From b1d48dbeef19b36cdc4792e17cfcf75f57c1ecae Mon Sep 17 00:00:00 2001
From: cquintini <cesarquintini@gmail.com>
Date: Thu, 2 Mar 2023 18:33:35 -0400
Subject: [PATCH 0001/1030] Enable Order Creation in BO with a virtual product
 and a customer address that is from a Country that is not served by any
 carrier.

---
 .../js/pages/order/create/create-order-page.ts |  4 ++++
 .../GetCartForOrderCreationHandler.php         |  8 ++++++--
 .../CartForOrderCreation/CartShipping.php      | 18 +++++++++++++++++-
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/admin-dev/themes/new-theme/js/pages/order/create/create-order-page.ts b/admin-dev/themes/new-theme/js/pages/order/create/create-order-page.ts
index 0ad971c7d73d4..f3d75cba88d3f 100644
--- a/admin-dev/themes/new-theme/js/pages/order/create/create-order-page.ts
+++ b/admin-dev/themes/new-theme/js/pages/order/create/create-order-page.ts
@@ -84,6 +84,7 @@ export interface CartShipping {
   giftMessage: string;
   recycledPackaging: boolean;
   selectedCarrierId: number | null | string;
+  virtual: boolean;
 }
 
 export interface CartSummary {
@@ -732,6 +733,9 @@ export default class CreateOrderPage {
 
     $(createOrderMap.cartBlock).removeClass('d-none');
     $(createOrderMap.cartBlock).data('cartId', cartInfo.cartId);
+    if(cartInfo.shipping.virtual){
+      $(createOrderMap.shippingBlock).addClass('d-none');
+    }
   }
 
   /**
diff --git a/src/Adapter/Cart/QueryHandler/GetCartForOrderCreationHandler.php b/src/Adapter/Cart/QueryHandler/GetCartForOrderCreationHandler.php
index dc04995c0bdb6..4f28c95c77ac5 100644
--- a/src/Adapter/Cart/QueryHandler/GetCartForOrderCreationHandler.php
+++ b/src/Adapter/Cart/QueryHandler/GetCartForOrderCreationHandler.php
@@ -359,7 +359,7 @@ private function extractShippingFromLegacySummary(Cart $cart, array $legacySumma
         $deliveryAddress = (int) $cart->id_address_delivery;
 
         //Check if there is any delivery options available for cart delivery address
-        if (!array_key_exists($deliveryAddress, $deliveryOptionsByAddress)) {
+        if (!array_key_exists($deliveryAddress, $deliveryOptionsByAddress) && !$cart->isVirtualCart()) {
             return null;
         }
 
@@ -374,7 +374,8 @@ private function extractShippingFromLegacySummary(Cart $cart, array $legacySumma
             (int) $carrier->id ?: $this->defaultCarrierId ?: null,
             (bool) $cart->gift,
             (bool) $cart->recyclable,
-            $cart->gift_message
+            $cart->gift_message,
+            $cart->isVirtualCart()
         );
     }
 
@@ -389,6 +390,9 @@ private function extractShippingFromLegacySummary(Cart $cart, array $legacySumma
     private function fetchCartDeliveryOptions(array $deliveryOptionsByAddress, int $deliveryAddressId)
     {
         $deliveryOptions = [];
+        if(empty($deliveryOptionsByAddress)){
+            return $deliveryOptions;
+        }
         // legacy multishipping feature allowed to split cart shipping to multiple addresses.
         // now when the multishipping feature is removed
         // the list of carriers should be shared across whole cart for single delivery address
diff --git a/src/Core/Domain/Cart/QueryResult/CartForOrderCreation/CartShipping.php b/src/Core/Domain/Cart/QueryResult/CartForOrderCreation/CartShipping.php
index 44df023d8a544..e482c8820e44f 100644
--- a/src/Core/Domain/Cart/QueryResult/CartForOrderCreation/CartShipping.php
+++ b/src/Core/Domain/Cart/QueryResult/CartForOrderCreation/CartShipping.php
@@ -66,6 +66,11 @@ class CartShipping
      */
     private $giftMessage;
 
+    /**
+     * @var bool
+     */
+    private $isVirtual;    
+
     /**
      * @param string $shippingPrice
      * @param bool $freeShipping
@@ -74,6 +79,7 @@ class CartShipping
      * @param bool $isGift
      * @param bool $isRecycledPackaging
      * @param string $giftMessage
+     * @param bool $isVirtual
      */
     public function __construct(
         string $shippingPrice,
@@ -82,7 +88,8 @@ public function __construct(
         ?int $selectedCarrierId,
         bool $isGift,
         bool $isRecycledPackaging,
-        string $giftMessage
+        string $giftMessage,
+        bool $isVirtual
     ) {
         $this->shippingPrice = $shippingPrice;
         $this->freeShipping = $freeShipping;
@@ -91,6 +98,7 @@ public function __construct(
         $this->isGift = $isGift;
         $this->isRecycledPackaging = $isRecycledPackaging;
         $this->giftMessage = $giftMessage;
+        $this->isVirtual = $isVirtual;
     }
 
     /**
@@ -148,4 +156,12 @@ public function getGiftMessage(): string
     {
         return $this->giftMessage;
     }
+
+    /**
+     * @return bool
+     */
+    public function isVirtual(): bool
+    {
+        return $this->isVirtual;
+    }    
 }

From fd2e013595dee454ef018a91b4817b6dc24787c7 Mon Sep 17 00:00:00 2001
From: Cesar Quintini <cesarquintini@gmail.com>
Date: Thu, 2 Mar 2023 19:13:03 -0400
Subject: [PATCH 0002/1030] Update create-order-page.ts

fix format
---
 .../themes/new-theme/js/pages/order/create/create-order-page.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-dev/themes/new-theme/js/pages/order/create/create-order-page.ts b/admin-dev/themes/new-theme/js/pages/order/create/create-order-page.ts
index f3d75cba88d3f..6ef97e81beae4 100644
--- a/admin-dev/themes/new-theme/js/pages/order/create/create-order-page.ts
+++ b/admin-dev/themes/new-theme/js/pages/order/create/create-order-page.ts
@@ -733,7 +733,7 @@ export default class CreateOrderPage {
 
     $(createOrderMap.cartBlock).removeClass('d-none');
     $(createOrderMap.cartBlock).data('cartId', cartInfo.cartId);
-    if(cartInfo.shipping.virtual){
+    if (cartInfo.shipping.virtual) {
       $(createOrderMap.shippingBlock).addClass('d-none');
     }
   }

From f04accd03c1008452101c1b5664b1ef717fc229e Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Fri, 3 Mar 2023 14:51:45 +0100
Subject: [PATCH 0003/1030] Do not interfere with PDF files

---
 classes/Tools.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/classes/Tools.php b/classes/Tools.php
index 16e2f1ee2a6a9..303352a6a3fcb 100644
--- a/classes/Tools.php
+++ b/classes/Tools.php
@@ -2516,11 +2516,6 @@ public static function generateHtaccess($path = null, $rewrite_settings = null,
 	<FilesMatch \"\.(ttf|ttc|otf|eot|woff|woff2|svg)$\">
 		Header set Access-Control-Allow-Origin \"*\"
 	</FilesMatch>
-
-    <FilesMatch \"\.pdf$\">
-      Header set Content-Disposition \"Attachment\"
-      Header set X-Content-Type-Options \"nosniff\"
-    </FilesMatch>
 </IfModule>\n\n");
         fwrite($write_fd, '<Files composer.lock>
     # Apache 2.2

From be75079bd132b40ec9749b46c0fe2069dda35eca Mon Sep 17 00:00:00 2001
From: Antonin 0x346e3730 CLAUZIER <antonin@clauzier.dev>
Date: Mon, 3 Oct 2022 19:18:40 +0400
Subject: [PATCH 0004/1030] Skip own profile when bulk delete

---
 .../CommandHandler/BulkDeleteProfileHandler.php       | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/Adapter/Profile/CommandHandler/BulkDeleteProfileHandler.php b/src/Adapter/Profile/CommandHandler/BulkDeleteProfileHandler.php
index 7d569204ab0e9..cb3dfbcc0d39c 100644
--- a/src/Adapter/Profile/CommandHandler/BulkDeleteProfileHandler.php
+++ b/src/Adapter/Profile/CommandHandler/BulkDeleteProfileHandler.php
@@ -69,6 +69,7 @@ public function __construct($superAdminProfileId, ContextEmployeeProviderInterfa
     public function handle(BulkDeleteProfileCommand $command)
     {
         $entityIds = $command->getProfileIds();
+        $exceptionToThrowLater = null;
 
         foreach ($entityIds as $entityId) {
             $entityIdValue = $entityId->getValue();
@@ -95,7 +96,17 @@ public function handle(BulkDeleteProfileCommand $command)
                 }
             } catch (PrestaShopException $e) {
                 throw new ProfileException(sprintf('Unexpected error occurred when deleting Profile with id %s', var_export($entityIdValue, true)), 0, $e);
+            } catch (FailedToDeleteProfileException $e) {
+                if ($e->getCode() === FailedToDeleteProfileException::PROFILE_IS_ASSIGNED_TO_CONTEXT_EMPLOYEE) {
+                    $exceptionToThrowLater = $e;
+                    continue;
+                }
+                throw $e;
             }
         }
+
+        if ($exceptionToThrowLater) {
+            throw $exceptionToThrowLater;
+        }
     }
 }

From ee646894c666a02de0a241f074c38b6553cd7bda Mon Sep 17 00:00:00 2001
From: Antonin 0x346e3730 CLAUZIER <antonin@clauzier.dev>
Date: Tue, 4 Oct 2022 13:19:05 +0400
Subject: [PATCH 0005/1030] Hide the checkbox for bulk actions for the current
 user's profile

---
 .../ProfileGridDataFactoryDecorator.php       | 95 +++++++++++++++++++
 .../services/core/grid/grid_data_factory.yml  |  6 ++
 .../services/core/grid/grid_factory.yml       |  2 +-
 .../Columns/Content/bulk_action.html.twig     |  2 +-
 4 files changed, 103 insertions(+), 2 deletions(-)
 create mode 100644 src/Core/Grid/Data/Factory/ProfileGridDataFactoryDecorator.php

diff --git a/src/Core/Grid/Data/Factory/ProfileGridDataFactoryDecorator.php b/src/Core/Grid/Data/Factory/ProfileGridDataFactoryDecorator.php
new file mode 100644
index 0000000000000..1d651d2039cde
--- /dev/null
+++ b/src/Core/Grid/Data/Factory/ProfileGridDataFactoryDecorator.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Grid\Data\Factory;
+
+use PrestaShop\PrestaShop\Core\Grid\Data\GridData;
+use PrestaShop\PrestaShop\Core\Grid\Record\RecordCollection;
+use PrestaShop\PrestaShop\Core\Grid\Record\RecordCollectionInterface;
+use PrestaShop\PrestaShop\Core\Grid\Search\SearchCriteriaInterface;
+use Symfony\Component\Security\Core\Security;
+
+/**
+ * Class ProfileGridDataFactory decorates data from profile doctrine data factory.
+ */
+final class ProfileGridDataFactoryDecorator implements GridDataFactoryInterface
+{
+    /**
+     * @var GridDataFactoryInterface
+     */
+    private $profileGridDataFactory;
+
+    /**
+     * @var Security
+     */
+    private $security;
+
+    public function __construct(
+        GridDataFactoryInterface $profileGridDataFactory,
+        Security $security
+
+    ) {
+        $this->profileGridDataFactory = $profileGridDataFactory;
+        $this->security = $security;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getData(SearchCriteriaInterface $searchCriteria)
+    {
+        $profileData = $this->profileGridDataFactory->getData($searchCriteria);
+
+        $profileRecords = $this->applyModifications($profileData->getRecords());
+
+        return new GridData(
+            $profileRecords,
+            $profileData->getRecordsTotal(),
+            $profileData->getQuery()
+        );
+    }
+
+    /**
+     * @param RecordCollectionInterface $profiles
+     *
+     * @return RecordCollection
+     */
+    private function applyModifications(RecordCollectionInterface $profiles)
+    {
+        $modifiedProfiles = [];
+
+        $currentUserIdProfile = $this->security->getUser()->getData()->id_profile;
+        foreach ($profiles as $profile) {
+            if ($profile['id_profile'] === $currentUserIdProfile) {
+                $profile['disableBulkCheckbox'] = true;
+            }
+
+            $modifiedProfiles[] = $profile;
+        }
+
+        return new RecordCollection($modifiedProfiles);
+    }
+}
diff --git a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_data_factory.yml b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_data_factory.yml
index 1b92f519c89fe..63923eb3c06c5 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_data_factory.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_data_factory.yml
@@ -186,6 +186,12 @@ services:
       - '@prestashop.core.grid.query.doctrine_query_parser'
       - 'profile'
 
+  prestashop.core.grid.data_factory.profiles_decorator:
+    class: 'PrestaShop\PrestaShop\Core\Grid\Data\Factory\ProfileGridDataFactoryDecorator'
+    arguments:
+      - '@prestashop.core.grid.data_factory.profiles'
+      - '@security.helper'
+
   prestashop.core.grid.data_provider.cms_page_category:
     class: '%prestashop.core.grid.data.factory.doctrine_grid_data_factory%'
     arguments:
diff --git a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_factory.yml b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_factory.yml
index c1aef65e774d5..ad4b02e03d81b 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_factory.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_factory.yml
@@ -148,7 +148,7 @@ services:
     class: 'PrestaShop\PrestaShop\Core\Grid\GridFactory'
     arguments:
       - '@prestashop.core.grid.definition.factory.profile'
-      - '@prestashop.core.grid.data_factory.profiles'
+      - '@prestashop.core.grid.data_factory.profiles_decorator'
       - '@prestashop.core.grid.filter.form_factory'
       - '@prestashop.core.hook.dispatcher'
 
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Common/Grid/Columns/Content/bulk_action.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Common/Grid/Columns/Content/bulk_action.html.twig
index b4f43a30aefb3..ca82eb08a67b2 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Common/Grid/Columns/Content/bulk_action.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Common/Grid/Columns/Content/bulk_action.html.twig
@@ -23,7 +23,7 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  *#}
 
-{% if column.options.disabled_field is empty or not record[column.options.disabled_field] %}
+{% if (column.options.disabled_field is empty or not record[column.options.disabled_field]) and (record.disableBulkCheckbox is not defined or not record.disableBulkCheckbox) %}
 <div class="md-checkbox">
   <label>
     <input type="checkbox"

From b70dccf8ea211ee81622f40e86b60fd6f70b607a Mon Sep 17 00:00:00 2001
From: Antonin 0x346e3730 CLAUZIER <antonin@clauzier.dev>
Date: Fri, 18 Nov 2022 13:42:32 +0400
Subject: [PATCH 0006/1030] Strict type & phpstan fix

---
 .../Grid/Data/Factory/ProfileGridDataFactoryDecorator.php  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Core/Grid/Data/Factory/ProfileGridDataFactoryDecorator.php b/src/Core/Grid/Data/Factory/ProfileGridDataFactoryDecorator.php
index 1d651d2039cde..4c51ce8447de6 100644
--- a/src/Core/Grid/Data/Factory/ProfileGridDataFactoryDecorator.php
+++ b/src/Core/Grid/Data/Factory/ProfileGridDataFactoryDecorator.php
@@ -24,12 +24,15 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
+declare(strict_types=1);
+
 namespace PrestaShop\PrestaShop\Core\Grid\Data\Factory;
 
 use PrestaShop\PrestaShop\Core\Grid\Data\GridData;
 use PrestaShop\PrestaShop\Core\Grid\Record\RecordCollection;
 use PrestaShop\PrestaShop\Core\Grid\Record\RecordCollectionInterface;
 use PrestaShop\PrestaShop\Core\Grid\Search\SearchCriteriaInterface;
+use PrestaShopBundle\Security\Admin\Employee;
 use Symfony\Component\Security\Core\Security;
 
 /**
@@ -81,7 +84,9 @@ private function applyModifications(RecordCollectionInterface $profiles)
     {
         $modifiedProfiles = [];
 
-        $currentUserIdProfile = $this->security->getUser()->getData()->id_profile;
+        /** @var Employee $user */
+        $user = $this->security->getUser();
+        $currentUserIdProfile = $user->getData()->id_profile;
         foreach ($profiles as $profile) {
             if ($profile['id_profile'] === $currentUserIdProfile) {
                 $profile['disableBulkCheckbox'] = true;

From f893ab8d1e28e9babce0e916284943e9bbb8bd82 Mon Sep 17 00:00:00 2001
From: Antonin 0x346e3730 CLAUZIER <antonin@clauzier.dev>
Date: Tue, 28 Mar 2023 11:49:50 +0400
Subject: [PATCH 0007/1030] Fixed CI ?

---
 .../Grid/Data/Factory/ProfileGridDataFactoryDecorator.php  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Core/Grid/Data/Factory/ProfileGridDataFactoryDecorator.php b/src/Core/Grid/Data/Factory/ProfileGridDataFactoryDecorator.php
index 4c51ce8447de6..2930824f0db34 100644
--- a/src/Core/Grid/Data/Factory/ProfileGridDataFactoryDecorator.php
+++ b/src/Core/Grid/Data/Factory/ProfileGridDataFactoryDecorator.php
@@ -1,5 +1,5 @@
 <?php
-/**
+/*
  * Copyright since 2007 PrestaShop SA and Contributors
  * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
  *
@@ -53,7 +53,6 @@ final class ProfileGridDataFactoryDecorator implements GridDataFactoryInterface
     public function __construct(
         GridDataFactoryInterface $profileGridDataFactory,
         Security $security
-
     ) {
         $this->profileGridDataFactory = $profileGridDataFactory;
         $this->security = $security;
@@ -86,6 +85,10 @@ private function applyModifications(RecordCollectionInterface $profiles)
 
         /** @var Employee $user */
         $user = $this->security->getUser();
+        if (!$user) {
+            return new RecordCollection($modifiedProfiles);
+        }
+
         $currentUserIdProfile = $user->getData()->id_profile;
         foreach ($profiles as $profile) {
             if ($profile['id_profile'] === $currentUserIdProfile) {

From 115565d55696578d7e13ed442799a60f014511ac Mon Sep 17 00:00:00 2001
From: Antonin 0x346e3730 CLAUZIER <antonin@clauzier.dev>
Date: Tue, 28 Mar 2023 12:19:34 +0400
Subject: [PATCH 0008/1030] Fix phpstan

---
 .../Grid/Data/Factory/ProfileGridDataFactoryDecorator.php   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Core/Grid/Data/Factory/ProfileGridDataFactoryDecorator.php b/src/Core/Grid/Data/Factory/ProfileGridDataFactoryDecorator.php
index 2930824f0db34..1dc8773cd28de 100644
--- a/src/Core/Grid/Data/Factory/ProfileGridDataFactoryDecorator.php
+++ b/src/Core/Grid/Data/Factory/ProfileGridDataFactoryDecorator.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * Copyright since 2007 PrestaShop SA and Contributors
  * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
  *
@@ -83,9 +83,9 @@ private function applyModifications(RecordCollectionInterface $profiles)
     {
         $modifiedProfiles = [];
 
-        /** @var Employee $user */
+        /** @var Employee|null $user */
         $user = $this->security->getUser();
-        if (!$user) {
+        if (null === $user) {
             return new RecordCollection($modifiedProfiles);
         }
 

From c4490ad7408fdfe2649c20f4a8075e725061132e Mon Sep 17 00:00:00 2001
From: Antonin 0x346e3730 CLAUZIER <antonin@clauzier.dev>
Date: Wed, 29 Mar 2023 12:39:06 +0400
Subject: [PATCH 0009/1030] FQCN instead of service name

---
 .../config/services/core/grid/grid_data_factory.yml       | 8 ++++----
 .../Resources/config/services/core/grid/grid_factory.yml  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_data_factory.yml b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_data_factory.yml
index 63923eb3c06c5..f0d434595cc03 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_data_factory.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_data_factory.yml
@@ -186,11 +186,11 @@ services:
       - '@prestashop.core.grid.query.doctrine_query_parser'
       - 'profile'
 
-  prestashop.core.grid.data_factory.profiles_decorator:
-    class: 'PrestaShop\PrestaShop\Core\Grid\Data\Factory\ProfileGridDataFactoryDecorator'
+  PrestaShop\PrestaShop\Core\Grid\Data\Factory\ProfileGridDataFactoryDecorator:
+    autowire: true
+    public: false
     arguments:
-      - '@prestashop.core.grid.data_factory.profiles'
-      - '@security.helper'
+      $profileGridDataFactory: '@prestashop.core.grid.data_factory.profiles'
 
   prestashop.core.grid.data_provider.cms_page_category:
     class: '%prestashop.core.grid.data.factory.doctrine_grid_data_factory%'
diff --git a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_factory.yml b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_factory.yml
index ad4b02e03d81b..f44f52f759347 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_factory.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_factory.yml
@@ -148,7 +148,7 @@ services:
     class: 'PrestaShop\PrestaShop\Core\Grid\GridFactory'
     arguments:
       - '@prestashop.core.grid.definition.factory.profile'
-      - '@prestashop.core.grid.data_factory.profiles_decorator'
+      - '@PrestaShop\PrestaShop\Core\Grid\Data\Factory\ProfileGridDataFactoryDecorator'
       - '@prestashop.core.grid.filter.form_factory'
       - '@prestashop.core.hook.dispatcher'
 

From f0efc18b5bf81499f39785370c62669c6796212c Mon Sep 17 00:00:00 2001
From: Cesar Quintini <cesarquintini@gmail.com>
Date: Wed, 29 Mar 2023 10:09:32 -0400
Subject: [PATCH 0010/1030] Update
 src/Adapter/Cart/QueryHandler/GetCartForOrderCreationHandler.php

fix errors with coding standards.

Co-authored-by: Krystian Podemski <kpodemski@users.noreply.github.com>
---
 .../Cart/QueryHandler/GetCartForOrderCreationHandler.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Adapter/Cart/QueryHandler/GetCartForOrderCreationHandler.php b/src/Adapter/Cart/QueryHandler/GetCartForOrderCreationHandler.php
index 4f28c95c77ac5..988d6efd40fbf 100644
--- a/src/Adapter/Cart/QueryHandler/GetCartForOrderCreationHandler.php
+++ b/src/Adapter/Cart/QueryHandler/GetCartForOrderCreationHandler.php
@@ -390,7 +390,7 @@ private function extractShippingFromLegacySummary(Cart $cart, array $legacySumma
     private function fetchCartDeliveryOptions(array $deliveryOptionsByAddress, int $deliveryAddressId)
     {
         $deliveryOptions = [];
-        if(empty($deliveryOptionsByAddress)){
+        if (empty($deliveryOptionsByAddress)) {
             return $deliveryOptions;
         }
         // legacy multishipping feature allowed to split cart shipping to multiple addresses.

From b71cc1756c4af42332fe8747ba8cd4ef71684d7b Mon Sep 17 00:00:00 2001
From: Krystian Podemski <kpodemski@users.noreply.github.com>
Date: Fri, 31 Mar 2023 16:57:50 +0200
Subject: [PATCH 0011/1030] Apply suggestions from code review

---
 .../Cart/QueryResult/CartForOrderCreation/CartShipping.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Core/Domain/Cart/QueryResult/CartForOrderCreation/CartShipping.php b/src/Core/Domain/Cart/QueryResult/CartForOrderCreation/CartShipping.php
index e482c8820e44f..fb6813028695c 100644
--- a/src/Core/Domain/Cart/QueryResult/CartForOrderCreation/CartShipping.php
+++ b/src/Core/Domain/Cart/QueryResult/CartForOrderCreation/CartShipping.php
@@ -69,7 +69,7 @@ class CartShipping
     /**
      * @var bool
      */
-    private $isVirtual;    
+    private $isVirtual;
 
     /**
      * @param string $shippingPrice
@@ -163,5 +163,5 @@ public function getGiftMessage(): string
     public function isVirtual(): bool
     {
         return $this->isVirtual;
-    }    
+    }
 }

From 885907e2203d1e876c1ae13b1ad650d4f2001ec1 Mon Sep 17 00:00:00 2001
From: Kijam Lopez <klopez@publica.la>
Date: Wed, 5 Apr 2023 17:11:51 -0400
Subject: [PATCH 0012/1030] If the actionValidateCustomerAddressForm hook is
 disabled or does not exist, this validation is never valid.

---
 classes/Hook.php                     | 2 +-
 classes/form/CustomerAddressForm.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/classes/Hook.php b/classes/Hook.php
index b0ce8127aa9bc..707d0e66430a6 100644
--- a/classes/Hook.php
+++ b/classes/Hook.php
@@ -818,7 +818,7 @@ public static function exec(
                 $hookRegistry->collect();
             }
 
-            return ($array_return) ? [] : false;
+            return ($array_return) ? [] : null;
         }
 
         // Store list of executed hooks on this page
diff --git a/classes/form/CustomerAddressForm.php b/classes/form/CustomerAddressForm.php
index 013eb164096e3..0eb1e9982ffdf 100644
--- a/classes/form/CustomerAddressForm.php
+++ b/classes/form/CustomerAddressForm.php
@@ -134,8 +134,8 @@ public function validate()
             }
         }
 
-        if (($hookReturn = Hook::exec('actionValidateCustomerAddressForm', ['form' => $this])) !== '') {
-            $is_valid &= (bool) $hookReturn;
+        if ($is_valid && Hook::exec('actionValidateCustomerAddressForm', ['form' => $this]) === false) {
+            $is_valid = false;
         }
 
         return $is_valid && parent::validate();

From 151abc593517bd1f17fa3a4e5841a666fe703490 Mon Sep 17 00:00:00 2001
From: Daniel Hlavacek <daniel.hlavacek@hotmail.cz>
Date: Thu, 20 Apr 2023 12:49:32 +0200
Subject: [PATCH 0013/1030] Update .htaccess

---
 upload/.htaccess | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/upload/.htaccess b/upload/.htaccess
index c99ee86527a74..e47b74dcad29f 100644
--- a/upload/.htaccess
+++ b/upload/.htaccess
@@ -1,3 +1,10 @@
+<IfModule mod_headers.c>
+    <FilesMatch "\.pdf$">
+      Header set Content-Disposition "Attachment"
+      Header set X-Content-Type-Options "nosniff"
+    </FilesMatch>
+</IfModule>
+
 <IfModule !mod_rewrite.c>
   # Apache 2.2
   <IfModule !mod_authz_core.c>

From 323e128bab612db5a4025713823ee5253211d479 Mon Sep 17 00:00:00 2001
From: Codencode <info@codencode.it>
Date: Tue, 9 May 2023 15:15:22 +0200
Subject: [PATCH 0014/1030] Update classes/ObjectModel.php

Delete all thumbnails of the given objects after uploading an image in backoffice.
---
 classes/ObjectModel.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/classes/ObjectModel.php b/classes/ObjectModel.php
index 51d1e2df51a85..31c531fd60471 100644
--- a/classes/ObjectModel.php
+++ b/classes/ObjectModel.php
@@ -1965,12 +1965,28 @@ public function deleteImage($force_delete = false)
                 return false;
             }
 
+            /** @var PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration $imageFormatConfiguration */
+            $imageFormatConfiguration = ServiceLocator::get('PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration');
+            $configuredImageFormats = $imageFormatConfiguration->getGenerationFormats();            
+
             $types = ImageType::getImagesTypes();
             foreach ($types as $image_type) {
                 if (file_exists($this->image_dir . $this->id . '-' . stripslashes($image_type['name']) . '.' . $this->image_format)
                 && !unlink($this->image_dir . $this->id . '-' . stripslashes($image_type['name']) . '.' . $this->image_format)) {
                     return false;
                 }
+
+                foreach ($configuredImageFormats as $imageFormat) {
+                    $file = $this->image_dir . $this->id . '-' . stripslashes($image_type['name']) . '.' . $imageFormat;
+                    if (file_exists($file)) {
+                        unlink($file);
+                    }
+
+                    $file = $this->image_dir . $this->id . '-' . stripslashes($image_type['name']) . '2x.' . $imageFormat;
+                    if (file_exists($file)) {
+                        unlink($file);
+                    }
+                }
             }
         }
 

From 829ca38a5148d0b6995d78df907732d4a71a46dc Mon Sep 17 00:00:00 2001
From: Codencode <info@codencode.it>
Date: Tue, 9 May 2023 16:46:38 +0200
Subject: [PATCH 0015/1030] Update classes/ObjectModel.php

Co-authored-by: Krystian Podemski <kpodemski@users.noreply.github.com>
---
 classes/ObjectModel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/ObjectModel.php b/classes/ObjectModel.php
index 31c531fd60471..997faa51b6940 100644
--- a/classes/ObjectModel.php
+++ b/classes/ObjectModel.php
@@ -1967,7 +1967,7 @@ public function deleteImage($force_delete = false)
 
             /** @var PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration $imageFormatConfiguration */
             $imageFormatConfiguration = ServiceLocator::get('PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration');
-            $configuredImageFormats = $imageFormatConfiguration->getGenerationFormats();            
+            $configuredImageFormats = $imageFormatConfiguration->getGenerationFormats();
 
             $types = ImageType::getImagesTypes();
             foreach ($types as $image_type) {

From 671b2dc60ed4e5a0eab53751f3b0c85dbfb09ebf Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Thu, 11 May 2023 17:21:43 +0200
Subject: [PATCH 0016/1030] Add lazy tag for ThemeManager and
 ThemePageLayoutsCustomizer service

---
 src/Core/Addon/Theme/ThemePageLayoutsCustomizer.php           | 2 +-
 src/PrestaShopBundle/Resources/config/services/core/addon.yml | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Core/Addon/Theme/ThemePageLayoutsCustomizer.php b/src/Core/Addon/Theme/ThemePageLayoutsCustomizer.php
index 27f8a0fa71dfd..22bcb9a84cc9b 100644
--- a/src/Core/Addon/Theme/ThemePageLayoutsCustomizer.php
+++ b/src/Core/Addon/Theme/ThemePageLayoutsCustomizer.php
@@ -31,7 +31,7 @@
 /**
  * Class PagesLayoutCustomizer customizes pages layout for shop's Front Office theme.
  */
-final class ThemePageLayoutsCustomizer implements ThemePageLayoutsCustomizerInterface
+class ThemePageLayoutsCustomizer implements ThemePageLayoutsCustomizerInterface
 {
     /**
      * @var Theme
diff --git a/src/PrestaShopBundle/Resources/config/services/core/addon.yml b/src/PrestaShopBundle/Resources/config/services/core/addon.yml
index 5bd71dffea16f..bd5fec39af528 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/addon.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/addon.yml
@@ -34,10 +34,12 @@ services:
 
   prestashop.core.addon.theme.theme_manager:
     class: PrestaShop\PrestaShop\Core\Addon\Theme\ThemeManager
+    lazy: true
     factory: [ '@prestashop.core.addon.theme.theme_manager_builder', 'build' ]
 
   prestashop.core.addon.theme.theme.page_layouts_customizer:
     class: PrestaShop\PrestaShop\Core\Addon\Theme\ThemePageLayoutsCustomizer
+    lazy: true
     arguments:
       - '@=service("prestashop.adapter.legacy.context").getContext().shop.theme'
       - '@prestashop.core.addon.theme.theme_manager'

From 7955d0e2e5fa9266a845155582dc231a7b146131 Mon Sep 17 00:00:00 2001
From: matthieu-rolland <matthieu.rolland@prestashop.com>
Date: Wed, 15 Feb 2023 14:33:40 +0100
Subject: [PATCH 0017/1030] take shop id into account when disabling module

---
 classes/module/Module.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/classes/module/Module.php b/classes/module/Module.php
index 85a86d053b341..437d7da510a9e 100755
--- a/classes/module/Module.php
+++ b/classes/module/Module.php
@@ -984,7 +984,8 @@ public function disable($force_all = false)
         }
 
         // Disable module for all shops
-        $result &= Db::getInstance()->delete('module_shop', '`id_module` = ' . (int) $this->id);
+        $whereIdShop = $force_all ? '' : ' AND `id_shop` IN(' . implode(', ', Shop::getContextListShopID()) . ')';
+        $result &= Db::getInstance()->delete('module_shop', '`id_module` = ' . (int) $this->id . $whereIdShop);
 
         // if module has no more shop associations, set module.active = 0
         if (!$this->hasShopAssociations()) {

From 5893043bd87ae039c6df67b0759a1ba0e66bd112 Mon Sep 17 00:00:00 2001
From: matthieu-rolland <matthieu.rolland@prestashop.com>
Date: Wed, 15 Feb 2023 17:20:36 +0100
Subject: [PATCH 0018/1030] update comment

---
 classes/module/Module.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/module/Module.php b/classes/module/Module.php
index 437d7da510a9e..1bcea8112ca96 100755
--- a/classes/module/Module.php
+++ b/classes/module/Module.php
@@ -983,7 +983,7 @@ public function disable($force_all = false)
             $result &= $this->uninstallOverrides();
         }
 
-        // Disable module for all shops
+        // Disable module for all shops or contextual shops
         $whereIdShop = $force_all ? '' : ' AND `id_shop` IN(' . implode(', ', Shop::getContextListShopID()) . ')';
         $result &= Db::getInstance()->delete('module_shop', '`id_module` = ' . (int) $this->id . $whereIdShop);
 

From 70526decc8530d5b6fd3a24dac488d8ba37164bb Mon Sep 17 00:00:00 2001
From: "matthieu.rolland" <matthieu.rolland@prestashop.com>
Date: Fri, 28 Apr 2023 12:54:10 +0200
Subject: [PATCH 0019/1030] take multishop contextes into account when checking
 if module is active

---
 .../Module/AdminModuleDataProvider.php        | 10 +++++++++-
 src/Adapter/Module/Module.php                 | 19 +++++++++++++++++--
 .../config/services/adapter/data_provider.yml |  1 +
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/Adapter/Module/AdminModuleDataProvider.php b/src/Adapter/Module/AdminModuleDataProvider.php
index c56870f8cf839..1baa3a7d9411d 100644
--- a/src/Adapter/Module/AdminModuleDataProvider.php
+++ b/src/Adapter/Module/AdminModuleDataProvider.php
@@ -29,6 +29,7 @@
 use Context;
 use Employee;
 use Module as LegacyModule;
+use PrestaShop\PrestaShop\Adapter\Shop\Context as ShopContext;
 use PrestaShop\PrestaShop\Core\Module\ModuleCollection;
 use PrestaShopBundle\Service\DataProvider\Admin\CategoriesProvider;
 use PrestaShopBundle\Service\DataProvider\Admin\ModuleInterface;
@@ -110,6 +111,11 @@ class AdminModuleDataProvider implements ModuleInterface
      */
     private $employee;
 
+    /**
+     * @var ShopContext
+     */
+    private $shopContext;
+
     /**
      * @var array
      */
@@ -128,11 +134,13 @@ class AdminModuleDataProvider implements ModuleInterface
     public function __construct(
         CategoriesProvider $categoriesProvider,
         ModuleDataProvider $modulesProvider,
+        ShopContext $shopContext,
         Employee $employee = null
     ) {
         $this->categoriesProvider = $categoriesProvider;
         $this->moduleProvider = $modulesProvider;
         $this->employee = $employee;
+        $this->shopContext = $shopContext;
     }
 
     /**
@@ -233,7 +241,7 @@ public function setActionUrls(ModuleCollection $modules, ?string $specific_actio
 
             if ($module->isInstalled()) {
                 unset($urls['install']);
-                if (!$module->isActive()) {
+                if (!$module->isActive($this->shopContext)) {
                     unset(
                         $urls['disable'],
                         $urls['enableMobile'],
diff --git a/src/Adapter/Module/Module.php b/src/Adapter/Module/Module.php
index e77b1a86d338f..3c623d314b31d 100644
--- a/src/Adapter/Module/Module.php
+++ b/src/Adapter/Module/Module.php
@@ -26,7 +26,9 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Module;
 
+use Db;
 use Module as LegacyModule;
+use PrestaShop\PrestaShop\Adapter\Shop\Context as ShopContext;
 use PrestaShop\PrestaShop\Core\Addon\AddonListFilterOrigin;
 use PrestaShop\PrestaShop\Core\Addon\Module\AddonListFilterDeviceStatus;
 use PrestaShop\PrestaShop\Core\Module\ModuleInterface;
@@ -224,9 +226,22 @@ public function hasValidInstance(): bool
     /**
      * @return bool
      */
-    public function isActive(): bool
+    public function isActive(ShopContext $shopContext = null): bool
     {
-        return (bool) $this->database->get('active');
+        if ($shopContext === null || $shopContext->isAllShopContext()) {
+            return (bool) $this->database->get('active');
+        }
+
+        $sql = sprintf(
+            'SELECT * FROM %smodule_shop WHERE `id_module` = %s AND `id_shop` IN (%s)',
+            _DB_PREFIX_,
+            $this->database->get('id'),
+            implode(', ', $shopContext->getContextListShopID())
+        );
+
+        $res = Db::getInstance()->executeS($sql);
+
+        return !empty($res);
     }
 
     public function isActiveOnMobile(): bool
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml b/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml
index 9166eb0505be1..fa0f4715cb1b4 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml
@@ -10,6 +10,7 @@ services:
     arguments:
       - "@prestashop.categories_provider"
       - "@prestashop.adapter.data_provider.module"
+      - "@prestashop.adapter.shop.context"
       - "@=service('prestashop.adapter.legacy.context').getContext().employee"
     calls:
       - [ setRouter, [ '@router' ] ]

From f99ad4606456b509cad609853ec717abf3bb3651 Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Wed, 10 May 2023 17:12:02 +0200
Subject: [PATCH 0020/1030] Try to fix CI

---
 src/Core/Addon/Module/ModuleManagerBuilder.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Core/Addon/Module/ModuleManagerBuilder.php b/src/Core/Addon/Module/ModuleManagerBuilder.php
index e99f17dbdf48e..3f0c01a6ccf10 100644
--- a/src/Core/Addon/Module/ModuleManagerBuilder.php
+++ b/src/Core/Addon/Module/ModuleManagerBuilder.php
@@ -196,6 +196,7 @@ private function __construct(bool $isDebug = _PS_MODE_DEV_)
             self::$adminModuleDataProvider = new AdminModuleDataProvider(
                 self::$categoriesProvider,
                 self::$moduleDataProvider,
+                new \PrestaShop\PrestaShop\Adapter\Shop\Context(),
                 Context::getContext()->employee
             );
             self::$adminModuleDataProvider->setRouter($this->getSymfonyRouter());

From 2198868897ae9c39e1dd1ebb44d76d608945b8ef Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Wed, 17 May 2023 17:24:18 +0200
Subject: [PATCH 0021/1030] Update ImageGenerator resize destination path

---
 src/Adapter/Image/ImageGenerator.php                  | 11 +++++------
 .../Product/Image/Uploader/ProductImageUploader.php   |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/Adapter/Image/ImageGenerator.php b/src/Adapter/Image/ImageGenerator.php
index 1b46a82cddd09..fd785bb886e00 100644
--- a/src/Adapter/Image/ImageGenerator.php
+++ b/src/Adapter/Image/ImageGenerator.php
@@ -68,13 +68,13 @@ public function __construct(FeatureFlagRepository $featureFlagRepository, ImageF
      * @throws ImageOptimizationException
      * @throws ImageUploadException
      */
-    public function generateImagesByTypes(string $imagePath, array $imageTypes): bool
+    public function generateImagesByTypes(string $imagePath, array $imageTypes, int $imageId): bool
     {
         $resized = true;
 
         try {
             foreach ($imageTypes as $imageType) {
-                $resized &= $this->resize($imagePath, $imageType);
+                $resized &= $this->resize($imagePath, $imageType, $imageId);
             }
         } catch (PrestaShopException $e) {
             throw new ImageOptimizationException('Unable to resize one or more of your pictures.');
@@ -95,7 +95,7 @@ public function generateImagesByTypes(string $imagePath, array $imageTypes): boo
      *
      * @return bool
      */
-    protected function resize(string $filePath, ImageType $imageType): bool
+    protected function resize(string $filePath, ImageType $imageType, int $imageId): bool
     {
         if (!is_file($filePath)) {
             throw new ImageUploadException(sprintf('File "%s" does not exist', $filePath));
@@ -124,7 +124,7 @@ protected function resize(string $filePath, ImageType $imageType): bool
             $forceFormat = ($imageFormat !== 'jpg');
             if (!ImageManager::resize(
                 $filePath,
-                sprintf('%s-%s.%s', rtrim($filePath, '.' . $imageFormat), stripslashes($imageType->name), $imageFormat),
+                sprintf('%s-%s.%s', dirname($filePath) . DIRECTORY_SEPARATOR . $imageId, stripslashes($imageType->name), $imageFormat),
                 $imageType->width,
                 $imageType->height,
                 $imageFormat,
@@ -132,10 +132,9 @@ protected function resize(string $filePath, ImageType $imageType): bool
             )) {
                 $result = false;
             }
-
             if ($generate_high_dpi_images && !ImageManager::resize(
                 $filePath,
-                sprintf('%s-%s.%s', rtrim($filePath, '.' . $imageFormat), stripslashes($imageType->name) . '2x', $imageFormat),
+                sprintf('%s-%s.%s', dirname($filePath) . DIRECTORY_SEPARATOR . $imageId, stripslashes($imageType->name) . '2x', $imageFormat),
                 $imageType->width * 2,
                 $imageType->height * 2,
                 $imageFormat,
diff --git a/src/Adapter/Product/Image/Uploader/ProductImageUploader.php b/src/Adapter/Product/Image/Uploader/ProductImageUploader.php
index b1175d3f62ec7..faa81e530df81 100644
--- a/src/Adapter/Product/Image/Uploader/ProductImageUploader.php
+++ b/src/Adapter/Product/Image/Uploader/ProductImageUploader.php
@@ -119,7 +119,7 @@ public function upload(Image $image, string $filePath): string
         $this->createDestinationDirectory($imageId, $productId);
         $destinationPath = $this->productImagePathFactory->getPath($imageId);
         $this->uploadFromTemp($filePath, $destinationPath);
-        $this->imageGenerator->generateImagesByTypes($destinationPath, $this->productImageRepository->getProductImageTypes());
+        $this->imageGenerator->generateImagesByTypes($destinationPath, $this->productImageRepository->getProductImageTypes(), $imageId->getValue());
 
         $this->hookDispatcher->dispatchWithParameters(
             'actionWatermark',

From b79d455931feb6d4d77b8a5b680dbe4402a05c23 Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Fri, 19 May 2023 09:36:35 +0200
Subject: [PATCH 0022/1030] Add phpDOC and turn $imageId parameter optional

---
 src/Adapter/Image/ImageGenerator.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Adapter/Image/ImageGenerator.php b/src/Adapter/Image/ImageGenerator.php
index fd785bb886e00..7c397461d30e2 100644
--- a/src/Adapter/Image/ImageGenerator.php
+++ b/src/Adapter/Image/ImageGenerator.php
@@ -62,13 +62,14 @@ public function __construct(FeatureFlagRepository $featureFlagRepository, ImageF
     /**
      * @param string $imagePath
      * @param ImageType[] $imageTypes
+     * @param int $imageId
      *
      * @return bool
      *
      * @throws ImageOptimizationException
      * @throws ImageUploadException
      */
-    public function generateImagesByTypes(string $imagePath, array $imageTypes, int $imageId): bool
+    public function generateImagesByTypes(string $imagePath, array $imageTypes, int $imageId = 0): bool
     {
         $resized = true;
 
@@ -92,10 +93,11 @@ public function generateImagesByTypes(string $imagePath, array $imageTypes, int
      *
      * @param string $filePath
      * @param ImageType $imageType
+     * @param int $imageId
      *
      * @return bool
      */
-    protected function resize(string $filePath, ImageType $imageType, int $imageId): bool
+    protected function resize(string $filePath, ImageType $imageType, int $imageId = 0): bool
     {
         if (!is_file($filePath)) {
             throw new ImageUploadException(sprintf('File "%s" does not exist', $filePath));

From 36790fb21947176791a6bdf7403dab0786e13574 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Thu, 25 May 2023 14:47:17 +0200
Subject: [PATCH 0023/1030] Add new test to change product quantity in FO

---
 .../10_cart/02_cart/01_changeQuantity.ts      | 144 ++++++++++++++++++
 tests/UI/pages/FO/cart/index.ts               |  47 +++++-
 2 files changed, 189 insertions(+), 2 deletions(-)
 create mode 100644 tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/01_changeQuantity.ts

diff --git a/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/01_changeQuantity.ts b/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/01_changeQuantity.ts
new file mode 100644
index 0000000000000..0bcb18e1abcae
--- /dev/null
+++ b/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/01_changeQuantity.ts
@@ -0,0 +1,144 @@
+// Import utils
+import helper from '@utils/helpers';
+import testContext from '@utils/testContext';
+
+// Import FO pages
+import cartPage from '@pages/FO/cart';
+import {homePage} from '@pages/FO/home';
+import checkoutPage from '@pages/FO/checkout';
+
+import {expect} from 'chai';
+import type {BrowserContext, Page} from 'playwright';
+
+const baseContext: string = 'functional_FO_classic_cart_cart_changeQuantity';
+
+describe('FO - cart : Change quantity', async () => {
+  let browserContext: BrowserContext;
+  let page: Page;
+
+  before(async function () {
+    browserContext = await helper.createBrowserContext(this.browser);
+    page = await helper.newTab(browserContext);
+  });
+
+  after(async () => {
+    await helper.closeBrowserContext(browserContext);
+  });
+
+  it('should go to FO', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'goToFo', baseContext);
+
+    await homePage.goToFo(page);
+    await homePage.changeLanguage(page, 'en');
+
+    const isHomePage = await homePage.isHomePage(page);
+    await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+  });
+
+  it('should add the first product to cart and proceed to checkout', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'addFirstProductToCart', baseContext);
+
+    await homePage.addProductToCartByQuickView(page, 1, 1);
+    await homePage.proceedToCheckout(page);
+
+    const pageTitle = await cartPage.getPageTitle(page);
+    await expect(pageTitle).to.eq(cartPage.pageTitle);
+  });
+
+  it('should increase the product quantity by the touchspin up to 5', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'increaseQuantity5', baseContext);
+
+    const quantity = await cartPage.setProductQuantity(page, 1, 5);
+    await expect(quantity).to.eq(5);
+
+    const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
+    await expect(notificationsNumber).to.be.eq(5);
+  });
+
+  it('should decrease the product quantity by the touchspin down to 2', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'decreaseQuantity2', baseContext);
+
+    const quantity = await cartPage.setProductQuantity(page, 1, 2);
+    await expect(quantity).to.eq(2);
+
+    const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
+    await expect(notificationsNumber).to.be.eq(2);
+  });
+
+  it('should set the quantity 3 in the input', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'setQuantity3', baseContext);
+
+    await cartPage.editProductQuantity(page, 1, 3);
+
+    const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
+    await expect(notificationsNumber).to.be.eq(3);
+  });
+
+  it('should set the quantity -6 in the input', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'setQuantity-6', baseContext);
+
+    await cartPage.editProductQuantity(page, 1, -6);
+
+    const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
+    await expect(notificationsNumber).to.be.eq(3);
+  });
+
+  it('should set the quantity +6 in the input', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'setQuantity+6', baseContext);
+
+    await cartPage.editProductQuantity(page, 1, +6);
+
+    const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
+    await expect(notificationsNumber).to.be.eq(6);
+  });
+
+  it('should set the quantity 64 in the input', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'setQuantity64', baseContext);
+
+    await cartPage.editProductQuantity(page, 1, 64);
+
+    const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
+    await expect(notificationsNumber).to.be.eq(64);
+  });
+
+  it('should set the quantity 64 in the input', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'setQuantity64', baseContext);
+
+    await cartPage.editProductQuantity(page, 1, 'azerty');
+
+    const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
+    await expect(notificationsNumber).to.be.eq(64);
+  });
+
+  it('should set the quantity 2400 in the input', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'setQuantity2400', baseContext);
+
+    await cartPage.editProductQuantity(page, 1, 2400);
+
+    const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
+    await expect(notificationsNumber).to.be.eq(2400);
+  });
+
+  it('should check the error message', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'checkErrorMessage', baseContext);
+
+    const alertText = await cartPage.getNotificationMessage(page);
+    await expect(alertText).to.contains(cartPage.errorNotificationForProductQuantity);
+  });
+
+  it('should check that proceed to checkout button is disabled', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'checkProceedToCheckoutButton', baseContext);
+
+    const isDisabled = await cartPage.isProceedToCheckoutButtonDisabled(page);
+    await expect(isDisabled).to.be.true;
+  });
+
+  it('should set the quantity 0 in the input', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'setQuantity', baseContext);
+
+    await cartPage.editProductQuantity(page, 1, 0);
+
+    const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
+    await expect(notificationsNumber).to.be.eq(0);
+  });
+});
diff --git a/tests/UI/pages/FO/cart/index.ts b/tests/UI/pages/FO/cart/index.ts
index d9e4fe55c95a9..e2b73bd52a00c 100644
--- a/tests/UI/pages/FO/cart/index.ts
+++ b/tests/UI/pages/FO/cart/index.ts
@@ -38,6 +38,10 @@ class Cart extends FOBasePage {
 
   private readonly productQuantity: (number: number) => string;
 
+  private readonly productQuantityScrollUpButton: string;
+
+  private readonly productQuantityScrollDownButton: string;
+
   private readonly productSize: (number: number) => string;
 
   private readonly productColor: (number: number) => string;
@@ -50,6 +54,8 @@ class Cart extends FOBasePage {
 
   private readonly noItemsInYourCartSpan: string;
 
+  private readonly alertMessage: string;
+
   private readonly subtotalDiscountValueSpan: string;
 
   private readonly cartTotalATI: string;
@@ -84,6 +90,8 @@ class Cart extends FOBasePage {
 
   public readonly minimumAmountErrorMessage: string;
 
+  public readonly errorNotificationForProductQuantity: string;
+
   private readonly alertWarning: string;
 
   private readonly proceedToCheckoutButton: string;
@@ -109,6 +117,7 @@ class Cart extends FOBasePage {
     this.cartRuleChooseCarrierAlertMessageText = 'You must choose a carrier before applying this voucher to your order';
     this.cartRuleCannotUseVoucherAlertMessageText = 'You cannot use this voucher with this carrier';
     this.minimumAmountErrorMessage = 'The minimum amount to benefit from this promo code is';
+    this.errorNotificationForProductQuantity = 'The available purchase order quantity for this product is 300.';
 
     // Selectors for cart page
     // Shopping cart block selectors
@@ -120,12 +129,17 @@ class Cart extends FOBasePage {
     this.productTotalPrice = (number: number) => `${this.productItem(number)} span.product-price`;
     this.productQuantity = (number: number) => `${this.productItem(number)} div.input-group `
       + 'input.js-cart-line-product-quantity';
+    this.productQuantityScrollUpButton = 'button.js-increase-product-quantity.bootstrap-touchspin-up';
+    this.productQuantityScrollDownButton = 'button.js-decrease-product-quantity.bootstrap-touchspin-down';
     this.productSize = (number: number) => `${this.productItem(number)} div.product-line-info.size span.value`;
     this.productColor = (number: number) => `${this.productItem(number)} div.product-line-info.color span.value`;
     this.productImage = (number: number) => `${this.productItem(number)} span.product-image img`;
     this.deleteIcon = (number: number) => `${this.productItem(number)} .remove-from-cart`;
     this.noItemsInYourCartSpan = 'div.cart-grid-body div.cart-overview.js-cart span.no-items';
 
+    // Notifications
+    this.alertMessage = '#notifications div.notifications-container';
+
     // Cart summary block selectors
     this.itemsNumber = '#cart-subtotal-products span.label.js-subtotal';
     this.subtotalDiscountValueSpan = '#cart-subtotal-discount span.value';
@@ -148,15 +162,19 @@ class Cart extends FOBasePage {
     this.alertWarning = '.checkout.cart-detailed-actions.card-block div.alert.alert-warning';
 
     this.proceedToCheckoutButton = '#main div.checkout a';
-    this.disabledProceedToCheckoutButton = '#main div.checkout button.disabled';
+    this.disabledProceedToCheckoutButton = '#main div.checkout .disabled';
 
-    this.alertPromoCode = '#promo-code > div > div > span';
+    this.alertPromoCode = '#promo-code div div span';
   }
 
   /*
  Methods
   */
 
+  async getNotificationMessage(page: Page): Promise<string> {
+    return this.getTextContent(page, this.alertMessage);
+  }
+
   /**
    * Get no items in your cart message
    * @param page {Page} Browser tab
@@ -243,6 +261,31 @@ class Cart extends FOBasePage {
     await page.click(this.productPrice(productID));
   }
 
+  /**
+   * Set product quantity
+   * @param page {Page} Browser tab
+   * @param productID {number} ID of the product
+   * @param quantity {number} New quantity of the product
+   * @returns {Promise<number>}
+   */
+  async setProductQuantity(page: Page, productID: number = 1, quantity: number = 1): Promise<number> {
+    const productQuantity: number = parseInt(await this.getAttributeContent(page, this.productQuantity(productID), 'value'), 10);
+
+    if (productQuantity < quantity) {
+      for (let i: number = 1; i < quantity; i++) {
+        await page.click(this.productQuantityScrollUpButton);
+        await page.waitForTimeout(1000);
+      }
+    } else {
+      for (let i: number = productQuantity; i > quantity; i--) {
+        await page.click(this.productQuantityScrollDownButton);
+        await page.waitForTimeout(1000);
+      }
+    }
+
+    return parseInt(await this.getAttributeContent(page, this.productQuantity(productID), 'value'), 10);
+  }
+
   /**
    * Delete product
    * @param page {Page} Browser tab

From 533f5904d48fec5cef7d15a6e847ec6a6dbc004c Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Thu, 25 May 2023 15:26:06 +0200
Subject: [PATCH 0024/1030] Add new test to delete product in FO

---
 .../10_cart/02_cart/01_changeQuantity.ts      |  1 -
 .../10_cart/02_cart/02_deleteProduct.ts       | 83 +++++++++++++++++++
 2 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/02_deleteProduct.ts

diff --git a/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/01_changeQuantity.ts b/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/01_changeQuantity.ts
index 0bcb18e1abcae..4f204f808e05f 100644
--- a/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/01_changeQuantity.ts
+++ b/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/01_changeQuantity.ts
@@ -5,7 +5,6 @@ import testContext from '@utils/testContext';
 // Import FO pages
 import cartPage from '@pages/FO/cart';
 import {homePage} from '@pages/FO/home';
-import checkoutPage from '@pages/FO/checkout';
 
 import {expect} from 'chai';
 import type {BrowserContext, Page} from 'playwright';
diff --git a/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/02_deleteProduct.ts b/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/02_deleteProduct.ts
new file mode 100644
index 0000000000000..b4851bef981d5
--- /dev/null
+++ b/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/02_deleteProduct.ts
@@ -0,0 +1,83 @@
+// Import utils
+import helper from '@utils/helpers';
+import testContext from '@utils/testContext';
+
+// Import FO pages
+import cartPage from '@pages/FO/cart';
+import {homePage as foHomePage, homePage} from '@pages/FO/home';
+
+import {expect} from 'chai';
+import type {BrowserContext, Page} from 'playwright';
+
+const baseContext: string = 'functional_FO_classic_cart_cart_changeQuantity';
+
+describe('FO - cart : Delete product', async () => {
+  let browserContext: BrowserContext;
+  let page: Page;
+
+  before(async function () {
+    browserContext = await helper.createBrowserContext(this.browser);
+    page = await helper.newTab(browserContext);
+  });
+
+  after(async () => {
+    await helper.closeBrowserContext(browserContext);
+  });
+
+  it('should go to FO', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'goToFo', baseContext);
+
+    await homePage.goToFo(page);
+    await homePage.changeLanguage(page, 'en');
+
+    const isHomePage = await homePage.isHomePage(page);
+    await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+  });
+
+  it('should add the first product to cart and proceed to checkout', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'addFirstProductToCart', baseContext);
+
+    await homePage.addProductToCartByQuickView(page, 1, 1);
+    await homePage.proceedToCheckout(page);
+
+    const pageTitle = await cartPage.getPageTitle(page);
+    await expect(pageTitle).to.eq(cartPage.pageTitle);
+  });
+
+  it('should set the quantity 0 in the input', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'setQuantity0', baseContext);
+
+    await cartPage.editProductQuantity(page, 1, 0);
+
+    const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
+    await expect(notificationsNumber).to.be.eq(0);
+  });
+
+  it('should go to home page', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'goToHomePage', baseContext);
+
+    await cartPage.goToHomePage(page);
+
+    const result = await foHomePage.isHomePage(page);
+    await expect(result).to.be.true;
+  });
+
+  it('should add the first product to cart and proceed to checkout', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'addFirstProductToCart1', baseContext);
+
+    await homePage.addProductToCartByQuickView(page, 1, 1);
+    await homePage.proceedToCheckout(page);
+
+    const pageTitle = await cartPage.getPageTitle(page);
+    await expect(pageTitle).to.eq(cartPage.pageTitle);
+  });
+
+  it('should delete the product', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'deleteProduct', baseContext);
+
+    await cartPage.deleteProduct(page, 1);
+
+    const notificationNumber = await cartPage.getCartNotificationsNumber(page);
+    await expect(notificationNumber).to.be.equal(0);
+  });
+});

From 8a095214304afa417592090c91bdc971a4a0039d Mon Sep 17 00:00:00 2001
From: Codencode <info@codencode.it>
Date: Thu, 25 May 2023 16:06:28 +0200
Subject: [PATCH 0025/1030] Update config/smarty.config.inc.php

---
 config/smarty.config.inc.php | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/config/smarty.config.inc.php b/config/smarty.config.inc.php
index dc116e3ded5e0..d8031c2d9f587 100644
--- a/config/smarty.config.inc.php
+++ b/config/smarty.config.inc.php
@@ -98,7 +98,7 @@ function smartyEscape($string, $esc_type = 'html', $char_set = null, $double_enc
 smartyRegisterFunction($smarty, 'modifier', 'addcslashes', 'addcslashes');
 smartyRegisterFunction($smarty, 'modifier', 'addslashes', 'addslashes');
 smartyRegisterFunction($smarty, 'modifier', 'date','date');
-smartyRegisterFunction($smarty, 'modifier', 'end','end');
+smartyRegisterFunction($smarty, 'modifier', 'end', 'smarty_endWithoutReference');
 smartyRegisterFunction($smarty, 'modifier', 'floatval', 'floatval');
 smartyRegisterFunction($smarty, 'modifier', 'htmlentities', 'htmlentities');
 smartyRegisterFunction($smarty, 'modifier', 'intval', 'intval');
@@ -113,6 +113,12 @@ function smartyEscape($string, $esc_type = 'html', $char_set = null, $double_enc
 smartyRegisterFunction($smarty, 'modifier', 'ucfirst', 'ucfirst');
 smartyRegisterFunction($smarty, 'modifier', 'urlencode','urlencode');
 smartyRegisterFunction($smarty, 'modifier', 'htmlspecialchars','htmlspecialchars');
+smartyRegisterFunction($smarty, 'modifier', 'implode', 'implode');
+smartyRegisterFunction($smarty, 'modifier', 'explode', 'explode');
+smartyRegisterFunction($smarty, 'modifier', 'print_r', 'print_r');
+smartyRegisterFunction($smarty, 'modifier', 'var_dump', 'var_dump');
+smartyRegisterFunction($smarty, 'modifier', 'lcfirst', 'lcfirst');
+smartyRegisterFunction($smarty, 'modifier', 'nl2br', 'nl2br');
 
 function smarty_modifier_htmlentitiesUTF8($string)
 {
@@ -213,3 +219,15 @@ function smartyClassnames(array $classnames)
 
     return implode(' ', $enabled_classes);
 }
+
+/**
+ * We add this intermediate method to prevent a warning because end expects its input to be a reference
+ *
+ * @param $arrayValue
+ *
+ * @return false|mixed
+ */
+function smarty_endWithoutReference($arrayValue)
+{
+    return end($arrayValue);
+}

From 4a00f8efe89b7c9f946d8f2ead476fd7003b0cbb Mon Sep 17 00:00:00 2001
From: Codencode <info@codencode.it>
Date: Thu, 25 May 2023 16:59:19 +0200
Subject: [PATCH 0026/1030] Update config/smarty.config.inc.php (fix PHPDoc
 error)

---
 config/smarty.config.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/smarty.config.inc.php b/config/smarty.config.inc.php
index d8031c2d9f587..0a66fed853afc 100644
--- a/config/smarty.config.inc.php
+++ b/config/smarty.config.inc.php
@@ -223,7 +223,7 @@ function smartyClassnames(array $classnames)
 /**
  * We add this intermediate method to prevent a warning because end expects its input to be a reference
  *
- * @param $arrayValue
+ * @param array<mixed> $arrayValue
  *
  * @return false|mixed
  */

From 80e294a575bd6843134a698d14d2b2cb7e0ede7c Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Thu, 25 May 2023 17:23:04 +0200
Subject: [PATCH 0027/1030] Add new test to add promo code in FO

---
 .../10_cart/02_cart/02_deleteProduct.ts       |   2 +-
 .../10_cart/02_cart/03_addPromoCode.ts        | 128 ++++++++++++++++++
 tests/UI/pages/FO/cart/index.ts               |  10 ++
 3 files changed, 139 insertions(+), 1 deletion(-)
 create mode 100644 tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/03_addPromoCode.ts

diff --git a/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/02_deleteProduct.ts b/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/02_deleteProduct.ts
index b4851bef981d5..fd9a833c2f952 100644
--- a/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/02_deleteProduct.ts
+++ b/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/02_deleteProduct.ts
@@ -9,7 +9,7 @@ import {homePage as foHomePage, homePage} from '@pages/FO/home';
 import {expect} from 'chai';
 import type {BrowserContext, Page} from 'playwright';
 
-const baseContext: string = 'functional_FO_classic_cart_cart_changeQuantity';
+const baseContext: string = 'functional_FO_classic_cart_cart_deleteProduct';
 
 describe('FO - cart : Delete product', async () => {
   let browserContext: BrowserContext;
diff --git a/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/03_addPromoCode.ts b/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/03_addPromoCode.ts
new file mode 100644
index 0000000000000..8a9a93bdd15b7
--- /dev/null
+++ b/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/03_addPromoCode.ts
@@ -0,0 +1,128 @@
+// Import utils
+import helper from '@utils/helpers';
+import testContext from '@utils/testContext';
+
+// Import FO pages
+import cartPage from '@pages/FO/cart';
+import {homePage} from '@pages/FO/home';
+
+// Import commonTests
+import {createCartRuleTest, deleteCartRuleTest} from '@commonTests/BO/catalog/cartRule';
+
+import {expect} from 'chai';
+import type {BrowserContext, Page} from 'playwright';
+
+// Import data
+import CartRuleData from '@data/faker/cartRule';
+
+const baseContext: string = 'functional_FO_classic_cart_cart_addPromoCode';
+
+describe('FO - cart : Add promo code', async () => {
+  let browserContext: BrowserContext;
+  let page: Page;
+
+  // Data to create cart rule
+  const newCartRuleData: CartRuleData = new CartRuleData({
+    name: 'reduction',
+    code: 'reduc',
+    discountType: 'Amount',
+    discountAmount: {
+      value: 20,
+      currency: 'EUR',
+      tax: 'Tax included',
+    },
+  });
+
+  // Pre-condition: Create cart rule and apply the discount to 'productWithCartRule'
+  createCartRuleTest(newCartRuleData, baseContext);
+
+  before(async function () {
+    browserContext = await helper.createBrowserContext(this.browser);
+    page = await helper.newTab(browserContext);
+  });
+
+  after(async () => {
+    await helper.closeBrowserContext(browserContext);
+  });
+
+  describe('Check promo code block', async () => {
+    it('should go to FO', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToFo', baseContext);
+
+      await homePage.goToFo(page);
+      await homePage.changeLanguage(page, 'en');
+
+      const isHomePage = await homePage.isHomePage(page);
+      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+    });
+
+    it('should add the first product to cart and proceed to checkout', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'addFirstProductToCart', baseContext);
+
+      await homePage.addProductToCartByQuickView(page, 1, 1);
+      await homePage.proceedToCheckout(page);
+
+      const pageTitle = await cartPage.getPageTitle(page);
+      await expect(pageTitle).to.eq(cartPage.pageTitle);
+    });
+
+    it('should add the promo code and check the total', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'checkTotalAfterDiscount', baseContext);
+
+      await cartPage.addPromoCode(page, newCartRuleData.code);
+
+      const isVisible = await cartPage.isCartRuleNameVisible(page);
+      await expect(isVisible).to.be.true;
+    });
+
+    it('should check the cart rule name', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'checkCartRuleName', baseContext);
+
+      const cartRuleName = await cartPage.getCartRuleName(page);
+      await expect(cartRuleName).to.equal(newCartRuleData.name);
+    });
+
+    it('should check the discount value', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'checkDiscountValue', baseContext);
+
+      const totalBeforeDiscount = await cartPage.getDiscountValue(page);
+      await expect(totalBeforeDiscount).to.eq(-newCartRuleData.discountAmount!.value);
+    });
+
+    it('should set the same promo code and check the error message', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'samePromoCode', baseContext);
+
+      await cartPage.addPromoCode(page, newCartRuleData.code);
+
+      const isVisible = await cartPage.isCartRuleNameVisible(page, 2);
+      await expect(isVisible).to.be.false;
+
+      const voucherErrorText = await cartPage.getCartRuleErrorMessage(page);
+      await expect(voucherErrorText).to.equal(cartPage.cartRuleAlreadyInYourCartErrorText);
+    });
+
+    it('should set a not existing promo code and check the error message', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'notExistingPromoCode', baseContext);
+
+      await cartPage.addPromoCode(page, 'reduction', false);
+
+      const isVisible = await cartPage.isCartRuleNameVisible(page, 2);
+      await expect(isVisible).to.be.false;
+
+      const voucherErrorText = await cartPage.getCartRuleErrorMessage(page);
+      await expect(voucherErrorText).to.equal(cartPage.cartRuleNotExistingErrorText);
+    });
+
+    it('should leave the promo code input blanc and check the error message', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'leavePromoCodeEmpty', baseContext);
+
+      await cartPage.addPromoCode(page, '', false);
+
+      const voucherErrorText = await cartPage.getCartRuleErrorMessage(page);
+      await expect(voucherErrorText).to.equal(cartPage.cartRuleMustEnterVoucherErrorText);
+    });
+  });
+
+  // Post-Condition: Delete cart rule
+  deleteCartRuleTest(newCartRuleData.name, baseContext);
+});
diff --git a/tests/UI/pages/FO/cart/index.ts b/tests/UI/pages/FO/cart/index.ts
index e2b73bd52a00c..7e413a75c9e39 100644
--- a/tests/UI/pages/FO/cart/index.ts
+++ b/tests/UI/pages/FO/cart/index.ts
@@ -16,6 +16,12 @@ class Cart extends FOBasePage {
 
   public readonly cartRuleAlreadyUsedErrorText: string;
 
+  public readonly cartRuleAlreadyInYourCartErrorText: string;
+
+  public readonly cartRuleNotExistingErrorText: string;
+
+  public readonly cartRuleMustEnterVoucherErrorText: string;
+
   public readonly cartRuleLimitUsageErrorText: string;
 
   public readonly cartRuleAlertMessageText: string;
@@ -109,6 +115,9 @@ class Cart extends FOBasePage {
 
     this.pageTitle = 'Cart';
     this.cartRuleAlreadyUsedErrorText = 'This voucher has already been used';
+    this.cartRuleAlreadyInYourCartErrorText = 'This voucher is already in your cart';
+    this.cartRuleNotExistingErrorText = 'This voucher does not exist.';
+    this.cartRuleMustEnterVoucherErrorText = 'You must enter a voucher code.';
     this.cartRuleLimitUsageErrorText = 'You cannot use this voucher anymore (usage limit reached)';
     this.cartRuleAlertMessageText = 'You cannot use this voucher';
     this.alertChooseDeliveryAddressWarningText = 'You must choose a delivery address'
@@ -373,6 +382,7 @@ class Cart extends FOBasePage {
     }
     await this.setValue(page, this.promoInput, code);
     await page.click(this.addPromoCodeButton);
+    await page.waitForTimeout(1000);
   }
 
   /**

From 9ff0ddf793726bb956a96898561155751799aedf Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Thu, 25 May 2023 17:39:51 +0200
Subject: [PATCH 0028/1030] Add some fixes

---
 .../FO/classic/10_cart/02_cart/01_changeQuantity.ts           | 4 ++--
 .../functional/FO/classic/10_cart/02_cart/03_addPromoCode.ts  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/01_changeQuantity.ts b/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/01_changeQuantity.ts
index 4f204f808e05f..efd9643f820a0 100644
--- a/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/01_changeQuantity.ts
+++ b/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/01_changeQuantity.ts
@@ -100,8 +100,8 @@ describe('FO - cart : Change quantity', async () => {
     await expect(notificationsNumber).to.be.eq(64);
   });
 
-  it('should set the quantity 64 in the input', async function () {
-    await testContext.addContextItem(this, 'testIdentifier', 'setQuantity64', baseContext);
+  it('should set \'azerty\' in the input', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'setAZERTY', baseContext);
 
     await cartPage.editProductQuantity(page, 1, 'azerty');
 
diff --git a/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/03_addPromoCode.ts b/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/03_addPromoCode.ts
index 8a9a93bdd15b7..65b1f8f27edf1 100644
--- a/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/03_addPromoCode.ts
+++ b/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/03_addPromoCode.ts
@@ -34,7 +34,7 @@ describe('FO - cart : Add promo code', async () => {
   });
 
   // Pre-condition: Create cart rule and apply the discount to 'productWithCartRule'
-  createCartRuleTest(newCartRuleData, baseContext);
+  createCartRuleTest(newCartRuleData, `${baseContext}_PreTest`);
 
   before(async function () {
     browserContext = await helper.createBrowserContext(this.browser);
@@ -124,5 +124,5 @@ describe('FO - cart : Add promo code', async () => {
   });
 
   // Post-Condition: Delete cart rule
-  deleteCartRuleTest(newCartRuleData.name, baseContext);
+  deleteCartRuleTest(newCartRuleData.name, `${baseContext}_PostTest`);
 });

From 7e882258a5c382d66c8626fe80e6413fe4ada137 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Thu, 25 May 2023 17:46:47 +0200
Subject: [PATCH 0029/1030] Add js doc fot getNotificationMessage method

---
 tests/UI/pages/FO/cart/index.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/UI/pages/FO/cart/index.ts b/tests/UI/pages/FO/cart/index.ts
index 7e413a75c9e39..4475a1857e953 100644
--- a/tests/UI/pages/FO/cart/index.ts
+++ b/tests/UI/pages/FO/cart/index.ts
@@ -179,7 +179,11 @@ class Cart extends FOBasePage {
   /*
  Methods
   */
-
+  /**
+   * Get notification message
+   * @param page {Page} Browser tab
+   * @returns {Promise<string>}
+   */
   async getNotificationMessage(page: Page): Promise<string> {
     return this.getTextContent(page, this.alertMessage);
   }

From fc2675675e0d907ed355cc54a193cbfaafc16f93 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Fri, 26 May 2023 10:13:57 +0200
Subject: [PATCH 0030/1030] Fix ts error

---
 tests/UI/pages/FO/cart/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/UI/pages/FO/cart/index.ts b/tests/UI/pages/FO/cart/index.ts
index 4475a1857e953..0691007b72936 100644
--- a/tests/UI/pages/FO/cart/index.ts
+++ b/tests/UI/pages/FO/cart/index.ts
@@ -268,8 +268,8 @@ class Cart extends FOBasePage {
    * @param quantity {number} New quantity of the product
    * @returns {Promise<void>}
    */
-  async editProductQuantity(page: Page, productID: number, quantity: number): Promise<void> {
-    await this.setValue(page, this.productQuantity(productID), quantity.toString());
+  async editProductQuantity(page: Page, productID: number, quantity: number | string): Promise<void> {
+    await this.setValue(page, this.productQuantity(productID), quantity);
     // click on price to see that its changed
     await page.click(this.productPrice(productID));
   }

From 6e41c573812f4f7d7c6c394a10c85fd13484feb9 Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Tue, 9 May 2023 15:41:42 +0200
Subject: [PATCH 0031/1030] Create CategoriesProviderBuilder and add lazy for
 tagCategoriesProviderService

---
 .../config/services/adapter/data_provider.yml | 12 +++-
 .../Admin/CategoriesProviderBuilder.php       | 56 +++++++++++++++++++
 2 files changed, 65 insertions(+), 3 deletions(-)
 create mode 100644 src/PrestaShopBundle/Service/DataProvider/Admin/CategoriesProviderBuilder.php

diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml b/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml
index 90c44d6409ea7..989e352f27a11 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml
@@ -107,11 +107,17 @@ services:
     calls:
       - [ "setEmployeeId", [ "@=service('prestashop.adapter.legacy.context').getContext().employee?service('prestashop.adapter.legacy.context').getContext().employee.id:0" ] ]
 
-  prestashop.categories_provider:
-    class: PrestaShopBundle\Service\DataProvider\Admin\CategoriesProvider
+  prestashop.categories_provider_builder:
+    class: PrestaShopBundle\Service\DataProvider\Admin\CategoriesProviderBuilder
     arguments:
+      - '@prestashop.adapter.legacy.context'
+      - '@prestashop.core.addon.theme.repository'
       - "%prestashop.addons.categories%"
-      - "@=service('prestashop.adapter.legacy.context').getContext().shop.theme_name?service('prestashop.core.addon.theme.repository').getInstanceByName(service('prestashop.adapter.legacy.context').getContext().shop.theme_name).getModulesToEnable():[]"
+
+  prestashop.categories_provider:
+    lazy: true
+    class: PrestaShopBundle\Service\DataProvider\Admin\CategoriesProvider
+    factory: [ '@prestashop.categories_provider_builder', 'build' ]
 
   prestashop.adapter.data_provider.default_route:
     class: PrestaShop\PrestaShop\Adapter\Routes\DefaultRouteProvider
diff --git a/src/PrestaShopBundle/Service/DataProvider/Admin/CategoriesProviderBuilder.php b/src/PrestaShopBundle/Service/DataProvider/Admin/CategoriesProviderBuilder.php
new file mode 100644
index 0000000000000..826d60eaa0a39
--- /dev/null
+++ b/src/PrestaShopBundle/Service/DataProvider/Admin/CategoriesProviderBuilder.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShopBundle\Service\DataProvider\Admin;
+
+use PrestaShop\PrestaShop\Adapter\LegacyContext;
+use PrestaShop\PrestaShop\Core\Addon\Theme\ThemeRepository;
+
+/**
+ * Provide the categories used to order modules and themes on https://addons.prestashop.com.
+ */
+class CategoriesProviderBuilder
+{
+    private $context;
+    private $themeRepository;
+
+    private $addonsCategories;
+
+    public function __construct(LegacyContext $context, ThemeRepository $themeRepository, array $addonsCategories)
+    {
+        $this->context = $context;
+        $this->themeRepository = $themeRepository;
+        $this->addonsCategories = $addonsCategories;
+    }
+
+    public function build()
+    {
+        $themeName = $this->context->getContext()->shop->theme_name;
+        $modulesTheme = $themeName ? $this->themeRepository->getInstanceByName($themeName)->getModulesToEnable() : [];
+
+        return new CategoriesProvider($this->addonsCategories, $modulesTheme);
+    }
+}

From dc7ac6c92b190afab594cce2e52807ae717136fb Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Fri, 12 May 2023 09:43:07 +0200
Subject: [PATCH 0032/1030] Adding typing, deletion of useless comment

---
 .../DataProvider/Admin/CategoriesProviderBuilder.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/PrestaShopBundle/Service/DataProvider/Admin/CategoriesProviderBuilder.php b/src/PrestaShopBundle/Service/DataProvider/Admin/CategoriesProviderBuilder.php
index 826d60eaa0a39..d2a2a88f2e50b 100644
--- a/src/PrestaShopBundle/Service/DataProvider/Admin/CategoriesProviderBuilder.php
+++ b/src/PrestaShopBundle/Service/DataProvider/Admin/CategoriesProviderBuilder.php
@@ -29,15 +29,11 @@
 use PrestaShop\PrestaShop\Adapter\LegacyContext;
 use PrestaShop\PrestaShop\Core\Addon\Theme\ThemeRepository;
 
-/**
- * Provide the categories used to order modules and themes on https://addons.prestashop.com.
- */
 class CategoriesProviderBuilder
 {
-    private $context;
-    private $themeRepository;
-
-    private $addonsCategories;
+    private LegacyContext $context;
+    private ThemeRepository $themeRepository;
+    private array $addonsCategories;
 
     public function __construct(LegacyContext $context, ThemeRepository $themeRepository, array $addonsCategories)
     {
@@ -46,7 +42,7 @@ public function __construct(LegacyContext $context, ThemeRepository $themeReposi
         $this->addonsCategories = $addonsCategories;
     }
 
-    public function build()
+    public function build(): CategoriesProvider
     {
         $themeName = $this->context->getContext()->shop->theme_name;
         $modulesTheme = $themeName ? $this->themeRepository->getInstanceByName($themeName)->getModulesToEnable() : [];

From 9c42d1fa71a063992809dd287c8a64f655acfd44 Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Fri, 12 May 2023 10:06:39 +0200
Subject: [PATCH 0033/1030] Move CategoriesProviderBuilder into adapter

---
 .../Category}/CategoriesProviderBuilder.php                 | 3 ++-
 .../Resources/config/services/adapter/data_provider.yml     | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)
 rename src/{PrestaShopBundle/Service/DataProvider/Admin => Adapter/Category}/CategoriesProviderBuilder.php (94%)

diff --git a/src/PrestaShopBundle/Service/DataProvider/Admin/CategoriesProviderBuilder.php b/src/Adapter/Category/CategoriesProviderBuilder.php
similarity index 94%
rename from src/PrestaShopBundle/Service/DataProvider/Admin/CategoriesProviderBuilder.php
rename to src/Adapter/Category/CategoriesProviderBuilder.php
index d2a2a88f2e50b..b4ab8e673648e 100644
--- a/src/PrestaShopBundle/Service/DataProvider/Admin/CategoriesProviderBuilder.php
+++ b/src/Adapter/Category/CategoriesProviderBuilder.php
@@ -24,10 +24,11 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
-namespace PrestaShopBundle\Service\DataProvider\Admin;
+namespace PrestaShop\PrestaShop\Adapter\Category;
 
 use PrestaShop\PrestaShop\Adapter\LegacyContext;
 use PrestaShop\PrestaShop\Core\Addon\Theme\ThemeRepository;
+use PrestaShopBundle\Service\DataProvider\Admin\CategoriesProvider;
 
 class CategoriesProviderBuilder
 {
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml b/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml
index 989e352f27a11..6f62683676308 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml
@@ -107,8 +107,8 @@ services:
     calls:
       - [ "setEmployeeId", [ "@=service('prestashop.adapter.legacy.context').getContext().employee?service('prestashop.adapter.legacy.context').getContext().employee.id:0" ] ]
 
-  prestashop.categories_provider_builder:
-    class: PrestaShopBundle\Service\DataProvider\Admin\CategoriesProviderBuilder
+  prestashop.adapter.categories_provider_builder:
+    class: PrestaShop\PrestaShop\Adapter\Category\CategoriesProviderBuilder
     arguments:
       - '@prestashop.adapter.legacy.context'
       - '@prestashop.core.addon.theme.repository'
@@ -117,7 +117,7 @@ services:
   prestashop.categories_provider:
     lazy: true
     class: PrestaShopBundle\Service\DataProvider\Admin\CategoriesProvider
-    factory: [ '@prestashop.categories_provider_builder', 'build' ]
+    factory: [ '@prestashop.adapter.categories_provider_builder', 'build' ]
 
   prestashop.adapter.data_provider.default_route:
     class: PrestaShop\PrestaShop\Adapter\Routes\DefaultRouteProvider

From fe003761af0095f441c383250da4e13470043aad Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Fri, 12 May 2023 10:21:52 +0200
Subject: [PATCH 0034/1030] Add strict_types

---
 src/Adapter/Category/CategoriesProviderBuilder.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Adapter/Category/CategoriesProviderBuilder.php b/src/Adapter/Category/CategoriesProviderBuilder.php
index b4ab8e673648e..25b903d54bd38 100644
--- a/src/Adapter/Category/CategoriesProviderBuilder.php
+++ b/src/Adapter/Category/CategoriesProviderBuilder.php
@@ -24,6 +24,8 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
+declare(strict_types=1);
+
 namespace PrestaShop\PrestaShop\Adapter\Category;
 
 use PrestaShop\PrestaShop\Adapter\LegacyContext;
@@ -32,9 +34,9 @@
 
 class CategoriesProviderBuilder
 {
-    private LegacyContext $context;
-    private ThemeRepository $themeRepository;
-    private array $addonsCategories;
+    private $context;
+    private $themeRepository;
+    private $addonsCategories;
 
     public function __construct(LegacyContext $context, ThemeRepository $themeRepository, array $addonsCategories)
     {

From 8b6459247d54a3268747c2f09690d00c86e904c6 Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Mon, 15 May 2023 12:03:00 +0200
Subject: [PATCH 0035/1030] Update DI definition for CategoriesProviderBuilder
 (FQCN)

---
 .../Resources/config/services/adapter/data_provider.yml      | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml b/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml
index 6f62683676308..51eeb807ae9b9 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml
@@ -107,8 +107,7 @@ services:
     calls:
       - [ "setEmployeeId", [ "@=service('prestashop.adapter.legacy.context').getContext().employee?service('prestashop.adapter.legacy.context').getContext().employee.id:0" ] ]
 
-  prestashop.adapter.categories_provider_builder:
-    class: PrestaShop\PrestaShop\Adapter\Category\CategoriesProviderBuilder
+  PrestaShop\PrestaShop\Adapter\Category\CategoriesProviderBuilder:
     arguments:
       - '@prestashop.adapter.legacy.context'
       - '@prestashop.core.addon.theme.repository'
@@ -117,7 +116,7 @@ services:
   prestashop.categories_provider:
     lazy: true
     class: PrestaShopBundle\Service\DataProvider\Admin\CategoriesProvider
-    factory: [ '@prestashop.adapter.categories_provider_builder', 'build' ]
+    factory: [ '@PrestaShop\PrestaShop\Adapter\Category\CategoriesProviderBuilder', 'build' ]
 
   prestashop.adapter.data_provider.default_route:
     class: PrestaShop\PrestaShop\Adapter\Routes\DefaultRouteProvider

From 6ddf2a7e9935730d4406cb01137340fa9f3363f4 Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Wed, 17 May 2023 11:06:23 +0200
Subject: [PATCH 0036/1030] Remove prestashop.addons.categories in DI

---
 src/Adapter/Category/CategoriesProviderBuilder.php     | 10 ++++++----
 .../DependencyInjection/PrestaShopExtension.php        |  5 -----
 .../config/services/adapter/data_provider.yml          |  1 -
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/Adapter/Category/CategoriesProviderBuilder.php b/src/Adapter/Category/CategoriesProviderBuilder.php
index 25b903d54bd38..8a335d67c13be 100644
--- a/src/Adapter/Category/CategoriesProviderBuilder.php
+++ b/src/Adapter/Category/CategoriesProviderBuilder.php
@@ -28,28 +28,30 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Category;
 
+use PrestaShop\PrestaShop\Adapter\Configuration;
 use PrestaShop\PrestaShop\Adapter\LegacyContext;
 use PrestaShop\PrestaShop\Core\Addon\Theme\ThemeRepository;
+use PrestaShop\PrestaShop\Core\Util\File\YamlParser;
 use PrestaShopBundle\Service\DataProvider\Admin\CategoriesProvider;
 
 class CategoriesProviderBuilder
 {
     private $context;
     private $themeRepository;
-    private $addonsCategories;
 
-    public function __construct(LegacyContext $context, ThemeRepository $themeRepository, array $addonsCategories)
+    public function __construct(LegacyContext $context, ThemeRepository $themeRepository)
     {
         $this->context = $context;
         $this->themeRepository = $themeRepository;
-        $this->addonsCategories = $addonsCategories;
     }
 
     public function build(): CategoriesProvider
     {
+        $yamlParser = new YamlParser((new Configuration())->get('_PS_CACHE_DIR_'));
+        $addonsCategories = $yamlParser->parse(_PS_ROOT_DIR_ . '/app/config' . '/addons/categories.yml');
         $themeName = $this->context->getContext()->shop->theme_name;
         $modulesTheme = $themeName ? $this->themeRepository->getInstanceByName($themeName)->getModulesToEnable() : [];
 
-        return new CategoriesProvider($this->addonsCategories, $modulesTheme);
+        return new CategoriesProvider($addonsCategories['prestashop']['addons']['categories'], $modulesTheme);
     }
 }
diff --git a/src/PrestaShopBundle/DependencyInjection/PrestaShopExtension.php b/src/PrestaShopBundle/DependencyInjection/PrestaShopExtension.php
index 23ab79276986b..0d5cf130a2625 100644
--- a/src/PrestaShopBundle/DependencyInjection/PrestaShopExtension.php
+++ b/src/PrestaShopBundle/DependencyInjection/PrestaShopExtension.php
@@ -41,14 +41,9 @@ class PrestaShopExtension extends Extension
      */
     public function load(array $configs, ContainerBuilder $container)
     {
-        $configuration = new AddOnsConfiguration();
-        $config = $this->processConfiguration($configuration, $configs);
-
         $loader = new YamlFileLoader($container, new FileLocator(dirname(__DIR__) . '/Resources/config'));
         $env = $container->getParameter('kernel.environment');
         $loader->load('services_' . $env . '.yml');
-
-        $container->setParameter('prestashop.addons.categories', $config['addons']['categories']);
     }
 
     /**
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml b/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml
index 51eeb807ae9b9..f490eae3cc918 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml
@@ -111,7 +111,6 @@ services:
     arguments:
       - '@prestashop.adapter.legacy.context'
       - '@prestashop.core.addon.theme.repository'
-      - "%prestashop.addons.categories%"
 
   prestashop.categories_provider:
     lazy: true

From 114c2a31449405dc3ad7d186699e6f1c5c4e0f24 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Fri, 14 Apr 2023 10:55:33 +0200
Subject: [PATCH 0037/1030] Remove deprecated method `setPriorities` in class
 `SpecificPrice`

---
 classes/SpecificPrice.php                     | 34 -------------------
 controllers/admin/AdminProductsController.php | 14 ++++++--
 .../override/AdminProductsController.php      | 15 +++++---
 .../admin/AdminProductsController.php         | 15 +++++---
 4 files changed, 33 insertions(+), 45 deletions(-)

diff --git a/classes/SpecificPrice.php b/classes/SpecificPrice.php
index b3afc6d6d00d1..e4997bafd691c 100644
--- a/classes/SpecificPrice.php
+++ b/classes/SpecificPrice.php
@@ -23,9 +23,6 @@
  * @copyright Since 2007 PrestaShop SA and Contributors
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
-
-use PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Update\SpecificPricePriorityUpdater;
-
 class SpecificPriceCore extends ObjectModel
 {
     public const ORDER_DEFAULT_FROM_QUANTITY = 1;
@@ -579,37 +576,6 @@ public static function getSpecificPrice(
         return self::$_specificPriceCache[$key];
     }
 
-    /**
-     * @deprecated since 8.0 and will be removed in next major version.
-     * @see SpecificPricePriorityUpdater::updateDefaultPriorities()
-     *
-     * @param array $priorities
-     *
-     * @return bool
-     */
-    public static function setPriorities($priorities)
-    {
-        @trigger_error(
-            sprintf(
-                '%s is deprecated since version 8.0. Use %s instead.',
-                __METHOD__,
-                SpecificPricePriorityUpdater::class . '::updateDefaultPriorities()'
-            ),
-            E_USER_DEPRECATED
-        );
-
-        $value = '';
-        if (is_array($priorities)) {
-            foreach ($priorities as $priority) {
-                $value .= pSQL($priority) . ';';
-            }
-        }
-
-        SpecificPrice::deletePriorities();
-
-        return Configuration::updateValue('PS_SPECIFIC_PRICE_PRIORITIES', rtrim($value, ';'));
-    }
-
     /**
      * Truncate the specific price priorities.
      *
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 4648ad9d4ed2e..b13b959a84fac 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -23,7 +23,10 @@
  * @copyright Since 2007 PrestaShop SA and Contributors
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
+
+use PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Update\SpecificPricePriorityUpdater;
 use PrestaShop\PrestaShop\Adapter\SymfonyContainer;
+use PrestaShop\PrestaShop\Core\Exception\CoreException;
 use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
 use PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration;
 
@@ -1067,10 +1070,15 @@ public function processSpecificPricePriorities()
         if (!$priorities = Tools::getValue('specificPricePriority')) {
             $this->errors[] = $this->trans('Please specify priorities.', [], 'Admin.Catalog.Notification');
         } elseif (Tools::isSubmit('specificPricePriorityToAll') && Tools::getValue('specificPricePriorityToAll')) {
-            if (!SpecificPrice::setPriorities($priorities)) {
-                $this->errors[] = $this->trans('An error occurred while updating priorities.', [], 'Admin.Catalog.Notification');
-            } else {
+            $sfContainer = SymfonyContainer::getInstance();
+            /** @var SpecificPricePriorityUpdater $specificPricePriorityUpdater */
+            $specificPricePriorityUpdater = $sfContainer->get(SpecificPricePriorityUpdater::class);
+
+            try {
+                $specificPricePriorityUpdater->updateDefaultPriorities($priorities);
                 $this->confirmations[] = 'The price rule has successfully updated';
+            } catch (CoreException $e) {
+                $this->errors[] = $this->trans('An error occurred while updating priorities.', [], 'Admin.Catalog.Notification');
             }
         } elseif (!SpecificPrice::setSpecificPriority((int) $obj->id, $priorities)) {
             $this->errors[] = $this->trans('An error occurred while setting priorities.', [], 'Admin.Catalog.Notification');
diff --git a/tests/Resources/modules_tests/override/AdminProductsController.php b/tests/Resources/modules_tests/override/AdminProductsController.php
index a9d440da05900..d0b57ea4293f4 100644
--- a/tests/Resources/modules_tests/override/AdminProductsController.php
+++ b/tests/Resources/modules_tests/override/AdminProductsController.php
@@ -1,6 +1,9 @@
 <?php
 
+use PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Update\SpecificPricePriorityUpdater;
+use PrestaShop\PrestaShop\Adapter\SymfonyContainer;
 use PrestaShop\PrestaShop\Core\Addon\Module\ModuleManagerBuilder;
+use PrestaShop\PrestaShop\Core\Exception\CoreException;
 
 class AdminProductsController extends AdminProductsControllerCore
 {
@@ -890,10 +893,14 @@ public function processSpecificPricePriorities()
         if (!$priorities = Tools::getValue('specificPricePriority')) {
             $this->errors[] = Tools::displayError('Please specify priorities.');
         } elseif (Tools::isSubmit('specificPricePriorityToAll')) {
-            if (!SpecificPrice::setPriorities($priorities)) {
-                $this->errors[] = Tools::displayError('An error occurred while updating priorities.');
-            } else {
-                $this->confirmations[] = $this->l('The price rule has successfully updated');
+            $sfContainer = SymfonyContainer::getInstance();
+            $specificPricePriorityUpdater = $sfContainer->get(SpecificPricePriorityUpdater::class);
+
+            try {
+                $specificPricePriorityUpdater->updateDefaultPriorities($priorities);
+                $this->confirmations[] = 'The price rule has successfully updated';
+            } catch (CoreException $e) {
+                $this->errors[] = $this->trans('An error occurred while updating priorities.', [], 'Admin.Catalog.Notification');
             }
         } elseif (!SpecificPrice::setSpecificPriority((int) $obj->id, $priorities)) {
             $this->errors[] = Tools::displayError('An error occurred while setting priorities.');
diff --git a/tests/Resources/modules_tests/pscsx32412/override/controllers/admin/AdminProductsController.php b/tests/Resources/modules_tests/pscsx32412/override/controllers/admin/AdminProductsController.php
index 3a3f078aa7dce..a9e5c3aefd554 100644
--- a/tests/Resources/modules_tests/pscsx32412/override/controllers/admin/AdminProductsController.php
+++ b/tests/Resources/modules_tests/pscsx32412/override/controllers/admin/AdminProductsController.php
@@ -24,7 +24,10 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
+use PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Update\SpecificPricePriorityUpdater;
+use PrestaShop\PrestaShop\Adapter\SymfonyContainer;
 use PrestaShop\PrestaShop\Core\Addon\Module\ModuleManagerBuilder;
+use PrestaShop\PrestaShop\Core\Exception\CoreException;
 
 class AdminProductsController extends AdminProductsControllerCore
 {
@@ -895,10 +898,14 @@ public function processSpecificPricePriorities()
         if (!$priorities = Tools::getValue('specificPricePriority')) {
             $this->errors[] = Tools::displayError('Please specify priorities.');
         } elseif (Tools::isSubmit('specificPricePriorityToAll')) {
-            if (!SpecificPrice::setPriorities($priorities)) {
-                $this->errors[] = Tools::displayError('An error occurred while updating priorities.');
-            } else {
-                $this->confirmations[] = $this->l('The price rule has successfully updated');
+            $sfContainer = SymfonyContainer::getInstance();
+            $specificPricePriorityUpdater = $sfContainer->get(SpecificPricePriorityUpdater::class);
+
+            try {
+                $specificPricePriorityUpdater->updateDefaultPriorities($priorities);
+                $this->confirmations[] = 'The price rule has successfully updated';
+            } catch (CoreException $e) {
+                $this->errors[] = $this->trans('An error occurred while updating priorities.', [], 'Admin.Catalog.Notification');
             }
         } elseif (!SpecificPrice::setSpecificPriority((int) $obj->id, $priorities)) {
             $this->errors[] = Tools::displayError('An error occurred while setting priorities.');

From a91669cbbc0a932ad723847ffee572aa553a1876 Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Fri, 26 May 2023 11:27:06 +0200
Subject: [PATCH 0038/1030] Update CategoriesProviderBuilder constructor and
 service definition

---
 .../Category/CategoriesProviderBuilder.php    | 19 +++++++++----------
 .../config/services/adapter/data_provider.yml |  3 +++
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/Adapter/Category/CategoriesProviderBuilder.php b/src/Adapter/Category/CategoriesProviderBuilder.php
index 8a335d67c13be..35116cabd764a 100644
--- a/src/Adapter/Category/CategoriesProviderBuilder.php
+++ b/src/Adapter/Category/CategoriesProviderBuilder.php
@@ -28,7 +28,6 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Category;
 
-use PrestaShop\PrestaShop\Adapter\Configuration;
 use PrestaShop\PrestaShop\Adapter\LegacyContext;
 use PrestaShop\PrestaShop\Core\Addon\Theme\ThemeRepository;
 use PrestaShop\PrestaShop\Core\Util\File\YamlParser;
@@ -36,19 +35,19 @@
 
 class CategoriesProviderBuilder
 {
-    private $context;
-    private $themeRepository;
-
-    public function __construct(LegacyContext $context, ThemeRepository $themeRepository)
-    {
-        $this->context = $context;
-        $this->themeRepository = $themeRepository;
+    public function __construct(
+        private readonly LegacyContext $context,
+        private readonly ThemeRepository $themeRepository,
+        private readonly string $cacheDir,
+        private readonly string $rootDir,
+        private readonly string $categoriesConfigPath,
+    ) {
     }
 
     public function build(): CategoriesProvider
     {
-        $yamlParser = new YamlParser((new Configuration())->get('_PS_CACHE_DIR_'));
-        $addonsCategories = $yamlParser->parse(_PS_ROOT_DIR_ . '/app/config' . '/addons/categories.yml');
+        $yamlParser = new YamlParser($this->cacheDir);
+        $addonsCategories = $yamlParser->parse($this->rootDir . $this->categoriesConfigPath);
         $themeName = $this->context->getContext()->shop->theme_name;
         $modulesTheme = $themeName ? $this->themeRepository->getInstanceByName($themeName)->getModulesToEnable() : [];
 
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml b/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml
index f490eae3cc918..8738befdca794 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml
@@ -111,6 +111,9 @@ services:
     arguments:
       - '@prestashop.adapter.legacy.context'
       - '@prestashop.core.addon.theme.repository'
+      - !php/const _PS_CACHE_DIR_
+      - !php/const _PS_ROOT_DIR_
+      - '/app/config/addons/categories.yml'
 
   prestashop.categories_provider:
     lazy: true

From 48d880562b7974b98a42b20dc3a4582521bb9f1f Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Tue, 30 May 2023 16:33:41 +0200
Subject: [PATCH 0039/1030] Functional Tests : Faceted search module -
 Uninstall and delete module

---
 .../01_modules/08_uploadModule.ts             |   5 +-
 .../04_uninstallAndDeleteModule.ts            | 163 ++++++++++++++++++
 tests/UI/data/demo/modules.ts                 |   6 +
 tests/UI/data/faker/module.ts                 |  11 +-
 tests/UI/data/types/module.d.ts               |   1 +
 .../pages/BO/modules/moduleManager/index.ts   |  40 ++++-
 tests/UI/pages/FO/category/index.ts           |  14 ++
 7 files changed, 232 insertions(+), 8 deletions(-)
 create mode 100644 tests/UI/campaigns/modules/ps_facetedsearch/01_installation/04_uninstallAndDeleteModule.ts

diff --git a/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/01_modules/08_uploadModule.ts b/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/01_modules/08_uploadModule.ts
index f081abde485d5..726d3fad6996b 100644
--- a/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/01_modules/08_uploadModule.ts
+++ b/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/01_modules/08_uploadModule.ts
@@ -22,9 +22,6 @@ describe('BO - Modules - Module Manager : Upload module', async () => {
   let browserContext: BrowserContext;
   let page: Page;
 
-  const link: string = 'https://github.com/PrestaShop/keycloak_connector_demo/releases/download/v1.0.2/'
-    + 'keycloak_connector_demo.zip';
-
   // before and after functions
   before(async function () {
     browserContext = await helper.createBrowserContext(this.browser);
@@ -43,7 +40,7 @@ describe('BO - Modules - Module Manager : Upload module', async () => {
   it(`should download the zip of the module '${Modules.keycloak.name}'`, async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'downloadModule', baseContext);
 
-    await files.downloadFile(link, 'module.zip');
+    await files.downloadFile(Modules.keycloak.releaseZip, 'module.zip');
 
     const found = await files.doesFileExist('module.zip');
     await expect(found).to.be.true;
diff --git a/tests/UI/campaigns/modules/ps_facetedsearch/01_installation/04_uninstallAndDeleteModule.ts b/tests/UI/campaigns/modules/ps_facetedsearch/01_installation/04_uninstallAndDeleteModule.ts
new file mode 100644
index 0000000000000..c4a971bb07e6b
--- /dev/null
+++ b/tests/UI/campaigns/modules/ps_facetedsearch/01_installation/04_uninstallAndDeleteModule.ts
@@ -0,0 +1,163 @@
+// Import utils
+import files from '@utils/files';
+import helper from '@utils/helpers';
+import testContext from '@utils/testContext';
+
+// Import commonTests
+import loginCommon from '@commonTests/BO/loginBO';
+
+// Import pages
+// Import BO pages
+import dashboardPage from '@pages/BO/dashboard';
+import {moduleManager as moduleManagerPage} from '@pages/BO/modules/moduleManager';
+// Import FO pages
+import categoryPage from '@pages/FO/category';
+import {homePage} from '@pages/FO/home';
+
+// Import data
+import Categories from '@data/demo/categories';
+import Modules from '@data/demo/modules';
+
+import {expect} from 'chai';
+import type {BrowserContext, Page} from 'playwright';
+
+const baseContext: string = 'modules_ps_facetedsearch_installation_uninstallAndDeleteModule';
+
+describe('Faceted search module - Uninstall and delete module', async () => {
+  let browserContext: BrowserContext;
+  let page: Page;
+
+  // before and after functions
+  before(async function () {
+    browserContext = await helper.createBrowserContext(this.browser);
+    page = await helper.newTab(browserContext);
+  });
+
+  after(async () => {
+    await helper.closeBrowserContext(browserContext);
+    await files.deleteFile('module.zip');
+  });
+
+  it('should login in BO', async function () {
+    await loginCommon.loginBO(this, page);
+  });
+
+  it('should go to \'Modules > Module Manager\' page', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'goToModuleManagerPage', baseContext);
+
+    await dashboardPage.goToSubMenu(
+      page,
+      dashboardPage.modulesParentLink,
+      dashboardPage.moduleManagerLink,
+    );
+    await moduleManagerPage.closeSfToolBar(page);
+
+    const pageTitle = await moduleManagerPage.getPageTitle(page);
+    await expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
+  });
+
+  it(`should search the module ${Modules.psFacetedSearch.name}`, async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'searchModule', baseContext);
+
+    const isModuleVisible = await moduleManagerPage.searchModule(page, Modules.psFacetedSearch);
+    await expect(isModuleVisible).to.be.true;
+  });
+
+  it('should display the uninstall modal and cancel it', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'resetModuleAndCancel', baseContext);
+
+    const textResult = await moduleManagerPage.setActionInModule(page, Modules.psFacetedSearch, 'uninstall', true);
+    await expect(textResult).to.eq('');
+
+    const isModuleVisible = await moduleManagerPage.isModuleVisible(page, Modules.psFacetedSearch);
+    await expect(isModuleVisible).to.be.true;
+
+    const isModalVisible = await moduleManagerPage.isModalActionVisible(page, Modules.psFacetedSearch, 'uninstall');
+    await expect(isModalVisible).to.be.false;
+
+    const dirExists = await files.doesFileExist(`${files.getRootPath()}/modules/${Modules.psFacetedSearch.tag}/`);
+    await expect(dirExists).to.be.true;
+  });
+
+  it('should uninstall the module', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'resetModule', baseContext);
+
+    const successMessage = await moduleManagerPage.setActionInModule(page, Modules.psFacetedSearch, 'uninstall', false, true);
+    await expect(successMessage).to.eq(moduleManagerPage.uninstallModuleSuccessMessage(Modules.psFacetedSearch.tag));
+
+    // Check the button at the right of the module is displaying "Install"
+    const mainAction = await moduleManagerPage.getMainActionInModule(page, Modules.psFacetedSearch);
+    await expect(mainAction).to.be.eq('install');
+
+    // Check the directory `modules/Modules.psFacetedSearch.tag`
+    const dirExists = await files.doesFileExist(`${files.getRootPath()}/modules/${Modules.psFacetedSearch.tag}/`);
+    await expect(dirExists).to.be.false;
+  });
+
+  it('should go to Front Office', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'goToFo', baseContext);
+
+    page = await moduleManagerPage.viewMyShop(page);
+    await homePage.changeLanguage(page, 'en');
+
+    const isHomePage = await homePage.isHomePage(page);
+    await expect(isHomePage).to.be.true;
+  });
+
+  it('should go to the category Page', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'goToCategoryPage', baseContext);
+
+    await homePage.goToCategory(page, Categories.clothes.id);
+
+    const pageTitle = await homePage.getPageTitle(page);
+    await expect(pageTitle).to.equal(Categories.clothes.name);
+  });
+
+  it(`should check that ${Modules.psFacetedSearch.name} is not present`, async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'checkModuleNotPresent', baseContext);
+
+    const hasFilters = await categoryPage.hasSearchFilters(page);
+    await expect(hasFilters).to.be.false;
+  });
+
+  describe(`POST-CONDITION : Install the module ${Modules.psFacetedSearch.name}`, async () => {
+    it('should go back to Back Office', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'returnToBo', baseContext);
+
+      page = await categoryPage.closePage(browserContext, page, 0);
+
+      const pageTitle = await moduleManagerPage.getPageTitle(page);
+      await expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
+    });
+
+    it(`should download the zip of the module '${Modules.psFacetedSearch.name}'`, async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'downloadModule', baseContext);
+
+      await files.downloadFile(Modules.psFacetedSearch.releaseZip, 'module.zip');
+
+      const found = await files.doesFileExist('module.zip');
+      await expect(found).to.be.true;
+    });
+
+    it(`should upload the module '${Modules.psFacetedSearch.name}'`, async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'uploadModule', baseContext);
+
+      const successMessage = await moduleManagerPage.uploadModule(page, 'module.zip');
+      await expect(successMessage).to.eq(moduleManagerPage.uploadModuleSuccessMessage);
+    });
+
+    it('should close upload module modal', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'closeModal', baseContext);
+
+      const isModalVisible = await moduleManagerPage.closeUploadModuleModal(page);
+      await expect(isModalVisible).to.be.false;
+    });
+
+    it(`should search the module '${Modules.psFacetedSearch.name}'`, async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'checkModulePresent', baseContext);
+
+      const isModuleVisible = await moduleManagerPage.searchModule(page, Modules.psFacetedSearch);
+      await expect(isModuleVisible, 'Module is not visible!').to.be.true;
+    });
+  });
+});
diff --git a/tests/UI/data/demo/modules.ts b/tests/UI/data/demo/modules.ts
index 00b2f4634d274..a653c9cd6c429 100644
--- a/tests/UI/data/demo/modules.ts
+++ b/tests/UI/data/demo/modules.ts
@@ -13,6 +13,11 @@ export default {
     tag: 'ps_emailsubscription',
     name: 'Newsletter subscription',
   }),
+  psFacetedSearch: new ModuleData({
+    tag: 'ps_facetedsearch',
+    name: 'Faceted search',
+    releaseZip: 'https://github.com/PrestaShop/ps_facetedsearch/releases/download/v3.12.1/ps_facetedsearch.zip',
+  }),
   contactForm: new ModuleData({
     tag: 'contactform',
     name: 'Contact form',
@@ -32,5 +37,6 @@ export default {
   keycloak: new ModuleData({
     tag: 'keycloak_connector_demo',
     name: 'Keycloak OAuth2 connector demo',
+    releaseZip: 'https://github.com/PrestaShop/keycloak_connector_demo/releases/download/v1.0.2/keycloak_connector_demo.zip',
   }),
 };
diff --git a/tests/UI/data/faker/module.ts b/tests/UI/data/faker/module.ts
index e09e147907ffd..c7483f1803eca 100644
--- a/tests/UI/data/faker/module.ts
+++ b/tests/UI/data/faker/module.ts
@@ -8,15 +8,20 @@ export default class ModuleData {
 
   public readonly name: string;
 
+  public readonly releaseZip: string;
+
   /**
-   * Constructor for class HookData
+   * Constructor for class ModuleData
    * @param valueToCreate {ModuleDataCreator} Could be used to force the value of some members
    */
   constructor(valueToCreate: ModuleDataCreator = {}) {
-    /** @type {string} Name of the currency */
+    /** @type {string} Technical Name of the module */
     this.tag = valueToCreate.tag || '';
 
-    /** @type {string} Name of the currency */
+    /** @type {string} Name of the module */
     this.name = valueToCreate.name || '';
+
+    /** @type {string} Release URL */
+    this.releaseZip = valueToCreate.releaseZip || '';
   }
 }
diff --git a/tests/UI/data/types/module.d.ts b/tests/UI/data/types/module.d.ts
index b0dcd14989109..0b76c28563b2d 100644
--- a/tests/UI/data/types/module.d.ts
+++ b/tests/UI/data/types/module.d.ts
@@ -1,6 +1,7 @@
 type ModuleDataCreator = {
   tag?: string
   name?: string
+  releaseZip?: string
 }
 
 export default ModuleDataCreator;
diff --git a/tests/UI/pages/BO/modules/moduleManager/index.ts b/tests/UI/pages/BO/modules/moduleManager/index.ts
index c083696018d5b..08cde89d54d32 100644
--- a/tests/UI/pages/BO/modules/moduleManager/index.ts
+++ b/tests/UI/pages/BO/modules/moduleManager/index.ts
@@ -90,6 +90,8 @@ class ModuleManager extends BOBasePage {
 
   private readonly modalConfirmCancel: (moduleTag: string, action: string) => string;
 
+  private readonly modalConfirmUninstallForceDeletion: (moduleTag: string) => string;
+
   private readonly statusDropdownDiv: string;
 
   private readonly statusDropdownMenu: string;
@@ -184,6 +186,8 @@ class ModuleManager extends BOBasePage {
       + ` div.modal-footer a.module_action_modal_${action}`;
     this.modalConfirmCancel = (moduleTag: string, action: string) => `${this.modalConfirmAction(moduleTag, action)}`
       + ' div.modal-footer input[type="button"][data-dismiss="modal"]';
+    this.modalConfirmUninstallForceDeletion = (moduleTag: string) => `${this.modalConfirmAction(moduleTag, 'uninstall')}`
+      + ' #force_deletion';
   }
 
   /*
@@ -403,9 +407,16 @@ class ModuleManager extends BOBasePage {
    * @param module {ModuleData} Module data to install/uninstall
    * @param action {string} Action install/uninstall/enable/disable/reset
    * @param cancel {boolean} Cancel the action
+   * @param forceDeletion {boolean} Delete module folder after uninstall
    * @return {Promise<string | null>}
    */
-  async setActionInModule(page: Page, module: ModuleData, action: string, cancel: boolean = false): Promise<string | null> {
+  async setActionInModule(
+    page: Page,
+    module: ModuleData,
+    action: string,
+    cancel: boolean = false,
+    forceDeletion: boolean = false,
+  ): Promise<string | null> {
     await this.closeGrowlMessage(page);
 
     if (await this.elementVisible(page, this.actionModuleButton(module.tag, action), 1000)) {
@@ -423,6 +434,9 @@ class ModuleManager extends BOBasePage {
         await this.elementNotVisible(page, this.modalConfirmAction(module.tag, action), 10000);
         return '';
       }
+      if (action === 'uninstall' && forceDeletion) {
+        await page.click(this.modalConfirmUninstallForceDeletion(module.tag));
+      }
       if (action === 'disable' || action === 'uninstall' || action === 'reset') {
         await this.waitForSelectorAndClick(page, this.modalConfirmButton(module.tag, action));
       }
@@ -431,6 +445,30 @@ class ModuleManager extends BOBasePage {
     return this.getGrowlMessageContent(page);
   }
 
+  /**
+   Returns the main action module action
+   * @param page {Page} Browser tab
+   * @param module {ModuleData} Module data
+   */
+  async getMainActionInModule(page: Page, module: ModuleData): Promise<string> {
+    const actions: string[] = [
+      'enable',
+      'disable',
+      'install',
+      'configure',
+    ];
+
+    for (let i: number = 0; i < actions.length; i++) {
+      const action = actions[i];
+
+      if (await this.elementVisible(page, this.actionModuleButton(module.tag, action), 1000)) {
+        return action;
+      }
+    }
+
+    return '';
+  }
+
   /**
    * Returns if the action module modal is visible
    * @param page {Page} Browser tab
diff --git a/tests/UI/pages/FO/category/index.ts b/tests/UI/pages/FO/category/index.ts
index 6cec40f158246..b7f540a38310b 100644
--- a/tests/UI/pages/FO/category/index.ts
+++ b/tests/UI/pages/FO/category/index.ts
@@ -63,6 +63,8 @@ class Category extends FOBasePage {
 
   private readonly categoryDescription: string;
 
+  private readonly searchFilters: string;
+
   /**
    * @constructs
    * Setting up texts and selectors to use on category page
@@ -107,6 +109,9 @@ class Category extends FOBasePage {
     this.quickViewModalDiv = 'div[id*=\'quickview-modal\']';
     this.quickViewModalProductImageCover = `${this.quickViewModalDiv} div.product-cover picture`;
     this.categoryDescription = '#category-description';
+
+    // Filter
+    this.searchFilters = '#search_filters_wrapper';
   }
 
   /* Methods */
@@ -339,6 +344,15 @@ class Category extends FOBasePage {
 
     return null;
   }
+
+  /**
+   * Return
+   * @param page {Page} Browser tab
+   * @return {Promise<boolean>}
+   */
+  async hasSearchFilters(page: Page): Promise<boolean> {
+    return this.elementVisible(page, this.searchFilters);
+  }
 }
 
 export default new Category();

From 666ad2c7caca524e375306d1620d269de4e26693 Mon Sep 17 00:00:00 2001
From: tleon <thomas.leone@prestashop.com>
Date: Tue, 30 May 2023 16:43:16 +0200
Subject: [PATCH 0040/1030] fix(ci): template update package fix table 8.0.x

---
 .../workflows/cron_update_modules/script.php  | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/cron_update_modules/script.php b/.github/workflows/cron_update_modules/script.php
index 3b5c3f22e301a..85abde4fe36b7 100644
--- a/.github/workflows/cron_update_modules/script.php
+++ b/.github/workflows/cron_update_modules/script.php
@@ -28,7 +28,8 @@
 
 const VENDOR_NAME = 'prestashop/';
 
-function fetchVersionComposerLock(): array {
+function fetchVersionComposerLock(): array
+{
     $composerLock = file_get_contents('composer.lock');
     $composerLock = json_decode($composerLock, true);
 
@@ -45,7 +46,7 @@ function fetchVersionComposerLock(): array {
 
 // Fetch modules from the repository PrestaShop/prestashop-modules
 $hCurl = curl_init();
-curl_setopt($hCurl, CURLOPT_USERAGENT,'PrestaShop/CronUpdateModules');
+curl_setopt($hCurl, CURLOPT_USERAGENT, 'PrestaShop/CronUpdateModules');
 curl_setopt($hCurl, CURLOPT_URL, 'https://api.github.com/repos/PrestaShop/prestashop-modules/git/trees/master');
 curl_setopt($hCurl, CURLOPT_RETURNTRANSFER, 1);
 $gitJSON = curl_exec($hCurl);
@@ -60,7 +61,7 @@ function fetchVersionComposerLock(): array {
     echo 'Empty return from the API';
     die();
 }
-$modulesGit = array_filter($gitJSON['tree'], function(array $val) {
+$modulesGit = array_filter($gitJSON['tree'], function (array $val) {
     return $val['type'] === 'commit';
 });
 
@@ -103,7 +104,7 @@ function fetchVersionComposerLock(): array {
     if ($moduleVersion === $moduleComposerLockAfterUpdate[$moduleName]) {
         continue;
     }
-    $pullRequestBodyBumpModules .= 'Module `' . $moduleName. '`: Bump version from `' . $moduleVersion
+    $pullRequestBodyBumpModules .= 'Module `' . $moduleName . '`: Bump version from `' . $moduleVersion
         . '` to `' . $moduleComposerLockAfterUpdate[$moduleName] . '`<br />';
 }
 
@@ -114,15 +115,15 @@ function fetchVersionComposerLock(): array {
 
 file_put_contents(
     'cron_php_update_modules.txt',
-    '| Questions         | Answers' . PHP_EOL
-        . '| ----------------- | -----------------' . PHP_EOL
-        . '| Branch?           | develop' . PHP_EOL
-        . '| Description?      | ' . $pullRequestBodyBumpModules . PHP_EOL
+    '| Questions         | Answers |' . PHP_EOL
+        . '| ----------------- | ----------------- |' . PHP_EOL
+        . '| Branch?           | develop |' . PHP_EOL
+        . '| Description?      | ' . $pullRequestBodyBumpModules . ' |' . PHP_EOL
         . '| Type?             | improvement' . PHP_EOL
-        . '| Category?         | CO' . PHP_EOL
-        . '| BC breaks?        | no' . PHP_EOL
-        . '| Deprecations?     | no' . PHP_EOL
-        . '| Fixed ticket?     | N/A' . PHP_EOL
-        . '| How to test?      | N/A' . PHP_EOL
-        . '| Possible impacts? | N/A' . PHP_EOL
+        . '| Category?         | CO |' . PHP_EOL
+        . '| BC breaks?        | no |' . PHP_EOL
+        . '| Deprecations?     | no |' . PHP_EOL
+        . '| Fixed ticket?     | N/A |' . PHP_EOL
+        . '| How to test?      | N/A |' . PHP_EOL
+        . '| Possible impacts? | N/A |' . PHP_EOL
 );

From 63f5ae12fac948eb62a162937f3298c20eec4fa7 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Wed, 31 May 2023 11:38:53 +0200
Subject: [PATCH 0041/1030] Functional Tests : Improved JSDoc

---
 tests/UI/pages/FO/category/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/UI/pages/FO/category/index.ts b/tests/UI/pages/FO/category/index.ts
index b7f540a38310b..2f2f2b3d00ff0 100644
--- a/tests/UI/pages/FO/category/index.ts
+++ b/tests/UI/pages/FO/category/index.ts
@@ -346,7 +346,7 @@ class Category extends FOBasePage {
   }
 
   /**
-   * Return
+   * Return if search filters are visible
    * @param page {Page} Browser tab
    * @return {Promise<boolean>}
    */

From a3933d28743351f3fd35d433b5170f5dc605ee0a Mon Sep 17 00:00:00 2001
From: tleon <thomas.leone@prestashop.com>
Date: Wed, 31 May 2023 17:30:16 +0200
Subject: [PATCH 0042/1030] fix(ci) backport fixes to github action template
 from develop

---
 .../workflows/cron_update_modules/script.php  | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/cron_update_modules/script.php b/.github/workflows/cron_update_modules/script.php
index 85abde4fe36b7..1a6bd00ec0a2c 100644
--- a/.github/workflows/cron_update_modules/script.php
+++ b/.github/workflows/cron_update_modules/script.php
@@ -28,8 +28,7 @@
 
 const VENDOR_NAME = 'prestashop/';
 
-function fetchVersionComposerLock(): array
-{
+function fetchVersionComposerLock(): array {
     $composerLock = file_get_contents('composer.lock');
     $composerLock = json_decode($composerLock, true);
 
@@ -46,7 +45,7 @@ function fetchVersionComposerLock(): array
 
 // Fetch modules from the repository PrestaShop/prestashop-modules
 $hCurl = curl_init();
-curl_setopt($hCurl, CURLOPT_USERAGENT, 'PrestaShop/CronUpdateModules');
+curl_setopt($hCurl, CURLOPT_USERAGENT,'PrestaShop/CronUpdateModules');
 curl_setopt($hCurl, CURLOPT_URL, 'https://api.github.com/repos/PrestaShop/prestashop-modules/git/trees/master');
 curl_setopt($hCurl, CURLOPT_RETURNTRANSFER, 1);
 $gitJSON = curl_exec($hCurl);
@@ -61,7 +60,7 @@ function fetchVersionComposerLock(): array
     echo 'Empty return from the API';
     die();
 }
-$modulesGit = array_filter($gitJSON['tree'], function (array $val) {
+$modulesGit = array_filter($gitJSON['tree'], function(array $val) {
     return $val['type'] === 'commit';
 });
 
@@ -104,7 +103,7 @@ function fetchVersionComposerLock(): array
     if ($moduleVersion === $moduleComposerLockAfterUpdate[$moduleName]) {
         continue;
     }
-    $pullRequestBodyBumpModules .= 'Module `' . $moduleName . '`: Bump version from `' . $moduleVersion
+    $pullRequestBodyBumpModules .= 'Module `' . $moduleName. '`: Bump version from `' . $moduleVersion
         . '` to `' . $moduleComposerLockAfterUpdate[$moduleName] . '`<br />';
 }
 
@@ -113,17 +112,22 @@ function fetchVersionComposerLock(): array
     exit();
 }
 
+$branch = $argv[1] ?? 'develop';
+
+$prTable = '| Questions         | Answers' . "|\r\n";
+$prTable .= '| ----------------- | -------------------------------------------------------' . "|\r\n";
+$prTable .= '| Branch?           | ' . $branch . "|\r\n";
+$prTable .= '| Description?      | Updated PrestaShop composer packages, details below.' . "|\r\n";
+$prTable .= '| Type?             | improvement' . "|\r\n";
+$prTable .= '| Category?         | CO' . "|\r\n";
+$prTable .= '| BC breaks?        | no' . "|\r\n";
+$prTable .= '| Deprecations?     | no' . "|\r\n";
+$prTable .= '| Fixed ticket?     | N/A' . "|\r\n";
+$prTable .= '| How to test?      | N/A' . "|\r\n";
+$prTable .= "\r\n\r\n";
+$prTable .= $pullRequestBodyBumpModules;
+
 file_put_contents(
     'cron_php_update_modules.txt',
-    '| Questions         | Answers |' . PHP_EOL
-        . '| ----------------- | ----------------- |' . PHP_EOL
-        . '| Branch?           | develop |' . PHP_EOL
-        . '| Description?      | ' . $pullRequestBodyBumpModules . ' |' . PHP_EOL
-        . '| Type?             | improvement' . PHP_EOL
-        . '| Category?         | CO |' . PHP_EOL
-        . '| BC breaks?        | no |' . PHP_EOL
-        . '| Deprecations?     | no |' . PHP_EOL
-        . '| Fixed ticket?     | N/A |' . PHP_EOL
-        . '| How to test?      | N/A |' . PHP_EOL
-        . '| Possible impacts? | N/A |' . PHP_EOL
+    $prTable
 );

From 4598c8d3b8525a861b44208a414badbfd2aba10b Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Wed, 31 May 2023 18:05:00 +0200
Subject: [PATCH 0043/1030] Fix sort attribute name

---
 admin-dev/themes/new-theme/js/app/widgets/ps-table/ps-sort.vue  | 2 +-
 .../BO/03_catalog/08_stocks/movement/02_sortAndPagination.ts    | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 tests/UI/campaigns/functional/BO/03_catalog/08_stocks/movement/02_sortAndPagination.ts

diff --git a/admin-dev/themes/new-theme/js/app/widgets/ps-table/ps-sort.vue b/admin-dev/themes/new-theme/js/app/widgets/ps-table/ps-sort.vue
index 5cb0f806c71f5..c05a0355ccca9 100644
--- a/admin-dev/themes/new-theme/js/app/widgets/ps-table/ps-sort.vue
+++ b/admin-dev/themes/new-theme/js/app/widgets/ps-table/ps-sort.vue
@@ -25,7 +25,7 @@
 <template>
   <div
     class="ps-sortable-column"
-    data-sort-col-name="id_product"
+    :data-sort-col-name="this.order"
     :data-sort-is-current="isCurrent"
     :data-sort-direction="sortDirection"
     @click="sortToggle"
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/movement/02_sortAndPagination.ts b/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/movement/02_sortAndPagination.ts
new file mode 100644
index 0000000000000..e69de29bb2d1d

From 725d57abc10c037ea37fdf271dac2fb5d6447d2c Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Wed, 31 May 2023 18:05:34 +0200
Subject: [PATCH 0044/1030] Add new test to sort and pagination movements table

---
 .../03_catalog/08_stocks/02_updateQuantity.ts |   2 +-
 .../movement/02_sortAndPagination.ts          | 164 ++++++++++++++++++
 .../BO/catalog/stocks/movements/index.ts      |  95 +++++++++-
 3 files changed, 258 insertions(+), 3 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/02_updateQuantity.ts b/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/02_updateQuantity.ts
index 7092ef408f528..4afbd578bf53c 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/02_updateQuantity.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/02_updateQuantity.ts
@@ -126,7 +126,7 @@ describe('BO - Catalog - Stocks : Update Quantity', async () => {
         const numberOfMovements = await movementsPage.getNumberOfElementInGrid(page);
         await expect(numberOfMovements).to.be.at.least(1);
 
-        const productName = await movementsPage.getTextColumnFromTable(page, numberOfMovements, 'name');
+        const productName = await movementsPage.getTextColumnFromTable(page, numberOfMovements, 'product_name');
         await expect(productName).to.equal(productStock.name);
 
         // Check movement quantity
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/movement/02_sortAndPagination.ts b/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/movement/02_sortAndPagination.ts
index e69de29bb2d1d..a6b96cd446fd1 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/movement/02_sortAndPagination.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/movement/02_sortAndPagination.ts
@@ -0,0 +1,164 @@
+// Import utils
+import helper from '@utils/helpers';
+import testContext from '@utils/testContext';
+
+// Import commonTests
+import loginCommon from '@commonTests/BO/loginBO';
+
+// Import pages
+import stocksPage from '@pages/BO/catalog/stocks';
+import dashboardPage from '@pages/BO/dashboard';
+import movementsPage from '@pages/BO/catalog/stocks/movements';
+
+import {expect} from 'chai';
+import type {BrowserContext, Page} from 'playwright';
+import basicHelper from "@utils/basicHelper";
+
+const baseContext: string = 'functional_BO_catalog_stocks_movements_sortAndPagination';
+
+describe('BO - Catalog - Movements : Sort and pagination', async () => {
+  let browserContext: BrowserContext;
+  let page: Page;
+
+  // before and after functions
+  before(async function () {
+    browserContext = await helper.createBrowserContext(this.browser);
+    page = await helper.newTab(browserContext);
+  });
+
+  after(async () => {
+    await helper.closeBrowserContext(browserContext);
+  });
+
+  it('should login in BO', async function () {
+    await loginCommon.loginBO(this, page);
+  });
+
+  describe('PRE-TEST: Bulk edit the quantity of products in the first page of stocks table', async () => {
+    it('should go to \'Catalog > Stocks\' page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToStocksPage', baseContext);
+
+      await dashboardPage.goToSubMenu(
+        page,
+        dashboardPage.catalogParentLink,
+        dashboardPage.stocksLink,
+      );
+      await stocksPage.closeSfToolBar(page);
+
+      const pageTitle = await stocksPage.getPageTitle(page);
+      await expect(pageTitle).to.contains(stocksPage.pageTitle);
+    });
+
+    /*it('should bulk edit quantity of all products in the first page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'bulkEditQuantity', baseContext);
+
+      // Update quantity and check successful message
+      const updateMessage = await stocksPage.bulkEditQuantityWithInput(page, 301);
+      await expect(updateMessage).to.contains(stocksPage.successfulUpdateMessage);
+    });*/
+  });
+
+  describe('Sort movements table', async () => {
+    it('should go to Movements page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToMovementsPage', baseContext);
+
+      await stocksPage.goToSubTabMovements(page);
+
+      const pageTitle = await movementsPage.getPageTitle(page);
+      await expect(pageTitle).to.contains(movementsPage.pageTitle);
+    });
+
+    const sortTests = [
+      {args: {testIdentifier: 'sortByDateDesc', sortBy: 'date_add', sortDirection: 'desc'}},
+      {args: {testIdentifier: 'sortByDateAsc', sortBy: 'date_add', sortDirection: 'asc'}},
+      {args: {testIdentifier: 'sortByProductIDAsc', sortBy: 'product_id', sortDirection: 'asc', isNumber: true}},
+      {args: {testIdentifier: 'sortByProductIDDesc', sortBy: 'product_id', sortDirection: 'desc', isNumber: true}},
+      {args: {testIdentifier: 'sortByProductNameAsc', sortBy: 'product_name', sortDirection: 'asc'}},
+      {args: {testIdentifier: 'sortByProductNameDesc', sortBy: 'product_name', sortDirection: 'desc'}},
+      {args: {testIdentifier: 'sortByReferenceAsc', sortBy: 'reference', sortDirection: 'asc'}},
+      {args: {testIdentifier: 'sortByReferenceDesc', sortBy: 'reference', sortDirection: 'desc'}},
+    ];
+
+    sortTests.forEach((test) => {
+      it(`should sort by '${test.args.sortBy}' '${test.args.sortDirection}' and check result`, async function () {
+        await testContext.addContextItem(this, 'testIdentifier', test.args.testIdentifier, baseContext);
+
+        const nonSortedTable = await movementsPage.getAllRowsColumnContent(page, test.args.sortBy);
+
+        await movementsPage.sortTable(page, test.args.sortBy, test.args.sortDirection);
+
+        const sortedTable = await movementsPage.getAllRowsColumnContent(page, test.args.sortBy);
+
+        if (test.args.isNumber) {
+          const nonSortedTableFloat: number[] = nonSortedTable.map((text: string): number => parseInt(text, 10));
+          const sortedTableFloat: number[] = sortedTable.map((text: string): number => parseInt(text, 10));
+
+          const expectedResult: number[] = await basicHelper.sortArrayNumber(nonSortedTableFloat);
+
+          if (test.args.sortDirection === 'asc') {
+            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+          } else {
+            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+          }
+        } else {
+          const expectedResult: string[] = await basicHelper.sortArray(nonSortedTable);
+
+          if (test.args.sortDirection === 'asc') {
+            await expect(sortedTable).to.deep.equal(expectedResult);
+          } else {
+            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+          }
+        }
+      });
+    });
+  });
+
+  describe('Bulk edit the quantity of products in the second page of stocks table', async () => {
+    it('should go to \'Catalog > Stocks\' page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToStocksPage2', baseContext);
+
+      await dashboardPage.goToSubMenu(
+        page,
+        dashboardPage.catalogParentLink,
+        dashboardPage.stocksLink,
+      );
+
+      const pageTitle = await stocksPage.getPageTitle(page);
+      await expect(pageTitle).to.contains(stocksPage.pageTitle);
+    });
+
+    it('should go to the second page and bulk edit the quantity of all products', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToSecondPage', baseContext);
+
+      await stocksPage.paginateTo(page, 2);
+
+      const updateMessage = await stocksPage.bulkEditQuantityWithInput(page, 301);
+      await expect(updateMessage).to.contains(stocksPage.successfulUpdateMessage);
+    });
+  });
+
+  describe('Pagination next and previous', async () => {
+    it('should go to Movements page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToMovementsPage2', baseContext);
+
+      await stocksPage.goToSubTabMovements(page);
+
+      const pageTitle = await movementsPage.getPageTitle(page);
+      await expect(pageTitle).to.contains(movementsPage.pageTitle);
+    });
+
+    it('should go to the next page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToNextPage', baseContext);
+
+      const pageNumber = await movementsPage.paginateTo(page, 2);
+      await expect(pageNumber).to.eq(2);
+    });
+
+    it('should go back to the first page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goBackToFirstPage', baseContext);
+
+      const pageNumber = await movementsPage.paginateTo(page, 1);
+      await expect(pageNumber).to.eq(1);
+    });
+  });
+});
diff --git a/tests/UI/pages/BO/catalog/stocks/movements/index.ts b/tests/UI/pages/BO/catalog/stocks/movements/index.ts
index f7d135eccbadc..b1d216cb57e1e 100644
--- a/tests/UI/pages/BO/catalog/stocks/movements/index.ts
+++ b/tests/UI/pages/BO/catalog/stocks/movements/index.ts
@@ -26,14 +26,30 @@ class Movements extends BOBasePage {
 
   private readonly tableRow: (row: number) => string;
 
+  private readonly tableProductId: (row: number) => string;
+
   private readonly tableProductNameColumn: (row: number) => string;
 
   private readonly tableProductReferenceColumn: (row: number) => string;
 
+  private readonly tableProductDateColumn: (row: number) => string;
+
   private readonly tableQuantityColumn: (row: number) => string;
 
+  private readonly tableHead: string;
+
+  private readonly sortColumnDiv: (column: string) => string;
+
+  private readonly sortColumnSpanButton: (column: string) => string;
+
   private readonly productListLoading: string;
 
+  private readonly paginationList: string;
+
+  private readonly paginationListItem: string;
+
+  private readonly paginationListItemLink: (id: number) => string;
+
   /**
    * @constructs
    * Setting up texts and selectors to use on movements page
@@ -56,12 +72,24 @@ class Movements extends BOBasePage {
     this.tableBody = `${this.gridTable} tbody`;
     this.tableRows = `${this.tableBody} tr`;
     this.tableRow = (row: number) => `${this.tableRows}:nth-child(${row})`;
+    this.tableProductId = (row: number) => `${this.tableRow(row)} td:nth-child(1)`;
     this.tableProductNameColumn = (row: number) => `${this.tableRow(row)} td:nth-child(2) div.media-body p`;
     this.tableProductReferenceColumn = (row: number) => `${this.tableRow(row)} td:nth-child(3)`;
     this.tableQuantityColumn = (row: number) => `${this.tableRow(row)} td:nth-child(5) span.qty-number`;
+    this.tableProductDateColumn = (row: number) => `${this.tableRow(row)} td:nth-child(6)`;
+
+    // Sort Selectors
+    this.tableHead = `${this.gridTable} thead`;
+    this.sortColumnDiv = (column: string) => `${this.tableHead} div.ps-sortable-column[data-sort-col-name='${column}']`;
+    this.sortColumnSpanButton = (column: string) => `${this.sortColumnDiv(column)} span.ps-sort`;
 
     // Loader
     this.productListLoading = `${this.tableRow(1)} td:nth-child(1) div.ps-loader`;
+
+    // Pagination
+    this.paginationList = 'nav ul.pagination';
+    this.paginationListItem = `${this.paginationList} li.page-item`;
+    this.paginationListItemLink = (id: number) => `${this.paginationListItem}:nth-child(${id}) a`;
   }
 
   /* Header methods */
@@ -100,12 +128,20 @@ class Movements extends BOBasePage {
    */
   async getTextColumnFromTable(page: Page, row: number, column: string): Promise<string> {
     switch (column) {
-      case 'name':
-        return this.getTextContent(page, this.tableProductNameColumn(row));
+      case 'product_id':
+        return this.getTextContent(page, this.tableProductId(row));
+      case 'product_name':
+        // @ts-ignore
+        return page.evaluate(
+          (selector) => document.querySelector(selector)!.childNodes[0].textContent,
+          this.tableProductNameColumn(row),
+        );
       case 'reference':
         return this.getTextContent(page, this.tableProductReferenceColumn(row));
       case 'quantity':
         return (await this.getTextContent(page, this.tableQuantityColumn(row))).replace(' ', '');
+      case 'date_add':
+        return this.getTextContent(page, this.tableProductDateColumn(row));
       default:
         throw new Error(`${column} was not find as column in this table`);
     }
@@ -119,6 +155,61 @@ class Movements extends BOBasePage {
   async getNumberOfElementInGrid(page: Page): Promise<number> {
     return (await page.$$(this.tableRows)).length;
   }
+
+  /**
+   * Get content from all rows
+   * @param page {Page} Browser tab
+   * @param column {string} Column name to get all rows content
+   * @return {Promise<Array<string>>}
+   */
+  async getAllRowsColumnContent(page: Page, column: string): Promise<string[]> {
+    await this.waitForHiddenSelector(page, this.productListLoading);
+    const rowsNumber = await this.getNumberOfElementInGrid(page);
+    const allRowsContentTable: string[] = [];
+
+    for (let i = 1; i <= rowsNumber; i++) {
+      const rowContent = await this.getTextColumnFromTable(page, i, column);
+      allRowsContentTable.push(rowContent);
+    }
+
+    return allRowsContentTable;
+  }
+
+  /**
+   * Sort table by clicking on column name
+   * @param page {Page} Browser tab
+   * @param sortBy {string} Column to sort with
+   * @param sortDirection {string} Sort direction asc or desc
+   * @return {Promise<void>}
+   */
+  async sortTable(page: Page, sortBy: string, sortDirection: string): Promise<void> {
+    await this.waitForHiddenSelector(page, this.productListLoading);
+    const sortColumnDiv = `${this.sortColumnDiv(sortBy)}[data-sort-direction='${sortDirection}']`;
+    const sortColumnSpanButton = this.sortColumnSpanButton(sortBy);
+
+    let i: number = 0;
+    while (await this.elementNotVisible(page, sortColumnDiv, 2000) && i < 2) {
+      await this.waitForSelectorAndClick(page, sortColumnSpanButton);
+      i += 1;
+    }
+
+    await this.waitForHiddenSelector(page, this.productListLoading);
+  }
+
+  /**
+   * Paginate to page
+   * @param page {Page} Browser tab
+   * @param pageNumber {number} Value of page to go
+   * @return {Promise<number>}
+   */
+  async paginateTo(page: Page, pageNumber: number = 1): Promise<number> {
+    await page.click(this.paginationListItemLink(pageNumber));
+    if (await this.elementVisible(page, this.productListLoading, 1000)) {
+      await this.waitForHiddenSelector(page, this.productListLoading);
+    }
+
+    return this.getNumberFromText(page, `${this.paginationListItem}.active`);
+  }
 }
 
 export default new Movements();

From 8cd56aab67a73a7314bb611b2f912914061c4a0c Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Wed, 31 May 2023 18:10:22 +0200
Subject: [PATCH 0045/1030] Add some fixes

---
 .../movement/02_sortAndPagination.ts          | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/movement/02_sortAndPagination.ts b/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/movement/02_sortAndPagination.ts
index a6b96cd446fd1..6a5539309cdb0 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/movement/02_sortAndPagination.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/movement/02_sortAndPagination.ts
@@ -1,6 +1,7 @@
 // Import utils
 import helper from '@utils/helpers';
 import testContext from '@utils/testContext';
+import basicHelper from '@utils/basicHelper';
 
 // Import commonTests
 import loginCommon from '@commonTests/BO/loginBO';
@@ -12,7 +13,6 @@ import movementsPage from '@pages/BO/catalog/stocks/movements';
 
 import {expect} from 'chai';
 import type {BrowserContext, Page} from 'playwright';
-import basicHelper from "@utils/basicHelper";
 
 const baseContext: string = 'functional_BO_catalog_stocks_movements_sortAndPagination';
 
@@ -49,13 +49,13 @@ describe('BO - Catalog - Movements : Sort and pagination', async () => {
       await expect(pageTitle).to.contains(stocksPage.pageTitle);
     });
 
-    /*it('should bulk edit quantity of all products in the first page', async function () {
+    it('should bulk edit quantity of all products in the first page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'bulkEditQuantity', baseContext);
 
       // Update quantity and check successful message
       const updateMessage = await stocksPage.bulkEditQuantityWithInput(page, 301);
       await expect(updateMessage).to.contains(stocksPage.successfulUpdateMessage);
-    });*/
+    });
   });
 
   describe('Sort movements table', async () => {
@@ -71,8 +71,22 @@ describe('BO - Catalog - Movements : Sort and pagination', async () => {
     const sortTests = [
       {args: {testIdentifier: 'sortByDateDesc', sortBy: 'date_add', sortDirection: 'desc'}},
       {args: {testIdentifier: 'sortByDateAsc', sortBy: 'date_add', sortDirection: 'asc'}},
-      {args: {testIdentifier: 'sortByProductIDAsc', sortBy: 'product_id', sortDirection: 'asc', isNumber: true}},
-      {args: {testIdentifier: 'sortByProductIDDesc', sortBy: 'product_id', sortDirection: 'desc', isNumber: true}},
+      {
+        args: {
+          testIdentifier: 'sortByProductIDAsc',
+          sortBy: 'product_id',
+          sortDirection: 'asc',
+          isNumber: true,
+        },
+      },
+      {
+        args: {
+          testIdentifier: 'sortByProductIDDesc',
+          sortBy: 'product_id',
+          sortDirection: 'desc',
+          isNumber: true,
+        },
+      },
       {args: {testIdentifier: 'sortByProductNameAsc', sortBy: 'product_name', sortDirection: 'asc'}},
       {args: {testIdentifier: 'sortByProductNameDesc', sortBy: 'product_name', sortDirection: 'desc'}},
       {args: {testIdentifier: 'sortByReferenceAsc', sortBy: 'reference', sortDirection: 'asc'}},

From 6b3d87004879cf626e31511daac1e7551f18b868 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Thu, 1 Jun 2023 10:19:07 +0200
Subject: [PATCH 0046/1030] Add some fixes to the scenario

---
 .../BO/03_catalog/08_stocks/02_updateQuantity.ts   |  2 +-
 .../08_stocks/movement/02_sortAndPagination.ts     | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/02_updateQuantity.ts b/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/02_updateQuantity.ts
index 4afbd578bf53c..39a51ed5c441d 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/02_updateQuantity.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/02_updateQuantity.ts
@@ -127,7 +127,7 @@ describe('BO - Catalog - Stocks : Update Quantity', async () => {
         await expect(numberOfMovements).to.be.at.least(1);
 
         const productName = await movementsPage.getTextColumnFromTable(page, numberOfMovements, 'product_name');
-        await expect(productName).to.equal(productStock.name);
+        await expect(productName).to.contain(productStock.name);
 
         // Check movement quantity
         const movementQuantity = await movementsPage.getTextColumnFromTable(page, numberOfMovements, 'quantity');
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/movement/02_sortAndPagination.ts b/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/movement/02_sortAndPagination.ts
index 6a5539309cdb0..a6b64a0a04755 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/movement/02_sortAndPagination.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/movement/02_sortAndPagination.ts
@@ -13,6 +13,7 @@ import movementsPage from '@pages/BO/catalog/stocks/movements';
 
 import {expect} from 'chai';
 import type {BrowserContext, Page} from 'playwright';
+import Products from "@data/demo/products";
 
 const baseContext: string = 'functional_BO_catalog_stocks_movements_sortAndPagination';
 
@@ -49,9 +50,11 @@ describe('BO - Catalog - Movements : Sort and pagination', async () => {
       await expect(pageTitle).to.contains(stocksPage.pageTitle);
     });
 
-    it('should bulk edit quantity of all products in the first page', async function () {
+    it(`should bulk edit the quantity of the product ${Products.demo_8.name}'`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'bulkEditQuantity', baseContext);
 
+      await stocksPage.simpleFilter(page, Products.demo_8.name);
+
       // Update quantity and check successful message
       const updateMessage = await stocksPage.bulkEditQuantityWithInput(page, 301);
       await expect(updateMessage).to.contains(stocksPage.successfulUpdateMessage);
@@ -127,7 +130,7 @@ describe('BO - Catalog - Movements : Sort and pagination', async () => {
     });
   });
 
-  describe('Bulk edit the quantity of products in the second page of stocks table', async () => {
+  describe('Bulk edit the quantity of products in the the 2 pages of stocks table', async () => {
     it('should go to \'Catalog > Stocks\' page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'goToStocksPage2', baseContext);
 
@@ -141,6 +144,13 @@ describe('BO - Catalog - Movements : Sort and pagination', async () => {
       await expect(pageTitle).to.contains(stocksPage.pageTitle);
     });
 
+    it('should bulk edit the quantity of all products in the first page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToSecondPage', baseContext);
+
+      const updateMessage = await stocksPage.bulkEditQuantityWithInput(page, 301);
+      await expect(updateMessage).to.contains(stocksPage.successfulUpdateMessage);
+    });
+
     it('should go to the second page and bulk edit the quantity of all products', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'goToSecondPage', baseContext);
 

From dc5f102fcd2b6871ecaefb1baec2cb0707d75943 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Wed, 31 May 2023 11:28:37 +0200
Subject: [PATCH 0047/1030] Functional Tests : API : External Auth Server -
 Resource Endpoint

---
 tests/UI/README.md                            |  13 +-
 .../01_authorizationEndpoint.ts               |   2 +-
 .../02_resourceEndpoint.ts                    | 186 ++++++++++++++++++
 .../commonTests/BO/modules/moduleManager.ts   | 134 +++++++++++++
 .../BO/modules/keycloakConnectorDemo/index.ts |  10 +-
 .../BO/modules/moduleConfiguration/index.ts   |   2 +-
 tests/UI/types/global.d.ts                    |   3 +-
 tests/UI/utils/globals.ts                     |   3 +-
 tests/UI/utils/keycloakHelper.ts              |   2 +-
 9 files changed, 341 insertions(+), 14 deletions(-)
 create mode 100644 tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts
 create mode 100644 tests/UI/commonTests/BO/modules/moduleManager.ts

diff --git a/tests/UI/README.md b/tests/UI/README.md
index 5307bd03b34fa..d57d1ad79845a 100755
--- a/tests/UI/README.md
+++ b/tests/UI/README.md
@@ -48,12 +48,13 @@ npm install
 
 ### Keycloak parameters
 
-| Parameter           | Description                                                                              |
-|---------------------|------------------------------------------------------------------------------------------|
-| KEYCLOAK_SERVER     | The server for Keycloak (default to **`http://127.0.0.1:8003`**)                         |
-| KEYCLOAK_ADMIN_USER | The admin user for connecting to Keycloak (default to **`admin`**)                       |
-| KEYCLOAK_ADMIN_PASS | The admin password for connecting to Keycloak (default to **`admin`**)                   |
-| KEYCLOAK_CLIENT_ID  | The Client ID for using in PrestaShop & Keycloak (default to **`prestashop_client_id`**) |
+| Parameter             | Description                                                                              |
+|-----------------------|------------------------------------------------------------------------------------------|
+| KEYCLOAK_URL_EXTERNAL | The external URL for Keycloak (default to **`http://127.0.0.1:8003`**) (outside Docker)  |
+| KEYCLOAK_URL_INTERNAL | The internal URL for Keycloak (default to **`http://keycloak:8080`**) (inside Docker)    |
+| KEYCLOAK_ADMIN_USER   | The admin user for connecting to Keycloak (default to **`admin`**)                       |
+| KEYCLOAK_ADMIN_PASS   | The admin password for connecting to Keycloak (default to **`admin`**)                   |
+| KEYCLOAK_CLIENT_ID    | The Client ID for using in PrestaShop & Keycloak (default to **`prestashop_client_id`**) |
 
 ### Playwright parameters
 
diff --git a/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/01_authorizationEndpoint.ts b/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/01_authorizationEndpoint.ts
index 66dad47093578..4714ab9e8d35a 100644
--- a/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/01_authorizationEndpoint.ts
+++ b/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/01_authorizationEndpoint.ts
@@ -20,7 +20,7 @@ describe('API : External Auth Server - Authorization Endpoint', async () => {
     });
     if (!global.GENERATE_FAILED_STEPS) {
       apiContextKeycloak = await request.newContext({
-        baseURL: global.keycloakConfig.keycloakServer,
+        baseURL: global.keycloakConfig.keycloakExternalUrl,
         // @todo : Remove it when Puppeteer will accept self signed certificates
         ignoreHTTPSErrors: true,
       });
diff --git a/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts b/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts
new file mode 100644
index 0000000000000..ff35f20b40af6
--- /dev/null
+++ b/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts
@@ -0,0 +1,186 @@
+import api from '@utils/api';
+import helpers from '@utils/helpers';
+import keycloakHelper from '@utils/keycloakHelper';
+import testContext from '@utils/testContext';
+
+import loginCommon from '@commonTests/BO/loginBO';
+import {installModule, uninstallModule} from '@commonTests/BO/modules/moduleManager';
+
+import dashboardPage from '@pages/BO/dashboard';
+import keycloakConnectorDemo from '@pages/BO/modules/keycloakConnectorDemo';
+import {moduleManager as moduleManagerPage} from '@pages/BO/modules/moduleManager';
+
+import Modules from '@data/demo/modules';
+
+import {expect} from 'chai';
+import type {APIRequestContext} from 'playwright';
+import {
+  APIResponse, BrowserContext, Page, request,
+} from 'playwright';
+
+const baseContext: string = 'functional_API_clientCredentialGrantFlow_externalAuthServer_resourceEndpoint';
+
+describe('API : External Auth Server - Resource Endpoint', async () => {
+  // Browser
+  let browserContext: BrowserContext;
+  let page: Page;
+  // API
+  let apiContext: APIRequestContext;
+  let accessTokenKeycloak: string;
+  let accessTokenExpiredKeycloak: string;
+
+  before(async function () {
+    browserContext = await helpers.createBrowserContext(this.browser);
+    page = await helpers.newTab(browserContext);
+
+    apiContext = await helpers.createAPIContext(global.BO.URL);
+
+    if (!global.GENERATE_FAILED_STEPS) {
+      const apiContextKeycloak: APIRequestContext = await request.newContext({
+        baseURL: global.keycloakConfig.keycloakExternalUrl,
+        // @todo : Remove it when Puppeteer will accept self signed certificates
+        ignoreHTTPSErrors: true,
+      });
+
+      const clientSecretKeycloak: string = await keycloakHelper.createClient(
+        global.keycloakConfig.keycloakClientId,
+        'PrestaShop Client ID',
+        false,
+        true,
+      );
+      await expect(clientSecretKeycloak.length).to.be.gt(0);
+
+      const apiResponse: APIResponse = await apiContextKeycloak.post('realms/master/protocol/openid-connect/token', {
+        form: {
+          client_id: global.keycloakConfig.keycloakClientId,
+          client_secret: clientSecretKeycloak,
+          grant_type: 'client_credentials',
+        },
+      });
+      await expect(apiResponse.status()).to.eq(200);
+
+      const jsonResponse = await apiResponse.json();
+      await expect(jsonResponse).to.have.property('access_token');
+      await expect(jsonResponse.access_token).to.be.a('string');
+
+      accessTokenKeycloak = jsonResponse.access_token;
+      accessTokenExpiredKeycloak = api.setAccessTokenAsExpired(accessTokenKeycloak);
+    }
+  });
+
+  after(async () => {
+    await helpers.closeBrowserContext(browserContext);
+
+    if (!global.GENERATE_FAILED_STEPS) {
+      const isRemoved: boolean = await keycloakHelper.removeClient(global.keycloakConfig.keycloakClientId);
+      await expect(isRemoved).to.be.true;
+    }
+  });
+
+  installModule(Modules.keycloak, `${baseContext}_preTest_1`);
+
+  describe('Resource Endpoint', async () => {
+    it('should login in BO', async function () {
+      await loginCommon.loginBO(this, page);
+    });
+
+    it('should go to \'Modules > Module Manager\' page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToModuleManagerPage', baseContext);
+
+      await dashboardPage.goToSubMenu(
+        page,
+        dashboardPage.modulesParentLink,
+        dashboardPage.moduleManagerLink,
+      );
+      await moduleManagerPage.closeSfToolBar(page);
+
+      const pageTitle = await moduleManagerPage.getPageTitle(page);
+      await expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
+    });
+
+    it(`should search the module '${Modules.keycloak.name}'`, async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'searchModule', baseContext);
+
+      const isModuleVisible = await moduleManagerPage.searchModule(page, Modules.keycloak);
+      await expect(isModuleVisible, 'Module is not visible!').to.be.true;
+    });
+
+    it(`should go to the configuration page of the module '${Modules.keycloak.name}'`, async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToConfigurationPage', baseContext);
+
+      await moduleManagerPage.goToConfigurationPage(page, Modules.keycloak.tag);
+
+      const pageTitle = await keycloakConnectorDemo.getPageTitle(page);
+      await expect(pageTitle).to.eq(keycloakConnectorDemo.pageTitle);
+    });
+
+    it('should define the Keycloak Realm endpoint', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'setKeycloakRealmEndpoint', baseContext);
+
+      const textResult = await keycloakConnectorDemo.setKeycloakEndpoint(
+        page,
+        `${global.keycloakConfig.keycloakInternalUrl}/realms/master`,
+      );
+      await expect(textResult).to.be.eq(keycloakConnectorDemo.successfulUpdateMessage);
+    });
+
+    it('should request the endpoint /admin-dev/new-api/hook-status/1 without access token', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'requestEndpointWithoutAccessToken', baseContext);
+
+      const apiResponse = await apiContext.get('new-api/hook-status/1');
+      await expect(apiResponse.status()).to.eq(401);
+      await expect(api.hasResponseHeader(apiResponse, 'WWW-Authenticate')).to.be.true;
+      await expect(api.getResponseHeader(apiResponse, 'WWW-Authenticate')).to.be.eq('Bearer');
+    });
+
+    // @todo : https://github.com/PrestaShop/PrestaShop/issues/32768
+    it.skip('should request the endpoint /admin-dev/new-api/hook-status/1 with invalid access token', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'requestEndpointWithInvalidAccessToken', baseContext);
+
+      const apiResponse = await apiContext.get('new-api/hook-status/1', {
+        headers: {
+          Authorization: 'Bearer INVALIDTOKEN',
+        },
+      });
+      await expect(apiResponse.status()).to.eq(401);
+      await expect(api.hasResponseHeader(apiResponse, 'WWW-Authenticate')).to.be.true;
+      await expect(api.getResponseHeader(apiResponse, 'WWW-Authenticate')).to.be.eq('Bearer');
+    });
+
+    it('should request the endpoint /admin-dev/new-api/hook-status/1 with expired access token', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'requestEndpointWithExpiredAccessToken', baseContext);
+
+      const apiResponse = await apiContext.get('new-api/hook-status/1', {
+        headers: {
+          Authorization: `Bearer ${accessTokenExpiredKeycloak}`,
+        },
+      });
+
+      await expect(apiResponse.status()).to.eq(401);
+      await expect(api.hasResponseHeader(apiResponse, 'WWW-Authenticate')).to.be.true;
+      await expect(api.getResponseHeader(apiResponse, 'WWW-Authenticate')).to.be.eq('Bearer');
+    });
+
+    it('should request the endpoint /admin-dev/new-api/hook-status/1 with valid access token', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'requestEndpointWithValidAccessToken', baseContext);
+
+      const apiResponse = await apiContext.get('new-api/hook-status/1', {
+        headers: {
+          Authorization: `Bearer ${accessTokenKeycloak}`,
+        },
+      });
+
+      await expect(apiResponse.status()).to.eq(200);
+      await expect(api.hasResponseHeader(apiResponse, 'Content-Type')).to.be.true;
+      await expect(api.getResponseHeader(apiResponse, 'Content-Type')).to.contains('application/ld+json');
+
+      const jsonResponse = await apiResponse.json();
+      await expect(jsonResponse).to.have.property('id');
+      await expect(jsonResponse.id).to.be.a('number');
+      await expect(jsonResponse).to.have.property('active');
+      await expect(jsonResponse.active).to.be.a('boolean');
+    });
+  });
+
+  uninstallModule(Modules.keycloak, `${baseContext}_postTest_1`);
+});
diff --git a/tests/UI/commonTests/BO/modules/moduleManager.ts b/tests/UI/commonTests/BO/modules/moduleManager.ts
new file mode 100644
index 0000000000000..72bd77c2980cf
--- /dev/null
+++ b/tests/UI/commonTests/BO/modules/moduleManager.ts
@@ -0,0 +1,134 @@
+import files from '@utils/files';
+import helper from '@utils/helpers';
+import testContext from '@utils/testContext';
+
+import loginCommon from '@commonTests/BO/loginBO';
+
+import dashboardPage from '@pages/BO/dashboard';
+import {moduleManager as moduleManagerPage} from '@pages/BO/modules/moduleManager';
+
+import Modules from '@data/demo/modules';
+import ModuleData from '@data/faker/module';
+
+import {expect} from 'chai';
+import type {BrowserContext, Page} from 'playwright';
+
+function installModule(module: ModuleData, baseContext: string = 'commonTests-installHummingbird'): void {
+  describe(`Install module ${module.name}`, async () => {
+    let browserContext: BrowserContext;
+    let page: Page;
+
+    // before and after functions
+    before(async function () {
+      browserContext = await helper.createBrowserContext(this.browser);
+      page = await helper.newTab(browserContext);
+    });
+
+    after(async () => {
+      await helper.closeBrowserContext(browserContext);
+      await files.deleteFile('module.zip');
+    });
+
+    it('should login in BO', async function () {
+      await loginCommon.loginBO(this, page);
+    });
+
+    it(`should download the zip of the module '${module.name}'`, async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'downloadModule', baseContext);
+
+      await files.downloadFile(module.releaseZip, 'module.zip');
+
+      const found = await files.doesFileExist('module.zip');
+      await expect(found).to.be.true;
+    });
+
+    it('should go to \'Modules > Module Manager\' page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToModuleManagerPage', baseContext);
+
+      await dashboardPage.goToSubMenu(
+        page,
+        dashboardPage.modulesParentLink,
+        dashboardPage.moduleManagerLink,
+      );
+      await moduleManagerPage.closeSfToolBar(page);
+
+      const pageTitle = await moduleManagerPage.getPageTitle(page);
+      await expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
+    });
+
+    it(`should upload the module '${module.name}'`, async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'uploadModule', baseContext);
+
+      const successMessage = await moduleManagerPage.uploadModule(page, 'module.zip');
+      await expect(successMessage).to.eq(moduleManagerPage.uploadModuleSuccessMessage);
+    });
+
+    it('should close upload module modal', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'closeModal', baseContext);
+
+      const isModalVisible = await moduleManagerPage.closeUploadModuleModal(page);
+      await expect(isModalVisible).to.be.true;
+    });
+
+    it(`should search the module '${module.name}'`, async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'searchModule', baseContext);
+
+      const isModuleVisible = await moduleManagerPage.searchModule(page, module);
+      await expect(isModuleVisible, 'Module is not visible!').to.be.true;
+    });
+  });
+}
+
+function uninstallModule(module: ModuleData, baseContext: string = 'commonTests-uninstallHummingbird'): void {
+  describe(`Uninstall module ${module.name}`, async () => {
+    let browserContext: BrowserContext;
+    let page: Page;
+
+    // before and after functions
+    before(async function () {
+      browserContext = await helper.createBrowserContext(this.browser);
+      page = await helper.newTab(browserContext);
+    });
+
+    after(async () => {
+      await helper.closeBrowserContext(browserContext);
+    });
+
+    it('should login in BO', async function () {
+      await loginCommon.loginBO(this, page);
+    });
+
+    it('should go to \'Modules > Module Manager\' page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToModuleManagerPage', baseContext);
+
+      await dashboardPage.goToSubMenu(
+        page,
+        dashboardPage.modulesParentLink,
+        dashboardPage.moduleManagerLink,
+      );
+      await moduleManagerPage.closeSfToolBar(page);
+
+      const pageTitle = await moduleManagerPage.getPageTitle(page);
+      await expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
+    });
+
+    it(`should search the module '${Modules.keycloak.name}'`, async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'searchModule', baseContext);
+
+      const isModuleVisible = await moduleManagerPage.searchModule(page, Modules.keycloak);
+      await expect(isModuleVisible, 'Module is not visible!').to.be.true;
+    });
+
+    it(`should uninstall the module '${module.name}'`, async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'uninstallModule', baseContext);
+
+      const successMessage = await moduleManagerPage.setActionInModule(page, module, 'uninstall');
+      await expect(successMessage).to.eq(moduleManagerPage.uninstallModuleSuccessMessage(module.tag));
+    });
+  });
+}
+
+export {
+  installModule,
+  uninstallModule,
+};
diff --git a/tests/UI/pages/BO/modules/keycloakConnectorDemo/index.ts b/tests/UI/pages/BO/modules/keycloakConnectorDemo/index.ts
index 73f6e0d62361a..3dceed66bd772 100644
--- a/tests/UI/pages/BO/modules/keycloakConnectorDemo/index.ts
+++ b/tests/UI/pages/BO/modules/keycloakConnectorDemo/index.ts
@@ -8,6 +8,8 @@ import type {Page} from 'playwright';
  * @extends ModuleConfiguration
  */
 class KeycloakConnectorDemo extends ModuleConfiguration {
+  public readonly pageTitle: string;
+
   private readonly formKeycloakEndpoint: string;
 
   private readonly formKeycloakButtonSubmit: string;
@@ -19,7 +21,9 @@ class KeycloakConnectorDemo extends ModuleConfiguration {
   constructor() {
     super();
 
-    // Newsletter registrations table selectors
+    this.pageTitle = `Keycloak connector • ${global.INSTALL.SHOP_NAME}`;
+
+    // Form selectors
     this.formKeycloakEndpoint = '#form_KEYCLOAK_ENDPOINT';
     this.formKeycloakButtonSubmit = 'form.form-horizontal .card-footer button';
   }
@@ -27,7 +31,7 @@ class KeycloakConnectorDemo extends ModuleConfiguration {
   /* Methods */
 
   /**
-   * Get number of newsletter registrations
+   * Set the Keycloak Realm Endpoint
    * @param page {Page} Browser tab
    * @param endpoint {string}
    * @returns {Promise<number>}
@@ -35,7 +39,7 @@ class KeycloakConnectorDemo extends ModuleConfiguration {
   async setKeycloakEndpoint(page: Page, endpoint: string): Promise<string> {
     await page.fill(this.formKeycloakEndpoint, endpoint);
 
-    await page.click(this.formKeycloakButtonSubmit);
+    await this.clickAndWaitForNavigation(page, this.formKeycloakButtonSubmit);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
diff --git a/tests/UI/pages/BO/modules/moduleConfiguration/index.ts b/tests/UI/pages/BO/modules/moduleConfiguration/index.ts
index 9fbc4b41c3ae4..a9d76188b6a6a 100644
--- a/tests/UI/pages/BO/modules/moduleConfiguration/index.ts
+++ b/tests/UI/pages/BO/modules/moduleConfiguration/index.ts
@@ -28,7 +28,7 @@ class ModuleConfiguration extends BOBasePage {
    * Get module name from page title
    * @return {Promise<string>}
    */
-  getPageSubtitle(page: Page): Promise<string> {
+  async getPageSubtitle(page: Page): Promise<string> {
     return this.getTextContent(page, this.pageHeadSubtitle);
   }
 }
diff --git a/tests/UI/types/global.d.ts b/tests/UI/types/global.d.ts
index a969a3c48bf63..8d3c4f0f6adda 100644
--- a/tests/UI/types/global.d.ts
+++ b/tests/UI/types/global.d.ts
@@ -65,7 +65,8 @@ type GlobalMaildevConfig = {
 }
 
 type GlobalKeycloakConfig = {
-  keycloakServer: string
+  keycloakExternalUrl: string
+  keycloakInternalUrl: string
   keycloakAdminUser: string
   keycloakAdminPass: string
   keycloakClientId: string
diff --git a/tests/UI/utils/globals.ts b/tests/UI/utils/globals.ts
index cf8414552fefb..60854b8784191 100755
--- a/tests/UI/utils/globals.ts
+++ b/tests/UI/utils/globals.ts
@@ -67,7 +67,8 @@ global.maildevConfig = {
 };
 
 global.keycloakConfig = {
-  keycloakServer: process.env.KEYCLOAK_SERVER || 'http://127.0.0.1:8003',
+  keycloakExternalUrl: process.env.KEYCLOAK_URL_EXTERNAL || 'http://127.0.0.1:8003',
+  keycloakInternalUrl: process.env.KEYCLOAK_URL_INTERNAL || 'http://keycloak:8080',
   keycloakAdminUser: process.env.KEYCLOAK_ADMIN_USER || 'admin',
   keycloakAdminPass: process.env.KEYCLOAK_ADMIN_PASS || 'admin',
   keycloakClientId: process.env.KEYCLOAK_CLIENT_ID || 'KEYCLOAK_CLIENT_ID',
diff --git a/tests/UI/utils/keycloakHelper.ts b/tests/UI/utils/keycloakHelper.ts
index 07b38e30a3259..92b14797d990b 100644
--- a/tests/UI/utils/keycloakHelper.ts
+++ b/tests/UI/utils/keycloakHelper.ts
@@ -2,7 +2,7 @@ import {KeycloakAdminClient} from '@s3pweb/keycloak-admin-client-cjs';
 import type ClientRepresentation from '@keycloak/keycloak-admin-client/lib/defs/clientRepresentation.js';
 
 const kcAdminClient: KeycloakAdminClient = new KeycloakAdminClient({
-  baseUrl: global.keycloakConfig.keycloakServer,
+  baseUrl: global.keycloakConfig.keycloakExternalUrl,
   realmName: 'master',
 });
 

From cc1bb1f366c6a8e40d3a826140b73dfdc5dae281 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Thu, 1 Jun 2023 10:53:59 +0200
Subject: [PATCH 0048/1030] Change product to bulk edit quantity

---
 .../03_catalog/08_stocks/movement/02_sortAndPagination.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/movement/02_sortAndPagination.ts b/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/movement/02_sortAndPagination.ts
index a6b64a0a04755..b20ec848b5531 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/movement/02_sortAndPagination.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/movement/02_sortAndPagination.ts
@@ -35,7 +35,7 @@ describe('BO - Catalog - Movements : Sort and pagination', async () => {
     await loginCommon.loginBO(this, page);
   });
 
-  describe('PRE-TEST: Bulk edit the quantity of products in the first page of stocks table', async () => {
+  describe('PRE-TEST: Bulk edit the quantity of products in stocks table', async () => {
     it('should go to \'Catalog > Stocks\' page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'goToStocksPage', baseContext);
 
@@ -50,10 +50,10 @@ describe('BO - Catalog - Movements : Sort and pagination', async () => {
       await expect(pageTitle).to.contains(stocksPage.pageTitle);
     });
 
-    it(`should bulk edit the quantity of the product ${Products.demo_8.name}'`, async function () {
+    it(`should bulk edit the quantity of the product '${Products.demo_1.name}'`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'bulkEditQuantity', baseContext);
 
-      await stocksPage.simpleFilter(page, Products.demo_8.name);
+      await stocksPage.simpleFilter(page, Products.demo_1.name);
 
       // Update quantity and check successful message
       const updateMessage = await stocksPage.bulkEditQuantityWithInput(page, 301);
@@ -130,7 +130,7 @@ describe('BO - Catalog - Movements : Sort and pagination', async () => {
     });
   });
 
-  describe('Bulk edit the quantity of products in the the 2 pages of stocks table', async () => {
+  describe('Bulk edit the quantity of products in the 2 pages of stocks table', async () => {
     it('should go to \'Catalog > Stocks\' page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'goToStocksPage2', baseContext);
 

From 184c179b0859b19ba3bf98861a1542a76af3104c Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Thu, 1 Jun 2023 11:31:54 +0200
Subject: [PATCH 0049/1030] Fix lint error

---
 .../03_catalog/08_stocks/movement/02_sortAndPagination.ts   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/movement/02_sortAndPagination.ts b/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/movement/02_sortAndPagination.ts
index b20ec848b5531..f1cb892373424 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/movement/02_sortAndPagination.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/movement/02_sortAndPagination.ts
@@ -11,9 +11,11 @@ import stocksPage from '@pages/BO/catalog/stocks';
 import dashboardPage from '@pages/BO/dashboard';
 import movementsPage from '@pages/BO/catalog/stocks/movements';
 
+// Import data
+import Products from '@data/demo/products';
+
 import {expect} from 'chai';
 import type {BrowserContext, Page} from 'playwright';
-import Products from "@data/demo/products";
 
 const baseContext: string = 'functional_BO_catalog_stocks_movements_sortAndPagination';
 
@@ -145,7 +147,7 @@ describe('BO - Catalog - Movements : Sort and pagination', async () => {
     });
 
     it('should bulk edit the quantity of all products in the first page', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'goToSecondPage', baseContext);
+      await testContext.addContextItem(this, 'testIdentifier', 'bulkEditQuantityFirstPage', baseContext);
 
       const updateMessage = await stocksPage.bulkEditQuantityWithInput(page, 301);
       await expect(updateMessage).to.contains(stocksPage.successfulUpdateMessage);

From 4064ca36b14a31d7acab0689eaad852c5f636e3a Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Thu, 1 Jun 2023 11:50:15 +0200
Subject: [PATCH 0050/1030] Fix step identifiers

---
 .../08_stocks/{movement => movements}/02_sortAndPagination.ts     | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename tests/UI/campaigns/functional/BO/03_catalog/08_stocks/{movement => movements}/02_sortAndPagination.ts (100%)

diff --git a/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/movement/02_sortAndPagination.ts b/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/movements/02_sortAndPagination.ts
similarity index 100%
rename from tests/UI/campaigns/functional/BO/03_catalog/08_stocks/movement/02_sortAndPagination.ts
rename to tests/UI/campaigns/functional/BO/03_catalog/08_stocks/movements/02_sortAndPagination.ts

From 281e1a07bf3df378170c21149c98d18d6b893414 Mon Sep 17 00:00:00 2001
From: Antonin 0x346e3730 CLAUZIER <antonin@clauzier.dev>
Date: Thu, 1 Jun 2023 16:39:28 +0400
Subject: [PATCH 0051/1030] Warning on Modules List page when Distribution API
 cannot be contacted

---
 src/Core/Module/ModuleCollection.php          | 17 ++++++++++++
 src/Core/Module/ModuleRepository.php          | 27 +++++++++++++------
 .../Admin/Improve/ModuleController.php        |  5 ++++
 3 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/src/Core/Module/ModuleCollection.php b/src/Core/Module/ModuleCollection.php
index 87ef97f98c15e..19bcbcab5199e 100644
--- a/src/Core/Module/ModuleCollection.php
+++ b/src/Core/Module/ModuleCollection.php
@@ -43,6 +43,8 @@ class ModuleCollection implements ArrayAccess, Countable, IteratorAggregate
     /** @var ModuleInterface[] */
     private $modules = [];
 
+    private $errors = [];
+
     public function __construct(array $modules = [])
     {
         foreach ($modules as $module) {
@@ -112,4 +114,19 @@ public function filter(callable $callable): ModuleCollection
     {
         return static::createFrom(array_filter($this->modules, $callable));
     }
+
+    public function add(ModuleInterface $module): void
+    {
+        $this->modules[] = $module;
+    }
+
+    public function addError(\Throwable $error): void
+    {
+        $this->errors[] = $error;
+    }
+
+    public function getErrors(): array
+    {
+        return $this->errors;
+    }
 }
diff --git a/src/Core/Module/ModuleRepository.php b/src/Core/Module/ModuleRepository.php
index 114f0d606bb36..ecec666138092 100644
--- a/src/Core/Module/ModuleRepository.php
+++ b/src/Core/Module/ModuleRepository.php
@@ -90,7 +90,7 @@ public function __construct(
 
     public function getList(): ModuleCollection
     {
-        $modules = [];
+        $modules = new ModuleCollection();
         $modulesDirsList = (new Finder())->directories()
             ->in($this->modulePath)
             ->depth('== 0')
@@ -103,10 +103,10 @@ public function getList(): ModuleCollection
                 continue;
             }
 
-            $modules[] = $this->getModule($moduleName);
+            $modules->add($this->getModule($moduleName));
         }
 
-        return ModuleCollection::createFrom($this->addModulesFromHook($modules));
+        return $this->addModulesFromHook($modules);
     }
 
     public function getInstalledModules(): ModuleCollection
@@ -292,13 +292,19 @@ private function getModulesFromHook()
     }
 
     /**
-     * @param Module[] $modules
+     * @param ModuleCollection $modules
      *
-     * @return Module[]
+     * @return ModuleCollection
      */
-    protected function addModulesFromHook(array $modules): array
+    protected function addModulesFromHook(ModuleCollection $modules): ModuleCollection
     {
-        $externalModules = $this->getModulesFromHook();
+        try {
+            $externalModules = $this->getModulesFromHook();
+        } catch (\Throwable $e) {
+            $modules->addError($e);
+
+            return $modules;
+        }
 
         foreach ($externalModules as $externalModule) {
             $merged = false;
@@ -323,7 +329,12 @@ protected function addModulesFromHook(array $modules): array
      */
     protected function enrichModuleAttributesFromHook(Module $module): ModuleInterface
     {
-        $modulesFromHook = $this->getModulesFromHook();
+        try {
+            $modulesFromHook = $this->getModulesFromHook();
+        } catch (\Throwable $e) {
+            return $module;
+        }
+
         foreach ($modulesFromHook as $moduleFromHook) {
             if ($module->get('name') === $moduleFromHook['name']) {
                 $module->getAttributes()->add($moduleFromHook);
diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/ModuleController.php b/src/PrestaShopBundle/Controller/Admin/Improve/ModuleController.php
index 5629506e0bb0c..f8f1c2d161438 100644
--- a/src/PrestaShopBundle/Controller/Admin/Improve/ModuleController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Improve/ModuleController.php
@@ -68,6 +68,11 @@ public function manageAction()
 
         $installedProducts = $moduleRepository->getList();
 
+        $moduleErrors = $installedProducts->getErrors();
+        foreach ($moduleErrors as $moduleError) {
+            $this->addFlash('warning', $moduleError->getMessage());
+        }
+
         $categories = $this->getCategories($modulesProvider, $installedProducts);
         $bulkActions = [
             'bulk-install' => $this->trans('Install', 'Admin.Actions'),

From 67e1544245485968706922ee85d979593c0bc8ea Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Thu, 1 Jun 2023 15:17:46 +0200
Subject: [PATCH 0052/1030] Fix PDF translations in backoffice

---
 config/smartyadmin.config.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/smartyadmin.config.inc.php b/config/smartyadmin.config.inc.php
index 0facbd6273c66..05484489a364b 100644
--- a/config/smartyadmin.config.inc.php
+++ b/config/smartyadmin.config.inc.php
@@ -75,7 +75,7 @@ function smartyTranslate($params, $smarty)
         $sprintf['legacy'] = $htmlEntities ? 'htmlspecialchars': 'addslashes';
     }
 
-    if ($isInPDF) {
+    if ($isInPDF && empty($params['d'])) {
         return Translate::smartyPostProcessTranslation(
             Translate::getPdfTranslation(
                 $params['s'],
@@ -86,7 +86,7 @@ function smartyTranslate($params, $smarty)
     }
 
     // If the template is part of a module
-    if ($isInModule) {
+    if ($isInModule && empty($params['d'])) {
         return Translate::smartyPostProcessTranslation(
             Translate::getModuleTranslation(
                 $params['mod'],

From 7d9df9a42de8698913509d06ed7af16ffb05462e Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Tue, 16 May 2023 16:36:13 +0200
Subject: [PATCH 0053/1030] Fix availability display logic

---
 src/Adapter/Presenter/Product/ProductLazyArray.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Adapter/Presenter/Product/ProductLazyArray.php b/src/Adapter/Presenter/Product/ProductLazyArray.php
index 154039d6b65c2..e0914beb00451 100644
--- a/src/Adapter/Presenter/Product/ProductLazyArray.php
+++ b/src/Adapter/Presenter/Product/ProductLazyArray.php
@@ -918,7 +918,7 @@ public function addQuantityInformation(
                 $remainingQuantityOfAlternativeCombinations = $product['quantity_all_versions'];
             }
 
-            if ($availableQuantity >= 0) {
+            if ($product['quantity'] > 0 && $availableQuantity >= 0) {
                 $this->product['availability_date'] = $product['available_date'];
 
                 if ($availableQuantity < $settings->lastRemainingItems) {

From 2816fc266b8817a7384e9f4f08066ed045f9bd1e Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Thu, 1 Jun 2023 17:49:40 +0200
Subject: [PATCH 0054/1030] Add new test design > position > filter module

---
 .../08_design/05_positions/01_filterModule.ts | 86 +++++++++++++++++++
 tests/UI/pages/BO/design/positions/index.ts   | 62 +++++++++++++
 2 files changed, 148 insertions(+)
 create mode 100644 tests/UI/campaigns/functional/BO/08_design/05_positions/01_filterModule.ts

diff --git a/tests/UI/campaigns/functional/BO/08_design/05_positions/01_filterModule.ts b/tests/UI/campaigns/functional/BO/08_design/05_positions/01_filterModule.ts
new file mode 100644
index 0000000000000..a2b97ba512e71
--- /dev/null
+++ b/tests/UI/campaigns/functional/BO/08_design/05_positions/01_filterModule.ts
@@ -0,0 +1,86 @@
+// Import utils
+import helper from '@utils/helpers';
+import testContext from '@utils/testContext';
+
+// Import commonTests
+import loginCommon from '@commonTests/BO/loginBO';
+
+// Import pages
+import dashboardPage from '@pages/BO/dashboard';
+import positionsPage from '@pages/BO/design/positions';
+
+import {expect} from 'chai';
+import type {BrowserContext, Page} from 'playwright';
+
+const baseContext: string = 'functional_BO_design_positions_filterModule';
+
+describe('BO - Design - Positions : Filter module', async () => {
+  let browserContext: BrowserContext;
+  let page: Page;
+  const moduleName: string = 'Wishlist';
+
+  // before and after functions
+  before(async function () {
+    browserContext = await helper.createBrowserContext(this.browser);
+    page = await helper.newTab(browserContext);
+  });
+
+  after(async () => {
+    await helper.closeBrowserContext(browserContext);
+  });
+
+  it('should login in BO', async function () {
+    await loginCommon.loginBO(this, page);
+  });
+
+  it('should go to \'Design > Positions\' page', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'goToPositionsPage', baseContext);
+
+    await dashboardPage.goToSubMenu(
+      page,
+      dashboardPage.designParentLink,
+      dashboardPage.positionsLink,
+    );
+    await positionsPage.closeSfToolBar(page);
+
+    const pageTitle = await positionsPage.getPageTitle(page);
+    await expect(pageTitle).to.contains(positionsPage.pageTitle);
+  });
+
+  it(`should filter by module '${moduleName}' and check the result`, async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'filterModule', baseContext);
+
+    await positionsPage.filterModule(page, moduleName);
+
+    const numberOfHooks = await positionsPage.getNumberOfHooks(page);
+    await expect(numberOfHooks).to.eq(5);
+  });
+
+  const hooks: string[] = [
+    'displayAdminCustomers',
+    'displayCustomerAccount',
+    'displayFooter',
+    'displayMyAccountBlock',
+    'displayProductActions',
+  ];
+  hooks.forEach((hook: string) => {
+    it(`should check the hook '${hook}'`, async function () {
+      await testContext.addContextItem(this, 'testIdentifier', `checkHooks${hook}`, baseContext);
+
+      const isVisible = await positionsPage.isHookVisible(page, hook);
+      await expect(isVisible).to.be.true;
+
+      const firstModuleName = await positionsPage.getModulesInHook(page, hook);
+      await expect(firstModuleName).to.contain(moduleName);
+    });
+  });
+
+  it('should filter by \'All modules\' and check the result', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'filterAllModules', baseContext);
+
+    await positionsPage.filterModule(page, 'All modules');
+
+    const numberOfHooks = await positionsPage.getNumberOfHooks(page);
+    await expect(numberOfHooks).to.above(5);
+  });
+});
diff --git a/tests/UI/pages/BO/design/positions/index.ts b/tests/UI/pages/BO/design/positions/index.ts
index 18e4d2938e540..27043d393b83d 100644
--- a/tests/UI/pages/BO/design/positions/index.ts
+++ b/tests/UI/pages/BO/design/positions/index.ts
@@ -16,6 +16,20 @@ class Positions extends BOBasePage {
 
   private readonly searchResultHookNameSpan: string;
 
+  private readonly filterModuleButton: string;
+
+  private readonly filterModuleInputValue: string;
+
+  private readonly filterModuleFirstResult: string;
+
+  private readonly modulePositionFormHookSection: string;
+
+  private readonly hookNameLink: (hookName: string) => string;
+
+  private readonly modulesListInHookResults: (hookName: string) => string;
+
+  private readonly hookNameSpan: (hookName: string) => string;
+
   /**
    * @constructs
    * Setting up texts and selectors to use on positions page
@@ -29,6 +43,13 @@ class Positions extends BOBasePage {
     this.searchInput = '#hook-search';
     this.modulePositionForm = '#module-positions-form';
     this.searchResultHookNameSpan = `${this.modulePositionForm} section[style] header span span`;
+    this.filterModuleButton = '#position-filters span.select2';
+    this.filterModuleInputValue = 'body span.select2-search.select2-search--dropdown input';
+    this.filterModuleFirstResult = '#select2-show-modules-results li:nth-child(1)';
+    this.modulePositionFormHookSection = `${this.modulePositionForm} section[style='']`;
+    this.hookNameLink = (hookName: string) => `${this.modulePositionFormHookSection} a[name=${hookName}]`;
+    this.modulesListInHookResults = (hookName: string) => `${this.hookNameLink(hookName)} ~ section.module-list ul`;
+    this.hookNameSpan = (hookName: string) => `${this.hookNameLink(hookName)} + header span.hook-name`;
   }
 
   /* Methods */
@@ -44,6 +65,47 @@ class Positions extends BOBasePage {
 
     return this.getTextContent(page, this.searchResultHookNameSpan);
   }
+
+  /**
+   * Filter module
+   * @param page {Page} Browser tab
+   * @param moduleName {string} Module name to filter by
+   * @returns {Promise<void>}
+   */
+  async filterModule(page: Page, moduleName: string): Promise<void> {
+    await this.waitForSelectorAndClick(page, this.filterModuleButton);
+    await this.setValue(page, this.filterModuleInputValue, moduleName);
+    await this.waitForSelectorAndClick(page, this.filterModuleFirstResult);
+  }
+
+  /**
+   * Get number of hooks
+   * @param page {Page} Browser tab
+   * @returns {Promise<number>}
+   */
+  async getNumberOfHooks(page: Page): Promise<number> {
+    return (await page.$$(this.modulePositionFormHookSection)).length;
+  }
+
+  /**
+   * Get modules in hook
+   * @param page {Page} Browser tab
+   * @param hookName {string} Hook name
+   * @returns {Promise<string>}
+   */
+  async getModulesInHook(page: Page, hookName: string): Promise<string> {
+    return this.getTextContent(page, this.modulesListInHookResults(hookName));
+  }
+
+  /**
+   * Is hook visible
+   * @param page {Page} Browser tab
+   * @param hookName {string} Hook name
+   * @returns {Promise<boolean>}
+   */
+  async isHookVisible(page: Page, hookName: string): Promise<boolean> {
+    return this.elementVisible(page, this.hookNameSpan(hookName), 1000);
+  }
 }
 
 export default new Positions();

From f1540e3f82356b1fd6b9cbddedf5a1fe40ec4b5e Mon Sep 17 00:00:00 2001
From: unloco <amxmodx.unloco@gmail.com>
Date: Thu, 1 Jun 2023 23:36:17 +0100
Subject: [PATCH 0055/1030] Add debug cookie options

---
 .../admin_parameters/performancePageUI.js     | 27 ++++----
 src/Adapter/Debug/DebugMode.php               | 65 ++++++++++++++++---
 src/Adapter/Debug/DebugModeConfiguration.php  | 46 +++++++++----
 .../Performance/DebugModeType.php             | 20 ++++++
 4 files changed, 125 insertions(+), 33 deletions(-)

diff --git a/admin-dev/themes/default/js/bundle/admin_parameters/performancePageUI.js b/admin-dev/themes/default/js/bundle/admin_parameters/performancePageUI.js
index b6a7dc1b68bd8..cdadd4b95870a 100644
--- a/admin-dev/themes/default/js/bundle/admin_parameters/performancePageUI.js
+++ b/admin-dev/themes/default/js/bundle/admin_parameters/performancePageUI.js
@@ -26,19 +26,16 @@ const PerformancePageUI = {
   displaySmartyCache() {
     const CACHE_ENABLED = '1';
     const smartyCacheSelected = document.querySelector('input[name="smarty[cache]"]:checked');
-    const smartyCacheOptions = document.querySelectorAll('.smarty-cache-option');
-
-    if (smartyCacheSelected && smartyCacheSelected.value === CACHE_ENABLED) {
-      for (let i = 0; i < smartyCacheOptions.length; i += 1) {
-        smartyCacheOptions[i].classList.remove('d-none');
-      }
-
-      return;
-    }
-
-    for (let i = 0; i < smartyCacheOptions.length; i += 1) {
-      smartyCacheOptions[i].classList.add('d-none');
-    }
+    document.querySelectorAll('.smarty-cache-option').forEach((element) => {
+      element.classList.toggle('d-none', smartyCacheSelected.value !== CACHE_ENABLED);
+    });
+  },
+  displayDebugModeOptions() {
+    const DEBUG_MODE_ON = '1';
+    const debugModeOn = document.querySelector('input[name="debug_mode[debug_mode]"]:checked');
+    document.querySelectorAll('.debug-mode-option').forEach((element) => {
+      element.classList.toggle('d-none', debugModeOn.value !== DEBUG_MODE_ON);
+    });
   },
   displayCacheSystems() {
     const CACHE_ENABLED = '1';
@@ -83,6 +80,7 @@ const PerformancePageUI = {
  */
 window.addEventListener('load', () => {
   PerformancePageUI.displaySmartyCache();
+  PerformancePageUI.displayDebugModeOptions();
   PerformancePageUI.displayCacheSystems();
   PerformancePageUI.displayMemcacheServers();
 });
@@ -102,6 +100,9 @@ while (length--) {
     if (name === 'smarty[cache]') {
       return PerformancePageUI.displaySmartyCache();
     }
+    if (name === 'debug_mode[debug_mode]') {
+      return PerformancePageUI.displayDebugModeOptions();
+    }
     if (name === 'caching[caching_system]') {
       return PerformancePageUI.displayMemcacheServers();
     }
diff --git a/src/Adapter/Debug/DebugMode.php b/src/Adapter/Debug/DebugMode.php
index 82c78d072625e..ebc45db1ea844 100644
--- a/src/Adapter/Debug/DebugMode.php
+++ b/src/Adapter/Debug/DebugMode.php
@@ -46,6 +46,16 @@ class DebugMode
      * @return bool Whether debug mode is enabled
      */
     public function isDebugModeEnabled()
+    {
+        return 'false' !== Tools::strtolower($this->getCurrentDebugMode());
+    }
+
+    /**
+     * Get the current debug mode from the defines file.
+     *
+     * @return string|null
+     */
+    public function getCurrentDebugMode()
     {
         $definesClean = '';
         $customDefinesPath = _PS_ROOT_DIR_ . '/config/defines_custom.inc.php';
@@ -55,14 +65,51 @@ public function isDebugModeEnabled()
             $definesClean = php_strip_whitespace($customDefinesPath);
         }
 
-        if (!preg_match('/define\(\'_PS_MODE_DEV_\', ([a-zA-Z]+)\);/Ui', $definesClean, $debugModeValue)) {
+        if (!preg_match('/define\(\'_PS_MODE_DEV_\', ([^;]+)\);/Ui', $definesClean, $debugModeValue)) {
             $definesClean = php_strip_whitespace($definesPath);
-            if (!preg_match('/define\(\'_PS_MODE_DEV_\', ([a-zA-Z]+)\);/Ui', $definesClean, $debugModeValue)) {
-                return false;
+            if (!preg_match('/define\(\'_PS_MODE_DEV_\', ([^;]+)\);/Ui', $definesClean, $debugModeValue)) {
+                return null;
             }
         }
 
-        return 'true' === Tools::strtolower($debugModeValue[1]);
+        return $debugModeValue[1];
+    }
+
+    /**
+     * Create php code based on the debug mode configuration.
+     * Examples:
+     *  define('_PS_MODE_DEV_', true);
+     *  define('_PS_MODE_DEV_', isset($_COOKIE['debug']) && $_COOKIE['debug'] === 'debug_password');
+     *  define('_PS_MODE_DEV_', isset($_COOKIE['debug']));
+     *  define('_PS_MODE_DEV_', false);
+     *
+     * @param array $configuration {
+     *                             debug_mode: bool
+     *                             debug_cookie_name: string
+     *                             debug_cookie_value: string
+     *                             }
+     *
+     * @return string
+     */
+    public function createDebugModeFromConfiguration(array $configuration)
+    {
+        if (!$configuration['debug_mode']) {
+            return 'false';
+        }
+
+        if (empty($configuration['debug_cookie_name'])) {
+            return 'true';
+        }
+
+        $debug_cookie_name = stripslashes($configuration['debug_cookie_name']);
+
+        if (empty($configuration['debug_cookie_value'])) {
+            return "isset(\$_COOKIE['$debug_cookie_name'])";
+        }
+
+        $debug_cookie_value = stripslashes($configuration['debug_cookie_value']);
+
+        return "isset(\$_COOKIE['$debug_cookie_name']) && \$_COOKIE['$debug_cookie_name'] === '$debug_cookie_value'";
     }
 
     /**
@@ -118,11 +165,11 @@ private function updateDebugModeValueInMainFile($value)
         $cleanedFileContent = php_strip_whitespace($filename);
         $fileContent = Tools::file_get_contents($filename);
 
-        if (!preg_match('/define\(\'_PS_MODE_DEV_\', ([a-zA-Z]+)\);/Ui', $cleanedFileContent)) {
+        if (!preg_match('/define\(\'_PS_MODE_DEV_\', ([^;]+)\);/Ui', $cleanedFileContent)) {
             return self::DEBUG_MODE_ERROR_NO_DEFINITION_FOUND;
         }
 
-        $fileContent = preg_replace('/define\(\'_PS_MODE_DEV_\', ([a-zA-Z]+)\);/Ui', 'define(\'_PS_MODE_DEV_\', ' . $value . ');', $fileContent);
+        $fileContent = preg_replace('/define\(\'_PS_MODE_DEV_\', ([^;]+)\);/Ui', 'define(\'_PS_MODE_DEV_\', ' . $value . ');', $fileContent);
         if (!@file_put_contents($filename, $fileContent)) {
             return self::DEBUG_MODE_ERROR_NO_WRITE_ACCESS;
         }
@@ -147,10 +194,10 @@ private function updateDebugModeValueInCustomFile($value)
         $cleanedFileContent = php_strip_whitespace($customFileName);
         $fileContent = Tools::file_get_contents($customFileName);
 
-        if (!preg_match('/define\(\'_PS_MODE_DEV_\', ([a-zA-Z]+)\);/Ui', $cleanedFileContent)) {
+        if (!preg_match('/define\(\'_PS_MODE_DEV_\', ([^;]+)\);/Ui', $cleanedFileContent)) {
             return self::DEBUG_MODE_ERROR_NO_DEFINITION_FOUND;
         }
-        $fileContent = preg_replace('/define\(\'_PS_MODE_DEV_\', ([a-zA-Z]+)\);/Ui', 'define(\'_PS_MODE_DEV_\', ' . $value . ');', $fileContent);
+        $fileContent = preg_replace('/define\(\'_PS_MODE_DEV_\', ([^;]+)\);/Ui', 'define(\'_PS_MODE_DEV_\', ' . $value . ');', $fileContent);
 
         if (!@file_put_contents($customFileName, $fileContent)) {
             return self::DEBUG_MODE_ERROR_NO_WRITE_ACCESS_CUSTOM;
@@ -170,7 +217,7 @@ private function updateDebugModeValueInCustomFile($value)
      *
      * @return int the debug mode
      */
-    private function changePsModeDevValue($value)
+    public function changePsModeDevValue($value)
     {
         // Check custom defines file first
         if ($this->isCustomDefinesReadable()) {
diff --git a/src/Adapter/Debug/DebugModeConfiguration.php b/src/Adapter/Debug/DebugModeConfiguration.php
index 0491c3a22d0fb..af3f9b89c4b54 100644
--- a/src/Adapter/Debug/DebugModeConfiguration.php
+++ b/src/Adapter/Debug/DebugModeConfiguration.php
@@ -91,6 +91,8 @@ public function getConfiguration()
         return [
             'disable_overrides' => $this->configuration->getBoolean('PS_DISABLE_OVERRIDES'),
             'debug_mode' => $this->debugMode->isDebugModeEnabled(),
+            'debug_cookie_name' => $this->configuration->get('PS_DEBUG_COOKIE_NAME'),
+            'debug_cookie_value' => $this->configuration->get('PS_DEBUG_COOKIE_VALUE'),
             'debug_profiling' => $this->debugProfiling->isProfilingEnabled(),
         ];
     }
@@ -106,10 +108,21 @@ public function updateConfiguration(array $configuration)
             // Set configuration
             $this->configuration->set('PS_DISABLE_OVERRIDES', $configuration['disable_overrides']);
 
+            $this->configuration->set('PS_DEBUG_COOKIE_NAME', $configuration['debug_cookie_name']);
+            $this->configuration->set('PS_DEBUG_COOKIE_VALUE', $configuration['debug_cookie_value']);
+
+            if (empty($configuration['debug_cookie_name']) && !empty($configuration['debug_cookie_value'])) {
+                $errors[] = [
+                    'key' => 'Error: The cookie name is required when the cookie value is set.',
+                    'domain' => 'Admin.Advparameters.Notification',
+                    'parameters' => [],
+                ];
+            }
+
             $this->classIndexCacheClearer->clear();
 
             // Update Debug Mode
-            $status = $this->updateDebugMode((bool) $configuration['debug_mode']);
+            $status = $this->updateDebugMode($configuration);
             switch ($status) {
                 case DebugMode::DEBUG_MODE_ERROR_NO_WRITE_ACCESS_CUSTOM:
                 case DebugMode::DEBUG_MODE_ERROR_NO_READ_ACCESS:
@@ -169,26 +182,37 @@ public function updateConfiguration(array $configuration)
      */
     public function validateConfiguration(array $configuration)
     {
-        return isset(
-            $configuration['disable_overrides'],
-            $configuration['debug_mode'],
-            $configuration['debug_profiling']
-        );
+        $keys = [
+            'disable_overrides',
+            'debug_mode',
+            'debug_cookie_name',
+            'debug_cookie_value',
+            'debug_profiling',
+        ];
+        $array_keys = array_keys($configuration);
+
+        return count(array_intersect($keys, $array_keys)) === count($keys);
     }
 
     /**
      * Change Debug mode value if needed.
      *
-     * @param bool $enableStatus
+     * @param array $configuration {
+     *                             debug_mode: bool
+     *                             debug_cookie_name: string
+     *                             debug_cookie_value: string
+     *                             }
      *
      * @return int|null Status of update
      */
-    private function updateDebugMode(bool $enableStatus): ?int
+    private function updateDebugMode(array $configuration): ?int
     {
-        $currentDebugMode = $this->debugMode->isDebugModeEnabled();
+        $currentDebugMode = $this->debugMode->getCurrentDebugMode();
+
+        $newDebugMode = $this->debugMode->createDebugModeFromConfiguration($configuration);
 
-        if ($enableStatus !== $currentDebugMode) {
-            return (true === $enableStatus) ? $this->debugMode->enable() : $this->debugMode->disable();
+        if ($newDebugMode !== $currentDebugMode) {
+            return $this->debugMode->changePsModeDevValue($newDebugMode);
         }
 
         return null;
diff --git a/src/PrestaShopBundle/Form/Admin/AdvancedParameters/Performance/DebugModeType.php b/src/PrestaShopBundle/Form/Admin/AdvancedParameters/Performance/DebugModeType.php
index a5037d6c211b1..c9a093fee1932 100644
--- a/src/PrestaShopBundle/Form/Admin/AdvancedParameters/Performance/DebugModeType.php
+++ b/src/PrestaShopBundle/Form/Admin/AdvancedParameters/Performance/DebugModeType.php
@@ -27,7 +27,9 @@
 namespace PrestaShopBundle\Form\Admin\AdvancedParameters\Performance;
 
 use PrestaShopBundle\Form\Admin\Type\SwitchType;
+use PrestaShopBundle\Form\Admin\Type\TextPreviewType;
 use PrestaShopBundle\Form\Admin\Type\TranslatorAwareType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
@@ -51,6 +53,24 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label' => $this->trans('Debug mode', 'Admin.Advparameters.Feature'),
                 'help' => $this->trans('Enable or disable debug mode. Debug mode will enable extended error reporting, display the Symfony debug bar, and other features.', 'Admin.Advparameters.Help'),
             ])
+            ->add('debug_cookie_name', TextType::class, [
+                'required' => false,
+                'attr' => ['placeholder' => 'COOKIE_NAME'],
+                'label' => $this->trans('Debug cookie name', 'Admin.Advparameters.Feature'),
+                'help' => $this->trans('(Optional) Insert a cookie name to enable the debug mode only when this cookie is set.', 'Admin.Advparameters.Help'),
+                'row_attr' => [
+                    'class' => 'debug-mode-option',
+                ],
+            ])
+            ->add('debug_cookie_value', TextType::class, [
+                'required' => false,
+                'attr' => ['placeholder' => 'COOKIE_VALUE'],
+                'label' => $this->trans('Debug cookie value', 'Admin.Advparameters.Feature'),
+                'help' => $this->trans('(Optional) Insert a value to enable the debug mode only when the cookie configured above is set to this value.', 'Admin.Advparameters.Help'),
+                'row_attr' => [
+                    'class' => 'debug-mode-option',
+                ],
+            ])
             ->add('debug_profiling', SwitchType::class, [
                 'required' => false,
                 'label' => $this->trans('Debug profiler', 'Admin.Advparameters.Feature'),

From 0e45edca32ade61578a4d5a79fd9e17736391f1d Mon Sep 17 00:00:00 2001
From: davidglezz <davidgg666@gmail.com>
Date: Sun, 4 Jun 2023 20:24:53 +0200
Subject: [PATCH 0056/1030] Improve SpecificPriceCore::getPriority()

Signed-off-by: davidglezz <davidg@empathy.co>
---
 classes/SpecificPrice.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/SpecificPrice.php b/classes/SpecificPrice.php
index b3afc6d6d00d1..b64658a91dffa 100644
--- a/classes/SpecificPrice.php
+++ b/classes/SpecificPrice.php
@@ -268,7 +268,7 @@ public static function getPriority($id_product)
         }
         $priority = 'id_customer;' . $priority;
 
-        return preg_split('/;/', $priority);
+        return explode(';', $priority);
     }
 
     /**

From 2d6e48a1c6d17ab68191556f8bf3363bd5dda4bc Mon Sep 17 00:00:00 2001
From: davidglezz <davidgg666@gmail.com>
Date: Sun, 4 Jun 2023 20:26:32 +0200
Subject: [PATCH 0057/1030] Improve GroupReduction

Signed-off-by: davidglezz <davidgg666@gmail.com>
---
 classes/GroupReduction.php | 40 +++++++++++++-------------------------
 1 file changed, 13 insertions(+), 27 deletions(-)

diff --git a/classes/GroupReduction.php b/classes/GroupReduction.php
index f853c4fc41480..86bd5d73c0c2d 100644
--- a/classes/GroupReduction.php
+++ b/classes/GroupReduction.php
@@ -63,10 +63,7 @@ public function delete()
 			WHERE cp.`id_category` = ' . (int) $this->id_category
         );
 
-        $ids = [];
-        foreach ($products as $row) {
-            $ids[] = $row['id_product'];
-        }
+        $ids = array_column($products, 'id_product');
 
         if ($ids) {
             Db::getInstance()->delete('product_group_reduction_cache', 'id_product IN (' . implode(', ', $ids) . ')');
@@ -111,14 +108,10 @@ protected function _updateCache()
             '
 			SELECT cp.`id_product`
 			FROM `' . _DB_PREFIX_ . 'category_product` cp
-			WHERE cp.`id_category` = ' . (int) $this->id_category,
-        false
+			WHERE cp.`id_category` = ' . (int) $this->id_category
         );
 
-        $ids = [];
-        foreach ($products as $product) {
-            $ids[] = $product['id_product'];
-        }
+        $ids = array_column($products, 'id_product');
 
         $result = true;
         if ($ids) {
@@ -194,15 +187,14 @@ public static function setProductReduction($id_product, $id_group = null, $id_ca
 
         $categories = Product::getProductCategories((int) $id_product);
 
-        if ($categories) {
-            foreach ($categories as $category) {
-                $reductions = GroupReduction::getGroupsByCategoryId((int) $category);
-                if ($reductions) {
-                    foreach ($reductions as $reduction) {
-                        $current_group_reduction = new GroupReduction((int) $reduction['id_group_reduction']);
-                        $res &= $current_group_reduction->_setCache();
-                    }
-                }
+        foreach ($categories as $category) {
+            $reductions = GroupReduction::getGroupsByCategoryId((int) $category);
+            if (!$reductions) {
+                continue;
+            }
+            foreach ($reductions as $reduction) {
+                $current_group_reduction = new GroupReduction((int) $reduction['id_group_reduction']);
+                $res &= $current_group_reduction->_setCache();
             }
         }
 
@@ -212,11 +204,8 @@ public static function setProductReduction($id_product, $id_group = null, $id_ca
     public static function deleteProductReduction($id_product)
     {
         $query = 'DELETE FROM `' . _DB_PREFIX_ . 'product_group_reduction_cache` WHERE `id_product` = ' . (int) $id_product;
-        if (Db::getInstance()->execute($query) === false) {
-            return false;
-        }
 
-        return true;
+        return Db::getInstance()->execute($query);
     }
 
     public static function duplicateReduction($id_product_old, $id_product)
@@ -245,11 +234,8 @@ public static function duplicateReduction($id_product_old, $id_product)
     public static function deleteCategory($id_category)
     {
         $query = 'DELETE FROM `' . _DB_PREFIX_ . 'group_reduction` WHERE `id_category` = ' . (int) $id_category;
-        if (Db::getInstance()->execute($query) === false) {
-            return false;
-        }
 
-        return true;
+        return Db::getInstance()->execute($query);
     }
 
     /**

From ddbdfc579498b46951fa7203da93d0bbf33cc7b2 Mon Sep 17 00:00:00 2001
From: unloco <amxmodx.unloco@gmail.com>
Date: Sun, 4 Jun 2023 21:05:11 +0100
Subject: [PATCH 0058/1030] Remove unused import

---
 .../Form/Admin/AdvancedParameters/Performance/DebugModeType.php  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/PrestaShopBundle/Form/Admin/AdvancedParameters/Performance/DebugModeType.php b/src/PrestaShopBundle/Form/Admin/AdvancedParameters/Performance/DebugModeType.php
index c9a093fee1932..6d668080bc852 100644
--- a/src/PrestaShopBundle/Form/Admin/AdvancedParameters/Performance/DebugModeType.php
+++ b/src/PrestaShopBundle/Form/Admin/AdvancedParameters/Performance/DebugModeType.php
@@ -27,7 +27,6 @@
 namespace PrestaShopBundle\Form\Admin\AdvancedParameters\Performance;
 
 use PrestaShopBundle\Form\Admin\Type\SwitchType;
-use PrestaShopBundle\Form\Admin\Type\TextPreviewType;
 use PrestaShopBundle\Form\Admin\Type\TranslatorAwareType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;

From ee02ab23659a7484f35734871e963c19ad9a26b6 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Mon, 5 Jun 2023 15:09:49 +0200
Subject: [PATCH 0059/1030] Nightly : Fixed
 functional/BO/02*/01*/viewAndEditOrder/11*

---
 .../BO/02_orders/01_orders/viewAndEditOrder/11_checkInvoice.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/11_checkInvoice.js b/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/11_checkInvoice.js
index fcc2e053e6420..1bc7dab24048c 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/11_checkInvoice.js
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/11_checkInvoice.js
@@ -1102,7 +1102,7 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
               filePath,
               `${productWithEcoTax.name}, ,  `
               + `€${productWithEcoTax.price.toFixed(2)},  ,`
-              + `ecotax: €${productWithEcoTax.ecoTax.toFixed(2)},,  `
+              + `Ecotax: €${productWithEcoTax.ecoTax.toFixed(2)},,  `
               + '1, ,  '
               + `€${productWithEcoTax.price.toFixed(2)}`,
             );

From 675e138feac2c5d407faa58315cdb9811a662438 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Tue, 6 Jun 2023 09:31:40 +0200
Subject: [PATCH 0060/1030] Nightly : 8.0.x : Fixed error in package.json

---
 tests/UI/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/UI/package.json b/tests/UI/package.json
index cebd914d4bf68..cd5707b5c5b16 100755
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -34,7 +34,7 @@
     "test:functional:BO:login": "TEST_PATH='functional/BO/00_login/*' npm run test:specific",
     "test:functional:BO:orders": "TEST_PATH='functional/BO/02_orders/*' npm run test:specific",
     "test:functional:BO:orders:01": "TEST_PATH='functional/BO/02_orders/01*/*' npm run test:specific",
-    "test:functional:BO:orders:01-0*1*": "TEST_PATH='functional/BO/02_orders/01*/{0*,1*}' npm run test:specific",
+    "test:functional:BO:orders:01:0-1": "TEST_PATH='functional/BO/02_orders/01*/{0*,1*}' npm run test:specific",
     "test:functional:BO:orders:01-create-orders": "TEST_PATH='functional/BO/02_orders/01*/createOrders/*' npm run test:specific",
     "test:functional:BO:orders:01-view-and-edit-order": "TEST_PATH='functional/BO/02_orders/01*/viewAndEditOrder/*' npm run test:specific",
     "test:functional:BO:orders:02": "TEST_PATH='functional/BO/02_orders/02*/*' npm run test:specific",

From 64d50e97c91f06090dbf6af86c66bdf0b9a59ea7 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Tue, 6 Jun 2023 09:33:41 +0200
Subject: [PATCH 0061/1030] Nightly : 8.1.x : Fixed error in package.json

---
 tests/UI/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/UI/package.json b/tests/UI/package.json
index 70e1e61fa22af..af81cfccafba1 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -37,7 +37,7 @@
     "test:functional:BO:dashboard": "TEST_PATH='functional/BO/01_dashboard/' npm run test:specific",
     "test:functional:BO:orders": "TEST_PATH='functional/BO/02_orders/' npm run test:specific",
     "test:functional:BO:orders:01": "TEST_PATH='functional/BO/02_orders/01*/' npm run test:specific",
-    "test:functional:BO:orders:01-0*1*": "TEST_PATH='functional/BO/02_orders/01*/{0*,1*}.ts' npm run test:specific",
+    "test:functional:BO:orders:01:0-1": "TEST_PATH='functional/BO/02_orders/01*/{0*,1*}.ts' npm run test:specific",
     "test:functional:BO:orders:01-create-orders": "TEST_PATH='functional/BO/02_orders/01*/createOrders/' npm run test:specific",
     "test:functional:BO:orders:01-view-and-edit-order": "TEST_PATH='functional/BO/02_orders/01*/viewAndEditOrder/' npm run test:specific",
     "test:functional:BO:orders:02": "TEST_PATH='functional/BO/02_orders/02*/' npm run test:specific",

From 24edcea9a2b4cf6f6404c89a73bc46334e4e6a07 Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Tue, 6 Jun 2023 11:48:38 +0200
Subject: [PATCH 0062/1030] Add integration test to test the use caase of the
 issue

---
 .../Product/ProductLazyArrayTest.php          | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/tests/Integration/Adapter/Presenter/Product/ProductLazyArrayTest.php b/tests/Integration/Adapter/Presenter/Product/ProductLazyArrayTest.php
index 080a9e1d75ad5..4ad0c7ad266f8 100644
--- a/tests/Integration/Adapter/Presenter/Product/ProductLazyArrayTest.php
+++ b/tests/Integration/Adapter/Presenter/Product/ProductLazyArrayTest.php
@@ -353,6 +353,25 @@ public function providerQuantityInformationCases(): iterable
             self::PRODUCT_AVAILABLE_NOW,
         ];
 
+        // Product page: out of stock, not allowed to order when out of stock
+        yield [
+            array_merge(
+                $product,
+                [
+                    'cache_default_attribute' => 0,
+                    'quantity_wanted' => 0,
+                    'stock_quantity' => 0,
+                    'quantity' => 0,
+                    'show_availability' => 1,
+                    'available_date' => false,
+                    'available_now' => self::PRODUCT_AVAILABLE_NOW,
+                    'available_later' => self::PRODUCT_AVAILABLE_LATER,
+                    'allow_oosp' => OutOfStockType::OUT_OF_STOCK_NOT_AVAILABLE,
+                ]
+            ),
+            self::PRODUCT_NOT_AVAILABLE,
+        ];
+
         // not enough stock, not allowed to order when out of stock
         yield [
             array_merge(

From 3fc37cb680346a307db05b82775288c27cf1ef60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@prestashop.com>
Date: Tue, 6 Jun 2023 15:12:00 +0200
Subject: [PATCH 0063/1030] Changed error code when access token is invalid

---
 app/config/config.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/config/config.yml b/app/config/config.yml
index 51e9aaf9b338b..7b40aa8850874 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -108,3 +108,5 @@ api_platform:
       - '%kernel.project_dir%/app/config/api_platform'
 
   metadata_backward_compatibility_layer: false
+  exception_to_status:
+    Lcobucci\JWT\Token\InvalidTokenStructure: 401

From 6365432f27ee4801bb2f303b564eac4839aa6537 Mon Sep 17 00:00:00 2001
From: Fabien Papet <fabien.papet@gmail.com>
Date: Tue, 6 Jun 2023 16:44:47 +0200
Subject: [PATCH 0064/1030] Use repository

Signed-off-by: Fabien Papet <fabien.papet@gmail.com>
---
 .../Module/AdminModuleDataProvider.php        | 10 +--------
 src/Adapter/Module/Module.php                 | 19 ++---------------
 src/Adapter/Module/ModuleDataProvider.php     | 21 +++++++++++++++----
 .../Addon/Module/ModuleManagerBuilder.php     |  1 -
 .../config/services/adapter/data_provider.yml |  1 -
 5 files changed, 20 insertions(+), 32 deletions(-)

diff --git a/src/Adapter/Module/AdminModuleDataProvider.php b/src/Adapter/Module/AdminModuleDataProvider.php
index 1baa3a7d9411d..c56870f8cf839 100644
--- a/src/Adapter/Module/AdminModuleDataProvider.php
+++ b/src/Adapter/Module/AdminModuleDataProvider.php
@@ -29,7 +29,6 @@
 use Context;
 use Employee;
 use Module as LegacyModule;
-use PrestaShop\PrestaShop\Adapter\Shop\Context as ShopContext;
 use PrestaShop\PrestaShop\Core\Module\ModuleCollection;
 use PrestaShopBundle\Service\DataProvider\Admin\CategoriesProvider;
 use PrestaShopBundle\Service\DataProvider\Admin\ModuleInterface;
@@ -111,11 +110,6 @@ class AdminModuleDataProvider implements ModuleInterface
      */
     private $employee;
 
-    /**
-     * @var ShopContext
-     */
-    private $shopContext;
-
     /**
      * @var array
      */
@@ -134,13 +128,11 @@ class AdminModuleDataProvider implements ModuleInterface
     public function __construct(
         CategoriesProvider $categoriesProvider,
         ModuleDataProvider $modulesProvider,
-        ShopContext $shopContext,
         Employee $employee = null
     ) {
         $this->categoriesProvider = $categoriesProvider;
         $this->moduleProvider = $modulesProvider;
         $this->employee = $employee;
-        $this->shopContext = $shopContext;
     }
 
     /**
@@ -241,7 +233,7 @@ public function setActionUrls(ModuleCollection $modules, ?string $specific_actio
 
             if ($module->isInstalled()) {
                 unset($urls['install']);
-                if (!$module->isActive($this->shopContext)) {
+                if (!$module->isActive()) {
                     unset(
                         $urls['disable'],
                         $urls['enableMobile'],
diff --git a/src/Adapter/Module/Module.php b/src/Adapter/Module/Module.php
index 3c623d314b31d..e77b1a86d338f 100644
--- a/src/Adapter/Module/Module.php
+++ b/src/Adapter/Module/Module.php
@@ -26,9 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Module;
 
-use Db;
 use Module as LegacyModule;
-use PrestaShop\PrestaShop\Adapter\Shop\Context as ShopContext;
 use PrestaShop\PrestaShop\Core\Addon\AddonListFilterOrigin;
 use PrestaShop\PrestaShop\Core\Addon\Module\AddonListFilterDeviceStatus;
 use PrestaShop\PrestaShop\Core\Module\ModuleInterface;
@@ -226,22 +224,9 @@ public function hasValidInstance(): bool
     /**
      * @return bool
      */
-    public function isActive(ShopContext $shopContext = null): bool
+    public function isActive(): bool
     {
-        if ($shopContext === null || $shopContext->isAllShopContext()) {
-            return (bool) $this->database->get('active');
-        }
-
-        $sql = sprintf(
-            'SELECT * FROM %smodule_shop WHERE `id_module` = %s AND `id_shop` IN (%s)',
-            _DB_PREFIX_,
-            $this->database->get('id'),
-            implode(', ', $shopContext->getContextListShopID())
-        );
-
-        $res = Db::getInstance()->executeS($sql);
-
-        return !empty($res);
+        return (bool) $this->database->get('active');
     }
 
     public function isActiveOnMobile(): bool
diff --git a/src/Adapter/Module/ModuleDataProvider.php b/src/Adapter/Module/ModuleDataProvider.php
index a18cb7032078c..fc36e99e206d4 100755
--- a/src/Adapter/Module/ModuleDataProvider.php
+++ b/src/Adapter/Module/ModuleDataProvider.php
@@ -146,7 +146,7 @@ public function getInstalled(): array
 
         $id_shops = (new Context())->getContextListShopID();
         if (count($id_shops) > 0) {
-            $select .= ', ms.`id_module` as active, ms.`enable_device` as active_on_mobile';
+            $select .= ', ms.`enable_device` as active_on_mobile';
             $from .= ' LEFT JOIN `' . _DB_PREFIX_ . 'module_shop` ms ON ms.`id_module` = m.`id_module`';
             $from .= ' AND ms.`id_shop` IN (' . implode(',', array_map('intval', $id_shops)) . ')';
         }
@@ -160,9 +160,7 @@ public function getInstalled(): array
             if (array_key_exists('active_on_mobile', $module)) {
                 $module['active_on_mobile'] = (bool) ($module['active_on_mobile'] & AddonListFilterDeviceStatus::DEVICE_MOBILE);
             }
-            if (array_key_exists('active', $module)) {
-                $module['active'] = (bool) $module['active'];
-            }
+            $module['active'] = $this->isModuleActive($module['id'], $id_shops);
             $modules[$module['name']] = $module;
         }
 
@@ -370,4 +368,19 @@ private function getDeviceStatus($name)
 
         return false;
     }
+
+
+    /**
+     * Checks if the module is active on at least one shop of the context.
+     */
+    private function isModuleActive(int $id, array $id_shops): bool
+    {
+        $result = Db::getInstance()->getRow('SELECT m.`active`, ms.`id_module` as `shop_active`, ms.`enable_device` as `enable_device`
+            FROM `' . _DB_PREFIX_ . 'module` m
+            LEFT JOIN `' . _DB_PREFIX_ . 'module_shop` ms ON m.`id_module` = ms.`id_module`
+            WHERE m.`id_module` = ' . $id . '
+            AND ms.`id_shop` IN (' . implode(',', $id_shops) . ')');
+
+        return !empty($result);
+    }
 }
diff --git a/src/Core/Addon/Module/ModuleManagerBuilder.php b/src/Core/Addon/Module/ModuleManagerBuilder.php
index 3f0c01a6ccf10..e99f17dbdf48e 100644
--- a/src/Core/Addon/Module/ModuleManagerBuilder.php
+++ b/src/Core/Addon/Module/ModuleManagerBuilder.php
@@ -196,7 +196,6 @@ private function __construct(bool $isDebug = _PS_MODE_DEV_)
             self::$adminModuleDataProvider = new AdminModuleDataProvider(
                 self::$categoriesProvider,
                 self::$moduleDataProvider,
-                new \PrestaShop\PrestaShop\Adapter\Shop\Context(),
                 Context::getContext()->employee
             );
             self::$adminModuleDataProvider->setRouter($this->getSymfonyRouter());
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml b/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml
index fa0f4715cb1b4..9166eb0505be1 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml
@@ -10,7 +10,6 @@ services:
     arguments:
       - "@prestashop.categories_provider"
       - "@prestashop.adapter.data_provider.module"
-      - "@prestashop.adapter.shop.context"
       - "@=service('prestashop.adapter.legacy.context').getContext().employee"
     calls:
       - [ setRouter, [ '@router' ] ]

From bf95d0dbdf6c214c69542a3cacdd3a689ba2f161 Mon Sep 17 00:00:00 2001
From: "matthieu.rolland" <matthieu.rolland@prestashop.com>
Date: Tue, 6 Jun 2023 17:36:37 +0200
Subject: [PATCH 0065/1030] keep file name from containing path traversal

---
 classes/Attachment.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/Attachment.php b/classes/Attachment.php
index b6874720d5fa1..1f4e73d18dd48 100644
--- a/classes/Attachment.php
+++ b/classes/Attachment.php
@@ -111,7 +111,7 @@ public function update($nullValues = false)
     public function delete()
     {
         if (file_exists(_PS_DOWNLOAD_DIR_ . $this->file)) {
-            @unlink(_PS_DOWNLOAD_DIR_ . $this->file);
+            @unlink(_PS_DOWNLOAD_DIR_ . basename($this->file));
         }
 
         $sql = new DbQuery();

From 034899eead7f1cd5e2218ec7873b802c5f8ac96e Mon Sep 17 00:00:00 2001
From: unloco <amxmodx.unloco@gmail.com>
Date: Wed, 7 Jun 2023 08:21:06 +0100
Subject: [PATCH 0066/1030] Generate random values for cookie name and value

---
 .../new-theme/js/components/generatable-input.ts   | 14 +++++++-------
 .../js/pages/performance-preferences/index.ts      |  5 +++++
 .../Performance/DebugModeType.php                  | 10 +++++-----
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/admin-dev/themes/new-theme/js/components/generatable-input.ts b/admin-dev/themes/new-theme/js/components/generatable-input.ts
index f998a9e66d31b..eba6d268e76bb 100644
--- a/admin-dev/themes/new-theme/js/components/generatable-input.ts
+++ b/admin-dev/themes/new-theme/js/components/generatable-input.ts
@@ -51,15 +51,15 @@
  */
 export default class GeneratableInput {
   /**
-   * Attaches event listener on button than can generate value
+   * Attaches click event listeners on buttons than can generate random values
    *
-   * @param {String} generatorBtnSelector
+   * @param {String} generatorButtonsSelector
    */
-  public attachOn(generatorBtnSelector: string): void {
-    const generatorBtn = document.querySelector(generatorBtnSelector);
+  public attachOn(generatorButtonsSelector: string): void {
+    const generatorButtons = document.querySelectorAll(generatorButtonsSelector);
 
-    if (generatorBtn !== null) {
-      generatorBtn.addEventListener('click', (event: Event): void => {
+    generatorButtons.forEach((btn: Element): void => {
+      btn.addEventListener('click', (event: Event): void => {
         const {attributes} = <HTMLButtonElement>event.currentTarget;
 
         const targetInputId = attributes.getNamedItem('data-target-input-id')
@@ -75,7 +75,7 @@ export default class GeneratableInput {
         targetInput.value = this.generateValue(generatedValueLength);
         targetInput.dispatchEvent(new CustomEvent('change', {bubbles: true}));
       });
-    }
+    });
   }
 
   /**
diff --git a/admin-dev/themes/new-theme/js/pages/performance-preferences/index.ts b/admin-dev/themes/new-theme/js/pages/performance-preferences/index.ts
index 0bdde9994a2af..7d88aea6149fa 100644
--- a/admin-dev/themes/new-theme/js/pages/performance-preferences/index.ts
+++ b/admin-dev/themes/new-theme/js/pages/performance-preferences/index.ts
@@ -25,6 +25,7 @@
 
 import ConfirmModal from '@components/modal/confirm-modal';
 import PerformancePreferencesPageMap from '@pages/performance-preferences/PerformancePreferencesPageMap';
+import GeneratableInput from '@components/generatable-input';
 
 const {$} = window;
 
@@ -47,4 +48,8 @@ $(() => {
 
     modal.show();
   });
+
+  // Initialize cookie name and value generatable inputs
+  const generatableInput = new GeneratableInput();
+  generatableInput.attachOn('.js-generator-btn');
 });
diff --git a/src/PrestaShopBundle/Form/Admin/AdvancedParameters/Performance/DebugModeType.php b/src/PrestaShopBundle/Form/Admin/AdvancedParameters/Performance/DebugModeType.php
index 6d668080bc852..fbb2667155d51 100644
--- a/src/PrestaShopBundle/Form/Admin/AdvancedParameters/Performance/DebugModeType.php
+++ b/src/PrestaShopBundle/Form/Admin/AdvancedParameters/Performance/DebugModeType.php
@@ -26,9 +26,9 @@
 
 namespace PrestaShopBundle\Form\Admin\AdvancedParameters\Performance;
 
+use PrestaShopBundle\Form\Admin\Type\GeneratableTextType;
 use PrestaShopBundle\Form\Admin\Type\SwitchType;
 use PrestaShopBundle\Form\Admin\Type\TranslatorAwareType;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
@@ -52,18 +52,18 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label' => $this->trans('Debug mode', 'Admin.Advparameters.Feature'),
                 'help' => $this->trans('Enable or disable debug mode. Debug mode will enable extended error reporting, display the Symfony debug bar, and other features.', 'Admin.Advparameters.Help'),
             ])
-            ->add('debug_cookie_name', TextType::class, [
+            ->add('debug_cookie_name', GeneratableTextType::class, [
                 'required' => false,
-                'attr' => ['placeholder' => 'COOKIE_NAME'],
+                'generated_value_length' => 16,
                 'label' => $this->trans('Debug cookie name', 'Admin.Advparameters.Feature'),
                 'help' => $this->trans('(Optional) Insert a cookie name to enable the debug mode only when this cookie is set.', 'Admin.Advparameters.Help'),
                 'row_attr' => [
                     'class' => 'debug-mode-option',
                 ],
             ])
-            ->add('debug_cookie_value', TextType::class, [
+            ->add('debug_cookie_value', GeneratableTextType::class, [
                 'required' => false,
-                'attr' => ['placeholder' => 'COOKIE_VALUE'],
+                'generated_value_length' => 16,
                 'label' => $this->trans('Debug cookie value', 'Admin.Advparameters.Feature'),
                 'help' => $this->trans('(Optional) Insert a value to enable the debug mode only when the cookie configured above is set to this value.', 'Admin.Advparameters.Help'),
                 'row_attr' => [

From bfd6677e676d85a0aa6fe412a848c004fa78da2d Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Wed, 7 Jun 2023 09:51:21 +0200
Subject: [PATCH 0067/1030] Nightly : Fixed functional/BO/04*/01*/08*

---
 tests/UI/pages/FO/checkout/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/UI/pages/FO/checkout/index.ts b/tests/UI/pages/FO/checkout/index.ts
index 6c958745b1b55..911e1aa5d05a1 100644
--- a/tests/UI/pages/FO/checkout/index.ts
+++ b/tests/UI/pages/FO/checkout/index.ts
@@ -723,12 +723,12 @@ class Checkout extends FOBasePage {
     if (await this.elementVisible(page, this.addressStepAliasInput)) {
       await this.setValue(page, this.addressStepAliasInput, address.alias);
     }
+    await this.setValue(page, this.addressStepPhoneInput, address.phone);
     await this.setValue(page, this.addressStepCompanyInput, address.company);
     await this.setValue(page, this.addressStepAddress1Input, address.address);
     await this.setValue(page, this.addressStepPostCodeInput, address.postalCode);
     await this.setValue(page, this.addressStepCityInput, address.city);
     await this.selectByVisibleText(page, this.addressStepCountrySelect, address.country);
-    await this.setValue(page, this.addressStepPhoneInput, address.phone);
     if (await this.elementVisible(page, this.stateInput, 1000)) {
       await this.selectByVisibleText(page, this.stateInput, address.state);
     }

From 0a8762b09cc0d8cfa5665cd05ed76df44a452b05 Mon Sep 17 00:00:00 2001
From: Jonathan Lelievre <jo.lelievre@gmail.com>
Date: Wed, 7 Jun 2023 10:22:47 +0200
Subject: [PATCH 0068/1030] CS fixer

---
 src/Adapter/Module/ModuleDataProvider.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Adapter/Module/ModuleDataProvider.php b/src/Adapter/Module/ModuleDataProvider.php
index fc36e99e206d4..2e7181546d4c8 100755
--- a/src/Adapter/Module/ModuleDataProvider.php
+++ b/src/Adapter/Module/ModuleDataProvider.php
@@ -369,7 +369,6 @@ private function getDeviceStatus($name)
         return false;
     }
 
-
     /**
      * Checks if the module is active on at least one shop of the context.
      */

From de2515d461670341bdbc8b1f734aa006017113e9 Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Sat, 20 May 2023 14:35:10 +0200
Subject: [PATCH 0069/1030] Introduce presenters for suppliers

---
 .../front/listing/SupplierController.php      |  39 +++---
 .../Manufacturer/ManufacturerLazyArray.php    |  41 +------
 .../Presenter/Supplier/SupplierLazyArray.php  | 111 ++++++++++++++++++
 .../Presenter/Supplier/SupplierPresenter.php  |  87 ++++++++++++++
 4 files changed, 220 insertions(+), 58 deletions(-)
 create mode 100644 src/Adapter/Presenter/Supplier/SupplierLazyArray.php
 create mode 100644 src/Adapter/Presenter/Supplier/SupplierPresenter.php

diff --git a/controllers/front/listing/SupplierController.php b/controllers/front/listing/SupplierController.php
index 61fe5e75f3403..29e267ee74fda 100644
--- a/controllers/front/listing/SupplierController.php
+++ b/controllers/front/listing/SupplierController.php
@@ -23,21 +23,23 @@
  * @copyright Since 2007 PrestaShop SA and Contributors
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
+use PrestaShop\PrestaShop\Adapter\Presenter\Supplier\SupplierPresenter;
 use PrestaShop\PrestaShop\Adapter\Supplier\SupplierProductSearchProvider;
 use PrestaShop\PrestaShop\Core\Product\Search\ProductSearchQuery;
 use PrestaShop\PrestaShop\Core\Product\Search\SortOrder;
 
 class SupplierControllerCore extends ProductListingFrontController
 {
-    /**
-     * @var string
-     */
+    /** @var string */
     public $php_self = 'supplier';
 
     /** @var Supplier|null */
     protected $supplier;
     protected $label;
 
+    /** @var SupplierPresenter */
+    protected $supplierPresenter;
+
     public function canonicalRedirection($canonicalURL = '')
     {
         if (Validate::isLoadedObject($this->supplier)) {
@@ -79,6 +81,9 @@ public function init()
             }
         }
 
+        // Initialize presenter, we will use it for all cases
+        $this->supplierPresenter = new SupplierPresenter($this->context->link);
+
         parent::init();
     }
 
@@ -155,7 +160,10 @@ protected function getDefaultProductSearchProvider()
      */
     protected function assignSupplier()
     {
-        $supplierVar = $this->objectPresenter->present($this->supplier);
+        $supplierVar = $this->supplierPresenter->present(
+            $this->supplier,
+            $this->context->language
+        );
 
         $filteredSupplier = Hook::exec(
             'filterSupplierContent',
@@ -202,26 +210,22 @@ protected function assignAll()
         }
 
         $this->context->smarty->assign([
-            'brands' => $suppliersVar,
+            'suppliers' => $suppliersVar,
         ]);
     }
 
     public function getTemplateVarSuppliers()
     {
         $suppliers = Supplier::getSuppliers(true, $this->context->language->id, true);
-        $suppliers_for_display = [];
-
-        foreach ($suppliers as $supplier) {
-            $suppliers_for_display[$supplier['id_supplier']] = $supplier;
-            $suppliers_for_display[$supplier['id_supplier']]['text'] = $supplier['description'];
-            $suppliers_for_display[$supplier['id_supplier']]['image'] = $this->context->link->getSupplierImageLink($supplier['id_supplier'], 'small_default');
-            $suppliers_for_display[$supplier['id_supplier']]['url'] = $this->context->link->getSupplierLink($supplier['id_supplier']);
-            $suppliers_for_display[$supplier['id_supplier']]['nb_products'] = $supplier['nb_products'] > 1
-                ? $this->trans('%number% products', ['%number%' => $supplier['nb_products']], 'Shop.Theme.Catalog')
-                : $this->trans('%number% product', ['%number%' => $supplier['nb_products']], 'Shop.Theme.Catalog');
+
+        foreach ($suppliers as &$supplier) {
+            $supplier = $this->supplierPresenter->present(
+                $supplier,
+                $this->context->language
+            );
         }
 
-        return $suppliers_for_display;
+        return $suppliers;
     }
 
     public function getListingLabel()
@@ -232,9 +236,8 @@ public function getListingLabel()
     public function getBreadcrumbLinks()
     {
         $breadcrumb = parent::getBreadcrumbLinks();
-
         $breadcrumb['links'][] = [
-            'title' => $this->trans('All suppliers', [], 'Shop.Theme.Catalog'),
+            'title' => $this->trans('Suppliers', [], 'Shop.Theme.Catalog'),
             'url' => $this->context->link->getPageLink('supplier', true),
         ];
 
diff --git a/src/Adapter/Presenter/Manufacturer/ManufacturerLazyArray.php b/src/Adapter/Presenter/Manufacturer/ManufacturerLazyArray.php
index 454834fc814c6..35494354d2f13 100644
--- a/src/Adapter/Presenter/Manufacturer/ManufacturerLazyArray.php
+++ b/src/Adapter/Presenter/Manufacturer/ManufacturerLazyArray.php
@@ -66,26 +66,7 @@ public function __construct(
         $this->link = $link;
 
         parent::__construct();
-    }
-
-    /**
-     * @arrayAccess
-     *
-     * @return int
-     */
-    public function getId()
-    {
-        return $this->manufacturer['id_manufacturer'];
-    }
-
-    /**
-     * @arrayAccess
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->manufacturer['name'];
+        $this->appendArray($this->manufacturer);
     }
 
     /**
@@ -98,26 +79,6 @@ public function getText()
         return $this->manufacturer['short_description'];
     }
 
-    /**
-     * @arrayAccess
-     *
-     * @return string
-     */
-    public function getShortDescription()
-    {
-        return $this->manufacturer['short_description'];
-    }
-
-    /**
-     * @arrayAccess
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        return $this->manufacturer['description'];
-    }
-
     /**
      * @arrayAccess
      *
diff --git a/src/Adapter/Presenter/Supplier/SupplierLazyArray.php b/src/Adapter/Presenter/Supplier/SupplierLazyArray.php
new file mode 100644
index 0000000000000..cd31d0e7c2cf4
--- /dev/null
+++ b/src/Adapter/Presenter/Supplier/SupplierLazyArray.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Adapter\Presenter\Supplier;
+
+use Language;
+use Link;
+use PrestaShop\PrestaShop\Adapter\Image\ImageRetriever;
+use PrestaShop\PrestaShop\Adapter\Presenter\AbstractLazyArray;
+use Supplier;
+
+class SupplierLazyArray extends AbstractLazyArray
+{
+    /**
+     * @var ImageRetriever
+     */
+    private $imageRetriever;
+
+    /**
+     * @var Link
+     */
+    private $link;
+
+    /**
+     * @var array
+     */
+    protected $supplier;
+
+    /**
+     * @var Language
+     */
+    private $language;
+
+    public function __construct(
+        array $supplier,
+        Language $language,
+        ImageRetriever $imageRetriever,
+        Link $link
+    ) {
+        $this->supplier = $supplier;
+        $this->language = $language;
+        $this->imageRetriever = $imageRetriever;
+        $this->link = $link;
+
+        parent::__construct();
+        $this->appendArray($this->supplier);
+    }
+
+    /**
+     * @arrayAccess
+     *
+     * @return string
+     */
+    public function getUrl()
+    {
+        return $this->link->getSupplierLink($this->supplier['id']);
+    }
+
+    /**
+     * @arrayAccess
+     *
+     * @return array|null
+     */
+    public function getImage()
+    {
+        return $this->imageRetriever->getImage(
+            new Supplier($this->supplier['id'], $this->language->getId()),
+            $this->supplier['id']
+        );
+    }
+
+    /**
+     * @arrayAccess
+     *
+     * @return int
+     */
+    public function getNbProducts()
+    {
+        if (!isset($this->supplier['nb_products'])) {
+            $this->supplier['nb_products'] = count(
+                (new Supplier($this->supplier['id'], $this->language->getId()))
+                    ->getProductsLite($this->language->getId())
+            );
+        }
+
+        return $this->supplier['nb_products'];
+    }
+}
diff --git a/src/Adapter/Presenter/Supplier/SupplierPresenter.php b/src/Adapter/Presenter/Supplier/SupplierPresenter.php
new file mode 100644
index 0000000000000..5003575895048
--- /dev/null
+++ b/src/Adapter/Presenter/Supplier/SupplierPresenter.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Adapter\Presenter\Supplier;
+
+use Hook;
+use Language;
+use Link;
+use PrestaShop\PrestaShop\Adapter\Image\ImageRetriever;
+use Supplier;
+
+class SupplierPresenter
+{
+    /**
+     * @var ImageRetriever
+     */
+    protected $imageRetriever;
+
+    /**
+     * @var Link
+     */
+    protected $link;
+
+    public function __construct(Link $link)
+    {
+        $this->link = $link;
+        $this->imageRetriever = new ImageRetriever($link);
+    }
+
+    /**
+     * @param array|Supplier $supplier Supplier object or an array
+     * @param Language $language
+     *
+     * @return SupplierLazyArray
+     */
+    public function present($supplier, $language)
+    {
+        // Convert to array if a Supplier object was passed
+        if (is_object($supplier)) {
+            $supplier = (array) $supplier;
+        }
+
+        // Normalize IDs
+        if (empty($supplier['id_supplier'])) {
+            $supplier['id_supplier'] = $supplier['id'];
+        }
+        if (empty($supplier['id'])) {
+            $supplier['id'] = $supplier['id_supplier'];
+        }
+
+        $supplierLazyArray = new SupplierLazyArray(
+            $supplier,
+            $language,
+            $this->imageRetriever,
+            $this->link
+        );
+
+        Hook::exec('actionPresentSupplier',
+            ['presentedSupplier' => &$supplierLazyArray]
+        );
+
+        return $supplierLazyArray;
+    }
+}

From e8de27a345becee36bf45f45437988e862d7ee42 Mon Sep 17 00:00:00 2001
From: Daniel Hlavacek <daniel.hlavacek@hotmail.cz>
Date: Mon, 22 May 2023 14:45:23 +0200
Subject: [PATCH 0070/1030] Update fixtures

---
 install-dev/data/xml/hook.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/install-dev/data/xml/hook.xml b/install-dev/data/xml/hook.xml
index 1d54094025e34..61bbf528cc0fc 100644
--- a/install-dev/data/xml/hook.xml
+++ b/install-dev/data/xml/hook.xml
@@ -2146,6 +2146,16 @@
       <title>Order Return Presenter</title>
       <description>This hook is called before an order return is presented</description>
     </hook>
+    <hook id="actionPresentSupplier">
+      <name>actionPresentSupplier</name>
+      <title>Supplier Presenter</title>
+      <description>This hook is called before a supplier is presented</description>
+    </hook>
+    <hook id="actionPresentManufacturer">
+      <name>actionPresentManufacturer</name>
+      <title>Manufacturer Presenter</title>
+      <description>This hook is called before a manufacturer is presented</description>
+    </hook>
     <hook id="actionPresentProduct">
       <name>actionPresentProduct</name>
       <title>Product Presenter</title>

From d0987f59dfc104e2f14a7c537933c60cf67859ce Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Wed, 7 Jun 2023 10:43:21 +0200
Subject: [PATCH 0071/1030] Typehint

---
 src/Adapter/Presenter/Manufacturer/ManufacturerPresenter.php | 2 +-
 src/Adapter/Presenter/Supplier/SupplierPresenter.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Adapter/Presenter/Manufacturer/ManufacturerPresenter.php b/src/Adapter/Presenter/Manufacturer/ManufacturerPresenter.php
index 1a51133e7319c..99c1373e51c42 100644
--- a/src/Adapter/Presenter/Manufacturer/ManufacturerPresenter.php
+++ b/src/Adapter/Presenter/Manufacturer/ManufacturerPresenter.php
@@ -56,7 +56,7 @@ public function __construct(Link $link)
      *
      * @return ManufacturerLazyArray
      */
-    public function present($manufacturer, $language)
+    public function present(array|Manufacturer $manufacturer, Language $language)
     {
         // Convert to array if a Manufacturer object was passed
         if (is_object($manufacturer)) {
diff --git a/src/Adapter/Presenter/Supplier/SupplierPresenter.php b/src/Adapter/Presenter/Supplier/SupplierPresenter.php
index 5003575895048..f28bc1a241c55 100644
--- a/src/Adapter/Presenter/Supplier/SupplierPresenter.php
+++ b/src/Adapter/Presenter/Supplier/SupplierPresenter.php
@@ -56,7 +56,7 @@ public function __construct(Link $link)
      *
      * @return SupplierLazyArray
      */
-    public function present($supplier, $language)
+    public function present(array|Supplier $supplier, Language $language)
     {
         // Convert to array if a Supplier object was passed
         if (is_object($supplier)) {

From 89029ed26861f86dea53bc134fafad2f70d1cb0b Mon Sep 17 00:00:00 2001
From: "matthieu.rolland" <matthieu.rolland@prestashop.com>
Date: Wed, 7 Jun 2023 15:18:08 +0200
Subject: [PATCH 0072/1030] keep file name from containing path traversal

---
 classes/CustomerMessage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/CustomerMessage.php b/classes/CustomerMessage.php
index 7099b486dc44f..8a8e39355099f 100644
--- a/classes/CustomerMessage.php
+++ b/classes/CustomerMessage.php
@@ -162,7 +162,7 @@ public static function getTotalCustomerMessages($where = null)
     public function delete()
     {
         if (!empty($this->file_name)) {
-            @unlink(_PS_UPLOAD_DIR_ . $this->file_name);
+            @unlink(_PS_UPLOAD_DIR_ . basename($this->file_name));
         }
 
         return parent::delete();

From a4aee98d3d5dbc127d03d0638e077d152ba483d3 Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Thu, 2 Feb 2023 16:58:23 +0100
Subject: [PATCH 0073/1030] APIS08b implement authorization server deletion

---
 .../Command/DeleteApplicationCommand.php      | 61 ++++++++++++
 .../CommandHandler/AddApplicationHandler.php  |  3 +-
 .../DeleteApplicationHandler.php              | 94 +++++++++++++++++++
 .../DeleteApplicationHandlerInterface.php     | 40 ++++++++
 .../CommandHandler/EditApplicationHandler.php |  2 +-
 .../Exception/DeleteApplicationException.php  | 36 +++++++
 .../Model/ApiAccessRepositoryInterface.php    | 41 ++++++++
 ...thorizedApplicationRepositoryInterface.php |  7 ++
 .../TransactionManagerInterface.php           | 45 +++++++++
 .../ApplicationController.php                 | 23 ++++-
 .../Entity/Repository/ApiAccessRepository.php | 21 ++++-
 .../AuthorizedApplicationRepository.php       |  9 ++
 .../config/services/bundle/repository.yml     |  5 +
 .../config/services/bundle/services.yml       |  8 ++
 .../core/domain/authorization_server.yml      |  6 ++
 .../AuthorizationServer/index.html.twig       |  2 +-
 .../Service/Database/TransactionManager.php   | 72 ++++++++++++++
 17 files changed, 468 insertions(+), 7 deletions(-)
 create mode 100644 src/Core/Domain/AuthorizationServer/Command/DeleteApplicationCommand.php
 create mode 100644 src/Core/Domain/AuthorizationServer/CommandHandler/DeleteApplicationHandler.php
 create mode 100644 src/Core/Domain/AuthorizationServer/CommandHandler/DeleteApplicationHandlerInterface.php
 create mode 100644 src/Core/Domain/AuthorizationServer/Exception/DeleteApplicationException.php
 create mode 100644 src/Core/Domain/AuthorizationServer/Model/ApiAccessRepositoryInterface.php
 create mode 100644 src/Core/Repository/TransactionManagerInterface.php
 create mode 100644 src/PrestaShopBundle/Service/Database/TransactionManager.php

diff --git a/src/Core/Domain/AuthorizationServer/Command/DeleteApplicationCommand.php b/src/Core/Domain/AuthorizationServer/Command/DeleteApplicationCommand.php
new file mode 100644
index 0000000000000..b3a473812b0fc
--- /dev/null
+++ b/src/Core/Domain/AuthorizationServer/Command/DeleteApplicationCommand.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Command;
+
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Exception\ApplicationConstraintException;
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\ValueObject\ApplicationId;
+
+/**
+ * Deletes application
+ */
+class DeleteApplicationCommand
+{
+    /**
+     * @var ApplicationId
+     */
+    private $applicationId;
+
+    /**
+     * @param $applicationId
+     *
+     * @throws ApplicationConstraintException
+     */
+    public function __construct($applicationId)
+    {
+        $this->applicationId = new ApplicationId($applicationId);
+    }
+
+    /**
+     * @return ApplicationId
+     */
+    public function getApplicationId(): ApplicationId
+    {
+        return $this->applicationId;
+    }
+}
diff --git a/src/Core/Domain/AuthorizationServer/CommandHandler/AddApplicationHandler.php b/src/Core/Domain/AuthorizationServer/CommandHandler/AddApplicationHandler.php
index ee37cb20639b0..840ec1bbf2ead 100644
--- a/src/Core/Domain/AuthorizationServer/CommandHandler/AddApplicationHandler.php
+++ b/src/Core/Domain/AuthorizationServer/CommandHandler/AddApplicationHandler.php
@@ -35,9 +35,10 @@
 use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Model\AuthorizedApplicationFactoryInterface;
 use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Model\AuthorizedApplicationRepositoryInterface;
 use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\ValueObject\ApplicationId;
+use PrestaShopBundle\Entity\AuthorizedApplication;
 
 /**
- * Handles command which adds new manufacturer using legacy object model
+ * Handles command which adds new application
  *
  * @experimental
  */
diff --git a/src/Core/Domain/AuthorizationServer/CommandHandler/DeleteApplicationHandler.php b/src/Core/Domain/AuthorizationServer/CommandHandler/DeleteApplicationHandler.php
new file mode 100644
index 0000000000000..b2e5a0f7525ff
--- /dev/null
+++ b/src/Core/Domain/AuthorizationServer/CommandHandler/DeleteApplicationHandler.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\CommandHandler;
+
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Command\DeleteApplicationCommand;
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Exception\DeleteApplicationException;
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Model\ApiAccessRepositoryInterface;
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Model\AuthorizedApplicationRepositoryInterface;
+use PrestaShop\PrestaShop\Core\Repository\TransactionManagerInterface;
+use PrestaShopBundle\Entity\AuthorizedApplication;
+
+/**
+ * Handles command which delete application
+ */
+class DeleteApplicationHandler implements DeleteApplicationHandlerInterface
+{
+    /**
+     * @var AuthorizedApplicationRepositoryInterface
+     */
+    private $applicationRepository;
+
+    /**
+     * @var ApiAccessRepositoryInterface
+     */
+    private $apiAccessRepository;
+
+    /**
+     * @var TransactionManagerInterface
+     */
+    private $transactionManager;
+
+    /**
+     * @param AuthorizedApplicationRepositoryInterface $applicationRepository
+     * @param ApiAccessRepositoryInterface $apiAccessRepository
+     * @param TransactionManagerInterface $transactionManager
+     */
+    public function __construct(
+        AuthorizedApplicationRepositoryInterface $applicationRepository,
+        ApiAccessRepositoryInterface $apiAccessRepository,
+        TransactionManagerInterface $transactionManager)
+    {
+        $this->applicationRepository = $applicationRepository;
+        $this->apiAccessRepository = $apiAccessRepository;
+        $this->transactionManager = $transactionManager;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @throws DeleteApplicationException
+     */
+    public function handle(DeleteApplicationCommand $command): void
+    {
+        $this->transactionManager->beginTransaction();
+
+        try {
+            /** @var ?AuthorizedApplication $application */
+            $application = $this->applicationRepository->getById($command->getApplicationId());
+            $this->apiAccessRepository->deleteByApplication($application);
+            $this->applicationRepository->delete($application);
+        } catch (\Exception $exception) {
+            $this->transactionManager->rollback();
+            throw new DeleteApplicationException($exception->getMessage());
+        }
+
+        $this->transactionManager->commit();
+    }
+}
diff --git a/src/Core/Domain/AuthorizationServer/CommandHandler/DeleteApplicationHandlerInterface.php b/src/Core/Domain/AuthorizationServer/CommandHandler/DeleteApplicationHandlerInterface.php
new file mode 100644
index 0000000000000..7d1bc50f0b7f3
--- /dev/null
+++ b/src/Core/Domain/AuthorizationServer/CommandHandler/DeleteApplicationHandlerInterface.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\CommandHandler;
+
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Command\DeleteApplicationCommand;
+
+/**
+ * Defines contract for DeleteApplicationHandler
+ */
+interface DeleteApplicationHandlerInterface
+{
+    /**
+     * @param DeleteApplicationCommand $command
+     */
+    public function handle(DeleteApplicationCommand $command);
+}
diff --git a/src/Core/Domain/AuthorizationServer/CommandHandler/EditApplicationHandler.php b/src/Core/Domain/AuthorizationServer/CommandHandler/EditApplicationHandler.php
index 6471f932ecc44..b8141b4ba5457 100644
--- a/src/Core/Domain/AuthorizationServer/CommandHandler/EditApplicationHandler.php
+++ b/src/Core/Domain/AuthorizationServer/CommandHandler/EditApplicationHandler.php
@@ -35,7 +35,7 @@
 use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Model\AuthorizedApplicationRepositoryInterface;
 
 /**
- * Handles command which adds new manufacturer using legacy object model
+ * Handles command which edit application
  *
  * @experimental
  */
diff --git a/src/Core/Domain/AuthorizationServer/Exception/DeleteApplicationException.php b/src/Core/Domain/AuthorizationServer/Exception/DeleteApplicationException.php
new file mode 100644
index 0000000000000..4e0f008acdeb0
--- /dev/null
+++ b/src/Core/Domain/AuthorizationServer/Exception/DeleteApplicationException.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Exception;
+
+/**
+ * Is thrown when application deletion failed
+ */
+class DeleteApplicationException extends ApplicationException
+{
+}
diff --git a/src/Core/Domain/AuthorizationServer/Model/ApiAccessRepositoryInterface.php b/src/Core/Domain/AuthorizationServer/Model/ApiAccessRepositoryInterface.php
new file mode 100644
index 0000000000000..b81af2453b6ac
--- /dev/null
+++ b/src/Core/Domain/AuthorizationServer/Model/ApiAccessRepositoryInterface.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Model;
+
+use PrestaShopBundle\Entity\AuthorizedApplication;
+
+interface ApiAccessRepositoryInterface
+{
+    /**
+     * @param AuthorizedApplication $application
+     *
+     * @return void
+     */
+    public function deleteByApplication(AuthorizedApplication $application): void;
+}
diff --git a/src/Core/Domain/AuthorizationServer/Model/AuthorizedApplicationRepositoryInterface.php b/src/Core/Domain/AuthorizationServer/Model/AuthorizedApplicationRepositoryInterface.php
index 032530cd0f09f..40374e2a3e387 100644
--- a/src/Core/Domain/AuthorizationServer/Model/AuthorizedApplicationRepositoryInterface.php
+++ b/src/Core/Domain/AuthorizationServer/Model/AuthorizedApplicationRepositoryInterface.php
@@ -67,4 +67,11 @@ public function getById(ApplicationId $applicationId): ?AuthorizedApplicationInt
      * @return AuthorizedApplicationInterface|null
      */
     public function getByName(string $name): ?AuthorizedApplicationInterface;
+
+    /**
+     * @param AuthorizedApplication $application
+     *
+     * @return void
+     */
+    public function delete(AuthorizedApplication $application): void;
 }
diff --git a/src/Core/Repository/TransactionManagerInterface.php b/src/Core/Repository/TransactionManagerInterface.php
new file mode 100644
index 0000000000000..51c410b1f5e6a
--- /dev/null
+++ b/src/Core/Repository/TransactionManagerInterface.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Repository;
+
+interface TransactionManagerInterface
+{
+    /**
+     * Initiate a transaction
+     */
+    public function beginTransaction();
+
+    /**
+     * Commit a transaction
+     */
+    public function commit();
+
+    /**
+     * Rollback a transaction
+     */
+    public function rollback();
+}
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/AuthorizationServer/ApplicationController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/AuthorizationServer/ApplicationController.php
index bb6f1e0e297f9..05b3a36aa7d85 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/AuthorizationServer/ApplicationController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/AuthorizationServer/ApplicationController.php
@@ -29,8 +29,11 @@
 namespace PrestaShopBundle\Controller\Admin\Configure\AdvancedParameters\AuthorizationServer;
 
 use Exception;
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Command\DeleteApplicationCommand;
 use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Exception\ApplicationConstraintException;
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Exception\ApplicationException;
 use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Exception\ApplicationNotFoundException;
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Exception\DeleteApplicationException;
 use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Exception\DuplicateApplicationNameException;
 use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Query\GetApplicationForEditing;
 use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\QueryResult\EditableApplication;
@@ -163,10 +166,19 @@ public function editAction(Request $request, int $applicationId): Response
     /**
      * @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))")
      */
-    public function deleteAction(): void
+    public function deleteAction(int $applicationId)
     {
-        // TODO: Implement deleteAction() method in delete PR.
-        throw new NotImplementedException();
+        try {
+            $this->getCommandBus()->handle(new DeleteApplicationCommand($applicationId));
+            $this->addFlash(
+                'success',
+                $this->trans('Successful deletion', 'Admin.Notifications.Success')
+            );
+        } catch (ApplicationException $e) {
+            $this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages($e)));
+        }
+
+        return $this->redirectToRoute('admin_authorized_applications_index');
     }
 
     /**
@@ -215,6 +227,11 @@ private function getErrorMessages(Exception $e): array
                 ),
                 $e instanceof DuplicateApplicationNameException ? $e->getDuplicateActionName() : ''
             ),
+            DeleteApplicationException::class => $this->trans(
+                'An error occurred during application deletion: %s',
+                'Admin.Notifications.Error',
+                [sprintf('"%s"', $e->getMessage())]
+            ),
             ApplicationConstraintException::class => [
                 CustomerConstraintException::INVALID_ID => $this->trans(
                     'The %s field is invalid.',
diff --git a/src/PrestaShopBundle/Entity/Repository/ApiAccessRepository.php b/src/PrestaShopBundle/Entity/Repository/ApiAccessRepository.php
index 4ec3c160a461a..702f5e8cdc5f9 100644
--- a/src/PrestaShopBundle/Entity/Repository/ApiAccessRepository.php
+++ b/src/PrestaShopBundle/Entity/Repository/ApiAccessRepository.php
@@ -29,10 +29,29 @@
 namespace PrestaShopBundle\Entity\Repository;
 
 use Doctrine\ORM\EntityRepository;
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Model\ApiAccessRepositoryInterface;
+use PrestaShopBundle\Entity\AuthorizedApplication;
 
 /**
  * @experimental
  */
-class ApiAccessRepository extends EntityRepository
+class ApiAccessRepository extends EntityRepository implements ApiAccessRepositoryInterface
 {
+    /**
+     * {@inheritdoc}
+     */
+    public function deleteByApplication(AuthorizedApplication $application): void
+    {
+        $queryBuilder = $this->getEntityManager()->createQueryBuilder();
+
+        $queryBuilder
+            ->delete()
+            ->from($this->getEntityName(), 'e')
+            ->where('e.authorizedApplication = :authorizedApplication')
+            ->setParameter('authorizedApplication', $application);
+
+        $query = $queryBuilder->getQuery();
+
+        $query->execute();
+    }
 }
diff --git a/src/PrestaShopBundle/Entity/Repository/AuthorizedApplicationRepository.php b/src/PrestaShopBundle/Entity/Repository/AuthorizedApplicationRepository.php
index 5223f102fa80a..c215ede95aa84 100644
--- a/src/PrestaShopBundle/Entity/Repository/AuthorizedApplicationRepository.php
+++ b/src/PrestaShopBundle/Entity/Repository/AuthorizedApplicationRepository.php
@@ -81,4 +81,13 @@ public function getByName(string $name): ?AuthorizedApplicationInterface
 
         return $application;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function delete(AuthorizedApplication $application): void
+    {
+        $this->getEntityManager()->remove($application);
+        $this->getEntityManager()->flush();
+    }
 }
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/repository.yml b/src/PrestaShopBundle/Resources/config/services/bundle/repository.yml
index 9060ab6b50483..dd44b16faaf35 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/repository.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/repository.yml
@@ -138,3 +138,8 @@ services:
     arguments:
       - PrestaShopBundle\Entity\AuthorizedApplication
     public: true
+
+  PrestaShopBundle\Entity\Repository\ApiAccessRepository:
+    factory: [ '@doctrine.orm.default_entity_manager', getRepository ]
+    arguments:
+      - PrestaShopBundle\Entity\ApiAccess
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/services.yml b/src/PrestaShopBundle/Resources/config/services/bundle/services.yml
index 0912adfa4f594..51c321d5d8880 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/services.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/services.yml
@@ -115,3 +115,11 @@ services:
     arguments:
       $storage: "@security.csrf.token_storage"
     autowire: true
+
+  PrestaShopBundle\Service\Database\TransactionManager:
+    public: false
+    autowire: true
+    arguments:
+      - '@doctrine.orm.entity_manager'
+
+  PrestaShop\PrestaShop\Core\Repository\TransactionManagerInterface: '@PrestaShopBundle\Service\Database\TransactionManager'
diff --git a/src/PrestaShopBundle/Resources/config/services/core/domain/authorization_server.yml b/src/PrestaShopBundle/Resources/config/services/core/domain/authorization_server.yml
index 8f1f939403820..c63a82e6b9d5f 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/domain/authorization_server.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/domain/authorization_server.yml
@@ -4,6 +4,7 @@ services:
     autowire: true
 
   PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Model\AuthorizedApplicationRepositoryInterface: '@PrestaShopBundle\Entity\Repository\AuthorizedApplicationRepository'
+  PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Model\ApiAccessRepositoryInterface: '@PrestaShopBundle\Entity\Repository\ApiAccessRepository'
 
   PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\CommandHandler\AddApplicationHandler:
     tags:
@@ -20,6 +21,11 @@ services:
       - name: tactician.handler
         command: 'PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Query\GetApplicationForEditing'
 
+  PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\CommandHandler\DeleteApplicationHandler:
+    tags:
+      - name: tactician.handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Command\DeleteApplicationCommand'
+
   PrestaShopBundle\Model\AuthorizationServer\AuthorizedApplicationFactory: ~
 
   PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Model\AuthorizedApplicationFactoryInterface: '@PrestaShopBundle\Model\AuthorizationServer\AuthorizedApplicationFactory'
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Configure/AdvancedParameters/AuthorizationServer/index.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Configure/AdvancedParameters/AuthorizationServer/index.html.twig
index 311839b7d87ea..7ab7ea630e206 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Configure/AdvancedParameters/AuthorizationServer/index.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Configure/AdvancedParameters/AuthorizationServer/index.html.twig
@@ -32,6 +32,6 @@
 {% endblock %}
 {% block javascripts %}
   {{ parent() }}
-  <script src="{{ asset('themes/new-theme/public/authorization-server.bundle.js') }}"></script>
+  <script src="{{ asset('themes/new-theme/public/authorization_server.bundle.js') }}"></script>
   <script src="{{ asset('themes/default/js/bundle/pagination.js') }}"></script>
 {% endblock %}
diff --git a/src/PrestaShopBundle/Service/Database/TransactionManager.php b/src/PrestaShopBundle/Service/Database/TransactionManager.php
new file mode 100644
index 0000000000000..278e4d2b73dff
--- /dev/null
+++ b/src/PrestaShopBundle/Service/Database/TransactionManager.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\Service\Database;
+
+use Doctrine\ORM\EntityManager;
+use PrestaShop\PrestaShop\Core\Repository\TransactionManagerInterface;
+
+class TransactionManager implements TransactionManagerInterface
+{
+    /**
+     * @var EntityManager
+     */
+    private $entityManager;
+
+    /**
+     * @param EntityManager $entityManager
+     */
+    public function __construct(EntityManager $entityManager)
+    {
+        $this->entityManager = $entityManager;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function rollback(): void
+    {
+        $this->entityManager->rollback();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function commit(): void
+    {
+        $this->entityManager->commit();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function beginTransaction(): void
+    {
+        $this->entityManager->beginTransaction();
+    }
+}

From 0a72bceea0cd7361b25c9e20bf402043833a30ff Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Wed, 26 Apr 2023 18:05:00 +0200
Subject: [PATCH 0074/1030] Fix grid line actions, add @experimental tags

---
 .../new-theme/js/pages/authorization-server/index.ts |  4 +++-
 .../Command/DeleteApplicationCommand.php             |  2 ++
 .../CommandHandler/DeleteApplicationHandler.php      |  2 ++
 .../DeleteApplicationHandlerInterface.php            |  2 ++
 .../Exception/DeleteApplicationException.php         |  2 ++
 .../Model/ApiAccessRepositoryInterface.php           |  3 +++
 .../AuthorizedApplicationRepositoryInterface.php     | 12 ++++++------
 .../Repository/AuthorizedApplicationRepository.php   |  6 +++---
 .../config/services/core/form/form_data_handler.yml  |  1 +
 .../config/services/core/form/form_data_provider.yml |  1 +
 10 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/admin-dev/themes/new-theme/js/pages/authorization-server/index.ts b/admin-dev/themes/new-theme/js/pages/authorization-server/index.ts
index 67dbfe517d86b..6c02feb5d9563 100644
--- a/admin-dev/themes/new-theme/js/pages/authorization-server/index.ts
+++ b/admin-dev/themes/new-theme/js/pages/authorization-server/index.ts
@@ -31,11 +31,12 @@ import SortingExtension from '@components/grid/extension/sorting-extension';
 import SubmitGridActionExtension from '@components/grid/extension/submit-grid-action-extension';
 import FiltersSubmitButtonEnablerExtension
   from '@components/grid/extension/filters-submit-button-enabler-extension';
+import SubmitRowActionExtension from "@components/grid/extension/action/row/submit-row-action-extension";
 
 const {$} = window;
 
 $(() => {
-  const grid = new Grid('authorization_server');
+  const grid = new Grid('authorized_application');
 
   grid.addExtension(new ReloadListActionExtension());
   grid.addExtension(new ExportToSqlManagerExtension());
@@ -43,4 +44,5 @@ $(() => {
   grid.addExtension(new SortingExtension());
   grid.addExtension(new SubmitGridActionExtension());
   grid.addExtension(new FiltersSubmitButtonEnablerExtension());
+  grid.addExtension(new SubmitRowActionExtension());
 });
diff --git a/src/Core/Domain/AuthorizationServer/Command/DeleteApplicationCommand.php b/src/Core/Domain/AuthorizationServer/Command/DeleteApplicationCommand.php
index b3a473812b0fc..b55fc839e18e9 100644
--- a/src/Core/Domain/AuthorizationServer/Command/DeleteApplicationCommand.php
+++ b/src/Core/Domain/AuthorizationServer/Command/DeleteApplicationCommand.php
@@ -33,6 +33,8 @@
 
 /**
  * Deletes application
+ *
+ * @experimental
  */
 class DeleteApplicationCommand
 {
diff --git a/src/Core/Domain/AuthorizationServer/CommandHandler/DeleteApplicationHandler.php b/src/Core/Domain/AuthorizationServer/CommandHandler/DeleteApplicationHandler.php
index b2e5a0f7525ff..0083bb5a348e4 100644
--- a/src/Core/Domain/AuthorizationServer/CommandHandler/DeleteApplicationHandler.php
+++ b/src/Core/Domain/AuthorizationServer/CommandHandler/DeleteApplicationHandler.php
@@ -37,6 +37,8 @@
 
 /**
  * Handles command which delete application
+ *
+ * @experimental
  */
 class DeleteApplicationHandler implements DeleteApplicationHandlerInterface
 {
diff --git a/src/Core/Domain/AuthorizationServer/CommandHandler/DeleteApplicationHandlerInterface.php b/src/Core/Domain/AuthorizationServer/CommandHandler/DeleteApplicationHandlerInterface.php
index 7d1bc50f0b7f3..e5a65316da60f 100644
--- a/src/Core/Domain/AuthorizationServer/CommandHandler/DeleteApplicationHandlerInterface.php
+++ b/src/Core/Domain/AuthorizationServer/CommandHandler/DeleteApplicationHandlerInterface.php
@@ -30,6 +30,8 @@
 
 /**
  * Defines contract for DeleteApplicationHandler
+ *
+ * @experimental
  */
 interface DeleteApplicationHandlerInterface
 {
diff --git a/src/Core/Domain/AuthorizationServer/Exception/DeleteApplicationException.php b/src/Core/Domain/AuthorizationServer/Exception/DeleteApplicationException.php
index 4e0f008acdeb0..4bed13cb2e03a 100644
--- a/src/Core/Domain/AuthorizationServer/Exception/DeleteApplicationException.php
+++ b/src/Core/Domain/AuthorizationServer/Exception/DeleteApplicationException.php
@@ -30,6 +30,8 @@
 
 /**
  * Is thrown when application deletion failed
+ *
+ * @experimental
  */
 class DeleteApplicationException extends ApplicationException
 {
diff --git a/src/Core/Domain/AuthorizationServer/Model/ApiAccessRepositoryInterface.php b/src/Core/Domain/AuthorizationServer/Model/ApiAccessRepositoryInterface.php
index b81af2453b6ac..14d2e57b34188 100644
--- a/src/Core/Domain/AuthorizationServer/Model/ApiAccessRepositoryInterface.php
+++ b/src/Core/Domain/AuthorizationServer/Model/ApiAccessRepositoryInterface.php
@@ -30,6 +30,9 @@
 
 use PrestaShopBundle\Entity\AuthorizedApplication;
 
+/**
+ * @experimental
+ */
 interface ApiAccessRepositoryInterface
 {
     /**
diff --git a/src/Core/Domain/AuthorizationServer/Model/AuthorizedApplicationRepositoryInterface.php b/src/Core/Domain/AuthorizationServer/Model/AuthorizedApplicationRepositoryInterface.php
index 40374e2a3e387..ed60d4898a94d 100644
--- a/src/Core/Domain/AuthorizationServer/Model/AuthorizedApplicationRepositoryInterface.php
+++ b/src/Core/Domain/AuthorizationServer/Model/AuthorizedApplicationRepositoryInterface.php
@@ -55,23 +55,23 @@ public function update(AuthorizedApplicationInterface $application): void;
      *
      * @throws ApplicationNotFoundException
      *
-     * @return AuthorizedApplicationInterface|null
+     * @return AuthorizedApplicationInterface
      */
-    public function getById(ApplicationId $applicationId): ?AuthorizedApplicationInterface;
+    public function getById(ApplicationId $applicationId): AuthorizedApplicationInterface;
 
     /**
      * @param string $name
      *
      * @throws ApplicationNotFoundException
      *
-     * @return AuthorizedApplicationInterface|null
+     * @return AuthorizedApplicationInterface
      */
-    public function getByName(string $name): ?AuthorizedApplicationInterface;
+    public function getByName(string $name): AuthorizedApplicationInterface;
 
     /**
-     * @param AuthorizedApplication $application
+     * @param AuthorizedApplicationInterface $application
      *
      * @return void
      */
-    public function delete(AuthorizedApplication $application): void;
+    public function delete(AuthorizedApplicationInterface $application): void;
 }
diff --git a/src/PrestaShopBundle/Entity/Repository/AuthorizedApplicationRepository.php b/src/PrestaShopBundle/Entity/Repository/AuthorizedApplicationRepository.php
index c215ede95aa84..58d6976873c14 100644
--- a/src/PrestaShopBundle/Entity/Repository/AuthorizedApplicationRepository.php
+++ b/src/PrestaShopBundle/Entity/Repository/AuthorizedApplicationRepository.php
@@ -59,7 +59,7 @@ public function update(AuthorizedApplicationInterface $application): void
     /**
      * {@inheritdoc}
      */
-    public function getById(ApplicationId $applicationId): ?AuthorizedApplicationInterface
+    public function getById(ApplicationId $applicationId): AuthorizedApplicationInterface
     {
         $application = $this->find($applicationId->getValue());
         if ($application === null) {
@@ -72,7 +72,7 @@ public function getById(ApplicationId $applicationId): ?AuthorizedApplicationInt
     /**
      * {@inheritdoc}
      */
-    public function getByName(string $name): ?AuthorizedApplicationInterface
+    public function getByName(string $name): AuthorizedApplicationInterface
     {
         $application = $this->findOneBy(['name' => $name]);
         if ($application === null) {
@@ -85,7 +85,7 @@ public function getByName(string $name): ?AuthorizedApplicationInterface
     /**
      * {@inheritdoc}
      */
-    public function delete(AuthorizedApplication $application): void
+    public function delete(AuthorizedApplicationInterface $application): void
     {
         $this->getEntityManager()->remove($application);
         $this->getEntityManager()->flush();
diff --git a/src/PrestaShopBundle/Resources/config/services/core/form/form_data_handler.yml b/src/PrestaShopBundle/Resources/config/services/core/form/form_data_handler.yml
index 48bee65d92dcf..cf9915f00c23a 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/form/form_data_handler.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/form/form_data_handler.yml
@@ -261,6 +261,7 @@ services:
   PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataHandler\ApplicationFormDataHandler:
     arguments:
       - '@prestashop.core.command_bus'
+    autowire: true
 
   PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataHandler\TaxRulesGroupFormDataHandler:
     arguments:
diff --git a/src/PrestaShopBundle/Resources/config/services/core/form/form_data_provider.yml b/src/PrestaShopBundle/Resources/config/services/core/form/form_data_provider.yml
index 19db8f728725b..e774568830a73 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/form/form_data_provider.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/form/form_data_provider.yml
@@ -230,6 +230,7 @@ services:
   PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataProvider\ApplicationFormDataProvider:
     arguments:
       - '@prestashop.core.command_bus'
+    autowire: true
 
   PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataProvider\TaxRulesGroupFormDataProvider:
     arguments:

From e96fae027ae91dec5f1d3080269b2597261aa470 Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Thu, 27 Apr 2023 10:01:47 +0200
Subject: [PATCH 0075/1030] Fix CI

---
 .../themes/new-theme/js/pages/authorization-server/index.ts  | 2 +-
 .../CommandHandler/AddApplicationHandler.php                 | 1 -
 .../QueryHandler/GetApplicationForEditingHandler.php         | 5 -----
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/admin-dev/themes/new-theme/js/pages/authorization-server/index.ts b/admin-dev/themes/new-theme/js/pages/authorization-server/index.ts
index 6c02feb5d9563..1062a365d0025 100644
--- a/admin-dev/themes/new-theme/js/pages/authorization-server/index.ts
+++ b/admin-dev/themes/new-theme/js/pages/authorization-server/index.ts
@@ -31,7 +31,7 @@ import SortingExtension from '@components/grid/extension/sorting-extension';
 import SubmitGridActionExtension from '@components/grid/extension/submit-grid-action-extension';
 import FiltersSubmitButtonEnablerExtension
   from '@components/grid/extension/filters-submit-button-enabler-extension';
-import SubmitRowActionExtension from "@components/grid/extension/action/row/submit-row-action-extension";
+import SubmitRowActionExtension from '@components/grid/extension/action/row/submit-row-action-extension';
 
 const {$} = window;
 
diff --git a/src/Core/Domain/AuthorizationServer/CommandHandler/AddApplicationHandler.php b/src/Core/Domain/AuthorizationServer/CommandHandler/AddApplicationHandler.php
index 840ec1bbf2ead..6d1f8d7492a6b 100644
--- a/src/Core/Domain/AuthorizationServer/CommandHandler/AddApplicationHandler.php
+++ b/src/Core/Domain/AuthorizationServer/CommandHandler/AddApplicationHandler.php
@@ -35,7 +35,6 @@
 use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Model\AuthorizedApplicationFactoryInterface;
 use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Model\AuthorizedApplicationRepositoryInterface;
 use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\ValueObject\ApplicationId;
-use PrestaShopBundle\Entity\AuthorizedApplication;
 
 /**
  * Handles command which adds new application
diff --git a/src/Core/Domain/AuthorizationServer/QueryHandler/GetApplicationForEditingHandler.php b/src/Core/Domain/AuthorizationServer/QueryHandler/GetApplicationForEditingHandler.php
index 110a91f10522b..20395f6a41778 100644
--- a/src/Core/Domain/AuthorizationServer/QueryHandler/GetApplicationForEditingHandler.php
+++ b/src/Core/Domain/AuthorizationServer/QueryHandler/GetApplicationForEditingHandler.php
@@ -28,7 +28,6 @@
 
 namespace PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\QueryHandler;
 
-use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Exception\ApplicationNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Model\AuthorizedApplicationRepositoryInterface;
 use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Query\GetApplicationForEditing;
 use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\QueryResult\EditableApplication;
@@ -57,10 +56,6 @@ public function handle(GetApplicationForEditing $query)
     {
         $application = $this->applicationRepository->getById($query->getApplicationId());
 
-        if ($application === null) {
-            throw new ApplicationNotFoundException(sprintf('Application with id "%d" was not found.', $query->getApplicationId()->getValue()));
-        }
-
         return new EditableApplication($query->getApplicationId(), $application->getName(), $application->getDescription());
     }
 }

From b5712623a6de3c0e4c759c4e2cb991e2b86c4aa6 Mon Sep 17 00:00:00 2001
From: boubkerbribri <boubker.bribri@prestashop.com>
Date: Wed, 7 Jun 2023 18:01:38 +0200
Subject: [PATCH 0076/1030] Refacto Ws tests countries

---
 .../functional/WS/01_countriesCRUD.ts         | 734 +++++++++++-------
 tests/UI/data/xml/country.ts                  |  23 +
 2 files changed, 465 insertions(+), 292 deletions(-)
 create mode 100644 tests/UI/data/xml/country.ts

diff --git a/tests/UI/campaigns/functional/WS/01_countriesCRUD.ts b/tests/UI/campaigns/functional/WS/01_countriesCRUD.ts
index 063857e5fdfc8..910b825bf65c1 100644
--- a/tests/UI/campaigns/functional/WS/01_countriesCRUD.ts
+++ b/tests/UI/campaigns/functional/WS/01_countriesCRUD.ts
@@ -16,9 +16,12 @@ import addCountryPage from '@pages/BO/international/locations/countries/add';
 
 // Import data
 import {WebservicePermission} from '@data/types/webservice';
+import countryXml from '@data/xml/country';
 
 import {expect} from 'chai';
-import type {APIRequestContext, BrowserContext, Page} from 'playwright';
+import type {
+  APIResponse, APIRequestContext, BrowserContext, Page,
+} from 'playwright';
 
 const baseContext: string = 'functional_WS_countriesCRUD';
 
@@ -35,45 +38,8 @@ describe('WS - Countries : CRUD', async () => {
       methods: ['all'],
     },
   ];
-  const xmlCreate: string = `<?xml version="1.0" encoding="UTF-8"?>
-       <prestashop xmlns:xlink="http://www.w3.org/1999/xlink">
-       <country>
-           <id_zone><![CDATA[1]]></id_zone>
-           <id_currency><![CDATA[1]]></id_currency>
-           <call_prefix><![CDATA[123]]></call_prefix>
-           <iso_code><![CDATA[tst]]></iso_code>
-           <active><![CDATA[1]]></active>
-           <contains_states><![CDATA[0]]></contains_states>
-           <need_identification_number><![CDATA[0]]></need_identification_number>
-           <need_zip_code><![CDATA[0]]></need_zip_code>
-           <zip_code_format><![CDATA[NNLLNN]]></zip_code_format>
-           <display_tax_label><![CDATA[0]]></display_tax_label>
-           <name>
-               <language id="1"><![CDATA[Test in English]]></language>
-               <language id="2"><![CDATA[Test en Français]]></language>
-           </name>
-       </country>
-    </prestashop>`;
-  const xmlUpdate: string = `<?xml version="1.0" encoding="UTF-8"?>
-       <prestashop xmlns:xlink="http://www.w3.org/1999/xlink">
-       <country>
-           <id><![CDATA[{fetchedId}]]></id>
-           <id_zone><![CDATA[2]]></id_zone>
-           <id_currency><![CDATA[1]]></id_currency>
-           <call_prefix><![CDATA[456]]></call_prefix>
-           <iso_code><![CDATA[upd]]></iso_code>
-           <active><![CDATA[0]]></active>
-           <contains_states><![CDATA[0]]></contains_states>
-           <need_identification_number><![CDATA[1]]></need_identification_number>
-           <need_zip_code><![CDATA[1]]></need_zip_code>
-           <zip_code_format><![CDATA[LLNNLL]]></zip_code_format>
-           <display_tax_label><![CDATA[1]]></display_tax_label>
-           <name>
-               <language id="1"><![CDATA[Updated in English]]></language>
-               <language id="2"><![CDATA[Mis à jour en Français]]></language>
-           </name>
-       </country>
-       </prestashop>`;
+  const xmlCreate: string = countryXml();
+  let xmlUpdate: string;
 
   // before and after functions
   before(async function () {
@@ -132,26 +98,48 @@ describe('WS - Countries : CRUD', async () => {
         await expect(wsKey).to.be.not.empty;
       });
     });
+
     describe('Endpoint : /api/countries - Method : GET ', () => {
-      it('should request the endpoint /api/countries with method GET', async function () {
-        await testContext.addContextItem(this, 'testIdentifier', 'requestEndpointCountriesMethodGet', baseContext);
+      let apiResponse : APIResponse;
+      let xmlResponse : string;
+      let countriesNode: Element[];
+
+      it('should check response status', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestGetStatus1', baseContext);
 
-        const apiResponse = await apiContext.get('api/countries/', {
+        apiResponse = await apiContext.get('api/countries/', {
           headers: {
             Authorization: `Basic ${Buffer.from(`${wsKey}:`).toString('base64')}`,
           },
         });
+
         await expect(apiResponse.status()).to.eq(200);
+      });
+
+      it('should check response root node', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestGetRootNode1', baseContext);
 
-        const xml: string = await apiResponse.text();
-        expect(ws.getWSRootNodeName(xml)).to.be.eq('prestashop');
+        xmlResponse = await apiResponse.text();
+        expect(ws.getWSRootNodeName(xmlResponse)).to.be.eq('prestashop');
+      });
+
+      it('should check number of node under prestashop', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestGetNodeNumber1', baseContext);
 
-        const rootNodes = ws.getWSNodes(xml, '/prestashop/*');
+        const rootNodes = ws.getWSNodes(xmlResponse, '/prestashop/*');
         expect(rootNodes.length).to.be.eq(1);
         expect(rootNodes[0].nodeName).to.be.eq('countries');
+      });
 
-        const countriesNode = ws.getWSNodes(xml, '/prestashop/countries/*');
+      it('should check number of nodes under countries node', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestGetNumberOfNodes1', baseContext);
+
+        countriesNode = ws.getWSNodes(xmlResponse, '/prestashop/countries/*');
         expect(countriesNode.length).to.be.gt(0);
+      });
+
+      it('should check each node name, attributes and xlink:href', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestGetCheckAll1', baseContext);
 
         for (let c: number = 0; c < countriesNode.length; c++) {
           const countryNode: Element = countriesNode[c];
@@ -172,338 +160,500 @@ describe('WS - Countries : CRUD', async () => {
         }
       });
     });
+
     describe('Endpoint : /api/countries - Method : POST ', () => {
-      it('should request the endpoint /api/countries with method POST', async function () {
-        await testContext.addContextItem(this, 'testIdentifier', 'requestEndpointCountriesMethodPost', baseContext);
+      describe('Endpoint : /api/countries - Method : POST - Add Country ', () => {
+        let apiResponse: APIResponse;
+        let xmlResponse : string;
+
+        it('should check response status', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestPostStatus1', baseContext);
+
+          apiResponse = await apiContext.post('api/countries/', {
+            headers: {
+              Authorization: `Basic ${Buffer.from(`${wsKey}:`).toString('base64')}`,
+            },
+            data: xmlCreate,
+          });
+          await expect(apiResponse.status()).to.eq(201);
+        });
 
-        const apiResponse = await apiContext.post('api/countries/', {
-          headers: {
-            Authorization: `Basic ${Buffer.from(`${wsKey}:`).toString('base64')}`,
-          },
-          data: xmlCreate,
+        it('should check response root node', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestPostRootNode1', baseContext);
+
+          xmlResponse = await apiResponse.text();
+          expect(ws.getWSRootNodeName(xmlResponse)).to.be.eq('prestashop');
         });
-        await expect(apiResponse.status()).to.eq(201);
 
-        const xml: string = await apiResponse.text();
-        expect(ws.getWSRootNodeName(xml)).to.be.eq('prestashop');
+        it('should check number of node under prestashop', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestPostNodeNumber1', baseContext);
 
-        const rootNodes = ws.getWSNodes(xml, '/prestashop/*');
-        expect(rootNodes.length).to.be.eq(1);
-        expect(rootNodes[0].nodeName).to.be.eq('country');
+          const rootNodes = ws.getWSNodes(xmlResponse, '/prestashop/*');
+          expect(rootNodes.length).to.be.eq(1);
+          expect(rootNodes[0].nodeName).to.be.eq('country');
+        });
 
-        // Attribute : id
-        countryNodeID = ws.getWSNodeValue(xml, '/prestashop/country/id');
-        expect(countryNodeID).to.be.eq(parseInt(countryNodeID, 10).toString());
+        it('should check id of the country', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestPostCheckId1', baseContext);
+
+          // Attribute : id
+          countryNodeID = ws.getWSNodeValue(xmlResponse, '/prestashop/country/id');
+          expect(countryNodeID).to.be.eq(parseInt(countryNodeID, 10).toString());
+        });
       });
 
-      it('should request the endpoint /api/countries/{id} with method GET', async function () {
-        await testContext.addContextItem(this, 'testIdentifier', 'requestEndpointCountriesIdMethodGetAfterPost', baseContext);
+      describe('Endpoint : /api/countries/{id} - Method : POST - Check with WS ', () => {
+        let apiResponse: APIResponse;
+        let xmlResponse : string;
+        let countriesNodes: Element[];
 
-        const apiResponse = await apiContext.get(`api/countries/${countryNodeID}`, {
-          headers: {
-            Authorization: `Basic ${Buffer.from(`${wsKey}:`).toString('base64')}`,
-          },
+        it('should check response status', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestGetIDStatus', baseContext);
+
+          apiResponse = await apiContext.get(`api/countries/${countryNodeID}`, {
+            headers: {
+              Authorization: `Basic ${Buffer.from(`${wsKey}:`).toString('base64')}`,
+            },
+          });
+          await expect(apiResponse.status()).to.eq(200);
         });
-        await expect(apiResponse.status()).to.eq(200);
 
-        const xml: string = await apiResponse.text();
-        expect(ws.getWSRootNodeName(xml)).to.be.eq('prestashop');
+        it('should check response root node', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestGetIDRootNode1', baseContext);
 
-        const rootNodes = ws.getWSNodes(xml, '/prestashop/*');
-        expect(rootNodes.length).to.be.eq(1);
-        expect(rootNodes[0].nodeName).to.be.eq('country');
-
-        const objectNodes = ws.getWSNodes(xml, '/prestashop/country/*');
-        expect(objectNodes.length).to.be.gt(0);
-
-        // Check nodes are equal to them done in Create
-        for (let o: number = 0; o < objectNodes.length; o++) {
-          const oNode: Element = objectNodes[o];
-
-          if (oNode.nodeName === 'id') {
-            expect(oNode.textContent).to.be.eq(countryNodeID);
-          } else if (oNode.nodeName === 'name') {
-            const objectNodeValueEN = ws.getWSNodeValue(xmlCreate, `/prestashop/country/${oNode.nodeName}/language[@id="1"]`);
-            const createNodeValueEN = ws.getWSNodeValue(xmlCreate, `/prestashop/country/${oNode.nodeName}/language[@id="1"]`);
-            expect(objectNodeValueEN).to.be.eq(createNodeValueEN);
-
-            const objectNodeValueFR = ws.getWSNodeValue(xmlCreate, `/prestashop/country/${oNode.nodeName}/language[@id="2"]`);
-            const createNodeValueFR = ws.getWSNodeValue(xmlCreate, `/prestashop/country/${oNode.nodeName}/language[@id="2"]`);
-            expect(objectNodeValueFR).to.be.eq(createNodeValueFR);
-          } else {
-            const objectNodeValue: string = ws.getWSNodeValue(xmlCreate, `/prestashop/country/${oNode.nodeName}`);
-            expect(oNode.textContent).to.be.eq(objectNodeValue);
+          xmlResponse = await apiResponse.text();
+          expect(ws.getWSRootNodeName(xmlResponse)).to.be.eq('prestashop');
+        });
+
+        it('should check number of node under prestashop', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestGetIDNodeNumber1', baseContext);
+
+          const rootNodes = ws.getWSNodes(xmlResponse, '/prestashop/*');
+          expect(rootNodes.length).to.be.eq(1);
+          expect(rootNodes[0].nodeName).to.be.eq('country');
+        });
+
+        it('should check number of nodes under countries node', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestGetIDNumberOfNodes1', baseContext);
+
+          countriesNodes = ws.getWSNodes(xmlResponse, '/prestashop/country/*');
+          expect(countriesNodes.length).to.be.gt(0);
+        });
+
+        it('should check each node id, name ...', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestGetIDCheckAll', baseContext);
+
+          // Check nodes are equal to them done in Create
+          for (let o: number = 0; o < countriesNodes.length; o++) {
+            const oNode: Element = countriesNodes[o];
+
+            if (oNode.nodeName === 'id') {
+              expect(oNode.textContent).to.be.eq(countryNodeID);
+            } else if (oNode.nodeName === 'name') {
+              const objectNodeValueEN = ws.getWSNodeValue(xmlCreate, `/prestashop/country/${oNode.nodeName}/language[@id="1"]`);
+              const createNodeValueEN = ws.getWSNodeValue(xmlCreate, `/prestashop/country/${oNode.nodeName}/language[@id="1"]`);
+              expect(objectNodeValueEN).to.be.eq(createNodeValueEN);
+
+              const objectNodeValueFR = ws.getWSNodeValue(xmlCreate, `/prestashop/country/${oNode.nodeName}/language[@id="2"]`);
+              const createNodeValueFR = ws.getWSNodeValue(xmlCreate, `/prestashop/country/${oNode.nodeName}/language[@id="2"]`);
+              expect(objectNodeValueFR).to.be.eq(createNodeValueFR);
+            } else {
+              const objectNodeValue: string = ws.getWSNodeValue(xmlCreate, `/prestashop/country/${oNode.nodeName}`);
+              expect(oNode.textContent).to.be.eq(objectNodeValue);
+            }
           }
-        }
+        });
       });
 
-      it('should go to \'International > Locations\' page', async function () {
-        await testContext.addContextItem(this, 'testIdentifier', 'goToLocationsPage', baseContext);
+      describe('Endpoint : /api/countries - Method : POST - Check On BO ', () => {
+        it('should go to \'International > Locations\' page', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'goToLocationsPage', baseContext);
 
-        await dashboardPage.goToSubMenu(
-          page,
-          dashboardPage.internationalParentLink,
-          dashboardPage.locationsLink,
-        );
-        await zonesPage.closeSfToolBar(page);
+          await dashboardPage.goToSubMenu(
+            page,
+            dashboardPage.internationalParentLink,
+            dashboardPage.locationsLink,
+          );
+          await zonesPage.closeSfToolBar(page);
 
-        const pageTitle = await zonesPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(zonesPage.pageTitle);
-      });
+          const pageTitle = await zonesPage.getPageTitle(page);
+          await expect(pageTitle).to.contains(zonesPage.pageTitle);
+        });
 
-      it('should go to \'Countries\' page', async function () {
-        await testContext.addContextItem(this, 'testIdentifier', 'goToCountriesPagePost', baseContext);
+        it('should go to \'Countries\' page', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'goToCountriesPagePost', baseContext);
 
-        await zonesPage.goToSubTabCountries(page);
+          await zonesPage.goToSubTabCountries(page);
 
-        const pageTitle = await countriesPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(countriesPage.pageTitle);
-      });
+          const pageTitle = await countriesPage.getPageTitle(page);
+          await expect(pageTitle).to.contains(countriesPage.pageTitle);
+        });
 
-      it('should filter country by ID', async function () {
-        await testContext.addContextItem(this, 'testIdentifier', 'filterToUpdateAfterPost', baseContext);
+        it('should filter country by ID', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'filterToUpdateAfterPost', baseContext);
 
-        // Filter
-        await countriesPage.resetFilter(page);
-        await countriesPage.filterTable(page, 'input', 'id_country', countryNodeID);
+          // Filter
+          await countriesPage.resetFilter(page);
+          await countriesPage.filterTable(page, 'input', 'id_country', countryNodeID);
 
-        // Check number of countries
-        const numberOfCountriesAfterFilter = await countriesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfCountriesAfterFilter).to.be.eq(1);
+          // Check number of countries
+          const numberOfCountriesAfterFilter = await countriesPage.getNumberOfElementInGrid(page);
+          await expect(numberOfCountriesAfterFilter).to.be.eq(1);
 
-        const textColumn = await countriesPage.getTextColumnFromTable(page, 1, 'id_country');
-        await expect(textColumn).to.contains(countryNodeID);
-      });
+          const textColumn = await countriesPage.getTextColumnFromTable(page, 1, 'id_country');
+          await expect(textColumn).to.contains(countryNodeID);
+        });
 
-      it('should go to edit country page', async function () {
-        await testContext.addContextItem(this, 'testIdentifier', 'goToEditCountryPageAfterPost', baseContext);
+        it('should go to edit country page', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'goToEditCountryPageAfterPost', baseContext);
 
-        await countriesPage.goToEditCountryPage(page, 1);
+          await countriesPage.goToEditCountryPage(page, 1);
 
-        const pageTitle = await addCountryPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addCountryPage.pageTitleEdit);
-      });
+          const pageTitle = await addCountryPage.getPageTitle(page);
+          await expect(pageTitle).to.contains(addCountryPage.pageTitleEdit);
+        });
 
-      it('should check all values', async function () {
-        await testContext.addContextItem(this, 'testIdentifier', 'checkEditCountryValuesAfterPost', baseContext);
+        it('should check country\'s zone', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkCountryZone1', baseContext);
 
-        const xmlValueIDZone = ws.getWSNodeValue(xmlCreate, '/prestashop/country/id_zone');
-        const valueIDZone = await addCountryPage.getSelectValue(page, 'id_zone');
-        expect(valueIDZone).to.be.eq(xmlValueIDZone);
+          const xmlValueIDZone = ws.getWSNodeValue(xmlCreate, '/prestashop/country/id_zone');
+          const valueIDZone = await addCountryPage.getSelectValue(page, 'id_zone');
+          expect(valueIDZone).to.be.eq(xmlValueIDZone);
+        });
 
-        const xmlValueIDCurrency = ws.getWSNodeValue(xmlCreate, '/prestashop/country/id_currency');
-        const valueIDCurrency = await addCountryPage.getSelectValue(page, 'id_currency');
-        expect(valueIDCurrency).to.be.eq(xmlValueIDCurrency);
+        it('should check country\'s currency', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkCountryCurrency1', baseContext);
 
-        const xmlValueCallPrefix = ws.getWSNodeValue(xmlCreate, '/prestashop/country/call_prefix');
-        const valueCallPrefix = await addCountryPage.getInputValue(page, 'call_prefix');
-        expect(valueCallPrefix).to.be.eq(xmlValueCallPrefix);
+          const xmlValueIDCurrency = ws.getWSNodeValue(xmlCreate, '/prestashop/country/id_currency');
+          const valueIDCurrency = await addCountryPage.getSelectValue(page, 'id_currency');
+          expect(valueIDCurrency).to.be.eq(xmlValueIDCurrency);
+        });
 
-        const xmlValueIsoCode = ws.getWSNodeValue(xmlCreate, '/prestashop/country/iso_code');
-        const valueIsoCode = await addCountryPage.getInputValue(page, 'iso_code');
-        expect(valueIsoCode).to.be.eq(xmlValueIsoCode);
+        it('should check country\'s call_prefix', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkCountryCallPrefix1', baseContext);
 
-        const xmlValueActive = ws.getWSNodeValue(xmlCreate, '/prestashop/country/active');
-        const valueActive = (await addCountryPage.isCheckboxChecked(page, 'active')) ? '1' : '0';
-        expect(valueActive).to.be.eq(xmlValueActive);
+          const xmlValueCallPrefix = ws.getWSNodeValue(xmlCreate, '/prestashop/country/call_prefix');
+          const valueCallPrefix = await addCountryPage.getInputValue(page, 'call_prefix');
+          expect(valueCallPrefix).to.be.eq(xmlValueCallPrefix);
+        });
 
-        const xmlValueContainsStates = ws.getWSNodeValue(xmlCreate, '/prestashop/country/contains_states');
-        const valueContainsStates = (await addCountryPage.isCheckboxChecked(page, 'contains_states')) ? '1' : '0';
-        expect(valueContainsStates).to.be.eq(xmlValueContainsStates);
+        it('should check country\'s iso_code', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkCountryIsoCode1', baseContext);
 
-        const xmlValueNeedIDNumber = ws.getWSNodeValue(xmlCreate, '/prestashop/country/need_identification_number');
-        const valueNeedIDNumber = (await addCountryPage.isCheckboxChecked(page, 'need_identification_number')) ? '1' : '0';
-        expect(valueNeedIDNumber).to.be.eq(xmlValueNeedIDNumber);
+          const xmlValueIsoCode = ws.getWSNodeValue(xmlCreate, '/prestashop/country/iso_code');
+          const valueIsoCode = await addCountryPage.getInputValue(page, 'iso_code');
+          expect(valueIsoCode).to.be.eq(xmlValueIsoCode);
+        });
 
-        const xmlValueNeedZipCode = ws.getWSNodeValue(xmlCreate, '/prestashop/country/need_zip_code');
-        const valueNeedZipCode = (await addCountryPage.isCheckboxChecked(page, 'need_zip_code')) ? '1' : '0';
-        expect(valueNeedZipCode).to.be.eq(xmlValueNeedZipCode);
+        it('should check country\'s active', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkCountryActive1', baseContext);
 
-        const xmlValueZipCode = ws.getWSNodeValue(xmlCreate, '/prestashop/country/zip_code_format');
-        const valueZipCode = await addCountryPage.getInputValue(page, 'zipCodeFormat');
-        expect(valueZipCode).to.be.eq(xmlValueZipCode);
+          const xmlValueActive = ws.getWSNodeValue(xmlCreate, '/prestashop/country/active');
+          const valueActive = (await addCountryPage.isCheckboxChecked(page, 'active')) ? '1' : '0';
+          expect(valueActive).to.be.eq(xmlValueActive);
+        });
 
-        const xmlValueNameEn = ws.getWSNodeValue(xmlCreate, '/prestashop/country/name/language[@id="1"]');
-        const valueNameEn = (await addCountryPage.getInputValue(page, 'nameEn'));
-        expect(valueNameEn).to.be.eq(xmlValueNameEn);
+        it('should check country\'s states', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkCountryStates1', baseContext);
 
-        const xmlValueNameFr = ws.getWSNodeValue(xmlCreate, '/prestashop/country/name/language[@id="2"]');
-        const valueNameFr = (await addCountryPage.getInputValue(page, 'nameFr'));
-        expect(valueNameFr).to.be.eq(xmlValueNameFr);
-      });
+          const xmlValueContainsStates = ws.getWSNodeValue(xmlCreate, '/prestashop/country/contains_states');
+          const valueContainsStates = (await addCountryPage.isCheckboxChecked(page, 'contains_states')) ? '1' : '0';
+          expect(valueContainsStates).to.be.eq(xmlValueContainsStates);
+        });
 
-      it('should go to \'Countries\' page', async function () {
-        await testContext.addContextItem(this, 'testIdentifier', 'goToCountriesPagePostReset', baseContext);
+        it('should check country\'s need_identification_number', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkCountryIdentificationNumber1', baseContext);
 
-        await zonesPage.goToSubTabCountries(page);
+          const xmlValueNeedIDNumber = ws.getWSNodeValue(xmlCreate, '/prestashop/country/need_identification_number');
+          const valueNeedIDNumber = (await addCountryPage.isCheckboxChecked(page, 'need_identification_number')) ? '1' : '0';
+          expect(valueNeedIDNumber).to.be.eq(xmlValueNeedIDNumber);
+        });
 
-        const pageTitle = await countriesPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(countriesPage.pageTitle);
-      });
+        it('should check country\'s need_zip_code', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkCountryZipCodeNumber1', baseContext);
 
-      it('should reset all filters', async function () {
-        await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirstAfterPost', baseContext);
+          const xmlValueNeedZipCode = ws.getWSNodeValue(xmlCreate, '/prestashop/country/need_zip_code');
+          const valueNeedZipCode = (await addCountryPage.isCheckboxChecked(page, 'need_zip_code')) ? '1' : '0';
+          expect(valueNeedZipCode).to.be.eq(xmlValueNeedZipCode);
+        });
 
-        const numberOfCountries = await countriesPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfCountries).to.be.above(0);
+        it('should check country\'s zip_code_format', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkCountryZipCodeFormat1', baseContext);
+
+          const xmlValueZipCode = ws.getWSNodeValue(xmlCreate, '/prestashop/country/zip_code_format');
+          const valueZipCode = await addCountryPage.getInputValue(page, 'zipCodeFormat');
+          expect(valueZipCode).to.be.eq(xmlValueZipCode);
+        });
+
+        it('should check country\'s name language 1', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkCountryNameLang11', baseContext);
+
+          const xmlValueNameEn = ws.getWSNodeValue(xmlCreate, '/prestashop/country/name/language[@id="1"]');
+          const valueNameEn = (await addCountryPage.getInputValue(page, 'nameEn'));
+          expect(valueNameEn).to.be.eq(xmlValueNameEn);
+        });
+
+        it('should check country\'s name language 2', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkCountryNameLang21', baseContext);
+
+          const xmlValueNameFr = ws.getWSNodeValue(xmlCreate, '/prestashop/country/name/language[@id="2"]');
+          const valueNameFr = (await addCountryPage.getInputValue(page, 'nameFr'));
+          expect(valueNameFr).to.be.eq(xmlValueNameFr);
+        });
+
+        it('should go to \'Countries\' page', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'goToCountriesPagePostReset', baseContext);
+
+          await zonesPage.goToSubTabCountries(page);
+
+          const pageTitle = await countriesPage.getPageTitle(page);
+          await expect(pageTitle).to.contains(countriesPage.pageTitle);
+        });
+
+        it('should reset all filters', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirstAfterPost', baseContext);
+
+          const numberOfCountries = await countriesPage.resetAndGetNumberOfLines(page);
+          await expect(numberOfCountries).to.be.above(0);
+        });
       });
     });
 
     describe('Endpoint : /api/countries - Method : PUT ', () => {
-      it('should request the endpoint /api/countries/{id} with method PUT', async function () {
-        await testContext.addContextItem(this, 'testIdentifier', 'requestEndpointCountriesMethodPut', baseContext);
+      describe('Endpoint : /api/countries - Method : PUT - Update Country ', () => {
+        let apiResponse: APIResponse;
+        let xmlResponse : string;
+
+        it('should check response status of /api/countries/{id}', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestPutStatus1', baseContext);
+
+          xmlUpdate = countryXml(countryNodeID);
+          apiResponse = await apiContext.put(`api/countries/${countryNodeID}`, {
+            headers: {
+              Authorization: `Basic ${Buffer.from(`${wsKey}:`).toString('base64')}`,
+            },
+            data: xmlUpdate,
+          });
+          await expect(apiResponse.status()).to.eq(200);
+        });
 
-        const apiResponse = await apiContext.put(`api/countries/${countryNodeID}`, {
-          headers: {
-            Authorization: `Basic ${Buffer.from(`${wsKey}:`).toString('base64')}`,
-          },
-          data: xmlUpdate.replace('{fetchedId}', countryNodeID),
+        it('should check response root node', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestPutRootNode1', baseContext);
+
+          xmlResponse = await apiResponse.text();
+          expect(ws.getWSRootNodeName(xmlResponse)).to.be.eq('prestashop');
         });
-        await expect(apiResponse.status()).to.eq(200);
 
-        const xml: string = await apiResponse.text();
-        expect(ws.getWSRootNodeName(xml)).to.be.eq('prestashop');
+        it('should check number of node under prestashop', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestPostNodeNumber1', baseContext);
 
-        const rootNodes = ws.getWSNodes(xml, '/prestashop/*');
-        expect(rootNodes.length).to.be.eq(1);
-        expect(rootNodes[0].nodeName).to.be.eq('country');
+          const rootNodes = ws.getWSNodes(xmlResponse, '/prestashop/*');
+          expect(rootNodes.length).to.be.eq(1);
+          expect(rootNodes[0].nodeName).to.be.eq('country');
+        });
+
+        it('should check id of the country', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestPutCheckId1', baseContext);
 
-        // Attribute : id
-        const countryUpdateNodeID = ws.getWSNodeValue(xml, '/prestashop/country/id');
-        expect(countryUpdateNodeID).to.be.eq(countryNodeID);
+          // Attribute : id
+          countryNodeID = ws.getWSNodeValue(xmlResponse, '/prestashop/country/id');
+          expect(countryNodeID).to.be.eq(parseInt(countryNodeID, 10).toString());
+        });
       });
 
-      it('should request the endpoint /api/countries/{id} with method GET', async function () {
-        await testContext.addContextItem(this, 'testIdentifier', 'requestEndpointCountriesIdMethodGetAfterPut', baseContext);
+      describe('Endpoint : /api/countries/{id} - Method : PUT - Check with WS ', () => {
+        let apiResponse: APIResponse;
+        let xmlResponse : string;
+        let countriesNodes: Element[];
 
-        const apiResponse = await apiContext.get(`api/countries/${countryNodeID}`, {
-          headers: {
-            Authorization: `Basic ${Buffer.from(`${wsKey}:`).toString('base64')}`,
-          },
+        it('should check response status', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestGetPutStatus2', baseContext);
+
+          apiResponse = await apiContext.get(`api/countries/${countryNodeID}`, {
+            headers: {
+              Authorization: `Basic ${Buffer.from(`${wsKey}:`).toString('base64')}`,
+            },
+          });
+          await expect(apiResponse.status()).to.eq(200);
         });
-        await expect(apiResponse.status()).to.eq(200);
 
-        const xml: string = await apiResponse.text();
-        const xmlUId = xmlUpdate.replace('{fetchedId}', countryNodeID);
+        it('should check response root node', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestGetPutRootNode2', baseContext);
 
-        expect(ws.getWSRootNodeName(xml)).to.be.eq('prestashop');
+          xmlResponse = await apiResponse.text();
+          expect(ws.getWSRootNodeName(xmlResponse)).to.be.eq('prestashop');
+        });
 
-        const rootNodes = ws.getWSNodes(xml, '/prestashop/*');
-        expect(rootNodes.length).to.be.eq(1);
-        expect(rootNodes[0].nodeName).to.be.eq('country');
-
-        const objectNodes = ws.getWSNodes(xml, '/prestashop/country/*');
-        expect(objectNodes.length).to.be.gt(0);
-
-        // Check nodes are equal to them done in Create
-        for (let o: number = 0; o < objectNodes.length; o++) {
-          const oNode: Element = objectNodes[o];
-
-          if (oNode.nodeName === 'id') {
-            expect(oNode.textContent).to.be.eq(countryNodeID);
-          } else if (oNode.nodeName === 'name') {
-            const objectNodeValueEN = ws.getWSNodeValue(xmlUId, `/prestashop/country/${oNode.nodeName}/language[@id="1"]`);
-            const createNodeValueEN = ws.getWSNodeValue(xml, `/prestashop/country/${oNode.nodeName}/language[@id="1"]`);
-            expect(objectNodeValueEN).to.be.eq(createNodeValueEN);
-
-            const objectNodeValueFR = ws.getWSNodeValue(xmlUId, `/prestashop/country/${oNode.nodeName}/language[@id="2"]`);
-            const createNodeValueFR = ws.getWSNodeValue(xml, `/prestashop/country/${oNode.nodeName}/language[@id="2"]`);
-            expect(objectNodeValueFR).to.be.eq(createNodeValueFR);
-          } else {
-            const objectNodeValue = ws.getWSNodeValue(xmlUId, `/prestashop/country/${oNode.nodeName}`);
-            expect(oNode.textContent).to.be.eq(objectNodeValue);
+        it('should check number of node under prestashop', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestGetPutNodeNumber1', baseContext);
+
+          const rootNodes = ws.getWSNodes(xmlResponse, '/prestashop/*');
+          expect(rootNodes.length).to.be.eq(1);
+          expect(rootNodes[0].nodeName).to.be.eq('country');
+        });
+
+        it('should check number of nodes under countries node', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestGetPutNumberOfNodes1', baseContext);
+
+          countriesNodes = ws.getWSNodes(xmlResponse, '/prestashop/country/*');
+          expect(countriesNodes.length).to.be.gt(0);
+        });
+
+        it('should check each node id, name ...', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestGetIDCheckAll', baseContext);
+
+          await testContext.addContextItem(this, 'testIdentifier', 'requestEndpointCountriesIdMethodGetAfterPut', baseContext);
+
+          // Check nodes are equal to them done in Create
+          for (let o: number = 0; o < countriesNodes.length; o++) {
+            const oNode: Element = countriesNodes[o];
+
+            if (oNode.nodeName === 'id') {
+              expect(oNode.textContent).to.be.eq(countryNodeID);
+            } else if (oNode.nodeName === 'name') {
+              const objectNodeValueEN = ws.getWSNodeValue(xmlUpdate, `/prestashop/country/${oNode.nodeName}/language[@id="1"]`);
+              const createNodeValueEN = ws.getWSNodeValue(xmlResponse, `/prestashop/country/${oNode.nodeName}/language[@id="1"]`);
+              expect(objectNodeValueEN).to.be.eq(createNodeValueEN);
+
+              const objectNodeValueFR = ws.getWSNodeValue(xmlUpdate, `/prestashop/country/${oNode.nodeName}/language[@id="2"]`);
+              const createNodeValueFR = ws.getWSNodeValue(xmlResponse, `/prestashop/country/${oNode.nodeName}/language[@id="2"]`);
+              expect(objectNodeValueFR).to.be.eq(createNodeValueFR);
+            } else {
+              const objectNodeValue = ws.getWSNodeValue(xmlUpdate, `/prestashop/country/${oNode.nodeName}`);
+              expect(oNode.textContent).to.be.eq(objectNodeValue);
+            }
           }
-        }
+        });
       });
 
-      it('should filter country by ID', async function () {
-        await testContext.addContextItem(this, 'testIdentifier', 'filterToUpdateAfterPut', baseContext);
+      describe('Endpoint : /api/countries - Method : PUT - Check On BO ', () => {
+        it('should filter country by ID', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'filterToUpdateAfterPost2', baseContext);
 
-        // Filter
-        await countriesPage.resetFilter(page);
-        await countriesPage.filterTable(page, 'input', 'id_country', countryNodeID);
+          // Filter
+          await countriesPage.resetFilter(page);
+          await countriesPage.filterTable(page, 'input', 'id_country', countryNodeID);
 
-        // Check number of countries
-        const numberOfCountriesAfterFilter = await countriesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfCountriesAfterFilter).to.be.eq(1);
+          // Check number of countries
+          const numberOfCountriesAfterFilter = await countriesPage.getNumberOfElementInGrid(page);
+          await expect(numberOfCountriesAfterFilter).to.be.eq(1);
 
-        const textColumn = await countriesPage.getTextColumnFromTable(page, 1, 'id_country');
-        await expect(textColumn).to.contains(countryNodeID);
-      });
+          const textColumn = await countriesPage.getTextColumnFromTable(page, 1, 'id_country');
+          await expect(textColumn).to.contains(countryNodeID);
+        });
 
-      it('should go to edit country page', async function () {
-        await testContext.addContextItem(this, 'testIdentifier', 'goToEditCountryPage', baseContext);
+        it('should go to edit country page', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'goToEditCountryPageAfterPost2', baseContext);
 
-        await countriesPage.goToEditCountryPage(page, 1);
+          await countriesPage.goToEditCountryPage(page, 1);
 
-        const pageTitle = await addCountryPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addCountryPage.pageTitleEdit);
-      });
+          const pageTitle = await addCountryPage.getPageTitle(page);
+          await expect(pageTitle).to.contains(addCountryPage.pageTitleEdit);
+        });
 
-      it('should check all values', async function () {
-        await testContext.addContextItem(this, 'testIdentifier', 'checkEditCountryValues', baseContext);
+        it('should check country\'s zone', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkCountryZone2', baseContext);
 
-        const xmlUId = xmlUpdate.replace('{fetchedId}', countryNodeID);
+          const xmlValueIDZone = ws.getWSNodeValue(xmlUpdate, '/prestashop/country/id_zone');
+          const valueIDZone = await addCountryPage.getSelectValue(page, 'id_zone');
+          expect(valueIDZone).to.be.eq(xmlValueIDZone);
+        });
 
-        const xmlValueIDZone = ws.getWSNodeValue(xmlUId, '/prestashop/country/id_zone');
-        const valueIDZone = await addCountryPage.getSelectValue(page, 'id_zone');
-        expect(valueIDZone).to.be.eq(xmlValueIDZone);
+        it('should check country\'s currency', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkCountryCurrency2', baseContext);
 
-        const xmlValueIDCurrency = ws.getWSNodeValue(xmlUId, '/prestashop/country/id_currency');
-        const valueIDCurrency = await addCountryPage.getSelectValue(page, 'id_currency');
-        expect(valueIDCurrency).to.be.eq(xmlValueIDCurrency);
+          const xmlValueIDCurrency = ws.getWSNodeValue(xmlUpdate, '/prestashop/country/id_currency');
+          const valueIDCurrency = await addCountryPage.getSelectValue(page, 'id_currency');
+          expect(valueIDCurrency).to.be.eq(xmlValueIDCurrency);
+        });
 
-        const xmlValueCallPrefix = ws.getWSNodeValue(xmlUId, '/prestashop/country/call_prefix');
-        const valueCallPrefix = await addCountryPage.getInputValue(page, 'call_prefix');
-        expect(valueCallPrefix).to.be.eq(xmlValueCallPrefix);
+        it('should check country\'s call_prefix', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkCountryCallPrefix2', baseContext);
 
-        const xmlValueIsoCode = ws.getWSNodeValue(xmlUId, '/prestashop/country/iso_code');
-        const valueIsoCode = await addCountryPage.getInputValue(page, 'iso_code');
-        expect(valueIsoCode).to.be.eq(xmlValueIsoCode);
+          const xmlValueCallPrefix = ws.getWSNodeValue(xmlUpdate, '/prestashop/country/call_prefix');
+          const valueCallPrefix = await addCountryPage.getInputValue(page, 'call_prefix');
+          expect(valueCallPrefix).to.be.eq(xmlValueCallPrefix);
+        });
 
-        const xmlValueActive = ws.getWSNodeValue(xmlUId, '/prestashop/country/active');
-        const valueActive = (await addCountryPage.isCheckboxChecked(page, 'active')) ? '1' : '0';
-        expect(valueActive).to.be.eq(xmlValueActive);
+        it('should check country\'s iso_code', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkCountryIsoCode2', baseContext);
 
-        const xmlValueContainsStates = ws.getWSNodeValue(xmlUId, '/prestashop/country/contains_states');
-        const valueContainsStates = (await addCountryPage.isCheckboxChecked(page, 'contains_states')) ? '1' : '0';
-        expect(valueContainsStates).to.be.eq(xmlValueContainsStates);
+          const xmlValueIsoCode = ws.getWSNodeValue(xmlUpdate, '/prestashop/country/iso_code');
+          const valueIsoCode = await addCountryPage.getInputValue(page, 'iso_code');
+          expect(valueIsoCode).to.be.eq(xmlValueIsoCode);
+        });
 
-        const xmlValueNeedIDNumber = ws.getWSNodeValue(xmlUId, '/prestashop/country/need_identification_number');
-        const valueNeedIDNumber = (await addCountryPage.isCheckboxChecked(page, 'need_identification_number')) ? '1' : '0';
-        expect(valueNeedIDNumber).to.be.eq(xmlValueNeedIDNumber);
+        it('should check country\'s active', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkCountryActive2', baseContext);
 
-        const xmlValueNeedZipCode = ws.getWSNodeValue(xmlUId, '/prestashop/country/need_zip_code');
-        const valueNeedZipCode = (await addCountryPage.isCheckboxChecked(page, 'need_zip_code')) ? '1' : '0';
-        expect(valueNeedZipCode).to.be.eq(xmlValueNeedZipCode);
+          const xmlValueActive = ws.getWSNodeValue(xmlUpdate, '/prestashop/country/active');
+          const valueActive = (await addCountryPage.isCheckboxChecked(page, 'active')) ? '1' : '0';
+          expect(valueActive).to.be.eq(xmlValueActive);
+        });
 
-        const xmlValueZipCode = ws.getWSNodeValue(xmlUId, '/prestashop/country/zip_code_format');
-        const valueZipCode = await addCountryPage.getInputValue(page, 'zipCodeFormat');
-        expect(valueZipCode).to.be.eq(xmlValueZipCode);
+        it('should check country\'s states', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkCountryStates2', baseContext);
 
-        const xmlValueNameEn = ws.getWSNodeValue(xmlUId, '/prestashop/country/name/language[@id="1"]');
-        const valueNameEn = (await addCountryPage.getInputValue(page, 'nameEn'));
-        expect(valueNameEn).to.be.eq(xmlValueNameEn);
+          const xmlValueContainsStates = ws.getWSNodeValue(xmlUpdate, '/prestashop/country/contains_states');
+          const valueContainsStates = (await addCountryPage.isCheckboxChecked(page, 'contains_states')) ? '1' : '0';
+          expect(valueContainsStates).to.be.eq(xmlValueContainsStates);
+        });
 
-        const xmlValueNameFr = ws.getWSNodeValue(xmlUId, '/prestashop/country/name/language[@id="2"]');
-        const valueNameFr = (await addCountryPage.getInputValue(page, 'nameFr'));
-        expect(valueNameFr).to.be.eq(xmlValueNameFr);
-      });
+        it('should check country\'s need_identification_number', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkCountryIdentificationNumber2', baseContext);
 
-      it('should go to \'Countries\' page', async function () {
-        await testContext.addContextItem(this, 'testIdentifier', 'goToCountriesPagePutReset', baseContext);
+          const xmlValueNeedIDNumber = ws.getWSNodeValue(xmlUpdate, '/prestashop/country/need_identification_number');
+          const valueNeedIDNumber = (await addCountryPage.isCheckboxChecked(page, 'need_identification_number')) ? '1' : '0';
+          expect(valueNeedIDNumber).to.be.eq(xmlValueNeedIDNumber);
+        });
 
-        await zonesPage.goToSubTabCountries(page);
+        it('should check country\'s need_zip_code', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkCountryZipCodeNumber2', baseContext);
 
-        const pageTitle = await countriesPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(countriesPage.pageTitle);
-      });
+          const xmlValueNeedZipCode = ws.getWSNodeValue(xmlUpdate, '/prestashop/country/need_zip_code');
+          const valueNeedZipCode = (await addCountryPage.isCheckboxChecked(page, 'need_zip_code')) ? '1' : '0';
+          expect(valueNeedZipCode).to.be.eq(xmlValueNeedZipCode);
+        });
 
-      it('should reset all filters', async function () {
-        await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirstAfterPut', baseContext);
+        it('should check country\'s zip_code_format', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkCountryZipCodeFormat2', baseContext);
 
-        const numberOfCountries = await countriesPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfCountries).to.be.above(0);
+          const xmlValueZipCode = ws.getWSNodeValue(xmlUpdate, '/prestashop/country/zip_code_format');
+          const valueZipCode = await addCountryPage.getInputValue(page, 'zipCodeFormat');
+          expect(valueZipCode).to.be.eq(xmlValueZipCode);
+        });
+
+        it('should check country\'s name language 1', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkCountryNameLang12', baseContext);
+
+          const xmlValueNameEn = ws.getWSNodeValue(xmlUpdate, '/prestashop/country/name/language[@id="1"]');
+          const valueNameEn = (await addCountryPage.getInputValue(page, 'nameEn'));
+          expect(valueNameEn).to.be.eq(xmlValueNameEn);
+        });
+
+        it('should check country\'s name language 2', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkCountryNameLang22', baseContext);
+
+          const xmlValueNameFr = ws.getWSNodeValue(xmlUpdate, '/prestashop/country/name/language[@id="2"]');
+          const valueNameFr = (await addCountryPage.getInputValue(page, 'nameFr'));
+          expect(valueNameFr).to.be.eq(xmlValueNameFr);
+        });
+
+        it('should go to \'Countries\' page', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'goToCountriesPagePutReset', baseContext);
+
+          await zonesPage.goToSubTabCountries(page);
+
+          const pageTitle = await countriesPage.getPageTitle(page);
+          await expect(pageTitle).to.contains(countriesPage.pageTitle);
+        });
+
+        it('should reset all filters', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirstAfterPut', baseContext);
+
+          const numberOfCountries = await countriesPage.resetAndGetNumberOfLines(page);
+          await expect(numberOfCountries).to.be.above(0);
+        });
       });
     });
 
diff --git a/tests/UI/data/xml/country.ts b/tests/UI/data/xml/country.ts
new file mode 100644
index 0000000000000..b9139f69ceb56
--- /dev/null
+++ b/tests/UI/data/xml/country.ts
@@ -0,0 +1,23 @@
+import {faker} from '@faker-js/faker';
+
+const countryXml = (idCountry : string | null = null): string => ('<?xml version="1.0" encoding="UTF-8"?>'
+  + '<prestashop xmlns:xlink="http://www.w3.org/1999/xlink">'
+  + `<country>${idCountry !== null ? (`<id><![CDATA[${idCountry}]]></id>`) : ''}`
+  + `<id_zone><![CDATA[${faker.datatype.number({min: 1, max: 5})}]]></id_zone>`
+  + '<id_currency><![CDATA[1]]></id_currency>'
+  + `<call_prefix><![CDATA[${faker.datatype.number({min: 100, max: 200})}]]></call_prefix>`
+  + `<iso_code><![CDATA[${faker.word.adjective(3)}]]></iso_code>`
+  + `<active><![CDATA[${faker.helpers.arrayElement([0, 1])}]]></active>`
+  + `<contains_states><![CDATA[${faker.helpers.arrayElement([0, 1])}]]></contains_states>`
+  + `<need_identification_number><![CDATA[${faker.helpers.arrayElement([0, 1])}]]></need_identification_number>`
+  + `<need_zip_code><![CDATA[${faker.helpers.arrayElement([0, 1])}]]></need_zip_code>`
+  + `<zip_code_format><![CDATA[${faker.helpers.arrayElement(['NNLLNN', 'LLNNLL'])}]]></zip_code_format>`
+  + `<display_tax_label><![CDATA[${faker.helpers.arrayElement([0, 1])}]]></display_tax_label>`
+  + '<name>'
+  + '<language id="1"><![CDATA[Test in English]]></language>'
+  + '<language id="2"><![CDATA[Test en Français]]></language>'
+  + '</name>'
+  + '</country>'
+  + '</prestashop>');
+
+export default countryXml;

From a5b3f604097b83dbf489d71d1efdd7df9c5c82a7 Mon Sep 17 00:00:00 2001
From: boubkerbribri <boubker.bribri@prestashop.com>
Date: Thu, 8 Jun 2023 09:57:49 +0200
Subject: [PATCH 0077/1030] Add Eudpoints and create a ws helper directory

---
 .../functional/WS/01_countriesCRUD.ts         | 164 +++++++++++-------
 tests/UI/data/xml/country.ts                  |  46 ++---
 tests/UI/utils/wsHelpers/endpoints.enum.ts    |   5 +
 tests/UI/utils/{ws.ts => wsHelpers/xml.ts}    |   0
 4 files changed, 129 insertions(+), 86 deletions(-)
 create mode 100644 tests/UI/utils/wsHelpers/endpoints.enum.ts
 rename tests/UI/utils/{ws.ts => wsHelpers/xml.ts} (100%)

diff --git a/tests/UI/campaigns/functional/WS/01_countriesCRUD.ts b/tests/UI/campaigns/functional/WS/01_countriesCRUD.ts
index 910b825bf65c1..3c30f5ab73a3f 100644
--- a/tests/UI/campaigns/functional/WS/01_countriesCRUD.ts
+++ b/tests/UI/campaigns/functional/WS/01_countriesCRUD.ts
@@ -1,7 +1,8 @@
 // Import utils
 import helper from '@utils/helpers';
 import testContext from '@utils/testContext';
-import ws from '@utils/ws';
+import xmlHelper from '@utils/wsHelpers/xml';
+import Endpoints from '@utils/wsHelpers/endpoints.enum';
 
 // Import commonTests
 import {addWebserviceKey, removeWebserviceKey, setWebserviceStatus} from '@commonTests/BO/advancedParameters/ws';
@@ -16,7 +17,7 @@ import addCountryPage from '@pages/BO/international/locations/countries/add';
 
 // Import data
 import {WebservicePermission} from '@data/types/webservice';
-import countryXml from '@data/xml/country';
+import getCountryXml from '@data/xml/country';
 
 import {expect} from 'chai';
 import type {
@@ -38,7 +39,7 @@ describe('WS - Countries : CRUD', async () => {
       methods: ['all'],
     },
   ];
-  const xmlCreate: string = countryXml();
+  const xmlCreate: string = getCountryXml();
   let xmlUpdate: string;
 
   // before and after functions
@@ -107,7 +108,7 @@ describe('WS - Countries : CRUD', async () => {
       it('should check response status', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'requestGetStatus1', baseContext);
 
-        apiResponse = await apiContext.get('api/countries/', {
+        apiResponse = await apiContext.get(Endpoints.COUNTRIES, {
           headers: {
             Authorization: `Basic ${Buffer.from(`${wsKey}:`).toString('base64')}`,
           },
@@ -120,13 +121,13 @@ describe('WS - Countries : CRUD', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'requestGetRootNode1', baseContext);
 
         xmlResponse = await apiResponse.text();
-        expect(ws.getWSRootNodeName(xmlResponse)).to.be.eq('prestashop');
+        expect(xmlHelper.getWSRootNodeName(xmlResponse)).to.be.eq('prestashop');
       });
 
       it('should check number of node under prestashop', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'requestGetNodeNumber1', baseContext);
 
-        const rootNodes = ws.getWSNodes(xmlResponse, '/prestashop/*');
+        const rootNodes = xmlHelper.getWSNodes(xmlResponse, '/prestashop/*');
         expect(rootNodes.length).to.be.eq(1);
         expect(rootNodes[0].nodeName).to.be.eq('countries');
       });
@@ -134,7 +135,7 @@ describe('WS - Countries : CRUD', async () => {
       it('should check number of nodes under countries node', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'requestGetNumberOfNodes1', baseContext);
 
-        countriesNode = ws.getWSNodes(xmlResponse, '/prestashop/countries/*');
+        countriesNode = xmlHelper.getWSNodes(xmlResponse, '/prestashop/countries/*');
         expect(countriesNode.length).to.be.gt(0);
       });
 
@@ -169,7 +170,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check response status', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'requestPostStatus1', baseContext);
 
-          apiResponse = await apiContext.post('api/countries/', {
+          apiResponse = await apiContext.post(Endpoints.COUNTRIES, {
             headers: {
               Authorization: `Basic ${Buffer.from(`${wsKey}:`).toString('base64')}`,
             },
@@ -182,13 +183,13 @@ describe('WS - Countries : CRUD', async () => {
           await testContext.addContextItem(this, 'testIdentifier', 'requestPostRootNode1', baseContext);
 
           xmlResponse = await apiResponse.text();
-          expect(ws.getWSRootNodeName(xmlResponse)).to.be.eq('prestashop');
+          expect(xmlHelper.getWSRootNodeName(xmlResponse)).to.be.eq('prestashop');
         });
 
         it('should check number of node under prestashop', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'requestPostNodeNumber1', baseContext);
 
-          const rootNodes = ws.getWSNodes(xmlResponse, '/prestashop/*');
+          const rootNodes = xmlHelper.getWSNodes(xmlResponse, '/prestashop/*');
           expect(rootNodes.length).to.be.eq(1);
           expect(rootNodes[0].nodeName).to.be.eq('country');
         });
@@ -197,12 +198,12 @@ describe('WS - Countries : CRUD', async () => {
           await testContext.addContextItem(this, 'testIdentifier', 'requestPostCheckId1', baseContext);
 
           // Attribute : id
-          countryNodeID = ws.getWSNodeValue(xmlResponse, '/prestashop/country/id');
+          countryNodeID = xmlHelper.getWSNodeValue(xmlResponse, '/prestashop/country/id');
           expect(countryNodeID).to.be.eq(parseInt(countryNodeID, 10).toString());
         });
       });
 
-      describe('Endpoint : /api/countries/{id} - Method : POST - Check with WS ', () => {
+      describe(`Endpoint : /${Endpoints.COUNTRIES}{id} - Method : POST - Check with WS `, () => {
         let apiResponse: APIResponse;
         let xmlResponse : string;
         let countriesNodes: Element[];
@@ -210,7 +211,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check response status', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'requestGetIDStatus', baseContext);
 
-          apiResponse = await apiContext.get(`api/countries/${countryNodeID}`, {
+          apiResponse = await apiContext.get(Endpoints.COUNTRIES + countryNodeID, {
             headers: {
               Authorization: `Basic ${Buffer.from(`${wsKey}:`).toString('base64')}`,
             },
@@ -222,13 +223,13 @@ describe('WS - Countries : CRUD', async () => {
           await testContext.addContextItem(this, 'testIdentifier', 'requestGetIDRootNode1', baseContext);
 
           xmlResponse = await apiResponse.text();
-          expect(ws.getWSRootNodeName(xmlResponse)).to.be.eq('prestashop');
+          expect(xmlHelper.getWSRootNodeName(xmlResponse)).to.be.eq('prestashop');
         });
 
         it('should check number of node under prestashop', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'requestGetIDNodeNumber1', baseContext);
 
-          const rootNodes = ws.getWSNodes(xmlResponse, '/prestashop/*');
+          const rootNodes = xmlHelper.getWSNodes(xmlResponse, '/prestashop/*');
           expect(rootNodes.length).to.be.eq(1);
           expect(rootNodes[0].nodeName).to.be.eq('country');
         });
@@ -236,7 +237,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check number of nodes under countries node', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'requestGetIDNumberOfNodes1', baseContext);
 
-          countriesNodes = ws.getWSNodes(xmlResponse, '/prestashop/country/*');
+          countriesNodes = xmlHelper.getWSNodes(xmlResponse, '/prestashop/country/*');
           expect(countriesNodes.length).to.be.gt(0);
         });
 
@@ -250,15 +251,31 @@ describe('WS - Countries : CRUD', async () => {
             if (oNode.nodeName === 'id') {
               expect(oNode.textContent).to.be.eq(countryNodeID);
             } else if (oNode.nodeName === 'name') {
-              const objectNodeValueEN = ws.getWSNodeValue(xmlCreate, `/prestashop/country/${oNode.nodeName}/language[@id="1"]`);
-              const createNodeValueEN = ws.getWSNodeValue(xmlCreate, `/prestashop/country/${oNode.nodeName}/language[@id="1"]`);
+              const objectNodeValueEN = xmlHelper.getWSNodeValue(
+                xmlCreate,
+                `/prestashop/country/${oNode.nodeName}/language[@id="1"]`,
+              );
+
+              const createNodeValueEN = xmlHelper.getWSNodeValue(
+                xmlCreate,
+                `/prestashop/country/${oNode.nodeName}/language[@id="1"]`,
+              );
               expect(objectNodeValueEN).to.be.eq(createNodeValueEN);
 
-              const objectNodeValueFR = ws.getWSNodeValue(xmlCreate, `/prestashop/country/${oNode.nodeName}/language[@id="2"]`);
-              const createNodeValueFR = ws.getWSNodeValue(xmlCreate, `/prestashop/country/${oNode.nodeName}/language[@id="2"]`);
+              const objectNodeValueFR = xmlHelper.getWSNodeValue(
+                xmlCreate,
+                `/prestashop/country/${oNode.nodeName}/language[@id="2"]`,
+              );
+              const createNodeValueFR = xmlHelper.getWSNodeValue(
+                xmlCreate,
+                `/prestashop/country/${oNode.nodeName}/language[@id="2"]`,
+              );
               expect(objectNodeValueFR).to.be.eq(createNodeValueFR);
             } else {
-              const objectNodeValue: string = ws.getWSNodeValue(xmlCreate, `/prestashop/country/${oNode.nodeName}`);
+              const objectNodeValue: string = xmlHelper.getWSNodeValue(
+                xmlCreate,
+                `/prestashop/country/${oNode.nodeName}`,
+              );
               expect(oNode.textContent).to.be.eq(objectNodeValue);
             }
           }
@@ -316,7 +333,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s zone', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryZone1', baseContext);
 
-          const xmlValueIDZone = ws.getWSNodeValue(xmlCreate, '/prestashop/country/id_zone');
+          const xmlValueIDZone = xmlHelper.getWSNodeValue(xmlCreate, '/prestashop/country/id_zone');
           const valueIDZone = await addCountryPage.getSelectValue(page, 'id_zone');
           expect(valueIDZone).to.be.eq(xmlValueIDZone);
         });
@@ -324,7 +341,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s currency', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryCurrency1', baseContext);
 
-          const xmlValueIDCurrency = ws.getWSNodeValue(xmlCreate, '/prestashop/country/id_currency');
+          const xmlValueIDCurrency = xmlHelper.getWSNodeValue(xmlCreate, '/prestashop/country/id_currency');
           const valueIDCurrency = await addCountryPage.getSelectValue(page, 'id_currency');
           expect(valueIDCurrency).to.be.eq(xmlValueIDCurrency);
         });
@@ -332,7 +349,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s call_prefix', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryCallPrefix1', baseContext);
 
-          const xmlValueCallPrefix = ws.getWSNodeValue(xmlCreate, '/prestashop/country/call_prefix');
+          const xmlValueCallPrefix = xmlHelper.getWSNodeValue(xmlCreate, '/prestashop/country/call_prefix');
           const valueCallPrefix = await addCountryPage.getInputValue(page, 'call_prefix');
           expect(valueCallPrefix).to.be.eq(xmlValueCallPrefix);
         });
@@ -340,7 +357,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s iso_code', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryIsoCode1', baseContext);
 
-          const xmlValueIsoCode = ws.getWSNodeValue(xmlCreate, '/prestashop/country/iso_code');
+          const xmlValueIsoCode = xmlHelper.getWSNodeValue(xmlCreate, '/prestashop/country/iso_code');
           const valueIsoCode = await addCountryPage.getInputValue(page, 'iso_code');
           expect(valueIsoCode).to.be.eq(xmlValueIsoCode);
         });
@@ -348,7 +365,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s active', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryActive1', baseContext);
 
-          const xmlValueActive = ws.getWSNodeValue(xmlCreate, '/prestashop/country/active');
+          const xmlValueActive = xmlHelper.getWSNodeValue(xmlCreate, '/prestashop/country/active');
           const valueActive = (await addCountryPage.isCheckboxChecked(page, 'active')) ? '1' : '0';
           expect(valueActive).to.be.eq(xmlValueActive);
         });
@@ -356,7 +373,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s states', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryStates1', baseContext);
 
-          const xmlValueContainsStates = ws.getWSNodeValue(xmlCreate, '/prestashop/country/contains_states');
+          const xmlValueContainsStates = xmlHelper.getWSNodeValue(xmlCreate, '/prestashop/country/contains_states');
           const valueContainsStates = (await addCountryPage.isCheckboxChecked(page, 'contains_states')) ? '1' : '0';
           expect(valueContainsStates).to.be.eq(xmlValueContainsStates);
         });
@@ -364,7 +381,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s need_identification_number', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryIdentificationNumber1', baseContext);
 
-          const xmlValueNeedIDNumber = ws.getWSNodeValue(xmlCreate, '/prestashop/country/need_identification_number');
+          const xmlValueNeedIDNumber = xmlHelper.getWSNodeValue(xmlCreate, '/prestashop/country/need_identification_number');
           const valueNeedIDNumber = (await addCountryPage.isCheckboxChecked(page, 'need_identification_number')) ? '1' : '0';
           expect(valueNeedIDNumber).to.be.eq(xmlValueNeedIDNumber);
         });
@@ -372,7 +389,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s need_zip_code', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryZipCodeNumber1', baseContext);
 
-          const xmlValueNeedZipCode = ws.getWSNodeValue(xmlCreate, '/prestashop/country/need_zip_code');
+          const xmlValueNeedZipCode = xmlHelper.getWSNodeValue(xmlCreate, '/prestashop/country/need_zip_code');
           const valueNeedZipCode = (await addCountryPage.isCheckboxChecked(page, 'need_zip_code')) ? '1' : '0';
           expect(valueNeedZipCode).to.be.eq(xmlValueNeedZipCode);
         });
@@ -380,7 +397,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s zip_code_format', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryZipCodeFormat1', baseContext);
 
-          const xmlValueZipCode = ws.getWSNodeValue(xmlCreate, '/prestashop/country/zip_code_format');
+          const xmlValueZipCode = xmlHelper.getWSNodeValue(xmlCreate, '/prestashop/country/zip_code_format');
           const valueZipCode = await addCountryPage.getInputValue(page, 'zipCodeFormat');
           expect(valueZipCode).to.be.eq(xmlValueZipCode);
         });
@@ -388,7 +405,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s name language 1', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryNameLang11', baseContext);
 
-          const xmlValueNameEn = ws.getWSNodeValue(xmlCreate, '/prestashop/country/name/language[@id="1"]');
+          const xmlValueNameEn = xmlHelper.getWSNodeValue(xmlCreate, '/prestashop/country/name/language[@id="1"]');
           const valueNameEn = (await addCountryPage.getInputValue(page, 'nameEn'));
           expect(valueNameEn).to.be.eq(xmlValueNameEn);
         });
@@ -396,7 +413,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s name language 2', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryNameLang21', baseContext);
 
-          const xmlValueNameFr = ws.getWSNodeValue(xmlCreate, '/prestashop/country/name/language[@id="2"]');
+          const xmlValueNameFr = xmlHelper.getWSNodeValue(xmlCreate, '/prestashop/country/name/language[@id="2"]');
           const valueNameFr = (await addCountryPage.getInputValue(page, 'nameFr'));
           expect(valueNameFr).to.be.eq(xmlValueNameFr);
         });
@@ -424,11 +441,11 @@ describe('WS - Countries : CRUD', async () => {
         let apiResponse: APIResponse;
         let xmlResponse : string;
 
-        it('should check response status of /api/countries/{id}', async function () {
+        it(`should check response status of /${Endpoints.COUNTRIES}{id}`, async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'requestPutStatus1', baseContext);
 
-          xmlUpdate = countryXml(countryNodeID);
-          apiResponse = await apiContext.put(`api/countries/${countryNodeID}`, {
+          xmlUpdate = getCountryXml(countryNodeID);
+          apiResponse = await apiContext.put(Endpoints.COUNTRIES + countryNodeID, {
             headers: {
               Authorization: `Basic ${Buffer.from(`${wsKey}:`).toString('base64')}`,
             },
@@ -441,13 +458,13 @@ describe('WS - Countries : CRUD', async () => {
           await testContext.addContextItem(this, 'testIdentifier', 'requestPutRootNode1', baseContext);
 
           xmlResponse = await apiResponse.text();
-          expect(ws.getWSRootNodeName(xmlResponse)).to.be.eq('prestashop');
+          expect(xmlHelper.getWSRootNodeName(xmlResponse)).to.be.eq('prestashop');
         });
 
         it('should check number of node under prestashop', async function () {
-          await testContext.addContextItem(this, 'testIdentifier', 'requestPostNodeNumber1', baseContext);
+          await testContext.addContextItem(this, 'testIdentifier', 'requestPutNodeNumber1', baseContext);
 
-          const rootNodes = ws.getWSNodes(xmlResponse, '/prestashop/*');
+          const rootNodes = xmlHelper.getWSNodes(xmlResponse, '/prestashop/*');
           expect(rootNodes.length).to.be.eq(1);
           expect(rootNodes[0].nodeName).to.be.eq('country');
         });
@@ -456,12 +473,12 @@ describe('WS - Countries : CRUD', async () => {
           await testContext.addContextItem(this, 'testIdentifier', 'requestPutCheckId1', baseContext);
 
           // Attribute : id
-          countryNodeID = ws.getWSNodeValue(xmlResponse, '/prestashop/country/id');
+          countryNodeID = xmlHelper.getWSNodeValue(xmlResponse, '/prestashop/country/id');
           expect(countryNodeID).to.be.eq(parseInt(countryNodeID, 10).toString());
         });
       });
 
-      describe('Endpoint : /api/countries/{id} - Method : PUT - Check with WS ', () => {
+      describe(`Endpoint : /${Endpoints.COUNTRIES}{id} - Method : PUT - Check with WS `, () => {
         let apiResponse: APIResponse;
         let xmlResponse : string;
         let countriesNodes: Element[];
@@ -469,7 +486,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check response status', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'requestGetPutStatus2', baseContext);
 
-          apiResponse = await apiContext.get(`api/countries/${countryNodeID}`, {
+          apiResponse = await apiContext.get(Endpoints.COUNTRIES + countryNodeID, {
             headers: {
               Authorization: `Basic ${Buffer.from(`${wsKey}:`).toString('base64')}`,
             },
@@ -481,13 +498,13 @@ describe('WS - Countries : CRUD', async () => {
           await testContext.addContextItem(this, 'testIdentifier', 'requestGetPutRootNode2', baseContext);
 
           xmlResponse = await apiResponse.text();
-          expect(ws.getWSRootNodeName(xmlResponse)).to.be.eq('prestashop');
+          expect(xmlHelper.getWSRootNodeName(xmlResponse)).to.be.eq('prestashop');
         });
 
         it('should check number of node under prestashop', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'requestGetPutNodeNumber1', baseContext);
 
-          const rootNodes = ws.getWSNodes(xmlResponse, '/prestashop/*');
+          const rootNodes = xmlHelper.getWSNodes(xmlResponse, '/prestashop/*');
           expect(rootNodes.length).to.be.eq(1);
           expect(rootNodes[0].nodeName).to.be.eq('country');
         });
@@ -495,12 +512,12 @@ describe('WS - Countries : CRUD', async () => {
         it('should check number of nodes under countries node', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'requestGetPutNumberOfNodes1', baseContext);
 
-          countriesNodes = ws.getWSNodes(xmlResponse, '/prestashop/country/*');
+          countriesNodes = xmlHelper.getWSNodes(xmlResponse, '/prestashop/country/*');
           expect(countriesNodes.length).to.be.gt(0);
         });
 
         it('should check each node id, name ...', async function () {
-          await testContext.addContextItem(this, 'testIdentifier', 'requestGetIDCheckAll', baseContext);
+          await testContext.addContextItem(this, 'testIdentifier', 'requestGetIDCheckAll2', baseContext);
 
           await testContext.addContextItem(this, 'testIdentifier', 'requestEndpointCountriesIdMethodGetAfterPut', baseContext);
 
@@ -511,15 +528,32 @@ describe('WS - Countries : CRUD', async () => {
             if (oNode.nodeName === 'id') {
               expect(oNode.textContent).to.be.eq(countryNodeID);
             } else if (oNode.nodeName === 'name') {
-              const objectNodeValueEN = ws.getWSNodeValue(xmlUpdate, `/prestashop/country/${oNode.nodeName}/language[@id="1"]`);
-              const createNodeValueEN = ws.getWSNodeValue(xmlResponse, `/prestashop/country/${oNode.nodeName}/language[@id="1"]`);
+              const objectNodeValueEN = xmlHelper.getWSNodeValue(
+                xmlUpdate,
+                `/prestashop/country/${oNode.nodeName}/language[@id="1"]`,
+              );
+
+              const createNodeValueEN = xmlHelper.getWSNodeValue(
+                xmlResponse,
+                `/prestashop/country/${oNode.nodeName}/language[@id="1"]`,
+              );
+
               expect(objectNodeValueEN).to.be.eq(createNodeValueEN);
 
-              const objectNodeValueFR = ws.getWSNodeValue(xmlUpdate, `/prestashop/country/${oNode.nodeName}/language[@id="2"]`);
-              const createNodeValueFR = ws.getWSNodeValue(xmlResponse, `/prestashop/country/${oNode.nodeName}/language[@id="2"]`);
+              const objectNodeValueFR = xmlHelper.getWSNodeValue(
+                xmlUpdate,
+                `/prestashop/country/${oNode.nodeName}/language[@id="2"]`,
+              );
+              const createNodeValueFR = xmlHelper.getWSNodeValue(
+                xmlResponse,
+                `/prestashop/country/${oNode.nodeName}/language[@id="2"]`,
+              );
               expect(objectNodeValueFR).to.be.eq(createNodeValueFR);
             } else {
-              const objectNodeValue = ws.getWSNodeValue(xmlUpdate, `/prestashop/country/${oNode.nodeName}`);
+              const objectNodeValue = xmlHelper.getWSNodeValue(
+                xmlUpdate,
+                `/prestashop/country/${oNode.nodeName}`,
+              );
               expect(oNode.textContent).to.be.eq(objectNodeValue);
             }
           }
@@ -554,7 +588,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s zone', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryZone2', baseContext);
 
-          const xmlValueIDZone = ws.getWSNodeValue(xmlUpdate, '/prestashop/country/id_zone');
+          const xmlValueIDZone = xmlHelper.getWSNodeValue(xmlUpdate, '/prestashop/country/id_zone');
           const valueIDZone = await addCountryPage.getSelectValue(page, 'id_zone');
           expect(valueIDZone).to.be.eq(xmlValueIDZone);
         });
@@ -562,7 +596,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s currency', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryCurrency2', baseContext);
 
-          const xmlValueIDCurrency = ws.getWSNodeValue(xmlUpdate, '/prestashop/country/id_currency');
+          const xmlValueIDCurrency = xmlHelper.getWSNodeValue(xmlUpdate, '/prestashop/country/id_currency');
           const valueIDCurrency = await addCountryPage.getSelectValue(page, 'id_currency');
           expect(valueIDCurrency).to.be.eq(xmlValueIDCurrency);
         });
@@ -570,7 +604,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s call_prefix', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryCallPrefix2', baseContext);
 
-          const xmlValueCallPrefix = ws.getWSNodeValue(xmlUpdate, '/prestashop/country/call_prefix');
+          const xmlValueCallPrefix = xmlHelper.getWSNodeValue(xmlUpdate, '/prestashop/country/call_prefix');
           const valueCallPrefix = await addCountryPage.getInputValue(page, 'call_prefix');
           expect(valueCallPrefix).to.be.eq(xmlValueCallPrefix);
         });
@@ -578,7 +612,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s iso_code', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryIsoCode2', baseContext);
 
-          const xmlValueIsoCode = ws.getWSNodeValue(xmlUpdate, '/prestashop/country/iso_code');
+          const xmlValueIsoCode = xmlHelper.getWSNodeValue(xmlUpdate, '/prestashop/country/iso_code');
           const valueIsoCode = await addCountryPage.getInputValue(page, 'iso_code');
           expect(valueIsoCode).to.be.eq(xmlValueIsoCode);
         });
@@ -586,7 +620,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s active', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryActive2', baseContext);
 
-          const xmlValueActive = ws.getWSNodeValue(xmlUpdate, '/prestashop/country/active');
+          const xmlValueActive = xmlHelper.getWSNodeValue(xmlUpdate, '/prestashop/country/active');
           const valueActive = (await addCountryPage.isCheckboxChecked(page, 'active')) ? '1' : '0';
           expect(valueActive).to.be.eq(xmlValueActive);
         });
@@ -594,7 +628,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s states', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryStates2', baseContext);
 
-          const xmlValueContainsStates = ws.getWSNodeValue(xmlUpdate, '/prestashop/country/contains_states');
+          const xmlValueContainsStates = xmlHelper.getWSNodeValue(xmlUpdate, '/prestashop/country/contains_states');
           const valueContainsStates = (await addCountryPage.isCheckboxChecked(page, 'contains_states')) ? '1' : '0';
           expect(valueContainsStates).to.be.eq(xmlValueContainsStates);
         });
@@ -602,7 +636,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s need_identification_number', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryIdentificationNumber2', baseContext);
 
-          const xmlValueNeedIDNumber = ws.getWSNodeValue(xmlUpdate, '/prestashop/country/need_identification_number');
+          const xmlValueNeedIDNumber = xmlHelper.getWSNodeValue(xmlUpdate, '/prestashop/country/need_identification_number');
           const valueNeedIDNumber = (await addCountryPage.isCheckboxChecked(page, 'need_identification_number')) ? '1' : '0';
           expect(valueNeedIDNumber).to.be.eq(xmlValueNeedIDNumber);
         });
@@ -610,7 +644,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s need_zip_code', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryZipCodeNumber2', baseContext);
 
-          const xmlValueNeedZipCode = ws.getWSNodeValue(xmlUpdate, '/prestashop/country/need_zip_code');
+          const xmlValueNeedZipCode = xmlHelper.getWSNodeValue(xmlUpdate, '/prestashop/country/need_zip_code');
           const valueNeedZipCode = (await addCountryPage.isCheckboxChecked(page, 'need_zip_code')) ? '1' : '0';
           expect(valueNeedZipCode).to.be.eq(xmlValueNeedZipCode);
         });
@@ -618,7 +652,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s zip_code_format', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryZipCodeFormat2', baseContext);
 
-          const xmlValueZipCode = ws.getWSNodeValue(xmlUpdate, '/prestashop/country/zip_code_format');
+          const xmlValueZipCode = xmlHelper.getWSNodeValue(xmlUpdate, '/prestashop/country/zip_code_format');
           const valueZipCode = await addCountryPage.getInputValue(page, 'zipCodeFormat');
           expect(valueZipCode).to.be.eq(xmlValueZipCode);
         });
@@ -626,7 +660,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s name language 1', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryNameLang12', baseContext);
 
-          const xmlValueNameEn = ws.getWSNodeValue(xmlUpdate, '/prestashop/country/name/language[@id="1"]');
+          const xmlValueNameEn = xmlHelper.getWSNodeValue(xmlUpdate, '/prestashop/country/name/language[@id="1"]');
           const valueNameEn = (await addCountryPage.getInputValue(page, 'nameEn'));
           expect(valueNameEn).to.be.eq(xmlValueNameEn);
         });
@@ -634,7 +668,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s name language 2', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryNameLang22', baseContext);
 
-          const xmlValueNameFr = ws.getWSNodeValue(xmlUpdate, '/prestashop/country/name/language[@id="2"]');
+          const xmlValueNameFr = xmlHelper.getWSNodeValue(xmlUpdate, '/prestashop/country/name/language[@id="2"]');
           const valueNameFr = (await addCountryPage.getInputValue(page, 'nameFr'));
           expect(valueNameFr).to.be.eq(xmlValueNameFr);
         });
@@ -658,10 +692,10 @@ describe('WS - Countries : CRUD', async () => {
     });
 
     describe('Endpoint : /api/countries - Method : DELETE ', () => {
-      it('should request the endpoint /api/countries/{id} with method DELETE', async function () {
+      it(`should request the endpoint /${Endpoints.COUNTRIES}{id} with method DELETE`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'requestEndpointCountriesMethodDelete', baseContext);
 
-        const apiResponse = await apiContext.delete(`api/countries/${countryNodeID}`, {
+        const apiResponse = await apiContext.delete(Endpoints.COUNTRIES + countryNodeID, {
           headers: {
             Authorization: `Basic ${Buffer.from(`${wsKey}:`).toString('base64')}`,
           },
@@ -669,10 +703,10 @@ describe('WS - Countries : CRUD', async () => {
         await expect(apiResponse.status()).to.eq(200);
       });
 
-      it('should request the endpoint /api/countries/{id} with method GET', async function () {
+      it(`should request the endpoint /${Endpoints.COUNTRIES}{id} with method GET`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'requestEndpointCountriesIdMethodGetAfterDelete', baseContext);
 
-        const apiResponse = await apiContext.get(`api/countries/${countryNodeID}`, {
+        const apiResponse = await apiContext.get(Endpoints.COUNTRIES + countryNodeID, {
           headers: {
             Authorization: `Basic ${Buffer.from(`${wsKey}:`).toString('base64')}`,
           },
diff --git a/tests/UI/data/xml/country.ts b/tests/UI/data/xml/country.ts
index b9139f69ceb56..7dad996786132 100644
--- a/tests/UI/data/xml/country.ts
+++ b/tests/UI/data/xml/country.ts
@@ -1,23 +1,27 @@
 import {faker} from '@faker-js/faker';
 
-const countryXml = (idCountry : string | null = null): string => ('<?xml version="1.0" encoding="UTF-8"?>'
-  + '<prestashop xmlns:xlink="http://www.w3.org/1999/xlink">'
-  + `<country>${idCountry !== null ? (`<id><![CDATA[${idCountry}]]></id>`) : ''}`
-  + `<id_zone><![CDATA[${faker.datatype.number({min: 1, max: 5})}]]></id_zone>`
-  + '<id_currency><![CDATA[1]]></id_currency>'
-  + `<call_prefix><![CDATA[${faker.datatype.number({min: 100, max: 200})}]]></call_prefix>`
-  + `<iso_code><![CDATA[${faker.word.adjective(3)}]]></iso_code>`
-  + `<active><![CDATA[${faker.helpers.arrayElement([0, 1])}]]></active>`
-  + `<contains_states><![CDATA[${faker.helpers.arrayElement([0, 1])}]]></contains_states>`
-  + `<need_identification_number><![CDATA[${faker.helpers.arrayElement([0, 1])}]]></need_identification_number>`
-  + `<need_zip_code><![CDATA[${faker.helpers.arrayElement([0, 1])}]]></need_zip_code>`
-  + `<zip_code_format><![CDATA[${faker.helpers.arrayElement(['NNLLNN', 'LLNNLL'])}]]></zip_code_format>`
-  + `<display_tax_label><![CDATA[${faker.helpers.arrayElement([0, 1])}]]></display_tax_label>`
-  + '<name>'
-  + '<language id="1"><![CDATA[Test in English]]></language>'
-  + '<language id="2"><![CDATA[Test en Français]]></language>'
-  + '</name>'
-  + '</country>'
-  + '</prestashop>');
-
-export default countryXml;
+/**
+ * Get xml of country to put on Post/Put request
+ * @param idCountry {string|null}
+ */
+export default function getCountryXml(idCountry : string | null = null): string {
+  return ('<?xml version="1.0" encoding="UTF-8"?>'
+    + '<prestashop xmlns:xlink="http://www.w3.org/1999/xlink">'
+    + `<country>${idCountry !== null ? (`<id><![CDATA[${idCountry}]]></id>`) : ''}`
+    + `<id_zone><![CDATA[${faker.datatype.number({min: 1, max: 5})}]]></id_zone>`
+    + '<id_currency><![CDATA[1]]></id_currency>'
+    + `<call_prefix><![CDATA[${faker.datatype.number({min: 100, max: 200})}]]></call_prefix>`
+    + `<iso_code><![CDATA[${faker.word.adjective(3)}]]></iso_code>`
+    + `<active><![CDATA[${faker.helpers.arrayElement([0, 1])}]]></active>`
+    + `<contains_states><![CDATA[${faker.helpers.arrayElement([0, 1])}]]></contains_states>`
+    + `<need_identification_number><![CDATA[${faker.helpers.arrayElement([0, 1])}]]></need_identification_number>`
+    + `<need_zip_code><![CDATA[${faker.helpers.arrayElement([0, 1])}]]></need_zip_code>`
+    + `<zip_code_format><![CDATA[${faker.helpers.arrayElement(['NNLLNN', 'LLNNLL'])}]]></zip_code_format>`
+    + `<display_tax_label><![CDATA[${faker.helpers.arrayElement([0, 1])}]]></display_tax_label>`
+    + '<name>'
+    + '<language id="1"><![CDATA[Test in English]]></language>'
+    + '<language id="2"><![CDATA[Test en Français]]></language>'
+    + '</name>'
+    + '</country>'
+    + '</prestashop>');
+}
diff --git a/tests/UI/utils/wsHelpers/endpoints.enum.ts b/tests/UI/utils/wsHelpers/endpoints.enum.ts
new file mode 100644
index 0000000000000..5da9b3240e9da
--- /dev/null
+++ b/tests/UI/utils/wsHelpers/endpoints.enum.ts
@@ -0,0 +1,5 @@
+const enum Endpoints {
+  COUNTRIES = 'api/countries/',
+}
+
+export default Endpoints;
diff --git a/tests/UI/utils/ws.ts b/tests/UI/utils/wsHelpers/xml.ts
similarity index 100%
rename from tests/UI/utils/ws.ts
rename to tests/UI/utils/wsHelpers/xml.ts

From a142aabb8d2e568073db85976ae34e7a97a729fd Mon Sep 17 00:00:00 2001
From: boubkerbribri <boubker.bribri@prestashop.com>
Date: Thu, 8 Jun 2023 10:00:51 +0200
Subject: [PATCH 0078/1030] fix step identifiers double

---
 tests/UI/campaigns/functional/WS/01_countriesCRUD.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/UI/campaigns/functional/WS/01_countriesCRUD.ts b/tests/UI/campaigns/functional/WS/01_countriesCRUD.ts
index 3c30f5ab73a3f..83b33f9f1e016 100644
--- a/tests/UI/campaigns/functional/WS/01_countriesCRUD.ts
+++ b/tests/UI/campaigns/functional/WS/01_countriesCRUD.ts
@@ -517,8 +517,6 @@ describe('WS - Countries : CRUD', async () => {
         });
 
         it('should check each node id, name ...', async function () {
-          await testContext.addContextItem(this, 'testIdentifier', 'requestGetIDCheckAll2', baseContext);
-
           await testContext.addContextItem(this, 'testIdentifier', 'requestEndpointCountriesIdMethodGetAfterPut', baseContext);
 
           // Check nodes are equal to them done in Create

From f6a667704f0dea29c576a6712d88f59c984eac6f Mon Sep 17 00:00:00 2001
From: boubkerbribri <boubker.bribri@prestashop.com>
Date: Thu, 8 Jun 2023 17:32:49 +0200
Subject: [PATCH 0079/1030] Create webservices folder

---
 .../functional/WS/01_countriesCRUD.ts         | 207 +++++++++---------
 tests/UI/package.json                         |   3 +-
 tests/UI/tsconfig.json                        |   3 +-
 tests/UI/utils/helpers.ts                     |   2 +-
 tests/UI/utils/{wsHelpers => }/xml.ts         |   8 +-
 .../country}/endpoints.enum.ts                |   0
 tests/UI/webservices/country/ws.ts            |  92 ++++++++
 7 files changed, 209 insertions(+), 106 deletions(-)
 rename tests/UI/utils/{wsHelpers => }/xml.ts (87%)
 rename tests/UI/{utils/wsHelpers => webservices/country}/endpoints.enum.ts (100%)
 create mode 100644 tests/UI/webservices/country/ws.ts

diff --git a/tests/UI/campaigns/functional/WS/01_countriesCRUD.ts b/tests/UI/campaigns/functional/WS/01_countriesCRUD.ts
index 83b33f9f1e016..df7cbaa020bb4 100644
--- a/tests/UI/campaigns/functional/WS/01_countriesCRUD.ts
+++ b/tests/UI/campaigns/functional/WS/01_countriesCRUD.ts
@@ -1,8 +1,11 @@
 // Import utils
 import helper from '@utils/helpers';
 import testContext from '@utils/testContext';
-import xmlHelper from '@utils/wsHelpers/xml';
-import Endpoints from '@utils/wsHelpers/endpoints.enum';
+import xmlHelper from '@utils/xml';
+import Endpoints from '@webservices/country/endpoints.enum';
+
+// Import webservices
+import wsCountries from '@webservices/country/ws';
 
 // Import commonTests
 import {addWebserviceKey, removeWebserviceKey, setWebserviceStatus} from '@commonTests/BO/advancedParameters/ws';
@@ -31,6 +34,7 @@ describe('WS - Countries : CRUD', async () => {
   let browserContext: BrowserContext;
   let page: Page;
   let wsKey: string = '';
+  let authorization: string = '';
 
   const wsKeyDescription: string = 'Webservice Key - Countries';
   const wsKeyPermissions: WebservicePermission[] = [
@@ -96,11 +100,12 @@ describe('WS - Countries : CRUD', async () => {
         await expect(description).to.contains(wsKeyDescription);
 
         wsKey = await webservicePage.getTextColumnFromTable(page, 1, 'key');
+        authorization = `Basic ${Buffer.from(`${wsKey}:`).toString('base64')}`;
         await expect(wsKey).to.be.not.empty;
       });
     });
 
-    describe('Endpoint : /api/countries - Method : GET ', () => {
+    describe(`Endpoint : ${Endpoints.COUNTRIES} - Method : GET `, () => {
       let apiResponse : APIResponse;
       let xmlResponse : string;
       let countriesNode: Element[];
@@ -108,11 +113,10 @@ describe('WS - Countries : CRUD', async () => {
       it('should check response status', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'requestGetStatus1', baseContext);
 
-        apiResponse = await apiContext.get(Endpoints.COUNTRIES, {
-          headers: {
-            Authorization: `Basic ${Buffer.from(`${wsKey}:`).toString('base64')}`,
-          },
-        });
+        apiResponse = await wsCountries.getAll(
+          apiContext,
+          authorization,
+        );
 
         await expect(apiResponse.status()).to.eq(200);
       });
@@ -121,13 +125,13 @@ describe('WS - Countries : CRUD', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'requestGetRootNode1', baseContext);
 
         xmlResponse = await apiResponse.text();
-        expect(xmlHelper.getWSRootNodeName(xmlResponse)).to.be.eq('prestashop');
+        expect(xmlHelper.getRootNodeName(xmlResponse)).to.be.eq('prestashop');
       });
 
       it('should check number of node under prestashop', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'requestGetNodeNumber1', baseContext);
 
-        const rootNodes = xmlHelper.getWSNodes(xmlResponse, '/prestashop/*');
+        const rootNodes = xmlHelper.getNodes(xmlResponse, '/prestashop/*');
         expect(rootNodes.length).to.be.eq(1);
         expect(rootNodes[0].nodeName).to.be.eq('countries');
       });
@@ -135,7 +139,7 @@ describe('WS - Countries : CRUD', async () => {
       it('should check number of nodes under countries node', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'requestGetNumberOfNodes1', baseContext);
 
-        countriesNode = xmlHelper.getWSNodes(xmlResponse, '/prestashop/countries/*');
+        countriesNode = xmlHelper.getNodes(xmlResponse, '/prestashop/countries/*');
         expect(countriesNode.length).to.be.gt(0);
       });
 
@@ -162,20 +166,20 @@ describe('WS - Countries : CRUD', async () => {
       });
     });
 
-    describe('Endpoint : /api/countries - Method : POST ', () => {
-      describe('Endpoint : /api/countries - Method : POST - Add Country ', () => {
+    describe(`Endpoint : ${Endpoints.COUNTRIES} - Method : POST `, () => {
+      describe(`Endpoint : ${Endpoints.COUNTRIES} - Method : POST - Add Country `, () => {
         let apiResponse: APIResponse;
         let xmlResponse : string;
 
         it('should check response status', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'requestPostStatus1', baseContext);
 
-          apiResponse = await apiContext.post(Endpoints.COUNTRIES, {
-            headers: {
-              Authorization: `Basic ${Buffer.from(`${wsKey}:`).toString('base64')}`,
-            },
-            data: xmlCreate,
-          });
+          apiResponse = await wsCountries.add(
+            apiContext,
+            authorization,
+            xmlCreate,
+          );
+
           await expect(apiResponse.status()).to.eq(201);
         });
 
@@ -183,13 +187,13 @@ describe('WS - Countries : CRUD', async () => {
           await testContext.addContextItem(this, 'testIdentifier', 'requestPostRootNode1', baseContext);
 
           xmlResponse = await apiResponse.text();
-          expect(xmlHelper.getWSRootNodeName(xmlResponse)).to.be.eq('prestashop');
+          expect(xmlHelper.getRootNodeName(xmlResponse)).to.be.eq('prestashop');
         });
 
         it('should check number of node under prestashop', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'requestPostNodeNumber1', baseContext);
 
-          const rootNodes = xmlHelper.getWSNodes(xmlResponse, '/prestashop/*');
+          const rootNodes = xmlHelper.getNodes(xmlResponse, '/prestashop/*');
           expect(rootNodes.length).to.be.eq(1);
           expect(rootNodes[0].nodeName).to.be.eq('country');
         });
@@ -198,12 +202,12 @@ describe('WS - Countries : CRUD', async () => {
           await testContext.addContextItem(this, 'testIdentifier', 'requestPostCheckId1', baseContext);
 
           // Attribute : id
-          countryNodeID = xmlHelper.getWSNodeValue(xmlResponse, '/prestashop/country/id');
+          countryNodeID = xmlHelper.getNodeValue(xmlResponse, '/prestashop/country/id');
           expect(countryNodeID).to.be.eq(parseInt(countryNodeID, 10).toString());
         });
       });
 
-      describe(`Endpoint : /${Endpoints.COUNTRIES}{id} - Method : POST - Check with WS `, () => {
+      describe(`Endpoint : ${Endpoints.COUNTRIES}{id} - Method : POST - Check with WS `, () => {
         let apiResponse: APIResponse;
         let xmlResponse : string;
         let countriesNodes: Element[];
@@ -211,11 +215,12 @@ describe('WS - Countries : CRUD', async () => {
         it('should check response status', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'requestGetIDStatus', baseContext);
 
-          apiResponse = await apiContext.get(Endpoints.COUNTRIES + countryNodeID, {
-            headers: {
-              Authorization: `Basic ${Buffer.from(`${wsKey}:`).toString('base64')}`,
-            },
-          });
+          apiResponse = await wsCountries.getById(
+            apiContext,
+            authorization,
+            countryNodeID,
+          );
+
           await expect(apiResponse.status()).to.eq(200);
         });
 
@@ -223,13 +228,13 @@ describe('WS - Countries : CRUD', async () => {
           await testContext.addContextItem(this, 'testIdentifier', 'requestGetIDRootNode1', baseContext);
 
           xmlResponse = await apiResponse.text();
-          expect(xmlHelper.getWSRootNodeName(xmlResponse)).to.be.eq('prestashop');
+          expect(xmlHelper.getRootNodeName(xmlResponse)).to.be.eq('prestashop');
         });
 
         it('should check number of node under prestashop', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'requestGetIDNodeNumber1', baseContext);
 
-          const rootNodes = xmlHelper.getWSNodes(xmlResponse, '/prestashop/*');
+          const rootNodes = xmlHelper.getNodes(xmlResponse, '/prestashop/*');
           expect(rootNodes.length).to.be.eq(1);
           expect(rootNodes[0].nodeName).to.be.eq('country');
         });
@@ -237,7 +242,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check number of nodes under countries node', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'requestGetIDNumberOfNodes1', baseContext);
 
-          countriesNodes = xmlHelper.getWSNodes(xmlResponse, '/prestashop/country/*');
+          countriesNodes = xmlHelper.getNodes(xmlResponse, '/prestashop/country/*');
           expect(countriesNodes.length).to.be.gt(0);
         });
 
@@ -251,28 +256,28 @@ describe('WS - Countries : CRUD', async () => {
             if (oNode.nodeName === 'id') {
               expect(oNode.textContent).to.be.eq(countryNodeID);
             } else if (oNode.nodeName === 'name') {
-              const objectNodeValueEN = xmlHelper.getWSNodeValue(
+              const objectNodeValueEN = xmlHelper.getNodeValue(
                 xmlCreate,
                 `/prestashop/country/${oNode.nodeName}/language[@id="1"]`,
               );
 
-              const createNodeValueEN = xmlHelper.getWSNodeValue(
+              const createNodeValueEN = xmlHelper.getNodeValue(
                 xmlCreate,
                 `/prestashop/country/${oNode.nodeName}/language[@id="1"]`,
               );
               expect(objectNodeValueEN).to.be.eq(createNodeValueEN);
 
-              const objectNodeValueFR = xmlHelper.getWSNodeValue(
+              const objectNodeValueFR = xmlHelper.getNodeValue(
                 xmlCreate,
                 `/prestashop/country/${oNode.nodeName}/language[@id="2"]`,
               );
-              const createNodeValueFR = xmlHelper.getWSNodeValue(
+              const createNodeValueFR = xmlHelper.getNodeValue(
                 xmlCreate,
                 `/prestashop/country/${oNode.nodeName}/language[@id="2"]`,
               );
               expect(objectNodeValueFR).to.be.eq(createNodeValueFR);
             } else {
-              const objectNodeValue: string = xmlHelper.getWSNodeValue(
+              const objectNodeValue: string = xmlHelper.getNodeValue(
                 xmlCreate,
                 `/prestashop/country/${oNode.nodeName}`,
               );
@@ -282,7 +287,7 @@ describe('WS - Countries : CRUD', async () => {
         });
       });
 
-      describe('Endpoint : /api/countries - Method : POST - Check On BO ', () => {
+      describe(`Endpoint : ${Endpoints.COUNTRIES} - Method : POST - Check On BO `, () => {
         it('should go to \'International > Locations\' page', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'goToLocationsPage', baseContext);
 
@@ -333,7 +338,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s zone', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryZone1', baseContext);
 
-          const xmlValueIDZone = xmlHelper.getWSNodeValue(xmlCreate, '/prestashop/country/id_zone');
+          const xmlValueIDZone = xmlHelper.getNodeValue(xmlCreate, '/prestashop/country/id_zone');
           const valueIDZone = await addCountryPage.getSelectValue(page, 'id_zone');
           expect(valueIDZone).to.be.eq(xmlValueIDZone);
         });
@@ -341,7 +346,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s currency', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryCurrency1', baseContext);
 
-          const xmlValueIDCurrency = xmlHelper.getWSNodeValue(xmlCreate, '/prestashop/country/id_currency');
+          const xmlValueIDCurrency = xmlHelper.getNodeValue(xmlCreate, '/prestashop/country/id_currency');
           const valueIDCurrency = await addCountryPage.getSelectValue(page, 'id_currency');
           expect(valueIDCurrency).to.be.eq(xmlValueIDCurrency);
         });
@@ -349,7 +354,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s call_prefix', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryCallPrefix1', baseContext);
 
-          const xmlValueCallPrefix = xmlHelper.getWSNodeValue(xmlCreate, '/prestashop/country/call_prefix');
+          const xmlValueCallPrefix = xmlHelper.getNodeValue(xmlCreate, '/prestashop/country/call_prefix');
           const valueCallPrefix = await addCountryPage.getInputValue(page, 'call_prefix');
           expect(valueCallPrefix).to.be.eq(xmlValueCallPrefix);
         });
@@ -357,7 +362,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s iso_code', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryIsoCode1', baseContext);
 
-          const xmlValueIsoCode = xmlHelper.getWSNodeValue(xmlCreate, '/prestashop/country/iso_code');
+          const xmlValueIsoCode = xmlHelper.getNodeValue(xmlCreate, '/prestashop/country/iso_code');
           const valueIsoCode = await addCountryPage.getInputValue(page, 'iso_code');
           expect(valueIsoCode).to.be.eq(xmlValueIsoCode);
         });
@@ -365,7 +370,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s active', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryActive1', baseContext);
 
-          const xmlValueActive = xmlHelper.getWSNodeValue(xmlCreate, '/prestashop/country/active');
+          const xmlValueActive = xmlHelper.getNodeValue(xmlCreate, '/prestashop/country/active');
           const valueActive = (await addCountryPage.isCheckboxChecked(page, 'active')) ? '1' : '0';
           expect(valueActive).to.be.eq(xmlValueActive);
         });
@@ -373,7 +378,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s states', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryStates1', baseContext);
 
-          const xmlValueContainsStates = xmlHelper.getWSNodeValue(xmlCreate, '/prestashop/country/contains_states');
+          const xmlValueContainsStates = xmlHelper.getNodeValue(xmlCreate, '/prestashop/country/contains_states');
           const valueContainsStates = (await addCountryPage.isCheckboxChecked(page, 'contains_states')) ? '1' : '0';
           expect(valueContainsStates).to.be.eq(xmlValueContainsStates);
         });
@@ -381,7 +386,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s need_identification_number', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryIdentificationNumber1', baseContext);
 
-          const xmlValueNeedIDNumber = xmlHelper.getWSNodeValue(xmlCreate, '/prestashop/country/need_identification_number');
+          const xmlValueNeedIDNumber = xmlHelper.getNodeValue(xmlCreate, '/prestashop/country/need_identification_number');
           const valueNeedIDNumber = (await addCountryPage.isCheckboxChecked(page, 'need_identification_number')) ? '1' : '0';
           expect(valueNeedIDNumber).to.be.eq(xmlValueNeedIDNumber);
         });
@@ -389,7 +394,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s need_zip_code', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryZipCodeNumber1', baseContext);
 
-          const xmlValueNeedZipCode = xmlHelper.getWSNodeValue(xmlCreate, '/prestashop/country/need_zip_code');
+          const xmlValueNeedZipCode = xmlHelper.getNodeValue(xmlCreate, '/prestashop/country/need_zip_code');
           const valueNeedZipCode = (await addCountryPage.isCheckboxChecked(page, 'need_zip_code')) ? '1' : '0';
           expect(valueNeedZipCode).to.be.eq(xmlValueNeedZipCode);
         });
@@ -397,7 +402,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s zip_code_format', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryZipCodeFormat1', baseContext);
 
-          const xmlValueZipCode = xmlHelper.getWSNodeValue(xmlCreate, '/prestashop/country/zip_code_format');
+          const xmlValueZipCode = xmlHelper.getNodeValue(xmlCreate, '/prestashop/country/zip_code_format');
           const valueZipCode = await addCountryPage.getInputValue(page, 'zipCodeFormat');
           expect(valueZipCode).to.be.eq(xmlValueZipCode);
         });
@@ -405,7 +410,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s name language 1', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryNameLang11', baseContext);
 
-          const xmlValueNameEn = xmlHelper.getWSNodeValue(xmlCreate, '/prestashop/country/name/language[@id="1"]');
+          const xmlValueNameEn = xmlHelper.getNodeValue(xmlCreate, '/prestashop/country/name/language[@id="1"]');
           const valueNameEn = (await addCountryPage.getInputValue(page, 'nameEn'));
           expect(valueNameEn).to.be.eq(xmlValueNameEn);
         });
@@ -413,7 +418,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s name language 2', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryNameLang21', baseContext);
 
-          const xmlValueNameFr = xmlHelper.getWSNodeValue(xmlCreate, '/prestashop/country/name/language[@id="2"]');
+          const xmlValueNameFr = xmlHelper.getNodeValue(xmlCreate, '/prestashop/country/name/language[@id="2"]');
           const valueNameFr = (await addCountryPage.getInputValue(page, 'nameFr'));
           expect(valueNameFr).to.be.eq(xmlValueNameFr);
         });
@@ -436,21 +441,22 @@ describe('WS - Countries : CRUD', async () => {
       });
     });
 
-    describe('Endpoint : /api/countries - Method : PUT ', () => {
-      describe('Endpoint : /api/countries - Method : PUT - Update Country ', () => {
+    describe(`Endpoint : ${Endpoints.COUNTRIES} - Method : PUT `, () => {
+      describe(`Endpoint : ${Endpoints.COUNTRIES} - Method : PUT - Update Country `, () => {
         let apiResponse: APIResponse;
         let xmlResponse : string;
 
-        it(`should check response status of /${Endpoints.COUNTRIES}{id}`, async function () {
+        it(`should check response status of ${Endpoints.COUNTRIES}{id}`, async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'requestPutStatus1', baseContext);
 
           xmlUpdate = getCountryXml(countryNodeID);
-          apiResponse = await apiContext.put(Endpoints.COUNTRIES + countryNodeID, {
-            headers: {
-              Authorization: `Basic ${Buffer.from(`${wsKey}:`).toString('base64')}`,
-            },
-            data: xmlUpdate,
-          });
+          apiResponse = await wsCountries.update(
+            apiContext,
+            authorization,
+            countryNodeID,
+            xmlUpdate,
+          );
+
           await expect(apiResponse.status()).to.eq(200);
         });
 
@@ -458,13 +464,13 @@ describe('WS - Countries : CRUD', async () => {
           await testContext.addContextItem(this, 'testIdentifier', 'requestPutRootNode1', baseContext);
 
           xmlResponse = await apiResponse.text();
-          expect(xmlHelper.getWSRootNodeName(xmlResponse)).to.be.eq('prestashop');
+          expect(xmlHelper.getRootNodeName(xmlResponse)).to.be.eq('prestashop');
         });
 
         it('should check number of node under prestashop', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'requestPutNodeNumber1', baseContext);
 
-          const rootNodes = xmlHelper.getWSNodes(xmlResponse, '/prestashop/*');
+          const rootNodes = xmlHelper.getNodes(xmlResponse, '/prestashop/*');
           expect(rootNodes.length).to.be.eq(1);
           expect(rootNodes[0].nodeName).to.be.eq('country');
         });
@@ -473,12 +479,12 @@ describe('WS - Countries : CRUD', async () => {
           await testContext.addContextItem(this, 'testIdentifier', 'requestPutCheckId1', baseContext);
 
           // Attribute : id
-          countryNodeID = xmlHelper.getWSNodeValue(xmlResponse, '/prestashop/country/id');
+          countryNodeID = xmlHelper.getNodeValue(xmlResponse, '/prestashop/country/id');
           expect(countryNodeID).to.be.eq(parseInt(countryNodeID, 10).toString());
         });
       });
 
-      describe(`Endpoint : /${Endpoints.COUNTRIES}{id} - Method : PUT - Check with WS `, () => {
+      describe(`Endpoint : ${Endpoints.COUNTRIES}{id} - Method : PUT - Check with WS `, () => {
         let apiResponse: APIResponse;
         let xmlResponse : string;
         let countriesNodes: Element[];
@@ -486,11 +492,12 @@ describe('WS - Countries : CRUD', async () => {
         it('should check response status', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'requestGetPutStatus2', baseContext);
 
-          apiResponse = await apiContext.get(Endpoints.COUNTRIES + countryNodeID, {
-            headers: {
-              Authorization: `Basic ${Buffer.from(`${wsKey}:`).toString('base64')}`,
-            },
-          });
+          apiResponse = await wsCountries.getById(
+            apiContext,
+            authorization,
+            countryNodeID,
+          );
+
           await expect(apiResponse.status()).to.eq(200);
         });
 
@@ -498,13 +505,13 @@ describe('WS - Countries : CRUD', async () => {
           await testContext.addContextItem(this, 'testIdentifier', 'requestGetPutRootNode2', baseContext);
 
           xmlResponse = await apiResponse.text();
-          expect(xmlHelper.getWSRootNodeName(xmlResponse)).to.be.eq('prestashop');
+          expect(xmlHelper.getRootNodeName(xmlResponse)).to.be.eq('prestashop');
         });
 
         it('should check number of node under prestashop', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'requestGetPutNodeNumber1', baseContext);
 
-          const rootNodes = xmlHelper.getWSNodes(xmlResponse, '/prestashop/*');
+          const rootNodes = xmlHelper.getNodes(xmlResponse, '/prestashop/*');
           expect(rootNodes.length).to.be.eq(1);
           expect(rootNodes[0].nodeName).to.be.eq('country');
         });
@@ -512,7 +519,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check number of nodes under countries node', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'requestGetPutNumberOfNodes1', baseContext);
 
-          countriesNodes = xmlHelper.getWSNodes(xmlResponse, '/prestashop/country/*');
+          countriesNodes = xmlHelper.getNodes(xmlResponse, '/prestashop/country/*');
           expect(countriesNodes.length).to.be.gt(0);
         });
 
@@ -526,29 +533,29 @@ describe('WS - Countries : CRUD', async () => {
             if (oNode.nodeName === 'id') {
               expect(oNode.textContent).to.be.eq(countryNodeID);
             } else if (oNode.nodeName === 'name') {
-              const objectNodeValueEN = xmlHelper.getWSNodeValue(
+              const objectNodeValueEN = xmlHelper.getNodeValue(
                 xmlUpdate,
                 `/prestashop/country/${oNode.nodeName}/language[@id="1"]`,
               );
 
-              const createNodeValueEN = xmlHelper.getWSNodeValue(
+              const createNodeValueEN = xmlHelper.getNodeValue(
                 xmlResponse,
                 `/prestashop/country/${oNode.nodeName}/language[@id="1"]`,
               );
 
               expect(objectNodeValueEN).to.be.eq(createNodeValueEN);
 
-              const objectNodeValueFR = xmlHelper.getWSNodeValue(
+              const objectNodeValueFR = xmlHelper.getNodeValue(
                 xmlUpdate,
                 `/prestashop/country/${oNode.nodeName}/language[@id="2"]`,
               );
-              const createNodeValueFR = xmlHelper.getWSNodeValue(
+              const createNodeValueFR = xmlHelper.getNodeValue(
                 xmlResponse,
                 `/prestashop/country/${oNode.nodeName}/language[@id="2"]`,
               );
               expect(objectNodeValueFR).to.be.eq(createNodeValueFR);
             } else {
-              const objectNodeValue = xmlHelper.getWSNodeValue(
+              const objectNodeValue = xmlHelper.getNodeValue(
                 xmlUpdate,
                 `/prestashop/country/${oNode.nodeName}`,
               );
@@ -558,7 +565,7 @@ describe('WS - Countries : CRUD', async () => {
         });
       });
 
-      describe('Endpoint : /api/countries - Method : PUT - Check On BO ', () => {
+      describe(`Endpoint : ${Endpoints.COUNTRIES} - Method : PUT - Check On BO `, () => {
         it('should filter country by ID', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'filterToUpdateAfterPost2', baseContext);
 
@@ -586,7 +593,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s zone', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryZone2', baseContext);
 
-          const xmlValueIDZone = xmlHelper.getWSNodeValue(xmlUpdate, '/prestashop/country/id_zone');
+          const xmlValueIDZone = xmlHelper.getNodeValue(xmlUpdate, '/prestashop/country/id_zone');
           const valueIDZone = await addCountryPage.getSelectValue(page, 'id_zone');
           expect(valueIDZone).to.be.eq(xmlValueIDZone);
         });
@@ -594,7 +601,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s currency', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryCurrency2', baseContext);
 
-          const xmlValueIDCurrency = xmlHelper.getWSNodeValue(xmlUpdate, '/prestashop/country/id_currency');
+          const xmlValueIDCurrency = xmlHelper.getNodeValue(xmlUpdate, '/prestashop/country/id_currency');
           const valueIDCurrency = await addCountryPage.getSelectValue(page, 'id_currency');
           expect(valueIDCurrency).to.be.eq(xmlValueIDCurrency);
         });
@@ -602,7 +609,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s call_prefix', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryCallPrefix2', baseContext);
 
-          const xmlValueCallPrefix = xmlHelper.getWSNodeValue(xmlUpdate, '/prestashop/country/call_prefix');
+          const xmlValueCallPrefix = xmlHelper.getNodeValue(xmlUpdate, '/prestashop/country/call_prefix');
           const valueCallPrefix = await addCountryPage.getInputValue(page, 'call_prefix');
           expect(valueCallPrefix).to.be.eq(xmlValueCallPrefix);
         });
@@ -610,7 +617,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s iso_code', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryIsoCode2', baseContext);
 
-          const xmlValueIsoCode = xmlHelper.getWSNodeValue(xmlUpdate, '/prestashop/country/iso_code');
+          const xmlValueIsoCode = xmlHelper.getNodeValue(xmlUpdate, '/prestashop/country/iso_code');
           const valueIsoCode = await addCountryPage.getInputValue(page, 'iso_code');
           expect(valueIsoCode).to.be.eq(xmlValueIsoCode);
         });
@@ -618,7 +625,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s active', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryActive2', baseContext);
 
-          const xmlValueActive = xmlHelper.getWSNodeValue(xmlUpdate, '/prestashop/country/active');
+          const xmlValueActive = xmlHelper.getNodeValue(xmlUpdate, '/prestashop/country/active');
           const valueActive = (await addCountryPage.isCheckboxChecked(page, 'active')) ? '1' : '0';
           expect(valueActive).to.be.eq(xmlValueActive);
         });
@@ -626,7 +633,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s states', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryStates2', baseContext);
 
-          const xmlValueContainsStates = xmlHelper.getWSNodeValue(xmlUpdate, '/prestashop/country/contains_states');
+          const xmlValueContainsStates = xmlHelper.getNodeValue(xmlUpdate, '/prestashop/country/contains_states');
           const valueContainsStates = (await addCountryPage.isCheckboxChecked(page, 'contains_states')) ? '1' : '0';
           expect(valueContainsStates).to.be.eq(xmlValueContainsStates);
         });
@@ -634,7 +641,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s need_identification_number', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryIdentificationNumber2', baseContext);
 
-          const xmlValueNeedIDNumber = xmlHelper.getWSNodeValue(xmlUpdate, '/prestashop/country/need_identification_number');
+          const xmlValueNeedIDNumber = xmlHelper.getNodeValue(xmlUpdate, '/prestashop/country/need_identification_number');
           const valueNeedIDNumber = (await addCountryPage.isCheckboxChecked(page, 'need_identification_number')) ? '1' : '0';
           expect(valueNeedIDNumber).to.be.eq(xmlValueNeedIDNumber);
         });
@@ -642,7 +649,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s need_zip_code', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryZipCodeNumber2', baseContext);
 
-          const xmlValueNeedZipCode = xmlHelper.getWSNodeValue(xmlUpdate, '/prestashop/country/need_zip_code');
+          const xmlValueNeedZipCode = xmlHelper.getNodeValue(xmlUpdate, '/prestashop/country/need_zip_code');
           const valueNeedZipCode = (await addCountryPage.isCheckboxChecked(page, 'need_zip_code')) ? '1' : '0';
           expect(valueNeedZipCode).to.be.eq(xmlValueNeedZipCode);
         });
@@ -650,7 +657,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s zip_code_format', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryZipCodeFormat2', baseContext);
 
-          const xmlValueZipCode = xmlHelper.getWSNodeValue(xmlUpdate, '/prestashop/country/zip_code_format');
+          const xmlValueZipCode = xmlHelper.getNodeValue(xmlUpdate, '/prestashop/country/zip_code_format');
           const valueZipCode = await addCountryPage.getInputValue(page, 'zipCodeFormat');
           expect(valueZipCode).to.be.eq(xmlValueZipCode);
         });
@@ -658,7 +665,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s name language 1', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryNameLang12', baseContext);
 
-          const xmlValueNameEn = xmlHelper.getWSNodeValue(xmlUpdate, '/prestashop/country/name/language[@id="1"]');
+          const xmlValueNameEn = xmlHelper.getNodeValue(xmlUpdate, '/prestashop/country/name/language[@id="1"]');
           const valueNameEn = (await addCountryPage.getInputValue(page, 'nameEn'));
           expect(valueNameEn).to.be.eq(xmlValueNameEn);
         });
@@ -666,7 +673,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s name language 2', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryNameLang22', baseContext);
 
-          const xmlValueNameFr = xmlHelper.getWSNodeValue(xmlUpdate, '/prestashop/country/name/language[@id="2"]');
+          const xmlValueNameFr = xmlHelper.getNodeValue(xmlUpdate, '/prestashop/country/name/language[@id="2"]');
           const valueNameFr = (await addCountryPage.getInputValue(page, 'nameFr'));
           expect(valueNameFr).to.be.eq(xmlValueNameFr);
         });
@@ -689,26 +696,28 @@ describe('WS - Countries : CRUD', async () => {
       });
     });
 
-    describe('Endpoint : /api/countries - Method : DELETE ', () => {
-      it(`should request the endpoint /${Endpoints.COUNTRIES}{id} with method DELETE`, async function () {
+    describe(`Endpoint : ${Endpoints.COUNTRIES} - Method : DELETE `, () => {
+      it(`should request the endpoint ${Endpoints.COUNTRIES}{id} with method DELETE`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'requestEndpointCountriesMethodDelete', baseContext);
 
-        const apiResponse = await apiContext.delete(Endpoints.COUNTRIES + countryNodeID, {
-          headers: {
-            Authorization: `Basic ${Buffer.from(`${wsKey}:`).toString('base64')}`,
-          },
-        });
+        const apiResponse = await wsCountries.delete(
+          apiContext,
+          authorization,
+          countryNodeID,
+        );
+
         await expect(apiResponse.status()).to.eq(200);
       });
 
-      it(`should request the endpoint /${Endpoints.COUNTRIES}{id} with method GET`, async function () {
+      it(`should request the endpoint ${Endpoints.COUNTRIES}{id} with method GET`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'requestEndpointCountriesIdMethodGetAfterDelete', baseContext);
 
-        const apiResponse = await apiContext.get(Endpoints.COUNTRIES + countryNodeID, {
-          headers: {
-            Authorization: `Basic ${Buffer.from(`${wsKey}:`).toString('base64')}`,
-          },
-        });
+        const apiResponse = await wsCountries.getById(
+          apiContext,
+          authorization,
+          countryNodeID,
+        );
+
         await expect(apiResponse.status()).to.eq(404);
       });
 
diff --git a/tests/UI/package.json b/tests/UI/package.json
index af81cfccafba1..bebc762f10683 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -92,7 +92,8 @@
     "@commonTests": "commonTests",
     "@data": "data",
     "@utils": "utils",
-    "@tools": "tools"
+    "@tools": "tools",
+    "@webservices": "webservices"
   },
   "repository": {
     "type": "git",
diff --git a/tests/UI/tsconfig.json b/tests/UI/tsconfig.json
index 2e6fc09dddfcc..1f423211ad71a 100644
--- a/tests/UI/tsconfig.json
+++ b/tests/UI/tsconfig.json
@@ -17,7 +17,8 @@
       "@commonTests/*": ["commonTests/*"],
       "@data/*": ["data/*"],
       "@utils/*": ["utils/*"],
-      "@tools/*": ["tools/*"]
+      "@tools/*": ["tools/*"],
+      "@webservices/*": ["webservices/*"]
     },
     "typeRoots": ["types", "node_modules/@types"],
     "skipLibCheck": true,
diff --git a/tests/UI/utils/helpers.ts b/tests/UI/utils/helpers.ts
index 298d2858d3b49..9587d588b3a18 100755
--- a/tests/UI/utils/helpers.ts
+++ b/tests/UI/utils/helpers.ts
@@ -54,7 +54,7 @@ export default {
   async createAPIContext(url: string): Promise<APIRequestContext> {
     return request.newContext({
       baseURL: url,
-      // @todo : Remove it when Puppeteer will accept self signed certificates
+      // @todo : Remove it when Playwright will accept self signed certificates
       ignoreHTTPSErrors: true,
     });
   },
diff --git a/tests/UI/utils/wsHelpers/xml.ts b/tests/UI/utils/xml.ts
similarity index 87%
rename from tests/UI/utils/wsHelpers/xml.ts
rename to tests/UI/utils/xml.ts
index 402754f58b94c..b62c189acc516 100644
--- a/tests/UI/utils/wsHelpers/xml.ts
+++ b/tests/UI/utils/xml.ts
@@ -18,7 +18,7 @@ export default {
    * @param {string} xml
    * @return {string}
    */
-  getWSRootNodeName(xml: string): string {
+  getRootNodeName(xml: string): string {
     const xmlDocument = this.getXmlDocument(xml);
     const docElement: HTMLElement = xmlDocument.documentElement;
 
@@ -31,7 +31,7 @@ export default {
    * @param {string} path
    * @return {string}
    */
-  getWSNodes(xml: string, path: string): Element[] {
+  getNodes(xml: string, path: string): Element[] {
     const xmlDocument = this.getXmlDocument(xml);
 
     return xpath.select(path, xmlDocument) as Element[];
@@ -43,7 +43,7 @@ export default {
    * @param {string} path
    * @return {string}
    */
-  getWSNode(xml: string, path: string): Element {
+  getNode(xml: string, path: string): Element {
     const xmlDocument = this.getXmlDocument(xml);
 
     return xpath.select1(path, xmlDocument) as Element;
@@ -55,7 +55,7 @@ export default {
    * @param {string} path
    * @return {string}
    */
-  getWSNodeValue(xml: string, path: string): string {
+  getNodeValue(xml: string, path: string): string {
     const xmlDocument = this.getXmlDocument(xml);
 
     return xpath.select1(`string(${path})`, xmlDocument) as string;
diff --git a/tests/UI/utils/wsHelpers/endpoints.enum.ts b/tests/UI/webservices/country/endpoints.enum.ts
similarity index 100%
rename from tests/UI/utils/wsHelpers/endpoints.enum.ts
rename to tests/UI/webservices/country/endpoints.enum.ts
diff --git a/tests/UI/webservices/country/ws.ts b/tests/UI/webservices/country/ws.ts
new file mode 100644
index 0000000000000..cb86ea7aa3457
--- /dev/null
+++ b/tests/UI/webservices/country/ws.ts
@@ -0,0 +1,92 @@
+import Endpoints from '@webservices/country/endpoints.enum';
+import type {APIRequestContext, APIResponse} from 'playwright';
+
+export default {
+  /**
+   * Get All Countries
+   * @param apiContext {APIRequestContext}
+   * @param authorization {string}
+   */
+  getAll(
+    apiContext: APIRequestContext,
+    authorization: string,
+  ): Promise<APIResponse> {
+    return apiContext.get(Endpoints.COUNTRIES, {
+      headers: {
+        Authorization: authorization,
+      },
+    });
+  },
+  /**
+   * Get By id
+   * @param apiContext {APIRequestContext}
+   * @param authorization {string}
+   * @param idCountry {string}
+   */
+  getById(
+    apiContext: APIRequestContext,
+    authorization: string,
+    idCountry: string,
+  ): Promise<APIResponse> {
+    return apiContext.get(Endpoints.COUNTRIES + idCountry, {
+      headers: {
+        Authorization: authorization,
+      },
+    });
+  },
+  /**
+   * Add new Country
+   * @param apiContext {APIRequestContext}
+   * @param authorization {string}
+   * @param data {string} Xml of a new Country
+   */
+  add(
+    apiContext: APIRequestContext,
+    authorization: string,
+    data: string,
+  ): Promise<APIResponse> {
+    return apiContext.post(Endpoints.COUNTRIES, {
+      headers: {
+        Authorization: authorization,
+      },
+      data,
+    });
+  },
+  /**
+   * Update a country
+   * @param apiContext {APIRequestContext}
+   * @param authorization {string}
+   * @param idCountry {string}
+   * @param data {string} Xml of the new Country
+   */
+  update(
+    apiContext: APIRequestContext,
+    authorization: string,
+    idCountry: string,
+    data: string,
+  ): Promise<APIResponse> {
+    return apiContext.put(Endpoints.COUNTRIES + idCountry, {
+      headers: {
+        Authorization: authorization,
+      },
+      data,
+    });
+  },
+  /**
+   * Delete a country
+   * @param apiContext {APIRequestContext}
+   * @param authorization {string}
+   * @param idCountry {string}
+   */
+  delete(
+    apiContext: APIRequestContext,
+    authorization: string,
+    idCountry: string,
+  ): Promise<APIResponse> {
+    return apiContext.delete(Endpoints.COUNTRIES + idCountry, {
+      headers: {
+        Authorization: authorization,
+      },
+    });
+  },
+};

From d9158f255a84aca3985e7d6bd3523452cb6535eb Mon Sep 17 00:00:00 2001
From: boubkerbribri <boubker.bribri@prestashop.com>
Date: Thu, 8 Jun 2023 18:02:39 +0200
Subject: [PATCH 0080/1030] Use classes

---
 .../functional/WS/01_countriesCRUD.ts         | 43 +++++------
 .../webservices/{country/ws.ts => baseWs.ts}  | 71 ++++++++++-------
 .../UI/webservices/country/endpoints.enum.ts  |  5 --
 tests/UI/webservices/country/index.ts         | 76 +++++++++++++++++++
 4 files changed, 139 insertions(+), 56 deletions(-)
 rename tests/UI/webservices/{country/ws.ts => baseWs.ts} (63%)
 delete mode 100644 tests/UI/webservices/country/endpoints.enum.ts
 create mode 100644 tests/UI/webservices/country/index.ts

diff --git a/tests/UI/campaigns/functional/WS/01_countriesCRUD.ts b/tests/UI/campaigns/functional/WS/01_countriesCRUD.ts
index df7cbaa020bb4..456c3b019a652 100644
--- a/tests/UI/campaigns/functional/WS/01_countriesCRUD.ts
+++ b/tests/UI/campaigns/functional/WS/01_countriesCRUD.ts
@@ -2,10 +2,9 @@
 import helper from '@utils/helpers';
 import testContext from '@utils/testContext';
 import xmlHelper from '@utils/xml';
-import Endpoints from '@webservices/country/endpoints.enum';
 
 // Import webservices
-import wsCountries from '@webservices/country/ws';
+import CountryWS from '@webservices/country';
 
 // Import commonTests
 import {addWebserviceKey, removeWebserviceKey, setWebserviceStatus} from '@commonTests/BO/advancedParameters/ws';
@@ -105,7 +104,7 @@ describe('WS - Countries : CRUD', async () => {
       });
     });
 
-    describe(`Endpoint : ${Endpoints.COUNTRIES} - Method : GET `, () => {
+    describe(`Endpoint : ${CountryWS.endpoint} - Method : GET `, () => {
       let apiResponse : APIResponse;
       let xmlResponse : string;
       let countriesNode: Element[];
@@ -113,7 +112,7 @@ describe('WS - Countries : CRUD', async () => {
       it('should check response status', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'requestGetStatus1', baseContext);
 
-        apiResponse = await wsCountries.getAll(
+        apiResponse = await CountryWS.getAll(
           apiContext,
           authorization,
         );
@@ -166,15 +165,15 @@ describe('WS - Countries : CRUD', async () => {
       });
     });
 
-    describe(`Endpoint : ${Endpoints.COUNTRIES} - Method : POST `, () => {
-      describe(`Endpoint : ${Endpoints.COUNTRIES} - Method : POST - Add Country `, () => {
+    describe(`Endpoint : ${CountryWS.endpoint} - Method : POST `, () => {
+      describe(`Endpoint : ${CountryWS.endpoint} - Method : POST - Add Country `, () => {
         let apiResponse: APIResponse;
         let xmlResponse : string;
 
         it('should check response status', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'requestPostStatus1', baseContext);
 
-          apiResponse = await wsCountries.add(
+          apiResponse = await CountryWS.add(
             apiContext,
             authorization,
             xmlCreate,
@@ -207,7 +206,7 @@ describe('WS - Countries : CRUD', async () => {
         });
       });
 
-      describe(`Endpoint : ${Endpoints.COUNTRIES}{id} - Method : POST - Check with WS `, () => {
+      describe(`Endpoint : ${CountryWS.endpoint}/{id} - Method : POST - Check with WS `, () => {
         let apiResponse: APIResponse;
         let xmlResponse : string;
         let countriesNodes: Element[];
@@ -215,7 +214,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check response status', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'requestGetIDStatus', baseContext);
 
-          apiResponse = await wsCountries.getById(
+          apiResponse = await CountryWS.getById(
             apiContext,
             authorization,
             countryNodeID,
@@ -287,7 +286,7 @@ describe('WS - Countries : CRUD', async () => {
         });
       });
 
-      describe(`Endpoint : ${Endpoints.COUNTRIES} - Method : POST - Check On BO `, () => {
+      describe(`Endpoint : ${CountryWS.endpoint} - Method : POST - Check On BO `, () => {
         it('should go to \'International > Locations\' page', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'goToLocationsPage', baseContext);
 
@@ -441,16 +440,16 @@ describe('WS - Countries : CRUD', async () => {
       });
     });
 
-    describe(`Endpoint : ${Endpoints.COUNTRIES} - Method : PUT `, () => {
-      describe(`Endpoint : ${Endpoints.COUNTRIES} - Method : PUT - Update Country `, () => {
+    describe(`Endpoint : ${CountryWS.endpoint} - Method : PUT `, () => {
+      describe(`Endpoint : ${CountryWS.endpoint} - Method : PUT - Update Country `, () => {
         let apiResponse: APIResponse;
         let xmlResponse : string;
 
-        it(`should check response status of ${Endpoints.COUNTRIES}{id}`, async function () {
+        it(`should check response status of ${CountryWS.endpoint}/{id}`, async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'requestPutStatus1', baseContext);
 
           xmlUpdate = getCountryXml(countryNodeID);
-          apiResponse = await wsCountries.update(
+          apiResponse = await CountryWS.update(
             apiContext,
             authorization,
             countryNodeID,
@@ -484,7 +483,7 @@ describe('WS - Countries : CRUD', async () => {
         });
       });
 
-      describe(`Endpoint : ${Endpoints.COUNTRIES}{id} - Method : PUT - Check with WS `, () => {
+      describe(`Endpoint : ${CountryWS.endpoint}/{id} - Method : PUT - Check with WS `, () => {
         let apiResponse: APIResponse;
         let xmlResponse : string;
         let countriesNodes: Element[];
@@ -492,7 +491,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check response status', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'requestGetPutStatus2', baseContext);
 
-          apiResponse = await wsCountries.getById(
+          apiResponse = await CountryWS.getById(
             apiContext,
             authorization,
             countryNodeID,
@@ -565,7 +564,7 @@ describe('WS - Countries : CRUD', async () => {
         });
       });
 
-      describe(`Endpoint : ${Endpoints.COUNTRIES} - Method : PUT - Check On BO `, () => {
+      describe(`Endpoint : ${CountryWS.endpoint} - Method : PUT - Check On BO `, () => {
         it('should filter country by ID', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'filterToUpdateAfterPost2', baseContext);
 
@@ -696,11 +695,11 @@ describe('WS - Countries : CRUD', async () => {
       });
     });
 
-    describe(`Endpoint : ${Endpoints.COUNTRIES} - Method : DELETE `, () => {
-      it(`should request the endpoint ${Endpoints.COUNTRIES}{id} with method DELETE`, async function () {
+    describe(`Endpoint : ${CountryWS.endpoint} - Method : DELETE `, () => {
+      it(`should request the endpoint ${CountryWS.endpoint}/{id} with method DELETE`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'requestEndpointCountriesMethodDelete', baseContext);
 
-        const apiResponse = await wsCountries.delete(
+        const apiResponse = await CountryWS.delete(
           apiContext,
           authorization,
           countryNodeID,
@@ -709,10 +708,10 @@ describe('WS - Countries : CRUD', async () => {
         await expect(apiResponse.status()).to.eq(200);
       });
 
-      it(`should request the endpoint ${Endpoints.COUNTRIES}{id} with method GET`, async function () {
+      it(`should request the endpoint ${CountryWS.endpoint}/{id} with method GET`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'requestEndpointCountriesIdMethodGetAfterDelete', baseContext);
 
-        const apiResponse = await wsCountries.getById(
+        const apiResponse = await CountryWS.getById(
           apiContext,
           authorization,
           countryNodeID,
diff --git a/tests/UI/webservices/country/ws.ts b/tests/UI/webservices/baseWs.ts
similarity index 63%
rename from tests/UI/webservices/country/ws.ts
rename to tests/UI/webservices/baseWs.ts
index cb86ea7aa3457..8d03de6d79a94 100644
--- a/tests/UI/webservices/country/ws.ts
+++ b/tests/UI/webservices/baseWs.ts
@@ -1,92 +1,105 @@
-import Endpoints from '@webservices/country/endpoints.enum';
 import type {APIRequestContext, APIResponse} from 'playwright';
 
-export default {
+export default class BaseWS {
   /**
-   * Get All Countries
+   * Get all element
    * @param apiContext {APIRequestContext}
+   * @param url {string}
    * @param authorization {string}
    */
-  getAll(
+  protected static getAll(
     apiContext: APIRequestContext,
+    url: string,
     authorization: string,
   ): Promise<APIResponse> {
-    return apiContext.get(Endpoints.COUNTRIES, {
+    return apiContext.get(url, {
       headers: {
         Authorization: authorization,
       },
     });
-  },
+  };
+
   /**
-   * Get By id
+   * Get element by id
    * @param apiContext {APIRequestContext}
+   * @param url {string}
    * @param authorization {string}
-   * @param idCountry {string}
+   * @param id {string}
    */
-  getById(
+  protected static getById(
     apiContext: APIRequestContext,
+    url: string,
     authorization: string,
-    idCountry: string,
+    id: string,
   ): Promise<APIResponse> {
-    return apiContext.get(Endpoints.COUNTRIES + idCountry, {
+    return apiContext.get(`${url}/${id}`, {
       headers: {
         Authorization: authorization,
       },
     });
-  },
+  };
+
   /**
-   * Add new Country
+   * Add new element
    * @param apiContext {APIRequestContext}
+   * @param url {string}
    * @param authorization {string}
    * @param data {string} Xml of a new Country
    */
-  add(
+  protected static add(
     apiContext: APIRequestContext,
+    url: string,
     authorization: string,
     data: string,
   ): Promise<APIResponse> {
-    return apiContext.post(Endpoints.COUNTRIES, {
+    return apiContext.post(url, {
       headers: {
         Authorization: authorization,
       },
       data,
     });
-  },
+  };
+
   /**
-   * Update a country
+   * Update an element
    * @param apiContext {APIRequestContext}
+   * @param url {string}
    * @param authorization {string}
-   * @param idCountry {string}
+   * @param id {string}
    * @param data {string} Xml of the new Country
    */
-  update(
+  protected static update(
     apiContext: APIRequestContext,
+    url: string,
     authorization: string,
-    idCountry: string,
+    id: string,
     data: string,
   ): Promise<APIResponse> {
-    return apiContext.put(Endpoints.COUNTRIES + idCountry, {
+    return apiContext.put(`${url}/${id}`, {
       headers: {
         Authorization: authorization,
       },
       data,
     });
-  },
+  };
+
   /**
-   * Delete a country
+   * Delete an element
    * @param apiContext {APIRequestContext}
+   * @param url {string}
    * @param authorization {string}
-   * @param idCountry {string}
+   * @param id {string}
    */
-  delete(
+  protected static delete(
     apiContext: APIRequestContext,
+    url: string,
     authorization: string,
-    idCountry: string,
+    id: string,
   ): Promise<APIResponse> {
-    return apiContext.delete(Endpoints.COUNTRIES + idCountry, {
+    return apiContext.delete(`${url}/${id}`, {
       headers: {
         Authorization: authorization,
       },
     });
-  },
-};
+  };
+}
diff --git a/tests/UI/webservices/country/endpoints.enum.ts b/tests/UI/webservices/country/endpoints.enum.ts
deleted file mode 100644
index 5da9b3240e9da..0000000000000
--- a/tests/UI/webservices/country/endpoints.enum.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-const enum Endpoints {
-  COUNTRIES = 'api/countries/',
-}
-
-export default Endpoints;
diff --git a/tests/UI/webservices/country/index.ts b/tests/UI/webservices/country/index.ts
new file mode 100644
index 0000000000000..366e109e2c226
--- /dev/null
+++ b/tests/UI/webservices/country/index.ts
@@ -0,0 +1,76 @@
+import BaseWS from '@webservices/baseWs';
+import {APIRequestContext, APIResponse} from 'playwright';
+
+export default class CountryWS extends BaseWS {
+  public static endpoint = 'api/countries';
+
+  /**
+   * Get All Countries
+   * @param apiContext {APIRequestContext}
+   * @param authorization {string}
+   */
+  public static getAll(
+    apiContext: APIRequestContext,
+    authorization: string,
+  ): Promise<APIResponse> {
+    return super.getAll(apiContext, this.endpoint, authorization);
+  }
+
+  /**
+   * Get By id
+   * @param apiContext {APIRequestContext}
+   * @param authorization {string}
+   * @param idCountry {string}
+   */
+  public static getById(
+    apiContext: APIRequestContext,
+    authorization: string,
+    idCountry: string,
+  ): Promise<APIResponse> {
+    return super.getById(apiContext, this.endpoint, authorization, idCountry);
+  }
+
+  /**
+   * Add new Country
+   * @param apiContext {APIRequestContext}
+   * @param authorization {string}
+   * @param data {string} Xml of a new Country
+   */
+  public static add(
+    apiContext: APIRequestContext,
+    authorization: string,
+    data: string,
+  ): Promise<APIResponse> {
+    return super.add(apiContext, this.endpoint, authorization, data);
+  }
+
+  /**
+   * Update a country
+   * @param apiContext {APIRequestContext}
+   * @param authorization {string}
+   * @param idCountry {string}
+   * @param data {string} Xml of the new Country
+   */
+  public static update(
+    apiContext: APIRequestContext,
+    authorization: string,
+    idCountry: string,
+    data: string,
+  ): Promise<APIResponse> {
+    return super.update(apiContext, this.endpoint, authorization, idCountry, data);
+  }
+
+  /**
+   * Delete a country
+   * @param apiContext {APIRequestContext}
+   * @param authorization {string}
+   * @param idCountry {string}
+   */
+  public static delete(
+    apiContext: APIRequestContext,
+    authorization: string,
+    idCountry: string,
+  ): Promise<APIResponse> {
+    return super.delete(apiContext, this.endpoint, authorization, idCountry);
+  }
+}

From bd6a14c9977a085fb800de061a4ec4f20147167c Mon Sep 17 00:00:00 2001
From: matks <mathieu.ferment@prestashop.com>
Date: Fri, 9 Jun 2023 17:06:57 +0200
Subject: [PATCH 0081/1030] Upgrade cssjanus to 2.1.1

---
 composer.lock | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/composer.lock b/composer.lock
index 9e7706ef409d7..6116203628dfb 100644
--- a/composer.lock
+++ b/composer.lock
@@ -510,25 +510,25 @@
         },
         {
             "name": "cssjanus/cssjanus",
-            "version": "v2.1.0",
+            "version": "v2.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/cssjanus/php-cssjanus.git",
-                "reference": "de7483c0805750a6462b372eab55d022d555df02"
+                "url": "https://github.com/wikimedia/php-cssjanus.git",
+                "reference": "befd1eb7b1e70ee2cd71cd5b9a86ff250d2e8423"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cssjanus/php-cssjanus/zipball/de7483c0805750a6462b372eab55d022d555df02",
-                "reference": "de7483c0805750a6462b372eab55d022d555df02",
+                "url": "https://api.github.com/repos/wikimedia/php-cssjanus/zipball/befd1eb7b1e70ee2cd71cd5b9a86ff250d2e8423",
+                "reference": "befd1eb7b1e70ee2cd71cd5b9a86ff250d2e8423",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.0"
+                "php": ">=7.4.0"
             },
             "require-dev": {
-                "mediawiki/mediawiki-phan-config": "0.10.6",
+                "mediawiki/mediawiki-phan-config": "0.12.0",
                 "php-parallel-lint/php-parallel-lint": "^1.3.0",
-                "phpunit/phpunit": "^8.5.15",
+                "phpunit/phpunit": "^9.5",
                 "squizlabs/php_codesniffer": "^3.6.0"
             },
             "type": "library",
@@ -553,11 +553,11 @@
                 }
             ],
             "description": "Convert CSS stylesheets between left-to-right and right-to-left.",
+            "homepage": "https://www.mediawiki.org/wiki/CSSJanus",
             "support": {
-                "issues": "https://github.com/cssjanus/php-cssjanus/issues",
-                "source": "https://github.com/cssjanus/php-cssjanus/tree/v2.1.0"
+                "source": "https://github.com/wikimedia/php-cssjanus/tree/v2.1.1"
             },
-            "time": "2021-09-09T17:58:26+00:00"
+            "time": "2023-01-08T17:45:35+00:00"
         },
         {
             "name": "curl/curl",

From 98ccbf44eed409017c0e3df8b3a5d89e85975025 Mon Sep 17 00:00:00 2001
From: boubkerbribri <boubker.bribri@prestashop.com>
Date: Mon, 12 Jun 2023 11:58:41 +0200
Subject: [PATCH 0082/1030] Refacto xml helper

---
 .../functional/WS/01_countriesCRUD.ts         | 142 +++++++++---------
 tests/UI/webservices/baseXml.ts               |  25 +++
 .../country/{index.ts => countryWs.ts}        |   0
 tests/UI/webservices/country/countryXml.ts    |  65 ++++++++
 4 files changed, 165 insertions(+), 67 deletions(-)
 create mode 100644 tests/UI/webservices/baseXml.ts
 rename tests/UI/webservices/country/{index.ts => countryWs.ts} (100%)
 create mode 100644 tests/UI/webservices/country/countryXml.ts

diff --git a/tests/UI/campaigns/functional/WS/01_countriesCRUD.ts b/tests/UI/campaigns/functional/WS/01_countriesCRUD.ts
index 456c3b019a652..050f71ff28d12 100644
--- a/tests/UI/campaigns/functional/WS/01_countriesCRUD.ts
+++ b/tests/UI/campaigns/functional/WS/01_countriesCRUD.ts
@@ -1,10 +1,10 @@
 // Import utils
 import helper from '@utils/helpers';
 import testContext from '@utils/testContext';
-import xmlHelper from '@utils/xml';
+import countryXml from '@webservices/country/countryXml';
 
 // Import webservices
-import CountryWS from '@webservices/country';
+import CountryWS from '@webservices/country/countryWs';
 
 // Import commonTests
 import {addWebserviceKey, removeWebserviceKey, setWebserviceStatus} from '@commonTests/BO/advancedParameters/ws';
@@ -124,13 +124,13 @@ describe('WS - Countries : CRUD', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'requestGetRootNode1', baseContext);
 
         xmlResponse = await apiResponse.text();
-        expect(xmlHelper.getRootNodeName(xmlResponse)).to.be.eq('prestashop');
+        expect(countryXml.getRootNodeName(xmlResponse)).to.be.eq('prestashop');
       });
 
       it('should check number of node under prestashop', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'requestGetNodeNumber1', baseContext);
 
-        const rootNodes = xmlHelper.getNodes(xmlResponse, '/prestashop/*');
+        const rootNodes = countryXml.getPrestaShopNodes(xmlResponse);
         expect(rootNodes.length).to.be.eq(1);
         expect(rootNodes[0].nodeName).to.be.eq('countries');
       });
@@ -138,7 +138,7 @@ describe('WS - Countries : CRUD', async () => {
       it('should check number of nodes under countries node', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'requestGetNumberOfNodes1', baseContext);
 
-        countriesNode = xmlHelper.getNodes(xmlResponse, '/prestashop/countries/*');
+        countriesNode = countryXml.getAllCountries(xmlResponse);
         expect(countriesNode.length).to.be.gt(0);
       });
 
@@ -186,13 +186,13 @@ describe('WS - Countries : CRUD', async () => {
           await testContext.addContextItem(this, 'testIdentifier', 'requestPostRootNode1', baseContext);
 
           xmlResponse = await apiResponse.text();
-          expect(xmlHelper.getRootNodeName(xmlResponse)).to.be.eq('prestashop');
+          expect(countryXml.getRootNodeName(xmlResponse)).to.be.eq('prestashop');
         });
 
         it('should check number of node under prestashop', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'requestPostNodeNumber1', baseContext);
 
-          const rootNodes = xmlHelper.getNodes(xmlResponse, '/prestashop/*');
+          const rootNodes = countryXml.getPrestaShopNodes(xmlResponse);
           expect(rootNodes.length).to.be.eq(1);
           expect(rootNodes[0].nodeName).to.be.eq('country');
         });
@@ -201,7 +201,7 @@ describe('WS - Countries : CRUD', async () => {
           await testContext.addContextItem(this, 'testIdentifier', 'requestPostCheckId1', baseContext);
 
           // Attribute : id
-          countryNodeID = xmlHelper.getNodeValue(xmlResponse, '/prestashop/country/id');
+          countryNodeID = countryXml.getAttributeValue(xmlResponse, 'id');
           expect(countryNodeID).to.be.eq(parseInt(countryNodeID, 10).toString());
         });
       });
@@ -227,13 +227,13 @@ describe('WS - Countries : CRUD', async () => {
           await testContext.addContextItem(this, 'testIdentifier', 'requestGetIDRootNode1', baseContext);
 
           xmlResponse = await apiResponse.text();
-          expect(xmlHelper.getRootNodeName(xmlResponse)).to.be.eq('prestashop');
+          expect(countryXml.getRootNodeName(xmlResponse)).to.be.eq('prestashop');
         });
 
         it('should check number of node under prestashop', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'requestGetIDNodeNumber1', baseContext);
 
-          const rootNodes = xmlHelper.getNodes(xmlResponse, '/prestashop/*');
+          const rootNodes = countryXml.getPrestaShopNodes(xmlResponse);
           expect(rootNodes.length).to.be.eq(1);
           expect(rootNodes[0].nodeName).to.be.eq('country');
         });
@@ -241,7 +241,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check number of nodes under countries node', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'requestGetIDNumberOfNodes1', baseContext);
 
-          countriesNodes = xmlHelper.getNodes(xmlResponse, '/prestashop/country/*');
+          countriesNodes = countryXml.getCountryNodes(xmlResponse);
           expect(countriesNodes.length).to.be.gt(0);
         });
 
@@ -255,30 +255,34 @@ describe('WS - Countries : CRUD', async () => {
             if (oNode.nodeName === 'id') {
               expect(oNode.textContent).to.be.eq(countryNodeID);
             } else if (oNode.nodeName === 'name') {
-              const objectNodeValueEN = xmlHelper.getNodeValue(
-                xmlCreate,
-                `/prestashop/country/${oNode.nodeName}/language[@id="1"]`,
+              const objectNodeValueEN = countryXml.getAttributeLangValue(
+                xmlResponse,
+                oNode.nodeName,
+                '1',
               );
 
-              const createNodeValueEN = xmlHelper.getNodeValue(
+              const createNodeValueEN = countryXml.getAttributeLangValue(
                 xmlCreate,
-                `/prestashop/country/${oNode.nodeName}/language[@id="1"]`,
+                oNode.nodeName,
+                '1',
               );
               expect(objectNodeValueEN).to.be.eq(createNodeValueEN);
 
-              const objectNodeValueFR = xmlHelper.getNodeValue(
-                xmlCreate,
-                `/prestashop/country/${oNode.nodeName}/language[@id="2"]`,
+              const objectNodeValueFR = countryXml.getAttributeLangValue(
+                xmlResponse,
+                oNode.nodeName,
+                '2',
               );
-              const createNodeValueFR = xmlHelper.getNodeValue(
+              const createNodeValueFR = countryXml.getAttributeLangValue(
                 xmlCreate,
-                `/prestashop/country/${oNode.nodeName}/language[@id="2"]`,
+                oNode.nodeName,
+                '2',
               );
               expect(objectNodeValueFR).to.be.eq(createNodeValueFR);
             } else {
-              const objectNodeValue: string = xmlHelper.getNodeValue(
+              const objectNodeValue: string = countryXml.getAttributeValue(
                 xmlCreate,
-                `/prestashop/country/${oNode.nodeName}`,
+                oNode.nodeName,
               );
               expect(oNode.textContent).to.be.eq(objectNodeValue);
             }
@@ -337,7 +341,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s zone', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryZone1', baseContext);
 
-          const xmlValueIDZone = xmlHelper.getNodeValue(xmlCreate, '/prestashop/country/id_zone');
+          const xmlValueIDZone = countryXml.getAttributeValue(xmlCreate, 'id_zone');
           const valueIDZone = await addCountryPage.getSelectValue(page, 'id_zone');
           expect(valueIDZone).to.be.eq(xmlValueIDZone);
         });
@@ -345,7 +349,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s currency', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryCurrency1', baseContext);
 
-          const xmlValueIDCurrency = xmlHelper.getNodeValue(xmlCreate, '/prestashop/country/id_currency');
+          const xmlValueIDCurrency = countryXml.getAttributeValue(xmlCreate, 'id_currency');
           const valueIDCurrency = await addCountryPage.getSelectValue(page, 'id_currency');
           expect(valueIDCurrency).to.be.eq(xmlValueIDCurrency);
         });
@@ -353,7 +357,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s call_prefix', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryCallPrefix1', baseContext);
 
-          const xmlValueCallPrefix = xmlHelper.getNodeValue(xmlCreate, '/prestashop/country/call_prefix');
+          const xmlValueCallPrefix = countryXml.getAttributeValue(xmlCreate, 'call_prefix');
           const valueCallPrefix = await addCountryPage.getInputValue(page, 'call_prefix');
           expect(valueCallPrefix).to.be.eq(xmlValueCallPrefix);
         });
@@ -361,7 +365,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s iso_code', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryIsoCode1', baseContext);
 
-          const xmlValueIsoCode = xmlHelper.getNodeValue(xmlCreate, '/prestashop/country/iso_code');
+          const xmlValueIsoCode = countryXml.getAttributeValue(xmlCreate, 'iso_code');
           const valueIsoCode = await addCountryPage.getInputValue(page, 'iso_code');
           expect(valueIsoCode).to.be.eq(xmlValueIsoCode);
         });
@@ -369,7 +373,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s active', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryActive1', baseContext);
 
-          const xmlValueActive = xmlHelper.getNodeValue(xmlCreate, '/prestashop/country/active');
+          const xmlValueActive = countryXml.getAttributeValue(xmlCreate, 'active');
           const valueActive = (await addCountryPage.isCheckboxChecked(page, 'active')) ? '1' : '0';
           expect(valueActive).to.be.eq(xmlValueActive);
         });
@@ -377,7 +381,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s states', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryStates1', baseContext);
 
-          const xmlValueContainsStates = xmlHelper.getNodeValue(xmlCreate, '/prestashop/country/contains_states');
+          const xmlValueContainsStates = countryXml.getAttributeValue(xmlCreate, 'contains_states');
           const valueContainsStates = (await addCountryPage.isCheckboxChecked(page, 'contains_states')) ? '1' : '0';
           expect(valueContainsStates).to.be.eq(xmlValueContainsStates);
         });
@@ -385,7 +389,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s need_identification_number', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryIdentificationNumber1', baseContext);
 
-          const xmlValueNeedIDNumber = xmlHelper.getNodeValue(xmlCreate, '/prestashop/country/need_identification_number');
+          const xmlValueNeedIDNumber = countryXml.getAttributeValue(xmlCreate, 'need_identification_number');
           const valueNeedIDNumber = (await addCountryPage.isCheckboxChecked(page, 'need_identification_number')) ? '1' : '0';
           expect(valueNeedIDNumber).to.be.eq(xmlValueNeedIDNumber);
         });
@@ -393,7 +397,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s need_zip_code', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryZipCodeNumber1', baseContext);
 
-          const xmlValueNeedZipCode = xmlHelper.getNodeValue(xmlCreate, '/prestashop/country/need_zip_code');
+          const xmlValueNeedZipCode = countryXml.getAttributeValue(xmlCreate, 'need_zip_code');
           const valueNeedZipCode = (await addCountryPage.isCheckboxChecked(page, 'need_zip_code')) ? '1' : '0';
           expect(valueNeedZipCode).to.be.eq(xmlValueNeedZipCode);
         });
@@ -401,7 +405,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s zip_code_format', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryZipCodeFormat1', baseContext);
 
-          const xmlValueZipCode = xmlHelper.getNodeValue(xmlCreate, '/prestashop/country/zip_code_format');
+          const xmlValueZipCode = countryXml.getAttributeValue(xmlCreate, 'zip_code_format');
           const valueZipCode = await addCountryPage.getInputValue(page, 'zipCodeFormat');
           expect(valueZipCode).to.be.eq(xmlValueZipCode);
         });
@@ -409,7 +413,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s name language 1', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryNameLang11', baseContext);
 
-          const xmlValueNameEn = xmlHelper.getNodeValue(xmlCreate, '/prestashop/country/name/language[@id="1"]');
+          const xmlValueNameEn = countryXml.getAttributeLangValue(xmlCreate, 'name', '1');
           const valueNameEn = (await addCountryPage.getInputValue(page, 'nameEn'));
           expect(valueNameEn).to.be.eq(xmlValueNameEn);
         });
@@ -417,7 +421,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s name language 2', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryNameLang21', baseContext);
 
-          const xmlValueNameFr = xmlHelper.getNodeValue(xmlCreate, '/prestashop/country/name/language[@id="2"]');
+          const xmlValueNameFr = countryXml.getAttributeLangValue(xmlCreate, 'name', '2');
           const valueNameFr = (await addCountryPage.getInputValue(page, 'nameFr'));
           expect(valueNameFr).to.be.eq(xmlValueNameFr);
         });
@@ -463,13 +467,13 @@ describe('WS - Countries : CRUD', async () => {
           await testContext.addContextItem(this, 'testIdentifier', 'requestPutRootNode1', baseContext);
 
           xmlResponse = await apiResponse.text();
-          expect(xmlHelper.getRootNodeName(xmlResponse)).to.be.eq('prestashop');
+          expect(countryXml.getRootNodeName(xmlResponse)).to.be.eq('prestashop');
         });
 
         it('should check number of node under prestashop', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'requestPutNodeNumber1', baseContext);
 
-          const rootNodes = xmlHelper.getNodes(xmlResponse, '/prestashop/*');
+          const rootNodes = countryXml.getPrestaShopNodes(xmlResponse);
           expect(rootNodes.length).to.be.eq(1);
           expect(rootNodes[0].nodeName).to.be.eq('country');
         });
@@ -478,7 +482,7 @@ describe('WS - Countries : CRUD', async () => {
           await testContext.addContextItem(this, 'testIdentifier', 'requestPutCheckId1', baseContext);
 
           // Attribute : id
-          countryNodeID = xmlHelper.getNodeValue(xmlResponse, '/prestashop/country/id');
+          countryNodeID = countryXml.getAttributeValue(xmlResponse, 'id');
           expect(countryNodeID).to.be.eq(parseInt(countryNodeID, 10).toString());
         });
       });
@@ -504,13 +508,13 @@ describe('WS - Countries : CRUD', async () => {
           await testContext.addContextItem(this, 'testIdentifier', 'requestGetPutRootNode2', baseContext);
 
           xmlResponse = await apiResponse.text();
-          expect(xmlHelper.getRootNodeName(xmlResponse)).to.be.eq('prestashop');
+          expect(countryXml.getRootNodeName(xmlResponse)).to.be.eq('prestashop');
         });
 
         it('should check number of node under prestashop', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'requestGetPutNodeNumber1', baseContext);
 
-          const rootNodes = xmlHelper.getNodes(xmlResponse, '/prestashop/*');
+          const rootNodes = countryXml.getPrestaShopNodes(xmlResponse);
           expect(rootNodes.length).to.be.eq(1);
           expect(rootNodes[0].nodeName).to.be.eq('country');
         });
@@ -518,7 +522,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check number of nodes under countries node', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'requestGetPutNumberOfNodes1', baseContext);
 
-          countriesNodes = xmlHelper.getNodes(xmlResponse, '/prestashop/country/*');
+          countriesNodes = countryXml.getCountryNodes(xmlResponse);
           expect(countriesNodes.length).to.be.gt(0);
         });
 
@@ -532,31 +536,35 @@ describe('WS - Countries : CRUD', async () => {
             if (oNode.nodeName === 'id') {
               expect(oNode.textContent).to.be.eq(countryNodeID);
             } else if (oNode.nodeName === 'name') {
-              const objectNodeValueEN = xmlHelper.getNodeValue(
-                xmlUpdate,
-                `/prestashop/country/${oNode.nodeName}/language[@id="1"]`,
-              );
-
-              const createNodeValueEN = xmlHelper.getNodeValue(
+              const objectNodeValueEN = countryXml.getAttributeLangValue(
                 xmlResponse,
-                `/prestashop/country/${oNode.nodeName}/language[@id="1"]`,
+                oNode.nodeName,
+                '1',
               );
 
-              expect(objectNodeValueEN).to.be.eq(createNodeValueEN);
-
-              const objectNodeValueFR = xmlHelper.getNodeValue(
+              const updateNodeValueEN = countryXml.getAttributeLangValue(
                 xmlUpdate,
-                `/prestashop/country/${oNode.nodeName}/language[@id="2"]`,
+                oNode.nodeName,
+                '1',
               );
-              const createNodeValueFR = xmlHelper.getNodeValue(
+
+              expect(objectNodeValueEN).to.be.eq(updateNodeValueEN);
+
+              const objectNodeValueFR = countryXml.getAttributeLangValue(
                 xmlResponse,
-                `/prestashop/country/${oNode.nodeName}/language[@id="2"]`,
+                oNode.nodeName,
+                '2',
               );
-              expect(objectNodeValueFR).to.be.eq(createNodeValueFR);
+              const updateNodeValueFR = countryXml.getAttributeLangValue(
+                xmlUpdate,
+                oNode.nodeName,
+                '2',
+              );
+              expect(objectNodeValueFR).to.be.eq(updateNodeValueFR);
             } else {
-              const objectNodeValue = xmlHelper.getNodeValue(
+              const objectNodeValue = countryXml.getAttributeValue(
                 xmlUpdate,
-                `/prestashop/country/${oNode.nodeName}`,
+                oNode.nodeName,
               );
               expect(oNode.textContent).to.be.eq(objectNodeValue);
             }
@@ -592,7 +600,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s zone', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryZone2', baseContext);
 
-          const xmlValueIDZone = xmlHelper.getNodeValue(xmlUpdate, '/prestashop/country/id_zone');
+          const xmlValueIDZone = countryXml.getAttributeValue(xmlUpdate, 'id_zone');
           const valueIDZone = await addCountryPage.getSelectValue(page, 'id_zone');
           expect(valueIDZone).to.be.eq(xmlValueIDZone);
         });
@@ -600,7 +608,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s currency', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryCurrency2', baseContext);
 
-          const xmlValueIDCurrency = xmlHelper.getNodeValue(xmlUpdate, '/prestashop/country/id_currency');
+          const xmlValueIDCurrency = countryXml.getAttributeValue(xmlUpdate, 'id_currency');
           const valueIDCurrency = await addCountryPage.getSelectValue(page, 'id_currency');
           expect(valueIDCurrency).to.be.eq(xmlValueIDCurrency);
         });
@@ -608,7 +616,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s call_prefix', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryCallPrefix2', baseContext);
 
-          const xmlValueCallPrefix = xmlHelper.getNodeValue(xmlUpdate, '/prestashop/country/call_prefix');
+          const xmlValueCallPrefix = countryXml.getAttributeValue(xmlUpdate, 'call_prefix');
           const valueCallPrefix = await addCountryPage.getInputValue(page, 'call_prefix');
           expect(valueCallPrefix).to.be.eq(xmlValueCallPrefix);
         });
@@ -616,7 +624,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s iso_code', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryIsoCode2', baseContext);
 
-          const xmlValueIsoCode = xmlHelper.getNodeValue(xmlUpdate, '/prestashop/country/iso_code');
+          const xmlValueIsoCode = countryXml.getAttributeValue(xmlUpdate, 'iso_code');
           const valueIsoCode = await addCountryPage.getInputValue(page, 'iso_code');
           expect(valueIsoCode).to.be.eq(xmlValueIsoCode);
         });
@@ -624,7 +632,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s active', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryActive2', baseContext);
 
-          const xmlValueActive = xmlHelper.getNodeValue(xmlUpdate, '/prestashop/country/active');
+          const xmlValueActive = countryXml.getAttributeValue(xmlUpdate, 'active');
           const valueActive = (await addCountryPage.isCheckboxChecked(page, 'active')) ? '1' : '0';
           expect(valueActive).to.be.eq(xmlValueActive);
         });
@@ -632,7 +640,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s states', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryStates2', baseContext);
 
-          const xmlValueContainsStates = xmlHelper.getNodeValue(xmlUpdate, '/prestashop/country/contains_states');
+          const xmlValueContainsStates = countryXml.getAttributeValue(xmlUpdate, 'contains_states');
           const valueContainsStates = (await addCountryPage.isCheckboxChecked(page, 'contains_states')) ? '1' : '0';
           expect(valueContainsStates).to.be.eq(xmlValueContainsStates);
         });
@@ -640,7 +648,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s need_identification_number', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryIdentificationNumber2', baseContext);
 
-          const xmlValueNeedIDNumber = xmlHelper.getNodeValue(xmlUpdate, '/prestashop/country/need_identification_number');
+          const xmlValueNeedIDNumber = countryXml.getAttributeValue(xmlUpdate, 'need_identification_number');
           const valueNeedIDNumber = (await addCountryPage.isCheckboxChecked(page, 'need_identification_number')) ? '1' : '0';
           expect(valueNeedIDNumber).to.be.eq(xmlValueNeedIDNumber);
         });
@@ -648,7 +656,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s need_zip_code', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryZipCodeNumber2', baseContext);
 
-          const xmlValueNeedZipCode = xmlHelper.getNodeValue(xmlUpdate, '/prestashop/country/need_zip_code');
+          const xmlValueNeedZipCode = countryXml.getAttributeValue(xmlUpdate, 'need_zip_code');
           const valueNeedZipCode = (await addCountryPage.isCheckboxChecked(page, 'need_zip_code')) ? '1' : '0';
           expect(valueNeedZipCode).to.be.eq(xmlValueNeedZipCode);
         });
@@ -656,7 +664,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s zip_code_format', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryZipCodeFormat2', baseContext);
 
-          const xmlValueZipCode = xmlHelper.getNodeValue(xmlUpdate, '/prestashop/country/zip_code_format');
+          const xmlValueZipCode = countryXml.getAttributeValue(xmlUpdate, 'zip_code_format');
           const valueZipCode = await addCountryPage.getInputValue(page, 'zipCodeFormat');
           expect(valueZipCode).to.be.eq(xmlValueZipCode);
         });
@@ -664,7 +672,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s name language 1', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryNameLang12', baseContext);
 
-          const xmlValueNameEn = xmlHelper.getNodeValue(xmlUpdate, '/prestashop/country/name/language[@id="1"]');
+          const xmlValueNameEn = countryXml.getAttributeLangValue(xmlUpdate, 'name', '1');
           const valueNameEn = (await addCountryPage.getInputValue(page, 'nameEn'));
           expect(valueNameEn).to.be.eq(xmlValueNameEn);
         });
@@ -672,7 +680,7 @@ describe('WS - Countries : CRUD', async () => {
         it('should check country\'s name language 2', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCountryNameLang22', baseContext);
 
-          const xmlValueNameFr = xmlHelper.getNodeValue(xmlUpdate, '/prestashop/country/name/language[@id="2"]');
+          const xmlValueNameFr = countryXml.getAttributeLangValue(xmlUpdate, 'name', '2');
           const valueNameFr = (await addCountryPage.getInputValue(page, 'nameFr'));
           expect(valueNameFr).to.be.eq(xmlValueNameFr);
         });
diff --git a/tests/UI/webservices/baseXml.ts b/tests/UI/webservices/baseXml.ts
new file mode 100644
index 0000000000000..1153123b546cb
--- /dev/null
+++ b/tests/UI/webservices/baseXml.ts
@@ -0,0 +1,25 @@
+import xmlHelper from '@utils/xml';
+
+export default class BaseXml {
+  protected static prestashopPath = '/prestashop/*';
+
+  /**
+   * Get root node name
+   * @param xml
+   */
+  public static getRootNodeName(
+    xml: string,
+  ): string {
+    return xmlHelper.getRootNodeName(xml);
+  }
+
+  /**
+   * Get PrestaShop root nodes
+   * @param xml
+   */
+  public static getPrestaShopNodes(
+    xml: string,
+  ): Element[] {
+    return xmlHelper.getNodes(xml, this.prestashopPath);
+  }
+}
diff --git a/tests/UI/webservices/country/index.ts b/tests/UI/webservices/country/countryWs.ts
similarity index 100%
rename from tests/UI/webservices/country/index.ts
rename to tests/UI/webservices/country/countryWs.ts
diff --git a/tests/UI/webservices/country/countryXml.ts b/tests/UI/webservices/country/countryXml.ts
new file mode 100644
index 0000000000000..560da76bbf91a
--- /dev/null
+++ b/tests/UI/webservices/country/countryXml.ts
@@ -0,0 +1,65 @@
+import BaseXml from '@webservices/baseXml';
+import xmlHelper from '@utils/xml';
+
+export default class CountryXml extends BaseXml {
+  private static countriesBasicPath = '/prestashop/countries';
+
+  private static countriesPath = `${this.countriesBasicPath}/*`;
+
+  private static countryBasicPath = '/prestashop/country';
+
+  private static countryPath = `${this.countryBasicPath}/*`;
+
+  private static attributePath = (attribute: string) => `${this.countryBasicPath}/${attribute}`;
+
+  private static attributeLangPath = (
+    attribute: string,
+    lang: string,
+  ) => `${this.attributePath(attribute)}/language[@id="${lang}"]`;
+
+  /**
+   * Get all countries nodes
+   * @param xml
+   */
+  public static getAllCountries(
+    xml: string,
+  ): Element[] {
+    return xmlHelper.getNodes(xml, this.countriesPath);
+  }
+
+  /**
+   * Get country nodes
+   * @param xml
+   */
+  public static getCountryNodes(
+    xml: string,
+  ): Element[] {
+    return xmlHelper.getNodes(xml, this.countryPath);
+  }
+
+  /**
+   * Get attribute value
+   * @param xml
+   * @param attribute
+   */
+  public static getAttributeValue(
+    xml: string,
+    attribute: string,
+  ): string {
+    return xmlHelper.getNodeValue(xml, this.attributePath(attribute));
+  }
+
+  /**
+   * Get attribute with language value
+   * @param xml
+   * @param attribute
+   * @param lang
+   */
+  public static getAttributeLangValue(
+    xml: string,
+    attribute: string,
+    lang: string,
+  ): string {
+    return xmlHelper.getNodeValue(xml, this.attributeLangPath(attribute, lang));
+  }
+}

From 3753c0816d44fbedaa8ab7e29a379014a0b17f1d Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Tue, 23 May 2023 15:55:17 +0300
Subject: [PATCH 0083/1030] implement update alias command

---
 .../Alias/Command/UpdateAliasCommand.php      | 122 ++++++++++++++++++
 1 file changed, 122 insertions(+)
 create mode 100644 src/Core/Domain/Alias/Command/UpdateAliasCommand.php

diff --git a/src/Core/Domain/Alias/Command/UpdateAliasCommand.php b/src/Core/Domain/Alias/Command/UpdateAliasCommand.php
new file mode 100644
index 0000000000000..6f21a7a9731a7
--- /dev/null
+++ b/src/Core/Domain/Alias/Command/UpdateAliasCommand.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\Alias\Command;
+
+use PrestaShop\PrestaShop\Core\Domain\Alias\ValueObject\AliasId;
+
+/**
+ * Edits alias with given data
+ */
+class UpdateAliasCommand
+{
+    public readonly AliasId $aliasId;
+
+    /**
+     * @var string[]
+     */
+    private $aliases;
+
+    /**
+     * @var string
+     */
+    private $searchTerm;
+
+    /**
+     * @var bool
+     */
+    private $active;
+
+    /**
+     * @param int $aliasId
+     */
+    public function __construct(int $aliasId)
+    {
+        $this->aliasId = new AliasId($aliasId);
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getAliases(): array
+    {
+        return $this->aliases;
+    }
+
+    /**
+     * @param string[] $aliases
+     *
+     * @return UpdateAliasCommand
+     */
+    public function setAliases(array $aliases): UpdateAliasCommand
+    {
+        $this->aliases = $aliases;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getSearchTerm(): string
+    {
+        return $this->searchTerm;
+    }
+
+    /**
+     * @param string $searchTerm
+     *
+     * @return UpdateAliasCommand
+     */
+    public function setSearchTerm(string $searchTerm): UpdateAliasCommand
+    {
+        $this->searchTerm = $searchTerm;
+
+        return $this;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isActive(): bool
+    {
+        return $this->active;
+    }
+
+    /**
+     * @param bool $active
+     *
+     * @return UpdateAliasCommand
+     */
+    public function setActive(bool $active): UpdateAliasCommand
+    {
+        $this->active = $active;
+
+        return $this;
+    }
+}

From 843c820fce52ca3665cb4be1059fbb534e2b421e Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Tue, 23 May 2023 16:07:57 +0300
Subject: [PATCH 0084/1030] implement update alias handler interface

---
 .../UpdateAliasHandlerInterface.php           | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 src/Core/Domain/Alias/CommandHandler/UpdateAliasHandlerInterface.php

diff --git a/src/Core/Domain/Alias/CommandHandler/UpdateAliasHandlerInterface.php b/src/Core/Domain/Alias/CommandHandler/UpdateAliasHandlerInterface.php
new file mode 100644
index 0000000000000..0dc3224ee0e27
--- /dev/null
+++ b/src/Core/Domain/Alias/CommandHandler/UpdateAliasHandlerInterface.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Domain\Alias\CommandHandler;
+
+use PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasCommand;
+
+/**
+ * Interface for services that handle command which updates alias
+ */
+interface UpdateAliasHandlerInterface
+{
+    /**
+     * @param UpdateAliasCommand $command
+     */
+    public function handle(UpdateAliasCommand $command): void;
+}

From 5e5b7a6ad89154a89d0c8adf0fee0f4b8c4666e8 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Tue, 23 May 2023 16:48:54 +0300
Subject: [PATCH 0085/1030] implement alias handler

---
 .../CommandHandler/UpdateAliasHandler.php     | 57 +++++++++++++++++++
 .../UpdateAliasHandlerInterface.php           |  2 +-
 .../config/services/adapter/alias.yml         |  5 ++
 3 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php

diff --git a/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php b/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php
new file mode 100644
index 0000000000000..360bc1ce9d668
--- /dev/null
+++ b/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Adapter\Alias\CommandHandler;
+
+use PrestaShop\PrestaShop\Adapter\Alias\Repository\AliasRepository;
+use PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasCommand;
+use PrestaShop\PrestaShop\Core\Domain\Alias\CommandHandler\UpdateAliasHandlerInterface;
+
+class UpdateAliasHandler implements UpdateAliasHandlerInterface
+{
+    public function __construct(
+        protected AliasRepository $aliasRepository
+    ) {
+    }
+
+    /**
+     * @param UpdateAliasCommand $command
+     */
+    public function handle(UpdateAliasCommand $command): void
+    {
+        $alias = $this->aliasRepository->get($command->aliasId);
+        $wasActive = (bool) $alias->active;
+
+        // @TODO implement updatable property filler
+
+        if (null !== $command->isActive()) {
+            $alias->active = $command->isActive();
+            $updatableProperties[] = 'active';
+        }
+    }
+}
diff --git a/src/Core/Domain/Alias/CommandHandler/UpdateAliasHandlerInterface.php b/src/Core/Domain/Alias/CommandHandler/UpdateAliasHandlerInterface.php
index 0dc3224ee0e27..13d987fcc5f67 100644
--- a/src/Core/Domain/Alias/CommandHandler/UpdateAliasHandlerInterface.php
+++ b/src/Core/Domain/Alias/CommandHandler/UpdateAliasHandlerInterface.php
@@ -29,7 +29,7 @@
 use PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasCommand;
 
 /**
- * Interface for services that handle command which updates alias
+ * Defines contract to handle @see UpdateAliasCommand
  */
 interface UpdateAliasHandlerInterface
 {
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml b/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
index cbe94e78f1f81..91bb78e590185 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
@@ -29,3 +29,8 @@ services:
     tags:
       - name: tactician.handler
         command: PrestaShop\PrestaShop\Core\Domain\Alias\Command\BulkUpdateAliasStatusCommand
+
+  PrestaShop\PrestaShop\Adapter\Alias\CommandHandler\UpdateAliasHandler:
+    tags:
+      - name: tactician.handler
+        command: PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasCommand

From 5e94388c5a2f24977f374dbffa405a702b2006b0 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Tue, 23 May 2023 17:13:04 +0300
Subject: [PATCH 0086/1030] finalise update alias handler implementation

---
 .../CommandHandler/UpdateAliasHandler.php     | 15 +++-
 src/Adapter/Alias/Filler/AliasFiller.php      | 69 +++++++++++++++++++
 .../Alias/Filler/AliasFillerInterface.php     | 51 ++++++++++++++
 .../Exception/CannotUpdateAliasException.php  |  3 +
 .../config/services/adapter/alias.yml         |  4 ++
 5 files changed, 140 insertions(+), 2 deletions(-)
 create mode 100644 src/Adapter/Alias/Filler/AliasFiller.php
 create mode 100644 src/Adapter/Alias/Filler/AliasFillerInterface.php

diff --git a/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php b/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php
index 360bc1ce9d668..d3bc15d66d5dc 100644
--- a/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php
+++ b/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php
@@ -28,13 +28,16 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Alias\CommandHandler;
 
+use PrestaShop\PrestaShop\Adapter\Alias\Filler\AliasFillerInterface;
 use PrestaShop\PrestaShop\Adapter\Alias\Repository\AliasRepository;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasCommand;
 use PrestaShop\PrestaShop\Core\Domain\Alias\CommandHandler\UpdateAliasHandlerInterface;
+use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\CannotUpdateAliasException;
 
 class UpdateAliasHandler implements UpdateAliasHandlerInterface
 {
     public function __construct(
+        protected AliasFillerInterface $aliasUpdatablePropertyFiller,
         protected AliasRepository $aliasRepository
     ) {
     }
@@ -45,13 +48,21 @@ public function __construct(
     public function handle(UpdateAliasCommand $command): void
     {
         $alias = $this->aliasRepository->get($command->aliasId);
-        $wasActive = (bool) $alias->active;
 
-        // @TODO implement updatable property filler
+        $updatableProperties = $this->aliasUpdatablePropertyFiller->fillUpdatableProperties(
+            $alias,
+            $command
+        );
 
         if (null !== $command->isActive()) {
             $alias->active = $command->isActive();
             $updatableProperties[] = 'active';
         }
+
+        $this->aliasRepository->partialUpdate(
+            $alias,
+            $updatableProperties,
+            CannotUpdateAliasException::class
+        );
     }
 }
diff --git a/src/Adapter/Alias/Filler/AliasFiller.php b/src/Adapter/Alias/Filler/AliasFiller.php
new file mode 100644
index 0000000000000..1e8c6fa4995a5
--- /dev/null
+++ b/src/Adapter/Alias/Filler/AliasFiller.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Adapter\Alias\Filler;
+
+use Alias;
+use PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasCommand;
+
+class AliasFiller implements AliasFillerInterface
+{
+    /**
+     * @var AliasFillerInterface[]
+     */
+    private $updatablePropertyFillers;
+
+    /**
+     * @param AliasFillerInterface[] $updatablePropertyFillers
+     */
+    public function __construct(
+        iterable $updatablePropertyFillers
+    ) {
+        $this->updatablePropertyFillers = $updatablePropertyFillers;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function fillUpdatableProperties(Alias $alias, UpdateAliasCommand $command): array
+    {
+        $updatableProperties = [];
+
+        foreach ($this->updatablePropertyFillers as $filler) {
+            $properties = $filler->fillUpdatableProperties($alias, $command);
+
+            if (empty($properties)) {
+                continue;
+            }
+
+            $updatableProperties = array_merge($updatableProperties, $properties);
+        }
+
+        return $updatableProperties;
+    }
+}
diff --git a/src/Adapter/Alias/Filler/AliasFillerInterface.php b/src/Adapter/Alias/Filler/AliasFillerInterface.php
new file mode 100644
index 0000000000000..13c39243efc59
--- /dev/null
+++ b/src/Adapter/Alias/Filler/AliasFillerInterface.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Adapter\Alias\Filler;
+
+use Alias;
+use PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasCommand;
+
+/**
+ * Responsible for filling up the Alias with the properties which have to be updated
+ */
+interface AliasFillerInterface
+{
+    /**
+     * Fill alias properties from the command and return an array of the properties to update.
+     *
+     * Returns a list of properties that were filled.
+     *
+     * @return string[]
+     *
+     * e.g.:
+     * [
+     *     'active',
+     *     'alias',
+     * ]
+     */
+    public function fillUpdatableProperties(Alias $alias, UpdateAliasCommand $command): array;
+}
diff --git a/src/Core/Domain/Alias/Exception/CannotUpdateAliasException.php b/src/Core/Domain/Alias/Exception/CannotUpdateAliasException.php
index 2e9ea3fc7f535..0ef490bb9309a 100644
--- a/src/Core/Domain/Alias/Exception/CannotUpdateAliasException.php
+++ b/src/Core/Domain/Alias/Exception/CannotUpdateAliasException.php
@@ -28,6 +28,9 @@
 
 namespace PrestaShop\PrestaShop\Core\Domain\Alias\Exception;
 
+/**
+ * Thrown when new alias update fails
+ */
 class CannotUpdateAliasException extends AliasException
 {
 }
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml b/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
index 91bb78e590185..d39c6968db641 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
@@ -34,3 +34,7 @@ services:
     tags:
       - name: tactician.handler
         command: PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasCommand
+
+  PrestaShop\PrestaShop\Adapter\Alias\Filler\AliasFiller:
+    arguments:
+      - !tagged core.alias_filler

From 4137a4580504c12c962b2db209aef149f869b19c Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Tue, 23 May 2023 17:39:08 +0300
Subject: [PATCH 0087/1030] implement behat tests

---
 .../Context/Domain/AliasFeatureContext.php    | 37 +++++++++++++++++++
 .../Scenario/Search/edit_alias.feature        | 23 ++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 tests/Integration/Behaviour/Features/Scenario/Search/edit_alias.feature

diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
index eb994604de73c..d103610c25964 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
@@ -31,6 +31,8 @@
 use Behat\Gherkin\Node\TableNode;
 use PHPUnit\Framework\Assert;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Command\AddAliasCommand;
+use PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasCommand;
+use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\AliasException;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Command\BulkUpdateAliasStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\AliasException;
@@ -135,6 +137,22 @@ public function assertLastErrorIsInvalidAliasConstraint(): void
         $this->assertLastErrorIs(InvalidArgumentException::class);
     }
 
+    /**
+     * @When I update alias ":aliasReference" with following values:
+     *
+     * @return void
+     */
+    public function assertUpdateAlias(string $aliasReference, TableNode $table): void
+    {
+        $updateAliasCommand = $this->buildUpdateAliasCommand($aliasReference, $table);
+
+        try {
+            $this->getCommandBus()->handle($updateAliasCommand);
+        } catch (AliasException $e) {
+            $this->setLastException($e);
+        }
+    }
+
     /**
      * @BeforeFeature @restore-aliases-before-feature
      */
@@ -182,4 +200,23 @@ private function assertAliasProperties(array $expectedData, array $aliases): arr
 
         return $idsByIdReferences;
     }
+
+    private function buildUpdateAliasCommand(string $aliasReference, TableNode $table): UpdateAliasCommand
+    {
+        $data = $table->getColumnsHash();
+        $aliasId = $this->getSharedStorage()->get($aliasReference);
+        $command = new UpdateAliasCommand($aliasId);
+
+        if (isset($data['aliases'])) {
+            $command->setAliases($data['aliases']);
+        }
+        if (isset($data['search'])) {
+            $command->setSearchTerm($data['search']);
+        }
+        if (isset($data['active'])) {
+            $command->setActive($data['active']);
+        }
+
+        return $command;
+    }
 }
diff --git a/tests/Integration/Behaviour/Features/Scenario/Search/edit_alias.feature b/tests/Integration/Behaviour/Features/Scenario/Search/edit_alias.feature
new file mode 100644
index 0000000000000..5515e23734f02
--- /dev/null
+++ b/tests/Integration/Behaviour/Features/Scenario/Search/edit_alias.feature
@@ -0,0 +1,23 @@
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s alias --tags update_alias_feature
+@restore-aliases-before-feature
+@clear-cache-before-feature
+@clear-cache-after-feature
+@update_alias_feature
+
+Feature: Edit alias from Back Office (BO)
+  As a BO user
+  I need to be able to edit alias from the BO
+
+  Scenario: change alias status
+    Given following aliases should exist:
+      | id reference | alias  | search | active |
+      | alias1       | bloose | blouse | 1      |
+      | alias2       | blues  | blouse | 1      |
+    When I update alias "alias1" with following values:
+      | aliases | dark  |
+      | search  | black |
+      | active  | true  |
+    Then following aliases should exist:
+      | id reference | alias  | search | active |
+      | alias1       | bloose | blouse | 0      |
+      | alias2       | blues  | blouse | 0      |

From 3dcfa37b7fef9497c1b792c372b913707b1b1a13 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Wed, 24 May 2023 14:03:58 +0300
Subject: [PATCH 0088/1030] fix tests

---
 src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php   | 5 -----
 .../Resources/config/services/adapter/alias.yml           | 3 +++
 .../Features/Context/Domain/AliasFeatureContext.php       | 6 +++---
 .../Behaviour/Features/Scenario/Search/edit_alias.feature | 8 ++++----
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php b/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php
index d3bc15d66d5dc..933f76543f349 100644
--- a/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php
+++ b/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php
@@ -54,11 +54,6 @@ public function handle(UpdateAliasCommand $command): void
             $command
         );
 
-        if (null !== $command->isActive()) {
-            $alias->active = $command->isActive();
-            $updatableProperties[] = 'active';
-        }
-
         $this->aliasRepository->partialUpdate(
             $alias,
             $updatableProperties,
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml b/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
index d39c6968db641..75a8d55577ef4 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
@@ -34,6 +34,9 @@ services:
     tags:
       - name: tactician.handler
         command: PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasCommand
+    arguments:
+      $aliasUpdatablePropertyFiller: '@PrestaShop\PrestaShop\Adapter\Alias\Filler\AliasFiller'
+
 
   PrestaShop\PrestaShop\Adapter\Alias\Filler\AliasFiller:
     arguments:
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
index d103610c25964..8a8257b5959c6 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
@@ -203,18 +203,18 @@ private function assertAliasProperties(array $expectedData, array $aliases): arr
 
     private function buildUpdateAliasCommand(string $aliasReference, TableNode $table): UpdateAliasCommand
     {
-        $data = $table->getColumnsHash();
+        $data = $table->getRowsHash();
         $aliasId = $this->getSharedStorage()->get($aliasReference);
         $command = new UpdateAliasCommand($aliasId);
 
         if (isset($data['aliases'])) {
-            $command->setAliases($data['aliases']);
+            $command->setAliases(PrimitiveUtils::castStringArrayIntoArray($data['aliases']));
         }
         if (isset($data['search'])) {
             $command->setSearchTerm($data['search']);
         }
         if (isset($data['active'])) {
-            $command->setActive($data['active']);
+            $command->setActive((bool) $data['active']);
         }
 
         return $command;
diff --git a/tests/Integration/Behaviour/Features/Scenario/Search/edit_alias.feature b/tests/Integration/Behaviour/Features/Scenario/Search/edit_alias.feature
index 5515e23734f02..44ce759ba5ed5 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Search/edit_alias.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Search/edit_alias.feature
@@ -16,8 +16,8 @@ Feature: Edit alias from Back Office (BO)
     When I update alias "alias1" with following values:
       | aliases | dark  |
       | search  | black |
-      | active  | true  |
+      | active  | 0     |
     Then following aliases should exist:
-      | id reference | alias  | search | active |
-      | alias1       | bloose | blouse | 0      |
-      | alias2       | blues  | blouse | 0      |
+      | id reference | alias | search | active |
+      | alias1       | dark  | black  | 0      |
+      | alias2       | blues | blouse | 1      |

From 06f5ae0b219a1a50ec0da4136426e07c0fdc3253 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Wed, 31 May 2023 17:47:32 +0300
Subject: [PATCH 0089/1030] remove duplicate import

---
 .../Behaviour/Features/Context/Domain/AliasFeatureContext.php    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
index 8a8257b5959c6..5f61d1cb809c6 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
@@ -35,7 +35,6 @@
 use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\AliasException;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Command\BulkUpdateAliasStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasStatusCommand;
-use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\AliasException;
 use PrestaShop\PrestaShop\Core\Domain\Alias\ValueObject\AliasId;
 use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
 use PrestaShop\PrestaShop\Core\Grid\Query\AliasQueryBuilder;

From b69050d4e91c223057d3b2dac598e55697af7100 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Wed, 31 May 2023 17:49:49 +0300
Subject: [PATCH 0090/1030] cs fixer fixes

---
 .../Behaviour/Features/Context/Domain/AliasFeatureContext.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
index 5f61d1cb809c6..f205b7b3d2f29 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
@@ -31,10 +31,10 @@
 use Behat\Gherkin\Node\TableNode;
 use PHPUnit\Framework\Assert;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Command\AddAliasCommand;
-use PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasCommand;
-use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\AliasException;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Command\BulkUpdateAliasStatusCommand;
+use PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasCommand;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasStatusCommand;
+use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\AliasException;
 use PrestaShop\PrestaShop\Core\Domain\Alias\ValueObject\AliasId;
 use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
 use PrestaShop\PrestaShop\Core\Grid\Query\AliasQueryBuilder;

From 530600da1e6ec6473c0f7631070de8f3dc8bfeea Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Mon, 5 Jun 2023 10:41:54 +0300
Subject: [PATCH 0091/1030] fix update alias command

---
 .../CommandHandler/UpdateAliasHandler.php     | 22 ++++-
 .../Alias/Command/UpdateAliasCommand.php      | 83 ++-----------------
 2 files changed, 25 insertions(+), 80 deletions(-)

diff --git a/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php b/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php
index 933f76543f349..40b32ba6cdd48 100644
--- a/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php
+++ b/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php
@@ -49,10 +49,24 @@ public function handle(UpdateAliasCommand $command): void
     {
         $alias = $this->aliasRepository->get($command->aliasId);
 
-        $updatableProperties = $this->aliasUpdatablePropertyFiller->fillUpdatableProperties(
-            $alias,
-            $command
-        );
+//        $updatableProperties = $this->aliasUpdatablePropertyFiller->fillUpdatableProperties(
+//            $alias,
+//            $command
+//        );
+
+        foreach ($command->getAliases())
+
+        //
+
+        $updatableProperties = [];
+        if (null !== $command->getAliases()) {
+            $alias->al = $command->getLocalizedNames();
+            $updatableProperties['name'] = array_keys($command->getLocalizedNames());
+        }
+        if (null !== $command->getGender()) {
+            $title->type = $command->getGender()->getValue();
+            $updatableProperties[] = 'type';
+        }
 
         $this->aliasRepository->partialUpdate(
             $alias,
diff --git a/src/Core/Domain/Alias/Command/UpdateAliasCommand.php b/src/Core/Domain/Alias/Command/UpdateAliasCommand.php
index 6f21a7a9731a7..fc435cf2fc429 100644
--- a/src/Core/Domain/Alias/Command/UpdateAliasCommand.php
+++ b/src/Core/Domain/Alias/Command/UpdateAliasCommand.php
@@ -37,86 +37,17 @@ class UpdateAliasCommand
 {
     public readonly AliasId $aliasId;
 
-    /**
-     * @var string[]
-     */
-    private $aliases;
-
-    /**
-     * @var string
-     */
-    private $searchTerm;
-
-    /**
-     * @var bool
-     */
-    private $active;
 
     /**
      * @param int $aliasId
-     */
-    public function __construct(int $aliasId)
-    {
-        $this->aliasId = new AliasId($aliasId);
-    }
-
-    /**
-     * @return string[]
-     */
-    public function getAliases(): array
-    {
-        return $this->aliases;
-    }
-
-    /**
      * @param string[] $aliases
-     *
-     * @return UpdateAliasCommand
+     * @param string[] $searchTerm
      */
-    public function setAliases(array $aliases): UpdateAliasCommand
-    {
-        $this->aliases = $aliases;
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getSearchTerm(): string
-    {
-        return $this->searchTerm;
-    }
-
-    /**
-     * @param string $searchTerm
-     *
-     * @return UpdateAliasCommand
-     */
-    public function setSearchTerm(string $searchTerm): UpdateAliasCommand
-    {
-        $this->searchTerm = $searchTerm;
-
-        return $this;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isActive(): bool
-    {
-        return $this->active;
-    }
-
-    /**
-     * @param bool $active
-     *
-     * @return UpdateAliasCommand
-     */
-    public function setActive(bool $active): UpdateAliasCommand
-    {
-        $this->active = $active;
-
-        return $this;
+    public function __construct(
+        int $aliasId,
+        public readonly array $aliases,
+        public readonly array $searchTerm
+    ) {
+        $this->aliasId = new AliasId($aliasId);
     }
 }

From 354b10ca8cccc0943e8dd2e9d319a576f2c18456 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Mon, 5 Jun 2023 11:46:15 +0300
Subject: [PATCH 0092/1030] fix alias command

---
 src/Core/Domain/Alias/Command/UpdateAliasCommand.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Core/Domain/Alias/Command/UpdateAliasCommand.php b/src/Core/Domain/Alias/Command/UpdateAliasCommand.php
index fc435cf2fc429..a2e5792904f02 100644
--- a/src/Core/Domain/Alias/Command/UpdateAliasCommand.php
+++ b/src/Core/Domain/Alias/Command/UpdateAliasCommand.php
@@ -41,12 +41,12 @@ class UpdateAliasCommand
     /**
      * @param int $aliasId
      * @param string[] $aliases
-     * @param string[] $searchTerm
+     * @param string $searchTerm
      */
     public function __construct(
         int $aliasId,
         public readonly array $aliases,
-        public readonly array $searchTerm
+        public readonly string $searchTerm
     ) {
         $this->aliasId = new AliasId($aliasId);
     }

From 2be3547ab26ba5d99a7e81d037d1749afe6d6647 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Mon, 5 Jun 2023 16:40:23 +0300
Subject: [PATCH 0093/1030] fix edit alias logic

---
 .../CommandHandler/UpdateAliasHandler.php     | 29 +------------
 .../Alias/Repository/AliasRepository.php      | 41 +++++++++++++++++++
 .../Alias/Exception/AliasExistsException.php  | 33 +++++++++++++++
 3 files changed, 76 insertions(+), 27 deletions(-)
 create mode 100644 src/Core/Domain/Alias/Exception/AliasExistsException.php

diff --git a/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php b/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php
index 40b32ba6cdd48..325fcbc0b766d 100644
--- a/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php
+++ b/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php
@@ -32,7 +32,6 @@
 use PrestaShop\PrestaShop\Adapter\Alias\Repository\AliasRepository;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasCommand;
 use PrestaShop\PrestaShop\Core\Domain\Alias\CommandHandler\UpdateAliasHandlerInterface;
-use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\CannotUpdateAliasException;
 
 class UpdateAliasHandler implements UpdateAliasHandlerInterface
 {
@@ -47,31 +46,7 @@ public function __construct(
      */
     public function handle(UpdateAliasCommand $command): void
     {
-        $alias = $this->aliasRepository->get($command->aliasId);
-
-//        $updatableProperties = $this->aliasUpdatablePropertyFiller->fillUpdatableProperties(
-//            $alias,
-//            $command
-//        );
-
-        foreach ($command->getAliases())
-
-        //
-
-        $updatableProperties = [];
-        if (null !== $command->getAliases()) {
-            $alias->al = $command->getLocalizedNames();
-            $updatableProperties['name'] = array_keys($command->getLocalizedNames());
-        }
-        if (null !== $command->getGender()) {
-            $title->type = $command->getGender()->getValue();
-            $updatableProperties[] = 'type';
-        }
-
-        $this->aliasRepository->partialUpdate(
-            $alias,
-            $updatableProperties,
-            CannotUpdateAliasException::class
-        );
+        $this->aliasRepository->deleteRelatedAliases($command->aliasId);
+        $this->aliasRepository->create($command->searchTerm, $command->aliases);
     }
 }
diff --git a/src/Adapter/Alias/Repository/AliasRepository.php b/src/Adapter/Alias/Repository/AliasRepository.php
index 3f345e7494b0b..9fdde00de1acc 100644
--- a/src/Adapter/Alias/Repository/AliasRepository.php
+++ b/src/Adapter/Alias/Repository/AliasRepository.php
@@ -32,6 +32,7 @@
 use Doctrine\DBAL\Connection;
 use PrestaShop\PrestaShop\Adapter\Alias\Validate\AliasValidator;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\AliasNotFoundException;
+use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\BulkAliasException;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\CannotAddAliasException;
 use PrestaShop\PrestaShop\Core\Domain\Alias\ValueObject\AliasId;
 use PrestaShop\PrestaShop\Core\Exception\CoreException;
@@ -164,4 +165,44 @@ public function partialUpdate(Alias $alias, array $propertiesToUpdate, string $e
         $this->aliasValidator->validate($alias);
         $this->partiallyUpdateObjectModel($alias, $propertiesToUpdate, $exceptionClass);
     }
+
+    /**
+     * Deletes all related aliases
+     *
+     * @param AliasId $aliasId
+     */
+    public function deleteRelatedAliases(AliasId $aliasId): void
+    {
+        $exceptions = [];
+
+        $alisIds = $this->connection->createQueryBuilder()
+            ->addSelect('al.id_alias')
+            ->from($this->dbPrefix . 'alias', 'a')
+            ->where('a.id_alias = :aliasId')
+            ->leftJoin('a', $this->dbPrefix . 'alias', 'al', 'al.search = a.search')
+            ->setParameter('aliasId', $aliasId->getValue())
+            ->execute()
+            ->fetchFirstColumn()
+        ;
+
+        if (empty($alisIds)) {
+            return;
+        }
+
+        foreach ($alisIds as $currentAliasId) {
+            try {
+                $this->deleteObjectModel($this->get(new AliasId((int) $currentAliasId)), CannotDeleteAliasException::class);
+            } catch (CannotDeleteAliasException $e) {
+                $exceptions[] = $e;
+            }
+        }
+
+        if (!empty($exceptions)) {
+            throw new BulkAliasException(
+                $exceptions,
+                'Errors occurred during Alias bulk delete action',
+                BulkFeatureException::FAILED_BULK_DELETE
+            );
+        }
+    }
 }
diff --git a/src/Core/Domain/Alias/Exception/AliasExistsException.php b/src/Core/Domain/Alias/Exception/AliasExistsException.php
new file mode 100644
index 0000000000000..3bab6f753ce8b
--- /dev/null
+++ b/src/Core/Domain/Alias/Exception/AliasExistsException.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\Alias\Exception;
+
+class AliasExistsException extends AliasException
+{
+}

From b954dd7e14ecc4aa3caaf592396ac7266f00a34c Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Tue, 13 Jun 2023 11:52:54 +0300
Subject: [PATCH 0094/1030] cs fixer fix

---
 src/Core/Domain/Alias/Command/UpdateAliasCommand.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Core/Domain/Alias/Command/UpdateAliasCommand.php b/src/Core/Domain/Alias/Command/UpdateAliasCommand.php
index a2e5792904f02..261af05af5f67 100644
--- a/src/Core/Domain/Alias/Command/UpdateAliasCommand.php
+++ b/src/Core/Domain/Alias/Command/UpdateAliasCommand.php
@@ -37,7 +37,6 @@ class UpdateAliasCommand
 {
     public readonly AliasId $aliasId;
 
-
     /**
      * @param int $aliasId
      * @param string[] $aliases

From f2d25364749ae4b7153b38f5bd88f4944445232f Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Tue, 13 Jun 2023 11:56:56 +0300
Subject: [PATCH 0095/1030] remove alias filler

---
 .../CommandHandler/UpdateAliasHandler.php     |  2 -
 src/Adapter/Alias/Filler/AliasFiller.php      | 69 -------------------
 .../Alias/Filler/AliasFillerInterface.php     | 51 --------------
 .../config/services/adapter/alias.yml         |  7 --
 4 files changed, 129 deletions(-)
 delete mode 100644 src/Adapter/Alias/Filler/AliasFiller.php
 delete mode 100644 src/Adapter/Alias/Filler/AliasFillerInterface.php

diff --git a/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php b/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php
index 325fcbc0b766d..447ac546019ee 100644
--- a/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php
+++ b/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php
@@ -28,7 +28,6 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Alias\CommandHandler;
 
-use PrestaShop\PrestaShop\Adapter\Alias\Filler\AliasFillerInterface;
 use PrestaShop\PrestaShop\Adapter\Alias\Repository\AliasRepository;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasCommand;
 use PrestaShop\PrestaShop\Core\Domain\Alias\CommandHandler\UpdateAliasHandlerInterface;
@@ -36,7 +35,6 @@
 class UpdateAliasHandler implements UpdateAliasHandlerInterface
 {
     public function __construct(
-        protected AliasFillerInterface $aliasUpdatablePropertyFiller,
         protected AliasRepository $aliasRepository
     ) {
     }
diff --git a/src/Adapter/Alias/Filler/AliasFiller.php b/src/Adapter/Alias/Filler/AliasFiller.php
deleted file mode 100644
index 1e8c6fa4995a5..0000000000000
--- a/src/Adapter/Alias/Filler/AliasFiller.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-declare(strict_types=1);
-
-namespace PrestaShop\PrestaShop\Adapter\Alias\Filler;
-
-use Alias;
-use PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasCommand;
-
-class AliasFiller implements AliasFillerInterface
-{
-    /**
-     * @var AliasFillerInterface[]
-     */
-    private $updatablePropertyFillers;
-
-    /**
-     * @param AliasFillerInterface[] $updatablePropertyFillers
-     */
-    public function __construct(
-        iterable $updatablePropertyFillers
-    ) {
-        $this->updatablePropertyFillers = $updatablePropertyFillers;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function fillUpdatableProperties(Alias $alias, UpdateAliasCommand $command): array
-    {
-        $updatableProperties = [];
-
-        foreach ($this->updatablePropertyFillers as $filler) {
-            $properties = $filler->fillUpdatableProperties($alias, $command);
-
-            if (empty($properties)) {
-                continue;
-            }
-
-            $updatableProperties = array_merge($updatableProperties, $properties);
-        }
-
-        return $updatableProperties;
-    }
-}
diff --git a/src/Adapter/Alias/Filler/AliasFillerInterface.php b/src/Adapter/Alias/Filler/AliasFillerInterface.php
deleted file mode 100644
index 13c39243efc59..0000000000000
--- a/src/Adapter/Alias/Filler/AliasFillerInterface.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-namespace PrestaShop\PrestaShop\Adapter\Alias\Filler;
-
-use Alias;
-use PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasCommand;
-
-/**
- * Responsible for filling up the Alias with the properties which have to be updated
- */
-interface AliasFillerInterface
-{
-    /**
-     * Fill alias properties from the command and return an array of the properties to update.
-     *
-     * Returns a list of properties that were filled.
-     *
-     * @return string[]
-     *
-     * e.g.:
-     * [
-     *     'active',
-     *     'alias',
-     * ]
-     */
-    public function fillUpdatableProperties(Alias $alias, UpdateAliasCommand $command): array;
-}
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml b/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
index 75a8d55577ef4..91bb78e590185 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
@@ -34,10 +34,3 @@ services:
     tags:
       - name: tactician.handler
         command: PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasCommand
-    arguments:
-      $aliasUpdatablePropertyFiller: '@PrestaShop\PrestaShop\Adapter\Alias\Filler\AliasFiller'
-
-
-  PrestaShop\PrestaShop\Adapter\Alias\Filler\AliasFiller:
-    arguments:
-      - !tagged core.alias_filler

From e25654b7eb9190f937f4a8b38a8e0cfcd564b2b9 Mon Sep 17 00:00:00 2001
From: Progi1984 <progi1984@gmail.com>
Date: Tue, 13 Jun 2023 09:48:27 +0000
Subject: [PATCH 0096/1030] Nightly : Move 1.7.8.x to Github Actions

---
 .github/workflows/cron_nightly_gcp.yml        | 59 -------------------
 .../workflows/cron_nightly_tests_1.7.8.x.yml  | 19 ++++++
 .../workflows/cron_nightly_tests_reusable.yml | 29 +++++++--
 3 files changed, 44 insertions(+), 63 deletions(-)
 delete mode 100644 .github/workflows/cron_nightly_gcp.yml
 create mode 100644 .github/workflows/cron_nightly_tests_1.7.8.x.yml

diff --git a/.github/workflows/cron_nightly_gcp.yml b/.github/workflows/cron_nightly_gcp.yml
deleted file mode 100644
index 89bd52856f1ef..0000000000000
--- a/.github/workflows/cron_nightly_gcp.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-# Nightly on GCP for 1.7.8.x (Deprecated if 1.7.8.x is not an active branch)
-name: Nightly on 1.7.8.x
-
-on:
-  workflow_run:
-    workflows: [ 'Nightly Build' ]
-    types:
-      - requested
-
-permissions:
-  contents: read
-
-jobs:
-  nightly:
-    runs-on: ubuntu-latest
-    name: Nightly
-    strategy:
-      matrix:
-        include:
-          - branch: 1.7.8.x
-            instance: release
-      fail-fast: false
-    env:
-      GC_INSTANCE_NAME: ${{ secrets.GC_INSTANCE_NAME }}
-      GC_PROJECT_ID: ${{ secrets.GC_PROJECT_ID }}
-      GC_SERVICE_KEY: ${{ secrets.GC_SERVICE_KEY }}
-      GC_ZONE: ${{ secrets.GC_ZONE }}
-      GH_BRANCH: ${{ matrix.branch }}
-      INSTANCE_TYPE: ${{ matrix.instance }}
-      NIGHTLY_TOKEN: ${{ secrets.NIGHTLY_TOKEN }}
-
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-          ref: ${{ env.GH_BRANCH }}
-
-      - name: Initialize GCloud Service Key
-        run: echo $GC_SERVICE_KEY > $HOME/gcloud-service-key.json
-
-      - name: Auth Cloud Sdk
-        uses: google-github-actions/auth@v0
-        with:
-          credentials_json: ${{ env.GC_SERVICE_KEY }}
-          project_id: ${{ env.GC_PROJECT_ID }}
-
-      - name: Setup Cloud Sdk
-        uses: google-github-actions/setup-gcloud@v0
-
-      - name: Stop the instance if started
-        run: gcloud compute instances stop --zone $GC_ZONE "${GC_INSTANCE_NAME}-${INSTANCE_TYPE}"
-
-      - name: Add metadata & Start instance
-        run: |
-          gcloud compute instances add-metadata "${GC_INSTANCE_NAME}-${INSTANCE_TYPE}" --zone $GC_ZONE --metadata=NIGHTLY_TOKEN=$NIGHTLY_TOKEN && \
-          gcloud compute instances add-metadata "${GC_INSTANCE_NAME}-${INSTANCE_TYPE}" --zone $GC_ZONE --metadata=GH_BRANCH=$GH_BRANCH && \
-          gcloud compute instances add-metadata "${GC_INSTANCE_NAME}-${INSTANCE_TYPE}" --zone $GC_ZONE --metadata-from-file startup-tests-script=tests/UI/scripts/run-nightly-tests.sh && \
-          gcloud compute instances add-metadata "${GC_INSTANCE_NAME}-${INSTANCE_TYPE}" --zone $GC_ZONE --metadata-from-file startup-reports-script=tests/UI/scripts/run-nightly-reports.sh && \
-          gcloud compute instances start --zone $GC_ZONE "${GC_INSTANCE_NAME}-${INSTANCE_TYPE}"
diff --git a/.github/workflows/cron_nightly_tests_1.7.8.x.yml b/.github/workflows/cron_nightly_tests_1.7.8.x.yml
new file mode 100644
index 0000000000000..2bb87c6426a46
--- /dev/null
+++ b/.github/workflows/cron_nightly_tests_1.7.8.x.yml
@@ -0,0 +1,19 @@
+# This workflow aim to run all UI tests on active branches
+# and upload the report on Google cloud platform storage
+name: Nightly tests and report - 1.7.8.x
+
+on:
+  workflow_run:
+    workflows: [ 'Nightly Build' ]
+    types:
+      - requested
+
+jobs:
+  test_1_7_8_x:
+    uses: ./.github/workflows/cron_nightly_tests_reusable.yml
+    with:
+      BRANCH: 1.7.8.x
+    secrets:
+      GC_PROJECT_ID: ${{ secrets.GC_PROJECT_ID }}
+      GC_SERVICE_KEY: ${{ secrets.GC_SERVICE_KEY }}
+      API_NIGHTLY_IMPORT_TOKEN: ${{ secrets.NIGHTLY_TOKEN }}
diff --git a/.github/workflows/cron_nightly_tests_reusable.yml b/.github/workflows/cron_nightly_tests_reusable.yml
index f5c59d831f80f..d91aa8130ed0c 100644
--- a/.github/workflows/cron_nightly_tests_reusable.yml
+++ b/.github/workflows/cron_nightly_tests_reusable.yml
@@ -92,6 +92,27 @@ jobs:
           - 'modules'
           - 'regression'
         exclude:
+          ## 1.7.8.x
+          - BRANCH: 1.7.8.x
+            CAMPAIGN: 'cldr'
+          - BRANCH: 1.7.8.x
+            CAMPAIGN: 'functional:BO:dashboard'
+          - BRANCH: 1.7.8.x
+            CAMPAIGN: 'functional:productV2'
+          - BRANCH: 1.7.8.x
+            CAMPAIGN: 'functional:API'
+          - BRANCH: 1.7.8.x
+            CAMPAIGN: 'functional:FO:classic:01-03'
+          - BRANCH: 1.7.8.x
+            CAMPAIGN: 'functional:FO:classic:04-07'
+          - BRANCH: 1.7.8.x
+            CAMPAIGN: 'functional:FO:classic:08-12'
+          - BRANCH: 1.7.8.x
+            CAMPAIGN: 'functional:FO:hummingbird:01-03'
+          - BRANCH: 1.7.8.x
+            CAMPAIGN: 'functional:WS'
+          - BRANCH: 1.7.8.x
+            CAMPAIGN: 'modules'
           ## 8.0.x
           - BRANCH: 8.0.x
             CAMPAIGN: 'cldr'
@@ -135,8 +156,8 @@ jobs:
       PS_LANGUAGE: 'en'
       PS_INSTALL_AUTO: 1
       PS_DEV_MODE: 0
-      PS_ENABLE_SSL: ${{ matrix.BRANCH == '8.0.x' && '0' || '1' }}
-      PS_DOMAIN: ${{ matrix.BRANCH == '8.0.x' && 'localhost:8001' || 'localhost:8002' }}
+      PS_ENABLE_SSL: ${{ ((matrix.BRANCH == '8.0.x') || (matrix.BRANCH == '1.7.8.x')) && '0' || '1' }}
+      PS_DOMAIN: ${{ ((matrix.BRANCH == '8.0.x') || (matrix.BRANCH == '1.7.8.x')) && 'localhost:8001' || 'localhost:8002' }}
       DB_SERVER: 'mysql'
       DB_NAME: 'prestashop'
       DB_PREFIX: 'tst_'
@@ -177,7 +198,7 @@ jobs:
       - name: Build and run shop with docker
         timeout-minutes: 15
         env:
-          URL_FO: ${{ env.GH_BRANCH == '8.0.x' && 'http://localhost:8001/' || 'https://localhost:8002/' }}
+          URL_FO: ${{ ((env.GH_BRANCH == '8.0.x') || (env.GH_BRANCH == '1.7.8.x')) && 'http://localhost:8001/' || 'https://localhost:8002/' }}
         run: |
           USER_ID=$(id -u) GROUP_ID=$(id -g) \
           docker-compose -f docker-compose.yml up -d --build
@@ -197,7 +218,7 @@ jobs:
         continue-on-error: true
         working-directory: ${{ inputs.TESTS_DIR }}
         env:
-          URL_FO: ${{ env.GH_BRANCH == '8.0.x' && 'http://localhost:8001/' || 'https://localhost:8002/' }}
+          URL_FO: ${{ ((env.GH_BRANCH == '8.0.x') || (env.GH_BRANCH == '1.7.8.x')) && 'http://localhost:8001/' || 'https://localhost:8002/' }}
           ENABLE_SSL: true
           SMTP_SERVER: '172.17.0.1'
         run: npm run ${{ env.TEST_CAMPAIGN }}

From dc789c14cb92e538b33d4ca464a9890f8df076e4 Mon Sep 17 00:00:00 2001
From: Ibrahima SOW <ibrahima.sow@prestashop.com>
Date: Tue, 13 Jun 2023 11:46:45 +0000
Subject: [PATCH 0097/1030] Admin search - Transmit the search query param

---
 controllers/admin/AdminSearchController.php                    | 3 ++-
 .../Integration/Controllers/AdminSearchControllerCoreTest.php  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/controllers/admin/AdminSearchController.php b/controllers/admin/AdminSearchController.php
index 3931abe5c18ca..b836b5bfc3735 100644
--- a/controllers/admin/AdminSearchController.php
+++ b/controllers/admin/AdminSearchController.php
@@ -304,8 +304,9 @@ public function searchFeatures()
             }
 
             $sfRouteParams = (!empty($row['route_name'])) ? ['route' => $row['route_name']] : [];
+            $params = ['bo_query' => $this->query];
             $this->_list['features'][$row['name']][] = [
-                'link' => Context::getContext()->link->getAdminLink((string) $row['class_name'], true, $sfRouteParams),
+                'link' => Context::getContext()->link->getAdminLink((string) $row['class_name'], true, $sfRouteParams, $params),
             ];
         }
     }
diff --git a/tests/Integration/Controllers/AdminSearchControllerCoreTest.php b/tests/Integration/Controllers/AdminSearchControllerCoreTest.php
index 34c9198b23bc9..f9e092348c447 100644
--- a/tests/Integration/Controllers/AdminSearchControllerCoreTest.php
+++ b/tests/Integration/Controllers/AdminSearchControllerCoreTest.php
@@ -85,7 +85,7 @@ public function dataProviderSearch(): array
                     'features' => [
                         'Orders' => [
                             [
-                                'link' => 'http://localhost/admin-dev/index.php?controller=AdminOrders',
+                                'link' => 'http://localhost/admin-dev/index.php?controller=AdminOrders&bo_query=orders',
                             ],
                         ],
                     ],

From e1fc1da55cacec1d8046acd08ea6122c979d748c Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Tue, 13 Jun 2023 15:42:20 +0300
Subject: [PATCH 0098/1030] add missing exception classes

---
 .../Alias/Repository/AliasRepository.php      |  2 ++
 .../Exception/CannotDeleteAliasException.php  | 36 +++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 src/Core/Domain/Alias/Exception/CannotDeleteAliasException.php

diff --git a/src/Adapter/Alias/Repository/AliasRepository.php b/src/Adapter/Alias/Repository/AliasRepository.php
index 9fdde00de1acc..8c932f7e74543 100644
--- a/src/Adapter/Alias/Repository/AliasRepository.php
+++ b/src/Adapter/Alias/Repository/AliasRepository.php
@@ -34,7 +34,9 @@
 use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\AliasNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\BulkAliasException;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\CannotAddAliasException;
+use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\CannotDeleteAliasException;
 use PrestaShop\PrestaShop\Core\Domain\Alias\ValueObject\AliasId;
+use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\BulkFeatureException;
 use PrestaShop\PrestaShop\Core\Exception\CoreException;
 use PrestaShop\PrestaShop\Core\Repository\AbstractObjectModelRepository;
 
diff --git a/src/Core/Domain/Alias/Exception/CannotDeleteAliasException.php b/src/Core/Domain/Alias/Exception/CannotDeleteAliasException.php
new file mode 100644
index 0000000000000..45676dce7ac87
--- /dev/null
+++ b/src/Core/Domain/Alias/Exception/CannotDeleteAliasException.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\Alias\Exception;
+
+/**
+ * Thrown when alias deletion fails
+ */
+class CannotDeleteAliasException extends AliasException
+{
+}

From ecf101ae99817b4fc1545b95d105e76bbf7ab6a3 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Tue, 13 Jun 2023 15:58:21 +0300
Subject: [PATCH 0099/1030] fix update alias handler logic

---
 src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php b/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php
index 447ac546019ee..4eaf4842ca7e4 100644
--- a/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php
+++ b/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php
@@ -44,7 +44,14 @@ public function __construct(
      */
     public function handle(UpdateAliasCommand $command): void
     {
-        $this->aliasRepository->deleteRelatedAliases($command->aliasId);
+        $existingAlias = $this->aliasRepository->get($command->aliasId);
+
+        // We need to delete existing aliases if search term is same as all aliases that needs to exists
+        // needs to be in UpdateAliasCommand
+        if ($existingAlias->search === $command->searchTerm) {
+            $this->aliasRepository->deleteRelatedAliases($command->aliasId);
+        }
+
         $this->aliasRepository->create($command->searchTerm, $command->aliases);
     }
 }

From 4c6b4b45d417c313adf72c7bd3b232567768da09 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Tue, 13 Jun 2023 17:54:29 +0300
Subject: [PATCH 0100/1030] improve tests

---
 .../Alias/CommandHandler/UpdateAliasHandler.php  |  6 +++---
 src/Adapter/Alias/Repository/AliasRepository.php |  5 +++--
 .../Domain/Alias/Command/UpdateAliasCommand.php  |  3 ++-
 .../Context/Domain/AliasFeatureContext.php       | 14 ++++++++------
 .../Features/Scenario/Search/edit_alias.feature  | 16 ++++++++++++----
 5 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php b/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php
index 4eaf4842ca7e4..35cadc02623b4 100644
--- a/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php
+++ b/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php
@@ -46,9 +46,9 @@ public function handle(UpdateAliasCommand $command): void
     {
         $existingAlias = $this->aliasRepository->get($command->aliasId);
 
-        // We need to delete existing aliases if search term is same as all aliases that needs to exists
-        // needs to be in UpdateAliasCommand
-        if ($existingAlias->search === $command->searchTerm) {
+        // We need to delete existing aliases if search term is different as we are changing all aliases searchTerm
+        // And previous searchTerm is obsolete
+        if ($existingAlias->search !== $command->searchTerm) {
             $this->aliasRepository->deleteRelatedAliases($command->aliasId);
         }
 
diff --git a/src/Adapter/Alias/Repository/AliasRepository.php b/src/Adapter/Alias/Repository/AliasRepository.php
index 8c932f7e74543..2b42043d9868e 100644
--- a/src/Adapter/Alias/Repository/AliasRepository.php
+++ b/src/Adapter/Alias/Repository/AliasRepository.php
@@ -72,12 +72,13 @@ public function __construct(
      *
      * @param string $searchTerm
      * @param string[] $aliases
+     * @param bool $active
      *
      * @return AliasId[]
      *
      * @throws CoreException
      */
-    public function create(string $searchTerm, array $aliases): array
+    public function create(string $searchTerm, array $aliases, bool $active = true): array
     {
         $aliasIds = [];
 
@@ -90,7 +91,7 @@ public function create(string $searchTerm, array $aliases): array
             $alias = new Alias();
             $alias->search = $searchTerm;
             $alias->alias = $searchAlias;
-            $alias->active = true;
+            $alias->active = $active;
             $this->aliasValidator->validate($alias);
 
             $this->addObjectModel($alias, CannotAddAliasException::class);
diff --git a/src/Core/Domain/Alias/Command/UpdateAliasCommand.php b/src/Core/Domain/Alias/Command/UpdateAliasCommand.php
index 261af05af5f67..ebf2bb9e2b8f9 100644
--- a/src/Core/Domain/Alias/Command/UpdateAliasCommand.php
+++ b/src/Core/Domain/Alias/Command/UpdateAliasCommand.php
@@ -45,7 +45,8 @@ class UpdateAliasCommand
     public function __construct(
         int $aliasId,
         public readonly array $aliases,
-        public readonly string $searchTerm
+        public readonly string $searchTerm,
+        public readonly bool $active = true
     ) {
         $this->aliasId = new AliasId($aliasId);
     }
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
index f205b7b3d2f29..7ef48e3c16f21 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
@@ -186,7 +186,7 @@ private function assertAliasProperties(array $expectedData, array $aliases): arr
 
             if (isset($expectedAlias['active'])) {
                 Assert::assertSame(
-                    $alias['active'],
+                    (int) $alias['active'],
                     (int) $expectedAlias['active'],
                     'Unexpected alias active field'
                 );
@@ -204,18 +204,20 @@ private function buildUpdateAliasCommand(string $aliasReference, TableNode $tabl
     {
         $data = $table->getRowsHash();
         $aliasId = $this->getSharedStorage()->get($aliasReference);
-        $command = new UpdateAliasCommand($aliasId);
+        $aliases = [];
+        $searchTerm = '';
+        $active = true;
 
         if (isset($data['aliases'])) {
-            $command->setAliases(PrimitiveUtils::castStringArrayIntoArray($data['aliases']));
+            $aliases = PrimitiveUtils::castStringArrayIntoArray($data['aliases']);
         }
         if (isset($data['search'])) {
-            $command->setSearchTerm($data['search']);
+            $searchTerm = $data['search'];
         }
         if (isset($data['active'])) {
-            $command->setActive((bool) $data['active']);
+            $active = (bool) $data['active'];
         }
 
-        return $command;
+        return new UpdateAliasCommand($aliasId, $aliases, $searchTerm, $active);
     }
 }
diff --git a/tests/Integration/Behaviour/Features/Scenario/Search/edit_alias.feature b/tests/Integration/Behaviour/Features/Scenario/Search/edit_alias.feature
index 44ce759ba5ed5..8f6a46ff9ed23 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Search/edit_alias.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Search/edit_alias.feature
@@ -8,16 +8,24 @@ Feature: Edit alias from Back Office (BO)
   As a BO user
   I need to be able to edit alias from the BO
 
-  Scenario: change alias status
+  Scenario: I edit existing alias with same search term and active status
     Given following aliases should exist:
       | id reference | alias  | search | active |
       | alias1       | bloose | blouse | 1      |
       | alias2       | blues  | blouse | 1      |
+    When I update alias "alias1" with following values:
+      | aliases | bluse  |
+      | search  | blouse |
+    Then following aliases should exist:
+      | id reference | alias  | search | active |
+      | alias1       | bloose | blouse | 1      |
+      | alias2       | blues  | blouse | 1      |
+      | alias3       | bluse  | blouse | 1      |
+
+  Scenario: I edit existing alias with different search term
     When I update alias "alias1" with following values:
       | aliases | dark  |
       | search  | black |
-      | active  | 0     |
     Then following aliases should exist:
       | id reference | alias | search | active |
-      | alias1       | dark  | black  | 0      |
-      | alias2       | blues | blouse | 1      |
+      | alias3       | dark  | black  | 1      |

From 9108556ed21f454301ef696c3ef3d181ffbf15be Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Tue, 13 Jun 2023 18:01:35 +0300
Subject: [PATCH 0101/1030] implement additional test

---
 .../Scenario/Search/edit_alias.feature         | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/tests/Integration/Behaviour/Features/Scenario/Search/edit_alias.feature b/tests/Integration/Behaviour/Features/Scenario/Search/edit_alias.feature
index 8f6a46ff9ed23..a455f3ab79c6d 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Search/edit_alias.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Search/edit_alias.feature
@@ -22,10 +22,26 @@ Feature: Edit alias from Back Office (BO)
       | alias2       | blues  | blouse | 1      |
       | alias3       | bluse  | blouse | 1      |
 
-  Scenario: I edit existing alias with different search term
+  Scenario: I edit existing alias with different search term that does not exist
     When I update alias "alias1" with following values:
       | aliases | dark  |
       | search  | black |
     Then following aliases should exist:
       | id reference | alias | search | active |
       | alias3       | dark  | black  | 1      |
+
+  Scenario: I edit existing alias with different search term that does exist
+    When I add alias with following information:
+      | alias  | large |
+      | search | big   |
+    Then following aliases should exist:
+      | id reference | alias | search | active |
+      | alias3       | dark  | black  | 1      |
+      | alias4       | large | big    | 1      |
+    When I update alias "alias3" with following values:
+      | aliases | huge |
+      | search  | big  |
+    Then following aliases should exist:
+      | id reference | alias | search | active |
+      | alias4       | large | big    | 1      |
+      | alias5       | huge  | big    | 1      |

From 792a115d50552514fe1400fa46006292f203ac02 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Tue, 13 Jun 2023 18:04:10 +0300
Subject: [PATCH 0102/1030] improve tests readability]

---
 .../Scenario/Search/edit_alias.feature        | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Scenario/Search/edit_alias.feature b/tests/Integration/Behaviour/Features/Scenario/Search/edit_alias.feature
index a455f3ab79c6d..d18ec94792aee 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Search/edit_alias.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Search/edit_alias.feature
@@ -8,40 +8,40 @@ Feature: Edit alias from Back Office (BO)
   As a BO user
   I need to be able to edit alias from the BO
 
-  Scenario: I edit existing alias with same search term and active status
+  Scenario: I edit existing alias with same search term
     Given following aliases should exist:
-      | id reference | alias  | search | active |
-      | alias1       | bloose | blouse | 1      |
-      | alias2       | blues  | blouse | 1      |
+      | id reference | alias  | search |
+      | alias1       | bloose | blouse |
+      | alias2       | blues  | blouse |
     When I update alias "alias1" with following values:
       | aliases | bluse  |
       | search  | blouse |
     Then following aliases should exist:
-      | id reference | alias  | search | active |
-      | alias1       | bloose | blouse | 1      |
-      | alias2       | blues  | blouse | 1      |
-      | alias3       | bluse  | blouse | 1      |
+      | id reference | alias  | search |
+      | alias1       | bloose | blouse |
+      | alias2       | blues  | blouse |
+      | alias3       | bluse  | blouse |
 
   Scenario: I edit existing alias with different search term that does not exist
     When I update alias "alias1" with following values:
       | aliases | dark  |
       | search  | black |
     Then following aliases should exist:
-      | id reference | alias | search | active |
-      | alias3       | dark  | black  | 1      |
+      | id reference | alias | search |
+      | alias3       | dark  | black  |
 
   Scenario: I edit existing alias with different search term that does exist
     When I add alias with following information:
       | alias  | large |
       | search | big   |
     Then following aliases should exist:
-      | id reference | alias | search | active |
-      | alias3       | dark  | black  | 1      |
-      | alias4       | large | big    | 1      |
+      | id reference | alias | search |
+      | alias3       | dark  | black  |
+      | alias4       | large | big    |
     When I update alias "alias3" with following values:
       | aliases | huge |
       | search  | big  |
     Then following aliases should exist:
-      | id reference | alias | search | active |
-      | alias4       | large | big    | 1      |
-      | alias5       | huge  | big    | 1      |
+      | id reference | alias | search |
+      | alias4       | large | big    |
+      | alias5       | huge  | big    |

From d77e012cdd80e8a4bc1f8756e5b613acd98e5610 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Tue, 13 Jun 2023 18:06:03 +0300
Subject: [PATCH 0103/1030] improve tests

---
 src/Core/Domain/Alias/Command/UpdateAliasCommand.php        | 1 -
 .../Features/Context/Domain/AliasFeatureContext.php         | 6 +-----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/Core/Domain/Alias/Command/UpdateAliasCommand.php b/src/Core/Domain/Alias/Command/UpdateAliasCommand.php
index ebf2bb9e2b8f9..219b68c20700c 100644
--- a/src/Core/Domain/Alias/Command/UpdateAliasCommand.php
+++ b/src/Core/Domain/Alias/Command/UpdateAliasCommand.php
@@ -46,7 +46,6 @@ public function __construct(
         int $aliasId,
         public readonly array $aliases,
         public readonly string $searchTerm,
-        public readonly bool $active = true
     ) {
         $this->aliasId = new AliasId($aliasId);
     }
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
index 7ef48e3c16f21..5f5306d085efd 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
@@ -206,7 +206,6 @@ private function buildUpdateAliasCommand(string $aliasReference, TableNode $tabl
         $aliasId = $this->getSharedStorage()->get($aliasReference);
         $aliases = [];
         $searchTerm = '';
-        $active = true;
 
         if (isset($data['aliases'])) {
             $aliases = PrimitiveUtils::castStringArrayIntoArray($data['aliases']);
@@ -214,10 +213,7 @@ private function buildUpdateAliasCommand(string $aliasReference, TableNode $tabl
         if (isset($data['search'])) {
             $searchTerm = $data['search'];
         }
-        if (isset($data['active'])) {
-            $active = (bool) $data['active'];
-        }
 
-        return new UpdateAliasCommand($aliasId, $aliases, $searchTerm, $active);
+        return new UpdateAliasCommand($aliasId, $aliases, $searchTerm);
     }
 }

From 7234a60344fbe47dc8044e8df86186939432586f Mon Sep 17 00:00:00 2001
From: Fabien Papet <fabien.papet@gmail.com>
Date: Wed, 14 Jun 2023 16:33:15 +0200
Subject: [PATCH 0104/1030] Fix clear filter options on missing category

Signed-off-by: Fabien Papet <fabien.papet@gmail.com>
---
 .../Grid/Definition/Factory/ProductGridDefinitionFactory.php    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Core/Grid/Definition/Factory/ProductGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/ProductGridDefinitionFactory.php
index ff591db024b16..69ab3f124d367 100644
--- a/src/Core/Grid/Definition/Factory/ProductGridDefinitionFactory.php
+++ b/src/Core/Grid/Definition/Factory/ProductGridDefinitionFactory.php
@@ -52,6 +52,7 @@
 use PrestaShop\PrestaShop\Core\Grid\Column\Type\Product\ShopListColumn;
 use PrestaShop\PrestaShop\Core\Grid\Filter\Filter;
 use PrestaShop\PrestaShop\Core\Grid\Filter\FilterCollection;
+use PrestaShop\PrestaShop\Core\Grid\Filter\HiddenFilter;
 use PrestaShop\PrestaShop\Core\Hook\HookDispatcherInterface;
 use PrestaShop\PrestaShop\Core\Shop\ShopConstraintContextInterface;
 use PrestaShopBundle\Form\Admin\Type\IntegerMinMaxFilterType;
@@ -524,6 +525,7 @@ protected function getSingleMultiShopsRowActions(): RowActionCollection
     protected function getFilters()
     {
         $filters = (new FilterCollection())
+            ->add(new HiddenFilter('id_category'))
             ->add(
                 (new Filter('id_product', IntegerMinMaxFilterType::class))
                     ->setTypeOptions([

From d87df32b7dfa5f4d7d229d48269c177e11137210 Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Mon, 22 May 2023 17:57:50 +0200
Subject: [PATCH 0105/1030] Remove module list item when force deletion

---
 .../new-theme/js/components/module-card.ts    | 13 +++--
 .../new-theme/js/pages/module/controller.js   |  6 +++
 .../Module/AdminModuleDataProvider.php        |  4 +-
 src/Adapter/Module/Module.php                 |  5 ++
 .../Admin/Improve/ModuleController.php        | 53 ++++++++++---------
 5 files changed, 52 insertions(+), 29 deletions(-)

diff --git a/admin-dev/themes/new-theme/js/components/module-card.ts b/admin-dev/themes/new-theme/js/components/module-card.ts
index 2995d3f1890c3..6ddac4b0370d3 100644
--- a/admin-dev/themes/new-theme/js/components/module-card.ts
+++ b/admin-dev/themes/new-theme/js/components/module-card.ts
@@ -429,12 +429,19 @@ export default class ModuleCard {
         const alteredSelector = self.getModuleItemSelector().replace('.', '');
         let mainElement = null;
 
-        if (action === 'uninstall') {
+        if (action === 'delete' && !result[moduleTechName].has_download_url) {
+          mainElement = jqElementObj.closest(`.${alteredSelector}`);
+          this.eventEmitter.emit('Module Delete', mainElement);
+        } else if (action === 'uninstall') {
           mainElement = jqElementObj.closest(`.${alteredSelector}`);
           mainElement.attr('data-installed', '0');
           mainElement.attr('data-active', '0');
 
-          this.eventEmitter.emit('Module Uninstalled', mainElement);
+          if ((forceDeletion === 'true' || forceDeletion === true) && !result[moduleTechName].has_download_url) {
+            this.eventEmitter.emit('Module Delete', mainElement);
+          } else {
+            this.eventEmitter.emit('Module Uninstalled', mainElement);
+          }
         } else if (action === 'disable') {
           mainElement = jqElementObj.closest(`.${alteredSelector}`);
           mainElement.addClass(`${alteredSelector}-isNotActive`);
@@ -458,7 +465,7 @@ export default class ModuleCard {
           mainElement = jqElementObj.closest(`.${alteredSelector}`);
 
           this.eventEmitter.emit('Module Upgraded', mainElement);
-        };
+        }
 
         // Since we replace the DOM content
         // we need to update the jquery object reference to target the new content,
diff --git a/admin-dev/themes/new-theme/js/pages/module/controller.js b/admin-dev/themes/new-theme/js/pages/module/controller.js
index 9ed456037d078..374101992f1c3 100644
--- a/admin-dev/themes/new-theme/js/pages/module/controller.js
+++ b/admin-dev/themes/new-theme/js/pages/module/controller.js
@@ -225,6 +225,7 @@ class AdminModuleController {
     this.eventEmitter.on('Module Enabled', (context) => this.onModuleDisabled(context));
     this.eventEmitter.on('Module Disabled', (context) => this.onModuleDisabled(context));
     this.eventEmitter.on('Module Uninstalled', (context) => this.installHandler(context));
+    this.eventEmitter.on('Module Delete', (context) => this.onModuleDelete(context));
     this.eventEmitter.on('Module Installed', (context) => this.installHandler(context));
   }
 
@@ -276,6 +277,11 @@ class AdminModuleController {
     });
   }
 
+  onModuleDelete(event) {
+    this.modulesList = this.modulesList.filter((value) => value.techName !== $(event).data('tech-name'));
+    this.installHandler(event);
+  }
+
   initPlaceholderMechanism() {
     const self = this;
 
diff --git a/src/Adapter/Module/AdminModuleDataProvider.php b/src/Adapter/Module/AdminModuleDataProvider.php
index 9549feb648c00..c17eaa113e7b9 100644
--- a/src/Adapter/Module/AdminModuleDataProvider.php
+++ b/src/Adapter/Module/AdminModuleDataProvider.php
@@ -269,11 +269,13 @@ public function setActionUrls(ModuleCollection $modules, ?string $specific_actio
                 if (!$module->isConfigurable()) {
                     unset($urls['configure']);
                 }
-            } else {
+            } elseif ($module->isUninstalled()) {
                 $urls = [
                     'install' => $urls['install'],
                     'delete' => $urls['delete'],
                 ];
+            } else {
+                $urls = ['install' => $urls['install']];
             }
 
             // Go through the actions and remove all actions that the current environment
diff --git a/src/Adapter/Module/Module.php b/src/Adapter/Module/Module.php
index de0afb51c928b..ec4217c748ce3 100644
--- a/src/Adapter/Module/Module.php
+++ b/src/Adapter/Module/Module.php
@@ -240,6 +240,11 @@ public function isInstalled(): bool
         return (bool) $this->database->get('installed');
     }
 
+    public function isUninstalled(): bool
+    {
+        return !$this->isInstalled() && $this->disk->get('is_present');
+    }
+
     public function isConfigurable(): bool
     {
         return (bool) $this->attributes->get('is_configurable');
diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/ModuleController.php b/src/PrestaShopBundle/Controller/Admin/Improve/ModuleController.php
index 5629506e0bb0c..26570e3125896 100644
--- a/src/PrestaShopBundle/Controller/Admin/Improve/ModuleController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Improve/ModuleController.php
@@ -30,6 +30,7 @@
 use Db;
 use Exception;
 use PrestaShop\PrestaShop\Adapter\Module\AdminModuleDataProvider;
+use PrestaShop\PrestaShop\Adapter\Module\Module;
 use PrestaShop\PrestaShop\Adapter\Module\Module as ModuleAdapter;
 use PrestaShop\PrestaShop\Core\Module\ModuleCollection;
 use PrestaShop\PrestaShop\Core\Module\SourceHandler\SourceHandlerNotFoundException;
@@ -194,33 +195,36 @@ public function moduleAction(Request $request)
             return $this->getDisabledFunctionalityResponse($request);
         }
 
-        $module = $request->get('module_name');
+        $moduleName = $request->get('module_name');
         $source = $request->query->get('source');
         $moduleManager = $this->container->get('prestashop.module.manager');
         $moduleRepository = $this->container->get('prestashop.core.admin.module.repository');
         $modulesProvider = $this->container->get('prestashop.core.admin.data_provider.module_interface');
-        $response = [$module => []];
+        $response = [$moduleName => []];
 
         if (!method_exists($moduleManager, $action)) {
-            $response[$module]['status'] = false;
-            $response[$module]['msg'] = $this->trans('Invalid action', 'Admin.Notifications.Error');
+            $response[$moduleName]['status'] = false;
+            $response[$moduleName]['msg'] = $this->trans('Invalid action', 'Admin.Notifications.Error');
 
             return new JsonResponse($response);
         }
 
         $actionTitle = AdminModuleDataProvider::ACTIONS_TRANSLATION_LABELS[$action];
-
         try {
-            $args = [$module];
+            $args = [$moduleName];
             if ($source !== null) {
                 $args[] = $source;
             }
             if ($action === ModuleAdapter::ACTION_UNINSTALL) {
                 $args[] = (bool) ($request->request->get('actionParams', [])['deletion'] ?? false);
-                $response[$module]['refresh_needed'] = $this->moduleNeedsReload($moduleRepository->getModule($module));
+                $moduleInstance = $moduleRepository->getModule($moduleName);
+                $response[$moduleName]['refresh_needed'] = $this->moduleNeedsReload($moduleInstance);
+                $response[$moduleName]['has_download_url'] = $moduleInstance->attributes->has('download_url');
             }
             if ($action === ModuleAdapter::ACTION_DELETE) {
-                $response[$module]['refresh_needed'] = false;
+                $moduleInstance = $moduleRepository->getModule($moduleName);
+                $response[$moduleName]['refresh_needed'] = false;
+                $response[$moduleName]['has_download_url'] = $moduleInstance->attributes->has('download_url');
             }
             $systemCacheClearEnabled = filter_var(
                 $request->request->get('actionParams', [])['cacheClearEnabled'] ?? true,
@@ -229,15 +233,15 @@ public function moduleAction(Request $request)
             if (!$systemCacheClearEnabled) {
                 $moduleManager->disableSystemClearCache();
             }
-            $response[$module]['status'] = call_user_func([$moduleManager, $action], ...$args);
+            $response[$moduleName]['status'] = call_user_func([$moduleManager, $action], ...$args);
         } catch (Exception $e) {
-            $response[$module]['status'] = false;
-            $response[$module]['msg'] = $this->trans(
+            $response[$moduleName]['status'] = false;
+            $response[$moduleName]['msg'] = $this->trans(
                 'Cannot %action% module %module%. %error_details%',
                 'Admin.Modules.Notification',
                 [
                     '%action%' => $actionTitle,
-                    '%module%' => $module,
+                    '%module%' => $moduleName,
                     '%error_details%' => $e->getMessage(),
                 ]
             );
@@ -245,22 +249,22 @@ public function moduleAction(Request $request)
             return new JsonResponse($response);
         }
 
-        $moduleInstance = $moduleRepository->getModule($module);
-        if ($response[$module]['status'] === true) {
-            if (!isset($response[$module]['refresh_needed'])) {
-                $response[$module]['refresh_needed'] = $this->moduleNeedsReload($moduleInstance);
+        $moduleInstance = $moduleRepository->getModule($moduleName);
+        if ($response[$moduleName]['status'] === true) {
+            if (!isset($response[$moduleName]['refresh_needed'])) {
+                $response[$moduleName]['refresh_needed'] = $this->moduleNeedsReload($moduleInstance);
             }
-            $response[$module]['msg'] = $this->trans(
+            $response[$moduleName]['msg'] = $this->trans(
                 '%action% action on module %module% succeeded.',
                 'Admin.Modules.Notification',
                 [
                     '%action%' => ucfirst($actionTitle),
-                    '%module%' => $module,
+                    '%module%' => $moduleName,
                 ]
             );
             if ($action !== 'uninstall' && $action !== 'delete') {
-                $response[$module]['module_name'] = $module;
-                $response[$module]['is_configurable'] = (bool) $moduleInstance->attributes->get('is_configurable');
+                $response[$moduleName]['module_name'] = $moduleName;
+                $response[$moduleName]['is_configurable'] = (bool) $moduleInstance->attributes->get('is_configurable');
             }
 
             $collection = ModuleCollection::createFrom([$moduleInstance]);
@@ -268,8 +272,7 @@ public function moduleAction(Request $request)
 
             $modulePresenter = $this->get('prestashop.adapter.presenter.module');
             $collectionPresented = $modulePresenter->presentCollection($collectionWithActionUrls);
-
-            $response[$module]['action_menu_html'] = $this->container->get('twig')->render(
+            $response[$moduleName]['action_menu_html'] = $this->container->get('twig')->render(
                 '@PrestaShop/Admin/Module/Includes/action_menu.html.twig',
                 [
                     'module' => $collectionPresented[0],
@@ -277,13 +280,13 @@ public function moduleAction(Request $request)
                 ]
             );
         } else {
-            $response[$module]['msg'] = $this->trans(
+            $response[$moduleName]['msg'] = $this->trans(
                 'Cannot %action% module %module%. %error_details%',
                 'Admin.Modules.Notification',
                 [
                     '%action%' => $actionTitle,
-                    '%module%' => $module,
-                    '%error_details%' => $moduleManager->getError($module),
+                    '%module%' => $moduleName,
+                    '%error_details%' => $moduleManager->getError($moduleName),
                 ]
             );
         }

From 237d7ed1a47f3a28fe16f4e3cafd37d0f5cc0753 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Thu, 27 Apr 2023 13:31:43 +0300
Subject: [PATCH 0106/1030]  introduce handler to restrict cart rules

---
 .../RestrictCartRulesHandler.php              | 60 +++++++++++++++
 .../Repository/CartRuleRepository.php         | 73 +++++++++++++++++-
 .../Command/RestrictCartRulesCommand.php      | 74 +++++++++++++++++++
 .../RestrictCartRulesHandlerInterface.php     | 36 +++++++++
 .../config/services/adapter/cart_rule.yml     |  9 +++
 5 files changed, 251 insertions(+), 1 deletion(-)
 create mode 100644 src/Adapter/CartRule/CommandHandler/RestrictCartRulesHandler.php
 create mode 100644 src/Core/Domain/CartRule/Command/RestrictCartRulesCommand.php
 create mode 100644 src/Core/Domain/CartRule/CommandHandler/RestrictCartRulesHandlerInterface.php

diff --git a/src/Adapter/CartRule/CommandHandler/RestrictCartRulesHandler.php b/src/Adapter/CartRule/CommandHandler/RestrictCartRulesHandler.php
new file mode 100644
index 0000000000000..a6d6fead3f03b
--- /dev/null
+++ b/src/Adapter/CartRule/CommandHandler/RestrictCartRulesHandler.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler;
+
+use PrestaShop\PrestaShop\Adapter\CartRule\Repository\CartRuleRepository;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\RestrictCartRulesCommand;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\CommandHandler\RestrictCartRulesHandlerInterface;
+
+class RestrictCartRulesHandler implements RestrictCartRulesHandlerInterface
+{
+    /**
+     * @var CartRuleRepository
+     */
+    private $cartRuleRepository;
+
+    public function __construct(
+        CartRuleRepository $cartRuleRepository
+    ) {
+        $this->cartRuleRepository = $cartRuleRepository;
+    }
+
+    public function handle(RestrictCartRulesCommand $command): void
+    {
+        $cartRule = $this->cartRuleRepository->get($command->getCartRuleId());
+        $this->cartRuleRepository->assertAllCartRulesExists($command->getRestrictedCartRuleIds());
+        $this->cartRuleRepository->restrictCartRules($command->getCartRuleId(), $command->getRestrictedCartRuleIds());
+        $cartRule->cart_rule_restriction = !empty($command->getRestrictedCartRuleIds());
+
+        $this->cartRuleRepository->partialUpdate(
+            $cartRule,
+            ['cart_rule_restriction']
+        );
+    }
+}
diff --git a/src/Adapter/CartRule/Repository/CartRuleRepository.php b/src/Adapter/CartRule/Repository/CartRuleRepository.php
index ebf55adc99a8e..f3a38de68db39 100644
--- a/src/Adapter/CartRule/Repository/CartRuleRepository.php
+++ b/src/Adapter/CartRule/Repository/CartRuleRepository.php
@@ -28,6 +28,7 @@
 namespace PrestaShop\PrestaShop\Adapter\CartRule\Repository;
 
 use CartRule;
+use Doctrine\DBAL\Connection;
 use PrestaShop\PrestaShop\Adapter\CartRule\Validate\CartRuleValidator;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CannotAddCartRuleException;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CannotEditCartRuleException;
@@ -41,11 +42,24 @@ class CartRuleRepository extends AbstractObjectModelRepository
      * @var CartRuleValidator
      */
     private $cartRuleValidator;
+    /**
+     * @var Connection
+     */
+    private $connection;
+
+    /**
+     * @var string
+     */
+    private $dbPrefix;
 
     public function __construct(
-        CartRuleValidator $cartRuleValidator
+        CartRuleValidator $cartRuleValidator,
+        Connection $connection,
+        string $dbPrefix
     ) {
         $this->cartRuleValidator = $cartRuleValidator;
+        $this->connection = $connection;
+        $this->dbPrefix = $dbPrefix;
     }
 
     public function add(CartRule $cartRule): CartRule
@@ -56,6 +70,26 @@ public function add(CartRule $cartRule): CartRule
         return $cartRule;
     }
 
+    public function assertAllCartRulesExists(array $cartRuleIds): void
+    {
+        $cartRuleIdsClause = implode(',', array_map(static function (CartRuleId $cartRuleId): int {
+            return $cartRuleId->getValue();
+        }, $cartRuleIds));
+
+        $countResult = $this->connection->createQueryBuilder()
+            ->select('COUNT(id_cart_rule) AS cart_rules_count')
+            ->from($this->dbPrefix . 'cart_rule')
+            ->where('id_cart_rule IN (:cartRuleIds)')
+            ->setParameter('cartRuleIds', $cartRuleIdsClause)
+            ->execute()
+            ->fetchAssociative()
+        ;
+
+        if (!isset($countResult['cart_rules_count']) || count($cartRuleIds) !== (int) $countResult['cart_rules_count']) {
+            throw new CartRuleNotFoundException('Failed to assert that all provided cart rules exists');
+        }
+    }
+
     public function get(CartRuleId $cartRuleId): CartRule
     {
         /** @var CartRule $cartRule */
@@ -83,4 +117,41 @@ public function partialUpdate(CartRule $cartRule, array $propertiesToUpdate, int
             $errorCode
         );
     }
+
+    /**
+     * @param CartRuleId $cartRuleId
+     * @param CartRuleId[] $restrictedCartRuleIds
+     *
+     * @return void
+     */
+    public function restrictCartRules(CartRuleId $cartRuleId, array $restrictedCartRuleIds): void
+    {
+        if (empty($restrictedCartRuleIds)) {
+            return;
+        }
+
+        $insertValues = [];
+        foreach ($restrictedCartRuleIds as $restrictedCartRuleId) {
+            $insertValues[] = sprintf('(%d,%d)', $cartRuleId->getValue(), $restrictedCartRuleId->getValue());
+        }
+
+        $this->removeRestrictedCartRules($cartRuleId);
+        $this->connection->executeStatement(
+            sprintf(
+                'INSERT INTO %s (`id_cart_rule_1`, `id_cart_rule_2`) VALUES %s',
+                $this->dbPrefix . 'cart_rule_combination',
+                implode(',', $insertValues)
+            )
+        );
+    }
+
+    private function removeRestrictedCartRules(CartRuleId $cartRuleId): void
+    {
+        $this->connection->createQueryBuilder()
+            ->delete($this->dbPrefix . 'cart_rule_combination', 'crc')
+            ->where('crc.cart_rule_1 = :cartRuleId OR crc.cart_rule_2 = :cartRuleId')
+            ->setParameter('cartRuleId', $cartRuleId->getValue())
+            ->execute()
+        ;
+    }
 }
diff --git a/src/Core/Domain/CartRule/Command/RestrictCartRulesCommand.php b/src/Core/Domain/CartRule/Command/RestrictCartRulesCommand.php
new file mode 100644
index 0000000000000..dbab915e9c5a6
--- /dev/null
+++ b/src/Core/Domain/CartRule/Command/RestrictCartRulesCommand.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\CartRule\Command;
+
+use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\CartRuleId;
+
+class RestrictCartRulesCommand
+{
+    /**
+     * @var CartRuleId
+     */
+    private $cartRuleId;
+
+    /**
+     * @var CartRuleId[]
+     */
+    private $restrictedCartRuleIds;
+
+    /**
+     * @param int $cartRuleId
+     * @param int[] $restrictedCartRuleIds
+     */
+    public function __construct(
+        int $cartRuleId,
+        array $restrictedCartRuleIds
+    ) {
+        $this->cartRuleId = new CartRuleId($cartRuleId);
+        $this->restrictedCartRuleIds = array_map(static function (int $cartRuleId): CartRuleId {
+            return new CartRuleId($cartRuleId);
+        }, $restrictedCartRuleIds);
+    }
+
+    /**
+     * @return CartRuleId
+     */
+    public function getCartRuleId(): CartRuleId
+    {
+        return $this->cartRuleId;
+    }
+
+    /**
+     * @return CartRuleId[]
+     */
+    public function getRestrictedCartRuleIds(): array
+    {
+        return $this->restrictedCartRuleIds;
+    }
+}
diff --git a/src/Core/Domain/CartRule/CommandHandler/RestrictCartRulesHandlerInterface.php b/src/Core/Domain/CartRule/CommandHandler/RestrictCartRulesHandlerInterface.php
new file mode 100644
index 0000000000000..393e0e8323ae5
--- /dev/null
+++ b/src/Core/Domain/CartRule/CommandHandler/RestrictCartRulesHandlerInterface.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\CartRule\CommandHandler;
+
+use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\RestrictCartRulesCommand;
+
+interface RestrictCartRulesHandlerInterface
+{
+    public function handle(RestrictCartRulesCommand $command): void;
+}
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml b/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml
index 45b197926a799..e255e95ddf81f 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml
@@ -53,6 +53,9 @@ services:
   PrestaShop\PrestaShop\Adapter\CartRule\Repository\CartRuleRepository:
     autowire: true
     public: false
+    arguments:
+      $connection: '@doctrine.dbal.default_connection'
+      $dbPrefix: '%env(DB_PREFIX)%'
 
   PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler\EditCartRuleHandler:
     autowire: true
@@ -63,3 +66,9 @@ services:
   PrestaShop\PrestaShop\Adapter\CartRule\CartRuleActionFiller:
     autowire: true
     public: false
+
+  PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler\RestrictCartRulesHandler:
+    autowire: true
+    public: false
+    tags:
+      - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\CartRule\Command\RestrictCartRulesCommand }

From 54aac4c4151f9fe0e0b6fb0221cd923d7f284c02 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Fri, 28 Apr 2023 17:50:37 +0300
Subject: [PATCH 0107/1030]  get cartRuleRestriction ids in CartRuleForEditing

---
 .../GetCartRuleForEditingHandler.php          | 17 ++++++++--
 .../Repository/CartRuleRepository.php         | 34 ++++++++++++++++++-
 .../CartRuleRestrictionsForEditing.php        | 14 ++++----
 3 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php b/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php
index 581af44fb3406..ede2bdf9ca94c 100644
--- a/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php
+++ b/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php
@@ -33,6 +33,7 @@
 use PrestaShop\Decimal\DecimalNumber;
 use PrestaShop\PrestaShop\Adapter\CartRule\AbstractCartRuleHandler;
 use PrestaShop\PrestaShop\Adapter\CartRule\LegacyDiscountApplicationType;
+use PrestaShop\PrestaShop\Adapter\CartRule\Repository\CartRuleRepository;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleException;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Query\GetCartRuleForEditing;
@@ -44,6 +45,7 @@
 use PrestaShop\PrestaShop\Core\Domain\CartRule\QueryResult\CartRuleMinimumForEditing;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\QueryResult\CartRuleReductionForEditing;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\QueryResult\CartRuleRestrictionsForEditing;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\CartRuleId;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\DiscountApplicationType;
 use PrestaShop\PrestaShop\Core\Domain\Customer\ValueObject\CustomerId;
 use PrestaShop\PrestaShop\Core\Domain\Customer\ValueObject\NoCustomerId;
@@ -52,8 +54,19 @@
 /**
  * Handles command which gets catalog price rule for editing using legacy object model
  */
-final class GetCartRuleForEditingHandler extends AbstractCartRuleHandler implements GetCartRuleForEditingHandlerInterface
+class GetCartRuleForEditingHandler extends AbstractCartRuleHandler implements GetCartRuleForEditingHandlerInterface
 {
+    /**
+     * @var CartRuleRepository
+     */
+    private $cartRuleRepository;
+
+    public function __construct(
+        CartRuleRepository $cartRuleRepository
+    ) {
+        $this->cartRuleRepository = $cartRuleRepository;
+    }
+
     /**
      * @param GetCartRuleForEditing $query
      *
@@ -119,7 +132,7 @@ private function getCartRuleConditions(CartRule $cartRule): CartRuleConditionsFo
             (bool) $cartRule->country_restriction,
             (bool) $cartRule->carrier_restriction,
             (bool) $cartRule->group_restriction,
-            (bool) $cartRule->cart_rule_restriction,
+            $this->cartRuleRepository->getRestrictedCartRuleIds(new CartRuleId((int) $cartRule->id)),
             (bool) $cartRule->product_restriction,
             (bool) $cartRule->shop_restriction
         );
diff --git a/src/Adapter/CartRule/Repository/CartRuleRepository.php b/src/Adapter/CartRule/Repository/CartRuleRepository.php
index f3a38de68db39..0dc17c5172be5 100644
--- a/src/Adapter/CartRule/Repository/CartRuleRepository.php
+++ b/src/Adapter/CartRule/Repository/CartRuleRepository.php
@@ -118,6 +118,38 @@ public function partialUpdate(CartRule $cartRule, array $propertiesToUpdate, int
         );
     }
 
+    /**
+     * @param CartRuleId $cartRuleId
+     *
+     * @return int[]
+     */
+    public function getRestrictedCartRuleIds(CartRuleId $cartRuleId): array
+    {
+        $cartRuleIdValue = $cartRuleId->getValue();
+        $results = $this->connection->createQueryBuilder()
+            ->select('crc.cart_rule_1')
+            ->from($this->dbPrefix . 'cart_rule_combination', 'crc')
+            ->where('crc.id_cart_rule_1 = :cartRuleId OR crc.id_cart_rule_2 = :cartRuleId')
+            ->setParameter('cartRuleId', $cartRuleIdValue)
+            ->execute()
+            ->fetchAssociative()
+        ;
+
+        if (empty($results)) {
+            return [];
+        }
+
+        $cartRuleIds = [];
+        foreach ($results as $result) {
+            $cartRule1 = (int) $result['id_cart_rule_1'];
+            $cartRule2 = (int) $result['id_cart_rule_2'];
+            // if one column is the id of current cart rule then we append the other column value to array
+            $cartRuleIds[] = $cartRule1 === $cartRuleIdValue ? $cartRule2 : $cartRule1;
+        }
+
+        return $cartRuleIds;
+    }
+
     /**
      * @param CartRuleId $cartRuleId
      * @param CartRuleId[] $restrictedCartRuleIds
@@ -149,7 +181,7 @@ private function removeRestrictedCartRules(CartRuleId $cartRuleId): void
     {
         $this->connection->createQueryBuilder()
             ->delete($this->dbPrefix . 'cart_rule_combination', 'crc')
-            ->where('crc.cart_rule_1 = :cartRuleId OR crc.cart_rule_2 = :cartRuleId')
+            ->where('crc.id_cart_rule_1 = :cartRuleId OR crc.id_cart_rule_2 = :cartRuleId')
             ->setParameter('cartRuleId', $cartRuleId->getValue())
             ->execute()
         ;
diff --git a/src/Core/Domain/CartRule/QueryResult/CartRuleRestrictionsForEditing.php b/src/Core/Domain/CartRule/QueryResult/CartRuleRestrictionsForEditing.php
index 5a85df5284bc1..4b6956db2606e 100644
--- a/src/Core/Domain/CartRule/QueryResult/CartRuleRestrictionsForEditing.php
+++ b/src/Core/Domain/CartRule/QueryResult/CartRuleRestrictionsForEditing.php
@@ -46,9 +46,9 @@ class CartRuleRestrictionsForEditing
     private $groupRestriction;
 
     /**
-     * @var bool
+     * @var int[]
      */
-    private $cartRuleRestriction;
+    private $restrictedCartRuleIds;
 
     /**
      * @var bool
@@ -64,14 +64,14 @@ public function __construct(
         bool $countryRestriction,
         bool $carrierRestriction,
         bool $groupRestriction,
-        bool $cartRuleRestriction,
+        array $restrictedCartRuleIds,
         bool $productRestriction,
         bool $shopRestriction
     ) {
         $this->countryRestriction = $countryRestriction;
         $this->carrierRestriction = $carrierRestriction;
         $this->groupRestriction = $groupRestriction;
-        $this->cartRuleRestriction = $cartRuleRestriction;
+        $this->restrictedCartRuleIds = $restrictedCartRuleIds;
         $this->productRestriction = $productRestriction;
         $this->shopRestriction = $shopRestriction;
     }
@@ -101,11 +101,11 @@ public function isGroupRestriction(): bool
     }
 
     /**
-     * @return bool
+     * @return int[]
      */
-    public function isCartRuleRestriction(): bool
+    public function getRestrictedCartRuleIds(): array
     {
-        return $this->cartRuleRestriction;
+        return $this->restrictedCartRuleIds;
     }
 
     /**

From 2a656a57bf0d2f5a369860915ad4c8aa0d9650b2 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Fri, 28 Apr 2023 18:22:58 +0300
Subject: [PATCH 0108/1030]  add basic assertion for cart rule restrictions

---
 .../GetCartRuleForEditingHandler.php          |   7 +-
 .../Repository/CartRuleRepository.php         |   2 +-
 .../config/services/adapter/cart_rule.yml     |   9 +-
 .../CartRule/EditCartRuleFeatureContext.php   | 202 ++++++++++++++++++
 .../Scenario/CartRule/edit_cart_rule.feature  |  37 ++--
 5 files changed, 233 insertions(+), 24 deletions(-)

diff --git a/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php b/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php
index ede2bdf9ca94c..28e1765ce4f6a 100644
--- a/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php
+++ b/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php
@@ -128,11 +128,16 @@ private function getCartRuleConditions(CartRule $cartRule): CartRuleConditionsFo
             }
         }
 
+        $restrictedCartRules = [];
+        if ($cartRule->cart_rule_restriction) {
+            $restrictedCartRules = $this->cartRuleRepository->getRestrictedCartRuleIds(new CartRuleId((int) $cartRule->id));
+        }
+
         $cartRuleRestrictions = new CartRuleRestrictionsForEditing(
             (bool) $cartRule->country_restriction,
             (bool) $cartRule->carrier_restriction,
             (bool) $cartRule->group_restriction,
-            $this->cartRuleRepository->getRestrictedCartRuleIds(new CartRuleId((int) $cartRule->id)),
+            $restrictedCartRules,
             (bool) $cartRule->product_restriction,
             (bool) $cartRule->shop_restriction
         );
diff --git a/src/Adapter/CartRule/Repository/CartRuleRepository.php b/src/Adapter/CartRule/Repository/CartRuleRepository.php
index 0dc17c5172be5..da6ebf2431118 100644
--- a/src/Adapter/CartRule/Repository/CartRuleRepository.php
+++ b/src/Adapter/CartRule/Repository/CartRuleRepository.php
@@ -127,7 +127,7 @@ public function getRestrictedCartRuleIds(CartRuleId $cartRuleId): array
     {
         $cartRuleIdValue = $cartRuleId->getValue();
         $results = $this->connection->createQueryBuilder()
-            ->select('crc.cart_rule_1')
+            ->select('crc.id_cart_rule_1')
             ->from($this->dbPrefix . 'cart_rule_combination', 'crc')
             ->where('crc.id_cart_rule_1 = :cartRuleId OR crc.id_cart_rule_2 = :cartRuleId')
             ->setParameter('cartRuleId', $cartRuleIdValue)
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml b/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml
index e255e95ddf81f..83be9ee8e0c57 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml
@@ -8,10 +8,9 @@ services:
     tags:
       - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\CartRule\Command\AddCartRuleCommand }
 
-  prestashop.adapter.cart_rule.query_handler.get_cart_rule_for_editing:
-    class: 'PrestaShop\PrestaShop\Adapter\CartRule\QueryHandler\GetCartRuleForEditingHandler'
-    arguments:
-      - '@prestashop.core.image.parser.image_tag_source_parser'
+  PrestaShop\PrestaShop\Adapter\CartRule\QueryHandler\GetCartRuleForEditingHandler:
+    autowire: true
+    public: false
     tags:
       - name: tactician.handler
         command: 'PrestaShop\PrestaShop\Core\Domain\CartRule\Query\GetCartRuleForEditing'
@@ -55,7 +54,7 @@ services:
     public: false
     arguments:
       $connection: '@doctrine.dbal.default_connection'
-      $dbPrefix: '%env(DB_PREFIX)%'
+      $dbPrefix: '%database_prefix%'
 
   PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler\EditCartRuleHandler:
     autowire: true
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
index e3d31c53661d6..61b6108ce14e4 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
@@ -29,10 +29,15 @@
 
 use Behat\Gherkin\Node\TableNode;
 use DateTimeImmutable;
+use PHPUnit\Framework\Assert;
+use PrestaShop\Decimal\DecimalNumber;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\BulkToggleCartRuleStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\EditCartRuleCommand;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\ToggleCartRuleStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleConstraintException;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\Query\GetCartRuleForEditing;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\QueryResult\CartRuleForEditing;
+use PrestaShop\PrestaShop\Core\Util\DateTime\DateTime;
 use Tests\Integration\Behaviour\Features\Context\Util\PrimitiveUtils;
 
 class EditCartRuleFeatureContext extends AbstractCartRuleFeatureContext
@@ -87,6 +92,203 @@ public function editCartRule(string $cartRuleReference, TableNode $tableNode): v
         }
     }
 
+    /**
+     * @Then cart rule :cartRuleReference should have the following properties:
+     *
+     * @param string $cartRuleReference
+     * @param TableNode $tableNode
+     */
+    public function assertCartRuleProperties(string $cartRuleReference, TableNode $tableNode): void
+    {
+        $cartRuleId = $this->getSharedStorage()->get($cartRuleReference);
+
+        /** @var CartRuleForEditing $editableCartRule */
+        $editableCartRule = $this->getQueryBus()->handle(
+            new GetCartRuleForEditing($this->getSharedStorage()->get($cartRuleReference))
+        );
+
+        $data = $this->localizeByRows($tableNode);
+        $information = $editableCartRule->getInformation();
+        $conditions = $editableCartRule->getConditions();
+        $actions = $editableCartRule->getActions();
+
+        if (isset($data['name'])) {
+            Assert::assertSame($data['name'], $information->getLocalizedNames(), 'Unexpected localized name');
+        }
+        if (isset($data['description'])) {
+            Assert::assertSame($data['description'], $information->getDescription(), 'Unexpected description');
+        }
+        if (isset($data['highlight'])) {
+            Assert::assertSame(
+                PrimitiveUtils::castStringBooleanIntoBoolean($data['highlight']),
+                $information->isHighlight(),
+                'Unexpected highlight'
+            );
+        }
+        if (isset($data['allow_partial_use'])) {
+            Assert::assertSame(
+                PrimitiveUtils::castStringBooleanIntoBoolean($data['allow_partial_use']),
+                $information->isPartialUse(),
+                'Unexpected partial use'
+            );
+        }
+        if (isset($data['enabled'])) {
+            Assert::assertSame(
+                PrimitiveUtils::castStringBooleanIntoBoolean($data['enabled']),
+                $information->isEnabled(),
+                'Unexpected enabled property'
+            );
+        }
+        if (isset($data['code'])) {
+            Assert::assertSame($data['code'], $information->getCode(), 'Unexpected code');
+        }
+        if (isset($data['customer'])) {
+            Assert::assertSame(
+                !empty($data['customer']) ? $this->getSharedStorage()->get($data['customer']) : 0,
+                $conditions->getCustomerId()->getValue(),
+                'Unexpected customer id'
+            );
+        }
+        if (isset($data['priority'])) {
+            Assert::assertSame((int) $data['priority'], $information->getPriority(), 'Unexpected priority');
+        }
+        if (isset($data['valid_from'])) {
+            Assert::assertEquals(
+                $data['valid_from'],
+                $conditions->getDateFrom()->format(DateTime::DEFAULT_DATETIME_FORMAT),
+                'Unexpected valid_from'
+            );
+        }
+        if (isset($data['valid_to'])) {
+            Assert::assertEquals(
+                $data['valid_to'],
+                $conditions->getDateTo()->format(DateTime::DEFAULT_DATETIME_FORMAT),
+                'Unexpected valid_to'
+            );
+        }
+        if (isset($data['total quantity'])) {
+            Assert::assertSame((int) $data['total quantity'], $conditions->getQuantity(), 'Unexpected quantity');
+        }
+        if (isset($data['quantity per user'])) {
+            Assert::assertSame((int) $data['quantity per user'], $conditions->getQuantityPerUser(), 'Unexpected quantity per user');
+        }
+
+        if (isset($data['minimum_amount'])) {
+            if (empty($data['minimum_amount'])) {
+                Assert::assertNull($conditions->getMinimum(), 'unexpected minimum_amount');
+            } else {
+                $minimum = $conditions->getMinimum();
+                Assert::assertTrue(
+                    $minimum->getAmount()->equals(new DecimalNumber($data['minimum_amount'])),
+                    'Unexpected minimum_amount'
+                );
+
+                Assert::assertSame(
+                    PrimitiveUtils::castStringBooleanIntoBoolean($data['minimum_amount_tax_included']),
+                    $minimum->isAmountTax(),
+                    'Unexpected minimum_amount_tax_included'
+                );
+
+                Assert::assertSame(
+                    $this->getSharedStorage()->get($data['minimum_amount_currency']),
+                    $minimum->getCurrencyId(),
+                    'Unexpected minimum_amount_currency'
+                );
+
+                Assert::assertSame(
+                    PrimitiveUtils::castStringBooleanIntoBoolean($data['minimum_amount_shipping_included']),
+                    $minimum->isShipping(),
+                    'Unexpected minimum_amount_shipping_included'
+                );
+            }
+        }
+
+        if (isset($data['discount_application_type'])) {
+            $expectedDiscountApplicationType = $data['discount_application_type'];
+            Assert::assertSame(
+                $expectedDiscountApplicationType,
+                $actions->getDiscountApplicationType(),
+                'Unexpected discount_application_type'
+            );
+
+            Assert::assertSame(
+                !empty($data['discount_product']) ? $this->getSharedStorage()->get($data['discount_product']) : null,
+                $actions->getReduction()->getProductId(),
+                'Unexpected discount_product'
+            );
+        }
+
+        if (isset($data['reduction_percentage'])) {
+            Assert::assertTrue(
+                $actions->getReduction()->getPercent()->equals(new DecimalNumber($data['reduction_percentage'])),
+                'Unexpected reduction_percentage'
+            );
+        }
+
+        if (isset($data['reduction_amount'])) {
+            Assert::assertTrue(
+                $actions->getReduction()->getAmount()->equals(new DecimalNumber($data['reduction_amount'])),
+                'Unexpected reduction_amount'
+            );
+        }
+
+        if (isset($data['reduction_currency'])) {
+            if ($data['reduction_currency'] === '') {
+                Assert::assertNull(
+                    $actions->getReduction()->getCurrencyId(),
+                    'Unexpected reduction_currency'
+                );
+            } else {
+                Assert::assertSame(
+                    $this->getSharedStorage()->get($data['reduction_currency']),
+                    $actions->getReduction()->getCurrencyId(),
+                    'Unexpected reduction_currency'
+                );
+            }
+        }
+
+        if (isset($data['reduction_apply_to_discounted_products'])) {
+            Assert::assertSame(
+                PrimitiveUtils::castStringBooleanIntoBoolean($data['reduction_apply_to_discounted_products']),
+                $actions->getReduction()->applyToDiscountedProducts(),
+                'Unexpected reduction_apply_to_discounted_products'
+            );
+        }
+
+        if (isset($data['free_shipping'])) {
+            Assert::assertSame(
+                PrimitiveUtils::castStringBooleanIntoBoolean($data['free_shipping']),
+                $actions->isFreeShipping(),
+                'Unexpected free_shipping'
+            );
+        }
+
+        if (isset($data['gift_product'])) {
+            Assert::assertSame(
+                $this->getSharedStorage()->get($data['gift_product']),
+                $actions->getGiftProductId(),
+                'Unexpected gift_product'
+            );
+        }
+
+        if (isset($data['gift_combination'])) {
+            Assert::assertSame(
+                !empty($data['gift_combination']) ? $this->getSharedStorage()->get($data['gift_combination']) : null,
+                $actions->getGiftCombinationId(),
+                'Unexpected gift_combination'
+            );
+        }
+
+        if (isset($data['restricted cart rules'])) {
+            $expectedRestrictedCartRuleIds = $this->referencesToIds($data['restricted cart rules']);
+            Assert::assertSame(
+                $expectedRestrictedCartRuleIds,
+                $editableCartRule->getConditions()->getRestrictions()->getRestrictedCartRuleIds(),
+                'Unexpected cart rule restrictions'
+            );
+        }
+    }
+
     /**
      * @param EditCartRuleCommand $command
      * @param array<string, mixed> $data
diff --git a/tests/Integration/Behaviour/Features/Scenario/CartRule/edit_cart_rule.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/edit_cart_rule.feature
index f48ebd2f2cce5..6814a8ba5aaa5 100644
--- a/tests/Integration/Behaviour/Features/Scenario/CartRule/edit_cart_rule.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/edit_cart_rule.feature
@@ -31,20 +31,21 @@ Feature: Add cart rule
       | minimum_amount_tax_included      | false               |
       | minimum_amount_shipping_included | false               |
     And cart rule "cart_rule_1" should have the following properties:
-      | name[en-US]        | cart rule 1         |
-      | highlight          | true                |
-      | is_active          | true                |
-      | allow_partial_use  | true                |
-      | priority           | 1                   |
-      | valid_from         | 2019-01-01 11:05:00 |
-      | valid_to           | 2019-12-01 00:00:00 |
-      | total_quantity     | 11                  |
-      | quantity_per_user  | 3                   |
-      | free_shipping      | true                |
-      | minimum_amount     |                     |
+      | name[en-US]           | cart rule 1         |
+      | highlight             | true                |
+      | is_active             | true                |
+      | allow_partial_use     | true                |
+      | priority              | 1                   |
+      | valid_from            | 2019-01-01 11:05:00 |
+      | valid_to              | 2019-12-01 00:00:00 |
+      | total_quantity        | 11                  |
+      | quantity_per_user     | 3                   |
+      | free_shipping         | true                |
+      | minimum_amount        |                     |
       # when currency is not provided the default one is used
-      | reduction_currency | usd                 |
-      | code               |                     |
+      | reduction_currency    | usd                 |
+      | code                  |                     |
+      | restricted cart rules |                     |
 
   Scenario: I edit cart rule and change various properties
     When I edit cart rule cart_rule_1 with following properties:
@@ -291,16 +292,18 @@ Feature: Add cart rule
       | quantity_per_user | 2                   |
       | free_shipping     | true                |
       | code              | testcode2           |
+    And cart rule cart_rule_2 should have the following properties:
+      | code | testcode2 |
     When I edit cart rule cart_rule_2 with following properties:
-      | code              | testcode1           |
+      | code | testcode1 |
     Then I should get cart rule error about "non unique cart rule code"
     And cart rule cart_rule_2 should have the following properties:
-      | code              | testcode2           |
+      | code | testcode2 |
     # make sure we do not raise error when cart rule is submitted with the same code as it was before
     When I edit cart rule cart_rule_2 with following properties:
-      | code              | testcode2           |
+      | code | testcode2 |
     Then cart rule cart_rule_2 should have the following properties:
-      | code              | testcode2           |
+      | code | testcode2 |
 
   Scenario: Disable cart rule
     When I create cart rule "cart_rule_1" with following properties:

From 90e335ce94c6bac7f96494c640bc4b12a7572ade Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Wed, 3 May 2023 19:16:06 +0300
Subject: [PATCH 0109/1030]  WIP behats for restrictions

---
 .../AbstractPrestaShopFeatureContext.php      |  2 +
 .../Context/CartRuleFeatureContext.php        | 24 +++++
 .../Features/Context/CommonFeatureContext.php |  2 -
 .../Product/UpdateProductFeatureContext.php   |  1 -
 .../Context/LegacyProductFeatureContext.php   | 13 +++
 .../CartRule/cart_rule_restriction.feature    | 96 +++++++++++++++++++
 tests/Integration/Behaviour/behat.yml         |  4 +
 7 files changed, 139 insertions(+), 3 deletions(-)
 create mode 100644 tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/cart_rule_restriction.feature

diff --git a/tests/Integration/Behaviour/Features/Context/AbstractPrestaShopFeatureContext.php b/tests/Integration/Behaviour/Features/Context/AbstractPrestaShopFeatureContext.php
index f4dc95a0f10bc..1df3a85763bf2 100644
--- a/tests/Integration/Behaviour/Features/Context/AbstractPrestaShopFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/AbstractPrestaShopFeatureContext.php
@@ -37,6 +37,8 @@
  */
 abstract class AbstractPrestaShopFeatureContext implements BehatContext
 {
+    use SharedStorageTrait;
+
     public const MODULES_DIRECTORY = __DIR__ . '/../../../../Resources/modules';
 
     protected function checkFixtureExists(array $fixtures, $fixtureName, $fixtureIndex)
diff --git a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
index c7c1093e37403..7c58e9e43e835 100644
--- a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
@@ -37,6 +37,7 @@
 use DateTime;
 use Db;
 use Order;
+use PHPUnit\Framework\Assert;
 
 class CartRuleFeatureContext extends AbstractPrestaShopFeatureContext
 {
@@ -417,6 +418,29 @@ public function someCartRulesExistTodayForCustomerWithId($customerId)
         }
     }
 
+    /**
+     * @Then cart rule referenced as :cartRuleReference can be applied to my cart
+     */
+    public function assertCartRuleByReferenceCanBeAppliedToCart(string $cartRuleReference)
+    {
+        $cartRule = new CartRule($this->getSharedStorage()->get($cartRuleReference));
+
+        Assert::assertTrue(
+            $cartRule->checkValidity(Context::getContext(), false, false),
+            sprintf('Cart rule referenced as "%s" cannot be applied to cart', $cartRuleReference)
+        );
+    }
+
+    /**
+     * @When I apply the discount code :cartRuleCode to my cart
+     *
+     * @param string $cartRuleCode
+     */
+    public function addCartRuleByCodeToCurrentCart(string $cartRuleCode): void
+    {
+        $this->getCurrentCart()->addCartRule($this->getSharedStorage()->get($cartRuleCode));
+    }
+
     /**
      * @When /^cart rule count in my cart should be (\d+)$/
      */
diff --git a/tests/Integration/Behaviour/Features/Context/CommonFeatureContext.php b/tests/Integration/Behaviour/Features/Context/CommonFeatureContext.php
index 674c768ddebf6..575ba70c75c7f 100644
--- a/tests/Integration/Behaviour/Features/Context/CommonFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/CommonFeatureContext.php
@@ -131,8 +131,6 @@
 
 class CommonFeatureContext extends AbstractPrestaShopFeatureContext
 {
-    use SharedStorageTrait;
-
     /**
      * Shared storage key for last thrown exception
      */
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/Product/UpdateProductFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/Product/UpdateProductFeatureContext.php
index a17db69f9edc6..6505c7bb91d49 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/Product/UpdateProductFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/Product/UpdateProductFeatureContext.php
@@ -37,7 +37,6 @@
 use PrestaShop\PrestaShop\Core\Domain\Product\Exception\ProductException;
 use PrestaShop\PrestaShop\Core\Domain\Product\ValueObject\DeliveryTimeNoteType;
 use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopConstraint;
-use Product;
 use RuntimeException;
 use Tests\Integration\Behaviour\Features\Context\Domain\TaxRulesGroupFeatureContext;
 use Tests\Integration\Behaviour\Features\Context\Util\PrimitiveUtils;
diff --git a/tests/Integration/Behaviour/Features/Context/LegacyProductFeatureContext.php b/tests/Integration/Behaviour/Features/Context/LegacyProductFeatureContext.php
index 4a2a225a3b9dd..2235804f82aaf 100644
--- a/tests/Integration/Behaviour/Features/Context/LegacyProductFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/LegacyProductFeatureContext.php
@@ -161,6 +161,19 @@ public function iAddProductNamedInMyCartWithQuantity($productQuantity, $productN
         }
     }
 
+    /**
+     * @When I add the following products to my cart:
+     */
+    public function addProductsToCart(TableNode $tableNode): void
+    {
+        foreach ($tableNode->getColumnsHash() as $productRow) {
+            $this->getCurrentCart()->updateQty(
+                (int) $productRow['quantity'],
+                $this->getSharedStorage()->get($productRow['id reference'])
+            );
+        }
+    }
+
     /**
      * @When /^I change quantity of product "(.+)" in my cart with quantity (\d+) and operator (up|down|nothing), result of change is (OK|KO)$/
      */
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/cart_rule_restriction.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/cart_rule_restriction.feature
new file mode 100644
index 0000000000000..4b5e907998f83
--- /dev/null
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/cart_rule_restriction.feature
@@ -0,0 +1,96 @@
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags cart-rule-restriction
+@restore-all-tables-before-feature
+@restore-cart-rules-before-scenario
+@cart-rule-restriction
+Feature: Cart rule combinations restrictions are applied correctly in cart
+  PrestaShop allows BO users to restrict usages of certain cart rule combinations
+  As a BO user
+  I must be able to restrict cart rules to avoid applying them together in cart
+
+  Background:
+    Given shop "shop1" with name "test_shop" exists
+    And there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
+    And there is a currency named "chf" with iso code "CHF" and exchange rate of 1.25
+    And currency "usd" is the default one
+    And language with iso code "en" is the default one
+    And there is a zone named "zone1"
+    And there is a country named "country1" and iso code "FR" in zone "zone1"
+    And there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
+    And there is an address named "address1" with postcode "1" in state "state1"
+    And there is a carrier named "carrier1"
+    And carrier "carrier1" applies shipping fees of 5.0 in zone "zone1" for price between 0 and 150
+    And I add product "product1" with following information:
+      | name[en-US] | magic staff |
+      | type        | standard    |
+    And I update product "product1" with following values:
+      | price | 100 |
+    And I update product "product1" stock with following information:
+      | delta_quantity | 100 |
+    And product product1 should have following prices information:
+      | price              | 100 |
+    And I create cart rule "rule_free_shipping_1" with following properties:
+      | name[en-US]       | free shipping 1     |
+      | is_active         | true                |
+      | allow_partial_use | false               |
+      | priority          | 1                   |
+      | valid_from        | 2022-01-01 11:00:00 |
+      | valid_to          | 3001-01-01 12:00:00 |
+      | total_quantity    | 10                  |
+      | quantity_per_user | 10                  |
+      | free_shipping     | true                |
+      | code              | TEST_RESTRICTION_1  |
+    And I create cart rule "rule_50_percent" with following properties:
+      | name[en-US]                            | Half the price      |
+      | is_active                              | true                |
+      | allow_partial_use                      | true                |
+      | priority                               | 2                   |
+      | valid_from                             | 2022-01-01 11:00:00 |
+      | valid_to                               | 3001-01-01 12:00:00 |
+      | total_quantity                         | 10                  |
+      | quantity_per_user                      | 12                  |
+      | free_shipping                          | false               |
+      | code                                   | TEST_RESTRICTION_2  |
+      | reduction_percentage                   | 50                  |
+      | reduction_apply_to_discounted_products | false               |
+    And cart rule "rule_free_shipping_1" should have the following properties:
+      | is_active             | true                |
+      | free_shipping         | true                |
+      | priority              | 1                   |
+      | valid_from            | 2022-01-01 11:00:00 |
+      | valid_to              | 3001-01-01 12:00:00 |
+      | code                  | TEST_RESTRICTION_1  |
+      | restricted cart rules |                     |
+    And cart rule "rule_50_percent" should have the following properties:
+      | is_active                              | true                   |
+      | priority                               | 2                      |
+      | valid_from                             | 2022-01-01 11:00:00    |
+      | valid_to                               | 3001-01-01 12:00:00    |
+      | free_shipping                          | false                  |
+      | code                                   | TEST_RESTRICTION_2     |
+      | reduction_percentage                   | 50                     |
+      | reduction_apply_to_discounted_products | false                  |
+      | discount_application_type              | order_without_shipping |
+      | restricted cart rules                  |                        |
+
+  Scenario: 1 product in cart, cart rules are inserted correctly
+    Given I have an empty default cart
+    And shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
+    And I select address "address1" in my cart
+    And I add the following products to my cart:
+      | id reference | quantity |
+      | product1     | 1        |
+    And I should have 1 different products in my cart
+    #@todo: need to assert taxes
+    And my cart total should be 100.0 tax excluded
+    And cart shipping fees should be 0.0
+    And cart rule referenced as "rule_free_shipping_1" can be applied to my cart
+    And cart rule referenced as "rule_50_percent" can be applied to my cart
+    When I apply the discount code "TEST_RESTRICTION_1" to my cart
+    Then my cart total should be 100.0 tax excluded
+    And cart rule referenced as "rule_50_percent" can be applied to my cart
+#    When I edit cart rule rule_free_shipping_1 with following properties:
+
+#    When I use the discount "cartrule1"
+#    Then cart rule "cartrule2" can be applied to my cart
+#    When I use the discount "cartrule2"
+#    When at least one cart rule applies today for customer with id 0
diff --git a/tests/Integration/Behaviour/behat.yml b/tests/Integration/Behaviour/behat.yml
index 64d2ae80a1819..a9c36b0f7b40c 100644
--- a/tests/Integration/Behaviour/behat.yml
+++ b/tests/Integration/Behaviour/behat.yml
@@ -127,6 +127,10 @@ default:
                 - Tests\Integration\Behaviour\Features\Transform\CurrencyTransformContext
                 - Tests\Integration\Behaviour\Features\Transform\SharedStorageTransformContext
                 - Tests\Integration\Behaviour\Features\Transform\StringToBoolTransformContext
+                - Tests\Integration\Behaviour\Features\Context\Domain\Product\AddProductFeatureContext
+                - Tests\Integration\Behaviour\Features\Context\Domain\Product\PricesAssertionFeatureContext
+                - Tests\Integration\Behaviour\Features\Context\Domain\Product\UpdateProductFeatureContext
+                - Tests\Integration\Behaviour\Features\Context\Domain\Product\UpdateStockFeatureContext
         language:
             paths:
                 - "%paths.base%/Features/Scenario/Language"

From f3e1c2bb90bc4cd7918e500b77652cca9846e197 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Thu, 4 May 2023 18:09:27 +0300
Subject: [PATCH 0110/1030]  add scenarios and lots of todo reminder explaining
 issuesg

---
 .../RestrictCartRulesHandler.php              |  21 +++-
 .../Repository/CartRuleRepository.php         |   4 +-
 .../Context/CartRuleFeatureContext.php        |  14 ++-
 .../CartRule/EditCartRuleFeatureContext.php   |  26 ++++-
 .../CartRule/cart_rule_restriction.feature    | 105 +++++++++++++-----
 .../StringToBoolTransformContext.php          |   4 +-
 6 files changed, 135 insertions(+), 39 deletions(-)

diff --git a/src/Adapter/CartRule/CommandHandler/RestrictCartRulesHandler.php b/src/Adapter/CartRule/CommandHandler/RestrictCartRulesHandler.php
index a6d6fead3f03b..9d3cd294683ba 100644
--- a/src/Adapter/CartRule/CommandHandler/RestrictCartRulesHandler.php
+++ b/src/Adapter/CartRule/CommandHandler/RestrictCartRulesHandler.php
@@ -31,6 +31,8 @@
 use PrestaShop\PrestaShop\Adapter\CartRule\Repository\CartRuleRepository;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\RestrictCartRulesCommand;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\CommandHandler\RestrictCartRulesHandlerInterface;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\CartRuleId;
+use CartRule;
 
 class RestrictCartRulesHandler implements RestrictCartRulesHandlerInterface
 {
@@ -47,11 +49,24 @@ public function __construct(
 
     public function handle(RestrictCartRulesCommand $command): void
     {
-        $cartRule = $this->cartRuleRepository->get($command->getCartRuleId());
+        $cartRuleId = $command->getCartRuleId();
+        $cartRule = $this->cartRuleRepository->get($cartRuleId);
         $this->cartRuleRepository->assertAllCartRulesExists($command->getRestrictedCartRuleIds());
-        $this->cartRuleRepository->restrictCartRules($command->getCartRuleId(), $command->getRestrictedCartRuleIds());
-        $cartRule->cart_rule_restriction = !empty($command->getRestrictedCartRuleIds());
+        $this->cartRuleRepository->restrictCartRules($cartRuleId, $command->getRestrictedCartRuleIds());
+        $hasRestrictions = !empty($command->getRestrictedCartRuleIds());
 
+        $this->updateRestrictionProperty($cartRule, $hasRestrictions);
+
+        // update cart_rule_restriction property for all the cart rules that have been affected
+        foreach ($this->cartRuleRepository->getRestrictedCartRuleIds($cartRuleId) as $restrictedCartRuleId) {
+            $affectedCartRule = $this->cartRuleRepository->get(new CartRuleId($restrictedCartRuleId));
+            $this->updateRestrictionProperty($affectedCartRule, $hasRestrictions);
+        }
+    }
+
+    private function updateRestrictionProperty(CartRule $cartRule, bool $hasRestrictions): void
+    {
+        $cartRule->cart_rule_restriction = $hasRestrictions;
         $this->cartRuleRepository->partialUpdate(
             $cartRule,
             ['cart_rule_restriction']
diff --git a/src/Adapter/CartRule/Repository/CartRuleRepository.php b/src/Adapter/CartRule/Repository/CartRuleRepository.php
index da6ebf2431118..75dd17334d20b 100644
--- a/src/Adapter/CartRule/Repository/CartRuleRepository.php
+++ b/src/Adapter/CartRule/Repository/CartRuleRepository.php
@@ -127,12 +127,12 @@ public function getRestrictedCartRuleIds(CartRuleId $cartRuleId): array
     {
         $cartRuleIdValue = $cartRuleId->getValue();
         $results = $this->connection->createQueryBuilder()
-            ->select('crc.id_cart_rule_1')
+            ->select('crc.id_cart_rule_1, crc.id_cart_rule_2')
             ->from($this->dbPrefix . 'cart_rule_combination', 'crc')
             ->where('crc.id_cart_rule_1 = :cartRuleId OR crc.id_cart_rule_2 = :cartRuleId')
             ->setParameter('cartRuleId', $cartRuleIdValue)
             ->execute()
-            ->fetchAssociative()
+            ->fetchAllAssociative()
         ;
 
         if (empty($results)) {
diff --git a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
index 7c58e9e43e835..02703cbe87791 100644
--- a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
@@ -419,15 +419,21 @@ public function someCartRulesExistTodayForCustomerWithId($customerId)
     }
 
     /**
-     * @Then cart rule referenced as :cartRuleReference can be applied to my cart
+     * @Then /^cart rule referenced as "(.+)" (can|cannot) be applied to my cart$/
+     *
+     * @param string $cartRuleReference
+     * @param bool $canBeApplied this property is transformed from string to bool automatically
+     *
+     * @see StringToBoolTransformContext
      */
-    public function assertCartRuleByReferenceCanBeAppliedToCart(string $cartRuleReference)
+    public function assertCartRuleByReferenceCanBeAppliedToCart(string $cartRuleReference, bool $canBeApplied)
     {
         $cartRule = new CartRule($this->getSharedStorage()->get($cartRuleReference));
 
-        Assert::assertTrue(
+        Assert::assertSame(
+            $canBeApplied,
             $cartRule->checkValidity(Context::getContext(), false, false),
-            sprintf('Cart rule referenced as "%s" cannot be applied to cart', $cartRuleReference)
+            sprintf('Cart rule referenced as "%s" %s be applied to cart', $cartRuleReference, $canBeApplied ? 'cannot' : 'can')
         );
     }
 
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
index 61b6108ce14e4..1d19253bc7f67 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
@@ -34,6 +34,7 @@
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\BulkToggleCartRuleStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\EditCartRuleCommand;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\ToggleCartRuleStatusCommand;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\RestrictCartRulesCommand;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleConstraintException;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Query\GetCartRuleForEditing;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\QueryResult\CartRuleForEditing;
@@ -100,8 +101,6 @@ public function editCartRule(string $cartRuleReference, TableNode $tableNode): v
      */
     public function assertCartRuleProperties(string $cartRuleReference, TableNode $tableNode): void
     {
-        $cartRuleId = $this->getSharedStorage()->get($cartRuleReference);
-
         /** @var CartRuleForEditing $editableCartRule */
         $editableCartRule = $this->getQueryBus()->handle(
             new GetCartRuleForEditing($this->getSharedStorage()->get($cartRuleReference))
@@ -289,6 +288,29 @@ public function assertCartRuleProperties(string $cartRuleReference, TableNode $t
         }
     }
 
+    /**
+     * @When I restrict following cart rules for cart rule :cartRuleReference:
+     *
+     * @param string $cartRuleReference
+     * @param TableNode $tableNode
+     *
+     * @return void
+     */
+    public function restrictCartRuleCombinations(string $cartRuleReference, TableNode $tableNode): void
+    {
+        $restrictedCartRuleIds = [];
+        foreach ($tableNode->getColumn(0) as $restrictedCartRuleReference) {
+            $restrictedCartRuleIds[] = $this->getSharedStorage()->get($restrictedCartRuleReference);
+        }
+
+        $this->getCommandBus()->handle(
+            new RestrictCartRulesCommand(
+                $this->getSharedStorage()->get($cartRuleReference),
+                $restrictedCartRuleIds
+            )
+        );
+    }
+
     /**
      * @param EditCartRuleCommand $command
      * @param array<string, mixed> $data
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/cart_rule_restriction.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/cart_rule_restriction.feature
index 4b5e907998f83..96569849411da 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/cart_rule_restriction.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/cart_rule_restriction.feature
@@ -27,18 +27,18 @@ Feature: Cart rule combinations restrictions are applied correctly in cart
     And I update product "product1" stock with following information:
       | delta_quantity | 100 |
     And product product1 should have following prices information:
-      | price              | 100 |
+      | price | 100 |
     And I create cart rule "rule_free_shipping_1" with following properties:
-      | name[en-US]       | free shipping 1     |
-      | is_active         | true                |
-      | allow_partial_use | false               |
-      | priority          | 1                   |
-      | valid_from        | 2022-01-01 11:00:00 |
-      | valid_to          | 3001-01-01 12:00:00 |
-      | total_quantity    | 10                  |
-      | quantity_per_user | 10                  |
-      | free_shipping     | true                |
-      | code              | TEST_RESTRICTION_1  |
+      | name[en-US]       | free shipping 1      |
+      | is_active         | true                 |
+      | allow_partial_use | false                |
+      | priority          | 1                    |
+      | valid_from        | 2022-01-01 11:00:00  |
+      | valid_to          | 3001-01-01 12:00:00  |
+      | total_quantity    | 10                   |
+      | quantity_per_user | 10                   |
+      | free_shipping     | true                 |
+      | code              | rule_free_shipping_1 |
     And I create cart rule "rule_50_percent" with following properties:
       | name[en-US]                            | Half the price      |
       | is_active                              | true                |
@@ -49,46 +49,99 @@ Feature: Cart rule combinations restrictions are applied correctly in cart
       | total_quantity                         | 10                  |
       | quantity_per_user                      | 12                  |
       | free_shipping                          | false               |
-      | code                                   | TEST_RESTRICTION_2  |
+      | code                                   | rule_50_percent     |
       | reduction_percentage                   | 50                  |
       | reduction_apply_to_discounted_products | false               |
+    And I create cart rule "rule_70_percent" with following properties:
+      | name[en-US]                            | Half the price      |
+      | is_active                              | true                |
+      | allow_partial_use                      | true                |
+      | priority                               | 3                   |
+      | valid_from                             | 2022-01-01 11:00:00 |
+      | valid_to                               | 3001-01-01 12:00:00 |
+      | total_quantity                         | 10                  |
+      | quantity_per_user                      | 12                  |
+      | free_shipping                          | false               |
+      | code                                   | rule_70_percent     |
+      | reduction_percentage                   | 70                  |
+      | reduction_apply_to_discounted_products | false               |
     And cart rule "rule_free_shipping_1" should have the following properties:
-      | is_active             | true                |
-      | free_shipping         | true                |
-      | priority              | 1                   |
-      | valid_from            | 2022-01-01 11:00:00 |
-      | valid_to              | 3001-01-01 12:00:00 |
-      | code                  | TEST_RESTRICTION_1  |
-      | restricted cart rules |                     |
+      | is_active             | true                 |
+      | free_shipping         | true                 |
+      | priority              | 1                    |
+      | valid_from            | 2022-01-01 11:00:00  |
+      | valid_to              | 3001-01-01 12:00:00  |
+      | code                  | rule_free_shipping_1 |
+      | restricted cart rules |                      |
     And cart rule "rule_50_percent" should have the following properties:
       | is_active                              | true                   |
       | priority                               | 2                      |
       | valid_from                             | 2022-01-01 11:00:00    |
       | valid_to                               | 3001-01-01 12:00:00    |
       | free_shipping                          | false                  |
-      | code                                   | TEST_RESTRICTION_2     |
+      | code                                   | rule_50_percent        |
       | reduction_percentage                   | 50                     |
       | reduction_apply_to_discounted_products | false                  |
       | discount_application_type              | order_without_shipping |
       | restricted cart rules                  |                        |
+    And cart rule "rule_70_percent" should have the following properties:
+      | is_active                              | true                   |
+      | priority                               | 3                      |
+      | valid_from                             | 2022-01-01 11:00:00    |
+      | valid_to                               | 3001-01-01 12:00:00    |
+      | free_shipping                          | false                  |
+      | code                                   | rule_70_percent        |
+      | reduction_percentage                   | 70                     |
+      | reduction_apply_to_discounted_products | false                  |
+      | discount_application_type              | order_without_shipping |
+      | restricted cart rules                  |                        |
 
   Scenario: 1 product in cart, cart rules are inserted correctly
     Given I have an empty default cart
     And shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    And I select address "address1" in my cart
     And I add the following products to my cart:
       | id reference | quantity |
       | product1     | 1        |
     And I should have 1 different products in my cart
-    #@todo: need to assert taxes
-    And my cart total should be 100.0 tax excluded
-    And cart shipping fees should be 0.0
+    And I select address "address1" in my cart
+    And I select carrier "carrier1" in my cart
+    And cart shipping fees should be 7.0
+    And my cart total should be 107.0 tax excluded
     And cart rule referenced as "rule_free_shipping_1" can be applied to my cart
     And cart rule referenced as "rule_50_percent" can be applied to my cart
-    When I apply the discount code "TEST_RESTRICTION_1" to my cart
+    And cart rule referenced as "rule_70_percent" can be applied to my cart
+    When I apply the discount code "rule_free_shipping_1" to my cart
+    # @todo: shipping fees are still 7.0 using the method bellow, because that one explicitly doesn't count free_shipping to avoid some loop,
+    #        but they are well calculated when calculating cart total
+    # Then cart shipping fees should be 0.0
     Then my cart total should be 100.0 tax excluded
     And cart rule referenced as "rule_50_percent" can be applied to my cart
-#    When I edit cart rule rule_free_shipping_1 with following properties:
+    And cart rule referenced as "rule_70_percent" can be applied to my cart
+    # @todo: by current behavior restricted rule = the ones compatible, but we will change the behavior depending on some configuration value,
+    # because it makes sense making all cart rules compatable by default, but only restricted ones would be incompatable.
+    # so the following line for now means that only rule_50_percent should be compatable with rule_free_shipping_1,
+    # therefore the rule_70_percent should not
+    When I restrict following cart rules for cart rule rule_free_shipping_1:
+      | rule_50_percent |
+    Then cart rule "rule_free_shipping_1" should have the following properties:
+      | restricted cart rules | rule_50_percent |
+    And cart rule "rule_50_percent" should have the following properties:
+      | restricted cart rules | rule_free_shipping_1 |
+    And cart rule "rule_70_percent" should have the following properties:
+      | restricted cart rules |  |
+    And cart rule referenced as "rule_50_percent" can be applied to my cart
+    # rule_70_percent can still be applied because it has higher priority so when applied it will replace the other "uncombinable" cart rule that was in cart already
+    # see CartRule L:909
+    # there are couple problems:
+    # 1. checkValidity method removes previous cart rule if its priority lower
+    # 2. checkValidity method is not called when using $cart->addCartRule (which is used when adding cart rule in behat bellow)
+    # for above mentioned reasons, the lines bellow won't pass :D Instead I need to reimplement additional step in a way that it works in FO (validates the cart rule when adding it)
+    And cart rule referenced as "rule_70_percent" can be applied to my cart
+    When I apply the discount code "rule_70_percent" to my cart
+    # this validates that free shipping rule has been replaced by the 70% discount ((100 total + 7 shipping) * 0.3 the 70% discount %)
+    #@todo: it doesn't work for above mentioned reasons now. (it will produce result of 30.0 because both of cart rules are added as the checkValidity is not called)
+    Then my cart total should be 32.1 tax excluded
+
 
 #    When I use the discount "cartrule1"
 #    Then cart rule "cartrule2" can be applied to my cart
diff --git a/tests/Integration/Behaviour/Features/Transform/StringToBoolTransformContext.php b/tests/Integration/Behaviour/Features/Transform/StringToBoolTransformContext.php
index 318f08a8940ec..1e0169a8bb22f 100644
--- a/tests/Integration/Behaviour/Features/Transform/StringToBoolTransformContext.php
+++ b/tests/Integration/Behaviour/Features/Transform/StringToBoolTransformContext.php
@@ -36,7 +36,7 @@
 class StringToBoolTransformContext implements Context
 {
     /**
-     * @Transform /^(enabled|enable|included|should|includes)$/
+     * @Transform /^(enabled|enable|included|should|includes|can)$/
      *
      * @param string $string
      *
@@ -48,7 +48,7 @@ public function transformTruthyStringToBoolean(string $string): bool
     }
 
     /**
-     * @Transform /^(disabled|disable|excluded|should not|excludes)$/
+     * @Transform /^(disabled|disable|excluded|should not|excludes|cannot)$/
      *
      * @param string $string
      *

From 78d4e687706c71b6174a128fd826ce3da79c166a Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Fri, 5 May 2023 13:31:00 +0300
Subject: [PATCH 0111/1030]  move restrictions test to cartRule ns and only
 test BO behavior (not testing FO applciation)

---
 .../RestrictCartRulesHandler.php              |   2 +-
 .../Repository/CartRuleRepository.php         |  14 +-
 .../Command/RestrictCartRulesCommand.php      |  27 +++-
 .../CartRule/EditCartRuleFeatureContext.php   |  16 ++-
 .../set_cart_rule_restrictions.feature}       | 131 ++++++++++--------
 5 files changed, 115 insertions(+), 75 deletions(-)
 rename tests/Integration/Behaviour/Features/Scenario/{Cart/Adding/CartRule/cart_rule_restriction.feature => CartRule/set_cart_rule_restrictions.feature} (53%)

diff --git a/src/Adapter/CartRule/CommandHandler/RestrictCartRulesHandler.php b/src/Adapter/CartRule/CommandHandler/RestrictCartRulesHandler.php
index 9d3cd294683ba..808d399af368b 100644
--- a/src/Adapter/CartRule/CommandHandler/RestrictCartRulesHandler.php
+++ b/src/Adapter/CartRule/CommandHandler/RestrictCartRulesHandler.php
@@ -28,11 +28,11 @@
 
 namespace PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler;
 
+use CartRule;
 use PrestaShop\PrestaShop\Adapter\CartRule\Repository\CartRuleRepository;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\RestrictCartRulesCommand;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\CommandHandler\RestrictCartRulesHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\CartRuleId;
-use CartRule;
 
 class RestrictCartRulesHandler implements RestrictCartRulesHandlerInterface
 {
diff --git a/src/Adapter/CartRule/Repository/CartRuleRepository.php b/src/Adapter/CartRule/Repository/CartRuleRepository.php
index 75dd17334d20b..c8bccbaa98bf0 100644
--- a/src/Adapter/CartRule/Repository/CartRuleRepository.php
+++ b/src/Adapter/CartRule/Repository/CartRuleRepository.php
@@ -72,20 +72,22 @@ public function add(CartRule $cartRule): CartRule
 
     public function assertAllCartRulesExists(array $cartRuleIds): void
     {
-        $cartRuleIdsClause = implode(',', array_map(static function (CartRuleId $cartRuleId): int {
+        $cartRuleIds = array_map(static function (CartRuleId $cartRuleId): int {
             return $cartRuleId->getValue();
-        }, $cartRuleIds));
+        }, $cartRuleIds);
 
-        $countResult = $this->connection->createQueryBuilder()
+        $qb = $this->connection->createQueryBuilder();
+
+        $result = $qb
             ->select('COUNT(id_cart_rule) AS cart_rules_count')
             ->from($this->dbPrefix . 'cart_rule')
-            ->where('id_cart_rule IN (:cartRuleIds)')
-            ->setParameter('cartRuleIds', $cartRuleIdsClause)
+            ->where($qb->expr()->in('id_cart_rule', ':cartRuleIds'))
+            ->setParameter('cartRuleIds', $cartRuleIds, Connection::PARAM_INT_ARRAY)
             ->execute()
             ->fetchAssociative()
         ;
 
-        if (!isset($countResult['cart_rules_count']) || count($cartRuleIds) !== (int) $countResult['cart_rules_count']) {
+        if (!isset($result['cart_rules_count']) || count($cartRuleIds) !== (int) $result['cart_rules_count']) {
             throw new CartRuleNotFoundException('Failed to assert that all provided cart rules exists');
         }
     }
diff --git a/src/Core/Domain/CartRule/Command/RestrictCartRulesCommand.php b/src/Core/Domain/CartRule/Command/RestrictCartRulesCommand.php
index dbab915e9c5a6..3ef91c9a8ffab 100644
--- a/src/Core/Domain/CartRule/Command/RestrictCartRulesCommand.php
+++ b/src/Core/Domain/CartRule/Command/RestrictCartRulesCommand.php
@@ -28,6 +28,7 @@
 
 namespace PrestaShop\PrestaShop\Core\Domain\CartRule\Command;
 
+use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleConstraintException;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\CartRuleId;
 
 class RestrictCartRulesCommand
@@ -51,9 +52,7 @@ public function __construct(
         array $restrictedCartRuleIds
     ) {
         $this->cartRuleId = new CartRuleId($cartRuleId);
-        $this->restrictedCartRuleIds = array_map(static function (int $cartRuleId): CartRuleId {
-            return new CartRuleId($cartRuleId);
-        }, $restrictedCartRuleIds);
+        $this->setRestrictedCartRuleIds($cartRuleId, $restrictedCartRuleIds);
     }
 
     /**
@@ -71,4 +70,26 @@ public function getRestrictedCartRuleIds(): array
     {
         return $this->restrictedCartRuleIds;
     }
+
+    /**
+     * @param int $cartRuleId
+     * @param int[] $restrictedCartRuleIds
+     *
+     * @return void
+     *
+     * @throws CartRuleConstraintException
+     */
+    private function setRestrictedCartRuleIds(int $cartRuleId, array $restrictedCartRuleIds): void
+    {
+        foreach ($restrictedCartRuleIds as $restrictedCartRuleId) {
+            if ($restrictedCartRuleId === $cartRuleId) {
+                throw new CartRuleConstraintException(
+                    'Restricted CartRule ids cannot contain id of current cart rule',
+                    CartRuleConstraintException::INVALID_CART_RULE_RESTRICTION
+                );
+            }
+
+            $this->restrictedCartRuleIds[] = new CartRuleId($restrictedCartRuleId);
+        }
+    }
 }
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
index 1d19253bc7f67..f9f2d387e080d 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
@@ -303,12 +303,16 @@ public function restrictCartRuleCombinations(string $cartRuleReference, TableNod
             $restrictedCartRuleIds[] = $this->getSharedStorage()->get($restrictedCartRuleReference);
         }
 
-        $this->getCommandBus()->handle(
-            new RestrictCartRulesCommand(
-                $this->getSharedStorage()->get($cartRuleReference),
-                $restrictedCartRuleIds
-            )
-        );
+        try {
+            $this->getCommandBus()->handle(
+                new RestrictCartRulesCommand(
+                    $this->getSharedStorage()->get($cartRuleReference),
+                    $restrictedCartRuleIds
+                )
+            );
+        } catch (CartRuleConstraintException $e) {
+            $this->setLastException($e);
+        }
     }
 
     /**
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/cart_rule_restriction.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_cart_rule_restrictions.feature
similarity index 53%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/cart_rule_restriction.feature
rename to tests/Integration/Behaviour/Features/Scenario/CartRule/set_cart_rule_restrictions.feature
index 96569849411da..3e212a05b5948 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/cart_rule_restriction.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_cart_rule_restrictions.feature
@@ -1,11 +1,10 @@
-# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags cart-rule-restriction
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart_rule --tags set-cart-rule-restrictions
 @restore-all-tables-before-feature
-@restore-cart-rules-before-scenario
-@cart-rule-restriction
-Feature: Cart rule combinations restrictions are applied correctly in cart
-  PrestaShop allows BO users to restrict usages of certain cart rule combinations
-  As a BO user
-  I must be able to restrict cart rules to avoid applying them together in cart
+@set-cart-rule-restrictions
+Feature: Set cart rule restrictions in BO
+  PrestaShop allows BO users to add and remove restrictions of cart rule combinations,
+  which defines which cart rules can or cannot be compatible in the same cart
+  As a BO user I must be able to edit cart rules compatibility
 
   Background:
     Given shop "shop1" with name "test_shop" exists
@@ -13,21 +12,6 @@ Feature: Cart rule combinations restrictions are applied correctly in cart
     And there is a currency named "chf" with iso code "CHF" and exchange rate of 1.25
     And currency "usd" is the default one
     And language with iso code "en" is the default one
-    And there is a zone named "zone1"
-    And there is a country named "country1" and iso code "FR" in zone "zone1"
-    And there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
-    And there is an address named "address1" with postcode "1" in state "state1"
-    And there is a carrier named "carrier1"
-    And carrier "carrier1" applies shipping fees of 5.0 in zone "zone1" for price between 0 and 150
-    And I add product "product1" with following information:
-      | name[en-US] | magic staff |
-      | type        | standard    |
-    And I update product "product1" with following values:
-      | price | 100 |
-    And I update product "product1" stock with following information:
-      | delta_quantity | 100 |
-    And product product1 should have following prices information:
-      | price | 100 |
     And I create cart rule "rule_free_shipping_1" with following properties:
       | name[en-US]       | free shipping 1      |
       | is_active         | true                 |
@@ -96,31 +80,7 @@ Feature: Cart rule combinations restrictions are applied correctly in cart
       | discount_application_type              | order_without_shipping |
       | restricted cart rules                  |                        |
 
-  Scenario: 1 product in cart, cart rules are inserted correctly
-    Given I have an empty default cart
-    And shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    And I add the following products to my cart:
-      | id reference | quantity |
-      | product1     | 1        |
-    And I should have 1 different products in my cart
-    And I select address "address1" in my cart
-    And I select carrier "carrier1" in my cart
-    And cart shipping fees should be 7.0
-    And my cart total should be 107.0 tax excluded
-    And cart rule referenced as "rule_free_shipping_1" can be applied to my cart
-    And cart rule referenced as "rule_50_percent" can be applied to my cart
-    And cart rule referenced as "rule_70_percent" can be applied to my cart
-    When I apply the discount code "rule_free_shipping_1" to my cart
-    # @todo: shipping fees are still 7.0 using the method bellow, because that one explicitly doesn't count free_shipping to avoid some loop,
-    #        but they are well calculated when calculating cart total
-    # Then cart shipping fees should be 0.0
-    Then my cart total should be 100.0 tax excluded
-    And cart rule referenced as "rule_50_percent" can be applied to my cart
-    And cart rule referenced as "rule_70_percent" can be applied to my cart
-    # @todo: by current behavior restricted rule = the ones compatible, but we will change the behavior depending on some configuration value,
-    # because it makes sense making all cart rules compatable by default, but only restricted ones would be incompatable.
-    # so the following line for now means that only rule_50_percent should be compatable with rule_free_shipping_1,
-    # therefore the rule_70_percent should not
+  Scenario: Restrict cart rule combinations
     When I restrict following cart rules for cart rule rule_free_shipping_1:
       | rule_50_percent |
     Then cart rule "rule_free_shipping_1" should have the following properties:
@@ -129,20 +89,73 @@ Feature: Cart rule combinations restrictions are applied correctly in cart
       | restricted cart rules | rule_free_shipping_1 |
     And cart rule "rule_70_percent" should have the following properties:
       | restricted cart rules |  |
-    And cart rule referenced as "rule_50_percent" can be applied to my cart
-    # rule_70_percent can still be applied because it has higher priority so when applied it will replace the other "uncombinable" cart rule that was in cart already
-    # see CartRule L:909
-    # there are couple problems:
-    # 1. checkValidity method removes previous cart rule if its priority lower
-    # 2. checkValidity method is not called when using $cart->addCartRule (which is used when adding cart rule in behat bellow)
-    # for above mentioned reasons, the lines bellow won't pass :D Instead I need to reimplement additional step in a way that it works in FO (validates the cart rule when adding it)
-    And cart rule referenced as "rule_70_percent" can be applied to my cart
-    When I apply the discount code "rule_70_percent" to my cart
-    # this validates that free shipping rule has been replaced by the 70% discount ((100 total + 7 shipping) * 0.3 the 70% discount %)
-    #@todo: it doesn't work for above mentioned reasons now. (it will produce result of 30.0 because both of cart rules are added as the checkValidity is not called)
-    Then my cart total should be 32.1 tax excluded
+    When I restrict following cart rules for cart rule rule_free_shipping_1:
+      | rule_50_percent |
+      | rule_70_percent |
+    Then cart rule "rule_free_shipping_1" should have the following properties:
+      | restricted cart rules | rule_50_percent,rule_70_percent |
+    And cart rule "rule_50_percent" should have the following properties:
+      | restricted cart rules | rule_free_shipping_1 |
+    And cart rule "rule_70_percent" should have the following properties:
+      | restricted cart rules | rule_free_shipping_1 |
 
+  @restore-cart-rules-before-scenario
+  Scenario: Restrict cart rule combinations providing the same cart rule that is being edited in the restricted cart rules list
+    Given cart rule "rule_70_percent" should have the following properties:
+      | restricted cart rules |  |
+    When I restrict following cart rules for cart rule rule_70_percent:
+      | rule_50_percent |
+      | rule_70_percent |
+    Then I should get cart rule error about "invalid cart rule restriction"
+    And cart rule "rule_70_percent" should have the following properties:
+      | restricted cart rules |  |
 
+# @todo: to be removed and FO cart rule application will be handled in separate PR because there are too many things to fix now
+#  Scenario: 1 product in cart, cart rules are inserted correctly
+#    And I add the following products to my cart:
+#      | id reference | quantity |
+#      | product1     | 1        |
+#    And I should have 1 different products in my cart
+#    And I select address "address1" in my cart
+#    And I select carrier "carrier1" in my cart
+#    And cart shipping fees should be 7.0
+#    And my cart total should be 107.0 tax excluded
+#    And cart rule referenced as "rule_free_shipping_1" can be applied to my cart
+#    And cart rule referenced as "rule_50_percent" can be applied to my cart
+#    And cart rule referenced as "rule_70_percent" can be applied to my cart
+#    When I apply the discount code "rule_free_shipping_1" to my cart
+#    # @todo: shipping fees are still 7.0 using the method bellow, because that one explicitly doesn't count free_shipping to avoid some loop,
+#    #        but they are well calculated when calculating cart total
+#    # Then cart shipping fees should be 0.0
+#    Then my cart total should be 100.0 tax excluded
+#    And cart rule referenced as "rule_50_percent" can be applied to my cart
+#    And cart rule referenced as "rule_70_percent" can be applied to my cart
+#    # @todo: by current behavior restricted rule = the ones compatible, but we will change the behavior depending on some configuration value,
+#    # because it makes sense making all cart rules compatable by default, but only restricted ones would be incompatable.
+#    # so the following line for now means that only rule_50_percent should be compatable with rule_free_shipping_1,
+#    # therefore the rule_70_percent should not
+#    When I restrict following cart rules for cart rule rule_free_shipping_1:
+#      | rule_50_percent |
+#    Then cart rule "rule_free_shipping_1" should have the following properties:
+#      | restricted cart rules | rule_50_percent |
+#    And cart rule "rule_50_percent" should have the following properties:
+#      | restricted cart rules | rule_free_shipping_1 |
+#    And cart rule "rule_70_percent" should have the following properties:
+#      | restricted cart rules |  |
+#    And cart rule referenced as "rule_50_percent" can be applied to my cart
+#    # rule_70_percent can still be applied because it has higher priority so when applied it will replace the other "uncombinable" cart rule that was in cart already
+#    # see CartRule L:909
+#    # there are couple problems:
+#    # 1. checkValidity method removes previous cart rule if its priority lower
+#    # 2. checkValidity method is not called when using $cart->addCartRule (which is used when adding cart rule in behat bellow)
+#    # for above mentioned reasons, the lines bellow won't pass :D Instead I need to reimplement additional step in a way that it works in FO (validates the cart rule when adding it)
+#    And cart rule referenced as "rule_70_percent" can be applied to my cart
+#    When I apply the discount code "rule_70_percent" to my cart
+#    # this validates that free shipping rule has been replaced by the 70% discount ((100 total + 7 shipping) * 0.3 the 70% discount %)
+#    #@todo: it doesn't work for above mentioned reasons now. (it will produce result of 30.0 because both of cart rules are added as the checkValidity is not called)
+#    Then my cart total should be 32.1 tax excluded
+#
+#
 #    When I use the discount "cartrule1"
 #    Then cart rule "cartrule2" can be applied to my cart
 #    When I use the discount "cartrule2"

From 40bd62f78e97ac9f4aaf73d64a260b5fbc93a532 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Fri, 5 May 2023 13:56:41 +0300
Subject: [PATCH 0112/1030]  remove commented code

---
 .../set_cart_rule_restrictions.feature        | 51 -------------------
 1 file changed, 51 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_cart_rule_restrictions.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_cart_rule_restrictions.feature
index 3e212a05b5948..cb831d535fddf 100644
--- a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_cart_rule_restrictions.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_cart_rule_restrictions.feature
@@ -109,54 +109,3 @@ Feature: Set cart rule restrictions in BO
     Then I should get cart rule error about "invalid cart rule restriction"
     And cart rule "rule_70_percent" should have the following properties:
       | restricted cart rules |  |
-
-# @todo: to be removed and FO cart rule application will be handled in separate PR because there are too many things to fix now
-#  Scenario: 1 product in cart, cart rules are inserted correctly
-#    And I add the following products to my cart:
-#      | id reference | quantity |
-#      | product1     | 1        |
-#    And I should have 1 different products in my cart
-#    And I select address "address1" in my cart
-#    And I select carrier "carrier1" in my cart
-#    And cart shipping fees should be 7.0
-#    And my cart total should be 107.0 tax excluded
-#    And cart rule referenced as "rule_free_shipping_1" can be applied to my cart
-#    And cart rule referenced as "rule_50_percent" can be applied to my cart
-#    And cart rule referenced as "rule_70_percent" can be applied to my cart
-#    When I apply the discount code "rule_free_shipping_1" to my cart
-#    # @todo: shipping fees are still 7.0 using the method bellow, because that one explicitly doesn't count free_shipping to avoid some loop,
-#    #        but they are well calculated when calculating cart total
-#    # Then cart shipping fees should be 0.0
-#    Then my cart total should be 100.0 tax excluded
-#    And cart rule referenced as "rule_50_percent" can be applied to my cart
-#    And cart rule referenced as "rule_70_percent" can be applied to my cart
-#    # @todo: by current behavior restricted rule = the ones compatible, but we will change the behavior depending on some configuration value,
-#    # because it makes sense making all cart rules compatable by default, but only restricted ones would be incompatable.
-#    # so the following line for now means that only rule_50_percent should be compatable with rule_free_shipping_1,
-#    # therefore the rule_70_percent should not
-#    When I restrict following cart rules for cart rule rule_free_shipping_1:
-#      | rule_50_percent |
-#    Then cart rule "rule_free_shipping_1" should have the following properties:
-#      | restricted cart rules | rule_50_percent |
-#    And cart rule "rule_50_percent" should have the following properties:
-#      | restricted cart rules | rule_free_shipping_1 |
-#    And cart rule "rule_70_percent" should have the following properties:
-#      | restricted cart rules |  |
-#    And cart rule referenced as "rule_50_percent" can be applied to my cart
-#    # rule_70_percent can still be applied because it has higher priority so when applied it will replace the other "uncombinable" cart rule that was in cart already
-#    # see CartRule L:909
-#    # there are couple problems:
-#    # 1. checkValidity method removes previous cart rule if its priority lower
-#    # 2. checkValidity method is not called when using $cart->addCartRule (which is used when adding cart rule in behat bellow)
-#    # for above mentioned reasons, the lines bellow won't pass :D Instead I need to reimplement additional step in a way that it works in FO (validates the cart rule when adding it)
-#    And cart rule referenced as "rule_70_percent" can be applied to my cart
-#    When I apply the discount code "rule_70_percent" to my cart
-#    # this validates that free shipping rule has been replaced by the 70% discount ((100 total + 7 shipping) * 0.3 the 70% discount %)
-#    #@todo: it doesn't work for above mentioned reasons now. (it will produce result of 30.0 because both of cart rules are added as the checkValidity is not called)
-#    Then my cart total should be 32.1 tax excluded
-#
-#
-#    When I use the discount "cartrule1"
-#    Then cart rule "cartrule2" can be applied to my cart
-#    When I use the discount "cartrule2"
-#    When at least one cart rule applies today for customer with id 0

From 5e396de7f579e7ddbe920c912ca394e1dd820264 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Fri, 5 May 2023 14:01:06 +0300
Subject: [PATCH 0113/1030]  revert all test changes that was used for FO cart
 rule application testing

---
 .../AbstractPrestaShopFeatureContext.php      |  2 --
 .../Context/CartRuleFeatureContext.php        | 30 -------------------
 .../Features/Context/CommonFeatureContext.php |  2 ++
 .../CartRule/EditCartRuleFeatureContext.php   |  2 +-
 .../Context/LegacyProductFeatureContext.php   | 13 --------
 .../StringToBoolTransformContext.php          |  4 +--
 tests/Integration/Behaviour/behat.yml         |  4 ---
 7 files changed, 5 insertions(+), 52 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Context/AbstractPrestaShopFeatureContext.php b/tests/Integration/Behaviour/Features/Context/AbstractPrestaShopFeatureContext.php
index 1df3a85763bf2..f4dc95a0f10bc 100644
--- a/tests/Integration/Behaviour/Features/Context/AbstractPrestaShopFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/AbstractPrestaShopFeatureContext.php
@@ -37,8 +37,6 @@
  */
 abstract class AbstractPrestaShopFeatureContext implements BehatContext
 {
-    use SharedStorageTrait;
-
     public const MODULES_DIRECTORY = __DIR__ . '/../../../../Resources/modules';
 
     protected function checkFixtureExists(array $fixtures, $fixtureName, $fixtureIndex)
diff --git a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
index 02703cbe87791..c7c1093e37403 100644
--- a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
@@ -37,7 +37,6 @@
 use DateTime;
 use Db;
 use Order;
-use PHPUnit\Framework\Assert;
 
 class CartRuleFeatureContext extends AbstractPrestaShopFeatureContext
 {
@@ -418,35 +417,6 @@ public function someCartRulesExistTodayForCustomerWithId($customerId)
         }
     }
 
-    /**
-     * @Then /^cart rule referenced as "(.+)" (can|cannot) be applied to my cart$/
-     *
-     * @param string $cartRuleReference
-     * @param bool $canBeApplied this property is transformed from string to bool automatically
-     *
-     * @see StringToBoolTransformContext
-     */
-    public function assertCartRuleByReferenceCanBeAppliedToCart(string $cartRuleReference, bool $canBeApplied)
-    {
-        $cartRule = new CartRule($this->getSharedStorage()->get($cartRuleReference));
-
-        Assert::assertSame(
-            $canBeApplied,
-            $cartRule->checkValidity(Context::getContext(), false, false),
-            sprintf('Cart rule referenced as "%s" %s be applied to cart', $cartRuleReference, $canBeApplied ? 'cannot' : 'can')
-        );
-    }
-
-    /**
-     * @When I apply the discount code :cartRuleCode to my cart
-     *
-     * @param string $cartRuleCode
-     */
-    public function addCartRuleByCodeToCurrentCart(string $cartRuleCode): void
-    {
-        $this->getCurrentCart()->addCartRule($this->getSharedStorage()->get($cartRuleCode));
-    }
-
     /**
      * @When /^cart rule count in my cart should be (\d+)$/
      */
diff --git a/tests/Integration/Behaviour/Features/Context/CommonFeatureContext.php b/tests/Integration/Behaviour/Features/Context/CommonFeatureContext.php
index 575ba70c75c7f..674c768ddebf6 100644
--- a/tests/Integration/Behaviour/Features/Context/CommonFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/CommonFeatureContext.php
@@ -131,6 +131,8 @@
 
 class CommonFeatureContext extends AbstractPrestaShopFeatureContext
 {
+    use SharedStorageTrait;
+
     /**
      * Shared storage key for last thrown exception
      */
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
index f9f2d387e080d..d14c9318b58a8 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
@@ -296,7 +296,7 @@ public function assertCartRuleProperties(string $cartRuleReference, TableNode $t
      *
      * @return void
      */
-    public function restrictCartRuleCombinations(string $cartRuleReference, TableNode $tableNode): void
+    public function restrictCartRules(string $cartRuleReference, TableNode $tableNode): void
     {
         $restrictedCartRuleIds = [];
         foreach ($tableNode->getColumn(0) as $restrictedCartRuleReference) {
diff --git a/tests/Integration/Behaviour/Features/Context/LegacyProductFeatureContext.php b/tests/Integration/Behaviour/Features/Context/LegacyProductFeatureContext.php
index 2235804f82aaf..4a2a225a3b9dd 100644
--- a/tests/Integration/Behaviour/Features/Context/LegacyProductFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/LegacyProductFeatureContext.php
@@ -161,19 +161,6 @@ public function iAddProductNamedInMyCartWithQuantity($productQuantity, $productN
         }
     }
 
-    /**
-     * @When I add the following products to my cart:
-     */
-    public function addProductsToCart(TableNode $tableNode): void
-    {
-        foreach ($tableNode->getColumnsHash() as $productRow) {
-            $this->getCurrentCart()->updateQty(
-                (int) $productRow['quantity'],
-                $this->getSharedStorage()->get($productRow['id reference'])
-            );
-        }
-    }
-
     /**
      * @When /^I change quantity of product "(.+)" in my cart with quantity (\d+) and operator (up|down|nothing), result of change is (OK|KO)$/
      */
diff --git a/tests/Integration/Behaviour/Features/Transform/StringToBoolTransformContext.php b/tests/Integration/Behaviour/Features/Transform/StringToBoolTransformContext.php
index 1e0169a8bb22f..318f08a8940ec 100644
--- a/tests/Integration/Behaviour/Features/Transform/StringToBoolTransformContext.php
+++ b/tests/Integration/Behaviour/Features/Transform/StringToBoolTransformContext.php
@@ -36,7 +36,7 @@
 class StringToBoolTransformContext implements Context
 {
     /**
-     * @Transform /^(enabled|enable|included|should|includes|can)$/
+     * @Transform /^(enabled|enable|included|should|includes)$/
      *
      * @param string $string
      *
@@ -48,7 +48,7 @@ public function transformTruthyStringToBoolean(string $string): bool
     }
 
     /**
-     * @Transform /^(disabled|disable|excluded|should not|excludes|cannot)$/
+     * @Transform /^(disabled|disable|excluded|should not|excludes)$/
      *
      * @param string $string
      *
diff --git a/tests/Integration/Behaviour/behat.yml b/tests/Integration/Behaviour/behat.yml
index a9c36b0f7b40c..64d2ae80a1819 100644
--- a/tests/Integration/Behaviour/behat.yml
+++ b/tests/Integration/Behaviour/behat.yml
@@ -127,10 +127,6 @@ default:
                 - Tests\Integration\Behaviour\Features\Transform\CurrencyTransformContext
                 - Tests\Integration\Behaviour\Features\Transform\SharedStorageTransformContext
                 - Tests\Integration\Behaviour\Features\Transform\StringToBoolTransformContext
-                - Tests\Integration\Behaviour\Features\Context\Domain\Product\AddProductFeatureContext
-                - Tests\Integration\Behaviour\Features\Context\Domain\Product\PricesAssertionFeatureContext
-                - Tests\Integration\Behaviour\Features\Context\Domain\Product\UpdateProductFeatureContext
-                - Tests\Integration\Behaviour\Features\Context\Domain\Product\UpdateStockFeatureContext
         language:
             paths:
                 - "%paths.base%/Features/Scenario/Language"

From 3e469e50d1b57296c2f676e63eeb076f8324e29e Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Fri, 5 May 2023 15:11:55 +0300
Subject: [PATCH 0114/1030]  add scenario for non existing cart rules

---
 .../CartRule/EditCartRuleFeatureContext.php   | 42 ++++++++++++++++---
 .../set_cart_rule_restrictions.feature        | 38 +++++------------
 2 files changed, 46 insertions(+), 34 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
index d14c9318b58a8..ec3512b7f1911 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
@@ -36,6 +36,7 @@
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\ToggleCartRuleStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\RestrictCartRulesCommand;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleConstraintException;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Query\GetCartRuleForEditing;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\QueryResult\CartRuleForEditing;
 use PrestaShop\PrestaShop\Core\Util\DateTime\DateTime;
@@ -43,6 +44,11 @@
 
 class EditCartRuleFeatureContext extends AbstractCartRuleFeatureContext
 {
+    /**
+     * This is just a random number which in theory should never be reached as cart rule id in tests
+     */
+    private const NON_EXISTING_CART_RULE_ID = 54440051;
+
     /**
      * @When /^I (enable|disable) cart rule with reference "(.+)"$/
      *
@@ -304,17 +310,41 @@ public function restrictCartRules(string $cartRuleReference, TableNode $tableNod
         }
 
         try {
-            $this->getCommandBus()->handle(
-                new RestrictCartRulesCommand(
-                    $this->getSharedStorage()->get($cartRuleReference),
-                    $restrictedCartRuleIds
-                )
-            );
+            $this->performCartRulesRestriction($this->getSharedStorage()->get($cartRuleReference), $restrictedCartRuleIds);
         } catch (CartRuleConstraintException $e) {
             $this->setLastException($e);
         }
     }
 
+    /**
+     * @When I restrict cart rules for :cartRuleReference providing non-existing cart rules
+     *
+     * @param string $cartRuleReference
+     *
+     * @return void
+     */
+    public function restrictCartRulesProvidingNonExistingIds(string $cartRuleReference): void
+    {
+        try {
+            $this->performCartRulesRestriction(
+                $this->getSharedStorage()->get($cartRuleReference),
+                [self::NON_EXISTING_CART_RULE_ID]
+            );
+        } catch (CartRuleNotFoundException $e) {
+            $this->setLastException($e);
+        }
+    }
+
+    private function performCartRulesRestriction(int $cartRuleId, array $restrictedCartRuleIds): void
+    {
+        $this->getCommandBus()->handle(
+            new RestrictCartRulesCommand(
+                $cartRuleId,
+                $restrictedCartRuleIds
+            )
+        );
+    }
+
     /**
      * @param EditCartRuleCommand $command
      * @param array<string, mixed> $data
diff --git a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_cart_rule_restrictions.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_cart_rule_restrictions.feature
index cb831d535fddf..79a77c2c67db3 100644
--- a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_cart_rule_restrictions.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_cart_rule_restrictions.feature
@@ -1,6 +1,7 @@
 # ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart_rule --tags set-cart-rule-restrictions
 @restore-all-tables-before-feature
 @set-cart-rule-restrictions
+@restore-cart-rules-before-scenario
 Feature: Set cart rule restrictions in BO
   PrestaShop allows BO users to add and remove restrictions of cart rule combinations,
   which defines which cart rules can or cannot be compatible in the same cart
@@ -50,35 +51,11 @@ Feature: Set cart rule restrictions in BO
       | reduction_percentage                   | 70                  |
       | reduction_apply_to_discounted_products | false               |
     And cart rule "rule_free_shipping_1" should have the following properties:
-      | is_active             | true                 |
-      | free_shipping         | true                 |
-      | priority              | 1                    |
-      | valid_from            | 2022-01-01 11:00:00  |
-      | valid_to              | 3001-01-01 12:00:00  |
-      | code                  | rule_free_shipping_1 |
-      | restricted cart rules |                      |
+      | restricted cart rules |  |
     And cart rule "rule_50_percent" should have the following properties:
-      | is_active                              | true                   |
-      | priority                               | 2                      |
-      | valid_from                             | 2022-01-01 11:00:00    |
-      | valid_to                               | 3001-01-01 12:00:00    |
-      | free_shipping                          | false                  |
-      | code                                   | rule_50_percent        |
-      | reduction_percentage                   | 50                     |
-      | reduction_apply_to_discounted_products | false                  |
-      | discount_application_type              | order_without_shipping |
-      | restricted cart rules                  |                        |
+      | restricted cart rules |  |
     And cart rule "rule_70_percent" should have the following properties:
-      | is_active                              | true                   |
-      | priority                               | 3                      |
-      | valid_from                             | 2022-01-01 11:00:00    |
-      | valid_to                               | 3001-01-01 12:00:00    |
-      | free_shipping                          | false                  |
-      | code                                   | rule_70_percent        |
-      | reduction_percentage                   | 70                     |
-      | reduction_apply_to_discounted_products | false                  |
-      | discount_application_type              | order_without_shipping |
-      | restricted cart rules                  |                        |
+      | restricted cart rules |  |
 
   Scenario: Restrict cart rule combinations
     When I restrict following cart rules for cart rule rule_free_shipping_1:
@@ -99,7 +76,12 @@ Feature: Set cart rule restrictions in BO
     And cart rule "rule_70_percent" should have the following properties:
       | restricted cart rules | rule_free_shipping_1 |
 
-  @restore-cart-rules-before-scenario
+  Scenario: Provide non-existing ids for cart rule restriction
+    When I restrict cart rules for rule_free_shipping_1 providing non-existing cart rules
+    Then I should get cart rule error about "non-existing cart rule"
+    And cart rule "rule_free_shipping_1" should have the following properties:
+      | restricted cart rules |  |
+
   Scenario: Restrict cart rule combinations providing the same cart rule that is being edited in the restricted cart rules list
     Given cart rule "rule_70_percent" should have the following properties:
       | restricted cart rules |  |

From ea27ee9c1dd30e7f02dce036a069d29bb768d32f Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Wed, 17 May 2023 12:49:05 +0300
Subject: [PATCH 0115/1030]  fix tests after rebase

---
 .../CartRule/AddCartRuleFeatureContext.php    |   2 +-
 .../CartRuleAssertionFeatureContext.php       |  46 +++-
 .../CartRule/CommonCartRuleFeatureContext.php |  56 +++++
 .../CartRule/EditCartRuleFeatureContext.php   | 202 +-----------------
 .../set_cart_rule_restrictions.feature        |  53 ++---
 tests/Integration/Behaviour/behat.yml         |   1 +
 6 files changed, 125 insertions(+), 235 deletions(-)
 create mode 100644 tests/Integration/Behaviour/Features/Context/Domain/CartRule/CommonCartRuleFeatureContext.php

diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AddCartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AddCartRuleFeatureContext.php
index 56801fe4b4a07..502b904fb135e 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AddCartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AddCartRuleFeatureContext.php
@@ -55,7 +55,7 @@ public function createCartRuleWithReference(string $cartRuleReference, TableNode
         try {
             $command = new AddCartRuleCommand(
                 $data['name'],
-                PrimitiveUtils::castStringBooleanIntoBoolean($data['highlight']),
+                isset($data['highlight']) && PrimitiveUtils::castStringBooleanIntoBoolean($data['highlight']),
                 PrimitiveUtils::castStringBooleanIntoBoolean($data['allow_partial_use']),
                 (int) $data['priority'],
                 PrimitiveUtils::castStringBooleanIntoBoolean($data['is_active']),
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
index 93f39487c9b56..53a26e38cbbba 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
@@ -98,23 +98,44 @@ public function assertCartRuleDeleted(string $cartRuleReference): void
     }
 
     /**
-     * @Then I should get cart rule error about :errorName
+     * @Then I should get cart rule error about :error
      *
-     * @param string $errorName
+     * @param string $error
      *
      * @return void
      */
-    public function assertCartRuleConstraintError(string $errorName): void
+    public function assertCartRuleError(string $error): void
     {
         $errorMap = [
-            'required specific product' => CartRuleConstraintException::MISSING_DISCOUNT_APPLICATION_PRODUCT,
-            'non unique cart rule code' => CartRuleConstraintException::NON_UNIQUE_CODE,
-            'missing action' => CartRuleConstraintException::MISSING_ACTION,
+            'required specific product' => [
+                'class' => CartRuleConstraintException::class,
+                'code' => CartRuleConstraintException::MISSING_DISCOUNT_APPLICATION_PRODUCT,
+            ],
+            'non unique cart rule code' => [
+                'class' => CartRuleConstraintException::class,
+                'code' => CartRuleConstraintException::NON_UNIQUE_CODE,
+            ],
+            'missing action' => [
+                'class' => CartRuleConstraintException::class,
+                'code' => CartRuleConstraintException::MISSING_ACTION,
+            ],
+            'invalid cart rule restriction' => [
+                'class' => CartRuleConstraintException::class,
+                'code' => CartRuleConstraintException::INVALID_CART_RULE_RESTRICTION,
+            ],
+            'non-existing cart rule' => [
+                'class' => CartRuleNotFoundException::class,
+                'code' => 0,
+            ],
         ];
 
+        if (!isset($errorMap[$error])) {
+            throw new RuntimeException(sprintf('$error "%s" not set in error map for assertion', $error));
+        }
+
         $this->assertLastErrorIs(
-            CartRuleConstraintException::class,
-            $errorMap[$errorName]
+            $errorMap[$error]['class'],
+            $errorMap[$error]['code']
         );
     }
 
@@ -302,5 +323,14 @@ public function assertCartRuleProperties(string $cartRuleReference, TableNode $t
                 'Unexpected gift_combination'
             );
         }
+
+        if (isset($data['restricted cart rules'])) {
+            $expectedRestrictedCartRuleIds = $this->referencesToIds($data['restricted cart rules']);
+            Assert::assertSame(
+                $expectedRestrictedCartRuleIds,
+                $editableCartRule->getConditions()->getRestrictions()->getRestrictedCartRuleIds(),
+                'Unexpected cart rule restrictions'
+            );
+        }
     }
 }
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CommonCartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CommonCartRuleFeatureContext.php
new file mode 100644
index 0000000000000..0529687a0c121
--- /dev/null
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CommonCartRuleFeatureContext.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace Tests\Integration\Behaviour\Features\Context\Domain\CartRule;
+
+use Tests\Resources\DatabaseDump;
+
+class CommonCartRuleFeatureContext extends AbstractCartRuleFeatureContext
+{
+    /**
+     * @BeforeScenario @restore-cart-rules-before-scenario
+     *
+     * @return void
+     */
+    public static function restoreCartRules(): void
+    {
+        DatabaseDump::restoreTables([
+            'cart_rule',
+            'cart_rule_shop',
+            'cart_rule_lang',
+            'cart_cart_rule',
+            'cart_rule_carrier',
+            'cart_rule_combination',
+            'cart_rule_country',
+            'cart_rule_group',
+            'cart_rule_product_rule',
+            'cart_rule_product_rule_group',
+            'cart_rule_product_rule_value',
+        ]);
+    }
+}
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
index ec3512b7f1911..7a37a1e1d3ef7 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
@@ -29,17 +29,12 @@
 
 use Behat\Gherkin\Node\TableNode;
 use DateTimeImmutable;
-use PHPUnit\Framework\Assert;
-use PrestaShop\Decimal\DecimalNumber;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\BulkToggleCartRuleStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\EditCartRuleCommand;
-use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\ToggleCartRuleStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\RestrictCartRulesCommand;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\ToggleCartRuleStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleConstraintException;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleNotFoundException;
-use PrestaShop\PrestaShop\Core\Domain\CartRule\Query\GetCartRuleForEditing;
-use PrestaShop\PrestaShop\Core\Domain\CartRule\QueryResult\CartRuleForEditing;
-use PrestaShop\PrestaShop\Core\Util\DateTime\DateTime;
 use Tests\Integration\Behaviour\Features\Context\Util\PrimitiveUtils;
 
 class EditCartRuleFeatureContext extends AbstractCartRuleFeatureContext
@@ -99,201 +94,6 @@ public function editCartRule(string $cartRuleReference, TableNode $tableNode): v
         }
     }
 
-    /**
-     * @Then cart rule :cartRuleReference should have the following properties:
-     *
-     * @param string $cartRuleReference
-     * @param TableNode $tableNode
-     */
-    public function assertCartRuleProperties(string $cartRuleReference, TableNode $tableNode): void
-    {
-        /** @var CartRuleForEditing $editableCartRule */
-        $editableCartRule = $this->getQueryBus()->handle(
-            new GetCartRuleForEditing($this->getSharedStorage()->get($cartRuleReference))
-        );
-
-        $data = $this->localizeByRows($tableNode);
-        $information = $editableCartRule->getInformation();
-        $conditions = $editableCartRule->getConditions();
-        $actions = $editableCartRule->getActions();
-
-        if (isset($data['name'])) {
-            Assert::assertSame($data['name'], $information->getLocalizedNames(), 'Unexpected localized name');
-        }
-        if (isset($data['description'])) {
-            Assert::assertSame($data['description'], $information->getDescription(), 'Unexpected description');
-        }
-        if (isset($data['highlight'])) {
-            Assert::assertSame(
-                PrimitiveUtils::castStringBooleanIntoBoolean($data['highlight']),
-                $information->isHighlight(),
-                'Unexpected highlight'
-            );
-        }
-        if (isset($data['allow_partial_use'])) {
-            Assert::assertSame(
-                PrimitiveUtils::castStringBooleanIntoBoolean($data['allow_partial_use']),
-                $information->isPartialUse(),
-                'Unexpected partial use'
-            );
-        }
-        if (isset($data['enabled'])) {
-            Assert::assertSame(
-                PrimitiveUtils::castStringBooleanIntoBoolean($data['enabled']),
-                $information->isEnabled(),
-                'Unexpected enabled property'
-            );
-        }
-        if (isset($data['code'])) {
-            Assert::assertSame($data['code'], $information->getCode(), 'Unexpected code');
-        }
-        if (isset($data['customer'])) {
-            Assert::assertSame(
-                !empty($data['customer']) ? $this->getSharedStorage()->get($data['customer']) : 0,
-                $conditions->getCustomerId()->getValue(),
-                'Unexpected customer id'
-            );
-        }
-        if (isset($data['priority'])) {
-            Assert::assertSame((int) $data['priority'], $information->getPriority(), 'Unexpected priority');
-        }
-        if (isset($data['valid_from'])) {
-            Assert::assertEquals(
-                $data['valid_from'],
-                $conditions->getDateFrom()->format(DateTime::DEFAULT_DATETIME_FORMAT),
-                'Unexpected valid_from'
-            );
-        }
-        if (isset($data['valid_to'])) {
-            Assert::assertEquals(
-                $data['valid_to'],
-                $conditions->getDateTo()->format(DateTime::DEFAULT_DATETIME_FORMAT),
-                'Unexpected valid_to'
-            );
-        }
-        if (isset($data['total quantity'])) {
-            Assert::assertSame((int) $data['total quantity'], $conditions->getQuantity(), 'Unexpected quantity');
-        }
-        if (isset($data['quantity per user'])) {
-            Assert::assertSame((int) $data['quantity per user'], $conditions->getQuantityPerUser(), 'Unexpected quantity per user');
-        }
-
-        if (isset($data['minimum_amount'])) {
-            if (empty($data['minimum_amount'])) {
-                Assert::assertNull($conditions->getMinimum(), 'unexpected minimum_amount');
-            } else {
-                $minimum = $conditions->getMinimum();
-                Assert::assertTrue(
-                    $minimum->getAmount()->equals(new DecimalNumber($data['minimum_amount'])),
-                    'Unexpected minimum_amount'
-                );
-
-                Assert::assertSame(
-                    PrimitiveUtils::castStringBooleanIntoBoolean($data['minimum_amount_tax_included']),
-                    $minimum->isAmountTax(),
-                    'Unexpected minimum_amount_tax_included'
-                );
-
-                Assert::assertSame(
-                    $this->getSharedStorage()->get($data['minimum_amount_currency']),
-                    $minimum->getCurrencyId(),
-                    'Unexpected minimum_amount_currency'
-                );
-
-                Assert::assertSame(
-                    PrimitiveUtils::castStringBooleanIntoBoolean($data['minimum_amount_shipping_included']),
-                    $minimum->isShipping(),
-                    'Unexpected minimum_amount_shipping_included'
-                );
-            }
-        }
-
-        if (isset($data['discount_application_type'])) {
-            $expectedDiscountApplicationType = $data['discount_application_type'];
-            Assert::assertSame(
-                $expectedDiscountApplicationType,
-                $actions->getDiscountApplicationType(),
-                'Unexpected discount_application_type'
-            );
-
-            Assert::assertSame(
-                !empty($data['discount_product']) ? $this->getSharedStorage()->get($data['discount_product']) : null,
-                $actions->getReduction()->getProductId(),
-                'Unexpected discount_product'
-            );
-        }
-
-        if (isset($data['reduction_percentage'])) {
-            Assert::assertTrue(
-                $actions->getReduction()->getPercent()->equals(new DecimalNumber($data['reduction_percentage'])),
-                'Unexpected reduction_percentage'
-            );
-        }
-
-        if (isset($data['reduction_amount'])) {
-            Assert::assertTrue(
-                $actions->getReduction()->getAmount()->equals(new DecimalNumber($data['reduction_amount'])),
-                'Unexpected reduction_amount'
-            );
-        }
-
-        if (isset($data['reduction_currency'])) {
-            if ($data['reduction_currency'] === '') {
-                Assert::assertNull(
-                    $actions->getReduction()->getCurrencyId(),
-                    'Unexpected reduction_currency'
-                );
-            } else {
-                Assert::assertSame(
-                    $this->getSharedStorage()->get($data['reduction_currency']),
-                    $actions->getReduction()->getCurrencyId(),
-                    'Unexpected reduction_currency'
-                );
-            }
-        }
-
-        if (isset($data['reduction_apply_to_discounted_products'])) {
-            Assert::assertSame(
-                PrimitiveUtils::castStringBooleanIntoBoolean($data['reduction_apply_to_discounted_products']),
-                $actions->getReduction()->applyToDiscountedProducts(),
-                'Unexpected reduction_apply_to_discounted_products'
-            );
-        }
-
-        if (isset($data['free_shipping'])) {
-            Assert::assertSame(
-                PrimitiveUtils::castStringBooleanIntoBoolean($data['free_shipping']),
-                $actions->isFreeShipping(),
-                'Unexpected free_shipping'
-            );
-        }
-
-        if (isset($data['gift_product'])) {
-            Assert::assertSame(
-                $this->getSharedStorage()->get($data['gift_product']),
-                $actions->getGiftProductId(),
-                'Unexpected gift_product'
-            );
-        }
-
-        if (isset($data['gift_combination'])) {
-            Assert::assertSame(
-                !empty($data['gift_combination']) ? $this->getSharedStorage()->get($data['gift_combination']) : null,
-                $actions->getGiftCombinationId(),
-                'Unexpected gift_combination'
-            );
-        }
-
-        if (isset($data['restricted cart rules'])) {
-            $expectedRestrictedCartRuleIds = $this->referencesToIds($data['restricted cart rules']);
-            Assert::assertSame(
-                $expectedRestrictedCartRuleIds,
-                $editableCartRule->getConditions()->getRestrictions()->getRestrictedCartRuleIds(),
-                'Unexpected cart rule restrictions'
-            );
-        }
-    }
-
     /**
      * @When I restrict following cart rules for cart rule :cartRuleReference:
      *
diff --git a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_cart_rule_restrictions.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_cart_rule_restrictions.feature
index 79a77c2c67db3..9b900ede233fd 100644
--- a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_cart_rule_restrictions.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_cart_rule_restrictions.feature
@@ -1,7 +1,6 @@
 # ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart_rule --tags set-cart-rule-restrictions
 @restore-all-tables-before-feature
 @set-cart-rule-restrictions
-@restore-cart-rules-before-scenario
 Feature: Set cart rule restrictions in BO
   PrestaShop allows BO users to add and remove restrictions of cart rule combinations,
   which defines which cart rules can or cannot be compatible in the same cart
@@ -25,31 +24,33 @@ Feature: Set cart rule restrictions in BO
       | free_shipping     | true                 |
       | code              | rule_free_shipping_1 |
     And I create cart rule "rule_50_percent" with following properties:
-      | name[en-US]                            | Half the price      |
-      | is_active                              | true                |
-      | allow_partial_use                      | true                |
-      | priority                               | 2                   |
-      | valid_from                             | 2022-01-01 11:00:00 |
-      | valid_to                               | 3001-01-01 12:00:00 |
-      | total_quantity                         | 10                  |
-      | quantity_per_user                      | 12                  |
-      | free_shipping                          | false               |
-      | code                                   | rule_50_percent     |
-      | reduction_percentage                   | 50                  |
-      | reduction_apply_to_discounted_products | false               |
+      | name[en-US]                            | Half the price         |
+      | is_active                              | true                   |
+      | allow_partial_use                      | true                   |
+      | priority                               | 2                      |
+      | valid_from                             | 2022-01-01 11:00:00    |
+      | valid_to                               | 3001-01-01 12:00:00    |
+      | total_quantity                         | 10                     |
+      | quantity_per_user                      | 12                     |
+      | free_shipping                          | false                  |
+      | code                                   | rule_50_percent        |
+      | reduction_percentage                   | 50                     |
+      | reduction_apply_to_discounted_products | false                  |
+      | discount_application_type              | order_without_shipping |
     And I create cart rule "rule_70_percent" with following properties:
-      | name[en-US]                            | Half the price      |
-      | is_active                              | true                |
-      | allow_partial_use                      | true                |
-      | priority                               | 3                   |
-      | valid_from                             | 2022-01-01 11:00:00 |
-      | valid_to                               | 3001-01-01 12:00:00 |
-      | total_quantity                         | 10                  |
-      | quantity_per_user                      | 12                  |
-      | free_shipping                          | false               |
-      | code                                   | rule_70_percent     |
-      | reduction_percentage                   | 70                  |
-      | reduction_apply_to_discounted_products | false               |
+      | name[en-US]                            | Half the price         |
+      | is_active                              | true                   |
+      | allow_partial_use                      | true                   |
+      | priority                               | 3                      |
+      | valid_from                             | 2022-01-01 11:00:00    |
+      | valid_to                               | 3001-01-01 12:00:00    |
+      | total_quantity                         | 10                     |
+      | quantity_per_user                      | 12                     |
+      | free_shipping                          | false                  |
+      | code                                   | rule_70_percent        |
+      | reduction_percentage                   | 70                     |
+      | reduction_apply_to_discounted_products | false                  |
+      | discount_application_type              | order_without_shipping |
     And cart rule "rule_free_shipping_1" should have the following properties:
       | restricted cart rules |  |
     And cart rule "rule_50_percent" should have the following properties:
@@ -76,12 +77,14 @@ Feature: Set cart rule restrictions in BO
     And cart rule "rule_70_percent" should have the following properties:
       | restricted cart rules | rule_free_shipping_1 |
 
+  @restore-cart-rules-before-scenario
   Scenario: Provide non-existing ids for cart rule restriction
     When I restrict cart rules for rule_free_shipping_1 providing non-existing cart rules
     Then I should get cart rule error about "non-existing cart rule"
     And cart rule "rule_free_shipping_1" should have the following properties:
       | restricted cart rules |  |
 
+  @restore-cart-rules-before-scenario
   Scenario: Restrict cart rule combinations providing the same cart rule that is being edited in the restricted cart rules list
     Given cart rule "rule_70_percent" should have the following properties:
       | restricted cart rules |  |
diff --git a/tests/Integration/Behaviour/behat.yml b/tests/Integration/Behaviour/behat.yml
index 64d2ae80a1819..414e1cee29f16 100644
--- a/tests/Integration/Behaviour/behat.yml
+++ b/tests/Integration/Behaviour/behat.yml
@@ -258,6 +258,7 @@ default:
                 - Tests\Integration\Behaviour\Features\Context\CustomerFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\AddCartRuleFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\CartRuleAssertionFeatureContext
+                - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\CommonCartRuleFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\DeleteCartRuleFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\EditCartRuleFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\Product\AddProductFeatureContext

From cf90e6509c19aee59514beec9dc42a965bf0015e Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Wed, 17 May 2023 13:23:24 +0300
Subject: [PATCH 0116/1030]  adapt pr scope classes to php 8.1

---
 .../RestrictCartRulesHandler.php              | 17 ++--
 .../GetCartRuleForEditingHandler.php          | 16 +---
 .../Repository/CartRuleRepository.php         | 23 +----
 .../Command/RestrictCartRulesCommand.php      | 39 ++------
 .../CartRule/Query/GetCartRuleForEditing.php  | 19 +---
 .../CartRuleRestrictionsForEditing.php        | 92 +------------------
 .../CartRuleAssertionFeatureContext.php       |  2 +-
 7 files changed, 26 insertions(+), 182 deletions(-)

diff --git a/src/Adapter/CartRule/CommandHandler/RestrictCartRulesHandler.php b/src/Adapter/CartRule/CommandHandler/RestrictCartRulesHandler.php
index 808d399af368b..1d35cabdc2bce 100644
--- a/src/Adapter/CartRule/CommandHandler/RestrictCartRulesHandler.php
+++ b/src/Adapter/CartRule/CommandHandler/RestrictCartRulesHandler.php
@@ -36,24 +36,19 @@
 
 class RestrictCartRulesHandler implements RestrictCartRulesHandlerInterface
 {
-    /**
-     * @var CartRuleRepository
-     */
-    private $cartRuleRepository;
-
     public function __construct(
-        CartRuleRepository $cartRuleRepository
+        protected CartRuleRepository $cartRuleRepository
     ) {
-        $this->cartRuleRepository = $cartRuleRepository;
     }
 
     public function handle(RestrictCartRulesCommand $command): void
     {
-        $cartRuleId = $command->getCartRuleId();
+        $cartRuleId = $command->cartRuleId;
         $cartRule = $this->cartRuleRepository->get($cartRuleId);
-        $this->cartRuleRepository->assertAllCartRulesExists($command->getRestrictedCartRuleIds());
-        $this->cartRuleRepository->restrictCartRules($cartRuleId, $command->getRestrictedCartRuleIds());
-        $hasRestrictions = !empty($command->getRestrictedCartRuleIds());
+        $restrictedCartRuleIds = $command->restrictedCartRuleIds;
+        $this->cartRuleRepository->assertAllCartRulesExists($restrictedCartRuleIds);
+        $this->cartRuleRepository->restrictCartRules($cartRuleId, $restrictedCartRuleIds);
+        $hasRestrictions = !empty($restrictedCartRuleIds);
 
         $this->updateRestrictionProperty($cartRule, $hasRestrictions);
 
diff --git a/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php b/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php
index 28e1765ce4f6a..f5c93f72048bd 100644
--- a/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php
+++ b/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php
@@ -56,15 +56,9 @@
  */
 class GetCartRuleForEditingHandler extends AbstractCartRuleHandler implements GetCartRuleForEditingHandlerInterface
 {
-    /**
-     * @var CartRuleRepository
-     */
-    private $cartRuleRepository;
-
     public function __construct(
-        CartRuleRepository $cartRuleRepository
+        protected CartRuleRepository $cartRuleRepository
     ) {
-        $this->cartRuleRepository = $cartRuleRepository;
     }
 
     /**
@@ -77,7 +71,7 @@ public function __construct(
      */
     public function handle(GetCartRuleForEditing $query): CartRuleForEditing
     {
-        $cartRuleId = $query->getCartRuleId();
+        $cartRuleId = $query->cartRuleId;
         $cartRule = $this->getCartRule($cartRuleId);
 
         $cartRuleInformation = $this->getCartRuleInformation($cartRule);
@@ -134,12 +128,8 @@ private function getCartRuleConditions(CartRule $cartRule): CartRuleConditionsFo
         }
 
         $cartRuleRestrictions = new CartRuleRestrictionsForEditing(
-            (bool) $cartRule->country_restriction,
-            (bool) $cartRule->carrier_restriction,
-            (bool) $cartRule->group_restriction,
+            // @todo: fill other restrictions when related commands are implemented
             $restrictedCartRules,
-            (bool) $cartRule->product_restriction,
-            (bool) $cartRule->shop_restriction
         );
 
         return new CartRuleConditionsForEditing(
diff --git a/src/Adapter/CartRule/Repository/CartRuleRepository.php b/src/Adapter/CartRule/Repository/CartRuleRepository.php
index c8bccbaa98bf0..94a6a8fd334f5 100644
--- a/src/Adapter/CartRule/Repository/CartRuleRepository.php
+++ b/src/Adapter/CartRule/Repository/CartRuleRepository.php
@@ -38,28 +38,11 @@
 
 class CartRuleRepository extends AbstractObjectModelRepository
 {
-    /**
-     * @var CartRuleValidator
-     */
-    private $cartRuleValidator;
-    /**
-     * @var Connection
-     */
-    private $connection;
-
-    /**
-     * @var string
-     */
-    private $dbPrefix;
-
     public function __construct(
-        CartRuleValidator $cartRuleValidator,
-        Connection $connection,
-        string $dbPrefix
+        protected CartRuleValidator $cartRuleValidator,
+        protected Connection $connection,
+        protected string $dbPrefix
     ) {
-        $this->cartRuleValidator = $cartRuleValidator;
-        $this->connection = $connection;
-        $this->dbPrefix = $dbPrefix;
     }
 
     public function add(CartRule $cartRule): CartRule
diff --git a/src/Core/Domain/CartRule/Command/RestrictCartRulesCommand.php b/src/Core/Domain/CartRule/Command/RestrictCartRulesCommand.php
index 3ef91c9a8ffab..2945c41589381 100644
--- a/src/Core/Domain/CartRule/Command/RestrictCartRulesCommand.php
+++ b/src/Core/Domain/CartRule/Command/RestrictCartRulesCommand.php
@@ -33,15 +33,10 @@
 
 class RestrictCartRulesCommand
 {
-    /**
-     * @var CartRuleId
-     */
-    private $cartRuleId;
+    public readonly CartRuleId $cartRuleId;
 
-    /**
-     * @var CartRuleId[]
-     */
-    private $restrictedCartRuleIds;
+    /** @var CartRuleId[] */
+    public readonly array $restrictedCartRuleIds;
 
     /**
      * @param int $cartRuleId
@@ -52,35 +47,20 @@ public function __construct(
         array $restrictedCartRuleIds
     ) {
         $this->cartRuleId = new CartRuleId($cartRuleId);
-        $this->setRestrictedCartRuleIds($cartRuleId, $restrictedCartRuleIds);
-    }
-
-    /**
-     * @return CartRuleId
-     */
-    public function getCartRuleId(): CartRuleId
-    {
-        return $this->cartRuleId;
-    }
-
-    /**
-     * @return CartRuleId[]
-     */
-    public function getRestrictedCartRuleIds(): array
-    {
-        return $this->restrictedCartRuleIds;
+        $this->restrictedCartRuleIds = $this->assertCartRuleIds($cartRuleId, $restrictedCartRuleIds);
     }
 
     /**
      * @param int $cartRuleId
      * @param int[] $restrictedCartRuleIds
      *
-     * @return void
+     * @return CartRuleId[]
      *
      * @throws CartRuleConstraintException
      */
-    private function setRestrictedCartRuleIds(int $cartRuleId, array $restrictedCartRuleIds): void
+    private function assertCartRuleIds(int $cartRuleId, array $restrictedCartRuleIds): array
     {
+        $cartRuleIds = [];
         foreach ($restrictedCartRuleIds as $restrictedCartRuleId) {
             if ($restrictedCartRuleId === $cartRuleId) {
                 throw new CartRuleConstraintException(
@@ -88,8 +68,9 @@ private function setRestrictedCartRuleIds(int $cartRuleId, array $restrictedCart
                     CartRuleConstraintException::INVALID_CART_RULE_RESTRICTION
                 );
             }
-
-            $this->restrictedCartRuleIds[] = new CartRuleId($restrictedCartRuleId);
+            $cartRuleIds[] = new CartRuleId($restrictedCartRuleId);
         }
+
+        return $cartRuleIds;
     }
 }
diff --git a/src/Core/Domain/CartRule/Query/GetCartRuleForEditing.php b/src/Core/Domain/CartRule/Query/GetCartRuleForEditing.php
index 564184c738ee9..0c735d56b6bea 100644
--- a/src/Core/Domain/CartRule/Query/GetCartRuleForEditing.php
+++ b/src/Core/Domain/CartRule/Query/GetCartRuleForEditing.php
@@ -28,7 +28,6 @@
 
 namespace PrestaShop\PrestaShop\Core\Domain\CartRule\Query;
 
-use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleConstraintException;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\CartRuleId;
 
 /**
@@ -36,26 +35,10 @@
  */
 class GetCartRuleForEditing
 {
-    /**
-     * @var CartRuleId
-     */
-    private $cartRuleId;
+    public readonly CartRuleId $cartRuleId;
 
-    /**
-     * @param int $cartRuleId
-     *
-     * @throws CartRuleConstraintException
-     */
     public function __construct(int $cartRuleId)
     {
         $this->cartRuleId = new CartRuleId($cartRuleId);
     }
-
-    /**
-     * @return CartRuleId $cartRuleId
-     */
-    public function getCartRuleId(): CartRuleId
-    {
-        return $this->cartRuleId;
-    }
 }
diff --git a/src/Core/Domain/CartRule/QueryResult/CartRuleRestrictionsForEditing.php b/src/Core/Domain/CartRule/QueryResult/CartRuleRestrictionsForEditing.php
index 4b6956db2606e..e21c9bc115d64 100644
--- a/src/Core/Domain/CartRule/QueryResult/CartRuleRestrictionsForEditing.php
+++ b/src/Core/Domain/CartRule/QueryResult/CartRuleRestrictionsForEditing.php
@@ -30,97 +30,9 @@
 
 class CartRuleRestrictionsForEditing
 {
-    /**
-     * @var bool
-     */
-    private $countryRestriction;
-
-    /**
-     * @var bool
-     */
-    private $carrierRestriction;
-
-    /**
-     * @var bool
-     */
-    private $groupRestriction;
-
-    /**
-     * @var int[]
-     */
-    private $restrictedCartRuleIds;
-
-    /**
-     * @var bool
-     */
-    private $productRestriction;
-
-    /**
-     * @var bool
-     */
-    private $shopRestriction;
-
+    //@todo: add other restrictions like country, carrier, group, product, shop (shop association might be handled separatly)
     public function __construct(
-        bool $countryRestriction,
-        bool $carrierRestriction,
-        bool $groupRestriction,
-        array $restrictedCartRuleIds,
-        bool $productRestriction,
-        bool $shopRestriction
+        public readonly array $restrictedCartRuleIds
     ) {
-        $this->countryRestriction = $countryRestriction;
-        $this->carrierRestriction = $carrierRestriction;
-        $this->groupRestriction = $groupRestriction;
-        $this->restrictedCartRuleIds = $restrictedCartRuleIds;
-        $this->productRestriction = $productRestriction;
-        $this->shopRestriction = $shopRestriction;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isCountryRestriction(): bool
-    {
-        return $this->countryRestriction;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isCarrierRestriction(): bool
-    {
-        return $this->carrierRestriction;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isGroupRestriction(): bool
-    {
-        return $this->groupRestriction;
-    }
-
-    /**
-     * @return int[]
-     */
-    public function getRestrictedCartRuleIds(): array
-    {
-        return $this->restrictedCartRuleIds;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isProductRestriction(): bool
-    {
-        return $this->productRestriction;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isShopRestriction(): bool
-    {
-        return $this->shopRestriction;
     }
 }
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
index 53a26e38cbbba..89330c5098209 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
@@ -328,7 +328,7 @@ public function assertCartRuleProperties(string $cartRuleReference, TableNode $t
             $expectedRestrictedCartRuleIds = $this->referencesToIds($data['restricted cart rules']);
             Assert::assertSame(
                 $expectedRestrictedCartRuleIds,
-                $editableCartRule->getConditions()->getRestrictions()->getRestrictedCartRuleIds(),
+                $editableCartRule->getConditions()->getRestrictions()->restrictedCartRuleIds,
                 'Unexpected cart rule restrictions'
             );
         }

From 9a06075b8a6f5f11790036fa59af765aa153fa8b Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Thu, 15 Jun 2023 12:35:48 +0300
Subject: [PATCH 0117/1030]  rename command and handler

---
 ...ulesHandler.php => SetCartRuleRestrictionsHandler.php} | 8 ++++----
 ...ulesCommand.php => SetCartRuleRestrictionsCommand.php} | 2 +-
 ...ce.php => SetCartRuleRestrictionsHandlerInterface.php} | 6 +++---
 .../Resources/config/services/adapter/cart_rule.yml       | 4 ++--
 .../Domain/CartRule/EditCartRuleFeatureContext.php        | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)
 rename src/Adapter/CartRule/CommandHandler/{RestrictCartRulesHandler.php => SetCartRuleRestrictionsHandler.php} (88%)
 rename src/Core/Domain/CartRule/Command/{RestrictCartRulesCommand.php => SetCartRuleRestrictionsCommand.php} (98%)
 rename src/Core/Domain/CartRule/CommandHandler/{RestrictCartRulesHandlerInterface.php => SetCartRuleRestrictionsHandlerInterface.php} (84%)

diff --git a/src/Adapter/CartRule/CommandHandler/RestrictCartRulesHandler.php b/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php
similarity index 88%
rename from src/Adapter/CartRule/CommandHandler/RestrictCartRulesHandler.php
rename to src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php
index 1d35cabdc2bce..15aca3523f4c9 100644
--- a/src/Adapter/CartRule/CommandHandler/RestrictCartRulesHandler.php
+++ b/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php
@@ -30,18 +30,18 @@
 
 use CartRule;
 use PrestaShop\PrestaShop\Adapter\CartRule\Repository\CartRuleRepository;
-use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\RestrictCartRulesCommand;
-use PrestaShop\PrestaShop\Core\Domain\CartRule\CommandHandler\RestrictCartRulesHandlerInterface;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\SetCartRuleRestrictionsCommand;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\CommandHandler\SetCartRuleRestrictionsHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\CartRuleId;
 
-class RestrictCartRulesHandler implements RestrictCartRulesHandlerInterface
+class SetCartRuleRestrictionsHandler implements SetCartRuleRestrictionsHandlerInterface
 {
     public function __construct(
         protected CartRuleRepository $cartRuleRepository
     ) {
     }
 
-    public function handle(RestrictCartRulesCommand $command): void
+    public function handle(SetCartRuleRestrictionsCommand $command): void
     {
         $cartRuleId = $command->cartRuleId;
         $cartRule = $this->cartRuleRepository->get($cartRuleId);
diff --git a/src/Core/Domain/CartRule/Command/RestrictCartRulesCommand.php b/src/Core/Domain/CartRule/Command/SetCartRuleRestrictionsCommand.php
similarity index 98%
rename from src/Core/Domain/CartRule/Command/RestrictCartRulesCommand.php
rename to src/Core/Domain/CartRule/Command/SetCartRuleRestrictionsCommand.php
index 2945c41589381..09102b494ee27 100644
--- a/src/Core/Domain/CartRule/Command/RestrictCartRulesCommand.php
+++ b/src/Core/Domain/CartRule/Command/SetCartRuleRestrictionsCommand.php
@@ -31,7 +31,7 @@
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleConstraintException;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\CartRuleId;
 
-class RestrictCartRulesCommand
+class SetCartRuleRestrictionsCommand
 {
     public readonly CartRuleId $cartRuleId;
 
diff --git a/src/Core/Domain/CartRule/CommandHandler/RestrictCartRulesHandlerInterface.php b/src/Core/Domain/CartRule/CommandHandler/SetCartRuleRestrictionsHandlerInterface.php
similarity index 84%
rename from src/Core/Domain/CartRule/CommandHandler/RestrictCartRulesHandlerInterface.php
rename to src/Core/Domain/CartRule/CommandHandler/SetCartRuleRestrictionsHandlerInterface.php
index 393e0e8323ae5..7a8e0fc61394e 100644
--- a/src/Core/Domain/CartRule/CommandHandler/RestrictCartRulesHandlerInterface.php
+++ b/src/Core/Domain/CartRule/CommandHandler/SetCartRuleRestrictionsHandlerInterface.php
@@ -28,9 +28,9 @@
 
 namespace PrestaShop\PrestaShop\Core\Domain\CartRule\CommandHandler;
 
-use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\RestrictCartRulesCommand;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\SetCartRuleRestrictionsCommand;
 
-interface RestrictCartRulesHandlerInterface
+interface SetCartRuleRestrictionsHandlerInterface
 {
-    public function handle(RestrictCartRulesCommand $command): void;
+    public function handle(SetCartRuleRestrictionsCommand $command): void;
 }
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml b/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml
index 83be9ee8e0c57..ec8fbb0c941aa 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml
@@ -66,8 +66,8 @@ services:
     autowire: true
     public: false
 
-  PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler\RestrictCartRulesHandler:
+  PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler\SetCartRuleRestrictionsHandler:
     autowire: true
     public: false
     tags:
-      - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\CartRule\Command\RestrictCartRulesCommand }
+      - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\CartRule\Command\SetCartRuleRestrictionsCommand }
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
index 7a37a1e1d3ef7..9e7fd5972162b 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
@@ -31,7 +31,7 @@
 use DateTimeImmutable;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\BulkToggleCartRuleStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\EditCartRuleCommand;
-use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\RestrictCartRulesCommand;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\SetCartRuleRestrictionsCommand;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\ToggleCartRuleStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleConstraintException;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleNotFoundException;
@@ -138,7 +138,7 @@ public function restrictCartRulesProvidingNonExistingIds(string $cartRuleReferen
     private function performCartRulesRestriction(int $cartRuleId, array $restrictedCartRuleIds): void
     {
         $this->getCommandBus()->handle(
-            new RestrictCartRulesCommand(
+            new SetCartRuleRestrictionsCommand(
                 $cartRuleId,
                 $restrictedCartRuleIds
             )

From 0bfddb86be26f52bb07dce8f802af09a301e53b0 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Thu, 15 Jun 2023 12:47:26 +0300
Subject: [PATCH 0118/1030]  dont use abstract handler in query

---
 .../QueryHandler/GetCartRuleForEditingHandler.php  | 10 ++--------
 .../CartRule/CommonCartRuleFeatureContext.php      | 14 +-------------
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php b/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php
index f5c93f72048bd..3671222264e40 100644
--- a/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php
+++ b/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php
@@ -31,11 +31,8 @@
 use CartRule;
 use DateTime;
 use PrestaShop\Decimal\DecimalNumber;
-use PrestaShop\PrestaShop\Adapter\CartRule\AbstractCartRuleHandler;
 use PrestaShop\PrestaShop\Adapter\CartRule\LegacyDiscountApplicationType;
 use PrestaShop\PrestaShop\Adapter\CartRule\Repository\CartRuleRepository;
-use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleException;
-use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Query\GetCartRuleForEditing;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\QueryHandler\GetCartRuleForEditingHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\QueryResult\CartRuleActionForEditing;
@@ -54,7 +51,7 @@
 /**
  * Handles command which gets catalog price rule for editing using legacy object model
  */
-class GetCartRuleForEditingHandler extends AbstractCartRuleHandler implements GetCartRuleForEditingHandlerInterface
+class GetCartRuleForEditingHandler implements GetCartRuleForEditingHandlerInterface
 {
     public function __construct(
         protected CartRuleRepository $cartRuleRepository
@@ -65,14 +62,11 @@ public function __construct(
      * @param GetCartRuleForEditing $query
      *
      * @return CartRuleForEditing
-     *
-     * @throws CartRuleException
-     * @throws CartRuleNotFoundException
      */
     public function handle(GetCartRuleForEditing $query): CartRuleForEditing
     {
         $cartRuleId = $query->cartRuleId;
-        $cartRule = $this->getCartRule($cartRuleId);
+        $cartRule = $this->cartRuleRepository->get($cartRuleId);
 
         $cartRuleInformation = $this->getCartRuleInformation($cartRule);
         $cartRuleConditions = $this->getCartRuleConditions($cartRule);
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CommonCartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CommonCartRuleFeatureContext.php
index 0529687a0c121..ee80aa2feb06d 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CommonCartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CommonCartRuleFeatureContext.php
@@ -39,18 +39,6 @@ class CommonCartRuleFeatureContext extends AbstractCartRuleFeatureContext
      */
     public static function restoreCartRules(): void
     {
-        DatabaseDump::restoreTables([
-            'cart_rule',
-            'cart_rule_shop',
-            'cart_rule_lang',
-            'cart_cart_rule',
-            'cart_rule_carrier',
-            'cart_rule_combination',
-            'cart_rule_country',
-            'cart_rule_group',
-            'cart_rule_product_rule',
-            'cart_rule_product_rule_group',
-            'cart_rule_product_rule_value',
-        ]);
+        DatabaseDump::restoreMatchingTables('^cart_rule.*^');
     }
 }

From c5509d8efbe21fe0531b70bb10851e382ecdcbc2 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Thu, 15 Jun 2023 13:01:01 +0300
Subject: [PATCH 0119/1030]  skip duplicate ids

---
 src/Adapter/CartRule/Repository/CartRuleRepository.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Adapter/CartRule/Repository/CartRuleRepository.php b/src/Adapter/CartRule/Repository/CartRuleRepository.php
index 94a6a8fd334f5..b4f89312c3275 100644
--- a/src/Adapter/CartRule/Repository/CartRuleRepository.php
+++ b/src/Adapter/CartRule/Repository/CartRuleRepository.php
@@ -147,9 +147,15 @@ public function restrictCartRules(CartRuleId $cartRuleId, array $restrictedCartR
             return;
         }
 
+        $checkedIds = [];
         $insertValues = [];
         foreach ($restrictedCartRuleIds as $restrictedCartRuleId) {
+            // skip duplicate ids if for some reason they exist
+            if (in_array($restrictedCartRuleId, $checkedIds, true)) {
+                continue;
+            }
             $insertValues[] = sprintf('(%d,%d)', $cartRuleId->getValue(), $restrictedCartRuleId->getValue());
+            $checkedIds[] = $restrictedCartRuleId;
         }
 
         $this->removeRestrictedCartRules($cartRuleId);

From 7855655698f2617c763f3e0707acee095d4ead27 Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Fri, 19 May 2023 16:52:37 +0200
Subject: [PATCH 0120/1030] Complete cache_id

---
 src/Adapter/Presenter/Cart/CartPresenter.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/Adapter/Presenter/Cart/CartPresenter.php b/src/Adapter/Presenter/Cart/CartPresenter.php
index 446968dd03494..39a000e6beb92 100644
--- a/src/Adapter/Presenter/Cart/CartPresenter.php
+++ b/src/Adapter/Presenter/Cart/CartPresenter.php
@@ -308,22 +308,19 @@ public function addCustomizedData(array $products, Cart $cart)
 
     /**
      * @param Cart $cart
-     * @param bool $shouldSeparateGifts
-     *
-     * @return array
      *
      * @throws \Exception
      */
-    public function present($cart, $shouldSeparateGifts = false)
+    public function present($cart, bool $shouldSeparateGifts = false): array
     {
-        $cache_id = 'presentedCart_' . (int) $shouldSeparateGifts;
+        $cache_id = 'presentedCart_' . (int) $shouldSeparateGifts . $cart->id;
         if (Cache::isStored($cache_id)) {
             return Cache::retrieve($cache_id);
         }
+
         if (!is_a($cart, 'Cart')) {
             throw new \Exception('CartPresenter can only present instance of Cart');
         }
-
         if ($shouldSeparateGifts) {
             $rawProducts = $cart->getProductsWithSeparatedGifts();
         } else {

From 97857ff8160cf2f849053a08d350938b9f6ce368 Mon Sep 17 00:00:00 2001
From: boubkerbribri <boubker.bribri@prestashop.com>
Date: Thu, 15 Jun 2023 18:11:20 +0200
Subject: [PATCH 0121/1030] Remove deprecated functions for Faker V8 and use
 new functions

---
 tests/UI/data/faker/CMSpage.ts             |  2 +-
 tests/UI/data/faker/address.ts             | 22 +++++++++++-------
 tests/UI/data/faker/brandAddress.ts        | 12 +++++-----
 tests/UI/data/faker/carrier.ts             | 14 ++++++------
 tests/UI/data/faker/cartRule.ts            |  2 +-
 tests/UI/data/faker/catalogPriceRule.ts    |  4 ++--
 tests/UI/data/faker/contact.ts             | 12 +++++++---
 tests/UI/data/faker/country.ts             |  4 ++--
 tests/UI/data/faker/customer.ts            | 16 ++++++++-----
 tests/UI/data/faker/deliverySlipOptions.ts |  2 +-
 tests/UI/data/faker/employee.ts            | 14 ++++++++----
 tests/UI/data/faker/group.ts               |  2 +-
 tests/UI/data/faker/imageType.ts           |  4 ++--
 tests/UI/data/faker/invoice.ts             |  2 +-
 tests/UI/data/faker/message.ts             |  6 ++---
 tests/UI/data/faker/order.ts               |  4 ++--
 tests/UI/data/faker/orderStatus.ts         |  2 +-
 tests/UI/data/faker/product.ts             | 26 +++++++++++-----------
 tests/UI/data/faker/productReview.ts       |  6 ++---
 tests/UI/data/faker/role.ts                |  2 +-
 tests/UI/data/faker/sqlQuery.ts            |  2 +-
 tests/UI/data/faker/state.ts               |  2 +-
 tests/UI/data/faker/store.ts               | 16 ++++++-------
 tests/UI/data/faker/supplier.ts            |  8 +++----
 tests/UI/data/faker/tax.ts                 |  2 +-
 tests/UI/data/faker/taxRule.ts             |  2 +-
 tests/UI/data/faker/taxRulesGroup.ts       |  2 +-
 tests/UI/data/faker/title.ts               |  2 +-
 tests/UI/data/faker/webservice.ts          |  2 +-
 tests/UI/data/import/addresses.ts          | 14 ++++++------
 tests/UI/data/import/brands.ts             |  2 +-
 tests/UI/data/import/customers.ts          | 16 ++++++-------
 32 files changed, 126 insertions(+), 102 deletions(-)

diff --git a/tests/UI/data/faker/CMSpage.ts b/tests/UI/data/faker/CMSpage.ts
index 15e2d93649f58..90865282dc427 100644
--- a/tests/UI/data/faker/CMSpage.ts
+++ b/tests/UI/data/faker/CMSpage.ts
@@ -36,7 +36,7 @@ export default class CMSPageData {
     this.id = pageToCreate.id || 0;
 
     /** @type {string} Title of the page */
-    this.title = pageToCreate.title || faker.random.word();
+    this.title = pageToCreate.title || faker.lorem.word();
 
     /** @type {string} Meta title of the page */
     this.metaTitle = pageToCreate.metaTitle || faker.lorem.word();
diff --git a/tests/UI/data/faker/address.ts b/tests/UI/data/faker/address.ts
index fee9e06453dd6..e29407acea0af 100644
--- a/tests/UI/data/faker/address.ts
+++ b/tests/UI/data/faker/address.ts
@@ -60,19 +60,25 @@ export default class AddressData {
     this.name = addressToCreate.name || faker.word.noun();
 
     /** @type {string} Customer firstname */
-    this.firstName = addressToCreate.firstName || faker.name.firstName();
+    this.firstName = addressToCreate.firstName || faker.person.firstName();
 
     /** @type {string} Customer lastname */
-    this.lastName = addressToCreate.lastName || faker.name.lastName();
+    this.lastName = addressToCreate.lastName || faker.person.lastName();
 
     /** @type {string} Related customer email */
-    this.email = addressToCreate.email || faker.internet.email(this.firstName, this.lastName, 'prestashop.com');
+    this.email = addressToCreate.email || faker.internet.email(
+      {
+        firstName: this.firstName,
+        lastName: this.lastName,
+        provider: 'prestashop.com',
+      },
+    );
 
     /** @type {string} Tax identification number of the customer */
     this.dni = addressToCreate.dni || '';
 
     /** @type {string} Address alias or name */
-    this.alias = addressToCreate.alias || faker.address.streetAddress();
+    this.alias = addressToCreate.alias || faker.location.streetAddress();
 
     /** @type {string} Company name if it's a company address */
     this.company = (addressToCreate.company || faker.company.name()).substring(0, 63);
@@ -81,16 +87,16 @@ export default class AddressData {
     this.vatNumber = addressToCreate.vatNumber || '';
 
     /** @type {string} Address first line */
-    this.address = addressToCreate.address || faker.address.streetAddress();
+    this.address = addressToCreate.address || faker.location.streetAddress();
 
     /** @type {string} Address second line */
-    this.secondAddress = addressToCreate.secondAddress || faker.address.secondaryAddress();
+    this.secondAddress = addressToCreate.secondAddress || faker.location.secondaryAddress();
 
     /** @type {string} Address postal code (default to this format #####) */
-    this.postalCode = addressToCreate.postalCode || faker.address.zipCode('#####');
+    this.postalCode = addressToCreate.postalCode || faker.location.zipCode('#####');
 
     /** @type {string} Address city name */
-    this.city = addressToCreate.city || faker.address.city();
+    this.city = addressToCreate.city || faker.location.city();
 
     /** @type {string} Address country name */
     this.country = addressToCreate.country || faker.helpers.arrayElement(countriesNames);
diff --git a/tests/UI/data/faker/brandAddress.ts b/tests/UI/data/faker/brandAddress.ts
index d46e716ff99a7..e8c4a4a91efdb 100644
--- a/tests/UI/data/faker/brandAddress.ts
+++ b/tests/UI/data/faker/brandAddress.ts
@@ -47,22 +47,22 @@ export default class BrandAddressData {
     this.brandName = brandAddressToCreate.brandName || '--';
 
     /** @type {string} Linked address firstname */
-    this.firstName = brandAddressToCreate.firstName || faker.name.firstName();
+    this.firstName = brandAddressToCreate.firstName || faker.person.firstName();
 
     /** @type {string} Linked address lastname */
-    this.lastName = brandAddressToCreate.lastName || faker.name.lastName();
+    this.lastName = brandAddressToCreate.lastName || faker.person.lastName();
 
     /** @type {string} Address first line */
-    this.address = brandAddressToCreate.address || faker.address.streetAddress();
+    this.address = brandAddressToCreate.address || faker.location.streetAddress();
 
     /** @type {string} Address second line */
-    this.secondaryAddress = brandAddressToCreate.secondaryAddress || faker.address.secondaryAddress();
+    this.secondaryAddress = brandAddressToCreate.secondaryAddress || faker.location.secondaryAddress();
 
     /** @type {string} Address postal code (default to this format #####) */
-    this.postalCode = brandAddressToCreate.postalCode || faker.address.zipCode();
+    this.postalCode = brandAddressToCreate.postalCode || faker.location.zipCode();
 
     /** @type {string} Address city name */
-    this.city = brandAddressToCreate.city || faker.address.city();
+    this.city = brandAddressToCreate.city || faker.location.city();
 
     /** @type {string} Address country name */
     this.country = brandAddressToCreate.country || faker.helpers.arrayElement(countriesNames);
diff --git a/tests/UI/data/faker/carrier.ts b/tests/UI/data/faker/carrier.ts
index 85297aff1daaa..2af775f7b62c1 100644
--- a/tests/UI/data/faker/carrier.ts
+++ b/tests/UI/data/faker/carrier.ts
@@ -85,7 +85,7 @@ export default class CarrierData {
     this.delay = carrierToCreate.delay || '';
 
     /** @type {number} Shipping delay, 0 for longest and 9 for shortest */
-    this.speedGrade = carrierToCreate.speedGrade || faker.datatype.number({min: 1, max: 9});
+    this.speedGrade = carrierToCreate.speedGrade || faker.number.int({min: 1, max: 9});
 
     /** @type {string} Url of carrier tracking */
     this.trakingURL = carrierToCreate.trakingURL || 'https://example.com/track.php?num=20';
@@ -106,28 +106,28 @@ export default class CarrierData {
     this.outOfRangeBehavior = carrierToCreate.outOfRangeBehavior || faker.helpers.arrayElement(outOfRangeBehavior);
 
     /** @type {number} Superior range for the carrier */
-    this.rangeSup = carrierToCreate.rangeSup || faker.datatype.number({min: 1, max: 100});
+    this.rangeSup = carrierToCreate.rangeSup || faker.number.int({min: 1, max: 100});
 
     /** @type {boolean} True to apply it to all zones */
     this.allZones = carrierToCreate.allZones === undefined ? true : carrierToCreate.allZones;
 
     /** @type {number} Value to set when all zones is checked */
-    this.allZonesValue = carrierToCreate.allZonesValue || faker.datatype.number({min: 1, max: 100});
+    this.allZonesValue = carrierToCreate.allZonesValue || faker.number.int({min: 1, max: 100});
 
     /** @type {number} ID of the zone on carrier form */
     this.zoneID = carrierToCreate.zoneID || faker.helpers.arrayElement(zonesID);
 
     /** @type {number} Max width that the carrier can handle */
-    this.maxWidth = carrierToCreate.maxWidth || faker.datatype.number({min: 1, max: 100});
+    this.maxWidth = carrierToCreate.maxWidth || faker.number.int({min: 1, max: 100});
 
     /** @type {number} Max height that the carrier can handle */
-    this.maxHeight = carrierToCreate.maxHeight || faker.datatype.number({min: 1, max: 100});
+    this.maxHeight = carrierToCreate.maxHeight || faker.number.int({min: 1, max: 100});
 
     /** @type {number} Max depth that the carrier can handle */
-    this.maxDepth = carrierToCreate.maxDepth || faker.datatype.number({min: 1, max: 100});
+    this.maxDepth = carrierToCreate.maxDepth || faker.number.int({min: 1, max: 100});
 
     /** @type {number} Max weight that the carrier can handle */
-    this.maxWeight = carrierToCreate.maxWeight || faker.datatype.number({min: 1, max: 100});
+    this.maxWeight = carrierToCreate.maxWeight || faker.number.int({min: 1, max: 100});
 
     /** @type {boolean} Status of the carrier */
     this.enable = carrierToCreate.enable === undefined ? true : carrierToCreate.enable;
diff --git a/tests/UI/data/faker/cartRule.ts b/tests/UI/data/faker/cartRule.ts
index 02cd4d8558d0a..1a9ce362ef2fd 100644
--- a/tests/UI/data/faker/cartRule.ts
+++ b/tests/UI/data/faker/cartRule.ts
@@ -166,7 +166,7 @@ export default class CartRuleData {
     this.discountAmount = null;
 
     if (this.discountType === 'Percent') {
-      this.discountPercent = cartRuleToCreate.discountPercent || faker.datatype.number({min: 10, max: 80});
+      this.discountPercent = cartRuleToCreate.discountPercent || faker.number.int({min: 10, max: 80});
     } else if (this.discountType === 'Amount') {
       this.discountAmount = cartRuleToCreate.discountAmount || {
         value: 0,
diff --git a/tests/UI/data/faker/catalogPriceRule.ts b/tests/UI/data/faker/catalogPriceRule.ts
index 448c3c5e39e8a..16864b08c8712 100644
--- a/tests/UI/data/faker/catalogPriceRule.ts
+++ b/tests/UI/data/faker/catalogPriceRule.ts
@@ -57,7 +57,7 @@ export default class CatalogPriceRuleData {
 
     /** @type {number} Minimum quantity to apply price rule */
     this.fromQuantity = priceRuleToCreate.fromQuantity === undefined
-      ? faker.datatype.number({min: 1, max: 9})
+      ? faker.number.int({min: 1, max: 9})
       : priceRuleToCreate.fromQuantity;
 
     /** @type {string} Starting date to apply the price rule  */
@@ -73,6 +73,6 @@ export default class CatalogPriceRuleData {
     this.reductionTax = priceRuleToCreate.reductionTax || faker.helpers.arrayElement(reductionTax);
 
     /** @type {number} Reduction value of the price rule */
-    this.reduction = priceRuleToCreate.reduction || faker.datatype.number({min: 20, max: 30});
+    this.reduction = priceRuleToCreate.reduction || faker.number.int({min: 20, max: 30});
   }
 }
diff --git a/tests/UI/data/faker/contact.ts b/tests/UI/data/faker/contact.ts
index 6c2dacef075c0..00e2a05154b44 100644
--- a/tests/UI/data/faker/contact.ts
+++ b/tests/UI/data/faker/contact.ts
@@ -30,16 +30,22 @@ export default class ContactData {
     this.id = contactToCreate.id || 0;
 
     /** @type {string} Firstname of the contact */
-    this.firstName = contactToCreate.firstName || faker.name.firstName();
+    this.firstName = contactToCreate.firstName || faker.person.firstName();
 
     /** @type {string} Lastname of the contact */
-    this.lastName = contactToCreate.lastName || faker.name.lastName();
+    this.lastName = contactToCreate.lastName || faker.person.lastName();
 
     /** @type {string} Title of the contact */
     this.title = contactToCreate.title || `${this.firstName} ${this.lastName}`;
 
     /** @type {string} Email of the contact */
-    this.email = contactToCreate.email || faker.internet.email(this.firstName, this.lastName, 'prestashop.com');
+    this.email = contactToCreate.email || faker.internet.email(
+      {
+        firstName: this.firstName,
+        lastName: this.lastName,
+        provider: 'prestashop.com',
+      },
+    );
 
     /** @type {boolean} True to save messages sent for the contact */
     this.saveMessage = contactToCreate.saveMessage === undefined ? true : contactToCreate.saveMessage;
diff --git a/tests/UI/data/faker/country.ts b/tests/UI/data/faker/country.ts
index 4e12b0c477bd5..fa364faa4a0fa 100644
--- a/tests/UI/data/faker/country.ts
+++ b/tests/UI/data/faker/country.ts
@@ -47,10 +47,10 @@ export default class CountryData {
     this.id = countryToCreate.id || 0;
 
     /** @type {string} Name of the country */
-    this.name = countryToCreate.name || `test${faker.address.country()}`;
+    this.name = countryToCreate.name || `test${faker.location.country()}`;
 
     /** @type {string} Country iso code */
-    this.isoCode = countryToCreate.isoCode || faker.address.countryCode();
+    this.isoCode = countryToCreate.isoCode || faker.location.countryCode();
 
     /** @type {string} Country call Prefix */
     this.callPrefix = countryToCreate.callPrefix || '0';
diff --git a/tests/UI/data/faker/customer.ts b/tests/UI/data/faker/customer.ts
index b9bef37dcdc90..34ac01a611320 100644
--- a/tests/UI/data/faker/customer.ts
+++ b/tests/UI/data/faker/customer.ts
@@ -61,19 +61,25 @@ export default class CustomerData {
     this.socialTitle = customerToCreate.socialTitle || faker.helpers.arrayElement(genders);
 
     /** @type {string} Firstname of the customer */
-    this.firstName = customerToCreate.firstName || faker.name.firstName();
+    this.firstName = customerToCreate.firstName || faker.person.firstName();
 
     /** @type {string} Lastname of the customer */
-    this.lastName = customerToCreate.lastName || faker.name.lastName();
+    this.lastName = customerToCreate.lastName || faker.person.lastName();
 
     /** @type {string} Email for the customer account */
-    this.email = customerToCreate.email || faker.internet.email(this.firstName, this.lastName, 'prestashop.com');
+    this.email = customerToCreate.email || faker.internet.email(
+      {
+        firstName: this.firstName,
+        lastName: this.lastName,
+        provider: 'prestashop.com',
+      },
+    );
 
     /** @type {string} Password for the customer account */
     this.password = customerToCreate.password === undefined ? faker.internet.password() : customerToCreate.password;
 
     /** @type {Date} Birthdate of the customer */
-    this.birthDate = customerToCreate.birthDate || faker.date.between('1950-01-01', '2000-12-31');
+    this.birthDate = customerToCreate.birthDate || faker.date.between({from: '1950-01-01', to: '2000-12-31'});
 
     /** @type {string} Year of the birth 'yyyy' */
     this.yearOfBirth = customerToCreate.yearOfBirth || this.birthDate.getFullYear().toString();
@@ -100,7 +106,7 @@ export default class CustomerData {
     this.company = customerToCreate.company || faker.company.name();
 
     /** @type {Number} Allowed outstanding amount for the customer */
-    this.allowedOutstandingAmount = customerToCreate.allowedOutstandingAmount || faker.datatype.number({
+    this.allowedOutstandingAmount = customerToCreate.allowedOutstandingAmount || faker.number.int({
       min: 0,
       max: 100,
     });
diff --git a/tests/UI/data/faker/deliverySlipOptions.ts b/tests/UI/data/faker/deliverySlipOptions.ts
index 9c8a1a17ad471..c7ae973b6c842 100644
--- a/tests/UI/data/faker/deliverySlipOptions.ts
+++ b/tests/UI/data/faker/deliverySlipOptions.ts
@@ -20,6 +20,6 @@ export default class DeliverySlipOptionsData {
     this.prefix = deliverySlipOptions.prefix || `#${faker.lorem.word()}`;
 
     /** @type {number} Number of delivery slips created */
-    this.number = deliverySlipOptions.number || faker.datatype.number({min: 10, max: 200});
+    this.number = deliverySlipOptions.number || faker.number.int({min: 10, max: 200});
   }
 }
diff --git a/tests/UI/data/faker/employee.ts b/tests/UI/data/faker/employee.ts
index 27610fece91e8..dda49672a5ec0 100644
--- a/tests/UI/data/faker/employee.ts
+++ b/tests/UI/data/faker/employee.ts
@@ -45,14 +45,20 @@ export default class EmployeeData {
     /** @type {number} Employee ID */
     this.id = employeeToCreate.id || 0;
 
-    /** @type {string} Employee fistname */
-    this.firstName = employeeToCreate.firstName || faker.name.firstName();
+    /** @type {string} Employee firstname */
+    this.firstName = employeeToCreate.firstName || faker.person.firstName();
 
     /** @type {string} Employee lastname */
-    this.lastName = employeeToCreate.lastName || faker.name.lastName();
+    this.lastName = employeeToCreate.lastName || faker.person.lastName();
 
     /** @type {string} Email of the employee */
-    this.email = employeeToCreate.email || faker.internet.email(this.firstName, this.lastName, 'prestashop.com');
+    this.email = employeeToCreate.email || faker.internet.email(
+      {
+        firstName: this.firstName,
+        lastName: this.lastName,
+        provider: 'prestashop.com',
+      },
+    );
 
     /** @type {string} Password for the employee account */
     this.password = employeeToCreate.password || 'prestashop_demo';
diff --git a/tests/UI/data/faker/group.ts b/tests/UI/data/faker/group.ts
index 86bf63bc181af..27d07bb249216 100644
--- a/tests/UI/data/faker/group.ts
+++ b/tests/UI/data/faker/group.ts
@@ -30,7 +30,7 @@ export default class GroupData {
     this.id = groupToCreate.id || 0;
 
     /** @type {string} Name of the group */
-    this.name = groupToCreate.name || faker.name.jobType();
+    this.name = groupToCreate.name || faker.person.jobType();
 
     /** @type {string} French name of the group */
     this.frName = groupToCreate.frName || this.name;
diff --git a/tests/UI/data/faker/imageType.ts b/tests/UI/data/faker/imageType.ts
index 5c50fc79984f9..6e880595f848c 100644
--- a/tests/UI/data/faker/imageType.ts
+++ b/tests/UI/data/faker/imageType.ts
@@ -36,10 +36,10 @@ export default class ImageTypeData {
     this.name = imageTypeToCreate.name || faker.lorem.word();
 
     /** @type {number} Image width */
-    this.width = imageTypeToCreate.width || faker.datatype.number({min: 100, max: 200});
+    this.width = imageTypeToCreate.width || faker.number.int({min: 100, max: 200});
 
     /** @type {number} Image height */
-    this.height = imageTypeToCreate.height || faker.datatype.number({min: 100, max: 200});
+    this.height = imageTypeToCreate.height || faker.number.int({min: 100, max: 200});
 
     /** @type {boolean} To activate type for products */
     this.productsStatus = imageTypeToCreate.productsStatus === undefined
diff --git a/tests/UI/data/faker/invoice.ts b/tests/UI/data/faker/invoice.ts
index e6cbb76d7f6b4..6e0faad05d387 100644
--- a/tests/UI/data/faker/invoice.ts
+++ b/tests/UI/data/faker/invoice.ts
@@ -21,7 +21,7 @@ export default class InvoiceData {
    */
   constructor(invoiceOptions: InvoiceCreator = {}) {
     /** @type {number} Invoice number to set on form */
-    this.invoiceNumber = invoiceOptions.invoiceNumber || faker.datatype.number({min: 100, max: 200}).toString();
+    this.invoiceNumber = invoiceOptions.invoiceNumber || faker.number.int({min: 100, max: 200}).toString();
 
     /** @type {string} legal free text to add to invoice */
     this.legalFreeText = invoiceOptions.legalFreeText || faker.lorem.sentence().substring(0, 10);
diff --git a/tests/UI/data/faker/message.ts b/tests/UI/data/faker/message.ts
index 6511607367cb8..0cd5da5e1868e 100644
--- a/tests/UI/data/faker/message.ts
+++ b/tests/UI/data/faker/message.ts
@@ -34,17 +34,17 @@ export default class MessageData {
     this.subject = messageToCreate.subject || faker.helpers.arrayElement(subject);
 
     /** @type {string} Firstname of the customer */
-    this.firstName = messageToCreate.firstName || faker.name.firstName();
+    this.firstName = messageToCreate.firstName || faker.person.firstName();
 
     /** @type {string} Firstname of the customer */
-    this.lastName = messageToCreate.lastName || faker.name.lastName();
+    this.lastName = messageToCreate.lastName || faker.person.lastName();
 
     /** @type {string} employee to forward the message */
     this.employeeName = messageToCreate.employeeName || `${this.firstName.slice(0.1)}. ${this.lastName}`;
 
     /** @type {string} Email of the customer */
     this.emailAddress = messageToCreate.emailAddress === undefined
-      ? faker.internet.email(this.firstName, this.lastName, 'prestashop.com')
+      ? faker.internet.email({firstName: this.firstName, lastName: this.lastName, provider: 'prestashop.com'})
       : messageToCreate.emailAddress;
 
     /** @type {string} Reference for on order if used */
diff --git a/tests/UI/data/faker/order.ts b/tests/UI/data/faker/order.ts
index 293cc56d229eb..d7c9534916bdd 100644
--- a/tests/UI/data/faker/order.ts
+++ b/tests/UI/data/faker/order.ts
@@ -52,9 +52,9 @@ export default class OrderData {
     /** @type {number} */
     this.id = valueToCreate.id || 0;
     /** @type {string} */
-    this.reference = valueToCreate.reference || faker.random.alpha({
+    this.reference = valueToCreate.reference || faker.string.alpha({
       casing: 'upper',
-      count: 9,
+      length: 9,
     });
 
     /** @type {boolean} */
diff --git a/tests/UI/data/faker/orderStatus.ts b/tests/UI/data/faker/orderStatus.ts
index 73beaf3b1b1bb..6e788ee48d047 100644
--- a/tests/UI/data/faker/orderStatus.ts
+++ b/tests/UI/data/faker/orderStatus.ts
@@ -56,7 +56,7 @@ export default class OrderStatusData {
     /** @type {boolean} True to hide this status in all customer orders. */
     this.hiddenOn = orderStatusToCreate.hiddenOn === undefined ? true : orderStatusToCreate.hiddenOn;
 
-    /** @type {boolean} True to send an email to the customer when his/her order status has changed */
+    /** @type {boolean} True to email the customer when his/her order status has changed */
     this.sendEmailOn = orderStatusToCreate.sendEmailOn === undefined ? true : orderStatusToCreate.sendEmailOn;
 
     /** @type {boolean} True to attach invoice PDF to email */
diff --git a/tests/UI/data/faker/product.ts b/tests/UI/data/faker/product.ts
index e28a760915935..4e56d5bad69c4 100644
--- a/tests/UI/data/faker/product.ts
+++ b/tests/UI/data/faker/product.ts
@@ -133,21 +133,21 @@ export default class ProductData {
     this.description = productToCreate.description === undefined ? faker.lorem.sentence() : productToCreate.description;
 
     /** @type {string} Reference of the product */
-    this.reference = productToCreate.reference || faker.random.alphaNumeric(7);
+    this.reference = productToCreate.reference || faker.string.alphanumeric(7);
 
     /** @type {number} Quantity available of the product */
     this.quantity = productToCreate.quantity === undefined
-      ? faker.datatype.number({min: 1, max: 9})
+      ? faker.number.int({min: 1, max: 9})
       : productToCreate.quantity;
 
     /** @type {number} Tax for the product */
     this.tax = productToCreate.tax === undefined
-      ? faker.datatype.number({min: 1, max: 100})
+      ? faker.number.int({min: 1, max: 100})
       : productToCreate.tax;
 
     /** @type {number} Price tax included of the product */
     this.price = productToCreate.price === undefined
-      ? faker.datatype.number({min: 10, max: 20}) : productToCreate.price;
+      ? faker.number.int({min: 10, max: 20}) : productToCreate.price;
 
     /** @type {number} Retail price of the product */
     this.retailPrice = productToCreate.retailPrice === undefined
@@ -181,11 +181,11 @@ export default class ProductData {
     this.pack = productToCreate.pack || [
       {
         reference: 'demo_1',
-        quantity: faker.datatype.number({min: 10, max: 100}),
+        quantity: faker.number.int({min: 10, max: 100}),
       },
       {
         reference: 'demo_2',
-        quantity: faker.datatype.number({min: 10, max: 100}),
+        quantity: faker.number.int({min: 10, max: 100}),
       },
     ];
 
@@ -194,20 +194,20 @@ export default class ProductData {
 
     /** @type {number} EcoTax tax included of the product */
     this.ecoTax = productToCreate.ecoTax === undefined
-      ? faker.datatype.number({min: 1, max: 5})
+      ? faker.number.int({min: 1, max: 5})
       : productToCreate.ecoTax;
 
     /** @type {ProductSpecificPrice} Specific price of the product */
     this.specificPrice = productToCreate.specificPrice || {
       attributes: 'Size - S, Color - White',
-      discount: faker.datatype.number({min: 10, max: 100}),
-      startingAt: faker.datatype.number({min: 2, max: 5}),
+      discount: faker.number.int({min: 10, max: 100}),
+      startingAt: faker.number.int({min: 2, max: 5}),
       reductionType: '',
     };
 
     /** @type {number} Minimum quantity to buy for the product */
     this.minimumQuantity = productToCreate.minimumQuantity === undefined
-      ? faker.datatype.number({min: 1, max: 9})
+      ? faker.number.int({min: 1, max: 9})
       : productToCreate.minimumQuantity;
 
     /** @type {string} Stock location of the product */
@@ -215,7 +215,7 @@ export default class ProductData {
 
     /** @type {number} Low stock level of the product */
     this.lowStockLevel = productToCreate.lowStockLevel === undefined
-      ? faker.datatype.number({min: 1, max: 9})
+      ? faker.number.int({min: 1, max: 9})
       : productToCreate.lowStockLevel;
 
     /** @type {string} Label to add if product is in stock */
@@ -241,10 +241,10 @@ export default class ProductData {
     this.fileName = productToCreate.fileName || 'virtual.jpg';
 
     /** @type {number} Number of allowed downloads */
-    this.allowedDownload = productToCreate.allowedDownload || faker.datatype.number({min: 1, max: 20});
+    this.allowedDownload = productToCreate.allowedDownload || faker.number.int({min: 1, max: 20});
 
     /** @type {number} Weight of the package */
-    this.weight = productToCreate.weight || faker.datatype.number({min: 1, max: 20});
+    this.weight = productToCreate.weight || faker.number.int({min: 1, max: 20});
 
     /** @type {ProductCombination[]} */
     this.combinations = productToCreate.combinations || [];
diff --git a/tests/UI/data/faker/productReview.ts b/tests/UI/data/faker/productReview.ts
index 46115a8474551..e2fed7fbfa3f9 100755
--- a/tests/UI/data/faker/productReview.ts
+++ b/tests/UI/data/faker/productReview.ts
@@ -20,13 +20,13 @@ export default class ProductReviewData {
   constructor(productReviewToCreate: ProductReviewCreator = {}) {
     /** @type {string} Title of the review */
     this.reviewTitle = productReviewToCreate.reviewTitle
-      || faker.lorem.sentence(faker.datatype.number({min: 3, max: 7}));
+      || faker.lorem.sentence(faker.number.int({min: 3, max: 7}));
 
     /** @type {string} Content of the review */
     this.reviewContent = productReviewToCreate.reviewContent
-      || faker.lorem.sentences(faker.datatype.number({min: 3, max: 10}));
+      || faker.lorem.sentences(faker.number.int({min: 3, max: 10}));
 
     /** @type {number} Rating of the review */
-    this.reviewRating = productReviewToCreate.reviewRating || faker.datatype.number({min: 1, max: 5});
+    this.reviewRating = productReviewToCreate.reviewRating || faker.number.int({min: 1, max: 5});
   }
 }
diff --git a/tests/UI/data/faker/role.ts b/tests/UI/data/faker/role.ts
index b3525547dd962..3b2b9865178f7 100644
--- a/tests/UI/data/faker/role.ts
+++ b/tests/UI/data/faker/role.ts
@@ -15,6 +15,6 @@ export default class RoleData {
    */
   constructor(roleToCreate: RoleCreator = {}) {
     /** @type {string} Name of the profile */
-    this.name = roleToCreate.name || faker.name.jobType();
+    this.name = roleToCreate.name || faker.person.jobType();
   }
 }
diff --git a/tests/UI/data/faker/sqlQuery.ts b/tests/UI/data/faker/sqlQuery.ts
index de8bfe16c29b5..a4f704444dbef 100644
--- a/tests/UI/data/faker/sqlQuery.ts
+++ b/tests/UI/data/faker/sqlQuery.ts
@@ -23,7 +23,7 @@ export default class SqlQueryData {
    */
   constructor(sqlQueryToCreate: SqlQueryCreator = {}) {
     /** @type {string} Name of the query */
-    this.name = sqlQueryToCreate.name || faker.random.word();
+    this.name = sqlQueryToCreate.name || faker.lorem.word();
 
     /** @type {string} Table to use on the query */
     this.tableName = sqlQueryToCreate.tableName || faker.helpers.arrayElement(tableNames);
diff --git a/tests/UI/data/faker/state.ts b/tests/UI/data/faker/state.ts
index 999b4ccf9025d..5826dda3206ac 100644
--- a/tests/UI/data/faker/state.ts
+++ b/tests/UI/data/faker/state.ts
@@ -36,7 +36,7 @@ export default class StateData {
     this.id = stateToCreate.id || 0;
 
     /** @type {string} Name of the state */
-    this.name = stateToCreate.name || `test ${faker.address.state()}`;
+    this.name = stateToCreate.name || `test ${faker.location.state()}`;
 
     /** @type {string} Iso code of the state */
     this.isoCode = stateToCreate.isoCode || faker.helpers.arrayElement(statesIsoCodes);
diff --git a/tests/UI/data/faker/store.ts b/tests/UI/data/faker/store.ts
index 7ee855cef5c70..6e716d7e7790c 100644
--- a/tests/UI/data/faker/store.ts
+++ b/tests/UI/data/faker/store.ts
@@ -56,28 +56,28 @@ export default class StoreData {
     this.name = storeToCreate.name || faker.company.name();
 
     /** @type {string} First line address of the store */
-    this.address1 = storeToCreate.address1 || faker.address.streetAddress();
+    this.address1 = storeToCreate.address1 || faker.location.streetAddress();
 
     /** @type {string} Second line address of the store */
-    this.address2 = storeToCreate.address2 || faker.address.secondaryAddress();
+    this.address2 = storeToCreate.address2 || faker.location.secondaryAddress();
 
     /** @type {string} Postal code of the store */
-    this.postcode = storeToCreate.postcode || faker.address.zipCode('#####');
+    this.postcode = storeToCreate.postcode || faker.location.zipCode('#####');
 
     /** @type {string} City for the address of the store */
-    this.city = storeToCreate.city || faker.address.city();
+    this.city = storeToCreate.city || faker.location.city();
 
     /** @type {string} State for the address of the store */
-    this.state = storeToCreate.state || faker.address.state();
+    this.state = storeToCreate.state || faker.location.state();
 
     /** @type {string} Country of the address of the store */
     this.country = storeToCreate.country || 'France';
 
     /** @type {string} Latitude of the address of the store */
-    this.latitude = storeToCreate.latitude || faker.address.latitude().toString();
+    this.latitude = storeToCreate.latitude || faker.location.latitude().toString();
 
     /** @type {string} Longitude of the address of the store */
-    this.longitude = storeToCreate.longitude || faker.address.longitude().toString();
+    this.longitude = storeToCreate.longitude || faker.location.longitude().toString();
 
     /** @type {string} Phone number of the store (default format 01########) */
     this.phone = storeToCreate.phone || faker.phone.number('01########');
@@ -86,7 +86,7 @@ export default class StoreData {
     this.fax = storeToCreate.fax || faker.phone.number('01########');
 
     /** @type {string} Registration number of the store */
-    this.registrationNumber = storeToCreate.registrationNumber || faker.finance.account();
+    this.registrationNumber = storeToCreate.registrationNumber || faker.finance.accountNumber();
 
     /** @type {string} Email to contact the store */
     this.email = storeToCreate.email || faker.internet.email();
diff --git a/tests/UI/data/faker/supplier.ts b/tests/UI/data/faker/supplier.ts
index 6ba33b473aaef..04d507cf20791 100644
--- a/tests/UI/data/faker/supplier.ts
+++ b/tests/UI/data/faker/supplier.ts
@@ -75,16 +75,16 @@ export default class SupplierData {
     this.mobilePhone = supplierToCreate.mobilePhone || faker.phone.number('06########');
 
     /** @type {string} First line address of the supplier */
-    this.address = supplierToCreate.address || faker.address.streetAddress();
+    this.address = supplierToCreate.address || faker.location.streetAddress();
 
     /** @type {string} Second line address of the supplier */
-    this.secondaryAddress = supplierToCreate.secondaryAddress || faker.address.secondaryAddress();
+    this.secondaryAddress = supplierToCreate.secondaryAddress || faker.location.secondaryAddress();
 
     /** @type {string} Postal code of the supplier */
-    this.postalCode = supplierToCreate.postalCode || faker.address.zipCode().replace('.', '-');
+    this.postalCode = supplierToCreate.postalCode || faker.location.zipCode().replace('.', '-');
 
     /** @type {string} City for the address of the supplier */
-    this.city = supplierToCreate.city || faker.address.city();
+    this.city = supplierToCreate.city || faker.location.city();
 
     /** @type {string} Country for the address of the supplier */
     this.country = supplierToCreate.country || faker.helpers.arrayElement(countriesNames);
diff --git a/tests/UI/data/faker/tax.ts b/tests/UI/data/faker/tax.ts
index 6392f9b36c1bf..f6b007719b7be 100644
--- a/tests/UI/data/faker/tax.ts
+++ b/tests/UI/data/faker/tax.ts
@@ -27,7 +27,7 @@ export default class TaxData {
     this.id = taxToCreate.id || 0;
 
     /** @type {string} Tax of the rate */
-    this.rate = taxToCreate.rate || faker.datatype.number({min: 1, max: 40}).toString();
+    this.rate = taxToCreate.rate || faker.number.int({min: 1, max: 40}).toString();
 
     /** @type {string} Name of the tax */
     this.name = taxToCreate.name || `TVA test ${this.rate}%`;
diff --git a/tests/UI/data/faker/taxRule.ts b/tests/UI/data/faker/taxRule.ts
index b2128481bac1c..d05f81d12ea50 100644
--- a/tests/UI/data/faker/taxRule.ts
+++ b/tests/UI/data/faker/taxRule.ts
@@ -38,7 +38,7 @@ export default class TaxRuleData {
     this.country = taxRulesToCreate.country || faker.helpers.arrayElement(countriesNames);
 
     /** @type {string} Postal code of the country */
-    this.zipCode = taxRulesToCreate.zipCode || faker.address.zipCode();
+    this.zipCode = taxRulesToCreate.zipCode || faker.location.zipCode();
 
     /** @type {string} Behavior of the tax rule */
     this.behaviour = taxRulesToCreate.behaviour || faker.helpers.arrayElement(TaxRuleBehaviour);
diff --git a/tests/UI/data/faker/taxRulesGroup.ts b/tests/UI/data/faker/taxRulesGroup.ts
index cc182abe86c48..6b7dca4798c3f 100644
--- a/tests/UI/data/faker/taxRulesGroup.ts
+++ b/tests/UI/data/faker/taxRulesGroup.ts
@@ -18,7 +18,7 @@ export default class TaxRulesGroupData {
    */
   constructor(taxRulesGroupToCreate: TaxRulesGroupCreator = {}) {
     /** @type {string} Name of the tax rules group */
-    this.name = (taxRulesGroupToCreate.name || `FR tax Rule ${faker.random.word()}`).substring(0, 30).trim();
+    this.name = (taxRulesGroupToCreate.name || `FR tax Rule ${faker.lorem.word()}`).substring(0, 30).trim();
 
     /** @type {boolean} Status of the tax rules group */
     this.enabled = taxRulesGroupToCreate.enabled === undefined ? true : taxRulesGroupToCreate.enabled;
diff --git a/tests/UI/data/faker/title.ts b/tests/UI/data/faker/title.ts
index 96545820c1f7c..084c25d1df791 100644
--- a/tests/UI/data/faker/title.ts
+++ b/tests/UI/data/faker/title.ts
@@ -34,7 +34,7 @@ export default class TitleData {
 
     // Title name should contain at most 20 characters
     /** @type {string} Name of the title */
-    this.name = titleToCreate.name || (faker.random.word()).substring(0, 19).trim();
+    this.name = titleToCreate.name || (faker.lorem.word()).substring(0, 19).trim();
 
     /** @type {string} French name of the title */
     this.frName = titleToCreate.frName || this.name;
diff --git a/tests/UI/data/faker/webservice.ts b/tests/UI/data/faker/webservice.ts
index 556b432451a02..419607e6b81f4 100644
--- a/tests/UI/data/faker/webservice.ts
+++ b/tests/UI/data/faker/webservice.ts
@@ -22,7 +22,7 @@ export default class WebserviceData {
    */
   constructor(webserviceToCreate: WebserviceCreator = {}) {
     /** @type {string} Key of the webservice */
-    this.key = webserviceToCreate.key || faker.datatype.uuid().substring(0, 32);
+    this.key = webserviceToCreate.key || faker.string.uuid().substring(0, 32);
 
     /** @type {string} Key description of the webservice */
     this.keyDescription = webserviceToCreate.keyDescription || faker.lorem.sentence();
diff --git a/tests/UI/data/import/addresses.ts b/tests/UI/data/import/addresses.ts
index abd389ce21fe7..76ee06f3e5187 100644
--- a/tests/UI/data/import/addresses.ts
+++ b/tests/UI/data/import/addresses.ts
@@ -14,19 +14,19 @@ function createRecord(): ImportAddress[] {
   for (let i: number = 0; i < 10; i++) {
     records.push({
       id: i + 3,
-      alias: faker.address.streetAddress(),
-      active: faker.datatype.number({min: 0, max: 1}),
+      alias: faker.location.streetAddress(),
+      active: faker.number.int({min: 0, max: 1}),
       email: Customers.johnDoe.email,
       customerID: Customers.johnDoe.id,
       manufacturer: '',
       supplier: '',
       company: faker.company.name(),
       lastname: 'test',
-      firstname: faker.name.firstName(),
-      address1: faker.address.streetAddress(),
-      address2: faker.address.secondaryAddress(),
-      zipCode: faker.address.zipCode('#####'),
-      city: faker.address.city(),
+      firstname: faker.person.firstName(),
+      address1: faker.location.streetAddress(),
+      address2: faker.location.secondaryAddress(),
+      zipCode: faker.location.zipCode('#####'),
+      city: faker.location.city(),
       country: faker.helpers.arrayElement(countriesNames),
       state: '',
       other: '',
diff --git a/tests/UI/data/import/brands.ts b/tests/UI/data/import/brands.ts
index 587fdba308c2e..1fcff194695c1 100644
--- a/tests/UI/data/import/brands.ts
+++ b/tests/UI/data/import/brands.ts
@@ -10,7 +10,7 @@ function createRecord(): ImportBrand[] {
     const name = `todelete ${faker.company.name()}`;
     records.push({
       id: i + 2,
-      active: faker.datatype.number({min: 0, max: 1}),
+      active: faker.number.int({min: 0, max: 1}),
       name,
       description: faker.lorem.sentence(),
       shortDescription: faker.lorem.sentence(),
diff --git a/tests/UI/data/import/customers.ts b/tests/UI/data/import/customers.ts
index f220658a8c159..d8f3d4cd1ef55 100644
--- a/tests/UI/data/import/customers.ts
+++ b/tests/UI/data/import/customers.ts
@@ -11,19 +11,19 @@ const records: ImportCustomer[] = [];
 
 function createRecord(): ImportCustomer[] {
   for (let i: number = 0; i < 10; i++) {
-    const lastName = faker.name.lastName();
+    const lastName = faker.person.lastName();
     records.push({
       id: i + 3,
-      active: faker.datatype.number({min: 0, max: 1}),
-      title: faker.datatype.number({min: 1, max: 2}),
+      active: faker.number.int({min: 0, max: 1}),
+      title: faker.number.int({min: 1, max: 2}),
       email: `test.${lastName}@prestashop.com`,
       password: faker.internet.password(),
-      birthdate: faker.date.between('1950-01-01', '2000-12-31').toISOString().slice(0, 10),
+      birthdate: faker.date.between({from: '1950-01-01', to: '2000-12-31'}).toISOString().slice(0, 10),
       lastName,
-      firstName: faker.name.firstName(),
-      newsletter: faker.datatype.number({min: 0, max: 1}),
-      optIn: faker.datatype.number({min: 0, max: 1}),
-      registrationDate: faker.date.past(2).toISOString().slice(0, 10),
+      firstName: faker.person.firstName(),
+      newsletter: faker.number.int({min: 0, max: 1}),
+      optIn: faker.number.int({min: 0, max: 1}),
+      registrationDate: faker.date.past({years: 2}).toISOString().slice(0, 10),
       groups: faker.helpers.arrayElement(groups),
       defaultGroup: faker.helpers.arrayElement(groups),
     });

From 178c4a482fac52d85404296f6e2124a8c60287b3 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Fri, 14 Apr 2023 10:44:27 +0200
Subject: [PATCH 0122/1030] Remove deprecated method `getClassName` in class
 `Tab`

---
 classes/Tab.php | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/classes/Tab.php b/classes/Tab.php
index 3dfa2718d290e..ba536a8c415de 100644
--- a/classes/Tab.php
+++ b/classes/Tab.php
@@ -353,7 +353,7 @@ public static function getTabs($idLang, $idParent = null)
      */
     public static function getIdFromClassName($className)
     {
-        $className = self::getClassName($className);
+        $className = strtolower($className);
         if (empty(self::$_getIdFromClassName)) {
             self::$_getIdFromClassName = [];
             $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('SELECT id_tab, class_name FROM `' . _DB_PREFIX_ . 'tab`', true, false);
@@ -368,29 +368,6 @@ public static function getIdFromClassName($className)
         return isset(self::$_getIdFromClassName[$className]) ? (int) self::$_getIdFromClassName[$className] : false;
     }
 
-    /**
-     * @deprecated 1.7.0, to be removed in 1.7.1. Upgrade module to 1.7.
-     */
-    private static function getClassName($className)
-    {
-        $legacyClassNames = [
-            'AdminTools',
-            'AdminPriceRule',
-            'AdminAdmin',
-            'AdminParentStats',
-            'AdminMarketing',
-            'AdminCarrierWizard',
-            'AdminTabs',
-        ];
-
-        if (in_array($className, $legacyClassNames)) {
-            @trigger_error($className . ' is a deprecated tab since version 1.7.0 and "Default" will be removed in 1.7.1.. Upgrade module using the docs: http://build.prestashop.com/news/how-we-reorganized-main-menu-prestashop-1.7/.', E_USER_DEPRECATED);
-            $className = 'DEFAULT';
-        }
-
-        return strtolower($className);
-    }
-
     /**
      * Get collection from module name.
      *

From 074fcf3c87971239adc90f48fc1dfd45488edad2 Mon Sep 17 00:00:00 2001
From: Kaikina <finalfantasydeadcrisis@hotmail.fr>
Date: Fri, 16 Jun 2023 11:48:58 +0200
Subject: [PATCH 0123/1030] Fix updateQuantity PHPDOC

---
 classes/stock/StockAvailable.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/stock/StockAvailable.php b/classes/stock/StockAvailable.php
index e354df31cdcd1..7910d61e163e1 100644
--- a/classes/stock/StockAvailable.php
+++ b/classes/stock/StockAvailable.php
@@ -536,7 +536,7 @@ public function postSave()
      * If $avoid_parent_pack_update is true, then packs containing the given product won't be updated.
      *
      * @param int $id_product
-     * @param int $id_product_attribute Optional
+     * @param int|null $id_product_attribute Optional
      * @param int $delta_quantity The delta quantity to update
      * @param int $id_shop Optional
      * @param bool $add_movement Optional

From 059ee4668bcc8cca43bd7b564c5f9f7b35cd05b7 Mon Sep 17 00:00:00 2001
From: Kaikina <finalfantasydeadcrisis@hotmail.fr>
Date: Fri, 16 Jun 2023 12:03:08 +0200
Subject: [PATCH 0124/1030] Fix StockManager.php PHPDOC

---
 src/Core/Stock/StockManager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Core/Stock/StockManager.php b/src/Core/Stock/StockManager.php
index 816fc9d4d26c1..f1957fba50f7f 100644
--- a/src/Core/Stock/StockManager.php
+++ b/src/Core/Stock/StockManager.php
@@ -143,7 +143,7 @@ public function updatePacksQuantityContainingProduct($product, $id_product_attri
      * If Product is contained in a Pack, Pack could be decreased or not (only if sub product stocks become not sufficient).
      *
      * @param Product $product The product to update its stockAvailable
-     * @param int $id_product_attribute The declinaison to update (null if not)
+     * @param int|null $id_product_attribute The declinaison to update (null if not)
      * @param int $delta_quantity The quantity change (positive or negative)
      * @param int|null $id_shop Optional
      * @param bool $add_movement Optional

From df1e388a728dcc0d6ca60c6bac4500e423b0fa03 Mon Sep 17 00:00:00 2001
From: Kaikina <finalfantasydeadcrisis@hotmail.fr>
Date: Fri, 16 Jun 2023 12:03:53 +0200
Subject: [PATCH 0125/1030] Fix StockManager.php PHPDOC

---
 src/Adapter/StockManager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Adapter/StockManager.php b/src/Adapter/StockManager.php
index 3ecebe0c1a4f1..56f2f98d1f48d 100644
--- a/src/Adapter/StockManager.php
+++ b/src/Adapter/StockManager.php
@@ -43,7 +43,7 @@ class StockManager implements StockInterface
      * Gets available stock for a given product / combination / shop.
      *
      * @param object $product
-     * @param null $id_product_attribute
+     * @param int|null $id_product_attribute
      * @param int|null $id_shop
      *
      * @return StockAvailable

From 722861be434b6673801c9749ed763c4ff101df1a Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Fri, 16 Jun 2023 14:01:00 +0200
Subject: [PATCH 0126/1030] Remove deprecated method `getClassName` in class
 `Tab` : Removed unuseful UI test

---
 .../regression/menu/deniedAccessToMenuTab.ts  | 60 -------------------
 1 file changed, 60 deletions(-)
 delete mode 100644 tests/UI/campaigns/regression/menu/deniedAccessToMenuTab.ts

diff --git a/tests/UI/campaigns/regression/menu/deniedAccessToMenuTab.ts b/tests/UI/campaigns/regression/menu/deniedAccessToMenuTab.ts
deleted file mode 100644
index a29634331d799..0000000000000
--- a/tests/UI/campaigns/regression/menu/deniedAccessToMenuTab.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-// Import utils
-import helper from '@utils/helpers';
-import testContext from '@utils/testContext';
-
-// Import commonTests
-import loginCommon from '@commonTests/BO/loginBO';
-
-// Import pages
-import menuTabPage from '@pages/BO/advancedParameters/menuTab';
-import dashboardPage from '@pages/BO/dashboard';
-
-import {expect} from 'chai';
-import type {BrowserContext, Page} from 'playwright';
-
-const baseContext: string = 'regression_menu_deniedAccessToMenuTab';
-
-describe('Regression : Access to Menu tab is denied with neither left menu and Url', async () => {
-  let browserContext: BrowserContext;
-  let page: Page;
-
-  const pageUrl: string = `${global.BO.URL}index.php?controller=AdminTabs`;
-
-  // before and after functions
-  before(async function () {
-    browserContext = await helper.createBrowserContext(this.browser);
-    page = await helper.newTab(browserContext);
-  });
-
-  after(async () => {
-    await helper.closeBrowserContext(browserContext);
-  });
-
-  it('should login in BO', async function () {
-    await loginCommon.loginBO(this, page);
-  });
-
-  it('should go check that menu tab on left menu is not visible', async function () {
-    await testContext.addContextItem(this, 'testIdentifier', 'menuTabNotVisible', baseContext);
-
-    const isMenuTabVisible = await dashboardPage.isSubmenuVisible(
-      page,
-      dashboardPage.advancedParametersLink,
-      dashboardPage.menuTabLink,
-    );
-    await expect(isMenuTabVisible, 'The Menu tab is still visible').to.be.false;
-  });
-
-  it('should accessing the page by Url be denied', async function () {
-    await testContext.addContextItem(this, 'testIdentifier', 'checkUrlAccessibility', baseContext);
-
-    await dashboardPage.navigateToPageWithInvalidToken(page, pageUrl);
-
-    // Check Title
-    const pageTitle = await menuTabPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(menuTabPage.pageTitle);
-
-    const alertText = await menuTabPage.getAlertDangerBlockParagraphContent(page);
-    await expect(alertText).to.contain(menuTabPage.accessDeniedMessage);
-  });
-});

From 42fa6cef70d67d50791db0f5ecaab5c00aa9b4db Mon Sep 17 00:00:00 2001
From: Fabien Papet <fabien.papet@gmail.com>
Date: Fri, 16 Jun 2023 16:20:48 +0200
Subject: [PATCH 0127/1030] Remove deprecated actions buttons

---
 .../Admin/Sell/Order/ActionsBarButton.php     | 36 -------------------
 .../Sell/Order/ActionsBarButtonInterface.php  | 36 -------------------
 .../Order/ActionsBarButtonsCollection.php     | 36 -------------------
 3 files changed, 108 deletions(-)
 delete mode 100644 src/PrestaShopBundle/Controller/Admin/Sell/Order/ActionsBarButton.php
 delete mode 100644 src/PrestaShopBundle/Controller/Admin/Sell/Order/ActionsBarButtonInterface.php
 delete mode 100644 src/PrestaShopBundle/Controller/Admin/Sell/Order/ActionsBarButtonsCollection.php

diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Order/ActionsBarButton.php b/src/PrestaShopBundle/Controller/Admin/Sell/Order/ActionsBarButton.php
deleted file mode 100644
index f2e2c0c1a1c3f..0000000000000
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Order/ActionsBarButton.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-namespace PrestaShopBundle\Controller\Admin\Sell\Order;
-
-use PrestaShop\PrestaShop\Core\Action\ActionsBarButton as CoreActionsBarButton;
-
-/**
- * @deprecated since 8.0 and will be removed in next major. Use PrestaShop\PrestaShop\Core\ActionBar\ActionsBarButton instead
- */
-class ActionsBarButton extends CoreActionsBarButton implements ActionsBarButtonInterface
-{
-}
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Order/ActionsBarButtonInterface.php b/src/PrestaShopBundle/Controller/Admin/Sell/Order/ActionsBarButtonInterface.php
deleted file mode 100644
index 2179c1634e9a5..0000000000000
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Order/ActionsBarButtonInterface.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-namespace PrestaShopBundle\Controller\Admin\Sell\Order;
-
-use PrestaShop\PrestaShop\Core\Action\ActionsBarButtonInterface as CoreActionsBarButtonInterface;
-
-/**
- * @deprecated since 8.0 and will be removed in next major. Use PrestaShop\PrestaShop\Core\ActionBar\ActionsBarButtonInterface instead
- */
-interface ActionsBarButtonInterface extends CoreActionsBarButtonInterface
-{
-}
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Order/ActionsBarButtonsCollection.php b/src/PrestaShopBundle/Controller/Admin/Sell/Order/ActionsBarButtonsCollection.php
deleted file mode 100644
index 6f4a02acc1ba6..0000000000000
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Order/ActionsBarButtonsCollection.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-namespace PrestaShopBundle\Controller\Admin\Sell\Order;
-
-use PrestaShop\PrestaShop\Core\Action\ActionsBarButtonsCollection as CoreActionsBarButtonsCollection;
-
-/**
- * @deprecated since 8.0 and will be removed in next major. Use PrestaShop\PrestaShop\Core\ActionBar\ActionsBarButtonsCollection instead
- */
-class ActionsBarButtonsCollection extends CoreActionsBarButtonsCollection
-{
-}

From 5372896617b6cf6b6ed65fa92fb2ef6870a08e80 Mon Sep 17 00:00:00 2001
From: Fabien Papet <fabien.papet@gmail.com>
Date: Mon, 5 Jun 2023 15:58:22 +0200
Subject: [PATCH 0128/1030] DI controllers

Signed-off-by: Fabien Papet <fabien.papet@gmail.com>
---
 app/AppKernel.php                             | 32 ++++++-----
 .../Controller/Admin/ErrorController.php      |  6 +--
 .../Admin/FrameworkBundleAdminController.php  | 21 +++++++-
 .../Admin/Improve/ModuleController.php        |  8 +--
 .../Admin/PrestaShopAdminController.php       | 53 +++++++++++++++++++
 .../Controller/Admin/SecurityController.php   | 32 ++++++-----
 .../Admin/Sell/Order/OrderController.php      | 10 ++--
 .../Compiler/ContainerInjectionPass.php       |  5 +-
 .../Compiler/LoadServicesFromModulesPass.php  |  2 +
 src/PrestaShopBundle/PrestaShopBundle.php     |  4 --
 .../config/services/bundle/controller.yml     | 52 +++++++-----------
 11 files changed, 147 insertions(+), 78 deletions(-)
 create mode 100644 src/PrestaShopBundle/Controller/Admin/PrestaShopAdminController.php

diff --git a/app/AppKernel.php b/app/AppKernel.php
index 041a7148d0239..9ee48db8a5d68 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -204,24 +204,28 @@ public function getLogDir()
      */
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
-        $loader->load(function (ContainerBuilder $container) {
-            $container->setParameter('container.autowiring.strict_mode', true);
-            $container->setParameter('container.dumper.inline_class_loader', false);
-            $container->addObjectResource($this);
-        });
+        $installedModules = $this->getActiveModules();
 
         $loader->load($this->getRootDir() . '/config/config_' . $this->getEnvironment() . '.yml');
 
-        // Add translation paths to load into the translator. The paths are loaded by the Symfony's FrameworkExtension
-        $loader->load(function (ContainerBuilder $container) {
-            /** @var array $moduleTranslationsPaths */
-            $moduleTranslationsPaths = $container->getParameter('modules_translation_paths');
-            foreach ($this->getActiveModules() as $activeModulePath) {
-                $translationsDir = _PS_MODULE_DIR_ . $activeModulePath . '/translations';
-                if (is_dir($translationsDir)) {
-                    $moduleTranslationsPaths[] = $translationsDir;
-                }
+        $moduleTranslationsPaths = [];
+        foreach ($installedModules as $activeModulePath)
+        {
+            $modulePath = _PS_MODULE_DIR_ . $activeModulePath;
+            $configPath = sprintf('%s/config/services.yml', $modulePath);
+            $translationsPath = sprintf('%s/translations', $modulePath);
+            if (is_file($configPath)) {
+                $loader->load($configPath);
+            }
+            if (is_dir($translationsPath)) {
+                $moduleTranslationsPaths[] = $translationsPath;
             }
+        }
+
+        $loader->load(function (ContainerBuilder $container) use ($moduleTranslationsPaths) {
+            $container->setParameter('container.autowiring.strict_mode', true);
+            $container->setParameter('container.dumper.inline_class_loader', false);
+            $container->addObjectResource($this);
             $container->setParameter('modules_translation_paths', $moduleTranslationsPaths);
         });
     }
diff --git a/src/PrestaShopBundle/Controller/Admin/ErrorController.php b/src/PrestaShopBundle/Controller/Admin/ErrorController.php
index 2bc0e7c90a063..fb156cff4844f 100644
--- a/src/PrestaShopBundle/Controller/Admin/ErrorController.php
+++ b/src/PrestaShopBundle/Controller/Admin/ErrorController.php
@@ -34,7 +34,7 @@
 /**
  * Manages Error pages (e.g. 500)
  */
-class ErrorController extends FrameworkBundleAdminController
+class ErrorController extends PrestaShopAdminController
 {
     /**
      * Enables debug mode from error page (500 for example)
@@ -47,9 +47,9 @@ class ErrorController extends FrameworkBundleAdminController
      *
      * @return RedirectResponse
      */
-    public function enableDebugModeAction(Request $request)
+    public function enableDebugModeAction(Request $request): RedirectResponse
     {
-        $this->getCommandBus()->handle(new SwitchDebugModeCommand(true));
+        $this->dispatchCommand(new SwitchDebugModeCommand(true));
 
         return $this->redirect(
             $request->request->get('_redirect_url')
diff --git a/src/PrestaShopBundle/Controller/Admin/FrameworkBundleAdminController.php b/src/PrestaShopBundle/Controller/Admin/FrameworkBundleAdminController.php
index f3dd109f7121b..cc963037b33cf 100644
--- a/src/PrestaShopBundle/Controller/Admin/FrameworkBundleAdminController.php
+++ b/src/PrestaShopBundle/Controller/Admin/FrameworkBundleAdminController.php
@@ -34,7 +34,9 @@
 use PrestaShop\PrestaShop\Core\Localization\Locale\Repository as LocaleRepository;
 use PrestaShop\PrestaShop\Core\Module\Exception\ModuleErrorInterface;
 use PrestaShop\PrestaShop\Core\Security\Permission;
+use Psr\Container\ContainerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
@@ -43,10 +45,27 @@
 /**
  * Extends The Symfony framework bundle controller to add common functions for PrestaShop needs.
  */
-class FrameworkBundleAdminController extends AbstractController
+class FrameworkBundleAdminController extends AbstractController implements ContainerAwareInterface
 {
+    /**
+     * @deprecated since 9.0
+     */
     public const PRESTASHOP_CORE_CONTROLLERS_TAG = 'prestashop.core.controllers';
 
+    /**
+     * Override to make this compatible with the ContainerAware signature, content should be the same as in the abstract.
+     * Do not override this neither use this, it will be removed in next versions.
+     *
+     * @internal
+     */
+    public function setContainer(ContainerInterface $container = null): ?ContainerInterface
+    {
+        $previous = $this->container;
+        $this->container = $container;
+
+        return $previous;
+    }
+
     /**
      * @var string|null
      */
diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/ModuleController.php b/src/PrestaShopBundle/Controller/Admin/Improve/ModuleController.php
index 11a7ad632d0f1..b41ad84042b9e 100644
--- a/src/PrestaShopBundle/Controller/Admin/Improve/ModuleController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Improve/ModuleController.php
@@ -192,9 +192,9 @@ public function moduleAction(Request $request)
 
         $module = $request->get('module_name');
         $source = $request->query->get('source');
-        $moduleManager = $this->container->get('prestashop.module.manager');
-        $moduleRepository = $this->container->get('prestashop.core.admin.module.repository');
-        $modulesProvider = $this->container->get('prestashop.core.admin.data_provider.module_interface');
+        $moduleManager = $this->get('prestashop.module.manager');
+        $moduleRepository = $this->get('prestashop.core.admin.module.repository');
+        $modulesProvider = $this->get('prestashop.core.admin.data_provider.module_interface');
         $response = [$module => []];
 
         if (!method_exists($moduleManager, $action)) {
@@ -265,7 +265,7 @@ public function moduleAction(Request $request)
             $modulePresenter = $this->get('prestashop.adapter.presenter.module');
             $collectionPresented = $modulePresenter->presentCollection($collectionWithActionUrls);
 
-            $response[$module]['action_menu_html'] = $this->container->get('twig')->render(
+            $response[$module]['action_menu_html'] = $this->get('twig')->render(
                 '@PrestaShop/Admin/Module/Includes/action_menu.html.twig',
                 [
                     'module' => $collectionPresented[0],
diff --git a/src/PrestaShopBundle/Controller/Admin/PrestaShopAdminController.php b/src/PrestaShopBundle/Controller/Admin/PrestaShopAdminController.php
new file mode 100644
index 0000000000000..51f9c22d02123
--- /dev/null
+++ b/src/PrestaShopBundle/Controller/Admin/PrestaShopAdminController.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\Controller\Admin;
+
+use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+
+/**
+ * Default controller for PrestaShop admin pages.
+ */
+class PrestaShopAdminController extends AbstractController
+{
+    public static function getSubscribedServices(): array
+    {
+        return parent::getSubscribedServices() + [
+            CommandBusInterface::class => CommandBusInterface::class,
+        ];
+    }
+
+    /**
+     * Get commands bus to execute commands.
+     */
+    protected function dispatchCommand(mixed $command): void
+    {
+        $this->container->get(CommandBusInterface::class)->handle($command);
+    }
+}
diff --git a/src/PrestaShopBundle/Controller/Admin/SecurityController.php b/src/PrestaShopBundle/Controller/Admin/SecurityController.php
index 053affe17ffd6..1426cff45b868 100644
--- a/src/PrestaShopBundle/Controller/Admin/SecurityController.php
+++ b/src/PrestaShopBundle/Controller/Admin/SecurityController.php
@@ -26,38 +26,46 @@
 
 namespace PrestaShopBundle\Controller\Admin;
 
+use PrestaShopBundle\Service\DataProvider\UserProvider;
 use PrestaShopBundle\Service\Routing\Router as PrestaShopRouter;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
 use Symfony\Component\Validator\Constraints as Assert;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
 
 /**
- * Admin controller to manage security pages.
+ * Security warning controller
  */
-class SecurityController extends FrameworkBundleAdminController
+class SecurityController extends PrestaShopAdminController
 {
-    public function compromisedAccessAction(Request $request)
+    public function __construct(
+        private readonly UserProvider $userProvider,
+        private readonly CsrfTokenManagerInterface $tokenManager,
+        private readonly ValidatorInterface $validator
+    ) {
+    }
+
+    public function compromisedAccessAction(Request $request): Response
     {
         $requestUri = urldecode($request->query->get('uri'));
         $url = new Assert\Url();
-        $violations = $this->get('validator')->validate($requestUri, [$url]);
+        $violations = $this->validator->validate($requestUri, [$url]);
         if ($violations->count()) {
             return $this->redirect('dashboard');
         }
 
         // getToken() actually generate a new token
-        $username = $this->get('prestashop.user_provider')->getUsername();
+        $username = $this->userProvider->getUsername();
 
-        $newToken = $this->get('security.csrf.token_manager')
+        $newToken = $this->tokenManager
             ->getToken($username)
             ->getValue();
 
         $newUri = PrestaShopRouter::generateTokenizedUrl($requestUri, $newToken);
 
-        return $this->render(
-            '@PrestaShop/Admin/Security/compromised.html.twig',
-            [
-                'requestUri' => $newUri,
-            ]
-        );
+        return $this->render('@PrestaShop/Admin/Security/compromised.html.twig', [
+            'requestUri' => $newUri,
+        ]);
     }
 }
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Order/OrderController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Order/OrderController.php
index 452922df2320f..597ef887252c5 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Order/OrderController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Order/OrderController.php
@@ -233,7 +233,7 @@ public function placeAction(Request $request)
     public function createAction(Request $request)
     {
         /** @var ShopContext $shopContextChecker */
-        $shopContextChecker = $this->container->get('prestashop.adapter.shop.context');
+        $shopContextChecker = $this->get('prestashop.adapter.shop.context');
 
         if (!$shopContextChecker->isSingleShopContext()) {
             $this->addFlash('error', $this->trans(
@@ -479,7 +479,7 @@ public function viewAction(int $orderId, Request $request): Response
             'order_id' => $orderId,
         ]);
 
-        $currencyDataProvider = $this->container->get('prestashop.adapter.data_provider.currency');
+        $currencyDataProvider = $this->get('prestashop.adapter.data_provider.currency');
         //@todo: Fix me. Should not rely on legacy object model - Currency
         $orderCurrency = $currencyDataProvider->getCurrencyById($orderForViewing->getCurrencyId());
 
@@ -776,7 +776,7 @@ public function addProductAction(int $orderId, Request $request): Response
         $formBuilder = $this->get('prestashop.core.form.identifiable_object.builder.cancel_product_form_builder');
         $cancelProductForm = $formBuilder->getFormFor($orderId);
 
-        $currencyDataProvider = $this->container->get('prestashop.adapter.data_provider.currency');
+        $currencyDataProvider = $this->get('prestashop.adapter.data_provider.currency');
         $orderCurrency = $currencyDataProvider->getCurrencyById($orderForViewing->getCurrencyId());
 
         $addedGridRows = '';
@@ -1044,7 +1044,7 @@ public function updateProductAction(int $orderId, int $orderDetailId, Request $r
         $formBuilder = $this->get('prestashop.core.form.identifiable_object.builder.cancel_product_form_builder');
         $cancelProductForm = $formBuilder->getFormFor($orderId);
 
-        $currencyDataProvider = $this->container->get('prestashop.adapter.data_provider.currency');
+        $currencyDataProvider = $this->get('prestashop.adapter.data_provider.currency');
         $orderCurrency = $currencyDataProvider->getCurrencyById($orderForViewing->getCurrencyId());
 
         return $this->render('@PrestaShop/Admin/Sell/Order/Order/Blocks/View/product.html.twig', [
@@ -1577,7 +1577,7 @@ public function getProductsListAction(int $orderId): Response
         /** @var OrderForViewing $orderForViewing */
         $orderForViewing = $this->getQueryBus()->handle(new GetOrderForViewing($orderId, QuerySorting::DESC));
 
-        $currencyDataProvider = $this->container->get('prestashop.adapter.data_provider.currency');
+        $currencyDataProvider = $this->get('prestashop.adapter.data_provider.currency');
         $orderCurrency = $currencyDataProvider->getCurrencyById($orderForViewing->getCurrencyId());
 
         $formBuilder = $this->get('prestashop.core.form.identifiable_object.builder.cancel_product_form_builder');
diff --git a/src/PrestaShopBundle/DependencyInjection/Compiler/ContainerInjectionPass.php b/src/PrestaShopBundle/DependencyInjection/Compiler/ContainerInjectionPass.php
index eb4d6417d6be1..bfb9feffa607f 100644
--- a/src/PrestaShopBundle/DependencyInjection/Compiler/ContainerInjectionPass.php
+++ b/src/PrestaShopBundle/DependencyInjection/Compiler/ContainerInjectionPass.php
@@ -30,7 +30,6 @@
 
 use InvalidArgumentException;
 use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -41,6 +40,8 @@
  * Controllers lose the ControllerAwareTrait capabilities when they are decorated.
  *
  * This pass injects the container into PrestaShop tagged controllers to overcome this issue.
+ *
+ * @deprecated since 9.0, to be removed in 10.0. Controller are now services and can use dependency injection.
  */
 class ContainerInjectionPass implements CompilerPassInterface
 {
@@ -66,7 +67,7 @@ public function process(ContainerBuilder $container)
 
             $isContainerAware = (
                 $reflectedClass->implementsInterface(ContainerAwareInterface::class)
-                || is_subclass_of($class, AbstractController::class)
+                || is_subclass_of($class, FrameworkBundleAdminController::class)
             );
 
             if ($isContainerAware) {
diff --git a/src/PrestaShopBundle/DependencyInjection/Compiler/LoadServicesFromModulesPass.php b/src/PrestaShopBundle/DependencyInjection/Compiler/LoadServicesFromModulesPass.php
index 4d9b66b75377d..6111070c90698 100644
--- a/src/PrestaShopBundle/DependencyInjection/Compiler/LoadServicesFromModulesPass.php
+++ b/src/PrestaShopBundle/DependencyInjection/Compiler/LoadServicesFromModulesPass.php
@@ -37,6 +37,8 @@
 
 /**
  * Load services stored in installed modules.
+ *
+ * @deprecated since 9.0, to be removed in 10.0
  */
 class LoadServicesFromModulesPass implements CompilerPassInterface
 {
diff --git a/src/PrestaShopBundle/PrestaShopBundle.php b/src/PrestaShopBundle/PrestaShopBundle.php
index a9ee1d8fc55ac..9207a084109ab 100644
--- a/src/PrestaShopBundle/PrestaShopBundle.php
+++ b/src/PrestaShopBundle/PrestaShopBundle.php
@@ -27,7 +27,6 @@
 namespace PrestaShopBundle;
 
 use PrestaShopBundle\DependencyInjection\Compiler\CommandAndQueryCollectorPass;
-use PrestaShopBundle\DependencyInjection\Compiler\ContainerInjectionPass;
 use PrestaShopBundle\DependencyInjection\Compiler\DynamicRolePass;
 use PrestaShopBundle\DependencyInjection\Compiler\GridDefinitionServiceIdsCollectorPass;
 use PrestaShopBundle\DependencyInjection\Compiler\IdentifiableObjectFormTypesCollectorPass;
@@ -72,8 +71,6 @@ public function build(ContainerBuilder $container)
     {
         $container->addCompilerPass(new DynamicRolePass());
         $container->addCompilerPass(new PopulateTranslationProvidersPass());
-        $container->addCompilerPass(new LoadServicesFromModulesPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, self::LOAD_MODULE_SERVICES_PASS_PRIORITY);
-        $container->addCompilerPass(new LoadServicesFromModulesPass('admin'), PassConfig::TYPE_BEFORE_OPTIMIZATION, self::LOAD_MODULE_SERVICES_PASS_PRIORITY);
         $container->addCompilerPass(new RemoveXmlCompiledContainerPass(), PassConfig::TYPE_AFTER_REMOVING);
         $container->addCompilerPass(new RouterPass(), PassConfig::TYPE_AFTER_REMOVING);
         $container->addCompilerPass(new OverrideTranslatorServiceCompilerPass());
@@ -82,6 +79,5 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new OptionsFormHookNameCollectorPass());
         $container->addCompilerPass(new GridDefinitionServiceIdsCollectorPass());
         $container->addCompilerPass(new IdentifiableObjectFormTypesCollectorPass());
-        $container->addCompilerPass(new ContainerInjectionPass());
     }
 }
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/controller.yml b/src/PrestaShopBundle/Resources/config/services/bundle/controller.yml
index 924e918458ab4..22c66bc81c363 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/controller.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/controller.yml
@@ -2,29 +2,35 @@ services:
   _defaults:
     public: true
 
+  _instanceof:
+    # cannot use autocnfigure under _instanceof so we need to define it here
+    PrestaShopBundle\Controller\Admin\PrestaShopAdminController:
+      autowire: true
+      public: true
+      tags:
+        - 'controller.service_arguments'
+        - 'container.service_subscriber'
+    PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController:
+      calls:
+        - [ setContainer, [ '@service_container' ] ]
+
+
+  # Legacy controllers don't extend the base controller, so we need to inject the container manually.
   PrestaShopBundle\Controller\Api\ApiController:
     class: PrestaShopBundle\Controller\Api\ApiController
     calls:
       - [ setLogger, [ '@logger' ] ]
       - [ setContainer, [ '@service_container' ] ]
-    tags:
-      - { name: !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG }
 
+  # Every single controller should be loaded here, except the legacy ones, and some misplaced files are also excluded.
   PrestaShopBundle\Controller\:
     resource: "%kernel.project_dir%/src/PrestaShopBundle/Controller/*"
     exclude:
       - "%kernel.project_dir%/src/PrestaShopBundle/Controller/Api"
-      - "%kernel.project_dir%/../src/PrestaShopBundle/Controller/Admin/Sell/Catalog/Product"
-    public: true
-    tags:
-      - !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG
-
-  PrestaShopBundle\Controller\Admin\Sell\Catalog\Product\:
-    resource: "%kernel.project_dir%/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/Product/*"
+      - "%kernel.project_dir%/src/PrestaShopBundle/Controller/ArgumentResolver"
+      - "%kernel.project_dir%/src/PrestaShopBundle/Controller/Exception"
     autoconfigure: true
     autowire: true
-    tags:
-      - { name: !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG }
 
   prestashop.core.api.controller:
     alias: PrestaShopBundle\Controller\Api\ApiController
@@ -37,8 +43,6 @@ services:
       movements: "@prestashop.core.api.stock.movements_collection"
       stockRepository: "@prestashop.core.api.stock.repository"
       queryParams: "@prestashop.core.api.query_stock_params_collection"
-    tags:
-      - { name: !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG }
 
   prestashop.core.api.stock.controller:
     alias: PrestaShopBundle\Controller\Api\StockController
@@ -50,8 +54,6 @@ services:
     properties:
       stockMovementRepository: "@prestashop.core.api.stock_movement.repository"
       queryParams: "@prestashop.core.api.query_stock_movement_params_collection"
-    tags:
-      - { name: !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG }
 
   prestashop.core.api.stock_movement.controller:
     alias: PrestaShopBundle\Controller\Api\StockMovementController
@@ -62,8 +64,6 @@ services:
     public: true
     properties:
       supplierRepository: "@prestashop.core.api.supplier.repository"
-    tags:
-      - { name: !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG }
 
   prestashop.core.api.supplier.controller:
     alias: PrestaShopBundle\Controller\Api\SupplierController
@@ -74,8 +74,6 @@ services:
     public: true
     properties:
       manufacturerRepository: "@prestashop.core.api.manufacturer.repository"
-    tags:
-      - { name: !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG }
 
   prestashop.core.api.manufacturer.controller:
     alias: PrestaShopBundle\Controller\Api\ManufacturerController
@@ -86,8 +84,6 @@ services:
     public: true
     properties:
       categoryRepository: "@prestashop.core.api.category.repository"
-    tags:
-      - { name: !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG }
 
   prestashop.core.api.category.controller:
     alias: PrestaShopBundle\Controller\Api\CategoryController
@@ -98,8 +94,6 @@ services:
     public: true
     properties:
       featureAttributeRepository: "@prestashop.core.api.feature_attribute.repository"
-    tags:
-      - { name: !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG }
 
   prestashop.core.api.attribute.controller:
     alias: PrestaShopBundle\Controller\Api\AttributeController
@@ -110,8 +104,6 @@ services:
     public: true
     properties:
       featureAttributeRepository: "@prestashop.core.api.feature_attribute.repository"
-    tags:
-      - { name: !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG }
 
   prestashop.core.api.feature.controller:
     alias: PrestaShopBundle\Controller\Api\FeatureController
@@ -120,8 +112,6 @@ services:
     class: PrestaShopBundle\Controller\Api\I18nController
     parent: PrestaShopBundle\Controller\Api\ApiController
     public: true
-    tags:
-      - { name: !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG }
 
   prestashop.core.api.i18n.controller:
     alias: PrestaShopBundle\Controller\Api\I18nController
@@ -133,8 +123,6 @@ services:
     properties:
       translationService: "@prestashop.service.translation"
       queryParams: "@prestashop.core.api.query_translation_params_collection"
-    tags:
-      - { name: !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG }
 
   prestashop.core.api.translation.controller:
     alias: PrestaShopBundle\Controller\Api\TranslationController
@@ -143,8 +131,6 @@ services:
     class: PrestaShopBundle\Controller\Api\Improve\Design\PositionsController
     parent: PrestaShopBundle\Controller\Api\ApiController
     public: true
-    tags:
-      - { name: !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG }
 
   prestashop.core.api.improve.design.postions.controller:
     alias: PrestaShopBundle\Controller\Api\Improve\Design\PositionsController
@@ -158,5 +144,5 @@ services:
       multiStoreContext: "@prestashop.adapter.shop.context"
       entityManager: "@doctrine.orm.entity_manager"
       productRepository: '@PrestaShop\PrestaShop\Adapter\Product\Repository\ProductRepository'
-    tags:
-      - { name: !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG }
+    calls:
+      - [ setContainer, [ '@service_container' ] ]

From 569155b5b70decf997209c28d95492a6ac927df6 Mon Sep 17 00:00:00 2001
From: Fabien Papet <fabien.papet@gmail.com>
Date: Fri, 16 Jun 2023 16:29:50 +0200
Subject: [PATCH 0129/1030] delete pass

Signed-off-by: Fabien Papet <fabien.papet@gmail.com>
---
 .../Compiler/ContainerInjectionPass.php       | 78 ----------------
 .../Compiler/LoadServicesFromModulesPass.php  | 89 -------------------
 2 files changed, 167 deletions(-)
 delete mode 100644 src/PrestaShopBundle/DependencyInjection/Compiler/ContainerInjectionPass.php
 delete mode 100644 src/PrestaShopBundle/DependencyInjection/Compiler/LoadServicesFromModulesPass.php

diff --git a/src/PrestaShopBundle/DependencyInjection/Compiler/ContainerInjectionPass.php b/src/PrestaShopBundle/DependencyInjection/Compiler/ContainerInjectionPass.php
deleted file mode 100644
index bfb9feffa607f..0000000000000
--- a/src/PrestaShopBundle/DependencyInjection/Compiler/ContainerInjectionPass.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-declare(strict_types=1);
-
-namespace PrestaShopBundle\DependencyInjection\Compiler;
-
-use InvalidArgumentException;
-use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Reference;
-
-/**
- * As explained in https://github.com/symfony/symfony/issues/36567,
- * Controllers lose the ControllerAwareTrait capabilities when they are decorated.
- *
- * This pass injects the container into PrestaShop tagged controllers to overcome this issue.
- *
- * @deprecated since 9.0, to be removed in 10.0. Controller are now services and can use dependency injection.
- */
-class ContainerInjectionPass implements CompilerPassInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function process(ContainerBuilder $container)
-    {
-        $controllers = $container->findTaggedServiceIds(FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG);
-
-        foreach ($controllers as $id => $controller) {
-            $definition = $container->findDefinition($id);
-            $class = $definition->getClass();
-            $reflectedClass = $container->getReflectionClass($class);
-
-            if (null === $reflectedClass) {
-                throw new InvalidArgumentException(sprintf(
-                    'Class "%s" used for service "%s" cannot be found.',
-                    $class,
-                    $id
-                ));
-            }
-
-            $isContainerAware = (
-                $reflectedClass->implementsInterface(ContainerAwareInterface::class)
-                || is_subclass_of($class, FrameworkBundleAdminController::class)
-            );
-
-            if ($isContainerAware) {
-                $definition->addMethodCall('setContainer', [new Reference('service_container')]);
-            }
-        }
-    }
-}
diff --git a/src/PrestaShopBundle/DependencyInjection/Compiler/LoadServicesFromModulesPass.php b/src/PrestaShopBundle/DependencyInjection/Compiler/LoadServicesFromModulesPass.php
deleted file mode 100644
index 6111070c90698..0000000000000
--- a/src/PrestaShopBundle/DependencyInjection/Compiler/LoadServicesFromModulesPass.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-namespace PrestaShopBundle\DependencyInjection\Compiler;
-
-use PrestaShop\PrestaShop\Adapter\Module\Repository\ModuleRepository;
-use Symfony\Component\Config\FileLocator;
-use Symfony\Component\Config\Loader\LoaderResolver;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
-use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
-use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
-
-/**
- * Load services stored in installed modules.
- *
- * @deprecated since 9.0, to be removed in 10.0
- */
-class LoadServicesFromModulesPass implements CompilerPassInterface
-{
-    /**
-     * @var string
-     */
-    private $configPath;
-
-    /**
-     * @var array
-     */
-    private $activeModulesPaths;
-
-    /**
-     * Used to identify which scope of services need to be loaded (front services, admin
-     * services or generic ones)
-     *
-     * @param string $containerName
-     */
-    public function __construct($containerName = '')
-    {
-        $this->configPath = '/config/' . (empty($containerName) ? '' : trim($containerName, '/') . '/');
-        $this->activeModulesPaths = (new ModuleRepository(_PS_ROOT_DIR_, _PS_MODULE_DIR_))->getActiveModulesPaths();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function process(ContainerBuilder $container)
-    {
-        if (empty($this->activeModulesPaths)) {
-            return;
-        }
-
-        foreach ($this->activeModulesPaths as $modulePath) {
-            $moduleConfigPath = $modulePath . $this->configPath;
-            if (file_exists($moduleConfigPath . 'services.yml')) {
-                $fileLocator = new FileLocator($moduleConfigPath);
-                $loader = new YamlFileLoader($container, $fileLocator);
-                $loader->setResolver(new LoaderResolver([
-                    new PhpFileLoader($container, $fileLocator),
-                    new XmlFileLoader($container, $fileLocator),
-                ]));
-                $loader->load('services.yml');
-            }
-        }
-    }
-}

From 240b5c1018991b2fd5cdfe25e88306ed6f2d4bbc Mon Sep 17 00:00:00 2001
From: Fabien Papet <fabien.papet@gmail.com>
Date: Fri, 16 Jun 2023 16:31:54 +0200
Subject: [PATCH 0130/1030] cleanup notation

Signed-off-by: Fabien Papet <fabien.papet@gmail.com>
---
 .../Resources/config/services/bundle/controller.yml            | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/controller.yml b/src/PrestaShopBundle/Resources/config/services/bundle/controller.yml
index 22c66bc81c363..07a7e775077d0 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/controller.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/controller.yml
@@ -10,9 +10,6 @@ services:
       tags:
         - 'controller.service_arguments'
         - 'container.service_subscriber'
-    PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController:
-      calls:
-        - [ setContainer, [ '@service_container' ] ]
 
 
   # Legacy controllers don't extend the base controller, so we need to inject the container manually.

From 57cfd96572ebe022ed5ac2781be69bee310b641e Mon Sep 17 00:00:00 2001
From: Fabien Papet <fabien.papet@gmail.com>
Date: Fri, 16 Jun 2023 16:37:35 +0200
Subject: [PATCH 0131/1030] cleanup notation

Signed-off-by: Fabien Papet <fabien.papet@gmail.com>
---
 .../Compiler/LoadServicesFromModulesPass.php  | 89 +++++++++++++++++++
 .../config/services/bundle/controller.yml     | 10 ---
 2 files changed, 89 insertions(+), 10 deletions(-)
 create mode 100644 src/PrestaShopBundle/DependencyInjection/Compiler/LoadServicesFromModulesPass.php

diff --git a/src/PrestaShopBundle/DependencyInjection/Compiler/LoadServicesFromModulesPass.php b/src/PrestaShopBundle/DependencyInjection/Compiler/LoadServicesFromModulesPass.php
new file mode 100644
index 0000000000000..6111070c90698
--- /dev/null
+++ b/src/PrestaShopBundle/DependencyInjection/Compiler/LoadServicesFromModulesPass.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShopBundle\DependencyInjection\Compiler;
+
+use PrestaShop\PrestaShop\Adapter\Module\Repository\ModuleRepository;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\Config\Loader\LoaderResolver;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
+use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+
+/**
+ * Load services stored in installed modules.
+ *
+ * @deprecated since 9.0, to be removed in 10.0
+ */
+class LoadServicesFromModulesPass implements CompilerPassInterface
+{
+    /**
+     * @var string
+     */
+    private $configPath;
+
+    /**
+     * @var array
+     */
+    private $activeModulesPaths;
+
+    /**
+     * Used to identify which scope of services need to be loaded (front services, admin
+     * services or generic ones)
+     *
+     * @param string $containerName
+     */
+    public function __construct($containerName = '')
+    {
+        $this->configPath = '/config/' . (empty($containerName) ? '' : trim($containerName, '/') . '/');
+        $this->activeModulesPaths = (new ModuleRepository(_PS_ROOT_DIR_, _PS_MODULE_DIR_))->getActiveModulesPaths();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function process(ContainerBuilder $container)
+    {
+        if (empty($this->activeModulesPaths)) {
+            return;
+        }
+
+        foreach ($this->activeModulesPaths as $modulePath) {
+            $moduleConfigPath = $modulePath . $this->configPath;
+            if (file_exists($moduleConfigPath . 'services.yml')) {
+                $fileLocator = new FileLocator($moduleConfigPath);
+                $loader = new YamlFileLoader($container, $fileLocator);
+                $loader->setResolver(new LoaderResolver([
+                    new PhpFileLoader($container, $fileLocator),
+                    new XmlFileLoader($container, $fileLocator),
+                ]));
+                $loader->load('services.yml');
+            }
+        }
+    }
+}
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/controller.yml b/src/PrestaShopBundle/Resources/config/services/bundle/controller.yml
index 07a7e775077d0..43513a2e92238 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/controller.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/controller.yml
@@ -2,16 +2,6 @@ services:
   _defaults:
     public: true
 
-  _instanceof:
-    # cannot use autocnfigure under _instanceof so we need to define it here
-    PrestaShopBundle\Controller\Admin\PrestaShopAdminController:
-      autowire: true
-      public: true
-      tags:
-        - 'controller.service_arguments'
-        - 'container.service_subscriber'
-
-
   # Legacy controllers don't extend the base controller, so we need to inject the container manually.
   PrestaShopBundle\Controller\Api\ApiController:
     class: PrestaShopBundle\Controller\Api\ApiController

From 1fdea5e3017b9eddfa81c88be80668e160adfda2 Mon Sep 17 00:00:00 2001
From: Fabien Papet <fabien.papet@gmail.com>
Date: Fri, 16 Jun 2023 16:40:48 +0200
Subject: [PATCH 0132/1030] deprecated

Signed-off-by: Fabien Papet <fabien.papet@gmail.com>
---
 .../Controller/Admin/FrameworkBundleAdminController.php  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/PrestaShopBundle/Controller/Admin/FrameworkBundleAdminController.php b/src/PrestaShopBundle/Controller/Admin/FrameworkBundleAdminController.php
index cc963037b33cf..6357e20557f47 100644
--- a/src/PrestaShopBundle/Controller/Admin/FrameworkBundleAdminController.php
+++ b/src/PrestaShopBundle/Controller/Admin/FrameworkBundleAdminController.php
@@ -44,6 +44,8 @@
 
 /**
  * Extends The Symfony framework bundle controller to add common functions for PrestaShop needs.
+ *
+ * @deprecated since 9.0 to be removed in future versions (10+ at least, when it will no more used)
  */
 class FrameworkBundleAdminController extends AbstractController implements ContainerAwareInterface
 {
@@ -54,7 +56,12 @@ class FrameworkBundleAdminController extends AbstractController implements Conta
 
     /**
      * Override to make this compatible with the ContainerAware signature, content should be the same as in the abstract.
-     * Do not override this neither use this, it will be removed in next versions.
+     * Do not override this neither use this, it will be removed in next versions. This overridden method
+     * along with the ContainerAwareInterface was added to skip the error sent by Symfony\Bundle\FrameworkBundle\Controller\ControllerResolver
+     * that forces the controllers extending AbstractController to be defined as service subscriber.
+     *
+     * This method allows us to keep controllers based on FrameworkBundleAdminController from being
+     * adapted. However, the core and the modules should stop using it in favor of PrestaShopAdminController
      *
      * @internal
      */

From ad5f35dd87a52bb2e25fb5b21a939641451d46a8 Mon Sep 17 00:00:00 2001
From: Fabien Papet <fabien.papet@gmail.com>
Date: Fri, 16 Jun 2023 16:51:37 +0200
Subject: [PATCH 0133/1030] Fixes

Signed-off-by: Fabien Papet <fabien.papet@gmail.com>
---
 app/AppKernel.php                                | 16 +++++++++++++---
 .../Admin/FrameworkBundleAdminController.php     |  2 +-
 .../Compiler/LoadServicesFromModulesPass.php     |  2 --
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/AppKernel.php b/app/AppKernel.php
index 9ee48db8a5d68..aef56f5295062 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -212,11 +212,21 @@ public function registerContainerConfiguration(LoaderInterface $loader)
         foreach ($installedModules as $activeModulePath)
         {
             $modulePath = _PS_MODULE_DIR_ . $activeModulePath;
-            $configPath = sprintf('%s/config/services.yml', $modulePath);
             $translationsPath = sprintf('%s/translations', $modulePath);
-            if (is_file($configPath)) {
-                $loader->load($configPath);
+
+            $configFiles = [
+                sprintf('%s/config/services.yml', $modulePath),
+                sprintf('%s/config/admin/services.yml', $modulePath),
+                // @todo Uncomment to Load this file once we'll have a unique container
+                // sprintf('%s/config/front/services.yml', $modulePath),
+            ];
+
+            foreach ($configFiles as $file) {
+                if(is_file($file)) {
+                    $loader->load($file);
+                }
             }
+
             if (is_dir($translationsPath)) {
                 $moduleTranslationsPaths[] = $translationsPath;
             }
diff --git a/src/PrestaShopBundle/Controller/Admin/FrameworkBundleAdminController.php b/src/PrestaShopBundle/Controller/Admin/FrameworkBundleAdminController.php
index 6357e20557f47..c3d98da4f5636 100644
--- a/src/PrestaShopBundle/Controller/Admin/FrameworkBundleAdminController.php
+++ b/src/PrestaShopBundle/Controller/Admin/FrameworkBundleAdminController.php
@@ -45,7 +45,7 @@
 /**
  * Extends The Symfony framework bundle controller to add common functions for PrestaShop needs.
  *
- * @deprecated since 9.0 to be removed in future versions (10+ at least, when it will no more used)
+ * @deprecated since 9.0 to be removed in future versions (10+ at least, when it will not be used anymore)
  */
 class FrameworkBundleAdminController extends AbstractController implements ContainerAwareInterface
 {
diff --git a/src/PrestaShopBundle/DependencyInjection/Compiler/LoadServicesFromModulesPass.php b/src/PrestaShopBundle/DependencyInjection/Compiler/LoadServicesFromModulesPass.php
index 6111070c90698..4d9b66b75377d 100644
--- a/src/PrestaShopBundle/DependencyInjection/Compiler/LoadServicesFromModulesPass.php
+++ b/src/PrestaShopBundle/DependencyInjection/Compiler/LoadServicesFromModulesPass.php
@@ -37,8 +37,6 @@
 
 /**
  * Load services stored in installed modules.
- *
- * @deprecated since 9.0, to be removed in 10.0
  */
 class LoadServicesFromModulesPass implements CompilerPassInterface
 {

From a99a1a37b4d592403f81bd76869d705cd0dd8871 Mon Sep 17 00:00:00 2001
From: Fabien Papet <fabien.papet@gmail.com>
Date: Fri, 16 Jun 2023 18:13:27 +0200
Subject: [PATCH 0134/1030] Update phpstan rules

Signed-off-by: Fabien Papet <fabien.papet@gmail.com>
---
 phpstan-disallowed-calls.neon | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/phpstan-disallowed-calls.neon b/phpstan-disallowed-calls.neon
index 8d8326ad5e6f4..28d8e8ac226b0 100644
--- a/phpstan-disallowed-calls.neon
+++ b/phpstan-disallowed-calls.neon
@@ -286,7 +286,15 @@ parameters:
             message: 'The @template annotation is deprecated and will be removed in future versions. We should not add any usages of it. '
             disallowIn:
                 - src/PrestaShopBundle/*
-  disallowedMethodCalls: []
+  disallowedMethodCalls:
+        -
+            method: 'Psr\Container\ContainerInterface::get()'
+            message: "Please do not call the container from the controller, you can use $this->get() on the FrameworkBundleAdminController, or better, use dependency injection instead."
+            disallowIn:
+                - src/PrestaShopBundle/Controller/*
+            allowIn:
+                - src/PrestaShopBundle/Controller/Admin/FrameworkBundleAdminController.php
+                - src/PrestaShopBundle/Controller/Admin/PrestaShopAdminController.php
   disallowedConstants:
         -
             constant:

From ad1deee88c594fa268e35919ceee841950a55f2b Mon Sep 17 00:00:00 2001
From: AUTHIE Louis <contact@louisauthie.fr>
Date: Tue, 9 May 2023 15:26:12 +0200
Subject: [PATCH 0135/1030] Add of GeoCoordinates form type

---
 .../Form/Admin/Type/GeoCoordinatesType.php    | 102 ++++++++++++++++++
 1 file changed, 102 insertions(+)
 create mode 100644 src/PrestaShopBundle/Form/Admin/Type/GeoCoordinatesType.php

diff --git a/src/PrestaShopBundle/Form/Admin/Type/GeoCoordinatesType.php b/src/PrestaShopBundle/Form/Admin/Type/GeoCoordinatesType.php
new file mode 100644
index 0000000000000..64b11e5659583
--- /dev/null
+++ b/src/PrestaShopBundle/Form/Admin/Type/GeoCoordinatesType.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+declare(strict_types=1);
+
+namespace PrestaShopBundle\Form\Admin\Type;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Form\Extension\Core\Type\NumberType;
+
+/**
+ * This form class is responsible to create a geolocation latitude/longitude coordinates field.
+ */
+class GeoCoordinatesType extends AbstractType
+{
+    /**
+     * @var TranslatorInterface
+     */
+    protected $translator;
+
+    /**
+     * @param TranslatorInterface $translator
+     */
+    public function __construct(
+        TranslatorInterface $translator
+    ) {
+        $this->translator = $translator;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('latitude', NumberType::class, [
+                'required' => false,
+                'label' => $options['label_latitude'],
+                'attr' => [
+                    'placeholder' => $this->translator->trans('-0.12345', [], 'Admin.Global'),
+                    'class' => 'latitude',
+                ],
+            ])
+            ->add('longitude', NumberType::class, [
+                'required' => false,
+                'label' => $options['label_longitude'],
+                'attr' => [
+                    'placeholder' => $this->translator->trans('-0.12345', [], 'Admin.Global'),
+                    'class' => 'longitude',
+                ],
+            ])
+        ;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+            'label_latitude' => $this->translator->trans('Latitude', [], 'Admin.Global'),
+            'label_longitude' => $this->translator->trans('Longitude', [], 'Admin.Global'),
+        ]);
+        $resolver
+            ->setAllowedTypes('label_latitude', 'string')
+            ->setAllowedTypes('label_longitude', 'string')
+        ;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getBlockPrefix()
+    {
+        return 'geo_coordinates';
+    }
+}
\ No newline at end of file

From cf5fd02c90855ccec52c18b5094b1129845cfdd5 Mon Sep 17 00:00:00 2001
From: AUTHIE Louis <contact@louisauthie.fr>
Date: Tue, 9 May 2023 15:34:39 +0200
Subject: [PATCH 0136/1030] Add Yaml

---
 .../Resources/config/services/bundle/form/form_type.yml       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
index 03d9fcd6a5696..51729c1d02aa9 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
@@ -69,6 +69,10 @@ services:
     arguments:
       - '@prestashop.bundle.form.data_transformer.idn_converter'
 
+  PrestaShopBundle\Form\Admin\Type\GeoCoordinatesType:
+    arguments:
+        - "@translator"
+
   PrestaShopBundle\Form\Admin\Type\DateRangeType:
   PrestaShopBundle\Form\Admin\Category\SimpleCategory:
     deprecated: ~

From e9c5ced6f7dc412574b042f1d1169211b276b279 Mon Sep 17 00:00:00 2001
From: AUTHIE Louis <contact@louisauthie.fr>
Date: Tue, 9 May 2023 21:08:50 +0200
Subject: [PATCH 0137/1030] Corrections applied

---
 src/PrestaShopBundle/Form/Admin/Type/GeoCoordinatesType.php   | 4 +++-
 .../Resources/config/services/bundle/form/form_type.yml       | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/PrestaShopBundle/Form/Admin/Type/GeoCoordinatesType.php b/src/PrestaShopBundle/Form/Admin/Type/GeoCoordinatesType.php
index 64b11e5659583..620fec9f00566 100644
--- a/src/PrestaShopBundle/Form/Admin/Type/GeoCoordinatesType.php
+++ b/src/PrestaShopBundle/Form/Admin/Type/GeoCoordinatesType.php
@@ -85,6 +85,8 @@ public function configureOptions(OptionsResolver $resolver)
         $resolver->setDefaults([
             'label_latitude' => $this->translator->trans('Latitude', [], 'Admin.Global'),
             'label_longitude' => $this->translator->trans('Longitude', [], 'Admin.Global'),
+            'compound' => true,
+            'inherit_data' => true,
         ]);
         $resolver
             ->setAllowedTypes('label_latitude', 'string')
@@ -99,4 +101,4 @@ public function getBlockPrefix()
     {
         return 'geo_coordinates';
     }
-}
\ No newline at end of file
+}
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
index 51729c1d02aa9..a281df01797cc 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
@@ -73,6 +73,7 @@ services:
     arguments:
         - "@translator"
 
+  PrestaShopBundle\Form\Admin\Type\LocaleChoiceType:
   PrestaShopBundle\Form\Admin\Type\DateRangeType:
   PrestaShopBundle\Form\Admin\Category\SimpleCategory:
     deprecated: ~

From 9e46c925da219779409b37ca2b3bd290e172c2dc Mon Sep 17 00:00:00 2001
From: AUTHIE Louis <contact@louisauthie.fr>
Date: Tue, 9 May 2023 21:45:08 +0200
Subject: [PATCH 0138/1030] CSFix

---
 src/PrestaShopBundle/Form/Admin/Type/GeoCoordinatesType.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PrestaShopBundle/Form/Admin/Type/GeoCoordinatesType.php b/src/PrestaShopBundle/Form/Admin/Type/GeoCoordinatesType.php
index 620fec9f00566..828dea9f54d05 100644
--- a/src/PrestaShopBundle/Form/Admin/Type/GeoCoordinatesType.php
+++ b/src/PrestaShopBundle/Form/Admin/Type/GeoCoordinatesType.php
@@ -28,10 +28,10 @@
 namespace PrestaShopBundle\Form\Admin\Type;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\NumberType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Symfony\Component\Form\Extension\Core\Type\NumberType;
 
 /**
  * This form class is responsible to create a geolocation latitude/longitude coordinates field.

From 809f9a4bc033d4b37713c966307ed57a29821c8f Mon Sep 17 00:00:00 2001
From: Louis AUTHIE <65625876+LouisAUTHIE@users.noreply.github.com>
Date: Sat, 17 Jun 2023 23:19:46 +0200
Subject: [PATCH 0139/1030] Update form_type.yml

---
 .../Resources/config/services/bundle/form/form_type.yml         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
index a281df01797cc..1dc496a638051 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
@@ -71,7 +71,7 @@ services:
 
   PrestaShopBundle\Form\Admin\Type\GeoCoordinatesType:
     arguments:
-        - "@translator"
+      - "@translator"
 
   PrestaShopBundle\Form\Admin\Type\LocaleChoiceType:
   PrestaShopBundle\Form\Admin\Type\DateRangeType:

From 42f8cc8e6073b54dce995ee523b967cfda16b54b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Jun 2023 04:59:24 +0000
Subject: [PATCH 0140/1030] Bump playwright from 1.35.0 to 1.35.1 in /tests/UI

Bumps [playwright](https://github.com/Microsoft/playwright) from 1.35.0 to 1.35.1.
- [Release notes](https://github.com/Microsoft/playwright/releases)
- [Commits](https://github.com/Microsoft/playwright/compare/v1.35.0...v1.35.1)

---
updated-dependencies:
- dependency-name: playwright
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 14 +++++++-------
 tests/UI/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index 94f6b84e7f804..f0817bceaded9 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -5163,17 +5163,17 @@
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
     },
     "playwright": {
-      "version": "1.35.0",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.35.0.tgz",
-      "integrity": "sha512-xhFhsoBmKPQfj3dM+HbIiFVlqRCZp2rwdJd/QFd9YBuidabo3TkVv0iuxPQ4vZoMwtSI7qzjY93f5ohdC97hww==",
+      "version": "1.35.1",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.35.1.tgz",
+      "integrity": "sha512-NbwBeGJLu5m7VGM0+xtlmLAH9VUfWwYOhUi/lSEDyGg46r1CA9RWlvoc5yywxR9AzQb0mOCm7bWtOXV7/w43ZA==",
       "requires": {
-        "playwright-core": "1.35.0"
+        "playwright-core": "1.35.1"
       }
     },
     "playwright-core": {
-      "version": "1.35.0",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.35.0.tgz",
-      "integrity": "sha512-muMXyPmIx/2DPrCHOD1H1ePT01o7OdKxKj2ebmCAYvqhUy+Y1bpal7B0rdoxros7YrXI294JT/DWw2LqyiqTPA=="
+      "version": "1.35.1",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.35.1.tgz",
+      "integrity": "sha512-pNXb6CQ7OqmGDRspEjlxE49w+4YtR6a3X6mT1hZXeJHWmsEz7SunmvZeiG/+y1yyMZdHnnn73WKYdtV1er0Xyg=="
     },
     "prelude-ls": {
       "version": "1.1.2",
diff --git a/tests/UI/package.json b/tests/UI/package.json
index 7839acde20ca8..32f1abc0d5cee 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -124,7 +124,7 @@
     "mochawesome": "^7.1.3",
     "module-alias": "^2.2.3",
     "pdfjs-dist": "^3.4.120",
-    "playwright": "^1.35.0",
+    "playwright": "^1.35.1",
     "xpath-ts": "^1.3.13"
   },
   "devDependencies": {

From c4cd399ac5b2dfd2be2225beb85adfd76a0a3a68 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Jun 2023 05:04:29 +0000
Subject: [PATCH 0141/1030] Bump eslint from 8.42.0 to 8.43.0 in /tests/UI

Bumps [eslint](https://github.com/eslint/eslint) from 8.42.0 to 8.43.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.42.0...v8.43.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 20 ++++++++++----------
 tests/UI/package.json      |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index 94f6b84e7f804..d321082376992 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -184,9 +184,9 @@
       }
     },
     "@eslint/js": {
-      "version": "8.42.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.42.0.tgz",
-      "integrity": "sha512-6SWlXpWU5AvId8Ac7zjzmIOqMOba/JWY8XZ4A7q7Gn1Vlfg/SFFIlrtHXt9nPn4op9ZPAkl91Jao+QQv3r/ukw==",
+      "version": "8.43.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.43.0.tgz",
+      "integrity": "sha512-s2UHCoiXfxMvmfzqoN+vrQ84ahUSYde9qNO1MdxmoEhyHWsfmwOpFlwYV+ePJEVc7gFnATGUi376WowX1N7tFg==",
       "dev": true
     },
     "@faker-js/faker": {
@@ -631,9 +631,9 @@
       }
     },
     "acorn": {
-      "version": "8.8.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
-      "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
+      "version": "8.9.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.9.0.tgz",
+      "integrity": "sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==",
       "dev": true
     },
     "acorn-globals": {
@@ -2213,15 +2213,15 @@
       }
     },
     "eslint": {
-      "version": "8.42.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.42.0.tgz",
-      "integrity": "sha512-ulg9Ms6E1WPf67PHaEY4/6E2tEn5/f7FXGzr3t9cBMugOmf1INYvuUwwh1aXQN4MfJ6a5K2iNwP3w4AColvI9A==",
+      "version": "8.43.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.43.0.tgz",
+      "integrity": "sha512-aaCpf2JqqKesMFGgmRPessmVKjcGXqdlAYLLC3THM8t5nBRZRQ+st5WM/hoJXkdioEXLLbXgclUpM0TXo5HX5Q==",
       "dev": true,
       "requires": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.4.0",
         "@eslint/eslintrc": "^2.0.3",
-        "@eslint/js": "8.42.0",
+        "@eslint/js": "8.43.0",
         "@humanwhocodes/config-array": "^0.11.10",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
diff --git a/tests/UI/package.json b/tests/UI/package.json
index 7839acde20ca8..5e2dafd10b603 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -135,7 +135,7 @@
     "@typescript-eslint/eslint-plugin": "^5.59.9",
     "@typescript-eslint/parser": "^5.59.9",
     "babel-eslint": "^10.1.0",
-    "eslint": "^8.42.0",
+    "eslint": "^8.43.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-html": "^7.1.0",
     "eslint-plugin-import": "^2.27.5",

From a85fbbd8eba8d948fd8ae4015111a0b3ae390a14 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Jun 2023 05:05:44 +0000
Subject: [PATCH 0142/1030] Bump dotenv from 16.1.4 to 16.3.1 in /tests/UI

Bumps [dotenv](https://github.com/motdotla/dotenv) from 16.1.4 to 16.3.1.
- [Changelog](https://github.com/motdotla/dotenv/blob/master/CHANGELOG.md)
- [Commits](https://github.com/motdotla/dotenv/compare/v16.1.4...v16.3.1)

---
updated-dependencies:
- dependency-name: dotenv
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 6 +++---
 tests/UI/package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index 94f6b84e7f804..663c4189e5458 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -2035,9 +2035,9 @@
       }
     },
     "dotenv": {
-      "version": "16.1.4",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.1.4.tgz",
-      "integrity": "sha512-m55RtE8AsPeJBpOIFKihEmqUcoVncQIwo7x9U8ZwLEZw9ZpXboz2c+rvog+jUaJvVrZ5kBOeYQBX5+8Aa/OZQw=="
+      "version": "16.3.1",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz",
+      "integrity": "sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ=="
     },
     "ee-first": {
       "version": "1.1.1",
diff --git a/tests/UI/package.json b/tests/UI/package.json
index 7839acde20ca8..f4b4f3bd72715 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -116,7 +116,7 @@
     "chai": "^4.3.7",
     "chai-string": "^1.5.0",
     "csv-writer": "^1.6.0",
-    "dotenv": "^16.1.4",
+    "dotenv": "^16.3.1",
     "jpeg-js": "^0.4.4",
     "js-image-generator": "^1.0.4",
     "maildev": "^2.0.5",

From ad42699abfa9578f3fde1cd516265ee3eecb92fa Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Mon, 19 Jun 2023 09:47:00 +0200
Subject: [PATCH 0143/1030] Nightly : 1.7.8.x : Fixed Admin password

---
 .github/workflows/cron_nightly_tests_reusable.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cron_nightly_tests_reusable.yml b/.github/workflows/cron_nightly_tests_reusable.yml
index d91aa8130ed0c..b80101af64b02 100644
--- a/.github/workflows/cron_nightly_tests_reusable.yml
+++ b/.github/workflows/cron_nightly_tests_reusable.yml
@@ -163,7 +163,7 @@ jobs:
       DB_PREFIX: 'tst_'
       DB_USER: 'root'
       DB_PASSWD: 'prestashop'
-      ADMIN_PASSWD: 'Correct Horse Battery Staple'
+      ADMIN_PASSWD: ${{ (matrix.BRANCH == '1.7.8.x') && 'prestashop_demo' || 'Correct Horse Battery Staple' }}
 
     steps:
       - uses: actions/checkout@v3
@@ -219,7 +219,7 @@ jobs:
         working-directory: ${{ inputs.TESTS_DIR }}
         env:
           URL_FO: ${{ ((env.GH_BRANCH == '8.0.x') || (env.GH_BRANCH == '1.7.8.x')) && 'http://localhost:8001/' || 'https://localhost:8002/' }}
-          ENABLE_SSL: true
+          ENABLE_SSL: ${{ ((matrix.BRANCH == '8.0.x') || (matrix.BRANCH == '1.7.8.x')) && false || true }}
           SMTP_SERVER: '172.17.0.1'
         run: npm run ${{ env.TEST_CAMPAIGN }}
 

From ac054cda974249412ded0634e1463a9718768c39 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Mon, 19 Jun 2023 09:47:22 +0200
Subject: [PATCH 0144/1030] Nightly : 1.7.8.x : Removed sanity:productV2
 campaign

---
 .github/workflows/cron_nightly_tests_reusable.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/cron_nightly_tests_reusable.yml b/.github/workflows/cron_nightly_tests_reusable.yml
index b80101af64b02..68c354820a9ab 100644
--- a/.github/workflows/cron_nightly_tests_reusable.yml
+++ b/.github/workflows/cron_nightly_tests_reusable.yml
@@ -113,6 +113,8 @@ jobs:
             CAMPAIGN: 'functional:WS'
           - BRANCH: 1.7.8.x
             CAMPAIGN: 'modules'
+          - BRANCH: 1.7.8.x
+            CAMPAIGN: 'sanity:productV2'
           ## 8.0.x
           - BRANCH: 8.0.x
             CAMPAIGN: 'cldr'

From 8eef3cb999662afd8f4ec4a155b3180cd45e5bed Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Jun 2023 08:08:08 +0000
Subject: [PATCH 0145/1030] Bump @typescript-eslint/parser from 5.59.9 to
 5.59.11 in /tests/UI

Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 5.59.9 to 5.59.11.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.59.11/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 46 +++++++++++++++++++-------------------
 tests/UI/package.json      |  2 +-
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index 2fd1882b028f4..60697e7d7c4e1 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -425,41 +425,41 @@
       }
     },
     "@typescript-eslint/parser": {
-      "version": "5.59.9",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.9.tgz",
-      "integrity": "sha512-FsPkRvBtcLQ/eVK1ivDiNYBjn3TGJdXy2fhXX+rc7czWl4ARwnpArwbihSOHI2Peg9WbtGHrbThfBUkZZGTtvQ==",
+      "version": "5.59.11",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.11.tgz",
+      "integrity": "sha512-s9ZF3M+Nym6CAZEkJJeO2TFHHDsKAM3ecNkLuH4i4s8/RCPnF5JRip2GyviYkeEAcwGMJxkqG9h2dAsnA1nZpA==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "5.59.9",
-        "@typescript-eslint/types": "5.59.9",
-        "@typescript-eslint/typescript-estree": "5.59.9",
+        "@typescript-eslint/scope-manager": "5.59.11",
+        "@typescript-eslint/types": "5.59.11",
+        "@typescript-eslint/typescript-estree": "5.59.11",
         "debug": "^4.3.4"
       },
       "dependencies": {
         "@typescript-eslint/scope-manager": {
-          "version": "5.59.9",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.9.tgz",
-          "integrity": "sha512-8RA+E+w78z1+2dzvK/tGZ2cpGigBZ58VMEHDZtpE1v+LLjzrYGc8mMaTONSxKyEkz3IuXFM0IqYiGHlCsmlZxQ==",
+          "version": "5.59.11",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.11.tgz",
+          "integrity": "sha512-dHFOsxoLFtrIcSj5h0QoBT/89hxQONwmn3FOQ0GOQcLOOXm+MIrS8zEAhs4tWl5MraxCY3ZJpaXQQdFMc2Tu+Q==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "5.59.9",
-            "@typescript-eslint/visitor-keys": "5.59.9"
+            "@typescript-eslint/types": "5.59.11",
+            "@typescript-eslint/visitor-keys": "5.59.11"
           }
         },
         "@typescript-eslint/types": {
-          "version": "5.59.9",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.9.tgz",
-          "integrity": "sha512-uW8H5NRgTVneSVTfiCVffBb8AbwWSKg7qcA4Ot3JI3MPCJGsB4Db4BhvAODIIYE5mNj7Q+VJkK7JxmRhk2Lyjw==",
+          "version": "5.59.11",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.11.tgz",
+          "integrity": "sha512-epoN6R6tkvBYSc+cllrz+c2sOFWkbisJZWkOE+y3xHtvYaOE6Wk6B8e114McRJwFRjGvYdJwLXQH5c9osME/AA==",
           "dev": true
         },
         "@typescript-eslint/typescript-estree": {
-          "version": "5.59.9",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.9.tgz",
-          "integrity": "sha512-pmM0/VQ7kUhd1QyIxgS+aRvMgw+ZljB3eDb+jYyp6d2bC0mQWLzUDF+DLwCTkQ3tlNyVsvZRXjFyV0LkU/aXjA==",
+          "version": "5.59.11",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.11.tgz",
+          "integrity": "sha512-YupOpot5hJO0maupJXixi6l5ETdrITxeo5eBOeuV7RSKgYdU3G5cxO49/9WRnJq9EMrB7AuTSLH/bqOsXi7wPA==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "5.59.9",
-            "@typescript-eslint/visitor-keys": "5.59.9",
+            "@typescript-eslint/types": "5.59.11",
+            "@typescript-eslint/visitor-keys": "5.59.11",
             "debug": "^4.3.4",
             "globby": "^11.1.0",
             "is-glob": "^4.0.3",
@@ -468,12 +468,12 @@
           }
         },
         "@typescript-eslint/visitor-keys": {
-          "version": "5.59.9",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.9.tgz",
-          "integrity": "sha512-bT7s0td97KMaLwpEBckbzj/YohnvXtqbe2XgqNvTl6RJVakY5mvENOTPvw5u66nljfZxthESpDozs86U+oLY8Q==",
+          "version": "5.59.11",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.11.tgz",
+          "integrity": "sha512-KGYniTGG3AMTuKF9QBD7EIrvufkB6O6uX3knP73xbKLMpH+QRPcgnCxjWXSHjMRuOxFLovljqQgQpR0c7GvjoA==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "5.59.9",
+            "@typescript-eslint/types": "5.59.11",
             "eslint-visitor-keys": "^3.3.0"
           }
         },
diff --git a/tests/UI/package.json b/tests/UI/package.json
index 14a0ca0b36416..cf71c504e395d 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -133,7 +133,7 @@
     "@types/mocha": "^10.0.1",
     "@types/mochawesome": "^6.2.1",
     "@typescript-eslint/eslint-plugin": "^5.59.9",
-    "@typescript-eslint/parser": "^5.59.9",
+    "@typescript-eslint/parser": "^5.59.11",
     "babel-eslint": "^10.1.0",
     "eslint": "^8.43.0",
     "eslint-config-airbnb-base": "^15.0.0",

From 8569191043ef861b87b1fa7e8a5a5c16eacd5732 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Mon, 19 Jun 2023 12:05:02 +0300
Subject: [PATCH 0146/1030] fix edit alias handler

---
 .../CommandHandler/UpdateAliasHandler.php     |  4 +-
 .../Alias/Repository/AliasRepository.php      | 11 +++--
 .../Scenario/Search/edit_alias.feature        | 43 +++++++++++--------
 3 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php b/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php
index 35cadc02623b4..0794a193e4dcb 100644
--- a/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php
+++ b/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php
@@ -48,9 +48,7 @@ public function handle(UpdateAliasCommand $command): void
 
         // We need to delete existing aliases if search term is different as we are changing all aliases searchTerm
         // And previous searchTerm is obsolete
-        if ($existingAlias->search !== $command->searchTerm) {
-            $this->aliasRepository->deleteRelatedAliases($command->aliasId);
-        }
+        $this->aliasRepository->deleteAliasesBySearchTerm($existingAlias->search);
 
         $this->aliasRepository->create($command->searchTerm, $command->aliases);
     }
diff --git a/src/Adapter/Alias/Repository/AliasRepository.php b/src/Adapter/Alias/Repository/AliasRepository.php
index 2b42043d9868e..562e571b5d646 100644
--- a/src/Adapter/Alias/Repository/AliasRepository.php
+++ b/src/Adapter/Alias/Repository/AliasRepository.php
@@ -172,18 +172,17 @@ public function partialUpdate(Alias $alias, array $propertiesToUpdate, string $e
     /**
      * Deletes all related aliases
      *
-     * @param AliasId $aliasId
+     * @param string $searchTerm
      */
-    public function deleteRelatedAliases(AliasId $aliasId): void
+    public function deleteAliasesBySearchTerm(string $searchTerm): void
     {
         $exceptions = [];
 
         $alisIds = $this->connection->createQueryBuilder()
-            ->addSelect('al.id_alias')
+            ->addSelect('a.id_alias')
             ->from($this->dbPrefix . 'alias', 'a')
-            ->where('a.id_alias = :aliasId')
-            ->leftJoin('a', $this->dbPrefix . 'alias', 'al', 'al.search = a.search')
-            ->setParameter('aliasId', $aliasId->getValue())
+            ->where('a.search = :searchTerm')
+            ->setParameter('searchTerm', $searchTerm)
             ->execute()
             ->fetchFirstColumn()
         ;
diff --git a/tests/Integration/Behaviour/Features/Scenario/Search/edit_alias.feature b/tests/Integration/Behaviour/Features/Scenario/Search/edit_alias.feature
index d18ec94792aee..e594578535ee4 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Search/edit_alias.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Search/edit_alias.feature
@@ -17,31 +17,36 @@ Feature: Edit alias from Back Office (BO)
       | aliases | bluse  |
       | search  | blouse |
     Then following aliases should exist:
-      | id reference | alias  | search |
-      | alias1       | bloose | blouse |
-      | alias2       | blues  | blouse |
-      | alias3       | bluse  | blouse |
+      | id reference | alias | search |
+      | alias3       | bluse | blouse |
 
   Scenario: I edit existing alias with different search term that does not exist
-    When I update alias "alias1" with following values:
-      | aliases | dark  |
-      | search  | black |
+    Given I add alias with following information:
+      | alias  | dress  |
+      | search | blouse |
+    And following aliases should exist:
+      | id reference | alias | search |
+      | alias3       | bluse | blouse |
+      | alias4       | dress | blouse |
+    When I update alias "alias3" with following values:
+      | aliases | black |
+      | search  | dark  |
     Then following aliases should exist:
       | id reference | alias | search |
-      | alias3       | dark  | black  |
+      | alias5       | black | dark   |
 
   Scenario: I edit existing alias with different search term that does exist
-    When I add alias with following information:
-      | alias  | large |
-      | search | big   |
-    Then following aliases should exist:
+    Given I add alias with following information:
+      | alias  | dress  |
+      | search | blouse |
+    And following aliases should exist:
       | id reference | alias | search |
-      | alias3       | dark  | black  |
-      | alias4       | large | big    |
-    When I update alias "alias3" with following values:
-      | aliases | huge |
-      | search  | big  |
+      | alias5       | black | dark   |
+      | alias6       | dress | blouse |
+    When I update alias "alias5" with following values:
+      | aliases | bluse  |
+      | search  | blouse |
     Then following aliases should exist:
       | id reference | alias | search |
-      | alias4       | large | big    |
-      | alias5       | huge  | big    |
+      | alias6       | dress | blouse |
+      | alias7       | bluse | blouse |

From ad06e757d11253d076227a3b373e305811d4b86a Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Mon, 19 Jun 2023 12:05:57 +0300
Subject: [PATCH 0147/1030] fix comments

---
 src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php b/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php
index 0794a193e4dcb..7197b3688380b 100644
--- a/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php
+++ b/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php
@@ -46,10 +46,8 @@ public function handle(UpdateAliasCommand $command): void
     {
         $existingAlias = $this->aliasRepository->get($command->aliasId);
 
-        // We need to delete existing aliases if search term is different as we are changing all aliases searchTerm
-        // And previous searchTerm is obsolete
+        // We need to delete existing aliases to add new alias entries
         $this->aliasRepository->deleteAliasesBySearchTerm($existingAlias->search);
-
         $this->aliasRepository->create($command->searchTerm, $command->aliases);
     }
 }

From 781123dbdff81a30f63cb2b0e2d805f6b686d61e Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Mon, 19 Jun 2023 12:25:19 +0300
Subject: [PATCH 0148/1030] add additional tests

---
 .../Scenario/Search/edit_alias.feature        | 46 +++++++++++++------
 1 file changed, 33 insertions(+), 13 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Scenario/Search/edit_alias.feature b/tests/Integration/Behaviour/Features/Scenario/Search/edit_alias.feature
index e594578535ee4..9c94083639ad0 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Search/edit_alias.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Search/edit_alias.feature
@@ -19,21 +19,25 @@ Feature: Edit alias from Back Office (BO)
     Then following aliases should exist:
       | id reference | alias | search |
       | alias3       | bluse | blouse |
+    When I update alias "alias3" with following values:
+      | aliases | bluse,dress |
+      | search  | blouse      |
+    Then following aliases should exist:
+      | id reference | alias | search |
+      | alias4       | bluse | blouse |
+      | alias5       | dress | blouse |
 
   Scenario: I edit existing alias with different search term that does not exist
-    Given I add alias with following information:
-      | alias  | dress  |
-      | search | blouse |
-    And following aliases should exist:
+    Given following aliases should exist:
       | id reference | alias | search |
-      | alias3       | bluse | blouse |
-      | alias4       | dress | blouse |
-    When I update alias "alias3" with following values:
+      | alias4       | bluse | blouse |
+      | alias5       | dress | blouse |
+    When I update alias "alias4" with following values:
       | aliases | black |
       | search  | dark  |
     Then following aliases should exist:
       | id reference | alias | search |
-      | alias5       | black | dark   |
+      | alias6       | black | dark   |
 
   Scenario: I edit existing alias with different search term that does exist
     Given I add alias with following information:
@@ -41,12 +45,28 @@ Feature: Edit alias from Back Office (BO)
       | search | blouse |
     And following aliases should exist:
       | id reference | alias | search |
-      | alias5       | black | dark   |
-      | alias6       | dress | blouse |
-    When I update alias "alias5" with following values:
+      | alias6       | black | dark   |
+      | alias7       | dress | blouse |
+    When I update alias "alias6" with following values:
       | aliases | bluse  |
       | search  | blouse |
     Then following aliases should exist:
       | id reference | alias | search |
-      | alias6       | dress | blouse |
-      | alias7       | bluse | blouse |
+      | alias7       | dress | blouse |
+      | alias8       | bluse | blouse |
+    Given I add alias with following information:
+      | alias  | white  |
+      | search | bright |
+    Then following aliases should exist:
+      | id reference | alias | search |
+      | alias7       | dress | blouse |
+      | alias8       | bluse | blouse |
+      | alias9       | white | bright |
+    When I update alias "alias7" with following values:
+      | aliases | cyan,yellow |
+      | search  | bright      |
+    Then following aliases should exist:
+      | id reference | alias  | search |
+      | alias9       | white  | bright |
+      | alias10      | cyan   | bright |
+      | alias11      | yellow | bright |

From c26dc4ba858a365239f4c35668ae9e9a132a63dd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Jun 2023 09:30:23 +0000
Subject: [PATCH 0149/1030] Bump @typescript-eslint/eslint-plugin in /tests/UI

Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 5.59.9 to 5.59.11.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.59.11/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 68 +++++++++++++++++++-------------------
 tests/UI/package.json      |  2 +-
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index 60697e7d7c4e1..96caa87070b1d 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -396,15 +396,15 @@
       "dev": true
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "5.59.9",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.9.tgz",
-      "integrity": "sha512-4uQIBq1ffXd2YvF7MAvehWKW3zVv/w+mSfRAu+8cKbfj3nwzyqJLNcZJpQ/WZ1HLbJDiowwmQ6NO+63nCA+fqA==",
+      "version": "5.59.11",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.11.tgz",
+      "integrity": "sha512-XxuOfTkCUiOSyBWIvHlUraLw/JT/6Io1365RO6ZuI88STKMavJZPNMU0lFcUTeQXEhHiv64CbxYxBNoDVSmghg==",
       "dev": true,
       "requires": {
         "@eslint-community/regexpp": "^4.4.0",
-        "@typescript-eslint/scope-manager": "5.59.9",
-        "@typescript-eslint/type-utils": "5.59.9",
-        "@typescript-eslint/utils": "5.59.9",
+        "@typescript-eslint/scope-manager": "5.59.11",
+        "@typescript-eslint/type-utils": "5.59.11",
+        "@typescript-eslint/utils": "5.59.11",
         "debug": "^4.3.4",
         "grapheme-splitter": "^1.0.4",
         "ignore": "^5.2.0",
@@ -495,23 +495,23 @@
       }
     },
     "@typescript-eslint/scope-manager": {
-      "version": "5.59.9",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.9.tgz",
-      "integrity": "sha512-8RA+E+w78z1+2dzvK/tGZ2cpGigBZ58VMEHDZtpE1v+LLjzrYGc8mMaTONSxKyEkz3IuXFM0IqYiGHlCsmlZxQ==",
+      "version": "5.59.11",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.11.tgz",
+      "integrity": "sha512-dHFOsxoLFtrIcSj5h0QoBT/89hxQONwmn3FOQ0GOQcLOOXm+MIrS8zEAhs4tWl5MraxCY3ZJpaXQQdFMc2Tu+Q==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.59.9",
-        "@typescript-eslint/visitor-keys": "5.59.9"
+        "@typescript-eslint/types": "5.59.11",
+        "@typescript-eslint/visitor-keys": "5.59.11"
       }
     },
     "@typescript-eslint/type-utils": {
-      "version": "5.59.9",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.59.9.tgz",
-      "integrity": "sha512-ksEsT0/mEHg9e3qZu98AlSrONAQtrSTljL3ow9CGej8eRo7pe+yaC/mvTjptp23Xo/xIf2mLZKC6KPv4Sji26Q==",
+      "version": "5.59.11",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.59.11.tgz",
+      "integrity": "sha512-LZqVY8hMiVRF2a7/swmkStMYSoXMFlzL6sXV6U/2gL5cwnLWQgLEG8tjWPpaE4rMIdZ6VKWwcffPlo1jPfk43g==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/typescript-estree": "5.59.9",
-        "@typescript-eslint/utils": "5.59.9",
+        "@typescript-eslint/typescript-estree": "5.59.11",
+        "@typescript-eslint/utils": "5.59.11",
         "debug": "^4.3.4",
         "tsutils": "^3.21.0"
       },
@@ -528,19 +528,19 @@
       }
     },
     "@typescript-eslint/types": {
-      "version": "5.59.9",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.9.tgz",
-      "integrity": "sha512-uW8H5NRgTVneSVTfiCVffBb8AbwWSKg7qcA4Ot3JI3MPCJGsB4Db4BhvAODIIYE5mNj7Q+VJkK7JxmRhk2Lyjw==",
+      "version": "5.59.11",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.11.tgz",
+      "integrity": "sha512-epoN6R6tkvBYSc+cllrz+c2sOFWkbisJZWkOE+y3xHtvYaOE6Wk6B8e114McRJwFRjGvYdJwLXQH5c9osME/AA==",
       "dev": true
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "5.59.9",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.9.tgz",
-      "integrity": "sha512-pmM0/VQ7kUhd1QyIxgS+aRvMgw+ZljB3eDb+jYyp6d2bC0mQWLzUDF+DLwCTkQ3tlNyVsvZRXjFyV0LkU/aXjA==",
+      "version": "5.59.11",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.11.tgz",
+      "integrity": "sha512-YupOpot5hJO0maupJXixi6l5ETdrITxeo5eBOeuV7RSKgYdU3G5cxO49/9WRnJq9EMrB7AuTSLH/bqOsXi7wPA==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.59.9",
-        "@typescript-eslint/visitor-keys": "5.59.9",
+        "@typescript-eslint/types": "5.59.11",
+        "@typescript-eslint/visitor-keys": "5.59.11",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -560,17 +560,17 @@
       }
     },
     "@typescript-eslint/utils": {
-      "version": "5.59.9",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.59.9.tgz",
-      "integrity": "sha512-1PuMYsju/38I5Ggblaeb98TOoUvjhRvLpLa1DoTOFaLWqaXl/1iQ1eGurTXgBY58NUdtfTXKP5xBq7q9NDaLKg==",
+      "version": "5.59.11",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.59.11.tgz",
+      "integrity": "sha512-didu2rHSOMUdJThLk4aZ1Or8IcO3HzCw/ZvEjTTIfjIrcdd5cvSIwwDy2AOlE7htSNp7QIZ10fLMyRCveesMLg==",
       "dev": true,
       "requires": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@types/json-schema": "^7.0.9",
         "@types/semver": "^7.3.12",
-        "@typescript-eslint/scope-manager": "5.59.9",
-        "@typescript-eslint/types": "5.59.9",
-        "@typescript-eslint/typescript-estree": "5.59.9",
+        "@typescript-eslint/scope-manager": "5.59.11",
+        "@typescript-eslint/types": "5.59.11",
+        "@typescript-eslint/typescript-estree": "5.59.11",
         "eslint-scope": "^5.1.1",
         "semver": "^7.3.7"
       },
@@ -588,12 +588,12 @@
       }
     },
     "@typescript-eslint/visitor-keys": {
-      "version": "5.59.9",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.9.tgz",
-      "integrity": "sha512-bT7s0td97KMaLwpEBckbzj/YohnvXtqbe2XgqNvTl6RJVakY5mvENOTPvw5u66nljfZxthESpDozs86U+oLY8Q==",
+      "version": "5.59.11",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.11.tgz",
+      "integrity": "sha512-KGYniTGG3AMTuKF9QBD7EIrvufkB6O6uX3knP73xbKLMpH+QRPcgnCxjWXSHjMRuOxFLovljqQgQpR0c7GvjoA==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.59.9",
+        "@typescript-eslint/types": "5.59.11",
         "eslint-visitor-keys": "^3.3.0"
       },
       "dependencies": {
diff --git a/tests/UI/package.json b/tests/UI/package.json
index cf71c504e395d..798772327c9f1 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -132,7 +132,7 @@
     "@types/chai-string": "^1.4.2",
     "@types/mocha": "^10.0.1",
     "@types/mochawesome": "^6.2.1",
-    "@typescript-eslint/eslint-plugin": "^5.59.9",
+    "@typescript-eslint/eslint-plugin": "^5.59.11",
     "@typescript-eslint/parser": "^5.59.11",
     "babel-eslint": "^10.1.0",
     "eslint": "^8.43.0",

From 5be6f4121f99ea45d19f9c64b49d91e599fc0084 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Mon, 19 Jun 2023 14:54:55 +0300
Subject: [PATCH 0150/1030] fix typo

---
 .../Alias/Repository/AliasRepository.php      |  6 ++--
 .../Alias/Exception/AliasExistsException.php  | 33 -------------------
 2 files changed, 3 insertions(+), 36 deletions(-)
 delete mode 100644 src/Core/Domain/Alias/Exception/AliasExistsException.php

diff --git a/src/Adapter/Alias/Repository/AliasRepository.php b/src/Adapter/Alias/Repository/AliasRepository.php
index 562e571b5d646..182226bc43357 100644
--- a/src/Adapter/Alias/Repository/AliasRepository.php
+++ b/src/Adapter/Alias/Repository/AliasRepository.php
@@ -178,7 +178,7 @@ public function deleteAliasesBySearchTerm(string $searchTerm): void
     {
         $exceptions = [];
 
-        $alisIds = $this->connection->createQueryBuilder()
+        $aliasIds = $this->connection->createQueryBuilder()
             ->addSelect('a.id_alias')
             ->from($this->dbPrefix . 'alias', 'a')
             ->where('a.search = :searchTerm')
@@ -187,11 +187,11 @@ public function deleteAliasesBySearchTerm(string $searchTerm): void
             ->fetchFirstColumn()
         ;
 
-        if (empty($alisIds)) {
+        if (empty($aliasIds)) {
             return;
         }
 
-        foreach ($alisIds as $currentAliasId) {
+        foreach ($aliasIds as $currentAliasId) {
             try {
                 $this->deleteObjectModel($this->get(new AliasId((int) $currentAliasId)), CannotDeleteAliasException::class);
             } catch (CannotDeleteAliasException $e) {
diff --git a/src/Core/Domain/Alias/Exception/AliasExistsException.php b/src/Core/Domain/Alias/Exception/AliasExistsException.php
deleted file mode 100644
index 3bab6f753ce8b..0000000000000
--- a/src/Core/Domain/Alias/Exception/AliasExistsException.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-declare(strict_types=1);
-
-namespace PrestaShop\PrestaShop\Core\Domain\Alias\Exception;
-
-class AliasExistsException extends AliasException
-{
-}

From ac0e8f059fbf92237d68b61c183736cd5c366058 Mon Sep 17 00:00:00 2001
From: Jens Wilke <jw_github@headissue.com>
Date: Mon, 19 Jun 2023 14:03:34 +0200
Subject: [PATCH 0151/1030] getShopLogo remove hasKey usage,
 https://github.com/PrestaShop/PrestaShop/issues/30373

---
 classes/controller/FrontController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php
index 5f928c9ae32f7..cfbbc632db1d1 100644
--- a/classes/controller/FrontController.php
+++ b/classes/controller/FrontController.php
@@ -1586,11 +1586,11 @@ public function getTemplateVarCustomer($customer = null)
      */
     public function getShopLogo(): array
     {
-        if (!Configuration::hasKey('PS_LOGO')) {
+        $logoFileName = Configuration::get('PS_LOGO');
+        if ($logoFileName == null) {
             return [];
         }
 
-        $logoFileName = Configuration::get('PS_LOGO');
         $logoFileDir = _PS_IMG_DIR_ . $logoFileName;
 
         if (!file_exists($logoFileDir)) {

From 3840fc39362e27ea60bce12863a7eb40d2718a24 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Wed, 5 Apr 2023 16:24:38 +0300
Subject: [PATCH 0152/1030] implement initial add alias command

---
 admin-dev/themes/default/package-lock.json    | 11599 +------------
 admin-dev/themes/new-theme/package-lock.json  | 14466 +---------------
 .../CommandHandler/AddAliasCommandHandler.php |    41 +
 .../AddAliasCommandHandlerInterface.php       |    43 +
 .../Exception/InvalidAliasIdException.php     |    34 +
 themes/package-lock.json                      |  5306 +-----
 themes/package.json                           |     2 +-
 7 files changed, 273 insertions(+), 31218 deletions(-)
 create mode 100644 src/Adapter/Alias/CommandHandler/AddAliasCommandHandler.php
 create mode 100644 src/Core/Domain/Alias/CommandHandler/AddAliasCommandHandlerInterface.php
 create mode 100644 src/Core/Domain/Alias/Exception/InvalidAliasIdException.php

diff --git a/admin-dev/themes/default/package-lock.json b/admin-dev/themes/default/package-lock.json
index abbc3faabfb0c..50b5e2dddaae3 100644
--- a/admin-dev/themes/default/package-lock.json
+++ b/admin-dev/themes/default/package-lock.json
@@ -1,11520 +1,8 @@
 {
   "name": "default",
   "version": "1.7.5",
-  "lockfileVersion": 2,
+  "lockfileVersion": 1,
   "requires": true,
-  "packages": {
-    "": {
-      "name": "default",
-      "version": "1.7.5",
-      "license": "OSL-3.0",
-      "dependencies": {
-        "@openfonts/ubuntu-condensed_latin": "^1.44.2",
-        "open-sans-fonts": "^1.6.2",
-        "perfect-scrollbar": "^1.4.0",
-        "prestakit": "^1.2.5",
-        "vazirmatn": "32.102.0"
-      },
-      "devDependencies": {
-        "@babel/core": "^7.0.0-rc.1",
-        "@babel/preset-env": "^7.0.0-rc.1",
-        "babel-eslint": "^10.1.0",
-        "babel-loader": "^8.0.2",
-        "bourbon": "^4.3.4",
-        "clean-webpack-plugin": "^2.0.2",
-        "css-loader": "^6.7.1",
-        "csso-webpack-plugin": "^2.0.0-beta.3",
-        "eslint": "^8.18.0",
-        "eslint-config-airbnb-base": "^15.0.0",
-        "eslint-import-resolver-webpack": "^0.12.1",
-        "eslint-plugin-html": "^6.0.0",
-        "eslint-plugin-import": "^2.20.0",
-        "html-webpack-plugin": "^5.5.0",
-        "material-design-icons-iconfont": "^6.7.0",
-        "mini-css-extract-plugin": "^1.6.1",
-        "path": "^0.12.7",
-        "postcss": "^8.4.4",
-        "postcss-cssnext": "^3.1.0",
-        "postcss-loader": "^5.3.0",
-        "sass-embedded": "^1.55.0",
-        "sass-loader": "^13.0.2",
-        "style-loader": "^1.1.3",
-        "stylelint": "^14.5.3",
-        "stylelint-config-prestashop": "^1.0.5",
-        "terser-webpack-plugin": "^5.2.5",
-        "webpack": "^5.53.0",
-        "webpack-cli": "^4.7.0",
-        "webpack-font-preload-plugin": "^1.5.0",
-        "webpack-license-plugin": "^4.2.1",
-        "webpack-remove-empty-scripts": "^0.7.3"
-      }
-    },
-    "node_modules/@ampproject/remapping": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.1.2.tgz",
-      "integrity": "sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/code-frame": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-      "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/compat-data": {
-      "version": "7.17.7",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.7.tgz",
-      "integrity": "sha512-p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/core": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.9.tgz",
-      "integrity": "sha512-5ug+SfZCpDAkVp9SFIZAzlW18rlzsOcJGaetCjkySnrXXDUw9AR8cDUm1iByTmdWM6yxX6/zycaV76w3YTF2gw==",
-      "dev": true,
-      "dependencies": {
-        "@ampproject/remapping": "^2.1.0",
-        "@babel/code-frame": "^7.16.7",
-        "@babel/generator": "^7.17.9",
-        "@babel/helper-compilation-targets": "^7.17.7",
-        "@babel/helper-module-transforms": "^7.17.7",
-        "@babel/helpers": "^7.17.9",
-        "@babel/parser": "^7.17.9",
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.17.9",
-        "@babel/types": "^7.17.0",
-        "convert-source-map": "^1.7.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.1",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/babel"
-      }
-    },
-    "node_modules/@babel/generator": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.9.tgz",
-      "integrity": "sha512-rAdDousTwxbIxbz5I7GEQ3lUip+xVCXooZNbsydCWs3xA7ZsYOv+CFRdzGxRX78BmQHu9B1Eso59AOZQOJDEdQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.17.0",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
-      "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz",
-      "integrity": "sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-explode-assignable-expression": "^7.16.7",
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.17.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz",
-      "integrity": "sha512-UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.17.7",
-        "@babel/helper-validator-option": "^7.16.7",
-        "browserslist": "^4.17.5",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.9.tgz",
-      "integrity": "sha512-kUjip3gruz6AJKOq5i3nC6CoCEEF/oHH3cp6tOZhB+IyyyPyW0g1Gfsxn3mkk6S08pIA2y8GQh609v9G/5sHVQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-function-name": "^7.17.9",
-        "@babel/helper-member-expression-to-functions": "^7.17.7",
-        "@babel/helper-optimise-call-expression": "^7.16.7",
-        "@babel/helper-replace-supers": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.17.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz",
-      "integrity": "sha512-awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "regexpu-core": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz",
-      "integrity": "sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-compilation-targets": "^7.13.0",
-        "@babel/helper-module-imports": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/traverse": "^7.13.0",
-        "debug": "^4.1.1",
-        "lodash.debounce": "^4.0.8",
-        "resolve": "^1.14.2",
-        "semver": "^6.1.2"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.4.0-0"
-      }
-    },
-    "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz",
-      "integrity": "sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-explode-assignable-expression": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz",
-      "integrity": "sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-function-name": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
-      "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.16.7",
-        "@babel/types": "^7.17.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
-      "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.17.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz",
-      "integrity": "sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.17.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-module-imports": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
-      "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms": {
-      "version": "7.17.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz",
-      "integrity": "sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-module-imports": "^7.16.7",
-        "@babel/helper-simple-access": "^7.17.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.17.3",
-        "@babel/types": "^7.17.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz",
-      "integrity": "sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz",
-      "integrity": "sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz",
-      "integrity": "sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-wrap-function": "^7.16.8",
-        "@babel/types": "^7.16.8"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-replace-supers": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz",
-      "integrity": "sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-member-expression-to-functions": "^7.16.7",
-        "@babel/helper-optimise-call-expression": "^7.16.7",
-        "@babel/traverse": "^7.16.7",
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-simple-access": {
-      "version": "7.17.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz",
-      "integrity": "sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.17.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz",
-      "integrity": "sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.16.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
-      "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-option": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
-      "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-wrap-function": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz",
-      "integrity": "sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-function-name": "^7.16.7",
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.16.8",
-        "@babel/types": "^7.16.8"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helpers": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.9.tgz",
-      "integrity": "sha512-cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.17.9",
-        "@babel/types": "^7.17.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",
-      "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/parser": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.9.tgz",
-      "integrity": "sha512-vqUSBLP8dQHFPdPi9bc5GK9vRkYHJ49fsZdtoJ8EQ8ibpwk5rPKfvNIwChB0KVXcIjcepEBBd2VHC5r9Gy8ueg==",
-      "dev": true,
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz",
-      "integrity": "sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz",
-      "integrity": "sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
-        "@babel/plugin-proposal-optional-chaining": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.13.0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz",
-      "integrity": "sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-remap-async-to-generator": "^7.16.8",
-        "@babel/plugin-syntax-async-generators": "^7.8.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-class-properties": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz",
-      "integrity": "sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-class-static-block": {
-      "version": "7.17.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.17.6.tgz",
-      "integrity": "sha512-X/tididvL2zbs7jZCeeRJ8167U/+Ac135AM6jCAx6gYXDUviZV5Ku9UDvWS2NCuWlFjIRXklYhwo6HhAC7ETnA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.17.6",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.12.0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-dynamic-import": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz",
-      "integrity": "sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-export-namespace-from": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz",
-      "integrity": "sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-json-strings": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz",
-      "integrity": "sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-json-strings": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-logical-assignment-operators": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz",
-      "integrity": "sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz",
-      "integrity": "sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-numeric-separator": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz",
-      "integrity": "sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.17.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.17.3.tgz",
-      "integrity": "sha512-yuL5iQA/TbZn+RGAfxQXfi7CNLmKi1f8zInn4IgobuCWcAb7i+zj4TYzQ9l8cEzVyJ89PDGuqxK1xZpUDISesw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.17.0",
-        "@babel/helper-compilation-targets": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz",
-      "integrity": "sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-optional-chaining": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz",
-      "integrity": "sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-private-methods": {
-      "version": "7.16.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz",
-      "integrity": "sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.16.10",
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-private-property-in-object": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz",
-      "integrity": "sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-create-class-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz",
-      "integrity": "sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-async-generators": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-class-properties": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-class-static-block": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
-      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-dynamic-import": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
-      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-export-namespace-from": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
-      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-json-strings": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-numeric-separator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-object-rest-spread": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-optional-chaining": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-private-property-in-object": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
-      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-top-level-await": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
-      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz",
-      "integrity": "sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz",
-      "integrity": "sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-imports": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-remap-async-to-generator": "^7.16.8"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz",
-      "integrity": "sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz",
-      "integrity": "sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz",
-      "integrity": "sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-function-name": "^7.16.7",
-        "@babel/helper-optimise-call-expression": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-replace-supers": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "globals": "^11.1.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz",
-      "integrity": "sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.17.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.7.tgz",
-      "integrity": "sha512-XVh0r5yq9sLR4vZ6eVZe8FKfIcSgaTBxVBRSYokRj2qksf6QerYnTxz9/GTuKTH/n/HwLP7t6gtlybHetJ/6hQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz",
-      "integrity": "sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz",
-      "integrity": "sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz",
-      "integrity": "sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz",
-      "integrity": "sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz",
-      "integrity": "sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-compilation-targets": "^7.16.7",
-        "@babel/helper-function-name": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz",
-      "integrity": "sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz",
-      "integrity": "sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz",
-      "integrity": "sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-transforms": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.9.tgz",
-      "integrity": "sha512-2TBFd/r2I6VlYn0YRTz2JdazS+FoUuQ2rIFHoAxtyP/0G3D82SBLaRq9rnUkpqlLg03Byfl/+M32mpxjO6KaPw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-transforms": "^7.17.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-simple-access": "^7.17.7",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.17.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.17.8.tgz",
-      "integrity": "sha512-39reIkMTUVagzgA5x88zDYXPCMT6lcaRKs1+S9K6NKBPErbgO/w/kP8GlNQTC87b412ZTlmNgr3k2JrWgHH+Bw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-hoist-variables": "^7.16.7",
-        "@babel/helper-module-transforms": "^7.17.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz",
-      "integrity": "sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-transforms": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz",
-      "integrity": "sha512-j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz",
-      "integrity": "sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz",
-      "integrity": "sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-replace-supers": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz",
-      "integrity": "sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz",
-      "integrity": "sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.17.9.tgz",
-      "integrity": "sha512-Lc2TfbxR1HOyn/c6b4Y/b6NHoTb67n/IoWLxTu4kC7h4KQnWlhCq2S8Tx0t2SVvv5Uu87Hs+6JEJ5kt2tYGylQ==",
-      "dev": true,
-      "dependencies": {
-        "regenerator-transform": "^0.15.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz",
-      "integrity": "sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz",
-      "integrity": "sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz",
-      "integrity": "sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz",
-      "integrity": "sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz",
-      "integrity": "sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz",
-      "integrity": "sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz",
-      "integrity": "sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz",
-      "integrity": "sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/preset-env": {
-      "version": "7.16.11",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.11.tgz",
-      "integrity": "sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.16.8",
-        "@babel/helper-compilation-targets": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-validator-option": "^7.16.7",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.16.7",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.16.7",
-        "@babel/plugin-proposal-async-generator-functions": "^7.16.8",
-        "@babel/plugin-proposal-class-properties": "^7.16.7",
-        "@babel/plugin-proposal-class-static-block": "^7.16.7",
-        "@babel/plugin-proposal-dynamic-import": "^7.16.7",
-        "@babel/plugin-proposal-export-namespace-from": "^7.16.7",
-        "@babel/plugin-proposal-json-strings": "^7.16.7",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.16.7",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7",
-        "@babel/plugin-proposal-numeric-separator": "^7.16.7",
-        "@babel/plugin-proposal-object-rest-spread": "^7.16.7",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.16.7",
-        "@babel/plugin-proposal-optional-chaining": "^7.16.7",
-        "@babel/plugin-proposal-private-methods": "^7.16.11",
-        "@babel/plugin-proposal-private-property-in-object": "^7.16.7",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.16.7",
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-class-properties": "^7.12.13",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
-        "@babel/plugin-syntax-top-level-await": "^7.14.5",
-        "@babel/plugin-transform-arrow-functions": "^7.16.7",
-        "@babel/plugin-transform-async-to-generator": "^7.16.8",
-        "@babel/plugin-transform-block-scoped-functions": "^7.16.7",
-        "@babel/plugin-transform-block-scoping": "^7.16.7",
-        "@babel/plugin-transform-classes": "^7.16.7",
-        "@babel/plugin-transform-computed-properties": "^7.16.7",
-        "@babel/plugin-transform-destructuring": "^7.16.7",
-        "@babel/plugin-transform-dotall-regex": "^7.16.7",
-        "@babel/plugin-transform-duplicate-keys": "^7.16.7",
-        "@babel/plugin-transform-exponentiation-operator": "^7.16.7",
-        "@babel/plugin-transform-for-of": "^7.16.7",
-        "@babel/plugin-transform-function-name": "^7.16.7",
-        "@babel/plugin-transform-literals": "^7.16.7",
-        "@babel/plugin-transform-member-expression-literals": "^7.16.7",
-        "@babel/plugin-transform-modules-amd": "^7.16.7",
-        "@babel/plugin-transform-modules-commonjs": "^7.16.8",
-        "@babel/plugin-transform-modules-systemjs": "^7.16.7",
-        "@babel/plugin-transform-modules-umd": "^7.16.7",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.16.8",
-        "@babel/plugin-transform-new-target": "^7.16.7",
-        "@babel/plugin-transform-object-super": "^7.16.7",
-        "@babel/plugin-transform-parameters": "^7.16.7",
-        "@babel/plugin-transform-property-literals": "^7.16.7",
-        "@babel/plugin-transform-regenerator": "^7.16.7",
-        "@babel/plugin-transform-reserved-words": "^7.16.7",
-        "@babel/plugin-transform-shorthand-properties": "^7.16.7",
-        "@babel/plugin-transform-spread": "^7.16.7",
-        "@babel/plugin-transform-sticky-regex": "^7.16.7",
-        "@babel/plugin-transform-template-literals": "^7.16.7",
-        "@babel/plugin-transform-typeof-symbol": "^7.16.7",
-        "@babel/plugin-transform-unicode-escapes": "^7.16.7",
-        "@babel/plugin-transform-unicode-regex": "^7.16.7",
-        "@babel/preset-modules": "^0.1.5",
-        "@babel/types": "^7.16.8",
-        "babel-plugin-polyfill-corejs2": "^0.3.0",
-        "babel-plugin-polyfill-corejs3": "^0.5.0",
-        "babel-plugin-polyfill-regenerator": "^0.3.0",
-        "core-js-compat": "^3.20.2",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/preset-modules": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
-      "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
-        "@babel/plugin-transform-dotall-regex": "^7.4.4",
-        "@babel/types": "^7.4.4",
-        "esutils": "^2.0.2"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/runtime": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.9.tgz",
-      "integrity": "sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==",
-      "dev": true,
-      "dependencies": {
-        "regenerator-runtime": "^0.13.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/runtime/node_modules/regenerator-runtime": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
-      "dev": true
-    },
-    "node_modules/@babel/template": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-      "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/parser": "^7.16.7",
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/traverse": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.9.tgz",
-      "integrity": "sha512-PQO8sDIJ8SIwipTPiR71kJQCKQYB5NGImbOviK8K+kg5xkNSYXLBupuX9QhatFowrsvo9Hj8WgArg3W7ijNAQw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/generator": "^7.17.9",
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-function-name": "^7.17.9",
-        "@babel/helper-hoist-variables": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "@babel/parser": "^7.17.9",
-        "@babel/types": "^7.17.0",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/types": {
-      "version": "7.17.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz",
-      "integrity": "sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "to-fast-properties": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@discoveryjs/json-ext": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
-      "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/@eslint/eslintrc": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz",
-      "integrity": "sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^9.4.0",
-        "globals": "^13.15.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
-        "strip-json-comments": "^3.1.1"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.18.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.18.0.tgz",
-      "integrity": "sha512-/mR4KI8Ps2spmoc0Ulu9L7agOF0du1CZNQ3dke8yItYlyKNmGrkONemBbd6V8UTc1Wgcqn21t3WYB7dbRmh6/A==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.7",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.7.tgz",
-      "integrity": "sha512-kBbPWzN8oVMLb0hOUYXhmxggL/1cJE6ydvjDIGi9EnAGUyA7cLVKQg+d/Dsm+KZwx2czGHrCmMVLiyg8s5JPKw==",
-      "dev": true,
-      "dependencies": {
-        "@humanwhocodes/object-schema": "^1.2.1",
-        "debug": "^4.1.1",
-        "minimatch": "^3.0.5"
-      },
-      "engines": {
-        "node": ">=10.10.0"
-      }
-    },
-    "node_modules/@humanwhocodes/module-importer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
-      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.22"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/nzakas"
-      }
-    },
-    "node_modules/@humanwhocodes/object-schema": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
-      "dev": true
-    },
-    "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz",
-      "integrity": "sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.11",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz",
-      "integrity": "sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg==",
-      "dev": true
-    },
-    "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz",
-      "integrity": "sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/resolve-uri": "^3.0.3",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
-      }
-    },
-    "node_modules/@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@nodelib/fs.walk": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@openfonts/ubuntu-condensed_latin": {
-      "version": "1.44.2",
-      "resolved": "https://registry.npmjs.org/@openfonts/ubuntu-condensed_latin/-/ubuntu-condensed_latin-1.44.2.tgz",
-      "integrity": "sha512-OWBvYVl/HbYQcKNlIAg7VFMvTpKobHf5FVDIOlBp16MMTBApQVelvWYueZ41jLhrTDproTI1LjZiZBYrUz5h4g=="
-    },
-    "node_modules/@tootallnate/once": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
-      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@types/eslint": {
-      "version": "8.4.1",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.1.tgz",
-      "integrity": "sha512-GE44+DNEyxxh2Kc6ro/VkIj+9ma0pO0bwv9+uHSyBrikYOHr8zYcdPvnBOp1aw8s+CjRvuSx7CyWqRrNFQ59mA==",
-      "dev": true,
-      "dependencies": {
-        "@types/estree": "*",
-        "@types/json-schema": "*"
-      }
-    },
-    "node_modules/@types/eslint-scope": {
-      "version": "3.7.3",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz",
-      "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==",
-      "dev": true,
-      "dependencies": {
-        "@types/eslint": "*",
-        "@types/estree": "*"
-      }
-    },
-    "node_modules/@types/estree": {
-      "version": "0.0.51",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
-      "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==",
-      "dev": true
-    },
-    "node_modules/@types/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
-      "dev": true,
-      "dependencies": {
-        "@types/minimatch": "*",
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/html-minifier-terser": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
-      "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==",
-      "dev": true
-    },
-    "node_modules/@types/json-schema": {
-      "version": "7.0.11",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
-      "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
-      "dev": true
-    },
-    "node_modules/@types/json5": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
-      "dev": true
-    },
-    "node_modules/@types/minimatch": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
-      "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==",
-      "dev": true
-    },
-    "node_modules/@types/minimist": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz",
-      "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==",
-      "dev": true
-    },
-    "node_modules/@types/node": {
-      "version": "17.0.25",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.25.tgz",
-      "integrity": "sha512-wANk6fBrUwdpY4isjWrKTufkrXdu1D2YHCot2fD/DfWxF5sMrVSA+KN7ydckvaTCh0HiqX9IVl0L5/ZoXg5M7w==",
-      "dev": true
-    },
-    "node_modules/@types/normalize-package-data": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
-      "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
-      "dev": true
-    },
-    "node_modules/@types/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
-      "dev": true
-    },
-    "node_modules/@types/webpack": {
-      "version": "5.28.0",
-      "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-5.28.0.tgz",
-      "integrity": "sha512-8cP0CzcxUiFuA9xGJkfeVpqmWTk9nx6CWwamRGCj95ph1SmlRRk9KlCZ6avhCbZd4L68LvYT6l1kpdEnQXrF8w==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "tapable": "^2.2.0",
-        "webpack": "^5"
-      }
-    },
-    "node_modules/@webassemblyjs/ast": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
-      "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/helper-numbers": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1"
-      }
-    },
-    "node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
-      "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
-      "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
-      "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-numbers": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
-      "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/floating-point-hex-parser": "1.11.1",
-        "@webassemblyjs/helper-api-error": "1.11.1",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
-      "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
-      "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-buffer": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/wasm-gen": "1.11.1"
-      }
-    },
-    "node_modules/@webassemblyjs/ieee754": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
-      "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==",
-      "dev": true,
-      "dependencies": {
-        "@xtuc/ieee754": "^1.2.0"
-      }
-    },
-    "node_modules/@webassemblyjs/leb128": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
-      "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==",
-      "dev": true,
-      "dependencies": {
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@webassemblyjs/utf8": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
-      "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
-      "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-buffer": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/helper-wasm-section": "1.11.1",
-        "@webassemblyjs/wasm-gen": "1.11.1",
-        "@webassemblyjs/wasm-opt": "1.11.1",
-        "@webassemblyjs/wasm-parser": "1.11.1",
-        "@webassemblyjs/wast-printer": "1.11.1"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
-      "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/ieee754": "1.11.1",
-        "@webassemblyjs/leb128": "1.11.1",
-        "@webassemblyjs/utf8": "1.11.1"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
-      "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-buffer": "1.11.1",
-        "@webassemblyjs/wasm-gen": "1.11.1",
-        "@webassemblyjs/wasm-parser": "1.11.1"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
-      "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-api-error": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/ieee754": "1.11.1",
-        "@webassemblyjs/leb128": "1.11.1",
-        "@webassemblyjs/utf8": "1.11.1"
-      }
-    },
-    "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
-      "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@webpack-cli/configtest": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.1.1.tgz",
-      "integrity": "sha512-1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg==",
-      "dev": true,
-      "peerDependencies": {
-        "webpack": "4.x.x || 5.x.x",
-        "webpack-cli": "4.x.x"
-      }
-    },
-    "node_modules/@webpack-cli/info": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.4.1.tgz",
-      "integrity": "sha512-PKVGmazEq3oAo46Q63tpMr4HipI3OPfP7LiNOEJg963RMgT0rqheag28NCML0o3GIzA3DmxP1ZIAv9oTX1CUIA==",
-      "dev": true,
-      "dependencies": {
-        "envinfo": "^7.7.3"
-      },
-      "peerDependencies": {
-        "webpack-cli": "4.x.x"
-      }
-    },
-    "node_modules/@webpack-cli/serve": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.6.1.tgz",
-      "integrity": "sha512-gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw==",
-      "dev": true,
-      "peerDependencies": {
-        "webpack-cli": "4.x.x"
-      },
-      "peerDependenciesMeta": {
-        "webpack-dev-server": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@xtuc/ieee754": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-      "dev": true
-    },
-    "node_modules/@xtuc/long": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-      "dev": true
-    },
-    "node_modules/abab": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
-      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
-      "dev": true
-    },
-    "node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-globals": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
-      "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^7.1.1",
-        "acorn-walk": "^7.1.1"
-      }
-    },
-    "node_modules/acorn-jsx": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true,
-      "peerDependencies": {
-        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      }
-    },
-    "node_modules/acorn-walk": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
-      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-      "dev": true,
-      "dependencies": {
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6.0.0"
-      }
-    },
-    "node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
-    "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/ansis": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/ansis/-/ansis-1.3.4.tgz",
-      "integrity": "sha512-BDXljGSG4gZXmWK64bQzXkI509i5fe8aAa9+eL29e3swaWUqxvxk/XlONjw9AUrNCpQWNdy++0GX7HAhWeR9BQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.13"
-      },
-      "funding": {
-        "type": "patreon",
-        "url": "https://patreon.com/biodiscus"
-      }
-    },
-    "node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
-    },
-    "node_modules/array-differ": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz",
-      "integrity": "sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/array-find": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-find/-/array-find-1.0.0.tgz",
-      "integrity": "sha1-bI4obRHtdoMn+OYuzuhzU8o+eLg=",
-      "dev": true
-    },
-    "node_modules/array-includes": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.4.tgz",
-      "integrity": "sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1",
-        "get-intrinsic": "^1.1.1",
-        "is-string": "^1.0.7"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-union": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-      "dev": true,
-      "dependencies": {
-        "array-uniq": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-uniq": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array.prototype.flat": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
-      "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.2",
-        "es-shim-unscopables": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/arrify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/asn1.js": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
-      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "safer-buffer": "^2.1.0"
-      }
-    },
-    "node_modules/asn1.js/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/assert": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
-      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
-      "dev": true,
-      "dependencies": {
-        "object-assign": "^4.1.1",
-        "util": "0.10.3"
-      }
-    },
-    "node_modules/assert/node_modules/inherits": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-      "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
-      "dev": true
-    },
-    "node_modules/assert/node_modules/util": {
-      "version": "0.10.3",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
-      "dev": true,
-      "dependencies": {
-        "inherits": "2.0.1"
-      }
-    },
-    "node_modules/asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-      "dev": true
-    },
-    "node_modules/autoprefixer": {
-      "version": "7.2.6",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.2.6.tgz",
-      "integrity": "sha512-Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^2.11.3",
-        "caniuse-lite": "^1.0.30000805",
-        "normalize-range": "^0.1.2",
-        "num2fraction": "^1.2.2",
-        "postcss": "^6.0.17",
-        "postcss-value-parser": "^3.2.3"
-      },
-      "bin": {
-        "autoprefixer-info": "bin/autoprefixer-info"
-      }
-    },
-    "node_modules/autoprefixer/node_modules/browserslist": {
-      "version": "2.11.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz",
-      "integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==",
-      "deprecated": "Browserslist 2 could fail on reading Browserslist >3.0 config used in other tools.",
-      "dev": true,
-      "dependencies": {
-        "caniuse-lite": "^1.0.30000792",
-        "electron-to-chromium": "^1.3.30"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      }
-    },
-    "node_modules/autoprefixer/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/autoprefixer/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/babel-eslint": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.1.0.tgz",
-      "integrity": "sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==",
-      "deprecated": "babel-eslint is now @babel/eslint-parser. This package will no longer receive updates.",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/parser": "^7.7.0",
-        "@babel/traverse": "^7.7.0",
-        "@babel/types": "^7.7.0",
-        "eslint-visitor-keys": "^1.0.0",
-        "resolve": "^1.12.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "peerDependencies": {
-        "eslint": ">= 4.12.1"
-      }
-    },
-    "node_modules/babel-loader": {
-      "version": "8.2.4",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.4.tgz",
-      "integrity": "sha512-8dytA3gcvPPPv4Grjhnt8b5IIiTcq/zeXOPk4iTYI0SVXcsmuGg7JtBRDp8S9X+gJfhQ8ektjXZlDu1Bb33U8A==",
-      "dev": true,
-      "dependencies": {
-        "find-cache-dir": "^3.3.1",
-        "loader-utils": "^2.0.0",
-        "make-dir": "^3.1.0",
-        "schema-utils": "^2.6.5"
-      },
-      "engines": {
-        "node": ">= 8.9"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0",
-        "webpack": ">=2"
-      }
-    },
-    "node_modules/babel-plugin-dynamic-import-node": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
-      "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
-      "dev": true,
-      "dependencies": {
-        "object.assign": "^4.1.0"
-      }
-    },
-    "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz",
-      "integrity": "sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.13.11",
-        "@babel/helper-define-polyfill-provider": "^0.3.1",
-        "semver": "^6.1.1"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz",
-      "integrity": "sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.3.1",
-        "core-js-compat": "^3.21.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz",
-      "integrity": "sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.3.1"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/babel-runtime": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-      "dev": true,
-      "dependencies": {
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.11.0"
-      }
-    },
-    "node_modules/babel-runtime/node_modules/core-js": {
-      "version": "2.6.12",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
-      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
-      "dev": true,
-      "hasInstallScript": true
-    },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
-    },
-    "node_modules/base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/big.js": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/bn.js": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
-      "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==",
-      "dev": true
-    },
-    "node_modules/boolbase": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
-      "dev": true
-    },
-    "node_modules/bootstrap": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz",
-      "integrity": "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/twbs"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/bootstrap"
-        }
-      ],
-      "peerDependencies": {
-        "jquery": "1.9.1 - 3",
-        "popper.js": "^1.16.1"
-      }
-    },
-    "node_modules/bourbon": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/bourbon/-/bourbon-4.3.4.tgz",
-      "integrity": "sha1-TaOAAp6SwMj5dkx3lFGhNLEefMM=",
-      "dev": true
-    },
-    "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dev": true,
-      "dependencies": {
-        "fill-range": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/brorand": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
-      "dev": true
-    },
-    "node_modules/browser-process-hrtime": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
-      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
-      "dev": true
-    },
-    "node_modules/browserify-aes": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-      "dev": true,
-      "dependencies": {
-        "buffer-xor": "^1.0.3",
-        "cipher-base": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.3",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/browserify-cipher": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
-      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
-      "dev": true,
-      "dependencies": {
-        "browserify-aes": "^1.0.4",
-        "browserify-des": "^1.0.0",
-        "evp_bytestokey": "^1.0.0"
-      }
-    },
-    "node_modules/browserify-des": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
-      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
-      "dev": true,
-      "dependencies": {
-        "cipher-base": "^1.0.1",
-        "des.js": "^1.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "node_modules/browserify-rsa": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
-      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^5.0.0",
-        "randombytes": "^2.0.1"
-      }
-    },
-    "node_modules/browserify-sign": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
-      "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^5.1.1",
-        "browserify-rsa": "^4.0.1",
-        "create-hash": "^1.2.0",
-        "create-hmac": "^1.1.7",
-        "elliptic": "^6.5.3",
-        "inherits": "^2.0.4",
-        "parse-asn1": "^5.1.5",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
-      }
-    },
-    "node_modules/browserify-sign/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/browserify-sign/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/browserify-zlib": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
-      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
-      "dev": true,
-      "dependencies": {
-        "pako": "~1.0.5"
-      }
-    },
-    "node_modules/browserslist": {
-      "version": "4.20.2",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.2.tgz",
-      "integrity": "sha512-CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        }
-      ],
-      "dependencies": {
-        "caniuse-lite": "^1.0.30001317",
-        "electron-to-chromium": "^1.4.84",
-        "escalade": "^3.1.1",
-        "node-releases": "^2.0.2",
-        "picocolors": "^1.0.0"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      },
-      "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-      }
-    },
-    "node_modules/buffer": {
-      "version": "4.9.2",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
-      "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
-      "dev": true,
-      "dependencies": {
-        "base64-js": "^1.0.2",
-        "ieee754": "^1.1.4",
-        "isarray": "^1.0.0"
-      }
-    },
-    "node_modules/buffer-builder": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/buffer-builder/-/buffer-builder-0.2.0.tgz",
-      "integrity": "sha512-7VPMEPuYznPSoR21NE1zvd2Xna6c/CloiZCfcMXR1Jny6PjX0N4Nsa38zcBFo/FMK+BlA+FLKbJCQ0i2yxp+Xg==",
-      "dev": true
-    },
-    "node_modules/buffer-from": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-      "dev": true
-    },
-    "node_modules/buffer-xor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
-      "dev": true
-    },
-    "node_modules/builtin-status-codes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
-      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
-      "dev": true
-    },
-    "node_modules/call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/camel-case": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
-      "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
-      "dev": true,
-      "dependencies": {
-        "pascal-case": "^3.1.2",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/camelcase-keys": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
-      "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^5.3.1",
-        "map-obj": "^4.0.0",
-        "quick-lru": "^4.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/caniuse-lite": {
-      "version": "1.0.30001332",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001332.tgz",
-      "integrity": "sha512-10T30NYOEQtN6C11YGg411yebhvpnC6Z102+B95eAsN0oB6KUs01ivE8u+G6FMIRtIrVlYXhL+LUwQ3/hXwDWw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
-        }
-      ]
-    },
-    "node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/chrome-trace-event": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
-      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
-    "node_modules/cipher-base": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/clean-css": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.0.tgz",
-      "integrity": "sha512-YYuuxv4H/iNb1Z/5IbMRoxgrzjWGhOEFfd+groZ5dMCVkpENiMZmwspdrzBo9286JjM1gZJPAyL7ZIdzuvu2AQ==",
-      "dev": true,
-      "dependencies": {
-        "source-map": "~0.6.0"
-      },
-      "engines": {
-        "node": ">= 10.0"
-      }
-    },
-    "node_modules/clean-css/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/clean-webpack-plugin": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-2.0.2.tgz",
-      "integrity": "sha512-pi1111o4OBd9qvacbgs+NRqClfVPKVIc66B4d8kx6Ho/L+i9entQ/NpK600CsTYTPu3kWvKwwyKarsYMvC2xeA==",
-      "dev": true,
-      "dependencies": {
-        "del": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "webpack": "*"
-      }
-    },
-    "node_modules/clone": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/clone-deep": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
-      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
-      "dev": true,
-      "dependencies": {
-        "is-plain-object": "^2.0.4",
-        "kind-of": "^6.0.2",
-        "shallow-clone": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/clone-regexp": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz",
-      "integrity": "sha512-beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q==",
-      "dev": true,
-      "dependencies": {
-        "is-regexp": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/color": {
-      "version": "0.11.4",
-      "resolved": "https://registry.npmjs.org/color/-/color-0.11.4.tgz",
-      "integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=",
-      "dev": true,
-      "dependencies": {
-        "clone": "^1.0.2",
-        "color-convert": "^1.3.0",
-        "color-string": "^0.3.0"
-      }
-    },
-    "node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/color-string": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz",
-      "integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=",
-      "dev": true,
-      "dependencies": {
-        "color-name": "^1.0.0"
-      }
-    },
-    "node_modules/colord": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.2.tgz",
-      "integrity": "sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ==",
-      "dev": true
-    },
-    "node_modules/colorette": {
-      "version": "2.0.16",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz",
-      "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==",
-      "dev": true
-    },
-    "node_modules/combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dev": true,
-      "dependencies": {
-        "delayed-stream": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/commander": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
-      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
-      "dev": true,
-      "engines": {
-        "node": ">= 12"
-      }
-    },
-    "node_modules/commondir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
-      "dev": true
-    },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
-    },
-    "node_modules/confusing-browser-globals": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
-      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
-      "dev": true
-    },
-    "node_modules/console-browserify": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
-      "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
-      "dev": true
-    },
-    "node_modules/constants-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
-      "dev": true
-    },
-    "node_modules/convert-source-map": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
-      "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "~5.1.1"
-      }
-    },
-    "node_modules/core-js": {
-      "version": "3.22.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.22.0.tgz",
-      "integrity": "sha512-8h9jBweRjMiY+ORO7bdWSeWfHhLPO7whobj7Z2Bl0IDo00C228EdGgH7FE4jGumbEjzcFfkfW8bXgdkEDhnwHQ==",
-      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
-      "dev": true,
-      "hasInstallScript": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
-    "node_modules/core-js-compat": {
-      "version": "3.22.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.22.0.tgz",
-      "integrity": "sha512-WwA7xbfRGrk8BGaaHlakauVXrlYmAIkk8PNGb1FDQS+Rbrewc3pgFfwJFRw6psmJVAll7Px9UHRYE16oRQnwAQ==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.20.2",
-        "semver": "7.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
-    "node_modules/core-js-compat/node_modules/semver": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
-      "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/core-util-is": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
-      "dev": true
-    },
-    "node_modules/cosmiconfig": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
-      "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/parse-json": "^4.0.0",
-        "import-fresh": "^3.2.1",
-        "parse-json": "^5.0.0",
-        "path-type": "^4.0.0",
-        "yaml": "^1.10.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/create-ecdh": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
-      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "elliptic": "^6.5.3"
-      }
-    },
-    "node_modules/create-ecdh/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/create-hash": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-      "dev": true,
-      "dependencies": {
-        "cipher-base": "^1.0.1",
-        "inherits": "^2.0.1",
-        "md5.js": "^1.3.4",
-        "ripemd160": "^2.0.1",
-        "sha.js": "^2.4.0"
-      }
-    },
-    "node_modules/create-hmac": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-      "dev": true,
-      "dependencies": {
-        "cipher-base": "^1.0.3",
-        "create-hash": "^1.1.0",
-        "inherits": "^2.0.1",
-        "ripemd160": "^2.0.0",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      }
-    },
-    "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dev": true,
-      "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/cross-spawn/node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/crypto-browserify": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
-      "dev": true,
-      "dependencies": {
-        "browserify-cipher": "^1.0.0",
-        "browserify-sign": "^4.0.0",
-        "create-ecdh": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.0",
-        "diffie-hellman": "^5.0.0",
-        "inherits": "^2.0.1",
-        "pbkdf2": "^3.0.3",
-        "public-encrypt": "^4.0.0",
-        "randombytes": "^2.0.0",
-        "randomfill": "^1.0.3"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/css-color-function": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/css-color-function/-/css-color-function-1.3.3.tgz",
-      "integrity": "sha1-jtJMLAIFBzM5+voAS8jBQfzLKC4=",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "0.1.0",
-        "color": "^0.11.0",
-        "debug": "^3.1.0",
-        "rgb": "~0.1.0"
-      }
-    },
-    "node_modules/css-color-function/node_modules/balanced-match": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.1.0.tgz",
-      "integrity": "sha1-tQS9BYabOSWd0MXvw12EMXbczEo=",
-      "dev": true
-    },
-    "node_modules/css-color-function/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/css-functions-list": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.0.1.tgz",
-      "integrity": "sha512-PriDuifDt4u4rkDgnqRCLnjfMatufLmWNfQnGCq34xZwpY3oabwhB9SqRBmuvWUgndbemCFlKqg+nO7C2q0SBw==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.22"
-      }
-    },
-    "node_modules/css-loader": {
-      "version": "6.7.2",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.7.2.tgz",
-      "integrity": "sha512-oqGbbVcBJkm8QwmnNzrFrWTnudnRZC+1eXikLJl0n4ljcfotgRifpg2a1lKy8jTrc4/d9A/ap1GFq1jDKG7J+Q==",
-      "dev": true,
-      "dependencies": {
-        "icss-utils": "^5.1.0",
-        "postcss": "^8.4.18",
-        "postcss-modules-extract-imports": "^3.0.0",
-        "postcss-modules-local-by-default": "^4.0.0",
-        "postcss-modules-scope": "^3.0.0",
-        "postcss-modules-values": "^4.0.0",
-        "postcss-value-parser": "^4.2.0",
-        "semver": "^7.3.8"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/css-loader/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/css-loader/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/css-rule-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/css-rule-stream/-/css-rule-stream-1.1.0.tgz",
-      "integrity": "sha1-N4bnGYmD2WWibjGVfgkHjLt3BaI=",
-      "dev": true,
-      "dependencies": {
-        "css-tokenize": "^1.0.1",
-        "duplexer2": "0.0.2",
-        "ldjson-stream": "^1.2.1",
-        "through2": "^0.6.3"
-      },
-      "bin": {
-        "css-rule-stream": "index.js"
-      }
-    },
-    "node_modules/css-rule-stream/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-      "dev": true
-    },
-    "node_modules/css-rule-stream/node_modules/readable-stream": {
-      "version": "1.0.34",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-      "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/css-rule-stream/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-      "dev": true
-    },
-    "node_modules/css-rule-stream/node_modules/through2": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-      "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": ">=1.0.33-1 <1.1.0-0",
-        "xtend": ">=4.0.0 <4.1.0-0"
-      }
-    },
-    "node_modules/css-select": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
-      "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
-      "dev": true,
-      "dependencies": {
-        "boolbase": "^1.0.0",
-        "css-what": "^6.0.1",
-        "domhandler": "^4.3.1",
-        "domutils": "^2.8.0",
-        "nth-check": "^2.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
-      }
-    },
-    "node_modules/css-tokenize": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/css-tokenize/-/css-tokenize-1.0.1.tgz",
-      "integrity": "sha1-RiXLHtohwUOFi3+B1oA8HSb8FL4=",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "readable-stream": "^1.0.33"
-      }
-    },
-    "node_modules/css-tokenize/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-      "dev": true
-    },
-    "node_modules/css-tokenize/node_modules/readable-stream": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/css-tokenize/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-      "dev": true
-    },
-    "node_modules/css-tree": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
-      "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
-      "dev": true,
-      "dependencies": {
-        "mdn-data": "2.0.14",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/css-tree/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/css-unit-converter": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/css-unit-converter/-/css-unit-converter-1.1.2.tgz",
-      "integrity": "sha512-IiJwMC8rdZE0+xiEZHeru6YoONC4rfPMqGm2W85jMIbkFvv5nFTwJVFHam2eFrN6txmoUYFAFXiv8ICVeTO0MA==",
-      "dev": true
-    },
-    "node_modules/css-what": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
-      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
-      }
-    },
-    "node_modules/cssesc": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-      "dev": true,
-      "bin": {
-        "cssesc": "bin/cssesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/csso": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
-      "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
-      "dev": true,
-      "dependencies": {
-        "css-tree": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/csso-webpack-plugin": {
-      "version": "2.0.0-beta.3",
-      "resolved": "https://registry.npmjs.org/csso-webpack-plugin/-/csso-webpack-plugin-2.0.0-beta.3.tgz",
-      "integrity": "sha512-FnhgS7W1BwOduZagTLg9UjT2kvM9aiSpInm4xIDZHLuXl6/6vbOA1+DIIcbGKSjE0dWIVuDKEv1to86mN6KZ4w==",
-      "dev": true,
-      "dependencies": {
-        "@types/webpack": ">=4.0",
-        "core-js": "^3.10.1",
-        "csso": "^4.0.2",
-        "source-map": "^0.7.3",
-        "webpack-sources": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/csso-webpack-plugin/node_modules/source-map": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/cssom": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz",
-      "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==",
-      "dev": true
-    },
-    "node_modules/cssstyle": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
-      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
-      "dev": true,
-      "dependencies": {
-        "cssom": "~0.3.6"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cssstyle/node_modules/cssom": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
-      "dev": true
-    },
-    "node_modules/data-urls": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.1.tgz",
-      "integrity": "sha512-Ds554NeT5Gennfoo9KN50Vh6tpgtvYEwraYjejXnyTpu1C7oXKxdFk75REooENHE8ndTVOJuv+BEs4/J/xcozw==",
-      "dev": true,
-      "dependencies": {
-        "abab": "^2.0.3",
-        "whatwg-mimetype": "^3.0.0",
-        "whatwg-url": "^10.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/decamelize-keys": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
-      "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
-      "dev": true,
-      "dependencies": {
-        "decamelize": "^1.1.0",
-        "map-obj": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/decamelize-keys/node_modules/map-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/decimal.js": {
-      "version": "10.3.1",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz",
-      "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==",
-      "dev": true
-    },
-    "node_modules/deep-is": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
-    },
-    "node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-      "dev": true,
-      "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/del": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
-      "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/glob": "^7.1.1",
-        "globby": "^6.1.0",
-        "is-path-cwd": "^2.0.0",
-        "is-path-in-cwd": "^2.0.0",
-        "p-map": "^2.0.0",
-        "pify": "^4.0.1",
-        "rimraf": "^2.6.3"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/des.js": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
-      "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "node_modules/diffie-hellman": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "miller-rabin": "^4.0.0",
-        "randombytes": "^2.0.0"
-      }
-    },
-    "node_modules/diffie-hellman/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dev": true,
-      "dependencies": {
-        "path-type": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/doiuse": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/doiuse/-/doiuse-4.4.1.tgz",
-      "integrity": "sha512-TUpr1/YNg20IB09tZmwGCTsTQoxj8jUld/hUZprZMj8vj0VpAJySXEWCr8WMvqvgzk0/kG/FxeSMGKode4UjPg==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.16.1",
-        "caniuse-lite": "^1.0.30001179",
-        "css-rule-stream": "^1.1.0",
-        "duplexer2": "0.0.2",
-        "ldjson-stream": "^1.2.1",
-        "multimatch": "^5.0.0",
-        "postcss": "^8.2.4",
-        "source-map": "^0.7.3",
-        "through2": "^4.0.2",
-        "yargs": "^16.2.0"
-      },
-      "bin": {
-        "doiuse": "cli.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/doiuse/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/doiuse/node_modules/cliui": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^7.0.0"
-      }
-    },
-    "node_modules/doiuse/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/doiuse/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/doiuse/node_modules/source-map": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/doiuse/node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/doiuse/node_modules/y18n": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/doiuse/node_modules/yargs": {
-      "version": "16.2.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-      "dev": true,
-      "dependencies": {
-        "cliui": "^7.0.2",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.0",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^20.2.2"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/dom-converter": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
-      "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
-      "dev": true,
-      "dependencies": {
-        "utila": "~0.4"
-      }
-    },
-    "node_modules/dom-serializer": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
-      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.2.0",
-        "entities": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
-      }
-    },
-    "node_modules/dom-serializer/node_modules/entities": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
-    "node_modules/domain-browser": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
-      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4",
-        "npm": ">=1.2"
-      }
-    },
-    "node_modules/domelementtype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ]
-    },
-    "node_modules/domexception": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
-      "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
-      "dev": true,
-      "dependencies": {
-        "webidl-conversions": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/domhandler": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
-      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "^2.2.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domhandler?sponsor=1"
-      }
-    },
-    "node_modules/domutils": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-      "dev": true,
-      "dependencies": {
-        "dom-serializer": "^1.0.1",
-        "domelementtype": "^2.2.0",
-        "domhandler": "^4.2.0"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domutils?sponsor=1"
-      }
-    },
-    "node_modules/dot-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
-      "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
-      "dev": true,
-      "dependencies": {
-        "no-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/duplexer2": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-      "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "~1.1.9"
-      }
-    },
-    "node_modules/duplexer2/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-      "dev": true
-    },
-    "node_modules/duplexer2/node_modules/readable-stream": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/duplexer2/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-      "dev": true
-    },
-    "node_modules/electron-to-chromium": {
-      "version": "1.4.113",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.113.tgz",
-      "integrity": "sha512-s30WKxp27F3bBH6fA07FYL2Xm/FYnYrKpMjHr3XVCTUb9anAyZn/BeZfPWgTZGAbJeT4NxNwISSbLcYZvggPMA==",
-      "dev": true
-    },
-    "node_modules/elliptic": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
-      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.11.9",
-        "brorand": "^1.1.0",
-        "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.1",
-        "inherits": "^2.0.4",
-        "minimalistic-assert": "^1.0.1",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "node_modules/elliptic/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/emojis-list": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/enhanced-resolve": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz",
-      "integrity": "sha1-TW5omzcl+GCQknzMhs2fFjW4ni4=",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "memory-fs": "^0.2.0",
-        "tapable": "^0.1.8"
-      },
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/enhanced-resolve/node_modules/tapable": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",
-      "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/entities": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz",
-      "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
-    "node_modules/envinfo": {
-      "version": "7.8.1",
-      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz",
-      "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==",
-      "dev": true,
-      "bin": {
-        "envinfo": "dist/cli.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dev": true,
-      "dependencies": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "node_modules/es-abstract": {
-      "version": "1.19.5",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.5.tgz",
-      "integrity": "sha512-Aa2G2+Rd3b6kxEUKTF4TaW67czBLyAv3z7VOhYRU50YBx+bbsYZ9xQP4lMNazePuFlybXI0V4MruPos7qUo5fA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.1.1",
-        "get-symbol-description": "^1.0.0",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "string.prototype.trimend": "^1.0.4",
-        "string.prototype.trimstart": "^1.0.4",
-        "unbox-primitive": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/es-module-lexer": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
-      "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
-      "dev": true
-    },
-    "node_modules/es-shim-unscopables": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
-      "dev": true,
-      "dependencies": {
-        "has": "^1.0.3"
-      }
-    },
-    "node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/escodegen": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
-      "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
-      "dev": true,
-      "dependencies": {
-        "esprima": "^4.0.1",
-        "estraverse": "^5.2.0",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1"
-      },
-      "bin": {
-        "escodegen": "bin/escodegen.js",
-        "esgenerate": "bin/esgenerate.js"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "optionalDependencies": {
-        "source-map": "~0.6.1"
-      }
-    },
-    "node_modules/escodegen/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/escodegen/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/eslint": {
-      "version": "8.28.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.28.0.tgz",
-      "integrity": "sha512-S27Di+EVyMxcHiwDrFzk8dJYAaD+/5SoWKxL1ri/71CRHsnJnRDPNt2Kzj24+MT9FDupf4aqqyqPrvI8MvQ4VQ==",
-      "dev": true,
-      "dependencies": {
-        "@eslint/eslintrc": "^1.3.3",
-        "@humanwhocodes/config-array": "^0.11.6",
-        "@humanwhocodes/module-importer": "^1.0.1",
-        "@nodelib/fs.walk": "^1.2.8",
-        "ajv": "^6.10.0",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.1.1",
-        "eslint-utils": "^3.0.0",
-        "eslint-visitor-keys": "^3.3.0",
-        "espree": "^9.4.0",
-        "esquery": "^1.4.0",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "find-up": "^5.0.0",
-        "glob-parent": "^6.0.2",
-        "globals": "^13.15.0",
-        "grapheme-splitter": "^1.0.4",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "is-path-inside": "^3.0.3",
-        "js-sdsl": "^4.1.4",
-        "js-yaml": "^4.1.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
-        "regexpp": "^3.2.0",
-        "strip-ansi": "^6.0.1",
-        "strip-json-comments": "^3.1.0",
-        "text-table": "^0.2.0"
-      },
-      "bin": {
-        "eslint": "bin/eslint.js"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint-config-airbnb-base": {
-      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz",
-      "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==",
-      "dev": true,
-      "dependencies": {
-        "confusing-browser-globals": "^1.0.10",
-        "object.assign": "^4.1.2",
-        "object.entries": "^1.1.5",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "peerDependencies": {
-        "eslint": "^7.32.0 || ^8.2.0",
-        "eslint-plugin-import": "^2.25.2"
-      }
-    },
-    "node_modules/eslint-import-resolver-node": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
-      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^3.2.7",
-        "resolve": "^1.20.0"
-      }
-    },
-    "node_modules/eslint-import-resolver-node/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/eslint-import-resolver-webpack": {
-      "version": "0.12.2",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.12.2.tgz",
-      "integrity": "sha512-7Jnm4YAoNNkvqPaZkKdIHsKGmv8/uNnYC5QsXkiSodvX4XEEfH2AKOna98FK52fCDXm3q4HzuX+7pRMKkJ64EQ==",
-      "dev": true,
-      "dependencies": {
-        "array-find": "^1.0.0",
-        "debug": "^2.6.9",
-        "enhanced-resolve": "^0.9.1",
-        "find-root": "^1.1.0",
-        "has": "^1.0.3",
-        "interpret": "^1.2.0",
-        "lodash": "^4.17.15",
-        "node-libs-browser": "^1.0.0 || ^2.0.0",
-        "resolve": "^1.13.1",
-        "semver": "^5.7.1"
-      },
-      "peerDependencies": {
-        "eslint-plugin-import": ">=1.4.0",
-        "webpack": ">=1.11.0"
-      }
-    },
-    "node_modules/eslint-import-resolver-webpack/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/eslint-import-resolver-webpack/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "node_modules/eslint-import-resolver-webpack/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/eslint-module-utils": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz",
-      "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^3.2.7",
-        "find-up": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-module-utils/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/eslint-plugin-html": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-html/-/eslint-plugin-html-6.2.0.tgz",
-      "integrity": "sha512-vi3NW0E8AJombTvt8beMwkL1R/fdRWl4QSNRNMhVQKWm36/X0KF0unGNAY4mqUF06mnwVWZcIcerrCnfn9025g==",
-      "dev": true,
-      "dependencies": {
-        "htmlparser2": "^7.1.2"
-      }
-    },
-    "node_modules/eslint-plugin-import": {
-      "version": "2.26.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
-      "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
-      "dev": true,
-      "dependencies": {
-        "array-includes": "^3.1.4",
-        "array.prototype.flat": "^1.2.5",
-        "debug": "^2.6.9",
-        "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.6",
-        "eslint-module-utils": "^2.7.3",
-        "has": "^1.0.3",
-        "is-core-module": "^2.8.1",
-        "is-glob": "^4.0.3",
-        "minimatch": "^3.1.2",
-        "object.values": "^1.1.5",
-        "resolve": "^1.22.0",
-        "tsconfig-paths": "^3.14.1"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/eslint-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-      "dev": true,
-      "dependencies": {
-        "eslint-visitor-keys": "^2.0.0"
-      },
-      "engines": {
-        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      },
-      "peerDependencies": {
-        "eslint": ">=5"
-      }
-    },
-    "node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/eslint-visitor-keys": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/eslint/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/eslint/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/eslint/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/eslint-scope": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/eslint/node_modules/find-up": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.3"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/eslint/node_modules/globals": {
-      "version": "13.18.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.18.0.tgz",
-      "integrity": "sha512-/mR4KI8Ps2spmoc0Ulu9L7agOF0du1CZNQ3dke8yItYlyKNmGrkONemBbd6V8UTc1Wgcqn21t3WYB7dbRmh6/A==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/levn": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/eslint/node_modules/locate-path": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/optionator": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-      "dev": true,
-      "dependencies": {
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0",
-        "word-wrap": "^1.2.3"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/eslint/node_modules/p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "dev": true,
-      "dependencies": {
-        "yocto-queue": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/p-locate": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/prelude-ls": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/eslint/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/type-check": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/espree": {
-      "version": "9.4.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz",
-      "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^8.8.0",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.3.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/espree/node_modules/acorn": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
-      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/espree/node_modules/eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/esquery": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/esquery/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esrecurse/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/events": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.x"
-      }
-    },
-    "node_modules/evp_bytestokey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-      "dev": true,
-      "dependencies": {
-        "md5.js": "^1.3.4",
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "node_modules/execa": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-      "dev": true,
-      "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.0",
-        "human-signals": "^2.1.0",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.1",
-        "onetime": "^5.1.2",
-        "signal-exit": "^3.0.3",
-        "strip-final-newline": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
-      }
-    },
-    "node_modules/execall": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/execall/-/execall-2.0.0.tgz",
-      "integrity": "sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow==",
-      "dev": true,
-      "dependencies": {
-        "clone-regexp": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
-    },
-    "node_modules/fast-glob": {
-      "version": "3.2.11",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
-      "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
-      },
-      "engines": {
-        "node": ">=8.6.0"
-      }
-    },
-    "node_modules/fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
-    },
-    "node_modules/fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-      "dev": true
-    },
-    "node_modules/fastest-levenshtein": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
-      "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==",
-      "dev": true
-    },
-    "node_modules/fastq": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
-      "dev": true,
-      "dependencies": {
-        "reusify": "^1.0.4"
-      }
-    },
-    "node_modules/file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-      "dev": true,
-      "dependencies": {
-        "flat-cache": "^3.0.4"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dev": true,
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/find-cache-dir": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
-      "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
-      "dev": true,
-      "dependencies": {
-        "commondir": "^1.0.1",
-        "make-dir": "^3.0.2",
-        "pkg-dir": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
-      }
-    },
-    "node_modules/find-root": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
-      "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==",
-      "dev": true
-    },
-    "node_modules/find-up": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-      "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/flat-cache": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-      "dev": true,
-      "dependencies": {
-        "flatted": "^3.1.0",
-        "rimraf": "^3.0.2"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/flat-cache/node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/flatted": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
-      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
-      "dev": true
-    },
-    "node_modules/flatten": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.3.tgz",
-      "integrity": "sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==",
-      "deprecated": "flatten is deprecated in favor of utility frameworks such as lodash.",
-      "dev": true
-    },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
-    },
-    "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
-    },
-    "node_modules/gensync": {
-      "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "dev": true,
-      "engines": {
-        "node": "6.* || 8.* || >= 10.*"
-      }
-    },
-    "node_modules/get-intrinsic": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
-      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/get-npm-tarball-url": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/get-npm-tarball-url/-/get-npm-tarball-url-2.0.3.tgz",
-      "integrity": "sha512-R/PW6RqyaBQNWYaSyfrh54/qtcnOp22FHCCiRhSSZj0FP3KQWCsxxt0DzIdVTbwTqe9CtQfvl/FPD4UIPt4pqw==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.17"
-      }
-    },
-    "node_modules/get-stream": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/get-symbol-description": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-      "dev": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/glob-to-regexp": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
-      "dev": true
-    },
-    "node_modules/global-modules": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
-      "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
-      "dev": true,
-      "dependencies": {
-        "global-prefix": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/global-prefix": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
-      "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
-      "dev": true,
-      "dependencies": {
-        "ini": "^1.3.5",
-        "kind-of": "^6.0.2",
-        "which": "^1.3.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/globby": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-      "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
-      "dev": true,
-      "dependencies": {
-        "array-union": "^1.0.1",
-        "glob": "^7.0.3",
-        "object-assign": "^4.0.1",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/globby/node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/globjoin": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
-      "integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=",
-      "dev": true
-    },
-    "node_modules/google-protobuf": {
-      "version": "3.21.0",
-      "resolved": "https://registry.npmjs.org/google-protobuf/-/google-protobuf-3.21.0.tgz",
-      "integrity": "sha512-byR7MBTK4tZ5PZEb+u5ZTzpt4SfrTxv5682MjPlHN16XeqgZE2/8HOIWeiXe8JKnT9OVbtBGhbq8mtvkK8cd5g==",
-      "dev": true
-    },
-    "node_modules/graceful-fs": {
-      "version": "4.2.10",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-      "dev": true
-    },
-    "node_modules/grapheme-splitter": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
-      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
-      "dev": true
-    },
-    "node_modules/hard-rejection": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
-      "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/has-bigints": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
-      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/has-property-descriptors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.1.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/hash-base": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
-      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/hash-base/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/hash-base/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/hash.js": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "minimalistic-assert": "^1.0.1"
-      }
-    },
-    "node_modules/he": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-      "dev": true,
-      "bin": {
-        "he": "bin/he"
-      }
-    },
-    "node_modules/hmac-drbg": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
-      "dev": true,
-      "dependencies": {
-        "hash.js": "^1.0.3",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "node_modules/hosted-git-info": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
-      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/html-encoding-sniffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
-      "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
-      "dev": true,
-      "dependencies": {
-        "whatwg-encoding": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/html-minifier-terser": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
-      "integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==",
-      "dev": true,
-      "dependencies": {
-        "camel-case": "^4.1.2",
-        "clean-css": "^5.2.2",
-        "commander": "^8.3.0",
-        "he": "^1.2.0",
-        "param-case": "^3.0.4",
-        "relateurl": "^0.2.7",
-        "terser": "^5.10.0"
-      },
-      "bin": {
-        "html-minifier-terser": "cli.js"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/html-tags": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.2.0.tgz",
-      "integrity": "sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/html-webpack-plugin": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz",
-      "integrity": "sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw==",
-      "dev": true,
-      "dependencies": {
-        "@types/html-minifier-terser": "^6.0.0",
-        "html-minifier-terser": "^6.0.2",
-        "lodash": "^4.17.21",
-        "pretty-error": "^4.0.0",
-        "tapable": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/html-webpack-plugin"
-      },
-      "peerDependencies": {
-        "webpack": "^5.20.0"
-      }
-    },
-    "node_modules/htmlparser2": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz",
-      "integrity": "sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==",
-      "dev": true,
-      "funding": [
-        "https://github.com/fb55/htmlparser2?sponsor=1",
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ],
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.2.2",
-        "domutils": "^2.8.0",
-        "entities": "^3.0.1"
-      }
-    },
-    "node_modules/http-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
-      "dev": true,
-      "dependencies": {
-        "@tootallnate/once": "2",
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/https-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
-      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
-      "dev": true
-    },
-    "node_modules/https-proxy-agent": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
-      "dev": true,
-      "dependencies": {
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/human-signals": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.17.0"
-      }
-    },
-    "node_modules/iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dev": true,
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/icss-utils": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
-      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
-      "dev": true,
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/ignore": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/immutable": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.1.0.tgz",
-      "integrity": "sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==",
-      "dev": true
-    },
-    "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
-      "dependencies": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/import-lazy": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
-      "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/import-local": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
-      "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
-      "dev": true,
-      "dependencies": {
-        "pkg-dir": "^4.2.0",
-        "resolve-cwd": "^3.0.0"
-      },
-      "bin": {
-        "import-local-fixture": "fixtures/cli.js"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.19"
-      }
-    },
-    "node_modules/indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/indexes-of": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
-      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
-      "dev": true
-    },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "node_modules/ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-      "dev": true
-    },
-    "node_modules/internal-slot": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
-      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.1.0",
-        "has": "^1.0.3",
-        "side-channel": "^1.0.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/interpret": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
-      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-      "dev": true
-    },
-    "node_modules/is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-      "dev": true,
-      "dependencies": {
-        "has-bigints": "^1.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-core-module": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz",
-      "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==",
-      "dev": true,
-      "dependencies": {
-        "has": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/is-number-object": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-path-cwd": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
-      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is-path-in-cwd": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
-      "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
-      "dev": true,
-      "dependencies": {
-        "is-path-inside": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is-path-inside": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
-      "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
-      "dev": true,
-      "dependencies": {
-        "path-is-inside": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is-plain-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-potential-custom-element-name": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
-      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
-      "dev": true
-    },
-    "node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-regexp": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-2.1.0.tgz",
-      "integrity": "sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-stream": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-      "dev": true
-    },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
-    },
-    "node_modules/isnumeric": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/isnumeric/-/isnumeric-0.2.0.tgz",
-      "integrity": "sha1-ojR7o2DeGeM9D/1ZD933dVy/LmQ=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.x"
-      }
-    },
-    "node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/jest-worker": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
-      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      }
-    },
-    "node_modules/jest-worker/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-worker/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
-      }
-    },
-    "node_modules/jquery": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.1.tgz",
-      "integrity": "sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw==",
-      "peer": true
-    },
-    "node_modules/jquery.growl": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/jquery.growl/-/jquery.growl-1.3.5.tgz",
-      "integrity": "sha512-pK1RD8x3pXm1hEQ6KH0cu4QqzvI7R0EsUd5oneT5pavZ0cHwx/TV4qIdKeVfCWM0DVPyzI2GfXD6FwdDbRx1kw=="
-    },
-    "node_modules/js-sdsl": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz",
-      "integrity": "sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==",
-      "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/js-sdsl"
-      }
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
-    },
-    "node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/jsdom": {
-      "version": "19.0.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-19.0.0.tgz",
-      "integrity": "sha512-RYAyjCbxy/vri/CfnjUWJQQtZ3LKlLnDqj+9XLNnJPgEGeirZs3hllKR20re8LUZ6o1b1X4Jat+Qd26zmP41+A==",
-      "dev": true,
-      "dependencies": {
-        "abab": "^2.0.5",
-        "acorn": "^8.5.0",
-        "acorn-globals": "^6.0.0",
-        "cssom": "^0.5.0",
-        "cssstyle": "^2.3.0",
-        "data-urls": "^3.0.1",
-        "decimal.js": "^10.3.1",
-        "domexception": "^4.0.0",
-        "escodegen": "^2.0.0",
-        "form-data": "^4.0.0",
-        "html-encoding-sniffer": "^3.0.0",
-        "http-proxy-agent": "^5.0.0",
-        "https-proxy-agent": "^5.0.0",
-        "is-potential-custom-element-name": "^1.0.1",
-        "nwsapi": "^2.2.0",
-        "parse5": "6.0.1",
-        "saxes": "^5.0.1",
-        "symbol-tree": "^3.2.4",
-        "tough-cookie": "^4.0.0",
-        "w3c-hr-time": "^1.0.2",
-        "w3c-xmlserializer": "^3.0.0",
-        "webidl-conversions": "^7.0.0",
-        "whatwg-encoding": "^2.0.0",
-        "whatwg-mimetype": "^3.0.0",
-        "whatwg-url": "^10.0.0",
-        "ws": "^8.2.3",
-        "xml-name-validator": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "peerDependencies": {
-        "canvas": "^2.5.0"
-      },
-      "peerDependenciesMeta": {
-        "canvas": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jsdom/node_modules/acorn": {
-      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
-      "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/jsdom/node_modules/form-data": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-      "dev": true,
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/jsdom/node_modules/punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/jsdom/node_modules/tough-cookie": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
-      "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
-      "dev": true,
-      "dependencies": {
-        "psl": "^1.1.33",
-        "punycode": "^2.1.1",
-        "universalify": "^0.1.2"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "dev": true,
-      "bin": {
-        "jsesc": "bin/jsesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/json-parse-better-errors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-      "dev": true
-    },
-    "node_modules/json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true
-    },
-    "node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-      "dev": true
-    },
-    "node_modules/json5": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
-      "dev": true,
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/klona": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz",
-      "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/known-css-properties": {
-      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.24.0.tgz",
-      "integrity": "sha512-RTSoaUAfLvpR357vWzAz/50Q/BmHfmE6ETSWfutT0AJiw10e6CmcdYRQJlLRd95B53D0Y2aD1jSxD3V3ySF+PA==",
-      "dev": true
-    },
-    "node_modules/ldjson-stream": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ldjson-stream/-/ldjson-stream-1.2.1.tgz",
-      "integrity": "sha1-kb7O2lrE7SsX5kn7d356v6AYnCs=",
-      "dev": true,
-      "dependencies": {
-        "split2": "^0.2.1",
-        "through2": "^0.6.1"
-      }
-    },
-    "node_modules/ldjson-stream/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-      "dev": true
-    },
-    "node_modules/ldjson-stream/node_modules/readable-stream": {
-      "version": "1.0.34",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-      "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/ldjson-stream/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-      "dev": true
-    },
-    "node_modules/ldjson-stream/node_modules/through2": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-      "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": ">=1.0.33-1 <1.1.0-0",
-        "xtend": ">=4.0.0 <4.1.0-0"
-      }
-    },
-    "node_modules/levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/lines-and-columns": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-      "dev": true
-    },
-    "node_modules/loader-runner": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
-      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.11.5"
-      }
-    },
-    "node_modules/loader-utils": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
-      "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
-      },
-      "engines": {
-        "node": ">=8.9.0"
-      }
-    },
-    "node_modules/locate-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^2.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
-    },
-    "node_modules/lodash._reinterpolate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
-      "dev": true
-    },
-    "node_modules/lodash.debounce": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
-      "dev": true
-    },
-    "node_modules/lodash.memoize": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-      "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
-      "dev": true
-    },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
-    },
-    "node_modules/lodash.template": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
-      "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==",
-      "dev": true,
-      "dependencies": {
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.templatesettings": "^4.0.0"
-      }
-    },
-    "node_modules/lodash.templatesettings": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz",
-      "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==",
-      "dev": true,
-      "dependencies": {
-        "lodash._reinterpolate": "^3.0.0"
-      }
-    },
-    "node_modules/lodash.truncate": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
-      "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
-      "dev": true
-    },
-    "node_modules/lodash.uniq": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
-      "dev": true
-    },
-    "node_modules/lower-case": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
-      "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "dev": true,
-      "dependencies": {
-        "semver": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/map-obj": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
-      "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/material-design-icons-iconfont": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/material-design-icons-iconfont/-/material-design-icons-iconfont-6.7.0.tgz",
-      "integrity": "sha512-lSj71DgVv20kO0kGbs42icDzbRot61gEDBLQACzkUuznRQBUYmbxzEkGU6dNBb5fRWHMaScYlAXX96HQ4/cJWA=="
-    },
-    "node_modules/math-expression-evaluator": {
-      "version": "1.3.14",
-      "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.3.14.tgz",
-      "integrity": "sha512-M6AMrvq9bO8uL42KvQHPA2/SbAobA0R7gviUmPrcTcGfdwpaLitz4q2Euzx2lP9Oy88vxK3HOrsISgSwKsYS4A==",
-      "dev": true
-    },
-    "node_modules/mathml-tag-names": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz",
-      "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/md5.js": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
-      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
-      "dev": true,
-      "dependencies": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "node_modules/mdn-data": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
-      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
-      "dev": true
-    },
-    "node_modules/memory-fs": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz",
-      "integrity": "sha512-+y4mDxU4rvXXu5UDSGCGNiesFmwCHuefGMoPCO1WYucNYj7DsLqrFaa2fXVI0H+NNiPTwwzKwspn9yTZqUGqng==",
-      "dev": true
-    },
-    "node_modules/meow": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
-      "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/minimist": "^1.2.0",
-        "camelcase-keys": "^6.2.2",
-        "decamelize": "^1.2.0",
-        "decamelize-keys": "^1.1.0",
-        "hard-rejection": "^2.1.0",
-        "minimist-options": "4.1.0",
-        "normalize-package-data": "^3.0.0",
-        "read-pkg-up": "^7.0.1",
-        "redent": "^3.0.0",
-        "trim-newlines": "^3.0.0",
-        "type-fest": "^0.18.0",
-        "yargs-parser": "^20.2.3"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/meow/node_modules/type-fest": {
-      "version": "0.18.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
-      "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true
-    },
-    "node_modules/merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-      "dev": true,
-      "dependencies": {
-        "braces": "^3.0.2",
-        "picomatch": "^2.3.1"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/miller-rabin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.0.0",
-        "brorand": "^1.0.1"
-      },
-      "bin": {
-        "miller-rabin": "bin/miller-rabin"
-      }
-    },
-    "node_modules/miller-rabin/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dev": true,
-      "dependencies": {
-        "mime-db": "1.52.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/min-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
-      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/mini-css-extract-plugin": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.2.tgz",
-      "integrity": "sha512-WhDvO3SjGm40oV5y26GjMJYjd2UMqrLAGKy5YS2/3QKJy2F7jgynuHTir/tgUUOiNQu5saXHdc8reo7YuhhT4Q==",
-      "dev": true,
-      "dependencies": {
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0",
-        "webpack-sources": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.4.0 || ^5.0.0"
-      }
-    },
-    "node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-      "dev": true
-    },
-    "node_modules/minimalistic-crypto-utils": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
-      "dev": true
-    },
-    "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/minimist": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
-      "dev": true
-    },
-    "node_modules/minimist-options": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
-      "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
-      "dev": true,
-      "dependencies": {
-        "arrify": "^1.0.1",
-        "is-plain-obj": "^1.1.0",
-        "kind-of": "^6.0.3"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/multimatch": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-5.0.0.tgz",
-      "integrity": "sha512-ypMKuglUrZUD99Tk2bUQ+xNQj43lPEfAeX2o9cTteAmShXy2VHDJpuwu1o0xqoKCt9jLVAvwyFKdLTPXKAfJyA==",
-      "dev": true,
-      "dependencies": {
-        "@types/minimatch": "^3.0.3",
-        "array-differ": "^3.0.0",
-        "array-union": "^2.1.0",
-        "arrify": "^2.0.1",
-        "minimatch": "^3.0.4"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/multimatch/node_modules/array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/multimatch/node_modules/arrify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
-      "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/nanoid": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
-      "dev": true,
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
-    "node_modules/natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-      "dev": true
-    },
-    "node_modules/needle": {
-      "version": "2.9.1",
-      "resolved": "https://registry.npmjs.org/needle/-/needle-2.9.1.tgz",
-      "integrity": "sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^3.2.6",
-        "iconv-lite": "^0.4.4",
-        "sax": "^1.2.4"
-      },
-      "bin": {
-        "needle": "bin/needle"
-      },
-      "engines": {
-        "node": ">= 4.4.x"
-      }
-    },
-    "node_modules/needle/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/neo-async": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-      "dev": true
-    },
-    "node_modules/no-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
-      "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
-      "dev": true,
-      "dependencies": {
-        "lower-case": "^2.0.2",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/node-libs-browser": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
-      "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
-      "dev": true,
-      "dependencies": {
-        "assert": "^1.1.1",
-        "browserify-zlib": "^0.2.0",
-        "buffer": "^4.3.0",
-        "console-browserify": "^1.1.0",
-        "constants-browserify": "^1.0.0",
-        "crypto-browserify": "^3.11.0",
-        "domain-browser": "^1.1.1",
-        "events": "^3.0.0",
-        "https-browserify": "^1.0.0",
-        "os-browserify": "^0.3.0",
-        "path-browserify": "0.0.1",
-        "process": "^0.11.10",
-        "punycode": "^1.2.4",
-        "querystring-es3": "^0.2.0",
-        "readable-stream": "^2.3.3",
-        "stream-browserify": "^2.0.1",
-        "stream-http": "^2.7.2",
-        "string_decoder": "^1.0.0",
-        "timers-browserify": "^2.0.4",
-        "tty-browserify": "0.0.0",
-        "url": "^0.11.0",
-        "util": "^0.11.0",
-        "vm-browserify": "^1.0.1"
-      }
-    },
-    "node_modules/node-releases": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.3.tgz",
-      "integrity": "sha512-maHFz6OLqYxz+VQyCAtA3PTX4UP/53pa05fyDNc9CwjvJ0yEh6+xBwKsgCxMNhS8taUKBFYxfuiaD9U/55iFaw==",
-      "dev": true
-    },
-    "node_modules/normalize-package-data": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
-      "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
-      "dev": true,
-      "dependencies": {
-        "hosted-git-info": "^4.0.1",
-        "is-core-module": "^2.5.0",
-        "semver": "^7.3.4",
-        "validate-npm-package-license": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/normalize-package-data/node_modules/semver": {
-      "version": "7.3.7",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/normalize-range": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/normalize-selector": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz",
-      "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=",
-      "dev": true
-    },
-    "node_modules/npm-run-path": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-      "dev": true,
-      "dependencies": {
-        "path-key": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/nth-check": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz",
-      "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==",
-      "dev": true,
-      "dependencies": {
-        "boolbase": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/nth-check?sponsor=1"
-      }
-    },
-    "node_modules/num2fraction": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
-      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
-      "dev": true
-    },
-    "node_modules/nwsapi": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
-      "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
-      "dev": true
-    },
-    "node_modules/object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-inspect": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.assign": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "has-symbols": "^1.0.1",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
-      "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.values": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
-      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
-    "node_modules/onecolor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/onecolor/-/onecolor-3.1.0.tgz",
-      "integrity": "sha512-YZSypViXzu3ul5LMu/m6XjJ9ol8qAy9S2VjHl5E6UlhUH1KGKWabyEJifn0Jjpw23bYDzC2ucKMPGiH5kfwSGQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.8"
-      }
-    },
-    "node_modules/onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "dev": true,
-      "dependencies": {
-        "mimic-fn": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/open-sans-fonts": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/open-sans-fonts/-/open-sans-fonts-1.6.2.tgz",
-      "integrity": "sha512-vsJ6/Mm0TdUKQJqxfkXJy+0K2X0QeRuTmxQq9YE1ycziw6CbDPolDsHhQ6+ImoV/7OTh8K8ZTGklY1Z5nUAwug==",
-      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info."
-    },
-    "node_modules/optionator": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-      "dev": true,
-      "dependencies": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.6",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "word-wrap": "~1.2.3"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/os-browserify": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
-      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
-      "dev": true
-    },
-    "node_modules/p-limit": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/p-locate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/p-map": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
-      "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/p-try": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/pako": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
-      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
-      "dev": true
-    },
-    "node_modules/param-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
-      "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
-      "dev": true,
-      "dependencies": {
-        "dot-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
-      "dependencies": {
-        "callsites": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/parse-asn1": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
-      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
-      "dev": true,
-      "dependencies": {
-        "asn1.js": "^5.2.0",
-        "browserify-aes": "^1.0.0",
-        "evp_bytestokey": "^1.0.0",
-        "pbkdf2": "^3.0.3",
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "node_modules/parse-json": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "error-ex": "^1.3.1",
-        "json-parse-even-better-errors": "^2.3.0",
-        "lines-and-columns": "^1.1.6"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/parse5": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
-      "dev": true
-    },
-    "node_modules/pascal-case": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
-      "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
-      "dev": true,
-      "dependencies": {
-        "no-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/path": {
-      "version": "0.12.7",
-      "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz",
-      "integrity": "sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=",
-      "dev": true,
-      "dependencies": {
-        "process": "^0.11.1",
-        "util": "^0.10.3"
-      }
-    },
-    "node_modules/path-browserify": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
-      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
-      "dev": true
-    },
-    "node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-is-inside": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
-      "dev": true
-    },
-    "node_modules/path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
-    },
-    "node_modules/path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/path/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-      "dev": true
-    },
-    "node_modules/path/node_modules/util": {
-      "version": "0.10.4",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
-      "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "2.0.3"
-      }
-    },
-    "node_modules/pbkdf2": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
-      "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
-      "dev": true,
-      "dependencies": {
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4",
-        "ripemd160": "^2.0.1",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      },
-      "engines": {
-        "node": ">=0.12"
-      }
-    },
-    "node_modules/perfect-scrollbar": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/perfect-scrollbar/-/perfect-scrollbar-1.5.5.tgz",
-      "integrity": "sha512-dzalfutyP3e/FOpdlhVryN4AJ5XDVauVWxybSkLZmakFE2sS3y3pc4JnSprw8tGmHvkaG5Edr5T7LBTZ+WWU2g=="
-    },
-    "node_modules/picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-      "dev": true
-    },
-    "node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/pify": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-      "dev": true,
-      "dependencies": {
-        "pinkie": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pixrem": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pixrem/-/pixrem-4.0.1.tgz",
-      "integrity": "sha1-LaSh3m7EQjxfw3lOkwuB1EkOxoY=",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^2.0.0",
-        "postcss": "^6.0.0",
-        "reduce-css-calc": "^1.2.7"
-      },
-      "engines": {
-        "node": ">=0.10.0",
-        "npm": ">=1.2.10"
-      }
-    },
-    "node_modules/pixrem/node_modules/browserslist": {
-      "version": "2.11.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz",
-      "integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==",
-      "deprecated": "Browserslist 2 could fail on reading Browserslist >3.0 config used in other tools.",
-      "dev": true,
-      "dependencies": {
-        "caniuse-lite": "^1.0.30000792",
-        "electron-to-chromium": "^1.3.30"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      }
-    },
-    "node_modules/pixrem/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/pixrem/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pleeease-filters": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/pleeease-filters/-/pleeease-filters-4.0.0.tgz",
-      "integrity": "sha1-ZjKy+wVkjSdY2GU4T7zteeHMrsc=",
-      "dev": true,
-      "dependencies": {
-        "onecolor": "^3.0.4",
-        "postcss": "^6.0.1"
-      }
-    },
-    "node_modules/pleeease-filters/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/pleeease-filters/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/popper.js": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
-      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
-      "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1",
-      "peer": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/popperjs"
-      }
-    },
-    "node_modules/postcss": {
-      "version": "8.4.19",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.19.tgz",
-      "integrity": "sha512-h+pbPsyhlYj6N2ozBmHhHrs9DzGmbaarbLvWipMRO7RLS+v4onj26MPFXA5OBYFxyqYhUJK456SwDcY9H2/zsA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
-        }
-      ],
-      "dependencies": {
-        "nanoid": "^3.3.4",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      }
-    },
-    "node_modules/postcss-apply": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/postcss-apply/-/postcss-apply-0.8.0.tgz",
-      "integrity": "sha1-FOVEu7XLbxweBIhXll15rgZrE0M=",
-      "dev": true,
-      "dependencies": {
-        "babel-runtime": "^6.23.0",
-        "balanced-match": "^0.4.2",
-        "postcss": "^6.0.0"
-      }
-    },
-    "node_modules/postcss-apply/node_modules/balanced-match": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-      "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
-      "dev": true
-    },
-    "node_modules/postcss-apply/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-apply/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-attribute-case-insensitive": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-2.0.0.tgz",
-      "integrity": "sha1-lNxCLI+QmX8WvTOjZUu77AhJY7Q=",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^6.0.0",
-        "postcss-selector-parser": "^2.2.3"
-      }
-    },
-    "node_modules/postcss-attribute-case-insensitive/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-attribute-case-insensitive/node_modules/postcss-selector-parser": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz",
-      "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=",
-      "dev": true,
-      "dependencies": {
-        "flatten": "^1.0.2",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
-      }
-    },
-    "node_modules/postcss-attribute-case-insensitive/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-color-function": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-color-function/-/postcss-color-function-4.1.0.tgz",
-      "integrity": "sha512-2/fuv6mP5Lt03XbRpVfMdGC8lRP1sykme+H1bR4ARyOmSMB8LPSjcL6EAI1iX6dqUF+jNEvKIVVXhan1w/oFDQ==",
-      "dev": true,
-      "dependencies": {
-        "css-color-function": "~1.3.3",
-        "postcss": "^6.0.23",
-        "postcss-message-helpers": "^2.0.0",
-        "postcss-value-parser": "^3.3.1"
-      }
-    },
-    "node_modules/postcss-color-function/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-color-function/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-color-gray": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-color-gray/-/postcss-color-gray-4.1.0.tgz",
-      "integrity": "sha512-L4iLKQLdqChz6ZOgGb6dRxkBNw78JFYcJmBz1orHpZoeLtuhDDGegRtX9gSyfoCIM7rWZ3VNOyiqqvk83BEN+w==",
-      "dev": true,
-      "dependencies": {
-        "color": "^2.0.1",
-        "postcss": "^6.0.14",
-        "postcss-message-helpers": "^2.0.0",
-        "reduce-function-call": "^1.0.2"
-      }
-    },
-    "node_modules/postcss-color-gray/node_modules/color": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color/-/color-2.0.1.tgz",
-      "integrity": "sha512-ubUCVVKfT7r2w2D3qtHakj8mbmKms+tThR8gI8zEYCbUBl8/voqFGt3kgBqGwXAopgXybnkuOq+qMYCRrp4cXw==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.1",
-        "color-string": "^1.5.2"
-      }
-    },
-    "node_modules/postcss-color-gray/node_modules/color-string": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.0.tgz",
-      "integrity": "sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "^1.0.0",
-        "simple-swizzle": "^0.2.2"
-      }
-    },
-    "node_modules/postcss-color-gray/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-color-gray/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-color-hex-alpha": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-3.0.0.tgz",
-      "integrity": "sha1-HlPmyKyyN5Vej9CLfs2xuLgwn5U=",
-      "dev": true,
-      "dependencies": {
-        "color": "^1.0.3",
-        "postcss": "^6.0.1",
-        "postcss-message-helpers": "^2.0.0"
-      }
-    },
-    "node_modules/postcss-color-hex-alpha/node_modules/color": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/color/-/color-1.0.3.tgz",
-      "integrity": "sha1-5I6DLYXxTvaU+0aIEcLVz+cptV0=",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.8.2",
-        "color-string": "^1.4.0"
-      }
-    },
-    "node_modules/postcss-color-hex-alpha/node_modules/color-string": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.0.tgz",
-      "integrity": "sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "^1.0.0",
-        "simple-swizzle": "^0.2.2"
-      }
-    },
-    "node_modules/postcss-color-hex-alpha/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-color-hex-alpha/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-color-hsl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-color-hsl/-/postcss-color-hsl-2.0.0.tgz",
-      "integrity": "sha1-EnA2ZvoxBDDj8wpFTawThjF9WEQ=",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^6.0.1",
-        "postcss-value-parser": "^3.3.0",
-        "units-css": "^0.4.0"
-      }
-    },
-    "node_modules/postcss-color-hsl/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-color-hsl/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-color-hwb": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-color-hwb/-/postcss-color-hwb-3.0.0.tgz",
-      "integrity": "sha1-NAKxnvTYSXVAwftQcr6YY8qVVx4=",
-      "dev": true,
-      "dependencies": {
-        "color": "^1.0.3",
-        "postcss": "^6.0.1",
-        "postcss-message-helpers": "^2.0.0",
-        "reduce-function-call": "^1.0.2"
-      }
-    },
-    "node_modules/postcss-color-hwb/node_modules/color": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/color/-/color-1.0.3.tgz",
-      "integrity": "sha1-5I6DLYXxTvaU+0aIEcLVz+cptV0=",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.8.2",
-        "color-string": "^1.4.0"
-      }
-    },
-    "node_modules/postcss-color-hwb/node_modules/color-string": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.0.tgz",
-      "integrity": "sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "^1.0.0",
-        "simple-swizzle": "^0.2.2"
-      }
-    },
-    "node_modules/postcss-color-hwb/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-color-hwb/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-color-rebeccapurple": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-3.1.0.tgz",
-      "integrity": "sha512-212hJUk9uSsbwO5ECqVjmh/iLsmiVL1xy9ce9TVf+X3cK/ZlUIlaMdoxje/YpsL9cmUH3I7io+/G2LyWx5rg1g==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^6.0.22",
-        "postcss-values-parser": "^1.5.0"
-      }
-    },
-    "node_modules/postcss-color-rebeccapurple/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-color-rebeccapurple/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-color-rgb": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-color-rgb/-/postcss-color-rgb-2.0.0.tgz",
-      "integrity": "sha1-FFOcinExSUtILg3RzCZf9lFLUmM=",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^6.0.1",
-        "postcss-value-parser": "^3.3.0"
-      }
-    },
-    "node_modules/postcss-color-rgb/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-color-rgb/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-color-rgba-fallback": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-color-rgba-fallback/-/postcss-color-rgba-fallback-3.0.0.tgz",
-      "integrity": "sha1-N9XJNToHoJJwkSqCYGu0Kg1wLAQ=",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^6.0.6",
-        "postcss-value-parser": "^3.3.0",
-        "rgb-hex": "^2.1.0"
-      }
-    },
-    "node_modules/postcss-color-rgba-fallback/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-color-rgba-fallback/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-cssnext": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-cssnext/-/postcss-cssnext-3.1.1.tgz",
-      "integrity": "sha512-u9e0CYE7zudnr/LK+FL02cwli8cQEwwmzzN3JVeOEZiDs0q8IDfGdI6C9FCkHtIKEEjY3AATW3dqCCvqDK+Sfg==",
-      "deprecated": "'postcss-cssnext' has been deprecated in favor of 'postcss-preset-env'. Read more at https://moox.io/blog/deprecating-cssnext/",
-      "dev": true,
-      "dependencies": {
-        "autoprefixer": "^7.1.1",
-        "caniuse-api": "^2.0.0",
-        "chalk": "^2.0.1",
-        "pixrem": "^4.0.0",
-        "pleeease-filters": "^4.0.0",
-        "postcss": "^6.0.5",
-        "postcss-apply": "^0.8.0",
-        "postcss-attribute-case-insensitive": "^2.0.0",
-        "postcss-calc": "^6.0.0",
-        "postcss-color-function": "^4.0.0",
-        "postcss-color-gray": "^4.0.0",
-        "postcss-color-hex-alpha": "^3.0.0",
-        "postcss-color-hsl": "^2.0.0",
-        "postcss-color-hwb": "^3.0.0",
-        "postcss-color-rebeccapurple": "^3.0.0",
-        "postcss-color-rgb": "^2.0.0",
-        "postcss-color-rgba-fallback": "^3.0.0",
-        "postcss-custom-media": "^6.0.0",
-        "postcss-custom-properties": "^6.1.0",
-        "postcss-custom-selectors": "^4.0.1",
-        "postcss-font-family-system-ui": "^3.0.0",
-        "postcss-font-variant": "^3.0.0",
-        "postcss-image-set-polyfill": "^0.3.5",
-        "postcss-initial": "^2.0.0",
-        "postcss-media-minmax": "^3.0.0",
-        "postcss-nesting": "^4.0.1",
-        "postcss-pseudo-class-any-link": "^4.0.0",
-        "postcss-pseudoelements": "^5.0.0",
-        "postcss-replace-overflow-wrap": "^2.0.0",
-        "postcss-selector-matches": "^3.0.1",
-        "postcss-selector-not": "^3.0.1"
-      },
-      "peerDependencies": {
-        "caniuse-lite": "^1.0.30000697"
-      }
-    },
-    "node_modules/postcss-cssnext/node_modules/browserslist": {
-      "version": "2.11.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz",
-      "integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==",
-      "deprecated": "Browserslist 2 could fail on reading Browserslist >3.0 config used in other tools.",
-      "dev": true,
-      "dependencies": {
-        "caniuse-lite": "^1.0.30000792",
-        "electron-to-chromium": "^1.3.30"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      }
-    },
-    "node_modules/postcss-cssnext/node_modules/caniuse-api": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-2.0.0.tgz",
-      "integrity": "sha1-sd21pZZrFvSNxJmERNS7xsfZ2DQ=",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^2.0.0",
-        "caniuse-lite": "^1.0.0",
-        "lodash.memoize": "^4.1.2",
-        "lodash.uniq": "^4.5.0"
-      }
-    },
-    "node_modules/postcss-cssnext/node_modules/picocolors": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-      "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-      "dev": true
-    },
-    "node_modules/postcss-cssnext/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-cssnext/node_modules/postcss-calc": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-6.0.2.tgz",
-      "integrity": "sha512-fiznXjEN5T42Qm7qqMCVJXS3roaj9r4xsSi+meaBVe7CJBl8t/QLOXu02Z2E6oWAMWIvCuF6JrvzFekmVEbOKA==",
-      "dev": true,
-      "dependencies": {
-        "css-unit-converter": "^1.1.1",
-        "postcss": "^7.0.2",
-        "postcss-selector-parser": "^2.2.2",
-        "reduce-css-calc": "^2.0.0"
-      }
-    },
-    "node_modules/postcss-cssnext/node_modules/postcss-calc/node_modules/postcss": {
-      "version": "7.0.39",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-      "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-      "dev": true,
-      "dependencies": {
-        "picocolors": "^0.2.1",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
-      }
-    },
-    "node_modules/postcss-cssnext/node_modules/postcss-selector-parser": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz",
-      "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=",
-      "dev": true,
-      "dependencies": {
-        "flatten": "^1.0.2",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
-      }
-    },
-    "node_modules/postcss-cssnext/node_modules/reduce-css-calc": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-2.1.8.tgz",
-      "integrity": "sha512-8liAVezDmUcH+tdzoEGrhfbGcP7nOV4NkGE3a74+qqvE7nt9i4sKLGBuZNOnpI4WiGksiNPklZxva80061QiPg==",
-      "dev": true,
-      "dependencies": {
-        "css-unit-converter": "^1.1.1",
-        "postcss-value-parser": "^3.3.0"
-      }
-    },
-    "node_modules/postcss-cssnext/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-custom-media": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-6.0.0.tgz",
-      "integrity": "sha1-vlMnhBEOyylQRPtTlaGABushpzc=",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^6.0.1"
-      }
-    },
-    "node_modules/postcss-custom-media/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-custom-media/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-custom-properties": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-6.3.1.tgz",
-      "integrity": "sha512-zoiwn4sCiUFbr4KcgcNZLFkR6gVQom647L+z1p/KBVHZ1OYwT87apnS42atJtx6XlX2yI7N5fjXbFixShQO2QQ==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "postcss": "^6.0.18"
-      }
-    },
-    "node_modules/postcss-custom-properties/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-custom-properties/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-custom-selectors": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-4.0.1.tgz",
-      "integrity": "sha1-eBOC+UxS5yfvXKR3bqKt9JphE4I=",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^6.0.1",
-        "postcss-selector-matches": "^3.0.0"
-      }
-    },
-    "node_modules/postcss-custom-selectors/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-custom-selectors/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-font-family-system-ui": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-font-family-system-ui/-/postcss-font-family-system-ui-3.0.0.tgz",
-      "integrity": "sha512-58G/hTxMSSKlIRpcPUjlyo6hV2MEzvcVO2m4L/T7Bb2fJTG4DYYfQjQeRvuimKQh1V1sOzCIz99g+H2aFNtlQw==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^6.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-font-family-system-ui/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-font-family-system-ui/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-font-variant": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-3.0.0.tgz",
-      "integrity": "sha1-CMzIj2BQuoLtjvLMdsDGprQfGD4=",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^6.0.1"
-      }
-    },
-    "node_modules/postcss-font-variant/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-font-variant/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-image-set-polyfill": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/postcss-image-set-polyfill/-/postcss-image-set-polyfill-0.3.5.tgz",
-      "integrity": "sha1-Dxk0E3AM8fgr05Bm7wFtZaShgYE=",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^6.0.1",
-        "postcss-media-query-parser": "^0.2.3"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-image-set-polyfill/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-image-set-polyfill/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-initial": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-2.0.0.tgz",
-      "integrity": "sha1-cnFfczbgu3k1HZnuZcSiU6hEG6Q=",
-      "dev": true,
-      "dependencies": {
-        "lodash.template": "^4.2.4",
-        "postcss": "^6.0.1"
-      }
-    },
-    "node_modules/postcss-initial/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-initial/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-loader": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-5.3.0.tgz",
-      "integrity": "sha512-/+Z1RAmssdiSLgIZwnJHwBMnlABPgF7giYzTN2NOfr9D21IJZ4mQC1R2miwp80zno9M4zMD/umGI8cR+2EL5zw==",
-      "dev": true,
-      "dependencies": {
-        "cosmiconfig": "^7.0.0",
-        "klona": "^2.0.4",
-        "semver": "^7.3.4"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "postcss": "^7.0.0 || ^8.0.1",
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/postcss-loader/node_modules/semver": {
-      "version": "7.3.7",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/postcss-media-minmax": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-3.0.0.tgz",
-      "integrity": "sha1-Z1JWA3pD70C8Twdgv9BtTcadSNI=",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^6.0.1"
-      }
-    },
-    "node_modules/postcss-media-minmax/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-media-minmax/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-media-query-parser": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
-      "integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=",
-      "dev": true
-    },
-    "node_modules/postcss-message-helpers": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz",
-      "integrity": "sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4=",
-      "dev": true
-    },
-    "node_modules/postcss-modules-extract-imports": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
-      "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
-      "dev": true,
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-modules-local-by-default": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz",
-      "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==",
-      "dev": true,
-      "dependencies": {
-        "icss-utils": "^5.0.0",
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.1.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-modules-local-by-default/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/postcss-modules-scope": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
-      "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
-      "dev": true,
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.4"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-modules-values": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
-      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
-      "dev": true,
-      "dependencies": {
-        "icss-utils": "^5.0.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-nesting": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-4.2.1.tgz",
-      "integrity": "sha512-IkyWXICwagCnlaviRexi7qOdwPw3+xVVjgFfGsxmztvRVaNxAlrypOIKqDE5mxY+BVxnId1rnUKBRQoNE2VDaA==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^6.0.11"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-nesting/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-nesting/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-pseudo-class-any-link": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-4.0.0.tgz",
-      "integrity": "sha1-kVKgYT00UHIFE+iJKFS65C0O5o4=",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^6.0.1",
-        "postcss-selector-parser": "^2.2.3"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-pseudo-class-any-link/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-pseudo-class-any-link/node_modules/postcss-selector-parser": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz",
-      "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=",
-      "dev": true,
-      "dependencies": {
-        "flatten": "^1.0.2",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
-      }
-    },
-    "node_modules/postcss-pseudo-class-any-link/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-pseudoelements": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-pseudoelements/-/postcss-pseudoelements-5.0.0.tgz",
-      "integrity": "sha1-7vGU6NUkZFylIKlJ6V5RjoEkAss=",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^6.0.0"
-      }
-    },
-    "node_modules/postcss-pseudoelements/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-pseudoelements/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-replace-overflow-wrap": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-2.0.0.tgz",
-      "integrity": "sha1-eU22+qVPjbEAhUOSqTr0V2i04ls=",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^6.0.1"
-      }
-    },
-    "node_modules/postcss-replace-overflow-wrap/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-replace-overflow-wrap/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-resolve-nested-selector": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz",
-      "integrity": "sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=",
-      "dev": true
-    },
-    "node_modules/postcss-safe-parser": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz",
-      "integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
-      },
-      "peerDependencies": {
-        "postcss": "^8.3.3"
-      }
-    },
-    "node_modules/postcss-selector-matches": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-selector-matches/-/postcss-selector-matches-3.0.1.tgz",
-      "integrity": "sha1-5WNAEeE5UIgYYbvdWMLQER/8lqs=",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^0.4.2",
-        "postcss": "^6.0.1"
-      }
-    },
-    "node_modules/postcss-selector-matches/node_modules/balanced-match": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-      "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
-      "dev": true
-    },
-    "node_modules/postcss-selector-matches/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-selector-matches/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-selector-not": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-3.0.1.tgz",
-      "integrity": "sha1-Lk2y8JZTNsAefOx9tsYN/3ZzNdk=",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^0.4.2",
-        "postcss": "^6.0.1"
-      }
-    },
-    "node_modules/postcss-selector-not/node_modules/balanced-match": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-      "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
-      "dev": true
-    },
-    "node_modules/postcss-selector-not/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-selector-not/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-selector-parser": {
-      "version": "6.0.10",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
-      "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
-      "dev": true,
-      "dependencies": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss-sorting": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-7.0.1.tgz",
-      "integrity": "sha512-iLBFYz6VRYyLJEJsBJ8M3TCqNcckVzz4wFounSc5Oez35ogE/X+aoC5fFu103Ot7NyvjU3/xqIXn93Gp3kJk4g==",
-      "dev": true,
-      "peerDependencies": {
-        "postcss": "^8.3.9"
-      }
-    },
-    "node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
-    "node_modules/postcss-values-parser": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/postcss-values-parser/-/postcss-values-parser-1.5.0.tgz",
-      "integrity": "sha512-3M3p+2gMp0AH3da530TlX8kiO1nxdTnc3C6vr8dMxRLIlh8UYkz0/wcwptSXjhtx2Fr0TySI7a+BHDQ8NL7LaQ==",
-      "dev": true,
-      "dependencies": {
-        "flatten": "^1.0.2",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/prestakit": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/prestakit/-/prestakit-1.2.5.tgz",
-      "integrity": "sha512-dLa1+teIRLLVtjk0F2pQL2Ya+HTGQUuJ6P6k+HZWJbT+1cwQkN7VAUiH7XGLHVSJchrI+hnarR43tI2B5XZDUA==",
-      "dependencies": {
-        "bootstrap": "^4.4.1",
-        "jquery.growl": "^1.3.5",
-        "material-design-icons-iconfont": "^6.1.0",
-        "open-sans-fonts": "^1.6.2",
-        "select2": "^4.0.5",
-        "select2-bootstrap-theme": "0.1.0-beta.10"
-      }
-    },
-    "node_modules/pretty-error": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz",
-      "integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==",
-      "dev": true,
-      "dependencies": {
-        "lodash": "^4.17.20",
-        "renderkid": "^3.0.0"
-      }
-    },
-    "node_modules/process": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6.0"
-      }
-    },
-    "node_modules/process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-      "dev": true
-    },
-    "node_modules/psl": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
-      "dev": true
-    },
-    "node_modules/public-encrypt": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
-      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "parse-asn1": "^5.0.0",
-        "randombytes": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "node_modules/public-encrypt/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/punycode": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-      "dev": true
-    },
-    "node_modules/querystring": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
-      "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
-    "node_modules/querystring-es3": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
-    "node_modules/queue-microtask": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/quick-lru": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
-      "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/randombytes": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "node_modules/randomfill": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-      "dev": true,
-      "dependencies": {
-        "randombytes": "^2.0.5",
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "node_modules/read-pkg": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
-      "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
-      "dev": true,
-      "dependencies": {
-        "@types/normalize-package-data": "^2.4.0",
-        "normalize-package-data": "^2.5.0",
-        "parse-json": "^5.0.0",
-        "type-fest": "^0.6.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg-up": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
-      "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^4.1.0",
-        "read-pkg": "^5.2.0",
-        "type-fest": "^0.8.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg/node_modules/hosted-git-info": {
-      "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-      "dev": true
-    },
-    "node_modules/read-pkg/node_modules/normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-      "dev": true,
-      "dependencies": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
-      }
-    },
-    "node_modules/read-pkg/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/read-pkg/node_modules/type-fest": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-      "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/readable-stream/node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "node_modules/rechoir": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz",
-      "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==",
-      "dev": true,
-      "dependencies": {
-        "resolve": "^1.9.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/redent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
-      "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
-      "dev": true,
-      "dependencies": {
-        "indent-string": "^4.0.0",
-        "strip-indent": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/reduce-css-calc": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz",
-      "integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^0.4.2",
-        "math-expression-evaluator": "^1.2.14",
-        "reduce-function-call": "^1.0.1"
-      }
-    },
-    "node_modules/reduce-css-calc/node_modules/balanced-match": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-      "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
-      "dev": true
-    },
-    "node_modules/reduce-function-call": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.3.tgz",
-      "integrity": "sha512-Hl/tuV2VDgWgCSEeWMLwxLZqX7OK59eU1guxXsRKTAyeYimivsKdtcV4fu3r710tpG5GmDKDhQ0HSZLExnNmyQ==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/regenerate": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
-      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
-      "dev": true
-    },
-    "node_modules/regenerate-unicode-properties": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz",
-      "integrity": "sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==",
-      "dev": true,
-      "dependencies": {
-        "regenerate": "^1.4.2"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/regenerator-runtime": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
-      "dev": true
-    },
-    "node_modules/regenerator-transform": {
-      "version": "0.15.0",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz",
-      "integrity": "sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.8.4"
-      }
-    },
-    "node_modules/regexpp": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      }
-    },
-    "node_modules/regexpu-core": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.0.1.tgz",
-      "integrity": "sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw==",
-      "dev": true,
-      "dependencies": {
-        "regenerate": "^1.4.2",
-        "regenerate-unicode-properties": "^10.0.1",
-        "regjsgen": "^0.6.0",
-        "regjsparser": "^0.8.2",
-        "unicode-match-property-ecmascript": "^2.0.0",
-        "unicode-match-property-value-ecmascript": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/regjsgen": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.6.0.tgz",
-      "integrity": "sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA==",
-      "dev": true
-    },
-    "node_modules/regjsparser": {
-      "version": "0.8.4",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.8.4.tgz",
-      "integrity": "sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==",
-      "dev": true,
-      "dependencies": {
-        "jsesc": "~0.5.0"
-      },
-      "bin": {
-        "regjsparser": "bin/parser"
-      }
-    },
-    "node_modules/regjsparser/node_modules/jsesc": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-      "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
-      "dev": true,
-      "bin": {
-        "jsesc": "bin/jsesc"
-      }
-    },
-    "node_modules/relateurl": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
-      "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/renderkid": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz",
-      "integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==",
-      "dev": true,
-      "dependencies": {
-        "css-select": "^4.1.3",
-        "dom-converter": "^0.2.0",
-        "htmlparser2": "^6.1.0",
-        "lodash": "^4.17.21",
-        "strip-ansi": "^6.0.1"
-      }
-    },
-    "node_modules/renderkid/node_modules/entities": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
-    "node_modules/renderkid/node_modules/htmlparser2": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
-      "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
-      "dev": true,
-      "funding": [
-        "https://github.com/fb55/htmlparser2?sponsor=1",
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ],
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.0.0",
-        "domutils": "^2.5.2",
-        "entities": "^2.0.0"
-      }
-    },
-    "node_modules/require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/require-from-string": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/resolve": {
-      "version": "1.22.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
-      "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
-      "dev": true,
-      "dependencies": {
-        "is-core-module": "^2.8.1",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/resolve-cwd": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
-      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
-      "dev": true,
-      "dependencies": {
-        "resolve-from": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/resolve-cwd/node_modules/resolve-from": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-      "dev": true,
-      "engines": {
-        "iojs": ">=1.0.0",
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/rgb": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/rgb/-/rgb-0.1.0.tgz",
-      "integrity": "sha1-vieykej+/+rBvZlylyG/pA/AN7U=",
-      "dev": true,
-      "bin": {
-        "rgb": "bin/rgb"
-      }
-    },
-    "node_modules/rgb-hex": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/rgb-hex/-/rgb-hex-2.1.0.tgz",
-      "integrity": "sha1-x3PF/iJoolV42SU5qCp6XOU77aY=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/ripemd160": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-      "dev": true,
-      "dependencies": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
-      }
-    },
-    "node_modules/run-parallel": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "queue-microtask": "^1.2.2"
-      }
-    },
-    "node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
-    },
-    "node_modules/safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
-    },
-    "node_modules/sass-embedded": {
-      "version": "1.55.0",
-      "resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.55.0.tgz",
-      "integrity": "sha512-6AkKEyRjxz37iNwOdTOW94I33j5mxcih9Z604q1w0M1dOTKaZgtyNI67O0zb4akwZ9dVZ2VSJBXqY8/1TZRBIw==",
-      "dev": true,
-      "dependencies": {
-        "buffer-builder": "^0.2.0",
-        "google-protobuf": "^3.11.4",
-        "immutable": "^4.0.0",
-        "rxjs": "^7.4.0",
-        "supports-color": "^8.1.1"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      },
-      "optionalDependencies": {
-        "sass-embedded-darwin-arm64": "1.55.0",
-        "sass-embedded-darwin-x64": "1.55.0",
-        "sass-embedded-linux-arm": "1.55.0",
-        "sass-embedded-linux-arm64": "1.55.0",
-        "sass-embedded-linux-ia32": "1.55.0",
-        "sass-embedded-linux-x64": "1.55.0",
-        "sass-embedded-win32-ia32": "1.55.0",
-        "sass-embedded-win32-x64": "1.55.0"
-      }
-    },
-    "node_modules/sass-embedded-darwin-arm64": {
-      "version": "1.55.0",
-      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-arm64/-/sass-embedded-darwin-arm64-1.55.0.tgz",
-      "integrity": "sha512-cQ43gYDFo4xWSqG01ZmOhTyTgk/RYK7s1a4R+7VSQPhYTsd4VofAmTNw0MkLR3RzR53ziGgawA6uT/WHTm+yjg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/sass-embedded-darwin-x64": {
-      "version": "1.55.0",
-      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-x64/-/sass-embedded-darwin-x64-1.55.0.tgz",
-      "integrity": "sha512-ra8z++EBey01pkiwCwjWyMbf6G5xm2Uj0dUJzzsS1MI6Fw6XaesrWmYico5pnawm3rOYtKlMxkd2Y6b1Jwxy8A==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/sass-embedded-linux-arm": {
-      "version": "1.55.0",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm/-/sass-embedded-linux-arm-1.55.0.tgz",
-      "integrity": "sha512-UIW7CaRLjHMWm64jH23n5eji/RAv8XIJ2qpFh0Ds8EJeDZmRA+qyIFHcQ805fZ22u6o0mkxq0kE4+j1XmmbBeg==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/sass-embedded-linux-arm64": {
-      "version": "1.55.0",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm64/-/sass-embedded-linux-arm64-1.55.0.tgz",
-      "integrity": "sha512-P4zL4PnujdiSkek/g0RJjyNZcYEqSm6WFr0sSIrxe3byhGg56mWr4WJdxUNwFZ6sxyy2s0PFSjSKGmBtgEfIpw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/sass-embedded-linux-ia32": {
-      "version": "1.55.0",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-ia32/-/sass-embedded-linux-ia32-1.55.0.tgz",
-      "integrity": "sha512-9XJyAl4w5KBjR4LAXckfQKqPv9UYPmOv2HFRBwhHD1k4Dc8gZbfTCzK5wl49z5Z4z1GPvqV9ucIZceXzgJ5e6Q==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/sass-embedded-linux-x64": {
-      "version": "1.55.0",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-x64/-/sass-embedded-linux-x64-1.55.0.tgz",
-      "integrity": "sha512-vd4/4/L7gZcVyxq03/MY/+rcpGgOI0ihOUpwRJLj+9CmUxvhxCSTF51/QO5CW7Z5oJSYEABA/RYlj8NPm4ZejA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/sass-embedded-win32-ia32": {
-      "version": "1.55.0",
-      "resolved": "https://registry.npmjs.org/sass-embedded-win32-ia32/-/sass-embedded-win32-ia32-1.55.0.tgz",
-      "integrity": "sha512-4HxK0byJ3iIn5OECIeNVz9GcGBuQcQT6kTvI+3QSHzuKsqgQrlXOPJ3772zKD6PVwZJNFZJFf3o9w8V2VSHbTQ==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/sass-embedded-win32-x64": {
-      "version": "1.55.0",
-      "resolved": "https://registry.npmjs.org/sass-embedded-win32-x64/-/sass-embedded-win32-x64-1.55.0.tgz",
-      "integrity": "sha512-LWUp5YpJy0/Q+5AOVcw919jktw+OnPiM4f4j5K6MJAiaodJwrSTqRGwMa2wOWyAUpjIdka8Ygm6j+2h5HNgSNQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/sass-embedded/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/sass-embedded/node_modules/rxjs": {
-      "version": "7.5.7",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.7.tgz",
-      "integrity": "sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/sass-embedded/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
-      }
-    },
-    "node_modules/sass-loader": {
-      "version": "13.0.2",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.0.2.tgz",
-      "integrity": "sha512-BbiqbVmbfJaWVeOOAu2o7DhYWtcNmTfvroVgFXa6k2hHheMxNAeDHLNoDy/Q5aoaVlz0LH+MbMktKwm9vN/j8Q==",
-      "dev": true,
-      "dependencies": {
-        "klona": "^2.0.4",
-        "neo-async": "^2.6.2"
-      },
-      "engines": {
-        "node": ">= 14.15.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "fibers": ">= 3.1.0",
-        "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0",
-        "sass": "^1.3.0",
-        "sass-embedded": "*",
-        "webpack": "^5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "fibers": {
-          "optional": true
-        },
-        "node-sass": {
-          "optional": true
-        },
-        "sass": {
-          "optional": true
-        },
-        "sass-embedded": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-      "dev": true
-    },
-    "node_modules/saxes": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
-      "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
-      "dev": true,
-      "dependencies": {
-        "xmlchars": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/schema-utils": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
-      "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.5",
-        "ajv": "^6.12.4",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 8.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/select2": {
-      "version": "4.0.13",
-      "resolved": "https://registry.npmjs.org/select2/-/select2-4.0.13.tgz",
-      "integrity": "sha512-1JeB87s6oN/TDxQQYCvS5EFoQyvV6eYMZZ0AeA4tdFDYWN3BAGZ8npr17UBFddU0lgAt3H0yjX3X6/ekOj1yjw=="
-    },
-    "node_modules/select2-bootstrap-theme": {
-      "version": "0.1.0-beta.10",
-      "resolved": "https://registry.npmjs.org/select2-bootstrap-theme/-/select2-bootstrap-theme-0.1.0-beta.10.tgz",
-      "integrity": "sha512-gc9Y9yNjkGRqeFmI/pAKyL4maMKH9VKAn62E+uF/hxz8FTmfuKH0sDEGhFhk3f8Jp+emtsDdK1c1nb6S51BV0Q=="
-    },
-    "node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/setimmediate": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
-      "dev": true
-    },
-    "node_modules/sha.js": {
-      "version": "2.4.11",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      },
-      "bin": {
-        "sha.js": "bin.js"
-      }
-    },
-    "node_modules/shallow-clone": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
-      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dev": true,
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "dev": true
-    },
-    "node_modules/simple-swizzle": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
-      "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
-      "dev": true,
-      "dependencies": {
-        "is-arrayish": "^0.3.1"
-      }
-    },
-    "node_modules/simple-swizzle/node_modules/is-arrayish": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
-      "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
-      "dev": true
-    },
-    "node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/source-list-map": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
-      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
-      "dev": true
-    },
-    "node_modules/source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-js": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-support": {
-      "version": "0.5.21",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-      "dev": true,
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      }
-    },
-    "node_modules/source-map-support/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/spdx-correct": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
-      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
-      "dev": true,
-      "dependencies": {
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-exceptions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
-      "dev": true
-    },
-    "node_modules/spdx-expression-parse": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
-      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
-      "dev": true,
-      "dependencies": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-expression-validate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/spdx-expression-validate/-/spdx-expression-validate-2.0.0.tgz",
-      "integrity": "sha512-b3wydZLM+Tc6CFvaRDBOF9d76oGIHNCLYFeHbftFXUWjnfZWganmDmvtM5sm1cRwJc/VDBMLyGGrsLFd1vOxbg==",
-      "dev": true,
-      "dependencies": {
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-license-ids": {
-      "version": "3.0.11",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz",
-      "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==",
-      "dev": true
-    },
-    "node_modules/specificity": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/specificity/-/specificity-0.4.1.tgz",
-      "integrity": "sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==",
-      "dev": true,
-      "bin": {
-        "specificity": "bin/specificity"
-      }
-    },
-    "node_modules/split2": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/split2/-/split2-0.2.1.tgz",
-      "integrity": "sha1-At2smtwD7Au3jBKC7Aecpuha6QA=",
-      "dev": true,
-      "dependencies": {
-        "through2": "~0.6.1"
-      }
-    },
-    "node_modules/split2/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-      "dev": true
-    },
-    "node_modules/split2/node_modules/readable-stream": {
-      "version": "1.0.34",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-      "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/split2/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-      "dev": true
-    },
-    "node_modules/split2/node_modules/through2": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-      "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": ">=1.0.33-1 <1.1.0-0",
-        "xtend": ">=4.0.0 <4.1.0-0"
-      }
-    },
-    "node_modules/stream-browserify": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
-      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "~2.0.1",
-        "readable-stream": "^2.0.2"
-      }
-    },
-    "node_modules/stream-http": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
-      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
-      "dev": true,
-      "dependencies": {
-        "builtin-status-codes": "^3.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.3.6",
-        "to-arraybuffer": "^1.0.0",
-        "xtend": "^4.0.0"
-      }
-    },
-    "node_modules/string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
-    "node_modules/string_decoder/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/string.prototype.trimend": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
-      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimstart": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
-      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/strip-final-newline": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/strip-indent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
-      "dev": true,
-      "dependencies": {
-        "min-indent": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/style-loader": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.3.0.tgz",
-      "integrity": "sha512-V7TCORko8rs9rIqkSrlMfkqA63DfoGBBJmK1kKGCcSi+BWb4cqz0SRsnp4l6rU5iwOEd0/2ePv68SV22VXon4Q==",
-      "dev": true,
-      "dependencies": {
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^2.7.0"
-      },
-      "engines": {
-        "node": ">= 8.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/style-search": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
-      "integrity": "sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI=",
-      "dev": true
-    },
-    "node_modules/stylelint": {
-      "version": "14.7.1",
-      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.7.1.tgz",
-      "integrity": "sha512-rUOWm67hrzGXXyO/cInENEejF4urh1dLgOb9cr/3XLDb/t/A+rXQp3p6+no8o8QCKTgBUdhVUq/bXMgE988PJw==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^2.0.0",
-        "colord": "^2.9.2",
-        "cosmiconfig": "^7.0.1",
-        "css-functions-list": "^3.0.1",
-        "debug": "^4.3.4",
-        "execall": "^2.0.0",
-        "fast-glob": "^3.2.11",
-        "fastest-levenshtein": "^1.0.12",
-        "file-entry-cache": "^6.0.1",
-        "get-stdin": "^8.0.0",
-        "global-modules": "^2.0.0",
-        "globby": "^11.1.0",
-        "globjoin": "^0.1.4",
-        "html-tags": "^3.2.0",
-        "ignore": "^5.2.0",
-        "import-lazy": "^4.0.0",
-        "imurmurhash": "^0.1.4",
-        "is-plain-object": "^5.0.0",
-        "known-css-properties": "^0.24.0",
-        "mathml-tag-names": "^2.1.3",
-        "meow": "^9.0.0",
-        "micromatch": "^4.0.5",
-        "normalize-path": "^3.0.0",
-        "normalize-selector": "^0.2.0",
-        "picocolors": "^1.0.0",
-        "postcss": "^8.4.12",
-        "postcss-media-query-parser": "^0.2.3",
-        "postcss-resolve-nested-selector": "^0.1.1",
-        "postcss-safe-parser": "^6.0.0",
-        "postcss-selector-parser": "^6.0.10",
-        "postcss-value-parser": "^4.2.0",
-        "resolve-from": "^5.0.0",
-        "specificity": "^0.4.1",
-        "string-width": "^4.2.3",
-        "strip-ansi": "^6.0.1",
-        "style-search": "^0.1.0",
-        "supports-hyperlinks": "^2.2.0",
-        "svg-tags": "^1.0.0",
-        "table": "^6.8.0",
-        "v8-compile-cache": "^2.3.0",
-        "write-file-atomic": "^4.0.1"
-      },
-      "bin": {
-        "stylelint": "bin/stylelint.js"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/stylelint"
-      }
-    },
-    "node_modules/stylelint-config-prestashop": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/stylelint-config-prestashop/-/stylelint-config-prestashop-1.0.7.tgz",
-      "integrity": "sha512-Ac2D15Jsk/zOmHJ4mu5g29bLQFkOmuSKGE/n8Scjs6YAOL/7QRhq26hXzlZ21+VMFi2bqKdjzqmYKbhgUHGpCA==",
-      "dev": true,
-      "dependencies": {
-        "stylelint-config-twbs-bootstrap": "^3.0.1",
-        "stylelint-no-unsupported-browser-features": "^5.0.1"
-      }
-    },
-    "node_modules/stylelint-config-prestashop/node_modules/postcss-scss": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.3.tgz",
-      "integrity": "sha512-j4KxzWovfdHsyxwl1BxkUal/O4uirvHgdzMKS1aWJBAV0qh2qj5qAZqpeBfVUYGWv+4iK9Az7SPyZ4fyNju1uA==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
-      },
-      "peerDependencies": {
-        "postcss": "^8.3.3"
-      }
-    },
-    "node_modules/stylelint-config-prestashop/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/stylelint-config-prestashop/node_modules/stylelint-config-recess-order": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-recess-order/-/stylelint-config-recess-order-3.0.0.tgz",
-      "integrity": "sha512-uNXrlDz570Q7HJlrq8mNjgfO/xlKIh2hKVKEFMTG1/ih/6tDLcTbuvO1Zoo2dnQay990OAkWLDpTDOorB+hmBw==",
-      "dev": true,
-      "dependencies": {
-        "stylelint-order": "5.x"
-      },
-      "peerDependencies": {
-        "stylelint": ">=14"
-      }
-    },
-    "node_modules/stylelint-config-prestashop/node_modules/stylelint-config-recommended": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-6.0.0.tgz",
-      "integrity": "sha512-ZorSSdyMcxWpROYUvLEMm0vSZud2uB7tX1hzBZwvVY9SV/uly4AvvJPPhCcymZL3fcQhEQG5AELmrxWqtmzacw==",
-      "dev": true,
-      "peerDependencies": {
-        "stylelint": "^14.0.0"
-      }
-    },
-    "node_modules/stylelint-config-prestashop/node_modules/stylelint-config-recommended-scss": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-5.0.2.tgz",
-      "integrity": "sha512-b14BSZjcwW0hqbzm9b0S/ScN2+3CO3O4vcMNOw2KGf8lfVSwJ4p5TbNEXKwKl1+0FMtgRXZj6DqVUe/7nGnuBg==",
-      "dev": true,
-      "dependencies": {
-        "postcss-scss": "^4.0.2",
-        "stylelint-config-recommended": "^6.0.0",
-        "stylelint-scss": "^4.0.0"
-      },
-      "peerDependencies": {
-        "stylelint": "^14.0.0"
-      }
-    },
-    "node_modules/stylelint-config-prestashop/node_modules/stylelint-config-standard": {
-      "version": "24.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-24.0.0.tgz",
-      "integrity": "sha512-+RtU7fbNT+VlNbdXJvnjc3USNPZRiRVp/d2DxOF/vBDDTi0kH5RX2Ny6errdtZJH3boO+bmqIYEllEmok4jiuw==",
-      "dev": true,
-      "dependencies": {
-        "stylelint-config-recommended": "^6.0.0"
-      },
-      "peerDependencies": {
-        "stylelint": "^14.0.0"
-      }
-    },
-    "node_modules/stylelint-config-prestashop/node_modules/stylelint-config-standard-scss": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-standard-scss/-/stylelint-config-standard-scss-3.0.0.tgz",
-      "integrity": "sha512-zt3ZbzIbllN1iCmc94e4pDxqpkzeR6CJo5DDXzltshuXr+82B8ylHyMMARNnUYrZH80B7wgY7UkKTYCFM0UUyw==",
-      "dev": true,
-      "dependencies": {
-        "stylelint-config-recommended-scss": "^5.0.2",
-        "stylelint-config-standard": "^24.0.0"
-      },
-      "peerDependencies": {
-        "stylelint": "^14.0.0"
-      }
-    },
-    "node_modules/stylelint-config-prestashop/node_modules/stylelint-config-twbs-bootstrap": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/stylelint-config-twbs-bootstrap/-/stylelint-config-twbs-bootstrap-3.0.1.tgz",
-      "integrity": "sha512-XvFWKO0aveUy/RziVa5osYaOXAX6CePt8YypnRwKdrMtZWkgP85xnrkYBEpS2fmKl2WN79NCdSQFLU/UFoP7hw==",
-      "dev": true,
-      "dependencies": {
-        "stylelint-config-recess-order": "^3.0.0",
-        "stylelint-config-standard": "^24.0.0",
-        "stylelint-config-standard-scss": "^3.0.0",
-        "stylelint-scss": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "peerDependencies": {
-        "stylelint": "^14.1.0"
-      }
-    },
-    "node_modules/stylelint-config-prestashop/node_modules/stylelint-order": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-5.0.0.tgz",
-      "integrity": "sha512-OWQ7pmicXufDw5BlRqzdz3fkGKJPgLyDwD1rFY3AIEfIH/LQY38Vu/85v8/up0I+VPiuGRwbc2Hg3zLAsJaiyw==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^8.3.11",
-        "postcss-sorting": "^7.0.1"
-      },
-      "peerDependencies": {
-        "stylelint": "^14.0.0"
-      }
-    },
-    "node_modules/stylelint-config-prestashop/node_modules/stylelint-scss": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-4.2.0.tgz",
-      "integrity": "sha512-HHHMVKJJ5RM9pPIbgJ/XA67h9H0407G68Rm69H4fzFbFkyDMcTV1Byep3qdze5+fJ3c0U7mJrbj6S0Fg072uZA==",
-      "dev": true,
-      "dependencies": {
-        "lodash": "^4.17.21",
-        "postcss-media-query-parser": "^0.2.3",
-        "postcss-resolve-nested-selector": "^0.1.1",
-        "postcss-selector-parser": "^6.0.6",
-        "postcss-value-parser": "^4.1.0"
-      },
-      "peerDependencies": {
-        "stylelint": "^14.5.1"
-      }
-    },
-    "node_modules/stylelint-no-unsupported-browser-features": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/stylelint-no-unsupported-browser-features/-/stylelint-no-unsupported-browser-features-5.0.3.tgz",
-      "integrity": "sha512-FqfbOTk5UEkHsAKOkPH6SvajsfO9YuoWvKxd34tCRBZug9ZNeaPn141nyWkd+ncc8S1gVmO2+O6qVAMj9bvWww==",
-      "dev": true,
-      "dependencies": {
-        "doiuse": "^4.4.1",
-        "lodash": "^4.17.15",
-        "postcss": "^8.3.6"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "peerDependencies": {
-        "stylelint": ">=13.0.0"
-      }
-    },
-    "node_modules/stylelint/node_modules/ajv": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-      "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/stylelint/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/stylelint/node_modules/array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/stylelint/node_modules/astral-regex": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/stylelint/node_modules/balanced-match": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz",
-      "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==",
-      "dev": true
-    },
-    "node_modules/stylelint/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/stylelint/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/stylelint/node_modules/get-stdin": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
-      "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/stylelint/node_modules/globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-      "dev": true,
-      "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/stylelint/node_modules/is-plain-object": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
-      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/stylelint/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true
-    },
-    "node_modules/stylelint/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/stylelint/node_modules/resolve-from": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/stylelint/node_modules/slice-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
-      }
-    },
-    "node_modules/stylelint/node_modules/table": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
-      "integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^8.0.1",
-        "lodash.truncate": "^4.4.2",
-        "slice-ansi": "^4.0.0",
-        "string-width": "^4.2.3",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/supports-hyperlinks": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
-      "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0",
-        "supports-color": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/supports-hyperlinks/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/supports-hyperlinks/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/svg-tags": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
-      "integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=",
-      "dev": true
-    },
-    "node_modules/symbol-tree": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
-      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
-      "dev": true
-    },
-    "node_modules/tapable": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/terser": {
-      "version": "5.12.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.12.1.tgz",
-      "integrity": "sha512-NXbs+7nisos5E+yXwAD+y7zrcTkMqb0dEJxIGtSKPdCBzopf7ni4odPul2aechpV7EXNvOudYOX2bb5tln1jbQ==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^8.5.0",
-        "commander": "^2.20.0",
-        "source-map": "~0.7.2",
-        "source-map-support": "~0.5.20"
-      },
-      "bin": {
-        "terser": "bin/terser"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/terser-webpack-plugin": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz",
-      "integrity": "sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g==",
-      "dev": true,
-      "dependencies": {
-        "jest-worker": "^27.4.5",
-        "schema-utils": "^3.1.1",
-        "serialize-javascript": "^6.0.0",
-        "source-map": "^0.6.1",
-        "terser": "^5.7.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.1.0"
-      },
-      "peerDependenciesMeta": {
-        "@swc/core": {
-          "optional": true
-        },
-        "esbuild": {
-          "optional": true
-        },
-        "uglify-js": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/serialize-javascript": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
-      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
-      "dev": true,
-      "dependencies": {
-        "randombytes": "^2.1.0"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/terser/node_modules/acorn": {
-      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
-      "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/terser/node_modules/commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true
-    },
-    "node_modules/terser/node_modules/source-map": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-      "dev": true
-    },
-    "node_modules/through2": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz",
-      "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "3"
-      }
-    },
-    "node_modules/through2/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/timers-browserify": {
-      "version": "2.0.12",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
-      "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
-      "dev": true,
-      "dependencies": {
-        "setimmediate": "^1.0.4"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
-    "node_modules/to-arraybuffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
-      "dev": true
-    },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/tr46": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
-      "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
-      "dev": true,
-      "dependencies": {
-        "punycode": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/tr46/node_modules/punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/trim-newlines": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
-      "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/tsconfig-paths": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
-      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
-        "minimist": "^1.2.6",
-        "strip-bom": "^3.0.0"
-      }
-    },
-    "node_modules/tsconfig-paths/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/tslib": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
-      "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
-      "dev": true
-    },
-    "node_modules/tty-browserify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
-      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
-      "dev": true
-    },
-    "node_modules/type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/unbox-primitive": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
-      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "has-bigints": "^1.0.1",
-        "has-symbols": "^1.0.2",
-        "which-boxed-primitive": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/unicode-canonical-property-names-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/unicode-match-property-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
-      "dev": true,
-      "dependencies": {
-        "unicode-canonical-property-names-ecmascript": "^2.0.0",
-        "unicode-property-aliases-ecmascript": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/unicode-match-property-value-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/unicode-property-aliases-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/uniq": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
-      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
-      "dev": true
-    },
-    "node_modules/units-css": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/units-css/-/units-css-0.4.0.tgz",
-      "integrity": "sha1-1iKGU6UZg9fBb/KPi53Dsf/tOgc=",
-      "dev": true,
-      "dependencies": {
-        "isnumeric": "^0.2.0",
-        "viewport-dimensions": "^0.2.0"
-      }
-    },
-    "node_modules/universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
-    "node_modules/uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
-      "dependencies": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "node_modules/uri-js/node_modules/punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/url": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
-      "dev": true,
-      "dependencies": {
-        "punycode": "1.3.2",
-        "querystring": "0.2.0"
-      }
-    },
-    "node_modules/url/node_modules/punycode": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-      "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
-      "dev": true
-    },
-    "node_modules/util": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
-      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "2.0.3"
-      }
-    },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
-    },
-    "node_modules/util/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-      "dev": true
-    },
-    "node_modules/utila": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
-      "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=",
-      "dev": true
-    },
-    "node_modules/v8-compile-cache": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
-      "dev": true
-    },
-    "node_modules/validate-npm-package-license": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-      "dev": true,
-      "dependencies": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
-    "node_modules/vazirmatn": {
-      "version": "32.102.0",
-      "resolved": "https://registry.npmjs.org/vazirmatn/-/vazirmatn-32.102.0.tgz",
-      "integrity": "sha512-Fkvs0Hp5x9zjHTuwog3KEcARhMLxjXd3o3MyD/vBywxYt2LG+4THEHpu6AW8ojfHJAutrxFnDTPB/5hvkX80ww=="
-    },
-    "node_modules/viewport-dimensions": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/viewport-dimensions/-/viewport-dimensions-0.2.0.tgz",
-      "integrity": "sha1-3nQHR9tTh/0XJfUXXpG6x2r982w=",
-      "dev": true
-    },
-    "node_modules/vm-browserify": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
-      "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
-      "dev": true
-    },
-    "node_modules/w3c-hr-time": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
-      "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
-      "dev": true,
-      "dependencies": {
-        "browser-process-hrtime": "^1.0.0"
-      }
-    },
-    "node_modules/w3c-xmlserializer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-3.0.0.tgz",
-      "integrity": "sha512-3WFqGEgSXIyGhOmAFtlicJNMjEps8b1MG31NCA0/vOF9+nKMUW1ckhi9cnNHmf88Rzw5V+dwIwsm2C7X8k9aQg==",
-      "dev": true,
-      "dependencies": {
-        "xml-name-validator": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/watchpack": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz",
-      "integrity": "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==",
-      "dev": true,
-      "dependencies": {
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.1.2"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/webidl-conversions": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
-      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/webpack": {
-      "version": "5.72.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.72.0.tgz",
-      "integrity": "sha512-qmSmbspI0Qo5ld49htys8GY9XhS9CGqFoHTsOVAnjBdg0Zn79y135R+k4IR4rKK6+eKaabMhJwiVB7xw0SJu5w==",
-      "dev": true,
-      "dependencies": {
-        "@types/eslint-scope": "^3.7.3",
-        "@types/estree": "^0.0.51",
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/wasm-edit": "1.11.1",
-        "@webassemblyjs/wasm-parser": "1.11.1",
-        "acorn": "^8.4.1",
-        "acorn-import-assertions": "^1.7.6",
-        "browserslist": "^4.14.5",
-        "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.9.2",
-        "es-module-lexer": "^0.9.0",
-        "eslint-scope": "5.1.1",
-        "events": "^3.2.0",
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.2.9",
-        "json-parse-better-errors": "^1.0.2",
-        "loader-runner": "^4.2.0",
-        "mime-types": "^2.1.27",
-        "neo-async": "^2.6.2",
-        "schema-utils": "^3.1.0",
-        "tapable": "^2.1.1",
-        "terser-webpack-plugin": "^5.1.3",
-        "watchpack": "^2.3.1",
-        "webpack-sources": "^3.2.3"
-      },
-      "bin": {
-        "webpack": "bin/webpack.js"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependenciesMeta": {
-        "webpack-cli": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/webpack-cli": {
-      "version": "4.9.2",
-      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.9.2.tgz",
-      "integrity": "sha512-m3/AACnBBzK/kMTcxWHcZFPrw/eQuY4Df1TxvIWfWM2x7mRqBQCqKEd96oCUa9jkapLBaFfRce33eGDb4Pr7YQ==",
-      "dev": true,
-      "dependencies": {
-        "@discoveryjs/json-ext": "^0.5.0",
-        "@webpack-cli/configtest": "^1.1.1",
-        "@webpack-cli/info": "^1.4.1",
-        "@webpack-cli/serve": "^1.6.1",
-        "colorette": "^2.0.14",
-        "commander": "^7.0.0",
-        "execa": "^5.0.0",
-        "fastest-levenshtein": "^1.0.12",
-        "import-local": "^3.0.2",
-        "interpret": "^2.2.0",
-        "rechoir": "^0.7.0",
-        "webpack-merge": "^5.7.3"
-      },
-      "bin": {
-        "webpack-cli": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "peerDependencies": {
-        "webpack": "4.x.x || 5.x.x"
-      },
-      "peerDependenciesMeta": {
-        "@webpack-cli/generators": {
-          "optional": true
-        },
-        "@webpack-cli/migrate": {
-          "optional": true
-        },
-        "webpack-bundle-analyzer": {
-          "optional": true
-        },
-        "webpack-dev-server": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/webpack-cli/node_modules/commander": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/webpack-cli/node_modules/interpret": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz",
-      "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/webpack-font-preload-plugin": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/webpack-font-preload-plugin/-/webpack-font-preload-plugin-1.5.0.tgz",
-      "integrity": "sha512-/Nh6MNa7/rbu3ZcqSR1SxB+G5XaITu7U2yZO5INTsVRpVlMLQmHQZCoDt4PP+iFyBdvBCDbA0CImRXHarQ0wpQ==",
-      "dev": true,
-      "dependencies": {
-        "jsdom": "^19.0.0",
-        "webpack-sources": "^3.2.2"
-      },
-      "engines": {
-        "node": ">= 10.17.0"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/webpack-font-preload-plugin/node_modules/webpack-sources": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/webpack-license-plugin": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/webpack-license-plugin/-/webpack-license-plugin-4.2.2.tgz",
-      "integrity": "sha512-OfIdm659IKurEInKlBN6Sfzrh+MNKIWkChKKg+aDCoPf3Ok1OSXBDd2RKSbuUAtxjmdW2j6LUVZWnRYRnVdOxA==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^5.0.1",
-        "get-npm-tarball-url": "^2.0.1",
-        "lodash": "^4.17.20",
-        "needle": "^2.2.4",
-        "spdx-expression-validate": "^2.0.0",
-        "webpack-sources": "^3.2.1"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "webpack": ">=4.0.0 < 6.0.0"
-      }
-    },
-    "node_modules/webpack-license-plugin/node_modules/chalk": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz",
-      "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==",
-      "dev": true,
-      "engines": {
-        "node": "^12.17.0 || ^14.13 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/webpack-license-plugin/node_modules/webpack-sources": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/webpack-merge": {
-      "version": "5.8.0",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz",
-      "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==",
-      "dev": true,
-      "dependencies": {
-        "clone-deep": "^4.0.1",
-        "wildcard": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/webpack-remove-empty-scripts": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/webpack-remove-empty-scripts/-/webpack-remove-empty-scripts-0.7.3.tgz",
-      "integrity": "sha512-yipqb25A0qtH7X9vKt6yihwyYkTtSlRiDdBb2QsyrkqGM3hpfAcfOO1lYDef9HQUNm3s8ojmorbNg32XXX6FYg==",
-      "dev": true,
-      "dependencies": {
-        "ansis": "^1.3.4"
-      },
-      "engines": {
-        "node": ">=12.14"
-      },
-      "funding": {
-        "type": "patreon",
-        "url": "https://patreon.com/biodiscus"
-      },
-      "peerDependencies": {
-        "webpack": ">=5.32.0"
-      }
-    },
-    "node_modules/webpack-sources": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
-      "dev": true,
-      "dependencies": {
-        "source-list-map": "^2.0.0",
-        "source-map": "~0.6.1"
-      }
-    },
-    "node_modules/webpack-sources/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/acorn": {
-      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
-      "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/webpack/node_modules/acorn-import-assertions": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
-      "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
-      "dev": true,
-      "peerDependencies": {
-        "acorn": "^8"
-      }
-    },
-    "node_modules/webpack/node_modules/enhanced-resolve": {
-      "version": "5.9.3",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.3.tgz",
-      "integrity": "sha512-Bq9VSor+kjvW3f9/MiiR4eE3XYgOl7/rS8lnSxbRbF3kS0B2r+Y9w5krBWxZgDxASVZbdYrn5wT4j/Wb0J9qow==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.2.4",
-        "tapable": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/webpack/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/webpack/node_modules/webpack-sources": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/whatwg-encoding": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
-      "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
-      "dev": true,
-      "dependencies": {
-        "iconv-lite": "0.6.3"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/whatwg-encoding/node_modules/iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "dev": true,
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/whatwg-mimetype": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
-      "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/whatwg-url": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-10.0.0.tgz",
-      "integrity": "sha512-CLxxCmdUby142H5FZzn4D8ikO1cmypvXVQktsgosNy4a4BHrDHeciBBGZhb0bNoR5/MltoCatso+vFjjGx8t0w==",
-      "dev": true,
-      "dependencies": {
-        "tr46": "^3.0.0",
-        "webidl-conversions": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
-      }
-    },
-    "node_modules/which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-      "dev": true,
-      "dependencies": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/wildcard": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
-      "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==",
-      "dev": true
-    },
-    "node_modules/word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
-    },
-    "node_modules/write-file-atomic": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.1.tgz",
-      "integrity": "sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==",
-      "dev": true,
-      "dependencies": {
-        "imurmurhash": "^0.1.4",
-        "signal-exit": "^3.0.7"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16"
-      }
-    },
-    "node_modules/ws": {
-      "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
-      "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/xml-name-validator": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
-      "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/xmlchars": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
-      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
-      "dev": true
-    },
-    "node_modules/xtend": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4"
-      }
-    },
-    "node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/yaml": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/yargs-parser": {
-      "version": "20.2.9",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    }
-  },
   "dependencies": {
     "@ampproject/remapping": {
       "version": "2.1.2",
@@ -12965,8 +1453,7 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.1.1.tgz",
       "integrity": "sha512-1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "@webpack-cli/info": {
       "version": "1.4.1",
@@ -12981,8 +1468,7 @@
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.6.1.tgz",
       "integrity": "sha512-gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "@xtuc/ieee754": {
       "version": "1.2.0",
@@ -13022,8 +1508,7 @@
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "acorn-walk": {
       "version": "7.2.0",
@@ -13056,8 +1541,7 @@
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
       "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "ansi-regex": {
       "version": "5.0.1",
@@ -13356,8 +1840,7 @@
     "bootstrap": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz",
-      "integrity": "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==",
-      "requires": {}
+      "integrity": "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ=="
     },
     "bourbon": {
       "version": "4.3.4",
@@ -15697,8 +4180,7 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
       "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "ieee754": {
       "version": "1.2.1",
@@ -16047,12 +4529,6 @@
         }
       }
     },
-    "jquery": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.1.tgz",
-      "integrity": "sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw==",
-      "peer": true
-    },
     "jquery.growl": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/jquery.growl/-/jquery.growl-1.3.5.tgz",
@@ -17221,12 +5697,6 @@
         }
       }
     },
-    "popper.js": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
-      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
-      "peer": true
-    },
     "postcss": {
       "version": "8.4.19",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.19.tgz",
@@ -18012,8 +6482,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
       "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "postcss-modules-local-by-default": {
       "version": "4.0.0",
@@ -18186,8 +6655,7 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz",
       "integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "postcss-selector-matches": {
       "version": "3.0.1",
@@ -18273,8 +6741,7 @@
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-7.0.1.tgz",
       "integrity": "sha512-iLBFYz6VRYyLJEJsBJ8M3TCqNcckVzz4wFounSc5Oez35ogE/X+aoC5fFu103Ot7NyvjU3/xqIXn93Gp3kJk4g==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "postcss-value-parser": {
       "version": "3.3.1",
@@ -19198,23 +7665,6 @@
         "xtend": "^4.0.0"
       }
     },
-    "string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.2.0"
-      },
-      "dependencies": {
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-          "dev": true
-        }
-      }
-    },
     "string-width": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -19246,6 +7696,23 @@
         "define-properties": "^1.1.3"
       }
     },
+    "string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.2.0"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+          "dev": true
+        }
+      }
+    },
     "strip-ansi": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
@@ -19485,8 +7952,7 @@
           "version": "4.0.3",
           "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.3.tgz",
           "integrity": "sha512-j4KxzWovfdHsyxwl1BxkUal/O4uirvHgdzMKS1aWJBAV0qh2qj5qAZqpeBfVUYGWv+4iK9Az7SPyZ4fyNju1uA==",
-          "dev": true,
-          "requires": {}
+          "dev": true
         },
         "postcss-value-parser": {
           "version": "4.2.0",
@@ -19507,8 +7973,7 @@
           "version": "6.0.0",
           "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-6.0.0.tgz",
           "integrity": "sha512-ZorSSdyMcxWpROYUvLEMm0vSZud2uB7tX1hzBZwvVY9SV/uly4AvvJPPhCcymZL3fcQhEQG5AELmrxWqtmzacw==",
-          "dev": true,
-          "requires": {}
+          "dev": true
         },
         "stylelint-config-recommended-scss": {
           "version": "5.0.2",
@@ -20087,8 +8552,7 @@
           "version": "1.8.0",
           "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
           "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
-          "dev": true,
-          "requires": {}
+          "dev": true
         },
         "enhanced-resolve": {
           "version": "5.9.3",
@@ -20326,8 +8790,7 @@
       "version": "8.5.0",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
       "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "xml-name-validator": {
       "version": "4.0.0",
diff --git a/admin-dev/themes/new-theme/package-lock.json b/admin-dev/themes/new-theme/package-lock.json
index 67e8d2903b8c8..62585aa06f38d 100644
--- a/admin-dev/themes/new-theme/package-lock.json
+++ b/admin-dev/themes/new-theme/package-lock.json
@@ -1,14275 +1,8 @@
 {
   "name": "new-theme",
   "version": "1.0.0",
-  "lockfileVersion": 2,
+  "lockfileVersion": 1,
   "requires": true,
-  "packages": {
-    "": {
-      "name": "new-theme",
-      "version": "1.0.0",
-      "license": "OSL-3.0",
-      "dependencies": {
-        "bignumber.js": "^9.0.1",
-        "bootstrap-colorpicker": "^3.2.0",
-        "bootstrap-tokenfield": "^0.12.0",
-        "bourbon": "^4.2.6",
-        "dropzone": "^5.9.3",
-        "eonasdan-bootstrap-datetimepicker": "^4.17.47",
-        "events": "^3.0.0",
-        "fos-routing": "0.0.6",
-        "jets": "0.11.0",
-        "jquery-serializejson": "^3.2.0",
-        "jquery-ui-dist": "^1.12.1",
-        "jwerty": "^0.3.2",
-        "lodash": "^4.17.21",
-        "lodash.escaperegexp": "^4.1.2",
-        "magnific-popup": "^1.1.0",
-        "moment": "^2.24.0",
-        "perfect-scrollbar": "^1.5.0",
-        "photoswipe": "^4.1.3",
-        "postcss": "^8.4.4",
-        "prestakit": "^1.2.6",
-        "punycode": "^2.1.1",
-        "resize-observer-polyfill": "^1.5.1",
-        "sprintf-js": "^1.1.2",
-        "tablednd": "^1.0.3",
-        "terser-webpack-plugin": "^5.2.5",
-        "typeahead.js": "^0.11.1",
-        "url-polyfill": "^1.1.7",
-        "vazirmatn": "32.102.0",
-        "vue": "^3.2.33",
-        "vue-i18n": "^9.1.10",
-        "vue-resource": "^1.5.1",
-        "vue-router": "^4.0.15",
-        "vuex": "^4.0.2",
-        "zxcvbn": "^4.4.2"
-      },
-      "devDependencies": {
-        "@babel/core": "^7.15.7",
-        "@babel/eslint-parser": "^7.18.9",
-        "@types/bootstrap": "^4.5.0",
-        "@types/dropzone": "^5.7.4",
-        "@types/jquery": "^3.5.5",
-        "@types/jquery.growl": "^1.3.4",
-        "@types/lodash": "^4.14.170",
-        "@types/photoswipe": "^4.1.2",
-        "@types/sprintf-js": "^1.1.2",
-        "@types/typeahead.js": "^0.11.0",
-        "@types/zxcvbn": "^4.4.1",
-        "@typescript-eslint/eslint-plugin": "^5.33.1",
-        "@typescript-eslint/parser": "^5.33.1",
-        "@vue/compiler-sfc": "^3.2.33",
-        "@vue/eslint-config-typescript": "^11.0.0",
-        "@vue/runtime-dom": "^3.2.33",
-        "bootstrap": "~4.4.1",
-        "chai": "^4.2.0",
-        "clean-webpack-plugin": "^4.0.0",
-        "copy-webpack-plugin": "^11.0.0",
-        "core-js": "^3.18.0",
-        "css-loader": "^6.7.2",
-        "csso-webpack-plugin": "^2.0.0-beta.3",
-        "esbuild-loader": "^2.15.1",
-        "eslint": "^8.22.0",
-        "eslint-config-airbnb-base": "^15.0.0",
-        "eslint-import-resolver-webpack": "^0.12.1",
-        "eslint-plugin-html": "^6.0.0",
-        "eslint-plugin-import": "^2.20.0",
-        "eslint-plugin-vue": "^9.3.0",
-        "expose-loader": "^4.0.0",
-        "file-loader": "^5.0",
-        "fork-ts-checker-webpack-plugin": "^7.2.11",
-        "hot-accept-webpack-plugin": "^2.0.0-beta.7",
-        "html-webpack-plugin": "^5.5.0",
-        "imports-loader": "^4.0.1",
-        "mini-css-extract-plugin": "^2.6.1",
-        "mocha": "^6",
-        "path": "^0.12.7",
-        "postcss-loader": "^7.0.1",
-        "postcss-preset-env": "^7.8.2",
-        "sass-embedded": "^1.55.0",
-        "sass-loader": "^13.0.2",
-        "style-loader": "^3.3.1",
-        "stylelint": "^14.1.0",
-        "stylelint-config-prestashop": "^1.0.5",
-        "ts-loader": "^9.3.0",
-        "ts-node": "^10.7.0",
-        "tsconfig-paths": "^3.9.0",
-        "typescript": "^4.6.4",
-        "uglify-save-license": "^0.4.1",
-        "vue-eslint-parser": "^9.0.3",
-        "vue-loader": "^17.0.0",
-        "vue-style-loader": "^4.1.3",
-        "webpack": "^5.75.0",
-        "webpack-cli": "^5.0.1",
-        "webpack-dev-server": "^4.3.0",
-        "webpack-font-preload-plugin": "^1.5.0",
-        "webpack-license-plugin": "^4.2.1",
-        "webpack-remove-empty-scripts": "^0.7.1"
-      }
-    },
-    "node_modules/@ampproject/remapping": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
-      "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/gen-mapping": "^0.1.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/code-frame": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
-      "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/compat-data": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.5.tgz",
-      "integrity": "sha512-KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/core": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.7.tgz",
-      "integrity": "sha512-t1ZjCluspe5DW24bn2Rr1CDb2v9rn/hROtg9a2tmd0+QYf4bsloYfLQzjG4qHPNMhWtKdGC33R5AxGR2Af2cBw==",
-      "dev": true,
-      "dependencies": {
-        "@ampproject/remapping": "^2.1.0",
-        "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.20.7",
-        "@babel/helper-compilation-targets": "^7.20.7",
-        "@babel/helper-module-transforms": "^7.20.7",
-        "@babel/helpers": "^7.20.7",
-        "@babel/parser": "^7.20.7",
-        "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.20.7",
-        "@babel/types": "^7.20.7",
-        "convert-source-map": "^1.7.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.1",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/babel"
-      }
-    },
-    "node_modules/@babel/eslint-parser": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.19.1.tgz",
-      "integrity": "sha512-AqNf2QWt1rtu2/1rLswy6CDP7H9Oh3mMhk177Y67Rg8d7RD9WfOLLv8CGn6tisFvS2htm86yIe1yLF6I1UDaGQ==",
-      "dev": true,
-      "dependencies": {
-        "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
-        "eslint-visitor-keys": "^2.1.0",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || >=14.0.0"
-      },
-      "peerDependencies": {
-        "@babel/core": ">=7.11.0",
-        "eslint": "^7.5.0 || ^8.0.0"
-      }
-    },
-    "node_modules/@babel/generator": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.7.tgz",
-      "integrity": "sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.20.7",
-        "@jridgewell/gen-mapping": "^0.3.2",
-        "jsesc": "^2.5.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
-      "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/set-array": "^1.0.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz",
-      "integrity": "sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.20.5",
-        "@babel/helper-validator-option": "^7.18.6",
-        "browserslist": "^4.21.3",
-        "lru-cache": "^5.1.1",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
-      "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-function-name": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
-      "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.18.10",
-        "@babel/types": "^7.19.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
-      "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-module-imports": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
-      "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.7.tgz",
-      "integrity": "sha512-FNdu7r67fqMUSVuQpFQGE6BPdhJIhitoxhGzDbAXNcA07uoVG37fOiMk3OSV8rEICuyG6t8LGkd9EE64qIEoIA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-simple-access": "^7.20.2",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/helper-validator-identifier": "^7.19.1",
-        "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.20.7",
-        "@babel/types": "^7.20.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-simple-access": {
-      "version": "7.20.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz",
-      "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.20.2"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
-      "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-string-parser": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz",
-      "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
-      "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-option": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz",
-      "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helpers": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.7.tgz",
-      "integrity": "sha512-PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.20.7",
-        "@babel/types": "^7.20.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
-      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.18.6",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/parser": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.7.tgz",
-      "integrity": "sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==",
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/template": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz",
-      "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.18.6",
-        "@babel/parser": "^7.20.7",
-        "@babel/types": "^7.20.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/traverse": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.7.tgz",
-      "integrity": "sha512-xueOL5+ZKX2dJbg8z8o4f4uTRTqGDRjilva9D1hiRlayJbTY8jBRL+Ph67IeRTIE439/VifHk+Z4g0SwRtQE0A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.20.7",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.19.0",
-        "@babel/helper-hoist-variables": "^7.18.6",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/parser": "^7.20.7",
-        "@babel/types": "^7.20.7",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/types": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.7.tgz",
-      "integrity": "sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-string-parser": "^7.19.4",
-        "@babel/helper-validator-identifier": "^7.19.1",
-        "to-fast-properties": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@cspotcode/source-map-support": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
-      "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/trace-mapping": "0.3.9"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.9",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
-      "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/resolve-uri": "^3.0.3",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
-      }
-    },
-    "node_modules/@csstools/postcss-cascade-layers": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-1.1.1.tgz",
-      "integrity": "sha512-+KdYrpKC5TgomQr2DlZF4lDEpHcoxnj5IGddYYfBWJAKfj1JtuHUIqMa+E1pJJ+z3kvDViWMqyqPlG4Ja7amQA==",
-      "dev": true,
-      "dependencies": {
-        "@csstools/selector-specificity": "^2.0.2",
-        "postcss-selector-parser": "^6.0.10"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/@csstools/postcss-color-function": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-color-function/-/postcss-color-function-1.1.1.tgz",
-      "integrity": "sha512-Bc0f62WmHdtRDjf5f3e2STwRAl89N2CLb+9iAwzrv4L2hncrbDwnQD9PCq0gtAt7pOI2leIV08HIBUd4jxD8cw==",
-      "dev": true,
-      "dependencies": {
-        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/@csstools/postcss-font-format-keywords": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-1.0.1.tgz",
-      "integrity": "sha512-ZgrlzuUAjXIOc2JueK0X5sZDjCtgimVp/O5CEqTcs5ShWBa6smhWYbS0x5cVc/+rycTDbjjzoP0KTDnUneZGOg==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/@csstools/postcss-hwb-function": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-hwb-function/-/postcss-hwb-function-1.0.2.tgz",
-      "integrity": "sha512-YHdEru4o3Rsbjmu6vHy4UKOXZD+Rn2zmkAmLRfPet6+Jz4Ojw8cbWxe1n42VaXQhD3CQUXXTooIy8OkVbUcL+w==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/@csstools/postcss-ic-unit": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-ic-unit/-/postcss-ic-unit-1.0.1.tgz",
-      "integrity": "sha512-Ot1rcwRAaRHNKC9tAqoqNZhjdYBzKk1POgWfhN4uCOE47ebGcLRqXjKkApVDpjifL6u2/55ekkpnFcp+s/OZUw==",
-      "dev": true,
-      "dependencies": {
-        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/@csstools/postcss-is-pseudo-class": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.7.tgz",
-      "integrity": "sha512-7JPeVVZHd+jxYdULl87lvjgvWldYu+Bc62s9vD/ED6/QTGjy0jy0US/f6BG53sVMTBJ1lzKZFpYmofBN9eaRiA==",
-      "dev": true,
-      "dependencies": {
-        "@csstools/selector-specificity": "^2.0.0",
-        "postcss-selector-parser": "^6.0.10"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/@csstools/postcss-nested-calc": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-nested-calc/-/postcss-nested-calc-1.0.0.tgz",
-      "integrity": "sha512-JCsQsw1wjYwv1bJmgjKSoZNvf7R6+wuHDAbi5f/7MbFhl2d/+v+TvBTU4BJH3G1X1H87dHl0mh6TfYogbT/dJQ==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/@csstools/postcss-normalize-display-values": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-1.0.1.tgz",
-      "integrity": "sha512-jcOanIbv55OFKQ3sYeFD/T0Ti7AMXc9nM1hZWu8m/2722gOTxFg7xYu4RDLJLeZmPUVQlGzo4jhzvTUq3x4ZUw==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/@csstools/postcss-oklab-function": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.1.1.tgz",
-      "integrity": "sha512-nJpJgsdA3dA9y5pgyb/UfEzE7W5Ka7u0CX0/HIMVBNWzWemdcTH3XwANECU6anWv/ao4vVNLTMxhiPNZsTK6iA==",
-      "dev": true,
-      "dependencies": {
-        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/@csstools/postcss-progressive-custom-properties": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-1.3.0.tgz",
-      "integrity": "sha512-ASA9W1aIy5ygskZYuWams4BzafD12ULvSypmaLJT2jvQ8G0M3I8PRQhC0h7mG0Z3LI05+agZjqSR9+K9yaQQjA==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.3"
-      }
-    },
-    "node_modules/@csstools/postcss-stepped-value-functions": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-1.0.1.tgz",
-      "integrity": "sha512-dz0LNoo3ijpTOQqEJLY8nyaapl6umbmDcgj4AD0lgVQ572b2eqA1iGZYTTWhrcrHztWDDRAX2DGYyw2VBjvCvQ==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/@csstools/postcss-text-decoration-shorthand": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-1.0.0.tgz",
-      "integrity": "sha512-c1XwKJ2eMIWrzQenN0XbcfzckOLLJiczqy+YvfGmzoVXd7pT9FfObiSEfzs84bpE/VqfpEuAZ9tCRbZkZxxbdw==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/@csstools/postcss-trigonometric-functions": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-1.0.2.tgz",
-      "integrity": "sha512-woKaLO///4bb+zZC2s80l+7cm07M7268MsyG3M0ActXXEFi6SuhvriQYcb58iiKGbjwwIU7n45iRLEHypB47Og==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/@csstools/postcss-unset-value": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.2.tgz",
-      "integrity": "sha512-c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g==",
-      "dev": true,
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/@csstools/selector-specificity": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz",
-      "integrity": "sha512-IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg==",
-      "dev": true,
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2",
-        "postcss-selector-parser": "^6.0.10"
-      }
-    },
-    "node_modules/@discoveryjs/json-ext": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
-      "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/@esbuild/android-arm": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.15.18.tgz",
-      "integrity": "sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.18.tgz",
-      "integrity": "sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@eslint/eslintrc": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.0.tgz",
-      "integrity": "sha512-7yfvXy6MWLgWSFsLhz5yH3iQ52St8cdUY6FoGieKkRDVxuxmrNuUetIuu6cmjNWwniUHiWXjxCr5tTXDrbYS5A==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^9.4.0",
-        "globals": "^13.19.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
-        "strip-json-comments": "^3.1.1"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.19.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz",
-      "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@eslint/eslintrc/node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.8",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
-      "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==",
-      "dev": true,
-      "dependencies": {
-        "@humanwhocodes/object-schema": "^1.2.1",
-        "debug": "^4.1.1",
-        "minimatch": "^3.0.5"
-      },
-      "engines": {
-        "node": ">=10.10.0"
-      }
-    },
-    "node_modules/@humanwhocodes/module-importer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
-      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.22"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/nzakas"
-      }
-    },
-    "node_modules/@humanwhocodes/object-schema": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
-      "dev": true
-    },
-    "node_modules/@intlify/core-base": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.2.2.tgz",
-      "integrity": "sha512-JjUpQtNfn+joMbrXvpR4hTF8iJQ2sEFzzK3KIESOx+f+uwIjgw20igOyaIdhfsVVBCds8ZM64MoeNSx+PHQMkA==",
-      "dependencies": {
-        "@intlify/devtools-if": "9.2.2",
-        "@intlify/message-compiler": "9.2.2",
-        "@intlify/shared": "9.2.2",
-        "@intlify/vue-devtools": "9.2.2"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/@intlify/devtools-if": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/@intlify/devtools-if/-/devtools-if-9.2.2.tgz",
-      "integrity": "sha512-4ttr/FNO29w+kBbU7HZ/U0Lzuh2cRDhP8UlWOtV9ERcjHzuyXVZmjyleESK6eVP60tGC9QtQW9yZE+JeRhDHkg==",
-      "dependencies": {
-        "@intlify/shared": "9.2.2"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/@intlify/message-compiler": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.2.2.tgz",
-      "integrity": "sha512-IUrQW7byAKN2fMBe8z6sK6riG1pue95e5jfokn8hA5Q3Bqy4MBJ5lJAofUsawQJYHeoPJ7svMDyBaVJ4d0GTtA==",
-      "dependencies": {
-        "@intlify/shared": "9.2.2",
-        "source-map": "0.6.1"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/@intlify/shared": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.2.2.tgz",
-      "integrity": "sha512-wRwTpsslgZS5HNyM7uDQYZtxnbI12aGiBZURX3BTR9RFIKKRWpllTsgzHWvj3HKm3Y2Sh5LPC1r0PDCKEhVn9Q==",
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/@intlify/vue-devtools": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/@intlify/vue-devtools/-/vue-devtools-9.2.2.tgz",
-      "integrity": "sha512-+dUyqyCHWHb/UcvY1MlIpO87munedm3Gn6E9WWYdWrMuYLcoIoOEVDWSS8xSwtlPU+kA+MEQTP6Q1iI/ocusJg==",
-      "dependencies": {
-        "@intlify/core-base": "9.2.2",
-        "@intlify/shared": "9.2.2"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
-      "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/set-array": "^1.0.0",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
-      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/set-array": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/source-map": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz",
-      "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==",
-      "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      }
-    },
-    "node_modules/@jridgewell/source-map/node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
-      "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
-      "dependencies": {
-        "@jridgewell/set-array": "^1.0.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.14",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
-    },
-    "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.17",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz",
-      "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==",
-      "dependencies": {
-        "@jridgewell/resolve-uri": "3.1.0",
-        "@jridgewell/sourcemap-codec": "1.4.14"
-      }
-    },
-    "node_modules/@leichtgewicht/ip-codec": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz",
-      "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==",
-      "dev": true
-    },
-    "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": {
-      "version": "5.1.1-v1",
-      "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
-      "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==",
-      "dev": true,
-      "dependencies": {
-        "eslint-scope": "5.1.1"
-      }
-    },
-    "node_modules/@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@nodelib/fs.walk": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@sindresorhus/is": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",
-      "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/is?sponsor=1"
-      }
-    },
-    "node_modules/@szmarczak/http-timer": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
-      "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",
-      "dependencies": {
-        "defer-to-connect": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@tootallnate/once": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
-      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@tsconfig/node10": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz",
-      "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==",
-      "dev": true
-    },
-    "node_modules/@tsconfig/node12": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
-      "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
-      "dev": true
-    },
-    "node_modules/@tsconfig/node14": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
-      "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
-      "dev": true
-    },
-    "node_modules/@tsconfig/node16": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.3.tgz",
-      "integrity": "sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==",
-      "dev": true
-    },
-    "node_modules/@ttskch/select2-bootstrap4-theme": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/@ttskch/select2-bootstrap4-theme/-/select2-bootstrap4-theme-1.5.2.tgz",
-      "integrity": "sha512-gAj8qNy/VYwQDBkACm0USM66kxFai8flX83ayRXPNhzZckEgSqIBB9sM74SCM3ssgeX+ZVy4BifTnLis+KpIyg=="
-    },
-    "node_modules/@types/body-parser": {
-      "version": "1.19.2",
-      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz",
-      "integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==",
-      "dev": true,
-      "dependencies": {
-        "@types/connect": "*",
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/bonjour": {
-      "version": "3.5.10",
-      "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz",
-      "integrity": "sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/bootstrap": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/@types/bootstrap/-/bootstrap-4.6.2.tgz",
-      "integrity": "sha512-HbqVAre9VMZF8KBw1UpmBkw0xt4rjrAxMO/JWqFfJZGbVi09t8BVccvB/VxDlygVvvu0BZkAU8ocfNc7/jlFsA==",
-      "dev": true,
-      "dependencies": {
-        "@types/jquery": "*",
-        "popper.js": "^1.14.1"
-      }
-    },
-    "node_modules/@types/cacheable-request": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz",
-      "integrity": "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==",
-      "dependencies": {
-        "@types/http-cache-semantics": "*",
-        "@types/keyv": "^3.1.4",
-        "@types/node": "*",
-        "@types/responselike": "^1.0.0"
-      }
-    },
-    "node_modules/@types/connect": {
-      "version": "3.4.35",
-      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz",
-      "integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/connect-history-api-fallback": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz",
-      "integrity": "sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==",
-      "dev": true,
-      "dependencies": {
-        "@types/express-serve-static-core": "*",
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/dropzone": {
-      "version": "5.7.4",
-      "resolved": "https://registry.npmjs.org/@types/dropzone/-/dropzone-5.7.4.tgz",
-      "integrity": "sha512-9kLJ2YAmVRWYrHvDoa95pQzHF0HUMKcznsS7FM1Mht5Yieec+HMB6Ybfm+ocvLjvFCvgyYGFTp4nzNFxhZmo3g==",
-      "dev": true,
-      "dependencies": {
-        "@types/jquery": "*"
-      }
-    },
-    "node_modules/@types/eslint": {
-      "version": "8.4.10",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.10.tgz",
-      "integrity": "sha512-Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw==",
-      "dependencies": {
-        "@types/estree": "*",
-        "@types/json-schema": "*"
-      }
-    },
-    "node_modules/@types/eslint-scope": {
-      "version": "3.7.4",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
-      "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
-      "dependencies": {
-        "@types/eslint": "*",
-        "@types/estree": "*"
-      }
-    },
-    "node_modules/@types/estree": {
-      "version": "0.0.51",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
-      "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ=="
-    },
-    "node_modules/@types/express": {
-      "version": "4.17.15",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.15.tgz",
-      "integrity": "sha512-Yv0k4bXGOH+8a+7bELd2PqHQsuiANB+A8a4gnQrkRWzrkKlb6KHaVvyXhqs04sVW/OWlbPyYxRgYlIXLfrufMQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/body-parser": "*",
-        "@types/express-serve-static-core": "^4.17.31",
-        "@types/qs": "*",
-        "@types/serve-static": "*"
-      }
-    },
-    "node_modules/@types/express-serve-static-core": {
-      "version": "4.17.31",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz",
-      "integrity": "sha512-DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "@types/qs": "*",
-        "@types/range-parser": "*"
-      }
-    },
-    "node_modules/@types/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
-      "dev": true,
-      "dependencies": {
-        "@types/minimatch": "*",
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/html-minifier-terser": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
-      "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==",
-      "dev": true
-    },
-    "node_modules/@types/http-cache-semantics": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
-      "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ=="
-    },
-    "node_modules/@types/http-proxy": {
-      "version": "1.17.9",
-      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.9.tgz",
-      "integrity": "sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/jquery": {
-      "version": "3.5.14",
-      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.14.tgz",
-      "integrity": "sha512-X1gtMRMbziVQkErhTQmSe2jFwwENA/Zr+PprCkF63vFq+Yt5PZ4AlKqgmeNlwgn7dhsXEK888eIW2520EpC+xg==",
-      "dev": true,
-      "dependencies": {
-        "@types/sizzle": "*"
-      }
-    },
-    "node_modules/@types/jquery.growl": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/@types/jquery.growl/-/jquery.growl-1.3.5.tgz",
-      "integrity": "sha512-gOC04gG44DiRjudmPycoZXZ+BCJ/+YT7YptUjjpZuhkvVdRPz9vlyVACmP3e58U2u1bvKAMIxznYTbknLV6Lfg==",
-      "dev": true,
-      "dependencies": {
-        "@types/jquery": "*"
-      }
-    },
-    "node_modules/@types/json-schema": {
-      "version": "7.0.11",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
-      "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ=="
-    },
-    "node_modules/@types/json5": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
-      "dev": true
-    },
-    "node_modules/@types/keyv": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz",
-      "integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==",
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/lodash": {
-      "version": "4.14.191",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.191.tgz",
-      "integrity": "sha512-BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ==",
-      "dev": true
-    },
-    "node_modules/@types/mime": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz",
-      "integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==",
-      "dev": true
-    },
-    "node_modules/@types/minimatch": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",
-      "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==",
-      "dev": true
-    },
-    "node_modules/@types/minimist": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz",
-      "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==",
-      "dev": true
-    },
-    "node_modules/@types/node": {
-      "version": "18.11.17",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.17.tgz",
-      "integrity": "sha512-HJSUJmni4BeDHhfzn6nF0sVmd1SMezP7/4F0Lq+aXzmp2xm9O7WXrUtHW/CHlYVtZUbByEvWidHqRtcJXGF2Ng=="
-    },
-    "node_modules/@types/normalize-package-data": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
-      "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
-      "dev": true
-    },
-    "node_modules/@types/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
-      "dev": true
-    },
-    "node_modules/@types/photoswipe": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/@types/photoswipe/-/photoswipe-4.1.2.tgz",
-      "integrity": "sha512-HA9TtCAQKToldgxRiyJ1DbsElg/cQV/SQ8COVjqIqghjy60Zxfh78E1WiFotthquqkS86nz13Za9wEbToe0svQ==",
-      "dev": true
-    },
-    "node_modules/@types/qs": {
-      "version": "6.9.7",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
-      "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==",
-      "dev": true
-    },
-    "node_modules/@types/range-parser": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz",
-      "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==",
-      "dev": true
-    },
-    "node_modules/@types/responselike": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
-      "integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==",
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/retry": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
-      "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==",
-      "dev": true
-    },
-    "node_modules/@types/semver": {
-      "version": "7.3.13",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz",
-      "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==",
-      "dev": true
-    },
-    "node_modules/@types/serve-index": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==",
-      "dev": true,
-      "dependencies": {
-        "@types/express": "*"
-      }
-    },
-    "node_modules/@types/serve-static": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.0.tgz",
-      "integrity": "sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==",
-      "dev": true,
-      "dependencies": {
-        "@types/mime": "*",
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/sizzle": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz",
-      "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==",
-      "dev": true
-    },
-    "node_modules/@types/sockjs": {
-      "version": "0.3.33",
-      "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz",
-      "integrity": "sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/sprintf-js": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@types/sprintf-js/-/sprintf-js-1.1.2.tgz",
-      "integrity": "sha512-hkgzYF+qnIl8uTO8rmUSVSfQ8BIfMXC4yJAF4n8BE758YsKBZvFC4NumnAegj7KmylP0liEZNpb9RRGFMbFejA==",
-      "dev": true
-    },
-    "node_modules/@types/typeahead.js": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/@types/typeahead.js/-/typeahead.js-0.11.1.tgz",
-      "integrity": "sha512-brFWKbilAIFqX0eY47xERqeQKTkWTzuOYV5QfJtuOWWcKFBkM/LQrYH1jUUHUEkf9IpYdefsQB2WclH8dhgLDw==",
-      "dev": true,
-      "dependencies": {
-        "@types/jquery": "*"
-      }
-    },
-    "node_modules/@types/webpack": {
-      "version": "5.28.0",
-      "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-5.28.0.tgz",
-      "integrity": "sha512-8cP0CzcxUiFuA9xGJkfeVpqmWTk9nx6CWwamRGCj95ph1SmlRRk9KlCZ6avhCbZd4L68LvYT6l1kpdEnQXrF8w==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "tapable": "^2.2.0",
-        "webpack": "^5"
-      }
-    },
-    "node_modules/@types/ws": {
-      "version": "8.5.3",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz",
-      "integrity": "sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/zxcvbn": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/@types/zxcvbn/-/zxcvbn-4.4.1.tgz",
-      "integrity": "sha512-3NoqvZC2W5gAC5DZbTpCeJ251vGQmgcWIHQJGq2J240HY6ErQ9aWKkwfoKJlHLx+A83WPNTZ9+3cd2ILxbvr1w==",
-      "dev": true
-    },
-    "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "5.47.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.47.0.tgz",
-      "integrity": "sha512-AHZtlXAMGkDmyLuLZsRpH3p4G/1iARIwc/T0vIem2YB+xW6pZaXYXzCBnZSF/5fdM97R9QqZWZ+h3iW10XgevQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/scope-manager": "5.47.0",
-        "@typescript-eslint/type-utils": "5.47.0",
-        "@typescript-eslint/utils": "5.47.0",
-        "debug": "^4.3.4",
-        "ignore": "^5.2.0",
-        "natural-compare-lite": "^1.4.0",
-        "regexpp": "^3.2.0",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "@typescript-eslint/parser": "^5.0.0",
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/@typescript-eslint/parser": {
-      "version": "5.47.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.47.0.tgz",
-      "integrity": "sha512-udPU4ckK+R1JWCGdQC4Qa27NtBg7w020ffHqGyAK8pAgOVuNw7YaKXGChk+udh+iiGIJf6/E/0xhVXyPAbsczw==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/scope-manager": "5.47.0",
-        "@typescript-eslint/types": "5.47.0",
-        "@typescript-eslint/typescript-estree": "5.47.0",
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/scope-manager": {
-      "version": "5.47.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.47.0.tgz",
-      "integrity": "sha512-dvJab4bFf7JVvjPuh3sfBUWsiD73aiftKBpWSfi3sUkysDQ4W8x+ZcFpNp7Kgv0weldhpmMOZBjx1wKN8uWvAw==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "5.47.0",
-        "@typescript-eslint/visitor-keys": "5.47.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils": {
-      "version": "5.47.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.47.0.tgz",
-      "integrity": "sha512-1J+DFFrYoDUXQE1b7QjrNGARZE6uVhBqIvdaXTe5IN+NmEyD68qXR1qX1g2u4voA+nCaelQyG8w30SAOihhEYg==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/typescript-estree": "5.47.0",
-        "@typescript-eslint/utils": "5.47.0",
-        "debug": "^4.3.4",
-        "tsutils": "^3.21.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "*"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/types": {
-      "version": "5.47.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.47.0.tgz",
-      "integrity": "sha512-eslFG0Qy8wpGzDdYKu58CEr3WLkjwC5Usa6XbuV89ce/yN5RITLe1O8e+WFEuxnfftHiJImkkOBADj58ahRxSg==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "5.47.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.47.0.tgz",
-      "integrity": "sha512-LxfKCG4bsRGq60Sqqu+34QT5qT2TEAHvSCCJ321uBWywgE2dS0LKcu5u+3sMGo+Vy9UmLOhdTw5JHzePV/1y4Q==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "5.47.0",
-        "@typescript-eslint/visitor-keys": "5.47.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/@typescript-eslint/utils": {
-      "version": "5.47.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.47.0.tgz",
-      "integrity": "sha512-U9xcc0N7xINrCdGVPwABjbAKqx4GK67xuMV87toI+HUqgXj26m6RBp9UshEXcTrgCkdGYFzgKLt8kxu49RilDw==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "@types/semver": "^7.3.12",
-        "@typescript-eslint/scope-manager": "5.47.0",
-        "@typescript-eslint/types": "5.47.0",
-        "@typescript-eslint/typescript-estree": "5.47.0",
-        "eslint-scope": "^5.1.1",
-        "eslint-utils": "^3.0.0",
-        "semver": "^7.3.7"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/utils/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@typescript-eslint/utils/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@typescript-eslint/utils/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.47.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.47.0.tgz",
-      "integrity": "sha512-ByPi5iMa6QqDXe/GmT/hR6MZtVPi0SqMQPDx15FczCBXJo/7M8T88xReOALAfpBLm+zxpPfmhuEvPb577JRAEg==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "5.47.0",
-        "eslint-visitor-keys": "^3.3.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/@vue/compiler-core": {
-      "version": "3.2.45",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.45.tgz",
-      "integrity": "sha512-rcMj7H+PYe5wBV3iYeUgbCglC+pbpN8hBLTJvRiK2eKQiWqu+fG9F+8sW99JdL4LQi7Re178UOxn09puSXvn4A==",
-      "dependencies": {
-        "@babel/parser": "^7.16.4",
-        "@vue/shared": "3.2.45",
-        "estree-walker": "^2.0.2",
-        "source-map": "^0.6.1"
-      }
-    },
-    "node_modules/@vue/compiler-dom": {
-      "version": "3.2.45",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.45.tgz",
-      "integrity": "sha512-tyYeUEuKqqZO137WrZkpwfPCdiiIeXYCcJ8L4gWz9vqaxzIQRccTSwSWZ/Axx5YR2z+LvpUbmPNXxuBU45lyRw==",
-      "dependencies": {
-        "@vue/compiler-core": "3.2.45",
-        "@vue/shared": "3.2.45"
-      }
-    },
-    "node_modules/@vue/compiler-sfc": {
-      "version": "3.2.45",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.45.tgz",
-      "integrity": "sha512-1jXDuWah1ggsnSAOGsec8cFjT/K6TMZ0sPL3o3d84Ft2AYZi2jWJgRMjw4iaK0rBfA89L5gw427H4n1RZQBu6Q==",
-      "dependencies": {
-        "@babel/parser": "^7.16.4",
-        "@vue/compiler-core": "3.2.45",
-        "@vue/compiler-dom": "3.2.45",
-        "@vue/compiler-ssr": "3.2.45",
-        "@vue/reactivity-transform": "3.2.45",
-        "@vue/shared": "3.2.45",
-        "estree-walker": "^2.0.2",
-        "magic-string": "^0.25.7",
-        "postcss": "^8.1.10",
-        "source-map": "^0.6.1"
-      }
-    },
-    "node_modules/@vue/compiler-ssr": {
-      "version": "3.2.45",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.45.tgz",
-      "integrity": "sha512-6BRaggEGqhWht3lt24CrIbQSRD5O07MTmd+LjAn5fJj568+R9eUD2F7wMQJjX859seSlrYog7sUtrZSd7feqrQ==",
-      "dependencies": {
-        "@vue/compiler-dom": "3.2.45",
-        "@vue/shared": "3.2.45"
-      }
-    },
-    "node_modules/@vue/devtools-api": {
-      "version": "6.4.5",
-      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.4.5.tgz",
-      "integrity": "sha512-JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ=="
-    },
-    "node_modules/@vue/eslint-config-typescript": {
-      "version": "11.0.2",
-      "resolved": "https://registry.npmjs.org/@vue/eslint-config-typescript/-/eslint-config-typescript-11.0.2.tgz",
-      "integrity": "sha512-EiKud1NqlWmSapBFkeSrE994qpKx7/27uCGnhdqzllYDpQZroyX/O6bwjEpeuyKamvLbsGdO6PMR2faIf+zFnw==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/eslint-plugin": "^5.0.0",
-        "@typescript-eslint/parser": "^5.0.0",
-        "vue-eslint-parser": "^9.0.0"
-      },
-      "engines": {
-        "node": "^14.17.0 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "eslint": "^6.2.0 || ^7.0.0 || ^8.0.0",
-        "eslint-plugin-vue": "^9.0.0",
-        "typescript": "*"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@vue/reactivity": {
-      "version": "3.2.45",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.45.tgz",
-      "integrity": "sha512-PRvhCcQcyEVohW0P8iQ7HDcIOXRjZfAsOds3N99X/Dzewy8TVhTCT4uXpAHfoKjVTJRA0O0K+6QNkDIZAxNi3A==",
-      "dependencies": {
-        "@vue/shared": "3.2.45"
-      }
-    },
-    "node_modules/@vue/reactivity-transform": {
-      "version": "3.2.45",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.45.tgz",
-      "integrity": "sha512-BHVmzYAvM7vcU5WmuYqXpwaBHjsS8T63jlKGWVtHxAHIoMIlmaMyurUSEs1Zcg46M4AYT5MtB1U274/2aNzjJQ==",
-      "dependencies": {
-        "@babel/parser": "^7.16.4",
-        "@vue/compiler-core": "3.2.45",
-        "@vue/shared": "3.2.45",
-        "estree-walker": "^2.0.2",
-        "magic-string": "^0.25.7"
-      }
-    },
-    "node_modules/@vue/runtime-core": {
-      "version": "3.2.45",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.45.tgz",
-      "integrity": "sha512-gzJiTA3f74cgARptqzYswmoQx0fIA+gGYBfokYVhF8YSXjWTUA2SngRzZRku2HbGbjzB6LBYSbKGIaK8IW+s0A==",
-      "dependencies": {
-        "@vue/reactivity": "3.2.45",
-        "@vue/shared": "3.2.45"
-      }
-    },
-    "node_modules/@vue/runtime-dom": {
-      "version": "3.2.45",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.45.tgz",
-      "integrity": "sha512-cy88YpfP5Ue2bDBbj75Cb4bIEZUMM/mAkDMfqDTpUYVgTf/kuQ2VQ8LebuZ8k6EudgH8pYhsGWHlY0lcxlvTwA==",
-      "dependencies": {
-        "@vue/runtime-core": "3.2.45",
-        "@vue/shared": "3.2.45",
-        "csstype": "^2.6.8"
-      }
-    },
-    "node_modules/@vue/server-renderer": {
-      "version": "3.2.45",
-      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.45.tgz",
-      "integrity": "sha512-ebiMq7q24WBU1D6uhPK//2OTR1iRIyxjF5iVq/1a5I1SDMDyDu4Ts6fJaMnjrvD3MqnaiFkKQj+LKAgz5WIK3g==",
-      "dependencies": {
-        "@vue/compiler-ssr": "3.2.45",
-        "@vue/shared": "3.2.45"
-      },
-      "peerDependencies": {
-        "vue": "3.2.45"
-      }
-    },
-    "node_modules/@vue/shared": {
-      "version": "3.2.45",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.45.tgz",
-      "integrity": "sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg=="
-    },
-    "node_modules/@webassemblyjs/ast": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
-      "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
-      "dependencies": {
-        "@webassemblyjs/helper-numbers": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1"
-      }
-    },
-    "node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
-      "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ=="
-    },
-    "node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
-      "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg=="
-    },
-    "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
-      "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA=="
-    },
-    "node_modules/@webassemblyjs/helper-numbers": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
-      "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==",
-      "dependencies": {
-        "@webassemblyjs/floating-point-hex-parser": "1.11.1",
-        "@webassemblyjs/helper-api-error": "1.11.1",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
-      "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q=="
-    },
-    "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
-      "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-buffer": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/wasm-gen": "1.11.1"
-      }
-    },
-    "node_modules/@webassemblyjs/ieee754": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
-      "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==",
-      "dependencies": {
-        "@xtuc/ieee754": "^1.2.0"
-      }
-    },
-    "node_modules/@webassemblyjs/leb128": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
-      "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==",
-      "dependencies": {
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@webassemblyjs/utf8": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
-      "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ=="
-    },
-    "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
-      "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-buffer": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/helper-wasm-section": "1.11.1",
-        "@webassemblyjs/wasm-gen": "1.11.1",
-        "@webassemblyjs/wasm-opt": "1.11.1",
-        "@webassemblyjs/wasm-parser": "1.11.1",
-        "@webassemblyjs/wast-printer": "1.11.1"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
-      "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/ieee754": "1.11.1",
-        "@webassemblyjs/leb128": "1.11.1",
-        "@webassemblyjs/utf8": "1.11.1"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
-      "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-buffer": "1.11.1",
-        "@webassemblyjs/wasm-gen": "1.11.1",
-        "@webassemblyjs/wasm-parser": "1.11.1"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
-      "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-api-error": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/ieee754": "1.11.1",
-        "@webassemblyjs/leb128": "1.11.1",
-        "@webassemblyjs/utf8": "1.11.1"
-      }
-    },
-    "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
-      "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@webpack-cli/configtest": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.0.1.tgz",
-      "integrity": "sha512-njsdJXJSiS2iNbQVS0eT8A/KPnmyH4pv1APj2K0d1wrZcBLw+yppxOy4CGqa0OxDJkzfL/XELDhD8rocnIwB5A==",
-      "dev": true,
-      "engines": {
-        "node": ">=14.15.0"
-      },
-      "peerDependencies": {
-        "webpack": "5.x.x",
-        "webpack-cli": "5.x.x"
-      }
-    },
-    "node_modules/@webpack-cli/info": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-2.0.1.tgz",
-      "integrity": "sha512-fE1UEWTwsAxRhrJNikE7v4EotYflkEhBL7EbajfkPlf6E37/2QshOy/D48Mw8G5XMFlQtS6YV42vtbG9zBpIQA==",
-      "dev": true,
-      "engines": {
-        "node": ">=14.15.0"
-      },
-      "peerDependencies": {
-        "webpack": "5.x.x",
-        "webpack-cli": "5.x.x"
-      }
-    },
-    "node_modules/@webpack-cli/serve": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-2.0.1.tgz",
-      "integrity": "sha512-0G7tNyS+yW8TdgHwZKlDWYXFA6OJQnoLCQvYKkQP0Q2X205PSQ6RNUj0M+1OB/9gRQaUZ/ccYfaxd0nhaWKfjw==",
-      "dev": true,
-      "engines": {
-        "node": ">=14.15.0"
-      },
-      "peerDependencies": {
-        "webpack": "5.x.x",
-        "webpack-cli": "5.x.x"
-      },
-      "peerDependenciesMeta": {
-        "webpack-dev-server": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@xtuc/ieee754": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="
-    },
-    "node_modules/@xtuc/long": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
-    },
-    "node_modules/abab": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
-      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
-      "dev": true
-    },
-    "node_modules/accepts": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
-      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
-      "dev": true,
-      "dependencies": {
-        "mime-types": "~2.1.34",
-        "negotiator": "0.6.3"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/acorn": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
-      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-globals": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
-      "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^7.1.1",
-        "acorn-walk": "^7.1.1"
-      }
-    },
-    "node_modules/acorn-globals/node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-globals/node_modules/acorn-walk": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
-      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-import-assertions": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
-      "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
-      "peerDependencies": {
-        "acorn": "^8"
-      }
-    },
-    "node_modules/acorn-jsx": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true,
-      "peerDependencies": {
-        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      }
-    },
-    "node_modules/acorn-walk": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-      "dev": true,
-      "dependencies": {
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6.0.0"
-      }
-    },
-    "node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/ajv-formats": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
-      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "ajv": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/ajv-formats/node_modules/ajv": {
-      "version": "8.11.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.2.tgz",
-      "integrity": "sha512-E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/ajv-formats/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true
-    },
-    "node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
-    "node_modules/ansi-colors": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz",
-      "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/ansi-html-community": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
-      "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
-      "dev": true,
-      "engines": [
-        "node >= 0.8.0"
-      ],
-      "bin": {
-        "ansi-html": "bin/ansi-html"
-      }
-    },
-    "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/ansis": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/ansis/-/ansis-1.5.5.tgz",
-      "integrity": "sha512-DNctovTacxs/NfZpGo6bIGWgLd2oZsDO7RJbiYX6Ttj40LPZM1XKv9WtesH13ieOEm1GajjD+Vik2n9YnSTPdA==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.13"
-      },
-      "funding": {
-        "type": "patreon",
-        "url": "https://patreon.com/biodiscus"
-      }
-    },
-    "node_modules/anymatch": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
-      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
-      "dev": true,
-      "dependencies": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/arg": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
-      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
-      "dev": true
-    },
-    "node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
-    },
-    "node_modules/array-differ": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz",
-      "integrity": "sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/array-find": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-find/-/array-find-1.0.0.tgz",
-      "integrity": "sha512-kO/vVCacW9mnpn3WPWbTVlEnOabK2L7LWi2HViURtCM46y1zb6I8UMjx4LgbiqadTgHnLInUronwn3ampNTJtQ==",
-      "dev": true
-    },
-    "node_modules/array-flatten": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
-      "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
-      "dev": true
-    },
-    "node_modules/array-includes": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
-      "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "get-intrinsic": "^1.1.3",
-        "is-string": "^1.0.7"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/array-uniq": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array.prototype.flat": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
-      "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "es-shim-unscopables": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.reduce": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz",
-      "integrity": "sha512-kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "es-array-method-boxes-properly": "^1.0.0",
-        "is-string": "^1.0.7"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/arrify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-      "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/asn1.js": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
-      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "safer-buffer": "^2.1.0"
-      }
-    },
-    "node_modules/asn1.js/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/assert": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
-      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
-      "dev": true,
-      "dependencies": {
-        "object-assign": "^4.1.1",
-        "util": "0.10.3"
-      }
-    },
-    "node_modules/assert/node_modules/inherits": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-      "integrity": "sha512-8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA==",
-      "dev": true
-    },
-    "node_modules/assert/node_modules/util": {
-      "version": "0.10.3",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-      "integrity": "sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "2.0.1"
-      }
-    },
-    "node_modules/assertion-error": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
-      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/astral-regex": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-      "dev": true
-    },
-    "node_modules/autoprefixer": {
-      "version": "10.4.13",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz",
-      "integrity": "sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/autoprefixer"
-        }
-      ],
-      "dependencies": {
-        "browserslist": "^4.21.4",
-        "caniuse-lite": "^1.0.30001426",
-        "fraction.js": "^4.2.0",
-        "normalize-range": "^0.1.2",
-        "picocolors": "^1.0.0",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "bin": {
-        "autoprefixer": "bin/autoprefixer"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
-    },
-    "node_modules/base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/batch": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-      "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
-      "dev": true
-    },
-    "node_modules/big.js": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/bignumber.js": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.1.tgz",
-      "integrity": "sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig==",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/binary-extensions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/bn.js": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
-      "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==",
-      "dev": true
-    },
-    "node_modules/body-parser": {
-      "version": "1.20.1",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
-      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
-      "dev": true,
-      "dependencies": {
-        "bytes": "3.1.2",
-        "content-type": "~1.0.4",
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "on-finished": "2.4.1",
-        "qs": "6.11.0",
-        "raw-body": "2.5.1",
-        "type-is": "~1.6.18",
-        "unpipe": "1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8",
-        "npm": "1.2.8000 || >= 1.4.16"
-      }
-    },
-    "node_modules/body-parser/node_modules/bytes": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/body-parser/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/body-parser/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/bonjour-service": {
-      "version": "1.0.14",
-      "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.0.14.tgz",
-      "integrity": "sha512-HIMbgLnk1Vqvs6B4Wq5ep7mxvj9sGz5d1JJyDNSGNIdA/w2MCz6GTjWTdjqOJV1bEPj+6IkxDvWNFKEBxNt4kQ==",
-      "dev": true,
-      "dependencies": {
-        "array-flatten": "^2.1.2",
-        "dns-equal": "^1.0.0",
-        "fast-deep-equal": "^3.1.3",
-        "multicast-dns": "^7.2.5"
-      }
-    },
-    "node_modules/boolbase": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
-      "dev": true
-    },
-    "node_modules/bootstrap": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.4.1.tgz",
-      "integrity": "sha512-tbx5cHubwE6e2ZG7nqM3g/FZ5PQEDMWmMGNrCUBVRPHXTJaH7CBDdsLeu3eCh3B1tzAxTnAbtmrzvWEvT2NNEA==",
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/bootstrap"
-      },
-      "peerDependencies": {
-        "jquery": "1.9.1 - 3",
-        "popper.js": "^1.16.0"
-      }
-    },
-    "node_modules/bootstrap-colorpicker": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/bootstrap-colorpicker/-/bootstrap-colorpicker-3.4.0.tgz",
-      "integrity": "sha512-7vA0hvLrat3ptobEKlT9+6amzBUJcDAoh6hJRQY/AD+5dVZYXXf1ivRfrTwmuwiVLJo9rZwM8YB4lYzp6agzqg==",
-      "dependencies": {
-        "bootstrap": ">=4.0",
-        "jquery": ">=2.2",
-        "popper.js": ">=1.10"
-      }
-    },
-    "node_modules/bootstrap-tokenfield": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/bootstrap-tokenfield/-/bootstrap-tokenfield-0.12.0.tgz",
-      "integrity": "sha512-OgLQEQ1V3s69wgvjpWvPESNTv1RUZKtwpRQd3o5AQYdan47iUAL7ajSMjXMlSxWywrLTntF1l84aE7N1DvUlVw==",
-      "dependencies": {
-        "jquery": "^2.1.0"
-      }
-    },
-    "node_modules/bootstrap-tokenfield/node_modules/jquery": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz",
-      "integrity": "sha512-lBHj60ezci2u1v2FqnZIraShGgEXq35qCzMv4lITyHGppTnA13rwR0MgwyNJh9TnDs3aXUvd1xjAotfraMHX/Q=="
-    },
-    "node_modules/bourbon": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/bourbon/-/bourbon-4.3.4.tgz",
-      "integrity": "sha512-XY2nuWcgS5ODGVFHgE/SsjFb18ke1dPtxu32vDm2tue8v4RflmU0mp0jpdIvvyjEtYEv6oiSpQL2PRUsEqde4w=="
-    },
-    "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dev": true,
-      "dependencies": {
-        "fill-range": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/brorand": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-      "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==",
-      "dev": true
-    },
-    "node_modules/browser-process-hrtime": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
-      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
-      "dev": true
-    },
-    "node_modules/browser-stdout": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
-      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
-      "dev": true
-    },
-    "node_modules/browserify-aes": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-      "dev": true,
-      "dependencies": {
-        "buffer-xor": "^1.0.3",
-        "cipher-base": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.3",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/browserify-cipher": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
-      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
-      "dev": true,
-      "dependencies": {
-        "browserify-aes": "^1.0.4",
-        "browserify-des": "^1.0.0",
-        "evp_bytestokey": "^1.0.0"
-      }
-    },
-    "node_modules/browserify-des": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
-      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
-      "dev": true,
-      "dependencies": {
-        "cipher-base": "^1.0.1",
-        "des.js": "^1.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "node_modules/browserify-rsa": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
-      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^5.0.0",
-        "randombytes": "^2.0.1"
-      }
-    },
-    "node_modules/browserify-sign": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
-      "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^5.1.1",
-        "browserify-rsa": "^4.0.1",
-        "create-hash": "^1.2.0",
-        "create-hmac": "^1.1.7",
-        "elliptic": "^6.5.3",
-        "inherits": "^2.0.4",
-        "parse-asn1": "^5.1.5",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
-      }
-    },
-    "node_modules/browserify-sign/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/browserify-zlib": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
-      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
-      "dev": true,
-      "dependencies": {
-        "pako": "~1.0.5"
-      }
-    },
-    "node_modules/browserslist": {
-      "version": "4.21.4",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
-      "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        }
-      ],
-      "dependencies": {
-        "caniuse-lite": "^1.0.30001400",
-        "electron-to-chromium": "^1.4.251",
-        "node-releases": "^2.0.6",
-        "update-browserslist-db": "^1.0.9"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      },
-      "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-      }
-    },
-    "node_modules/buffer": {
-      "version": "4.9.2",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
-      "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
-      "dev": true,
-      "dependencies": {
-        "base64-js": "^1.0.2",
-        "ieee754": "^1.1.4",
-        "isarray": "^1.0.0"
-      }
-    },
-    "node_modules/buffer-builder": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/buffer-builder/-/buffer-builder-0.2.0.tgz",
-      "integrity": "sha512-7VPMEPuYznPSoR21NE1zvd2Xna6c/CloiZCfcMXR1Jny6PjX0N4Nsa38zcBFo/FMK+BlA+FLKbJCQ0i2yxp+Xg==",
-      "dev": true
-    },
-    "node_modules/buffer-from": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
-    },
-    "node_modules/buffer-xor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-      "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==",
-      "dev": true
-    },
-    "node_modules/builtin-status-codes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
-      "integrity": "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==",
-      "dev": true
-    },
-    "node_modules/bytes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/cacheable-lookup": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
-      "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==",
-      "engines": {
-        "node": ">=10.6.0"
-      }
-    },
-    "node_modules/cacheable-request": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz",
-      "integrity": "sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==",
-      "dependencies": {
-        "clone-response": "^1.0.2",
-        "get-stream": "^5.1.0",
-        "http-cache-semantics": "^4.0.0",
-        "keyv": "^4.0.0",
-        "lowercase-keys": "^2.0.0",
-        "normalize-url": "^6.0.1",
-        "responselike": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/camel-case": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
-      "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
-      "dev": true,
-      "dependencies": {
-        "pascal-case": "^3.1.2",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/camelcase-keys": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
-      "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^5.3.1",
-        "map-obj": "^4.0.0",
-        "quick-lru": "^4.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/caniuse-lite": {
-      "version": "1.0.30001441",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001441.tgz",
-      "integrity": "sha512-OyxRR4Vof59I3yGWXws6i908EtGbMzVUi3ganaZQHmydk1iwDhRnvaPG2WaR0KcqrDFKrxVZHULT396LEPhXfg==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
-        }
-      ]
-    },
-    "node_modules/chai": {
-      "version": "4.3.7",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.7.tgz",
-      "integrity": "sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==",
-      "dev": true,
-      "dependencies": {
-        "assertion-error": "^1.1.0",
-        "check-error": "^1.0.2",
-        "deep-eql": "^4.1.2",
-        "get-func-name": "^2.0.0",
-        "loupe": "^2.3.1",
-        "pathval": "^1.1.1",
-        "type-detect": "^4.0.5"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/check-error": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
-      "integrity": "sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/chokidar": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
-      ],
-      "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/chokidar/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/chrome-trace-event": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
-      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
-    "node_modules/cipher-base": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/clean-css": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.1.tgz",
-      "integrity": "sha512-lCr8OHhiWCTw4v8POJovCoh4T7I9U11yVsPjMWWnnMmp9ZowCxyad1Pathle/9HjaDp+fdQKjO9fQydE6RHTZg==",
-      "dev": true,
-      "dependencies": {
-        "source-map": "~0.6.0"
-      },
-      "engines": {
-        "node": ">= 10.0"
-      }
-    },
-    "node_modules/clean-webpack-plugin": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-4.0.0.tgz",
-      "integrity": "sha512-WuWE1nyTNAyW5T7oNyys2EN0cfP2fdRxhxnIQWiAp0bMabPdHhoGxM8A6YL2GhqwgrPnnaemVE7nv5XJ2Fhh2w==",
-      "dev": true,
-      "dependencies": {
-        "del": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "webpack": ">=4.0.0 <6.0.0"
-      }
-    },
-    "node_modules/cliui": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^3.1.0",
-        "strip-ansi": "^5.2.0",
-        "wrap-ansi": "^5.1.0"
-      }
-    },
-    "node_modules/cliui/node_modules/ansi-regex": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/cliui/node_modules/emoji-regex": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-      "dev": true
-    },
-    "node_modules/cliui/node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/cliui/node_modules/string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/cliui/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/clone-deep": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
-      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
-      "dev": true,
-      "dependencies": {
-        "is-plain-object": "^2.0.4",
-        "kind-of": "^6.0.2",
-        "shallow-clone": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/clone-deep/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/clone-response": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
-      "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",
-      "dependencies": {
-        "mimic-response": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true
-    },
-    "node_modules/colord": {
-      "version": "2.9.3",
-      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
-      "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==",
-      "dev": true
-    },
-    "node_modules/colorette": {
-      "version": "2.0.19",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz",
-      "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==",
-      "dev": true
-    },
-    "node_modules/combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dev": true,
-      "dependencies": {
-        "delayed-stream": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/commander": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
-      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
-      "dev": true,
-      "engines": {
-        "node": ">= 12"
-      }
-    },
-    "node_modules/compressible": {
-      "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
-      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
-      "dev": true,
-      "dependencies": {
-        "mime-db": ">= 1.43.0 < 2"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/compression": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
-      "dev": true,
-      "dependencies": {
-        "accepts": "~1.3.5",
-        "bytes": "3.0.0",
-        "compressible": "~2.0.16",
-        "debug": "2.6.9",
-        "on-headers": "~1.0.2",
-        "safe-buffer": "5.1.2",
-        "vary": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/compression/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/compression/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/compression/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
-    },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true
-    },
-    "node_modules/confusing-browser-globals": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
-      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
-      "dev": true
-    },
-    "node_modules/connect-history-api-fallback": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
-      "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/console-browserify": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
-      "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
-      "dev": true
-    },
-    "node_modules/constants-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-      "integrity": "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==",
-      "dev": true
-    },
-    "node_modules/content-disposition": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
-      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "5.2.1"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/convert-source-map": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
-      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
-      "dev": true
-    },
-    "node_modules/cookie": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/cookie-signature": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
-      "dev": true
-    },
-    "node_modules/copy-webpack-plugin": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz",
-      "integrity": "sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==",
-      "dev": true,
-      "dependencies": {
-        "fast-glob": "^3.2.11",
-        "glob-parent": "^6.0.1",
-        "globby": "^13.1.1",
-        "normalize-path": "^3.0.0",
-        "schema-utils": "^4.0.0",
-        "serialize-javascript": "^6.0.0"
-      },
-      "engines": {
-        "node": ">= 14.15.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.1.0"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/globby": {
-      "version": "13.1.3",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-13.1.3.tgz",
-      "integrity": "sha512-8krCNHXvlCgHDpegPzleMq07yMYTO2sXKASmZmquEYWEmCx6J5UTRbp5RwMJkTJGtcQ44YpiUYUiN0b9mzy8Bw==",
-      "dev": true,
-      "dependencies": {
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.11",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^4.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/slash": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
-      "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/core-js": {
-      "version": "3.26.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.26.1.tgz",
-      "integrity": "sha512-21491RRQVzUn0GGM9Z1Jrpr6PNPxPi+Za8OM9q4tksTSnlbXXGKK1nXNg/QvwFYettXvSX6zWKCtHHfjN4puyA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
-    "node_modules/core-util-is": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
-      "dev": true
-    },
-    "node_modules/cosmiconfig": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
-      "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
-      "dev": true,
-      "dependencies": {
-        "@types/parse-json": "^4.0.0",
-        "import-fresh": "^3.2.1",
-        "parse-json": "^5.0.0",
-        "path-type": "^4.0.0",
-        "yaml": "^1.10.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/create-ecdh": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
-      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "elliptic": "^6.5.3"
-      }
-    },
-    "node_modules/create-ecdh/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/create-hash": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-      "dev": true,
-      "dependencies": {
-        "cipher-base": "^1.0.1",
-        "inherits": "^2.0.1",
-        "md5.js": "^1.3.4",
-        "ripemd160": "^2.0.1",
-        "sha.js": "^2.4.0"
-      }
-    },
-    "node_modules/create-hmac": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-      "dev": true,
-      "dependencies": {
-        "cipher-base": "^1.0.3",
-        "create-hash": "^1.1.0",
-        "inherits": "^2.0.1",
-        "ripemd160": "^2.0.0",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      }
-    },
-    "node_modules/create-require": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
-      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
-      "dev": true
-    },
-    "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dev": true,
-      "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/crypto-browserify": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
-      "dev": true,
-      "dependencies": {
-        "browserify-cipher": "^1.0.0",
-        "browserify-sign": "^4.0.0",
-        "create-ecdh": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.0",
-        "diffie-hellman": "^5.0.0",
-        "inherits": "^2.0.1",
-        "pbkdf2": "^3.0.3",
-        "public-encrypt": "^4.0.0",
-        "randombytes": "^2.0.0",
-        "randomfill": "^1.0.3"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/css-blank-pseudo": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-3.0.3.tgz",
-      "integrity": "sha512-VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ==",
-      "dev": true,
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.9"
-      },
-      "bin": {
-        "css-blank-pseudo": "dist/cli.cjs"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
-      }
-    },
-    "node_modules/css-functions-list": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.1.0.tgz",
-      "integrity": "sha512-/9lCvYZaUbBGvYUgYGFJ4dcYiyqdhSjG7IPVluoV8A1ILjkF7ilmhp1OGUz8n+nmBcu0RNrQAzgD8B6FJbrt2w==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.22"
-      }
-    },
-    "node_modules/css-has-pseudo": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-3.0.4.tgz",
-      "integrity": "sha512-Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw==",
-      "dev": true,
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.9"
-      },
-      "bin": {
-        "css-has-pseudo": "dist/cli.cjs"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
-      }
-    },
-    "node_modules/css-loader": {
-      "version": "6.7.3",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.7.3.tgz",
-      "integrity": "sha512-qhOH1KlBMnZP8FzRO6YCH9UHXQhVMcEGLyNdb7Hv2cpcmJbW0YrddO+tG1ab5nT41KpHIYGsbeHqxB9xPu1pKQ==",
-      "dev": true,
-      "dependencies": {
-        "icss-utils": "^5.1.0",
-        "postcss": "^8.4.19",
-        "postcss-modules-extract-imports": "^3.0.0",
-        "postcss-modules-local-by-default": "^4.0.0",
-        "postcss-modules-scope": "^3.0.0",
-        "postcss-modules-values": "^4.0.0",
-        "postcss-value-parser": "^4.2.0",
-        "semver": "^7.3.8"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/css-loader/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/css-loader/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/css-loader/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/css-prefers-color-scheme": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz",
-      "integrity": "sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==",
-      "dev": true,
-      "bin": {
-        "css-prefers-color-scheme": "dist/cli.cjs"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
-      }
-    },
-    "node_modules/css-rule-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/css-rule-stream/-/css-rule-stream-1.1.0.tgz",
-      "integrity": "sha512-qiio/Zkr8I19jh/XuzEkK8OKDQRTrEYaRyIHy4Bwh/tPUe0w8GcQs7r6x24Yc9lT+FbnZFYULxEIXCmaymguUQ==",
-      "dev": true,
-      "dependencies": {
-        "css-tokenize": "^1.0.1",
-        "duplexer2": "0.0.2",
-        "ldjson-stream": "^1.2.1",
-        "through2": "^0.6.3"
-      },
-      "bin": {
-        "css-rule-stream": "index.js"
-      }
-    },
-    "node_modules/css-rule-stream/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-      "dev": true
-    },
-    "node_modules/css-rule-stream/node_modules/readable-stream": {
-      "version": "1.0.34",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-      "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/css-rule-stream/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
-      "dev": true
-    },
-    "node_modules/css-rule-stream/node_modules/through2": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-      "integrity": "sha512-RkK/CCESdTKQZHdmKICijdKKsCRVHs5KsLZ6pACAmF/1GPUQhonHSXWNERctxEp7RmvjdNbZTL5z9V7nSCXKcg==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": ">=1.0.33-1 <1.1.0-0",
-        "xtend": ">=4.0.0 <4.1.0-0"
-      }
-    },
-    "node_modules/css-select": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
-      "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
-      "dev": true,
-      "dependencies": {
-        "boolbase": "^1.0.0",
-        "css-what": "^6.0.1",
-        "domhandler": "^4.3.1",
-        "domutils": "^2.8.0",
-        "nth-check": "^2.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
-      }
-    },
-    "node_modules/css-tokenize": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/css-tokenize/-/css-tokenize-1.0.1.tgz",
-      "integrity": "sha512-gLmmbJdwH9HLY4bcA17lnZ8GgPwEXRbvxBJGHnkiB6gLhRpTzjkjtMIvz7YORGW/Ptv2oMk8b5g+u7mRD6Dd7A==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "readable-stream": "^1.0.33"
-      }
-    },
-    "node_modules/css-tokenize/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-      "dev": true
-    },
-    "node_modules/css-tokenize/node_modules/readable-stream": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/css-tokenize/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
-      "dev": true
-    },
-    "node_modules/css-tree": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
-      "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
-      "dev": true,
-      "dependencies": {
-        "mdn-data": "2.0.14",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/css-what": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
-      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
-      }
-    },
-    "node_modules/cssdb": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-7.2.0.tgz",
-      "integrity": "sha512-JYlIsE7eKHSi0UNuCyo96YuIDFqvhGgHw4Ck6lsN+DP0Tp8M64UTDT2trGbkMDqnCoEjks7CkS0XcjU0rkvBdg==",
-      "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      }
-    },
-    "node_modules/cssesc": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-      "dev": true,
-      "bin": {
-        "cssesc": "bin/cssesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/csso": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
-      "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
-      "dev": true,
-      "dependencies": {
-        "css-tree": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/csso-webpack-plugin": {
-      "version": "2.0.0-beta.3",
-      "resolved": "https://registry.npmjs.org/csso-webpack-plugin/-/csso-webpack-plugin-2.0.0-beta.3.tgz",
-      "integrity": "sha512-FnhgS7W1BwOduZagTLg9UjT2kvM9aiSpInm4xIDZHLuXl6/6vbOA1+DIIcbGKSjE0dWIVuDKEv1to86mN6KZ4w==",
-      "dev": true,
-      "dependencies": {
-        "@types/webpack": ">=4.0",
-        "core-js": "^3.10.1",
-        "csso": "^4.0.2",
-        "source-map": "^0.7.3",
-        "webpack-sources": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/csso-webpack-plugin/node_modules/source-map": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/cssom": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz",
-      "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==",
-      "dev": true
-    },
-    "node_modules/cssstyle": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
-      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
-      "dev": true,
-      "dependencies": {
-        "cssom": "~0.3.6"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cssstyle/node_modules/cssom": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
-      "dev": true
-    },
-    "node_modules/csstype": {
-      "version": "2.6.21",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.21.tgz",
-      "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w=="
-    },
-    "node_modules/data-urls": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz",
-      "integrity": "sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==",
-      "dev": true,
-      "dependencies": {
-        "abab": "^2.0.6",
-        "whatwg-mimetype": "^3.0.0",
-        "whatwg-url": "^11.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/data-urls/node_modules/whatwg-url": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz",
-      "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==",
-      "dev": true,
-      "dependencies": {
-        "tr46": "^3.0.0",
-        "webidl-conversions": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/decamelize-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz",
-      "integrity": "sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==",
-      "dev": true,
-      "dependencies": {
-        "decamelize": "^1.1.0",
-        "map-obj": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/decamelize-keys/node_modules/map-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-      "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/decimal.js": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
-      "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==",
-      "dev": true
-    },
-    "node_modules/decompress-response": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
-      "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
-      "dependencies": {
-        "mimic-response": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/decompress-response/node_modules/mimic-response": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
-      "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/deep-eql": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz",
-      "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==",
-      "dev": true,
-      "dependencies": {
-        "type-detect": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/deep-is": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
-    },
-    "node_modules/deepmerge": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/default-gateway": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
-      "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
-      "dev": true,
-      "dependencies": {
-        "execa": "^5.0.0"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/defer-to-connect": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
-      "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/define-lazy-prop": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
-      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-      "dev": true,
-      "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/del": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
-      "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/glob": "^7.1.1",
-        "globby": "^6.1.0",
-        "is-path-cwd": "^2.0.0",
-        "is-path-in-cwd": "^2.0.0",
-        "p-map": "^2.0.0",
-        "pify": "^4.0.1",
-        "rimraf": "^2.6.3"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/del/node_modules/array-union": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-      "integrity": "sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==",
-      "dev": true,
-      "dependencies": {
-        "array-uniq": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/del/node_modules/globby": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-      "integrity": "sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==",
-      "dev": true,
-      "dependencies": {
-        "array-union": "^1.0.1",
-        "glob": "^7.0.3",
-        "object-assign": "^4.0.1",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/del/node_modules/globby/node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/depd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/des.js": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
-      "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "node_modules/destroy": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
-      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8",
-        "npm": "1.2.8000 || >= 1.4.16"
-      }
-    },
-    "node_modules/detect-node": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
-      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
-      "dev": true
-    },
-    "node_modules/diff": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.3.1"
-      }
-    },
-    "node_modules/diffie-hellman": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "miller-rabin": "^4.0.0",
-        "randombytes": "^2.0.0"
-      }
-    },
-    "node_modules/diffie-hellman/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dev": true,
-      "dependencies": {
-        "path-type": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/dns-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
-      "integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==",
-      "dev": true
-    },
-    "node_modules/dns-packet": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.4.0.tgz",
-      "integrity": "sha512-EgqGeaBB8hLiHLZtp/IbaDQTL8pZ0+IvwzSHA6d7VyMDM+B9hgddEMa9xjK5oYnw0ci0JQ6g2XCD7/f6cafU6g==",
-      "dev": true,
-      "dependencies": {
-        "@leichtgewicht/ip-codec": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/doiuse": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/doiuse/-/doiuse-4.4.1.tgz",
-      "integrity": "sha512-TUpr1/YNg20IB09tZmwGCTsTQoxj8jUld/hUZprZMj8vj0VpAJySXEWCr8WMvqvgzk0/kG/FxeSMGKode4UjPg==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.16.1",
-        "caniuse-lite": "^1.0.30001179",
-        "css-rule-stream": "^1.1.0",
-        "duplexer2": "0.0.2",
-        "ldjson-stream": "^1.2.1",
-        "multimatch": "^5.0.0",
-        "postcss": "^8.2.4",
-        "source-map": "^0.7.3",
-        "through2": "^4.0.2",
-        "yargs": "^16.2.0"
-      },
-      "bin": {
-        "doiuse": "cli.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/doiuse/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/doiuse/node_modules/cliui": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^7.0.0"
-      }
-    },
-    "node_modules/doiuse/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/doiuse/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/doiuse/node_modules/source-map": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/doiuse/node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/doiuse/node_modules/y18n": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/doiuse/node_modules/yargs": {
-      "version": "16.2.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-      "dev": true,
-      "dependencies": {
-        "cliui": "^7.0.2",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.0",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^20.2.2"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/doiuse/node_modules/yargs-parser": {
-      "version": "20.2.9",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/dom-converter": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
-      "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
-      "dev": true,
-      "dependencies": {
-        "utila": "~0.4"
-      }
-    },
-    "node_modules/dom-serializer": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
-      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.2.0",
-        "entities": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
-      }
-    },
-    "node_modules/dom-serializer/node_modules/entities": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
-    "node_modules/domain-browser": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
-      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4",
-        "npm": ">=1.2"
-      }
-    },
-    "node_modules/domelementtype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ]
-    },
-    "node_modules/domexception": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
-      "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
-      "dev": true,
-      "dependencies": {
-        "webidl-conversions": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/domhandler": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
-      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "^2.2.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domhandler?sponsor=1"
-      }
-    },
-    "node_modules/domutils": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-      "dev": true,
-      "dependencies": {
-        "dom-serializer": "^1.0.1",
-        "domelementtype": "^2.2.0",
-        "domhandler": "^4.2.0"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domutils?sponsor=1"
-      }
-    },
-    "node_modules/dot-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
-      "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
-      "dev": true,
-      "dependencies": {
-        "no-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/dropzone": {
-      "version": "5.9.3",
-      "resolved": "https://registry.npmjs.org/dropzone/-/dropzone-5.9.3.tgz",
-      "integrity": "sha512-Azk8kD/2/nJIuVPK+zQ9sjKMRIpRvNyqn9XwbBHNq+iNuSccbJS6hwm1Woy0pMST0erSo0u4j+KJaodndDk4vA=="
-    },
-    "node_modules/duplexer2": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-      "integrity": "sha512-+AWBwjGadtksxjOQSFDhPNQbed7icNXApT4+2BNpsXzcCBiInq2H9XW0O8sfHFaPmnQRs7cg/P0fAr2IWQSW0g==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "~1.1.9"
-      }
-    },
-    "node_modules/duplexer2/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-      "dev": true
-    },
-    "node_modules/duplexer2/node_modules/readable-stream": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/duplexer2/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
-      "dev": true
-    },
-    "node_modules/ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
-      "dev": true
-    },
-    "node_modules/electron-to-chromium": {
-      "version": "1.4.284",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz",
-      "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA=="
-    },
-    "node_modules/elliptic": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
-      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.11.9",
-        "brorand": "^1.1.0",
-        "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.1",
-        "inherits": "^2.0.4",
-        "minimalistic-assert": "^1.0.1",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "node_modules/elliptic/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/emojis-list": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dependencies": {
-        "once": "^1.4.0"
-      }
-    },
-    "node_modules/enhanced-resolve": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz",
-      "integrity": "sha512-kxpoMgrdtkXZ5h0SeraBS1iRntpTpQ3R8ussdb38+UAFnMGX5DDyJXePm+OCHOcoXvHDw7mc2erbJBpDnl7TPw==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "memory-fs": "^0.2.0",
-        "tapable": "^0.1.8"
-      },
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/enhanced-resolve/node_modules/tapable": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",
-      "integrity": "sha512-jX8Et4hHg57mug1/079yitEKWGB3LCwoxByLsNim89LABq8NqgiX+6iYVOsq0vX8uJHkU+DZ5fnq95f800bEsQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/entities": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz",
-      "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
-    "node_modules/envinfo": {
-      "version": "7.8.1",
-      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz",
-      "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==",
-      "dev": true,
-      "bin": {
-        "envinfo": "dist/cli.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eonasdan-bootstrap-datetimepicker": {
-      "version": "4.17.49",
-      "resolved": "https://registry.npmjs.org/eonasdan-bootstrap-datetimepicker/-/eonasdan-bootstrap-datetimepicker-4.17.49.tgz",
-      "integrity": "sha512-7KZeDpkj+A6AtPR3XjX8gAnRPUkPSfW0OmMANG1dkUOPMtLSzbyoCjDIdEcfRtQPU5X0D9Gob7wWKn0h4QWy7A==",
-      "dependencies": {
-        "bootstrap": "^3.3",
-        "jquery": "^3.5.1",
-        "moment": "^2.10",
-        "moment-timezone": "^0.4.0"
-      },
-      "peerDependencies": {
-        "bootstrap": "^3.3",
-        "jquery": "^1.8.3 || ^2.0 || ^3.0",
-        "moment": "^2.10",
-        "moment-timezone": "^0.4.0 || ^0.5.0"
-      }
-    },
-    "node_modules/eonasdan-bootstrap-datetimepicker/node_modules/bootstrap": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.4.1.tgz",
-      "integrity": "sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dev": true,
-      "dependencies": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "node_modules/es-abstract": {
-      "version": "1.20.5",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.5.tgz",
-      "integrity": "sha512-7h8MM2EQhsCA7pU/Nv78qOXFpD8Rhqd12gYiSJVkrH9+e8VuA8JlPJK/hQjjlLv6pJvx/z1iRFKzYb0XT/RuAQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.3",
-        "get-symbol-description": "^1.0.0",
-        "gopd": "^1.0.1",
-        "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.7",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.2",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.4.3",
-        "safe-regex-test": "^1.0.0",
-        "string.prototype.trimend": "^1.0.6",
-        "string.prototype.trimstart": "^1.0.6",
-        "unbox-primitive": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/es-array-method-boxes-properly": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz",
-      "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==",
-      "dev": true
-    },
-    "node_modules/es-module-lexer": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
-      "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ=="
-    },
-    "node_modules/es-shim-unscopables": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
-      "dev": true,
-      "dependencies": {
-        "has": "^1.0.3"
-      }
-    },
-    "node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/esbuild": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.15.18.tgz",
-      "integrity": "sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q==",
-      "dev": true,
-      "hasInstallScript": true,
-      "bin": {
-        "esbuild": "bin/esbuild"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "optionalDependencies": {
-        "@esbuild/android-arm": "0.15.18",
-        "@esbuild/linux-loong64": "0.15.18",
-        "esbuild-android-64": "0.15.18",
-        "esbuild-android-arm64": "0.15.18",
-        "esbuild-darwin-64": "0.15.18",
-        "esbuild-darwin-arm64": "0.15.18",
-        "esbuild-freebsd-64": "0.15.18",
-        "esbuild-freebsd-arm64": "0.15.18",
-        "esbuild-linux-32": "0.15.18",
-        "esbuild-linux-64": "0.15.18",
-        "esbuild-linux-arm": "0.15.18",
-        "esbuild-linux-arm64": "0.15.18",
-        "esbuild-linux-mips64le": "0.15.18",
-        "esbuild-linux-ppc64le": "0.15.18",
-        "esbuild-linux-riscv64": "0.15.18",
-        "esbuild-linux-s390x": "0.15.18",
-        "esbuild-netbsd-64": "0.15.18",
-        "esbuild-openbsd-64": "0.15.18",
-        "esbuild-sunos-64": "0.15.18",
-        "esbuild-windows-32": "0.15.18",
-        "esbuild-windows-64": "0.15.18",
-        "esbuild-windows-arm64": "0.15.18"
-      }
-    },
-    "node_modules/esbuild-android-64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.15.18.tgz",
-      "integrity": "sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-android-arm64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.15.18.tgz",
-      "integrity": "sha512-G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-darwin-64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.15.18.tgz",
-      "integrity": "sha512-2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-darwin-arm64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.18.tgz",
-      "integrity": "sha512-tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-freebsd-64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.18.tgz",
-      "integrity": "sha512-TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-freebsd-arm64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.18.tgz",
-      "integrity": "sha512-R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-32": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.15.18.tgz",
-      "integrity": "sha512-lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.18.tgz",
-      "integrity": "sha512-hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-arm": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.15.18.tgz",
-      "integrity": "sha512-UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-arm64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.18.tgz",
-      "integrity": "sha512-54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-mips64le": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.18.tgz",
-      "integrity": "sha512-Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ==",
-      "cpu": [
-        "mips64el"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-ppc64le": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.18.tgz",
-      "integrity": "sha512-b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-riscv64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.18.tgz",
-      "integrity": "sha512-ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-s390x": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.18.tgz",
-      "integrity": "sha512-VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-loader": {
-      "version": "2.20.0",
-      "resolved": "https://registry.npmjs.org/esbuild-loader/-/esbuild-loader-2.20.0.tgz",
-      "integrity": "sha512-dr+j8O4w5RvqZ7I4PPB4EIyVTd679EBQnMm+JBB7av+vu05Zpje2IpK5N3ld1VWa+WxrInIbNFAg093+E1aRsA==",
-      "dev": true,
-      "dependencies": {
-        "esbuild": "^0.15.6",
-        "joycon": "^3.0.1",
-        "json5": "^2.2.0",
-        "loader-utils": "^2.0.0",
-        "tapable": "^2.2.0",
-        "webpack-sources": "^2.2.0"
-      },
-      "funding": {
-        "url": "https://github.com/privatenumber/esbuild-loader?sponsor=1"
-      },
-      "peerDependencies": {
-        "webpack": "^4.40.0 || ^5.0.0"
-      }
-    },
-    "node_modules/esbuild-loader/node_modules/webpack-sources": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz",
-      "integrity": "sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==",
-      "dev": true,
-      "dependencies": {
-        "source-list-map": "^2.0.1",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/esbuild-netbsd-64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.18.tgz",
-      "integrity": "sha512-98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-openbsd-64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.18.tgz",
-      "integrity": "sha512-yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-sunos-64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.15.18.tgz",
-      "integrity": "sha512-On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-windows-32": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.15.18.tgz",
-      "integrity": "sha512-o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-windows-64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.18.tgz",
-      "integrity": "sha512-qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-windows-arm64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.18.tgz",
-      "integrity": "sha512-q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
-      "dev": true
-    },
-    "node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/escodegen": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
-      "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
-      "dev": true,
-      "dependencies": {
-        "esprima": "^4.0.1",
-        "estraverse": "^5.2.0",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1"
-      },
-      "bin": {
-        "escodegen": "bin/escodegen.js",
-        "esgenerate": "bin/esgenerate.js"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "optionalDependencies": {
-        "source-map": "~0.6.1"
-      }
-    },
-    "node_modules/escodegen/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/escodegen/node_modules/levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/escodegen/node_modules/optionator": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-      "dev": true,
-      "dependencies": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.6",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "word-wrap": "~1.2.3"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/escodegen/node_modules/prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/escodegen/node_modules/type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/eslint": {
-      "version": "8.30.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.30.0.tgz",
-      "integrity": "sha512-MGADB39QqYuzEGov+F/qb18r4i7DohCDOfatHaxI2iGlPuC65bwG2gxgO+7DkyL38dRFaRH7RaRAgU6JKL9rMQ==",
-      "dev": true,
-      "dependencies": {
-        "@eslint/eslintrc": "^1.4.0",
-        "@humanwhocodes/config-array": "^0.11.8",
-        "@humanwhocodes/module-importer": "^1.0.1",
-        "@nodelib/fs.walk": "^1.2.8",
-        "ajv": "^6.10.0",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.1.1",
-        "eslint-utils": "^3.0.0",
-        "eslint-visitor-keys": "^3.3.0",
-        "espree": "^9.4.0",
-        "esquery": "^1.4.0",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "find-up": "^5.0.0",
-        "glob-parent": "^6.0.2",
-        "globals": "^13.19.0",
-        "grapheme-splitter": "^1.0.4",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "is-path-inside": "^3.0.3",
-        "js-sdsl": "^4.1.4",
-        "js-yaml": "^4.1.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
-        "regexpp": "^3.2.0",
-        "strip-ansi": "^6.0.1",
-        "strip-json-comments": "^3.1.0",
-        "text-table": "^0.2.0"
-      },
-      "bin": {
-        "eslint": "bin/eslint.js"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint-config-airbnb-base": {
-      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz",
-      "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==",
-      "dev": true,
-      "dependencies": {
-        "confusing-browser-globals": "^1.0.10",
-        "object.assign": "^4.1.2",
-        "object.entries": "^1.1.5",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "peerDependencies": {
-        "eslint": "^7.32.0 || ^8.2.0",
-        "eslint-plugin-import": "^2.25.2"
-      }
-    },
-    "node_modules/eslint-import-resolver-node": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
-      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^3.2.7",
-        "resolve": "^1.20.0"
-      }
-    },
-    "node_modules/eslint-import-resolver-node/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/eslint-import-resolver-webpack": {
-      "version": "0.12.2",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.12.2.tgz",
-      "integrity": "sha512-7Jnm4YAoNNkvqPaZkKdIHsKGmv8/uNnYC5QsXkiSodvX4XEEfH2AKOna98FK52fCDXm3q4HzuX+7pRMKkJ64EQ==",
-      "dev": true,
-      "dependencies": {
-        "array-find": "^1.0.0",
-        "debug": "^2.6.9",
-        "enhanced-resolve": "^0.9.1",
-        "find-root": "^1.1.0",
-        "has": "^1.0.3",
-        "interpret": "^1.2.0",
-        "lodash": "^4.17.15",
-        "node-libs-browser": "^1.0.0 || ^2.0.0",
-        "resolve": "^1.13.1",
-        "semver": "^5.7.1"
-      },
-      "peerDependencies": {
-        "eslint-plugin-import": ">=1.4.0",
-        "webpack": ">=1.11.0"
-      }
-    },
-    "node_modules/eslint-import-resolver-webpack/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/eslint-import-resolver-webpack/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/eslint-import-resolver-webpack/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/eslint-module-utils": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz",
-      "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^3.2.7"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependenciesMeta": {
-        "eslint": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/eslint-module-utils/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/eslint-plugin-html": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-html/-/eslint-plugin-html-6.2.0.tgz",
-      "integrity": "sha512-vi3NW0E8AJombTvt8beMwkL1R/fdRWl4QSNRNMhVQKWm36/X0KF0unGNAY4mqUF06mnwVWZcIcerrCnfn9025g==",
-      "dev": true,
-      "dependencies": {
-        "htmlparser2": "^7.1.2"
-      }
-    },
-    "node_modules/eslint-plugin-import": {
-      "version": "2.26.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
-      "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
-      "dev": true,
-      "dependencies": {
-        "array-includes": "^3.1.4",
-        "array.prototype.flat": "^1.2.5",
-        "debug": "^2.6.9",
-        "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.6",
-        "eslint-module-utils": "^2.7.3",
-        "has": "^1.0.3",
-        "is-core-module": "^2.8.1",
-        "is-glob": "^4.0.3",
-        "minimatch": "^3.1.2",
-        "object.values": "^1.1.5",
-        "resolve": "^1.22.0",
-        "tsconfig-paths": "^3.14.1"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/eslint-plugin-vue": {
-      "version": "9.8.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.8.0.tgz",
-      "integrity": "sha512-E/AXwcTzunyzM83C2QqDHxepMzvI2y6x+mmeYHbVDQlKFqmKYvRrhaVixEeeG27uI44p9oKDFiyCRw4XxgtfHA==",
-      "dev": true,
-      "dependencies": {
-        "eslint-utils": "^3.0.0",
-        "natural-compare": "^1.4.0",
-        "nth-check": "^2.0.1",
-        "postcss-selector-parser": "^6.0.9",
-        "semver": "^7.3.5",
-        "vue-eslint-parser": "^9.0.1",
-        "xml-name-validator": "^4.0.0"
-      },
-      "engines": {
-        "node": "^14.17.0 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "eslint": "^6.2.0 || ^7.0.0 || ^8.0.0"
-      }
-    },
-    "node_modules/eslint-plugin-vue/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/eslint-plugin-vue/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/eslint-plugin-vue/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/eslint-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-      "dev": true,
-      "dependencies": {
-        "eslint-visitor-keys": "^2.0.0"
-      },
-      "engines": {
-        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      },
-      "peerDependencies": {
-        "eslint": ">=5"
-      }
-    },
-    "node_modules/eslint-visitor-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/eslint/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/eslint/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/eslint/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/eslint/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/eslint-scope": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/eslint/node_modules/globals": {
-      "version": "13.19.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz",
-      "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/espree": {
-      "version": "9.4.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz",
-      "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^8.8.0",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.3.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/espree/node_modules/eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/esquery": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/esquery/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dependencies": {
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esrecurse/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/estree-walker": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
-      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
-    },
-    "node_modules/esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/eventemitter3": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
-      "dev": true
-    },
-    "node_modules/events": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-      "engines": {
-        "node": ">=0.8.x"
-      }
-    },
-    "node_modules/evp_bytestokey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-      "dev": true,
-      "dependencies": {
-        "md5.js": "^1.3.4",
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "node_modules/execa": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-      "dev": true,
-      "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.0",
-        "human-signals": "^2.1.0",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.1",
-        "onetime": "^5.1.2",
-        "signal-exit": "^3.0.3",
-        "strip-final-newline": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
-      }
-    },
-    "node_modules/execa/node_modules/get-stream": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/expose-loader": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/expose-loader/-/expose-loader-4.0.0.tgz",
-      "integrity": "sha512-kUEvHyf6MPR2ubZCL9aziP9Br5wxMvq1cghTpYhM6MW52NPq+7hXixw2EqQuI1SvGb1fDjc2ehJOg6645wR6ww==",
-      "dev": true,
-      "engines": {
-        "node": ">= 14.15.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/express": {
-      "version": "4.18.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
-      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
-      "dev": true,
-      "dependencies": {
-        "accepts": "~1.3.8",
-        "array-flatten": "1.1.1",
-        "body-parser": "1.20.1",
-        "content-disposition": "0.5.4",
-        "content-type": "~1.0.4",
-        "cookie": "0.5.0",
-        "cookie-signature": "1.0.6",
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "finalhandler": "1.2.0",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "merge-descriptors": "1.0.1",
-        "methods": "~1.1.2",
-        "on-finished": "2.4.1",
-        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.7",
-        "qs": "6.11.0",
-        "range-parser": "~1.2.1",
-        "safe-buffer": "5.2.1",
-        "send": "0.18.0",
-        "serve-static": "1.15.0",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "type-is": "~1.6.18",
-        "utils-merge": "1.0.1",
-        "vary": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
-    "node_modules/express/node_modules/array-flatten": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
-      "dev": true
-    },
-    "node_modules/express/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/express/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
-    },
-    "node_modules/fast-glob": {
-      "version": "3.2.12",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
-      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
-      },
-      "engines": {
-        "node": ">=8.6.0"
-      }
-    },
-    "node_modules/fast-glob/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
-    },
-    "node_modules/fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-      "dev": true
-    },
-    "node_modules/fastest-levenshtein": {
-      "version": "1.0.16",
-      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
-      "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4.9.1"
-      }
-    },
-    "node_modules/fastq": {
-      "version": "1.14.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.14.0.tgz",
-      "integrity": "sha512-eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg==",
-      "dev": true,
-      "dependencies": {
-        "reusify": "^1.0.4"
-      }
-    },
-    "node_modules/faye-websocket": {
-      "version": "0.11.4",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
-      "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
-      "dev": true,
-      "dependencies": {
-        "websocket-driver": ">=0.5.1"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-      "dev": true,
-      "dependencies": {
-        "flat-cache": "^3.0.4"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/file-loader": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-5.1.0.tgz",
-      "integrity": "sha512-u/VkLGskw3Ue59nyOwUwXI/6nuBCo7KBkniB/l7ICwr/7cPNGsL1WCXUp3GB0qgOOKU1TiP49bv4DZF/LJqprg==",
-      "dev": true,
-      "dependencies": {
-        "loader-utils": "^1.4.0",
-        "schema-utils": "^2.5.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/file-loader/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/file-loader/node_modules/loader-utils": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
-      "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/file-loader/node_modules/schema-utils": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
-      "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.5",
-        "ajv": "^6.12.4",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 8.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dev": true,
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/finalhandler": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
-      "dev": true,
-      "dependencies": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "2.4.1",
-        "parseurl": "~1.3.3",
-        "statuses": "2.0.1",
-        "unpipe": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/finalhandler/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/finalhandler/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/find-root": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
-      "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==",
-      "dev": true
-    },
-    "node_modules/find-up": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/flat": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.1.tgz",
-      "integrity": "sha512-FmTtBsHskrU6FJ2VxCnsDb84wu9zhmO3cUX2kGFb5tuwhfXxGciiT0oRY+cck35QmG+NmGh5eLz6lLCpWTqwpA==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "~2.0.3"
-      },
-      "bin": {
-        "flat": "cli.js"
-      }
-    },
-    "node_modules/flat-cache": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-      "dev": true,
-      "dependencies": {
-        "flatted": "^3.1.0",
-        "rimraf": "^3.0.2"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/flat-cache/node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/flatted": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
-      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
-      "dev": true
-    },
-    "node_modules/follow-redirects": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/RubenVerborgh"
-        }
-      ],
-      "engines": {
-        "node": ">=4.0"
-      },
-      "peerDependenciesMeta": {
-        "debug": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin": {
-      "version": "7.2.14",
-      "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-7.2.14.tgz",
-      "integrity": "sha512-Tg2feh/n8k486KX0EbXVUfJj3j0xnnbKYTJw0fnIb2QdV0+lblOYZSal5ed9hARoWVwKeOC7sYE2EakSRLo5ZA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.16.7",
-        "chalk": "^4.1.2",
-        "chokidar": "^3.5.3",
-        "cosmiconfig": "^7.0.1",
-        "deepmerge": "^4.2.2",
-        "fs-extra": "^10.0.0",
-        "memfs": "^3.4.1",
-        "minimatch": "^3.0.4",
-        "node-abort-controller": "^3.0.1",
-        "schema-utils": "^3.1.1",
-        "semver": "^7.3.5",
-        "tapable": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=12.13.0",
-        "yarn": ">=1.0.0"
-      },
-      "peerDependencies": {
-        "typescript": ">3.6.0",
-        "vue-template-compiler": "*",
-        "webpack": "^5.11.0"
-      },
-      "peerDependenciesMeta": {
-        "vue-template-compiler": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/form-data": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-      "dev": true,
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/forwarded": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/fos-routing": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/fos-routing/-/fos-routing-0.0.6.tgz",
-      "integrity": "sha512-+eeaFADJSbxdBI7l/hqZGZlvYmxFudOhiv+GHypQHvzbkr05pBYrm7AON80uuQp+3kBDiaRSh8Ln34Y1rHYzYw=="
-    },
-    "node_modules/fraction.js": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
-      "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "type": "patreon",
-        "url": "https://www.patreon.com/infusion"
-      }
-    },
-    "node_modules/fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/fs-extra": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/fs-monkey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz",
-      "integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==",
-      "dev": true
-    },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true
-    },
-    "node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
-    "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
-    },
-    "node_modules/function.prototype.name": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0",
-        "functions-have-names": "^1.2.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/functions-have-names": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/gensync": {
-      "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "dev": true,
-      "engines": {
-        "node": "6.* || 8.* || >= 10.*"
-      }
-    },
-    "node_modules/get-func-name": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
-      "integrity": "sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/get-intrinsic": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/get-npm-tarball-url": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/get-npm-tarball-url/-/get-npm-tarball-url-2.0.3.tgz",
-      "integrity": "sha512-R/PW6RqyaBQNWYaSyfrh54/qtcnOp22FHCCiRhSSZj0FP3KQWCsxxt0DzIdVTbwTqe9CtQfvl/FPD4UIPt4pqw==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.17"
-      }
-    },
-    "node_modules/get-stream": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-      "dependencies": {
-        "pump": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/get-symbol-description": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/glob": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-      "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
-      "dev": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.3"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/glob-to-regexp": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="
-    },
-    "node_modules/global-modules": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
-      "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
-      "dev": true,
-      "dependencies": {
-        "global-prefix": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/global-prefix": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
-      "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
-      "dev": true,
-      "dependencies": {
-        "ini": "^1.3.5",
-        "kind-of": "^6.0.2",
-        "which": "^1.3.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/global-prefix/node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
-      }
-    },
-    "node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-      "dev": true,
-      "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/globjoin": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
-      "integrity": "sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==",
-      "dev": true
-    },
-    "node_modules/google-protobuf": {
-      "version": "3.21.2",
-      "resolved": "https://registry.npmjs.org/google-protobuf/-/google-protobuf-3.21.2.tgz",
-      "integrity": "sha512-3MSOYFO5U9mPGikIYCzK0SaThypfGgS6bHqrUGXG3DPHCrb+txNqeEcns1W0lkGfk0rCyNXm7xB9rMxnCiZOoA==",
-      "dev": true
-    },
-    "node_modules/gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/got": {
-      "version": "11.8.6",
-      "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz",
-      "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==",
-      "dependencies": {
-        "@sindresorhus/is": "^4.0.0",
-        "@szmarczak/http-timer": "^4.0.5",
-        "@types/cacheable-request": "^6.0.1",
-        "@types/responselike": "^1.0.0",
-        "cacheable-lookup": "^5.0.3",
-        "cacheable-request": "^7.0.2",
-        "decompress-response": "^6.0.0",
-        "http2-wrapper": "^1.0.0-beta.5.2",
-        "lowercase-keys": "^2.0.0",
-        "p-cancelable": "^2.0.0",
-        "responselike": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10.19.0"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/got?sponsor=1"
-      }
-    },
-    "node_modules/graceful-fs": {
-      "version": "4.2.10",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
-    },
-    "node_modules/grapheme-splitter": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
-      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
-      "dev": true
-    },
-    "node_modules/growl": {
-      "version": "1.10.5",
-      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
-      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.x"
-      }
-    },
-    "node_modules/handle-thing": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
-      "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
-      "dev": true
-    },
-    "node_modules/hard-rejection": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
-      "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/has-property-descriptors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.1.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/hash-base": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
-      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/hash-base/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/hash-sum": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz",
-      "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==",
-      "dev": true
-    },
-    "node_modules/hash.js": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "minimalistic-assert": "^1.0.1"
-      }
-    },
-    "node_modules/he": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-      "dev": true,
-      "bin": {
-        "he": "bin/he"
-      }
-    },
-    "node_modules/hmac-drbg": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-      "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==",
-      "dev": true,
-      "dependencies": {
-        "hash.js": "^1.0.3",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "node_modules/hosted-git-info": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
-      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/hosted-git-info/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/hosted-git-info/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/hot-accept-webpack-plugin": {
-      "version": "2.0.0-beta.7",
-      "resolved": "https://registry.npmjs.org/hot-accept-webpack-plugin/-/hot-accept-webpack-plugin-2.0.0-beta.7.tgz",
-      "integrity": "sha512-3uRVxSf558Mb05zkQuqlEtroe6M50qb+k36+2xYOrxq/uQwpk0joGzzGvm62rW/SOyQq0p9pxS2+7kUiVJrcLw==",
-      "dev": true,
-      "dependencies": {
-        "modify-source-webpack-plugin": "2.0.0-beta.7"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/hpack.js": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
-      "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "obuf": "^1.0.0",
-        "readable-stream": "^2.0.1",
-        "wbuf": "^1.1.0"
-      }
-    },
-    "node_modules/html-encoding-sniffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
-      "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
-      "dev": true,
-      "dependencies": {
-        "whatwg-encoding": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/html-entities": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz",
-      "integrity": "sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==",
-      "dev": true
-    },
-    "node_modules/html-minifier-terser": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
-      "integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==",
-      "dev": true,
-      "dependencies": {
-        "camel-case": "^4.1.2",
-        "clean-css": "^5.2.2",
-        "commander": "^8.3.0",
-        "he": "^1.2.0",
-        "param-case": "^3.0.4",
-        "relateurl": "^0.2.7",
-        "terser": "^5.10.0"
-      },
-      "bin": {
-        "html-minifier-terser": "cli.js"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/html-tags": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.2.0.tgz",
-      "integrity": "sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/html-webpack-plugin": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz",
-      "integrity": "sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw==",
-      "dev": true,
-      "dependencies": {
-        "@types/html-minifier-terser": "^6.0.0",
-        "html-minifier-terser": "^6.0.2",
-        "lodash": "^4.17.21",
-        "pretty-error": "^4.0.0",
-        "tapable": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/html-webpack-plugin"
-      },
-      "peerDependencies": {
-        "webpack": "^5.20.0"
-      }
-    },
-    "node_modules/htmlparser2": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz",
-      "integrity": "sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==",
-      "dev": true,
-      "funding": [
-        "https://github.com/fb55/htmlparser2?sponsor=1",
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ],
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.2.2",
-        "domutils": "^2.8.0",
-        "entities": "^3.0.1"
-      }
-    },
-    "node_modules/http-cache-semantics": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
-      "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="
-    },
-    "node_modules/http-deceiver": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
-      "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==",
-      "dev": true
-    },
-    "node_modules/http-errors": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
-      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
-      "dev": true,
-      "dependencies": {
-        "depd": "2.0.0",
-        "inherits": "2.0.4",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "toidentifier": "1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/http-parser-js": {
-      "version": "0.5.8",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
-      "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==",
-      "dev": true
-    },
-    "node_modules/http-proxy": {
-      "version": "1.18.1",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
-      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
-      "dev": true,
-      "dependencies": {
-        "eventemitter3": "^4.0.0",
-        "follow-redirects": "^1.0.0",
-        "requires-port": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/http-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
-      "dev": true,
-      "dependencies": {
-        "@tootallnate/once": "2",
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/http-proxy-middleware": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
-      "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
-      "dev": true,
-      "dependencies": {
-        "@types/http-proxy": "^1.17.8",
-        "http-proxy": "^1.18.1",
-        "is-glob": "^4.0.1",
-        "is-plain-obj": "^3.0.0",
-        "micromatch": "^4.0.2"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "@types/express": "^4.17.13"
-      },
-      "peerDependenciesMeta": {
-        "@types/express": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/http-proxy-middleware/node_modules/is-plain-obj": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
-      "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/http2-wrapper": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz",
-      "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==",
-      "dependencies": {
-        "quick-lru": "^5.1.1",
-        "resolve-alpn": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=10.19.0"
-      }
-    },
-    "node_modules/http2-wrapper/node_modules/quick-lru": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
-      "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/https-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
-      "integrity": "sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==",
-      "dev": true
-    },
-    "node_modules/https-proxy-agent": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
-      "dev": true,
-      "dependencies": {
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/human-signals": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.17.0"
-      }
-    },
-    "node_modules/iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dev": true,
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/icss-utils": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
-      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
-      "dev": true,
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/ignore": {
-      "version": "5.2.4",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
-      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/immutable": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.1.0.tgz",
-      "integrity": "sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==",
-      "dev": true
-    },
-    "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
-      "dependencies": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/import-lazy": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
-      "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/import-local": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
-      "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
-      "dev": true,
-      "dependencies": {
-        "pkg-dir": "^4.2.0",
-        "resolve-cwd": "^3.0.0"
-      },
-      "bin": {
-        "import-local-fixture": "fixtures/cli.js"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/imports-loader": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/imports-loader/-/imports-loader-4.0.1.tgz",
-      "integrity": "sha512-ZiY+1xH5fqAJ1Qu1CFv+zw54rvPCC92DdYRDe0IIUboOhbJPLfOPbF/paA2iipelvMwjQUKWydcFOJ7f1+ZFcA==",
-      "dev": true,
-      "dependencies": {
-        "source-map": "^0.6.1",
-        "strip-comments": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 14.15.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.19"
-      }
-    },
-    "node_modules/indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "node_modules/ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-      "dev": true
-    },
-    "node_modules/internal-slot": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz",
-      "integrity": "sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.1.3",
-        "has": "^1.0.3",
-        "side-channel": "^1.0.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/interpret": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
-      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/ipaddr.js": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz",
-      "integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
-      "dev": true
-    },
-    "node_modules/is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-      "dev": true,
-      "dependencies": {
-        "has-bigints": "^1.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "dev": true,
-      "dependencies": {
-        "binary-extensions": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-buffer": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
-      "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/is-callable": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-core-module": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
-      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
-      "dev": true,
-      "dependencies": {
-        "has": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-docker": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
-      "dev": true,
-      "bin": {
-        "is-docker": "cli.js"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/is-number-object": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-path-cwd": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
-      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is-path-in-cwd": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
-      "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
-      "dev": true,
-      "dependencies": {
-        "is-path-inside": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is-path-in-cwd/node_modules/is-path-inside": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
-      "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
-      "dev": true,
-      "dependencies": {
-        "path-is-inside": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-plain-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-plain-object": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
-      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-potential-custom-element-name": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
-      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
-      "dev": true
-    },
-    "node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-stream": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-wsl": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-      "dev": true,
-      "dependencies": {
-        "is-docker": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-      "dev": true
-    },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "dev": true
-    },
-    "node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/jest-worker": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
-      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
-      "dependencies": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      }
-    },
-    "node_modules/jest-worker/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-worker/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
-      }
-    },
-    "node_modules/jets": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/jets/-/jets-0.11.0.tgz",
-      "integrity": "sha512-WGRZAkICV8la9FirezCLFkN0vr/VQDn6l5C0TeTaip8hY3YVz4EJW3tb8FASHLBCnFechGsssYAxkzTmRKXcLg=="
-    },
-    "node_modules/joycon": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/joycon/-/joycon-3.1.1.tgz",
-      "integrity": "sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/jquery": {
-      "version": "3.6.3",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.3.tgz",
-      "integrity": "sha512-bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg=="
-    },
-    "node_modules/jquery-serializejson": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/jquery-serializejson/-/jquery-serializejson-3.2.1.tgz",
-      "integrity": "sha512-89UxVNC4ac9XC5tWPz3DjSTYFcT5z6JYsxGVw+qHhD61FzjbEzXJHjpdLnezWujjqtIECi/URQ6KdPmDE9imGA=="
-    },
-    "node_modules/jquery-ui-dist": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/jquery-ui-dist/-/jquery-ui-dist-1.13.2.tgz",
-      "integrity": "sha512-oVDRd1NLtTbBwpRKAYdIRgpWVDzeBhfy7Gu0RmY6JEaZtmBq6kDn1pm5SgDiAotrnDS+RoTRXO6xvcNTxA9tOA==",
-      "dependencies": {
-        "jquery": ">=1.8.0 <4.0.0"
-      }
-    },
-    "node_modules/jquery.growl": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/jquery.growl/-/jquery.growl-1.3.5.tgz",
-      "integrity": "sha512-pK1RD8x3pXm1hEQ6KH0cu4QqzvI7R0EsUd5oneT5pavZ0cHwx/TV4qIdKeVfCWM0DVPyzI2GfXD6FwdDbRx1kw=="
-    },
-    "node_modules/js-sdsl": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz",
-      "integrity": "sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==",
-      "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/js-sdsl"
-      }
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
-    },
-    "node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/jsdom": {
-      "version": "19.0.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-19.0.0.tgz",
-      "integrity": "sha512-RYAyjCbxy/vri/CfnjUWJQQtZ3LKlLnDqj+9XLNnJPgEGeirZs3hllKR20re8LUZ6o1b1X4Jat+Qd26zmP41+A==",
-      "dev": true,
-      "dependencies": {
-        "abab": "^2.0.5",
-        "acorn": "^8.5.0",
-        "acorn-globals": "^6.0.0",
-        "cssom": "^0.5.0",
-        "cssstyle": "^2.3.0",
-        "data-urls": "^3.0.1",
-        "decimal.js": "^10.3.1",
-        "domexception": "^4.0.0",
-        "escodegen": "^2.0.0",
-        "form-data": "^4.0.0",
-        "html-encoding-sniffer": "^3.0.0",
-        "http-proxy-agent": "^5.0.0",
-        "https-proxy-agent": "^5.0.0",
-        "is-potential-custom-element-name": "^1.0.1",
-        "nwsapi": "^2.2.0",
-        "parse5": "6.0.1",
-        "saxes": "^5.0.1",
-        "symbol-tree": "^3.2.4",
-        "tough-cookie": "^4.0.0",
-        "w3c-hr-time": "^1.0.2",
-        "w3c-xmlserializer": "^3.0.0",
-        "webidl-conversions": "^7.0.0",
-        "whatwg-encoding": "^2.0.0",
-        "whatwg-mimetype": "^3.0.0",
-        "whatwg-url": "^10.0.0",
-        "ws": "^8.2.3",
-        "xml-name-validator": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "peerDependencies": {
-        "canvas": "^2.5.0"
-      },
-      "peerDependenciesMeta": {
-        "canvas": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "dev": true,
-      "bin": {
-        "jsesc": "bin/jsesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/json-buffer": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="
-    },
-    "node_modules/json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
-    },
-    "node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-    },
-    "node_modules/json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-      "dev": true
-    },
-    "node_modules/json5": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.2.tgz",
-      "integrity": "sha512-46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ==",
-      "dev": true,
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "dev": true,
-      "dependencies": {
-        "universalify": "^2.0.0"
-      },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/jwerty": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/jwerty/-/jwerty-0.3.2.tgz",
-      "integrity": "sha512-cMFyML8AJ5Q8oh6MYx0/6W99B4XH0y9G5IANjTF+gqv7iLSlkjmWBhpkq3XYKgFiDrsmrm2NGs1lK7SduX3DyA=="
-    },
-    "node_modules/keyv": {
-      "version": "4.5.2",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.2.tgz",
-      "integrity": "sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==",
-      "dependencies": {
-        "json-buffer": "3.0.1"
-      }
-    },
-    "node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/klona": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz",
-      "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/known-css-properties": {
-      "version": "0.26.0",
-      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.26.0.tgz",
-      "integrity": "sha512-5FZRzrZzNTBruuurWpvZnvP9pum+fe0HcK8z/ooo+U+Hmp4vtbyp1/QDsqmufirXy4egGzbaH/y2uCZf+6W5Kg==",
-      "dev": true
-    },
-    "node_modules/ldjson-stream": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ldjson-stream/-/ldjson-stream-1.2.1.tgz",
-      "integrity": "sha512-xw/nNEXafuPSLu8NjjG3+atVVw+8U1APZAQylmwQn19Hgw6rC7QjHvP6MupnHWCrzSm9m0xs5QWkCLuRvBPjgQ==",
-      "dev": true,
-      "dependencies": {
-        "split2": "^0.2.1",
-        "through2": "^0.6.1"
-      }
-    },
-    "node_modules/ldjson-stream/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-      "dev": true
-    },
-    "node_modules/ldjson-stream/node_modules/readable-stream": {
-      "version": "1.0.34",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-      "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/ldjson-stream/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
-      "dev": true
-    },
-    "node_modules/ldjson-stream/node_modules/through2": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-      "integrity": "sha512-RkK/CCESdTKQZHdmKICijdKKsCRVHs5KsLZ6pACAmF/1GPUQhonHSXWNERctxEp7RmvjdNbZTL5z9V7nSCXKcg==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": ">=1.0.33-1 <1.1.0-0",
-        "xtend": ">=4.0.0 <4.1.0-0"
-      }
-    },
-    "node_modules/levn": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/lines-and-columns": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-      "dev": true
-    },
-    "node_modules/loader-runner": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
-      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
-      "engines": {
-        "node": ">=6.11.5"
-      }
-    },
-    "node_modules/loader-utils": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
-      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
-      },
-      "engines": {
-        "node": ">=8.9.0"
-      }
-    },
-    "node_modules/locate-path": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-    },
-    "node_modules/lodash.escaperegexp": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz",
-      "integrity": "sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw=="
-    },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
-    },
-    "node_modules/lodash.truncate": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
-      "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==",
-      "dev": true
-    },
-    "node_modules/log-symbols": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
-      "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/loupe": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.6.tgz",
-      "integrity": "sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==",
-      "dev": true,
-      "dependencies": {
-        "get-func-name": "^2.0.0"
-      }
-    },
-    "node_modules/lower-case": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
-      "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/lowercase-keys": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^3.0.2"
-      }
-    },
-    "node_modules/magic-string": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
-      "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
-      "dependencies": {
-        "sourcemap-codec": "^1.4.8"
-      }
-    },
-    "node_modules/magnific-popup": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/magnific-popup/-/magnific-popup-1.1.0.tgz",
-      "integrity": "sha512-ghSa/1TKsOUL6ZlHfcfFCoB9Wms2nqaDdBEPh6QX9jFYQyMkUu7ciU1mrxedWWq4NM2m1C/llhHKLt6GKRYOzg==",
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/make-error": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
-      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
-      "dev": true
-    },
-    "node_modules/map-obj": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
-      "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/material-design-icons-iconfont": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/material-design-icons-iconfont/-/material-design-icons-iconfont-6.7.0.tgz",
-      "integrity": "sha512-lSj71DgVv20kO0kGbs42icDzbRot61gEDBLQACzkUuznRQBUYmbxzEkGU6dNBb5fRWHMaScYlAXX96HQ4/cJWA=="
-    },
-    "node_modules/mathml-tag-names": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz",
-      "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/md5.js": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
-      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
-      "dev": true,
-      "dependencies": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "node_modules/mdn-data": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
-      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
-      "dev": true
-    },
-    "node_modules/media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/memfs": {
-      "version": "3.4.12",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.12.tgz",
-      "integrity": "sha512-BcjuQn6vfqP+k100e0E9m61Hyqa//Brp+I3f0OBmN0ATHlFA8vx3Lt8z57R3u2bPqe3WGDBC+nF72fTH7isyEw==",
-      "dev": true,
-      "dependencies": {
-        "fs-monkey": "^1.0.3"
-      },
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
-    "node_modules/memory-fs": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz",
-      "integrity": "sha512-+y4mDxU4rvXXu5UDSGCGNiesFmwCHuefGMoPCO1WYucNYj7DsLqrFaa2fXVI0H+NNiPTwwzKwspn9yTZqUGqng==",
-      "dev": true
-    },
-    "node_modules/meow": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
-      "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/minimist": "^1.2.0",
-        "camelcase-keys": "^6.2.2",
-        "decamelize": "^1.2.0",
-        "decamelize-keys": "^1.1.0",
-        "hard-rejection": "^2.1.0",
-        "minimist-options": "4.1.0",
-        "normalize-package-data": "^3.0.0",
-        "read-pkg-up": "^7.0.1",
-        "redent": "^3.0.0",
-        "trim-newlines": "^3.0.0",
-        "type-fest": "^0.18.0",
-        "yargs-parser": "^20.2.3"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/meow/node_modules/yargs-parser": {
-      "version": "20.2.9",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
-      "dev": true
-    },
-    "node_modules/merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
-    },
-    "node_modules/merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-      "dev": true,
-      "dependencies": {
-        "braces": "^3.0.2",
-        "picomatch": "^2.3.1"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/miller-rabin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.0.0",
-        "brorand": "^1.0.1"
-      },
-      "bin": {
-        "miller-rabin": "bin/miller-rabin"
-      }
-    },
-    "node_modules/miller-rabin/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-      "dev": true,
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dependencies": {
-        "mime-db": "1.52.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/mimic-response": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/min-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
-      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/mini-css-extract-plugin": {
-      "version": "2.7.2",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.2.tgz",
-      "integrity": "sha512-EdlUizq13o0Pd+uCp+WO/JpkLvHRVGt97RqfeGhXqAcorYo1ypJSpkV+WDT0vY/kmh/p7wRdJNJtuyK540PXDw==",
-      "dev": true,
-      "dependencies": {
-        "schema-utils": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-      "dev": true
-    },
-    "node_modules/minimalistic-crypto-utils": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-      "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==",
-      "dev": true
-    },
-    "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/minimist": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
-      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/minimist-options": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
-      "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
-      "dev": true,
-      "dependencies": {
-        "arrify": "^1.0.1",
-        "is-plain-obj": "^1.1.0",
-        "kind-of": "^6.0.3"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/mkdirp": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz",
-      "integrity": "sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==",
-      "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/mocha": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-6.2.3.tgz",
-      "integrity": "sha512-0R/3FvjIGH3eEuG17ccFPk117XL2rWxatr81a57D+r/x2uTYZRbdZ4oVidEUMh2W2TJDa7MdAb12Lm2/qrKajg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-colors": "3.2.3",
-        "browser-stdout": "1.3.1",
-        "debug": "3.2.6",
-        "diff": "3.5.0",
-        "escape-string-regexp": "1.0.5",
-        "find-up": "3.0.0",
-        "glob": "7.1.3",
-        "growl": "1.10.5",
-        "he": "1.2.0",
-        "js-yaml": "3.13.1",
-        "log-symbols": "2.2.0",
-        "minimatch": "3.0.4",
-        "mkdirp": "0.5.4",
-        "ms": "2.1.1",
-        "node-environment-flags": "1.0.5",
-        "object.assign": "4.1.0",
-        "strip-json-comments": "2.0.1",
-        "supports-color": "6.0.0",
-        "which": "1.3.1",
-        "wide-align": "1.1.3",
-        "yargs": "13.3.2",
-        "yargs-parser": "13.1.2",
-        "yargs-unparser": "1.6.0"
-      },
-      "bin": {
-        "_mocha": "bin/_mocha",
-        "mocha": "bin/mocha"
-      },
-      "engines": {
-        "node": ">= 6.0.0"
-      }
-    },
-    "node_modules/mocha/node_modules/argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "node_modules/mocha/node_modules/debug": {
-      "version": "3.2.6",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-      "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/mocha/node_modules/find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/mocha/node_modules/js-yaml": {
-      "version": "3.13.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
-      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/mocha/node_modules/locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/mocha/node_modules/minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/mocha/node_modules/ms": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-      "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-      "dev": true
-    },
-    "node_modules/mocha/node_modules/object.assign": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
-      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.2",
-        "function-bind": "^1.1.1",
-        "has-symbols": "^1.0.0",
-        "object-keys": "^1.0.11"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/mocha/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/mocha/node_modules/p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/mocha/node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/mocha/node_modules/sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
-      "dev": true
-    },
-    "node_modules/mocha/node_modules/strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/mocha/node_modules/supports-color": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz",
-      "integrity": "sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/mocha/node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
-      }
-    },
-    "node_modules/modify-source-webpack-plugin": {
-      "version": "2.0.0-beta.7",
-      "resolved": "https://registry.npmjs.org/modify-source-webpack-plugin/-/modify-source-webpack-plugin-2.0.0-beta.7.tgz",
-      "integrity": "sha512-P7CKlGAF+HlinKS5xsIP5wuYwqcpV5eQMpwJYy5yocLAdv2RN5A24orv0Q1DXkbcw5Pd2pCUB4Fo1x9EqfiNeg==",
-      "dev": true,
-      "dependencies": {
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/modify-source-webpack-plugin/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/moment": {
-      "version": "2.29.4",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
-      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/moment-timezone": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.4.1.tgz",
-      "integrity": "sha512-5cNPVUwaVJDCe9JM8m/qz17f9SkaI8rpnRUyDJi2K5HAd6EwhuQ3n5nLclZkNC/qJnomKgQH2TIu70Gy2dxFKA==",
-      "dependencies": {
-        "moment": ">= 2.6.0"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/multicast-dns": {
-      "version": "7.2.5",
-      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
-      "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
-      "dev": true,
-      "dependencies": {
-        "dns-packet": "^5.2.2",
-        "thunky": "^1.0.2"
-      },
-      "bin": {
-        "multicast-dns": "cli.js"
-      }
-    },
-    "node_modules/multimatch": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-5.0.0.tgz",
-      "integrity": "sha512-ypMKuglUrZUD99Tk2bUQ+xNQj43lPEfAeX2o9cTteAmShXy2VHDJpuwu1o0xqoKCt9jLVAvwyFKdLTPXKAfJyA==",
-      "dev": true,
-      "dependencies": {
-        "@types/minimatch": "^3.0.3",
-        "array-differ": "^3.0.0",
-        "array-union": "^2.1.0",
-        "arrify": "^2.0.1",
-        "minimatch": "^3.0.4"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/multimatch/node_modules/@types/minimatch": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
-      "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==",
-      "dev": true
-    },
-    "node_modules/multimatch/node_modules/arrify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
-      "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/nanoid": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
-    "node_modules/natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-      "dev": true
-    },
-    "node_modules/natural-compare-lite": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
-      "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
-      "dev": true
-    },
-    "node_modules/needle": {
-      "version": "2.9.1",
-      "resolved": "https://registry.npmjs.org/needle/-/needle-2.9.1.tgz",
-      "integrity": "sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^3.2.6",
-        "iconv-lite": "^0.4.4",
-        "sax": "^1.2.4"
-      },
-      "bin": {
-        "needle": "bin/needle"
-      },
-      "engines": {
-        "node": ">= 4.4.x"
-      }
-    },
-    "node_modules/needle/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/negotiator": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/neo-async": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
-    },
-    "node_modules/no-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
-      "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
-      "dev": true,
-      "dependencies": {
-        "lower-case": "^2.0.2",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/node-abort-controller": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.0.1.tgz",
-      "integrity": "sha512-/ujIVxthRs+7q6hsdjHMaj8hRG9NuWmwrz+JdRwZ14jdFoKSkm+vDsCbF9PLpnSqjaWQJuTmVtcWHNLr+vrOFw==",
-      "dev": true
-    },
-    "node_modules/node-environment-flags": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.5.tgz",
-      "integrity": "sha512-VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ==",
-      "dev": true,
-      "dependencies": {
-        "object.getownpropertydescriptors": "^2.0.3",
-        "semver": "^5.7.0"
-      }
-    },
-    "node_modules/node-environment-flags/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/node-forge": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
-      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6.13.0"
-      }
-    },
-    "node_modules/node-libs-browser": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
-      "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
-      "dev": true,
-      "dependencies": {
-        "assert": "^1.1.1",
-        "browserify-zlib": "^0.2.0",
-        "buffer": "^4.3.0",
-        "console-browserify": "^1.1.0",
-        "constants-browserify": "^1.0.0",
-        "crypto-browserify": "^3.11.0",
-        "domain-browser": "^1.1.1",
-        "events": "^3.0.0",
-        "https-browserify": "^1.0.0",
-        "os-browserify": "^0.3.0",
-        "path-browserify": "0.0.1",
-        "process": "^0.11.10",
-        "punycode": "^1.2.4",
-        "querystring-es3": "^0.2.0",
-        "readable-stream": "^2.3.3",
-        "stream-browserify": "^2.0.1",
-        "stream-http": "^2.7.2",
-        "string_decoder": "^1.0.0",
-        "timers-browserify": "^2.0.4",
-        "tty-browserify": "0.0.0",
-        "url": "^0.11.0",
-        "util": "^0.11.0",
-        "vm-browserify": "^1.0.1"
-      }
-    },
-    "node_modules/node-libs-browser/node_modules/punycode": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
-      "dev": true
-    },
-    "node_modules/node-releases": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.8.tgz",
-      "integrity": "sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A=="
-    },
-    "node_modules/normalize-package-data": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
-      "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
-      "dev": true,
-      "dependencies": {
-        "hosted-git-info": "^4.0.1",
-        "is-core-module": "^2.5.0",
-        "semver": "^7.3.4",
-        "validate-npm-package-license": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/normalize-package-data/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/normalize-package-data/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/normalize-package-data/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/normalize-range": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-      "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/normalize-url": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
-      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/npm-run-path": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-      "dev": true,
-      "dependencies": {
-        "path-key": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/nth-check": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
-      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
-      "dev": true,
-      "dependencies": {
-        "boolbase": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/nth-check?sponsor=1"
-      }
-    },
-    "node_modules/nwsapi": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.2.tgz",
-      "integrity": "sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==",
-      "dev": true
-    },
-    "node_modules/object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-inspect": {
-      "version": "1.12.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.assign": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "has-symbols": "^1.0.3",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz",
-      "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.getownpropertydescriptors": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.5.tgz",
-      "integrity": "sha512-yDNzckpM6ntyQiGTik1fKV1DcVDRS+w8bvpWNCBanvH5LfRX9O8WTHqQzG4RZwRAM4I0oU7TV11Lj5v0g20ibw==",
-      "dev": true,
-      "dependencies": {
-        "array.prototype.reduce": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
-      "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/obuf": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
-      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
-      "dev": true
-    },
-    "node_modules/on-finished": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
-      "dev": true,
-      "dependencies": {
-        "ee-first": "1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/on-headers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
-    "node_modules/onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "dev": true,
-      "dependencies": {
-        "mimic-fn": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/open": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz",
-      "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==",
-      "dev": true,
-      "dependencies": {
-        "define-lazy-prop": "^2.0.0",
-        "is-docker": "^2.1.1",
-        "is-wsl": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/open-sans-fonts": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/open-sans-fonts/-/open-sans-fonts-1.6.2.tgz",
-      "integrity": "sha512-vsJ6/Mm0TdUKQJqxfkXJy+0K2X0QeRuTmxQq9YE1ycziw6CbDPolDsHhQ6+ImoV/7OTh8K8ZTGklY1Z5nUAwug==",
-      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info."
-    },
-    "node_modules/optionator": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-      "dev": true,
-      "dependencies": {
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0",
-        "word-wrap": "^1.2.3"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/os-browserify": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
-      "integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==",
-      "dev": true
-    },
-    "node_modules/p-cancelable": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
-      "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "dev": true,
-      "dependencies": {
-        "yocto-queue": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-locate": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-map": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
-      "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/p-retry": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz",
-      "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/retry": "0.12.0",
-        "retry": "^0.13.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pako": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
-      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
-      "dev": true
-    },
-    "node_modules/param-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
-      "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
-      "dev": true,
-      "dependencies": {
-        "dot-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
-      "dependencies": {
-        "callsites": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/parse-asn1": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
-      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
-      "dev": true,
-      "dependencies": {
-        "asn1.js": "^5.2.0",
-        "browserify-aes": "^1.0.0",
-        "evp_bytestokey": "^1.0.0",
-        "pbkdf2": "^3.0.3",
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "node_modules/parse-json": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "error-ex": "^1.3.1",
-        "json-parse-even-better-errors": "^2.3.0",
-        "lines-and-columns": "^1.1.6"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/parse5": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
-      "dev": true
-    },
-    "node_modules/parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/pascal-case": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
-      "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
-      "dev": true,
-      "dependencies": {
-        "no-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/path": {
-      "version": "0.12.7",
-      "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz",
-      "integrity": "sha512-aXXC6s+1w7otVF9UletFkFcDsJeO7lSZBPUQhtb5O0xJe8LtYhj/GxldoL09bBj9+ZmE2hNoHqQSFMN5fikh4Q==",
-      "dev": true,
-      "dependencies": {
-        "process": "^0.11.1",
-        "util": "^0.10.3"
-      }
-    },
-    "node_modules/path-browserify": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
-      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
-      "dev": true
-    },
-    "node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-is-inside": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-      "integrity": "sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==",
-      "dev": true
-    },
-    "node_modules/path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
-    },
-    "node_modules/path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==",
-      "dev": true
-    },
-    "node_modules/path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/path/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
-      "dev": true
-    },
-    "node_modules/path/node_modules/util": {
-      "version": "0.10.4",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
-      "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "2.0.3"
-      }
-    },
-    "node_modules/pathval": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
-      "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/pbkdf2": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
-      "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
-      "dev": true,
-      "dependencies": {
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4",
-        "ripemd160": "^2.0.1",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      },
-      "engines": {
-        "node": ">=0.12"
-      }
-    },
-    "node_modules/perfect-scrollbar": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/perfect-scrollbar/-/perfect-scrollbar-1.5.5.tgz",
-      "integrity": "sha512-dzalfutyP3e/FOpdlhVryN4AJ5XDVauVWxybSkLZmakFE2sS3y3pc4JnSprw8tGmHvkaG5Edr5T7LBTZ+WWU2g=="
-    },
-    "node_modules/photoswipe": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/photoswipe/-/photoswipe-4.1.3.tgz",
-      "integrity": "sha512-89Z43IRUyw7ycTolo+AaiDn3W1EEIfox54hERmm9bI12IB9cvRfHSHez3XhAyU8XW2EAFrC+2sKMhh7SJwn0bA==",
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
-    },
-    "node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/pify": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==",
-      "dev": true,
-      "dependencies": {
-        "pinkie": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/popper.js": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
-      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
-      "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/popperjs"
-      }
-    },
-    "node_modules/postcss": {
-      "version": "8.4.20",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.20.tgz",
-      "integrity": "sha512-6Q04AXR1212bXr5fh03u8aAwbLxAQNGQ/Q1LNa0VfOI06ZAlhPHtQvE4OIdpj4kLThXilalPnmDSOD65DcHt+g==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
-        }
-      ],
-      "dependencies": {
-        "nanoid": "^3.3.4",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      }
-    },
-    "node_modules/postcss-attribute-case-insensitive": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.2.tgz",
-      "integrity": "sha512-XIidXV8fDr0kKt28vqki84fRK8VW8eTuIa4PChv2MqKuT6C9UjmSKzen6KaWhWEoYvwxFCa7n/tC1SZ3tyq4SQ==",
-      "dev": true,
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.10"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-clamp": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-clamp/-/postcss-clamp-4.1.0.tgz",
-      "integrity": "sha512-ry4b1Llo/9zz+PKC+030KUnPITTJAHeOwjfAyyB60eT0AorGLdzp52s31OsPRHRf8NchkgFoG2y6fCfn1IV1Ow==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": ">=7.6.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4.6"
-      }
-    },
-    "node_modules/postcss-color-functional-notation": {
-      "version": "4.2.4",
-      "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.4.tgz",
-      "integrity": "sha512-2yrTAUZUab9s6CpxkxC4rVgFEVaR6/2Pipvi6qcgvnYiVqZcbDHEoBDhrXzyb7Efh2CCfHQNtcqWcIruDTIUeg==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-color-hex-alpha": {
-      "version": "8.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.4.tgz",
-      "integrity": "sha512-nLo2DCRC9eE4w2JmuKgVA3fGL3d01kGq752pVALF68qpGLmx2Qrk91QTKkdUqqp45T1K1XV8IhQpcu1hoAQflQ==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
-      }
-    },
-    "node_modules/postcss-color-rebeccapurple": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.1.1.tgz",
-      "integrity": "sha512-pGxkuVEInwLHgkNxUc4sdg4g3py7zUeCQ9sMfwyHAT+Ezk8a4OaaVZ8lIY5+oNqA/BXXgLyXv0+5wHP68R79hg==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-custom-media": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-8.0.2.tgz",
-      "integrity": "sha512-7yi25vDAoHAkbhAzX9dHx2yc6ntS4jQvejrNcC+csQJAXjj15e7VcWfMgLqBNAbOvqi5uIa9huOVwdHbf+sKqg==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.3"
-      }
-    },
-    "node_modules/postcss-custom-properties": {
-      "version": "12.1.11",
-      "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.11.tgz",
-      "integrity": "sha512-0IDJYhgU8xDv1KY6+VgUwuQkVtmYzRwu+dMjnmdMafXYv86SWqfxkc7qdDvWS38vsjaEtv8e0vGOUQrAiMBLpQ==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-custom-selectors": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-6.0.3.tgz",
-      "integrity": "sha512-fgVkmyiWDwmD3JbpCmB45SvvlCD6z9CG6Ie6Iere22W5aHea6oWa7EM2bpnv2Fj3I94L3VbtvX9KqwSi5aFzSg==",
-      "dev": true,
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.4"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.3"
-      }
-    },
-    "node_modules/postcss-dir-pseudo-class": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.5.tgz",
-      "integrity": "sha512-eqn4m70P031PF7ZQIvSgy9RSJ5uI2171O/OO/zcRNYpJbvaeKFUlar1aJ7rmgiQtbm0FSPsRewjpdS0Oew7MPA==",
-      "dev": true,
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.10"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-double-position-gradients": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.2.tgz",
-      "integrity": "sha512-GX+FuE/uBR6eskOK+4vkXgT6pDkexLokPaz/AbJna9s5Kzp/yl488pKPjhy0obB475ovfT1Wv8ho7U/cHNaRgQ==",
-      "dev": true,
-      "dependencies": {
-        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-env-function": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-4.0.6.tgz",
-      "integrity": "sha512-kpA6FsLra+NqcFnL81TnsU+Z7orGtDTxcOhl6pwXeEq1yFPpRMkCDpHhrz8CFQDr/Wfm0jLiNQ1OsGGPjlqPwA==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
-      }
-    },
-    "node_modules/postcss-focus-visible": {
-      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-6.0.4.tgz",
-      "integrity": "sha512-QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw==",
-      "dev": true,
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.9"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
-      }
-    },
-    "node_modules/postcss-focus-within": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-5.0.4.tgz",
-      "integrity": "sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ==",
-      "dev": true,
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.9"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
-      }
-    },
-    "node_modules/postcss-font-variant": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz",
-      "integrity": "sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==",
-      "dev": true,
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-gap-properties": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.5.tgz",
-      "integrity": "sha512-IuE6gKSdoUNcvkGIqdtjtcMtZIFyXZhmFd5RUlg97iVEvp1BZKV5ngsAjCjrVy+14uhGBQl9tzmi1Qwq4kqVOg==",
-      "dev": true,
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-image-set-function": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-4.0.7.tgz",
-      "integrity": "sha512-9T2r9rsvYzm5ndsBE8WgtrMlIT7VbtTfE7b3BQnudUqnBcBo7L758oc+o+pdj/dUV0l5wjwSdjeOH2DZtfv8qw==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-initial": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-4.0.1.tgz",
-      "integrity": "sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==",
-      "dev": true,
-      "peerDependencies": {
-        "postcss": "^8.0.0"
-      }
-    },
-    "node_modules/postcss-lab-function": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-4.2.1.tgz",
-      "integrity": "sha512-xuXll4isR03CrQsmxyz92LJB2xX9n+pZJ5jE9JgcnmsCammLyKdlzrBin+25dy6wIjfhJpKBAN80gsTlCgRk2w==",
-      "dev": true,
-      "dependencies": {
-        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-loader": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.0.2.tgz",
-      "integrity": "sha512-fUJzV/QH7NXUAqV8dWJ9Lg4aTkDCezpTS5HgJ2DvqznexTbSTxgi/dTECvTZ15BwKTtk8G/bqI/QTu2HPd3ZCg==",
-      "dev": true,
-      "dependencies": {
-        "cosmiconfig": "^7.0.0",
-        "klona": "^2.0.5",
-        "semver": "^7.3.8"
-      },
-      "engines": {
-        "node": ">= 14.15.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "postcss": "^7.0.0 || ^8.0.1",
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/postcss-loader/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/postcss-loader/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/postcss-loader/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/postcss-logical": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-5.0.4.tgz",
-      "integrity": "sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==",
-      "dev": true,
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
-      }
-    },
-    "node_modules/postcss-media-minmax": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz",
-      "integrity": "sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-media-query-parser": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
-      "integrity": "sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==",
-      "dev": true
-    },
-    "node_modules/postcss-modules-extract-imports": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
-      "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
-      "dev": true,
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-modules-local-by-default": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz",
-      "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==",
-      "dev": true,
-      "dependencies": {
-        "icss-utils": "^5.0.0",
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.1.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-modules-scope": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
-      "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
-      "dev": true,
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.4"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-modules-values": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
-      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
-      "dev": true,
-      "dependencies": {
-        "icss-utils": "^5.0.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-nesting": {
-      "version": "10.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.2.0.tgz",
-      "integrity": "sha512-EwMkYchxiDiKUhlJGzWsD9b2zvq/r2SSubcRrgP+jujMXFzqvANLt16lJANC+5uZ6hjI7lpRmI6O8JIl+8l1KA==",
-      "dev": true,
-      "dependencies": {
-        "@csstools/selector-specificity": "^2.0.0",
-        "postcss-selector-parser": "^6.0.10"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-opacity-percentage": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/postcss-opacity-percentage/-/postcss-opacity-percentage-1.1.3.tgz",
-      "integrity": "sha512-An6Ba4pHBiDtyVpSLymUUERMo2cU7s+Obz6BTrS+gxkbnSBNKSuD0AVUc+CpBMrpVPKKfoVz0WQCX+Tnst0i4A==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "kofi",
-          "url": "https://ko-fi.com/mrcgrtz"
-        },
-        {
-          "type": "liberapay",
-          "url": "https://liberapay.com/mrcgrtz"
-        }
-      ],
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-overflow-shorthand": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.4.tgz",
-      "integrity": "sha512-otYl/ylHK8Y9bcBnPLo3foYFLL6a6Ak+3EQBPOTR7luMYCOsiVTUk1iLvNf6tVPNGXcoL9Hoz37kpfriRIFb4A==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-page-break": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-3.0.4.tgz",
-      "integrity": "sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==",
-      "dev": true,
-      "peerDependencies": {
-        "postcss": "^8"
-      }
-    },
-    "node_modules/postcss-place": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-place/-/postcss-place-7.0.5.tgz",
-      "integrity": "sha512-wR8igaZROA6Z4pv0d+bvVrvGY4GVHihBCBQieXFY3kuSuMyOmEnnfFzHl/tQuqHZkfkIVBEbDvYcFfHmpSet9g==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-preset-env": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.8.3.tgz",
-      "integrity": "sha512-T1LgRm5uEVFSEF83vHZJV2z19lHg4yJuZ6gXZZkqVsqv63nlr6zabMH3l4Pc01FQCyfWVrh2GaUeCVy9Po+Aag==",
-      "dev": true,
-      "dependencies": {
-        "@csstools/postcss-cascade-layers": "^1.1.1",
-        "@csstools/postcss-color-function": "^1.1.1",
-        "@csstools/postcss-font-format-keywords": "^1.0.1",
-        "@csstools/postcss-hwb-function": "^1.0.2",
-        "@csstools/postcss-ic-unit": "^1.0.1",
-        "@csstools/postcss-is-pseudo-class": "^2.0.7",
-        "@csstools/postcss-nested-calc": "^1.0.0",
-        "@csstools/postcss-normalize-display-values": "^1.0.1",
-        "@csstools/postcss-oklab-function": "^1.1.1",
-        "@csstools/postcss-progressive-custom-properties": "^1.3.0",
-        "@csstools/postcss-stepped-value-functions": "^1.0.1",
-        "@csstools/postcss-text-decoration-shorthand": "^1.0.0",
-        "@csstools/postcss-trigonometric-functions": "^1.0.2",
-        "@csstools/postcss-unset-value": "^1.0.2",
-        "autoprefixer": "^10.4.13",
-        "browserslist": "^4.21.4",
-        "css-blank-pseudo": "^3.0.3",
-        "css-has-pseudo": "^3.0.4",
-        "css-prefers-color-scheme": "^6.0.3",
-        "cssdb": "^7.1.0",
-        "postcss-attribute-case-insensitive": "^5.0.2",
-        "postcss-clamp": "^4.1.0",
-        "postcss-color-functional-notation": "^4.2.4",
-        "postcss-color-hex-alpha": "^8.0.4",
-        "postcss-color-rebeccapurple": "^7.1.1",
-        "postcss-custom-media": "^8.0.2",
-        "postcss-custom-properties": "^12.1.10",
-        "postcss-custom-selectors": "^6.0.3",
-        "postcss-dir-pseudo-class": "^6.0.5",
-        "postcss-double-position-gradients": "^3.1.2",
-        "postcss-env-function": "^4.0.6",
-        "postcss-focus-visible": "^6.0.4",
-        "postcss-focus-within": "^5.0.4",
-        "postcss-font-variant": "^5.0.0",
-        "postcss-gap-properties": "^3.0.5",
-        "postcss-image-set-function": "^4.0.7",
-        "postcss-initial": "^4.0.1",
-        "postcss-lab-function": "^4.2.1",
-        "postcss-logical": "^5.0.4",
-        "postcss-media-minmax": "^5.0.0",
-        "postcss-nesting": "^10.2.0",
-        "postcss-opacity-percentage": "^1.1.2",
-        "postcss-overflow-shorthand": "^3.0.4",
-        "postcss-page-break": "^3.0.4",
-        "postcss-place": "^7.0.5",
-        "postcss-pseudo-class-any-link": "^7.1.6",
-        "postcss-replace-overflow-wrap": "^4.0.0",
-        "postcss-selector-not": "^6.0.1",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-pseudo-class-any-link": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.6.tgz",
-      "integrity": "sha512-9sCtZkO6f/5ML9WcTLcIyV1yz9D1rf0tWc+ulKcvV30s0iZKS/ONyETvoWsr6vnrmW+X+KmuK3gV/w5EWnT37w==",
-      "dev": true,
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.10"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-replace-overflow-wrap": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz",
-      "integrity": "sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==",
-      "dev": true,
-      "peerDependencies": {
-        "postcss": "^8.0.3"
-      }
-    },
-    "node_modules/postcss-resolve-nested-selector": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz",
-      "integrity": "sha512-HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw==",
-      "dev": true
-    },
-    "node_modules/postcss-safe-parser": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz",
-      "integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
-      },
-      "peerDependencies": {
-        "postcss": "^8.3.3"
-      }
-    },
-    "node_modules/postcss-scss": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.6.tgz",
-      "integrity": "sha512-rLDPhJY4z/i4nVFZ27j9GqLxj1pwxE80eAzUNRMXtcpipFYIeowerzBgG3yJhMtObGEXidtIgbUpQ3eLDsf5OQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss-scss"
-        }
-      ],
-      "engines": {
-        "node": ">=12.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4.19"
-      }
-    },
-    "node_modules/postcss-selector-not": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-6.0.1.tgz",
-      "integrity": "sha512-1i9affjAe9xu/y9uqWH+tD4r6/hDaXJruk8xn2x1vzxC2U3J3LKO3zJW4CyxlNhA56pADJ/djpEwpH1RClI2rQ==",
-      "dev": true,
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.10"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-selector-parser": {
-      "version": "6.0.11",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz",
-      "integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==",
-      "dev": true,
-      "dependencies": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss-sorting": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-7.0.1.tgz",
-      "integrity": "sha512-iLBFYz6VRYyLJEJsBJ8M3TCqNcckVzz4wFounSc5Oez35ogE/X+aoC5fFu103Ot7NyvjU3/xqIXn93Gp3kJk4g==",
-      "dev": true,
-      "peerDependencies": {
-        "postcss": "^8.3.9"
-      }
-    },
-    "node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/prelude-ls": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/prestakit": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/prestakit/-/prestakit-1.2.6.tgz",
-      "integrity": "sha512-eE6sLXoFyrP1f28ZfU2cRE3ZynZQl9aCvxy8bUTcQH8cidg7PGrNw7w2dFvXmPCvxsTOPy0pAV0SrL+c9U4muQ==",
-      "dependencies": {
-        "@ttskch/select2-bootstrap4-theme": "^1.5.2",
-        "bootstrap": "^4.4.1",
-        "jquery.growl": "^1.3.5",
-        "material-design-icons-iconfont": "^6.7.0",
-        "open-sans-fonts": "^1.6.2",
-        "select2": "^4.0.5"
-      }
-    },
-    "node_modules/pretty-error": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz",
-      "integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==",
-      "dev": true,
-      "dependencies": {
-        "lodash": "^4.17.20",
-        "renderkid": "^3.0.0"
-      }
-    },
-    "node_modules/process": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6.0"
-      }
-    },
-    "node_modules/process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-      "dev": true
-    },
-    "node_modules/proxy-addr": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
-      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
-      "dev": true,
-      "dependencies": {
-        "forwarded": "0.2.0",
-        "ipaddr.js": "1.9.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/proxy-addr/node_modules/ipaddr.js": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/psl": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
-      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
-      "dev": true
-    },
-    "node_modules/public-encrypt": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
-      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "parse-asn1": "^5.0.0",
-        "randombytes": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "node_modules/public-encrypt/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "node_modules/punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/qs": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
-      "dev": true,
-      "dependencies": {
-        "side-channel": "^1.0.4"
-      },
-      "engines": {
-        "node": ">=0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/querystring": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==",
-      "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
-    "node_modules/querystring-es3": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-      "integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
-    "node_modules/querystringify": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
-      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
-      "dev": true
-    },
-    "node_modules/queue-microtask": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/quick-lru": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
-      "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/randombytes": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dependencies": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "node_modules/randomfill": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-      "dev": true,
-      "dependencies": {
-        "randombytes": "^2.0.5",
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "node_modules/range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/raw-body": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
-      "dev": true,
-      "dependencies": {
-        "bytes": "3.1.2",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/raw-body/node_modules/bytes": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/read-pkg": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
-      "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
-      "dev": true,
-      "dependencies": {
-        "@types/normalize-package-data": "^2.4.0",
-        "normalize-package-data": "^2.5.0",
-        "parse-json": "^5.0.0",
-        "type-fest": "^0.6.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg-up": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
-      "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^4.1.0",
-        "read-pkg": "^5.2.0",
-        "type-fest": "^0.8.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg/node_modules/hosted-git-info": {
-      "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-      "dev": true
-    },
-    "node_modules/read-pkg/node_modules/normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-      "dev": true,
-      "dependencies": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
-      }
-    },
-    "node_modules/read-pkg/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/read-pkg/node_modules/type-fest": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-      "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/readable-stream/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
-    },
-    "node_modules/readable-stream/node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "node_modules/readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "dev": true,
-      "dependencies": {
-        "picomatch": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      }
-    },
-    "node_modules/rechoir": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz",
-      "integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==",
-      "dev": true,
-      "dependencies": {
-        "resolve": "^1.20.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      }
-    },
-    "node_modules/redent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
-      "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
-      "dev": true,
-      "dependencies": {
-        "indent-string": "^4.0.0",
-        "strip-indent": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/regexp.prototype.flags": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "functions-have-names": "^1.2.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/regexpp": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      }
-    },
-    "node_modules/relateurl": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
-      "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/renderkid": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz",
-      "integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==",
-      "dev": true,
-      "dependencies": {
-        "css-select": "^4.1.3",
-        "dom-converter": "^0.2.0",
-        "htmlparser2": "^6.1.0",
-        "lodash": "^4.17.21",
-        "strip-ansi": "^6.0.1"
-      }
-    },
-    "node_modules/renderkid/node_modules/entities": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
-    "node_modules/renderkid/node_modules/htmlparser2": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
-      "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
-      "dev": true,
-      "funding": [
-        "https://github.com/fb55/htmlparser2?sponsor=1",
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ],
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.0.0",
-        "domutils": "^2.5.2",
-        "entities": "^2.0.0"
-      }
-    },
-    "node_modules/require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/require-from-string": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/require-main-filename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-      "dev": true
-    },
-    "node_modules/requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
-      "dev": true
-    },
-    "node_modules/resize-observer-polyfill": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
-      "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
-    },
-    "node_modules/resolve": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
-      "dev": true,
-      "dependencies": {
-        "is-core-module": "^2.9.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/resolve-alpn": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
-      "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g=="
-    },
-    "node_modules/resolve-cwd": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
-      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
-      "dev": true,
-      "dependencies": {
-        "resolve-from": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/resolve-cwd/node_modules/resolve-from": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/responselike": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",
-      "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==",
-      "dependencies": {
-        "lowercase-keys": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/retry": {
-      "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
-      "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-      "dev": true,
-      "engines": {
-        "iojs": ">=1.0.0",
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/ripemd160": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-      "dev": true,
-      "dependencies": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
-      }
-    },
-    "node_modules/run-parallel": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "queue-microtask": "^1.2.2"
-      }
-    },
-    "node_modules/rxjs": {
-      "version": "7.8.0",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.0.tgz",
-      "integrity": "sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/safe-regex-test": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
-      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
-        "is-regex": "^1.1.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
-    },
-    "node_modules/sass-embedded": {
-      "version": "1.57.1",
-      "resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.57.1.tgz",
-      "integrity": "sha512-O0s796x76bRSJIdmJ4lrK+zJLtF3XeP+0tbJzR4NAPSDnWqHLk2boUYSdfx4DnF4x9rGmcVlMWFE8UvnLMNCmw==",
-      "dev": true,
-      "dependencies": {
-        "buffer-builder": "^0.2.0",
-        "google-protobuf": "^3.11.4",
-        "immutable": "^4.0.0",
-        "rxjs": "^7.4.0",
-        "supports-color": "^8.1.1"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      },
-      "optionalDependencies": {
-        "sass-embedded-darwin-arm64": "1.57.1",
-        "sass-embedded-darwin-x64": "1.57.1",
-        "sass-embedded-linux-arm": "1.57.1",
-        "sass-embedded-linux-arm64": "1.57.1",
-        "sass-embedded-linux-ia32": "1.57.1",
-        "sass-embedded-linux-x64": "1.57.1",
-        "sass-embedded-win32-ia32": "1.57.1",
-        "sass-embedded-win32-x64": "1.57.1"
-      }
-    },
-    "node_modules/sass-embedded-darwin-arm64": {
-      "version": "1.57.1",
-      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-arm64/-/sass-embedded-darwin-arm64-1.57.1.tgz",
-      "integrity": "sha512-YSfrLZkM2HdXETQdSznv2DN2GdkmBNWLAlHfDWe0toSEIB2C2YGuoqHYZtl6PBYqu8k8FH4TDyct8VzoIa+rMw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/sass-embedded-darwin-x64": {
-      "version": "1.57.1",
-      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-x64/-/sass-embedded-darwin-x64-1.57.1.tgz",
-      "integrity": "sha512-xq2Au8CRLHQ+MqH2p8gQn9rYGtfQ8voCWMRz7klYmmh5kXHFjefG3opPPB8mJeSc3SIqE35SQxQEIhUbsxozpg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/sass-embedded-linux-arm": {
-      "version": "1.57.1",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm/-/sass-embedded-linux-arm-1.57.1.tgz",
-      "integrity": "sha512-s+roBIgiQSg8124JmYmiSw4THWRvkF2BOclBZCb+OFLa8ZTak2WZdGs0PhqkMmZypxQ7cewh9ts+sOWN24yIrw==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/sass-embedded-linux-arm64": {
-      "version": "1.57.1",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm64/-/sass-embedded-linux-arm64-1.57.1.tgz",
-      "integrity": "sha512-R0GqVqf0xEhQ5nDbj7vqmKw+/1kqiURNBl0pD4uv4inBed2YKg+7agn7Y5XE5GUWbgOz7ubjL2kt4Glr7K7xeA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/sass-embedded-linux-ia32": {
-      "version": "1.57.1",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-ia32/-/sass-embedded-linux-ia32-1.57.1.tgz",
-      "integrity": "sha512-gKqMpfcjrW4S1m+cuRn88oUkr/HMv48CqyCHnfGCsrkTpIft33a1ZKW2jWm09rwmR0g/G6yGstoQO0iHWJWxuQ==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/sass-embedded-linux-x64": {
-      "version": "1.57.1",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-x64/-/sass-embedded-linux-x64-1.57.1.tgz",
-      "integrity": "sha512-AI6CrcuLWP22RXhVrZUN2JfdQ7YdFR30dA4twYwp/Q4hUfj85dJrVD5ORi8G04haMWPOQiFV6pBcMgzpiY2Bog==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/sass-embedded-win32-ia32": {
-      "version": "1.57.1",
-      "resolved": "https://registry.npmjs.org/sass-embedded-win32-ia32/-/sass-embedded-win32-ia32-1.57.1.tgz",
-      "integrity": "sha512-s7EhJLG9AnJNBga3I+W0rk6y/1n/i0XD34rvqR3yJgBhNKkI5rVCxFN7FAcGR50vQQbCO1MrUCmuVvld+2qvyQ==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/sass-embedded-win32-x64": {
-      "version": "1.57.1",
-      "resolved": "https://registry.npmjs.org/sass-embedded-win32-x64/-/sass-embedded-win32-x64-1.57.1.tgz",
-      "integrity": "sha512-b/Kgz7ADPTlPITk8e47Zf3eiuXlTGhi/eWsAoesUmkjR7jayvFNLHPhThgiRAxkzT6UlWI3Dzr+E3OBqUjegEg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/sass-embedded/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/sass-embedded/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
-      }
-    },
-    "node_modules/sass-loader": {
-      "version": "13.2.0",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.2.0.tgz",
-      "integrity": "sha512-JWEp48djQA4nbZxmgC02/Wh0eroSUutulROUusYJO9P9zltRbNN80JCBHqRGzjd4cmZCa/r88xgfkjGD0TXsHg==",
-      "dev": true,
-      "dependencies": {
-        "klona": "^2.0.4",
-        "neo-async": "^2.6.2"
-      },
-      "engines": {
-        "node": ">= 14.15.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "fibers": ">= 3.1.0",
-        "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0",
-        "sass": "^1.3.0",
-        "sass-embedded": "*",
-        "webpack": "^5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "fibers": {
-          "optional": true
-        },
-        "node-sass": {
-          "optional": true
-        },
-        "sass": {
-          "optional": true
-        },
-        "sass-embedded": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-      "dev": true
-    },
-    "node_modules/saxes": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
-      "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
-      "dev": true,
-      "dependencies": {
-        "xmlchars": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/schema-utils": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-      "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "ajv": "^8.8.0",
-        "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.0.0"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/schema-utils/node_modules/ajv": {
-      "version": "8.11.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.2.tgz",
-      "integrity": "sha512-E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/schema-utils/node_modules/ajv-keywords": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3"
-      },
-      "peerDependencies": {
-        "ajv": "^8.8.2"
-      }
-    },
-    "node_modules/schema-utils/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true
-    },
-    "node_modules/select-hose": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
-      "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==",
-      "dev": true
-    },
-    "node_modules/select2": {
-      "version": "4.0.13",
-      "resolved": "https://registry.npmjs.org/select2/-/select2-4.0.13.tgz",
-      "integrity": "sha512-1JeB87s6oN/TDxQQYCvS5EFoQyvV6eYMZZ0AeA4tdFDYWN3BAGZ8npr17UBFddU0lgAt3H0yjX3X6/ekOj1yjw=="
-    },
-    "node_modules/selfsigned": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz",
-      "integrity": "sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==",
-      "dev": true,
-      "dependencies": {
-        "node-forge": "^1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/send": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
-      "dev": true,
-      "dependencies": {
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "mime": "1.6.0",
-        "ms": "2.1.3",
-        "on-finished": "2.4.1",
-        "range-parser": "~1.2.1",
-        "statuses": "2.0.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/send/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/send/node_modules/debug/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/send/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-      "dev": true
-    },
-    "node_modules/serialize-javascript": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
-      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
-      "dependencies": {
-        "randombytes": "^2.1.0"
-      }
-    },
-    "node_modules/serve-index": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
-      "dev": true,
-      "dependencies": {
-        "accepts": "~1.3.4",
-        "batch": "0.6.1",
-        "debug": "2.6.9",
-        "escape-html": "~1.0.3",
-        "http-errors": "~1.6.2",
-        "mime-types": "~2.1.17",
-        "parseurl": "~1.3.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/serve-index/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/serve-index/node_modules/depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/serve-index/node_modules/http-errors": {
-      "version": "1.6.3",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-      "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
-      "dev": true,
-      "dependencies": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.0",
-        "statuses": ">= 1.4.0 < 2"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/serve-index/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
-      "dev": true
-    },
-    "node_modules/serve-index/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/serve-index/node_modules/setprototypeof": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-      "dev": true
-    },
-    "node_modules/serve-index/node_modules/statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/serve-static": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
-      "dev": true,
-      "dependencies": {
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "parseurl": "~1.3.3",
-        "send": "0.18.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
-      "dev": true
-    },
-    "node_modules/setimmediate": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-      "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==",
-      "dev": true
-    },
-    "node_modules/setprototypeof": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
-      "dev": true
-    },
-    "node_modules/sha.js": {
-      "version": "2.4.11",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      },
-      "bin": {
-        "sha.js": "bin.js"
-      }
-    },
-    "node_modules/shallow-clone": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
-      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dev": true,
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "dev": true
-    },
-    "node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/slice-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
-      }
-    },
-    "node_modules/slice-ansi/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/slice-ansi/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/slice-ansi/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/sockjs": {
-      "version": "0.3.24",
-      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
-      "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
-      "dev": true,
-      "dependencies": {
-        "faye-websocket": "^0.11.3",
-        "uuid": "^8.3.2",
-        "websocket-driver": "^0.7.4"
-      }
-    },
-    "node_modules/source-list-map": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
-      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
-      "dev": true
-    },
-    "node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-js": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-support": {
-      "version": "0.5.21",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      }
-    },
-    "node_modules/sourcemap-codec": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
-      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
-      "deprecated": "Please use @jridgewell/sourcemap-codec instead"
-    },
-    "node_modules/spdx-correct": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
-      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
-      "dev": true,
-      "dependencies": {
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-exceptions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
-      "dev": true
-    },
-    "node_modules/spdx-expression-parse": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
-      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
-      "dev": true,
-      "dependencies": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-expression-validate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/spdx-expression-validate/-/spdx-expression-validate-2.0.0.tgz",
-      "integrity": "sha512-b3wydZLM+Tc6CFvaRDBOF9d76oGIHNCLYFeHbftFXUWjnfZWganmDmvtM5sm1cRwJc/VDBMLyGGrsLFd1vOxbg==",
-      "dev": true,
-      "dependencies": {
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-license-ids": {
-      "version": "3.0.12",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz",
-      "integrity": "sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==",
-      "dev": true
-    },
-    "node_modules/spdy": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
-      "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.1.0",
-        "handle-thing": "^2.0.0",
-        "http-deceiver": "^1.2.7",
-        "select-hose": "^2.0.0",
-        "spdy-transport": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/spdy-transport": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
-      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.1.0",
-        "detect-node": "^2.0.4",
-        "hpack.js": "^2.1.6",
-        "obuf": "^1.1.2",
-        "readable-stream": "^3.0.6",
-        "wbuf": "^1.7.3"
-      }
-    },
-    "node_modules/spdy-transport/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/split2": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/split2/-/split2-0.2.1.tgz",
-      "integrity": "sha512-D/oTExYAkC9nWleOCTOyNmAuzfAT/6rHGBA9LIK7FVnGo13CSvrKCUzKenwH6U1s2znY9MqH6v0UQTEDa3vJmg==",
-      "dev": true,
-      "dependencies": {
-        "through2": "~0.6.1"
-      }
-    },
-    "node_modules/split2/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-      "dev": true
-    },
-    "node_modules/split2/node_modules/readable-stream": {
-      "version": "1.0.34",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-      "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/split2/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
-      "dev": true
-    },
-    "node_modules/split2/node_modules/through2": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-      "integrity": "sha512-RkK/CCESdTKQZHdmKICijdKKsCRVHs5KsLZ6pACAmF/1GPUQhonHSXWNERctxEp7RmvjdNbZTL5z9V7nSCXKcg==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": ">=1.0.33-1 <1.1.0-0",
-        "xtend": ">=4.0.0 <4.1.0-0"
-      }
-    },
-    "node_modules/sprintf-js": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
-      "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="
-    },
-    "node_modules/statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/stream-browserify": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
-      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "~2.0.1",
-        "readable-stream": "^2.0.2"
-      }
-    },
-    "node_modules/stream-http": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
-      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
-      "dev": true,
-      "dependencies": {
-        "builtin-status-codes": "^3.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.3.6",
-        "to-arraybuffer": "^1.0.0",
-        "xtend": "^4.0.0"
-      }
-    },
-    "node_modules/string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
-    "node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/string.prototype.trimend": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
-      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimstart": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
-      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/strip-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-comments/-/strip-comments-2.0.1.tgz",
-      "integrity": "sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/strip-final-newline": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/strip-indent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
-      "dev": true,
-      "dependencies": {
-        "min-indent": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/style-loader": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.1.tgz",
-      "integrity": "sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/style-search": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
-      "integrity": "sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg==",
-      "dev": true
-    },
-    "node_modules/stylelint": {
-      "version": "14.16.0",
-      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.16.0.tgz",
-      "integrity": "sha512-X6uTi9DcxjzLV8ZUAjit1vsRtSwcls0nl07c9rqOPzvpA8IvTX/xWEkBRowS0ffevRrqkHa/ThDEu86u73FQDg==",
-      "dev": true,
-      "dependencies": {
-        "@csstools/selector-specificity": "^2.0.2",
-        "balanced-match": "^2.0.0",
-        "colord": "^2.9.3",
-        "cosmiconfig": "^7.1.0",
-        "css-functions-list": "^3.1.0",
-        "debug": "^4.3.4",
-        "fast-glob": "^3.2.12",
-        "fastest-levenshtein": "^1.0.16",
-        "file-entry-cache": "^6.0.1",
-        "global-modules": "^2.0.0",
-        "globby": "^11.1.0",
-        "globjoin": "^0.1.4",
-        "html-tags": "^3.2.0",
-        "ignore": "^5.2.1",
-        "import-lazy": "^4.0.0",
-        "imurmurhash": "^0.1.4",
-        "is-plain-object": "^5.0.0",
-        "known-css-properties": "^0.26.0",
-        "mathml-tag-names": "^2.1.3",
-        "meow": "^9.0.0",
-        "micromatch": "^4.0.5",
-        "normalize-path": "^3.0.0",
-        "picocolors": "^1.0.0",
-        "postcss": "^8.4.19",
-        "postcss-media-query-parser": "^0.2.3",
-        "postcss-resolve-nested-selector": "^0.1.1",
-        "postcss-safe-parser": "^6.0.0",
-        "postcss-selector-parser": "^6.0.11",
-        "postcss-value-parser": "^4.2.0",
-        "resolve-from": "^5.0.0",
-        "string-width": "^4.2.3",
-        "strip-ansi": "^6.0.1",
-        "style-search": "^0.1.0",
-        "supports-hyperlinks": "^2.3.0",
-        "svg-tags": "^1.0.0",
-        "table": "^6.8.1",
-        "v8-compile-cache": "^2.3.0",
-        "write-file-atomic": "^4.0.2"
-      },
-      "bin": {
-        "stylelint": "bin/stylelint.js"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/stylelint"
-      }
-    },
-    "node_modules/stylelint-config-prestashop": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/stylelint-config-prestashop/-/stylelint-config-prestashop-1.0.7.tgz",
-      "integrity": "sha512-Ac2D15Jsk/zOmHJ4mu5g29bLQFkOmuSKGE/n8Scjs6YAOL/7QRhq26hXzlZ21+VMFi2bqKdjzqmYKbhgUHGpCA==",
-      "dev": true,
-      "dependencies": {
-        "stylelint-config-twbs-bootstrap": "^3.0.1",
-        "stylelint-no-unsupported-browser-features": "^5.0.1"
-      }
-    },
-    "node_modules/stylelint-config-recess-order": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-recess-order/-/stylelint-config-recess-order-3.1.0.tgz",
-      "integrity": "sha512-LXR6zD5O9cS1a9gbLbuKvWLs7qmHj4xm5MQ5KhhwZPMhtQP9da3F6Jsp/NAUdsAwDQEnT1ShU16YVdgN6p4a/w==",
-      "dev": true,
-      "dependencies": {
-        "stylelint-order": "5.x"
-      },
-      "peerDependencies": {
-        "stylelint": ">=14"
-      }
-    },
-    "node_modules/stylelint-config-recommended": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-7.0.0.tgz",
-      "integrity": "sha512-yGn84Bf/q41J4luis1AZ95gj0EQwRX8lWmGmBwkwBNSkpGSpl66XcPTulxGa/Z91aPoNGuIGBmFkcM1MejMo9Q==",
-      "dev": true,
-      "peerDependencies": {
-        "stylelint": "^14.4.0"
-      }
-    },
-    "node_modules/stylelint-config-recommended-scss": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-5.0.2.tgz",
-      "integrity": "sha512-b14BSZjcwW0hqbzm9b0S/ScN2+3CO3O4vcMNOw2KGf8lfVSwJ4p5TbNEXKwKl1+0FMtgRXZj6DqVUe/7nGnuBg==",
-      "dev": true,
-      "dependencies": {
-        "postcss-scss": "^4.0.2",
-        "stylelint-config-recommended": "^6.0.0",
-        "stylelint-scss": "^4.0.0"
-      },
-      "peerDependencies": {
-        "stylelint": "^14.0.0"
-      }
-    },
-    "node_modules/stylelint-config-recommended-scss/node_modules/stylelint-config-recommended": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-6.0.0.tgz",
-      "integrity": "sha512-ZorSSdyMcxWpROYUvLEMm0vSZud2uB7tX1hzBZwvVY9SV/uly4AvvJPPhCcymZL3fcQhEQG5AELmrxWqtmzacw==",
-      "dev": true,
-      "peerDependencies": {
-        "stylelint": "^14.0.0"
-      }
-    },
-    "node_modules/stylelint-config-standard": {
-      "version": "25.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-25.0.0.tgz",
-      "integrity": "sha512-21HnP3VSpaT1wFjFvv9VjvOGDtAviv47uTp3uFmzcN+3Lt+RYRv6oAplLaV51Kf792JSxJ6svCJh/G18E9VnCA==",
-      "dev": true,
-      "dependencies": {
-        "stylelint-config-recommended": "^7.0.0"
-      },
-      "peerDependencies": {
-        "stylelint": "^14.4.0"
-      }
-    },
-    "node_modules/stylelint-config-standard-scss": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-standard-scss/-/stylelint-config-standard-scss-3.0.0.tgz",
-      "integrity": "sha512-zt3ZbzIbllN1iCmc94e4pDxqpkzeR6CJo5DDXzltshuXr+82B8ylHyMMARNnUYrZH80B7wgY7UkKTYCFM0UUyw==",
-      "dev": true,
-      "dependencies": {
-        "stylelint-config-recommended-scss": "^5.0.2",
-        "stylelint-config-standard": "^24.0.0"
-      },
-      "peerDependencies": {
-        "stylelint": "^14.0.0"
-      }
-    },
-    "node_modules/stylelint-config-standard-scss/node_modules/stylelint-config-recommended": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-6.0.0.tgz",
-      "integrity": "sha512-ZorSSdyMcxWpROYUvLEMm0vSZud2uB7tX1hzBZwvVY9SV/uly4AvvJPPhCcymZL3fcQhEQG5AELmrxWqtmzacw==",
-      "dev": true,
-      "peerDependencies": {
-        "stylelint": "^14.0.0"
-      }
-    },
-    "node_modules/stylelint-config-standard-scss/node_modules/stylelint-config-standard": {
-      "version": "24.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-24.0.0.tgz",
-      "integrity": "sha512-+RtU7fbNT+VlNbdXJvnjc3USNPZRiRVp/d2DxOF/vBDDTi0kH5RX2Ny6errdtZJH3boO+bmqIYEllEmok4jiuw==",
-      "dev": true,
-      "dependencies": {
-        "stylelint-config-recommended": "^6.0.0"
-      },
-      "peerDependencies": {
-        "stylelint": "^14.0.0"
-      }
-    },
-    "node_modules/stylelint-config-twbs-bootstrap": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/stylelint-config-twbs-bootstrap/-/stylelint-config-twbs-bootstrap-3.2.1.tgz",
-      "integrity": "sha512-lfVEx+tW2SHMTYoifXIdB086FgQdQarQGt1vDqkEiuGYEtKeGjf41hovotEijw4t1RSyWuhkfxF8GzUZajTXjQ==",
-      "dev": true,
-      "dependencies": {
-        "stylelint-config-recess-order": "^3.0.0",
-        "stylelint-config-standard": "^25.0.0",
-        "stylelint-config-standard-scss": "^3.0.0",
-        "stylelint-scss": "^4.2.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "peerDependencies": {
-        "stylelint": "^14.4.0"
-      }
-    },
-    "node_modules/stylelint-no-unsupported-browser-features": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/stylelint-no-unsupported-browser-features/-/stylelint-no-unsupported-browser-features-5.0.4.tgz",
-      "integrity": "sha512-05DeIsWv262DXTSWhbQURDOxno9Tsu81sNnOpG1gD39WT+NNsEjhR2BQvwvNpZ/J/lS8vHxjhHULU2OGKSswvA==",
-      "dev": true,
-      "dependencies": {
-        "doiuse": "^4.4.1",
-        "lodash": "^4.17.15",
-        "postcss": "^8.4.16"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "peerDependencies": {
-        "stylelint": ">=13.0.0"
-      }
-    },
-    "node_modules/stylelint-order": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-5.0.0.tgz",
-      "integrity": "sha512-OWQ7pmicXufDw5BlRqzdz3fkGKJPgLyDwD1rFY3AIEfIH/LQY38Vu/85v8/up0I+VPiuGRwbc2Hg3zLAsJaiyw==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^8.3.11",
-        "postcss-sorting": "^7.0.1"
-      },
-      "peerDependencies": {
-        "stylelint": "^14.0.0"
-      }
-    },
-    "node_modules/stylelint-scss": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-4.3.0.tgz",
-      "integrity": "sha512-GvSaKCA3tipzZHoz+nNO7S02ZqOsdBzMiCx9poSmLlb3tdJlGddEX/8QzCOD8O7GQan9bjsvLMsO5xiw6IhhIQ==",
-      "dev": true,
-      "dependencies": {
-        "lodash": "^4.17.21",
-        "postcss-media-query-parser": "^0.2.3",
-        "postcss-resolve-nested-selector": "^0.1.1",
-        "postcss-selector-parser": "^6.0.6",
-        "postcss-value-parser": "^4.1.0"
-      },
-      "peerDependencies": {
-        "stylelint": "^14.5.1"
-      }
-    },
-    "node_modules/stylelint/node_modules/balanced-match": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz",
-      "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==",
-      "dev": true
-    },
-    "node_modules/stylelint/node_modules/resolve-from": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/supports-hyperlinks": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz",
-      "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0",
-        "supports-color": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/supports-hyperlinks/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/supports-hyperlinks/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/svg-tags": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
-      "integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==",
-      "dev": true
-    },
-    "node_modules/symbol-tree": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
-      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
-      "dev": true
-    },
-    "node_modules/table": {
-      "version": "6.8.1",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.8.1.tgz",
-      "integrity": "sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^8.0.1",
-        "lodash.truncate": "^4.4.2",
-        "slice-ansi": "^4.0.0",
-        "string-width": "^4.2.3",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/table/node_modules/ajv": {
-      "version": "8.11.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.2.tgz",
-      "integrity": "sha512-E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/table/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true
-    },
-    "node_modules/tablednd": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/tablednd/-/tablednd-1.0.5.tgz",
-      "integrity": "sha512-iC230jusaekjzzAy0jigZLbzb7jKKnW9xiNiZ4W17p7y8AvBYf5KunyrIE3HwL1FhL2VEeogZtjP5VeBeIW4xg=="
-    },
-    "node_modules/tapable": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/terser": {
-      "version": "5.16.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.1.tgz",
-      "integrity": "sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw==",
-      "dependencies": {
-        "@jridgewell/source-map": "^0.3.2",
-        "acorn": "^8.5.0",
-        "commander": "^2.20.0",
-        "source-map-support": "~0.5.20"
-      },
-      "bin": {
-        "terser": "bin/terser"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/terser-webpack-plugin": {
-      "version": "5.3.6",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz",
-      "integrity": "sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==",
-      "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.14",
-        "jest-worker": "^27.4.5",
-        "schema-utils": "^3.1.1",
-        "serialize-javascript": "^6.0.0",
-        "terser": "^5.14.1"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.1.0"
-      },
-      "peerDependenciesMeta": {
-        "@swc/core": {
-          "optional": true
-        },
-        "esbuild": {
-          "optional": true
-        },
-        "uglify-js": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/terser/node_modules/commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
-    },
-    "node_modules/text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-      "dev": true
-    },
-    "node_modules/through2": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz",
-      "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "3"
-      }
-    },
-    "node_modules/through2/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/thunky": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
-      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
-      "dev": true
-    },
-    "node_modules/timers-browserify": {
-      "version": "2.0.12",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
-      "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
-      "dev": true,
-      "dependencies": {
-        "setimmediate": "^1.0.4"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
-    "node_modules/to-arraybuffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-      "integrity": "sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA==",
-      "dev": true
-    },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/toidentifier": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/tough-cookie": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz",
-      "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==",
-      "dev": true,
-      "dependencies": {
-        "psl": "^1.1.33",
-        "punycode": "^2.1.1",
-        "universalify": "^0.2.0",
-        "url-parse": "^1.5.3"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/tough-cookie/node_modules/universalify": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
-      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
-    "node_modules/tr46": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
-      "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
-      "dev": true,
-      "dependencies": {
-        "punycode": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/trim-newlines": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
-      "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ts-loader": {
-      "version": "9.4.2",
-      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.4.2.tgz",
-      "integrity": "sha512-OmlC4WVmFv5I0PpaxYb+qGeGOdm5giHU7HwDDUjw59emP2UYMHy9fFSDcYgSNoH8sXcj4hGCSEhlDZ9ULeDraA==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.1.0",
-        "enhanced-resolve": "^5.0.0",
-        "micromatch": "^4.0.0",
-        "semver": "^7.3.4"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "typescript": "*",
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/ts-loader/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/ts-loader/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/ts-loader/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/ts-loader/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/ts-loader/node_modules/enhanced-resolve": {
-      "version": "5.12.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz",
-      "integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.2.4",
-        "tapable": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/ts-loader/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ts-loader/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/ts-loader/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/ts-loader/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ts-loader/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/ts-node": {
-      "version": "10.9.1",
-      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz",
-      "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==",
-      "dev": true,
-      "dependencies": {
-        "@cspotcode/source-map-support": "^0.8.0",
-        "@tsconfig/node10": "^1.0.7",
-        "@tsconfig/node12": "^1.0.7",
-        "@tsconfig/node14": "^1.0.0",
-        "@tsconfig/node16": "^1.0.2",
-        "acorn": "^8.4.1",
-        "acorn-walk": "^8.1.1",
-        "arg": "^4.1.0",
-        "create-require": "^1.1.0",
-        "diff": "^4.0.1",
-        "make-error": "^1.1.1",
-        "v8-compile-cache-lib": "^3.0.1",
-        "yn": "3.1.1"
-      },
-      "bin": {
-        "ts-node": "dist/bin.js",
-        "ts-node-cwd": "dist/bin-cwd.js",
-        "ts-node-esm": "dist/bin-esm.js",
-        "ts-node-script": "dist/bin-script.js",
-        "ts-node-transpile-only": "dist/bin-transpile.js",
-        "ts-script": "dist/bin-script-deprecated.js"
-      },
-      "peerDependencies": {
-        "@swc/core": ">=1.2.50",
-        "@swc/wasm": ">=1.2.50",
-        "@types/node": "*",
-        "typescript": ">=2.7"
-      },
-      "peerDependenciesMeta": {
-        "@swc/core": {
-          "optional": true
-        },
-        "@swc/wasm": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/ts-node/node_modules/diff": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.3.1"
-      }
-    },
-    "node_modules/tsconfig-paths": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
-      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
-        "minimist": "^1.2.6",
-        "strip-bom": "^3.0.0"
-      }
-    },
-    "node_modules/tsconfig-paths/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/tslib": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz",
-      "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==",
-      "dev": true
-    },
-    "node_modules/tsutils": {
-      "version": "3.21.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
-      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^1.8.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      },
-      "peerDependencies": {
-        "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
-      }
-    },
-    "node_modules/tsutils/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
-    },
-    "node_modules/tty-browserify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
-      "integrity": "sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw==",
-      "dev": true
-    },
-    "node_modules/type-check": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/type-detect": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/type-fest": {
-      "version": "0.18.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
-      "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-      "dev": true,
-      "dependencies": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/typeahead.js": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/typeahead.js/-/typeahead.js-0.11.1.tgz",
-      "integrity": "sha512-yGaLzGjVHyryZdNfrWz2NHXUwEO7hrlVmGMGCo5+6mH3nEEhcQ0Te3mK3G60uRnxfERu8twOWSU4WmwScbwhMg==",
-      "dependencies": {
-        "jquery": ">=1.7"
-      }
-    },
-    "node_modules/typescript": {
-      "version": "4.9.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz",
-      "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==",
-      "dev": true,
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=4.2.0"
-      }
-    },
-    "node_modules/uglify-save-license": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/uglify-save-license/-/uglify-save-license-0.4.1.tgz",
-      "integrity": "sha512-ErJczQkCvQKoEk7xxIfJTGp2JHtbKr8lEPtTgeJqm3PVCdF930Ba7x+wwtj3dZKwVu7lDy2nTOwncm3qCD+RMw==",
-      "dev": true
-    },
-    "node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/universalify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
-    "node_modules/unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/update-browserslist-db": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
-      "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        }
-      ],
-      "dependencies": {
-        "escalade": "^3.1.1",
-        "picocolors": "^1.0.0"
-      },
-      "bin": {
-        "browserslist-lint": "cli.js"
-      },
-      "peerDependencies": {
-        "browserslist": ">= 4.21.0"
-      }
-    },
-    "node_modules/uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dependencies": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "node_modules/url": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-      "integrity": "sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==",
-      "dev": true,
-      "dependencies": {
-        "punycode": "1.3.2",
-        "querystring": "0.2.0"
-      }
-    },
-    "node_modules/url-parse": {
-      "version": "1.5.10",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
-      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
-      "dev": true,
-      "dependencies": {
-        "querystringify": "^2.1.1",
-        "requires-port": "^1.0.0"
-      }
-    },
-    "node_modules/url-polyfill": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/url-polyfill/-/url-polyfill-1.1.12.tgz",
-      "integrity": "sha512-mYFmBHCapZjtcNHW0MDq9967t+z4Dmg5CJ0KqysK3+ZbyoNOWQHksGCTWwDhxGXllkWlOc10Xfko6v4a3ucM6A=="
-    },
-    "node_modules/url/node_modules/punycode": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-      "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==",
-      "dev": true
-    },
-    "node_modules/util": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
-      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "2.0.3"
-      }
-    },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-      "dev": true
-    },
-    "node_modules/util/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
-      "dev": true
-    },
-    "node_modules/utila": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
-      "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==",
-      "dev": true
-    },
-    "node_modules/utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "dev": true,
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
-    "node_modules/v8-compile-cache": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
-      "dev": true
-    },
-    "node_modules/v8-compile-cache-lib": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
-      "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
-      "dev": true
-    },
-    "node_modules/validate-npm-package-license": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-      "dev": true,
-      "dependencies": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
-    "node_modules/vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/vazirmatn": {
-      "version": "32.102.0",
-      "resolved": "https://registry.npmjs.org/vazirmatn/-/vazirmatn-32.102.0.tgz",
-      "integrity": "sha512-Fkvs0Hp5x9zjHTuwog3KEcARhMLxjXd3o3MyD/vBywxYt2LG+4THEHpu6AW8ojfHJAutrxFnDTPB/5hvkX80ww=="
-    },
-    "node_modules/vm-browserify": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
-      "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
-      "dev": true
-    },
-    "node_modules/vue": {
-      "version": "3.2.45",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-3.2.45.tgz",
-      "integrity": "sha512-9Nx/Mg2b2xWlXykmCwiTUCWHbWIj53bnkizBxKai1g61f2Xit700A1ljowpTIM11e3uipOeiPcSqnmBg6gyiaA==",
-      "dependencies": {
-        "@vue/compiler-dom": "3.2.45",
-        "@vue/compiler-sfc": "3.2.45",
-        "@vue/runtime-dom": "3.2.45",
-        "@vue/server-renderer": "3.2.45",
-        "@vue/shared": "3.2.45"
-      }
-    },
-    "node_modules/vue-eslint-parser": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.1.0.tgz",
-      "integrity": "sha512-NGn/iQy8/Wb7RrRa4aRkokyCZfOUWk19OP5HP6JEozQFX5AoS/t+Z0ZN7FY4LlmWc4FNI922V7cvX28zctN8dQ==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.3.4",
-        "eslint-scope": "^7.1.1",
-        "eslint-visitor-keys": "^3.3.0",
-        "espree": "^9.3.1",
-        "esquery": "^1.4.0",
-        "lodash": "^4.17.21",
-        "semver": "^7.3.6"
-      },
-      "engines": {
-        "node": "^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      },
-      "peerDependencies": {
-        "eslint": ">=6.0.0"
-      }
-    },
-    "node_modules/vue-eslint-parser/node_modules/eslint-scope": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/vue-eslint-parser/node_modules/eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/vue-eslint-parser/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/vue-eslint-parser/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/vue-eslint-parser/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/vue-eslint-parser/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/vue-i18n": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.2.2.tgz",
-      "integrity": "sha512-yswpwtj89rTBhegUAv9Mu37LNznyu3NpyLQmozF3i1hYOhwpG8RjcjIFIIfnu+2MDZJGSZPXaKWvnQA71Yv9TQ==",
-      "dependencies": {
-        "@intlify/core-base": "9.2.2",
-        "@intlify/shared": "9.2.2",
-        "@intlify/vue-devtools": "9.2.2",
-        "@vue/devtools-api": "^6.2.1"
-      },
-      "engines": {
-        "node": ">= 14"
-      },
-      "peerDependencies": {
-        "vue": "^3.0.0"
-      }
-    },
-    "node_modules/vue-loader": {
-      "version": "17.0.1",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-17.0.1.tgz",
-      "integrity": "sha512-/OOyugJnImKCkAKrAvdsWMuwoCqGxWT5USLsjohzWbMgOwpA5wQmzQiLMzZd7DjhIfunzAGIApTOgIylz/kwcg==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.1.0",
-        "hash-sum": "^2.0.0",
-        "loader-utils": "^2.0.0"
-      },
-      "peerDependencies": {
-        "webpack": "^4.1.0 || ^5.0.0-0"
-      },
-      "peerDependenciesMeta": {
-        "@vue/compiler-sfc": {
-          "optional": true
-        },
-        "vue": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/vue-loader/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/vue-loader/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/vue-loader/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/vue-loader/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/vue-loader/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/vue-loader/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/vue-resource": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/vue-resource/-/vue-resource-1.5.3.tgz",
-      "integrity": "sha512-REhTuEuYSpwmEH/VN4fgDQVC/VXxDK/xsguuiDPnINxOwy1s0CSu//p++osTUkiAXi6d/vptwBpb0AcBIDsXzw==",
-      "dependencies": {
-        "got": ">=8.0 <12.0"
-      }
-    },
-    "node_modules/vue-router": {
-      "version": "4.1.6",
-      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.1.6.tgz",
-      "integrity": "sha512-DYWYwsG6xNPmLq/FmZn8Ip+qrhFEzA14EI12MsMgVxvHFDYvlr4NXpVF5hrRH1wVcDP8fGi5F4rxuJSl8/r+EQ==",
-      "dependencies": {
-        "@vue/devtools-api": "^6.4.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/posva"
-      },
-      "peerDependencies": {
-        "vue": "^3.2.0"
-      }
-    },
-    "node_modules/vue-style-loader": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz",
-      "integrity": "sha512-sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg==",
-      "dev": true,
-      "dependencies": {
-        "hash-sum": "^1.0.2",
-        "loader-utils": "^1.0.2"
-      }
-    },
-    "node_modules/vue-style-loader/node_modules/hash-sum": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
-      "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
-      "dev": true
-    },
-    "node_modules/vue-style-loader/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/vue-style-loader/node_modules/loader-utils": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
-      "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/vuex": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/vuex/-/vuex-4.1.0.tgz",
-      "integrity": "sha512-hmV6UerDrPcgbSy9ORAtNXDr9M4wlNP4pEFKye4ujJF8oqgFFuxDCdOLS3eNoRTtq5O3hoBDh9Doj1bQMYHRbQ==",
-      "dependencies": {
-        "@vue/devtools-api": "^6.0.0-beta.11"
-      },
-      "peerDependencies": {
-        "vue": "^3.2.0"
-      }
-    },
-    "node_modules/w3c-hr-time": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
-      "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
-      "deprecated": "Use your platform's native performance.now() and performance.timeOrigin.",
-      "dev": true,
-      "dependencies": {
-        "browser-process-hrtime": "^1.0.0"
-      }
-    },
-    "node_modules/w3c-xmlserializer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-3.0.0.tgz",
-      "integrity": "sha512-3WFqGEgSXIyGhOmAFtlicJNMjEps8b1MG31NCA0/vOF9+nKMUW1ckhi9cnNHmf88Rzw5V+dwIwsm2C7X8k9aQg==",
-      "dev": true,
-      "dependencies": {
-        "xml-name-validator": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/watchpack": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
-      "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
-      "dependencies": {
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.1.2"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/wbuf": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
-      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
-      "dev": true,
-      "dependencies": {
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "node_modules/webidl-conversions": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
-      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/webpack": {
-      "version": "5.75.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz",
-      "integrity": "sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==",
-      "dependencies": {
-        "@types/eslint-scope": "^3.7.3",
-        "@types/estree": "^0.0.51",
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/wasm-edit": "1.11.1",
-        "@webassemblyjs/wasm-parser": "1.11.1",
-        "acorn": "^8.7.1",
-        "acorn-import-assertions": "^1.7.6",
-        "browserslist": "^4.14.5",
-        "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.10.0",
-        "es-module-lexer": "^0.9.0",
-        "eslint-scope": "5.1.1",
-        "events": "^3.2.0",
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.2.9",
-        "json-parse-even-better-errors": "^2.3.1",
-        "loader-runner": "^4.2.0",
-        "mime-types": "^2.1.27",
-        "neo-async": "^2.6.2",
-        "schema-utils": "^3.1.0",
-        "tapable": "^2.1.1",
-        "terser-webpack-plugin": "^5.1.3",
-        "watchpack": "^2.4.0",
-        "webpack-sources": "^3.2.3"
-      },
-      "bin": {
-        "webpack": "bin/webpack.js"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependenciesMeta": {
-        "webpack-cli": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/webpack-cli": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.0.1.tgz",
-      "integrity": "sha512-S3KVAyfwUqr0Mo/ur3NzIp6jnerNpo7GUO6so51mxLi1spqsA17YcMXy0WOIJtBSnj748lthxC6XLbNKh/ZC+A==",
-      "dev": true,
-      "dependencies": {
-        "@discoveryjs/json-ext": "^0.5.0",
-        "@webpack-cli/configtest": "^2.0.1",
-        "@webpack-cli/info": "^2.0.1",
-        "@webpack-cli/serve": "^2.0.1",
-        "colorette": "^2.0.14",
-        "commander": "^9.4.1",
-        "cross-spawn": "^7.0.3",
-        "envinfo": "^7.7.3",
-        "fastest-levenshtein": "^1.0.12",
-        "import-local": "^3.0.2",
-        "interpret": "^3.1.1",
-        "rechoir": "^0.8.0",
-        "webpack-merge": "^5.7.3"
-      },
-      "bin": {
-        "webpack-cli": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=14.15.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "5.x.x"
-      },
-      "peerDependenciesMeta": {
-        "@webpack-cli/generators": {
-          "optional": true
-        },
-        "webpack-bundle-analyzer": {
-          "optional": true
-        },
-        "webpack-dev-server": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/webpack-cli/node_modules/commander": {
-      "version": "9.4.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-9.4.1.tgz",
-      "integrity": "sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw==",
-      "dev": true,
-      "engines": {
-        "node": "^12.20.0 || >=14"
-      }
-    },
-    "node_modules/webpack-cli/node_modules/interpret": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz",
-      "integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/webpack-dev-middleware": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz",
-      "integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==",
-      "dev": true,
-      "dependencies": {
-        "colorette": "^2.0.10",
-        "memfs": "^3.4.3",
-        "mime-types": "^2.1.31",
-        "range-parser": "^1.2.1",
-        "schema-utils": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/webpack-dev-server": {
-      "version": "4.11.1",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.11.1.tgz",
-      "integrity": "sha512-lILVz9tAUy1zGFwieuaQtYiadImb5M3d+H+L1zDYalYoDl0cksAB1UNyuE5MMWJrG6zR1tXkCP2fitl7yoUJiw==",
-      "dev": true,
-      "dependencies": {
-        "@types/bonjour": "^3.5.9",
-        "@types/connect-history-api-fallback": "^1.3.5",
-        "@types/express": "^4.17.13",
-        "@types/serve-index": "^1.9.1",
-        "@types/serve-static": "^1.13.10",
-        "@types/sockjs": "^0.3.33",
-        "@types/ws": "^8.5.1",
-        "ansi-html-community": "^0.0.8",
-        "bonjour-service": "^1.0.11",
-        "chokidar": "^3.5.3",
-        "colorette": "^2.0.10",
-        "compression": "^1.7.4",
-        "connect-history-api-fallback": "^2.0.0",
-        "default-gateway": "^6.0.3",
-        "express": "^4.17.3",
-        "graceful-fs": "^4.2.6",
-        "html-entities": "^2.3.2",
-        "http-proxy-middleware": "^2.0.3",
-        "ipaddr.js": "^2.0.1",
-        "open": "^8.0.9",
-        "p-retry": "^4.5.0",
-        "rimraf": "^3.0.2",
-        "schema-utils": "^4.0.0",
-        "selfsigned": "^2.1.1",
-        "serve-index": "^1.9.1",
-        "sockjs": "^0.3.24",
-        "spdy": "^4.0.2",
-        "webpack-dev-middleware": "^5.3.1",
-        "ws": "^8.4.2"
-      },
-      "bin": {
-        "webpack-dev-server": "bin/webpack-dev-server.js"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.37.0 || ^5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "webpack-cli": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/webpack-font-preload-plugin": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/webpack-font-preload-plugin/-/webpack-font-preload-plugin-1.5.0.tgz",
-      "integrity": "sha512-/Nh6MNa7/rbu3ZcqSR1SxB+G5XaITu7U2yZO5INTsVRpVlMLQmHQZCoDt4PP+iFyBdvBCDbA0CImRXHarQ0wpQ==",
-      "dev": true,
-      "dependencies": {
-        "jsdom": "^19.0.0",
-        "webpack-sources": "^3.2.2"
-      },
-      "engines": {
-        "node": ">= 10.17.0"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/webpack-font-preload-plugin/node_modules/webpack-sources": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/webpack-license-plugin": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/webpack-license-plugin/-/webpack-license-plugin-4.2.2.tgz",
-      "integrity": "sha512-OfIdm659IKurEInKlBN6Sfzrh+MNKIWkChKKg+aDCoPf3Ok1OSXBDd2RKSbuUAtxjmdW2j6LUVZWnRYRnVdOxA==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^5.0.1",
-        "get-npm-tarball-url": "^2.0.1",
-        "lodash": "^4.17.20",
-        "needle": "^2.2.4",
-        "spdx-expression-validate": "^2.0.0",
-        "webpack-sources": "^3.2.1"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "webpack": ">=4.0.0 < 6.0.0"
-      }
-    },
-    "node_modules/webpack-license-plugin/node_modules/chalk": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.2.0.tgz",
-      "integrity": "sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.17.0 || ^14.13 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/webpack-license-plugin/node_modules/webpack-sources": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/webpack-merge": {
-      "version": "5.8.0",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz",
-      "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==",
-      "dev": true,
-      "dependencies": {
-        "clone-deep": "^4.0.1",
-        "wildcard": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/webpack-remove-empty-scripts": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/webpack-remove-empty-scripts/-/webpack-remove-empty-scripts-0.7.3.tgz",
-      "integrity": "sha512-yipqb25A0qtH7X9vKt6yihwyYkTtSlRiDdBb2QsyrkqGM3hpfAcfOO1lYDef9HQUNm3s8ojmorbNg32XXX6FYg==",
-      "dev": true,
-      "dependencies": {
-        "ansis": "^1.3.4"
-      },
-      "engines": {
-        "node": ">=12.14"
-      },
-      "funding": {
-        "type": "patreon",
-        "url": "https://patreon.com/biodiscus"
-      },
-      "peerDependencies": {
-        "webpack": ">=5.32.0"
-      }
-    },
-    "node_modules/webpack-sources": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
-      "dev": true,
-      "dependencies": {
-        "source-list-map": "^2.0.0",
-        "source-map": "~0.6.1"
-      }
-    },
-    "node_modules/webpack/node_modules/enhanced-resolve": {
-      "version": "5.12.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz",
-      "integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==",
-      "dependencies": {
-        "graceful-fs": "^4.2.4",
-        "tapable": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/webpack/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/webpack/node_modules/webpack-sources": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/websocket-driver": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
-      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
-      "dev": true,
-      "dependencies": {
-        "http-parser-js": ">=0.5.1",
-        "safe-buffer": ">=5.1.0",
-        "websocket-extensions": ">=0.1.1"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/websocket-extensions": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
-      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/whatwg-encoding": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
-      "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
-      "dev": true,
-      "dependencies": {
-        "iconv-lite": "0.6.3"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/whatwg-encoding/node_modules/iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "dev": true,
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/whatwg-mimetype": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
-      "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/whatwg-url": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-10.0.0.tgz",
-      "integrity": "sha512-CLxxCmdUby142H5FZzn4D8ikO1cmypvXVQktsgosNy4a4BHrDHeciBBGZhb0bNoR5/MltoCatso+vFjjGx8t0w==",
-      "dev": true,
-      "dependencies": {
-        "tr46": "^3.0.0",
-        "webidl-conversions": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-      "dev": true,
-      "dependencies": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/which-module": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==",
-      "dev": true
-    },
-    "node_modules/wide-align": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^1.0.2 || 2"
-      }
-    },
-    "node_modules/wide-align/node_modules/ansi-regex": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-      "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/wide-align/node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/wide-align/node_modules/string-width": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-      "dev": true,
-      "dependencies": {
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/wide-align/node_modules/strip-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-      "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/wildcard": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
-      "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==",
-      "dev": true
-    },
-    "node_modules/word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/wrap-ansi": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.0",
-        "string-width": "^3.0.0",
-        "strip-ansi": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/ansi-regex": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/emoji-regex": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-      "dev": true
-    },
-    "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
-    },
-    "node_modules/write-file-atomic": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
-      "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
-      "dev": true,
-      "dependencies": {
-        "imurmurhash": "^0.1.4",
-        "signal-exit": "^3.0.7"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
-      }
-    },
-    "node_modules/ws": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
-      "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/xml-name-validator": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
-      "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/xmlchars": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
-      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
-      "dev": true
-    },
-    "node_modules/xtend": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4"
-      }
-    },
-    "node_modules/y18n": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
-      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
-      "dev": true
-    },
-    "node_modules/yallist": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-      "dev": true
-    },
-    "node_modules/yaml": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/yargs": {
-      "version": "13.3.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
-      "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
-      "dev": true,
-      "dependencies": {
-        "cliui": "^5.0.0",
-        "find-up": "^3.0.0",
-        "get-caller-file": "^2.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^3.0.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^13.1.2"
-      }
-    },
-    "node_modules/yargs-parser": {
-      "version": "13.1.2",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      }
-    },
-    "node_modules/yargs-unparser": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz",
-      "integrity": "sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==",
-      "dev": true,
-      "dependencies": {
-        "flat": "^4.1.0",
-        "lodash": "^4.17.15",
-        "yargs": "^13.3.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yargs/node_modules/ansi-regex": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yargs/node_modules/emoji-regex": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-      "dev": true
-    },
-    "node_modules/yargs/node_modules/find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yargs/node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/yargs/node_modules/locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yargs/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/yargs/node_modules/p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yargs/node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/yargs/node_modules/string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yargs/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yn": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
-      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/zxcvbn": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/zxcvbn/-/zxcvbn-4.4.2.tgz",
-      "integrity": "sha512-Bq0B+ixT/DMyG8kgX2xWcI5jUvCwqrMxSFam7m0lAf78nf04hv6lNCsyLYdyYTrCVMqNDY/206K7eExYCeSyUQ=="
-    }
-  },
   "dependencies": {
     "@ampproject/remapping": {
       "version": "2.2.0",
@@ -14667,15 +400,13 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.2.tgz",
       "integrity": "sha512-c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "@csstools/selector-specificity": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz",
       "integrity": "sha512-IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "@discoveryjs/json-ext": {
       "version": "0.5.7",
@@ -15012,6 +743,7 @@
       "version": "8.4.10",
       "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.10.tgz",
       "integrity": "sha512-Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw==",
+      "dev": true,
       "requires": {
         "@types/estree": "*",
         "@types/json-schema": "*"
@@ -15021,6 +753,7 @@
       "version": "3.7.4",
       "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
       "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
+      "dev": true,
       "requires": {
         "@types/eslint": "*",
         "@types/estree": "*"
@@ -15029,7 +762,8 @@
     "@types/estree": {
       "version": "0.0.51",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
-      "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ=="
+      "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==",
+      "dev": true
     },
     "@types/express": {
       "version": "4.17.15",
@@ -15578,6 +1312,7 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
       "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
+      "dev": true,
       "requires": {
         "@webassemblyjs/helper-numbers": "1.11.1",
         "@webassemblyjs/helper-wasm-bytecode": "1.11.1"
@@ -15586,22 +1321,26 @@
     "@webassemblyjs/floating-point-hex-parser": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
-      "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ=="
+      "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==",
+      "dev": true
     },
     "@webassemblyjs/helper-api-error": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
-      "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg=="
+      "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==",
+      "dev": true
     },
     "@webassemblyjs/helper-buffer": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
-      "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA=="
+      "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==",
+      "dev": true
     },
     "@webassemblyjs/helper-numbers": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
       "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==",
+      "dev": true,
       "requires": {
         "@webassemblyjs/floating-point-hex-parser": "1.11.1",
         "@webassemblyjs/helper-api-error": "1.11.1",
@@ -15611,12 +1350,14 @@
     "@webassemblyjs/helper-wasm-bytecode": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
-      "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q=="
+      "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==",
+      "dev": true
     },
     "@webassemblyjs/helper-wasm-section": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
       "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==",
+      "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/helper-buffer": "1.11.1",
@@ -15628,6 +1369,7 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
       "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==",
+      "dev": true,
       "requires": {
         "@xtuc/ieee754": "^1.2.0"
       }
@@ -15636,6 +1378,7 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
       "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==",
+      "dev": true,
       "requires": {
         "@xtuc/long": "4.2.2"
       }
@@ -15643,12 +1386,14 @@
     "@webassemblyjs/utf8": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
-      "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ=="
+      "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==",
+      "dev": true
     },
     "@webassemblyjs/wasm-edit": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
       "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==",
+      "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/helper-buffer": "1.11.1",
@@ -15664,6 +1409,7 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
       "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==",
+      "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
@@ -15676,6 +1422,7 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
       "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==",
+      "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/helper-buffer": "1.11.1",
@@ -15687,6 +1434,7 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
       "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==",
+      "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/helper-api-error": "1.11.1",
@@ -15700,6 +1448,7 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
       "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==",
+      "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
         "@xtuc/long": "4.2.2"
@@ -15709,32 +1458,31 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.0.1.tgz",
       "integrity": "sha512-njsdJXJSiS2iNbQVS0eT8A/KPnmyH4pv1APj2K0d1wrZcBLw+yppxOy4CGqa0OxDJkzfL/XELDhD8rocnIwB5A==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "@webpack-cli/info": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-2.0.1.tgz",
       "integrity": "sha512-fE1UEWTwsAxRhrJNikE7v4EotYflkEhBL7EbajfkPlf6E37/2QshOy/D48Mw8G5XMFlQtS6YV42vtbG9zBpIQA==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "@webpack-cli/serve": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-2.0.1.tgz",
       "integrity": "sha512-0G7tNyS+yW8TdgHwZKlDWYXFA6OJQnoLCQvYKkQP0Q2X205PSQ6RNUj0M+1OB/9gRQaUZ/ccYfaxd0nhaWKfjw==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "@xtuc/ieee754": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+      "dev": true
     },
     "@xtuc/long": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+      "dev": true
     },
     "abab": {
       "version": "2.0.6",
@@ -15785,14 +1533,13 @@
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
       "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
-      "requires": {}
+      "dev": true
     },
     "acorn-jsx": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "acorn-walk": {
       "version": "8.2.0",
@@ -15852,8 +1599,7 @@
     "ajv-keywords": {
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "requires": {}
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="
     },
     "ansi-colors": {
       "version": "3.2.3",
@@ -16168,8 +1914,7 @@
     "bootstrap": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.4.1.tgz",
-      "integrity": "sha512-tbx5cHubwE6e2ZG7nqM3g/FZ5PQEDMWmMGNrCUBVRPHXTJaH7CBDdsLeu3eCh3B1tzAxTnAbtmrzvWEvT2NNEA==",
-      "requires": {}
+      "integrity": "sha512-tbx5cHubwE6e2ZG7nqM3g/FZ5PQEDMWmMGNrCUBVRPHXTJaH7CBDdsLeu3eCh3B1tzAxTnAbtmrzvWEvT2NNEA=="
     },
     "bootstrap-colorpicker": {
       "version": "3.4.0",
@@ -16328,6 +2073,7 @@
       "version": "4.21.4",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
       "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
+      "dev": true,
       "requires": {
         "caniuse-lite": "^1.0.30001400",
         "electron-to-chromium": "^1.4.251",
@@ -16440,7 +2186,8 @@
     "caniuse-lite": {
       "version": "1.0.30001441",
       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001441.tgz",
-      "integrity": "sha512-OyxRR4Vof59I3yGWXws6i908EtGbMzVUi3ganaZQHmydk1iwDhRnvaPG2WaR0KcqrDFKrxVZHULT396LEPhXfg=="
+      "integrity": "sha512-OyxRR4Vof59I3yGWXws6i908EtGbMzVUi3ganaZQHmydk1iwDhRnvaPG2WaR0KcqrDFKrxVZHULT396LEPhXfg==",
+      "dev": true
     },
     "chai": {
       "version": "4.3.7",
@@ -16504,7 +2251,8 @@
     "chrome-trace-event": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
-      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg=="
+      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
+      "dev": true
     },
     "cipher-base": {
       "version": "1.0.4",
@@ -16978,8 +2726,7 @@
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz",
       "integrity": "sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "css-rule-stream": {
       "version": "1.1.0",
@@ -17658,7 +3405,8 @@
     "electron-to-chromium": {
       "version": "1.4.284",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz",
-      "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA=="
+      "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==",
+      "dev": true
     },
     "elliptic": {
       "version": "6.5.4",
@@ -17809,7 +3557,8 @@
     "es-module-lexer": {
       "version": "0.9.3",
       "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
-      "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ=="
+      "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
+      "dev": true
     },
     "es-shim-unscopables": {
       "version": "1.0.0",
@@ -18030,7 +3779,8 @@
     "escalade": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true
     },
     "escape-html": {
       "version": "1.0.3",
@@ -18440,6 +4190,7 @@
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
       "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
       "requires": {
         "esrecurse": "^4.3.0",
         "estraverse": "^4.1.1"
@@ -18506,6 +4257,7 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
       "requires": {
         "estraverse": "^5.2.0"
       },
@@ -18513,14 +4265,16 @@
         "estraverse": {
           "version": "5.3.0",
           "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
+          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+          "dev": true
         }
       }
     },
     "estraverse": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true
     },
     "estree-walker": {
       "version": "2.0.2",
@@ -18589,8 +4343,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/expose-loader/-/expose-loader-4.0.0.tgz",
       "integrity": "sha512-kUEvHyf6MPR2ubZCL9aziP9Br5wxMvq1cghTpYhM6MW52NPq+7hXixw2EqQuI1SvGb1fDjc2ehJOg6645wR6ww==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "express": {
       "version": "4.18.2",
@@ -19142,7 +4895,8 @@
     "glob-to-regexp": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
+      "dev": true
     },
     "global-modules": {
       "version": "2.0.0",
@@ -19237,7 +4991,8 @@
     "graceful-fs": {
       "version": "4.2.10",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
+      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
+      "dev": true
     },
     "grapheme-splitter": {
       "version": "1.0.4",
@@ -19597,8 +5352,7 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
       "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "ieee754": {
       "version": "1.2.1",
@@ -20081,7 +5835,8 @@
     "json-parse-even-better-errors": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true
     },
     "json-schema-traverse": {
       "version": "0.4.1",
@@ -20206,7 +5961,8 @@
     "loader-runner": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
-      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg=="
+      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
+      "dev": true
     },
     "loader-utils": {
       "version": "2.0.4",
@@ -20453,12 +6209,14 @@
     "mime-db": {
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "dev": true
     },
     "mime-types": {
       "version": "2.1.35",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "dev": true,
       "requires": {
         "mime-db": "1.52.0"
       }
@@ -20824,7 +6582,8 @@
     "neo-async": {
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+      "dev": true
     },
     "no-case": {
       "version": "3.0.4",
@@ -20908,7 +6667,8 @@
     "node-releases": {
       "version": "2.0.8",
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.8.tgz",
-      "integrity": "sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A=="
+      "integrity": "sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A==",
+      "dev": true
     },
     "normalize-package-data": {
       "version": "3.0.3",
@@ -21565,15 +7325,13 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz",
       "integrity": "sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "postcss-gap-properties": {
       "version": "3.0.5",
       "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.5.tgz",
       "integrity": "sha512-IuE6gKSdoUNcvkGIqdtjtcMtZIFyXZhmFd5RUlg97iVEvp1BZKV5ngsAjCjrVy+14uhGBQl9tzmi1Qwq4kqVOg==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "postcss-image-set-function": {
       "version": "4.0.7",
@@ -21588,8 +7346,7 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-4.0.1.tgz",
       "integrity": "sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "postcss-lab-function": {
       "version": "4.2.1",
@@ -21642,15 +7399,13 @@
       "version": "5.0.4",
       "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-5.0.4.tgz",
       "integrity": "sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "postcss-media-minmax": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz",
       "integrity": "sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "postcss-media-query-parser": {
       "version": "0.2.3",
@@ -21662,8 +7417,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
       "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "postcss-modules-local-by-default": {
       "version": "4.0.0",
@@ -21708,8 +7462,7 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/postcss-opacity-percentage/-/postcss-opacity-percentage-1.1.3.tgz",
       "integrity": "sha512-An6Ba4pHBiDtyVpSLymUUERMo2cU7s+Obz6BTrS+gxkbnSBNKSuD0AVUc+CpBMrpVPKKfoVz0WQCX+Tnst0i4A==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "postcss-overflow-shorthand": {
       "version": "3.0.4",
@@ -21724,8 +7477,7 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-3.0.4.tgz",
       "integrity": "sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "postcss-place": {
       "version": "7.0.5",
@@ -21806,8 +7558,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz",
       "integrity": "sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "postcss-resolve-nested-selector": {
       "version": "0.1.1",
@@ -21819,15 +7570,13 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz",
       "integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "postcss-scss": {
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.6.tgz",
       "integrity": "sha512-rLDPhJY4z/i4nVFZ27j9GqLxj1pwxE80eAzUNRMXtcpipFYIeowerzBgG3yJhMtObGEXidtIgbUpQ3eLDsf5OQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "postcss-selector-not": {
       "version": "6.0.1",
@@ -21852,8 +7601,7 @@
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-7.0.1.tgz",
       "integrity": "sha512-iLBFYz6VRYyLJEJsBJ8M3TCqNcckVzz4wFounSc5Oez35ogE/X+aoC5fFu103Ot7NyvjU3/xqIXn93Gp3kJk4g==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "postcss-value-parser": {
       "version": "4.2.0",
@@ -23041,15 +8789,6 @@
         "xtend": "^4.0.0"
       }
     },
-    "string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
     "string-width": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -23083,6 +8822,15 @@
         "es-abstract": "^1.20.4"
       }
     },
+    "string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
     "strip-ansi": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
@@ -23129,8 +8877,7 @@
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.1.tgz",
       "integrity": "sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "style-search": {
       "version": "0.1.0",
@@ -23221,8 +8968,7 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-7.0.0.tgz",
       "integrity": "sha512-yGn84Bf/q41J4luis1AZ95gj0EQwRX8lWmGmBwkwBNSkpGSpl66XcPTulxGa/Z91aPoNGuIGBmFkcM1MejMo9Q==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "stylelint-config-recommended-scss": {
       "version": "5.0.2",
@@ -23239,8 +8985,7 @@
           "version": "6.0.0",
           "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-6.0.0.tgz",
           "integrity": "sha512-ZorSSdyMcxWpROYUvLEMm0vSZud2uB7tX1hzBZwvVY9SV/uly4AvvJPPhCcymZL3fcQhEQG5AELmrxWqtmzacw==",
-          "dev": true,
-          "requires": {}
+          "dev": true
         }
       }
     },
@@ -23267,8 +9012,7 @@
           "version": "6.0.0",
           "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-6.0.0.tgz",
           "integrity": "sha512-ZorSSdyMcxWpROYUvLEMm0vSZud2uB7tX1hzBZwvVY9SV/uly4AvvJPPhCcymZL3fcQhEQG5AELmrxWqtmzacw==",
-          "dev": true,
-          "requires": {}
+          "dev": true
         },
         "stylelint-config-standard": {
           "version": "24.0.0",
@@ -23422,7 +9166,8 @@
     "tapable": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="
+      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+      "dev": true
     },
     "terser": {
       "version": "5.16.1",
@@ -23828,6 +9573,7 @@
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
       "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
+      "dev": true,
       "requires": {
         "escalade": "^3.1.1",
         "picocolors": "^1.0.0"
@@ -24186,6 +9932,7 @@
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
       "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
+      "dev": true,
       "requires": {
         "glob-to-regexp": "^0.4.1",
         "graceful-fs": "^4.1.2"
@@ -24210,6 +9957,7 @@
       "version": "5.75.0",
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz",
       "integrity": "sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==",
+      "dev": true,
       "requires": {
         "@types/eslint-scope": "^3.7.3",
         "@types/estree": "^0.0.51",
@@ -24241,6 +9989,7 @@
           "version": "5.12.0",
           "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz",
           "integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==",
+          "dev": true,
           "requires": {
             "graceful-fs": "^4.2.4",
             "tapable": "^2.2.0"
@@ -24250,6 +9999,7 @@
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
           "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+          "dev": true,
           "requires": {
             "@types/json-schema": "^7.0.8",
             "ajv": "^6.12.5",
@@ -24259,7 +10009,8 @@
         "webpack-sources": {
           "version": "3.2.3",
           "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-          "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w=="
+          "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+          "dev": true
         }
       }
     },
@@ -24639,8 +10390,7 @@
       "version": "8.11.0",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
       "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "xml-name-validator": {
       "version": "4.0.0",
diff --git a/src/Adapter/Alias/CommandHandler/AddAliasCommandHandler.php b/src/Adapter/Alias/CommandHandler/AddAliasCommandHandler.php
new file mode 100644
index 0000000000000..34aff254c6b6f
--- /dev/null
+++ b/src/Adapter/Alias/CommandHandler/AddAliasCommandHandler.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Adapter\Alias\CommandHandler;
+
+use PrestaShop\PrestaShop\Core\Domain\Alias\Command\AddAliasCommand;
+use PrestaShop\PrestaShop\Core\Domain\Alias\CommandHandler\AddAliasCommandHandlerInterface;
+
+class AddAliasCommandHandler implements AddAliasCommandHandlerInterface
+{
+    public function handle(AddAliasCommand $command)
+    {
+        // TODO: Implement handle() method.
+    }
+}
diff --git a/src/Core/Domain/Alias/CommandHandler/AddAliasCommandHandlerInterface.php b/src/Core/Domain/Alias/CommandHandler/AddAliasCommandHandlerInterface.php
new file mode 100644
index 0000000000000..a811244de9226
--- /dev/null
+++ b/src/Core/Domain/Alias/CommandHandler/AddAliasCommandHandlerInterface.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Domain\Alias\CommandHandler;
+
+use PrestaShop\PrestaShop\Core\Domain\Alias\Command\AddAliasCommand;
+use PrestaShop\PrestaShop\Core\Domain\Alias\ValueObject\AliasId;
+
+/**
+ * Interface for services that handle command which adds new alias
+ */
+interface AddAliasCommandHandlerInterface
+{
+    /**
+     * @param AddAliasCommand $command
+     *
+     * @return AliasId Added alias ID
+     */
+    public function handle(AddAliasCommand $command);
+}
diff --git a/src/Core/Domain/Alias/Exception/InvalidAliasIdException.php b/src/Core/Domain/Alias/Exception/InvalidAliasIdException.php
new file mode 100644
index 0000000000000..0c85df4788608
--- /dev/null
+++ b/src/Core/Domain/Alias/Exception/InvalidAliasIdException.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Domain\Alias\Exception;
+
+/**
+ * Class InvalidAliasIdException is thrown when AliasId with invalid value is being created.
+ */
+class InvalidAliasIdException extends AliasException
+{
+}
diff --git a/themes/package-lock.json b/themes/package-lock.json
index 2367cbb438c64..93bd52ca101b1 100644
--- a/themes/package-lock.json
+++ b/themes/package-lock.json
@@ -1,5279 +1,8 @@
 {
   "name": "prestashop-core-theme-js",
   "version": "1.7.5",
-  "lockfileVersion": 2,
+  "lockfileVersion": 1,
   "requires": true,
-  "packages": {
-    "": {
-      "name": "prestashop-core-theme-js",
-      "version": "1.7.5",
-      "license": "OSL-3.0",
-      "dependencies": {
-        "@prestashop-core/jquery.live-polyfill": "^1.1.2",
-        "jquery": "^3.5.1",
-        "jquery-migrate": "^3.1.0",
-        "jquery.browser": "^0.1.0",
-        "punycode": "^2.1.1",
-        "zxcvbn": "^4.4.2"
-      },
-      "devDependencies": {
-        "babel-eslint": "^10.0.3",
-        "esbuild-loader": "^2.15.1",
-        "eslint": "^6.8.0",
-        "eslint-config-airbnb-base": "^14.0.0",
-        "eslint-import-resolver-webpack": "^0.12.1",
-        "eslint-plugin-html": "^6.0.0",
-        "eslint-plugin-import": "^2.20.0",
-        "mini-css-extract-plugin": "^2.6.1",
-        "path": "^0.12.7",
-        "webpack": "^5.37.1",
-        "webpack-cli": "^4.7.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
-      "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
-      "dev": true
-    },
-    "node_modules/@discoveryjs/json-ext": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz",
-      "integrity": "sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/@prestashop-core/jquery.live-polyfill": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@prestashop-core/jquery.live-polyfill/-/jquery.live-polyfill-1.1.2.tgz",
-      "integrity": "sha512-nBq6BmiGi2N+FY+aO6SVRDN8In7K5OQaK13VlVCtwYgpKfC7Rs87rFMwSujDMkswSvca6XEcgoWP1jPYyjcUqA==",
-      "dependencies": {
-        "jquery": ">=1.9"
-      }
-    },
-    "node_modules/@types/color-name": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
-      "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
-      "dev": true
-    },
-    "node_modules/@types/eslint": {
-      "version": "7.2.10",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.10.tgz",
-      "integrity": "sha512-kUEPnMKrqbtpCq/KTaGFFKAcz6Ethm2EjCoKIDaCmfRBWLbFuTcOJfTlorwbnboXBzahqWLgUp1BQeKHiJzPUQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/estree": "*",
-        "@types/json-schema": "*"
-      }
-    },
-    "node_modules/@types/eslint-scope": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.0.tgz",
-      "integrity": "sha512-O/ql2+rrCUe2W2rs7wMR+GqPRcgB6UiqN5RhrR5xruFlY7l9YLMn0ZkDzjoHLeiFkR8MCQZVudUuuvQ2BLC9Qw==",
-      "dev": true,
-      "dependencies": {
-        "@types/eslint": "*",
-        "@types/estree": "*"
-      }
-    },
-    "node_modules/@types/estree": {
-      "version": "0.0.47",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.47.tgz",
-      "integrity": "sha512-c5ciR06jK8u9BstrmJyO97m+klJrrhCf9u3rLu3DEAJBirxRqSCvDQoYKmxuYwQI5SZChAWu+tq9oVlGRuzPAg==",
-      "dev": true
-    },
-    "node_modules/@types/json-schema": {
-      "version": "7.0.11",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
-      "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
-      "dev": true
-    },
-    "node_modules/@types/json5": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
-      "dev": true
-    },
-    "node_modules/@types/node": {
-      "version": "15.3.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.3.0.tgz",
-      "integrity": "sha512-8/bnjSZD86ZfpBsDlCIkNXIvm+h6wi9g7IqL+kmFkQ+Wvu3JrasgLElfiPgoo8V8vVfnEi0QVS12gbl94h9YsQ==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/ast": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.0.tgz",
-      "integrity": "sha512-kX2W49LWsbthrmIRMbQZuQDhGtjyqXfEmmHyEi4XWnSZtPmxY0+3anPIzsnRb45VH/J55zlOfWvZuY47aJZTJg==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/helper-numbers": "1.11.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.0"
-      }
-    },
-    "node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.0.tgz",
-      "integrity": "sha512-Q/aVYs/VnPDVYvsCBL/gSgwmfjeCb4LW8+TMrO3cSzJImgv8lxxEPM2JA5jMrivE7LSz3V+PFqtMbls3m1exDA==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.0.tgz",
-      "integrity": "sha512-baT/va95eXiXb2QflSx95QGT5ClzWpGaa8L7JnJbgzoYeaA27FCvuBXU758l+KXWRndEmUXjP0Q5fibhavIn8w==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.0.tgz",
-      "integrity": "sha512-u9HPBEl4DS+vA8qLQdEQ6N/eJQ7gT7aNvMIo8AAWvAl/xMrcOSiI2M0MAnMCy3jIFke7bEee/JwdX1nUpCtdyA==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-numbers": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.0.tgz",
-      "integrity": "sha512-DhRQKelIj01s5IgdsOJMKLppI+4zpmcMQ3XboFPLwCpSNH6Hqo1ritgHgD0nqHeSYqofA6aBN/NmXuGjM1jEfQ==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/floating-point-hex-parser": "1.11.0",
-        "@webassemblyjs/helper-api-error": "1.11.0",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.0.tgz",
-      "integrity": "sha512-MbmhvxXExm542tWREgSFnOVo07fDpsBJg3sIl6fSp9xuu75eGz5lz31q7wTLffwL3Za7XNRCMZy210+tnsUSEA==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.0.tgz",
-      "integrity": "sha512-3Eb88hcbfY/FCukrg6i3EH8H2UsD7x8Vy47iVJrP967A9JGqgBVL9aH71SETPx1JrGsOUVLo0c7vMCN22ytJew==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.0",
-        "@webassemblyjs/helper-buffer": "1.11.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.0",
-        "@webassemblyjs/wasm-gen": "1.11.0"
-      }
-    },
-    "node_modules/@webassemblyjs/ieee754": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.0.tgz",
-      "integrity": "sha512-KXzOqpcYQwAfeQ6WbF6HXo+0udBNmw0iXDmEK5sFlmQdmND+tr773Ti8/5T/M6Tl/413ArSJErATd8In3B+WBA==",
-      "dev": true,
-      "dependencies": {
-        "@xtuc/ieee754": "^1.2.0"
-      }
-    },
-    "node_modules/@webassemblyjs/leb128": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.0.tgz",
-      "integrity": "sha512-aqbsHa1mSQAbeeNcl38un6qVY++hh8OpCOzxhixSYgbRfNWcxJNJQwe2rezK9XEcssJbbWIkblaJRwGMS9zp+g==",
-      "dev": true,
-      "dependencies": {
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@webassemblyjs/utf8": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.0.tgz",
-      "integrity": "sha512-A/lclGxH6SpSLSyFowMzO/+aDEPU4hvEiooCMXQPcQFPPJaYcPQNKGOCLUySJsYJ4trbpr+Fs08n4jelkVTGVw==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.0.tgz",
-      "integrity": "sha512-JHQ0damXy0G6J9ucyKVXO2j08JVJ2ntkdJlq1UTiUrIgfGMmA7Ik5VdC/L8hBK46kVJgujkBIoMtT8yVr+yVOQ==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.0",
-        "@webassemblyjs/helper-buffer": "1.11.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.0",
-        "@webassemblyjs/helper-wasm-section": "1.11.0",
-        "@webassemblyjs/wasm-gen": "1.11.0",
-        "@webassemblyjs/wasm-opt": "1.11.0",
-        "@webassemblyjs/wasm-parser": "1.11.0",
-        "@webassemblyjs/wast-printer": "1.11.0"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.0.tgz",
-      "integrity": "sha512-BEUv1aj0WptCZ9kIS30th5ILASUnAPEvE3tVMTrItnZRT9tXCLW2LEXT8ezLw59rqPP9klh9LPmpU+WmRQmCPQ==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.0",
-        "@webassemblyjs/ieee754": "1.11.0",
-        "@webassemblyjs/leb128": "1.11.0",
-        "@webassemblyjs/utf8": "1.11.0"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.0.tgz",
-      "integrity": "sha512-tHUSP5F4ywyh3hZ0+fDQuWxKx3mJiPeFufg+9gwTpYp324mPCQgnuVKwzLTZVqj0duRDovnPaZqDwoyhIO8kYg==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.0",
-        "@webassemblyjs/helper-buffer": "1.11.0",
-        "@webassemblyjs/wasm-gen": "1.11.0",
-        "@webassemblyjs/wasm-parser": "1.11.0"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.0.tgz",
-      "integrity": "sha512-6L285Sgu9gphrcpDXINvm0M9BskznnzJTE7gYkjDbxET28shDqp27wpruyx3C2S/dvEwiigBwLA1cz7lNUi0kw==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.0",
-        "@webassemblyjs/helper-api-error": "1.11.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.0",
-        "@webassemblyjs/ieee754": "1.11.0",
-        "@webassemblyjs/leb128": "1.11.0",
-        "@webassemblyjs/utf8": "1.11.0"
-      }
-    },
-    "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.0.tgz",
-      "integrity": "sha512-Fg5OX46pRdTgB7rKIUojkh9vXaVN6sGYCnEiJN1GYkb0RPwShZXp6KTDqmoMdQPKhcroOXh3fEzmkWmCYaKYhQ==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.0",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@webpack-cli/configtest": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.3.tgz",
-      "integrity": "sha512-WQs0ep98FXX2XBAfQpRbY0Ma6ADw8JR6xoIkaIiJIzClGOMqVRvPCWqndTxf28DgFopWan0EKtHtg/5W1h0Zkw==",
-      "dev": true,
-      "peerDependencies": {
-        "webpack": "4.x.x || 5.x.x",
-        "webpack-cli": "4.x.x"
-      }
-    },
-    "node_modules/@webpack-cli/info": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.2.4.tgz",
-      "integrity": "sha512-ogE2T4+pLhTTPS/8MM3IjHn0IYplKM4HbVNMCWA9N4NrdPzunwenpCsqKEXyejMfRu6K8mhauIPYf8ZxWG5O6g==",
-      "dev": true,
-      "dependencies": {
-        "envinfo": "^7.7.3"
-      },
-      "peerDependencies": {
-        "webpack-cli": "4.x.x"
-      }
-    },
-    "node_modules/@webpack-cli/serve": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.4.0.tgz",
-      "integrity": "sha512-xgT/HqJ+uLWGX+Mzufusl3cgjAcnqYYskaB7o0vRcwOEfuu6hMzSILQpnIzFMGsTaeaX4Nnekl+6fadLbl1/Vg==",
-      "dev": true,
-      "peerDependencies": {
-        "webpack-cli": "4.x.x"
-      },
-      "peerDependenciesMeta": {
-        "webpack-dev-server": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@xtuc/ieee754": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-      "dev": true
-    },
-    "node_modules/@xtuc/long": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-      "dev": true
-    },
-    "node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-jsx": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz",
-      "integrity": "sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==",
-      "dev": true,
-      "peerDependencies": {
-        "acorn": "^6.0.0 || ^7.0.0"
-      }
-    },
-    "node_modules/ajv": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-      "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/ajv-formats": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
-      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "ajv": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/ajv-keywords": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3"
-      },
-      "peerDependencies": {
-        "ajv": "^8.8.2"
-      }
-    },
-    "node_modules/ajv/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true
-    },
-    "node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "node_modules/array-find": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-find/-/array-find-1.0.0.tgz",
-      "integrity": "sha1-bI4obRHtdoMn+OYuzuhzU8o+eLg=",
-      "dev": true
-    },
-    "node_modules/array-includes": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.1.tgz",
-      "integrity": "sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0",
-        "is-string": "^1.0.5"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/es-abstract": {
-      "version": "1.17.6",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
-      "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
-      "dev": true,
-      "dependencies": {
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1",
-        "is-callable": "^1.2.0",
-        "is-regex": "^1.1.0",
-        "object-inspect": "^1.7.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.0",
-        "string.prototype.trimend": "^1.0.1",
-        "string.prototype.trimstart": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/is-callable": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
-      "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/is-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
-      "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/is-symbol": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
-      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/array.prototype.flat": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz",
-      "integrity": "sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flat/node_modules/es-abstract": {
-      "version": "1.17.6",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
-      "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
-      "dev": true,
-      "dependencies": {
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1",
-        "is-callable": "^1.2.0",
-        "is-regex": "^1.1.0",
-        "object-inspect": "^1.7.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.0",
-        "string.prototype.trimend": "^1.0.1",
-        "string.prototype.trimstart": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flat/node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flat/node_modules/is-callable": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
-      "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flat/node_modules/is-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
-      "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flat/node_modules/is-symbol": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
-      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flat/node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/asn1.js": {
-      "version": "4.10.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
-      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "node_modules/assert": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
-      "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
-      "dev": true,
-      "dependencies": {
-        "util": "0.10.3"
-      }
-    },
-    "node_modules/assert/node_modules/inherits": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-      "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
-      "dev": true
-    },
-    "node_modules/assert/node_modules/util": {
-      "version": "0.10.3",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
-      "dev": true,
-      "dependencies": {
-        "inherits": "2.0.1"
-      }
-    },
-    "node_modules/astral-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
-      "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/babel-eslint": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.1.0.tgz",
-      "integrity": "sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==",
-      "deprecated": "babel-eslint is now @babel/eslint-parser. This package will no longer receive updates.",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/parser": "^7.7.0",
-        "@babel/traverse": "^7.7.0",
-        "@babel/types": "^7.7.0",
-        "eslint-visitor-keys": "^1.0.0",
-        "resolve": "^1.12.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "peerDependencies": {
-        "eslint": ">= 4.12.1"
-      }
-    },
-    "node_modules/babel-eslint/node_modules/@babel/code-frame": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-      "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.10.4"
-      }
-    },
-    "node_modules/babel-eslint/node_modules/@babel/generator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.4.tgz",
-      "integrity": "sha512-toLIHUIAgcQygFZRAQcsLQV3CBuX6yOIru1kJk/qqqvcRmZrYe6WavZTSG+bB8MxhnL9YPf+pKQfuiP161q7ng==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.10.4",
-        "jsesc": "^2.5.1",
-        "lodash": "^4.17.13",
-        "source-map": "^0.5.0"
-      }
-    },
-    "node_modules/babel-eslint/node_modules/@babel/helper-function-name": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
-      "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-get-function-arity": "^7.10.4",
-        "@babel/template": "^7.10.4",
-        "@babel/types": "^7.10.4"
-      }
-    },
-    "node_modules/babel-eslint/node_modules/@babel/helper-get-function-arity": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
-      "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.10.4"
-      }
-    },
-    "node_modules/babel-eslint/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.4.tgz",
-      "integrity": "sha512-pySBTeoUff56fL5CBU2hWm9TesA4r/rOkI9DyJLvvgz09MB9YtfIYe3iBriVaYNaPe+Alua0vBIOVOLs2buWhg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.10.4"
-      }
-    },
-    "node_modules/babel-eslint/node_modules/@babel/highlight": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-      "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.10.4",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "node_modules/babel-eslint/node_modules/@babel/parser": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.4.tgz",
-      "integrity": "sha512-8jHII4hf+YVDsskTF6WuMB3X4Eh+PsUkC2ljq22so5rHvH+T8BzyL94VOdyFLNR8tBSVXOTbNHOKpR4TfRxVtA==",
-      "dev": true,
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/babel-eslint/node_modules/@babel/template": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-      "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/parser": "^7.10.4",
-        "@babel/types": "^7.10.4"
-      }
-    },
-    "node_modules/babel-eslint/node_modules/@babel/traverse": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.4.tgz",
-      "integrity": "sha512-aSy7p5THgSYm4YyxNGz6jZpXf+Ok40QF3aA2LyIONkDHpAcJzDUqlCKXv6peqYUs2gmic849C/t2HKw2a2K20Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/generator": "^7.10.4",
-        "@babel/helper-function-name": "^7.10.4",
-        "@babel/helper-split-export-declaration": "^7.10.4",
-        "@babel/parser": "^7.10.4",
-        "@babel/types": "^7.10.4",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.13"
-      }
-    },
-    "node_modules/babel-eslint/node_modules/@babel/types": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.4.tgz",
-      "integrity": "sha512-UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.10.4",
-        "lodash": "^4.17.13",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
-    "node_modules/babel-eslint/node_modules/debug": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/babel-eslint/node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
-    },
-    "node_modules/babel-eslint/node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
-    },
-    "node_modules/babel-eslint/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/babel-eslint/node_modules/resolve": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
-      "dev": true,
-      "dependencies": {
-        "path-parse": "^1.0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-      "dev": true
-    },
-    "node_modules/base64-js": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
-      "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==",
-      "dev": true
-    },
-    "node_modules/bn.js": {
-      "version": "4.11.8",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
-      "dev": true
-    },
-    "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/brorand": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
-      "dev": true
-    },
-    "node_modules/browserify-aes": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-      "dev": true,
-      "dependencies": {
-        "buffer-xor": "^1.0.3",
-        "cipher-base": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.3",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/browserify-cipher": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
-      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
-      "dev": true,
-      "dependencies": {
-        "browserify-aes": "^1.0.4",
-        "browserify-des": "^1.0.0",
-        "evp_bytestokey": "^1.0.0"
-      }
-    },
-    "node_modules/browserify-des": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
-      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
-      "dev": true,
-      "dependencies": {
-        "cipher-base": "^1.0.1",
-        "des.js": "^1.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "node_modules/browserify-rsa": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
-      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "randombytes": "^2.0.1"
-      }
-    },
-    "node_modules/browserify-sign": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
-      "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.1.1",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.2",
-        "elliptic": "^6.0.0",
-        "inherits": "^2.0.1",
-        "parse-asn1": "^5.0.0"
-      }
-    },
-    "node_modules/browserify-zlib": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
-      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
-      "dev": true,
-      "dependencies": {
-        "pako": "~1.0.5"
-      }
-    },
-    "node_modules/buffer": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
-      "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
-      "deprecated": "This version of 'buffer' is out-of-date. You must update to v4.9.2 or newer",
-      "dev": true,
-      "dependencies": {
-        "base64-js": "^1.0.2",
-        "ieee754": "^1.1.4",
-        "isarray": "^1.0.0"
-      }
-    },
-    "node_modules/buffer-from": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
-      "dev": true
-    },
-    "node_modules/buffer-xor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
-      "dev": true
-    },
-    "node_modules/builtin-status-codes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
-      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
-      "dev": true
-    },
-    "node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/chalk": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
-      "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/chrome-trace-event": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
-      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
-    "node_modules/cipher-base": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/clone-deep": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
-      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
-      "dev": true,
-      "dependencies": {
-        "is-plain-object": "^2.0.4",
-        "kind-of": "^6.0.2",
-        "shallow-clone": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/color-convert": {
-      "version": "1.9.2",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.2.tgz",
-      "integrity": "sha512-3NUJZdhMhcdPn8vJ9v2UQJoH0qqoGUkYTgFEPZaPjEtwmmKUfNV46zZmgB2M5M4DCEQHMaCfWHCxiBflLm04Tg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.1"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.1.tgz",
-      "integrity": "sha1-SxQVMEz1ACjqgWQ2Q72C6gWANok=",
-      "dev": true
-    },
-    "node_modules/colorette": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
-      "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
-      "dev": true
-    },
-    "node_modules/commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true
-    },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
-    },
-    "node_modules/confusing-browser-globals": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.9.tgz",
-      "integrity": "sha512-KbS1Y0jMtyPgIxjO7ZzMAuUpAKMt1SzCL9fsrKsX6b0zJPTaT0SiSPmewwVZg9UAO83HVIlEhZF84LIjZ0lmAw==",
-      "dev": true
-    },
-    "node_modules/console-browserify": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
-      "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
-      "dev": true,
-      "dependencies": {
-        "date-now": "^0.1.4"
-      }
-    },
-    "node_modules/constants-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
-      "dev": true
-    },
-    "node_modules/contains-path": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz",
-      "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-      "dev": true
-    },
-    "node_modules/create-ecdh": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
-      "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "elliptic": "^6.0.0"
-      }
-    },
-    "node_modules/create-hash": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-      "dev": true,
-      "dependencies": {
-        "cipher-base": "^1.0.1",
-        "inherits": "^2.0.1",
-        "md5.js": "^1.3.4",
-        "ripemd160": "^2.0.1",
-        "sha.js": "^2.4.0"
-      }
-    },
-    "node_modules/create-hmac": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-      "dev": true,
-      "dependencies": {
-        "cipher-base": "^1.0.3",
-        "create-hash": "^1.1.0",
-        "inherits": "^2.0.1",
-        "ripemd160": "^2.0.0",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      }
-    },
-    "node_modules/cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-      "dev": true,
-      "dependencies": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
-      },
-      "engines": {
-        "node": ">=4.8"
-      }
-    },
-    "node_modules/crypto-browserify": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
-      "dev": true,
-      "dependencies": {
-        "browserify-cipher": "^1.0.0",
-        "browserify-sign": "^4.0.0",
-        "create-ecdh": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.0",
-        "diffie-hellman": "^5.0.0",
-        "inherits": "^2.0.1",
-        "pbkdf2": "^3.0.3",
-        "public-encrypt": "^4.0.0",
-        "randombytes": "^2.0.0",
-        "randomfill": "^1.0.3"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/date-now": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
-      "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=",
-      "dev": true
-    },
-    "node_modules/deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
-      "dev": true
-    },
-    "node_modules/define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-      "dev": true,
-      "dependencies": {
-        "object-keys": "^1.0.12"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/des.js": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
-      "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "node_modules/diffie-hellman": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "miller-rabin": "^4.0.0",
-        "randombytes": "^2.0.0"
-      }
-    },
-    "node_modules/doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/dom-serializer": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
-      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "entities": "^2.0.0"
-      }
-    },
-    "node_modules/domain-browser": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
-      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4",
-        "npm": ">=1.2"
-      }
-    },
-    "node_modules/domelementtype": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz",
-      "integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==",
-      "dev": true
-    },
-    "node_modules/domhandler": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-3.0.0.tgz",
-      "integrity": "sha512-eKLdI5v9m67kbXQbJSNn1zjh0SDzvzWVWtX+qEI3eMjZw8daH9k8rlj1FZY9memPwjiskQFbe7vHVVJIAqoEhw==",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/domutils": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.1.0.tgz",
-      "integrity": "sha512-CD9M0Dm1iaHfQ1R/TI+z3/JWp/pgub0j4jIQKH89ARR4ATAV2nbaOQS5XxU9maJP5jHaPdDDQSEHuE2UmpUTKg==",
-      "dev": true,
-      "dependencies": {
-        "dom-serializer": "^0.2.1",
-        "domelementtype": "^2.0.1",
-        "domhandler": "^3.0.0"
-      }
-    },
-    "node_modules/elliptic": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
-      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.11.9",
-        "brorand": "^1.1.0",
-        "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.1",
-        "inherits": "^2.0.4",
-        "minimalistic-assert": "^1.0.1",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "node_modules/elliptic/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/elliptic/node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/enhanced-resolve": {
-      "version": "5.8.2",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz",
-      "integrity": "sha512-F27oB3WuHDzvR2DOGNTaYy0D5o0cnrv8TeI482VM4kYgQd/FT9lUQwuNsJ0oOHtBUq7eiW5ytqzp7nBFknL+GA==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.2.4",
-        "tapable": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/enhanced-resolve/node_modules/graceful-fs": {
-      "version": "4.2.6",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
-      "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==",
-      "dev": true
-    },
-    "node_modules/entities": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz",
-      "integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==",
-      "dev": true
-    },
-    "node_modules/envinfo": {
-      "version": "7.8.1",
-      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz",
-      "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==",
-      "dev": true,
-      "bin": {
-        "envinfo": "dist/cli.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dev": true,
-      "dependencies": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "node_modules/es-module-lexer": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.4.1.tgz",
-      "integrity": "sha512-ooYciCUtfw6/d2w56UVeqHPcoCFAiJdz5XOkYpv/Txl1HMUozpXjz/2RIQgqwKdXNDPSF1W7mJCFse3G+HDyAA==",
-      "dev": true
-    },
-    "node_modules/esbuild": {
-      "version": "0.12.29",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.12.29.tgz",
-      "integrity": "sha512-w/XuoBCSwepyiZtIRsKsetiLDUVGPVw1E/R3VTFSecIy8UR7Cq3SOtwKHJMFoVqqVG36aGkzh4e8BvpO1Fdc7g==",
-      "dev": true,
-      "hasInstallScript": true,
-      "bin": {
-        "esbuild": "bin/esbuild"
-      }
-    },
-    "node_modules/esbuild-loader": {
-      "version": "2.15.1",
-      "resolved": "https://registry.npmjs.org/esbuild-loader/-/esbuild-loader-2.15.1.tgz",
-      "integrity": "sha512-JRBL6uTeWplMbylNBt9gxLKMjD8wKnqGq786QV/cm/nPBSNA9/kC7/vNwCXTDPfYqHoWsjyfH7ub9ekN0kdAYQ==",
-      "dev": true,
-      "dependencies": {
-        "esbuild": "^0.12.21",
-        "joycon": "^3.0.1",
-        "json5": "^2.2.0",
-        "loader-utils": "^2.0.0",
-        "tapable": "^2.2.0",
-        "type-fest": "^1.4.0",
-        "webpack-sources": "^2.2.0"
-      },
-      "funding": {
-        "url": "https://github.com/privatenumber/esbuild-loader?sponsor=1"
-      },
-      "peerDependencies": {
-        "webpack": "^4.40.0 || ^5.0.0"
-      }
-    },
-    "node_modules/esbuild-loader/node_modules/big.js": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/esbuild-loader/node_modules/emojis-list": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/esbuild-loader/node_modules/json5": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-      "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/esbuild-loader/node_modules/loader-utils": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-      "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
-      },
-      "engines": {
-        "node": ">=8.9.0"
-      }
-    },
-    "node_modules/esbuild-loader/node_modules/source-list-map": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
-      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
-      "dev": true
-    },
-    "node_modules/esbuild-loader/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/esbuild-loader/node_modules/type-fest": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz",
-      "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/esbuild-loader/node_modules/webpack-sources": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz",
-      "integrity": "sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==",
-      "dev": true,
-      "dependencies": {
-        "source-list-map": "^2.0.1",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/eslint": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz",
-      "integrity": "sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "ajv": "^6.10.0",
-        "chalk": "^2.1.0",
-        "cross-spawn": "^6.0.5",
-        "debug": "^4.0.1",
-        "doctrine": "^3.0.0",
-        "eslint-scope": "^5.0.0",
-        "eslint-utils": "^1.4.3",
-        "eslint-visitor-keys": "^1.1.0",
-        "espree": "^6.1.2",
-        "esquery": "^1.0.1",
-        "esutils": "^2.0.2",
-        "file-entry-cache": "^5.0.1",
-        "functional-red-black-tree": "^1.0.1",
-        "glob-parent": "^5.0.0",
-        "globals": "^12.1.0",
-        "ignore": "^4.0.6",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "inquirer": "^7.0.0",
-        "is-glob": "^4.0.0",
-        "js-yaml": "^3.13.1",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.3.0",
-        "lodash": "^4.17.14",
-        "minimatch": "^3.0.4",
-        "mkdirp": "^0.5.1",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.8.3",
-        "progress": "^2.0.0",
-        "regexpp": "^2.0.1",
-        "semver": "^6.1.2",
-        "strip-ansi": "^5.2.0",
-        "strip-json-comments": "^3.0.1",
-        "table": "^5.2.3",
-        "text-table": "^0.2.0",
-        "v8-compile-cache": "^2.0.3"
-      },
-      "bin": {
-        "eslint": "bin/eslint.js"
-      },
-      "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint-config-airbnb-base": {
-      "version": "14.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.2.0.tgz",
-      "integrity": "sha512-Snswd5oC6nJaevs3nZoLSTvGJBvzTfnBqOIArkf3cbyTyq9UD79wOk8s+RiL6bhca0p/eRO6veczhf6A/7Jy8Q==",
-      "dev": true,
-      "dependencies": {
-        "confusing-browser-globals": "^1.0.9",
-        "object.assign": "^4.1.0",
-        "object.entries": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 6"
-      },
-      "peerDependencies": {
-        "eslint": "^5.16.0 || ^6.8.0 || ^7.2.0",
-        "eslint-plugin-import": "^2.21.2"
-      }
-    },
-    "node_modules/eslint-import-resolver-node": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz",
-      "integrity": "sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^2.6.9",
-        "resolve": "^1.13.1"
-      }
-    },
-    "node_modules/eslint-import-resolver-node/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/eslint-import-resolver-node/node_modules/resolve": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
-      "dev": true,
-      "dependencies": {
-        "path-parse": "^1.0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-import-resolver-webpack": {
-      "version": "0.12.2",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.12.2.tgz",
-      "integrity": "sha512-7Jnm4YAoNNkvqPaZkKdIHsKGmv8/uNnYC5QsXkiSodvX4XEEfH2AKOna98FK52fCDXm3q4HzuX+7pRMKkJ64EQ==",
-      "dev": true,
-      "dependencies": {
-        "array-find": "^1.0.0",
-        "debug": "^2.6.9",
-        "enhanced-resolve": "^0.9.1",
-        "find-root": "^1.1.0",
-        "has": "^1.0.3",
-        "interpret": "^1.2.0",
-        "lodash": "^4.17.15",
-        "node-libs-browser": "^1.0.0 || ^2.0.0",
-        "resolve": "^1.13.1",
-        "semver": "^5.7.1"
-      },
-      "peerDependencies": {
-        "eslint-plugin-import": ">=1.4.0",
-        "webpack": ">=1.11.0"
-      }
-    },
-    "node_modules/eslint-import-resolver-webpack/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/eslint-import-resolver-webpack/node_modules/enhanced-resolve": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz",
-      "integrity": "sha1-TW5omzcl+GCQknzMhs2fFjW4ni4=",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "memory-fs": "^0.2.0",
-        "tapable": "^0.1.8"
-      },
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/eslint-import-resolver-webpack/node_modules/interpret": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
-      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/eslint-import-resolver-webpack/node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
-    },
-    "node_modules/eslint-import-resolver-webpack/node_modules/memory-fs": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz",
-      "integrity": "sha1-8rslNovBIeORwlIN6Slpyu4KApA=",
-      "dev": true
-    },
-    "node_modules/eslint-import-resolver-webpack/node_modules/resolve": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
-      "dev": true,
-      "dependencies": {
-        "path-parse": "^1.0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-import-resolver-webpack/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/eslint-import-resolver-webpack/node_modules/tapable": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",
-      "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/eslint-module-utils": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz",
-      "integrity": "sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^2.6.9",
-        "pkg-dir": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-module-utils/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/eslint-plugin-html": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-html/-/eslint-plugin-html-6.0.2.tgz",
-      "integrity": "sha512-Ik/z32UteKLo8GEfwNqVKcJ/WOz/be4h8N5mbMmxxnZ+9aL9XczOXQFz/bGu+nAGVoRg8CflldxJhONFpqlrxw==",
-      "dev": true,
-      "dependencies": {
-        "htmlparser2": "^4.1.0"
-      }
-    },
-    "node_modules/eslint-plugin-import": {
-      "version": "2.22.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.0.tgz",
-      "integrity": "sha512-66Fpf1Ln6aIS5Gr/55ts19eUuoDhAbZgnr6UxK5hbDx6l/QgQgx61AePq+BV4PP2uXQFClgMVzep5zZ94qqsxg==",
-      "dev": true,
-      "dependencies": {
-        "array-includes": "^3.1.1",
-        "array.prototype.flat": "^1.2.3",
-        "contains-path": "^0.1.0",
-        "debug": "^2.6.9",
-        "doctrine": "1.5.0",
-        "eslint-import-resolver-node": "^0.3.3",
-        "eslint-module-utils": "^2.6.0",
-        "has": "^1.0.3",
-        "minimatch": "^3.0.4",
-        "object.values": "^1.1.1",
-        "read-pkg-up": "^2.0.0",
-        "resolve": "^1.17.0",
-        "tsconfig-paths": "^3.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/doctrine": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
-      "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2",
-        "isarray": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/resolve": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
-      "dev": true,
-      "dependencies": {
-        "path-parse": "^1.0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/eslint-scope/node_modules/esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/eslint-scope/node_modules/esrecurse/node_modules/estraverse": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/eslint-utils": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
-      "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
-      "dev": true,
-      "dependencies": {
-        "eslint-visitor-keys": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/eslint-visitor-keys": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint/node_modules/@babel/code-frame": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-      "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.10.4"
-      }
-    },
-    "node_modules/eslint/node_modules/@babel/highlight": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-      "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.10.4",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/ajv": {
-      "version": "6.12.3",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/eslint/node_modules/ansi-escapes": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
-      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.11.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/ansi-escapes/node_modules/type-fest": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-      "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/ansi-styles": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-      "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-      "dev": true,
-      "dependencies": {
-        "@types/color-name": "^1.1.1",
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/eslint/node_modules/chardet": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
-      "dev": true
-    },
-    "node_modules/eslint/node_modules/cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-      "dev": true,
-      "dependencies": {
-        "restore-cursor": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/cli-width": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
-      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/eslint/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/eslint/node_modules/debug": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/eslint/node_modules/eslint-scope": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.0.tgz",
-      "integrity": "sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.1.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/external-editor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
-      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
-      "dev": true,
-      "dependencies": {
-        "chardet": "^0.7.0",
-        "iconv-lite": "^0.4.24",
-        "tmp": "^0.0.33"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint/node_modules/figures": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-      "dev": true,
-      "dependencies": {
-        "escape-string-regexp": "^1.0.5"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/glob-parent": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
-      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/eslint/node_modules/glob-parent/node_modules/is-glob": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/eslint/node_modules/globals": {
-      "version": "12.4.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
-      "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.8.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dev": true,
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/eslint/node_modules/inquirer": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.0.tgz",
-      "integrity": "sha512-K+LZp6L/6eE5swqIcVXrxl21aGDU4S50gKH0/d96OMQnSBCyGyZl/oZhbkVmdp5sBoINHd4xZvFSARh2dk6DWA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^3.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^3.0.0",
-        "lodash": "^4.17.15",
-        "mute-stream": "0.0.8",
-        "run-async": "^2.4.0",
-        "rxjs": "^6.6.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "through": "^2.3.6"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/inquirer/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/eslint/node_modules/inquirer/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
-    },
-    "node_modules/eslint/node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
-    },
-    "node_modules/eslint/node_modules/mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/eslint/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/eslint/node_modules/mute-stream": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
-      "dev": true
-    },
-    "node_modules/eslint/node_modules/onetime": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz",
-      "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==",
-      "dev": true,
-      "dependencies": {
-        "mimic-fn": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/eslint/node_modules/restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-      "dev": true,
-      "dependencies": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/run-async": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
-      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/eslint/node_modules/rxjs": {
-      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.0.tgz",
-      "integrity": "sha512-3HMA8z/Oz61DUHe+SdOiQyzIf4tOx5oQHmMir7IZEu6TMqCLHT4LRcmNaUS0NwOz8VLvmmBduMsoaUvMaIiqzg==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^1.9.0"
-      },
-      "engines": {
-        "npm": ">=2.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/eslint/node_modules/string-width": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/string-width/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/eslint/node_modules/strip-ansi/node_modules/ansi-regex": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/eslint/node_modules/supports-color": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-      "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/v8-compile-cache": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz",
-      "integrity": "sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==",
-      "dev": true
-    },
-    "node_modules/espree": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz",
-      "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^7.1.1",
-        "acorn-jsx": "^5.2.0",
-        "eslint-visitor-keys": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/esquery": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz",
-      "integrity": "sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/esquery/node_modules/estraverse": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.1.0.tgz",
-      "integrity": "sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esrecurse": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
-      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/estraverse": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/esutils": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
-      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/events": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.x"
-      }
-    },
-    "node_modules/evp_bytestokey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-      "dev": true,
-      "dependencies": {
-        "md5.js": "^1.3.4",
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "node_modules/execa": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz",
-      "integrity": "sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ==",
-      "dev": true,
-      "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.0",
-        "human-signals": "^2.1.0",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.1",
-        "onetime": "^5.1.2",
-        "signal-exit": "^3.0.3",
-        "strip-final-newline": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
-      }
-    },
-    "node_modules/execa/node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dev": true,
-      "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/execa/node_modules/path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/execa/node_modules/shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dev": true,
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/execa/node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/execa/node_modules/signal-exit": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
-      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
-      "dev": true
-    },
-    "node_modules/execa/node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
-    },
-    "node_modules/fast-json-stable-stringify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
-      "dev": true
-    },
-    "node_modules/fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-      "dev": true
-    },
-    "node_modules/fastest-levenshtein": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
-      "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==",
-      "dev": true
-    },
-    "node_modules/file-entry-cache": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
-      "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
-      "dev": true,
-      "dependencies": {
-        "flat-cache": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/find-root": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
-      "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==",
-      "dev": true
-    },
-    "node_modules/find-up": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/flat-cache": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
-      "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
-      "dev": true,
-      "dependencies": {
-        "flatted": "^2.0.0",
-        "rimraf": "2.6.3",
-        "write": "1.0.3"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/flat-cache/node_modules/glob": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-      "dev": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/flat-cache/node_modules/rimraf": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/flatted": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz",
-      "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==",
-      "dev": true
-    },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
-    },
-    "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
-    },
-    "node_modules/functional-red-black-tree": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-      "dev": true
-    },
-    "node_modules/get-stream": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/glob-to-regexp": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
-      "dev": true
-    },
-    "node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/graceful-fs": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/has-symbols": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
-      "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/hash-base": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
-      "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/hash.js": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "minimalistic-assert": "^1.0.1"
-      }
-    },
-    "node_modules/hmac-drbg": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
-      "dev": true,
-      "dependencies": {
-        "hash.js": "^1.0.3",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "node_modules/hosted-git-info": {
-      "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-      "dev": true
-    },
-    "node_modules/htmlparser2": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-4.1.0.tgz",
-      "integrity": "sha512-4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q==",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^3.0.0",
-        "domutils": "^2.0.0",
-        "entities": "^2.0.0"
-      }
-    },
-    "node_modules/https-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
-      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
-      "dev": true
-    },
-    "node_modules/human-signals": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.17.0"
-      }
-    },
-    "node_modules/ieee754": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz",
-      "integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==",
-      "dev": true
-    },
-    "node_modules/ignore": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/import-fresh": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
-      "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==",
-      "dev": true,
-      "dependencies": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/import-fresh/node_modules/resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/import-local": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
-      "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==",
-      "dev": true,
-      "dependencies": {
-        "pkg-dir": "^4.2.0",
-        "resolve-cwd": "^3.0.0"
-      },
-      "bin": {
-        "import-local-fixture": "fixtures/cli.js"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/import-local/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/import-local/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/import-local/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/import-local/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/import-local/node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/import-local/node_modules/pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.19"
-      }
-    },
-    "node_modules/indexof": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
-      "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
-      "dev": true
-    },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-      "dev": true
-    },
-    "node_modules/interpret": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz",
-      "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-      "dev": true
-    },
-    "node_modules/is-core-module": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz",
-      "integrity": "sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==",
-      "dev": true,
-      "dependencies": {
-        "has": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-date-object": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
-      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/is-glob": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz",
-      "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
-      "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-string": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz",
-      "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-      "dev": true
-    },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
-    },
-    "node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/jest-worker": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
-      "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^7.0.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      }
-    },
-    "node_modules/jest-worker/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-worker/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/joycon": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/joycon/-/joycon-3.0.1.tgz",
-      "integrity": "sha512-SJcJNBg32dGgxhPtM0wQqxqV0ax9k/9TaUskGDSJkSFSQOEWWvQ3zzWdGQRIUry2j1zA5+ReH13t0Mf3StuVZA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/jquery": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
-      "integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg=="
-    },
-    "node_modules/jquery-migrate": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/jquery-migrate/-/jquery-migrate-3.1.0.tgz",
-      "integrity": "sha512-u/MtE1ST2pCr3rCyouJG2xMiw/k3OzLNeRKprjKTeHUezCGr0DyEgeXFdqFLmQfxfR5EsVu+mGo/sCcYdiYcIQ==",
-      "peerDependencies": {
-        "jquery": ">=3 <4"
-      }
-    },
-    "node_modules/jquery.browser": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/jquery.browser/-/jquery.browser-0.1.0.tgz",
-      "integrity": "sha1-nHKmCV/SgUtER26o9xZne3Kmors=",
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/js-yaml": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
-      "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/jsesc": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.1.tgz",
-      "integrity": "sha1-5CGiqOINawgZ3yiQj3glJrlt0f4=",
-      "dev": true,
-      "bin": {
-        "jsesc": "bin/jsesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/json-parse-better-errors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-      "dev": true
-    },
-    "node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-      "dev": true
-    },
-    "node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/load-json-file": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
-      "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
-        "strip-bom": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/load-json-file/node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/loader-runner": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz",
-      "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.11.5"
-      }
-    },
-    "node_modules/locate-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^2.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/locate-path/node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/md5.js": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz",
-      "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=",
-      "dev": true,
-      "dependencies": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
-      }
-    },
-    "node_modules/merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true
-    },
-    "node_modules/miller-rabin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.0.0",
-        "brorand": "^1.0.1"
-      },
-      "bin": {
-        "miller-rabin": "bin/miller-rabin"
-      }
-    },
-    "node_modules/mime-db": {
-      "version": "1.47.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz",
-      "integrity": "sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mime-types": {
-      "version": "2.1.30",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.30.tgz",
-      "integrity": "sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg==",
-      "dev": true,
-      "dependencies": {
-        "mime-db": "1.47.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/mini-css-extract-plugin": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.6.1.tgz",
-      "integrity": "sha512-wd+SD57/K6DiV7jIR34P+s3uckTRuQvx0tKPcvjFlrEylk6P4mQ2KSWk1hblj1Kxaqok7LogKOieygXqBczNlg==",
-      "dev": true,
-      "dependencies": {
-        "schema-utils": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-      "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "ajv": "^8.8.0",
-        "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.0.0"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-      "dev": true
-    },
-    "node_modules/minimalistic-crypto-utils": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
-      "dev": true
-    },
-    "node_modules/minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-      "dev": true
-    },
-    "node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "node_modules/natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-      "dev": true
-    },
-    "node_modules/neo-async": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-      "dev": true
-    },
-    "node_modules/nice-try": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.4.tgz",
-      "integrity": "sha512-2NpiFHqC87y/zFke0fC0spBXL3bBsoh/p5H1EFhshxjCR5+0g2d6BiXbUFz9v1sAcxsk2htp2eQnNIci2dIYcA==",
-      "dev": true
-    },
-    "node_modules/node-libs-browser": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz",
-      "integrity": "sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==",
-      "dev": true,
-      "dependencies": {
-        "assert": "^1.1.1",
-        "browserify-zlib": "^0.2.0",
-        "buffer": "^4.3.0",
-        "console-browserify": "^1.1.0",
-        "constants-browserify": "^1.0.0",
-        "crypto-browserify": "^3.11.0",
-        "domain-browser": "^1.1.1",
-        "events": "^1.0.0",
-        "https-browserify": "^1.0.0",
-        "os-browserify": "^0.3.0",
-        "path-browserify": "0.0.0",
-        "process": "^0.11.10",
-        "punycode": "^1.2.4",
-        "querystring-es3": "^0.2.0",
-        "readable-stream": "^2.3.3",
-        "stream-browserify": "^2.0.1",
-        "stream-http": "^2.7.2",
-        "string_decoder": "^1.0.0",
-        "timers-browserify": "^2.0.4",
-        "tty-browserify": "0.0.0",
-        "url": "^0.11.0",
-        "util": "^0.10.3",
-        "vm-browserify": "0.0.4"
-      }
-    },
-    "node_modules/node-libs-browser/node_modules/events": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
-      "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
-    "node_modules/node-libs-browser/node_modules/punycode": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-      "dev": true
-    },
-    "node_modules/node-releases": {
-      "version": "1.1.72",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.72.tgz",
-      "integrity": "sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==",
-      "dev": true
-    },
-    "node_modules/normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-      "dev": true,
-      "dependencies": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
-      }
-    },
-    "node_modules/normalize-package-data/node_modules/resolve": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
-      "dev": true,
-      "dependencies": {
-        "path-parse": "^1.0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/npm-run-path": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-      "dev": true,
-      "dependencies": {
-        "path-key": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/npm-run-path/node_modules/path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/object-inspect": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz",
-      "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object-keys": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz",
-      "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.assign": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
-      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.2",
-        "function-bind": "^1.1.1",
-        "has-symbols": "^1.0.0",
-        "object-keys": "^1.0.11"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.entries": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.2.tgz",
-      "integrity": "sha512-BQdB9qKmb/HyNdMNWVr7O3+z5MUIx3aiegEIJqjMBbBf0YT9RRxTJSim4mzFqtyr7PDAHigq0N9dO0m0tRakQA==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5",
-        "has": "^1.0.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.entries/node_modules/es-abstract": {
-      "version": "1.17.6",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
-      "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
-      "dev": true,
-      "dependencies": {
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1",
-        "is-callable": "^1.2.0",
-        "is-regex": "^1.1.0",
-        "object-inspect": "^1.7.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.0",
-        "string.prototype.trimend": "^1.0.1",
-        "string.prototype.trimstart": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries/node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries/node_modules/is-callable": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
-      "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries/node_modules/is-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
-      "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries/node_modules/is-symbol": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
-      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries/node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.values": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz",
-      "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/es-abstract": {
-      "version": "1.17.6",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
-      "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
-      "dev": true,
-      "dependencies": {
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1",
-        "is-callable": "^1.2.0",
-        "is-regex": "^1.1.0",
-        "object-inspect": "^1.7.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.0",
-        "string.prototype.trimend": "^1.0.1",
-        "string.prototype.trimstart": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/is-callable": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
-      "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/is-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
-      "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/is-symbol": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
-      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
-    "node_modules/onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "dev": true,
-      "dependencies": {
-        "mimic-fn": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/optionator": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-      "dev": true,
-      "dependencies": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.6",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "word-wrap": "~1.2.3"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/os-browserify": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
-      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
-      "dev": true
-    },
-    "node_modules/os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/p-limit": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/p-locate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/p-try": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/pako": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz",
-      "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==",
-      "dev": true
-    },
-    "node_modules/parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
-      "dependencies": {
-        "callsites": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/parse-asn1": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz",
-      "integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==",
-      "dev": true,
-      "dependencies": {
-        "asn1.js": "^4.0.0",
-        "browserify-aes": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.0",
-        "pbkdf2": "^3.0.3"
-      }
-    },
-    "node_modules/parse-json": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-      "dev": true,
-      "dependencies": {
-        "error-ex": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path": {
-      "version": "0.12.7",
-      "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz",
-      "integrity": "sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=",
-      "dev": true,
-      "dependencies": {
-        "process": "^0.11.1",
-        "util": "^0.10.3"
-      }
-    },
-    "node_modules/path-browserify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
-      "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
-      "dev": true
-    },
-    "node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/path-parse": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
-      "dev": true
-    },
-    "node_modules/path-type": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
-      "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
-      "dev": true,
-      "dependencies": {
-        "pify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/path-type/node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pbkdf2": {
-      "version": "3.0.16",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.16.tgz",
-      "integrity": "sha512-y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA==",
-      "dev": true,
-      "dependencies": {
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4",
-        "ripemd160": "^2.0.1",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      },
-      "engines": {
-        "node": ">=0.12"
-      }
-    },
-    "node_modules/pkg-dir": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
-      "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/process": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6.0"
-      }
-    },
-    "node_modules/process-nextick-args": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
-      "dev": true
-    },
-    "node_modules/progress": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/public-encrypt": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz",
-      "integrity": "sha512-4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "parse-asn1": "^5.0.0",
-        "randombytes": "^2.0.1"
-      }
-    },
-    "node_modules/punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/querystring": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
-      "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
-    "node_modules/querystring-es3": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
-    "node_modules/randombytes": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz",
-      "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "node_modules/randomfill": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-      "dev": true,
-      "dependencies": {
-        "randombytes": "^2.0.5",
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "node_modules/read-pkg": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
-      "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
-      "dev": true,
-      "dependencies": {
-        "load-json-file": "^2.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/read-pkg-up": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-      "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^2.0.0",
-        "read-pkg": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/readable-stream": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/rechoir": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz",
-      "integrity": "sha512-ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q==",
-      "dev": true,
-      "dependencies": {
-        "resolve": "^1.9.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/rechoir/node_modules/resolve": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
-      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
-      "dev": true,
-      "dependencies": {
-        "is-core-module": "^2.2.0",
-        "path-parse": "^1.0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/regexpp": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
-      "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.5.0"
-      }
-    },
-    "node_modules/require-from-string": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/resolve-cwd": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
-      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
-      "dev": true,
-      "dependencies": {
-        "resolve-from": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/resolve-from": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ripemd160": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-      "dev": true,
-      "dependencies": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
-      }
-    },
-    "node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
-    },
-    "node_modules/safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
-    },
-    "node_modules/schema-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
-      "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.6",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/schema-utils/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/schema-utils/node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
-    "node_modules/semver": {
-      "version": "5.5.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.1.tgz",
-      "integrity": "sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/serialize-javascript": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
-      "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
-      "dev": true,
-      "dependencies": {
-        "randombytes": "^2.1.0"
-      }
-    },
-    "node_modules/serialize-javascript/node_modules/randombytes": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "node_modules/setimmediate": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
-      "dev": true
-    },
-    "node_modules/sha.js": {
-      "version": "2.4.11",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      },
-      "bin": {
-        "sha.js": "bin.js"
-      }
-    },
-    "node_modules/shallow-clone": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
-      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-      "dev": true,
-      "dependencies": {
-        "shebang-regex": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/signal-exit": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
-      "dev": true
-    },
-    "node_modules/slice-ansi": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
-      "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.0",
-        "astral-regex": "^1.0.0",
-        "is-fullwidth-code-point": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/spdx-correct": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
-      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
-      "dev": true,
-      "dependencies": {
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-exceptions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
-      "dev": true
-    },
-    "node_modules/spdx-expression-parse": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
-      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
-      "dev": true,
-      "dependencies": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-license-ids": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
-      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
-      "dev": true
-    },
-    "node_modules/sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-      "dev": true
-    },
-    "node_modules/stream-browserify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
-      "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
-      "dev": true,
-      "dependencies": {
-        "inherits": "~2.0.1",
-        "readable-stream": "^2.0.2"
-      }
-    },
-    "node_modules/stream-http": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
-      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
-      "dev": true,
-      "dependencies": {
-        "builtin-status-codes": "^3.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.3.6",
-        "to-arraybuffer": "^1.0.0",
-        "xtend": "^4.0.0"
-      }
-    },
-    "node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "node_modules/string.prototype.trimend": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
-      "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimend/node_modules/es-abstract": {
-      "version": "1.17.6",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
-      "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
-      "dev": true,
-      "dependencies": {
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1",
-        "is-callable": "^1.2.0",
-        "is-regex": "^1.1.0",
-        "object-inspect": "^1.7.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.0",
-        "string.prototype.trimend": "^1.0.1",
-        "string.prototype.trimstart": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimend/node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimend/node_modules/is-callable": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
-      "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimend/node_modules/is-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
-      "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimend/node_modules/is-symbol": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
-      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimend/node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/string.prototype.trimstart": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
-      "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimstart/node_modules/es-abstract": {
-      "version": "1.17.6",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
-      "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
-      "dev": true,
-      "dependencies": {
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1",
-        "is-callable": "^1.2.0",
-        "is-regex": "^1.1.0",
-        "object-inspect": "^1.7.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.0",
-        "string.prototype.trimend": "^1.0.1",
-        "string.prototype.trimstart": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimstart/node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimstart/node_modules/is-callable": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
-      "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimstart/node_modules/is-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
-      "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimstart/node_modules/is-symbol": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
-      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimstart/node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/strip-final-newline": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/strip-json-comments": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.0.tgz",
-      "integrity": "sha512-e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/table": {
-      "version": "5.4.6",
-      "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
-      "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.10.2",
-        "lodash": "^4.17.14",
-        "slice-ansi": "^2.1.0",
-        "string-width": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/table/node_modules/ajv": {
-      "version": "6.12.3",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/table/node_modules/ansi-regex": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/table/node_modules/emoji-regex": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-      "dev": true
-    },
-    "node_modules/table/node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
-    },
-    "node_modules/table/node_modules/string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/table/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/tapable": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.0.tgz",
-      "integrity": "sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/terser": {
-      "version": "5.7.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.7.0.tgz",
-      "integrity": "sha512-HP5/9hp2UaZt5fYkuhNBR8YyRcT8juw8+uFbAme53iN9hblvKnLUTKkmwJG6ocWpIKf8UK4DoeWG4ty0J6S6/g==",
-      "dev": true,
-      "dependencies": {
-        "commander": "^2.20.0",
-        "source-map": "~0.7.2",
-        "source-map-support": "~0.5.19"
-      },
-      "bin": {
-        "terser": "bin/terser"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/terser-webpack-plugin": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.1.2.tgz",
-      "integrity": "sha512-6QhDaAiVHIQr5Ab3XUWZyDmrIPCHMiqJVljMF91YKyqwKkL5QHnYMkrMBy96v9Z7ev1hGhSEw1HQZc2p/s5Z8Q==",
-      "dev": true,
-      "dependencies": {
-        "jest-worker": "^26.6.2",
-        "p-limit": "^3.1.0",
-        "schema-utils": "^3.0.0",
-        "serialize-javascript": "^5.0.1",
-        "source-map": "^0.6.1",
-        "terser": "^5.7.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.1.0"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "dev": true,
-      "dependencies": {
-        "yocto-queue": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/terser/node_modules/source-map": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/terser/node_modules/source-map-support": {
-      "version": "0.5.19",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
-      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
-      "dev": true,
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      }
-    },
-    "node_modules/terser/node_modules/source-map-support/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-      "dev": true
-    },
-    "node_modules/through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-      "dev": true
-    },
-    "node_modules/timers-browserify": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz",
-      "integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
-      "dev": true,
-      "dependencies": {
-        "setimmediate": "^1.0.4"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
-    "node_modules/tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-      "dev": true,
-      "dependencies": {
-        "os-tmpdir": "~1.0.2"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
-    "node_modules/to-arraybuffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
-      "dev": true
-    },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/tsconfig-paths": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz",
-      "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==",
-      "dev": true,
-      "dependencies": {
-        "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
-        "minimist": "^1.2.0",
-        "strip-bom": "^3.0.0"
-      }
-    },
-    "node_modules/tsconfig-paths/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/tslib": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
-      "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==",
-      "dev": true
-    },
-    "node_modules/tty-browserify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
-      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
-      "dev": true
-    },
-    "node_modules/type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/uri-js": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
-      "dev": true,
-      "dependencies": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "node_modules/url": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
-      "dev": true,
-      "dependencies": {
-        "punycode": "1.3.2",
-        "querystring": "0.2.0"
-      }
-    },
-    "node_modules/url/node_modules/punycode": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-      "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
-      "dev": true
-    },
-    "node_modules/util": {
-      "version": "0.10.4",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
-      "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "2.0.3"
-      }
-    },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
-    },
-    "node_modules/v8-compile-cache": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
-      "dev": true
-    },
-    "node_modules/validate-npm-package-license": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-      "dev": true,
-      "dependencies": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
-    "node_modules/vm-browserify": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
-      "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
-      "dev": true,
-      "dependencies": {
-        "indexof": "0.0.1"
-      }
-    },
-    "node_modules/watchpack": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.1.1.tgz",
-      "integrity": "sha512-Oo7LXCmc1eE1AjyuSBmtC3+Wy4HcV8PxWh2kP6fOl8yTlNS7r0K9l1ao2lrrUza7V39Y3D/BbJgY8VeSlc5JKw==",
-      "dev": true,
-      "dependencies": {
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.1.2"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/webpack": {
-      "version": "5.37.1",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.37.1.tgz",
-      "integrity": "sha512-btZjGy/hSjCAAVHw+cKG+L0M+rstlyxbO2C+BOTaQ5/XAnxkDrP5sVbqWhXgo4pL3X2dcOib6rqCP20Zr9PLow==",
-      "dev": true,
-      "dependencies": {
-        "@types/eslint-scope": "^3.7.0",
-        "@types/estree": "^0.0.47",
-        "@webassemblyjs/ast": "1.11.0",
-        "@webassemblyjs/wasm-edit": "1.11.0",
-        "@webassemblyjs/wasm-parser": "1.11.0",
-        "acorn": "^8.2.1",
-        "browserslist": "^4.14.5",
-        "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.8.0",
-        "es-module-lexer": "^0.4.0",
-        "eslint-scope": "^5.1.1",
-        "events": "^3.2.0",
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.2.4",
-        "json-parse-better-errors": "^1.0.2",
-        "loader-runner": "^4.2.0",
-        "mime-types": "^2.1.27",
-        "neo-async": "^2.6.2",
-        "schema-utils": "^3.0.0",
-        "tapable": "^2.1.1",
-        "terser-webpack-plugin": "^5.1.1",
-        "watchpack": "^2.0.0",
-        "webpack-sources": "^2.1.1"
-      },
-      "bin": {
-        "webpack": "bin/webpack.js"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependenciesMeta": {
-        "webpack-cli": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/webpack-cli": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.7.0.tgz",
-      "integrity": "sha512-7bKr9182/sGfjFm+xdZSwgQuFjgEcy0iCTIBxRUeteJ2Kr8/Wz0qNJX+jw60LU36jApt4nmMkep6+W5AKhok6g==",
-      "dev": true,
-      "dependencies": {
-        "@discoveryjs/json-ext": "^0.5.0",
-        "@webpack-cli/configtest": "^1.0.3",
-        "@webpack-cli/info": "^1.2.4",
-        "@webpack-cli/serve": "^1.4.0",
-        "colorette": "^1.2.1",
-        "commander": "^7.0.0",
-        "execa": "^5.0.0",
-        "fastest-levenshtein": "^1.0.12",
-        "import-local": "^3.0.2",
-        "interpret": "^2.2.0",
-        "rechoir": "^0.7.0",
-        "v8-compile-cache": "^2.2.0",
-        "webpack-merge": "^5.7.3"
-      },
-      "bin": {
-        "webpack-cli": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "peerDependencies": {
-        "webpack": "4.x.x || 5.x.x"
-      },
-      "peerDependenciesMeta": {
-        "@webpack-cli/generators": {
-          "optional": true
-        },
-        "@webpack-cli/migrate": {
-          "optional": true
-        },
-        "webpack-bundle-analyzer": {
-          "optional": true
-        },
-        "webpack-dev-server": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/webpack-cli/node_modules/commander": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/webpack-merge": {
-      "version": "5.7.3",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.7.3.tgz",
-      "integrity": "sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA==",
-      "dev": true,
-      "dependencies": {
-        "clone-deep": "^4.0.1",
-        "wildcard": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/webpack/node_modules/acorn": {
-      "version": "8.7.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
-      "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/webpack/node_modules/browserslist": {
-      "version": "4.16.6",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
-      "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
-      "dev": true,
-      "dependencies": {
-        "caniuse-lite": "^1.0.30001219",
-        "colorette": "^1.2.2",
-        "electron-to-chromium": "^1.3.723",
-        "escalade": "^3.1.1",
-        "node-releases": "^1.1.71"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      },
-      "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/browserslist"
-      }
-    },
-    "node_modules/webpack/node_modules/caniuse-lite": {
-      "version": "1.0.30001228",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz",
-      "integrity": "sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A==",
-      "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/browserslist"
-      }
-    },
-    "node_modules/webpack/node_modules/electron-to-chromium": {
-      "version": "1.3.732",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.732.tgz",
-      "integrity": "sha512-qKD5Pbq+QMk4nea4lMuncUMhpEiQwaJyCW7MrvissnRcBDENhVfDmAqQYRQ3X525oTzhar9Zh1cK0L2d1UKYcw==",
-      "dev": true
-    },
-    "node_modules/webpack/node_modules/graceful-fs": {
-      "version": "4.2.6",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
-      "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==",
-      "dev": true
-    },
-    "node_modules/webpack/node_modules/source-list-map": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
-      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
-      "dev": true
-    },
-    "node_modules/webpack/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/webpack-sources": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.2.0.tgz",
-      "integrity": "sha512-bQsA24JLwcnWGArOKUxYKhX3Mz/nK1Xf6hxullKERyktjNMC4x8koOeaDNTA2fEJ09BdWLbM/iTW0ithREUP0w==",
-      "dev": true,
-      "dependencies": {
-        "source-list-map": "^2.0.1",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
-      }
-    },
-    "node_modules/wildcard": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
-      "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==",
-      "dev": true
-    },
-    "node_modules/word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
-    },
-    "node_modules/write": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
-      "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
-      "dev": true,
-      "dependencies": {
-        "mkdirp": "^0.5.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/xtend": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4"
-      }
-    },
-    "node_modules/yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/zxcvbn": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/zxcvbn/-/zxcvbn-4.4.2.tgz",
-      "integrity": "sha1-KOwXzwl0PtyrBW3dixsGJizHPDA="
-    }
-  },
   "dependencies": {
     "@babel/helper-validator-identifier": {
       "version": "7.10.4",
@@ -5495,8 +224,7 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.3.tgz",
       "integrity": "sha512-WQs0ep98FXX2XBAfQpRbY0Ma6ADw8JR6xoIkaIiJIzClGOMqVRvPCWqndTxf28DgFopWan0EKtHtg/5W1h0Zkw==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "@webpack-cli/info": {
       "version": "1.2.4",
@@ -5511,8 +239,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.4.0.tgz",
       "integrity": "sha512-xgT/HqJ+uLWGX+Mzufusl3cgjAcnqYYskaB7o0vRcwOEfuu6hMzSILQpnIzFMGsTaeaX4Nnekl+6fadLbl1/Vg==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "@xtuc/ieee754": {
       "version": "1.2.0",
@@ -5536,8 +263,7 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz",
       "integrity": "sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "ajv": {
       "version": "8.11.0",
@@ -7778,8 +2504,7 @@
     "jquery-migrate": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/jquery-migrate/-/jquery-migrate-3.1.0.tgz",
-      "integrity": "sha512-u/MtE1ST2pCr3rCyouJG2xMiw/k3OzLNeRKprjKTeHUezCGr0DyEgeXFdqFLmQfxfR5EsVu+mGo/sCcYdiYcIQ==",
-      "requires": {}
+      "integrity": "sha512-u/MtE1ST2pCr3rCyouJG2xMiw/k3OzLNeRKprjKTeHUezCGr0DyEgeXFdqFLmQfxfR5EsVu+mGo/sCcYdiYcIQ=="
     },
     "jquery.browser": {
       "version": "0.1.0",
@@ -8662,8 +3387,7 @@
           "version": "3.5.2",
           "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
           "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-          "dev": true,
-          "requires": {}
+          "dev": true
         }
       }
     },
@@ -8817,15 +3541,6 @@
         "xtend": "^4.0.0"
       }
     },
-    "string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
     "string.prototype.trimend": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
@@ -8970,6 +3685,15 @@
         }
       }
     },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
     "strip-bom": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
diff --git a/themes/package.json b/themes/package.json
index 2b1567912c5ae..a12580e0e564a 100644
--- a/themes/package.json
+++ b/themes/package.json
@@ -32,4 +32,4 @@
     "webpack": "^5.37.1",
     "webpack-cli": "^4.7.0"
   }
-}
\ No newline at end of file
+}

From 38e7d3477a438a4ffe21ae08d107ac2bc80cf740 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Wed, 5 Apr 2023 16:39:57 +0300
Subject: [PATCH 0153/1030] revert dev environment related files

---
 admin-dev/themes/default/package-lock.json   | 11599 ++++++++++++-
 admin-dev/themes/new-theme/package-lock.json | 14466 ++++++++++++++++-
 themes/package-lock.json                     |  5306 +++++-
 themes/package.json                          |     2 +-
 4 files changed, 31218 insertions(+), 155 deletions(-)

diff --git a/admin-dev/themes/default/package-lock.json b/admin-dev/themes/default/package-lock.json
index 50b5e2dddaae3..abbc3faabfb0c 100644
--- a/admin-dev/themes/default/package-lock.json
+++ b/admin-dev/themes/default/package-lock.json
@@ -1,8 +1,11520 @@
 {
   "name": "default",
   "version": "1.7.5",
-  "lockfileVersion": 1,
+  "lockfileVersion": 2,
   "requires": true,
+  "packages": {
+    "": {
+      "name": "default",
+      "version": "1.7.5",
+      "license": "OSL-3.0",
+      "dependencies": {
+        "@openfonts/ubuntu-condensed_latin": "^1.44.2",
+        "open-sans-fonts": "^1.6.2",
+        "perfect-scrollbar": "^1.4.0",
+        "prestakit": "^1.2.5",
+        "vazirmatn": "32.102.0"
+      },
+      "devDependencies": {
+        "@babel/core": "^7.0.0-rc.1",
+        "@babel/preset-env": "^7.0.0-rc.1",
+        "babel-eslint": "^10.1.0",
+        "babel-loader": "^8.0.2",
+        "bourbon": "^4.3.4",
+        "clean-webpack-plugin": "^2.0.2",
+        "css-loader": "^6.7.1",
+        "csso-webpack-plugin": "^2.0.0-beta.3",
+        "eslint": "^8.18.0",
+        "eslint-config-airbnb-base": "^15.0.0",
+        "eslint-import-resolver-webpack": "^0.12.1",
+        "eslint-plugin-html": "^6.0.0",
+        "eslint-plugin-import": "^2.20.0",
+        "html-webpack-plugin": "^5.5.0",
+        "material-design-icons-iconfont": "^6.7.0",
+        "mini-css-extract-plugin": "^1.6.1",
+        "path": "^0.12.7",
+        "postcss": "^8.4.4",
+        "postcss-cssnext": "^3.1.0",
+        "postcss-loader": "^5.3.0",
+        "sass-embedded": "^1.55.0",
+        "sass-loader": "^13.0.2",
+        "style-loader": "^1.1.3",
+        "stylelint": "^14.5.3",
+        "stylelint-config-prestashop": "^1.0.5",
+        "terser-webpack-plugin": "^5.2.5",
+        "webpack": "^5.53.0",
+        "webpack-cli": "^4.7.0",
+        "webpack-font-preload-plugin": "^1.5.0",
+        "webpack-license-plugin": "^4.2.1",
+        "webpack-remove-empty-scripts": "^0.7.3"
+      }
+    },
+    "node_modules/@ampproject/remapping": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.1.2.tgz",
+      "integrity": "sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.0"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/code-frame": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
+      "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/highlight": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/compat-data": {
+      "version": "7.17.7",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.7.tgz",
+      "integrity": "sha512-p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/core": {
+      "version": "7.17.9",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.9.tgz",
+      "integrity": "sha512-5ug+SfZCpDAkVp9SFIZAzlW18rlzsOcJGaetCjkySnrXXDUw9AR8cDUm1iByTmdWM6yxX6/zycaV76w3YTF2gw==",
+      "dev": true,
+      "dependencies": {
+        "@ampproject/remapping": "^2.1.0",
+        "@babel/code-frame": "^7.16.7",
+        "@babel/generator": "^7.17.9",
+        "@babel/helper-compilation-targets": "^7.17.7",
+        "@babel/helper-module-transforms": "^7.17.7",
+        "@babel/helpers": "^7.17.9",
+        "@babel/parser": "^7.17.9",
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.17.9",
+        "@babel/types": "^7.17.0",
+        "convert-source-map": "^1.7.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.1",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/babel"
+      }
+    },
+    "node_modules/@babel/generator": {
+      "version": "7.17.9",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.9.tgz",
+      "integrity": "sha512-rAdDousTwxbIxbz5I7GEQ3lUip+xVCXooZNbsydCWs3xA7ZsYOv+CFRdzGxRX78BmQHu9B1Eso59AOZQOJDEdQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.17.0",
+        "jsesc": "^2.5.1",
+        "source-map": "^0.5.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-annotate-as-pure": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
+      "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz",
+      "integrity": "sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-explode-assignable-expression": "^7.16.7",
+        "@babel/types": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-compilation-targets": {
+      "version": "7.17.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz",
+      "integrity": "sha512-UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w==",
+      "dev": true,
+      "dependencies": {
+        "@babel/compat-data": "^7.17.7",
+        "@babel/helper-validator-option": "^7.16.7",
+        "browserslist": "^4.17.5",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-create-class-features-plugin": {
+      "version": "7.17.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.9.tgz",
+      "integrity": "sha512-kUjip3gruz6AJKOq5i3nC6CoCEEF/oHH3cp6tOZhB+IyyyPyW0g1Gfsxn3mkk6S08pIA2y8GQh609v9G/5sHVQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-function-name": "^7.17.9",
+        "@babel/helper-member-expression-to-functions": "^7.17.7",
+        "@babel/helper-optimise-call-expression": "^7.16.7",
+        "@babel/helper-replace-supers": "^7.16.7",
+        "@babel/helper-split-export-declaration": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-create-regexp-features-plugin": {
+      "version": "7.17.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz",
+      "integrity": "sha512-awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "regexpu-core": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-define-polyfill-provider": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz",
+      "integrity": "sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-compilation-targets": "^7.13.0",
+        "@babel/helper-module-imports": "^7.12.13",
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/traverse": "^7.13.0",
+        "debug": "^4.1.1",
+        "lodash.debounce": "^4.0.8",
+        "resolve": "^1.14.2",
+        "semver": "^6.1.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0-0"
+      }
+    },
+    "node_modules/@babel/helper-environment-visitor": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz",
+      "integrity": "sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-explode-assignable-expression": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz",
+      "integrity": "sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-function-name": {
+      "version": "7.17.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
+      "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/template": "^7.16.7",
+        "@babel/types": "^7.17.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-hoist-variables": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
+      "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-member-expression-to-functions": {
+      "version": "7.17.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz",
+      "integrity": "sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.17.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-imports": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
+      "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-transforms": {
+      "version": "7.17.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz",
+      "integrity": "sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-module-imports": "^7.16.7",
+        "@babel/helper-simple-access": "^7.17.7",
+        "@babel/helper-split-export-declaration": "^7.16.7",
+        "@babel/helper-validator-identifier": "^7.16.7",
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.17.3",
+        "@babel/types": "^7.17.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-optimise-call-expression": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz",
+      "integrity": "sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-plugin-utils": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz",
+      "integrity": "sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-remap-async-to-generator": {
+      "version": "7.16.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz",
+      "integrity": "sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-wrap-function": "^7.16.8",
+        "@babel/types": "^7.16.8"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-replace-supers": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz",
+      "integrity": "sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-member-expression-to-functions": "^7.16.7",
+        "@babel/helper-optimise-call-expression": "^7.16.7",
+        "@babel/traverse": "^7.16.7",
+        "@babel/types": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-simple-access": {
+      "version": "7.17.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz",
+      "integrity": "sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.17.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz",
+      "integrity": "sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.16.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-split-export-declaration": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
+      "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
+      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-option": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
+      "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-wrap-function": {
+      "version": "7.16.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz",
+      "integrity": "sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-function-name": "^7.16.7",
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.16.8",
+        "@babel/types": "^7.16.8"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helpers": {
+      "version": "7.17.9",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.9.tgz",
+      "integrity": "sha512-cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.17.9",
+        "@babel/types": "^7.17.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight": {
+      "version": "7.17.9",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",
+      "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.16.7",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/parser": {
+      "version": "7.17.9",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.9.tgz",
+      "integrity": "sha512-vqUSBLP8dQHFPdPi9bc5GK9vRkYHJ49fsZdtoJ8EQ8ibpwk5rPKfvNIwChB0KVXcIjcepEBBd2VHC5r9Gy8ueg==",
+      "dev": true,
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz",
+      "integrity": "sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz",
+      "integrity": "sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
+        "@babel/plugin-proposal-optional-chaining": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.13.0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-async-generator-functions": {
+      "version": "7.16.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz",
+      "integrity": "sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-remap-async-to-generator": "^7.16.8",
+        "@babel/plugin-syntax-async-generators": "^7.8.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-class-properties": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz",
+      "integrity": "sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-class-static-block": {
+      "version": "7.17.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.17.6.tgz",
+      "integrity": "sha512-X/tididvL2zbs7jZCeeRJ8167U/+Ac135AM6jCAx6gYXDUviZV5Ku9UDvWS2NCuWlFjIRXklYhwo6HhAC7ETnA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.17.6",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.12.0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-dynamic-import": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz",
+      "integrity": "sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-export-namespace-from": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz",
+      "integrity": "sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-json-strings": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz",
+      "integrity": "sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-json-strings": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-logical-assignment-operators": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz",
+      "integrity": "sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz",
+      "integrity": "sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-numeric-separator": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz",
+      "integrity": "sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-object-rest-spread": {
+      "version": "7.17.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.17.3.tgz",
+      "integrity": "sha512-yuL5iQA/TbZn+RGAfxQXfi7CNLmKi1f8zInn4IgobuCWcAb7i+zj4TYzQ9l8cEzVyJ89PDGuqxK1xZpUDISesw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/compat-data": "^7.17.0",
+        "@babel/helper-compilation-targets": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-transform-parameters": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-optional-catch-binding": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz",
+      "integrity": "sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-optional-chaining": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz",
+      "integrity": "sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-private-methods": {
+      "version": "7.16.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz",
+      "integrity": "sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.16.10",
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-private-property-in-object": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz",
+      "integrity": "sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-create-class-features-plugin": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-unicode-property-regex": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz",
+      "integrity": "sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-async-generators": {
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-class-properties": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.12.13"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-class-static-block": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
+      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-dynamic-import": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
+      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-export-namespace-from": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
+      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.3"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-json-strings": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-numeric-separator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-object-rest-spread": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-optional-chaining": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-private-property-in-object": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
+      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-top-level-await": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-arrow-functions": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz",
+      "integrity": "sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-async-to-generator": {
+      "version": "7.16.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz",
+      "integrity": "sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-remap-async-to-generator": "^7.16.8"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-block-scoped-functions": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz",
+      "integrity": "sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-block-scoping": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz",
+      "integrity": "sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-classes": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz",
+      "integrity": "sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-function-name": "^7.16.7",
+        "@babel/helper-optimise-call-expression": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-replace-supers": "^7.16.7",
+        "@babel/helper-split-export-declaration": "^7.16.7",
+        "globals": "^11.1.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-computed-properties": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz",
+      "integrity": "sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-destructuring": {
+      "version": "7.17.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.7.tgz",
+      "integrity": "sha512-XVh0r5yq9sLR4vZ6eVZe8FKfIcSgaTBxVBRSYokRj2qksf6QerYnTxz9/GTuKTH/n/HwLP7t6gtlybHetJ/6hQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-dotall-regex": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz",
+      "integrity": "sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-duplicate-keys": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz",
+      "integrity": "sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-exponentiation-operator": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz",
+      "integrity": "sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-for-of": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz",
+      "integrity": "sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-function-name": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz",
+      "integrity": "sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-compilation-targets": "^7.16.7",
+        "@babel/helper-function-name": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-literals": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz",
+      "integrity": "sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-member-expression-literals": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz",
+      "integrity": "sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-amd": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz",
+      "integrity": "sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-module-transforms": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-commonjs": {
+      "version": "7.17.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.9.tgz",
+      "integrity": "sha512-2TBFd/r2I6VlYn0YRTz2JdazS+FoUuQ2rIFHoAxtyP/0G3D82SBLaRq9rnUkpqlLg03Byfl/+M32mpxjO6KaPw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-module-transforms": "^7.17.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-simple-access": "^7.17.7",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-systemjs": {
+      "version": "7.17.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.17.8.tgz",
+      "integrity": "sha512-39reIkMTUVagzgA5x88zDYXPCMT6lcaRKs1+S9K6NKBPErbgO/w/kP8GlNQTC87b412ZTlmNgr3k2JrWgHH+Bw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-hoist-variables": "^7.16.7",
+        "@babel/helper-module-transforms": "^7.17.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-validator-identifier": "^7.16.7",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-umd": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz",
+      "integrity": "sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-module-transforms": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
+      "version": "7.16.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz",
+      "integrity": "sha512-j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-new-target": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz",
+      "integrity": "sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-object-super": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz",
+      "integrity": "sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-replace-supers": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-parameters": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz",
+      "integrity": "sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-property-literals": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz",
+      "integrity": "sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-regenerator": {
+      "version": "7.17.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.17.9.tgz",
+      "integrity": "sha512-Lc2TfbxR1HOyn/c6b4Y/b6NHoTb67n/IoWLxTu4kC7h4KQnWlhCq2S8Tx0t2SVvv5Uu87Hs+6JEJ5kt2tYGylQ==",
+      "dev": true,
+      "dependencies": {
+        "regenerator-transform": "^0.15.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-reserved-words": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz",
+      "integrity": "sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-shorthand-properties": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz",
+      "integrity": "sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-spread": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz",
+      "integrity": "sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-sticky-regex": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz",
+      "integrity": "sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-template-literals": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz",
+      "integrity": "sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-typeof-symbol": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz",
+      "integrity": "sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-unicode-escapes": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz",
+      "integrity": "sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-unicode-regex": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz",
+      "integrity": "sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/preset-env": {
+      "version": "7.16.11",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.11.tgz",
+      "integrity": "sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/compat-data": "^7.16.8",
+        "@babel/helper-compilation-targets": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-validator-option": "^7.16.7",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.16.7",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.16.7",
+        "@babel/plugin-proposal-async-generator-functions": "^7.16.8",
+        "@babel/plugin-proposal-class-properties": "^7.16.7",
+        "@babel/plugin-proposal-class-static-block": "^7.16.7",
+        "@babel/plugin-proposal-dynamic-import": "^7.16.7",
+        "@babel/plugin-proposal-export-namespace-from": "^7.16.7",
+        "@babel/plugin-proposal-json-strings": "^7.16.7",
+        "@babel/plugin-proposal-logical-assignment-operators": "^7.16.7",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7",
+        "@babel/plugin-proposal-numeric-separator": "^7.16.7",
+        "@babel/plugin-proposal-object-rest-spread": "^7.16.7",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.16.7",
+        "@babel/plugin-proposal-optional-chaining": "^7.16.7",
+        "@babel/plugin-proposal-private-methods": "^7.16.11",
+        "@babel/plugin-proposal-private-property-in-object": "^7.16.7",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.16.7",
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-class-properties": "^7.12.13",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+        "@babel/plugin-syntax-top-level-await": "^7.14.5",
+        "@babel/plugin-transform-arrow-functions": "^7.16.7",
+        "@babel/plugin-transform-async-to-generator": "^7.16.8",
+        "@babel/plugin-transform-block-scoped-functions": "^7.16.7",
+        "@babel/plugin-transform-block-scoping": "^7.16.7",
+        "@babel/plugin-transform-classes": "^7.16.7",
+        "@babel/plugin-transform-computed-properties": "^7.16.7",
+        "@babel/plugin-transform-destructuring": "^7.16.7",
+        "@babel/plugin-transform-dotall-regex": "^7.16.7",
+        "@babel/plugin-transform-duplicate-keys": "^7.16.7",
+        "@babel/plugin-transform-exponentiation-operator": "^7.16.7",
+        "@babel/plugin-transform-for-of": "^7.16.7",
+        "@babel/plugin-transform-function-name": "^7.16.7",
+        "@babel/plugin-transform-literals": "^7.16.7",
+        "@babel/plugin-transform-member-expression-literals": "^7.16.7",
+        "@babel/plugin-transform-modules-amd": "^7.16.7",
+        "@babel/plugin-transform-modules-commonjs": "^7.16.8",
+        "@babel/plugin-transform-modules-systemjs": "^7.16.7",
+        "@babel/plugin-transform-modules-umd": "^7.16.7",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.16.8",
+        "@babel/plugin-transform-new-target": "^7.16.7",
+        "@babel/plugin-transform-object-super": "^7.16.7",
+        "@babel/plugin-transform-parameters": "^7.16.7",
+        "@babel/plugin-transform-property-literals": "^7.16.7",
+        "@babel/plugin-transform-regenerator": "^7.16.7",
+        "@babel/plugin-transform-reserved-words": "^7.16.7",
+        "@babel/plugin-transform-shorthand-properties": "^7.16.7",
+        "@babel/plugin-transform-spread": "^7.16.7",
+        "@babel/plugin-transform-sticky-regex": "^7.16.7",
+        "@babel/plugin-transform-template-literals": "^7.16.7",
+        "@babel/plugin-transform-typeof-symbol": "^7.16.7",
+        "@babel/plugin-transform-unicode-escapes": "^7.16.7",
+        "@babel/plugin-transform-unicode-regex": "^7.16.7",
+        "@babel/preset-modules": "^0.1.5",
+        "@babel/types": "^7.16.8",
+        "babel-plugin-polyfill-corejs2": "^0.3.0",
+        "babel-plugin-polyfill-corejs3": "^0.5.0",
+        "babel-plugin-polyfill-regenerator": "^0.3.0",
+        "core-js-compat": "^3.20.2",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/preset-modules": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
+      "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
+        "@babel/plugin-transform-dotall-regex": "^7.4.4",
+        "@babel/types": "^7.4.4",
+        "esutils": "^2.0.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/runtime": {
+      "version": "7.17.9",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.9.tgz",
+      "integrity": "sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==",
+      "dev": true,
+      "dependencies": {
+        "regenerator-runtime": "^0.13.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/runtime/node_modules/regenerator-runtime": {
+      "version": "0.13.9",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
+      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
+      "dev": true
+    },
+    "node_modules/@babel/template": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
+      "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.16.7",
+        "@babel/parser": "^7.16.7",
+        "@babel/types": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/traverse": {
+      "version": "7.17.9",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.9.tgz",
+      "integrity": "sha512-PQO8sDIJ8SIwipTPiR71kJQCKQYB5NGImbOviK8K+kg5xkNSYXLBupuX9QhatFowrsvo9Hj8WgArg3W7ijNAQw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.16.7",
+        "@babel/generator": "^7.17.9",
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-function-name": "^7.17.9",
+        "@babel/helper-hoist-variables": "^7.16.7",
+        "@babel/helper-split-export-declaration": "^7.16.7",
+        "@babel/parser": "^7.17.9",
+        "@babel/types": "^7.17.0",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/types": {
+      "version": "7.17.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz",
+      "integrity": "sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.16.7",
+        "to-fast-properties": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@discoveryjs/json-ext": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
+      "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/@eslint/eslintrc": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz",
+      "integrity": "sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.4.0",
+        "globals": "^13.15.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/globals": {
+      "version": "13.18.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.18.0.tgz",
+      "integrity": "sha512-/mR4KI8Ps2spmoc0Ulu9L7agOF0du1CZNQ3dke8yItYlyKNmGrkONemBbd6V8UTc1Wgcqn21t3WYB7dbRmh6/A==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@humanwhocodes/config-array": {
+      "version": "0.11.7",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.7.tgz",
+      "integrity": "sha512-kBbPWzN8oVMLb0hOUYXhmxggL/1cJE6ydvjDIGi9EnAGUyA7cLVKQg+d/Dsm+KZwx2czGHrCmMVLiyg8s5JPKw==",
+      "dev": true,
+      "dependencies": {
+        "@humanwhocodes/object-schema": "^1.2.1",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.5"
+      },
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
+    "node_modules/@humanwhocodes/module-importer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.22"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
+    },
+    "node_modules/@humanwhocodes/object-schema": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+      "dev": true
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz",
+      "integrity": "sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.4.11",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz",
+      "integrity": "sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg==",
+      "dev": true
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz",
+      "integrity": "sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.0.3",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
+      }
+    },
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@openfonts/ubuntu-condensed_latin": {
+      "version": "1.44.2",
+      "resolved": "https://registry.npmjs.org/@openfonts/ubuntu-condensed_latin/-/ubuntu-condensed_latin-1.44.2.tgz",
+      "integrity": "sha512-OWBvYVl/HbYQcKNlIAg7VFMvTpKobHf5FVDIOlBp16MMTBApQVelvWYueZ41jLhrTDproTI1LjZiZBYrUz5h4g=="
+    },
+    "node_modules/@tootallnate/once": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
+      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@types/eslint": {
+      "version": "8.4.1",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.1.tgz",
+      "integrity": "sha512-GE44+DNEyxxh2Kc6ro/VkIj+9ma0pO0bwv9+uHSyBrikYOHr8zYcdPvnBOp1aw8s+CjRvuSx7CyWqRrNFQ59mA==",
+      "dev": true,
+      "dependencies": {
+        "@types/estree": "*",
+        "@types/json-schema": "*"
+      }
+    },
+    "node_modules/@types/eslint-scope": {
+      "version": "3.7.3",
+      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz",
+      "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==",
+      "dev": true,
+      "dependencies": {
+        "@types/eslint": "*",
+        "@types/estree": "*"
+      }
+    },
+    "node_modules/@types/estree": {
+      "version": "0.0.51",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
+      "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==",
+      "dev": true
+    },
+    "node_modules/@types/glob": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
+      "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
+      "dev": true,
+      "dependencies": {
+        "@types/minimatch": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/html-minifier-terser": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
+      "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==",
+      "dev": true
+    },
+    "node_modules/@types/json-schema": {
+      "version": "7.0.11",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
+      "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
+      "dev": true
+    },
+    "node_modules/@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
+      "dev": true
+    },
+    "node_modules/@types/minimatch": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
+      "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==",
+      "dev": true
+    },
+    "node_modules/@types/minimist": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz",
+      "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==",
+      "dev": true
+    },
+    "node_modules/@types/node": {
+      "version": "17.0.25",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.25.tgz",
+      "integrity": "sha512-wANk6fBrUwdpY4isjWrKTufkrXdu1D2YHCot2fD/DfWxF5sMrVSA+KN7ydckvaTCh0HiqX9IVl0L5/ZoXg5M7w==",
+      "dev": true
+    },
+    "node_modules/@types/normalize-package-data": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
+      "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
+      "dev": true
+    },
+    "node_modules/@types/parse-json": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
+      "dev": true
+    },
+    "node_modules/@types/webpack": {
+      "version": "5.28.0",
+      "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-5.28.0.tgz",
+      "integrity": "sha512-8cP0CzcxUiFuA9xGJkfeVpqmWTk9nx6CWwamRGCj95ph1SmlRRk9KlCZ6avhCbZd4L68LvYT6l1kpdEnQXrF8w==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "tapable": "^2.2.0",
+        "webpack": "^5"
+      }
+    },
+    "node_modules/@webassemblyjs/ast": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
+      "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/helper-numbers": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1"
+      }
+    },
+    "node_modules/@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
+      "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/helper-api-error": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
+      "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/helper-buffer": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
+      "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/helper-numbers": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
+      "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/floating-point-hex-parser": "1.11.1",
+        "@webassemblyjs/helper-api-error": "1.11.1",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
+      "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/helper-wasm-section": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
+      "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-buffer": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
+        "@webassemblyjs/wasm-gen": "1.11.1"
+      }
+    },
+    "node_modules/@webassemblyjs/ieee754": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
+      "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==",
+      "dev": true,
+      "dependencies": {
+        "@xtuc/ieee754": "^1.2.0"
+      }
+    },
+    "node_modules/@webassemblyjs/leb128": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
+      "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==",
+      "dev": true,
+      "dependencies": {
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/utf8": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
+      "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/wasm-edit": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
+      "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-buffer": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
+        "@webassemblyjs/helper-wasm-section": "1.11.1",
+        "@webassemblyjs/wasm-gen": "1.11.1",
+        "@webassemblyjs/wasm-opt": "1.11.1",
+        "@webassemblyjs/wasm-parser": "1.11.1",
+        "@webassemblyjs/wast-printer": "1.11.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-gen": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
+      "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
+        "@webassemblyjs/ieee754": "1.11.1",
+        "@webassemblyjs/leb128": "1.11.1",
+        "@webassemblyjs/utf8": "1.11.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-opt": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
+      "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-buffer": "1.11.1",
+        "@webassemblyjs/wasm-gen": "1.11.1",
+        "@webassemblyjs/wasm-parser": "1.11.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-parser": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
+      "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-api-error": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
+        "@webassemblyjs/ieee754": "1.11.1",
+        "@webassemblyjs/leb128": "1.11.1",
+        "@webassemblyjs/utf8": "1.11.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wast-printer": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
+      "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webpack-cli/configtest": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.1.1.tgz",
+      "integrity": "sha512-1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg==",
+      "dev": true,
+      "peerDependencies": {
+        "webpack": "4.x.x || 5.x.x",
+        "webpack-cli": "4.x.x"
+      }
+    },
+    "node_modules/@webpack-cli/info": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.4.1.tgz",
+      "integrity": "sha512-PKVGmazEq3oAo46Q63tpMr4HipI3OPfP7LiNOEJg963RMgT0rqheag28NCML0o3GIzA3DmxP1ZIAv9oTX1CUIA==",
+      "dev": true,
+      "dependencies": {
+        "envinfo": "^7.7.3"
+      },
+      "peerDependencies": {
+        "webpack-cli": "4.x.x"
+      }
+    },
+    "node_modules/@webpack-cli/serve": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.6.1.tgz",
+      "integrity": "sha512-gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw==",
+      "dev": true,
+      "peerDependencies": {
+        "webpack-cli": "4.x.x"
+      },
+      "peerDependenciesMeta": {
+        "webpack-dev-server": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@xtuc/ieee754": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+      "dev": true
+    },
+    "node_modules/@xtuc/long": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+      "dev": true
+    },
+    "node_modules/abab": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
+      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
+      "dev": true
+    },
+    "node_modules/acorn": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-globals": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
+      "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^7.1.1",
+        "acorn-walk": "^7.1.1"
+      }
+    },
+    "node_modules/acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true,
+      "peerDependencies": {
+        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/acorn-walk": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
+      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ansis": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/ansis/-/ansis-1.3.4.tgz",
+      "integrity": "sha512-BDXljGSG4gZXmWK64bQzXkI509i5fe8aAa9+eL29e3swaWUqxvxk/XlONjw9AUrNCpQWNdy++0GX7HAhWeR9BQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.13"
+      },
+      "funding": {
+        "type": "patreon",
+        "url": "https://patreon.com/biodiscus"
+      }
+    },
+    "node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "node_modules/array-differ": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz",
+      "integrity": "sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/array-find": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-find/-/array-find-1.0.0.tgz",
+      "integrity": "sha1-bI4obRHtdoMn+OYuzuhzU8o+eLg=",
+      "dev": true
+    },
+    "node_modules/array-includes": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.4.tgz",
+      "integrity": "sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1",
+        "get-intrinsic": "^1.1.1",
+        "is-string": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-union": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+      "dev": true,
+      "dependencies": {
+        "array-uniq": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array.prototype.flat": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
+      "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.2",
+        "es-shim-unscopables": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/arrify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/asn1.js": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
+      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
+    "node_modules/asn1.js/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
+    "node_modules/assert": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
+      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
+      "dev": true,
+      "dependencies": {
+        "object-assign": "^4.1.1",
+        "util": "0.10.3"
+      }
+    },
+    "node_modules/assert/node_modules/inherits": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+      "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+      "dev": true
+    },
+    "node_modules/assert/node_modules/util": {
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+      "dev": true,
+      "dependencies": {
+        "inherits": "2.0.1"
+      }
+    },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "dev": true
+    },
+    "node_modules/autoprefixer": {
+      "version": "7.2.6",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.2.6.tgz",
+      "integrity": "sha512-Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^2.11.3",
+        "caniuse-lite": "^1.0.30000805",
+        "normalize-range": "^0.1.2",
+        "num2fraction": "^1.2.2",
+        "postcss": "^6.0.17",
+        "postcss-value-parser": "^3.2.3"
+      },
+      "bin": {
+        "autoprefixer-info": "bin/autoprefixer-info"
+      }
+    },
+    "node_modules/autoprefixer/node_modules/browserslist": {
+      "version": "2.11.3",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz",
+      "integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==",
+      "deprecated": "Browserslist 2 could fail on reading Browserslist >3.0 config used in other tools.",
+      "dev": true,
+      "dependencies": {
+        "caniuse-lite": "^1.0.30000792",
+        "electron-to-chromium": "^1.3.30"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      }
+    },
+    "node_modules/autoprefixer/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/autoprefixer/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/babel-eslint": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.1.0.tgz",
+      "integrity": "sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==",
+      "deprecated": "babel-eslint is now @babel/eslint-parser. This package will no longer receive updates.",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "@babel/parser": "^7.7.0",
+        "@babel/traverse": "^7.7.0",
+        "@babel/types": "^7.7.0",
+        "eslint-visitor-keys": "^1.0.0",
+        "resolve": "^1.12.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "peerDependencies": {
+        "eslint": ">= 4.12.1"
+      }
+    },
+    "node_modules/babel-loader": {
+      "version": "8.2.4",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.4.tgz",
+      "integrity": "sha512-8dytA3gcvPPPv4Grjhnt8b5IIiTcq/zeXOPk4iTYI0SVXcsmuGg7JtBRDp8S9X+gJfhQ8ektjXZlDu1Bb33U8A==",
+      "dev": true,
+      "dependencies": {
+        "find-cache-dir": "^3.3.1",
+        "loader-utils": "^2.0.0",
+        "make-dir": "^3.1.0",
+        "schema-utils": "^2.6.5"
+      },
+      "engines": {
+        "node": ">= 8.9"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0",
+        "webpack": ">=2"
+      }
+    },
+    "node_modules/babel-plugin-dynamic-import-node": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
+      "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
+      "dev": true,
+      "dependencies": {
+        "object.assign": "^4.1.0"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-corejs2": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz",
+      "integrity": "sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==",
+      "dev": true,
+      "dependencies": {
+        "@babel/compat-data": "^7.13.11",
+        "@babel/helper-define-polyfill-provider": "^0.3.1",
+        "semver": "^6.1.1"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-corejs3": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz",
+      "integrity": "sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-define-polyfill-provider": "^0.3.1",
+        "core-js-compat": "^3.21.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-regenerator": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz",
+      "integrity": "sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-define-polyfill-provider": "^0.3.1"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/babel-runtime": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+      "dev": true,
+      "dependencies": {
+        "core-js": "^2.4.0",
+        "regenerator-runtime": "^0.11.0"
+      }
+    },
+    "node_modules/babel-runtime/node_modules/core-js": {
+      "version": "2.6.12",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
+      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
+      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
+      "dev": true,
+      "hasInstallScript": true
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "node_modules/base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/big.js": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/bn.js": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
+      "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==",
+      "dev": true
+    },
+    "node_modules/boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
+      "dev": true
+    },
+    "node_modules/bootstrap": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz",
+      "integrity": "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/twbs"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/bootstrap"
+        }
+      ],
+      "peerDependencies": {
+        "jquery": "1.9.1 - 3",
+        "popper.js": "^1.16.1"
+      }
+    },
+    "node_modules/bourbon": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/bourbon/-/bourbon-4.3.4.tgz",
+      "integrity": "sha1-TaOAAp6SwMj5dkx3lFGhNLEefMM=",
+      "dev": true
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "dependencies": {
+        "fill-range": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/brorand": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
+      "dev": true
+    },
+    "node_modules/browser-process-hrtime": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
+      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
+      "dev": true
+    },
+    "node_modules/browserify-aes": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+      "dev": true,
+      "dependencies": {
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/browserify-cipher": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+      "dev": true,
+      "dependencies": {
+        "browserify-aes": "^1.0.4",
+        "browserify-des": "^1.0.0",
+        "evp_bytestokey": "^1.0.0"
+      }
+    },
+    "node_modules/browserify-des": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+      "dev": true,
+      "dependencies": {
+        "cipher-base": "^1.0.1",
+        "des.js": "^1.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/browserify-rsa": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
+      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^5.0.0",
+        "randombytes": "^2.0.1"
+      }
+    },
+    "node_modules/browserify-sign": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
+      "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^5.1.1",
+        "browserify-rsa": "^4.0.1",
+        "create-hash": "^1.2.0",
+        "create-hmac": "^1.1.7",
+        "elliptic": "^6.5.3",
+        "inherits": "^2.0.4",
+        "parse-asn1": "^5.1.5",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      }
+    },
+    "node_modules/browserify-sign/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/browserify-sign/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/browserify-zlib": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+      "dev": true,
+      "dependencies": {
+        "pako": "~1.0.5"
+      }
+    },
+    "node_modules/browserslist": {
+      "version": "4.20.2",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.2.tgz",
+      "integrity": "sha512-CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        }
+      ],
+      "dependencies": {
+        "caniuse-lite": "^1.0.30001317",
+        "electron-to-chromium": "^1.4.84",
+        "escalade": "^3.1.1",
+        "node-releases": "^2.0.2",
+        "picocolors": "^1.0.0"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      },
+      "engines": {
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      }
+    },
+    "node_modules/buffer": {
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
+      "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
+      "dev": true,
+      "dependencies": {
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4",
+        "isarray": "^1.0.0"
+      }
+    },
+    "node_modules/buffer-builder": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/buffer-builder/-/buffer-builder-0.2.0.tgz",
+      "integrity": "sha512-7VPMEPuYznPSoR21NE1zvd2Xna6c/CloiZCfcMXR1Jny6PjX0N4Nsa38zcBFo/FMK+BlA+FLKbJCQ0i2yxp+Xg==",
+      "dev": true
+    },
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true
+    },
+    "node_modules/buffer-xor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
+      "dev": true
+    },
+    "node_modules/builtin-status-codes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
+      "dev": true
+    },
+    "node_modules/call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/camel-case": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
+      "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
+      "dev": true,
+      "dependencies": {
+        "pascal-case": "^3.1.2",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/camelcase-keys": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
+      "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^5.3.1",
+        "map-obj": "^4.0.0",
+        "quick-lru": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001332",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001332.tgz",
+      "integrity": "sha512-10T30NYOEQtN6C11YGg411yebhvpnC6Z102+B95eAsN0oB6KUs01ivE8u+G6FMIRtIrVlYXhL+LUwQ3/hXwDWw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        }
+      ]
+    },
+    "node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/chrome-trace-event": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
+      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
+    "node_modules/cipher-base": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/clean-css": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.0.tgz",
+      "integrity": "sha512-YYuuxv4H/iNb1Z/5IbMRoxgrzjWGhOEFfd+groZ5dMCVkpENiMZmwspdrzBo9286JjM1gZJPAyL7ZIdzuvu2AQ==",
+      "dev": true,
+      "dependencies": {
+        "source-map": "~0.6.0"
+      },
+      "engines": {
+        "node": ">= 10.0"
+      }
+    },
+    "node_modules/clean-css/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/clean-webpack-plugin": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-2.0.2.tgz",
+      "integrity": "sha512-pi1111o4OBd9qvacbgs+NRqClfVPKVIc66B4d8kx6Ho/L+i9entQ/NpK600CsTYTPu3kWvKwwyKarsYMvC2xeA==",
+      "dev": true,
+      "dependencies": {
+        "del": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "webpack": "*"
+      }
+    },
+    "node_modules/clone": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/clone-deep": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.4",
+        "kind-of": "^6.0.2",
+        "shallow-clone": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/clone-regexp": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz",
+      "integrity": "sha512-beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q==",
+      "dev": true,
+      "dependencies": {
+        "is-regexp": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/color": {
+      "version": "0.11.4",
+      "resolved": "https://registry.npmjs.org/color/-/color-0.11.4.tgz",
+      "integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=",
+      "dev": true,
+      "dependencies": {
+        "clone": "^1.0.2",
+        "color-convert": "^1.3.0",
+        "color-string": "^0.3.0"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/color-string": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz",
+      "integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=",
+      "dev": true,
+      "dependencies": {
+        "color-name": "^1.0.0"
+      }
+    },
+    "node_modules/colord": {
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.2.tgz",
+      "integrity": "sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ==",
+      "dev": true
+    },
+    "node_modules/colorette": {
+      "version": "2.0.16",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz",
+      "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==",
+      "dev": true
+    },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dev": true,
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/commander": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
+      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
+      "dev": true,
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+      "dev": true
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "node_modules/confusing-browser-globals": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
+      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
+      "dev": true
+    },
+    "node_modules/console-browserify": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
+      "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
+      "dev": true
+    },
+    "node_modules/constants-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
+      "dev": true
+    },
+    "node_modules/convert-source-map": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
+      "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.1"
+      }
+    },
+    "node_modules/core-js": {
+      "version": "3.22.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.22.0.tgz",
+      "integrity": "sha512-8h9jBweRjMiY+ORO7bdWSeWfHhLPO7whobj7Z2Bl0IDo00C228EdGgH7FE4jGumbEjzcFfkfW8bXgdkEDhnwHQ==",
+      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
+      "dev": true,
+      "hasInstallScript": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/core-js-compat": {
+      "version": "3.22.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.22.0.tgz",
+      "integrity": "sha512-WwA7xbfRGrk8BGaaHlakauVXrlYmAIkk8PNGb1FDQS+Rbrewc3pgFfwJFRw6psmJVAll7Px9UHRYE16oRQnwAQ==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^4.20.2",
+        "semver": "7.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/core-js-compat/node_modules/semver": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
+      "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/core-util-is": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+      "dev": true
+    },
+    "node_modules/cosmiconfig": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
+      "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/parse-json": "^4.0.0",
+        "import-fresh": "^3.2.1",
+        "parse-json": "^5.0.0",
+        "path-type": "^4.0.0",
+        "yaml": "^1.10.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/create-ecdh": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
+      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "elliptic": "^6.5.3"
+      }
+    },
+    "node_modules/create-ecdh/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
+    "node_modules/create-hash": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "dev": true,
+      "dependencies": {
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
+      }
+    },
+    "node_modules/create-hmac": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+      "dev": true,
+      "dependencies": {
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/cross-spawn/node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/crypto-browserify": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+      "dev": true,
+      "dependencies": {
+        "browserify-cipher": "^1.0.0",
+        "browserify-sign": "^4.0.0",
+        "create-ecdh": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.0",
+        "diffie-hellman": "^5.0.0",
+        "inherits": "^2.0.1",
+        "pbkdf2": "^3.0.3",
+        "public-encrypt": "^4.0.0",
+        "randombytes": "^2.0.0",
+        "randomfill": "^1.0.3"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/css-color-function": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/css-color-function/-/css-color-function-1.3.3.tgz",
+      "integrity": "sha1-jtJMLAIFBzM5+voAS8jBQfzLKC4=",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "0.1.0",
+        "color": "^0.11.0",
+        "debug": "^3.1.0",
+        "rgb": "~0.1.0"
+      }
+    },
+    "node_modules/css-color-function/node_modules/balanced-match": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.1.0.tgz",
+      "integrity": "sha1-tQS9BYabOSWd0MXvw12EMXbczEo=",
+      "dev": true
+    },
+    "node_modules/css-color-function/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/css-functions-list": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.0.1.tgz",
+      "integrity": "sha512-PriDuifDt4u4rkDgnqRCLnjfMatufLmWNfQnGCq34xZwpY3oabwhB9SqRBmuvWUgndbemCFlKqg+nO7C2q0SBw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.22"
+      }
+    },
+    "node_modules/css-loader": {
+      "version": "6.7.2",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.7.2.tgz",
+      "integrity": "sha512-oqGbbVcBJkm8QwmnNzrFrWTnudnRZC+1eXikLJl0n4ljcfotgRifpg2a1lKy8jTrc4/d9A/ap1GFq1jDKG7J+Q==",
+      "dev": true,
+      "dependencies": {
+        "icss-utils": "^5.1.0",
+        "postcss": "^8.4.18",
+        "postcss-modules-extract-imports": "^3.0.0",
+        "postcss-modules-local-by-default": "^4.0.0",
+        "postcss-modules-scope": "^3.0.0",
+        "postcss-modules-values": "^4.0.0",
+        "postcss-value-parser": "^4.2.0",
+        "semver": "^7.3.8"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/css-loader/node_modules/postcss-value-parser": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+      "dev": true
+    },
+    "node_modules/css-loader/node_modules/semver": {
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/css-rule-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/css-rule-stream/-/css-rule-stream-1.1.0.tgz",
+      "integrity": "sha1-N4bnGYmD2WWibjGVfgkHjLt3BaI=",
+      "dev": true,
+      "dependencies": {
+        "css-tokenize": "^1.0.1",
+        "duplexer2": "0.0.2",
+        "ldjson-stream": "^1.2.1",
+        "through2": "^0.6.3"
+      },
+      "bin": {
+        "css-rule-stream": "index.js"
+      }
+    },
+    "node_modules/css-rule-stream/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+      "dev": true
+    },
+    "node_modules/css-rule-stream/node_modules/readable-stream": {
+      "version": "1.0.34",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+      "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/css-rule-stream/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+      "dev": true
+    },
+    "node_modules/css-rule-stream/node_modules/through2": {
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+      "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": ">=1.0.33-1 <1.1.0-0",
+        "xtend": ">=4.0.0 <4.1.0-0"
+      }
+    },
+    "node_modules/css-select": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
+      "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
+      "dev": true,
+      "dependencies": {
+        "boolbase": "^1.0.0",
+        "css-what": "^6.0.1",
+        "domhandler": "^4.3.1",
+        "domutils": "^2.8.0",
+        "nth-check": "^2.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/css-tokenize": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/css-tokenize/-/css-tokenize-1.0.1.tgz",
+      "integrity": "sha1-RiXLHtohwUOFi3+B1oA8HSb8FL4=",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "readable-stream": "^1.0.33"
+      }
+    },
+    "node_modules/css-tokenize/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+      "dev": true
+    },
+    "node_modules/css-tokenize/node_modules/readable-stream": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/css-tokenize/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+      "dev": true
+    },
+    "node_modules/css-tree": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
+      "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
+      "dev": true,
+      "dependencies": {
+        "mdn-data": "2.0.14",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/css-tree/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/css-unit-converter": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/css-unit-converter/-/css-unit-converter-1.1.2.tgz",
+      "integrity": "sha512-IiJwMC8rdZE0+xiEZHeru6YoONC4rfPMqGm2W85jMIbkFvv5nFTwJVFHam2eFrN6txmoUYFAFXiv8ICVeTO0MA==",
+      "dev": true
+    },
+    "node_modules/css-what": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
+      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/cssesc": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+      "dev": true,
+      "bin": {
+        "cssesc": "bin/cssesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/csso": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
+      "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
+      "dev": true,
+      "dependencies": {
+        "css-tree": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/csso-webpack-plugin": {
+      "version": "2.0.0-beta.3",
+      "resolved": "https://registry.npmjs.org/csso-webpack-plugin/-/csso-webpack-plugin-2.0.0-beta.3.tgz",
+      "integrity": "sha512-FnhgS7W1BwOduZagTLg9UjT2kvM9aiSpInm4xIDZHLuXl6/6vbOA1+DIIcbGKSjE0dWIVuDKEv1to86mN6KZ4w==",
+      "dev": true,
+      "dependencies": {
+        "@types/webpack": ">=4.0",
+        "core-js": "^3.10.1",
+        "csso": "^4.0.2",
+        "source-map": "^0.7.3",
+        "webpack-sources": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/csso-webpack-plugin/node_modules/source-map": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/cssom": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz",
+      "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==",
+      "dev": true
+    },
+    "node_modules/cssstyle": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
+      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
+      "dev": true,
+      "dependencies": {
+        "cssom": "~0.3.6"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cssstyle/node_modules/cssom": {
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
+      "dev": true
+    },
+    "node_modules/data-urls": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.1.tgz",
+      "integrity": "sha512-Ds554NeT5Gennfoo9KN50Vh6tpgtvYEwraYjejXnyTpu1C7oXKxdFk75REooENHE8ndTVOJuv+BEs4/J/xcozw==",
+      "dev": true,
+      "dependencies": {
+        "abab": "^2.0.3",
+        "whatwg-mimetype": "^3.0.0",
+        "whatwg-url": "^10.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/decamelize-keys": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
+      "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
+      "dev": true,
+      "dependencies": {
+        "decamelize": "^1.1.0",
+        "map-obj": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/decamelize-keys/node_modules/map-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/decimal.js": {
+      "version": "10.3.1",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz",
+      "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==",
+      "dev": true
+    },
+    "node_modules/deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true
+    },
+    "node_modules/define-properties": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+      "dev": true,
+      "dependencies": {
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/del": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
+      "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/glob": "^7.1.1",
+        "globby": "^6.1.0",
+        "is-path-cwd": "^2.0.0",
+        "is-path-in-cwd": "^2.0.0",
+        "p-map": "^2.0.0",
+        "pify": "^4.0.1",
+        "rimraf": "^2.6.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/des.js": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
+      "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "node_modules/diffie-hellman": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "miller-rabin": "^4.0.0",
+        "randombytes": "^2.0.0"
+      }
+    },
+    "node_modules/diffie-hellman/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
+    "node_modules/dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+      "dev": true,
+      "dependencies": {
+        "path-type": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/doiuse": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/doiuse/-/doiuse-4.4.1.tgz",
+      "integrity": "sha512-TUpr1/YNg20IB09tZmwGCTsTQoxj8jUld/hUZprZMj8vj0VpAJySXEWCr8WMvqvgzk0/kG/FxeSMGKode4UjPg==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^4.16.1",
+        "caniuse-lite": "^1.0.30001179",
+        "css-rule-stream": "^1.1.0",
+        "duplexer2": "0.0.2",
+        "ldjson-stream": "^1.2.1",
+        "multimatch": "^5.0.0",
+        "postcss": "^8.2.4",
+        "source-map": "^0.7.3",
+        "through2": "^4.0.2",
+        "yargs": "^16.2.0"
+      },
+      "bin": {
+        "doiuse": "cli.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/doiuse/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/doiuse/node_modules/cliui": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
+      }
+    },
+    "node_modules/doiuse/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/doiuse/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/doiuse/node_modules/source-map": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/doiuse/node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/doiuse/node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/doiuse/node_modules/yargs": {
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.0",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/dom-converter": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
+      "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
+      "dev": true,
+      "dependencies": {
+        "utila": "~0.4"
+      }
+    },
+    "node_modules/dom-serializer": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
+      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.2.0",
+        "entities": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+      }
+    },
+    "node_modules/dom-serializer/node_modules/entities": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/domain-browser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
+      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4",
+        "npm": ">=1.2"
+      }
+    },
+    "node_modules/domelementtype": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ]
+    },
+    "node_modules/domexception": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
+      "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
+      "dev": true,
+      "dependencies": {
+        "webidl-conversions": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/domhandler": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
+      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.2.0"
+      },
+      "engines": {
+        "node": ">= 4"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
+      }
+    },
+    "node_modules/domutils": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+      "dev": true,
+      "dependencies": {
+        "dom-serializer": "^1.0.1",
+        "domelementtype": "^2.2.0",
+        "domhandler": "^4.2.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domutils?sponsor=1"
+      }
+    },
+    "node_modules/dot-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
+      "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
+      "dev": true,
+      "dependencies": {
+        "no-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/duplexer2": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+      "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~1.1.9"
+      }
+    },
+    "node_modules/duplexer2/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+      "dev": true
+    },
+    "node_modules/duplexer2/node_modules/readable-stream": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/duplexer2/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+      "dev": true
+    },
+    "node_modules/electron-to-chromium": {
+      "version": "1.4.113",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.113.tgz",
+      "integrity": "sha512-s30WKxp27F3bBH6fA07FYL2Xm/FYnYrKpMjHr3XVCTUb9anAyZn/BeZfPWgTZGAbJeT4NxNwISSbLcYZvggPMA==",
+      "dev": true
+    },
+    "node_modules/elliptic": {
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "brorand": "^1.1.0",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.1",
+        "inherits": "^2.0.4",
+        "minimalistic-assert": "^1.0.1",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "node_modules/elliptic/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/emojis-list": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/enhanced-resolve": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz",
+      "integrity": "sha1-TW5omzcl+GCQknzMhs2fFjW4ni4=",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "memory-fs": "^0.2.0",
+        "tapable": "^0.1.8"
+      },
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/enhanced-resolve/node_modules/tapable": {
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",
+      "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/entities": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz",
+      "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/envinfo": {
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz",
+      "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==",
+      "dev": true,
+      "bin": {
+        "envinfo": "dist/cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "node_modules/es-abstract": {
+      "version": "1.19.5",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.5.tgz",
+      "integrity": "sha512-Aa2G2+Rd3b6kxEUKTF4TaW67czBLyAv3z7VOhYRU50YBx+bbsYZ9xQP4lMNazePuFlybXI0V4MruPos7qUo5fA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.1.1",
+        "get-symbol-description": "^1.0.0",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.3",
+        "is-callable": "^1.2.4",
+        "is-negative-zero": "^2.0.2",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.2",
+        "is-string": "^1.0.7",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.12.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.2",
+        "string.prototype.trimend": "^1.0.4",
+        "string.prototype.trimstart": "^1.0.4",
+        "unbox-primitive": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es-module-lexer": {
+      "version": "0.9.3",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
+      "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
+      "dev": true
+    },
+    "node_modules/es-shim-unscopables": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
+      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+      "dev": true,
+      "dependencies": {
+        "has": "^1.0.3"
+      }
+    },
+    "node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/escodegen": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
+      "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
+      "dev": true,
+      "dependencies": {
+        "esprima": "^4.0.1",
+        "estraverse": "^5.2.0",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.6.1"
+      }
+    },
+    "node_modules/escodegen/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/escodegen/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eslint": {
+      "version": "8.28.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.28.0.tgz",
+      "integrity": "sha512-S27Di+EVyMxcHiwDrFzk8dJYAaD+/5SoWKxL1ri/71CRHsnJnRDPNt2Kzj24+MT9FDupf4aqqyqPrvI8MvQ4VQ==",
+      "dev": true,
+      "dependencies": {
+        "@eslint/eslintrc": "^1.3.3",
+        "@humanwhocodes/config-array": "^0.11.6",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@nodelib/fs.walk": "^1.2.8",
+        "ajv": "^6.10.0",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.1.1",
+        "eslint-utils": "^3.0.0",
+        "eslint-visitor-keys": "^3.3.0",
+        "espree": "^9.4.0",
+        "esquery": "^1.4.0",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "globals": "^13.15.0",
+        "grapheme-splitter": "^1.0.4",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "is-path-inside": "^3.0.3",
+        "js-sdsl": "^4.1.4",
+        "js-yaml": "^4.1.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.1",
+        "regexpp": "^3.2.0",
+        "strip-ansi": "^6.0.1",
+        "strip-json-comments": "^3.1.0",
+        "text-table": "^0.2.0"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-config-airbnb-base": {
+      "version": "15.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz",
+      "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==",
+      "dev": true,
+      "dependencies": {
+        "confusing-browser-globals": "^1.0.10",
+        "object.assign": "^4.1.2",
+        "object.entries": "^1.1.5",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^7.32.0 || ^8.2.0",
+        "eslint-plugin-import": "^2.25.2"
+      }
+    },
+    "node_modules/eslint-import-resolver-node": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
+      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.7",
+        "resolve": "^1.20.0"
+      }
+    },
+    "node_modules/eslint-import-resolver-node/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-import-resolver-webpack": {
+      "version": "0.12.2",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.12.2.tgz",
+      "integrity": "sha512-7Jnm4YAoNNkvqPaZkKdIHsKGmv8/uNnYC5QsXkiSodvX4XEEfH2AKOna98FK52fCDXm3q4HzuX+7pRMKkJ64EQ==",
+      "dev": true,
+      "dependencies": {
+        "array-find": "^1.0.0",
+        "debug": "^2.6.9",
+        "enhanced-resolve": "^0.9.1",
+        "find-root": "^1.1.0",
+        "has": "^1.0.3",
+        "interpret": "^1.2.0",
+        "lodash": "^4.17.15",
+        "node-libs-browser": "^1.0.0 || ^2.0.0",
+        "resolve": "^1.13.1",
+        "semver": "^5.7.1"
+      },
+      "peerDependencies": {
+        "eslint-plugin-import": ">=1.4.0",
+        "webpack": ">=1.11.0"
+      }
+    },
+    "node_modules/eslint-import-resolver-webpack/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/eslint-import-resolver-webpack/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "node_modules/eslint-import-resolver-webpack/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/eslint-module-utils": {
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz",
+      "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.7",
+        "find-up": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/eslint-module-utils/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-plugin-html": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-html/-/eslint-plugin-html-6.2.0.tgz",
+      "integrity": "sha512-vi3NW0E8AJombTvt8beMwkL1R/fdRWl4QSNRNMhVQKWm36/X0KF0unGNAY4mqUF06mnwVWZcIcerrCnfn9025g==",
+      "dev": true,
+      "dependencies": {
+        "htmlparser2": "^7.1.2"
+      }
+    },
+    "node_modules/eslint-plugin-import": {
+      "version": "2.26.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
+      "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
+      "dev": true,
+      "dependencies": {
+        "array-includes": "^3.1.4",
+        "array.prototype.flat": "^1.2.5",
+        "debug": "^2.6.9",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.6",
+        "eslint-module-utils": "^2.7.3",
+        "has": "^1.0.3",
+        "is-core-module": "^2.8.1",
+        "is-glob": "^4.0.3",
+        "minimatch": "^3.1.2",
+        "object.values": "^1.1.5",
+        "resolve": "^1.22.0",
+        "tsconfig-paths": "^3.14.1"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/eslint-utils": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "engines": {
+        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      },
+      "peerDependencies": {
+        "eslint": ">=5"
+      }
+    },
+    "node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/eslint-visitor-keys": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/eslint/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/eslint/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/eslint/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/eslint/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/eslint/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/eslint-scope": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
+      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/eslint/node_modules/eslint-visitor-keys": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/eslint/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/eslint/node_modules/find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/eslint/node_modules/globals": {
+      "version": "13.18.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.18.0.tgz",
+      "integrity": "sha512-/mR4KI8Ps2spmoc0Ulu9L7agOF0du1CZNQ3dke8yItYlyKNmGrkONemBbd6V8UTc1Wgcqn21t3WYB7dbRmh6/A==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/is-path-inside": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/eslint/node_modules/locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/optionator": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "dev": true,
+      "dependencies": {
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/eslint/node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/eslint/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/espree": {
+      "version": "9.4.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz",
+      "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^8.8.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/espree/node_modules/acorn": {
+      "version": "8.8.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
+      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/espree/node_modules/eslint-visitor-keys": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/esquery": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/esquery/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esrecurse/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/events": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.x"
+      }
+    },
+    "node_modules/evp_bytestokey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "dev": true,
+      "dependencies": {
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/execa": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
+        "strip-final-newline": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/execall": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/execall/-/execall-2.0.0.tgz",
+      "integrity": "sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow==",
+      "dev": true,
+      "dependencies": {
+        "clone-regexp": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "node_modules/fast-glob": {
+      "version": "3.2.11",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
+      "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "dev": true
+    },
+    "node_modules/fastest-levenshtein": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
+      "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==",
+      "dev": true
+    },
+    "node_modules/fastq": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
+      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
+      "dev": true,
+      "dependencies": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "node_modules/file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dev": true,
+      "dependencies": {
+        "flat-cache": "^3.0.4"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/find-cache-dir": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
+      "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
+      "dev": true,
+      "dependencies": {
+        "commondir": "^1.0.1",
+        "make-dir": "^3.0.2",
+        "pkg-dir": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
+      }
+    },
+    "node_modules/find-root": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
+      "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==",
+      "dev": true
+    },
+    "node_modules/find-up": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+      "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/flat-cache": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+      "dev": true,
+      "dependencies": {
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/flat-cache/node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/flatted": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
+      "dev": true
+    },
+    "node_modules/flatten": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.3.tgz",
+      "integrity": "sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==",
+      "deprecated": "flatten is deprecated in favor of utility frameworks such as lodash.",
+      "dev": true
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "node_modules/gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true,
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
+      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-npm-tarball-url": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/get-npm-tarball-url/-/get-npm-tarball-url-2.0.3.tgz",
+      "integrity": "sha512-R/PW6RqyaBQNWYaSyfrh54/qtcnOp22FHCCiRhSSZj0FP3KQWCsxxt0DzIdVTbwTqe9CtQfvl/FPD4UIPt4pqw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.17"
+      }
+    },
+    "node_modules/get-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/get-symbol-description": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
+      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/glob": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/glob-to-regexp": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
+      "dev": true
+    },
+    "node_modules/global-modules": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
+      "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
+      "dev": true,
+      "dependencies": {
+        "global-prefix": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/global-prefix": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
+      "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
+      "dev": true,
+      "dependencies": {
+        "ini": "^1.3.5",
+        "kind-of": "^6.0.2",
+        "which": "^1.3.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/globby": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+      "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+      "dev": true,
+      "dependencies": {
+        "array-union": "^1.0.1",
+        "glob": "^7.0.3",
+        "object-assign": "^4.0.1",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/globby/node_modules/pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/globjoin": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
+      "integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=",
+      "dev": true
+    },
+    "node_modules/google-protobuf": {
+      "version": "3.21.0",
+      "resolved": "https://registry.npmjs.org/google-protobuf/-/google-protobuf-3.21.0.tgz",
+      "integrity": "sha512-byR7MBTK4tZ5PZEb+u5ZTzpt4SfrTxv5682MjPlHN16XeqgZE2/8HOIWeiXe8JKnT9OVbtBGhbq8mtvkK8cd5g==",
+      "dev": true
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.10",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
+      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
+      "dev": true
+    },
+    "node_modules/grapheme-splitter": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
+      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
+      "dev": true
+    },
+    "node_modules/hard-rejection": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
+      "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/has-bigints": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
+      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-tostringtag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/hash-base": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
+      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/hash-base/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/hash-base/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/hash.js": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
+      }
+    },
+    "node_modules/he": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+      "dev": true,
+      "bin": {
+        "he": "bin/he"
+      }
+    },
+    "node_modules/hmac-drbg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+      "dev": true,
+      "dependencies": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "node_modules/hosted-git-info": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
+      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/html-encoding-sniffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
+      "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
+      "dev": true,
+      "dependencies": {
+        "whatwg-encoding": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/html-minifier-terser": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
+      "integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==",
+      "dev": true,
+      "dependencies": {
+        "camel-case": "^4.1.2",
+        "clean-css": "^5.2.2",
+        "commander": "^8.3.0",
+        "he": "^1.2.0",
+        "param-case": "^3.0.4",
+        "relateurl": "^0.2.7",
+        "terser": "^5.10.0"
+      },
+      "bin": {
+        "html-minifier-terser": "cli.js"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/html-tags": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.2.0.tgz",
+      "integrity": "sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/html-webpack-plugin": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz",
+      "integrity": "sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw==",
+      "dev": true,
+      "dependencies": {
+        "@types/html-minifier-terser": "^6.0.0",
+        "html-minifier-terser": "^6.0.2",
+        "lodash": "^4.17.21",
+        "pretty-error": "^4.0.0",
+        "tapable": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/html-webpack-plugin"
+      },
+      "peerDependencies": {
+        "webpack": "^5.20.0"
+      }
+    },
+    "node_modules/htmlparser2": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz",
+      "integrity": "sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==",
+      "dev": true,
+      "funding": [
+        "https://github.com/fb55/htmlparser2?sponsor=1",
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ],
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.2.2",
+        "domutils": "^2.8.0",
+        "entities": "^3.0.1"
+      }
+    },
+    "node_modules/http-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
+      "dev": true,
+      "dependencies": {
+        "@tootallnate/once": "2",
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/https-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
+      "dev": true
+    },
+    "node_modules/https-proxy-agent": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/human-signals": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.17.0"
+      }
+    },
+    "node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dev": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/icss-utils": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
+      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
+      "dev": true,
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/ignore": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/immutable": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.1.0.tgz",
+      "integrity": "sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==",
+      "dev": true
+    },
+    "node_modules/import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "dev": true,
+      "dependencies": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/import-lazy": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
+      "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/import-local": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
+      "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
+      "dev": true,
+      "dependencies": {
+        "pkg-dir": "^4.2.0",
+        "resolve-cwd": "^3.0.0"
+      },
+      "bin": {
+        "import-local-fixture": "fixtures/cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/indent-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/indexes-of": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
+      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
+      "dev": true
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "node_modules/ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+      "dev": true
+    },
+    "node_modules/internal-slot": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
+      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.0",
+        "has": "^1.0.3",
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/interpret": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
+      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+      "dev": true
+    },
+    "node_modules/is-bigint": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "dev": true,
+      "dependencies": {
+        "has-bigints": "^1.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-boolean-object": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-callable": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-core-module": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz",
+      "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==",
+      "dev": true,
+      "dependencies": {
+        "has": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-date-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-negative-zero": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-number-object": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-path-cwd": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
+      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-path-in-cwd": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
+      "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
+      "dev": true,
+      "dependencies": {
+        "is-path-inside": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-path-inside": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
+      "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
+      "dev": true,
+      "dependencies": {
+        "path-is-inside": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-potential-custom-element-name": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
+      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
+      "dev": true
+    },
+    "node_modules/is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-regexp": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-2.1.0.tgz",
+      "integrity": "sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-shared-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-weakref": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
+    "node_modules/isnumeric": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/isnumeric/-/isnumeric-0.2.0.tgz",
+      "integrity": "sha1-ojR7o2DeGeM9D/1ZD933dVy/LmQ=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.x"
+      }
+    },
+    "node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/jest-worker": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
+      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/jest-worker/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-worker/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/jquery": {
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.1.tgz",
+      "integrity": "sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw==",
+      "peer": true
+    },
+    "node_modules/jquery.growl": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/jquery.growl/-/jquery.growl-1.3.5.tgz",
+      "integrity": "sha512-pK1RD8x3pXm1hEQ6KH0cu4QqzvI7R0EsUd5oneT5pavZ0cHwx/TV4qIdKeVfCWM0DVPyzI2GfXD6FwdDbRx1kw=="
+    },
+    "node_modules/js-sdsl": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz",
+      "integrity": "sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==",
+      "dev": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/js-sdsl"
+      }
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/jsdom": {
+      "version": "19.0.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-19.0.0.tgz",
+      "integrity": "sha512-RYAyjCbxy/vri/CfnjUWJQQtZ3LKlLnDqj+9XLNnJPgEGeirZs3hllKR20re8LUZ6o1b1X4Jat+Qd26zmP41+A==",
+      "dev": true,
+      "dependencies": {
+        "abab": "^2.0.5",
+        "acorn": "^8.5.0",
+        "acorn-globals": "^6.0.0",
+        "cssom": "^0.5.0",
+        "cssstyle": "^2.3.0",
+        "data-urls": "^3.0.1",
+        "decimal.js": "^10.3.1",
+        "domexception": "^4.0.0",
+        "escodegen": "^2.0.0",
+        "form-data": "^4.0.0",
+        "html-encoding-sniffer": "^3.0.0",
+        "http-proxy-agent": "^5.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "is-potential-custom-element-name": "^1.0.1",
+        "nwsapi": "^2.2.0",
+        "parse5": "6.0.1",
+        "saxes": "^5.0.1",
+        "symbol-tree": "^3.2.4",
+        "tough-cookie": "^4.0.0",
+        "w3c-hr-time": "^1.0.2",
+        "w3c-xmlserializer": "^3.0.0",
+        "webidl-conversions": "^7.0.0",
+        "whatwg-encoding": "^2.0.0",
+        "whatwg-mimetype": "^3.0.0",
+        "whatwg-url": "^10.0.0",
+        "ws": "^8.2.3",
+        "xml-name-validator": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "peerDependencies": {
+        "canvas": "^2.5.0"
+      },
+      "peerDependenciesMeta": {
+        "canvas": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jsdom/node_modules/acorn": {
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
+      "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/jsdom/node_modules/form-data": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "dev": true,
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/jsdom/node_modules/punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/jsdom/node_modules/tough-cookie": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
+      "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
+      "dev": true,
+      "dependencies": {
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.1.2"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "dev": true,
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+      "dev": true
+    },
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+      "dev": true
+    },
+    "node_modules/json5": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
+      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
+      "dev": true,
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/klona": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz",
+      "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/known-css-properties": {
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.24.0.tgz",
+      "integrity": "sha512-RTSoaUAfLvpR357vWzAz/50Q/BmHfmE6ETSWfutT0AJiw10e6CmcdYRQJlLRd95B53D0Y2aD1jSxD3V3ySF+PA==",
+      "dev": true
+    },
+    "node_modules/ldjson-stream": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ldjson-stream/-/ldjson-stream-1.2.1.tgz",
+      "integrity": "sha1-kb7O2lrE7SsX5kn7d356v6AYnCs=",
+      "dev": true,
+      "dependencies": {
+        "split2": "^0.2.1",
+        "through2": "^0.6.1"
+      }
+    },
+    "node_modules/ldjson-stream/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+      "dev": true
+    },
+    "node_modules/ldjson-stream/node_modules/readable-stream": {
+      "version": "1.0.34",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+      "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/ldjson-stream/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+      "dev": true
+    },
+    "node_modules/ldjson-stream/node_modules/through2": {
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+      "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": ">=1.0.33-1 <1.1.0-0",
+        "xtend": ">=4.0.0 <4.1.0-0"
+      }
+    },
+    "node_modules/levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+      "dev": true
+    },
+    "node_modules/loader-runner": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
+      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.11.5"
+      }
+    },
+    "node_modules/loader-utils": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
+      "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=8.9.0"
+      }
+    },
+    "node_modules/locate-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^2.0.0",
+        "path-exists": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
+    },
+    "node_modules/lodash._reinterpolate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
+      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
+      "dev": true
+    },
+    "node_modules/lodash.debounce": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
+      "dev": true
+    },
+    "node_modules/lodash.memoize": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+      "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
+      "dev": true
+    },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
+    },
+    "node_modules/lodash.template": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
+      "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==",
+      "dev": true,
+      "dependencies": {
+        "lodash._reinterpolate": "^3.0.0",
+        "lodash.templatesettings": "^4.0.0"
+      }
+    },
+    "node_modules/lodash.templatesettings": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz",
+      "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==",
+      "dev": true,
+      "dependencies": {
+        "lodash._reinterpolate": "^3.0.0"
+      }
+    },
+    "node_modules/lodash.truncate": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
+      "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
+      "dev": true
+    },
+    "node_modules/lodash.uniq": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
+      "dev": true
+    },
+    "node_modules/lower-case": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
+      "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/make-dir": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "dev": true,
+      "dependencies": {
+        "semver": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/map-obj": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
+      "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/material-design-icons-iconfont": {
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/material-design-icons-iconfont/-/material-design-icons-iconfont-6.7.0.tgz",
+      "integrity": "sha512-lSj71DgVv20kO0kGbs42icDzbRot61gEDBLQACzkUuznRQBUYmbxzEkGU6dNBb5fRWHMaScYlAXX96HQ4/cJWA=="
+    },
+    "node_modules/math-expression-evaluator": {
+      "version": "1.3.14",
+      "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.3.14.tgz",
+      "integrity": "sha512-M6AMrvq9bO8uL42KvQHPA2/SbAobA0R7gviUmPrcTcGfdwpaLitz4q2Euzx2lP9Oy88vxK3HOrsISgSwKsYS4A==",
+      "dev": true
+    },
+    "node_modules/mathml-tag-names": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz",
+      "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/md5.js": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+      "dev": true,
+      "dependencies": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/mdn-data": {
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
+      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
+      "dev": true
+    },
+    "node_modules/memory-fs": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz",
+      "integrity": "sha512-+y4mDxU4rvXXu5UDSGCGNiesFmwCHuefGMoPCO1WYucNYj7DsLqrFaa2fXVI0H+NNiPTwwzKwspn9yTZqUGqng==",
+      "dev": true
+    },
+    "node_modules/meow": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
+      "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/minimist": "^1.2.0",
+        "camelcase-keys": "^6.2.2",
+        "decamelize": "^1.2.0",
+        "decamelize-keys": "^1.1.0",
+        "hard-rejection": "^2.1.0",
+        "minimist-options": "4.1.0",
+        "normalize-package-data": "^3.0.0",
+        "read-pkg-up": "^7.0.1",
+        "redent": "^3.0.0",
+        "trim-newlines": "^3.0.0",
+        "type-fest": "^0.18.0",
+        "yargs-parser": "^20.2.3"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/meow/node_modules/type-fest": {
+      "version": "0.18.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
+      "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true
+    },
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "dev": true,
+      "dependencies": {
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/miller-rabin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
+      },
+      "bin": {
+        "miller-rabin": "bin/miller-rabin"
+      }
+    },
+    "node_modules/miller-rabin/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
+    "node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "dev": true,
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/min-indent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
+      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/mini-css-extract-plugin": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.2.tgz",
+      "integrity": "sha512-WhDvO3SjGm40oV5y26GjMJYjd2UMqrLAGKy5YS2/3QKJy2F7jgynuHTir/tgUUOiNQu5saXHdc8reo7YuhhT4Q==",
+      "dev": true,
+      "dependencies": {
+        "loader-utils": "^2.0.0",
+        "schema-utils": "^3.0.0",
+        "webpack-sources": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.4.0 || ^5.0.0"
+      }
+    },
+    "node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+      "dev": true
+    },
+    "node_modules/minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
+      "dev": true
+    },
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
+      "dev": true
+    },
+    "node_modules/minimist-options": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
+      "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
+      "dev": true,
+      "dependencies": {
+        "arrify": "^1.0.1",
+        "is-plain-obj": "^1.1.0",
+        "kind-of": "^6.0.3"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/multimatch": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-5.0.0.tgz",
+      "integrity": "sha512-ypMKuglUrZUD99Tk2bUQ+xNQj43lPEfAeX2o9cTteAmShXy2VHDJpuwu1o0xqoKCt9jLVAvwyFKdLTPXKAfJyA==",
+      "dev": true,
+      "dependencies": {
+        "@types/minimatch": "^3.0.3",
+        "array-differ": "^3.0.0",
+        "array-union": "^2.1.0",
+        "arrify": "^2.0.1",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/multimatch/node_modules/array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/multimatch/node_modules/arrify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
+      "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
+      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
+      "dev": true,
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+      "dev": true
+    },
+    "node_modules/needle": {
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/needle/-/needle-2.9.1.tgz",
+      "integrity": "sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.6",
+        "iconv-lite": "^0.4.4",
+        "sax": "^1.2.4"
+      },
+      "bin": {
+        "needle": "bin/needle"
+      },
+      "engines": {
+        "node": ">= 4.4.x"
+      }
+    },
+    "node_modules/needle/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/neo-async": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+      "dev": true
+    },
+    "node_modules/no-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
+      "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
+      "dev": true,
+      "dependencies": {
+        "lower-case": "^2.0.2",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/node-libs-browser": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
+      "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
+      "dev": true,
+      "dependencies": {
+        "assert": "^1.1.1",
+        "browserify-zlib": "^0.2.0",
+        "buffer": "^4.3.0",
+        "console-browserify": "^1.1.0",
+        "constants-browserify": "^1.0.0",
+        "crypto-browserify": "^3.11.0",
+        "domain-browser": "^1.1.1",
+        "events": "^3.0.0",
+        "https-browserify": "^1.0.0",
+        "os-browserify": "^0.3.0",
+        "path-browserify": "0.0.1",
+        "process": "^0.11.10",
+        "punycode": "^1.2.4",
+        "querystring-es3": "^0.2.0",
+        "readable-stream": "^2.3.3",
+        "stream-browserify": "^2.0.1",
+        "stream-http": "^2.7.2",
+        "string_decoder": "^1.0.0",
+        "timers-browserify": "^2.0.4",
+        "tty-browserify": "0.0.0",
+        "url": "^0.11.0",
+        "util": "^0.11.0",
+        "vm-browserify": "^1.0.1"
+      }
+    },
+    "node_modules/node-releases": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.3.tgz",
+      "integrity": "sha512-maHFz6OLqYxz+VQyCAtA3PTX4UP/53pa05fyDNc9CwjvJ0yEh6+xBwKsgCxMNhS8taUKBFYxfuiaD9U/55iFaw==",
+      "dev": true
+    },
+    "node_modules/normalize-package-data": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
+      "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
+      "dev": true,
+      "dependencies": {
+        "hosted-git-info": "^4.0.1",
+        "is-core-module": "^2.5.0",
+        "semver": "^7.3.4",
+        "validate-npm-package-license": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/normalize-package-data/node_modules/semver": {
+      "version": "7.3.7",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/normalize-range": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/normalize-selector": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz",
+      "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=",
+      "dev": true
+    },
+    "node_modules/npm-run-path": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/nth-check": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz",
+      "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==",
+      "dev": true,
+      "dependencies": {
+        "boolbase": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/nth-check?sponsor=1"
+      }
+    },
+    "node_modules/num2fraction": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
+      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
+      "dev": true
+    },
+    "node_modules/nwsapi": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
+      "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
+      "dev": true
+    },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
+      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.assign": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "has-symbols": "^1.0.1",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
+      "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.values": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
+      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/onecolor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/onecolor/-/onecolor-3.1.0.tgz",
+      "integrity": "sha512-YZSypViXzu3ul5LMu/m6XjJ9ol8qAy9S2VjHl5E6UlhUH1KGKWabyEJifn0Jjpw23bYDzC2ucKMPGiH5kfwSGQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.8"
+      }
+    },
+    "node_modules/onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dev": true,
+      "dependencies": {
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/open-sans-fonts": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/open-sans-fonts/-/open-sans-fonts-1.6.2.tgz",
+      "integrity": "sha512-vsJ6/Mm0TdUKQJqxfkXJy+0K2X0QeRuTmxQq9YE1ycziw6CbDPolDsHhQ6+ImoV/7OTh8K8ZTGklY1Z5nUAwug==",
+      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info."
+    },
+    "node_modules/optionator": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+      "dev": true,
+      "dependencies": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.6",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "word-wrap": "~1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/os-browserify": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
+      "dev": true
+    },
+    "node_modules/p-limit": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-map": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
+      "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/p-try": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/pako": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
+      "dev": true
+    },
+    "node_modules/param-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
+      "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
+      "dev": true,
+      "dependencies": {
+        "dot-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "dependencies": {
+        "callsites": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parse-asn1": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
+      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
+      "dev": true,
+      "dependencies": {
+        "asn1.js": "^5.2.0",
+        "browserify-aes": "^1.0.0",
+        "evp_bytestokey": "^1.0.0",
+        "pbkdf2": "^3.0.3",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/parse5": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+      "dev": true
+    },
+    "node_modules/pascal-case": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
+      "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
+      "dev": true,
+      "dependencies": {
+        "no-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/path": {
+      "version": "0.12.7",
+      "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz",
+      "integrity": "sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=",
+      "dev": true,
+      "dependencies": {
+        "process": "^0.11.1",
+        "util": "^0.10.3"
+      }
+    },
+    "node_modules/path-browserify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
+      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
+      "dev": true
+    },
+    "node_modules/path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
+      "dev": true
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
+    },
+    "node_modules/path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "dev": true
+    },
+    "node_modules/path/node_modules/util": {
+      "version": "0.10.4",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
+      "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "2.0.3"
+      }
+    },
+    "node_modules/pbkdf2": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
+      "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
+      "dev": true,
+      "dependencies": {
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      },
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
+    "node_modules/perfect-scrollbar": {
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/perfect-scrollbar/-/perfect-scrollbar-1.5.5.tgz",
+      "integrity": "sha512-dzalfutyP3e/FOpdlhVryN4AJ5XDVauVWxybSkLZmakFE2sS3y3pc4JnSprw8tGmHvkaG5Edr5T7LBTZ+WWU2g=="
+    },
+    "node_modules/picocolors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+      "dev": true
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "dev": true,
+      "dependencies": {
+        "pinkie": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pixrem": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pixrem/-/pixrem-4.0.1.tgz",
+      "integrity": "sha1-LaSh3m7EQjxfw3lOkwuB1EkOxoY=",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^2.0.0",
+        "postcss": "^6.0.0",
+        "reduce-css-calc": "^1.2.7"
+      },
+      "engines": {
+        "node": ">=0.10.0",
+        "npm": ">=1.2.10"
+      }
+    },
+    "node_modules/pixrem/node_modules/browserslist": {
+      "version": "2.11.3",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz",
+      "integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==",
+      "deprecated": "Browserslist 2 could fail on reading Browserslist >3.0 config used in other tools.",
+      "dev": true,
+      "dependencies": {
+        "caniuse-lite": "^1.0.30000792",
+        "electron-to-chromium": "^1.3.30"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      }
+    },
+    "node_modules/pixrem/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/pixrem/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pleeease-filters": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/pleeease-filters/-/pleeease-filters-4.0.0.tgz",
+      "integrity": "sha1-ZjKy+wVkjSdY2GU4T7zteeHMrsc=",
+      "dev": true,
+      "dependencies": {
+        "onecolor": "^3.0.4",
+        "postcss": "^6.0.1"
+      }
+    },
+    "node_modules/pleeease-filters/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/pleeease-filters/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/popper.js": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
+      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
+      "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1",
+      "peer": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/popperjs"
+      }
+    },
+    "node_modules/postcss": {
+      "version": "8.4.19",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.19.tgz",
+      "integrity": "sha512-h+pbPsyhlYj6N2ozBmHhHrs9DzGmbaarbLvWipMRO7RLS+v4onj26MPFXA5OBYFxyqYhUJK456SwDcY9H2/zsA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        }
+      ],
+      "dependencies": {
+        "nanoid": "^3.3.4",
+        "picocolors": "^1.0.0",
+        "source-map-js": "^1.0.2"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      }
+    },
+    "node_modules/postcss-apply": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/postcss-apply/-/postcss-apply-0.8.0.tgz",
+      "integrity": "sha1-FOVEu7XLbxweBIhXll15rgZrE0M=",
+      "dev": true,
+      "dependencies": {
+        "babel-runtime": "^6.23.0",
+        "balanced-match": "^0.4.2",
+        "postcss": "^6.0.0"
+      }
+    },
+    "node_modules/postcss-apply/node_modules/balanced-match": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
+      "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
+      "dev": true
+    },
+    "node_modules/postcss-apply/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-apply/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-attribute-case-insensitive": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-2.0.0.tgz",
+      "integrity": "sha1-lNxCLI+QmX8WvTOjZUu77AhJY7Q=",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^6.0.0",
+        "postcss-selector-parser": "^2.2.3"
+      }
+    },
+    "node_modules/postcss-attribute-case-insensitive/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-attribute-case-insensitive/node_modules/postcss-selector-parser": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz",
+      "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=",
+      "dev": true,
+      "dependencies": {
+        "flatten": "^1.0.2",
+        "indexes-of": "^1.0.1",
+        "uniq": "^1.0.1"
+      }
+    },
+    "node_modules/postcss-attribute-case-insensitive/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-color-function": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-color-function/-/postcss-color-function-4.1.0.tgz",
+      "integrity": "sha512-2/fuv6mP5Lt03XbRpVfMdGC8lRP1sykme+H1bR4ARyOmSMB8LPSjcL6EAI1iX6dqUF+jNEvKIVVXhan1w/oFDQ==",
+      "dev": true,
+      "dependencies": {
+        "css-color-function": "~1.3.3",
+        "postcss": "^6.0.23",
+        "postcss-message-helpers": "^2.0.0",
+        "postcss-value-parser": "^3.3.1"
+      }
+    },
+    "node_modules/postcss-color-function/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-color-function/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-color-gray": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-color-gray/-/postcss-color-gray-4.1.0.tgz",
+      "integrity": "sha512-L4iLKQLdqChz6ZOgGb6dRxkBNw78JFYcJmBz1orHpZoeLtuhDDGegRtX9gSyfoCIM7rWZ3VNOyiqqvk83BEN+w==",
+      "dev": true,
+      "dependencies": {
+        "color": "^2.0.1",
+        "postcss": "^6.0.14",
+        "postcss-message-helpers": "^2.0.0",
+        "reduce-function-call": "^1.0.2"
+      }
+    },
+    "node_modules/postcss-color-gray/node_modules/color": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color/-/color-2.0.1.tgz",
+      "integrity": "sha512-ubUCVVKfT7r2w2D3qtHakj8mbmKms+tThR8gI8zEYCbUBl8/voqFGt3kgBqGwXAopgXybnkuOq+qMYCRrp4cXw==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.1",
+        "color-string": "^1.5.2"
+      }
+    },
+    "node_modules/postcss-color-gray/node_modules/color-string": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.0.tgz",
+      "integrity": "sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "^1.0.0",
+        "simple-swizzle": "^0.2.2"
+      }
+    },
+    "node_modules/postcss-color-gray/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-color-gray/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-color-hex-alpha": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-3.0.0.tgz",
+      "integrity": "sha1-HlPmyKyyN5Vej9CLfs2xuLgwn5U=",
+      "dev": true,
+      "dependencies": {
+        "color": "^1.0.3",
+        "postcss": "^6.0.1",
+        "postcss-message-helpers": "^2.0.0"
+      }
+    },
+    "node_modules/postcss-color-hex-alpha/node_modules/color": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/color/-/color-1.0.3.tgz",
+      "integrity": "sha1-5I6DLYXxTvaU+0aIEcLVz+cptV0=",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.8.2",
+        "color-string": "^1.4.0"
+      }
+    },
+    "node_modules/postcss-color-hex-alpha/node_modules/color-string": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.0.tgz",
+      "integrity": "sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "^1.0.0",
+        "simple-swizzle": "^0.2.2"
+      }
+    },
+    "node_modules/postcss-color-hex-alpha/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-color-hex-alpha/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-color-hsl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-color-hsl/-/postcss-color-hsl-2.0.0.tgz",
+      "integrity": "sha1-EnA2ZvoxBDDj8wpFTawThjF9WEQ=",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^6.0.1",
+        "postcss-value-parser": "^3.3.0",
+        "units-css": "^0.4.0"
+      }
+    },
+    "node_modules/postcss-color-hsl/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-color-hsl/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-color-hwb": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-color-hwb/-/postcss-color-hwb-3.0.0.tgz",
+      "integrity": "sha1-NAKxnvTYSXVAwftQcr6YY8qVVx4=",
+      "dev": true,
+      "dependencies": {
+        "color": "^1.0.3",
+        "postcss": "^6.0.1",
+        "postcss-message-helpers": "^2.0.0",
+        "reduce-function-call": "^1.0.2"
+      }
+    },
+    "node_modules/postcss-color-hwb/node_modules/color": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/color/-/color-1.0.3.tgz",
+      "integrity": "sha1-5I6DLYXxTvaU+0aIEcLVz+cptV0=",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.8.2",
+        "color-string": "^1.4.0"
+      }
+    },
+    "node_modules/postcss-color-hwb/node_modules/color-string": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.0.tgz",
+      "integrity": "sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "^1.0.0",
+        "simple-swizzle": "^0.2.2"
+      }
+    },
+    "node_modules/postcss-color-hwb/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-color-hwb/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-color-rebeccapurple": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-3.1.0.tgz",
+      "integrity": "sha512-212hJUk9uSsbwO5ECqVjmh/iLsmiVL1xy9ce9TVf+X3cK/ZlUIlaMdoxje/YpsL9cmUH3I7io+/G2LyWx5rg1g==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^6.0.22",
+        "postcss-values-parser": "^1.5.0"
+      }
+    },
+    "node_modules/postcss-color-rebeccapurple/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-color-rebeccapurple/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-color-rgb": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-color-rgb/-/postcss-color-rgb-2.0.0.tgz",
+      "integrity": "sha1-FFOcinExSUtILg3RzCZf9lFLUmM=",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^6.0.1",
+        "postcss-value-parser": "^3.3.0"
+      }
+    },
+    "node_modules/postcss-color-rgb/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-color-rgb/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-color-rgba-fallback": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-color-rgba-fallback/-/postcss-color-rgba-fallback-3.0.0.tgz",
+      "integrity": "sha1-N9XJNToHoJJwkSqCYGu0Kg1wLAQ=",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^6.0.6",
+        "postcss-value-parser": "^3.3.0",
+        "rgb-hex": "^2.1.0"
+      }
+    },
+    "node_modules/postcss-color-rgba-fallback/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-color-rgba-fallback/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-cssnext": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-cssnext/-/postcss-cssnext-3.1.1.tgz",
+      "integrity": "sha512-u9e0CYE7zudnr/LK+FL02cwli8cQEwwmzzN3JVeOEZiDs0q8IDfGdI6C9FCkHtIKEEjY3AATW3dqCCvqDK+Sfg==",
+      "deprecated": "'postcss-cssnext' has been deprecated in favor of 'postcss-preset-env'. Read more at https://moox.io/blog/deprecating-cssnext/",
+      "dev": true,
+      "dependencies": {
+        "autoprefixer": "^7.1.1",
+        "caniuse-api": "^2.0.0",
+        "chalk": "^2.0.1",
+        "pixrem": "^4.0.0",
+        "pleeease-filters": "^4.0.0",
+        "postcss": "^6.0.5",
+        "postcss-apply": "^0.8.0",
+        "postcss-attribute-case-insensitive": "^2.0.0",
+        "postcss-calc": "^6.0.0",
+        "postcss-color-function": "^4.0.0",
+        "postcss-color-gray": "^4.0.0",
+        "postcss-color-hex-alpha": "^3.0.0",
+        "postcss-color-hsl": "^2.0.0",
+        "postcss-color-hwb": "^3.0.0",
+        "postcss-color-rebeccapurple": "^3.0.0",
+        "postcss-color-rgb": "^2.0.0",
+        "postcss-color-rgba-fallback": "^3.0.0",
+        "postcss-custom-media": "^6.0.0",
+        "postcss-custom-properties": "^6.1.0",
+        "postcss-custom-selectors": "^4.0.1",
+        "postcss-font-family-system-ui": "^3.0.0",
+        "postcss-font-variant": "^3.0.0",
+        "postcss-image-set-polyfill": "^0.3.5",
+        "postcss-initial": "^2.0.0",
+        "postcss-media-minmax": "^3.0.0",
+        "postcss-nesting": "^4.0.1",
+        "postcss-pseudo-class-any-link": "^4.0.0",
+        "postcss-pseudoelements": "^5.0.0",
+        "postcss-replace-overflow-wrap": "^2.0.0",
+        "postcss-selector-matches": "^3.0.1",
+        "postcss-selector-not": "^3.0.1"
+      },
+      "peerDependencies": {
+        "caniuse-lite": "^1.0.30000697"
+      }
+    },
+    "node_modules/postcss-cssnext/node_modules/browserslist": {
+      "version": "2.11.3",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz",
+      "integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==",
+      "deprecated": "Browserslist 2 could fail on reading Browserslist >3.0 config used in other tools.",
+      "dev": true,
+      "dependencies": {
+        "caniuse-lite": "^1.0.30000792",
+        "electron-to-chromium": "^1.3.30"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      }
+    },
+    "node_modules/postcss-cssnext/node_modules/caniuse-api": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-2.0.0.tgz",
+      "integrity": "sha1-sd21pZZrFvSNxJmERNS7xsfZ2DQ=",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^2.0.0",
+        "caniuse-lite": "^1.0.0",
+        "lodash.memoize": "^4.1.2",
+        "lodash.uniq": "^4.5.0"
+      }
+    },
+    "node_modules/postcss-cssnext/node_modules/picocolors": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+      "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+      "dev": true
+    },
+    "node_modules/postcss-cssnext/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-cssnext/node_modules/postcss-calc": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-6.0.2.tgz",
+      "integrity": "sha512-fiznXjEN5T42Qm7qqMCVJXS3roaj9r4xsSi+meaBVe7CJBl8t/QLOXu02Z2E6oWAMWIvCuF6JrvzFekmVEbOKA==",
+      "dev": true,
+      "dependencies": {
+        "css-unit-converter": "^1.1.1",
+        "postcss": "^7.0.2",
+        "postcss-selector-parser": "^2.2.2",
+        "reduce-css-calc": "^2.0.0"
+      }
+    },
+    "node_modules/postcss-cssnext/node_modules/postcss-calc/node_modules/postcss": {
+      "version": "7.0.39",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+      "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
+      "dev": true,
+      "dependencies": {
+        "picocolors": "^0.2.1",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      }
+    },
+    "node_modules/postcss-cssnext/node_modules/postcss-selector-parser": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz",
+      "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=",
+      "dev": true,
+      "dependencies": {
+        "flatten": "^1.0.2",
+        "indexes-of": "^1.0.1",
+        "uniq": "^1.0.1"
+      }
+    },
+    "node_modules/postcss-cssnext/node_modules/reduce-css-calc": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-2.1.8.tgz",
+      "integrity": "sha512-8liAVezDmUcH+tdzoEGrhfbGcP7nOV4NkGE3a74+qqvE7nt9i4sKLGBuZNOnpI4WiGksiNPklZxva80061QiPg==",
+      "dev": true,
+      "dependencies": {
+        "css-unit-converter": "^1.1.1",
+        "postcss-value-parser": "^3.3.0"
+      }
+    },
+    "node_modules/postcss-cssnext/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-custom-media": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-6.0.0.tgz",
+      "integrity": "sha1-vlMnhBEOyylQRPtTlaGABushpzc=",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^6.0.1"
+      }
+    },
+    "node_modules/postcss-custom-media/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-custom-media/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-custom-properties": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-6.3.1.tgz",
+      "integrity": "sha512-zoiwn4sCiUFbr4KcgcNZLFkR6gVQom647L+z1p/KBVHZ1OYwT87apnS42atJtx6XlX2yI7N5fjXbFixShQO2QQ==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "postcss": "^6.0.18"
+      }
+    },
+    "node_modules/postcss-custom-properties/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-custom-properties/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-custom-selectors": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-4.0.1.tgz",
+      "integrity": "sha1-eBOC+UxS5yfvXKR3bqKt9JphE4I=",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^6.0.1",
+        "postcss-selector-matches": "^3.0.0"
+      }
+    },
+    "node_modules/postcss-custom-selectors/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-custom-selectors/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-font-family-system-ui": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-font-family-system-ui/-/postcss-font-family-system-ui-3.0.0.tgz",
+      "integrity": "sha512-58G/hTxMSSKlIRpcPUjlyo6hV2MEzvcVO2m4L/T7Bb2fJTG4DYYfQjQeRvuimKQh1V1sOzCIz99g+H2aFNtlQw==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^6.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-font-family-system-ui/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-font-family-system-ui/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-font-variant": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-3.0.0.tgz",
+      "integrity": "sha1-CMzIj2BQuoLtjvLMdsDGprQfGD4=",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^6.0.1"
+      }
+    },
+    "node_modules/postcss-font-variant/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-font-variant/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-image-set-polyfill": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/postcss-image-set-polyfill/-/postcss-image-set-polyfill-0.3.5.tgz",
+      "integrity": "sha1-Dxk0E3AM8fgr05Bm7wFtZaShgYE=",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^6.0.1",
+        "postcss-media-query-parser": "^0.2.3"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-image-set-polyfill/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-image-set-polyfill/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-initial": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-2.0.0.tgz",
+      "integrity": "sha1-cnFfczbgu3k1HZnuZcSiU6hEG6Q=",
+      "dev": true,
+      "dependencies": {
+        "lodash.template": "^4.2.4",
+        "postcss": "^6.0.1"
+      }
+    },
+    "node_modules/postcss-initial/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-initial/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-loader": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-5.3.0.tgz",
+      "integrity": "sha512-/+Z1RAmssdiSLgIZwnJHwBMnlABPgF7giYzTN2NOfr9D21IJZ4mQC1R2miwp80zno9M4zMD/umGI8cR+2EL5zw==",
+      "dev": true,
+      "dependencies": {
+        "cosmiconfig": "^7.0.0",
+        "klona": "^2.0.4",
+        "semver": "^7.3.4"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "postcss": "^7.0.0 || ^8.0.1",
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/postcss-loader/node_modules/semver": {
+      "version": "7.3.7",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/postcss-media-minmax": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-3.0.0.tgz",
+      "integrity": "sha1-Z1JWA3pD70C8Twdgv9BtTcadSNI=",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^6.0.1"
+      }
+    },
+    "node_modules/postcss-media-minmax/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-media-minmax/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-media-query-parser": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
+      "integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=",
+      "dev": true
+    },
+    "node_modules/postcss-message-helpers": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz",
+      "integrity": "sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4=",
+      "dev": true
+    },
+    "node_modules/postcss-modules-extract-imports": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
+      "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
+      "dev": true,
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz",
+      "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==",
+      "dev": true,
+      "dependencies": {
+        "icss-utils": "^5.0.0",
+        "postcss-selector-parser": "^6.0.2",
+        "postcss-value-parser": "^4.1.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default/node_modules/postcss-value-parser": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+      "dev": true
+    },
+    "node_modules/postcss-modules-scope": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
+      "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
+      "dev": true,
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.4"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-modules-values": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
+      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
+      "dev": true,
+      "dependencies": {
+        "icss-utils": "^5.0.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-nesting": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-4.2.1.tgz",
+      "integrity": "sha512-IkyWXICwagCnlaviRexi7qOdwPw3+xVVjgFfGsxmztvRVaNxAlrypOIKqDE5mxY+BVxnId1rnUKBRQoNE2VDaA==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^6.0.11"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-nesting/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-nesting/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-pseudo-class-any-link": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-4.0.0.tgz",
+      "integrity": "sha1-kVKgYT00UHIFE+iJKFS65C0O5o4=",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^6.0.1",
+        "postcss-selector-parser": "^2.2.3"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-pseudo-class-any-link/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-pseudo-class-any-link/node_modules/postcss-selector-parser": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz",
+      "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=",
+      "dev": true,
+      "dependencies": {
+        "flatten": "^1.0.2",
+        "indexes-of": "^1.0.1",
+        "uniq": "^1.0.1"
+      }
+    },
+    "node_modules/postcss-pseudo-class-any-link/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-pseudoelements": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-pseudoelements/-/postcss-pseudoelements-5.0.0.tgz",
+      "integrity": "sha1-7vGU6NUkZFylIKlJ6V5RjoEkAss=",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^6.0.0"
+      }
+    },
+    "node_modules/postcss-pseudoelements/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-pseudoelements/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-replace-overflow-wrap": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-2.0.0.tgz",
+      "integrity": "sha1-eU22+qVPjbEAhUOSqTr0V2i04ls=",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^6.0.1"
+      }
+    },
+    "node_modules/postcss-replace-overflow-wrap/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-replace-overflow-wrap/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-resolve-nested-selector": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz",
+      "integrity": "sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=",
+      "dev": true
+    },
+    "node_modules/postcss-safe-parser": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz",
+      "integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      },
+      "peerDependencies": {
+        "postcss": "^8.3.3"
+      }
+    },
+    "node_modules/postcss-selector-matches": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-selector-matches/-/postcss-selector-matches-3.0.1.tgz",
+      "integrity": "sha1-5WNAEeE5UIgYYbvdWMLQER/8lqs=",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^0.4.2",
+        "postcss": "^6.0.1"
+      }
+    },
+    "node_modules/postcss-selector-matches/node_modules/balanced-match": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
+      "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
+      "dev": true
+    },
+    "node_modules/postcss-selector-matches/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-selector-matches/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-selector-not": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-3.0.1.tgz",
+      "integrity": "sha1-Lk2y8JZTNsAefOx9tsYN/3ZzNdk=",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^0.4.2",
+        "postcss": "^6.0.1"
+      }
+    },
+    "node_modules/postcss-selector-not/node_modules/balanced-match": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
+      "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
+      "dev": true
+    },
+    "node_modules/postcss-selector-not/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-selector-not/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-selector-parser": {
+      "version": "6.0.10",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
+      "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
+      "dev": true,
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-sorting": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-7.0.1.tgz",
+      "integrity": "sha512-iLBFYz6VRYyLJEJsBJ8M3TCqNcckVzz4wFounSc5Oez35ogE/X+aoC5fFu103Ot7NyvjU3/xqIXn93Gp3kJk4g==",
+      "dev": true,
+      "peerDependencies": {
+        "postcss": "^8.3.9"
+      }
+    },
+    "node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "node_modules/postcss-values-parser": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/postcss-values-parser/-/postcss-values-parser-1.5.0.tgz",
+      "integrity": "sha512-3M3p+2gMp0AH3da530TlX8kiO1nxdTnc3C6vr8dMxRLIlh8UYkz0/wcwptSXjhtx2Fr0TySI7a+BHDQ8NL7LaQ==",
+      "dev": true,
+      "dependencies": {
+        "flatten": "^1.0.2",
+        "indexes-of": "^1.0.1",
+        "uniq": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/prestakit": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/prestakit/-/prestakit-1.2.5.tgz",
+      "integrity": "sha512-dLa1+teIRLLVtjk0F2pQL2Ya+HTGQUuJ6P6k+HZWJbT+1cwQkN7VAUiH7XGLHVSJchrI+hnarR43tI2B5XZDUA==",
+      "dependencies": {
+        "bootstrap": "^4.4.1",
+        "jquery.growl": "^1.3.5",
+        "material-design-icons-iconfont": "^6.1.0",
+        "open-sans-fonts": "^1.6.2",
+        "select2": "^4.0.5",
+        "select2-bootstrap-theme": "0.1.0-beta.10"
+      }
+    },
+    "node_modules/pretty-error": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz",
+      "integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==",
+      "dev": true,
+      "dependencies": {
+        "lodash": "^4.17.20",
+        "renderkid": "^3.0.0"
+      }
+    },
+    "node_modules/process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
+    "node_modules/process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "dev": true
+    },
+    "node_modules/psl": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
+      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
+      "dev": true
+    },
+    "node_modules/public-encrypt": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "parse-asn1": "^5.0.0",
+        "randombytes": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/public-encrypt/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
+    "node_modules/punycode": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+      "dev": true
+    },
+    "node_modules/querystring": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
+      "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.x"
+      }
+    },
+    "node_modules/querystring-es3": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.x"
+      }
+    },
+    "node_modules/queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/quick-lru": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
+      "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/randomfill": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+      "dev": true,
+      "dependencies": {
+        "randombytes": "^2.0.5",
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/read-pkg": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
+      "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
+      "dev": true,
+      "dependencies": {
+        "@types/normalize-package-data": "^2.4.0",
+        "normalize-package-data": "^2.5.0",
+        "parse-json": "^5.0.0",
+        "type-fest": "^0.6.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/read-pkg-up": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
+      "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^4.1.0",
+        "read-pkg": "^5.2.0",
+        "type-fest": "^0.8.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/type-fest": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/read-pkg/node_modules/hosted-git-info": {
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+      "dev": true
+    },
+    "node_modules/read-pkg/node_modules/normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dev": true,
+      "dependencies": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      }
+    },
+    "node_modules/read-pkg/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/read-pkg/node_modules/type-fest": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
+      "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/readable-stream/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/rechoir": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz",
+      "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==",
+      "dev": true,
+      "dependencies": {
+        "resolve": "^1.9.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/redent": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
+      "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
+      "dev": true,
+      "dependencies": {
+        "indent-string": "^4.0.0",
+        "strip-indent": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/reduce-css-calc": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz",
+      "integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^0.4.2",
+        "math-expression-evaluator": "^1.2.14",
+        "reduce-function-call": "^1.0.1"
+      }
+    },
+    "node_modules/reduce-css-calc/node_modules/balanced-match": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
+      "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
+      "dev": true
+    },
+    "node_modules/reduce-function-call": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.3.tgz",
+      "integrity": "sha512-Hl/tuV2VDgWgCSEeWMLwxLZqX7OK59eU1guxXsRKTAyeYimivsKdtcV4fu3r710tpG5GmDKDhQ0HSZLExnNmyQ==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/regenerate": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
+      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
+      "dev": true
+    },
+    "node_modules/regenerate-unicode-properties": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz",
+      "integrity": "sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==",
+      "dev": true,
+      "dependencies": {
+        "regenerate": "^1.4.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/regenerator-runtime": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
+      "dev": true
+    },
+    "node_modules/regenerator-transform": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz",
+      "integrity": "sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.8.4"
+      }
+    },
+    "node_modules/regexpp": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      }
+    },
+    "node_modules/regexpu-core": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.0.1.tgz",
+      "integrity": "sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw==",
+      "dev": true,
+      "dependencies": {
+        "regenerate": "^1.4.2",
+        "regenerate-unicode-properties": "^10.0.1",
+        "regjsgen": "^0.6.0",
+        "regjsparser": "^0.8.2",
+        "unicode-match-property-ecmascript": "^2.0.0",
+        "unicode-match-property-value-ecmascript": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/regjsgen": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.6.0.tgz",
+      "integrity": "sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA==",
+      "dev": true
+    },
+    "node_modules/regjsparser": {
+      "version": "0.8.4",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.8.4.tgz",
+      "integrity": "sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==",
+      "dev": true,
+      "dependencies": {
+        "jsesc": "~0.5.0"
+      },
+      "bin": {
+        "regjsparser": "bin/parser"
+      }
+    },
+    "node_modules/regjsparser/node_modules/jsesc": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+      "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+      "dev": true,
+      "bin": {
+        "jsesc": "bin/jsesc"
+      }
+    },
+    "node_modules/relateurl": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
+      "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/renderkid": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz",
+      "integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==",
+      "dev": true,
+      "dependencies": {
+        "css-select": "^4.1.3",
+        "dom-converter": "^0.2.0",
+        "htmlparser2": "^6.1.0",
+        "lodash": "^4.17.21",
+        "strip-ansi": "^6.0.1"
+      }
+    },
+    "node_modules/renderkid/node_modules/entities": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/renderkid/node_modules/htmlparser2": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
+      "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
+      "dev": true,
+      "funding": [
+        "https://github.com/fb55/htmlparser2?sponsor=1",
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ],
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.0.0",
+        "domutils": "^2.5.2",
+        "entities": "^2.0.0"
+      }
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/resolve": {
+      "version": "1.22.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
+      "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
+      "dev": true,
+      "dependencies": {
+        "is-core-module": "^2.8.1",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/resolve-cwd": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+      "dev": true,
+      "dependencies": {
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve-cwd/node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "dev": true,
+      "engines": {
+        "iojs": ">=1.0.0",
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/rgb": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/rgb/-/rgb-0.1.0.tgz",
+      "integrity": "sha1-vieykej+/+rBvZlylyG/pA/AN7U=",
+      "dev": true,
+      "bin": {
+        "rgb": "bin/rgb"
+      }
+    },
+    "node_modules/rgb-hex": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/rgb-hex/-/rgb-hex-2.1.0.tgz",
+      "integrity": "sha1-x3PF/iJoolV42SU5qCp6XOU77aY=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/ripemd160": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "dev": true,
+      "dependencies": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
+    "node_modules/run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
+    },
+    "node_modules/sass-embedded": {
+      "version": "1.55.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.55.0.tgz",
+      "integrity": "sha512-6AkKEyRjxz37iNwOdTOW94I33j5mxcih9Z604q1w0M1dOTKaZgtyNI67O0zb4akwZ9dVZ2VSJBXqY8/1TZRBIw==",
+      "dev": true,
+      "dependencies": {
+        "buffer-builder": "^0.2.0",
+        "google-protobuf": "^3.11.4",
+        "immutable": "^4.0.0",
+        "rxjs": "^7.4.0",
+        "supports-color": "^8.1.1"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "optionalDependencies": {
+        "sass-embedded-darwin-arm64": "1.55.0",
+        "sass-embedded-darwin-x64": "1.55.0",
+        "sass-embedded-linux-arm": "1.55.0",
+        "sass-embedded-linux-arm64": "1.55.0",
+        "sass-embedded-linux-ia32": "1.55.0",
+        "sass-embedded-linux-x64": "1.55.0",
+        "sass-embedded-win32-ia32": "1.55.0",
+        "sass-embedded-win32-x64": "1.55.0"
+      }
+    },
+    "node_modules/sass-embedded-darwin-arm64": {
+      "version": "1.55.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-arm64/-/sass-embedded-darwin-arm64-1.55.0.tgz",
+      "integrity": "sha512-cQ43gYDFo4xWSqG01ZmOhTyTgk/RYK7s1a4R+7VSQPhYTsd4VofAmTNw0MkLR3RzR53ziGgawA6uT/WHTm+yjg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-darwin-x64": {
+      "version": "1.55.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-x64/-/sass-embedded-darwin-x64-1.55.0.tgz",
+      "integrity": "sha512-ra8z++EBey01pkiwCwjWyMbf6G5xm2Uj0dUJzzsS1MI6Fw6XaesrWmYico5pnawm3rOYtKlMxkd2Y6b1Jwxy8A==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-linux-arm": {
+      "version": "1.55.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm/-/sass-embedded-linux-arm-1.55.0.tgz",
+      "integrity": "sha512-UIW7CaRLjHMWm64jH23n5eji/RAv8XIJ2qpFh0Ds8EJeDZmRA+qyIFHcQ805fZ22u6o0mkxq0kE4+j1XmmbBeg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-linux-arm64": {
+      "version": "1.55.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm64/-/sass-embedded-linux-arm64-1.55.0.tgz",
+      "integrity": "sha512-P4zL4PnujdiSkek/g0RJjyNZcYEqSm6WFr0sSIrxe3byhGg56mWr4WJdxUNwFZ6sxyy2s0PFSjSKGmBtgEfIpw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-linux-ia32": {
+      "version": "1.55.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-ia32/-/sass-embedded-linux-ia32-1.55.0.tgz",
+      "integrity": "sha512-9XJyAl4w5KBjR4LAXckfQKqPv9UYPmOv2HFRBwhHD1k4Dc8gZbfTCzK5wl49z5Z4z1GPvqV9ucIZceXzgJ5e6Q==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-linux-x64": {
+      "version": "1.55.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-x64/-/sass-embedded-linux-x64-1.55.0.tgz",
+      "integrity": "sha512-vd4/4/L7gZcVyxq03/MY/+rcpGgOI0ihOUpwRJLj+9CmUxvhxCSTF51/QO5CW7Z5oJSYEABA/RYlj8NPm4ZejA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-win32-ia32": {
+      "version": "1.55.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-win32-ia32/-/sass-embedded-win32-ia32-1.55.0.tgz",
+      "integrity": "sha512-4HxK0byJ3iIn5OECIeNVz9GcGBuQcQT6kTvI+3QSHzuKsqgQrlXOPJ3772zKD6PVwZJNFZJFf3o9w8V2VSHbTQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-win32-x64": {
+      "version": "1.55.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-win32-x64/-/sass-embedded-win32-x64-1.55.0.tgz",
+      "integrity": "sha512-LWUp5YpJy0/Q+5AOVcw919jktw+OnPiM4f4j5K6MJAiaodJwrSTqRGwMa2wOWyAUpjIdka8Ygm6j+2h5HNgSNQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/sass-embedded/node_modules/rxjs": {
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.7.tgz",
+      "integrity": "sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
+    "node_modules/sass-embedded/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/sass-loader": {
+      "version": "13.0.2",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.0.2.tgz",
+      "integrity": "sha512-BbiqbVmbfJaWVeOOAu2o7DhYWtcNmTfvroVgFXa6k2hHheMxNAeDHLNoDy/Q5aoaVlz0LH+MbMktKwm9vN/j8Q==",
+      "dev": true,
+      "dependencies": {
+        "klona": "^2.0.4",
+        "neo-async": "^2.6.2"
+      },
+      "engines": {
+        "node": ">= 14.15.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "fibers": ">= 3.1.0",
+        "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0",
+        "sass": "^1.3.0",
+        "sass-embedded": "*",
+        "webpack": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "fibers": {
+          "optional": true
+        },
+        "node-sass": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "sass-embedded": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+      "dev": true
+    },
+    "node_modules/saxes": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
+      "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
+      "dev": true,
+      "dependencies": {
+        "xmlchars": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/schema-utils": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
+      "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.5",
+        "ajv": "^6.12.4",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 8.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/select2": {
+      "version": "4.0.13",
+      "resolved": "https://registry.npmjs.org/select2/-/select2-4.0.13.tgz",
+      "integrity": "sha512-1JeB87s6oN/TDxQQYCvS5EFoQyvV6eYMZZ0AeA4tdFDYWN3BAGZ8npr17UBFddU0lgAt3H0yjX3X6/ekOj1yjw=="
+    },
+    "node_modules/select2-bootstrap-theme": {
+      "version": "0.1.0-beta.10",
+      "resolved": "https://registry.npmjs.org/select2-bootstrap-theme/-/select2-bootstrap-theme-0.1.0-beta.10.tgz",
+      "integrity": "sha512-gc9Y9yNjkGRqeFmI/pAKyL4maMKH9VKAn62E+uF/hxz8FTmfuKH0sDEGhFhk3f8Jp+emtsDdK1c1nb6S51BV0Q=="
+    },
+    "node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
+      "dev": true
+    },
+    "node_modules/sha.js": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      },
+      "bin": {
+        "sha.js": "bin.js"
+      }
+    },
+    "node_modules/shallow-clone": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true
+    },
+    "node_modules/simple-swizzle": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
+      "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
+      "dev": true,
+      "dependencies": {
+        "is-arrayish": "^0.3.1"
+      }
+    },
+    "node_modules/simple-swizzle/node_modules/is-arrayish": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
+      "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
+      "dev": true
+    },
+    "node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/source-list-map": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
+      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
+      "dev": true
+    },
+    "node_modules/source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-js": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "dev": true,
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/source-map-support/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/spdx-correct": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
+      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+      "dev": true,
+      "dependencies": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-exceptions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
+      "dev": true
+    },
+    "node_modules/spdx-expression-parse": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "dev": true,
+      "dependencies": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-expression-validate": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-expression-validate/-/spdx-expression-validate-2.0.0.tgz",
+      "integrity": "sha512-b3wydZLM+Tc6CFvaRDBOF9d76oGIHNCLYFeHbftFXUWjnfZWganmDmvtM5sm1cRwJc/VDBMLyGGrsLFd1vOxbg==",
+      "dev": true,
+      "dependencies": {
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-license-ids": {
+      "version": "3.0.11",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz",
+      "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==",
+      "dev": true
+    },
+    "node_modules/specificity": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/specificity/-/specificity-0.4.1.tgz",
+      "integrity": "sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==",
+      "dev": true,
+      "bin": {
+        "specificity": "bin/specificity"
+      }
+    },
+    "node_modules/split2": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-0.2.1.tgz",
+      "integrity": "sha1-At2smtwD7Au3jBKC7Aecpuha6QA=",
+      "dev": true,
+      "dependencies": {
+        "through2": "~0.6.1"
+      }
+    },
+    "node_modules/split2/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+      "dev": true
+    },
+    "node_modules/split2/node_modules/readable-stream": {
+      "version": "1.0.34",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+      "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/split2/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+      "dev": true
+    },
+    "node_modules/split2/node_modules/through2": {
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+      "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": ">=1.0.33-1 <1.1.0-0",
+        "xtend": ">=4.0.0 <4.1.0-0"
+      }
+    },
+    "node_modules/stream-browserify": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
+      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "~2.0.1",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "node_modules/stream-http": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
+      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+      "dev": true,
+      "dependencies": {
+        "builtin-status-codes": "^3.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.3.6",
+        "to-arraybuffer": "^1.0.0",
+        "xtend": "^4.0.0"
+      }
+    },
+    "node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "node_modules/string_decoder/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string.prototype.trimend": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
+      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
+      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/strip-final-newline": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/strip-indent": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
+      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+      "dev": true,
+      "dependencies": {
+        "min-indent": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/style-loader": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.3.0.tgz",
+      "integrity": "sha512-V7TCORko8rs9rIqkSrlMfkqA63DfoGBBJmK1kKGCcSi+BWb4cqz0SRsnp4l6rU5iwOEd0/2ePv68SV22VXon4Q==",
+      "dev": true,
+      "dependencies": {
+        "loader-utils": "^2.0.0",
+        "schema-utils": "^2.7.0"
+      },
+      "engines": {
+        "node": ">= 8.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/style-search": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
+      "integrity": "sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI=",
+      "dev": true
+    },
+    "node_modules/stylelint": {
+      "version": "14.7.1",
+      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.7.1.tgz",
+      "integrity": "sha512-rUOWm67hrzGXXyO/cInENEejF4urh1dLgOb9cr/3XLDb/t/A+rXQp3p6+no8o8QCKTgBUdhVUq/bXMgE988PJw==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^2.0.0",
+        "colord": "^2.9.2",
+        "cosmiconfig": "^7.0.1",
+        "css-functions-list": "^3.0.1",
+        "debug": "^4.3.4",
+        "execall": "^2.0.0",
+        "fast-glob": "^3.2.11",
+        "fastest-levenshtein": "^1.0.12",
+        "file-entry-cache": "^6.0.1",
+        "get-stdin": "^8.0.0",
+        "global-modules": "^2.0.0",
+        "globby": "^11.1.0",
+        "globjoin": "^0.1.4",
+        "html-tags": "^3.2.0",
+        "ignore": "^5.2.0",
+        "import-lazy": "^4.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-plain-object": "^5.0.0",
+        "known-css-properties": "^0.24.0",
+        "mathml-tag-names": "^2.1.3",
+        "meow": "^9.0.0",
+        "micromatch": "^4.0.5",
+        "normalize-path": "^3.0.0",
+        "normalize-selector": "^0.2.0",
+        "picocolors": "^1.0.0",
+        "postcss": "^8.4.12",
+        "postcss-media-query-parser": "^0.2.3",
+        "postcss-resolve-nested-selector": "^0.1.1",
+        "postcss-safe-parser": "^6.0.0",
+        "postcss-selector-parser": "^6.0.10",
+        "postcss-value-parser": "^4.2.0",
+        "resolve-from": "^5.0.0",
+        "specificity": "^0.4.1",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1",
+        "style-search": "^0.1.0",
+        "supports-hyperlinks": "^2.2.0",
+        "svg-tags": "^1.0.0",
+        "table": "^6.8.0",
+        "v8-compile-cache": "^2.3.0",
+        "write-file-atomic": "^4.0.1"
+      },
+      "bin": {
+        "stylelint": "bin/stylelint.js"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/stylelint"
+      }
+    },
+    "node_modules/stylelint-config-prestashop": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/stylelint-config-prestashop/-/stylelint-config-prestashop-1.0.7.tgz",
+      "integrity": "sha512-Ac2D15Jsk/zOmHJ4mu5g29bLQFkOmuSKGE/n8Scjs6YAOL/7QRhq26hXzlZ21+VMFi2bqKdjzqmYKbhgUHGpCA==",
+      "dev": true,
+      "dependencies": {
+        "stylelint-config-twbs-bootstrap": "^3.0.1",
+        "stylelint-no-unsupported-browser-features": "^5.0.1"
+      }
+    },
+    "node_modules/stylelint-config-prestashop/node_modules/postcss-scss": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.3.tgz",
+      "integrity": "sha512-j4KxzWovfdHsyxwl1BxkUal/O4uirvHgdzMKS1aWJBAV0qh2qj5qAZqpeBfVUYGWv+4iK9Az7SPyZ4fyNju1uA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      },
+      "peerDependencies": {
+        "postcss": "^8.3.3"
+      }
+    },
+    "node_modules/stylelint-config-prestashop/node_modules/postcss-value-parser": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+      "dev": true
+    },
+    "node_modules/stylelint-config-prestashop/node_modules/stylelint-config-recess-order": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-recess-order/-/stylelint-config-recess-order-3.0.0.tgz",
+      "integrity": "sha512-uNXrlDz570Q7HJlrq8mNjgfO/xlKIh2hKVKEFMTG1/ih/6tDLcTbuvO1Zoo2dnQay990OAkWLDpTDOorB+hmBw==",
+      "dev": true,
+      "dependencies": {
+        "stylelint-order": "5.x"
+      },
+      "peerDependencies": {
+        "stylelint": ">=14"
+      }
+    },
+    "node_modules/stylelint-config-prestashop/node_modules/stylelint-config-recommended": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-6.0.0.tgz",
+      "integrity": "sha512-ZorSSdyMcxWpROYUvLEMm0vSZud2uB7tX1hzBZwvVY9SV/uly4AvvJPPhCcymZL3fcQhEQG5AELmrxWqtmzacw==",
+      "dev": true,
+      "peerDependencies": {
+        "stylelint": "^14.0.0"
+      }
+    },
+    "node_modules/stylelint-config-prestashop/node_modules/stylelint-config-recommended-scss": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-5.0.2.tgz",
+      "integrity": "sha512-b14BSZjcwW0hqbzm9b0S/ScN2+3CO3O4vcMNOw2KGf8lfVSwJ4p5TbNEXKwKl1+0FMtgRXZj6DqVUe/7nGnuBg==",
+      "dev": true,
+      "dependencies": {
+        "postcss-scss": "^4.0.2",
+        "stylelint-config-recommended": "^6.0.0",
+        "stylelint-scss": "^4.0.0"
+      },
+      "peerDependencies": {
+        "stylelint": "^14.0.0"
+      }
+    },
+    "node_modules/stylelint-config-prestashop/node_modules/stylelint-config-standard": {
+      "version": "24.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-24.0.0.tgz",
+      "integrity": "sha512-+RtU7fbNT+VlNbdXJvnjc3USNPZRiRVp/d2DxOF/vBDDTi0kH5RX2Ny6errdtZJH3boO+bmqIYEllEmok4jiuw==",
+      "dev": true,
+      "dependencies": {
+        "stylelint-config-recommended": "^6.0.0"
+      },
+      "peerDependencies": {
+        "stylelint": "^14.0.0"
+      }
+    },
+    "node_modules/stylelint-config-prestashop/node_modules/stylelint-config-standard-scss": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-standard-scss/-/stylelint-config-standard-scss-3.0.0.tgz",
+      "integrity": "sha512-zt3ZbzIbllN1iCmc94e4pDxqpkzeR6CJo5DDXzltshuXr+82B8ylHyMMARNnUYrZH80B7wgY7UkKTYCFM0UUyw==",
+      "dev": true,
+      "dependencies": {
+        "stylelint-config-recommended-scss": "^5.0.2",
+        "stylelint-config-standard": "^24.0.0"
+      },
+      "peerDependencies": {
+        "stylelint": "^14.0.0"
+      }
+    },
+    "node_modules/stylelint-config-prestashop/node_modules/stylelint-config-twbs-bootstrap": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/stylelint-config-twbs-bootstrap/-/stylelint-config-twbs-bootstrap-3.0.1.tgz",
+      "integrity": "sha512-XvFWKO0aveUy/RziVa5osYaOXAX6CePt8YypnRwKdrMtZWkgP85xnrkYBEpS2fmKl2WN79NCdSQFLU/UFoP7hw==",
+      "dev": true,
+      "dependencies": {
+        "stylelint-config-recess-order": "^3.0.0",
+        "stylelint-config-standard": "^24.0.0",
+        "stylelint-config-standard-scss": "^3.0.0",
+        "stylelint-scss": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "peerDependencies": {
+        "stylelint": "^14.1.0"
+      }
+    },
+    "node_modules/stylelint-config-prestashop/node_modules/stylelint-order": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-5.0.0.tgz",
+      "integrity": "sha512-OWQ7pmicXufDw5BlRqzdz3fkGKJPgLyDwD1rFY3AIEfIH/LQY38Vu/85v8/up0I+VPiuGRwbc2Hg3zLAsJaiyw==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^8.3.11",
+        "postcss-sorting": "^7.0.1"
+      },
+      "peerDependencies": {
+        "stylelint": "^14.0.0"
+      }
+    },
+    "node_modules/stylelint-config-prestashop/node_modules/stylelint-scss": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-4.2.0.tgz",
+      "integrity": "sha512-HHHMVKJJ5RM9pPIbgJ/XA67h9H0407G68Rm69H4fzFbFkyDMcTV1Byep3qdze5+fJ3c0U7mJrbj6S0Fg072uZA==",
+      "dev": true,
+      "dependencies": {
+        "lodash": "^4.17.21",
+        "postcss-media-query-parser": "^0.2.3",
+        "postcss-resolve-nested-selector": "^0.1.1",
+        "postcss-selector-parser": "^6.0.6",
+        "postcss-value-parser": "^4.1.0"
+      },
+      "peerDependencies": {
+        "stylelint": "^14.5.1"
+      }
+    },
+    "node_modules/stylelint-no-unsupported-browser-features": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/stylelint-no-unsupported-browser-features/-/stylelint-no-unsupported-browser-features-5.0.3.tgz",
+      "integrity": "sha512-FqfbOTk5UEkHsAKOkPH6SvajsfO9YuoWvKxd34tCRBZug9ZNeaPn141nyWkd+ncc8S1gVmO2+O6qVAMj9bvWww==",
+      "dev": true,
+      "dependencies": {
+        "doiuse": "^4.4.1",
+        "lodash": "^4.17.15",
+        "postcss": "^8.3.6"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "peerDependencies": {
+        "stylelint": ">=13.0.0"
+      }
+    },
+    "node_modules/stylelint/node_modules/ajv": {
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
+      "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/stylelint/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/stylelint/node_modules/array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/stylelint/node_modules/astral-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/stylelint/node_modules/balanced-match": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz",
+      "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==",
+      "dev": true
+    },
+    "node_modules/stylelint/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/stylelint/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/stylelint/node_modules/get-stdin": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
+      "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/stylelint/node_modules/globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+      "dev": true,
+      "dependencies": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/stylelint/node_modules/is-plain-object": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/stylelint/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
+    },
+    "node_modules/stylelint/node_modules/postcss-value-parser": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+      "dev": true
+    },
+    "node_modules/stylelint/node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/stylelint/node_modules/slice-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+      }
+    },
+    "node_modules/stylelint/node_modules/table": {
+      "version": "6.8.0",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
+      "integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^8.0.1",
+        "lodash.truncate": "^4.4.2",
+        "slice-ansi": "^4.0.0",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/supports-hyperlinks": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
+      "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0",
+        "supports-color": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-hyperlinks/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-hyperlinks/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/svg-tags": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
+      "integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=",
+      "dev": true
+    },
+    "node_modules/symbol-tree": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
+      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
+      "dev": true
+    },
+    "node_modules/tapable": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
+      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/terser": {
+      "version": "5.12.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.12.1.tgz",
+      "integrity": "sha512-NXbs+7nisos5E+yXwAD+y7zrcTkMqb0dEJxIGtSKPdCBzopf7ni4odPul2aechpV7EXNvOudYOX2bb5tln1jbQ==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^8.5.0",
+        "commander": "^2.20.0",
+        "source-map": "~0.7.2",
+        "source-map-support": "~0.5.20"
+      },
+      "bin": {
+        "terser": "bin/terser"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/terser-webpack-plugin": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz",
+      "integrity": "sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g==",
+      "dev": true,
+      "dependencies": {
+        "jest-worker": "^27.4.5",
+        "schema-utils": "^3.1.1",
+        "serialize-javascript": "^6.0.0",
+        "source-map": "^0.6.1",
+        "terser": "^5.7.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.1.0"
+      },
+      "peerDependenciesMeta": {
+        "@swc/core": {
+          "optional": true
+        },
+        "esbuild": {
+          "optional": true
+        },
+        "uglify-js": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/serialize-javascript": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
+      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
+      "dev": true,
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/terser/node_modules/acorn": {
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
+      "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/terser/node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
+    },
+    "node_modules/terser/node_modules/source-map": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+      "dev": true
+    },
+    "node_modules/through2": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz",
+      "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "3"
+      }
+    },
+    "node_modules/through2/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/timers-browserify": {
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
+      "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
+      "dev": true,
+      "dependencies": {
+        "setimmediate": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
+    "node_modules/to-arraybuffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
+      "dev": true
+    },
+    "node_modules/to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/tr46": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
+      "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
+      "dev": true,
+      "dependencies": {
+        "punycode": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tr46/node_modules/punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/trim-newlines": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
+      "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/tsconfig-paths": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
+      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.1",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
+      }
+    },
+    "node_modules/tsconfig-paths/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/tslib": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+      "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
+      "dev": true
+    },
+    "node_modules/tty-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
+      "dev": true
+    },
+    "node_modules/type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/unbox-primitive": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
+      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "has-bigints": "^1.0.1",
+        "has-symbols": "^1.0.2",
+        "which-boxed-primitive": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/unicode-canonical-property-names-ecmascript": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unicode-match-property-ecmascript": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
+      "dev": true,
+      "dependencies": {
+        "unicode-canonical-property-names-ecmascript": "^2.0.0",
+        "unicode-property-aliases-ecmascript": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unicode-match-property-value-ecmascript": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unicode-property-aliases-ecmascript": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/uniq": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
+      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
+      "dev": true
+    },
+    "node_modules/units-css": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/units-css/-/units-css-0.4.0.tgz",
+      "integrity": "sha1-1iKGU6UZg9fBb/KPi53Dsf/tOgc=",
+      "dev": true,
+      "dependencies": {
+        "isnumeric": "^0.2.0",
+        "viewport-dimensions": "^0.2.0"
+      }
+    },
+    "node_modules/universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/uri-js/node_modules/punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/url": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+      "dev": true,
+      "dependencies": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      }
+    },
+    "node_modules/url/node_modules/punycode": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+      "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+      "dev": true
+    },
+    "node_modules/util": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "2.0.3"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
+    },
+    "node_modules/util/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "dev": true
+    },
+    "node_modules/utila": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
+      "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=",
+      "dev": true
+    },
+    "node_modules/v8-compile-cache": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+      "dev": true
+    },
+    "node_modules/validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
+      "dependencies": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "node_modules/vazirmatn": {
+      "version": "32.102.0",
+      "resolved": "https://registry.npmjs.org/vazirmatn/-/vazirmatn-32.102.0.tgz",
+      "integrity": "sha512-Fkvs0Hp5x9zjHTuwog3KEcARhMLxjXd3o3MyD/vBywxYt2LG+4THEHpu6AW8ojfHJAutrxFnDTPB/5hvkX80ww=="
+    },
+    "node_modules/viewport-dimensions": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/viewport-dimensions/-/viewport-dimensions-0.2.0.tgz",
+      "integrity": "sha1-3nQHR9tTh/0XJfUXXpG6x2r982w=",
+      "dev": true
+    },
+    "node_modules/vm-browserify": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
+      "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
+      "dev": true
+    },
+    "node_modules/w3c-hr-time": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
+      "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
+      "dev": true,
+      "dependencies": {
+        "browser-process-hrtime": "^1.0.0"
+      }
+    },
+    "node_modules/w3c-xmlserializer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-3.0.0.tgz",
+      "integrity": "sha512-3WFqGEgSXIyGhOmAFtlicJNMjEps8b1MG31NCA0/vOF9+nKMUW1ckhi9cnNHmf88Rzw5V+dwIwsm2C7X8k9aQg==",
+      "dev": true,
+      "dependencies": {
+        "xml-name-validator": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/watchpack": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz",
+      "integrity": "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==",
+      "dev": true,
+      "dependencies": {
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.1.2"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/webidl-conversions": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/webpack": {
+      "version": "5.72.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.72.0.tgz",
+      "integrity": "sha512-qmSmbspI0Qo5ld49htys8GY9XhS9CGqFoHTsOVAnjBdg0Zn79y135R+k4IR4rKK6+eKaabMhJwiVB7xw0SJu5w==",
+      "dev": true,
+      "dependencies": {
+        "@types/eslint-scope": "^3.7.3",
+        "@types/estree": "^0.0.51",
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/wasm-edit": "1.11.1",
+        "@webassemblyjs/wasm-parser": "1.11.1",
+        "acorn": "^8.4.1",
+        "acorn-import-assertions": "^1.7.6",
+        "browserslist": "^4.14.5",
+        "chrome-trace-event": "^1.0.2",
+        "enhanced-resolve": "^5.9.2",
+        "es-module-lexer": "^0.9.0",
+        "eslint-scope": "5.1.1",
+        "events": "^3.2.0",
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.2.9",
+        "json-parse-better-errors": "^1.0.2",
+        "loader-runner": "^4.2.0",
+        "mime-types": "^2.1.27",
+        "neo-async": "^2.6.2",
+        "schema-utils": "^3.1.0",
+        "tapable": "^2.1.1",
+        "terser-webpack-plugin": "^5.1.3",
+        "watchpack": "^2.3.1",
+        "webpack-sources": "^3.2.3"
+      },
+      "bin": {
+        "webpack": "bin/webpack.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependenciesMeta": {
+        "webpack-cli": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-cli": {
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.9.2.tgz",
+      "integrity": "sha512-m3/AACnBBzK/kMTcxWHcZFPrw/eQuY4Df1TxvIWfWM2x7mRqBQCqKEd96oCUa9jkapLBaFfRce33eGDb4Pr7YQ==",
+      "dev": true,
+      "dependencies": {
+        "@discoveryjs/json-ext": "^0.5.0",
+        "@webpack-cli/configtest": "^1.1.1",
+        "@webpack-cli/info": "^1.4.1",
+        "@webpack-cli/serve": "^1.6.1",
+        "colorette": "^2.0.14",
+        "commander": "^7.0.0",
+        "execa": "^5.0.0",
+        "fastest-levenshtein": "^1.0.12",
+        "import-local": "^3.0.2",
+        "interpret": "^2.2.0",
+        "rechoir": "^0.7.0",
+        "webpack-merge": "^5.7.3"
+      },
+      "bin": {
+        "webpack-cli": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "peerDependencies": {
+        "webpack": "4.x.x || 5.x.x"
+      },
+      "peerDependenciesMeta": {
+        "@webpack-cli/generators": {
+          "optional": true
+        },
+        "@webpack-cli/migrate": {
+          "optional": true
+        },
+        "webpack-bundle-analyzer": {
+          "optional": true
+        },
+        "webpack-dev-server": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-cli/node_modules/commander": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/webpack-cli/node_modules/interpret": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz",
+      "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/webpack-font-preload-plugin": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/webpack-font-preload-plugin/-/webpack-font-preload-plugin-1.5.0.tgz",
+      "integrity": "sha512-/Nh6MNa7/rbu3ZcqSR1SxB+G5XaITu7U2yZO5INTsVRpVlMLQmHQZCoDt4PP+iFyBdvBCDbA0CImRXHarQ0wpQ==",
+      "dev": true,
+      "dependencies": {
+        "jsdom": "^19.0.0",
+        "webpack-sources": "^3.2.2"
+      },
+      "engines": {
+        "node": ">= 10.17.0"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/webpack-font-preload-plugin/node_modules/webpack-sources": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/webpack-license-plugin": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/webpack-license-plugin/-/webpack-license-plugin-4.2.2.tgz",
+      "integrity": "sha512-OfIdm659IKurEInKlBN6Sfzrh+MNKIWkChKKg+aDCoPf3Ok1OSXBDd2RKSbuUAtxjmdW2j6LUVZWnRYRnVdOxA==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^5.0.1",
+        "get-npm-tarball-url": "^2.0.1",
+        "lodash": "^4.17.20",
+        "needle": "^2.2.4",
+        "spdx-expression-validate": "^2.0.0",
+        "webpack-sources": "^3.2.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "webpack": ">=4.0.0 < 6.0.0"
+      }
+    },
+    "node_modules/webpack-license-plugin/node_modules/chalk": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz",
+      "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==",
+      "dev": true,
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/webpack-license-plugin/node_modules/webpack-sources": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/webpack-merge": {
+      "version": "5.8.0",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz",
+      "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==",
+      "dev": true,
+      "dependencies": {
+        "clone-deep": "^4.0.1",
+        "wildcard": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/webpack-remove-empty-scripts": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/webpack-remove-empty-scripts/-/webpack-remove-empty-scripts-0.7.3.tgz",
+      "integrity": "sha512-yipqb25A0qtH7X9vKt6yihwyYkTtSlRiDdBb2QsyrkqGM3hpfAcfOO1lYDef9HQUNm3s8ojmorbNg32XXX6FYg==",
+      "dev": true,
+      "dependencies": {
+        "ansis": "^1.3.4"
+      },
+      "engines": {
+        "node": ">=12.14"
+      },
+      "funding": {
+        "type": "patreon",
+        "url": "https://patreon.com/biodiscus"
+      },
+      "peerDependencies": {
+        "webpack": ">=5.32.0"
+      }
+    },
+    "node_modules/webpack-sources": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+      "dev": true,
+      "dependencies": {
+        "source-list-map": "^2.0.0",
+        "source-map": "~0.6.1"
+      }
+    },
+    "node_modules/webpack-sources/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack/node_modules/acorn": {
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
+      "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/webpack/node_modules/acorn-import-assertions": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
+      "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
+      "dev": true,
+      "peerDependencies": {
+        "acorn": "^8"
+      }
+    },
+    "node_modules/webpack/node_modules/enhanced-resolve": {
+      "version": "5.9.3",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.3.tgz",
+      "integrity": "sha512-Bq9VSor+kjvW3f9/MiiR4eE3XYgOl7/rS8lnSxbRbF3kS0B2r+Y9w5krBWxZgDxASVZbdYrn5wT4j/Wb0J9qow==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.4",
+        "tapable": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/webpack/node_modules/schema-utils": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/webpack/node_modules/webpack-sources": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/whatwg-encoding": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
+      "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
+      "dev": true,
+      "dependencies": {
+        "iconv-lite": "0.6.3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/whatwg-encoding/node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "dev": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/whatwg-mimetype": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
+      "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/whatwg-url": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-10.0.0.tgz",
+      "integrity": "sha512-CLxxCmdUby142H5FZzn4D8ikO1cmypvXVQktsgosNy4a4BHrDHeciBBGZhb0bNoR5/MltoCatso+vFjjGx8t0w==",
+      "dev": true,
+      "dependencies": {
+        "tr46": "^3.0.0",
+        "webidl-conversions": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "dev": true,
+      "dependencies": {
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/wildcard": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
+      "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==",
+      "dev": true
+    },
+    "node_modules/word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "node_modules/write-file-atomic": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.1.tgz",
+      "integrity": "sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==",
+      "dev": true,
+      "dependencies": {
+        "imurmurhash": "^0.1.4",
+        "signal-exit": "^3.0.7"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16"
+      }
+    },
+    "node_modules/ws": {
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
+      "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/xml-name-validator": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
+      "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/xmlchars": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
+      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
+      "dev": true
+    },
+    "node_modules/xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
+    "node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/yaml": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "20.2.9",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    }
+  },
   "dependencies": {
     "@ampproject/remapping": {
       "version": "2.1.2",
@@ -1453,7 +12965,8 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.1.1.tgz",
       "integrity": "sha512-1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "@webpack-cli/info": {
       "version": "1.4.1",
@@ -1468,7 +12981,8 @@
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.6.1.tgz",
       "integrity": "sha512-gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "@xtuc/ieee754": {
       "version": "1.2.0",
@@ -1508,7 +13022,8 @@
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "acorn-walk": {
       "version": "7.2.0",
@@ -1541,7 +13056,8 @@
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
       "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "ansi-regex": {
       "version": "5.0.1",
@@ -1840,7 +13356,8 @@
     "bootstrap": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz",
-      "integrity": "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ=="
+      "integrity": "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==",
+      "requires": {}
     },
     "bourbon": {
       "version": "4.3.4",
@@ -4180,7 +15697,8 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
       "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "ieee754": {
       "version": "1.2.1",
@@ -4529,6 +16047,12 @@
         }
       }
     },
+    "jquery": {
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.1.tgz",
+      "integrity": "sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw==",
+      "peer": true
+    },
     "jquery.growl": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/jquery.growl/-/jquery.growl-1.3.5.tgz",
@@ -5697,6 +17221,12 @@
         }
       }
     },
+    "popper.js": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
+      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
+      "peer": true
+    },
     "postcss": {
       "version": "8.4.19",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.19.tgz",
@@ -6482,7 +18012,8 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
       "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-modules-local-by-default": {
       "version": "4.0.0",
@@ -6655,7 +18186,8 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz",
       "integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-selector-matches": {
       "version": "3.0.1",
@@ -6741,7 +18273,8 @@
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-7.0.1.tgz",
       "integrity": "sha512-iLBFYz6VRYyLJEJsBJ8M3TCqNcckVzz4wFounSc5Oez35ogE/X+aoC5fFu103Ot7NyvjU3/xqIXn93Gp3kJk4g==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-value-parser": {
       "version": "3.3.1",
@@ -7665,6 +19198,23 @@
         "xtend": "^4.0.0"
       }
     },
+    "string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.2.0"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+          "dev": true
+        }
+      }
+    },
     "string-width": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -7696,23 +19246,6 @@
         "define-properties": "^1.1.3"
       }
     },
-    "string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.2.0"
-      },
-      "dependencies": {
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-          "dev": true
-        }
-      }
-    },
     "strip-ansi": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
@@ -7952,7 +19485,8 @@
           "version": "4.0.3",
           "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.3.tgz",
           "integrity": "sha512-j4KxzWovfdHsyxwl1BxkUal/O4uirvHgdzMKS1aWJBAV0qh2qj5qAZqpeBfVUYGWv+4iK9Az7SPyZ4fyNju1uA==",
-          "dev": true
+          "dev": true,
+          "requires": {}
         },
         "postcss-value-parser": {
           "version": "4.2.0",
@@ -7973,7 +19507,8 @@
           "version": "6.0.0",
           "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-6.0.0.tgz",
           "integrity": "sha512-ZorSSdyMcxWpROYUvLEMm0vSZud2uB7tX1hzBZwvVY9SV/uly4AvvJPPhCcymZL3fcQhEQG5AELmrxWqtmzacw==",
-          "dev": true
+          "dev": true,
+          "requires": {}
         },
         "stylelint-config-recommended-scss": {
           "version": "5.0.2",
@@ -8552,7 +20087,8 @@
           "version": "1.8.0",
           "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
           "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
-          "dev": true
+          "dev": true,
+          "requires": {}
         },
         "enhanced-resolve": {
           "version": "5.9.3",
@@ -8790,7 +20326,8 @@
       "version": "8.5.0",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
       "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "xml-name-validator": {
       "version": "4.0.0",
diff --git a/admin-dev/themes/new-theme/package-lock.json b/admin-dev/themes/new-theme/package-lock.json
index 62585aa06f38d..67e8d2903b8c8 100644
--- a/admin-dev/themes/new-theme/package-lock.json
+++ b/admin-dev/themes/new-theme/package-lock.json
@@ -1,8 +1,14275 @@
 {
   "name": "new-theme",
   "version": "1.0.0",
-  "lockfileVersion": 1,
+  "lockfileVersion": 2,
   "requires": true,
+  "packages": {
+    "": {
+      "name": "new-theme",
+      "version": "1.0.0",
+      "license": "OSL-3.0",
+      "dependencies": {
+        "bignumber.js": "^9.0.1",
+        "bootstrap-colorpicker": "^3.2.0",
+        "bootstrap-tokenfield": "^0.12.0",
+        "bourbon": "^4.2.6",
+        "dropzone": "^5.9.3",
+        "eonasdan-bootstrap-datetimepicker": "^4.17.47",
+        "events": "^3.0.0",
+        "fos-routing": "0.0.6",
+        "jets": "0.11.0",
+        "jquery-serializejson": "^3.2.0",
+        "jquery-ui-dist": "^1.12.1",
+        "jwerty": "^0.3.2",
+        "lodash": "^4.17.21",
+        "lodash.escaperegexp": "^4.1.2",
+        "magnific-popup": "^1.1.0",
+        "moment": "^2.24.0",
+        "perfect-scrollbar": "^1.5.0",
+        "photoswipe": "^4.1.3",
+        "postcss": "^8.4.4",
+        "prestakit": "^1.2.6",
+        "punycode": "^2.1.1",
+        "resize-observer-polyfill": "^1.5.1",
+        "sprintf-js": "^1.1.2",
+        "tablednd": "^1.0.3",
+        "terser-webpack-plugin": "^5.2.5",
+        "typeahead.js": "^0.11.1",
+        "url-polyfill": "^1.1.7",
+        "vazirmatn": "32.102.0",
+        "vue": "^3.2.33",
+        "vue-i18n": "^9.1.10",
+        "vue-resource": "^1.5.1",
+        "vue-router": "^4.0.15",
+        "vuex": "^4.0.2",
+        "zxcvbn": "^4.4.2"
+      },
+      "devDependencies": {
+        "@babel/core": "^7.15.7",
+        "@babel/eslint-parser": "^7.18.9",
+        "@types/bootstrap": "^4.5.0",
+        "@types/dropzone": "^5.7.4",
+        "@types/jquery": "^3.5.5",
+        "@types/jquery.growl": "^1.3.4",
+        "@types/lodash": "^4.14.170",
+        "@types/photoswipe": "^4.1.2",
+        "@types/sprintf-js": "^1.1.2",
+        "@types/typeahead.js": "^0.11.0",
+        "@types/zxcvbn": "^4.4.1",
+        "@typescript-eslint/eslint-plugin": "^5.33.1",
+        "@typescript-eslint/parser": "^5.33.1",
+        "@vue/compiler-sfc": "^3.2.33",
+        "@vue/eslint-config-typescript": "^11.0.0",
+        "@vue/runtime-dom": "^3.2.33",
+        "bootstrap": "~4.4.1",
+        "chai": "^4.2.0",
+        "clean-webpack-plugin": "^4.0.0",
+        "copy-webpack-plugin": "^11.0.0",
+        "core-js": "^3.18.0",
+        "css-loader": "^6.7.2",
+        "csso-webpack-plugin": "^2.0.0-beta.3",
+        "esbuild-loader": "^2.15.1",
+        "eslint": "^8.22.0",
+        "eslint-config-airbnb-base": "^15.0.0",
+        "eslint-import-resolver-webpack": "^0.12.1",
+        "eslint-plugin-html": "^6.0.0",
+        "eslint-plugin-import": "^2.20.0",
+        "eslint-plugin-vue": "^9.3.0",
+        "expose-loader": "^4.0.0",
+        "file-loader": "^5.0",
+        "fork-ts-checker-webpack-plugin": "^7.2.11",
+        "hot-accept-webpack-plugin": "^2.0.0-beta.7",
+        "html-webpack-plugin": "^5.5.0",
+        "imports-loader": "^4.0.1",
+        "mini-css-extract-plugin": "^2.6.1",
+        "mocha": "^6",
+        "path": "^0.12.7",
+        "postcss-loader": "^7.0.1",
+        "postcss-preset-env": "^7.8.2",
+        "sass-embedded": "^1.55.0",
+        "sass-loader": "^13.0.2",
+        "style-loader": "^3.3.1",
+        "stylelint": "^14.1.0",
+        "stylelint-config-prestashop": "^1.0.5",
+        "ts-loader": "^9.3.0",
+        "ts-node": "^10.7.0",
+        "tsconfig-paths": "^3.9.0",
+        "typescript": "^4.6.4",
+        "uglify-save-license": "^0.4.1",
+        "vue-eslint-parser": "^9.0.3",
+        "vue-loader": "^17.0.0",
+        "vue-style-loader": "^4.1.3",
+        "webpack": "^5.75.0",
+        "webpack-cli": "^5.0.1",
+        "webpack-dev-server": "^4.3.0",
+        "webpack-font-preload-plugin": "^1.5.0",
+        "webpack-license-plugin": "^4.2.1",
+        "webpack-remove-empty-scripts": "^0.7.1"
+      }
+    },
+    "node_modules/@ampproject/remapping": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
+      "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.1.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/code-frame": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
+      "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/highlight": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/compat-data": {
+      "version": "7.20.5",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.5.tgz",
+      "integrity": "sha512-KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/core": {
+      "version": "7.20.7",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.7.tgz",
+      "integrity": "sha512-t1ZjCluspe5DW24bn2Rr1CDb2v9rn/hROtg9a2tmd0+QYf4bsloYfLQzjG4qHPNMhWtKdGC33R5AxGR2Af2cBw==",
+      "dev": true,
+      "dependencies": {
+        "@ampproject/remapping": "^2.1.0",
+        "@babel/code-frame": "^7.18.6",
+        "@babel/generator": "^7.20.7",
+        "@babel/helper-compilation-targets": "^7.20.7",
+        "@babel/helper-module-transforms": "^7.20.7",
+        "@babel/helpers": "^7.20.7",
+        "@babel/parser": "^7.20.7",
+        "@babel/template": "^7.20.7",
+        "@babel/traverse": "^7.20.7",
+        "@babel/types": "^7.20.7",
+        "convert-source-map": "^1.7.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.1",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/babel"
+      }
+    },
+    "node_modules/@babel/eslint-parser": {
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.19.1.tgz",
+      "integrity": "sha512-AqNf2QWt1rtu2/1rLswy6CDP7H9Oh3mMhk177Y67Rg8d7RD9WfOLLv8CGn6tisFvS2htm86yIe1yLF6I1UDaGQ==",
+      "dev": true,
+      "dependencies": {
+        "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
+        "eslint-visitor-keys": "^2.1.0",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || >=14.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": ">=7.11.0",
+        "eslint": "^7.5.0 || ^8.0.0"
+      }
+    },
+    "node_modules/@babel/generator": {
+      "version": "7.20.7",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.7.tgz",
+      "integrity": "sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.20.7",
+        "@jridgewell/gen-mapping": "^0.3.2",
+        "jsesc": "^2.5.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+      "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/helper-compilation-targets": {
+      "version": "7.20.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz",
+      "integrity": "sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/compat-data": "^7.20.5",
+        "@babel/helper-validator-option": "^7.18.6",
+        "browserslist": "^4.21.3",
+        "lru-cache": "^5.1.1",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-environment-visitor": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
+      "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-function-name": {
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
+      "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
+      "dev": true,
+      "dependencies": {
+        "@babel/template": "^7.18.10",
+        "@babel/types": "^7.19.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-hoist-variables": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
+      "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-imports": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
+      "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-transforms": {
+      "version": "7.20.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.7.tgz",
+      "integrity": "sha512-FNdu7r67fqMUSVuQpFQGE6BPdhJIhitoxhGzDbAXNcA07uoVG37fOiMk3OSV8rEICuyG6t8LGkd9EE64qIEoIA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-module-imports": "^7.18.6",
+        "@babel/helper-simple-access": "^7.20.2",
+        "@babel/helper-split-export-declaration": "^7.18.6",
+        "@babel/helper-validator-identifier": "^7.19.1",
+        "@babel/template": "^7.20.7",
+        "@babel/traverse": "^7.20.7",
+        "@babel/types": "^7.20.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-simple-access": {
+      "version": "7.20.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz",
+      "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.20.2"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-split-export-declaration": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
+      "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.19.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz",
+      "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+      "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-option": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz",
+      "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helpers": {
+      "version": "7.20.7",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.7.tgz",
+      "integrity": "sha512-PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/template": "^7.20.7",
+        "@babel/traverse": "^7.20.7",
+        "@babel/types": "^7.20.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
+      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.18.6",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/parser": {
+      "version": "7.20.7",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.7.tgz",
+      "integrity": "sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==",
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/template": {
+      "version": "7.20.7",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz",
+      "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.18.6",
+        "@babel/parser": "^7.20.7",
+        "@babel/types": "^7.20.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/traverse": {
+      "version": "7.20.7",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.7.tgz",
+      "integrity": "sha512-xueOL5+ZKX2dJbg8z8o4f4uTRTqGDRjilva9D1hiRlayJbTY8jBRL+Ph67IeRTIE439/VifHk+Z4g0SwRtQE0A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.18.6",
+        "@babel/generator": "^7.20.7",
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-function-name": "^7.19.0",
+        "@babel/helper-hoist-variables": "^7.18.6",
+        "@babel/helper-split-export-declaration": "^7.18.6",
+        "@babel/parser": "^7.20.7",
+        "@babel/types": "^7.20.7",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/types": {
+      "version": "7.20.7",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.7.tgz",
+      "integrity": "sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-string-parser": "^7.19.4",
+        "@babel/helper-validator-identifier": "^7.19.1",
+        "to-fast-properties": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@cspotcode/source-map-support": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
+      "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/trace-mapping": "0.3.9"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
+      "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.0.3",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
+      }
+    },
+    "node_modules/@csstools/postcss-cascade-layers": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-1.1.1.tgz",
+      "integrity": "sha512-+KdYrpKC5TgomQr2DlZF4lDEpHcoxnj5IGddYYfBWJAKfj1JtuHUIqMa+E1pJJ+z3kvDViWMqyqPlG4Ja7amQA==",
+      "dev": true,
+      "dependencies": {
+        "@csstools/selector-specificity": "^2.0.2",
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-color-function": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-color-function/-/postcss-color-function-1.1.1.tgz",
+      "integrity": "sha512-Bc0f62WmHdtRDjf5f3e2STwRAl89N2CLb+9iAwzrv4L2hncrbDwnQD9PCq0gtAt7pOI2leIV08HIBUd4jxD8cw==",
+      "dev": true,
+      "dependencies": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-font-format-keywords": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-1.0.1.tgz",
+      "integrity": "sha512-ZgrlzuUAjXIOc2JueK0X5sZDjCtgimVp/O5CEqTcs5ShWBa6smhWYbS0x5cVc/+rycTDbjjzoP0KTDnUneZGOg==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-hwb-function": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-hwb-function/-/postcss-hwb-function-1.0.2.tgz",
+      "integrity": "sha512-YHdEru4o3Rsbjmu6vHy4UKOXZD+Rn2zmkAmLRfPet6+Jz4Ojw8cbWxe1n42VaXQhD3CQUXXTooIy8OkVbUcL+w==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-ic-unit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-ic-unit/-/postcss-ic-unit-1.0.1.tgz",
+      "integrity": "sha512-Ot1rcwRAaRHNKC9tAqoqNZhjdYBzKk1POgWfhN4uCOE47ebGcLRqXjKkApVDpjifL6u2/55ekkpnFcp+s/OZUw==",
+      "dev": true,
+      "dependencies": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-is-pseudo-class": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.7.tgz",
+      "integrity": "sha512-7JPeVVZHd+jxYdULl87lvjgvWldYu+Bc62s9vD/ED6/QTGjy0jy0US/f6BG53sVMTBJ1lzKZFpYmofBN9eaRiA==",
+      "dev": true,
+      "dependencies": {
+        "@csstools/selector-specificity": "^2.0.0",
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-nested-calc": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-nested-calc/-/postcss-nested-calc-1.0.0.tgz",
+      "integrity": "sha512-JCsQsw1wjYwv1bJmgjKSoZNvf7R6+wuHDAbi5f/7MbFhl2d/+v+TvBTU4BJH3G1X1H87dHl0mh6TfYogbT/dJQ==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-normalize-display-values": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-1.0.1.tgz",
+      "integrity": "sha512-jcOanIbv55OFKQ3sYeFD/T0Ti7AMXc9nM1hZWu8m/2722gOTxFg7xYu4RDLJLeZmPUVQlGzo4jhzvTUq3x4ZUw==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-oklab-function": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.1.1.tgz",
+      "integrity": "sha512-nJpJgsdA3dA9y5pgyb/UfEzE7W5Ka7u0CX0/HIMVBNWzWemdcTH3XwANECU6anWv/ao4vVNLTMxhiPNZsTK6iA==",
+      "dev": true,
+      "dependencies": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-progressive-custom-properties": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-1.3.0.tgz",
+      "integrity": "sha512-ASA9W1aIy5ygskZYuWams4BzafD12ULvSypmaLJT2jvQ8G0M3I8PRQhC0h7mG0Z3LI05+agZjqSR9+K9yaQQjA==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.3"
+      }
+    },
+    "node_modules/@csstools/postcss-stepped-value-functions": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-1.0.1.tgz",
+      "integrity": "sha512-dz0LNoo3ijpTOQqEJLY8nyaapl6umbmDcgj4AD0lgVQ572b2eqA1iGZYTTWhrcrHztWDDRAX2DGYyw2VBjvCvQ==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-text-decoration-shorthand": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-1.0.0.tgz",
+      "integrity": "sha512-c1XwKJ2eMIWrzQenN0XbcfzckOLLJiczqy+YvfGmzoVXd7pT9FfObiSEfzs84bpE/VqfpEuAZ9tCRbZkZxxbdw==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-trigonometric-functions": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-1.0.2.tgz",
+      "integrity": "sha512-woKaLO///4bb+zZC2s80l+7cm07M7268MsyG3M0ActXXEFi6SuhvriQYcb58iiKGbjwwIU7n45iRLEHypB47Og==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-unset-value": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.2.tgz",
+      "integrity": "sha512-c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g==",
+      "dev": true,
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/selector-specificity": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz",
+      "integrity": "sha512-IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg==",
+      "dev": true,
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2",
+        "postcss-selector-parser": "^6.0.10"
+      }
+    },
+    "node_modules/@discoveryjs/json-ext": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
+      "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.15.18.tgz",
+      "integrity": "sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.18.tgz",
+      "integrity": "sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@eslint/eslintrc": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.0.tgz",
+      "integrity": "sha512-7yfvXy6MWLgWSFsLhz5yH3iQ52St8cdUY6FoGieKkRDVxuxmrNuUetIuu6cmjNWwniUHiWXjxCr5tTXDrbYS5A==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.4.0",
+        "globals": "^13.19.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/globals": {
+      "version": "13.19.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz",
+      "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@humanwhocodes/config-array": {
+      "version": "0.11.8",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
+      "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==",
+      "dev": true,
+      "dependencies": {
+        "@humanwhocodes/object-schema": "^1.2.1",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.5"
+      },
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
+    "node_modules/@humanwhocodes/module-importer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.22"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
+    },
+    "node_modules/@humanwhocodes/object-schema": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+      "dev": true
+    },
+    "node_modules/@intlify/core-base": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.2.2.tgz",
+      "integrity": "sha512-JjUpQtNfn+joMbrXvpR4hTF8iJQ2sEFzzK3KIESOx+f+uwIjgw20igOyaIdhfsVVBCds8ZM64MoeNSx+PHQMkA==",
+      "dependencies": {
+        "@intlify/devtools-if": "9.2.2",
+        "@intlify/message-compiler": "9.2.2",
+        "@intlify/shared": "9.2.2",
+        "@intlify/vue-devtools": "9.2.2"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@intlify/devtools-if": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/@intlify/devtools-if/-/devtools-if-9.2.2.tgz",
+      "integrity": "sha512-4ttr/FNO29w+kBbU7HZ/U0Lzuh2cRDhP8UlWOtV9ERcjHzuyXVZmjyleESK6eVP60tGC9QtQW9yZE+JeRhDHkg==",
+      "dependencies": {
+        "@intlify/shared": "9.2.2"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@intlify/message-compiler": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.2.2.tgz",
+      "integrity": "sha512-IUrQW7byAKN2fMBe8z6sK6riG1pue95e5jfokn8hA5Q3Bqy4MBJ5lJAofUsawQJYHeoPJ7svMDyBaVJ4d0GTtA==",
+      "dependencies": {
+        "@intlify/shared": "9.2.2",
+        "source-map": "0.6.1"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@intlify/shared": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.2.2.tgz",
+      "integrity": "sha512-wRwTpsslgZS5HNyM7uDQYZtxnbI12aGiBZURX3BTR9RFIKKRWpllTsgzHWvj3HKm3Y2Sh5LPC1r0PDCKEhVn9Q==",
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@intlify/vue-devtools": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/@intlify/vue-devtools/-/vue-devtools-9.2.2.tgz",
+      "integrity": "sha512-+dUyqyCHWHb/UcvY1MlIpO87munedm3Gn6E9WWYdWrMuYLcoIoOEVDWSS8xSwtlPU+kA+MEQTP6Q1iI/ocusJg==",
+      "dependencies": {
+        "@intlify/core-base": "9.2.2",
+        "@intlify/shared": "9.2.2"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
+      "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/set-array": "^1.0.0",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
+      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/source-map": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz",
+      "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==",
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      }
+    },
+    "node_modules/@jridgewell/source-map/node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+      "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+      "dependencies": {
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.4.14",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
+      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.17",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz",
+      "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==",
+      "dependencies": {
+        "@jridgewell/resolve-uri": "3.1.0",
+        "@jridgewell/sourcemap-codec": "1.4.14"
+      }
+    },
+    "node_modules/@leichtgewicht/ip-codec": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz",
+      "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==",
+      "dev": true
+    },
+    "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": {
+      "version": "5.1.1-v1",
+      "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
+      "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==",
+      "dev": true,
+      "dependencies": {
+        "eslint-scope": "5.1.1"
+      }
+    },
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@sindresorhus/is": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",
+      "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/is?sponsor=1"
+      }
+    },
+    "node_modules/@szmarczak/http-timer": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
+      "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",
+      "dependencies": {
+        "defer-to-connect": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@tootallnate/once": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
+      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tsconfig/node10": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz",
+      "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==",
+      "dev": true
+    },
+    "node_modules/@tsconfig/node12": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
+      "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
+      "dev": true
+    },
+    "node_modules/@tsconfig/node14": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
+      "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
+      "dev": true
+    },
+    "node_modules/@tsconfig/node16": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.3.tgz",
+      "integrity": "sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==",
+      "dev": true
+    },
+    "node_modules/@ttskch/select2-bootstrap4-theme": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/@ttskch/select2-bootstrap4-theme/-/select2-bootstrap4-theme-1.5.2.tgz",
+      "integrity": "sha512-gAj8qNy/VYwQDBkACm0USM66kxFai8flX83ayRXPNhzZckEgSqIBB9sM74SCM3ssgeX+ZVy4BifTnLis+KpIyg=="
+    },
+    "node_modules/@types/body-parser": {
+      "version": "1.19.2",
+      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz",
+      "integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==",
+      "dev": true,
+      "dependencies": {
+        "@types/connect": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/bonjour": {
+      "version": "3.5.10",
+      "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz",
+      "integrity": "sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/bootstrap": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/@types/bootstrap/-/bootstrap-4.6.2.tgz",
+      "integrity": "sha512-HbqVAre9VMZF8KBw1UpmBkw0xt4rjrAxMO/JWqFfJZGbVi09t8BVccvB/VxDlygVvvu0BZkAU8ocfNc7/jlFsA==",
+      "dev": true,
+      "dependencies": {
+        "@types/jquery": "*",
+        "popper.js": "^1.14.1"
+      }
+    },
+    "node_modules/@types/cacheable-request": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz",
+      "integrity": "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==",
+      "dependencies": {
+        "@types/http-cache-semantics": "*",
+        "@types/keyv": "^3.1.4",
+        "@types/node": "*",
+        "@types/responselike": "^1.0.0"
+      }
+    },
+    "node_modules/@types/connect": {
+      "version": "3.4.35",
+      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz",
+      "integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/connect-history-api-fallback": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz",
+      "integrity": "sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==",
+      "dev": true,
+      "dependencies": {
+        "@types/express-serve-static-core": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/dropzone": {
+      "version": "5.7.4",
+      "resolved": "https://registry.npmjs.org/@types/dropzone/-/dropzone-5.7.4.tgz",
+      "integrity": "sha512-9kLJ2YAmVRWYrHvDoa95pQzHF0HUMKcznsS7FM1Mht5Yieec+HMB6Ybfm+ocvLjvFCvgyYGFTp4nzNFxhZmo3g==",
+      "dev": true,
+      "dependencies": {
+        "@types/jquery": "*"
+      }
+    },
+    "node_modules/@types/eslint": {
+      "version": "8.4.10",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.10.tgz",
+      "integrity": "sha512-Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw==",
+      "dependencies": {
+        "@types/estree": "*",
+        "@types/json-schema": "*"
+      }
+    },
+    "node_modules/@types/eslint-scope": {
+      "version": "3.7.4",
+      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
+      "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
+      "dependencies": {
+        "@types/eslint": "*",
+        "@types/estree": "*"
+      }
+    },
+    "node_modules/@types/estree": {
+      "version": "0.0.51",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
+      "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ=="
+    },
+    "node_modules/@types/express": {
+      "version": "4.17.15",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.15.tgz",
+      "integrity": "sha512-Yv0k4bXGOH+8a+7bELd2PqHQsuiANB+A8a4gnQrkRWzrkKlb6KHaVvyXhqs04sVW/OWlbPyYxRgYlIXLfrufMQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/body-parser": "*",
+        "@types/express-serve-static-core": "^4.17.31",
+        "@types/qs": "*",
+        "@types/serve-static": "*"
+      }
+    },
+    "node_modules/@types/express-serve-static-core": {
+      "version": "4.17.31",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz",
+      "integrity": "sha512-DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "@types/qs": "*",
+        "@types/range-parser": "*"
+      }
+    },
+    "node_modules/@types/glob": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
+      "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
+      "dev": true,
+      "dependencies": {
+        "@types/minimatch": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/html-minifier-terser": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
+      "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==",
+      "dev": true
+    },
+    "node_modules/@types/http-cache-semantics": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
+      "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ=="
+    },
+    "node_modules/@types/http-proxy": {
+      "version": "1.17.9",
+      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.9.tgz",
+      "integrity": "sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/jquery": {
+      "version": "3.5.14",
+      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.14.tgz",
+      "integrity": "sha512-X1gtMRMbziVQkErhTQmSe2jFwwENA/Zr+PprCkF63vFq+Yt5PZ4AlKqgmeNlwgn7dhsXEK888eIW2520EpC+xg==",
+      "dev": true,
+      "dependencies": {
+        "@types/sizzle": "*"
+      }
+    },
+    "node_modules/@types/jquery.growl": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/@types/jquery.growl/-/jquery.growl-1.3.5.tgz",
+      "integrity": "sha512-gOC04gG44DiRjudmPycoZXZ+BCJ/+YT7YptUjjpZuhkvVdRPz9vlyVACmP3e58U2u1bvKAMIxznYTbknLV6Lfg==",
+      "dev": true,
+      "dependencies": {
+        "@types/jquery": "*"
+      }
+    },
+    "node_modules/@types/json-schema": {
+      "version": "7.0.11",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
+      "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ=="
+    },
+    "node_modules/@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
+      "dev": true
+    },
+    "node_modules/@types/keyv": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz",
+      "integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/lodash": {
+      "version": "4.14.191",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.191.tgz",
+      "integrity": "sha512-BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ==",
+      "dev": true
+    },
+    "node_modules/@types/mime": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz",
+      "integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==",
+      "dev": true
+    },
+    "node_modules/@types/minimatch": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",
+      "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==",
+      "dev": true
+    },
+    "node_modules/@types/minimist": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz",
+      "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==",
+      "dev": true
+    },
+    "node_modules/@types/node": {
+      "version": "18.11.17",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.17.tgz",
+      "integrity": "sha512-HJSUJmni4BeDHhfzn6nF0sVmd1SMezP7/4F0Lq+aXzmp2xm9O7WXrUtHW/CHlYVtZUbByEvWidHqRtcJXGF2Ng=="
+    },
+    "node_modules/@types/normalize-package-data": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
+      "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
+      "dev": true
+    },
+    "node_modules/@types/parse-json": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
+      "dev": true
+    },
+    "node_modules/@types/photoswipe": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/@types/photoswipe/-/photoswipe-4.1.2.tgz",
+      "integrity": "sha512-HA9TtCAQKToldgxRiyJ1DbsElg/cQV/SQ8COVjqIqghjy60Zxfh78E1WiFotthquqkS86nz13Za9wEbToe0svQ==",
+      "dev": true
+    },
+    "node_modules/@types/qs": {
+      "version": "6.9.7",
+      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
+      "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==",
+      "dev": true
+    },
+    "node_modules/@types/range-parser": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz",
+      "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==",
+      "dev": true
+    },
+    "node_modules/@types/responselike": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
+      "integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/retry": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==",
+      "dev": true
+    },
+    "node_modules/@types/semver": {
+      "version": "7.3.13",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz",
+      "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==",
+      "dev": true
+    },
+    "node_modules/@types/serve-index": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz",
+      "integrity": "sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==",
+      "dev": true,
+      "dependencies": {
+        "@types/express": "*"
+      }
+    },
+    "node_modules/@types/serve-static": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==",
+      "dev": true,
+      "dependencies": {
+        "@types/mime": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/sizzle": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz",
+      "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==",
+      "dev": true
+    },
+    "node_modules/@types/sockjs": {
+      "version": "0.3.33",
+      "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz",
+      "integrity": "sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/sprintf-js": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@types/sprintf-js/-/sprintf-js-1.1.2.tgz",
+      "integrity": "sha512-hkgzYF+qnIl8uTO8rmUSVSfQ8BIfMXC4yJAF4n8BE758YsKBZvFC4NumnAegj7KmylP0liEZNpb9RRGFMbFejA==",
+      "dev": true
+    },
+    "node_modules/@types/typeahead.js": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/@types/typeahead.js/-/typeahead.js-0.11.1.tgz",
+      "integrity": "sha512-brFWKbilAIFqX0eY47xERqeQKTkWTzuOYV5QfJtuOWWcKFBkM/LQrYH1jUUHUEkf9IpYdefsQB2WclH8dhgLDw==",
+      "dev": true,
+      "dependencies": {
+        "@types/jquery": "*"
+      }
+    },
+    "node_modules/@types/webpack": {
+      "version": "5.28.0",
+      "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-5.28.0.tgz",
+      "integrity": "sha512-8cP0CzcxUiFuA9xGJkfeVpqmWTk9nx6CWwamRGCj95ph1SmlRRk9KlCZ6avhCbZd4L68LvYT6l1kpdEnQXrF8w==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "tapable": "^2.2.0",
+        "webpack": "^5"
+      }
+    },
+    "node_modules/@types/ws": {
+      "version": "8.5.3",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz",
+      "integrity": "sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/zxcvbn": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/@types/zxcvbn/-/zxcvbn-4.4.1.tgz",
+      "integrity": "sha512-3NoqvZC2W5gAC5DZbTpCeJ251vGQmgcWIHQJGq2J240HY6ErQ9aWKkwfoKJlHLx+A83WPNTZ9+3cd2ILxbvr1w==",
+      "dev": true
+    },
+    "node_modules/@typescript-eslint/eslint-plugin": {
+      "version": "5.47.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.47.0.tgz",
+      "integrity": "sha512-AHZtlXAMGkDmyLuLZsRpH3p4G/1iARIwc/T0vIem2YB+xW6pZaXYXzCBnZSF/5fdM97R9QqZWZ+h3iW10XgevQ==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/scope-manager": "5.47.0",
+        "@typescript-eslint/type-utils": "5.47.0",
+        "@typescript-eslint/utils": "5.47.0",
+        "debug": "^4.3.4",
+        "ignore": "^5.2.0",
+        "natural-compare-lite": "^1.4.0",
+        "regexpp": "^3.2.0",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/parser": "^5.0.0",
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": {
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/@typescript-eslint/parser": {
+      "version": "5.47.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.47.0.tgz",
+      "integrity": "sha512-udPU4ckK+R1JWCGdQC4Qa27NtBg7w020ffHqGyAK8pAgOVuNw7YaKXGChk+udh+iiGIJf6/E/0xhVXyPAbsczw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/scope-manager": "5.47.0",
+        "@typescript-eslint/types": "5.47.0",
+        "@typescript-eslint/typescript-estree": "5.47.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/scope-manager": {
+      "version": "5.47.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.47.0.tgz",
+      "integrity": "sha512-dvJab4bFf7JVvjPuh3sfBUWsiD73aiftKBpWSfi3sUkysDQ4W8x+ZcFpNp7Kgv0weldhpmMOZBjx1wKN8uWvAw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.47.0",
+        "@typescript-eslint/visitor-keys": "5.47.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils": {
+      "version": "5.47.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.47.0.tgz",
+      "integrity": "sha512-1J+DFFrYoDUXQE1b7QjrNGARZE6uVhBqIvdaXTe5IN+NmEyD68qXR1qX1g2u4voA+nCaelQyG8w30SAOihhEYg==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/typescript-estree": "5.47.0",
+        "@typescript-eslint/utils": "5.47.0",
+        "debug": "^4.3.4",
+        "tsutils": "^3.21.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "*"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/types": {
+      "version": "5.47.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.47.0.tgz",
+      "integrity": "sha512-eslFG0Qy8wpGzDdYKu58CEr3WLkjwC5Usa6XbuV89ce/yN5RITLe1O8e+WFEuxnfftHiJImkkOBADj58ahRxSg==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree": {
+      "version": "5.47.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.47.0.tgz",
+      "integrity": "sha512-LxfKCG4bsRGq60Sqqu+34QT5qT2TEAHvSCCJ321uBWywgE2dS0LKcu5u+3sMGo+Vy9UmLOhdTw5JHzePV/1y4Q==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.47.0",
+        "@typescript-eslint/visitor-keys": "5.47.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/@typescript-eslint/utils": {
+      "version": "5.47.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.47.0.tgz",
+      "integrity": "sha512-U9xcc0N7xINrCdGVPwABjbAKqx4GK67xuMV87toI+HUqgXj26m6RBp9UshEXcTrgCkdGYFzgKLt8kxu49RilDw==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.9",
+        "@types/semver": "^7.3.12",
+        "@typescript-eslint/scope-manager": "5.47.0",
+        "@typescript-eslint/types": "5.47.0",
+        "@typescript-eslint/typescript-estree": "5.47.0",
+        "eslint-scope": "^5.1.1",
+        "eslint-utils": "^3.0.0",
+        "semver": "^7.3.7"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/utils/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@typescript-eslint/utils/node_modules/semver": {
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@typescript-eslint/utils/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/@typescript-eslint/visitor-keys": {
+      "version": "5.47.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.47.0.tgz",
+      "integrity": "sha512-ByPi5iMa6QqDXe/GmT/hR6MZtVPi0SqMQPDx15FczCBXJo/7M8T88xReOALAfpBLm+zxpPfmhuEvPb577JRAEg==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.47.0",
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@vue/compiler-core": {
+      "version": "3.2.45",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.45.tgz",
+      "integrity": "sha512-rcMj7H+PYe5wBV3iYeUgbCglC+pbpN8hBLTJvRiK2eKQiWqu+fG9F+8sW99JdL4LQi7Re178UOxn09puSXvn4A==",
+      "dependencies": {
+        "@babel/parser": "^7.16.4",
+        "@vue/shared": "3.2.45",
+        "estree-walker": "^2.0.2",
+        "source-map": "^0.6.1"
+      }
+    },
+    "node_modules/@vue/compiler-dom": {
+      "version": "3.2.45",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.45.tgz",
+      "integrity": "sha512-tyYeUEuKqqZO137WrZkpwfPCdiiIeXYCcJ8L4gWz9vqaxzIQRccTSwSWZ/Axx5YR2z+LvpUbmPNXxuBU45lyRw==",
+      "dependencies": {
+        "@vue/compiler-core": "3.2.45",
+        "@vue/shared": "3.2.45"
+      }
+    },
+    "node_modules/@vue/compiler-sfc": {
+      "version": "3.2.45",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.45.tgz",
+      "integrity": "sha512-1jXDuWah1ggsnSAOGsec8cFjT/K6TMZ0sPL3o3d84Ft2AYZi2jWJgRMjw4iaK0rBfA89L5gw427H4n1RZQBu6Q==",
+      "dependencies": {
+        "@babel/parser": "^7.16.4",
+        "@vue/compiler-core": "3.2.45",
+        "@vue/compiler-dom": "3.2.45",
+        "@vue/compiler-ssr": "3.2.45",
+        "@vue/reactivity-transform": "3.2.45",
+        "@vue/shared": "3.2.45",
+        "estree-walker": "^2.0.2",
+        "magic-string": "^0.25.7",
+        "postcss": "^8.1.10",
+        "source-map": "^0.6.1"
+      }
+    },
+    "node_modules/@vue/compiler-ssr": {
+      "version": "3.2.45",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.45.tgz",
+      "integrity": "sha512-6BRaggEGqhWht3lt24CrIbQSRD5O07MTmd+LjAn5fJj568+R9eUD2F7wMQJjX859seSlrYog7sUtrZSd7feqrQ==",
+      "dependencies": {
+        "@vue/compiler-dom": "3.2.45",
+        "@vue/shared": "3.2.45"
+      }
+    },
+    "node_modules/@vue/devtools-api": {
+      "version": "6.4.5",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.4.5.tgz",
+      "integrity": "sha512-JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ=="
+    },
+    "node_modules/@vue/eslint-config-typescript": {
+      "version": "11.0.2",
+      "resolved": "https://registry.npmjs.org/@vue/eslint-config-typescript/-/eslint-config-typescript-11.0.2.tgz",
+      "integrity": "sha512-EiKud1NqlWmSapBFkeSrE994qpKx7/27uCGnhdqzllYDpQZroyX/O6bwjEpeuyKamvLbsGdO6PMR2faIf+zFnw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/eslint-plugin": "^5.0.0",
+        "@typescript-eslint/parser": "^5.0.0",
+        "vue-eslint-parser": "^9.0.0"
+      },
+      "engines": {
+        "node": "^14.17.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^6.2.0 || ^7.0.0 || ^8.0.0",
+        "eslint-plugin-vue": "^9.0.0",
+        "typescript": "*"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@vue/reactivity": {
+      "version": "3.2.45",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.45.tgz",
+      "integrity": "sha512-PRvhCcQcyEVohW0P8iQ7HDcIOXRjZfAsOds3N99X/Dzewy8TVhTCT4uXpAHfoKjVTJRA0O0K+6QNkDIZAxNi3A==",
+      "dependencies": {
+        "@vue/shared": "3.2.45"
+      }
+    },
+    "node_modules/@vue/reactivity-transform": {
+      "version": "3.2.45",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.45.tgz",
+      "integrity": "sha512-BHVmzYAvM7vcU5WmuYqXpwaBHjsS8T63jlKGWVtHxAHIoMIlmaMyurUSEs1Zcg46M4AYT5MtB1U274/2aNzjJQ==",
+      "dependencies": {
+        "@babel/parser": "^7.16.4",
+        "@vue/compiler-core": "3.2.45",
+        "@vue/shared": "3.2.45",
+        "estree-walker": "^2.0.2",
+        "magic-string": "^0.25.7"
+      }
+    },
+    "node_modules/@vue/runtime-core": {
+      "version": "3.2.45",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.45.tgz",
+      "integrity": "sha512-gzJiTA3f74cgARptqzYswmoQx0fIA+gGYBfokYVhF8YSXjWTUA2SngRzZRku2HbGbjzB6LBYSbKGIaK8IW+s0A==",
+      "dependencies": {
+        "@vue/reactivity": "3.2.45",
+        "@vue/shared": "3.2.45"
+      }
+    },
+    "node_modules/@vue/runtime-dom": {
+      "version": "3.2.45",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.45.tgz",
+      "integrity": "sha512-cy88YpfP5Ue2bDBbj75Cb4bIEZUMM/mAkDMfqDTpUYVgTf/kuQ2VQ8LebuZ8k6EudgH8pYhsGWHlY0lcxlvTwA==",
+      "dependencies": {
+        "@vue/runtime-core": "3.2.45",
+        "@vue/shared": "3.2.45",
+        "csstype": "^2.6.8"
+      }
+    },
+    "node_modules/@vue/server-renderer": {
+      "version": "3.2.45",
+      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.45.tgz",
+      "integrity": "sha512-ebiMq7q24WBU1D6uhPK//2OTR1iRIyxjF5iVq/1a5I1SDMDyDu4Ts6fJaMnjrvD3MqnaiFkKQj+LKAgz5WIK3g==",
+      "dependencies": {
+        "@vue/compiler-ssr": "3.2.45",
+        "@vue/shared": "3.2.45"
+      },
+      "peerDependencies": {
+        "vue": "3.2.45"
+      }
+    },
+    "node_modules/@vue/shared": {
+      "version": "3.2.45",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.45.tgz",
+      "integrity": "sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg=="
+    },
+    "node_modules/@webassemblyjs/ast": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
+      "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
+      "dependencies": {
+        "@webassemblyjs/helper-numbers": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1"
+      }
+    },
+    "node_modules/@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
+      "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ=="
+    },
+    "node_modules/@webassemblyjs/helper-api-error": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
+      "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg=="
+    },
+    "node_modules/@webassemblyjs/helper-buffer": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
+      "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA=="
+    },
+    "node_modules/@webassemblyjs/helper-numbers": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
+      "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==",
+      "dependencies": {
+        "@webassemblyjs/floating-point-hex-parser": "1.11.1",
+        "@webassemblyjs/helper-api-error": "1.11.1",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
+      "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q=="
+    },
+    "node_modules/@webassemblyjs/helper-wasm-section": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
+      "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-buffer": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
+        "@webassemblyjs/wasm-gen": "1.11.1"
+      }
+    },
+    "node_modules/@webassemblyjs/ieee754": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
+      "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==",
+      "dependencies": {
+        "@xtuc/ieee754": "^1.2.0"
+      }
+    },
+    "node_modules/@webassemblyjs/leb128": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
+      "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==",
+      "dependencies": {
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/utf8": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
+      "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ=="
+    },
+    "node_modules/@webassemblyjs/wasm-edit": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
+      "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-buffer": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
+        "@webassemblyjs/helper-wasm-section": "1.11.1",
+        "@webassemblyjs/wasm-gen": "1.11.1",
+        "@webassemblyjs/wasm-opt": "1.11.1",
+        "@webassemblyjs/wasm-parser": "1.11.1",
+        "@webassemblyjs/wast-printer": "1.11.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-gen": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
+      "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
+        "@webassemblyjs/ieee754": "1.11.1",
+        "@webassemblyjs/leb128": "1.11.1",
+        "@webassemblyjs/utf8": "1.11.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-opt": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
+      "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-buffer": "1.11.1",
+        "@webassemblyjs/wasm-gen": "1.11.1",
+        "@webassemblyjs/wasm-parser": "1.11.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-parser": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
+      "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-api-error": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
+        "@webassemblyjs/ieee754": "1.11.1",
+        "@webassemblyjs/leb128": "1.11.1",
+        "@webassemblyjs/utf8": "1.11.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wast-printer": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
+      "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webpack-cli/configtest": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.0.1.tgz",
+      "integrity": "sha512-njsdJXJSiS2iNbQVS0eT8A/KPnmyH4pv1APj2K0d1wrZcBLw+yppxOy4CGqa0OxDJkzfL/XELDhD8rocnIwB5A==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.15.0"
+      },
+      "peerDependencies": {
+        "webpack": "5.x.x",
+        "webpack-cli": "5.x.x"
+      }
+    },
+    "node_modules/@webpack-cli/info": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-2.0.1.tgz",
+      "integrity": "sha512-fE1UEWTwsAxRhrJNikE7v4EotYflkEhBL7EbajfkPlf6E37/2QshOy/D48Mw8G5XMFlQtS6YV42vtbG9zBpIQA==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.15.0"
+      },
+      "peerDependencies": {
+        "webpack": "5.x.x",
+        "webpack-cli": "5.x.x"
+      }
+    },
+    "node_modules/@webpack-cli/serve": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-2.0.1.tgz",
+      "integrity": "sha512-0G7tNyS+yW8TdgHwZKlDWYXFA6OJQnoLCQvYKkQP0Q2X205PSQ6RNUj0M+1OB/9gRQaUZ/ccYfaxd0nhaWKfjw==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.15.0"
+      },
+      "peerDependencies": {
+        "webpack": "5.x.x",
+        "webpack-cli": "5.x.x"
+      },
+      "peerDependenciesMeta": {
+        "webpack-dev-server": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@xtuc/ieee754": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="
+    },
+    "node_modules/@xtuc/long": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
+    },
+    "node_modules/abab": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
+      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
+      "dev": true
+    },
+    "node_modules/accepts": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+      "dev": true,
+      "dependencies": {
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/acorn": {
+      "version": "8.8.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
+      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-globals": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
+      "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^7.1.1",
+        "acorn-walk": "^7.1.1"
+      }
+    },
+    "node_modules/acorn-globals/node_modules/acorn": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-globals/node_modules/acorn-walk": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
+      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-import-assertions": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
+      "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
+      "peerDependencies": {
+        "acorn": "^8"
+      }
+    },
+    "node_modules/acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true,
+      "peerDependencies": {
+        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/acorn-walk": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
+      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ajv-formats": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
+      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ajv": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/ajv-formats/node_modules/ajv": {
+      "version": "8.11.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.2.tgz",
+      "integrity": "sha512-E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ajv-formats/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
+    },
+    "node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/ansi-colors": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz",
+      "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ansi-html-community": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
+      "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
+      "dev": true,
+      "engines": [
+        "node >= 0.8.0"
+      ],
+      "bin": {
+        "ansi-html": "bin/ansi-html"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ansis": {
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/ansis/-/ansis-1.5.5.tgz",
+      "integrity": "sha512-DNctovTacxs/NfZpGo6bIGWgLd2oZsDO7RJbiYX6Ttj40LPZM1XKv9WtesH13ieOEm1GajjD+Vik2n9YnSTPdA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.13"
+      },
+      "funding": {
+        "type": "patreon",
+        "url": "https://patreon.com/biodiscus"
+      }
+    },
+    "node_modules/anymatch": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "dev": true,
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/arg": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
+      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
+      "dev": true
+    },
+    "node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "node_modules/array-differ": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz",
+      "integrity": "sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/array-find": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-find/-/array-find-1.0.0.tgz",
+      "integrity": "sha512-kO/vVCacW9mnpn3WPWbTVlEnOabK2L7LWi2HViURtCM46y1zb6I8UMjx4LgbiqadTgHnLInUronwn3ampNTJtQ==",
+      "dev": true
+    },
+    "node_modules/array-flatten": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
+      "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
+      "dev": true
+    },
+    "node_modules/array-includes": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
+      "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "get-intrinsic": "^1.1.3",
+        "is-string": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array.prototype.flat": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
+      "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.reduce": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz",
+      "integrity": "sha512-kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-array-method-boxes-properly": "^1.0.0",
+        "is-string": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/arrify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+      "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/asn1.js": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
+      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
+    "node_modules/asn1.js/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
+    "node_modules/assert": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
+      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
+      "dev": true,
+      "dependencies": {
+        "object-assign": "^4.1.1",
+        "util": "0.10.3"
+      }
+    },
+    "node_modules/assert/node_modules/inherits": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+      "integrity": "sha512-8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA==",
+      "dev": true
+    },
+    "node_modules/assert/node_modules/util": {
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+      "integrity": "sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "2.0.1"
+      }
+    },
+    "node_modules/assertion-error": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
+      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/astral-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "dev": true
+    },
+    "node_modules/autoprefixer": {
+      "version": "10.4.13",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz",
+      "integrity": "sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/autoprefixer"
+        }
+      ],
+      "dependencies": {
+        "browserslist": "^4.21.4",
+        "caniuse-lite": "^1.0.30001426",
+        "fraction.js": "^4.2.0",
+        "normalize-range": "^0.1.2",
+        "picocolors": "^1.0.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "bin": {
+        "autoprefixer": "bin/autoprefixer"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "node_modules/base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/batch": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
+      "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
+      "dev": true
+    },
+    "node_modules/big.js": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/bignumber.js": {
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.1.tgz",
+      "integrity": "sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig==",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/binary-extensions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/bn.js": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
+      "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==",
+      "dev": true
+    },
+    "node_modules/body-parser": {
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+      "dev": true,
+      "dependencies": {
+        "bytes": "3.1.2",
+        "content-type": "~1.0.4",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "on-finished": "2.4.1",
+        "qs": "6.11.0",
+        "raw-body": "2.5.1",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
+    },
+    "node_modules/body-parser/node_modules/bytes": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/body-parser/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/body-parser/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/bonjour-service": {
+      "version": "1.0.14",
+      "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.0.14.tgz",
+      "integrity": "sha512-HIMbgLnk1Vqvs6B4Wq5ep7mxvj9sGz5d1JJyDNSGNIdA/w2MCz6GTjWTdjqOJV1bEPj+6IkxDvWNFKEBxNt4kQ==",
+      "dev": true,
+      "dependencies": {
+        "array-flatten": "^2.1.2",
+        "dns-equal": "^1.0.0",
+        "fast-deep-equal": "^3.1.3",
+        "multicast-dns": "^7.2.5"
+      }
+    },
+    "node_modules/boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
+      "dev": true
+    },
+    "node_modules/bootstrap": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.4.1.tgz",
+      "integrity": "sha512-tbx5cHubwE6e2ZG7nqM3g/FZ5PQEDMWmMGNrCUBVRPHXTJaH7CBDdsLeu3eCh3B1tzAxTnAbtmrzvWEvT2NNEA==",
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/bootstrap"
+      },
+      "peerDependencies": {
+        "jquery": "1.9.1 - 3",
+        "popper.js": "^1.16.0"
+      }
+    },
+    "node_modules/bootstrap-colorpicker": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/bootstrap-colorpicker/-/bootstrap-colorpicker-3.4.0.tgz",
+      "integrity": "sha512-7vA0hvLrat3ptobEKlT9+6amzBUJcDAoh6hJRQY/AD+5dVZYXXf1ivRfrTwmuwiVLJo9rZwM8YB4lYzp6agzqg==",
+      "dependencies": {
+        "bootstrap": ">=4.0",
+        "jquery": ">=2.2",
+        "popper.js": ">=1.10"
+      }
+    },
+    "node_modules/bootstrap-tokenfield": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/bootstrap-tokenfield/-/bootstrap-tokenfield-0.12.0.tgz",
+      "integrity": "sha512-OgLQEQ1V3s69wgvjpWvPESNTv1RUZKtwpRQd3o5AQYdan47iUAL7ajSMjXMlSxWywrLTntF1l84aE7N1DvUlVw==",
+      "dependencies": {
+        "jquery": "^2.1.0"
+      }
+    },
+    "node_modules/bootstrap-tokenfield/node_modules/jquery": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz",
+      "integrity": "sha512-lBHj60ezci2u1v2FqnZIraShGgEXq35qCzMv4lITyHGppTnA13rwR0MgwyNJh9TnDs3aXUvd1xjAotfraMHX/Q=="
+    },
+    "node_modules/bourbon": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/bourbon/-/bourbon-4.3.4.tgz",
+      "integrity": "sha512-XY2nuWcgS5ODGVFHgE/SsjFb18ke1dPtxu32vDm2tue8v4RflmU0mp0jpdIvvyjEtYEv6oiSpQL2PRUsEqde4w=="
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "dependencies": {
+        "fill-range": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/brorand": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+      "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==",
+      "dev": true
+    },
+    "node_modules/browser-process-hrtime": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
+      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
+      "dev": true
+    },
+    "node_modules/browser-stdout": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
+      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
+      "dev": true
+    },
+    "node_modules/browserify-aes": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+      "dev": true,
+      "dependencies": {
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/browserify-cipher": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+      "dev": true,
+      "dependencies": {
+        "browserify-aes": "^1.0.4",
+        "browserify-des": "^1.0.0",
+        "evp_bytestokey": "^1.0.0"
+      }
+    },
+    "node_modules/browserify-des": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+      "dev": true,
+      "dependencies": {
+        "cipher-base": "^1.0.1",
+        "des.js": "^1.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/browserify-rsa": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
+      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^5.0.0",
+        "randombytes": "^2.0.1"
+      }
+    },
+    "node_modules/browserify-sign": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
+      "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^5.1.1",
+        "browserify-rsa": "^4.0.1",
+        "create-hash": "^1.2.0",
+        "create-hmac": "^1.1.7",
+        "elliptic": "^6.5.3",
+        "inherits": "^2.0.4",
+        "parse-asn1": "^5.1.5",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      }
+    },
+    "node_modules/browserify-sign/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/browserify-zlib": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+      "dev": true,
+      "dependencies": {
+        "pako": "~1.0.5"
+      }
+    },
+    "node_modules/browserslist": {
+      "version": "4.21.4",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
+      "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        }
+      ],
+      "dependencies": {
+        "caniuse-lite": "^1.0.30001400",
+        "electron-to-chromium": "^1.4.251",
+        "node-releases": "^2.0.6",
+        "update-browserslist-db": "^1.0.9"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      },
+      "engines": {
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      }
+    },
+    "node_modules/buffer": {
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
+      "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
+      "dev": true,
+      "dependencies": {
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4",
+        "isarray": "^1.0.0"
+      }
+    },
+    "node_modules/buffer-builder": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/buffer-builder/-/buffer-builder-0.2.0.tgz",
+      "integrity": "sha512-7VPMEPuYznPSoR21NE1zvd2Xna6c/CloiZCfcMXR1Jny6PjX0N4Nsa38zcBFo/FMK+BlA+FLKbJCQ0i2yxp+Xg==",
+      "dev": true
+    },
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
+    },
+    "node_modules/buffer-xor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==",
+      "dev": true
+    },
+    "node_modules/builtin-status-codes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+      "integrity": "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==",
+      "dev": true
+    },
+    "node_modules/bytes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+      "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/cacheable-lookup": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
+      "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==",
+      "engines": {
+        "node": ">=10.6.0"
+      }
+    },
+    "node_modules/cacheable-request": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz",
+      "integrity": "sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==",
+      "dependencies": {
+        "clone-response": "^1.0.2",
+        "get-stream": "^5.1.0",
+        "http-cache-semantics": "^4.0.0",
+        "keyv": "^4.0.0",
+        "lowercase-keys": "^2.0.0",
+        "normalize-url": "^6.0.1",
+        "responselike": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/camel-case": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
+      "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
+      "dev": true,
+      "dependencies": {
+        "pascal-case": "^3.1.2",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/camelcase-keys": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
+      "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^5.3.1",
+        "map-obj": "^4.0.0",
+        "quick-lru": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001441",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001441.tgz",
+      "integrity": "sha512-OyxRR4Vof59I3yGWXws6i908EtGbMzVUi3ganaZQHmydk1iwDhRnvaPG2WaR0KcqrDFKrxVZHULT396LEPhXfg==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        }
+      ]
+    },
+    "node_modules/chai": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.7.tgz",
+      "integrity": "sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==",
+      "dev": true,
+      "dependencies": {
+        "assertion-error": "^1.1.0",
+        "check-error": "^1.0.2",
+        "deep-eql": "^4.1.2",
+        "get-func-name": "^2.0.0",
+        "loupe": "^2.3.1",
+        "pathval": "^1.1.1",
+        "type-detect": "^4.0.5"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/check-error": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
+      "integrity": "sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/chokidar": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ],
+      "dependencies": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/chokidar/node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/chrome-trace-event": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
+      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
+    "node_modules/cipher-base": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/clean-css": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.1.tgz",
+      "integrity": "sha512-lCr8OHhiWCTw4v8POJovCoh4T7I9U11yVsPjMWWnnMmp9ZowCxyad1Pathle/9HjaDp+fdQKjO9fQydE6RHTZg==",
+      "dev": true,
+      "dependencies": {
+        "source-map": "~0.6.0"
+      },
+      "engines": {
+        "node": ">= 10.0"
+      }
+    },
+    "node_modules/clean-webpack-plugin": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-4.0.0.tgz",
+      "integrity": "sha512-WuWE1nyTNAyW5T7oNyys2EN0cfP2fdRxhxnIQWiAp0bMabPdHhoGxM8A6YL2GhqwgrPnnaemVE7nv5XJ2Fhh2w==",
+      "dev": true,
+      "dependencies": {
+        "del": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "webpack": ">=4.0.0 <6.0.0"
+      }
+    },
+    "node_modules/cliui": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^3.1.0",
+        "strip-ansi": "^5.2.0",
+        "wrap-ansi": "^5.1.0"
+      }
+    },
+    "node_modules/cliui/node_modules/ansi-regex": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/cliui/node_modules/emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "dev": true
+    },
+    "node_modules/cliui/node_modules/is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/cliui/node_modules/string-width": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^7.0.1",
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/cliui/node_modules/strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/clone-deep": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.4",
+        "kind-of": "^6.0.2",
+        "shallow-clone": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/clone-deep/node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/clone-response": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
+      "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",
+      "dependencies": {
+        "mimic-response": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true
+    },
+    "node_modules/colord": {
+      "version": "2.9.3",
+      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
+      "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==",
+      "dev": true
+    },
+    "node_modules/colorette": {
+      "version": "2.0.19",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz",
+      "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==",
+      "dev": true
+    },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dev": true,
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/commander": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
+      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
+      "dev": true,
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/compressible": {
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
+      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
+      "dev": true,
+      "dependencies": {
+        "mime-db": ">= 1.43.0 < 2"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/compression": {
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
+      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
+      "dev": true,
+      "dependencies": {
+        "accepts": "~1.3.5",
+        "bytes": "3.0.0",
+        "compressible": "~2.0.16",
+        "debug": "2.6.9",
+        "on-headers": "~1.0.2",
+        "safe-buffer": "5.1.2",
+        "vary": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/compression/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/compression/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/compression/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true
+    },
+    "node_modules/confusing-browser-globals": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
+      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
+      "dev": true
+    },
+    "node_modules/connect-history-api-fallback": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
+      "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/console-browserify": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
+      "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
+      "dev": true
+    },
+    "node_modules/constants-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+      "integrity": "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==",
+      "dev": true
+    },
+    "node_modules/content-disposition": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "5.2.1"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/content-type": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/convert-source-map": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+      "dev": true
+    },
+    "node_modules/cookie": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
+      "dev": true
+    },
+    "node_modules/copy-webpack-plugin": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz",
+      "integrity": "sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==",
+      "dev": true,
+      "dependencies": {
+        "fast-glob": "^3.2.11",
+        "glob-parent": "^6.0.1",
+        "globby": "^13.1.1",
+        "normalize-path": "^3.0.0",
+        "schema-utils": "^4.0.0",
+        "serialize-javascript": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 14.15.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.1.0"
+      }
+    },
+    "node_modules/copy-webpack-plugin/node_modules/globby": {
+      "version": "13.1.3",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-13.1.3.tgz",
+      "integrity": "sha512-8krCNHXvlCgHDpegPzleMq07yMYTO2sXKASmZmquEYWEmCx6J5UTRbp5RwMJkTJGtcQ44YpiUYUiN0b9mzy8Bw==",
+      "dev": true,
+      "dependencies": {
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.11",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^4.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/copy-webpack-plugin/node_modules/slash": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
+      "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/core-js": {
+      "version": "3.26.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.26.1.tgz",
+      "integrity": "sha512-21491RRQVzUn0GGM9Z1Jrpr6PNPxPi+Za8OM9q4tksTSnlbXXGKK1nXNg/QvwFYettXvSX6zWKCtHHfjN4puyA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/core-util-is": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+      "dev": true
+    },
+    "node_modules/cosmiconfig": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
+      "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
+      "dev": true,
+      "dependencies": {
+        "@types/parse-json": "^4.0.0",
+        "import-fresh": "^3.2.1",
+        "parse-json": "^5.0.0",
+        "path-type": "^4.0.0",
+        "yaml": "^1.10.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/create-ecdh": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
+      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "elliptic": "^6.5.3"
+      }
+    },
+    "node_modules/create-ecdh/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
+    "node_modules/create-hash": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "dev": true,
+      "dependencies": {
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
+      }
+    },
+    "node_modules/create-hmac": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+      "dev": true,
+      "dependencies": {
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "node_modules/create-require": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
+      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
+      "dev": true
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/crypto-browserify": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+      "dev": true,
+      "dependencies": {
+        "browserify-cipher": "^1.0.0",
+        "browserify-sign": "^4.0.0",
+        "create-ecdh": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.0",
+        "diffie-hellman": "^5.0.0",
+        "inherits": "^2.0.1",
+        "pbkdf2": "^3.0.3",
+        "public-encrypt": "^4.0.0",
+        "randombytes": "^2.0.0",
+        "randomfill": "^1.0.3"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/css-blank-pseudo": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-3.0.3.tgz",
+      "integrity": "sha512-VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ==",
+      "dev": true,
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.9"
+      },
+      "bin": {
+        "css-blank-pseudo": "dist/cli.cjs"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/css-functions-list": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.1.0.tgz",
+      "integrity": "sha512-/9lCvYZaUbBGvYUgYGFJ4dcYiyqdhSjG7IPVluoV8A1ILjkF7ilmhp1OGUz8n+nmBcu0RNrQAzgD8B6FJbrt2w==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.22"
+      }
+    },
+    "node_modules/css-has-pseudo": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-3.0.4.tgz",
+      "integrity": "sha512-Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw==",
+      "dev": true,
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.9"
+      },
+      "bin": {
+        "css-has-pseudo": "dist/cli.cjs"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/css-loader": {
+      "version": "6.7.3",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.7.3.tgz",
+      "integrity": "sha512-qhOH1KlBMnZP8FzRO6YCH9UHXQhVMcEGLyNdb7Hv2cpcmJbW0YrddO+tG1ab5nT41KpHIYGsbeHqxB9xPu1pKQ==",
+      "dev": true,
+      "dependencies": {
+        "icss-utils": "^5.1.0",
+        "postcss": "^8.4.19",
+        "postcss-modules-extract-imports": "^3.0.0",
+        "postcss-modules-local-by-default": "^4.0.0",
+        "postcss-modules-scope": "^3.0.0",
+        "postcss-modules-values": "^4.0.0",
+        "postcss-value-parser": "^4.2.0",
+        "semver": "^7.3.8"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/css-loader/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/css-loader/node_modules/semver": {
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/css-loader/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/css-prefers-color-scheme": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz",
+      "integrity": "sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==",
+      "dev": true,
+      "bin": {
+        "css-prefers-color-scheme": "dist/cli.cjs"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/css-rule-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/css-rule-stream/-/css-rule-stream-1.1.0.tgz",
+      "integrity": "sha512-qiio/Zkr8I19jh/XuzEkK8OKDQRTrEYaRyIHy4Bwh/tPUe0w8GcQs7r6x24Yc9lT+FbnZFYULxEIXCmaymguUQ==",
+      "dev": true,
+      "dependencies": {
+        "css-tokenize": "^1.0.1",
+        "duplexer2": "0.0.2",
+        "ldjson-stream": "^1.2.1",
+        "through2": "^0.6.3"
+      },
+      "bin": {
+        "css-rule-stream": "index.js"
+      }
+    },
+    "node_modules/css-rule-stream/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+      "dev": true
+    },
+    "node_modules/css-rule-stream/node_modules/readable-stream": {
+      "version": "1.0.34",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+      "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/css-rule-stream/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+      "dev": true
+    },
+    "node_modules/css-rule-stream/node_modules/through2": {
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+      "integrity": "sha512-RkK/CCESdTKQZHdmKICijdKKsCRVHs5KsLZ6pACAmF/1GPUQhonHSXWNERctxEp7RmvjdNbZTL5z9V7nSCXKcg==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": ">=1.0.33-1 <1.1.0-0",
+        "xtend": ">=4.0.0 <4.1.0-0"
+      }
+    },
+    "node_modules/css-select": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
+      "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
+      "dev": true,
+      "dependencies": {
+        "boolbase": "^1.0.0",
+        "css-what": "^6.0.1",
+        "domhandler": "^4.3.1",
+        "domutils": "^2.8.0",
+        "nth-check": "^2.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/css-tokenize": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/css-tokenize/-/css-tokenize-1.0.1.tgz",
+      "integrity": "sha512-gLmmbJdwH9HLY4bcA17lnZ8GgPwEXRbvxBJGHnkiB6gLhRpTzjkjtMIvz7YORGW/Ptv2oMk8b5g+u7mRD6Dd7A==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "readable-stream": "^1.0.33"
+      }
+    },
+    "node_modules/css-tokenize/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+      "dev": true
+    },
+    "node_modules/css-tokenize/node_modules/readable-stream": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+      "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/css-tokenize/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+      "dev": true
+    },
+    "node_modules/css-tree": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
+      "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
+      "dev": true,
+      "dependencies": {
+        "mdn-data": "2.0.14",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/css-what": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
+      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/cssdb": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-7.2.0.tgz",
+      "integrity": "sha512-JYlIsE7eKHSi0UNuCyo96YuIDFqvhGgHw4Ck6lsN+DP0Tp8M64UTDT2trGbkMDqnCoEjks7CkS0XcjU0rkvBdg==",
+      "dev": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      }
+    },
+    "node_modules/cssesc": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+      "dev": true,
+      "bin": {
+        "cssesc": "bin/cssesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/csso": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
+      "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
+      "dev": true,
+      "dependencies": {
+        "css-tree": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/csso-webpack-plugin": {
+      "version": "2.0.0-beta.3",
+      "resolved": "https://registry.npmjs.org/csso-webpack-plugin/-/csso-webpack-plugin-2.0.0-beta.3.tgz",
+      "integrity": "sha512-FnhgS7W1BwOduZagTLg9UjT2kvM9aiSpInm4xIDZHLuXl6/6vbOA1+DIIcbGKSjE0dWIVuDKEv1to86mN6KZ4w==",
+      "dev": true,
+      "dependencies": {
+        "@types/webpack": ">=4.0",
+        "core-js": "^3.10.1",
+        "csso": "^4.0.2",
+        "source-map": "^0.7.3",
+        "webpack-sources": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/csso-webpack-plugin/node_modules/source-map": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
+      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/cssom": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz",
+      "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==",
+      "dev": true
+    },
+    "node_modules/cssstyle": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
+      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
+      "dev": true,
+      "dependencies": {
+        "cssom": "~0.3.6"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cssstyle/node_modules/cssom": {
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
+      "dev": true
+    },
+    "node_modules/csstype": {
+      "version": "2.6.21",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.21.tgz",
+      "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w=="
+    },
+    "node_modules/data-urls": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz",
+      "integrity": "sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==",
+      "dev": true,
+      "dependencies": {
+        "abab": "^2.0.6",
+        "whatwg-mimetype": "^3.0.0",
+        "whatwg-url": "^11.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/data-urls/node_modules/whatwg-url": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz",
+      "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==",
+      "dev": true,
+      "dependencies": {
+        "tr46": "^3.0.0",
+        "webidl-conversions": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/decamelize-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz",
+      "integrity": "sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==",
+      "dev": true,
+      "dependencies": {
+        "decamelize": "^1.1.0",
+        "map-obj": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/decamelize-keys/node_modules/map-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+      "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/decimal.js": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
+      "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==",
+      "dev": true
+    },
+    "node_modules/decompress-response": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
+      "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
+      "dependencies": {
+        "mimic-response": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/decompress-response/node_modules/mimic-response": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
+      "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/deep-eql": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz",
+      "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==",
+      "dev": true,
+      "dependencies": {
+        "type-detect": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true
+    },
+    "node_modules/deepmerge": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
+      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/default-gateway": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
+      "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
+      "dev": true,
+      "dependencies": {
+        "execa": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/defer-to-connect": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
+      "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/define-lazy-prop": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
+      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/define-properties": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+      "dev": true,
+      "dependencies": {
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/del": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
+      "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/glob": "^7.1.1",
+        "globby": "^6.1.0",
+        "is-path-cwd": "^2.0.0",
+        "is-path-in-cwd": "^2.0.0",
+        "p-map": "^2.0.0",
+        "pify": "^4.0.1",
+        "rimraf": "^2.6.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/del/node_modules/array-union": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+      "integrity": "sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==",
+      "dev": true,
+      "dependencies": {
+        "array-uniq": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/del/node_modules/globby": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+      "integrity": "sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==",
+      "dev": true,
+      "dependencies": {
+        "array-union": "^1.0.1",
+        "glob": "^7.0.3",
+        "object-assign": "^4.0.1",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/del/node_modules/globby/node_modules/pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/des.js": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
+      "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "node_modules/destroy": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
+    },
+    "node_modules/detect-node": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
+      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
+      "dev": true
+    },
+    "node_modules/diff": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
+    "node_modules/diffie-hellman": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "miller-rabin": "^4.0.0",
+        "randombytes": "^2.0.0"
+      }
+    },
+    "node_modules/diffie-hellman/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
+    "node_modules/dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+      "dev": true,
+      "dependencies": {
+        "path-type": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/dns-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
+      "integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==",
+      "dev": true
+    },
+    "node_modules/dns-packet": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.4.0.tgz",
+      "integrity": "sha512-EgqGeaBB8hLiHLZtp/IbaDQTL8pZ0+IvwzSHA6d7VyMDM+B9hgddEMa9xjK5oYnw0ci0JQ6g2XCD7/f6cafU6g==",
+      "dev": true,
+      "dependencies": {
+        "@leichtgewicht/ip-codec": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/doiuse": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/doiuse/-/doiuse-4.4.1.tgz",
+      "integrity": "sha512-TUpr1/YNg20IB09tZmwGCTsTQoxj8jUld/hUZprZMj8vj0VpAJySXEWCr8WMvqvgzk0/kG/FxeSMGKode4UjPg==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^4.16.1",
+        "caniuse-lite": "^1.0.30001179",
+        "css-rule-stream": "^1.1.0",
+        "duplexer2": "0.0.2",
+        "ldjson-stream": "^1.2.1",
+        "multimatch": "^5.0.0",
+        "postcss": "^8.2.4",
+        "source-map": "^0.7.3",
+        "through2": "^4.0.2",
+        "yargs": "^16.2.0"
+      },
+      "bin": {
+        "doiuse": "cli.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/doiuse/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/doiuse/node_modules/cliui": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
+      }
+    },
+    "node_modules/doiuse/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/doiuse/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/doiuse/node_modules/source-map": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
+      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/doiuse/node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/doiuse/node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/doiuse/node_modules/yargs": {
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.0",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/doiuse/node_modules/yargs-parser": {
+      "version": "20.2.9",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/dom-converter": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
+      "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
+      "dev": true,
+      "dependencies": {
+        "utila": "~0.4"
+      }
+    },
+    "node_modules/dom-serializer": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
+      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.2.0",
+        "entities": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+      }
+    },
+    "node_modules/dom-serializer/node_modules/entities": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/domain-browser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
+      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4",
+        "npm": ">=1.2"
+      }
+    },
+    "node_modules/domelementtype": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ]
+    },
+    "node_modules/domexception": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
+      "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
+      "dev": true,
+      "dependencies": {
+        "webidl-conversions": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/domhandler": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
+      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.2.0"
+      },
+      "engines": {
+        "node": ">= 4"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
+      }
+    },
+    "node_modules/domutils": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+      "dev": true,
+      "dependencies": {
+        "dom-serializer": "^1.0.1",
+        "domelementtype": "^2.2.0",
+        "domhandler": "^4.2.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domutils?sponsor=1"
+      }
+    },
+    "node_modules/dot-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
+      "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
+      "dev": true,
+      "dependencies": {
+        "no-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/dropzone": {
+      "version": "5.9.3",
+      "resolved": "https://registry.npmjs.org/dropzone/-/dropzone-5.9.3.tgz",
+      "integrity": "sha512-Azk8kD/2/nJIuVPK+zQ9sjKMRIpRvNyqn9XwbBHNq+iNuSccbJS6hwm1Woy0pMST0erSo0u4j+KJaodndDk4vA=="
+    },
+    "node_modules/duplexer2": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+      "integrity": "sha512-+AWBwjGadtksxjOQSFDhPNQbed7icNXApT4+2BNpsXzcCBiInq2H9XW0O8sfHFaPmnQRs7cg/P0fAr2IWQSW0g==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~1.1.9"
+      }
+    },
+    "node_modules/duplexer2/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+      "dev": true
+    },
+    "node_modules/duplexer2/node_modules/readable-stream": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+      "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/duplexer2/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+      "dev": true
+    },
+    "node_modules/ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
+      "dev": true
+    },
+    "node_modules/electron-to-chromium": {
+      "version": "1.4.284",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz",
+      "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA=="
+    },
+    "node_modules/elliptic": {
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "brorand": "^1.1.0",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.1",
+        "inherits": "^2.0.4",
+        "minimalistic-assert": "^1.0.1",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "node_modules/elliptic/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/emojis-list": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "dependencies": {
+        "once": "^1.4.0"
+      }
+    },
+    "node_modules/enhanced-resolve": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz",
+      "integrity": "sha512-kxpoMgrdtkXZ5h0SeraBS1iRntpTpQ3R8ussdb38+UAFnMGX5DDyJXePm+OCHOcoXvHDw7mc2erbJBpDnl7TPw==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "memory-fs": "^0.2.0",
+        "tapable": "^0.1.8"
+      },
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/enhanced-resolve/node_modules/tapable": {
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",
+      "integrity": "sha512-jX8Et4hHg57mug1/079yitEKWGB3LCwoxByLsNim89LABq8NqgiX+6iYVOsq0vX8uJHkU+DZ5fnq95f800bEsQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/entities": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz",
+      "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/envinfo": {
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz",
+      "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==",
+      "dev": true,
+      "bin": {
+        "envinfo": "dist/cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/eonasdan-bootstrap-datetimepicker": {
+      "version": "4.17.49",
+      "resolved": "https://registry.npmjs.org/eonasdan-bootstrap-datetimepicker/-/eonasdan-bootstrap-datetimepicker-4.17.49.tgz",
+      "integrity": "sha512-7KZeDpkj+A6AtPR3XjX8gAnRPUkPSfW0OmMANG1dkUOPMtLSzbyoCjDIdEcfRtQPU5X0D9Gob7wWKn0h4QWy7A==",
+      "dependencies": {
+        "bootstrap": "^3.3",
+        "jquery": "^3.5.1",
+        "moment": "^2.10",
+        "moment-timezone": "^0.4.0"
+      },
+      "peerDependencies": {
+        "bootstrap": "^3.3",
+        "jquery": "^1.8.3 || ^2.0 || ^3.0",
+        "moment": "^2.10",
+        "moment-timezone": "^0.4.0 || ^0.5.0"
+      }
+    },
+    "node_modules/eonasdan-bootstrap-datetimepicker/node_modules/bootstrap": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.4.1.tgz",
+      "integrity": "sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "node_modules/es-abstract": {
+      "version": "1.20.5",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.5.tgz",
+      "integrity": "sha512-7h8MM2EQhsCA7pU/Nv78qOXFpD8Rhqd12gYiSJVkrH9+e8VuA8JlPJK/hQjjlLv6pJvx/z1iRFKzYb0XT/RuAQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "function.prototype.name": "^1.1.5",
+        "get-intrinsic": "^1.1.3",
+        "get-symbol-description": "^1.0.0",
+        "gopd": "^1.0.1",
+        "has": "^1.0.3",
+        "has-property-descriptors": "^1.0.0",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.3",
+        "is-callable": "^1.2.7",
+        "is-negative-zero": "^2.0.2",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.2",
+        "is-string": "^1.0.7",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.12.2",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.4",
+        "regexp.prototype.flags": "^1.4.3",
+        "safe-regex-test": "^1.0.0",
+        "string.prototype.trimend": "^1.0.6",
+        "string.prototype.trimstart": "^1.0.6",
+        "unbox-primitive": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es-array-method-boxes-properly": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz",
+      "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==",
+      "dev": true
+    },
+    "node_modules/es-module-lexer": {
+      "version": "0.9.3",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
+      "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ=="
+    },
+    "node_modules/es-shim-unscopables": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
+      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+      "dev": true,
+      "dependencies": {
+        "has": "^1.0.3"
+      }
+    },
+    "node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/esbuild": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.15.18.tgz",
+      "integrity": "sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q==",
+      "dev": true,
+      "hasInstallScript": true,
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "optionalDependencies": {
+        "@esbuild/android-arm": "0.15.18",
+        "@esbuild/linux-loong64": "0.15.18",
+        "esbuild-android-64": "0.15.18",
+        "esbuild-android-arm64": "0.15.18",
+        "esbuild-darwin-64": "0.15.18",
+        "esbuild-darwin-arm64": "0.15.18",
+        "esbuild-freebsd-64": "0.15.18",
+        "esbuild-freebsd-arm64": "0.15.18",
+        "esbuild-linux-32": "0.15.18",
+        "esbuild-linux-64": "0.15.18",
+        "esbuild-linux-arm": "0.15.18",
+        "esbuild-linux-arm64": "0.15.18",
+        "esbuild-linux-mips64le": "0.15.18",
+        "esbuild-linux-ppc64le": "0.15.18",
+        "esbuild-linux-riscv64": "0.15.18",
+        "esbuild-linux-s390x": "0.15.18",
+        "esbuild-netbsd-64": "0.15.18",
+        "esbuild-openbsd-64": "0.15.18",
+        "esbuild-sunos-64": "0.15.18",
+        "esbuild-windows-32": "0.15.18",
+        "esbuild-windows-64": "0.15.18",
+        "esbuild-windows-arm64": "0.15.18"
+      }
+    },
+    "node_modules/esbuild-android-64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.15.18.tgz",
+      "integrity": "sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-android-arm64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.15.18.tgz",
+      "integrity": "sha512-G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-darwin-64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.15.18.tgz",
+      "integrity": "sha512-2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-darwin-arm64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.18.tgz",
+      "integrity": "sha512-tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-freebsd-64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.18.tgz",
+      "integrity": "sha512-TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-freebsd-arm64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.18.tgz",
+      "integrity": "sha512-R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-linux-32": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.15.18.tgz",
+      "integrity": "sha512-lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-linux-64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.18.tgz",
+      "integrity": "sha512-hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-linux-arm": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.15.18.tgz",
+      "integrity": "sha512-UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-linux-arm64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.18.tgz",
+      "integrity": "sha512-54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-linux-mips64le": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.18.tgz",
+      "integrity": "sha512-Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-linux-ppc64le": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.18.tgz",
+      "integrity": "sha512-b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-linux-riscv64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.18.tgz",
+      "integrity": "sha512-ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-linux-s390x": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.18.tgz",
+      "integrity": "sha512-VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-loader": {
+      "version": "2.20.0",
+      "resolved": "https://registry.npmjs.org/esbuild-loader/-/esbuild-loader-2.20.0.tgz",
+      "integrity": "sha512-dr+j8O4w5RvqZ7I4PPB4EIyVTd679EBQnMm+JBB7av+vu05Zpje2IpK5N3ld1VWa+WxrInIbNFAg093+E1aRsA==",
+      "dev": true,
+      "dependencies": {
+        "esbuild": "^0.15.6",
+        "joycon": "^3.0.1",
+        "json5": "^2.2.0",
+        "loader-utils": "^2.0.0",
+        "tapable": "^2.2.0",
+        "webpack-sources": "^2.2.0"
+      },
+      "funding": {
+        "url": "https://github.com/privatenumber/esbuild-loader?sponsor=1"
+      },
+      "peerDependencies": {
+        "webpack": "^4.40.0 || ^5.0.0"
+      }
+    },
+    "node_modules/esbuild-loader/node_modules/webpack-sources": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz",
+      "integrity": "sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==",
+      "dev": true,
+      "dependencies": {
+        "source-list-map": "^2.0.1",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/esbuild-netbsd-64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.18.tgz",
+      "integrity": "sha512-98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-openbsd-64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.18.tgz",
+      "integrity": "sha512-yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-sunos-64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.15.18.tgz",
+      "integrity": "sha512-On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-windows-32": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.15.18.tgz",
+      "integrity": "sha512-o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-windows-64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.18.tgz",
+      "integrity": "sha512-qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-windows-arm64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.18.tgz",
+      "integrity": "sha512-q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
+      "dev": true
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/escodegen": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
+      "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
+      "dev": true,
+      "dependencies": {
+        "esprima": "^4.0.1",
+        "estraverse": "^5.2.0",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.6.1"
+      }
+    },
+    "node_modules/escodegen/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/escodegen/node_modules/levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/escodegen/node_modules/optionator": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+      "dev": true,
+      "dependencies": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.6",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "word-wrap": "~1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/escodegen/node_modules/prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/escodegen/node_modules/type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/eslint": {
+      "version": "8.30.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.30.0.tgz",
+      "integrity": "sha512-MGADB39QqYuzEGov+F/qb18r4i7DohCDOfatHaxI2iGlPuC65bwG2gxgO+7DkyL38dRFaRH7RaRAgU6JKL9rMQ==",
+      "dev": true,
+      "dependencies": {
+        "@eslint/eslintrc": "^1.4.0",
+        "@humanwhocodes/config-array": "^0.11.8",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@nodelib/fs.walk": "^1.2.8",
+        "ajv": "^6.10.0",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.1.1",
+        "eslint-utils": "^3.0.0",
+        "eslint-visitor-keys": "^3.3.0",
+        "espree": "^9.4.0",
+        "esquery": "^1.4.0",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "globals": "^13.19.0",
+        "grapheme-splitter": "^1.0.4",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "is-path-inside": "^3.0.3",
+        "js-sdsl": "^4.1.4",
+        "js-yaml": "^4.1.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.1",
+        "regexpp": "^3.2.0",
+        "strip-ansi": "^6.0.1",
+        "strip-json-comments": "^3.1.0",
+        "text-table": "^0.2.0"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-config-airbnb-base": {
+      "version": "15.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz",
+      "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==",
+      "dev": true,
+      "dependencies": {
+        "confusing-browser-globals": "^1.0.10",
+        "object.assign": "^4.1.2",
+        "object.entries": "^1.1.5",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^7.32.0 || ^8.2.0",
+        "eslint-plugin-import": "^2.25.2"
+      }
+    },
+    "node_modules/eslint-import-resolver-node": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
+      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.7",
+        "resolve": "^1.20.0"
+      }
+    },
+    "node_modules/eslint-import-resolver-node/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-import-resolver-webpack": {
+      "version": "0.12.2",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.12.2.tgz",
+      "integrity": "sha512-7Jnm4YAoNNkvqPaZkKdIHsKGmv8/uNnYC5QsXkiSodvX4XEEfH2AKOna98FK52fCDXm3q4HzuX+7pRMKkJ64EQ==",
+      "dev": true,
+      "dependencies": {
+        "array-find": "^1.0.0",
+        "debug": "^2.6.9",
+        "enhanced-resolve": "^0.9.1",
+        "find-root": "^1.1.0",
+        "has": "^1.0.3",
+        "interpret": "^1.2.0",
+        "lodash": "^4.17.15",
+        "node-libs-browser": "^1.0.0 || ^2.0.0",
+        "resolve": "^1.13.1",
+        "semver": "^5.7.1"
+      },
+      "peerDependencies": {
+        "eslint-plugin-import": ">=1.4.0",
+        "webpack": ">=1.11.0"
+      }
+    },
+    "node_modules/eslint-import-resolver-webpack/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/eslint-import-resolver-webpack/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/eslint-import-resolver-webpack/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/eslint-module-utils": {
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz",
+      "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.7"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependenciesMeta": {
+        "eslint": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-module-utils/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-plugin-html": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-html/-/eslint-plugin-html-6.2.0.tgz",
+      "integrity": "sha512-vi3NW0E8AJombTvt8beMwkL1R/fdRWl4QSNRNMhVQKWm36/X0KF0unGNAY4mqUF06mnwVWZcIcerrCnfn9025g==",
+      "dev": true,
+      "dependencies": {
+        "htmlparser2": "^7.1.2"
+      }
+    },
+    "node_modules/eslint-plugin-import": {
+      "version": "2.26.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
+      "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
+      "dev": true,
+      "dependencies": {
+        "array-includes": "^3.1.4",
+        "array.prototype.flat": "^1.2.5",
+        "debug": "^2.6.9",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.6",
+        "eslint-module-utils": "^2.7.3",
+        "has": "^1.0.3",
+        "is-core-module": "^2.8.1",
+        "is-glob": "^4.0.3",
+        "minimatch": "^3.1.2",
+        "object.values": "^1.1.5",
+        "resolve": "^1.22.0",
+        "tsconfig-paths": "^3.14.1"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/eslint-plugin-vue": {
+      "version": "9.8.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.8.0.tgz",
+      "integrity": "sha512-E/AXwcTzunyzM83C2QqDHxepMzvI2y6x+mmeYHbVDQlKFqmKYvRrhaVixEeeG27uI44p9oKDFiyCRw4XxgtfHA==",
+      "dev": true,
+      "dependencies": {
+        "eslint-utils": "^3.0.0",
+        "natural-compare": "^1.4.0",
+        "nth-check": "^2.0.1",
+        "postcss-selector-parser": "^6.0.9",
+        "semver": "^7.3.5",
+        "vue-eslint-parser": "^9.0.1",
+        "xml-name-validator": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.17.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^6.2.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-vue/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/eslint-plugin-vue/node_modules/semver": {
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/eslint-plugin-vue/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/eslint-utils": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "engines": {
+        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      },
+      "peerDependencies": {
+        "eslint": ">=5"
+      }
+    },
+    "node_modules/eslint-visitor-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/eslint/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/eslint/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/eslint/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/eslint/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/eslint/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/eslint-scope": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
+      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/eslint/node_modules/eslint-visitor-keys": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/eslint/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/eslint/node_modules/globals": {
+      "version": "13.19.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz",
+      "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/espree": {
+      "version": "9.4.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz",
+      "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^8.8.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/espree/node_modules/eslint-visitor-keys": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/esquery": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/esquery/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dependencies": {
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esrecurse/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estree-walker": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
+    },
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/eventemitter3": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
+      "dev": true
+    },
+    "node_modules/events": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+      "engines": {
+        "node": ">=0.8.x"
+      }
+    },
+    "node_modules/evp_bytestokey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "dev": true,
+      "dependencies": {
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/execa": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
+        "strip-final-newline": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/execa/node_modules/get-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/expose-loader": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/expose-loader/-/expose-loader-4.0.0.tgz",
+      "integrity": "sha512-kUEvHyf6MPR2ubZCL9aziP9Br5wxMvq1cghTpYhM6MW52NPq+7hXixw2EqQuI1SvGb1fDjc2ehJOg6645wR6ww==",
+      "dev": true,
+      "engines": {
+        "node": ">= 14.15.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/express": {
+      "version": "4.18.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
+      "dev": true,
+      "dependencies": {
+        "accepts": "~1.3.8",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.20.1",
+        "content-disposition": "0.5.4",
+        "content-type": "~1.0.4",
+        "cookie": "0.5.0",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "finalhandler": "1.2.0",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "merge-descriptors": "1.0.1",
+        "methods": "~1.1.2",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "~2.0.7",
+        "qs": "6.11.0",
+        "range-parser": "~1.2.1",
+        "safe-buffer": "5.2.1",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "type-is": "~1.6.18",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/express/node_modules/array-flatten": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
+      "dev": true
+    },
+    "node_modules/express/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/express/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+    },
+    "node_modules/fast-glob": {
+      "version": "3.2.12",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
+      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
+    "node_modules/fast-glob/node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
+    },
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "dev": true
+    },
+    "node_modules/fastest-levenshtein": {
+      "version": "1.0.16",
+      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
+      "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.9.1"
+      }
+    },
+    "node_modules/fastq": {
+      "version": "1.14.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.14.0.tgz",
+      "integrity": "sha512-eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg==",
+      "dev": true,
+      "dependencies": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "node_modules/faye-websocket": {
+      "version": "0.11.4",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
+      "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
+      "dev": true,
+      "dependencies": {
+        "websocket-driver": ">=0.5.1"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dev": true,
+      "dependencies": {
+        "flat-cache": "^3.0.4"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/file-loader": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-5.1.0.tgz",
+      "integrity": "sha512-u/VkLGskw3Ue59nyOwUwXI/6nuBCo7KBkniB/l7ICwr/7cPNGsL1WCXUp3GB0qgOOKU1TiP49bv4DZF/LJqprg==",
+      "dev": true,
+      "dependencies": {
+        "loader-utils": "^1.4.0",
+        "schema-utils": "^2.5.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/file-loader/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/file-loader/node_modules/loader-utils": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+      "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/file-loader/node_modules/schema-utils": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
+      "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.5",
+        "ajv": "^6.12.4",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 8.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/finalhandler": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+      "dev": true,
+      "dependencies": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "statuses": "2.0.1",
+        "unpipe": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/finalhandler/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/finalhandler/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/find-root": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
+      "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==",
+      "dev": true
+    },
+    "node_modules/find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/flat": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.1.tgz",
+      "integrity": "sha512-FmTtBsHskrU6FJ2VxCnsDb84wu9zhmO3cUX2kGFb5tuwhfXxGciiT0oRY+cck35QmG+NmGh5eLz6lLCpWTqwpA==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "~2.0.3"
+      },
+      "bin": {
+        "flat": "cli.js"
+      }
+    },
+    "node_modules/flat-cache": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+      "dev": true,
+      "dependencies": {
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/flat-cache/node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/flatted": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
+      "dev": true
+    },
+    "node_modules/follow-redirects": {
+      "version": "1.15.2",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
+      "engines": {
+        "node": ">=4.0"
+      },
+      "peerDependenciesMeta": {
+        "debug": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin": {
+      "version": "7.2.14",
+      "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-7.2.14.tgz",
+      "integrity": "sha512-Tg2feh/n8k486KX0EbXVUfJj3j0xnnbKYTJw0fnIb2QdV0+lblOYZSal5ed9hARoWVwKeOC7sYE2EakSRLo5ZA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.16.7",
+        "chalk": "^4.1.2",
+        "chokidar": "^3.5.3",
+        "cosmiconfig": "^7.0.1",
+        "deepmerge": "^4.2.2",
+        "fs-extra": "^10.0.0",
+        "memfs": "^3.4.1",
+        "minimatch": "^3.0.4",
+        "node-abort-controller": "^3.0.1",
+        "schema-utils": "^3.1.1",
+        "semver": "^7.3.5",
+        "tapable": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=12.13.0",
+        "yarn": ">=1.0.0"
+      },
+      "peerDependencies": {
+        "typescript": ">3.6.0",
+        "vue-template-compiler": "*",
+        "webpack": "^5.11.0"
+      },
+      "peerDependenciesMeta": {
+        "vue-template-compiler": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/schema-utils": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/semver": {
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/form-data": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "dev": true,
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/forwarded": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/fos-routing": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/fos-routing/-/fos-routing-0.0.6.tgz",
+      "integrity": "sha512-+eeaFADJSbxdBI7l/hqZGZlvYmxFudOhiv+GHypQHvzbkr05pBYrm7AON80uuQp+3kBDiaRSh8Ln34Y1rHYzYw=="
+    },
+    "node_modules/fraction.js": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
+      "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "type": "patreon",
+        "url": "https://www.patreon.com/infusion"
+      }
+    },
+    "node_modules/fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/fs-extra": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/fs-monkey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz",
+      "integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==",
+      "dev": true
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "node_modules/function.prototype.name": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
+      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.0",
+        "functions-have-names": "^1.2.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true,
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/get-func-name": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
+      "integrity": "sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
+      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-npm-tarball-url": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/get-npm-tarball-url/-/get-npm-tarball-url-2.0.3.tgz",
+      "integrity": "sha512-R/PW6RqyaBQNWYaSyfrh54/qtcnOp22FHCCiRhSSZj0FP3KQWCsxxt0DzIdVTbwTqe9CtQfvl/FPD4UIPt4pqw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.17"
+      }
+    },
+    "node_modules/get-stream": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/get-symbol-description": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
+      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/glob": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
+      "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/glob-to-regexp": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="
+    },
+    "node_modules/global-modules": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
+      "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
+      "dev": true,
+      "dependencies": {
+        "global-prefix": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/global-prefix": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
+      "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
+      "dev": true,
+      "dependencies": {
+        "ini": "^1.3.5",
+        "kind-of": "^6.0.2",
+        "which": "^1.3.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/global-prefix/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+      "dev": true,
+      "dependencies": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/globjoin": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
+      "integrity": "sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==",
+      "dev": true
+    },
+    "node_modules/google-protobuf": {
+      "version": "3.21.2",
+      "resolved": "https://registry.npmjs.org/google-protobuf/-/google-protobuf-3.21.2.tgz",
+      "integrity": "sha512-3MSOYFO5U9mPGikIYCzK0SaThypfGgS6bHqrUGXG3DPHCrb+txNqeEcns1W0lkGfk0rCyNXm7xB9rMxnCiZOoA==",
+      "dev": true
+    },
+    "node_modules/gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/got": {
+      "version": "11.8.6",
+      "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz",
+      "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==",
+      "dependencies": {
+        "@sindresorhus/is": "^4.0.0",
+        "@szmarczak/http-timer": "^4.0.5",
+        "@types/cacheable-request": "^6.0.1",
+        "@types/responselike": "^1.0.0",
+        "cacheable-lookup": "^5.0.3",
+        "cacheable-request": "^7.0.2",
+        "decompress-response": "^6.0.0",
+        "http2-wrapper": "^1.0.0-beta.5.2",
+        "lowercase-keys": "^2.0.0",
+        "p-cancelable": "^2.0.0",
+        "responselike": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10.19.0"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/got?sponsor=1"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.10",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
+      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
+    },
+    "node_modules/grapheme-splitter": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
+      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
+      "dev": true
+    },
+    "node_modules/growl": {
+      "version": "1.10.5",
+      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
+      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.x"
+      }
+    },
+    "node_modules/handle-thing": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
+      "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
+      "dev": true
+    },
+    "node_modules/hard-rejection": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
+      "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-tostringtag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/hash-base": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
+      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/hash-base/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/hash-sum": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz",
+      "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==",
+      "dev": true
+    },
+    "node_modules/hash.js": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
+      }
+    },
+    "node_modules/he": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+      "dev": true,
+      "bin": {
+        "he": "bin/he"
+      }
+    },
+    "node_modules/hmac-drbg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==",
+      "dev": true,
+      "dependencies": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "node_modules/hosted-git-info": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
+      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/hosted-git-info/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/hosted-git-info/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/hot-accept-webpack-plugin": {
+      "version": "2.0.0-beta.7",
+      "resolved": "https://registry.npmjs.org/hot-accept-webpack-plugin/-/hot-accept-webpack-plugin-2.0.0-beta.7.tgz",
+      "integrity": "sha512-3uRVxSf558Mb05zkQuqlEtroe6M50qb+k36+2xYOrxq/uQwpk0joGzzGvm62rW/SOyQq0p9pxS2+7kUiVJrcLw==",
+      "dev": true,
+      "dependencies": {
+        "modify-source-webpack-plugin": "2.0.0-beta.7"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/hpack.js": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
+      "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "obuf": "^1.0.0",
+        "readable-stream": "^2.0.1",
+        "wbuf": "^1.1.0"
+      }
+    },
+    "node_modules/html-encoding-sniffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
+      "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
+      "dev": true,
+      "dependencies": {
+        "whatwg-encoding": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/html-entities": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz",
+      "integrity": "sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==",
+      "dev": true
+    },
+    "node_modules/html-minifier-terser": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
+      "integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==",
+      "dev": true,
+      "dependencies": {
+        "camel-case": "^4.1.2",
+        "clean-css": "^5.2.2",
+        "commander": "^8.3.0",
+        "he": "^1.2.0",
+        "param-case": "^3.0.4",
+        "relateurl": "^0.2.7",
+        "terser": "^5.10.0"
+      },
+      "bin": {
+        "html-minifier-terser": "cli.js"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/html-tags": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.2.0.tgz",
+      "integrity": "sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/html-webpack-plugin": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz",
+      "integrity": "sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw==",
+      "dev": true,
+      "dependencies": {
+        "@types/html-minifier-terser": "^6.0.0",
+        "html-minifier-terser": "^6.0.2",
+        "lodash": "^4.17.21",
+        "pretty-error": "^4.0.0",
+        "tapable": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/html-webpack-plugin"
+      },
+      "peerDependencies": {
+        "webpack": "^5.20.0"
+      }
+    },
+    "node_modules/htmlparser2": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz",
+      "integrity": "sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==",
+      "dev": true,
+      "funding": [
+        "https://github.com/fb55/htmlparser2?sponsor=1",
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ],
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.2.2",
+        "domutils": "^2.8.0",
+        "entities": "^3.0.1"
+      }
+    },
+    "node_modules/http-cache-semantics": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
+      "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="
+    },
+    "node_modules/http-deceiver": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
+      "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==",
+      "dev": true
+    },
+    "node_modules/http-errors": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+      "dev": true,
+      "dependencies": {
+        "depd": "2.0.0",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/http-parser-js": {
+      "version": "0.5.8",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
+      "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==",
+      "dev": true
+    },
+    "node_modules/http-proxy": {
+      "version": "1.18.1",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
+      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
+      "dev": true,
+      "dependencies": {
+        "eventemitter3": "^4.0.0",
+        "follow-redirects": "^1.0.0",
+        "requires-port": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/http-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
+      "dev": true,
+      "dependencies": {
+        "@tootallnate/once": "2",
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/http-proxy-middleware": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
+      "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
+      "dev": true,
+      "dependencies": {
+        "@types/http-proxy": "^1.17.8",
+        "http-proxy": "^1.18.1",
+        "is-glob": "^4.0.1",
+        "is-plain-obj": "^3.0.0",
+        "micromatch": "^4.0.2"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "@types/express": "^4.17.13"
+      },
+      "peerDependenciesMeta": {
+        "@types/express": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/http-proxy-middleware/node_modules/is-plain-obj": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
+      "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/http2-wrapper": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz",
+      "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==",
+      "dependencies": {
+        "quick-lru": "^5.1.1",
+        "resolve-alpn": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=10.19.0"
+      }
+    },
+    "node_modules/http2-wrapper/node_modules/quick-lru": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
+      "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/https-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+      "integrity": "sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==",
+      "dev": true
+    },
+    "node_modules/https-proxy-agent": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/human-signals": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.17.0"
+      }
+    },
+    "node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dev": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/icss-utils": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
+      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
+      "dev": true,
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/ignore": {
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
+      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/immutable": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.1.0.tgz",
+      "integrity": "sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==",
+      "dev": true
+    },
+    "node_modules/import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "dev": true,
+      "dependencies": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/import-lazy": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
+      "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/import-local": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
+      "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
+      "dev": true,
+      "dependencies": {
+        "pkg-dir": "^4.2.0",
+        "resolve-cwd": "^3.0.0"
+      },
+      "bin": {
+        "import-local-fixture": "fixtures/cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/imports-loader": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/imports-loader/-/imports-loader-4.0.1.tgz",
+      "integrity": "sha512-ZiY+1xH5fqAJ1Qu1CFv+zw54rvPCC92DdYRDe0IIUboOhbJPLfOPbF/paA2iipelvMwjQUKWydcFOJ7f1+ZFcA==",
+      "dev": true,
+      "dependencies": {
+        "source-map": "^0.6.1",
+        "strip-comments": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 14.15.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/indent-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "node_modules/ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+      "dev": true
+    },
+    "node_modules/internal-slot": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz",
+      "integrity": "sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.3",
+        "has": "^1.0.3",
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/interpret": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
+      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/ipaddr.js": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz",
+      "integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "dev": true
+    },
+    "node_modules/is-bigint": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "dev": true,
+      "dependencies": {
+        "has-bigints": "^1.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-boolean-object": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-buffer": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
+      "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/is-callable": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-core-module": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
+      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
+      "dev": true,
+      "dependencies": {
+        "has": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-date-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-docker": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "dev": true,
+      "bin": {
+        "is-docker": "cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-negative-zero": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-number-object": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-path-cwd": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
+      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-path-in-cwd": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
+      "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
+      "dev": true,
+      "dependencies": {
+        "is-path-inside": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-path-in-cwd/node_modules/is-path-inside": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
+      "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
+      "dev": true,
+      "dependencies": {
+        "path-is-inside": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-path-inside": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-plain-object": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-potential-custom-element-name": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
+      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
+      "dev": true
+    },
+    "node_modules/is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-shared-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-weakref": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-wsl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "dev": true,
+      "dependencies": {
+        "is-docker": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+      "dev": true
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
+    "node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/jest-worker": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
+      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/jest-worker/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-worker/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/jets": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/jets/-/jets-0.11.0.tgz",
+      "integrity": "sha512-WGRZAkICV8la9FirezCLFkN0vr/VQDn6l5C0TeTaip8hY3YVz4EJW3tb8FASHLBCnFechGsssYAxkzTmRKXcLg=="
+    },
+    "node_modules/joycon": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/joycon/-/joycon-3.1.1.tgz",
+      "integrity": "sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/jquery": {
+      "version": "3.6.3",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.3.tgz",
+      "integrity": "sha512-bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg=="
+    },
+    "node_modules/jquery-serializejson": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/jquery-serializejson/-/jquery-serializejson-3.2.1.tgz",
+      "integrity": "sha512-89UxVNC4ac9XC5tWPz3DjSTYFcT5z6JYsxGVw+qHhD61FzjbEzXJHjpdLnezWujjqtIECi/URQ6KdPmDE9imGA=="
+    },
+    "node_modules/jquery-ui-dist": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/jquery-ui-dist/-/jquery-ui-dist-1.13.2.tgz",
+      "integrity": "sha512-oVDRd1NLtTbBwpRKAYdIRgpWVDzeBhfy7Gu0RmY6JEaZtmBq6kDn1pm5SgDiAotrnDS+RoTRXO6xvcNTxA9tOA==",
+      "dependencies": {
+        "jquery": ">=1.8.0 <4.0.0"
+      }
+    },
+    "node_modules/jquery.growl": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/jquery.growl/-/jquery.growl-1.3.5.tgz",
+      "integrity": "sha512-pK1RD8x3pXm1hEQ6KH0cu4QqzvI7R0EsUd5oneT5pavZ0cHwx/TV4qIdKeVfCWM0DVPyzI2GfXD6FwdDbRx1kw=="
+    },
+    "node_modules/js-sdsl": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz",
+      "integrity": "sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==",
+      "dev": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/js-sdsl"
+      }
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/jsdom": {
+      "version": "19.0.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-19.0.0.tgz",
+      "integrity": "sha512-RYAyjCbxy/vri/CfnjUWJQQtZ3LKlLnDqj+9XLNnJPgEGeirZs3hllKR20re8LUZ6o1b1X4Jat+Qd26zmP41+A==",
+      "dev": true,
+      "dependencies": {
+        "abab": "^2.0.5",
+        "acorn": "^8.5.0",
+        "acorn-globals": "^6.0.0",
+        "cssom": "^0.5.0",
+        "cssstyle": "^2.3.0",
+        "data-urls": "^3.0.1",
+        "decimal.js": "^10.3.1",
+        "domexception": "^4.0.0",
+        "escodegen": "^2.0.0",
+        "form-data": "^4.0.0",
+        "html-encoding-sniffer": "^3.0.0",
+        "http-proxy-agent": "^5.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "is-potential-custom-element-name": "^1.0.1",
+        "nwsapi": "^2.2.0",
+        "parse5": "6.0.1",
+        "saxes": "^5.0.1",
+        "symbol-tree": "^3.2.4",
+        "tough-cookie": "^4.0.0",
+        "w3c-hr-time": "^1.0.2",
+        "w3c-xmlserializer": "^3.0.0",
+        "webidl-conversions": "^7.0.0",
+        "whatwg-encoding": "^2.0.0",
+        "whatwg-mimetype": "^3.0.0",
+        "whatwg-url": "^10.0.0",
+        "ws": "^8.2.3",
+        "xml-name-validator": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "peerDependencies": {
+        "canvas": "^2.5.0"
+      },
+      "peerDependenciesMeta": {
+        "canvas": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "dev": true,
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/json-buffer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="
+    },
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+    },
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "dev": true
+    },
+    "node_modules/json5": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.2.tgz",
+      "integrity": "sha512-46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ==",
+      "dev": true,
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "dev": true,
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/jwerty": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/jwerty/-/jwerty-0.3.2.tgz",
+      "integrity": "sha512-cMFyML8AJ5Q8oh6MYx0/6W99B4XH0y9G5IANjTF+gqv7iLSlkjmWBhpkq3XYKgFiDrsmrm2NGs1lK7SduX3DyA=="
+    },
+    "node_modules/keyv": {
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.2.tgz",
+      "integrity": "sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==",
+      "dependencies": {
+        "json-buffer": "3.0.1"
+      }
+    },
+    "node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/klona": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz",
+      "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/known-css-properties": {
+      "version": "0.26.0",
+      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.26.0.tgz",
+      "integrity": "sha512-5FZRzrZzNTBruuurWpvZnvP9pum+fe0HcK8z/ooo+U+Hmp4vtbyp1/QDsqmufirXy4egGzbaH/y2uCZf+6W5Kg==",
+      "dev": true
+    },
+    "node_modules/ldjson-stream": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ldjson-stream/-/ldjson-stream-1.2.1.tgz",
+      "integrity": "sha512-xw/nNEXafuPSLu8NjjG3+atVVw+8U1APZAQylmwQn19Hgw6rC7QjHvP6MupnHWCrzSm9m0xs5QWkCLuRvBPjgQ==",
+      "dev": true,
+      "dependencies": {
+        "split2": "^0.2.1",
+        "through2": "^0.6.1"
+      }
+    },
+    "node_modules/ldjson-stream/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+      "dev": true
+    },
+    "node_modules/ldjson-stream/node_modules/readable-stream": {
+      "version": "1.0.34",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+      "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/ldjson-stream/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+      "dev": true
+    },
+    "node_modules/ldjson-stream/node_modules/through2": {
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+      "integrity": "sha512-RkK/CCESdTKQZHdmKICijdKKsCRVHs5KsLZ6pACAmF/1GPUQhonHSXWNERctxEp7RmvjdNbZTL5z9V7nSCXKcg==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": ">=1.0.33-1 <1.1.0-0",
+        "xtend": ">=4.0.0 <4.1.0-0"
+      }
+    },
+    "node_modules/levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+      "dev": true
+    },
+    "node_modules/loader-runner": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
+      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
+      "engines": {
+        "node": ">=6.11.5"
+      }
+    },
+    "node_modules/loader-utils": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=8.9.0"
+      }
+    },
+    "node_modules/locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+    },
+    "node_modules/lodash.escaperegexp": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz",
+      "integrity": "sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw=="
+    },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
+    },
+    "node_modules/lodash.truncate": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
+      "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==",
+      "dev": true
+    },
+    "node_modules/log-symbols": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
+      "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/loupe": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.6.tgz",
+      "integrity": "sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==",
+      "dev": true,
+      "dependencies": {
+        "get-func-name": "^2.0.0"
+      }
+    },
+    "node_modules/lower-case": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
+      "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/lowercase-keys": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
+      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "node_modules/magic-string": {
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
+      "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
+      "dependencies": {
+        "sourcemap-codec": "^1.4.8"
+      }
+    },
+    "node_modules/magnific-popup": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/magnific-popup/-/magnific-popup-1.1.0.tgz",
+      "integrity": "sha512-ghSa/1TKsOUL6ZlHfcfFCoB9Wms2nqaDdBEPh6QX9jFYQyMkUu7ciU1mrxedWWq4NM2m1C/llhHKLt6GKRYOzg==",
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/make-error": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+      "dev": true
+    },
+    "node_modules/map-obj": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
+      "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/material-design-icons-iconfont": {
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/material-design-icons-iconfont/-/material-design-icons-iconfont-6.7.0.tgz",
+      "integrity": "sha512-lSj71DgVv20kO0kGbs42icDzbRot61gEDBLQACzkUuznRQBUYmbxzEkGU6dNBb5fRWHMaScYlAXX96HQ4/cJWA=="
+    },
+    "node_modules/mathml-tag-names": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz",
+      "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/md5.js": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+      "dev": true,
+      "dependencies": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/mdn-data": {
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
+      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
+      "dev": true
+    },
+    "node_modules/media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/memfs": {
+      "version": "3.4.12",
+      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.12.tgz",
+      "integrity": "sha512-BcjuQn6vfqP+k100e0E9m61Hyqa//Brp+I3f0OBmN0ATHlFA8vx3Lt8z57R3u2bPqe3WGDBC+nF72fTH7isyEw==",
+      "dev": true,
+      "dependencies": {
+        "fs-monkey": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/memory-fs": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz",
+      "integrity": "sha512-+y4mDxU4rvXXu5UDSGCGNiesFmwCHuefGMoPCO1WYucNYj7DsLqrFaa2fXVI0H+NNiPTwwzKwspn9yTZqUGqng==",
+      "dev": true
+    },
+    "node_modules/meow": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
+      "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/minimist": "^1.2.0",
+        "camelcase-keys": "^6.2.2",
+        "decamelize": "^1.2.0",
+        "decamelize-keys": "^1.1.0",
+        "hard-rejection": "^2.1.0",
+        "minimist-options": "4.1.0",
+        "normalize-package-data": "^3.0.0",
+        "read-pkg-up": "^7.0.1",
+        "redent": "^3.0.0",
+        "trim-newlines": "^3.0.0",
+        "type-fest": "^0.18.0",
+        "yargs-parser": "^20.2.3"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/meow/node_modules/yargs-parser": {
+      "version": "20.2.9",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/merge-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
+      "dev": true
+    },
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
+    },
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "dev": true,
+      "dependencies": {
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/miller-rabin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
+      },
+      "bin": {
+        "miller-rabin": "bin/miller-rabin"
+      }
+    },
+    "node_modules/miller-rabin/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
+    "node_modules/mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "dev": true,
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mimic-response": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
+      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/min-indent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
+      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/mini-css-extract-plugin": {
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.2.tgz",
+      "integrity": "sha512-EdlUizq13o0Pd+uCp+WO/JpkLvHRVGt97RqfeGhXqAcorYo1ypJSpkV+WDT0vY/kmh/p7wRdJNJtuyK540PXDw==",
+      "dev": true,
+      "dependencies": {
+        "schema-utils": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+      "dev": true
+    },
+    "node_modules/minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==",
+      "dev": true
+    },
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
+      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/minimist-options": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
+      "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
+      "dev": true,
+      "dependencies": {
+        "arrify": "^1.0.1",
+        "is-plain-obj": "^1.1.0",
+        "kind-of": "^6.0.3"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/mkdirp": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz",
+      "integrity": "sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==",
+      "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "node_modules/mocha": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-6.2.3.tgz",
+      "integrity": "sha512-0R/3FvjIGH3eEuG17ccFPk117XL2rWxatr81a57D+r/x2uTYZRbdZ4oVidEUMh2W2TJDa7MdAb12Lm2/qrKajg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "3.2.3",
+        "browser-stdout": "1.3.1",
+        "debug": "3.2.6",
+        "diff": "3.5.0",
+        "escape-string-regexp": "1.0.5",
+        "find-up": "3.0.0",
+        "glob": "7.1.3",
+        "growl": "1.10.5",
+        "he": "1.2.0",
+        "js-yaml": "3.13.1",
+        "log-symbols": "2.2.0",
+        "minimatch": "3.0.4",
+        "mkdirp": "0.5.4",
+        "ms": "2.1.1",
+        "node-environment-flags": "1.0.5",
+        "object.assign": "4.1.0",
+        "strip-json-comments": "2.0.1",
+        "supports-color": "6.0.0",
+        "which": "1.3.1",
+        "wide-align": "1.1.3",
+        "yargs": "13.3.2",
+        "yargs-parser": "13.1.2",
+        "yargs-unparser": "1.6.0"
+      },
+      "bin": {
+        "_mocha": "bin/_mocha",
+        "mocha": "bin/mocha"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/mocha/node_modules/argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/mocha/node_modules/debug": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+      "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/mocha/node_modules/find-up": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mocha/node_modules/js-yaml": {
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/mocha/node_modules/locate-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^3.0.0",
+        "path-exists": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mocha/node_modules/minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/mocha/node_modules/ms": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+      "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+      "dev": true
+    },
+    "node_modules/mocha/node_modules/object.assign": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
+      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.2",
+        "function-bind": "^1.1.1",
+        "has-symbols": "^1.0.0",
+        "object-keys": "^1.0.11"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/mocha/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/mocha/node_modules/p-locate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mocha/node_modules/path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/mocha/node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+      "dev": true
+    },
+    "node_modules/mocha/node_modules/strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mocha/node_modules/supports-color": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz",
+      "integrity": "sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mocha/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/modify-source-webpack-plugin": {
+      "version": "2.0.0-beta.7",
+      "resolved": "https://registry.npmjs.org/modify-source-webpack-plugin/-/modify-source-webpack-plugin-2.0.0-beta.7.tgz",
+      "integrity": "sha512-P7CKlGAF+HlinKS5xsIP5wuYwqcpV5eQMpwJYy5yocLAdv2RN5A24orv0Q1DXkbcw5Pd2pCUB4Fo1x9EqfiNeg==",
+      "dev": true,
+      "dependencies": {
+        "loader-utils": "^2.0.0",
+        "schema-utils": "^3.0.0"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/modify-source-webpack-plugin/node_modules/schema-utils": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/moment": {
+      "version": "2.29.4",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
+      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/moment-timezone": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.4.1.tgz",
+      "integrity": "sha512-5cNPVUwaVJDCe9JM8m/qz17f9SkaI8rpnRUyDJi2K5HAd6EwhuQ3n5nLclZkNC/qJnomKgQH2TIu70Gy2dxFKA==",
+      "dependencies": {
+        "moment": ">= 2.6.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/multicast-dns": {
+      "version": "7.2.5",
+      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
+      "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
+      "dev": true,
+      "dependencies": {
+        "dns-packet": "^5.2.2",
+        "thunky": "^1.0.2"
+      },
+      "bin": {
+        "multicast-dns": "cli.js"
+      }
+    },
+    "node_modules/multimatch": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-5.0.0.tgz",
+      "integrity": "sha512-ypMKuglUrZUD99Tk2bUQ+xNQj43lPEfAeX2o9cTteAmShXy2VHDJpuwu1o0xqoKCt9jLVAvwyFKdLTPXKAfJyA==",
+      "dev": true,
+      "dependencies": {
+        "@types/minimatch": "^3.0.3",
+        "array-differ": "^3.0.0",
+        "array-union": "^2.1.0",
+        "arrify": "^2.0.1",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/multimatch/node_modules/@types/minimatch": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
+      "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==",
+      "dev": true
+    },
+    "node_modules/multimatch/node_modules/arrify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
+      "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
+      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true
+    },
+    "node_modules/natural-compare-lite": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
+      "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
+      "dev": true
+    },
+    "node_modules/needle": {
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/needle/-/needle-2.9.1.tgz",
+      "integrity": "sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.6",
+        "iconv-lite": "^0.4.4",
+        "sax": "^1.2.4"
+      },
+      "bin": {
+        "needle": "bin/needle"
+      },
+      "engines": {
+        "node": ">= 4.4.x"
+      }
+    },
+    "node_modules/needle/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/negotiator": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/neo-async": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
+    },
+    "node_modules/no-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
+      "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
+      "dev": true,
+      "dependencies": {
+        "lower-case": "^2.0.2",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/node-abort-controller": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.0.1.tgz",
+      "integrity": "sha512-/ujIVxthRs+7q6hsdjHMaj8hRG9NuWmwrz+JdRwZ14jdFoKSkm+vDsCbF9PLpnSqjaWQJuTmVtcWHNLr+vrOFw==",
+      "dev": true
+    },
+    "node_modules/node-environment-flags": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.5.tgz",
+      "integrity": "sha512-VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ==",
+      "dev": true,
+      "dependencies": {
+        "object.getownpropertydescriptors": "^2.0.3",
+        "semver": "^5.7.0"
+      }
+    },
+    "node_modules/node-environment-flags/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/node-forge": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
+      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6.13.0"
+      }
+    },
+    "node_modules/node-libs-browser": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
+      "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
+      "dev": true,
+      "dependencies": {
+        "assert": "^1.1.1",
+        "browserify-zlib": "^0.2.0",
+        "buffer": "^4.3.0",
+        "console-browserify": "^1.1.0",
+        "constants-browserify": "^1.0.0",
+        "crypto-browserify": "^3.11.0",
+        "domain-browser": "^1.1.1",
+        "events": "^3.0.0",
+        "https-browserify": "^1.0.0",
+        "os-browserify": "^0.3.0",
+        "path-browserify": "0.0.1",
+        "process": "^0.11.10",
+        "punycode": "^1.2.4",
+        "querystring-es3": "^0.2.0",
+        "readable-stream": "^2.3.3",
+        "stream-browserify": "^2.0.1",
+        "stream-http": "^2.7.2",
+        "string_decoder": "^1.0.0",
+        "timers-browserify": "^2.0.4",
+        "tty-browserify": "0.0.0",
+        "url": "^0.11.0",
+        "util": "^0.11.0",
+        "vm-browserify": "^1.0.1"
+      }
+    },
+    "node_modules/node-libs-browser/node_modules/punycode": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+      "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
+      "dev": true
+    },
+    "node_modules/node-releases": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.8.tgz",
+      "integrity": "sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A=="
+    },
+    "node_modules/normalize-package-data": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
+      "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
+      "dev": true,
+      "dependencies": {
+        "hosted-git-info": "^4.0.1",
+        "is-core-module": "^2.5.0",
+        "semver": "^7.3.4",
+        "validate-npm-package-license": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/normalize-package-data/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/normalize-package-data/node_modules/semver": {
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/normalize-package-data/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/normalize-range": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+      "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/normalize-url": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
+      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/npm-run-path": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/nth-check": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
+      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
+      "dev": true,
+      "dependencies": {
+        "boolbase": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/nth-check?sponsor=1"
+      }
+    },
+    "node_modules/nwsapi": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.2.tgz",
+      "integrity": "sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==",
+      "dev": true
+    },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
+      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.assign": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
+      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "has-symbols": "^1.0.3",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz",
+      "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.getownpropertydescriptors": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.5.tgz",
+      "integrity": "sha512-yDNzckpM6ntyQiGTik1fKV1DcVDRS+w8bvpWNCBanvH5LfRX9O8WTHqQzG4RZwRAM4I0oU7TV11Lj5v0g20ibw==",
+      "dev": true,
+      "dependencies": {
+        "array.prototype.reduce": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.values": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
+      "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/obuf": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
+      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
+      "dev": true
+    },
+    "node_modules/on-finished": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+      "dev": true,
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/on-headers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
+      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dev": true,
+      "dependencies": {
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/open": {
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz",
+      "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==",
+      "dev": true,
+      "dependencies": {
+        "define-lazy-prop": "^2.0.0",
+        "is-docker": "^2.1.1",
+        "is-wsl": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/open-sans-fonts": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/open-sans-fonts/-/open-sans-fonts-1.6.2.tgz",
+      "integrity": "sha512-vsJ6/Mm0TdUKQJqxfkXJy+0K2X0QeRuTmxQq9YE1ycziw6CbDPolDsHhQ6+ImoV/7OTh8K8ZTGklY1Z5nUAwug==",
+      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info."
+    },
+    "node_modules/optionator": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "dev": true,
+      "dependencies": {
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/os-browserify": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+      "integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==",
+      "dev": true
+    },
+    "node_modules/p-cancelable": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
+      "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-map": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
+      "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/p-retry": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz",
+      "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/retry": "0.12.0",
+        "retry": "^0.13.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pako": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
+      "dev": true
+    },
+    "node_modules/param-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
+      "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
+      "dev": true,
+      "dependencies": {
+        "dot-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "dependencies": {
+        "callsites": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parse-asn1": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
+      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
+      "dev": true,
+      "dependencies": {
+        "asn1.js": "^5.2.0",
+        "browserify-aes": "^1.0.0",
+        "evp_bytestokey": "^1.0.0",
+        "pbkdf2": "^3.0.3",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/parse5": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+      "dev": true
+    },
+    "node_modules/parseurl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/pascal-case": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
+      "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
+      "dev": true,
+      "dependencies": {
+        "no-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/path": {
+      "version": "0.12.7",
+      "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz",
+      "integrity": "sha512-aXXC6s+1w7otVF9UletFkFcDsJeO7lSZBPUQhtb5O0xJe8LtYhj/GxldoL09bBj9+ZmE2hNoHqQSFMN5fikh4Q==",
+      "dev": true,
+      "dependencies": {
+        "process": "^0.11.1",
+        "util": "^0.10.3"
+      }
+    },
+    "node_modules/path-browserify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
+      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
+      "dev": true
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==",
+      "dev": true
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
+    },
+    "node_modules/path-to-regexp": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==",
+      "dev": true
+    },
+    "node_modules/path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
+      "dev": true
+    },
+    "node_modules/path/node_modules/util": {
+      "version": "0.10.4",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
+      "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "2.0.3"
+      }
+    },
+    "node_modules/pathval": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
+      "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/pbkdf2": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
+      "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
+      "dev": true,
+      "dependencies": {
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      },
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
+    "node_modules/perfect-scrollbar": {
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/perfect-scrollbar/-/perfect-scrollbar-1.5.5.tgz",
+      "integrity": "sha512-dzalfutyP3e/FOpdlhVryN4AJ5XDVauVWxybSkLZmakFE2sS3y3pc4JnSprw8tGmHvkaG5Edr5T7LBTZ+WWU2g=="
+    },
+    "node_modules/photoswipe": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/photoswipe/-/photoswipe-4.1.3.tgz",
+      "integrity": "sha512-89Z43IRUyw7ycTolo+AaiDn3W1EEIfox54hERmm9bI12IB9cvRfHSHez3XhAyU8XW2EAFrC+2sKMhh7SJwn0bA==",
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/picocolors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==",
+      "dev": true,
+      "dependencies": {
+        "pinkie": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/popper.js": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
+      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
+      "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/popperjs"
+      }
+    },
+    "node_modules/postcss": {
+      "version": "8.4.20",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.20.tgz",
+      "integrity": "sha512-6Q04AXR1212bXr5fh03u8aAwbLxAQNGQ/Q1LNa0VfOI06ZAlhPHtQvE4OIdpj4kLThXilalPnmDSOD65DcHt+g==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        }
+      ],
+      "dependencies": {
+        "nanoid": "^3.3.4",
+        "picocolors": "^1.0.0",
+        "source-map-js": "^1.0.2"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      }
+    },
+    "node_modules/postcss-attribute-case-insensitive": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.2.tgz",
+      "integrity": "sha512-XIidXV8fDr0kKt28vqki84fRK8VW8eTuIa4PChv2MqKuT6C9UjmSKzen6KaWhWEoYvwxFCa7n/tC1SZ3tyq4SQ==",
+      "dev": true,
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-clamp": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-clamp/-/postcss-clamp-4.1.0.tgz",
+      "integrity": "sha512-ry4b1Llo/9zz+PKC+030KUnPITTJAHeOwjfAyyB60eT0AorGLdzp52s31OsPRHRf8NchkgFoG2y6fCfn1IV1Ow==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=7.6.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.6"
+      }
+    },
+    "node_modules/postcss-color-functional-notation": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.4.tgz",
+      "integrity": "sha512-2yrTAUZUab9s6CpxkxC4rVgFEVaR6/2Pipvi6qcgvnYiVqZcbDHEoBDhrXzyb7Efh2CCfHQNtcqWcIruDTIUeg==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-color-hex-alpha": {
+      "version": "8.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.4.tgz",
+      "integrity": "sha512-nLo2DCRC9eE4w2JmuKgVA3fGL3d01kGq752pVALF68qpGLmx2Qrk91QTKkdUqqp45T1K1XV8IhQpcu1hoAQflQ==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-color-rebeccapurple": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.1.1.tgz",
+      "integrity": "sha512-pGxkuVEInwLHgkNxUc4sdg4g3py7zUeCQ9sMfwyHAT+Ezk8a4OaaVZ8lIY5+oNqA/BXXgLyXv0+5wHP68R79hg==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-custom-media": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-8.0.2.tgz",
+      "integrity": "sha512-7yi25vDAoHAkbhAzX9dHx2yc6ntS4jQvejrNcC+csQJAXjj15e7VcWfMgLqBNAbOvqi5uIa9huOVwdHbf+sKqg==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.3"
+      }
+    },
+    "node_modules/postcss-custom-properties": {
+      "version": "12.1.11",
+      "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.11.tgz",
+      "integrity": "sha512-0IDJYhgU8xDv1KY6+VgUwuQkVtmYzRwu+dMjnmdMafXYv86SWqfxkc7qdDvWS38vsjaEtv8e0vGOUQrAiMBLpQ==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-custom-selectors": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-6.0.3.tgz",
+      "integrity": "sha512-fgVkmyiWDwmD3JbpCmB45SvvlCD6z9CG6Ie6Iere22W5aHea6oWa7EM2bpnv2Fj3I94L3VbtvX9KqwSi5aFzSg==",
+      "dev": true,
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.4"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.3"
+      }
+    },
+    "node_modules/postcss-dir-pseudo-class": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.5.tgz",
+      "integrity": "sha512-eqn4m70P031PF7ZQIvSgy9RSJ5uI2171O/OO/zcRNYpJbvaeKFUlar1aJ7rmgiQtbm0FSPsRewjpdS0Oew7MPA==",
+      "dev": true,
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-double-position-gradients": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.2.tgz",
+      "integrity": "sha512-GX+FuE/uBR6eskOK+4vkXgT6pDkexLokPaz/AbJna9s5Kzp/yl488pKPjhy0obB475ovfT1Wv8ho7U/cHNaRgQ==",
+      "dev": true,
+      "dependencies": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-env-function": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-4.0.6.tgz",
+      "integrity": "sha512-kpA6FsLra+NqcFnL81TnsU+Z7orGtDTxcOhl6pwXeEq1yFPpRMkCDpHhrz8CFQDr/Wfm0jLiNQ1OsGGPjlqPwA==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-focus-visible": {
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-6.0.4.tgz",
+      "integrity": "sha512-QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw==",
+      "dev": true,
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.9"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-focus-within": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-5.0.4.tgz",
+      "integrity": "sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ==",
+      "dev": true,
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.9"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-font-variant": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz",
+      "integrity": "sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==",
+      "dev": true,
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-gap-properties": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.5.tgz",
+      "integrity": "sha512-IuE6gKSdoUNcvkGIqdtjtcMtZIFyXZhmFd5RUlg97iVEvp1BZKV5ngsAjCjrVy+14uhGBQl9tzmi1Qwq4kqVOg==",
+      "dev": true,
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-image-set-function": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-4.0.7.tgz",
+      "integrity": "sha512-9T2r9rsvYzm5ndsBE8WgtrMlIT7VbtTfE7b3BQnudUqnBcBo7L758oc+o+pdj/dUV0l5wjwSdjeOH2DZtfv8qw==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-initial": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-4.0.1.tgz",
+      "integrity": "sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==",
+      "dev": true,
+      "peerDependencies": {
+        "postcss": "^8.0.0"
+      }
+    },
+    "node_modules/postcss-lab-function": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-4.2.1.tgz",
+      "integrity": "sha512-xuXll4isR03CrQsmxyz92LJB2xX9n+pZJ5jE9JgcnmsCammLyKdlzrBin+25dy6wIjfhJpKBAN80gsTlCgRk2w==",
+      "dev": true,
+      "dependencies": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-loader": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.0.2.tgz",
+      "integrity": "sha512-fUJzV/QH7NXUAqV8dWJ9Lg4aTkDCezpTS5HgJ2DvqznexTbSTxgi/dTECvTZ15BwKTtk8G/bqI/QTu2HPd3ZCg==",
+      "dev": true,
+      "dependencies": {
+        "cosmiconfig": "^7.0.0",
+        "klona": "^2.0.5",
+        "semver": "^7.3.8"
+      },
+      "engines": {
+        "node": ">= 14.15.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "postcss": "^7.0.0 || ^8.0.1",
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/postcss-loader/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/postcss-loader/node_modules/semver": {
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/postcss-loader/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/postcss-logical": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-5.0.4.tgz",
+      "integrity": "sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==",
+      "dev": true,
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-media-minmax": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz",
+      "integrity": "sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-media-query-parser": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
+      "integrity": "sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==",
+      "dev": true
+    },
+    "node_modules/postcss-modules-extract-imports": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
+      "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
+      "dev": true,
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz",
+      "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==",
+      "dev": true,
+      "dependencies": {
+        "icss-utils": "^5.0.0",
+        "postcss-selector-parser": "^6.0.2",
+        "postcss-value-parser": "^4.1.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-modules-scope": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
+      "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
+      "dev": true,
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.4"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-modules-values": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
+      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
+      "dev": true,
+      "dependencies": {
+        "icss-utils": "^5.0.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-nesting": {
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.2.0.tgz",
+      "integrity": "sha512-EwMkYchxiDiKUhlJGzWsD9b2zvq/r2SSubcRrgP+jujMXFzqvANLt16lJANC+5uZ6hjI7lpRmI6O8JIl+8l1KA==",
+      "dev": true,
+      "dependencies": {
+        "@csstools/selector-specificity": "^2.0.0",
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-opacity-percentage": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/postcss-opacity-percentage/-/postcss-opacity-percentage-1.1.3.tgz",
+      "integrity": "sha512-An6Ba4pHBiDtyVpSLymUUERMo2cU7s+Obz6BTrS+gxkbnSBNKSuD0AVUc+CpBMrpVPKKfoVz0WQCX+Tnst0i4A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "kofi",
+          "url": "https://ko-fi.com/mrcgrtz"
+        },
+        {
+          "type": "liberapay",
+          "url": "https://liberapay.com/mrcgrtz"
+        }
+      ],
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-overflow-shorthand": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.4.tgz",
+      "integrity": "sha512-otYl/ylHK8Y9bcBnPLo3foYFLL6a6Ak+3EQBPOTR7luMYCOsiVTUk1iLvNf6tVPNGXcoL9Hoz37kpfriRIFb4A==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-page-break": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-3.0.4.tgz",
+      "integrity": "sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==",
+      "dev": true,
+      "peerDependencies": {
+        "postcss": "^8"
+      }
+    },
+    "node_modules/postcss-place": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-place/-/postcss-place-7.0.5.tgz",
+      "integrity": "sha512-wR8igaZROA6Z4pv0d+bvVrvGY4GVHihBCBQieXFY3kuSuMyOmEnnfFzHl/tQuqHZkfkIVBEbDvYcFfHmpSet9g==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-preset-env": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.8.3.tgz",
+      "integrity": "sha512-T1LgRm5uEVFSEF83vHZJV2z19lHg4yJuZ6gXZZkqVsqv63nlr6zabMH3l4Pc01FQCyfWVrh2GaUeCVy9Po+Aag==",
+      "dev": true,
+      "dependencies": {
+        "@csstools/postcss-cascade-layers": "^1.1.1",
+        "@csstools/postcss-color-function": "^1.1.1",
+        "@csstools/postcss-font-format-keywords": "^1.0.1",
+        "@csstools/postcss-hwb-function": "^1.0.2",
+        "@csstools/postcss-ic-unit": "^1.0.1",
+        "@csstools/postcss-is-pseudo-class": "^2.0.7",
+        "@csstools/postcss-nested-calc": "^1.0.0",
+        "@csstools/postcss-normalize-display-values": "^1.0.1",
+        "@csstools/postcss-oklab-function": "^1.1.1",
+        "@csstools/postcss-progressive-custom-properties": "^1.3.0",
+        "@csstools/postcss-stepped-value-functions": "^1.0.1",
+        "@csstools/postcss-text-decoration-shorthand": "^1.0.0",
+        "@csstools/postcss-trigonometric-functions": "^1.0.2",
+        "@csstools/postcss-unset-value": "^1.0.2",
+        "autoprefixer": "^10.4.13",
+        "browserslist": "^4.21.4",
+        "css-blank-pseudo": "^3.0.3",
+        "css-has-pseudo": "^3.0.4",
+        "css-prefers-color-scheme": "^6.0.3",
+        "cssdb": "^7.1.0",
+        "postcss-attribute-case-insensitive": "^5.0.2",
+        "postcss-clamp": "^4.1.0",
+        "postcss-color-functional-notation": "^4.2.4",
+        "postcss-color-hex-alpha": "^8.0.4",
+        "postcss-color-rebeccapurple": "^7.1.1",
+        "postcss-custom-media": "^8.0.2",
+        "postcss-custom-properties": "^12.1.10",
+        "postcss-custom-selectors": "^6.0.3",
+        "postcss-dir-pseudo-class": "^6.0.5",
+        "postcss-double-position-gradients": "^3.1.2",
+        "postcss-env-function": "^4.0.6",
+        "postcss-focus-visible": "^6.0.4",
+        "postcss-focus-within": "^5.0.4",
+        "postcss-font-variant": "^5.0.0",
+        "postcss-gap-properties": "^3.0.5",
+        "postcss-image-set-function": "^4.0.7",
+        "postcss-initial": "^4.0.1",
+        "postcss-lab-function": "^4.2.1",
+        "postcss-logical": "^5.0.4",
+        "postcss-media-minmax": "^5.0.0",
+        "postcss-nesting": "^10.2.0",
+        "postcss-opacity-percentage": "^1.1.2",
+        "postcss-overflow-shorthand": "^3.0.4",
+        "postcss-page-break": "^3.0.4",
+        "postcss-place": "^7.0.5",
+        "postcss-pseudo-class-any-link": "^7.1.6",
+        "postcss-replace-overflow-wrap": "^4.0.0",
+        "postcss-selector-not": "^6.0.1",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-pseudo-class-any-link": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.6.tgz",
+      "integrity": "sha512-9sCtZkO6f/5ML9WcTLcIyV1yz9D1rf0tWc+ulKcvV30s0iZKS/ONyETvoWsr6vnrmW+X+KmuK3gV/w5EWnT37w==",
+      "dev": true,
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-replace-overflow-wrap": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz",
+      "integrity": "sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==",
+      "dev": true,
+      "peerDependencies": {
+        "postcss": "^8.0.3"
+      }
+    },
+    "node_modules/postcss-resolve-nested-selector": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz",
+      "integrity": "sha512-HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw==",
+      "dev": true
+    },
+    "node_modules/postcss-safe-parser": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz",
+      "integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      },
+      "peerDependencies": {
+        "postcss": "^8.3.3"
+      }
+    },
+    "node_modules/postcss-scss": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.6.tgz",
+      "integrity": "sha512-rLDPhJY4z/i4nVFZ27j9GqLxj1pwxE80eAzUNRMXtcpipFYIeowerzBgG3yJhMtObGEXidtIgbUpQ3eLDsf5OQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss-scss"
+        }
+      ],
+      "engines": {
+        "node": ">=12.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.19"
+      }
+    },
+    "node_modules/postcss-selector-not": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-6.0.1.tgz",
+      "integrity": "sha512-1i9affjAe9xu/y9uqWH+tD4r6/hDaXJruk8xn2x1vzxC2U3J3LKO3zJW4CyxlNhA56pADJ/djpEwpH1RClI2rQ==",
+      "dev": true,
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-selector-parser": {
+      "version": "6.0.11",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz",
+      "integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==",
+      "dev": true,
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-sorting": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-7.0.1.tgz",
+      "integrity": "sha512-iLBFYz6VRYyLJEJsBJ8M3TCqNcckVzz4wFounSc5Oez35ogE/X+aoC5fFu103Ot7NyvjU3/xqIXn93Gp3kJk4g==",
+      "dev": true,
+      "peerDependencies": {
+        "postcss": "^8.3.9"
+      }
+    },
+    "node_modules/postcss-value-parser": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+      "dev": true
+    },
+    "node_modules/prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/prestakit": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/prestakit/-/prestakit-1.2.6.tgz",
+      "integrity": "sha512-eE6sLXoFyrP1f28ZfU2cRE3ZynZQl9aCvxy8bUTcQH8cidg7PGrNw7w2dFvXmPCvxsTOPy0pAV0SrL+c9U4muQ==",
+      "dependencies": {
+        "@ttskch/select2-bootstrap4-theme": "^1.5.2",
+        "bootstrap": "^4.4.1",
+        "jquery.growl": "^1.3.5",
+        "material-design-icons-iconfont": "^6.7.0",
+        "open-sans-fonts": "^1.6.2",
+        "select2": "^4.0.5"
+      }
+    },
+    "node_modules/pretty-error": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz",
+      "integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==",
+      "dev": true,
+      "dependencies": {
+        "lodash": "^4.17.20",
+        "renderkid": "^3.0.0"
+      }
+    },
+    "node_modules/process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
+    "node_modules/process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "dev": true
+    },
+    "node_modules/proxy-addr": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+      "dev": true,
+      "dependencies": {
+        "forwarded": "0.2.0",
+        "ipaddr.js": "1.9.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/proxy-addr/node_modules/ipaddr.js": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/psl": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
+      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
+      "dev": true
+    },
+    "node_modules/public-encrypt": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "parse-asn1": "^5.0.0",
+        "randombytes": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/public-encrypt/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
+    "node_modules/pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "node_modules/punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/qs": {
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "dev": true,
+      "dependencies": {
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/querystring": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+      "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==",
+      "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.x"
+      }
+    },
+    "node_modules/querystring-es3": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+      "integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.x"
+      }
+    },
+    "node_modules/querystringify": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
+      "dev": true
+    },
+    "node_modules/queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/quick-lru": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
+      "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/randomfill": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+      "dev": true,
+      "dependencies": {
+        "randombytes": "^2.0.5",
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/range-parser": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/raw-body": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+      "dev": true,
+      "dependencies": {
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/raw-body/node_modules/bytes": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/read-pkg": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
+      "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
+      "dev": true,
+      "dependencies": {
+        "@types/normalize-package-data": "^2.4.0",
+        "normalize-package-data": "^2.5.0",
+        "parse-json": "^5.0.0",
+        "type-fest": "^0.6.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/read-pkg-up": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
+      "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^4.1.0",
+        "read-pkg": "^5.2.0",
+        "type-fest": "^0.8.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/type-fest": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/read-pkg/node_modules/hosted-git-info": {
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+      "dev": true
+    },
+    "node_modules/read-pkg/node_modules/normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dev": true,
+      "dependencies": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      }
+    },
+    "node_modules/read-pkg/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/read-pkg/node_modules/type-fest": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
+      "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/readable-stream/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "node_modules/readable-stream/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/rechoir": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz",
+      "integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==",
+      "dev": true,
+      "dependencies": {
+        "resolve": "^1.20.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/redent": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
+      "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
+      "dev": true,
+      "dependencies": {
+        "indent-string": "^4.0.0",
+        "strip-indent": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/regexp.prototype.flags": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
+      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "functions-have-names": "^1.2.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/regexpp": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      }
+    },
+    "node_modules/relateurl": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
+      "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/renderkid": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz",
+      "integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==",
+      "dev": true,
+      "dependencies": {
+        "css-select": "^4.1.3",
+        "dom-converter": "^0.2.0",
+        "htmlparser2": "^6.1.0",
+        "lodash": "^4.17.21",
+        "strip-ansi": "^6.0.1"
+      }
+    },
+    "node_modules/renderkid/node_modules/entities": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/renderkid/node_modules/htmlparser2": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
+      "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
+      "dev": true,
+      "funding": [
+        "https://github.com/fb55/htmlparser2?sponsor=1",
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ],
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.0.0",
+        "domutils": "^2.5.2",
+        "entities": "^2.0.0"
+      }
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-main-filename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+      "dev": true
+    },
+    "node_modules/requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+      "dev": true
+    },
+    "node_modules/resize-observer-polyfill": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
+      "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
+    },
+    "node_modules/resolve": {
+      "version": "1.22.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
+      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+      "dev": true,
+      "dependencies": {
+        "is-core-module": "^2.9.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/resolve-alpn": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
+      "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g=="
+    },
+    "node_modules/resolve-cwd": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+      "dev": true,
+      "dependencies": {
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve-cwd/node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/responselike": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",
+      "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==",
+      "dependencies": {
+        "lowercase-keys": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/retry": {
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
+      "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "dev": true,
+      "engines": {
+        "iojs": ">=1.0.0",
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/ripemd160": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "dev": true,
+      "dependencies": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
+    "node_modules/run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
+    "node_modules/rxjs": {
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.0.tgz",
+      "integrity": "sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/safe-regex-test": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
+      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.3",
+        "is-regex": "^1.1.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
+    },
+    "node_modules/sass-embedded": {
+      "version": "1.57.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.57.1.tgz",
+      "integrity": "sha512-O0s796x76bRSJIdmJ4lrK+zJLtF3XeP+0tbJzR4NAPSDnWqHLk2boUYSdfx4DnF4x9rGmcVlMWFE8UvnLMNCmw==",
+      "dev": true,
+      "dependencies": {
+        "buffer-builder": "^0.2.0",
+        "google-protobuf": "^3.11.4",
+        "immutable": "^4.0.0",
+        "rxjs": "^7.4.0",
+        "supports-color": "^8.1.1"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "optionalDependencies": {
+        "sass-embedded-darwin-arm64": "1.57.1",
+        "sass-embedded-darwin-x64": "1.57.1",
+        "sass-embedded-linux-arm": "1.57.1",
+        "sass-embedded-linux-arm64": "1.57.1",
+        "sass-embedded-linux-ia32": "1.57.1",
+        "sass-embedded-linux-x64": "1.57.1",
+        "sass-embedded-win32-ia32": "1.57.1",
+        "sass-embedded-win32-x64": "1.57.1"
+      }
+    },
+    "node_modules/sass-embedded-darwin-arm64": {
+      "version": "1.57.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-arm64/-/sass-embedded-darwin-arm64-1.57.1.tgz",
+      "integrity": "sha512-YSfrLZkM2HdXETQdSznv2DN2GdkmBNWLAlHfDWe0toSEIB2C2YGuoqHYZtl6PBYqu8k8FH4TDyct8VzoIa+rMw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-darwin-x64": {
+      "version": "1.57.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-x64/-/sass-embedded-darwin-x64-1.57.1.tgz",
+      "integrity": "sha512-xq2Au8CRLHQ+MqH2p8gQn9rYGtfQ8voCWMRz7klYmmh5kXHFjefG3opPPB8mJeSc3SIqE35SQxQEIhUbsxozpg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-linux-arm": {
+      "version": "1.57.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm/-/sass-embedded-linux-arm-1.57.1.tgz",
+      "integrity": "sha512-s+roBIgiQSg8124JmYmiSw4THWRvkF2BOclBZCb+OFLa8ZTak2WZdGs0PhqkMmZypxQ7cewh9ts+sOWN24yIrw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-linux-arm64": {
+      "version": "1.57.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm64/-/sass-embedded-linux-arm64-1.57.1.tgz",
+      "integrity": "sha512-R0GqVqf0xEhQ5nDbj7vqmKw+/1kqiURNBl0pD4uv4inBed2YKg+7agn7Y5XE5GUWbgOz7ubjL2kt4Glr7K7xeA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-linux-ia32": {
+      "version": "1.57.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-ia32/-/sass-embedded-linux-ia32-1.57.1.tgz",
+      "integrity": "sha512-gKqMpfcjrW4S1m+cuRn88oUkr/HMv48CqyCHnfGCsrkTpIft33a1ZKW2jWm09rwmR0g/G6yGstoQO0iHWJWxuQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-linux-x64": {
+      "version": "1.57.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-x64/-/sass-embedded-linux-x64-1.57.1.tgz",
+      "integrity": "sha512-AI6CrcuLWP22RXhVrZUN2JfdQ7YdFR30dA4twYwp/Q4hUfj85dJrVD5ORi8G04haMWPOQiFV6pBcMgzpiY2Bog==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-win32-ia32": {
+      "version": "1.57.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-win32-ia32/-/sass-embedded-win32-ia32-1.57.1.tgz",
+      "integrity": "sha512-s7EhJLG9AnJNBga3I+W0rk6y/1n/i0XD34rvqR3yJgBhNKkI5rVCxFN7FAcGR50vQQbCO1MrUCmuVvld+2qvyQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-win32-x64": {
+      "version": "1.57.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-win32-x64/-/sass-embedded-win32-x64-1.57.1.tgz",
+      "integrity": "sha512-b/Kgz7ADPTlPITk8e47Zf3eiuXlTGhi/eWsAoesUmkjR7jayvFNLHPhThgiRAxkzT6UlWI3Dzr+E3OBqUjegEg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/sass-embedded/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/sass-loader": {
+      "version": "13.2.0",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.2.0.tgz",
+      "integrity": "sha512-JWEp48djQA4nbZxmgC02/Wh0eroSUutulROUusYJO9P9zltRbNN80JCBHqRGzjd4cmZCa/r88xgfkjGD0TXsHg==",
+      "dev": true,
+      "dependencies": {
+        "klona": "^2.0.4",
+        "neo-async": "^2.6.2"
+      },
+      "engines": {
+        "node": ">= 14.15.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "fibers": ">= 3.1.0",
+        "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0",
+        "sass": "^1.3.0",
+        "sass-embedded": "*",
+        "webpack": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "fibers": {
+          "optional": true
+        },
+        "node-sass": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "sass-embedded": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+      "dev": true
+    },
+    "node_modules/saxes": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
+      "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
+      "dev": true,
+      "dependencies": {
+        "xmlchars": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/schema-utils": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
+      "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.9",
+        "ajv": "^8.8.0",
+        "ajv-formats": "^2.1.1",
+        "ajv-keywords": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/schema-utils/node_modules/ajv": {
+      "version": "8.11.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.2.tgz",
+      "integrity": "sha512-E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/schema-utils/node_modules/ajv-keywords": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3"
+      },
+      "peerDependencies": {
+        "ajv": "^8.8.2"
+      }
+    },
+    "node_modules/schema-utils/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
+    },
+    "node_modules/select-hose": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
+      "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==",
+      "dev": true
+    },
+    "node_modules/select2": {
+      "version": "4.0.13",
+      "resolved": "https://registry.npmjs.org/select2/-/select2-4.0.13.tgz",
+      "integrity": "sha512-1JeB87s6oN/TDxQQYCvS5EFoQyvV6eYMZZ0AeA4tdFDYWN3BAGZ8npr17UBFddU0lgAt3H0yjX3X6/ekOj1yjw=="
+    },
+    "node_modules/selfsigned": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz",
+      "integrity": "sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==",
+      "dev": true,
+      "dependencies": {
+        "node-forge": "^1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/send": {
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+      "dev": true,
+      "dependencies": {
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "mime": "1.6.0",
+        "ms": "2.1.3",
+        "on-finished": "2.4.1",
+        "range-parser": "~1.2.1",
+        "statuses": "2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/send/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/send/node_modules/debug/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/send/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true
+    },
+    "node_modules/serialize-javascript": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
+      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "node_modules/serve-index": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
+      "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
+      "dev": true,
+      "dependencies": {
+        "accepts": "~1.3.4",
+        "batch": "0.6.1",
+        "debug": "2.6.9",
+        "escape-html": "~1.0.3",
+        "http-errors": "~1.6.2",
+        "mime-types": "~2.1.17",
+        "parseurl": "~1.3.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/serve-index/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/serve-index/node_modules/depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/serve-index/node_modules/http-errors": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+      "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
+      "dev": true,
+      "dependencies": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.0",
+        "statuses": ">= 1.4.0 < 2"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/serve-index/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
+      "dev": true
+    },
+    "node_modules/serve-index/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/serve-index/node_modules/setprototypeof": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+      "dev": true
+    },
+    "node_modules/serve-index/node_modules/statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/serve-static": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+      "dev": true,
+      "dependencies": {
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.3",
+        "send": "0.18.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
+      "dev": true
+    },
+    "node_modules/setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==",
+      "dev": true
+    },
+    "node_modules/setprototypeof": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
+      "dev": true
+    },
+    "node_modules/sha.js": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      },
+      "bin": {
+        "sha.js": "bin.js"
+      }
+    },
+    "node_modules/shallow-clone": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true
+    },
+    "node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/slice-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+      }
+    },
+    "node_modules/slice-ansi/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/slice-ansi/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/slice-ansi/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/sockjs": {
+      "version": "0.3.24",
+      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
+      "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
+      "dev": true,
+      "dependencies": {
+        "faye-websocket": "^0.11.3",
+        "uuid": "^8.3.2",
+        "websocket-driver": "^0.7.4"
+      }
+    },
+    "node_modules/source-list-map": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
+      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
+      "dev": true
+    },
+    "node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-js": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/sourcemap-codec": {
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
+      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
+      "deprecated": "Please use @jridgewell/sourcemap-codec instead"
+    },
+    "node_modules/spdx-correct": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
+      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+      "dev": true,
+      "dependencies": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-exceptions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
+      "dev": true
+    },
+    "node_modules/spdx-expression-parse": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "dev": true,
+      "dependencies": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-expression-validate": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-expression-validate/-/spdx-expression-validate-2.0.0.tgz",
+      "integrity": "sha512-b3wydZLM+Tc6CFvaRDBOF9d76oGIHNCLYFeHbftFXUWjnfZWganmDmvtM5sm1cRwJc/VDBMLyGGrsLFd1vOxbg==",
+      "dev": true,
+      "dependencies": {
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-license-ids": {
+      "version": "3.0.12",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz",
+      "integrity": "sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==",
+      "dev": true
+    },
+    "node_modules/spdy": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
+      "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.0",
+        "handle-thing": "^2.0.0",
+        "http-deceiver": "^1.2.7",
+        "select-hose": "^2.0.0",
+        "spdy-transport": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/spdy-transport": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
+      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.0",
+        "detect-node": "^2.0.4",
+        "hpack.js": "^2.1.6",
+        "obuf": "^1.1.2",
+        "readable-stream": "^3.0.6",
+        "wbuf": "^1.7.3"
+      }
+    },
+    "node_modules/spdy-transport/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/split2": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-0.2.1.tgz",
+      "integrity": "sha512-D/oTExYAkC9nWleOCTOyNmAuzfAT/6rHGBA9LIK7FVnGo13CSvrKCUzKenwH6U1s2znY9MqH6v0UQTEDa3vJmg==",
+      "dev": true,
+      "dependencies": {
+        "through2": "~0.6.1"
+      }
+    },
+    "node_modules/split2/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+      "dev": true
+    },
+    "node_modules/split2/node_modules/readable-stream": {
+      "version": "1.0.34",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+      "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/split2/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+      "dev": true
+    },
+    "node_modules/split2/node_modules/through2": {
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+      "integrity": "sha512-RkK/CCESdTKQZHdmKICijdKKsCRVHs5KsLZ6pACAmF/1GPUQhonHSXWNERctxEp7RmvjdNbZTL5z9V7nSCXKcg==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": ">=1.0.33-1 <1.1.0-0",
+        "xtend": ">=4.0.0 <4.1.0-0"
+      }
+    },
+    "node_modules/sprintf-js": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
+      "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="
+    },
+    "node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/stream-browserify": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
+      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "~2.0.1",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "node_modules/stream-http": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
+      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+      "dev": true,
+      "dependencies": {
+        "builtin-status-codes": "^3.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.3.6",
+        "to-arraybuffer": "^1.0.0",
+        "xtend": "^4.0.0"
+      }
+    },
+    "node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string.prototype.trimend": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
+      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
+      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/strip-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-comments/-/strip-comments-2.0.1.tgz",
+      "integrity": "sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/strip-final-newline": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/strip-indent": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
+      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+      "dev": true,
+      "dependencies": {
+        "min-indent": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/style-loader": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.1.tgz",
+      "integrity": "sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/style-search": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
+      "integrity": "sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg==",
+      "dev": true
+    },
+    "node_modules/stylelint": {
+      "version": "14.16.0",
+      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.16.0.tgz",
+      "integrity": "sha512-X6uTi9DcxjzLV8ZUAjit1vsRtSwcls0nl07c9rqOPzvpA8IvTX/xWEkBRowS0ffevRrqkHa/ThDEu86u73FQDg==",
+      "dev": true,
+      "dependencies": {
+        "@csstools/selector-specificity": "^2.0.2",
+        "balanced-match": "^2.0.0",
+        "colord": "^2.9.3",
+        "cosmiconfig": "^7.1.0",
+        "css-functions-list": "^3.1.0",
+        "debug": "^4.3.4",
+        "fast-glob": "^3.2.12",
+        "fastest-levenshtein": "^1.0.16",
+        "file-entry-cache": "^6.0.1",
+        "global-modules": "^2.0.0",
+        "globby": "^11.1.0",
+        "globjoin": "^0.1.4",
+        "html-tags": "^3.2.0",
+        "ignore": "^5.2.1",
+        "import-lazy": "^4.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-plain-object": "^5.0.0",
+        "known-css-properties": "^0.26.0",
+        "mathml-tag-names": "^2.1.3",
+        "meow": "^9.0.0",
+        "micromatch": "^4.0.5",
+        "normalize-path": "^3.0.0",
+        "picocolors": "^1.0.0",
+        "postcss": "^8.4.19",
+        "postcss-media-query-parser": "^0.2.3",
+        "postcss-resolve-nested-selector": "^0.1.1",
+        "postcss-safe-parser": "^6.0.0",
+        "postcss-selector-parser": "^6.0.11",
+        "postcss-value-parser": "^4.2.0",
+        "resolve-from": "^5.0.0",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1",
+        "style-search": "^0.1.0",
+        "supports-hyperlinks": "^2.3.0",
+        "svg-tags": "^1.0.0",
+        "table": "^6.8.1",
+        "v8-compile-cache": "^2.3.0",
+        "write-file-atomic": "^4.0.2"
+      },
+      "bin": {
+        "stylelint": "bin/stylelint.js"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/stylelint"
+      }
+    },
+    "node_modules/stylelint-config-prestashop": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/stylelint-config-prestashop/-/stylelint-config-prestashop-1.0.7.tgz",
+      "integrity": "sha512-Ac2D15Jsk/zOmHJ4mu5g29bLQFkOmuSKGE/n8Scjs6YAOL/7QRhq26hXzlZ21+VMFi2bqKdjzqmYKbhgUHGpCA==",
+      "dev": true,
+      "dependencies": {
+        "stylelint-config-twbs-bootstrap": "^3.0.1",
+        "stylelint-no-unsupported-browser-features": "^5.0.1"
+      }
+    },
+    "node_modules/stylelint-config-recess-order": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-recess-order/-/stylelint-config-recess-order-3.1.0.tgz",
+      "integrity": "sha512-LXR6zD5O9cS1a9gbLbuKvWLs7qmHj4xm5MQ5KhhwZPMhtQP9da3F6Jsp/NAUdsAwDQEnT1ShU16YVdgN6p4a/w==",
+      "dev": true,
+      "dependencies": {
+        "stylelint-order": "5.x"
+      },
+      "peerDependencies": {
+        "stylelint": ">=14"
+      }
+    },
+    "node_modules/stylelint-config-recommended": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-7.0.0.tgz",
+      "integrity": "sha512-yGn84Bf/q41J4luis1AZ95gj0EQwRX8lWmGmBwkwBNSkpGSpl66XcPTulxGa/Z91aPoNGuIGBmFkcM1MejMo9Q==",
+      "dev": true,
+      "peerDependencies": {
+        "stylelint": "^14.4.0"
+      }
+    },
+    "node_modules/stylelint-config-recommended-scss": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-5.0.2.tgz",
+      "integrity": "sha512-b14BSZjcwW0hqbzm9b0S/ScN2+3CO3O4vcMNOw2KGf8lfVSwJ4p5TbNEXKwKl1+0FMtgRXZj6DqVUe/7nGnuBg==",
+      "dev": true,
+      "dependencies": {
+        "postcss-scss": "^4.0.2",
+        "stylelint-config-recommended": "^6.0.0",
+        "stylelint-scss": "^4.0.0"
+      },
+      "peerDependencies": {
+        "stylelint": "^14.0.0"
+      }
+    },
+    "node_modules/stylelint-config-recommended-scss/node_modules/stylelint-config-recommended": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-6.0.0.tgz",
+      "integrity": "sha512-ZorSSdyMcxWpROYUvLEMm0vSZud2uB7tX1hzBZwvVY9SV/uly4AvvJPPhCcymZL3fcQhEQG5AELmrxWqtmzacw==",
+      "dev": true,
+      "peerDependencies": {
+        "stylelint": "^14.0.0"
+      }
+    },
+    "node_modules/stylelint-config-standard": {
+      "version": "25.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-25.0.0.tgz",
+      "integrity": "sha512-21HnP3VSpaT1wFjFvv9VjvOGDtAviv47uTp3uFmzcN+3Lt+RYRv6oAplLaV51Kf792JSxJ6svCJh/G18E9VnCA==",
+      "dev": true,
+      "dependencies": {
+        "stylelint-config-recommended": "^7.0.0"
+      },
+      "peerDependencies": {
+        "stylelint": "^14.4.0"
+      }
+    },
+    "node_modules/stylelint-config-standard-scss": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-standard-scss/-/stylelint-config-standard-scss-3.0.0.tgz",
+      "integrity": "sha512-zt3ZbzIbllN1iCmc94e4pDxqpkzeR6CJo5DDXzltshuXr+82B8ylHyMMARNnUYrZH80B7wgY7UkKTYCFM0UUyw==",
+      "dev": true,
+      "dependencies": {
+        "stylelint-config-recommended-scss": "^5.0.2",
+        "stylelint-config-standard": "^24.0.0"
+      },
+      "peerDependencies": {
+        "stylelint": "^14.0.0"
+      }
+    },
+    "node_modules/stylelint-config-standard-scss/node_modules/stylelint-config-recommended": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-6.0.0.tgz",
+      "integrity": "sha512-ZorSSdyMcxWpROYUvLEMm0vSZud2uB7tX1hzBZwvVY9SV/uly4AvvJPPhCcymZL3fcQhEQG5AELmrxWqtmzacw==",
+      "dev": true,
+      "peerDependencies": {
+        "stylelint": "^14.0.0"
+      }
+    },
+    "node_modules/stylelint-config-standard-scss/node_modules/stylelint-config-standard": {
+      "version": "24.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-24.0.0.tgz",
+      "integrity": "sha512-+RtU7fbNT+VlNbdXJvnjc3USNPZRiRVp/d2DxOF/vBDDTi0kH5RX2Ny6errdtZJH3boO+bmqIYEllEmok4jiuw==",
+      "dev": true,
+      "dependencies": {
+        "stylelint-config-recommended": "^6.0.0"
+      },
+      "peerDependencies": {
+        "stylelint": "^14.0.0"
+      }
+    },
+    "node_modules/stylelint-config-twbs-bootstrap": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/stylelint-config-twbs-bootstrap/-/stylelint-config-twbs-bootstrap-3.2.1.tgz",
+      "integrity": "sha512-lfVEx+tW2SHMTYoifXIdB086FgQdQarQGt1vDqkEiuGYEtKeGjf41hovotEijw4t1RSyWuhkfxF8GzUZajTXjQ==",
+      "dev": true,
+      "dependencies": {
+        "stylelint-config-recess-order": "^3.0.0",
+        "stylelint-config-standard": "^25.0.0",
+        "stylelint-config-standard-scss": "^3.0.0",
+        "stylelint-scss": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "peerDependencies": {
+        "stylelint": "^14.4.0"
+      }
+    },
+    "node_modules/stylelint-no-unsupported-browser-features": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/stylelint-no-unsupported-browser-features/-/stylelint-no-unsupported-browser-features-5.0.4.tgz",
+      "integrity": "sha512-05DeIsWv262DXTSWhbQURDOxno9Tsu81sNnOpG1gD39WT+NNsEjhR2BQvwvNpZ/J/lS8vHxjhHULU2OGKSswvA==",
+      "dev": true,
+      "dependencies": {
+        "doiuse": "^4.4.1",
+        "lodash": "^4.17.15",
+        "postcss": "^8.4.16"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "peerDependencies": {
+        "stylelint": ">=13.0.0"
+      }
+    },
+    "node_modules/stylelint-order": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-5.0.0.tgz",
+      "integrity": "sha512-OWQ7pmicXufDw5BlRqzdz3fkGKJPgLyDwD1rFY3AIEfIH/LQY38Vu/85v8/up0I+VPiuGRwbc2Hg3zLAsJaiyw==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^8.3.11",
+        "postcss-sorting": "^7.0.1"
+      },
+      "peerDependencies": {
+        "stylelint": "^14.0.0"
+      }
+    },
+    "node_modules/stylelint-scss": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-4.3.0.tgz",
+      "integrity": "sha512-GvSaKCA3tipzZHoz+nNO7S02ZqOsdBzMiCx9poSmLlb3tdJlGddEX/8QzCOD8O7GQan9bjsvLMsO5xiw6IhhIQ==",
+      "dev": true,
+      "dependencies": {
+        "lodash": "^4.17.21",
+        "postcss-media-query-parser": "^0.2.3",
+        "postcss-resolve-nested-selector": "^0.1.1",
+        "postcss-selector-parser": "^6.0.6",
+        "postcss-value-parser": "^4.1.0"
+      },
+      "peerDependencies": {
+        "stylelint": "^14.5.1"
+      }
+    },
+    "node_modules/stylelint/node_modules/balanced-match": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz",
+      "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==",
+      "dev": true
+    },
+    "node_modules/stylelint/node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/supports-hyperlinks": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz",
+      "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0",
+        "supports-color": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-hyperlinks/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-hyperlinks/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/svg-tags": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
+      "integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==",
+      "dev": true
+    },
+    "node_modules/symbol-tree": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
+      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
+      "dev": true
+    },
+    "node_modules/table": {
+      "version": "6.8.1",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.8.1.tgz",
+      "integrity": "sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^8.0.1",
+        "lodash.truncate": "^4.4.2",
+        "slice-ansi": "^4.0.0",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/table/node_modules/ajv": {
+      "version": "8.11.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.2.tgz",
+      "integrity": "sha512-E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/table/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
+    },
+    "node_modules/tablednd": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/tablednd/-/tablednd-1.0.5.tgz",
+      "integrity": "sha512-iC230jusaekjzzAy0jigZLbzb7jKKnW9xiNiZ4W17p7y8AvBYf5KunyrIE3HwL1FhL2VEeogZtjP5VeBeIW4xg=="
+    },
+    "node_modules/tapable": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
+      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/terser": {
+      "version": "5.16.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.1.tgz",
+      "integrity": "sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw==",
+      "dependencies": {
+        "@jridgewell/source-map": "^0.3.2",
+        "acorn": "^8.5.0",
+        "commander": "^2.20.0",
+        "source-map-support": "~0.5.20"
+      },
+      "bin": {
+        "terser": "bin/terser"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/terser-webpack-plugin": {
+      "version": "5.3.6",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz",
+      "integrity": "sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.14",
+        "jest-worker": "^27.4.5",
+        "schema-utils": "^3.1.1",
+        "serialize-javascript": "^6.0.0",
+        "terser": "^5.14.1"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.1.0"
+      },
+      "peerDependenciesMeta": {
+        "@swc/core": {
+          "optional": true
+        },
+        "esbuild": {
+          "optional": true
+        },
+        "uglify-js": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/terser/node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+    },
+    "node_modules/text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+      "dev": true
+    },
+    "node_modules/through2": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz",
+      "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "3"
+      }
+    },
+    "node_modules/through2/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/thunky": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
+      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
+      "dev": true
+    },
+    "node_modules/timers-browserify": {
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
+      "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
+      "dev": true,
+      "dependencies": {
+        "setimmediate": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
+    "node_modules/to-arraybuffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+      "integrity": "sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA==",
+      "dev": true
+    },
+    "node_modules/to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/toidentifier": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/tough-cookie": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz",
+      "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==",
+      "dev": true,
+      "dependencies": {
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.2.0",
+        "url-parse": "^1.5.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tough-cookie/node_modules/universalify": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/tr46": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
+      "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
+      "dev": true,
+      "dependencies": {
+        "punycode": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/trim-newlines": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
+      "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ts-loader": {
+      "version": "9.4.2",
+      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.4.2.tgz",
+      "integrity": "sha512-OmlC4WVmFv5I0PpaxYb+qGeGOdm5giHU7HwDDUjw59emP2UYMHy9fFSDcYgSNoH8sXcj4hGCSEhlDZ9ULeDraA==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "enhanced-resolve": "^5.0.0",
+        "micromatch": "^4.0.0",
+        "semver": "^7.3.4"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "typescript": "*",
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/ts-loader/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/ts-loader/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/ts-loader/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/ts-loader/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/ts-loader/node_modules/enhanced-resolve": {
+      "version": "5.12.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz",
+      "integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.4",
+        "tapable": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/ts-loader/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ts-loader/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ts-loader/node_modules/semver": {
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ts-loader/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ts-loader/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/ts-node": {
+      "version": "10.9.1",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz",
+      "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==",
+      "dev": true,
+      "dependencies": {
+        "@cspotcode/source-map-support": "^0.8.0",
+        "@tsconfig/node10": "^1.0.7",
+        "@tsconfig/node12": "^1.0.7",
+        "@tsconfig/node14": "^1.0.0",
+        "@tsconfig/node16": "^1.0.2",
+        "acorn": "^8.4.1",
+        "acorn-walk": "^8.1.1",
+        "arg": "^4.1.0",
+        "create-require": "^1.1.0",
+        "diff": "^4.0.1",
+        "make-error": "^1.1.1",
+        "v8-compile-cache-lib": "^3.0.1",
+        "yn": "3.1.1"
+      },
+      "bin": {
+        "ts-node": "dist/bin.js",
+        "ts-node-cwd": "dist/bin-cwd.js",
+        "ts-node-esm": "dist/bin-esm.js",
+        "ts-node-script": "dist/bin-script.js",
+        "ts-node-transpile-only": "dist/bin-transpile.js",
+        "ts-script": "dist/bin-script-deprecated.js"
+      },
+      "peerDependencies": {
+        "@swc/core": ">=1.2.50",
+        "@swc/wasm": ">=1.2.50",
+        "@types/node": "*",
+        "typescript": ">=2.7"
+      },
+      "peerDependenciesMeta": {
+        "@swc/core": {
+          "optional": true
+        },
+        "@swc/wasm": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/ts-node/node_modules/diff": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
+    "node_modules/tsconfig-paths": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
+      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.1",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
+      }
+    },
+    "node_modules/tsconfig-paths/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/tslib": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz",
+      "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==",
+      "dev": true
+    },
+    "node_modules/tsutils": {
+      "version": "3.21.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.8.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      },
+      "peerDependencies": {
+        "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
+      }
+    },
+    "node_modules/tsutils/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
+    "node_modules/tty-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+      "integrity": "sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw==",
+      "dev": true
+    },
+    "node_modules/type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "0.18.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
+      "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/type-is": {
+      "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+      "dev": true,
+      "dependencies": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/typeahead.js": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/typeahead.js/-/typeahead.js-0.11.1.tgz",
+      "integrity": "sha512-yGaLzGjVHyryZdNfrWz2NHXUwEO7hrlVmGMGCo5+6mH3nEEhcQ0Te3mK3G60uRnxfERu8twOWSU4WmwScbwhMg==",
+      "dependencies": {
+        "jquery": ">=1.7"
+      }
+    },
+    "node_modules/typescript": {
+      "version": "4.9.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz",
+      "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==",
+      "dev": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=4.2.0"
+      }
+    },
+    "node_modules/uglify-save-license": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/uglify-save-license/-/uglify-save-license-0.4.1.tgz",
+      "integrity": "sha512-ErJczQkCvQKoEk7xxIfJTGp2JHtbKr8lEPtTgeJqm3PVCdF930Ba7x+wwtj3dZKwVu7lDy2nTOwncm3qCD+RMw==",
+      "dev": true
+    },
+    "node_modules/unbox-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
+        "which-boxed-primitive": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/universalify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/update-browserslist-db": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
+      "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        }
+      ],
+      "dependencies": {
+        "escalade": "^3.1.1",
+        "picocolors": "^1.0.0"
+      },
+      "bin": {
+        "browserslist-lint": "cli.js"
+      },
+      "peerDependencies": {
+        "browserslist": ">= 4.21.0"
+      }
+    },
+    "node_modules/uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/url": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+      "integrity": "sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==",
+      "dev": true,
+      "dependencies": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      }
+    },
+    "node_modules/url-parse": {
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+      "dev": true,
+      "dependencies": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    },
+    "node_modules/url-polyfill": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/url-polyfill/-/url-polyfill-1.1.12.tgz",
+      "integrity": "sha512-mYFmBHCapZjtcNHW0MDq9967t+z4Dmg5CJ0KqysK3+ZbyoNOWQHksGCTWwDhxGXllkWlOc10Xfko6v4a3ucM6A=="
+    },
+    "node_modules/url/node_modules/punycode": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+      "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==",
+      "dev": true
+    },
+    "node_modules/util": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "2.0.3"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "dev": true
+    },
+    "node_modules/util/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
+      "dev": true
+    },
+    "node_modules/utila": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
+      "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==",
+      "dev": true
+    },
+    "node_modules/utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "dev": true,
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/v8-compile-cache": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+      "dev": true
+    },
+    "node_modules/v8-compile-cache-lib": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
+      "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
+      "dev": true
+    },
+    "node_modules/validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
+      "dependencies": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "node_modules/vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/vazirmatn": {
+      "version": "32.102.0",
+      "resolved": "https://registry.npmjs.org/vazirmatn/-/vazirmatn-32.102.0.tgz",
+      "integrity": "sha512-Fkvs0Hp5x9zjHTuwog3KEcARhMLxjXd3o3MyD/vBywxYt2LG+4THEHpu6AW8ojfHJAutrxFnDTPB/5hvkX80ww=="
+    },
+    "node_modules/vm-browserify": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
+      "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
+      "dev": true
+    },
+    "node_modules/vue": {
+      "version": "3.2.45",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-3.2.45.tgz",
+      "integrity": "sha512-9Nx/Mg2b2xWlXykmCwiTUCWHbWIj53bnkizBxKai1g61f2Xit700A1ljowpTIM11e3uipOeiPcSqnmBg6gyiaA==",
+      "dependencies": {
+        "@vue/compiler-dom": "3.2.45",
+        "@vue/compiler-sfc": "3.2.45",
+        "@vue/runtime-dom": "3.2.45",
+        "@vue/server-renderer": "3.2.45",
+        "@vue/shared": "3.2.45"
+      }
+    },
+    "node_modules/vue-eslint-parser": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.1.0.tgz",
+      "integrity": "sha512-NGn/iQy8/Wb7RrRa4aRkokyCZfOUWk19OP5HP6JEozQFX5AoS/t+Z0ZN7FY4LlmWc4FNI922V7cvX28zctN8dQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.3.4",
+        "eslint-scope": "^7.1.1",
+        "eslint-visitor-keys": "^3.3.0",
+        "espree": "^9.3.1",
+        "esquery": "^1.4.0",
+        "lodash": "^4.17.21",
+        "semver": "^7.3.6"
+      },
+      "engines": {
+        "node": "^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      },
+      "peerDependencies": {
+        "eslint": ">=6.0.0"
+      }
+    },
+    "node_modules/vue-eslint-parser/node_modules/eslint-scope": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
+      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/vue-eslint-parser/node_modules/eslint-visitor-keys": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/vue-eslint-parser/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/vue-eslint-parser/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/vue-eslint-parser/node_modules/semver": {
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/vue-eslint-parser/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/vue-i18n": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.2.2.tgz",
+      "integrity": "sha512-yswpwtj89rTBhegUAv9Mu37LNznyu3NpyLQmozF3i1hYOhwpG8RjcjIFIIfnu+2MDZJGSZPXaKWvnQA71Yv9TQ==",
+      "dependencies": {
+        "@intlify/core-base": "9.2.2",
+        "@intlify/shared": "9.2.2",
+        "@intlify/vue-devtools": "9.2.2",
+        "@vue/devtools-api": "^6.2.1"
+      },
+      "engines": {
+        "node": ">= 14"
+      },
+      "peerDependencies": {
+        "vue": "^3.0.0"
+      }
+    },
+    "node_modules/vue-loader": {
+      "version": "17.0.1",
+      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-17.0.1.tgz",
+      "integrity": "sha512-/OOyugJnImKCkAKrAvdsWMuwoCqGxWT5USLsjohzWbMgOwpA5wQmzQiLMzZd7DjhIfunzAGIApTOgIylz/kwcg==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "hash-sum": "^2.0.0",
+        "loader-utils": "^2.0.0"
+      },
+      "peerDependencies": {
+        "webpack": "^4.1.0 || ^5.0.0-0"
+      },
+      "peerDependenciesMeta": {
+        "@vue/compiler-sfc": {
+          "optional": true
+        },
+        "vue": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/vue-loader/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/vue-loader/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/vue-loader/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/vue-loader/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/vue-loader/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/vue-loader/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/vue-resource": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/vue-resource/-/vue-resource-1.5.3.tgz",
+      "integrity": "sha512-REhTuEuYSpwmEH/VN4fgDQVC/VXxDK/xsguuiDPnINxOwy1s0CSu//p++osTUkiAXi6d/vptwBpb0AcBIDsXzw==",
+      "dependencies": {
+        "got": ">=8.0 <12.0"
+      }
+    },
+    "node_modules/vue-router": {
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.1.6.tgz",
+      "integrity": "sha512-DYWYwsG6xNPmLq/FmZn8Ip+qrhFEzA14EI12MsMgVxvHFDYvlr4NXpVF5hrRH1wVcDP8fGi5F4rxuJSl8/r+EQ==",
+      "dependencies": {
+        "@vue/devtools-api": "^6.4.5"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/posva"
+      },
+      "peerDependencies": {
+        "vue": "^3.2.0"
+      }
+    },
+    "node_modules/vue-style-loader": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz",
+      "integrity": "sha512-sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg==",
+      "dev": true,
+      "dependencies": {
+        "hash-sum": "^1.0.2",
+        "loader-utils": "^1.0.2"
+      }
+    },
+    "node_modules/vue-style-loader/node_modules/hash-sum": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
+      "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
+      "dev": true
+    },
+    "node_modules/vue-style-loader/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/vue-style-loader/node_modules/loader-utils": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+      "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/vuex": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/vuex/-/vuex-4.1.0.tgz",
+      "integrity": "sha512-hmV6UerDrPcgbSy9ORAtNXDr9M4wlNP4pEFKye4ujJF8oqgFFuxDCdOLS3eNoRTtq5O3hoBDh9Doj1bQMYHRbQ==",
+      "dependencies": {
+        "@vue/devtools-api": "^6.0.0-beta.11"
+      },
+      "peerDependencies": {
+        "vue": "^3.2.0"
+      }
+    },
+    "node_modules/w3c-hr-time": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
+      "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
+      "deprecated": "Use your platform's native performance.now() and performance.timeOrigin.",
+      "dev": true,
+      "dependencies": {
+        "browser-process-hrtime": "^1.0.0"
+      }
+    },
+    "node_modules/w3c-xmlserializer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-3.0.0.tgz",
+      "integrity": "sha512-3WFqGEgSXIyGhOmAFtlicJNMjEps8b1MG31NCA0/vOF9+nKMUW1ckhi9cnNHmf88Rzw5V+dwIwsm2C7X8k9aQg==",
+      "dev": true,
+      "dependencies": {
+        "xml-name-validator": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/watchpack": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
+      "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
+      "dependencies": {
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.1.2"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/wbuf": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
+      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
+      "dev": true,
+      "dependencies": {
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "node_modules/webidl-conversions": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/webpack": {
+      "version": "5.75.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz",
+      "integrity": "sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==",
+      "dependencies": {
+        "@types/eslint-scope": "^3.7.3",
+        "@types/estree": "^0.0.51",
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/wasm-edit": "1.11.1",
+        "@webassemblyjs/wasm-parser": "1.11.1",
+        "acorn": "^8.7.1",
+        "acorn-import-assertions": "^1.7.6",
+        "browserslist": "^4.14.5",
+        "chrome-trace-event": "^1.0.2",
+        "enhanced-resolve": "^5.10.0",
+        "es-module-lexer": "^0.9.0",
+        "eslint-scope": "5.1.1",
+        "events": "^3.2.0",
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.2.9",
+        "json-parse-even-better-errors": "^2.3.1",
+        "loader-runner": "^4.2.0",
+        "mime-types": "^2.1.27",
+        "neo-async": "^2.6.2",
+        "schema-utils": "^3.1.0",
+        "tapable": "^2.1.1",
+        "terser-webpack-plugin": "^5.1.3",
+        "watchpack": "^2.4.0",
+        "webpack-sources": "^3.2.3"
+      },
+      "bin": {
+        "webpack": "bin/webpack.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependenciesMeta": {
+        "webpack-cli": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-cli": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.0.1.tgz",
+      "integrity": "sha512-S3KVAyfwUqr0Mo/ur3NzIp6jnerNpo7GUO6so51mxLi1spqsA17YcMXy0WOIJtBSnj748lthxC6XLbNKh/ZC+A==",
+      "dev": true,
+      "dependencies": {
+        "@discoveryjs/json-ext": "^0.5.0",
+        "@webpack-cli/configtest": "^2.0.1",
+        "@webpack-cli/info": "^2.0.1",
+        "@webpack-cli/serve": "^2.0.1",
+        "colorette": "^2.0.14",
+        "commander": "^9.4.1",
+        "cross-spawn": "^7.0.3",
+        "envinfo": "^7.7.3",
+        "fastest-levenshtein": "^1.0.12",
+        "import-local": "^3.0.2",
+        "interpret": "^3.1.1",
+        "rechoir": "^0.8.0",
+        "webpack-merge": "^5.7.3"
+      },
+      "bin": {
+        "webpack-cli": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=14.15.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "5.x.x"
+      },
+      "peerDependenciesMeta": {
+        "@webpack-cli/generators": {
+          "optional": true
+        },
+        "webpack-bundle-analyzer": {
+          "optional": true
+        },
+        "webpack-dev-server": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-cli/node_modules/commander": {
+      "version": "9.4.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-9.4.1.tgz",
+      "integrity": "sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw==",
+      "dev": true,
+      "engines": {
+        "node": "^12.20.0 || >=14"
+      }
+    },
+    "node_modules/webpack-cli/node_modules/interpret": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz",
+      "integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/webpack-dev-middleware": {
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz",
+      "integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==",
+      "dev": true,
+      "dependencies": {
+        "colorette": "^2.0.10",
+        "memfs": "^3.4.3",
+        "mime-types": "^2.1.31",
+        "range-parser": "^1.2.1",
+        "schema-utils": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/webpack-dev-server": {
+      "version": "4.11.1",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.11.1.tgz",
+      "integrity": "sha512-lILVz9tAUy1zGFwieuaQtYiadImb5M3d+H+L1zDYalYoDl0cksAB1UNyuE5MMWJrG6zR1tXkCP2fitl7yoUJiw==",
+      "dev": true,
+      "dependencies": {
+        "@types/bonjour": "^3.5.9",
+        "@types/connect-history-api-fallback": "^1.3.5",
+        "@types/express": "^4.17.13",
+        "@types/serve-index": "^1.9.1",
+        "@types/serve-static": "^1.13.10",
+        "@types/sockjs": "^0.3.33",
+        "@types/ws": "^8.5.1",
+        "ansi-html-community": "^0.0.8",
+        "bonjour-service": "^1.0.11",
+        "chokidar": "^3.5.3",
+        "colorette": "^2.0.10",
+        "compression": "^1.7.4",
+        "connect-history-api-fallback": "^2.0.0",
+        "default-gateway": "^6.0.3",
+        "express": "^4.17.3",
+        "graceful-fs": "^4.2.6",
+        "html-entities": "^2.3.2",
+        "http-proxy-middleware": "^2.0.3",
+        "ipaddr.js": "^2.0.1",
+        "open": "^8.0.9",
+        "p-retry": "^4.5.0",
+        "rimraf": "^3.0.2",
+        "schema-utils": "^4.0.0",
+        "selfsigned": "^2.1.1",
+        "serve-index": "^1.9.1",
+        "sockjs": "^0.3.24",
+        "spdy": "^4.0.2",
+        "webpack-dev-middleware": "^5.3.1",
+        "ws": "^8.4.2"
+      },
+      "bin": {
+        "webpack-dev-server": "bin/webpack-dev-server.js"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.37.0 || ^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "webpack-cli": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/webpack-font-preload-plugin": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/webpack-font-preload-plugin/-/webpack-font-preload-plugin-1.5.0.tgz",
+      "integrity": "sha512-/Nh6MNa7/rbu3ZcqSR1SxB+G5XaITu7U2yZO5INTsVRpVlMLQmHQZCoDt4PP+iFyBdvBCDbA0CImRXHarQ0wpQ==",
+      "dev": true,
+      "dependencies": {
+        "jsdom": "^19.0.0",
+        "webpack-sources": "^3.2.2"
+      },
+      "engines": {
+        "node": ">= 10.17.0"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/webpack-font-preload-plugin/node_modules/webpack-sources": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/webpack-license-plugin": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/webpack-license-plugin/-/webpack-license-plugin-4.2.2.tgz",
+      "integrity": "sha512-OfIdm659IKurEInKlBN6Sfzrh+MNKIWkChKKg+aDCoPf3Ok1OSXBDd2RKSbuUAtxjmdW2j6LUVZWnRYRnVdOxA==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^5.0.1",
+        "get-npm-tarball-url": "^2.0.1",
+        "lodash": "^4.17.20",
+        "needle": "^2.2.4",
+        "spdx-expression-validate": "^2.0.0",
+        "webpack-sources": "^3.2.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "webpack": ">=4.0.0 < 6.0.0"
+      }
+    },
+    "node_modules/webpack-license-plugin/node_modules/chalk": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.2.0.tgz",
+      "integrity": "sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/webpack-license-plugin/node_modules/webpack-sources": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/webpack-merge": {
+      "version": "5.8.0",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz",
+      "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==",
+      "dev": true,
+      "dependencies": {
+        "clone-deep": "^4.0.1",
+        "wildcard": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/webpack-remove-empty-scripts": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/webpack-remove-empty-scripts/-/webpack-remove-empty-scripts-0.7.3.tgz",
+      "integrity": "sha512-yipqb25A0qtH7X9vKt6yihwyYkTtSlRiDdBb2QsyrkqGM3hpfAcfOO1lYDef9HQUNm3s8ojmorbNg32XXX6FYg==",
+      "dev": true,
+      "dependencies": {
+        "ansis": "^1.3.4"
+      },
+      "engines": {
+        "node": ">=12.14"
+      },
+      "funding": {
+        "type": "patreon",
+        "url": "https://patreon.com/biodiscus"
+      },
+      "peerDependencies": {
+        "webpack": ">=5.32.0"
+      }
+    },
+    "node_modules/webpack-sources": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+      "dev": true,
+      "dependencies": {
+        "source-list-map": "^2.0.0",
+        "source-map": "~0.6.1"
+      }
+    },
+    "node_modules/webpack/node_modules/enhanced-resolve": {
+      "version": "5.12.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz",
+      "integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==",
+      "dependencies": {
+        "graceful-fs": "^4.2.4",
+        "tapable": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/webpack/node_modules/schema-utils": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/webpack/node_modules/webpack-sources": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/websocket-driver": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
+      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
+      "dev": true,
+      "dependencies": {
+        "http-parser-js": ">=0.5.1",
+        "safe-buffer": ">=5.1.0",
+        "websocket-extensions": ">=0.1.1"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/websocket-extensions": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
+      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/whatwg-encoding": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
+      "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
+      "dev": true,
+      "dependencies": {
+        "iconv-lite": "0.6.3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/whatwg-encoding/node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "dev": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/whatwg-mimetype": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
+      "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/whatwg-url": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-10.0.0.tgz",
+      "integrity": "sha512-CLxxCmdUby142H5FZzn4D8ikO1cmypvXVQktsgosNy4a4BHrDHeciBBGZhb0bNoR5/MltoCatso+vFjjGx8t0w==",
+      "dev": true,
+      "dependencies": {
+        "tr46": "^3.0.0",
+        "webidl-conversions": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "dev": true,
+      "dependencies": {
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-module": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==",
+      "dev": true
+    },
+    "node_modules/wide-align": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^1.0.2 || 2"
+      }
+    },
+    "node_modules/wide-align/node_modules/ansi-regex": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
+      "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/wide-align/node_modules/is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/wide-align/node_modules/string-width": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "dev": true,
+      "dependencies": {
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/wide-align/node_modules/strip-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+      "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/wildcard": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
+      "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==",
+      "dev": true
+    },
+    "node_modules/word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/wrap-ansi": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.0",
+        "string-width": "^3.0.0",
+        "strip-ansi": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-regex": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "dev": true
+    },
+    "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/string-width": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^7.0.1",
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+    },
+    "node_modules/write-file-atomic": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+      "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
+      "dev": true,
+      "dependencies": {
+        "imurmurhash": "^0.1.4",
+        "signal-exit": "^3.0.7"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/ws": {
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
+      "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/xml-name-validator": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
+      "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/xmlchars": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
+      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
+      "dev": true
+    },
+    "node_modules/xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
+    "node_modules/y18n": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+      "dev": true
+    },
+    "node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true
+    },
+    "node_modules/yaml": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/yargs": {
+      "version": "13.3.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+      "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^5.0.0",
+        "find-up": "^3.0.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^3.0.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^13.1.2"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "13.1.2",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      }
+    },
+    "node_modules/yargs-unparser": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz",
+      "integrity": "sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==",
+      "dev": true,
+      "dependencies": {
+        "flat": "^4.1.0",
+        "lodash": "^4.17.15",
+        "yargs": "^13.3.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/yargs/node_modules/ansi-regex": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/yargs/node_modules/emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "dev": true
+    },
+    "node_modules/yargs/node_modules/find-up": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/yargs/node_modules/is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/yargs/node_modules/locate-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^3.0.0",
+        "path-exists": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/yargs/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/yargs/node_modules/p-locate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/yargs/node_modules/path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/yargs/node_modules/string-width": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^7.0.1",
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/yargs/node_modules/strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/yn": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
+      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/zxcvbn": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/zxcvbn/-/zxcvbn-4.4.2.tgz",
+      "integrity": "sha512-Bq0B+ixT/DMyG8kgX2xWcI5jUvCwqrMxSFam7m0lAf78nf04hv6lNCsyLYdyYTrCVMqNDY/206K7eExYCeSyUQ=="
+    }
+  },
   "dependencies": {
     "@ampproject/remapping": {
       "version": "2.2.0",
@@ -400,13 +14667,15 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.2.tgz",
       "integrity": "sha512-c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "@csstools/selector-specificity": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz",
       "integrity": "sha512-IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "@discoveryjs/json-ext": {
       "version": "0.5.7",
@@ -743,7 +15012,6 @@
       "version": "8.4.10",
       "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.10.tgz",
       "integrity": "sha512-Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw==",
-      "dev": true,
       "requires": {
         "@types/estree": "*",
         "@types/json-schema": "*"
@@ -753,7 +15021,6 @@
       "version": "3.7.4",
       "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
       "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
-      "dev": true,
       "requires": {
         "@types/eslint": "*",
         "@types/estree": "*"
@@ -762,8 +15029,7 @@
     "@types/estree": {
       "version": "0.0.51",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
-      "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==",
-      "dev": true
+      "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ=="
     },
     "@types/express": {
       "version": "4.17.15",
@@ -1312,7 +15578,6 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
       "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
-      "dev": true,
       "requires": {
         "@webassemblyjs/helper-numbers": "1.11.1",
         "@webassemblyjs/helper-wasm-bytecode": "1.11.1"
@@ -1321,26 +15586,22 @@
     "@webassemblyjs/floating-point-hex-parser": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
-      "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==",
-      "dev": true
+      "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ=="
     },
     "@webassemblyjs/helper-api-error": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
-      "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==",
-      "dev": true
+      "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg=="
     },
     "@webassemblyjs/helper-buffer": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
-      "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==",
-      "dev": true
+      "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA=="
     },
     "@webassemblyjs/helper-numbers": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
       "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==",
-      "dev": true,
       "requires": {
         "@webassemblyjs/floating-point-hex-parser": "1.11.1",
         "@webassemblyjs/helper-api-error": "1.11.1",
@@ -1350,14 +15611,12 @@
     "@webassemblyjs/helper-wasm-bytecode": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
-      "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==",
-      "dev": true
+      "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q=="
     },
     "@webassemblyjs/helper-wasm-section": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
       "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==",
-      "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/helper-buffer": "1.11.1",
@@ -1369,7 +15628,6 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
       "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==",
-      "dev": true,
       "requires": {
         "@xtuc/ieee754": "^1.2.0"
       }
@@ -1378,7 +15636,6 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
       "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==",
-      "dev": true,
       "requires": {
         "@xtuc/long": "4.2.2"
       }
@@ -1386,14 +15643,12 @@
     "@webassemblyjs/utf8": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
-      "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==",
-      "dev": true
+      "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ=="
     },
     "@webassemblyjs/wasm-edit": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
       "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==",
-      "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/helper-buffer": "1.11.1",
@@ -1409,7 +15664,6 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
       "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==",
-      "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
@@ -1422,7 +15676,6 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
       "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==",
-      "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/helper-buffer": "1.11.1",
@@ -1434,7 +15687,6 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
       "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==",
-      "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/helper-api-error": "1.11.1",
@@ -1448,7 +15700,6 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
       "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==",
-      "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
         "@xtuc/long": "4.2.2"
@@ -1458,31 +15709,32 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.0.1.tgz",
       "integrity": "sha512-njsdJXJSiS2iNbQVS0eT8A/KPnmyH4pv1APj2K0d1wrZcBLw+yppxOy4CGqa0OxDJkzfL/XELDhD8rocnIwB5A==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "@webpack-cli/info": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-2.0.1.tgz",
       "integrity": "sha512-fE1UEWTwsAxRhrJNikE7v4EotYflkEhBL7EbajfkPlf6E37/2QshOy/D48Mw8G5XMFlQtS6YV42vtbG9zBpIQA==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "@webpack-cli/serve": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-2.0.1.tgz",
       "integrity": "sha512-0G7tNyS+yW8TdgHwZKlDWYXFA6OJQnoLCQvYKkQP0Q2X205PSQ6RNUj0M+1OB/9gRQaUZ/ccYfaxd0nhaWKfjw==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "@xtuc/ieee754": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-      "dev": true
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="
     },
     "@xtuc/long": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-      "dev": true
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
     },
     "abab": {
       "version": "2.0.6",
@@ -1533,13 +15785,14 @@
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
       "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
-      "dev": true
+      "requires": {}
     },
     "acorn-jsx": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "acorn-walk": {
       "version": "8.2.0",
@@ -1599,7 +15852,8 @@
     "ajv-keywords": {
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "requires": {}
     },
     "ansi-colors": {
       "version": "3.2.3",
@@ -1914,7 +16168,8 @@
     "bootstrap": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.4.1.tgz",
-      "integrity": "sha512-tbx5cHubwE6e2ZG7nqM3g/FZ5PQEDMWmMGNrCUBVRPHXTJaH7CBDdsLeu3eCh3B1tzAxTnAbtmrzvWEvT2NNEA=="
+      "integrity": "sha512-tbx5cHubwE6e2ZG7nqM3g/FZ5PQEDMWmMGNrCUBVRPHXTJaH7CBDdsLeu3eCh3B1tzAxTnAbtmrzvWEvT2NNEA==",
+      "requires": {}
     },
     "bootstrap-colorpicker": {
       "version": "3.4.0",
@@ -2073,7 +16328,6 @@
       "version": "4.21.4",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
       "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
-      "dev": true,
       "requires": {
         "caniuse-lite": "^1.0.30001400",
         "electron-to-chromium": "^1.4.251",
@@ -2186,8 +16440,7 @@
     "caniuse-lite": {
       "version": "1.0.30001441",
       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001441.tgz",
-      "integrity": "sha512-OyxRR4Vof59I3yGWXws6i908EtGbMzVUi3ganaZQHmydk1iwDhRnvaPG2WaR0KcqrDFKrxVZHULT396LEPhXfg==",
-      "dev": true
+      "integrity": "sha512-OyxRR4Vof59I3yGWXws6i908EtGbMzVUi3ganaZQHmydk1iwDhRnvaPG2WaR0KcqrDFKrxVZHULT396LEPhXfg=="
     },
     "chai": {
       "version": "4.3.7",
@@ -2251,8 +16504,7 @@
     "chrome-trace-event": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
-      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
-      "dev": true
+      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg=="
     },
     "cipher-base": {
       "version": "1.0.4",
@@ -2726,7 +16978,8 @@
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz",
       "integrity": "sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "css-rule-stream": {
       "version": "1.1.0",
@@ -3405,8 +17658,7 @@
     "electron-to-chromium": {
       "version": "1.4.284",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz",
-      "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==",
-      "dev": true
+      "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA=="
     },
     "elliptic": {
       "version": "6.5.4",
@@ -3557,8 +17809,7 @@
     "es-module-lexer": {
       "version": "0.9.3",
       "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
-      "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
-      "dev": true
+      "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ=="
     },
     "es-shim-unscopables": {
       "version": "1.0.0",
@@ -3779,8 +18030,7 @@
     "escalade": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-      "dev": true
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
     },
     "escape-html": {
       "version": "1.0.3",
@@ -4190,7 +18440,6 @@
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
       "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
       "requires": {
         "esrecurse": "^4.3.0",
         "estraverse": "^4.1.1"
@@ -4257,7 +18506,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
       "requires": {
         "estraverse": "^5.2.0"
       },
@@ -4265,16 +18513,14 @@
         "estraverse": {
           "version": "5.3.0",
           "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-          "dev": true
+          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
         }
       }
     },
     "estraverse": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
     },
     "estree-walker": {
       "version": "2.0.2",
@@ -4343,7 +18589,8 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/expose-loader/-/expose-loader-4.0.0.tgz",
       "integrity": "sha512-kUEvHyf6MPR2ubZCL9aziP9Br5wxMvq1cghTpYhM6MW52NPq+7hXixw2EqQuI1SvGb1fDjc2ehJOg6645wR6ww==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "express": {
       "version": "4.18.2",
@@ -4895,8 +19142,7 @@
     "glob-to-regexp": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
-      "dev": true
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="
     },
     "global-modules": {
       "version": "2.0.0",
@@ -4991,8 +19237,7 @@
     "graceful-fs": {
       "version": "4.2.10",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-      "dev": true
+      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
     },
     "grapheme-splitter": {
       "version": "1.0.4",
@@ -5352,7 +19597,8 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
       "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "ieee754": {
       "version": "1.2.1",
@@ -5835,8 +20081,7 @@
     "json-parse-even-better-errors": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
     },
     "json-schema-traverse": {
       "version": "0.4.1",
@@ -5961,8 +20206,7 @@
     "loader-runner": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
-      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
-      "dev": true
+      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg=="
     },
     "loader-utils": {
       "version": "2.0.4",
@@ -6209,14 +20453,12 @@
     "mime-db": {
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "dev": true
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
     },
     "mime-types": {
       "version": "2.1.35",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dev": true,
       "requires": {
         "mime-db": "1.52.0"
       }
@@ -6582,8 +20824,7 @@
     "neo-async": {
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-      "dev": true
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
     },
     "no-case": {
       "version": "3.0.4",
@@ -6667,8 +20908,7 @@
     "node-releases": {
       "version": "2.0.8",
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.8.tgz",
-      "integrity": "sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A==",
-      "dev": true
+      "integrity": "sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A=="
     },
     "normalize-package-data": {
       "version": "3.0.3",
@@ -7325,13 +21565,15 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz",
       "integrity": "sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-gap-properties": {
       "version": "3.0.5",
       "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.5.tgz",
       "integrity": "sha512-IuE6gKSdoUNcvkGIqdtjtcMtZIFyXZhmFd5RUlg97iVEvp1BZKV5ngsAjCjrVy+14uhGBQl9tzmi1Qwq4kqVOg==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-image-set-function": {
       "version": "4.0.7",
@@ -7346,7 +21588,8 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-4.0.1.tgz",
       "integrity": "sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-lab-function": {
       "version": "4.2.1",
@@ -7399,13 +21642,15 @@
       "version": "5.0.4",
       "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-5.0.4.tgz",
       "integrity": "sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-media-minmax": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz",
       "integrity": "sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-media-query-parser": {
       "version": "0.2.3",
@@ -7417,7 +21662,8 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
       "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-modules-local-by-default": {
       "version": "4.0.0",
@@ -7462,7 +21708,8 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/postcss-opacity-percentage/-/postcss-opacity-percentage-1.1.3.tgz",
       "integrity": "sha512-An6Ba4pHBiDtyVpSLymUUERMo2cU7s+Obz6BTrS+gxkbnSBNKSuD0AVUc+CpBMrpVPKKfoVz0WQCX+Tnst0i4A==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-overflow-shorthand": {
       "version": "3.0.4",
@@ -7477,7 +21724,8 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-3.0.4.tgz",
       "integrity": "sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-place": {
       "version": "7.0.5",
@@ -7558,7 +21806,8 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz",
       "integrity": "sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-resolve-nested-selector": {
       "version": "0.1.1",
@@ -7570,13 +21819,15 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz",
       "integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-scss": {
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.6.tgz",
       "integrity": "sha512-rLDPhJY4z/i4nVFZ27j9GqLxj1pwxE80eAzUNRMXtcpipFYIeowerzBgG3yJhMtObGEXidtIgbUpQ3eLDsf5OQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-selector-not": {
       "version": "6.0.1",
@@ -7601,7 +21852,8 @@
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-7.0.1.tgz",
       "integrity": "sha512-iLBFYz6VRYyLJEJsBJ8M3TCqNcckVzz4wFounSc5Oez35ogE/X+aoC5fFu103Ot7NyvjU3/xqIXn93Gp3kJk4g==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-value-parser": {
       "version": "4.2.0",
@@ -8789,6 +23041,15 @@
         "xtend": "^4.0.0"
       }
     },
+    "string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
     "string-width": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -8822,15 +23083,6 @@
         "es-abstract": "^1.20.4"
       }
     },
-    "string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
     "strip-ansi": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
@@ -8877,7 +23129,8 @@
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.1.tgz",
       "integrity": "sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "style-search": {
       "version": "0.1.0",
@@ -8968,7 +23221,8 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-7.0.0.tgz",
       "integrity": "sha512-yGn84Bf/q41J4luis1AZ95gj0EQwRX8lWmGmBwkwBNSkpGSpl66XcPTulxGa/Z91aPoNGuIGBmFkcM1MejMo9Q==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "stylelint-config-recommended-scss": {
       "version": "5.0.2",
@@ -8985,7 +23239,8 @@
           "version": "6.0.0",
           "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-6.0.0.tgz",
           "integrity": "sha512-ZorSSdyMcxWpROYUvLEMm0vSZud2uB7tX1hzBZwvVY9SV/uly4AvvJPPhCcymZL3fcQhEQG5AELmrxWqtmzacw==",
-          "dev": true
+          "dev": true,
+          "requires": {}
         }
       }
     },
@@ -9012,7 +23267,8 @@
           "version": "6.0.0",
           "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-6.0.0.tgz",
           "integrity": "sha512-ZorSSdyMcxWpROYUvLEMm0vSZud2uB7tX1hzBZwvVY9SV/uly4AvvJPPhCcymZL3fcQhEQG5AELmrxWqtmzacw==",
-          "dev": true
+          "dev": true,
+          "requires": {}
         },
         "stylelint-config-standard": {
           "version": "24.0.0",
@@ -9166,8 +23422,7 @@
     "tapable": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
-      "dev": true
+      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="
     },
     "terser": {
       "version": "5.16.1",
@@ -9573,7 +23828,6 @@
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
       "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
-      "dev": true,
       "requires": {
         "escalade": "^3.1.1",
         "picocolors": "^1.0.0"
@@ -9932,7 +24186,6 @@
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
       "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
-      "dev": true,
       "requires": {
         "glob-to-regexp": "^0.4.1",
         "graceful-fs": "^4.1.2"
@@ -9957,7 +24210,6 @@
       "version": "5.75.0",
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz",
       "integrity": "sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==",
-      "dev": true,
       "requires": {
         "@types/eslint-scope": "^3.7.3",
         "@types/estree": "^0.0.51",
@@ -9989,7 +24241,6 @@
           "version": "5.12.0",
           "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz",
           "integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==",
-          "dev": true,
           "requires": {
             "graceful-fs": "^4.2.4",
             "tapable": "^2.2.0"
@@ -9999,7 +24250,6 @@
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
           "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-          "dev": true,
           "requires": {
             "@types/json-schema": "^7.0.8",
             "ajv": "^6.12.5",
@@ -10009,8 +24259,7 @@
         "webpack-sources": {
           "version": "3.2.3",
           "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-          "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
-          "dev": true
+          "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w=="
         }
       }
     },
@@ -10390,7 +24639,8 @@
       "version": "8.11.0",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
       "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "xml-name-validator": {
       "version": "4.0.0",
diff --git a/themes/package-lock.json b/themes/package-lock.json
index 93bd52ca101b1..2367cbb438c64 100644
--- a/themes/package-lock.json
+++ b/themes/package-lock.json
@@ -1,8 +1,5279 @@
 {
   "name": "prestashop-core-theme-js",
   "version": "1.7.5",
-  "lockfileVersion": 1,
+  "lockfileVersion": 2,
   "requires": true,
+  "packages": {
+    "": {
+      "name": "prestashop-core-theme-js",
+      "version": "1.7.5",
+      "license": "OSL-3.0",
+      "dependencies": {
+        "@prestashop-core/jquery.live-polyfill": "^1.1.2",
+        "jquery": "^3.5.1",
+        "jquery-migrate": "^3.1.0",
+        "jquery.browser": "^0.1.0",
+        "punycode": "^2.1.1",
+        "zxcvbn": "^4.4.2"
+      },
+      "devDependencies": {
+        "babel-eslint": "^10.0.3",
+        "esbuild-loader": "^2.15.1",
+        "eslint": "^6.8.0",
+        "eslint-config-airbnb-base": "^14.0.0",
+        "eslint-import-resolver-webpack": "^0.12.1",
+        "eslint-plugin-html": "^6.0.0",
+        "eslint-plugin-import": "^2.20.0",
+        "mini-css-extract-plugin": "^2.6.1",
+        "path": "^0.12.7",
+        "webpack": "^5.37.1",
+        "webpack-cli": "^4.7.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+      "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
+      "dev": true
+    },
+    "node_modules/@discoveryjs/json-ext": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz",
+      "integrity": "sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/@prestashop-core/jquery.live-polyfill": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@prestashop-core/jquery.live-polyfill/-/jquery.live-polyfill-1.1.2.tgz",
+      "integrity": "sha512-nBq6BmiGi2N+FY+aO6SVRDN8In7K5OQaK13VlVCtwYgpKfC7Rs87rFMwSujDMkswSvca6XEcgoWP1jPYyjcUqA==",
+      "dependencies": {
+        "jquery": ">=1.9"
+      }
+    },
+    "node_modules/@types/color-name": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
+      "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
+      "dev": true
+    },
+    "node_modules/@types/eslint": {
+      "version": "7.2.10",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.10.tgz",
+      "integrity": "sha512-kUEPnMKrqbtpCq/KTaGFFKAcz6Ethm2EjCoKIDaCmfRBWLbFuTcOJfTlorwbnboXBzahqWLgUp1BQeKHiJzPUQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/estree": "*",
+        "@types/json-schema": "*"
+      }
+    },
+    "node_modules/@types/eslint-scope": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.0.tgz",
+      "integrity": "sha512-O/ql2+rrCUe2W2rs7wMR+GqPRcgB6UiqN5RhrR5xruFlY7l9YLMn0ZkDzjoHLeiFkR8MCQZVudUuuvQ2BLC9Qw==",
+      "dev": true,
+      "dependencies": {
+        "@types/eslint": "*",
+        "@types/estree": "*"
+      }
+    },
+    "node_modules/@types/estree": {
+      "version": "0.0.47",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.47.tgz",
+      "integrity": "sha512-c5ciR06jK8u9BstrmJyO97m+klJrrhCf9u3rLu3DEAJBirxRqSCvDQoYKmxuYwQI5SZChAWu+tq9oVlGRuzPAg==",
+      "dev": true
+    },
+    "node_modules/@types/json-schema": {
+      "version": "7.0.11",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
+      "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
+      "dev": true
+    },
+    "node_modules/@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
+      "dev": true
+    },
+    "node_modules/@types/node": {
+      "version": "15.3.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.3.0.tgz",
+      "integrity": "sha512-8/bnjSZD86ZfpBsDlCIkNXIvm+h6wi9g7IqL+kmFkQ+Wvu3JrasgLElfiPgoo8V8vVfnEi0QVS12gbl94h9YsQ==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/ast": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.0.tgz",
+      "integrity": "sha512-kX2W49LWsbthrmIRMbQZuQDhGtjyqXfEmmHyEi4XWnSZtPmxY0+3anPIzsnRb45VH/J55zlOfWvZuY47aJZTJg==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/helper-numbers": "1.11.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.0"
+      }
+    },
+    "node_modules/@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.0.tgz",
+      "integrity": "sha512-Q/aVYs/VnPDVYvsCBL/gSgwmfjeCb4LW8+TMrO3cSzJImgv8lxxEPM2JA5jMrivE7LSz3V+PFqtMbls3m1exDA==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/helper-api-error": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.0.tgz",
+      "integrity": "sha512-baT/va95eXiXb2QflSx95QGT5ClzWpGaa8L7JnJbgzoYeaA27FCvuBXU758l+KXWRndEmUXjP0Q5fibhavIn8w==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/helper-buffer": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.0.tgz",
+      "integrity": "sha512-u9HPBEl4DS+vA8qLQdEQ6N/eJQ7gT7aNvMIo8AAWvAl/xMrcOSiI2M0MAnMCy3jIFke7bEee/JwdX1nUpCtdyA==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/helper-numbers": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.0.tgz",
+      "integrity": "sha512-DhRQKelIj01s5IgdsOJMKLppI+4zpmcMQ3XboFPLwCpSNH6Hqo1ritgHgD0nqHeSYqofA6aBN/NmXuGjM1jEfQ==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/floating-point-hex-parser": "1.11.0",
+        "@webassemblyjs/helper-api-error": "1.11.0",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.0.tgz",
+      "integrity": "sha512-MbmhvxXExm542tWREgSFnOVo07fDpsBJg3sIl6fSp9xuu75eGz5lz31q7wTLffwL3Za7XNRCMZy210+tnsUSEA==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/helper-wasm-section": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.0.tgz",
+      "integrity": "sha512-3Eb88hcbfY/FCukrg6i3EH8H2UsD7x8Vy47iVJrP967A9JGqgBVL9aH71SETPx1JrGsOUVLo0c7vMCN22ytJew==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.0",
+        "@webassemblyjs/helper-buffer": "1.11.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.0",
+        "@webassemblyjs/wasm-gen": "1.11.0"
+      }
+    },
+    "node_modules/@webassemblyjs/ieee754": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.0.tgz",
+      "integrity": "sha512-KXzOqpcYQwAfeQ6WbF6HXo+0udBNmw0iXDmEK5sFlmQdmND+tr773Ti8/5T/M6Tl/413ArSJErATd8In3B+WBA==",
+      "dev": true,
+      "dependencies": {
+        "@xtuc/ieee754": "^1.2.0"
+      }
+    },
+    "node_modules/@webassemblyjs/leb128": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.0.tgz",
+      "integrity": "sha512-aqbsHa1mSQAbeeNcl38un6qVY++hh8OpCOzxhixSYgbRfNWcxJNJQwe2rezK9XEcssJbbWIkblaJRwGMS9zp+g==",
+      "dev": true,
+      "dependencies": {
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/utf8": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.0.tgz",
+      "integrity": "sha512-A/lclGxH6SpSLSyFowMzO/+aDEPU4hvEiooCMXQPcQFPPJaYcPQNKGOCLUySJsYJ4trbpr+Fs08n4jelkVTGVw==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/wasm-edit": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.0.tgz",
+      "integrity": "sha512-JHQ0damXy0G6J9ucyKVXO2j08JVJ2ntkdJlq1UTiUrIgfGMmA7Ik5VdC/L8hBK46kVJgujkBIoMtT8yVr+yVOQ==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.0",
+        "@webassemblyjs/helper-buffer": "1.11.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.0",
+        "@webassemblyjs/helper-wasm-section": "1.11.0",
+        "@webassemblyjs/wasm-gen": "1.11.0",
+        "@webassemblyjs/wasm-opt": "1.11.0",
+        "@webassemblyjs/wasm-parser": "1.11.0",
+        "@webassemblyjs/wast-printer": "1.11.0"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-gen": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.0.tgz",
+      "integrity": "sha512-BEUv1aj0WptCZ9kIS30th5ILASUnAPEvE3tVMTrItnZRT9tXCLW2LEXT8ezLw59rqPP9klh9LPmpU+WmRQmCPQ==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.0",
+        "@webassemblyjs/ieee754": "1.11.0",
+        "@webassemblyjs/leb128": "1.11.0",
+        "@webassemblyjs/utf8": "1.11.0"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-opt": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.0.tgz",
+      "integrity": "sha512-tHUSP5F4ywyh3hZ0+fDQuWxKx3mJiPeFufg+9gwTpYp324mPCQgnuVKwzLTZVqj0duRDovnPaZqDwoyhIO8kYg==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.0",
+        "@webassemblyjs/helper-buffer": "1.11.0",
+        "@webassemblyjs/wasm-gen": "1.11.0",
+        "@webassemblyjs/wasm-parser": "1.11.0"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-parser": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.0.tgz",
+      "integrity": "sha512-6L285Sgu9gphrcpDXINvm0M9BskznnzJTE7gYkjDbxET28shDqp27wpruyx3C2S/dvEwiigBwLA1cz7lNUi0kw==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.0",
+        "@webassemblyjs/helper-api-error": "1.11.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.0",
+        "@webassemblyjs/ieee754": "1.11.0",
+        "@webassemblyjs/leb128": "1.11.0",
+        "@webassemblyjs/utf8": "1.11.0"
+      }
+    },
+    "node_modules/@webassemblyjs/wast-printer": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.0.tgz",
+      "integrity": "sha512-Fg5OX46pRdTgB7rKIUojkh9vXaVN6sGYCnEiJN1GYkb0RPwShZXp6KTDqmoMdQPKhcroOXh3fEzmkWmCYaKYhQ==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.0",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webpack-cli/configtest": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.3.tgz",
+      "integrity": "sha512-WQs0ep98FXX2XBAfQpRbY0Ma6ADw8JR6xoIkaIiJIzClGOMqVRvPCWqndTxf28DgFopWan0EKtHtg/5W1h0Zkw==",
+      "dev": true,
+      "peerDependencies": {
+        "webpack": "4.x.x || 5.x.x",
+        "webpack-cli": "4.x.x"
+      }
+    },
+    "node_modules/@webpack-cli/info": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.2.4.tgz",
+      "integrity": "sha512-ogE2T4+pLhTTPS/8MM3IjHn0IYplKM4HbVNMCWA9N4NrdPzunwenpCsqKEXyejMfRu6K8mhauIPYf8ZxWG5O6g==",
+      "dev": true,
+      "dependencies": {
+        "envinfo": "^7.7.3"
+      },
+      "peerDependencies": {
+        "webpack-cli": "4.x.x"
+      }
+    },
+    "node_modules/@webpack-cli/serve": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.4.0.tgz",
+      "integrity": "sha512-xgT/HqJ+uLWGX+Mzufusl3cgjAcnqYYskaB7o0vRcwOEfuu6hMzSILQpnIzFMGsTaeaX4Nnekl+6fadLbl1/Vg==",
+      "dev": true,
+      "peerDependencies": {
+        "webpack-cli": "4.x.x"
+      },
+      "peerDependenciesMeta": {
+        "webpack-dev-server": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@xtuc/ieee754": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+      "dev": true
+    },
+    "node_modules/@xtuc/long": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+      "dev": true
+    },
+    "node_modules/acorn": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-jsx": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz",
+      "integrity": "sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==",
+      "dev": true,
+      "peerDependencies": {
+        "acorn": "^6.0.0 || ^7.0.0"
+      }
+    },
+    "node_modules/ajv": {
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
+      "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ajv-formats": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
+      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ajv": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/ajv-keywords": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3"
+      },
+      "peerDependencies": {
+        "ajv": "^8.8.2"
+      }
+    },
+    "node_modules/ajv/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
+    },
+    "node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/array-find": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-find/-/array-find-1.0.0.tgz",
+      "integrity": "sha1-bI4obRHtdoMn+OYuzuhzU8o+eLg=",
+      "dev": true
+    },
+    "node_modules/array-includes": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.1.tgz",
+      "integrity": "sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0",
+        "is-string": "^1.0.5"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/es-abstract": {
+      "version": "1.17.6",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
+      "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
+      "dev": true,
+      "dependencies": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.0",
+        "is-regex": "^1.1.0",
+        "object-inspect": "^1.7.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.0",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/is-callable": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
+      "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/is-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
+      "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/is-symbol": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
+      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/array.prototype.flat": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz",
+      "integrity": "sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flat/node_modules/es-abstract": {
+      "version": "1.17.6",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
+      "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
+      "dev": true,
+      "dependencies": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.0",
+        "is-regex": "^1.1.0",
+        "object-inspect": "^1.7.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.0",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flat/node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flat/node_modules/is-callable": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
+      "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flat/node_modules/is-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
+      "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flat/node_modules/is-symbol": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
+      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flat/node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/asn1.js": {
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
+      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "node_modules/assert": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
+      "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
+      "dev": true,
+      "dependencies": {
+        "util": "0.10.3"
+      }
+    },
+    "node_modules/assert/node_modules/inherits": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+      "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+      "dev": true
+    },
+    "node_modules/assert/node_modules/util": {
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+      "dev": true,
+      "dependencies": {
+        "inherits": "2.0.1"
+      }
+    },
+    "node_modules/astral-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
+      "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/babel-eslint": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.1.0.tgz",
+      "integrity": "sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==",
+      "deprecated": "babel-eslint is now @babel/eslint-parser. This package will no longer receive updates.",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "@babel/parser": "^7.7.0",
+        "@babel/traverse": "^7.7.0",
+        "@babel/types": "^7.7.0",
+        "eslint-visitor-keys": "^1.0.0",
+        "resolve": "^1.12.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "peerDependencies": {
+        "eslint": ">= 4.12.1"
+      }
+    },
+    "node_modules/babel-eslint/node_modules/@babel/code-frame": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+      "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/highlight": "^7.10.4"
+      }
+    },
+    "node_modules/babel-eslint/node_modules/@babel/generator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.4.tgz",
+      "integrity": "sha512-toLIHUIAgcQygFZRAQcsLQV3CBuX6yOIru1kJk/qqqvcRmZrYe6WavZTSG+bB8MxhnL9YPf+pKQfuiP161q7ng==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.10.4",
+        "jsesc": "^2.5.1",
+        "lodash": "^4.17.13",
+        "source-map": "^0.5.0"
+      }
+    },
+    "node_modules/babel-eslint/node_modules/@babel/helper-function-name": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
+      "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-get-function-arity": "^7.10.4",
+        "@babel/template": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/babel-eslint/node_modules/@babel/helper-get-function-arity": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
+      "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/babel-eslint/node_modules/@babel/helper-split-export-declaration": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.4.tgz",
+      "integrity": "sha512-pySBTeoUff56fL5CBU2hWm9TesA4r/rOkI9DyJLvvgz09MB9YtfIYe3iBriVaYNaPe+Alua0vBIOVOLs2buWhg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/babel-eslint/node_modules/@babel/highlight": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
+      "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.10.4",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      }
+    },
+    "node_modules/babel-eslint/node_modules/@babel/parser": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.4.tgz",
+      "integrity": "sha512-8jHII4hf+YVDsskTF6WuMB3X4Eh+PsUkC2ljq22so5rHvH+T8BzyL94VOdyFLNR8tBSVXOTbNHOKpR4TfRxVtA==",
+      "dev": true,
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/babel-eslint/node_modules/@babel/template": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+      "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.10.4",
+        "@babel/parser": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/babel-eslint/node_modules/@babel/traverse": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.4.tgz",
+      "integrity": "sha512-aSy7p5THgSYm4YyxNGz6jZpXf+Ok40QF3aA2LyIONkDHpAcJzDUqlCKXv6peqYUs2gmic849C/t2HKw2a2K20Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.10.4",
+        "@babel/generator": "^7.10.4",
+        "@babel/helper-function-name": "^7.10.4",
+        "@babel/helper-split-export-declaration": "^7.10.4",
+        "@babel/parser": "^7.10.4",
+        "@babel/types": "^7.10.4",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0",
+        "lodash": "^4.17.13"
+      }
+    },
+    "node_modules/babel-eslint/node_modules/@babel/types": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.4.tgz",
+      "integrity": "sha512-UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.10.4",
+        "lodash": "^4.17.13",
+        "to-fast-properties": "^2.0.0"
+      }
+    },
+    "node_modules/babel-eslint/node_modules/debug": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/babel-eslint/node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "node_modules/babel-eslint/node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
+    },
+    "node_modules/babel-eslint/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/babel-eslint/node_modules/resolve": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+      "dev": true,
+      "dependencies": {
+        "path-parse": "^1.0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "dev": true
+    },
+    "node_modules/base64-js": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
+      "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==",
+      "dev": true
+    },
+    "node_modules/bn.js": {
+      "version": "4.11.8",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
+      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
+      "dev": true
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/brorand": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
+      "dev": true
+    },
+    "node_modules/browserify-aes": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+      "dev": true,
+      "dependencies": {
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/browserify-cipher": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+      "dev": true,
+      "dependencies": {
+        "browserify-aes": "^1.0.4",
+        "browserify-des": "^1.0.0",
+        "evp_bytestokey": "^1.0.0"
+      }
+    },
+    "node_modules/browserify-des": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+      "dev": true,
+      "dependencies": {
+        "cipher-base": "^1.0.1",
+        "des.js": "^1.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/browserify-rsa": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "randombytes": "^2.0.1"
+      }
+    },
+    "node_modules/browserify-sign": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
+      "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.1.1",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.2",
+        "elliptic": "^6.0.0",
+        "inherits": "^2.0.1",
+        "parse-asn1": "^5.0.0"
+      }
+    },
+    "node_modules/browserify-zlib": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+      "dev": true,
+      "dependencies": {
+        "pako": "~1.0.5"
+      }
+    },
+    "node_modules/buffer": {
+      "version": "4.9.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
+      "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
+      "deprecated": "This version of 'buffer' is out-of-date. You must update to v4.9.2 or newer",
+      "dev": true,
+      "dependencies": {
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4",
+        "isarray": "^1.0.0"
+      }
+    },
+    "node_modules/buffer-from": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
+      "dev": true
+    },
+    "node_modules/buffer-xor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
+      "dev": true
+    },
+    "node_modules/builtin-status-codes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
+      "dev": true
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+      "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/chrome-trace-event": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
+      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
+    "node_modules/cipher-base": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/clone-deep": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.4",
+        "kind-of": "^6.0.2",
+        "shallow-clone": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "1.9.2",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.2.tgz",
+      "integrity": "sha512-3NUJZdhMhcdPn8vJ9v2UQJoH0qqoGUkYTgFEPZaPjEtwmmKUfNV46zZmgB2M5M4DCEQHMaCfWHCxiBflLm04Tg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.1"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.1.tgz",
+      "integrity": "sha1-SxQVMEz1ACjqgWQ2Q72C6gWANok=",
+      "dev": true
+    },
+    "node_modules/colorette": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
+      "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
+      "dev": true
+    },
+    "node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "node_modules/confusing-browser-globals": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.9.tgz",
+      "integrity": "sha512-KbS1Y0jMtyPgIxjO7ZzMAuUpAKMt1SzCL9fsrKsX6b0zJPTaT0SiSPmewwVZg9UAO83HVIlEhZF84LIjZ0lmAw==",
+      "dev": true
+    },
+    "node_modules/console-browserify": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
+      "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
+      "dev": true,
+      "dependencies": {
+        "date-now": "^0.1.4"
+      }
+    },
+    "node_modules/constants-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
+      "dev": true
+    },
+    "node_modules/contains-path": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz",
+      "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "dev": true
+    },
+    "node_modules/create-ecdh": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
+      "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "elliptic": "^6.0.0"
+      }
+    },
+    "node_modules/create-hash": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "dev": true,
+      "dependencies": {
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
+      }
+    },
+    "node_modules/create-hmac": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+      "dev": true,
+      "dependencies": {
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "node_modules/cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "dev": true,
+      "dependencies": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      },
+      "engines": {
+        "node": ">=4.8"
+      }
+    },
+    "node_modules/crypto-browserify": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+      "dev": true,
+      "dependencies": {
+        "browserify-cipher": "^1.0.0",
+        "browserify-sign": "^4.0.0",
+        "create-ecdh": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.0",
+        "diffie-hellman": "^5.0.0",
+        "inherits": "^2.0.1",
+        "pbkdf2": "^3.0.3",
+        "public-encrypt": "^4.0.0",
+        "randombytes": "^2.0.0",
+        "randomfill": "^1.0.3"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/date-now": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
+      "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=",
+      "dev": true
+    },
+    "node_modules/deep-is": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+      "dev": true
+    },
+    "node_modules/define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "dev": true,
+      "dependencies": {
+        "object-keys": "^1.0.12"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/des.js": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
+      "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "node_modules/diffie-hellman": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "miller-rabin": "^4.0.0",
+        "randombytes": "^2.0.0"
+      }
+    },
+    "node_modules/doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/dom-serializer": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
+      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "entities": "^2.0.0"
+      }
+    },
+    "node_modules/domain-browser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
+      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4",
+        "npm": ">=1.2"
+      }
+    },
+    "node_modules/domelementtype": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz",
+      "integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==",
+      "dev": true
+    },
+    "node_modules/domhandler": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-3.0.0.tgz",
+      "integrity": "sha512-eKLdI5v9m67kbXQbJSNn1zjh0SDzvzWVWtX+qEI3eMjZw8daH9k8rlj1FZY9memPwjiskQFbe7vHVVJIAqoEhw==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/domutils": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.1.0.tgz",
+      "integrity": "sha512-CD9M0Dm1iaHfQ1R/TI+z3/JWp/pgub0j4jIQKH89ARR4ATAV2nbaOQS5XxU9maJP5jHaPdDDQSEHuE2UmpUTKg==",
+      "dev": true,
+      "dependencies": {
+        "dom-serializer": "^0.2.1",
+        "domelementtype": "^2.0.1",
+        "domhandler": "^3.0.0"
+      }
+    },
+    "node_modules/elliptic": {
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "brorand": "^1.1.0",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.1",
+        "inherits": "^2.0.4",
+        "minimalistic-assert": "^1.0.1",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "node_modules/elliptic/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
+    "node_modules/elliptic/node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/enhanced-resolve": {
+      "version": "5.8.2",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz",
+      "integrity": "sha512-F27oB3WuHDzvR2DOGNTaYy0D5o0cnrv8TeI482VM4kYgQd/FT9lUQwuNsJ0oOHtBUq7eiW5ytqzp7nBFknL+GA==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.4",
+        "tapable": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/enhanced-resolve/node_modules/graceful-fs": {
+      "version": "4.2.6",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
+      "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==",
+      "dev": true
+    },
+    "node_modules/entities": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz",
+      "integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==",
+      "dev": true
+    },
+    "node_modules/envinfo": {
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz",
+      "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==",
+      "dev": true,
+      "bin": {
+        "envinfo": "dist/cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "node_modules/es-module-lexer": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.4.1.tgz",
+      "integrity": "sha512-ooYciCUtfw6/d2w56UVeqHPcoCFAiJdz5XOkYpv/Txl1HMUozpXjz/2RIQgqwKdXNDPSF1W7mJCFse3G+HDyAA==",
+      "dev": true
+    },
+    "node_modules/esbuild": {
+      "version": "0.12.29",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.12.29.tgz",
+      "integrity": "sha512-w/XuoBCSwepyiZtIRsKsetiLDUVGPVw1E/R3VTFSecIy8UR7Cq3SOtwKHJMFoVqqVG36aGkzh4e8BvpO1Fdc7g==",
+      "dev": true,
+      "hasInstallScript": true,
+      "bin": {
+        "esbuild": "bin/esbuild"
+      }
+    },
+    "node_modules/esbuild-loader": {
+      "version": "2.15.1",
+      "resolved": "https://registry.npmjs.org/esbuild-loader/-/esbuild-loader-2.15.1.tgz",
+      "integrity": "sha512-JRBL6uTeWplMbylNBt9gxLKMjD8wKnqGq786QV/cm/nPBSNA9/kC7/vNwCXTDPfYqHoWsjyfH7ub9ekN0kdAYQ==",
+      "dev": true,
+      "dependencies": {
+        "esbuild": "^0.12.21",
+        "joycon": "^3.0.1",
+        "json5": "^2.2.0",
+        "loader-utils": "^2.0.0",
+        "tapable": "^2.2.0",
+        "type-fest": "^1.4.0",
+        "webpack-sources": "^2.2.0"
+      },
+      "funding": {
+        "url": "https://github.com/privatenumber/esbuild-loader?sponsor=1"
+      },
+      "peerDependencies": {
+        "webpack": "^4.40.0 || ^5.0.0"
+      }
+    },
+    "node_modules/esbuild-loader/node_modules/big.js": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/esbuild-loader/node_modules/emojis-list": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/esbuild-loader/node_modules/json5": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+      "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/esbuild-loader/node_modules/loader-utils": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+      "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=8.9.0"
+      }
+    },
+    "node_modules/esbuild-loader/node_modules/source-list-map": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
+      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
+      "dev": true
+    },
+    "node_modules/esbuild-loader/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/esbuild-loader/node_modules/type-fest": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz",
+      "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/esbuild-loader/node_modules/webpack-sources": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz",
+      "integrity": "sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==",
+      "dev": true,
+      "dependencies": {
+        "source-list-map": "^2.0.1",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/eslint": {
+      "version": "6.8.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz",
+      "integrity": "sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "ajv": "^6.10.0",
+        "chalk": "^2.1.0",
+        "cross-spawn": "^6.0.5",
+        "debug": "^4.0.1",
+        "doctrine": "^3.0.0",
+        "eslint-scope": "^5.0.0",
+        "eslint-utils": "^1.4.3",
+        "eslint-visitor-keys": "^1.1.0",
+        "espree": "^6.1.2",
+        "esquery": "^1.0.1",
+        "esutils": "^2.0.2",
+        "file-entry-cache": "^5.0.1",
+        "functional-red-black-tree": "^1.0.1",
+        "glob-parent": "^5.0.0",
+        "globals": "^12.1.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "inquirer": "^7.0.0",
+        "is-glob": "^4.0.0",
+        "js-yaml": "^3.13.1",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.3.0",
+        "lodash": "^4.17.14",
+        "minimatch": "^3.0.4",
+        "mkdirp": "^0.5.1",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.8.3",
+        "progress": "^2.0.0",
+        "regexpp": "^2.0.1",
+        "semver": "^6.1.2",
+        "strip-ansi": "^5.2.0",
+        "strip-json-comments": "^3.0.1",
+        "table": "^5.2.3",
+        "text-table": "^0.2.0",
+        "v8-compile-cache": "^2.0.3"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-config-airbnb-base": {
+      "version": "14.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.2.0.tgz",
+      "integrity": "sha512-Snswd5oC6nJaevs3nZoLSTvGJBvzTfnBqOIArkf3cbyTyq9UD79wOk8s+RiL6bhca0p/eRO6veczhf6A/7Jy8Q==",
+      "dev": true,
+      "dependencies": {
+        "confusing-browser-globals": "^1.0.9",
+        "object.assign": "^4.1.0",
+        "object.entries": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 6"
+      },
+      "peerDependencies": {
+        "eslint": "^5.16.0 || ^6.8.0 || ^7.2.0",
+        "eslint-plugin-import": "^2.21.2"
+      }
+    },
+    "node_modules/eslint-import-resolver-node": {
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz",
+      "integrity": "sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^2.6.9",
+        "resolve": "^1.13.1"
+      }
+    },
+    "node_modules/eslint-import-resolver-node/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/eslint-import-resolver-node/node_modules/resolve": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+      "dev": true,
+      "dependencies": {
+        "path-parse": "^1.0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/eslint-import-resolver-webpack": {
+      "version": "0.12.2",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.12.2.tgz",
+      "integrity": "sha512-7Jnm4YAoNNkvqPaZkKdIHsKGmv8/uNnYC5QsXkiSodvX4XEEfH2AKOna98FK52fCDXm3q4HzuX+7pRMKkJ64EQ==",
+      "dev": true,
+      "dependencies": {
+        "array-find": "^1.0.0",
+        "debug": "^2.6.9",
+        "enhanced-resolve": "^0.9.1",
+        "find-root": "^1.1.0",
+        "has": "^1.0.3",
+        "interpret": "^1.2.0",
+        "lodash": "^4.17.15",
+        "node-libs-browser": "^1.0.0 || ^2.0.0",
+        "resolve": "^1.13.1",
+        "semver": "^5.7.1"
+      },
+      "peerDependencies": {
+        "eslint-plugin-import": ">=1.4.0",
+        "webpack": ">=1.11.0"
+      }
+    },
+    "node_modules/eslint-import-resolver-webpack/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/eslint-import-resolver-webpack/node_modules/enhanced-resolve": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz",
+      "integrity": "sha1-TW5omzcl+GCQknzMhs2fFjW4ni4=",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "memory-fs": "^0.2.0",
+        "tapable": "^0.1.8"
+      },
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/eslint-import-resolver-webpack/node_modules/interpret": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
+      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/eslint-import-resolver-webpack/node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
+    },
+    "node_modules/eslint-import-resolver-webpack/node_modules/memory-fs": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz",
+      "integrity": "sha1-8rslNovBIeORwlIN6Slpyu4KApA=",
+      "dev": true
+    },
+    "node_modules/eslint-import-resolver-webpack/node_modules/resolve": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+      "dev": true,
+      "dependencies": {
+        "path-parse": "^1.0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/eslint-import-resolver-webpack/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/eslint-import-resolver-webpack/node_modules/tapable": {
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",
+      "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/eslint-module-utils": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz",
+      "integrity": "sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^2.6.9",
+        "pkg-dir": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/eslint-module-utils/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-html": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-html/-/eslint-plugin-html-6.0.2.tgz",
+      "integrity": "sha512-Ik/z32UteKLo8GEfwNqVKcJ/WOz/be4h8N5mbMmxxnZ+9aL9XczOXQFz/bGu+nAGVoRg8CflldxJhONFpqlrxw==",
+      "dev": true,
+      "dependencies": {
+        "htmlparser2": "^4.1.0"
+      }
+    },
+    "node_modules/eslint-plugin-import": {
+      "version": "2.22.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.0.tgz",
+      "integrity": "sha512-66Fpf1Ln6aIS5Gr/55ts19eUuoDhAbZgnr6UxK5hbDx6l/QgQgx61AePq+BV4PP2uXQFClgMVzep5zZ94qqsxg==",
+      "dev": true,
+      "dependencies": {
+        "array-includes": "^3.1.1",
+        "array.prototype.flat": "^1.2.3",
+        "contains-path": "^0.1.0",
+        "debug": "^2.6.9",
+        "doctrine": "1.5.0",
+        "eslint-import-resolver-node": "^0.3.3",
+        "eslint-module-utils": "^2.6.0",
+        "has": "^1.0.3",
+        "minimatch": "^3.0.4",
+        "object.values": "^1.1.1",
+        "read-pkg-up": "^2.0.0",
+        "resolve": "^1.17.0",
+        "tsconfig-paths": "^3.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/doctrine": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
+      "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2",
+        "isarray": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/resolve": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+      "dev": true,
+      "dependencies": {
+        "path-parse": "^1.0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/eslint-scope/node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/eslint-scope/node_modules/esrecurse/node_modules/estraverse": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/eslint-utils": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
+      "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/eslint-visitor-keys": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/eslint/node_modules/@babel/code-frame": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+      "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/highlight": "^7.10.4"
+      }
+    },
+    "node_modules/eslint/node_modules/@babel/highlight": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
+      "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.10.4",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      }
+    },
+    "node_modules/eslint/node_modules/ajv": {
+      "version": "6.12.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/eslint/node_modules/ansi-escapes": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
+      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.11.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/ansi-escapes/node_modules/type-fest": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
+      "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/ansi-styles": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+      "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+      "dev": true,
+      "dependencies": {
+        "@types/color-name": "^1.1.1",
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/eslint/node_modules/chardet": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
+      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
+      "dev": true
+    },
+    "node_modules/eslint/node_modules/cli-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+      "dev": true,
+      "dependencies": {
+        "restore-cursor": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/cli-width": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
+      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/eslint/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/eslint/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/eslint/node_modules/debug": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint/node_modules/eslint-scope": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.0.tgz",
+      "integrity": "sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/eslint/node_modules/external-editor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
+      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
+      "dev": true,
+      "dependencies": {
+        "chardet": "^0.7.0",
+        "iconv-lite": "^0.4.24",
+        "tmp": "^0.0.33"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/eslint/node_modules/figures": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+      "dev": true,
+      "dependencies": {
+        "escape-string-regexp": "^1.0.5"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/glob-parent": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/eslint/node_modules/glob-parent/node_modules/is-glob": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eslint/node_modules/globals": {
+      "version": "12.4.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
+      "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.8.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dev": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eslint/node_modules/inquirer": {
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.0.tgz",
+      "integrity": "sha512-K+LZp6L/6eE5swqIcVXrxl21aGDU4S50gKH0/d96OMQnSBCyGyZl/oZhbkVmdp5sBoINHd4xZvFSARh2dk6DWA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.1.0",
+        "cli-cursor": "^3.1.0",
+        "cli-width": "^3.0.0",
+        "external-editor": "^3.0.3",
+        "figures": "^3.0.0",
+        "lodash": "^4.17.15",
+        "mute-stream": "0.0.8",
+        "run-async": "^2.4.0",
+        "rxjs": "^6.6.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "through": "^2.3.6"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/eslint/node_modules/inquirer/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/eslint/node_modules/inquirer/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "node_modules/eslint/node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
+    },
+    "node_modules/eslint/node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/eslint/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/eslint/node_modules/mute-stream": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
+      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
+      "dev": true
+    },
+    "node_modules/eslint/node_modules/onetime": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz",
+      "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==",
+      "dev": true,
+      "dependencies": {
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/eslint/node_modules/restore-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "dev": true,
+      "dependencies": {
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/run-async": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
+      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/eslint/node_modules/rxjs": {
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.0.tgz",
+      "integrity": "sha512-3HMA8z/Oz61DUHe+SdOiQyzIf4tOx5oQHmMir7IZEu6TMqCLHT4LRcmNaUS0NwOz8VLvmmBduMsoaUvMaIiqzg==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
+    "node_modules/eslint/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/eslint/node_modules/string-width": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/string-width/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/eslint/node_modules/strip-ansi/node_modules/ansi-regex": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/eslint/node_modules/supports-color": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+      "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/v8-compile-cache": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz",
+      "integrity": "sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==",
+      "dev": true
+    },
+    "node_modules/espree": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz",
+      "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^7.1.1",
+        "acorn-jsx": "^5.2.0",
+        "eslint-visitor-keys": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/esquery": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz",
+      "integrity": "sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/esquery/node_modules/estraverse": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.1.0.tgz",
+      "integrity": "sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esrecurse": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
+      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/esutils": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/events": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.x"
+      }
+    },
+    "node_modules/evp_bytestokey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "dev": true,
+      "dependencies": {
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/execa": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz",
+      "integrity": "sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
+        "strip-final-newline": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/execa/node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/execa/node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/execa/node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/execa/node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/execa/node_modules/signal-exit": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
+      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
+      "dev": true
+    },
+    "node_modules/execa/node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
+      "dev": true
+    },
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "dev": true
+    },
+    "node_modules/fastest-levenshtein": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
+      "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==",
+      "dev": true
+    },
+    "node_modules/file-entry-cache": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
+      "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
+      "dev": true,
+      "dependencies": {
+        "flat-cache": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/find-root": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
+      "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==",
+      "dev": true
+    },
+    "node_modules/find-up": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/flat-cache": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
+      "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
+      "dev": true,
+      "dependencies": {
+        "flatted": "^2.0.0",
+        "rimraf": "2.6.3",
+        "write": "1.0.3"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/flat-cache/node_modules/glob": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/flat-cache/node_modules/rimraf": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/flatted": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz",
+      "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==",
+      "dev": true
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "node_modules/functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+      "dev": true
+    },
+    "node_modules/get-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/glob-to-regexp": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
+      "dev": true
+    },
+    "node_modules/globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
+      "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/hash-base": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
+      "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/hash.js": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
+      }
+    },
+    "node_modules/hmac-drbg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+      "dev": true,
+      "dependencies": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "node_modules/hosted-git-info": {
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+      "dev": true
+    },
+    "node_modules/htmlparser2": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-4.1.0.tgz",
+      "integrity": "sha512-4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^3.0.0",
+        "domutils": "^2.0.0",
+        "entities": "^2.0.0"
+      }
+    },
+    "node_modules/https-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
+      "dev": true
+    },
+    "node_modules/human-signals": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.17.0"
+      }
+    },
+    "node_modules/ieee754": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz",
+      "integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==",
+      "dev": true
+    },
+    "node_modules/ignore": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/import-fresh": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
+      "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==",
+      "dev": true,
+      "dependencies": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/import-fresh/node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/import-local": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
+      "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==",
+      "dev": true,
+      "dependencies": {
+        "pkg-dir": "^4.2.0",
+        "resolve-cwd": "^3.0.0"
+      },
+      "bin": {
+        "import-local-fixture": "fixtures/cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/import-local/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/import-local/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/import-local/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/import-local/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/import-local/node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/import-local/node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/indexof": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
+      "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
+      "dev": true
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "dev": true
+    },
+    "node_modules/interpret": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz",
+      "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+      "dev": true
+    },
+    "node_modules/is-core-module": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz",
+      "integrity": "sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==",
+      "dev": true,
+      "dependencies": {
+        "has": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-date-object": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
+      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz",
+      "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
+      "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-string": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz",
+      "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
+    "node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/jest-worker": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
+      "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/jest-worker/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-worker/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/joycon": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/joycon/-/joycon-3.0.1.tgz",
+      "integrity": "sha512-SJcJNBg32dGgxhPtM0wQqxqV0ax9k/9TaUskGDSJkSFSQOEWWvQ3zzWdGQRIUry2j1zA5+ReH13t0Mf3StuVZA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/jquery": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
+      "integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg=="
+    },
+    "node_modules/jquery-migrate": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/jquery-migrate/-/jquery-migrate-3.1.0.tgz",
+      "integrity": "sha512-u/MtE1ST2pCr3rCyouJG2xMiw/k3OzLNeRKprjKTeHUezCGr0DyEgeXFdqFLmQfxfR5EsVu+mGo/sCcYdiYcIQ==",
+      "peerDependencies": {
+        "jquery": ">=3 <4"
+      }
+    },
+    "node_modules/jquery.browser": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/jquery.browser/-/jquery.browser-0.1.0.tgz",
+      "integrity": "sha1-nHKmCV/SgUtER26o9xZne3Kmors=",
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/js-yaml": {
+      "version": "3.14.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
+      "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/jsesc": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.1.tgz",
+      "integrity": "sha1-5CGiqOINawgZ3yiQj3glJrlt0f4=",
+      "dev": true,
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+      "dev": true
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+      "dev": true
+    },
+    "node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/load-json-file": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+      "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "strip-bom": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/load-json-file/node_modules/pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/loader-runner": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz",
+      "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.11.5"
+      }
+    },
+    "node_modules/locate-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^2.0.0",
+        "path-exists": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/locate-path/node_modules/path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/md5.js": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz",
+      "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=",
+      "dev": true,
+      "dependencies": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true
+    },
+    "node_modules/miller-rabin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
+      },
+      "bin": {
+        "miller-rabin": "bin/miller-rabin"
+      }
+    },
+    "node_modules/mime-db": {
+      "version": "1.47.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz",
+      "integrity": "sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.30",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.30.tgz",
+      "integrity": "sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg==",
+      "dev": true,
+      "dependencies": {
+        "mime-db": "1.47.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mini-css-extract-plugin": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.6.1.tgz",
+      "integrity": "sha512-wd+SD57/K6DiV7jIR34P+s3uckTRuQvx0tKPcvjFlrEylk6P4mQ2KSWk1hblj1Kxaqok7LogKOieygXqBczNlg==",
+      "dev": true,
+      "dependencies": {
+        "schema-utils": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
+      "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.9",
+        "ajv": "^8.8.0",
+        "ajv-formats": "^2.1.1",
+        "ajv-keywords": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+      "dev": true
+    },
+    "node_modules/minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
+      "dev": true
+    },
+    "node_modules/minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "dev": true
+    },
+    "node_modules/mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+      "dev": true
+    },
+    "node_modules/neo-async": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+      "dev": true
+    },
+    "node_modules/nice-try": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.4.tgz",
+      "integrity": "sha512-2NpiFHqC87y/zFke0fC0spBXL3bBsoh/p5H1EFhshxjCR5+0g2d6BiXbUFz9v1sAcxsk2htp2eQnNIci2dIYcA==",
+      "dev": true
+    },
+    "node_modules/node-libs-browser": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz",
+      "integrity": "sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==",
+      "dev": true,
+      "dependencies": {
+        "assert": "^1.1.1",
+        "browserify-zlib": "^0.2.0",
+        "buffer": "^4.3.0",
+        "console-browserify": "^1.1.0",
+        "constants-browserify": "^1.0.0",
+        "crypto-browserify": "^3.11.0",
+        "domain-browser": "^1.1.1",
+        "events": "^1.0.0",
+        "https-browserify": "^1.0.0",
+        "os-browserify": "^0.3.0",
+        "path-browserify": "0.0.0",
+        "process": "^0.11.10",
+        "punycode": "^1.2.4",
+        "querystring-es3": "^0.2.0",
+        "readable-stream": "^2.3.3",
+        "stream-browserify": "^2.0.1",
+        "stream-http": "^2.7.2",
+        "string_decoder": "^1.0.0",
+        "timers-browserify": "^2.0.4",
+        "tty-browserify": "0.0.0",
+        "url": "^0.11.0",
+        "util": "^0.10.3",
+        "vm-browserify": "0.0.4"
+      }
+    },
+    "node_modules/node-libs-browser/node_modules/events": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
+      "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.x"
+      }
+    },
+    "node_modules/node-libs-browser/node_modules/punycode": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+      "dev": true
+    },
+    "node_modules/node-releases": {
+      "version": "1.1.72",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.72.tgz",
+      "integrity": "sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==",
+      "dev": true
+    },
+    "node_modules/normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dev": true,
+      "dependencies": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      }
+    },
+    "node_modules/normalize-package-data/node_modules/resolve": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+      "dev": true,
+      "dependencies": {
+        "path-parse": "^1.0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/npm-run-path": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/npm-run-path/node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz",
+      "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-keys": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz",
+      "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.assign": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
+      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.2",
+        "function-bind": "^1.1.1",
+        "has-symbols": "^1.0.0",
+        "object-keys": "^1.0.11"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.entries": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.2.tgz",
+      "integrity": "sha512-BQdB9qKmb/HyNdMNWVr7O3+z5MUIx3aiegEIJqjMBbBf0YT9RRxTJSim4mzFqtyr7PDAHigq0N9dO0m0tRakQA==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5",
+        "has": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.entries/node_modules/es-abstract": {
+      "version": "1.17.6",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
+      "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
+      "dev": true,
+      "dependencies": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.0",
+        "is-regex": "^1.1.0",
+        "object-inspect": "^1.7.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.0",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries/node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries/node_modules/is-callable": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
+      "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries/node_modules/is-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
+      "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries/node_modules/is-symbol": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
+      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries/node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.values": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz",
+      "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.values/node_modules/es-abstract": {
+      "version": "1.17.6",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
+      "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
+      "dev": true,
+      "dependencies": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.0",
+        "is-regex": "^1.1.0",
+        "object-inspect": "^1.7.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.0",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.values/node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.values/node_modules/is-callable": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
+      "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.values/node_modules/is-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
+      "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.values/node_modules/is-symbol": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
+      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.values/node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dev": true,
+      "dependencies": {
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/optionator": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+      "dev": true,
+      "dependencies": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.6",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "word-wrap": "~1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/os-browserify": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
+      "dev": true
+    },
+    "node_modules/os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-try": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/pako": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz",
+      "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==",
+      "dev": true
+    },
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "dependencies": {
+        "callsites": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parse-asn1": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz",
+      "integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==",
+      "dev": true,
+      "dependencies": {
+        "asn1.js": "^4.0.0",
+        "browserify-aes": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.0",
+        "pbkdf2": "^3.0.3"
+      }
+    },
+    "node_modules/parse-json": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+      "dev": true,
+      "dependencies": {
+        "error-ex": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path": {
+      "version": "0.12.7",
+      "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz",
+      "integrity": "sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=",
+      "dev": true,
+      "dependencies": {
+        "process": "^0.11.1",
+        "util": "^0.10.3"
+      }
+    },
+    "node_modules/path-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
+      "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
+      "dev": true
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+      "dev": true
+    },
+    "node_modules/path-type": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
+      "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+      "dev": true,
+      "dependencies": {
+        "pify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/path-type/node_modules/pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pbkdf2": {
+      "version": "3.0.16",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.16.tgz",
+      "integrity": "sha512-y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA==",
+      "dev": true,
+      "dependencies": {
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      },
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
+    "node_modules/pkg-dir": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
+      "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
+    "node_modules/process-nextick-args": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
+      "dev": true
+    },
+    "node_modules/progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/public-encrypt": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz",
+      "integrity": "sha512-4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "parse-asn1": "^5.0.0",
+        "randombytes": "^2.0.1"
+      }
+    },
+    "node_modules/punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/querystring": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
+      "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.x"
+      }
+    },
+    "node_modules/querystring-es3": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.x"
+      }
+    },
+    "node_modules/randombytes": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz",
+      "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/randomfill": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+      "dev": true,
+      "dependencies": {
+        "randombytes": "^2.0.5",
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/read-pkg": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
+      "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+      "dev": true,
+      "dependencies": {
+        "load-json-file": "^2.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/read-pkg-up": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+      "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^2.0.0",
+        "read-pkg": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/readable-stream": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/rechoir": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz",
+      "integrity": "sha512-ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q==",
+      "dev": true,
+      "dependencies": {
+        "resolve": "^1.9.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/rechoir/node_modules/resolve": {
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
+      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+      "dev": true,
+      "dependencies": {
+        "is-core-module": "^2.2.0",
+        "path-parse": "^1.0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/regexpp": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
+      "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.5.0"
+      }
+    },
+    "node_modules/require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/resolve-cwd": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+      "dev": true,
+      "dependencies": {
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ripemd160": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "dev": true,
+      "dependencies": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
+    },
+    "node_modules/schema-utils": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
+      "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.6",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/schema-utils/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/schema-utils/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/semver": {
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.1.tgz",
+      "integrity": "sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/serialize-javascript": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
+      "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
+      "dev": true,
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "node_modules/serialize-javascript/node_modules/randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
+      "dev": true
+    },
+    "node_modules/sha.js": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      },
+      "bin": {
+        "sha.js": "bin.js"
+      }
+    },
+    "node_modules/shallow-clone": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+      "dev": true
+    },
+    "node_modules/slice-ansi": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
+      "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.0",
+        "astral-regex": "^1.0.0",
+        "is-fullwidth-code-point": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/spdx-correct": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
+      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+      "dev": true,
+      "dependencies": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-exceptions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
+      "dev": true
+    },
+    "node_modules/spdx-expression-parse": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "dev": true,
+      "dependencies": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-license-ids": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
+      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
+      "dev": true
+    },
+    "node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "dev": true
+    },
+    "node_modules/stream-browserify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
+      "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
+      "dev": true,
+      "dependencies": {
+        "inherits": "~2.0.1",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "node_modules/stream-http": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
+      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+      "dev": true,
+      "dependencies": {
+        "builtin-status-codes": "^3.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.3.6",
+        "to-arraybuffer": "^1.0.0",
+        "xtend": "^4.0.0"
+      }
+    },
+    "node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/string.prototype.trimend": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
+      "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimend/node_modules/es-abstract": {
+      "version": "1.17.6",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
+      "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
+      "dev": true,
+      "dependencies": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.0",
+        "is-regex": "^1.1.0",
+        "object-inspect": "^1.7.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.0",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimend/node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimend/node_modules/is-callable": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
+      "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimend/node_modules/is-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
+      "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimend/node_modules/is-symbol": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
+      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimend/node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/string.prototype.trimstart": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
+      "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart/node_modules/es-abstract": {
+      "version": "1.17.6",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
+      "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
+      "dev": true,
+      "dependencies": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.0",
+        "is-regex": "^1.1.0",
+        "object-inspect": "^1.7.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.0",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart/node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart/node_modules/is-callable": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
+      "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart/node_modules/is-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
+      "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart/node_modules/is-symbol": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
+      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart/node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/strip-final-newline": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.0.tgz",
+      "integrity": "sha512-e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/table": {
+      "version": "5.4.6",
+      "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
+      "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.10.2",
+        "lodash": "^4.17.14",
+        "slice-ansi": "^2.1.0",
+        "string-width": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/table/node_modules/ajv": {
+      "version": "6.12.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/table/node_modules/ansi-regex": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/table/node_modules/emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "dev": true
+    },
+    "node_modules/table/node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
+    },
+    "node_modules/table/node_modules/string-width": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^7.0.1",
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/table/node_modules/strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tapable": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.0.tgz",
+      "integrity": "sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/terser": {
+      "version": "5.7.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.7.0.tgz",
+      "integrity": "sha512-HP5/9hp2UaZt5fYkuhNBR8YyRcT8juw8+uFbAme53iN9hblvKnLUTKkmwJG6ocWpIKf8UK4DoeWG4ty0J6S6/g==",
+      "dev": true,
+      "dependencies": {
+        "commander": "^2.20.0",
+        "source-map": "~0.7.2",
+        "source-map-support": "~0.5.19"
+      },
+      "bin": {
+        "terser": "bin/terser"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/terser-webpack-plugin": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.1.2.tgz",
+      "integrity": "sha512-6QhDaAiVHIQr5Ab3XUWZyDmrIPCHMiqJVljMF91YKyqwKkL5QHnYMkrMBy96v9Z7ev1hGhSEw1HQZc2p/s5Z8Q==",
+      "dev": true,
+      "dependencies": {
+        "jest-worker": "^26.6.2",
+        "p-limit": "^3.1.0",
+        "schema-utils": "^3.0.0",
+        "serialize-javascript": "^5.0.1",
+        "source-map": "^0.6.1",
+        "terser": "^5.7.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.1.0"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/terser/node_modules/source-map": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/terser/node_modules/source-map-support": {
+      "version": "0.5.19",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
+      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+      "dev": true,
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/terser/node_modules/source-map-support/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+      "dev": true
+    },
+    "node_modules/through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+      "dev": true
+    },
+    "node_modules/timers-browserify": {
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz",
+      "integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
+      "dev": true,
+      "dependencies": {
+        "setimmediate": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
+    "node_modules/tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "dev": true,
+      "dependencies": {
+        "os-tmpdir": "~1.0.2"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
+    "node_modules/to-arraybuffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
+      "dev": true
+    },
+    "node_modules/to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/tsconfig-paths": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz",
+      "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==",
+      "dev": true,
+      "dependencies": {
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.1",
+        "minimist": "^1.2.0",
+        "strip-bom": "^3.0.0"
+      }
+    },
+    "node_modules/tsconfig-paths/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/tslib": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
+      "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==",
+      "dev": true
+    },
+    "node_modules/tty-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
+      "dev": true
+    },
+    "node_modules/type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/uri-js": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
+      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+      "dev": true,
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/url": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+      "dev": true,
+      "dependencies": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      }
+    },
+    "node_modules/url/node_modules/punycode": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+      "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+      "dev": true
+    },
+    "node_modules/util": {
+      "version": "0.10.4",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
+      "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "2.0.3"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
+    },
+    "node_modules/v8-compile-cache": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+      "dev": true
+    },
+    "node_modules/validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
+      "dependencies": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "node_modules/vm-browserify": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
+      "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
+      "dev": true,
+      "dependencies": {
+        "indexof": "0.0.1"
+      }
+    },
+    "node_modules/watchpack": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.1.1.tgz",
+      "integrity": "sha512-Oo7LXCmc1eE1AjyuSBmtC3+Wy4HcV8PxWh2kP6fOl8yTlNS7r0K9l1ao2lrrUza7V39Y3D/BbJgY8VeSlc5JKw==",
+      "dev": true,
+      "dependencies": {
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.1.2"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/webpack": {
+      "version": "5.37.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.37.1.tgz",
+      "integrity": "sha512-btZjGy/hSjCAAVHw+cKG+L0M+rstlyxbO2C+BOTaQ5/XAnxkDrP5sVbqWhXgo4pL3X2dcOib6rqCP20Zr9PLow==",
+      "dev": true,
+      "dependencies": {
+        "@types/eslint-scope": "^3.7.0",
+        "@types/estree": "^0.0.47",
+        "@webassemblyjs/ast": "1.11.0",
+        "@webassemblyjs/wasm-edit": "1.11.0",
+        "@webassemblyjs/wasm-parser": "1.11.0",
+        "acorn": "^8.2.1",
+        "browserslist": "^4.14.5",
+        "chrome-trace-event": "^1.0.2",
+        "enhanced-resolve": "^5.8.0",
+        "es-module-lexer": "^0.4.0",
+        "eslint-scope": "^5.1.1",
+        "events": "^3.2.0",
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.2.4",
+        "json-parse-better-errors": "^1.0.2",
+        "loader-runner": "^4.2.0",
+        "mime-types": "^2.1.27",
+        "neo-async": "^2.6.2",
+        "schema-utils": "^3.0.0",
+        "tapable": "^2.1.1",
+        "terser-webpack-plugin": "^5.1.1",
+        "watchpack": "^2.0.0",
+        "webpack-sources": "^2.1.1"
+      },
+      "bin": {
+        "webpack": "bin/webpack.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependenciesMeta": {
+        "webpack-cli": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-cli": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.7.0.tgz",
+      "integrity": "sha512-7bKr9182/sGfjFm+xdZSwgQuFjgEcy0iCTIBxRUeteJ2Kr8/Wz0qNJX+jw60LU36jApt4nmMkep6+W5AKhok6g==",
+      "dev": true,
+      "dependencies": {
+        "@discoveryjs/json-ext": "^0.5.0",
+        "@webpack-cli/configtest": "^1.0.3",
+        "@webpack-cli/info": "^1.2.4",
+        "@webpack-cli/serve": "^1.4.0",
+        "colorette": "^1.2.1",
+        "commander": "^7.0.0",
+        "execa": "^5.0.0",
+        "fastest-levenshtein": "^1.0.12",
+        "import-local": "^3.0.2",
+        "interpret": "^2.2.0",
+        "rechoir": "^0.7.0",
+        "v8-compile-cache": "^2.2.0",
+        "webpack-merge": "^5.7.3"
+      },
+      "bin": {
+        "webpack-cli": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "peerDependencies": {
+        "webpack": "4.x.x || 5.x.x"
+      },
+      "peerDependenciesMeta": {
+        "@webpack-cli/generators": {
+          "optional": true
+        },
+        "@webpack-cli/migrate": {
+          "optional": true
+        },
+        "webpack-bundle-analyzer": {
+          "optional": true
+        },
+        "webpack-dev-server": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-cli/node_modules/commander": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/webpack-merge": {
+      "version": "5.7.3",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.7.3.tgz",
+      "integrity": "sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA==",
+      "dev": true,
+      "dependencies": {
+        "clone-deep": "^4.0.1",
+        "wildcard": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/webpack/node_modules/acorn": {
+      "version": "8.7.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
+      "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/webpack/node_modules/browserslist": {
+      "version": "4.16.6",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
+      "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
+      "dev": true,
+      "dependencies": {
+        "caniuse-lite": "^1.0.30001219",
+        "colorette": "^1.2.2",
+        "electron-to-chromium": "^1.3.723",
+        "escalade": "^3.1.1",
+        "node-releases": "^1.1.71"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      },
+      "engines": {
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/browserslist"
+      }
+    },
+    "node_modules/webpack/node_modules/caniuse-lite": {
+      "version": "1.0.30001228",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz",
+      "integrity": "sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A==",
+      "dev": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/browserslist"
+      }
+    },
+    "node_modules/webpack/node_modules/electron-to-chromium": {
+      "version": "1.3.732",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.732.tgz",
+      "integrity": "sha512-qKD5Pbq+QMk4nea4lMuncUMhpEiQwaJyCW7MrvissnRcBDENhVfDmAqQYRQ3X525oTzhar9Zh1cK0L2d1UKYcw==",
+      "dev": true
+    },
+    "node_modules/webpack/node_modules/graceful-fs": {
+      "version": "4.2.6",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
+      "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==",
+      "dev": true
+    },
+    "node_modules/webpack/node_modules/source-list-map": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
+      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
+      "dev": true
+    },
+    "node_modules/webpack/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack/node_modules/webpack-sources": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.2.0.tgz",
+      "integrity": "sha512-bQsA24JLwcnWGArOKUxYKhX3Mz/nK1Xf6hxullKERyktjNMC4x8koOeaDNTA2fEJ09BdWLbM/iTW0ithREUP0w==",
+      "dev": true,
+      "dependencies": {
+        "source-list-map": "^2.0.1",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/wildcard": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
+      "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==",
+      "dev": true
+    },
+    "node_modules/word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "node_modules/write": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
+      "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
+      "dev": true,
+      "dependencies": {
+        "mkdirp": "^0.5.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/xtend": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/zxcvbn": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/zxcvbn/-/zxcvbn-4.4.2.tgz",
+      "integrity": "sha1-KOwXzwl0PtyrBW3dixsGJizHPDA="
+    }
+  },
   "dependencies": {
     "@babel/helper-validator-identifier": {
       "version": "7.10.4",
@@ -224,7 +5495,8 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.3.tgz",
       "integrity": "sha512-WQs0ep98FXX2XBAfQpRbY0Ma6ADw8JR6xoIkaIiJIzClGOMqVRvPCWqndTxf28DgFopWan0EKtHtg/5W1h0Zkw==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "@webpack-cli/info": {
       "version": "1.2.4",
@@ -239,7 +5511,8 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.4.0.tgz",
       "integrity": "sha512-xgT/HqJ+uLWGX+Mzufusl3cgjAcnqYYskaB7o0vRcwOEfuu6hMzSILQpnIzFMGsTaeaX4Nnekl+6fadLbl1/Vg==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "@xtuc/ieee754": {
       "version": "1.2.0",
@@ -263,7 +5536,8 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz",
       "integrity": "sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "ajv": {
       "version": "8.11.0",
@@ -2504,7 +7778,8 @@
     "jquery-migrate": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/jquery-migrate/-/jquery-migrate-3.1.0.tgz",
-      "integrity": "sha512-u/MtE1ST2pCr3rCyouJG2xMiw/k3OzLNeRKprjKTeHUezCGr0DyEgeXFdqFLmQfxfR5EsVu+mGo/sCcYdiYcIQ=="
+      "integrity": "sha512-u/MtE1ST2pCr3rCyouJG2xMiw/k3OzLNeRKprjKTeHUezCGr0DyEgeXFdqFLmQfxfR5EsVu+mGo/sCcYdiYcIQ==",
+      "requires": {}
     },
     "jquery.browser": {
       "version": "0.1.0",
@@ -3387,7 +8662,8 @@
           "version": "3.5.2",
           "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
           "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-          "dev": true
+          "dev": true,
+          "requires": {}
         }
       }
     },
@@ -3541,6 +8817,15 @@
         "xtend": "^4.0.0"
       }
     },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
     "string.prototype.trimend": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
@@ -3685,15 +8970,6 @@
         }
       }
     },
-    "string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
     "strip-bom": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
diff --git a/themes/package.json b/themes/package.json
index a12580e0e564a..2b1567912c5ae 100644
--- a/themes/package.json
+++ b/themes/package.json
@@ -32,4 +32,4 @@
     "webpack": "^5.37.1",
     "webpack-cli": "^4.7.0"
   }
-}
+}
\ No newline at end of file

From 5b7f25e1bae9609ab0f63c5ccf9b03d19d17404c Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Mon, 24 Apr 2023 11:42:36 +0300
Subject: [PATCH 0154/1030] implement delete alias command

---
 .../Alias/Command/DeleteAliasCommand.php      | 55 +++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 src/Core/Domain/Alias/Command/DeleteAliasCommand.php

diff --git a/src/Core/Domain/Alias/Command/DeleteAliasCommand.php b/src/Core/Domain/Alias/Command/DeleteAliasCommand.php
new file mode 100644
index 0000000000000..496b539839a6e
--- /dev/null
+++ b/src/Core/Domain/Alias/Command/DeleteAliasCommand.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\Alias\Command;
+
+use PrestaShop\PrestaShop\Core\Domain\Alias\ValueObject\AliasId;
+
+/**
+ * Deletes given alias.
+ */
+class DeleteAliasCommand
+{
+    /**
+     * @var AliasId
+     */
+    private $aliasId;
+
+    public function __construct(AliasId $aliasId)
+    {
+        $this->aliasId = $aliasId;
+    }
+
+    /**
+     * @return AliasId
+     */
+    public function getAliasId(): AliasId
+    {
+        return $this->aliasId;
+    }
+}

From eb15f93d183219809b455be868fb624325d01a1e Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Mon, 24 Apr 2023 11:59:07 +0300
Subject: [PATCH 0155/1030] implement delete alias command handler

---
 .../Alias/CommandHandler/DeleteAlias.php      | 54 +++++++++++++++++++
 .../Alias/Repository/AliasRepository.php      | 13 +++++
 .../DeleteAliasHandlerInterface.php           | 40 ++++++++++++++
 3 files changed, 107 insertions(+)
 create mode 100644 src/Adapter/Alias/CommandHandler/DeleteAlias.php
 create mode 100644 src/Core/Domain/Alias/CommandHandler/DeleteAliasHandlerInterface.php

diff --git a/src/Adapter/Alias/CommandHandler/DeleteAlias.php b/src/Adapter/Alias/CommandHandler/DeleteAlias.php
new file mode 100644
index 0000000000000..9814f76604a99
--- /dev/null
+++ b/src/Adapter/Alias/CommandHandler/DeleteAlias.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Adapter\Alias\CommandHandler;
+
+use PrestaShop\PrestaShop\Adapter\Alias\Repository\AliasRepository;
+use PrestaShop\PrestaShop\Core\Domain\Alias\Command\DeleteAliasCommand;
+use PrestaShop\PrestaShop\Core\Domain\Alias\CommandHandler\DeleteAliasHandlerInterface;
+
+class DeleteAlias implements DeleteAliasHandlerInterface
+{
+    /**
+     * @var AliasRepository
+     */
+    private $aliasRepository;
+
+    public function __construct(AliasRepository $aliasRepository)
+    {
+        $this->aliasRepository = $aliasRepository;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function handle(DeleteAliasCommand $command): void
+    {
+        $this->aliasRepository->delete($command->getAliasId());
+    }
+}
diff --git a/src/Adapter/Alias/Repository/AliasRepository.php b/src/Adapter/Alias/Repository/AliasRepository.php
index 182226bc43357..d93a13318dc5a 100644
--- a/src/Adapter/Alias/Repository/AliasRepository.php
+++ b/src/Adapter/Alias/Repository/AliasRepository.php
@@ -156,6 +156,19 @@ public function getAliasesBySearchTerm(string $searchTerm): array
         return $qb->execute()->fetchFirstColumn();
     }
 
+    public function delete(AliasId $aliasId): void
+    {
+        /** @var Alias $alias */
+        $alias = $this->getObjectModel(
+            $aliasId->getValue(),
+            Alias::class,
+            AliasNotFoundException::class
+        );
+
+        $alias->delete();
+    }
+
+
     /**
      * @param Alias $alias
      * @param string[] $propertiesToUpdate
diff --git a/src/Core/Domain/Alias/CommandHandler/DeleteAliasHandlerInterface.php b/src/Core/Domain/Alias/CommandHandler/DeleteAliasHandlerInterface.php
new file mode 100644
index 0000000000000..fcba288cc894a
--- /dev/null
+++ b/src/Core/Domain/Alias/CommandHandler/DeleteAliasHandlerInterface.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Domain\Alias\CommandHandler;
+
+use PrestaShop\PrestaShop\Core\Domain\Alias\Command\DeleteAliasCommand;
+
+/**
+ * Defines contract to handle @see DeleteAliasCommand
+ */
+interface DeleteAliasHandlerInterface
+{
+    /**
+     * @param DeleteAliasCommand $command
+     */
+    public function handle(DeleteAliasCommand $command): void;
+}

From 813660445acae4db0e29e51fd11c70ef9e1fd8ad Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Mon, 24 Apr 2023 15:23:53 +0300
Subject: [PATCH 0156/1030] create symfony config for delete alias

---
 .../Resources/config/services/adapter/alias.yml          | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml b/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
index 91bb78e590185..ccb20f52d6160 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
@@ -20,6 +20,15 @@ services:
       - name: tactician.handler
         command: PrestaShop\PrestaShop\Core\Domain\Alias\Query\GetAliasForEditing
 
+  PrestaShop\PrestaShop\Adapter\Alias\CommandHandler\DeleteAlias:
+    autowire: true
+    public: false
+    tags:
+      - name: tactician.handler
+        command: PrestaShop\PrestaShop\Core\Domain\Alias\Command\DeleteAliasCommand
+    arguments:
+      - '@PrestaShop\PrestaShop\Adapter\Alias\Repository\AliasRepository'
+
   PrestaShop\PrestaShop\Adapter\Alias\CommandHandler\UpdateAliasStatusHandler:
     tags:
       - name: tactician.handler

From 1b5f71303189a15ac25a41e9f08591b952d172a1 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Mon, 24 Apr 2023 15:46:45 +0300
Subject: [PATCH 0157/1030] implement bulk delete command

---
 .../Alias/Command/BulkDeleteAliasCommand.php  | 63 +++++++++++++++++++
 .../BulkDeleteAliasHandlerInterface.php       | 40 ++++++++++++
 2 files changed, 103 insertions(+)
 create mode 100644 src/Core/Domain/Alias/Command/BulkDeleteAliasCommand.php
 create mode 100644 src/Core/Domain/Alias/CommandHandler/BulkDeleteAliasHandlerInterface.php

diff --git a/src/Core/Domain/Alias/Command/BulkDeleteAliasCommand.php b/src/Core/Domain/Alias/Command/BulkDeleteAliasCommand.php
new file mode 100644
index 0000000000000..61c176692732b
--- /dev/null
+++ b/src/Core/Domain/Alias/Command/BulkDeleteAliasCommand.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\Alias\Command;
+
+use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\AliasConstraintException;
+use PrestaShop\PrestaShop\Core\Domain\Alias\ValueObject\AliasId;
+
+/**
+ * Deletes multiple aliases
+ */
+class BulkDeleteAliasCommand
+{
+    /**
+     * @var AliasId[]
+     */
+    private $aliasIds;
+
+    /**
+     * @param int[] $aliasIds
+     *
+     * @throws AliasConstraintException
+     */
+    public function __construct(array $aliasIds)
+    {
+        foreach ($aliasIds as $aliasId) {
+            $this->aliasIds[] = new AliasId($aliasId);
+        }
+    }
+
+    /**
+     * @return AliasId[]
+     */
+    public function getAliasIds(): array
+    {
+        return $this->aliasIds;
+    }
+}
diff --git a/src/Core/Domain/Alias/CommandHandler/BulkDeleteAliasHandlerInterface.php b/src/Core/Domain/Alias/CommandHandler/BulkDeleteAliasHandlerInterface.php
new file mode 100644
index 0000000000000..85949c63a10f5
--- /dev/null
+++ b/src/Core/Domain/Alias/CommandHandler/BulkDeleteAliasHandlerInterface.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Domain\Alias\CommandHandler;
+
+use PrestaShop\PrestaShop\Core\Domain\Alias\Command\BulkDeleteAliasCommand;
+
+/**
+ * Defines contract to handle @see BulkDeleteAliasCommand
+ */
+interface BulkDeleteAliasHandlerInterface
+{
+    /**
+     * @param BulkDeleteAliasCommand $command
+     */
+    public function handle(BulkDeleteAliasCommand $command): void;
+}

From 279072214ed7d7d4deed5e8372d5b2ee24d023b0 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Mon, 24 Apr 2023 16:11:48 +0300
Subject: [PATCH 0158/1030] implement bulk delete alias command handler

---
 .../CommandHandler/AbstractBulkHandler.php    | 86 +++++++++++++++++++
 .../Alias/CommandHandler/BulkDeleteAlias.php  | 81 +++++++++++++++++
 .../config/services/adapter/alias.yml         |  9 ++
 3 files changed, 176 insertions(+)
 create mode 100644 src/Adapter/Alias/CommandHandler/AbstractBulkHandler.php
 create mode 100644 src/Adapter/Alias/CommandHandler/BulkDeleteAlias.php

diff --git a/src/Adapter/Alias/CommandHandler/AbstractBulkHandler.php b/src/Adapter/Alias/CommandHandler/AbstractBulkHandler.php
new file mode 100644
index 0000000000000..07987b07db2c1
--- /dev/null
+++ b/src/Adapter/Alias/CommandHandler/AbstractBulkHandler.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Adapter\Alias\CommandHandler;
+
+use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\BulkAliasException;
+use PrestaShop\PrestaShop\Core\Domain\Alias\ValueObject\AliasId;
+
+/**
+ * This abstract class helps us build a bulk handler since the principle is often very similar, it might not be
+ * compatible with all the handlers, but it helps for many. The exact copy of Product Abstract Bulk Handler.
+ */
+abstract class AbstractBulkHandler
+{
+    /**
+     * @param AliasId[] $aliasIds
+     * @param mixed|null $command
+     *
+     * @return array<int, mixed>
+     * @throws BulkAliasException
+     */
+    protected function handleBulkAction(array $aliasIds, $command = null): array
+    {
+        $bulkException = null;
+        $actionResults = [];
+        foreach ($aliasIds as $aliasId) {
+            try {
+                $actionResults[$aliasId->getValue()] = $this->handleSingleAction($aliasId, $command);
+            } catch (BulkAliasException $e) {
+                if (null === $bulkException) {
+                    $bulkException = $this->buildBulkException();
+                }
+                $bulkException->addException($aliasId, $e);
+            }
+        }
+
+        if (null !== $bulkException) {
+            throw $bulkException;
+        }
+
+        return $actionResults;
+    }
+
+    /**
+     * This uses the base bulk exception class, but you can override this in your handler.
+     *
+     * @return BulkAliasException
+     */
+    protected function buildBulkException(): BulkAliasException
+    {
+        return new BulkAliasException();
+    }
+
+    /**
+     * @param AliasId $aliasId
+     * @param mixed|null $command
+     *
+     * @return mixed
+     */
+    abstract protected function handleSingleAction(AliasId $aliasId, $command = null);
+}
diff --git a/src/Adapter/Alias/CommandHandler/BulkDeleteAlias.php b/src/Adapter/Alias/CommandHandler/BulkDeleteAlias.php
new file mode 100644
index 0000000000000..56e008f5b0acf
--- /dev/null
+++ b/src/Adapter/Alias/CommandHandler/BulkDeleteAlias.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Adapter\Alias\CommandHandler;
+
+use PrestaShop\PrestaShop\Adapter\Alias\Repository\AliasRepository;
+use PrestaShop\PrestaShop\Core\Domain\Alias\Command\BulkDeleteAliasCommand;
+use PrestaShop\PrestaShop\Core\Domain\Alias\CommandHandler\BulkDeleteAliasHandlerInterface;
+use PrestaShop\PrestaShop\Core\Domain\Alias\ValueObject\AliasId;
+use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
+
+/**
+ * Handles command which deletes aliases in bulk action
+ */
+class BulkDeleteAlias extends AbstractBulkHandler implements BulkDeleteAliasHandlerInterface
+{
+    /**
+     * @var AliasRepository
+     */
+    private $aliasRepository;
+
+    public function __construct(AliasRepository $aliasRepository)
+    {
+        $this->aliasRepository = $aliasRepository;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function handle(BulkDeleteAliasCommand $command): void
+    {
+        $this->handleBulkAction($command->getAliasIds(), $command);
+    }
+
+    /**
+     * @param AliasId $aliasId
+     * @param BulkDeleteAliasCommand $command
+     *
+     * @return void
+     *
+     * @throws InvalidArgumentException
+     */
+    protected function handleSingleAction(AliasId $aliasId, $command = null)
+    {
+        if (!($command instanceof BulkDeleteAliasCommand)) {
+            throw new InvalidArgumentException(
+                sprintf(
+                    'Expected argument $command of type "%s". Got "%s"',
+                    BulkDeleteAliasCommand::class,
+                    var_export($command, true)
+                ));
+        }
+
+        $this->aliasRepository->delete($aliasId);
+    }
+}
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml b/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
index ccb20f52d6160..46ff1611e9cec 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
@@ -29,6 +29,15 @@ services:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Alias\Repository\AliasRepository'
 
+  PrestaShop\PrestaShop\Adapter\Alias\CommandHandler\BulkDeleteAlias:
+    autowire: true
+    public: false
+    tags:
+      - name: tactician.handler
+        command: PrestaShop\PrestaShop\Core\Domain\Alias\Command\BulkDeleteAliasCommand
+    arguments:
+      - '@PrestaShop\PrestaShop\Adapter\Alias\Repository\AliasRepository'
+
   PrestaShop\PrestaShop\Adapter\Alias\CommandHandler\UpdateAliasStatusHandler:
     tags:
       - name: tactician.handler

From 839db408e527e4a5f3f9c95f79d66c0d5ce52da9 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Mon, 24 Apr 2023 20:50:17 +0300
Subject: [PATCH 0159/1030] implement delete and bulk delete scenarios

---
 .../Scenario/Search/delete_alias.feature      | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 tests/Integration/Behaviour/Features/Scenario/Search/delete_alias.feature

diff --git a/tests/Integration/Behaviour/Features/Scenario/Search/delete_alias.feature b/tests/Integration/Behaviour/Features/Scenario/Search/delete_alias.feature
new file mode 100644
index 0000000000000..7da4f4cfbeae9
--- /dev/null
+++ b/tests/Integration/Behaviour/Features/Scenario/Search/delete_alias.feature
@@ -0,0 +1,35 @@
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s alias --tags delete
+@restore-aliases-before-feature
+@clear-cache-before-feature
+@clear-cache-after-feature
+@delete
+Feature: Delete aliases from Back Office (BO)
+  As a BO user
+  I need to be able to delete alias and multiple aliases at once from BO
+
+  Scenario: I delete alias
+    Given I add alias "alias1" with following information:
+      | alias   | alias1  |
+      | search  | alias 1 |
+    And I delete alias "alias1"
+    Then alias alias1 should not exist anymore
+
+  Scenario: I bulk delete aliases
+    Given I add alias "alias1" with following information:
+      | alias   | alias1  |
+      | search  | alias 1 |
+    Given I add alias "alias2" with following information:
+      | alias   | alias2  |
+      | search  | alias 2 |
+    Given I add alias "alias3" with following information:
+      | alias   | alias3  |
+      | search  | alias 3 |
+    When I bulk delete following aliases:
+      | reference |
+      | alias1  |
+      | alias2  |
+    Then alias alias1 should not exist anymore
+    And alias alias2 should not exist anymore
+    And alias "alias3" should have the following details:
+      | alias  | alias3  |
+      | search | alias 3 |

From e501e8843f135085332bb5155f94f008723e1152 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Mon, 24 Apr 2023 22:38:15 +0300
Subject: [PATCH 0160/1030] implement bulk delete behat context

---
 .../Context/Domain/AliasFeatureContext.php    | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
index 5f5306d085efd..183993e1c32e2 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
@@ -40,6 +40,9 @@
 use PrestaShop\PrestaShop\Core\Grid\Query\AliasQueryBuilder;
 use PrestaShop\PrestaShop\Core\Search\Filters;
 use Tests\Integration\Behaviour\Features\Context\Util\PrimitiveUtils;
+use PrestaShop\PrestaShop\Core\Domain\Alias\Command\BulkDeleteAliasCommand;
+use PrestaShop\PrestaShop\Core\Domain\Alias\Command\DeleteAliasCommand;
+use PrestaShopBundle\Exception\NotImplementedException;
 use Tests\Resources\DatabaseDump;
 
 class AliasFeatureContext extends AbstractDomainFeatureContext
@@ -152,6 +155,52 @@ public function assertUpdateAlias(string $aliasReference, TableNode $table): voi
         }
     }
 
+    /**
+     * @When I delete alias :reference
+     *
+     * @param string $reference
+     */
+    public function deleteAliasFromDefaultShop(string $reference): void
+    {
+        try {
+            $this->getCommandBus()->handle(new DeleteAliasCommand(
+                $this->getSharedStorage()->get($reference)
+            ));
+        } catch (AliasException $e) {
+            $this->setLastException($e);
+        }
+    }
+
+    /**
+     * @When I bulk delete following aliases:
+     *
+     * @param TableNode $aliasesList
+     */
+    public function bulkDeleteProductsFromDefaultShop(TableNode $aliasesList): void
+    {
+        $aliasIds = [];
+
+        foreach ($aliasesList->getColumnsHash() as $aliasInfo) {
+            $aliasIds[] = $this->getSharedStorage()->get($aliasInfo['reference'])->getValue();
+        }
+
+        try {
+            $this->getCommandBus()->handle(new BulkDeleteAliasCommand($aliasIds));
+        } catch (AliasException $e) {
+            $this->setLastException($e);
+        }
+    }
+
+    /**
+     * @Then alias :reference should not exist anymore
+     *
+     * @param string $reference
+     */
+    public function assertAliasDoesNotExistAnymore(string $reference): void
+    {
+        throw new NotImplementedException();
+    }
+
     /**
      * @BeforeFeature @restore-aliases-before-feature
      */

From b43363c25fc2121f4d997fede22b44fee3f34f9d Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Wed, 26 Apr 2023 16:26:42 +0300
Subject: [PATCH 0161/1030] fix comment style

---
 src/Adapter/Alias/CommandHandler/AbstractBulkHandler.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Adapter/Alias/CommandHandler/AbstractBulkHandler.php b/src/Adapter/Alias/CommandHandler/AbstractBulkHandler.php
index 07987b07db2c1..39419088b85b4 100644
--- a/src/Adapter/Alias/CommandHandler/AbstractBulkHandler.php
+++ b/src/Adapter/Alias/CommandHandler/AbstractBulkHandler.php
@@ -42,6 +42,7 @@ abstract class AbstractBulkHandler
      * @param mixed|null $command
      *
      * @return array<int, mixed>
+     *
      * @throws BulkAliasException
      */
     protected function handleBulkAction(array $aliasIds, $command = null): array

From 1f7a2204641622c58a9b35da9c79daa8689a7fa9 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Wed, 26 Apr 2023 17:40:30 +0300
Subject: [PATCH 0162/1030] fix delete alias tests

---
 .../Context/Domain/AliasFeatureContext.php        | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
index 183993e1c32e2..cd5798903e556 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
@@ -162,12 +162,15 @@ public function assertUpdateAlias(string $aliasReference, TableNode $table): voi
      */
     public function deleteAliasFromDefaultShop(string $reference): void
     {
-        try {
-            $this->getCommandBus()->handle(new DeleteAliasCommand(
-                $this->getSharedStorage()->get($reference)
-            ));
-        } catch (AliasException $e) {
-            $this->setLastException($e);
+        /** @var AliasId[] $aliasIds */
+        $aliasIds = $this->getSharedStorage()->get($reference);
+
+        foreach ($aliasIds as $aliasId) {
+            try {
+                $this->getCommandBus()->handle(new DeleteAliasCommand($aliasId));
+            } catch (AliasException $e) {
+                $this->setLastException($e);
+            }
         }
     }
 

From c78380d47b63ef6af9e5bc961efc4f7acd1fe30d Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Wed, 26 Apr 2023 19:47:37 +0300
Subject: [PATCH 0163/1030] fix behat tests

---
 .../Behaviour/Features/Context/Domain/AliasFeatureContext.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
index cd5798903e556..fded82a32702a 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
@@ -184,7 +184,7 @@ public function bulkDeleteProductsFromDefaultShop(TableNode $aliasesList): void
         $aliasIds = [];
 
         foreach ($aliasesList->getColumnsHash() as $aliasInfo) {
-            $aliasIds[] = $this->getSharedStorage()->get($aliasInfo['reference'])->getValue();
+            $aliasIds[] = $this->getSharedStorage()->get($aliasInfo['reference'])[0]->getValue();
         }
 
         try {

From f5e16fe084239a16e10086650b96dfa8857a4310 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Wed, 10 May 2023 13:00:59 +0300
Subject: [PATCH 0164/1030] fix cs fixer issues

---
 .../Alias/CommandHandler/AddAliasCommandHandler.php       | 1 -
 .../Features/Context/Domain/AliasFeatureContext.php       | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/Adapter/Alias/CommandHandler/AddAliasCommandHandler.php b/src/Adapter/Alias/CommandHandler/AddAliasCommandHandler.php
index 34aff254c6b6f..deac31a8c22da 100644
--- a/src/Adapter/Alias/CommandHandler/AddAliasCommandHandler.php
+++ b/src/Adapter/Alias/CommandHandler/AddAliasCommandHandler.php
@@ -24,7 +24,6 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
-
 declare(strict_types=1);
 
 namespace PrestaShop\PrestaShop\Adapter\Alias\CommandHandler;
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
index fded82a32702a..3b7ebd87ac750 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
@@ -31,18 +31,18 @@
 use Behat\Gherkin\Node\TableNode;
 use PHPUnit\Framework\Assert;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Command\AddAliasCommand;
+use PrestaShop\PrestaShop\Core\Domain\Alias\Command\BulkDeleteAliasCommand;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Command\BulkUpdateAliasStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasCommand;
+use PrestaShop\PrestaShop\Core\Domain\Alias\Command\DeleteAliasCommand;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\AliasException;
 use PrestaShop\PrestaShop\Core\Domain\Alias\ValueObject\AliasId;
 use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
 use PrestaShop\PrestaShop\Core\Grid\Query\AliasQueryBuilder;
 use PrestaShop\PrestaShop\Core\Search\Filters;
-use Tests\Integration\Behaviour\Features\Context\Util\PrimitiveUtils;
-use PrestaShop\PrestaShop\Core\Domain\Alias\Command\BulkDeleteAliasCommand;
-use PrestaShop\PrestaShop\Core\Domain\Alias\Command\DeleteAliasCommand;
 use PrestaShopBundle\Exception\NotImplementedException;
+use Tests\Integration\Behaviour\Features\Context\Util\PrimitiveUtils;
 use Tests\Resources\DatabaseDump;
 
 class AliasFeatureContext extends AbstractDomainFeatureContext
@@ -93,7 +93,7 @@ public function assertAliasesList(TableNode $table): void
         $idsByIdReferences = $this->assertAliasProperties($expectedAliases, $aliases);
 
         foreach ($idsByIdReferences as $reference => $id) {
-            $this->getSharedStorage()->set($reference, (int) $id);
+            $this->getSharedStorage()->set($reference, $id);
         }
     }
 

From a39b6c4fa0a5bfdfb0c3f16e532c3f2527eb51f8 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Wed, 10 May 2023 13:04:23 +0300
Subject: [PATCH 0165/1030] remove unused handlers

---
 .../CommandHandler/AddAliasCommandHandler.php | 40 -----------------
 .../AddAliasCommandHandlerInterface.php       | 43 -------------------
 2 files changed, 83 deletions(-)
 delete mode 100644 src/Adapter/Alias/CommandHandler/AddAliasCommandHandler.php
 delete mode 100644 src/Core/Domain/Alias/CommandHandler/AddAliasCommandHandlerInterface.php

diff --git a/src/Adapter/Alias/CommandHandler/AddAliasCommandHandler.php b/src/Adapter/Alias/CommandHandler/AddAliasCommandHandler.php
deleted file mode 100644
index deac31a8c22da..0000000000000
--- a/src/Adapter/Alias/CommandHandler/AddAliasCommandHandler.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-declare(strict_types=1);
-
-namespace PrestaShop\PrestaShop\Adapter\Alias\CommandHandler;
-
-use PrestaShop\PrestaShop\Core\Domain\Alias\Command\AddAliasCommand;
-use PrestaShop\PrestaShop\Core\Domain\Alias\CommandHandler\AddAliasCommandHandlerInterface;
-
-class AddAliasCommandHandler implements AddAliasCommandHandlerInterface
-{
-    public function handle(AddAliasCommand $command)
-    {
-        // TODO: Implement handle() method.
-    }
-}
diff --git a/src/Core/Domain/Alias/CommandHandler/AddAliasCommandHandlerInterface.php b/src/Core/Domain/Alias/CommandHandler/AddAliasCommandHandlerInterface.php
deleted file mode 100644
index a811244de9226..0000000000000
--- a/src/Core/Domain/Alias/CommandHandler/AddAliasCommandHandlerInterface.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-namespace PrestaShop\PrestaShop\Core\Domain\Alias\CommandHandler;
-
-use PrestaShop\PrestaShop\Core\Domain\Alias\Command\AddAliasCommand;
-use PrestaShop\PrestaShop\Core\Domain\Alias\ValueObject\AliasId;
-
-/**
- * Interface for services that handle command which adds new alias
- */
-interface AddAliasCommandHandlerInterface
-{
-    /**
-     * @param AddAliasCommand $command
-     *
-     * @return AliasId Added alias ID
-     */
-    public function handle(AddAliasCommand $command);
-}

From 06566f653c8fa36d1dbc765ed7f8135a1ade2902 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Wed, 10 May 2023 14:43:04 +0300
Subject: [PATCH 0166/1030] fix single delete alias test

---
 .../Context/Domain/AliasFeatureContext.php    | 28 +++------
 .../Scenario/Search/delete_alias.feature      | 60 +++++++++++--------
 2 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
index 3b7ebd87ac750..07684cb2d7c20 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
@@ -160,17 +160,15 @@ public function assertUpdateAlias(string $aliasReference, TableNode $table): voi
      *
      * @param string $reference
      */
-    public function deleteAliasFromDefaultShop(string $reference): void
+    public function deleteAlias(string $reference): void
     {
-        /** @var AliasId[] $aliasIds */
-        $aliasIds = $this->getSharedStorage()->get($reference);
+        /** @var string[] $aliasId */
+        $aliasId = $this->getSharedStorage()->get($reference);
 
-        foreach ($aliasIds as $aliasId) {
-            try {
-                $this->getCommandBus()->handle(new DeleteAliasCommand($aliasId));
-            } catch (AliasException $e) {
-                $this->setLastException($e);
-            }
+        try {
+            $this->getCommandBus()->handle(new DeleteAliasCommand(new AliasId((int) $aliasId)));
+        } catch (AliasException $e) {
+            $this->setLastException($e);
         }
     }
 
@@ -179,7 +177,7 @@ public function deleteAliasFromDefaultShop(string $reference): void
      *
      * @param TableNode $aliasesList
      */
-    public function bulkDeleteProductsFromDefaultShop(TableNode $aliasesList): void
+    public function bulkDeleteAlias(TableNode $aliasesList): void
     {
         $aliasIds = [];
 
@@ -194,16 +192,6 @@ public function bulkDeleteProductsFromDefaultShop(TableNode $aliasesList): void
         }
     }
 
-    /**
-     * @Then alias :reference should not exist anymore
-     *
-     * @param string $reference
-     */
-    public function assertAliasDoesNotExistAnymore(string $reference): void
-    {
-        throw new NotImplementedException();
-    }
-
     /**
      * @BeforeFeature @restore-aliases-before-feature
      */
diff --git a/tests/Integration/Behaviour/Features/Scenario/Search/delete_alias.feature b/tests/Integration/Behaviour/Features/Scenario/Search/delete_alias.feature
index 7da4f4cfbeae9..ed273aa5889d8 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Search/delete_alias.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Search/delete_alias.feature
@@ -8,28 +8,40 @@ Feature: Delete aliases from Back Office (BO)
   I need to be able to delete alias and multiple aliases at once from BO
 
   Scenario: I delete alias
-    Given I add alias "alias1" with following information:
-      | alias   | alias1  |
-      | search  | alias 1 |
-    And I delete alias "alias1"
-    Then alias alias1 should not exist anymore
+    Given following aliases should exist:
+      | id reference | alias  | search |
+      | alias1       | bloose | blouse |
+      | alias2       | blues  | blouse |
+    When I add alias with following information:
+      | alias   | large |
+      | search  | big   |
+    Then following aliases should exist:
+      | id reference | alias  | search |
+      | alias1       | bloose | blouse |
+      | alias2       | blues  | blouse |
+      | alias3       | large  | big    |
+    And I delete alias "alias3"
+    Then following aliases should exist:
+      | id reference | alias  | search |
+      | alias1       | bloose | blouse |
+      | alias2       | blues  | blouse |
 
-  Scenario: I bulk delete aliases
-    Given I add alias "alias1" with following information:
-      | alias   | alias1  |
-      | search  | alias 1 |
-    Given I add alias "alias2" with following information:
-      | alias   | alias2  |
-      | search  | alias 2 |
-    Given I add alias "alias3" with following information:
-      | alias   | alias3  |
-      | search  | alias 3 |
-    When I bulk delete following aliases:
-      | reference |
-      | alias1  |
-      | alias2  |
-    Then alias alias1 should not exist anymore
-    And alias alias2 should not exist anymore
-    And alias "alias3" should have the following details:
-      | alias  | alias3  |
-      | search | alias 3 |
+#  Scenario: I bulk delete aliases
+#    Given I add alias "alias1" with following information:
+#      | alias   | alias1  |
+#      | search  | alias 1 |
+#    Given I add alias "alias2" with following information:
+#      | alias   | alias2  |
+#      | search  | alias 2 |
+#    Given I add alias "alias3" with following information:
+#      | alias   | alias3  |
+#      | search  | alias 3 |
+#    When I bulk delete following aliases:
+#      | reference |
+#      | alias1  |
+#      | alias2  |
+#    Then alias alias1 should not exist anymore
+#    And alias alias2 should not exist anymore
+#    And alias "alias3" should have the following details:
+#      | alias  | alias3  |
+#      | search | alias 3 |

From 7e27c11208605afb52acc450ea701fedf2787726 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Wed, 10 May 2023 14:58:19 +0300
Subject: [PATCH 0167/1030] fix behat tests

---
 .../Context/Domain/AliasFeatureContext.php    |  3 +-
 .../Scenario/Search/delete_alias.feature      | 44 +++++++++++--------
 2 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
index 07684cb2d7c20..b2b2eddb4767f 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
@@ -41,7 +41,6 @@
 use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
 use PrestaShop\PrestaShop\Core\Grid\Query\AliasQueryBuilder;
 use PrestaShop\PrestaShop\Core\Search\Filters;
-use PrestaShopBundle\Exception\NotImplementedException;
 use Tests\Integration\Behaviour\Features\Context\Util\PrimitiveUtils;
 use Tests\Resources\DatabaseDump;
 
@@ -182,7 +181,7 @@ public function bulkDeleteAlias(TableNode $aliasesList): void
         $aliasIds = [];
 
         foreach ($aliasesList->getColumnsHash() as $aliasInfo) {
-            $aliasIds[] = $this->getSharedStorage()->get($aliasInfo['reference'])[0]->getValue();
+            $aliasIds[] = (int) $this->getSharedStorage()->get($aliasInfo['reference']);
         }
 
         try {
diff --git a/tests/Integration/Behaviour/Features/Scenario/Search/delete_alias.feature b/tests/Integration/Behaviour/Features/Scenario/Search/delete_alias.feature
index ed273aa5889d8..515b95b75c399 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Search/delete_alias.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Search/delete_alias.feature
@@ -26,22 +26,28 @@ Feature: Delete aliases from Back Office (BO)
       | alias1       | bloose | blouse |
       | alias2       | blues  | blouse |
 
-#  Scenario: I bulk delete aliases
-#    Given I add alias "alias1" with following information:
-#      | alias   | alias1  |
-#      | search  | alias 1 |
-#    Given I add alias "alias2" with following information:
-#      | alias   | alias2  |
-#      | search  | alias 2 |
-#    Given I add alias "alias3" with following information:
-#      | alias   | alias3  |
-#      | search  | alias 3 |
-#    When I bulk delete following aliases:
-#      | reference |
-#      | alias1  |
-#      | alias2  |
-#    Then alias alias1 should not exist anymore
-#    And alias alias2 should not exist anymore
-#    And alias "alias3" should have the following details:
-#      | alias  | alias3  |
-#      | search | alias 3 |
+  Scenario: I bulk delete aliases
+    Given following aliases should exist:
+      | id reference | alias  | search |
+      | alias1       | bloose | blouse |
+      | alias2       | blues  | blouse |
+    When I add alias with following information:
+      | alias   | large |
+      | search  | big   |
+    And I add alias with following information:
+      | alias   | huge |
+      | search  | big   |
+    Then following aliases should exist:
+      | id reference | alias  | search |
+      | alias1       | bloose | blouse |
+      | alias2       | blues  | blouse |
+      | alias3       | large  | big    |
+      | alias4       | huge   | big    |
+    And I bulk delete following aliases:
+      | reference |
+      | alias3    |
+      | alias4    |
+    Given following aliases should exist:
+      | id reference | alias  | search |
+      | alias1       | bloose | blouse |
+      | alias2       | blues  | blouse |

From 416a783d0ff6c380e55d88a9a77ffb8ab9517f42 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Wed, 10 May 2023 15:16:45 +0300
Subject: [PATCH 0168/1030] add additional comment

---
 src/Adapter/Alias/CommandHandler/AbstractBulkHandler.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Adapter/Alias/CommandHandler/AbstractBulkHandler.php b/src/Adapter/Alias/CommandHandler/AbstractBulkHandler.php
index 39419088b85b4..5f486f56dcb23 100644
--- a/src/Adapter/Alias/CommandHandler/AbstractBulkHandler.php
+++ b/src/Adapter/Alias/CommandHandler/AbstractBulkHandler.php
@@ -33,7 +33,9 @@
 
 /**
  * This abstract class helps us build a bulk handler since the principle is often very similar, it might not be
- * compatible with all the handlers, but it helps for many. The exact copy of Product Abstract Bulk Handler.
+ * compatible with all the handlers, but it helps for many. The exact copy of Product Abstract Bulk Handler
+ *
+ * @see PrestaShop\PrestaShop\Adapter\Product\CommandHandler\AbstracBulkHandler
  */
 abstract class AbstractBulkHandler
 {

From c3e95cd3f2e8de02c8b3362801d7f7d9e32e9e82 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Wed, 10 May 2023 15:26:04 +0300
Subject: [PATCH 0169/1030] fix config file

---
 .../Resources/config/services/adapter/alias.yml           | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml b/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
index 46ff1611e9cec..084b40d3f15b5 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
@@ -21,22 +21,14 @@ services:
         command: PrestaShop\PrestaShop\Core\Domain\Alias\Query\GetAliasForEditing
 
   PrestaShop\PrestaShop\Adapter\Alias\CommandHandler\DeleteAlias:
-    autowire: true
-    public: false
     tags:
       - name: tactician.handler
         command: PrestaShop\PrestaShop\Core\Domain\Alias\Command\DeleteAliasCommand
-    arguments:
-      - '@PrestaShop\PrestaShop\Adapter\Alias\Repository\AliasRepository'
 
   PrestaShop\PrestaShop\Adapter\Alias\CommandHandler\BulkDeleteAlias:
-    autowire: true
-    public: false
     tags:
       - name: tactician.handler
         command: PrestaShop\PrestaShop\Core\Domain\Alias\Command\BulkDeleteAliasCommand
-    arguments:
-      - '@PrestaShop\PrestaShop\Adapter\Alias\Repository\AliasRepository'
 
   PrestaShop\PrestaShop\Adapter\Alias\CommandHandler\UpdateAliasStatusHandler:
     tags:

From 5605a6a0c0651a149c150192f3b2cb5a25f72aec Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Wed, 10 May 2023 17:20:14 +0300
Subject: [PATCH 0170/1030] refactor alias bulk handler

---
 .../CommandHandler/AbstractBulkHandler.php    | 89 -------------------
 .../Alias/CommandHandler/BulkDeleteAlias.php  | 45 ++++++----
 .../BulkDeleteFeatureHandler.php              |  4 +-
 .../Domain/AbstractBulkCommandHandler.php     |  4 +-
 .../Domain/AbstractBulkCommandHandlerTest.php |  4 +-
 5 files changed, 35 insertions(+), 111 deletions(-)
 delete mode 100644 src/Adapter/Alias/CommandHandler/AbstractBulkHandler.php

diff --git a/src/Adapter/Alias/CommandHandler/AbstractBulkHandler.php b/src/Adapter/Alias/CommandHandler/AbstractBulkHandler.php
deleted file mode 100644
index 5f486f56dcb23..0000000000000
--- a/src/Adapter/Alias/CommandHandler/AbstractBulkHandler.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-declare(strict_types=1);
-
-namespace PrestaShop\PrestaShop\Adapter\Alias\CommandHandler;
-
-use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\BulkAliasException;
-use PrestaShop\PrestaShop\Core\Domain\Alias\ValueObject\AliasId;
-
-/**
- * This abstract class helps us build a bulk handler since the principle is often very similar, it might not be
- * compatible with all the handlers, but it helps for many. The exact copy of Product Abstract Bulk Handler
- *
- * @see PrestaShop\PrestaShop\Adapter\Product\CommandHandler\AbstracBulkHandler
- */
-abstract class AbstractBulkHandler
-{
-    /**
-     * @param AliasId[] $aliasIds
-     * @param mixed|null $command
-     *
-     * @return array<int, mixed>
-     *
-     * @throws BulkAliasException
-     */
-    protected function handleBulkAction(array $aliasIds, $command = null): array
-    {
-        $bulkException = null;
-        $actionResults = [];
-        foreach ($aliasIds as $aliasId) {
-            try {
-                $actionResults[$aliasId->getValue()] = $this->handleSingleAction($aliasId, $command);
-            } catch (BulkAliasException $e) {
-                if (null === $bulkException) {
-                    $bulkException = $this->buildBulkException();
-                }
-                $bulkException->addException($aliasId, $e);
-            }
-        }
-
-        if (null !== $bulkException) {
-            throw $bulkException;
-        }
-
-        return $actionResults;
-    }
-
-    /**
-     * This uses the base bulk exception class, but you can override this in your handler.
-     *
-     * @return BulkAliasException
-     */
-    protected function buildBulkException(): BulkAliasException
-    {
-        return new BulkAliasException();
-    }
-
-    /**
-     * @param AliasId $aliasId
-     * @param mixed|null $command
-     *
-     * @return mixed
-     */
-    abstract protected function handleSingleAction(AliasId $aliasId, $command = null);
-}
diff --git a/src/Adapter/Alias/CommandHandler/BulkDeleteAlias.php b/src/Adapter/Alias/CommandHandler/BulkDeleteAlias.php
index 56e008f5b0acf..b3e5218cc93bc 100644
--- a/src/Adapter/Alias/CommandHandler/BulkDeleteAlias.php
+++ b/src/Adapter/Alias/CommandHandler/BulkDeleteAlias.php
@@ -29,15 +29,20 @@
 namespace PrestaShop\PrestaShop\Adapter\Alias\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Alias\Repository\AliasRepository;
+use PrestaShop\PrestaShop\Core\Domain\AbstractBulkCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Command\BulkDeleteAliasCommand;
 use PrestaShop\PrestaShop\Core\Domain\Alias\CommandHandler\BulkDeleteAliasHandlerInterface;
+use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\AliasException;
+use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\BulkAliasException;
 use PrestaShop\PrestaShop\Core\Domain\Alias\ValueObject\AliasId;
+use PrestaShop\PrestaShop\Core\Domain\Exception\BulkCommandExceptionInterface;
+use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\BulkFeatureException;
 use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
 
 /**
  * Handles command which deletes aliases in bulk action
  */
-class BulkDeleteAlias extends AbstractBulkHandler implements BulkDeleteAliasHandlerInterface
+class BulkDeleteAlias extends AbstractBulkCommandHandler implements BulkDeleteAliasHandlerInterface
 {
     /**
      * @var AliasRepository
@@ -54,28 +59,36 @@ public function __construct(AliasRepository $aliasRepository)
      */
     public function handle(BulkDeleteAliasCommand $command): void
     {
-        $this->handleBulkAction($command->getAliasIds(), $command);
+        $this->handleBulkAction($command->getAliasIds(), AliasException::class);
     }
 
     /**
-     * @param AliasId $aliasId
-     * @param BulkDeleteAliasCommand $command
+     * @param AliasId $id
      *
      * @return void
-     *
-     * @throws InvalidArgumentException
      */
-    protected function handleSingleAction(AliasId $aliasId, $command = null)
+    protected function handleSingleAction($id): void
+    {
+        $this->aliasRepository->delete($id);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function buildBulkException(array $caughtExceptions): BulkCommandExceptionInterface
     {
-        if (!($command instanceof BulkDeleteAliasCommand)) {
-            throw new InvalidArgumentException(
-                sprintf(
-                    'Expected argument $command of type "%s". Got "%s"',
-                    BulkDeleteAliasCommand::class,
-                    var_export($command, true)
-                ));
-        }
+        return new BulkAliasException(
+            $caughtExceptions,
+            'Errors occurred during Feature bulk delete action',
+            BulkFeatureException::FAILED_BULK_DELETE
+        );
+    }
 
-        $this->aliasRepository->delete($aliasId);
+    /**
+     * {@inheritDoc}
+     */
+    protected function supports($id): bool
+    {
+        return $id instanceof AliasId;
     }
 }
diff --git a/src/Adapter/Feature/CommandHandler/BulkDeleteFeatureHandler.php b/src/Adapter/Feature/CommandHandler/BulkDeleteFeatureHandler.php
index 5e2e595d9daac..268069ad4be0b 100644
--- a/src/Adapter/Feature/CommandHandler/BulkDeleteFeatureHandler.php
+++ b/src/Adapter/Feature/CommandHandler/BulkDeleteFeatureHandler.php
@@ -68,10 +68,10 @@ protected function handleSingleAction(mixed $id, mixed $command): void
     /**
      * {@inheritDoc}
      */
-    protected function buildBulkException(array $coughtExceptions): BulkCommandExceptionInterface
+    protected function buildBulkException(array $caughtExceptions): BulkCommandExceptionInterface
     {
         return new BulkFeatureException(
-            $coughtExceptions,
+            $caughtExceptions,
             'Errors occurred during Feature bulk delete action',
             BulkFeatureException::FAILED_BULK_DELETE
         );
diff --git a/src/Core/Domain/AbstractBulkCommandHandler.php b/src/Core/Domain/AbstractBulkCommandHandler.php
index 9271c8bf6dcb3..9d56c8b49b7a1 100644
--- a/src/Core/Domain/AbstractBulkCommandHandler.php
+++ b/src/Core/Domain/AbstractBulkCommandHandler.php
@@ -71,11 +71,11 @@ protected function handleBulkAction(array $ids, string $exceptionToCatch, mixed
     }
 
     /**
-     * @param Throwable[] $coughtExceptions
+     * @param Throwable[] $caughtExceptions
      *
      * @return BulkCommandExceptionInterface
      */
-    abstract protected function buildBulkException(array $coughtExceptions): BulkCommandExceptionInterface;
+    abstract protected function buildBulkException(array $caughtExceptions): BulkCommandExceptionInterface;
 
     /**
      * @param mixed $id
diff --git a/tests/Unit/Core/Domain/AbstractBulkCommandHandlerTest.php b/tests/Unit/Core/Domain/AbstractBulkCommandHandlerTest.php
index 79ee87a60f9b8..f0a1a98645106 100644
--- a/tests/Unit/Core/Domain/AbstractBulkCommandHandlerTest.php
+++ b/tests/Unit/Core/Domain/AbstractBulkCommandHandlerTest.php
@@ -173,9 +173,9 @@ public function handle(array $ids, string $exceptionToCatch, mixed $command = nu
         $this->handleBulkAction($ids, $exceptionToCatch, $command);
     }
 
-    protected function buildBulkException(array $coughtExceptions): BulkCommandExceptionInterface
+    protected function buildBulkException(array $caughtExceptions): BulkCommandExceptionInterface
     {
-        return new BulkFeatureException($coughtExceptions, 'test bulk action failed');
+        return new BulkFeatureException($caughtExceptions, 'test bulk action failed');
     }
 
     /**

From 85497e6a760f0708faafff3cffdb57afbf4db18c Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Wed, 10 May 2023 17:23:22 +0300
Subject: [PATCH 0171/1030] fix repository delete function

---
 src/Adapter/Alias/Repository/AliasRepository.php | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/Adapter/Alias/Repository/AliasRepository.php b/src/Adapter/Alias/Repository/AliasRepository.php
index d93a13318dc5a..2b3afb867ea57 100644
--- a/src/Adapter/Alias/Repository/AliasRepository.php
+++ b/src/Adapter/Alias/Repository/AliasRepository.php
@@ -158,14 +158,7 @@ public function getAliasesBySearchTerm(string $searchTerm): array
 
     public function delete(AliasId $aliasId): void
     {
-        /** @var Alias $alias */
-        $alias = $this->getObjectModel(
-            $aliasId->getValue(),
-            Alias::class,
-            AliasNotFoundException::class
-        );
-
-        $alias->delete();
+        $this->get($aliasId)->delete();
     }
 
 

From 9a39bee67f1fb21078daf4abe838531345079a9b Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Wed, 10 May 2023 17:31:14 +0300
Subject: [PATCH 0172/1030] fix tests

---
 .../Context/Domain/AliasFeatureContext.php         | 14 +++++---------
 .../Features/Scenario/Search/delete_alias.feature  |  5 +----
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
index b2b2eddb4767f..55902ea8a2d70 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
@@ -172,20 +172,16 @@ public function deleteAlias(string $reference): void
     }
 
     /**
-     * @When I bulk delete following aliases:
+     * @When I bulk delete aliases :aliasReferences
      *
      * @param TableNode $aliasesList
      */
-    public function bulkDeleteAlias(TableNode $aliasesList): void
+    public function bulkDeleteAlias(string $aliasReferences): void
     {
-        $aliasIds = [];
-
-        foreach ($aliasesList->getColumnsHash() as $aliasInfo) {
-            $aliasIds[] = (int) $this->getSharedStorage()->get($aliasInfo['reference']);
-        }
-
         try {
-            $this->getCommandBus()->handle(new BulkDeleteAliasCommand($aliasIds));
+            $this->getCommandBus()->handle(new BulkDeleteAliasCommand(
+                array_map('intval', $this->referencesToIds($aliasReferences))
+            ));
         } catch (AliasException $e) {
             $this->setLastException($e);
         }
diff --git a/tests/Integration/Behaviour/Features/Scenario/Search/delete_alias.feature b/tests/Integration/Behaviour/Features/Scenario/Search/delete_alias.feature
index 515b95b75c399..f9ef391cbd157 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Search/delete_alias.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Search/delete_alias.feature
@@ -43,10 +43,7 @@ Feature: Delete aliases from Back Office (BO)
       | alias2       | blues  | blouse |
       | alias3       | large  | big    |
       | alias4       | huge   | big    |
-    And I bulk delete following aliases:
-      | reference |
-      | alias3    |
-      | alias4    |
+    And I bulk delete aliases "alias3,alias4"
     Given following aliases should exist:
       | id reference | alias  | search |
       | alias1       | bloose | blouse |

From ff969f65c988546297ca4bff21a7ccabc1cdb062 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Thu, 11 May 2023 08:14:49 +0300
Subject: [PATCH 0173/1030] fix code review comments

---
 src/Adapter/Alias/CommandHandler/BulkDeleteAlias.php            | 2 +-
 .../Behaviour/Features/Context/Domain/AliasFeatureContext.php   | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Adapter/Alias/CommandHandler/BulkDeleteAlias.php b/src/Adapter/Alias/CommandHandler/BulkDeleteAlias.php
index b3e5218cc93bc..f83d0127e494c 100644
--- a/src/Adapter/Alias/CommandHandler/BulkDeleteAlias.php
+++ b/src/Adapter/Alias/CommandHandler/BulkDeleteAlias.php
@@ -79,7 +79,7 @@ protected function buildBulkException(array $caughtExceptions): BulkCommandExcep
     {
         return new BulkAliasException(
             $caughtExceptions,
-            'Errors occurred during Feature bulk delete action',
+            'Errors occurred during Alias bulk delete action',
             BulkFeatureException::FAILED_BULK_DELETE
         );
     }
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
index 55902ea8a2d70..f31820d018214 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
@@ -173,8 +173,6 @@ public function deleteAlias(string $reference): void
 
     /**
      * @When I bulk delete aliases :aliasReferences
-     *
-     * @param TableNode $aliasesList
      */
     public function bulkDeleteAlias(string $aliasReferences): void
     {

From cae92ec3e9412fefd5cd5f758d98daf72b6a6605 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Mon, 15 May 2023 18:26:56 +0300
Subject: [PATCH 0174/1030] fix alias id type

---
 .../Features/Context/Domain/AliasFeatureContext.php         | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
index f31820d018214..6bef7c22d1345 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
@@ -92,7 +92,7 @@ public function assertAliasesList(TableNode $table): void
         $idsByIdReferences = $this->assertAliasProperties($expectedAliases, $aliases);
 
         foreach ($idsByIdReferences as $reference => $id) {
-            $this->getSharedStorage()->set($reference, $id);
+            $this->getSharedStorage()->set($reference, (int) $id);
         }
     }
 
@@ -177,9 +177,7 @@ public function deleteAlias(string $reference): void
     public function bulkDeleteAlias(string $aliasReferences): void
     {
         try {
-            $this->getCommandBus()->handle(new BulkDeleteAliasCommand(
-                array_map('intval', $this->referencesToIds($aliasReferences))
-            ));
+            $this->getCommandBus()->handle(new BulkDeleteAliasCommand($this->referencesToIds($aliasReferences)));
         } catch (AliasException $e) {
             $this->setLastException($e);
         }

From a3e7b8a35b4850ba0491e8ae6f9b54dd7d835f73 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Mon, 15 May 2023 18:30:43 +0300
Subject: [PATCH 0175/1030] remove unused import

---
 src/Adapter/Alias/CommandHandler/BulkDeleteAlias.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Adapter/Alias/CommandHandler/BulkDeleteAlias.php b/src/Adapter/Alias/CommandHandler/BulkDeleteAlias.php
index f83d0127e494c..c31aa9c70d046 100644
--- a/src/Adapter/Alias/CommandHandler/BulkDeleteAlias.php
+++ b/src/Adapter/Alias/CommandHandler/BulkDeleteAlias.php
@@ -37,7 +37,6 @@
 use PrestaShop\PrestaShop\Core\Domain\Alias\ValueObject\AliasId;
 use PrestaShop\PrestaShop\Core\Domain\Exception\BulkCommandExceptionInterface;
 use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\BulkFeatureException;
-use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
 
 /**
  * Handles command which deletes aliases in bulk action

From 4a461015d634efeb3b5dc487b1964e58b4d0a52b Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Tue, 16 May 2023 16:12:02 +0300
Subject: [PATCH 0176/1030] rename delete alias handlers

---
 .../{BulkDeleteAlias.php => BulkDeleteAliasHandler.php}       | 2 +-
 .../{DeleteAlias.php => DeleteAliasHandler.php}               | 2 +-
 .../Resources/config/services/adapter/alias.yml               | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename src/Adapter/Alias/CommandHandler/{BulkDeleteAlias.php => BulkDeleteAliasHandler.php} (96%)
 rename src/Adapter/Alias/CommandHandler/{DeleteAlias.php => DeleteAliasHandler.php} (96%)

diff --git a/src/Adapter/Alias/CommandHandler/BulkDeleteAlias.php b/src/Adapter/Alias/CommandHandler/BulkDeleteAliasHandler.php
similarity index 96%
rename from src/Adapter/Alias/CommandHandler/BulkDeleteAlias.php
rename to src/Adapter/Alias/CommandHandler/BulkDeleteAliasHandler.php
index c31aa9c70d046..9a1a781927331 100644
--- a/src/Adapter/Alias/CommandHandler/BulkDeleteAlias.php
+++ b/src/Adapter/Alias/CommandHandler/BulkDeleteAliasHandler.php
@@ -41,7 +41,7 @@
 /**
  * Handles command which deletes aliases in bulk action
  */
-class BulkDeleteAlias extends AbstractBulkCommandHandler implements BulkDeleteAliasHandlerInterface
+class BulkDeleteAliasHandler extends AbstractBulkCommandHandler implements BulkDeleteAliasHandlerInterface
 {
     /**
      * @var AliasRepository
diff --git a/src/Adapter/Alias/CommandHandler/DeleteAlias.php b/src/Adapter/Alias/CommandHandler/DeleteAliasHandler.php
similarity index 96%
rename from src/Adapter/Alias/CommandHandler/DeleteAlias.php
rename to src/Adapter/Alias/CommandHandler/DeleteAliasHandler.php
index 9814f76604a99..ffb23ef3caeb9 100644
--- a/src/Adapter/Alias/CommandHandler/DeleteAlias.php
+++ b/src/Adapter/Alias/CommandHandler/DeleteAliasHandler.php
@@ -32,7 +32,7 @@
 use PrestaShop\PrestaShop\Core\Domain\Alias\Command\DeleteAliasCommand;
 use PrestaShop\PrestaShop\Core\Domain\Alias\CommandHandler\DeleteAliasHandlerInterface;
 
-class DeleteAlias implements DeleteAliasHandlerInterface
+class DeleteAliasHandler implements DeleteAliasHandlerInterface
 {
     /**
      * @var AliasRepository
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml b/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
index 084b40d3f15b5..d0226a6a8d48d 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
@@ -20,12 +20,12 @@ services:
       - name: tactician.handler
         command: PrestaShop\PrestaShop\Core\Domain\Alias\Query\GetAliasForEditing
 
-  PrestaShop\PrestaShop\Adapter\Alias\CommandHandler\DeleteAlias:
+  PrestaShop\PrestaShop\Adapter\Alias\CommandHandler\DeleteAliasHandler:
     tags:
       - name: tactician.handler
         command: PrestaShop\PrestaShop\Core\Domain\Alias\Command\DeleteAliasCommand
 
-  PrestaShop\PrestaShop\Adapter\Alias\CommandHandler\BulkDeleteAlias:
+  PrestaShop\PrestaShop\Adapter\Alias\CommandHandler\BulkDeleteAliasHandler:
     tags:
       - name: tactician.handler
         command: PrestaShop\PrestaShop\Core\Domain\Alias\Command\BulkDeleteAliasCommand

From 55aaf48696ef79125656110b358d4c2bfab5f773 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Mon, 22 May 2023 14:13:13 +0300
Subject: [PATCH 0177/1030] format alias feature

---
 .../Features/Scenario/Search/delete_alias.feature    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Scenario/Search/delete_alias.feature b/tests/Integration/Behaviour/Features/Scenario/Search/delete_alias.feature
index f9ef391cbd157..b4fe3bb341fbf 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Search/delete_alias.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Search/delete_alias.feature
@@ -13,8 +13,8 @@ Feature: Delete aliases from Back Office (BO)
       | alias1       | bloose | blouse |
       | alias2       | blues  | blouse |
     When I add alias with following information:
-      | alias   | large |
-      | search  | big   |
+      | alias  | large |
+      | search | big   |
     Then following aliases should exist:
       | id reference | alias  | search |
       | alias1       | bloose | blouse |
@@ -32,11 +32,11 @@ Feature: Delete aliases from Back Office (BO)
       | alias1       | bloose | blouse |
       | alias2       | blues  | blouse |
     When I add alias with following information:
-      | alias   | large |
-      | search  | big   |
+      | alias  | large |
+      | search | big   |
     And I add alias with following information:
-      | alias   | huge |
-      | search  | big   |
+      | alias  | huge |
+      | search | big  |
     Then following aliases should exist:
       | id reference | alias  | search |
       | alias1       | bloose | blouse |

From 278667912ebbb418c654a4fb578fa6e218598c60 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Mon, 22 May 2023 15:19:35 +0300
Subject: [PATCH 0178/1030] add types ain bulk delete handler

---
 .../Alias/CommandHandler/BulkDeleteAliasHandler.php  | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/Adapter/Alias/CommandHandler/BulkDeleteAliasHandler.php b/src/Adapter/Alias/CommandHandler/BulkDeleteAliasHandler.php
index 9a1a781927331..af3b3150b11fa 100644
--- a/src/Adapter/Alias/CommandHandler/BulkDeleteAliasHandler.php
+++ b/src/Adapter/Alias/CommandHandler/BulkDeleteAliasHandler.php
@@ -43,14 +43,8 @@
  */
 class BulkDeleteAliasHandler extends AbstractBulkCommandHandler implements BulkDeleteAliasHandlerInterface
 {
-    /**
-     * @var AliasRepository
-     */
-    private $aliasRepository;
-
-    public function __construct(AliasRepository $aliasRepository)
+    public function __construct(private readonly AliasRepository $aliasRepository)
     {
-        $this->aliasRepository = $aliasRepository;
     }
 
     /**
@@ -66,7 +60,7 @@ public function handle(BulkDeleteAliasCommand $command): void
      *
      * @return void
      */
-    protected function handleSingleAction($id): void
+    protected function handleSingleAction(object $id): void
     {
         $this->aliasRepository->delete($id);
     }
@@ -86,7 +80,7 @@ protected function buildBulkException(array $caughtExceptions): BulkCommandExcep
     /**
      * {@inheritDoc}
      */
-    protected function supports($id): bool
+    protected function supports(object $id): bool
     {
         return $id instanceof AliasId;
     }

From 705821bae49e424abf353cbfc1ac1661ea45ed31 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Mon, 22 May 2023 15:34:14 +0300
Subject: [PATCH 0179/1030] fix alias repository and handler types

---
 .../CommandHandler/DeleteAliasHandler.php     |  8 +-----
 .../Alias/Repository/AliasRepository.php      | 25 +++++--------------
 2 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/src/Adapter/Alias/CommandHandler/DeleteAliasHandler.php b/src/Adapter/Alias/CommandHandler/DeleteAliasHandler.php
index ffb23ef3caeb9..a97c5558c0b33 100644
--- a/src/Adapter/Alias/CommandHandler/DeleteAliasHandler.php
+++ b/src/Adapter/Alias/CommandHandler/DeleteAliasHandler.php
@@ -34,14 +34,8 @@
 
 class DeleteAliasHandler implements DeleteAliasHandlerInterface
 {
-    /**
-     * @var AliasRepository
-     */
-    private $aliasRepository;
-
-    public function __construct(AliasRepository $aliasRepository)
+    public function __construct(private readonly AliasRepository $aliasRepository)
     {
-        $this->aliasRepository = $aliasRepository;
     }
 
     /**
diff --git a/src/Adapter/Alias/Repository/AliasRepository.php b/src/Adapter/Alias/Repository/AliasRepository.php
index 2b3afb867ea57..3546860d57f63 100644
--- a/src/Adapter/Alias/Repository/AliasRepository.php
+++ b/src/Adapter/Alias/Repository/AliasRepository.php
@@ -43,28 +43,15 @@
 class AliasRepository extends AbstractObjectModelRepository
 {
     /**
-     * @var Connection
+     * @param Connection $connection
+     * @param string $dbPrefix
+     * @param AliasValidator $aliasValidator
      */
-    private $connection;
-
-    /**
-     * @var string
-     */
-    private $dbPrefix;
-
-    /**
-     * @var AliasValidator
-     */
-    private $aliasValidator;
-
     public function __construct(
-        Connection $connection,
-        string $dbPrefix,
-        AliasValidator $aliasValidator
+        private readonly Connection $connection,
+        private readonly string $dbPrefix,
+        private readonly AliasValidator $aliasValidator
     ) {
-        $this->aliasValidator = $aliasValidator;
-        $this->connection = $connection;
-        $this->dbPrefix = $dbPrefix;
     }
 
     /**

From 0257fc26e635e4621e17256ad63d59e0c984ec8a Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Mon, 22 May 2023 15:54:12 +0300
Subject: [PATCH 0180/1030] refactor types

---
 .../Alias/CommandHandler/BulkDeleteAliasHandler.php        | 4 ++--
 src/Core/Domain/Alias/Command/BulkDeleteAliasCommand.php   | 7 +------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/Adapter/Alias/CommandHandler/BulkDeleteAliasHandler.php b/src/Adapter/Alias/CommandHandler/BulkDeleteAliasHandler.php
index af3b3150b11fa..7560c8daf7af2 100644
--- a/src/Adapter/Alias/CommandHandler/BulkDeleteAliasHandler.php
+++ b/src/Adapter/Alias/CommandHandler/BulkDeleteAliasHandler.php
@@ -43,7 +43,7 @@
  */
 class BulkDeleteAliasHandler extends AbstractBulkCommandHandler implements BulkDeleteAliasHandlerInterface
 {
-    public function __construct(private readonly AliasRepository $aliasRepository)
+    public function __construct(protected AliasRepository $aliasRepository)
     {
     }
 
@@ -80,7 +80,7 @@ protected function buildBulkException(array $caughtExceptions): BulkCommandExcep
     /**
      * {@inheritDoc}
      */
-    protected function supports(object $id): bool
+    protected function supports(mixed $id): bool
     {
         return $id instanceof AliasId;
     }
diff --git a/src/Core/Domain/Alias/Command/BulkDeleteAliasCommand.php b/src/Core/Domain/Alias/Command/BulkDeleteAliasCommand.php
index 61c176692732b..62cd6ba1320f3 100644
--- a/src/Core/Domain/Alias/Command/BulkDeleteAliasCommand.php
+++ b/src/Core/Domain/Alias/Command/BulkDeleteAliasCommand.php
@@ -36,17 +36,12 @@
  */
 class BulkDeleteAliasCommand
 {
-    /**
-     * @var AliasId[]
-     */
-    private $aliasIds;
-
     /**
      * @param int[] $aliasIds
      *
      * @throws AliasConstraintException
      */
-    public function __construct(array $aliasIds)
+    public function __construct(private array $aliasIds)
     {
         foreach ($aliasIds as $aliasId) {
             $this->aliasIds[] = new AliasId($aliasId);

From d3f8920635e543206a292a195410e07878b9f9e3 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Mon, 22 May 2023 16:13:28 +0300
Subject: [PATCH 0181/1030] revert delete alias command

---
 src/Adapter/Alias/Repository/AliasRepository.php         | 6 +++---
 src/Core/Domain/Alias/Command/BulkDeleteAliasCommand.php | 7 ++++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/Adapter/Alias/Repository/AliasRepository.php b/src/Adapter/Alias/Repository/AliasRepository.php
index 3546860d57f63..57e50034dc8fc 100644
--- a/src/Adapter/Alias/Repository/AliasRepository.php
+++ b/src/Adapter/Alias/Repository/AliasRepository.php
@@ -48,9 +48,9 @@ class AliasRepository extends AbstractObjectModelRepository
      * @param AliasValidator $aliasValidator
      */
     public function __construct(
-        private readonly Connection $connection,
-        private readonly string $dbPrefix,
-        private readonly AliasValidator $aliasValidator
+        protected Connection $connection,
+        protected string $dbPrefix,
+        protected AliasValidator $aliasValidator
     ) {
     }
 
diff --git a/src/Core/Domain/Alias/Command/BulkDeleteAliasCommand.php b/src/Core/Domain/Alias/Command/BulkDeleteAliasCommand.php
index 62cd6ba1320f3..7707b531d1420 100644
--- a/src/Core/Domain/Alias/Command/BulkDeleteAliasCommand.php
+++ b/src/Core/Domain/Alias/Command/BulkDeleteAliasCommand.php
@@ -36,12 +36,17 @@
  */
 class BulkDeleteAliasCommand
 {
+    /**
+     * @var AliasId[]
+     */
+    private array $aliasIds;
+
     /**
      * @param int[] $aliasIds
      *
      * @throws AliasConstraintException
      */
-    public function __construct(private array $aliasIds)
+    public function __construct(array $aliasIds)
     {
         foreach ($aliasIds as $aliasId) {
             $this->aliasIds[] = new AliasId($aliasId);

From 03668013739e79134c9a23bb9ab2268a4f604ed7 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Mon, 22 May 2023 16:19:27 +0300
Subject: [PATCH 0182/1030] simplify delete alias command

---
 .../Alias/CommandHandler/DeleteAliasHandler.php  |  2 +-
 .../Domain/Alias/Command/DeleteAliasCommand.php  | 16 +---------------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/Adapter/Alias/CommandHandler/DeleteAliasHandler.php b/src/Adapter/Alias/CommandHandler/DeleteAliasHandler.php
index a97c5558c0b33..4f1672485e6ce 100644
--- a/src/Adapter/Alias/CommandHandler/DeleteAliasHandler.php
+++ b/src/Adapter/Alias/CommandHandler/DeleteAliasHandler.php
@@ -43,6 +43,6 @@ public function __construct(private readonly AliasRepository $aliasRepository)
      */
     public function handle(DeleteAliasCommand $command): void
     {
-        $this->aliasRepository->delete($command->getAliasId());
+        $this->aliasRepository->delete($command->aliasId);
     }
 }
diff --git a/src/Core/Domain/Alias/Command/DeleteAliasCommand.php b/src/Core/Domain/Alias/Command/DeleteAliasCommand.php
index 496b539839a6e..58f8cccaba87a 100644
--- a/src/Core/Domain/Alias/Command/DeleteAliasCommand.php
+++ b/src/Core/Domain/Alias/Command/DeleteAliasCommand.php
@@ -35,21 +35,7 @@
  */
 class DeleteAliasCommand
 {
-    /**
-     * @var AliasId
-     */
-    private $aliasId;
-
-    public function __construct(AliasId $aliasId)
-    {
-        $this->aliasId = $aliasId;
-    }
-
-    /**
-     * @return AliasId
-     */
-    public function getAliasId(): AliasId
+    public function __construct(public readonly AliasId $aliasId)
     {
-        return $this->aliasId;
     }
 }

From ea9aada99319d6a7b0e71e3437c9a6252f5497ef Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Tue, 23 May 2023 12:33:33 +0300
Subject: [PATCH 0183/1030] fix argument type

---
 src/Adapter/Alias/CommandHandler/BulkDeleteAliasHandler.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Adapter/Alias/CommandHandler/BulkDeleteAliasHandler.php b/src/Adapter/Alias/CommandHandler/BulkDeleteAliasHandler.php
index 7560c8daf7af2..3816e4b3274f1 100644
--- a/src/Adapter/Alias/CommandHandler/BulkDeleteAliasHandler.php
+++ b/src/Adapter/Alias/CommandHandler/BulkDeleteAliasHandler.php
@@ -60,7 +60,7 @@ public function handle(BulkDeleteAliasCommand $command): void
      *
      * @return void
      */
-    protected function handleSingleAction(object $id): void
+    protected function handleSingleAction(mixed $id): void
     {
         $this->aliasRepository->delete($id);
     }

From 19b894c0b6d9a5711bcd6508b3c25d261c6153b8 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Tue, 23 May 2023 12:38:40 +0300
Subject: [PATCH 0184/1030] fix alias deletion

---
 src/Adapter/Alias/Repository/AliasRepository.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Adapter/Alias/Repository/AliasRepository.php b/src/Adapter/Alias/Repository/AliasRepository.php
index 57e50034dc8fc..ead04d54d469f 100644
--- a/src/Adapter/Alias/Repository/AliasRepository.php
+++ b/src/Adapter/Alias/Repository/AliasRepository.php
@@ -145,7 +145,7 @@ public function getAliasesBySearchTerm(string $searchTerm): array
 
     public function delete(AliasId $aliasId): void
     {
-        $this->get($aliasId)->delete();
+        $this->deleteObjectModel($this->get($aliasId), CannotDeleteAliasException::class);
     }
 
 

From 21b828f0c97beeb16552a10aa6896fa2172591c3 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Wed, 31 May 2023 03:24:54 +0300
Subject: [PATCH 0185/1030] fix bulk alias exception

---
 src/Core/Domain/Alias/Exception/BulkAliasException.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Core/Domain/Alias/Exception/BulkAliasException.php b/src/Core/Domain/Alias/Exception/BulkAliasException.php
index f700c941f81c2..a863aad7ea8ee 100644
--- a/src/Core/Domain/Alias/Exception/BulkAliasException.php
+++ b/src/Core/Domain/Alias/Exception/BulkAliasException.php
@@ -37,8 +37,12 @@
  */
 class BulkAliasException extends AliasException implements BulkCommandExceptionInterface
 {
-    public const FAILED_BULK_DELETE = 1;
-
+    /**
+     * @param Throwable[] $exceptions
+     * @param string $message
+     * @param int $code
+     * @param Throwable|null $previous
+     */
     public function __construct(
         private readonly array $exceptions,
         string $message = 'Errors occurred during Alias bulk action',

From 1cc7a97a50ab4cd637c861b81cc6c9adaccb574c Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Wed, 31 May 2023 03:28:33 +0300
Subject: [PATCH 0186/1030] fix bulk delete action

---
 src/Adapter/Alias/CommandHandler/BulkDeleteAliasHandler.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Adapter/Alias/CommandHandler/BulkDeleteAliasHandler.php b/src/Adapter/Alias/CommandHandler/BulkDeleteAliasHandler.php
index 3816e4b3274f1..96d24f0f82c30 100644
--- a/src/Adapter/Alias/CommandHandler/BulkDeleteAliasHandler.php
+++ b/src/Adapter/Alias/CommandHandler/BulkDeleteAliasHandler.php
@@ -57,10 +57,11 @@ public function handle(BulkDeleteAliasCommand $command): void
 
     /**
      * @param AliasId $id
+     * @param mixed $command
      *
      * @return void
      */
-    protected function handleSingleAction(mixed $id): void
+    protected function handleSingleAction(mixed $id, mixed $command): void
     {
         $this->aliasRepository->delete($id);
     }

From f66302b9c2f784cea111c40df5cbc9ffe813be50 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Wed, 31 May 2023 04:02:04 +0300
Subject: [PATCH 0187/1030] csfixer fixes

---
 src/Adapter/Alias/Repository/AliasRepository.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Adapter/Alias/Repository/AliasRepository.php b/src/Adapter/Alias/Repository/AliasRepository.php
index ead04d54d469f..c1eab578aff7c 100644
--- a/src/Adapter/Alias/Repository/AliasRepository.php
+++ b/src/Adapter/Alias/Repository/AliasRepository.php
@@ -148,7 +148,6 @@ public function delete(AliasId $aliasId): void
         $this->deleteObjectModel($this->get($aliasId), CannotDeleteAliasException::class);
     }
 
-
     /**
      * @param Alias $alias
      * @param string[] $propertiesToUpdate

From dbf7832a00cb35334943765049a4eda8d717aab3 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Mon, 19 Jun 2023 15:55:19 +0300
Subject: [PATCH 0188/1030] csfixer fixes

---
 .../Behaviour/Features/Context/Domain/AliasFeatureContext.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
index 6bef7c22d1345..f7d300911dadf 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
@@ -33,8 +33,8 @@
 use PrestaShop\PrestaShop\Core\Domain\Alias\Command\AddAliasCommand;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Command\BulkDeleteAliasCommand;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Command\BulkUpdateAliasStatusCommand;
-use PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasCommand;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Command\DeleteAliasCommand;
+use PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasCommand;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\AliasException;
 use PrestaShop\PrestaShop\Core\Domain\Alias\ValueObject\AliasId;

From 123591f0ab03120f41a2d4bd035e6cf6ba66a6f7 Mon Sep 17 00:00:00 2001
From: Jens Wilke <jw_github@headissue.com>
Date: Mon, 19 Jun 2023 15:17:46 +0200
Subject: [PATCH 0189/1030] remove Configuration::hasKey from getShopLogo,
 https://github.com/PrestaShop/PrestaShop/issues/30373

---
 classes/controller/FrontController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php
index cfbbc632db1d1..9feeff7b6f3ef 100644
--- a/classes/controller/FrontController.php
+++ b/classes/controller/FrontController.php
@@ -1587,7 +1587,7 @@ public function getTemplateVarCustomer($customer = null)
     public function getShopLogo(): array
     {
         $logoFileName = Configuration::get('PS_LOGO');
-        if ($logoFileName == null) {
+        if (!$logoFileName) {
             return [];
         }
 

From b694eb7ee4b5f1f259b52c8c1d316919131addda Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Mon, 19 Jun 2023 17:03:53 +0300
Subject: [PATCH 0190/1030] remove error code

---
 src/Adapter/Alias/CommandHandler/BulkDeleteAliasHandler.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Adapter/Alias/CommandHandler/BulkDeleteAliasHandler.php b/src/Adapter/Alias/CommandHandler/BulkDeleteAliasHandler.php
index 96d24f0f82c30..14cd145b63556 100644
--- a/src/Adapter/Alias/CommandHandler/BulkDeleteAliasHandler.php
+++ b/src/Adapter/Alias/CommandHandler/BulkDeleteAliasHandler.php
@@ -74,7 +74,6 @@ protected function buildBulkException(array $caughtExceptions): BulkCommandExcep
         return new BulkAliasException(
             $caughtExceptions,
             'Errors occurred during Alias bulk delete action',
-            BulkFeatureException::FAILED_BULK_DELETE
         );
     }
 

From e6a1ead1f5de34701d42b3842e1ea1309cef66be Mon Sep 17 00:00:00 2001
From: lartist <salim-benouamer.ext@prestashop.com>
Date: Mon, 19 Jun 2023 15:12:37 +0200
Subject: [PATCH 0191/1030] Remove unused symfony librairies

---
 composer.json |   8 +-
 composer.lock | 550 +-------------------------------------------------
 2 files changed, 2 insertions(+), 556 deletions(-)

diff --git a/composer.json b/composer.json
index b2e3c75e436a8..f3622b9363c54 100644
--- a/composer.json
+++ b/composer.json
@@ -136,7 +136,7 @@
         "symfony/config": "5.4.*",
         "symfony/console": "5.4.*",
         "symfony/dependency-injection": "5.4.*",
-        "symfony/doctrine-messenger": "^5.4",
+        "symfony/doctrine-messenger": "5.4.*",
         "symfony/dom-crawler": "5.4.*",
         "symfony/dotenv": "5.4.*",
         "symfony/error-handler": "5.4.*",
@@ -148,14 +148,12 @@
         "symfony/http-client": "5.4.*",
         "symfony/http-foundation": "5.4.*",
         "symfony/http-kernel": "5.4.*",
-        "symfony/inflector": "5.4.*",
         "symfony/intl": "5.4.*",
         "symfony/lock": "5.4.*",
         "symfony/mailer": "5.4.*",
         "symfony/messenger": "5.4.*",
         "symfony/mime": "5.4.*",
         "symfony/monolog-bundle": "^3.7.0",
-        "symfony/notifier": "5.4.*",
         "symfony/options-resolver": "5.4.*",
         "symfony/password-hasher": "5.4.*",
         "symfony/polyfill-php73": "^1.10",
@@ -164,25 +162,21 @@
         "symfony/property-info": "5.4.*",
         "symfony/proxy-manager-bridge": "5.4.*",
         "symfony/psr-http-message-bridge": "^2.1",
-        "symfony/rate-limiter": "5.4.*",
         "symfony/routing": "5.4.*",
         "symfony/security-bundle": "5.4.*",
         "symfony/security-core": "5.4.*",
         "symfony/security-csrf": "5.4.*",
         "symfony/security-guard": "5.4.*",
         "symfony/security-http": "5.4.*",
-        "symfony/semaphore": "5.4.*",
         "symfony/serializer": "5.4.*",
         "symfony/string": "5.4.*",
         "symfony/templating": "5.4.*",
         "symfony/translation": "5.4.*",
         "symfony/twig-bundle": "5.4.*",
-        "symfony/uid": "5.4.*",
         "symfony/validator": "5.4.*",
         "symfony/var-dumper": "5.4.*",
         "symfony/var-exporter": "5.4.*",
         "symfony/web-link": "5.4.*",
-        "symfony/workflow": "5.4.*",
         "symfony/yaml": "5.4.*",
         "tecnickcom/tcpdf": "^6.2.12",
         "tijsverkoyen/css-to-inline-styles": "^2.2",
diff --git a/composer.lock b/composer.lock
index 939c59fc0fe0e..14df51e50d7da 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "2af9c8d5f804d5b155630f3a5ac5e9d4",
+    "content-hash": "b53c58fd0c6b584e404e192d49d23363",
     "packages": [
         {
             "name": "api-platform/core",
@@ -10859,79 +10859,6 @@
             ],
             "time": "2023-04-28T13:29:52+00:00"
         },
-        {
-            "name": "symfony/inflector",
-            "version": "v5.4.21",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/inflector.git",
-                "reference": "d56964e2b19253ba331a829c20d911dd27aa61b6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/inflector/zipball/d56964e2b19253ba331a829c20d911dd27aa61b6",
-                "reference": "d56964e2b19253ba331a829c20d911dd27aa61b6",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2.5",
-                "symfony/deprecation-contracts": "^2.1|^3",
-                "symfony/polyfill-php80": "^1.16",
-                "symfony/string": "^5.3.10|^6.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Inflector\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@gmail.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Converts words between their singular and plural forms (English only)",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "inflection",
-                "pluralize",
-                "singularize",
-                "string",
-                "symfony",
-                "words"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/inflector/tree/v5.4.21"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "abandoned": "EnglishInflector from the String component",
-            "time": "2023-02-14T08:03:56+00:00"
-        },
         {
             "name": "symfony/intl",
             "version": "v5.4.23",
@@ -11514,101 +11441,6 @@
             ],
             "time": "2022-05-10T14:24:36+00:00"
         },
-        {
-            "name": "symfony/notifier",
-            "version": "v5.4.22",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/notifier.git",
-                "reference": "5ea626671ee3875f32c887467a47697bed83e6d4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/notifier/zipball/5ea626671ee3875f32c887467a47697bed83e6d4",
-                "reference": "5ea626671ee3875f32c887467a47697bed83e6d4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2.5",
-                "psr/log": "^1|^2|^3",
-                "symfony/polyfill-php80": "^1.15"
-            },
-            "conflict": {
-                "symfony/discord-notifier": "<5.3",
-                "symfony/esendex-notifier": "<5.3",
-                "symfony/firebase-notifier": "<5.3",
-                "symfony/free-mobile-notifier": "<5.3",
-                "symfony/google-chat-notifier": "<5.3",
-                "symfony/http-kernel": "<4.4",
-                "symfony/infobip-notifier": "<5.3",
-                "symfony/linked-in-notifier": "<5.3",
-                "symfony/mattermost-notifier": "<5.3",
-                "symfony/mobyt-notifier": "<5.3",
-                "symfony/nexmo-notifier": "<5.3",
-                "symfony/ovh-cloud-notifier": "<5.3",
-                "symfony/rocket-chat-notifier": "<5.3",
-                "symfony/sendinblue-notifier": "<5.3",
-                "symfony/sinch-notifier": "<5.3",
-                "symfony/slack-notifier": "<5.3",
-                "symfony/sms77-notifier": "<5.3",
-                "symfony/smsapi-notifier": "<5.3",
-                "symfony/telegram-notifier": "<5.3",
-                "symfony/twilio-notifier": "<5.3",
-                "symfony/zulip-notifier": "<5.3"
-            },
-            "require-dev": {
-                "symfony/event-dispatcher-contracts": "^2|^3",
-                "symfony/http-client-contracts": "^2|^3",
-                "symfony/messenger": "^4.4|^5.0|^6.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Notifier\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Sends notifications via one or more channels (email, SMS, ...)",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "notification",
-                "notifier"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/notifier/tree/v5.4.22"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2023-03-10T09:58:14+00:00"
-        },
         {
             "name": "symfony/options-resolver",
             "version": "v5.4.21",
@@ -12572,88 +12404,6 @@
             ],
             "time": "2022-11-03T14:55:06+00:00"
         },
-        {
-            "name": "symfony/polyfill-uuid",
-            "version": "v1.27.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-uuid.git",
-                "reference": "f3cf1a645c2734236ed1e2e671e273eeb3586166"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/f3cf1a645c2734236ed1e2e671e273eeb3586166",
-                "reference": "f3cf1a645c2734236ed1e2e671e273eeb3586166",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "provide": {
-                "ext-uuid": "*"
-            },
-            "suggest": {
-                "ext-uuid": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.27-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Uuid\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Grégoire Pineau",
-                    "email": "lyrixx@lyrixx.info"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for uuid functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "uuid"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-uuid/tree/v1.27.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-11-03T14:55:06+00:00"
-        },
         {
             "name": "symfony/process",
             "version": "v5.4.23",
@@ -13043,76 +12793,6 @@
             ],
             "time": "2022-09-05T10:34:54+00:00"
         },
-        {
-            "name": "symfony/rate-limiter",
-            "version": "v5.4.21",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/rate-limiter.git",
-                "reference": "342acb2d23f6012f6150e7a8b167bf9cd931c0f8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/rate-limiter/zipball/342acb2d23f6012f6150e7a8b167bf9cd931c0f8",
-                "reference": "342acb2d23f6012f6150e7a8b167bf9cd931c0f8",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2.5",
-                "symfony/lock": "^5.2|^6.0",
-                "symfony/options-resolver": "^5.1|^6.0"
-            },
-            "require-dev": {
-                "psr/cache": "^1.0|^2.0|^3.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\RateLimiter\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Wouter de Jong",
-                    "email": "wouter@wouterj.nl"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Provides a Token Bucket implementation to rate limit input and output in your application",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "limiter",
-                "rate-limiter"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/rate-limiter/tree/v5.4.21"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2023-02-21T19:46:44+00:00"
-        },
         {
             "name": "symfony/redis-messenger",
             "version": "v5.4.23",
@@ -13689,78 +13369,6 @@
             ],
             "time": "2023-04-21T11:34:27+00:00"
         },
-        {
-            "name": "symfony/semaphore",
-            "version": "v5.4.21",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/semaphore.git",
-                "reference": "f268ab07e2c7c2e8572d8cef4db8580b3620a3f3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/semaphore/zipball/f268ab07e2c7c2e8572d8cef4db8580b3620a3f3",
-                "reference": "f268ab07e2c7c2e8572d8cef4db8580b3620a3f3",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2.5",
-                "psr/log": "^1|^2|^3"
-            },
-            "require-dev": {
-                "predis/predis": "~1.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Semaphore\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Grégoire Pineau",
-                    "email": "lyrixx@lyrixx.info"
-                },
-                {
-                    "name": "Jérémy Derussé",
-                    "email": "jeremy@derusse.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Semaphore Component",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "semaphore"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/semaphore/tree/v5.4.21"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2023-02-16T09:33:00+00:00"
-        },
         {
             "name": "symfony/serializer",
             "version": "v5.4.23",
@@ -14486,80 +14094,6 @@
             ],
             "time": "2023-02-14T08:03:56+00:00"
         },
-        {
-            "name": "symfony/uid",
-            "version": "v5.4.21",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/uid.git",
-                "reference": "a30744506976aafc807ccb0d4f95865c0a690d02"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/uid/zipball/a30744506976aafc807ccb0d4f95865c0a690d02",
-                "reference": "a30744506976aafc807ccb0d4f95865c0a690d02",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2.5",
-                "symfony/polyfill-uuid": "^1.15"
-            },
-            "require-dev": {
-                "symfony/console": "^4.4|^5.0|^6.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Uid\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Grégoire Pineau",
-                    "email": "lyrixx@lyrixx.info"
-                },
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Provides an object-oriented API to generate and represent UIDs",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "UID",
-                "ulid",
-                "uuid"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/uid/tree/v5.4.21"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2023-02-14T08:03:56+00:00"
-        },
         {
             "name": "symfony/validator",
             "version": "v5.4.23",
@@ -14922,88 +14456,6 @@
             ],
             "time": "2023-02-14T08:03:56+00:00"
         },
-        {
-            "name": "symfony/workflow",
-            "version": "v5.4.21",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/workflow.git",
-                "reference": "96ec1843a27c7d3574bd521b807aa18101e31764"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/workflow/zipball/96ec1843a27c7d3574bd521b807aa18101e31764",
-                "reference": "96ec1843a27c7d3574bd521b807aa18101e31764",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2.5",
-                "symfony/polyfill-php80": "^1.15"
-            },
-            "conflict": {
-                "symfony/event-dispatcher": "<4.4"
-            },
-            "require-dev": {
-                "psr/log": "^1|^2|^3",
-                "symfony/dependency-injection": "^4.4|^5.0|^6.0",
-                "symfony/event-dispatcher": "^4.4|^5.0|^6.0",
-                "symfony/expression-language": "^4.4|^5.0|^6.0",
-                "symfony/security-core": "^4.4|^5.0|^6.0",
-                "symfony/validator": "^4.4|^5.0|^6.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Workflow\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Grégoire Pineau",
-                    "email": "lyrixx@lyrixx.info"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Provides tools for managing a workflow or finite state machine",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "petrinet",
-                "place",
-                "state",
-                "statemachine",
-                "transition",
-                "workflow"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/workflow/tree/v5.4.21"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2023-02-24T08:13:13+00:00"
-        },
         {
             "name": "symfony/yaml",
             "version": "v5.4.23",

From 9f0782c1ffe3e1221d93f531bace0be2b056a360 Mon Sep 17 00:00:00 2001
From: Adrien Foulon <6115458+Tofandel@users.noreply.github.com>
Date: Mon, 19 Jun 2023 16:26:12 +0200
Subject: [PATCH 0192/1030] FrontController should not drop existing
 notifications

---
 classes/controller/FrontController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php
index 5f928c9ae32f7..09ab27a1ca09d 100644
--- a/classes/controller/FrontController.php
+++ b/classes/controller/FrontController.php
@@ -692,10 +692,10 @@ protected function prepareNotifications()
         }
 
         if (session_status() == PHP_SESSION_ACTIVE && isset($_SESSION['notifications'])) {
-            $notifications = array_merge($notifications, json_decode($_SESSION['notifications'], true));
+            $notifications = array_merge_recursive($notifications, json_decode($_SESSION['notifications'], true));
             unset($_SESSION['notifications']);
         } elseif (isset($_COOKIE['notifications'])) {
-            $notifications = array_merge($notifications, json_decode($_COOKIE['notifications'], true));
+            $notifications = array_merge_recursive($notifications, json_decode($_COOKIE['notifications'], true));
             unset($_COOKIE['notifications']);
         }
 

From 54a7bdf4fb0c45b4ed27a828a539611b7ce89502 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Mon, 19 Jun 2023 17:47:57 +0300
Subject: [PATCH 0193/1030] cs fixer fix

---
 src/Adapter/Alias/CommandHandler/BulkDeleteAliasHandler.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Adapter/Alias/CommandHandler/BulkDeleteAliasHandler.php b/src/Adapter/Alias/CommandHandler/BulkDeleteAliasHandler.php
index 14cd145b63556..f158f08f05fa5 100644
--- a/src/Adapter/Alias/CommandHandler/BulkDeleteAliasHandler.php
+++ b/src/Adapter/Alias/CommandHandler/BulkDeleteAliasHandler.php
@@ -36,7 +36,6 @@
 use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\BulkAliasException;
 use PrestaShop\PrestaShop\Core\Domain\Alias\ValueObject\AliasId;
 use PrestaShop\PrestaShop\Core\Domain\Exception\BulkCommandExceptionInterface;
-use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\BulkFeatureException;
 
 /**
  * Handles command which deletes aliases in bulk action

From b277228bead567ec083d274841a5de316dc45de1 Mon Sep 17 00:00:00 2001
From: Louis AUTHIE <65625876+LouisAUTHIE@users.noreply.github.com>
Date: Mon, 19 Jun 2023 16:57:57 +0200
Subject: [PATCH 0194/1030] Apply suggestions from code review

Co-authored-by: Fabien Papet <FabienPapet@users.noreply.github.com>
---
 src/PrestaShopBundle/Form/Admin/Type/GeoCoordinatesType.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/PrestaShopBundle/Form/Admin/Type/GeoCoordinatesType.php b/src/PrestaShopBundle/Form/Admin/Type/GeoCoordinatesType.php
index 828dea9f54d05..0723688fd1694 100644
--- a/src/PrestaShopBundle/Form/Admin/Type/GeoCoordinatesType.php
+++ b/src/PrestaShopBundle/Form/Admin/Type/GeoCoordinatesType.php
@@ -38,11 +38,6 @@
  */
 class GeoCoordinatesType extends AbstractType
 {
-    /**
-     * @var TranslatorInterface
-     */
-    protected $translator;
-
     /**
      * @param TranslatorInterface $translator
      */

From c6edd2e7174e06fdbb5052130d3570b87bdfc31d Mon Sep 17 00:00:00 2001
From: Louis AUTHIE <65625876+LouisAUTHIE@users.noreply.github.com>
Date: Mon, 19 Jun 2023 16:59:26 +0200
Subject: [PATCH 0195/1030] Apply suggestions from code review

Co-authored-by: Fabien Papet <FabienPapet@users.noreply.github.com>
---
 .../Form/Admin/Type/GeoCoordinatesType.php               | 9 ++++-----
 .../Resources/config/services/bundle/form/form_type.yml  | 2 --
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/PrestaShopBundle/Form/Admin/Type/GeoCoordinatesType.php b/src/PrestaShopBundle/Form/Admin/Type/GeoCoordinatesType.php
index 0723688fd1694..2f4cde44efcf0 100644
--- a/src/PrestaShopBundle/Form/Admin/Type/GeoCoordinatesType.php
+++ b/src/PrestaShopBundle/Form/Admin/Type/GeoCoordinatesType.php
@@ -42,15 +42,14 @@ class GeoCoordinatesType extends AbstractType
      * @param TranslatorInterface $translator
      */
     public function __construct(
-        TranslatorInterface $translator
+        private readonly TranslatorInterface $translator
     ) {
-        $this->translator = $translator;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function buildForm(FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder
             ->add('latitude', NumberType::class, [
@@ -75,7 +74,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     /**
      * {@inheritdoc}
      */
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
             'label_latitude' => $this->translator->trans('Latitude', [], 'Admin.Global'),
@@ -92,7 +91,7 @@ public function configureOptions(OptionsResolver $resolver)
     /**
      * {@inheritdoc}
      */
-    public function getBlockPrefix()
+    public function getBlockPrefix(): string
     {
         return 'geo_coordinates';
     }
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
index 1dc496a638051..9a1e9d9dd0225 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
@@ -70,8 +70,6 @@ services:
       - '@prestashop.bundle.form.data_transformer.idn_converter'
 
   PrestaShopBundle\Form\Admin\Type\GeoCoordinatesType:
-    arguments:
-      - "@translator"
 
   PrestaShopBundle\Form\Admin\Type\LocaleChoiceType:
   PrestaShopBundle\Form\Admin\Type\DateRangeType:

From 43a8186947365aeaf708303550dc1ba32097c4c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@prestashop.com>
Date: Mon, 19 Jun 2023 11:21:02 +0200
Subject: [PATCH 0196/1030] Fix disabling a module for a specific shop applied
 to all shops

---
 classes/module/Module.php                 |  5 +++--
 src/Adapter/Module/ModuleDataProvider.php | 20 ++++++++++++++++----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/classes/module/Module.php b/classes/module/Module.php
index 8f0f24187b3bc..88462bfa40dc3 100755
--- a/classes/module/Module.php
+++ b/classes/module/Module.php
@@ -984,8 +984,9 @@ public function disable($force_all = false)
             $result &= $this->uninstallOverrides();
         }
 
-        // Disable module for all shops
-        $result &= Db::getInstance()->delete('module_shop', '`id_module` = ' . (int) $this->id);
+        // Disable module for all shops or contextual shops
+        $whereIdShop = $force_all ? '' : ' AND `id_shop` IN(' . implode(', ', Shop::getContextListShopID()) . ')';
+        $result &= Db::getInstance()->delete('module_shop', '`id_module` = ' . (int) $this->id . $whereIdShop);
 
         // if module has no more shop associations, set module.active = 0
         if (!$this->hasShopAssociations()) {
diff --git a/src/Adapter/Module/ModuleDataProvider.php b/src/Adapter/Module/ModuleDataProvider.php
index a18cb7032078c..2e7181546d4c8 100755
--- a/src/Adapter/Module/ModuleDataProvider.php
+++ b/src/Adapter/Module/ModuleDataProvider.php
@@ -146,7 +146,7 @@ public function getInstalled(): array
 
         $id_shops = (new Context())->getContextListShopID();
         if (count($id_shops) > 0) {
-            $select .= ', ms.`id_module` as active, ms.`enable_device` as active_on_mobile';
+            $select .= ', ms.`enable_device` as active_on_mobile';
             $from .= ' LEFT JOIN `' . _DB_PREFIX_ . 'module_shop` ms ON ms.`id_module` = m.`id_module`';
             $from .= ' AND ms.`id_shop` IN (' . implode(',', array_map('intval', $id_shops)) . ')';
         }
@@ -160,9 +160,7 @@ public function getInstalled(): array
             if (array_key_exists('active_on_mobile', $module)) {
                 $module['active_on_mobile'] = (bool) ($module['active_on_mobile'] & AddonListFilterDeviceStatus::DEVICE_MOBILE);
             }
-            if (array_key_exists('active', $module)) {
-                $module['active'] = (bool) $module['active'];
-            }
+            $module['active'] = $this->isModuleActive($module['id'], $id_shops);
             $modules[$module['name']] = $module;
         }
 
@@ -370,4 +368,18 @@ private function getDeviceStatus($name)
 
         return false;
     }
+
+    /**
+     * Checks if the module is active on at least one shop of the context.
+     */
+    private function isModuleActive(int $id, array $id_shops): bool
+    {
+        $result = Db::getInstance()->getRow('SELECT m.`active`, ms.`id_module` as `shop_active`, ms.`enable_device` as `enable_device`
+            FROM `' . _DB_PREFIX_ . 'module` m
+            LEFT JOIN `' . _DB_PREFIX_ . 'module_shop` ms ON m.`id_module` = ms.`id_module`
+            WHERE m.`id_module` = ' . $id . '
+            AND ms.`id_shop` IN (' . implode(',', $id_shops) . ')');
+
+        return !empty($result);
+    }
 }

From 25a117fea3dfcdc31f664947390d81e2e2107933 Mon Sep 17 00:00:00 2001
From: Fabien Papet <fabien.papet@gmail.com>
Date: Mon, 19 Jun 2023 16:46:50 +0200
Subject: [PATCH 0197/1030] Install rector

Signed-off-by: Fabien Papet <fabien.papet@gmail.com>
---
 composer.json |  1 +
 composer.lock | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 rector.php    | 33 +++++++++++++++++++++++++++++
 3 files changed, 90 insertions(+), 1 deletion(-)
 create mode 100644 rector.php

diff --git a/composer.json b/composer.json
index f3622b9363c54..492e85e75d474 100644
--- a/composer.json
+++ b/composer.json
@@ -191,6 +191,7 @@
         "phpstan/extension-installer": "^1.2",
         "phpstan/phpstan": "^1.9.3",
         "phpunit/phpunit": "~9.6.7",
+        "rector/rector": "^0.15.17",
         "spaze/phpstan-disallowed-calls": "^2.10",
         "symfony/browser-kit": "5.4.*",
         "symfony/css-selector": "5.4.*",
diff --git a/composer.lock b/composer.lock
index 14df51e50d7da..a8716714d78b7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b53c58fd0c6b584e404e192d49d23363",
+    "content-hash": "092ab401125dbb2e25c5dd7096e598a6",
     "packages": [
         {
             "name": "api-platform/core",
@@ -16597,6 +16597,61 @@
             ],
             "time": "2023-06-11T06:13:56+00:00"
         },
+        {
+            "name": "rector/rector",
+            "version": "0.15.17",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/rectorphp/rector.git",
+                "reference": "7f6ee7974175138864d3b50c28ea73a7b0fd4e2d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/rectorphp/rector/zipball/7f6ee7974175138864d3b50c28ea73a7b0fd4e2d",
+                "reference": "7f6ee7974175138864d3b50c28ea73a7b0fd4e2d",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2|^8.0",
+                "phpstan/phpstan": "^1.9.14"
+            },
+            "conflict": {
+                "rector/rector-doctrine": "*",
+                "rector/rector-downgrade-php": "*",
+                "rector/rector-phpunit": "*",
+                "rector/rector-symfony": "*"
+            },
+            "bin": [
+                "bin/rector"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "0.15-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Instant Upgrade and Automated Refactoring of any PHP code",
+            "support": {
+                "issues": "https://github.com/rectorphp/rector/issues",
+                "source": "https://github.com/rectorphp/rector/tree/0.15.17"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/tomasvotruba",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-02-17T20:34:07+00:00"
+        },
         {
             "name": "sebastian/cli-parser",
             "version": "1.0.1",
diff --git a/rector.php b/rector.php
new file mode 100644
index 0000000000000..5441c0708d89f
--- /dev/null
+++ b/rector.php
@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+use Rector\Php80\Rector\ClassConstFetch\ClassOnThisVariableObjectRector;
+use Rector\Php80\Rector\Identical\StrEndsWithRector;
+use Rector\Php80\Rector\Identical\StrStartsWithRector;
+use Rector\Php80\Rector\NotIdentical\StrContainsRector;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->paths([
+        __DIR__ . '/src',
+    ]);
+
+//    $rectorConfig->sets(
+//        [LevelSetList::UP_TO_PHP_81]
+//    );
+//    $rectorConfig->rule(ClassPropertyAssignToConstructorPromotionRector::class);
+    $rectorConfig->rule(StrContainsRector::class);
+    $rectorConfig->rule(StrStartsWithRector::class);
+    $rectorConfig->rule(ClassOnThisVariableObjectRector::class);
+    $rectorConfig->rule(StrEndsWithRector::class);
+
+
+//    $rectorConfig->ruleWithConfiguration(\Rector\Php80\Rector\Class_\DoctrineAnnotationClassToAttributeRector::class, [
+//        new AnnotationToAttribute(AdminSecurity::class)
+//    ]);
+//
+//    $rectorConfig->ruleWithConfiguration(RenameClassRector::class, [
+//        \PrestaShopBundle\Security\Annotation\AdminSecurity::class => \PrestaShop\PrestaShop\Core\Security\Attributes\Security::class,
+//    ]);
+};

From b6587c75d916f221ef705809c87097c61eec723e Mon Sep 17 00:00:00 2001
From: Fabien Papet <fabien.papet@gmail.com>
Date: Mon, 19 Jun 2023 16:49:48 +0200
Subject: [PATCH 0198/1030] Apply str rector

Signed-off-by: Fabien Papet <fabien.papet@gmail.com>
---
 rector.php                                    | 105 ++++++++++++++----
 .../EntityTranslation/DataLangFactory.php     |   2 +-
 .../EntityTranslation/EntityTranslator.php    |   2 +-
 src/Adapter/Language/LanguageCopier.php       |   2 +-
 src/Adapter/LegacyHookSubscriber.php          |   2 +-
 src/Adapter/Meta/MetaDataProvider.php         |   2 +-
 .../Module/AdminModuleDataProvider.php        |   6 +-
 src/Adapter/Presenter/AbstractLazyArray.php   |   2 +-
 .../Product/AdminProductDataProvider.php      |   6 +-
 .../Product/AdminProductDataUpdater.php       |   2 +-
 src/Adapter/Product/AdminProductWrapper.php   |   2 +-
 src/Adapter/Product/ListParametersUpdater.php |   2 +-
 .../Shop/Url/ProductPreviewProvider.php       |   2 +-
 src/Core/Email/EmailLister.php                |   4 +-
 .../Foundation/Database/EntityRepository.php  |   4 +-
 src/Core/Foundation/Version.php               |   2 +-
 .../Generator/HookDescriptionGenerator.php    |   4 +-
 .../Currency/PatternTransformer.php           |   2 +-
 .../Localization/RTL/StylesheetGenerator.php  |   4 +-
 src/Core/Translation/Builder/Map/Message.php  |   6 +-
 .../Storage/Finder/TranslationFinder.php      |   2 +-
 src/Core/Util/String/StringValidator.php      |   2 +-
 .../Webservice/ServerRequirementsChecker.php  |   2 +-
 .../Api/QueryParamsCollection.php             |   2 +-
 .../Command/UpdateLicensesCommand.php         |   4 +-
 .../Command/UpdateSchemaCommand.php           |   8 +-
 .../Controller/Admin/AttributeController.php  |   2 +-
 .../Controller/Admin/CommonController.php     |   2 +-
 .../GridDefinitionServiceIdsCollectorPass.php |   2 +-
 ...entifiableObjectFormTypesCollectorPass.php |   4 +-
 .../OptionsFormHookNameCollectorPass.php      |   2 +-
 src/PrestaShopBundle/Entity/AdminFilter.php   |   4 +-
 .../Repository/FeatureAttributeRepository.php |   2 +-
 .../Repository/StockManagementRepository.php  |   2 +-
 .../Improve/Design/Theme/ShopLogosType.php    |   2 +-
 src/PrestaShopBundle/Install/XmlLoader.php    |   8 +-
 .../Routing/Converter/LegacyUrlConverter.php  |   4 +-
 .../Routing/Linter/AdminRouteProvider.php     |   2 +-
 .../Routing/Linter/NamingConventionLinter.php |   2 +-
 .../Linter/SecurityAnnotationLinter.php       |   2 +-
 .../Security/SslMiddleware.php                |   2 +-
 .../Security/Voter/PageVoter.php              |   2 +-
 .../Translation/Exporter/ThemeExporter.php    |   2 +-
 .../Translation/PrestaShopTranslatorTrait.php |   2 +-
 .../Provider/TranslationFinder.php            |   2 +-
 .../Translation/View/TreeBuilder.php          |  18 +--
 src/PrestaShopBundle/Twig/LayoutExtension.php |   2 +-
 47 files changed, 159 insertions(+), 94 deletions(-)

diff --git a/rector.php b/rector.php
index 5441c0708d89f..39d6c6060d174 100644
--- a/rector.php
+++ b/rector.php
@@ -2,32 +2,97 @@
 
 declare(strict_types=1);
 
+use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector;
+use Rector\CodeQuality\Rector\ClassMethod\OptionalParametersAfterRequiredRector;
 use Rector\Config\RectorConfig;
-use Rector\Php80\Rector\ClassConstFetch\ClassOnThisVariableObjectRector;
-use Rector\Php80\Rector\Identical\StrEndsWithRector;
-use Rector\Php80\Rector\Identical\StrStartsWithRector;
-use Rector\Php80\Rector\NotIdentical\StrContainsRector;
+use Rector\Php53\Rector\Ternary\TernaryToElvisRector;
+use Rector\Php54\Rector\Array_\LongArrayToShortArrayRector;
+use Rector\Php55\Rector\Class_\ClassConstantToSelfClassRector;
+use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector;
+use Rector\Php56\Rector\FuncCall\PowToExpRector;
+use Rector\Php56\Rector\FunctionLike\AddDefaultValueForUndefinedVariableRector;
+use Rector\Php70\Rector\FunctionLike\ExceptionHandlerTypehintRector;
+use Rector\Php70\Rector\If_\IfToSpaceshipRector;
+use Rector\Php70\Rector\MethodCall\ThisCallOnStaticMethodToStaticCallRector;
+use Rector\Php70\Rector\Ternary\TernaryToNullCoalescingRector;
+use Rector\Php71\Rector\FuncCall\CountOnNullRector;
+use Rector\Php71\Rector\List_\ListToArrayDestructRector;
+use Rector\Php71\Rector\TryCatch\MultiExceptionCatchRector;
+use Rector\Php72\Rector\FuncCall\GetClassOnNullRector;
+use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector;
+use Rector\Php74\Rector\Assign\NullCoalescingOperatorRector;
+use Rector\Php74\Rector\Closure\ClosureToArrowFunctionRector;
+use Rector\Php74\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector;
+use Rector\Php74\Rector\LNumber\AddLiteralSeparatorToNumberRector;
+use Rector\Php74\Rector\Ternary\ParenthesizeNestedTernaryRector;
+use Rector\Php80\Rector\Catch_\RemoveUnusedVariableInCatchRector;
+use Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector;
+use Rector\Php80\Rector\Class_\StringableForToStringRector;
+use Rector\Php80\Rector\FuncCall\ClassOnObjectRector;
+use Rector\Php80\Rector\FunctionLike\MixedTypeRector;
+use Rector\Php80\Rector\FunctionLike\UnionTypesRector;
+use Rector\Php80\Rector\Switch_\ChangeSwitchToMatchRector;
+use Rector\Php80\Rector\Ternary\GetDebugTypeRector;
+use Rector\Php81\Rector\Array_\FirstClassCallableRector;
+use Rector\Php81\Rector\ClassConst\FinalizePublicClassConstantRector;
+use Rector\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector;
+use Rector\Php81\Rector\FunctionLike\IntersectionTypesRector;
+use Rector\Php81\Rector\Property\ReadOnlyPropertyRector;
+use Rector\Set\ValueObject\LevelSetList;
+use Rector\TypeDeclaration\Rector\ClassMethod\ReturnNeverTypeRector;
+use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector;
 
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->paths([
-        __DIR__ . '/src',
+        __DIR__ . '/src/',
     ]);
 
-//    $rectorConfig->sets(
-//        [LevelSetList::UP_TO_PHP_81]
-//    );
-//    $rectorConfig->rule(ClassPropertyAssignToConstructorPromotionRector::class);
-    $rectorConfig->rule(StrContainsRector::class);
-    $rectorConfig->rule(StrStartsWithRector::class);
-    $rectorConfig->rule(ClassOnThisVariableObjectRector::class);
-    $rectorConfig->rule(StrEndsWithRector::class);
+    $rectorConfig->sets(
+        [LevelSetList::UP_TO_PHP_81]
+    );
 
+    /**
+     * Ignored rules for now as grouping them would create a huge PR impossible to review,
+     * so I documented them here, I we can process them one by one.
+     */
+    $rectorConfig->skip([
+        ReadOnlyPropertyRector::class => '*',
+        ClosureToArrowFunctionRector::class => '*',
+        InlineConstructorDefaultToPropertyRector::class => '*',
+        ClassPropertyAssignToConstructorPromotionRector::class => '*',
+        UnionTypesRector::class => '*',
+        MixedTypeRector::class => '*',
+        TypedPropertyFromAssignsRector::class => '*',
+        FinalizePublicClassConstantRector::class => '*',
+        CountOnNullRector::class => '*',
+        AddDefaultValueForUndefinedVariableRector::class => '*',
+        NullToStrictStringFuncCallArgRector::class => '*',
+        JsonThrowOnErrorRector::class => '*',
+        IntersectionTypesRector::class => '*',
+        ReturnNeverTypeRector::class => '*',
+        ChangeSwitchToMatchRector::class => '*',
+        TernaryToNullCoalescingRector::class => '*',
+        RemoveUnusedVariableInCatchRector::class => '*',
+        StringableForToStringRector::class => '*',
+        LongArrayToShortArrayRector::class => '*',
+        ListToArrayDestructRector::class => '*',
+        StringClassNameToClassConstantRector::class => '*',
+        IfToSpaceshipRector::class => '*',
+        ClassOnObjectRector::class => '*',
+        FirstClassCallableRector::class => '*',
+        ExceptionHandlerTypehintRector::class => '*',
+        ThisCallOnStaticMethodToStaticCallRector::class => '*',
+        MultiExceptionCatchRector::class => '*',
+        TernaryToElvisRector::class => '*',
+        NullCoalescingOperatorRector::class => '*',
+        ArraySpreadInsteadOfArrayMergeRector::class => '*',
+        AddLiteralSeparatorToNumberRector::class => '*',
+        ParenthesizeNestedTernaryRector::class => '*',
+        GetDebugTypeRector::class => '*',
+        PowToExpRector::class => '*',
+        GetClassOnNullRector::class => '*',
+        ClassConstantToSelfClassRector::class => '*',
+        OptionalParametersAfterRequiredRector::class => '*',
+    ]);
 
-//    $rectorConfig->ruleWithConfiguration(\Rector\Php80\Rector\Class_\DoctrineAnnotationClassToAttributeRector::class, [
-//        new AnnotationToAttribute(AdminSecurity::class)
-//    ]);
-//
-//    $rectorConfig->ruleWithConfiguration(RenameClassRector::class, [
-//        \PrestaShopBundle\Security\Annotation\AdminSecurity::class => \PrestaShop\PrestaShop\Core\Security\Attributes\Security::class,
-//    ]);
 };
diff --git a/src/Adapter/EntityTranslation/DataLangFactory.php b/src/Adapter/EntityTranslation/DataLangFactory.php
index ad8627a5fab79..1cd9e8977de1d 100644
--- a/src/Adapter/EntityTranslation/DataLangFactory.php
+++ b/src/Adapter/EntityTranslation/DataLangFactory.php
@@ -134,7 +134,7 @@ private function removeDbPrefixIfPresent(string $tableName): string
      */
     private function ensureLangSuffix(string $tableName): string
     {
-        if (substr($tableName, -5) !== '_lang') {
+        if (!str_ends_with($tableName, '_lang')) {
             $tableName .= '_lang';
         }
 
diff --git a/src/Adapter/EntityTranslation/EntityTranslator.php b/src/Adapter/EntityTranslation/EntityTranslator.php
index bb90416035b15..92786f63f094c 100644
--- a/src/Adapter/EntityTranslation/EntityTranslator.php
+++ b/src/Adapter/EntityTranslation/EntityTranslator.php
@@ -230,7 +230,7 @@ protected function doTranslate(array $data, string $fieldName): string
     private function buildTableNameFromDataLang(DataLangCore $dataLang): string
     {
         $tableName = $this->dataLang->getTableName();
-        if (substr($tableName, 0, strlen($this->dbPrefix)) !== $this->dbPrefix) {
+        if (!str_starts_with($tableName, $this->dbPrefix)) {
             $tableName = $this->dbPrefix . $tableName;
         }
 
diff --git a/src/Adapter/Language/LanguageCopier.php b/src/Adapter/Language/LanguageCopier.php
index a808a98dfd574..bf06fb36dddd9 100644
--- a/src/Adapter/Language/LanguageCopier.php
+++ b/src/Adapter/Language/LanguageCopier.php
@@ -224,7 +224,7 @@ private function validateConfig(LanguageCopierConfigInterface $config)
     private function isModuleContext($source, $destination, $language)
     {
         // Legacy condition
-        return false !== strpos($destination, 'modules') && basename($source) === $language . '.php';
+        return str_contains($destination, 'modules') && basename($source) === $language . '.php';
     }
 
     /**
diff --git a/src/Adapter/LegacyHookSubscriber.php b/src/Adapter/LegacyHookSubscriber.php
index 66b97bb807593..7a5ae417ac13e 100644
--- a/src/Adapter/LegacyHookSubscriber.php
+++ b/src/Adapter/LegacyHookSubscriber.php
@@ -106,7 +106,7 @@ public static function getSubscribedEvents()
      */
     public function __call($name, $args)
     {
-        if (strpos($name, 'call_') !== 0) {
+        if (!str_starts_with($name, 'call_')) {
             throw new \BadMethodCallException('The call to \'' . $name . '\' is not recognized.');
         }
 
diff --git a/src/Adapter/Meta/MetaDataProvider.php b/src/Adapter/Meta/MetaDataProvider.php
index 8cf2d562060af..1e97f998b3e55 100644
--- a/src/Adapter/Meta/MetaDataProvider.php
+++ b/src/Adapter/Meta/MetaDataProvider.php
@@ -138,6 +138,6 @@ public function getNotConfiguredModuleMetaPageNames()
      */
     private function isModuleFile($fileName)
     {
-        return 0 === strncmp($fileName, 'module-', 7);
+        return str_starts_with($fileName, 'module-');
     }
 }
diff --git a/src/Adapter/Module/AdminModuleDataProvider.php b/src/Adapter/Module/AdminModuleDataProvider.php
index 64069889b23ea..6364fba7fc737 100644
--- a/src/Adapter/Module/AdminModuleDataProvider.php
+++ b/src/Adapter/Module/AdminModuleDataProvider.php
@@ -319,9 +319,9 @@ protected function applyModuleFilters(array $modules, array $filters)
                         // Instead of looping on the whole module list, we use $module_ids which can already be reduced
                         // thanks to the previous array_intersect(...)
                         foreach ($modules as $key => $module) {
-                            if (strpos($module->displayName, $keyword) !== false
-                                || strpos($module->name, $keyword) !== false
-                                || strpos($module->description, $keyword) !== false) {
+                            if (str_contains($module->displayName, $keyword)
+                                || str_contains($module->name, $keyword)
+                                || str_contains($module->description, $keyword)) {
                                 $search_result[] = $key;
                             }
                         }
diff --git a/src/Adapter/Presenter/AbstractLazyArray.php b/src/Adapter/Presenter/AbstractLazyArray.php
index 0d6eb94cdc8d8..96d4cbf402db4 100644
--- a/src/Adapter/Presenter/AbstractLazyArray.php
+++ b/src/Adapter/Presenter/AbstractLazyArray.php
@@ -93,7 +93,7 @@ public function __construct()
         $methods = $reflectionClass->getMethods(ReflectionMethod::IS_PUBLIC);
         foreach ($methods as $method) {
             $methodDoc = $method->getDocComment();
-            if (strpos($methodDoc, '@arrayAccess') !== false) {
+            if (str_contains($methodDoc, '@arrayAccess')) {
                 $this->arrayAccessList->offsetSet(
                     $this->convertMethodNameToIndex($method->getName()),
                     [
diff --git a/src/Adapter/Product/AdminProductDataProvider.php b/src/Adapter/Product/AdminProductDataProvider.php
index 4a82f9c4684ed..838cfef7ccee2 100644
--- a/src/Adapter/Product/AdminProductDataProvider.php
+++ b/src/Adapter/Product/AdminProductDataProvider.php
@@ -129,7 +129,7 @@ public function isColumnFiltered()
     {
         $filters = $this->getPersistedFilterParameters();
         foreach ($filters as $filterKey => $filterValue) {
-            if (strpos($filterKey, 'filter_column_') === 0 && $filterValue !== '') {
+            if (str_starts_with($filterKey, 'filter_column_') && $filterValue !== '') {
                 return true; // break at first column filter found
             }
         }
@@ -218,7 +218,7 @@ public function getCatalogProductList(
         $showPositionColumn = $this->isCategoryFiltered();
         if ($orderBy == 'position_ordering' && $showPositionColumn) {
             foreach ($filterParams as $key => $param) {
-                if (strpos($key, 'filter_column_') === 0) {
+                if (str_starts_with($key, 'filter_column_')) {
                     $filterParams[$key] = '';
                 }
             }
@@ -322,7 +322,7 @@ public function getCatalogProductList(
             if (!$filterValue && $filterValue !== '0') {
                 continue;
             }
-            if (strpos($filterParam, 'filter_column_') === 0) {
+            if (str_starts_with($filterParam, 'filter_column_')) {
                 $filterValue = Db::getInstance()->escape($filterValue, in_array($filterParam, [
                     'filter_column_id_product',
                     'filter_column_sav_quantity',
diff --git a/src/Adapter/Product/AdminProductDataUpdater.php b/src/Adapter/Product/AdminProductDataUpdater.php
index 0ed3e5958ecea..3576a313b9ec5 100644
--- a/src/Adapter/Product/AdminProductDataUpdater.php
+++ b/src/Adapter/Product/AdminProductDataUpdater.php
@@ -262,7 +262,7 @@ public function sortProductIdList(array $productList, $filterParams)
         }
 
         foreach ($filterParams as $k => $v) {
-            if ($v == '' || strpos($k, 'filter_') !== 0) {
+            if ($v == '' || !str_starts_with($k, 'filter_')) {
                 continue;
             }
             if ($k == 'filter_category') {
diff --git a/src/Adapter/Product/AdminProductWrapper.php b/src/Adapter/Product/AdminProductWrapper.php
index 82989d40fa346..5daedc591c7f4 100644
--- a/src/Adapter/Product/AdminProductWrapper.php
+++ b/src/Adapter/Product/AdminProductWrapper.php
@@ -945,7 +945,7 @@ public function getPreviewUrlDeactivate($preview_url)
 
         $admin_dir = dirname($_SERVER['PHP_SELF']);
         $admin_dir = substr($admin_dir, strrpos($admin_dir, '/') + 1);
-        $preview_url_deactivate = $preview_url . ((strpos($preview_url, '?') === false) ? '?' : '&') . 'adtoken=' . $token . '&ad=' . $admin_dir . '&id_employee=' . (int) $context->employee->id . '&preview=1';
+        $preview_url_deactivate = $preview_url . ((!str_contains($preview_url, '?')) ? '?' : '&') . 'adtoken=' . $token . '&ad=' . $admin_dir . '&id_employee=' . (int) $context->employee->id . '&preview=1';
 
         return $preview_url_deactivate;
     }
diff --git a/src/Adapter/Product/ListParametersUpdater.php b/src/Adapter/Product/ListParametersUpdater.php
index 89b3f3a6e51c3..bb194e588af7a 100644
--- a/src/Adapter/Product/ListParametersUpdater.php
+++ b/src/Adapter/Product/ListParametersUpdater.php
@@ -49,7 +49,7 @@ public function cleanFiltersForPositionOrdering($filterParameters, $orderBy, $ha
     {
         if ($orderBy == 'position_ordering' && $hasCategoryFilter) {
             foreach (array_keys($filterParameters) as $key) {
-                if (strpos($key, 'filter_column_') === 0) {
+                if (str_starts_with($key, 'filter_column_')) {
                     $filterParameters[$key] = '';
                 }
             }
diff --git a/src/Adapter/Shop/Url/ProductPreviewProvider.php b/src/Adapter/Shop/Url/ProductPreviewProvider.php
index 2ccca0c2bac05..65f3e4752f7c1 100644
--- a/src/Adapter/Shop/Url/ProductPreviewProvider.php
+++ b/src/Adapter/Shop/Url/ProductPreviewProvider.php
@@ -86,7 +86,7 @@ public function getUrl(?int $productId = null, ?bool $active = true, ?int $shopI
             $preview_url = sprintf(
                 '%s%sadtoken=%s&id_employee=%d&preview=1',
                 $preview_url,
-                ((strpos($preview_url, '?') === false) ? '?' : '&'),
+                ((!str_contains($preview_url, '?')) ? '?' : '&'),
                 $token,
                 $this->employeeId
             );
diff --git a/src/Core/Email/EmailLister.php b/src/Core/Email/EmailLister.php
index 381c0b9b9bd7b..ed47d8163075e 100644
--- a/src/Core/Email/EmailLister.php
+++ b/src/Core/Email/EmailLister.php
@@ -58,7 +58,7 @@ public function getAvailableMails($dir)
 
         // Remove unwanted .html / .txt / .tpl / .php / . / ..
         foreach ($mail_directory as $mail) {
-            if (strpos($mail->getFilename(), '.') !== false) {
+            if (str_contains($mail->getFilename(), '.')) {
                 $tmp = explode('.', $mail->getFilename());
 
                 // Check for filename existence (left part) and if extension is html (right part)
@@ -83,7 +83,7 @@ public function getAvailableMails($dir)
      */
     public function getCleanedMailName($mail_name)
     {
-        if (strpos($mail_name, '.') !== false) {
+        if (str_contains($mail_name, '.')) {
             $tmp = explode('.', $mail_name);
 
             if (!isset($tmp[0])) {
diff --git a/src/Core/Foundation/Database/EntityRepository.php b/src/Core/Foundation/Database/EntityRepository.php
index ed32f50a37c81..39f19d42db760 100644
--- a/src/Core/Foundation/Database/EntityRepository.php
+++ b/src/Core/Foundation/Database/EntityRepository.php
@@ -65,10 +65,10 @@ public function __construct(
 
     public function __call($method, $arguments)
     {
-        if (0 === strpos($method, 'findOneBy')) {
+        if (str_starts_with($method, 'findOneBy')) {
             $one = true;
             $by = substr($method, 9);
-        } elseif (0 === strpos($method, 'findBy')) {
+        } elseif (str_starts_with($method, 'findBy')) {
             $one = false;
             $by = substr($method, 6);
         } else {
diff --git a/src/Core/Foundation/Version.php b/src/Core/Foundation/Version.php
index dcaf12beb889e..b4c8809641841 100644
--- a/src/Core/Foundation/Version.php
+++ b/src/Core/Foundation/Version.php
@@ -368,7 +368,7 @@ private function versionCompare($version, $operator)
      */
     private function removeLegacyPrefix($version, $majorVersionString)
     {
-        if ('1.' === substr($version, 0, 2) && substr($version, 0, strlen($majorVersionString)) === $majorVersionString) {
+        if (str_starts_with($version, '1.') && str_starts_with($version, $majorVersionString)) {
             $version = substr($version, 2);
         }
 
diff --git a/src/Core/Hook/Generator/HookDescriptionGenerator.php b/src/Core/Hook/Generator/HookDescriptionGenerator.php
index 0b994e9d9384b..e77f3de5b1c32 100644
--- a/src/Core/Hook/Generator/HookDescriptionGenerator.php
+++ b/src/Core/Hook/Generator/HookDescriptionGenerator.php
@@ -144,7 +144,7 @@ private function getTextWithHookId($description, $hookId)
      */
     private function doesHookDescriptionContainsPlaceholder($description)
     {
-        return false !== strpos($description, '%s');
+        return str_contains($description, '%s');
     }
 
     /**
@@ -156,6 +156,6 @@ private function doesHookDescriptionContainsPlaceholder($description)
      */
     private function doesPlaceholderIsTheFirstElementOfTheDescription($description)
     {
-        return 0 === strncmp($description, '%s', 2);
+        return str_starts_with($description, '%s');
     }
 }
diff --git a/src/Core/Localization/Currency/PatternTransformer.php b/src/Core/Localization/Currency/PatternTransformer.php
index 734b81c9403ef..fbc3a40519fe9 100644
--- a/src/Core/Localization/Currency/PatternTransformer.php
+++ b/src/Core/Localization/Currency/PatternTransformer.php
@@ -142,6 +142,6 @@ private function transformPattern(string $basePattern, string $transformationTyp
      */
     private function getRtlCharacter(string $currencyPattern): string
     {
-        return (false !== strpos($currencyPattern, self::RTL_CHARACTER)) ? self::RTL_CHARACTER : '';
+        return (str_contains($currencyPattern, self::RTL_CHARACTER)) ? self::RTL_CHARACTER : '';
     }
 }
diff --git a/src/Core/Localization/RTL/StylesheetGenerator.php b/src/Core/Localization/RTL/StylesheetGenerator.php
index cdc91a4a79095..521c1b82f657e 100644
--- a/src/Core/Localization/RTL/StylesheetGenerator.php
+++ b/src/Core/Localization/RTL/StylesheetGenerator.php
@@ -108,9 +108,9 @@ public function generateInDirectory($directory, $regenerate = false)
     private function shouldProcessFile($file, $regenerate)
     {
         return
-            strpos($file, '/node_modules/') === false
+            !str_contains($file, '/node_modules/')
             // rtl.css contains RTL override rules
-            && strpos($file, 'rtl.css') === false
+            && !str_contains($file, 'rtl.css')
             // does not end with .rtlfix
             && substr(rtrim($file, '.' . $this->fileType), -4) !== $this->rtlSuffix
             // RTL file does not exist or we are regenerating them
diff --git a/src/Core/Translation/Builder/Map/Message.php b/src/Core/Translation/Builder/Map/Message.php
index 0c0bd6a62b23c..b232d0bf93d48 100644
--- a/src/Core/Translation/Builder/Map/Message.php
+++ b/src/Core/Translation/Builder/Map/Message.php
@@ -135,9 +135,9 @@ private function containsWord(string $s): bool
         $s = strtolower($s);
 
         return
-            false !== strpos(strtolower($this->defaultTranslation), $s)
-            || (null !== $this->fileTranslation && false !== strpos(strtolower($this->fileTranslation), $s))
-            || (null !== $this->userTranslation && false !== strpos(strtolower($this->userTranslation), $s))
+            str_contains(strtolower($this->defaultTranslation), $s)
+            || (null !== $this->fileTranslation && str_contains(strtolower($this->fileTranslation), $s))
+            || (null !== $this->userTranslation && str_contains(strtolower($this->userTranslation), $s))
         ;
     }
 }
diff --git a/src/Core/Translation/Storage/Finder/TranslationFinder.php b/src/Core/Translation/Storage/Finder/TranslationFinder.php
index 7502fe8d58609..c5218da2ff934 100644
--- a/src/Core/Translation/Storage/Finder/TranslationFinder.php
+++ b/src/Core/Translation/Storage/Finder/TranslationFinder.php
@@ -149,7 +149,7 @@ private function getDomainFromFile(SplFileInfo $file, string $locale): string
         $basename = $file->getBasename('.xlf');
 
         $domain = $basename;
-        if (strpos($basename, $locale) === false) {
+        if (!str_contains($basename, $locale)) {
             $domain .= '.' . $locale;
         }
 
diff --git a/src/Core/Util/String/StringValidator.php b/src/Core/Util/String/StringValidator.php
index b252069e94928..8a6f079e5b64e 100644
--- a/src/Core/Util/String/StringValidator.php
+++ b/src/Core/Util/String/StringValidator.php
@@ -36,7 +36,7 @@ final class StringValidator implements StringValidatorInterface
      */
     public function startsWith($string, $prefix)
     {
-        return strpos($string, $prefix) === 0;
+        return str_starts_with($string, $prefix);
     }
 
     /**
diff --git a/src/Core/Webservice/ServerRequirementsChecker.php b/src/Core/Webservice/ServerRequirementsChecker.php
index abef090a31d1e..a01b9f8d3705f 100644
--- a/src/Core/Webservice/ServerRequirementsChecker.php
+++ b/src/Core/Webservice/ServerRequirementsChecker.php
@@ -123,7 +123,7 @@ private function lookForIssues()
             $issues[] = self::ISSUE_HTTPS_NOT_AVAILABLE;
         }
 
-        if (false === strpos($this->hostingInformation->getServerInformation()['version'], 'Apache')) {
+        if (!str_contains($this->hostingInformation->getServerInformation()['version'], 'Apache')) {
             return $issues;
         }
 
diff --git a/src/PrestaShopBundle/Api/QueryParamsCollection.php b/src/PrestaShopBundle/Api/QueryParamsCollection.php
index bc0ff86e375dc..fd778ebffc62c 100644
--- a/src/PrestaShopBundle/Api/QueryParamsCollection.php
+++ b/src/PrestaShopBundle/Api/QueryParamsCollection.php
@@ -316,7 +316,7 @@ public function getSqlOrder()
         $implodableOrder = [];
 
         foreach ($this->queryParams['order'] as $order) {
-            $descendingOrder = false !== strpos($order, 'desc');
+            $descendingOrder = str_contains($order, 'desc');
             $filterColumn = $this->removeDirection($order);
 
             $orderFiltered = '{' . $filterColumn . '}';
diff --git a/src/PrestaShopBundle/Command/UpdateLicensesCommand.php b/src/PrestaShopBundle/Command/UpdateLicensesCommand.php
index 1c8cd5c142ed8..3ecea283381ee 100644
--- a/src/PrestaShopBundle/Command/UpdateLicensesCommand.php
+++ b/src/PrestaShopBundle/Command/UpdateLicensesCommand.php
@@ -248,7 +248,7 @@ private function makeGoodLicense(SplFileInfo $file)
     private function isAFLLicense($fileName)
     {
         foreach ($this->aflLicense as $afl) {
-            if (0 === strpos($fileName, $afl)) {
+            if (str_starts_with($fileName, $afl)) {
                 return true;
             }
         }
@@ -335,7 +335,7 @@ private function addLicenseToNode($node, SplFileInfo $file)
         $comments = $node->getAttribute('comments');
         foreach ($comments as $comment) {
             if ($comment instanceof \PhpParser\Comment
-                && strpos($comment->getText(), 'prestashop') !== false) {
+                && str_contains($comment->getText(), 'prestashop')) {
                 file_put_contents($file->getRelativePathname(), str_replace($comment->getText(), $this->license, $file->getContents()));
             }
         }
diff --git a/src/PrestaShopBundle/Command/UpdateSchemaCommand.php b/src/PrestaShopBundle/Command/UpdateSchemaCommand.php
index f0b71a6babc4e..32b84834adb9e 100644
--- a/src/PrestaShopBundle/Command/UpdateSchemaCommand.php
+++ b/src/PrestaShopBundle/Command/UpdateSchemaCommand.php
@@ -294,7 +294,7 @@ public function clearQueries(Connection $connection, array &$queries): void
                 $extra = $results[0]['Extra'];
 
                 if ($oldDefaultValue !== null
-                    && strpos($oldDefaultValue, 'CURRENT_TIMESTAMP') === false) {
+                    && !str_contains($oldDefaultValue, 'CURRENT_TIMESTAMP')) {
                     $oldDefaultValue = "'" . $oldDefaultValue . "'";
                 }
 
@@ -305,9 +305,9 @@ public function clearQueries(Connection $connection, array &$queries): void
                 // set the old default value
                 if (!($results[0]['Null'] == 'NO' && $results[0]['Default'] === null)
                     && !($oldDefaultValue === 'NULL'
-                         && strpos($matches[0][$matchKey], 'NOT NULL') !== false)
-                    && (strpos($matches[0][$matchKey], 'BLOB') === false)
-                    && (strpos($matches[0][$matchKey], 'TEXT') === false)
+                         && str_contains($matches[0][$matchKey], 'NOT NULL'))
+                    && (!str_contains($matches[0][$matchKey], 'BLOB'))
+                    && (!str_contains($matches[0][$matchKey], 'TEXT'))
                 ) {
                     if (preg_match('/DEFAULT/', $matches[0][$matchKey])) {
                         $matches[0][$matchKey] = preg_replace(
diff --git a/src/PrestaShopBundle/Controller/Admin/AttributeController.php b/src/PrestaShopBundle/Controller/Admin/AttributeController.php
index 95226b92005fb..4faa6ea95e522 100644
--- a/src/PrestaShopBundle/Controller/Admin/AttributeController.php
+++ b/src/PrestaShopBundle/Controller/Admin/AttributeController.php
@@ -121,7 +121,7 @@ public function attributesGeneratorAction(Request $request)
         foreach ($options as $idGroup => $attributes) {
             foreach ($attributes as $attribute) {
                 //If attribute is a group attribute, replace group data by all attributes group
-                if (false !== strpos($attribute, 'group')) {
+                if (str_contains($attribute, 'group')) {
                     $allGroupAttributes = $this->get('prestashop.adapter.data_provider.attribute')->getAttributeIdsByGroup((int) $idGroup, true);
                     foreach ($allGroupAttributes as $groupAttribute) {
                         $newOptions[$idGroup][$groupAttribute] = $groupAttribute;
diff --git a/src/PrestaShopBundle/Controller/Admin/CommonController.php b/src/PrestaShopBundle/Controller/Admin/CommonController.php
index 2218a8e38ff7b..91e24b32cf991 100644
--- a/src/PrestaShopBundle/Controller/Admin/CommonController.php
+++ b/src/PrestaShopBundle/Controller/Admin/CommonController.php
@@ -127,7 +127,7 @@ public function paginationAction(Request $request, $limit = 10, $offset = 0, $to
         // urls from route
         $callerParameters = $request->attributes->get('caller_parameters', []);
         foreach ($callerParameters as $k => $v) {
-            if (strpos($k, '_') === 0) {
+            if (str_starts_with($k, '_')) {
                 unset($callerParameters[$k]);
             }
         }
diff --git a/src/PrestaShopBundle/DependencyInjection/Compiler/GridDefinitionServiceIdsCollectorPass.php b/src/PrestaShopBundle/DependencyInjection/Compiler/GridDefinitionServiceIdsCollectorPass.php
index 65b315d50ef9f..e736281e6f2ca 100644
--- a/src/PrestaShopBundle/DependencyInjection/Compiler/GridDefinitionServiceIdsCollectorPass.php
+++ b/src/PrestaShopBundle/DependencyInjection/Compiler/GridDefinitionServiceIdsCollectorPass.php
@@ -75,7 +75,7 @@ public function process(ContainerBuilder $container)
      */
     private function isGridDefinitionService($serviceId, $serviceClass)
     {
-        $doesServiceStartsWithGridDefinition = strpos($serviceId, self::GRID_DEFINITION_SERVICE_PREFIX) === 0;
+        $doesServiceStartsWithGridDefinition = str_starts_with($serviceId, self::GRID_DEFINITION_SERVICE_PREFIX);
 
         return $doesServiceStartsWithGridDefinition && is_subclass_of($serviceClass, GridDefinitionFactoryInterface::class);
     }
diff --git a/src/PrestaShopBundle/DependencyInjection/Compiler/IdentifiableObjectFormTypesCollectorPass.php b/src/PrestaShopBundle/DependencyInjection/Compiler/IdentifiableObjectFormTypesCollectorPass.php
index ace8c807d94cc..dad2a77d8ed23 100644
--- a/src/PrestaShopBundle/DependencyInjection/Compiler/IdentifiableObjectFormTypesCollectorPass.php
+++ b/src/PrestaShopBundle/DependencyInjection/Compiler/IdentifiableObjectFormTypesCollectorPass.php
@@ -88,8 +88,8 @@ public function process(ContainerBuilder $container)
     private function isIdentifiableObjectFormBuilderService($serviceId, $serviceClass)
     {
         $isServiceKeyBelongsToIdentifiableObject =
-            strpos($serviceId, self::IDENTIFIABLE_OBJECT_SERVICE_NAME_START_WITH) === 0 ||
-            strpos($serviceId, self::ALTERNATIVE_IDENTIFIABLE_OBJECT_SERVICE_STARTS_WITH) === 0
+            str_starts_with($serviceId, self::IDENTIFIABLE_OBJECT_SERVICE_NAME_START_WITH) ||
+            str_starts_with($serviceId, self::ALTERNATIVE_IDENTIFIABLE_OBJECT_SERVICE_STARTS_WITH)
         ;
 
         return $isServiceKeyBelongsToIdentifiableObject &&
diff --git a/src/PrestaShopBundle/DependencyInjection/Compiler/OptionsFormHookNameCollectorPass.php b/src/PrestaShopBundle/DependencyInjection/Compiler/OptionsFormHookNameCollectorPass.php
index 22e6dc5ef2483..6551683243495 100644
--- a/src/PrestaShopBundle/DependencyInjection/Compiler/OptionsFormHookNameCollectorPass.php
+++ b/src/PrestaShopBundle/DependencyInjection/Compiler/OptionsFormHookNameCollectorPass.php
@@ -127,7 +127,7 @@ private function stringEndsWith($haystack, $needle)
     {
         $diff = strlen($haystack) - strlen($needle);
 
-        return $diff >= 0 && strpos($haystack, $needle, $diff) !== false;
+        return $diff >= 0 && str_contains($haystack, $needle);
     }
 
     /**
diff --git a/src/PrestaShopBundle/Entity/AdminFilter.php b/src/PrestaShopBundle/Entity/AdminFilter.php
index 2653d5d129f1e..a39206598b1dc 100644
--- a/src/PrestaShopBundle/Entity/AdminFilter.php
+++ b/src/PrestaShopBundle/Entity/AdminFilter.php
@@ -313,11 +313,11 @@ public static function sanitizeFilterParameters(array $filter)
             return function ($subject) use ($filter) {
                 $operator = null;
 
-                if (false !== strpos($subject, '<=')) {
+                if (str_contains($subject, '<=')) {
                     $operator = '<=';
                 }
 
-                if (false !== strpos($subject, '>=')) {
+                if (str_contains($subject, '>=')) {
                     $operator = '>=';
                 }
 
diff --git a/src/PrestaShopBundle/Entity/Repository/FeatureAttributeRepository.php b/src/PrestaShopBundle/Entity/Repository/FeatureAttributeRepository.php
index 0ee59b6952d44..2a82b05e49c6b 100644
--- a/src/PrestaShopBundle/Entity/Repository/FeatureAttributeRepository.php
+++ b/src/PrestaShopBundle/Entity/Repository/FeatureAttributeRepository.php
@@ -210,7 +210,7 @@ private function explodeCollections($rows)
             $row['values'] = explode(',', $row['values']);
 
             $row['values'] = array_map(function ($value) {
-                if (false === strpos($value, ':')) {
+                if (!str_contains($value, ':')) {
                     return $value;
                 }
 
diff --git a/src/PrestaShopBundle/Entity/Repository/StockManagementRepository.php b/src/PrestaShopBundle/Entity/Repository/StockManagementRepository.php
index d8f843b196c08..86a28b0ea3c06 100644
--- a/src/PrestaShopBundle/Entity/Repository/StockManagementRepository.php
+++ b/src/PrestaShopBundle/Entity/Repository/StockManagementRepository.php
@@ -325,7 +325,7 @@ protected function orderBy(QueryParamsCollection $queryParams)
     {
         $orderByClause = $queryParams->getSqlOrder();
 
-        $descendingOrder = false !== strpos($orderByClause, ' DESC');
+        $descendingOrder = str_contains($orderByClause, ' DESC');
 
         $productColumns = 'product_id, combination_id';
         if ($descendingOrder) {
diff --git a/src/PrestaShopBundle/Form/Admin/Improve/Design/Theme/ShopLogosType.php b/src/PrestaShopBundle/Form/Admin/Improve/Design/Theme/ShopLogosType.php
index 3a23d5d3138a4..431ff4a168c11 100644
--- a/src/PrestaShopBundle/Form/Admin/Improve/Design/Theme/ShopLogosType.php
+++ b/src/PrestaShopBundle/Form/Admin/Improve/Design/Theme/ShopLogosType.php
@@ -296,7 +296,7 @@ private function stringEndsWith($haystack, $needle)
     {
         $diff = \strlen($haystack) - \strlen($needle);
 
-        return $diff >= 0 && strpos($haystack, $needle, $diff) !== false;
+        return $diff >= 0 && str_contains($haystack, $needle);
     }
 
     /**
diff --git a/src/PrestaShopBundle/Install/XmlLoader.php b/src/PrestaShopBundle/Install/XmlLoader.php
index 8dc1f9ee7b733..656ea2ec6bae7 100644
--- a/src/PrestaShopBundle/Install/XmlLoader.php
+++ b/src/PrestaShopBundle/Install/XmlLoader.php
@@ -266,7 +266,7 @@ public function populateEntity($entity)
             return;
         }
 
-        if (substr($entity, 0, 1) == '.' || substr($entity, 0, 1) == '_') {
+        if (str_starts_with($entity, '.') || str_starts_with($entity, '_')) {
             return;
         }
 
@@ -537,7 +537,7 @@ public function createEntity($entity, $identifier, $classname, array $data, arra
             $entity_id = 0;
             if (!$xml->fields['primary']) {
                 $primary = 'id_' . $entity;
-            } elseif (strpos((string) $xml->fields['primary'], ',') === false) {
+            } elseif (!str_contains((string) $xml->fields['primary'], ',')) {
                 $primary = (string) $xml->fields['primary'];
             }
             unset($xml);
@@ -662,7 +662,7 @@ public function createEntityTab($identifier, array $data, array $data_lang)
         // Generate primary key manually
         if (!$xml->fields['primary']) {
             $primary = 'id_' . $entity;
-        } elseif (strpos((string) $xml->fields['primary'], ',') === false) {
+        } elseif (!str_contains((string) $xml->fields['primary'], ',')) {
             $primary = (string) $xml->fields['primary'];
         } else {
             $primary = '';
@@ -1210,7 +1210,7 @@ public function getEntityContents($entity)
 
         // Check if current table is an association table (if multiple primary keys)
         $is_association = false;
-        if (strpos($primary, ',') !== false) {
+        if (str_contains($primary, ',')) {
             $is_association = true;
             $primary = array_map('trim', explode(',', $primary));
         }
diff --git a/src/PrestaShopBundle/Routing/Converter/LegacyUrlConverter.php b/src/PrestaShopBundle/Routing/Converter/LegacyUrlConverter.php
index 8af1cd097b10c..852ce1d0d443e 100644
--- a/src/PrestaShopBundle/Routing/Converter/LegacyUrlConverter.php
+++ b/src/PrestaShopBundle/Routing/Converter/LegacyUrlConverter.php
@@ -214,8 +214,8 @@ private function getActionFromParameters(array $parameters)
                     // e.g.
                     //  create=1 is an action
                     //  id_product=1 is NOT an action
-                    if (false === strpos($parameter, 'id_')
-                        && false === strpos($parameter, '_id')) {
+                    if (!str_contains($parameter, 'id_')
+                        && !str_contains($parameter, '_id')) {
                         $legacyAction = $parameter;
 
                         break;
diff --git a/src/PrestaShopBundle/Routing/Linter/AdminRouteProvider.php b/src/PrestaShopBundle/Routing/Linter/AdminRouteProvider.php
index 98bd2f29821da..7fca5c88f76aa 100644
--- a/src/PrestaShopBundle/Routing/Linter/AdminRouteProvider.php
+++ b/src/PrestaShopBundle/Routing/Linter/AdminRouteProvider.php
@@ -55,7 +55,7 @@ public function getRoutes()
         $adminRoutes = [];
 
         foreach ($this->router->getRouteCollection() as $routeName => $route) {
-            if (strpos($routeName, 'admin_') !== 0) {
+            if (!str_starts_with($routeName, 'admin_')) {
                 continue;
             }
 
diff --git a/src/PrestaShopBundle/Routing/Linter/NamingConventionLinter.php b/src/PrestaShopBundle/Routing/Linter/NamingConventionLinter.php
index 9294526121f87..e19d462da3a7c 100644
--- a/src/PrestaShopBundle/Routing/Linter/NamingConventionLinter.php
+++ b/src/PrestaShopBundle/Routing/Linter/NamingConventionLinter.php
@@ -71,7 +71,7 @@ public function lint($routeName, Route $route)
     private function getControllerAndMethodName(Route $route)
     {
         $defaultController = $route->getDefault('_controller');
-        if (false === strpos($defaultController, '::')) {
+        if (!str_contains($defaultController, '::')) {
             throw new SymfonyControllerConventionException(
                 sprintf('Controller "%s" does not follow symfony convention.', $defaultController),
                 $defaultController
diff --git a/src/PrestaShopBundle/Routing/Linter/SecurityAnnotationLinter.php b/src/PrestaShopBundle/Routing/Linter/SecurityAnnotationLinter.php
index 419c4dc464f81..ecda704ca77f6 100644
--- a/src/PrestaShopBundle/Routing/Linter/SecurityAnnotationLinter.php
+++ b/src/PrestaShopBundle/Routing/Linter/SecurityAnnotationLinter.php
@@ -98,7 +98,7 @@ private function extractControllerAndMethodNamesFromRoute(Route $route)
     {
         $controller = $route->getDefault('_controller');
 
-        if (strpos($controller, '::') === false) {
+        if (!str_contains($controller, '::')) {
             return null;
         }
 
diff --git a/src/PrestaShopBundle/Security/SslMiddleware.php b/src/PrestaShopBundle/Security/SslMiddleware.php
index 5e44c8d5173b7..832c5c5a28a00 100644
--- a/src/PrestaShopBundle/Security/SslMiddleware.php
+++ b/src/PrestaShopBundle/Security/SslMiddleware.php
@@ -89,7 +89,7 @@ public function onKernelRequest(RequestEvent $event): void
         $enabled = (1 === (int) $this->configuration->get('PS_SSL_ENABLED'));
         $forced = (1 === (int) $this->configuration->get('PS_SSL_ENABLED_EVERYWHERE'));
         $serverParams = $event->getRequest()->server;
-        $refererSsl = ($serverParams->has('HTTP_REFERER') && strpos($serverParams->get('HTTP_REFERER'), 'https') === 0);
+        $refererSsl = ($serverParams->has('HTTP_REFERER') && str_starts_with($serverParams->get('HTTP_REFERER'), 'https'));
 
         if ($enabled && ($forced || $refererSsl)) {
             $this->redirectToSsl($event);
diff --git a/src/PrestaShopBundle/Security/Voter/PageVoter.php b/src/PrestaShopBundle/Security/Voter/PageVoter.php
index f475fa5175e81..d25393085d2b3 100644
--- a/src/PrestaShopBundle/Security/Voter/PageVoter.php
+++ b/src/PrestaShopBundle/Security/Voter/PageVoter.php
@@ -135,7 +135,7 @@ private function buildAction(string $subject, string $attribute): string
         $action = $subject;
 
         // add underscore to join if needed
-        if (substr($action, -1) !== '_') {
+        if (!str_ends_with($action, '_')) {
             $action .= '_';
         }
 
diff --git a/src/PrestaShopBundle/Translation/Exporter/ThemeExporter.php b/src/PrestaShopBundle/Translation/Exporter/ThemeExporter.php
index 67b64cc685591..2c158f86228fa 100644
--- a/src/PrestaShopBundle/Translation/Exporter/ThemeExporter.php
+++ b/src/PrestaShopBundle/Translation/Exporter/ThemeExporter.php
@@ -181,7 +181,7 @@ protected function ensureFileBelongsToExportDirectory($filePath)
             return false;
         }
 
-        $validFileLocation = substr(realpath($filePath), 0, strlen(realpath($this->exportDir))) === realpath($this->exportDir);
+        $validFileLocation = str_starts_with(realpath($filePath), realpath($this->exportDir));
 
         if (!$validFileLocation) {
             throw new \Exception('Invalid file location. This file should belong to the export directory');
diff --git a/src/PrestaShopBundle/Translation/PrestaShopTranslatorTrait.php b/src/PrestaShopBundle/Translation/PrestaShopTranslatorTrait.php
index b26234e4529ac..060fea06b4120 100644
--- a/src/PrestaShopBundle/Translation/PrestaShopTranslatorTrait.php
+++ b/src/PrestaShopBundle/Translation/PrestaShopTranslatorTrait.php
@@ -171,7 +171,7 @@ private function translateUsingLegacySystem($message, array $parameters, $domain
     private function shouldFallbackToLegacyModuleTranslation(string $message, ?string $domain, ?string $locale): bool
     {
         return
-            'Modules.' === substr($domain ?? '', 0, 8)
+            str_starts_with($domain ?? '', 'Modules.')
             && (
                 !method_exists($this, 'getCatalogue')
                 || !$this->getCatalogue($locale)->has($message, $this->normalizeDomain($domain))
diff --git a/src/PrestaShopBundle/Translation/Provider/TranslationFinder.php b/src/PrestaShopBundle/Translation/Provider/TranslationFinder.php
index d37e77b21a88f..afc4c2a20a459 100644
--- a/src/PrestaShopBundle/Translation/Provider/TranslationFinder.php
+++ b/src/PrestaShopBundle/Translation/Provider/TranslationFinder.php
@@ -149,7 +149,7 @@ private function getDomainFromFile(SplFileInfo $file, string $locale): string
         $basename = $file->getBasename('.xlf');
 
         $domain = $basename;
-        if (strpos($basename, $locale) === false) {
+        if (!str_contains($basename, $locale)) {
             $domain .= '.' . $locale;
         }
 
diff --git a/src/PrestaShopBundle/Translation/View/TreeBuilder.php b/src/PrestaShopBundle/Translation/View/TreeBuilder.php
index 2de85cf0b9f0f..dd960b9601677 100644
--- a/src/PrestaShopBundle/Translation/View/TreeBuilder.php
+++ b/src/PrestaShopBundle/Translation/View/TreeBuilder.php
@@ -118,18 +118,18 @@ private function dataContainsSearchWord($search, $data)
         if (is_string($search)) {
             $search = strtolower($search);
 
-            return false !== strpos(strtolower($data['default']), $search) ||
-                false !== strpos(strtolower($data['xlf']), $search) ||
-                false !== strpos(strtolower($data['db']), $search);
+            return str_contains(strtolower($data['default']), $search) ||
+                str_contains(strtolower($data['xlf']), $search) ||
+                str_contains(strtolower($data['db']), $search);
         }
 
         if (is_array($search)) {
             $contains = true;
             foreach ($search as $s) {
                 $s = strtolower($s);
-                $contains &= false !== strpos(strtolower($data['default']), $s) ||
-                    false !== strpos(strtolower($data['xlf']), $s) ||
-                    false !== strpos(strtolower($data['db']), $s);
+                $contains &= str_contains(strtolower($data['default']), $s) ||
+                    str_contains(strtolower($data['xlf']), $s) ||
+                    str_contains(strtolower($data['db']), $s);
             }
 
             return $contains;
@@ -201,7 +201,7 @@ public function cleanTreeToApi($tree, Router $router, $theme = null, $search = n
         $index1 = 0;
         foreach ($tree as $k1 => $t1) {
             $index2 = 0;
-            if (is_array($t1) && '__' !== substr($k1, 0, 2)) {
+            if (is_array($t1) && !str_starts_with($k1, '__')) {
                 $this->addTreeInfo($router, $cleanTree, $index1, $k1, $k1, $this->theme, $search, $module);
 
                 if (array_key_exists('__messages', $t1)) {
@@ -221,7 +221,7 @@ public function cleanTreeToApi($tree, Router $router, $theme = null, $search = n
 
                 foreach ($t1 as $k2 => $t2) {
                     $index3 = 0;
-                    if (is_array($t2) && '__' !== substr($k2, 0, 2)) {
+                    if (is_array($t2) && !str_starts_with($k2, '__')) {
                         $this->addTreeInfo($router, $cleanTree[$index1]['children'], $index2, $k2, $k1 . $k2, $this->theme, $search, $module);
 
                         if (array_key_exists('__messages', $t2)) {
@@ -242,7 +242,7 @@ public function cleanTreeToApi($tree, Router $router, $theme = null, $search = n
                         }
 
                         foreach ($t2 as $k3 => $t3) {
-                            if (is_array($t3) && '__' !== substr($k3, 0, 2)) {
+                            if (is_array($t3) && !str_starts_with($k3, '__')) {
                                 $this->addTreeInfo($router, $cleanTree[$index1]['children'][$index2]['children'], $index3, $k3, $k1 . $k2 . $k3, $this->theme, $search, $module);
 
                                 if (array_key_exists('__messages', $t3)) {
diff --git a/src/PrestaShopBundle/Twig/LayoutExtension.php b/src/PrestaShopBundle/Twig/LayoutExtension.php
index 530df4a442c06..72ba5102554ee 100644
--- a/src/PrestaShopBundle/Twig/LayoutExtension.php
+++ b/src/PrestaShopBundle/Twig/LayoutExtension.php
@@ -210,7 +210,7 @@ public function getLegacyLayout(
         }
 
         // Test if legacy template from "content.tpl" has '{$content}'
-        if (false === strpos($layout, '{$content}')) {
+        if (!str_contains($layout, '{$content}')) {
             throw new Exception('PrestaShopBundle\Twig\LayoutExtension cannot find the {$content} string in legacy layout template', 1);
         }
 

From a69a8ff5f5a5b8b0298370a0f479ee3e4a60aa72 Mon Sep 17 00:00:00 2001
From: Fabien Papet <fabien.papet@gmail.com>
Date: Mon, 19 Jun 2023 19:04:17 +0200
Subject: [PATCH 0199/1030] Apply array notation rector

Signed-off-by: Fabien Papet <fabien.papet@gmail.com>
---
 rector.php                                                  | 4 ++--
 src/Adapter/Admin/UrlGenerator.php                          | 2 +-
 src/Adapter/Backup/Backup.php                               | 2 +-
 .../CommandHandler/UpdateCategoryPositionHandler.php        | 2 +-
 src/Adapter/Import/ImageCopier.php                          | 2 +-
 src/Adapter/LegacyHookSubscriber.php                        | 2 +-
 src/Adapter/Order/OrderDetailUpdater.php                    | 6 +++---
 src/Adapter/Presenter/Cart/CartPresenter.php                | 2 +-
 .../LocalizationPackByIsoCodeChoiceProvider.php             | 2 +-
 src/Core/Localization/Number/Formatter.php                  | 2 +-
 .../Configuration/PaymentRestrictionsConfigurator.php       | 2 +-
 src/Core/Product/Search/SortOrder.php                       | 2 +-
 .../Search/Builder/AbstractRepositoryFiltersBuilder.php     | 2 +-
 src/Core/Shop/LogoUploader.php                              | 2 +-
 src/Core/Translation/Builder/Map/Catalogue.php              | 2 +-
 src/PrestaShopBundle/Api/QueryParamsCollection.php          | 4 ++--
 .../EventListener/DemoModeEnabledListener.php               | 2 +-
 .../EventListener/ModuleActivatedListener.php               | 2 +-
 src/PrestaShopBundle/Install/Install.php                    | 2 +-
 .../Routing/Linter/NamingConventionLinter.php               | 2 +-
 .../Routing/Linter/SecurityAnnotationLinter.php             | 2 +-
 .../Translation/TranslatorLanguageLoader.php                | 4 ++--
 src/PrestaShopBundle/Translation/View/TreeBuilder.php       | 2 +-
 src/PrestaShopBundle/Twig/TranslationsExtension.php         | 6 +++---
 24 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/rector.php b/rector.php
index 39d6c6060d174..0e816e849a66e 100644
--- a/rector.php
+++ b/rector.php
@@ -74,8 +74,8 @@
         TernaryToNullCoalescingRector::class => '*',
         RemoveUnusedVariableInCatchRector::class => '*',
         StringableForToStringRector::class => '*',
-        LongArrayToShortArrayRector::class => '*',
-        ListToArrayDestructRector::class => '*',
+//        LongArrayToShortArrayRector::class => '*',
+//        ListToArrayDestructRector::class => '*',
         StringClassNameToClassConstantRector::class => '*',
         IfToSpaceshipRector::class => '*',
         ClassOnObjectRector::class => '*',
diff --git a/src/Adapter/Admin/UrlGenerator.php b/src/Adapter/Admin/UrlGenerator.php
index f7d52eac44188..5cffe80e17fc9 100644
--- a/src/Adapter/Admin/UrlGenerator.php
+++ b/src/Adapter/Admin/UrlGenerator.php
@@ -80,7 +80,7 @@ public function generate($name, $parameters = [], $referenceType = self::ABSOLUT
         $legacyParameters = $parameters;
 
         // resolve route & legacy mapping
-        list($legacyController, $legacyParameters) = $this->getLegacyOptions($name, $parameters);
+        [$legacyController, $legacyParameters] = $this->getLegacyOptions($name, $parameters);
 
         return $this->legacyContext->getAdminLink($legacyController, true, $legacyParameters);
     }
diff --git a/src/Adapter/Backup/Backup.php b/src/Adapter/Backup/Backup.php
index bb6604c5860ba..2c504ec221b05 100644
--- a/src/Adapter/Backup/Backup.php
+++ b/src/Adapter/Backup/Backup.php
@@ -101,7 +101,7 @@ public function getAge()
      */
     public function getDate()
     {
-        list($timestamp) = explode('-', $this->fileName);
+        [$timestamp] = explode('-', $this->fileName);
 
         return new DateTimeImmutable('@' . $timestamp);
     }
diff --git a/src/Adapter/Category/CommandHandler/UpdateCategoryPositionHandler.php b/src/Adapter/Category/CommandHandler/UpdateCategoryPositionHandler.php
index 211b308e3d5f4..f944e9cbae93c 100644
--- a/src/Adapter/Category/CommandHandler/UpdateCategoryPositionHandler.php
+++ b/src/Adapter/Category/CommandHandler/UpdateCategoryPositionHandler.php
@@ -48,7 +48,7 @@ public function handle(UpdateCategoryPositionCommand $command)
         $position = null;
 
         foreach ($command->getPositions() as $key => $value) {
-            list(, $positionParentCategoryId, $positionCategoryId) = explode('_', $value);
+            [, $positionParentCategoryId, $positionCategoryId] = explode('_', $value);
 
             if ((int) $positionParentCategoryId === $parentCategoryId && (int) $positionCategoryId === $categoryId) {
                 $position = $key;
diff --git a/src/Adapter/Import/ImageCopier.php b/src/Adapter/Import/ImageCopier.php
index c1a57924f96da..3c244990baeeb 100644
--- a/src/Adapter/Import/ImageCopier.php
+++ b/src/Adapter/Import/ImageCopier.php
@@ -234,7 +234,7 @@ private function getBestPath($targetWidth, $targetHeight, $pathInfos)
         $pathInfos = array_reverse($pathInfos);
         $path = '';
         foreach ($pathInfos as $pathInfo) {
-            list($width, $height, $path) = $pathInfo;
+            [$width, $height, $path] = $pathInfo;
             if ($width >= $targetWidth && $height >= $targetHeight) {
                 return $path;
             }
diff --git a/src/Adapter/LegacyHookSubscriber.php b/src/Adapter/LegacyHookSubscriber.php
index 7a5ae417ac13e..dd28f1580151c 100644
--- a/src/Adapter/LegacyHookSubscriber.php
+++ b/src/Adapter/LegacyHookSubscriber.php
@@ -118,7 +118,7 @@ public function __call($name, $args)
         }
 
         $moduleId = (int) $ids[1];
-        list($event, $hookName) = $args;
+        [$event, $hookName] = $args;
 
         $content = Hook::exec(
             $hookName,
diff --git a/src/Adapter/Order/OrderDetailUpdater.php b/src/Adapter/Order/OrderDetailUpdater.php
index 02d26392af2bb..23e08836b2806 100644
--- a/src/Adapter/Order/OrderDetailUpdater.php
+++ b/src/Adapter/Order/OrderDetailUpdater.php
@@ -88,7 +88,7 @@ public function updateOrderDetail(
         DecimalNumber $priceTaxExcluded,
         DecimalNumber $priceTaxIncluded
     ): void {
-        list($roundType, $computingPrecision, $taxAddress) = $this->prepareOrderContext($order);
+        [$roundType, $computingPrecision, $taxAddress] = $this->prepareOrderContext($order);
 
         try {
             $ecotax = new DecimalNumber((string) $orderDetail->ecotax);
@@ -136,7 +136,7 @@ public function updateOrderDetailsForProduct(
         DecimalNumber $priceTaxExcluded,
         DecimalNumber $priceTaxIncluded
     ): void {
-        list($roundType, $computingPrecision, $taxAddress) = $this->prepareOrderContext($order);
+        [$roundType, $computingPrecision, $taxAddress] = $this->prepareOrderContext($order);
 
         try {
             $this->applyUpdatesForProduct(
@@ -159,7 +159,7 @@ public function updateOrderDetailsForProduct(
      */
     public function updateOrderDetailsTaxes(Order $order): void
     {
-        list($roundType, $computingPrecision, $taxAddress) = $this->prepareOrderContext($order);
+        [$roundType, $computingPrecision, $taxAddress] = $this->prepareOrderContext($order);
 
         try {
             $orderDetailsData = $order->getProducts();
diff --git a/src/Adapter/Presenter/Cart/CartPresenter.php b/src/Adapter/Presenter/Cart/CartPresenter.php
index 446968dd03494..4e2bc1ca86067 100644
--- a/src/Adapter/Presenter/Cart/CartPresenter.php
+++ b/src/Adapter/Presenter/Cart/CartPresenter.php
@@ -680,7 +680,7 @@ protected function getAttributesArrayFromString($attributes)
         }
 
         foreach ($matches['attribute'] as $attribute) {
-            list($key, $value) = explode(':', $attribute);
+            [$key, $value] = explode(':', $attribute);
             $attributesArray[trim($key)] = ltrim($value);
         }
 
diff --git a/src/Core/Form/ChoiceProvider/LocalizationPackByIsoCodeChoiceProvider.php b/src/Core/Form/ChoiceProvider/LocalizationPackByIsoCodeChoiceProvider.php
index d7d9595979710..0a85d83a73d23 100644
--- a/src/Core/Form/ChoiceProvider/LocalizationPackByIsoCodeChoiceProvider.php
+++ b/src/Core/Form/ChoiceProvider/LocalizationPackByIsoCodeChoiceProvider.php
@@ -104,7 +104,7 @@ public function getChoices()
             ->name('/^([a-z]{2})\.xml$/');
 
         foreach ($finder as $file) {
-            list($iso) = explode('.', $file->getFilename());
+            [$iso] = explode('.', $file->getFilename());
 
             // if localization pack was not loaded yet and it exists locally
             // then add it to choices list
diff --git a/src/Core/Localization/Number/Formatter.php b/src/Core/Localization/Number/Formatter.php
index d00e168d128d9..c2c74fd2aa71e 100644
--- a/src/Core/Localization/Number/Formatter.php
+++ b/src/Core/Localization/Number/Formatter.php
@@ -115,7 +115,7 @@ public function format($number, NumberSpecification $specification)
         $isNegative = $decimalNumber->isNegative();
         $decimalNumber = $decimalNumber->toPositive();
 
-        list($majorDigits, $minorDigits) = $this->extractMajorMinorDigits($decimalNumber);
+        [$majorDigits, $minorDigits] = $this->extractMajorMinorDigits($decimalNumber);
         $majorDigits = $this->splitMajorGroups($majorDigits);
         $minorDigits = $this->adjustMinorDigitsZeroes($minorDigits);
 
diff --git a/src/Core/Module/Configuration/PaymentRestrictionsConfigurator.php b/src/Core/Module/Configuration/PaymentRestrictionsConfigurator.php
index 2f5b4f92333dc..cbafb97bd63f9 100644
--- a/src/Core/Module/Configuration/PaymentRestrictionsConfigurator.php
+++ b/src/Core/Module/Configuration/PaymentRestrictionsConfigurator.php
@@ -118,7 +118,7 @@ public function configureCarrierRestrictions(array $carrierRestrictions)
      */
     private function configureRestrictions($restrictionType, array $restrictions)
     {
-        list($moduleIds, $newConfiguration) = $this->parseRestrictionData($restrictions);
+        [$moduleIds, $newConfiguration] = $this->parseRestrictionData($restrictions);
 
         $this->clearCurrentConfiguration($restrictionType, $moduleIds);
         $this->insertNewConfiguration($restrictionType, $newConfiguration);
diff --git a/src/Core/Product/Search/SortOrder.php b/src/Core/Product/Search/SortOrder.php
index fd822e8258d89..f1a9bd2197bfc 100644
--- a/src/Core/Product/Search/SortOrder.php
+++ b/src/Core/Product/Search/SortOrder.php
@@ -127,7 +127,7 @@ public static function newFromString($sortOrderConfiguration)
             throw new CoreException('Invalid argument');
         }
 
-        list($entity, $field, $direction) = $sortParams;
+        [$entity, $field, $direction] = $sortParams;
 
         return new static($entity, $field, $direction);
     }
diff --git a/src/Core/Search/Builder/AbstractRepositoryFiltersBuilder.php b/src/Core/Search/Builder/AbstractRepositoryFiltersBuilder.php
index 9bd3f7ec23a74..7577a1cf46675 100644
--- a/src/Core/Search/Builder/AbstractRepositoryFiltersBuilder.php
+++ b/src/Core/Search/Builder/AbstractRepositoryFiltersBuilder.php
@@ -77,7 +77,7 @@ public function setConfig(array $config)
         $defaultController = $defaultAction = '';
         if (isset($config['request']) && $config['request'] instanceof Request) {
             $request = $config['request'];
-            list($defaultController, $defaultAction) = ControllerAction::fromString($request->get('_controller'));
+            [$defaultController, $defaultAction] = ControllerAction::fromString($request->get('_controller'));
         }
 
         $this->controller = isset($config['controller']) ? $config['controller'] : $defaultController;
diff --git a/src/Core/Shop/LogoUploader.php b/src/Core/Shop/LogoUploader.php
index bb087ec23d326..afd1a6232a4c0 100644
--- a/src/Core/Shop/LogoUploader.php
+++ b/src/Core/Shop/LogoUploader.php
@@ -82,7 +82,7 @@ public function __construct(
     public function updateHeader()
     {
         if ($this->update('PS_LOGO', 'logo')) {
-            list($width, $height) = getimagesize($this->imageDirection . Configuration::get('PS_LOGO'));
+            [$width, $height] = getimagesize($this->imageDirection . Configuration::get('PS_LOGO'));
             Configuration::updateValue('SHOP_LOGO_HEIGHT', (int) round($height));
             Configuration::updateValue('SHOP_LOGO_WIDTH', (int) round($width));
         }
diff --git a/src/Core/Translation/Builder/Map/Catalogue.php b/src/Core/Translation/Builder/Map/Catalogue.php
index 7306e1fcd4997..bb20370c0ce69 100644
--- a/src/Core/Translation/Builder/Map/Catalogue.php
+++ b/src/Core/Translation/Builder/Map/Catalogue.php
@@ -152,7 +152,7 @@ private function updateCounters(array &$subtree): array
             }
 
             // update child and get its counters
-            list($count, $missing) = $this->updateCounters($subtree[$key]);
+            [$count, $missing] = $this->updateCounters($subtree[$key]);
 
             // update this tree's counters by adding the child's
             $subtree[self::METADATA_KEY_NAME]['count'] += $count;
diff --git a/src/PrestaShopBundle/Api/QueryParamsCollection.php b/src/PrestaShopBundle/Api/QueryParamsCollection.php
index fd778ebffc62c..900e80b13bae2 100644
--- a/src/PrestaShopBundle/Api/QueryParamsCollection.php
+++ b/src/PrestaShopBundle/Api/QueryParamsCollection.php
@@ -648,7 +648,7 @@ protected function appendSqlAttributesFilterParam($value, $sqlParams)
         }
 
         array_map(function ($index, $value) use (&$sqlParams) {
-            list($idAttributeGroup, $idAttribute) = explode(':', $value);
+            [$idAttributeGroup, $idAttribute] = explode(':', $value);
             $sqlParams['attribute_id_' . $index] = (string) $idAttribute;
             $sqlParams['attribute_group_id_' . $index] = (string) $idAttributeGroup;
         }, range(0, count($value) - 1), $value);
@@ -704,7 +704,7 @@ protected function appendSqlFeaturesFilterParam($value, $sqlParams)
         }
 
         array_map(function ($index, $value) use (&$sqlParams) {
-            list($idFeature, $idFeatureValue) = explode(':', $value);
+            [$idFeature, $idFeatureValue] = explode(':', $value);
             $sqlParams['feature_id_' . $index] = (string) $idFeature;
             $sqlParams['feature_value_id_' . $index] = (string) $idFeatureValue;
         }, range(0, count($value) - 1), $value);
diff --git a/src/PrestaShopBundle/EventListener/DemoModeEnabledListener.php b/src/PrestaShopBundle/EventListener/DemoModeEnabledListener.php
index 59c9334f81bd8..f51157f225607 100644
--- a/src/PrestaShopBundle/EventListener/DemoModeEnabledListener.php
+++ b/src/PrestaShopBundle/EventListener/DemoModeEnabledListener.php
@@ -108,7 +108,7 @@ public function onKernelController(ControllerEvent $event)
             return;
         }
 
-        list($controllerObject, $methodName) = $controller;
+        [$controllerObject, $methodName] = $controller;
         $demoRestricted = $this->getAnnotation($controllerObject, $methodName);
 
         if (!$demoRestricted instanceof DemoRestricted) {
diff --git a/src/PrestaShopBundle/EventListener/ModuleActivatedListener.php b/src/PrestaShopBundle/EventListener/ModuleActivatedListener.php
index 9c701eb25f6f8..ccc6f2fe824d0 100644
--- a/src/PrestaShopBundle/EventListener/ModuleActivatedListener.php
+++ b/src/PrestaShopBundle/EventListener/ModuleActivatedListener.php
@@ -110,7 +110,7 @@ public function onKernelController(ControllerEvent $event)
             return;
         }
 
-        list($controllerObject, $methodName) = $controller;
+        [$controllerObject, $methodName] = $controller;
         $moduleActivated = $this->getAnnotation($controllerObject, $methodName);
 
         if (null === $moduleActivated) {
diff --git a/src/PrestaShopBundle/Install/Install.php b/src/PrestaShopBundle/Install/Install.php
index 2c64b718984da..8eb2bbb19dccd 100644
--- a/src/PrestaShopBundle/Install/Install.php
+++ b/src/PrestaShopBundle/Install/Install.php
@@ -835,7 +835,7 @@ public function configureShop(array $data = [])
 
         // Set logo configuration
         if (file_exists(_PS_IMG_DIR_ . 'logo.png')) {
-            list($width, $height) = getimagesize(_PS_IMG_DIR_ . 'logo.png');
+            [$width, $height] = getimagesize(_PS_IMG_DIR_ . 'logo.png');
             Configuration::updateGlobalValue('SHOP_LOGO_WIDTH', round($width));
             Configuration::updateGlobalValue('SHOP_LOGO_HEIGHT', round($height));
         }
diff --git a/src/PrestaShopBundle/Routing/Linter/NamingConventionLinter.php b/src/PrestaShopBundle/Routing/Linter/NamingConventionLinter.php
index e19d462da3a7c..7998508155293 100644
--- a/src/PrestaShopBundle/Routing/Linter/NamingConventionLinter.php
+++ b/src/PrestaShopBundle/Routing/Linter/NamingConventionLinter.php
@@ -78,7 +78,7 @@ private function getControllerAndMethodName(Route $route)
             );
         }
 
-        list($controller, $method) = explode('::', $defaultController, 2);
+        [$controller, $method] = explode('::', $defaultController, 2);
         if (!method_exists($controller, $method)) {
             throw new ControllerNotFoundException(
                 sprintf('Controller "%s" does not exist.', $defaultController),
diff --git a/src/PrestaShopBundle/Routing/Linter/SecurityAnnotationLinter.php b/src/PrestaShopBundle/Routing/Linter/SecurityAnnotationLinter.php
index ecda704ca77f6..e2d723d90d11a 100644
--- a/src/PrestaShopBundle/Routing/Linter/SecurityAnnotationLinter.php
+++ b/src/PrestaShopBundle/Routing/Linter/SecurityAnnotationLinter.php
@@ -102,7 +102,7 @@ private function extractControllerAndMethodNamesFromRoute(Route $route)
             return null;
         }
 
-        list($controller, $method) = explode('::', $controller, 2);
+        [$controller, $method] = explode('::', $controller, 2);
 
         return [
             'controller' => $controller,
diff --git a/src/PrestaShopBundle/Translation/TranslatorLanguageLoader.php b/src/PrestaShopBundle/Translation/TranslatorLanguageLoader.php
index 49340ae8b38ee..a112f6c799202 100644
--- a/src/PrestaShopBundle/Translation/TranslatorLanguageLoader.php
+++ b/src/PrestaShopBundle/Translation/TranslatorLanguageLoader.php
@@ -111,7 +111,7 @@ public function loadLanguage(TranslatorInterface $translator, $locale, $withDB =
                 ->in($directory);
 
             foreach ($finder as $file) {
-                list($domain, $locale, $format) = explode('.', $file->getBasename(), 3);
+                [$domain, $locale, $format] = explode('.', $file->getBasename(), 3);
                 $translator->addResource($format, $file, $locale, $domain);
                 if ($withDB) {
                     if ($type !== 'theme') {
@@ -159,7 +159,7 @@ private function loadModuleTranslations(
             ->in($translationDir);
 
         foreach ($modulesCatalogueFinder as $file) {
-            list($domain, $locale, $format) = explode('.', $file->getBasename(), 3);
+            [$domain, $locale, $format] = explode('.', $file->getBasename(), 3);
             $translator->addResource($format, $file, $locale, $domain);
             if ($withDB) {
                 $translator->addResource('db', $domain . '.' . $locale . '.db', $locale, $domain);
diff --git a/src/PrestaShopBundle/Translation/View/TreeBuilder.php b/src/PrestaShopBundle/Translation/View/TreeBuilder.php
index dd960b9601677..8e89d48a92a6f 100644
--- a/src/PrestaShopBundle/Translation/View/TreeBuilder.php
+++ b/src/PrestaShopBundle/Translation/View/TreeBuilder.php
@@ -165,7 +165,7 @@ public function makeTranslationsTree($catalogue)
             $subtree['__messages'] = [$domain => $messages];
             if (isset($messages['__metadata'])) {
                 $subtree['__fixed_length_id'] = '_' . sha1($domain);
-                list($subtree['__domain']) = explode('.', $domain);
+                [$subtree['__domain']] = explode('.', $domain);
                 $subtree['__metadata'] = $messages['__metadata'];
                 $subtree['__metadata']['domain'] = $subtree['__domain'];
                 unset($messages['__metadata']);
diff --git a/src/PrestaShopBundle/Twig/TranslationsExtension.php b/src/PrestaShopBundle/Twig/TranslationsExtension.php
index cb6e530089afb..4df8baddd3d6b 100644
--- a/src/PrestaShopBundle/Twig/TranslationsExtension.php
+++ b/src/PrestaShopBundle/Twig/TranslationsExtension.php
@@ -241,7 +241,7 @@ protected function getSharedEditFormViewProperties()
      */
     protected function renderEditTranslationForm($properties)
     {
-        list($domain, $locale) = explode('.', $properties['camelized_domain']);
+        [$domain, $locale] = explode('.', $properties['camelized_domain']);
         $translationValue = $this->getTranslationValue($properties['translation']);
         $defaultTranslationValue = $this->getDefaultTranslationValue(
             $properties['translation_key'],
@@ -521,8 +521,8 @@ protected function replaceWarningPlaceholder($output, $subtree)
      */
     protected function parseDomain($subtree)
     {
-        list($camelizedDomain) = $subtree['__messages'];
-        list($domain) = explode('.', $camelizedDomain);
+        [$camelizedDomain] = $subtree['__messages'];
+        [$domain] = explode('.', $camelizedDomain);
 
         return $domain;
     }

From b09e18e6b82b3fc3a6e82eeedb17f475d3f58a19 Mon Sep 17 00:00:00 2001
From: Fabien Papet <fabien.papet@gmail.com>
Date: Mon, 19 Jun 2023 19:06:37 +0200
Subject: [PATCH 0200/1030] Apply class notation rector

Signed-off-by: Fabien Papet <fabien.papet@gmail.com>
---
 rector.php                                       |  6 ------
 src/Adapter/AbstractObjectModelValidator.php     |  8 ++++----
 src/Adapter/Admin/PagePreference.php             |  2 +-
 src/Adapter/Hook/HookDispatcher.php              |  2 +-
 src/Adapter/Image/ImageRetriever.php             | 10 +++++-----
 .../MailTemplate/MailTemplateTwigRenderer.php    |  2 +-
 src/Adapter/PDF/DeliverySlipPdfGenerator.php     |  2 +-
 src/Adapter/PDF/InvoicePdfGenerator.php          |  2 +-
 src/Adapter/PDF/OrderInvoicePdfGenerator.php     |  2 +-
 src/Adapter/Presenter/AbstractLazyArray.php      |  6 +++---
 .../CommandHandler/BulkDeleteSupplierHandler.php |  2 +-
 .../CommandHandler/DeleteSupplierHandler.php     |  2 +-
 src/Core/Addon/Theme/ThemeManager.php            |  2 +-
 src/Core/CommandBus/ExecutedCommandRegistry.php  |  4 ++--
 src/Core/Data/AbstractTypedCollection.php        |  2 +-
 src/Core/Data/Layer/AbstractDataLayer.php        |  4 ++--
 .../CommandBuilder/CommandBuilder.php            |  2 +-
 .../CommandBuilder/CommandField.php              |  2 +-
 src/Core/Grid/Column/AbstractColumn.php          |  2 +-
 .../Grid/Filter/CategoryFilterFormFactory.php    |  2 +-
 .../Grid/Filter/CmsPageFilterFormFactory.php     |  2 +-
 .../FilterFormFactoryFormActionDecorator.php     |  2 +-
 .../Query/ProductCombinationQueryBuilder.php     |  4 ++--
 .../AbstractMultiShopObjectModelRepository.php   |  4 ++--
 .../Repository/AbstractObjectModelRepository.php | 16 ++++++++--------
 src/Core/Util/DateTime/NullDateTime.php          |  2 +-
 .../ControllerConfigurationFactory.php           |  2 +-
 .../InitFrameworkBridgeControllerListener.php    |  2 +-
 .../AdvancedParameters/ShopController.php        |  2 +-
 .../AdvancedParameters/SqlManagerController.php  | 10 +++++-----
 .../Configure/ShopParameters/MetaController.php  |  4 ++--
 .../Admin/FrameworkBundleAdminController.php     |  2 +-
 .../Admin/Improve/Design/ThemeController.php     |  4 ++--
 .../Admin/Sell/Catalog/CartRuleController.php    |  2 +-
 .../Admin/Sell/Order/CartController.php          |  2 +-
 .../ActionDispatcherLegacyHooksSubscriber.php    |  2 +-
 ...lterCmsPageCategorySearchCriteriaListener.php |  2 +-
 .../Admin/Improve/Design/Theme/ShopLogosType.php |  4 ++--
 .../Validator/Constraints/TinyMceMaxLength.php   |  2 +-
 .../Security/Admin/EmployeeProvider.php          |  2 +-
 src/PrestaShopBundle/Service/Hook/HookFinder.php |  4 ++--
 41 files changed, 68 insertions(+), 74 deletions(-)

diff --git a/rector.php b/rector.php
index 0e816e849a66e..523480e3747c0 100644
--- a/rector.php
+++ b/rector.php
@@ -6,7 +6,6 @@
 use Rector\CodeQuality\Rector\ClassMethod\OptionalParametersAfterRequiredRector;
 use Rector\Config\RectorConfig;
 use Rector\Php53\Rector\Ternary\TernaryToElvisRector;
-use Rector\Php54\Rector\Array_\LongArrayToShortArrayRector;
 use Rector\Php55\Rector\Class_\ClassConstantToSelfClassRector;
 use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector;
 use Rector\Php56\Rector\FuncCall\PowToExpRector;
@@ -16,7 +15,6 @@
 use Rector\Php70\Rector\MethodCall\ThisCallOnStaticMethodToStaticCallRector;
 use Rector\Php70\Rector\Ternary\TernaryToNullCoalescingRector;
 use Rector\Php71\Rector\FuncCall\CountOnNullRector;
-use Rector\Php71\Rector\List_\ListToArrayDestructRector;
 use Rector\Php71\Rector\TryCatch\MultiExceptionCatchRector;
 use Rector\Php72\Rector\FuncCall\GetClassOnNullRector;
 use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector;
@@ -28,7 +26,6 @@
 use Rector\Php80\Rector\Catch_\RemoveUnusedVariableInCatchRector;
 use Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector;
 use Rector\Php80\Rector\Class_\StringableForToStringRector;
-use Rector\Php80\Rector\FuncCall\ClassOnObjectRector;
 use Rector\Php80\Rector\FunctionLike\MixedTypeRector;
 use Rector\Php80\Rector\FunctionLike\UnionTypesRector;
 use Rector\Php80\Rector\Switch_\ChangeSwitchToMatchRector;
@@ -74,11 +71,8 @@
         TernaryToNullCoalescingRector::class => '*',
         RemoveUnusedVariableInCatchRector::class => '*',
         StringableForToStringRector::class => '*',
-//        LongArrayToShortArrayRector::class => '*',
-//        ListToArrayDestructRector::class => '*',
         StringClassNameToClassConstantRector::class => '*',
         IfToSpaceshipRector::class => '*',
-        ClassOnObjectRector::class => '*',
         FirstClassCallableRector::class => '*',
         ExceptionHandlerTypehintRector::class => '*',
         ThisCallOnStaticMethodToStaticCallRector::class => '*',
diff --git a/src/Adapter/AbstractObjectModelValidator.php b/src/Adapter/AbstractObjectModelValidator.php
index 4292b2190ef01..3ab932428601b 100644
--- a/src/Adapter/AbstractObjectModelValidator.php
+++ b/src/Adapter/AbstractObjectModelValidator.php
@@ -52,7 +52,7 @@ protected function validateObjectModelProperty(ObjectModel $objectModel, string
                 throw new $exceptionClass(
                     sprintf(
                         'Invalid %s %s. Got "%s"',
-                        get_class($objectModel),
+                        $objectModel::class,
                         $propertyName,
                         $objectModel->{$propertyName}
                     ),
@@ -61,7 +61,7 @@ protected function validateObjectModelProperty(ObjectModel $objectModel, string
             }
         } catch (PrestaShopException $e) {
             throw new CoreException(
-                sprintf('Error occurred when validating %s property "%s"', get_class($objectModel), $propertyName),
+                sprintf('Error occurred when validating %s property "%s"', $objectModel::class, $propertyName),
                 0,
                 $e
             );
@@ -86,7 +86,7 @@ protected function validateObjectModelLocalizedProperty(ObjectModel $objectModel
                     throw new $exceptionClass(
                         sprintf(
                             'Invalid %s localized property "%s" for language with id "%d"',
-                            get_class($objectModel),
+                            $objectModel::class,
                             $propertyName,
                             $langId
                         ),
@@ -96,7 +96,7 @@ protected function validateObjectModelLocalizedProperty(ObjectModel $objectModel
             }
         } catch (PrestaShopException $e) {
             throw new CoreException(
-                sprintf('Error occurred when trying to validate %s localized property "%s"', get_class($objectModel), $propertyName),
+                sprintf('Error occurred when trying to validate %s localized property "%s"', $objectModel::class, $propertyName),
                 0,
                 $e
             );
diff --git a/src/Adapter/Admin/PagePreference.php b/src/Adapter/Admin/PagePreference.php
index 7610b8008db61..16c770058b243 100644
--- a/src/Adapter/Admin/PagePreference.php
+++ b/src/Adapter/Admin/PagePreference.php
@@ -59,7 +59,7 @@ public function __construct(SessionInterface $session, bool $isDebug = _PS_MODE_
         if ($session->isStarted()) {
             $this->session = $session;
         } else {
-            $sessionClass = get_class($session);
+            $sessionClass = $session::class;
             $this->session = new $sessionClass(new PhpBridgeSessionStorage());
         }
         $this->isDebug = $isDebug;
diff --git a/src/Adapter/Hook/HookDispatcher.php b/src/Adapter/Hook/HookDispatcher.php
index 512f633e772b9..87285cc56fa0a 100644
--- a/src/Adapter/Hook/HookDispatcher.php
+++ b/src/Adapter/Hook/HookDispatcher.php
@@ -102,7 +102,7 @@ public function __construct(
     public function dispatch(object $event, string $eventName = null): object
     {
         if (!$event instanceof HookEvent) {
-            throw new \Exception('HookDispatcher must dispatch a HookEvent subclass only. ' . get_class($event) . ' given.');
+            throw new \Exception('HookDispatcher must dispatch a HookEvent subclass only. ' . $event::class . ' given.');
         }
 
         if ($listeners = $this->getListeners(strtolower($eventName ?? ''))) {
diff --git a/src/Adapter/Image/ImageRetriever.php b/src/Adapter/Image/ImageRetriever.php
index 696c116e7e107..fe17321e6ec1a 100644
--- a/src/Adapter/Image/ImageRetriever.php
+++ b/src/Adapter/Image/ImageRetriever.php
@@ -150,7 +150,7 @@ public function getImage($object, $id_image)
         }
 
         // Resolve functions we will use to get image links from Link class
-        if (get_class($object) === 'Product') {
+        if ($object::class === 'Product') {
             $type = 'products';
             $getImageURL = 'getImageLink';
             // Product images are the only exception in path structure, they are placed in folder
@@ -159,15 +159,15 @@ public function getImage($object, $id_image)
                 rtrim(_PS_PRODUCT_IMG_DIR_, DIRECTORY_SEPARATOR),
                 rtrim(Image::getImgFolderStatic($id_image), DIRECTORY_SEPARATOR),
             ]);
-        } elseif (get_class($object) === 'Store') {
+        } elseif ($object::class === 'Store') {
             $type = 'stores';
             $getImageURL = 'getStoreImageLink';
             $imageFolderPath = rtrim(_PS_STORE_IMG_DIR_, DIRECTORY_SEPARATOR);
-        } elseif (get_class($object) === 'Manufacturer') {
+        } elseif ($object::class === 'Manufacturer') {
             $type = 'manufacturers';
             $getImageURL = 'getManufacturerImageLink';
             $imageFolderPath = rtrim(_PS_MANU_IMG_DIR_, DIRECTORY_SEPARATOR);
-        } elseif (get_class($object) === 'Supplier') {
+        } elseif ($object::class === 'Supplier') {
             $type = 'suppliers';
             $getImageURL = 'getSupplierImageLink';
             $imageFolderPath = rtrim(_PS_SUPP_IMG_DIR_, DIRECTORY_SEPARATOR);
@@ -217,7 +217,7 @@ public function getImage($object, $id_image)
 
                 // Get the URL of the thumb and add it to sources
                 // Manufacturer and supplier use only IDs
-                if (get_class($object) === 'Manufacturer' || get_class($object) === 'Supplier') {
+                if ($object::class === 'Manufacturer' || $object::class === 'Supplier') {
                     $sources[$imageFormat] = $this->link->$getImageURL($id_image, $image_type['name'], $imageFormat);
                 // Products, categories and stores pass both rewrite and ID
                 } else {
diff --git a/src/Adapter/MailTemplate/MailTemplateTwigRenderer.php b/src/Adapter/MailTemplate/MailTemplateTwigRenderer.php
index 589f8157cee22..a04b8f1adf50f 100644
--- a/src/Adapter/MailTemplate/MailTemplateTwigRenderer.php
+++ b/src/Adapter/MailTemplate/MailTemplateTwigRenderer.php
@@ -171,7 +171,7 @@ private function getMailLayoutTransformations(LayoutInterface $mailLayout, $temp
         $templateTransformations = new TransformationCollection();
         /** @var TransformationInterface $transformation */
         foreach ($this->transformations as $transformation) {
-            if (get_class($transformation) == 'PrestaShop\PrestaShop\Core\MailTemplate\Transformation\CSSInlineTransformation' && $themeName == 'modern') {
+            if ($transformation::class == 'PrestaShop\PrestaShop\Core\MailTemplate\Transformation\CSSInlineTransformation' && $themeName == 'modern') {
                 continue;
             }
             if ($templateType !== $transformation->getType()) {
diff --git a/src/Adapter/PDF/DeliverySlipPdfGenerator.php b/src/Adapter/PDF/DeliverySlipPdfGenerator.php
index 179e87c35f908..89a1e6ad18b78 100644
--- a/src/Adapter/PDF/DeliverySlipPdfGenerator.php
+++ b/src/Adapter/PDF/DeliverySlipPdfGenerator.php
@@ -61,7 +61,7 @@ public function __construct(TranslatorInterface $translator)
     public function generatePDF(array $orderId)
     {
         if (count($orderId) !== 1) {
-            throw new CoreException(sprintf('"%s" supports generating delivery slip for single order only.', get_class($this)));
+            throw new CoreException(sprintf('"%s" supports generating delivery slip for single order only.', self::class));
         }
 
         $orderId = reset($orderId);
diff --git a/src/Adapter/PDF/InvoicePdfGenerator.php b/src/Adapter/PDF/InvoicePdfGenerator.php
index d90d16603efcc..5757e04814ce2 100644
--- a/src/Adapter/PDF/InvoicePdfGenerator.php
+++ b/src/Adapter/PDF/InvoicePdfGenerator.php
@@ -48,7 +48,7 @@ final class InvoicePdfGenerator implements PDFGeneratorInterface
     public function generatePDF(array $invoiceId): void
     {
         if (count($invoiceId) !== 1) {
-            throw new CoreException(sprintf('"%s" supports generating PDF for single invoice only.', get_class($this)));
+            throw new CoreException(sprintf('"%s" supports generating PDF for single invoice only.', self::class));
         }
 
         $invoiceId = reset($invoiceId);
diff --git a/src/Adapter/PDF/OrderInvoicePdfGenerator.php b/src/Adapter/PDF/OrderInvoicePdfGenerator.php
index be353338b8df6..5a8169c2c7bcd 100644
--- a/src/Adapter/PDF/OrderInvoicePdfGenerator.php
+++ b/src/Adapter/PDF/OrderInvoicePdfGenerator.php
@@ -60,7 +60,7 @@ public function __construct(TranslatorInterface $translator)
     public function generatePDF(array $orderId)
     {
         if (count($orderId) !== 1) {
-            throw new CoreException(sprintf('"%s" supports generating invoice for single order only.', get_class($this)));
+            throw new CoreException(sprintf('"%s" supports generating invoice for single order only.', self::class));
         }
 
         $orderId = reset($orderId);
diff --git a/src/Adapter/Presenter/AbstractLazyArray.php b/src/Adapter/Presenter/AbstractLazyArray.php
index 96d4cbf402db4..882eda2ede36c 100644
--- a/src/Adapter/Presenter/AbstractLazyArray.php
+++ b/src/Adapter/Presenter/AbstractLazyArray.php
@@ -89,7 +89,7 @@ abstract class AbstractLazyArray implements Iterator, ArrayAccess, Countable, Js
     public function __construct()
     {
         $this->arrayAccessList = new ArrayObject();
-        $reflectionClass = new ReflectionClass(get_class($this));
+        $reflectionClass = new ReflectionClass(static::class);
         $methods = $reflectionClass->getMethods(ReflectionMethod::IS_PUBLIC);
         foreach ($methods as $method) {
             $methodDoc = $method->getDocComment();
@@ -394,7 +394,7 @@ public function offsetSet($offset, $value, $force = false): void
         if (!$force && $this->arrayAccessList->offsetExists($offset)) {
             $result = $this->arrayAccessList->offsetGet($offset);
             if ($result['type'] !== 'variable') {
-                throw new RuntimeException('Trying to set the index ' . print_r($offset, true) . ' of the LazyArray ' . get_class($this) . ' already defined by a method is not allowed');
+                throw new RuntimeException('Trying to set the index ' . print_r($offset, true) . ' of the LazyArray ' . static::class . ' already defined by a method is not allowed');
             }
         }
         $this->arrayAccessList->offsetSet($offset, [
@@ -415,7 +415,7 @@ public function offsetUnset($offset, $force = false): void
         if ($force || $result['type'] === 'variable') {
             $this->arrayAccessList->offsetUnset($offset);
         } else {
-            throw new RuntimeException('Trying to unset the index ' . print_r($offset, true) . ' of the LazyArray ' . get_class($this) . ' already defined by a method is not allowed');
+            throw new RuntimeException('Trying to unset the index ' . print_r($offset, true) . ' of the LazyArray ' . static::class . ' already defined by a method is not allowed');
         }
     }
 
diff --git a/src/Adapter/Supplier/CommandHandler/BulkDeleteSupplierHandler.php b/src/Adapter/Supplier/CommandHandler/BulkDeleteSupplierHandler.php
index ff665f9d53a8b..dc670ff8fbb49 100644
--- a/src/Adapter/Supplier/CommandHandler/BulkDeleteSupplierHandler.php
+++ b/src/Adapter/Supplier/CommandHandler/BulkDeleteSupplierHandler.php
@@ -47,7 +47,7 @@ public function handle(BulkDeleteSupplierCommand $command)
             try {
                 $this->removeSupplier($supplierId);
             } catch (SupplierException $e) {
-                if (SupplierException::class === get_class($e)) {
+                if (SupplierException::class === $e::class) {
                     throw new CannotDeleteSupplierException(sprintf('Cannot delete Supplier object with id "%s".', $supplierId->getValue()), CannotDeleteSupplierException::FAILED_BULK_DELETE);
                 }
 
diff --git a/src/Adapter/Supplier/CommandHandler/DeleteSupplierHandler.php b/src/Adapter/Supplier/CommandHandler/DeleteSupplierHandler.php
index 91f7d9f511769..9720236f90b76 100644
--- a/src/Adapter/Supplier/CommandHandler/DeleteSupplierHandler.php
+++ b/src/Adapter/Supplier/CommandHandler/DeleteSupplierHandler.php
@@ -47,7 +47,7 @@ public function handle(DeleteSupplierCommand $command)
         try {
             $this->removeSupplier($supplierId);
         } catch (SupplierException $e) {
-            if (SupplierException::class === get_class($e)) {
+            if (SupplierException::class === $e::class) {
                 throw new CannotDeleteSupplierException(sprintf('Cannot delete Supplier object with id "%s".', $supplierId->getValue()), CannotDeleteSupplierException::FAILED_DELETE);
             }
 
diff --git a/src/Core/Addon/Theme/ThemeManager.php b/src/Core/Addon/Theme/ThemeManager.php
index fde5deea62a78..50cf5a1f75bdf 100644
--- a/src/Core/Addon/Theme/ThemeManager.php
+++ b/src/Core/Addon/Theme/ThemeManager.php
@@ -459,7 +459,7 @@ private function doApplyImageTypes(array $types): self
     private function installFromZip($source)
     {
         /** @var Finder $finderClass */
-        $finderClass = get_class($this->finder);
+        $finderClass = $this->finder::class;
         $this->finder = $finderClass::create();
 
         $sandboxPath = $this->getSandboxPath();
diff --git a/src/Core/CommandBus/ExecutedCommandRegistry.php b/src/Core/CommandBus/ExecutedCommandRegistry.php
index 7e86d1a843967..02b4ff90b3450 100644
--- a/src/Core/CommandBus/ExecutedCommandRegistry.php
+++ b/src/Core/CommandBus/ExecutedCommandRegistry.php
@@ -64,8 +64,8 @@ public function __construct(CommandTypeParser $commandTypeParser)
      */
     public function register($command, $handler): void
     {
-        $commandClass = get_class($command);
-        $handlerClass = get_class($handler);
+        $commandClass = $command::class;
+        $handlerClass = $handler::class;
 
         $type = $this->commandTypeParser->parse($commandClass);
 
diff --git a/src/Core/Data/AbstractTypedCollection.php b/src/Core/Data/AbstractTypedCollection.php
index 5e24e7791a1ec..8897ddf4b3ac5 100644
--- a/src/Core/Data/AbstractTypedCollection.php
+++ b/src/Core/Data/AbstractTypedCollection.php
@@ -161,7 +161,7 @@ private function checkElementType($element)
     {
         $expectedType = $this->getType();
         if (!($element instanceof $expectedType)) {
-            throw new TypeException(sprintf('Invalid element type %s, expected %s', is_object($element) ? get_class($element) : gettype($element), $expectedType));
+            throw new TypeException(sprintf('Invalid element type %s, expected %s', is_object($element) ? $element::class : gettype($element), $expectedType));
         }
     }
 }
diff --git a/src/Core/Data/Layer/AbstractDataLayer.php b/src/Core/Data/Layer/AbstractDataLayer.php
index 420f969448696..dbc8165f69fa6 100644
--- a/src/Core/Data/Layer/AbstractDataLayer.php
+++ b/src/Core/Data/Layer/AbstractDataLayer.php
@@ -194,7 +194,7 @@ protected function saveReadPropagationResult($id, $data)
             try {
                 $this->doWrite($id, $data);
             } catch (Exception $e) {
-                throw new DataLayerException('Unable to write into "' . $id . '"" (data layer : "' . get_class($this) . '")', 0, $e);
+                throw new DataLayerException('Unable to write into "' . $id . '"" (data layer : "' . static::class . '")', 0, $e);
             }
         }
     }
@@ -224,7 +224,7 @@ protected function saveWritePropagationResult($id, $data)
             try {
                 $this->doWrite($id, $data);
             } catch (Exception $e) {
-                throw new DataLayerException('Unable to write into "' . $id . '" (data layer "' . get_class($this) . '")', 0, $e);
+                throw new DataLayerException('Unable to write into "' . $id . '" (data layer "' . static::class . '")', 0, $e);
             }
 
             // If update needed after write
diff --git a/src/Core/Form/IdentifiableObject/CommandBuilder/CommandBuilder.php b/src/Core/Form/IdentifiableObject/CommandBuilder/CommandBuilder.php
index 8f1fcebd5f4ee..e7142453cc752 100644
--- a/src/Core/Form/IdentifiableObject/CommandBuilder/CommandBuilder.php
+++ b/src/Core/Form/IdentifiableObject/CommandBuilder/CommandBuilder.php
@@ -195,7 +195,7 @@ private function updateCommand(object $command, CommandField $commandField, arra
 
         if (!method_exists($command, $setterMethod)) {
             throw new InvalidArgumentException(
-                sprintf('Setter method "%s" not found in command "%s"', $setterMethod, get_class($command))
+                sprintf('Setter method "%s" not found in command "%s"', $setterMethod, $command::class)
             );
         }
         $command->$setterMethod(...$setterArguments);
diff --git a/src/Core/Form/IdentifiableObject/CommandBuilder/CommandField.php b/src/Core/Form/IdentifiableObject/CommandBuilder/CommandField.php
index 99a39d4f623d0..461b4821d7e88 100644
--- a/src/Core/Form/IdentifiableObject/CommandBuilder/CommandField.php
+++ b/src/Core/Form/IdentifiableObject/CommandBuilder/CommandField.php
@@ -58,7 +58,7 @@ protected function __construct(string $commandSetter, array $dataFields, bool $i
             if (!$dataField instanceof DataField) {
                 throw new InvalidArgumentException(sprintf(
                     'Invalid data field type "%s", expected "%s"',
-                    is_object($dataField) ? get_class($dataField) : gettype($dataField),
+                    is_object($dataField) ? $dataField::class : gettype($dataField),
                     DataField::class
                 ));
             }
diff --git a/src/Core/Grid/Column/AbstractColumn.php b/src/Core/Grid/Column/AbstractColumn.php
index c98a711025528..38770c66ec4ad 100644
--- a/src/Core/Grid/Column/AbstractColumn.php
+++ b/src/Core/Grid/Column/AbstractColumn.php
@@ -115,7 +115,7 @@ public function getOption(string $name)
             return $this->options[$name];
         }
 
-        throw new NoSuchOptionException(sprintf('Option "%s" does not exist in "%s"', $name, get_class($this)));
+        throw new NoSuchOptionException(sprintf('Option "%s" does not exist in "%s"', $name, static::class));
     }
 
     /**
diff --git a/src/Core/Grid/Filter/CategoryFilterFormFactory.php b/src/Core/Grid/Filter/CategoryFilterFormFactory.php
index 5d540cbec60ad..86a8119b3e2d9 100644
--- a/src/Core/Grid/Filter/CategoryFilterFormFactory.php
+++ b/src/Core/Grid/Filter/CategoryFilterFormFactory.php
@@ -83,7 +83,7 @@ public function create(GridDefinitionInterface $definition)
         foreach ($categoryFilterForm as $categoryFormItem) {
             $newCategoryFormBuilder->add(
                 $categoryFormItem->getName(),
-                get_class($categoryFormItem->getConfig()->getType()->getInnerType()),
+                $categoryFormItem->getConfig()->getType()->getInnerType()::class,
                 $categoryFormItem->getConfig()->getOptions()
             );
         }
diff --git a/src/Core/Grid/Filter/CmsPageFilterFormFactory.php b/src/Core/Grid/Filter/CmsPageFilterFormFactory.php
index 4a5f98bd077a8..7d2ba72b52f7f 100644
--- a/src/Core/Grid/Filter/CmsPageFilterFormFactory.php
+++ b/src/Core/Grid/Filter/CmsPageFilterFormFactory.php
@@ -83,7 +83,7 @@ public function create(GridDefinitionInterface $definition)
         foreach ($cmsPageCategoryFilterForm as $categoryFormItem) {
             $newCmsPageCategoryFormBuilder->add(
                 $categoryFormItem->getName(),
-                get_class($categoryFormItem->getConfig()->getType()->getInnerType()),
+                $categoryFormItem->getConfig()->getType()->getInnerType()::class,
                 $categoryFormItem->getConfig()->getOptions()
             );
         }
diff --git a/src/Core/Grid/Filter/FilterFormFactoryFormActionDecorator.php b/src/Core/Grid/Filter/FilterFormFactoryFormActionDecorator.php
index 1f3dd3ffa9f8e..f380b49075fd9 100644
--- a/src/Core/Grid/Filter/FilterFormFactoryFormActionDecorator.php
+++ b/src/Core/Grid/Filter/FilterFormFactoryFormActionDecorator.php
@@ -82,7 +82,7 @@ public function create(GridDefinitionInterface $definition)
         foreach ($filterForm as $formItem) {
             $formBuilder->add(
                 $formItem->getName(),
-                get_class($formItem->getConfig()->getType()->getInnerType()),
+                $formItem->getConfig()->getType()->getInnerType()::class,
                 $formItem->getConfig()->getOptions()
             );
         }
diff --git a/src/Core/Grid/Query/ProductCombinationQueryBuilder.php b/src/Core/Grid/Query/ProductCombinationQueryBuilder.php
index 945b7a675bac3..23a340a1ac3bd 100644
--- a/src/Core/Grid/Query/ProductCombinationQueryBuilder.php
+++ b/src/Core/Grid/Query/ProductCombinationQueryBuilder.php
@@ -67,7 +67,7 @@ public function getSearchQueryBuilder(SearchCriteriaInterface $searchCriteria)
             throw new InvalidArgumentException(
                 sprintf(
                     'Expected %s, but got %s',
-                    ProductCombinationFilters::class, get_class($searchCriteria)
+                    ProductCombinationFilters::class, $searchCriteria::class
                 )
             );
         }
@@ -99,7 +99,7 @@ public function getCountQueryBuilder(SearchCriteriaInterface $searchCriteria)
             throw new InvalidArgumentException(
                 sprintf(
                     'Expected %s, but got %s',
-                    ProductCombinationFilters::class, get_class($searchCriteria)
+                    ProductCombinationFilters::class, $searchCriteria::class
                 )
             );
         }
diff --git a/src/Core/Repository/AbstractMultiShopObjectModelRepository.php b/src/Core/Repository/AbstractMultiShopObjectModelRepository.php
index 5db2a141a6cce..78b8834310e00 100644
--- a/src/Core/Repository/AbstractMultiShopObjectModelRepository.php
+++ b/src/Core/Repository/AbstractMultiShopObjectModelRepository.php
@@ -227,7 +227,7 @@ protected function deleteObjectModelFromShops(ObjectModel $objectModel, array $s
 
             if (!$objectModel->delete()) {
                 throw new $exceptionClass(
-                    sprintf('Failed to delete %s #%d', get_class($objectModel), $objectModel->id),
+                    sprintf('Failed to delete %s #%d', $objectModel::class, $objectModel->id),
                     $errorCode
                 );
             }
@@ -235,7 +235,7 @@ protected function deleteObjectModelFromShops(ObjectModel $objectModel, array $s
             throw new CoreException(
                 sprintf(
                     'Error occurred when trying to delete %s #%d [%s]',
-                    get_class($objectModel),
+                    $objectModel::class,
                     $objectModel->id,
                     $e->getMessage()
                 ),
diff --git a/src/Core/Repository/AbstractObjectModelRepository.php b/src/Core/Repository/AbstractObjectModelRepository.php
index 19ba563d6c229..955d7494bab61 100644
--- a/src/Core/Repository/AbstractObjectModelRepository.php
+++ b/src/Core/Repository/AbstractObjectModelRepository.php
@@ -94,7 +94,7 @@ protected function addObjectModel(ObjectModel $objectModel, string $exceptionCla
         try {
             if (!$objectModel->add()) {
                 throw new $exceptionClass(
-                    sprintf('Failed to add %s', get_class($objectModel)),
+                    sprintf('Failed to add %s', $objectModel::class),
                     $errorCode
                 );
             }
@@ -104,7 +104,7 @@ protected function addObjectModel(ObjectModel $objectModel, string $exceptionCla
             throw new CoreException(
                 sprintf(
                     'Error occurred when trying to add %s [%s]',
-                    get_class($objectModel),
+                    $objectModel::class,
                     $e->getMessage()
                 ),
                 0,
@@ -129,7 +129,7 @@ protected function updateObjectModel(ObjectModel $objectModel, string $exception
         try {
             if (!$objectModel->update()) {
                 throw new $exceptionClass(
-                    sprintf('Failed to update %s #%d', get_class($objectModel), $objectModel->id),
+                    sprintf('Failed to update %s #%d', $objectModel::class, $objectModel->id),
                     $errorCode
                 );
             }
@@ -137,7 +137,7 @@ protected function updateObjectModel(ObjectModel $objectModel, string $exception
             throw new CoreException(
                 sprintf(
                     'Error occurred when trying to update %s #%d [%s]',
-                    get_class($objectModel),
+                    $objectModel::class,
                     $objectModel->id,
                     $e->getMessage()
                 ),
@@ -179,7 +179,7 @@ protected function deleteObjectModel(ObjectModel $objectModel, string $exception
         try {
             if (!$objectModel->delete()) {
                 throw new $exceptionClass(
-                    sprintf('Failed to delete %s #%d', get_class($objectModel), $objectModel->id),
+                    sprintf('Failed to delete %s #%d', $objectModel::class, $objectModel->id),
                     $errorCode
                 );
             }
@@ -187,7 +187,7 @@ protected function deleteObjectModel(ObjectModel $objectModel, string $exception
             throw new CoreException(
                 sprintf(
                     'Error occurred when trying to delete %s #%d [%s]',
-                    get_class($objectModel),
+                    $objectModel::class,
                     $objectModel->id,
                     $e->getMessage()
                 ),
@@ -209,7 +209,7 @@ protected function softDeleteObjectModel(ObjectModel $objectModel, string $excep
         try {
             if (!$objectModel->softDelete()) {
                 throw new $exceptionClass(
-                    sprintf('Failed to soft delete %s #%d', get_class($objectModel), $objectModel->id),
+                    sprintf('Failed to soft delete %s #%d', $objectModel::class, $objectModel->id),
                     $errorCode
                 );
             }
@@ -217,7 +217,7 @@ protected function softDeleteObjectModel(ObjectModel $objectModel, string $excep
             throw new CoreException(
                 sprintf(
                     'Error occurred when trying to soft delete %s #%d [%s]',
-                    get_class($objectModel),
+                    $objectModel::class,
                     $objectModel->id,
                     $e->getMessage()
                 ),
diff --git a/src/Core/Util/DateTime/NullDateTime.php b/src/Core/Util/DateTime/NullDateTime.php
index b6becedfd2eb8..dacc00e356384 100644
--- a/src/Core/Util/DateTime/NullDateTime.php
+++ b/src/Core/Util/DateTime/NullDateTime.php
@@ -67,7 +67,7 @@ public function format($format): string
         }
 
         throw new RuntimeException(
-            sprintf('Format "%s" is not supported by %s', $format, get_class($this))
+            sprintf('Format "%s" is not supported by %s', $format, static::class)
         );
     }
 
diff --git a/src/PrestaShopBundle/Bridge/AdminController/ControllerConfigurationFactory.php b/src/PrestaShopBundle/Bridge/AdminController/ControllerConfigurationFactory.php
index 80e93511354dd..3be1821353bb2 100644
--- a/src/PrestaShopBundle/Bridge/AdminController/ControllerConfigurationFactory.php
+++ b/src/PrestaShopBundle/Bridge/AdminController/ControllerConfigurationFactory.php
@@ -81,7 +81,7 @@ public function create(
                 sprintf(
                     'Unexpected user type. Expected "%s", got "%s',
                     Employee::class,
-                    get_class($employee))
+                    $employee::class)
             );
         }
 
diff --git a/src/PrestaShopBundle/Bridge/AdminController/Listener/InitFrameworkBridgeControllerListener.php b/src/PrestaShopBundle/Bridge/AdminController/Listener/InitFrameworkBridgeControllerListener.php
index 559029b13c4b9..bd5c0211c320f 100644
--- a/src/PrestaShopBundle/Bridge/AdminController/Listener/InitFrameworkBridgeControllerListener.php
+++ b/src/PrestaShopBundle/Bridge/AdminController/Listener/InitFrameworkBridgeControllerListener.php
@@ -88,7 +88,7 @@ public function onKernelController(ControllerEvent $event): void
         /** @var FrameworkBridgeControllerInterface $controller */
         $controller = $event->getController()[0];
 
-        if (!is_string(get_class($controller))) {
+        if (!is_string($controller::class)) {
             return;
         }
 
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ShopController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ShopController.php
index b570153dbe26d..342e41f3ccbd3 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ShopController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ShopController.php
@@ -70,7 +70,7 @@ public function searchAction(string $searchTerm): JsonResponse
     private function getErrorMessage(Exception $e): string
     {
         return $this->getFallbackErrorMessage(
-            get_class($e),
+            $e::class,
             $e->getCode(),
             $e->getMessage()
         );
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/SqlManagerController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/SqlManagerController.php
index 38584c938d816..d6b47fe04dd6e 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/SqlManagerController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/SqlManagerController.php
@@ -483,7 +483,7 @@ protected function getSqlRequestDataFromRequest(Request $request)
     protected function handleException(SqlRequestException $e)
     {
         $code = $e->getCode();
-        $type = get_class($e);
+        $type = $e::class;
 
         $exceptionMessages = [
             SqlRequestNotFoundException::class => $this->trans('The object cannot be loaded (or found).', 'Admin.Notifications.Error'),
@@ -518,7 +518,7 @@ protected function handleException(SqlRequestException $e)
      */
     protected function handleViewException(SqlRequestException $e)
     {
-        $type = get_class($e);
+        $type = $e::class;
 
         $exceptionMessages = [
             SqlRequestNotFoundException::class => $this->trans('The object cannot be loaded (or found).', 'Admin.Notifications.Error'),
@@ -538,7 +538,7 @@ protected function handleViewException(SqlRequestException $e)
      */
     protected function handleExportException(Exception $e)
     {
-        $type = get_class($e);
+        $type = $e::class;
 
         if ($e instanceof FileWritingException) {
             return $this->handleApplicationExportException($e);
@@ -568,7 +568,7 @@ protected function handleApplicationExportException(FileWritingException $e)
             return $applicationErrors[$code];
         }
 
-        return $this->getFallbackErrorMessage(get_class($e), $code);
+        return $this->getFallbackErrorMessage($e::class, $code);
     }
 
     /**
@@ -578,7 +578,7 @@ protected function handleApplicationExportException(FileWritingException $e)
      */
     protected function handleDomainExportException(SqlRequestException $e)
     {
-        $type = get_class($e);
+        $type = $e::class;
 
         $domainErrors = [
             SqlRequestNotFoundException::class => $this->trans('The object cannot be loaded (or found).', 'Admin.Notifications.Error'),
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/MetaController.php b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/MetaController.php
index 476f9f3f3e83a..f438525db0e36 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/MetaController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/MetaController.php
@@ -627,7 +627,7 @@ private function getExceptionByClassAndErrorCode(Exception $exception)
             ],
         ];
 
-        $exceptionClass = get_class($exception);
+        $exceptionClass = $exception::class;
         $exceptionCode = $exception->getCode();
         if (isset($exceptionDictionary[$exceptionClass][$exceptionCode])) {
             return $exceptionDictionary[$exceptionClass][$exceptionCode];
@@ -652,7 +652,7 @@ private function getExceptionByType(Exception $exception)
             ),
         ];
 
-        $exceptionClass = get_class($exception);
+        $exceptionClass = $exception::class;
         if (isset($exceptionDictionary[$exceptionClass])) {
             return $exceptionDictionary[$exceptionClass];
         }
diff --git a/src/PrestaShopBundle/Controller/Admin/FrameworkBundleAdminController.php b/src/PrestaShopBundle/Controller/Admin/FrameworkBundleAdminController.php
index f3dd109f7121b..963de54a8bef4 100644
--- a/src/PrestaShopBundle/Controller/Admin/FrameworkBundleAdminController.php
+++ b/src/PrestaShopBundle/Controller/Admin/FrameworkBundleAdminController.php
@@ -496,7 +496,7 @@ protected function getErrorMessageForException(Exception $e, array $messages)
             return $e->getMessage();
         }
 
-        $exceptionType = get_class($e);
+        $exceptionType = $e::class;
         $exceptionCode = $e->getCode();
 
         if (isset($messages[$exceptionType])) {
diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/Design/ThemeController.php b/src/PrestaShopBundle/Controller/Admin/Improve/Design/ThemeController.php
index c723074584580..07a4b597cbcc5 100644
--- a/src/PrestaShopBundle/Controller/Admin/Improve/Design/ThemeController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Improve/Design/ThemeController.php
@@ -531,7 +531,7 @@ private function handleEnableThemeException(ThemeException $e)
      */
     private function handleDeleteThemeException(ThemeException $e)
     {
-        $type = get_class($e);
+        $type = $e::class;
 
         $errorMessages = [
             CannotDeleteThemeException::class => $this->trans(
@@ -554,7 +554,7 @@ private function handleDeleteThemeException(ThemeException $e)
      */
     private function handleAdaptThemeToRTLLanguagesException(ThemeException $e)
     {
-        $type = get_class($e);
+        $type = $e::class;
 
         $errorMessages = [
             CannotAdaptThemeToRTLLanguagesException::class => $this->trans('Cannot adapt theme to RTL languages.', 'Admin.Design.Notification'),
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/CartRuleController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/CartRuleController.php
index 6cbbd90cdd323..baddbba939046 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/CartRuleController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/CartRuleController.php
@@ -111,7 +111,7 @@ public function searchAction(Request $request): JsonResponse
                 $cartRules = $this->getQueryBus()->handle(new SearchCartRules($searchPhrase));
             } catch (Exception $e) {
                 return $this->json(
-                    ['message' => $this->getFallbackErrorMessage(get_class($e), $e->getCode())],
+                    ['message' => $this->getFallbackErrorMessage($e::class, $e->getCode())],
                     Response::HTTP_INTERNAL_SERVER_ERROR
                 );
             }
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Order/CartController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Order/CartController.php
index 76177938a5474..ca288aa2ff9a0 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Order/CartController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Order/CartController.php
@@ -619,7 +619,7 @@ private function getErrorMessages(Exception $e)
      */
     private function getErrorCode(Exception $e): int
     {
-        switch (get_class($e)) {
+        switch ($e::class) {
             case ProductOutOfStockException::class:
                 return Response::HTTP_CONFLICT;
         }
diff --git a/src/PrestaShopBundle/EventListener/ActionDispatcherLegacyHooksSubscriber.php b/src/PrestaShopBundle/EventListener/ActionDispatcherLegacyHooksSubscriber.php
index 8a726720cd6a9..9f910caf78d73 100644
--- a/src/PrestaShopBundle/EventListener/ActionDispatcherLegacyHooksSubscriber.php
+++ b/src/PrestaShopBundle/EventListener/ActionDispatcherLegacyHooksSubscriber.php
@@ -93,7 +93,7 @@ public function callActionDispatcherBeforeHook(ControllerEvent $event)
         ]);
 
         $requestAttributes->set('controller_type', $controllerType);
-        $requestAttributes->set('controller_name', get_class($controller));
+        $requestAttributes->set('controller_name', $controller::class);
     }
 
     public function callActionDispatcherAfterHook(ResponseEvent $event)
diff --git a/src/PrestaShopBundle/EventListener/FilterCmsPageCategorySearchCriteriaListener.php b/src/PrestaShopBundle/EventListener/FilterCmsPageCategorySearchCriteriaListener.php
index afe1300bc61a9..abcd0cce276ca 100644
--- a/src/PrestaShopBundle/EventListener/FilterCmsPageCategorySearchCriteriaListener.php
+++ b/src/PrestaShopBundle/EventListener/FilterCmsPageCategorySearchCriteriaListener.php
@@ -64,7 +64,7 @@ public function onFilterSearchCriteria(FilterSearchCriteriaEvent $event)
             return;
         }
 
-        $searchCriteriaClass = get_class($event->getSearchCriteria());
+        $searchCriteriaClass = $event->getSearchCriteria()::class;
 
         $searchCriteria = $event->getSearchCriteria();
 
diff --git a/src/PrestaShopBundle/Form/Admin/Improve/Design/Theme/ShopLogosType.php b/src/PrestaShopBundle/Form/Admin/Improve/Design/Theme/ShopLogosType.php
index 431ff4a168c11..fdba689b69692 100644
--- a/src/PrestaShopBundle/Form/Admin/Improve/Design/Theme/ShopLogosType.php
+++ b/src/PrestaShopBundle/Form/Admin/Improve/Design/Theme/ShopLogosType.php
@@ -228,7 +228,7 @@ private function disableAllShopContextFields(FormBuilderInterface $builder, $suf
                 $formType = $formField->getConfig()->getType()->getInnerType();
                 $options = $formField->getConfig()->getOptions();
                 $options['attr']['disabled'] = true;
-                $form->add($originalFieldName, get_class($formType), $options);
+                $form->add($originalFieldName, $formType::class, $options);
             }
         });
     }
@@ -258,7 +258,7 @@ private function setShopRestrictionSource(FormBuilderInterface $builder, $suffix
                 $options = $formField->getConfig()->getOptions();
                 $options['attr']['data-shop-restriction-source'] = $fieldName;
 
-                $form->add($fieldName, get_class($formType), $options);
+                $form->add($fieldName, $formType::class, $options);
             }
         });
     }
diff --git a/src/PrestaShopBundle/Form/Validator/Constraints/TinyMceMaxLength.php b/src/PrestaShopBundle/Form/Validator/Constraints/TinyMceMaxLength.php
index af8c033e22140..44af4f7ef7a48 100644
--- a/src/PrestaShopBundle/Form/Validator/Constraints/TinyMceMaxLength.php
+++ b/src/PrestaShopBundle/Form/Validator/Constraints/TinyMceMaxLength.php
@@ -58,6 +58,6 @@ public function __construct($options = null)
 
     public function validatedBy(): string
     {
-        return get_class($this) . 'Validator';
+        return static::class . 'Validator';
     }
 }
diff --git a/src/PrestaShopBundle/Security/Admin/EmployeeProvider.php b/src/PrestaShopBundle/Security/Admin/EmployeeProvider.php
index 7b4450c1fc8e9..47773492dcb1b 100644
--- a/src/PrestaShopBundle/Security/Admin/EmployeeProvider.php
+++ b/src/PrestaShopBundle/Security/Admin/EmployeeProvider.php
@@ -109,7 +109,7 @@ public function loadUserByUsername($username)
     public function refreshUser(UserInterface $employee)
     {
         if (!$employee instanceof Employee) {
-            throw new UnsupportedUserException(sprintf('Instances of "%s" are not supported.', get_class($employee)));
+            throw new UnsupportedUserException(sprintf('Instances of "%s" are not supported.', $employee::class));
         }
 
         return $this->loadUserByUsername($employee->getUsername());
diff --git a/src/PrestaShopBundle/Service/Hook/HookFinder.php b/src/PrestaShopBundle/Service/Hook/HookFinder.php
index 5433f09302493..436f40757c801 100644
--- a/src/PrestaShopBundle/Service/Hook/HookFinder.php
+++ b/src/PrestaShopBundle/Service/Hook/HookFinder.php
@@ -81,8 +81,8 @@ public function find()
                 if (!count($this->expectedInstanceClasses)) {
                     continue;
                 }
-                if (is_object($content) && !in_array(get_class($content), $this->expectedInstanceClasses)) {
-                    throw new \Exception('The module ' . $moduleName . ' did not return expected class. Was ' . get_class($content) . ' instead of ' . implode(' or ', $this->expectedInstanceClasses) . '.');
+                if (is_object($content) && !in_array($content::class, $this->expectedInstanceClasses)) {
+                    throw new \Exception('The module ' . $moduleName . ' did not return expected class. Was ' . $content::class . ' instead of ' . implode(' or ', $this->expectedInstanceClasses) . '.');
                 } elseif (!is_object($content)) {
                     throw new \Exception('The module ' . $moduleName . ' did not return expected type. Was ' . gettype($content) . ' instead of ' . implode(' or ', $this->expectedInstanceClasses) . '.');
                 }

From dde33db1a2382cc79586d92c4a1805db093a282e Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Tue, 20 Jun 2023 14:16:43 +0200
Subject: [PATCH 0201/1030] Override service discovery

---
 .../Resources/config/services/bundle/event_listener.yml     | 6 ------
 .../Resources/config/services/bundle/form.yml               | 4 ++++
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/event_listener.yml b/src/PrestaShopBundle/Resources/config/services/bundle/event_listener.yml
index 95e10e7de9849..72b74f56d094d 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/event_listener.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/event_listener.yml
@@ -109,12 +109,6 @@ services:
     tags:
       - { name: kernel.event_subscriber }
 
-  PrestaShopBundle\Form\Admin\Configure\AdvancedParameters\FeatureFlag\EventListener\FeatureFlagTypeListener:
-    class: PrestaShopBundle\Form\Admin\Configure\AdvancedParameters\FeatureFlag\EventListener\FeatureFlagTypeListener
-    autowire: true
-    tags:
-      - { name: core.legacy.hook.subscriber }
-
   PrestaShopBundle\EventListener\ShopConstraintListener:
     public: false
     arguments:
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form.yml
index 3ff7d437a2e8a..e55d8e70bf6f5 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/form.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/form.yml
@@ -42,3 +42,7 @@ services:
   PrestaShopBundle\Form\Admin\Type\CustomMoneyType:
     alias: 'PrestaShopBundle\Form\Extension\CustomMoneyTypeExtension'
     deprecated: ~
+
+  PrestaShopBundle\Form\Admin\Configure\AdvancedParameters\FeatureFlag\EventListener\FeatureFlagTypeListener:
+    tags:
+      - { name: core.legacy.hook.subscriber }

From 0c8a61d4e5f4a246295b01c7c18892e01eed938d Mon Sep 17 00:00:00 2001
From: tleon <thomas.leone@prestashop.com>
Date: Thu, 25 May 2023 15:51:21 +0200
Subject: [PATCH 0202/1030] feat(api-platform): add assets installation

---
 .gitignore                                    |  3 +++
 app/config/security_dev.yml                   |  2 +-
 .../ApiPlatform/Resources/Hook.php            | 20 +++++++++++++++++++
 tools/assets/build.sh                         |  7 +++++++
 4 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index beb018ee125af..838a421f79e21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -122,6 +122,9 @@ tests-legacy/.phpunit.result.cache
 !/admin-dev/themes/new-theme/public/theme.rtlfix
 !/admin-dev/themes/default/public/theme.rtlfix
 
+# Api plateform assets
+/admin-dev/bundles
+
 themes/*/cache/*
 themes/core.js.map
 themes/core.js
diff --git a/app/config/security_dev.yml b/app/config/security_dev.yml
index 2ec19650314d2..69e2e5ce8f735 100644
--- a/app/config/security_dev.yml
+++ b/app/config/security_dev.yml
@@ -24,7 +24,7 @@ security:
       security: false
 
     api:
-      pattern: '^%api_base_path%'
+      pattern: '^(%api_base_path%)(?!/docs)'
       stateless: true
       provider: 'oauth2'
       guard:
diff --git a/src/PrestaShopBundle/ApiPlatform/Resources/Hook.php b/src/PrestaShopBundle/ApiPlatform/Resources/Hook.php
index ee394bb3bbda7..55f833354ba63 100644
--- a/src/PrestaShopBundle/ApiPlatform/Resources/Hook.php
+++ b/src/PrestaShopBundle/ApiPlatform/Resources/Hook.php
@@ -43,6 +43,26 @@
         new Get(
             uriTemplate: '/hook-status/{hookId}',
             requirements: ['id' => '\d+'],
+            openapiContext: [
+                'summary' => 'Get hook status A',
+                'description' => 'Get hook status B',
+                'parameters' => [
+                    [
+                        'name' => 'hookId',
+                        'in' => 'path',
+                        'required' => true,
+                        'schema' => [
+                            'type' => 'string',
+                        ],
+                        'description' => 'this is a description of the parameter'
+                    ],
+                    [
+                        'name' => 'Authorization',
+                        'in' => 'scopes',
+                        'description' => "read:hook-status <br> write:hook-status "
+                    ],
+                ],
+            ],
             exceptionToStatus: [HookNotFoundException::class => 404],
             provider: QueryProvider::class,
             extraProperties: ['query' => GetHookStatus::class]
diff --git a/tools/assets/build.sh b/tools/assets/build.sh
index 74ea12c04d758..1ca894f750e1a 100755
--- a/tools/assets/build.sh
+++ b/tools/assets/build.sh
@@ -28,6 +28,13 @@ function build {
   npm ci
   npm run build
   popd
+
+  if [[ ! -d "$ADMIN_DIR/bundles" ]]; then
+    echo ">>> install api-platform assets..."
+    bin/console asset:install "admin-dev"
+  else
+    echo ">>> api-platform assets already installed"
+  fi
 }
 
 build_asset() {

From d382ca7952fce0e14cb8fac48d9dfa14bd8304b5 Mon Sep 17 00:00:00 2001
From: tleon <thomas.leone@prestashop.com>
Date: Fri, 9 Jun 2023 11:06:14 +0200
Subject: [PATCH 0203/1030] fix(ci): test & cs

---
 .gitignore                                          | 2 +-
 src/PrestaShopBundle/ApiPlatform/Resources/Hook.php | 4 ++--
 tools/assets/build.sh                               | 7 -------
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 838a421f79e21..040bf14cc02dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -122,7 +122,7 @@ tests-legacy/.phpunit.result.cache
 !/admin-dev/themes/new-theme/public/theme.rtlfix
 !/admin-dev/themes/default/public/theme.rtlfix
 
-# Api plateform assets
+# Api platform assets
 /admin-dev/bundles
 
 themes/*/cache/*
diff --git a/src/PrestaShopBundle/ApiPlatform/Resources/Hook.php b/src/PrestaShopBundle/ApiPlatform/Resources/Hook.php
index 55f833354ba63..ba8f36f110a23 100644
--- a/src/PrestaShopBundle/ApiPlatform/Resources/Hook.php
+++ b/src/PrestaShopBundle/ApiPlatform/Resources/Hook.php
@@ -54,12 +54,12 @@
                         'schema' => [
                             'type' => 'string',
                         ],
-                        'description' => 'this is a description of the parameter'
+                        'description' => 'Id of the hook you are requesting the status from',
                     ],
                     [
                         'name' => 'Authorization',
                         'in' => 'scopes',
-                        'description' => "read:hook-status <br> write:hook-status "
+                        'description' => 'read:hook-status <br> write:hook-status ',
                     ],
                 ],
             ],
diff --git a/tools/assets/build.sh b/tools/assets/build.sh
index 1ca894f750e1a..74ea12c04d758 100755
--- a/tools/assets/build.sh
+++ b/tools/assets/build.sh
@@ -28,13 +28,6 @@ function build {
   npm ci
   npm run build
   popd
-
-  if [[ ! -d "$ADMIN_DIR/bundles" ]]; then
-    echo ">>> install api-platform assets..."
-    bin/console asset:install "admin-dev"
-  else
-    echo ">>> api-platform assets already installed"
-  fi
 }
 
 build_asset() {

From f097ecc8f1c1951deb80ac7d8b5f6bd72a53e50f Mon Sep 17 00:00:00 2001
From: lartist <salim-benouamer.ext@prestashop.com>
Date: Tue, 20 Jun 2023 17:44:01 +0200
Subject: [PATCH 0204/1030] Removing guzzle librairy

---
 composer.json |   1 -
 composer.lock | 109 ++++++++++++++++++++++++--------------------------
 2 files changed, 53 insertions(+), 57 deletions(-)

diff --git a/composer.json b/composer.json
index 492e85e75d474..258d9e41ccfc2 100644
--- a/composer.json
+++ b/composer.json
@@ -41,7 +41,6 @@
         "friendsofsymfony/jsrouting-bundle": "^3.2.1",
         "geoip2/geoip2": "~2.4.2",
         "greenlion/php-sql-parser": "^4.3",
-        "guzzlehttp/guzzle": "^7.5",
         "incenteev/composer-parameter-handler": "~2.0",
         "ircmaxell/password-compat": "^1.0.4",
         "ircmaxell/random-lib": "^1.2.0",
diff --git a/composer.lock b/composer.lock
index a8716714d78b7..1df3fdd044867 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "092ab401125dbb2e25c5dd7096e598a6",
+    "content-hash": "c5cb176c44556351608b37f0799f06a8",
     "packages": [
         {
             "name": "api-platform/core",
@@ -2249,22 +2249,22 @@
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "7.5.0",
+            "version": "7.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba"
+                "reference": "fb7566caccf22d74d1ab270de3551f72a58399f5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b50a2a1251152e43f6a37f0fa053e730a67d25ba",
-                "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/fb7566caccf22d74d1ab270de3551f72a58399f5",
+                "reference": "fb7566caccf22d74d1ab270de3551f72a58399f5",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "guzzlehttp/promises": "^1.5",
-                "guzzlehttp/psr7": "^1.9 || ^2.4",
+                "guzzlehttp/promises": "^1.5.3 || ^2.0",
+                "guzzlehttp/psr7": "^1.9.1 || ^2.4.5",
                 "php": "^7.2.5 || ^8.0",
                 "psr/http-client": "^1.0",
                 "symfony/deprecation-contracts": "^2.2 || ^3.0"
@@ -2275,7 +2275,8 @@
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.1",
                 "ext-curl": "*",
-                "php-http/client-integration-tests": "^3.0",
+                "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999",
+                "php-http/message-factory": "^1.1",
                 "phpunit/phpunit": "^8.5.29 || ^9.5.23",
                 "psr/log": "^1.1 || ^2.0 || ^3.0"
             },
@@ -2289,9 +2290,6 @@
                 "bamarni-bin": {
                     "bin-links": true,
                     "forward-command": false
-                },
-                "branch-alias": {
-                    "dev-master": "7.5-dev"
                 }
             },
             "autoload": {
@@ -2357,7 +2355,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/7.5.0"
+                "source": "https://github.com/guzzle/guzzle/tree/7.7.0"
             },
             "funding": [
                 {
@@ -2373,38 +2371,37 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-08-28T15:39:27+00:00"
+            "time": "2023-05-21T14:04:53+00:00"
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "1.5.2",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "b94b2807d85443f9719887892882d0329d1e2598"
+                "reference": "3a494dc7dc1d7d12e511890177ae2d0e6c107da6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598",
-                "reference": "b94b2807d85443f9719887892882d0329d1e2598",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/3a494dc7dc1d7d12e511890177ae2d0e6c107da6",
+                "reference": "3a494dc7dc1d7d12e511890177ae2d0e6c107da6",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5"
+                "php": "^7.2.5 || ^8.0"
             },
             "require-dev": {
-                "symfony/phpunit-bridge": "^4.4 || ^5.1"
+                "bamarni/composer-bin-plugin": "^1.8.1",
+                "phpunit/phpunit": "^8.5.29 || ^9.5.23"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "1.5-dev"
+                "bamarni-bin": {
+                    "bin-links": true,
+                    "forward-command": false
                 }
             },
             "autoload": {
-                "files": [
-                    "src/functions_include.php"
-                ],
                 "psr-4": {
                     "GuzzleHttp\\Promise\\": "src/"
                 }
@@ -2441,7 +2438,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/1.5.2"
+                "source": "https://github.com/guzzle/promises/tree/2.0.0"
             },
             "funding": [
                 {
@@ -2457,26 +2454,26 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-08-28T14:55:35+00:00"
+            "time": "2023-05-21T13:50:22+00:00"
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "2.4.5",
+            "version": "2.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "0454e12ef0cd597ccd2adb036f7bda4e7fface66"
+                "reference": "b635f279edd83fc275f822a1188157ffea568ff6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/0454e12ef0cd597ccd2adb036f7bda4e7fface66",
-                "reference": "0454e12ef0cd597ccd2adb036f7bda4e7fface66",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/b635f279edd83fc275f822a1188157ffea568ff6",
+                "reference": "b635f279edd83fc275f822a1188157ffea568ff6",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2.5 || ^8.0",
                 "psr/http-factory": "^1.0",
-                "psr/http-message": "^1.0",
+                "psr/http-message": "^1.1 || ^2.0",
                 "ralouphie/getallheaders": "^3.0"
             },
             "provide": {
@@ -2557,7 +2554,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/2.4.5"
+                "source": "https://github.com/guzzle/psr7/tree/2.5.0"
             },
             "funding": [
                 {
@@ -2573,7 +2570,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-04-17T16:00:45+00:00"
+            "time": "2023-04-17T16:11:26+00:00"
         },
         {
             "name": "incenteev/composer-parameter-handler",
@@ -8158,21 +8155,21 @@
         },
         {
             "name": "psr/http-client",
-            "version": "1.0.1",
+            "version": "1.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-client.git",
-                "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621"
+                "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
-                "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
+                "url": "https://api.github.com/repos/php-fig/http-client/zipball/0955afe48220520692d2d09f7ab7e0f93ffd6a31",
+                "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.0 || ^8.0",
-                "psr/http-message": "^1.0"
+                "psr/http-message": "^1.0 || ^2.0"
             },
             "type": "library",
             "extra": {
@@ -8192,7 +8189,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common interface for HTTP clients",
@@ -8204,27 +8201,27 @@
                 "psr-18"
             ],
             "support": {
-                "source": "https://github.com/php-fig/http-client/tree/master"
+                "source": "https://github.com/php-fig/http-client/tree/1.0.2"
             },
-            "time": "2020-06-29T06:28:15+00:00"
+            "time": "2023-04-10T20:12:12+00:00"
         },
         {
             "name": "psr/http-factory",
-            "version": "1.0.1",
+            "version": "1.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-factory.git",
-                "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be"
+                "reference": "e616d01114759c4c489f93b099585439f795fe35"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
-                "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
+                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35",
+                "reference": "e616d01114759c4c489f93b099585439f795fe35",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.0.0",
-                "psr/http-message": "^1.0"
+                "psr/http-message": "^1.0 || ^2.0"
             },
             "type": "library",
             "extra": {
@@ -8244,7 +8241,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common interfaces for PSR-7 HTTP message factories",
@@ -8259,9 +8256,9 @@
                 "response"
             ],
             "support": {
-                "source": "https://github.com/php-fig/http-factory/tree/master"
+                "source": "https://github.com/php-fig/http-factory/tree/1.0.2"
             },
-            "time": "2019-04-30T12:38:16+00:00"
+            "time": "2023-04-10T20:10:41+00:00"
         },
         {
             "name": "psr/http-message",
@@ -9423,16 +9420,16 @@
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v3.2.1",
+            "version": "v3.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e"
+                "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e",
-                "reference": "e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf",
+                "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf",
                 "shasum": ""
             },
             "require": {
@@ -9441,7 +9438,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.3-dev"
+                    "dev-main": "3.4-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -9470,7 +9467,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.2.1"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.3.0"
             },
             "funding": [
                 {
@@ -9486,7 +9483,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-01T10:25:55+00:00"
+            "time": "2023-05-23T14:45:45+00:00"
         },
         {
             "name": "symfony/doctrine-bridge",

From 136d8c5a0c454c696decb9cc3ea23e247494caa9 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Tue, 25 Apr 2023 12:45:31 +0300
Subject: [PATCH 0205/1030]  introduce empty controller,route and view for
 featureValue

---
 .../Sell/Catalog/FeatureValueController.php   | 70 +++++++++++++++++++
 .../routing/admin/sell/catalog/_catalog.yml   |  4 ++
 .../admin/sell/catalog/feature_value.yml      | 10 +++
 .../Features/FeatureValue/index.html.twig     | 46 ++++++++++++
 4 files changed, 130 insertions(+)
 create mode 100644 src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
 create mode 100644 src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/feature_value.yml
 create mode 100644 src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/index.html.twig

diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
new file mode 100644
index 0000000000000..4d9f900bd9c20
--- /dev/null
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\Controller\Admin\Sell\Catalog;
+
+use PrestaShop\PrestaShop\Core\Search\Filters\FeatureFilters;
+use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
+use PrestaShopBundle\Security\Annotation\AdminSecurity;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+class FeatureValueController extends FrameworkBundleAdminController
+{
+    /**
+     * @AdminSecurity("is_granted('read', request.get('_legacy_controller'))")
+     */
+    public function indexAction(Request $request, FeatureFilters $filters): Response
+    {
+        //@todo: render grid
+//        $featureGridFactory = $this->get('prestashop.core.grid.grid_factory.feature');
+//
+//        $showcaseCardIsClosed = $this->getQueryBus()->handle(
+//            new GetShowcaseCardIsClosed(
+//                (int) $this->getContext()->employee->id,
+//                ShowcaseCard::FEATURES_CARD
+//            )
+//        );
+
+        return $this->render('@PrestaShop/Admin/Sell/Catalog/Features/FeatureValue/index.html.twig', [
+            'enableSidebar' => true,
+            'help_link' => $this->generateSidebarLink($request->attributes->get('_legacy_controller')),
+            //            'featureGrid' => $this->presentGrid($featureGridFactory->getGrid($filters)),
+            //            'settingsTipMessage' => $this->getSettingsTipMessage(),
+            //            'showcaseCardName' => ShowcaseCard::FEATURES_CARD,
+            //            'isShowcaseCardClosed' => $showcaseCardIsClosed,
+            //            'layoutHeaderToolbarBtn' => [
+            //                'add_feature' => [
+            //                    'href' => $this->generateUrl('admin_features_add'),
+            //                    'desc' => $this->trans('Add new feature', 'Admin.Catalog.Feature'),
+            //                    'icon' => 'add_circle_outline',
+            //                ],
+            //            ],
+        ]);
+    }
+}
diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/_catalog.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/_catalog.yml
index af41be21acb94..ff4ade24364b0 100644
--- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/_catalog.yml
+++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/_catalog.yml
@@ -30,6 +30,10 @@ _features:
   resource: "features.yml"
   prefix: /features
 
+_feature_values:
+  resource: "feature_value.yml"
+  prefix: /features/{featureId}/values/
+
 _attributes:
   resource: "attribute.yml"
   prefix: /attribute-groups/{attributeGroupId}/attributes/
diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/feature_value.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/feature_value.yml
new file mode 100644
index 0000000000000..19e4a6eb28668
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/feature_value.yml
@@ -0,0 +1,10 @@
+admin_feature_values_index:
+  path: /
+  methods: [ GET ]
+  defaults:
+    _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureValueController::indexAction
+    _legacy_controller: AdminFeatures
+    _legacy_link: AdminFeatures
+    _legacy_feature_flag: feature
+  requirements:
+    featureId: \d+
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/index.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/index.html.twig
new file mode 100644
index 0000000000000..5f7961975373d
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/index.html.twig
@@ -0,0 +1,46 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+
+{% extends '@PrestaShop/Admin/layout.html.twig' %}
+
+{% import '@PrestaShop/Admin/macros.html.twig' as ps %}
+
+{% block content %}
+  Todo: render grid.
+{#  {{ ps.infotip(settingsTipMessage, true) }}#}
+{#  {% block feature_group_showcase_card %}#}
+{#      {% include '@PrestaShop/Admin/Sell/Catalog/Features/Blocks/showcase_card.html.twig' %}#}
+{#  {% endblock %}#}
+{#  {% block features_listing %}#}
+{#    {% include '@PrestaShop/Admin/Common/Grid/grid_panel.html.twig' with {'grid': featureGrid} %}#}
+{#  {% endblock %}#}
+{% endblock %}
+
+{% block javascripts %}
+{#  {{ parent() }}#}
+
+{#  <script src="{{ asset('themes/default/js/bundle/pagination.js') }}"></script>#}
+{#  <script src="{{ asset('themes/new-theme/public/feature.bundle.js') }}"></script>#}
+{% endblock %}

From df7c7373e182fbd1069b523c48bfead821020a29 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Tue, 25 Apr 2023 18:45:16 +0300
Subject: [PATCH 0206/1030]  implement configurableGridDefinition factory and
 custom featureValue builder. Show grid without actions

---
 .../Feature/Repository/FeatureRepository.php  |  38 +++
 ...tractConfigurableGridDefinitionFactory.php |  33 +++
 .../Factory/AbstractGridDefinitionFactory.php |   6 +-
 ...igurableGridDefinitionFactoryInterface.php |  36 +++
 .../FeatureValueGridDefinitionFactory.php     | 272 ++++++++++++++++++
 .../GridDefinitionFactoryInterface.php        |   2 +-
 .../Factory/CategoryGridFactoryDecorator.php  |   2 +-
 src/Core/Grid/GridFactory.php                 |   4 +-
 src/Core/Grid/GridFactoryInterface.php        |   2 +-
 .../Grid/Query/FeatureValueQueryBuilder.php   | 132 +++++++++
 .../FeatureValueFiltersBuilder.php            |  90 ++++++
 .../Search/Filters/FeatureValueFilters.php    |  87 ++++++
 .../Sell/Catalog/FeatureValueController.php   |  12 +-
 .../admin/sell/catalog/feature_value.yml      |  15 +
 .../core/grid/doctrine_query_builder.yml      |   7 +
 .../services/core/grid/grid_data_factory.yml  |   8 +
 .../core/grid/grid_definition_factory.yml     |  11 +
 .../services/core/grid/grid_factory.yml       |   9 +
 .../Resources/config/services/core/search.yml |   5 +
 .../Features/FeatureValue/index.html.twig     |  18 +-
 20 files changed, 768 insertions(+), 21 deletions(-)
 create mode 100644 src/Core/Grid/Definition/Factory/AbstractConfigurableGridDefinitionFactory.php
 create mode 100644 src/Core/Grid/Definition/Factory/ConfigurableGridDefinitionFactoryInterface.php
 create mode 100644 src/Core/Grid/Definition/Factory/FeatureValueGridDefinitionFactory.php
 create mode 100644 src/Core/Grid/Query/FeatureValueQueryBuilder.php
 create mode 100644 src/Core/Search/Builder/TypedBuilder/FeatureValueFiltersBuilder.php
 create mode 100644 src/Core/Search/Filters/FeatureValueFilters.php

diff --git a/src/Adapter/Feature/Repository/FeatureRepository.php b/src/Adapter/Feature/Repository/FeatureRepository.php
index 2e75b57187991..e0dc96f0564dc 100644
--- a/src/Adapter/Feature/Repository/FeatureRepository.php
+++ b/src/Adapter/Feature/Repository/FeatureRepository.php
@@ -37,6 +37,7 @@
 use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\CannotEditFeatureException;
 use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\FeatureNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Feature\ValueObject\FeatureId;
+use PrestaShop\PrestaShop\Core\Domain\Language\ValueObject\LanguageId;
 use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopConstraint;
 use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopGroupId;
 use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopId;
@@ -142,6 +143,43 @@ public function assertExists(FeatureId $featureId): void
         );
     }
 
+    /**
+     * @param FeatureId $featureId
+     * @param LanguageId $languageId
+     *
+     * @return string
+     *
+     * @throws FeatureNotFoundException
+     */
+    public function getFeatureName(FeatureId $featureId, LanguageId $languageId): string
+    {
+        $featureIdValue = $featureId->getValue();
+        $result = $this->connection->createQueryBuilder()
+            ->select('fl.name')
+            ->from($this->dbPrefix . 'feature', 'f')
+            ->innerJoin(
+                'f',
+                $this->dbPrefix . 'feature_lang',
+                'fl',
+                'f.id_feature = fl.id_feature'
+            )
+            ->andWhere('f.id_feature = :featureId')
+            ->andWhere('fl.id_lang = :languageId')
+            ->setParameters([
+                'featureId' => $featureIdValue,
+                'languageId' => $languageId->getValue(),
+            ])
+            ->execute()
+            ->fetchAssociative()
+        ;
+
+        if (!isset($result['name'])) {
+            throw new FeatureNotFoundException(sprintf('Feature with id "%d" name was not found', $featureIdValue));
+        }
+
+        return $result['name'];
+    }
+
     /**
      * @param int|null $limit
      * @param int|null $offset
diff --git a/src/Core/Grid/Definition/Factory/AbstractConfigurableGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/AbstractConfigurableGridDefinitionFactory.php
new file mode 100644
index 0000000000000..e2e1e072d3de5
--- /dev/null
+++ b/src/Core/Grid/Definition/Factory/AbstractConfigurableGridDefinitionFactory.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Grid\Definition\Factory;
+
+abstract class AbstractConfigurableGridDefinitionFactory extends AbstractFilterableGridDefinitionFactory implements ConfigurableGridDefinitionFactoryInterface
+{
+}
diff --git a/src/Core/Grid/Definition/Factory/AbstractGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/AbstractGridDefinitionFactory.php
index c23b5b10a736e..917e9e23abda7 100644
--- a/src/Core/Grid/Definition/Factory/AbstractGridDefinitionFactory.php
+++ b/src/Core/Grid/Definition/Factory/AbstractGridDefinitionFactory.php
@@ -63,8 +63,12 @@ public function __construct(HookDispatcherInterface $hookDispatcher)
     /**
      * {@inheritdoc}
      */
-    final public function getDefinition()
+    final public function getDefinition(array $options = [])
     {
+        if ($this instanceof ConfigurableGridDefinitionFactoryInterface) {
+            $this->configureOptions($options);
+        }
+
         $definition = new GridDefinition(
             $this->getId(),
             $this->getName(),
diff --git a/src/Core/Grid/Definition/Factory/ConfigurableGridDefinitionFactoryInterface.php b/src/Core/Grid/Definition/Factory/ConfigurableGridDefinitionFactoryInterface.php
new file mode 100644
index 0000000000000..ea89c828a0fae
--- /dev/null
+++ b/src/Core/Grid/Definition/Factory/ConfigurableGridDefinitionFactoryInterface.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Grid\Definition\Factory;
+
+/**
+ * This interface allows to configure grid definition with options during runtime
+ */
+interface ConfigurableGridDefinitionFactoryInterface extends FilterableGridDefinitionFactoryInterface
+{
+    public function configureOptions(array $options): void;
+}
diff --git a/src/Core/Grid/Definition/Factory/FeatureValueGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/FeatureValueGridDefinitionFactory.php
new file mode 100644
index 0000000000000..0c7cbe1e35e3b
--- /dev/null
+++ b/src/Core/Grid/Definition/Factory/FeatureValueGridDefinitionFactory.php
@@ -0,0 +1,272 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Grid\Definition\Factory;
+
+use PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureRepository;
+use PrestaShop\PrestaShop\Core\Domain\Feature\ValueObject\FeatureId;
+use PrestaShop\PrestaShop\Core\Domain\Language\ValueObject\LanguageId;
+use PrestaShop\PrestaShop\Core\Grid\Action\Bulk\BulkActionCollection;
+use PrestaShop\PrestaShop\Core\Grid\Action\Bulk\BulkActionCollectionInterface;
+use PrestaShop\PrestaShop\Core\Grid\Action\GridActionCollection;
+use PrestaShop\PrestaShop\Core\Grid\Action\GridActionCollectionInterface;
+use PrestaShop\PrestaShop\Core\Grid\Action\Type\LinkGridAction;
+use PrestaShop\PrestaShop\Core\Grid\Action\Type\SimpleGridAction;
+use PrestaShop\PrestaShop\Core\Grid\Column\ColumnCollection;
+use PrestaShop\PrestaShop\Core\Grid\Column\ColumnCollectionInterface;
+use PrestaShop\PrestaShop\Core\Grid\Column\Type\Common\ActionColumn;
+use PrestaShop\PrestaShop\Core\Grid\Column\Type\Common\DataColumn;
+use PrestaShop\PrestaShop\Core\Grid\Filter\Filter;
+use PrestaShop\PrestaShop\Core\Grid\Filter\FilterCollection;
+use PrestaShop\PrestaShop\Core\Grid\Filter\FilterCollectionInterface;
+use PrestaShop\PrestaShop\Core\Hook\HookDispatcherInterface;
+use PrestaShopBundle\Form\Admin\Type\SearchAndResetType;
+use Symfony\Component\Form\Extension\Core\Type\NumberType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class FeatureValueGridDefinitionFactory extends AbstractConfigurableGridDefinitionFactory
+{
+    public const GRID_ID = 'feature_value';
+
+    protected $options = [];
+
+    /**
+     * @var FeatureRepository
+     */
+    private $featureRepository;
+
+    public function __construct(
+        HookDispatcherInterface $hookDispatcher,
+        FeatureRepository $featureRepository
+    ) {
+        parent::__construct($hookDispatcher);
+        $this->featureRepository = $featureRepository;
+    }
+
+    public function configureOptions(array $options): void
+    {
+        $optionsResolver = new OptionsResolver();
+        $optionsResolver
+            ->setRequired(['feature_id', 'language_id'])
+            ->setAllowedTypes('feature_id', 'int')
+            ->setAllowedTypes('language_id', 'int')
+        ;
+
+        $this->options = $optionsResolver->resolve($options);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getId(): string
+    {
+        return self::GRID_ID;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getName(): string
+    {
+        //@todo: repository should be wrapped in interface (should be clear after ADR https://github.com/PrestaShop/ADR/pull/33 is finished)
+        return $this->featureRepository->getFeatureName(
+            new FeatureId($this->options['feature_id']),
+            new LanguageId($this->options['language_id'])
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getColumns(): ColumnCollectionInterface
+    {
+        return (new ColumnCollection())
+//            ->add((new BulkActionColumn('bulk'))
+//            ->setOptions([
+//                'bulk_field' => 'id_feature',
+//            ])
+//            )
+            ->add((new DataColumn('id_feature_value'))
+            ->setName($this->trans('ID', [], 'Admin.Global'))
+            ->setOptions([
+                'field' => 'id_feature_value',
+            ])
+            )
+            ->add((new DataColumn('value'))
+            ->setName($this->trans('Value', [], 'Admin.Global'))
+            ->setOptions([
+                'field' => 'value',
+            ])
+//            )
+//            ->add((new DataColumn('values_count'))
+//            ->setName($this->trans('Values', [], 'Admin.Catalog.Feature'))
+//            ->setOptions([
+//                'field' => 'values_count',
+//            ])
+//            )
+//            // @todo: position action is not implemented yet
+//            //        Uncomment Position column and delete position DataColumn when its done.
+//            ->add((new DataColumn('position'))
+//            ->setName($this->trans('Position', [], 'Admin.Global'))
+//            ->setOptions(['field' => 'position'])
+//            )
+//            ->add((new PositionColumn('position'))
+//            ->setName($this->trans('Position', [], 'Admin.Global'))
+//            ->setOptions([
+//                'id_field' => 'id_feature',
+//                'position_field' => 'position',
+//                'update_method' => 'POST',
+//                'update_route' => 'admin_features_update_position',
+//            ])
+            )
+            ->add((new ActionColumn('actions'))
+            ->setName($this->trans('Actions', [], 'Admin.Global'))
+//            ->setOptions([
+//                'actions' => (new RowActionCollection())
+//                    // @todo: view action is not implemented yet
+//                    // ->add((new LinkRowAction('view'))
+//                    // ->setName($this->trans('View', [], 'Admin.Actions'))
+//                    // ->setIcon('zoom_in')
+//                    // ->setOptions([
+//                    // 'route' => 'admin_features_view',
+//                    // 'route_param_name' => 'featureId',
+//                    // 'route_param_field' => 'id_feature',
+//                    // 'clickable_row' => true,
+//                    // ])
+//                    // )
+//                    ->add((new LinkRowAction('edit'))
+//                    ->setName($this->trans('Edit', [], 'Admin.Actions'))
+//                    ->setIcon('edit')
+//                    ->setOptions([
+//                        'route' => 'admin_features_edit',
+//                        'route_param_name' => 'featureId',
+//                        'route_param_field' => 'id_feature',
+//                    ])
+//                    ),
+//                // @todo: delete aciton is not implemented yet
+//                // ->add(
+//                // $this->buildDeleteAction(
+//                // 'admin_features_delete',
+//                // 'featureId',
+//                // 'id_feature',
+//                // Request::METHOD_DELETE
+//                // )
+//                // ),
+//            ])
+            );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getGridActions(): GridActionCollectionInterface
+    {
+        return (new GridActionCollection())
+            ->add((new LinkGridAction('import'))
+            ->setName($this->trans('Import', [], 'Admin.Actions'))
+            ->setIcon('cloud_upload')
+            ->setOptions([
+                'route' => 'admin_import',
+                'route_params' => [
+                    'import_type' => 'features',
+                ],
+            ])
+            )
+            ->add((new LinkGridAction('export'))
+            ->setName($this->trans('Export', [], 'Admin.Actions'))
+            ->setIcon('cloud_download')
+            ->setOptions([
+                'route' => 'admin_features_export',
+            ])
+            )
+            ->add((new SimpleGridAction('common_refresh_list'))
+            ->setName($this->trans('Refresh list', [], 'Admin.Advparameters.Feature'))
+            ->setIcon('refresh')
+            )
+            ->add((new SimpleGridAction('common_show_query'))
+            ->setName($this->trans('Show SQL query', [], 'Admin.Actions'))
+            ->setIcon('code')
+            )
+            ->add((new SimpleGridAction('common_export_sql_manager'))
+            ->setName($this->trans('Export to SQL Manager', [], 'Admin.Actions'))
+            ->setIcon('storage')
+            );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getFilters(): FilterCollectionInterface
+    {
+        return (new FilterCollection())
+            ->add((new Filter('id_feature_value', NumberType::class))
+            ->setTypeOptions([
+                'required' => false,
+                'attr' => [
+                    'placeholder' => $this->trans('Search ID', [], 'Admin.Actions'),
+                ],
+            ])
+            ->setAssociatedColumn('id_feature_value')
+            )
+            ->add((new Filter('value', TextType::class))
+            ->setTypeOptions([
+                'required' => false,
+                'attr' => [
+                    'placeholder' => $this->trans('Search value', [], 'Admin.Actions'),
+                ],
+            ])
+            ->setAssociatedColumn('value')
+            )
+            ->add((new Filter('actions', SearchAndResetType::class))
+            ->setAssociatedColumn('actions')
+            ->setTypeOptions([
+                'reset_route' => 'admin_common_reset_search_by_filter_id',
+                'reset_route_params' => [
+                    'filterId' => self::GRID_ID,
+                ],
+                'redirect_route' => 'admin_feature_values_index',
+                'redirect_route_params' => [
+                    'featureId' => $this->options['feature_id'],
+                ],
+            ])
+            ->setAssociatedColumn('actions')
+            );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getBulkActions(): BulkActionCollectionInterface
+    {
+        return new BulkActionCollection();
+        // @todo: bulk delete action is not implemented yet
+        // return (new BulkActionCollection())
+        // ->add($this->buildBulkDeleteAction('admin_features_bulk_delete'))
+        // ;
+    }
+}
diff --git a/src/Core/Grid/Definition/Factory/GridDefinitionFactoryInterface.php b/src/Core/Grid/Definition/Factory/GridDefinitionFactoryInterface.php
index eacd347edfbee..fa93ab555d47f 100644
--- a/src/Core/Grid/Definition/Factory/GridDefinitionFactoryInterface.php
+++ b/src/Core/Grid/Definition/Factory/GridDefinitionFactoryInterface.php
@@ -38,5 +38,5 @@ interface GridDefinitionFactoryInterface
      *
      * @return GridDefinitionInterface
      */
-    public function getDefinition();
+    public function getDefinition(array $options = []);
 }
diff --git a/src/Core/Grid/Factory/CategoryGridFactoryDecorator.php b/src/Core/Grid/Factory/CategoryGridFactoryDecorator.php
index 0ba9e65c99dfc..0f724843596e4 100644
--- a/src/Core/Grid/Factory/CategoryGridFactoryDecorator.php
+++ b/src/Core/Grid/Factory/CategoryGridFactoryDecorator.php
@@ -67,7 +67,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function getGrid(SearchCriteriaInterface $searchCriteria)
+    public function getGrid(SearchCriteriaInterface $searchCriteria, array $options = [])
     {
         $categoryGrid = $this->categoryGridFactory->getGrid($searchCriteria);
 
diff --git a/src/Core/Grid/GridFactory.php b/src/Core/Grid/GridFactory.php
index bc84beeefeb19..bca74ac3dcd73 100644
--- a/src/Core/Grid/GridFactory.php
+++ b/src/Core/Grid/GridFactory.php
@@ -79,9 +79,9 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function getGrid(SearchCriteriaInterface $searchCriteria)
+    public function getGrid(SearchCriteriaInterface $searchCriteria, array $options = [])
     {
-        $definition = $this->definitionFactory->getDefinition();
+        $definition = $this->definitionFactory->getDefinition($options);
         $data = $this->dataFactory->getData($searchCriteria);
 
         $this->hookDispatcher->dispatchWithParameters('action' . Container::camelize($definition->getId()) . 'GridDataModifier', [
diff --git a/src/Core/Grid/GridFactoryInterface.php b/src/Core/Grid/GridFactoryInterface.php
index 8f45dfb3cc872..456d7311ab27d 100644
--- a/src/Core/Grid/GridFactoryInterface.php
+++ b/src/Core/Grid/GridFactoryInterface.php
@@ -40,5 +40,5 @@ interface GridFactoryInterface
      *
      * @return GridInterface
      */
-    public function getGrid(SearchCriteriaInterface $searchCriteria);
+    public function getGrid(SearchCriteriaInterface $searchCriteria, array $options = []);
 }
diff --git a/src/Core/Grid/Query/FeatureValueQueryBuilder.php b/src/Core/Grid/Query/FeatureValueQueryBuilder.php
new file mode 100644
index 0000000000000..ffb3d0d974a74
--- /dev/null
+++ b/src/Core/Grid/Query/FeatureValueQueryBuilder.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Grid\Query;
+
+use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Query\QueryBuilder;
+use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
+use PrestaShop\PrestaShop\Core\Grid\Search\SearchCriteriaInterface;
+use PrestaShop\PrestaShop\Core\Search\Filters\FeatureValueFilters;
+
+class FeatureValueQueryBuilder extends AbstractDoctrineQueryBuilder
+{
+    /**
+     * @var DoctrineSearchCriteriaApplicatorInterface
+     */
+    private $searchCriteriaApplicator;
+
+    /**
+     * @param Connection $connection
+     * @param string $dbPrefix
+     * @param DoctrineSearchCriteriaApplicatorInterface $searchCriteriaApplicator
+     */
+    public function __construct(
+        Connection $connection,
+        $dbPrefix,
+        DoctrineSearchCriteriaApplicatorInterface $searchCriteriaApplicator
+    ) {
+        parent::__construct($connection, $dbPrefix);
+
+        $this->searchCriteriaApplicator = $searchCriteriaApplicator;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getSearchQueryBuilder(SearchCriteriaInterface $searchCriteria): QueryBuilder
+    {
+        $qb = $this->getQueryBuilder($searchCriteria)
+            ->select('fv.id_feature_value, fvl.value')
+            ->groupBy('fv.id_feature_value')
+        ;
+
+        $this->searchCriteriaApplicator
+            ->applyPagination($searchCriteria, $qb)
+            ->applySorting($searchCriteria, $qb)
+        ;
+
+        return $qb;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getCountQueryBuilder(SearchCriteriaInterface $searchCriteria): QueryBuilder
+    {
+        return $this->getQueryBuilder($searchCriteria)
+            ->select('COUNT(DISTINCT fv.id_feature_value)')
+        ;
+    }
+
+    /**
+     * @param SearchCriteriaInterface $searchCriteria
+     *
+     * @return QueryBuilder
+     *
+     * @throws InvalidArgumentException
+     */
+    private function getQueryBuilder(SearchCriteriaInterface $searchCriteria): QueryBuilder
+    {
+        if (!$searchCriteria instanceof FeatureValueFilters) {
+            throw new InvalidArgumentException(sprintf('Invalid search criteria type. Expected "%s"', FeatureValueFilters::class));
+        }
+
+        $filters = $searchCriteria->getFilters();
+        $allowedFilters = ['id_feature_value', 'value'];
+
+        $qb = $this->connection
+            ->createQueryBuilder()
+            ->from($this->dbPrefix . 'feature_value', 'fv')
+            ->where('fv.id_feature = :featureId')
+            ->setParameter('featureId', $searchCriteria->getFeatureId())
+            ->leftJoin(
+                'fv',
+                $this->dbPrefix . 'feature_value_lang',
+                'fvl',
+                'fv.id_feature_value = fvl.id_feature_value AND fvl.id_lang = :langId'
+            )
+            ->setParameter('langId', $searchCriteria->getLanguageId())
+        ;
+
+        foreach ($filters as $filterName => $value) {
+            if (!in_array($filterName, $allowedFilters, true)) {
+                continue;
+            }
+
+            if ('value' === $filterName) {
+                $qb->andWhere('fvl.value LIKE :' . $filterName)
+                    ->setParameter($filterName, '%' . $value . '%');
+                continue;
+            }
+
+            $qb->andWhere('fv.`' . $filterName . '` = :' . $filterName)
+                ->setParameter($filterName, $value);
+        }
+
+        return $qb;
+    }
+}
diff --git a/src/Core/Search/Builder/TypedBuilder/FeatureValueFiltersBuilder.php b/src/Core/Search/Builder/TypedBuilder/FeatureValueFiltersBuilder.php
new file mode 100644
index 0000000000000..2196699b0955d
--- /dev/null
+++ b/src/Core/Search/Builder/TypedBuilder/FeatureValueFiltersBuilder.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Search\Builder\TypedBuilder;
+
+use PrestaShop\PrestaShop\Core\Search\Builder\AbstractFiltersBuilder;
+use PrestaShop\PrestaShop\Core\Search\Filters;
+use PrestaShop\PrestaShop\Core\Search\Filters\FeatureValueFilters;
+use Symfony\Component\HttpFoundation\Request;
+
+class FeatureValueFiltersBuilder extends AbstractFiltersBuilder implements TypedFiltersBuilderInterface
+{
+    /** @var Request */
+    private $request;
+
+    /**
+     * @var int
+     */
+    private $contextLangId;
+
+    public function __construct(
+        int $contextLangId
+    ) {
+        $this->contextLangId = $contextLangId;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setConfig(array $config): FeatureValueFiltersBuilder
+    {
+        $this->request = $config['request'] ?? null;
+
+        return parent::setConfig($config);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function buildFilters(Filters $filters = null)
+    {
+        $filterParameters = FeatureValueFilters::getDefaults();
+        if (null !== $filters) {
+            $filterParameters = array_replace($filterParameters, $filters->all());
+        }
+
+        $filterParameters['filters']['feature_id'] = $this->getFeatureId();
+        $filterParameters['filters']['language_id'] = $this->contextLangId;
+
+        return new FeatureValueFilters($filterParameters);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function supports(string $filterClassName): bool
+    {
+        return $filterClassName === FeatureValueFilters::class;
+    }
+
+    private function getFeatureId(): int
+    {
+        return $this->request->attributes->getInt('featureId');
+    }
+}
diff --git a/src/Core/Search/Filters/FeatureValueFilters.php b/src/Core/Search/Filters/FeatureValueFilters.php
new file mode 100644
index 0000000000000..84a9986d62297
--- /dev/null
+++ b/src/Core/Search/Filters/FeatureValueFilters.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Search\Filters;
+
+use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
+use PrestaShop\PrestaShop\Core\Grid\Definition\Factory\FeatureValueGridDefinitionFactory;
+use PrestaShop\PrestaShop\Core\Search\Filters;
+
+class FeatureValueFilters extends Filters
+{
+    /** @var string */
+    protected $filterId = FeatureValueGridDefinitionFactory::GRID_ID;
+
+    /**
+     * @var int
+     */
+    protected $featureId;
+
+    /**
+     * @var int
+     */
+    protected $languageId;
+
+    public function __construct(array $filters = [])
+    {
+        if (!isset($filters['filters']['feature_id'])) {
+            throw new InvalidArgumentException(sprintf('%s filters expect a feature_id filter', static::class));
+        }
+
+        if (!isset($filters['filters']['language_id'])) {
+            throw new InvalidArgumentException(sprintf('%s filters expect a language_id filter', static::class));
+        }
+
+        $this->featureId = (int) $filters['filters']['feature_id'];
+        $this->languageId = (int) $filters['filters']['language_id'];
+
+        parent::__construct($filters, $this->filterId);
+    }
+
+    public function getFeatureId(): int
+    {
+        return $this->featureId;
+    }
+
+    public function getLanguageId(): int
+    {
+        return $this->languageId;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDefaults(): array
+    {
+        return [
+            'limit' => self::LIST_LIMIT,
+            'offset' => 0,
+            'orderBy' => 'value',
+            'sortOrder' => 'asc',
+            'filters' => [],
+        ];
+    }
+}
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
index 4d9f900bd9c20..4b3bed889528f 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
@@ -28,7 +28,7 @@
 
 namespace PrestaShopBundle\Controller\Admin\Sell\Catalog;
 
-use PrestaShop\PrestaShop\Core\Search\Filters\FeatureFilters;
+use PrestaShop\PrestaShop\Core\Search\Filters\FeatureValueFilters;
 use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
 use PrestaShopBundle\Security\Annotation\AdminSecurity;
 use Symfony\Component\HttpFoundation\Request;
@@ -39,10 +39,14 @@ class FeatureValueController extends FrameworkBundleAdminController
     /**
      * @AdminSecurity("is_granted('read', request.get('_legacy_controller'))")
      */
-    public function indexAction(Request $request, FeatureFilters $filters): Response
+    public function indexAction(Request $request, FeatureValueFilters $filters): Response
     {
         //@todo: render grid
-//        $featureGridFactory = $this->get('prestashop.core.grid.grid_factory.feature');
+        $featureValueGridFactory = $this->get('prestashop.core.grid.grid_factory.feature_value');
+        $grid = $featureValueGridFactory->getGrid($filters, [
+            'feature_id' => $filters->getFeatureId(),
+            'language_id' => $filters->getLanguageId(),
+        ]);
 //
 //        $showcaseCardIsClosed = $this->getQueryBus()->handle(
 //            new GetShowcaseCardIsClosed(
@@ -54,7 +58,7 @@ public function indexAction(Request $request, FeatureFilters $filters): Response
         return $this->render('@PrestaShop/Admin/Sell/Catalog/Features/FeatureValue/index.html.twig', [
             'enableSidebar' => true,
             'help_link' => $this->generateSidebarLink($request->attributes->get('_legacy_controller')),
-            //            'featureGrid' => $this->presentGrid($featureGridFactory->getGrid($filters)),
+            'featureValueGrid' => $this->presentGrid($grid),
             //            'settingsTipMessage' => $this->getSettingsTipMessage(),
             //            'showcaseCardName' => ShowcaseCard::FEATURES_CARD,
             //            'isShowcaseCardClosed' => $showcaseCardIsClosed,
diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/feature_value.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/feature_value.yml
index 19e4a6eb28668..b9e2b6cd2f389 100644
--- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/feature_value.yml
+++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/feature_value.yml
@@ -8,3 +8,18 @@ admin_feature_values_index:
     _legacy_feature_flag: feature
   requirements:
     featureId: \d+
+
+admin_feature_values_search:
+  path: /
+  methods: [ POST ]
+  defaults:
+    _controller: PrestaShopBundle\Controller\Admin\CommonController::searchGridAction
+    _legacy_controller: AdminFeatures
+    _legacy_link: AdminFeatures
+    _legacy_feature_flag: feature
+    gridDefinitionFactoryServiceId: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\FeatureGridDefinitionFactory
+    redirectRoute: admin_feature_values_index
+    redirectQueryParamsToKeep:
+      - featureId
+  requirements:
+    featureId: \d+
diff --git a/src/PrestaShopBundle/Resources/config/services/core/grid/doctrine_query_builder.yml b/src/PrestaShopBundle/Resources/config/services/core/grid/doctrine_query_builder.yml
index c50628ba6fd16..2355744f966d6 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/grid/doctrine_query_builder.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/grid/doctrine_query_builder.yml
@@ -522,6 +522,13 @@ services:
       $searchCriteriaApplicator: '@prestashop.core.query.doctrine_search_criteria_applicator'
       $contextLangId: "@=service('prestashop.adapter.legacy.context').getContext().language.id"
 
+  PrestaShop\PrestaShop\Core\Grid\Query\FeatureValueQueryBuilder:
+    parent: 'prestashop.core.grid.abstract_query_builder'
+    autowire: true
+    public: false
+    arguments:
+      $searchCriteriaApplicator: '@prestashop.core.query.doctrine_search_criteria_applicator'
+
   PrestaShop\PrestaShop\Core\Grid\Query\StoreQueryBuilder:
     autowire: true
     public: false
diff --git a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_data_factory.yml b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_data_factory.yml
index a4c70065bca73..5eedbed645e7e 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_data_factory.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_data_factory.yml
@@ -635,6 +635,14 @@ services:
       - '@prestashop.core.grid.query.doctrine_query_parser'
       - 'feature'
 
+  prestashop.core.grid.data.factory.feature_value:
+    class: '%prestashop.core.grid.data.factory.doctrine_grid_data_factory%'
+    arguments:
+      - '@PrestaShop\PrestaShop\Core\Grid\Query\FeatureValueQueryBuilder'
+      - '@prestashop.core.hook.dispatcher'
+      - '@prestashop.core.grid.query.doctrine_query_parser'
+      - 'feature_value'
+
   prestashop.core.grid.data.factory.store:
     class: '%prestashop.core.grid.data.factory.doctrine_grid_data_factory%'
     arguments:
diff --git a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_definition_factory.yml b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_definition_factory.yml
index 8dd32e8327f65..50f3bc20a87ba 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_definition_factory.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_definition_factory.yml
@@ -10,6 +10,12 @@ services:
     calls:
       - [ setTranslator, [ '@translator' ] ]
 
+  PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractConfigurableGridDefinitionFactory:
+    abstract: true
+    autowire: true
+    calls:
+      - [ setTranslator, [ '@translator' ] ]
+
   prestashop.core.grid.definition.factory.logs:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\LogGridDefinitionFactory'
     parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
@@ -414,3 +420,8 @@ services:
     parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
     public: true
     autowire: true
+
+  PrestaShop\PrestaShop\Core\Grid\Definition\Factory\FeatureValueGridDefinitionFactory:
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractConfigurableGridDefinitionFactory
+    autowire: true
+    public: true
diff --git a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_factory.yml b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_factory.yml
index 35f5b0a3b422b..e7fd0a724c55d 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_factory.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_factory.yml
@@ -10,6 +10,7 @@ services:
       - '@prestashop.core.grid.filter.form_factory'
       - '@prestashop.core.hook.dispatcher'
 
+
   prestashop.core.grid.factory.email_logs:
     class: 'PrestaShop\PrestaShop\Core\Grid\GridFactory'
     arguments:
@@ -512,6 +513,14 @@ services:
       - '@prestashop.core.grid.filter.form_factory'
       - '@prestashop.core.hook.dispatcher'
 
+  prestashop.core.grid.grid_factory.feature_value:
+    class: 'PrestaShop\PrestaShop\Core\Grid\GridFactory'
+    arguments:
+      - '@PrestaShop\PrestaShop\Core\Grid\Definition\Factory\FeatureValueGridDefinitionFactory'
+      - '@prestashop.core.grid.data.factory.feature_value'
+      - '@prestashop.core.grid.filter.form_factory'
+      - '@prestashop.core.hook.dispatcher'
+
   prestashop.core.grid.grid_factory.store:
     class: 'PrestaShop\PrestaShop\Core\Grid\GridFactory'
     arguments:
diff --git a/src/PrestaShopBundle/Resources/config/services/core/search.yml b/src/PrestaShopBundle/Resources/config/services/core/search.yml
index afd457ef2e1b5..e4a0fdeedc125 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/search.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/search.yml
@@ -54,3 +54,8 @@ services:
   prestashop.core.search.builder.typed_builder.product_combination_filters_builder:
     class: 'PrestaShop\PrestaShop\Core\Search\Builder\TypedBuilder\ProductCombinationFiltersBuilder'
     tags: [ 'core.typed_filters_builder' ]
+
+  PrestaShop\PrestaShop\Core\Search\Builder\TypedBuilder\FeatureValueFiltersBuilder:
+    tags: [ 'core.typed_filters_builder' ]
+    arguments:
+      - '@=service("prestashop.adapter.legacy.context").getContext().language.id'
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/index.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/index.html.twig
index 5f7961975373d..1ab16f878f709 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/index.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/index.html.twig
@@ -28,19 +28,15 @@
 {% import '@PrestaShop/Admin/macros.html.twig' as ps %}
 
 {% block content %}
-  Todo: render grid.
-{#  {{ ps.infotip(settingsTipMessage, true) }}#}
-{#  {% block feature_group_showcase_card %}#}
-{#      {% include '@PrestaShop/Admin/Sell/Catalog/Features/Blocks/showcase_card.html.twig' %}#}
-{#  {% endblock %}#}
-{#  {% block features_listing %}#}
-{#    {% include '@PrestaShop/Admin/Common/Grid/grid_panel.html.twig' with {'grid': featureGrid} %}#}
-{#  {% endblock %}#}
+  {% block feature_values_listing %}
+    {% include '@PrestaShop/Admin/Common/Grid/grid_panel.html.twig' with {'grid': featureValueGrid} %}
+  {% endblock %}
 {% endblock %}
 
 {% block javascripts %}
-{#  {{ parent() }}#}
+  {{ parent() }}
 
-{#  <script src="{{ asset('themes/default/js/bundle/pagination.js') }}"></script>#}
-{#  <script src="{{ asset('themes/new-theme/public/feature.bundle.js') }}"></script>#}
+  <script src="{{ asset('themes/default/js/bundle/pagination.js') }}"></script>
+
+{#@todo: uncomment when feature_value.bundle.js is ready  <script src="{{ asset('themes/new-theme/public/feature.bundle.js') }}"></script>#}
 {% endblock %}

From 0257b3f0c94bb398ae1f7303bf894924a239a38e Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Wed, 26 Apr 2023 16:42:38 +0300
Subject: [PATCH 0207/1030]  enable js and implement custom search action

---
 admin-dev/themes/new-theme/.webpack/common.js |  1 +
 .../js/pages/feature/feature-value/index.ts   | 45 +++++++++++++
 .../FeatureValueGridDefinitionFactory.php     | 64 +------------------
 .../Sell/Catalog/FeatureValueController.php   | 54 +++++++++++-----
 .../admin/sell/catalog/feature_value.yml      |  6 +-
 .../Features/FeatureValue/index.html.twig     |  3 +-
 .../Service/Grid/ResponseBuilder.php          |  5 +-
 7 files changed, 92 insertions(+), 86 deletions(-)
 create mode 100644 admin-dev/themes/new-theme/js/pages/feature/feature-value/index.ts

diff --git a/admin-dev/themes/new-theme/.webpack/common.js b/admin-dev/themes/new-theme/.webpack/common.js
index ac85cc159da6c..d3ac61712cd76 100644
--- a/admin-dev/themes/new-theme/.webpack/common.js
+++ b/admin-dev/themes/new-theme/.webpack/common.js
@@ -77,6 +77,7 @@ module.exports = {
     employee_form: './js/pages/employee/form',
     error: './js/pages/error',
     feature: './js/pages/feature',
+    feature_value: './js/pages/feature/feature-value',
     feature_flag: './js/pages/feature-flag/index',
     feature_form: './js/pages/feature/form',
     form_popover_error: './js/components/form/form-popover-error',
diff --git a/admin-dev/themes/new-theme/js/pages/feature/feature-value/index.ts b/admin-dev/themes/new-theme/js/pages/feature/feature-value/index.ts
new file mode 100644
index 0000000000000..a0b8d85b1233f
--- /dev/null
+++ b/admin-dev/themes/new-theme/js/pages/feature/feature-value/index.ts
@@ -0,0 +1,45 @@
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+import ExportToSqlManagerExtension from '@components/grid/extension/export-to-sql-manager-extension';
+import FiltersResetExtension from '@components/grid/extension/filters-reset-extension';
+import FiltersSubmitButtonEnablerExtension from '@components/grid/extension/filters-submit-button-enabler-extension';
+import Grid from '@components/grid/grid';
+import ReloadListActionExtension from '@components/grid/extension/reload-list-extension';
+import SortingExtension from '@components/grid/extension/sorting-extension';
+import SubmitRowActionExtension from '@components/grid/extension/action/row/submit-row-action-extension';
+
+const {$} = window;
+
+$(() => {
+  const grid = new Grid('feature_value');
+
+  grid.addExtension(new ExportToSqlManagerExtension());
+  grid.addExtension(new FiltersResetExtension());
+  grid.addExtension(new FiltersSubmitButtonEnablerExtension());
+  grid.addExtension(new ReloadListActionExtension());
+  grid.addExtension(new SortingExtension());
+  grid.addExtension(new SubmitRowActionExtension());
+});
diff --git a/src/Core/Grid/Definition/Factory/FeatureValueGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/FeatureValueGridDefinitionFactory.php
index 0c7cbe1e35e3b..90a1f25b7dde3 100644
--- a/src/Core/Grid/Definition/Factory/FeatureValueGridDefinitionFactory.php
+++ b/src/Core/Grid/Definition/Factory/FeatureValueGridDefinitionFactory.php
@@ -106,11 +106,6 @@ protected function getName(): string
     protected function getColumns(): ColumnCollectionInterface
     {
         return (new ColumnCollection())
-//            ->add((new BulkActionColumn('bulk'))
-//            ->setOptions([
-//                'bulk_field' => 'id_feature',
-//            ])
-//            )
             ->add((new DataColumn('id_feature_value'))
             ->setName($this->trans('ID', [], 'Admin.Global'))
             ->setOptions([
@@ -122,62 +117,10 @@ protected function getColumns(): ColumnCollectionInterface
             ->setOptions([
                 'field' => 'value',
             ])
-//            )
-//            ->add((new DataColumn('values_count'))
-//            ->setName($this->trans('Values', [], 'Admin.Catalog.Feature'))
-//            ->setOptions([
-//                'field' => 'values_count',
-//            ])
-//            )
-//            // @todo: position action is not implemented yet
-//            //        Uncomment Position column and delete position DataColumn when its done.
-//            ->add((new DataColumn('position'))
-//            ->setName($this->trans('Position', [], 'Admin.Global'))
-//            ->setOptions(['field' => 'position'])
-//            )
-//            ->add((new PositionColumn('position'))
-//            ->setName($this->trans('Position', [], 'Admin.Global'))
-//            ->setOptions([
-//                'id_field' => 'id_feature',
-//                'position_field' => 'position',
-//                'update_method' => 'POST',
-//                'update_route' => 'admin_features_update_position',
-//            ])
             )
             ->add((new ActionColumn('actions'))
             ->setName($this->trans('Actions', [], 'Admin.Global'))
-//            ->setOptions([
-//                'actions' => (new RowActionCollection())
-//                    // @todo: view action is not implemented yet
-//                    // ->add((new LinkRowAction('view'))
-//                    // ->setName($this->trans('View', [], 'Admin.Actions'))
-//                    // ->setIcon('zoom_in')
-//                    // ->setOptions([
-//                    // 'route' => 'admin_features_view',
-//                    // 'route_param_name' => 'featureId',
-//                    // 'route_param_field' => 'id_feature',
-//                    // 'clickable_row' => true,
-//                    // ])
-//                    // )
-//                    ->add((new LinkRowAction('edit'))
-//                    ->setName($this->trans('Edit', [], 'Admin.Actions'))
-//                    ->setIcon('edit')
-//                    ->setOptions([
-//                        'route' => 'admin_features_edit',
-//                        'route_param_name' => 'featureId',
-//                        'route_param_field' => 'id_feature',
-//                    ])
-//                    ),
-//                // @todo: delete aciton is not implemented yet
-//                // ->add(
-//                // $this->buildDeleteAction(
-//                // 'admin_features_delete',
-//                // 'featureId',
-//                // 'id_feature',
-//                // Request::METHOD_DELETE
-//                // )
-//                // ),
-//            ])
+            // @todo: actions will be added in dedicated PR
             );
     }
 
@@ -263,10 +206,7 @@ protected function getFilters(): FilterCollectionInterface
      */
     protected function getBulkActions(): BulkActionCollectionInterface
     {
+        // @todo: bulk actions will be added in dedicated PR
         return new BulkActionCollection();
-        // @todo: bulk delete action is not implemented yet
-        // return (new BulkActionCollection())
-        // ->add($this->buildBulkDeleteAction('admin_features_bulk_delete'))
-        // ;
     }
 }
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
index 4b3bed889528f..29e0c91dd5460 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
@@ -28,9 +28,13 @@
 
 namespace PrestaShopBundle\Controller\Admin\Sell\Catalog;
 
+use PrestaShop\PrestaShop\Core\Grid\Definition\Factory\FeatureValueGridDefinitionFactory;
+use PrestaShop\PrestaShop\Core\Search\Builder\TypedBuilder\FeatureValueFiltersBuilder;
 use PrestaShop\PrestaShop\Core\Search\Filters\FeatureValueFilters;
 use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
 use PrestaShopBundle\Security\Annotation\AdminSecurity;
+use PrestaShopBundle\Service\Grid\ResponseBuilder;
+use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -41,34 +45,54 @@ class FeatureValueController extends FrameworkBundleAdminController
      */
     public function indexAction(Request $request, FeatureValueFilters $filters): Response
     {
-        //@todo: render grid
+        $featureId = $filters->getFeatureId();
         $featureValueGridFactory = $this->get('prestashop.core.grid.grid_factory.feature_value');
         $grid = $featureValueGridFactory->getGrid($filters, [
-            'feature_id' => $filters->getFeatureId(),
+            'feature_id' => $featureId,
             'language_id' => $filters->getLanguageId(),
         ]);
-//
-//        $showcaseCardIsClosed = $this->getQueryBus()->handle(
-//            new GetShowcaseCardIsClosed(
-//                (int) $this->getContext()->employee->id,
-//                ShowcaseCard::FEATURES_CARD
-//            )
-//        );
 
         return $this->render('@PrestaShop/Admin/Sell/Catalog/Features/FeatureValue/index.html.twig', [
             'enableSidebar' => true,
             'help_link' => $this->generateSidebarLink($request->attributes->get('_legacy_controller')),
             'featureValueGrid' => $this->presentGrid($grid),
-            //            'settingsTipMessage' => $this->getSettingsTipMessage(),
-            //            'showcaseCardName' => ShowcaseCard::FEATURES_CARD,
-            //            'isShowcaseCardClosed' => $showcaseCardIsClosed,
+            // @todo: uncomment when add action is migrated
             //            'layoutHeaderToolbarBtn' => [
-            //                'add_feature' => [
-            //                    'href' => $this->generateUrl('admin_features_add'),
-            //                    'desc' => $this->trans('Add new feature', 'Admin.Catalog.Feature'),
+            //                'add_feature_value' => [
+            //                    'href' => $this->generateUrl('admin_feature_values_add', ['featureId' => $featureId]),
+            //                    'desc' => $this->trans('Add new feature value', 'Admin.Catalog.Feature'),
             //                    'icon' => 'add_circle_outline',
             //                ],
             //            ],
         ]);
     }
+
+    /**
+     * @AdminSecurity("is_granted('read', request.get('_legacy_controller'))")
+     *
+     * @return RedirectResponse
+     */
+    public function searchAction(Request $request, FeatureValueFilters $filters): RedirectResponse
+    {
+        /** @var ResponseBuilder $responseBuilder */
+        $responseBuilder = $this->get('prestashop.bundle.grid.response_builder');
+        /** @var FeatureValueFiltersBuilder $featureValueFiltersBuilder */
+        $featureValueFiltersBuilder = $this->get(FeatureValueFiltersBuilder::class);
+        /** @var FeatureValueGridDefinitionFactory $gridDefinitionFactory */
+        $gridDefinitionFactory = $this->get(FeatureValueGridDefinitionFactory::class);
+        /* @var FeatureValueFilters $filters */
+//        $filters = $featureValueFiltersBuilder->buildFilters(new FeatureValueFilters($request->request->all()));
+
+        return $responseBuilder->buildSearchResponse(
+            $gridDefinitionFactory,
+            $request,
+            FeatureValueGridDefinitionFactory::GRID_ID,
+            'admin_feature_values_index',
+            ['featureId'],
+            [
+                'feature_id' => $filters->getFeatureId(),
+                'language_id' => $filters->getLanguageId(),
+            ]
+        );
+    }
 }
diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/feature_value.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/feature_value.yml
index b9e2b6cd2f389..84dac5db086d3 100644
--- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/feature_value.yml
+++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/feature_value.yml
@@ -13,13 +13,9 @@ admin_feature_values_search:
   path: /
   methods: [ POST ]
   defaults:
-    _controller: PrestaShopBundle\Controller\Admin\CommonController::searchGridAction
+    _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureValueController::searchAction
     _legacy_controller: AdminFeatures
     _legacy_link: AdminFeatures
     _legacy_feature_flag: feature
-    gridDefinitionFactoryServiceId: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\FeatureGridDefinitionFactory
-    redirectRoute: admin_feature_values_index
-    redirectQueryParamsToKeep:
-      - featureId
   requirements:
     featureId: \d+
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/index.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/index.html.twig
index 1ab16f878f709..4d39fb1ab1d38 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/index.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/index.html.twig
@@ -37,6 +37,5 @@
   {{ parent() }}
 
   <script src="{{ asset('themes/default/js/bundle/pagination.js') }}"></script>
-
-{#@todo: uncomment when feature_value.bundle.js is ready  <script src="{{ asset('themes/new-theme/public/feature.bundle.js') }}"></script>#}
+  <script src="{{ asset('themes/new-theme/public/feature_value.bundle.js') }}"></script>
 {% endblock %}
diff --git a/src/PrestaShopBundle/Service/Grid/ResponseBuilder.php b/src/PrestaShopBundle/Service/Grid/ResponseBuilder.php
index 133d11cc59577..229a01473f8e8 100644
--- a/src/PrestaShopBundle/Service/Grid/ResponseBuilder.php
+++ b/src/PrestaShopBundle/Service/Grid/ResponseBuilder.php
@@ -93,10 +93,11 @@ public function buildSearchResponse(
         Request $request,
         $filterId,
         $redirectRoute,
-        array $queryParamsToKeep = []
+        array $queryParamsToKeep = [],
+        array $gridOptions = []
     ) {
         /** @var GridDefinitionInterface $definition */
-        $definition = $definitionFactory->getDefinition();
+        $definition = $definitionFactory->getDefinition($gridOptions);
 
         /** @var FormInterface $filtersForm */
         $filtersForm = $this->filterFormFactory->create($definition);

From 4dd957bef9f104545252c9bc249a5417cf27068c Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Wed, 26 Apr 2023 19:38:23 +0300
Subject: [PATCH 0208/1030]  remove bc breaks and introduce the custom grid
 definition factory instead

---
 ...tractConfigurableGridDefinitionFactory.php |  33 ----
 .../Factory/AbstractGridDefinitionFactory.php |  21 ++-
 ...igurableGridDefinitionFactoryInterface.php |  36 -----
 .../FeatureValueGridDefinitionFactory.php     |  70 +++------
 .../GridDefinitionFactoryInterface.php        |   2 +-
 .../Factory/CategoryGridFactoryDecorator.php  |   2 +-
 .../Grid/Factory/FeatureValueGridFactory.php  | 124 +++++++++++++++
 src/Core/Grid/GridFactory.php                 |  14 +-
 src/Core/Grid/GridFactoryInterface.php        |   2 +-
 .../Sell/Catalog/FeatureValueController.php   |  43 +-----
 .../admin/sell/catalog/feature_value.yml      |   6 +-
 .../core/grid/grid_definition_factory.yml     | 142 +++++++++---------
 .../services/core/grid/grid_factory.yml       |  12 +-
 .../Service/Grid/ResponseBuilder.php          |   8 +-
 14 files changed, 250 insertions(+), 265 deletions(-)
 delete mode 100644 src/Core/Grid/Definition/Factory/AbstractConfigurableGridDefinitionFactory.php
 delete mode 100644 src/Core/Grid/Definition/Factory/ConfigurableGridDefinitionFactoryInterface.php
 create mode 100644 src/Core/Grid/Factory/FeatureValueGridFactory.php

diff --git a/src/Core/Grid/Definition/Factory/AbstractConfigurableGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/AbstractConfigurableGridDefinitionFactory.php
deleted file mode 100644
index e2e1e072d3de5..0000000000000
--- a/src/Core/Grid/Definition/Factory/AbstractConfigurableGridDefinitionFactory.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-declare(strict_types=1);
-
-namespace PrestaShop\PrestaShop\Core\Grid\Definition\Factory;
-
-abstract class AbstractConfigurableGridDefinitionFactory extends AbstractFilterableGridDefinitionFactory implements ConfigurableGridDefinitionFactoryInterface
-{
-}
diff --git a/src/Core/Grid/Definition/Factory/AbstractGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/AbstractGridDefinitionFactory.php
index 917e9e23abda7..8b3091f486508 100644
--- a/src/Core/Grid/Definition/Factory/AbstractGridDefinitionFactory.php
+++ b/src/Core/Grid/Definition/Factory/AbstractGridDefinitionFactory.php
@@ -34,6 +34,7 @@
 use PrestaShop\PrestaShop\Core\Grid\Action\ViewOptionsCollectionInterface;
 use PrestaShop\PrestaShop\Core\Grid\Column\ColumnCollectionInterface;
 use PrestaShop\PrestaShop\Core\Grid\Definition\GridDefinition;
+use PrestaShop\PrestaShop\Core\Grid\Definition\GridDefinitionInterface;
 use PrestaShop\PrestaShop\Core\Grid\Filter\FilterCollection;
 use PrestaShop\PrestaShop\Core\Grid\Filter\FilterCollectionInterface;
 use PrestaShop\PrestaShop\Core\Hook\HookDispatcherInterface;
@@ -63,12 +64,8 @@ public function __construct(HookDispatcherInterface $hookDispatcher)
     /**
      * {@inheritdoc}
      */
-    final public function getDefinition(array $options = [])
+    public function getDefinition(): GridDefinitionInterface
     {
-        if ($this instanceof ConfigurableGridDefinitionFactoryInterface) {
-            $this->configureOptions($options);
-        }
-
         $definition = new GridDefinition(
             $this->getId(),
             $this->getName(),
@@ -91,21 +88,21 @@ final public function getDefinition(array $options = [])
      *
      * @return string
      */
-    abstract protected function getId();
+    abstract protected function getId(): string;
 
     /**
      * Get translated grid name.
      *
      * @return string
      */
-    abstract protected function getName();
+    abstract protected function getName(): string;
 
     /**
      * Get defined columns for grid.
      *
      * @return ColumnCollectionInterface
      */
-    abstract protected function getColumns();
+    abstract protected function getColumns(): ColumnCollectionInterface;
 
     /**
      * Get defined grid actions.
@@ -113,7 +110,7 @@ abstract protected function getColumns();
      *
      * @return GridActionCollectionInterface
      */
-    protected function getGridActions()
+    protected function getGridActions(): GridActionCollectionInterface
     {
         return new GridActionCollection();
     }
@@ -124,7 +121,7 @@ protected function getGridActions()
      *
      * @return BulkActionCollectionInterface
      */
-    protected function getBulkActions()
+    protected function getBulkActions(): BulkActionCollectionInterface
     {
         return new BulkActionCollection();
     }
@@ -135,7 +132,7 @@ protected function getBulkActions()
      *
      * @return ViewOptionsCollectionInterface
      */
-    protected function getViewOptions()
+    protected function getViewOptions(): ViewOptionsCollectionInterface
     {
         return new ViewOptionsCollection();
     }
@@ -146,7 +143,7 @@ protected function getViewOptions()
      *
      * @return FilterCollectionInterface
      */
-    protected function getFilters()
+    protected function getFilters(): FilterCollectionInterface
     {
         return new FilterCollection();
     }
diff --git a/src/Core/Grid/Definition/Factory/ConfigurableGridDefinitionFactoryInterface.php b/src/Core/Grid/Definition/Factory/ConfigurableGridDefinitionFactoryInterface.php
deleted file mode 100644
index ea89c828a0fae..0000000000000
--- a/src/Core/Grid/Definition/Factory/ConfigurableGridDefinitionFactoryInterface.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-declare(strict_types=1);
-
-namespace PrestaShop\PrestaShop\Core\Grid\Definition\Factory;
-
-/**
- * This interface allows to configure grid definition with options during runtime
- */
-interface ConfigurableGridDefinitionFactoryInterface extends FilterableGridDefinitionFactoryInterface
-{
-    public function configureOptions(array $options): void;
-}
diff --git a/src/Core/Grid/Definition/Factory/FeatureValueGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/FeatureValueGridDefinitionFactory.php
index 90a1f25b7dde3..3ed93ffc139df 100644
--- a/src/Core/Grid/Definition/Factory/FeatureValueGridDefinitionFactory.php
+++ b/src/Core/Grid/Definition/Factory/FeatureValueGridDefinitionFactory.php
@@ -27,9 +27,6 @@
 
 namespace PrestaShop\PrestaShop\Core\Grid\Definition\Factory;
 
-use PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureRepository;
-use PrestaShop\PrestaShop\Core\Domain\Feature\ValueObject\FeatureId;
-use PrestaShop\PrestaShop\Core\Domain\Language\ValueObject\LanguageId;
 use PrestaShop\PrestaShop\Core\Grid\Action\Bulk\BulkActionCollection;
 use PrestaShop\PrestaShop\Core\Grid\Action\Bulk\BulkActionCollectionInterface;
 use PrestaShop\PrestaShop\Core\Grid\Action\GridActionCollection;
@@ -40,44 +37,33 @@
 use PrestaShop\PrestaShop\Core\Grid\Column\ColumnCollectionInterface;
 use PrestaShop\PrestaShop\Core\Grid\Column\Type\Common\ActionColumn;
 use PrestaShop\PrestaShop\Core\Grid\Column\Type\Common\DataColumn;
+use PrestaShop\PrestaShop\Core\Grid\Definition\GridDefinition;
+use PrestaShop\PrestaShop\Core\Grid\Definition\GridDefinitionInterface;
+use PrestaShop\PrestaShop\Core\Grid\Factory\FeatureValueGridFactory;
 use PrestaShop\PrestaShop\Core\Grid\Filter\Filter;
 use PrestaShop\PrestaShop\Core\Grid\Filter\FilterCollection;
 use PrestaShop\PrestaShop\Core\Grid\Filter\FilterCollectionInterface;
-use PrestaShop\PrestaShop\Core\Hook\HookDispatcherInterface;
-use PrestaShopBundle\Form\Admin\Type\SearchAndResetType;
 use Symfony\Component\Form\Extension\Core\Type\NumberType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
-use Symfony\Component\OptionsResolver\OptionsResolver;
 
-class FeatureValueGridDefinitionFactory extends AbstractConfigurableGridDefinitionFactory
+/**
+ * @see FeatureValueGridFactory - it modifies grid definition to adapt values which depends on request filters (like name and some filter columns)
+ */
+class FeatureValueGridDefinitionFactory extends AbstractFilterableGridDefinitionFactory
 {
     public const GRID_ID = 'feature_value';
 
-    protected $options = [];
-
-    /**
-     * @var FeatureRepository
-     */
-    private $featureRepository;
-
-    public function __construct(
-        HookDispatcherInterface $hookDispatcher,
-        FeatureRepository $featureRepository
-    ) {
-        parent::__construct($hookDispatcher);
-        $this->featureRepository = $featureRepository;
-    }
-
-    public function configureOptions(array $options): void
+    public function getDefinition(): GridDefinitionInterface
     {
-        $optionsResolver = new OptionsResolver();
-        $optionsResolver
-            ->setRequired(['feature_id', 'language_id'])
-            ->setAllowedTypes('feature_id', 'int')
-            ->setAllowedTypes('language_id', 'int')
-        ;
-
-        $this->options = $optionsResolver->resolve($options);
+        return new GridDefinition(
+            $this->getId(),
+            $this->getName(),
+            $this->getColumns(),
+            $this->getFilters(),
+            $this->getGridActions(),
+            $this->getBulkActions(),
+            $this->getViewOptions()
+        );
     }
 
     /**
@@ -93,11 +79,8 @@ protected function getId(): string
      */
     protected function getName(): string
     {
-        //@todo: repository should be wrapped in interface (should be clear after ADR https://github.com/PrestaShop/ADR/pull/33 is finished)
-        return $this->featureRepository->getFeatureName(
-            new FeatureId($this->options['feature_id']),
-            new LanguageId($this->options['language_id'])
-        );
+        // the name is overriden in FeatureValueGridFactory to be the dynamic Feature name instead
+        return 'Features';
     }
 
     /**
@@ -166,6 +149,7 @@ protected function getGridActions(): GridActionCollectionInterface
      */
     protected function getFilters(): FilterCollectionInterface
     {
+        // some filters (which depends on request filters) are added inside FeatureValueGridFactory
         return (new FilterCollection())
             ->add((new Filter('id_feature_value', NumberType::class))
             ->setTypeOptions([
@@ -184,20 +168,6 @@ protected function getFilters(): FilterCollectionInterface
                 ],
             ])
             ->setAssociatedColumn('value')
-            )
-            ->add((new Filter('actions', SearchAndResetType::class))
-            ->setAssociatedColumn('actions')
-            ->setTypeOptions([
-                'reset_route' => 'admin_common_reset_search_by_filter_id',
-                'reset_route_params' => [
-                    'filterId' => self::GRID_ID,
-                ],
-                'redirect_route' => 'admin_feature_values_index',
-                'redirect_route_params' => [
-                    'featureId' => $this->options['feature_id'],
-                ],
-            ])
-            ->setAssociatedColumn('actions')
             );
     }
 
diff --git a/src/Core/Grid/Definition/Factory/GridDefinitionFactoryInterface.php b/src/Core/Grid/Definition/Factory/GridDefinitionFactoryInterface.php
index fa93ab555d47f..eacd347edfbee 100644
--- a/src/Core/Grid/Definition/Factory/GridDefinitionFactoryInterface.php
+++ b/src/Core/Grid/Definition/Factory/GridDefinitionFactoryInterface.php
@@ -38,5 +38,5 @@ interface GridDefinitionFactoryInterface
      *
      * @return GridDefinitionInterface
      */
-    public function getDefinition(array $options = []);
+    public function getDefinition();
 }
diff --git a/src/Core/Grid/Factory/CategoryGridFactoryDecorator.php b/src/Core/Grid/Factory/CategoryGridFactoryDecorator.php
index 0f724843596e4..0ba9e65c99dfc 100644
--- a/src/Core/Grid/Factory/CategoryGridFactoryDecorator.php
+++ b/src/Core/Grid/Factory/CategoryGridFactoryDecorator.php
@@ -67,7 +67,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function getGrid(SearchCriteriaInterface $searchCriteria, array $options = [])
+    public function getGrid(SearchCriteriaInterface $searchCriteria)
     {
         $categoryGrid = $this->categoryGridFactory->getGrid($searchCriteria);
 
diff --git a/src/Core/Grid/Factory/FeatureValueGridFactory.php b/src/Core/Grid/Factory/FeatureValueGridFactory.php
new file mode 100644
index 0000000000000..8068d1c3a00f2
--- /dev/null
+++ b/src/Core/Grid/Factory/FeatureValueGridFactory.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Grid\Factory;
+
+use PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureRepository;
+use PrestaShop\PrestaShop\Core\Domain\Feature\ValueObject\FeatureId;
+use PrestaShop\PrestaShop\Core\Domain\Language\ValueObject\LanguageId;
+use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
+use PrestaShop\PrestaShop\Core\Grid\Data\Factory\GridDataFactoryInterface;
+use PrestaShop\PrestaShop\Core\Grid\Definition\Factory\GridDefinitionFactoryInterface;
+use PrestaShop\PrestaShop\Core\Grid\Definition\GridDefinition;
+use PrestaShop\PrestaShop\Core\Grid\Filter\Filter;
+use PrestaShop\PrestaShop\Core\Grid\Filter\GridFilterFormFactoryInterface;
+use PrestaShop\PrestaShop\Core\Grid\Grid;
+use PrestaShop\PrestaShop\Core\Grid\GridFactory;
+use PrestaShop\PrestaShop\Core\Grid\Search\SearchCriteriaInterface;
+use PrestaShop\PrestaShop\Core\Hook\HookDispatcherInterface;
+use PrestaShop\PrestaShop\Core\Search\Filters\FeatureValueFilters;
+use PrestaShopBundle\Form\Admin\Type\SearchAndResetType;
+use Symfony\Component\DependencyInjection\Container;
+
+/**
+ * This class allows adapting the feature value grid definition with dynamic values
+ * which depends on values inside search filters (the name and actions that needs featureId and/or languageId)
+ */
+class FeatureValueGridFactory extends GridFactory
+{
+    /**
+     * @var FeatureRepository
+     */
+    private $featureRepository;
+
+    public function __construct(
+        GridDefinitionFactoryInterface $definitionFactory,
+        GridDataFactoryInterface $dataFactory,
+        GridFilterFormFactoryInterface $filterFormFactory,
+        HookDispatcherInterface $hookDispatcher,
+        FeatureRepository $featureRepository
+    ) {
+        parent::__construct($definitionFactory, $dataFactory, $filterFormFactory, $hookDispatcher);
+        $this->featureRepository = $featureRepository;
+    }
+
+    public function getGrid(SearchCriteriaInterface $searchCriteria)
+    {
+        if (!$searchCriteria instanceof FeatureValueFilters) {
+            throw new InvalidArgumentException(sprintf('Invalid search criteria. Expected "%s"', FeatureValueFilters::class));
+        }
+
+        /** @var GridDefinition $definition */
+        $definition = $this->definitionFactory->getDefinition();
+        $this->modifyDefinition($definition, $searchCriteria);
+
+        $this->hookDispatcher->dispatchWithParameters('action' . Container::camelize($definition->getId()) . 'GridDefinitionModifier', [
+            'definition' => $definition,
+        ]);
+
+        $data = $this->dataFactory->getData($searchCriteria);
+
+        $this->hookDispatcher->dispatchWithParameters('action' . Container::camelize($definition->getId()) . 'GridDataModifier', [
+            'data' => &$data,
+        ]);
+
+        $filterForm = $this->filterFormFactory->create($definition);
+        $filterForm->setData($searchCriteria->getFilters());
+
+        return new Grid(
+            $definition,
+            $data,
+            $searchCriteria,
+            $filterForm
+        );
+    }
+
+    private function modifyDefinition(GridDefinition $definition, FeatureValueFilters $featureValueFilters): void
+    {
+        $definition->setName($this->featureRepository->getFeatureName(
+            new FeatureId($featureValueFilters->getFeatureId()),
+            new LanguageId($featureValueFilters->getLanguageId())
+        ));
+
+        $definition->getFilters()->add((new Filter('actions', SearchAndResetType::class))
+            // action options are added in FeatureValueGridFactory, because they are dynamic and depend on filters
+            ->setAssociatedColumn('actions')
+            ->setAssociatedColumn('actions')
+            ->setTypeOptions([
+                'reset_route' => 'admin_common_reset_search_by_filter_id',
+                'reset_route_params' => [
+                    'filterId' => $definition->getId(),
+                ],
+                'redirect_route' => 'admin_feature_values_index',
+                'redirect_route_params' => [
+                    'featureId' => $featureValueFilters->getFeatureId(),
+                ],
+            ])
+        );
+    }
+}
diff --git a/src/Core/Grid/GridFactory.php b/src/Core/Grid/GridFactory.php
index bca74ac3dcd73..9ecab667f412e 100644
--- a/src/Core/Grid/GridFactory.php
+++ b/src/Core/Grid/GridFactory.php
@@ -36,27 +36,27 @@
 /**
  * Class GridFactory is responsible for creating final Grid instance.
  */
-final class GridFactory implements GridFactoryInterface
+class GridFactory implements GridFactoryInterface
 {
     /**
      * @var GridDefinitionFactoryInterface
      */
-    private $definitionFactory;
+    protected $definitionFactory;
 
     /**
      * @var GridDataFactoryInterface
      */
-    private $dataFactory;
+    protected $dataFactory;
 
     /**
      * @var GridFilterFormFactoryInterface
      */
-    private $filterFormFactory;
+    protected $filterFormFactory;
 
     /**
      * @var HookDispatcherInterface
      */
-    private $hookDispatcher;
+    protected $hookDispatcher;
 
     /**
      * @param GridDefinitionFactoryInterface $definitionFactory
@@ -79,9 +79,9 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function getGrid(SearchCriteriaInterface $searchCriteria, array $options = [])
+    public function getGrid(SearchCriteriaInterface $searchCriteria)
     {
-        $definition = $this->definitionFactory->getDefinition($options);
+        $definition = $this->definitionFactory->getDefinition();
         $data = $this->dataFactory->getData($searchCriteria);
 
         $this->hookDispatcher->dispatchWithParameters('action' . Container::camelize($definition->getId()) . 'GridDataModifier', [
diff --git a/src/Core/Grid/GridFactoryInterface.php b/src/Core/Grid/GridFactoryInterface.php
index 456d7311ab27d..8f45dfb3cc872 100644
--- a/src/Core/Grid/GridFactoryInterface.php
+++ b/src/Core/Grid/GridFactoryInterface.php
@@ -40,5 +40,5 @@ interface GridFactoryInterface
      *
      * @return GridInterface
      */
-    public function getGrid(SearchCriteriaInterface $searchCriteria, array $options = []);
+    public function getGrid(SearchCriteriaInterface $searchCriteria);
 }
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
index 29e0c91dd5460..03c55e3f521e9 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
@@ -28,13 +28,10 @@
 
 namespace PrestaShopBundle\Controller\Admin\Sell\Catalog;
 
-use PrestaShop\PrestaShop\Core\Grid\Definition\Factory\FeatureValueGridDefinitionFactory;
-use PrestaShop\PrestaShop\Core\Search\Builder\TypedBuilder\FeatureValueFiltersBuilder;
+use PrestaShop\PrestaShop\Core\Grid\Factory\FeatureValueGridFactory;
 use PrestaShop\PrestaShop\Core\Search\Filters\FeatureValueFilters;
 use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
 use PrestaShopBundle\Security\Annotation\AdminSecurity;
-use PrestaShopBundle\Service\Grid\ResponseBuilder;
-use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -45,17 +42,12 @@ class FeatureValueController extends FrameworkBundleAdminController
      */
     public function indexAction(Request $request, FeatureValueFilters $filters): Response
     {
-        $featureId = $filters->getFeatureId();
-        $featureValueGridFactory = $this->get('prestashop.core.grid.grid_factory.feature_value');
-        $grid = $featureValueGridFactory->getGrid($filters, [
-            'feature_id' => $featureId,
-            'language_id' => $filters->getLanguageId(),
-        ]);
+        $featureValueGridFactory = $this->get(FeatureValueGridFactory::class);
 
         return $this->render('@PrestaShop/Admin/Sell/Catalog/Features/FeatureValue/index.html.twig', [
             'enableSidebar' => true,
             'help_link' => $this->generateSidebarLink($request->attributes->get('_legacy_controller')),
-            'featureValueGrid' => $this->presentGrid($grid),
+            'featureValueGrid' => $this->presentGrid($featureValueGridFactory->getGrid($filters)),
             // @todo: uncomment when add action is migrated
             //            'layoutHeaderToolbarBtn' => [
             //                'add_feature_value' => [
@@ -66,33 +58,4 @@ public function indexAction(Request $request, FeatureValueFilters $filters): Res
             //            ],
         ]);
     }
-
-    /**
-     * @AdminSecurity("is_granted('read', request.get('_legacy_controller'))")
-     *
-     * @return RedirectResponse
-     */
-    public function searchAction(Request $request, FeatureValueFilters $filters): RedirectResponse
-    {
-        /** @var ResponseBuilder $responseBuilder */
-        $responseBuilder = $this->get('prestashop.bundle.grid.response_builder');
-        /** @var FeatureValueFiltersBuilder $featureValueFiltersBuilder */
-        $featureValueFiltersBuilder = $this->get(FeatureValueFiltersBuilder::class);
-        /** @var FeatureValueGridDefinitionFactory $gridDefinitionFactory */
-        $gridDefinitionFactory = $this->get(FeatureValueGridDefinitionFactory::class);
-        /* @var FeatureValueFilters $filters */
-//        $filters = $featureValueFiltersBuilder->buildFilters(new FeatureValueFilters($request->request->all()));
-
-        return $responseBuilder->buildSearchResponse(
-            $gridDefinitionFactory,
-            $request,
-            FeatureValueGridDefinitionFactory::GRID_ID,
-            'admin_feature_values_index',
-            ['featureId'],
-            [
-                'feature_id' => $filters->getFeatureId(),
-                'language_id' => $filters->getLanguageId(),
-            ]
-        );
-    }
 }
diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/feature_value.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/feature_value.yml
index 84dac5db086d3..5c1ba1599d18e 100644
--- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/feature_value.yml
+++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/feature_value.yml
@@ -13,9 +13,13 @@ admin_feature_values_search:
   path: /
   methods: [ POST ]
   defaults:
-    _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureValueController::searchAction
+    _controller: PrestaShopBundle\Controller\Admin\CommonController::searchGridAction
+    gridDefinitionFactoryServiceId: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\FeatureValueGridDefinitionFactory
+    redirectRoute: admin_feature_values_index
     _legacy_controller: AdminFeatures
     _legacy_link: AdminFeatures
     _legacy_feature_flag: feature
+    redirectQueryParamsToKeep:
+      - 'featureId'
   requirements:
     featureId: \d+
diff --git a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_definition_factory.yml b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_definition_factory.yml
index 50f3bc20a87ba..5e3a8b45304aa 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_definition_factory.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_definition_factory.yml
@@ -2,57 +2,50 @@ services:
   _defaults:
     public: true
 
-  prestashop.core.grid.definition.factory.abstract_grid_definition:
-    class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory'
+  PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory:
     abstract: true
     arguments:
       - '@prestashop.core.hook.dispatcher'
     calls:
       - [ setTranslator, [ '@translator' ] ]
 
-  PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractConfigurableGridDefinitionFactory:
-    abstract: true
-    autowire: true
-    calls:
-      - [ setTranslator, [ '@translator' ] ]
-
   prestashop.core.grid.definition.factory.logs:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\LogGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     public: true
     arguments:
       - '@=service("prestashop.adapter.legacy.context").getContext().language.date_format_full'
 
   prestashop.core.grid.definition.factory.email_logs:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\EmailLogsDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     public: true
     arguments:
       - '@prestashop.core.form.choice_provider.language_by_id'
 
   prestashop.core.grid.definition.factory.request_sql:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\RequestSqlGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     public: true
 
   prestashop.core.grid.definition.factory.backup:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\BackupDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     public: true
 
   prestashop.core.grid.definition.factory.webservice_key:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\WebserviceKeyDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     public: true
 
   prestashop.core.grid.definition.factory.meta:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\MetaGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     public: true
 
   prestashop.core.grid.definition.factory.category:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CategoryGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     arguments:
       - '@prestashop.adapter.shop.context'
       - '@prestashop.adapter.grid.action.row.accessibility_checker.category_for_view'
@@ -60,17 +53,17 @@ services:
 
   prestashop.core.grid.definition.factory.employee:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\EmployeeGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     public: true
 
   prestashop.core.grid.definition.factory.contacts:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\ContactGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     public: true
 
   prestashop.core.grid.definition.factory.customer:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CustomerGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     arguments:
       - '@=service("prestashop.core.b2b.b2b_feature").isActive()'
       - '@=service("prestashop.adapter.multistore_feature").isActive()'
@@ -80,67 +73,67 @@ services:
 
   prestashop.core.grid.definition.factory.customer.discount:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CustomerDiscountGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     public: true
 
   prestashop.core.grid.definition.factory.customer.address:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CustomerAddressGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     arguments:
       - '@=service("request_stack").getCurrentRequest()'
     public: true
 
   prestashop.core.grid.definition.factory.customer.cart:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CustomerCartGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     arguments:
       - '@=service("prestashop.adapter.legacy.context").getContext().language.date_format_full'
     public: true
 
   prestashop.core.grid.definition.factory.customer.order:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CustomerOrderGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     arguments:
       - '@=service("prestashop.adapter.legacy.context").getContext().language.date_format_full'
     public: true
 
   prestashop.core.grid.definition.factory.customer.bought_product:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CustomerBoughtProductGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     arguments:
       - '@=service("prestashop.adapter.legacy.context").getContext().language.date_format_full'
     public: true
 
   prestashop.core.grid.definition.factory.customer.viewed_product:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CustomerViewedProductGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     arguments:
       - '@=service("prestashop.adapter.legacy.context").getContext().language.date_format_full'
     public: true
 
   prestashop.core.grid.definition.factory.language:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\LanguageGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     public: true
 
   prestashop.core.grid.definition.factory.currency:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CurrencyGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     public: true
 
   prestashop.core.grid.definition.factory.supplier:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\SupplierGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     public: true
 
   prestashop.core.grid.definition.factory.profile:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\ProfileGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     public: true
 
   prestashop.core.grid.definition.factory.cms_page_category:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CmsPageCategoryDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     arguments:
       - '@request_stack'
       - '@prestashop.adapter.shop.context'
@@ -149,22 +142,22 @@ services:
 
   prestashop.core.grid.definition.factory.tax:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\TaxGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     public: true
 
   prestashop.core.grid.definition.factory.manufacturer:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\ManufacturerGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     public: true
 
   prestashop.core.grid.definition.factory.manufacturer_address:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\ManufacturerAddressGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     public: true
 
   prestashop.core.grid.definition.factory.cms_page:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CmsPageDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     arguments:
       - '@prestashop.core.query_bus'
       - '@request_stack'
@@ -174,44 +167,44 @@ services:
 
   prestashop.core.grid.definition.factory.monitoring.empty_category:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\Monitoring\EmptyCategoryGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     arguments:
       - '@prestashop.adapter.grid.action.row.accessibility_checker.category_for_view'
     public: true
 
   prestashop.core.grid.definition.factory.monitoring.no_qty_product_with_combination:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\Monitoring\NoQtyProductWithCombinationGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     public: true
 
   prestashop.core.grid.definition.factory.monitoring.no_qty_product_without_combination:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\Monitoring\NoQtyProductWithoutCombinationGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     public: true
 
   prestashop.core.grid.definition.factory.monitoring.disabled_product:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\Monitoring\DisabledProductGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     public: true
 
   prestashop.core.grid.definition.factory.monitoring.product_without_image:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\Monitoring\ProductWithoutImageGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     public: true
 
   prestashop.core.grid.definition.factory.monitoring.product_without_description:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\Monitoring\ProductWithoutDescriptionGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     public: true
 
   prestashop.core.grid.definition.factory.monitoring.product_without_price:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\Monitoring\ProductWithoutPriceGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     public: true
 
   prestashop.core.grid.definition.factory.order:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\OrderGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     arguments:
       - '@prestashop.adapter.legacy.configuration'
       - '@prestashop.adapter.form.choice_provider.order_countries'
@@ -225,14 +218,14 @@ services:
 
   prestashop.core.grid.definition.factory.cart_rule:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CartRuleGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     public: true
     arguments:
       - '@=service("prestashop.adapter.legacy.context").getContext().language.date_format_full'
 
   prestashop.core.grid.definition.factory.catalog_price_rule:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CatalogPriceRuleGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     arguments:
       - '@request_stack'
       - '@prestashop.adapter.shop.context'
@@ -241,17 +234,17 @@ services:
 
   prestashop.core.grid.definition.factory.order_message:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\OrderMessageGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     public: true
 
   prestashop.core.grid.definition.factory.attachment:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AttachmentGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     public: true
 
   prestashop.core.grid.definition.factory.attribute:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AttributeGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     arguments:
       - '@=service("request_stack").getCurrentRequest().attributes.getInt("attributeGroupId")'
       - '@PrestaShop\PrestaShop\Adapter\AttributeGroup\AttributeGroupViewDataProvider'
@@ -259,48 +252,48 @@ services:
 
   prestashop.core.grid.definition.factory.attribute_group:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AttributeGroupGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     public: true
 
   prestashop.core.grid.definition.factory.merchandise_return:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\MerchandiseReturnGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     public: true
 
   prestashop.core.grid.definition.factory.tax_rules_group:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\TaxRulesGroupGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     public: true
 
   prestashop.core.grid.definition.factory.address:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AddressGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     public: true
 
   prestashop.core.grid.definition.factory.credit_slip:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CreditSlipGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     arguments:
       - '@=service("prestashop.adapter.legacy.context").getLanguage().date_format_lite'
     public: true
 
   prestashop.core.grid.definition.factory.order_states:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\OrderStatesGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     arguments:
       - '@prestashop.core.grid.action.row.accessibility_checker.delete_order_states'
     public: true
 
   prestashop.core.grid.definition.factory.order_return_states:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\OrderReturnStatesGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     arguments:
       - '@prestashop.core.grid.action.row.accessibility_checker.delete_order_return_states'
     public: true
 
   prestashop.core.grid.definition.factory.outstanding:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\OutstandingGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     arguments:
       - '@prestashop.adapter.legacy.configuration'
       - "@=service('prestashop.adapter.legacy.context').getContext().language.id"
@@ -309,27 +302,27 @@ services:
 
   prestashop.core.grid.definition.factory.carrier:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CarrierGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     public: true
 
   prestashop.core.grid.definition.factory.zone:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\ZoneGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     public: true
 
   prestashop.core.grid.definition.factory.country:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CountryGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     public: true
 
   prestashop.core.grid.definition.factory.search_engines:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\SearchEngineGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     public: true
 
   prestashop.core.grid.definition.factory.product:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\ProductGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     arguments:
       - '@prestashop.adapter.legacy.configuration'
       - '@PrestaShop\PrestaShop\Adapter\Feature\MultistoreFeature'
@@ -346,28 +339,28 @@ services:
 
   prestashop.core.grid.definition.factory.product_light:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\ProductLightGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     arguments:
       - '@prestashop.adapter.legacy.configuration'
     public: true
 
   prestashop.core.grid.definition.factory.security.session.employee:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\Security\Session\EmployeeGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     arguments:
       - '@=service("prestashop.adapter.legacy.context").getContext().language.date_format_full'
     public: true
 
   prestashop.core.grid.definition.factory.security.session.customer:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\Security\Session\CustomerGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     arguments:
       - '@=service("prestashop.adapter.legacy.context").getContext().language.date_format_full'
     public: true
 
   prestashop.core.grid.definition.factory.state:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\StateGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     arguments:
       - "@=service('router').generate('admin_common_reset_search', {'controller': 'state', 'action': 'index'})"
       - "@=service('router').generate('admin_states_index')"
@@ -375,14 +368,14 @@ services:
 
   prestashop.core.grid.definition.factory.title:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\TitleGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     arguments:
       - '@prestashop.core.form.choice_provider.gender_choice_provider'
     public: true
 
   prestashop.core.grid.definition.factory.customer_thread:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CustomerThreadGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     arguments:
       - '@prestashop.core.form.choice_provider.contact_type_choice_provider'
       - '@prestashop.adapter.form.choice_provider.shop_name_by_id'
@@ -391,37 +384,42 @@ services:
 
   PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AuthorizedApplicationGridDefinitionFactory:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AuthorizedApplicationGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     public: false
     autowire: true
 
   prestashop.core.grid.definition.factory.customer_groups:
     class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CustomerGroupsGridDefinitionFactory'
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     public: true
 
   PrestaShop\PrestaShop\Core\Grid\Definition\Factory\TaxRuleGridDefinitionFactory:
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     public: false
     autowire: true
 
   PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AliasGridDefinitionFactory:
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     public: false
     autowire: true
 
   PrestaShop\PrestaShop\Core\Grid\Definition\Factory\FeatureGridDefinitionFactory:
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     autowire: true
     # must remain public to be accessed by CommonController:searchGridAction
     public: true
 
   PrestaShop\PrestaShop\Core\Grid\Definition\Factory\StoreGridDefinitionFactory:
-    parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition'
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     public: true
     autowire: true
 
   PrestaShop\PrestaShop\Core\Grid\Definition\Factory\FeatureValueGridDefinitionFactory:
-    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractConfigurableGridDefinitionFactory
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
     autowire: true
     public: true
+
+  # deprecated services
+  prestashop.core.grid.definition.factory.abstract_grid_definition:
+    alias: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
+    deprecated: ~
diff --git a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_factory.yml b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_factory.yml
index e7fd0a724c55d..c5dfbe3db84a7 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_factory.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_factory.yml
@@ -10,7 +10,6 @@ services:
       - '@prestashop.core.grid.filter.form_factory'
       - '@prestashop.core.hook.dispatcher'
 
-
   prestashop.core.grid.factory.email_logs:
     class: 'PrestaShop\PrestaShop\Core\Grid\GridFactory'
     arguments:
@@ -513,13 +512,12 @@ services:
       - '@prestashop.core.grid.filter.form_factory'
       - '@prestashop.core.hook.dispatcher'
 
-  prestashop.core.grid.grid_factory.feature_value:
-    class: 'PrestaShop\PrestaShop\Core\Grid\GridFactory'
+  PrestaShop\PrestaShop\Core\Grid\Factory\FeatureValueGridFactory:
+    autowire: true
     arguments:
-      - '@PrestaShop\PrestaShop\Core\Grid\Definition\Factory\FeatureValueGridDefinitionFactory'
-      - '@prestashop.core.grid.data.factory.feature_value'
-      - '@prestashop.core.grid.filter.form_factory'
-      - '@prestashop.core.hook.dispatcher'
+      $definitionFactory: '@PrestaShop\PrestaShop\Core\Grid\Definition\Factory\FeatureValueGridDefinitionFactory'
+      $dataFactory: '@prestashop.core.grid.data.factory.feature_value'
+      $filterFormFactory: '@prestashop.core.grid.filter.form_factory'
 
   prestashop.core.grid.grid_factory.store:
     class: 'PrestaShop\PrestaShop\Core\Grid\GridFactory'
diff --git a/src/PrestaShopBundle/Service/Grid/ResponseBuilder.php b/src/PrestaShopBundle/Service/Grid/ResponseBuilder.php
index 229a01473f8e8..a11b4389fa767 100644
--- a/src/PrestaShopBundle/Service/Grid/ResponseBuilder.php
+++ b/src/PrestaShopBundle/Service/Grid/ResponseBuilder.php
@@ -33,6 +33,7 @@
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\Routing\Router;
 
@@ -93,11 +94,10 @@ public function buildSearchResponse(
         Request $request,
         $filterId,
         $redirectRoute,
-        array $queryParamsToKeep = [],
-        array $gridOptions = []
+        array $queryParamsToKeep = []
     ) {
         /** @var GridDefinitionInterface $definition */
-        $definition = $definitionFactory->getDefinition($gridOptions);
+        $definition = $definitionFactory->getDefinition();
 
         /** @var FormInterface $filtersForm */
         $filtersForm = $this->filterFormFactory->create($definition);
@@ -134,7 +134,7 @@ public function buildSearchResponse(
 
         $redirectUrl = $this->router->generate($redirectRoute, $redirectParams);
 
-        return new RedirectResponse($redirectUrl, 302);
+        return new RedirectResponse($redirectUrl, Response::HTTP_FOUND);
     }
 
     /**

From 83d5f8cff6e751697cb885677638a2e42a9f3602 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Wed, 26 Apr 2023 19:59:38 +0300
Subject: [PATCH 0209/1030]  allow using adapter FeatureRepository class in
 FeatureValueGridFactory temporary, and add a todo comment for future fix

---
 phpstan-disallowed-calls.neon                     |  1 +
 src/Core/Grid/Factory/FeatureValueGridFactory.php | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/phpstan-disallowed-calls.neon b/phpstan-disallowed-calls.neon
index 28d8e8ac226b0..1feda95bf49c5 100644
--- a/phpstan-disallowed-calls.neon
+++ b/phpstan-disallowed-calls.neon
@@ -394,6 +394,7 @@ parameters:
             allowIn:
                 - src/Adapter/*
                 - src/PrestaShopBundle/Install/*
+                - src/Core/Grid/Factory/FeatureValueGridFactory
         -
             class: PrestaShopBundle\Security\Voter\PageVoter
             constant: ['CREATE', 'READ', 'UPDATE', 'DELETE', 'LEVEL_DELETE', 'LEVEL_CREATE', 'LEVEL_READ', 'LEVEL_UPDATE']
diff --git a/src/Core/Grid/Factory/FeatureValueGridFactory.php b/src/Core/Grid/Factory/FeatureValueGridFactory.php
index 8068d1c3a00f2..61494f2cf29a0 100644
--- a/src/Core/Grid/Factory/FeatureValueGridFactory.php
+++ b/src/Core/Grid/Factory/FeatureValueGridFactory.php
@@ -56,6 +56,17 @@ class FeatureValueGridFactory extends GridFactory
      */
     private $featureRepository;
 
+    /**
+     * @param GridDefinitionFactoryInterface $definitionFactory
+     * @param GridDataFactoryInterface $dataFactory
+     * @param GridFilterFormFactoryInterface $filterFormFactory
+     * @param HookDispatcherInterface $hookDispatcher
+     * @param FeatureRepository $featureRepository
+     *
+     * @todo: after following ADR https://github.com/PrestaShop/ADR/pull/33,
+     *        the Addapter/FeatureRepository usage should be replaced by interface
+     *        and FeatureValueGridFactory should be removed from phpstan-disallowed-calls.neon "allowIn" section
+     */
     public function __construct(
         GridDefinitionFactoryInterface $definitionFactory,
         GridDataFactoryInterface $dataFactory,

From 8e6dddc7a0687c00c94508659c91fb993042ccaa Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Wed, 26 Apr 2023 20:02:45 +0300
Subject: [PATCH 0210/1030]  remove types from interface to avoid increasing pr
 scope as it requires to adjust all implementations

---
 .../Factory/AbstractGridDefinitionFactory.php   | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/Core/Grid/Definition/Factory/AbstractGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/AbstractGridDefinitionFactory.php
index 8b3091f486508..eff678818d19e 100644
--- a/src/Core/Grid/Definition/Factory/AbstractGridDefinitionFactory.php
+++ b/src/Core/Grid/Definition/Factory/AbstractGridDefinitionFactory.php
@@ -34,7 +34,6 @@
 use PrestaShop\PrestaShop\Core\Grid\Action\ViewOptionsCollectionInterface;
 use PrestaShop\PrestaShop\Core\Grid\Column\ColumnCollectionInterface;
 use PrestaShop\PrestaShop\Core\Grid\Definition\GridDefinition;
-use PrestaShop\PrestaShop\Core\Grid\Definition\GridDefinitionInterface;
 use PrestaShop\PrestaShop\Core\Grid\Filter\FilterCollection;
 use PrestaShop\PrestaShop\Core\Grid\Filter\FilterCollectionInterface;
 use PrestaShop\PrestaShop\Core\Hook\HookDispatcherInterface;
@@ -64,7 +63,7 @@ public function __construct(HookDispatcherInterface $hookDispatcher)
     /**
      * {@inheritdoc}
      */
-    public function getDefinition(): GridDefinitionInterface
+    public function getDefinition()
     {
         $definition = new GridDefinition(
             $this->getId(),
@@ -88,21 +87,21 @@ public function getDefinition(): GridDefinitionInterface
      *
      * @return string
      */
-    abstract protected function getId(): string;
+    abstract protected function getId();
 
     /**
      * Get translated grid name.
      *
      * @return string
      */
-    abstract protected function getName(): string;
+    abstract protected function getName();
 
     /**
      * Get defined columns for grid.
      *
      * @return ColumnCollectionInterface
      */
-    abstract protected function getColumns(): ColumnCollectionInterface;
+    abstract protected function getColumns();
 
     /**
      * Get defined grid actions.
@@ -110,7 +109,7 @@ abstract protected function getColumns(): ColumnCollectionInterface;
      *
      * @return GridActionCollectionInterface
      */
-    protected function getGridActions(): GridActionCollectionInterface
+    protected function getGridActions()
     {
         return new GridActionCollection();
     }
@@ -121,7 +120,7 @@ protected function getGridActions(): GridActionCollectionInterface
      *
      * @return BulkActionCollectionInterface
      */
-    protected function getBulkActions(): BulkActionCollectionInterface
+    protected function getBulkActions()
     {
         return new BulkActionCollection();
     }
@@ -132,7 +131,7 @@ protected function getBulkActions(): BulkActionCollectionInterface
      *
      * @return ViewOptionsCollectionInterface
      */
-    protected function getViewOptions(): ViewOptionsCollectionInterface
+    protected function getViewOptions()
     {
         return new ViewOptionsCollection();
     }
@@ -143,7 +142,7 @@ protected function getViewOptions(): ViewOptionsCollectionInterface
      *
      * @return FilterCollectionInterface
      */
-    protected function getFilters(): FilterCollectionInterface
+    protected function getFilters()
     {
         return new FilterCollection();
     }

From 596694d061179c49e3365957a54314e0c5452e2e Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Wed, 26 Apr 2023 20:18:40 +0300
Subject: [PATCH 0211/1030]  enable view aciton in feature list

---
 .../Factory/FeatureGridDefinitionFactory.php  | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/Core/Grid/Definition/Factory/FeatureGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/FeatureGridDefinitionFactory.php
index b737dba0c50e7..bc7af1238a081 100644
--- a/src/Core/Grid/Definition/Factory/FeatureGridDefinitionFactory.php
+++ b/src/Core/Grid/Definition/Factory/FeatureGridDefinitionFactory.php
@@ -120,17 +120,16 @@ protected function getColumns(): ColumnCollectionInterface
             ->setName($this->trans('Actions', [], 'Admin.Global'))
             ->setOptions([
                 'actions' => (new RowActionCollection())
-                    // @todo: view action is not implemented yet
-                    // ->add((new LinkRowAction('view'))
-                    // ->setName($this->trans('View', [], 'Admin.Actions'))
-                    // ->setIcon('zoom_in')
-                    // ->setOptions([
-                    // 'route' => 'admin_features_view',
-                    // 'route_param_name' => 'featureId',
-                    // 'route_param_field' => 'id_feature',
-                    // 'clickable_row' => true,
-                    // ])
-                    // )
+                    ->add((new LinkRowAction('view'))
+                    ->setName($this->trans('View', [], 'Admin.Actions'))
+                    ->setIcon('zoom_in')
+                    ->setOptions([
+                        'route' => 'admin_feature_values_index',
+                        'route_param_name' => 'featureId',
+                        'route_param_field' => 'id_feature',
+                        'clickable_row' => true,
+                    ])
+                     )
                     ->add((new LinkRowAction('edit'))
                     ->setName($this->trans('Edit', [], 'Admin.Actions'))
                     ->setIcon('edit')

From a4d4bad6c9b3ac6ea0c9ddbbd7a6711a4213a609 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Thu, 27 Apr 2023 12:06:24 +0300
Subject: [PATCH 0212/1030]  introduce ContextLanguageProviderInterface instead
 of injecting context lang id directly

---
 .../Language/ContextLanguageProvider.php      | 59 +++++++++++++++++++
 .../ContextLanguageProviderInterface.php      | 36 +++++++++++
 .../FeatureValueFiltersBuilder.php            | 11 ++--
 .../config/services/adapter/language.yml      |  8 +++
 .../Resources/config/services/core/search.yml |  3 +-
 5 files changed, 110 insertions(+), 7 deletions(-)
 create mode 100644 src/Adapter/Language/ContextLanguageProvider.php
 create mode 100644 src/Core/Language/ContextLanguageProviderInterface.php

diff --git a/src/Adapter/Language/ContextLanguageProvider.php b/src/Adapter/Language/ContextLanguageProvider.php
new file mode 100644
index 0000000000000..eccf0da20ae31
--- /dev/null
+++ b/src/Adapter/Language/ContextLanguageProvider.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Adapter\Language;
+
+use PrestaShop\PrestaShop\Adapter\LegacyContext;
+use PrestaShop\PrestaShop\Core\Domain\Language\ValueObject\LanguageId;
+use PrestaShop\PrestaShop\Core\Exception\CoreException;
+use PrestaShop\PrestaShop\Core\Language\ContextLanguageProviderInterface;
+
+class ContextLanguageProvider implements ContextLanguageProviderInterface
+{
+    /**
+     * @var LegacyContext
+     */
+    private $context;
+
+    public function __construct(
+        LegacyContext $context
+    ) {
+        $this->context = $context;
+    }
+
+    public function getLanguageId(): LanguageId
+    {
+        $langId = (int) $this->context->getContext()->language->id;
+
+        if (!$langId) {
+            throw new CoreException('Context language is missing');
+        }
+
+        return new LanguageId($langId);
+    }
+}
diff --git a/src/Core/Language/ContextLanguageProviderInterface.php b/src/Core/Language/ContextLanguageProviderInterface.php
new file mode 100644
index 0000000000000..8c80c7e266218
--- /dev/null
+++ b/src/Core/Language/ContextLanguageProviderInterface.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Language;
+
+use PrestaShop\PrestaShop\Core\Domain\Language\ValueObject\LanguageId;
+
+interface ContextLanguageProviderInterface
+{
+    public function getLanguageId(): LanguageId;
+}
diff --git a/src/Core/Search/Builder/TypedBuilder/FeatureValueFiltersBuilder.php b/src/Core/Search/Builder/TypedBuilder/FeatureValueFiltersBuilder.php
index 2196699b0955d..df8c50f0b377b 100644
--- a/src/Core/Search/Builder/TypedBuilder/FeatureValueFiltersBuilder.php
+++ b/src/Core/Search/Builder/TypedBuilder/FeatureValueFiltersBuilder.php
@@ -28,6 +28,7 @@
 
 namespace PrestaShop\PrestaShop\Core\Search\Builder\TypedBuilder;
 
+use PrestaShop\PrestaShop\Core\Language\ContextLanguageProviderInterface;
 use PrestaShop\PrestaShop\Core\Search\Builder\AbstractFiltersBuilder;
 use PrestaShop\PrestaShop\Core\Search\Filters;
 use PrestaShop\PrestaShop\Core\Search\Filters\FeatureValueFilters;
@@ -39,14 +40,14 @@ class FeatureValueFiltersBuilder extends AbstractFiltersBuilder implements Typed
     private $request;
 
     /**
-     * @var int
+     * @var ContextLanguageProviderInterface
      */
-    private $contextLangId;
+    private $contextLanguageProvider;
 
     public function __construct(
-        int $contextLangId
+        ContextLanguageProviderInterface $contextLanguageProvider
     ) {
-        $this->contextLangId = $contextLangId;
+        $this->contextLanguageProvider = $contextLanguageProvider;
     }
 
     /**
@@ -70,7 +71,7 @@ public function buildFilters(Filters $filters = null)
         }
 
         $filterParameters['filters']['feature_id'] = $this->getFeatureId();
-        $filterParameters['filters']['language_id'] = $this->contextLangId;
+        $filterParameters['filters']['language_id'] = $this->contextLanguageProvider->getLanguageId()->getValue();
 
         return new FeatureValueFilters($filterParameters);
     }
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/language.yml b/src/PrestaShopBundle/Resources/config/services/adapter/language.yml
index eaf6a34ef6a9e..9d381ccfbdd00 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/language.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/language.yml
@@ -73,3 +73,11 @@ services:
     tags:
       - name: tactician.handler
         command: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\DeleteLanguageCommand'
+
+  PrestaShop\PrestaShop\Adapter\Language\ContextLanguageProvider:
+    autowire: true
+    public: false
+    arguments:
+      $context: '@prestashop.adapter.legacy.context'
+
+  PrestaShop\PrestaShop\Core\Language\ContextLanguageProviderInterface: '@PrestaShop\PrestaShop\Adapter\Language\ContextLanguageProvider'
diff --git a/src/PrestaShopBundle/Resources/config/services/core/search.yml b/src/PrestaShopBundle/Resources/config/services/core/search.yml
index e4a0fdeedc125..124bcceb1b061 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/search.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/search.yml
@@ -56,6 +56,5 @@ services:
     tags: [ 'core.typed_filters_builder' ]
 
   PrestaShop\PrestaShop\Core\Search\Builder\TypedBuilder\FeatureValueFiltersBuilder:
+    autowire: true
     tags: [ 'core.typed_filters_builder' ]
-    arguments:
-      - '@=service("prestashop.adapter.legacy.context").getContext().language.id'

From 286becaad3c1a386f589a91530a64af05582f58a Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Fri, 28 Apr 2023 13:16:24 +0300
Subject: [PATCH 0213/1030]  remove optional param

---
 src/PrestaShopBundle/Service/Grid/ResponseBuilder.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/PrestaShopBundle/Service/Grid/ResponseBuilder.php b/src/PrestaShopBundle/Service/Grid/ResponseBuilder.php
index a11b4389fa767..917ba7448395d 100644
--- a/src/PrestaShopBundle/Service/Grid/ResponseBuilder.php
+++ b/src/PrestaShopBundle/Service/Grid/ResponseBuilder.php
@@ -33,7 +33,6 @@
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\Routing\Router;
 
@@ -132,9 +131,7 @@ public function buildSearchResponse(
             }
         }
 
-        $redirectUrl = $this->router->generate($redirectRoute, $redirectParams);
-
-        return new RedirectResponse($redirectUrl, Response::HTTP_FOUND);
+        return new RedirectResponse($this->router->generate($redirectRoute, $redirectParams));
     }
 
     /**

From 2c53eb425c88829eaa8a9417806380df51d9ea35 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Fri, 28 Apr 2023 13:28:20 +0300
Subject: [PATCH 0214/1030]  move service definition to core and do not use VO

---
 src/Adapter/Language/ContextLanguageProvider.php          | 8 +++++---
 src/Core/Language/ContextLanguageProviderInterface.php    | 7 ++++---
 .../Builder/TypedBuilder/FeatureValueFiltersBuilder.php   | 2 +-
 .../Resources/config/services/adapter/language.yml        | 2 --
 .../Resources/config/services/core/language.yml           | 2 ++
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/Adapter/Language/ContextLanguageProvider.php b/src/Adapter/Language/ContextLanguageProvider.php
index eccf0da20ae31..49ccf2107c8cc 100644
--- a/src/Adapter/Language/ContextLanguageProvider.php
+++ b/src/Adapter/Language/ContextLanguageProvider.php
@@ -29,10 +29,12 @@
 namespace PrestaShop\PrestaShop\Adapter\Language;
 
 use PrestaShop\PrestaShop\Adapter\LegacyContext;
-use PrestaShop\PrestaShop\Core\Domain\Language\ValueObject\LanguageId;
 use PrestaShop\PrestaShop\Core\Exception\CoreException;
 use PrestaShop\PrestaShop\Core\Language\ContextLanguageProviderInterface;
 
+/**
+ * @experimental This will be refactored once the Context replacement architecture has been decided
+ */
 class ContextLanguageProvider implements ContextLanguageProviderInterface
 {
     /**
@@ -46,7 +48,7 @@ public function __construct(
         $this->context = $context;
     }
 
-    public function getLanguageId(): LanguageId
+    public function getLanguageId(): int
     {
         $langId = (int) $this->context->getContext()->language->id;
 
@@ -54,6 +56,6 @@ public function getLanguageId(): LanguageId
             throw new CoreException('Context language is missing');
         }
 
-        return new LanguageId($langId);
+        return $langId;
     }
 }
diff --git a/src/Core/Language/ContextLanguageProviderInterface.php b/src/Core/Language/ContextLanguageProviderInterface.php
index 8c80c7e266218..89dc36db5eabc 100644
--- a/src/Core/Language/ContextLanguageProviderInterface.php
+++ b/src/Core/Language/ContextLanguageProviderInterface.php
@@ -28,9 +28,10 @@
 
 namespace PrestaShop\PrestaShop\Core\Language;
 
-use PrestaShop\PrestaShop\Core\Domain\Language\ValueObject\LanguageId;
-
+/**
+ * @experimental This will be refactored once the Context replacement architecture has been decided
+ */
 interface ContextLanguageProviderInterface
 {
-    public function getLanguageId(): LanguageId;
+    public function getLanguageId(): int;
 }
diff --git a/src/Core/Search/Builder/TypedBuilder/FeatureValueFiltersBuilder.php b/src/Core/Search/Builder/TypedBuilder/FeatureValueFiltersBuilder.php
index df8c50f0b377b..af044f51ed303 100644
--- a/src/Core/Search/Builder/TypedBuilder/FeatureValueFiltersBuilder.php
+++ b/src/Core/Search/Builder/TypedBuilder/FeatureValueFiltersBuilder.php
@@ -71,7 +71,7 @@ public function buildFilters(Filters $filters = null)
         }
 
         $filterParameters['filters']['feature_id'] = $this->getFeatureId();
-        $filterParameters['filters']['language_id'] = $this->contextLanguageProvider->getLanguageId()->getValue();
+        $filterParameters['filters']['language_id'] = $this->contextLanguageProvider->getLanguageId();
 
         return new FeatureValueFilters($filterParameters);
     }
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/language.yml b/src/PrestaShopBundle/Resources/config/services/adapter/language.yml
index 9d381ccfbdd00..bfeda68434a13 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/language.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/language.yml
@@ -79,5 +79,3 @@ services:
     public: false
     arguments:
       $context: '@prestashop.adapter.legacy.context'
-
-  PrestaShop\PrestaShop\Core\Language\ContextLanguageProviderInterface: '@PrestaShop\PrestaShop\Adapter\Language\ContextLanguageProvider'
diff --git a/src/PrestaShopBundle/Resources/config/services/core/language.yml b/src/PrestaShopBundle/Resources/config/services/core/language.yml
index b79dccebafdaa..987cf40927847 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/language.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/language.yml
@@ -11,3 +11,5 @@ services:
     arguments:
       - 'fa': 'Tahoma'
         'ar': 'Tahoma'
+
+  PrestaShop\PrestaShop\Core\Language\ContextLanguageProviderInterface: '@PrestaShop\PrestaShop\Adapter\Language\ContextLanguageProvider'

From ace5de65bc597a686981f4610fb9caee296cc4b7 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Fri, 28 Apr 2023 14:06:12 +0300
Subject: [PATCH 0215/1030]  move feature_values route into features.yml

---
 .../routing/admin/sell/catalog/_catalog.yml   |  4 ---
 .../admin/sell/catalog/feature_value.yml      | 25 ----------------
 .../routing/admin/sell/catalog/features.yml   | 29 +++++++++++++++++--
 3 files changed, 27 insertions(+), 31 deletions(-)
 delete mode 100644 src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/feature_value.yml

diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/_catalog.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/_catalog.yml
index ff4ade24364b0..af41be21acb94 100644
--- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/_catalog.yml
+++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/_catalog.yml
@@ -30,10 +30,6 @@ _features:
   resource: "features.yml"
   prefix: /features
 
-_feature_values:
-  resource: "feature_value.yml"
-  prefix: /features/{featureId}/values/
-
 _attributes:
   resource: "attribute.yml"
   prefix: /attribute-groups/{attributeGroupId}/attributes/
diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/feature_value.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/feature_value.yml
deleted file mode 100644
index 5c1ba1599d18e..0000000000000
--- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/feature_value.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-admin_feature_values_index:
-  path: /
-  methods: [ GET ]
-  defaults:
-    _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureValueController::indexAction
-    _legacy_controller: AdminFeatures
-    _legacy_link: AdminFeatures
-    _legacy_feature_flag: feature
-  requirements:
-    featureId: \d+
-
-admin_feature_values_search:
-  path: /
-  methods: [ POST ]
-  defaults:
-    _controller: PrestaShopBundle\Controller\Admin\CommonController::searchGridAction
-    gridDefinitionFactoryServiceId: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\FeatureValueGridDefinitionFactory
-    redirectRoute: admin_feature_values_index
-    _legacy_controller: AdminFeatures
-    _legacy_link: AdminFeatures
-    _legacy_feature_flag: feature
-    redirectQueryParamsToKeep:
-      - 'featureId'
-  requirements:
-    featureId: \d+
diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml
index 301f9b7433eeb..4114ebde0647b 100644
--- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml
+++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml
@@ -1,4 +1,4 @@
-# @todo: legacy links can be uncommented when page is fully migrated.
+# @todo: feature flag can be removed once page is fully migrated
 admin_features_index:
   path: /
   methods: [ GET ]
@@ -21,7 +21,6 @@ admin_features_search:
   defaults:
     _controller: PrestaShopBundle\Controller\Admin\CommonController::searchGridAction
     _legacy_controller: AdminFeatures
-    # _legacy_link: AdminFeatures
     gridDefinitionFactoryServiceId: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\FeatureGridDefinitionFactory
     redirectRoute: admin_features_index
 
@@ -80,3 +79,29 @@ admin_features_bulk_delete:
     _legacy_controller: AdminFeatures
   requirements:
     featureId: \d+
+
+admin_feature_values_index:
+  path: /{featureId}/values
+  methods: [ GET ]
+  defaults:
+    _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureValueController::indexAction
+    _legacy_controller: AdminFeatures
+    _legacy_link: AdminFeatures
+    _legacy_feature_flag: feature
+  requirements:
+    featureId: \d+
+
+admin_feature_values_search:
+  path: /{featureId}/values
+  methods: [ POST ]
+  defaults:
+    _controller: PrestaShopBundle\Controller\Admin\CommonController::searchGridAction
+    gridDefinitionFactoryServiceId: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\FeatureValueGridDefinitionFactory
+    redirectRoute: admin_feature_values_index
+    _legacy_controller: AdminFeatures
+    _legacy_link: AdminFeatures
+    _legacy_feature_flag: feature
+    redirectQueryParamsToKeep:
+      - 'featureId'
+  requirements:
+    featureId: \d+

From 5a1e4ac21916f0719ea9a2469c28e007a55fefa9 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Mon, 22 May 2023 11:59:03 +0300
Subject: [PATCH 0216/1030]  adapt some parts to 8.1

---
 .../Feature/Repository/FeatureRepository.php  | 29 ++--------------
 .../Language/ContextLanguageProvider.php      | 10 ++----
 src/Core/Grid/Definition/GridDefinition.php   |  2 +-
 .../Factory/CategoryGridFactoryDecorator.php  |  2 +-
 .../Grid/Factory/FeatureValueGridFactory.php  | 19 ++++-------
 src/Core/Grid/GridFactory.php                 | 34 +++----------------
 src/Core/Grid/GridFactoryInterface.php        |  2 +-
 .../Grid/Query/FeatureValueQueryBuilder.php   |  9 +----
 .../FeatureValueFiltersBuilder.php            | 11 ++----
 9 files changed, 23 insertions(+), 95 deletions(-)

diff --git a/src/Adapter/Feature/Repository/FeatureRepository.php b/src/Adapter/Feature/Repository/FeatureRepository.php
index e0dc96f0564dc..c535e50841a38 100644
--- a/src/Adapter/Feature/Repository/FeatureRepository.php
+++ b/src/Adapter/Feature/Repository/FeatureRepository.php
@@ -49,34 +49,11 @@
  */
 class FeatureRepository extends AbstractMultiShopObjectModelRepository
 {
-    /**
-     * @var Connection
-     */
-    protected $connection;
-
-    /**
-     * @var string
-     */
-    protected $dbPrefix;
-
-    /**
-     * @var FeatureValidator
-     */
-    private $featureValidator;
-
-    /**
-     * @param Connection $connection
-     * @param string $dbPrefix
-     * @param FeatureValidator $featureValidator
-     */
     public function __construct(
-        Connection $connection,
-        string $dbPrefix,
-        FeatureValidator $featureValidator
+        protected Connection $connection,
+        protected string $dbPrefix,
+        protected FeatureValidator $featureValidator
     ) {
-        $this->connection = $connection;
-        $this->dbPrefix = $dbPrefix;
-        $this->featureValidator = $featureValidator;
     }
 
     public function get(FeatureId $featureId): Feature
diff --git a/src/Adapter/Language/ContextLanguageProvider.php b/src/Adapter/Language/ContextLanguageProvider.php
index 49ccf2107c8cc..cf9762ca80220 100644
--- a/src/Adapter/Language/ContextLanguageProvider.php
+++ b/src/Adapter/Language/ContextLanguageProvider.php
@@ -33,19 +33,13 @@
 use PrestaShop\PrestaShop\Core\Language\ContextLanguageProviderInterface;
 
 /**
- * @experimental This will be refactored once the Context replacement architecture has been decided
+ * @experimental This will be refactored once the Context replacement architecture is decided
  */
 class ContextLanguageProvider implements ContextLanguageProviderInterface
 {
-    /**
-     * @var LegacyContext
-     */
-    private $context;
-
     public function __construct(
-        LegacyContext $context
+        protected LegacyContext $context
     ) {
-        $this->context = $context;
     }
 
     public function getLanguageId(): int
diff --git a/src/Core/Grid/Definition/GridDefinition.php b/src/Core/Grid/Definition/GridDefinition.php
index 67825bb408460..35b7e0074a788 100644
--- a/src/Core/Grid/Definition/GridDefinition.php
+++ b/src/Core/Grid/Definition/GridDefinition.php
@@ -176,7 +176,7 @@ public function getFilters()
     /**
      * @param string $name
      */
-    public function setName($name)
+    public function setName(string $name)
     {
         if (!is_string($name)) {
             throw new InvalidDataException('Definition name should be a string.');
diff --git a/src/Core/Grid/Factory/CategoryGridFactoryDecorator.php b/src/Core/Grid/Factory/CategoryGridFactoryDecorator.php
index 0ba9e65c99dfc..4cec822db7f60 100644
--- a/src/Core/Grid/Factory/CategoryGridFactoryDecorator.php
+++ b/src/Core/Grid/Factory/CategoryGridFactoryDecorator.php
@@ -67,7 +67,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function getGrid(SearchCriteriaInterface $searchCriteria)
+    public function getGrid(SearchCriteriaInterface $searchCriteria): GridInterface
     {
         $categoryGrid = $this->categoryGridFactory->getGrid($searchCriteria);
 
diff --git a/src/Core/Grid/Factory/FeatureValueGridFactory.php b/src/Core/Grid/Factory/FeatureValueGridFactory.php
index 61494f2cf29a0..c13c6d0a9ac7a 100644
--- a/src/Core/Grid/Factory/FeatureValueGridFactory.php
+++ b/src/Core/Grid/Factory/FeatureValueGridFactory.php
@@ -39,6 +39,7 @@
 use PrestaShop\PrestaShop\Core\Grid\Filter\GridFilterFormFactoryInterface;
 use PrestaShop\PrestaShop\Core\Grid\Grid;
 use PrestaShop\PrestaShop\Core\Grid\GridFactory;
+use PrestaShop\PrestaShop\Core\Grid\GridInterface;
 use PrestaShop\PrestaShop\Core\Grid\Search\SearchCriteriaInterface;
 use PrestaShop\PrestaShop\Core\Hook\HookDispatcherInterface;
 use PrestaShop\PrestaShop\Core\Search\Filters\FeatureValueFilters;
@@ -51,11 +52,6 @@
  */
 class FeatureValueGridFactory extends GridFactory
 {
-    /**
-     * @var FeatureRepository
-     */
-    private $featureRepository;
-
     /**
      * @param GridDefinitionFactoryInterface $definitionFactory
      * @param GridDataFactoryInterface $dataFactory
@@ -68,17 +64,16 @@ class FeatureValueGridFactory extends GridFactory
      *        and FeatureValueGridFactory should be removed from phpstan-disallowed-calls.neon "allowIn" section
      */
     public function __construct(
-        GridDefinitionFactoryInterface $definitionFactory,
-        GridDataFactoryInterface $dataFactory,
-        GridFilterFormFactoryInterface $filterFormFactory,
-        HookDispatcherInterface $hookDispatcher,
-        FeatureRepository $featureRepository
+        protected GridDefinitionFactoryInterface $definitionFactory,
+        protected GridDataFactoryInterface $dataFactory,
+        protected GridFilterFormFactoryInterface $filterFormFactory,
+        protected HookDispatcherInterface $hookDispatcher,
+        protected FeatureRepository $featureRepository
     ) {
         parent::__construct($definitionFactory, $dataFactory, $filterFormFactory, $hookDispatcher);
-        $this->featureRepository = $featureRepository;
     }
 
-    public function getGrid(SearchCriteriaInterface $searchCriteria)
+    public function getGrid(SearchCriteriaInterface $searchCriteria): GridInterface
     {
         if (!$searchCriteria instanceof FeatureValueFilters) {
             throw new InvalidArgumentException(sprintf('Invalid search criteria. Expected "%s"', FeatureValueFilters::class));
diff --git a/src/Core/Grid/GridFactory.php b/src/Core/Grid/GridFactory.php
index 9ecab667f412e..3d090a6ff643f 100644
--- a/src/Core/Grid/GridFactory.php
+++ b/src/Core/Grid/GridFactory.php
@@ -38,26 +38,6 @@
  */
 class GridFactory implements GridFactoryInterface
 {
-    /**
-     * @var GridDefinitionFactoryInterface
-     */
-    protected $definitionFactory;
-
-    /**
-     * @var GridDataFactoryInterface
-     */
-    protected $dataFactory;
-
-    /**
-     * @var GridFilterFormFactoryInterface
-     */
-    protected $filterFormFactory;
-
-    /**
-     * @var HookDispatcherInterface
-     */
-    protected $hookDispatcher;
-
     /**
      * @param GridDefinitionFactoryInterface $definitionFactory
      * @param GridDataFactoryInterface $dataFactory
@@ -65,21 +45,17 @@ class GridFactory implements GridFactoryInterface
      * @param HookDispatcherInterface $hookDispatcher
      */
     public function __construct(
-        GridDefinitionFactoryInterface $definitionFactory,
-        GridDataFactoryInterface $dataFactory,
-        GridFilterFormFactoryInterface $filterFormFactory,
-        HookDispatcherInterface $hookDispatcher
+        protected GridDefinitionFactoryInterface $definitionFactory,
+        protected GridDataFactoryInterface $dataFactory,
+        protected GridFilterFormFactoryInterface $filterFormFactory,
+        protected HookDispatcherInterface $hookDispatcher
     ) {
-        $this->definitionFactory = $definitionFactory;
-        $this->dataFactory = $dataFactory;
-        $this->filterFormFactory = $filterFormFactory;
-        $this->hookDispatcher = $hookDispatcher;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getGrid(SearchCriteriaInterface $searchCriteria)
+    public function getGrid(SearchCriteriaInterface $searchCriteria): GridInterface
     {
         $definition = $this->definitionFactory->getDefinition();
         $data = $this->dataFactory->getData($searchCriteria);
diff --git a/src/Core/Grid/GridFactoryInterface.php b/src/Core/Grid/GridFactoryInterface.php
index 8f45dfb3cc872..45d85bd84340c 100644
--- a/src/Core/Grid/GridFactoryInterface.php
+++ b/src/Core/Grid/GridFactoryInterface.php
@@ -40,5 +40,5 @@ interface GridFactoryInterface
      *
      * @return GridInterface
      */
-    public function getGrid(SearchCriteriaInterface $searchCriteria);
+    public function getGrid(SearchCriteriaInterface $searchCriteria): GridInterface;
 }
diff --git a/src/Core/Grid/Query/FeatureValueQueryBuilder.php b/src/Core/Grid/Query/FeatureValueQueryBuilder.php
index ffb3d0d974a74..d8712411c07aa 100644
--- a/src/Core/Grid/Query/FeatureValueQueryBuilder.php
+++ b/src/Core/Grid/Query/FeatureValueQueryBuilder.php
@@ -34,11 +34,6 @@
 
 class FeatureValueQueryBuilder extends AbstractDoctrineQueryBuilder
 {
-    /**
-     * @var DoctrineSearchCriteriaApplicatorInterface
-     */
-    private $searchCriteriaApplicator;
-
     /**
      * @param Connection $connection
      * @param string $dbPrefix
@@ -47,11 +42,9 @@ class FeatureValueQueryBuilder extends AbstractDoctrineQueryBuilder
     public function __construct(
         Connection $connection,
         $dbPrefix,
-        DoctrineSearchCriteriaApplicatorInterface $searchCriteriaApplicator
+        protected DoctrineSearchCriteriaApplicatorInterface $searchCriteriaApplicator
     ) {
         parent::__construct($connection, $dbPrefix);
-
-        $this->searchCriteriaApplicator = $searchCriteriaApplicator;
     }
 
     /**
diff --git a/src/Core/Search/Builder/TypedBuilder/FeatureValueFiltersBuilder.php b/src/Core/Search/Builder/TypedBuilder/FeatureValueFiltersBuilder.php
index af044f51ed303..84f54edb62319 100644
--- a/src/Core/Search/Builder/TypedBuilder/FeatureValueFiltersBuilder.php
+++ b/src/Core/Search/Builder/TypedBuilder/FeatureValueFiltersBuilder.php
@@ -36,18 +36,11 @@
 
 class FeatureValueFiltersBuilder extends AbstractFiltersBuilder implements TypedFiltersBuilderInterface
 {
-    /** @var Request */
-    private $request;
-
-    /**
-     * @var ContextLanguageProviderInterface
-     */
-    private $contextLanguageProvider;
+    private Request $request;
 
     public function __construct(
-        ContextLanguageProviderInterface $contextLanguageProvider
+        protected ContextLanguageProviderInterface $contextLanguageProvider
     ) {
-        $this->contextLanguageProvider = $contextLanguageProvider;
     }
 
     /**

From afb2e2f24d2970dc0e8fbe82a3c66b0e546ef3cf Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Wed, 21 Jun 2023 14:07:57 +0300
Subject: [PATCH 0217/1030]  fix redeclaring properties

---
 .../Feature/Repository/FeatureRepository.php   |  6 +++---
 .../Language/ContextLanguageProvider.php       |  2 +-
 .../Grid/Factory/FeatureValueGridFactory.php   | 10 +++++-----
 src/Core/Grid/GridFactory.php                  |  8 ++++----
 .../Query/AbstractDoctrineQueryBuilder.php     | 18 ++++--------------
 .../Grid/Query/FeatureValueQueryBuilder.php    |  9 ++-------
 .../Monitoring/AbstractProductQueryBuilder.php | 10 ----------
 .../FeatureValueFiltersBuilder.php             |  2 +-
 8 files changed, 20 insertions(+), 45 deletions(-)

diff --git a/src/Adapter/Feature/Repository/FeatureRepository.php b/src/Adapter/Feature/Repository/FeatureRepository.php
index c535e50841a38..fa0947029f655 100644
--- a/src/Adapter/Feature/Repository/FeatureRepository.php
+++ b/src/Adapter/Feature/Repository/FeatureRepository.php
@@ -50,9 +50,9 @@
 class FeatureRepository extends AbstractMultiShopObjectModelRepository
 {
     public function __construct(
-        protected Connection $connection,
-        protected string $dbPrefix,
-        protected FeatureValidator $featureValidator
+        protected readonly Connection $connection,
+        protected readonly string $dbPrefix,
+        protected readonly FeatureValidator $featureValidator
     ) {
     }
 
diff --git a/src/Adapter/Language/ContextLanguageProvider.php b/src/Adapter/Language/ContextLanguageProvider.php
index cf9762ca80220..9df0b970c719b 100644
--- a/src/Adapter/Language/ContextLanguageProvider.php
+++ b/src/Adapter/Language/ContextLanguageProvider.php
@@ -38,7 +38,7 @@
 class ContextLanguageProvider implements ContextLanguageProviderInterface
 {
     public function __construct(
-        protected LegacyContext $context
+        protected readonly LegacyContext $context
     ) {
     }
 
diff --git a/src/Core/Grid/Factory/FeatureValueGridFactory.php b/src/Core/Grid/Factory/FeatureValueGridFactory.php
index c13c6d0a9ac7a..98f3afcb4e505 100644
--- a/src/Core/Grid/Factory/FeatureValueGridFactory.php
+++ b/src/Core/Grid/Factory/FeatureValueGridFactory.php
@@ -64,11 +64,11 @@ class FeatureValueGridFactory extends GridFactory
      *        and FeatureValueGridFactory should be removed from phpstan-disallowed-calls.neon "allowIn" section
      */
     public function __construct(
-        protected GridDefinitionFactoryInterface $definitionFactory,
-        protected GridDataFactoryInterface $dataFactory,
-        protected GridFilterFormFactoryInterface $filterFormFactory,
-        protected HookDispatcherInterface $hookDispatcher,
-        protected FeatureRepository $featureRepository
+        GridDefinitionFactoryInterface $definitionFactory,
+        GridDataFactoryInterface $dataFactory,
+        GridFilterFormFactoryInterface $filterFormFactory,
+        HookDispatcherInterface $hookDispatcher,
+        protected readonly FeatureRepository $featureRepository
     ) {
         parent::__construct($definitionFactory, $dataFactory, $filterFormFactory, $hookDispatcher);
     }
diff --git a/src/Core/Grid/GridFactory.php b/src/Core/Grid/GridFactory.php
index 3d090a6ff643f..13ae59f3d2277 100644
--- a/src/Core/Grid/GridFactory.php
+++ b/src/Core/Grid/GridFactory.php
@@ -45,10 +45,10 @@ class GridFactory implements GridFactoryInterface
      * @param HookDispatcherInterface $hookDispatcher
      */
     public function __construct(
-        protected GridDefinitionFactoryInterface $definitionFactory,
-        protected GridDataFactoryInterface $dataFactory,
-        protected GridFilterFormFactoryInterface $filterFormFactory,
-        protected HookDispatcherInterface $hookDispatcher
+        protected readonly GridDefinitionFactoryInterface $definitionFactory,
+        protected readonly GridDataFactoryInterface $dataFactory,
+        protected readonly GridFilterFormFactoryInterface $filterFormFactory,
+        protected readonly HookDispatcherInterface $hookDispatcher
     ) {
     }
 
diff --git a/src/Core/Grid/Query/AbstractDoctrineQueryBuilder.php b/src/Core/Grid/Query/AbstractDoctrineQueryBuilder.php
index 65f3e2d0ad37f..013b263cd54dc 100644
--- a/src/Core/Grid/Query/AbstractDoctrineQueryBuilder.php
+++ b/src/Core/Grid/Query/AbstractDoctrineQueryBuilder.php
@@ -33,24 +33,14 @@
  */
 abstract class AbstractDoctrineQueryBuilder implements DoctrineQueryBuilderInterface
 {
-    /**
-     * @var Connection
-     */
-    protected $connection;
-
-    /**
-     * @var string
-     */
-    protected $dbPrefix;
-
     /**
      * @param Connection $connection
      * @param string $dbPrefix
      */
-    public function __construct(Connection $connection, $dbPrefix)
-    {
-        $this->connection = $connection;
-        $this->dbPrefix = $dbPrefix;
+    public function __construct(
+        protected readonly Connection $connection,
+        protected readonly string $dbPrefix
+    ) {
     }
 
     /**
diff --git a/src/Core/Grid/Query/FeatureValueQueryBuilder.php b/src/Core/Grid/Query/FeatureValueQueryBuilder.php
index d8712411c07aa..aeca8b7fe7411 100644
--- a/src/Core/Grid/Query/FeatureValueQueryBuilder.php
+++ b/src/Core/Grid/Query/FeatureValueQueryBuilder.php
@@ -34,15 +34,10 @@
 
 class FeatureValueQueryBuilder extends AbstractDoctrineQueryBuilder
 {
-    /**
-     * @param Connection $connection
-     * @param string $dbPrefix
-     * @param DoctrineSearchCriteriaApplicatorInterface $searchCriteriaApplicator
-     */
     public function __construct(
         Connection $connection,
-        $dbPrefix,
-        protected DoctrineSearchCriteriaApplicatorInterface $searchCriteriaApplicator
+        string $dbPrefix,
+        protected readonly DoctrineSearchCriteriaApplicatorInterface $searchCriteriaApplicator
     ) {
         parent::__construct($connection, $dbPrefix);
     }
diff --git a/src/Core/Grid/Query/Monitoring/AbstractProductQueryBuilder.php b/src/Core/Grid/Query/Monitoring/AbstractProductQueryBuilder.php
index a536c66438f77..b740385ad46c9 100644
--- a/src/Core/Grid/Query/Monitoring/AbstractProductQueryBuilder.php
+++ b/src/Core/Grid/Query/Monitoring/AbstractProductQueryBuilder.php
@@ -38,16 +38,6 @@
  */
 abstract class AbstractProductQueryBuilder extends AbstractDoctrineQueryBuilder
 {
-    /**
-     * @var Connection
-     */
-    protected $connection;
-
-    /**
-     * @var string
-     */
-    protected $dbPrefix;
-
     /**
      * @var int
      */
diff --git a/src/Core/Search/Builder/TypedBuilder/FeatureValueFiltersBuilder.php b/src/Core/Search/Builder/TypedBuilder/FeatureValueFiltersBuilder.php
index 84f54edb62319..461ed3f5197a7 100644
--- a/src/Core/Search/Builder/TypedBuilder/FeatureValueFiltersBuilder.php
+++ b/src/Core/Search/Builder/TypedBuilder/FeatureValueFiltersBuilder.php
@@ -39,7 +39,7 @@ class FeatureValueFiltersBuilder extends AbstractFiltersBuilder implements Typed
     private Request $request;
 
     public function __construct(
-        protected ContextLanguageProviderInterface $contextLanguageProvider
+        protected readonly ContextLanguageProviderInterface $contextLanguageProvider
     ) {
     }
 

From 8220faf0ce894e7f09dc511b52efb090ef49bdd8 Mon Sep 17 00:00:00 2001
From: Jens Wilke <jw_github@headissue.com>
Date: Thu, 22 Jun 2023 06:31:05 +0200
Subject: [PATCH 0218/1030] remove other hasKey as well

---
 classes/controller/FrontController.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php
index 9feeff7b6f3ef..0c18ff4a9af18 100644
--- a/classes/controller/FrontController.php
+++ b/classes/controller/FrontController.php
@@ -1633,10 +1633,10 @@ public function getTemplateVarShop()
             'long' => Configuration::get('PS_STORES_CENTER_LONG'),
             'lat' => Configuration::get('PS_STORES_CENTER_LAT'),
 
-            'logo' => Configuration::hasKey('PS_LOGO') ? $psImageUrl . Configuration::get('PS_LOGO') : '',
+            'logo' => self::configuredImageUrl('PS_LOGO', $psImageUrl),
             'logo_details' => $this->getShopLogo(),
-            'stores_icon' => Configuration::hasKey('PS_STORES_ICON') ? $psImageUrl . Configuration::get('PS_STORES_ICON') : '',
-            'favicon' => Configuration::hasKey('PS_FAVICON') ? $psImageUrl . Configuration::get('PS_FAVICON') : '',
+            'stores_icon' => self::configuredImageUrl('PS_STORES_ICON', $psImageUrl),
+            'favicon' => self::configuredImageUrl('PS_STORES_ICON', $psImageUrl),
             'favicon_update_time' => Configuration::get('PS_IMG_UPDATE_TIME'),
 
             'address' => [
@@ -1655,6 +1655,11 @@ public function getTemplateVarShop()
         return $shop;
     }
 
+    private static function configuredImageUrl(string $configKey, $psImageUrl) {
+        $image = Configuration::get($configKey);
+        return $image ? $psImageUrl . $image : '';
+    }
+
     /**
      * Initializes a set of commonly used variables related to the current page, available for use
      * in the template. @see FrontController::assignGeneralPurposeVariables for more information.

From 577e801b9daa6fb576f8dfc618d7e3c0a359b375 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Mon, 8 May 2023 13:38:23 +0300
Subject: [PATCH 0219/1030]  inmplement a step to add cart rule which validates
 it and adds it to cart by code as it is done in FO

---
 .../Context/CartRuleFeatureContext.php        | 93 +++++++++++++++++++
 .../Cart/Adding/CartRule/add_cartrule.feature | 13 ++-
 2 files changed, 101 insertions(+), 5 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
index c7c1093e37403..f54fbedb912c7 100644
--- a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
@@ -37,10 +37,15 @@
 use DateTime;
 use Db;
 use Order;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleValidityException;
+use RuntimeException;
+use Validate;
 
 class CartRuleFeatureContext extends AbstractPrestaShopFeatureContext
 {
     use CartAwareTrait;
+    use SharedStorageTrait;
+    use LastExceptionTrait;
 
     /**
      * @var CartRule[]
@@ -406,6 +411,50 @@ public function iAddCartRuleNamedToMyCart(string $cartRuleName): void
         $this->getCurrentCart()->addCartRule($this->cartRules[$cartRuleName]->id);
     }
 
+    /**
+     * @When /^I apply the discount code "(.+)"$/
+     *
+     * @param string $code
+     *
+     * @return void
+     */
+    public function applyCartRuleByCode(string $code): void
+    {
+        $cartRuleId = $this->getSharedStorage()->get($code);
+        $cartRule = new CartRule($cartRuleId);
+
+        if (!Validate::isLoadedObject($cartRule)) {
+            throw new RuntimeException(sprintf('Failed to load cart rule %d', $cartRule->id));
+        }
+
+        if ($errorMessage = $cartRule->checkValidity(Context::getContext())) {
+            // checkValidity method doesn't throw exception, but returns string
+            // so we map it to error code and reuse the LastExceptionTrait to be able to assert the exception on next step
+            $this->setLastException(
+                new CartRuleValidityException($errorMessage, $this->getCartRuleValidityCodeByMessage($errorMessage))
+            );
+
+            return;
+        }
+
+        $this->getCurrentCart()->addCartRule((int) $cartRule->id);
+    }
+
+    /**
+     * @Then I should get cart rule validation error saying :expectedMessage
+     *
+     * @param string $expectedMessage
+     *
+     * @return void
+     */
+    public function assertCartRuleValidationError(string $expectedMessage): void
+    {
+        $this->assertLastErrorIs(
+            CartRuleValidityException::class,
+            $this->getCartRuleValidityCodeByMessage($expectedMessage)
+        );
+    }
+
     /**
      * @When /^at least one cart rule applies today for customer with id (\d+)$/
      */
@@ -517,4 +566,48 @@ public function checkCartRuleUsageLimitIsDetected(string $cartRuleReference)
             throw new \RuntimeException(sprintf('Expects "usage limit reached" error message, got %s instead', $result));
         }
     }
+
+    /**
+     * Legacy cart rule validation returns errors as strings (CartRule::checkVBalidity()),
+     * so to identify lastError in steps we will use this custom map,
+     * which will eventually allow us to reuse LastExceptionTrait and assert exceptions by codes
+     *
+     * @return int[]
+     */
+    private function getCartRuleValidityCodeByMessage(string $message): int
+    {
+        $map = [
+            'This voucher is disabled' => 100,
+            'This voucher has already been used' => 101,
+            'This voucher is not valid yet' => 102,
+            'This voucher has expired' => 103,
+            'You cannot use this voucher anymore (usage limit reached)' => 104,
+            'You cannot use this voucher' => 105,
+            'You must choose a delivery address before applying this voucher to your order' => 106,
+            'You cannot use this voucher in your country of delivery' => 107,
+            'You must choose a carrier before applying this voucher to your order' => 108,
+            'You cannot use this voucher with this carrier' => 109,
+            'You cannot use this voucher on products on sale' => 110,
+            'You cannot use this voucher in an empty cart' => 111,
+            'You cannot use this voucher with these products' => 112,
+            'The minimum amount to benefit from this promo code is' => 113,
+            'This voucher is already in your cart' => 114,
+            'This voucher is not combinable with an other voucher already in your cart:' => 115,
+            'Cart is empty' => 116,
+        ];
+
+        foreach ($map as $errorPart => $code) {
+            // @todo:
+            //     some of these errors have %s placeholders, so we just match the most part of it,
+            //     it should be convenient enough for now, but will need improvement later
+            if (0 === strpos($message, $errorPart)) {
+                return $code;
+            }
+        }
+
+        throw new RuntimeException(sprintf(
+            'Invalid error-code mapping in test. Couldn\'t find the code for message "%s"',
+            $message
+        ));
+    }
 }
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/add_cartrule.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/add_cartrule.feature
index b09bbed71b3cc..78010c7a41808 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/add_cartrule.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/add_cartrule.feature
@@ -9,14 +9,14 @@ Feature: Add cart rule in cart
     And country "US" is enabled
 
   @bo-add-cart-rule
-  Scenario: No product in cart should give a not valid cart rule insertion
+  Scenario: Adding a cart rule to an empty cart should not be possible
     Given I have an empty default cart
     Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
     Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
     Given cart rule "cartrule1" has a discount code "foo1"
     Then I should have 0 different products in my cart
-    Then cart rule "cartrule1" cannot be applied to my cart
-    When I use the discount "cartrule1"
+    When I apply the discount code "foo1"
+    Then I should get cart rule validation error saying "Cart is empty"
     When at least one cart rule applies today for customer with id 0
     Then I should have 0 products in my cart
 
@@ -29,8 +29,11 @@ Feature: Add cart rule in cart
     Given cart rule "cartrule1" has a discount code "foo1"
     When I add 1 items of product "product1" in my cart
     Then I should have 1 different products in my cart
-    Then cart rule "cartrule1" can be applied to my cart
-    When I use the discount "cartrule1"
+    # 19.812 product +7 shipping (1 cent probably lost on price convertion?)
+    And my cart total should be precisely 26.81 tax excluded
+    When I apply the discount code "foo1"
+    # @todo: products discounted by 50% and then shipping is added. So (19.812/2)+7. Need to add shipping assertion to make it clearer
+    Then my cart total should be precisely 16.9 tax excluded
     When at least one cart rule applies today for customer with id 0
     Then I should have 1 products in my cart
 

From 9c4a25e9402f69a98569a12bf83cf7aa2e9c4e20 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Mon, 8 May 2023 15:54:57 +0300
Subject: [PATCH 0220/1030]  add cart total assertions to some scenarios and
 move BO cart rule applications to dedicated feature file

---
 .../Context/CartRuleFeatureContext.php        |   1 +
 .../Cart/Adding/CartRule/add_cartrule.feature | 139 ------------------
 .../Adding/CartRule/apply_cart_rule.feature   | 115 +++++++++++++++
 .../CartRule/bo_apply_cart_rule.feature       |  34 +++++
 4 files changed, 150 insertions(+), 139 deletions(-)
 delete mode 100644 tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/add_cartrule.feature
 create mode 100644 tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/apply_cart_rule.feature
 create mode 100644 tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/bo_apply_cart_rule.feature

diff --git a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
index f54fbedb912c7..47d137569a7d5 100644
--- a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
@@ -456,6 +456,7 @@ public function assertCartRuleValidationError(string $expectedMessage): void
     }
 
     /**
+     * @todo: What is this method supposed to assert. Especially in cases when it checks customer id 0??
      * @When /^at least one cart rule applies today for customer with id (\d+)$/
      */
     public function someCartRulesExistTodayForCustomerWithId($customerId)
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/add_cartrule.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/add_cartrule.feature
deleted file mode 100644
index 78010c7a41808..0000000000000
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/add_cartrule.feature
+++ /dev/null
@@ -1,139 +0,0 @@
-# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags bo-add-cart-rule
-@restore-all-tables-before-feature
-Feature: Add cart rule in cart
-  As a customer
-  I must be able to correctly add cart rules in my cart
-
-  Background:
-    And there is customer "testCustomer" with email "pub@prestashop.com"
-    And country "US" is enabled
-
-  @bo-add-cart-rule
-  Scenario: Adding a cart rule to an empty cart should not be possible
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule1" has a discount code "foo1"
-    Then I should have 0 different products in my cart
-    When I apply the discount code "foo1"
-    Then I should get cart rule validation error saying "Cart is empty"
-    When at least one cart rule applies today for customer with id 0
-    Then I should have 0 products in my cart
-
-  @bo-add-cart-rule
-  Scenario: 1 product in cart, cart rule is inserted correctly
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule1" has a discount code "foo1"
-    When I add 1 items of product "product1" in my cart
-    Then I should have 1 different products in my cart
-    # 19.812 product +7 shipping (1 cent probably lost on price convertion?)
-    And my cart total should be precisely 26.81 tax excluded
-    When I apply the discount code "foo1"
-    # @todo: products discounted by 50% and then shipping is added. So (19.812/2)+7. Need to add shipping assertion to make it clearer
-    Then my cart total should be precisely 16.9 tax excluded
-    When at least one cart rule applies today for customer with id 0
-    Then I should have 1 products in my cart
-
-  @bo-add-cart-rule
-  Scenario: 1 product in cart, cart rules are inserted correctly
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule1" has a discount code "foo1"
-    Given there is a cart rule named "cartrule2" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule2" has a discount code "foo2"
-    When I add 1 items of product "product1" in my cart
-    Then I should have 1 different products in my cart
-    Then cart rule "cartrule1" can be applied to my cart
-    When I use the discount "cartrule1"
-    Then cart rule "cartrule2" can be applied to my cart
-    When I use the discount "cartrule2"
-    When at least one cart rule applies today for customer with id 0
-    Then I should have 1 products in my cart
-
-  @bo-add-cart-rule
-  Scenario: 1 product in cart, double cart rule not inserted
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule1" has a discount code "foo1"
-    When I add 1 items of product "product1" in my cart
-    Then I should have 1 different products in my cart
-    Then cart rule "cartrule1" can be applied to my cart
-    When I use the discount "cartrule1"
-    Then cart rule "cartrule1" cannot be applied to my cart
-    When I use the discount "cartrule1"
-    When at least one cart rule applies today for customer with id 0
-    Then I should have 1 products in my cart
-
-  @bo-add-cart-rule
-  Scenario: 1 product in cart, cart rule giving gift, and global cart rule should be inserted without error
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
-    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule1" has a discount code "foo1"
-    Given there is a cart rule named "cartrule12" that applies a percent discount of 10.0% with priority 1, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule12" has a discount code "foo12"
-    Given cart rule "cartrule12" offers a gift product "product3"
-    When I add 1 items of product "product1" in my cart
-    Then I should have 1 different products in my cart
-    Then cart rule "cartrule12" can be applied to my cart
-    When I use the discount "cartrule12"
-    Then cart rule "cartrule1" can be applied to my cart
-    When I use the discount "cartrule1"
-    When at least one cart rule applies today for customer with id 0
-    Then I should have 2 products in my cart
-
-  @bo-add-cart-rule
-  Scenario: 1 product in cart, cart rule giving gift out of stock, and global cart rule should be inserted without error (test PR #8361)
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product4" with a price of 35.567 and 1000 items in stock
-    Given product "product4" is out of stock
-    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule1" has a discount code "foo1"
-    Given there is a cart rule named "cartrule13" that applies a percent discount of 10.0% with priority 13, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule13" has a discount code "foo13"
-    Given cart rule "cartrule13" offers a gift product "product4"
-    When I add 1 items of product "product1" in my cart
-    Then I should have 1 different products in my cart
-    Then cart rule "cartrule13" can be applied to my cart
-    When I use the discount "cartrule13"
-    Then cart rule "cartrule1" can be applied to my cart
-    When I use the discount "cartrule1"
-    When at least one cart rule applies today for customer with id 0
-    Then I should have 1 products in my cart
-
-  @bo-add-cart-rule
-  Scenario: Add cart rule which provides gift product and free shipping
-    Given I create an empty cart "dummy_cart_1" for customer "testCustomer"
-    And I select "US" address as delivery and invoice address for customer "testCustomer" in cart "dummy_cart_1"
-    And I add 2 products "Mug The best is yet to come" to the cart "dummy_cart_1"
-    And product "Mug The best is yet to come" quantity in cart dummy_cart_1 should be 2 excluding gift products
-    When I use a voucher "gift+freeShip" which provides a gift product "Mountain fox notebook" and free shipping on the cart "dummy_cart_1"
-    Then gifted product "Mountain fox notebook" quantity in cart "dummy_cart_1" should be 1
-    And cart "dummy_cart_1" should have free shipping
-    And reduction value of voucher "gift+freeShip" in cart "dummy_cart_1" should be "19.9"
-
-  @bo-add-cart-rule
-  Scenario: Add multiple cart rules which uses same gift product to the cart which already has paid products identical to those gifts
-    Given I create an empty cart "dummy_cart_2" for customer "testCustomer"
-    And I select "US" address as delivery and invoice address for customer "testCustomer" in cart "dummy_cart_2"
-    And I add 2 products "Mountain fox notebook" to the cart "dummy_cart_2"
-    And product "Mountain fox notebook" quantity in cart "dummy_cart_2" should be 2 excluding gift products
-    When I use a voucher "foxGift1" which provides a gift product "Mountain fox notebook" on the cart "dummy_cart_2"
-    Then product "Mountain fox notebook" quantity in cart "dummy_cart_2" should be 2 excluding gift products
-    And gifted product "Mountain fox notebook" quantity in cart "dummy_cart_2" should be 1
-    And reduction value of voucher "foxGift1" in cart "dummy_cart_2" should be "12.9"
-    When I use a voucher "foxGift2" which provides a gift product "Mountain fox notebook" on the cart "dummy_cart_2"
-    Then product "Mountain fox notebook" quantity in cart "dummy_cart_2" should be 2 excluding gift products
-    And gifted product "Mountain fox notebook" quantity in cart "dummy_cart_2" should be 2
-    And reduction value of voucher "foxGift2" in cart "dummy_cart_2" should be "12.9"
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/apply_cart_rule.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/apply_cart_rule.feature
new file mode 100644
index 0000000000000..d32155d91925d
--- /dev/null
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/apply_cart_rule.feature
@@ -0,0 +1,115 @@
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags apply-cart-rule
+@restore-all-tables-before-feature
+@apply-cart-rule
+Feature: Apply cart rule to cart
+  As a customer
+  I must be able to apply cart rules to my cart
+
+  Background:
+    And there is customer "testCustomer" with email "pub@prestashop.com"
+    And country "US" is enabled
+
+  Scenario: Adding a cart rule to an empty cart should not be possible
+    Given I have an empty default cart
+    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
+    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
+    Given cart rule "cartrule1" has a discount code "foo1"
+    Then I should have 0 different products in my cart
+    When I apply the discount code "foo1"
+    Then I should get cart rule validation error saying "Cart is empty"
+    When at least one cart rule applies today for customer with id 0
+    Then I should have 0 products in my cart
+
+  Scenario: 1 product in cart, percentage reduction cart rule is applied correctly
+    Given I have an empty default cart
+    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
+    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
+    Given cart rule "cartrule1" has a discount code "foo1"
+    When I add 1 items of product "product1" in my cart
+    Then I should have 1 different products in my cart
+    # 19.812 product +7 shipping (1 cent probably lost on price convertion?)
+    And my cart total should be 26.8 tax excluded
+    When I apply the discount code "foo1"
+    # @todo: products discounted by 50% and then shipping is added. So (19.812/2)+7. Need to add shipping assertion to make it clearer
+    Then my cart total should be 16.9 tax excluded
+    When at least one cart rule applies today for customer with id 0
+    Then I should have 1 products in my cart
+
+  Scenario: 2 combinable cart rules are applied correctly
+    Given I have an empty default cart
+    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
+    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
+    Given cart rule "cartrule1" has a discount code "foo1"
+    Given there is a cart rule named "cartrule2" that applies a percent discount of 30.0% with priority 2, quantity of 1000 and quantity per user 1000
+    Given cart rule "cartrule2" has a discount code "foo2"
+    When I add 1 items of product "product1" in my cart
+    Then I should have 1 different products in my cart
+    And my cart total should be 26.8 tax excluded
+    When I apply the discount code "foo1"
+    Then my cart total should be 16.9 tax excluded
+    When I apply the discount code "foo2"
+    # (19.812*0.5)*0.7 + 7 shipping
+    Then my cart total should be 13.9 tax excluded
+    When at least one cart rule applies today for customer with id 0
+    Then I should have 1 products in my cart
+
+  Scenario: Cart rule cannot be applied again when it is already in the cart
+    Given I have an empty default cart
+    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
+    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
+    Given cart rule "cartrule1" has a discount code "foo1"
+    When I add 1 items of product "product1" in my cart
+    Then I should have 1 different products in my cart
+    And my cart total should be 26.8 tax excluded
+    When I apply the discount code "foo1"
+    Then my cart total should be 16.9 tax excluded
+    When I apply the discount code "foo1"
+    Then I should get cart rule validation error saying "This voucher is already in your cart"
+    When at least one cart rule applies today for customer with id 0
+    Then I should have 1 products in my cart
+
+  Scenario: Percentage reduction cart rule and gift product cart rule applied to the same cart
+    Given I have an empty default cart
+    And shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
+    And there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+    And there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
+    And there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
+    And cart rule "cartrule1" has a discount code "foo1"
+    And there is a cart rule named "cartrule12" that applies a percent discount of 10.0% with priority 1, quantity of 1000 and quantity per user 1000
+    And cart rule "cartrule12" has a discount code "foo12"
+    And cart rule "cartrule12" offers a gift product "product3"
+    And I add 1 items of product "product1" in my cart
+    And I should have 1 different products in my cart
+    And my cart total should be 26.8 tax excluded
+    When I apply the discount code "foo12"
+    Then my cart total should be 24.8 tax excluded
+    And I should have 2 products in my cart
+    When I apply the discount code "foo1"
+    Then my cart total should be 15.9 tax excluded
+    And I should have 2 products in my cart
+    And at least one cart rule applies today for customer with id 0
+
+  Scenario: 1 product in cart, cart rule giving gift out of stock, and global cart rule should be inserted without error (test PR #8361)
+    Given I have an empty default cart
+    And shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
+    And there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+    And there is a product in the catalog named "product4" with a price of 35.567 and 1000 items in stock
+    And product "product4" is out of stock
+    And there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
+    And cart rule "cartrule1" has a discount code "foo1"
+    And there is a cart rule named "cartrule13" that applies a percent discount of 10.0% with priority 13, quantity of 1000 and quantity per user 1000
+    And cart rule "cartrule13" has a discount code "foo13"
+    And cart rule "cartrule13" offers a gift product "product4"
+    And I add 1 items of product "product1" in my cart
+    And I should have 1 different products in my cart
+    And my cart total should be 26.8 tax excluded
+    When I apply the discount code "foo13"
+    Then my cart total should be 24.8 tax excluded
+    Then cart rule "cartrule1" can be applied to my cart
+    When I apply the discount code "foo1"
+    Then my cart total should be 15.9 tax excluded
+    And I should have 1 products in my cart
+    And at least one cart rule applies today for customer with id 0
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/bo_apply_cart_rule.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/bo_apply_cart_rule.feature
new file mode 100644
index 0000000000000..c42399c9974c5
--- /dev/null
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/bo_apply_cart_rule.feature
@@ -0,0 +1,34 @@
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags bo-apply-cart-rule
+@restore-all-tables-before-feature
+@bo-apply-cart-rule
+Feature: Apply cart rule to cart from Back Office (BO)
+  As an employee
+  I must be able to correctly apply cart rules to carts in BO
+
+  Background:
+    And there is customer "testCustomer" with email "pub@prestashop.com"
+    And country "US" is enabled
+
+  Scenario: Add cart rule which provides gift product and free shipping
+    Given I create an empty cart "dummy_cart_1" for customer "testCustomer"
+    And I select "US" address as delivery and invoice address for customer "testCustomer" in cart "dummy_cart_1"
+    And I add 2 products "Mug The best is yet to come" to the cart "dummy_cart_1"
+    And product "Mug The best is yet to come" quantity in cart dummy_cart_1 should be 2 excluding gift products
+    When I use a voucher "gift+freeShip" which provides a gift product "Mountain fox notebook" and free shipping on the cart "dummy_cart_1"
+    Then gifted product "Mountain fox notebook" quantity in cart "dummy_cart_1" should be 1
+    And cart "dummy_cart_1" should have free shipping
+    And reduction value of voucher "gift+freeShip" in cart "dummy_cart_1" should be "19.9"
+
+  Scenario: Add multiple cart rules which uses same gift product to the cart which already has paid products identical to those gifts
+    Given I create an empty cart "dummy_cart_2" for customer "testCustomer"
+    And I select "US" address as delivery and invoice address for customer "testCustomer" in cart "dummy_cart_2"
+    And I add 2 products "Mountain fox notebook" to the cart "dummy_cart_2"
+    And product "Mountain fox notebook" quantity in cart "dummy_cart_2" should be 2 excluding gift products
+    When I use a voucher "foxGift1" which provides a gift product "Mountain fox notebook" on the cart "dummy_cart_2"
+    Then product "Mountain fox notebook" quantity in cart "dummy_cart_2" should be 2 excluding gift products
+    And gifted product "Mountain fox notebook" quantity in cart "dummy_cart_2" should be 1
+    And reduction value of voucher "foxGift1" in cart "dummy_cart_2" should be "12.9"
+    When I use a voucher "foxGift2" which provides a gift product "Mountain fox notebook" on the cart "dummy_cart_2"
+    Then product "Mountain fox notebook" quantity in cart "dummy_cart_2" should be 2 excluding gift products
+    And gifted product "Mountain fox notebook" quantity in cart "dummy_cart_2" should be 2
+    And reduction value of voucher "foxGift2" in cart "dummy_cart_2" should be "12.9"

From 71ca6000395b99b56615d821ef7956f9f624b318 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Mon, 8 May 2023 18:05:17 +0300
Subject: [PATCH 0221/1030]  rename some scenarios so its clear they are for
 carts in BO

---
 .../apply_cart_rule.feature}                           |  2 +-
 .../CartRule/{ => BackOffice}/gift_cartrule.feature    | 10 +++++-----
 .../{ => BackOffice}/minimum_amount_cartrule.feature   | 10 +++++-----
 .../{ => BackOffice}/usage_limit_per_user.feature      |  9 +++++----
 .../CartRule/{ => FrontOffice}/apply_cart_rule.feature |  4 ++--
 5 files changed, 18 insertions(+), 17 deletions(-)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/{bo_apply_cart_rule.feature => BackOffice/apply_cart_rule.feature} (96%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/{ => BackOffice}/gift_cartrule.feature (92%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/{ => BackOffice}/minimum_amount_cartrule.feature (95%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/{ => BackOffice}/usage_limit_per_user.feature (90%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/{ => FrontOffice}/apply_cart_rule.feature (99%)

diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/bo_apply_cart_rule.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/BackOffice/apply_cart_rule.feature
similarity index 96%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/bo_apply_cart_rule.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/BackOffice/apply_cart_rule.feature
index c42399c9974c5..d7ae0369821a7 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/bo_apply_cart_rule.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/BackOffice/apply_cart_rule.feature
@@ -3,7 +3,7 @@
 @bo-apply-cart-rule
 Feature: Apply cart rule to cart from Back Office (BO)
   As an employee
-  I must be able to correctly apply cart rules to carts in BO
+  I must be able to correctly apply various cart rules to cart when creating order in BO
 
   Background:
     And there is customer "testCustomer" with email "pub@prestashop.com"
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/gift_cartrule.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/BackOffice/gift_cartrule.feature
similarity index 92%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/gift_cartrule.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/BackOffice/gift_cartrule.feature
index 3f5810a512ebb..6b1d4cfd16018 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/gift_cartrule.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/BackOffice/gift_cartrule.feature
@@ -1,9 +1,9 @@
-# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags cart-gift-cart-rule
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags bo-cart-gift-cart-rule
 @restore-all-tables-before-feature
-@cart-gift-cart-rule
-Feature: Add cart rule in cart
-  As a customer
-  I must be able to correctly add cart rules in my cart
+@bo-cart-gift-cart-rule
+Feature: Apply cart rule to cart from Back Office (BO)
+  As an employee
+  I must be able to correctly apply various cart rules to cart when creating order in BO
 
   Background:
     And there is customer "testCustomer" with email "pub@prestashop.com"
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/minimum_amount_cartrule.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/BackOffice/minimum_amount_cartrule.feature
similarity index 95%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/minimum_amount_cartrule.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/BackOffice/minimum_amount_cartrule.feature
index 023d299219db9..329853875cc1d 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/minimum_amount_cartrule.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/BackOffice/minimum_amount_cartrule.feature
@@ -1,9 +1,9 @@
-# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags cart-minimum-amount-cart-rule
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags bo-cart-minimum-amount-cart-rule
 @restore-all-tables-before-feature
-@cart-minimum-amount-cart-rule
-Feature: Add cart rule in cart
-  As a customer
-  I must be able to correctly add cart rules in my cart
+@bo-cart-minimum-amount-cart-rule
+Feature: Apply cart rule to cart from Back Office (BO)
+  As an employee
+  I must be able to correctly apply various cart rules to cart when creating order in BO
 
   Background:
     Given there is customer "testCustomer" with email "pub@prestashop.com"
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/usage_limit_per_user.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/BackOffice/usage_limit_per_user.feature
similarity index 90%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/usage_limit_per_user.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/BackOffice/usage_limit_per_user.feature
index ba8afdfcb8a36..790c7489e1c1c 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/usage_limit_per_user.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/BackOffice/usage_limit_per_user.feature
@@ -1,8 +1,9 @@
-# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags cart-rule-usage-limit
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags bo-cart-rule-usage-limit
 @restore-all-tables-before-feature
-@cart-rule-usage-limit
-
-Feature: A cart rule's usage limit per user is detected
+@bo-cart-rule-usage-limit
+Feature: Apply cart rule to cart from Back Office (BO)
+  As an employee
+  I must be able to correctly apply various cart rules to cart when creating order in BO
 
   Background:
     Given country "US" is enabled
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/apply_cart_rule.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/FrontOffice/apply_cart_rule.feature
similarity index 99%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/apply_cart_rule.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/FrontOffice/apply_cart_rule.feature
index d32155d91925d..cde350c9a4f67 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/apply_cart_rule.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/FrontOffice/apply_cart_rule.feature
@@ -1,6 +1,6 @@
-# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags apply-cart-rule
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags fo-apply-cart-rule
 @restore-all-tables-before-feature
-@apply-cart-rule
+@fo-apply-cart-rule
 Feature: Apply cart rule to cart
   As a customer
   I must be able to apply cart rules to my cart

From 2e005d95626fa909dca4bcb3c45719b1d188fb63 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Tue, 9 May 2023 12:11:03 +0300
Subject: [PATCH 0222/1030]  add shipping assertions

---
 .../Features/Context/CartFeatureContext.php         | 13 +++++++++++++
 .../CartRule/FrontOffice/apply_cart_rule.feature    |  9 ++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Context/CartFeatureContext.php b/tests/Integration/Behaviour/Features/Context/CartFeatureContext.php
index a405bc59c95b5..261e695568705 100644
--- a/tests/Integration/Behaviour/Features/Context/CartFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/CartFeatureContext.php
@@ -29,6 +29,7 @@
 use Cart;
 use Context;
 use PHPUnit\Framework\Assert;
+use PrestaShop\Decimal\DecimalNumber;
 use Tests\Integration\Utility\CartOld;
 
 class CartFeatureContext extends AbstractPrestaShopFeatureContext
@@ -202,6 +203,18 @@ public function calculateCartShippingFees($expectedShippingFees, $taxes = null)
         }
     }
 
+    /**
+     * @Then /^total cart shipping fees should be (\d+\.\d+) tax (excluded|included)?$/
+     */
+    public function assertTotalCartShipping(string $expectedShipping, bool $taxIncluded): void
+    {
+        $cart = $this->getCurrentCart();
+        $expectedTotal = new DecimalNumber($expectedShipping);
+        $actualTotal = new DecimalNumber((string) $cart->getOrderTotal($taxIncluded, Cart::ONLY_SHIPPING));
+
+        Assert::assertSame((string) $expectedTotal, (string) $actualTotal, 'Unexpected total cart shipping');
+    }
+
     /**
      * @Then /^I should have a voucher named "(.+)" with (\d+\.\d+) of discount$/
      */
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/FrontOffice/apply_cart_rule.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/FrontOffice/apply_cart_rule.feature
index cde350c9a4f67..9c0ec89b887f6 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/FrontOffice/apply_cart_rule.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/FrontOffice/apply_cart_rule.feature
@@ -6,7 +6,7 @@ Feature: Apply cart rule to cart
   I must be able to apply cart rules to my cart
 
   Background:
-    And there is customer "testCustomer" with email "pub@prestashop.com"
+    Given there is customer "testCustomer" with email "pub@prestashop.com"
     And country "US" is enabled
 
   Scenario: Adding a cart rule to an empty cart should not be possible
@@ -28,10 +28,9 @@ Feature: Apply cart rule to cart
     Given cart rule "cartrule1" has a discount code "foo1"
     When I add 1 items of product "product1" in my cart
     Then I should have 1 different products in my cart
-    # 19.812 product +7 shipping (1 cent probably lost on price convertion?)
+    And total cart shipping fees should be 7.0 tax excluded
     And my cart total should be 26.8 tax excluded
     When I apply the discount code "foo1"
-    # @todo: products discounted by 50% and then shipping is added. So (19.812/2)+7. Need to add shipping assertion to make it clearer
     Then my cart total should be 16.9 tax excluded
     When at least one cart rule applies today for customer with id 0
     Then I should have 1 products in my cart
@@ -46,6 +45,7 @@ Feature: Apply cart rule to cart
     Given cart rule "cartrule2" has a discount code "foo2"
     When I add 1 items of product "product1" in my cart
     Then I should have 1 different products in my cart
+    And total cart shipping fees should be 7.0 tax excluded
     And my cart total should be 26.8 tax excluded
     When I apply the discount code "foo1"
     Then my cart total should be 16.9 tax excluded
@@ -63,6 +63,7 @@ Feature: Apply cart rule to cart
     Given cart rule "cartrule1" has a discount code "foo1"
     When I add 1 items of product "product1" in my cart
     Then I should have 1 different products in my cart
+    And total cart shipping fees should be 7.0 tax excluded
     And my cart total should be 26.8 tax excluded
     When I apply the discount code "foo1"
     Then my cart total should be 16.9 tax excluded
@@ -83,6 +84,7 @@ Feature: Apply cart rule to cart
     And cart rule "cartrule12" offers a gift product "product3"
     And I add 1 items of product "product1" in my cart
     And I should have 1 different products in my cart
+    And total cart shipping fees should be 7.0 tax excluded
     And my cart total should be 26.8 tax excluded
     When I apply the discount code "foo12"
     Then my cart total should be 24.8 tax excluded
@@ -105,6 +107,7 @@ Feature: Apply cart rule to cart
     And cart rule "cartrule13" offers a gift product "product4"
     And I add 1 items of product "product1" in my cart
     And I should have 1 different products in my cart
+    And total cart shipping fees should be 7.0 tax excluded
     And my cart total should be 26.8 tax excluded
     When I apply the discount code "foo13"
     Then my cart total should be 24.8 tax excluded

From 393926578f0caa1181d0693ba84dcef249eea7b7 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Tue, 9 May 2023 14:52:46 +0300
Subject: [PATCH 0223/1030]  move gift cart rule related scenarios

---
 .../BackOffice/apply_cart_rule.feature        | 34 -------------------
 .../CartRule/BackOffice/gift_cartrule.feature | 24 +++++++++++++
 2 files changed, 24 insertions(+), 34 deletions(-)
 delete mode 100644 tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/BackOffice/apply_cart_rule.feature

diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/BackOffice/apply_cart_rule.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/BackOffice/apply_cart_rule.feature
deleted file mode 100644
index d7ae0369821a7..0000000000000
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/BackOffice/apply_cart_rule.feature
+++ /dev/null
@@ -1,34 +0,0 @@
-# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags bo-apply-cart-rule
-@restore-all-tables-before-feature
-@bo-apply-cart-rule
-Feature: Apply cart rule to cart from Back Office (BO)
-  As an employee
-  I must be able to correctly apply various cart rules to cart when creating order in BO
-
-  Background:
-    And there is customer "testCustomer" with email "pub@prestashop.com"
-    And country "US" is enabled
-
-  Scenario: Add cart rule which provides gift product and free shipping
-    Given I create an empty cart "dummy_cart_1" for customer "testCustomer"
-    And I select "US" address as delivery and invoice address for customer "testCustomer" in cart "dummy_cart_1"
-    And I add 2 products "Mug The best is yet to come" to the cart "dummy_cart_1"
-    And product "Mug The best is yet to come" quantity in cart dummy_cart_1 should be 2 excluding gift products
-    When I use a voucher "gift+freeShip" which provides a gift product "Mountain fox notebook" and free shipping on the cart "dummy_cart_1"
-    Then gifted product "Mountain fox notebook" quantity in cart "dummy_cart_1" should be 1
-    And cart "dummy_cart_1" should have free shipping
-    And reduction value of voucher "gift+freeShip" in cart "dummy_cart_1" should be "19.9"
-
-  Scenario: Add multiple cart rules which uses same gift product to the cart which already has paid products identical to those gifts
-    Given I create an empty cart "dummy_cart_2" for customer "testCustomer"
-    And I select "US" address as delivery and invoice address for customer "testCustomer" in cart "dummy_cart_2"
-    And I add 2 products "Mountain fox notebook" to the cart "dummy_cart_2"
-    And product "Mountain fox notebook" quantity in cart "dummy_cart_2" should be 2 excluding gift products
-    When I use a voucher "foxGift1" which provides a gift product "Mountain fox notebook" on the cart "dummy_cart_2"
-    Then product "Mountain fox notebook" quantity in cart "dummy_cart_2" should be 2 excluding gift products
-    And gifted product "Mountain fox notebook" quantity in cart "dummy_cart_2" should be 1
-    And reduction value of voucher "foxGift1" in cart "dummy_cart_2" should be "12.9"
-    When I use a voucher "foxGift2" which provides a gift product "Mountain fox notebook" on the cart "dummy_cart_2"
-    Then product "Mountain fox notebook" quantity in cart "dummy_cart_2" should be 2 excluding gift products
-    And gifted product "Mountain fox notebook" quantity in cart "dummy_cart_2" should be 2
-    And reduction value of voucher "foxGift2" in cart "dummy_cart_2" should be "12.9"
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/BackOffice/gift_cartrule.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/BackOffice/gift_cartrule.feature
index 6b1d4cfd16018..9c692fad5def2 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/BackOffice/gift_cartrule.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/BackOffice/gift_cartrule.feature
@@ -42,3 +42,27 @@ Feature: Apply cart rule to cart from Back Office (BO)
     And gifted product "product4" quantity in cart "dummy_custom_cart" should be 1
     And cart "dummy_custom_cart" should contain 3 products
     And cart "dummy_custom_cart" should contain 2 products excluding gifts
+
+  Scenario: Add cart rule which provides gift product and free shipping
+    Given I create an empty cart "dummy_cart_1" for customer "testCustomer"
+    And I select "US" address as delivery and invoice address for customer "testCustomer" in cart "dummy_cart_1"
+    And I add 2 products "Mug The best is yet to come" to the cart "dummy_cart_1"
+    And product "Mug The best is yet to come" quantity in cart dummy_cart_1 should be 2 excluding gift products
+    When I use a voucher "gift+freeShip" which provides a gift product "Mountain fox notebook" and free shipping on the cart "dummy_cart_1"
+    Then gifted product "Mountain fox notebook" quantity in cart "dummy_cart_1" should be 1
+    And cart "dummy_cart_1" should have free shipping
+    And reduction value of voucher "gift+freeShip" in cart "dummy_cart_1" should be "19.9"
+
+  Scenario: Add multiple cart rules which uses same gift product to the cart which already has paid products identical to those gifts
+    Given I create an empty cart "dummy_cart_2" for customer "testCustomer"
+    And I select "US" address as delivery and invoice address for customer "testCustomer" in cart "dummy_cart_2"
+    And I add 2 products "Mountain fox notebook" to the cart "dummy_cart_2"
+    And product "Mountain fox notebook" quantity in cart "dummy_cart_2" should be 2 excluding gift products
+    When I use a voucher "foxGift1" which provides a gift product "Mountain fox notebook" on the cart "dummy_cart_2"
+    Then product "Mountain fox notebook" quantity in cart "dummy_cart_2" should be 2 excluding gift products
+    And gifted product "Mountain fox notebook" quantity in cart "dummy_cart_2" should be 1
+    And reduction value of voucher "foxGift1" in cart "dummy_cart_2" should be "12.9"
+    When I use a voucher "foxGift2" which provides a gift product "Mountain fox notebook" on the cart "dummy_cart_2"
+    Then product "Mountain fox notebook" quantity in cart "dummy_cart_2" should be 2 excluding gift products
+    And gifted product "Mountain fox notebook" quantity in cart "dummy_cart_2" should be 2
+    And reduction value of voucher "foxGift2" in cart "dummy_cart_2" should be "12.9"

From 71be739833a23ad775bb10d69ada3bf5c83ed650 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Tue, 9 May 2023 16:13:27 +0300
Subject: [PATCH 0224/1030]  some reorganization of cart & cart/cartRule behat
 feature files

---
 .../FrontOffice/apply_cart_rule.feature       | 118 -------
 .../cart_rule_carrier_specific.feature        | 105 ------
 .../Cart/Calculation/CartRule/carrier.feature | 151 ---------
 .../delete_cart_rule_from_cart.feature        |   0
 .../delete_product_from_cart.feature          |   0
 .../CartRule/BackOffice/gift_cartrule.feature |   0
 .../minimum_amount_cartrule.feature           |   0
 .../BackOffice/usage_limit_per_user.feature   |   0
 .../FrontOffice/Amount}/amount_mono.feature   |   0
 .../Amount}/amount_mono_virtual.feature       |   0
 .../Amount}/amount_multiple.feature           |   0
 .../Amount}/amount_specific.feature           |   0
 .../FrontOffice/Percent}/percent_mono.feature |  17 +
 .../Percent}/percent_multiple.feature         |  25 +-
 .../Percent}/percent_no_code_multiple.feature |   0
 .../Percent}/percent_specific.feature         |   0
 .../Percent}/percent_specific_mono.feature    |   0
 .../percent_specific_multiple.feature         |   0
 .../cart_rule_carrier_restriction.feature}    | 103 +++++-
 .../cart_rule_country_restriction.feature}    |   0
 .../Cart/CartRule/FrontOffice/carrier.feature | 300 ++++++++++++++++++
 .../FrontOffice/cart_rule_validation.feature  |  57 ++++
 .../FrontOffice}/cheapest_product.feature     |   0
 .../FrontOffice}/ecotax.feature               |   0
 .../exclude_discounted_product.feature        |   0
 .../FrontOffice}/free_shipping.feature        |   0
 .../FrontOffice}/gift.feature                 |   0
 .../FrontOffice}/mixed.feature                |  47 +++
 .../FrontOffice}/mixed_specific.feature       |   0
 .../Product/add_combination.feature           |   0
 .../Product/add_customization.feature         |   0
 .../{Adding => }/Product/add_pack.feature     |   0
 .../Product/add_standard_product.feature      |   0
 .../Product/gift_wrapping.feature             |   0
 .../Product/only_products.feature             |   0
 .../Product/specific_price.feature            |   0
 .../Product/update_pack.feature               |   0
 .../RoundingMode/round_down.feature           |   0
 .../RoundingMode/round_half_down.feature      |   0
 .../RoundingMode/round_half_even.feature      |   0
 .../RoundingMode/round_half_odd.feature       |   0
 .../RoundingMode/round_half_up.feature        |   0
 .../RoundingMode/round_up.feature             |   0
 .../RoundingType/round_item.feature           |   0
 .../RoundingType/round_line.feature           |   0
 .../RoundingType/round_total.feature          |   0
 .../SpecificPriceRule/amount.feature          |   0
 .../SpecificPriceRule/mixed.feature           |   0
 .../SpecificPriceRule/percent.feature         |   0
 .../percent_multiple.feature                  |   0
 .../SpecificPriceRule/price_set.feature       |   0
 .../{Calculation/Carrier => }/carrier.feature |   0
 .../{CartToOrder => }/cart_to_order.feature   |   0
 .../Currency => }/currency.feature            |   0
 .../{Delivery => }/delivery_options.feature   |   0
 .../Cart/{Calculation/Taxes => }/tax.feature  |   0
 56 files changed, 545 insertions(+), 378 deletions(-)
 delete mode 100644 tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/FrontOffice/apply_cart_rule.feature
 delete mode 100644 tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/Carrier/cart_rule_carrier_specific.feature
 delete mode 100644 tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/CartRule/carrier.feature
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Deleting => CartRule/BackOffice}/delete_cart_rule_from_cart.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Deleting => CartRule/BackOffice}/delete_product_from_cart.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Adding => }/CartRule/BackOffice/gift_cartrule.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Adding => }/CartRule/BackOffice/minimum_amount_cartrule.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Adding => }/CartRule/BackOffice/usage_limit_per_user.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Calculation/CartRule => CartRule/FrontOffice/Amount}/amount_mono.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Calculation/CartRule => CartRule/FrontOffice/Amount}/amount_mono_virtual.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Calculation/CartRule => CartRule/FrontOffice/Amount}/amount_multiple.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Calculation/CartRule => CartRule/FrontOffice/Amount}/amount_specific.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Calculation/CartRule => CartRule/FrontOffice/Percent}/percent_mono.feature (75%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Calculation/CartRule => CartRule/FrontOffice/Percent}/percent_multiple.feature (80%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Calculation/CartRule => CartRule/FrontOffice/Percent}/percent_no_code_multiple.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Calculation/CartRule => CartRule/FrontOffice/Percent}/percent_specific.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Calculation/CartRule => CartRule/FrontOffice/Percent}/percent_specific_mono.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Calculation/CartRule => CartRule/FrontOffice/Percent}/percent_specific_multiple.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Calculation/Carrier/change_carrier_cart_rule.feature => CartRule/FrontOffice/Restrictions/cart_rule_carrier_restriction.feature} (60%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Calculation/Country/cart_rule_country_specific.feature => CartRule/FrontOffice/Restrictions/cart_rule_country_restriction.feature} (100%)
 create mode 100644 tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/carrier.feature
 create mode 100644 tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Calculation/CartRule => CartRule/FrontOffice}/cheapest_product.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Calculation/CartRule => CartRule/FrontOffice}/ecotax.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Calculation/CartRule => CartRule/FrontOffice}/exclude_discounted_product.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Calculation/CartRule => CartRule/FrontOffice}/free_shipping.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Calculation/CartRule => CartRule/FrontOffice}/gift.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Calculation/CartRule => CartRule/FrontOffice}/mixed.feature (67%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Calculation/CartRule => CartRule/FrontOffice}/mixed_specific.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Adding => }/Product/add_combination.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Adding => }/Product/add_customization.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Adding => }/Product/add_pack.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Adding => }/Product/add_standard_product.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Calculation => }/Product/gift_wrapping.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Calculation => }/Product/only_products.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Calculation => }/Product/specific_price.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Updating => }/Product/update_pack.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Calculation => Rounding}/RoundingMode/round_down.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Calculation => Rounding}/RoundingMode/round_half_down.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Calculation => Rounding}/RoundingMode/round_half_even.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Calculation => Rounding}/RoundingMode/round_half_odd.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Calculation => Rounding}/RoundingMode/round_half_up.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Calculation => Rounding}/RoundingMode/round_up.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Calculation => Rounding}/RoundingType/round_item.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Calculation => Rounding}/RoundingType/round_line.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Calculation => Rounding}/RoundingType/round_total.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Calculation => }/SpecificPriceRule/amount.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Calculation => }/SpecificPriceRule/mixed.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Calculation => }/SpecificPriceRule/percent.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Calculation => }/SpecificPriceRule/percent_multiple.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Calculation => }/SpecificPriceRule/price_set.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Calculation/Carrier => }/carrier.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{CartToOrder => }/cart_to_order.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Calculation/Currency => }/currency.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Delivery => }/delivery_options.feature (100%)
 rename tests/Integration/Behaviour/Features/Scenario/Cart/{Calculation/Taxes => }/tax.feature (100%)

diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/FrontOffice/apply_cart_rule.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/FrontOffice/apply_cart_rule.feature
deleted file mode 100644
index 9c0ec89b887f6..0000000000000
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/FrontOffice/apply_cart_rule.feature
+++ /dev/null
@@ -1,118 +0,0 @@
-# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags fo-apply-cart-rule
-@restore-all-tables-before-feature
-@fo-apply-cart-rule
-Feature: Apply cart rule to cart
-  As a customer
-  I must be able to apply cart rules to my cart
-
-  Background:
-    Given there is customer "testCustomer" with email "pub@prestashop.com"
-    And country "US" is enabled
-
-  Scenario: Adding a cart rule to an empty cart should not be possible
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule1" has a discount code "foo1"
-    Then I should have 0 different products in my cart
-    When I apply the discount code "foo1"
-    Then I should get cart rule validation error saying "Cart is empty"
-    When at least one cart rule applies today for customer with id 0
-    Then I should have 0 products in my cart
-
-  Scenario: 1 product in cart, percentage reduction cart rule is applied correctly
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule1" has a discount code "foo1"
-    When I add 1 items of product "product1" in my cart
-    Then I should have 1 different products in my cart
-    And total cart shipping fees should be 7.0 tax excluded
-    And my cart total should be 26.8 tax excluded
-    When I apply the discount code "foo1"
-    Then my cart total should be 16.9 tax excluded
-    When at least one cart rule applies today for customer with id 0
-    Then I should have 1 products in my cart
-
-  Scenario: 2 combinable cart rules are applied correctly
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule1" has a discount code "foo1"
-    Given there is a cart rule named "cartrule2" that applies a percent discount of 30.0% with priority 2, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule2" has a discount code "foo2"
-    When I add 1 items of product "product1" in my cart
-    Then I should have 1 different products in my cart
-    And total cart shipping fees should be 7.0 tax excluded
-    And my cart total should be 26.8 tax excluded
-    When I apply the discount code "foo1"
-    Then my cart total should be 16.9 tax excluded
-    When I apply the discount code "foo2"
-    # (19.812*0.5)*0.7 + 7 shipping
-    Then my cart total should be 13.9 tax excluded
-    When at least one cart rule applies today for customer with id 0
-    Then I should have 1 products in my cart
-
-  Scenario: Cart rule cannot be applied again when it is already in the cart
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule1" has a discount code "foo1"
-    When I add 1 items of product "product1" in my cart
-    Then I should have 1 different products in my cart
-    And total cart shipping fees should be 7.0 tax excluded
-    And my cart total should be 26.8 tax excluded
-    When I apply the discount code "foo1"
-    Then my cart total should be 16.9 tax excluded
-    When I apply the discount code "foo1"
-    Then I should get cart rule validation error saying "This voucher is already in your cart"
-    When at least one cart rule applies today for customer with id 0
-    Then I should have 1 products in my cart
-
-  Scenario: Percentage reduction cart rule and gift product cart rule applied to the same cart
-    Given I have an empty default cart
-    And shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    And there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    And there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
-    And there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    And cart rule "cartrule1" has a discount code "foo1"
-    And there is a cart rule named "cartrule12" that applies a percent discount of 10.0% with priority 1, quantity of 1000 and quantity per user 1000
-    And cart rule "cartrule12" has a discount code "foo12"
-    And cart rule "cartrule12" offers a gift product "product3"
-    And I add 1 items of product "product1" in my cart
-    And I should have 1 different products in my cart
-    And total cart shipping fees should be 7.0 tax excluded
-    And my cart total should be 26.8 tax excluded
-    When I apply the discount code "foo12"
-    Then my cart total should be 24.8 tax excluded
-    And I should have 2 products in my cart
-    When I apply the discount code "foo1"
-    Then my cart total should be 15.9 tax excluded
-    And I should have 2 products in my cart
-    And at least one cart rule applies today for customer with id 0
-
-  Scenario: 1 product in cart, cart rule giving gift out of stock, and global cart rule should be inserted without error (test PR #8361)
-    Given I have an empty default cart
-    And shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    And there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    And there is a product in the catalog named "product4" with a price of 35.567 and 1000 items in stock
-    And product "product4" is out of stock
-    And there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    And cart rule "cartrule1" has a discount code "foo1"
-    And there is a cart rule named "cartrule13" that applies a percent discount of 10.0% with priority 13, quantity of 1000 and quantity per user 1000
-    And cart rule "cartrule13" has a discount code "foo13"
-    And cart rule "cartrule13" offers a gift product "product4"
-    And I add 1 items of product "product1" in my cart
-    And I should have 1 different products in my cart
-    And total cart shipping fees should be 7.0 tax excluded
-    And my cart total should be 26.8 tax excluded
-    When I apply the discount code "foo13"
-    Then my cart total should be 24.8 tax excluded
-    Then cart rule "cartrule1" can be applied to my cart
-    When I apply the discount code "foo1"
-    Then my cart total should be 15.9 tax excluded
-    And I should have 1 products in my cart
-    And at least one cart rule applies today for customer with id 0
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/Carrier/cart_rule_carrier_specific.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/Carrier/cart_rule_carrier_specific.feature
deleted file mode 100644
index 85fa5e469c3fe..0000000000000
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/Carrier/cart_rule_carrier_specific.feature
+++ /dev/null
@@ -1,105 +0,0 @@
-@restore-all-tables-before-feature
-Feature: Cart calculation with carrier specific cart rules
-  As a customer
-  I must be able to have correct cart total when selecting carriers
-
-  Scenario: Empty cart, carrier 1
-    Given I have an empty default cart
-    Given there is a zone named "zone1"
-    Given there is a zone named "zone2"
-    Given there is a country named "country1" and iso code "FR" in zone "zone1"
-    Given there is a country named "country2" and iso code "US" in zone "zone2"
-    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
-    Given there is a state named "state2" with iso code "TEST-2" in country "country2" and zone "zone2"
-    Given there is an address named "address1" with postcode "1" in state "state1"
-    Given there is an address named "address2" with postcode "1" in state "state2"
-    Given there is a carrier named "carrier1"
-    Given carrier "carrier1" applies shipping fees of 3.1 in zone "zone1" for price between 0 and 10000
-    Given carrier "carrier1" applies shipping fees of 4.3 in zone "zone2" for price between 0 and 10000
-    Given there is a carrier named "carrier2"
-    Given carrier "carrier2" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
-    Given carrier "carrier2" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
-    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule1" is restricted to carrier "carrier2"
-    When I select address "address1" in my cart
-    When I select carrier "carrier1" in my cart
-    Then cart shipping fees should be 0.0
-    Then my cart total should be 0.0 tax included
-    Then my cart total using previous calculation method should be 0.0 tax included
-
-  Scenario: one product in cart, quantity 1, carrier 1
-    Given I have an empty default cart
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a zone named "zone1"
-    Given there is a zone named "zone2"
-    Given there is a country named "country1" and iso code "FR" in zone "zone1"
-    Given there is a country named "country2" and iso code "US" in zone "zone2"
-    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
-    Given there is a state named "state2" with iso code "TEST-2" in country "country2" and zone "zone2"
-    Given there is an address named "address1" with postcode "1" in state "state1"
-    Given there is an address named "address2" with postcode "1" in state "state2"
-    Given there is a carrier named "carrier1"
-    Given carrier "carrier1" applies shipping fees of 3.1 in zone "zone1" for price between 0 and 10000
-    Given carrier "carrier1" applies shipping fees of 4.3 in zone "zone2" for price between 0 and 10000
-    Given there is a carrier named "carrier2"
-    Given carrier "carrier2" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
-    Given carrier "carrier2" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
-    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule1" is restricted to carrier "carrier2"
-    When I add 1 items of product "product1" in my cart
-    When I select address "address1" in my cart
-    When I select carrier "carrier1" in my cart
-    Then cart shipping fees should be 5.1
-    Then my cart total should be 24.912 tax included
-    Then my cart total using previous calculation method should be 24.912 tax included
-
-  Scenario: Empty cart, carrier 2
-    Given I have an empty default cart
-    Given there is a zone named "zone1"
-    Given there is a zone named "zone2"
-    Given there is a country named "country1" and iso code "FR" in zone "zone1"
-    Given there is a country named "country2" and iso code "US" in zone "zone2"
-    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
-    Given there is a state named "state2" with iso code "TEST-2" in country "country2" and zone "zone2"
-    Given there is an address named "address1" with postcode "1" in state "state1"
-    Given there is an address named "address2" with postcode "1" in state "state2"
-    Given there is a carrier named "carrier1"
-    Given carrier "carrier1" applies shipping fees of 3.1 in zone "zone1" for price between 0 and 10000
-    Given carrier "carrier1" applies shipping fees of 4.3 in zone "zone2" for price between 0 and 10000
-    Given there is a carrier named "carrier2"
-    Given carrier "carrier2" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
-    Given carrier "carrier2" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
-    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule1" is restricted to carrier "carrier2"
-    When I select address "address1" in my cart
-    When I select carrier "carrier2" in my cart
-    Then cart shipping fees should be 0.0
-    Then my cart total should be 0.0 tax included
-    Then my cart total using previous calculation method should be 0.0 tax included
-
-  # following is testing the bug http://forge.prestashop.com/browse/BOOM-3307
-  Scenario: one product in cart, quantity 1, carrier 2
-    Given I have an empty default cart
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a zone named "zone1"
-    Given there is a zone named "zone2"
-    Given there is a country named "country1" and iso code "FR" in zone "zone1"
-    Given there is a country named "country2" and iso code "US" in zone "zone2"
-    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
-    Given there is a state named "state2" with iso code "TEST-2" in country "country2" and zone "zone2"
-    Given there is an address named "address1" with postcode "1" in state "state1"
-    Given there is an address named "address2" with postcode "1" in state "state2"
-    Given there is a carrier named "carrier1"
-    Given carrier "carrier1" applies shipping fees of 3.1 in zone "zone1" for price between 0 and 10000
-    Given carrier "carrier1" applies shipping fees of 4.3 in zone "zone2" for price between 0 and 10000
-    Given there is a carrier named "carrier2"
-    Given carrier "carrier2" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
-    Given carrier "carrier2" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
-    Given there is a cart rule named "cartrule1" that applies a percent discount of 55.0% with priority 1, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule1" is restricted to carrier "carrier2"
-    When I add 1 items of product "product1" in my cart
-    When I select address "address1" in my cart
-    When I select carrier "carrier2" in my cart
-    Then cart shipping fees should be 7.7
-    Then my cart total should be 16.6154 tax included
-    Then my cart total using previous calculation method should be 16.6154 tax included
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/CartRule/carrier.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/CartRule/carrier.feature
deleted file mode 100644
index 0bd7efc9d19d8..0000000000000
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/CartRule/carrier.feature
+++ /dev/null
@@ -1,151 +0,0 @@
-@restore-all-tables-before-feature
-Feature: Cart calculation with cart rules giving gift
-  As a customer
-  I must be able to have correct cart total when adding products, and adding cart rule with gift
-
-  # Issue #9540 part one fixed by #12965
-  Scenario: free carrier in price range, voucher in percent set the price bellow range
-    Given I have an empty default cart
-    Given there is a product in the catalog named "product1" with a price of 151.0 and 1000 items in stock
-    Given there is a zone named "zone1"
-    Given there is a country named "country1" and iso code "FR" in zone "zone1"
-    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
-    Given there is an address named "address1" with postcode "1" in state "state1"
-    Given there is a carrier named "carrier1"
-    Given carrier "carrier1" applies shipping fees of 5.0 in zone "zone1" for price between 0 and 150
-    Given carrier "carrier1" applies shipping fees of 0.0 in zone "zone1" for price between 150 and 1000
-    Given there is a cart rule named "cartrule2" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule2" has a discount code "foo2"
-    When I add 1 item of product "product1" in my cart
-    When I use the discount "cartrule2"
-    When I select address "address1" in my cart
-    When I select carrier "carrier1" in my cart
-    Then cart shipping fees should be 7.0
-    Then my cart total should be 82.5 tax included
-    Then my cart total using previous calculation method should be 82.5 tax included
-
-  Scenario: free carrier in price range, voucher in amount set the price bellow range
-    Given I have an empty default cart
-    Given there is a product in the catalog named "product1" with a price of 151.0 and 1000 items in stock
-    Given there is a zone named "zone1"
-    Given there is a country named "country1" and iso code "FR" in zone "zone1"
-    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
-    Given there is an address named "address1" with postcode "1" in state "state1"
-    Given there is a carrier named "carrier1"
-    Given carrier "carrier1" applies shipping fees of 5.0 in zone "zone1" for price between 0 and 150
-    Given carrier "carrier1" applies shipping fees of 0.0 in zone "zone1" for price between 150 and 1000
-    Given there is a cart rule named "cartrule2" that applies an amount discount of 2.0 with priority 2, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule2" has a discount code "foo2"
-    When I add 1 item of product "product1" in my cart
-    When I use the discount "cartrule2"
-    When I select address "address1" in my cart
-    When I select carrier "carrier1" in my cart
-    Then cart shipping fees should be 7.0
-    Then my cart total should be 156.0 tax included
-    Then my cart total using previous calculation method should be 156.0 tax included
-
-  # Issue #12976 part two
-  Scenario: carrier fees not free, voucher without code set shipping fees free above amount, cart total is below
-    Given I have an empty default cart
-    Given there is a product in the catalog named "product1" with a price of 149.0 and 1000 items in stock
-    Given there is a zone named "zone1"
-    Given there is a country named "country1" and iso code "FR" in zone "zone1"
-    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
-    Given there is an address named "address1" with postcode "1" in state "state1"
-    Given there is a carrier named "carrier1"
-    Given carrier "carrier1" applies shipping fees of 5.0 in zone "zone1" for price between 0 and 10000
-    Given there is a cart rule named "cartrule2" that applies an amount discount of 0.0 with priority 2, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule2" offers free shipping
-    Given cart rule "cartrule2" applies discount only when cart total is above 150.0
-    When I add 1 item of product "product1" in my cart
-    When I select address "address1" in my cart
-    When I select carrier "carrier1" in my cart
-    Then cart shipping fees should be 7.0
-    Then my cart total should be 156.0 tax included
-    Then my cart total using previous calculation method should be 156.0 tax included
-
-  Scenario: carrier fees not free, voucher with code set shipping fees free above amount, cart total is below
-    Given I have an empty default cart
-    Given there is a product in the catalog named "product1" with a price of 149.0 and 1000 items in stock
-    Given there is a zone named "zone1"
-    Given there is a country named "country1" and iso code "FR" in zone "zone1"
-    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
-    Given there is an address named "address1" with postcode "1" in state "state1"
-    Given there is a carrier named "carrier1"
-    Given carrier "carrier1" applies shipping fees of 5.0 in zone "zone1" for price between 0 and 150
-    Given carrier "carrier1" applies shipping fees of 0.0 in zone "zone1" for price between 150 and 1000
-    Given there is a cart rule named "cartrule2" that applies an amount discount of 0.0 with priority 2, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule2" has a discount code "foo2"
-    Given cart rule "cartrule2" offers free shipping
-    Given cart rule "cartrule2" applies discount only when cart total is above 150.0
-    When I add 1 item of product "product1" in my cart
-    When I select address "address1" in my cart
-    When I select carrier "carrier1" in my cart
-    Then cart rule "cartrule2" cannot be applied to my cart
-    Then cart shipping fees should be 7.0
-    Then my cart total should be 156.0 tax included
-    Then my cart total using previous calculation method should be 156.0 tax included
-
-  Scenario: carrier fees not free, voucher without code set shipping fees free above amount, cart total is below
-    Given I have an empty default cart
-    Given there is a product in the catalog named "product1" with a price of 149.0 and 1000 items in stock
-    Given there is a zone named "zone1"
-    Given there is a country named "country1" and iso code "FR" in zone "zone1"
-    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
-    Given there is an address named "address1" with postcode "1" in state "state1"
-    Given there is a carrier named "carrier1"
-    Given carrier "carrier1" applies shipping fees of 5.0 in zone "zone1" for price between 0 and 10000
-    Given there is a cart rule named "cartrule2" that applies an amount discount of 0.0 with priority 2, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule2" offers free shipping
-    Given cart rule "cartrule2" applies discount only when cart total is above 150.0
-    When I add 1 item of product "product1" in my cart
-    When I select address "address1" in my cart
-    When I select carrier "carrier1" in my cart
-    Then cart shipping fees should be 7.0
-    Then my cart total should be 156.0 tax included
-    Then my cart total using previous calculation method should be 156.0 tax included
-
-  Scenario: carrier fees not free, voucher with code set shipping fees free above amount, cart total is above
-    Given I have an empty default cart
-    Given there is a product in the catalog named "product1" with a price of 151.0 and 1000 items in stock
-    Given there is a zone named "zone1"
-    Given there is a country named "country1" and iso code "FR" in zone "zone1"
-    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
-    Given there is an address named "address1" with postcode "1" in state "state1"
-    Given there is a carrier named "carrier1"
-    Given carrier "carrier1" applies shipping fees of 5.0 in zone "zone1" for price between 0 and 150
-    Given carrier "carrier1" applies shipping fees of 0.0 in zone "zone1" for price between 150 and 1000
-    Given there is a cart rule named "cartrule2" that applies an amount discount of 0.0 with priority 2, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule2" has a discount code "foo2"
-    Given cart rule "cartrule2" offers free shipping
-    Given cart rule "cartrule2" applies discount only when cart total is above 150.0
-    When I add 1 item of product "product1" in my cart
-    When I select address "address1" in my cart
-    When I select carrier "carrier1" in my cart
-    Then cart rule "cartrule2" can be applied to my cart
-    When I use the discount "cartrule2"
-    Then cart shipping fees should be 2.0
-    Then my cart total should be 151.0 tax included
-    Then my cart total using previous calculation method should be 151.0 tax included
-
-  Scenario: carrier fees not free, voucher without code set shipping fees free above amount, cart total is above
-    Given I have an empty default cart
-    Given there is a product in the catalog named "product1" with a price of 151.0 and 1000 items in stock
-    Given there is a zone named "zone1"
-    Given there is a country named "country1" and iso code "FR" in zone "zone1"
-    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
-    Given there is an address named "address1" with postcode "1" in state "state1"
-    Given there is a carrier named "carrier1"
-    Given carrier "carrier1" applies shipping fees of 5.0 in zone "zone1" for price between 0 and 150
-    Given carrier "carrier1" applies shipping fees of 0.0 in zone "zone1" for price between 150 and 1000
-    Given there is a cart rule named "cartrule2" that applies an amount discount of 0.0 with priority 2, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule2" has a discount code "foo2"
-    Given cart rule "cartrule2" offers free shipping
-    Given cart rule "cartrule2" applies discount only when cart total is above 150.0
-    When I add 1 item of product "product1" in my cart
-    When I use the discount "cartrule2"
-    When I select address "address1" in my cart
-    When I select carrier "carrier1" in my cart
-    Then cart shipping fees should be 2.0
-    Then my cart total should be 151.0 tax included
-    Then my cart total using previous calculation method should be 151.0 tax included
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Deleting/delete_cart_rule_from_cart.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/delete_cart_rule_from_cart.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Deleting/delete_cart_rule_from_cart.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/delete_cart_rule_from_cart.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Deleting/delete_product_from_cart.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/delete_product_from_cart.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Deleting/delete_product_from_cart.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/delete_product_from_cart.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/BackOffice/gift_cartrule.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/gift_cartrule.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/BackOffice/gift_cartrule.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/gift_cartrule.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/BackOffice/minimum_amount_cartrule.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/minimum_amount_cartrule.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/BackOffice/minimum_amount_cartrule.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/minimum_amount_cartrule.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/BackOffice/usage_limit_per_user.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/usage_limit_per_user.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Adding/CartRule/BackOffice/usage_limit_per_user.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/usage_limit_per_user.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/CartRule/amount_mono.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/CartRule/amount_mono.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/CartRule/amount_mono_virtual.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono_virtual.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/CartRule/amount_mono_virtual.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono_virtual.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/CartRule/amount_multiple.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_multiple.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/CartRule/amount_multiple.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_multiple.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/CartRule/amount_specific.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_specific.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/CartRule/amount_specific.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_specific.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/CartRule/percent_mono.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_mono.feature
similarity index 75%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/CartRule/percent_mono.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_mono.feature
index a06da8e40118b..b61dca61a456f 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/CartRule/percent_mono.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_mono.feature
@@ -1,4 +1,6 @@
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags fo-cart-rule-percent-mono
 @restore-all-tables-before-feature
+@fo-cart-rule-percent-mono
 Feature: Cart rule (percent) calculation with one cart rule
   As a customer
   I must be able to have correct cart total when adding cart rules
@@ -49,3 +51,18 @@ Feature: Cart rule (percent) calculation with one cart rule
     When I use the discount "cartrule2"
     Then my cart total should be 84.7 tax included
     Then my cart total using previous calculation method should be 84.7 tax included
+
+  Scenario: 1 product in cart, percentage reduction cart rule is applied correctly
+    Given I have an empty default cart
+    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
+    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
+    Given cart rule "cartrule1" has a discount code "foo1"
+    When I add 1 items of product "product1" in my cart
+    Then I should have 1 different products in my cart
+    And total cart shipping fees should be 7.0 tax excluded
+    And my cart total should be 26.8 tax excluded
+    When I apply the discount code "foo1"
+    Then my cart total should be 16.9 tax excluded
+    When at least one cart rule applies today for customer with id 0
+    Then I should have 1 products in my cart
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/CartRule/percent_multiple.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_multiple.feature
similarity index 80%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/CartRule/percent_multiple.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_multiple.feature
index 924392c1a4369..f98c3ddb6112c 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/CartRule/percent_multiple.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_multiple.feature
@@ -1,7 +1,6 @@
-#./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags calculation-cartrule-percent-multiple
-
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags fo-cart-rule-percent-multiple
 @restore-all-tables-before-feature
-@calculation-cartrule-percent-multiple
+@fo-cart-rule-percent-multiple
 Feature: Cart rule (percent) calculation with multiple cart rules
   As a customer
   I must be able to have correct cart total when adding cart rules
@@ -91,3 +90,23 @@ Feature: Cart rule (percent) calculation with multiple cart rules
       | 10percent        | 1.981 |
     And my cart total should be precisely 17.83 tax included
     And cart shipping fees should be 0.00 tax included
+
+  Scenario: 2 combinable cart rules are applied correctly
+    Given I have an empty default cart
+    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
+    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
+    Given cart rule "cartrule1" has a discount code "foo1"
+    Given there is a cart rule named "cartrule2" that applies a percent discount of 30.0% with priority 2, quantity of 1000 and quantity per user 1000
+    Given cart rule "cartrule2" has a discount code "foo2"
+    When I add 1 items of product "product1" in my cart
+    Then I should have 1 different products in my cart
+    And total cart shipping fees should be 7.0 tax excluded
+    And my cart total should be 26.8 tax excluded
+    When I apply the discount code "foo1"
+    Then my cart total should be 16.9 tax excluded
+    When I apply the discount code "foo2"
+    # (19.812*0.5)*0.7 + 7 shipping
+    Then my cart total should be 13.9 tax excluded
+    When at least one cart rule applies today for customer with id 0
+    Then I should have 1 products in my cart
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/CartRule/percent_no_code_multiple.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_no_code_multiple.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/CartRule/percent_no_code_multiple.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_no_code_multiple.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/CartRule/percent_specific.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_specific.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/CartRule/percent_specific.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_specific.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/CartRule/percent_specific_mono.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_specific_mono.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/CartRule/percent_specific_mono.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_specific_mono.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/CartRule/percent_specific_multiple.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_specific_multiple.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/CartRule/percent_specific_multiple.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_specific_multiple.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/Carrier/change_carrier_cart_rule.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Restrictions/cart_rule_carrier_restriction.feature
similarity index 60%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/Carrier/change_carrier_cart_rule.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Restrictions/cart_rule_carrier_restriction.feature
index fbefa8491e572..a5f6a4311f0fc 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/Carrier/change_carrier_cart_rule.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Restrictions/cart_rule_carrier_restriction.feature
@@ -1,8 +1,109 @@
 @restore-all-tables-before-feature
-Feature: Cart calculation with carriers specific cart rules: carrier changes
+Feature: Cart calculation with carrier specific cart rules
   As a customer
   I must be able to have correct cart total when selecting carriers
 
+  Scenario: Empty cart, carrier 1
+    Given I have an empty default cart
+    Given there is a zone named "zone1"
+    Given there is a zone named "zone2"
+    Given there is a country named "country1" and iso code "FR" in zone "zone1"
+    Given there is a country named "country2" and iso code "US" in zone "zone2"
+    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
+    Given there is a state named "state2" with iso code "TEST-2" in country "country2" and zone "zone2"
+    Given there is an address named "address1" with postcode "1" in state "state1"
+    Given there is an address named "address2" with postcode "1" in state "state2"
+    Given there is a carrier named "carrier1"
+    Given carrier "carrier1" applies shipping fees of 3.1 in zone "zone1" for price between 0 and 10000
+    Given carrier "carrier1" applies shipping fees of 4.3 in zone "zone2" for price between 0 and 10000
+    Given there is a carrier named "carrier2"
+    Given carrier "carrier2" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
+    Given carrier "carrier2" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
+    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
+    Given cart rule "cartrule1" is restricted to carrier "carrier2"
+    When I select address "address1" in my cart
+    When I select carrier "carrier1" in my cart
+    Then cart shipping fees should be 0.0
+    Then my cart total should be 0.0 tax included
+    Then my cart total using previous calculation method should be 0.0 tax included
+
+  Scenario: one product in cart, quantity 1, carrier 1
+    Given I have an empty default cart
+    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+    Given there is a zone named "zone1"
+    Given there is a zone named "zone2"
+    Given there is a country named "country1" and iso code "FR" in zone "zone1"
+    Given there is a country named "country2" and iso code "US" in zone "zone2"
+    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
+    Given there is a state named "state2" with iso code "TEST-2" in country "country2" and zone "zone2"
+    Given there is an address named "address1" with postcode "1" in state "state1"
+    Given there is an address named "address2" with postcode "1" in state "state2"
+    Given there is a carrier named "carrier1"
+    Given carrier "carrier1" applies shipping fees of 3.1 in zone "zone1" for price between 0 and 10000
+    Given carrier "carrier1" applies shipping fees of 4.3 in zone "zone2" for price between 0 and 10000
+    Given there is a carrier named "carrier2"
+    Given carrier "carrier2" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
+    Given carrier "carrier2" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
+    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
+    Given cart rule "cartrule1" is restricted to carrier "carrier2"
+    When I add 1 items of product "product1" in my cart
+    When I select address "address1" in my cart
+    When I select carrier "carrier1" in my cart
+    Then cart shipping fees should be 5.1
+    Then my cart total should be 24.912 tax included
+    Then my cart total using previous calculation method should be 24.912 tax included
+
+  Scenario: Empty cart, carrier 2
+    Given I have an empty default cart
+    Given there is a zone named "zone1"
+    Given there is a zone named "zone2"
+    Given there is a country named "country1" and iso code "FR" in zone "zone1"
+    Given there is a country named "country2" and iso code "US" in zone "zone2"
+    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
+    Given there is a state named "state2" with iso code "TEST-2" in country "country2" and zone "zone2"
+    Given there is an address named "address1" with postcode "1" in state "state1"
+    Given there is an address named "address2" with postcode "1" in state "state2"
+    Given there is a carrier named "carrier1"
+    Given carrier "carrier1" applies shipping fees of 3.1 in zone "zone1" for price between 0 and 10000
+    Given carrier "carrier1" applies shipping fees of 4.3 in zone "zone2" for price between 0 and 10000
+    Given there is a carrier named "carrier2"
+    Given carrier "carrier2" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
+    Given carrier "carrier2" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
+    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
+    Given cart rule "cartrule1" is restricted to carrier "carrier2"
+    When I select address "address1" in my cart
+    When I select carrier "carrier2" in my cart
+    Then cart shipping fees should be 0.0
+    Then my cart total should be 0.0 tax included
+    Then my cart total using previous calculation method should be 0.0 tax included
+
+  # following is testing the bug http://forge.prestashop.com/browse/BOOM-3307
+  Scenario: one product in cart, quantity 1, carrier 2
+    Given I have an empty default cart
+    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+    Given there is a zone named "zone1"
+    Given there is a zone named "zone2"
+    Given there is a country named "country1" and iso code "FR" in zone "zone1"
+    Given there is a country named "country2" and iso code "US" in zone "zone2"
+    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
+    Given there is a state named "state2" with iso code "TEST-2" in country "country2" and zone "zone2"
+    Given there is an address named "address1" with postcode "1" in state "state1"
+    Given there is an address named "address2" with postcode "1" in state "state2"
+    Given there is a carrier named "carrier1"
+    Given carrier "carrier1" applies shipping fees of 3.1 in zone "zone1" for price between 0 and 10000
+    Given carrier "carrier1" applies shipping fees of 4.3 in zone "zone2" for price between 0 and 10000
+    Given there is a carrier named "carrier2"
+    Given carrier "carrier2" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
+    Given carrier "carrier2" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
+    Given there is a cart rule named "cartrule1" that applies a percent discount of 55.0% with priority 1, quantity of 1000 and quantity per user 1000
+    Given cart rule "cartrule1" is restricted to carrier "carrier2"
+    When I add 1 items of product "product1" in my cart
+    When I select address "address1" in my cart
+    When I select carrier "carrier2" in my cart
+    Then cart shipping fees should be 7.7
+    Then my cart total should be 16.6154 tax included
+    Then my cart total using previous calculation method should be 16.6154 tax included
+
   Scenario: one product in cart, quantity 1, cant apply not corresponding cart rule
     Given I have an empty default cart
     Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/Country/cart_rule_country_specific.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Restrictions/cart_rule_country_restriction.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/Country/cart_rule_country_specific.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Restrictions/cart_rule_country_restriction.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/carrier.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/carrier.feature
new file mode 100644
index 0000000000000..81da2b0fb2f11
--- /dev/null
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/carrier.feature
@@ -0,0 +1,300 @@
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags fo-cart-rule-carrier
+@restore-all-tables-before-feature
+@fo-cart-rule-carrier
+Feature: Cart calculation with cart rules and different carriers
+  As a customer
+  I must see correct cart total price with different carriers when applying cart rules
+
+  # Issue #9540 part one fixed by #12965
+  Scenario: free carrier in price range, voucher in percent set the price bellow range
+    Given I have an empty default cart
+    Given there is a product in the catalog named "product1" with a price of 151.0 and 1000 items in stock
+    Given there is a zone named "zone1"
+    Given there is a country named "country1" and iso code "FR" in zone "zone1"
+    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
+    Given there is an address named "address1" with postcode "1" in state "state1"
+    Given there is a carrier named "carrier1"
+    Given carrier "carrier1" applies shipping fees of 5.0 in zone "zone1" for price between 0 and 150
+    Given carrier "carrier1" applies shipping fees of 0.0 in zone "zone1" for price between 150 and 1000
+    Given there is a cart rule named "cartrule2" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
+    Given cart rule "cartrule2" has a discount code "foo2"
+    When I add 1 item of product "product1" in my cart
+    When I use the discount "cartrule2"
+    When I select address "address1" in my cart
+    When I select carrier "carrier1" in my cart
+    Then cart shipping fees should be 7.0
+    Then my cart total should be 82.5 tax included
+    Then my cart total using previous calculation method should be 82.5 tax included
+
+  Scenario: free carrier in price range, voucher in amount set the price bellow range
+    Given I have an empty default cart
+    Given there is a product in the catalog named "product1" with a price of 151.0 and 1000 items in stock
+    Given there is a zone named "zone1"
+    Given there is a country named "country1" and iso code "FR" in zone "zone1"
+    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
+    Given there is an address named "address1" with postcode "1" in state "state1"
+    Given there is a carrier named "carrier1"
+    Given carrier "carrier1" applies shipping fees of 5.0 in zone "zone1" for price between 0 and 150
+    Given carrier "carrier1" applies shipping fees of 0.0 in zone "zone1" for price between 150 and 1000
+    Given there is a cart rule named "cartrule2" that applies an amount discount of 2.0 with priority 2, quantity of 1000 and quantity per user 1000
+    Given cart rule "cartrule2" has a discount code "foo2"
+    When I add 1 item of product "product1" in my cart
+    When I use the discount "cartrule2"
+    When I select address "address1" in my cart
+    When I select carrier "carrier1" in my cart
+    Then cart shipping fees should be 7.0
+    Then my cart total should be 156.0 tax included
+    Then my cart total using previous calculation method should be 156.0 tax included
+
+  # Issue #12976 part two
+  Scenario: carrier fees not free, voucher without code set shipping fees free above amount, cart total is below
+    Given I have an empty default cart
+    Given there is a product in the catalog named "product1" with a price of 149.0 and 1000 items in stock
+    Given there is a zone named "zone1"
+    Given there is a country named "country1" and iso code "FR" in zone "zone1"
+    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
+    Given there is an address named "address1" with postcode "1" in state "state1"
+    Given there is a carrier named "carrier1"
+    Given carrier "carrier1" applies shipping fees of 5.0 in zone "zone1" for price between 0 and 10000
+    Given there is a cart rule named "cartrule2" that applies an amount discount of 0.0 with priority 2, quantity of 1000 and quantity per user 1000
+    Given cart rule "cartrule2" offers free shipping
+    Given cart rule "cartrule2" applies discount only when cart total is above 150.0
+    When I add 1 item of product "product1" in my cart
+    When I select address "address1" in my cart
+    When I select carrier "carrier1" in my cart
+    Then cart shipping fees should be 7.0
+    Then my cart total should be 156.0 tax included
+    Then my cart total using previous calculation method should be 156.0 tax included
+
+  Scenario: carrier fees not free, voucher with code set shipping fees free above amount, cart total is below
+    Given I have an empty default cart
+    Given there is a product in the catalog named "product1" with a price of 149.0 and 1000 items in stock
+    Given there is a zone named "zone1"
+    Given there is a country named "country1" and iso code "FR" in zone "zone1"
+    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
+    Given there is an address named "address1" with postcode "1" in state "state1"
+    Given there is a carrier named "carrier1"
+    Given carrier "carrier1" applies shipping fees of 5.0 in zone "zone1" for price between 0 and 150
+    Given carrier "carrier1" applies shipping fees of 0.0 in zone "zone1" for price between 150 and 1000
+    Given there is a cart rule named "cartrule2" that applies an amount discount of 0.0 with priority 2, quantity of 1000 and quantity per user 1000
+    Given cart rule "cartrule2" has a discount code "foo2"
+    Given cart rule "cartrule2" offers free shipping
+    Given cart rule "cartrule2" applies discount only when cart total is above 150.0
+    When I add 1 item of product "product1" in my cart
+    When I select address "address1" in my cart
+    When I select carrier "carrier1" in my cart
+    Then cart rule "cartrule2" cannot be applied to my cart
+    Then cart shipping fees should be 7.0
+    Then my cart total should be 156.0 tax included
+    Then my cart total using previous calculation method should be 156.0 tax included
+
+  Scenario: carrier fees not free, voucher without code set shipping fees free above amount, cart total is below
+    Given I have an empty default cart
+    Given there is a product in the catalog named "product1" with a price of 149.0 and 1000 items in stock
+    Given there is a zone named "zone1"
+    Given there is a country named "country1" and iso code "FR" in zone "zone1"
+    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
+    Given there is an address named "address1" with postcode "1" in state "state1"
+    Given there is a carrier named "carrier1"
+    Given carrier "carrier1" applies shipping fees of 5.0 in zone "zone1" for price between 0 and 10000
+    Given there is a cart rule named "cartrule2" that applies an amount discount of 0.0 with priority 2, quantity of 1000 and quantity per user 1000
+    Given cart rule "cartrule2" offers free shipping
+    Given cart rule "cartrule2" applies discount only when cart total is above 150.0
+    When I add 1 item of product "product1" in my cart
+    When I select address "address1" in my cart
+    When I select carrier "carrier1" in my cart
+    Then cart shipping fees should be 7.0
+    Then my cart total should be 156.0 tax included
+    Then my cart total using previous calculation method should be 156.0 tax included
+
+  Scenario: carrier fees not free, voucher with code set shipping fees free above amount, cart total is above
+    Given I have an empty default cart
+    Given there is a product in the catalog named "product1" with a price of 151.0 and 1000 items in stock
+    Given there is a zone named "zone1"
+    Given there is a country named "country1" and iso code "FR" in zone "zone1"
+    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
+    Given there is an address named "address1" with postcode "1" in state "state1"
+    Given there is a carrier named "carrier1"
+    Given carrier "carrier1" applies shipping fees of 5.0 in zone "zone1" for price between 0 and 150
+    Given carrier "carrier1" applies shipping fees of 0.0 in zone "zone1" for price between 150 and 1000
+    Given there is a cart rule named "cartrule2" that applies an amount discount of 0.0 with priority 2, quantity of 1000 and quantity per user 1000
+    Given cart rule "cartrule2" has a discount code "foo2"
+    Given cart rule "cartrule2" offers free shipping
+    Given cart rule "cartrule2" applies discount only when cart total is above 150.0
+    When I add 1 item of product "product1" in my cart
+    When I select address "address1" in my cart
+    When I select carrier "carrier1" in my cart
+    Then cart rule "cartrule2" can be applied to my cart
+    When I use the discount "cartrule2"
+    Then cart shipping fees should be 2.0
+    Then my cart total should be 151.0 tax included
+    Then my cart total using previous calculation method should be 151.0 tax included
+
+  Scenario: carrier fees not free, voucher without code set shipping fees free above amount, cart total is above
+    Given I have an empty default cart
+    Given there is a product in the catalog named "product1" with a price of 151.0 and 1000 items in stock
+    Given there is a zone named "zone1"
+    Given there is a country named "country1" and iso code "FR" in zone "zone1"
+    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
+    Given there is an address named "address1" with postcode "1" in state "state1"
+    Given there is a carrier named "carrier1"
+    Given carrier "carrier1" applies shipping fees of 5.0 in zone "zone1" for price between 0 and 150
+    Given carrier "carrier1" applies shipping fees of 0.0 in zone "zone1" for price between 150 and 1000
+    Given there is a cart rule named "cartrule2" that applies an amount discount of 0.0 with priority 2, quantity of 1000 and quantity per user 1000
+    Given cart rule "cartrule2" has a discount code "foo2"
+    Given cart rule "cartrule2" offers free shipping
+    Given cart rule "cartrule2" applies discount only when cart total is above 150.0
+    When I add 1 item of product "product1" in my cart
+    When I use the discount "cartrule2"
+    When I select address "address1" in my cart
+    When I select carrier "carrier1" in my cart
+    Then cart shipping fees should be 2.0
+    Then my cart total should be 151.0 tax included
+    Then my cart total using previous calculation method should be 151.0 tax included
+
+  Scenario: one product in cart, quantity 1, cant apply not corresponding cart rule
+    Given I have an empty default cart
+    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+    Given there is a zone named "zone1"
+    Given there is a zone named "zone2"
+    Given there is a country named "country1" and iso code "FR" in zone "zone1"
+    Given there is a country named "country2" and iso code "US" in zone "zone2"
+    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
+    Given there is a state named "state2" with iso code "TEST-2" in country "country2" and zone "zone2"
+    Given there is an address named "address1" with postcode "1" in state "state1"
+    Given there is an address named "address2" with postcode "1" in state "state2"
+    Given there is a carrier named "carrier1"
+    Given carrier "carrier1" applies shipping fees of 3.1 in zone "zone1" for price between 0 and 10000
+    Given carrier "carrier1" applies shipping fees of 4.3 in zone "zone2" for price between 0 and 10000
+    Given there is a carrier named "carrier2"
+    Given carrier "carrier2" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
+    Given carrier "carrier2" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
+    Given there is a carrier named "carrier3"
+    Given carrier "carrier3" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
+    Given carrier "carrier3" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
+    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
+    Given cart rule "cartrule1" has a discount code "foo"
+    Given cart rule "cartrule1" is restricted to carrier "carrier2"
+    Given there is a cart rule named "cartrule2" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
+    Given cart rule "cartrule2" has a discount code "bar"
+    Given cart rule "cartrule2" is restricted to carrier "carrier1"
+    Given there is a cart rule named "cartrule3" that applies a percent discount of 55.0% with priority 3, quantity of 1000 and quantity per user 1000
+    Given cart rule "cartrule3" is restricted to carrier "carrier3"
+    When I add 1 items of product "product1" in my cart
+    When I select address "address1" in my cart
+    When I select carrier "carrier2" in my cart
+    Then cart rule "cartrule2" cannot be applied to my cart
+
+  Scenario: one product in cart, quantity 1, can apply corresponding cart rule
+    Given I have an empty default cart
+    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+    Given there is a zone named "zone1"
+    Given there is a zone named "zone2"
+    Given there is a country named "country1" and iso code "FR" in zone "zone1"
+    Given there is a country named "country2" and iso code "US" in zone "zone2"
+    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
+    Given there is a state named "state2" with iso code "TEST-2" in country "country2" and zone "zone2"
+    Given there is an address named "address1" with postcode "1" in state "state1"
+    Given there is an address named "address2" with postcode "1" in state "state2"
+    Given there is a carrier named "carrier1"
+    Given carrier "carrier1" applies shipping fees of 3.1 in zone "zone1" for price between 0 and 10000
+    Given carrier "carrier1" applies shipping fees of 4.3 in zone "zone2" for price between 0 and 10000
+    Given there is a carrier named "carrier2"
+    Given carrier "carrier2" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
+    Given carrier "carrier2" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
+    Given there is a carrier named "carrier3"
+    Given carrier "carrier3" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
+    Given carrier "carrier3" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
+    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
+    Given cart rule "cartrule1" has a discount code "foo"
+    Given cart rule "cartrule1" is restricted to carrier "carrier2"
+    Given there is a cart rule named "cartrule2" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
+    Given cart rule "cartrule2" has a discount code "bar"
+    Given cart rule "cartrule2" is restricted to carrier "carrier1"
+    Given there is a cart rule named "cartrule3" that applies a percent discount of 55.0% with priority 3, quantity of 1000 and quantity per user 1000
+    Given cart rule "cartrule3" is restricted to carrier "carrier3"
+    When I add 1 items of product "product1" in my cart
+    When I select address "address1" in my cart
+    When I select carrier "carrier2" in my cart
+    Then cart rule "cartrule1" can be applied to my cart
+    When I use the discount "cartrule1"
+    Then cart rule count in my cart should be 1
+    Then cart rule "cartrule1" cannot be applied to my cart
+    When I use the discount "cartrule1"
+    Then cart rule count in my cart should be 1
+
+  Scenario: one product in cart, quantity 1, can apply corresponding cart rule
+    Given I have an empty default cart
+    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+    Given there is a zone named "zone1"
+    Given there is a zone named "zone2"
+    Given there is a country named "country1" and iso code "FR" in zone "zone1"
+    Given there is a country named "country2" and iso code "US" in zone "zone2"
+    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
+    Given there is a state named "state2" with iso code "TEST-2" in country "country2" and zone "zone2"
+    Given there is an address named "address1" with postcode "1" in state "state1"
+    Given there is an address named "address2" with postcode "1" in state "state2"
+    Given there is a carrier named "carrier1"
+    Given carrier "carrier1" applies shipping fees of 3.1 in zone "zone1" for price between 0 and 10000
+    Given carrier "carrier1" applies shipping fees of 4.3 in zone "zone2" for price between 0 and 10000
+    Given there is a carrier named "carrier2"
+    Given carrier "carrier2" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
+    Given carrier "carrier2" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
+    Given there is a carrier named "carrier3"
+    Given carrier "carrier3" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
+    Given carrier "carrier3" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
+    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
+    Given cart rule "cartrule1" has a discount code "foo"
+    Given cart rule "cartrule1" is restricted to carrier "carrier2"
+    Given there is a cart rule named "cartrule2" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
+    Given cart rule "cartrule2" has a discount code "bar"
+    Given cart rule "cartrule2" is restricted to carrier "carrier1"
+    Given there is a cart rule named "cartrule3" that applies a percent discount of 55.0% with priority 3, quantity of 1000 and quantity per user 1000
+    Given cart rule "cartrule3" is restricted to carrier "carrier3"
+    When I add 1 items of product "product1" in my cart
+    When I select address "address1" in my cart
+    When I select carrier "carrier2" in my cart
+    Then cart rule "cartrule1" can be applied to my cart
+    When I use the discount "cartrule1"
+    Then cart rule count in my cart should be 1
+    Then cart rule "cartrule1" cannot be applied to my cart
+    When I use the discount "cartrule1"
+    When I select carrier "carrier1" in my cart
+    Then cart rule count in my cart should be 0
+
+  Scenario: one product in cart, quantity 1, cart rule without code correctly (un)applied on corresponding carrier
+    Given I have an empty default cart
+    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+    Given there is a zone named "zone1"
+    Given there is a zone named "zone2"
+    Given there is a country named "country1" and iso code "FR" in zone "zone1"
+    Given there is a country named "country2" and iso code "US" in zone "zone2"
+    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
+    Given there is a state named "state2" with iso code "TEST-2" in country "country2" and zone "zone2"
+    Given there is an address named "address1" with postcode "1" in state "state1"
+    Given there is an address named "address2" with postcode "1" in state "state2"
+    Given there is a carrier named "carrier1"
+    Given carrier "carrier1" applies shipping fees of 3.1 in zone "zone1" for price between 0 and 10000
+    Given carrier "carrier1" applies shipping fees of 4.3 in zone "zone2" for price between 0 and 10000
+    Given there is a carrier named "carrier2"
+    Given carrier "carrier2" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
+    Given carrier "carrier2" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
+    Given there is a carrier named "carrier3"
+    Given carrier "carrier3" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
+    Given carrier "carrier3" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
+    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
+    Given cart rule "cartrule1" has a discount code "foo"
+    Given cart rule "cartrule1" is restricted to carrier "carrier2"
+    Given there is a cart rule named "cartrule2" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
+    Given cart rule "cartrule2" has a discount code "bar"
+    Given cart rule "cartrule2" is restricted to carrier "carrier1"
+    Given there is a cart rule named "cartrule3" that applies a percent discount of 55.0% with priority 3, quantity of 1000 and quantity per user 1000
+    Given cart rule "cartrule3" is restricted to carrier "carrier3"
+    When I add 1 items of product "product1" in my cart
+    When I select address "address1" in my cart
+    When I select carrier "carrier2" in my cart
+    Then cart rule count in my cart should be 0
+    When I select carrier "carrier3" in my cart
+    Then cart rule count in my cart should be 1
+    When I select carrier "carrier2" in my cart
+    Then cart rule count in my cart should be 0
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature
new file mode 100644
index 0000000000000..6be15e1280e96
--- /dev/null
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature
@@ -0,0 +1,57 @@
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags fo-cart-rule-validation
+@restore-all-tables-before-feature
+@fo-cart-rule-validation
+Feature: Cart rule application is validated before it is applied to cart
+  As a customer
+  I must not be able to apply invalid cart rules
+
+  Background:
+    Given there is customer "testCustomer" with email "pub@prestashop.com"
+    And country "US" is enabled
+
+  Scenario: Adding a cart rule to an empty cart should not be possible
+    Given I have an empty default cart
+    And shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
+    And there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
+    And cart rule "cartrule1" has a discount code "foo1"
+    And I should have 0 different products in my cart
+    And total cart shipping fees should be 0.0 tax excluded
+    And my cart total should be 0.0 tax excluded
+    When I apply the discount code "foo1"
+    Then I should get cart rule validation error saying "Cart is empty"
+    And at least one cart rule applies today for customer with id 0
+    And I should have 0 products in my cart
+    And total cart shipping fees should be 0.0 tax excluded
+    And my cart total should be 0.0 tax excluded
+    Given there is a cart rule named "cartrule2" that applies an amount discount of 10.0 with priority 1, quantity of 10 and quantity per user 10
+    Given cart rule "cartrule2" has a discount code "foo2"
+    When I apply the discount code "foo2"
+    Then I should get cart rule validation error saying "Cart is empty"
+    And I should have 0 products in my cart
+    And total cart shipping fees should be 0.0 tax excluded
+    And my cart total should be 0.0 tax excluded
+    Given there is a cart rule named "cartrule-free-shipping" that applies an amount discount of 0.0 with priority 1, quantity of 1 and quantity per user 1
+    And cart rule "cartrule-free-shipping" offers free shipping
+    And cart rule "cartrule-free-shipping" has a discount code "foo3"
+    When I apply the discount code "foo2"
+    Then I should get cart rule validation error saying "Cart is empty"
+    And I should have 0 products in my cart
+    And total cart shipping fees should be 0.0 tax excluded
+    And my cart total should be 0.0 tax excluded
+
+  Scenario: Cart rule cannot be applied again when it is already in the cart
+    Given I have an empty default cart
+    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
+    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
+    Given cart rule "cartrule1" has a discount code "foo1"
+    When I add 1 items of product "product1" in my cart
+    Then I should have 1 different products in my cart
+    And total cart shipping fees should be 7.0 tax excluded
+    And my cart total should be 26.8 tax excluded
+    When I apply the discount code "foo1"
+    Then my cart total should be 16.9 tax excluded
+    When I apply the discount code "foo1"
+    Then I should get cart rule validation error saying "This voucher is already in your cart"
+    When at least one cart rule applies today for customer with id 0
+    Then I should have 1 products in my cart
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/CartRule/cheapest_product.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cheapest_product.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/CartRule/cheapest_product.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cheapest_product.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/CartRule/ecotax.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/ecotax.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/CartRule/ecotax.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/ecotax.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/CartRule/exclude_discounted_product.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/exclude_discounted_product.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/CartRule/exclude_discounted_product.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/exclude_discounted_product.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/CartRule/free_shipping.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/free_shipping.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/CartRule/free_shipping.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/free_shipping.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/CartRule/gift.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/gift.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/CartRule/gift.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/gift.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/CartRule/mixed.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/mixed.feature
similarity index 67%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/CartRule/mixed.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/mixed.feature
index 64c6ff7513808..5114b25764bc8 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/CartRule/mixed.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/mixed.feature
@@ -1,4 +1,6 @@
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags fo-cart-rule-mixed
 @restore-all-tables-before-feature
+@fo-cart-rule-mixed
 Feature: Cart rule (mixed) calculation with multiple cart rules
   As a customer
   I must be able to have correct cart total when adding cart rules
@@ -91,3 +93,48 @@ Feature: Cart rule (mixed) calculation with multiple cart rules
     Then my cart total should be 82.205 tax included
     #known to fail on previous
     #Then my cart total using previous calculation method should be 82.205 tax included
+
+  Scenario: Percentage reduction cart rule and gift product cart rule applied to the same cart
+    Given I have an empty default cart
+    And shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
+    And there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+    And there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
+    And there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
+    And cart rule "cartrule1" has a discount code "foo1"
+    And there is a cart rule named "cartrule12" that applies a percent discount of 10.0% with priority 1, quantity of 1000 and quantity per user 1000
+    And cart rule "cartrule12" has a discount code "foo12"
+    And cart rule "cartrule12" offers a gift product "product3"
+    And I add 1 items of product "product1" in my cart
+    And I should have 1 different products in my cart
+    And total cart shipping fees should be 7.0 tax excluded
+    And my cart total should be 26.8 tax excluded
+    When I apply the discount code "foo12"
+    Then my cart total should be 24.8 tax excluded
+    And I should have 2 products in my cart
+    When I apply the discount code "foo1"
+    Then my cart total should be 15.9 tax excluded
+    And I should have 2 products in my cart
+    And at least one cart rule applies today for customer with id 0
+
+  Scenario: 1 product in cart, cart rule giving gift out of stock, and global cart rule should be inserted without error (test PR #8361)
+    Given I have an empty default cart
+    And shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
+    And there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+    And there is a product in the catalog named "product4" with a price of 35.567 and 1000 items in stock
+    And product "product4" is out of stock
+    And there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
+    And cart rule "cartrule1" has a discount code "foo1"
+    And there is a cart rule named "cartrule13" that applies a percent discount of 10.0% with priority 13, quantity of 1000 and quantity per user 1000
+    And cart rule "cartrule13" has a discount code "foo13"
+    And cart rule "cartrule13" offers a gift product "product4"
+    And I add 1 items of product "product1" in my cart
+    And I should have 1 different products in my cart
+    And total cart shipping fees should be 7.0 tax excluded
+    And my cart total should be 26.8 tax excluded
+    When I apply the discount code "foo13"
+    Then my cart total should be 24.8 tax excluded
+    Then cart rule "cartrule1" can be applied to my cart
+    When I apply the discount code "foo1"
+    Then my cart total should be 15.9 tax excluded
+    And I should have 1 products in my cart
+    And at least one cart rule applies today for customer with id 0
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/CartRule/mixed_specific.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/mixed_specific.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/CartRule/mixed_specific.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/mixed_specific.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/Product/add_combination.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/Product/add_combination.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Adding/Product/add_combination.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/Product/add_combination.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/Product/add_customization.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/Product/add_customization.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Adding/Product/add_customization.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/Product/add_customization.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/Product/add_pack.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/Product/add_pack.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Adding/Product/add_pack.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/Product/add_pack.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Adding/Product/add_standard_product.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/Product/add_standard_product.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Adding/Product/add_standard_product.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/Product/add_standard_product.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/Product/gift_wrapping.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/Product/gift_wrapping.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/Product/gift_wrapping.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/Product/gift_wrapping.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/Product/only_products.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/Product/only_products.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/Product/only_products.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/Product/only_products.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/Product/specific_price.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/Product/specific_price.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/Product/specific_price.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/Product/specific_price.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Updating/Product/update_pack.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/Product/update_pack.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Updating/Product/update_pack.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/Product/update_pack.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/RoundingMode/round_down.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/Rounding/RoundingMode/round_down.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/RoundingMode/round_down.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/Rounding/RoundingMode/round_down.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/RoundingMode/round_half_down.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/Rounding/RoundingMode/round_half_down.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/RoundingMode/round_half_down.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/Rounding/RoundingMode/round_half_down.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/RoundingMode/round_half_even.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/Rounding/RoundingMode/round_half_even.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/RoundingMode/round_half_even.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/Rounding/RoundingMode/round_half_even.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/RoundingMode/round_half_odd.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/Rounding/RoundingMode/round_half_odd.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/RoundingMode/round_half_odd.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/Rounding/RoundingMode/round_half_odd.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/RoundingMode/round_half_up.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/Rounding/RoundingMode/round_half_up.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/RoundingMode/round_half_up.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/Rounding/RoundingMode/round_half_up.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/RoundingMode/round_up.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/Rounding/RoundingMode/round_up.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/RoundingMode/round_up.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/Rounding/RoundingMode/round_up.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/RoundingType/round_item.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/Rounding/RoundingType/round_item.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/RoundingType/round_item.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/Rounding/RoundingType/round_item.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/RoundingType/round_line.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/Rounding/RoundingType/round_line.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/RoundingType/round_line.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/Rounding/RoundingType/round_line.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/RoundingType/round_total.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/Rounding/RoundingType/round_total.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/RoundingType/round_total.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/Rounding/RoundingType/round_total.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/SpecificPriceRule/amount.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/SpecificPriceRule/amount.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/SpecificPriceRule/amount.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/SpecificPriceRule/amount.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/SpecificPriceRule/mixed.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/SpecificPriceRule/mixed.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/SpecificPriceRule/mixed.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/SpecificPriceRule/mixed.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/SpecificPriceRule/percent.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/SpecificPriceRule/percent.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/SpecificPriceRule/percent.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/SpecificPriceRule/percent.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/SpecificPriceRule/percent_multiple.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/SpecificPriceRule/percent_multiple.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/SpecificPriceRule/percent_multiple.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/SpecificPriceRule/percent_multiple.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/SpecificPriceRule/price_set.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/SpecificPriceRule/price_set.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/SpecificPriceRule/price_set.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/SpecificPriceRule/price_set.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/Carrier/carrier.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/carrier.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/Carrier/carrier.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/carrier.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartToOrder/cart_to_order.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/cart_to_order.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/CartToOrder/cart_to_order.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/cart_to_order.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/Currency/currency.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/currency.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/Currency/currency.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/currency.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Delivery/delivery_options.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/delivery_options.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Delivery/delivery_options.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/delivery_options.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/Taxes/tax.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/tax.feature
similarity index 100%
rename from tests/Integration/Behaviour/Features/Scenario/Cart/Calculation/Taxes/tax.feature
rename to tests/Integration/Behaviour/Features/Scenario/Cart/tax.feature

From a45b15bcbc52c7ba22994f389390c000b5f6bf07 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Tue, 9 May 2023 16:15:12 +0300
Subject: [PATCH 0225/1030]  fix cs fixer

---
 .../Behaviour/Features/Context/CartRuleFeatureContext.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
index 47d137569a7d5..be90b6ca1fdd8 100644
--- a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
@@ -573,7 +573,7 @@ public function checkCartRuleUsageLimitIsDetected(string $cartRuleReference)
      * so to identify lastError in steps we will use this custom map,
      * which will eventually allow us to reuse LastExceptionTrait and assert exceptions by codes
      *
-     * @return int[]
+     * @return int
      */
     private function getCartRuleValidityCodeByMessage(string $message): int
     {

From b71490864c3facc0aede28290e032ba63f34a688 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Tue, 9 May 2023 16:57:35 +0300
Subject: [PATCH 0226/1030]  fix tags in delete-cart-rule features

---
 .../CartRule/BackOffice/delete_cart_rule_from_cart.feature     | 3 +--
 .../Cart/CartRule/BackOffice/delete_product_from_cart.feature  | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/delete_cart_rule_from_cart.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/delete_cart_rule_from_cart.feature
index 5e6ddcda6f7c2..c332891021d71 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/delete_cart_rule_from_cart.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/delete_cart_rule_from_cart.feature
@@ -1,5 +1,6 @@
 # ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags bo-delete-cart-rule
 @restore-all-tables-before-feature
+@bo-delete-cart-rule
 Feature: Delete cart rule from cart in Back Office (BO)
   As a BO user I must be able to delete cart rules from cart
   Background:
@@ -10,7 +11,6 @@ Feature: Delete cart rule from cart in Back Office (BO)
     And customer "testCustomer" has address in "US" country
     And I create an empty cart "dummy_cart" for customer "testCustomer"
 
-  @bo-delete-cart-rule
   Scenario: Delete cart rule with gift product
     Given I add 2 products "Mug The best is yet to come" to the cart "dummy_cart"
     And product "Mug The best is yet to come" quantity in cart "dummy_cart" should be 2 excluding gift products
@@ -19,7 +19,6 @@ Feature: Delete cart rule from cart in Back Office (BO)
     When I delete voucher "giftFoxNotebook" from cart "dummy_cart"
     Then cart "dummy_cart" should not contain gift product "Mountain fox notebook"
 
-  @bo-delete-cart-rule
   Scenario: Delete cart rule with gift product when same product as gift already exists in cart
     Given I create an empty cart "dummy_cart_2" for customer "testCustomer"
     And I add 3 products "Mountain fox notebook" to the cart "dummy_cart_2"
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/delete_product_from_cart.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/delete_product_from_cart.feature
index a607b73f91966..4cf0b44f5340c 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/delete_product_from_cart.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/delete_product_from_cart.feature
@@ -1,5 +1,6 @@
 # ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags bo-delete-product
 @restore-all-tables-before-feature
+@bo-delete-product
 Feature: Delete product from cart in Back Office (BO)
   As a BO user I must be able to delete products from cart
   Background:
@@ -9,7 +10,6 @@ Feature: Delete product from cart in Back Office (BO)
     And there is customer "testCustomer" with email "pub@prestashop.com"
     And customer "testCustomer" has address in "US" country
 
-  @bo-delete-product
   Scenario: Delete standard product from cart
     Given I create an empty cart "dummy_cart" for customer "testCustomer"
     And I add 2 products "Mug The best is yet to come" to the cart "dummy_cart"
@@ -17,7 +17,6 @@ Feature: Delete product from cart in Back Office (BO)
     When I delete product "Mug The best is yet to come" from cart "dummy_cart"
     Then cart "dummy_cart" should not contain product "Mug The best is yet to come"
 
-  @bo-delete-product
   Scenario: Delete standard product from cart when cart has another identical product added as a gift
     Given I create an empty cart "dummy_cart_2" for customer "testCustomer"
     And I add 2 products "Mountain fox notebook" to the cart "dummy_cart_2"

From 72faa2d52be717cd78f13671f7dc08923070b1de Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Tue, 9 May 2023 18:00:56 +0300
Subject: [PATCH 0227/1030]  clean up cart_rule_validation feature by using
 cqrs command for cart rules creation

---
 .../Context/CartRuleFeatureContext.php        | 66 +++++++++++++-
 .../FrontOffice/cart_rule_validation.feature  | 88 +++++++++++++++----
 2 files changed, 134 insertions(+), 20 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
index be90b6ca1fdd8..caad150fc457e 100644
--- a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
@@ -37,8 +37,10 @@
 use DateTime;
 use Db;
 use Order;
+use PHPUnit\Framework\Assert;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleValidityException;
 use RuntimeException;
+use Tests\Resources\DatabaseDump;
 use Validate;
 
 class CartRuleFeatureContext extends AbstractPrestaShopFeatureContext
@@ -456,7 +458,6 @@ public function assertCartRuleValidationError(string $expectedMessage): void
     }
 
     /**
-     * @todo: What is this method supposed to assert. Especially in cases when it checks customer id 0??
      * @When /^at least one cart rule applies today for customer with id (\d+)$/
      */
     public function someCartRulesExistTodayForCustomerWithId($customerId)
@@ -467,6 +468,46 @@ public function someCartRulesExistTodayForCustomerWithId($customerId)
         }
     }
 
+    /**
+     * @Given discount code :cartRuleReference is not applied to my cart
+     *
+     * @param string $code
+     *
+     * @return void
+     */
+    public function assertDiscountCodeIsNotAppliedToCurrentCart(string $code): void
+    {
+        $cartRuleId = $this->getSharedStorage()->get($code);
+
+        /** @var array<string, mixed> $cartRule */
+        foreach ($this->getCurrentCart()->getCartRules() as $cartRule) {
+            if ((int) $cartRule['id_cart_rule'] === $cartRuleId) {
+                throw new RuntimeException(sprintf('Cart rule with code "%s" is applied to current cart', $code));
+            }
+        }
+    }
+
+    /**
+     * @Given discount code :cartRuleReference is applied to my cart
+     *
+     * @param string $code
+     *
+     * @return void
+     */
+    public function assertDiscountCodeIsAppliedToCurrentCart(string $code): void
+    {
+        $cartRuleId = $this->getSharedStorage()->get($code);
+
+        /** @var array<string, mixed> $cartRule */
+        foreach ($this->getCurrentCart()->getCartRules() as $cartRule) {
+            if ((int) $cartRule['id_cart_rule'] === $cartRuleId) {
+                return;
+            }
+        }
+
+        throw new RuntimeException(sprintf('Cart rule with code "%s" is not applied to current cart', $code));
+    }
+
     /**
      * @When /^cart rule count in my cart should be (\d+)$/
      */
@@ -568,6 +609,29 @@ public function checkCartRuleUsageLimitIsDetected(string $cartRuleReference)
         }
     }
 
+    /**
+     * @BeforeScenario @restore-cart-rules-before-scenario
+     *
+     * @return void
+     */
+    public static function restoreCartRules(): void
+    {
+        DatabaseDump::restoreTables(['cart_rule', 'cart_rule_shop']);
+        DatabaseDump::restoreTables([
+            'cart_rule',
+            'cart_rule_shop',
+            'cart_rule_lang',
+            'cart_cart_rule',
+            'cart_rule_carrier',
+            'cart_rule_combination',
+            'cart_rule_country',
+            'cart_rule_group',
+            'cart_rule_product_rule',
+            'cart_rule_product_rule_group',
+            'cart_rule_product_rule_value',
+        ]);
+    }
+
     /**
      * Legacy cart rule validation returns errors as strings (CartRule::checkVBalidity()),
      * so to identify lastError in steps we will use this custom map,
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature
index 6be15e1280e96..2df4c1c0cce4e 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature
@@ -8,50 +8,100 @@ Feature: Cart rule application is validated before it is applied to cart
   Background:
     Given there is customer "testCustomer" with email "pub@prestashop.com"
     And country "US" is enabled
+    And there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
+    And I create cart rule "cart_rule_1" with following properties:
+      | name[en-US]                            | cartrule1              |
+      | description                            | provides 50% discount  |
+      | highlight                              | true                   |
+      | is_active                              | true                   |
+      | allow_partial_use                      | true                   |
+      | priority                               | 1                      |
+      | valid_from                             | 2000-01-01 11:05:00    |
+      | valid_to                               | 3000-12-01 00:00:00    |
+      | total_quantity                         | 1000                   |
+      | quantity_per_user                      | 1000                   |
+      | free_shipping                          | false                  |
+      | code                                   | foo1                   |
+      | reduction_percentage                   | 50                     |
+      | reduction_apply_to_discounted_products | true                   |
+      | discount_application_type              | order_without_shipping |
+    And I create cart rule "cart_rule_2" with following properties:
+      | name[en-US]                            | cartrule2              |
+      | description                            | provides 10$ discount  |
+      | highlight                              | true                   |
+      | is_active                              | true                   |
+      | allow_partial_use                      | true                   |
+      | priority                               | 1                      |
+      | valid_from                             | 2000-01-01 11:05:00    |
+      | valid_to                               | 3000-12-01 00:00:00    |
+      | total_quantity                         | 10                     |
+      | quantity_per_user                      | 10                     |
+      | free_shipping                          | false                  |
+      | code                                   | foo2                   |
+      | reduction_amount                       | 10                     |
+      | reduction_currency                     | usd                    |
+      | reduction_tax                          | false                  |
+      | reduction_apply_to_discounted_products | true                   |
+      | discount_application_type              | order_without_shipping |
+    And I create cart rule "cart_rule_3" with following properties:
+      | name[en-US]       | cartrule3              |
+      | description       | provides free shipping |
+      | highlight         | true                   |
+      | is_active         | true                   |
+      | allow_partial_use | true                   |
+      | priority          | 1                      |
+      | valid_from        | 2000-01-01 11:05:00    |
+      | valid_to          | 3000-12-01 00:00:00    |
+      | total_quantity    | 10                     |
+      | quantity_per_user | 10                     |
+      | free_shipping     | true                   |
+      | code              | foo3                   |
 
   Scenario: Adding a cart rule to an empty cart should not be possible
     Given I have an empty default cart
     And shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    And there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    And cart rule "cartrule1" has a discount code "foo1"
+    And discount code "foo1" is not applied to my cart
+    And discount code "foo2" is not applied to my cart
+    And discount code "foo3" is not applied to my cart
     And I should have 0 different products in my cart
     And total cart shipping fees should be 0.0 tax excluded
     And my cart total should be 0.0 tax excluded
+    # try applying percentage discount
     When I apply the discount code "foo1"
     Then I should get cart rule validation error saying "Cart is empty"
-    And at least one cart rule applies today for customer with id 0
+    And discount code "foo1" is not applied to my cart
     And I should have 0 products in my cart
     And total cart shipping fees should be 0.0 tax excluded
     And my cart total should be 0.0 tax excluded
-    Given there is a cart rule named "cartrule2" that applies an amount discount of 10.0 with priority 1, quantity of 10 and quantity per user 10
-    Given cart rule "cartrule2" has a discount code "foo2"
+    # try applying amount discount
     When I apply the discount code "foo2"
     Then I should get cart rule validation error saying "Cart is empty"
+    And discount code "foo2" is not applied to my cart
     And I should have 0 products in my cart
     And total cart shipping fees should be 0.0 tax excluded
     And my cart total should be 0.0 tax excluded
-    Given there is a cart rule named "cartrule-free-shipping" that applies an amount discount of 0.0 with priority 1, quantity of 1 and quantity per user 1
-    And cart rule "cartrule-free-shipping" offers free shipping
-    And cart rule "cartrule-free-shipping" has a discount code "foo3"
-    When I apply the discount code "foo2"
+    # try applying free shipping discount
+    When I apply the discount code "foo3"
     Then I should get cart rule validation error saying "Cart is empty"
+    And discount code "foo3" is not applied to my cart
     And I should have 0 products in my cart
     And total cart shipping fees should be 0.0 tax excluded
     And my cart total should be 0.0 tax excluded
 
+  @restore-cart-rules-before-scenario
   Scenario: Cart rule cannot be applied again when it is already in the cart
     Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule1" has a discount code "foo1"
-    When I add 1 items of product "product1" in my cart
-    Then I should have 1 different products in my cart
+    And shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
+    And there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+    And I add 1 items of product "product1" in my cart
+    And I should have 1 different products in my cart
     And total cart shipping fees should be 7.0 tax excluded
     And my cart total should be 26.8 tax excluded
-    When I apply the discount code "foo1"
-    Then my cart total should be 16.9 tax excluded
+    And discount code "foo1" is not applied to my cart
+    And I apply the discount code "foo1"
+    And discount code "foo1" is applied to my cart
+    And my cart total should be 16.9 tax excluded
     When I apply the discount code "foo1"
     Then I should get cart rule validation error saying "This voucher is already in your cart"
-    When at least one cart rule applies today for customer with id 0
-    Then I should have 1 products in my cart
+    And my cart total should be 16.9 tax excluded
+    And I should have 1 products in my cart

From 5be177e3a9fbbc6a2e727a837ea6ed036a36c574 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Wed, 10 May 2023 13:36:41 +0300
Subject: [PATCH 0228/1030]  adjust AddCartRuleCommand constructor and add
 setters for optional params

---
 .../CommandHandler/AddCartRuleHandler.php     |  17 +-
 .../CartRule/Command/AddCartRuleCommand.php   | 255 +++++++-----------
 .../DataHandler/CartRuleFormDataHandler.php   |  22 +-
 3 files changed, 119 insertions(+), 175 deletions(-)

diff --git a/src/Adapter/CartRule/CommandHandler/AddCartRuleHandler.php b/src/Adapter/CartRule/CommandHandler/AddCartRuleHandler.php
index 1d5752b329972..a732d733d30ee 100644
--- a/src/Adapter/CartRule/CommandHandler/AddCartRuleHandler.php
+++ b/src/Adapter/CartRule/CommandHandler/AddCartRuleHandler.php
@@ -28,10 +28,12 @@
 
 use CartRule;
 use PrestaShop\PrestaShop\Adapter\CartRule\CartRuleActionFiller;
+use DateTimeImmutable;
 use PrestaShop\PrestaShop\Adapter\CartRule\Repository\CartRuleRepository;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\AddCartRuleCommand;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\CommandHandler\AddCartRuleHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\CartRuleId;
+use PrestaShop\PrestaShop\Core\Util\DateTime\DateTime as DateTimeUtil;
 use PrestaShopException;
 
 /**
@@ -87,9 +89,9 @@ private function buildCartRuleFromCommandData(AddCartRuleCommand $command): Cart
         $cartRule->description = $command->getDescription();
         $cartRule->code = $command->getCode();
         $cartRule->highlight = $command->isHighlightInCart();
-        $cartRule->partial_use = $command->isAllowPartialUse();
+        $cartRule->partial_use = $command->allowPartialUse();
         $cartRule->priority = $command->getPriority();
-        $cartRule->active = $command->isActive();
+        $cartRule->active = $command->active();
 
         $this->fillCartRuleConditionsFromCommandData($cartRule, $command);
         $this->cartRuleActionFiller->fillUpdatableProperties($cartRule, $command->getCartRuleAction());
@@ -107,8 +109,15 @@ private function fillCartRuleConditionsFromCommandData(CartRule $cartRule, AddCa
     {
         $cartRule->id_customer = null !== $command->getCustomerId() ? $command->getCustomerId()->getValue() : null;
 
-        $cartRule->date_from = $command->getValidFrom()->format('Y-m-d H:i:s');
-        $cartRule->date_to = $command->getValidTo()->format('Y-m-d H:i:s');
+        if (null === $command->getValidFrom() || null === $command->getValidTo()) {
+            $now = new DateTimeImmutable();
+
+            $cartRule->date_from = $now->format(DateTimeUtil::DEFAULT_DATETIME_FORMAT);
+            $cartRule->date_to = $now->modify('+1 month')->format(DateTimeUtil::DEFAULT_DATETIME_FORMAT);
+        } else {
+            $cartRule->date_from = $command->getValidFrom()->format(DateTimeUtil::DEFAULT_DATETIME_FORMAT);
+            $cartRule->date_to = $command->getValidTo()->format(DateTimeUtil::DEFAULT_DATETIME_FORMAT);
+        }
 
         $minimumAmount = $command->getMinimumAmount();
         if ($minimumAmount) {
diff --git a/src/Core/Domain/CartRule/Command/AddCartRuleCommand.php b/src/Core/Domain/CartRule/Command/AddCartRuleCommand.php
index efc1e40229de4..7c394489eea92 100644
--- a/src/Core/Domain/CartRule/Command/AddCartRuleCommand.php
+++ b/src/Core/Domain/CartRule/Command/AddCartRuleCommand.php
@@ -42,6 +42,16 @@
  */
 class AddCartRuleCommand
 {
+    /**
+     * @var array<int, string>
+     */
+    private $localizedNames;
+
+    /**
+     * @var CartRuleAction
+     */
+    private $cartRuleAction;
+
     /**
      * @var string
      */
@@ -67,143 +77,101 @@ class AddCartRuleCommand
      */
     private $customerId;
 
-    /**
-     * @var array
-     */
-    private $localizedNames;
-
     /**
      * @var bool
      */
-    private $highlightInCart;
+    private $highlightInCart = false;
 
     /**
      * @var bool
      */
-    private $allowPartialUse;
+    private $allowPartialUse = true;
 
     /**
      * @var int
      */
-    private $priority;
+    private $priority = 1;
 
     /**
      * @var bool
      */
-    private $isActive;
+    private $active = true;
 
     /**
-     * @var DateTime
+     * @var DateTime|null
      */
     private $validFrom;
 
     /**
-     * @var DateTime
+     * @var DateTime|null
      */
     private $validTo;
 
     /**
      * @var int
      */
-    private $totalQuantity;
+    private $totalQuantity = 1;
 
     /**
      * @var int
      */
-    private $quantityPerUser;
+    private $quantityPerUser = 1;
 
-    /**
-     * @var CartRuleAction
-     */
-    private $cartRuleAction;
-
-    /**
-     * @param array $localizedNames
-     * @param bool $highlightInCart
-     * @param bool $allowPartialUse
-     * @param int $priority
-     * @param bool $isActive
-     * @param DateTime $validFrom
-     * @param DateTime $validTo
-     * @param int $totalQuantity
-     * @param int $quantityPerUser
-     * @param CartRuleAction $cartRuleAction
-     *
-     * @throws CartRuleConstraintException
-     */
     public function __construct(
         array $localizedNames,
-        bool $highlightInCart,
-        bool $allowPartialUse,
-        int $priority,
-        bool $isActive,
-        DateTime $validFrom,
-        DateTime $validTo,
-        int $totalQuantity,
-        int $quantityPerUser,
         CartRuleAction $cartRuleAction
     ) {
-        $this->assertDateRangeIsValid($validFrom, $validTo);
         $this->setLocalizedNames($localizedNames);
-        $this->setPriority($priority);
-        $this->setTotalQuantity($totalQuantity);
-        $this->setQuantityPerUser($quantityPerUser);
-        $this->highlightInCart = $highlightInCart;
-        $this->allowPartialUse = $allowPartialUse;
-        $this->isActive = $isActive;
-        $this->validFrom = $validFrom;
-        $this->validTo = $validTo;
         $this->cartRuleAction = $cartRuleAction;
     }
 
-    /**
-     * @return string
-     */
     public function getDescription(): string
     {
         return $this->description;
     }
 
-    /**
-     * @return string
-     */
     public function getCode(): string
     {
         return $this->code;
     }
 
-    /**
-     * @return CustomerId|null
-     */
     public function getCustomerId(): ?CustomerId
     {
         return $this->customerId;
     }
 
     /**
-     * @return array
+     * @return array<int, string>
      */
     public function getLocalizedNames(): array
     {
         return $this->localizedNames;
     }
 
-    /**
-     * @return bool
-     */
     public function isHighlightInCart(): bool
     {
         return $this->highlightInCart;
     }
 
-    /**
-     * @return bool
-     */
-    public function isAllowPartialUse(): bool
+    public function setHighlightInCart(bool $highlight): AddCartRuleCommand
+    {
+        $this->highlightInCart = $highlight;
+
+        return $this;
+    }
+
+    public function allowPartialUse(): bool
     {
         return $this->allowPartialUse;
     }
 
+    public function setAllowPartialUse(bool $allow): AddCartRuleCommand
+    {
+        $this->allowPartialUse = $allow;
+
+        return $this;
+    }
+
     /**
      * @return int
      */
@@ -213,58 +181,94 @@ public function getPriority(): int
     }
 
     /**
-     * @return bool
+     * @param int $priority
+     *
+     * @return AddCartRuleCommand
+     *
+     * @throws CartRuleConstraintException
      */
-    public function isActive(): bool
+    public function setPriority(int $priority): AddCartRuleCommand
+    {
+        if (0 >= $priority) {
+            throw new CartRuleConstraintException(
+                sprintf('Invalid cart rule priority "%s". Must be a positive integer.', $priority),
+                CartRuleConstraintException::INVALID_PRIORITY
+            );
+        }
+
+        $this->priority = $priority;
+
+        return $this;
+    }
+
+    public function active(): bool
     {
-        return $this->isActive;
+        return $this->active;
+    }
+
+    public function setActive(bool $active): AddCartRuleCommand
+    {
+        $this->active = $active;
+
+        return $this;
     }
 
-    /**
-     * @return DateTime
-     */
     public function getValidFrom(): DateTime
     {
         return $this->validFrom;
     }
 
-    /**
-     * @return DateTime
-     */
     public function getValidTo(): DateTime
     {
         return $this->validTo;
     }
 
-    /**
-     * @return int
-     */
+    public function setValidDateRange(DateTime $from, DateTime $to): AddCartRuleCommand
+    {
+        $this->assertDateRangeIsValid($from, $to);
+        $this->validFrom = $from;
+        $this->validTo = $to;
+
+        return $this;
+    }
+
     public function getTotalQuantity(): int
     {
         return $this->totalQuantity;
     }
 
-    /**
-     * @return int
-     */
+    public function setTotalQuantity(int $quantity): AddCartRuleCommand
+    {
+        if (0 > $quantity) {
+            throw new CartRuleConstraintException(sprintf('Quantity cannot be lower than zero, %d given', $quantity), CartRuleConstraintException::INVALID_QUANTITY);
+        }
+
+        $this->totalQuantity = $quantity;
+
+        return $this;
+    }
+
     public function getQuantityPerUser(): int
     {
         return $this->quantityPerUser;
     }
 
-    /**
-     * @return CartRuleAction
-     */
+    public function setQuantityPerUser(int $quantity): AddCartRuleCommand
+    {
+        if (0 > $quantity) {
+            throw new CartRuleConstraintException(sprintf('Quantity per user cannot be lower than zero, %d given', $quantity), CartRuleConstraintException::INVALID_QUANTITY_PER_USER);
+        }
+
+        $this->quantityPerUser = $quantity;
+
+        return $this;
+    }
+
     public function getCartRuleAction(): CartRuleAction
     {
         return $this->cartRuleAction;
     }
 
-    /**
-     * @param string $description
-     *
-     * @return AddCartRuleCommand
-     */
     public function setDescription(string $description): AddCartRuleCommand
     {
         $this->description = $description;
@@ -272,11 +276,6 @@ public function setDescription(string $description): AddCartRuleCommand
         return $this;
     }
 
-    /**
-     * @param string $code
-     *
-     * @return AddCartRuleCommand
-     */
     public function setCode(string $code): AddCartRuleCommand
     {
         $this->code = $code;
@@ -284,11 +283,6 @@ public function setCode(string $code): AddCartRuleCommand
         return $this;
     }
 
-    /**
-     * @param int $customerId
-     *
-     * @return AddCartRuleCommand
-     */
     public function setCustomerId(int $customerId): AddCartRuleCommand
     {
         $this->customerId = new CustomerId($customerId);
@@ -336,69 +330,6 @@ private function setLocalizedNames(array $localizedNames): AddCartRuleCommand
         return $this;
     }
 
-    /**
-     * @param int $priority
-     *
-     * @return AddCartRuleCommand
-     *
-     * @throws CartRuleConstraintException
-     */
-    private function setPriority(int $priority): AddCartRuleCommand
-    {
-        if (0 >= $priority) {
-            throw new CartRuleConstraintException(
-                sprintf('Invalid cart rule priority "%s". Must be a positive integer.', $priority),
-                CartRuleConstraintException::INVALID_PRIORITY
-            );
-        }
-
-        $this->priority = $priority;
-
-        return $this;
-    }
-
-    /**
-     * @param int $quantity
-     *
-     * @return AddCartRuleCommand
-     *
-     * @throws CartRuleConstraintException
-     */
-    private function setTotalQuantity(int $quantity): AddCartRuleCommand
-    {
-        if (0 > $quantity) {
-            throw new CartRuleConstraintException(sprintf('Quantity cannot be lower than zero, %d given', $quantity), CartRuleConstraintException::INVALID_QUANTITY);
-        }
-
-        $this->totalQuantity = $quantity;
-
-        return $this;
-    }
-
-    /**
-     * @param int $quantity
-     *
-     * @return AddCartRuleCommand
-     *
-     * @throws CartRuleConstraintException
-     */
-    private function setQuantityPerUser(int $quantity): AddCartRuleCommand
-    {
-        if (0 > $quantity) {
-            throw new CartRuleConstraintException(sprintf('Quantity per user cannot be lower than zero, %d given', $quantity), CartRuleConstraintException::INVALID_QUANTITY_PER_USER);
-        }
-
-        $this->quantityPerUser = $quantity;
-
-        return $this;
-    }
-
-    /**
-     * @param DateTime $dateFrom
-     * @param DateTime $dateTo
-     *
-     * @throws CartRuleConstraintException
-     */
     private function assertDateRangeIsValid(DateTime $dateFrom, DateTime $dateTo): void
     {
         if ($dateFrom > $dateTo) {
diff --git a/src/Core/Form/IdentifiableObject/DataHandler/CartRuleFormDataHandler.php b/src/Core/Form/IdentifiableObject/DataHandler/CartRuleFormDataHandler.php
index 19b6462e577a2..5c6c80c5bac92 100644
--- a/src/Core/Form/IdentifiableObject/DataHandler/CartRuleFormDataHandler.php
+++ b/src/Core/Form/IdentifiableObject/DataHandler/CartRuleFormDataHandler.php
@@ -64,18 +64,22 @@ public function create(array $data)
 
         $command = new AddCartRuleCommand(
             $informationData['name'],
-            isset($informationData['highlight']) && (bool) $informationData['highlight'],
-            (bool) $informationData['partial_use'],
-            (int) $informationData['priority'],
-            (bool) $informationData['active'],
-            DateTime::createFromFormat(DateTimeUtil::DEFAULT_DATETIME_FORMAT, $dateRange['from']),
-            DateTime::createFromFormat(DateTimeUtil::DEFAULT_DATETIME_FORMAT, $dateRange['to']),
-            (int) $conditionsData['total_available'],
-            (int) $conditionsData['available_per_user'],
             $this->cartRuleActionBuilder->build($data['actions'])
         );
 
-        $command->setCode($informationData['code']);
+        $command
+            ->setCode($informationData['code'])
+            ->setHighlightInCart(isset($informationData['highlight']) && (bool) $informationData['highlight'])
+            ->setAllowPartialUse((bool) $informationData['partial_use'])
+            ->setPriority((int) $informationData['priority'])
+            ->setActive((bool) $informationData['active'])
+            ->setValidDateRange(
+                DateTime::createFromFormat(DateTimeUtil::DEFAULT_DATETIME_FORMAT, $dateRange['from']),
+                DateTime::createFromFormat(DateTimeUtil::DEFAULT_DATETIME_FORMAT, $dateRange['to'])
+            )
+            ->setTotalQuantity((int) $conditionsData['total_available'])
+            ->setQuantityPerUser((int) $conditionsData['available_per_user'])
+        ;
 
         if (!empty($conditionsData['minimum_amount']['amount'])) {
             $amountData = $conditionsData['minimum_amount'];

From 08498be30df5bb19be0fda60a07b21c25b587609 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Wed, 10 May 2023 13:38:41 +0300
Subject: [PATCH 0229/1030]  fix route

---
 .../CartRule/Command/AddCartRuleCommand.php   |  4 ++--
 .../Form/Admin/Type/ProductSearchType.php     |  2 +-
 .../FrontOffice/cart_rule_validation.feature  | 21 -------------------
 3 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/src/Core/Domain/CartRule/Command/AddCartRuleCommand.php b/src/Core/Domain/CartRule/Command/AddCartRuleCommand.php
index 7c394489eea92..bc8f4efb737de 100644
--- a/src/Core/Domain/CartRule/Command/AddCartRuleCommand.php
+++ b/src/Core/Domain/CartRule/Command/AddCartRuleCommand.php
@@ -213,12 +213,12 @@ public function setActive(bool $active): AddCartRuleCommand
         return $this;
     }
 
-    public function getValidFrom(): DateTime
+    public function getValidFrom(): ?DateTime
     {
         return $this->validFrom;
     }
 
-    public function getValidTo(): DateTime
+    public function getValidTo(): ?DateTime
     {
         return $this->validTo;
     }
diff --git a/src/PrestaShopBundle/Form/Admin/Type/ProductSearchType.php b/src/PrestaShopBundle/Form/Admin/Type/ProductSearchType.php
index 279749544f42e..a2605ef7c7e5a 100644
--- a/src/PrestaShopBundle/Form/Admin/Type/ProductSearchType.php
+++ b/src/PrestaShopBundle/Form/Admin/Type/ProductSearchType.php
@@ -98,7 +98,7 @@ public function configureOptions(OptionsResolver $resolver): void
                             'filters' => $options['filters'],
                         ]);
                     } else {
-                        return $router->generate('admin_products_v2_search_associations', [
+                        return $router->generate('admin_products_search_products_for_association', [
                             'languageCode' => $languageIsoCode,
                             'query' => '__QUERY__',
                         ]);
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature
index 2df4c1c0cce4e..53de56b28fa6f 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature
@@ -11,13 +11,6 @@ Feature: Cart rule application is validated before it is applied to cart
     And there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
     And I create cart rule "cart_rule_1" with following properties:
       | name[en-US]                            | cartrule1              |
-      | description                            | provides 50% discount  |
-      | highlight                              | true                   |
-      | is_active                              | true                   |
-      | allow_partial_use                      | true                   |
-      | priority                               | 1                      |
-      | valid_from                             | 2000-01-01 11:05:00    |
-      | valid_to                               | 3000-12-01 00:00:00    |
       | total_quantity                         | 1000                   |
       | quantity_per_user                      | 1000                   |
       | free_shipping                          | false                  |
@@ -27,13 +20,6 @@ Feature: Cart rule application is validated before it is applied to cart
       | discount_application_type              | order_without_shipping |
     And I create cart rule "cart_rule_2" with following properties:
       | name[en-US]                            | cartrule2              |
-      | description                            | provides 10$ discount  |
-      | highlight                              | true                   |
-      | is_active                              | true                   |
-      | allow_partial_use                      | true                   |
-      | priority                               | 1                      |
-      | valid_from                             | 2000-01-01 11:05:00    |
-      | valid_to                               | 3000-12-01 00:00:00    |
       | total_quantity                         | 10                     |
       | quantity_per_user                      | 10                     |
       | free_shipping                          | false                  |
@@ -45,13 +31,6 @@ Feature: Cart rule application is validated before it is applied to cart
       | discount_application_type              | order_without_shipping |
     And I create cart rule "cart_rule_3" with following properties:
       | name[en-US]       | cartrule3              |
-      | description       | provides free shipping |
-      | highlight         | true                   |
-      | is_active         | true                   |
-      | allow_partial_use | true                   |
-      | priority          | 1                      |
-      | valid_from        | 2000-01-01 11:05:00    |
-      | valid_to          | 3000-12-01 00:00:00    |
       | total_quantity    | 10                     |
       | quantity_per_user | 10                     |
       | free_shipping     | true                   |

From 50f9ec2d97e0f2ca9a2a00c59cc776477a8ca7c4 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Thu, 11 May 2023 10:31:26 +0300
Subject: [PATCH 0230/1030]  use create cart rule step and improve background
 for amount_mono/mono_virtual/multiple).feature

---
 .../Features/Context/CartFeatureContext.php   |   1 +
 .../Context/CartRuleFeatureContext.php        |  48 ++-
 .../FrontOffice/Amount/amount_mono.feature    | 135 ++++----
 .../Amount/amount_mono_virtual.feature        |  75 +++--
 .../Amount/amount_multiple.feature            | 298 ++++++++++++------
 .../FrontOffice/cart_rule_validation.feature  |   2 +-
 6 files changed, 361 insertions(+), 198 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Context/CartFeatureContext.php b/tests/Integration/Behaviour/Features/Context/CartFeatureContext.php
index 261e695568705..802e4315ece15 100644
--- a/tests/Integration/Behaviour/Features/Context/CartFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/CartFeatureContext.php
@@ -210,6 +210,7 @@ public function assertTotalCartShipping(string $expectedShipping, bool $taxInclu
     {
         $cart = $this->getCurrentCart();
         $expectedTotal = new DecimalNumber($expectedShipping);
+        // using ONLY_SHIPPING will not reduce discounts, so this method is not suitable to assert free_shipping discount application
         $actualTotal = new DecimalNumber((string) $cart->getOrderTotal($taxIncluded, Cart::ONLY_SHIPPING));
 
         Assert::assertSame((string) $expectedTotal, (string) $actualTotal, 'Unexpected total cart shipping');
diff --git a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
index caad150fc457e..0400bc121430c 100644
--- a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
@@ -172,13 +172,21 @@ protected function createCartRule(
      */
     public function cartRuleWithProductRuleRestriction(string $cartRuleName, string $categoryName, int $quantity)
     {
-        $this->checkCartRuleWithNameExists($cartRuleName);
+        if ($this->getSharedStorage()->exists($cartRuleName)) {
+            //@todo: This allows applying this step to cart rule that was created with a step using CQRS command and saved to shared storage
+            //       it is not ideal, but for now it should work, until restrictions are migrated.
+            $cartRuleId = $this->getSharedStorage()->get($cartRuleName);
+        } else {
+            $this->checkCartRuleWithNameExists($cartRuleName);
+            $cartRuleId = $this->cartRules[$cartRuleName]->id;
+        }
+
         $this->categoryFeatureContext->checkCategoryWithNameExists($categoryName);
         $category = $this->categoryFeatureContext->getCategoryWithName($categoryName);
 
         Db::getInstance()->execute(
             'INSERT INTO `' . _DB_PREFIX_ . 'cart_rule_product_rule_group` (`id_cart_rule`, `quantity`) ' .
-            'VALUES (' . (int) $this->cartRules[$cartRuleName]->id . ', ' . $quantity . ')'
+            'VALUES (' . (int) $cartRuleId . ', ' . $quantity . ')'
         );
         $idProductRuleGroup = Db::getInstance()->Insert_ID();
 
@@ -186,7 +194,6 @@ public function cartRuleWithProductRuleRestriction(string $cartRuleName, string
             'INSERT INTO `' . _DB_PREFIX_ . 'cart_rule_product_rule` (`id_product_rule_group`, `type`) ' .
             'VALUES (' . (int) $idProductRuleGroup . ', "categories")'
         );
-        $idProductRule = Db::getInstance()->Insert_ID();
 
         Db::getInstance()->execute(
             'INSERT INTO `' . _DB_PREFIX_ . 'cart_rule_product_rule_value` (`id_product_rule`, `id_item`) ' .
@@ -224,18 +231,26 @@ public function cartRuleNamedIsRestrictedToProductNamed(
         string $productName,
         int $quantity = 1
     ): void {
-        $this->checkCartRuleWithNameExists($cartRuleName);
+        if ($this->getSharedStorage()->exists($cartRuleName)) {
+            //@todo: This allows applying this step to cart rule that was created with a step using CQRS command and saved to shared storage
+            //       it is not ideal, but for now it should work, until restrictions are migrated.
+            $cartRuleId = $this->getSharedStorage()->get($cartRuleName);
+        } else {
+            $this->checkCartRuleWithNameExists($cartRuleName);
+            $cartRuleId = $this->cartRules[$cartRuleName]->id;
+        }
         $this->productFeatureContext->checkProductWithNameExists($productName);
-
         $restrictedProduct = $this->productFeatureContext->getProductWithName($productName);
-        $this->cartRules[$cartRuleName]->product_restriction = true;
-        $this->cartRules[$cartRuleName]->reduction_product = $restrictedProduct->id;
-        $this->cartRules[$cartRuleName]->save();
+        $cartRule = new CartRule($cartRuleId);
+        $cartRule->product_restriction = true;
+        $cartRule->reduction_product = $restrictedProduct->id;
+        $cartRule->save();
+        $this->cartRules[$cartRuleName] = $cartRule;
 
         // The reduction_product is not enough, we need to define product rules for condition (this is done by the controller usually)
         Db::getInstance()->insert(
             'cart_rule_product_rule_group',
-            ['id_cart_rule' => $this->cartRules[$cartRuleName]->id, 'quantity' => $quantity]
+            ['id_cart_rule' => $cartRuleId, 'quantity' => $quantity]
         );
         $productRuleGroupId = Db::getInstance()->Insert_ID();
         Db::getInstance()->insert(
@@ -488,24 +503,27 @@ public function assertDiscountCodeIsNotAppliedToCurrentCart(string $code): void
     }
 
     /**
-     * @Given discount code :cartRuleReference is applied to my cart
+     * @Given cart rule :referenceOrCode is applied to my cart
+     * @Given discount :referenceOrCode is applied to my cart
      *
-     * @param string $code
+     * @param string $referenceOrCode
      *
      * @return void
      */
-    public function assertDiscountCodeIsAppliedToCurrentCart(string $code): void
+    public function assertCartRuleIsAppliedToCurrentCart(string $referenceOrCode): void
     {
-        $cartRuleId = $this->getSharedStorage()->get($code);
+        $cartRuleId = $this->getSharedStorage()->get($referenceOrCode);
 
+        Cache::clean('Cart::getCartRules_*');
+        $cartRules = $this->getCurrentCart()->getCartRules();
         /** @var array<string, mixed> $cartRule */
-        foreach ($this->getCurrentCart()->getCartRules() as $cartRule) {
+        foreach ($cartRules as $cartRule) {
             if ((int) $cartRule['id_cart_rule'] === $cartRuleId) {
                 return;
             }
         }
 
-        throw new RuntimeException(sprintf('Cart rule with code "%s" is not applied to current cart', $code));
+        throw new RuntimeException(sprintf('Cart rule with code or reference "%s" is not applied to current cart', $referenceOrCode));
     }
 
     /**
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono.feature
index b9ab60831812b..136a8257af64b 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono.feature
@@ -1,92 +1,103 @@
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags fo-cart-rule-amount-mono
 @restore-all-tables-before-feature
+@fo-cart-rule-amount-mono
 Feature: Cart rule (amount) calculation with one cart rule
   As a customer
   I must be able to have correct cart total when adding cart rules
 
-  Scenario: Empty cart, one cartRule
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a cart rule named "cartrule4" that applies an amount discount of 5.0 with priority 4, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule4" has a discount code "foo4"
-    Then I should have 0 different products in my cart
-    When I use the discount "cartrule4"
-    Then my cart total should be 0.0 tax included
-    Then my cart total using previous calculation method should be 0.0 tax included
+  Background:
+    And there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
+    And shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
+    And there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+    And there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
+    And there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
+    And I create cart rule "reduction_5_dollar" with following properties:
+      | name[en-US]                            | reduces $5             |
+      | total_quantity                         | 1000                   |
+      | quantity_per_user                      | 1000                   |
+      | priority                               | 4                      |
+      | free_shipping                          | false                  |
+      | code                                   | reduce-5               |
+      | reduction_amount                       | 5                      |
+      | reduction_currency                     | usd                    |
+      | reduction_tax                          | false                  |
+      | reduction_apply_to_discounted_products | true                   |
+      | discount_application_type              | order_without_shipping |
+    And I create cart rule "reduction_500_dollar" with following properties:
+      | name[en-US]                            | reduces $500           |
+      | total_quantity                         | 1000                   |
+      | quantity_per_user                      | 1000                   |
+      | priority                               | 5                      |
+      | free_shipping                          | false                  |
+      | code                                   | reduce-500             |
+      | reduction_amount                       | 500                    |
+      | reduction_currency                     | usd                    |
+      | reduction_tax                          | false                  |
+      | reduction_apply_to_discounted_products | true                   |
+      | discount_application_type              | order_without_shipping |
 
   Scenario: one product in cart, quantity 1, one 5€ global cartRule
     Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a cart rule named "cartrule4" that applies an amount discount of 5.0 with priority 4, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule4" has a discount code "foo4"
-    When I add 1 items of product "product1" in my cart
-    When I use the discount "cartrule4"
+    And I add 1 items of product "product1" in my cart
+    And total cart shipping fees should be 7.0 tax included
+    Then my cart total should be 26.812 tax included
+    Then my cart total using previous calculation method should be 26.812 tax included
+    When I apply the discount code "reduce-5"
     Then my cart total should be 21.812 tax included
     Then my cart total using previous calculation method should be 21.812 tax included
 
+  @restore-cart-rules-before-scenario
   Scenario: one product in cart, quantity 1, one 500€ global cartRule
     Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a cart rule named "cartrule5" that applies an amount discount of 500.0 with priority 5, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule5" has a discount code "foo5"
-    When I add 1 items of product "product1" in my cart
-    When I use the discount "cartrule5"
+    And I add 1 items of product "product1" in my cart
+    And total cart shipping fees should be 7.0 tax included
+    When I apply the discount code "reduce-500"
     Then my cart total should be 7.0 tax included
-    Then my cart total using previous calculation method should be 7.0 tax included
+    And my cart total using previous calculation method should be 7.0 tax included
 
+  @restore-cart-rules-before-scenario
   Scenario: one product in cart, quantity 3, one 5€ global cartRule
     Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a cart rule named "cartrule4" that applies an amount discount of 5.0 with priority 4, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule4" has a discount code "foo4"
-    When I add 3 items of product "product1" in my cart
-    When I use the discount "cartrule4"
+    And I add 3 items of product "product1" in my cart
+    When I apply the discount code "reduce-5"
     Then my cart total should be 61.436 tax included
-    Then my cart total using previous calculation method should be 61.436 tax included
+    And my cart total using previous calculation method should be 61.436 tax included
 
+  @restore-cart-rules-before-scenario
   Scenario: 3 products in cart, several quantities, one 5€ global cartRule (reduced product at first place)
     Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
-    Given there is a cart rule named "cartrule4" that applies an amount discount of 5.0 with priority 4, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule4" has a discount code "foo4"
-    When I add 2 items of product "product2" in my cart
-    When I add 3 items of product "product1" in my cart
-    When I add 1 items of product "product3" in my cart
-    When I use the discount "cartrule4"
+    And I add 2 items of product "product2" in my cart
+    And I add 3 items of product "product1" in my cart
+    And I add 1 items of product "product3" in my cart
+    And total cart shipping fees should be 7.0 tax included
+    And my cart total should be 162.4 tax included
+    And my cart total using previous calculation method should be 162.4 tax included
+    When I apply the discount code "reduce-5"
     Then my cart total should be 157.4 tax included
-    Then my cart total using previous calculation method should be 157.4 tax included
+    And my cart total using previous calculation method should be 157.4 tax included
 
+  @restore-cart-rules-before-scenario
   Scenario: 3 products in cart, several quantities, one 5€ global cartRule (reduced product at second place)
     Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
-    Given there is a cart rule named "cartrule4" that applies an amount discount of 5.0 with priority 4, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule4" has a discount code "foo4"
-    When I add 3 items of product "product1" in my cart
-    When I add 2 items of product "product2" in my cart
-    When I add 1 items of product "product3" in my cart
-    When I use the discount "cartrule4"
+    And I add 3 items of product "product1" in my cart
+    And I add 2 items of product "product2" in my cart
+    And I add 1 items of product "product3" in my cart
+    And total cart shipping fees should be 7.0 tax included
+    And my cart total should be 162.4 tax included
+    And my cart total using previous calculation method should be 162.4 tax included
+    When I apply the discount code "reduce-5"
     Then my cart total should be 157.4 tax included
-    Then my cart total using previous calculation method should be 157.4 tax included
+    And my cart total using previous calculation method should be 157.4 tax included
 
+  @restore-cart-rules-before-scenario
   Scenario: 3 products in cart, several quantities, one 500€ global cartRule
     Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
-    Given there is a cart rule named "cartrule5" that applies an amount discount of 500.0 with priority 5, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule5" has a discount code "foo5"
-    When I add 3 items of product "product1" in my cart
-    When I add 2 items of product "product2" in my cart
-    When I add 1 items of product "product3" in my cart
-    When I use the discount "cartrule5"
-    Then my cart total should be 7.0 tax included
+    And I add 3 items of product "product1" in my cart
+    And I add 2 items of product "product2" in my cart
+    And I add 1 items of product "product3" in my cart
+    And total cart shipping fees should be 7.0 tax included
+    And my cart total should be 162.4 tax included
+    And my cart total using previous calculation method should be 162.4 tax included
+    When I apply the discount code "reduce-500"
     Then my cart total using previous calculation method should be 7.0 tax included
+    And my cart total should be 7.0 tax included
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono_virtual.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono_virtual.feature
index c89cbd08f229e..31c1f92ec301d 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono_virtual.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono_virtual.feature
@@ -1,36 +1,63 @@
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags fo-cart-rule-amount-mono-virtual
 @restore-all-tables-before-feature
+@fo-cart-rule-amount-mono-virtual
 Feature: Cart rule (amount) calculation with one cart rule
   As a customer
   I must be able to have correct cart total when adding cart rules
 
+  Background:
+    And there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
+    And shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
+    And there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+    And there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
+    And there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
+    And there is a product in the catalog named "product8" with a price of 12.345 and 1000 items in stock
+    And product "product8" is virtual
+    And I create cart rule "reduction_5_dollar" with following properties:
+      | name[en-US]                            | reduces $5             |
+      | total_quantity                         | 1000                   |
+      | quantity_per_user                      | 1000                   |
+      | priority                               | 4                      |
+      | free_shipping                          | false                  |
+      | code                                   | reduce-5               |
+      | reduction_amount                       | 5                      |
+      | reduction_currency                     | usd                    |
+      | reduction_tax                          | false                  |
+      | reduction_apply_to_discounted_products | true                   |
+      | discount_application_type              | order_without_shipping |
+    And I create cart rule "reduction_500_dollar" with following properties:
+      | name[en-US]                            | reduces $500           |
+      | total_quantity                         | 1000                   |
+      | quantity_per_user                      | 1000                   |
+      | priority                               | 5                      |
+      | free_shipping                          | false                  |
+      | code                                   | reduce-500             |
+      | reduction_amount                       | 500                    |
+      | reduction_currency                     | usd                    |
+      | reduction_tax                          | false                  |
+      | reduction_apply_to_discounted_products | true                   |
+      | discount_application_type              | order_without_shipping |
+
   Scenario: 4 products in cart, one is virtual, several quantities, one 5€ global voucher
     Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
-    Given there is a product in the catalog named "product8" with a price of 12.345 and 1000 items in stock
-    Given product "product8" is virtual
-    Given there is a cart rule named "cartrule4" that applies an amount discount of 5.0 with priority 4, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule4" has a discount code "foo4"
-    When I add 3 items of product "product1" in my cart
-    When I add 2 items of product "product2" in my cart
-    When I add 1 items of product "product3" in my cart
-    When I add 2 items of product "product8" in my cart
-    Then cart rule "cartrule4" can be applied to my cart
-    When I use the discount "cartrule4"
+    And I add 3 items of product "product1" in my cart
+    And I add 2 items of product "product2" in my cart
+    And I add 1 items of product "product3" in my cart
+    And I add 2 items of product "product8" in my cart
+    And total cart shipping fees should be 7.0 tax included
+    And my cart total should be 187.09 tax included
+    And my cart total using previous calculation method should be 187.09 tax included
+    When I apply the discount code "reduce-5"
     Then my cart total should be 182.09 tax included
-    Then my cart total using previous calculation method should be 182.09 tax included
+    And my cart total using previous calculation method should be 182.09 tax included
 
+  @restore-cart-rules-before-scenario
   Scenario: Only virtual product in my cart, one 5€ global voucher
     Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product8" with a price of 12.345 and 1000 items in stock
-    Given product "product8" is virtual
-    Given there is a cart rule named "cartrule4" that applies an amount discount of 5.0 with priority 4, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule4" has a discount code "foo4"
-    When I add 2 items of product "product8" in my cart
-    Then cart rule "cartrule4" can be applied to my cart
-    When I use the discount "cartrule4"
+    And I add 2 items of product "product8" in my cart
+    And total cart shipping fees should be 0.0 tax included
+    And my cart total should be 24.69 tax included
+    And my cart total using previous calculation method should be 24.69 tax included
+    When I apply the discount code "reduce-5"
     Then my cart total should be 19.69 tax included
-    Then my cart total using previous calculation method should be 19.69 tax included
+    And my cart total using previous calculation method should be 19.69 tax included
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_multiple.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_multiple.feature
index d91ce20eb67b8..7a335f565cb48 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_multiple.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_multiple.feature
@@ -1,131 +1,237 @@
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags fo-cart-rule-amount-multiple
 @restore-all-tables-before-feature
+@fo-cart-rule-amount-multiple
 Feature: Cart rule (amount) calculation with multiple cart rules
   As a customer
   I must be able to have correct cart total when adding cart rules
 
-  Scenario: Empty cart, 2 cartRules
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a cart rule named "cartrule4" that applies an amount discount of 5.0 with priority 4, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule4" has a discount code "foo4"
-    Given there is a cart rule named "cartrule6" that applies an amount discount of 10.0 with priority 6, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule6" has a discount code "foo6"
-    Then I should have 0 different products in my cart
-    When I use the discount "cartrule4"
-    When I use the discount "cartrule6"
-    Then my cart total should be 0.0 tax included
-    Then my cart total using previous calculation method should be 0.0 tax included
+  Background:
+    And there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
+    And shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
+    And there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+    And there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
+    And there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
+    And there is a product in the catalog named "product8" with a price of 12.345 and 1000 items in stock
+    And there is a category named "Awesome"
+    And product "product8" is in category "Awesome"
+    And product "product8" is virtual
+    And I create cart rule "reduction_5_dollar" with following properties:
+      | name[en-US]                            | reduces $5             |
+      | total_quantity                         | 1000                   |
+      | quantity_per_user                      | 1000                   |
+      | priority                               | 4                      |
+      | free_shipping                          | false                  |
+      | code                                   | reduce-5               |
+      | reduction_amount                       | 5                      |
+      | reduction_currency                     | usd                    |
+      | reduction_tax                          | false                  |
+      | reduction_apply_to_discounted_products | true                   |
+      | discount_application_type              | order_without_shipping |
+    And I create cart rule "reduction_500_dollar" with following properties:
+      | name[en-US]                            | reduces $500           |
+      | total_quantity                         | 1000                   |
+      | quantity_per_user                      | 1000                   |
+      | priority                               | 5                      |
+      | free_shipping                          | false                  |
+      | code                                   | reduce-500             |
+      | reduction_amount                       | 500                    |
+      | reduction_currency                     | usd                    |
+      | reduction_tax                          | false                  |
+      | reduction_apply_to_discounted_products | true                   |
+      | discount_application_type              | order_without_shipping |
+    And I create cart rule "reduction_10_dollar" with following properties:
+      | name[en-US]                            | reduces $10            |
+      | total_quantity                         | 1000                   |
+      | quantity_per_user                      | 1000                   |
+      | priority                               | 6                      |
+      | free_shipping                          | false                  |
+      | code                                   | reduce-10              |
+      | reduction_amount                       | 10                     |
+      | reduction_currency                     | usd                    |
+      | reduction_tax                          | false                  |
+      | reduction_apply_to_discounted_products | true                   |
+      | discount_application_type              | order_without_shipping |
 
   Scenario: one product in cart, quantity 1, one 5€ global cartRule, one 10€ global cartRule
     Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a cart rule named "cartrule4" that applies an amount discount of 5.0 with priority 4, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule4" has a discount code "foo4"
-    Given there is a cart rule named "cartrule6" that applies an amount discount of 10.0 with priority 6, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule6" has a discount code "foo6"
-    When I add 1 items of product "product1" in my cart
-    When I use the discount "cartrule4"
-    When I use the discount "cartrule6"
+    And I add 1 items of product "product1" in my cart
+    And total cart shipping fees should be 7.0 tax included
+    And my cart total should be 26.812 tax included
+    And my cart total using previous calculation method should be 26.812 tax included
+    When I apply the discount code "reduce-5"
+    Then my cart total should be 21.812 tax included
+    And my cart total using previous calculation method should be 21.812 tax included
+    And I apply the discount code "reduce-10"
     Then my cart total should be 11.812 tax included
-    Then my cart total using previous calculation method should be 11.812 tax included
+    And my cart total using previous calculation method should be 11.812 tax included
 
+  @restore-cart-rules-before-scenario
   Scenario: one product in cart, quantity 3, one 5€ global cartRule, one 10€ global cartRule
     Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a cart rule named "cartrule4" that applies an amount discount of 5.0 with priority 4, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule4" has a discount code "foo4"
-    Given there is a cart rule named "cartrule6" that applies an amount discount of 10.0 with priority 6, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule6" has a discount code "foo6"
-    When I add 3 items of product "product1" in my cart
-    When I use the discount "cartrule4"
-    When I use the discount "cartrule6"
+    And I add 3 items of product "product1" in my cart
+    And total cart shipping fees should be 7.0 tax included
+    And my cart total should be 66.436 tax included
+    And my cart total using previous calculation method should be 66.436 tax included
+    When I apply the discount code "reduce-5"
+    Then my cart total should be 61.436 tax included
+    And my cart total using previous calculation method should be 61.436 tax included
+    When I apply the discount code "reduce-10"
     Then my cart total should be 51.436 tax included
-    Then my cart total using previous calculation method should be 51.436 tax included
+    And my cart total using previous calculation method should be 51.436 tax included
 
+  @restore-cart-rules-before-scenario
   Scenario: 3 products in cart, several quantities, one 5€ global cartRule (reduced product at first place)
     Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
-    Given there is a cart rule named "cartrule4" that applies an amount discount of 5.0 with priority 4, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule4" has a discount code "foo4"
-    Given there is a cart rule named "cartrule6" that applies an amount discount of 10.0 with priority 6, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule6" has a discount code "foo6"
-    When I add 2 items of product "product2" in my cart
-    When I add 3 items of product "product1" in my cart
-    When I add 1 items of product "product3" in my cart
-    When I use the discount "cartrule4"
-    When I use the discount "cartrule6"
+    And I add 2 items of product "product2" in my cart
+    And I add 3 items of product "product1" in my cart
+    And I add 1 items of product "product3" in my cart
+    And total cart shipping fees should be 7.0 tax included
+    And my cart total should be 162.4 tax included
+    And my cart total using previous calculation method should be 162.4 tax included
+    When I apply the discount code "reduce-5"
+    Then my cart total should be 157.4 tax included
+    And my cart total using previous calculation method should be 157.4 tax included
+    When I apply the discount code "reduce-10"
     Then my cart total should be 147.4 tax included
-    Then my cart total using previous calculation method should be 147.4 tax included
+    And my cart total using previous calculation method should be 147.4 tax included
 
+  @restore-cart-rules-before-scenario
   Scenario: One product in my cart, one cart rule for free shipping and one for free gift
     Given I have an empty default cart
-    Given there is a category named "Awesome"
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product8" with a price of 12.345 and 1000 items in stock
-    Given product "product8" is in category "Awesome"
-    Given there is a cart rule named "cartrule-free-shipping" that applies an amount discount of 0.0 with priority 1, quantity of 1 and quantity per user 1
-    Given cart rule "cartrule-free-shipping" offers free shipping
-    Given there is a cart rule named "cartrule-free-gift" that applies an amount discount of 10.0 with priority 1, quantity of 1 and quantity per user 1
-    Given cart rule "cartrule-free-gift" is restricted to the category "Awesome" with a quantity of 1
-    Given cart rule "cartrule-free-gift" is restricted to product "product8"
+    And I create cart rule "cartrule-free-shipping" with following properties:
+      | name[en-US]       | cartrule-free-shipping |
+      | total_quantity    | 1                      |
+      | quantity_per_user | 1                      |
+      | priority          | 1                      |
+      | free_shipping     | true                   |
+    And I create cart rule "reduce-10-restricted" with following properties:
+      | name[en-US]                            | reduce-10-restricted   |
+      | total_quantity                         | 1                      |
+      | quantity_per_user                      | 1                      |
+      | priority                               | 1                      |
+      | free_shipping                          | false                  |
+      | reduction_amount                       | 10                     |
+      | reduction_currency                     | usd                    |
+      | reduction_tax                          | false                  |
+      | reduction_apply_to_discounted_products | true                   |
+      | discount_application_type              | order_without_shipping |
+    And cart rule "reduce-10-restricted" is restricted to the category "Awesome" with a quantity of 1
+    And cart rule "reduce-10-restricted" is restricted to product "product8"
     When I add 1 item of product "product8" in my cart
-    Then my cart total should be precisely 2.35 tax included
-    Then my cart total should be 2.4 tax included
-    Then my cart total using previous calculation method should be 2.4 tax included
+    And cart rule "reduce-10-restricted" is applied to my cart
+    Then total cart shipping fees should be 0.0 tax included
+    And my cart total should be precisely 2.35 tax included
+    And my cart total should be 2.4 tax included
+    And my cart total using previous calculation method should be 2.4 tax included
 
+  @restore-cart-rules-before-scenario
   Scenario: One product in my cart, one 10€ global cartRule, 2 free gifts global cartRules
     Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
-    Given there is a cart rule named "cartrule-10" that applies an amount discount of 10.0 with priority 1, quantity of 1 and quantity per user 1
-    Given there is a cart rule named "cartrule-free-gift-1" that applies no discount with priority 1, quantity of 1 and quantity per user 1
-    Given cart rule "cartrule-free-gift-1" offers a gift product "product2"
-    Given there is a cart rule named "cartrule-free-gift-2" that applies no discount with priority 1, quantity of 1 and quantity per user 1
-    Given cart rule "cartrule-free-gift-2" offers a gift product "product3"
+    And I create cart rule "reduce-10-global" with following properties:
+      | name[en-US]                            | reduce-10-global       |
+      | total_quantity                         | 1                      |
+      | quantity_per_user                      | 1                      |
+      | priority                               | 1                      |
+      | free_shipping                          | false                  |
+      | reduction_amount                       | 10                     |
+      | reduction_currency                     | usd                    |
+      | reduction_tax                          | false                  |
+      | reduction_apply_to_discounted_products | true                   |
+      | discount_application_type              | order_without_shipping |
+    And I create cart rule "cartrule-gift-product2" with following properties:
+      | name[en-US]       | cartrule-gift-product2 |
+      | total_quantity    | 1                      |
+      | quantity_per_user | 1                      |
+      | priority          | 1                      |
+      | free_shipping     | false                  |
+      | gift_product      | product2               |
+    And I create cart rule "cartrule-gift-product3" with following properties:
+      | name[en-US]       | cartrule-gift-product3 |
+      | total_quantity    | 1                      |
+      | quantity_per_user | 1                      |
+      | priority          | 1                      |
+      | free_shipping     | false                  |
+      | gift_product      | product3               |
     When I add 1 item of product "product1" in my cart
-    Then I should have 3 products in my cart
-    Then my cart total should be precisely 16.81 tax included
-    Then my cart total should be 16.8 tax included
-    Then my cart total using previous calculation method should be 16.8 tax included
+    Then cart rule "cartrule-gift-product2" is applied to my cart
+    And cart rule "cartrule-gift-product3" is applied to my cart
+    And cart rule "reduce-10-global" is applied to my cart
+    And I should have 3 products in my cart
+    And my cart total should be precisely 16.81 tax included
+    And my cart total should be 16.8 tax included
+    And my cart total using previous calculation method should be 16.8 tax included
 
+  @restore-cart-rules-before-scenario
   Scenario: One product in my cart, one 30€ global cartRule (which is superior to the product bought), 2 free gifts global cartRules
     Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
-    Given there is a cart rule named "cartrule-30" that applies an amount discount of 30.0 with priority 1, quantity of 1 and quantity per user 1
-    Given there is a cart rule named "cartrule-free-gift-1" that applies no discount with priority 1, quantity of 1 and quantity per user 1
-    Given cart rule "cartrule-free-gift-1" offers a gift product "product2"
-    Given there is a cart rule named "cartrule-free-gift-2" that applies no discount with priority 1, quantity of 1 and quantity per user 1
-    Given cart rule "cartrule-free-gift-2" offers a gift product "product3"
+    And I create cart rule "reduce-30-global" with following properties:
+      | name[en-US]                            | reduce-30-global       |
+      | total_quantity                         | 1                      |
+      | quantity_per_user                      | 1                      |
+      | priority                               | 1                      |
+      | free_shipping                          | false                  |
+      | reduction_amount                       | 30                     |
+      | reduction_currency                     | usd                    |
+      | reduction_tax                          | false                  |
+      | reduction_apply_to_discounted_products | true                   |
+      | discount_application_type              | order_without_shipping |
+    And I create cart rule "cartrule-gift-product2" with following properties:
+      | name[en-US]       | cartrule-gift-product2 |
+      | total_quantity    | 1                      |
+      | quantity_per_user | 1                      |
+      | priority          | 1                      |
+      | free_shipping     | false                  |
+      | gift_product      | product2               |
+    And I create cart rule "cartrule-gift-product3" with following properties:
+      | name[en-US]       | cartrule-gift-product3 |
+      | total_quantity    | 1                      |
+      | quantity_per_user | 1                      |
+      | priority          | 1                      |
+      | free_shipping     | false                  |
+      | gift_product      | product3               |
     When I add 1 item of product "product1" in my cart
     Then I should have 3 products in my cart
-    Then my cart total should be precisely 7.0 tax included
-    Then my cart total should be 7.0 tax included
-    Then my cart total using previous calculation method should be 7.0 tax included
+    And cart rule "cartrule-gift-product2" is applied to my cart
+    And cart rule "cartrule-gift-product3" is applied to my cart
+    And cart rule "reduce-30-global" is applied to my cart
+    And total cart shipping fees should be 7.0 tax included
+    And my cart total should be precisely 7.0 tax included
+    And my cart total should be 7.0 tax included
+    And my cart total using previous calculation method should be 7.0 tax included
 
+  @restore-cart-rules-before-scenario
   Scenario: One product in my cart, one 30€ global cartRule (which is superior to the product bought) with free shipping, 2 free gifts global cartRules
     Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
-    Given there is a cart rule named "cartrule-30" that applies an amount discount of 30.0 with priority 1, quantity of 1 and quantity per user 1
-    Given cart rule "cartrule-30" offers free shipping
-    Given there is a cart rule named "cartrule-free-gift-1" that applies no discount with priority 1, quantity of 1 and quantity per user 1
-    Given cart rule "cartrule-free-gift-1" offers a gift product "product2"
-    Given there is a cart rule named "cartrule-free-gift-2" that applies no discount with priority 1, quantity of 1 and quantity per user 1
-    Given cart rule "cartrule-free-gift-2" offers a gift product "product3"
+    And I create cart rule "reduce-30-free-ship-global" with following properties:
+      | name[en-US]                            | reduce-30-free-ship-global |
+      | total_quantity                         | 1                          |
+      | quantity_per_user                      | 1                          |
+      | priority                               | 1                          |
+      | free_shipping                          | true                       |
+      | reduction_amount                       | 30                         |
+      | reduction_currency                     | usd                        |
+      | reduction_tax                          | false                      |
+      | reduction_apply_to_discounted_products | true                       |
+      | discount_application_type              | order_without_shipping     |
+    And I create cart rule "cartrule-gift-product2" with following properties:
+      | name[en-US]       | cartrule-gift-product2 |
+      | total_quantity    | 1                      |
+      | quantity_per_user | 1                      |
+      | priority          | 1                      |
+      | free_shipping     | false                  |
+      | gift_product      | product2               |
+    And I create cart rule "cartrule-gift-product3" with following properties:
+      | name[en-US]       | cartrule-gift-product3 |
+      | total_quantity    | 1                      |
+      | quantity_per_user | 1                      |
+      | priority          | 1                      |
+      | free_shipping     | false                  |
+      | gift_product      | product3               |
     When I add 1 item of product "product1" in my cart
     Then I should have 3 products in my cart
-    Then my cart total should be precisely 0.0 tax included
-    Then my cart total should be 0.0 tax included
-    Then my cart total using previous calculation method should be 0.0 tax included
+    And cart rule "cartrule-gift-product2" is applied to my cart
+    And cart rule "cartrule-gift-product3" is applied to my cart
+    And cart rule "reduce-30-free-ship-global" is applied to my cart
+    And my cart total should be precisely 0.0 tax included
+    And my cart total should be 0.0 tax included
+    And my cart total using previous calculation method should be 0.0 tax included
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature
index 53de56b28fa6f..80c52445597e4 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature
@@ -78,7 +78,7 @@ Feature: Cart rule application is validated before it is applied to cart
     And my cart total should be 26.8 tax excluded
     And discount code "foo1" is not applied to my cart
     And I apply the discount code "foo1"
-    And discount code "foo1" is applied to my cart
+    And discount "foo1" is applied to my cart
     And my cart total should be 16.9 tax excluded
     When I apply the discount code "foo1"
     Then I should get cart rule validation error saying "This voucher is already in your cart"

From 9d37e4b640c89534592036d8671a620a4ee8cb4b Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Wed, 17 May 2023 16:31:19 +0300
Subject: [PATCH 0231/1030]  fix add cart rule after rebase

---
 .../CartRule/AddCartRuleFeatureContext.php    | 44 ++++++++++++-------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AddCartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AddCartRuleFeatureContext.php
index 502b904fb135e..9428ff067b507 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AddCartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AddCartRuleFeatureContext.php
@@ -31,9 +31,7 @@
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\AddCartRuleCommand;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleConstraintException;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\CartRuleId;
-use PrestaShop\PrestaShop\Core\Domain\Exception\DomainConstraintException;
-use PrestaShopDatabaseException;
-use PrestaShopException;
+use RuntimeException;
 use Tests\Integration\Behaviour\Features\Context\Util\PrimitiveUtils;
 
 class AddCartRuleFeatureContext extends AbstractCartRuleFeatureContext
@@ -43,11 +41,6 @@ class AddCartRuleFeatureContext extends AbstractCartRuleFeatureContext
      *
      * @param string $cartRuleReference
      * @param TableNode $node
-     *
-     * @throws CartRuleConstraintException
-     * @throws DomainConstraintException
-     * @throws PrestaShopDatabaseException
-     * @throws PrestaShopException
      */
     public function createCartRuleWithReference(string $cartRuleReference, TableNode $node): void
     {
@@ -55,17 +48,36 @@ public function createCartRuleWithReference(string $cartRuleReference, TableNode
         try {
             $command = new AddCartRuleCommand(
                 $data['name'],
-                isset($data['highlight']) && PrimitiveUtils::castStringBooleanIntoBoolean($data['highlight']),
-                PrimitiveUtils::castStringBooleanIntoBoolean($data['allow_partial_use']),
-                (int) $data['priority'],
-                PrimitiveUtils::castStringBooleanIntoBoolean($data['is_active']),
-                new DateTime($data['valid_from']),
-                new DateTime($data['valid_to']),
-                $data['total_quantity'],
-                $data['quantity_per_user'],
                 $this->getCartRuleActionBuilder()->build($this->formatDataForActionBuilder($data))
             );
 
+            if (isset($data['highlight'])) {
+                $command->setHighlightInCart(PrimitiveUtils::castStringBooleanIntoBoolean($data['highlight']));
+            }
+            if (isset($data['allow_partial_use'])) {
+                $command->setAllowPartialUse(PrimitiveUtils::castStringBooleanIntoBoolean($data['allow_partial_use']));
+            }
+            if (isset($data['priority'])) {
+                $command->setPriority((int) $data['priority']);
+            }
+            if (isset($data['is_active'])) {
+                $command->setActive(PrimitiveUtils::castStringBooleanIntoBoolean($data['is_active']));
+            }
+            if (isset($data['valid_from'])) {
+                if (empty($data['valid_to'])) {
+                    throw new RuntimeException('When setting cart rule range "valid_from" and "valid_to" must be provided');
+                }
+                $command->setValidDateRange(
+                    new DateTime($data['valid_from']),
+                    new DateTime($data['valid_to']),
+                );
+            }
+            if (isset($data['total_quantity'])) {
+                $command->setTotalQuantity((int) $data['total_quantity']);
+            }
+            if (isset($data['quantity_per_user'])) {
+                $command->setQuantityPerUser((int) $data['quantity_per_user']);
+            }
             if (!empty($data['minimum_amount'])) {
                 $currencyId = $this->getSharedStorage()->get($data['minimum_amount_currency']);
                 $command->setMinimumAmount(

From 97196790119fb676c715fd3f9833e6124af5485d Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Wed, 17 May 2023 16:54:42 +0300
Subject: [PATCH 0232/1030]  homogenize discounts and active field

---
 .../CommandHandler/AddCartRuleHandler.php     |   2 +-
 .../CartRule/Command/EditCartRuleCommand.php  |   8 +-
 .../CartRuleReductionForEditing.php           |   4 +-
 .../AbstractCartRuleFeatureContext.php        |  14 +-
 .../CartRule/AddCartRuleFeatureContext.php    |   4 +-
 .../CartRuleAssertionFeatureContext.php       |  42 ++--
 .../CartRule/EditCartRuleFeatureContext.php   |   4 +-
 .../minimum_amount_cartrule.feature           |  54 ++---
 .../FrontOffice/Amount/amount_mono.feature    |  44 ++--
 .../Amount/amount_mono_virtual.feature        |  44 ++--
 .../Amount/amount_multiple.feature            | 146 ++++++------
 .../FrontOffice/cart_rule_validation.feature  |  46 ++--
 .../Scenario/CartRule/add_cart_rule.feature   |  88 +++----
 .../Scenario/CartRule/edit_cart_rule.feature  | 221 +++++++++---------
 .../Scenario/Order/order_cart_rules.feature   |  29 ---
 15 files changed, 347 insertions(+), 403 deletions(-)

diff --git a/src/Adapter/CartRule/CommandHandler/AddCartRuleHandler.php b/src/Adapter/CartRule/CommandHandler/AddCartRuleHandler.php
index a732d733d30ee..eb8ea3d354c8c 100644
--- a/src/Adapter/CartRule/CommandHandler/AddCartRuleHandler.php
+++ b/src/Adapter/CartRule/CommandHandler/AddCartRuleHandler.php
@@ -27,8 +27,8 @@
 namespace PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler;
 
 use CartRule;
-use PrestaShop\PrestaShop\Adapter\CartRule\CartRuleActionFiller;
 use DateTimeImmutable;
+use PrestaShop\PrestaShop\Adapter\CartRule\CartRuleActionFiller;
 use PrestaShop\PrestaShop\Adapter\CartRule\Repository\CartRuleRepository;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\AddCartRuleCommand;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\CommandHandler\AddCartRuleHandlerInterface;
diff --git a/src/Core/Domain/CartRule/Command/EditCartRuleCommand.php b/src/Core/Domain/CartRule/Command/EditCartRuleCommand.php
index 9200558cd0fc8..855352ff5b1f7 100644
--- a/src/Core/Domain/CartRule/Command/EditCartRuleCommand.php
+++ b/src/Core/Domain/CartRule/Command/EditCartRuleCommand.php
@@ -94,7 +94,7 @@ class EditCartRuleCommand
     /**
      * @var bool|null
      */
-    private $enabled;
+    private $active;
 
     /**
      * @var DateTimeImmutable|null
@@ -190,12 +190,12 @@ public function setAllowPartialUse(?bool $allowPartialUse): EditCartRuleCommand
 
     public function isActive(): ?bool
     {
-        return $this->enabled;
+        return $this->active;
     }
 
-    public function setEnabled(bool $enabled): EditCartRuleCommand
+    public function setActive(bool $active): EditCartRuleCommand
     {
-        $this->enabled = $enabled;
+        $this->active = $active;
 
         return $this;
     }
diff --git a/src/Core/Domain/CartRule/QueryResult/CartRuleReductionForEditing.php b/src/Core/Domain/CartRule/QueryResult/CartRuleReductionForEditing.php
index b1f109c854435..2640ab55bbc38 100644
--- a/src/Core/Domain/CartRule/QueryResult/CartRuleReductionForEditing.php
+++ b/src/Core/Domain/CartRule/QueryResult/CartRuleReductionForEditing.php
@@ -68,14 +68,14 @@ public function __construct(
         bool $tax,
         ?int $currencyId,
         ?int $productId,
-        bool $excludeSpecial
+        bool $applyToDiscountedProducts
     ) {
         $this->percent = $percent;
         $this->amount = $amount;
         $this->tax = $tax;
         $this->currencyId = $currencyId;
         $this->productId = $productId;
-        $this->applyToDiscountedProducts = $excludeSpecial;
+        $this->applyToDiscountedProducts = $applyToDiscountedProducts;
     }
 
     /**
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
index e11c7638cf976..e406d7bcbacf0 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
@@ -55,18 +55,18 @@ protected function formatDataForActionBuilder(array $data): array
             $formattedData['free_shipping'] = PrimitiveUtils::castStringBooleanIntoBoolean($data['free_shipping']);
         }
 
-        if (isset($data['reduction_percentage'])) {
-            $formattedData['discount']['reduction']['value'] = $data['reduction_percentage'];
+        if (isset($data['discount_percentage'])) {
+            $formattedData['discount']['reduction']['value'] = $data['discount_percentage'];
             $formattedData['discount']['reduction']['type'] = Reduction::TYPE_PERCENTAGE;
-            $formattedData['discount']['apply_to_discounted_products'] = PrimitiveUtils::castStringBooleanIntoBoolean($data['reduction_apply_to_discounted_products']);
+            $formattedData['discount']['apply_to_discounted_products'] = PrimitiveUtils::castStringBooleanIntoBoolean($data['apply_to_discounted_products']);
         }
 
-        if (isset($data['reduction_amount'])) {
+        if (isset($data['discount_amount'])) {
             $formattedData['discount']['reduction'] = [
-                'value' => $data['reduction_amount'],
+                'value' => $data['discount_amount'],
                 'type' => Reduction::TYPE_AMOUNT,
-                'currency' => $this->getSharedStorage()->get($data['reduction_currency']),
-                'include_tax' => PrimitiveUtils::castStringBooleanIntoBoolean($data['reduction_tax']),
+                'currency' => $this->getSharedStorage()->get($data['discount_currency']),
+                'include_tax' => PrimitiveUtils::castStringBooleanIntoBoolean($data['discount_includes_tax']),
             ];
         }
 
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AddCartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AddCartRuleFeatureContext.php
index 9428ff067b507..4d564acf232eb 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AddCartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AddCartRuleFeatureContext.php
@@ -60,8 +60,8 @@ public function createCartRuleWithReference(string $cartRuleReference, TableNode
             if (isset($data['priority'])) {
                 $command->setPriority((int) $data['priority']);
             }
-            if (isset($data['is_active'])) {
-                $command->setActive(PrimitiveUtils::castStringBooleanIntoBoolean($data['is_active']));
+            if (isset($data['active'])) {
+                $command->setActive(PrimitiveUtils::castStringBooleanIntoBoolean($data['active']));
             }
             if (isset($data['valid_from'])) {
                 if (empty($data['valid_to'])) {
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
index 89330c5098209..d7403484d4652 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
@@ -177,11 +177,11 @@ public function assertCartRuleProperties(string $cartRuleReference, TableNode $t
                 'Unexpected partial use'
             );
         }
-        if (isset($data['enabled'])) {
+        if (isset($data['active'])) {
             Assert::assertSame(
-                PrimitiveUtils::castStringBooleanIntoBoolean($data['enabled']),
+                PrimitiveUtils::castStringBooleanIntoBoolean($data['active']),
                 $information->isEnabled(),
-                'Unexpected enabled property'
+                'Unexpected active property'
             );
         }
         if (isset($data['code'])) {
@@ -263,40 +263,48 @@ public function assertCartRuleProperties(string $cartRuleReference, TableNode $t
             );
         }
 
-        if (isset($data['reduction_percentage'])) {
+        if (isset($data['discount_percentage'])) {
             Assert::assertTrue(
-                $actions->getReduction()->getPercent()->equals(new DecimalNumber($data['reduction_percentage'])),
-                'Unexpected reduction_percentage'
+                $actions->getReduction()->getPercent()->equals(new DecimalNumber($data['discount_percentage'])),
+                'Unexpected discount_percentage'
             );
         }
 
-        if (isset($data['reduction_amount'])) {
+        if (isset($data['discount_amount'])) {
             Assert::assertTrue(
-                $actions->getReduction()->getAmount()->equals(new DecimalNumber($data['reduction_amount'])),
-                'Unexpected reduction_amount'
+                $actions->getReduction()->getAmount()->equals(new DecimalNumber($data['discount_amount'])),
+                'Unexpected discount_amount'
             );
         }
 
-        if (isset($data['reduction_currency'])) {
-            if ($data['reduction_currency'] === '') {
+        if (isset($data['discount_currency'])) {
+            if ($data['discount_currency'] === '') {
                 Assert::assertNull(
                     $actions->getReduction()->getCurrencyId(),
-                    'Unexpected reduction_currency'
+                    'Unexpected discount_currency'
                 );
             } else {
                 Assert::assertSame(
-                    $this->getSharedStorage()->get($data['reduction_currency']),
+                    $this->getSharedStorage()->get($data['discount_currency']),
                     $actions->getReduction()->getCurrencyId(),
-                    'Unexpected reduction_currency'
+                    'Unexpected discount_currency'
                 );
             }
         }
 
-        if (isset($data['reduction_apply_to_discounted_products'])) {
+        if (isset($data['discount_includes_tax'])) {
             Assert::assertSame(
-                PrimitiveUtils::castStringBooleanIntoBoolean($data['reduction_apply_to_discounted_products']),
+                PrimitiveUtils::castStringBooleanIntoBoolean($data['discount_includes_tax']),
+                $actions->getReduction()->isTax(),
+                'Unexpected discount_includes_tax'
+            );
+        }
+
+        if (isset($data['apply_to_discounted_products'])) {
+            Assert::assertSame(
+                PrimitiveUtils::castStringBooleanIntoBoolean($data['apply_to_discounted_products']),
                 $actions->getReduction()->applyToDiscountedProducts(),
-                'Unexpected reduction_apply_to_discounted_products'
+                'Unexpected apply_to_discounted_products'
             );
         }
 
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
index 9e7fd5972162b..84753cf484320 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
@@ -163,8 +163,8 @@ private function fillCommand(EditCartRuleCommand $command, array $data): void
         if (isset($data['allow_partial_use'])) {
             $command->setAllowPartialUse(PrimitiveUtils::castStringBooleanIntoBoolean($data['allow_partial_use']));
         }
-        if (isset($data['enabled'])) {
-            $command->setEnabled(PrimitiveUtils::castStringBooleanIntoBoolean($data['enabled']));
+        if (isset($data['active'])) {
+            $command->setActive(PrimitiveUtils::castStringBooleanIntoBoolean($data['active']));
         }
         if (isset($data['code'])) {
             $command->setCode($data['code']);
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/minimum_amount_cartrule.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/minimum_amount_cartrule.feature
index 329853875cc1d..7324804f12caf 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/minimum_amount_cartrule.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/minimum_amount_cartrule.feature
@@ -21,47 +21,19 @@ Feature: Apply cart rule to cart from Back Office (BO)
     And there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
     And there is a product in the catalog named "product4" with a price of 35.567 and 1000 items in stock
     And I create cart rule "cart_rule_1" with following properties:
-      | name[en-US]                            | CartRule with minimum amount |
-      | description                            | CartRule with minimum amount |
-      | highlight                              | true                         |
-      | is_active                              | true                         |
-      | allow_partial_use                      | false                        |
-      | priority                               | 2                            |
-      | valid_from                             | 2019-01-01 11:05:00          |
-      | valid_to                               | 2029-12-01 00:00:00          |
-      | total_quantity                         | 10                           |
-      | quantity_per_user                      | 1                            |
-      | free_shipping                          | true                         |
-      | minimum_amount                         | 50                           |
-      | minimum_amount_currency                | usd                          |
-      | minimum_amount_tax_included            | false                        |
-      | minimum_amount_shipping_included       | true                         |
-      | code                                   | CART_RULE_MIN_AMOUNT         |
-      | reduction_amount                       | 2                            |
-      | reduction_currency                     | usd                          |
-      | reduction_tax                          | true                         |
-      | discount_application_type              | order_without_shipping       |
-    And cart rule "cart_rule_1" should have the following properties:
-      | name[en-US]                            | CartRule with minimum amount |
-      | description                            | CartRule with minimum amount |
-      | highlight                              | true                         |
-      | is_active                              | true                         |
-      | allow_partial_use                      | false                        |
-      | priority                               | 2                            |
-      | valid_from                             | 2019-01-01 11:05:00          |
-      | valid_to                               | 2029-12-01 00:00:00          |
-      | total_quantity                         | 10                           |
-      | quantity_per_user                      | 1                            |
-      | free_shipping                          | true                         |
-      | minimum_amount                         | 50                           |
-      | minimum_amount_currency                | usd                          |
-      | minimum_amount_tax_included            | false                        |
-      | minimum_amount_shipping_included       | true                         |
-      | code                                   | CART_RULE_MIN_AMOUNT         |
-      | reduction_amount                       | 2                            |
-      | reduction_currency                     | usd                          |
-      | reduction_tax                          | true                         |
-      | discount_application_type              | order_without_shipping       |
+      | name[en-US]                      | CartRule with minimum amount |
+      | description                      | CartRule with minimum amount |
+      | priority                         | 2                            |
+      | free_shipping                    | true                         |
+      | minimum_amount                   | 50                           |
+      | minimum_amount_currency          | usd                          |
+      | minimum_amount_tax_included      | false                        |
+      | minimum_amount_shipping_included | true                         |
+      | code                             | CART_RULE_MIN_AMOUNT         |
+      | discount_amount                  | 2                            |
+      | discount_currency                | usd                          |
+      | discount_includes_tax            | true                         |
+      | discount_application_type        | order_without_shipping       |
     When I add 1 products "product1" to the cart "dummy_custom_cart"
     And I add 1 products "product4" to the cart "dummy_custom_cart"
     Then cart "dummy_custom_cart" should contain 2 products
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono.feature
index 136a8257af64b..d2320107f5c9a 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono.feature
@@ -12,29 +12,29 @@ Feature: Cart rule (amount) calculation with one cart rule
     And there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
     And there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
     And I create cart rule "reduction_5_dollar" with following properties:
-      | name[en-US]                            | reduces $5             |
-      | total_quantity                         | 1000                   |
-      | quantity_per_user                      | 1000                   |
-      | priority                               | 4                      |
-      | free_shipping                          | false                  |
-      | code                                   | reduce-5               |
-      | reduction_amount                       | 5                      |
-      | reduction_currency                     | usd                    |
-      | reduction_tax                          | false                  |
-      | reduction_apply_to_discounted_products | true                   |
-      | discount_application_type              | order_without_shipping |
+      | name[en-US]                  | reduces $5             |
+      | total_quantity               | 1000                   |
+      | quantity_per_user            | 1000                   |
+      | priority                     | 4                      |
+      | free_shipping                | false                  |
+      | code                         | reduce-5               |
+      | discount_amount              | 5                      |
+      | discount_currency            | usd                    |
+      | discount_includes_tax        | false                  |
+      | apply_to_discounted_products | true                   |
+      | discount_application_type    | order_without_shipping |
     And I create cart rule "reduction_500_dollar" with following properties:
-      | name[en-US]                            | reduces $500           |
-      | total_quantity                         | 1000                   |
-      | quantity_per_user                      | 1000                   |
-      | priority                               | 5                      |
-      | free_shipping                          | false                  |
-      | code                                   | reduce-500             |
-      | reduction_amount                       | 500                    |
-      | reduction_currency                     | usd                    |
-      | reduction_tax                          | false                  |
-      | reduction_apply_to_discounted_products | true                   |
-      | discount_application_type              | order_without_shipping |
+      | name[en-US]                  | reduces $500           |
+      | total_quantity               | 1000                   |
+      | quantity_per_user            | 1000                   |
+      | priority                     | 5                      |
+      | free_shipping                | false                  |
+      | code                         | reduce-500             |
+      | discount_amount              | 500                    |
+      | discount_currency            | usd                    |
+      | discount_includes_tax        | false                  |
+      | apply_to_discounted_products | true                   |
+      | discount_application_type    | order_without_shipping |
 
   Scenario: one product in cart, quantity 1, one 5€ global cartRule
     Given I have an empty default cart
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono_virtual.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono_virtual.feature
index 31c1f92ec301d..a72c4c806e6b6 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono_virtual.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono_virtual.feature
@@ -14,29 +14,29 @@ Feature: Cart rule (amount) calculation with one cart rule
     And there is a product in the catalog named "product8" with a price of 12.345 and 1000 items in stock
     And product "product8" is virtual
     And I create cart rule "reduction_5_dollar" with following properties:
-      | name[en-US]                            | reduces $5             |
-      | total_quantity                         | 1000                   |
-      | quantity_per_user                      | 1000                   |
-      | priority                               | 4                      |
-      | free_shipping                          | false                  |
-      | code                                   | reduce-5               |
-      | reduction_amount                       | 5                      |
-      | reduction_currency                     | usd                    |
-      | reduction_tax                          | false                  |
-      | reduction_apply_to_discounted_products | true                   |
-      | discount_application_type              | order_without_shipping |
+      | name[en-US]                  | reduces $5             |
+      | total_quantity               | 1000                   |
+      | quantity_per_user            | 1000                   |
+      | priority                     | 4                      |
+      | free_shipping                | false                  |
+      | code                         | reduce-5               |
+      | discount_amount              | 5                      |
+      | discount_currency            | usd                    |
+      | discount_includes_tax        | false                  |
+      | apply_to_discounted_products | true                   |
+      | discount_application_type    | order_without_shipping |
     And I create cart rule "reduction_500_dollar" with following properties:
-      | name[en-US]                            | reduces $500           |
-      | total_quantity                         | 1000                   |
-      | quantity_per_user                      | 1000                   |
-      | priority                               | 5                      |
-      | free_shipping                          | false                  |
-      | code                                   | reduce-500             |
-      | reduction_amount                       | 500                    |
-      | reduction_currency                     | usd                    |
-      | reduction_tax                          | false                  |
-      | reduction_apply_to_discounted_products | true                   |
-      | discount_application_type              | order_without_shipping |
+      | name[en-US]                  | reduces $500           |
+      | total_quantity               | 1000                   |
+      | quantity_per_user            | 1000                   |
+      | priority                     | 5                      |
+      | free_shipping                | false                  |
+      | code                         | reduce-500             |
+      | discount_amount              | 500                    |
+      | discount_currency            | usd                    |
+      | discount_includes_tax        | false                  |
+      | apply_to_discounted_products | true                   |
+      | discount_application_type    | order_without_shipping |
 
   Scenario: 4 products in cart, one is virtual, several quantities, one 5€ global voucher
     Given I have an empty default cart
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_multiple.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_multiple.feature
index 7a335f565cb48..012aeb9457759 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_multiple.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_multiple.feature
@@ -16,41 +16,41 @@ Feature: Cart rule (amount) calculation with multiple cart rules
     And product "product8" is in category "Awesome"
     And product "product8" is virtual
     And I create cart rule "reduction_5_dollar" with following properties:
-      | name[en-US]                            | reduces $5             |
-      | total_quantity                         | 1000                   |
-      | quantity_per_user                      | 1000                   |
-      | priority                               | 4                      |
-      | free_shipping                          | false                  |
-      | code                                   | reduce-5               |
-      | reduction_amount                       | 5                      |
-      | reduction_currency                     | usd                    |
-      | reduction_tax                          | false                  |
-      | reduction_apply_to_discounted_products | true                   |
-      | discount_application_type              | order_without_shipping |
+      | name[en-US]                  | reduces $5             |
+      | total_quantity               | 1000                   |
+      | quantity_per_user            | 1000                   |
+      | priority                     | 4                      |
+      | free_shipping                | false                  |
+      | code                         | reduce-5               |
+      | discount_amount              | 5                      |
+      | discount_currency            | usd                    |
+      | discount_includes_tax        | false                  |
+      | apply_to_discounted_products | true                   |
+      | discount_application_type    | order_without_shipping |
     And I create cart rule "reduction_500_dollar" with following properties:
-      | name[en-US]                            | reduces $500           |
-      | total_quantity                         | 1000                   |
-      | quantity_per_user                      | 1000                   |
-      | priority                               | 5                      |
-      | free_shipping                          | false                  |
-      | code                                   | reduce-500             |
-      | reduction_amount                       | 500                    |
-      | reduction_currency                     | usd                    |
-      | reduction_tax                          | false                  |
-      | reduction_apply_to_discounted_products | true                   |
-      | discount_application_type              | order_without_shipping |
+      | name[en-US]                  | reduces $500           |
+      | total_quantity               | 1000                   |
+      | quantity_per_user            | 1000                   |
+      | priority                     | 5                      |
+      | free_shipping                | false                  |
+      | code                         | reduce-500             |
+      | discount_amount              | 500                    |
+      | discount_currency            | usd                    |
+      | discount_includes_tax        | false                  |
+      | apply_to_discounted_products | true                   |
+      | discount_application_type    | order_without_shipping |
     And I create cart rule "reduction_10_dollar" with following properties:
-      | name[en-US]                            | reduces $10            |
-      | total_quantity                         | 1000                   |
-      | quantity_per_user                      | 1000                   |
-      | priority                               | 6                      |
-      | free_shipping                          | false                  |
-      | code                                   | reduce-10              |
-      | reduction_amount                       | 10                     |
-      | reduction_currency                     | usd                    |
-      | reduction_tax                          | false                  |
-      | reduction_apply_to_discounted_products | true                   |
-      | discount_application_type              | order_without_shipping |
+      | name[en-US]                  | reduces $10            |
+      | total_quantity               | 1000                   |
+      | quantity_per_user            | 1000                   |
+      | priority                     | 6                      |
+      | free_shipping                | false                  |
+      | code                         | reduce-10              |
+      | discount_amount              | 10                     |
+      | discount_currency            | usd                    |
+      | discount_includes_tax        | false                  |
+      | apply_to_discounted_products | true                   |
+      | discount_application_type    | order_without_shipping |
 
   Scenario: one product in cart, quantity 1, one 5€ global cartRule, one 10€ global cartRule
     Given I have an empty default cart
@@ -105,16 +105,16 @@ Feature: Cart rule (amount) calculation with multiple cart rules
       | priority          | 1                      |
       | free_shipping     | true                   |
     And I create cart rule "reduce-10-restricted" with following properties:
-      | name[en-US]                            | reduce-10-restricted   |
-      | total_quantity                         | 1                      |
-      | quantity_per_user                      | 1                      |
-      | priority                               | 1                      |
-      | free_shipping                          | false                  |
-      | reduction_amount                       | 10                     |
-      | reduction_currency                     | usd                    |
-      | reduction_tax                          | false                  |
-      | reduction_apply_to_discounted_products | true                   |
-      | discount_application_type              | order_without_shipping |
+      | name[en-US]                  | reduce-10-restricted   |
+      | total_quantity               | 1                      |
+      | quantity_per_user            | 1                      |
+      | priority                     | 1                      |
+      | free_shipping                | false                  |
+      | discount_amount              | 10                     |
+      | discount_currency            | usd                    |
+      | discount_includes_tax        | false                  |
+      | apply_to_discounted_products | true                   |
+      | discount_application_type    | order_without_shipping |
     And cart rule "reduce-10-restricted" is restricted to the category "Awesome" with a quantity of 1
     And cart rule "reduce-10-restricted" is restricted to product "product8"
     When I add 1 item of product "product8" in my cart
@@ -128,16 +128,16 @@ Feature: Cart rule (amount) calculation with multiple cart rules
   Scenario: One product in my cart, one 10€ global cartRule, 2 free gifts global cartRules
     Given I have an empty default cart
     And I create cart rule "reduce-10-global" with following properties:
-      | name[en-US]                            | reduce-10-global       |
-      | total_quantity                         | 1                      |
-      | quantity_per_user                      | 1                      |
-      | priority                               | 1                      |
-      | free_shipping                          | false                  |
-      | reduction_amount                       | 10                     |
-      | reduction_currency                     | usd                    |
-      | reduction_tax                          | false                  |
-      | reduction_apply_to_discounted_products | true                   |
-      | discount_application_type              | order_without_shipping |
+      | name[en-US]                  | reduce-10-global       |
+      | total_quantity               | 1                      |
+      | quantity_per_user            | 1                      |
+      | priority                     | 1                      |
+      | free_shipping                | false                  |
+      | discount_amount              | 10                     |
+      | discount_currency            | usd                    |
+      | discount_includes_tax        | false                  |
+      | apply_to_discounted_products | true                   |
+      | discount_application_type    | order_without_shipping |
     And I create cart rule "cartrule-gift-product2" with following properties:
       | name[en-US]       | cartrule-gift-product2 |
       | total_quantity    | 1                      |
@@ -165,16 +165,16 @@ Feature: Cart rule (amount) calculation with multiple cart rules
   Scenario: One product in my cart, one 30€ global cartRule (which is superior to the product bought), 2 free gifts global cartRules
     Given I have an empty default cart
     And I create cart rule "reduce-30-global" with following properties:
-      | name[en-US]                            | reduce-30-global       |
-      | total_quantity                         | 1                      |
-      | quantity_per_user                      | 1                      |
-      | priority                               | 1                      |
-      | free_shipping                          | false                  |
-      | reduction_amount                       | 30                     |
-      | reduction_currency                     | usd                    |
-      | reduction_tax                          | false                  |
-      | reduction_apply_to_discounted_products | true                   |
-      | discount_application_type              | order_without_shipping |
+      | name[en-US]                  | reduce-30-global       |
+      | total_quantity               | 1                      |
+      | quantity_per_user            | 1                      |
+      | priority                     | 1                      |
+      | free_shipping                | false                  |
+      | discount_amount              | 30                     |
+      | discount_currency            | usd                    |
+      | discount_includes_tax        | false                  |
+      | apply_to_discounted_products | true                   |
+      | discount_application_type    | order_without_shipping |
     And I create cart rule "cartrule-gift-product2" with following properties:
       | name[en-US]       | cartrule-gift-product2 |
       | total_quantity    | 1                      |
@@ -203,16 +203,16 @@ Feature: Cart rule (amount) calculation with multiple cart rules
   Scenario: One product in my cart, one 30€ global cartRule (which is superior to the product bought) with free shipping, 2 free gifts global cartRules
     Given I have an empty default cart
     And I create cart rule "reduce-30-free-ship-global" with following properties:
-      | name[en-US]                            | reduce-30-free-ship-global |
-      | total_quantity                         | 1                          |
-      | quantity_per_user                      | 1                          |
-      | priority                               | 1                          |
-      | free_shipping                          | true                       |
-      | reduction_amount                       | 30                         |
-      | reduction_currency                     | usd                        |
-      | reduction_tax                          | false                      |
-      | reduction_apply_to_discounted_products | true                       |
-      | discount_application_type              | order_without_shipping     |
+      | name[en-US]                  | reduce-30-free-ship-global |
+      | total_quantity               | 1                          |
+      | quantity_per_user            | 1                          |
+      | priority                     | 1                          |
+      | free_shipping                | true                       |
+      | discount_amount              | 30                         |
+      | discount_currency            | usd                        |
+      | discount_includes_tax        | false                      |
+      | apply_to_discounted_products | true                       |
+      | discount_application_type    | order_without_shipping     |
     And I create cart rule "cartrule-gift-product2" with following properties:
       | name[en-US]       | cartrule-gift-product2 |
       | total_quantity    | 1                      |
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature
index 80c52445597e4..e69f2bfcdf64e 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature
@@ -10,31 +10,31 @@ Feature: Cart rule application is validated before it is applied to cart
     And country "US" is enabled
     And there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
     And I create cart rule "cart_rule_1" with following properties:
-      | name[en-US]                            | cartrule1              |
-      | total_quantity                         | 1000                   |
-      | quantity_per_user                      | 1000                   |
-      | free_shipping                          | false                  |
-      | code                                   | foo1                   |
-      | reduction_percentage                   | 50                     |
-      | reduction_apply_to_discounted_products | true                   |
-      | discount_application_type              | order_without_shipping |
+      | name[en-US]                  | cartrule1              |
+      | total_quantity               | 1000                   |
+      | quantity_per_user            | 1000                   |
+      | free_shipping                | false                  |
+      | code                         | foo1                   |
+      | discount_percentage          | 50                     |
+      | apply_to_discounted_products | true                   |
+      | discount_application_type    | order_without_shipping |
     And I create cart rule "cart_rule_2" with following properties:
-      | name[en-US]                            | cartrule2              |
-      | total_quantity                         | 10                     |
-      | quantity_per_user                      | 10                     |
-      | free_shipping                          | false                  |
-      | code                                   | foo2                   |
-      | reduction_amount                       | 10                     |
-      | reduction_currency                     | usd                    |
-      | reduction_tax                          | false                  |
-      | reduction_apply_to_discounted_products | true                   |
-      | discount_application_type              | order_without_shipping |
+      | name[en-US]                  | cartrule2              |
+      | total_quantity               | 10                     |
+      | quantity_per_user            | 10                     |
+      | free_shipping                | false                  |
+      | code                         | foo2                   |
+      | discount_amount              | 10                     |
+      | discount_currency            | usd                    |
+      | discount_includes_tax        | false                  |
+      | apply_to_discounted_products | true                   |
+      | discount_application_type    | order_without_shipping |
     And I create cart rule "cart_rule_3" with following properties:
-      | name[en-US]       | cartrule3              |
-      | total_quantity    | 10                     |
-      | quantity_per_user | 10                     |
-      | free_shipping     | true                   |
-      | code              | foo3                   |
+      | name[en-US]       | cartrule3 |
+      | total_quantity    | 10        |
+      | quantity_per_user | 10        |
+      | free_shipping     | true      |
+      | code              | foo3      |
 
   Scenario: Adding a cart rule to an empty cart should not be possible
     Given I have an empty default cart
diff --git a/tests/Integration/Behaviour/Features/Scenario/CartRule/add_cart_rule.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/add_cart_rule.feature
index a27849c18ac02..4eba95414183b 100644
--- a/tests/Integration/Behaviour/Features/Scenario/CartRule/add_cart_rule.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/add_cart_rule.feature
@@ -31,9 +31,9 @@ Feature: Add cart rule
       | minimum_amount_tax_included      | false                  |
       | minimum_amount_shipping_included | true                   |
       | code                             | PROMO_2019             |
-      | reduction_amount                 | 15                     |
-      | reduction_currency               | usd                    |
-      | reduction_tax                    | true                   |
+      | discount_amount                  | 15                     |
+      | discount_currency                | usd                    |
+      | discount_includes_tax            | true                   |
       | discount_application_type        | order_without_shipping |
     And cart rule "cart_rule_1" should have the following properties:
       | name[en-US]                      | Promotion              |
@@ -52,52 +52,52 @@ Feature: Add cart rule
       | minimum_amount_tax_included      | false                  |
       | minimum_amount_shipping_included | true                   |
       | code                             | PROMO_2019             |
-      | reduction_amount                 | 15                     |
-      | reduction_currency               | usd                    |
-      | reduction_tax                    | true                   |
+      | discount_amount                  | 15                     |
+      | discount_currency                | usd                    |
+      | discount_includes_tax            | true                   |
       | discount_application_type        | order_without_shipping |
 
   Scenario: Create a cart rule with percentage discount
     When I create cart rule "cart_rule_1" with following properties:
-      | name[en-US]                            | 50% off promo                           |
-      | description                            | Discount for whole catalog for one hour |
-      | highlight                              | true                                    |
-      | is_active                              | false                                   |
-      | allow_partial_use                      | true                                    |
-      | priority                               | 1                                       |
-      | valid_from                             | 2019-01-01 11:00:00                     |
-      | valid_to                               | 2019-01-01 12:00:00                     |
-      | total_quantity                         | 10                                      |
-      | quantity_per_user                      | 12                                      |
-      | free_shipping                          | true                                    |
-      | minimum_amount                         | 99.99                                   |
-      | minimum_amount_currency                | usd                                     |
-      | minimum_amount_tax_included            | true                                    |
-      | minimum_amount_shipping_included       | false                                   |
-      | code                                   | HAPPY_HOUR                              |
-      | reduction_percentage                   | 50                                      |
-      | reduction_apply_to_discounted_products | false                                   |
-      | discount_application_type              | cheapest_product                        |
+      | name[en-US]                      | 50% off promo                           |
+      | description                      | Discount for whole catalog for one hour |
+      | highlight                        | true                                    |
+      | is_active                        | false                                   |
+      | allow_partial_use                | true                                    |
+      | priority                         | 1                                       |
+      | valid_from                       | 2019-01-01 11:00:00                     |
+      | valid_to                         | 2019-01-01 12:00:00                     |
+      | total_quantity                   | 10                                      |
+      | quantity_per_user                | 12                                      |
+      | free_shipping                    | true                                    |
+      | minimum_amount                   | 99.99                                   |
+      | minimum_amount_currency          | usd                                     |
+      | minimum_amount_tax_included      | true                                    |
+      | minimum_amount_shipping_included | false                                   |
+      | code                             | HAPPY_HOUR                              |
+      | discount_percentage              | 50                                      |
+      | apply_to_discounted_products     | false                                   |
+      | discount_application_type        | cheapest_product                        |
     And cart rule "cart_rule_1" should have the following properties:
-      | name[en-US]                            | 50% off promo                           |
-      | description                            | Discount for whole catalog for one hour |
-      | highlight                              | true                                    |
-      | is_active                              | false                                   |
-      | allow_partial_use                      | true                                    |
-      | priority                               | 1                                       |
-      | valid_from                             | 2019-01-01 11:00:00                     |
-      | valid_to                               | 2019-01-01 12:00:00                     |
-      | total_quantity                         | 10                                      |
-      | quantity_per_user                      | 12                                      |
-      | free_shipping                          | true                                    |
-      | minimum_amount                         | 99.99                                   |
-      | minimum_amount_currency                | usd                                     |
-      | minimum_amount_tax_included            | true                                    |
-      | minimum_amount_shipping_included       | false                                   |
-      | code                                   | HAPPY_HOUR                              |
-      | reduction_percentage                   | 50                                      |
-      | reduction_apply_to_discounted_products | false                                   |
-      | discount_application_type              | cheapest_product                        |
+      | name[en-US]                      | 50% off promo                           |
+      | description                      | Discount for whole catalog for one hour |
+      | highlight                        | true                                    |
+      | is_active                        | false                                   |
+      | allow_partial_use                | true                                    |
+      | priority                         | 1                                       |
+      | valid_from                       | 2019-01-01 11:00:00                     |
+      | valid_to                         | 2019-01-01 12:00:00                     |
+      | total_quantity                   | 10                                      |
+      | quantity_per_user                | 12                                      |
+      | free_shipping                    | true                                    |
+      | minimum_amount                   | 99.99                                   |
+      | minimum_amount_currency          | usd                                     |
+      | minimum_amount_tax_included      | true                                    |
+      | minimum_amount_shipping_included | false                                   |
+      | code                             | HAPPY_HOUR                              |
+      | discount_percentage              | 50                                      |
+      | apply_to_discounted_products     | false                                   |
+      | discount_application_type        | cheapest_product                        |
 
   Scenario: Create and enable cart rule
     When I create cart rule "cart_rule_1" with following properties:
diff --git a/tests/Integration/Behaviour/Features/Scenario/CartRule/edit_cart_rule.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/edit_cart_rule.feature
index 6814a8ba5aaa5..b1126ca2eba47 100644
--- a/tests/Integration/Behaviour/Features/Scenario/CartRule/edit_cart_rule.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/edit_cart_rule.feature
@@ -17,10 +17,10 @@ Feature: Add cart rule
     And attribute "S" named "S" in en language exists
     And attribute "M" named "M" in en language exists
     And attribute "White" named "White" in en language exists
-    Given I create cart rule "cart_rule_1" with following properties:
+    And I create cart rule "cart_rule_1" with following properties:
       | name[en-US]                      | cart rule 1         |
       | highlight                        | true                |
-      | is_active                        | true                |
+      | active                           | true                |
       | allow_partial_use                | true                |
       | priority                         | 1                   |
       | valid_from                       | 2019-01-01 11:05:00 |
@@ -31,27 +31,26 @@ Feature: Add cart rule
       | minimum_amount_tax_included      | false               |
       | minimum_amount_shipping_included | false               |
     And cart rule "cart_rule_1" should have the following properties:
-      | name[en-US]           | cart rule 1         |
-      | highlight             | true                |
-      | is_active             | true                |
-      | allow_partial_use     | true                |
-      | priority              | 1                   |
-      | valid_from            | 2019-01-01 11:05:00 |
-      | valid_to              | 2019-12-01 00:00:00 |
-      | total_quantity        | 11                  |
-      | quantity_per_user     | 3                   |
-      | free_shipping         | true                |
-      | minimum_amount        |                     |
+      | name[en-US]       | cart rule 1         |
+      | highlight         | true                |
+      | active            | true                |
+      | allow_partial_use | true                |
+      | priority          | 1                   |
+      | valid_from        | 2019-01-01 11:05:00 |
+      | valid_to          | 2019-12-01 00:00:00 |
+      | total_quantity    | 11                  |
+      | quantity_per_user | 3                   |
+      | free_shipping     | true                |
+      | minimum_amount    |                     |
       # when currency is not provided the default one is used
-      | reduction_currency    | usd                 |
-      | code                  |                     |
-      | restricted cart rules |                     |
+      | discount_currency | usd                 |
+      | code              |                     |
 
   Scenario: I edit cart rule and change various properties
     When I edit cart rule cart_rule_1 with following properties:
       | name[en-US]                      | cart rule 1 edited  |
       | highlight                        | false               |
-      | is_active                        | false               |
+      | active                           | false               |
       | allow_partial_use                | false               |
       | priority                         | 120                 |
       | valid_from                       | 2019-01-01 11:05:01 |
@@ -67,7 +66,7 @@ Feature: Add cart rule
     Then cart rule "cart_rule_1" should have the following properties:
       | name[en-US]                      | cart rule 1 edited  |
       | highlight                        | false               |
-      | is_active                        | true                |
+      | active                           | false               |
       | allow_partial_use                | false               |
       | priority                         | 120                 |
       | valid_from                       | 2019-01-01 11:05:01 |
@@ -79,8 +78,8 @@ Feature: Add cart rule
       | minimum_amount_currency          | chf                 |
       | minimum_amount_tax_included      | true                |
       | minimum_amount_shipping_included | true                |
-      | reduction_amount                 | 0                   |
-      | reduction_tax                    | false               |
+      | discount_amount                  | 0                   |
+      | discount_includes_tax            | false               |
       | code                             | abcxyz              |
 
   Scenario: I edit cart rule and remove free shipping when it is the only action.
@@ -93,107 +92,107 @@ Feature: Add cart rule
   Scenario: I edit cart rule by adding amount discount action.
     When I edit cart rule cart_rule_1 with following properties:
       | free_shipping             | true                   |
-      | reduction_amount          | 10.5                   |
-      | reduction_tax             | true                   |
-      | reduction_currency        | chf                    |
+      | discount_amount           | 10.5                   |
+      | discount_includes_tax     | true                   |
+      | discount_currency         | chf                    |
       | discount_application_type | order_without_shipping |
     Then cart rule "cart_rule_1" should have the following properties:
       | free_shipping             | true                   |
-      | reduction_amount          | 10.5                   |
-      | reduction_tax             | true                   |
-      | reduction_currency        | chf                    |
+      | discount_amount           | 10.5                   |
+      | discount_includes_tax     | true                   |
+      | discount_currency         | chf                    |
       | discount_application_type | order_without_shipping |
     When I edit cart rule cart_rule_1 with following properties:
       | free_shipping             | false                  |
-      | reduction_amount          | 11                     |
-      | reduction_tax             | false                  |
-      | reduction_currency        | usd                    |
+      | discount_amount           | 11                     |
+      | discount_includes_tax     | false                  |
+      | discount_currency         | usd                    |
       | discount_application_type | order_without_shipping |
     Then cart rule "cart_rule_1" should have the following properties:
       | free_shipping             | false                  |
-      | reduction_amount          | 11                     |
-      | reduction_tax             | false                  |
-      | reduction_currency        | usd                    |
+      | discount_amount           | 11                     |
+      | discount_includes_tax     | false                  |
+      | discount_currency         | usd                    |
       | discount_application_type | order_without_shipping |
     Given I add product "product1" with following information:
       | name[en-US] | Presta camera |
       | type        | standard      |
     When I edit cart rule cart_rule_1 with following properties:
       | free_shipping             | false            |
-      | reduction_amount          | 11               |
-      | reduction_tax             | false            |
-      | reduction_currency        | usd              |
+      | discount_amount           | 11               |
+      | discount_includes_tax     | false            |
+      | discount_currency         | usd              |
       | discount_application_type | specific_product |
       | discount_product          | product1         |
     Then cart rule "cart_rule_1" should have the following properties:
       | free_shipping             | false            |
-      | reduction_amount          | 11               |
-      | reduction_tax             | false            |
-      | reduction_currency        | usd              |
+      | discount_amount           | 11               |
+      | discount_includes_tax     | false            |
+      | discount_currency         | usd              |
       | discount_application_type | specific_product |
       | discount_product          | product1         |
 
   Scenario: I edit cart rule by applying specific product discount, but not providing the specific product itself
     When I edit cart rule cart_rule_1 with following properties:
       | free_shipping             | true             |
-      | reduction_amount          | 10.5             |
-      | reduction_tax             | true             |
-      | reduction_currency        | chf              |
+      | discount_amount           | 10.5             |
+      | discount_includes_tax     | true             |
+      | discount_currency         | chf              |
       | discount_application_type | specific_product |
     Then I should get cart rule error about "required specific product"
 
   Scenario: I edit cart rule by adding percentage discount action.
     When I edit cart rule cart_rule_1 with following properties:
-      | free_shipping                          | true                   |
-      | reduction_percentage                   | 85.5                   |
-      | discount_application_type              | order_without_shipping |
-      | reduction_apply_to_discounted_products | true                   |
+      | free_shipping                | true                   |
+      | discount_percentage          | 85.5                   |
+      | discount_application_type    | order_without_shipping |
+      | apply_to_discounted_products | true                   |
     Then cart rule "cart_rule_1" should have the following properties:
-      | free_shipping                          | true                   |
-      | reduction_percentage                   | 85.5                   |
-      | discount_application_type              | order_without_shipping |
-      | reduction_apply_to_discounted_products | true                   |
+      | free_shipping                | true                   |
+      | discount_percentage          | 85.5                   |
+      | discount_application_type    | order_without_shipping |
+      | apply_to_discounted_products | true                   |
     When I edit cart rule cart_rule_1 with following properties:
-      | free_shipping                          | false            |
-      | reduction_percentage                   | 10               |
-      | discount_application_type              | cheapest_product |
-      | reduction_apply_to_discounted_products | false            |
+      | free_shipping                | false            |
+      | discount_percentage          | 10               |
+      | discount_application_type    | cheapest_product |
+      | apply_to_discounted_products | false            |
     Then cart rule "cart_rule_1" should have the following properties:
-      | free_shipping                          | false            |
-      | reduction_percentage                   | 10               |
-      | discount_application_type              | cheapest_product |
-      | reduction_apply_to_discounted_products | false            |
+      | free_shipping                | false            |
+      | discount_percentage          | 10               |
+      | discount_application_type    | cheapest_product |
+      | apply_to_discounted_products | false            |
     When I edit cart rule cart_rule_1 with following properties:
-      | free_shipping                          | false            |
-      | reduction_percentage                   | 10               |
-      | discount_application_type              | cheapest_product |
-      | reduction_apply_to_discounted_products | false            |
+      | free_shipping                | false            |
+      | discount_percentage          | 10               |
+      | discount_application_type    | cheapest_product |
+      | apply_to_discounted_products | false            |
     Given I add product "product1" with following information:
       | name[en-US] | Presta camera |
       | type        | standard      |
     When I edit cart rule cart_rule_1 with following properties:
-      | free_shipping                          | false            |
-      | reduction_percentage                   | 10               |
-      | discount_application_type              | specific_product |
-      | reduction_apply_to_discounted_products | true             |
-      | discount_product                       | product1         |
+      | free_shipping                | false            |
+      | discount_percentage          | 10               |
+      | discount_application_type    | specific_product |
+      | apply_to_discounted_products | true             |
+      | discount_product             | product1         |
     Then cart rule "cart_rule_1" should have the following properties:
-      | free_shipping                          | false            |
-      | reduction_percentage                   | 10               |
-      | discount_application_type              | specific_product |
-      | reduction_apply_to_discounted_products | true             |
-      | discount_product                       | product1         |
+      | free_shipping                | false            |
+      | discount_percentage          | 10               |
+      | discount_application_type    | specific_product |
+      | apply_to_discounted_products | true             |
+      | discount_product             | product1         |
     When I edit cart rule cart_rule_1 with following properties:
-      | free_shipping                          | false                  |
-      | reduction_percentage                   | 10                     |
-      | discount_application_type              | order_without_shipping |
-      | reduction_apply_to_discounted_products | true                   |
+      | free_shipping                | false                  |
+      | discount_percentage          | 10                     |
+      | discount_application_type    | order_without_shipping |
+      | apply_to_discounted_products | true                   |
     Then cart rule "cart_rule_1" should have the following properties:
-      | free_shipping                          | false                  |
-      | reduction_percentage                   | 10                     |
-      | discount_application_type              | order_without_shipping |
-      | reduction_apply_to_discounted_products | true                   |
-      | discount_product                       |                        |
+      | free_shipping                | false                  |
+      | discount_percentage          | 10                     |
+      | discount_application_type    | order_without_shipping |
+      | apply_to_discounted_products | true                   |
+      | discount_product             |                        |
 
   Scenario: I edit cart rule by adding gift product action.
     Given I add product "product1" with following information:
@@ -227,28 +226,28 @@ Feature: Add cart rule
       | gift_product     | product2       |
       | gift_combination | product2SWhite |
     Then cart rule "cart_rule_1" should have the following properties:
-      | free_shipping                          | true                   |
-      | gift_product                           | product2               |
-      | gift_combination                       | product2SWhite         |
+      | free_shipping                | true                   |
+      | gift_product                 | product2               |
+      | gift_combination             | product2SWhite         |
       # assert default values of reduction fields
-      | reduction_percentage                   | 0                      |
-      | reduction_amount                       | 0                      |
-      | reduction_currency                     | usd                    |
-      | discount_application_type              | order_without_shipping |
-      | reduction_apply_to_discounted_products | true                   |
+      | discount_percentage          | 0                      |
+      | discount_amount              | 0                      |
+      | discount_currency            | usd                    |
+      | discount_application_type    | order_without_shipping |
+      | apply_to_discounted_products | true                   |
     When I edit cart rule cart_rule_1 with following properties:
       | free_shipping | true     |
       | gift_product  | product1 |
     Then cart rule "cart_rule_1" should have the following properties:
-      | free_shipping                          | true                   |
-      | gift_product                           | product1               |
-      | gift_combination                       |                        |
+      | free_shipping                | true                   |
+      | gift_product                 | product1               |
+      | gift_combination             |                        |
       # assert default values of reduction fields
-      | reduction_percentage                   | 0                      |
-      | reduction_amount                       | 0                      |
-      | reduction_currency                     | usd                    |
-      | discount_application_type              | order_without_shipping |
-      | reduction_apply_to_discounted_products | true                   |
+      | discount_percentage          | 0                      |
+      | discount_amount              | 0                      |
+      | discount_currency            | usd                    |
+      | discount_application_type    | order_without_shipping |
+      | apply_to_discounted_products | true                   |
 
   Scenario: I edit cart rule by alternating customer
     Given there is customer "JohnDoe" with email "pub@prestashop.com"
@@ -270,7 +269,6 @@ Feature: Add cart rule
       | active            | true                |
       | allow_partial_use | true                |
       | priority          | 1                   |
-      | is_active         | true                |
       | valid_from        | 2019-01-01 11:05:00 |
       | valid_to          | 2019-12-01 00:00:00 |
       | total_quantity    | 10                  |
@@ -278,14 +276,13 @@ Feature: Add cart rule
       | free_shipping     | true                |
       | code              | testcode1           |
     And cart rule cart_rule_1 should have the following properties:
-      | is_active | testcode1 |
+      | code | testcode1 |
     And I create cart rule "cart_rule_2" with following properties:
       | name[en-US]       | Cart Rule 2         |
       | highlight         | true                |
       | active            | true                |
       | allow_partial_use | true                |
       | priority          | 1                   |
-      | is_active         | true                |
       | valid_from        | 2019-01-01 11:05:00 |
       | valid_to          | 2019-12-01 00:00:00 |
       | total_quantity    | 10                  |
@@ -312,7 +309,6 @@ Feature: Add cart rule
       | active                           | true                |
       | allow_partial_use                | true                |
       | priority                         | 1                   |
-      | is_active                        | true                |
       | valid_from                       | 2019-01-01 11:05:00 |
       | valid_to                         | 2019-12-01 00:00:00 |
       | total_quantity                   | 10                  |
@@ -329,10 +325,9 @@ Feature: Add cart rule
     Given I create cart rule "cart_rule_1" with following properties:
       | name[en-US]                      | Cart Rule 1         |
       | highlight                        | true                |
-      | active                           | true                |
+      | active                           | false               |
       | allow_partial_use                | true                |
       | priority                         | 1                   |
-      | is_active                        | true                |
       | valid_from                       | 2019-01-01 11:05:00 |
       | valid_to                         | 2019-12-01 00:00:00 |
       | total_quantity                   | 10                  |
@@ -345,10 +340,9 @@ Feature: Add cart rule
     And I create cart rule "cart_rule_2" with following properties:
       | name[en-US]                      | Cart Rule 2         |
       | highlight                        | true                |
-      | active                           | true                |
+      | active                           | false               |
       | allow_partial_use                | true                |
       | priority                         | 1                   |
-      | is_active                        | true                |
       | valid_from                       | 2019-01-01 11:05:00 |
       | valid_to                         | 2019-12-01 00:00:00 |
       | total_quantity                   | 10                  |
@@ -359,12 +353,12 @@ Feature: Add cart rule
       | minimum_amount_tax_included      | true                |
       | minimum_amount_shipping_included | true                |
     And cart rule cart_rule_1 should have the following properties:
-      | is_active | true |
+      | active | false |
     And cart rule cart_rule_2 should have the following properties:
-      | is_active | true |
-    And I bulk disable cart rules "cart_rule_1,cart_rule_2"
-    Then Cart rule with reference "cart_rule_1" is disabled
-    And Cart rule with reference "cart_rule_2" is disabled
+      | active | false |
+    And I bulk enable cart rules "cart_rule_1,cart_rule_2"
+    Then Cart rule with reference "cart_rule_1" is enabled
+    And Cart rule with reference "cart_rule_2" is enabled
 
   Scenario: Disable multiple cart rules
     When I create cart rule "cart_rule_1" with following properties:
@@ -373,7 +367,7 @@ Feature: Add cart rule
       | active                           | true                |
       | allow_partial_use                | true                |
       | priority                         | 1                   |
-      | is_active                        | false               |
+      | active                           | false               |
       | valid_from                       | 2019-01-01 11:05:00 |
       | valid_to                         | 2019-12-01 00:00:00 |
       | total_quantity                   | 10                  |
@@ -389,7 +383,6 @@ Feature: Add cart rule
       | active                           | false               |
       | allow_partial_use                | true                |
       | priority                         | 1                   |
-      | is_active                        | true                |
       | valid_from                       | 2019-01-01 11:05:00 |
       | valid_to                         | 2019-12-01 00:00:00 |
       | total_quantity                   | 10                  |
@@ -399,6 +392,6 @@ Feature: Add cart rule
       | minimum_amount_currency          | usd                 |
       | minimum_amount_tax_included      | true                |
       | minimum_amount_shipping_included | true                |
-    When I bulk enable cart rules "cart_rule_1,cart_rule_2"
-    Then Cart rule with reference "cart_rule_1" is enabled
-    And Cart rule with reference "cart_rule_2" is enabled
+    When I bulk disable cart rules "cart_rule_1,cart_rule_2"
+    Then Cart rule with reference "cart_rule_1" is disabled
+    And Cart rule with reference "cart_rule_2" is disabled
diff --git a/tests/Integration/Behaviour/Features/Scenario/Order/order_cart_rules.feature b/tests/Integration/Behaviour/Features/Scenario/Order/order_cart_rules.feature
index 9b7067cbe1763..a72aa177570bd 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Order/order_cart_rules.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Order/order_cart_rules.feature
@@ -801,35 +801,6 @@ Feature: Order from Back Office (BO)
     ## Create a new cart rule
     And I create cart rule "cart_rule_1" with following properties:
       | name[en-US]                            | Cart Rule 50% which excludes discounted products and applies to cheapest product |
-      | description                            | None                                                                             |
-      | highlight                              | true                                                                             |
-      | is_active                              | true                                                                             |
-      | allow_partial_use                      | false                                                                            |
-      | priority                               | 1                                                                                |
-      | valid_from                             | 2019-01-01 11:00:00                                                              |
-      | valid_to                               | 2040-01-01 12:00:00                                                              |
-      | total_quantity                         | 100                                                                              |
-      | quantity_per_user                      | 100                                                                              |
-      | free_shipping                          | false                                                                            |
-      | minimum_amount                         |                                                                                  |
-      | code                                   |                                                                                  |
-      | reduction_percentage                   | 50                                                                               |
-      | reduction_apply_to_discounted_products | false                                                                            |
-      | discount_application_type              | cheapest_product                                                                 |
-    And cart rule "cart_rule_1" should have the following properties:
-      | name[en-US]                            | Cart Rule 50% which excludes discounted products and applies to cheapest product |
-      | description                            | None                                                                             |
-      | highlight                              | true                                                                             |
-      | is_active                              | true                                                                             |
-      | allow_partial_use                      | false                                                                            |
-      | priority                               | 1                                                                                |
-      | valid_from                             | 2019-01-01 11:00:00                                                              |
-      | valid_to                               | 2040-01-01 12:00:00                                                              |
-      | total_quantity                         | 100                                                                              |
-      | quantity_per_user                      | 100                                                                              |
-      | free_shipping                          | false                                                                            |
-      | minimum_amount                         |                                                                                  |
-      | code                                   |                                                                                  |
       | reduction_percentage                   | 50                                                                               |
       | reduction_apply_to_discounted_products | false                                                                            |
       | discount_application_type              | cheapest_product                                                                 |

From e1dd2fd8503c70104fa21e428f22224fb5f2a58a Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Thu, 18 May 2023 12:58:21 +0300
Subject: [PATCH 0233/1030]  allow create or assert existing cart rule.
 Requires restoring only those scenarios that includes cart rules without coes
 (that affects all other scenarios)

---
 .../Context/CartRuleFeatureContext.php        |  24 --
 .../AbstractCartRuleFeatureContext.php        | 285 ++++++++++++++++++
 .../CartRule/AddCartRuleFeatureContext.php    |  72 +----
 .../CartRuleAssertionFeatureContext.php       | 204 +------------
 .../FrontOffice/Amount/amount_mono.feature    |   9 +-
 .../Amount/amount_mono_virtual.feature        |   5 +-
 .../Amount/amount_multiple.feature            |  38 ++-
 .../FrontOffice/cart_rule_validation.feature  |   7 +-
 .../Scenario/CartRule/add_cart_rule.feature   |  22 +-
 .../CartRule/delete_cart_rule.feature         |  14 +-
 .../Scenario/CartRule/edit_cart_rule.feature  | 114 +++----
 11 files changed, 389 insertions(+), 405 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
index 0400bc121430c..bdd0b9feeff7d 100644
--- a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
@@ -40,7 +40,6 @@
 use PHPUnit\Framework\Assert;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleValidityException;
 use RuntimeException;
-use Tests\Resources\DatabaseDump;
 use Validate;
 
 class CartRuleFeatureContext extends AbstractPrestaShopFeatureContext
@@ -627,29 +626,6 @@ public function checkCartRuleUsageLimitIsDetected(string $cartRuleReference)
         }
     }
 
-    /**
-     * @BeforeScenario @restore-cart-rules-before-scenario
-     *
-     * @return void
-     */
-    public static function restoreCartRules(): void
-    {
-        DatabaseDump::restoreTables(['cart_rule', 'cart_rule_shop']);
-        DatabaseDump::restoreTables([
-            'cart_rule',
-            'cart_rule_shop',
-            'cart_rule_lang',
-            'cart_cart_rule',
-            'cart_rule_carrier',
-            'cart_rule_combination',
-            'cart_rule_country',
-            'cart_rule_group',
-            'cart_rule_product_rule',
-            'cart_rule_product_rule_group',
-            'cart_rule_product_rule_value',
-        ]);
-    }
-
     /**
      * Legacy cart rule validation returns errors as strings (CartRule::checkVBalidity()),
      * so to identify lastError in steps we will use this custom map,
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
index e406d7bcbacf0..5428e1610addc 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
@@ -28,13 +28,288 @@
 
 namespace Tests\Integration\Behaviour\Features\Context\Domain\CartRule;
 
+use DateTime;
+use PHPUnit\Framework\Assert;
+use PrestaShop\Decimal\DecimalNumber;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\AddCartRuleCommand;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\Query\GetCartRuleForEditing;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\QueryResult\CartRuleForEditing;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\CartRuleId;
 use PrestaShop\PrestaShop\Core\Domain\ValueObject\Reduction;
 use PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\CartRule\CartRuleActionBuilder;
+use PrestaShop\PrestaShop\Core\Util\DateTime\DateTime as DateTimeUtil;
+use RuntimeException;
 use Tests\Integration\Behaviour\Features\Context\Domain\AbstractDomainFeatureContext;
 use Tests\Integration\Behaviour\Features\Context\Util\PrimitiveUtils;
+use Tests\Resources\DatabaseDump;
 
 abstract class AbstractCartRuleFeatureContext extends AbstractDomainFeatureContext
 {
+    /**
+     * @BeforeScenario @restore-cart-rules-before-scenario
+     * @AfterScenario @restore-cart-rules-after-scenario
+     *
+     * @return void
+     */
+    public static function restoreCartRules(): void
+    {
+        DatabaseDump::restoreTables(['cart_rule', 'cart_rule_shop']);
+        DatabaseDump::restoreTables([
+            'cart_rule',
+            'cart_rule_shop',
+            'cart_rule_lang',
+            'cart_cart_rule',
+            'cart_rule_carrier',
+            'cart_rule_combination',
+            'cart_rule_country',
+            'cart_rule_group',
+            'cart_rule_product_rule',
+            'cart_rule_product_rule_group',
+            'cart_rule_product_rule_value',
+        ]);
+    }
+
+    public function createCartRuleWithReference(string $cartRuleReference, array $data): void
+    {
+        $command = new AddCartRuleCommand(
+            $data['name'],
+            $this->getCartRuleActionBuilder()->build($this->formatDataForActionBuilder($data))
+        );
+
+        if (isset($data['highlight'])) {
+            $command->setHighlightInCart(PrimitiveUtils::castStringBooleanIntoBoolean($data['highlight']));
+        }
+        if (isset($data['allow_partial_use'])) {
+            $command->setAllowPartialUse(PrimitiveUtils::castStringBooleanIntoBoolean($data['allow_partial_use']));
+        }
+        if (isset($data['priority'])) {
+            $command->setPriority((int) $data['priority']);
+        }
+        if (isset($data['active'])) {
+            $command->setActive(PrimitiveUtils::castStringBooleanIntoBoolean($data['active']));
+        }
+        if (isset($data['valid_from'])) {
+            if (empty($data['valid_to'])) {
+                throw new RuntimeException('When setting cart rule range "valid_from" and "valid_to" must be provided');
+            }
+            $command->setValidDateRange(
+                new DateTime($data['valid_from']),
+                new DateTime($data['valid_to']),
+            );
+        }
+        if (isset($data['total_quantity'])) {
+            $command->setTotalQuantity((int) $data['total_quantity']);
+        }
+        if (isset($data['quantity_per_user'])) {
+            $command->setQuantityPerUser((int) $data['quantity_per_user']);
+        }
+        if (!empty($data['minimum_amount'])) {
+            $currencyId = $this->getSharedStorage()->get($data['minimum_amount_currency']);
+            $command->setMinimumAmount(
+                $data['minimum_amount'],
+                $currencyId,
+                PrimitiveUtils::castStringBooleanIntoBoolean($data['minimum_amount_tax_included']),
+                PrimitiveUtils::castStringBooleanIntoBoolean($data['minimum_amount_shipping_included'])
+            );
+        }
+
+        $command->setDescription($data['description'] ?? '');
+        if (!empty($data['code'])) {
+            $command->setCode($data['code']);
+        }
+
+        /** @var CartRuleId $cartRuleId */
+        $cartRuleId = $this->getCommandBus()->handle($command);
+        $this->getSharedStorage()->set($cartRuleReference, $cartRuleId->getValue());
+
+        if (!empty($data['code'])) {
+            // set cart rule id by code when it is not empty
+            $this->getSharedStorage()->set($data['code'], $cartRuleId->getValue());
+        }
+    }
+
+    protected function assertCartRuleProperties(CartRuleForEditing $cartRuleForEditing, array $expectedData): void
+    {
+        $information = $cartRuleForEditing->getInformation();
+        $conditions = $cartRuleForEditing->getConditions();
+        $actions = $cartRuleForEditing->getActions();
+
+        if (isset($expectedData['name'])) {
+            Assert::assertSame($expectedData['name'], $information->getLocalizedNames(), 'Unexpected localized name');
+        }
+        if (isset($expectedData['description'])) {
+            Assert::assertSame($expectedData['description'], $information->getDescription(), 'Unexpected description');
+        }
+        if (isset($expectedData['highlight'])) {
+            Assert::assertSame(
+                PrimitiveUtils::castStringBooleanIntoBoolean($expectedData['highlight']),
+                $information->isHighlight(),
+                'Unexpected highlight'
+            );
+        }
+        if (isset($expectedData['allow_partial_use'])) {
+            Assert::assertSame(
+                PrimitiveUtils::castStringBooleanIntoBoolean($expectedData['allow_partial_use']),
+                $information->isPartialUse(),
+                'Unexpected partial use'
+            );
+        }
+        if (isset($expectedData['active'])) {
+            Assert::assertSame(
+                PrimitiveUtils::castStringBooleanIntoBoolean($expectedData['active']),
+                $information->isEnabled(),
+                'Unexpected active property'
+            );
+        }
+        if (isset($expectedData['code'])) {
+            Assert::assertSame($expectedData['code'], $information->getCode(), 'Unexpected code');
+        }
+        if (isset($expectedData['customer'])) {
+            Assert::assertSame(
+                !empty($expectedData['customer']) ? $this->getSharedStorage()->get($expectedData['customer']) : 0,
+                $conditions->getCustomerId()->getValue(),
+                'Unexpected customer id'
+            );
+        }
+        if (isset($expectedData['priority'])) {
+            Assert::assertSame((int) $expectedData['priority'], $information->getPriority(), 'Unexpected priority');
+        }
+        if (isset($expectedData['valid_from'])) {
+            Assert::assertEquals(
+                $expectedData['valid_from'],
+                $conditions->getDateFrom()->format(DateTimeUtil::DEFAULT_DATETIME_FORMAT),
+                'Unexpected valid_from'
+            );
+        }
+        if (isset($expectedData['valid_to'])) {
+            Assert::assertEquals(
+                $expectedData['valid_to'],
+                $conditions->getDateTo()->format(DateTimeUtil::DEFAULT_DATETIME_FORMAT),
+                'Unexpected valid_to'
+            );
+        }
+        if (isset($expectedData['total quantity'])) {
+            Assert::assertSame((int) $expectedData['total quantity'], $conditions->getQuantity(), 'Unexpected quantity');
+        }
+        if (isset($expectedData['quantity per user'])) {
+            Assert::assertSame((int) $expectedData['quantity per user'], $conditions->getQuantityPerUser(), 'Unexpected quantity per user');
+        }
+
+        if (isset($expectedData['minimum_amount'])) {
+            if (empty($expectedData['minimum_amount'])) {
+                Assert::assertNull($conditions->getMinimum(), 'unexpected minimum_amount');
+            } else {
+                $minimum = $conditions->getMinimum();
+                Assert::assertTrue(
+                    $minimum->getAmount()->equals(new DecimalNumber($expectedData['minimum_amount'])),
+                    'Unexpected minimum_amount'
+                );
+
+                Assert::assertSame(
+                    PrimitiveUtils::castStringBooleanIntoBoolean($expectedData['minimum_amount_tax_included']),
+                    $minimum->isAmountTax(),
+                    'Unexpected minimum_amount_tax_included'
+                );
+
+                Assert::assertSame(
+                    $this->getSharedStorage()->get($expectedData['minimum_amount_currency']),
+                    $minimum->getCurrencyId(),
+                    'Unexpected minimum_amount_currency'
+                );
+
+                Assert::assertSame(
+                    PrimitiveUtils::castStringBooleanIntoBoolean($expectedData['minimum_amount_shipping_included']),
+                    $minimum->isShipping(),
+                    'Unexpected minimum_amount_shipping_included'
+                );
+            }
+        }
+
+        if (isset($expectedData['discount_application_type'])) {
+            $expectedDiscountApplicationType = $expectedData['discount_application_type'];
+            Assert::assertSame(
+                $expectedDiscountApplicationType,
+                $actions->getDiscountApplicationType(),
+                'Unexpected discount_application_type'
+            );
+
+            Assert::assertSame(
+                !empty($expectedData['discount_product']) ? $this->getSharedStorage()->get($expectedData['discount_product']) : null,
+                $actions->getReduction()->getProductId(),
+                'Unexpected discount_product'
+            );
+        }
+
+        if (isset($expectedData['discount_percentage'])) {
+            Assert::assertTrue(
+                $actions->getReduction()->getPercent()->equals(new DecimalNumber($expectedData['discount_percentage'])),
+                'Unexpected discount_percentage'
+            );
+        }
+
+        if (isset($expectedData['discount_amount'])) {
+            Assert::assertTrue(
+                $actions->getReduction()->getAmount()->equals(new DecimalNumber($expectedData['discount_amount'])),
+                'Unexpected discount_amount'
+            );
+        }
+
+        if (isset($expectedData['discount_currency'])) {
+            if ($expectedData['discount_currency'] === '') {
+                Assert::assertNull(
+                    $actions->getReduction()->getCurrencyId(),
+                    'Unexpected discount_currency'
+                );
+            } else {
+                Assert::assertSame(
+                    $this->getSharedStorage()->get($expectedData['discount_currency']),
+                    $actions->getReduction()->getCurrencyId(),
+                    'Unexpected discount_currency'
+                );
+            }
+        }
+
+        if (isset($expectedData['discount_includes_tax'])) {
+            Assert::assertSame(
+                PrimitiveUtils::castStringBooleanIntoBoolean($expectedData['discount_includes_tax']),
+                $actions->getReduction()->isTax(),
+                'Unexpected discount_includes_tax'
+            );
+        }
+
+        if (isset($expectedData['apply_to_discounted_products'])) {
+            Assert::assertSame(
+                PrimitiveUtils::castStringBooleanIntoBoolean($expectedData['apply_to_discounted_products']),
+                $actions->getReduction()->applyToDiscountedProducts(),
+                'Unexpected apply_to_discounted_products'
+            );
+        }
+
+        if (isset($expectedData['free_shipping'])) {
+            Assert::assertSame(
+                PrimitiveUtils::castStringBooleanIntoBoolean($expectedData['free_shipping']),
+                $actions->isFreeShipping(),
+                'Unexpected free_shipping'
+            );
+        }
+
+        if (isset($expectedData['gift_product'])) {
+            Assert::assertSame(
+                $this->getSharedStorage()->get($expectedData['gift_product']),
+                $actions->getGiftProductId(),
+                'Unexpected gift_product'
+            );
+        }
+
+        if (isset($expectedData['gift_combination'])) {
+            Assert::assertSame(
+                !empty($expectedData['gift_combination']) ? $this->getSharedStorage()->get($expectedData['gift_combination']) : null,
+                $actions->getGiftCombinationId(),
+                'Unexpected gift_combination'
+            );
+        }
+    }
+
     protected function getCartRuleActionBuilder(): CartRuleActionBuilder
     {
         return new CartRuleActionBuilder();
@@ -87,4 +362,14 @@ protected function formatDataForActionBuilder(array $data): array
 
         return $formattedData;
     }
+
+    protected function getCartRuleForEditing(int $cartRuleId): CartRuleForEditing
+    {
+        /** @var CartRuleForEditing $cartRuleForEditing */
+        $cartRuleForEditing = $this->getQueryBus()->handle(
+            new GetCartRuleForEditing($cartRuleId)
+        );
+
+        return $cartRuleForEditing;
+    }
 }
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AddCartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AddCartRuleFeatureContext.php
index 4d564acf232eb..92dfc5c30fee1 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AddCartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AddCartRuleFeatureContext.php
@@ -27,80 +27,38 @@
 namespace Tests\Integration\Behaviour\Features\Context\Domain\CartRule;
 
 use Behat\Gherkin\Node\TableNode;
-use DateTime;
-use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\AddCartRuleCommand;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleConstraintException;
-use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\CartRuleId;
-use RuntimeException;
-use Tests\Integration\Behaviour\Features\Context\Util\PrimitiveUtils;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleNotFoundException;
 
 class AddCartRuleFeatureContext extends AbstractCartRuleFeatureContext
 {
     /**
      * @When I create cart rule :cartRuleReference with following properties:
+     * @When there is a cart rule :cartRuleReference with following properties:
      *
      * @param string $cartRuleReference
      * @param TableNode $node
      */
-    public function createCartRuleWithReference(string $cartRuleReference, TableNode $node): void
+    public function createCartRuleIfNotExists(string $cartRuleReference, TableNode $node): void
     {
         $data = $this->localizeByRows($node);
-        try {
-            $command = new AddCartRuleCommand(
-                $data['name'],
-                $this->getCartRuleActionBuilder()->build($this->formatDataForActionBuilder($data))
-            );
 
-            if (isset($data['highlight'])) {
-                $command->setHighlightInCart(PrimitiveUtils::castStringBooleanIntoBoolean($data['highlight']));
-            }
-            if (isset($data['allow_partial_use'])) {
-                $command->setAllowPartialUse(PrimitiveUtils::castStringBooleanIntoBoolean($data['allow_partial_use']));
-            }
-            if (isset($data['priority'])) {
-                $command->setPriority((int) $data['priority']);
-            }
-            if (isset($data['active'])) {
-                $command->setActive(PrimitiveUtils::castStringBooleanIntoBoolean($data['active']));
-            }
-            if (isset($data['valid_from'])) {
-                if (empty($data['valid_to'])) {
-                    throw new RuntimeException('When setting cart rule range "valid_from" and "valid_to" must be provided');
-                }
-                $command->setValidDateRange(
-                    new DateTime($data['valid_from']),
-                    new DateTime($data['valid_to']),
-                );
-            }
-            if (isset($data['total_quantity'])) {
-                $command->setTotalQuantity((int) $data['total_quantity']);
-            }
-            if (isset($data['quantity_per_user'])) {
-                $command->setQuantityPerUser((int) $data['quantity_per_user']);
-            }
-            if (!empty($data['minimum_amount'])) {
-                $currencyId = $this->getSharedStorage()->get($data['minimum_amount_currency']);
-                $command->setMinimumAmount(
-                    $data['minimum_amount'],
-                    $currencyId,
-                    PrimitiveUtils::castStringBooleanIntoBoolean($data['minimum_amount_tax_included']),
-                    PrimitiveUtils::castStringBooleanIntoBoolean($data['minimum_amount_shipping_included'])
+        if ($this->getSharedStorage()->exists($cartRuleReference)) {
+            try {
+                // if cart rule already exists we assert all its expected properties
+                $this->assertCartRuleProperties(
+                    $this->getCartRuleForEditing($this->getSharedStorage()->get($cartRuleReference)),
+                    $data
                 );
-            }
 
-            $command->setDescription($data['description'] ?? '');
-            if (!empty($data['code'])) {
-                $command->setCode($data['code']);
+                return;
+            } catch (CartRuleNotFoundException $e) {
+                // if cart rule was not found we proceed to create it under this reference.
             }
+        }
 
-            /** @var CartRuleId $cartRuleId */
-            $cartRuleId = $this->getCommandBus()->handle($command);
-            $this->getSharedStorage()->set($cartRuleReference, $cartRuleId->getValue());
-
-            if (!empty($data['code'])) {
-                // set cart rule id by code when it is not empty
-                $this->getSharedStorage()->set($data['code'], $cartRuleId->getValue());
-            }
+        try {
+            $this->createCartRuleWithReference($cartRuleReference, $data);
         } catch (CartRuleConstraintException $e) {
             $this->setLastException($e);
         }
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
index d7403484d4652..35ad7d8d6d7b9 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
@@ -30,20 +30,17 @@
 
 use Behat\Gherkin\Node\TableNode;
 use PHPUnit\Framework\Assert;
-use PrestaShop\Decimal\DecimalNumber;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleConstraintException;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Query\GetCartRuleForEditing;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\QueryResult\CartRuleForEditing;
-use PrestaShop\PrestaShop\Core\Util\DateTime\DateTime;
 use RuntimeException;
 use Tests\Integration\Behaviour\Features\Context\Util\NoExceptionAlthoughExpectedException;
-use Tests\Integration\Behaviour\Features\Context\Util\PrimitiveUtils;
 
 class CartRuleAssertionFeatureContext extends AbstractCartRuleFeatureContext
 {
     /**
-     * @Then Cart rule with reference :cartRuleReference is enabled
+     * @Then cart rule with reference :cartRuleReference is enabled
      *
      * @param string $cartRuleReference
      *
@@ -62,7 +59,7 @@ public function assertCartRuleEnabled(string $cartRuleReference): void
     }
 
     /**
-     * @Then Cart rule with reference :cartRuleReference is disabled
+     * @Then cart rule with reference :cartRuleReference is disabled
      *
      * @param string $cartRuleReference
      *
@@ -145,200 +142,11 @@ public function assertCartRuleError(string $error): void
      * @param string $cartRuleReference
      * @param TableNode $tableNode
      */
-    public function assertCartRuleProperties(string $cartRuleReference, TableNode $tableNode): void
+    public function assertCartRule(string $cartRuleReference, TableNode $tableNode): void
     {
-        /** @var CartRuleForEditing $editableCartRule */
-        $editableCartRule = $this->getQueryBus()->handle(
-            new GetCartRuleForEditing($this->getSharedStorage()->get($cartRuleReference))
+        $this->assertCartRuleProperties(
+            $this->getCartRuleForEditing($this->getSharedStorage()->get($cartRuleReference)),
+            $this->localizeByColumns($tableNode)
         );
-
-        $data = $this->localizeByRows($tableNode);
-        $information = $editableCartRule->getInformation();
-        $conditions = $editableCartRule->getConditions();
-        $actions = $editableCartRule->getActions();
-
-        if (isset($data['name'])) {
-            Assert::assertSame($data['name'], $information->getLocalizedNames(), 'Unexpected localized name');
-        }
-        if (isset($data['description'])) {
-            Assert::assertSame($data['description'], $information->getDescription(), 'Unexpected description');
-        }
-        if (isset($data['highlight'])) {
-            Assert::assertSame(
-                PrimitiveUtils::castStringBooleanIntoBoolean($data['highlight']),
-                $information->isHighlight(),
-                'Unexpected highlight'
-            );
-        }
-        if (isset($data['allow_partial_use'])) {
-            Assert::assertSame(
-                PrimitiveUtils::castStringBooleanIntoBoolean($data['allow_partial_use']),
-                $information->isPartialUse(),
-                'Unexpected partial use'
-            );
-        }
-        if (isset($data['active'])) {
-            Assert::assertSame(
-                PrimitiveUtils::castStringBooleanIntoBoolean($data['active']),
-                $information->isEnabled(),
-                'Unexpected active property'
-            );
-        }
-        if (isset($data['code'])) {
-            Assert::assertSame($data['code'], $information->getCode(), 'Unexpected code');
-        }
-        if (isset($data['customer'])) {
-            Assert::assertSame(
-                !empty($data['customer']) ? $this->getSharedStorage()->get($data['customer']) : 0,
-                $conditions->getCustomerId()->getValue(),
-                'Unexpected customer id'
-            );
-        }
-        if (isset($data['priority'])) {
-            Assert::assertSame((int) $data['priority'], $information->getPriority(), 'Unexpected priority');
-        }
-        if (isset($data['valid_from'])) {
-            Assert::assertEquals(
-                $data['valid_from'],
-                $conditions->getDateFrom()->format(DateTime::DEFAULT_DATETIME_FORMAT),
-                'Unexpected valid_from'
-            );
-        }
-        if (isset($data['valid_to'])) {
-            Assert::assertEquals(
-                $data['valid_to'],
-                $conditions->getDateTo()->format(DateTime::DEFAULT_DATETIME_FORMAT),
-                'Unexpected valid_to'
-            );
-        }
-        if (isset($data['total quantity'])) {
-            Assert::assertSame((int) $data['total quantity'], $conditions->getQuantity(), 'Unexpected quantity');
-        }
-        if (isset($data['quantity per user'])) {
-            Assert::assertSame((int) $data['quantity per user'], $conditions->getQuantityPerUser(), 'Unexpected quantity per user');
-        }
-
-        if (isset($data['minimum_amount'])) {
-            if (empty($data['minimum_amount'])) {
-                Assert::assertNull($conditions->getMinimum(), 'unexpected minimum_amount');
-            } else {
-                $minimum = $conditions->getMinimum();
-                Assert::assertTrue(
-                    $minimum->getAmount()->equals(new DecimalNumber($data['minimum_amount'])),
-                    'Unexpected minimum_amount'
-                );
-
-                Assert::assertSame(
-                    PrimitiveUtils::castStringBooleanIntoBoolean($data['minimum_amount_tax_included']),
-                    $minimum->isAmountTax(),
-                    'Unexpected minimum_amount_tax_included'
-                );
-
-                Assert::assertSame(
-                    $this->getSharedStorage()->get($data['minimum_amount_currency']),
-                    $minimum->getCurrencyId(),
-                    'Unexpected minimum_amount_currency'
-                );
-
-                Assert::assertSame(
-                    PrimitiveUtils::castStringBooleanIntoBoolean($data['minimum_amount_shipping_included']),
-                    $minimum->isShipping(),
-                    'Unexpected minimum_amount_shipping_included'
-                );
-            }
-        }
-
-        if (isset($data['discount_application_type'])) {
-            $expectedDiscountApplicationType = $data['discount_application_type'];
-            Assert::assertSame(
-                $expectedDiscountApplicationType,
-                $actions->getDiscountApplicationType(),
-                'Unexpected discount_application_type'
-            );
-
-            Assert::assertSame(
-                !empty($data['discount_product']) ? $this->getSharedStorage()->get($data['discount_product']) : null,
-                $actions->getReduction()->getProductId(),
-                'Unexpected discount_product'
-            );
-        }
-
-        if (isset($data['discount_percentage'])) {
-            Assert::assertTrue(
-                $actions->getReduction()->getPercent()->equals(new DecimalNumber($data['discount_percentage'])),
-                'Unexpected discount_percentage'
-            );
-        }
-
-        if (isset($data['discount_amount'])) {
-            Assert::assertTrue(
-                $actions->getReduction()->getAmount()->equals(new DecimalNumber($data['discount_amount'])),
-                'Unexpected discount_amount'
-            );
-        }
-
-        if (isset($data['discount_currency'])) {
-            if ($data['discount_currency'] === '') {
-                Assert::assertNull(
-                    $actions->getReduction()->getCurrencyId(),
-                    'Unexpected discount_currency'
-                );
-            } else {
-                Assert::assertSame(
-                    $this->getSharedStorage()->get($data['discount_currency']),
-                    $actions->getReduction()->getCurrencyId(),
-                    'Unexpected discount_currency'
-                );
-            }
-        }
-
-        if (isset($data['discount_includes_tax'])) {
-            Assert::assertSame(
-                PrimitiveUtils::castStringBooleanIntoBoolean($data['discount_includes_tax']),
-                $actions->getReduction()->isTax(),
-                'Unexpected discount_includes_tax'
-            );
-        }
-
-        if (isset($data['apply_to_discounted_products'])) {
-            Assert::assertSame(
-                PrimitiveUtils::castStringBooleanIntoBoolean($data['apply_to_discounted_products']),
-                $actions->getReduction()->applyToDiscountedProducts(),
-                'Unexpected apply_to_discounted_products'
-            );
-        }
-
-        if (isset($data['free_shipping'])) {
-            Assert::assertSame(
-                PrimitiveUtils::castStringBooleanIntoBoolean($data['free_shipping']),
-                $actions->isFreeShipping(),
-                'Unexpected free_shipping'
-            );
-        }
-
-        if (isset($data['gift_product'])) {
-            Assert::assertSame(
-                $this->getSharedStorage()->get($data['gift_product']),
-                $actions->getGiftProductId(),
-                'Unexpected gift_product'
-            );
-        }
-
-        if (isset($data['gift_combination'])) {
-            Assert::assertSame(
-                !empty($data['gift_combination']) ? $this->getSharedStorage()->get($data['gift_combination']) : null,
-                $actions->getGiftCombinationId(),
-                'Unexpected gift_combination'
-            );
-        }
-
-        if (isset($data['restricted cart rules'])) {
-            $expectedRestrictedCartRuleIds = $this->referencesToIds($data['restricted cart rules']);
-            Assert::assertSame(
-                $expectedRestrictedCartRuleIds,
-                $editableCartRule->getConditions()->getRestrictions()->restrictedCartRuleIds,
-                'Unexpected cart rule restrictions'
-            );
-        }
     }
 }
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono.feature
index d2320107f5c9a..51afc0e40d735 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono.feature
@@ -11,7 +11,7 @@ Feature: Cart rule (amount) calculation with one cart rule
     And there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
     And there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
     And there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
-    And I create cart rule "reduction_5_dollar" with following properties:
+    And there is a cart rule "reduction_5_dollar" with following properties:
       | name[en-US]                  | reduces $5             |
       | total_quantity               | 1000                   |
       | quantity_per_user            | 1000                   |
@@ -23,7 +23,7 @@ Feature: Cart rule (amount) calculation with one cart rule
       | discount_includes_tax        | false                  |
       | apply_to_discounted_products | true                   |
       | discount_application_type    | order_without_shipping |
-    And I create cart rule "reduction_500_dollar" with following properties:
+    And there is a cart rule "reduction_500_dollar" with following properties:
       | name[en-US]                  | reduces $500           |
       | total_quantity               | 1000                   |
       | quantity_per_user            | 1000                   |
@@ -46,7 +46,6 @@ Feature: Cart rule (amount) calculation with one cart rule
     Then my cart total should be 21.812 tax included
     Then my cart total using previous calculation method should be 21.812 tax included
 
-  @restore-cart-rules-before-scenario
   Scenario: one product in cart, quantity 1, one 500€ global cartRule
     Given I have an empty default cart
     And I add 1 items of product "product1" in my cart
@@ -55,7 +54,6 @@ Feature: Cart rule (amount) calculation with one cart rule
     Then my cart total should be 7.0 tax included
     And my cart total using previous calculation method should be 7.0 tax included
 
-  @restore-cart-rules-before-scenario
   Scenario: one product in cart, quantity 3, one 5€ global cartRule
     Given I have an empty default cart
     And I add 3 items of product "product1" in my cart
@@ -63,7 +61,6 @@ Feature: Cart rule (amount) calculation with one cart rule
     Then my cart total should be 61.436 tax included
     And my cart total using previous calculation method should be 61.436 tax included
 
-  @restore-cart-rules-before-scenario
   Scenario: 3 products in cart, several quantities, one 5€ global cartRule (reduced product at first place)
     Given I have an empty default cart
     And I add 2 items of product "product2" in my cart
@@ -76,7 +73,6 @@ Feature: Cart rule (amount) calculation with one cart rule
     Then my cart total should be 157.4 tax included
     And my cart total using previous calculation method should be 157.4 tax included
 
-  @restore-cart-rules-before-scenario
   Scenario: 3 products in cart, several quantities, one 5€ global cartRule (reduced product at second place)
     Given I have an empty default cart
     And I add 3 items of product "product1" in my cart
@@ -89,7 +85,6 @@ Feature: Cart rule (amount) calculation with one cart rule
     Then my cart total should be 157.4 tax included
     And my cart total using previous calculation method should be 157.4 tax included
 
-  @restore-cart-rules-before-scenario
   Scenario: 3 products in cart, several quantities, one 500€ global cartRule
     Given I have an empty default cart
     And I add 3 items of product "product1" in my cart
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono_virtual.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono_virtual.feature
index a72c4c806e6b6..e9fcd9d120305 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono_virtual.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono_virtual.feature
@@ -13,7 +13,7 @@ Feature: Cart rule (amount) calculation with one cart rule
     And there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
     And there is a product in the catalog named "product8" with a price of 12.345 and 1000 items in stock
     And product "product8" is virtual
-    And I create cart rule "reduction_5_dollar" with following properties:
+    And there is a cart rule "reduction_5_dollar" with following properties:
       | name[en-US]                  | reduces $5             |
       | total_quantity               | 1000                   |
       | quantity_per_user            | 1000                   |
@@ -25,7 +25,7 @@ Feature: Cart rule (amount) calculation with one cart rule
       | discount_includes_tax        | false                  |
       | apply_to_discounted_products | true                   |
       | discount_application_type    | order_without_shipping |
-    And I create cart rule "reduction_500_dollar" with following properties:
+    And there is a cart rule "reduction_500_dollar" with following properties:
       | name[en-US]                  | reduces $500           |
       | total_quantity               | 1000                   |
       | quantity_per_user            | 1000                   |
@@ -51,7 +51,6 @@ Feature: Cart rule (amount) calculation with one cart rule
     Then my cart total should be 182.09 tax included
     And my cart total using previous calculation method should be 182.09 tax included
 
-  @restore-cart-rules-before-scenario
   Scenario: Only virtual product in my cart, one 5€ global voucher
     Given I have an empty default cart
     And I add 2 items of product "product8" in my cart
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_multiple.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_multiple.feature
index 012aeb9457759..8483908f4a088 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_multiple.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_multiple.feature
@@ -15,7 +15,7 @@ Feature: Cart rule (amount) calculation with multiple cart rules
     And there is a category named "Awesome"
     And product "product8" is in category "Awesome"
     And product "product8" is virtual
-    And I create cart rule "reduction_5_dollar" with following properties:
+    And there is a cart rule "reduction_5_dollar" with following properties:
       | name[en-US]                  | reduces $5             |
       | total_quantity               | 1000                   |
       | quantity_per_user            | 1000                   |
@@ -27,7 +27,7 @@ Feature: Cart rule (amount) calculation with multiple cart rules
       | discount_includes_tax        | false                  |
       | apply_to_discounted_products | true                   |
       | discount_application_type    | order_without_shipping |
-    And I create cart rule "reduction_500_dollar" with following properties:
+    And there is a cart rule "reduction_500_dollar" with following properties:
       | name[en-US]                  | reduces $500           |
       | total_quantity               | 1000                   |
       | quantity_per_user            | 1000                   |
@@ -39,7 +39,7 @@ Feature: Cart rule (amount) calculation with multiple cart rules
       | discount_includes_tax        | false                  |
       | apply_to_discounted_products | true                   |
       | discount_application_type    | order_without_shipping |
-    And I create cart rule "reduction_10_dollar" with following properties:
+    And there is a cart rule "reduction_10_dollar" with following properties:
       | name[en-US]                  | reduces $10            |
       | total_quantity               | 1000                   |
       | quantity_per_user            | 1000                   |
@@ -65,7 +65,6 @@ Feature: Cart rule (amount) calculation with multiple cart rules
     Then my cart total should be 11.812 tax included
     And my cart total using previous calculation method should be 11.812 tax included
 
-  @restore-cart-rules-before-scenario
   Scenario: one product in cart, quantity 3, one 5€ global cartRule, one 10€ global cartRule
     Given I have an empty default cart
     And I add 3 items of product "product1" in my cart
@@ -79,7 +78,6 @@ Feature: Cart rule (amount) calculation with multiple cart rules
     Then my cart total should be 51.436 tax included
     And my cart total using previous calculation method should be 51.436 tax included
 
-  @restore-cart-rules-before-scenario
   Scenario: 3 products in cart, several quantities, one 5€ global cartRule (reduced product at first place)
     Given I have an empty default cart
     And I add 2 items of product "product2" in my cart
@@ -95,16 +93,16 @@ Feature: Cart rule (amount) calculation with multiple cart rules
     Then my cart total should be 147.4 tax included
     And my cart total using previous calculation method should be 147.4 tax included
 
-  @restore-cart-rules-before-scenario
+  @restore-cart-rules-after-scenario
   Scenario: One product in my cart, one cart rule for free shipping and one for free gift
     Given I have an empty default cart
-    And I create cart rule "cartrule-free-shipping" with following properties:
+    And there is a cart rule "cartrule-free-shipping" with following properties:
       | name[en-US]       | cartrule-free-shipping |
       | total_quantity    | 1                      |
       | quantity_per_user | 1                      |
       | priority          | 1                      |
       | free_shipping     | true                   |
-    And I create cart rule "reduce-10-restricted" with following properties:
+    And there is a cart rule "reduce-10-restricted" with following properties:
       | name[en-US]                  | reduce-10-restricted   |
       | total_quantity               | 1                      |
       | quantity_per_user            | 1                      |
@@ -124,10 +122,10 @@ Feature: Cart rule (amount) calculation with multiple cart rules
     And my cart total should be 2.4 tax included
     And my cart total using previous calculation method should be 2.4 tax included
 
-  @restore-cart-rules-before-scenario
+  @restore-cart-rules-after-scenario
   Scenario: One product in my cart, one 10€ global cartRule, 2 free gifts global cartRules
     Given I have an empty default cart
-    And I create cart rule "reduce-10-global" with following properties:
+    And there is a cart rule "reduce-10-global" with following properties:
       | name[en-US]                  | reduce-10-global       |
       | total_quantity               | 1                      |
       | quantity_per_user            | 1                      |
@@ -138,14 +136,14 @@ Feature: Cart rule (amount) calculation with multiple cart rules
       | discount_includes_tax        | false                  |
       | apply_to_discounted_products | true                   |
       | discount_application_type    | order_without_shipping |
-    And I create cart rule "cartrule-gift-product2" with following properties:
+    And there is a cart rule "cartrule-gift-product2" with following properties:
       | name[en-US]       | cartrule-gift-product2 |
       | total_quantity    | 1                      |
       | quantity_per_user | 1                      |
       | priority          | 1                      |
       | free_shipping     | false                  |
       | gift_product      | product2               |
-    And I create cart rule "cartrule-gift-product3" with following properties:
+    And there is a cart rule "cartrule-gift-product3" with following properties:
       | name[en-US]       | cartrule-gift-product3 |
       | total_quantity    | 1                      |
       | quantity_per_user | 1                      |
@@ -161,10 +159,10 @@ Feature: Cart rule (amount) calculation with multiple cart rules
     And my cart total should be 16.8 tax included
     And my cart total using previous calculation method should be 16.8 tax included
 
-  @restore-cart-rules-before-scenario
+  @restore-cart-rules-after-scenario
   Scenario: One product in my cart, one 30€ global cartRule (which is superior to the product bought), 2 free gifts global cartRules
     Given I have an empty default cart
-    And I create cart rule "reduce-30-global" with following properties:
+    And there is a cart rule "reduce-30-global" with following properties:
       | name[en-US]                  | reduce-30-global       |
       | total_quantity               | 1                      |
       | quantity_per_user            | 1                      |
@@ -175,14 +173,14 @@ Feature: Cart rule (amount) calculation with multiple cart rules
       | discount_includes_tax        | false                  |
       | apply_to_discounted_products | true                   |
       | discount_application_type    | order_without_shipping |
-    And I create cart rule "cartrule-gift-product2" with following properties:
+    And there is a cart rule "cartrule-gift-product2" with following properties:
       | name[en-US]       | cartrule-gift-product2 |
       | total_quantity    | 1                      |
       | quantity_per_user | 1                      |
       | priority          | 1                      |
       | free_shipping     | false                  |
       | gift_product      | product2               |
-    And I create cart rule "cartrule-gift-product3" with following properties:
+    And there is a cart rule "cartrule-gift-product3" with following properties:
       | name[en-US]       | cartrule-gift-product3 |
       | total_quantity    | 1                      |
       | quantity_per_user | 1                      |
@@ -199,10 +197,10 @@ Feature: Cart rule (amount) calculation with multiple cart rules
     And my cart total should be 7.0 tax included
     And my cart total using previous calculation method should be 7.0 tax included
 
-  @restore-cart-rules-before-scenario
+  @restore-cart-rules-after-scenario
   Scenario: One product in my cart, one 30€ global cartRule (which is superior to the product bought) with free shipping, 2 free gifts global cartRules
     Given I have an empty default cart
-    And I create cart rule "reduce-30-free-ship-global" with following properties:
+    And there is a cart rule "reduce-30-free-ship-global" with following properties:
       | name[en-US]                  | reduce-30-free-ship-global |
       | total_quantity               | 1                          |
       | quantity_per_user            | 1                          |
@@ -213,14 +211,14 @@ Feature: Cart rule (amount) calculation with multiple cart rules
       | discount_includes_tax        | false                      |
       | apply_to_discounted_products | true                       |
       | discount_application_type    | order_without_shipping     |
-    And I create cart rule "cartrule-gift-product2" with following properties:
+    And there is a cart rule "cartrule-gift-product2" with following properties:
       | name[en-US]       | cartrule-gift-product2 |
       | total_quantity    | 1                      |
       | quantity_per_user | 1                      |
       | priority          | 1                      |
       | free_shipping     | false                  |
       | gift_product      | product2               |
-    And I create cart rule "cartrule-gift-product3" with following properties:
+    And there is a cart rule "cartrule-gift-product3" with following properties:
       | name[en-US]       | cartrule-gift-product3 |
       | total_quantity    | 1                      |
       | quantity_per_user | 1                      |
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature
index e69f2bfcdf64e..67880268e69f4 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature
@@ -9,7 +9,7 @@ Feature: Cart rule application is validated before it is applied to cart
     Given there is customer "testCustomer" with email "pub@prestashop.com"
     And country "US" is enabled
     And there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
-    And I create cart rule "cart_rule_1" with following properties:
+    And there is a cart rule "cart_rule_1" with following properties:
       | name[en-US]                  | cartrule1              |
       | total_quantity               | 1000                   |
       | quantity_per_user            | 1000                   |
@@ -18,7 +18,7 @@ Feature: Cart rule application is validated before it is applied to cart
       | discount_percentage          | 50                     |
       | apply_to_discounted_products | true                   |
       | discount_application_type    | order_without_shipping |
-    And I create cart rule "cart_rule_2" with following properties:
+    And there is a cart rule "cart_rule_2" with following properties:
       | name[en-US]                  | cartrule2              |
       | total_quantity               | 10                     |
       | quantity_per_user            | 10                     |
@@ -29,7 +29,7 @@ Feature: Cart rule application is validated before it is applied to cart
       | discount_includes_tax        | false                  |
       | apply_to_discounted_products | true                   |
       | discount_application_type    | order_without_shipping |
-    And I create cart rule "cart_rule_3" with following properties:
+    And there is a cart rule "cart_rule_3" with following properties:
       | name[en-US]       | cartrule3 |
       | total_quantity    | 10        |
       | quantity_per_user | 10        |
@@ -67,7 +67,6 @@ Feature: Cart rule application is validated before it is applied to cart
     And total cart shipping fees should be 0.0 tax excluded
     And my cart total should be 0.0 tax excluded
 
-  @restore-cart-rules-before-scenario
   Scenario: Cart rule cannot be applied again when it is already in the cart
     Given I have an empty default cart
     And shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
diff --git a/tests/Integration/Behaviour/Features/Scenario/CartRule/add_cart_rule.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/add_cart_rule.feature
index 4eba95414183b..d22d474e07f60 100644
--- a/tests/Integration/Behaviour/Features/Scenario/CartRule/add_cart_rule.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/add_cart_rule.feature
@@ -58,7 +58,7 @@ Feature: Add cart rule
       | discount_application_type        | order_without_shipping |
 
   Scenario: Create a cart rule with percentage discount
-    When I create cart rule "cart_rule_1" with following properties:
+    When I create cart rule "cart_rule_2" with following properties:
       | name[en-US]                      | 50% off promo                           |
       | description                      | Discount for whole catalog for one hour |
       | highlight                        | true                                    |
@@ -78,7 +78,7 @@ Feature: Add cart rule
       | discount_percentage              | 50                                      |
       | apply_to_discounted_products     | false                                   |
       | discount_application_type        | cheapest_product                        |
-    And cart rule "cart_rule_1" should have the following properties:
+    And cart rule "cart_rule_2" should have the following properties:
       | name[en-US]                      | 50% off promo                           |
       | description                      | Discount for whole catalog for one hour |
       | highlight                        | true                                    |
@@ -100,8 +100,8 @@ Feature: Add cart rule
       | discount_application_type        | cheapest_product                        |
 
   Scenario: Create and enable cart rule
-    When I create cart rule "cart_rule_1" with following properties:
-      | name[en-US]                      | Cart Rule 1         |
+    When I create cart rule "cart_rule_3" with following properties:
+      | name[en-US]                      | Cart Rule 3         |
       | highlight                        | true                |
       | active                           | false               |
       | allow_partial_use                | true                |
@@ -116,12 +116,12 @@ Feature: Add cart rule
       | minimum_amount_currency          | usd                 |
       | minimum_amount_tax_included      | true                |
       | minimum_amount_shipping_included | true                |
-    When I enable cart rule with reference "cart_rule_1"
-    Then Cart rule with reference "cart_rule_1" is enabled
+    When I enable cart rule with reference "cart_rule_3"
+    Then cart rule with reference "cart_rule_3" is enabled
 
   Scenario: I should not be able to create cart rule with already existing code
-    Given I create cart rule "cart_rule_1" with following properties:
-      | name[en-US]       | Cart Rule 1         |
+    Given I create cart rule "cart_rule_4" with following properties:
+      | name[en-US]       | Cart Rule 4         |
       | highlight         | true                |
       | active            | true                |
       | allow_partial_use | true                |
@@ -133,10 +133,10 @@ Feature: Add cart rule
       | quantity_per_user | 2                   |
       | free_shipping     | true                |
       | code              | testcode1           |
-    And cart rule cart_rule_1 should have the following properties:
+    And cart rule cart_rule_4 should have the following properties:
       | is_active | testcode1 |
-    When I create cart rule "cart_rule_2" with following properties:
-      | name[en-US]       | Cart Rule 2         |
+    When I create cart rule "cart_rule_5" with following properties:
+      | name[en-US]       | Cart Rule 5         |
       | highlight         | true                |
       | active            | true                |
       | allow_partial_use | true                |
diff --git a/tests/Integration/Behaviour/Features/Scenario/CartRule/delete_cart_rule.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/delete_cart_rule.feature
index 1e5793d497554..bf646f6353bcc 100644
--- a/tests/Integration/Behaviour/Features/Scenario/CartRule/delete_cart_rule.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/delete_cart_rule.feature
@@ -33,8 +33,8 @@ Feature: Add cart rule
     Then Cart rule with reference "cart_rule_1" does not exist
 
   Scenario: Delete multiple cart rules
-    When I create cart rule "cart_rule_1" with following properties:
-      | name[en-US]                      | Cart Rule 1         |
+    When I create cart rule "cart_rule_2" with following properties:
+      | name[en-US]                      | Cart Rule 2         |
       | highlight                        | true                |
       | active                           | true                |
       | allow_partial_use                | true                |
@@ -49,8 +49,8 @@ Feature: Add cart rule
       | minimum_amount_currency          | usd                 |
       | minimum_amount_tax_included      | true                |
       | minimum_amount_shipping_included | true                |
-    And I create cart rule "cart_rule_2" with following properties:
-      | name[en-US]                      | Cart Rule 2         |
+    And I create cart rule "cart_rule_3" with following properties:
+      | name[en-US]                      | Cart Rule 3         |
       | highlight                        | true                |
       | active                           | true                |
       | allow_partial_use                | true                |
@@ -65,6 +65,6 @@ Feature: Add cart rule
       | minimum_amount_currency          | usd                 |
       | minimum_amount_tax_included      | true                |
       | minimum_amount_shipping_included | true                |
-    And I bulk delete cart rules "cart_rule_1,cart_rule_2"
-    Then Cart rule with reference "cart_rule_1" does not exist
-    And Cart rule with reference "cart_rule_2" does not exist
+    And I bulk delete cart rules "cart_rule_2,cart_rule_3"
+    Then Cart rule with reference "cart_rule_2" does not exist
+    And Cart rule with reference "cart_rule_3" does not exist
diff --git a/tests/Integration/Behaviour/Features/Scenario/CartRule/edit_cart_rule.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/edit_cart_rule.feature
index b1126ca2eba47..e3c9eb9fdb9f8 100644
--- a/tests/Integration/Behaviour/Features/Scenario/CartRule/edit_cart_rule.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/edit_cart_rule.feature
@@ -46,6 +46,7 @@ Feature: Add cart rule
       | discount_currency | usd                 |
       | code              |                     |
 
+  @restore-cart-rules-after-scenario
   Scenario: I edit cart rule and change various properties
     When I edit cart rule cart_rule_1 with following properties:
       | name[en-US]                      | cart rule 1 edited  |
@@ -89,6 +90,7 @@ Feature: Add cart rule
     And cart rule "cart_rule_1" should have the following properties:
       | free_shipping | true |
 
+  @restore-cart-rules-after-scenario
   Scenario: I edit cart rule by adding amount discount action.
     When I edit cart rule cart_rule_1 with following properties:
       | free_shipping             | true                   |
@@ -141,6 +143,7 @@ Feature: Add cart rule
       | discount_application_type | specific_product |
     Then I should get cart rule error about "required specific product"
 
+  @restore-cart-rules-after-scenario
   Scenario: I edit cart rule by adding percentage discount action.
     When I edit cart rule cart_rule_1 with following properties:
       | free_shipping                | true                   |
@@ -194,6 +197,7 @@ Feature: Add cart rule
       | apply_to_discounted_products | true                   |
       | discount_product             |                        |
 
+  @restore-cart-rules-after-scenario
   Scenario: I edit cart rule by adding gift product action.
     Given I add product "product1" with following information:
       | name[en-US] | Presta camera |
@@ -249,6 +253,7 @@ Feature: Add cart rule
       | discount_application_type    | order_without_shipping |
       | apply_to_discounted_products | true                   |
 
+  @restore-cart-rules-after-scenario
   Scenario: I edit cart rule by alternating customer
     Given there is customer "JohnDoe" with email "pub@prestashop.com"
     And cart rule "cart_rule_1" should have the following properties:
@@ -263,8 +268,8 @@ Feature: Add cart rule
       | customer |  |
 
   Scenario: I should not be able to edit cart rule with already existing code
-    Given I create cart rule "cart_rule_1" with following properties:
-      | name[en-US]       | Cart Rule 1         |
+    Given I create cart rule "cart_rule_2" with following properties:
+      | name[en-US]       | Cart Rule 2         |
       | highlight         | true                |
       | active            | true                |
       | allow_partial_use | true                |
@@ -275,10 +280,10 @@ Feature: Add cart rule
       | quantity_per_user | 2                   |
       | free_shipping     | true                |
       | code              | testcode1           |
-    And cart rule cart_rule_1 should have the following properties:
+    And cart rule cart_rule_2 should have the following properties:
       | code | testcode1 |
-    And I create cart rule "cart_rule_2" with following properties:
-      | name[en-US]       | Cart Rule 2         |
+    And I create cart rule "cart_rule_3" with following properties:
+      | name[en-US]       | Cart Rule 3         |
       | highlight         | true                |
       | active            | true                |
       | allow_partial_use | true                |
@@ -289,41 +294,29 @@ Feature: Add cart rule
       | quantity_per_user | 2                   |
       | free_shipping     | true                |
       | code              | testcode2           |
-    And cart rule cart_rule_2 should have the following properties:
-      | code | testcode2 |
     When I edit cart rule cart_rule_2 with following properties:
       | code | testcode1 |
+    When I edit cart rule cart_rule_3 with following properties:
+      | code | testcode1 |
     Then I should get cart rule error about "non unique cart rule code"
-    And cart rule cart_rule_2 should have the following properties:
+    And cart rule cart_rule_3 should have the following properties:
       | code | testcode2 |
     # make sure we do not raise error when cart rule is submitted with the same code as it was before
-    When I edit cart rule cart_rule_2 with following properties:
+    When I edit cart rule cart_rule_3 with following properties:
       | code | testcode2 |
-    Then cart rule cart_rule_2 should have the following properties:
+    Then cart rule cart_rule_3 should have the following properties:
       | code | testcode2 |
 
-  Scenario: Disable cart rule
-    When I create cart rule "cart_rule_1" with following properties:
-      | name[en-US]                      | Cart Rule 1         |
-      | highlight                        | true                |
-      | active                           | true                |
-      | allow_partial_use                | true                |
-      | priority                         | 1                   |
-      | valid_from                       | 2019-01-01 11:05:00 |
-      | valid_to                         | 2019-12-01 00:00:00 |
-      | total_quantity                   | 10                  |
-      | quantity_per_user                | 2                   |
-      | free_shipping                    | true                |
-      | minimum_amount                   | 10                  |
-      | minimum_amount_currency          | usd                 |
-      | minimum_amount_tax_included      | true                |
-      | minimum_amount_shipping_included | true                |
-    And I disable cart rule with reference "cart_rule_1"
-    Then Cart rule with reference "cart_rule_1" is disabled
+  Scenario: Update cart rule status
+    Given cart rule with reference "cart_rule_1" is enabled
+    When I disable cart rule with reference "cart_rule_1"
+    Then cart rule with reference "cart_rule_1" is disabled
+    When I enable cart rule with reference "cart_rule_1"
+    Then cart rule with reference "cart_rule_1" is enabled
 
-  Scenario: Enable multiple cart rules
-    Given I create cart rule "cart_rule_1" with following properties:
-      | name[en-US]                      | Cart Rule 1         |
+  Scenario: Update multiple cart rules status
+    Given I create cart rule "cart_rule_4" with following properties:
+      | name[en-US]                      | Cart Rule 4         |
       | highlight                        | true                |
       | active                           | false               |
       | allow_partial_use                | true                |
@@ -337,8 +330,8 @@ Feature: Add cart rule
       | minimum_amount_currency          | usd                 |
       | minimum_amount_tax_included      | true                |
       | minimum_amount_shipping_included | true                |
-    And I create cart rule "cart_rule_2" with following properties:
-      | name[en-US]                      | Cart Rule 2         |
+    And I create cart rule "cart_rule_5" with following properties:
+      | name[en-US]                      | Cart Rule 5         |
       | highlight                        | true                |
       | active                           | false               |
       | allow_partial_use                | true                |
@@ -352,46 +345,19 @@ Feature: Add cart rule
       | minimum_amount_currency          | usd                 |
       | minimum_amount_tax_included      | true                |
       | minimum_amount_shipping_included | true                |
-    And cart rule cart_rule_1 should have the following properties:
+    And cart rule cart_rule_4 should have the following properties:
       | active | false |
-    And cart rule cart_rule_2 should have the following properties:
+    And cart rule cart_rule_5 should have the following properties:
       | active | false |
-    And I bulk enable cart rules "cart_rule_1,cart_rule_2"
-    Then Cart rule with reference "cart_rule_1" is enabled
-    And Cart rule with reference "cart_rule_2" is enabled
-
-  Scenario: Disable multiple cart rules
-    When I create cart rule "cart_rule_1" with following properties:
-      | name[en-US]                      | Cart Rule 1         |
-      | highlight                        | true                |
-      | active                           | true                |
-      | allow_partial_use                | true                |
-      | priority                         | 1                   |
-      | active                           | false               |
-      | valid_from                       | 2019-01-01 11:05:00 |
-      | valid_to                         | 2019-12-01 00:00:00 |
-      | total_quantity                   | 10                  |
-      | quantity_per_user                | 2                   |
-      | free_shipping                    | true                |
-      | minimum_amount                   | 10                  |
-      | minimum_amount_currency          | usd                 |
-      | minimum_amount_tax_included      | true                |
-      | minimum_amount_shipping_included | true                |
-    And I create cart rule "cart_rule_2" with following properties:
-      | name[en-US]                      | Cart Rule 2         |
-      | highlight                        | true                |
-      | active                           | false               |
-      | allow_partial_use                | true                |
-      | priority                         | 1                   |
-      | valid_from                       | 2019-01-01 11:05:00 |
-      | valid_to                         | 2019-12-01 00:00:00 |
-      | total_quantity                   | 10                  |
-      | quantity_per_user                | 2                   |
-      | free_shipping                    | true                |
-      | minimum_amount                   | 10                  |
-      | minimum_amount_currency          | usd                 |
-      | minimum_amount_tax_included      | true                |
-      | minimum_amount_shipping_included | true                |
-    When I bulk disable cart rules "cart_rule_1,cart_rule_2"
-    Then Cart rule with reference "cart_rule_1" is disabled
-    And Cart rule with reference "cart_rule_2" is disabled
+    And I bulk enable cart rules "cart_rule_4,cart_rule_5"
+    Then cart rule with reference "cart_rule_4" is enabled
+    And cart rule with reference "cart_rule_5" is enabled
+    When I bulk disable cart rules "cart_rule_4,cart_rule_5"
+    Then cart rule with reference "cart_rule_4" is disabled
+    And cart rule with reference "cart_rule_5" is disabled
+    When I bulk enable cart rules "cart_rule_4"
+    Then cart rule with reference "cart_rule_4" is enabled
+    But cart rule with reference "cart_rule_5" is disabled
+    When I bulk disable cart rules "cart_rule_4,cart_rule_5"
+    Then cart rule with reference "cart_rule_4" is disabled
+    And cart rule with reference "cart_rule_5" is disabled

From 3639820d90b65f7aa7a6f53fac839979a1850afa Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Thu, 18 May 2023 16:48:31 +0300
Subject: [PATCH 0234/1030]  homogenize cart shipping total and voucher
 application steps

---
 .../Features/Context/CartFeatureContext.php   |  2 +-
 .../Context/CartRuleFeatureContext.php        |  2 +-
 .../FrontOffice/Amount/amount_mono.feature    | 22 ++---
 .../Amount/amount_mono_virtual.feature        |  8 +-
 .../Amount/amount_multiple.feature            | 22 ++---
 .../Amount/amount_specific.feature            | 97 ++++++++-----------
 .../FrontOffice/Percent/percent_mono.feature  |  4 +-
 .../Percent/percent_multiple.feature          |  6 +-
 .../FrontOffice/cart_rule_validation.feature  | 68 +++++++++----
 .../Cart/CartRule/FrontOffice/mixed.feature   | 12 +--
 10 files changed, 131 insertions(+), 112 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Context/CartFeatureContext.php b/tests/Integration/Behaviour/Features/Context/CartFeatureContext.php
index 802e4315ece15..14d05fdcfab2f 100644
--- a/tests/Integration/Behaviour/Features/Context/CartFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/CartFeatureContext.php
@@ -204,7 +204,7 @@ public function calculateCartShippingFees($expectedShippingFees, $taxes = null)
     }
 
     /**
-     * @Then /^total cart shipping fees should be (\d+\.\d+) tax (excluded|included)?$/
+     * @Then /^my cart total shipping fees should be (\d+\.\d+) tax (excluded|included)?$/
      */
     public function assertTotalCartShipping(string $expectedShipping, bool $taxIncluded): void
     {
diff --git a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
index bdd0b9feeff7d..128c6e80375a5 100644
--- a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
@@ -428,7 +428,7 @@ public function iAddCartRuleNamedToMyCart(string $cartRuleName): void
     }
 
     /**
-     * @When /^I apply the discount code "(.+)"$/
+     * @When /^I apply the voucher code "(.+)"$/
      *
      * @param string $code
      *
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono.feature
index 51afc0e40d735..d63d011f84bb4 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono.feature
@@ -39,25 +39,25 @@ Feature: Cart rule (amount) calculation with one cart rule
   Scenario: one product in cart, quantity 1, one 5€ global cartRule
     Given I have an empty default cart
     And I add 1 items of product "product1" in my cart
-    And total cart shipping fees should be 7.0 tax included
+    And my cart total shipping fees should be 7.0 tax included
     Then my cart total should be 26.812 tax included
     Then my cart total using previous calculation method should be 26.812 tax included
-    When I apply the discount code "reduce-5"
+    When I apply the voucher code "reduce-5"
     Then my cart total should be 21.812 tax included
     Then my cart total using previous calculation method should be 21.812 tax included
 
   Scenario: one product in cart, quantity 1, one 500€ global cartRule
     Given I have an empty default cart
     And I add 1 items of product "product1" in my cart
-    And total cart shipping fees should be 7.0 tax included
-    When I apply the discount code "reduce-500"
+    And my cart total shipping fees should be 7.0 tax included
+    When I apply the voucher code "reduce-500"
     Then my cart total should be 7.0 tax included
     And my cart total using previous calculation method should be 7.0 tax included
 
   Scenario: one product in cart, quantity 3, one 5€ global cartRule
     Given I have an empty default cart
     And I add 3 items of product "product1" in my cart
-    When I apply the discount code "reduce-5"
+    When I apply the voucher code "reduce-5"
     Then my cart total should be 61.436 tax included
     And my cart total using previous calculation method should be 61.436 tax included
 
@@ -66,10 +66,10 @@ Feature: Cart rule (amount) calculation with one cart rule
     And I add 2 items of product "product2" in my cart
     And I add 3 items of product "product1" in my cart
     And I add 1 items of product "product3" in my cart
-    And total cart shipping fees should be 7.0 tax included
+    And my cart total shipping fees should be 7.0 tax included
     And my cart total should be 162.4 tax included
     And my cart total using previous calculation method should be 162.4 tax included
-    When I apply the discount code "reduce-5"
+    When I apply the voucher code "reduce-5"
     Then my cart total should be 157.4 tax included
     And my cart total using previous calculation method should be 157.4 tax included
 
@@ -78,10 +78,10 @@ Feature: Cart rule (amount) calculation with one cart rule
     And I add 3 items of product "product1" in my cart
     And I add 2 items of product "product2" in my cart
     And I add 1 items of product "product3" in my cart
-    And total cart shipping fees should be 7.0 tax included
+    And my cart total shipping fees should be 7.0 tax included
     And my cart total should be 162.4 tax included
     And my cart total using previous calculation method should be 162.4 tax included
-    When I apply the discount code "reduce-5"
+    When I apply the voucher code "reduce-5"
     Then my cart total should be 157.4 tax included
     And my cart total using previous calculation method should be 157.4 tax included
 
@@ -90,9 +90,9 @@ Feature: Cart rule (amount) calculation with one cart rule
     And I add 3 items of product "product1" in my cart
     And I add 2 items of product "product2" in my cart
     And I add 1 items of product "product3" in my cart
-    And total cart shipping fees should be 7.0 tax included
+    And my cart total shipping fees should be 7.0 tax included
     And my cart total should be 162.4 tax included
     And my cart total using previous calculation method should be 162.4 tax included
-    When I apply the discount code "reduce-500"
+    When I apply the voucher code "reduce-500"
     Then my cart total using previous calculation method should be 7.0 tax included
     And my cart total should be 7.0 tax included
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono_virtual.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono_virtual.feature
index e9fcd9d120305..7e99b1f6ac114 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono_virtual.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono_virtual.feature
@@ -44,19 +44,19 @@ Feature: Cart rule (amount) calculation with one cart rule
     And I add 2 items of product "product2" in my cart
     And I add 1 items of product "product3" in my cart
     And I add 2 items of product "product8" in my cart
-    And total cart shipping fees should be 7.0 tax included
+    And my cart total shipping fees should be 7.0 tax included
     And my cart total should be 187.09 tax included
     And my cart total using previous calculation method should be 187.09 tax included
-    When I apply the discount code "reduce-5"
+    When I apply the voucher code "reduce-5"
     Then my cart total should be 182.09 tax included
     And my cart total using previous calculation method should be 182.09 tax included
 
   Scenario: Only virtual product in my cart, one 5€ global voucher
     Given I have an empty default cart
     And I add 2 items of product "product8" in my cart
-    And total cart shipping fees should be 0.0 tax included
+    And my cart total shipping fees should be 0.0 tax included
     And my cart total should be 24.69 tax included
     And my cart total using previous calculation method should be 24.69 tax included
-    When I apply the discount code "reduce-5"
+    When I apply the voucher code "reduce-5"
     Then my cart total should be 19.69 tax included
     And my cart total using previous calculation method should be 19.69 tax included
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_multiple.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_multiple.feature
index 8483908f4a088..d8c6a7cb023d9 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_multiple.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_multiple.feature
@@ -55,26 +55,26 @@ Feature: Cart rule (amount) calculation with multiple cart rules
   Scenario: one product in cart, quantity 1, one 5€ global cartRule, one 10€ global cartRule
     Given I have an empty default cart
     And I add 1 items of product "product1" in my cart
-    And total cart shipping fees should be 7.0 tax included
+    And my cart total shipping fees should be 7.0 tax included
     And my cart total should be 26.812 tax included
     And my cart total using previous calculation method should be 26.812 tax included
-    When I apply the discount code "reduce-5"
+    When I apply the voucher code "reduce-5"
     Then my cart total should be 21.812 tax included
     And my cart total using previous calculation method should be 21.812 tax included
-    And I apply the discount code "reduce-10"
+    And I apply the voucher code "reduce-10"
     Then my cart total should be 11.812 tax included
     And my cart total using previous calculation method should be 11.812 tax included
 
   Scenario: one product in cart, quantity 3, one 5€ global cartRule, one 10€ global cartRule
     Given I have an empty default cart
     And I add 3 items of product "product1" in my cart
-    And total cart shipping fees should be 7.0 tax included
+    And my cart total shipping fees should be 7.0 tax included
     And my cart total should be 66.436 tax included
     And my cart total using previous calculation method should be 66.436 tax included
-    When I apply the discount code "reduce-5"
+    When I apply the voucher code "reduce-5"
     Then my cart total should be 61.436 tax included
     And my cart total using previous calculation method should be 61.436 tax included
-    When I apply the discount code "reduce-10"
+    When I apply the voucher code "reduce-10"
     Then my cart total should be 51.436 tax included
     And my cart total using previous calculation method should be 51.436 tax included
 
@@ -83,13 +83,13 @@ Feature: Cart rule (amount) calculation with multiple cart rules
     And I add 2 items of product "product2" in my cart
     And I add 3 items of product "product1" in my cart
     And I add 1 items of product "product3" in my cart
-    And total cart shipping fees should be 7.0 tax included
+    And my cart total shipping fees should be 7.0 tax included
     And my cart total should be 162.4 tax included
     And my cart total using previous calculation method should be 162.4 tax included
-    When I apply the discount code "reduce-5"
+    When I apply the voucher code "reduce-5"
     Then my cart total should be 157.4 tax included
     And my cart total using previous calculation method should be 157.4 tax included
-    When I apply the discount code "reduce-10"
+    When I apply the voucher code "reduce-10"
     Then my cart total should be 147.4 tax included
     And my cart total using previous calculation method should be 147.4 tax included
 
@@ -117,7 +117,7 @@ Feature: Cart rule (amount) calculation with multiple cart rules
     And cart rule "reduce-10-restricted" is restricted to product "product8"
     When I add 1 item of product "product8" in my cart
     And cart rule "reduce-10-restricted" is applied to my cart
-    Then total cart shipping fees should be 0.0 tax included
+    Then my cart total shipping fees should be 0.0 tax included
     And my cart total should be precisely 2.35 tax included
     And my cart total should be 2.4 tax included
     And my cart total using previous calculation method should be 2.4 tax included
@@ -192,7 +192,7 @@ Feature: Cart rule (amount) calculation with multiple cart rules
     And cart rule "cartrule-gift-product2" is applied to my cart
     And cart rule "cartrule-gift-product3" is applied to my cart
     And cart rule "reduce-30-global" is applied to my cart
-    And total cart shipping fees should be 7.0 tax included
+    And my cart total shipping fees should be 7.0 tax included
     And my cart total should be precisely 7.0 tax included
     And my cart total should be 7.0 tax included
     And my cart total using previous calculation method should be 7.0 tax included
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_specific.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_specific.feature
index a67400e22a751..69efd997ed8ab 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_specific.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_specific.feature
@@ -1,75 +1,62 @@
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags fo-cart-rule-amount-specific
 @restore-all-tables-before-feature
+@fo-cart-rule-amount-specific
 Feature: Cart rule (amount) calculation with one cart rule restricted to one product
   As a customer
   I must be able to have correct cart total when adding cart rules
 
-  Scenario: Empty cart, one cartRule
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a cart rule named "cartrule8" that applies an amount discount of 5.0 with priority 8, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule8" is restricted to product "product2"
-    Given cart rule "cartrule8" has a discount code "foo8"
-    Then I should have 0 different products in my cart
-    When I use the discount "cartrule8"
-    Then my cart total should be 0.0 tax included
-    Then my cart total using previous calculation method should be 0.0 tax included
-
-  Scenario: one product in cart, quantity 1, one specific 5€ cartRule on product2
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a cart rule named "cartrule8" that applies an amount discount of 5.0 with priority 8, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule8" is restricted to product "product2"
-    Given cart rule "cartrule8" has a discount code "foo8"
-    When I add 1 items of product "product1" in my cart
-    When I use the discount "cartrule8"
-    Then my cart total should be 26.812 tax included
-    Then my cart total using previous calculation method should be 26.812 tax included
-
-  Scenario: one product in cart, quantity 3, one specific 5€ cartRule on product #2
-    Given I have an empty default cart
+  Background:
     Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a cart rule named "cartrule8" that applies an amount discount of 5.0 with priority 8, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule8" is restricted to product "product2"
-    Given cart rule "cartrule8" has a discount code "foo8"
-    When I add 3 items of product "product1" in my cart
-    When I use the discount "cartrule8"
-    Then my cart total should be 66.436 tax included
-    Then my cart total using previous calculation method should be 66.436 tax included
+    And there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
+    And there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+    And there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
+    And there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
+    And there is a cart rule "cartrule8" with following properties:
+      | name[en-US]                  | reduces $5 for product2 |
+      | total_quantity               | 1000                    |
+      | quantity_per_user            | 1000                    |
+      | priority                     | 8                       |
+      | free_shipping                | false                   |
+      | code                         | foo8                    |
+      | discount_amount              | 5                       |
+      | discount_currency            | usd                     |
+      | discount_includes_tax        | false                   |
+      | apply_to_discounted_products | true                    |
+      | discount_application_type    | order_without_shipping  |
+    And cart rule "cartrule8" is restricted to product "product2"
 
   Scenario: 3 products in cart, several quantities, one specific 5€ cartRule on product #2
     Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
-    Given there is a cart rule named "cartrule8" that applies an amount discount of 5.0 with priority 8, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule8" is restricted to product "product2"
-    Given cart rule "cartrule8" has a discount code "foo8"
     When I add 2 items of product "product2" in my cart
     When I add 3 items of product "product1" in my cart
     When I add 1 items of product "product3" in my cart
-    When I use the discount "cartrule8"
+    And my cart total shipping fees should be 7.0 tax excluded
+    And my cart total should be 162.4 tax excluded
+    When I apply the voucher code "foo8"
     Then my cart total should be 157.4 tax included
-    Then my cart total using previous calculation method should be 157.4 tax included
+    And my cart total using previous calculation method should be 157.4 tax included
 
   Scenario: 3 products in cart, several quantities, one specific 500€ cartRule on product #2
     Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
-    Given there is a cart rule named "cartrule9" that applies an amount discount of 500.0 with priority 8, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule9" is restricted to product "product2"
-    Given cart rule "cartrule9" has a discount code "foo9"
+    And there is a cart rule "cartrule9" with following properties:
+      | name[en-US]                  | reduces $500 for product2 |
+      | total_quantity               | 1000                      |
+      | quantity_per_user            | 1000                      |
+      | priority                     | 8                         |
+      | free_shipping                | false                     |
+      | code                         | foo9                      |
+      | discount_amount              | 500                       |
+      | discount_currency            | usd                       |
+      | discount_includes_tax        | false                     |
+      | apply_to_discounted_products | true                      |
+      | discount_application_type    | order_without_shipping    |
+    And cart rule "cartrule9" is restricted to product "product2"
     When I add 3 items of product "product1" in my cart
     When I add 2 items of product "product2" in my cart
     When I add 1 items of product "product3" in my cart
-    When I use the discount "cartrule9"
+    And my cart total shipping fees should be 7.0 tax excluded
+    And my cart total should be 162.364 tax included
+    When I apply the voucher code "foo9"
+    # discount is $500, but it only applies for product 2 so in the end it provides a discount equal to value of product2 (so 32.388 * 2qty)
     Then my cart total should be 97.624 tax included
-    #known to fail on previous
-    #Then my cart total using previous calculation method should be 97.624 tax included
+    And my cart total using previous calculation method should be 97.624 tax included
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_mono.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_mono.feature
index b61dca61a456f..71f394f0c00ae 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_mono.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_mono.feature
@@ -60,9 +60,9 @@ Feature: Cart rule (percent) calculation with one cart rule
     Given cart rule "cartrule1" has a discount code "foo1"
     When I add 1 items of product "product1" in my cart
     Then I should have 1 different products in my cart
-    And total cart shipping fees should be 7.0 tax excluded
+    And my cart total shipping fees should be 7.0 tax excluded
     And my cart total should be 26.8 tax excluded
-    When I apply the discount code "foo1"
+    When I apply the voucher code "foo1"
     Then my cart total should be 16.9 tax excluded
     When at least one cart rule applies today for customer with id 0
     Then I should have 1 products in my cart
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_multiple.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_multiple.feature
index f98c3ddb6112c..7cb0e79e69f63 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_multiple.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_multiple.feature
@@ -101,11 +101,11 @@ Feature: Cart rule (percent) calculation with multiple cart rules
     Given cart rule "cartrule2" has a discount code "foo2"
     When I add 1 items of product "product1" in my cart
     Then I should have 1 different products in my cart
-    And total cart shipping fees should be 7.0 tax excluded
+    And my cart total shipping fees should be 7.0 tax excluded
     And my cart total should be 26.8 tax excluded
-    When I apply the discount code "foo1"
+    When I apply the voucher code "foo1"
     Then my cart total should be 16.9 tax excluded
-    When I apply the discount code "foo2"
+    When I apply the voucher code "foo2"
     # (19.812*0.5)*0.7 + 7 shipping
     Then my cart total should be 13.9 tax excluded
     When at least one cart rule applies today for customer with id 0
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature
index 67880268e69f4..85dc6541612c8 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature
@@ -9,6 +9,8 @@ Feature: Cart rule application is validated before it is applied to cart
     Given there is customer "testCustomer" with email "pub@prestashop.com"
     And country "US" is enabled
     And there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
+    And there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+    And there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
     And there is a cart rule "cart_rule_1" with following properties:
       | name[en-US]                  | cartrule1              |
       | total_quantity               | 1000                   |
@@ -43,43 +45,73 @@ Feature: Cart rule application is validated before it is applied to cart
     And discount code "foo2" is not applied to my cart
     And discount code "foo3" is not applied to my cart
     And I should have 0 different products in my cart
-    And total cart shipping fees should be 0.0 tax excluded
-    And my cart total should be 0.0 tax excluded
+    And my cart total shipping fees should be 0.0 tax excluded
+    And my cart total should be 0.0 tax included
     # try applying percentage discount
-    When I apply the discount code "foo1"
+    When I apply the voucher code "foo1"
     Then I should get cart rule validation error saying "Cart is empty"
     And discount code "foo1" is not applied to my cart
     And I should have 0 products in my cart
-    And total cart shipping fees should be 0.0 tax excluded
-    And my cart total should be 0.0 tax excluded
+    And my cart total shipping fees should be 0.0 tax excluded
+    And my cart total should be 0.0 tax included
     # try applying amount discount
-    When I apply the discount code "foo2"
+    When I apply the voucher code "foo2"
     Then I should get cart rule validation error saying "Cart is empty"
     And discount code "foo2" is not applied to my cart
     And I should have 0 products in my cart
-    And total cart shipping fees should be 0.0 tax excluded
-    And my cart total should be 0.0 tax excluded
+    And my cart total shipping fees should be 0.0 tax excluded
+    And my cart total should be 0.0 tax included
     # try applying free shipping discount
-    When I apply the discount code "foo3"
+    When I apply the voucher code "foo3"
     Then I should get cart rule validation error saying "Cart is empty"
     And discount code "foo3" is not applied to my cart
     And I should have 0 products in my cart
-    And total cart shipping fees should be 0.0 tax excluded
-    And my cart total should be 0.0 tax excluded
+    And my cart total shipping fees should be 0.0 tax excluded
+    And my cart total should be 0.0 tax included
 
   Scenario: Cart rule cannot be applied again when it is already in the cart
     Given I have an empty default cart
     And shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    And there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
     And I add 1 items of product "product1" in my cart
     And I should have 1 different products in my cart
-    And total cart shipping fees should be 7.0 tax excluded
-    And my cart total should be 26.8 tax excluded
+    And my cart total shipping fees should be 7.0 tax excluded
+    And my cart total should be 26.8 tax included
     And discount code "foo1" is not applied to my cart
-    And I apply the discount code "foo1"
+    And I apply the voucher code "foo1"
     And discount "foo1" is applied to my cart
-    And my cart total should be 16.9 tax excluded
-    When I apply the discount code "foo1"
+    And my cart total should be 16.9 tax included
+    When I apply the voucher code "foo1"
     Then I should get cart rule validation error saying "This voucher is already in your cart"
-    And my cart total should be 16.9 tax excluded
+    And my cart total should be 16.9 tax included
     And I should have 1 products in my cart
+
+  Scenario: I cannot use voucher when it is restricted to specific product and that product is not in my cart
+    Given I have an empty default cart
+    And there is a cart rule "cartrule4" with following properties:
+      | name[en-US]                  | reduces $5 for product2 |
+      | total_quantity               | 1000                    |
+      | quantity_per_user            | 1000                    |
+      | priority                     | 8                       |
+      | free_shipping                | false                   |
+      | code                         | foo4                    |
+      | discount_amount              | 5                       |
+      | discount_currency            | usd                     |
+      | discount_includes_tax        | false                   |
+      | apply_to_discounted_products | true                    |
+      | discount_application_type    | order_without_shipping  |
+    And cart rule "cartrule4" is restricted to product "product2"
+    And I add 1 items of product "product1" in my cart
+    And my cart total shipping fees should be 7.0 tax excluded
+    And my cart total should be 26.812 tax included
+    When I apply the voucher code "foo4"
+    And I should get cart rule validation error saying "You cannot use this voucher with these products"
+    When I add 2 items of product "product1" in my cart
+    Then my cart total should be 66.436 tax included
+    When I apply the voucher code "foo4"
+    Then I should get cart rule validation error saying "You cannot use this voucher with these products"
+    And my cart total should be 66.436 tax included
+    And my cart total using previous calculation method should be 66.436 tax included
+    And I add 1 items of product "product2" in my cart
+    And my cart total should be 98.82 tax included
+    When I apply the voucher code "foo4"
+    Then my cart total should be 93.82 tax included
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/mixed.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/mixed.feature
index 5114b25764bc8..8498721ab2b07 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/mixed.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/mixed.feature
@@ -106,12 +106,12 @@ Feature: Cart rule (mixed) calculation with multiple cart rules
     And cart rule "cartrule12" offers a gift product "product3"
     And I add 1 items of product "product1" in my cart
     And I should have 1 different products in my cart
-    And total cart shipping fees should be 7.0 tax excluded
+    And my cart total shipping fees should be 7.0 tax excluded
     And my cart total should be 26.8 tax excluded
-    When I apply the discount code "foo12"
+    When I apply the voucher code "foo12"
     Then my cart total should be 24.8 tax excluded
     And I should have 2 products in my cart
-    When I apply the discount code "foo1"
+    When I apply the voucher code "foo1"
     Then my cart total should be 15.9 tax excluded
     And I should have 2 products in my cart
     And at least one cart rule applies today for customer with id 0
@@ -129,12 +129,12 @@ Feature: Cart rule (mixed) calculation with multiple cart rules
     And cart rule "cartrule13" offers a gift product "product4"
     And I add 1 items of product "product1" in my cart
     And I should have 1 different products in my cart
-    And total cart shipping fees should be 7.0 tax excluded
+    And my cart total shipping fees should be 7.0 tax excluded
     And my cart total should be 26.8 tax excluded
-    When I apply the discount code "foo13"
+    When I apply the voucher code "foo13"
     Then my cart total should be 24.8 tax excluded
     Then cart rule "cartrule1" can be applied to my cart
-    When I apply the discount code "foo1"
+    When I apply the voucher code "foo1"
     Then my cart total should be 15.9 tax excluded
     And I should have 1 products in my cart
     And at least one cart rule applies today for customer with id 0

From 31d7a9a719efdc10223adbdc2f831d9b9d35f9d3 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Thu, 18 May 2023 17:10:42 +0300
Subject: [PATCH 0235/1030]  adjust percent_mono feature to use new cart rules
 creation

---
 .../FrontOffice/Percent/percent_mono.feature  | 93 ++++++++++---------
 1 file changed, 50 insertions(+), 43 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_mono.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_mono.feature
index 71f394f0c00ae..ab7b3b94a491d 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_mono.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_mono.feature
@@ -5,64 +5,71 @@ Feature: Cart rule (percent) calculation with one cart rule
   As a customer
   I must be able to have correct cart total when adding cart rules
 
-  Scenario: Empty cart, one cartRule
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a cart rule named "cartrule2" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule2" has a discount code "foo2"
-    Then I should have 0 different products in my cart
-    When I use the discount "cartrule2"
-    Then my cart total should be 0.0 tax included
-    Then my cart total using previous calculation method should be 0.0 tax included
+  Background:
+    And there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
+    And shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
+    And there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+    And there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
+    And there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
+    And there is a cart rule "cartrule2" with following properties:
+      | name[en-US]                  | cartrule2              |
+      | total_quantity               | 1000                   |
+      | quantity_per_user            | 1000                   |
+      | priority                     | 2                      |
+      | free_shipping                | false                  |
+      | code                         | foo2                   |
+      | discount_percentage          | 50                     |
+      | apply_to_discounted_products | true                   |
+      | discount_application_type    | order_without_shipping |
 
   Scenario: one product in cart, quantity 1, one 50% global cartRule
     Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a cart rule named "cartrule2" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule2" has a discount code "foo2"
-    When I add 1 items of product "product1" in my cart
-    When I use the discount "cartrule2"
+    And I add 1 items of product "product1" in my cart
+    And my cart total shipping fees should be 7.0 tax included
+    And my cart total should be 26.812 tax included
+    When I apply the voucher code "foo2"
     Then my cart total should be 16.906 tax included
-    Then my cart total using previous calculation method should be 16.906 tax included
+    And my cart total using previous calculation method should be 16.906 tax included
 
   Scenario: one product in cart, quantity 3, one 50% global cartRule
     Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a cart rule named "cartrule2" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule2" has a discount code "foo2"
-    When I add 3 items of product "product1" in my cart
-    When I use the discount "cartrule2"
+    And I add 3 items of product "product1" in my cart
+    And my cart total shipping fees should be 7.0 tax included
+    And my cart total should be 66.436 tax included
+    When I apply the voucher code "foo2"
     Then my cart total should be 36.718 tax included
-    Then my cart total using previous calculation method should be 36.718 tax included
+    And my cart total using previous calculation method should be 36.718 tax included
 
   Scenario: 3 products in cart, several quantities, one 5€ global cartRule (reduced product at first place)
     Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
-    Given there is a cart rule named "cartrule2" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule2" has a discount code "foo2"
-    When I add 2 items of product "product2" in my cart
-    When I add 3 items of product "product1" in my cart
-    When I add 1 items of product "product3" in my cart
-    When I use the discount "cartrule2"
+    And I add 3 items of product "product1" in my cart
+    And I add 2 items of product "product2" in my cart
+    And I add 1 items of product "product3" in my cart
+    And my cart total shipping fees should be 7.0 tax included
+    And my cart total should be 162.4 tax included
+    When I apply the voucher code "foo2"
     Then my cart total should be 84.7 tax included
     Then my cart total using previous calculation method should be 84.7 tax included
 
   Scenario: 1 product in cart, percentage reduction cart rule is applied correctly
     Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule1" has a discount code "foo1"
-    When I add 1 items of product "product1" in my cart
-    Then I should have 1 different products in my cart
+    And there is a cart rule "cartrule1" with following properties:
+      | name[en-US]                  | cartrule1              |
+      | total_quantity               | 1000                   |
+      | quantity_per_user            | 1000                   |
+      | priority                     | 1                      |
+      | free_shipping                | false                  |
+      | code                         | foo1                   |
+      | discount_percentage          | 50                     |
+      | apply_to_discounted_products | true                   |
+      | discount_application_type    | order_without_shipping |
+    And I add 1 items of product "product1" in my cart
+    And I should have 1 different products in my cart
     And my cart total shipping fees should be 7.0 tax excluded
-    And my cart total should be 26.8 tax excluded
+    And my cart total should be 26.812 tax included
     When I apply the voucher code "foo1"
-    Then my cart total should be 16.9 tax excluded
-    When at least one cart rule applies today for customer with id 0
-    Then I should have 1 products in my cart
+    Then my cart total should be 16.906 tax included
+    And my cart total using previous calculation method should be 16.906 tax included
+    When I apply the voucher code "foo2"
+    Then my cart total should be 11.95 tax included
+    And I should have 1 products in my cart

From c0c705c6adb90fbd51d6523086f45d21fb21886b Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Thu, 18 May 2023 17:46:54 +0300
Subject: [PATCH 0236/1030]  cache getContextualValue was causing wrong
 discounts price with old calculation and for value_real when getting
 contextual value

---
 .../Context/CartRuleFeatureContext.php        | 48 ++++++-----
 .../Percent/percent_multiple.feature          | 84 +++++++++++--------
 2 files changed, 75 insertions(+), 57 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
index 128c6e80375a5..2b5b83e646a34 100644
--- a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
@@ -38,6 +38,7 @@
 use Db;
 use Order;
 use PHPUnit\Framework\Assert;
+use PrestaShop\Decimal\DecimalNumber;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleValidityException;
 use RuntimeException;
 use Validate;
@@ -454,6 +455,8 @@ public function applyCartRuleByCode(string $code): void
         }
 
         $this->getCurrentCart()->addCartRule((int) $cartRule->id);
+        //@todo: should this be added inside production addCartRule instead?
+        Cache::clean('getContextualValue_*');
     }
 
     /**
@@ -581,29 +584,32 @@ public function checkCartRuleValueForCustomer($customerName, $position, $expecte
      */
     public function checkCartRuleContextualValue(TableNode $table)
     {
-        $contextualReductionValues = $table->getRowsHash();
-        $cartRules = $this->getCurrentCart()->getCartRules();
+        $expectedCartRules = $table->getColumnsHash();
+        $cartRuleRows = $this->getCurrentCart()->getCartRules();
 
-        foreach ($cartRules as $currentCartRule) {
-            if (!isset($contextualReductionValues[$currentCartRule['description']])) {
-                throw new \RuntimeException(sprintf('Cart rule %s was not expected.', $currentCartRule['description']));
-            }
+        Assert::assertCount(count($expectedCartRules), $cartRuleRows, 'Unexpected cart rules count in cart');
 
-            // float numbers are compared as string because float numbers seemingly equals can still be unequals.
-            if ((string) $currentCartRule['value_real'] !== (string) $contextualReductionValues[$currentCartRule['description']]) {
-                throw new \RuntimeException(
-                    sprintf(
-                        'Expects %s, got %s instead',
-                        $contextualReductionValues[$currentCartRule['description']],
-                        $currentCartRule['value_real']
-                    )
-                );
-            }
-            unset($contextualReductionValues[$currentCartRule['description']]);
-        }
+        foreach ($cartRuleRows as $key => $cartRuleRow) {
+            $cartRuleReference = $expectedCartRules[$key]['reference'];
+
+            Assert::assertTrue(
+                $this->getSharedStorage()->exists($cartRuleReference),
+                sprintf('cart rule by reference "%s" doesnt exist', $cartRuleReference)
+            );
+
+            Assert::assertSame(
+                (int) $cartRuleRow['id_cart_rule'],
+                $this->getSharedStorage()->get($cartRuleReference),
+                sprintf('Cart rule %s was not expected in cart (or the sequence is unexpected).', $cartRuleReference)
+            );
 
-        if (!empty($contextualReductionValues)) {
-            throw new \RuntimeException(sprintf('The cart rule "%s" was not found', reset($contextualReductionValues)));
+            $expectedReduction = new DecimalNumber($expectedCartRules[$key]['reduction']);
+            $actualReduction = new DecimalNumber((string) $cartRuleRow['value_real']);
+
+            Assert::assertTrue(
+                $actualReduction->equals($expectedReduction),
+                sprintf('Unexpected contextual reduction. Expected %s, got %s', $expectedReduction, $actualReduction)
+            );
         }
     }
 
@@ -659,7 +665,7 @@ private function getCartRuleValidityCodeByMessage(string $message): int
             // @todo:
             //     some of these errors have %s placeholders, so we just match the most part of it,
             //     it should be convenient enough for now, but will need improvement later
-            if (0 === strpos($message, $errorPart)) {
+            if (str_starts_with($message, $errorPart)) {
                 return $code;
             }
         }
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_multiple.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_multiple.feature
index 7cb0e79e69f63..7e46588ea878c 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_multiple.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_multiple.feature
@@ -1,43 +1,52 @@
 # ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags fo-cart-rule-percent-multiple
 @restore-all-tables-before-feature
 @fo-cart-rule-percent-multiple
+@clear-cache-before-feature
 Feature: Cart rule (percent) calculation with multiple cart rules
   As a customer
   I must be able to have correct cart total when adding cart rules
 
-  Scenario: Empty cart, 2 cartRules
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a cart rule named "cartrule2" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule2" has a discount code "foo2"
-    Given there is a cart rule named "cartrule3" that applies a percent discount of 10.0% with priority 3, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule3" has a discount code "foo3"
-    Then I should have 0 different products in my cart
-    When I use the discount "cartrule2"
-    When I use the discount "cartrule3"
-    Then the current cart should have the following contextual reductions:
-      | cartrule2        | 0  |
-      | cartrule3        | 0  |
-    Then my cart total should be 0.0 tax included
-    Then my cart total using previous calculation method should be 0.0 tax included
+  Background:
+    And there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
+    And shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
+    And there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+    And there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
+    And there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
+    And there is a cart rule "cartrule2" with following properties:
+      | name[en-US]                  | cartrule2              |
+      | total_quantity               | 1000                   |
+      | quantity_per_user            | 1000                   |
+      | priority                     | 2                      |
+      | free_shipping                | false                  |
+      | code                         | foo2                   |
+      | discount_percentage          | 50                     |
+      | apply_to_discounted_products | true                   |
+      | discount_application_type    | order_without_shipping |
+    And there is a cart rule "cartrule3" with following properties:
+      | name[en-US]                  | cartrule3              |
+      | total_quantity               | 1000                   |
+      | quantity_per_user            | 1000                   |
+      | priority                     | 3                      |
+      | free_shipping                | false                  |
+      | code                         | foo3                   |
+      | discount_percentage          | 10                     |
+      | apply_to_discounted_products | true                   |
+      | discount_application_type    | order_without_shipping |
 
   Scenario: one product in cart, quantity 1, 2x % global cartRules
     Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a cart rule named "cartrule2" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule2" has a discount code "foo2"
-    Given there is a cart rule named "cartrule3" that applies a percent discount of 10.0% with priority 3, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule3" has a discount code "foo3"
-    When I add 1 items of product "product1" in my cart
-    When I use the discount "cartrule2"
-    When I use the discount "cartrule3"
-    Then the current cart should have the following contextual reductions:
-      | cartrule2        | 9.905  |
-      | cartrule3        | 0.9905 |
-    Then my cart total should be 15.9154 tax included
-    #known to fail on previous
-    #Then my cart total using previous calculation method should be 15.9154 tax included
+    And I add 1 items of product "product1" in my cart
+    And my cart total shipping fees should be 7.0 tax included
+    And my cart total should be precisely 26.812 tax included
+    When I apply the voucher code "foo2"
+    Then my cart total should be precisely 16.906 tax included
+    When I apply the voucher code "foo3"
+    Then my cart total should be precisely 15.9154 tax included
+    And my cart total using previous calculation method should be precisely 15.9154 tax included
+    And the current cart should have the following contextual reductions:
+      | reference | reduction |
+      | cartrule2 | 9.905     |
+      | cartrule3 | 0.9905    |
 
   Scenario: one product in cart, quantity 3, one 50% global cartRule
     Given I have an empty default cart
@@ -51,8 +60,9 @@ Feature: Cart rule (percent) calculation with multiple cart rules
     When I use the discount "cartrule2"
     When I use the discount "cartrule3"
     Then the current cart should have the following contextual reductions:
-      | cartrule2        | 29.72 |
-      | cartrule3        | 2.972 |
+      | reference | reduction |
+      | cartrule2 | 29.72     |
+      | cartrule3 | 2.972     |
     Then my cart total should be precisely 33.75 tax included
 
   Scenario: 3 products in cart, several quantities, 2x % global cartRules
@@ -71,8 +81,9 @@ Feature: Cart rule (percent) calculation with multiple cart rules
     When I use the discount "cartrule2"
     When I use the discount "cartrule3"
     Then the current cart should have the following contextual reductions:
-      | cartrule2        | 77.705 |
-      | cartrule3        | 7.7705 |
+      | reference | reduction |
+      | cartrule2 | 77.705    |
+      | cartrule3 | 7.7705    |
     Then my cart total should be 76.93 tax included
     #known to fail on previous
     #Then my cart total using previous calculation method should be 76.93 tax included
@@ -86,8 +97,9 @@ Feature: Cart rule (percent) calculation with multiple cart rules
     And there is a cart rule named "10percent" that applies a percent discount of 10.0% with priority 2, quantity of 1000 and quantity per user 1000
     When I add 1 items of product "product1" in my cart
     Then the current cart should have the following contextual reductions:
-      | freeshipping     | 7     |
-      | 10percent        | 1.981 |
+      | reference    | reduction |
+      | freeshipping | 7         |
+      | 10percent    | 1.981     |
     And my cart total should be precisely 17.83 tax included
     And cart shipping fees should be 0.00 tax included
 

From fc1bfdc7c09d50a672d0b532355187e3ebc81cd2 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Fri, 19 May 2023 14:40:16 +0300
Subject: [PATCH 0237/1030]  percent_multiple cleanup

---
 .../Percent/percent_multiple.feature          | 128 ++++++++++--------
 tests/Integration/Utility/CartOld.php         |   2 +
 2 files changed, 73 insertions(+), 57 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_multiple.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_multiple.feature
index 7e46588ea878c..cd7037bfb2c22 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_multiple.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_multiple.feature
@@ -37,12 +37,11 @@ Feature: Cart rule (percent) calculation with multiple cart rules
     Given I have an empty default cart
     And I add 1 items of product "product1" in my cart
     And my cart total shipping fees should be 7.0 tax included
-    And my cart total should be precisely 26.812 tax included
+    And my cart total should be 26.81 tax included
     When I apply the voucher code "foo2"
-    Then my cart total should be precisely 16.906 tax included
+    Then my cart total should be 16.9 tax included
     When I apply the voucher code "foo3"
-    Then my cart total should be precisely 15.9154 tax included
-    And my cart total using previous calculation method should be precisely 15.9154 tax included
+    Then my cart total should be 15.92 tax included
     And the current cart should have the following contextual reductions:
       | reference | reduction |
       | cartrule2 | 9.905     |
@@ -50,75 +49,90 @@ Feature: Cart rule (percent) calculation with multiple cart rules
 
   Scenario: one product in cart, quantity 3, one 50% global cartRule
     Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a cart rule named "cartrule2" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule2" has a discount code "foo2"
-    Given there is a cart rule named "cartrule3" that applies a percent discount of 10.0% with priority 3, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule3" has a discount code "foo3"
-    When I add 3 items of product "product1" in my cart
-    When I use the discount "cartrule2"
-    When I use the discount "cartrule3"
-    Then the current cart should have the following contextual reductions:
+    And I add 3 items of product "product1" in my cart
+    And my cart total shipping fees should be 7.0 tax included
+    And my cart total should be 66.44 tax included
+    When I apply the voucher code "foo2"
+    Then my cart total should be 36.72 tax included
+    When I apply the voucher code "foo3"
+    Then my cart total should be 33.75 tax included
+    And the current cart should have the following contextual reductions:
       | reference | reduction |
       | cartrule2 | 29.72     |
       | cartrule3 | 2.972     |
-    Then my cart total should be precisely 33.75 tax included
 
   Scenario: 3 products in cart, several quantities, 2x % global cartRules
     Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
-    Given there is a cart rule named "cartrule2" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule2" has a discount code "foo2"
-    Given there is a cart rule named "cartrule3" that applies a percent discount of 10.0% with priority 3, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule3" has a discount code "foo3"
-    When I add 2 items of product "product2" in my cart
-    When I add 3 items of product "product1" in my cart
-    When I add 1 items of product "product3" in my cart
-    When I use the discount "cartrule2"
-    When I use the discount "cartrule3"
-    Then the current cart should have the following contextual reductions:
+    And I add 2 items of product "product2" in my cart
+    And I add 3 items of product "product1" in my cart
+    And I add 1 items of product "product3" in my cart
+    And my cart total shipping fees should be 7.0 tax included
+    And my cart total should be 162.4 tax included
+    When I apply the voucher code "foo2"
+    Then my cart total should be 84.7 tax included
+    When I apply the voucher code "foo3"
+    Then my cart total should be 76.93 tax included
+    And the current cart should have the following contextual reductions:
       | reference | reduction |
       | cartrule2 | 77.705    |
       | cartrule3 | 7.7705    |
-    Then my cart total should be 76.93 tax included
-    #known to fail on previous
-    #Then my cart total using previous calculation method should be 76.93 tax included
 
+  @restore-cart-rules-after-scenario
   Scenario: one product in cart, one cart rule free shipping, one cart rule 10%
     Given I have an empty default cart
-    And shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    And there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    And there is a cart rule named "freeshipping" that applies no discount with priority 1, quantity of 1000 and quantity per user 1000
-    And cart rule "freeshipping" offers free shipping
-    And there is a cart rule named "10percent" that applies a percent discount of 10.0% with priority 2, quantity of 1000 and quantity per user 1000
     When I add 1 items of product "product1" in my cart
-    Then the current cart should have the following contextual reductions:
+    # checking cart total and shipping before cart rules exists, to assert that shipping price will be reduced later
+    # because when ONLY_SHIPPING is calculated it does not count cart rules
+    And my cart total shipping fees should be 7.0 tax included
+    And my cart total should be precisely 26.81 tax included
+    Given I have an empty default cart
+    And there is a cart rule "freeshipping" with following properties:
+      | name[en-US]       | freeshipping |
+      | total_quantity    | 1000         |
+      | quantity_per_user | 1000         |
+      | priority          | 1            |
+      | free_shipping     | true         |
+    And there is a cart rule "10percent" with following properties:
+      | name[en-US]                  | 10percent              |
+      | total_quantity               | 1000                   |
+      | quantity_per_user            | 1000                   |
+      | priority                     | 2                      |
+      | discount_percentage          | 10                     |
+      | apply_to_discounted_products | true                   |
+      | discount_application_type    | order_without_shipping |
+    # now adding same products just with cart rules and checking the order total is correct (shipping and percentage applied)
+    When I add 1 items of product "product1" in my cart
+    And my cart total should be precisely 17.83 tax included
+    And the current cart should have the following contextual reductions:
       | reference    | reduction |
       | freeshipping | 7         |
       | 10percent    | 1.981     |
-    And my cart total should be precisely 17.83 tax included
-    And cart shipping fees should be 0.00 tax included
 
   Scenario: 2 combinable cart rules are applied correctly
     Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule1" has a discount code "foo1"
-    Given there is a cart rule named "cartrule2" that applies a percent discount of 30.0% with priority 2, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule2" has a discount code "foo2"
-    When I add 1 items of product "product1" in my cart
-    Then I should have 1 different products in my cart
-    And my cart total shipping fees should be 7.0 tax excluded
-    And my cart total should be 26.8 tax excluded
-    When I apply the voucher code "foo1"
-    Then my cart total should be 16.9 tax excluded
-    When I apply the voucher code "foo2"
-    # (19.812*0.5)*0.7 + 7 shipping
-    Then my cart total should be 13.9 tax excluded
-    When at least one cart rule applies today for customer with id 0
-    Then I should have 1 products in my cart
+    And there is a cart rule "cartrule50" with following properties:
+      | name[en-US]                  | cartrule50             |
+      | total_quantity               | 1000                   |
+      | quantity_per_user            | 1000                   |
+      | priority                     | 1                      |
+      | code                         | foo50                  |
+      | discount_percentage          | 50                     |
+      | apply_to_discounted_products | true                   |
+      | discount_application_type    | order_without_shipping |
+    And there is a cart rule "cartrule30" with following properties:
+      | name[en-US]                  | cartrule30             |
+      | total_quantity               | 1000                   |
+      | quantity_per_user            | 1000                   |
+      | priority                     | 2                      |
+      | code                         | foo30                  |
+      | discount_percentage          | 30                     |
+      | apply_to_discounted_products | true                   |
+      | discount_application_type    | order_without_shipping |
+    And I add 1 items of product "product1" in my cart
+    And I should have 1 different products in my cart
+    And my cart total shipping fees should be 7.0 tax included
+    And my cart total should be precisely 26.81 tax included
+    When I apply the voucher code "foo50"
+    Then my cart total should be 16.9 tax included
+    When I apply the voucher code "foo30"
+    Then my cart total should be precisely 13.93 tax included
diff --git a/tests/Integration/Utility/CartOld.php b/tests/Integration/Utility/CartOld.php
index c3f3040ab661b..d322805e7e6f8 100644
--- a/tests/Integration/Utility/CartOld.php
+++ b/tests/Integration/Utility/CartOld.php
@@ -36,6 +36,8 @@
 use Tools;
 
 /**
+ * @todo: should this class be deleted already? (or at least deprecated?) It doesn't seem to be used anymore
+ *
  * legacy code here : used to test behaviour between recent and previous version
  */
 class CartOld extends Cart

From 4018f50574539d964418ed880287f9abf6dd5cf2 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Fri, 19 May 2023 16:21:33 +0300
Subject: [PATCH 0238/1030]  clean up and remove some redundant tests

---
 .../CommandHandler/AddCartRuleHandler.php     |   2 +-
 .../CartRule/Command/AddCartRuleCommand.php   |   2 +-
 .../FrontOffice/Amount/amount_mono.feature    |   2 +-
 .../Amount/amount_mono_virtual.feature        |   2 +-
 .../Amount/amount_multiple.feature            |   2 +-
 .../FrontOffice/Percent/percent_mono.feature  |   2 +-
 .../Percent/percent_multiple.feature          |  35 ++++-
 .../Percent/percent_no_code_multiple.feature  |  21 ---
 .../Percent/percent_specific.feature          | 129 ++++++++++--------
 .../Percent/percent_specific_mono.feature     |  71 ----------
 .../Percent/percent_specific_multiple.feature |  92 -------------
 .../FrontOffice/cart_rule_validation.feature  |  40 +++++-
 12 files changed, 148 insertions(+), 252 deletions(-)
 delete mode 100644 tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_no_code_multiple.feature
 delete mode 100644 tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_specific_mono.feature
 delete mode 100644 tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_specific_multiple.feature

diff --git a/src/Adapter/CartRule/CommandHandler/AddCartRuleHandler.php b/src/Adapter/CartRule/CommandHandler/AddCartRuleHandler.php
index eb8ea3d354c8c..4c22a6f33272d 100644
--- a/src/Adapter/CartRule/CommandHandler/AddCartRuleHandler.php
+++ b/src/Adapter/CartRule/CommandHandler/AddCartRuleHandler.php
@@ -91,7 +91,7 @@ private function buildCartRuleFromCommandData(AddCartRuleCommand $command): Cart
         $cartRule->highlight = $command->isHighlightInCart();
         $cartRule->partial_use = $command->allowPartialUse();
         $cartRule->priority = $command->getPriority();
-        $cartRule->active = $command->active();
+        $cartRule->active = $command->isActive();
 
         $this->fillCartRuleConditionsFromCommandData($cartRule, $command);
         $this->cartRuleActionFiller->fillUpdatableProperties($cartRule, $command->getCartRuleAction());
diff --git a/src/Core/Domain/CartRule/Command/AddCartRuleCommand.php b/src/Core/Domain/CartRule/Command/AddCartRuleCommand.php
index bc8f4efb737de..72f32f171ee4f 100644
--- a/src/Core/Domain/CartRule/Command/AddCartRuleCommand.php
+++ b/src/Core/Domain/CartRule/Command/AddCartRuleCommand.php
@@ -201,7 +201,7 @@ public function setPriority(int $priority): AddCartRuleCommand
         return $this;
     }
 
-    public function active(): bool
+    public function isActive(): bool
     {
         return $this->active;
     }
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono.feature
index d63d011f84bb4..ee721679c1f47 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono.feature
@@ -6,7 +6,7 @@ Feature: Cart rule (amount) calculation with one cart rule
   I must be able to have correct cart total when adding cart rules
 
   Background:
-    And there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
+    Given there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
     And shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
     And there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
     And there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono_virtual.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono_virtual.feature
index 7e99b1f6ac114..ba1c385b9bd84 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono_virtual.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono_virtual.feature
@@ -6,7 +6,7 @@ Feature: Cart rule (amount) calculation with one cart rule
   I must be able to have correct cart total when adding cart rules
 
   Background:
-    And there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
+    Given there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
     And shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
     And there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
     And there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_multiple.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_multiple.feature
index d8c6a7cb023d9..b0adf7c2373de 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_multiple.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_multiple.feature
@@ -6,7 +6,7 @@ Feature: Cart rule (amount) calculation with multiple cart rules
   I must be able to have correct cart total when adding cart rules
 
   Background:
-    And there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
+    Given there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
     And shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
     And there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
     And there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_mono.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_mono.feature
index ab7b3b94a491d..c11621cfb72ea 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_mono.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_mono.feature
@@ -6,7 +6,7 @@ Feature: Cart rule (percent) calculation with one cart rule
   I must be able to have correct cart total when adding cart rules
 
   Background:
-    And there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
+    Given there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
     And shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
     And there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
     And there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_multiple.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_multiple.feature
index cd7037bfb2c22..d3da5e5331a62 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_multiple.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_multiple.feature
@@ -7,7 +7,7 @@ Feature: Cart rule (percent) calculation with multiple cart rules
   I must be able to have correct cart total when adding cart rules
 
   Background:
-    And there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
+    Given there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
     And shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
     And there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
     And there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
@@ -136,3 +136,36 @@ Feature: Cart rule (percent) calculation with multiple cart rules
     Then my cart total should be 16.9 tax included
     When I apply the voucher code "foo30"
     Then my cart total should be precisely 13.93 tax included
+
+  Scenario: 3 products in cart, several quantities, 2x % global cartRules without codes
+    Given I have an empty default cart
+    When I add 2 items of product "product2" in my cart
+    And I add 3 items of product "product1" in my cart
+    And I add 1 items of product "product3" in my cart
+    Then my cart total should be 162.4 tax included
+    And my cart total shipping fees should be 7.0 tax included
+    Given I have an empty default cart
+    And there is a cart rule "cartrule14" with following properties:
+      | name[en-US]                  | cartrule14             |
+      | total_quantity               | 1000                   |
+      | quantity_per_user            | 1000                   |
+      | priority                     | 14                     |
+      | free_shipping                | false                  |
+      | code                         |                        |
+      | discount_percentage          | 10                     |
+      | apply_to_discounted_products | true                   |
+      | discount_application_type    | order_without_shipping |
+    And there is a cart rule "cartrule15" with following properties:
+      | name[en-US]                  | cartrule15             |
+      | total_quantity               | 1000                   |
+      | quantity_per_user            | 1000                   |
+      | priority                     | 15                     |
+      | free_shipping                | false                  |
+      | code                         |                        |
+      | discount_percentage          | 10                     |
+      | apply_to_discounted_products | true                   |
+      | discount_application_type    | order_without_shipping |
+    When I add 2 items of product "product2" in my cart
+    And I add 3 items of product "product1" in my cart
+    And I add 1 items of product "product3" in my cart
+    Then my cart total should be 132.874 tax included
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_no_code_multiple.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_no_code_multiple.feature
deleted file mode 100644
index 999b25c61f947..0000000000000
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_no_code_multiple.feature
+++ /dev/null
@@ -1,21 +0,0 @@
-@restore-all-tables-before-feature
-Feature: Cart rule (percent) calculation with multiple cart rules without code
-  As a customer
-  I must be able to have correct cart total when adding cart rules
-
-  Scenario: 3 products in cart, several quantities, 2x % global cartRules
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
-    Given there is a cart rule named "cartrule14" that applies a percent discount of 10.0% with priority 14, quantity of 1000 and quantity per user 1000
-    Given there is a cart rule named "cartrule15" that applies a percent discount of 10.0% with priority 15, quantity of 1000 and quantity per user 1000
-    When I add 2 items of product "product2" in my cart
-    When I add 3 items of product "product1" in my cart
-    When I add 1 items of product "product3" in my cart
-    When I use the discount "cartrule14"
-    When I use the discount "cartrule15"
-    Then my cart total should be 132.874 tax included
-    #known to fail on previous
-    #Then my cart total using previous calculation method should be 132.874 tax included
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_specific.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_specific.feature
index ab17bf9f7e73f..e4073883f12df 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_specific.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_specific.feature
@@ -1,71 +1,80 @@
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags fo-cart-rule-percent-specific
 @restore-all-tables-before-feature
+@fo-cart-rule-percent-specific
+@clear-cache-before-feature
 Feature: Cart rule (percent) calculation with one cart rule restricted to one product
   As a customer
   I must be able to have correct cart total when adding cart rules
 
-  Scenario: Empty cart, one cartRule
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a cart rule named "cartrule10" that applies a percent discount of 50.0% with priority 10, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule10" is restricted to product "product2"
-    Given cart rule "cartrule10" has a discount code "foo10"
-    Then I should have 0 different products in my cart
-    When I use the discount "cartrule10"
-    Then my cart total should be 0.0 tax included
-    Then my cart total using previous calculation method should be 0.0 tax included
-
-  Scenario: one product in cart, quantity 1, one specific 50% cartRule on product #2
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a cart rule named "cartrule10" that applies a percent discount of 50.0% with priority 10, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule10" is restricted to product "product2"
-    Given cart rule "cartrule10" has a discount code "foo10"
-    When I add 1 items of product "product1" in my cart
-    When I use the discount "cartrule10"
-    Then my cart total should be 26.812 tax included
-    Then my cart total using previous calculation method should be 26.812 tax included
-
-  Scenario: one product in cart, quantity 3, one specific 50% cartRule on product #2
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a cart rule named "cartrule10" that applies a percent discount of 50.0% with priority 10, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule10" is restricted to product "product2"
-    Given cart rule "cartrule10" has a discount code "foo10"
-    When I add 3 items of product "product1" in my cart
-    When I use the discount "cartrule10"
-    Then my cart total should be 66.436 tax included
-    Then my cart total using previous calculation method should be 66.436 tax included
+  Background:
+    Given there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
+    And I have an empty default cart
+    And shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
+    And there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+    And there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
+    And there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
+    And there is a cart rule "cartrule10" with following properties:
+      | name[en-US]                  | cartrule10             |
+      | total_quantity               | 1000                   |
+      | quantity_per_user            | 1000                   |
+      | priority                     | 10                     |
+      | free_shipping                | false                  |
+      | code                         | foo10                  |
+      | discount_percentage          | 50                     |
+      | apply_to_discounted_products | true                   |
+      | discount_application_type    | order_without_shipping |
+    And cart rule "cartrule10" is restricted to product "product2"
+    And there is a cart rule "cartrule11" with following properties:
+      | name[en-US]                  | cartrule11             |
+      | total_quantity               | 1000                   |
+      | quantity_per_user            | 1000                   |
+      | priority                     | 11                     |
+      | free_shipping                | false                  |
+      | code                         | foo11                  |
+      | discount_percentage          | 10                     |
+      | apply_to_discounted_products | true                   |
+      | discount_application_type    | order_without_shipping |
+    And cart rule "cartrule11" is restricted to product "product2"
 
   Scenario: one product #2 in cart, quantity 3, one specific 50% cartRule on product #2
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a cart rule named "cartrule10" that applies a percent discount of 50.0% with priority 10, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule10" is restricted to product "product2"
-    Given cart rule "cartrule10" has a discount code "foo10"
-    When I add 3 items of product "product2" in my cart
-    When I use the discount "cartrule10"
+    Given I add 3 items of product "product2" in my cart
+    And my cart total shipping fees should be 7.0 tax excluded
+    And my cart total should be precisely 104.16 tax included
+    When I apply the voucher code "foo10"
     Then my cart total should be 55.582 tax included
-    Then my cart total using previous calculation method should be 55.582 tax included
 
   Scenario: 3 products in cart, several quantities, one specific 50% cartRule on product #2
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
-    Given there is a cart rule named "cartrule10" that applies a percent discount of 50.0% with priority 10, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule10" is restricted to product "product2"
-    Given cart rule "cartrule10" has a discount code "foo10"
-    When I add 3 items of product "product1" in my cart
-    When I add 2 items of product "product2" in my cart
-    When I add 1 items of product "product3" in my cart
-    When I use the discount "cartrule10"
+    Given I add 2 items of product "product2" in my cart
+    And I add 1 items of product "product3" in my cart
+    And I add 3 items of product "product1" in my cart
+    And my cart total shipping fees should be 7.0 tax included
+    And my cart total should be 162.4 tax included
+    When I apply the voucher code "foo10"
+    # because cart rule provides 50% discount for product2 only
     Then my cart total should be 130.012 tax included
-    #known to fail on previous
-    #Then my cart total using previous calculation method should be 130.012 tax included
+
+  Scenario: one product #2 in cart, quantity 3, one specific 50% cartRule on product #2
+    Given I add 3 items of product "product2" in my cart
+    And my cart total shipping fees should be 7.0 tax included
+    And my cart total should be 104.164 tax included
+    When I apply the voucher code "foo10"
+    Then my cart total should be 55.582 tax included
+
+  Scenario: one product #2 in cart, quantity 3, specific 50% cartRule on product #2, specific 10% cartRule on product #2
+    Given I add 3 items of product "product2" in my cart
+    And my cart total shipping fees should be 7.0 tax included
+    And my cart total should be 104.164 tax included
+    When I apply the voucher code "foo10"
+    Then my cart total should be 55.58 tax included
+    When I apply the voucher code "foo11"
+    Then my cart total should be 50.73 tax included
+
+  Scenario: 3 products in cart, several quantities, specific 50% cartRule on product #2, specific 10% cartRule on product #2
+    Given I add 3 items of product "product1" in my cart
+    And I add 2 items of product "product2" in my cart
+    And I add 1 items of product "product3" in my cart
+    And my cart total shipping fees should be 7.0 tax included
+    And my cart total should be 162.4 tax included
+    When I apply the voucher code "foo10"
+    When I apply the voucher code "foo11"
+    Then my cart total should be 126.7732 tax included
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_specific_mono.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_specific_mono.feature
deleted file mode 100644
index ab17bf9f7e73f..0000000000000
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_specific_mono.feature
+++ /dev/null
@@ -1,71 +0,0 @@
-@restore-all-tables-before-feature
-Feature: Cart rule (percent) calculation with one cart rule restricted to one product
-  As a customer
-  I must be able to have correct cart total when adding cart rules
-
-  Scenario: Empty cart, one cartRule
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a cart rule named "cartrule10" that applies a percent discount of 50.0% with priority 10, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule10" is restricted to product "product2"
-    Given cart rule "cartrule10" has a discount code "foo10"
-    Then I should have 0 different products in my cart
-    When I use the discount "cartrule10"
-    Then my cart total should be 0.0 tax included
-    Then my cart total using previous calculation method should be 0.0 tax included
-
-  Scenario: one product in cart, quantity 1, one specific 50% cartRule on product #2
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a cart rule named "cartrule10" that applies a percent discount of 50.0% with priority 10, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule10" is restricted to product "product2"
-    Given cart rule "cartrule10" has a discount code "foo10"
-    When I add 1 items of product "product1" in my cart
-    When I use the discount "cartrule10"
-    Then my cart total should be 26.812 tax included
-    Then my cart total using previous calculation method should be 26.812 tax included
-
-  Scenario: one product in cart, quantity 3, one specific 50% cartRule on product #2
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a cart rule named "cartrule10" that applies a percent discount of 50.0% with priority 10, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule10" is restricted to product "product2"
-    Given cart rule "cartrule10" has a discount code "foo10"
-    When I add 3 items of product "product1" in my cart
-    When I use the discount "cartrule10"
-    Then my cart total should be 66.436 tax included
-    Then my cart total using previous calculation method should be 66.436 tax included
-
-  Scenario: one product #2 in cart, quantity 3, one specific 50% cartRule on product #2
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a cart rule named "cartrule10" that applies a percent discount of 50.0% with priority 10, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule10" is restricted to product "product2"
-    Given cart rule "cartrule10" has a discount code "foo10"
-    When I add 3 items of product "product2" in my cart
-    When I use the discount "cartrule10"
-    Then my cart total should be 55.582 tax included
-    Then my cart total using previous calculation method should be 55.582 tax included
-
-  Scenario: 3 products in cart, several quantities, one specific 50% cartRule on product #2
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
-    Given there is a cart rule named "cartrule10" that applies a percent discount of 50.0% with priority 10, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule10" is restricted to product "product2"
-    Given cart rule "cartrule10" has a discount code "foo10"
-    When I add 3 items of product "product1" in my cart
-    When I add 2 items of product "product2" in my cart
-    When I add 1 items of product "product3" in my cart
-    When I use the discount "cartrule10"
-    Then my cart total should be 130.012 tax included
-    #known to fail on previous
-    #Then my cart total using previous calculation method should be 130.012 tax included
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_specific_multiple.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_specific_multiple.feature
deleted file mode 100644
index 4d50f32ffc21b..0000000000000
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_specific_multiple.feature
+++ /dev/null
@@ -1,92 +0,0 @@
-@restore-all-tables-before-feature
-Feature: Cart rule (percent) calculation with multiple cart rules restricted to one product
-  As a customer
-  I must be able to have correct cart total when adding cart rules
-
-  Scenario: Empty cart, 2 cartRules
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a cart rule named "cartrule10" that applies a percent discount of 50.0% with priority 10, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule10" is restricted to product "product2"
-    Given cart rule "cartrule10" has a discount code "foo10"
-    Given there is a cart rule named "cartrule11" that applies a percent discount of 10.0% with priority 11, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule11" is restricted to product "product2"
-    Given cart rule "cartrule11" has a discount code "foo11"
-    Then I should have 0 different products in my cart
-    When I use the discount "cartrule10"
-    When I use the discount "cartrule11"
-    Then my cart total should be 0.0 tax included
-    Then my cart total using previous calculation method should be 0.0 tax included
-
-  Scenario: one product in cart, quantity 1, specific 50% cartRule on product #2, specific 10% cartRule on product #2
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a cart rule named "cartrule10" that applies a percent discount of 50.0% with priority 10, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule10" is restricted to product "product2"
-    Given cart rule "cartrule10" has a discount code "foo10"
-    Given there is a cart rule named "cartrule11" that applies a percent discount of 10.0% with priority 11, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule11" is restricted to product "product2"
-    Given cart rule "cartrule11" has a discount code "foo11"
-    When I add 1 items of product "product1" in my cart
-    When I use the discount "cartrule10"
-    When I use the discount "cartrule11"
-    Then my cart total should be 26.812 tax included
-    Then my cart total using previous calculation method should be 26.812 tax included
-
-  Scenario: one product in cart, quantity 3, specific 50% cartRule on product #2, specific 10% cartRule on product #2
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a cart rule named "cartrule10" that applies a percent discount of 50.0% with priority 10, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule10" is restricted to product "product2"
-    Given cart rule "cartrule10" has a discount code "foo10"
-    Given there is a cart rule named "cartrule11" that applies a percent discount of 10.0% with priority 11, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule11" is restricted to product "product2"
-    Given cart rule "cartrule11" has a discount code "foo11"
-    When I add 3 items of product "product1" in my cart
-    When I use the discount "cartrule10"
-    When I use the discount "cartrule11"
-    Then my cart total should be 66.436 tax included
-    Then my cart total using previous calculation method should be 66.436 tax included
-
-  Scenario: one product #2 in cart, quantity 3, specific 50% cartRule on product #2, specific 10% cartRule on product #2
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a cart rule named "cartrule10" that applies a percent discount of 50.0% with priority 10, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule10" is restricted to product "product2"
-    Given cart rule "cartrule10" has a discount code "foo10"
-    Given there is a cart rule named "cartrule11" that applies a percent discount of 10.0% with priority 11, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule11" is restricted to product "product2"
-    Given cart rule "cartrule11" has a discount code "foo11"
-    When I add 3 items of product "product2" in my cart
-    When I use the discount "cartrule10"
-    When I use the discount "cartrule11"
-    Then my cart total should be 50.7238 tax included
-    #known to fail on previous
-    #Then my cart total using previous calculation method should be 50.7238 tax included
-
-  Scenario: 3 products in cart, several quantities, specific 50% cartRule on product #2, specific 10% cartRule on product #2
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
-    Given there is a cart rule named "cartrule10" that applies a percent discount of 50.0% with priority 10, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule10" is restricted to product "product2"
-    Given cart rule "cartrule10" has a discount code "foo10"
-    Given there is a cart rule named "cartrule11" that applies a percent discount of 10.0% with priority 11, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule11" is restricted to product "product2"
-    Given cart rule "cartrule11" has a discount code "foo11"
-    When I add 3 items of product "product1" in my cart
-    When I add 2 items of product "product2" in my cart
-    When I add 1 items of product "product3" in my cart
-    When I use the discount "cartrule10"
-    When I use the discount "cartrule11"
-    Then my cart total should be 126.7732 tax included
-    #known to fail on previous
-    #Then my cart total using previous calculation method should be 126.7732 tax included
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature
index 85dc6541612c8..8c88d6ed4b971 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature
@@ -101,7 +101,7 @@ Feature: Cart rule application is validated before it is applied to cart
       | discount_application_type    | order_without_shipping  |
     And cart rule "cartrule4" is restricted to product "product2"
     And I add 1 items of product "product1" in my cart
-    And my cart total shipping fees should be 7.0 tax excluded
+    And my cart total shipping fees should be 7.0 tax included
     And my cart total should be 26.812 tax included
     When I apply the voucher code "foo4"
     And I should get cart rule validation error saying "You cannot use this voucher with these products"
@@ -115,3 +115,41 @@ Feature: Cart rule application is validated before it is applied to cart
     And my cart total should be 98.82 tax included
     When I apply the voucher code "foo4"
     Then my cart total should be 93.82 tax included
+    # same with percentage
+    Given I have an empty default cart
+    And there is a cart rule "cartrule50" with following properties:
+      | name[en-US]                  | cartrule50             |
+      | total_quantity               | 1000                   |
+      | quantity_per_user            | 1000                   |
+      | priority                     | 10                     |
+      | free_shipping                | false                  |
+      | code                         | foo50                  |
+      | discount_percentage          | 50                     |
+      | apply_to_discounted_products | true                   |
+      | discount_application_type    | order_without_shipping |
+    And cart rule "cartrule50" is restricted to product "product2"
+    And I add 1 items of product "product1" in my cart
+    And my cart total shipping fees should be 7.0 tax included
+    And my cart total should be 26.812 tax included
+    When I apply the voucher code "foo50"
+    Then I should get cart rule validation error saying "You cannot use this voucher with these products"
+    And my cart total should be 26.812 tax included
+    # same with free shipping (just restricting to another product)
+    Given I have an empty default cart
+    And there is a cart rule "cartruleFreeShip" with following properties:
+      | name[en-US]                  | cartruleFreeShip       |
+      | priority                     | 11                     |
+      | free_shipping                | true                   |
+      | code                         | cartruleFreeShip       |
+      | discount_percentage          | 50                     |
+      | apply_to_discounted_products | true                   |
+      | discount_application_type    | order_without_shipping |
+    And cart rule "cartruleFreeShip" is restricted to product "product1"
+    And I add 1 items of product "product2" in my cart
+    And my cart total shipping fees should be 7.0 tax included
+    And my cart total should be 39.4 tax included
+    When I apply the voucher code "cartruleFreeShip"
+    Then I should get cart rule validation error saying "You cannot use this voucher with these products"
+    And my cart total should be 39.4 tax included
+
+

From a0ae3b27bd978e2efc7f5070b8f2027bad8f955b Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Fri, 19 May 2023 18:23:18 +0300
Subject: [PATCH 0239/1030]  move empty cart assertion to background in
 previously cleaned tests

---
 .../Context/CartRuleFeatureContext.php        |  19 +-
 .../FrontOffice/Amount/amount_mono.feature    |  19 +-
 .../Amount/amount_mono_virtual.feature        |   7 +-
 .../Amount/amount_multiple.feature            |  22 +-
 .../Amount/amount_specific.feature            |   9 +-
 .../FrontOffice/Percent/percent_mono.feature  |  13 +-
 .../Percent/percent_multiple.feature          |  15 +-
 .../Percent/percent_specific.feature          |   2 +-
 .../cart_rule_carrier_restriction.feature     | 444 ++++++++----------
 .../FrontOffice/cart_rule_validation.feature  |  43 +-
 10 files changed, 295 insertions(+), 298 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
index 2b5b83e646a34..8523bde3acd4e 100644
--- a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
@@ -269,13 +269,24 @@ public function cartRuleNamedIsRestrictedToProductNamed(
      */
     public function cartRuleNamedIsRestrictedToCarrierNamed($cartRuleName, $carrierName)
     {
-        $this->checkCartRuleWithNameExists($cartRuleName);
         $this->carrierFeatureContext->checkCarrierWithNameExists($carrierName);
-        $this->cartRules[$cartRuleName]->carrier_restriction = true;
-        $this->cartRules[$cartRuleName]->save();
+
+        if ($this->getSharedStorage()->exists($cartRuleName)) {
+            //@todo: This allows applying this step to cart rule that was created with a step using CQRS command and saved to shared storage
+            //       it is not ideal, but for now it should work, until restrictions are migrated.
+            $cartRuleId = $this->getSharedStorage()->get($cartRuleName);
+        } else {
+            $this->checkCartRuleWithNameExists($cartRuleName);
+            $cartRuleId = (int) $this->cartRules[$cartRuleName]->id;
+        }
+        $cartRule = new CartRule($cartRuleId);
+        $cartRule->carrier_restriction = true;
+        $cartRule->save();
+        $this->cartRules[$cartRuleName] = $cartRule;
+
         Db::getInstance()->execute('
           INSERT INTO ' . _DB_PREFIX_ . "cart_rule_carrier(`id_cart_rule`, `id_carrier`)
-          VALUES('" . (int) $this->cartRules[$cartRuleName]->id . "',
+          VALUES('" . $cartRuleId . "',
           '" . (int) $this->carrierFeatureContext->getCarrierWithName($carrierName)->id . "')
         ");
         Cache::clear();
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono.feature
index ee721679c1f47..cab6da10e3943 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono.feature
@@ -35,10 +35,10 @@ Feature: Cart rule (amount) calculation with one cart rule
       | discount_includes_tax        | false                  |
       | apply_to_discounted_products | true                   |
       | discount_application_type    | order_without_shipping |
+    And I have an empty default cart
 
   Scenario: one product in cart, quantity 1, one 5€ global cartRule
-    Given I have an empty default cart
-    And I add 1 items of product "product1" in my cart
+    Given I add 1 items of product "product1" in my cart
     And my cart total shipping fees should be 7.0 tax included
     Then my cart total should be 26.812 tax included
     Then my cart total using previous calculation method should be 26.812 tax included
@@ -47,23 +47,20 @@ Feature: Cart rule (amount) calculation with one cart rule
     Then my cart total using previous calculation method should be 21.812 tax included
 
   Scenario: one product in cart, quantity 1, one 500€ global cartRule
-    Given I have an empty default cart
-    And I add 1 items of product "product1" in my cart
+    Given I add 1 items of product "product1" in my cart
     And my cart total shipping fees should be 7.0 tax included
     When I apply the voucher code "reduce-500"
     Then my cart total should be 7.0 tax included
     And my cart total using previous calculation method should be 7.0 tax included
 
   Scenario: one product in cart, quantity 3, one 5€ global cartRule
-    Given I have an empty default cart
-    And I add 3 items of product "product1" in my cart
+    Given I add 3 items of product "product1" in my cart
     When I apply the voucher code "reduce-5"
     Then my cart total should be 61.436 tax included
     And my cart total using previous calculation method should be 61.436 tax included
 
   Scenario: 3 products in cart, several quantities, one 5€ global cartRule (reduced product at first place)
-    Given I have an empty default cart
-    And I add 2 items of product "product2" in my cart
+    Given I add 2 items of product "product2" in my cart
     And I add 3 items of product "product1" in my cart
     And I add 1 items of product "product3" in my cart
     And my cart total shipping fees should be 7.0 tax included
@@ -74,8 +71,7 @@ Feature: Cart rule (amount) calculation with one cart rule
     And my cart total using previous calculation method should be 157.4 tax included
 
   Scenario: 3 products in cart, several quantities, one 5€ global cartRule (reduced product at second place)
-    Given I have an empty default cart
-    And I add 3 items of product "product1" in my cart
+    Given I add 3 items of product "product1" in my cart
     And I add 2 items of product "product2" in my cart
     And I add 1 items of product "product3" in my cart
     And my cart total shipping fees should be 7.0 tax included
@@ -86,8 +82,7 @@ Feature: Cart rule (amount) calculation with one cart rule
     And my cart total using previous calculation method should be 157.4 tax included
 
   Scenario: 3 products in cart, several quantities, one 500€ global cartRule
-    Given I have an empty default cart
-    And I add 3 items of product "product1" in my cart
+    Given I add 3 items of product "product1" in my cart
     And I add 2 items of product "product2" in my cart
     And I add 1 items of product "product3" in my cart
     And my cart total shipping fees should be 7.0 tax included
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono_virtual.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono_virtual.feature
index ba1c385b9bd84..74ed28d874140 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono_virtual.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono_virtual.feature
@@ -37,10 +37,10 @@ Feature: Cart rule (amount) calculation with one cart rule
       | discount_includes_tax        | false                  |
       | apply_to_discounted_products | true                   |
       | discount_application_type    | order_without_shipping |
+    And I have an empty default cart
 
   Scenario: 4 products in cart, one is virtual, several quantities, one 5€ global voucher
-    Given I have an empty default cart
-    And I add 3 items of product "product1" in my cart
+    Given I add 3 items of product "product1" in my cart
     And I add 2 items of product "product2" in my cart
     And I add 1 items of product "product3" in my cart
     And I add 2 items of product "product8" in my cart
@@ -52,8 +52,7 @@ Feature: Cart rule (amount) calculation with one cart rule
     And my cart total using previous calculation method should be 182.09 tax included
 
   Scenario: Only virtual product in my cart, one 5€ global voucher
-    Given I have an empty default cart
-    And I add 2 items of product "product8" in my cart
+    Given I add 2 items of product "product8" in my cart
     And my cart total shipping fees should be 0.0 tax included
     And my cart total should be 24.69 tax included
     And my cart total using previous calculation method should be 24.69 tax included
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_multiple.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_multiple.feature
index b0adf7c2373de..0322e672108e9 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_multiple.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_multiple.feature
@@ -51,10 +51,10 @@ Feature: Cart rule (amount) calculation with multiple cart rules
       | discount_includes_tax        | false                  |
       | apply_to_discounted_products | true                   |
       | discount_application_type    | order_without_shipping |
+    And I have an empty default cart
 
   Scenario: one product in cart, quantity 1, one 5€ global cartRule, one 10€ global cartRule
-    Given I have an empty default cart
-    And I add 1 items of product "product1" in my cart
+    Given I add 1 items of product "product1" in my cart
     And my cart total shipping fees should be 7.0 tax included
     And my cart total should be 26.812 tax included
     And my cart total using previous calculation method should be 26.812 tax included
@@ -66,8 +66,7 @@ Feature: Cart rule (amount) calculation with multiple cart rules
     And my cart total using previous calculation method should be 11.812 tax included
 
   Scenario: one product in cart, quantity 3, one 5€ global cartRule, one 10€ global cartRule
-    Given I have an empty default cart
-    And I add 3 items of product "product1" in my cart
+    Given I add 3 items of product "product1" in my cart
     And my cart total shipping fees should be 7.0 tax included
     And my cart total should be 66.436 tax included
     And my cart total using previous calculation method should be 66.436 tax included
@@ -79,8 +78,7 @@ Feature: Cart rule (amount) calculation with multiple cart rules
     And my cart total using previous calculation method should be 51.436 tax included
 
   Scenario: 3 products in cart, several quantities, one 5€ global cartRule (reduced product at first place)
-    Given I have an empty default cart
-    And I add 2 items of product "product2" in my cart
+    Given I add 2 items of product "product2" in my cart
     And I add 3 items of product "product1" in my cart
     And I add 1 items of product "product3" in my cart
     And my cart total shipping fees should be 7.0 tax included
@@ -95,8 +93,7 @@ Feature: Cart rule (amount) calculation with multiple cart rules
 
   @restore-cart-rules-after-scenario
   Scenario: One product in my cart, one cart rule for free shipping and one for free gift
-    Given I have an empty default cart
-    And there is a cart rule "cartrule-free-shipping" with following properties:
+    Given there is a cart rule "cartrule-free-shipping" with following properties:
       | name[en-US]       | cartrule-free-shipping |
       | total_quantity    | 1                      |
       | quantity_per_user | 1                      |
@@ -124,8 +121,7 @@ Feature: Cart rule (amount) calculation with multiple cart rules
 
   @restore-cart-rules-after-scenario
   Scenario: One product in my cart, one 10€ global cartRule, 2 free gifts global cartRules
-    Given I have an empty default cart
-    And there is a cart rule "reduce-10-global" with following properties:
+    Given there is a cart rule "reduce-10-global" with following properties:
       | name[en-US]                  | reduce-10-global       |
       | total_quantity               | 1                      |
       | quantity_per_user            | 1                      |
@@ -161,8 +157,7 @@ Feature: Cart rule (amount) calculation with multiple cart rules
 
   @restore-cart-rules-after-scenario
   Scenario: One product in my cart, one 30€ global cartRule (which is superior to the product bought), 2 free gifts global cartRules
-    Given I have an empty default cart
-    And there is a cart rule "reduce-30-global" with following properties:
+    Given there is a cart rule "reduce-30-global" with following properties:
       | name[en-US]                  | reduce-30-global       |
       | total_quantity               | 1                      |
       | quantity_per_user            | 1                      |
@@ -199,8 +194,7 @@ Feature: Cart rule (amount) calculation with multiple cart rules
 
   @restore-cart-rules-after-scenario
   Scenario: One product in my cart, one 30€ global cartRule (which is superior to the product bought) with free shipping, 2 free gifts global cartRules
-    Given I have an empty default cart
-    And there is a cart rule "reduce-30-free-ship-global" with following properties:
+    Given there is a cart rule "reduce-30-free-ship-global" with following properties:
       | name[en-US]                  | reduce-30-free-ship-global |
       | total_quantity               | 1                          |
       | quantity_per_user            | 1                          |
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_specific.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_specific.feature
index 69efd997ed8ab..618b4a9b9e7ef 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_specific.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_specific.feature
@@ -24,12 +24,12 @@ Feature: Cart rule (amount) calculation with one cart rule restricted to one pro
       | apply_to_discounted_products | true                    |
       | discount_application_type    | order_without_shipping  |
     And cart rule "cartrule8" is restricted to product "product2"
+    And I have an empty default cart
 
   Scenario: 3 products in cart, several quantities, one specific 5€ cartRule on product #2
-    Given I have an empty default cart
     When I add 2 items of product "product2" in my cart
-    When I add 3 items of product "product1" in my cart
-    When I add 1 items of product "product3" in my cart
+    And I add 3 items of product "product1" in my cart
+    And I add 1 items of product "product3" in my cart
     And my cart total shipping fees should be 7.0 tax excluded
     And my cart total should be 162.4 tax excluded
     When I apply the voucher code "foo8"
@@ -37,8 +37,7 @@ Feature: Cart rule (amount) calculation with one cart rule restricted to one pro
     And my cart total using previous calculation method should be 157.4 tax included
 
   Scenario: 3 products in cart, several quantities, one specific 500€ cartRule on product #2
-    Given I have an empty default cart
-    And there is a cart rule "cartrule9" with following properties:
+    Given there is a cart rule "cartrule9" with following properties:
       | name[en-US]                  | reduces $500 for product2 |
       | total_quantity               | 1000                      |
       | quantity_per_user            | 1000                      |
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_mono.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_mono.feature
index c11621cfb72ea..4db7dca444f08 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_mono.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_mono.feature
@@ -21,10 +21,10 @@ Feature: Cart rule (percent) calculation with one cart rule
       | discount_percentage          | 50                     |
       | apply_to_discounted_products | true                   |
       | discount_application_type    | order_without_shipping |
+    And I have an empty default cart
 
   Scenario: one product in cart, quantity 1, one 50% global cartRule
-    Given I have an empty default cart
-    And I add 1 items of product "product1" in my cart
+    Given I add 1 items of product "product1" in my cart
     And my cart total shipping fees should be 7.0 tax included
     And my cart total should be 26.812 tax included
     When I apply the voucher code "foo2"
@@ -32,8 +32,7 @@ Feature: Cart rule (percent) calculation with one cart rule
     And my cart total using previous calculation method should be 16.906 tax included
 
   Scenario: one product in cart, quantity 3, one 50% global cartRule
-    Given I have an empty default cart
-    And I add 3 items of product "product1" in my cart
+    Given I add 3 items of product "product1" in my cart
     And my cart total shipping fees should be 7.0 tax included
     And my cart total should be 66.436 tax included
     When I apply the voucher code "foo2"
@@ -41,8 +40,7 @@ Feature: Cart rule (percent) calculation with one cart rule
     And my cart total using previous calculation method should be 36.718 tax included
 
   Scenario: 3 products in cart, several quantities, one 5€ global cartRule (reduced product at first place)
-    Given I have an empty default cart
-    And I add 3 items of product "product1" in my cart
+    Given I add 3 items of product "product1" in my cart
     And I add 2 items of product "product2" in my cart
     And I add 1 items of product "product3" in my cart
     And my cart total shipping fees should be 7.0 tax included
@@ -52,8 +50,7 @@ Feature: Cart rule (percent) calculation with one cart rule
     Then my cart total using previous calculation method should be 84.7 tax included
 
   Scenario: 1 product in cart, percentage reduction cart rule is applied correctly
-    Given I have an empty default cart
-    And there is a cart rule "cartrule1" with following properties:
+    Given there is a cart rule "cartrule1" with following properties:
       | name[en-US]                  | cartrule1              |
       | total_quantity               | 1000                   |
       | quantity_per_user            | 1000                   |
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_multiple.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_multiple.feature
index d3da5e5331a62..38a511aafd964 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_multiple.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_multiple.feature
@@ -32,10 +32,10 @@ Feature: Cart rule (percent) calculation with multiple cart rules
       | discount_percentage          | 10                     |
       | apply_to_discounted_products | true                   |
       | discount_application_type    | order_without_shipping |
+    And I have an empty default cart
 
   Scenario: one product in cart, quantity 1, 2x % global cartRules
-    Given I have an empty default cart
-    And I add 1 items of product "product1" in my cart
+    Given I add 1 items of product "product1" in my cart
     And my cart total shipping fees should be 7.0 tax included
     And my cart total should be 26.81 tax included
     When I apply the voucher code "foo2"
@@ -48,8 +48,7 @@ Feature: Cart rule (percent) calculation with multiple cart rules
       | cartrule3 | 0.9905    |
 
   Scenario: one product in cart, quantity 3, one 50% global cartRule
-    Given I have an empty default cart
-    And I add 3 items of product "product1" in my cart
+    Given I add 3 items of product "product1" in my cart
     And my cart total shipping fees should be 7.0 tax included
     And my cart total should be 66.44 tax included
     When I apply the voucher code "foo2"
@@ -62,8 +61,7 @@ Feature: Cart rule (percent) calculation with multiple cart rules
       | cartrule3 | 2.972     |
 
   Scenario: 3 products in cart, several quantities, 2x % global cartRules
-    Given I have an empty default cart
-    And I add 2 items of product "product2" in my cart
+    Given I add 2 items of product "product2" in my cart
     And I add 3 items of product "product1" in my cart
     And I add 1 items of product "product3" in my cart
     And my cart total shipping fees should be 7.0 tax included
@@ -79,7 +77,6 @@ Feature: Cart rule (percent) calculation with multiple cart rules
 
   @restore-cart-rules-after-scenario
   Scenario: one product in cart, one cart rule free shipping, one cart rule 10%
-    Given I have an empty default cart
     When I add 1 items of product "product1" in my cart
     # checking cart total and shipping before cart rules exists, to assert that shipping price will be reduced later
     # because when ONLY_SHIPPING is calculated it does not count cart rules
@@ -109,8 +106,7 @@ Feature: Cart rule (percent) calculation with multiple cart rules
       | 10percent    | 1.981     |
 
   Scenario: 2 combinable cart rules are applied correctly
-    Given I have an empty default cart
-    And there is a cart rule "cartrule50" with following properties:
+    Given there is a cart rule "cartrule50" with following properties:
       | name[en-US]                  | cartrule50             |
       | total_quantity               | 1000                   |
       | quantity_per_user            | 1000                   |
@@ -138,7 +134,6 @@ Feature: Cart rule (percent) calculation with multiple cart rules
     Then my cart total should be precisely 13.93 tax included
 
   Scenario: 3 products in cart, several quantities, 2x % global cartRules without codes
-    Given I have an empty default cart
     When I add 2 items of product "product2" in my cart
     And I add 3 items of product "product1" in my cart
     And I add 1 items of product "product3" in my cart
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_specific.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_specific.feature
index e4073883f12df..7c62e40027310 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_specific.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_specific.feature
@@ -8,7 +8,6 @@ Feature: Cart rule (percent) calculation with one cart rule restricted to one pr
 
   Background:
     Given there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
-    And I have an empty default cart
     And shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
     And there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
     And there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
@@ -35,6 +34,7 @@ Feature: Cart rule (percent) calculation with one cart rule restricted to one pr
       | apply_to_discounted_products | true                   |
       | discount_application_type    | order_without_shipping |
     And cart rule "cartrule11" is restricted to product "product2"
+    And I have an empty default cart
 
   Scenario: one product #2 in cart, quantity 3, one specific 50% cartRule on product #2
     Given I add 3 items of product "product2" in my cart
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Restrictions/cart_rule_carrier_restriction.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Restrictions/cart_rule_carrier_restriction.feature
index a5f6a4311f0fc..49e801c0fb7ad 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Restrictions/cart_rule_carrier_restriction.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Restrictions/cart_rule_carrier_restriction.feature
@@ -1,49 +1,45 @@
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags fo-cart-rule-carrier-restriction
 @restore-all-tables-before-feature
+@fo-cart-rule-carrier-restriction
+@clear-cache-before-feature
 Feature: Cart calculation with carrier specific cart rules
   As a customer
   I must be able to have correct cart total when selecting carriers
 
-  Scenario: Empty cart, carrier 1
-    Given I have an empty default cart
-    Given there is a zone named "zone1"
-    Given there is a zone named "zone2"
-    Given there is a country named "country1" and iso code "FR" in zone "zone1"
-    Given there is a country named "country2" and iso code "US" in zone "zone2"
-    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
-    Given there is a state named "state2" with iso code "TEST-2" in country "country2" and zone "zone2"
-    Given there is an address named "address1" with postcode "1" in state "state1"
-    Given there is an address named "address2" with postcode "1" in state "state2"
-    Given there is a carrier named "carrier1"
-    Given carrier "carrier1" applies shipping fees of 3.1 in zone "zone1" for price between 0 and 10000
-    Given carrier "carrier1" applies shipping fees of 4.3 in zone "zone2" for price between 0 and 10000
-    Given there is a carrier named "carrier2"
-    Given carrier "carrier2" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
-    Given carrier "carrier2" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
-    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule1" is restricted to carrier "carrier2"
-    When I select address "address1" in my cart
-    When I select carrier "carrier1" in my cart
-    Then cart shipping fees should be 0.0
-    Then my cart total should be 0.0 tax included
-    Then my cart total using previous calculation method should be 0.0 tax included
+  Background:
+    Given there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
+    And I have an empty default cart
+    And shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
+    And there is a zone named "zone1"
+    And there is a zone named "zone2"
+    And there is a country named "country1" and iso code "FR" in zone "zone1"
+    And there is a country named "country2" and iso code "US" in zone "zone2"
+    And there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
+    And there is a state named "state2" with iso code "TEST-2" in country "country2" and zone "zone2"
+    And there is an address named "address1" with postcode "1" in state "state1"
+    And there is an address named "address2" with postcode "1" in state "state2"
+    And there is a carrier named "carrier1"
+    And carrier "carrier1" applies shipping fees of 3.1 in zone "zone1" for price between 0 and 10000
+    And carrier "carrier1" applies shipping fees of 4.3 in zone "zone2" for price between 0 and 10000
+    And there is a carrier named "carrier2"
+    And carrier "carrier2" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
+    And carrier "carrier2" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
+    And there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+    And there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
+    And there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
+    And there is a cart rule "cartrule1" with following properties:
+      | name[en-US]                  | cartrule1              |
+      | total_quantity               | 1000                   |
+      | quantity_per_user            | 1000                   |
+      | priority                     | 1                      |
+      | free_shipping                | false                  |
+      | code                         | foo                    |
+      | discount_percentage          | 50                     |
+      | apply_to_discounted_products | true                   |
+      | discount_application_type    | order_without_shipping |
+    And cart rule "cartrule1" is restricted to carrier "carrier2"
 
   Scenario: one product in cart, quantity 1, carrier 1
-    Given I have an empty default cart
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a zone named "zone1"
-    Given there is a zone named "zone2"
-    Given there is a country named "country1" and iso code "FR" in zone "zone1"
-    Given there is a country named "country2" and iso code "US" in zone "zone2"
-    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
-    Given there is a state named "state2" with iso code "TEST-2" in country "country2" and zone "zone2"
-    Given there is an address named "address1" with postcode "1" in state "state1"
-    Given there is an address named "address2" with postcode "1" in state "state2"
-    Given there is a carrier named "carrier1"
-    Given carrier "carrier1" applies shipping fees of 3.1 in zone "zone1" for price between 0 and 10000
-    Given carrier "carrier1" applies shipping fees of 4.3 in zone "zone2" for price between 0 and 10000
-    Given there is a carrier named "carrier2"
-    Given carrier "carrier2" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
-    Given carrier "carrier2" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
     Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
     Given cart rule "cartrule1" is restricted to carrier "carrier2"
     When I add 1 items of product "product1" in my cart
@@ -53,200 +49,176 @@ Feature: Cart calculation with carrier specific cart rules
     Then my cart total should be 24.912 tax included
     Then my cart total using previous calculation method should be 24.912 tax included
 
-  Scenario: Empty cart, carrier 2
-    Given I have an empty default cart
-    Given there is a zone named "zone1"
-    Given there is a zone named "zone2"
-    Given there is a country named "country1" and iso code "FR" in zone "zone1"
-    Given there is a country named "country2" and iso code "US" in zone "zone2"
-    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
-    Given there is a state named "state2" with iso code "TEST-2" in country "country2" and zone "zone2"
-    Given there is an address named "address1" with postcode "1" in state "state1"
-    Given there is an address named "address2" with postcode "1" in state "state2"
-    Given there is a carrier named "carrier1"
-    Given carrier "carrier1" applies shipping fees of 3.1 in zone "zone1" for price between 0 and 10000
-    Given carrier "carrier1" applies shipping fees of 4.3 in zone "zone2" for price between 0 and 10000
-    Given there is a carrier named "carrier2"
-    Given carrier "carrier2" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
-    Given carrier "carrier2" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
-    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule1" is restricted to carrier "carrier2"
-    When I select address "address1" in my cart
-    When I select carrier "carrier2" in my cart
-    Then cart shipping fees should be 0.0
-    Then my cart total should be 0.0 tax included
-    Then my cart total using previous calculation method should be 0.0 tax included
-
-  # following is testing the bug http://forge.prestashop.com/browse/BOOM-3307
-  Scenario: one product in cart, quantity 1, carrier 2
-    Given I have an empty default cart
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a zone named "zone1"
-    Given there is a zone named "zone2"
-    Given there is a country named "country1" and iso code "FR" in zone "zone1"
-    Given there is a country named "country2" and iso code "US" in zone "zone2"
-    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
-    Given there is a state named "state2" with iso code "TEST-2" in country "country2" and zone "zone2"
-    Given there is an address named "address1" with postcode "1" in state "state1"
-    Given there is an address named "address2" with postcode "1" in state "state2"
-    Given there is a carrier named "carrier1"
-    Given carrier "carrier1" applies shipping fees of 3.1 in zone "zone1" for price between 0 and 10000
-    Given carrier "carrier1" applies shipping fees of 4.3 in zone "zone2" for price between 0 and 10000
-    Given there is a carrier named "carrier2"
-    Given carrier "carrier2" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
-    Given carrier "carrier2" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
-    Given there is a cart rule named "cartrule1" that applies a percent discount of 55.0% with priority 1, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule1" is restricted to carrier "carrier2"
-    When I add 1 items of product "product1" in my cart
-    When I select address "address1" in my cart
-    When I select carrier "carrier2" in my cart
-    Then cart shipping fees should be 7.7
-    Then my cart total should be 16.6154 tax included
-    Then my cart total using previous calculation method should be 16.6154 tax included
-
-  Scenario: one product in cart, quantity 1, cant apply not corresponding cart rule
-    Given I have an empty default cart
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a zone named "zone1"
-    Given there is a zone named "zone2"
-    Given there is a country named "country1" and iso code "FR" in zone "zone1"
-    Given there is a country named "country2" and iso code "US" in zone "zone2"
-    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
-    Given there is a state named "state2" with iso code "TEST-2" in country "country2" and zone "zone2"
-    Given there is an address named "address1" with postcode "1" in state "state1"
-    Given there is an address named "address2" with postcode "1" in state "state2"
-    Given there is a carrier named "carrier1"
-    Given carrier "carrier1" applies shipping fees of 3.1 in zone "zone1" for price between 0 and 10000
-    Given carrier "carrier1" applies shipping fees of 4.3 in zone "zone2" for price between 0 and 10000
-    Given there is a carrier named "carrier2"
-    Given carrier "carrier2" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
-    Given carrier "carrier2" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
-    Given there is a carrier named "carrier3"
-    Given carrier "carrier3" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
-    Given carrier "carrier3" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
-    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule1" has a discount code "foo"
-    Given cart rule "cartrule1" is restricted to carrier "carrier2"
-    Given there is a cart rule named "cartrule2" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule2" has a discount code "bar"
-    Given cart rule "cartrule2" is restricted to carrier "carrier1"
-    Given there is a cart rule named "cartrule3" that applies a percent discount of 55.0% with priority 3, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule3" is restricted to carrier "carrier3"
-    When I add 1 items of product "product1" in my cart
-    When I select address "address1" in my cart
-    When I select carrier "carrier2" in my cart
-    Then cart rule "cartrule2" cannot be applied to my cart
-
-  Scenario: one product in cart, quantity 1, can apply corresponding cart rule
-    Given I have an empty default cart
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a zone named "zone1"
-    Given there is a zone named "zone2"
-    Given there is a country named "country1" and iso code "FR" in zone "zone1"
-    Given there is a country named "country2" and iso code "US" in zone "zone2"
-    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
-    Given there is a state named "state2" with iso code "TEST-2" in country "country2" and zone "zone2"
-    Given there is an address named "address1" with postcode "1" in state "state1"
-    Given there is an address named "address2" with postcode "1" in state "state2"
-    Given there is a carrier named "carrier1"
-    Given carrier "carrier1" applies shipping fees of 3.1 in zone "zone1" for price between 0 and 10000
-    Given carrier "carrier1" applies shipping fees of 4.3 in zone "zone2" for price between 0 and 10000
-    Given there is a carrier named "carrier2"
-    Given carrier "carrier2" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
-    Given carrier "carrier2" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
-    Given there is a carrier named "carrier3"
-    Given carrier "carrier3" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
-    Given carrier "carrier3" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
-    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule1" has a discount code "foo"
-    Given cart rule "cartrule1" is restricted to carrier "carrier2"
-    Given there is a cart rule named "cartrule2" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule2" has a discount code "bar"
-    Given cart rule "cartrule2" is restricted to carrier "carrier1"
-    Given there is a cart rule named "cartrule3" that applies a percent discount of 55.0% with priority 3, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule3" is restricted to carrier "carrier3"
-    When I add 1 items of product "product1" in my cart
-    When I select address "address1" in my cart
-    When I select carrier "carrier2" in my cart
-    Then cart rule "cartrule1" can be applied to my cart
-    When I use the discount "cartrule1"
-    Then cart rule count in my cart should be 1
-    Then cart rule "cartrule1" cannot be applied to my cart
-    When I use the discount "cartrule1"
-    Then cart rule count in my cart should be 1
-
-  Scenario: one product in cart, quantity 1, can apply corresponding cart rule
-    Given I have an empty default cart
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a zone named "zone1"
-    Given there is a zone named "zone2"
-    Given there is a country named "country1" and iso code "FR" in zone "zone1"
-    Given there is a country named "country2" and iso code "US" in zone "zone2"
-    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
-    Given there is a state named "state2" with iso code "TEST-2" in country "country2" and zone "zone2"
-    Given there is an address named "address1" with postcode "1" in state "state1"
-    Given there is an address named "address2" with postcode "1" in state "state2"
-    Given there is a carrier named "carrier1"
-    Given carrier "carrier1" applies shipping fees of 3.1 in zone "zone1" for price between 0 and 10000
-    Given carrier "carrier1" applies shipping fees of 4.3 in zone "zone2" for price between 0 and 10000
-    Given there is a carrier named "carrier2"
-    Given carrier "carrier2" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
-    Given carrier "carrier2" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
-    Given there is a carrier named "carrier3"
-    Given carrier "carrier3" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
-    Given carrier "carrier3" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
-    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule1" has a discount code "foo"
-    Given cart rule "cartrule1" is restricted to carrier "carrier2"
-    Given there is a cart rule named "cartrule2" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule2" has a discount code "bar"
-    Given cart rule "cartrule2" is restricted to carrier "carrier1"
-    Given there is a cart rule named "cartrule3" that applies a percent discount of 55.0% with priority 3, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule3" is restricted to carrier "carrier3"
-    When I add 1 items of product "product1" in my cart
-    When I select address "address1" in my cart
-    When I select carrier "carrier2" in my cart
-    Then cart rule "cartrule1" can be applied to my cart
-    When I use the discount "cartrule1"
-    Then cart rule count in my cart should be 1
-    Then cart rule "cartrule1" cannot be applied to my cart
-    When I use the discount "cartrule1"
-    When I select carrier "carrier1" in my cart
-    Then cart rule count in my cart should be 0
-
-  Scenario: one product in cart, quantity 1, cart rule without code correctly (un)applied on corresponding carrier
-    Given I have an empty default cart
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a zone named "zone1"
-    Given there is a zone named "zone2"
-    Given there is a country named "country1" and iso code "FR" in zone "zone1"
-    Given there is a country named "country2" and iso code "US" in zone "zone2"
-    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
-    Given there is a state named "state2" with iso code "TEST-2" in country "country2" and zone "zone2"
-    Given there is an address named "address1" with postcode "1" in state "state1"
-    Given there is an address named "address2" with postcode "1" in state "state2"
-    Given there is a carrier named "carrier1"
-    Given carrier "carrier1" applies shipping fees of 3.1 in zone "zone1" for price between 0 and 10000
-    Given carrier "carrier1" applies shipping fees of 4.3 in zone "zone2" for price between 0 and 10000
-    Given there is a carrier named "carrier2"
-    Given carrier "carrier2" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
-    Given carrier "carrier2" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
-    Given there is a carrier named "carrier3"
-    Given carrier "carrier3" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
-    Given carrier "carrier3" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
-    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule1" has a discount code "foo"
-    Given cart rule "cartrule1" is restricted to carrier "carrier2"
-    Given there is a cart rule named "cartrule2" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule2" has a discount code "bar"
-    Given cart rule "cartrule2" is restricted to carrier "carrier1"
-    Given there is a cart rule named "cartrule3" that applies a percent discount of 55.0% with priority 3, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule3" is restricted to carrier "carrier3"
-    When I add 1 items of product "product1" in my cart
-    When I select address "address1" in my cart
-    When I select carrier "carrier2" in my cart
-    Then cart rule count in my cart should be 0
-    When I select carrier "carrier3" in my cart
-    Then cart rule count in my cart should be 1
-    When I select carrier "carrier2" in my cart
-    Then cart rule count in my cart should be 0
+#  # following is testing the bug http://forge.prestashop.com/browse/BOOM-3307
+#  Scenario: one product in cart, quantity 1, carrier 2
+#    Given I have an empty default cart
+#    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+#    Given there is a zone named "zone1"
+#    Given there is a zone named "zone2"
+#    Given there is a country named "country1" and iso code "FR" in zone "zone1"
+#    Given there is a country named "country2" and iso code "US" in zone "zone2"
+#    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
+#    Given there is a state named "state2" with iso code "TEST-2" in country "country2" and zone "zone2"
+#    Given there is an address named "address1" with postcode "1" in state "state1"
+#    Given there is an address named "address2" with postcode "1" in state "state2"
+#    Given there is a carrier named "carrier1"
+#    Given carrier "carrier1" applies shipping fees of 3.1 in zone "zone1" for price between 0 and 10000
+#    Given carrier "carrier1" applies shipping fees of 4.3 in zone "zone2" for price between 0 and 10000
+#    Given there is a carrier named "carrier2"
+#    Given carrier "carrier2" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
+#    Given carrier "carrier2" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
+#    Given there is a cart rule named "cartrule1" that applies a percent discount of 55.0% with priority 1, quantity of 1000 and quantity per user 1000
+#    Given cart rule "cartrule1" is restricted to carrier "carrier2"
+#    When I add 1 items of product "product1" in my cart
+#    When I select address "address1" in my cart
+#    When I select carrier "carrier2" in my cart
+#    Then cart shipping fees should be 7.7
+#    Then my cart total should be 16.6154 tax included
+#    Then my cart total using previous calculation method should be 16.6154 tax included
+#
+#  Scenario: one product in cart, quantity 1, cant apply not corresponding cart rule
+#    Given I have an empty default cart
+#    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+#    Given there is a zone named "zone1"
+#    Given there is a zone named "zone2"
+#    Given there is a country named "country1" and iso code "FR" in zone "zone1"
+#    Given there is a country named "country2" and iso code "US" in zone "zone2"
+#    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
+#    Given there is a state named "state2" with iso code "TEST-2" in country "country2" and zone "zone2"
+#    Given there is an address named "address1" with postcode "1" in state "state1"
+#    Given there is an address named "address2" with postcode "1" in state "state2"
+#    Given there is a carrier named "carrier1"
+#    Given carrier "carrier1" applies shipping fees of 3.1 in zone "zone1" for price between 0 and 10000
+#    Given carrier "carrier1" applies shipping fees of 4.3 in zone "zone2" for price between 0 and 10000
+#    Given there is a carrier named "carrier2"
+#    Given carrier "carrier2" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
+#    Given carrier "carrier2" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
+#    Given there is a carrier named "carrier3"
+#    Given carrier "carrier3" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
+#    Given carrier "carrier3" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
+#    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
+#    Given cart rule "cartrule1" has a discount code "foo"
+#    Given cart rule "cartrule1" is restricted to carrier "carrier2"
+#    Given there is a cart rule named "cartrule2" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
+#    Given cart rule "cartrule2" has a discount code "bar"
+#    Given cart rule "cartrule2" is restricted to carrier "carrier1"
+#    Given there is a cart rule named "cartrule3" that applies a percent discount of 55.0% with priority 3, quantity of 1000 and quantity per user 1000
+#    Given cart rule "cartrule3" is restricted to carrier "carrier3"
+#    When I add 1 items of product "product1" in my cart
+#    When I select address "address1" in my cart
+#    When I select carrier "carrier2" in my cart
+#    Then cart rule "cartrule2" cannot be applied to my cart
+#
+#  Scenario: one product in cart, quantity 1, can apply corresponding cart rule
+#    Given I have an empty default cart
+#    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+#    Given there is a zone named "zone1"
+#    Given there is a zone named "zone2"
+#    Given there is a country named "country1" and iso code "FR" in zone "zone1"
+#    Given there is a country named "country2" and iso code "US" in zone "zone2"
+#    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
+#    Given there is a state named "state2" with iso code "TEST-2" in country "country2" and zone "zone2"
+#    Given there is an address named "address1" with postcode "1" in state "state1"
+#    Given there is an address named "address2" with postcode "1" in state "state2"
+#    Given there is a carrier named "carrier1"
+#    Given carrier "carrier1" applies shipping fees of 3.1 in zone "zone1" for price between 0 and 10000
+#    Given carrier "carrier1" applies shipping fees of 4.3 in zone "zone2" for price between 0 and 10000
+#    Given there is a carrier named "carrier2"
+#    Given carrier "carrier2" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
+#    Given carrier "carrier2" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
+#    Given there is a carrier named "carrier3"
+#    Given carrier "carrier3" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
+#    Given carrier "carrier3" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
+#    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
+#    Given cart rule "cartrule1" has a discount code "foo"
+#    Given cart rule "cartrule1" is restricted to carrier "carrier2"
+#    Given there is a cart rule named "cartrule2" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
+#    Given cart rule "cartrule2" has a discount code "bar"
+#    Given cart rule "cartrule2" is restricted to carrier "carrier1"
+#    Given there is a cart rule named "cartrule3" that applies a percent discount of 55.0% with priority 3, quantity of 1000 and quantity per user 1000
+#    Given cart rule "cartrule3" is restricted to carrier "carrier3"
+#    When I add 1 items of product "product1" in my cart
+#    When I select address "address1" in my cart
+#    When I select carrier "carrier2" in my cart
+#    Then cart rule "cartrule1" can be applied to my cart
+#    When I use the discount "cartrule1"
+#    Then cart rule count in my cart should be 1
+#    Then cart rule "cartrule1" cannot be applied to my cart
+#    When I use the discount "cartrule1"
+#    Then cart rule count in my cart should be 1
+#
+#  Scenario: one product in cart, quantity 1, can apply corresponding cart rule
+#    Given I have an empty default cart
+#    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+#    Given there is a zone named "zone1"
+#    Given there is a zone named "zone2"
+#    Given there is a country named "country1" and iso code "FR" in zone "zone1"
+#    Given there is a country named "country2" and iso code "US" in zone "zone2"
+#    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
+#    Given there is a state named "state2" with iso code "TEST-2" in country "country2" and zone "zone2"
+#    Given there is an address named "address1" with postcode "1" in state "state1"
+#    Given there is an address named "address2" with postcode "1" in state "state2"
+#    Given there is a carrier named "carrier1"
+#    Given carrier "carrier1" applies shipping fees of 3.1 in zone "zone1" for price between 0 and 10000
+#    Given carrier "carrier1" applies shipping fees of 4.3 in zone "zone2" for price between 0 and 10000
+#    Given there is a carrier named "carrier2"
+#    Given carrier "carrier2" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
+#    Given carrier "carrier2" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
+#    Given there is a carrier named "carrier3"
+#    Given carrier "carrier3" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
+#    Given carrier "carrier3" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
+#    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
+#    Given cart rule "cartrule1" has a discount code "foo"
+#    Given cart rule "cartrule1" is restricted to carrier "carrier2"
+#    Given there is a cart rule named "cartrule2" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
+#    Given cart rule "cartrule2" has a discount code "bar"
+#    Given cart rule "cartrule2" is restricted to carrier "carrier1"
+#    Given there is a cart rule named "cartrule3" that applies a percent discount of 55.0% with priority 3, quantity of 1000 and quantity per user 1000
+#    Given cart rule "cartrule3" is restricted to carrier "carrier3"
+#    When I add 1 items of product "product1" in my cart
+#    When I select address "address1" in my cart
+#    When I select carrier "carrier2" in my cart
+#    Then cart rule "cartrule1" can be applied to my cart
+#    When I use the discount "cartrule1"
+#    Then cart rule count in my cart should be 1
+#    Then cart rule "cartrule1" cannot be applied to my cart
+#    When I use the discount "cartrule1"
+#    When I select carrier "carrier1" in my cart
+#    Then cart rule count in my cart should be 0
+#
+#  Scenario: one product in cart, quantity 1, cart rule without code correctly (un)applied on corresponding carrier
+#    Given I have an empty default cart
+#    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+#    Given there is a zone named "zone1"
+#    Given there is a zone named "zone2"
+#    Given there is a country named "country1" and iso code "FR" in zone "zone1"
+#    Given there is a country named "country2" and iso code "US" in zone "zone2"
+#    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
+#    Given there is a state named "state2" with iso code "TEST-2" in country "country2" and zone "zone2"
+#    Given there is an address named "address1" with postcode "1" in state "state1"
+#    Given there is an address named "address2" with postcode "1" in state "state2"
+#    Given there is a carrier named "carrier1"
+#    Given carrier "carrier1" applies shipping fees of 3.1 in zone "zone1" for price between 0 and 10000
+#    Given carrier "carrier1" applies shipping fees of 4.3 in zone "zone2" for price between 0 and 10000
+#    Given there is a carrier named "carrier2"
+#    Given carrier "carrier2" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
+#    Given carrier "carrier2" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
+#    Given there is a carrier named "carrier3"
+#    Given carrier "carrier3" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
+#    Given carrier "carrier3" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
+#    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
+#    Given cart rule "cartrule1" has a discount code "foo"
+#    Given cart rule "cartrule1" is restricted to carrier "carrier2"
+#    Given there is a cart rule named "cartrule2" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
+#    Given cart rule "cartrule2" has a discount code "bar"
+#    Given cart rule "cartrule2" is restricted to carrier "carrier1"
+#    Given there is a cart rule named "cartrule3" that applies a percent discount of 55.0% with priority 3, quantity of 1000 and quantity per user 1000
+#    Given cart rule "cartrule3" is restricted to carrier "carrier3"
+#    When I add 1 items of product "product1" in my cart
+#    When I select address "address1" in my cart
+#    When I select carrier "carrier2" in my cart
+#    Then cart rule count in my cart should be 0
+#    When I select carrier "carrier3" in my cart
+#    Then cart rule count in my cart should be 1
+#    When I select carrier "carrier2" in my cart
+#    Then cart rule count in my cart should be 0
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature
index 8c88d6ed4b971..e1cafba3ab79d 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature
@@ -45,29 +45,64 @@ Feature: Cart rule application is validated before it is applied to cart
     And discount code "foo2" is not applied to my cart
     And discount code "foo3" is not applied to my cart
     And I should have 0 different products in my cart
-    And my cart total shipping fees should be 0.0 tax excluded
+    And my cart total shipping fees should be 0.0 tax included
     And my cart total should be 0.0 tax included
     # try applying percentage discount
     When I apply the voucher code "foo1"
     Then I should get cart rule validation error saying "Cart is empty"
     And discount code "foo1" is not applied to my cart
     And I should have 0 products in my cart
-    And my cart total shipping fees should be 0.0 tax excluded
+    And my cart total shipping fees should be 0.0 tax included
     And my cart total should be 0.0 tax included
     # try applying amount discount
     When I apply the voucher code "foo2"
     Then I should get cart rule validation error saying "Cart is empty"
     And discount code "foo2" is not applied to my cart
     And I should have 0 products in my cart
-    And my cart total shipping fees should be 0.0 tax excluded
+    And my cart total shipping fees should be 0.0 tax included
     And my cart total should be 0.0 tax included
     # try applying free shipping discount
     When I apply the voucher code "foo3"
     Then I should get cart rule validation error saying "Cart is empty"
     And discount code "foo3" is not applied to my cart
     And I should have 0 products in my cart
-    And my cart total shipping fees should be 0.0 tax excluded
+    And my cart total shipping fees should be 0.0 tax included
     And my cart total should be 0.0 tax included
+    # try applying cart rule restricted to carrier
+    Given I have an empty default cart
+    And there is a cart rule "cart_rule_4" with following properties:
+      | name[en-US]                  | cart_rule_4            |
+      | total_quantity               | 10                     |
+      | quantity_per_user            | 10                     |
+      | free_shipping                | false                  |
+      | free_shipping                | true                   |
+      | code                         | rule_carrier1          |
+      | discount_percentage          | 50                     |
+      | apply_to_discounted_products | true                   |
+      | discount_application_type    | order_without_shipping |
+    And there is a carrier named "carrier1"
+    And cart rule "cart_rule_4" is restricted to carrier "carrier1"
+    And I select carrier "carrier1" in my cart
+    And I should have 0 products in my cart
+    When I apply the voucher code "foo3"
+    Then I should get cart rule validation error saying "Cart is empty"
+
+  @restore-cart-rules-after-scenario
+  Scenario: Cart rule without code is not applied when cart is empty
+    Given I have an empty default cart
+    And my cart total shipping fees should be 0.0 tax included
+    And my cart total should be 0.0 tax included
+    And I should have 0 products in my cart
+    When there is a cart rule "cart_rule_5" with following properties:
+      | name[en-US]       | cart_rule_5 |
+      | total_quantity    | 10          |
+      | quantity_per_user | 10          |
+      | free_shipping     | false       |
+      | free_shipping     | false       |
+      | gift_product      | product1    |
+    Then my cart total shipping fees should be 0.0 tax included
+    And my cart total should be 0.0 tax included
+    And I should have 0 products in my cart
 
   Scenario: Cart rule cannot be applied again when it is already in the cart
     Given I have an empty default cart

From bb099bcc06712ce14c6f00be9af9cb9e2a0e7b0f Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Mon, 22 May 2023 17:27:52 +0300
Subject: [PATCH 0240/1030]  clean up carrier restriction feature scenarios

---
 .../cart_rule_carrier_restriction.feature     | 292 +++++++-----------
 .../FrontOffice/cart_rule_validation.feature  |   2 -
 2 files changed, 113 insertions(+), 181 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Restrictions/cart_rule_carrier_restriction.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Restrictions/cart_rule_carrier_restriction.feature
index 49e801c0fb7ad..85c95c436446c 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Restrictions/cart_rule_carrier_restriction.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Restrictions/cart_rule_carrier_restriction.feature
@@ -9,6 +9,7 @@ Feature: Cart calculation with carrier specific cart rules
   Background:
     Given there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
     And I have an empty default cart
+    And shipping handling fees are set to 2.0
     And shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
     And there is a zone named "zone1"
     And there is a zone named "zone2"
@@ -24,6 +25,7 @@ Feature: Cart calculation with carrier specific cart rules
     And there is a carrier named "carrier2"
     And carrier "carrier2" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
     And carrier "carrier2" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
+    And there is a carrier named "carrier3"
     And there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
     And there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
     And there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
@@ -38,187 +40,119 @@ Feature: Cart calculation with carrier specific cart rules
       | apply_to_discounted_products | true                   |
       | discount_application_type    | order_without_shipping |
     And cart rule "cartrule1" is restricted to carrier "carrier2"
+    And there is a cart rule "cartrule2" with following properties:
+      | name[en-US]                  | cartrule2              |
+      | total_quantity               | 1000                   |
+      | quantity_per_user            | 1000                   |
+      | priority                     | 2                      |
+      | free_shipping                | false                  |
+      | code                         | bar                    |
+      | discount_percentage          | 50                     |
+      | apply_to_discounted_products | true                   |
+      | discount_application_type    | order_without_shipping |
+    And cart rule "cartrule2" is restricted to carrier "carrier1"
 
-  Scenario: one product in cart, quantity 1, carrier 1
-    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule1" is restricted to carrier "carrier2"
+  Scenario: I cannot use voucher when it is restricted to specific carrier and that carrier is not selected
     When I add 1 items of product "product1" in my cart
-    When I select address "address1" in my cart
+    And I select address "address1" in my cart
+    And I select carrier "carrier1" in my cart
+    And cart shipping fees should be 5.1
+    And my cart total shipping fees should be 5.1 tax included
+    And my cart total should be 24.912 tax included
+    When I apply the voucher code "foo"
+    Then I should get cart rule validation error saying "You cannot use this voucher with this carrier"
+    And my cart total should be 24.912 tax included
+    And cart shipping fees should be 5.1
+
+  @restore-cart-rules-after-scenario
+  Scenario: Free shipping cart rule without code is applied to cart automatically when restricted carrier is selected
+    Given there is a cart rule "cartrule10" with following properties:
+      | name[en-US]       | cartrule10 |
+      | total_quantity    | 1000       |
+      | quantity_per_user | 1000       |
+      | priority          | 1          |
+      | free_shipping     | true       |
+    And cart rule "cartrule10" is restricted to carrier "carrier2"
+    When I add 1 items of product "product1" in my cart
+    And I select address "address1" in my cart
+    And I select carrier "carrier1" in my cart
+    Then cart shipping fees should be 5.1
+    And my cart total should be 24.912 tax included
+    When I select carrier "carrier2" in my cart
+    Then cart shipping fees should be 7.7
+    And my cart total should be 19.812 tax included
+
+  @restore-cart-rules-after-scenario
+  Scenario: Percentage cart rule without code is applied to cart automatically when restricted carrier is selected
+    Given there is a cart rule "cartrule11" with following properties:
+      | name[en-US]                  | cartrule11             |
+      | total_quantity               | 1000                   |
+      | quantity_per_user            | 1000                   |
+      | priority                     | 1                      |
+      | free_shipping                | false                  |
+      | discount_percentage          | 55                     |
+      | apply_to_discounted_products | true                   |
+      | discount_application_type    | order_without_shipping |
+    And cart rule "cartrule11" is restricted to carrier "carrier2"
+    When I add 1 items of product "product1" in my cart
+    And I select address "address1" in my cart
     When I select carrier "carrier1" in my cart
     Then cart shipping fees should be 5.1
-    Then my cart total should be 24.912 tax included
-    Then my cart total using previous calculation method should be 24.912 tax included
+    And my cart total should be 24.912 tax included
+    When I select carrier "carrier2" in my cart
+    Then cart shipping fees should be 7.7
+    Then my cart total should be 16.6154 tax included
 
-#  # following is testing the bug http://forge.prestashop.com/browse/BOOM-3307
-#  Scenario: one product in cart, quantity 1, carrier 2
-#    Given I have an empty default cart
-#    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-#    Given there is a zone named "zone1"
-#    Given there is a zone named "zone2"
-#    Given there is a country named "country1" and iso code "FR" in zone "zone1"
-#    Given there is a country named "country2" and iso code "US" in zone "zone2"
-#    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
-#    Given there is a state named "state2" with iso code "TEST-2" in country "country2" and zone "zone2"
-#    Given there is an address named "address1" with postcode "1" in state "state1"
-#    Given there is an address named "address2" with postcode "1" in state "state2"
-#    Given there is a carrier named "carrier1"
-#    Given carrier "carrier1" applies shipping fees of 3.1 in zone "zone1" for price between 0 and 10000
-#    Given carrier "carrier1" applies shipping fees of 4.3 in zone "zone2" for price between 0 and 10000
-#    Given there is a carrier named "carrier2"
-#    Given carrier "carrier2" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
-#    Given carrier "carrier2" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
-#    Given there is a cart rule named "cartrule1" that applies a percent discount of 55.0% with priority 1, quantity of 1000 and quantity per user 1000
-#    Given cart rule "cartrule1" is restricted to carrier "carrier2"
-#    When I add 1 items of product "product1" in my cart
-#    When I select address "address1" in my cart
-#    When I select carrier "carrier2" in my cart
-#    Then cart shipping fees should be 7.7
-#    Then my cart total should be 16.6154 tax included
-#    Then my cart total using previous calculation method should be 16.6154 tax included
-#
-#  Scenario: one product in cart, quantity 1, cant apply not corresponding cart rule
-#    Given I have an empty default cart
-#    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-#    Given there is a zone named "zone1"
-#    Given there is a zone named "zone2"
-#    Given there is a country named "country1" and iso code "FR" in zone "zone1"
-#    Given there is a country named "country2" and iso code "US" in zone "zone2"
-#    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
-#    Given there is a state named "state2" with iso code "TEST-2" in country "country2" and zone "zone2"
-#    Given there is an address named "address1" with postcode "1" in state "state1"
-#    Given there is an address named "address2" with postcode "1" in state "state2"
-#    Given there is a carrier named "carrier1"
-#    Given carrier "carrier1" applies shipping fees of 3.1 in zone "zone1" for price between 0 and 10000
-#    Given carrier "carrier1" applies shipping fees of 4.3 in zone "zone2" for price between 0 and 10000
-#    Given there is a carrier named "carrier2"
-#    Given carrier "carrier2" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
-#    Given carrier "carrier2" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
-#    Given there is a carrier named "carrier3"
-#    Given carrier "carrier3" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
-#    Given carrier "carrier3" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
-#    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-#    Given cart rule "cartrule1" has a discount code "foo"
-#    Given cart rule "cartrule1" is restricted to carrier "carrier2"
-#    Given there is a cart rule named "cartrule2" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
-#    Given cart rule "cartrule2" has a discount code "bar"
-#    Given cart rule "cartrule2" is restricted to carrier "carrier1"
-#    Given there is a cart rule named "cartrule3" that applies a percent discount of 55.0% with priority 3, quantity of 1000 and quantity per user 1000
-#    Given cart rule "cartrule3" is restricted to carrier "carrier3"
-#    When I add 1 items of product "product1" in my cart
-#    When I select address "address1" in my cart
-#    When I select carrier "carrier2" in my cart
-#    Then cart rule "cartrule2" cannot be applied to my cart
-#
-#  Scenario: one product in cart, quantity 1, can apply corresponding cart rule
-#    Given I have an empty default cart
-#    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-#    Given there is a zone named "zone1"
-#    Given there is a zone named "zone2"
-#    Given there is a country named "country1" and iso code "FR" in zone "zone1"
-#    Given there is a country named "country2" and iso code "US" in zone "zone2"
-#    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
-#    Given there is a state named "state2" with iso code "TEST-2" in country "country2" and zone "zone2"
-#    Given there is an address named "address1" with postcode "1" in state "state1"
-#    Given there is an address named "address2" with postcode "1" in state "state2"
-#    Given there is a carrier named "carrier1"
-#    Given carrier "carrier1" applies shipping fees of 3.1 in zone "zone1" for price between 0 and 10000
-#    Given carrier "carrier1" applies shipping fees of 4.3 in zone "zone2" for price between 0 and 10000
-#    Given there is a carrier named "carrier2"
-#    Given carrier "carrier2" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
-#    Given carrier "carrier2" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
-#    Given there is a carrier named "carrier3"
-#    Given carrier "carrier3" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
-#    Given carrier "carrier3" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
-#    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-#    Given cart rule "cartrule1" has a discount code "foo"
-#    Given cart rule "cartrule1" is restricted to carrier "carrier2"
-#    Given there is a cart rule named "cartrule2" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
-#    Given cart rule "cartrule2" has a discount code "bar"
-#    Given cart rule "cartrule2" is restricted to carrier "carrier1"
-#    Given there is a cart rule named "cartrule3" that applies a percent discount of 55.0% with priority 3, quantity of 1000 and quantity per user 1000
-#    Given cart rule "cartrule3" is restricted to carrier "carrier3"
-#    When I add 1 items of product "product1" in my cart
-#    When I select address "address1" in my cart
-#    When I select carrier "carrier2" in my cart
-#    Then cart rule "cartrule1" can be applied to my cart
-#    When I use the discount "cartrule1"
-#    Then cart rule count in my cart should be 1
-#    Then cart rule "cartrule1" cannot be applied to my cart
-#    When I use the discount "cartrule1"
-#    Then cart rule count in my cart should be 1
-#
-#  Scenario: one product in cart, quantity 1, can apply corresponding cart rule
-#    Given I have an empty default cart
-#    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-#    Given there is a zone named "zone1"
-#    Given there is a zone named "zone2"
-#    Given there is a country named "country1" and iso code "FR" in zone "zone1"
-#    Given there is a country named "country2" and iso code "US" in zone "zone2"
-#    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
-#    Given there is a state named "state2" with iso code "TEST-2" in country "country2" and zone "zone2"
-#    Given there is an address named "address1" with postcode "1" in state "state1"
-#    Given there is an address named "address2" with postcode "1" in state "state2"
-#    Given there is a carrier named "carrier1"
-#    Given carrier "carrier1" applies shipping fees of 3.1 in zone "zone1" for price between 0 and 10000
-#    Given carrier "carrier1" applies shipping fees of 4.3 in zone "zone2" for price between 0 and 10000
-#    Given there is a carrier named "carrier2"
-#    Given carrier "carrier2" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
-#    Given carrier "carrier2" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
-#    Given there is a carrier named "carrier3"
-#    Given carrier "carrier3" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
-#    Given carrier "carrier3" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
-#    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-#    Given cart rule "cartrule1" has a discount code "foo"
-#    Given cart rule "cartrule1" is restricted to carrier "carrier2"
-#    Given there is a cart rule named "cartrule2" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
-#    Given cart rule "cartrule2" has a discount code "bar"
-#    Given cart rule "cartrule2" is restricted to carrier "carrier1"
-#    Given there is a cart rule named "cartrule3" that applies a percent discount of 55.0% with priority 3, quantity of 1000 and quantity per user 1000
-#    Given cart rule "cartrule3" is restricted to carrier "carrier3"
-#    When I add 1 items of product "product1" in my cart
-#    When I select address "address1" in my cart
-#    When I select carrier "carrier2" in my cart
-#    Then cart rule "cartrule1" can be applied to my cart
-#    When I use the discount "cartrule1"
-#    Then cart rule count in my cart should be 1
-#    Then cart rule "cartrule1" cannot be applied to my cart
-#    When I use the discount "cartrule1"
-#    When I select carrier "carrier1" in my cart
-#    Then cart rule count in my cart should be 0
-#
-#  Scenario: one product in cart, quantity 1, cart rule without code correctly (un)applied on corresponding carrier
-#    Given I have an empty default cart
-#    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-#    Given there is a zone named "zone1"
-#    Given there is a zone named "zone2"
-#    Given there is a country named "country1" and iso code "FR" in zone "zone1"
-#    Given there is a country named "country2" and iso code "US" in zone "zone2"
-#    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
-#    Given there is a state named "state2" with iso code "TEST-2" in country "country2" and zone "zone2"
-#    Given there is an address named "address1" with postcode "1" in state "state1"
-#    Given there is an address named "address2" with postcode "1" in state "state2"
-#    Given there is a carrier named "carrier1"
-#    Given carrier "carrier1" applies shipping fees of 3.1 in zone "zone1" for price between 0 and 10000
-#    Given carrier "carrier1" applies shipping fees of 4.3 in zone "zone2" for price between 0 and 10000
-#    Given there is a carrier named "carrier2"
-#    Given carrier "carrier2" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
-#    Given carrier "carrier2" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
-#    Given there is a carrier named "carrier3"
-#    Given carrier "carrier3" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
-#    Given carrier "carrier3" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
-#    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-#    Given cart rule "cartrule1" has a discount code "foo"
-#    Given cart rule "cartrule1" is restricted to carrier "carrier2"
-#    Given there is a cart rule named "cartrule2" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
-#    Given cart rule "cartrule2" has a discount code "bar"
-#    Given cart rule "cartrule2" is restricted to carrier "carrier1"
-#    Given there is a cart rule named "cartrule3" that applies a percent discount of 55.0% with priority 3, quantity of 1000 and quantity per user 1000
-#    Given cart rule "cartrule3" is restricted to carrier "carrier3"
-#    When I add 1 items of product "product1" in my cart
-#    When I select address "address1" in my cart
-#    When I select carrier "carrier2" in my cart
-#    Then cart rule count in my cart should be 0
-#    When I select carrier "carrier3" in my cart
-#    Then cart rule count in my cart should be 1
-#    When I select carrier "carrier2" in my cart
-#    Then cart rule count in my cart should be 0
+  @restore-cart-rules-after-scenario
+  Scenario: Amount cart rule without code is applied to cart automatically when restricted carrier is selected
+    Given there is a cart rule "cartrule12" with following properties:
+      | name[en-US]                  | cartrule12             |
+      | total_quantity               | 1000                   |
+      | quantity_per_user            | 1000                   |
+      | priority                     | 1                      |
+      | free_shipping                | false                  |
+      | discount_amount              | 10                     |
+      | discount_currency            | usd                    |
+      | discount_includes_tax        | false                  |
+      | apply_to_discounted_products | true                   |
+      | discount_application_type    | order_without_shipping |
+    And cart rule "cartrule12" is restricted to carrier "carrier2"
+    When I add 1 items of product "product1" in my cart
+    And I select address "address1" in my cart
+    When I select carrier "carrier1" in my cart
+    Then cart shipping fees should be 5.1
+    And my cart total should be 24.912 tax included
+    When I select carrier "carrier2" in my cart
+    Then cart shipping fees should be 7.7
+    And my cart total should be 17.5 tax included
+
+  Scenario: one product in cart, quantity 1, can apply corresponding cart rule
+    Given carrier "carrier3" applies shipping fees of 6.7 in zone "zone1" for price between 0 and 10000
+    Given carrier "carrier3" applies shipping fees of 7.2 in zone "zone2" for price between 0 and 10000
+    Given there is a cart rule named "cartrule3" that applies a percent discount of 55.0% with priority 3, quantity of 1000 and quantity per user 1000
+    Given there is a cart rule "cartrule3" with following properties:
+      | name[en-US]                  | cartrule3              |
+      | total_quantity               | 1000                   |
+      | quantity_per_user            | 1000                   |
+      | priority                     | 3                      |
+      | free_shipping                | false                  |
+      | discount_percentage          | 55                     |
+      | apply_to_discounted_products | true                   |
+      | discount_application_type    | order_without_shipping |
+    And cart rule "cartrule3" is restricted to carrier "carrier3"
+    When I add 1 items of product "product1" in my cart
+    When I select address "address1" in my cart
+    When I select carrier "carrier2" in my cart
+    When I apply the voucher code "foo"
+    Then cart shipping fees should be 7.7
+    And my cart total should be 17.6 tax included
+    When I select carrier "carrier1" in my cart
+    Then cart rule count in my cart should be 0
+    And my cart total should be 24.912 tax included
+    When I select carrier "carrier3" in my cart
+    Then cart shipping fees should be 8.7
+    And cart rule count in my cart should be 1
+    And my cart total should be 17.6 tax included
+    When I select carrier "carrier2" in my cart
+    Then cart rule count in my cart should be 0
+    And my cart total should be 27.5 tax included
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature
index e1cafba3ab79d..81aa048ea9cf7 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature
@@ -186,5 +186,3 @@ Feature: Cart rule application is validated before it is applied to cart
     When I apply the voucher code "cartruleFreeShip"
     Then I should get cart rule validation error saying "You cannot use this voucher with these products"
     And my cart total should be 39.4 tax included
-
-

From e7c54e2283735920d27312fc63ef3a72dae1975b Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Mon, 22 May 2023 18:03:53 +0300
Subject: [PATCH 0241/1030]  cleanup cart rule country restriction and carrier
 feature

---
 .../CommandHandler/EditCartRuleHandler.php    |   5 +-
 .../Context/CartRuleFeatureContext.php        |  20 +-
 .../cart_rule_carrier_restriction.feature     |   5 +-
 .../cart_rule_country_restriction.feature     |  87 ++--
 .../Cart/CartRule/FrontOffice/carrier.feature | 448 ++++++++----------
 5 files changed, 249 insertions(+), 316 deletions(-)

diff --git a/src/Adapter/CartRule/CommandHandler/EditCartRuleHandler.php b/src/Adapter/CartRule/CommandHandler/EditCartRuleHandler.php
index 19f98dcb4b3c0..295d459d1b1ce 100644
--- a/src/Adapter/CartRule/CommandHandler/EditCartRuleHandler.php
+++ b/src/Adapter/CartRule/CommandHandler/EditCartRuleHandler.php
@@ -134,8 +134,9 @@ private function fillConditions(CartRule $cartRule, EditCartRuleCommand $command
             $cartRule->date_to = $command->getValidTo()->format(DateTimeUtil::DEFAULT_DATETIME_FORMAT);
             $updatableProperties[] = 'date_to';
         }
-        if (null !== $command->getMinimumAmount()) {
-            $minimumAmount = $command->getMinimumAmount();
+
+        $minimumAmount = $command->getMinimumAmount();
+        if (null !== $minimumAmount) {
             $cartRule->minimum_amount = (float) (string) $minimumAmount->getAmount();
             $cartRule->minimum_amount_currency = $minimumAmount->getCurrencyId()->getValue();
             $cartRule->minimum_amount_tax = $minimumAmount->isTaxIncluded();
diff --git a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
index 8523bde3acd4e..b419e862b5a55 100644
--- a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
@@ -297,16 +297,26 @@ public function cartRuleNamedIsRestrictedToCarrierNamed($cartRuleName, $carrierN
      */
     public function cartRuleNamedIsRestrictedToCountryNamed(string $cartRuleName, string $country)
     {
-        $this->checkCartRuleWithNameExists($cartRuleName);
         $this->countryFeatureContext->checkCountryWithIsoCodeExists($country);
-        $this->cartRules[$cartRuleName]->country_restriction = true;
-        $this->cartRules[$cartRuleName]->save();
 
-        $idCartRule = (int) $this->cartRules[$cartRuleName]->id;
+        if ($this->getSharedStorage()->exists($cartRuleName)) {
+            //@todo: This allows applying this step to cart rule that was created with a step using CQRS command and saved to shared storage
+            //       it is not ideal, but for now it should work, until restrictions are migrated.
+            $cartRuleId = $this->getSharedStorage()->get($cartRuleName);
+        } else {
+            $this->checkCartRuleWithNameExists($cartRuleName);
+            $cartRuleId = (int) $this->cartRules[$cartRuleName]->id;
+        }
+
+        $cartRule = new CartRule($cartRuleId);
+        $cartRule->country_restriction = true;
+        $cartRule->save();
+        $this->cartRules[$cartRuleName] = $cartRule;
+
         $idCountry = (int) $this->countryFeatureContext->getCountryWithIsoCode($country);
         Db::getInstance()->execute(
             'INSERT INTO ' . _DB_PREFIX_ . 'cart_rule_country(`id_cart_rule`, `id_country`) ' .
-            'VALUES(' . $idCartRule . ', ' . $idCountry . ')'
+            'VALUES(' . $cartRuleId . ', ' . $idCountry . ')'
         );
         Cache::clear();
     }
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Restrictions/cart_rule_carrier_restriction.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Restrictions/cart_rule_carrier_restriction.feature
index 85c95c436446c..1b00ae367151d 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Restrictions/cart_rule_carrier_restriction.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Restrictions/cart_rule_carrier_restriction.feature
@@ -128,9 +128,8 @@ Feature: Cart calculation with carrier specific cart rules
 
   Scenario: one product in cart, quantity 1, can apply corresponding cart rule
     Given carrier "carrier3" applies shipping fees of 6.7 in zone "zone1" for price between 0 and 10000
-    Given carrier "carrier3" applies shipping fees of 7.2 in zone "zone2" for price between 0 and 10000
-    Given there is a cart rule named "cartrule3" that applies a percent discount of 55.0% with priority 3, quantity of 1000 and quantity per user 1000
-    Given there is a cart rule "cartrule3" with following properties:
+    And carrier "carrier3" applies shipping fees of 7.2 in zone "zone2" for price between 0 and 10000
+    And there is a cart rule "cartrule3" with following properties:
       | name[en-US]                  | cartrule3              |
       | total_quantity               | 1000                   |
       | quantity_per_user            | 1000                   |
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Restrictions/cart_rule_country_restriction.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Restrictions/cart_rule_country_restriction.feature
index 1bfa7048d51b2..3e37b260bd24c 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Restrictions/cart_rule_country_restriction.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Restrictions/cart_rule_country_restriction.feature
@@ -1,56 +1,57 @@
-# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags calculation-country-cart-rule-specific
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags fo-cart-rule-country-restriction
 
 @restore-all-tables-before-feature
-@calculation-country-cart-rule-specific
+@fo-cart-rule-country-restriction
 Feature: Cart calculation with country specific cart rules
   As a customer
   I must be able to have correct cart total when selecting country
 
+  Background:
+    Given there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
+    And I have an empty default cart
+    And shipping handling fees are set to 2.0
+    And shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
+    And there is a zone named "Europe"
+    And there is a zone named "North America"
+    And there is a country named "France" and iso code "FR" in zone "Europe"
+    And there is a country named "United States of America" and iso code "US" in zone "North America"
+    And there is a state named "state-fr" with iso code "TEST-FR" in country "France" and zone "Europe"
+    And there is a state named "state-us" with iso code "TEST-US" in country "United States of America" and zone "North America"
+    And there is an address named "address-fr" with postcode "1" in state "state-fr"
+    And there is an address named "address-us" with postcode "1" in state "state-us"
+    And there is a carrier named "carrier1"
+    And carrier "carrier1" applies shipping fees of 12.3 in zone "Europe" for price between 0 and 10000
+    And carrier "carrier1" applies shipping fees of 45.6 in zone "North America" for price between 0 and 10000
+    And there is a cart rule "cartrule1" with following properties:
+      | name[en-US]                  | cartrule1              |
+      | total_quantity               | 1000                   |
+      | quantity_per_user            | 1000                   |
+      | priority                     | 1                      |
+      | free_shipping                | false                  |
+      | discount_amount              | 7.8                    |
+      | discount_currency            | usd                    |
+      | discount_includes_tax        | false                  |
+      | apply_to_discounted_products | true                   |
+      | discount_application_type    | order_without_shipping |
+    And cart rule "cartrule1" is restricted to country "FR"
+    And there is a product in the catalog named "Product1" with a price of 90.12 and 100 items in stock
+
   Scenario: Cart with a Product And address restricted by cart rule
-    Given I have an empty default cart
-      And there is a zone named "Europe"
-      And there is a zone named "North America"
-      And there is a country named "France" and iso code "FR" in zone "Europe"
-      And there is a country named "United States of America" and iso code "US" in zone "North America"
-      And there is a state named "state-fr" with iso code "TEST-FR" in country "France" and zone "Europe"
-      And there is a state named "state-us" with iso code "TEST-US" in country "United States of America" and zone "North America"
-      And there is an address named "address-fr" with postcode "1" in state "state-fr"
-      And there is an address named "address-us" with postcode "1" in state "state-us"
-      And there is a carrier named "carrier1"
-      And carrier "carrier1" applies shipping fees of 12.3 in zone "Europe" for price between 0 and 10000
-      And carrier "carrier1" applies shipping fees of 45.6 in zone "North America" for price between 0 and 10000
-      And there is a cart rule named "cartrule1" that applies an amount discount of 7.8 with priority 1, quantity of 1000 and quantity per user 1000
-      And cart rule "cartrule1" is restricted to country "FR"
-      And there is a product in the catalog named "Product1" with a price of 90.12 and 100 items in stock
     When I select address "address-fr" in my cart
-      And I select carrier "carrier1" in my cart
-      And I add 1 items of product "Product1" in my cart
+    And I select carrier "carrier1" in my cart
+    And I add 1 items of product "Product1" in my cart
     Then cart rule count in my cart should be 1
-      And the current cart should have the following contextual reductions:
-        | cartrule1        | 7.8 |
-      And cart shipping fees should be 14.3 tax excluded
-      And cart shipping fees should be 14.3 tax included
-      And my cart total should be 96.6 tax included
+    And the current cart should have the following contextual reductions:
+      | reference | reduction |
+      | cartrule1 | 7.8       |
+    And cart shipping fees should be 14.3 tax excluded
+    And cart shipping fees should be 14.3 tax included
+    And my cart total should be 96.6 tax included
 
   Scenario: Cart with a Product And adress not restricted by cart rule
-    Given I have an empty default cart
-      And there is a zone named "Europe"
-      And there is a zone named "North America"
-      And there is a country named "France" and iso code "FR" in zone "Europe"
-      And there is a country named "United States of America" and iso code "US" in zone "North America"
-      And there is a state named "state-fr" with iso code "TEST-FR" in country "France" and zone "Europe"
-      And there is a state named "state-us" with iso code "TEST-US" in country "United States of America" and zone "North America"
-      And there is an address named "address-fr" with postcode "1" in state "state-fr"
-      And there is an address named "address-us" with postcode "1" in state "state-us"
-      And there is a carrier named "carrier1"
-      And carrier "carrier1" applies shipping fees of 12.3 in zone "Europe" for price between 0 and 10000
-      And carrier "carrier1" applies shipping fees of 45.6 in zone "North America" for price between 0 and 10000
-      And there is a cart rule named "cartrule1" that applies an amount discount of 7.8 with priority 1, quantity of 1000 and quantity per user 1000
-      And cart rule "cartrule1" is restricted to country "FR"
-      And there is a product in the catalog named "Product1" with a price of 90.12 and 100 items in stock
     When I select address "address-us" in my cart
-      And I select carrier "carrier1" in my cart
-      And I add 1 items of product "Product1" in my cart
+    And I select carrier "carrier1" in my cart
+    And I add 1 items of product "Product1" in my cart
     Then cart rule count in my cart should be 0
-      And cart shipping fees should be 47.6 tax included
-      And my cart total should be 137.7 tax included
+    And cart shipping fees should be 47.6 tax included
+    And my cart total should be 137.7 tax included
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/carrier.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/carrier.feature
index 81da2b0fb2f11..42cc0cd3a9a19 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/carrier.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/carrier.feature
@@ -5,294 +5,216 @@ Feature: Cart calculation with cart rules and different carriers
   As a customer
   I must see correct cart total price with different carriers when applying cart rules
 
+  Background:
+    Given I have an empty default cart
+    And there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
+    And there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+    And there is a product in the catalog named "product4" with a price of 149.0 and 1000 items in stock
+    And there is a product in the catalog named "product5" with a price of 151.0 and 1000 items in stock
+    And there is a carrier named "carrier1"
+    And there is a zone named "zone1"
+    And there is a zone named "zone2"
+    And there is a country named "country1" and iso code "FR" in zone "zone1"
+    And there is a country named "country2" and iso code "US" in zone "zone2"
+    And there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
+    And there is a state named "state2" with iso code "TEST-2" in country "country2" and zone "zone2"
+    And there is an address named "address1" with postcode "1" in state "state1"
+    And there is an address named "address2" with postcode "2" in state "state2"
+    And there is a carrier named "carrier1"
+    And there is a carrier named "carrier2"
+    And there is a carrier named "carrier3"
+    And there is a carrier named "carrier4"
+    And carrier "carrier1" applies shipping fees of 3.1 in zone "zone1" for price between 0 and 10000
+    And carrier "carrier1" applies shipping fees of 4.3 in zone "zone2" for price between 0 and 10000
+    And carrier "carrier2" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
+    And carrier "carrier2" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
+    And carrier "carrier3" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
+    And carrier "carrier3" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
+    And carrier "carrier4" applies shipping fees of 5.0 in zone "zone1" for price between 0 and 150
+    And carrier "carrier4" applies shipping fees of 0.0 in zone "zone1" for price between 150 and 1000
+    And shipping handling fees are set to 2.0
+    And there is a cart rule "cartrule5" with following properties:
+      | name[en-US]                      | cartrule5 |
+      | total_quantity                   | 1000      |
+      | quantity_per_user                | 1000      |
+      | priority                         | 2         |
+      | free_shipping                    | true      |
+      | code                             | foo5      |
+      | minimum_amount                   | 150       |
+      | minimum_amount_currency          | usd       |
+      | minimum_amount_tax_included      | false     |
+      | minimum_amount_shipping_included | false     |
+    And there is a cart rule "cartrule2" with following properties:
+      | name[en-US]                  | cartrule2              |
+      | total_quantity               | 1000                   |
+      | quantity_per_user            | 1000                   |
+      | priority                     | 2                      |
+      | free_shipping                | false                  |
+      | code                         | cartrule2              |
+      | discount_percentage          | 50                     |
+      | apply_to_discounted_products | true                   |
+      | discount_application_type    | order_without_shipping |
+
   # Issue #9540 part one fixed by #12965
   Scenario: free carrier in price range, voucher in percent set the price bellow range
-    Given I have an empty default cart
-    Given there is a product in the catalog named "product1" with a price of 151.0 and 1000 items in stock
-    Given there is a zone named "zone1"
-    Given there is a country named "country1" and iso code "FR" in zone "zone1"
-    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
-    Given there is an address named "address1" with postcode "1" in state "state1"
-    Given there is a carrier named "carrier1"
-    Given carrier "carrier1" applies shipping fees of 5.0 in zone "zone1" for price between 0 and 150
-    Given carrier "carrier1" applies shipping fees of 0.0 in zone "zone1" for price between 150 and 1000
-    Given there is a cart rule named "cartrule2" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule2" has a discount code "foo2"
-    When I add 1 item of product "product1" in my cart
-    When I use the discount "cartrule2"
-    When I select address "address1" in my cart
-    When I select carrier "carrier1" in my cart
-    Then cart shipping fees should be 7.0
-    Then my cart total should be 82.5 tax included
-    Then my cart total using previous calculation method should be 82.5 tax included
+    And I add 1 item of product "product5" in my cart
+    And I apply the voucher code "cartrule2"
+    And I select address "address1" in my cart
+    And I select carrier "carrier4" in my cart
+    And cart shipping fees should be 7.0
+    And my cart total should be 82.5 tax included
+    And my cart total using previous calculation method should be 82.5 tax included
 
   Scenario: free carrier in price range, voucher in amount set the price bellow range
-    Given I have an empty default cart
-    Given there is a product in the catalog named "product1" with a price of 151.0 and 1000 items in stock
-    Given there is a zone named "zone1"
-    Given there is a country named "country1" and iso code "FR" in zone "zone1"
-    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
-    Given there is an address named "address1" with postcode "1" in state "state1"
-    Given there is a carrier named "carrier1"
-    Given carrier "carrier1" applies shipping fees of 5.0 in zone "zone1" for price between 0 and 150
-    Given carrier "carrier1" applies shipping fees of 0.0 in zone "zone1" for price between 150 and 1000
-    Given there is a cart rule named "cartrule2" that applies an amount discount of 2.0 with priority 2, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule2" has a discount code "foo2"
-    When I add 1 item of product "product1" in my cart
-    When I use the discount "cartrule2"
-    When I select address "address1" in my cart
-    When I select carrier "carrier1" in my cart
+    Given there is a cart rule "cartrule3" with following properties:
+      | name[en-US]                  | cartrule3              |
+      | total_quantity               | 1000                   |
+      | quantity_per_user            | 1000                   |
+      | priority                     | 2                      |
+      | free_shipping                | false                  |
+      | code                         | foo2                   |
+      | discount_amount              | 2                      |
+      | discount_currency            | usd                    |
+      | discount_includes_tax        | false                  |
+      | apply_to_discounted_products | true                   |
+      | discount_application_type    | order_without_shipping |
+    When I add 1 item of product "product5" in my cart
+    And I apply the voucher code "foo2"
+    And I select address "address1" in my cart
+    And I select carrier "carrier4" in my cart
     Then cart shipping fees should be 7.0
-    Then my cart total should be 156.0 tax included
-    Then my cart total using previous calculation method should be 156.0 tax included
+    And my cart total should be 156.0 tax included
+    And my cart total using previous calculation method should be 156.0 tax included
 
   # Issue #12976 part two
+  @restore-cart-rules-after-scenario
   Scenario: carrier fees not free, voucher without code set shipping fees free above amount, cart total is below
-    Given I have an empty default cart
-    Given there is a product in the catalog named "product1" with a price of 149.0 and 1000 items in stock
-    Given there is a zone named "zone1"
-    Given there is a country named "country1" and iso code "FR" in zone "zone1"
-    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
-    Given there is an address named "address1" with postcode "1" in state "state1"
-    Given there is a carrier named "carrier1"
-    Given carrier "carrier1" applies shipping fees of 5.0 in zone "zone1" for price between 0 and 10000
-    Given there is a cart rule named "cartrule2" that applies an amount discount of 0.0 with priority 2, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule2" offers free shipping
-    Given cart rule "cartrule2" applies discount only when cart total is above 150.0
-    When I add 1 item of product "product1" in my cart
-    When I select address "address1" in my cart
-    When I select carrier "carrier1" in my cart
+    Given there is a cart rule "cartrule4" with following properties:
+      | name[en-US]                      | cartrule4 |
+      | total_quantity                   | 1000      |
+      | quantity_per_user                | 1000      |
+      | priority                         | 2         |
+      | free_shipping                    | true      |
+      | minimum_amount                   | 150       |
+      | minimum_amount_currency          | usd       |
+      | minimum_amount_tax_included      | false     |
+      | minimum_amount_shipping_included | false     |
+    When I add 1 item of product "product4" in my cart
+    And I select address "address1" in my cart
+    And I select carrier "carrier4" in my cart
     Then cart shipping fees should be 7.0
-    Then my cart total should be 156.0 tax included
-    Then my cart total using previous calculation method should be 156.0 tax included
+    And my cart total should be 156.0 tax included
+    And my cart total using previous calculation method should be 156.0 tax included
 
   Scenario: carrier fees not free, voucher with code set shipping fees free above amount, cart total is below
-    Given I have an empty default cart
-    Given there is a product in the catalog named "product1" with a price of 149.0 and 1000 items in stock
-    Given there is a zone named "zone1"
-    Given there is a country named "country1" and iso code "FR" in zone "zone1"
-    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
-    Given there is an address named "address1" with postcode "1" in state "state1"
-    Given there is a carrier named "carrier1"
-    Given carrier "carrier1" applies shipping fees of 5.0 in zone "zone1" for price between 0 and 150
-    Given carrier "carrier1" applies shipping fees of 0.0 in zone "zone1" for price between 150 and 1000
-    Given there is a cart rule named "cartrule2" that applies an amount discount of 0.0 with priority 2, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule2" has a discount code "foo2"
-    Given cart rule "cartrule2" offers free shipping
-    Given cart rule "cartrule2" applies discount only when cart total is above 150.0
-    When I add 1 item of product "product1" in my cart
-    When I select address "address1" in my cart
-    When I select carrier "carrier1" in my cart
-    Then cart rule "cartrule2" cannot be applied to my cart
-    Then cart shipping fees should be 7.0
-    Then my cart total should be 156.0 tax included
-    Then my cart total using previous calculation method should be 156.0 tax included
+    When I add 1 item of product "product4" in my cart
+    And I select address "address1" in my cart
+    And I select carrier "carrier4" in my cart
+    And I apply the voucher code "foo5"
+    Then I should get cart rule validation error saying "The minimum amount to benefit from this promo code is"
+    And cart shipping fees should be 7.0
+    And my cart total should be 156.0 tax included
+    And my cart total using previous calculation method should be 156.0 tax included
 
+  @restore-cart-rules-after-scenario
   Scenario: carrier fees not free, voucher without code set shipping fees free above amount, cart total is below
-    Given I have an empty default cart
-    Given there is a product in the catalog named "product1" with a price of 149.0 and 1000 items in stock
-    Given there is a zone named "zone1"
-    Given there is a country named "country1" and iso code "FR" in zone "zone1"
-    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
-    Given there is an address named "address1" with postcode "1" in state "state1"
-    Given there is a carrier named "carrier1"
-    Given carrier "carrier1" applies shipping fees of 5.0 in zone "zone1" for price between 0 and 10000
-    Given there is a cart rule named "cartrule2" that applies an amount discount of 0.0 with priority 2, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule2" offers free shipping
-    Given cart rule "cartrule2" applies discount only when cart total is above 150.0
-    When I add 1 item of product "product1" in my cart
-    When I select address "address1" in my cart
-    When I select carrier "carrier1" in my cart
+    Given there is a cart rule "cartrule6" with following properties:
+      | name[en-US]                      | cartrule6 |
+      | total_quantity                   | 1000      |
+      | quantity_per_user                | 1000      |
+      | priority                         | 2         |
+      | free_shipping                    | true      |
+      | minimum_amount                   | 150       |
+      | minimum_amount_currency          | usd       |
+      | minimum_amount_tax_included      | false     |
+      | minimum_amount_shipping_included | false     |
+    When I add 1 item of product "product4" in my cart
+    And I select address "address1" in my cart
+    And I select carrier "carrier4" in my cart
     Then cart shipping fees should be 7.0
-    Then my cart total should be 156.0 tax included
-    Then my cart total using previous calculation method should be 156.0 tax included
+    And my cart total should be 156.0 tax included
+    And my cart total using previous calculation method should be 156.0 tax included
 
   Scenario: carrier fees not free, voucher with code set shipping fees free above amount, cart total is above
-    Given I have an empty default cart
-    Given there is a product in the catalog named "product1" with a price of 151.0 and 1000 items in stock
-    Given there is a zone named "zone1"
-    Given there is a country named "country1" and iso code "FR" in zone "zone1"
-    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
-    Given there is an address named "address1" with postcode "1" in state "state1"
-    Given there is a carrier named "carrier1"
-    Given carrier "carrier1" applies shipping fees of 5.0 in zone "zone1" for price between 0 and 150
-    Given carrier "carrier1" applies shipping fees of 0.0 in zone "zone1" for price between 150 and 1000
-    Given there is a cart rule named "cartrule2" that applies an amount discount of 0.0 with priority 2, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule2" has a discount code "foo2"
-    Given cart rule "cartrule2" offers free shipping
-    Given cart rule "cartrule2" applies discount only when cart total is above 150.0
-    When I add 1 item of product "product1" in my cart
-    When I select address "address1" in my cart
-    When I select carrier "carrier1" in my cart
-    Then cart rule "cartrule2" can be applied to my cart
-    When I use the discount "cartrule2"
+    Given I add 1 item of product "product5" in my cart
+    And I select address "address1" in my cart
+    And I select carrier "carrier4" in my cart
+    When I apply the voucher code "foo5"
     Then cart shipping fees should be 2.0
-    Then my cart total should be 151.0 tax included
-    Then my cart total using previous calculation method should be 151.0 tax included
+    And my cart total should be 151.0 tax included
+    And my cart total using previous calculation method should be 151.0 tax included
 
+  @restore-cart-rules-after-scenario
   Scenario: carrier fees not free, voucher without code set shipping fees free above amount, cart total is above
-    Given I have an empty default cart
-    Given there is a product in the catalog named "product1" with a price of 151.0 and 1000 items in stock
-    Given there is a zone named "zone1"
-    Given there is a country named "country1" and iso code "FR" in zone "zone1"
-    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
-    Given there is an address named "address1" with postcode "1" in state "state1"
-    Given there is a carrier named "carrier1"
-    Given carrier "carrier1" applies shipping fees of 5.0 in zone "zone1" for price between 0 and 150
-    Given carrier "carrier1" applies shipping fees of 0.0 in zone "zone1" for price between 150 and 1000
-    Given there is a cart rule named "cartrule2" that applies an amount discount of 0.0 with priority 2, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule2" has a discount code "foo2"
-    Given cart rule "cartrule2" offers free shipping
-    Given cart rule "cartrule2" applies discount only when cart total is above 150.0
-    When I add 1 item of product "product1" in my cart
-    When I use the discount "cartrule2"
-    When I select address "address1" in my cart
-    When I select carrier "carrier1" in my cart
+    Given there is a cart rule "cartrule6" with following properties:
+      | name[en-US]                      | cartrule6 |
+      | total_quantity                   | 1000      |
+      | quantity_per_user                | 1000      |
+      | priority                         | 2         |
+      | free_shipping                    | true      |
+      | minimum_amount                   | 150       |
+      | minimum_amount_currency          | usd       |
+      | minimum_amount_tax_included      | false     |
+      | minimum_amount_shipping_included | false     |
+    When I add 1 item of product "product5" in my cart
+    And I select address "address1" in my cart
+    And I select carrier "carrier4" in my cart
     Then cart shipping fees should be 2.0
-    Then my cart total should be 151.0 tax included
-    Then my cart total using previous calculation method should be 151.0 tax included
+    And my cart total should be 151.0 tax included
+    And my cart total using previous calculation method should be 151.0 tax included
 
-  Scenario: one product in cart, quantity 1, cant apply not corresponding cart rule
-    Given I have an empty default cart
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a zone named "zone1"
-    Given there is a zone named "zone2"
-    Given there is a country named "country1" and iso code "FR" in zone "zone1"
-    Given there is a country named "country2" and iso code "US" in zone "zone2"
-    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
-    Given there is a state named "state2" with iso code "TEST-2" in country "country2" and zone "zone2"
-    Given there is an address named "address1" with postcode "1" in state "state1"
-    Given there is an address named "address2" with postcode "1" in state "state2"
-    Given there is a carrier named "carrier1"
-    Given carrier "carrier1" applies shipping fees of 3.1 in zone "zone1" for price between 0 and 10000
-    Given carrier "carrier1" applies shipping fees of 4.3 in zone "zone2" for price between 0 and 10000
-    Given there is a carrier named "carrier2"
-    Given carrier "carrier2" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
-    Given carrier "carrier2" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
-    Given there is a carrier named "carrier3"
-    Given carrier "carrier3" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
-    Given carrier "carrier3" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
-    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule1" has a discount code "foo"
-    Given cart rule "cartrule1" is restricted to carrier "carrier2"
-    Given there is a cart rule named "cartrule2" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule2" has a discount code "bar"
-    Given cart rule "cartrule2" is restricted to carrier "carrier1"
-    Given there is a cart rule named "cartrule3" that applies a percent discount of 55.0% with priority 3, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule3" is restricted to carrier "carrier3"
+  Scenario: one product in cart, quantity 1, can apply only the cart rule which is restricted to selected carrier
+    Given there is a cart rule "cartrule7" with following properties:
+      | name[en-US]                  | cartrule7              |
+      | total_quantity               | 1000                   |
+      | quantity_per_user            | 1000                   |
+      | priority                     | 1                      |
+      | free_shipping                | false                  |
+      | code                         | cartrule7              |
+      | discount_percentage          | 50                     |
+      | apply_to_discounted_products | true                   |
+      | discount_application_type    | order_without_shipping |
+    And cart rule "cartrule7" is restricted to carrier "carrier2"
+    And there is a cart rule "cartrule8" with following properties:
+      | name[en-US]                  | cartrule8              |
+      | total_quantity               | 1000                   |
+      | quantity_per_user            | 1000                   |
+      | priority                     | 2                      |
+      | free_shipping                | false                  |
+      | code                         | cartrule8              |
+      | discount_percentage          | 50                     |
+      | apply_to_discounted_products | true                   |
+      | discount_application_type    | order_without_shipping |
+    And cart rule "cartrule8" is restricted to carrier "carrier1"
     When I add 1 items of product "product1" in my cart
-    When I select address "address1" in my cart
-    When I select carrier "carrier2" in my cart
-    Then cart rule "cartrule2" cannot be applied to my cart
-
-  Scenario: one product in cart, quantity 1, can apply corresponding cart rule
-    Given I have an empty default cart
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a zone named "zone1"
-    Given there is a zone named "zone2"
-    Given there is a country named "country1" and iso code "FR" in zone "zone1"
-    Given there is a country named "country2" and iso code "US" in zone "zone2"
-    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
-    Given there is a state named "state2" with iso code "TEST-2" in country "country2" and zone "zone2"
-    Given there is an address named "address1" with postcode "1" in state "state1"
-    Given there is an address named "address2" with postcode "1" in state "state2"
-    Given there is a carrier named "carrier1"
-    Given carrier "carrier1" applies shipping fees of 3.1 in zone "zone1" for price between 0 and 10000
-    Given carrier "carrier1" applies shipping fees of 4.3 in zone "zone2" for price between 0 and 10000
-    Given there is a carrier named "carrier2"
-    Given carrier "carrier2" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
-    Given carrier "carrier2" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
-    Given there is a carrier named "carrier3"
-    Given carrier "carrier3" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
-    Given carrier "carrier3" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
-    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule1" has a discount code "foo"
-    Given cart rule "cartrule1" is restricted to carrier "carrier2"
-    Given there is a cart rule named "cartrule2" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule2" has a discount code "bar"
-    Given cart rule "cartrule2" is restricted to carrier "carrier1"
-    Given there is a cart rule named "cartrule3" that applies a percent discount of 55.0% with priority 3, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule3" is restricted to carrier "carrier3"
-    When I add 1 items of product "product1" in my cart
-    When I select address "address1" in my cart
-    When I select carrier "carrier2" in my cart
-    Then cart rule "cartrule1" can be applied to my cart
-    When I use the discount "cartrule1"
-    Then cart rule count in my cart should be 1
-    Then cart rule "cartrule1" cannot be applied to my cart
-    When I use the discount "cartrule1"
-    Then cart rule count in my cart should be 1
-
-  Scenario: one product in cart, quantity 1, can apply corresponding cart rule
-    Given I have an empty default cart
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a zone named "zone1"
-    Given there is a zone named "zone2"
-    Given there is a country named "country1" and iso code "FR" in zone "zone1"
-    Given there is a country named "country2" and iso code "US" in zone "zone2"
-    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
-    Given there is a state named "state2" with iso code "TEST-2" in country "country2" and zone "zone2"
-    Given there is an address named "address1" with postcode "1" in state "state1"
-    Given there is an address named "address2" with postcode "1" in state "state2"
-    Given there is a carrier named "carrier1"
-    Given carrier "carrier1" applies shipping fees of 3.1 in zone "zone1" for price between 0 and 10000
-    Given carrier "carrier1" applies shipping fees of 4.3 in zone "zone2" for price between 0 and 10000
-    Given there is a carrier named "carrier2"
-    Given carrier "carrier2" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
-    Given carrier "carrier2" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
-    Given there is a carrier named "carrier3"
-    Given carrier "carrier3" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
-    Given carrier "carrier3" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
-    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule1" has a discount code "foo"
-    Given cart rule "cartrule1" is restricted to carrier "carrier2"
-    Given there is a cart rule named "cartrule2" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule2" has a discount code "bar"
-    Given cart rule "cartrule2" is restricted to carrier "carrier1"
-    Given there is a cart rule named "cartrule3" that applies a percent discount of 55.0% with priority 3, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule3" is restricted to carrier "carrier3"
-    When I add 1 items of product "product1" in my cart
-    When I select address "address1" in my cart
-    When I select carrier "carrier2" in my cart
-    Then cart rule "cartrule1" can be applied to my cart
-    When I use the discount "cartrule1"
-    Then cart rule count in my cart should be 1
-    Then cart rule "cartrule1" cannot be applied to my cart
-    When I use the discount "cartrule1"
-    When I select carrier "carrier1" in my cart
-    Then cart rule count in my cart should be 0
+    And I select address "address1" in my cart
+    And I select carrier "carrier2" in my cart
+    Then cart shipping fees should be 7.7
+    Then my cart total should be 27.5 tax included
+    When I apply the voucher code "cartrule8"
+    Then I should get cart rule validation error saying "You cannot use this voucher with this carrier"
+    And I select carrier "carrier1" in my cart
+    And I apply the voucher code "cartrule8"
+    Then cart shipping fees should be 5.1
+    And my cart total should be 15.0 tax included
 
+  @restore-cart-rules-after-scenario
   Scenario: one product in cart, quantity 1, cart rule without code correctly (un)applied on corresponding carrier
-    Given I have an empty default cart
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a zone named "zone1"
-    Given there is a zone named "zone2"
-    Given there is a country named "country1" and iso code "FR" in zone "zone1"
-    Given there is a country named "country2" and iso code "US" in zone "zone2"
-    Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
-    Given there is a state named "state2" with iso code "TEST-2" in country "country2" and zone "zone2"
-    Given there is an address named "address1" with postcode "1" in state "state1"
-    Given there is an address named "address2" with postcode "1" in state "state2"
-    Given there is a carrier named "carrier1"
-    Given carrier "carrier1" applies shipping fees of 3.1 in zone "zone1" for price between 0 and 10000
-    Given carrier "carrier1" applies shipping fees of 4.3 in zone "zone2" for price between 0 and 10000
-    Given there is a carrier named "carrier2"
-    Given carrier "carrier2" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
-    Given carrier "carrier2" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
-    Given there is a carrier named "carrier3"
-    Given carrier "carrier3" applies shipping fees of 5.7 in zone "zone1" for price between 0 and 10000
-    Given carrier "carrier3" applies shipping fees of 6.2 in zone "zone2" for price between 0 and 10000
-    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule1" has a discount code "foo"
-    Given cart rule "cartrule1" is restricted to carrier "carrier2"
-    Given there is a cart rule named "cartrule2" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule2" has a discount code "bar"
-    Given cart rule "cartrule2" is restricted to carrier "carrier1"
-    Given there is a cart rule named "cartrule3" that applies a percent discount of 55.0% with priority 3, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule3" is restricted to carrier "carrier3"
+    Given there is a cart rule "cartrule9" with following properties:
+      | name[en-US]                  | cartrule9              |
+      | total_quantity               | 1000                   |
+      | quantity_per_user            | 1000                   |
+      | priority                     | 3                      |
+      | free_shipping                | false                  |
+      | discount_percentage          | 55                     |
+      | apply_to_discounted_products | true                   |
+      | discount_application_type    | order_without_shipping |
+    And cart rule "cartrule9" is restricted to carrier "carrier3"
+    And cart rule "cartrule5" is restricted to carrier "carrier2"
+    And cart rule "cartrule2" is restricted to carrier "carrier1"
     When I add 1 items of product "product1" in my cart
-    When I select address "address1" in my cart
-    When I select carrier "carrier2" in my cart
+    And I select address "address1" in my cart
+    And I select carrier "carrier2" in my cart
     Then cart rule count in my cart should be 0
     When I select carrier "carrier3" in my cart
     Then cart rule count in my cart should be 1

From b31652d24bde556e27fc1209c654e768a2de9dc1 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Tue, 23 May 2023 16:51:11 +0300
Subject: [PATCH 0242/1030]  cheapest_product feature

---
 src/Adapter/CartRule/CartRuleActionFiller.php |   4 +-
 .../Context/CartRuleFeatureContext.php        |  11 --
 .../FrontOffice/cheapest_product.feature      | 123 +++++++++---------
 3 files changed, 60 insertions(+), 78 deletions(-)

diff --git a/src/Adapter/CartRule/CartRuleActionFiller.php b/src/Adapter/CartRule/CartRuleActionFiller.php
index 656e62b0da86e..1a4a45d78bcf8 100644
--- a/src/Adapter/CartRule/CartRuleActionFiller.php
+++ b/src/Adapter/CartRule/CartRuleActionFiller.php
@@ -102,8 +102,7 @@ private function fillDiscount(CartRule $cartRule, ?Discount $discount): void
 
         if ($amountDiscount) {
             $this->fillAmountDiscount($cartRule, $amountDiscount);
-        }
-        if ($percentageDiscount) {
+        } else {
             $this->fillPercentageDiscount($cartRule, $percentageDiscount);
         }
 
@@ -132,6 +131,7 @@ private function fillDiscountApplicationType(
                 $discountApplicationValue = LegacyDiscountApplicationType::ORDER_WITHOUT_SHIPPING;
         }
 
+        //@todo: specific/selected/cheapest product is selected it might be that product_restriction muts be set to true.
         $cartRule->reduction_product = $discountApplicationValue;
     }
 
diff --git a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
index b419e862b5a55..b75d3a54cd627 100644
--- a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
@@ -321,17 +321,6 @@ public function cartRuleNamedIsRestrictedToCountryNamed(string $cartRuleName, st
         Cache::clear();
     }
 
-    /**
-     * @Given /^cart rule "(.+)" is restricted to cheapest product$/
-     */
-    public function cartRuleIsRestrictedToCheapestProduct($cartRuleName)
-    {
-        $this->checkCartRuleWithNameExists($cartRuleName);
-        $this->cartRules[$cartRuleName]->product_restriction = true;
-        $this->cartRules[$cartRuleName]->reduction_product = -1;
-        $this->cartRules[$cartRuleName]->save();
-    }
-
     /**
      * @Given /^cart rule "(.+)" is restricted on the selection of products$/
      */
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cheapest_product.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cheapest_product.feature
index 5d52cdbf4311c..b6961a523e667 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cheapest_product.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cheapest_product.feature
@@ -1,79 +1,72 @@
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags fo-cart-rule-cheapest-product
 @restore-all-tables-before-feature
+@fo-cart-rule-cheapest-product
 Feature: Cart rule (percent) calculation with one cart rule restricted to cheapest product
   As a customer
   I must be able to have correct cart total when adding cart rules
 
-  Scenario: Empty cart, one 50% cartRule on cheapest product
+  Background:
     Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a cart rule named "cartrule10" that applies a percent discount of 50.0% with priority 10, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule10" is restricted to cheapest product
-    Given cart rule "cartrule10" has a discount code "foo10"
-    Then I should have 0 different products in my cart
-    When I use the discount "cartrule10"
-    Then my cart total should be 0.0 tax included
-    Then my cart total using previous calculation method should be 0.0 tax included
+    And shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
+    And there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+    And there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
+    And there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
+    And there is a cart rule "cartrule10" with following properties:
+      | name[en-US]                  | cartrule10       |
+      | total_quantity               | 1000             |
+      | quantity_per_user            | 1000             |
+      | priority                     | 10               |
+      | free_shipping                | false            |
+      | code                         | foo10            |
+      | discount_percentage          | 50               |
+      | apply_to_discounted_products | false            |
+      | discount_application_type    | cheapest_product |
 
   Scenario: one product in cart, quantity 1, one 50% cartRule on cheapest product
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a cart rule named "cartrule10" that applies a percent discount of 50.0% with priority 10, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule10" is restricted to cheapest product
-    Given cart rule "cartrule10" has a discount code "foo10"
-    When I add 1 items of product "product1" in my cart
-    When I use the discount "cartrule10"
+    Given I add 1 items of product "product1" in my cart
+    And my cart total shipping fees should be 7.0 tax included
+    And my cart total should be 26.812 tax included
+    When I apply the voucher code "foo10"
     Then my cart total should be 16.906 tax included
-    Then my cart total using previous calculation method should be 16.906 tax included
 
   Scenario: multiple products in cart, several quantities, one 50% cartRule on cheapest product
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
-    Given there is a cart rule named "cartrule10" that applies a percent discount of 50.0% with priority 10, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule10" is restricted to cheapest product
-    Given cart rule "cartrule10" has a discount code "foo10"
-    When I add 2 items of product "product2" in my cart
-    When I add 3 items of product "product1" in my cart
-    When I add 1 items of product "product3" in my cart
-    When I use the discount "cartrule10"
+    Given I add 2 items of product "product2" in my cart
+    And I add 3 items of product "product1" in my cart
+    And I add 1 items of product "product3" in my cart
+    And my cart total shipping fees should be 7.0 tax included
+    And my cart total should be 162.4 tax included
+    When I apply the voucher code "foo10"
     Then my cart total should be 152.494 tax included
-    Then my cart total using previous calculation method should be 152.494 tax included
 
-  Scenario: multiple products in cart, several quantities, one 50% cartRule on cheapest product excluding already discounted
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
-    Given there is a cart rule named "cartrule10" that applies a percent discount of 50.0% with priority 10, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule10" is restricted to cheapest product
-    Given cart rule "cartrule10" does not apply to already discounted products
-    Given cart rule "cartrule10" has a discount code "foo10"
-    When I add 2 items of product "product2" in my cart
-    When I add 3 items of product "product1" in my cart
-    When I add 1 items of product "product3" in my cart
-    When I use the discount "cartrule10"
-    Then my cart total should be 152.494 tax included
-    Then my cart total using previous calculation method should be 152.494 tax included
+  Scenario: 50% cartRule on cheapest product excluding discounted products, cheapest product is already discounted
+    Given product "product1" has a specific price named "specificPrice2" with an amount discount of 10.0
+    And I add 2 items of product "product2" in my cart
+    And I add 3 items of product "product1" in my cart
+    And I add 1 items of product "product3" in my cart
+    And my cart total shipping fees should be 7.0 tax included
+    And my cart total should be 132.4 tax included
+    When I apply the voucher code "foo10"
+    # product1 is cheapest, but it has a specific price, so the 50% discount is applied to the next cheapest product which is product3
+    Then my cart total should be 116.8 tax included
 
-  Scenario: multiple products in cart, several quantities, one 50% cartRule on cheapest product excluding already discounted, cheapest product is already discounted
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given product "product1" has a specific price named "specificPrice1" with an amount discount of 3.0
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
-    Given there is a cart rule named "cartrule10" that applies a percent discount of 50.0% with priority 10, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule10" is restricted to cheapest product
-    Given cart rule "cartrule10" does not apply to already discounted products
-    Given cart rule "cartrule10" has a discount code "foo10"
-    When I add 2 items of product "product2" in my cart
-    When I add 3 items of product "product1" in my cart
-    When I add 1 items of product "product3" in my cart
-    When I use the discount "cartrule10"
-    Then my cart total should be 137.806 tax included
-    Then my cart total using previous calculation method should be 137.806 tax included
+#  Scenario: 50% cartRule on cheapest product including already discounted products, cheapest product is already discounted
+#    Given product "product1" has a specific price named "specificPrice3" with an amount discount of 10.0
+#    And there is a cart rule "cartrule20" with following properties:
+#      | name[en-US]                  | cartrule20       |
+#      | priority                     | 10               |
+#      | free_shipping                | false            |
+#      | code                         | foo20            |
+#      | discount_percentage          | 50               |
+#      | apply_to_discounted_products | true             |
+#      | discount_application_type    | cheapest_product |
+#    And I add 2 items of product "product2" in my cart
+#    And I add 3 items of product "product1" in my cart
+#    And I add 1 items of product "product3" in my cart
+#    And my cart total shipping fees should be 7.0 tax included
+#    And my cart total should be 132.4 tax included
+#    When I apply the voucher code "foo20"
+#    And my cart total shipping fees should be 7.0 tax included
+#    # @todo: doesn't seem to work. gets 127.5 instead, is it a bug in cart rules calculation or did I make a mistake in expectations?
+#    #  (19.812-10)*3 = 29.436 (the cheapest product price with already applied specific price)
+#    # 29.436*0.5 + 32.388*2 + 31.188 + 7.0 shipping
+#    Then my cart total should be 117.682 tax included

From 9b11b8509e4da359a455a47020ee967ef310ef0e Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Tue, 23 May 2023 17:38:31 +0300
Subject: [PATCH 0243/1030]  ecotax feature

---
 src/Adapter/CartRule/CartRuleActionFiller.php |  1 -
 .../Cart/CartRule/FrontOffice/ecotax.feature  | 96 ++++++++-----------
 2 files changed, 38 insertions(+), 59 deletions(-)

diff --git a/src/Adapter/CartRule/CartRuleActionFiller.php b/src/Adapter/CartRule/CartRuleActionFiller.php
index 1a4a45d78bcf8..7651a0ed9a77f 100644
--- a/src/Adapter/CartRule/CartRuleActionFiller.php
+++ b/src/Adapter/CartRule/CartRuleActionFiller.php
@@ -131,7 +131,6 @@ private function fillDiscountApplicationType(
                 $discountApplicationValue = LegacyDiscountApplicationType::ORDER_WITHOUT_SHIPPING;
         }
 
-        //@todo: specific/selected/cheapest product is selected it might be that product_restriction muts be set to true.
         $cartRule->reduction_product = $discountApplicationValue;
     }
 
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/ecotax.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/ecotax.feature
index 1a80949370ad3..0217ded748152 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/ecotax.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/ecotax.feature
@@ -1,86 +1,66 @@
-# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags cart-calculation-cartrule-ecotax
-
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags fo-cart-rule-ecotax
+@clear-cache-before-feature
 @restore-all-tables-before-feature
-@clear-cache-before-scenario
-@cart-calculation-cartrule-ecotax
+@fo-cart-rule-ecotax
 Feature: Cart rule (percent) calculation with one cart rule
   As a customer
   I must be able to have correct cart total when adding cart rules
 
   Background:
-    Given there is a zone named "zone1"
+    Given I have an empty default cart
+    And there is a zone named "zone1"
     And there is a country named "country1" and iso code "FR" in zone "zone1"
     And there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
     And there is an address named "address1" with postcode "1" in state "state1"
     And shop configuration for "PS_USE_ECOTAX" is set to 1
-
-  Scenario:
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
+    And shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
     And there is a tax named "tax4Percent" and rate 4.0%
     And there is a tax rule named "taxRule4Percent" in country "country1" where tax "tax4Percent" is applied
-    And I have an empty default cart
-    ## Set Product
     And there is a product in the catalog named "product_without_ecotax" with a price of 10.000 and 1000 items in stock
     And product "product_without_ecotax" belongs to tax group "taxRule4Percent"
-    ## Set Cart Rule
-    When there is a cart rule named "cartRuleFiftyPercent" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
-    And cart rule "cartRuleFiftyPercent" is restricted to product "product_without_ecotax"
-    And cart rule "cartRuleFiftyPercent" is restricted on the selection of products
-    And cart rule "cartRuleFiftyPercent" has a discount code "cartRuleFiftyPercent"
-    ## Add product
-    When I select address "address1" in my cart
-    And I add 1 item of product "product_without_ecotax" in my cart
+    And there is a product in the catalog named "product_with_ecotax" with a price of 10.000 and 1000 items in stock
+    And the product "product_with_ecotax" ecotax is 2.00
+    And product "product_with_ecotax" belongs to tax group "taxRule4Percent"
+    And there is a cart rule "cartRuleFiftyPercent" with following properties:
+      | name[en-US]                  | cartRuleFiftyPercent |
+      | total_quantity               | 1000                 |
+      | quantity_per_user            | 1000                 |
+      | priority                     | 2                    |
+      | free_shipping                | false                |
+      | code                         | cartRuleFiftyPercent |
+      | discount_percentage          | 50                   |
+      | apply_to_discounted_products | true                 |
+      | discount_application_type    | selected_products    |
+
+  Scenario:
+    Given cart rule "cartRuleFiftyPercent" is restricted to product "product_without_ecotax"
+    And I select address "address1" in my cart
+    When I add 1 item of product "product_without_ecotax" in my cart
     Then my cart total should be 10.400 tax included
     And my cart total should be 10.000 tax excluded
     And I use the discount "cartRuleFiftyPercent"
-    Then my cart total should be 5.200 tax included
+    And my cart total should be 5.200 tax included
     And my cart total should be 5.000 tax excluded
 
   Scenario:
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    And there is a tax named "tax4Percent" and rate 4.0%
-    And there is a tax rule named "taxRule4Percent" in country "country1" where tax "tax4Percent" is applied
-    And I have an empty default cart
-    ## Set Product
-    And there is a product in the catalog named "product_with_ecotax" with a price of 10.000 and 1000 items in stock
-    And the product "product_with_ecotax" ecotax is 2.00
-    And product "product_with_ecotax" belongs to tax group "taxRule4Percent"
-    ## Set Cart Rule
-    When there is a cart rule named "cartRuleFiftyPercent" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
-    And cart rule "cartRuleFiftyPercent" is restricted to product "product_with_ecotax"
-    And cart rule "cartRuleFiftyPercent" is restricted on the selection of products
-    And cart rule "cartRuleFiftyPercent" has a discount code "cartRuleFiftyPercent"
-    ## Add product
-    When I select address "address1" in my cart
-    And I add 1 item of product "product_with_ecotax" in my cart
+    Given cart rule "cartRuleFiftyPercent" is restricted to product "product_with_ecotax"
+    And I select address "address1" in my cart
+    When I add 1 item of product "product_with_ecotax" in my cart
     Then my cart total should be 12.400 tax included
     And my cart total should be 12.000 tax excluded
     And I use the discount "cartRuleFiftyPercent"
-    Then my cart total should be 6.200 tax included
+    And my cart total should be 6.200 tax included
     And my cart total should be 6.000 tax excluded
-    Then I should have a voucher named "cartRuleFiftyPercent" with 6.2 of discount
+    And I should have a voucher named "cartRuleFiftyPercent" with 6.2 of discount
 
   Scenario:
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    And there is a tax named "tax4Percent" and rate 4.0%
-    And there is a tax rule named "taxRule4Percent" in country "country1" where tax "tax4Percent" is applied
-    And Ecotax belongs to tax group "taxRule4Percent"
-    And I have an empty default cart
-    ## Set Product
-    And there is a product in the catalog named "product_with_ecotax" with a price of 10.000 and 1000 items in stock
-    And the product "product_with_ecotax" ecotax is 2.00
-    And product "product_with_ecotax" belongs to tax group "taxRule4Percent"
-    ## Set Cart Rule
-    When there is a cart rule named "cartRuleFiftyPercent" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
+    Given Ecotax belongs to tax group "taxRule4Percent"
     And cart rule "cartRuleFiftyPercent" is restricted to product "product_with_ecotax"
-    And cart rule "cartRuleFiftyPercent" is restricted on the selection of products
-    And cart rule "cartRuleFiftyPercent" has a discount code "cartRuleFiftyPercent"
-    ## Add product
-    When I select address "address1" in my cart
-    And I add 1 item of product "product_with_ecotax" in my cart
-    Then my cart total should be precisely 12.48 tax included
-    And my cart total should be 12.000 tax excluded
-    And I use the discount "cartRuleFiftyPercent"
-    Then my cart total should be precisely 6.24 tax included
+    And I select address "address1" in my cart
+    When I add 1 item of product "product_with_ecotax" in my cart
+    And my cart total should be precisely 12.000 tax excluded
+    And my cart total should be precisely 12.48 tax included
+    And I apply the voucher code "cartRuleFiftyPercent"
+    And my cart total should be precisely 6.24 tax included
     And my cart total should be 6.000 tax excluded
-    Then I should have a voucher named "cartRuleFiftyPercent" with 6.24 of discount
+    And I should have a voucher named "cartRuleFiftyPercent" with 6.24 of discount

From 295813e14b55d2b6853992e6c34e55524fb5bc67 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Tue, 23 May 2023 18:06:55 +0300
Subject: [PATCH 0244/1030]  exclude_discounted_product feature

---
 .../exclude_discounted_product.feature        | 67 +++++++++++--------
 1 file changed, 39 insertions(+), 28 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/exclude_discounted_product.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/exclude_discounted_product.feature
index 6f79be5d0270e..47b9399cbb2d4 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/exclude_discounted_product.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/exclude_discounted_product.feature
@@ -1,42 +1,53 @@
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags fo-cart-rule-excluded-discounted-product
 @restore-all-tables-before-feature
+@fo-cart-rule-excluded-discounted-product
 Feature: Cart rule (percent) calculation with one cart rule restricted to not already discounted product
   As a customer
   I must be able to have correct cart total when adding cart rules
 
-  Scenario: multiple products in cart, several quantities, one 50% cartRule excluding already discounted
+  Background:
     Given I have an empty default cart
     Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
     Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given product "product1" has a specific price named "specificPrice1" with an amount discount of 3.0
     Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
     Given there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
-    Given there is a cart rule named "cartrule10" that applies a percent discount of 50.0% with priority 10, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule10" does not apply to already discounted products
-    Given cart rule "cartrule10" has a discount code "foo10"
-    When I add 2 items of product "product2" in my cart
-    When I add 3 items of product "product1" in my cart
-    When I add 1 items of product "product3" in my cart
-    When I use the discount "cartrule10"
+    Given product "product1" has a specific price named "specificPrice1" with an amount discount of 3.0
+
+  Scenario: multiple products in cart, several quantities, one 50% cartRule excluding already discounted
+    Given there is a cart rule "cartrule10" with following properties:
+      | name[en-US]                  | cartrule10             |
+      | total_quantity               | 1000                   |
+      | quantity_per_user            | 1000                   |
+      | priority                     | 10                     |
+      | free_shipping                | false                  |
+      | code                         | foo10                  |
+      | discount_percentage          | 50                     |
+      | apply_to_discounted_products | false                  |
+      | discount_application_type    | order_without_shipping |
+    And I add 2 items of product "product2" in my cart
+    And I add 3 items of product "product1" in my cart
+    And I add 1 items of product "product3" in my cart
+    And my cart total shipping fees should be 7.0 tax included
+    And my cart total should be 153.4 tax included
+    When I apply the voucher code "foo10"
     Then my cart total should be 105.418 tax included
-    # Test known not to be reliable on previous
-    # Then my cart total using previous calculation method should be 105.418 tax included
 
   Scenario: multiple products in cart, several quantities, one 50% cartRule on selected product excluding already discounted
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given product "product1" has a specific price named "specificPrice1" with an amount discount of 3.0
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
-    Given there is a cart rule named "cartrule11" that applies a percent discount of 50.0% with priority 10, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule11" is restricted to product "product1"
-    Given cart rule "cartrule11" is restricted to product "product2"
-    Given cart rule "cartrule11" does not apply to already discounted products
-    Given cart rule "cartrule11" has a discount code "foo10"
-    When I add 2 items of product "product2" in my cart
-    When I add 3 items of product "product1" in my cart
-    When I add 1 items of product "product3" in my cart
-    When I use the discount "cartrule11"
+    Given there is a cart rule "cartrule11" with following properties:
+      | name[en-US]                  | cartrule11             |
+      | total_quantity               | 1000                   |
+      | quantity_per_user            | 1000                   |
+      | priority                     | 10                     |
+      | free_shipping                | false                  |
+      | code                         | foo11                  |
+      | discount_percentage          | 50                     |
+      | apply_to_discounted_products | false                  |
+      | discount_application_type    | order_without_shipping |
+    And cart rule "cartrule11" is restricted to product "product2"
+    And I add 2 items of product "product2" in my cart
+    And I add 3 items of product "product1" in my cart
+    And I add 1 items of product "product3" in my cart
+    And my cart total shipping fees should be 7.0 tax included
+    And my cart total should be 153.4 tax included
+    When I apply the voucher code "foo11"
     Then my cart total should be 121.000 tax included
-    # Test known not to be reliable on previous
-    # Then my cart total using previous calculation method should be 121.000 tax included

From cac344dd4323f8d8538a9f475f32a394cc435314 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Wed, 24 May 2023 10:12:28 +0300
Subject: [PATCH 0245/1030]  cleanup free_shipping feature and make
 discount_application_type optional. Remove meaningless options from steps to
 reduce noise

---
 .../CartRule/CartRuleActionBuilder.php        |   3 +-
 .../AbstractCartRuleFeatureContext.php        |   4 +-
 .../CartRule/BackOffice/gift_cartrule.feature |   1 -
 .../FrontOffice/Amount/amount_mono.feature    |   8 --
 .../Amount/amount_mono_virtual.feature        |   8 --
 .../Amount/amount_multiple.feature            |  39 -------
 .../Amount/amount_specific.feature            |   8 --
 .../FrontOffice/Percent/percent_mono.feature  |   4 -
 .../Percent/percent_multiple.feature          |  14 ---
 .../Percent/percent_specific.feature          |   8 --
 .../cart_rule_carrier_restriction.feature     |   8 --
 .../cart_rule_country_restriction.feature     |   4 -
 .../Cart/CartRule/FrontOffice/carrier.feature |   2 -
 .../FrontOffice/cart_rule_validation.feature  | 101 +++++++-----------
 .../FrontOffice/cheapest_product.feature      |   1 -
 .../exclude_discounted_product.feature        |  50 +++++----
 .../FrontOffice/free_shipping.feature         | 101 +++++++++++-------
 .../CartRule/CartRuleActionBuilderTest.php    |  42 ++++++--
 18 files changed, 168 insertions(+), 238 deletions(-)

diff --git a/src/Core/Form/IdentifiableObject/Builder/CartRule/CartRuleActionBuilder.php b/src/Core/Form/IdentifiableObject/Builder/CartRule/CartRuleActionBuilder.php
index 685971a68b7dc..4697041934b77 100644
--- a/src/Core/Form/IdentifiableObject/Builder/CartRule/CartRuleActionBuilder.php
+++ b/src/Core/Form/IdentifiableObject/Builder/CartRule/CartRuleActionBuilder.php
@@ -79,7 +79,6 @@ public function supports(array $data): bool
         if (
             $propertyAccessor->isReadable($data, '[discount][reduction][value]')
             && $propertyAccessor->isReadable($data, '[discount][reduction][type]')
-            && $propertyAccessor->isReadable($data, '[discount][discount_application]')
         ) {
             return true;
         }
@@ -118,7 +117,7 @@ private function buildDiscount(array $data): ?Discount
         }
 
         $discountApplicationType = new DiscountApplicationType(
-            $data['discount']['discount_application'],
+            $data['discount']['discount_application'] ?? DiscountApplicationType::ORDER_WITHOUT_SHIPPING,
             $specificProductId
         );
         $reductionData = $data['discount']['reduction'];
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
index 5428e1610addc..904069d3a6b7d 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
@@ -333,7 +333,9 @@ protected function formatDataForActionBuilder(array $data): array
         if (isset($data['discount_percentage'])) {
             $formattedData['discount']['reduction']['value'] = $data['discount_percentage'];
             $formattedData['discount']['reduction']['type'] = Reduction::TYPE_PERCENTAGE;
-            $formattedData['discount']['apply_to_discounted_products'] = PrimitiveUtils::castStringBooleanIntoBoolean($data['apply_to_discounted_products']);
+            if (isset($data['apply_to_discounted_products'])) {
+                $formattedData['discount']['apply_to_discounted_products'] = PrimitiveUtils::castStringBooleanIntoBoolean($data['apply_to_discounted_products']);
+            }
         }
 
         if (isset($data['discount_amount'])) {
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/gift_cartrule.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/gift_cartrule.feature
index 9c692fad5def2..bcd10894de553 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/gift_cartrule.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/gift_cartrule.feature
@@ -11,7 +11,6 @@ Feature: Apply cart rule to cart from Back Office (BO)
 
   Scenario: 1 product in cart, 1 automatic cart rule offering free gift, change the product quantity and check split cart quantities
     Given I am logged in as "test@prestashop.com" employee
-    Given there is customer "customer1" with email "pub@prestashop.com"
     Given I create an empty cart "dummy_custom_cart" for customer "customer1"
     Given email sending is disabled
     Given shipping handling fees are set to 2.0
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono.feature
index cab6da10e3943..fb3260269344a 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono.feature
@@ -13,28 +13,20 @@ Feature: Cart rule (amount) calculation with one cart rule
     And there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
     And there is a cart rule "reduction_5_dollar" with following properties:
       | name[en-US]                  | reduces $5             |
-      | total_quantity               | 1000                   |
-      | quantity_per_user            | 1000                   |
       | priority                     | 4                      |
       | free_shipping                | false                  |
       | code                         | reduce-5               |
       | discount_amount              | 5                      |
       | discount_currency            | usd                    |
       | discount_includes_tax        | false                  |
-      | apply_to_discounted_products | true                   |
-      | discount_application_type    | order_without_shipping |
     And there is a cart rule "reduction_500_dollar" with following properties:
       | name[en-US]                  | reduces $500           |
-      | total_quantity               | 1000                   |
-      | quantity_per_user            | 1000                   |
       | priority                     | 5                      |
       | free_shipping                | false                  |
       | code                         | reduce-500             |
       | discount_amount              | 500                    |
       | discount_currency            | usd                    |
       | discount_includes_tax        | false                  |
-      | apply_to_discounted_products | true                   |
-      | discount_application_type    | order_without_shipping |
     And I have an empty default cart
 
   Scenario: one product in cart, quantity 1, one 5€ global cartRule
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono_virtual.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono_virtual.feature
index 74ed28d874140..2d56dd4444ff5 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono_virtual.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_mono_virtual.feature
@@ -15,28 +15,20 @@ Feature: Cart rule (amount) calculation with one cart rule
     And product "product8" is virtual
     And there is a cart rule "reduction_5_dollar" with following properties:
       | name[en-US]                  | reduces $5             |
-      | total_quantity               | 1000                   |
-      | quantity_per_user            | 1000                   |
       | priority                     | 4                      |
       | free_shipping                | false                  |
       | code                         | reduce-5               |
       | discount_amount              | 5                      |
       | discount_currency            | usd                    |
       | discount_includes_tax        | false                  |
-      | apply_to_discounted_products | true                   |
-      | discount_application_type    | order_without_shipping |
     And there is a cart rule "reduction_500_dollar" with following properties:
       | name[en-US]                  | reduces $500           |
-      | total_quantity               | 1000                   |
-      | quantity_per_user            | 1000                   |
       | priority                     | 5                      |
       | free_shipping                | false                  |
       | code                         | reduce-500             |
       | discount_amount              | 500                    |
       | discount_currency            | usd                    |
       | discount_includes_tax        | false                  |
-      | apply_to_discounted_products | true                   |
-      | discount_application_type    | order_without_shipping |
     And I have an empty default cart
 
   Scenario: 4 products in cart, one is virtual, several quantities, one 5€ global voucher
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_multiple.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_multiple.feature
index 0322e672108e9..6fe7a1faad1e3 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_multiple.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_multiple.feature
@@ -17,20 +17,14 @@ Feature: Cart rule (amount) calculation with multiple cart rules
     And product "product8" is virtual
     And there is a cart rule "reduction_5_dollar" with following properties:
       | name[en-US]                  | reduces $5             |
-      | total_quantity               | 1000                   |
-      | quantity_per_user            | 1000                   |
       | priority                     | 4                      |
       | free_shipping                | false                  |
       | code                         | reduce-5               |
       | discount_amount              | 5                      |
       | discount_currency            | usd                    |
       | discount_includes_tax        | false                  |
-      | apply_to_discounted_products | true                   |
-      | discount_application_type    | order_without_shipping |
     And there is a cart rule "reduction_500_dollar" with following properties:
       | name[en-US]                  | reduces $500           |
-      | total_quantity               | 1000                   |
-      | quantity_per_user            | 1000                   |
       | priority                     | 5                      |
       | free_shipping                | false                  |
       | code                         | reduce-500             |
@@ -41,16 +35,12 @@ Feature: Cart rule (amount) calculation with multiple cart rules
       | discount_application_type    | order_without_shipping |
     And there is a cart rule "reduction_10_dollar" with following properties:
       | name[en-US]                  | reduces $10            |
-      | total_quantity               | 1000                   |
-      | quantity_per_user            | 1000                   |
       | priority                     | 6                      |
       | free_shipping                | false                  |
       | code                         | reduce-10              |
       | discount_amount              | 10                     |
       | discount_currency            | usd                    |
       | discount_includes_tax        | false                  |
-      | apply_to_discounted_products | true                   |
-      | discount_application_type    | order_without_shipping |
     And I have an empty default cart
 
   Scenario: one product in cart, quantity 1, one 5€ global cartRule, one 10€ global cartRule
@@ -95,21 +85,15 @@ Feature: Cart rule (amount) calculation with multiple cart rules
   Scenario: One product in my cart, one cart rule for free shipping and one for free gift
     Given there is a cart rule "cartrule-free-shipping" with following properties:
       | name[en-US]       | cartrule-free-shipping |
-      | total_quantity    | 1                      |
-      | quantity_per_user | 1                      |
       | priority          | 1                      |
       | free_shipping     | true                   |
     And there is a cart rule "reduce-10-restricted" with following properties:
       | name[en-US]                  | reduce-10-restricted   |
-      | total_quantity               | 1                      |
-      | quantity_per_user            | 1                      |
       | priority                     | 1                      |
       | free_shipping                | false                  |
       | discount_amount              | 10                     |
       | discount_currency            | usd                    |
       | discount_includes_tax        | false                  |
-      | apply_to_discounted_products | true                   |
-      | discount_application_type    | order_without_shipping |
     And cart rule "reduce-10-restricted" is restricted to the category "Awesome" with a quantity of 1
     And cart rule "reduce-10-restricted" is restricted to product "product8"
     When I add 1 item of product "product8" in my cart
@@ -123,26 +107,18 @@ Feature: Cart rule (amount) calculation with multiple cart rules
   Scenario: One product in my cart, one 10€ global cartRule, 2 free gifts global cartRules
     Given there is a cart rule "reduce-10-global" with following properties:
       | name[en-US]                  | reduce-10-global       |
-      | total_quantity               | 1                      |
-      | quantity_per_user            | 1                      |
       | priority                     | 1                      |
       | free_shipping                | false                  |
       | discount_amount              | 10                     |
       | discount_currency            | usd                    |
       | discount_includes_tax        | false                  |
-      | apply_to_discounted_products | true                   |
-      | discount_application_type    | order_without_shipping |
     And there is a cart rule "cartrule-gift-product2" with following properties:
       | name[en-US]       | cartrule-gift-product2 |
-      | total_quantity    | 1                      |
-      | quantity_per_user | 1                      |
       | priority          | 1                      |
       | free_shipping     | false                  |
       | gift_product      | product2               |
     And there is a cart rule "cartrule-gift-product3" with following properties:
       | name[en-US]       | cartrule-gift-product3 |
-      | total_quantity    | 1                      |
-      | quantity_per_user | 1                      |
       | priority          | 1                      |
       | free_shipping     | false                  |
       | gift_product      | product3               |
@@ -159,26 +135,18 @@ Feature: Cart rule (amount) calculation with multiple cart rules
   Scenario: One product in my cart, one 30€ global cartRule (which is superior to the product bought), 2 free gifts global cartRules
     Given there is a cart rule "reduce-30-global" with following properties:
       | name[en-US]                  | reduce-30-global       |
-      | total_quantity               | 1                      |
-      | quantity_per_user            | 1                      |
       | priority                     | 1                      |
       | free_shipping                | false                  |
       | discount_amount              | 30                     |
       | discount_currency            | usd                    |
       | discount_includes_tax        | false                  |
-      | apply_to_discounted_products | true                   |
-      | discount_application_type    | order_without_shipping |
     And there is a cart rule "cartrule-gift-product2" with following properties:
       | name[en-US]       | cartrule-gift-product2 |
-      | total_quantity    | 1                      |
-      | quantity_per_user | 1                      |
       | priority          | 1                      |
       | free_shipping     | false                  |
       | gift_product      | product2               |
     And there is a cart rule "cartrule-gift-product3" with following properties:
       | name[en-US]       | cartrule-gift-product3 |
-      | total_quantity    | 1                      |
-      | quantity_per_user | 1                      |
       | priority          | 1                      |
       | free_shipping     | false                  |
       | gift_product      | product3               |
@@ -196,26 +164,19 @@ Feature: Cart rule (amount) calculation with multiple cart rules
   Scenario: One product in my cart, one 30€ global cartRule (which is superior to the product bought) with free shipping, 2 free gifts global cartRules
     Given there is a cart rule "reduce-30-free-ship-global" with following properties:
       | name[en-US]                  | reduce-30-free-ship-global |
-      | total_quantity               | 1                          |
-      | quantity_per_user            | 1                          |
       | priority                     | 1                          |
       | free_shipping                | true                       |
       | discount_amount              | 30                         |
       | discount_currency            | usd                        |
       | discount_includes_tax        | false                      |
       | apply_to_discounted_products | true                       |
-      | discount_application_type    | order_without_shipping     |
     And there is a cart rule "cartrule-gift-product2" with following properties:
       | name[en-US]       | cartrule-gift-product2 |
-      | total_quantity    | 1                      |
-      | quantity_per_user | 1                      |
       | priority          | 1                      |
       | free_shipping     | false                  |
       | gift_product      | product2               |
     And there is a cart rule "cartrule-gift-product3" with following properties:
       | name[en-US]       | cartrule-gift-product3 |
-      | total_quantity    | 1                      |
-      | quantity_per_user | 1                      |
       | priority          | 1                      |
       | free_shipping     | false                  |
       | gift_product      | product3               |
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_specific.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_specific.feature
index 618b4a9b9e7ef..307f6312d993a 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_specific.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Amount/amount_specific.feature
@@ -13,16 +13,12 @@ Feature: Cart rule (amount) calculation with one cart rule restricted to one pro
     And there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
     And there is a cart rule "cartrule8" with following properties:
       | name[en-US]                  | reduces $5 for product2 |
-      | total_quantity               | 1000                    |
-      | quantity_per_user            | 1000                    |
       | priority                     | 8                       |
       | free_shipping                | false                   |
       | code                         | foo8                    |
       | discount_amount              | 5                       |
       | discount_currency            | usd                     |
       | discount_includes_tax        | false                   |
-      | apply_to_discounted_products | true                    |
-      | discount_application_type    | order_without_shipping  |
     And cart rule "cartrule8" is restricted to product "product2"
     And I have an empty default cart
 
@@ -39,16 +35,12 @@ Feature: Cart rule (amount) calculation with one cart rule restricted to one pro
   Scenario: 3 products in cart, several quantities, one specific 500€ cartRule on product #2
     Given there is a cart rule "cartrule9" with following properties:
       | name[en-US]                  | reduces $500 for product2 |
-      | total_quantity               | 1000                      |
-      | quantity_per_user            | 1000                      |
       | priority                     | 8                         |
       | free_shipping                | false                     |
       | code                         | foo9                      |
       | discount_amount              | 500                       |
       | discount_currency            | usd                       |
       | discount_includes_tax        | false                     |
-      | apply_to_discounted_products | true                      |
-      | discount_application_type    | order_without_shipping    |
     And cart rule "cartrule9" is restricted to product "product2"
     When I add 3 items of product "product1" in my cart
     When I add 2 items of product "product2" in my cart
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_mono.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_mono.feature
index 4db7dca444f08..e3eae2fa8c58e 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_mono.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_mono.feature
@@ -19,8 +19,6 @@ Feature: Cart rule (percent) calculation with one cart rule
       | free_shipping                | false                  |
       | code                         | foo2                   |
       | discount_percentage          | 50                     |
-      | apply_to_discounted_products | true                   |
-      | discount_application_type    | order_without_shipping |
     And I have an empty default cart
 
   Scenario: one product in cart, quantity 1, one 50% global cartRule
@@ -58,8 +56,6 @@ Feature: Cart rule (percent) calculation with one cart rule
       | free_shipping                | false                  |
       | code                         | foo1                   |
       | discount_percentage          | 50                     |
-      | apply_to_discounted_products | true                   |
-      | discount_application_type    | order_without_shipping |
     And I add 1 items of product "product1" in my cart
     And I should have 1 different products in my cart
     And my cart total shipping fees should be 7.0 tax excluded
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_multiple.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_multiple.feature
index 38a511aafd964..7c1360fe3f0b2 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_multiple.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_multiple.feature
@@ -20,8 +20,6 @@ Feature: Cart rule (percent) calculation with multiple cart rules
       | free_shipping                | false                  |
       | code                         | foo2                   |
       | discount_percentage          | 50                     |
-      | apply_to_discounted_products | true                   |
-      | discount_application_type    | order_without_shipping |
     And there is a cart rule "cartrule3" with following properties:
       | name[en-US]                  | cartrule3              |
       | total_quantity               | 1000                   |
@@ -30,8 +28,6 @@ Feature: Cart rule (percent) calculation with multiple cart rules
       | free_shipping                | false                  |
       | code                         | foo3                   |
       | discount_percentage          | 10                     |
-      | apply_to_discounted_products | true                   |
-      | discount_application_type    | order_without_shipping |
     And I have an empty default cart
 
   Scenario: one product in cart, quantity 1, 2x % global cartRules
@@ -95,8 +91,6 @@ Feature: Cart rule (percent) calculation with multiple cart rules
       | quantity_per_user            | 1000                   |
       | priority                     | 2                      |
       | discount_percentage          | 10                     |
-      | apply_to_discounted_products | true                   |
-      | discount_application_type    | order_without_shipping |
     # now adding same products just with cart rules and checking the order total is correct (shipping and percentage applied)
     When I add 1 items of product "product1" in my cart
     And my cart total should be precisely 17.83 tax included
@@ -113,8 +107,6 @@ Feature: Cart rule (percent) calculation with multiple cart rules
       | priority                     | 1                      |
       | code                         | foo50                  |
       | discount_percentage          | 50                     |
-      | apply_to_discounted_products | true                   |
-      | discount_application_type    | order_without_shipping |
     And there is a cart rule "cartrule30" with following properties:
       | name[en-US]                  | cartrule30             |
       | total_quantity               | 1000                   |
@@ -122,8 +114,6 @@ Feature: Cart rule (percent) calculation with multiple cart rules
       | priority                     | 2                      |
       | code                         | foo30                  |
       | discount_percentage          | 30                     |
-      | apply_to_discounted_products | true                   |
-      | discount_application_type    | order_without_shipping |
     And I add 1 items of product "product1" in my cart
     And I should have 1 different products in my cart
     And my cart total shipping fees should be 7.0 tax included
@@ -148,8 +138,6 @@ Feature: Cart rule (percent) calculation with multiple cart rules
       | free_shipping                | false                  |
       | code                         |                        |
       | discount_percentage          | 10                     |
-      | apply_to_discounted_products | true                   |
-      | discount_application_type    | order_without_shipping |
     And there is a cart rule "cartrule15" with following properties:
       | name[en-US]                  | cartrule15             |
       | total_quantity               | 1000                   |
@@ -158,8 +146,6 @@ Feature: Cart rule (percent) calculation with multiple cart rules
       | free_shipping                | false                  |
       | code                         |                        |
       | discount_percentage          | 10                     |
-      | apply_to_discounted_products | true                   |
-      | discount_application_type    | order_without_shipping |
     When I add 2 items of product "product2" in my cart
     And I add 3 items of product "product1" in my cart
     And I add 1 items of product "product3" in my cart
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_specific.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_specific.feature
index 7c62e40027310..2ea927ec271d2 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_specific.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Percent/percent_specific.feature
@@ -14,25 +14,17 @@ Feature: Cart rule (percent) calculation with one cart rule restricted to one pr
     And there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
     And there is a cart rule "cartrule10" with following properties:
       | name[en-US]                  | cartrule10             |
-      | total_quantity               | 1000                   |
-      | quantity_per_user            | 1000                   |
       | priority                     | 10                     |
       | free_shipping                | false                  |
       | code                         | foo10                  |
       | discount_percentage          | 50                     |
-      | apply_to_discounted_products | true                   |
-      | discount_application_type    | order_without_shipping |
     And cart rule "cartrule10" is restricted to product "product2"
     And there is a cart rule "cartrule11" with following properties:
       | name[en-US]                  | cartrule11             |
-      | total_quantity               | 1000                   |
-      | quantity_per_user            | 1000                   |
       | priority                     | 11                     |
       | free_shipping                | false                  |
       | code                         | foo11                  |
       | discount_percentage          | 10                     |
-      | apply_to_discounted_products | true                   |
-      | discount_application_type    | order_without_shipping |
     And cart rule "cartrule11" is restricted to product "product2"
     And I have an empty default cart
 
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Restrictions/cart_rule_carrier_restriction.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Restrictions/cart_rule_carrier_restriction.feature
index 1b00ae367151d..5bb273eb18033 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Restrictions/cart_rule_carrier_restriction.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Restrictions/cart_rule_carrier_restriction.feature
@@ -37,8 +37,6 @@ Feature: Cart calculation with carrier specific cart rules
       | free_shipping                | false                  |
       | code                         | foo                    |
       | discount_percentage          | 50                     |
-      | apply_to_discounted_products | true                   |
-      | discount_application_type    | order_without_shipping |
     And cart rule "cartrule1" is restricted to carrier "carrier2"
     And there is a cart rule "cartrule2" with following properties:
       | name[en-US]                  | cartrule2              |
@@ -48,8 +46,6 @@ Feature: Cart calculation with carrier specific cart rules
       | free_shipping                | false                  |
       | code                         | bar                    |
       | discount_percentage          | 50                     |
-      | apply_to_discounted_products | true                   |
-      | discount_application_type    | order_without_shipping |
     And cart rule "cartrule2" is restricted to carrier "carrier1"
 
   Scenario: I cannot use voucher when it is restricted to specific carrier and that carrier is not selected
@@ -91,8 +87,6 @@ Feature: Cart calculation with carrier specific cart rules
       | priority                     | 1                      |
       | free_shipping                | false                  |
       | discount_percentage          | 55                     |
-      | apply_to_discounted_products | true                   |
-      | discount_application_type    | order_without_shipping |
     And cart rule "cartrule11" is restricted to carrier "carrier2"
     When I add 1 items of product "product1" in my cart
     And I select address "address1" in my cart
@@ -114,8 +108,6 @@ Feature: Cart calculation with carrier specific cart rules
       | discount_amount              | 10                     |
       | discount_currency            | usd                    |
       | discount_includes_tax        | false                  |
-      | apply_to_discounted_products | true                   |
-      | discount_application_type    | order_without_shipping |
     And cart rule "cartrule12" is restricted to carrier "carrier2"
     When I add 1 items of product "product1" in my cart
     And I select address "address1" in my cart
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Restrictions/cart_rule_country_restriction.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Restrictions/cart_rule_country_restriction.feature
index 3e37b260bd24c..3af3fa79372c3 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Restrictions/cart_rule_country_restriction.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Restrictions/cart_rule_country_restriction.feature
@@ -24,15 +24,11 @@ Feature: Cart calculation with country specific cart rules
     And carrier "carrier1" applies shipping fees of 45.6 in zone "North America" for price between 0 and 10000
     And there is a cart rule "cartrule1" with following properties:
       | name[en-US]                  | cartrule1              |
-      | total_quantity               | 1000                   |
-      | quantity_per_user            | 1000                   |
       | priority                     | 1                      |
       | free_shipping                | false                  |
       | discount_amount              | 7.8                    |
       | discount_currency            | usd                    |
       | discount_includes_tax        | false                  |
-      | apply_to_discounted_products | true                   |
-      | discount_application_type    | order_without_shipping |
     And cart rule "cartrule1" is restricted to country "FR"
     And there is a product in the catalog named "Product1" with a price of 90.12 and 100 items in stock
 
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/carrier.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/carrier.feature
index 42cc0cd3a9a19..3fc20cec6b031 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/carrier.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/carrier.feature
@@ -207,8 +207,6 @@ Feature: Cart calculation with cart rules and different carriers
       | priority                     | 3                      |
       | free_shipping                | false                  |
       | discount_percentage          | 55                     |
-      | apply_to_discounted_products | true                   |
-      | discount_application_type    | order_without_shipping |
     And cart rule "cartrule9" is restricted to carrier "carrier3"
     And cart rule "cartrule5" is restricted to carrier "carrier2"
     And cart rule "cartrule2" is restricted to carrier "carrier1"
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature
index 81aa048ea9cf7..6f4d8fc417a5c 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature
@@ -6,31 +6,23 @@ Feature: Cart rule application is validated before it is applied to cart
   I must not be able to apply invalid cart rules
 
   Background:
-    Given there is customer "testCustomer" with email "pub@prestashop.com"
-    And country "US" is enabled
+    Given I have an empty default cart
     And there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
     And there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
     And there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
     And there is a cart rule "cart_rule_1" with following properties:
-      | name[en-US]                  | cartrule1              |
-      | total_quantity               | 1000                   |
-      | quantity_per_user            | 1000                   |
-      | free_shipping                | false                  |
-      | code                         | foo1                   |
-      | discount_percentage          | 50                     |
-      | apply_to_discounted_products | true                   |
-      | discount_application_type    | order_without_shipping |
+      | name[en-US]                  | cartrule1 |
+      | free_shipping                | false     |
+      | code                         | foo1      |
+      | discount_percentage          | 50        |
+      | apply_to_discounted_products | true      |
     And there is a cart rule "cart_rule_2" with following properties:
-      | name[en-US]                  | cartrule2              |
-      | total_quantity               | 10                     |
-      | quantity_per_user            | 10                     |
-      | free_shipping                | false                  |
-      | code                         | foo2                   |
-      | discount_amount              | 10                     |
-      | discount_currency            | usd                    |
-      | discount_includes_tax        | false                  |
-      | apply_to_discounted_products | true                   |
-      | discount_application_type    | order_without_shipping |
+      | name[en-US]           | cartrule2 |
+      | free_shipping         | false     |
+      | code                  | foo2      |
+      | discount_amount       | 10        |
+      | discount_currency     | usd       |
+      | discount_includes_tax | false     |
     And there is a cart rule "cart_rule_3" with following properties:
       | name[en-US]       | cartrule3 |
       | total_quantity    | 10        |
@@ -39,7 +31,6 @@ Feature: Cart rule application is validated before it is applied to cart
       | code              | foo3      |
 
   Scenario: Adding a cart rule to an empty cart should not be possible
-    Given I have an empty default cart
     And shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
     And discount code "foo1" is not applied to my cart
     And discount code "foo2" is not applied to my cart
@@ -71,15 +62,11 @@ Feature: Cart rule application is validated before it is applied to cart
     # try applying cart rule restricted to carrier
     Given I have an empty default cart
     And there is a cart rule "cart_rule_4" with following properties:
-      | name[en-US]                  | cart_rule_4            |
-      | total_quantity               | 10                     |
-      | quantity_per_user            | 10                     |
-      | free_shipping                | false                  |
-      | free_shipping                | true                   |
-      | code                         | rule_carrier1          |
-      | discount_percentage          | 50                     |
-      | apply_to_discounted_products | true                   |
-      | discount_application_type    | order_without_shipping |
+      | name[en-US]         | cart_rule_4   |
+      | free_shipping       | false         |
+      | free_shipping       | true          |
+      | code                | rule_carrier1 |
+      | discount_percentage | 50            |
     And there is a carrier named "carrier1"
     And cart rule "cart_rule_4" is restricted to carrier "carrier1"
     And I select carrier "carrier1" in my cart
@@ -94,12 +81,10 @@ Feature: Cart rule application is validated before it is applied to cart
     And my cart total should be 0.0 tax included
     And I should have 0 products in my cart
     When there is a cart rule "cart_rule_5" with following properties:
-      | name[en-US]       | cart_rule_5 |
-      | total_quantity    | 10          |
-      | quantity_per_user | 10          |
-      | free_shipping     | false       |
-      | free_shipping     | false       |
-      | gift_product      | product1    |
+      | name[en-US]   | cart_rule_5 |
+      | free_shipping | false       |
+      | free_shipping | false       |
+      | gift_product  | product1    |
     Then my cart total shipping fees should be 0.0 tax included
     And my cart total should be 0.0 tax included
     And I should have 0 products in my cart
@@ -123,17 +108,13 @@ Feature: Cart rule application is validated before it is applied to cart
   Scenario: I cannot use voucher when it is restricted to specific product and that product is not in my cart
     Given I have an empty default cart
     And there is a cart rule "cartrule4" with following properties:
-      | name[en-US]                  | reduces $5 for product2 |
-      | total_quantity               | 1000                    |
-      | quantity_per_user            | 1000                    |
-      | priority                     | 8                       |
-      | free_shipping                | false                   |
-      | code                         | foo4                    |
-      | discount_amount              | 5                       |
-      | discount_currency            | usd                     |
-      | discount_includes_tax        | false                   |
-      | apply_to_discounted_products | true                    |
-      | discount_application_type    | order_without_shipping  |
+      | name[en-US]           | reduces $5 for product2 |
+      | priority              | 8                       |
+      | free_shipping         | false                   |
+      | code                  | foo4                    |
+      | discount_amount       | 5                       |
+      | discount_currency     | usd                     |
+      | discount_includes_tax | false                   |
     And cart rule "cartrule4" is restricted to product "product2"
     And I add 1 items of product "product1" in my cart
     And my cart total shipping fees should be 7.0 tax included
@@ -153,15 +134,11 @@ Feature: Cart rule application is validated before it is applied to cart
     # same with percentage
     Given I have an empty default cart
     And there is a cart rule "cartrule50" with following properties:
-      | name[en-US]                  | cartrule50             |
-      | total_quantity               | 1000                   |
-      | quantity_per_user            | 1000                   |
-      | priority                     | 10                     |
-      | free_shipping                | false                  |
-      | code                         | foo50                  |
-      | discount_percentage          | 50                     |
-      | apply_to_discounted_products | true                   |
-      | discount_application_type    | order_without_shipping |
+      | name[en-US]         | cartrule50 |
+      | priority            | 10         |
+      | free_shipping       | false      |
+      | code                | foo50      |
+      | discount_percentage | 50         |
     And cart rule "cartrule50" is restricted to product "product2"
     And I add 1 items of product "product1" in my cart
     And my cart total shipping fees should be 7.0 tax included
@@ -172,13 +149,11 @@ Feature: Cart rule application is validated before it is applied to cart
     # same with free shipping (just restricting to another product)
     Given I have an empty default cart
     And there is a cart rule "cartruleFreeShip" with following properties:
-      | name[en-US]                  | cartruleFreeShip       |
-      | priority                     | 11                     |
-      | free_shipping                | true                   |
-      | code                         | cartruleFreeShip       |
-      | discount_percentage          | 50                     |
-      | apply_to_discounted_products | true                   |
-      | discount_application_type    | order_without_shipping |
+      | name[en-US]         | cartruleFreeShip |
+      | priority            | 11               |
+      | free_shipping       | true             |
+      | code                | cartruleFreeShip |
+      | discount_percentage | 50               |
     And cart rule "cartruleFreeShip" is restricted to product "product1"
     And I add 1 items of product "product2" in my cart
     And my cart total shipping fees should be 7.0 tax included
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cheapest_product.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cheapest_product.feature
index b6961a523e667..9c5a89b2228d5 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cheapest_product.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cheapest_product.feature
@@ -19,7 +19,6 @@ Feature: Cart rule (percent) calculation with one cart rule restricted to cheape
       | free_shipping                | false            |
       | code                         | foo10            |
       | discount_percentage          | 50               |
-      | apply_to_discounted_products | false            |
       | discount_application_type    | cheapest_product |
 
   Scenario: one product in cart, quantity 1, one 50% cartRule on cheapest product
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/exclude_discounted_product.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/exclude_discounted_product.feature
index 47b9399cbb2d4..5aa881e81f323 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/exclude_discounted_product.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/exclude_discounted_product.feature
@@ -11,19 +11,16 @@ Feature: Cart rule (percent) calculation with one cart rule restricted to not al
     Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
     Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
     Given there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
-    Given product "product1" has a specific price named "specificPrice1" with an amount discount of 3.0
 
   Scenario: multiple products in cart, several quantities, one 50% cartRule excluding already discounted
     Given there is a cart rule "cartrule10" with following properties:
-      | name[en-US]                  | cartrule10             |
-      | total_quantity               | 1000                   |
-      | quantity_per_user            | 1000                   |
-      | priority                     | 10                     |
-      | free_shipping                | false                  |
-      | code                         | foo10                  |
-      | discount_percentage          | 50                     |
-      | apply_to_discounted_products | false                  |
-      | discount_application_type    | order_without_shipping |
+      | name[en-US]                  | cartrule10 |
+      | priority                     | 10         |
+      | free_shipping                | false      |
+      | code                         | foo10      |
+      | discount_percentage          | 50         |
+      | apply_to_discounted_products | false      |
+    And product "product1" has a specific price named "specificPrice1" with an amount discount of 3.0
     And I add 2 items of product "product2" in my cart
     And I add 3 items of product "product1" in my cart
     And I add 1 items of product "product3" in my cart
@@ -34,16 +31,14 @@ Feature: Cart rule (percent) calculation with one cart rule restricted to not al
 
   Scenario: multiple products in cart, several quantities, one 50% cartRule on selected product excluding already discounted
     Given there is a cart rule "cartrule11" with following properties:
-      | name[en-US]                  | cartrule11             |
-      | total_quantity               | 1000                   |
-      | quantity_per_user            | 1000                   |
-      | priority                     | 10                     |
-      | free_shipping                | false                  |
-      | code                         | foo11                  |
-      | discount_percentage          | 50                     |
-      | apply_to_discounted_products | false                  |
-      | discount_application_type    | order_without_shipping |
+      | name[en-US]                  | cartrule11 |
+      | priority                     | 10         |
+      | free_shipping                | false      |
+      | code                         | foo11      |
+      | discount_percentage          | 50         |
+      | apply_to_discounted_products | false      |
     And cart rule "cartrule11" is restricted to product "product2"
+    And product "product1" has a specific price named "specificPrice2" with an amount discount of 3.0
     And I add 2 items of product "product2" in my cart
     And I add 3 items of product "product1" in my cart
     And I add 1 items of product "product3" in my cart
@@ -51,3 +46,20 @@ Feature: Cart rule (percent) calculation with one cart rule restricted to not al
     And my cart total should be 153.4 tax included
     When I apply the voucher code "foo11"
     Then my cart total should be 121.000 tax included
+
+  Scenario: multiple products in cart, several quantities, one 50% cartRule on selected product applying to already discounted
+    Given there is a cart rule "cartrule12" with following properties:
+      | name[en-US]                  | cartrule12 |
+      | priority                     | 10         |
+      | free_shipping                | false      |
+      | code                         | foo12      |
+      | discount_percentage          | 50         |
+      | apply_to_discounted_products | true       |
+    And product "product2" has a specific price named "specificPrice3" with an amount discount of 5.0
+    And I add 2 items of product "product2" in my cart
+    And I add 3 items of product "product1" in my cart
+    And I add 1 items of product "product3" in my cart
+    And my cart total shipping fees should be 7.0 tax included
+    And my cart total should be 152.4 tax included
+    When I apply the voucher code "foo12"
+    Then my cart total should be 79.7 tax included
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/free_shipping.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/free_shipping.feature
index e2d9f9cd306b1..5e905c74a9ca8 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/free_shipping.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/free_shipping.feature
@@ -1,53 +1,80 @@
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags fo-cart-rule-free-shipping
 @restore-all-tables-before-feature
+@fo-cart-rule-free-shipping
 Feature: Cart rule (amount) calculation with one cart rule offering free shipping
   As a customer
   I must be able to have correct cart total when adding cart rules
 
-  Scenario: One product in cart, one cartRule offering only free shipping
+  Background:
     Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a cart rule named "cartrule4" that applies no discount with priority 4, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule4" offers free shipping
-    Given cart rule "cartrule4" has a discount code "foo4"
-    When I add 1 items of product "product1" in my cart
-    When I use the discount "cartrule4"
+    And there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
+    And shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
+    And there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+
+  Scenario: One product in cart, one cartRule offering only free shipping
+    Given there is a cart rule "cartrule1" with following properties:
+      | name[en-US]       | cartrule1 |
+      | priority          | 4         |
+      | free_shipping     | true      |
+      | code              | foo1      |
+    And I add 1 items of product "product1" in my cart
+    And my cart total shipping fees should be 7.0 tax included
+    And my cart total should be 26.812 tax included
+    When I apply the voucher code "foo1"
     Then my cart total should be 19.812 tax included
-    Then my cart total using previous calculation method should be 19.812 tax included
 
   Scenario: One product in cart, one cartRule offering free shipping AND 5€ discount
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a cart rule named "cartrule4" that applies an amount discount of 5.0 with priority 4, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule4" offers free shipping
-    Given cart rule "cartrule4" has a discount code "foo4"
-    When I add 1 items of product "product1" in my cart
-    When I use the discount "cartrule4"
+    Given there is a cart rule "cartrule2" with following properties:
+      | name[en-US]           | cartrule2 |
+      | priority              | 4         |
+      | free_shipping         | true      |
+      | code                  | foo2      |
+      | discount_amount       | 5         |
+      | discount_currency     | usd       |
+      | discount_includes_tax | false     |
+    And I add 1 items of product "product1" in my cart
+    And my cart total shipping fees should be 7.0 tax included
+    And my cart total should be 26.812 tax included
+    When I apply the voucher code "foo2"
     Then my cart total should be 14.812 tax included
-    Then my cart total using previous calculation method should be 14.812 tax included
 
   Scenario: One product in cart, four different cartRules offering free shipping
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a cart rule named "cartrule5" that applies an amount discount of 5.0 with priority 4, quantity of 100 and quantity per user 10
-    Given there is a cart rule named "cartrule6" that applies no discount with priority 5, quantity of 100 and quantity per user 10
-    Given there is a cart rule named "cartrule7" that applies no discount with priority 6, quantity of 100 and quantity per user 10
-    Given there is a cart rule named "cartrule8" that applies an amount discount of 5.0 with priority 4, quantity of 100 and quantity per user 10
-    Given cart rule "cartrule5" offers free shipping
-    Given cart rule "cartrule5" has a discount code "foo5"
-    Given cart rule "cartrule6" offers free shipping
-    Given cart rule "cartrule6" has a discount code "foo6"
-    Given cart rule "cartrule7" offers free shipping
-    Given cart rule "cartrule7" has a discount code "foo7"
-    Given cart rule "cartrule8" has a discount code "foo8"
-    When I add 1 items of product "product1" in my cart
-    When I use the discount "cartrule5"
+    Given there is a cart rule "cartrule5" with following properties:
+      | name[en-US]           | cartrule5 |
+      | priority              | 4         |
+      | free_shipping         | true      |
+      | code                  | foo5      |
+      | discount_amount       | 5         |
+      | discount_currency     | usd       |
+      | discount_includes_tax | false     |
+    And there is a cart rule "cartrule6" with following properties:
+      | name[en-US]       | cartrule6 |
+      | total_quantity    | 100       |
+      | quantity_per_user | 10        |
+      | priority          | 5         |
+      | free_shipping     | true      |
+      | code              | foo6      |
+    And there is a cart rule "cartrule7" with following properties:
+      | name[en-US]       | cartrule7 |
+      | priority          | 6         |
+      | free_shipping     | true      |
+      | code              | foo7      |
+    And there is a cart rule "cartrule8" with following properties:
+      | name[en-US]           | cartrule8 |
+      | priority              | 4         |
+      | free_shipping         | true      |
+      | code                  | foo8      |
+      | discount_amount       | 5         |
+      | discount_currency     | usd       |
+      | discount_includes_tax | false     |
+    And I add 1 items of product "product1" in my cart
+    And my cart total shipping fees should be 7.0 tax included
+    And my cart total should be 26.812 tax included
+    When I apply the voucher code "foo5"
     Then my cart total should be 14.812 tax included
-    When I use the discount "cartrule6"
+    When I apply the voucher code "foo6"
     Then my cart total should be 14.812 tax included
-    When I use the discount "cartrule7"
+    When I apply the voucher code "foo7"
     Then my cart total should be 14.812 tax included
-    When I use the discount "cartrule8"
+    When I apply the voucher code "foo8"
     Then my cart total should be 9.8 tax included
diff --git a/tests/Unit/Core/Form/IdentifiableObject/Builder/CartRule/CartRuleActionBuilderTest.php b/tests/Unit/Core/Form/IdentifiableObject/Builder/CartRule/CartRuleActionBuilderTest.php
index 092471997ba28..c7a55f53d804b 100644
--- a/tests/Unit/Core/Form/IdentifiableObject/Builder/CartRule/CartRuleActionBuilderTest.php
+++ b/tests/Unit/Core/Form/IdentifiableObject/Builder/CartRule/CartRuleActionBuilderTest.php
@@ -163,6 +163,17 @@ public function getSupportedData(): iterable
                 ],
             ],
         ];
+
+        yield 'discount application not provided' => [
+            [
+                'discount' => [
+                    'reduction' => [
+                        'value' => '144',
+                        'type' => Reduction::TYPE_AMOUNT,
+                    ],
+                ],
+            ],
+        ];
     }
 
     public function getUnsupportedData(): iterable
@@ -196,17 +207,6 @@ public function getUnsupportedData(): iterable
                 ],
             ],
         ];
-
-        yield 'missing discount application' => [
-            [
-                'discount' => [
-                    'reduction' => [
-                        'value' => '144',
-                        'type' => Reduction::TYPE_AMOUNT,
-                    ],
-                ],
-            ],
-        ];
     }
 
     public function getInvalidData(): iterable
@@ -653,6 +653,26 @@ public function getDataForMixedAction(): iterable
                 )
             ),
         ];
+
+        yield 'percent action with missing discount application' => [
+            [
+                'discount' => [
+                    'reduction' => [
+                        'type' => Reduction::TYPE_PERCENTAGE,
+                        'value' => '50',
+                    ],
+                ],
+            ],
+            new CartRuleAction(
+                false,
+                null,
+                Discount::buildPercentageDiscount(
+                    new DecimalNumber('50'),
+                    false,
+                    new DiscountApplicationType(DiscountApplicationType::ORDER_WITHOUT_SHIPPING)
+                )
+            ),
+        ];
     }
 
     private function getCartRuleActionBuilder(): CartRuleActionBuilder

From 8fd2251beee78166f5f5afcafdcd441311cf6492 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Wed, 24 May 2023 12:46:25 +0300
Subject: [PATCH 0246/1030]  clean up gift feature

---
 .../Context/CartRuleFeatureContext.php        |  39 ++--
 .../Cart/CartRule/FrontOffice/carrier.feature |   2 +-
 .../Cart/CartRule/FrontOffice/gift.feature    | 215 +++++++++---------
 3 files changed, 134 insertions(+), 122 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
index b75d3a54cd627..3ce0c501749a0 100644
--- a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
@@ -652,29 +652,30 @@ public function checkCartRuleUsageLimitIsDetected(string $cartRuleReference)
     private function getCartRuleValidityCodeByMessage(string $message): int
     {
         $map = [
-            'This voucher is disabled' => 100,
-            'This voucher has already been used' => 101,
-            'This voucher is not valid yet' => 102,
-            'This voucher has expired' => 103,
-            'You cannot use this voucher anymore (usage limit reached)' => 104,
-            'You cannot use this voucher' => 105,
-            'You must choose a delivery address before applying this voucher to your order' => 106,
-            'You cannot use this voucher in your country of delivery' => 107,
-            'You must choose a carrier before applying this voucher to your order' => 108,
-            'You cannot use this voucher with this carrier' => 109,
-            'You cannot use this voucher on products on sale' => 110,
-            'You cannot use this voucher in an empty cart' => 111,
-            'You cannot use this voucher with these products' => 112,
-            'The minimum amount to benefit from this promo code is' => 113,
-            'This voucher is already in your cart' => 114,
-            'This voucher is not combinable with an other voucher already in your cart:' => 115,
-            'Cart is empty' => 116,
+            'Cart is empty' => 100,
+            'This voucher is disabled' => 101,
+            'This voucher has already been used' => 102,
+            'This voucher is not valid yet' => 103,
+            'This voucher has expired' => 104,
+            'You must choose a delivery address before applying this voucher to your order' => 105,
+            'You must choose a carrier before applying this voucher to your order' => 106,
+            'The minimum amount to benefit from this promo code is' => 107,
+            'This voucher is already in your cart' => 108,
+            'This voucher is not combinable with an other voucher already in your cart:' => 109,
+            'You cannot use this voucher with these products' => 110,
+            'You cannot use this voucher on products on sale' => 111,
+            'You cannot use this voucher with this carrier' => 112,
+            'You cannot use this voucher in your country of delivery' => 113,
+            'You cannot use this voucher in an empty cart' => 114,
+            'You cannot use this voucher anymore (usage limit reached)' => 115,
+            'You cannot use this voucher' => 116,
         ];
 
         foreach ($map as $errorPart => $code) {
             // @todo:
-            //     some of these errors have %s placeholders, so we just match the most part of it,
-            //     it should be convenient enough for now, but will need improvement later
+            //     some of these errors have %s placeholders (luckily at the end of the string),
+            //      so we just match the start of the error message,
+            //     it should be convenient enough for now, but might need improvement later
             if (str_starts_with($message, $errorPart)) {
                 return $code;
             }
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/carrier.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/carrier.feature
index 3fc20cec6b031..bb83b34b5c64c 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/carrier.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/carrier.feature
@@ -111,7 +111,7 @@ Feature: Cart calculation with cart rules and different carriers
     And I select address "address1" in my cart
     And I select carrier "carrier4" in my cart
     And I apply the voucher code "foo5"
-    Then I should get cart rule validation error saying "The minimum amount to benefit from this promo code is"
+    Then I should get cart rule validation error saying "The minimum amount to benefit from this promo code is $150"
     And cart shipping fees should be 7.0
     And my cart total should be 156.0 tax included
     And my cart total using previous calculation method should be 156.0 tax included
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/gift.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/gift.feature
index fc9e2c68e4352..96be37cd92db9 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/gift.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/gift.feature
@@ -1,141 +1,152 @@
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags fo-cart-rule-gift
 @restore-all-tables-before-feature
+@fo-cart-rule-gift
 Feature: Cart calculation with cart rules giving gift
   As a customer
   I must be able to have correct cart total when adding products, and adding cart rule with gift
 
-  Scenario: 1 product in cart (out of stock), 1 cart rule give it as a gift, offering a gift (out of stock) and a global 10% discount
+  Background:
     Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product4" with a price of 35.567 and 1000 items in stock
+    And shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
+    And there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+    And there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
+    And there is a product in the catalog named "product4" with a price of 35.567 and 1000 items in stock
+    # cart rules must be reset after each scenario, because new product is created everytime, but old cart rule remains (with previous id of gift product)
+    # will need to be improved later when cleaning up product steps
+    And there is a cart rule "cartrule13" with following properties:
+      | name[en-US]         | cartrule13 |
+      | priority            | 13         |
+      | free_shipping       | false      |
+      | code                | foo13      |
+      | discount_percentage | 10         |
+      | gift_product        | product4   |
+
+  @restore-cart-rules-after-scenario
+  Scenario: 1 product in cart (out of stock), 1 cart rule give it as a gift, offering a gift (out of stock) and a global 10% discount
+    And there is a cart rule "cartrule10" with following properties:
+      | name[en-US]                  | cartrule10 |
+      | priority                     | 10         |
+      | free_shipping                | false      |
+      | code                         | foo10      |
+      | discount_percentage          | 10         |
+      | gift_product                 | product4   |
+      | apply_to_discounted_products | true       |
     Given product "product4" is out of stock
-    Given there is a cart rule named "cartrule13" that applies a percent discount of 10.0% with priority 13, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule13" has a discount code "foo13"
-    Given cart rule "cartrule13" offers a gift product "product4"
-    When I am not allowed to add 1 items of product "product4" in my cart
-    When I use the discount "cartrule13"
-    Then I should have 0 products in my cart
-    Then my cart total should be 0.0 tax included
-    # Test known not to be reliable on previous
-    # Then my cart total using previous calculation method should be 0.0 tax included
+    And I am not allowed to add 1 items of product "product4" in my cart
+    When I apply the voucher code "foo10"
+    # @todo: when apply_to_discounted_products = false then it throws "You cannot use this voucher on products on sale", but it is misleading (though out of scope now to fix)
+    Then I should get cart rule validation error saying "Cart is empty"
+    And I should have 0 products in my cart
+    And my cart total should be 0.0 tax included
 
+  @restore-cart-rules-after-scenario
   Scenario: 2 products in cart, one cart rule offering a gift (out of stock) and a global 10% discount
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product4" with a price of 35.567 and 1000 items in stock
     Given product "product4" is out of stock
-    Given there is a cart rule named "cartrule13" that applies a percent discount of 10.0% with priority 13, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule13" has a discount code "foo13"
-    Given cart rule "cartrule13" offers a gift product "product4"
-    When I add 3 items of product "product1" in my cart
-    When I am not allowed to add 1 items of product "product4" in my cart
-    When I use the discount "cartrule13"
-    Then I should have 3 products in my cart
-    Then my cart total should be 60.4924 tax included
-    # Test known not to be reliable on previous
-    # Then my cart total using previous calculation method should be 60.4924 tax included
+    And I add 3 items of product "product1" in my cart
+    And my cart total should be 66.436 tax included
+    And I am not allowed to add 1 items of product "product4" in my cart
+    When I apply the voucher code "foo13"
+    And I should have 3 products in my cart
+    And my cart total should be 60.4924 tax included
 
+  @restore-cart-rules-after-scenario
   Scenario: 3 products in cart, one cart rule offering a gift and a global 10% discount
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product4" with a price of 35.567 and 1000 items in stock
-    Given there is a cart rule named "cartrule13" that applies a percent discount of 10.0% with priority 13, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule13" has a discount code "foo13"
-    Given cart rule "cartrule13" offers a gift product "product4"
-    When I add 3 items of product "product1" in my cart
-    When I use the discount "cartrule13"
+    Given I add 3 items of product "product1" in my cart
+    When I apply the voucher code "foo13"
     Then I should have 4 products in my cart
-    Then my cart total should be 60.487 tax included
-    Then shipping handling fees are set to 7.0
-    Then the current cart should have the following contextual reductions:
-      | cartrule13        |  41.514  |
+    And my cart total should be 60.487 tax included
+    And my cart total shipping fees should be 7.0 tax included
+    And the current cart should have the following contextual reductions:
+      | reference  | reduction |
+      | cartrule13 | 41.514    |
 
+  @restore-cart-rules-after-scenario
   Scenario: 2 products in cart including one with specific price, one cart rule offering a gift and a global 10% discount
-    but does not apply to already discounted products
-
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    And product "product1" has a specific price named "discount" with a discount of 20.00 percent
+  but does not apply to already discounted products
     Given there is a product in the catalog named "product2" with a price of 11.00 and 1000 items in stock
-    Given there is a product in the catalog named "product4" with a price of 35.567 and 1000 items in stock
-    Given there is a cart rule named "cartrule13" that applies a percent discount of 10.0% with priority 13, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule13" has a discount code "foo13"
-    Given cart rule "cartrule13" offers a gift product "product4"
-    Given cart rule "cartrule13" does not apply to already discounted products
-    When I add 1 items of product "product1" in my cart
+    And product "product1" has a specific price named "discount" with a discount of 20.00 percent
+    And I add 1 items of product "product1" in my cart
     And I add 1 items of product "product2" in my cart
-    When I use the discount "cartrule13"
+    When I apply the voucher code "foo13"
     Then I should have 3 products in my cart
-    Then my cart total should be 32.8 tax included
-    Then shipping handling fees are set to 7.0
-    Then the current cart should have the following contextual reductions:
-      | cartrule13        |  36.67  |
+    And my cart total should be 32.8 tax included
+    And my cart total shipping fees should be 7.0 tax included
+    And the current cart should have the following contextual reductions:
+      | reference  | reduction |
+      | cartrule13 | 36.67     |
 
+  @restore-cart-rules-after-scenario
   Scenario: 1 product in my cart, one cart rule offering the same product and a global 50% discount
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product_1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product_2" with a price of 35.567 and 1000 items in stock
-    Given there is a cart rule named "cartrule14" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule14" has a discount code "foo14"
-    Given there is a cart rule named "cartrule15" that applies no discount with priority 1, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule15" offers a gift product "product_1"
-    Given cart rule "cartrule15" has a discount code "foo15"
-    When I add 1 items of product "product_1" in my cart
-    And I use the discount "cartrule14"
+    Given there is a cart rule "cartrule14" with following properties:
+      | name[en-US]         | cartrule14 |
+      | priority            | 1          |
+      | free_shipping       | false      |
+      | code                | foo14      |
+      | discount_percentage | 50         |
+    And there is a cart rule "cartrule15" with following properties:
+      | name[en-US]   | cartrule15 |
+      | priority      | 1          |
+      | free_shipping | false      |
+      | code          | foo15      |
+      | gift_product  | product1   |
+    And I add 1 items of product "product1" in my cart
+    When I apply the voucher code "foo14"
     Then I should have 1 products in my cart
     And the current cart should have the following contextual reductions:
-      | cartrule14        | 9.905 |
+      | reference  | reduction |
+      | cartrule14 | 9.905     |
     And my cart total should be precisely 16.9 tax included
-    When I use the discount "cartrule15"
+    When I apply the voucher code "foo15"
     Then I should have 2 products in my cart
     And the current cart should have the following contextual reductions:
-      | cartrule14        | 9.905  |
-      | cartrule15        | 19.81 |
+      | reference  | reduction |
+      | cartrule15 | 19.81     |
+      | cartrule14 | 9.905     |
     And my cart total should be precisely 16.9 tax included
 
+  @restore-cart-rules-after-scenario
   Scenario: 1 product in my cart, 2 same cart rules offering the same product as gift
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product_1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product_2" with a price of 35.567 and 1000 items in stock
-    Given there is a cart rule named "cartrule16" that applies no discount with priority 1, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule16" offers a gift product "product_1"
-    Given cart rule "cartrule16" has a discount code "foo16"
-    Given there is a cart rule named "cartrule17" that applies no discount with priority 1, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule17" offers a gift product "product_1"
-    Given cart rule "cartrule17" has a discount code "foo17"
-    When I add 1 items of product "product_1" in my cart
-    And I use the discount "cartrule16"
+    Given there is a cart rule "cartrule16" with following properties:
+      | name[en-US]   | cartrule16 |
+      | priority      | 1          |
+      | free_shipping | false      |
+      | code          | foo16      |
+      | gift_product  | product1   |
+    And there is a cart rule "cartrule17" with following properties:
+      | name[en-US]   | cartrule17 |
+      | priority      | 1          |
+      | free_shipping | false      |
+      | code          | foo17      |
+      | gift_product  | product1   |
+    And I add 1 items of product "product1" in my cart
+    When I apply the voucher code "foo16"
     Then I should have 2 products in my cart
     And the current cart should have the following contextual reductions:
-      | cartrule16        | 19.81 |
+      | reference  | reduction |
+      | cartrule16 | 19.81     |
     And my cart total should be precisely 26.81 tax included
-    When I use the discount "cartrule17"
+    When I apply the voucher code "foo17"
     Then I should have 3 products in my cart
     And the current cart should have the following contextual reductions:
-      | cartrule16        | 19.81 |
-      | cartrule17        | 19.81 |
+      | reference  | reduction |
+      | cartrule16 | 19.81     |
+      | cartrule17 | 19.81     |
     And my cart total should be precisely 26.82 tax included
     # 3*19.812 = 59.436 rounded to 59.44 - 19.81*2 = 19.82 + 7 (shipping) = 26.82
 
+  @restore-cart-rules-after-scenario
   Scenario: 2 products in cart, one cart rule offering a gift (in stock) and a global 10% discount
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
-    Given there is a product in the catalog named "product4" with a price of 35.567 and 1000 items in stock
     Given product "product4" is out of stock
-    Given there is a cart rule named "cartrule12" that applies a percent discount of 10.0% with priority 12, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule12" has a discount code "foo12"
-    Given cart rule "cartrule12" offers a gift product "product3"
-    When I add 2 items of product "product1" in my cart
-    When I add 3 items of product "product3" in my cart
-    When I am not allowed to add 1 items of product "product4" in my cart
-    When I use the discount "cartrule12"
+    And there is a cart rule "cartrule17" with following properties:
+      | name[en-US]         | cartrule12 |
+      | priority            | 12         |
+      | free_shipping       | false      |
+      | code                | foo12      |
+      | gift_product        | product3   |
+      | discount_percentage | 10         |
+    And I add 2 items of product "product1" in my cart
+    And I add 3 items of product "product3" in my cart
+    And I am not allowed to add 1 items of product "product4" in my cart
+    When I apply the voucher code "foo12"
     Then I should have 6 products in my cart
-    Then my cart total should be 126.8692 tax included
-    # Test known not to be reliable on previous
-    # Then my cart total using previous calculation method should be 126.8692 tax included
+    And my cart total should be 126.8692 tax included

From 3c5e85b3d5af2cfce134abfdede700aeaf8f3e12 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Wed, 24 May 2023 13:06:57 +0300
Subject: [PATCH 0247/1030]  clean up mixed.feature

---
 .../Features/Context/CartFeatureContext.php   |   2 +
 .../Cart/CartRule/FrontOffice/mixed.feature   | 190 ++++++++----------
 2 files changed, 88 insertions(+), 104 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Context/CartFeatureContext.php b/tests/Integration/Behaviour/Features/Context/CartFeatureContext.php
index 14d05fdcfab2f..67acf361ceba2 100644
--- a/tests/Integration/Behaviour/Features/Context/CartFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/CartFeatureContext.php
@@ -204,6 +204,8 @@ public function calculateCartShippingFees($expectedShippingFees, $taxes = null)
     }
 
     /**
+     * @todo: check if possible to unify this step with calculateCartShippingFees() so that they produce the same result (maybe selecting currency and address is missing?)
+     *
      * @Then /^my cart total shipping fees should be (\d+\.\d+) tax (excluded|included)?$/
      */
     public function assertTotalCartShipping(string $expectedShipping, bool $taxIncluded): void
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/mixed.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/mixed.feature
index 8498721ab2b07..35ec1e031cc1e 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/mixed.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/mixed.feature
@@ -5,136 +5,118 @@ Feature: Cart rule (mixed) calculation with multiple cart rules
   As a customer
   I must be able to have correct cart total when adding cart rules
 
-  Scenario: Empty cart, 2 mixed cartRule
+  Background:
     Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a cart rule named "cartrule2" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule2" has a discount code "foo2"
-    Given there is a cart rule named "cartrule4" that applies an amount discount of 5.0 with priority 4, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule4" has a discount code "foo4"
-    Then I should have 0 different products in my cart
-    When I use the discount "cartrule2"
-    When I use the discount "cartrule4"
-    Then my cart total should be 0.0 tax included
-    Then my cart total using previous calculation method should be 0.0 tax included
+    And there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
+    And shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
+    And there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+    And there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
+    And there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
+    And there is a product in the catalog named "product4" with a price of 35.567 and 1000 items in stock
+    And there is a cart rule "cartrule2" with following properties:
+      | name[en-US]         | cartrule2 |
+      | priority            | 2         |
+      | free_shipping       | false     |
+      | code                | foo2      |
+      | discount_percentage | 50        |
+    And there is a cart rule "cartrule4" with following properties:
+      | name[en-US]           | cartrule4 |
+      | priority              | 4         |
+      | free_shipping         | false     |
+      | code                  | foo4      |
+      | discount_amount       | 5         |
+      | discount_currency     | usd       |
+      | discount_includes_tax | false     |
+    And there is a cart rule "cartrule5" with following properties:
+      | name[en-US]           | cartrule5 |
+      | priority              | 5         |
+      | free_shipping         | false     |
+      | code                  | foo5      |
+      | discount_amount       | 500       |
+      | discount_currency     | usd       |
+      | discount_includes_tax | false     |
+    And there is a cart rule "cartrule7" with following properties:
+      | name[en-US]         | cartrule7 |
+      | priority            | 7         |
+      | free_shipping       | false     |
+      | code                | foo7      |
+      | discount_percentage | 50        |
 
   Scenario: one product in cart, quantity 1, one 50% global cartRule, one 5€ global cartRule
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a cart rule named "cartrule2" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule2" has a discount code "foo2"
-    Given there is a cart rule named "cartrule4" that applies an amount discount of 5.0 with priority 4, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule4" has a discount code "foo4"
-    When I add 1 items of product "product1" in my cart
-    When I use the discount "cartrule2"
-    When I use the discount "cartrule4"
+    Given I add 1 items of product "product1" in my cart
+    And my cart total should be 26.812 tax included
+    And my cart total shipping fees should be 7.0 tax included
+    When I apply the voucher code "foo2"
+    And I apply the voucher code "foo4"
     Then my cart total should be 11.906 tax included
-    Then my cart total using previous calculation method should be 11.906 tax included
 
   Scenario: one product in cart, quantity 1, one 50% global cartRule, one 500€ global cartRule
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a cart rule named "cartrule2" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule2" has a discount code "foo2"
-    Given there is a cart rule named "cartrule5" that applies an amount discount of 500.0 with priority 5, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule5" has a discount code "foo5"
-    When I add 3 items of product "product1" in my cart
-    When I use the discount "cartrule2"
-    When I use the discount "cartrule5"
+    Given I add 3 items of product "product1" in my cart
+    And my cart total should be 66.436 tax included
+    And my cart total shipping fees should be 7.0 tax included
+    When I apply the voucher code "foo2"
+    When I apply the voucher code "foo5"
     Then my cart total should be 7.0 tax included
-    Then my cart total using previous calculation method should be 7.0 tax included
 
   Scenario: one product in cart, quantity 3, one 5€ global cartRule, one 50% global cartRule
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a cart rule named "cartrule4" that applies an amount discount of 5.0 with priority 4, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule4" has a discount code "foo4"
-    Given there is a cart rule named "cartrule7" that applies a percent discount of 50.0% with priority 7, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule7" has a discount code "foo7"
-    When I add 3 items of product "product1" in my cart
-    When I use the discount "cartrule4"
-    When I use the discount "cartrule7"
+    Given I add 3 items of product "product1" in my cart
+    And my cart total should be 66.436 tax included
+    And my cart total shipping fees should be 7.0 tax included
+    When I apply the voucher code "foo4"
+    When I apply the voucher code "foo7"
     Then my cart total should be 34.218 tax included
-    #known to fail on previous
-    #Then my cart total using previous calculation method should be 34.218 tax included
 
   Scenario: one product in cart, quantity 3, one 500€ global cartRule, one 50% global cartRule
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a cart rule named "cartrule5" that applies an amount discount of 500.0 with priority 5, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule5" has a discount code "foo5"
-    Given there is a cart rule named "cartrule7" that applies a percent discount of 50.0% with priority 7, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule7" has a discount code "foo7"
-    When I add 3 items of product "product1" in my cart
-    When I use the discount "cartrule5"
-    When I use the discount "cartrule7"
+    Given I add 3 items of product "product1" in my cart
+    And my cart total should be 66.436 tax included
+    And my cart total shipping fees should be 7.0 tax included
+    When I apply the voucher code "foo5"
     Then my cart total should be 7.0 tax included
-    Then my cart total using previous calculation method should be 7.0 tax included
 
   Scenario: 3 products with several quantities in cart, one 5€ global cartRule, one 50% global cartRule
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
-    Given there is a cart rule named "cartrule4" that applies an amount discount of 5.0 with priority 4, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule4" has a discount code "foo4"
-    Given there is a cart rule named "cartrule7" that applies a percent discount of 50.0% with priority 7, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule7" has a discount code "foo7"
-    When I add 2 items of product "product2" in my cart
-    When I add 3 items of product "product1" in my cart
-    When I add 1 items of product "product3" in my cart
-    When I use the discount "cartrule4"
-    When I use the discount "cartrule7"
+    Given I add 2 items of product "product2" in my cart
+    And I add 3 items of product "product1" in my cart
+    And I add 1 items of product "product3" in my cart
+    And my cart total should be 162.4 tax included
+    And my cart total shipping fees should be 7.0 tax included
+    When I apply the voucher code "foo4"
+    And I apply the voucher code "foo7"
     Then my cart total should be 82.205 tax included
-    #known to fail on previous
-    #Then my cart total using previous calculation method should be 82.205 tax included
 
   Scenario: Percentage reduction cart rule and gift product cart rule applied to the same cart
-    Given I have an empty default cart
-    And shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    And there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    And there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
-    And there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    And cart rule "cartrule1" has a discount code "foo1"
-    And there is a cart rule named "cartrule12" that applies a percent discount of 10.0% with priority 1, quantity of 1000 and quantity per user 1000
-    And cart rule "cartrule12" has a discount code "foo12"
-    And cart rule "cartrule12" offers a gift product "product3"
+    Given there is a cart rule "cartrule12" with following properties:
+      | name[en-US]         | cartrule12 |
+      | priority            | 1          |
+      | free_shipping       | false      |
+      | code                | foo12      |
+      | discount_percentage | 10         |
+      | gift_product        | product3   |
     And I add 1 items of product "product1" in my cart
     And I should have 1 different products in my cart
-    And my cart total shipping fees should be 7.0 tax excluded
-    And my cart total should be 26.8 tax excluded
+    And my cart total shipping fees should be 7.0 tax included
+    And my cart total should be 26.8 tax included
     When I apply the voucher code "foo12"
-    Then my cart total should be 24.8 tax excluded
+    Then my cart total should be 24.8 tax included
     And I should have 2 products in my cart
-    When I apply the voucher code "foo1"
-    Then my cart total should be 15.9 tax excluded
+    When I apply the voucher code "foo2"
+    Then my cart total should be 15.9 tax included
     And I should have 2 products in my cart
-    And at least one cart rule applies today for customer with id 0
 
   Scenario: 1 product in cart, cart rule giving gift out of stock, and global cart rule should be inserted without error (test PR #8361)
-    Given I have an empty default cart
-    And shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    And there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    And there is a product in the catalog named "product4" with a price of 35.567 and 1000 items in stock
-    And product "product4" is out of stock
-    And there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    And cart rule "cartrule1" has a discount code "foo1"
-    And there is a cart rule named "cartrule13" that applies a percent discount of 10.0% with priority 13, quantity of 1000 and quantity per user 1000
-    And cart rule "cartrule13" has a discount code "foo13"
-    And cart rule "cartrule13" offers a gift product "product4"
+    Given product "product4" is out of stock
+    And there is a cart rule "cartrule13" with following properties:
+      | name[en-US]         | cartrule13 |
+      | priority            | 1          |
+      | free_shipping       | false      |
+      | code                | foo13      |
+      | discount_percentage | 10         |
+      | gift_product        | product4   |
     And I add 1 items of product "product1" in my cart
     And I should have 1 different products in my cart
-    And my cart total shipping fees should be 7.0 tax excluded
-    And my cart total should be 26.8 tax excluded
+    And my cart total shipping fees should be 7.0 tax included
+    And my cart total should be 26.8 tax included
     When I apply the voucher code "foo13"
-    Then my cart total should be 24.8 tax excluded
-    Then cart rule "cartrule1" can be applied to my cart
-    When I apply the voucher code "foo1"
-    Then my cart total should be 15.9 tax excluded
+    Then my cart total should be 24.8 tax included
+    When I apply the voucher code "foo2"
+    Then my cart total should be 15.9 tax included
     And I should have 1 products in my cart
-    And at least one cart rule applies today for customer with id 0

From 05d60e7db8fb2cdba55209cf552731356dabf185 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Wed, 24 May 2023 13:43:08 +0300
Subject: [PATCH 0248/1030]  mixed_specific feature

---
 .../FrontOffice/cart_rule_validation.feature  |  19 ++-
 .../FrontOffice/mixed_specific.feature        | 139 +++++-------------
 2 files changed, 51 insertions(+), 107 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature
index 6f4d8fc417a5c..75c59e95ded3d 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature
@@ -149,11 +149,12 @@ Feature: Cart rule application is validated before it is applied to cart
     # same with free shipping (just restricting to another product)
     Given I have an empty default cart
     And there is a cart rule "cartruleFreeShip" with following properties:
-      | name[en-US]         | cartruleFreeShip |
-      | priority            | 11               |
-      | free_shipping       | true             |
-      | code                | cartruleFreeShip |
-      | discount_percentage | 50               |
+      | name[en-US]                  | cartruleFreeShip |
+      | priority                     | 11               |
+      | free_shipping                | true             |
+      | code                         | cartruleFreeShip |
+      | discount_percentage          | 50               |
+      | apply_to_discounted_products | true             |
     And cart rule "cartruleFreeShip" is restricted to product "product1"
     And I add 1 items of product "product2" in my cart
     And my cart total shipping fees should be 7.0 tax included
@@ -161,3 +162,11 @@ Feature: Cart rule application is validated before it is applied to cart
     When I apply the voucher code "cartruleFreeShip"
     Then I should get cart rule validation error saying "You cannot use this voucher with these products"
     And my cart total should be 39.4 tax included
+    Given I have an empty default cart
+    And product "product1" is out of stock
+    And I add 1 items of product "product2" in my cart
+    And I am not allowed to add 1 items of product "product1" in my cart
+    When I apply the voucher code "cartruleFreeShip"
+    Then I should get cart rule validation error saying "You cannot use this voucher with these products"
+    When I apply the voucher code "cartrule50"
+    Then my cart total should be 23.2 tax included
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/mixed_specific.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/mixed_specific.feature
index 7c8a6bfbae7d4..ec2e7a888b194 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/mixed_specific.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/mixed_specific.feature
@@ -1,113 +1,48 @@
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags fo-cart-rule-mixed-specific
 @restore-all-tables-before-feature
+@fo-cart-rule-mixed-specific
 Feature: Cart rule (percent) calculation with multiple cart rules restricted to one product
   As a customer
   I must be able to have correct cart total when adding cart rules
 
-  Scenario: Empty cart, 2 cartRules
+  Background:
     Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a cart rule named "cartrule10" that applies a percent discount of 50.0% with priority 10, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule10" is restricted to product "product2"
-    Given cart rule "cartrule10" has a discount code "foo10"
-    Given there is a cart rule named "cartrule8" that applies an amount discount of 5.0 with priority 8, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule8" is restricted to product "product2"
-    Given cart rule "cartrule8" has a discount code "foo8"
-    Then I should have 0 different products in my cart
-    When I use the discount "cartrule10"
-    When I use the discount "cartrule8"
-    Then my cart total should be 0.0 tax included
-    Then my cart total using previous calculation method should be 0.0 tax included
-
-  Scenario: one product in cart, quantity 1, specific 5€ cartRule on product #2, specific 50% cartRule on product #2
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a cart rule named "cartrule10" that applies a percent discount of 50.0% with priority 10, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule10" is restricted to product "product2"
-    Given cart rule "cartrule10" has a discount code "foo10"
-    Given there is a cart rule named "cartrule8" that applies an amount discount of 5.0 with priority 8, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule8" is restricted to product "product2"
-    Given cart rule "cartrule8" has a discount code "foo8"
-    When I add 1 items of product "product1" in my cart
-    When I use the discount "cartrule10"
-    When I use the discount "cartrule8"
-    Then my cart total should be 26.812 tax included
-    Then my cart total using previous calculation method should be 26.812 tax included
-
-  Scenario: one product in cart, quantity 3, specific 5€ cartRule on product #2, specific 50% cartRule on product #2
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a cart rule named "cartrule10" that applies a percent discount of 50.0% with priority 10, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule10" is restricted to product "product2"
-    Given cart rule "cartrule10" has a discount code "foo10"
-    Given there is a cart rule named "cartrule8" that applies an amount discount of 5.0 with priority 8, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule8" is restricted to product "product2"
-    Given cart rule "cartrule8" has a discount code "foo8"
-    When I add 3 items of product "product1" in my cart
-    When I use the discount "cartrule10"
-    When I use the discount "cartrule8"
-    Then my cart total should be 66.436 tax included
-    Then my cart total using previous calculation method should be 66.436 tax included
+    And there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
+    And shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
+    And there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+    And there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
+    And there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
+    And there is a cart rule "cartrule10" with following properties:
+      | name[en-US]         | cartrule10 |
+      | priority            | 10         |
+      | free_shipping       | false      |
+      | code                | foo10      |
+      | discount_percentage | 50         |
+    And cart rule "cartrule10" is restricted to product "product2"
+    And there is a cart rule "cartrule8" with following properties:
+      | name[en-US]           | cartrule8 |
+      | priority              | 8         |
+      | free_shipping         | false     |
+      | code                  | foo8      |
+      | discount_amount       | 5         |
+      | discount_currency     | usd       |
+      | discount_includes_tax | false     |
+    And cart rule "cartrule8" is restricted to product "product2"
 
   Scenario: one product #2 in cart, quantity 3, specific 5€ cartRule on product #2, specific 50% cartRule on product #2
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a cart rule named "cartrule10" that applies a percent discount of 50.0% with priority 10, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule10" is restricted to product "product2"
-    Given cart rule "cartrule10" has a discount code "foo10"
-    Given there is a cart rule named "cartrule8" that applies an amount discount of 5.0 with priority 8, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule8" is restricted to product "product2"
-    Given cart rule "cartrule8" has a discount code "foo8"
-    When I add 3 items of product "product2" in my cart
-    When I use the discount "cartrule10"
-    When I use the discount "cartrule8"
-    Then my cart total should be 53.082 tax included
-    #known to fail on previous
-    #Then my cart total using previous calculation method should be 53.082 tax included
+    Given I add 3 items of product "product2" in my cart
+    And my cart total shipping fees should be 7.0 tax included
+    And my cart total should be 104.2 tax included
+    When I apply the voucher code "foo10"
+    And I apply the voucher code "foo8"
+    And my cart total should be 53.082 tax included
 
   Scenario: 3 products in cart, several quantities, specific 5€ cartRule on product #2, specific 50% cartRule on product #2
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
-    Given there is a cart rule named "cartrule10" that applies a percent discount of 50.0% with priority 10, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule10" is restricted to product "product2"
-    Given cart rule "cartrule10" has a discount code "foo10"
-    Given there is a cart rule named "cartrule8" that applies an amount discount of 5.0 with priority 8, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule8" is restricted to product "product2"
-    Given cart rule "cartrule8" has a discount code "foo8"
-    When I add 3 items of product "product1" in my cart
-    When I add 2 items of product "product2" in my cart
-    When I add 1 items of product "product3" in my cart
-    When I use the discount "cartrule10"
-    When I use the discount "cartrule8"
+    Given I add 3 items of product "product1" in my cart
+    And I add 2 items of product "product2" in my cart
+    And I add 1 items of product "product3" in my cart
+    And my cart total shipping fees should be 7.0 tax included
+    And my cart total should be 162.4 tax included
+    When I apply the voucher code "foo10"
+    And I apply the voucher code "foo8"
     Then my cart total should be 127.512 tax included
-    #known to fail on previous
-    #Then my cart total using previous calculation method should be 127.512 tax included
-
-  Scenario: 2 products in cart, one is out of stock, specific 5€ cartRule on product #2, specific 50% cartRule on product #2
-    Given I have an empty default cart
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
-    Given there is a product in the catalog named "product4" with a price of 35.567 and 1000 items in stock
-    Given product "product4" is out of stock
-    Given there is a cart rule named "cartrule10" that applies a percent discount of 50.0% with priority 10, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule10" is restricted to product "product2"
-    Given cart rule "cartrule10" has a discount code "foo10"
-    Given there is a cart rule named "cartrule8" that applies an amount discount of 5.0 with priority 8, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule8" is restricted to product "product2"
-    Given cart rule "cartrule8" has a discount code "foo8"
-    When I add 3 items of product "product1" in my cart
-    When I am not allowed to add 1 items of product "product4" in my cart
-    When I use the discount "cartrule10"
-    When I use the discount "cartrule8"
-    Then my cart total should be 66.436 tax included
-    Then my cart total using previous calculation method should be 66.436 tax included

From 1025b86480f3d893a85ce3d6aa8a11ba4a2640b9 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Wed, 24 May 2023 13:48:33 +0300
Subject: [PATCH 0249/1030]  fix customer reference

---
 .../Scenario/Cart/CartRule/BackOffice/gift_cartrule.feature     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/gift_cartrule.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/gift_cartrule.feature
index bcd10894de553..897ca6f7da665 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/gift_cartrule.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/gift_cartrule.feature
@@ -11,7 +11,7 @@ Feature: Apply cart rule to cart from Back Office (BO)
 
   Scenario: 1 product in cart, 1 automatic cart rule offering free gift, change the product quantity and check split cart quantities
     Given I am logged in as "test@prestashop.com" employee
-    Given I create an empty cart "dummy_custom_cart" for customer "customer1"
+    Given I create an empty cart "dummy_custom_cart" for customer "testCustomer"
     Given email sending is disabled
     Given shipping handling fees are set to 2.0
     Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock

From a5a044ee4ec476e0ea2be50cc1310cdd2979601a Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Wed, 24 May 2023 15:01:31 +0300
Subject: [PATCH 0250/1030]  clean shared storage when restoring tables

---
 .../AbstractPrestaShopFeatureContext.php      |   2 +
 .../Context/CartRuleFeatureContext.php        | 102 ++++++++++--------
 .../Features/Context/CommonFeatureContext.php |   2 +
 .../Context/Domain/CartFeatureContext.php     |   6 +-
 .../CartRule/BackOffice/gift_cartrule.feature |  48 ++++-----
 .../Cart/CartRule/FrontOffice/carrier.feature |   6 --
 6 files changed, 93 insertions(+), 73 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Context/AbstractPrestaShopFeatureContext.php b/tests/Integration/Behaviour/Features/Context/AbstractPrestaShopFeatureContext.php
index f4dc95a0f10bc..1df3a85763bf2 100644
--- a/tests/Integration/Behaviour/Features/Context/AbstractPrestaShopFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/AbstractPrestaShopFeatureContext.php
@@ -37,6 +37,8 @@
  */
 abstract class AbstractPrestaShopFeatureContext implements BehatContext
 {
+    use SharedStorageTrait;
+
     public const MODULES_DIRECTORY = __DIR__ . '/../../../../Resources/modules';
 
     protected function checkFixtureExists(array $fixtures, $fixtureName, $fixtureIndex)
diff --git a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
index 3ce0c501749a0..5480da3b59dbd 100644
--- a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
@@ -39,6 +39,7 @@
 use Order;
 use PHPUnit\Framework\Assert;
 use PrestaShop\Decimal\DecimalNumber;
+use PrestaShop\PrestaShop\Adapter\CartRule\LegacyDiscountApplicationType;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleValidityException;
 use RuntimeException;
 use Validate;
@@ -163,8 +164,7 @@ protected function createCartRule(
         $cartRule->date_to = $now->format('Y-m-d H:i:s');
         $cartRule->active = true;
         $cartRule->add();
-        $this->cartRules[$cartRuleName] = $cartRule;
-        SharedStorage::getStorage()->set($cartRuleName, $cartRule->id);
+        $this->getSharedStorage()->set($cartRuleName, $cartRule->id);
     }
 
     /**
@@ -206,10 +206,11 @@ public function cartRuleWithProductRuleRestriction(string $cartRuleName, string
      */
     public function cartRuleNamedHasACode($cartRuleName, $cartRuleCode)
     {
-        $this->checkCartRuleWithNameExists($cartRuleName);
-        $this->cartRules[$cartRuleName]->code = $cartRuleCode;
-        $this->cartRules[$cartRuleName]->save();
-        SharedStorage::getStorage()->set($cartRuleCode, $this->cartRules[$cartRuleName]->id);
+        $cartRule = $this->loadCartRule($cartRuleName);
+        $cartRule->code = $cartRuleCode;
+        $cartRule->save();
+
+        $this->getSharedStorage()->set($cartRuleCode, (int) $cartRule->id);
     }
 
     /**
@@ -217,9 +218,9 @@ public function cartRuleNamedHasACode($cartRuleName, $cartRuleCode)
      */
     public function cartRuleNamedHasNoCode($cartRuleName)
     {
-        $this->checkCartRuleWithNameExists($cartRuleName);
-        $this->cartRules[$cartRuleName]->code = '';
-        $this->cartRules[$cartRuleName]->save();
+        $cartRule = $this->loadCartRule($cartRuleName);
+        $cartRule->code = '';
+        $cartRule->save();
     }
 
     /**
@@ -326,9 +327,9 @@ public function cartRuleNamedIsRestrictedToCountryNamed(string $cartRuleName, st
      */
     public function cartRuleIsRestrictedToSelectionProducts(string $cartRuleName): void
     {
-        $this->checkCartRuleWithNameExists($cartRuleName);
-        $this->cartRules[$cartRuleName]->reduction_product = -2;
-        $this->cartRules[$cartRuleName]->save();
+        $cartRule = $this->loadCartRule($cartRuleName);
+        $cartRule->reduction_product = LegacyDiscountApplicationType::SELECTED_PRODUCTS;
+        $cartRule->save();
     }
 
     /**
@@ -336,10 +337,10 @@ public function cartRuleIsRestrictedToSelectionProducts(string $cartRuleName): v
      */
     public function cartRuleIsRestrictedToEveryOrder($cartRuleName)
     {
-        $this->checkCartRuleWithNameExists($cartRuleName);
-        $this->cartRules[$cartRuleName]->product_restriction = false;
-        $this->cartRules[$cartRuleName]->reduction_product = 0;
-        $this->cartRules[$cartRuleName]->save();
+        $cartRule = $this->loadCartRule($cartRuleName);
+        $cartRule->product_restriction = false;
+        $cartRule->reduction_product = 0;
+        $cartRule->save();
     }
 
     /**
@@ -347,9 +348,9 @@ public function cartRuleIsRestrictedToEveryOrder($cartRuleName)
      */
     public function cartRuleIsDisabled($cartRuleName)
     {
-        $this->checkCartRuleWithNameExists($cartRuleName);
-        $this->cartRules[$cartRuleName]->active = false;
-        $this->cartRules[$cartRuleName]->save();
+        $cartRule = $this->loadCartRule($cartRuleName);
+        $cartRule->active = false;
+        $cartRule->save();
     }
 
     /**
@@ -357,9 +358,9 @@ public function cartRuleIsDisabled($cartRuleName)
      */
     public function enableCartRule($cartRuleName)
     {
-        $this->checkCartRuleWithNameExists($cartRuleName);
-        $this->cartRules[$cartRuleName]->active = true;
-        $this->cartRules[$cartRuleName]->save();
+        $cartRule = $this->loadCartRule($cartRuleName);
+        $cartRule->active = true;
+        $cartRule->save();
     }
 
     /**
@@ -367,9 +368,9 @@ public function enableCartRule($cartRuleName)
      */
     public function cartRuleDoesNotApplyToDiscountedProduct($cartRuleName)
     {
-        $this->checkCartRuleWithNameExists($cartRuleName);
-        $this->cartRules[$cartRuleName]->reduction_exclude_special = true;
-        $this->cartRules[$cartRuleName]->save();
+        $cartRule = $this->loadCartRule($cartRuleName);
+        $cartRule->reduction_exclude_special = true;
+        $cartRule->save();
     }
 
     /**
@@ -377,10 +378,10 @@ public function cartRuleDoesNotApplyToDiscountedProduct($cartRuleName)
      */
     public function cartRuleNamedHasAGiftProductNamed($cartRuleName, $productName)
     {
-        $this->checkCartRuleWithNameExists($cartRuleName);
         $this->productFeatureContext->checkProductWithNameExists($productName);
-        $this->cartRules[$cartRuleName]->gift_product = $this->productFeatureContext->getProductWithName($productName)->id;
-        $this->cartRules[$cartRuleName]->save();
+        $cartRule = $this->loadCartRule($cartRuleName);
+        $cartRule->gift_product = $this->productFeatureContext->getProductWithName($productName)->id;
+        $cartRule->save();
     }
 
     /**
@@ -388,9 +389,9 @@ public function cartRuleNamedHasAGiftProductNamed($cartRuleName, $productName)
      */
     public function cartRuleOffersFreeShipping($cartRuleName)
     {
-        $this->checkCartRuleWithNameExists($cartRuleName);
-        $this->cartRules[$cartRuleName]->free_shipping = true;
-        $this->cartRules[$cartRuleName]->save();
+        $cartRule = $this->loadCartRule($cartRuleName);
+        $cartRule->free_shipping = true;
+        $cartRule->save();
     }
 
     /**
@@ -398,9 +399,9 @@ public function cartRuleOffersFreeShipping($cartRuleName)
      */
     public function cartRuleAppliesBetween($cartRuleName, $min)
     {
-        $this->checkCartRuleWithNameExists($cartRuleName);
-        $this->cartRules[$cartRuleName]->minimum_amount = $min;
-        $this->cartRules[$cartRuleName]->save();
+        $cartRule = $this->loadCartRule($cartRuleName);
+        $cartRule->minimum_amount = $min;
+        $cartRule->save();
     }
 
     /**
@@ -408,8 +409,9 @@ public function cartRuleAppliesBetween($cartRuleName, $min)
      */
     public function cartRuleNamedCannotBeAppliedToMyCart($cartRuleName)
     {
-        $this->checkCartRuleWithNameExists($cartRuleName);
-        $result = $this->cartRules[$cartRuleName]->checkValidity(\Context::getContext(), false, false);
+        $cartRule = $this->loadCartRule($cartRuleName);
+        $result = $cartRule->checkValidity(\Context::getContext(), false, false);
+
         if ($result) {
             throw new \RuntimeException(sprintf('Expects false, got %s instead', $result));
         }
@@ -420,8 +422,9 @@ public function cartRuleNamedCannotBeAppliedToMyCart($cartRuleName)
      */
     public function cartRuleNamedCanBeAppliedToMyCart($cartRuleName)
     {
-        $this->checkCartRuleWithNameExists($cartRuleName);
-        $result = $this->cartRules[$cartRuleName]->checkValidity(\Context::getContext(), false, false);
+        $cartRule = $this->loadCartRule($cartRuleName);
+        $result = $cartRule->checkValidity(\Context::getContext(), false, false);
+
         if (!$result) {
             throw new \RuntimeException(sprintf('Expects true, got %s instead', $result));
         }
@@ -434,8 +437,8 @@ public function cartRuleNamedCanBeAppliedToMyCart($cartRuleName)
      */
     public function iAddCartRuleNamedToMyCart(string $cartRuleName): void
     {
-        $this->checkCartRuleWithNameExists($cartRuleName);
-        $this->getCurrentCart()->addCartRule($this->cartRules[$cartRuleName]->id);
+        $cartRule = $this->loadCartRule($cartRuleName);
+        $this->getCurrentCart()->addCartRule($cartRule->id);
     }
 
     /**
@@ -447,8 +450,7 @@ public function iAddCartRuleNamedToMyCart(string $cartRuleName): void
      */
     public function applyCartRuleByCode(string $code): void
     {
-        $cartRuleId = $this->getSharedStorage()->get($code);
-        $cartRule = new CartRule($cartRuleId);
+        $cartRule = $this->loadCartRule($code);
 
         if (!Validate::isLoadedObject($cartRule)) {
             throw new RuntimeException(sprintf('Failed to load cart rule %d', $cartRule->id));
@@ -686,4 +688,20 @@ private function getCartRuleValidityCodeByMessage(string $message): int
             $message
         ));
     }
+
+    /**
+     * This method is temporary. We will get rid of it once all old cart rule creation/edition steps are cleaned up
+     *
+     * @param string $reference
+     *
+     * @return CartRule
+     */
+    private function loadCartRule(string $reference): CartRule
+    {
+        if (!$this->getSharedStorage()->exists($reference)) {
+            throw new RuntimeException('Cart rule "%s" does not exist in shared storage', $reference);
+        }
+
+        return new CartRule($this->getSharedStorage()->get($reference));
+    }
 }
diff --git a/tests/Integration/Behaviour/Features/Context/CommonFeatureContext.php b/tests/Integration/Behaviour/Features/Context/CommonFeatureContext.php
index 674c768ddebf6..3d46394a4ab95 100644
--- a/tests/Integration/Behaviour/Features/Context/CommonFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/CommonFeatureContext.php
@@ -190,6 +190,7 @@ public static function prepare(BeforeSuiteScope $scope)
     public static function restoreAllTablesBeforeFeature()
     {
         DatabaseDump::restoreAllTables();
+        SharedStorage::getStorage()->clean();
         require_once _PS_ROOT_DIR_ . '/config/config.inc.php';
     }
 
@@ -201,6 +202,7 @@ public static function restoreAllTablesBeforeFeature()
     public static function restoreAllTablesAfterFeature()
     {
         DatabaseDump::restoreAllTables();
+        SharedStorage::getStorage()->clean();
         require_once _PS_ROOT_DIR_ . '/config/config.inc.php';
     }
 
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartFeatureContext.php
index e09f772ebbdd3..22fdaeeac44dc 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartFeatureContext.php
@@ -583,7 +583,7 @@ public function useDiscountVoucherOnCart(string $voucherCode, float $discountAmo
      */
     public function useDiscountByCodeOnCart(string $voucherCode, string $cartReference)
     {
-        $cartId = SharedStorage::getStorage()->get($cartReference);
+        $cartId = $this->getSharedStorage()->get($cartReference);
         $cartRuleId = $this->getSharedStorage()->get($voucherCode);
 
         $this->getCommandBus()->handle(
@@ -878,6 +878,10 @@ public function assertCartShippingIsFree(string $cartReference)
     public function addGiftPlusFreeShippingCartRule(string $voucherCode, string $giftProductName, string $cartReference)
     {
         $productId = $this->getProductIdByName($giftProductName);
+
+        if (!(new Product($productId))->id) {
+            throw new RuntimeException(sprintf('Product %d was not found', $productId));
+        }
         $cartRule = $this->createCommonCartRule($voucherCode);
         $cartRule->free_shipping = true;
         $cartRule->gift_product = $productId;
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/gift_cartrule.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/gift_cartrule.feature
index 897ca6f7da665..37b229217e913 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/gift_cartrule.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/gift_cartrule.feature
@@ -9,6 +9,30 @@ Feature: Apply cart rule to cart from Back Office (BO)
     And there is customer "testCustomer" with email "pub@prestashop.com"
     And country "US" is enabled
 
+  Scenario: Add cart rule which provides gift product and free shipping
+    Given I create an empty cart "dummy_cart_1" for customer "testCustomer"
+    And I select "US" address as delivery and invoice address for customer "testCustomer" in cart "dummy_cart_1"
+    And I add 2 products "Mug The best is yet to come" to the cart "dummy_cart_1"
+    And product "Mug The best is yet to come" quantity in cart dummy_cart_1 should be 2 excluding gift products
+    When I use a voucher "gift+freeShip" which provides a gift product "Mountain fox notebook" and free shipping on the cart "dummy_cart_1"
+    Then gifted product "Mountain fox notebook" quantity in cart "dummy_cart_1" should be 1
+    And cart "dummy_cart_1" should have free shipping
+    And reduction value of voucher "gift+freeShip" in cart "dummy_cart_1" should be "19.9"
+
+  Scenario: Add multiple cart rules which uses same gift product to the cart which already has paid products identical to those gifts
+    Given I create an empty cart "dummy_cart_2" for customer "testCustomer"
+    And I select "US" address as delivery and invoice address for customer "testCustomer" in cart "dummy_cart_2"
+    And I add 2 products "Mountain fox notebook" to the cart "dummy_cart_2"
+    And product "Mountain fox notebook" quantity in cart "dummy_cart_2" should be 2 excluding gift products
+    When I use a voucher "foxGift1" which provides a gift product "Mountain fox notebook" on the cart "dummy_cart_2"
+    Then product "Mountain fox notebook" quantity in cart "dummy_cart_2" should be 2 excluding gift products
+    And gifted product "Mountain fox notebook" quantity in cart "dummy_cart_2" should be 1
+    And reduction value of voucher "foxGift1" in cart "dummy_cart_2" should be "12.9"
+    When I use a voucher "foxGift2" which provides a gift product "Mountain fox notebook" on the cart "dummy_cart_2"
+    Then product "Mountain fox notebook" quantity in cart "dummy_cart_2" should be 2 excluding gift products
+    And gifted product "Mountain fox notebook" quantity in cart "dummy_cart_2" should be 2
+    And reduction value of voucher "foxGift2" in cart "dummy_cart_2" should be "12.9"
+
   Scenario: 1 product in cart, 1 automatic cart rule offering free gift, change the product quantity and check split cart quantities
     Given I am logged in as "test@prestashop.com" employee
     Given I create an empty cart "dummy_custom_cart" for customer "testCustomer"
@@ -41,27 +65,3 @@ Feature: Apply cart rule to cart from Back Office (BO)
     And gifted product "product4" quantity in cart "dummy_custom_cart" should be 1
     And cart "dummy_custom_cart" should contain 3 products
     And cart "dummy_custom_cart" should contain 2 products excluding gifts
-
-  Scenario: Add cart rule which provides gift product and free shipping
-    Given I create an empty cart "dummy_cart_1" for customer "testCustomer"
-    And I select "US" address as delivery and invoice address for customer "testCustomer" in cart "dummy_cart_1"
-    And I add 2 products "Mug The best is yet to come" to the cart "dummy_cart_1"
-    And product "Mug The best is yet to come" quantity in cart dummy_cart_1 should be 2 excluding gift products
-    When I use a voucher "gift+freeShip" which provides a gift product "Mountain fox notebook" and free shipping on the cart "dummy_cart_1"
-    Then gifted product "Mountain fox notebook" quantity in cart "dummy_cart_1" should be 1
-    And cart "dummy_cart_1" should have free shipping
-    And reduction value of voucher "gift+freeShip" in cart "dummy_cart_1" should be "19.9"
-
-  Scenario: Add multiple cart rules which uses same gift product to the cart which already has paid products identical to those gifts
-    Given I create an empty cart "dummy_cart_2" for customer "testCustomer"
-    And I select "US" address as delivery and invoice address for customer "testCustomer" in cart "dummy_cart_2"
-    And I add 2 products "Mountain fox notebook" to the cart "dummy_cart_2"
-    And product "Mountain fox notebook" quantity in cart "dummy_cart_2" should be 2 excluding gift products
-    When I use a voucher "foxGift1" which provides a gift product "Mountain fox notebook" on the cart "dummy_cart_2"
-    Then product "Mountain fox notebook" quantity in cart "dummy_cart_2" should be 2 excluding gift products
-    And gifted product "Mountain fox notebook" quantity in cart "dummy_cart_2" should be 1
-    And reduction value of voucher "foxGift1" in cart "dummy_cart_2" should be "12.9"
-    When I use a voucher "foxGift2" which provides a gift product "Mountain fox notebook" on the cart "dummy_cart_2"
-    Then product "Mountain fox notebook" quantity in cart "dummy_cart_2" should be 2 excluding gift products
-    And gifted product "Mountain fox notebook" quantity in cart "dummy_cart_2" should be 2
-    And reduction value of voucher "foxGift2" in cart "dummy_cart_2" should be "12.9"
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/carrier.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/carrier.feature
index bb83b34b5c64c..313e380b8c90b 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/carrier.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/carrier.feature
@@ -35,8 +35,6 @@ Feature: Cart calculation with cart rules and different carriers
     And shipping handling fees are set to 2.0
     And there is a cart rule "cartrule5" with following properties:
       | name[en-US]                      | cartrule5 |
-      | total_quantity                   | 1000      |
-      | quantity_per_user                | 1000      |
       | priority                         | 2         |
       | free_shipping                    | true      |
       | code                             | foo5      |
@@ -46,8 +44,6 @@ Feature: Cart calculation with cart rules and different carriers
       | minimum_amount_shipping_included | false     |
     And there is a cart rule "cartrule2" with following properties:
       | name[en-US]                  | cartrule2              |
-      | total_quantity               | 1000                   |
-      | quantity_per_user            | 1000                   |
       | priority                     | 2                      |
       | free_shipping                | false                  |
       | code                         | cartrule2              |
@@ -68,8 +64,6 @@ Feature: Cart calculation with cart rules and different carriers
   Scenario: free carrier in price range, voucher in amount set the price bellow range
     Given there is a cart rule "cartrule3" with following properties:
       | name[en-US]                  | cartrule3              |
-      | total_quantity               | 1000                   |
-      | quantity_per_user            | 1000                   |
       | priority                     | 2                      |
       | free_shipping                | false                  |
       | code                         | foo2                   |

From 490ea5e1f3641edc3399ec0b4ed4277f58b7287e Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Tue, 13 Jun 2023 16:15:30 +0300
Subject: [PATCH 0251/1030]  fix removing specific product rule when removing
 that product from cart

---
 .../Order/Refund/OrderProductRemover.php      | 32 ++++++++
 .../Context/CartRuleFeatureContext.php        |  3 +-
 .../AbstractCartRuleFeatureContext.php        | 15 +---
 .../Scenario/Order/order_cart_rules.feature   | 74 ++++++++++++++-----
 4 files changed, 90 insertions(+), 34 deletions(-)

diff --git a/src/Adapter/Order/Refund/OrderProductRemover.php b/src/Adapter/Order/Refund/OrderProductRemover.php
index 4d86a5735e211..40121a4d85ff1 100644
--- a/src/Adapter/Order/Refund/OrderProductRemover.php
+++ b/src/Adapter/Order/Refund/OrderProductRemover.php
@@ -61,6 +61,7 @@ public function deleteProductFromOrder(
     ): CartProductsComparator {
         $cart = new Cart($order->id_cart);
 
+        $this->removeSpecificProductCartRules($order, $orderDetail);
         // Important to remove order cart rule before the product is removed, so that cart rule can detect if it's applied on it
         $this->deleteOrderCartRule($order, $orderDetail, $cart);
 
@@ -231,4 +232,35 @@ private function deleteSpecificPrice(
             $specificPrice->delete();
         }
     }
+
+    /**
+     * This method removes cart rules which was applied to specific product when that product is being deleted.
+     *
+     * @param Order $order
+     * @param OrderDetail $orderDetail
+     *
+     * @return void
+     */
+    private function removeSpecificProductCartRules(
+        Order $order,
+        OrderDetail $orderDetail
+    ): void {
+        foreach ($order->getCartRules() as $orderCartRule) {
+            $cartRuleId = (int) $orderCartRule['id_cart_rule'];
+            $cartRule = new CartRule($cartRuleId);
+
+            if ($cartRuleId === (int) $cartRule->id && (int) $cartRule->reduction_product !== (int) $orderDetail->product_id) {
+                continue;
+            }
+
+            $orderCartRuleId = (int) $orderCartRule['id_order_cart_rule'];
+            $orderCartRuleObj = new OrderCartRule($orderCartRuleId);
+            if ((int) $orderCartRuleObj->id !== $orderCartRuleId) {
+                continue;
+            }
+
+            $orderCartRuleObj->deleted = true;
+            $orderCartRuleObj->save();
+        }
+    }
 }
diff --git a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
index 5480da3b59dbd..c5ccc1b4ab304 100644
--- a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
@@ -244,6 +244,7 @@ public function cartRuleNamedIsRestrictedToProductNamed(
         $restrictedProduct = $this->productFeatureContext->getProductWithName($productName);
         $cartRule = new CartRule($cartRuleId);
         $cartRule->product_restriction = true;
+        //@todo: product restriction and reduction_product are 2 different features. Should they really be mixed in here to one?
         $cartRule->reduction_product = $restrictedProduct->id;
         $cartRule->save();
         $this->cartRules[$cartRuleName] = $cartRule;
@@ -699,7 +700,7 @@ private function getCartRuleValidityCodeByMessage(string $message): int
     private function loadCartRule(string $reference): CartRule
     {
         if (!$this->getSharedStorage()->exists($reference)) {
-            throw new RuntimeException('Cart rule "%s" does not exist in shared storage', $reference);
+            throw new RuntimeException(sprintf('Cart rule "%s" does not exist in shared storage', $reference));
         }
 
         return new CartRule($this->getSharedStorage()->get($reference));
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
index 904069d3a6b7d..617e2ee6108d2 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
@@ -53,20 +53,7 @@ abstract class AbstractCartRuleFeatureContext extends AbstractDomainFeatureConte
      */
     public static function restoreCartRules(): void
     {
-        DatabaseDump::restoreTables(['cart_rule', 'cart_rule_shop']);
-        DatabaseDump::restoreTables([
-            'cart_rule',
-            'cart_rule_shop',
-            'cart_rule_lang',
-            'cart_cart_rule',
-            'cart_rule_carrier',
-            'cart_rule_combination',
-            'cart_rule_country',
-            'cart_rule_group',
-            'cart_rule_product_rule',
-            'cart_rule_product_rule_group',
-            'cart_rule_product_rule_value',
-        ]);
+        DatabaseDump::restoreMatchingTables('^cart_rule.*^');
     }
 
     public function createCartRuleWithReference(string $cartRuleReference, array $data): void
diff --git a/tests/Integration/Behaviour/Features/Scenario/Order/order_cart_rules.feature b/tests/Integration/Behaviour/Features/Scenario/Order/order_cart_rules.feature
index a72aa177570bd..f83889cc083fc 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Order/order_cart_rules.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Order/order_cart_rules.feature
@@ -9,6 +9,8 @@ Feature: Order from Back Office (BO)
 
   Background:
     Given email sending is disabled
+    And shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
+    And there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
     And the current currency is "USD"
     And country "US" is enabled
     And language with iso code "en" is the default one
@@ -41,11 +43,17 @@ Feature: Order from Back Office (BO)
       | total_paid_real          | 0.0    |
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
     And there is a product in the catalog named "Test Product Cart Rule On Select Product" with a price of 15.0 and 100 items in stock
-    And there is a cart rule named "CartRuleAmountOnSelectedProduct" that applies an amount discount of 500.0 with priority 1, quantity of 100 and quantity per user 100
-    And cart rule "CartRuleAmountOnSelectedProduct" has no discount code
-    And cart rule "CartRuleAmountOnSelectedProduct" is restricted to product "Test Product Cart Rule On Select Product"
+    And there is a cart rule "CartRuleAmountOnSelectedProduct" with following properties:
+      | name[en-US]               | CartRuleAmountOnSelectedProduct          |
+      | priority                  | 1                                        |
+      | discount_amount           | 500                                      |
+      | discount_currency         | usd                                      |
+      | discount_application_type | specific_product                         |
+      | discount_product          | Test Product Cart Rule On Select Product |
+      | discount_includes_tax     | true                                     |
+      | quantity                  | 100                                      |
+      | quantity_per_user         | 100                                      |
     When I add products to order "bo_order1" with new invoice and the following products details:
       | name   | Test Product Cart Rule On Select Product |
       | amount | 1                                        |
@@ -81,6 +89,7 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
 
+  @restore-cart-rules-before-scenario
   Scenario: Add product linked to a cart rule to an existing Order without invoice with free shipping and new invoice And update the product quantity and price
     Given order with reference "bo_order1" does not contain product "Mug Today is a good day"
     Then order "bo_order1" should have 2 products in total
@@ -97,7 +106,6 @@ Feature: Order from Back Office (BO)
       | total_paid_real          | 0.0    |
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
     And there is a product in the catalog named "Test Product Cart Rule On Select Product" with a price of 15.0 and 100 items in stock
     And there is a cart rule named "CartRuleAmountOnSelectedProduct" that applies an amount discount of 500.0 with priority 1, quantity of 100 and quantity per user 100
     And cart rule "CartRuleAmountOnSelectedProduct" has no discount code
@@ -225,6 +233,7 @@ Feature: Order from Back Office (BO)
 #      | total_shipping_tax_excl  | 14.00  |
 #      | total_shipping_tax_incl  | 14.84  |
 
+  @restore-cart-rules-before-scenario
   Scenario: Add discount to all orders, when a product is added the discount is applied, when a product is removed the discount should still be present
     Given order with reference "bo_order1" does not contain product "Mug Today is a good day"
     Then order "bo_order1" should have 2 products in total
@@ -241,10 +250,15 @@ Feature: Order from Back Office (BO)
       | total_paid_real          | 0.0    |
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
     And there is a product in the catalog named "Test Product Cart Rule On Order" with a price of 15.0 and 100 items in stock
-    Given there is a cart rule named "CartRuleAmountOnWholeOrder" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    And cart rule "CartRuleAmountOnWholeOrder" is applied on every order
+    And there is a cart rule "CartRuleAmountOnEveryOrder" with following properties:
+      | name[en-US]               | CartRuleAmountOnEveryOrder |
+      | priority                  | 1                          |
+      | free_shipping             | false                      |
+      | discount_percentage       | 50                         |
+      | discount_application_type | order_without_shipping     |
+      | quantity                  | 1000                       |
+      | quantity_per_user         | 1000                       |
     When I add products to order "bo_order1" with new invoice and the following products details:
       | name   | Test Product Cart Rule On Order |
       | amount | 1                               |
@@ -252,7 +266,7 @@ Feature: Order from Back Office (BO)
     Then order "bo_order1" should have 3 products in total
     Then order "bo_order1" should contain 1 product "Test Product Cart Rule On Order"
     Then order "bo_order1" should have 1 cart rule
-    Then order "bo_order1" should have cart rule "CartRuleAmountOnWholeOrder" with amount "$19.40"
+    Then order "bo_order1" should have cart rule "CartRuleAmountOnEveryOrder" with amount "$19.40"
     Then order "bo_order1" should have following details:
       | total_products           | 38.800 |
       | total_products_wt        | 41.130 |
@@ -268,7 +282,7 @@ Feature: Order from Back Office (BO)
     Then order "bo_order1" should have 2 products in total
     Then order "bo_order1" should contain 0 product "Test Product Cart Rule On Order"
     Then order "bo_order1" should have 1 cart rule
-    Then order "bo_order1" should have cart rule "CartRuleAmountOnWholeOrder" with amount "$11.90"
+    Then order "bo_order1" should have cart rule "CartRuleAmountOnEveryOrder" with amount "$11.90"
     Then order "bo_order1" should have following details:
       | total_products           | 23.800 |
       | total_products_wt        | 25.230 |
@@ -281,6 +295,7 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
 
+  @restore-cart-rules-before-scenario
   Scenario: Add discount to every orders, I remove the discount from order, it is automatically added again until I inactivate it
     Given order with reference "bo_order1" does not contain product "Mug Today is a good day"
     Then order "bo_order1" should have 2 products in total
@@ -297,10 +312,15 @@ Feature: Order from Back Office (BO)
       | total_paid_real          | 0.0    |
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
     And there is a product in the catalog named "Test Product Cart Rule On Order" with a price of 15.0 and 100 items in stock
-    Given there is a cart rule named "CartRuleAmountOnEveryOrder" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    And cart rule "CartRuleAmountOnEveryOrder" is applied on every order
+    And there is a cart rule "CartRuleAmountOnEveryOrder" with following properties:
+      | name[en-US]               | CartRuleAmountOnEveryOrder |
+      | priority                  | 1                          |
+      | free_shipping             | false                      |
+      | discount_percentage       | 50                         |
+      | discount_application_type | order_without_shipping     |
+      | quantity                  | 1000                       |
+      | quantity_per_user         | 1000                       |
     When I add products to order "bo_order1" with new invoice and the following products details:
       | name   | Test Product Cart Rule On Order |
       | amount | 1                               |
@@ -353,6 +373,7 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
 
+  @restore-cart-rules-before-scenario
   Scenario: Add product with associated discount to order, Add discount to the specific order, when I remove a product the order specific discount is still present
     Given order with reference "bo_order1" does not contain product "Mug Today is a good day"
     Then order "bo_order1" should have 2 products in total
@@ -369,9 +390,16 @@ Feature: Order from Back Office (BO)
       | total_paid_real          | 0.0    |
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
     And there is a product in the catalog named "Test Product With Percent Discount" with a price of 350.00 and 100 items in stock
-    Given there is a cart rule named "CartRulePercentForSpecificProduct" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
+    And there is a cart rule "CartRulePercentForSpecificProduct" with following properties:
+      | name[en-US]               | CartRulePercentForSpecificProduct  |
+      | priority                  | 1                                  |
+      | free_shipping             | false                              |
+      | discount_percentage       | 50                                 |
+      | discount_application_type | specific_product                   |
+      | quantity                  | 1000                               |
+      | quantity_per_user         | 1000                               |
+      | discount_product          | Test Product With Percent Discount |
     And cart rule "CartRulePercentForSpecificProduct" is restricted to product "Test Product With Percent Discount"
     When I add products to order "bo_order1" with new invoice and the following products details:
       | name   | Test Product With Percent Discount |
@@ -413,6 +441,7 @@ Feature: Order from Back Office (BO)
     When I remove product "Test Product With Percent Discount" from order "bo_order1"
     Then order "bo_order1" should have 2 products in total
     Then order "bo_order1" should contain 0 product "Test Product With Percent Discount"
+    # @todo: for some reason it still has 2 rules. The one that shouldn't exist (because product was deleted) is CartRulePercentForSpecificProduct, but after product removal, this cart rule value in order_cart_rule becomes 0 (instead of removing the cart rule completely). HOW THE F* IT WORKED BEFORE?
     Then order "bo_order1" should have 1 cart rule
     Then order "bo_order1" should have cart rule "discount five-percent" with amount "$1.19"
     Then order "bo_order1" should have following details:
@@ -443,10 +472,19 @@ Feature: Order from Back Office (BO)
       | total_paid_real          | 0.0    |
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
     And there is a product in the catalog named "Test Product With Percent Discount" with a price of 350.00 and 100 items in stock
     Given there is a cart rule named "CartRulePercentForSpecificProduct" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
     And cart rule "CartRulePercentForSpecificProduct" is restricted to product "Test Product With Percent Discount"
+    And there is a cart rule "CartRulePercentForSpecificProduct" with following properties:
+      | name[en-US]               | CartRulePercentForSpecificProduct  |
+      | priority                  | 1                                  |
+      | free_shipping             | false                              |
+      | discount_percentage       | 50                                 |
+      | discount_application_type | specific_product                   |
+      | discount_application_type | specific_product                   |
+      | quantity                  | 1000                               |
+      | quantity_per_user         | 1000                               |
+      | discount_product          | Test Product With Percent Discount |
     When I add products to order "bo_order1" with new invoice and the following products details:
       | name   | Test Product With Percent Discount |
       | amount | 1                                  |
@@ -502,7 +540,7 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
 
-  Scenario: Add product with associated discount to order, I remove the discount of this product, if I remove the propduct and add it again the discount is applied again
+  Scenario: Add product with associated discount to order, I remove the discount of this product, if I remove the product and add it again the discount is applied again
     Given order with reference "bo_order1" does not contain product "Mug Today is a good day"
     Then order "bo_order1" should have 2 products in total
     Then order "bo_order1" should have 0 invoices
@@ -518,7 +556,6 @@ Feature: Order from Back Office (BO)
       | total_paid_real          | 0.0    |
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
     And there is a product in the catalog named "Test Product With Percent Discount" with a price of 350.00 and 100 items in stock
     Given there is a cart rule named "CartRulePercentForSpecificProduct" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
     And cart rule "CartRulePercentForSpecificProduct" is restricted to product "Test Product With Percent Discount"
@@ -608,7 +645,6 @@ Feature: Order from Back Office (BO)
       | total_paid_real          | 0.0    |
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
-    Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
     When I add discount to order "bo_order1" with following details:
       | name  | discount five-percent |
       | type  | percent               |

From d272a2cd419c10e493e3296ec76b1e486a4c6227 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Tue, 13 Jun 2023 18:24:42 +0300
Subject: [PATCH 0252/1030]  fix some typo in feature

---
 .../Cart/Rounding/RoundingType/round_item.feature |  2 ++
 .../Scenario/Order/order_cart_rules.feature       | 15 +++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Rounding/RoundingType/round_item.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/Rounding/RoundingType/round_item.feature
index 14a56a65ee80b..af251711d3dd8 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/Rounding/RoundingType/round_item.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/Rounding/RoundingType/round_item.feature
@@ -1,4 +1,6 @@
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags round-item
 @restore-all-tables-before-feature
+@round-item
 Feature: Cart calculation with rounding type ITEM
   As a customer
   I must be able to have correct cart total when configuration is set to different rounding types
diff --git a/tests/Integration/Behaviour/Features/Scenario/Order/order_cart_rules.feature b/tests/Integration/Behaviour/Features/Scenario/Order/order_cart_rules.feature
index f83889cc083fc..fde6d0c0b70a9 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Order/order_cart_rules.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Order/order_cart_rules.feature
@@ -456,6 +456,7 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
 
+  @restore-cart-rules-before-scenario
   Scenario: Add product with associated discount to order, Add discount to the specific order, I remove the discount of this product, if I add the product again the discount is still removed
     Given order with reference "bo_order1" does not contain product "Mug Today is a good day"
     Then order "bo_order1" should have 2 products in total
@@ -540,6 +541,7 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
 
+  @restore-cart-rules-before-scenario
   Scenario: Add product with associated discount to order, I remove the discount of this product, if I remove the product and add it again the discount is applied again
     Given order with reference "bo_order1" does not contain product "Mug Today is a good day"
     Then order "bo_order1" should have 2 products in total
@@ -629,6 +631,7 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
 
+  @restore-cart-rules-before-scenario
   Scenario: Add discount to the specific order, then remove it When I perform add/remove product actions the discount is not reapplied
     Given order with reference "bo_order1" does not contain product "Mug Today is a good day"
     Then order "bo_order1" should have 2 products in total
@@ -703,6 +706,7 @@ Feature: Order from Back Office (BO)
     Then order "bo_order1" should have 2 products in total
     Then order "bo_order1" should contain 0 product "Test Product With Percent Discount"
 
+  @restore-cart-rules-before-scenario
   Scenario: When a cart rule is associated to a carrier, when I change the carrier the cart rule should be added/removed accordingly
     Given there is a product in the catalog named "product1" with a price of 10.00 and 100 items in stock
     And there is a product in the catalog named "product2" with a price of 15.00 and 100 items in stock
@@ -724,6 +728,7 @@ Feature: Order from Back Office (BO)
     When I select carrier "carrier2" for cart "dummy_cart_freegift"
     Then cart "dummy_cart_freegift" should contain 1 products
 
+  @restore-cart-rules-before-scenario
   Scenario: Add a cart rule with free shipping to an order with a total of 0
     Given there is a product in the catalog named "product1" with a price of 0.00 and 100 items in stock
     When I create an empty cart "dummy_cart_free_shipping" for customer "testCustomer"
@@ -765,6 +770,7 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_excl  | 7.000 |
       | total_shipping_tax_incl  | 7.420 |
 
+  @restore-cart-rules-before-scenario
   Scenario: Add a cart rule with free shipping to an order with a total of 0 and existing order
     Given there is a product in the catalog named "product1" with a price of 0.00 and 100 items in stock
     When I create an empty cart "dummy_cart_free_shipping" for customer "testCustomer"
@@ -807,6 +813,7 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_excl  | 7.000 |
       | total_shipping_tax_incl  | 7.420 |
 
+  @restore-cart-rules-before-scenario
   Scenario: Add a cart rule with free shipping to an order with a total of 0 and existing order
     Given there is a product in the catalog named "product_expensive" with a price of 123.00 and 100 items in stock
     And there is a product in the catalog named "product_cheap" with a price of 10.00 and 100 items in stock
@@ -836,10 +843,10 @@ Feature: Order from Back Office (BO)
     And order "bo_order1" should have invoice
     ## Create a new cart rule
     And I create cart rule "cart_rule_1" with following properties:
-      | name[en-US]                            | Cart Rule 50% which excludes discounted products and applies to cheapest product |
-      | reduction_percentage                   | 50                                                                               |
-      | reduction_apply_to_discounted_products | false                                                                            |
-      | discount_application_type              | cheapest_product                                                                 |
+      | name[en-US]                  | Cart Rule 50% which excludes discounted products and applies to cheapest product |
+      | discount_percentage          | 50                                                                               |
+      | apply_to_discounted_products | false                                                                            |
+      | discount_application_type    | cheapest_product                                                                 |
     ## Add the product to the order
     When I add products to order "bo_order1" without invoice and the following products details:
       | name   | product_cheap |

From a57f5e4b831457271576fde6893e766bd087086a Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Wed, 14 Jun 2023 12:29:48 +0300
Subject: [PATCH 0253/1030]  fix rounding scenarios

---
 .../Rounding/RoundingType/round_item.feature  | 51 ++++++++---------
 .../Rounding/RoundingType/round_line.feature  | 56 +++++++++----------
 .../Rounding/RoundingType/round_total.feature | 52 ++++++++---------
 3 files changed, 74 insertions(+), 85 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Rounding/RoundingType/round_item.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/Rounding/RoundingType/round_item.feature
index af251711d3dd8..7602c078c0829 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/Rounding/RoundingType/round_item.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/Rounding/RoundingType/round_item.feature
@@ -5,62 +5,59 @@ Feature: Cart calculation with rounding type ITEM
   As a customer
   I must be able to have correct cart total when configuration is set to different rounding types
 
-  Scenario: Empty cart
+  Background:
     Given I have an empty default cart
-    Given specific shop configuration for "rounding type" is set to round each article
-    Then my cart total should be precisely 0.0 tax included
-    Then my cart total using previous calculation method should be 0.0 tax included
+    And there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
+    And specific shop configuration for "rounding type" is set to round each article
+    And there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+    And there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
+    And there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
 
   Scenario: one product in cart, quantity 1
-    Given I have an empty default cart
-    Given specific shop configuration for "rounding type" is set to round each article
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
     When I add 1 items of product "product1" in my cart
     Then my cart total should be precisely 26.81 tax included
+    And my cart total shipping fees should be 7.0 tax included
     Then my cart total using previous calculation method should be precisely 26.81 tax included
 
   Scenario: one product in cart, quantity 3
-    Given I have an empty default cart
-    Given specific shop configuration for "rounding type" is set to round each article
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
     When I add 3 items of product "product1" in my cart
     Then my cart total should be precisely 66.43 tax included
     Then my cart total using previous calculation method should be precisely 66.43 tax included
 
   Scenario: 3 products in cart, several quantities
-    Given I have an empty default cart
-    Given specific shop configuration for "rounding type" is set to round each article
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
     When I add 2 items of product "product2" in my cart
     When I add 3 items of product "product1" in my cart
     When I add 1 items of product "product3" in my cart
     Then my cart total should be precisely 162.4 tax included
+    And my cart total shipping fees should be 7.0 tax included
     Then my cart total using previous calculation method should be precisely 162.4 tax included
 
   Scenario: 1 product in cart, with a quantity of 2 and a tricky price
-    Given I have an empty default cart
-    Given specific shop configuration for "rounding type" is set to round each article
-    Given there is a product in the catalog named "product1" with a price of 35.32552 and 1000 items in stock
-    When I add 2 items of product "product1" in my cart
+    Given there is a product in the catalog named "product4" with a price of 35.32552 and 1000 items in stock
+    When I add 2 items of product "product4" in my cart
     Then my cart total should be precisely 77.66 tax included
+    And my cart total shipping fees should be 7.0 tax included
     Then my cart total using previous calculation method should be precisely 77.66 tax included
 
+  @restore-cart-rules-after-scenario
   Scenario: 1 product in cart, with a quantity of 3 and a percentage cart rule
-    Given I have an empty default cart
-    Given specific shop configuration for "rounding type" is set to round each article
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a cart rule named "cartrule1" that applies a percent discount of 15.0% with priority 1, quantity of 1000 and quantity per user 1000
+    Given there is a cart rule "cartrule1" with following properties:
+      | name[en-US]         | cartrule1 |
+      | priority            | 1         |
+      | discount_percentage | 15        |
     When I add 3 items of product "product1" in my cart
     Then my cart total should be precisely 57.52 tax included
+    And my cart total shipping fees should be 7.0 tax included
     Then my cart total using previous calculation method should be precisely 57.52 tax included
 
   Scenario: 1 product in cart, with a quantity of 3 and an amount cart rule
-    Given I have an empty default cart
-    Given specific shop configuration for "rounding type" is set to round each article
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a cart rule named "cartrule1" that applies an amount discount of 5.0 with priority 8, quantity of 1000 and quantity per user 1000
+    Given there is a cart rule "cartrule1" with following properties:
+      | name[en-US]           | cartrule1 |
+      | priority              | 8         |
+      | discount_amount       | 5         |
+      | discount_currency     | usd       |
+      | discount_includes_tax | false     |
     When I add 3 items of product "product1" in my cart
     Then my cart total should be precisely 61.43 tax included
+    And my cart total shipping fees should be 7.0 tax included
     Then my cart total using previous calculation method should be precisely 61.43 tax included
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Rounding/RoundingType/round_line.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/Rounding/RoundingType/round_line.feature
index 83e57a2d3bee1..810a3483f2ed7 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/Rounding/RoundingType/round_line.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/Rounding/RoundingType/round_line.feature
@@ -1,56 +1,52 @@
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags round-line
 @restore-all-tables-before-feature
+@round-line
 Feature: Cart calculation with rounding type LINE
   As a customer
   I must be able to have correct cart total when configuration is set to different rounding types
 
-  Scenario: Empty cart
+  Background:
     Given I have an empty default cart
-    Given specific shop configuration for "rounding type" is set to round each line
-    Then my cart total should be 0.0 tax included
-    Then my cart total using previous calculation method should be 0.0 tax included
+    And there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
+    And specific shop configuration for "rounding type" is set to round each line
+    And there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+    And there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
+    And there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
 
   Scenario: one product in cart, quantity 1
-    Given I have an empty default cart
-    Given specific shop configuration for "rounding type" is set to round each line
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
     When I add 1 items of product "product1" in my cart
     Then my cart total should be precisely 26.81 tax included
-    Then my cart total using previous calculation method should be precisely 26.81 tax included
+    And my cart total shipping fees should be 7.0 tax included
 
   Scenario: one product in cart, quantity 3
-    Given I have an empty default cart
-    Given specific shop configuration for "rounding type" is set to round each line
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
     When I add 3 items of product "product1" in my cart
     Then my cart total should be precisely 66.44 tax included
-    Then my cart total using previous calculation method should be precisely 66.44 tax included
+    And my cart total shipping fees should be 7.0 tax included
 
   Scenario: 3 products in cart, several quantities
-    Given I have an empty default cart
-    Given specific shop configuration for "rounding type" is set to round each line
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
     When I add 2 items of product "product2" in my cart
-    When I add 3 items of product "product1" in my cart
-    When I add 1 items of product "product3" in my cart
+    And I add 3 items of product "product1" in my cart
+    And I add 1 items of product "product3" in my cart
     Then my cart total should be precisely 162.4 tax included
-    Then my cart total using previous calculation method should be precisely 162.41 tax included
+    And my cart total shipping fees should be 7.0 tax included
 
+  @restore-cart-rules-after-scenario
   Scenario: one product in cart, quantity 3 with a percentage cart rule
-    Given I have an empty default cart
-    Given specific shop configuration for "rounding type" is set to round each line
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a cart rule named "cartrule1" that applies a percent discount of 15.0% with priority 1, quantity of 1000 and quantity per user 1000
+    Given there is a cart rule "cartrule1" with following properties:
+      | name[en-US]         | cartrule1 |
+      | priority            | 1         |
+      | discount_percentage | 15        |
     When I add 3 items of product "product1" in my cart
     Then my cart total should be precisely 57.52 tax included
-    Then my cart total using previous calculation method should be precisely 57.52 tax included
+    And my cart total shipping fees should be 7.0 tax included
 
   Scenario: one product in cart, quantity 3 with an amount cart rule
-    Given I have an empty default cart
-    Given specific shop configuration for "rounding type" is set to round each line
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a cart rule named "cartrule1" that applies an amount discount of 5.0 with priority 8, quantity of 1000 and quantity per user 1000
+    Given there is a cart rule "cartrule1" with following properties:
+      | name[en-US]           | cartrule1 |
+      | priority              | 8         |
+      | discount_amount       | 5         |
+      | discount_currency     | usd       |
+      | discount_includes_tax | false     |
     When I add 3 items of product "product1" in my cart
     Then my cart total should be precisely 61.44 tax included
-    Then my cart total using previous calculation method should be precisely 61.44 tax included
+    And my cart total shipping fees should be 7.0 tax included
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/Rounding/RoundingType/round_total.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/Rounding/RoundingType/round_total.feature
index e216e31f0a1cf..dac2ae2d14f32 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/Rounding/RoundingType/round_total.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/Rounding/RoundingType/round_total.feature
@@ -1,56 +1,52 @@
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags round-total
 @restore-all-tables-before-feature
+@round-total
 Feature: Cart calculation with rounding type TOTAL
   As a customer
   I must be able to have correct cart total when configuration is set to different rounding types
 
-  Scenario: Empty cart
+  Background:
     Given I have an empty default cart
-    Given specific shop configuration for "rounding type" is set to round cart total
-    Then my cart total should be precisely 0.0 tax included
-    Then my cart total using previous calculation method should be precisely 0.0 tax included
+    And specific shop configuration for "rounding type" is set to round cart total
+    And there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
+    And there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+    And there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
+    And there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
 
   Scenario: one product in cart, quantity 1
-    Given I have an empty default cart
-    Given specific shop configuration for "rounding type" is set to round cart total
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
     When I add 1 items of product "product1" in my cart
     Then my cart total should be precisely 26.81 tax included
-    Then my cart total using previous calculation method should be precisely 26.81 tax included
+    And my cart total shipping fees should be 7.0 tax included
 
   Scenario: one product in cart, quantity 3
-    Given I have an empty default cart
-    Given specific shop configuration for "rounding type" is set to round cart total
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
     When I add 3 items of product "product1" in my cart
     Then my cart total should be precisely 66.44 tax included
-    Then my cart total using previous calculation method should be precisely 66.44 tax included
+    And my cart total shipping fees should be 7.0 tax included
 
   Scenario: 3 products in cart, several quantities
-    Given I have an empty default cart
-    Given specific shop configuration for "rounding type" is set to round cart total
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
     When I add 2 items of product "product2" in my cart
     When I add 3 items of product "product1" in my cart
     When I add 1 items of product "product3" in my cart
     Then my cart total should be precisely 162.4 tax included
-    Then my cart total using previous calculation method should be precisely 162.4 tax included
+    And my cart total shipping fees should be 7.0 tax included
 
+  @restore-cart-rules-after-scenario
   Scenario: one product in cart, quantity 3 with a percentage cart rule
-    Given I have an empty default cart
-    Given specific shop configuration for "rounding type" is set to round cart total
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a cart rule named "cartrule1" that applies a percent discount of 15.0% with priority 1, quantity of 1000 and quantity per user 1000
+    Given there is a cart rule "cartrule1" with following properties:
+      | name[en-US]         | cartrule1 |
+      | priority            | 1         |
+      | discount_percentage | 15        |
     When I add 3 items of product "product1" in my cart
     Then my cart total should be precisely 57.52 tax included
-    Then my cart total using previous calculation method should be precisely 57.52 tax included
+    And my cart total shipping fees should be 7.0 tax included
 
   Scenario: one product in cart, quantity 3 with an amount cart rule
-    Given I have an empty default cart
-    Given specific shop configuration for "rounding type" is set to round cart total
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a cart rule named "cartrule1" that applies an amount discount of 5.0 with priority 8, quantity of 1000 and quantity per user 1000
+    Given there is a cart rule "cartrule1" with following properties:
+      | name[en-US]           | cartrule1 |
+      | priority              | 8         |
+      | discount_amount       | 5         |
+      | discount_currency     | usd       |
+      | discount_includes_tax | false     |
     When I add 3 items of product "product1" in my cart
     Then my cart total should be precisely 61.44 tax included
-    Then my cart total using previous calculation method should be precisely 61.44 tax included
+    And my cart total shipping fees should be 7.0 tax included

From 1c5c08f4c9bbfeaf069632929188ef87c179d29b Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Wed, 14 Jun 2023 17:36:22 +0300
Subject: [PATCH 0254/1030]  use cart rule cqrs commands in
 order_gift_cart_rule scenario and fix it

---
 .../Context/Domain/CartFeatureContext.php     |    6 +-
 .../Scenario/Order/order_cart_rules.feature   |    6 +-
 .../Order/order_gift_cart_rule.feature        | 1141 +++++++++--------
 3 files changed, 645 insertions(+), 508 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartFeatureContext.php
index 22fdaeeac44dc..cf92864a991b5 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartFeatureContext.php
@@ -170,12 +170,12 @@ public function addProductsToCart(int $quantity, string $productName, string $ca
         try {
             $this->getCommandBus()->handle(
                 new AddProductToCartCommand(
-                    SharedStorage::getStorage()->get($cartReference),
+                    $this->getSharedStorage()->get($cartReference),
                     $productId,
                     $quantity
                 )
             );
-            SharedStorage::getStorage()->set($productName, $productId);
+            $this->getSharedStorage()->set($productName, $productId);
 
             // Clear cart static cache or it will have no products in next calls
             Cart::resetStaticCache();
@@ -612,7 +612,7 @@ public function useGiftProductVoucherOnCart(string $voucherCode, string $giftPro
 
         $this->getCommandBus()->handle(
             new AddCartRuleToCartCommand(
-                SharedStorage::getStorage()->get($cartReference),
+                $this->getSharedStorage()->get($cartReference),
                 $cartRuleId
             )
         );
diff --git a/tests/Integration/Behaviour/Features/Scenario/Order/order_cart_rules.feature b/tests/Integration/Behaviour/Features/Scenario/Order/order_cart_rules.feature
index fde6d0c0b70a9..07182a01faba0 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Order/order_cart_rules.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Order/order_cart_rules.feature
@@ -257,7 +257,7 @@ Feature: Order from Back Office (BO)
       | free_shipping             | false                      |
       | discount_percentage       | 50                         |
       | discount_application_type | order_without_shipping     |
-      | quantity                  | 1000                       |
+      | total_quantity            | 1000                       |
       | quantity_per_user         | 1000                       |
     When I add products to order "bo_order1" with new invoice and the following products details:
       | name   | Test Product Cart Rule On Order |
@@ -319,7 +319,7 @@ Feature: Order from Back Office (BO)
       | free_shipping             | false                      |
       | discount_percentage       | 50                         |
       | discount_application_type | order_without_shipping     |
-      | quantity                  | 1000                       |
+      | total_quantity            | 1000                       |
       | quantity_per_user         | 1000                       |
     When I add products to order "bo_order1" with new invoice and the following products details:
       | name   | Test Product Cart Rule On Order |
@@ -483,7 +483,7 @@ Feature: Order from Back Office (BO)
       | discount_percentage       | 50                                 |
       | discount_application_type | specific_product                   |
       | discount_application_type | specific_product                   |
-      | quantity                  | 1000                               |
+      | total_quantity            | 1000                               |
       | quantity_per_user         | 1000                               |
       | discount_product          | Test Product With Percent Discount |
     When I add products to order "bo_order1" with new invoice and the following products details:
diff --git a/tests/Integration/Behaviour/Features/Scenario/Order/order_gift_cart_rule.feature b/tests/Integration/Behaviour/Features/Scenario/Order/order_gift_cart_rule.feature
index 626600d097a55..ecedf2df59bdd 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Order/order_gift_cart_rule.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Order/order_gift_cart_rule.feature
@@ -22,8 +22,16 @@ Feature: Order from Back Office (BO)
     And I select "US" address as delivery and invoice address for customer "testCustomer" in cart "dummy_cart"
     And I add 2 products "Mug The best is yet to come" to the cart "dummy_cart"
 
+  @restore-cart-rules-after-scenario
   Scenario: Add discount with gift product to cart, and remove it in the order
-    Given I use a voucher "CartRuleGiftProduct" which provides a gift product "Test Product Gifted" on the cart "dummy_cart"
+    Given there is a cart rule "CartRuleGiftProduct" with following properties:
+      | name[en-US]       | CartRuleGiftProduct |
+      | priority          | 1                   |
+      | total_quantity    | 100                 |
+      | quantity_per_user | 100                 |
+      | gift_product      | Test Product Gifted |
+      | code              | CartRuleGiftProduct |
+    And I use a voucher CartRuleGiftProduct on the cart dummy_cart
     And I add order "bo_order1" with the following details:
       | cart                | dummy_cart                 |
       | message             | test                       |
@@ -44,13 +52,13 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
     And product "Test Product Gifted" in order "bo_order1" has following details:
-      | product_quantity            | 1     |
-      | product_price               | 15.00 |
-      | original_product_price      | 15.00 |
-      | unit_price_tax_incl         | 15.90 |
-      | unit_price_tax_excl         | 15.00 |
-      | total_price_tax_incl        | 15.90 |
-      | total_price_tax_excl        | 15.00 |
+      | product_quantity       | 1     |
+      | product_price          | 15.00 |
+      | original_product_price | 15.00 |
+      | unit_price_tax_incl    | 15.90 |
+      | unit_price_tax_excl    | 15.00 |
+      | total_price_tax_incl   | 15.90 |
+      | total_price_tax_excl   | 15.00 |
     And order "bo_order1" should have cart rule "CartRuleGiftProduct" with amount "$15.00"
     And the available stock for product "Test Product Gifted" should be 99
     When I remove cart rule "CartRuleGiftProduct" from order "bo_order1"
@@ -71,9 +79,17 @@ Feature: Order from Back Office (BO)
     And order "bo_order1" should contain 0 product "Test Product Gifted"
     And the available stock for product "Test Product Gifted" should be 100
 
+  @restore-cart-rules-after-scenario
   Scenario: Add a product then add a discount with this product as a gift, and remove it from the order
     Given I add 1 products "Test Product Gifted" to the cart "dummy_cart"
-    And I use a voucher "CartRuleGiftProduct" which provides a gift product "Test Product Gifted" on the cart "dummy_cart"
+    And there is a cart rule "CartRuleGiftProduct" with following properties:
+      | name[en-US]       | CartRuleGiftProduct |
+      | priority          | 1                   |
+      | total_quantity    | 100                 |
+      | quantity_per_user | 100                 |
+      | gift_product      | Test Product Gifted |
+      | code              | CartRuleGiftProduct |
+    And I use a voucher CartRuleGiftProduct on the cart dummy_cart
     And I add order "bo_order1" with the following details:
       | cart                | dummy_cart                 |
       | message             | test                       |
@@ -94,13 +110,13 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
     And product "Test Product Gifted" in order "bo_order1" has following details:
-      | product_quantity            | 2     |
-      | product_price               | 15.00 |
-      | original_product_price      | 15.00 |
-      | unit_price_tax_incl         | 15.90 |
-      | unit_price_tax_excl         | 15.00 |
-      | total_price_tax_incl        | 31.80 |
-      | total_price_tax_excl        | 30.00 |
+      | product_quantity       | 2     |
+      | product_price          | 15.00 |
+      | original_product_price | 15.00 |
+      | unit_price_tax_incl    | 15.90 |
+      | unit_price_tax_excl    | 15.00 |
+      | total_price_tax_incl   | 31.80 |
+      | total_price_tax_excl   | 30.00 |
     And order "bo_order1" should have cart rule "CartRuleGiftProduct" with amount "$15.00"
     And the available stock for product "Test Product Gifted" should be 98
     And gifted product "Test Product Gifted" quantity in cart "dummy_cart" should be 1
@@ -120,19 +136,27 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
     And product "Test Product Gifted" in order "bo_order1" has following details:
-      | product_quantity            | 1     |
-      | product_price               | 15.00 |
-      | original_product_price      | 15.00 |
-      | unit_price_tax_incl         | 15.90 |
-      | unit_price_tax_excl         | 15.00 |
-      | total_price_tax_incl        | 15.90 |
-      | total_price_tax_excl        | 15.00 |
+      | product_quantity       | 1     |
+      | product_price          | 15.00 |
+      | original_product_price | 15.00 |
+      | unit_price_tax_incl    | 15.90 |
+      | unit_price_tax_excl    | 15.00 |
+      | total_price_tax_incl   | 15.90 |
+      | total_price_tax_excl   | 15.00 |
     And the available stock for product "Test Product Gifted" should be 99
     And cart "dummy_cart" should not contain gift product "Test Product Gifted"
     But cart "dummy_cart" should contain product "Test Product Gifted"
 
+  @restore-cart-rules-after-scenario
   Scenario: Add discount with gift product to cart, and remove the gifted product in the order and add it again the discount is still present
-    Given I use a voucher "CartRuleGiftProduct" which provides a gift product "Test Product Gifted" on the cart "dummy_cart"
+    Given there is a cart rule "CartRuleGiftProduct" with following properties:
+      | name[en-US]       | CartRuleGiftProduct |
+      | priority          | 1                   |
+      | total_quantity    | 100                 |
+      | quantity_per_user | 100                 |
+      | gift_product      | Test Product Gifted |
+      | code              | CartRuleGiftProduct |
+    And I use a voucher CartRuleGiftProduct on the cart dummy_cart
     And I add order "bo_order1" with the following details:
       | cart                | dummy_cart                 |
       | message             | test                       |
@@ -153,13 +177,13 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
     And product "Test Product Gifted" in order "bo_order1" has following details:
-      | product_quantity            | 1     |
-      | product_price               | 15.00 |
-      | original_product_price      | 15.00 |
-      | unit_price_tax_incl         | 15.90 |
-      | unit_price_tax_excl         | 15.00 |
-      | total_price_tax_incl        | 15.90 |
-      | total_price_tax_excl        | 15.00 |
+      | product_quantity       | 1     |
+      | product_price          | 15.00 |
+      | original_product_price | 15.00 |
+      | unit_price_tax_incl    | 15.90 |
+      | unit_price_tax_excl    | 15.00 |
+      | total_price_tax_incl   | 15.90 |
+      | total_price_tax_excl   | 15.00 |
     And order "bo_order1" should have cart rule "CartRuleGiftProduct" with amount "$15.00"
     And the available stock for product "Test Product Gifted" should be 99
     When I remove product "Test Product Gifted" from order "bo_order1"
@@ -182,9 +206,9 @@ Feature: Order from Back Office (BO)
     And order "bo_order1" should contain 0 product "Test Product Gifted"
     And the available stock for product "Test Product Gifted" should be 100
     And I add products to order "bo_order1" with new invoice and the following products details:
-      | name          | Test Product Gifted |
-      | amount        | 1                   |
-      | price         | 15.0                |
+      | name   | Test Product Gifted |
+      | amount | 1                   |
+      | price  | 15.0                |
     Then order "bo_order1" should have 3 products in total
     And gifted product "Test Product Gifted" quantity in cart "dummy_cart" should be 1
     And order "bo_order1" should have 0 invoice
@@ -201,18 +225,26 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
     And product "Test Product Gifted" in order "bo_order1" has following details:
-      | product_quantity            | 1     |
-      | product_price               | 15.00 |
-      | original_product_price      | 15.00 |
-      | unit_price_tax_incl         | 15.90 |
-      | unit_price_tax_excl         | 15.00 |
-      | total_price_tax_incl        | 15.90 |
-      | total_price_tax_excl        | 15.00 |
+      | product_quantity       | 1     |
+      | product_price          | 15.00 |
+      | original_product_price | 15.00 |
+      | unit_price_tax_incl    | 15.90 |
+      | unit_price_tax_excl    | 15.00 |
+      | total_price_tax_incl   | 15.90 |
+      | total_price_tax_excl   | 15.00 |
     And order "bo_order1" should have cart rule "CartRuleGiftProduct" with amount "$15.00"
     And the available stock for product "Test Product Gifted" should be 99
 
+  @restore-cart-rules-after-scenario
   Scenario: Add multiple order details contain the gift product, Then the one with at least 2 is updated
-    And I use a voucher "CartRuleGiftProduct" which provides a gift product "Test Product Gifted" on the cart "dummy_cart"
+    Given there is a cart rule "CartRuleGiftProduct" with following properties:
+      | name[en-US]       | CartRuleGiftProduct |
+      | priority          | 1                   |
+      | total_quantity    | 100                 |
+      | quantity_per_user | 100                 |
+      | gift_product      | Test Product Gifted |
+      | code              | CartRuleGiftProduct |
+    And I use a voucher CartRuleGiftProduct on the cart dummy_cart
     And I add order "bo_order1" with the following details:
       | cart                | dummy_cart                 |
       | message             | test                       |
@@ -220,40 +252,40 @@ Feature: Order from Back Office (BO)
       | status              | Awaiting bank wire payment |
     And I generate invoice for "bo_order1" order
     And I add products to order "bo_order1" with new invoice and the following products details:
-      | name          | Test Product Gifted |
-      | amount        | 2                   |
-      | price         | 15.0                |
+      | name   | Test Product Gifted |
+      | amount | 2                   |
+      | price  | 15.0                |
     Then order "bo_order1" should have 5 products in total
     And order "bo_order1" should have 2 invoices
     And order "bo_order1" should have 1 cart rule
     And order "bo_order1" should have following details:
-      | total_products           | 68.800 |
-      | total_products_wt        | 72.930 |
+      | total_products          | 68.800 |
+      | total_products_wt       | 72.930 |
       # Total is not correct here because of bug from issue #20778 (discount amount applied twice), current is 30 should be 15
 #      | total_discounts_tax_excl | 15.0   |
 #      | total_discounts_tax_incl | 15.9   |
 #      | total_paid_tax_excl      | 60.800 |
 #      | total_paid_tax_incl      | 64.450 |
 #      | total_paid               | 64.450 |
-      | total_paid_real          | 0.0    |
-      | total_shipping_tax_excl  | 7.0    |
-      | total_shipping_tax_incl  | 7.42   |
+      | total_paid_real         | 0.0    |
+      | total_shipping_tax_excl | 7.0    |
+      | total_shipping_tax_incl | 7.42   |
     And the product "Test Product Gifted" in the first invoice from the order "bo_order1" should have the following details:
-      | product_quantity            | 1     |
-      | product_price               | 15.00 |
-      | original_product_price      | 15.00 |
-      | unit_price_tax_incl         | 15.90 |
-      | unit_price_tax_excl         | 15.00 |
-      | total_price_tax_incl        | 15.90 |
-      | total_price_tax_excl        | 15.00 |
+      | product_quantity       | 1     |
+      | product_price          | 15.00 |
+      | original_product_price | 15.00 |
+      | unit_price_tax_incl    | 15.90 |
+      | unit_price_tax_excl    | 15.00 |
+      | total_price_tax_incl   | 15.90 |
+      | total_price_tax_excl   | 15.00 |
     And the product "Test Product Gifted" in the second invoice from the order "bo_order1" should have the following details:
-      | product_quantity            | 2     |
-      | product_price               | 15.00 |
-      | original_product_price      | 15.00 |
-      | unit_price_tax_incl         | 15.90 |
-      | unit_price_tax_excl         | 15.00 |
-      | total_price_tax_incl        | 31.80 |
-      | total_price_tax_excl        | 30.00 |
+      | product_quantity       | 2     |
+      | product_price          | 15.00 |
+      | original_product_price | 15.00 |
+      | unit_price_tax_incl    | 15.90 |
+      | unit_price_tax_excl    | 15.00 |
+      | total_price_tax_incl   | 31.80 |
+      | total_price_tax_excl   | 30.00 |
     # Discount is not correct here because of bug from issue #20778 (discount amount applied twice), current is 30 should be 15
 #    And order "bo_order1" should have cart rule "CartRuleGiftProduct" with amount "$15.00"
     And the available stock for product "Test Product Gifted" should be 97
@@ -273,25 +305,33 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
     And the product "Test Product Gifted" in the first invoice from the order "bo_order1" should have the following details:
-      | product_quantity            | 1     |
-      | product_price               | 15.00 |
-      | original_product_price      | 15.00 |
-      | unit_price_tax_incl         | 15.90 |
-      | unit_price_tax_excl         | 15.00 |
-      | total_price_tax_incl        | 15.90 |
-      | total_price_tax_excl        | 15.00 |
+      | product_quantity       | 1     |
+      | product_price          | 15.00 |
+      | original_product_price | 15.00 |
+      | unit_price_tax_incl    | 15.90 |
+      | unit_price_tax_excl    | 15.00 |
+      | total_price_tax_incl   | 15.90 |
+      | total_price_tax_excl   | 15.00 |
     And the product "Test Product Gifted" in the second invoice from the order "bo_order1" should have the following details:
-      | product_quantity            | 1     |
-      | product_price               | 15.00 |
-      | original_product_price      | 15.00 |
-      | unit_price_tax_incl         | 15.90 |
-      | unit_price_tax_excl         | 15.00 |
-      | total_price_tax_incl        | 15.90 |
-      | total_price_tax_excl        | 15.00 |
+      | product_quantity       | 1     |
+      | product_price          | 15.00 |
+      | original_product_price | 15.00 |
+      | unit_price_tax_incl    | 15.90 |
+      | unit_price_tax_excl    | 15.00 |
+      | total_price_tax_incl   | 15.90 |
+      | total_price_tax_excl   | 15.00 |
     And the available stock for product "Test Product Gifted" should be 98
 
+  @restore-cart-rules-after-scenario
   Scenario: Add multiple order details that contain only one gift product, the first one is removed by default with the gift cart rule
-    And I use a voucher "CartRuleGiftProduct" which provides a gift product "Test Product Gifted" on the cart "dummy_cart"
+    Given there is a cart rule "CartRuleGiftProduct" with following properties:
+      | name[en-US]       | CartRuleGiftProduct |
+      | priority          | 1                   |
+      | total_quantity    | 100                 |
+      | quantity_per_user | 100                 |
+      | gift_product      | Test Product Gifted |
+      | code              | CartRuleGiftProduct |
+    And I use a voucher CartRuleGiftProduct on the cart dummy_cart
     And I add order "bo_order1" with the following details:
       | cart                | dummy_cart                 |
       | message             | test                       |
@@ -299,40 +339,40 @@ Feature: Order from Back Office (BO)
       | status              | Awaiting bank wire payment |
     And I generate invoice for "bo_order1" order
     And I add products to order "bo_order1" with new invoice and the following products details:
-      | name          | Test Product Gifted |
-      | amount        | 1                           |
-      | price         | 15.0                        |
+      | name   | Test Product Gifted |
+      | amount | 1                   |
+      | price  | 15.0                |
     Then order "bo_order1" should have 4 products in total
     And order "bo_order1" should have 2 invoices
     And order "bo_order1" should have 1 cart rule
     And order "bo_order1" should have following details:
-      | total_products           | 53.800 |
-      | total_products_wt        | 57.030 |
+      | total_products          | 53.800 |
+      | total_products_wt       | 57.030 |
       # Total is not correct here because of bug from issue #20778 (discount amount applied twice), current is 30 should be 15
 #      | total_discounts_tax_excl | 15.0   |
 #      | total_discounts_tax_incl | 15.9   |
 #      | total_paid_tax_excl      | 45.800 |
 #      | total_paid_tax_incl      | 48.550 |
 #      | total_paid               | 48.550 |
-      | total_paid_real          | 0.0    |
-      | total_shipping_tax_excl  | 7.0    |
-      | total_shipping_tax_incl  | 7.42   |
+      | total_paid_real         | 0.0    |
+      | total_shipping_tax_excl | 7.0    |
+      | total_shipping_tax_incl | 7.42   |
     And the product "Test Product Gifted" in the first invoice from the order "bo_order1" should have the following details:
-      | product_quantity            | 1     |
-      | product_price               | 15.00 |
-      | original_product_price      | 15.00 |
-      | unit_price_tax_incl         | 15.90 |
-      | unit_price_tax_excl         | 15.00 |
-      | total_price_tax_incl        | 15.90 |
-      | total_price_tax_excl        | 15.00 |
+      | product_quantity       | 1     |
+      | product_price          | 15.00 |
+      | original_product_price | 15.00 |
+      | unit_price_tax_incl    | 15.90 |
+      | unit_price_tax_excl    | 15.00 |
+      | total_price_tax_incl   | 15.90 |
+      | total_price_tax_excl   | 15.00 |
     And the product "Test Product Gifted" in the second invoice from the order "bo_order1" should have the following details:
-      | product_quantity            | 1     |
-      | product_price               | 15.00 |
-      | original_product_price      | 15.00 |
-      | unit_price_tax_incl         | 15.90 |
-      | unit_price_tax_excl         | 15.00 |
-      | total_price_tax_incl        | 15.90 |
-      | total_price_tax_excl        | 15.00 |
+      | product_quantity       | 1     |
+      | product_price          | 15.00 |
+      | original_product_price | 15.00 |
+      | unit_price_tax_incl    | 15.90 |
+      | unit_price_tax_excl    | 15.00 |
+      | total_price_tax_incl   | 15.90 |
+      | total_price_tax_excl   | 15.00 |
     # Discount is not correct here because of bug from issue #20778 (discount amount applied twice), current is 30 should be 15
 #    And order "bo_order1" should have cart rule "CartRuleGiftProduct" with amount "$15.00"
     And the available stock for product "Test Product Gifted" should be 98
@@ -353,22 +393,30 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_incl  | 7.42   |
     And the first invoice from order "bo_order1" should contain 0 product "Test Product Gifted"
     And the product "Test Product Gifted" in the second invoice from the order "bo_order1" should have the following details:
-      | product_quantity            | 1     |
-      | product_price               | 15.00 |
-      | original_product_price      | 15.00 |
-      | unit_price_tax_incl         | 15.90 |
-      | unit_price_tax_excl         | 15.00 |
-      | total_price_tax_incl        | 15.90 |
-      | total_price_tax_excl        | 15.00 |
+      | product_quantity       | 1     |
+      | product_price          | 15.00 |
+      | original_product_price | 15.00 |
+      | unit_price_tax_incl    | 15.90 |
+      | unit_price_tax_excl    | 15.00 |
+      | total_price_tax_incl   | 15.90 |
+      | total_price_tax_excl   | 15.00 |
     And the available stock for product "Test Product Gifted" should be 99
 
+  @restore-cart-rules-after-scenario
   Scenario: I have a cart rule that is associated to a product which adds a gift product, I add this product to cart and then I remove it
     Given there is a product in the catalog named "Test Product With Auto Gift" with a price of 12.0 and 100 items in stock
-    And there is a cart rule named "MultiGiftAutoCartRule" that applies an amount discount of 1.0 with priority 1, quantity of 100 and quantity per user 100
-    And cart rule "MultiGiftAutoCartRule" has no discount code
-    And cart rule "MultiGiftAutoCartRule" is restricted to product "Test Product With Auto Gift"
-    And cart rule "MultiGiftAutoCartRule" offers free shipping
-    And cart rule "MultiGiftAutoCartRule" offers a gift product "Test Product Gifted"
+    And there is a cart rule "MultiGiftAutoCartRule" with following properties:
+      | name[en-US]               | MultiGiftAutoCartRule       |
+      | free_shipping             | true                        |
+      | priority                  | 1                           |
+      | total_quantity            | 100                         |
+      | quantity_per_user         | 100                         |
+      | gift_product              | Test Product Gifted         |
+      | discount_amount           | 1                           |
+      | discount_currency         | USD                         |
+      | discount_includes_tax     | false                       |
+      | discount_application_type | specific_product            |
+      | discount_product          | Test Product With Auto Gift |
     And I add 1 products "Test Product With Auto Gift" to the cart "dummy_cart"
     And I add order "bo_order1" with the following details:
       | cart                | dummy_cart                 |
@@ -390,21 +438,21 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
     And product "Test Product Gifted" in order "bo_order1" has following details:
-      | product_quantity            | 1     |
-      | product_price               | 15.00 |
-      | original_product_price      | 15.00 |
-      | unit_price_tax_incl         | 15.90 |
-      | unit_price_tax_excl         | 15.00 |
-      | total_price_tax_incl        | 15.90 |
-      | total_price_tax_excl        | 15.00 |
+      | product_quantity       | 1     |
+      | product_price          | 15.00 |
+      | original_product_price | 15.00 |
+      | unit_price_tax_incl    | 15.90 |
+      | unit_price_tax_excl    | 15.00 |
+      | total_price_tax_incl   | 15.90 |
+      | total_price_tax_excl   | 15.00 |
     And product "Test Product With Auto Gift" in order "bo_order1" has following details:
-      | product_quantity            | 1     |
-      | product_price               | 12.00 |
-      | original_product_price      | 12.00 |
-      | unit_price_tax_incl         | 12.72 |
-      | unit_price_tax_excl         | 12.00 |
-      | total_price_tax_incl        | 12.72 |
-      | total_price_tax_excl        | 12.00 |
+      | product_quantity       | 1     |
+      | product_price          | 12.00 |
+      | original_product_price | 12.00 |
+      | unit_price_tax_incl    | 12.72 |
+      | unit_price_tax_excl    | 12.00 |
+      | total_price_tax_incl   | 12.72 |
+      | total_price_tax_excl   | 12.00 |
     And order "bo_order1" should have cart rule "MultiGiftAutoCartRule" with amount "$23.00"
     And the available stock for product "Test Product Gifted" should be 99
     And the available stock for product "Test Product With Auto Gift" should be 99
@@ -427,13 +475,21 @@ Feature: Order from Back Office (BO)
     And the available stock for product "Test Product With Auto Gift" should be 100
     And the available stock for product "Test Product Gifted" should be 100
 
+  @restore-cart-rules-after-scenario
   Scenario: I have a cart rule that is associated to a product which adds a gift product, I add this product to the order and then I remove it
     Given there is a product in the catalog named "Test Product With Auto Gift" with a price of 12.0 and 100 items in stock
-    And there is a cart rule named "MultiGiftAutoCartRule" that applies an amount discount of 1.0 with priority 1, quantity of 100 and quantity per user 100
-    And cart rule "MultiGiftAutoCartRule" has no discount code
-    And cart rule "MultiGiftAutoCartRule" is restricted to product "Test Product With Auto Gift"
-    And cart rule "MultiGiftAutoCartRule" offers free shipping
-    And cart rule "MultiGiftAutoCartRule" offers a gift product "Test Product Gifted"
+    And there is a cart rule "MultiGiftAutoCartRule" with following properties:
+      | name[en-US]               | MultiGiftAutoCartRule       |
+      | free_shipping             | true                        |
+      | priority                  | 1                           |
+      | total_quantity            | 100                         |
+      | quantity_per_user         | 100                         |
+      | gift_product              | Test Product Gifted         |
+      | discount_amount           | 1                           |
+      | discount_currency         | USD                         |
+      | discount_includes_tax     | false                       |
+      | discount_application_type | specific_product            |
+      | discount_product          | Test Product With Auto Gift |
     And I add order "bo_order1" with the following details:
       | cart                | dummy_cart                 |
       | message             | test                       |
@@ -453,9 +509,9 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
     When I add products to order "bo_order1" with new invoice and the following products details:
-      | name          | Test Product With Auto Gift |
-      | amount        | 1                           |
-      | price         | 12.00                       |
+      | name   | Test Product With Auto Gift |
+      | amount | 1                           |
+      | price  | 12.00                       |
     Then order "bo_order1" should have 4 products in total
     And order "bo_order1" should have 0 invoice
     And order "bo_order1" should have 1 cart rule
@@ -471,21 +527,21 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
     And product "Test Product Gifted" in order "bo_order1" has following details:
-      | product_quantity            | 1     |
-      | product_price               | 15.00 |
-      | original_product_price      | 15.00 |
-      | unit_price_tax_incl         | 15.90 |
-      | unit_price_tax_excl         | 15.00 |
-      | total_price_tax_incl        | 15.90 |
-      | total_price_tax_excl        | 15.00 |
+      | product_quantity       | 1     |
+      | product_price          | 15.00 |
+      | original_product_price | 15.00 |
+      | unit_price_tax_incl    | 15.90 |
+      | unit_price_tax_excl    | 15.00 |
+      | total_price_tax_incl   | 15.90 |
+      | total_price_tax_excl   | 15.00 |
     And product "Test Product With Auto Gift" in order "bo_order1" has following details:
-      | product_quantity            | 1     |
-      | product_price               | 12.00 |
-      | original_product_price      | 12.00 |
-      | unit_price_tax_incl         | 12.72 |
-      | unit_price_tax_excl         | 12.00 |
-      | total_price_tax_incl        | 12.72 |
-      | total_price_tax_excl        | 12.00 |
+      | product_quantity       | 1     |
+      | product_price          | 12.00 |
+      | original_product_price | 12.00 |
+      | unit_price_tax_incl    | 12.72 |
+      | unit_price_tax_excl    | 12.00 |
+      | total_price_tax_incl   | 12.72 |
+      | total_price_tax_excl   | 12.00 |
     And order "bo_order1" should have cart rule "MultiGiftAutoCartRule" with amount "$23.00"
     And the available stock for product "Test Product Gifted" should be 99
     And the available stock for product "Test Product With Auto Gift" should be 99
@@ -508,13 +564,21 @@ Feature: Order from Back Office (BO)
     And the available stock for product "Test Product With Auto Gift" should be 100
     And the available stock for product "Test Product Gifted" should be 100
 
+  @restore-cart-rules-after-scenario
   Scenario: I remove a product with associated gift product, but this gift was already present in the cart
     Given there is a product in the catalog named "Test Product With Auto Gift" with a price of 12.0 and 100 items in stock
-    And there is a cart rule named "MultiGiftAutoCartRule" that applies an amount discount of 1.0 with priority 1, quantity of 100 and quantity per user 100
-    And cart rule "MultiGiftAutoCartRule" has no discount code
-    And cart rule "MultiGiftAutoCartRule" is restricted to product "Test Product With Auto Gift"
-    And cart rule "MultiGiftAutoCartRule" offers free shipping
-    And cart rule "MultiGiftAutoCartRule" offers a gift product "Test Product Gifted"
+    And there is a cart rule "MultiGiftAutoCartRule" with following properties:
+      | name[en-US]               | MultiGiftAutoCartRule       |
+      | free_shipping             | true                        |
+      | priority                  | 1                           |
+      | total_quantity            | 100                         |
+      | quantity_per_user         | 100                         |
+      | gift_product              | Test Product Gifted         |
+      | discount_amount           | 1                           |
+      | discount_currency         | USD                         |
+      | discount_includes_tax     | false                       |
+      | discount_application_type | specific_product            |
+      | discount_product          | Test Product With Auto Gift |
     And I add 1 products "Test Product Gifted" to the cart "dummy_cart"
     And I add 1 products "Test Product With Auto Gift" to the cart "dummy_cart"
     And I add order "bo_order1" with the following details:
@@ -537,21 +601,21 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
     And product "Test Product Gifted" in order "bo_order1" has following details:
-      | product_quantity            | 2     |
-      | product_price               | 15.00 |
-      | original_product_price      | 15.00 |
-      | unit_price_tax_incl         | 15.90 |
-      | unit_price_tax_excl         | 15.00 |
-      | total_price_tax_incl        | 31.80 |
-      | total_price_tax_excl        | 30.00 |
+      | product_quantity       | 2     |
+      | product_price          | 15.00 |
+      | original_product_price | 15.00 |
+      | unit_price_tax_incl    | 15.90 |
+      | unit_price_tax_excl    | 15.00 |
+      | total_price_tax_incl   | 31.80 |
+      | total_price_tax_excl   | 30.00 |
     And product "Test Product With Auto Gift" in order "bo_order1" has following details:
-      | product_quantity            | 1     |
-      | product_price               | 12.00 |
-      | original_product_price      | 12.00 |
-      | unit_price_tax_incl         | 12.72 |
-      | unit_price_tax_excl         | 12.00 |
-      | total_price_tax_incl        | 12.72 |
-      | total_price_tax_excl        | 12.00 |
+      | product_quantity       | 1     |
+      | product_price          | 12.00 |
+      | original_product_price | 12.00 |
+      | unit_price_tax_incl    | 12.72 |
+      | unit_price_tax_excl    | 12.00 |
+      | total_price_tax_incl   | 12.72 |
+      | total_price_tax_excl   | 12.00 |
     And order "bo_order1" should have cart rule "MultiGiftAutoCartRule" with amount "$23.00"
     And the available stock for product "Test Product Gifted" should be 98
     And the available stock for product "Test Product With Auto Gift" should be 99
@@ -572,23 +636,31 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
     And product "Test Product Gifted" in order "bo_order1" has following details:
-      | product_quantity            | 1     |
-      | product_price               | 15.00 |
-      | original_product_price      | 15.00 |
-      | unit_price_tax_incl         | 15.90 |
-      | unit_price_tax_excl         | 15.00 |
-      | total_price_tax_incl        | 15.90 |
-      | total_price_tax_excl        | 15.00 |
+      | product_quantity       | 1     |
+      | product_price          | 15.00 |
+      | original_product_price | 15.00 |
+      | unit_price_tax_incl    | 15.90 |
+      | unit_price_tax_excl    | 15.00 |
+      | total_price_tax_incl   | 15.90 |
+      | total_price_tax_excl   | 15.00 |
     And the available stock for product "Test Product With Auto Gift" should be 100
     And the available stock for product "Test Product Gifted" should be 99
 
+  @restore-cart-rules-after-scenario
   Scenario: I add the product with associated gift when the cart already has the gift, the quantity should be updated
     Given there is a product in the catalog named "Test Product With Auto Gift" with a price of 12.0 and 100 items in stock
-    And there is a cart rule named "MultiGiftAutoCartRule" that applies an amount discount of 1.0 with priority 1, quantity of 100 and quantity per user 100
-    And cart rule "MultiGiftAutoCartRule" has no discount code
-    And cart rule "MultiGiftAutoCartRule" is restricted to product "Test Product With Auto Gift"
-    And cart rule "MultiGiftAutoCartRule" offers free shipping
-    And cart rule "MultiGiftAutoCartRule" offers a gift product "Test Product Gifted"
+    And there is a cart rule "MultiGiftAutoCartRule" with following properties:
+      | name[en-US]               | MultiGiftAutoCartRule       |
+      | free_shipping             | true                        |
+      | priority                  | 1                           |
+      | total_quantity            | 100                         |
+      | quantity_per_user         | 100                         |
+      | gift_product              | Test Product Gifted         |
+      | discount_amount           | 1                           |
+      | discount_currency         | USD                         |
+      | discount_includes_tax     | false                       |
+      | discount_application_type | specific_product            |
+      | discount_product          | Test Product With Auto Gift |
     And I add 1 products "Test Product Gifted" to the cart "dummy_cart"
     And I add order "bo_order1" with the following details:
       | cart                | dummy_cart                 |
@@ -609,18 +681,18 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
     And product "Test Product Gifted" in order "bo_order1" has following details:
-      | product_quantity            | 1     |
-      | product_price               | 15.00 |
-      | original_product_price      | 15.00 |
-      | unit_price_tax_incl         | 15.90 |
-      | unit_price_tax_excl         | 15.00 |
-      | total_price_tax_incl        | 15.90 |
-      | total_price_tax_excl        | 15.00 |
+      | product_quantity       | 1     |
+      | product_price          | 15.00 |
+      | original_product_price | 15.00 |
+      | unit_price_tax_incl    | 15.90 |
+      | unit_price_tax_excl    | 15.00 |
+      | total_price_tax_incl   | 15.90 |
+      | total_price_tax_excl   | 15.00 |
     And the available stock for product "Test Product Gifted" should be 99
     When I add products to order "bo_order1" with new invoice and the following products details:
-      | name          | Test Product With Auto Gift |
-      | amount        | 1                           |
-      | price         | 12.00                       |
+      | name   | Test Product With Auto Gift |
+      | amount | 1                           |
+      | price  | 12.00                       |
     Then order "bo_order1" should have 5 products in total
     And order "bo_order1" should have 0 invoice
     And order "bo_order1" should have 1 cart rule
@@ -636,21 +708,21 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
     And product "Test Product Gifted" in order "bo_order1" has following details:
-      | product_quantity            | 2     |
-      | product_price               | 15.00 |
-      | original_product_price      | 15.00 |
-      | unit_price_tax_incl         | 15.90 |
-      | unit_price_tax_excl         | 15.00 |
-      | total_price_tax_incl        | 31.80 |
-      | total_price_tax_excl        | 30.00 |
+      | product_quantity       | 2     |
+      | product_price          | 15.00 |
+      | original_product_price | 15.00 |
+      | unit_price_tax_incl    | 15.90 |
+      | unit_price_tax_excl    | 15.00 |
+      | total_price_tax_incl   | 31.80 |
+      | total_price_tax_excl   | 30.00 |
     And product "Test Product With Auto Gift" in order "bo_order1" has following details:
-      | product_quantity            | 1     |
-      | product_price               | 12.00 |
-      | original_product_price      | 12.00 |
-      | unit_price_tax_incl         | 12.72 |
-      | unit_price_tax_excl         | 12.00 |
-      | total_price_tax_incl        | 12.72 |
-      | total_price_tax_excl        | 12.00 |
+      | product_quantity       | 1     |
+      | product_price          | 12.00 |
+      | original_product_price | 12.00 |
+      | unit_price_tax_incl    | 12.72 |
+      | unit_price_tax_excl    | 12.00 |
+      | total_price_tax_incl   | 12.72 |
+      | total_price_tax_excl   | 12.00 |
     And order "bo_order1" should have cart rule "MultiGiftAutoCartRule" with amount "$23.00"
     And the available stock for product "Test Product Gifted" should be 98
     And the available stock for product "Test Product With Auto Gift" should be 99
@@ -670,23 +742,31 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
     And product "Test Product Gifted" in order "bo_order1" has following details:
-      | product_quantity            | 1     |
-      | product_price               | 15.00 |
-      | original_product_price      | 15.00 |
-      | unit_price_tax_incl         | 15.90 |
-      | unit_price_tax_excl         | 15.00 |
-      | total_price_tax_incl        | 15.90 |
-      | total_price_tax_excl        | 15.00 |
+      | product_quantity       | 1     |
+      | product_price          | 15.00 |
+      | original_product_price | 15.00 |
+      | unit_price_tax_incl    | 15.90 |
+      | unit_price_tax_excl    | 15.00 |
+      | total_price_tax_incl   | 15.90 |
+      | total_price_tax_excl   | 15.00 |
     And the available stock for product "Test Product With Auto Gift" should be 100
     And the available stock for product "Test Product Gifted" should be 99
 
+  @restore-cart-rules-after-scenario
   Scenario: I add the product with associated gift, I remove the CartRule from the order
     Given there is a product in the catalog named "Test Product With Auto Gift" with a price of 12.0 and 100 items in stock
-    And there is a cart rule named "MultiGiftAutoCartRule" that applies an amount discount of 1.0 with priority 1, quantity of 100 and quantity per user 100
-    And cart rule "MultiGiftAutoCartRule" has no discount code
-    And cart rule "MultiGiftAutoCartRule" is restricted to product "Test Product With Auto Gift"
-    And cart rule "MultiGiftAutoCartRule" offers free shipping
-    And cart rule "MultiGiftAutoCartRule" offers a gift product "Test Product Gifted"
+    And there is a cart rule "MultiGiftAutoCartRule" with following properties:
+      | name[en-US]               | MultiGiftAutoCartRule       |
+      | free_shipping             | true                        |
+      | priority                  | 1                           |
+      | total_quantity            | 100                         |
+      | quantity_per_user         | 100                         |
+      | gift_product              | Test Product Gifted         |
+      | discount_amount           | 1                           |
+      | discount_currency         | USD                         |
+      | discount_includes_tax     | false                       |
+      | discount_application_type | specific_product            |
+      | discount_product          | Test Product With Auto Gift |
     And I add 1 products "Test Product With Auto Gift" to the cart "dummy_cart"
     And I add order "bo_order1" with the following details:
       | cart                | dummy_cart                 |
@@ -708,21 +788,21 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
     And product "Test Product Gifted" in order "bo_order1" has following details:
-      | product_quantity            | 1     |
-      | product_price               | 15.00 |
-      | original_product_price      | 15.00 |
-      | unit_price_tax_incl         | 15.90 |
-      | unit_price_tax_excl         | 15.00 |
-      | total_price_tax_incl        | 15.90 |
-      | total_price_tax_excl        | 15.00 |
+      | product_quantity       | 1     |
+      | product_price          | 15.00 |
+      | original_product_price | 15.00 |
+      | unit_price_tax_incl    | 15.90 |
+      | unit_price_tax_excl    | 15.00 |
+      | total_price_tax_incl   | 15.90 |
+      | total_price_tax_excl   | 15.00 |
     And product "Test Product With Auto Gift" in order "bo_order1" has following details:
-      | product_quantity            | 1     |
-      | product_price               | 12.00 |
-      | original_product_price      | 12.00 |
-      | unit_price_tax_incl         | 12.72 |
-      | unit_price_tax_excl         | 12.00 |
-      | total_price_tax_incl        | 12.72 |
-      | total_price_tax_excl        | 12.00 |
+      | product_quantity       | 1     |
+      | product_price          | 12.00 |
+      | original_product_price | 12.00 |
+      | unit_price_tax_incl    | 12.72 |
+      | unit_price_tax_excl    | 12.00 |
+      | total_price_tax_incl   | 12.72 |
+      | total_price_tax_excl   | 12.00 |
     And order "bo_order1" should have cart rule "MultiGiftAutoCartRule" with amount "$23.00"
     And the available stock for product "Test Product Gifted" should be 99
     And the available stock for product "Test Product With Auto Gift" should be 99
@@ -742,24 +822,32 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
     And product "Test Product With Auto Gift" in order "bo_order1" has following details:
-      | product_quantity            | 1     |
-      | product_price               | 12.00 |
-      | original_product_price      | 12.00 |
-      | unit_price_tax_incl         | 12.72 |
-      | unit_price_tax_excl         | 12.00 |
-      | total_price_tax_incl        | 12.72 |
-      | total_price_tax_excl        | 12.00 |
+      | product_quantity       | 1     |
+      | product_price          | 12.00 |
+      | original_product_price | 12.00 |
+      | unit_price_tax_incl    | 12.72 |
+      | unit_price_tax_excl    | 12.00 |
+      | total_price_tax_incl   | 12.72 |
+      | total_price_tax_excl   | 12.00 |
     And order "bo_order1" should contain 0 product "Test Product Gifted"
     And the available stock for product "Test Product Gifted" should be 100
     And the available stock for product "Test Product With Auto Gift" should be 99
 
+  @restore-cart-rules-after-scenario
   Scenario: I add the product with associated gift, I remove the gift from order
     Given there is a product in the catalog named "Test Product With Auto Gift" with a price of 12.0 and 100 items in stock
-    And there is a cart rule named "MultiGiftAutoCartRule" that applies an amount discount of 1.0 with priority 1, quantity of 100 and quantity per user 100
-    And cart rule "MultiGiftAutoCartRule" has no discount code
-    And cart rule "MultiGiftAutoCartRule" is restricted to product "Test Product With Auto Gift"
-    And cart rule "MultiGiftAutoCartRule" offers free shipping
-    And cart rule "MultiGiftAutoCartRule" offers a gift product "Test Product Gifted"
+    And there is a cart rule "MultiGiftAutoCartRule" with following properties:
+      | name[en-US]               | MultiGiftAutoCartRule       |
+      | free_shipping             | true                        |
+      | priority                  | 1                           |
+      | total_quantity            | 100                         |
+      | quantity_per_user         | 100                         |
+      | gift_product              | Test Product Gifted         |
+      | discount_amount           | 1                           |
+      | discount_currency         | USD                         |
+      | discount_includes_tax     | false                       |
+      | discount_application_type | specific_product            |
+      | discount_product          | Test Product With Auto Gift |
     And I add 1 products "Test Product With Auto Gift" to the cart "dummy_cart"
     And I add order "bo_order1" with the following details:
       | cart                | dummy_cart                 |
@@ -781,21 +869,21 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
     And product "Test Product Gifted" in order "bo_order1" has following details:
-      | product_quantity            | 1     |
-      | product_price               | 15.00 |
-      | original_product_price      | 15.00 |
-      | unit_price_tax_incl         | 15.90 |
-      | unit_price_tax_excl         | 15.00 |
-      | total_price_tax_incl        | 15.90 |
-      | total_price_tax_excl        | 15.00 |
+      | product_quantity       | 1     |
+      | product_price          | 15.00 |
+      | original_product_price | 15.00 |
+      | unit_price_tax_incl    | 15.90 |
+      | unit_price_tax_excl    | 15.00 |
+      | total_price_tax_incl   | 15.90 |
+      | total_price_tax_excl   | 15.00 |
     And product "Test Product With Auto Gift" in order "bo_order1" has following details:
-      | product_quantity            | 1     |
-      | product_price               | 12.00 |
-      | original_product_price      | 12.00 |
-      | unit_price_tax_incl         | 12.72 |
-      | unit_price_tax_excl         | 12.00 |
-      | total_price_tax_incl        | 12.72 |
-      | total_price_tax_excl        | 12.00 |
+      | product_quantity       | 1     |
+      | product_price          | 12.00 |
+      | original_product_price | 12.00 |
+      | unit_price_tax_incl    | 12.72 |
+      | unit_price_tax_excl    | 12.00 |
+      | total_price_tax_incl   | 12.72 |
+      | total_price_tax_excl   | 12.00 |
     And order "bo_order1" should have cart rule "MultiGiftAutoCartRule" with amount "$23.00"
     And the available stock for product "Test Product Gifted" should be 99
     And the available stock for product "Test Product With Auto Gift" should be 99
@@ -815,25 +903,33 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
     And product "Test Product With Auto Gift" in order "bo_order1" has following details:
-      | product_quantity            | 1     |
-      | product_price               | 12.00 |
-      | original_product_price      | 12.00 |
-      | unit_price_tax_incl         | 12.72 |
-      | unit_price_tax_excl         | 12.00 |
-      | total_price_tax_incl        | 12.72 |
-      | total_price_tax_excl        | 12.00 |
+      | product_quantity       | 1     |
+      | product_price          | 12.00 |
+      | original_product_price | 12.00 |
+      | unit_price_tax_incl    | 12.72 |
+      | unit_price_tax_excl    | 12.00 |
+      | total_price_tax_incl   | 12.72 |
+      | total_price_tax_excl   | 12.00 |
     And order "bo_order1" should have cart rule "MultiGiftAutoCartRule" with amount "$8.00"
     And order "bo_order1" should contain 0 product "Test Product Gifted"
     And the available stock for product "Test Product Gifted" should be 100
     And the available stock for product "Test Product With Auto Gift" should be 99
 
+  @restore-cart-rules-after-scenario
   Scenario: I add the product with associated gift when the cart already has the gift, then I change the product quantity several times and finally delete it
     Given there is a product in the catalog named "Test Product With Auto Gift" with a price of 12.0 and 100 items in stock
-    And there is a cart rule named "MultiGiftAutoCartRule" that applies an amount discount of 1.0 with priority 1, quantity of 100 and quantity per user 100
-    And cart rule "MultiGiftAutoCartRule" has no discount code
-    And cart rule "MultiGiftAutoCartRule" is restricted to product "Test Product With Auto Gift"
-    And cart rule "MultiGiftAutoCartRule" offers free shipping
-    And cart rule "MultiGiftAutoCartRule" offers a gift product "Test Product Gifted"
+    And there is a cart rule "MultiGiftAutoCartRule" with following properties:
+      | name[en-US]               | MultiGiftAutoCartRule       |
+      | free_shipping             | true                        |
+      | priority                  | 1                           |
+      | total_quantity            | 100                         |
+      | quantity_per_user         | 100                         |
+      | gift_product              | Test Product Gifted         |
+      | discount_amount           | 1                           |
+      | discount_currency         | USD                         |
+      | discount_includes_tax     | false                       |
+      | discount_application_type | specific_product            |
+      | discount_product          | Test Product With Auto Gift |
     And I add 1 products "Test Product Gifted" to the cart "dummy_cart"
     And I add 1 products "Test Product With Auto Gift" to the cart "dummy_cart"
     And I add order "bo_order1" with the following details:
@@ -856,27 +952,27 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
     And product "Test Product Gifted" in order "bo_order1" has following details:
-      | product_quantity            | 2     |
-      | product_price               | 15.00 |
-      | original_product_price      | 15.00 |
-      | unit_price_tax_incl         | 15.90 |
-      | unit_price_tax_excl         | 15.00 |
-      | total_price_tax_incl        | 31.80 |
-      | total_price_tax_excl        | 30.00 |
+      | product_quantity       | 2     |
+      | product_price          | 15.00 |
+      | original_product_price | 15.00 |
+      | unit_price_tax_incl    | 15.90 |
+      | unit_price_tax_excl    | 15.00 |
+      | total_price_tax_incl   | 31.80 |
+      | total_price_tax_excl   | 30.00 |
     And product "Test Product With Auto Gift" in order "bo_order1" has following details:
-      | product_quantity            | 1     |
-      | product_price               | 12.00 |
-      | original_product_price      | 12.00 |
-      | unit_price_tax_incl         | 12.72 |
-      | unit_price_tax_excl         | 12.00 |
-      | total_price_tax_incl        | 12.72 |
-      | total_price_tax_excl        | 12.00 |
+      | product_quantity       | 1     |
+      | product_price          | 12.00 |
+      | original_product_price | 12.00 |
+      | unit_price_tax_incl    | 12.72 |
+      | unit_price_tax_excl    | 12.00 |
+      | total_price_tax_incl   | 12.72 |
+      | total_price_tax_excl   | 12.00 |
     And order "bo_order1" should have cart rule "MultiGiftAutoCartRule" with amount "$23.00"
     And the available stock for product "Test Product Gifted" should be 98
     And the available stock for product "Test Product With Auto Gift" should be 99
     When I edit product "Test Product Gifted" to order "bo_order1" with following products details:
-      | amount        | 1                       |
-      | price         | 15                      |
+      | amount | 1  |
+      | price  | 15 |
     Then order "bo_order1" should have 4 products in total
     And order "bo_order1" should have 0 invoice
     And order "bo_order1" should have 1 cart rule
@@ -892,27 +988,27 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
     And product "Test Product Gifted" in order "bo_order1" has following details:
-      | product_quantity            | 1     |
-      | product_price               | 15.00 |
-      | original_product_price      | 15.00 |
-      | unit_price_tax_incl         | 15.90 |
-      | unit_price_tax_excl         | 15.00 |
-      | total_price_tax_incl        | 15.90 |
-      | total_price_tax_excl        | 15.00 |
+      | product_quantity       | 1     |
+      | product_price          | 15.00 |
+      | original_product_price | 15.00 |
+      | unit_price_tax_incl    | 15.90 |
+      | unit_price_tax_excl    | 15.00 |
+      | total_price_tax_incl   | 15.90 |
+      | total_price_tax_excl   | 15.00 |
     And product "Test Product With Auto Gift" in order "bo_order1" has following details:
-      | product_quantity            | 1     |
-      | product_price               | 12.00 |
-      | original_product_price      | 12.00 |
-      | unit_price_tax_incl         | 12.72 |
-      | unit_price_tax_excl         | 12.00 |
-      | total_price_tax_incl        | 12.72 |
-      | total_price_tax_excl        | 12.00 |
+      | product_quantity       | 1     |
+      | product_price          | 12.00 |
+      | original_product_price | 12.00 |
+      | unit_price_tax_incl    | 12.72 |
+      | unit_price_tax_excl    | 12.00 |
+      | total_price_tax_incl   | 12.72 |
+      | total_price_tax_excl   | 12.00 |
     And order "bo_order1" should have cart rule "MultiGiftAutoCartRule" with amount "$23.00"
     And the available stock for product "Test Product Gifted" should be 99
     And the available stock for product "Test Product With Auto Gift" should be 99
     When I edit product "Test Product Gifted" to order "bo_order1" with following products details:
-      | amount        | 2                       |
-      | price         | 15                      |
+      | amount | 2  |
+      | price  | 15 |
     Then order "bo_order1" should have 5 products in total
     And order "bo_order1" should have following details:
       | total_products           | 65.800 |
@@ -926,21 +1022,21 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
     And product "Test Product Gifted" in order "bo_order1" has following details:
-      | product_quantity            | 2     |
-      | product_price               | 15.00 |
-      | original_product_price      | 15.00 |
-      | unit_price_tax_incl         | 15.90 |
-      | unit_price_tax_excl         | 15.00 |
-      | total_price_tax_incl        | 31.80 |
-      | total_price_tax_excl        | 30.00 |
+      | product_quantity       | 2     |
+      | product_price          | 15.00 |
+      | original_product_price | 15.00 |
+      | unit_price_tax_incl    | 15.90 |
+      | unit_price_tax_excl    | 15.00 |
+      | total_price_tax_incl   | 31.80 |
+      | total_price_tax_excl   | 30.00 |
     And product "Test Product With Auto Gift" in order "bo_order1" has following details:
-      | product_quantity            | 1     |
-      | product_price               | 12.00 |
-      | original_product_price      | 12.00 |
-      | unit_price_tax_incl         | 12.72 |
-      | unit_price_tax_excl         | 12.00 |
-      | total_price_tax_incl        | 12.72 |
-      | total_price_tax_excl        | 12.00 |
+      | product_quantity       | 1     |
+      | product_price          | 12.00 |
+      | original_product_price | 12.00 |
+      | unit_price_tax_incl    | 12.72 |
+      | unit_price_tax_excl    | 12.00 |
+      | total_price_tax_incl   | 12.72 |
+      | total_price_tax_excl   | 12.00 |
     And order "bo_order1" should have cart rule "MultiGiftAutoCartRule" with amount "$23.00"
     And the available stock for product "Test Product Gifted" should be 98
     And the available stock for product "Test Product With Auto Gift" should be 99
@@ -960,22 +1056,26 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
     And product "Test Product With Auto Gift" in order "bo_order1" has following details:
-      | product_quantity            | 1     |
-      | product_price               | 12.00 |
-      | original_product_price      | 12.00 |
-      | unit_price_tax_incl         | 12.72 |
-      | unit_price_tax_excl         | 12.00 |
-      | total_price_tax_incl        | 12.72 |
-      | total_price_tax_excl        | 12.00 |
+      | product_quantity       | 1     |
+      | product_price          | 12.00 |
+      | original_product_price | 12.00 |
+      | unit_price_tax_incl    | 12.72 |
+      | unit_price_tax_excl    | 12.00 |
+      | total_price_tax_incl   | 12.72 |
+      | total_price_tax_excl   | 12.00 |
     And order "bo_order1" should have cart rule "MultiGiftAutoCartRule" with amount "$8.00"
     And order "bo_order1" should contain 0 product "Test Product Gifted"
     And the available stock for product "Test Product Gifted" should be 100
     And the available stock for product "Test Product With Auto Gift" should be 99
 
+  @restore-cart-rules-after-scenario
   Scenario: I have a cart rule that automatically adds a gift product, I add this product to cart and then I decrease it
-    And there is a cart rule named "AutoGiftCartRule" that applies an amount discount of 0.0 with priority 1, quantity of 100 and quantity per user 100
-    And cart rule "AutoGiftCartRule" has no discount code
-    And cart rule "AutoGiftCartRule" offers a gift product "Test Product Gifted"
+    And there is a cart rule "AutoGiftCartRule" with following properties:
+      | name[en-US]       | AutoGiftCartRule    |
+      | priority          | 1                   |
+      | total_quantity    | 100                 |
+      | quantity_per_user | 100                 |
+      | gift_product      | Test Product Gifted |
     And I delete product "Mug The best is yet to come" from cart "dummy_cart"
     And I add 1 products "Test Product Gifted" to the cart "dummy_cart"
     And I add order "bo_order1" with the following details:
@@ -998,18 +1098,18 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_excl  | 7.0   |
       | total_shipping_tax_incl  | 7.42  |
     And product "Test Product Gifted" in order "bo_order1" has following details:
-      | product_quantity            | 2     |
-      | product_price               | 15.00 |
-      | original_product_price      | 15.00 |
-      | unit_price_tax_incl         | 15.90 |
-      | unit_price_tax_excl         | 15.00 |
-      | total_price_tax_incl        | 31.80 |
-      | total_price_tax_excl        | 30.00 |
+      | product_quantity       | 2     |
+      | product_price          | 15.00 |
+      | original_product_price | 15.00 |
+      | unit_price_tax_incl    | 15.90 |
+      | unit_price_tax_excl    | 15.00 |
+      | total_price_tax_incl   | 31.80 |
+      | total_price_tax_excl   | 30.00 |
     And order "bo_order1" should have cart rule "AutoGiftCartRule" with amount "$15.00"
     And the available stock for product "Test Product Gifted" should be 98
     When I edit product "Test Product Gifted" to order "bo_order1" with following products details:
-      | amount        | 1     |
-      | price         | 15.00 |
+      | amount | 1     |
+      | price  | 15.00 |
     Then order "bo_order1" should have 0 products in total
     Then order "bo_order1" should contain 0 product "Test Product Gifted"
     Then order "bo_order1" should have 0 cart rule
@@ -1027,12 +1127,12 @@ Feature: Order from Back Office (BO)
     And the available stock for product "Test Product Gifted" should be 100
     Then order "bo_order1" has status "Awaiting bank wire payment"
     And I add products to order "bo_order1" with new invoice and the following products details:
-      | name          | Test Product Gifted |
-      | amount        | 1                   |
-      | price         | 15.0                |
+      | name   | Test Product Gifted |
+      | amount | 1                   |
+      | price  | 15.0                |
     Then order "bo_order1" should have 2 products in total
-    And order "bo_order1" should have 0 invoice
     And order "bo_order1" should have 1 cart rule
+    And order "bo_order1" should have 0 invoice
     And order "bo_order1" should have following details:
       | total_products           | 30.00 |
       | total_products_wt        | 31.80 |
@@ -1045,24 +1145,32 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_excl  | 7.0   |
       | total_shipping_tax_incl  | 7.42  |
     And product "Test Product Gifted" in order "bo_order1" has following details:
-      | product_quantity            | 2     |
-      | product_price               | 15.00 |
-      | original_product_price      | 15.00 |
-      | unit_price_tax_incl         | 15.90 |
-      | unit_price_tax_excl         | 15.00 |
-      | total_price_tax_incl        | 31.80 |
-      | total_price_tax_excl        | 30.00 |
+      | product_quantity       | 2     |
+      | product_price          | 15.00 |
+      | original_product_price | 15.00 |
+      | unit_price_tax_incl    | 15.90 |
+      | unit_price_tax_excl    | 15.00 |
+      | total_price_tax_incl   | 31.80 |
+      | total_price_tax_excl   | 30.00 |
     And order "bo_order1" should have cart rule "AutoGiftCartRule" with amount "$15.00"
     And the available stock for product "Test Product Gifted" should be 98
 
+  @restore-cart-rules-after-scenario
   Scenario: I add the product with associated gift when the cart already has the gift, and the gift product quantity in stock before cart rule applies is 1
     Given there is a product in the catalog named "product triggering gift" with a price of 12.0 and 100 items in stock
-    Given there is a product in the catalog named "gifted product" with a price of 15.0 and 2 items in stock
-    And there is a cart rule named "GiftAutoCartRule" that applies an amount discount of 1.0 with priority 1, quantity of 100 and quantity per user 100
-    And cart rule "GiftAutoCartRule" has no discount code
-    And cart rule "GiftAutoCartRule" is restricted to product "product triggering gift"
-    And cart rule "GiftAutoCartRule" offers free shipping
-    And cart rule "GiftAutoCartRule" offers a gift product "gifted product"
+    And there is a product in the catalog named "gifted product" with a price of 15.0 and 2 items in stock
+    And there is a cart rule "MultiGiftAutoCartRule" with following properties:
+      | name[en-US]               | GiftAutoCartRule        |
+      | free_shipping             | true                    |
+      | priority                  | 1                       |
+      | total_quantity            | 100                     |
+      | quantity_per_user         | 100                     |
+      | gift_product              | gifted product          |
+      | discount_amount           | 1                       |
+      | discount_currency         | USD                     |
+      | discount_includes_tax     | false                   |
+      | discount_application_type | specific_product        |
+      | discount_product          | product triggering gift |
     And I add 1 products "gifted product" to the cart "dummy_cart"
     Given I add order "bo_order1" with the following details:
       | cart                | dummy_cart                 |
@@ -1084,19 +1192,19 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
     When I add products to order "bo_order1" with new invoice and the following products details:
-      | name          | product triggering gift  |
-      | amount        | 1                        |
-      | price         | 12.0                     |
+      | name   | product triggering gift |
+      | amount | 1                       |
+      | price  | 12.0                    |
     Then order "bo_order1" should have 5 products in total
     And the available stock for product "gifted product" should be 0
     And product "gifted product" in order "bo_order1" has following details:
-      | product_quantity            | 2     |
-      | product_price               | 15.00 |
-      | original_product_price      | 15.00 |
-      | unit_price_tax_incl         | 15.90 |
-      | unit_price_tax_excl         | 15.00 |
-      | total_price_tax_incl        | 31.80 |
-      | total_price_tax_excl        | 30.00 |
+      | product_quantity       | 2     |
+      | product_price          | 15.00 |
+      | original_product_price | 15.00 |
+      | unit_price_tax_incl    | 15.90 |
+      | unit_price_tax_excl    | 15.00 |
+      | total_price_tax_incl   | 31.80 |
+      | total_price_tax_excl   | 30.00 |
     And order "bo_order1" should have following details:
       | total_products           | 65.800 |
       | total_products_wt        | 69.750 |
@@ -1109,21 +1217,33 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
 
+  @restore-cart-rules-after-scenario
   Scenario: I have a cart rule that is associated to a product which adds a discount,
-      and an another cart rule which adds a free gift which is the same product,
-      I add this product,
-      I order,
-      I remove all cart rules,
-      I remove the product
+  and an another cart rule which adds a free gift which is the same product,
+  I add this product,
+  I order,
+  I remove all cart rules,
+  I remove the product
     Given there is a product in the catalog named "Product 12345" with a price of 12.0 and 100 items in stock
     # Create a cart rule : No cade + Product restriction with min quanity + Discount 50%
-    And there is a cart rule named "cartRulePercentDiscountOnSpecificProduct" that applies a percent discount of 50.0% with priority 1, quantity of 100 and quantity per user 100
-    And cart rule "cartRulePercentDiscountOnSpecificProduct" has no discount code
+    And there is a cart rule "cartRulePercentDiscountOnSpecificProduct" with following properties:
+      | name[en-US]               | cartRulePercentDiscountOnSpecificProduct |
+      | priority                  | 1                                        |
+      | total_quantity            | 100                                      |
+      | quantity_per_user         | 100                                      |
+      | discount_percentage       | 50                                       |
+      | discount_currency         | USD                                      |
+      | discount_application_type | specific_product                         |
+      | discount_product          | Product 12345                            |
+    # @todo: restrictions are not yet implemented using CQRS, so we use old step. (the step itself is as well unclear- it is a mix between specific product and product restriction features)
     And cart rule "cartRulePercentDiscountOnSpecificProduct" is restricted to product "Product 12345" with a quantity of 2
     # Create a cart rule : No cade + no conditions + free gift = demo_6
-    And there is a cart rule named "cartRuleFreeGift" that applies no discount with priority 1, quantity of 100 and quantity per user 100
-    And cart rule "cartRuleFreeGift" has no discount code
-    And cart rule "cartRuleFreeGift" offers a gift product "Product 12345"
+    And there is a cart rule "cartRuleFreeGift" with following properties:
+      | name[en-US]       | cartRuleFreeGift |
+      | priority          | 1                |
+      | quantity          | 100              |
+      | quantity_per_user | 100              |
+      | gift_product      | Product 12345    |
     # Make an order
     And I create an empty cart "dummy_cart" for customer "testCustomer"
     And I select "US" address as delivery and invoice address for customer "testCustomer" in cart "dummy_cart"
@@ -1198,28 +1318,32 @@ Feature: Order from Back Office (BO)
     And order "bo_order1" should have 0 invoice
     And order "bo_order1" should have 0 cart rules
     And order "bo_order1" should have following details:
-      | total_products           | 0.00  |
-      | total_products_wt        | 0.00  |
-      | total_discounts_tax_excl | 0.00  |
-      | total_discounts_tax_incl | 0.00  |
-      | total_shipping_tax_excl  | 0.00  |
-      | total_shipping_tax_incl  | 0.00  |
-      | total_paid_tax_excl      | 0.00  |
-      | total_paid_tax_incl      | 0.00  |
-      | total_paid               | 0.00  |
-      | total_paid_real          | 0.00  |
+      | total_products           | 0.00 |
+      | total_products_wt        | 0.00 |
+      | total_discounts_tax_excl | 0.00 |
+      | total_discounts_tax_incl | 0.00 |
+      | total_shipping_tax_excl  | 0.00 |
+      | total_shipping_tax_incl  | 0.00 |
+      | total_paid_tax_excl      | 0.00 |
+      | total_paid_tax_incl      | 0.00 |
+      | total_paid               | 0.00 |
+      | total_paid_real          | 0.00 |
 
+  @restore-cart-rules-after-scenario
   Scenario: I have a cart rule that adds a free gift when delivery address is in the USA,
-            when I change this delivery address, the free gift is removed
+  when I change this delivery address, the free gift is removed
 
     Given country "US" is enabled
     And country "FR" is enabled
     And there is a product in the catalog named "Product 12345" with a price of 12.0 and 100 items in stock
     And there is a product in the catalog named "Gift product" with a price of 13.0 and 100 items in stock
     # Create a cart rule : No cade + no conditions + free gift = demo_6
-    And there is a cart rule named "cartRuleFreeGift" that applies no discount with priority 1, quantity of 100 and quantity per user 100
-    And cart rule "cartRuleFreeGift" has no discount code
-    And cart rule "cartRuleFreeGift" offers a gift product "Gift product"
+    And there is a cart rule "cartRuleFreeGift" with following properties:
+      | name[en-US]       | cartRuleFreeGift |
+      | priority          | 1                |
+      | total_quantity    | 100              |
+      | quantity_per_user | 100              |
+      | gift_product      | Gift product     |
     And cart rule "cartRuleFreeGift" is restricted to country "US"
     # Make an order
     And I create an empty cart "dummy_cart" for customer "testCustomer"
@@ -1245,29 +1369,29 @@ Feature: Order from Back Office (BO)
       | total_paid               | 20.14 |
       | total_paid_real          | 0.0   |
     And product "Product 12345" in order "bo_order1" has following details:
-      | product_quantity         | 1     |
-      | product_price            | 12.00 |
-      | original_product_price   | 12.00 |
-      | unit_price_tax_incl      | 12.72 |
-      | unit_price_tax_excl      | 12.00 |
-      | total_price_tax_incl     | 12.72 |
-      | total_price_tax_excl     | 12.00 |
+      | product_quantity       | 1     |
+      | product_price          | 12.00 |
+      | original_product_price | 12.00 |
+      | unit_price_tax_incl    | 12.72 |
+      | unit_price_tax_excl    | 12.00 |
+      | total_price_tax_incl   | 12.72 |
+      | total_price_tax_excl   | 12.00 |
     And product "Gift product" in order "bo_order1" has following details:
-      | product_quantity         | 1     |
-      | product_price            | 13.00 |
-      | original_product_price   | 13.00 |
-      | unit_price_tax_incl      | 13.78 |
-      | unit_price_tax_excl      | 13.00 |
-      | total_price_tax_incl     | 13.78 |
-      | total_price_tax_excl     | 13.00 |
+      | product_quantity       | 1     |
+      | product_price          | 13.00 |
+      | original_product_price | 13.00 |
+      | unit_price_tax_incl    | 13.78 |
+      | unit_price_tax_excl    | 13.00 |
+      | total_price_tax_incl   | 13.78 |
+      | total_price_tax_excl   | 13.00 |
     When I add new address to customer "testCustomer" with following details:
-      | Address alias    | test-customer-france-address |
-      | First name       | testFirstName                |
-      | Last name        | testLastName                 |
-      | Address          | 36 Avenue des Champs Elysees |
-      | City             | Paris                        |
-      | Country          | France                       |
-      | Postal code      | 75008                        |
+      | Address alias | test-customer-france-address |
+      | First name    | testFirstName                |
+      | Last name     | testLastName                 |
+      | Address       | 36 Avenue des Champs Elysees |
+      | City          | Paris                        |
+      | Country       | France                       |
+      | Postal code   | 75008                        |
     And I change order "bo_order1" shipping address to "test-customer-france-address"
     Then order "bo_order1" should have 1 products in total
     And order "bo_order1" should have 0 invoice
@@ -1285,22 +1409,22 @@ Feature: Order from Back Office (BO)
       | total_paid               | 19.00 |
       | total_paid_real          | 0.0   |
     And product "Product 12345" in order "bo_order1" has following details:
-      | product_quantity         | 1     |
-      | product_price            | 12.00 |
-      | original_product_price   | 12.00 |
-      | unit_price_tax_incl      | 12.00 |
-      | unit_price_tax_excl      | 12.00 |
-      | total_price_tax_incl     | 12.00 |
-      | total_price_tax_excl     | 12.00 |
+      | product_quantity       | 1     |
+      | product_price          | 12.00 |
+      | original_product_price | 12.00 |
+      | unit_price_tax_incl    | 12.00 |
+      | unit_price_tax_excl    | 12.00 |
+      | total_price_tax_incl   | 12.00 |
+      | total_price_tax_excl   | 12.00 |
     When I add new address to customer "testCustomer" with following details:
-      | Address alias    | test-customer-states-address |
-      | First name       | testFirstName                |
-      | Last name        | testLastName                 |
-      | Address          | 36 Avenue des Champs Elysees |
-      | City             | Miami                        |
-      | Country          | United States                |
-      | State            | Florida                      |
-      | Postal code      | 33133                        |
+      | Address alias | test-customer-states-address |
+      | First name    | testFirstName                |
+      | Last name     | testLastName                 |
+      | Address       | 36 Avenue des Champs Elysees |
+      | City          | Miami                        |
+      | Country       | United States                |
+      | State         | Florida                      |
+      | Postal code   | 33133                        |
     And I change order "bo_order1" shipping address to "test-customer-states-address"
     Then order "bo_order1" should have 2 products in total
     And order "bo_order1" should have 0 invoice
@@ -1317,33 +1441,39 @@ Feature: Order from Back Office (BO)
       | total_paid               | 20.14 |
       | total_paid_real          | 0.0   |
     And product "Product 12345" in order "bo_order1" has following details:
-      | product_quantity         | 1     |
-      | product_price            | 12.00 |
-      | original_product_price   | 12.00 |
-      | unit_price_tax_incl      | 12.72 |
-      | unit_price_tax_excl      | 12.00 |
-      | total_price_tax_incl     | 12.72 |
-      | total_price_tax_excl     | 12.00 |
+      | product_quantity       | 1     |
+      | product_price          | 12.00 |
+      | original_product_price | 12.00 |
+      | unit_price_tax_incl    | 12.72 |
+      | unit_price_tax_excl    | 12.00 |
+      | total_price_tax_incl   | 12.72 |
+      | total_price_tax_excl   | 12.00 |
     And product "Gift product" in order "bo_order1" has following details:
-      | product_quantity         | 1     |
-      | product_price            | 13.00 |
-      | original_product_price   | 13.00 |
-      | unit_price_tax_incl      | 13.78 |
-      | unit_price_tax_excl      | 13.00 |
-      | total_price_tax_incl     | 13.78 |
-      | total_price_tax_excl     | 13.00 |
-
+      | product_quantity       | 1     |
+      | product_price          | 13.00 |
+      | original_product_price | 13.00 |
+      | unit_price_tax_incl    | 13.78 |
+      | unit_price_tax_excl    | 13.00 |
+      | total_price_tax_incl   | 13.78 |
+      | total_price_tax_excl   | 13.00 |
 
+  @restore-cart-rules-after-scenario
   Scenario: I have a cart rule that adds a free gift when a certain amount is reached,
-            when the amount is not reached anymore (by reducing quantity), the free gift is removed
+  when the amount is not reached anymore (by reducing quantity), the free gift is removed
 
     Given there is a product in the catalog named "Product 12345" with a price of 12.0 and 100 items in stock
     And there is a product in the catalog named "Gift product" with a price of 13.0 and 100 items in stock
     # Create a cart rule : No cade + no conditions + free gift = demo_6
-    And there is a cart rule named "cartRuleFreeGift" that applies no discount with priority 1, quantity of 100 and quantity per user 100
-    And cart rule "cartRuleFreeGift" has no discount code
-    And cart rule "cartRuleFreeGift" offers a gift product "Gift product"
-    And cart rule "cartRuleFreeGift" applies discount only when cart total is above 30.00
+    And there is a cart rule "cartRuleFreeGift" with following properties:
+      | name[en-US]                      | cartRuleFreeGift |
+      | priority                         | 1                |
+      | total_quantity                   | 100              |
+      | quantity_per_user                | 100              |
+      | gift_product                     | Gift product     |
+      | minimum_amount                   | 30               |
+      | minimum_amount_currency          | USD              |
+      | minimum_amount_tax_included      | false            |
+      | minimum_amount_shipping_included | false            |
     # Make an order
     And I create an empty cart "dummy_cart" for customer "testCustomer"
     And I select "US" address as delivery and invoice address for customer "testCustomer" in cart "dummy_cart"
@@ -1368,21 +1498,21 @@ Feature: Order from Back Office (BO)
       | total_paid               | 45.58 |
       | total_paid_real          | 0.0   |
     And product "Product 12345" in order "bo_order1" has following details:
-      | product_quantity         | 3     |
-      | product_price            | 12.00 |
-      | original_product_price   | 12.00 |
-      | unit_price_tax_incl      | 12.72 |
-      | unit_price_tax_excl      | 12.00 |
-      | total_price_tax_incl     | 38.16 |
-      | total_price_tax_excl     | 36.00 |
+      | product_quantity       | 3     |
+      | product_price          | 12.00 |
+      | original_product_price | 12.00 |
+      | unit_price_tax_incl    | 12.72 |
+      | unit_price_tax_excl    | 12.00 |
+      | total_price_tax_incl   | 38.16 |
+      | total_price_tax_excl   | 36.00 |
     And product "Gift product" in order "bo_order1" has following details:
-      | product_quantity         | 1     |
-      | product_price            | 13.00 |
-      | original_product_price   | 13.00 |
-      | unit_price_tax_incl      | 13.78 |
-      | unit_price_tax_excl      | 13.00 |
-      | total_price_tax_incl     | 13.78 |
-      | total_price_tax_excl     | 13.00 |
+      | product_quantity       | 1     |
+      | product_price          | 13.00 |
+      | original_product_price | 13.00 |
+      | unit_price_tax_incl    | 13.78 |
+      | unit_price_tax_excl    | 13.00 |
+      | total_price_tax_incl   | 13.78 |
+      | total_price_tax_excl   | 13.00 |
     When I edit product "Product 12345" to order "bo_order1" with following products details:
       | amount | 1     |
       | price  | 12.00 |
@@ -1401,15 +1531,15 @@ Feature: Order from Back Office (BO)
       | total_paid               | 20.14 |
       | total_paid_real          | 0.0   |
     And product "Product 12345" in order "bo_order1" has following details:
-      | product_quantity         | 1     |
-      | product_price            | 12.00 |
-      | original_product_price   | 12.00 |
-      | unit_price_tax_incl      | 12.72 |
-      | unit_price_tax_excl      | 12.00 |
-      | total_price_tax_incl     | 12.72 |
-      | total_price_tax_excl     | 12.00 |
+      | product_quantity       | 1     |
+      | product_price          | 12.00 |
+      | original_product_price | 12.00 |
+      | unit_price_tax_incl    | 12.72 |
+      | unit_price_tax_excl    | 12.00 |
+      | total_price_tax_incl   | 12.72 |
+      | total_price_tax_excl   | 12.00 |
     When I edit product "Product 12345" to order "bo_order1" with following products details:
-      | amount | 3 |
+      | amount | 3     |
       | price  | 12.00 |
     Then order "bo_order1" should have 4 products in total
     And order "bo_order1" should have 0 invoice
@@ -1426,32 +1556,39 @@ Feature: Order from Back Office (BO)
       | total_paid               | 45.58 |
       | total_paid_real          | 0.0   |
     And product "Product 12345" in order "bo_order1" has following details:
-      | product_quantity         | 3     |
-      | product_price            | 12.00 |
-      | original_product_price   | 12.00 |
-      | unit_price_tax_incl      | 12.72 |
-      | unit_price_tax_excl      | 12.00 |
-      | total_price_tax_incl     | 38.16 |
-      | total_price_tax_excl     | 36.00 |
+      | product_quantity       | 3     |
+      | product_price          | 12.00 |
+      | original_product_price | 12.00 |
+      | unit_price_tax_incl    | 12.72 |
+      | unit_price_tax_excl    | 12.00 |
+      | total_price_tax_incl   | 38.16 |
+      | total_price_tax_excl   | 36.00 |
     And product "Gift product" in order "bo_order1" has following details:
-      | product_quantity         | 1     |
-      | product_price            | 13.00 |
-      | original_product_price   | 13.00 |
-      | unit_price_tax_incl      | 13.78 |
-      | unit_price_tax_excl      | 13.00 |
-      | total_price_tax_incl     | 13.78 |
-      | total_price_tax_excl     | 13.00 |
+      | product_quantity       | 1     |
+      | product_price          | 13.00 |
+      | original_product_price | 13.00 |
+      | unit_price_tax_incl    | 13.78 |
+      | unit_price_tax_excl    | 13.00 |
+      | total_price_tax_incl   | 13.78 |
+      | total_price_tax_excl   | 13.00 |
 
+  @restore-cart-rules-after-scenario
   Scenario: I have a cart rule that adds a free gift when a certain amount is reached,
   when the amount is not reached anymore (by reducing price), the free gift is removed
 
     Given there is a product in the catalog named "Product 12345" with a price of 12.0 and 100 items in stock
     And there is a product in the catalog named "Gift product" with a price of 13.0 and 100 items in stock
     # Create a cart rule : No cade + no conditions + free gift = demo_6
-    And there is a cart rule named "cartRuleFreeGift" that applies no discount with priority 1, quantity of 100 and quantity per user 100
-    And cart rule "cartRuleFreeGift" has no discount code
-    And cart rule "cartRuleFreeGift" offers a gift product "Gift product"
-    And cart rule "cartRuleFreeGift" applies discount only when cart total is above 30.00
+    And there is a cart rule "cartRuleFreeGift" with following properties:
+      | name[en-US]                      | cartRuleFreeGift |
+      | priority                         | 1                |
+      | total_quantity                   | 100              |
+      | quantity_per_user                | 100              |
+      | gift_product                     | Gift product     |
+      | minimum_amount                   | 30               |
+      | minimum_amount_currency          | USD              |
+      | minimum_amount_tax_included      | false            |
+      | minimum_amount_shipping_included | false            |
     # Make an order
     And I create an empty cart "dummy_cart" for customer "testCustomer"
     And I select "US" address as delivery and invoice address for customer "testCustomer" in cart "dummy_cart"
@@ -1476,15 +1613,15 @@ Feature: Order from Back Office (BO)
       | total_paid               | 20.14 |
       | total_paid_real          | 0.0   |
     And product "Product 12345" in order "bo_order1" has following details:
-      | product_quantity         | 1     |
-      | product_price            | 12.00 |
-      | original_product_price   | 12.00 |
-      | unit_price_tax_incl      | 12.72 |
-      | unit_price_tax_excl      | 12.00 |
-      | total_price_tax_incl     | 12.72 |
-      | total_price_tax_excl     | 12.00 |
+      | product_quantity       | 1     |
+      | product_price          | 12.00 |
+      | original_product_price | 12.00 |
+      | unit_price_tax_incl    | 12.72 |
+      | unit_price_tax_excl    | 12.00 |
+      | total_price_tax_incl   | 12.72 |
+      | total_price_tax_excl   | 12.00 |
     When I edit product "Product 12345" to order "bo_order1" with following products details:
-      | amount | 1 |
+      | amount | 1     |
       | price  | 30.00 |
     Then order "bo_order1" should have 2 products in total
     And order "bo_order1" should have 0 invoice
@@ -1501,18 +1638,18 @@ Feature: Order from Back Office (BO)
       | total_paid               | 39.22 |
       | total_paid_real          | 0.0   |
     And product "Product 12345" in order "bo_order1" has following details:
-      | product_quantity         | 1     |
-      | product_price            | 30.00 |
-      | original_product_price   | 12.00 |
-      | unit_price_tax_incl      | 31.80 |
-      | unit_price_tax_excl      | 30.00 |
-      | total_price_tax_incl     | 31.80 |
-      | total_price_tax_excl     | 30.00 |
+      | product_quantity       | 1     |
+      | product_price          | 30.00 |
+      | original_product_price | 12.00 |
+      | unit_price_tax_incl    | 31.80 |
+      | unit_price_tax_excl    | 30.00 |
+      | total_price_tax_incl   | 31.80 |
+      | total_price_tax_excl   | 30.00 |
     And product "Gift product" in order "bo_order1" has following details:
-      | product_quantity         | 1     |
-      | product_price            | 13.00 |
-      | original_product_price   | 13.00 |
-      | unit_price_tax_incl      | 13.78 |
-      | unit_price_tax_excl      | 13.00 |
-      | total_price_tax_incl     | 13.78 |
-      | total_price_tax_excl     | 13.00 |
+      | product_quantity       | 1     |
+      | product_price          | 13.00 |
+      | original_product_price | 13.00 |
+      | unit_price_tax_incl    | 13.78 |
+      | unit_price_tax_excl    | 13.00 |
+      | total_price_tax_incl   | 13.78 |
+      | total_price_tax_excl   | 13.00 |

From f9b166a0dddbd0101662d1249eba253c0bcd2642 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Tue, 20 Jun 2023 10:54:46 +0300
Subject: [PATCH 0255/1030]  move before/after feature method out of abstract
 context

---
 .../CartRule/AbstractCartRuleFeatureContext.php      | 12 ------------
 .../CartRule/CartRuleAssertionFeatureContext.php     | 12 ++++++++++++
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
index 617e2ee6108d2..18e6a0aabd219 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
@@ -41,21 +41,9 @@
 use RuntimeException;
 use Tests\Integration\Behaviour\Features\Context\Domain\AbstractDomainFeatureContext;
 use Tests\Integration\Behaviour\Features\Context\Util\PrimitiveUtils;
-use Tests\Resources\DatabaseDump;
 
 abstract class AbstractCartRuleFeatureContext extends AbstractDomainFeatureContext
 {
-    /**
-     * @BeforeScenario @restore-cart-rules-before-scenario
-     * @AfterScenario @restore-cart-rules-after-scenario
-     *
-     * @return void
-     */
-    public static function restoreCartRules(): void
-    {
-        DatabaseDump::restoreMatchingTables('^cart_rule.*^');
-    }
-
     public function createCartRuleWithReference(string $cartRuleReference, array $data): void
     {
         $command = new AddCartRuleCommand(
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
index 35ad7d8d6d7b9..40c813d157c75 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
@@ -36,9 +36,21 @@
 use PrestaShop\PrestaShop\Core\Domain\CartRule\QueryResult\CartRuleForEditing;
 use RuntimeException;
 use Tests\Integration\Behaviour\Features\Context\Util\NoExceptionAlthoughExpectedException;
+use Tests\Resources\DatabaseDump;
 
 class CartRuleAssertionFeatureContext extends AbstractCartRuleFeatureContext
 {
+    /**
+     * @BeforeScenario @restore-cart-rules-before-scenario
+     * @AfterScenario @restore-cart-rules-after-scenario
+     *
+     * @return void
+     */
+    public static function restoreCartRules(): void
+    {
+        DatabaseDump::restoreMatchingTables('^cart_rule.*^');
+    }
+
     /**
      * @Then cart rule with reference :cartRuleReference is enabled
      *

From e78a1cbdb294c134db01966cac09a1512a25d4fe Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Tue, 20 Jun 2023 11:41:11 +0300
Subject: [PATCH 0256/1030]  ruese and cleanup getting cartRuleId for old and
 new scenarios

---
 .../Context/CartRuleFeatureContext.php        | 55 ++++++-------------
 1 file changed, 17 insertions(+), 38 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
index c5ccc1b4ab304..c795ff9093867 100644
--- a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
@@ -172,15 +172,7 @@ protected function createCartRule(
      */
     public function cartRuleWithProductRuleRestriction(string $cartRuleName, string $categoryName, int $quantity)
     {
-        if ($this->getSharedStorage()->exists($cartRuleName)) {
-            //@todo: This allows applying this step to cart rule that was created with a step using CQRS command and saved to shared storage
-            //       it is not ideal, but for now it should work, until restrictions are migrated.
-            $cartRuleId = $this->getSharedStorage()->get($cartRuleName);
-        } else {
-            $this->checkCartRuleWithNameExists($cartRuleName);
-            $cartRuleId = $this->cartRules[$cartRuleName]->id;
-        }
-
+        $cartRuleId = $this->getCartRuleId($cartRuleName);
         $this->categoryFeatureContext->checkCategoryWithNameExists($categoryName);
         $category = $this->categoryFeatureContext->getCategoryWithName($categoryName);
 
@@ -232,14 +224,7 @@ public function cartRuleNamedIsRestrictedToProductNamed(
         string $productName,
         int $quantity = 1
     ): void {
-        if ($this->getSharedStorage()->exists($cartRuleName)) {
-            //@todo: This allows applying this step to cart rule that was created with a step using CQRS command and saved to shared storage
-            //       it is not ideal, but for now it should work, until restrictions are migrated.
-            $cartRuleId = $this->getSharedStorage()->get($cartRuleName);
-        } else {
-            $this->checkCartRuleWithNameExists($cartRuleName);
-            $cartRuleId = $this->cartRules[$cartRuleName]->id;
-        }
+        $cartRuleId = $this->getCartRuleId($cartRuleName);
         $this->productFeatureContext->checkProductWithNameExists($productName);
         $restrictedProduct = $this->productFeatureContext->getProductWithName($productName);
         $cartRule = new CartRule($cartRuleId);
@@ -272,15 +257,7 @@ public function cartRuleNamedIsRestrictedToProductNamed(
     public function cartRuleNamedIsRestrictedToCarrierNamed($cartRuleName, $carrierName)
     {
         $this->carrierFeatureContext->checkCarrierWithNameExists($carrierName);
-
-        if ($this->getSharedStorage()->exists($cartRuleName)) {
-            //@todo: This allows applying this step to cart rule that was created with a step using CQRS command and saved to shared storage
-            //       it is not ideal, but for now it should work, until restrictions are migrated.
-            $cartRuleId = $this->getSharedStorage()->get($cartRuleName);
-        } else {
-            $this->checkCartRuleWithNameExists($cartRuleName);
-            $cartRuleId = (int) $this->cartRules[$cartRuleName]->id;
-        }
+        $cartRuleId = $this->getCartRuleId($cartRuleName);
         $cartRule = new CartRule($cartRuleId);
         $cartRule->carrier_restriction = true;
         $cartRule->save();
@@ -300,15 +277,7 @@ public function cartRuleNamedIsRestrictedToCarrierNamed($cartRuleName, $carrierN
     public function cartRuleNamedIsRestrictedToCountryNamed(string $cartRuleName, string $country)
     {
         $this->countryFeatureContext->checkCountryWithIsoCodeExists($country);
-
-        if ($this->getSharedStorage()->exists($cartRuleName)) {
-            //@todo: This allows applying this step to cart rule that was created with a step using CQRS command and saved to shared storage
-            //       it is not ideal, but for now it should work, until restrictions are migrated.
-            $cartRuleId = $this->getSharedStorage()->get($cartRuleName);
-        } else {
-            $this->checkCartRuleWithNameExists($cartRuleName);
-            $cartRuleId = (int) $this->cartRules[$cartRuleName]->id;
-        }
+        $cartRuleId = $this->getCartRuleId($cartRuleName);
 
         $cartRule = new CartRule($cartRuleId);
         $cartRule->country_restriction = true;
@@ -699,10 +668,20 @@ private function getCartRuleValidityCodeByMessage(string $message): int
      */
     private function loadCartRule(string $reference): CartRule
     {
-        if (!$this->getSharedStorage()->exists($reference)) {
-            throw new RuntimeException(sprintf('Cart rule "%s" does not exist in shared storage', $reference));
+        return new CartRule($this->getCartRuleId($reference));
+    }
+
+    private function getCartRuleId(string $cartRuleReference): int
+    {
+        if ($this->getSharedStorage()->exists($cartRuleReference)) {
+            // @todo: This allows applying this step to cart rule which was created with a step using CQRS command and saved to shared storage
+            // it is not ideal, but for now it should work, until restrictions are migrated.
+            $cartRuleId = $this->getSharedStorage()->get($cartRuleReference);
+        } else {
+            $this->checkCartRuleWithNameExists($cartRuleReference);
+            $cartRuleId = $this->cartRules[$cartRuleReference]->id;
         }
 
-        return new CartRule($this->getSharedStorage()->get($reference));
+        return $cartRuleId;
     }
 }

From a1b4d01affe3a91cdbb7a6b31c2f13aa60d0f40a Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Tue, 20 Jun 2023 11:42:52 +0300
Subject: [PATCH 0257/1030]  move cache clear "getContextualValue_" to
 addCartRule method in production

---
 classes/Cart.php                                               | 1 +
 .../Behaviour/Features/Context/CartRuleFeatureContext.php      | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/classes/Cart.php b/classes/Cart.php
index 13d9510172b00..c98bfb3cb0468 100644
--- a/classes/Cart.php
+++ b/classes/Cart.php
@@ -1334,6 +1334,7 @@ public function addCartRule($id_cart_rule, bool $useOrderPrices = false)
         Cache::clean('Cart::getOrderedCartRulesIds_' . $this->id . '-' . CartRule::FILTER_ACTION_SHIPPING . '-ids');
         Cache::clean('Cart::getOrderedCartRulesIds_' . $this->id . '-' . CartRule::FILTER_ACTION_REDUCTION . '-ids');
         Cache::clean('Cart::getOrderedCartRulesIds_' . $this->id . '-' . CartRule::FILTER_ACTION_GIFT . '-ids');
+        Cache::clean('getContextualValue_*');
 
         if ((int) $cartRule->gift_product) {
             $this->updateQty(
diff --git a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
index c795ff9093867..6571b3dcf0408 100644
--- a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
@@ -36,7 +36,6 @@
 use DateInterval;
 use DateTime;
 use Db;
-use Order;
 use PHPUnit\Framework\Assert;
 use PrestaShop\Decimal\DecimalNumber;
 use PrestaShop\PrestaShop\Adapter\CartRule\LegacyDiscountApplicationType;
@@ -437,8 +436,6 @@ public function applyCartRuleByCode(string $code): void
         }
 
         $this->getCurrentCart()->addCartRule((int) $cartRule->id);
-        //@todo: should this be added inside production addCartRule instead?
-        Cache::clean('getContextualValue_*');
     }
 
     /**

From ea7a84051e73d5373e9e09b3218a046984eb9fe9 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Tue, 20 Jun 2023 12:39:39 +0300
Subject: [PATCH 0258/1030]  rename method to setValidityDateRange and us
 immutable objects

---
 .../Domain/CartRule/Command/AddCartRuleCommand.php | 14 +++++++-------
 .../CartRule/Command/EditCartRuleCommand.php       |  2 +-
 .../DataHandler/CartRuleFormDataHandler.php        |  8 ++++----
 .../CartRule/AbstractCartRuleFeatureContext.php    |  8 ++++----
 .../Domain/CartRule/EditCartRuleFeatureContext.php |  2 +-
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/Core/Domain/CartRule/Command/AddCartRuleCommand.php b/src/Core/Domain/CartRule/Command/AddCartRuleCommand.php
index 72f32f171ee4f..6b728a623d254 100644
--- a/src/Core/Domain/CartRule/Command/AddCartRuleCommand.php
+++ b/src/Core/Domain/CartRule/Command/AddCartRuleCommand.php
@@ -28,7 +28,7 @@
 
 namespace PrestaShop\PrestaShop\Core\Domain\CartRule\Command;
 
-use DateTime;
+use DateTimeImmutable;
 use PrestaShop\Decimal\DecimalNumber;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleConstraintException;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\CartRuleAction;
@@ -98,12 +98,12 @@ class AddCartRuleCommand
     private $active = true;
 
     /**
-     * @var DateTime|null
+     * @var DateTimeImmutable|null
      */
     private $validFrom;
 
     /**
-     * @var DateTime|null
+     * @var DateTimeImmutable|null
      */
     private $validTo;
 
@@ -213,17 +213,17 @@ public function setActive(bool $active): AddCartRuleCommand
         return $this;
     }
 
-    public function getValidFrom(): ?DateTime
+    public function getValidFrom(): ?DateTimeImmutable
     {
         return $this->validFrom;
     }
 
-    public function getValidTo(): ?DateTime
+    public function getValidTo(): ?DateTimeImmutable
     {
         return $this->validTo;
     }
 
-    public function setValidDateRange(DateTime $from, DateTime $to): AddCartRuleCommand
+    public function setValidityDateRange(DateTimeImmutable $from, DateTimeImmutable $to): AddCartRuleCommand
     {
         $this->assertDateRangeIsValid($from, $to);
         $this->validFrom = $from;
@@ -330,7 +330,7 @@ private function setLocalizedNames(array $localizedNames): AddCartRuleCommand
         return $this;
     }
 
-    private function assertDateRangeIsValid(DateTime $dateFrom, DateTime $dateTo): void
+    private function assertDateRangeIsValid(DateTimeImmutable $dateFrom, DateTimeImmutable $dateTo): void
     {
         if ($dateFrom > $dateTo) {
             throw new CartRuleConstraintException('Date from cannot be greater than date to.', CartRuleConstraintException::DATE_FROM_GREATER_THAN_DATE_TO);
diff --git a/src/Core/Domain/CartRule/Command/EditCartRuleCommand.php b/src/Core/Domain/CartRule/Command/EditCartRuleCommand.php
index 855352ff5b1f7..0407a28734b05 100644
--- a/src/Core/Domain/CartRule/Command/EditCartRuleCommand.php
+++ b/src/Core/Domain/CartRule/Command/EditCartRuleCommand.php
@@ -247,7 +247,7 @@ public function setPriority(int $priority): EditCartRuleCommand
         return $this;
     }
 
-    public function setDateRange(DateTimeImmutable $validFrom, DateTimeImmutable $validTo): EditCartRuleCommand
+    public function setValidityDateRange(DateTimeImmutable $validFrom, DateTimeImmutable $validTo): EditCartRuleCommand
     {
         $this->assertDateRangeIsValid($validFrom, $validTo);
         $this->validFrom = $validFrom;
diff --git a/src/Core/Form/IdentifiableObject/DataHandler/CartRuleFormDataHandler.php b/src/Core/Form/IdentifiableObject/DataHandler/CartRuleFormDataHandler.php
index 5c6c80c5bac92..3a081f2b84cd4 100644
--- a/src/Core/Form/IdentifiableObject/DataHandler/CartRuleFormDataHandler.php
+++ b/src/Core/Form/IdentifiableObject/DataHandler/CartRuleFormDataHandler.php
@@ -27,7 +27,7 @@
 
 namespace PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataHandler;
 
-use DateTime;
+use DateTimeImmutable;
 use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\AddCartRuleCommand;
 use PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\CartRule\CartRuleActionBuilder;
@@ -73,9 +73,9 @@ public function create(array $data)
             ->setAllowPartialUse((bool) $informationData['partial_use'])
             ->setPriority((int) $informationData['priority'])
             ->setActive((bool) $informationData['active'])
-            ->setValidDateRange(
-                DateTime::createFromFormat(DateTimeUtil::DEFAULT_DATETIME_FORMAT, $dateRange['from']),
-                DateTime::createFromFormat(DateTimeUtil::DEFAULT_DATETIME_FORMAT, $dateRange['to'])
+            ->setValidityDateRange(
+                DateTimeImmutable::createFromFormat(DateTimeUtil::DEFAULT_DATETIME_FORMAT, $dateRange['from']),
+                DateTimeImmutable::createFromFormat(DateTimeUtil::DEFAULT_DATETIME_FORMAT, $dateRange['to'])
             )
             ->setTotalQuantity((int) $conditionsData['total_available'])
             ->setQuantityPerUser((int) $conditionsData['available_per_user'])
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
index 18e6a0aabd219..760bc2a07f0e1 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
@@ -28,7 +28,7 @@
 
 namespace Tests\Integration\Behaviour\Features\Context\Domain\CartRule;
 
-use DateTime;
+use DateTimeImmutable;
 use PHPUnit\Framework\Assert;
 use PrestaShop\Decimal\DecimalNumber;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\AddCartRuleCommand;
@@ -67,9 +67,9 @@ public function createCartRuleWithReference(string $cartRuleReference, array $da
             if (empty($data['valid_to'])) {
                 throw new RuntimeException('When setting cart rule range "valid_from" and "valid_to" must be provided');
             }
-            $command->setValidDateRange(
-                new DateTime($data['valid_from']),
-                new DateTime($data['valid_to']),
+            $command->setValidityDateRange(
+                new DateTimeImmutable($data['valid_from']),
+                new DateTimeImmutable($data['valid_to']),
             );
         }
         if (isset($data['total_quantity'])) {
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
index 84753cf484320..26424e5be53dc 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
@@ -176,7 +176,7 @@ private function fillCommand(EditCartRuleCommand $command, array $data): void
             $command->setPriority((int) $data['priority']);
         }
         if (isset($data['valid_from'])) {
-            $command->setDateRange(
+            $command->setValidityDateRange(
                 new DateTimeImmutable($data['valid_from']),
                 new DateTimeImmutable($data['valid_to'])
             );

From 9cd4546fda5eef246b36911ccc629bb1ec478b6b Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Wed, 21 Jun 2023 10:59:36 +0300
Subject: [PATCH 0259/1030]  remove todo. Not doing in this PR

---
 tests/Integration/Utility/CartOld.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/Integration/Utility/CartOld.php b/tests/Integration/Utility/CartOld.php
index d322805e7e6f8..c3f3040ab661b 100644
--- a/tests/Integration/Utility/CartOld.php
+++ b/tests/Integration/Utility/CartOld.php
@@ -36,8 +36,6 @@
 use Tools;
 
 /**
- * @todo: should this class be deleted already? (or at least deprecated?) It doesn't seem to be used anymore
- *
  * legacy code here : used to test behaviour between recent and previous version
  */
 class CartOld extends Cart

From 75cc5fca8da004c0f4aef95397327c039d20f17d Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Thu, 22 Jun 2023 09:51:25 +0300
Subject: [PATCH 0260/1030]  fix rebase errors

---
 .../set_cart_rule_restrictions.feature        | 60 +++++++++----------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_cart_rule_restrictions.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_cart_rule_restrictions.feature
index 9b900ede233fd..cc7a297843275 100644
--- a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_cart_rule_restrictions.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_cart_rule_restrictions.feature
@@ -12,9 +12,9 @@ Feature: Set cart rule restrictions in BO
     And there is a currency named "chf" with iso code "CHF" and exchange rate of 1.25
     And currency "usd" is the default one
     And language with iso code "en" is the default one
-    And I create cart rule "rule_free_shipping_1" with following properties:
+    And there is a cart rule "rule_free_shipping_1" with following properties:
       | name[en-US]       | free shipping 1      |
-      | is_active         | true                 |
+      | active            | true                 |
       | allow_partial_use | false                |
       | priority          | 1                    |
       | valid_from        | 2022-01-01 11:00:00  |
@@ -23,34 +23,34 @@ Feature: Set cart rule restrictions in BO
       | quantity_per_user | 10                   |
       | free_shipping     | true                 |
       | code              | rule_free_shipping_1 |
-    And I create cart rule "rule_50_percent" with following properties:
-      | name[en-US]                            | Half the price         |
-      | is_active                              | true                   |
-      | allow_partial_use                      | true                   |
-      | priority                               | 2                      |
-      | valid_from                             | 2022-01-01 11:00:00    |
-      | valid_to                               | 3001-01-01 12:00:00    |
-      | total_quantity                         | 10                     |
-      | quantity_per_user                      | 12                     |
-      | free_shipping                          | false                  |
-      | code                                   | rule_50_percent        |
-      | reduction_percentage                   | 50                     |
-      | reduction_apply_to_discounted_products | false                  |
-      | discount_application_type              | order_without_shipping |
-    And I create cart rule "rule_70_percent" with following properties:
-      | name[en-US]                            | Half the price         |
-      | is_active                              | true                   |
-      | allow_partial_use                      | true                   |
-      | priority                               | 3                      |
-      | valid_from                             | 2022-01-01 11:00:00    |
-      | valid_to                               | 3001-01-01 12:00:00    |
-      | total_quantity                         | 10                     |
-      | quantity_per_user                      | 12                     |
-      | free_shipping                          | false                  |
-      | code                                   | rule_70_percent        |
-      | reduction_percentage                   | 70                     |
-      | reduction_apply_to_discounted_products | false                  |
-      | discount_application_type              | order_without_shipping |
+    And there is a cart rule "rule_50_percent" with following properties:
+      | name[en-US]                  | Half the price         |
+      | active                       | true                   |
+      | allow_partial_use            | true                   |
+      | priority                     | 2                      |
+      | valid_from                   | 2022-01-01 11:00:00    |
+      | valid_to                     | 3001-01-01 12:00:00    |
+      | total_quantity               | 10                     |
+      | quantity_per_user            | 12                     |
+      | free_shipping                | false                  |
+      | code                         | rule_50_percent        |
+      | discount_percentage          | 50                     |
+      | apply_to_discounted_products | false                  |
+      | discount_application_type    | order_without_shipping |
+    And there is a cart rule "rule_70_percent" with following properties:
+      | name[en-US]                  | Half the price         |
+      | active                       | true                   |
+      | allow_partial_use            | true                   |
+      | priority                     | 3                      |
+      | valid_from                   | 2022-01-01 11:00:00    |
+      | valid_to                     | 3001-01-01 12:00:00    |
+      | total_quantity               | 10                     |
+      | quantity_per_user            | 12                     |
+      | free_shipping                | false                  |
+      | code                         | rule_70_percent        |
+      | discount_percentage          | 70                     |
+      | apply_to_discounted_products | false                  |
+      | discount_application_type    | order_without_shipping |
     And cart rule "rule_free_shipping_1" should have the following properties:
       | restricted cart rules |  |
     And cart rule "rule_50_percent" should have the following properties:

From 7fab7e1642d0d45ad844b46b11069940c3156247 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Thu, 22 Jun 2023 15:21:51 +0300
Subject: [PATCH 0261/1030]  get rid of legacy step creating cart rule with no
 discount

---
 .../Context/CartRuleFeatureContext.php        | 21 ---------
 .../AbstractCartRuleFeatureContext.php        |  8 ++--
 .../CartRule/BackOffice/gift_cartrule.feature |  9 +++-
 .../Scenario/Cart/cart_to_order.feature       | 45 +++++++++++--------
 .../Scenario/Cart/delivery_options.feature    | 18 +++++---
 .../Scenario/Order/order_cart_rules.feature   |  7 +--
 6 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
index 6571b3dcf0408..fe5f6d060c645 100644
--- a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
@@ -79,19 +79,6 @@ class CartRuleFeatureContext extends AbstractPrestaShopFeatureContext
      */
     protected $categoryFeatureContext;
 
-    /**
-     * This hook can be used to perform a database cleaning of added objects
-     *
-     * @AfterScenario
-     */
-    public function cleanCartRuleFixtures()
-    {
-        foreach ($this->cartRules as $cartRule) {
-            $cartRule->delete();
-        }
-        $this->cartRules = [];
-    }
-
     /** @BeforeScenario */
     public function before(BeforeScenarioScope $scope)
     {
@@ -123,14 +110,6 @@ public function thereIsACartRuleWithNameAndPercentDiscountOf50AndPriorityOfAndQu
         $this->createCartRule($cartRuleName, $percent, 0, $priority, $cartRuleQuantity, $cartRuleQuantityPerUser);
     }
 
-    /**
-     * @Given /^there is a cart rule named "(.+)" that applies no discount with priority (\d+), quantity of (\d+) and quantity per user (\d+)$/
-     */
-    public function thereIsACartRuleWithNameAndNoDiscountAndPriorityOfAndQuantityOfAndQuantityPerUserOf($cartRuleName, $priority, $cartRuleQuantity, $cartRuleQuantityPerUser)
-    {
-        $this->createCartRule($cartRuleName, 0, 0, $priority, $cartRuleQuantity, $cartRuleQuantityPerUser);
-    }
-
     /**
      * @Given /^there is a cart rule named "(.+)" that applies an amount discount of (\d+\.\d+) with priority (\d+), quantity of (\d+) and quantity per user (\d+)$/
      */
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
index 760bc2a07f0e1..09e53f2d2d4cd 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
@@ -163,11 +163,11 @@ protected function assertCartRuleProperties(CartRuleForEditing $cartRuleForEditi
                 'Unexpected valid_to'
             );
         }
-        if (isset($expectedData['total quantity'])) {
-            Assert::assertSame((int) $expectedData['total quantity'], $conditions->getQuantity(), 'Unexpected quantity');
+        if (isset($expectedData['total_quantity'])) {
+            Assert::assertSame((int) $expectedData['total_quantity'], $conditions->getQuantity(), 'Unexpected quantity');
         }
-        if (isset($expectedData['quantity per user'])) {
-            Assert::assertSame((int) $expectedData['quantity per user'], $conditions->getQuantityPerUser(), 'Unexpected quantity per user');
+        if (isset($expectedData['quantity_per_user'])) {
+            Assert::assertSame((int) $expectedData['quantity_per_user'], $conditions->getQuantityPerUser(), 'Unexpected quantity_per_user');
         }
 
         if (isset($expectedData['minimum_amount'])) {
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/gift_cartrule.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/gift_cartrule.feature
index 37b229217e913..cab9f9c85da09 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/gift_cartrule.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/gift_cartrule.feature
@@ -40,8 +40,13 @@ Feature: Apply cart rule to cart from Back Office (BO)
     Given shipping handling fees are set to 2.0
     Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
     Given there is a product in the catalog named "product4" with a price of 35.567 and 1000 items in stock
-    Given there is a cart rule named "cartrule13" that applies no discount with priority 13, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule13" offers a gift product "product4"
+    Given there is a cart rule cartrule13 with following properties:
+      | name[en-US]       | cartrule13 |
+      | priority          | 13         |
+      | free_shipping     | false      |
+      | total_quantity    | 1000       |
+      | quantity_per_user | 1000       |
+      | gift_product      | product4   |
     When I add 1 products "product1" to the cart "dummy_custom_cart"
     Then product "product1" quantity in cart "dummy_custom_cart" should be 1 excluding gift products
     And gifted product "product4" quantity in cart "dummy_custom_cart" should be 1
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/cart_to_order.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/cart_to_order.feature
index 72a953582f860..2f54ab6474f7f 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/cart_to_order.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/cart_to_order.feature
@@ -1,13 +1,20 @@
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart --tags cart-to-order
 @restore-all-tables-before-feature
+@cart-to-order
 Feature: Check cart to order data copy
   As a customer
   I must be able to have a correct order when validating payment step
 
+  Background:
+    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+    And there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
+    And there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
+    And there is a product in the catalog named "product4" with a price of 35.567 and 1000 items in stock
+
   Scenario: 1 product in cart, 1 cart rule
     Given I have an empty default cart
     Given email sending is disabled
     Given shipping handling fees are set to 2.0
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
     Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
     Given cart rule "cartrule1" has a discount code "foo1"
     Given there is a zone named "zone1"
@@ -41,7 +48,6 @@ Feature: Check cart to order data copy
     Given I have an empty default cart
     Given email sending is disabled
     Given shipping handling fees are set to 2.0
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
     Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
     Given cart rule "cartrule1" has a discount code "foo1"
     Given there is a cart rule named "cartrule2" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
@@ -79,9 +85,6 @@ Feature: Check cart to order data copy
     Given I have an empty default cart
     Given email sending is disabled
     Given shipping handling fees are set to 2.0
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
     Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
     Given cart rule "cartrule1" has a discount code "foo1"
     Given there is a zone named "zone1"
@@ -119,9 +122,6 @@ Feature: Check cart to order data copy
     Given I have an empty default cart
     Given email sending is disabled
     Given shipping handling fees are set to 2.0
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
-    Given there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
     Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
     Given cart rule "cartrule1" has a discount code "foo1"
     Given there is a cart rule named "cartrule2" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
@@ -163,7 +163,6 @@ Feature: Check cart to order data copy
     Given I have an empty default cart
     Given email sending is disabled
     Given shipping handling fees are set to 2.0
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
     Given there is a cart rule named "cartrule5" that applies an amount discount of 500.0 with priority 5, quantity of 1000 and quantity per user 1000
     Given cart rule "cartrule5" has a discount code "foo5"
     Given there is a zone named "zone1"
@@ -198,11 +197,14 @@ Feature: Check cart to order data copy
     Given I have an empty default cart
     Given email sending is disabled
     Given shipping handling fees are set to 2.0
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product4" with a price of 35.567 and 1000 items in stock
-    Given there is a cart rule named "cartrule13" that applies no discount with priority 13, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule13" has a discount code "foo13"
-    Given cart rule "cartrule13" offers a gift product "product4"
+    Given there is a cart rule cartrule13 with following properties:
+      | name[en-US]       | cartrule13 |
+      | priority          | 13         |
+      | free_shipping     | false      |
+      | total_quantity    | 1000       |
+      | quantity_per_user | 1000       |
+      | gift_product      | product4   |
+      | code              | foo13      |
     Given there is a zone named "zone1"
     Given there is a country named "country1" and iso code "FR" in zone "zone1"
     Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
@@ -231,15 +233,20 @@ Feature: Check cart to order data copy
     Then current cart order should have a discount in position 1 with an amount of 36.989680 tax included and 35.567000 tax excluded
     Then customer "customer1" should have 0 cart rules that apply to him
 
+  @restore-cart-rules-before-scenario
   Scenario: 2 product in cart, 1 cart rule offering free gift, offering same product as already existing in cart
     Given I have an empty default cart
     Given email sending is disabled
     Given shipping handling fees are set to 2.0
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
-    Given there is a product in the catalog named "product4" with a price of 35.567 and 1000 items in stock
-    Given there is a cart rule named "cartrule13" that applies no discount with priority 13, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule13" has a discount code "foo13"
-    Given cart rule "cartrule13" offers a gift product "product4"
+    # @todo: should be moved to background, but now every time product is created in background its id changes, so that needs to be resolved first
+    Given there is a cart rule cartrule13 with following properties:
+      | name[en-US]       | cartrule13 |
+      | priority          | 13         |
+      | free_shipping     | false      |
+      | total_quantity    | 1000       |
+      | quantity_per_user | 1000       |
+      | gift_product      | product4   |
+      | code              | foo13      |
     Given there is a zone named "zone1"
     Given there is a country named "country1" and iso code "FR" in zone "zone1"
     Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/delivery_options.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/delivery_options.feature
index ef1a4cdb2ae38..b3ea8f0d595da 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/delivery_options.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/delivery_options.feature
@@ -13,12 +13,20 @@ Feature: Compute correct delivery options
     Given shipping handling fees are set to 2.0
     Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
     # Create free shipping cart rule
-    Given there is a cart rule named "free_shipping_1" that applies no discount with priority 1, quantity of 1000 and quantity per user 1000
-    Given cart rule "free_shipping_1" offers free shipping
-    Given cart rule "free_shipping_1" has a discount code "djbuch-12878"
+    Given there is a cart rule free_shipping_1 with following properties:
+      | name[en-US]       | free_shipping_1 |
+      | priority          | 1               |
+      | free_shipping     | true            |
+      | total_quantity    | 1000            |
+      | quantity_per_user | 1000            |
+      | code              | djbuch-12878    |
     # Standard cart rule, disabled
-    Given there is a cart rule named "bad_cart_rule" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
-    Given cart rule "bad_cart_rule" is disabled
+    Given there is a cart rule bad_cart_rule with following properties:
+      | name[en-US]         | bad_cart_rule |
+      | active              | false         |
+      | priority            | 2             |
+      | free_shipping       | true          |
+      | discount_percentage | 50            |
     # Standard location settings
     Given there is a zone named "zone1"
     Given there is a country named "country1" and iso code "FR" in zone "zone1"
diff --git a/tests/Integration/Behaviour/Features/Scenario/Order/order_cart_rules.feature b/tests/Integration/Behaviour/Features/Scenario/Order/order_cart_rules.feature
index 07182a01faba0..c62d6af40f08d 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Order/order_cart_rules.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Order/order_cart_rules.feature
@@ -52,7 +52,7 @@ Feature: Order from Back Office (BO)
       | discount_application_type | specific_product                         |
       | discount_product          | Test Product Cart Rule On Select Product |
       | discount_includes_tax     | true                                     |
-      | quantity                  | 100                                      |
+      | total_quantity            | 100                                      |
       | quantity_per_user         | 100                                      |
     When I add products to order "bo_order1" with new invoice and the following products details:
       | name   | Test Product Cart Rule On Select Product |
@@ -716,8 +716,9 @@ Feature: Order from Back Office (BO)
     And there is a carrier named "carrier2"
     And carrier "carrier1" applies shipping fees of 0.0 in zone "zone1" for price between 0 and 10000
     And carrier "carrier2" applies shipping fees of 0.0 in zone "zone1" for price between 0 and 10000
-    And there is a cart rule named "FreeGift" that applies no discount with priority 1, quantity of 1 and quantity per user 1
-    And cart rule "FreeGift" offers a gift product "product1"
+    And there is a cart rule FreeGift with following properties:
+      | name[en-US]  | FreeGift |
+      | gift_product | product1 |
     And cart rule "FreeGift" is restricted to carrier "carrier1"
     When I create an empty cart "dummy_cart_freegift" for customer "testCustomer"
     And I select "FR" address as delivery and invoice address for customer "testCustomer" in cart "dummy_cart_freegift"

From fa03f812704e6ecb73be374f9ac03f9f22e4dfe9 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Thu, 22 Jun 2023 16:34:21 +0300
Subject: [PATCH 0262/1030]  get rid of discount amount applyng legacy step

---
 .../Context/CartRuleFeatureContext.php        |   8 -
 .../BackOffice/usage_limit_per_user.feature   |  11 +-
 .../Scenario/Cart/cart_to_order.feature       |  14 +-
 .../Order/order_cancel_product.feature        | 153 +++----
 .../Scenario/Order/order_cart_rules.feature   |  12 +-
 .../Scenario/Order/order_currency.feature     | 379 +++++++++---------
 6 files changed, 305 insertions(+), 272 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
index fe5f6d060c645..48839ce459034 100644
--- a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
@@ -110,14 +110,6 @@ public function thereIsACartRuleWithNameAndPercentDiscountOf50AndPriorityOfAndQu
         $this->createCartRule($cartRuleName, $percent, 0, $priority, $cartRuleQuantity, $cartRuleQuantityPerUser);
     }
 
-    /**
-     * @Given /^there is a cart rule named "(.+)" that applies an amount discount of (\d+\.\d+) with priority (\d+), quantity of (\d+) and quantity per user (\d+)$/
-     */
-    public function thereIsACartRuleWithNameAndAmountDiscountOfAndPriorityOfAndQuantityOfAndQuantityPerUserOf($cartRuleName, $amount, $priority, $cartRuleQuantity, $cartRuleQuantityPerUser)
-    {
-        $this->createCartRule($cartRuleName, 0, $amount, $priority, $cartRuleQuantity, $cartRuleQuantityPerUser);
-    }
-
     protected function createCartRule(
         $cartRuleName,
         $percent,
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/usage_limit_per_user.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/usage_limit_per_user.feature
index 790c7489e1c1c..3c71779460532 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/usage_limit_per_user.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/usage_limit_per_user.feature
@@ -8,12 +8,19 @@ Feature: Apply cart rule to cart from Back Office (BO)
   Background:
     Given country "US" is enabled
     And there is customer "testCustomer" with email "pub@prestashop.com"
+    And there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
     And customer "testCustomer" has address in "US" country
     And I am logged in as "test@prestashop.com" employee
     And shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
     And the module "dummy_payment" is installed
-    And there is a cart rule named "limitedCartRule" that applies an amount discount of 1.0 with priority 1, quantity of 2 and quantity per user 1
-    And cart rule "limitedCartRule" has a discount code "foo1"
+    And there is a cart rule limitedCartRule with following properties:
+      | name[en-US]           | limitedCartRule |
+      | discount_amount       | 1               |
+      | discount_currency     | usd             |
+      | discount_includes_tax | false           |
+      | code                  | foo1            |
+      | total_quantity        | 2               |
+      | quantity_per_user     | 1               |
     And there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
 
   Scenario: Cart rule usage limit is detected when the cart rule is created anonymously then assigned to a customer who already used it
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/cart_to_order.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/cart_to_order.feature
index 2f54ab6474f7f..10e9fe701ab8d 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/cart_to_order.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/cart_to_order.feature
@@ -6,7 +6,8 @@ Feature: Check cart to order data copy
   I must be able to have a correct order when validating payment step
 
   Background:
-    Given there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
+    Given there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
+    And there is a product in the catalog named "product1" with a price of 19.812 and 1000 items in stock
     And there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
     And there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
     And there is a product in the catalog named "product4" with a price of 35.567 and 1000 items in stock
@@ -163,8 +164,15 @@ Feature: Check cart to order data copy
     Given I have an empty default cart
     Given email sending is disabled
     Given shipping handling fees are set to 2.0
-    Given there is a cart rule named "cartrule5" that applies an amount discount of 500.0 with priority 5, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule5" has a discount code "foo5"
+    Given there is a cart rule cartrule5 with following properties:
+      | name[en-US]           | cartrule5 |
+      | priority              | 5         |
+      | discount_amount       | 500       |
+      | discount_currency     | usd       |
+      | discount_includes_tax | false     |
+      | code                  | foo5      |
+      | total_quantity        | 1000      |
+      | quantity_per_user     | 1000      |
     Given there is a zone named "zone1"
     Given there is a country named "country1" and iso code "FR" in zone "zone1"
     Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
diff --git a/tests/Integration/Behaviour/Features/Scenario/Order/order_cancel_product.feature b/tests/Integration/Behaviour/Features/Scenario/Order/order_cancel_product.feature
index ff8933309bcf5..05c1050afcd35 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Order/order_cancel_product.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Order/order_cancel_product.feature
@@ -9,6 +9,7 @@ Feature: Cancel Order Product from Back Office (BO)
 
   Background:
     Given email sending is disabled
+    And there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
     And the current currency is "USD"
     And country "US" is enabled
     And the module "dummy_payment" is installed
@@ -26,10 +27,10 @@ Feature: Cancel Order Product from Back Office (BO)
 
   Scenario: Cancel product feature has expected behavior
     Given I add order "bo_order_cancel_product" with the following details:
-      | cart                | dummy_cart                 |
-      | message             | test                       |
-      | payment module name | dummy_payment              |
-      | status              | Awaiting check payment     |
+      | cart                | dummy_cart             |
+      | message             | test                   |
+      | payment module name | dummy_payment          |
+      | status              | Awaiting check payment |
     Then order "bo_order_cancel_product" should have 10 products in total
     And order "bo_order_cancel_product" should contain 5 products "Mug The best is yet to come"
     And order "bo_order_cancel_product" should contain 3 products "Mug Today is a good day"
@@ -57,44 +58,44 @@ Feature: Cancel Order Product from Back Office (BO)
     And order "bo_order_cancel_product" should contain 2 products "Mug Today is a good day"
     And order "bo_order_cancel_product" should contain 1 products "Customizable mug"
     And product "Mug The best is yet to come" in order "bo_order_cancel_product" has following details:
-      | product_quantity            | 3           |
-      | product_quantity_refunded   | 0           |
-      | product_quantity_reinjected | 0           |
-      | total_refunded_tax_excl     | 0.000000    |
-      | total_refunded_tax_incl     | 0.000000    |
+      | product_quantity            | 3        |
+      | product_quantity_refunded   | 0        |
+      | product_quantity_reinjected | 0        |
+      | total_refunded_tax_excl     | 0.000000 |
+      | total_refunded_tax_incl     | 0.000000 |
     And product "Mug Today is a good day" in order "bo_order_cancel_product" has following details:
-      | product_quantity            | 2           |
-      | product_quantity_refunded   | 0           |
-      | product_quantity_reinjected | 0           |
-      | total_refunded_tax_excl     | 0.000000    |
-      | total_refunded_tax_incl     | 0.000000    |
+      | product_quantity            | 2        |
+      | product_quantity_refunded   | 0        |
+      | product_quantity_reinjected | 0        |
+      | total_refunded_tax_excl     | 0.000000 |
+      | total_refunded_tax_incl     | 0.000000 |
     And product "Customizable mug" in order "bo_order_cancel_product" has following details:
-      | product_quantity            | 1           |
-      | product_quantity_refunded   | 0           |
-      | product_quantity_reinjected | 0           |
-      | total_refunded_tax_excl     | 0.000000    |
-      | total_refunded_tax_incl     | 0.000000    |
+      | product_quantity            | 1        |
+      | product_quantity_refunded   | 0        |
+      | product_quantity_reinjected | 0        |
+      | total_refunded_tax_excl     | 0.000000 |
+      | total_refunded_tax_incl     | 0.000000 |
     And there are 2 more "Mug The best is yet to come" in stock
     And there is 1 more "Mug Today is a good day" in stock
     And there is 1 more "Customizable mug" in stock
     And order "bo_order_cancel_product" should have following details:
-      | total_products           | 73.40  |
-      | total_products_wt        | 77.80  |
-      | total_discounts_tax_excl | 0.0    |
-      | total_discounts_tax_incl | 0.0    |
-      | total_paid_tax_excl      | 80.40  |
-      | total_paid_tax_incl      | 85.22  |
-      | total_paid               | 85.22  |
-      | total_paid_real          | 0.0    |
-      | total_shipping_tax_excl  | 7.0    |
-      | total_shipping_tax_incl  | 7.42   |
+      | total_products           | 73.40 |
+      | total_products_wt        | 77.80 |
+      | total_discounts_tax_excl | 0.0   |
+      | total_discounts_tax_incl | 0.0   |
+      | total_paid_tax_excl      | 80.40 |
+      | total_paid_tax_incl      | 85.22 |
+      | total_paid               | 85.22 |
+      | total_paid_real          | 0.0   |
+      | total_shipping_tax_excl  | 7.0   |
+      | total_shipping_tax_incl  | 7.42  |
 
   Scenario: Order status is set to canceled when all products have been cancelled
     Given I add order "bo_order_cancel_product" with the following details:
-      | cart                | dummy_cart                 |
-      | message             | test                       |
-      | payment module name | dummy_payment              |
-      | status              | Awaiting check payment     |
+      | cart                | dummy_cart             |
+      | message             | test                   |
+      | payment module name | dummy_payment          |
+      | status              | Awaiting check payment |
     Then order "bo_order_cancel_product" should have 10 products in total
     And order "bo_order_cancel_product" should contain 5 products "Mug The best is yet to come"
     And order "bo_order_cancel_product" should contain 3 products "Mug Today is a good day"
@@ -157,10 +158,10 @@ Feature: Cancel Order Product from Back Office (BO)
 
   Scenario: Quantity is required
     Given I add order "bo_order_cancel_product" with the following details:
-      | cart                | dummy_cart                 |
-      | message             | test                       |
-      | payment module name | dummy_payment              |
-      | status              | Awaiting check payment     |
+      | cart                | dummy_cart             |
+      | message             | test                   |
+      | payment module name | dummy_payment          |
+      | status              | Awaiting check payment |
     Then order "bo_order_cancel_product" should have 10 products in total
     And order "bo_order_cancel_product" should contain 5 products "Mug The best is yet to come"
     And order "bo_order_cancel_product" should contain 3 products "Mug Today is a good day"
@@ -188,10 +189,10 @@ Feature: Cancel Order Product from Back Office (BO)
 
   Scenario: Quantity is too high
     Given I add order "bo_order_cancel_product" with the following details:
-      | cart                | dummy_cart                 |
-      | message             | test                       |
-      | payment module name | dummy_payment              |
-      | status              | Awaiting check payment     |
+      | cart                | dummy_cart             |
+      | message             | test                   |
+      | payment module name | dummy_payment          |
+      | status              | Awaiting check payment |
     And order "bo_order_cancel_product" should contain 5 products "Mug The best is yet to come"
     And order "bo_order_cancel_product" should contain 3 products "Mug Today is a good day"
     And order "bo_order_cancel_product" should contain 2 products "Customizable mug"
@@ -200,7 +201,7 @@ Feature: Cancel Order Product from Back Office (BO)
     And there are 2 less "Customizable mug" in stock
     When I cancel the following products from order "bo_order_cancel_product":
       | product_name                | quantity |
-      | Mug The best is yet to come | 565       |
+      | Mug The best is yet to come | 565      |
       | Mug Today is a good day     | 1        |
     Then I should get error that cancel quantity is too high and max is 5
     And order "bo_order_cancel_product" should have 10 products in total
@@ -218,10 +219,10 @@ Feature: Cancel Order Product from Back Office (BO)
 
   Scenario: Order should not have invoice
     Given I add order "bo_order_cancel_product" with the following details:
-      | cart                | dummy_cart                 |
-      | message             | test                       |
-      | payment module name | dummy_payment              |
-      | status              | Payment accepted     |
+      | cart                | dummy_cart       |
+      | message             | test             |
+      | payment module name | dummy_payment    |
+      | status              | Payment accepted |
     And order "bo_order_cancel_product" should contain 5 products "Mug The best is yet to come"
     And order "bo_order_cancel_product" should contain 3 products "Mug Today is a good day"
     And order "bo_order_cancel_product" should contain 2 products "Customizable mug"
@@ -248,10 +249,10 @@ Feature: Cancel Order Product from Back Office (BO)
 
   Scenario: Add product linked to a cart rule to an existing Order without invoice with free shipping and new invoice And cancel this product
     Given I add order "bo_order_cancel_product" with the following details:
-      | cart                | dummy_cart                 |
-      | message             | test                       |
-      | payment module name | dummy_payment              |
-      | status              | Awaiting check payment     |
+      | cart                | dummy_cart             |
+      | message             | test                   |
+      | payment module name | dummy_payment          |
+      | status              | Awaiting check payment |
     And order "bo_order_cancel_product" should contain 5 products "Mug The best is yet to come"
     And order "bo_order_cancel_product" should contain 3 products "Mug Today is a good day"
     And order "bo_order_cancel_product" should contain 2 products "Customizable mug"
@@ -271,13 +272,19 @@ Feature: Cancel Order Product from Back Office (BO)
       | total_shipping_tax_incl  | 7.42   |
     Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
     And there is a product in the catalog named "Test Product Cart Rule On Select Product" with a price of 15.0 and 100 items in stock
-    And there is a cart rule named "CartRuleAmountOnSelectedProduct" that applies an amount discount of 500.0 with priority 1, quantity of 100 and quantity per user 100
-    And cart rule "CartRuleAmountOnSelectedProduct" has no discount code
-    And cart rule "CartRuleAmountOnSelectedProduct" is restricted to product "Test Product Cart Rule On Select Product"
+    And there is a cart rule CartRuleAmountOnSelectedProduct with following properties:
+      | name[en-US]               | CartRuleAmountOnSelectedProduct          |
+      | discount_amount           | 500                                      |
+      | discount_currency         | usd                                      |
+      | total_quantity            | 100                                      |
+      | quantity_per_user         | 100                                      |
+      | discount_application_type | specific_product                         |
+      | discount_includes_tax     | false                                    |
+      | discount_product          | Test Product Cart Rule On Select Product |
     When I add products to order "bo_order_cancel_product" with new invoice and the following products details:
-      | name          | Test Product Cart Rule On Select Product  |
-      | amount        | 1                                         |
-      | price         | 15                                        |
+      | name   | Test Product Cart Rule On Select Product |
+      | amount | 1                                        |
+      | price  | 15                                       |
     Then order "bo_order_cancel_product" should have 11 products in total
     Then order "bo_order_cancel_product" should contain 1 product "Test Product Cart Rule On Select Product"
     Then order "bo_order_cancel_product" should have 1 cart rule
@@ -302,24 +309,24 @@ Feature: Cancel Order Product from Back Office (BO)
     # @todo This should be fixed along with #19717
 #    Then order "bo_order_cancel_product" should have 0 cart rule
     Then order "bo_order_cancel_product" should have following details:
-      | total_products           | 123.00 |
-      | total_products_wt        | 130.38 |
+      | total_products          | 123.00 |
+      | total_products_wt       | 130.38 |
       # Most totals are incorrect and need to be updated
 #      | total_discounts_tax_excl | 0.0    |
 #      | total_discounts_tax_incl | 0.0    |
 #      | total_paid_tax_excl      | 102.20 |
 #      | total_paid_tax_incl      | 108.33 |
 #      | total_paid               | 108.33 |
-      | total_paid_real          | 0.0    |
-      | total_shipping_tax_excl  | 7.0    |
-      | total_shipping_tax_incl  | 7.42   |
+      | total_paid_real         | 0.0    |
+      | total_shipping_tax_excl | 7.0    |
+      | total_shipping_tax_incl | 7.42   |
 
   Scenario: Add discount to all orders, when a product is cancelled the discount should still be present
     Given I add order "bo_order_cancel_product" with the following details:
-      | cart                | dummy_cart                 |
-      | message             | test                       |
-      | payment module name | dummy_payment              |
-      | status              | Awaiting check payment     |
+      | cart                | dummy_cart             |
+      | message             | test                   |
+      | payment module name | dummy_payment          |
+      | status              | Awaiting check payment |
     And order "bo_order_cancel_product" should contain 5 products "Mug The best is yet to come"
     And order "bo_order_cancel_product" should contain 3 products "Mug Today is a good day"
     And order "bo_order_cancel_product" should contain 2 products "Customizable mug"
@@ -342,9 +349,9 @@ Feature: Cancel Order Product from Back Office (BO)
     Given there is a cart rule named "CartRuleAmountOnWholeOrder" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
     And cart rule "CartRuleAmountOnWholeOrder" is applied on every order
     When I add products to order "bo_order_cancel_product" with new invoice and the following products details:
-      | name          | Test Product Cart Rule On Order |
-      | amount        | 1                               |
-      | price         | 15                              |
+      | name   | Test Product Cart Rule On Order |
+      | amount | 1                               |
+      | price  | 15                              |
     Then order "bo_order_cancel_product" should have 11 products in total
     Then order "bo_order_cancel_product" should contain 1 product "Test Product Cart Rule On Order"
     Then order "bo_order_cancel_product" should have 1 cart rule
@@ -371,14 +378,14 @@ Feature: Cancel Order Product from Back Office (BO)
     # This test doesn't work because cart rules are not updated in cart nor in order
     # @todo This should be fixed along with #19717
     Then order "bo_order_cancel_product" should have following details:
-      | total_products           | 123.00 |
-      | total_products_wt        | 130.38 |
+      | total_products          | 123.00 |
+      | total_products_wt       | 130.38 |
       # Most totals are incorrect and need to be be updated
 #      | total_discounts_tax_excl | 47.600 |
 #      | total_discounts_tax_incl | 50.460 |
 #      | total_paid_tax_excl      | 54.600 |
 #      | total_paid_tax_incl      | 57.870 |
 #      | total_paid               | 57.870 |
-      | total_paid_real          | 0.0    |
-      | total_shipping_tax_excl  | 7.0    |
-      | total_shipping_tax_incl  | 7.42   |
+      | total_paid_real         | 0.0    |
+      | total_shipping_tax_excl | 7.0    |
+      | total_shipping_tax_incl | 7.42   |
diff --git a/tests/Integration/Behaviour/Features/Scenario/Order/order_cart_rules.feature b/tests/Integration/Behaviour/Features/Scenario/Order/order_cart_rules.feature
index c62d6af40f08d..776fff91fb25f 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Order/order_cart_rules.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Order/order_cart_rules.feature
@@ -107,9 +107,15 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
     And there is a product in the catalog named "Test Product Cart Rule On Select Product" with a price of 15.0 and 100 items in stock
-    And there is a cart rule named "CartRuleAmountOnSelectedProduct" that applies an amount discount of 500.0 with priority 1, quantity of 100 and quantity per user 100
-    And cart rule "CartRuleAmountOnSelectedProduct" has no discount code
-    And cart rule "CartRuleAmountOnSelectedProduct" is restricted to product "Test Product Cart Rule On Select Product"
+    And there is a cart rule CartRuleAmountOnSelectedProduct with following properties:
+      | name[en-US]               | CartRuleAmountOnSelectedProduct          |
+      | discount_amount           | 500                                      |
+      | discount_currency         | usd                                      |
+      | total_quantity            | 100                                      |
+      | quantity_per_user         | 100                                      |
+      | discount_application_type | specific_product                         |
+      | discount_includes_tax     | false                                    |
+      | discount_product          | Test Product Cart Rule On Select Product |
     When I add products to order "bo_order1" with new invoice and the following products details:
       | name   | Test Product Cart Rule On Select Product |
       | amount | 1                                        |
diff --git a/tests/Integration/Behaviour/Features/Scenario/Order/order_currency.feature b/tests/Integration/Behaviour/Features/Scenario/Order/order_currency.feature
index 54ea211d19fb7..c417190e10908 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Order/order_currency.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Order/order_currency.feature
@@ -1,11 +1,11 @@
-# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s order --tags multiple-currencies-to-order
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s order --tags order-currency
 @restore-all-tables-before-feature
 @clear-cache-before-feature
 @reboot-kernel-before-feature
 @restore-currencies-after-feature
 @reboot-kernel-after-feature
 @restore-currencies-before-scenario
-@multiple-currencies-to-order
+@order-currency
 Feature: Multiple currencies for Order in Back Office (BO)
   In order to manage multiple currencies for orders in BO
   As a BO user
@@ -13,7 +13,8 @@ Feature: Multiple currencies for Order in Back Office (BO)
 
   Background:
     Given email sending is disabled
-    Given shop "shop1" with name "test_shop" exists
+    And shop "shop1" with name "test_shop" exists
+    And there is a currency named "usd" with iso code "USD" and exchange rate of 1.0
     And the current currency is "USD"
     And country "US" is enabled
     And country "FR" is enabled
@@ -59,13 +60,13 @@ Feature: Multiple currencies for Order in Back Office (BO)
       | total_shipping_tax_excl  | 70.00  |
       | total_shipping_tax_incl  | 74.20  |
     And product "Mug The best is yet to come" in order "bo_order1" has following details:
-      | product_quantity            | 2      |
-      | original_product_price      | 119.00 |
-      | product_price               | 119.00 |
-      | unit_price_tax_incl         | 126.14 |
-      | unit_price_tax_excl         | 119.00 |
-      | total_price_tax_incl        | 252.28 |
-      | total_price_tax_excl        | 238.00 |
+      | product_quantity       | 2      |
+      | original_product_price | 119.00 |
+      | product_price          | 119.00 |
+      | unit_price_tax_incl    | 126.14 |
+      | unit_price_tax_excl    | 119.00 |
+      | total_price_tax_incl   | 252.28 |
+      | total_price_tax_excl   | 238.00 |
 
   Scenario: Add cart rule of type 'amount' to an order with secondary currency
     Given I add discount to order "bo_order1" with following details:
@@ -132,13 +133,19 @@ Feature: Multiple currencies for Order in Back Office (BO)
       | reduction      | 0.25       |
       | reduction_type | percentage |
       | reduction_tax  | 1          |
-    And there is a cart rule named "CartRuleAmountOnSelectedProduct" that applies an amount discount of 1.0 with priority 1, quantity of 100 and quantity per user 100
-    And cart rule "CartRuleAmountOnSelectedProduct" has no discount code
-    And cart rule "CartRuleAmountOnSelectedProduct" is restricted to product "Test Product With Discount and SpecificPrice"
+    And there is a cart rule CartRuleAmountOnSelectedProduct with following properties:
+      | name[en-US]               | CartRuleAmountOnSelectedProduct              |
+      | discount_amount           | 1                                            |
+      | discount_currency         | usd                                          |
+      | discount_includes_tax     | false                                        |
+      | total_quantity            | 100                                          |
+      | quantity_per_user         | 100                                          |
+      | discount_application_type | specific_product                             |
+      | discount_product          | Test Product With Discount and SpecificPrice |
     When I add products to order "bo_order1" with new invoice and the following products details:
-      | name          | Test Product With Discount and SpecificPrice |
-      | amount        | 2                                            |
-      | price         | 120                                          |
+      | name   | Test Product With Discount and SpecificPrice |
+      | amount | 2                                            |
+      | price  | 120                                          |
     Then product "Test Product With Discount and SpecificPrice" in order "bo_order1" should have no specific price
 #    For product "Test Product With Discount and SpecificPrice"
 #    Due to the specific price 25% of €160, the customer have to pay 75% of the product price : €120
@@ -158,13 +165,13 @@ Feature: Multiple currencies for Order in Back Office (BO)
       | total_shipping_tax_excl  | 70.00  |
       | total_shipping_tax_incl  | 74.20  |
     And product "Mug The best is yet to come" in order "bo_order1" has following details:
-      | product_quantity            | 2        |
-      | product_price               | 119.00   |
-      | original_product_price      | 119.00   |
-      | unit_price_tax_incl         | 126.14   |
-      | unit_price_tax_excl         | 119.00   |
-      | total_price_tax_incl        | 252.28   |
-      | total_price_tax_excl        | 238.00   |
+      | product_quantity       | 2      |
+      | product_price          | 119.00 |
+      | original_product_price | 119.00 |
+      | unit_price_tax_incl    | 126.14 |
+      | unit_price_tax_excl    | 119.00 |
+      | total_price_tax_incl   | 252.28 |
+      | total_price_tax_excl   | 238.00 |
     And product "Test Product With Discount and SpecificPrice" in order "bo_order1" has following details:
       | product_quantity       | 2      |
       | original_product_price | 160.00 |
@@ -192,7 +199,7 @@ Feature: Multiple currencies for Order in Back Office (BO)
       | total_shipping_tax_excl  | 70.00  |
       | total_shipping_tax_incl  | 74.20  |
     And product "Mug The best is yet to come" in order "bo_order1" has following details:
-      | product_quantity       | 2     |
+      | product_quantity       | 2      |
       | original_product_price | 119.00 |
       | product_price          | 119.00 |
       | unit_price_tax_incl    | 126.14 |
@@ -228,20 +235,20 @@ Feature: Multiple currencies for Order in Back Office (BO)
   Scenario: Update product quantity in order with secondary currency when its category has discount
     Given the default category of product "Mug The best is yet to come" has a group reduction of 50.00% for the customer "testCustomer"
     When I edit product "Mug The best is yet to come" to order "bo_order1" with following products details:
-      | amount        | 3                       |
-      | price         | 11.90                   |
+      | amount | 3     |
+      | price  | 11.90 |
     Then order "bo_order1" should contain 3 products "Mug The best is yet to come"
     And product "Mug The best is yet to come" in order "bo_order1" has following details:
-      | product_quantity            | 3      |
-      | original_product_price      | 119.00 |
-      | product_price               | 11.90  |
-      | unit_price_tax_incl         | 12.614 |
-      | unit_price_tax_excl         | 11.90  |
-      | total_price_tax_incl        | 37.84  |
-      | total_price_tax_excl        | 35.70  |
+      | product_quantity       | 3      |
+      | original_product_price | 119.00 |
+      | product_price          | 11.90  |
+      | unit_price_tax_incl    | 12.614 |
+      | unit_price_tax_excl    | 11.90  |
+      | total_price_tax_incl   | 37.84  |
+      | total_price_tax_excl   | 35.70  |
     And order "bo_order1" should have following details:
-      | total_products           | 35.70 |
-      | total_products_wt        | 37.84 |
+      | total_products           | 35.70  |
+      | total_products_wt        | 37.84  |
       | total_discounts_tax_excl | 0.00   |
       | total_discounts_tax_incl | 0.00   |
       | total_paid_tax_excl      | 105.70 |
@@ -251,20 +258,20 @@ Feature: Multiple currencies for Order in Back Office (BO)
       | total_shipping_tax_excl  | 70.00  |
       | total_shipping_tax_incl  | 74.20  |
     When I edit product "Mug The best is yet to come" to order "bo_order1" with following products details:
-      | amount        | 3                       |
-      | price         | 20.00                   |
+      | amount | 3     |
+      | price  | 20.00 |
     Then order "bo_order1" should contain 3 products "Mug The best is yet to come"
     And product "Mug The best is yet to come" in order "bo_order1" has following details:
-      | product_quantity            | 3      |
-      | original_product_price      | 119.00 |
-      | product_price               | 20.00  |
-      | unit_price_tax_incl         | 21.20  |
-      | unit_price_tax_excl         | 20.00  |
-      | total_price_tax_incl        | 63.60  |
-      | total_price_tax_excl        | 60.00  |
+      | product_quantity       | 3      |
+      | original_product_price | 119.00 |
+      | product_price          | 20.00  |
+      | unit_price_tax_incl    | 21.20  |
+      | unit_price_tax_excl    | 20.00  |
+      | total_price_tax_incl   | 63.60  |
+      | total_price_tax_excl   | 60.00  |
     And order "bo_order1" should have following details:
-      | total_products           | 60.00 |
-      | total_products_wt        | 63.60 |
+      | total_products           | 60.00  |
+      | total_products_wt        | 63.60  |
       | total_discounts_tax_excl | 0.00   |
       | total_discounts_tax_incl | 0.00   |
       | total_paid_tax_excl      | 130.00 |
@@ -396,140 +403,146 @@ Feature: Multiple currencies for Order in Back Office (BO)
 
   @reset-database-before-scenario
     # We reset database before this scenario to be sure only default_carrier is enabled
-    Scenario: I add the product with associated gift when the order already has the gift
-      Given there is a product in the catalog named "Test Product With Auto Gift" with a price of 12.0 and 100 items in stock
-      And there is a product in the catalog named "Test Product Gifted" with a price of 15.0 and 100 items in stock
-      And there is a cart rule named "MultiGiftAutoCartRule" that applies an amount discount of 1.0 with priority 1, quantity of 100 and quantity per user 100
-      And cart rule "MultiGiftAutoCartRule" has no discount code
-      And cart rule "MultiGiftAutoCartRule" is restricted to product "Test Product With Auto Gift"
-      And cart rule "MultiGiftAutoCartRule" offers free shipping
-      And cart rule "MultiGiftAutoCartRule" offers a gift product "Test Product Gifted"
-      And I add products to order "bo_order1" with new invoice and the following products details:
-        | name   | Test Product Gifted |
-        | amount | 1                   |
-        | price  | 150.0               |
-      Then order "bo_order1" should have 3 products in total
-      And order "bo_order1" should have 0 invoice
-      And order "bo_order1" should have 0 cart rule
-      And order "bo_order1" should have "default_carrier" as a carrier
-      And order "bo_order1" should have following details:
-        | total_products           | 388.00 |
-        | total_products_wt        | 411.28 |
-        | total_discounts_tax_excl | 0.0    |
-        | total_discounts_tax_incl | 0.0    |
-        | total_paid_tax_excl      | 458.00 |
-        | total_paid_tax_incl      | 485.48 |
-        | total_paid               | 485.48 |
-        | total_paid_real          | 0.0    |
-        | total_shipping_tax_excl  | 70.00  |
-        | total_shipping_tax_incl  | 74.20  |
-      And order "bo_order1" carrier should have following details:
-        | weight                 | 0.600 |
-        | shipping_cost_tax_excl | 70.00 |
-        | shipping_cost_tax_incl | 74.20 |
-      And product "Mug The best is yet to come" in order "bo_order1" has following details:
-        | product_quantity       | 2      |
-        | original_product_price | 119.00 |
-        | product_price          | 119.00 |
-        | unit_price_tax_incl    | 126.14 |
-        | unit_price_tax_excl    | 119.00 |
-        | total_price_tax_incl   | 252.28 |
-        | total_price_tax_excl   | 238.00 |
-      And product "Test Product Gifted" in order "bo_order1" has following details:
-        | product_quantity       | 1      |
-        | original_product_price | 150.00 |
-        | product_price          | 150.00 |
-        | unit_price_tax_incl    | 159.00 |
-        | unit_price_tax_excl    | 150.00 |
-        | total_price_tax_incl   | 159.00 |
-        | total_price_tax_excl   | 150.00 |
-      When I add products to order "bo_order1" with new invoice and the following products details:
-        | name   | Test Product With Auto Gift |
-        | amount | 1                           |
-        | price  | 120.00                      |
-      Then order "bo_order1" should have 5 products in total
-      And order "bo_order1" should have 0 invoice
-      And order "bo_order1" should have 1 cart rule
-      And order "bo_order1" should have following details:
-        | total_products           | 658.00 |
-        | total_products_wt        | 697.48 |
-        | total_discounts_tax_excl | 230.0  |
-        | total_discounts_tax_incl | 243.80 |
-        | total_paid_tax_excl      | 498.00 |
-        | total_paid_tax_incl      | 527.88 |
-        | total_paid               | 527.88 |
-        | total_paid_real          | 0.0    |
-        | total_shipping_tax_excl  | 70.00  |
-        | total_shipping_tax_incl  | 74.20  |
-      And order "bo_order1" carrier should have following details:
-        | weight                 | 0.600 |
-        | shipping_cost_tax_excl | 70.00 |
-        | shipping_cost_tax_incl | 74.20 |
-      And order "bo_order1" should have cart rule "MultiGiftAutoCartRule" with amount "€230.00"
-      And product "Mug The best is yet to come" in order "bo_order1" has following details:
-        | product_quantity       | 2      |
-        | original_product_price | 119.00 |
-        | product_price          | 119.00 |
-        | unit_price_tax_incl    | 126.14 |
-        | unit_price_tax_excl    | 119.00 |
-        | total_price_tax_incl   | 252.28 |
-        | total_price_tax_excl   | 238.00 |
-      And product "Test Product Gifted" in order "bo_order1" has following details:
-        | product_quantity       | 2      |
-        | original_product_price | 150.00 |
-        | product_price          | 150.00 |
-        | unit_price_tax_incl    | 159.00 |
-        | unit_price_tax_excl    | 150.00 |
-        | total_price_tax_incl   | 318.00 |
-        | total_price_tax_excl   | 300.00 |
-      And product "Test Product With Auto Gift" in order "bo_order1" has following details:
-        | product_quantity       | 1      |
-        | original_product_price | 120.00 |
-        | product_price          | 120.00 |
-        | unit_price_tax_incl    | 127.20 |
-        | unit_price_tax_excl    | 120.00 |
-        | total_price_tax_incl   | 127.20 |
-        | total_price_tax_excl   | 120.00 |
-      When I remove cart rule "MultiGiftAutoCartRule" from order "bo_order1"
-      Then order "bo_order1" should have 4 products in total
-      And order "bo_order1" should have 0 invoice
-      And order "bo_order1" should have 0 cart rule
-      And order "bo_order1" should have following details:
-        | total_products           | 508.00 |
-        | total_products_wt        | 538.48 |
-        | total_discounts_tax_excl | 0.00   |
-        | total_discounts_tax_incl | 0.00   |
-        | total_paid_tax_excl      | 578.00 |
-        | total_paid_tax_incl      | 612.68 |
-        | total_paid               | 612.68 |
-        | total_paid_real          | 0.0    |
-        | total_shipping_tax_excl  | 70.00  |
-        | total_shipping_tax_incl  | 74.20  |
-      And order "bo_order1" carrier should have following details:
-        | weight                 | 0.600 |
-        | shipping_cost_tax_excl | 70.00 |
-        | shipping_cost_tax_incl | 74.20 |
-      And product "Mug The best is yet to come" in order "bo_order1" has following details:
-        | product_quantity       | 2      |
-        | original_product_price | 119.00 |
-        | product_price          | 119.00 |
-        | unit_price_tax_incl    | 126.14 |
-        | unit_price_tax_excl    | 119.00 |
-        | total_price_tax_incl   | 252.28 |
-        | total_price_tax_excl   | 238.00 |
-      And product "Test Product Gifted" in order "bo_order1" has following details:
-        | product_quantity       | 1      |
-        | original_product_price | 150.00 |
-        | product_price          | 150.00 |
-        | unit_price_tax_incl    | 159.00 |
-        | unit_price_tax_excl    | 150.00 |
-        | total_price_tax_incl   | 159.00 |
-        | total_price_tax_excl   | 150.00 |
-      And product "Test Product With Auto Gift" in order "bo_order1" has following details:
-        | product_quantity       | 1      |
-        | original_product_price | 120.00 |
-        | product_price          | 120.00 |
-        | unit_price_tax_incl    | 127.20 |
-        | unit_price_tax_excl    | 120.00 |
-        | total_price_tax_incl   | 127.20 |
-        | total_price_tax_excl   | 120.00 |
+  Scenario: I add the product with associated gift when the order already has the gift
+    Given there is a product in the catalog named "Test Product With Auto Gift" with a price of 12.0 and 100 items in stock
+    And there is a product in the catalog named "Test Product Gifted" with a price of 15.0 and 100 items in stock
+    And there is a cart rule MultiGiftAutoCartRule with following properties:
+      | name[en-US]               | MultiGiftAutoCartRule       |
+      | free_shipping             | true                        |
+      | discount_amount           | 1                           |
+      | discount_currency         | usd                         |
+      | discount_includes_tax     | false                       |
+      | total_quantity            | 100                         |
+      | quantity_per_user         | 100                         |
+      | discount_application_type | specific_product            |
+      | discount_product          | Test Product With Auto Gift |
+      | gift_product              | Test Product Gifted         |
+    And I add products to order "bo_order1" with new invoice and the following products details:
+      | name   | Test Product Gifted |
+      | amount | 1                   |
+      | price  | 150.0               |
+    Then order "bo_order1" should have 3 products in total
+    And order "bo_order1" should have 0 invoice
+    And order "bo_order1" should have 0 cart rule
+    And order "bo_order1" should have "default_carrier" as a carrier
+    And order "bo_order1" should have following details:
+      | total_products           | 388.00 |
+      | total_products_wt        | 411.28 |
+      | total_discounts_tax_excl | 0.0    |
+      | total_discounts_tax_incl | 0.0    |
+      | total_paid_tax_excl      | 458.00 |
+      | total_paid_tax_incl      | 485.48 |
+      | total_paid               | 485.48 |
+      | total_paid_real          | 0.0    |
+      | total_shipping_tax_excl  | 70.00  |
+      | total_shipping_tax_incl  | 74.20  |
+    And order "bo_order1" carrier should have following details:
+      | weight                 | 0.600 |
+      | shipping_cost_tax_excl | 70.00 |
+      | shipping_cost_tax_incl | 74.20 |
+    And product "Mug The best is yet to come" in order "bo_order1" has following details:
+      | product_quantity       | 2      |
+      | original_product_price | 119.00 |
+      | product_price          | 119.00 |
+      | unit_price_tax_incl    | 126.14 |
+      | unit_price_tax_excl    | 119.00 |
+      | total_price_tax_incl   | 252.28 |
+      | total_price_tax_excl   | 238.00 |
+    And product "Test Product Gifted" in order "bo_order1" has following details:
+      | product_quantity       | 1      |
+      | original_product_price | 150.00 |
+      | product_price          | 150.00 |
+      | unit_price_tax_incl    | 159.00 |
+      | unit_price_tax_excl    | 150.00 |
+      | total_price_tax_incl   | 159.00 |
+      | total_price_tax_excl   | 150.00 |
+    When I add products to order "bo_order1" with new invoice and the following products details:
+      | name   | Test Product With Auto Gift |
+      | amount | 1                           |
+      | price  | 120.00                      |
+    Then order "bo_order1" should have 5 products in total
+    And order "bo_order1" should have 0 invoice
+    And order "bo_order1" should have 1 cart rule
+    And order "bo_order1" should have following details:
+      | total_products           | 658.00 |
+      | total_products_wt        | 697.48 |
+      | total_discounts_tax_excl | 230.0  |
+      | total_discounts_tax_incl | 243.80 |
+      | total_paid_tax_excl      | 498.00 |
+      | total_paid_tax_incl      | 527.88 |
+      | total_paid               | 527.88 |
+      | total_paid_real          | 0.0    |
+      | total_shipping_tax_excl  | 70.00  |
+      | total_shipping_tax_incl  | 74.20  |
+    And order "bo_order1" carrier should have following details:
+      | weight                 | 0.600 |
+      | shipping_cost_tax_excl | 70.00 |
+      | shipping_cost_tax_incl | 74.20 |
+    And order "bo_order1" should have cart rule "MultiGiftAutoCartRule" with amount "€230.00"
+    And product "Mug The best is yet to come" in order "bo_order1" has following details:
+      | product_quantity       | 2      |
+      | original_product_price | 119.00 |
+      | product_price          | 119.00 |
+      | unit_price_tax_incl    | 126.14 |
+      | unit_price_tax_excl    | 119.00 |
+      | total_price_tax_incl   | 252.28 |
+      | total_price_tax_excl   | 238.00 |
+    And product "Test Product Gifted" in order "bo_order1" has following details:
+      | product_quantity       | 2      |
+      | original_product_price | 150.00 |
+      | product_price          | 150.00 |
+      | unit_price_tax_incl    | 159.00 |
+      | unit_price_tax_excl    | 150.00 |
+      | total_price_tax_incl   | 318.00 |
+      | total_price_tax_excl   | 300.00 |
+    And product "Test Product With Auto Gift" in order "bo_order1" has following details:
+      | product_quantity       | 1      |
+      | original_product_price | 120.00 |
+      | product_price          | 120.00 |
+      | unit_price_tax_incl    | 127.20 |
+      | unit_price_tax_excl    | 120.00 |
+      | total_price_tax_incl   | 127.20 |
+      | total_price_tax_excl   | 120.00 |
+    When I remove cart rule "MultiGiftAutoCartRule" from order "bo_order1"
+    Then order "bo_order1" should have 4 products in total
+    And order "bo_order1" should have 0 invoice
+    And order "bo_order1" should have 0 cart rule
+    And order "bo_order1" should have following details:
+      | total_products           | 508.00 |
+      | total_products_wt        | 538.48 |
+      | total_discounts_tax_excl | 0.00   |
+      | total_discounts_tax_incl | 0.00   |
+      | total_paid_tax_excl      | 578.00 |
+      | total_paid_tax_incl      | 612.68 |
+      | total_paid               | 612.68 |
+      | total_paid_real          | 0.0    |
+      | total_shipping_tax_excl  | 70.00  |
+      | total_shipping_tax_incl  | 74.20  |
+    And order "bo_order1" carrier should have following details:
+      | weight                 | 0.600 |
+      | shipping_cost_tax_excl | 70.00 |
+      | shipping_cost_tax_incl | 74.20 |
+    And product "Mug The best is yet to come" in order "bo_order1" has following details:
+      | product_quantity       | 2      |
+      | original_product_price | 119.00 |
+      | product_price          | 119.00 |
+      | unit_price_tax_incl    | 126.14 |
+      | unit_price_tax_excl    | 119.00 |
+      | total_price_tax_incl   | 252.28 |
+      | total_price_tax_excl   | 238.00 |
+    And product "Test Product Gifted" in order "bo_order1" has following details:
+      | product_quantity       | 1      |
+      | original_product_price | 150.00 |
+      | product_price          | 150.00 |
+      | unit_price_tax_incl    | 159.00 |
+      | unit_price_tax_excl    | 150.00 |
+      | total_price_tax_incl   | 159.00 |
+      | total_price_tax_excl   | 150.00 |
+    And product "Test Product With Auto Gift" in order "bo_order1" has following details:
+      | product_quantity       | 1      |
+      | original_product_price | 120.00 |
+      | product_price          | 120.00 |
+      | unit_price_tax_incl    | 127.20 |
+      | unit_price_tax_excl    | 120.00 |
+      | total_price_tax_incl   | 127.20 |
+      | total_price_tax_excl   | 120.00 |

From 045eac95172a71157f425d73d63b1213ef3344fa Mon Sep 17 00:00:00 2001
From: Jens Wilke <jw_github@headissue.com>
Date: Fri, 23 Jun 2023 06:26:19 +0200
Subject: [PATCH 0263/1030] Fix CS

---
 classes/controller/FrontController.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php
index 0c18ff4a9af18..bdde4f5df0fd7 100644
--- a/classes/controller/FrontController.php
+++ b/classes/controller/FrontController.php
@@ -1655,8 +1655,10 @@ public function getTemplateVarShop()
         return $shop;
     }
 
-    private static function configuredImageUrl(string $configKey, $psImageUrl) {
+    private static function configuredImageUrl(string $configKey, $psImageUrl)
+    {
         $image = Configuration::get($configKey);
+
         return $image ? $psImageUrl . $image : '';
     }
 

From ea1cf259977ce5c02f8d4ad706d8e29958571079 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Fri, 14 Apr 2023 11:17:02 +0200
Subject: [PATCH 0264/1030] Removed deprecated methods `displayNumber` &
 `displayPrice` in class `Tools`

---
 classes/Tools.php                             | 67 -------------------
 .../GetOrderForViewingHandler.php             | 20 +++---
 .../Presenter/Product/ProductLazyArray.php    |  4 +-
 src/Adapter/Product/PriceFormatter.php        |  6 +-
 .../GetCustomerThreadForViewingHandler.php    |  8 ++-
 .../override/AdminProductsController.php      | 13 ++--
 .../admin/AdminProductsController.php         | 13 ++--
 7 files changed, 38 insertions(+), 93 deletions(-)

diff --git a/classes/Tools.php b/classes/Tools.php
index f7e9818704344..9d8ad34af8744 100644
--- a/classes/Tools.php
+++ b/classes/Tools.php
@@ -661,46 +661,6 @@ public static function setCurrency($cookie)
         return $currency;
     }
 
-    /**
-     * Return price with currency sign for a given product.
-     *
-     * @deprecated Since 1.7.6.0. Please use Locale::formatPrice() instead
-     * @see PrestaShop\PrestaShop\Core\Localization\Locale
-     *
-     * @param float $price Product price
-     * @param int|Currency|array|null $currency Current currency (object, id_currency, NULL => context currency)
-     * @param bool $no_utf8 Not used anymore
-     * @param Context|null $context
-     *
-     * @return string Price correctly formatted (sign, decimal separator...)
-     *                if you modify this function, don't forget to modify the Javascript function formatCurrency (in tools.js)
-     *
-     * @throws LocalizationException
-     */
-    public static function displayPrice($price, $currency = null, $no_utf8 = false, Context $context = null)
-    {
-        @trigger_error(
-            'Tools::displayPrice() is deprecated since version 1.7.6.0. Use ' . Locale::class . '::formatPrice() instead.',
-            E_USER_DEPRECATED
-        );
-
-        if (!is_numeric($price)) {
-            return $price;
-        }
-
-        $context = $context ?: Context::getContext();
-        $currency = $currency ?: $context->currency;
-
-        if (is_int($currency)) {
-            $currency = Currency::getCurrencyInstance($currency);
-        }
-
-        $locale = static::getContextLocale($context);
-        $currencyCode = is_array($currency) ? $currency['iso_code'] : $currency->iso_code;
-
-        return $locale->formatPrice($price, $currencyCode);
-    }
-
     /**
      * Return current locale
      *
@@ -732,33 +692,6 @@ public static function getContextLocale(Context $context)
         return $locale;
     }
 
-    /**
-     * Returns a well formatted number.
-     *
-     * @deprecated Since 1.7.6.0. Please use Locale::formatNumber() instead
-     * @see Locale
-     *
-     * @param int|float|string $number The number to format
-     * @param null $currency not used anymore
-     *
-     * @return string The formatted number
-     *
-     * @throws Exception
-     * @throws LocalizationException
-     */
-    public static function displayNumber($number, $currency = null)
-    {
-        @trigger_error(
-            'Tools::displayNumber() is deprecated since version 1.7.5.0. Use ' . Locale::class . ' instead.',
-            E_USER_DEPRECATED
-        );
-
-        $context = Context::getContext();
-        $locale = static::getContextLocale($context);
-
-        return $locale->formatNumber($number);
-    }
-
     public static function displayPriceSmarty($params, &$smarty)
     {
         $context = Context::getContext();
diff --git a/src/Adapter/Order/QueryHandler/GetOrderForViewingHandler.php b/src/Adapter/Order/QueryHandler/GetOrderForViewingHandler.php
index 7ccce7243b32a..b743a295f9aee 100644
--- a/src/Adapter/Order/QueryHandler/GetOrderForViewingHandler.php
+++ b/src/Adapter/Order/QueryHandler/GetOrderForViewingHandler.php
@@ -541,9 +541,9 @@ private function getOrderShipping(Order $order): OrderShippingForViewing
         if (!$order->isVirtual()) {
             foreach ($shipping as $item) {
                 if ($taxCalculationMethod == PS_TAX_INC) {
-                    $price = Tools::displayPrice($item['shipping_cost_tax_incl'], $currency);
+                    $price = $this->locale->formatPrice($item['shipping_cost_tax_incl'], $currency->iso_code);
                 } else {
-                    $price = Tools::displayPrice($item['shipping_cost_tax_excl'], $currency);
+                    $price = $this->locale->formatPrice($item['shipping_cost_tax_excl'], $currency->iso_code);
                 }
 
                 $trackingUrl = null;
@@ -766,13 +766,13 @@ private function getOrderPrices(Order $order): OrderPricesForViewing
             new DecimalNumber((string) $shippingRefundable),
             new DecimalNumber((string) $taxesAmount),
             new DecimalNumber((string) $totalAmount),
-            Tools::displayPrice($productsPrice, $currency),
-            Tools::displayPrice($discountsAmount, $currency),
-            Tools::displayPrice($wrappingPrice, $currency),
-            Tools::displayPrice($shippingPrice, $currency),
-            Tools::displayPrice($shippingRefundable, $currency),
-            Tools::displayPrice($taxesAmount, $currency),
-            Tools::displayPrice($totalAmount, $currency)
+            $this->locale->formatPrice($productsPrice, $currency->iso_code),
+            $this->locale->formatPrice($discountsAmount, $currency->iso_code),
+            $this->locale->formatPrice($wrappingPrice, $currency->iso_code),
+            $this->locale->formatPrice($shippingPrice, $currency->iso_code),
+            $this->locale->formatPrice($shippingRefundable, $currency->iso_code),
+            $this->locale->formatPrice($taxesAmount, $currency->iso_code),
+            $this->locale->formatPrice($totalAmount, $currency->iso_code)
         );
     }
 
@@ -796,7 +796,7 @@ private function getOrderDiscounts(Order $order): OrderDiscountsForViewing
                 (int) $discount['id_order_cart_rule'],
                 $discount['name'],
                 new DecimalNumber((string) $discountAmount),
-                Tools::displayPrice($discountAmount, $currency)
+                $this->locale->formatPrice($discountAmount, $currency->iso_code)
             );
         }
 
diff --git a/src/Adapter/Presenter/Product/ProductLazyArray.php b/src/Adapter/Presenter/Product/ProductLazyArray.php
index 5fde96b6924d6..6d97f268ef9db 100644
--- a/src/Adapter/Presenter/Product/ProductLazyArray.php
+++ b/src/Adapter/Presenter/Product/ProductLazyArray.php
@@ -764,8 +764,8 @@ private function addPriceInformation(ProductPresentationSettings $settings, arra
             $presNegativeReduction = $negativeReduction->round(2, Rounding::ROUND_HALF_UP);
 
             // TODO: add percent sign according to locale preferences
-            $this->product['discount_percentage'] = Tools::displayNumber($presNegativeReduction) . '%';
-            $this->product['discount_percentage_absolute'] = Tools::displayNumber($presAbsoluteReduction) . '%';
+            $this->product['discount_percentage'] = $this->context->getCurrentLocale()->formatNumber($presNegativeReduction) . '%';
+            $this->product['discount_percentage_absolute'] = $this->context->getCurrentLocale()->formatNumber($presAbsoluteReduction) . '%';
             if ($settings->include_taxes) {
                 $regular_price = $product['price_without_reduction'];
                 $this->product['discount_amount'] = $this->priceFormatter->format(
diff --git a/src/Adapter/Product/PriceFormatter.php b/src/Adapter/Product/PriceFormatter.php
index 9ab11cddb7748..790991ad6ca73 100644
--- a/src/Adapter/Product/PriceFormatter.php
+++ b/src/Adapter/Product/PriceFormatter.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Product;
 
+use Context;
 use Currency;
 use Tools;
 
@@ -53,7 +54,10 @@ public function convertAmount($price, $currency = null)
      */
     public function format($price, $currency = null)
     {
-        return Tools::displayPrice($price, $currency);
+        return Context::getContext()->getCurrentLocale()->formatPrice(
+            $price,
+            is_array($currency) ? $currency['iso_code'] : ($currency instanceof Currency ? $currency->iso_code : null)
+        );
     }
 
     /**
diff --git a/src/Core/Domain/CustomerService/QueryHandler/GetCustomerThreadForViewingHandler.php b/src/Core/Domain/CustomerService/QueryHandler/GetCustomerThreadForViewingHandler.php
index 6ba582f2bcf23..5be67a1ee7bf1 100644
--- a/src/Core/Domain/CustomerService/QueryHandler/GetCustomerThreadForViewingHandler.php
+++ b/src/Core/Domain/CustomerService/QueryHandler/GetCustomerThreadForViewingHandler.php
@@ -349,9 +349,9 @@ private function getCustomerInformation(CustomerThread $thread)
                 }
 
                 $orders[$key]['date_add'] = Tools::displayDate($order['date_add']);
-                $orders[$key]['total_paid_real'] = Tools::displayPrice(
+                $orders[$key]['total_paid_real'] = $this->context->getCurrentLocale()->formatPrice(
                     $order['total_paid_real'],
-                    new Currency((int) $order['id_currency'])
+                    (new Currency((int) $order['id_currency']))->iso_code
                 );
             }
         }
@@ -362,7 +362,9 @@ private function getCustomerInformation(CustomerThread $thread)
             $customer->lastname,
             $thread->email,
             count($ordersOk),
-            $totalOk ? Tools::displayPrice($totalOk, $this->context->currency) : $totalOk,
+            $totalOk
+                ? $this->context->getCurrentLocale()->formatPrice($totalOk, $this->context->currency->iso_code)
+                : $totalOk,
             (new DateTime($customer->date_add))->format($this->context->language->date_format_lite)
         );
     }
diff --git a/tests/Resources/modules_tests/override/AdminProductsController.php b/tests/Resources/modules_tests/override/AdminProductsController.php
index d0b57ea4293f4..b62c9769b475d 100644
--- a/tests/Resources/modules_tests/override/AdminProductsController.php
+++ b/tests/Resources/modules_tests/override/AdminProductsController.php
@@ -2805,12 +2805,12 @@ public function initFormPrices($obj)
                     $combinations[$attribute['id_product_attribute']]['attributes'] = '';
                 }
                 $combinations[$attribute['id_product_attribute']]['attributes'] .= $attribute['attribute_name'] . ' - ';
-                $combinations[$attribute['id_product_attribute']]['price'] = Tools::displayPrice(
+                $combinations[$attribute['id_product_attribute']]['price'] = $this->context->getContextLocale()->formatPrice(
                     Tools::convertPrice(
                         Product::getPriceStatic((int) $obj->id, false, $attribute['id_product_attribute']),
                         $this->context->currency
                     ),
-                    $this->context->currency
+                    $this->context->currency->iso_code
                 );
             }
             foreach ($combinations as &$combination) {
@@ -3120,7 +3120,10 @@ protected function _displaySpecificPriceModificationForm($defaultCurrency, $shop
                 if ($specific_price['reduction_type'] == 'percentage') {
                     $impact = '- ' . ($specific_price['reduction'] * 100) . ' %';
                 } elseif ($specific_price['reduction'] > 0) {
-                    $impact = '- ' . Tools::displayPrice(Tools::ps_round($specific_price['reduction'], 2), $current_specific_currency) . ' ';
+                    $impact = '- ' . $this->context->getContextLocale()->formatPrice(
+                        Tools::ps_round($specific_price['reduction'], 2),
+                        $current_specific_currency['iso_code']
+                    ) . ' ';
                     if ($specific_price['reduction_tax']) {
                         $impact .= '(' . $this->l('Tax incl.') . ')';
                     } else {
@@ -3167,7 +3170,7 @@ protected function _displaySpecificPriceModificationForm($defaultCurrency, $shop
 						<td>' . ($id_shop_sp ? $shops[$id_shop_sp]['name'] : $this->l('All shops')) . '</td>';
                     }
                     $price = Tools::ps_round($specific_price['price'], 2);
-                    $fixed_price = ($price == Tools::ps_round($obj->price, 2) || $specific_price['price'] == -1) ? '--' : Tools::displayPrice($price, $current_specific_currency);
+                    $fixed_price = ($price == Tools::ps_round($obj->price, 2) || $specific_price['price'] == -1) ? '--' : $this->context->getContextLocale()->formatPrice($price, $current_specific_currency['iso_code']);
                     $content .= '
 						<td>' . ($specific_price['id_currency'] ? $currencies[$specific_price['id_currency']]['name'] : $this->l('All currencies')) . '</td>
 						<td>' . ($specific_price['id_country'] ? $countries[$specific_price['id_country']]['name'] : $this->l('All countries')) . '</td>
@@ -3889,7 +3892,7 @@ public function renderListAttributes($product, $currency)
                 $combination_images = $product->getCombinationImages($this->context->language->id);
                 foreach ($combinations as $k => $combination) {
                     $price_to_convert = Tools::convertPrice($combination['price'], $currency);
-                    $price = Tools::displayPrice($price_to_convert, $currency);
+                    $price = $this->context->getContextLocale()->formatPrice($price_to_convert, $currency['iso_code']);
                     $container['id_product_attribute'] = $combination['id_product_attribute'];
                     $container['attributes'][] = [$combination['group_name'], $combination['attribute_name'], $combination['id_attribute']];
                     $container['wholesale_price'] = $combination['wholesale_price'];
diff --git a/tests/Resources/modules_tests/pscsx32412/override/controllers/admin/AdminProductsController.php b/tests/Resources/modules_tests/pscsx32412/override/controllers/admin/AdminProductsController.php
index a9e5c3aefd554..713773a6f6b6d 100644
--- a/tests/Resources/modules_tests/pscsx32412/override/controllers/admin/AdminProductsController.php
+++ b/tests/Resources/modules_tests/pscsx32412/override/controllers/admin/AdminProductsController.php
@@ -2919,12 +2919,12 @@ public function initFormPrices($obj)
                 }
                 $combinations[$attribute['id_product_attribute']]['attributes'] .= $attribute['attribute_name'] . ' - ';
 
-                $combinations[$attribute['id_product_attribute']]['price'] = Tools::displayPrice(
+                $combinations[$attribute['id_product_attribute']]['price'] = $this->context->getContextLocale()->formatPrice(
                     Tools::convertPrice(
                         Product::getPriceStatic((int) $obj->id, false, $attribute['id_product_attribute']),
                         $this->context->currency
                     ),
-                    $this->context->currency
+                    $this->context->currency->iso_code
                 );
             }
             foreach ($combinations as &$combination) {
@@ -3253,7 +3253,10 @@ protected function _displaySpecificPriceModificationForm($defaultCurrency, $shop
                 if ($specific_price['reduction_type'] == 'percentage') {
                     $impact = '- ' . ($specific_price['reduction'] * 100) . ' %';
                 } elseif ($specific_price['reduction'] > 0) {
-                    $impact = '- ' . Tools::displayPrice(Tools::ps_round($specific_price['reduction'], 2), $current_specific_currency) . ' ';
+                    $impact = '- ' . $this->context->getContextLocale()->formatPrice(
+                        Tools::ps_round($specific_price['reduction'], 2),
+                        $current_specific_currency['iso_code']
+                    ) . ' ';
                     if ($specific_price['reduction_tax']) {
                         $impact .= '(' . $this->l('Tax incl.') . ')';
                     } else {
@@ -3305,7 +3308,7 @@ protected function _displaySpecificPriceModificationForm($defaultCurrency, $shop
 						<td>' . ($id_shop_sp ? $shops[$id_shop_sp]['name'] : $this->l('All shops')) . '</td>';
                     }
                     $price = Tools::ps_round($specific_price['price'], 2);
-                    $fixed_price = ($price == Tools::ps_round($obj->price, 2) || $specific_price['price'] == -1) ? '--' : Tools::displayPrice($price, $current_specific_currency);
+                    $fixed_price = ($price == Tools::ps_round($obj->price, 2) || $specific_price['price'] == -1) ? '--' : $this->context->getContextLocale()->formatPrice($price, $current_specific_currency['iso_code']);
                     $content .= '
 						<td>' . ($specific_price['id_currency'] ? $currencies[$specific_price['id_currency']]['name'] : $this->l('All currencies')) . '</td>
 						<td>' . ($specific_price['id_country'] ? $countries[$specific_price['id_country']]['name'] : $this->l('All countries')) . '</td>
@@ -4062,7 +4065,7 @@ public function renderListAttributes($product, $currency)
                 $combination_images = $product->getCombinationImages($this->context->language->id);
                 foreach ($combinations as $k => $combination) {
                     $price_to_convert = Tools::convertPrice($combination['price'], $currency);
-                    $price = Tools::displayPrice($price_to_convert, $currency);
+                    $price = $this->context->getContextLocale()->formatPrice($price_to_convert, $currency['iso_code']);
 
                     $container['id_product_attribute'] = $combination['id_product_attribute'];
                     $container['attributes'][] = [$combination['group_name'], $combination['attribute_name'], $combination['id_attribute']];

From e73926d37d0a2493281007428f277482a1d23dc8 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Fri, 12 May 2023 15:14:23 +0200
Subject: [PATCH 0265/1030] Removed deprecated methods `displayNumber` &
 `displayPrice` in class `Tools` : Fixed Behat tests

---
 classes/Tools.php                                    |  1 -
 .../Order/QueryHandler/GetOrderForViewingHandler.php |  8 ++++++--
 .../GetCustomerThreadForViewingHandler.php           | 12 ++++++++++--
 .../config/services/core/domain/customer_service.yml |  1 +
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/classes/Tools.php b/classes/Tools.php
index 9d8ad34af8744..a7c0eda18dbcc 100644
--- a/classes/Tools.php
+++ b/classes/Tools.php
@@ -30,7 +30,6 @@
 use PrestaShop\PrestaShop\Adapter\SymfonyContainer;
 use PrestaShop\PrestaShop\Core\Cache\Clearer\CacheClearerInterface;
 use PrestaShop\PrestaShop\Core\Foundation\Filesystem\FileSystem as PsFileSystem;
-use PrestaShop\PrestaShop\Core\Localization\Exception\LocalizationException;
 use PrestaShop\PrestaShop\Core\Localization\Locale;
 use PrestaShop\PrestaShop\Core\Localization\Locale\Repository as LocaleRepository;
 use PrestaShop\PrestaShop\Core\Security\Hashing;
diff --git a/src/Adapter/Order/QueryHandler/GetOrderForViewingHandler.php b/src/Adapter/Order/QueryHandler/GetOrderForViewingHandler.php
index b743a295f9aee..e8f50d2c7065a 100644
--- a/src/Adapter/Order/QueryHandler/GetOrderForViewingHandler.php
+++ b/src/Adapter/Order/QueryHandler/GetOrderForViewingHandler.php
@@ -541,9 +541,13 @@ private function getOrderShipping(Order $order): OrderShippingForViewing
         if (!$order->isVirtual()) {
             foreach ($shipping as $item) {
                 if ($taxCalculationMethod == PS_TAX_INC) {
-                    $price = $this->locale->formatPrice($item['shipping_cost_tax_incl'], $currency->iso_code);
+                    $price = $item['shipping_cost_tax_incl']
+                        ? $this->locale->formatPrice($item['shipping_cost_tax_incl'], $currency->iso_code)
+                        : $item['shipping_cost_tax_incl'];
                 } else {
-                    $price = $this->locale->formatPrice($item['shipping_cost_tax_excl'], $currency->iso_code);
+                    $price = $item['shipping_cost_tax_excl']
+                        ? $this->locale->formatPrice($item['shipping_cost_tax_excl'], $currency->iso_code)
+                        : $item['shipping_cost_tax_excl'];
                 }
 
                 $trackingUrl = null;
diff --git a/src/Core/Domain/CustomerService/QueryHandler/GetCustomerThreadForViewingHandler.php b/src/Core/Domain/CustomerService/QueryHandler/GetCustomerThreadForViewingHandler.php
index 5be67a1ee7bf1..5117f4cb8810e 100644
--- a/src/Core/Domain/CustomerService/QueryHandler/GetCustomerThreadForViewingHandler.php
+++ b/src/Core/Domain/CustomerService/QueryHandler/GetCustomerThreadForViewingHandler.php
@@ -45,6 +45,7 @@
 use PrestaShop\PrestaShop\Core\Domain\CustomerService\ValueObject\CustomerThreadMessageType;
 use PrestaShop\PrestaShop\Core\Domain\CustomerService\ValueObject\CustomerThreadStatus;
 use PrestaShop\PrestaShop\Core\Domain\Language\ValueObject\LanguageId;
+use PrestaShop\PrestaShop\Core\Localization\Locale;
 use Product;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Tools;
@@ -65,13 +66,20 @@ class GetCustomerThreadForViewingHandler implements GetCustomerThreadForViewingH
      */
     private $translator;
 
+    /**
+     * @var Locale
+     */
+    protected $locale;
+
     /**
      * @param Context $context
+     * @param Locale $locale
      */
-    public function __construct(Context $context)
+    public function __construct(Context $context, Locale $locale)
     {
         $this->context = $context;
         $this->translator = $context->getTranslator();
+        $this->locale = $locale;
     }
 
     /**
@@ -349,7 +357,7 @@ private function getCustomerInformation(CustomerThread $thread)
                 }
 
                 $orders[$key]['date_add'] = Tools::displayDate($order['date_add']);
-                $orders[$key]['total_paid_real'] = $this->context->getCurrentLocale()->formatPrice(
+                $orders[$key]['total_paid_real'] = $this->locale->formatPrice(
                     $order['total_paid_real'],
                     (new Currency((int) $order['id_currency']))->iso_code
                 );
diff --git a/src/PrestaShopBundle/Resources/config/services/core/domain/customer_service.yml b/src/PrestaShopBundle/Resources/config/services/core/domain/customer_service.yml
index b2fbdb4ad6504..ea4a2d64a8830 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/domain/customer_service.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/domain/customer_service.yml
@@ -34,6 +34,7 @@ services:
     class: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\QueryHandler\GetCustomerThreadForViewingHandler'
     arguments:
       - '@=service("prestashop.adapter.legacy.context").getContext()'
+      - '@prestashop.core.localization.locale.context_locale'
     tags:
       - name: tactician.handler
         command: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\Query\GetCustomerThreadForViewing'

From 47246df1a45780ed00f5f1fc783b3c38d9e2b4f3 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Fri, 12 May 2023 16:54:45 +0200
Subject: [PATCH 0266/1030] Removed deprecated methods `displayNumber` &
 `displayPrice` in class `Tools` : Fixed PHPStan

---
 src/Adapter/Presenter/Product/ProductLazyArray.php | 5 +++--
 src/Adapter/Product/PriceFormatter.php             | 9 +++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Adapter/Presenter/Product/ProductLazyArray.php b/src/Adapter/Presenter/Product/ProductLazyArray.php
index 6d97f268ef9db..cb474ff8a66f2 100644
--- a/src/Adapter/Presenter/Product/ProductLazyArray.php
+++ b/src/Adapter/Presenter/Product/ProductLazyArray.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Presenter\Product;
 
+use Context;
 use DateTime;
 use Language;
 use Link;
@@ -764,8 +765,8 @@ private function addPriceInformation(ProductPresentationSettings $settings, arra
             $presNegativeReduction = $negativeReduction->round(2, Rounding::ROUND_HALF_UP);
 
             // TODO: add percent sign according to locale preferences
-            $this->product['discount_percentage'] = $this->context->getCurrentLocale()->formatNumber($presNegativeReduction) . '%';
-            $this->product['discount_percentage_absolute'] = $this->context->getCurrentLocale()->formatNumber($presAbsoluteReduction) . '%';
+            $this->product['discount_percentage'] = Context::getContext()->getCurrentLocale()->formatNumber($presNegativeReduction) . '%';
+            $this->product['discount_percentage_absolute'] = Context::getContext()->getCurrentLocale()->formatNumber($presAbsoluteReduction) . '%';
             if ($settings->include_taxes) {
                 $regular_price = $product['price_without_reduction'];
                 $this->product['discount_amount'] = $this->priceFormatter->format(
diff --git a/src/Adapter/Product/PriceFormatter.php b/src/Adapter/Product/PriceFormatter.php
index 790991ad6ca73..dd26f7bac3cb1 100644
--- a/src/Adapter/Product/PriceFormatter.php
+++ b/src/Adapter/Product/PriceFormatter.php
@@ -54,10 +54,11 @@ public function convertAmount($price, $currency = null)
      */
     public function format($price, $currency = null)
     {
-        return Context::getContext()->getCurrentLocale()->formatPrice(
-            $price,
-            is_array($currency) ? $currency['iso_code'] : ($currency instanceof Currency ? $currency->iso_code : null)
-        );
+        $priceCurrency = is_array($currency) ? $currency['iso_code'] : null;
+        $priceCurrency = !$priceCurrency && $currency instanceof Currency ? $currency->iso_code : $priceCurrency;
+        $priceCurrency = !$priceCurrency ? Context::getContext()->currency->iso_code : $priceCurrency;
+
+        return Context::getContext()->getCurrentLocale()->formatPrice($price, $priceCurrency);
     }
 
     /**

From 8da334ef63a0949aae4bb7b65ee13ae32d55d675 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Fri, 16 Jun 2023 11:32:08 +0200
Subject: [PATCH 0267/1030] Removed deprecated methods `displayNumber` &
 `displayPrice` in class `Tools` :  Fixed UI Tests

---
 src/Adapter/Presenter/Cart/CartPresenter.php | 6 ++----
 src/Adapter/Product/PriceFormatter.php       | 5 +++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/Adapter/Presenter/Cart/CartPresenter.php b/src/Adapter/Presenter/Cart/CartPresenter.php
index 4e2bc1ca86067..da76e19b55775 100644
--- a/src/Adapter/Presenter/Cart/CartPresenter.php
+++ b/src/Adapter/Presenter/Cart/CartPresenter.php
@@ -153,12 +153,10 @@ private function presentProduct(array $rawProduct)
         }
 
         if ($this->includeTaxes()) {
-            $rawProduct['price_amount'] = $rawProduct['price_wt'];
-            $rawProduct['price'] = $this->priceFormatter->format($rawProduct['price_wt']);
+            $rawProduct['price_amount'] = $rawProduct['price'] = $rawProduct['price_wt'];
             $rawProduct['unit_price'] = $rawProduct['unit_price_tax_included'];
         } else {
-            $rawProduct['price_amount'] = $rawProduct['price'];
-            $rawProduct['price'] = $rawProduct['price_tax_exc'] = $this->priceFormatter->format($rawProduct['price']);
+            $rawProduct['price_amount'] = $rawProduct['price_tax_exc'] = $rawProduct['price'];
             $rawProduct['unit_price'] = $rawProduct['unit_price_tax_excluded'];
         }
 
diff --git a/src/Adapter/Product/PriceFormatter.php b/src/Adapter/Product/PriceFormatter.php
index dd26f7bac3cb1..2eb6494b7a44e 100644
--- a/src/Adapter/Product/PriceFormatter.php
+++ b/src/Adapter/Product/PriceFormatter.php
@@ -54,11 +54,12 @@ public function convertAmount($price, $currency = null)
      */
     public function format($price, $currency = null)
     {
+        $context = Context::getContext();
         $priceCurrency = is_array($currency) ? $currency['iso_code'] : null;
         $priceCurrency = !$priceCurrency && $currency instanceof Currency ? $currency->iso_code : $priceCurrency;
-        $priceCurrency = !$priceCurrency ? Context::getContext()->currency->iso_code : $priceCurrency;
+        $priceCurrency = !$priceCurrency ? $context->currency->iso_code : $priceCurrency;
 
-        return Context::getContext()->getCurrentLocale()->formatPrice($price, $priceCurrency);
+        return Tools::getContextLocale($context)->formatPrice($price, $priceCurrency);
     }
 
     /**

From 76343a0732af38b5d7db116201374c8ecc990df8 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Fri, 23 Jun 2023 08:45:36 +0200
Subject: [PATCH 0268/1030] Removed deprecated methods `displayNumber` &
 `displayPrice` in class `Tools` : Bump prestashop/dashtrends to 2.1.2

---
 composer.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/composer.lock b/composer.lock
index 1df3fdd044867..49363a778322b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -5435,16 +5435,16 @@
         },
         {
             "name": "prestashop/dashtrends",
-            "version": "v2.1.1",
+            "version": "v2.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PrestaShop/dashtrends.git",
-                "reference": "c0ffb850abf1896ae8650522c8c8f4cff1c1dd80"
+                "reference": "e2cbdb088241a17118a8c4424b468a36216f8316"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PrestaShop/dashtrends/zipball/c0ffb850abf1896ae8650522c8c8f4cff1c1dd80",
-                "reference": "c0ffb850abf1896ae8650522c8c8f4cff1c1dd80",
+                "url": "https://api.github.com/repos/PrestaShop/dashtrends/zipball/e2cbdb088241a17118a8c4424b468a36216f8316",
+                "reference": "e2cbdb088241a17118a8c4424b468a36216f8316",
                 "shasum": ""
             },
             "require": {
@@ -5472,9 +5472,9 @@
             "description": "PrestaShop module dashtrends",
             "homepage": "https://github.com/PrestaShop/dashtrends",
             "support": {
-                "source": "https://github.com/PrestaShop/dashtrends/tree/v2.1.1"
+                "source": "https://github.com/PrestaShop/dashtrends/tree/v2.1.2"
             },
-            "time": "2023-03-24T13:19:08+00:00"
+            "time": "2023-06-19T13:25:37+00:00"
         },
         {
             "name": "prestashop/decimal",

From a43ad054d6a79ae753354aa4066b5c4e6f366091 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Fri, 23 Jun 2023 09:57:49 +0300
Subject: [PATCH 0269/1030]  use full definition instead of alias for
 deprecated service

---
 .../config/services/core/grid/grid_definition_factory.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_definition_factory.yml b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_definition_factory.yml
index 5e3a8b45304aa..f472833931839 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_definition_factory.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_definition_factory.yml
@@ -420,6 +420,12 @@ services:
     public: true
 
   # deprecated services
+  # Alias for this abstract definition causes tests in vendor fail for some reason, so we stick to full definition instead
   prestashop.core.grid.definition.factory.abstract_grid_definition:
-    alias: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
+    class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory'
+    abstract: true
+    arguments:
+      - '@prestashop.core.hook.dispatcher'
+    calls:
+      - [ setTranslator, [ '@translator' ] ]
     deprecated: ~

From 2fd4c47d57b0356480cc4ca1b5b23d9b44f3a6aa Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Thu, 22 Jun 2023 18:58:47 +0300
Subject: [PATCH 0270/1030]  remove cart rule creation legacy step and other
 unused steps

---
 .../CommandHandler/AddCartRuleHandler.php     |   1 -
 .../Context/CartRuleFeatureContext.php        | 157 ---------------
 .../AbstractCartRuleFeatureContext.php        |   1 +
 .../CartRule/CommonCartRuleFeatureContext.php |  44 -----
 .../BackOffice/usage_limit_per_user.feature   |   1 -
 .../cart_rule_country_restriction.feature     |   1 +
 .../Cart/CartRule/FrontOffice/ecotax.feature  |  46 +++--
 .../Scenario/Cart/cart_to_order.feature       |  40 ++--
 .../Order/order_cancel_product.feature        |   7 +-
 .../Scenario/Order/order_cart_rules.feature   |  28 +--
 .../Order/order_ecotax_cartrule.feature       | 109 +++++-----
 .../Order/order_multi_invoices.feature        | 186 +++++++++---------
 tests/Integration/Behaviour/behat.yml         |   1 -
 13 files changed, 231 insertions(+), 391 deletions(-)
 delete mode 100644 tests/Integration/Behaviour/Features/Context/Domain/CartRule/CommonCartRuleFeatureContext.php

diff --git a/src/Adapter/CartRule/CommandHandler/AddCartRuleHandler.php b/src/Adapter/CartRule/CommandHandler/AddCartRuleHandler.php
index 4c22a6f33272d..d47be1e08a0f6 100644
--- a/src/Adapter/CartRule/CommandHandler/AddCartRuleHandler.php
+++ b/src/Adapter/CartRule/CommandHandler/AddCartRuleHandler.php
@@ -68,7 +68,6 @@ public function __construct(
      */
     public function handle(AddCartRuleCommand $command): CartRuleId
     {
-        //@todo: restrictions are missing. We should consider dedicated command for restrictions
         $cartRule = $this->cartRuleRepository->add($this->buildCartRuleFromCommandData($command));
 
         return new CartRuleId((int) $cartRule->id);
diff --git a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
index 48839ce459034..4d76a8a38b7df 100644
--- a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
@@ -31,14 +31,10 @@
 use Behat\Gherkin\Node\TableNode;
 use Cache;
 use CartRule;
-use Configuration;
 use Context;
-use DateInterval;
-use DateTime;
 use Db;
 use PHPUnit\Framework\Assert;
 use PrestaShop\Decimal\DecimalNumber;
-use PrestaShop\PrestaShop\Adapter\CartRule\LegacyDiscountApplicationType;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleValidityException;
 use RuntimeException;
 use Validate;
@@ -102,41 +98,6 @@ public function before(BeforeScenarioScope $scope)
         $this->categoryFeatureContext = $categoryFeatureContext;
     }
 
-    /**
-     * @Given /^there is a cart rule named "(.+)" that applies a percent discount of (\d+\.\d+)% with priority (\d+), quantity of (\d+) and quantity per user (\d+)$/
-     */
-    public function thereIsACartRuleWithNameAndPercentDiscountOf50AndPriorityOfAndQuantityOfAndQuantityPerUserOf($cartRuleName, $percent, $priority, $cartRuleQuantity, $cartRuleQuantityPerUser)
-    {
-        $this->createCartRule($cartRuleName, $percent, 0, $priority, $cartRuleQuantity, $cartRuleQuantityPerUser);
-    }
-
-    protected function createCartRule(
-        $cartRuleName,
-        $percent,
-        $amount,
-        $priority,
-        $cartRuleQuantity,
-        $cartRuleQuantityPerUser
-    ) {
-        $cartRule = new CartRule();
-        $cartRule->reduction_percent = $percent;
-        $cartRule->reduction_amount = $amount;
-        $cartRule->name = [Configuration::get('PS_LANG_DEFAULT') => $cartRuleName];
-        $cartRule->description = $cartRuleName;
-        $cartRule->priority = $priority;
-        $cartRule->quantity = $cartRuleQuantity;
-        $cartRule->quantity_per_user = $cartRuleQuantityPerUser;
-        $now = new DateTime();
-        // sub 1s to avoid bad comparisons with strictly greater than
-        $now->sub(new DateInterval('P2D'));
-        $cartRule->date_from = $now->format('Y-m-d H:i:s');
-        $now->add(new DateInterval('P1Y'));
-        $cartRule->date_to = $now->format('Y-m-d H:i:s');
-        $cartRule->active = true;
-        $cartRule->add();
-        $this->getSharedStorage()->set($cartRuleName, $cartRule->id);
-    }
-
     /**
      * @Given /^cart rule "(.+?)" is restricted to the category "(.+?)" with a quantity of (\d+)$/
      */
@@ -163,28 +124,6 @@ public function cartRuleWithProductRuleRestriction(string $cartRuleName, string
         );
     }
 
-    /**
-     * @Given /^cart rule "(.+)" has a discount code "(.+)"$/
-     */
-    public function cartRuleNamedHasACode($cartRuleName, $cartRuleCode)
-    {
-        $cartRule = $this->loadCartRule($cartRuleName);
-        $cartRule->code = $cartRuleCode;
-        $cartRule->save();
-
-        $this->getSharedStorage()->set($cartRuleCode, (int) $cartRule->id);
-    }
-
-    /**
-     * @Given /^cart rule "(.+)" has no discount code$/
-     */
-    public function cartRuleNamedHasNoCode($cartRuleName)
-    {
-        $cartRule = $this->loadCartRule($cartRuleName);
-        $cartRule->code = '';
-        $cartRule->save();
-    }
-
     /**
      * @Given /^cart rule "(.+)" is restricted to product "(.+)"$/
      * @Given /^cart rule "(.+)" is restricted to product "(.+)" with a quantity of (\d+)$/
@@ -262,37 +201,6 @@ public function cartRuleNamedIsRestrictedToCountryNamed(string $cartRuleName, st
         Cache::clear();
     }
 
-    /**
-     * @Given /^cart rule "(.+)" is restricted on the selection of products$/
-     */
-    public function cartRuleIsRestrictedToSelectionProducts(string $cartRuleName): void
-    {
-        $cartRule = $this->loadCartRule($cartRuleName);
-        $cartRule->reduction_product = LegacyDiscountApplicationType::SELECTED_PRODUCTS;
-        $cartRule->save();
-    }
-
-    /**
-     * @Given /^cart rule "(.+)" is applied on every order$/
-     */
-    public function cartRuleIsRestrictedToEveryOrder($cartRuleName)
-    {
-        $cartRule = $this->loadCartRule($cartRuleName);
-        $cartRule->product_restriction = false;
-        $cartRule->reduction_product = 0;
-        $cartRule->save();
-    }
-
-    /**
-     * @Given /^cart rule "(.+)" is disabled$/
-     */
-    public function cartRuleIsDisabled($cartRuleName)
-    {
-        $cartRule = $this->loadCartRule($cartRuleName);
-        $cartRule->active = false;
-        $cartRule->save();
-    }
-
     /**
      * @When /^I enable cart rule "(.+)"$/
      */
@@ -303,60 +211,6 @@ public function enableCartRule($cartRuleName)
         $cartRule->save();
     }
 
-    /**
-     * @Given /^cart rule "(.+)" does not apply to already discounted products$/
-     */
-    public function cartRuleDoesNotApplyToDiscountedProduct($cartRuleName)
-    {
-        $cartRule = $this->loadCartRule($cartRuleName);
-        $cartRule->reduction_exclude_special = true;
-        $cartRule->save();
-    }
-
-    /**
-     * @Given /^cart rule "(.+)" offers a gift product "(.+)"$/
-     */
-    public function cartRuleNamedHasAGiftProductNamed($cartRuleName, $productName)
-    {
-        $this->productFeatureContext->checkProductWithNameExists($productName);
-        $cartRule = $this->loadCartRule($cartRuleName);
-        $cartRule->gift_product = $this->productFeatureContext->getProductWithName($productName)->id;
-        $cartRule->save();
-    }
-
-    /**
-     * @Given /^cart rule "(.+)" offers free shipping$/
-     */
-    public function cartRuleOffersFreeShipping($cartRuleName)
-    {
-        $cartRule = $this->loadCartRule($cartRuleName);
-        $cartRule->free_shipping = true;
-        $cartRule->save();
-    }
-
-    /**
-     * @Given /^cart rule "(.+)" applies discount only when cart total is above (\d+\.\d+)$/
-     */
-    public function cartRuleAppliesBetween($cartRuleName, $min)
-    {
-        $cartRule = $this->loadCartRule($cartRuleName);
-        $cartRule->minimum_amount = $min;
-        $cartRule->save();
-    }
-
-    /**
-     * @Then /^cart rule "(.+)" cannot be applied to my cart$/
-     */
-    public function cartRuleNamedCannotBeAppliedToMyCart($cartRuleName)
-    {
-        $cartRule = $this->loadCartRule($cartRuleName);
-        $result = $cartRule->checkValidity(\Context::getContext(), false, false);
-
-        if ($result) {
-            throw new \RuntimeException(sprintf('Expects false, got %s instead', $result));
-        }
-    }
-
     /**
      * @Then /^cart rule "(.+)" can be applied to my cart$/
      */
@@ -424,17 +278,6 @@ public function assertCartRuleValidationError(string $expectedMessage): void
         );
     }
 
-    /**
-     * @When /^at least one cart rule applies today for customer with id (\d+)$/
-     */
-    public function someCartRulesExistTodayForCustomerWithId($customerId)
-    {
-        $result = CartRule::haveCartRuleToday($customerId);
-        if (!$result) {
-            throw new \RuntimeException(sprintf('Expects true, got %s instead', $result));
-        }
-    }
-
     /**
      * @Given discount code :cartRuleReference is not applied to my cart
      *
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
index 09e53f2d2d4cd..92735e557a743 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
@@ -75,6 +75,7 @@ public function createCartRuleWithReference(string $cartRuleReference, array $da
         if (isset($data['total_quantity'])) {
             $command->setTotalQuantity((int) $data['total_quantity']);
         }
+
         if (isset($data['quantity_per_user'])) {
             $command->setQuantityPerUser((int) $data['quantity_per_user']);
         }
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CommonCartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CommonCartRuleFeatureContext.php
deleted file mode 100644
index ee80aa2feb06d..0000000000000
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CommonCartRuleFeatureContext.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-declare(strict_types=1);
-
-namespace Tests\Integration\Behaviour\Features\Context\Domain\CartRule;
-
-use Tests\Resources\DatabaseDump;
-
-class CommonCartRuleFeatureContext extends AbstractCartRuleFeatureContext
-{
-    /**
-     * @BeforeScenario @restore-cart-rules-before-scenario
-     *
-     * @return void
-     */
-    public static function restoreCartRules(): void
-    {
-        DatabaseDump::restoreMatchingTables('^cart_rule.*^');
-    }
-}
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/usage_limit_per_user.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/usage_limit_per_user.feature
index 3c71779460532..ecee1564b70bb 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/usage_limit_per_user.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/BackOffice/usage_limit_per_user.feature
@@ -30,7 +30,6 @@ Feature: Apply cart rule to cart from Back Office (BO)
     Then I should have 1 different products in my cart
     And cart rule "limitedCartRule" can be applied to my cart
     When I use the discount "limitedCartRule"
-    Then at least one cart rule applies today for customer with id 0
     And I should have 1 products in my cart
     When I add order "bo_order1" with the following details:
       | cart                | dummy_cart                 |
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Restrictions/cart_rule_country_restriction.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Restrictions/cart_rule_country_restriction.feature
index 3af3fa79372c3..92931ab088d4f 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Restrictions/cart_rule_country_restriction.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Restrictions/cart_rule_country_restriction.feature
@@ -44,6 +44,7 @@ Feature: Cart calculation with country specific cart rules
     And cart shipping fees should be 14.3 tax included
     And my cart total should be 96.6 tax included
 
+  @restore-cart-rules-before-scenario
   Scenario: Cart with a Product And adress not restricted by cart rule
     When I select address "address-us" in my cart
     And I select carrier "carrier1" in my cart
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/ecotax.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/ecotax.feature
index 0217ded748152..864d1c7829ac7 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/ecotax.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/ecotax.feature
@@ -21,41 +21,57 @@ Feature: Cart rule (percent) calculation with one cart rule
     And there is a product in the catalog named "product_with_ecotax" with a price of 10.000 and 1000 items in stock
     And the product "product_with_ecotax" ecotax is 2.00
     And product "product_with_ecotax" belongs to tax group "taxRule4Percent"
-    And there is a cart rule "cartRuleFiftyPercent" with following properties:
-      | name[en-US]                  | cartRuleFiftyPercent |
-      | total_quantity               | 1000                 |
-      | quantity_per_user            | 1000                 |
-      | priority                     | 2                    |
-      | free_shipping                | false                |
-      | code                         | cartRuleFiftyPercent |
-      | discount_percentage          | 50                   |
-      | apply_to_discounted_products | true                 |
-      | discount_application_type    | selected_products    |
 
+  @restore-cart-rules-after-scenario
   Scenario:
-    Given cart rule "cartRuleFiftyPercent" is restricted to product "product_without_ecotax"
+    And there is a cart rule "cartRuleFiftyPercent" with following properties:
+      | name[en-US]                  | cartRuleFiftyPercent   |
+      | priority                     | 2                      |
+      | free_shipping                | false                  |
+      | code                         | cartRuleFiftyPercent   |
+      | discount_percentage          | 50                     |
+      | apply_to_discounted_products | true                   |
+      | discount_application_type    | specific_product       |
+      | discount_product             | product_without_ecotax |
     And I select address "address1" in my cart
     When I add 1 item of product "product_without_ecotax" in my cart
     Then my cart total should be 10.400 tax included
     And my cart total should be 10.000 tax excluded
-    And I use the discount "cartRuleFiftyPercent"
+    And I apply the voucher code "cartRuleFiftyPercent"
     And my cart total should be 5.200 tax included
     And my cart total should be 5.000 tax excluded
 
+  @restore-cart-rules-after-scenario
   Scenario:
-    Given cart rule "cartRuleFiftyPercent" is restricted to product "product_with_ecotax"
+    And there is a cart rule "cartRuleFiftyPercent" with following properties:
+      | name[en-US]                  | cartRuleFiftyPercent |
+      | priority                     | 2                    |
+      | free_shipping                | false                |
+      | code                         | cartRuleFiftyPercent |
+      | discount_percentage          | 50                   |
+      | apply_to_discounted_products | true                 |
+      | discount_application_type    | specific_product     |
+      | discount_product             | product_with_ecotax  |
     And I select address "address1" in my cart
     When I add 1 item of product "product_with_ecotax" in my cart
     Then my cart total should be 12.400 tax included
     And my cart total should be 12.000 tax excluded
-    And I use the discount "cartRuleFiftyPercent"
+    And I apply the voucher code "cartRuleFiftyPercent"
     And my cart total should be 6.200 tax included
     And my cart total should be 6.000 tax excluded
     And I should have a voucher named "cartRuleFiftyPercent" with 6.2 of discount
 
   Scenario:
+    And there is a cart rule "cartRuleFiftyPercent" with following properties:
+      | name[en-US]                  | cartRuleFiftyPercent |
+      | priority                     | 2                    |
+      | free_shipping                | false                |
+      | code                         | cartRuleFiftyPercent |
+      | discount_percentage          | 50                   |
+      | apply_to_discounted_products | true                 |
+      | discount_application_type    | specific_product     |
+      | discount_product             | product_with_ecotax  |
     Given Ecotax belongs to tax group "taxRule4Percent"
-    And cart rule "cartRuleFiftyPercent" is restricted to product "product_with_ecotax"
     And I select address "address1" in my cart
     When I add 1 item of product "product_with_ecotax" in my cart
     And my cart total should be precisely 12.000 tax excluded
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/cart_to_order.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/cart_to_order.feature
index 10e9fe701ab8d..0c024d04f731f 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/cart_to_order.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/cart_to_order.feature
@@ -11,13 +11,17 @@ Feature: Check cart to order data copy
     And there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
     And there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
     And there is a product in the catalog named "product4" with a price of 35.567 and 1000 items in stock
+    And there is a cart rule "cartrule1" with following properties:
+      | name[en-US]         | cartrule1 |
+      | priority            | 1         |
+      | free_shipping       | false     |
+      | code                | foo1      |
+      | discount_percentage | 50        |
 
   Scenario: 1 product in cart, 1 cart rule
     Given I have an empty default cart
     Given email sending is disabled
     Given shipping handling fees are set to 2.0
-    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule1" has a discount code "foo1"
     Given there is a zone named "zone1"
     Given there is a country named "country1" and iso code "FR" in zone "zone1"
     Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
@@ -45,14 +49,17 @@ Feature: Check cart to order data copy
     Then current cart order should have a discount in position 1 with an amount of 10.300000 tax included and 9.905000 tax excluded
     Then customer "customer1" should have 0 cart rules that apply to him
 
+  @restore-cart-rules-after-scenario
   Scenario: 1 product in cart, 2 cart rules
     Given I have an empty default cart
     Given email sending is disabled
     Given shipping handling fees are set to 2.0
-    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule1" has a discount code "foo1"
-    Given there is a cart rule named "cartrule2" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule2" has a discount code "foo2"
+    And there is a cart rule "cartrule2" with following properties:
+      | name[en-US]         | cartrule2 |
+      | priority            | 2         |
+      | free_shipping       | false     |
+      | code                | foo2      |
+      | discount_percentage | 50        |
     Given there is a zone named "zone1"
     Given there is a country named "country1" and iso code "FR" in zone "zone1"
     Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
@@ -86,8 +93,6 @@ Feature: Check cart to order data copy
     Given I have an empty default cart
     Given email sending is disabled
     Given shipping handling fees are set to 2.0
-    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule1" has a discount code "foo1"
     Given there is a zone named "zone1"
     Given there is a country named "country1" and iso code "FR" in zone "zone1"
     Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
@@ -123,10 +128,12 @@ Feature: Check cart to order data copy
     Given I have an empty default cart
     Given email sending is disabled
     Given shipping handling fees are set to 2.0
-    Given there is a cart rule named "cartrule1" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule1" has a discount code "foo1"
-    Given there is a cart rule named "cartrule2" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
-    Given cart rule "cartrule2" has a discount code "foo2"
+    Given there is a cart rule "cartrule2" with following properties:
+      | name[en-US]         | cartrule2 |
+      | priority            | 2         |
+      | free_shipping       | false     |
+      | code                | foo2      |
+      | discount_percentage | 50        |
     Given there is a zone named "zone1"
     Given there is a country named "country1" and iso code "FR" in zone "zone1"
     Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
@@ -171,8 +178,6 @@ Feature: Check cart to order data copy
       | discount_currency     | usd       |
       | discount_includes_tax | false     |
       | code                  | foo5      |
-      | total_quantity        | 1000      |
-      | quantity_per_user     | 1000      |
     Given there is a zone named "zone1"
     Given there is a country named "country1" and iso code "FR" in zone "zone1"
     Given there is a state named "state1" with iso code "TEST-1" in country "country1" and zone "zone1"
@@ -201,6 +206,7 @@ Feature: Check cart to order data copy
     Then customer "customer1" should have 1 cart rules that apply to him
     Then cart rule for customer "customer1" in position 1 should apply a discount of 480.190000
 
+  @restore-cart-rules-after-scenario
   Scenario: 1 product in cart, 1 cart rule offering free gift
     Given I have an empty default cart
     Given email sending is disabled
@@ -209,8 +215,6 @@ Feature: Check cart to order data copy
       | name[en-US]       | cartrule13 |
       | priority          | 13         |
       | free_shipping     | false      |
-      | total_quantity    | 1000       |
-      | quantity_per_user | 1000       |
       | gift_product      | product4   |
       | code              | foo13      |
     Given there is a zone named "zone1"
@@ -241,18 +245,14 @@ Feature: Check cart to order data copy
     Then current cart order should have a discount in position 1 with an amount of 36.989680 tax included and 35.567000 tax excluded
     Then customer "customer1" should have 0 cart rules that apply to him
 
-  @restore-cart-rules-before-scenario
   Scenario: 2 product in cart, 1 cart rule offering free gift, offering same product as already existing in cart
     Given I have an empty default cart
     Given email sending is disabled
     Given shipping handling fees are set to 2.0
-    # @todo: should be moved to background, but now every time product is created in background its id changes, so that needs to be resolved first
     Given there is a cart rule cartrule13 with following properties:
       | name[en-US]       | cartrule13 |
       | priority          | 13         |
       | free_shipping     | false      |
-      | total_quantity    | 1000       |
-      | quantity_per_user | 1000       |
       | gift_product      | product4   |
       | code              | foo13      |
     Given there is a zone named "zone1"
diff --git a/tests/Integration/Behaviour/Features/Scenario/Order/order_cancel_product.feature b/tests/Integration/Behaviour/Features/Scenario/Order/order_cancel_product.feature
index 05c1050afcd35..b74112caca706 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Order/order_cancel_product.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Order/order_cancel_product.feature
@@ -346,8 +346,11 @@ Feature: Cancel Order Product from Back Office (BO)
       | total_shipping_tax_incl  | 7.42   |
     Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
     And there is a product in the catalog named "Test Product Cart Rule On Order" with a price of 15.0 and 100 items in stock
-    Given there is a cart rule named "CartRuleAmountOnWholeOrder" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    And cart rule "CartRuleAmountOnWholeOrder" is applied on every order
+    And there is a cart rule CartRuleAmountOnWholeOrder with following properties:
+      | name[en-US]               | CartRuleAmountOnWholeOrder |
+      | priority                  | 1                          |
+      | discount_percentage       | 50                         |
+      | discount_application_type | order_without_shipping     |
     When I add products to order "bo_order_cancel_product" with new invoice and the following products details:
       | name   | Test Product Cart Rule On Order |
       | amount | 1                               |
diff --git a/tests/Integration/Behaviour/Features/Scenario/Order/order_cart_rules.feature b/tests/Integration/Behaviour/Features/Scenario/Order/order_cart_rules.feature
index 776fff91fb25f..057d3b9006452 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Order/order_cart_rules.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Order/order_cart_rules.feature
@@ -403,8 +403,6 @@ Feature: Order from Back Office (BO)
       | free_shipping             | false                              |
       | discount_percentage       | 50                                 |
       | discount_application_type | specific_product                   |
-      | quantity                  | 1000                               |
-      | quantity_per_user         | 1000                               |
       | discount_product          | Test Product With Percent Discount |
     And cart rule "CartRulePercentForSpecificProduct" is restricted to product "Test Product With Percent Discount"
     When I add products to order "bo_order1" with new invoice and the following products details:
@@ -447,7 +445,6 @@ Feature: Order from Back Office (BO)
     When I remove product "Test Product With Percent Discount" from order "bo_order1"
     Then order "bo_order1" should have 2 products in total
     Then order "bo_order1" should contain 0 product "Test Product With Percent Discount"
-    # @todo: for some reason it still has 2 rules. The one that shouldn't exist (because product was deleted) is CartRulePercentForSpecificProduct, but after product removal, this cart rule value in order_cart_rule becomes 0 (instead of removing the cart rule completely). HOW THE F* IT WORKED BEFORE?
     Then order "bo_order1" should have 1 cart rule
     Then order "bo_order1" should have cart rule "discount five-percent" with amount "$1.19"
     Then order "bo_order1" should have following details:
@@ -480,17 +477,12 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
     And there is a product in the catalog named "Test Product With Percent Discount" with a price of 350.00 and 100 items in stock
-    Given there is a cart rule named "CartRulePercentForSpecificProduct" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    And cart rule "CartRulePercentForSpecificProduct" is restricted to product "Test Product With Percent Discount"
     And there is a cart rule "CartRulePercentForSpecificProduct" with following properties:
       | name[en-US]               | CartRulePercentForSpecificProduct  |
       | priority                  | 1                                  |
       | free_shipping             | false                              |
       | discount_percentage       | 50                                 |
       | discount_application_type | specific_product                   |
-      | discount_application_type | specific_product                   |
-      | total_quantity            | 1000                               |
-      | quantity_per_user         | 1000                               |
       | discount_product          | Test Product With Percent Discount |
     When I add products to order "bo_order1" with new invoice and the following products details:
       | name   | Test Product With Percent Discount |
@@ -565,7 +557,12 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
     And there is a product in the catalog named "Test Product With Percent Discount" with a price of 350.00 and 100 items in stock
-    Given there is a cart rule named "CartRulePercentForSpecificProduct" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
+    And there is a cart rule "CartRulePercentForSpecificProduct" with following properties:
+      | name[en-US]         | CartRulePercentForSpecificProduct |
+      | priority            | 1                                 |
+      | free_shipping       | false                             |
+      | discount_percentage | 50                                |
+    # @todo: this seems to be a restriction based scenario (not specific_product), so the following step should be replaced when SetCartRuleProductRestrictions cqrs command is done
     And cart rule "CartRulePercentForSpecificProduct" is restricted to product "Test Product With Percent Discount"
     When I add products to order "bo_order1" with new invoice and the following products details:
       | name   | Test Product With Percent Discount |
@@ -672,8 +669,13 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_excl  | 7.0    |
       | total_shipping_tax_incl  | 7.42   |
     And there is a product in the catalog named "Test Product With Percent Discount" with a price of 350.00 and 100 items in stock
-    Given there is a cart rule named "CartRulePercentForSpecificProduct" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
-    And cart rule "CartRulePercentForSpecificProduct" is restricted to product "Test Product With Percent Discount"
+    And there is a cart rule "CartRulePercentForSpecificProduct1" with following properties:
+      | name[en-US]               | CartRulePercentForSpecificProduct1 |
+      | discount_percentage       | 50                                 |
+      | priority                  | 1                                  |
+      | free_shipping             | false                              |
+      | discount_application_type | specific_product                   |
+      | discount_product          | Test Product With Percent Discount |
     When I add products to order "bo_order1" with new invoice and the following products details:
       | name   | Test Product With Percent Discount |
       | amount | 1                                  |
@@ -682,7 +684,7 @@ Feature: Order from Back Office (BO)
     Then order "bo_order1" should contain 1 product "Test Product With Percent Discount"
     Then order "bo_order1" should have 2 cart rule
     Then order "bo_order1" should have cart rule "discount five-percent" with amount "$18.69"
-    Then order "bo_order1" should have cart rule "CartRulePercentForSpecificProduct" with amount "$166.25"
+    Then order "bo_order1" should have cart rule "CartRulePercentForSpecificProduct1" with amount "$166.25"
     Then order "bo_order1" should have following details:
       | total_products           | 373.80 |
       | total_products_wt        | 396.23 |
@@ -696,7 +698,7 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_incl  | 7.42   |
     When I remove cart rule "discount five-percent" from order "bo_order1"
     Then order "bo_order1" should have 1 cart rule
-    And order "bo_order1" should have cart rule "CartRulePercentForSpecificProduct" with amount "$175.00"
+    And order "bo_order1" should have cart rule "CartRulePercentForSpecificProduct1" with amount "$175.00"
     And order "bo_order1" should have following details:
       | total_products           | 373.80 |
       | total_products_wt        | 396.23 |
diff --git a/tests/Integration/Behaviour/Features/Scenario/Order/order_ecotax_cartrule.feature b/tests/Integration/Behaviour/Features/Scenario/Order/order_ecotax_cartrule.feature
index 26b490c5a1ee3..b93e59929bf8c 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Order/order_ecotax_cartrule.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Order/order_ecotax_cartrule.feature
@@ -13,12 +13,12 @@ Feature: Ecotax for Order in Back Office (BO)
     And country "FR" is enabled
     ## Create Tax
     And I add new tax "fr-tax-6" with following properties:
-      | name         | FR Tax (6%)   |
-      | rate         | 6             |
-      | is_enabled   | true          |
+      | name       | FR Tax (6%) |
+      | rate       | 6           |
+      | is_enabled | true        |
     And I add the tax rule group "fr-tax-6-group" for the tax "fr-tax-6" with the following conditions:
-      | name         | FR Tax (6%)   |
-      | country      | FR            |
+      | name    | FR Tax (6%) |
+      | country | FR          |
     ## Create Product
     And there is a product in the catalog named "Free Product" with a price of 0.0 and 100 items in stock
     Then the available stock for product "Free Product" should be 100
@@ -51,16 +51,23 @@ Feature: Ecotax for Order in Back Office (BO)
       | payment module name | dummy_payment              |
       | status              | Awaiting bank wire payment |
 
+  @restore-cart-rules-after-scenario
   Scenario: Add product (without ecotax) to an Order
     ## Set Cart Rule
-    When there is a cart rule named "cartRuleFiftyPercent" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
+    And there is a cart rule "cartRuleFiftyPercent" with following properties:
+      | name[en-US]               | cartRuleFiftyPercent |
+      | discount_percentage       | 50                   |
+      | priority                  | 2                    |
+      | free_shipping             | false                |
+      | discount_application_type | specific_product     |
+      | discount_product          | Test Ecotax Product  |
     And cart rule "cartRuleFiftyPercent" is restricted to product "Test Ecotax Product"
     When I set tax rule group "fr-tax-6-group" to product "Test Ecotax Product"
     And I add products to order "bo_order1" with new invoice and the following products details:
-      | name          | Test Ecotax Product |
-      | amount        | 2                   |
-      | price         | 15.00               |
-      | price_tax_incl| 15.90               |
+      | name           | Test Ecotax Product |
+      | amount         | 2                   |
+      | price          | 15.00               |
+      | price_tax_incl | 15.90               |
     ## Check informations
     Then order "bo_order1" should contain 2 products "Test Ecotax Product"
     And the available stock for product "Test Ecotax Product" should be 98
@@ -68,24 +75,24 @@ Feature: Ecotax for Order in Back Office (BO)
     And order "bo_order1" should have 0 invoices
     And order "bo_order1" should have 1 cart rule
     And product "Test Ecotax Product" in order "bo_order1" has following details:
-      | product_quantity            | 2     |
-      | ecotax                      | 0.00  |
-      | product_price               | 15.00 |
-      | original_product_price      | 15.00 |
-      | unit_price_tax_excl         | 15.00 |
-      | unit_price_tax_incl         | 15.90 |
-      | total_price_tax_excl        | 30.00 |
-      | total_price_tax_incl        | 31.80 |
+      | product_quantity       | 2     |
+      | ecotax                 | 0.00  |
+      | product_price          | 15.00 |
+      | original_product_price | 15.00 |
+      | unit_price_tax_excl    | 15.00 |
+      | unit_price_tax_incl    | 15.90 |
+      | total_price_tax_excl   | 30.00 |
+      | total_price_tax_incl   | 31.80 |
     When I generate invoice for "bo_order1" order
     And the first invoice from order "bo_order1" should have following details:
-      | total_products              | 30.00 |
-      | total_products_wt           | 31.80 |
-      | total_discount_tax_excl     | 15.00 |
-      | total_discount_tax_incl     | 15.90 |
-      | total_paid_tax_excl         | 22.00 |
-      | total_paid_tax_incl         | 23.32 |
-      | total_shipping_tax_excl     | 7.0   |
-      | total_shipping_tax_incl     | 7.42  |
+      | total_products          | 30.00 |
+      | total_products_wt       | 31.80 |
+      | total_discount_tax_excl | 15.00 |
+      | total_discount_tax_incl | 15.90 |
+      | total_paid_tax_excl     | 22.00 |
+      | total_paid_tax_incl     | 23.32 |
+      | total_shipping_tax_excl | 7.0   |
+      | total_shipping_tax_incl | 7.42  |
     ## Reset
     When I remove product "Test Ecotax Product" from order "bo_order1"
     Then order "bo_order1" should have 1 products in total
@@ -93,16 +100,24 @@ Feature: Ecotax for Order in Back Office (BO)
 
   Scenario: Add product (with ecotax) to an Order
     ## Set Cart Rule
-    When there is a cart rule named "cartRuleFiftyPercent" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
+#    When there is a cart rule named "cartRuleFiftyPercent" that applies a percent discount of 50.0% with priority 2, quantity of 1000 and quantity per user 1000
+#    And cart rule "cartRuleFiftyPercent" is restricted to product "Test Ecotax Product"
+    And there is a cart rule "cartRuleFiftyPercent" with following properties:
+      | name[en-US]               | cartRuleFiftyPercent |
+      | discount_percentage       | 50                   |
+      | priority                  | 2                    |
+      | free_shipping             | false                |
+      | discount_application_type | specific_product     |
+      | discount_product          | Test Ecotax Product  |
     And cart rule "cartRuleFiftyPercent" is restricted to product "Test Ecotax Product"
     ## Set EcoTax
     When the product "Test Ecotax Product" ecotax is 5.12
     And I set tax rule group "fr-tax-6-group" to product "Test Ecotax Product"
     And I add products to order "bo_order1" with new invoice and the following products details:
-      | name          | Test Ecotax Product |
-      | amount        | 2                   |
-      | price         | 20.12               |
-      | price_tax_incl| 21.02               |
+      | name           | Test Ecotax Product |
+      | amount         | 2                   |
+      | price          | 20.12               |
+      | price_tax_incl | 21.02               |
     ## Check informations
     Then the ecotax of the product "Test Ecotax Product" should be 5.12
     And product "Test Ecotax Product" price is 15.00
@@ -112,30 +127,30 @@ Feature: Ecotax for Order in Back Office (BO)
     And order "bo_order1" should have 0 invoices
     And order "bo_order1" should have 1 cart rule
     And product "Test Ecotax Product" in order "bo_order1" has following details:
-      | product_quantity            | 2     |
-      | ecotax                      | 5.12  |
-      | product_price               | 20.12 |
+      | product_quantity       | 2     |
+      | ecotax                 | 5.12  |
+      | product_price          | 20.12 |
       # 20.12 = 15 + 5.12
-      | original_product_price      | 20.12 |
+      | original_product_price | 20.12 |
       # 20.12 = 15 + 5.12
-      | unit_price_tax_excl         | 20.12 |
+      | unit_price_tax_excl    | 20.12 |
       # 20.12 = 15 + 5.12
-      | unit_price_tax_incl         | 21.02 |
+      | unit_price_tax_incl    | 21.02 |
       # 21.02 = (15 + 6%) + 5.12
-      | total_price_tax_excl        | 40.24 |
+      | total_price_tax_excl   | 40.24 |
       # 40.24 = 20.12 * 2
-      | total_price_tax_incl        | 42.04 |
+      | total_price_tax_incl   | 42.04 |
       # 42.04 = 21.02 * 2
     When I generate invoice for "bo_order1" order
     And the first invoice from order "bo_order1" should have following details:
-      | total_products              | 40.24 |
-      | total_products_wt           | 42.04 |
-      | total_discount_tax_excl     | 20.12 |
-      | total_discount_tax_incl     | 21.02 |
-      | total_paid_tax_excl         | 27.12 |
-      | total_paid_tax_incl         | 28.44 |
-      | total_shipping_tax_excl     | 7.0   |
-      | total_shipping_tax_incl     | 7.42  |
+      | total_products          | 40.24 |
+      | total_products_wt       | 42.04 |
+      | total_discount_tax_excl | 20.12 |
+      | total_discount_tax_incl | 21.02 |
+      | total_paid_tax_excl     | 27.12 |
+      | total_paid_tax_incl     | 28.44 |
+      | total_shipping_tax_excl | 7.0   |
+      | total_shipping_tax_incl | 7.42  |
     # Reset
     When the product "Test Ecotax Product" ecotax is 0.00
     Then the ecotax of the product "Test Ecotax Product" should be 0.00
diff --git a/tests/Integration/Behaviour/Features/Scenario/Order/order_multi_invoices.feature b/tests/Integration/Behaviour/Features/Scenario/Order/order_multi_invoices.feature
index 684a716d8ab0f..f0962ff098dca 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Order/order_multi_invoices.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Order/order_multi_invoices.feature
@@ -32,21 +32,21 @@ Feature: Order from Back Office (BO)
     When I generate invoice for "bo_order1" order
     Then order "bo_order1" should have 1 invoice
     When I add products to order "bo_order1" to the first invoice and the following products details:
-      | name          | Test Product A |
-      | amount        | 3              |
-      | price         | 15             |
+      | name   | Test Product A |
+      | amount | 3              |
+      | price  | 15             |
     And I add products to order "bo_order1" with new invoice and the following products details:
-      | name          | Test Product A |
-      | amount        | 2              |
-      | price         | 15             |
+      | name   | Test Product A |
+      | amount | 2              |
+      | price  | 15             |
     And I add products to order "bo_order1" to the second invoice and the following products details:
-      | name          | Test Product B |
-      | amount        | 1              |
-      | price         | 10             |
+      | name   | Test Product B |
+      | amount | 1              |
+      | price  | 10             |
     And I add products to order "bo_order1" with new invoice and the following products details:
-      | name          | Test Product B |
-      | amount        | 5              |
-      | price         | 10             |
+      | name   | Test Product B |
+      | amount | 5              |
+      | price  | 10             |
     Then order "bo_order1" should have 3 invoices
     And order "bo_order1" should have 13 products in total
     And order "bo_order1" should contain 2 products "Mug The best is yet to come"
@@ -98,7 +98,7 @@ Feature: Order from Back Office (BO)
 #      | total_shipping_tax_excl  | 21.0   |
 #      | total_shipping_tax_incl  | 22.26  |
     And order "bo_order1" carrier should have following details:
-      | weight                 | 0.600 |
+      | weight | 0.600 |
 #      | shipping_cost_tax_excl | 21.00 |
 #      | shipping_cost_tax_incl | 22.26 |
 
@@ -106,13 +106,13 @@ Feature: Order from Back Office (BO)
     When I generate invoice for "bo_order1" order
     Then order "bo_order1" should have 1 invoice
     And I add products to order "bo_order1" with new invoice and the following products details:
-      | name          | Test Product A |
-      | amount        | 2              |
-      | price         | 15             |
+      | name   | Test Product A |
+      | amount | 2              |
+      | price  | 15             |
     And I add products to order "bo_order1" to the second invoice and the following products details:
-      | name          | Test Product B |
-      | amount        | 1              |
-      | price         | 10             |
+      | name   | Test Product B |
+      | amount | 1              |
+      | price  | 10             |
     Then order "bo_order1" should have 2 invoices
     And order "bo_order1" should have 5 products in total
     And order "bo_order1" should contain 2 products "Mug The best is yet to come"
@@ -153,13 +153,13 @@ Feature: Order from Back Office (BO)
 #      | total_shipping_tax_excl  | 14.0  |
 #      | total_shipping_tax_incl  | 14.84 |
     And order "bo_order1" carrier should have following details:
-      | weight                 | 0.600 |
+      | weight | 0.600 |
 #      | shipping_cost_tax_excl | 14.00 |
 #      | shipping_cost_tax_incl | 14.84 |
     When I add discount to order "bo_order1" on second invoice and following details:
-      | name      | discount amount |
-      | type      | amount          |
-      | value     | 5.50            |
+      | name  | discount amount |
+      | type  | amount          |
+      | value | 5.50            |
     Then the first invoice from order "bo_order1" should have following details:
       | total_products          | 23.800 |
       | total_products_wt       | 25.230 |
@@ -194,17 +194,17 @@ Feature: Order from Back Office (BO)
     When I generate invoice for "bo_order1" order
     Then order "bo_order1" should have 1 invoice
     And I add products to order "bo_order1" with new invoice and the following products details:
-      | name          | Test Product A |
-      | amount        | 2              |
-      | price         | 15             |
+      | name   | Test Product A |
+      | amount | 2              |
+      | price  | 15             |
     And I add products to order "bo_order1" to the second invoice and the following products details:
-      | name          | Test Product B |
-      | amount        | 3              |
-      | price         | 10             |
+      | name   | Test Product B |
+      | amount | 3              |
+      | price  | 10             |
     And I add products to order "bo_order1" with new invoice and the following products details:
-      | name          | Test Product B |
-      | amount        | 5              |
-      | price         | 10             |
+      | name   | Test Product B |
+      | amount | 5              |
+      | price  | 10             |
     Then order "bo_order1" should have 3 invoices
     And order "bo_order1" should have 12 products in total
     And order "bo_order1" should contain 2 products "Mug The best is yet to come"
@@ -255,17 +255,17 @@ Feature: Order from Back Office (BO)
 #      | total_shipping_tax_excl  | 21.0   |
 #      | total_shipping_tax_incl  | 22.26  |
     And order "bo_order1" carrier should have following details:
-      | weight                 | 0.600 |
+      | weight | 0.600 |
 #      | shipping_cost_tax_excl | 21.00 |
 #      | shipping_cost_tax_incl | 22.26 |
     When I add discount to order "bo_order1" on third invoice and following details:
-      | name      | discount fifty-fifty |
-      | type      | percent              |
-      | value     | 50                   |
+      | name  | discount fifty-fifty |
+      | type  | percent              |
+      | value | 50                   |
     When I add discount to order "bo_order1" on second invoice and following details:
-      | name      | discount amount |
-      | type      | amount          |
-      | value     | 5.50            |
+      | name  | discount amount |
+      | type  | amount          |
+      | value | 5.50            |
     Then the first invoice from order "bo_order1" should have following details:
       | total_products          | 23.800 |
       | total_products_wt       | 25.230 |
@@ -276,8 +276,8 @@ Feature: Order from Back Office (BO)
       | total_shipping_tax_excl | 7.0    |
       | total_shipping_tax_incl | 7.42   |
     And the second invoice from order "bo_order1" should have following details:
-      | total_products          | 60.000 |
-      | total_products_wt       | 63.600 |
+      | total_products    | 60.000 |
+      | total_products_wt | 63.600 |
 #      | total_discount_tax_excl | 5.19   |
 #      | total_discount_tax_incl | 5.50   |
 #      | total_paid_tax_excl     | 61.81  |
@@ -285,8 +285,8 @@ Feature: Order from Back Office (BO)
 #      | total_shipping_tax_excl | 7.0    |
 #      | total_shipping_tax_incl | 7.42   |
     And the third invoice from order "bo_order1" should have following details:
-      | total_products          | 50.000 |
-      | total_products_wt       | 53.000 |
+      | total_products    | 50.000 |
+      | total_products_wt | 53.000 |
 #      | total_discount_tax_excl | 25.00  |
 #      | total_discount_tax_incl | 26.50  |
 #      | total_paid_tax_excl     | 32.00  |
@@ -294,14 +294,14 @@ Feature: Order from Back Office (BO)
 #      | total_shipping_tax_excl | 7.0    |
 #      | total_shipping_tax_incl | 7.42   |
     And order "bo_order1" should have following details:
-      | total_products           | 133.80 |
-      | total_products_wt        | 141.83 |
+      | total_products    | 133.80 |
+      | total_products_wt | 141.83 |
 #      | total_discounts_tax_excl | 30.19  |
 #      | total_discounts_tax_incl | 32.00  |
 #      | total_paid_tax_excl      | 124.61 |
 #      | total_paid_tax_incl      | 132.09 |
 #      | total_paid               | 132.09 |
-      | total_paid_real          | 0.0    |
+      | total_paid_real   | 0.0    |
 #      | total_shipping_tax_excl  | 21.0   |
 #      | total_shipping_tax_incl  | 22.26  |
 
@@ -309,13 +309,13 @@ Feature: Order from Back Office (BO)
     When I generate invoice for "bo_order1" order
     Then order "bo_order1" should have 1 invoice
     And I add products to order "bo_order1" with new invoice and the following products details:
-      | name          | Test Product A |
-      | amount        | 2              |
-      | price         | 15             |
+      | name   | Test Product A |
+      | amount | 2              |
+      | price  | 15             |
     And I add products to order "bo_order1" to the second invoice and the following products details:
-      | name          | Test Product B |
-      | amount        | 1              |
-      | price         | 10             |
+      | name   | Test Product B |
+      | amount | 1              |
+      | price  | 10             |
     Then order "bo_order1" should have 2 invoices
     And order "bo_order1" should have 5 products in total
     And order "bo_order1" should contain 2 products "Mug The best is yet to come"
@@ -356,12 +356,12 @@ Feature: Order from Back Office (BO)
 #      | total_shipping_tax_excl  | 14.0  |
 #      | total_shipping_tax_incl  | 14.84 |
     And order "bo_order1" carrier should have following details:
-      | weight                 | 0.600 |
+      | weight | 0.600 |
 #      | shipping_cost_tax_excl | 14.00 |
 #      | shipping_cost_tax_incl | 14.84 |
     When I add discount to order "bo_order1" on second invoice and following details:
-      | name      | discount shipping |
-      | type      | free_shipping     |
+      | name | discount shipping |
+      | type | free_shipping     |
     Then the first invoice from order "bo_order1" should have following details:
       | total_products          | 23.800 |
       | total_products_wt       | 25.230 |
@@ -393,24 +393,30 @@ Feature: Order from Back Office (BO)
 #      | total_shipping_tax_incl  | 14.84 |
     #todo: should the OrderCarrier values count the shipping discount and be only 7.0 ?
     And order "bo_order1" carrier should have following details:
-      | weight                 | 0.600 |
+      | weight | 0.600 |
 #      | shipping_cost_tax_excl | 14.00 |
 #      | shipping_cost_tax_incl | 14.84 |
 
   Scenario: I add products in two different invoices, a product has automatic discount when I move it to an order the discount is also moved
     Given shop configuration for "PS_CART_RULE_FEATURE_ACTIVE" is set to 1
-    Given there is a cart rule named "CartRulePercentForSpecificProduct" that applies a percent discount of 50.0% with priority 1, quantity of 1000 and quantity per user 1000
+    And there is a cart rule "CartRulePercentForSpecificProduct" with following properties:
+      | name[en-US]               | CartRulePercentForSpecificProduct |
+      | discount_percentage       | 50                                |
+      | priority                  | 2                                 |
+      | free_shipping             | false                             |
+      | discount_application_type | specific_product                  |
+      | discount_product          | Test Product B                    |
     And cart rule "CartRulePercentForSpecificProduct" is restricted to product "Test Product B"
     When I generate invoice for "bo_order1" order
     Then order "bo_order1" should have 1 invoice
     And I add products to order "bo_order1" with new invoice and the following products details:
-      | name          | Test Product A |
-      | amount        | 2              |
-      | price         | 15             |
+      | name   | Test Product A |
+      | amount | 2              |
+      | price  | 15             |
     And I add products to order "bo_order1" to the second invoice and the following products details:
-      | name          | Test Product B |
-      | amount        | 3              |
-      | price         | 10             |
+      | name   | Test Product B |
+      | amount | 3              |
+      | price  | 10             |
     Then order "bo_order1" should have 2 invoices
     And order "bo_order1" should have 7 products in total
     And order "bo_order1" should contain 2 products "Mug The best is yet to come"
@@ -453,13 +459,13 @@ Feature: Order from Back Office (BO)
 #      | total_shipping_tax_excl  | 14.0  |
 #      | total_shipping_tax_incl  | 14.84 |
     And order "bo_order1" carrier should have following details:
-      | weight                 | 0.600 |
+      | weight | 0.600 |
 #      | shipping_cost_tax_excl | 14.00 |
 #      | shipping_cost_tax_incl | 14.84 |
     When I edit product "Test Product B" in second invoice from order "bo_order1" with following products details:
-      | amount        | 3                       |
-      | price         | 10                      |
-      | invoice       | first                   |
+      | amount  | 3     |
+      | price   | 10    |
+      | invoice | first |
     Then the available stock for product "Test Product A" should be 98
     And the available stock for product "Test Product B" should be 97
     And the first invoice from order "bo_order1" should contain 2 products "Mug The best is yet to come"
@@ -495,7 +501,7 @@ Feature: Order from Back Office (BO)
 #      | total_shipping_tax_excl  | 14.0  |
 #      | total_shipping_tax_incl  | 14.84 |
     And order "bo_order1" carrier should have following details:
-      | weight                 | 0.600 |
+      | weight | 0.600 |
 #      | shipping_cost_tax_excl | 14.00 |
 #      | shipping_cost_tax_incl | 14.84 |
 
@@ -503,21 +509,21 @@ Feature: Order from Back Office (BO)
     When I generate invoice for "bo_order1" order
     Then order "bo_order1" should have 1 invoice
     When I add products to order "bo_order1" to the first invoice and the following products details:
-      | name          | Test Product A |
-      | amount        | 3              |
-      | price         | 15             |
+      | name   | Test Product A |
+      | amount | 3              |
+      | price  | 15             |
     And I add products to order "bo_order1" with new invoice and the following products details:
-      | name          | Test Product A |
-      | amount        | 2              |
-      | price         | 15             |
+      | name   | Test Product A |
+      | amount | 2              |
+      | price  | 15             |
     And I add products to order "bo_order1" to the second invoice and the following products details:
-      | name          | Test Product B |
-      | amount        | 1              |
-      | price         | 10             |
+      | name   | Test Product B |
+      | amount | 1              |
+      | price  | 10             |
     And I add products to order "bo_order1" with new invoice and the following products details:
-      | name          | Test Product B |
-      | amount        | 5              |
-      | price         | 10             |
+      | name   | Test Product B |
+      | amount | 5              |
+      | price  | 10             |
     Then order "bo_order1" should have 3 invoices
     And order "bo_order1" should have 13 products in total
     And order "bo_order1" should contain 2 products "Mug The best is yet to come"
@@ -527,9 +533,9 @@ Feature: Order from Back Office (BO)
     And the available stock for product "Test Product B" should be 94
     # This is the same base scenario as the first one, we don't check values here to make it shorter
     When I edit product "Test Product A" in second invoice from order "bo_order1" with following products details:
-      | amount        | 2                       |
-      | price         | 15                      |
-      | invoice       | third                   |
+      | amount  | 2     |
+      | price   | 15    |
+      | invoice | third |
     Then the first invoice from order "bo_order1" should contain 2 products "Mug The best is yet to come"
     And the first invoice from order "bo_order1" should contain 3 products "Test Product A"
     And the first invoice from order "bo_order1" should have following details:
@@ -575,13 +581,13 @@ Feature: Order from Back Office (BO)
 #      | total_shipping_tax_excl  | 21.0   |
 #      | total_shipping_tax_incl  | 22.26  |
     And order "bo_order1" carrier should have following details:
-      | weight                 | 0.600 |
+      | weight | 0.600 |
 #      | shipping_cost_tax_excl | 21.00 |
 #      | shipping_cost_tax_incl | 22.26 |
     When I edit product "Test Product A" in third invoice from order "bo_order1" with following products details:
-      | amount        | 2                       |
-      | price         | 15                      |
-      | invoice       | first                   |
+      | amount  | 2     |
+      | price   | 15    |
+      | invoice | first |
     Then I should get error that adding duplicate product in invoice is forbidden
     And the first invoice from order "bo_order1" should contain 2 products "Mug The best is yet to come"
     And the first invoice from order "bo_order1" should contain 3 products "Test Product A"
@@ -590,9 +596,9 @@ Feature: Order from Back Office (BO)
     And the third invoice from order "bo_order1" should contain 2 products "Test Product A"
     And the third invoice from order "bo_order1" should contain 5 products "Test Product B"
     When I add products to order "bo_order1" to the third invoice and the following products details:
-      | name          | Test Product A |
-      | amount        | 1              |
-      | price         | 10             |
+      | name   | Test Product A |
+      | amount | 1              |
+      | price  | 10             |
     Then I should get error that adding duplicate product in invoice is forbidden
     And the first invoice from order "bo_order1" should contain 2 products "Mug The best is yet to come"
     And the first invoice from order "bo_order1" should contain 3 products "Test Product A"
diff --git a/tests/Integration/Behaviour/behat.yml b/tests/Integration/Behaviour/behat.yml
index 414e1cee29f16..64d2ae80a1819 100644
--- a/tests/Integration/Behaviour/behat.yml
+++ b/tests/Integration/Behaviour/behat.yml
@@ -258,7 +258,6 @@ default:
                 - Tests\Integration\Behaviour\Features\Context\CustomerFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\AddCartRuleFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\CartRuleAssertionFeatureContext
-                - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\CommonCartRuleFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\DeleteCartRuleFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\EditCartRuleFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\Product\AddProductFeatureContext

From ac1c8ecdfb9ac5bd3f508fe26825e01ed6bd13f8 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Fri, 23 Jun 2023 10:55:38 +0300
Subject: [PATCH 0271/1030]  fix argument assignment

---
 src/Core/Grid/Query/WebserviceKeyQueryBuilder.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Core/Grid/Query/WebserviceKeyQueryBuilder.php b/src/Core/Grid/Query/WebserviceKeyQueryBuilder.php
index a82b8fc16e768..038b0bd75a7ef 100644
--- a/src/Core/Grid/Query/WebserviceKeyQueryBuilder.php
+++ b/src/Core/Grid/Query/WebserviceKeyQueryBuilder.php
@@ -71,7 +71,6 @@ public function __construct(
         parent::__construct($connection, $dbPrefix);
         $this->searchCriteriaApplicator = $searchCriteriaApplicator;
         $this->contextShopIds = $contextShopIds;
-        $this->connection = $connection;
         $this->doctrineFilterApplicator = $doctrineFilterApplicator;
     }
 

From 5f1491c22689350edd41155e5a139ac445ef5646 Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Wed, 18 Jan 2023 17:58:06 +0100
Subject: [PATCH 0272/1030] APIS08c - Add and edit authorized application

---
 .../ValueObject/ApplicationIdInterface.php    | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 src/Core/Domain/AuthorizationServer/ValueObject/ApplicationIdInterface.php

diff --git a/src/Core/Domain/AuthorizationServer/ValueObject/ApplicationIdInterface.php b/src/Core/Domain/AuthorizationServer/ValueObject/ApplicationIdInterface.php
new file mode 100644
index 0000000000000..c37a5aa5b463c
--- /dev/null
+++ b/src/Core/Domain/AuthorizationServer/ValueObject/ApplicationIdInterface.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\ValueObject;
+
+/**
+ * @see ApplicationId
+ */
+interface ApplicationIdInterface
+{
+    /**
+     * @return int
+     */
+    public function getValue(): int;
+}

From 74ed92d34159be9cd51cfbc7dace7af46f56ddf3 Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Mon, 30 Jan 2023 14:45:36 +0100
Subject: [PATCH 0273/1030] Fix typo and minor css issue

---
 .../themes/new-theme/scss/components/layout/_header_toolbar.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/admin-dev/themes/new-theme/scss/components/layout/_header_toolbar.scss b/admin-dev/themes/new-theme/scss/components/layout/_header_toolbar.scss
index 281283958bfe7..2c257e3454021 100644
--- a/admin-dev/themes/new-theme/scss/components/layout/_header_toolbar.scss
+++ b/admin-dev/themes/new-theme/scss/components/layout/_header_toolbar.scss
@@ -51,6 +51,7 @@
     margin-bottom: 0;
     font-size: 1.625rem;
     font-weight: 400;
+    flex: 1;
 
     @include media-breakpoint-down(sm) {
       float: none;

From ed63a25b7b5629a11d4f16b568ade5b615071a5b Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Wed, 7 Jun 2023 17:07:56 +0200
Subject: [PATCH 0274/1030] APISO08d - View application

---
 .../components/layout/_header_toolbar.scss    |   1 -
 .../scss/pages/_authorization_server.scss     |  19 +++
 admin-dev/themes/new-theme/scss/theme.scss    |   1 +
 .../Query/GetApplicationForViewing.php        |  61 +++++++++
 .../GetApplicationForViewingHandler.php       |  67 ++++++++++
 ...tApplicationForViewingHandlerInterface.php |  43 ++++++
 .../QueryResult/ViewableApplication.php       |  91 +++++++++++++
 .../ApiAccessGridDefinitionFactory.php        | 123 ++++++++++++++++++
 src/Core/Grid/Query/ApiAccessQueryBuilder.php | 122 +++++++++++++++++
 .../TypedBuilder/ApiAccessFiltersBuilder.php  |  80 ++++++++++++
 .../Search/Filters/ApiAccessesFilters.php     |  83 ++++++++++++
 .../ApplicationController.php                 |  37 ++++--
 .../authorization_server.yml                  |  22 +++-
 .../core/domain/authorization_server.yml      |   9 ++
 .../core/grid/doctrine_query_builder.yml      |   8 +-
 .../services/core/grid/grid_data_factory.yml  |   9 ++
 .../services/core/grid/grid_factory.yml       |   8 ++
 .../Application/view.html.twig                |  54 ++++++++
 18 files changed, 826 insertions(+), 12 deletions(-)
 create mode 100644 admin-dev/themes/new-theme/scss/pages/_authorization_server.scss
 create mode 100644 src/Core/Domain/AuthorizationServer/Query/GetApplicationForViewing.php
 create mode 100644 src/Core/Domain/AuthorizationServer/QueryHandler/GetApplicationForViewingHandler.php
 create mode 100644 src/Core/Domain/AuthorizationServer/QueryHandler/GetApplicationForViewingHandlerInterface.php
 create mode 100644 src/Core/Domain/AuthorizationServer/QueryResult/ViewableApplication.php
 create mode 100644 src/Core/Grid/Definition/Factory/ApiAccessGridDefinitionFactory.php
 create mode 100644 src/Core/Grid/Query/ApiAccessQueryBuilder.php
 create mode 100644 src/Core/Search/Builder/TypedBuilder/ApiAccessFiltersBuilder.php
 create mode 100644 src/Core/Search/Filters/ApiAccessesFilters.php
 create mode 100644 src/PrestaShopBundle/Resources/views/Admin/Configure/AdvancedParameters/AuthorizationServer/Application/view.html.twig

diff --git a/admin-dev/themes/new-theme/scss/components/layout/_header_toolbar.scss b/admin-dev/themes/new-theme/scss/components/layout/_header_toolbar.scss
index 2c257e3454021..281283958bfe7 100644
--- a/admin-dev/themes/new-theme/scss/components/layout/_header_toolbar.scss
+++ b/admin-dev/themes/new-theme/scss/components/layout/_header_toolbar.scss
@@ -51,7 +51,6 @@
     margin-bottom: 0;
     font-size: 1.625rem;
     font-weight: 400;
-    flex: 1;
 
     @include media-breakpoint-down(sm) {
       float: none;
diff --git a/admin-dev/themes/new-theme/scss/pages/_authorization_server.scss b/admin-dev/themes/new-theme/scss/pages/_authorization_server.scss
new file mode 100644
index 0000000000000..08a9e21dea019
--- /dev/null
+++ b/admin-dev/themes/new-theme/scss/pages/_authorization_server.scss
@@ -0,0 +1,19 @@
+.view-authorized-application-card {
+  .card-body {
+    .row {
+      .text-right {
+        font-weight: $font-weight-semibold;
+      }
+    }
+  }
+}
+
+#api_access_grid_panel {
+  #api_access_grid_table {
+    .column-headers {
+      th[data-column-id="active"] {
+        text-align: center;
+      }
+    }
+  }
+}
diff --git a/admin-dev/themes/new-theme/scss/theme.scss b/admin-dev/themes/new-theme/scss/theme.scss
index 80ea26e1ae1f3..1d6bb854ef9a1 100644
--- a/admin-dev/themes/new-theme/scss/theme.scss
+++ b/admin-dev/themes/new-theme/scss/theme.scss
@@ -89,6 +89,7 @@
 @import "pages/payment";
 @import "pages/translation_page";
 @import "pages/product_preferences";
+@import "pages/authorization_server";
 
 // Main Layout
 @import "pages/modules";
diff --git a/src/Core/Domain/AuthorizationServer/Query/GetApplicationForViewing.php b/src/Core/Domain/AuthorizationServer/Query/GetApplicationForViewing.php
new file mode 100644
index 0000000000000..a4daaef8c06e5
--- /dev/null
+++ b/src/Core/Domain/AuthorizationServer/Query/GetApplicationForViewing.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Query;
+
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Exception\ApplicationConstraintException;
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\ValueObject\ApplicationId;
+
+/**
+ * Gets application for editing in Back Office
+ */
+class GetApplicationForViewing
+{
+    /**
+     * @var ApplicationId
+     */
+    private $applicationId;
+
+    /**
+     * @param int $applicationId
+     *
+     * @throws ApplicationConstraintException
+     */
+    public function __construct(int $applicationId)
+    {
+        $this->applicationId = new ApplicationId($applicationId);
+    }
+
+    /**
+     * @return ApplicationId
+     */
+    public function getApplicationId(): ApplicationId
+    {
+        return $this->applicationId;
+    }
+}
diff --git a/src/Core/Domain/AuthorizationServer/QueryHandler/GetApplicationForViewingHandler.php b/src/Core/Domain/AuthorizationServer/QueryHandler/GetApplicationForViewingHandler.php
new file mode 100644
index 0000000000000..91857f3922d7c
--- /dev/null
+++ b/src/Core/Domain/AuthorizationServer/QueryHandler/GetApplicationForViewingHandler.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\QueryHandler;
+
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Exception\ApplicationNotFoundException;
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Model\AuthorizedApplicationRepositoryInterface;
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Query\GetApplicationForViewing;
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\QueryResult\ViewableApplication;
+
+/**
+ * Handles query which gets application for viewing
+ */
+class GetApplicationForViewingHandler implements GetApplicationForViewingHandlerInterface
+{
+    /**
+     * @var AuthorizedApplicationRepositoryInterface
+     */
+    private $applicationRepository;
+
+    /**
+     * @param AuthorizedApplicationRepositoryInterface $applicationRepository
+     */
+    public function __construct(AuthorizedApplicationRepositoryInterface $applicationRepository)
+    {
+        $this->applicationRepository = $applicationRepository;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function handle(GetApplicationForViewing $query): ViewableApplication
+    {
+        $application = $this->applicationRepository->getById($query->getApplicationId());
+
+        if ($application === null) {
+            throw new ApplicationNotFoundException(sprintf('Application with id "%d" was not found.', $query->getApplicationId()->getValue()));
+        }
+
+        return new ViewableApplication($query->getApplicationId(), $application->getName(), $application->getDescription());
+    }
+}
diff --git a/src/Core/Domain/AuthorizationServer/QueryHandler/GetApplicationForViewingHandlerInterface.php b/src/Core/Domain/AuthorizationServer/QueryHandler/GetApplicationForViewingHandlerInterface.php
new file mode 100644
index 0000000000000..1edd528e11c7d
--- /dev/null
+++ b/src/Core/Domain/AuthorizationServer/QueryHandler/GetApplicationForViewingHandlerInterface.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\QueryHandler;
+
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Query\GetApplicationForViewing;
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\QueryResult\ViewableApplication;
+
+/**
+ * Defines contract for GetApplicationForViewing
+ */
+interface GetApplicationForViewingHandlerInterface
+{
+    /**
+     * @param GetApplicationForViewing $query
+     *
+     * @return ViewableApplication
+     */
+    public function handle(GetApplicationForViewing $query);
+}
diff --git a/src/Core/Domain/AuthorizationServer/QueryResult/ViewableApplication.php b/src/Core/Domain/AuthorizationServer/QueryResult/ViewableApplication.php
new file mode 100644
index 0000000000000..0636b84a7405a
--- /dev/null
+++ b/src/Core/Domain/AuthorizationServer/QueryResult/ViewableApplication.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\QueryResult;
+
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\ValueObject\ApplicationId;
+
+/**
+ * Transfers application data for editing
+ */
+class ViewableApplication
+{
+    /**
+     * @var ApplicationId
+     */
+    private $applicationId;
+
+    /**
+     * @var string
+     */
+    private $name;
+
+    /**
+     * @var string
+     */
+    private $description;
+
+    /**
+     * @param ApplicationId $applicationId
+     * @param string $name
+     * @param string $description
+     */
+    public function __construct(
+        ApplicationId $applicationId,
+        string $name,
+        string $description
+    ) {
+        $this->applicationId = $applicationId;
+        $this->name = $name;
+        $this->description = $description;
+    }
+
+    /**
+     * @return ApplicationId
+     */
+    public function getApplicationId(): ApplicationId
+    {
+        return $this->applicationId;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * @return string
+     */
+    public function getDescription(): string
+    {
+        return $this->description;
+    }
+}
diff --git a/src/Core/Grid/Definition/Factory/ApiAccessGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/ApiAccessGridDefinitionFactory.php
new file mode 100644
index 0000000000000..043c7435a77cd
--- /dev/null
+++ b/src/Core/Grid/Definition/Factory/ApiAccessGridDefinitionFactory.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Grid\Definition\Factory;
+
+use PrestaShop\PrestaShop\Core\Grid\Action\Row\RowActionCollection;
+use PrestaShop\PrestaShop\Core\Grid\Action\Row\Type\LinkRowAction;
+use PrestaShop\PrestaShop\Core\Grid\Column\ColumnCollection;
+use PrestaShop\PrestaShop\Core\Grid\Column\ColumnCollectionInterface;
+use PrestaShop\PrestaShop\Core\Grid\Column\Type\Common\ActionColumn;
+use PrestaShop\PrestaShop\Core\Grid\Column\Type\Common\IdentifierColumn;
+use PrestaShop\PrestaShop\Core\Grid\Column\Type\Common\ToggleColumn;
+
+/**
+ * Class ApiAccessGridDefinitionFactory is responsible for creating new instance of Api Access grid definition.
+ */
+final class ApiAccessGridDefinitionFactory extends AbstractGridDefinitionFactory
+{
+    use DeleteActionTrait;
+
+    public const GRID_ID = 'api_access';
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getId(): string
+    {
+        return self::GRID_ID;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getName(): string
+    {
+        return $this->trans('Api accesses', [], 'Admin.Navigation.Menu');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getColumns(): ColumnCollectionInterface
+    {
+        return (new ColumnCollection())
+            ->add(
+                (new IdentifierColumn('client_id'))
+                    ->setName($this->trans('Name', [], 'Admin.Global'))
+                    ->setOptions([
+                        'identifier_field' => 'client_id',
+                        'clickable' => false,
+                    ])
+            )
+            ->add(
+                (new ToggleColumn('active'))
+                    ->setName($this->trans('Api access state', [], 'Admin.Global'))
+                    ->setOptions([
+                        'field' => 'active',
+                        'primary_field' => 'id_api_access',
+                        'route' => 'admin_api_accesses_toggle_active',
+                        'route_param_name' => 'apiAccessId',
+                        'sortable' => false,
+                    ])
+            )
+            ->add((new ActionColumn('actions'))
+            ->setName($this->trans('Actions', [], 'Admin.Global'))
+            ->setOptions([
+                'actions' => $this->getRowActions(),
+            ])
+            );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getRowActions(): RowActionCollection
+    {
+        $rowActions = new RowActionCollection();
+        $rowActions
+            ->add((new LinkRowAction('edit'))
+            ->setName($this->trans('Edit', [], 'Admin.Actions'))
+            ->setIcon('edit')
+            ->setOptions([
+                'route' => 'admin_api_accesses_edit',
+                'route_param_name' => 'apiAccessId',
+                'route_param_field' => 'id_api_access',
+            ])
+            )
+            ->add(
+                $this->buildDeleteAction(
+                    'admin_api_accesses_delete',
+                    'apiAccessId',
+                    'id_api_access'
+                )
+            );
+
+        return $rowActions;
+    }
+}
diff --git a/src/Core/Grid/Query/ApiAccessQueryBuilder.php b/src/Core/Grid/Query/ApiAccessQueryBuilder.php
new file mode 100644
index 0000000000000..1b3c3306aa28a
--- /dev/null
+++ b/src/Core/Grid/Query/ApiAccessQueryBuilder.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Grid\Query;
+
+use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Query\QueryBuilder;
+use InvalidArgumentException;
+use PrestaShop\PrestaShop\Core\Grid\Search\SearchCriteriaInterface;
+use PrestaShop\PrestaShop\Core\Search\Filters\ApiAccessesFilters;
+
+/**
+ * Class ApiAccessQueryBuilder builds search & count queries for api access grid.
+ */
+final class ApiAccessQueryBuilder extends AbstractDoctrineQueryBuilder
+{
+    /**
+     * @var DoctrineSearchCriteriaApplicator
+     */
+    private $searchCriteriaApplicator;
+
+    /**
+     * @param Connection $connection
+     * @param string $dbPrefix
+     * @param DoctrineSearchCriteriaApplicator $searchCriteriaApplicator
+     */
+    public function __construct(
+        Connection $connection,
+        string $dbPrefix,
+        DoctrineSearchCriteriaApplicator $searchCriteriaApplicator
+    ) {
+        parent::__construct($connection, $dbPrefix);
+
+        $this->searchCriteriaApplicator = $searchCriteriaApplicator;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getSearchQueryBuilder(SearchCriteriaInterface $searchCriteria): QueryBuilder
+    {
+        if (!$searchCriteria instanceof ApiAccessesFilters) {
+            throw new InvalidArgumentException(
+                sprintf(
+                    'Expected %s, but got %s',
+                    ApiAccessesFilters::class, get_class($searchCriteria)
+                )
+            );
+        }
+
+        $applicationId = $searchCriteria->getApplicationId();
+        $queryBuilder = $this->getQueryBuilder()
+            ->select('aa.*')
+            ->from($this->dbPrefix . 'api_access', 'aa')
+            ->where('aa.id_authorized_application  = :applicationId')
+            ->setParameter('applicationId', $applicationId);
+
+        $this->searchCriteriaApplicator
+            ->applyPagination($searchCriteria, $queryBuilder)
+            ->applySorting($searchCriteria, $queryBuilder);
+
+        return $queryBuilder;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getCountQueryBuilder(SearchCriteriaInterface $searchCriteria): QueryBuilder
+    {
+        if (!$searchCriteria instanceof ApiAccessesFilters) {
+            throw new InvalidArgumentException(
+                sprintf(
+                    'Expected %s, but got %s',
+                    ApiAccessesFilters::class, get_class($searchCriteria)
+                )
+            );
+        }
+
+        $applicationId = $searchCriteria->getApplicationId();
+
+        return $this->getQueryBuilder()
+            ->select('COUNT(aa.id_api_access)')
+            ->from($this->dbPrefix . 'api_access', 'aa')
+            ->where('aa.id_authorized_application  = :applicationId')
+            ->setParameter('applicationId', $applicationId);
+    }
+
+    /**
+     * Get generic query builder.
+     *
+     * @return QueryBuilder
+     */
+    private function getQueryBuilder(): QueryBuilder
+    {
+        return $this->connection->createQueryBuilder();
+    }
+}
diff --git a/src/Core/Search/Builder/TypedBuilder/ApiAccessFiltersBuilder.php b/src/Core/Search/Builder/TypedBuilder/ApiAccessFiltersBuilder.php
new file mode 100644
index 0000000000000..d02334cfe12e7
--- /dev/null
+++ b/src/Core/Search/Builder/TypedBuilder/ApiAccessFiltersBuilder.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Search\Builder\TypedBuilder;
+
+use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
+use PrestaShop\PrestaShop\Core\Search\Builder\AbstractFiltersBuilder;
+use PrestaShop\PrestaShop\Core\Search\Filters;
+use PrestaShop\PrestaShop\Core\Search\Filters\ApiAccessesFilters;
+use Symfony\Component\HttpFoundation\Request;
+
+class ApiAccessFiltersBuilder extends AbstractFiltersBuilder implements TypedFiltersBuilderInterface
+{
+    /** @var Request */
+    private $request;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setConfig(array $config)
+    {
+        $this->request = $config['request'] ?? null;
+
+        return parent::setConfig($config);
+    }
+
+    /**
+     * @throws InvalidArgumentException
+     */
+    public function buildFilters(Filters $filters = null)
+    {
+        $filterParameters = ApiAccessesFilters::getDefaults();
+        if (null !== $filters) {
+            $filterParameters = array_replace($filterParameters, $filters->all());
+        }
+
+        $applicationId = $this->getApplicationId();
+        $filterParameters['filters']['application_id'] = $applicationId;
+
+        return new ApiAccessesFilters($filterParameters);
+    }
+
+    private function getApplicationId()
+    {
+        return $this->request->attributes->getInt('applicationId');
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function supports(string $filterClassName): bool
+    {
+        return $filterClassName === ApiAccessesFilters::class;
+    }
+}
diff --git a/src/Core/Search/Filters/ApiAccessesFilters.php b/src/Core/Search/Filters/ApiAccessesFilters.php
new file mode 100644
index 0000000000000..04f060501b76d
--- /dev/null
+++ b/src/Core/Search/Filters/ApiAccessesFilters.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Search\Filters;
+
+use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
+use PrestaShop\PrestaShop\Core\Grid\Definition\Factory\ApiAccessGridDefinitionFactory;
+use PrestaShop\PrestaShop\Core\Search\Filters;
+
+final class ApiAccessesFilters extends Filters
+{
+    /** @var string */
+    protected $filterId = ApiAccessGridDefinitionFactory::GRID_ID;
+
+    /**
+     * @var int
+     */
+    private $applicationId;
+
+    /**
+     * @param array $filters
+     * @param $filterId
+     *
+     * @throws InvalidArgumentException
+     */
+    public function __construct(array $filters = [], $filterId = '')
+    {
+        if (!isset($filters['filters']['application_id'])) {
+            throw new InvalidArgumentException(sprintf('%s filters expect a application_id filter', static::class));
+        }
+
+        $this->applicationId = (int) $filters['filters']['application_id'];
+
+        parent::__construct($filters, $filterId);
+    }
+
+    /**
+     * @return int
+     */
+    public function getApplicationId(): int
+    {
+        return $this->applicationId;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDefaults(): array
+    {
+        return [
+            'limit' => 10,
+            'offset' => 0,
+            'orderBy' => 'id_api_access',
+            'sortOrder' => 'desc',
+            'filters' => [],
+        ];
+    }
+}
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/AuthorizationServer/ApplicationController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/AuthorizationServer/ApplicationController.php
index 05b3a36aa7d85..7e28079a1e01e 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/AuthorizationServer/ApplicationController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/AuthorizationServer/ApplicationController.php
@@ -36,8 +36,11 @@
 use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Exception\DeleteApplicationException;
 use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Exception\DuplicateApplicationNameException;
 use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Query\GetApplicationForEditing;
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Query\GetApplicationForViewing;
 use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\QueryResult\EditableApplication;
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\QueryResult\ViewableApplication;
 use PrestaShop\PrestaShop\Core\Domain\Customer\Exception\CustomerConstraintException;
+use PrestaShop\PrestaShop\Core\Search\Filters\ApiAccessesFilters;
 use PrestaShop\PrestaShop\Core\Search\Filters\AuthorizedApplicationsFilters;
 use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
 use PrestaShopBundle\Exception\NotImplementedException;
@@ -76,15 +79,6 @@ public function indexAction(AuthorizedApplicationsFilters $filters): Response
         ]);
     }
 
-    /**
-     * @AdminSecurity("is_granted('create', request.get('_legacy_controller')) || is_granted('update', request.get('_legacy_controller')) || is_granted('delete', request.get('_legacy_controller')) || is_granted('read', request.get('_legacy_controller'))")
-     */
-    public function viewAction(): void
-    {
-        // TODO: Implement viewAction() method in view PR.
-        throw new NotImplementedException();
-    }
-
     /**
      * @AdminSecurity("is_granted('create', request.get('_legacy_controller'))")
      *
@@ -181,6 +175,31 @@ public function deleteAction(int $applicationId)
         return $this->redirectToRoute('admin_authorized_applications_index');
     }
 
+    /**
+     * @AdminSecurity("is_granted('create', request.get('_legacy_controller')) || is_granted('update', request.get('_legacy_controller')) || is_granted('delete', request.get('_legacy_controller')) || is_granted('read', request.get('_legacy_controller'))")
+     */
+    public function viewAction(ApiAccessesFilters $filters, int $applicationId): Response
+    {
+        $gridAuthorizedApplicationFactory = $this->get('prestashop.core.grid.factory.api_access');
+        $grid = $gridAuthorizedApplicationFactory->getGrid($filters);
+
+        try {
+            /** @var ViewableApplication $viewableApplication */
+            $viewableApplication = $this->getQueryBus()->handle(new GetApplicationForViewing($applicationId));
+        } catch (Exception $e) {
+            $this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages($e)));
+
+            return $this->redirectToRoute('admin_authorized_applications_index');
+        }
+
+        return $this->render('@PrestaShop/Admin/Configure/AdvancedParameters/AuthorizationServer/Application/view.html.twig', [
+            'help_link' => $this->generateSidebarLink('AdminAuthorizationServer'),
+            'enableSidebar' => true,
+            'viewableApplication' => $viewableApplication,
+            'grid' => $this->presentGrid($grid),
+        ]);
+    }
+
     /**
      * @return array
      */
diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/configure/advanced_parameters/authorization_server.yml b/src/PrestaShopBundle/Resources/config/routing/admin/configure/advanced_parameters/authorization_server.yml
index a568ccf2b2cec..db303a6ae8633 100644
--- a/src/PrestaShopBundle/Resources/config/routing/admin/configure/advanced_parameters/authorization_server.yml
+++ b/src/PrestaShopBundle/Resources/config/routing/admin/configure/advanced_parameters/authorization_server.yml
@@ -39,10 +39,30 @@ admin_authorized_applications_delete:
     _controller: PrestaShopBundle\Controller\Admin\Configure\AdvancedParameters\AuthorizationServer\ApplicationController::deleteAction
     _legacy_controller: AdminAuthorizationServer
 
-
 admin_api_accesses_create:
   path: /applications/api-accesses/create
   methods: [ GET, POST, PATCH ]
   defaults:
     _controller: PrestaShopBundle\Controller\Admin\Configure\AdvancedParameters\AuthorizationServer\ApiAccessController::createAction
     _legacy_controller: AdminAuthorizationServer
+
+admin_api_accesses_edit:
+  path: /applications/api-accesses/{apiAccessId}/edit
+  methods: [ GET, POST, PATCH ]
+  defaults:
+    _controller: PrestaShopBundle\Controller\Admin\Configure\AdvancedParameters\AuthorizationServer\ApiAccessController::editAction
+    _legacy_controller: ApiAccessController
+
+admin_api_accesses_delete:
+  path: /applications/api-accesses/{apiAccessId}/delete
+  methods: [ POST ]
+  defaults:
+    _controller: PrestaShopBundle\Controller\Admin\Configure\AdvancedParameters\AuthorizationServer\ApiAccessController::deleteAction
+    _legacy_controller: ApiAccessController
+
+admin_api_accesses_toggle_active:
+  path: /applications/api-accesses/{apiAccessId}/toggle-active
+  methods: [ POST ]
+  defaults:
+    _controller: PrestaShopBundle\Controller\Admin\Configure\AdvancedParameters\AuthorizationServer\ApiAccessController::toggleActiveAction
+    _legacy_controller: ApiAccessController
diff --git a/src/PrestaShopBundle/Resources/config/services/core/domain/authorization_server.yml b/src/PrestaShopBundle/Resources/config/services/core/domain/authorization_server.yml
index c63a82e6b9d5f..d86ca0f38156e 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/domain/authorization_server.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/domain/authorization_server.yml
@@ -29,3 +29,12 @@ services:
   PrestaShopBundle\Model\AuthorizationServer\AuthorizedApplicationFactory: ~
 
   PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Model\AuthorizedApplicationFactoryInterface: '@PrestaShopBundle\Model\AuthorizationServer\AuthorizedApplicationFactory'
+
+  PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\QueryHandler\GetApplicationForViewingHandler:
+    tags:
+      - name: tactician.handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Query\GetApplicationForViewing'
+
+  PrestaShop\PrestaShop\Core\Search\Builder\TypedBuilder\ApiAccessFiltersBuilder:
+    class: 'PrestaShop\PrestaShop\Core\Search\Builder\TypedBuilder\ApiAccessFiltersBuilder'
+    tags: [ 'core.typed_filters_builder' ]
diff --git a/src/PrestaShopBundle/Resources/config/services/core/grid/doctrine_query_builder.yml b/src/PrestaShopBundle/Resources/config/services/core/grid/doctrine_query_builder.yml
index 2355744f966d6..f7bf7d23689f3 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/grid/doctrine_query_builder.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/grid/doctrine_query_builder.yml
@@ -486,7 +486,13 @@ services:
     public: true
 
   PrestaShop\PrestaShop\Core\Grid\Query\AuthorizedApplicationQueryBuilder:
-    class: 'PrestaShop\PrestaShop\Core\Grid\Query\AuthorizedApplicationQueryBuilder'
+    parent: 'prestashop.core.grid.abstract_query_builder'
+    public: false
+    autowire: true
+    arguments:
+      - '@prestashop.core.query.doctrine_search_criteria_applicator'
+
+  PrestaShop\PrestaShop\Core\Grid\Query\ApiAccessQueryBuilder:
     parent: 'prestashop.core.grid.abstract_query_builder'
     public: false
     autowire: true
diff --git a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_data_factory.yml b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_data_factory.yml
index 5eedbed645e7e..4535f607e86f7 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_data_factory.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_data_factory.yml
@@ -656,3 +656,12 @@ services:
     public: false
     arguments:
       - '@prestashop.core.grid.data.factory.store'
+
+  prestashop.core.grid.data_factory.api_access:
+    class: '%prestashop.core.grid.data.factory.doctrine_grid_data_factory%'
+    public: false
+    arguments:
+      - '@PrestaShop\PrestaShop\Core\Grid\Query\ApiAccessQueryBuilder'
+      - '@prestashop.core.hook.dispatcher'
+      - '@prestashop.core.grid.query.doctrine_query_parser'
+      - 'api_access'
diff --git a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_factory.yml b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_factory.yml
index c5dfbe3db84a7..c5609fda10893 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_factory.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_factory.yml
@@ -526,3 +526,11 @@ services:
       - '@PrestaShop\PrestaShop\Core\Grid\Data\Factory\StoreGridDataFactory'
       - '@prestashop.core.grid.filter.form_factory'
       - '@prestashop.core.hook.dispatcher'
+
+  prestashop.core.grid.factory.api_access:
+    class: 'PrestaShop\PrestaShop\Core\Grid\GridFactory'
+    arguments:
+      - '@PrestaShop\PrestaShop\Core\Grid\Definition\Factory\ApiAccessGridDefinitionFactory'
+      - '@prestashop.core.grid.data_factory.api_access'
+      - '@prestashop.core.grid.filter.form_factory'
+      - '@prestashop.core.hook.dispatcher'
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Configure/AdvancedParameters/AuthorizationServer/Application/view.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Configure/AdvancedParameters/AuthorizationServer/Application/view.html.twig
new file mode 100644
index 0000000000000..1eb2863147122
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Configure/AdvancedParameters/AuthorizationServer/Application/view.html.twig
@@ -0,0 +1,54 @@
+{# **
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ * #}
+{% set layoutTitle = '%application_name%'|trans({'%application_name%': viewableApplication.name}, 'Admin.Actions') %}
+
+{% extends '@PrestaShop/Admin/layout.html.twig' %}
+
+{% block content %}
+  <div class="card view-authorized-application-card" data-role="authorized-application-card">
+    <h3 class="card-header">
+      {{ 'Application information'|trans({}, 'Admin.Global') }}
+    </h3>
+    <div class="card-body">
+      <div class="row mb-1">
+        <div class="col-4 text-right">
+          {{ 'App name'|trans({}, 'Admin.Global') }}
+        </div>
+        <div class="col-8">
+          {{ viewableApplication.name }}
+        </div>
+      </div>
+      <div class="row mb-1">
+        <div class="col-4 text-right">
+          {{ 'Description'|trans({}, 'Admin.Global') }}
+        </div>
+        <div class="col-8">
+          {{ viewableApplication.description }}
+        </div>
+      </div>
+    </div>
+  </div>
+  {{ include('@PrestaShop/Admin/Common/Grid/grid_panel.html.twig', {'grid': grid }) }}
+{% endblock %}

From 3d0a2b78f28d46869cae5861cf559d7587d46b2e Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Thu, 27 Apr 2023 10:04:46 +0200
Subject: [PATCH 0275/1030] ApplicationRepository search can't return null

---
 .../QueryHandler/GetApplicationForViewingHandler.php         | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/Core/Domain/AuthorizationServer/QueryHandler/GetApplicationForViewingHandler.php b/src/Core/Domain/AuthorizationServer/QueryHandler/GetApplicationForViewingHandler.php
index 91857f3922d7c..49368879f164a 100644
--- a/src/Core/Domain/AuthorizationServer/QueryHandler/GetApplicationForViewingHandler.php
+++ b/src/Core/Domain/AuthorizationServer/QueryHandler/GetApplicationForViewingHandler.php
@@ -28,7 +28,6 @@
 
 namespace PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\QueryHandler;
 
-use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Exception\ApplicationNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Model\AuthorizedApplicationRepositoryInterface;
 use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Query\GetApplicationForViewing;
 use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\QueryResult\ViewableApplication;
@@ -58,10 +57,6 @@ public function handle(GetApplicationForViewing $query): ViewableApplication
     {
         $application = $this->applicationRepository->getById($query->getApplicationId());
 
-        if ($application === null) {
-            throw new ApplicationNotFoundException(sprintf('Application with id "%d" was not found.', $query->getApplicationId()->getValue()));
-        }
-
         return new ViewableApplication($query->getApplicationId(), $application->getName(), $application->getDescription());
     }
 }

From 4a531e73262a261c8e4a33978ca339c715fb5fb0 Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Wed, 24 May 2023 19:44:54 +0200
Subject: [PATCH 0276/1030] Fixes after review

---
 .../ValueObject/ApplicationIdInterface.php    | 38 -------------------
 src/Core/Grid/Query/ApiAccessQueryBuilder.php |  2 +-
 .../ApplicationController.php                 |  1 -
 3 files changed, 1 insertion(+), 40 deletions(-)
 delete mode 100644 src/Core/Domain/AuthorizationServer/ValueObject/ApplicationIdInterface.php

diff --git a/src/Core/Domain/AuthorizationServer/ValueObject/ApplicationIdInterface.php b/src/Core/Domain/AuthorizationServer/ValueObject/ApplicationIdInterface.php
deleted file mode 100644
index c37a5aa5b463c..0000000000000
--- a/src/Core/Domain/AuthorizationServer/ValueObject/ApplicationIdInterface.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-namespace PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\ValueObject;
-
-/**
- * @see ApplicationId
- */
-interface ApplicationIdInterface
-{
-    /**
-     * @return int
-     */
-    public function getValue(): int;
-}
diff --git a/src/Core/Grid/Query/ApiAccessQueryBuilder.php b/src/Core/Grid/Query/ApiAccessQueryBuilder.php
index 1b3c3306aa28a..be4e0117ba810 100644
--- a/src/Core/Grid/Query/ApiAccessQueryBuilder.php
+++ b/src/Core/Grid/Query/ApiAccessQueryBuilder.php
@@ -37,7 +37,7 @@
 /**
  * Class ApiAccessQueryBuilder builds search & count queries for api access grid.
  */
-final class ApiAccessQueryBuilder extends AbstractDoctrineQueryBuilder
+class ApiAccessQueryBuilder extends AbstractDoctrineQueryBuilder
 {
     /**
      * @var DoctrineSearchCriteriaApplicator
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/AuthorizationServer/ApplicationController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/AuthorizationServer/ApplicationController.php
index 7e28079a1e01e..c94ed13e6cec9 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/AuthorizationServer/ApplicationController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/AuthorizationServer/ApplicationController.php
@@ -43,7 +43,6 @@
 use PrestaShop\PrestaShop\Core\Search\Filters\ApiAccessesFilters;
 use PrestaShop\PrestaShop\Core\Search\Filters\AuthorizedApplicationsFilters;
 use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
-use PrestaShopBundle\Exception\NotImplementedException;
 use PrestaShopBundle\Security\Annotation\AdminSecurity;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;

From b57b9e9b6fb161c7e45bed5569c4c51c4985325a Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Fri, 23 Jun 2023 14:38:44 +0200
Subject: [PATCH 0277/1030] Change translation key when duplicate product

---
 .../Grid/Definition/Factory/ProductGridDefinitionFactory.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Core/Grid/Definition/Factory/ProductGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/ProductGridDefinitionFactory.php
index ff591db024b16..c260756212675 100644
--- a/src/Core/Grid/Definition/Factory/ProductGridDefinitionFactory.php
+++ b/src/Core/Grid/Definition/Factory/ProductGridDefinitionFactory.php
@@ -694,7 +694,7 @@ protected function getBulkActions()
             $routeParams = [];
             $bulkEnableLabel = $this->trans('Activate selection for all stores', [], 'Admin.Actions');
             $bulkDisableLabel = $this->trans('Deactivate selection for all stores', [], 'Admin.Actions');
-            $bulkDuplicateLabel = $this->trans('Duplicate selection for all stores', [], 'Admin.Actions');
+            $bulkDuplicateLabel = $this->trans('Duplicate selection for associated stores', [], 'Admin.Actions');
             $bulkDeleteLabel = $this->trans('Delete selection for all stores', [], 'Admin.Actions');
         }
 

From 9aa38dd1d4dd720446d3867a808c4b7defdad3b7 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Fri, 23 Jun 2023 15:51:09 +0300
Subject: [PATCH 0278/1030]  introduce create/edit views and create action.
 Untested

---
 .../FeatureValueFormDataHandler.php           | 67 ++++++++++++++
 .../DataProvider/FeatureFormDataProvider.php  |  2 +-
 .../FeatureValueFormDataProvider.php          | 49 ++++++++++
 .../Sell/Catalog/FeatureValueController.php   | 42 +++++++++
 .../Admin/Sell/Catalog/FeatureValueType.php   | 90 +++++++++++++++++++
 .../routing/admin/sell/catalog/features.yml   | 11 +++
 .../config/services/bundle/form/form_type.yml |  5 +-
 .../services/core/form/form_builder.yml       |  7 ++
 .../services/core/form/form_data_handler.yml  |  4 +
 .../services/core/form/form_data_provider.yml |  5 +-
 .../services/core/form/form_handler.yml       |  6 ++
 .../FeatureValue/Blocks/form.html.twig        | 52 +++++++++++
 .../Features/FeatureValue/create.html.twig    | 37 ++++++++
 .../Features/FeatureValue/edit.html.twig      | 38 ++++++++
 14 files changed, 412 insertions(+), 3 deletions(-)
 create mode 100644 src/Core/Form/IdentifiableObject/DataHandler/FeatureValueFormDataHandler.php
 create mode 100644 src/Core/Form/IdentifiableObject/DataProvider/FeatureValueFormDataProvider.php
 create mode 100644 src/PrestaShopBundle/Form/Admin/Sell/Catalog/FeatureValueType.php
 create mode 100644 src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/Blocks/form.html.twig
 create mode 100644 src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/create.html.twig
 create mode 100644 src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/edit.html.twig

diff --git a/src/Core/Form/IdentifiableObject/DataHandler/FeatureValueFormDataHandler.php b/src/Core/Form/IdentifiableObject/DataHandler/FeatureValueFormDataHandler.php
new file mode 100644
index 0000000000000..3148cc489d1c1
--- /dev/null
+++ b/src/Core/Form/IdentifiableObject/DataHandler/FeatureValueFormDataHandler.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataHandler;
+
+use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
+use PrestaShop\PrestaShop\Core\Domain\Feature\Command\AddFeatureValueCommand;
+use PrestaShop\PrestaShop\Core\Domain\Feature\Command\EditFeatureValueCommand;
+use PrestaShop\PrestaShop\Core\Domain\Feature\ValueObject\FeatureValueId;
+
+class FeatureValueFormDataHandler implements FormDataHandlerInterface
+{
+    public function __construct(
+        protected readonly CommandBusInterface $commandBus
+    ) {
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function create(array $data): int
+    {
+        /** @var FeatureValueId $featureValueId */
+        $featureValueId = $this->commandBus->handle(new AddFeatureValueCommand(
+            $data['feature_id'],
+            $data['value']
+        ));
+
+        return $featureValueId->getValue();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function update($id, array $data): void
+    {
+        $command = (new EditFeatureValueCommand($id))
+            ->setFeatureId($data['feature_id'])
+            ->setLocalizedValues($data['value'])
+        ;
+
+        $this->commandBus->handle($command);
+    }
+}
diff --git a/src/Core/Form/IdentifiableObject/DataProvider/FeatureFormDataProvider.php b/src/Core/Form/IdentifiableObject/DataProvider/FeatureFormDataProvider.php
index 3c860e8b92a7d..8559b1e06303e 100644
--- a/src/Core/Form/IdentifiableObject/DataProvider/FeatureFormDataProvider.php
+++ b/src/Core/Form/IdentifiableObject/DataProvider/FeatureFormDataProvider.php
@@ -33,7 +33,7 @@
 /**
  * Provides data for feature forms.
  */
-final class FeatureFormDataProvider implements FormDataProviderInterface
+class FeatureFormDataProvider implements FormDataProviderInterface
 {
     /**
      * @var CommandBusInterface
diff --git a/src/Core/Form/IdentifiableObject/DataProvider/FeatureValueFormDataProvider.php b/src/Core/Form/IdentifiableObject/DataProvider/FeatureValueFormDataProvider.php
new file mode 100644
index 0000000000000..e8f5c180f0a17
--- /dev/null
+++ b/src/Core/Form/IdentifiableObject/DataProvider/FeatureValueFormDataProvider.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataProvider;
+
+/**
+ * @todo: unfinished
+ */
+class FeatureValueFormDataProvider implements FormDataProviderInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getData($id): array
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getDefaultData(): array
+    {
+        return [];
+    }
+}
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
index 03c55e3f521e9..ef92e74143e82 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
@@ -28,6 +28,8 @@
 
 namespace PrestaShopBundle\Controller\Admin\Sell\Catalog;
 
+use Exception;
+use PrestaShop\PrestaShop\Core\Domain\Feature\ValueObject\FeatureId;
 use PrestaShop\PrestaShop\Core\Grid\Factory\FeatureValueGridFactory;
 use PrestaShop\PrestaShop\Core\Search\Filters\FeatureValueFilters;
 use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
@@ -58,4 +60,44 @@ public function indexAction(Request $request, FeatureValueFilters $filters): Res
             //            ],
         ]);
     }
+
+    /**
+     * @AdminSecurity("is_granted('create', request.get('_legacy_controller'))")
+     *
+     * @param int $featureId
+     * @param Request $request
+     *
+     * @return Response
+     */
+    public function createAction(int $featureId, Request $request): Response
+    {
+        $featureValueFormBuilder = $this->get('prestashop.core.form.identifiable_object.builder.feature_value_form_builder');
+        $featureValueFormHandler = $this->get('prestashop.core.form.identifiable_object.handler.feature_value_form_handler');
+
+        $featureValueForm = $featureValueFormBuilder->getForm();
+        $featureValueForm->handleRequest($request);
+
+        try {
+            $handlerResult = $featureValueFormHandler->handle($featureValueForm);
+
+            if (null !== $handlerResult->getIdentifiableObjectId()) {
+                $this->addFlash('success', $this->trans('Successful creation', 'Admin.Notifications.Success'));
+
+                return $this->redirectToRoute('admin_features_index');
+            }
+        } catch (Exception $e) {
+            $this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages()));
+        }
+
+        return $this->render('@PrestaShop/Admin/Sell/Catalog/Features/FeatureValue/create.html.twig', [
+            'featureValueForm' => $featureValueForm->createView(),
+            'layoutTitle' => $this->trans('New Feature Value', 'Admin.Navigation.Menu'),
+        ]);
+    }
+
+    private function getErrorMessages(): array
+    {
+        //@todo:
+        return [];
+    }
 }
diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Catalog/FeatureValueType.php b/src/PrestaShopBundle/Form/Admin/Sell/Catalog/FeatureValueType.php
new file mode 100644
index 0000000000000..0f450fec2e07e
--- /dev/null
+++ b/src/PrestaShopBundle/Form/Admin/Sell/Catalog/FeatureValueType.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\Form\Admin\Sell\Catalog;
+
+use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\DefaultLanguage;
+use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\TypedRegex;
+use PrestaShop\PrestaShop\Core\Form\FormChoiceProviderInterface;
+use PrestaShopBundle\Form\Admin\Type\TranslatableType;
+use PrestaShopBundle\Form\Admin\Type\TranslatorAwareType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Validator\Constraints\Length;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class FeatureValueType extends TranslatorAwareType
+{
+    public function __construct(
+        TranslatorInterface $translator,
+        array $locales,
+        protected readonly FormChoiceProviderInterface $featureChoiceProvider
+    ) {
+        parent::__construct($translator, $locales);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('feature_id', ChoiceType::class, [
+                'choices' => $this->featureChoiceProvider->getChoices(),
+                'label' => $this->trans('Feature', 'Admin.Global'),
+            ])
+            ->add('value', TranslatableType::class, [
+                'label' => $this->trans('Value', 'Admin.Global'),
+                'type' => TextType::class,
+                'constraints' => [
+                    new DefaultLanguage(),
+                    //@todo: replace with constant
+                    new Length(['max' => 255]),
+                ],
+                'options' => [
+                    'constraints' => [
+                        new TypedRegex([
+                            'type' => 'generic_name',
+                        ]),
+                    ],
+                ],
+                'help' => $this->trans('Invalid characters: %chars%', 'Admin.Notifications.Info', ['%chars%' => '<>={}']),
+            ])
+        ;
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        parent::configureOptions($resolver);
+        $resolver->setDefaults([
+            'form_theme' => '@PrestaShop/Admin/TwigTemplateForm/prestashop_ui_kit.html.twig',
+        ]);
+    }
+}
diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml
index 4114ebde0647b..f2cda00fdb1c8 100644
--- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml
+++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml
@@ -105,3 +105,14 @@ admin_feature_values_search:
       - 'featureId'
   requirements:
     featureId: \d+
+
+admin_feature_values_add:
+  path: /{featureId}/values/new
+  methods: [ GET, POST ]
+  defaults:
+    _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureValueController::createAction
+    _legacy_controller: AdminFeatures
+    _legacy_link: AdminFeatures:addfeature_value
+    _legacy_feature_flag: feature
+    redirectQueryParamsToKeep:
+      - 'featureId'
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
index 03d9fcd6a5696..a1546c447333b 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
@@ -430,7 +430,10 @@ services:
       $orderInvoiceChoiceProvider: '@prestashop.adapter.form.choice_provider.order_invoice_by_id'
       $installedPaymentModulesChoiceProvider: '@prestashop.adapter.form.choice_provider.installed_payment_modules'
 
-  PrestaShopBundle\Form\Admin\Sell\Catalog\FeatureType:
+  PrestaShopBundle\Form\Admin\Sell\Catalog\FeatureType: ~
+  PrestaShopBundle\Form\Admin\Sell\Catalog\FeatureValueType:
+    arguments:
+      $featureChoiceProvider: '@prestashop.adapter.form.choice_provider.features_choice_provider'
 
   PrestaShopBundle\Form\Admin\Sell\Order\ChangeOrderCurrencyType:
     arguments:
diff --git a/src/PrestaShopBundle/Resources/config/services/core/form/form_builder.yml b/src/PrestaShopBundle/Resources/config/services/core/form/form_builder.yml
index e70ef65c0c7ae..9dabf017d2ed5 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/form/form_builder.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/form/form_builder.yml
@@ -135,6 +135,13 @@ services:
       - 'PrestaShopBundle\Form\Admin\Sell\Catalog\FeatureType'
       - '@prestashop.core.form.identifiable_object.data_provider.feature_form_data_provider'
 
+  prestashop.core.form.identifiable_object.builder.feature_value_form_builder:
+    class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\FormBuilder'
+    factory: [ '@prestashop.core.form.builder.form_builder_factory', 'create' ]
+    arguments:
+      - 'PrestaShopBundle\Form\Admin\Sell\Catalog\FeatureValueType'
+      - '@PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataProvider\FeatureValueFormDataProvider'
+
   prestashop.core.form.identifiable_object.builder.order_message_form_builder:
     class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\FormBuilder'
     factory: [ '@prestashop.core.form.builder.form_builder_factory', 'create' ]
diff --git a/src/PrestaShopBundle/Resources/config/services/core/form/form_data_handler.yml b/src/PrestaShopBundle/Resources/config/services/core/form/form_data_handler.yml
index cf9915f00c23a..d6c1834fb60f7 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/form/form_data_handler.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/form/form_data_handler.yml
@@ -119,6 +119,10 @@ services:
     autowire: true
     public: false
 
+  PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataHandler\FeatureValueFormDataHandler:
+    autowire: true
+    public: false
+
   prestashop.core.form.identifiable_object.data_handler.order_message_form_data_handler:
     class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataHandler\OrderMessageFormDataHandler'
     arguments:
diff --git a/src/PrestaShopBundle/Resources/config/services/core/form/form_data_provider.yml b/src/PrestaShopBundle/Resources/config/services/core/form/form_data_provider.yml
index e774568830a73..54a84ad449797 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/form/form_data_provider.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/form/form_data_provider.yml
@@ -4,7 +4,6 @@ services:
     bind:
       $queryBus: '@prestashop.core.query_bus'
 
-
   prestashop.core.form.identifiable_object.data_provider.sql_request_form_data_provider:
     class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataProvider\SqlRequestFormDataProvider'
     arguments:
@@ -118,6 +117,10 @@ services:
       - '@=service("prestashop.adapter.multistore_feature").isActive()'
       - '@=service("prestashop.adapter.shop.context").getShops(true, true)'
 
+  PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataProvider\FeatureValueFormDataProvider:
+    autowire: true
+    public: false
+
   prestashop.core.form.identifiable_object.data_provider.order_message_form_data_provider:
     class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataProvider\OrderMessageFormDataProvider'
     arguments:
diff --git a/src/PrestaShopBundle/Resources/config/services/core/form/form_handler.yml b/src/PrestaShopBundle/Resources/config/services/core/form/form_handler.yml
index 4ef9a07702486..f9ef50203a6f8 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/form/form_handler.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/form/form_handler.yml
@@ -118,6 +118,12 @@ services:
     arguments:
       - '@PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataHandler\FeatureFormDataHandler'
 
+  prestashop.core.form.identifiable_object.handler.feature_value_form_handler:
+    class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Handler\FormHandler'
+    factory: [ '@prestashop.core.form.identifiable_object.handler.form_handler_factory', 'create' ]
+    arguments:
+      - '@PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataHandler\FeatureValueFormDataHandler'
+
   prestashop.core.form.identifiable_object.handler.order_message_form_handler:
     class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Handler\FormHandler'
     factory: [ '@prestashop.core.form.identifiable_object.handler.form_handler_factory', 'create' ]
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/Blocks/form.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/Blocks/form.html.twig
new file mode 100644
index 0000000000000..d6de32469df09
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/Blocks/form.html.twig
@@ -0,0 +1,52 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+{% block feature_value_form_block %}
+  {{ form_start(featureValueForm) }}
+
+  <div class="card">
+    <h3 class="card-header">
+      {{ 'Feature value'|trans({}, 'Admin.Catalog.Feature') }}
+    </h3>
+
+    <div class="card-body">
+      <div class="form-wrapper">
+        {% block feature_value_form_rest %}
+          {{ form_rest(featureValueForm) }}
+        {% endblock %}
+      </div>
+    </div>
+
+    <div class="card-footer">
+{# @todo: redirect to feature view page #}
+      <a href="{{ path('admin_features_index') }}" class="btn btn-outline-secondary">
+        {{ 'Cancel'|trans({}, 'Admin.Actions') }}
+      </a>
+      <button class="btn btn-primary float-right" id="save-button">
+        {{ 'Save'|trans({}, 'Admin.Actions') }}
+      </button>
+    </div>
+  </div>
+  {{ form_end(featureValueForm) }}
+{% endblock %}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/create.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/create.html.twig
new file mode 100644
index 0000000000000..5d9fcd095b790
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/create.html.twig
@@ -0,0 +1,37 @@
+{# **
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ * #}
+{% extends '@PrestaShop/Admin/layout.html.twig' %}
+
+{% block content %}
+  {% include '@PrestaShop/Admin/Sell/Catalog/Features/FeatureValue/Blocks/form.html.twig' with {
+    featureForm: featureValueForm
+  } %}
+{% endblock %}
+
+{% block javascripts %}
+  {{ parent() }}
+  {# @todo: this js doesn't exist yet #}
+  <script src="{{ asset('themes/new-theme/public/feature_value_form.bundle.js') }}"></script>
+{% endblock %}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/edit.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/edit.html.twig
new file mode 100644
index 0000000000000..827bd873ea8fa
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/edit.html.twig
@@ -0,0 +1,38 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+{% extends '@PrestaShop/Admin/layout.html.twig' %}
+
+{% block content %}
+    {% include '@PrestaShop/Admin/Sell/Catalog/Features/FeatureValue/Blocks/form.html.twig' with {
+      featureForm: featureValueForm
+    } %}
+  {% endif %}
+{% endblock %}
+
+{% block javascripts %}
+  {{ parent() }}
+  {# @todo: this js doesn't exist yet #}
+  <script src="{{ asset('themes/new-theme/public/feature_value_form.bundle.js') }}"></script>
+{% endblock %}

From 65a1f7219879904b2681ac121b0e15127cf2bb15 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Fri, 23 Jun 2023 17:20:52 +0300
Subject: [PATCH 0279/1030]  add js, integrate edit action in list

---
 admin-dev/themes/new-theme/.webpack/common.js |  1 +
 .../js/pages/feature/feature-value/form.ts    | 30 ++++++++
 .../FeatureValueFormDataHandler.php           |  1 -
 .../FeatureValueFormDataProvider.php          | 18 ++++-
 .../FeatureValueGridDefinitionFactory.php     | 22 +++++-
 .../Grid/Query/FeatureValueQueryBuilder.php   |  2 +-
 .../Sell/Catalog/FeatureValueController.php   | 70 ++++++++++++++++---
 .../Admin/Sell/Catalog/FeatureValueType.php   | 13 ++--
 .../routing/admin/sell/catalog/features.yml   | 11 +++
 .../FeatureValue/Blocks/form.html.twig        | 15 +++-
 .../Features/FeatureValue/edit.html.twig      |  4 +-
 11 files changed, 162 insertions(+), 25 deletions(-)
 create mode 100644 admin-dev/themes/new-theme/js/pages/feature/feature-value/form.ts

diff --git a/admin-dev/themes/new-theme/.webpack/common.js b/admin-dev/themes/new-theme/.webpack/common.js
index d3ac61712cd76..1fb54fceb5a3c 100644
--- a/admin-dev/themes/new-theme/.webpack/common.js
+++ b/admin-dev/themes/new-theme/.webpack/common.js
@@ -78,6 +78,7 @@ module.exports = {
     error: './js/pages/error',
     feature: './js/pages/feature',
     feature_value: './js/pages/feature/feature-value',
+    feature_value_form: './js/pages/feature/feature-value/form',
     feature_flag: './js/pages/feature-flag/index',
     feature_form: './js/pages/feature/form',
     form_popover_error: './js/components/form/form-popover-error',
diff --git a/admin-dev/themes/new-theme/js/pages/feature/feature-value/form.ts b/admin-dev/themes/new-theme/js/pages/feature/feature-value/form.ts
new file mode 100644
index 0000000000000..2e36830fa28e2
--- /dev/null
+++ b/admin-dev/themes/new-theme/js/pages/feature/feature-value/form.ts
@@ -0,0 +1,30 @@
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+import TranslatableInput from '@components/translatable-input';
+
+$(() => {
+  new TranslatableInput();
+});
diff --git a/src/Core/Form/IdentifiableObject/DataHandler/FeatureValueFormDataHandler.php b/src/Core/Form/IdentifiableObject/DataHandler/FeatureValueFormDataHandler.php
index 3148cc489d1c1..7367c5536efe6 100644
--- a/src/Core/Form/IdentifiableObject/DataHandler/FeatureValueFormDataHandler.php
+++ b/src/Core/Form/IdentifiableObject/DataHandler/FeatureValueFormDataHandler.php
@@ -58,7 +58,6 @@ public function create(array $data): int
     public function update($id, array $data): void
     {
         $command = (new EditFeatureValueCommand($id))
-            ->setFeatureId($data['feature_id'])
             ->setLocalizedValues($data['value'])
         ;
 
diff --git a/src/Core/Form/IdentifiableObject/DataProvider/FeatureValueFormDataProvider.php b/src/Core/Form/IdentifiableObject/DataProvider/FeatureValueFormDataProvider.php
index e8f5c180f0a17..32805c657a5a2 100644
--- a/src/Core/Form/IdentifiableObject/DataProvider/FeatureValueFormDataProvider.php
+++ b/src/Core/Form/IdentifiableObject/DataProvider/FeatureValueFormDataProvider.php
@@ -26,17 +26,33 @@
 
 namespace PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataProvider;
 
+use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
+use PrestaShop\PrestaShop\Core\Domain\Feature\Query\GetFeatureValueForEditing;
+use PrestaShop\PrestaShop\Core\Domain\Feature\QueryResult\EditableFeatureValue;
+
 /**
  * @todo: unfinished
  */
 class FeatureValueFormDataProvider implements FormDataProviderInterface
 {
+    public function __construct(
+        private readonly CommandBusInterface $queryBus
+    ) {
+    }
+
     /**
      * {@inheritdoc}
      */
     public function getData($id): array
     {
-        return [];
+        /** @var EditableFeatureValue $featureValueForEditing */
+        $featureValueForEditing = $this->queryBus->handle(new GetFeatureValueForEditing($id));
+
+        return [
+            'feature_id' => $featureValueForEditing->getFeatureId()->getValue(),
+            'feature_value_id' => $featureValueForEditing->getFeatureValueId()->getValue(),
+            'value' => $featureValueForEditing->getLocalizedValues(),
+        ];
     }
 
     /**
diff --git a/src/Core/Grid/Definition/Factory/FeatureValueGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/FeatureValueGridDefinitionFactory.php
index 3ed93ffc139df..6a5a4052cc832 100644
--- a/src/Core/Grid/Definition/Factory/FeatureValueGridDefinitionFactory.php
+++ b/src/Core/Grid/Definition/Factory/FeatureValueGridDefinitionFactory.php
@@ -31,6 +31,8 @@
 use PrestaShop\PrestaShop\Core\Grid\Action\Bulk\BulkActionCollectionInterface;
 use PrestaShop\PrestaShop\Core\Grid\Action\GridActionCollection;
 use PrestaShop\PrestaShop\Core\Grid\Action\GridActionCollectionInterface;
+use PrestaShop\PrestaShop\Core\Grid\Action\Row\RowActionCollection;
+use PrestaShop\PrestaShop\Core\Grid\Action\Row\Type\LinkRowAction;
 use PrestaShop\PrestaShop\Core\Grid\Action\Type\LinkGridAction;
 use PrestaShop\PrestaShop\Core\Grid\Action\Type\SimpleGridAction;
 use PrestaShop\PrestaShop\Core\Grid\Column\ColumnCollection;
@@ -103,8 +105,24 @@ protected function getColumns(): ColumnCollectionInterface
             )
             ->add((new ActionColumn('actions'))
             ->setName($this->trans('Actions', [], 'Admin.Global'))
-            // @todo: actions will be added in dedicated PR
-            );
+            ->setOptions([
+                'actions' => (new RowActionCollection())
+                    ->add(
+                        (new LinkRowAction('edit'))
+                            ->setName($this->trans('Edit', [], 'Admin.Actions'))
+                            ->setIcon('edit')
+                            ->setOptions([
+                                'route' => 'admin_feature_values_edit',
+                                'route_param_name' => 'featureValueId',
+                                'route_param_field' => 'id_feature_value',
+                                'extra_route_params' => [
+                                    'featureId' => 'id_feature',
+                                ],
+                            ])
+                    ),
+            ])
+            )
+        ;
     }
 
     /**
diff --git a/src/Core/Grid/Query/FeatureValueQueryBuilder.php b/src/Core/Grid/Query/FeatureValueQueryBuilder.php
index aeca8b7fe7411..aaa18a9fcb3dd 100644
--- a/src/Core/Grid/Query/FeatureValueQueryBuilder.php
+++ b/src/Core/Grid/Query/FeatureValueQueryBuilder.php
@@ -48,7 +48,7 @@ public function __construct(
     public function getSearchQueryBuilder(SearchCriteriaInterface $searchCriteria): QueryBuilder
     {
         $qb = $this->getQueryBuilder($searchCriteria)
-            ->select('fv.id_feature_value, fvl.value')
+            ->select('fv.id_feature, fv.id_feature_value, fvl.value')
             ->groupBy('fv.id_feature_value')
         ;
 
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
index ef92e74143e82..79b353d349339 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
@@ -29,7 +29,8 @@
 namespace PrestaShopBundle\Controller\Admin\Sell\Catalog;
 
 use Exception;
-use PrestaShop\PrestaShop\Core\Domain\Feature\ValueObject\FeatureId;
+use PrestaShop\PrestaShop\Core\Domain\Feature\Query\GetFeatureValueForEditing;
+use PrestaShop\PrestaShop\Core\Domain\Feature\QueryResult\EditableFeatureValue;
 use PrestaShop\PrestaShop\Core\Grid\Factory\FeatureValueGridFactory;
 use PrestaShop\PrestaShop\Core\Search\Filters\FeatureValueFilters;
 use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
@@ -50,14 +51,13 @@ public function indexAction(Request $request, FeatureValueFilters $filters): Res
             'enableSidebar' => true,
             'help_link' => $this->generateSidebarLink($request->attributes->get('_legacy_controller')),
             'featureValueGrid' => $this->presentGrid($featureValueGridFactory->getGrid($filters)),
-            // @todo: uncomment when add action is migrated
-            //            'layoutHeaderToolbarBtn' => [
-            //                'add_feature_value' => [
-            //                    'href' => $this->generateUrl('admin_feature_values_add', ['featureId' => $featureId]),
-            //                    'desc' => $this->trans('Add new feature value', 'Admin.Catalog.Feature'),
-            //                    'icon' => 'add_circle_outline',
-            //                ],
-            //            ],
+            'layoutHeaderToolbarBtn' => [
+                'add_feature_value' => [
+                    'href' => $this->generateUrl('admin_feature_values_add', ['featureId' => $filters->getFeatureId()]),
+                    'desc' => $this->trans('Add new feature value', 'Admin.Catalog.Feature'),
+                    'icon' => 'add_circle_outline',
+                ],
+            ],
         ]);
     }
 
@@ -74,7 +74,7 @@ public function createAction(int $featureId, Request $request): Response
         $featureValueFormBuilder = $this->get('prestashop.core.form.identifiable_object.builder.feature_value_form_builder');
         $featureValueFormHandler = $this->get('prestashop.core.form.identifiable_object.handler.feature_value_form_handler');
 
-        $featureValueForm = $featureValueFormBuilder->getForm();
+        $featureValueForm = $featureValueFormBuilder->getForm(['feature_id' => $featureId]);
         $featureValueForm->handleRequest($request);
 
         try {
@@ -90,11 +90,61 @@ public function createAction(int $featureId, Request $request): Response
         }
 
         return $this->render('@PrestaShop/Admin/Sell/Catalog/Features/FeatureValue/create.html.twig', [
+            'featureId' => $featureId,
             'featureValueForm' => $featureValueForm->createView(),
             'layoutTitle' => $this->trans('New Feature Value', 'Admin.Navigation.Menu'),
         ]);
     }
 
+    /**
+     * @AdminSecurity("is_granted('update', request.get('_legacy_controller'))")
+     *
+     * @param int $featureValueId
+     * @param Request $request
+     *
+     * @return Response
+     */
+    public function editAction(int $featureValueId, Request $request): Response
+    {
+        try {
+            /** @var EditableFeatureValue $featureValueForEditing */
+            $featureValueForEditing = $this->getQueryBus()->handle(new GetFeatureValueForEditing($featureValueId));
+        } catch (Exception $e) {
+            $this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages()));
+
+            return $this->redirectToRoute('admin_features_index');
+        }
+
+        $featureValueFormBuilder = $this->get('prestashop.core.form.identifiable_object.builder.feature_value_form_builder');
+        $featureValueFormHandler = $this->get('prestashop.core.form.identifiable_object.handler.feature_value_form_handler');
+
+        $featureValueForm = $featureValueFormBuilder->getFormFor($featureValueId);
+        $featureValueForm->handleRequest($request);
+
+        try {
+            $handlerResult = $featureValueFormHandler->handleFor((int) $featureValueId, $featureValueForm);
+
+            if ($handlerResult->isSubmitted() && $handlerResult->isValid()) {
+                $this->addFlash('success', $this->trans('Successful update', 'Admin.Notifications.Success'));
+
+                return $this->redirectToRoute('admin_feature_values_index', [
+                    'featureId' => $featureValueForEditing->getFeatureId()->getValue(),
+                ]);
+            }
+        } catch (Exception $e) {
+            $this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages()));
+        }
+
+        return $this->render('@PrestaShop/Admin/Sell/Catalog/Features/FeatureValue/edit.html.twig', [
+            'featureId' => $featureValueForEditing->getFeatureId()->getValue(),
+            'featureValueForm' => $featureValueForm->createView(),
+            'layoutTitle' => $this->trans(
+                'Feature value',
+                'Admin.Navigation.Menu',
+            ),
+        ]);
+    }
+
     private function getErrorMessages(): array
     {
         //@todo:
diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Catalog/FeatureValueType.php b/src/PrestaShopBundle/Form/Admin/Sell/Catalog/FeatureValueType.php
index 0f450fec2e07e..865e2a8585d55 100644
--- a/src/PrestaShopBundle/Form/Admin/Sell/Catalog/FeatureValueType.php
+++ b/src/PrestaShopBundle/Form/Admin/Sell/Catalog/FeatureValueType.php
@@ -34,7 +34,7 @@
 use PrestaShopBundle\Form\Admin\Type\TranslatableType;
 use PrestaShopBundle\Form\Admin\Type\TranslatorAwareType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Validator\Constraints\Length;
@@ -56,23 +56,28 @@ public function __construct(
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
+            ->add('feature_value_id', HiddenType::class)
             ->add('feature_id', ChoiceType::class, [
                 'choices' => $this->featureChoiceProvider->getChoices(),
                 'label' => $this->trans('Feature', 'Admin.Global'),
+                'data' => $builder->getData()['feature_id'] ?? null,
+                'attr' => [
+                    // disable feature id choices when editing feature value and only allow changing them when creating new one
+                    'disabled' => isset($builder->getData()['feature_value_id']),
+                ],
             ])
             ->add('value', TranslatableType::class, [
                 'label' => $this->trans('Value', 'Admin.Global'),
-                'type' => TextType::class,
                 'constraints' => [
                     new DefaultLanguage(),
-                    //@todo: replace with constant
-                    new Length(['max' => 255]),
                 ],
                 'options' => [
                     'constraints' => [
                         new TypedRegex([
                             'type' => 'generic_name',
                         ]),
+                        //@todo: replace with constant
+                        new Length(['max' => 255]),
                     ],
                 ],
                 'help' => $this->trans('Invalid characters: %chars%', 'Admin.Notifications.Info', ['%chars%' => '<>={}']),
diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml
index f2cda00fdb1c8..47f2e7316ff22 100644
--- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml
+++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml
@@ -116,3 +116,14 @@ admin_feature_values_add:
     _legacy_feature_flag: feature
     redirectQueryParamsToKeep:
       - 'featureId'
+
+admin_feature_values_edit:
+  path: /{featureId}/values/{featureValueId}/edit
+  methods: [ GET, POST ]
+  defaults:
+    _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureValueController::editAction
+    _legacy_controller: AdminFeatures
+    _legacy_link: AdminFeatures:updatefeature_value
+    _legacy_feature_flag: feature
+    redirectQueryParamsToKeep:
+      - 'featureId'
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/Blocks/form.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/Blocks/form.html.twig
index d6de32469df09..17af8bca18c33 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/Blocks/form.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/Blocks/form.html.twig
@@ -39,13 +39,22 @@
     </div>
 
     <div class="card-footer">
-{# @todo: redirect to feature view page #}
-      <a href="{{ path('admin_features_index') }}" class="btn btn-outline-secondary">
+      <a href="{{ path('admin_features_index', {'featureId': featureId}) }}" class="btn btn-outline-secondary">
         {{ 'Cancel'|trans({}, 'Admin.Actions') }}
       </a>
-      <button class="btn btn-primary float-right" id="save-button">
+      <div class="float-right">
+        {# render save-and-add-new button only in edit page #}
+        {# @todo: how to identify and redirect to add page based if this button was submitted?#}
+        {% if featureValueForm.vars.data.feature_value_id is defined %}
+          <button class="btn btn-primary" id="save-and-add-new-button">
+            {{ 'Save then add another value'|trans({}, 'Admin.Catalog.Feature') }}
+          </button>
+        {% endif %}
+      <button class="btn btn-primary" id="save-button">
         {{ 'Save'|trans({}, 'Admin.Actions') }}
       </button>
+      </div>
+
     </div>
   </div>
   {{ form_end(featureValueForm) }}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/edit.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/edit.html.twig
index 827bd873ea8fa..5620fce58c2c0 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/edit.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/edit.html.twig
@@ -26,13 +26,11 @@
 
 {% block content %}
     {% include '@PrestaShop/Admin/Sell/Catalog/Features/FeatureValue/Blocks/form.html.twig' with {
-      featureForm: featureValueForm
+      featureValueForm: featureValueForm
     } %}
-  {% endif %}
 {% endblock %}
 
 {% block javascripts %}
   {{ parent() }}
-  {# @todo: this js doesn't exist yet #}
   <script src="{{ asset('themes/new-theme/public/feature_value_form.bundle.js') }}"></script>
 {% endblock %}

From b1eb7eef79b509ddf52e390b8e5ac29f2b21bc7a Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Fri, 23 Jun 2023 17:24:50 +0300
Subject: [PATCH 0280/1030]  introdue FeatureValue settings for constatnts

---
 classes/FeatureValue.php                      |  4 +-
 .../Domain/Feature/FeatureValueSettings.php   | 47 +++++++++++++++++++
 .../Admin/Sell/Catalog/FeatureValueType.php   |  4 +-
 3 files changed, 52 insertions(+), 3 deletions(-)
 create mode 100644 src/Core/Domain/Feature/FeatureValueSettings.php

diff --git a/classes/FeatureValue.php b/classes/FeatureValue.php
index 78afeefe6ebbc..85ef0ddb080d4 100644
--- a/classes/FeatureValue.php
+++ b/classes/FeatureValue.php
@@ -24,6 +24,8 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
+use PrestaShop\PrestaShop\Core\Domain\Feature\FeatureValueSettings;
+
 /**
  * Class FeatureValueCore.
  */
@@ -50,7 +52,7 @@ class FeatureValueCore extends ObjectModel
             'custom' => ['type' => self::TYPE_BOOL, 'validate' => 'isBool'],
 
             /* Lang fields */
-            'value' => ['type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'required' => true, 'size' => 255],
+            'value' => ['type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'required' => true, 'size' => FeatureValueSettings::VALUE_MAX_LENGTH],
         ],
     ];
 
diff --git a/src/Core/Domain/Feature/FeatureValueSettings.php b/src/Core/Domain/Feature/FeatureValueSettings.php
new file mode 100644
index 0000000000000..5512769aad7c9
--- /dev/null
+++ b/src/Core/Domain/Feature/FeatureValueSettings.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\Feature;
+
+/**
+ * Holds constants for FeatureValue when those settings doesn't have its own dedicated Value Objects
+ */
+class FeatureValueSettings
+{
+    /**
+     * Maximum allowed length for feature value "value" property
+     */
+    public const VALUE_MAX_LENGTH = 255;
+
+    /**
+     * This class is not supposed to be initialized
+     */
+    private function __construct()
+    {
+    }
+}
diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Catalog/FeatureValueType.php b/src/PrestaShopBundle/Form/Admin/Sell/Catalog/FeatureValueType.php
index 865e2a8585d55..b948d179874da 100644
--- a/src/PrestaShopBundle/Form/Admin/Sell/Catalog/FeatureValueType.php
+++ b/src/PrestaShopBundle/Form/Admin/Sell/Catalog/FeatureValueType.php
@@ -30,6 +30,7 @@
 
 use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\DefaultLanguage;
 use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\TypedRegex;
+use PrestaShop\PrestaShop\Core\Domain\Feature\FeatureValueSettings;
 use PrestaShop\PrestaShop\Core\Form\FormChoiceProviderInterface;
 use PrestaShopBundle\Form\Admin\Type\TranslatableType;
 use PrestaShopBundle\Form\Admin\Type\TranslatorAwareType;
@@ -76,8 +77,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                         new TypedRegex([
                             'type' => 'generic_name',
                         ]),
-                        //@todo: replace with constant
-                        new Length(['max' => 255]),
+                        new Length(['max' => FeatureValueSettings::VALUE_MAX_LENGTH]),
                     ],
                 ],
                 'help' => $this->trans('Invalid characters: %chars%', 'Admin.Notifications.Info', ['%chars%' => '<>={}']),

From a162302f44e2d56686c504333210e9116a47f356 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Fri, 23 Jun 2023 17:42:33 +0300
Subject: [PATCH 0281/1030]  fix save-and-add functionallity

---
 .../Sell/Catalog/FeatureValueController.php   | 37 ++++++++++++-------
 .../FeatureValue/Blocks/form.html.twig        | 16 +++-----
 2 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
index 79b353d349339..53b419f1db237 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
@@ -29,8 +29,6 @@
 namespace PrestaShopBundle\Controller\Admin\Sell\Catalog;
 
 use Exception;
-use PrestaShop\PrestaShop\Core\Domain\Feature\Query\GetFeatureValueForEditing;
-use PrestaShop\PrestaShop\Core\Domain\Feature\QueryResult\EditableFeatureValue;
 use PrestaShop\PrestaShop\Core\Grid\Factory\FeatureValueGridFactory;
 use PrestaShop\PrestaShop\Core\Search\Filters\FeatureValueFilters;
 use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
@@ -40,6 +38,12 @@
 
 class FeatureValueController extends FrameworkBundleAdminController
 {
+    /**
+     * Button name which when submitted indicates that after form submission
+     * user wants to be redirected to ADD NEW form to add additional value
+     */
+    private const SAVE_AND_ADD_BUTTON_NAME = 'save-and-add-new';
+
     /**
      * @AdminSecurity("is_granted('read', request.get('_legacy_controller'))")
      */
@@ -83,6 +87,14 @@ public function createAction(int $featureId, Request $request): Response
             if (null !== $handlerResult->getIdentifiableObjectId()) {
                 $this->addFlash('success', $this->trans('Successful creation', 'Admin.Notifications.Success'));
 
+                $this->addFlash('success', $this->trans('Successful update', 'Admin.Notifications.Success'));
+
+                if ($request->request->has(self::SAVE_AND_ADD_BUTTON_NAME)) {
+                    return $this->redirectToRoute('admin_feature_values_add', [
+                        'featureId' => $featureId,
+                    ]);
+                }
+
                 return $this->redirectToRoute('admin_features_index');
             }
         } catch (Exception $e) {
@@ -104,17 +116,8 @@ public function createAction(int $featureId, Request $request): Response
      *
      * @return Response
      */
-    public function editAction(int $featureValueId, Request $request): Response
+    public function editAction(int $featureId, int $featureValueId, Request $request): Response
     {
-        try {
-            /** @var EditableFeatureValue $featureValueForEditing */
-            $featureValueForEditing = $this->getQueryBus()->handle(new GetFeatureValueForEditing($featureValueId));
-        } catch (Exception $e) {
-            $this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages()));
-
-            return $this->redirectToRoute('admin_features_index');
-        }
-
         $featureValueFormBuilder = $this->get('prestashop.core.form.identifiable_object.builder.feature_value_form_builder');
         $featureValueFormHandler = $this->get('prestashop.core.form.identifiable_object.handler.feature_value_form_handler');
 
@@ -127,8 +130,14 @@ public function editAction(int $featureValueId, Request $request): Response
             if ($handlerResult->isSubmitted() && $handlerResult->isValid()) {
                 $this->addFlash('success', $this->trans('Successful update', 'Admin.Notifications.Success'));
 
+                if ($request->request->has(self::SAVE_AND_ADD_BUTTON_NAME)) {
+                    return $this->redirectToRoute('admin_feature_values_add', [
+                        'featureId' => $featureId,
+                    ]);
+                }
+
                 return $this->redirectToRoute('admin_feature_values_index', [
-                    'featureId' => $featureValueForEditing->getFeatureId()->getValue(),
+                    'featureId' => $featureId,
                 ]);
             }
         } catch (Exception $e) {
@@ -136,7 +145,7 @@ public function editAction(int $featureValueId, Request $request): Response
         }
 
         return $this->render('@PrestaShop/Admin/Sell/Catalog/Features/FeatureValue/edit.html.twig', [
-            'featureId' => $featureValueForEditing->getFeatureId()->getValue(),
+            'featureId' => $featureId,
             'featureValueForm' => $featureValueForm->createView(),
             'layoutTitle' => $this->trans(
                 'Feature value',
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/Blocks/form.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/Blocks/form.html.twig
index 17af8bca18c33..f1dde36ba79e7 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/Blocks/form.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/Blocks/form.html.twig
@@ -43,16 +43,12 @@
         {{ 'Cancel'|trans({}, 'Admin.Actions') }}
       </a>
       <div class="float-right">
-        {# render save-and-add-new button only in edit page #}
-        {# @todo: how to identify and redirect to add page based if this button was submitted?#}
-        {% if featureValueForm.vars.data.feature_value_id is defined %}
-          <button class="btn btn-primary" id="save-and-add-new-button">
-            {{ 'Save then add another value'|trans({}, 'Admin.Catalog.Feature') }}
-          </button>
-        {% endif %}
-      <button class="btn btn-primary" id="save-button">
-        {{ 'Save'|trans({}, 'Admin.Actions') }}
-      </button>
+        <button type="submit" class="btn btn-primary" name="save-and-add-new">
+          {{ 'Save then add another value'|trans({}, 'Admin.Catalog.Feature') }}
+        </button>
+        <button type="submit" class="btn btn-primary" id="save-button">
+          {{ 'Save'|trans({}, 'Admin.Actions') }}
+        </button>
       </div>
 
     </div>

From 1b4a3944a276214f671d4257c5320c7b13cdb27e Mon Sep 17 00:00:00 2001
From: boherm <boris.hermans@prestashop.com>
Date: Fri, 16 Jun 2023 09:39:01 +0200
Subject: [PATCH 0282/1030] Add DotEnv support in console and admin entry
 points

---
 .gitignore          |  5 +++++
 admin-dev/index.php | 12 ++++++++++++
 bin/console         | 13 ++++++++++++-
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 040bf14cc02dd..507cdae348247 100644
--- a/.gitignore
+++ b/.gitignore
@@ -217,3 +217,8 @@ tools/build/releases/*
 # Docker configuration
 install.lock
 docker-compose.override.yml
+
+# DotEnv files
+/.env.local
+/.env.local.php
+/.env.*.local
diff --git a/admin-dev/index.php b/admin-dev/index.php
index ca8ae91605d7b..85909952daf6b 100644
--- a/admin-dev/index.php
+++ b/admin-dev/index.php
@@ -24,6 +24,7 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 use PrestaShopBundle\Api\Api;
+use Symfony\Component\Dotenv\Dotenv;
 use Symfony\Component\ErrorHandler\Debug;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
@@ -70,6 +71,17 @@
 if (_PS_MODE_DEV_) {
     Debug::enable();
 }
+
+// Loads .env file from the root of project if present
+$dotEnvFile = dirname(__FILE__, 2) . '/.env';
+if (file_exists($dotEnvFile)) {
+    (new Dotenv())
+        // DO NOT use putEnv
+        ->usePutenv(false)
+        ->loadEnv($dotEnvFile, _PS_ENV_)
+    ;
+}
+
 require_once __DIR__ . '/../app/AppKernel.php';
 
 $kernel = new AppKernel(_PS_ENV_, _PS_MODE_DEV_);
diff --git a/bin/console b/bin/console
index ef24799ce55e6..5ec36acfbeaba 100755
--- a/bin/console
+++ b/bin/console
@@ -3,6 +3,7 @@
 
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\Dotenv\Dotenv;
 use Symfony\Component\ErrorHandler\Debug;
 
 // if you don't want to setup permissions the proper way, just uncomment the following PHP line
@@ -19,7 +20,17 @@ $env = $input->getParameterOption(['--env', '-e'], getenv('SYMFONY_ENV') ?: 'dev
 $debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(['--no-debug', '']) && $env !== 'prod';
 
 if ($debug) {
-  Debug::enable();
+    Debug::enable();
+}
+
+// Loads .env file from the root of project if present
+$dotEnvFile = dirname(__FILE__, 2) . '/.env';
+if (file_exists($dotEnvFile)) {
+    (new Dotenv())
+    // DO NOT use putEnv
+        ->usePutenv(false)
+        ->loadEnv($dotEnvFile, _PS_ENV_)
+  ;
 }
 
 $kernel = new AppKernel($env, $debug);

From 303e0dfdf2fe968bbe8124e4467e3814a5fae90b Mon Sep 17 00:00:00 2001
From: boherm <boris.hermans@prestashop.com>
Date: Fri, 16 Jun 2023 09:40:42 +0200
Subject: [PATCH 0283/1030] Add type in feature flags entity and installed data

---
 classes/FeatureFlag.php                      | 11 ++++++
 install-dev/data/xml/feature_flag.xml        | 31 ++++++++--------
 src/Core/FeatureFlag/FeatureFlagSettings.php | 10 ++++++
 src/PrestaShopBundle/Entity/FeatureFlag.php  | 38 ++++++++++++++++++++
 4 files changed, 75 insertions(+), 15 deletions(-)

diff --git a/classes/FeatureFlag.php b/classes/FeatureFlag.php
index 251c425e21cfc..556d0f5fcf58d 100644
--- a/classes/FeatureFlag.php
+++ b/classes/FeatureFlag.php
@@ -39,6 +39,11 @@ class FeatureFlagCore extends ObjectModel
      */
     public $name;
 
+    /**
+     * @var string
+     */
+    public $type;
+
     /**
      * @var string
      */
@@ -77,6 +82,12 @@ class FeatureFlagCore extends ObjectModel
         'primary' => 'id_feature_flag',
         'fields' => [
             'name' => ['type' => self::TYPE_STRING, 'required' => true, 'size' => 191],
+            'type' => [
+                'type' => self::TYPE_STRING,
+                'required' => true,
+                'size' => 64,
+                'default' => FeatureFlagSettings::TYPE_DB,
+            ],
             'label_wording' => ['type' => self::TYPE_STRING, 'required' => true, 'size' => 191],
             'label_domain' => ['type' => self::TYPE_STRING, 'required' => true, 'size' => 255],
             'description_wording' => ['type' => self::TYPE_STRING, 'required' => true, 'size' => 191],
diff --git a/install-dev/data/xml/feature_flag.xml b/install-dev/data/xml/feature_flag.xml
index dc0b86a6bbe95..348c0a3f21933 100644
--- a/install-dev/data/xml/feature_flag.xml
+++ b/install-dev/data/xml/feature_flag.xml
@@ -2,6 +2,7 @@
 <entity_feature_flag>
   <fields id="name" class="FeatureFlag">
     <field name="name"/>
+    <field name="type"/>
     <field name="label_wording"/>
     <field name="label_domain"/>
     <field name="description_wording"/>
@@ -10,20 +11,20 @@
     <field name="stability"/>
   </fields>
   <entities>
-    <feature_flag id="product_page_v2" name="product_page_v2" label_wording="New product page" label_domain="Admin.Advparameters.Feature" description_wording="This page benefits from increased performance and includes new features such as a new combination management system." description_domain="Admin.Advparameters.Help" state="1" stability="stable" />
-    <feature_flag id="attribute_group" name="attribute_group" label_wording="Attribute group" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable migrated attribute group page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
-    <feature_flag id="authorization_server" name="authorization_server" label_wording="Authorization server" label_domain="Admin.Advparameters.Feature" description_wording="Enable or disable the authorization server page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
-    <feature_flag id="cart_rule" name="cart_rule" label_wording="Cart rules" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated cart rules page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
-    <feature_flag id="catalog_price_rule" name="catalog_price_rule" label_wording="Catalog price rules" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated catalog price rules page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
-    <feature_flag id="multiple_image_format" name="multiple_image_format" label_wording="Multiple image formats" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable having more than one image format (jpg, webp, avif, png, etc.)" description_domain="Admin.Advparameters.Help" state="0" stability="stable" />
-    <feature_flag id="country" name="country" label_wording="Countries" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated countries page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
-    <feature_flag id="state" name="state" label_wording="States" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated states page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
-    <feature_flag id="carrier" name="carrier" label_wording="Carriers" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated carriers page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
-    <feature_flag id="title" name="title" label_wording="Titles" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated titles page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
-    <feature_flag id="permission" name="permission" label_wording="Permissions" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated permissions page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
-    <feature_flag id="tax_rules_group" name="tax_rules_group" label_wording="Tax rule groups" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated tax rules page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
-    <feature_flag id="customer_threads" name="customer_threads" label_wording="Customer threads" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated customer threads page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
-    <feature_flag id="order_state" name="order_state" label_wording="Order states" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated order states page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
-    <feature_flag id="feature" name="feature" label_wording="Features" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated features page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
+    <feature_flag id="product_page_v2" name="product_page_v2" type="db" label_wording="New product page" label_domain="Admin.Advparameters.Feature" description_wording="This page benefits from increased performance and includes new features such as a new combination management system." description_domain="Admin.Advparameters.Help" state="1" stability="stable" />
+    <feature_flag id="attribute_group" name="attribute_group" type="db" label_wording="Attribute group" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable migrated attribute group page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
+    <feature_flag id="authorization_server" name="authorization_server" type="db" label_wording="Authorization server" label_domain="Admin.Advparameters.Feature" description_wording="Enable or disable the authorization server page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
+    <feature_flag id="cart_rule" name="cart_rule" type="db" label_wording="Cart rules" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated cart rules page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
+    <feature_flag id="catalog_price_rule" name="catalog_price_rule" type="db" label_wording="Catalog price rules" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated catalog price rules page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
+    <feature_flag id="multiple_image_format" name="multiple_image_format" type="db" label_wording="Multiple image formats" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable having more than one image format (jpg, webp, avif, png, etc.)" description_domain="Admin.Advparameters.Help" state="0" stability="stable" />
+    <feature_flag id="country" name="country" type="db" label_wording="Countries" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated countries page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
+    <feature_flag id="state" name="state" type="db" label_wording="States" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated states page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
+    <feature_flag id="carrier" name="carrier" type="db" label_wording="Carriers" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated carriers page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
+    <feature_flag id="title" name="title" type="db" label_wording="Titles" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated titles page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
+    <feature_flag id="permission" name="permission" type="db" label_wording="Permissions" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated permissions page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
+    <feature_flag id="tax_rules_group" name="tax_rules_group" type="db" label_wording="Tax rule groups" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated tax rules page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
+    <feature_flag id="customer_threads" name="customer_threads" type="db" label_wording="Customer threads" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated customer threads page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
+    <feature_flag id="order_state" name="order_state" type="db" label_wording="Order states" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated order states page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
+    <feature_flag id="feature" name="feature" type="db" label_wording="Features" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated features page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
   </entities>
 </entity_feature_flag>
diff --git a/src/Core/FeatureFlag/FeatureFlagSettings.php b/src/Core/FeatureFlag/FeatureFlagSettings.php
index b3343aab166fa..2d088c36746af 100644
--- a/src/Core/FeatureFlag/FeatureFlagSettings.php
+++ b/src/Core/FeatureFlag/FeatureFlagSettings.php
@@ -30,9 +30,19 @@
 
 class FeatureFlagSettings
 {
+    /**
+     * Stability consts
+     */
     public const STABILITY_STABLE = 'stable';
     public const STABILITY_BETA = 'beta';
 
+    /**
+     * Type consts
+     */
+    public const TYPE_DB = 'db';
+    public const TYPE_ENV = 'env';
+    public const TYPE_DOTENV = 'dotenv';
+
     /**
      * @deprecated Deprecated in 8.1 will be removed in next major.
      */
diff --git a/src/PrestaShopBundle/Entity/FeatureFlag.php b/src/PrestaShopBundle/Entity/FeatureFlag.php
index 36043e9e84df3..2d690f297db27 100644
--- a/src/PrestaShopBundle/Entity/FeatureFlag.php
+++ b/src/PrestaShopBundle/Entity/FeatureFlag.php
@@ -58,6 +58,13 @@ class FeatureFlag
      */
     private $name;
 
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="type", type="string", length=64, options={"default":"db"})
+     */
+    private $type;
+
     /**
      * @var bool
      *
@@ -109,6 +116,7 @@ public function __construct(string $name)
             throw new InvalidArgumentException('Feature flag name cannot be empty');
         }
         $this->name = $name;
+        $this->type = FeatureFlagSettings::TYPE_DB;
         $this->state = false;
         $this->descriptionWording = '';
         $this->descriptionDomain = '';
@@ -260,4 +268,34 @@ public function setStability(string $stability): self
 
         return $this;
     }
+
+    /**
+     * @return string
+     */
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    /**
+     * Retrieve order of feature flags type
+     *
+     * @return array
+     */
+    public function getTypeOrder(): array
+    {
+        return explode(',', $this->type);
+    }
+
+    /**
+     * @param string $type
+     *
+     * @return self
+     */
+    public function setType(string $type): self
+    {
+        $this->type = $type;
+
+        return $this;
+    }
 }

From 928e5cc2c15bbff597474502f76eb105a29e4aec Mon Sep 17 00:00:00 2001
From: boherm <boris.hermans@prestashop.com>
Date: Fri, 16 Jun 2023 09:41:53 +0200
Subject: [PATCH 0284/1030] Add Handlers for feature flags

---
 install-dev/data/xml/feature_flag.xml         |  30 ++--
 src/Core/FeatureFlag/FeatureFlagService.php   | 127 +++++++++++++++++
 .../FeatureFlag/Handler/AbstractHandler.php   |  42 ++++++
 src/Core/FeatureFlag/Handler/DbHandler.php    |  81 +++++++++++
 .../FeatureFlag/Handler/DotEnvHandler.php     | 129 ++++++++++++++++++
 src/Core/FeatureFlag/Handler/EnvHandler.php   |  92 +++++++++++++
 src/Core/FeatureFlag/TypeHandlerInterface.php |  62 +++++++++
 .../config/services/core/feature_flag.yml     |  11 ++
 8 files changed, 559 insertions(+), 15 deletions(-)
 create mode 100644 src/Core/FeatureFlag/FeatureFlagService.php
 create mode 100644 src/Core/FeatureFlag/Handler/AbstractHandler.php
 create mode 100644 src/Core/FeatureFlag/Handler/DbHandler.php
 create mode 100644 src/Core/FeatureFlag/Handler/DotEnvHandler.php
 create mode 100644 src/Core/FeatureFlag/Handler/EnvHandler.php
 create mode 100644 src/Core/FeatureFlag/TypeHandlerInterface.php
 create mode 100644 src/PrestaShopBundle/Resources/config/services/core/feature_flag.yml

diff --git a/install-dev/data/xml/feature_flag.xml b/install-dev/data/xml/feature_flag.xml
index 348c0a3f21933..e3c531e8a24d4 100644
--- a/install-dev/data/xml/feature_flag.xml
+++ b/install-dev/data/xml/feature_flag.xml
@@ -11,20 +11,20 @@
     <field name="stability"/>
   </fields>
   <entities>
-    <feature_flag id="product_page_v2" name="product_page_v2" type="db" label_wording="New product page" label_domain="Admin.Advparameters.Feature" description_wording="This page benefits from increased performance and includes new features such as a new combination management system." description_domain="Admin.Advparameters.Help" state="1" stability="stable" />
-    <feature_flag id="attribute_group" name="attribute_group" type="db" label_wording="Attribute group" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable migrated attribute group page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
-    <feature_flag id="authorization_server" name="authorization_server" type="db" label_wording="Authorization server" label_domain="Admin.Advparameters.Feature" description_wording="Enable or disable the authorization server page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
-    <feature_flag id="cart_rule" name="cart_rule" type="db" label_wording="Cart rules" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated cart rules page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
-    <feature_flag id="catalog_price_rule" name="catalog_price_rule" type="db" label_wording="Catalog price rules" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated catalog price rules page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
-    <feature_flag id="multiple_image_format" name="multiple_image_format" type="db" label_wording="Multiple image formats" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable having more than one image format (jpg, webp, avif, png, etc.)" description_domain="Admin.Advparameters.Help" state="0" stability="stable" />
-    <feature_flag id="country" name="country" type="db" label_wording="Countries" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated countries page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
-    <feature_flag id="state" name="state" type="db" label_wording="States" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated states page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
-    <feature_flag id="carrier" name="carrier" type="db" label_wording="Carriers" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated carriers page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
-    <feature_flag id="title" name="title" type="db" label_wording="Titles" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated titles page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
-    <feature_flag id="permission" name="permission" type="db" label_wording="Permissions" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated permissions page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
-    <feature_flag id="tax_rules_group" name="tax_rules_group" type="db" label_wording="Tax rule groups" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated tax rules page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
-    <feature_flag id="customer_threads" name="customer_threads" type="db" label_wording="Customer threads" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated customer threads page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
-    <feature_flag id="order_state" name="order_state" type="db" label_wording="Order states" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated order states page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
-    <feature_flag id="feature" name="feature" type="db" label_wording="Features" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated features page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
+    <feature_flag id="product_page_v2" name="product_page_v2" type="env,dotenv,db" label_wording="New product page" label_domain="Admin.Advparameters.Feature" description_wording="This page benefits from increased performance and includes new features such as a new combination management system." description_domain="Admin.Advparameters.Help" state="1" stability="stable" />
+    <feature_flag id="attribute_group" name="attribute_group" type="env,dotenv,db" label_wording="Attribute group" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable migrated attribute group page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
+    <feature_flag id="authorization_server" name="authorization_server" type="env,dotenv,db" label_wording="Authorization server" label_domain="Admin.Advparameters.Feature" description_wording="Enable or disable the authorization server page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
+    <feature_flag id="cart_rule" name="cart_rule" type="env,dotenv,db" label_wording="Cart rules" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated cart rules page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
+    <feature_flag id="catalog_price_rule" name="catalog_price_rule" type="env,dotenv,db" label_wording="Catalog price rules" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated catalog price rules page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
+    <feature_flag id="multiple_image_format" name="multiple_image_format" type="env,dotenv,db" label_wording="Multiple image formats" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable having more than one image format (jpg, webp, avif, png, etc.)" description_domain="Admin.Advparameters.Help" state="0" stability="stable" />
+    <feature_flag id="country" name="country" type="env,dotenv,db" label_wording="Countries" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated countries page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
+    <feature_flag id="state" name="state" type="env,dotenv,db" label_wording="States" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated states page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
+    <feature_flag id="carrier" name="carrier" type="env,dotenv,db" label_wording="Carriers" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated carriers page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
+    <feature_flag id="title" name="title" type="env,dotenv,db" label_wording="Titles" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated titles page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
+    <feature_flag id="permission" name="permission" type="env,dotenv,db" label_wording="Permissions" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated permissions page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
+    <feature_flag id="tax_rules_group" name="tax_rules_group" type="env,dotenv,db" label_wording="Tax rule groups" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated tax rules page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
+    <feature_flag id="customer_threads" name="customer_threads" type="env,dotenv,db" label_wording="Customer threads" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated customer threads page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
+    <feature_flag id="order_state" name="order_state" type="env,dotenv,db" label_wording="Order states" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated order states page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
+    <feature_flag id="feature" name="feature" type="env,dotenv,db" label_wording="Features" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated features page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
   </entities>
 </entity_feature_flag>
diff --git a/src/Core/FeatureFlag/FeatureFlagService.php b/src/Core/FeatureFlag/FeatureFlagService.php
new file mode 100644
index 0000000000000..153212e0a55f3
--- /dev/null
+++ b/src/Core/FeatureFlag/FeatureFlagService.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\FeatureFlag;
+
+use PrestaShop\PrestaShop\Core\FeatureFlag\Handler\DbHandler;
+use PrestaShop\PrestaShop\Core\FeatureFlag\Handler\DotEnvHandler;
+use PrestaShop\PrestaShop\Core\FeatureFlag\Handler\EnvHandler;
+use PrestaShopBundle\Entity\Repository\FeatureFlagRepository;
+use Psr\Container\ContainerInterface;
+use Symfony\Contracts\Service\ServiceSubscriberInterface;
+
+class FeatureFlagService implements ServiceSubscriberInterface
+{
+    public function __construct(
+        private readonly ContainerInterface $locator,
+        private readonly FeatureFlagRepository $featureFlagRepository
+    ) {
+    }
+
+    /**
+     * Subscribe all handlers in this service container.
+     *
+     * @return string[]
+     */
+    public static function getSubscribedServices(): array
+    {
+        return [
+            FeatureFlagSettings::TYPE_ENV => EnvHandler::class,
+            FeatureFlagSettings::TYPE_DOTENV => DotEnvHandler::class,
+            FeatureFlagSettings::TYPE_DB => DbHandler::class,
+        ];
+    }
+
+    /**
+     * Get used handle for the feature flag.
+     */
+    private function getHandler(string $featureFlagName): TypeHandlerInterface
+    {
+        $featureFlag = $this->featureFlagRepository->getByName($featureFlagName);
+        if (null !== $featureFlag) {
+            foreach ($featureFlag->getTypeOrder() as $type) {
+                if ($this->locator->has($type)) {
+                    $handler = $this->locator->get($type);
+                    if ($handler->canBeUsed($featureFlagName)) {
+                        return $handler;
+                    }
+                }
+            }
+            throw new \RuntimeException(sprintf('No handler can be used for feature flag %s.', $featureFlagName));
+        }
+        throw new \RuntimeException(sprintf('The feature flag %s doesn\'t exist.', $featureFlagName));
+    }
+
+    /**
+     * Get type of handler used by this feature flag.
+     */
+    public function getTypeUsed(string $featureFlagName): string
+    {
+        return $this->getHandler($featureFlagName)->getTypeName();
+    }
+
+    /**
+     * Is the handler used by this feature flag read only?
+     */
+    public function isReadonly(string $featureFlagName): bool
+    {
+        return $this->getHandler($featureFlagName)->isReadonly();
+    }
+
+    /**
+     * Is this feature flag enable?
+     */
+    public function isEnabled(string $featureFlagName): bool
+    {
+        return $this->getHandler($featureFlagName)->isEnabled($featureFlagName);
+    }
+
+    /**
+     * Is this feature flag disable?
+     */
+    public function isDisabled(string $featureFlagName): bool
+    {
+        return !$this->isEnabled($featureFlagName);
+    }
+
+    /**
+     * Enable the feature flag by his handler.
+     */
+    public function enable(string $featureFlagName): void
+    {
+        $this->getHandler($featureFlagName)->enable($featureFlagName);
+    }
+
+    /**
+     * Disable the feature flag by his handler.
+     */
+    public function disable(string $featureFlagName): void
+    {
+        $this->getHandler($featureFlagName)->disable($featureFlagName);
+    }
+}
diff --git a/src/Core/FeatureFlag/Handler/AbstractHandler.php b/src/Core/FeatureFlag/Handler/AbstractHandler.php
new file mode 100644
index 0000000000000..0bd53db8d0a79
--- /dev/null
+++ b/src/Core/FeatureFlag/Handler/AbstractHandler.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\FeatureFlag\Handler;
+
+use PrestaShop\PrestaShop\Core\FeatureFlag\TypeHandlerInterface;
+
+abstract class AbstractHandler implements TypeHandlerInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function isReadonly(): bool
+    {
+        return false;
+    }
+}
diff --git a/src/Core/FeatureFlag/Handler/DbHandler.php b/src/Core/FeatureFlag/Handler/DbHandler.php
new file mode 100644
index 0000000000000..dd18b69173790
--- /dev/null
+++ b/src/Core/FeatureFlag/Handler/DbHandler.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\FeatureFlag\Handler;
+
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
+use PrestaShopBundle\Entity\Repository\FeatureFlagRepository;
+
+class DbHandler extends AbstractHandler
+{
+    public function __construct(
+        protected readonly FeatureFlagRepository $featureFlagRepository
+    ) {
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTypeName(): string
+    {
+        return FeatureFlagSettings::TYPE_DB;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function canBeUsed(string $featureFlagName): bool
+    {
+        // It's always possible via DB!
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isEnabled(string $featureFlagName): bool
+    {
+        return $this->featureFlagRepository->isEnabled($featureFlagName);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function enable(string $featureFlagName): void
+    {
+        $this->featureFlagRepository->enable($featureFlagName);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function disable(string $featureFlagName): void
+    {
+        $this->featureFlagRepository->disable($featureFlagName);
+    }
+}
diff --git a/src/Core/FeatureFlag/Handler/DotEnvHandler.php b/src/Core/FeatureFlag/Handler/DotEnvHandler.php
new file mode 100644
index 0000000000000..28260b9c63fa9
--- /dev/null
+++ b/src/Core/FeatureFlag/Handler/DotEnvHandler.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\FeatureFlag\Handler;
+
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
+
+class DotEnvHandler extends AbstractHandler
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getTypeName(): string
+    {
+        return FeatureFlagSettings::TYPE_DOTENV;
+    }
+
+    /**
+     * Retrieve the variable name of this feature flag.
+     */
+    public function getVarName(string $featureFlagName): string
+    {
+        return 'PS_FF_' . strtoupper($featureFlagName);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function canBeUsed(string $featureFlagName): bool
+    {
+        return isset($_ENV['SYMFONY_DOTENV_VARS']) && str_contains($_ENV['SYMFONY_DOTENV_VARS'], $this->getVarName($featureFlagName));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isEnabled(string $featureFlagName): bool
+    {
+        return isset($_ENV[$this->getVarName($featureFlagName)]) && strtoupper($_ENV[$this->getVarName($featureFlagName)]) === 'TRUE';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function enable(string $featureFlagName): void
+    {
+        $this->setStatus($featureFlagName, true);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function disable(string $featureFlagName): void
+    {
+        $this->setStatus($featureFlagName, false);
+    }
+
+    /**
+     * Retrieve dotenv file used with this feature flag set.
+     */
+    private function locateDotEnvFile(string $featureFlagName): string
+    {
+        $env = _PS_ENV_;
+        $filesToCheck = [".env.$env.local", ".env.$env", '.env'];
+
+        foreach ($filesToCheck as $file) {
+            $path = _PS_ROOT_DIR_ . '/' . $file;
+            if (file_exists($path) && str_contains(file_get_contents($path), $this->getVarName($featureFlagName))) {
+                return $path;
+            }
+        }
+
+        return '';
+    }
+
+    /**
+     * Set feature flag status in the good dotenv file.
+     */
+    private function setStatus(string $featureFlagName, bool $status): void
+    {
+        if ($pathDotenv = $this->locateDotEnvFile($featureFlagName)) {
+            file_put_contents(
+                $pathDotenv,
+                str_ireplace(
+                    "{$this->getVarName($featureFlagName)}=" . $this->boolLabel($this->isEnabled($featureFlagName)),
+                    "{$this->getVarName($featureFlagName)}=" . $this->boolLabel($status),
+                    file_get_contents($pathDotenv)
+                )
+            );
+
+            return;
+        }
+
+        throw new \RuntimeException(sprintf('Cannot change status of the feature flag %s', $featureFlagName));
+    }
+
+    /**
+     * Get label in function of boolean.
+     */
+    private function boolLabel(bool $status): string
+    {
+        return $status ? 'TRUE' : 'FALSE';
+    }
+}
diff --git a/src/Core/FeatureFlag/Handler/EnvHandler.php b/src/Core/FeatureFlag/Handler/EnvHandler.php
new file mode 100644
index 0000000000000..bdb4aa735c62f
--- /dev/null
+++ b/src/Core/FeatureFlag/Handler/EnvHandler.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\FeatureFlag\Handler;
+
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
+
+class EnvHandler extends AbstractHandler
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getTypeName(): string
+    {
+        return FeatureFlagSettings::TYPE_ENV;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isReadonly(): bool
+    {
+        // It's always NOT editable via Env!
+        return true;
+    }
+
+    /**
+     * Retrieve the const name of this feature flag.
+     */
+    public function getConstName(string $featureFlagName): string
+    {
+        return 'PS_FF_' . strtoupper($featureFlagName);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function canBeUsed(string $featureFlagName): bool
+    {
+        // Check if PS_FF_{featureFlag's name} is on Env variable.
+        return getenv($this->getConstName($featureFlagName)) !== false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isEnabled(string $featureFlagName): bool
+    {
+        return $this->canBeUsed($featureFlagName) && strtoupper(getenv($this->getConstName($featureFlagName))) === 'TRUE';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function enable(string $featureFlagName): void
+    {
+        throw new \InvalidArgumentException(sprintf('We cannot change status of the env feature flag %s.', $featureFlagName));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function disable(string $featureFlagName): void
+    {
+        throw new \InvalidArgumentException(sprintf('We cannot change status of the env feature flag %s.', $featureFlagName));
+    }
+}
diff --git a/src/Core/FeatureFlag/TypeHandlerInterface.php b/src/Core/FeatureFlag/TypeHandlerInterface.php
new file mode 100644
index 0000000000000..27256af466ef4
--- /dev/null
+++ b/src/Core/FeatureFlag/TypeHandlerInterface.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\FeatureFlag;
+
+interface TypeHandlerInterface
+{
+    /**
+     * Get type name of this handler.
+     */
+    public function getTypeName(): string;
+
+    /**
+     * Define is this handler can change feature flag status.
+     */
+    public function isReadonly(): bool;
+
+    /**
+     * Define is this handler can be used.
+     */
+    public function canBeUsed(string $featureFlagName): bool;
+
+    /**
+     * Retrieve if the feature flag is enabled.
+     */
+    public function isEnabled(string $featureFlagName): bool;
+
+    /**
+     * Enable the feature flag with this handler method.
+     */
+    public function enable(string $featureFlagName): void;
+
+    /**
+     * Disable the feature flag with this handler method.
+     */
+    public function disable(string $featureFlagName): void;
+}
diff --git a/src/PrestaShopBundle/Resources/config/services/core/feature_flag.yml b/src/PrestaShopBundle/Resources/config/services/core/feature_flag.yml
new file mode 100644
index 0000000000000..dc8e62fd3df07
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/config/services/core/feature_flag.yml
@@ -0,0 +1,11 @@
+services:
+  _defaults:
+    autowire: true
+    autoconfigure: true
+
+  PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService:
+    public: true
+
+  PrestaShop\PrestaShop\Core\FeatureFlag\Handler\DbHandler: ~
+  PrestaShop\PrestaShop\Core\FeatureFlag\Handler\EnvHandler: ~
+  PrestaShop\PrestaShop\Core\FeatureFlag\Handler\DotEnvHandler: ~

From ac5ac0782915d86c6683e3dba58b9fd02f9637d5 Mon Sep 17 00:00:00 2001
From: boherm <boris.hermans@prestashop.com>
Date: Fri, 16 Jun 2023 09:42:13 +0200
Subject: [PATCH 0285/1030] Implement Handler to deal with feature flags

---
 .../Command/FeatureFlagCommand.php            | 41 ++++++++++++-----
 .../Repository/FeatureFlagRepository.php      |  2 +-
 .../FeatureFlag/FeatureFlagType.php           | 29 +++++++++++-
 .../FeatureFlagsFormDataProvider.php          | 44 ++++++++-----------
 .../bundle/form/form_data_provider.yml        |  2 +
 .../Command/FeatureFlagCommandTest.php        |  9 ++--
 6 files changed, 85 insertions(+), 42 deletions(-)

diff --git a/src/PrestaShopBundle/Command/FeatureFlagCommand.php b/src/PrestaShopBundle/Command/FeatureFlagCommand.php
index 6f27d88bceb00..1ca4d5fff596c 100644
--- a/src/PrestaShopBundle/Command/FeatureFlagCommand.php
+++ b/src/PrestaShopBundle/Command/FeatureFlagCommand.php
@@ -28,6 +28,7 @@
 
 namespace PrestaShopBundle\Command;
 
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService;
 use PrestaShopBundle\Entity\FeatureFlag;
 use PrestaShopBundle\Entity\Repository\FeatureFlagRepository;
 use Symfony\Component\Console\Command\Command;
@@ -55,16 +56,11 @@ class FeatureFlagCommand extends Command
         'list',
     ];
 
-    /**
-     * @var FeatureFlagRepository
-     */
-    private $featureFlagRepository;
-
     public function __construct(
-        FeatureFlagRepository $featureFlagRepository
+        private readonly FeatureFlagRepository $featureFlagRepository,
+        private readonly EntityManagerInterface $entityManager
     ) {
         parent::__construct();
-        $this->featureFlagRepository = $featureFlagRepository;
     }
 
     protected function configure()
@@ -99,16 +95,36 @@ private function listFeatureFlags(OutputInterface $output): int
     {
         $featureFlags = $this->featureFlagRepository->findAll();
         $table = new Table($output);
-        $table->setHeaders(['Feature flag', 'State']);
+        $table->setHeaders(['Feature flag', 'Type', 'State']);
         /** @var FeatureFlag $featureFlag */
         foreach ($featureFlags as $featureFlag) {
-            $table->addRow([$featureFlag->getName(), $featureFlag->isEnabled() ? 'Enabled' : 'Disabled']);
+            $handler = HandlerFactory::getHandler($featureFlag);
+            $table->addRow([
+                $featureFlag->getName(),
+                $this->getTypeRow($handler),
+                $handler->isEnabled() ? 'Enabled' : 'Disabled',
+            ]);
         }
         $table->render();
 
         return self::SUCCESS_RETURN_CODE;
     }
 
+    private function getTypeRow(TypeHandlerInterface $handler): string
+    {
+        $out = [];
+
+        foreach ($handler->getFeatureFlag()->getTypeOrder() as $type) {
+            if ($handler->getTypeName() === $type) {
+                $out[] = "[$type]";
+            } else {
+                $out[] = $type;
+            }
+        }
+
+        return implode(',', $out);
+    }
+
     private function toggleFeatureFlag(bool $expectedState, InputInterface $input, OutputInterface $output): int
     {
         $featureFlagArgument = $input->getArgument('feature_flag');
@@ -128,19 +144,22 @@ private function toggleFeatureFlag(bool $expectedState, InputInterface $input, O
             return self::INVALID_ARGUMENTS_RETURN_CODE;
         }
 
+        $handler = HandlerFactory::getHandler($featureFlag);
+
         if ($expectedState) {
-            $this->featureFlagRepository->enable($featureFlagArgument);
+            $handler->enable();
             $output->writeln(sprintf(
                 '<info>Feature flag %s was enabled</info>',
                 $featureFlagArgument
             ));
         } else {
-            $this->featureFlagRepository->disable($featureFlagArgument);
+            $handler->disable();
             $output->writeln(sprintf(
                 '<info>Feature flag %s was disabled</info>',
                 $featureFlagArgument
             ));
         }
+        $this->entityManager->flush();
 
         return self::SUCCESS_RETURN_CODE;
     }
diff --git a/src/PrestaShopBundle/Entity/Repository/FeatureFlagRepository.php b/src/PrestaShopBundle/Entity/Repository/FeatureFlagRepository.php
index 54911ce327a2f..46ed4b9a2318f 100644
--- a/src/PrestaShopBundle/Entity/Repository/FeatureFlagRepository.php
+++ b/src/PrestaShopBundle/Entity/Repository/FeatureFlagRepository.php
@@ -68,7 +68,7 @@ public function isEnabled(string $featureFlagName): bool
     }
 
     /**
-     * Check if a feature flag is enabled based on its name (if it doesn't exist false is returned).
+     * Check if a feature flag is disabled based on its name (if it doesn't exist true is returned).
      *
      * @param string $featureFlagName
      *
diff --git a/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/FeatureFlag/FeatureFlagType.php b/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/FeatureFlag/FeatureFlagType.php
index 47eef80a0745f..d89675cb837bc 100644
--- a/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/FeatureFlag/FeatureFlagType.php
+++ b/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/FeatureFlag/FeatureFlagType.php
@@ -72,12 +72,37 @@ public function adaptSwitchOption(PreSetDataEvent $event): void
         $featureFlagData = $event->getData();
         $form = $event->getForm();
         $form->add($this->formCloner->cloneForm($form->get('enabled'), [
-            'label' => $this->trans($featureFlagData['label'], $featureFlagData['label_domain']),
-            'help' => $this->trans($featureFlagData['description'], $featureFlagData['description_domain']),
+            'label' => $this->trans($featureFlagData['label'], $featureFlagData['label_domain']) . $this->getHandlerLabel($featureFlagData),
+            'help' => $this->trans($featureFlagData['description'], $featureFlagData['description_domain']) . $this->getForcedByEnvMessage($featureFlagData),
             'attr' => ['disabled' => $featureFlagData['disabled']],
         ]));
     }
 
+    private function getHandlerLabel(array $featureFlagData): string
+    {
+        $template = '<br><small class="form-text">%s</small>';
+
+        $htmlType = [];
+        foreach ($featureFlagData['type'] as $type) {
+            if ($type === $featureFlagData['type_used']) {
+                $htmlType[] = sprintf('<strong>%s</strong>', addslashes($type));
+            } else {
+                $htmlType[] = $type;
+            }
+        }
+
+        return sprintf($template, implode(', ', $htmlType));
+    }
+
+    private function getForcedByEnvMessage(array $featureFlagData): string
+    {
+        if ($featureFlagData['forced_by_env']) {
+            return '<br/><strong>' . $this->trans('This FeatureFlag is forced by Env.', 'Admin.Advparameters.Help') . '</strong>';
+        }
+
+        return '';
+    }
+
     public function configureOptions(OptionsResolver $resolver)
     {
         parent::configureOptions($resolver);
diff --git a/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/FeatureFlag/FeatureFlagsFormDataProvider.php b/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/FeatureFlag/FeatureFlagsFormDataProvider.php
index 8dbea0942c508..5fccefa35d637 100644
--- a/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/FeatureFlag/FeatureFlagsFormDataProvider.php
+++ b/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/FeatureFlag/FeatureFlagsFormDataProvider.php
@@ -30,6 +30,8 @@
 
 use Doctrine\ORM\EntityManagerInterface;
 use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
 use PrestaShop\PrestaShop\Core\Form\FormDataProviderInterface;
 use PrestaShopBundle\Entity\FeatureFlag;
 use PrestaShopBundle\Routing\Converter\CacheCleanerInterface;
@@ -40,30 +42,17 @@
  */
 class FeatureFlagsFormDataProvider implements FormDataProviderInterface
 {
-    /** @var EntityManagerInterface */
-    protected $doctrineEntityManager;
-
-    /** @var string */
-    protected $stability;
-
-    /**
-     * @var CacheCleanerInterface
-     */
-    private $cacheCleaner;
-
     /**
      * @param EntityManagerInterface $doctrineEntityManager
      * @param string $stability
      * @param CacheCleanerInterface $cacheCleaner
      */
     public function __construct(
-        EntityManagerInterface $doctrineEntityManager,
-        string $stability,
-        CacheCleanerInterface $cacheCleaner
+        protected EntityManagerInterface $doctrineEntityManager,
+        protected readonly string $stability,
+        private CacheCleanerInterface $cacheCleaner,
+        private FeatureFlagService $featureFlagService
     ) {
-        $this->doctrineEntityManager = $doctrineEntityManager;
-        $this->stability = $stability;
-        $this->cacheCleaner = $cacheCleaner;
     }
 
     public function getData()
@@ -72,16 +61,18 @@ public function getData()
 
         $featureFlagsData = [];
         foreach ($featureFlags as $featureFlag) {
-            $featureFlagsData[$featureFlag->getName()] = [
-                'enabled' => $featureFlag->isEnabled(),
+            $flagName = $featureFlag->getName();
+            $featureFlagsData[$flagName] = [
+                'enabled' => $this->featureFlagService->isEnabled($flagName),
                 'name' => $featureFlag->getName(),
                 'label' => $featureFlag->getLabelWording(),
                 'label_domain' => $featureFlag->getLabelDomain(),
                 'description' => $featureFlag->getDescriptionWording(),
                 'description_domain' => $featureFlag->getDescriptionDomain(),
-                // You can handle specific rules here to indicate if the feature flag should be editable or not, currently
-                // no more specific rule but it can evolve in the future
-                'disabled' => false,
+                'type' => $featureFlag->getTypeOrder(),
+                'type_used' => $this->featureFlagService->getTypeUsed($flagName),
+                'disabled' => $this->featureFlagService->isReadOnly($flagName),
+                'forced_by_env' => $this->featureFlagService->getTypeUsed($flagName) === FeatureFlagSettings::TYPE_ENV,
             ];
         }
 
@@ -102,15 +93,18 @@ public function setData(array $flagsData)
                 throw new InvalidArgumentException(sprintf('Invalid feature flag configuration submitted, flag %s does not exist', $flagName));
             }
 
+            if ($this->featureFlagService->isReadonly($flagName)) {
+                continue;
+            }
+
             $flagState = $flagData['enabled'] ?? false;
             if ($flagState) {
-                $featureFlag->enable();
+                $this->featureFlagService->enable($flagName);
             } else {
-                $featureFlag->disable();
+                $this->featureFlagService->disable($flagName);
             }
         }
 
-        $this->doctrineEntityManager->flush();
         // Clear cache of legacy routes since they can depend on an associated feature flag
         // when the attribute _legacy_feature_flag is used
         $this->cacheCleaner->clearCache();
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_data_provider.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_data_provider.yml
index c3ae0aacb32a8..af54b514f1ee1 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_data_provider.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_data_provider.yml
@@ -274,6 +274,7 @@ services:
       - '@doctrine.orm.entity_manager'
       - 'stable'
       - '@prestashop.bundle.routing.converter.cache_provider'
+      - '@PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService'
 
   prestashop.admin.configure.advanced_parameters.beta_feature_flags_form_data_provider:
     class: 'PrestaShopBundle\Form\Admin\Configure\AdvancedParameters\FeatureFlag\FeatureFlagsFormDataProvider'
@@ -281,6 +282,7 @@ services:
       - '@doctrine.orm.entity_manager'
       - 'beta'
       - '@prestashop.bundle.routing.converter.cache_provider'
+      - '@PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService'
 
   prestashop.adapter.security.general.form_provider:
     class: 'PrestaShopBundle\Form\Admin\Configure\AdvancedParameters\Security\FormDataProvider'
diff --git a/tests/Integration/PrestaShopBundle/Command/FeatureFlagCommandTest.php b/tests/Integration/PrestaShopBundle/Command/FeatureFlagCommandTest.php
index a18fcea9e3cd9..0388b6de01142 100644
--- a/tests/Integration/PrestaShopBundle/Command/FeatureFlagCommandTest.php
+++ b/tests/Integration/PrestaShopBundle/Command/FeatureFlagCommandTest.php
@@ -29,6 +29,7 @@
 namespace Integration\PrestaShopBundle\Command;
 
 use Doctrine\ORM\EntityManagerInterface;
+use PrestaShop\PrestaShop\Core\FeatureFlag\Handler\HandlerFactory;
 use PrestaShopBundle\Entity\FeatureFlag;
 use PrestaShopBundle\Entity\Repository\FeatureFlagRepository;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
@@ -65,9 +66,11 @@ public function testList(): void
         $featureFlags = $featureFlagRepository->findAll();
         /** @var FeatureFlag $featureFlag */
         foreach ($featureFlags as $featureFlag) {
+            // Get Handler
+            $handler = HandlerFactory::getHandler($featureFlag);
             // This method is based on the output of the list action so it indirectly tests it
             $flagState = $this->getFeatureFlagState($kernel, $featureFlag->getName());
-            $this->assertEquals($flagState, $featureFlag->isEnabled());
+            $this->assertEquals($flagState, $handler->isEnabled());
         }
     }
 
@@ -112,10 +115,10 @@ private function getFeatureFlagState(KernelInterface $kernel, string $featureFla
 
         // the output of the command in the console
         $output = $commandTester->getDisplay();
-        $regexp = sprintf('/\|[ ]+%s[ ]+\|[ ]+([^ ]+)[ ]+\|/', $featureFlag);
+        $regexp = sprintf('/\|[ ]+%s[ ]+\|[ ]+([^ ]+)[ ]+\|[ ]+([^ ]+)[ ]+\|/', $featureFlag);
         $matches = [];
         preg_match($regexp, $output, $matches);
-        $state = $matches[1];
+        $state = $matches[2];
         $this->assertTrue(in_array($state, ['Enabled', 'Disabled']));
 
         return $state === 'Enabled';

From d8cf722ff3414facfe730eb51791636733e6714f Mon Sep 17 00:00:00 2001
From: boherm <boris.hermans@prestashop.com>
Date: Fri, 23 Jun 2023 17:32:01 +0200
Subject: [PATCH 0286/1030] Use FeatureFlagService instead of
 FeatureFlagRepository directly

---
 classes/Image.php                             |  3 +-
 classes/QuickAccess.php                       |  2 +-
 controllers/admin/AdminImagesController.php   |  4 +--
 controllers/admin/AdminProductsController.php |  3 +-
 src/Adapter/Image/ImageGenerator.php          | 22 ++++--------
 src/Core/Shop/LogoUploader.php                | 36 ++++---------------
 .../Command/FeatureFlagCommand.php            | 20 +++++------
 .../Controller/Admin/ProductController.php    |  4 +--
 .../Catalog/Product/ProductController.php     |  4 +--
 .../config/services/adapter/image.yml         |  2 +-
 .../config/services/bundle/repository.yml     |  4 ---
 .../config/services/bundle/routing.yml        |  2 +-
 .../Resources/config/services/core/shop.yml   |  2 +-
 .../Routing/Converter/LegacyRouteFactory.php  | 15 +++-----
 14 files changed, 39 insertions(+), 84 deletions(-)

diff --git a/classes/Image.php b/classes/Image.php
index 7680eae3f5b0b..ac3d839bb7610 100644
--- a/classes/Image.php
+++ b/classes/Image.php
@@ -26,6 +26,7 @@
 
 use PrestaShop\PrestaShop\Adapter\SymfonyContainer;
 use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService;
 use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
 use PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration;
 
@@ -637,7 +638,7 @@ public function deleteImage($forceDelete = false)
         // Delete auto-generated images
         $image_types = ImageType::getImagesTypes();
         $sfContainer = SymfonyContainer::getInstance();
-        $isMultipleImageFormatFeatureEnabled = $sfContainer->get('prestashop.core.admin.feature_flag.repository')->isEnabled(FeatureFlagSettings::FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT);
+        $isMultipleImageFormatFeatureEnabled = $sfContainer->get(FeatureFlagService::class)->isEnabled(FeatureFlagSettings::FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT);
 
         foreach ($image_types as $imageType) {
             $filesToDelete = $this->deleteAutoGeneratedImage($imageType, $this->image_format, $filesToDelete);
diff --git a/classes/QuickAccess.php b/classes/QuickAccess.php
index 0a13fbaa980aa..1708e3c068a6a 100644
--- a/classes/QuickAccess.php
+++ b/classes/QuickAccess.php
@@ -168,6 +168,6 @@ public function toggleNewWindow()
      */
     private static function productPageV2Enabled(): bool
     {
-        return SymfonyContainer::getInstance()->get('prestashop.core.admin.feature_flag.repository')->isEnabled(FeatureFlagSettings::FEATURE_FLAG_PRODUCT_PAGE_V2);
+        return SymfonyContainer::getInstance()->get('PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService')->isEnabled(FeatureFlagSettings::FEATURE_FLAG_PRODUCT_PAGE_V2);
     }
 }
diff --git a/controllers/admin/AdminImagesController.php b/controllers/admin/AdminImagesController.php
index 533916e6249f1..2d833210b5d66 100644
--- a/controllers/admin/AdminImagesController.php
+++ b/controllers/admin/AdminImagesController.php
@@ -24,9 +24,9 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService;
 use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
 use PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration;
-use PrestaShopBundle\Entity\Repository\FeatureFlagRepository;
 
 /**
  * @property ImageType $object
@@ -83,7 +83,7 @@ public function init()
         parent::init();
 
         $this->canGenerateAvif = $this->get('PrestaShop\PrestaShop\Core\Image\AvifExtensionChecker')->isAvailable();
-        $this->isMultipleImageFormatFeatureEnabled = $this->get(FeatureFlagRepository::class)->isEnabled(FeatureFlagSettings::FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT);
+        $this->isMultipleImageFormatFeatureEnabled = $this->get(FeatureFlagService::class)->isEnabled(FeatureFlagSettings::FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT);
         $this->imageFormatConfiguration = $this->get('PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration');
 
         $formFields = [];
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 35c6c99f1f5ff..5549e5969cc74 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -27,6 +27,7 @@
 use PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Update\SpecificPricePriorityUpdater;
 use PrestaShop\PrestaShop\Adapter\SymfonyContainer;
 use PrestaShop\PrestaShop\Core\Exception\CoreException;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService;
 use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
 use PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration;
 
@@ -2891,7 +2892,7 @@ public function ajaxProcessaddProductImage($idProduct = null, $inputFileName = '
                     *
                     * In case of .jpg images, the actual format inside is decided by ImageManager.
                     */
-                    if ($sfContainer->get('prestashop.core.admin.feature_flag.repository')->isEnabled(FeatureFlagSettings::FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT)) {
+                    if ($sfContainer->get(FeatureFlagService::class)->isEnabled(FeatureFlagSettings::FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT)) {
                         $configuredImageFormats = $sfContainer->get(ImageFormatConfiguration::class)->getGenerationFormats();
                     } else {
                         $configuredImageFormats = ['jpg'];
diff --git a/src/Adapter/Image/ImageGenerator.php b/src/Adapter/Image/ImageGenerator.php
index 8904f3d5b5b14..ac8806e037bf5 100644
--- a/src/Adapter/Image/ImageGenerator.php
+++ b/src/Adapter/Image/ImageGenerator.php
@@ -30,11 +30,11 @@
 
 use ImageManager;
 use ImageType;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService;
 use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
 use PrestaShop\PrestaShop\Core\Image\Exception\ImageOptimizationException;
 use PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration;
 use PrestaShop\PrestaShop\Core\Image\Uploader\Exception\ImageUploadException;
-use PrestaShopBundle\Entity\Repository\FeatureFlagRepository;
 use PrestaShopException;
 
 /**
@@ -42,20 +42,10 @@
  */
 class ImageGenerator
 {
-    /**
-     * @var FeatureFlagRepository
-     */
-    private $featureFlagRepository;
-
-    /**
-     * @var ImageFormatConfiguration
-     */
-    private $imageFormatConfiguration;
-
-    public function __construct(FeatureFlagRepository $featureFlagRepository, ImageFormatConfiguration $imageFormatConfiguration)
-    {
-        $this->featureFlagRepository = $featureFlagRepository;
-        $this->imageFormatConfiguration = $imageFormatConfiguration;
+    public function __construct(
+        private readonly FeatureFlagService $featureFlagService,
+        private readonly ImageFormatConfiguration $imageFormatConfiguration
+    ) {
     }
 
     /**
@@ -106,7 +96,7 @@ protected function resize(string $filePath, ImageType $imageType): bool
          *
          * In case of .jpg images, the actual format inside is decided by ImageManager.
          */
-        if ($this->featureFlagRepository->isEnabled(FeatureFlagSettings::FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT)) {
+        if ($this->featureFlagService->isEnabled(FeatureFlagSettings::FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT)) {
             $configuredImageFormats = $this->imageFormatConfiguration->getGenerationFormats();
         } else {
             $configuredImageFormats = ['jpg'];
diff --git a/src/Core/Shop/LogoUploader.php b/src/Core/Shop/LogoUploader.php
index afd1a6232a4c0..ec8d2ef5a9f8b 100644
--- a/src/Core/Shop/LogoUploader.php
+++ b/src/Core/Shop/LogoUploader.php
@@ -30,9 +30,9 @@
 use Context;
 use ImageManager;
 use PrestaShop\PrestaShop\Core\Domain\Shop\DTO\ShopLogoSettings;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService;
 use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
 use PrestaShop\PrestaShop\Core\Image\ImageFormatConfigurationInterface;
-use PrestaShopBundle\Entity\Repository\FeatureFlagRepository;
 use PrestaShopException;
 use Shop;
 use Tools;
@@ -42,41 +42,17 @@
  */
 class LogoUploader
 {
-    /**
-     * @var Shop
-     */
-    private $shop;
-
     /**
      * @var array
      */
     private $errors = [];
 
-    /**
-     * @var ImageFormatConfigurationInterface
-     */
-    private $imageFormatConfiguration;
-
-    /**
-     * @var string
-     */
-    private $imageDirection;
-
-    /**
-     * @var FeatureFlagRepository
-     */
-    private $featureFlagRepository;
-
     public function __construct(
-        Shop $shop,
-        ImageFormatConfigurationInterface $imageFormatConfiguration,
-        FeatureFlagRepository $featureFlagRepository,
-        string $imageDirection
+        private Shop $shop,
+        private ImageFormatConfigurationInterface $imageFormatConfiguration,
+        private FeatureFlagService $featureFlagService,
+        private string $imageDirection
     ) {
-        $this->shop = $shop;
-        $this->imageFormatConfiguration = $imageFormatConfiguration;
-        $this->imageDirection = $imageDirection;
-        $this->featureFlagRepository = $featureFlagRepository;
     }
 
     public function updateHeader()
@@ -160,7 +136,7 @@ public function update($fieldName, $logoPrefix, array $files = [])
                     *
                     * In case of .jpg images, the actual format inside is decided by ImageManager.
                     */
-                    if ($this->featureFlagRepository->isEnabled(FeatureFlagSettings::FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT)) {
+                    if ($this->featureFlagService->isEnabled(FeatureFlagSettings::FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT)) {
                         $configuredImageFormats = $this->imageFormatConfiguration->getGenerationFormats();
                     } else {
                         $configuredImageFormats = ['jpg'];
diff --git a/src/PrestaShopBundle/Command/FeatureFlagCommand.php b/src/PrestaShopBundle/Command/FeatureFlagCommand.php
index 1ca4d5fff596c..41fefcb293f1b 100644
--- a/src/PrestaShopBundle/Command/FeatureFlagCommand.php
+++ b/src/PrestaShopBundle/Command/FeatureFlagCommand.php
@@ -58,7 +58,7 @@ class FeatureFlagCommand extends Command
 
     public function __construct(
         private readonly FeatureFlagRepository $featureFlagRepository,
-        private readonly EntityManagerInterface $entityManager
+        private readonly FeatureFlagService $featureFlagService
     ) {
         parent::__construct();
     }
@@ -98,11 +98,10 @@ private function listFeatureFlags(OutputInterface $output): int
         $table->setHeaders(['Feature flag', 'Type', 'State']);
         /** @var FeatureFlag $featureFlag */
         foreach ($featureFlags as $featureFlag) {
-            $handler = HandlerFactory::getHandler($featureFlag);
             $table->addRow([
                 $featureFlag->getName(),
-                $this->getTypeRow($handler),
-                $handler->isEnabled() ? 'Enabled' : 'Disabled',
+                $this->getTypeRow($featureFlag),
+                $this->featureFlagService->isEnabled($featureFlag->getName()) ? 'Enabled' : 'Disabled',
             ]);
         }
         $table->render();
@@ -110,12 +109,12 @@ private function listFeatureFlags(OutputInterface $output): int
         return self::SUCCESS_RETURN_CODE;
     }
 
-    private function getTypeRow(TypeHandlerInterface $handler): string
+    private function getTypeRow(FeatureFlag $featureFlag): string
     {
         $out = [];
 
-        foreach ($handler->getFeatureFlag()->getTypeOrder() as $type) {
-            if ($handler->getTypeName() === $type) {
+        foreach ($featureFlag->getTypeOrder() as $type) {
+            if ($this->featureFlagService->getTypeUsed($featureFlag->getName()) === $type) {
                 $out[] = "[$type]";
             } else {
                 $out[] = $type;
@@ -144,22 +143,19 @@ private function toggleFeatureFlag(bool $expectedState, InputInterface $input, O
             return self::INVALID_ARGUMENTS_RETURN_CODE;
         }
 
-        $handler = HandlerFactory::getHandler($featureFlag);
-
         if ($expectedState) {
-            $handler->enable();
+            $this->featureFlagService->enable($featureFlagArgument);
             $output->writeln(sprintf(
                 '<info>Feature flag %s was enabled</info>',
                 $featureFlagArgument
             ));
         } else {
-            $handler->disable();
+            $this->featureFlagService->disable($featureFlagArgument);
             $output->writeln(sprintf(
                 '<info>Feature flag %s was disabled</info>',
                 $featureFlagArgument
             ));
         }
-        $this->entityManager->flush();
 
         return self::SUCCESS_RETURN_CODE;
     }
diff --git a/src/PrestaShopBundle/Controller/Admin/ProductController.php b/src/PrestaShopBundle/Controller/Admin/ProductController.php
index 2895a97ab8ef6..409e60bae2f17 100644
--- a/src/PrestaShopBundle/Controller/Admin/ProductController.php
+++ b/src/PrestaShopBundle/Controller/Admin/ProductController.php
@@ -41,6 +41,7 @@
 use PrestaShop\PrestaShop\Core\Domain\Product\Exception\ProductNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Product\Query\GetProductForEditing;
 use PrestaShop\PrestaShop\Core\Domain\Product\QueryResult\ProductForEditing;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService;
 use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
 use PrestaShop\PrestaShop\Core\Hook\HookDispatcher;
 use PrestaShop\PrestaShop\Core\Product\ProductCsvExporter;
@@ -49,7 +50,6 @@
 use PrestaShopBundle\Entity\AdminFilter;
 use PrestaShopBundle\Entity\Attribute;
 use PrestaShopBundle\Entity\Repository\AttributeRepository;
-use PrestaShopBundle\Entity\Repository\FeatureFlagRepository;
 use PrestaShopBundle\Exception\UpdateProductException;
 use PrestaShopBundle\Form\Admin\Product\ProductCategories;
 use PrestaShopBundle\Form\Admin\Product\ProductCombination;
@@ -1306,6 +1306,6 @@ private function getLogDataContext($id_product = null, $error_code = null, $allo
      */
     private function shouldRedirectToV2(): bool
     {
-        return $this->get(FeatureFlagRepository::class)->isEnabled(FeatureFlagSettings::FEATURE_FLAG_PRODUCT_PAGE_V2);
+        return $this->get(FeatureFlagService::class)->isEnabled(FeatureFlagSettings::FEATURE_FLAG_PRODUCT_PAGE_V2);
     }
 }
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/Product/ProductController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/Product/ProductController.php
index 7c42fd0d4c432..5a4c13ed9f5de 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/Product/ProductController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/Product/ProductController.php
@@ -57,6 +57,7 @@
 use PrestaShop\PrestaShop\Core\Domain\Shop\Exception\ShopAssociationNotFound;
 use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopConstraint;
 use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopId;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService;
 use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
 use PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\FormBuilderInterface;
 use PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Handler\FormHandlerInterface;
@@ -68,7 +69,6 @@
 use PrestaShopBundle\Controller\BulkActionsTrait;
 use PrestaShopBundle\Entity\AdminFilter;
 use PrestaShopBundle\Entity\ProductDownload;
-use PrestaShopBundle\Entity\Repository\FeatureFlagRepository;
 use PrestaShopBundle\Form\Admin\Sell\Product\Category\CategoryFilterType;
 use PrestaShopBundle\Form\Admin\Type\ShopSelectorType;
 use PrestaShopBundle\Security\Admin\Employee;
@@ -1508,7 +1508,7 @@ private function getGridAdminFilter(): ?AdminFilter
      */
     private function shouldRedirectToV1(): bool
     {
-        return $this->get(FeatureFlagRepository::class)->isDisabled(FeatureFlagSettings::FEATURE_FLAG_PRODUCT_PAGE_V2);
+        return $this->get(FeatureFlagService::class)->isDisabled(FeatureFlagSettings::FEATURE_FLAG_PRODUCT_PAGE_V2);
     }
 
     /**
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/image.yml b/src/PrestaShopBundle/Resources/config/services/adapter/image.yml
index c85cfc524c24d..1b56afafd757e 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/image.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/image.yml
@@ -41,7 +41,7 @@ services:
 
   PrestaShop\PrestaShop\Adapter\Image\ImageGenerator:
     arguments:
-      - '@prestashop.core.admin.feature_flag.repository'
+      - '@PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService'
       - '@PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration'
 
   PrestaShop\PrestaShop\Adapter\Image\ImageValidator:
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/repository.yml b/src/PrestaShopBundle/Resources/config/services/bundle/repository.yml
index dd44b16faaf35..5c185f0815089 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/repository.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/repository.yml
@@ -129,10 +129,6 @@ services:
     arguments:
       - PrestaShopBundle\Entity\FeatureFlag
 
-  prestashop.core.admin.feature_flag.repository:
-    alias: PrestaShopBundle\Entity\Repository\FeatureFlagRepository
-    deprecated: ~
-
   PrestaShopBundle\Entity\Repository\AuthorizedApplicationRepository:
     factory: [ '@doctrine.orm.default_entity_manager', getRepository ]
     arguments:
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/routing.yml b/src/PrestaShopBundle/Resources/config/services/bundle/routing.yml
index c3e706ed01444..c721a31771f2a 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/routing.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/routing.yml
@@ -26,7 +26,7 @@ services:
   PrestaShopBundle\Routing\Converter\LegacyRouteFactory:
     autowire: true
     arguments:
-      - '@PrestaShopBundle\Entity\Repository\FeatureFlagRepository'
+      - '@PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService'
 
   # We set this alias so that we can override it in test environment (to avoid memory limit crashes)
   prestashop.bundle.routing.converter.cache:
diff --git a/src/PrestaShopBundle/Resources/config/services/core/shop.yml b/src/PrestaShopBundle/Resources/config/services/core/shop.yml
index 9749c457344e3..9d92e4b1b34e0 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/shop.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/shop.yml
@@ -7,5 +7,5 @@ services:
     arguments:
       - '@=service("prestashop.adapter.legacy.context").getContext().shop'
       - '@PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration'
-      - '@prestashop.core.admin.feature_flag.repository'
+      - '@PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService'
       - !php/const _PS_IMG_DIR_
diff --git a/src/PrestaShopBundle/Routing/Converter/LegacyRouteFactory.php b/src/PrestaShopBundle/Routing/Converter/LegacyRouteFactory.php
index 0ffe76888acee..6c83db7d4ff55 100644
--- a/src/PrestaShopBundle/Routing/Converter/LegacyRouteFactory.php
+++ b/src/PrestaShopBundle/Routing/Converter/LegacyRouteFactory.php
@@ -26,20 +26,15 @@
 
 namespace PrestaShopBundle\Routing\Converter;
 
-use PrestaShopBundle\Entity\Repository\FeatureFlagRepository;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
 
 class LegacyRouteFactory
 {
-    /**
-     * @var FeatureFlagRepository
-     */
-    private $featureFlagRepository;
-
-    public function __construct(FeatureFlagRepository $featureFlagRepository)
-    {
-        $this->featureFlagRepository = $featureFlagRepository;
+    public function __construct(
+        private readonly FeatureFlagService $featureFlagService
+    ) {
     }
 
     public function buildFromCollection(RouteCollection $routeCollection): array
@@ -61,7 +56,7 @@ private function isLegacyRoute(Route $route): bool
 
         if (isset($routeDefaults[RouterProvider::LEGACY_LINK_ROUTE_ATTRIBUTE])) {
             if (isset($routeDefaults[RouterProvider::FEATURE_FLAG_NAME])) {
-                return $this->featureFlagRepository->isEnabled($routeDefaults[RouterProvider::FEATURE_FLAG_NAME]);
+                return $this->featureFlagService->isEnabled($routeDefaults[RouterProvider::FEATURE_FLAG_NAME]);
             }
 
             return true;

From 15ecae84d001d966dab856031fd5729537a5e099 Mon Sep 17 00:00:00 2001
From: boherm <boris.hermans@prestashop.com>
Date: Fri, 23 Jun 2023 17:56:15 +0200
Subject: [PATCH 0287/1030] Fix tests

---
 .../controller/AdminControllerTest.php        | 14 +++----
 .../Command/FeatureFlagCommandTest.php        |  7 ++--
 .../Converter/LegacyRouteFactoryTest.php      | 10 ++---
 .../Converter/LegacyUrlConverterTest.php      | 42 +++++++++----------
 .../Routing/Converter/RouterProviderTest.php  | 16 +++----
 5 files changed, 44 insertions(+), 45 deletions(-)

diff --git a/tests/Integration/Classes/controller/AdminControllerTest.php b/tests/Integration/Classes/controller/AdminControllerTest.php
index 6f769ab5fdd44..7a3d8731dc9a5 100644
--- a/tests/Integration/Classes/controller/AdminControllerTest.php
+++ b/tests/Integration/Classes/controller/AdminControllerTest.php
@@ -36,6 +36,7 @@
 use PrestaShop\PrestaShop\Adapter\EntityMapper;
 use PrestaShop\PrestaShop\Adapter\ServiceLocator;
 use PrestaShop\PrestaShop\Core\Feature\FeatureInterface;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService;
 use PrestaShop\PrestaShop\Core\Foundation\IoC\Container;
 use PrestaShop\PrestaShop\Core\Foundation\IoC\Container as LegacyContainer;
 use PrestaShop\PrestaShop\Core\Image\AvifExtensionChecker;
@@ -45,7 +46,6 @@
 use PrestaShop\PrestaShop\Core\Localization\Specification\NumberInterface;
 use PrestaShop\PrestaShop\Core\Localization\Specification\NumberSymbolList;
 use PrestaShopBundle\Controller\Admin\MultistoreController;
-use PrestaShopBundle\Entity\Repository\FeatureFlagRepository;
 use PrestaShopBundle\Service\DataProvider\UserProvider;
 use Shop;
 use Smarty;
@@ -293,8 +293,8 @@ private function getMockContainerBuilder(): ContainerBuilder
                 if ($param === 'PrestaShop\PrestaShop\Core\Image\AvifExtensionChecker') {
                     return $this->getMockedAvifExtensionChecker();
                 }
-                if ($param === 'prestashop.core.admin.feature_flag.repository' || $param === FeatureFlagRepository::class) {
-                    return $this->getMockedFeatureFlagRepository();
+                if ($param === 'PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService' || $param === FeatureFlagService::class) {
+                    return $this->getMockedFeatureFlagService();
                 }
             });
 
@@ -375,15 +375,15 @@ private function getMockedAvifExtensionChecker(): AvifExtensionChecker
         return $mockAvifExtensionChecker;
     }
 
-    private function getMockedFeatureFlagRepository(): FeatureFlagRepository
+    private function getMockedFeatureFlagService(): FeatureFlagService
     {
-        $mockFeatureFlagRepository = $this->getMockBuilder(FeatureFlagRepository::class)
+        $mockFeatureFlagService = $this->getMockBuilder(FeatureFlagService::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $mockFeatureFlagRepository->method('isEnabled')->willReturn(false);
+        $mockFeatureFlagService->method('isEnabled')->willReturn(false);
 
-        return $mockFeatureFlagRepository;
+        return $mockFeatureFlagService;
     }
 
     private function getMockNumberSpecification(): NumberSpecification
diff --git a/tests/Integration/PrestaShopBundle/Command/FeatureFlagCommandTest.php b/tests/Integration/PrestaShopBundle/Command/FeatureFlagCommandTest.php
index 0388b6de01142..a5dcb5bde9aa9 100644
--- a/tests/Integration/PrestaShopBundle/Command/FeatureFlagCommandTest.php
+++ b/tests/Integration/PrestaShopBundle/Command/FeatureFlagCommandTest.php
@@ -29,7 +29,7 @@
 namespace Integration\PrestaShopBundle\Command;
 
 use Doctrine\ORM\EntityManagerInterface;
-use PrestaShop\PrestaShop\Core\FeatureFlag\Handler\HandlerFactory;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService;
 use PrestaShopBundle\Entity\FeatureFlag;
 use PrestaShopBundle\Entity\Repository\FeatureFlagRepository;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
@@ -63,14 +63,13 @@ public function testList(): void
         $kernel = self::bootKernel();
         /** @var FeatureFlagRepository $featureFlagRepository */
         $featureFlagRepository = $kernel->getContainer()->get(FeatureFlagRepository::class);
+        $featureFlagService = $kernel->getContainer()->get(FeatureFlagService::class);
         $featureFlags = $featureFlagRepository->findAll();
         /** @var FeatureFlag $featureFlag */
         foreach ($featureFlags as $featureFlag) {
-            // Get Handler
-            $handler = HandlerFactory::getHandler($featureFlag);
             // This method is based on the output of the list action so it indirectly tests it
             $flagState = $this->getFeatureFlagState($kernel, $featureFlag->getName());
-            $this->assertEquals($flagState, $handler->isEnabled());
+            $this->assertEquals($flagState, $featureFlagService->isEnabled($featureFlag->getName()));
         }
     }
 
diff --git a/tests/Unit/PrestaShopBundle/Routing/Converter/LegacyRouteFactoryTest.php b/tests/Unit/PrestaShopBundle/Routing/Converter/LegacyRouteFactoryTest.php
index 0ff858191ea20..8c3fdc3192877 100644
--- a/tests/Unit/PrestaShopBundle/Routing/Converter/LegacyRouteFactoryTest.php
+++ b/tests/Unit/PrestaShopBundle/Routing/Converter/LegacyRouteFactoryTest.php
@@ -27,7 +27,7 @@
 namespace Tests\Unit\PrestaShopBundle\Routing\Converter;
 
 use PHPUnit\Framework\TestCase;
-use PrestaShopBundle\Entity\Repository\FeatureFlagRepository;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService;
 use PrestaShopBundle\Routing\Converter\LegacyRoute;
 use PrestaShopBundle\Routing\Converter\LegacyRouteFactory;
 use Symfony\Component\Routing\Route;
@@ -41,10 +41,10 @@ class LegacyRouteFactoryTest extends TestCase
     public function testRouteEnabledWithEnabledFeatureFlags(Route $route): void
     {
         $factory = new LegacyRouteFactory(
-            $featureFlagRepository = $this->createMock(FeatureFlagRepository::class)
+            $featureFlagService = $this->createMock(FeatureFlagService::class)
         );
 
-        $featureFlagRepository
+        $featureFlagService
             ->method('isEnabled')
             ->willReturn(true)
         ;
@@ -76,11 +76,11 @@ public function testRouteWithoutFeatureFlagShouldNeverCallRepository(
         Route $route
     ): void {
         $factory = new LegacyRouteFactory(
-            $featureFlagRepo = $this->createMock(FeatureFlagRepository::class)
+            $featureFlagService = $this->createMock(FeatureFlagService::class)
         );
 
         // assert no calls to repository
-        $featureFlagRepo
+        $featureFlagService
             ->expects(self::never())
             ->method('isEnabled')
         ;
diff --git a/tests/Unit/PrestaShopBundle/Routing/Converter/LegacyUrlConverterTest.php b/tests/Unit/PrestaShopBundle/Routing/Converter/LegacyUrlConverterTest.php
index d81a6075ed57c..64cf6ec5410f9 100644
--- a/tests/Unit/PrestaShopBundle/Routing/Converter/LegacyUrlConverterTest.php
+++ b/tests/Unit/PrestaShopBundle/Routing/Converter/LegacyUrlConverterTest.php
@@ -28,7 +28,7 @@
 
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use PrestaShopBundle\Entity\Repository\FeatureFlagRepository;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService;
 use PrestaShopBundle\Routing\Converter\Exception\ArgumentException;
 use PrestaShopBundle\Routing\Converter\Exception\RouteNotFoundException;
 use PrestaShopBundle\Routing\Converter\LegacyRouteFactory;
@@ -46,7 +46,7 @@ class LegacyUrlConverterTest extends TestCase
     public function testBasic()
     {
         $router = $this->buildRouterMock('admin_products_index', '/products', 'AdminProducts');
-        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagRepository::class))));
+        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagService::class))));
         $url = $converter->convertByParameters([
             'controller' => 'AdminProducts',
         ]);
@@ -59,7 +59,7 @@ public function testBasic()
     public function testMinifiedController()
     {
         $router = $this->buildRouterMock('admin_products_index', '/products', 'AdminProducts');
-        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagRepository::class))));
+        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagService::class))));
         $url = $converter->convertByParameters([
             'controller' => 'adminproducts',
         ]);
@@ -72,7 +72,7 @@ public function testMinifiedController()
     public function testBasicTab()
     {
         $router = $this->buildRouterMock('admin_products_index', '/products', 'AdminProducts');
-        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagRepository::class))));
+        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagService::class))));
         $url = $converter->convertByParameters([
             'tab' => 'AdminProducts',
         ]);
@@ -85,7 +85,7 @@ public function testBasicTab()
     public function testIndexAlias()
     {
         $router = $this->buildRouterMock('admin_products_index', '/products', 'AdminProducts');
-        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagRepository::class))));
+        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagService::class))));
         $url = $converter->convertByParameters([
             'controller' => 'AdminProducts',
             'action' => 'index',
@@ -99,7 +99,7 @@ public function testIndexAlias()
     public function testTabIndexAlias()
     {
         $router = $this->buildRouterMock('admin_products_index', '/products', 'AdminProducts');
-        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagRepository::class))));
+        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagService::class))));
         $url = $converter->convertByParameters([
             'tab' => 'AdminProducts',
             'action' => 'index',
@@ -113,7 +113,7 @@ public function testTabIndexAlias()
     public function testInsensitiveListAlias()
     {
         $router = $this->buildRouterMock('admin_products_index', '/products', 'AdminProducts');
-        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagRepository::class))));
+        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagService::class))));
         $url = $converter->convertByParameters([
             'controller' => 'AdminProducts',
             'action' => 'LIST',
@@ -127,7 +127,7 @@ public function testInsensitiveListAlias()
     public function testAction()
     {
         $router = $this->buildRouterMock('admin_products_create', '/products/create', 'AdminProducts:create');
-        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagRepository::class))));
+        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagService::class))));
         $url = $converter->convertByParameters([
             'controller' => 'AdminProducts',
             'action' => 'create',
@@ -141,7 +141,7 @@ public function testAction()
     public function testTabAction()
     {
         $router = $this->buildRouterMock('admin_products_create', '/products/create', 'AdminProducts:create');
-        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagRepository::class))));
+        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagService::class))));
         $url = $converter->convertByParameters([
             'tab' => 'AdminProducts',
             'action' => 'create',
@@ -155,7 +155,7 @@ public function testTabAction()
     public function testActionWithTrue()
     {
         $router = $this->buildRouterMock('admin_products_create', '/products/create', 'AdminProducts:create');
-        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagRepository::class))));
+        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagService::class))));
         $url = $converter->convertByParameters([
             'controller' => 'AdminProducts',
             'create' => true,
@@ -169,7 +169,7 @@ public function testActionWithTrue()
     public function testActionWithEmptyString()
     {
         $router = $this->buildRouterMock('admin_products_create', '/products/create', 'AdminProducts:create');
-        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagRepository::class))));
+        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagService::class))));
         $url = $converter->convertByParameters([
             'controller' => 'AdminProducts',
             'create' => '',
@@ -186,7 +186,7 @@ public function testMultipleLegacyLinks()
             'AdminModulesManage',
             'AdminModulesSf',
         ]);
-        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagRepository::class))));
+        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagService::class))));
 
         //First controller
         $url = $converter->convertByParameters([
@@ -214,7 +214,7 @@ public function testMultipleLegacyLinks()
     public function testNonExistentAction()
     {
         $router = $this->buildRouterMock('admin_products_index', '/products', 'AdminProducts');
-        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagRepository::class))));
+        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagService::class))));
 
         $caughtException = null;
 
@@ -287,7 +287,7 @@ public function testNonExistentAction()
     public function testIdEqualToOne()
     {
         $router = $this->buildRouterMock('admin_products_index', '/products', 'AdminProducts');
-        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagRepository::class))));
+        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagService::class))));
         $convertedUrl = $converter->convertByUrl('?controller=AdminProducts&id_product=1');
         $this->assertEquals('/products', $convertedUrl);
 
@@ -305,7 +305,7 @@ public function testActionWithArgument()
             ['id' => 2]
         );
 
-        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagRepository::class))));
+        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagService::class))));
         $url = $converter->convertByParameters([
             'controller' => 'AdminProducts',
             'action' => 'edit',
@@ -333,7 +333,7 @@ public function testActionWithArgumentWithoutMatching()
             ['id' => 42]
         );
 
-        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagRepository::class))));
+        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagService::class))));
         $url = $converter->convertByParameters([
             'controller' => 'AdminProducts',
             'action' => 'edit',
@@ -373,7 +373,7 @@ public function testConvertByRequest()
             ->method('getContext')
             ->willReturn($contextMock);
 
-        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagRepository::class))));
+        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagService::class))));
         $url = $converter->convertByRequest($request);
         $this->assertEquals('/products/create', $url);
     }
@@ -381,7 +381,7 @@ public function testConvertByRequest()
     public function testMissingController()
     {
         $router = $this->buildRouterMock('admin_products_create', '/products/create', 'AdminProducts:create');
-        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagRepository::class))));
+        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagService::class))));
         $this->expectException(ArgumentException::class);
         $this->expectExceptionMessage('Missing required controller argument');
         $converter->convertByParameters([
@@ -392,7 +392,7 @@ public function testMissingController()
     public function testControllerNotFound()
     {
         $router = $this->buildRouterMock('admin_products_create', '/products/create', 'AdminProducts:create');
-        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagRepository::class))));
+        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagService::class))));
 
         /** @var RouteNotFoundException $caughtException */
         $caughtException = null;
@@ -413,7 +413,7 @@ public function testControllerNotFound()
     public function testActionNotFound()
     {
         $router = $this->buildRouterMock('admin_products_create', '/products/create', 'AdminProducts:create');
-        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagRepository::class))));
+        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagService::class))));
 
         /** @var RouteNotFoundException $caughtException */
         $caughtException = null;
@@ -452,7 +452,7 @@ public function testMultipleRoutesActionWithTrue()
                 '_legacy_link' => 'AdminProducts:add',
             ],
         ]);
-        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagRepository::class))));
+        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagService::class))));
 
         //Test index by parameter
         $url = $converter->convertByParameters([
diff --git a/tests/Unit/PrestaShopBundle/Routing/Converter/RouterProviderTest.php b/tests/Unit/PrestaShopBundle/Routing/Converter/RouterProviderTest.php
index d0289786bce83..c071b64fd70af 100644
--- a/tests/Unit/PrestaShopBundle/Routing/Converter/RouterProviderTest.php
+++ b/tests/Unit/PrestaShopBundle/Routing/Converter/RouterProviderTest.php
@@ -28,7 +28,7 @@
 
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use PrestaShopBundle\Entity\Repository\FeatureFlagRepository;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService;
 use PrestaShopBundle\Routing\Converter\Exception\RouteNotFoundException;
 use PrestaShopBundle\Routing\Converter\LegacyRoute;
 use PrestaShopBundle\Routing\Converter\LegacyRouteFactory;
@@ -59,7 +59,7 @@ public function testBuildRoutes()
 
         $routerProvider = new RouterProvider(
             $router,
-            new LegacyRouteFactory($this->createMock(FeatureFlagRepository::class))
+            new LegacyRouteFactory($this->createMock(FeatureFlagService::class))
         );
 
         $legacyRoutes = $routerProvider->getLegacyRoutes();
@@ -108,7 +108,7 @@ public function testControllersActions()
         ]);
         $routerProvider = new RouterProvider(
             $router,
-            new LegacyRouteFactory($this->createMock(FeatureFlagRepository::class))
+            new LegacyRouteFactory($this->createMock(FeatureFlagService::class))
         );
         $controllersActions = $routerProvider->getControllersActions();
         $this->assertCount(2, $controllersActions);
@@ -153,7 +153,7 @@ public function testGetActionsByController()
 
         $routerProvider = new RouterProvider(
             $router,
-            new LegacyRouteFactory($this->createMock(FeatureFlagRepository::class))
+            new LegacyRouteFactory($this->createMock(FeatureFlagService::class))
         );
 
         $controllerActions = $routerProvider->getActionsByController('AdminProducts');
@@ -189,7 +189,7 @@ public function testGetActionsByControllerInsensitive()
 
         $routerProvider = new RouterProvider(
             $router,
-            new LegacyRouteFactory($this->createMock(FeatureFlagRepository::class))
+            new LegacyRouteFactory($this->createMock(FeatureFlagService::class))
         );
 
         $controllerActions = $routerProvider->getActionsByController('adminproducts');
@@ -245,7 +245,7 @@ public function testGetLegacyRouteByAction()
 
         $routerProvider = new RouterProvider(
             $router,
-            new LegacyRouteFactory($this->createMock(FeatureFlagRepository::class))
+            new LegacyRouteFactory($this->createMock(FeatureFlagService::class))
         );
 
         $legacyRoute = $routerProvider->getLegacyRouteByAction('AdminProducts', 'index');
@@ -323,7 +323,7 @@ public function testGetLegacyRouteByActionInsensitive()
 
         $routerProvider = new RouterProvider(
             $router,
-            new LegacyRouteFactory($this->createMock(FeatureFlagRepository::class))
+            new LegacyRouteFactory($this->createMock(FeatureFlagService::class))
         );
 
         $legacyRoute = $routerProvider->getLegacyRouteByAction('adminproducts', 'index');
@@ -362,7 +362,7 @@ public function testControllerNotFound()
 
         $routerProvider = new RouterProvider(
             $router,
-            new LegacyRouteFactory($this->createMock(FeatureFlagRepository::class))
+            new LegacyRouteFactory($this->createMock(FeatureFlagService::class))
         );
 
         $caughtException = null;

From fcee01c5c2ad465881f4473b4dcfadfaa17e9772 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jun 2023 04:58:39 +0000
Subject: [PATCH 0288/1030] Bump @typescript-eslint/parser from 5.59.11 to
 5.60.0 in /tests/UI

Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 5.59.11 to 5.60.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.60.0/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 46 +++++++++++++++++++-------------------
 tests/UI/package.json      |  2 +-
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index 96caa87070b1d..15f175d344f78 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -425,41 +425,41 @@
       }
     },
     "@typescript-eslint/parser": {
-      "version": "5.59.11",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.11.tgz",
-      "integrity": "sha512-s9ZF3M+Nym6CAZEkJJeO2TFHHDsKAM3ecNkLuH4i4s8/RCPnF5JRip2GyviYkeEAcwGMJxkqG9h2dAsnA1nZpA==",
+      "version": "5.60.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.60.0.tgz",
+      "integrity": "sha512-jBONcBsDJ9UoTWrARkRRCgDz6wUggmH5RpQVlt7BimSwaTkTjwypGzKORXbR4/2Hqjk9hgwlon2rVQAjWNpkyQ==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "5.59.11",
-        "@typescript-eslint/types": "5.59.11",
-        "@typescript-eslint/typescript-estree": "5.59.11",
+        "@typescript-eslint/scope-manager": "5.60.0",
+        "@typescript-eslint/types": "5.60.0",
+        "@typescript-eslint/typescript-estree": "5.60.0",
         "debug": "^4.3.4"
       },
       "dependencies": {
         "@typescript-eslint/scope-manager": {
-          "version": "5.59.11",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.11.tgz",
-          "integrity": "sha512-dHFOsxoLFtrIcSj5h0QoBT/89hxQONwmn3FOQ0GOQcLOOXm+MIrS8zEAhs4tWl5MraxCY3ZJpaXQQdFMc2Tu+Q==",
+          "version": "5.60.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.60.0.tgz",
+          "integrity": "sha512-hakuzcxPwXi2ihf9WQu1BbRj1e/Pd8ZZwVTG9kfbxAMZstKz8/9OoexIwnmLzShtsdap5U/CoQGRCWlSuPbYxQ==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "5.59.11",
-            "@typescript-eslint/visitor-keys": "5.59.11"
+            "@typescript-eslint/types": "5.60.0",
+            "@typescript-eslint/visitor-keys": "5.60.0"
           }
         },
         "@typescript-eslint/types": {
-          "version": "5.59.11",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.11.tgz",
-          "integrity": "sha512-epoN6R6tkvBYSc+cllrz+c2sOFWkbisJZWkOE+y3xHtvYaOE6Wk6B8e114McRJwFRjGvYdJwLXQH5c9osME/AA==",
+          "version": "5.60.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.60.0.tgz",
+          "integrity": "sha512-ascOuoCpNZBccFVNJRSC6rPq4EmJ2NkuoKnd6LDNyAQmdDnziAtxbCGWCbefG1CNzmDvd05zO36AmB7H8RzKPA==",
           "dev": true
         },
         "@typescript-eslint/typescript-estree": {
-          "version": "5.59.11",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.11.tgz",
-          "integrity": "sha512-YupOpot5hJO0maupJXixi6l5ETdrITxeo5eBOeuV7RSKgYdU3G5cxO49/9WRnJq9EMrB7AuTSLH/bqOsXi7wPA==",
+          "version": "5.60.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.60.0.tgz",
+          "integrity": "sha512-R43thAuwarC99SnvrBmh26tc7F6sPa2B3evkXp/8q954kYL6Ro56AwASYWtEEi+4j09GbiNAHqYwNNZuNlARGQ==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "5.59.11",
-            "@typescript-eslint/visitor-keys": "5.59.11",
+            "@typescript-eslint/types": "5.60.0",
+            "@typescript-eslint/visitor-keys": "5.60.0",
             "debug": "^4.3.4",
             "globby": "^11.1.0",
             "is-glob": "^4.0.3",
@@ -468,12 +468,12 @@
           }
         },
         "@typescript-eslint/visitor-keys": {
-          "version": "5.59.11",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.11.tgz",
-          "integrity": "sha512-KGYniTGG3AMTuKF9QBD7EIrvufkB6O6uX3knP73xbKLMpH+QRPcgnCxjWXSHjMRuOxFLovljqQgQpR0c7GvjoA==",
+          "version": "5.60.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.60.0.tgz",
+          "integrity": "sha512-wm9Uz71SbCyhUKgcaPRauBdTegUyY/ZWl8gLwD/i/ybJqscrrdVSFImpvUz16BLPChIeKBK5Fa9s6KDQjsjyWw==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "5.59.11",
+            "@typescript-eslint/types": "5.60.0",
             "eslint-visitor-keys": "^3.3.0"
           }
         },
diff --git a/tests/UI/package.json b/tests/UI/package.json
index 798772327c9f1..51f6a934a0499 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -133,7 +133,7 @@
     "@types/mocha": "^10.0.1",
     "@types/mochawesome": "^6.2.1",
     "@typescript-eslint/eslint-plugin": "^5.59.11",
-    "@typescript-eslint/parser": "^5.59.11",
+    "@typescript-eslint/parser": "^5.60.0",
     "babel-eslint": "^10.1.0",
     "eslint": "^8.43.0",
     "eslint-config-airbnb-base": "^15.0.0",

From a3152d204be2540410b94df8cda1df47b16b0814 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jun 2023 08:23:47 +0000
Subject: [PATCH 0289/1030] Bump @typescript-eslint/eslint-plugin in /tests/UI

Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 5.59.11 to 5.60.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.60.0/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 68 +++++++++++++++++++-------------------
 tests/UI/package.json      |  2 +-
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index 15f175d344f78..303f19f3b78fe 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -396,15 +396,15 @@
       "dev": true
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "5.59.11",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.11.tgz",
-      "integrity": "sha512-XxuOfTkCUiOSyBWIvHlUraLw/JT/6Io1365RO6ZuI88STKMavJZPNMU0lFcUTeQXEhHiv64CbxYxBNoDVSmghg==",
+      "version": "5.60.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.60.0.tgz",
+      "integrity": "sha512-78B+anHLF1TI8Jn/cD0Q00TBYdMgjdOn980JfAVa9yw5sop8nyTfVOQAv6LWywkOGLclDBtv5z3oxN4w7jxyNg==",
       "dev": true,
       "requires": {
         "@eslint-community/regexpp": "^4.4.0",
-        "@typescript-eslint/scope-manager": "5.59.11",
-        "@typescript-eslint/type-utils": "5.59.11",
-        "@typescript-eslint/utils": "5.59.11",
+        "@typescript-eslint/scope-manager": "5.60.0",
+        "@typescript-eslint/type-utils": "5.60.0",
+        "@typescript-eslint/utils": "5.60.0",
         "debug": "^4.3.4",
         "grapheme-splitter": "^1.0.4",
         "ignore": "^5.2.0",
@@ -495,23 +495,23 @@
       }
     },
     "@typescript-eslint/scope-manager": {
-      "version": "5.59.11",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.11.tgz",
-      "integrity": "sha512-dHFOsxoLFtrIcSj5h0QoBT/89hxQONwmn3FOQ0GOQcLOOXm+MIrS8zEAhs4tWl5MraxCY3ZJpaXQQdFMc2Tu+Q==",
+      "version": "5.60.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.60.0.tgz",
+      "integrity": "sha512-hakuzcxPwXi2ihf9WQu1BbRj1e/Pd8ZZwVTG9kfbxAMZstKz8/9OoexIwnmLzShtsdap5U/CoQGRCWlSuPbYxQ==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.59.11",
-        "@typescript-eslint/visitor-keys": "5.59.11"
+        "@typescript-eslint/types": "5.60.0",
+        "@typescript-eslint/visitor-keys": "5.60.0"
       }
     },
     "@typescript-eslint/type-utils": {
-      "version": "5.59.11",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.59.11.tgz",
-      "integrity": "sha512-LZqVY8hMiVRF2a7/swmkStMYSoXMFlzL6sXV6U/2gL5cwnLWQgLEG8tjWPpaE4rMIdZ6VKWwcffPlo1jPfk43g==",
+      "version": "5.60.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.60.0.tgz",
+      "integrity": "sha512-X7NsRQddORMYRFH7FWo6sA9Y/zbJ8s1x1RIAtnlj6YprbToTiQnM6vxcMu7iYhdunmoC0rUWlca13D5DVHkK2g==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/typescript-estree": "5.59.11",
-        "@typescript-eslint/utils": "5.59.11",
+        "@typescript-eslint/typescript-estree": "5.60.0",
+        "@typescript-eslint/utils": "5.60.0",
         "debug": "^4.3.4",
         "tsutils": "^3.21.0"
       },
@@ -528,19 +528,19 @@
       }
     },
     "@typescript-eslint/types": {
-      "version": "5.59.11",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.11.tgz",
-      "integrity": "sha512-epoN6R6tkvBYSc+cllrz+c2sOFWkbisJZWkOE+y3xHtvYaOE6Wk6B8e114McRJwFRjGvYdJwLXQH5c9osME/AA==",
+      "version": "5.60.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.60.0.tgz",
+      "integrity": "sha512-ascOuoCpNZBccFVNJRSC6rPq4EmJ2NkuoKnd6LDNyAQmdDnziAtxbCGWCbefG1CNzmDvd05zO36AmB7H8RzKPA==",
       "dev": true
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "5.59.11",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.11.tgz",
-      "integrity": "sha512-YupOpot5hJO0maupJXixi6l5ETdrITxeo5eBOeuV7RSKgYdU3G5cxO49/9WRnJq9EMrB7AuTSLH/bqOsXi7wPA==",
+      "version": "5.60.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.60.0.tgz",
+      "integrity": "sha512-R43thAuwarC99SnvrBmh26tc7F6sPa2B3evkXp/8q954kYL6Ro56AwASYWtEEi+4j09GbiNAHqYwNNZuNlARGQ==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.59.11",
-        "@typescript-eslint/visitor-keys": "5.59.11",
+        "@typescript-eslint/types": "5.60.0",
+        "@typescript-eslint/visitor-keys": "5.60.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -560,17 +560,17 @@
       }
     },
     "@typescript-eslint/utils": {
-      "version": "5.59.11",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.59.11.tgz",
-      "integrity": "sha512-didu2rHSOMUdJThLk4aZ1Or8IcO3HzCw/ZvEjTTIfjIrcdd5cvSIwwDy2AOlE7htSNp7QIZ10fLMyRCveesMLg==",
+      "version": "5.60.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.60.0.tgz",
+      "integrity": "sha512-ba51uMqDtfLQ5+xHtwlO84vkdjrqNzOnqrnwbMHMRY8Tqeme8C2Q8Fc7LajfGR+e3/4LoYiWXUM6BpIIbHJ4hQ==",
       "dev": true,
       "requires": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@types/json-schema": "^7.0.9",
         "@types/semver": "^7.3.12",
-        "@typescript-eslint/scope-manager": "5.59.11",
-        "@typescript-eslint/types": "5.59.11",
-        "@typescript-eslint/typescript-estree": "5.59.11",
+        "@typescript-eslint/scope-manager": "5.60.0",
+        "@typescript-eslint/types": "5.60.0",
+        "@typescript-eslint/typescript-estree": "5.60.0",
         "eslint-scope": "^5.1.1",
         "semver": "^7.3.7"
       },
@@ -588,12 +588,12 @@
       }
     },
     "@typescript-eslint/visitor-keys": {
-      "version": "5.59.11",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.11.tgz",
-      "integrity": "sha512-KGYniTGG3AMTuKF9QBD7EIrvufkB6O6uX3knP73xbKLMpH+QRPcgnCxjWXSHjMRuOxFLovljqQgQpR0c7GvjoA==",
+      "version": "5.60.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.60.0.tgz",
+      "integrity": "sha512-wm9Uz71SbCyhUKgcaPRauBdTegUyY/ZWl8gLwD/i/ybJqscrrdVSFImpvUz16BLPChIeKBK5Fa9s6KDQjsjyWw==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.59.11",
+        "@typescript-eslint/types": "5.60.0",
         "eslint-visitor-keys": "^3.3.0"
       },
       "dependencies": {
diff --git a/tests/UI/package.json b/tests/UI/package.json
index 51f6a934a0499..42ea5328d9ab5 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -132,7 +132,7 @@
     "@types/chai-string": "^1.4.2",
     "@types/mocha": "^10.0.1",
     "@types/mochawesome": "^6.2.1",
-    "@typescript-eslint/eslint-plugin": "^5.59.11",
+    "@typescript-eslint/eslint-plugin": "^5.60.0",
     "@typescript-eslint/parser": "^5.60.0",
     "babel-eslint": "^10.1.0",
     "eslint": "^8.43.0",

From a5e6711d3ed3aeb14a4237a1e26639ca5d12f741 Mon Sep 17 00:00:00 2001
From: "matthieu.rolland" <matthieu.rolland@prestashop.com>
Date: Tue, 20 Jun 2023 15:21:33 +0200
Subject: [PATCH 0290/1030] upgrade modules

---
 composer.json |  6 ++---
 composer.lock | 75 ++++++++++++++++++++++++++-------------------------
 2 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/composer.json b/composer.json
index d1e454b67fec5..69c66d0c69801 100644
--- a/composer.json
+++ b/composer.json
@@ -60,7 +60,7 @@
         "phpoffice/phpspreadsheet": "^1.19",
         "prestashop/autoload": "^1.0",
         "prestashop/blockreassurance": "^5.1",
-        "prestashop/blockwishlist": "^2.0",
+        "prestashop/blockwishlist": "^3.0",
         "prestashop/circuit-breaker": "^4.0",
         "prestashop/classic": "^2.1",
         "prestashop/contactform": "^4",
@@ -98,7 +98,7 @@
         "prestashop/ps_googleanalytics": "^4.1",
         "prestashop/ps_imageslider": "^3",
         "prestashop/ps_languageselector": "^2",
-        "prestashop/ps_linklist": "^5",
+        "prestashop/ps_linklist": "^6",
         "prestashop/ps_mainmenu": "^2",
         "prestashop/ps_newproducts": "^1.0",
         "prestashop/ps_searchbar": "^2",
@@ -110,7 +110,7 @@
         "prestashop/ps_themecusto": "^1",
         "prestashop/ps_viewedproduct": "^1.2",
         "prestashop/ps_wirepayment": "^2.1",
-        "prestashop/psgdpr": "^1.4",
+        "prestashop/psgdpr": "^2",
         "prestashop/statsbestcategories": "^2",
         "prestashop/statsbestcustomers": "^2",
         "prestashop/statsbestmanufacturers": "^2",
diff --git a/composer.lock b/composer.lock
index 946a0a4403ff2..9c6d32e05cb99 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "94d6aa77d7f11d70e8f0c478ff8ec2c5",
+    "content-hash": "c06660159933c3076ef4f6b2e5e174f1",
     "packages": [
         {
             "name": "api-platform/core",
@@ -5244,16 +5244,16 @@
         },
         {
             "name": "prestashop/blockwishlist",
-            "version": "v2.1.2",
+            "version": "v3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PrestaShop/blockwishlist.git",
-                "reference": "5d84188d2c37f8df66438eaae643bd192781c208"
+                "reference": "d42091134c5b7060e195fa9d60dda63396c06d64"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PrestaShop/blockwishlist/zipball/5d84188d2c37f8df66438eaae643bd192781c208",
-                "reference": "5d84188d2c37f8df66438eaae643bd192781c208",
+                "url": "https://api.github.com/repos/PrestaShop/blockwishlist/zipball/d42091134c5b7060e195fa9d60dda63396c06d64",
+                "reference": "d42091134c5b7060e195fa9d60dda63396c06d64",
                 "shasum": ""
             },
             "require-dev": {
@@ -5283,9 +5283,9 @@
             "description": "PrestaShop module blockwishlist",
             "homepage": "https://github.com/PrestaShop/blockwishlist",
             "support": {
-                "source": "https://github.com/PrestaShop/blockwishlist/tree/v2.1.2"
+                "source": "https://github.com/PrestaShop/blockwishlist/tree/v3.0.0"
             },
-            "time": "2022-08-01T14:47:51+00:00"
+            "time": "2023-02-23T10:22:22+00:00"
         },
         {
             "name": "prestashop/circuit-breaker",
@@ -5550,16 +5550,16 @@
         },
         {
             "name": "prestashop/dashtrends",
-            "version": "v2.1.1",
+            "version": "v2.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PrestaShop/dashtrends.git",
-                "reference": "c0ffb850abf1896ae8650522c8c8f4cff1c1dd80"
+                "reference": "e2cbdb088241a17118a8c4424b468a36216f8316"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PrestaShop/dashtrends/zipball/c0ffb850abf1896ae8650522c8c8f4cff1c1dd80",
-                "reference": "c0ffb850abf1896ae8650522c8c8f4cff1c1dd80",
+                "url": "https://api.github.com/repos/PrestaShop/dashtrends/zipball/e2cbdb088241a17118a8c4424b468a36216f8316",
+                "reference": "e2cbdb088241a17118a8c4424b468a36216f8316",
                 "shasum": ""
             },
             "require": {
@@ -5587,9 +5587,9 @@
             "description": "PrestaShop module dashtrends",
             "homepage": "https://github.com/PrestaShop/dashtrends",
             "support": {
-                "source": "https://github.com/PrestaShop/dashtrends/tree/v2.1.1"
+                "source": "https://github.com/PrestaShop/dashtrends/tree/v2.1.2"
             },
-            "time": "2023-03-24T13:19:08+00:00"
+            "time": "2023-06-19T13:25:37+00:00"
         },
         {
             "name": "prestashop/decimal",
@@ -6812,23 +6812,23 @@
         },
         {
             "name": "prestashop/ps_imageslider",
-            "version": "v3.1.2",
+            "version": "v3.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PrestaShop/ps_imageslider.git",
-                "reference": "c5980fe4e99ba6aa5139b4e0755540be42c52b88"
+                "reference": "36f848c1943f84f1dc0c41813f07c0e9b70ae8b0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PrestaShop/ps_imageslider/zipball/c5980fe4e99ba6aa5139b4e0755540be42c52b88",
-                "reference": "c5980fe4e99ba6aa5139b4e0755540be42c52b88",
+                "url": "https://api.github.com/repos/PrestaShop/ps_imageslider/zipball/36f848c1943f84f1dc0c41813f07c0e9b70ae8b0",
+                "reference": "36f848c1943f84f1dc0c41813f07c0e9b70ae8b0",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.4.0"
             },
             "require-dev": {
-                "prestashop/php-dev-tools": "^3.4"
+                "prestashop/php-dev-tools": "^4.3"
             },
             "type": "prestashop-module",
             "autoload": {
@@ -6849,9 +6849,9 @@
             "description": "PrestaShop - Image slider",
             "homepage": "https://github.com/PrestaShop/ps_imageslider",
             "support": {
-                "source": "https://github.com/PrestaShop/ps_imageslider/tree/v3.1.2"
+                "source": "https://github.com/PrestaShop/ps_imageslider/tree/v3.1.3"
             },
-            "time": "2023-03-15T17:45:19+00:00"
+            "time": "2023-06-08T12:48:16+00:00"
         },
         {
             "name": "prestashop/ps_languageselector",
@@ -6899,23 +6899,23 @@
         },
         {
             "name": "prestashop/ps_linklist",
-            "version": "v5.0.5",
+            "version": "v6.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PrestaShop/ps_linklist.git",
-                "reference": "f27df3c4b7035557544bb3d8366024c6b175b2c8"
+                "reference": "66bd879f99c665f1fac8aab820f02b17c64df7c9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PrestaShop/ps_linklist/zipball/f27df3c4b7035557544bb3d8366024c6b175b2c8",
-                "reference": "f27df3c4b7035557544bb3d8366024c6b175b2c8",
+                "url": "https://api.github.com/repos/PrestaShop/ps_linklist/zipball/66bd879f99c665f1fac8aab820f02b17c64df7c9",
+                "reference": "66bd879f99c665f1fac8aab820f02b17c64df7c9",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.6.0"
+                "php": ">=7.2.5"
             },
             "require-dev": {
-                "prestashop/php-dev-tools": "^3.4"
+                "prestashop/php-dev-tools": "^4.3"
             },
             "type": "prestashop-module",
             "autoload": {
@@ -6940,9 +6940,9 @@
             "description": "PrestaShop - Link list",
             "homepage": "https://github.com/PrestaShop/ps_linklist",
             "support": {
-                "source": "https://github.com/PrestaShop/ps_linklist/tree/v5.0.5"
+                "source": "https://github.com/PrestaShop/ps_linklist/tree/v6.0.2"
             },
-            "time": "2022-09-02T15:51:11+00:00"
+            "time": "2023-05-23T17:09:26+00:00"
         },
         {
             "name": "prestashop/ps_mainmenu",
@@ -7390,26 +7390,27 @@
         },
         {
             "name": "prestashop/psgdpr",
-            "version": "v1.4.3",
+            "version": "v2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PrestaShop/psgdpr.git",
-                "reference": "2b94cd472d00c837275f0aa8677947de2691c6d7"
+                "reference": "ad7ba6f3aa8b382955ddbcdb4562a1e68bef9356"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PrestaShop/psgdpr/zipball/2b94cd472d00c837275f0aa8677947de2691c6d7",
-                "reference": "2b94cd472d00c837275f0aa8677947de2691c6d7",
+                "url": "https://api.github.com/repos/PrestaShop/psgdpr/zipball/ad7ba6f3aa8b382955ddbcdb4562a1e68bef9356",
+                "reference": "ad7ba6f3aa8b382955ddbcdb4562a1e68bef9356",
                 "shasum": ""
             },
             "require-dev": {
-                "prestashop/php-dev-tools": "^3.4"
+                "prestashop/php-dev-tools": "^4.3"
             },
             "type": "prestashop-module",
             "autoload": {
+                "psr-4": {
+                    "PrestaShop\\Module\\Psgdpr\\": "src/"
+                },
                 "classmap": [
-                    "classes",
-                    "controllers",
                     "psgdpr.php"
                 ]
             },
@@ -7426,9 +7427,9 @@
             "description": "PrestaShop module psgdpr",
             "homepage": "https://github.com/PrestaShopCorp/psgdpr",
             "support": {
-                "source": "https://github.com/PrestaShop/psgdpr/tree/v1.4.3"
+                "source": "https://github.com/PrestaShop/psgdpr/tree/v2.0.1"
             },
-            "time": "2022-12-15T10:02:36+00:00"
+            "time": "2023-04-19T15:47:02+00:00"
         },
         {
             "name": "prestashop/statsbestcategories",

From dd9b7697339f3ed6504d789fb8df554195fa1fbb Mon Sep 17 00:00:00 2001
From: "matthieu.rolland" <matthieu.rolland@prestashop.com>
Date: Tue, 20 Jun 2023 16:21:29 +0200
Subject: [PATCH 0291/1030] downgrade module psgdpr

---
 composer.json |  2 +-
 composer.lock | 21 ++++++++++-----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/composer.json b/composer.json
index 69c66d0c69801..3c8a4ae82da7f 100644
--- a/composer.json
+++ b/composer.json
@@ -110,7 +110,7 @@
         "prestashop/ps_themecusto": "^1",
         "prestashop/ps_viewedproduct": "^1.2",
         "prestashop/ps_wirepayment": "^2.1",
-        "prestashop/psgdpr": "^2",
+        "prestashop/psgdpr": "^1.4",
         "prestashop/statsbestcategories": "^2",
         "prestashop/statsbestcustomers": "^2",
         "prestashop/statsbestmanufacturers": "^2",
diff --git a/composer.lock b/composer.lock
index 9c6d32e05cb99..e9095a1c29227 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "c06660159933c3076ef4f6b2e5e174f1",
+    "content-hash": "641341a247962639b8e804ac9db38c37",
     "packages": [
         {
             "name": "api-platform/core",
@@ -7390,27 +7390,26 @@
         },
         {
             "name": "prestashop/psgdpr",
-            "version": "v2.0.1",
+            "version": "v1.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PrestaShop/psgdpr.git",
-                "reference": "ad7ba6f3aa8b382955ddbcdb4562a1e68bef9356"
+                "reference": "2b94cd472d00c837275f0aa8677947de2691c6d7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PrestaShop/psgdpr/zipball/ad7ba6f3aa8b382955ddbcdb4562a1e68bef9356",
-                "reference": "ad7ba6f3aa8b382955ddbcdb4562a1e68bef9356",
+                "url": "https://api.github.com/repos/PrestaShop/psgdpr/zipball/2b94cd472d00c837275f0aa8677947de2691c6d7",
+                "reference": "2b94cd472d00c837275f0aa8677947de2691c6d7",
                 "shasum": ""
             },
             "require-dev": {
-                "prestashop/php-dev-tools": "^4.3"
+                "prestashop/php-dev-tools": "^3.4"
             },
             "type": "prestashop-module",
             "autoload": {
-                "psr-4": {
-                    "PrestaShop\\Module\\Psgdpr\\": "src/"
-                },
                 "classmap": [
+                    "classes",
+                    "controllers",
                     "psgdpr.php"
                 ]
             },
@@ -7427,9 +7426,9 @@
             "description": "PrestaShop module psgdpr",
             "homepage": "https://github.com/PrestaShopCorp/psgdpr",
             "support": {
-                "source": "https://github.com/PrestaShop/psgdpr/tree/v2.0.1"
+                "source": "https://github.com/PrestaShop/psgdpr/tree/v1.4.3"
             },
-            "time": "2023-04-19T15:47:02+00:00"
+            "time": "2022-12-15T10:02:36+00:00"
         },
         {
             "name": "prestashop/statsbestcategories",

From 153594b1c9b2421cf9301b3fd608b2f18176f705 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Mon, 26 Jun 2023 12:28:34 +0300
Subject: [PATCH 0292/1030]  fix error catching and messages. Remove irrelevant
 todos

---
 .../FeatureValueFormDataProvider.php          |  3 --
 .../Factory/FeatureGridDefinitionFactory.php  |  6 ----
 .../Sell/Catalog/FeatureValueController.php   | 28 ++++++++++++-------
 .../Features/FeatureValue/create.html.twig    |  1 -
 4 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/Core/Form/IdentifiableObject/DataProvider/FeatureValueFormDataProvider.php b/src/Core/Form/IdentifiableObject/DataProvider/FeatureValueFormDataProvider.php
index 32805c657a5a2..557c30c3b1e32 100644
--- a/src/Core/Form/IdentifiableObject/DataProvider/FeatureValueFormDataProvider.php
+++ b/src/Core/Form/IdentifiableObject/DataProvider/FeatureValueFormDataProvider.php
@@ -30,9 +30,6 @@
 use PrestaShop\PrestaShop\Core\Domain\Feature\Query\GetFeatureValueForEditing;
 use PrestaShop\PrestaShop\Core\Domain\Feature\QueryResult\EditableFeatureValue;
 
-/**
- * @todo: unfinished
- */
 class FeatureValueFormDataProvider implements FormDataProviderInterface
 {
     public function __construct(
diff --git a/src/Core/Grid/Definition/Factory/FeatureGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/FeatureGridDefinitionFactory.php
index bc7af1238a081..e29e1b7046dde 100644
--- a/src/Core/Grid/Definition/Factory/FeatureGridDefinitionFactory.php
+++ b/src/Core/Grid/Definition/Factory/FeatureGridDefinitionFactory.php
@@ -101,12 +101,6 @@ protected function getColumns(): ColumnCollectionInterface
                 'field' => 'values_count',
             ])
             )
-            // @todo: position action is not implemented yet
-            //        Uncomment Position column and delete position DataColumn when its done.
-            ->add((new DataColumn('position'))
-            ->setName($this->trans('Position', [], 'Admin.Global'))
-            ->setOptions(['field' => 'position'])
-            )
             ->add((new PositionColumn('position'))
             ->setName($this->trans('Position', [], 'Admin.Global'))
             ->setOptions([
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
index 53b419f1db237..8d942ba7a0925 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
@@ -29,6 +29,7 @@
 namespace PrestaShopBundle\Controller\Admin\Sell\Catalog;
 
 use Exception;
+use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\FeatureValueNotFoundException;
 use PrestaShop\PrestaShop\Core\Grid\Factory\FeatureValueGridFactory;
 use PrestaShop\PrestaShop\Core\Search\Filters\FeatureValueFilters;
 use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
@@ -78,17 +79,14 @@ public function createAction(int $featureId, Request $request): Response
         $featureValueFormBuilder = $this->get('prestashop.core.form.identifiable_object.builder.feature_value_form_builder');
         $featureValueFormHandler = $this->get('prestashop.core.form.identifiable_object.handler.feature_value_form_handler');
 
-        $featureValueForm = $featureValueFormBuilder->getForm(['feature_id' => $featureId]);
-        $featureValueForm->handleRequest($request);
-
         try {
+            $featureValueForm = $featureValueFormBuilder->getForm(['feature_id' => $featureId]);
+            $featureValueForm->handleRequest($request);
             $handlerResult = $featureValueFormHandler->handle($featureValueForm);
 
             if (null !== $handlerResult->getIdentifiableObjectId()) {
                 $this->addFlash('success', $this->trans('Successful creation', 'Admin.Notifications.Success'));
 
-                $this->addFlash('success', $this->trans('Successful update', 'Admin.Notifications.Success'));
-
                 if ($request->request->has(self::SAVE_AND_ADD_BUTTON_NAME)) {
                     return $this->redirectToRoute('admin_feature_values_add', [
                         'featureId' => $featureId,
@@ -99,6 +97,8 @@ public function createAction(int $featureId, Request $request): Response
             }
         } catch (Exception $e) {
             $this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages()));
+
+            return $this->redirectToRoute('admin_features_index');
         }
 
         return $this->render('@PrestaShop/Admin/Sell/Catalog/Features/FeatureValue/create.html.twig', [
@@ -121,10 +121,9 @@ public function editAction(int $featureId, int $featureValueId, Request $request
         $featureValueFormBuilder = $this->get('prestashop.core.form.identifiable_object.builder.feature_value_form_builder');
         $featureValueFormHandler = $this->get('prestashop.core.form.identifiable_object.handler.feature_value_form_handler');
 
-        $featureValueForm = $featureValueFormBuilder->getFormFor($featureValueId);
-        $featureValueForm->handleRequest($request);
-
         try {
+            $featureValueForm = $featureValueFormBuilder->getFormFor($featureValueId);
+            $featureValueForm->handleRequest($request);
             $handlerResult = $featureValueFormHandler->handleFor((int) $featureValueId, $featureValueForm);
 
             if ($handlerResult->isSubmitted() && $handlerResult->isValid()) {
@@ -142,6 +141,8 @@ public function editAction(int $featureId, int $featureValueId, Request $request
             }
         } catch (Exception $e) {
             $this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages()));
+
+            return $this->redirectToRoute('admin_features_index');
         }
 
         return $this->render('@PrestaShop/Admin/Sell/Catalog/Features/FeatureValue/edit.html.twig', [
@@ -154,9 +155,16 @@ public function editAction(int $featureId, int $featureValueId, Request $request
         ]);
     }
 
+    /**
+     * @return array<string, string|array<int, string>>
+     */
     private function getErrorMessages(): array
     {
-        //@todo:
-        return [];
+        return [
+            FeatureValueNotFoundException::class => $this->trans(
+                'The object cannot be loaded (or found).',
+                'Admin.Notifications.Error'
+            ),
+        ];
     }
 }
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/create.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/create.html.twig
index 5d9fcd095b790..593ffd0996d73 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/create.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/create.html.twig
@@ -32,6 +32,5 @@
 
 {% block javascripts %}
   {{ parent() }}
-  {# @todo: this js doesn't exist yet #}
   <script src="{{ asset('themes/new-theme/public/feature_value_form.bundle.js') }}"></script>
 {% endblock %}

From addbd6be18c249d96cb50e44baa4669da4e1e0b5 Mon Sep 17 00:00:00 2001
From: "matthieu.rolland" <matthieu.rolland@prestashop.com>
Date: Tue, 20 Jun 2023 14:11:12 +0200
Subject: [PATCH 0293/1030] // Changelog 8.1.0

---
 docs/CHANGELOG.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
index d4875dc692807..8bc8a34ba13e1 100644
--- a/docs/CHANGELOG.txt
+++ b/docs/CHANGELOG.txt
@@ -23,6 +23,14 @@ needs please refer to https://devdocs.prestashop.com/ for more information.
 
 Changelog for PrestaShop 8
 
+####################################
+#   v8.1.0 - (2023-06-20)
+####################################
+
+- Back Office:
+  - Bug fix:
+    - #31379: Fix disabling a module for a specific shop applied to all shops (by @matthieu-rolland and @FabienPapet)
+
 ####################################
 #   v8.1-rc.1 - (2023-05-22)
 ####################################

From 0b8f29f2f0325c61a53d64cefccbb7fdb305e56d Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Mon, 26 Jun 2023 14:50:48 +0200
Subject: [PATCH 0294/1030] Nightly : Fixed mocha loader (develop)

---
 tests/UI/package.json | 100 +++++++++++++++++++++---------------------
 1 file changed, 50 insertions(+), 50 deletions(-)

diff --git a/tests/UI/package.json b/tests/UI/package.json
index 42ea5328d9ab5..cf1d70342d6ad 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -20,70 +20,70 @@
     "test:specific": "ts-mocha --recursive --file utils/setup.ts campaigns/$TEST_PATH",
     "test:specific:fast-fail": "ts-mocha --bail --recursive --file utils/setup.ts campaigns/$TEST_PATH",
     "// CLDR": "Scripts to run CLDR tests",
-    "test:cldr": "TEST_PATH='cldr/' npm run test:specific",
+    "test:cldr": "TEST_PATH='cldr/**/*' npm run test:specific",
     "test:cldr:fast-fail": "TEST_PATH='cldr/' npm run test:specific:fast-fail",
     "// Sanity": "Scripts to run sanity tests",
-    "test:sanity": "TEST_PATH='sanity/' npm run test:specific",
+    "test:sanity": "TEST_PATH='sanity/**/*' npm run test:specific",
     "test:sanity:fast-fail": "TEST_PATH='sanity/' npm run test:specific:fast-fail",
-    "test:sanity:productV2": "TEST_PATH='productV2/sanity/' npm run test:specific",
+    "test:sanity:productV2": "TEST_PATH='productV2/sanity/**/*' npm run test:specific",
     "test:sanity:productV2:fast-fail": "TEST_PATH='productV2/sanity/' npm run test:specific:fast-fail",
     "// Functional": "Scripts to run functional tests",
-    "test:functional": "TEST_PATH='functional/' npm run test:specific",
+    "test:functional": "TEST_PATH='functional/**/*' npm run test:specific",
     "// Functional API": "Scripts to run functional API tests",
-    "test:functional:API": "TEST_PATH='functional/API/' npm run test:specific",
+    "test:functional:API": "TEST_PATH='functional/API/**/*' npm run test:specific",
     "// Functional BO": "Scripts to run functional BO tests",
-    "test:functional:BO": "TEST_PATH='functional/BO/' npm run test:specific",
-    "test:functional:BO:login": "TEST_PATH='functional/BO/00_login/' npm run test:specific",
-    "test:functional:BO:dashboard": "TEST_PATH='functional/BO/01_dashboard/' npm run test:specific",
-    "test:functional:BO:orders": "TEST_PATH='functional/BO/02_orders/' npm run test:specific",
-    "test:functional:BO:orders:01": "TEST_PATH='functional/BO/02_orders/01*/' npm run test:specific",
+    "test:functional:BO": "TEST_PATH='functional/BO/**/*' npm run test:specific",
+    "test:functional:BO:login": "TEST_PATH='functional/BO/00_login/**/*' npm run test:specific",
+    "test:functional:BO:dashboard": "TEST_PATH='functional/BO/01_dashboard/**/*' npm run test:specific",
+    "test:functional:BO:orders": "TEST_PATH='functional/BO/02_orders/**/*' npm run test:specific",
+    "test:functional:BO:orders:01": "TEST_PATH='functional/BO/02_orders/01*/**/*' npm run test:specific",
     "test:functional:BO:orders:01:0-1": "TEST_PATH='functional/BO/02_orders/01*/{0*,1*}.ts' npm run test:specific",
-    "test:functional:BO:orders:01-create-orders": "TEST_PATH='functional/BO/02_orders/01*/createOrders/' npm run test:specific",
-    "test:functional:BO:orders:01-view-and-edit-order": "TEST_PATH='functional/BO/02_orders/01*/viewAndEditOrder/' npm run test:specific",
-    "test:functional:BO:orders:02": "TEST_PATH='functional/BO/02_orders/02*/' npm run test:specific",
-    "test:functional:BO:orders:03-05": "TEST_PATH='functional/BO/02_orders/0[3-5]*/' npm run test:specific",
-    "test:functional:BO:catalog": "TEST_PATH='functional/BO/03_catalog/' npm run test:specific",
-    "test:functional:BO:catalog:01-02": "TEST_PATH='functional/BO/03_catalog/0[1-2]*/' npm run test:specific",
-    "test:functional:BO:catalog:03-04": "TEST_PATH='functional/BO/03_catalog/0[3-4]*/' npm run test:specific",
-    "test:functional:BO:catalog:05-06": "TEST_PATH='functional/BO/03_catalog/0[5-6]*/' npm run test:specific",
-    "test:functional:BO:catalog:07-08": "TEST_PATH='functional/BO/03_catalog/0[7-8]*/' npm run test:specific",
-    "test:functional:BO:customer": "TEST_PATH='functional/BO/04_customers/' npm run test:specific",
-    "test:functional:BO:customer:01": "TEST_PATH='functional/BO/04_customers/01*/' npm run test:specific",
-    "test:functional:BO:customer:02-03": "TEST_PATH='functional/BO/04_customers/0[2-3]*/' npm run test:specific",
-    "test:functional:BO:customer-service": "TEST_PATH='functional/BO/05_customerService/' npm run test:specific",
-    "test:functional:BO:modules": "TEST_PATH='functional/BO/07_modules/' npm run test:specific",
-    "test:functional:BO:design": "TEST_PATH='functional/BO/08_design/' npm run test:specific",
-    "test:functional:BO:shipping": "TEST_PATH='functional/BO/09_shipping/' npm run test:specific",
-    "test:functional:BO:payment": "TEST_PATH='functional/BO/10_payment/' npm run test:specific",
-    "test:functional:BO:international": "TEST_PATH='functional/BO/11_international/' npm run test:specific",
-    "test:functional:BO:international:01": "TEST_PATH='functional/BO/11_international/01*/' npm run test:specific",
-    "test:functional:BO:international:02": "TEST_PATH='functional/BO/11_international/02*/' npm run test:specific",
-    "test:functional:BO:international:03-04": "TEST_PATH='functional/BO/11_international/0[3-4]*/' npm run test:specific",
-    "test:functional:BO:shop-parameters": "TEST_PATH='functional/BO/13_shopParameters/' npm run test:specific",
-    "test:functional:BO:shop-parameters:01-02": "TEST_PATH='functional/BO/13_shopParameters/0[1-2]*/' npm run test:specific",
-    "test:functional:BO:shop-parameters:03-04": "TEST_PATH='functional/BO/13_shopParameters/0[3-4]*/' npm run test:specific",
-    "test:functional:BO:shop-parameters:05-07": "TEST_PATH='functional/BO/13_shopParameters/0[5-7]*/' npm run test:specific",
-    "test:functional:BO:advanced-parameters": "TEST_PATH='functional/BO/14_advancedParameters/' npm run test:specific",
-    "test:functional:BO:advanced-parameters:01-06": "TEST_PATH='functional/BO/14_advancedParameters/0[1-6]*/' npm run test:specific",
-    "test:functional:BO:advanced-parameters:07-10": "TEST_PATH='functional/BO/14_advancedParameters/{0[7-9],10}*/' npm run test:specific",
-    "test:functional:BO:header": "TEST_PATH='functional/BO/15_header/' npm run test:specific",
-    "test:functional:productV2": "TEST_PATH='productV2/functional/' npm run test:specific",
+    "test:functional:BO:orders:01-create-orders": "TEST_PATH='functional/BO/02_orders/01*/createOrders/**/*' npm run test:specific",
+    "test:functional:BO:orders:01-view-and-edit-order": "TEST_PATH='functional/BO/02_orders/01*/viewAndEditOrder/**/*' npm run test:specific",
+    "test:functional:BO:orders:02": "TEST_PATH='functional/BO/02_orders/02*/**/*' npm run test:specific",
+    "test:functional:BO:orders:03-05": "TEST_PATH='functional/BO/02_orders/0[3-5]*/**/*' npm run test:specific",
+    "test:functional:BO:catalog": "TEST_PATH='functional/BO/03_catalog/**/*' npm run test:specific",
+    "test:functional:BO:catalog:01-02": "TEST_PATH='functional/BO/03_catalog/0[1-2]*/**/*' npm run test:specific",
+    "test:functional:BO:catalog:03-04": "TEST_PATH='functional/BO/03_catalog/0[3-4]*/**/*' npm run test:specific",
+    "test:functional:BO:catalog:05-06": "TEST_PATH='functional/BO/03_catalog/0[5-6]*/**/*' npm run test:specific",
+    "test:functional:BO:catalog:07-08": "TEST_PATH='functional/BO/03_catalog/0[7-8]*/**/*' npm run test:specific",
+    "test:functional:BO:customer": "TEST_PATH='functional/BO/04_customers/**/*' npm run test:specific",
+    "test:functional:BO:customer:01": "TEST_PATH='functional/BO/04_customers/01*/**/*' npm run test:specific",
+    "test:functional:BO:customer:02-03": "TEST_PATH='functional/BO/04_customers/0[2-3]*/**/*' npm run test:specific",
+    "test:functional:BO:customer-service": "TEST_PATH='functional/BO/05_customerService/**/*' npm run test:specific",
+    "test:functional:BO:modules": "TEST_PATH='functional/BO/07_modules/**/*' npm run test:specific",
+    "test:functional:BO:design": "TEST_PATH='functional/BO/08_design/**/*' npm run test:specific",
+    "test:functional:BO:shipping": "TEST_PATH='functional/BO/09_shipping/**/*' npm run test:specific",
+    "test:functional:BO:payment": "TEST_PATH='functional/BO/10_payment/**/*' npm run test:specific",
+    "test:functional:BO:international": "TEST_PATH='functional/BO/11_international/**/*' npm run test:specific",
+    "test:functional:BO:international:01": "TEST_PATH='functional/BO/11_international/01*/**/*' npm run test:specific",
+    "test:functional:BO:international:02": "TEST_PATH='functional/BO/11_international/02*/**/*' npm run test:specific",
+    "test:functional:BO:international:03-04": "TEST_PATH='functional/BO/11_international/0[3-4]*/**/*' npm run test:specific",
+    "test:functional:BO:shop-parameters": "TEST_PATH='functional/BO/13_shopParameters/**/*' npm run test:specific",
+    "test:functional:BO:shop-parameters:01-02": "TEST_PATH='functional/BO/13_shopParameters/0[1-2]*/**/*' npm run test:specific",
+    "test:functional:BO:shop-parameters:03-04": "TEST_PATH='functional/BO/13_shopParameters/0[3-4]*/**/*' npm run test:specific",
+    "test:functional:BO:shop-parameters:05-07": "TEST_PATH='functional/BO/13_shopParameters/0[5-7]*/**/*' npm run test:specific",
+    "test:functional:BO:advanced-parameters": "TEST_PATH='functional/BO/14_advancedParameters/**/*' npm run test:specific",
+    "test:functional:BO:advanced-parameters:01-06": "TEST_PATH='functional/BO/14_advancedParameters/0[1-6]*/**/*' npm run test:specific",
+    "test:functional:BO:advanced-parameters:07-10": "TEST_PATH='functional/BO/14_advancedParameters/{0[7-9],10}*/**/*' npm run test:specific",
+    "test:functional:BO:header": "TEST_PATH='functional/BO/15_header/**/*' npm run test:specific",
+    "test:functional:productV2": "TEST_PATH='productV2/functional/**/*' npm run test:specific",
     "// Functional FO": "Scripts to run functional FO tests",
-    "test:functional:FO": "TEST_PATH='functional/FO/' npm run test:specific",
+    "test:functional:FO": "TEST_PATH='functional/FO/**/*' npm run test:specific",
     "// Functional FO - Classic": "Scripts to run functional FO Classic tests",
-    "test:functional:FO:classic": "TEST_PATH='functional/FO/classic/' npm run test:specific",
-    "test:functional:FO:classic:01-03": "TEST_PATH='functional/FO/classic/0[1-3]*/' npm run test:specific",
-    "test:functional:FO:classic:04-07": "TEST_PATH='functional/FO/classic/0[4-7]*/' npm run test:specific",
-    "test:functional:FO:classic:08-12": "TEST_PATH='functional/FO/classic/{0[8-9],[11-12]}*/' npm run test:specific",
+    "test:functional:FO:classic": "TEST_PATH='functional/FO/classic/**/*' npm run test:specific",
+    "test:functional:FO:classic:01-03": "TEST_PATH='functional/FO/classic/0[1-3]*/**/*' npm run test:specific",
+    "test:functional:FO:classic:04-07": "TEST_PATH='functional/FO/classic/0[4-7]*/**/*' npm run test:specific",
+    "test:functional:FO:classic:08-12": "TEST_PATH='functional/FO/classic/{0[8-9],1[0-2]}*/**/*' npm run test:specific",
     "// Functional FO - Hummingbird": "Scripts to run functional FO Hummingbird tests",
-    "test:functional:FO:hummingbird": "TEST_PATH='functional/FO/hummingbird/' npm run test:specific",
-    "test:functional:FO:hummingbird:01-03": "TEST_PATH='functional/FO/hummingbird/0[1-3]*/' npm run test:specific",
+    "test:functional:FO:hummingbird": "TEST_PATH='functional/FO/hummingbird/**/*' npm run test:specific",
+    "test:functional:FO:hummingbird:01-03": "TEST_PATH='functional/FO/hummingbird/0[1-3]*/**/*' npm run test:specific",
     "// Functional WS": "Scripts to run functional WS tests",
-    "test:functional:WS": "TEST_PATH='functional/WS/' npm run test:specific",
+    "test:functional:WS": "TEST_PATH='functional/WS/**/*' npm run test:specific",
     "// Modules tests": "Scripts to run modules tests",
-    "test:modules": "TEST_PATH='modules/' npm run test:specific",
+    "test:modules": "TEST_PATH='modules/**/*' npm run test:specific",
     "// Regression tests": "Scripts to run regression tests",
-    "test:regression": "TEST_PATH='regression/' npm run test:specific",
+    "test:regression": "TEST_PATH='regression/**/*' npm run test:specific",
     "// All tests": "Scripts to run all campaigns",
     "test:all": "ts-mocha --recursive --file utils/setup.ts campaigns/cldr/* campaigns/functional/* campaigns/sanity/* campaigns/regression/*"
   },

From 4033f25356e068d3592de5f3e51a6c9928776556 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Mon, 26 Jun 2023 14:52:52 +0200
Subject: [PATCH 0295/1030] Nightly : Fixed mocha loader (8.1.x)

---
 tests/UI/package.json | 100 +++++++++++++++++++++---------------------
 1 file changed, 50 insertions(+), 50 deletions(-)

diff --git a/tests/UI/package.json b/tests/UI/package.json
index bebc762f10683..a70aa619d3dff 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -20,70 +20,70 @@
     "test:specific": "ts-mocha --recursive --file utils/setup.ts campaigns/$TEST_PATH",
     "test:specific:fast-fail": "ts-mocha --bail --recursive --file utils/setup.ts campaigns/$TEST_PATH",
     "// CLDR": "Scripts to run CLDR tests",
-    "test:cldr": "TEST_PATH='cldr/' npm run test:specific",
+    "test:cldr": "TEST_PATH='cldr/**/*' npm run test:specific",
     "test:cldr:fast-fail": "TEST_PATH='cldr/' npm run test:specific:fast-fail",
     "// Sanity": "Scripts to run sanity tests",
-    "test:sanity": "TEST_PATH='sanity/' npm run test:specific",
+    "test:sanity": "TEST_PATH='sanity/**/*' npm run test:specific",
     "test:sanity:fast-fail": "TEST_PATH='sanity/' npm run test:specific:fast-fail",
-    "test:sanity:productV2": "TEST_PATH='productV2/sanity/' npm run test:specific",
+    "test:sanity:productV2": "TEST_PATH='productV2/sanity/**/*' npm run test:specific",
     "test:sanity:productV2:fast-fail": "TEST_PATH='productV2/sanity/' npm run test:specific:fast-fail",
     "// Functional": "Scripts to run functional tests",
-    "test:functional": "TEST_PATH='functional/' npm run test:specific",
+    "test:functional": "TEST_PATH='functional/**/*' npm run test:specific",
     "// Functional API": "Scripts to run functional API tests",
-    "test:functional:API": "TEST_PATH='functional/API/' npm run test:specific",
+    "test:functional:API": "TEST_PATH='functional/API/**/*' npm run test:specific",
     "// Functional BO": "Scripts to run functional BO tests",
-    "test:functional:BO": "TEST_PATH='functional/BO/' npm run test:specific",
-    "test:functional:BO:login": "TEST_PATH='functional/BO/00_login/' npm run test:specific",
-    "test:functional:BO:dashboard": "TEST_PATH='functional/BO/01_dashboard/' npm run test:specific",
-    "test:functional:BO:orders": "TEST_PATH='functional/BO/02_orders/' npm run test:specific",
-    "test:functional:BO:orders:01": "TEST_PATH='functional/BO/02_orders/01*/' npm run test:specific",
+    "test:functional:BO": "TEST_PATH='functional/BO/**/*' npm run test:specific",
+    "test:functional:BO:login": "TEST_PATH='functional/BO/00_login/**/*' npm run test:specific",
+    "test:functional:BO:dashboard": "TEST_PATH='functional/BO/01_dashboard/**/*' npm run test:specific",
+    "test:functional:BO:orders": "TEST_PATH='functional/BO/02_orders/**/*' npm run test:specific",
+    "test:functional:BO:orders:01": "TEST_PATH='functional/BO/02_orders/01*/**/*' npm run test:specific",
     "test:functional:BO:orders:01:0-1": "TEST_PATH='functional/BO/02_orders/01*/{0*,1*}.ts' npm run test:specific",
-    "test:functional:BO:orders:01-create-orders": "TEST_PATH='functional/BO/02_orders/01*/createOrders/' npm run test:specific",
-    "test:functional:BO:orders:01-view-and-edit-order": "TEST_PATH='functional/BO/02_orders/01*/viewAndEditOrder/' npm run test:specific",
-    "test:functional:BO:orders:02": "TEST_PATH='functional/BO/02_orders/02*/' npm run test:specific",
-    "test:functional:BO:orders:03-05": "TEST_PATH='functional/BO/02_orders/0[3-5]*/' npm run test:specific",
-    "test:functional:BO:catalog": "TEST_PATH='functional/BO/03_catalog/' npm run test:specific",
-    "test:functional:BO:catalog:01-02": "TEST_PATH='functional/BO/03_catalog/0[1-2]*/' npm run test:specific",
-    "test:functional:BO:catalog:03-04": "TEST_PATH='functional/BO/03_catalog/0[3-4]*/' npm run test:specific",
-    "test:functional:BO:catalog:05-06": "TEST_PATH='functional/BO/03_catalog/0[5-6]*/' npm run test:specific",
-    "test:functional:BO:catalog:07-08": "TEST_PATH='functional/BO/03_catalog/0[7-8]*/' npm run test:specific",
-    "test:functional:BO:customer": "TEST_PATH='functional/BO/04_customers/' npm run test:specific",
-    "test:functional:BO:customer:01": "TEST_PATH='functional/BO/04_customers/01*/' npm run test:specific",
-    "test:functional:BO:customer:02-03": "TEST_PATH='functional/BO/04_customers/0[2-3]*/' npm run test:specific",
-    "test:functional:BO:customer-service": "TEST_PATH='functional/BO/05_customerService/' npm run test:specific",
-    "test:functional:BO:modules": "TEST_PATH='functional/BO/07_modules/' npm run test:specific",
-    "test:functional:BO:design": "TEST_PATH='functional/BO/08_design/' npm run test:specific",
-    "test:functional:BO:shipping": "TEST_PATH='functional/BO/09_shipping/' npm run test:specific",
-    "test:functional:BO:payment": "TEST_PATH='functional/BO/10_payment/' npm run test:specific",
-    "test:functional:BO:international": "TEST_PATH='functional/BO/11_international/' npm run test:specific",
-    "test:functional:BO:international:01": "TEST_PATH='functional/BO/11_international/01*/' npm run test:specific",
-    "test:functional:BO:international:02": "TEST_PATH='functional/BO/11_international/02*/' npm run test:specific",
-    "test:functional:BO:international:03-04": "TEST_PATH='functional/BO/11_international/0[3-4]*/' npm run test:specific",
-    "test:functional:BO:shop-parameters": "TEST_PATH='functional/BO/13_shopParameters/' npm run test:specific",
-    "test:functional:BO:shop-parameters:01-02": "TEST_PATH='functional/BO/13_shopParameters/0[1-2]*/' npm run test:specific",
-    "test:functional:BO:shop-parameters:03-04": "TEST_PATH='functional/BO/13_shopParameters/0[3-4]*/' npm run test:specific",
-    "test:functional:BO:shop-parameters:05-07": "TEST_PATH='functional/BO/13_shopParameters/0[5-7]*/' npm run test:specific",
-    "test:functional:BO:advanced-parameters": "TEST_PATH='functional/BO/14_advancedParameters/' npm run test:specific",
-    "test:functional:BO:advanced-parameters:01-06": "TEST_PATH='functional/BO/14_advancedParameters/0[1-6]*/' npm run test:specific",
-    "test:functional:BO:advanced-parameters:07-10": "TEST_PATH='functional/BO/14_advancedParameters/{0[7-9],10}*/' npm run test:specific",
-    "test:functional:BO:header": "TEST_PATH='functional/BO/15_header/' npm run test:specific",
-    "test:functional:productV2": "TEST_PATH='productV2/functional/' npm run test:specific",
+    "test:functional:BO:orders:01-create-orders": "TEST_PATH='functional/BO/02_orders/01*/createOrders/**/*' npm run test:specific",
+    "test:functional:BO:orders:01-view-and-edit-order": "TEST_PATH='functional/BO/02_orders/01*/viewAndEditOrder/**/*' npm run test:specific",
+    "test:functional:BO:orders:02": "TEST_PATH='functional/BO/02_orders/02*/**/*' npm run test:specific",
+    "test:functional:BO:orders:03-05": "TEST_PATH='functional/BO/02_orders/0[3-5]*/**/*' npm run test:specific",
+    "test:functional:BO:catalog": "TEST_PATH='functional/BO/03_catalog/**/*' npm run test:specific",
+    "test:functional:BO:catalog:01-02": "TEST_PATH='functional/BO/03_catalog/0[1-2]*/**/*' npm run test:specific",
+    "test:functional:BO:catalog:03-04": "TEST_PATH='functional/BO/03_catalog/0[3-4]*/**/*' npm run test:specific",
+    "test:functional:BO:catalog:05-06": "TEST_PATH='functional/BO/03_catalog/0[5-6]*/**/*' npm run test:specific",
+    "test:functional:BO:catalog:07-08": "TEST_PATH='functional/BO/03_catalog/0[7-8]*/**/*' npm run test:specific",
+    "test:functional:BO:customer": "TEST_PATH='functional/BO/04_customers/**/*' npm run test:specific",
+    "test:functional:BO:customer:01": "TEST_PATH='functional/BO/04_customers/01*/**/*' npm run test:specific",
+    "test:functional:BO:customer:02-03": "TEST_PATH='functional/BO/04_customers/0[2-3]*/**/*' npm run test:specific",
+    "test:functional:BO:customer-service": "TEST_PATH='functional/BO/05_customerService/**/*' npm run test:specific",
+    "test:functional:BO:modules": "TEST_PATH='functional/BO/07_modules/**/*' npm run test:specific",
+    "test:functional:BO:design": "TEST_PATH='functional/BO/08_design/**/*' npm run test:specific",
+    "test:functional:BO:shipping": "TEST_PATH='functional/BO/09_shipping/**/*' npm run test:specific",
+    "test:functional:BO:payment": "TEST_PATH='functional/BO/10_payment/**/*' npm run test:specific",
+    "test:functional:BO:international": "TEST_PATH='functional/BO/11_international/**/*' npm run test:specific",
+    "test:functional:BO:international:01": "TEST_PATH='functional/BO/11_international/01*/**/*' npm run test:specific",
+    "test:functional:BO:international:02": "TEST_PATH='functional/BO/11_international/02*/**/*' npm run test:specific",
+    "test:functional:BO:international:03-04": "TEST_PATH='functional/BO/11_international/0[3-4]*/**/*' npm run test:specific",
+    "test:functional:BO:shop-parameters": "TEST_PATH='functional/BO/13_shopParameters/**/*' npm run test:specific",
+    "test:functional:BO:shop-parameters:01-02": "TEST_PATH='functional/BO/13_shopParameters/0[1-2]*/**/*' npm run test:specific",
+    "test:functional:BO:shop-parameters:03-04": "TEST_PATH='functional/BO/13_shopParameters/0[3-4]*/**/*' npm run test:specific",
+    "test:functional:BO:shop-parameters:05-07": "TEST_PATH='functional/BO/13_shopParameters/0[5-7]*/**/*' npm run test:specific",
+    "test:functional:BO:advanced-parameters": "TEST_PATH='functional/BO/14_advancedParameters/**/*' npm run test:specific",
+    "test:functional:BO:advanced-parameters:01-06": "TEST_PATH='functional/BO/14_advancedParameters/0[1-6]*/**/*' npm run test:specific",
+    "test:functional:BO:advanced-parameters:07-10": "TEST_PATH='functional/BO/14_advancedParameters/{0[7-9],10}*/**/*' npm run test:specific",
+    "test:functional:BO:header": "TEST_PATH='functional/BO/15_header/**/*' npm run test:specific",
+    "test:functional:productV2": "TEST_PATH='productV2/functional/**/*' npm run test:specific",
     "// Functional FO": "Scripts to run functional FO tests",
-    "test:functional:FO": "TEST_PATH='functional/FO/' npm run test:specific",
+    "test:functional:FO": "TEST_PATH='functional/FO/**/*' npm run test:specific",
     "// Functional FO - Classic": "Scripts to run functional FO Classic tests",
-    "test:functional:FO:classic": "TEST_PATH='functional/FO/classic/' npm run test:specific",
-    "test:functional:FO:classic:01-03": "TEST_PATH='functional/FO/classic/0[1-3]*/' npm run test:specific",
-    "test:functional:FO:classic:04-07": "TEST_PATH='functional/FO/classic/0[4-7]*/' npm run test:specific",
-    "test:functional:FO:classic:08-12": "TEST_PATH='functional/FO/classic/{0[8-9],[11-12]}*/' npm run test:specific",
+    "test:functional:FO:classic": "TEST_PATH='functional/FO/classic/**/*' npm run test:specific",
+    "test:functional:FO:classic:01-03": "TEST_PATH='functional/FO/classic/0[1-3]*/**/*' npm run test:specific",
+    "test:functional:FO:classic:04-07": "TEST_PATH='functional/FO/classic/0[4-7]*/**/*' npm run test:specific",
+    "test:functional:FO:classic:08-12": "TEST_PATH='functional/FO/classic/{0[8-9],[11-12]}*/**/*' npm run test:specific",
     "// Functional FO - Hummingbird": "Scripts to run functional FO Hummingbird tests",
-    "test:functional:FO:hummingbird": "TEST_PATH='functional/FO/hummingbird/' npm run test:specific",
-    "test:functional:FO:hummingbird:01-03": "TEST_PATH='functional/FO/hummingbird/0[1-3]*/' npm run test:specific",
+    "test:functional:FO:hummingbird": "TEST_PATH='functional/FO/hummingbird/**/*' npm run test:specific",
+    "test:functional:FO:hummingbird:01-03": "TEST_PATH='functional/FO/hummingbird/0[1-3]*/**/*' npm run test:specific",
     "// Functional WS": "Scripts to run functional WS tests",
-    "test:functional:WS": "TEST_PATH='functional/WS/' npm run test:specific",
+    "test:functional:WS": "TEST_PATH='functional/WS/**/*' npm run test:specific",
     "// Modules tests": "Scripts to run modules tests",
-    "test:modules": "TEST_PATH='modules/' npm run test:specific",
+    "test:modules": "TEST_PATH='modules/**/*' npm run test:specific",
     "// Regression tests": "Scripts to run regression tests",
-    "test:regression": "TEST_PATH='regression/' npm run test:specific",
+    "test:regression": "TEST_PATH='regression/**/*' npm run test:specific",
     "// All tests": "Scripts to run all campaigns",
     "test:all": "ts-mocha --recursive --file utils/setup.ts campaigns/cldr/* campaigns/functional/* campaigns/sanity/* campaigns/regression/*"
   },

From f9c0d44bd6aa6e662819a391b6617f133adf9b0a Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Mon, 26 Jun 2023 14:54:17 +0200
Subject: [PATCH 0296/1030] Nightly : Fixed mocha loader (8.0.x)

---
 tests/UI/package.json | 82 +++++++++++++++++++++----------------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/tests/UI/package.json b/tests/UI/package.json
index cd5707b5c5b16..42435d80c47ef 100755
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -21,58 +21,58 @@
     "test:specific:fast-fail": "./node_modules/mocha/bin/mocha --bail --recursive --file utils/setup.js campaigns/$TEST_PATH",
 
     "// Sanity": "Scripts to run sanity tests",
-    "test:sanity": "TEST_PATH='sanity/*' npm run test:specific",
+    "test:sanity": "TEST_PATH='sanity/**/*' npm run test:specific",
     "test:sanity:fast-fail": "TEST_PATH='sanity/*' npm run test:specific:fast-fail",
-    "test:sanity:productV2": "TEST_PATH='productV2/sanity/*' npm run test:specific",
+    "test:sanity:productV2": "TEST_PATH='productV2/sanity/**/*' npm run test:specific",
     "test:sanity:productV2:fast-fail": "TEST_PATH='productV2/sanity/*' npm run test:specific:fast-fail",
 
     "// Functional": "Scripts to run functional tests",
-    "test:functional": "TEST_PATH='functional/*' npm run test:specific",
+    "test:functional": "TEST_PATH='functional/**/*' npm run test:specific",
 
     "// Functional BO": "Scripts to run functional BO tests",
-    "test:functional:BO": "TEST_PATH='functional/BO/*' npm run test:specific",
-    "test:functional:BO:login": "TEST_PATH='functional/BO/00_login/*' npm run test:specific",
-    "test:functional:BO:orders": "TEST_PATH='functional/BO/02_orders/*' npm run test:specific",
-    "test:functional:BO:orders:01": "TEST_PATH='functional/BO/02_orders/01*/*' npm run test:specific",
+    "test:functional:BO": "TEST_PATH='functional/BO/**/*' npm run test:specific",
+    "test:functional:BO:login": "TEST_PATH='functional/BO/00_login/**/*' npm run test:specific",
+    "test:functional:BO:orders": "TEST_PATH='functional/BO/02_orders/**/*' npm run test:specific",
+    "test:functional:BO:orders:01": "TEST_PATH='functional/BO/02_orders/01*/**/*' npm run test:specific",
     "test:functional:BO:orders:01:0-1": "TEST_PATH='functional/BO/02_orders/01*/{0*,1*}' npm run test:specific",
-    "test:functional:BO:orders:01-create-orders": "TEST_PATH='functional/BO/02_orders/01*/createOrders/*' npm run test:specific",
-    "test:functional:BO:orders:01-view-and-edit-order": "TEST_PATH='functional/BO/02_orders/01*/viewAndEditOrder/*' npm run test:specific",
-    "test:functional:BO:orders:02": "TEST_PATH='functional/BO/02_orders/02*/*' npm run test:specific",
-    "test:functional:BO:orders:03-05": "TEST_PATH='functional/BO/02_orders/0[3-5]*/*' npm run test:specific",
-    "test:functional:BO:catalog": "TEST_PATH='functional/BO/03_catalog/*' npm run test:specific",
-    "test:functional:BO:catalog:01-02": "TEST_PATH='functional/BO/03_catalog/0[1-2]*/*' npm run test:specific",
-    "test:functional:BO:catalog:03-04": "TEST_PATH='functional/BO/03_catalog/0[3-4]*/*' npm run test:specific",
-    "test:functional:BO:catalog:05-06": "TEST_PATH='functional/BO/03_catalog/0[5-6]*/*' npm run test:specific",
-    "test:functional:BO:catalog:07-08": "TEST_PATH='functional/BO/03_catalog/0[7-8]*/*' npm run test:specific",
-    "test:functional:BO:customer": "TEST_PATH='functional/BO/04_customers/*' npm run test:specific",
-    "test:functional:BO:customer:01": "TEST_PATH='functional/BO/04_customers/01*/*' npm run test:specific",
-    "test:functional:BO:customer:02-03": "TEST_PATH='functional/BO/04_customers/0[2-3]*/*' npm run test:specific",
-    "test:functional:BO:customer-service": "TEST_PATH='functional/BO/05_customerService/*' npm run test:specific",
-    "test:functional:BO:modules": "TEST_PATH='functional/BO/07_modules/*' npm run test:specific",
-    "test:functional:BO:design": "TEST_PATH='functional/BO/08_design/*' npm run test:specific",
-    "test:functional:BO:shipping": "TEST_PATH='functional/BO/09_shipping/*' npm run test:specific",
-    "test:functional:BO:payment": "TEST_PATH='functional/BO/10_payment/*' npm run test:specific",
-    "test:functional:BO:international": "TEST_PATH='functional/BO/11_international/*' npm run test:specific",
-    "test:functional:BO:international:01": "TEST_PATH='functional/BO/11_international/01*/*' npm run test:specific",
-    "test:functional:BO:international:02": "TEST_PATH='functional/BO/11_international/02*/*' npm run test:specific",
-    "test:functional:BO:international:03-04": "TEST_PATH='functional/BO/11_international/0[3-4]*/*' npm run test:specific",
-    "test:functional:BO:shop-parameters": "TEST_PATH='functional/BO/13_shopParameters/*' npm run test:specific",
-    "test:functional:BO:shop-parameters:01-02": "TEST_PATH='functional/BO/13_shopParameters/0[1-2]*/*' npm run test:specific",
-    "test:functional:BO:shop-parameters:03-04": "TEST_PATH='functional/BO/13_shopParameters/0[3-4]*/*' npm run test:specific",
-    "test:functional:BO:shop-parameters:05-07": "TEST_PATH='functional/BO/13_shopParameters/0[5-7]*/*' npm run test:specific",
-    "test:functional:BO:advanced-parameters": "TEST_PATH='functional/BO/14_advancedParameters/*' npm run test:specific",
-    "test:functional:BO:advanced-parameters:01-06": "TEST_PATH='functional/BO/14_advancedParameters/0[1-6]*/*' npm run test:specific",
-    "test:functional:BO:advanced-parameters:07-10": "TEST_PATH='functional/BO/14_advancedParameters/{0[7-9],10}*/*' npm run test:specific",
-    "test:functional:BO:header": "TEST_PATH='functional/BO/15_header/*' npm run test:specific",
+    "test:functional:BO:orders:01-create-orders": "TEST_PATH='functional/BO/02_orders/01*/createOrders/**/*' npm run test:specific",
+    "test:functional:BO:orders:01-view-and-edit-order": "TEST_PATH='functional/BO/02_orders/01*/viewAndEditOrder/**/*' npm run test:specific",
+    "test:functional:BO:orders:02": "TEST_PATH='functional/BO/02_orders/02*/**/*' npm run test:specific",
+    "test:functional:BO:orders:03-05": "TEST_PATH='functional/BO/02_orders/0[3-5]*/**/*' npm run test:specific",
+    "test:functional:BO:catalog": "TEST_PATH='functional/BO/03_catalog/**/*' npm run test:specific",
+    "test:functional:BO:catalog:01-02": "TEST_PATH='functional/BO/03_catalog/0[1-2]*/**/*' npm run test:specific",
+    "test:functional:BO:catalog:03-04": "TEST_PATH='functional/BO/03_catalog/0[3-4]*/**/*' npm run test:specific",
+    "test:functional:BO:catalog:05-06": "TEST_PATH='functional/BO/03_catalog/0[5-6]*/**/*' npm run test:specific",
+    "test:functional:BO:catalog:07-08": "TEST_PATH='functional/BO/03_catalog/0[7-8]*/**/*' npm run test:specific",
+    "test:functional:BO:customer": "TEST_PATH='functional/BO/04_customers/**/*' npm run test:specific",
+    "test:functional:BO:customer:01": "TEST_PATH='functional/BO/04_customers/01*/**/*' npm run test:specific",
+    "test:functional:BO:customer:02-03": "TEST_PATH='functional/BO/04_customers/0[2-3]*/**/*' npm run test:specific",
+    "test:functional:BO:customer-service": "TEST_PATH='functional/BO/05_customerService/**/*' npm run test:specific",
+    "test:functional:BO:modules": "TEST_PATH='functional/BO/07_modules/**/*' npm run test:specific",
+    "test:functional:BO:design": "TEST_PATH='functional/BO/08_design/**/*' npm run test:specific",
+    "test:functional:BO:shipping": "TEST_PATH='functional/BO/09_shipping/**/*' npm run test:specific",
+    "test:functional:BO:payment": "TEST_PATH='functional/BO/10_payment/**/*' npm run test:specific",
+    "test:functional:BO:international": "TEST_PATH='functional/BO/11_international/**/*' npm run test:specific",
+    "test:functional:BO:international:01": "TEST_PATH='functional/BO/11_international/01*/**/*' npm run test:specific",
+    "test:functional:BO:international:02": "TEST_PATH='functional/BO/11_international/02*/**/*' npm run test:specific",
+    "test:functional:BO:international:03-04": "TEST_PATH='functional/BO/11_international/0[3-4]*/**/*' npm run test:specific",
+    "test:functional:BO:shop-parameters": "TEST_PATH='functional/BO/13_shopParameters/**/*' npm run test:specific",
+    "test:functional:BO:shop-parameters:01-02": "TEST_PATH='functional/BO/13_shopParameters/0[1-2]*/**/*' npm run test:specific",
+    "test:functional:BO:shop-parameters:03-04": "TEST_PATH='functional/BO/13_shopParameters/0[3-4]*/**/*' npm run test:specific",
+    "test:functional:BO:shop-parameters:05-07": "TEST_PATH='functional/BO/13_shopParameters/0[5-7]*/**/*' npm run test:specific",
+    "test:functional:BO:advanced-parameters": "TEST_PATH='functional/BO/14_advancedParameters/**/*' npm run test:specific",
+    "test:functional:BO:advanced-parameters:01-06": "TEST_PATH='functional/BO/14_advancedParameters/0[1-6]*/**/*' npm run test:specific",
+    "test:functional:BO:advanced-parameters:07-10": "TEST_PATH='functional/BO/14_advancedParameters/{0[7-9],10}*/**/*' npm run test:specific",
+    "test:functional:BO:header": "TEST_PATH='functional/BO/15_header/**/*' npm run test:specific",
 
     "// Functional FO": "Scripts to run functional FO tests",
-    "test:functional:FO": "TEST_PATH='functional/FO/*' npm run test:specific",
-    "test:functional:FO:01-03": "TEST_PATH='functional/FO/0[1-3]*/*' npm run test:specific",
-    "test:functional:FO:04-07": "TEST_PATH='functional/FO/0[4-7]*/*' npm run test:specific",
-    "test:functional:FO:08-12": "TEST_PATH='functional/FO/{0[8-9],[11-12]}*/*' npm run test:specific",
+    "test:functional:FO": "TEST_PATH='functional/FO/**/*' npm run test:specific",
+    "test:functional:FO:01-03": "TEST_PATH='functional/FO/0[1-3]*/**/*' npm run test:specific",
+    "test:functional:FO:04-07": "TEST_PATH='functional/FO/0[4-7]*/**/*' npm run test:specific",
+    "test:functional:FO:08-12": "TEST_PATH='functional/FO/{0[8-9],[11-12]}*/**/*' npm run test:specific",
 
     "// Regression tests": "Scripts to run regression tests",
-    "test:regression": "TEST_PATH='regression/*' npm run test:specific",
+    "test:regression": "TEST_PATH='regression/**/*' npm run test:specific",
 
     "// All tests": "Scripts to run all campaigns",
     "test:all": "./node_modules/mocha/bin/mocha --recursive --file utils/setup.js campaigns/functional/* campaigns/sanity/* campaigns/regression/*"

From 2845764edf064ed9e3bf9b6b95cd441af7a460a4 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Mon, 26 Jun 2023 17:20:51 +0300
Subject: [PATCH 0297/1030]  remove redundant parent call

---
 .../Form/Admin/Sell/Catalog/FeatureValueType.php                 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Catalog/FeatureValueType.php b/src/PrestaShopBundle/Form/Admin/Sell/Catalog/FeatureValueType.php
index b948d179874da..009b554d4be30 100644
--- a/src/PrestaShopBundle/Form/Admin/Sell/Catalog/FeatureValueType.php
+++ b/src/PrestaShopBundle/Form/Admin/Sell/Catalog/FeatureValueType.php
@@ -87,7 +87,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
     public function configureOptions(OptionsResolver $resolver)
     {
-        parent::configureOptions($resolver);
         $resolver->setDefaults([
             'form_theme' => '@PrestaShop/Admin/TwigTemplateForm/prestashop_ui_kit.html.twig',
         ]);

From 582c480ab046102c76350641812522e0cbdbc3f8 Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Mon, 26 Jun 2023 16:43:19 +0200
Subject: [PATCH 0298/1030] Improve controller depreciation documentation

---
 .../Controller/Admin/FrameworkBundleAdminController.php        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/PrestaShopBundle/Controller/Admin/FrameworkBundleAdminController.php b/src/PrestaShopBundle/Controller/Admin/FrameworkBundleAdminController.php
index fdcf3ac2cf258..19f42abab687b 100644
--- a/src/PrestaShopBundle/Controller/Admin/FrameworkBundleAdminController.php
+++ b/src/PrestaShopBundle/Controller/Admin/FrameworkBundleAdminController.php
@@ -45,7 +45,8 @@
 /**
  * Extends The Symfony framework bundle controller to add common functions for PrestaShop needs.
  *
- * @deprecated since 9.0 to be removed in future versions (10+ at least, when it will not be used anymore)
+ * @deprecated since 9.0 to be removed in future versions (10+ at least, when it will not be used anymore),
+ * should stop using it in favor of PrestaShopAdminController.
  */
 class FrameworkBundleAdminController extends AbstractController implements ContainerAwareInterface
 {

From 95ddba09dc2c779bbfdc75d11bb0d5d41ef98384 Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Mon, 26 Jun 2023 16:59:30 +0200
Subject: [PATCH 0299/1030] Fix missing service

---
 .../config/services/core/grid/grid_definition_factory.yml    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_definition_factory.yml b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_definition_factory.yml
index f472833931839..a3ff2d4fd2c85 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_definition_factory.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_definition_factory.yml
@@ -419,6 +419,11 @@ services:
     autowire: true
     public: true
 
+  PrestaShop\PrestaShop\Core\Grid\Definition\Factory\ApiAccessGridDefinitionFactory:
+    parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory
+    autowire: true
+    public: true
+
   # deprecated services
   # Alias for this abstract definition causes tests in vendor fail for some reason, so we stick to full definition instead
   prestashop.core.grid.definition.factory.abstract_grid_definition:

From 66597d55850de69398a4432870e57498c90fc229 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Tue, 27 Jun 2023 10:51:55 +0300
Subject: [PATCH 0300/1030]  extract featureChoiceType

---
 .../Sell/Product/Details/FeatureValueType.php | 27 +-------
 .../Form/Admin/Type/FeatureChoiceType.php     | 62 +++++++++++++++++++
 .../config/services/adapter/form.yml          | 17 ++---
 .../config/services/bundle/form/form_type.yml |  5 +-
 4 files changed, 78 insertions(+), 33 deletions(-)
 create mode 100644 src/PrestaShopBundle/Form/Admin/Type/FeatureChoiceType.php

diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Product/Details/FeatureValueType.php b/src/PrestaShopBundle/Form/Admin/Sell/Product/Details/FeatureValueType.php
index 99eb1b910ce5d..feba2a53fac12 100644
--- a/src/PrestaShopBundle/Form/Admin/Sell/Product/Details/FeatureValueType.php
+++ b/src/PrestaShopBundle/Form/Admin/Sell/Product/Details/FeatureValueType.php
@@ -28,7 +28,7 @@
 
 namespace PrestaShopBundle\Form\Admin\Sell\Product\Details;
 
-use PrestaShop\PrestaShop\Core\Form\FormChoiceProviderInterface;
+use PrestaShopBundle\Form\Admin\Type\FeatureChoiceType;
 use PrestaShopBundle\Form\Admin\Type\IconButtonType;
 use PrestaShopBundle\Form\Admin\Type\TranslatableType;
 use PrestaShopBundle\Form\Admin\Type\TranslatorAwareType;
@@ -42,25 +42,12 @@
 
 class FeatureValueType extends TranslatorAwareType
 {
-    /**
-     * @var FormChoiceProviderInterface
-     */
-    private $featuresChoiceProvider;
-
-    /**
-     * @var EventSubscriberInterface
-     */
-    private $featureValueListener;
-
     public function __construct(
         TranslatorInterface $translator,
         array $locales,
-        FormChoiceProviderInterface $featuresChoiceProvider,
-        EventSubscriberInterface $featureValueListener
+        protected readonly EventSubscriberInterface $featureValueListener
     ) {
         parent::__construct($translator, $locales);
-        $this->featuresChoiceProvider = $featuresChoiceProvider;
-        $this->featureValueListener = $featureValueListener;
     }
 
     /**
@@ -68,19 +55,11 @@ public function __construct(
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $features = $this->featuresChoiceProvider->getChoices();
-
         $builder
-            ->add('feature_id', ChoiceType::class, [
+            ->add('feature_id', FeatureChoiceType::class, [
                 'empty_data' => null,
-                'choices' => $features,
                 'required' => false,
                 'placeholder' => $this->trans('Choose a feature', 'Admin.Catalog.Feature'),
-                'label' => $this->trans('Feature', 'Admin.Catalog.Feature'),
-                'attr' => [
-                    'data-toggle' => 'select2',
-                    'class' => 'feature-selector',
-                ],
                 'constraints' => [
                     new NotBlank([
                         'message' => $this->trans('Choose a feature', 'Admin.Catalog.Feature'),
diff --git a/src/PrestaShopBundle/Form/Admin/Type/FeatureChoiceType.php b/src/PrestaShopBundle/Form/Admin/Type/FeatureChoiceType.php
new file mode 100644
index 0000000000000..a3f2b1b579bd6
--- /dev/null
+++ b/src/PrestaShopBundle/Form/Admin/Type/FeatureChoiceType.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\Form\Admin\Type;
+
+use PrestaShop\PrestaShop\Core\Form\FormChoiceProviderInterface;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class FeatureChoiceType extends TranslatorAwareType
+{
+    public function __construct(
+        TranslatorInterface $translator,
+        array $locales,
+        protected readonly FormChoiceProviderInterface $featureChoiceProvider
+    ) {
+        parent::__construct($translator, $locales);
+    }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setDefaults([
+            'choices' => $this->featureChoiceProvider->getChoices(),
+            'label' => $this->trans('Feature', 'Admin.Catalog.Feature'),
+            'attr' => [
+                'data-toggle' => 'select2',
+                'class' => 'feature-selector',
+            ],
+        ]);
+    }
+
+    public function getParent(): string
+    {
+        return ChoiceType::class;
+    }
+}
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/form.yml b/src/PrestaShopBundle/Resources/config/services/adapter/form.yml
index 350e99b46d11b..8339035d1bef3 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/form.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/form.yml
@@ -71,13 +71,6 @@ services:
     arguments:
       - '@=service("prestashop.adapter.legacy.context").getLanguage().id'
 
-  prestashop.adapter.form.choice_provider.features_choice_provider:
-    class: 'PrestaShop\PrestaShop\Adapter\Form\ChoiceProvider\FeaturesChoiceProvider'
-    arguments:
-      - '@PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureRepository'
-      - '@prestashop.adapter.legacy.context'
-      - "@=service('prestashop.adapter.legacy.configuration').getInt('PS_LANG_DEFAULT')"
-
   prestashop.adapter.form.choice_provider.feature_values_choice_provider:
     class: 'PrestaShop\PrestaShop\Adapter\Form\ChoiceProvider\FeatureValuesChoiceProvider'
     arguments:
@@ -110,7 +103,17 @@ services:
     autowire: true
     public: false
 
+  PrestaShop\PrestaShop\Adapter\Form\ChoiceProvider\FeaturesChoiceProvider:
+    public: false
+    autowire: true
+    arguments:
+      $defaultLanguageId: "@=service('prestashop.adapter.legacy.configuration').getInt('PS_LANG_DEFAULT')"
+
   # deprecated
   prestashop.adapter.form.choice_provider.shop_tree_choice_provider:
     alias: PrestaShop\PrestaShop\Adapter\Form\ChoiceProvider\ShopTreeChoiceProvider
     deprecated: ~
+
+  prestashop.adapter.form.choice_provider.features_choice_provider:
+    alias: PrestaShop\PrestaShop\Adapter\Form\ChoiceProvider\FeaturesChoiceProvider
+    deprecated: ~
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
index 03d9fcd6a5696..e2661d47b351f 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
@@ -504,7 +504,6 @@ services:
 
   PrestaShopBundle\Form\Admin\Sell\Product\Details\FeatureValueType:
     arguments:
-      $featuresChoiceProvider: '@prestashop.adapter.form.choice_provider.features_choice_provider'
       $featureValueListener: '@PrestaShopBundle\Form\Admin\Sell\Product\EventListener\FeatureValueListener'
 
   PrestaShopBundle\Form\Admin\Sell\Product\Stock\StockType:
@@ -657,7 +656,9 @@ services:
       $permissionChoices: '@=service("prestashop.core.form.choice_provider.permissions_choice_provider").getChoices()'
 
   PrestaShopBundle\Form\Admin\Improve\International\Tax\TaxRulesGroupType:
-
+  PrestaShopBundle\Form\Admin\Type\FeatureChoiceType:
+    arguments:
+      $featureChoiceProvider: '@PrestaShop\PrestaShop\Adapter\Form\ChoiceProvider\FeaturesChoiceProvider'
 
   # Deprecated
   form.type.sell.product.event_listener.categories_listener:

From 610196055fa3a6883e20644758b4f975e01bc741 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Tue, 27 Jun 2023 11:10:07 +0300
Subject: [PATCH 0301/1030]  use autocomplete option

---
 src/PrestaShopBundle/Form/Admin/Type/FeatureChoiceType.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PrestaShopBundle/Form/Admin/Type/FeatureChoiceType.php b/src/PrestaShopBundle/Form/Admin/Type/FeatureChoiceType.php
index a3f2b1b579bd6..a81b51ba01afe 100644
--- a/src/PrestaShopBundle/Form/Admin/Type/FeatureChoiceType.php
+++ b/src/PrestaShopBundle/Form/Admin/Type/FeatureChoiceType.php
@@ -48,8 +48,8 @@ public function configureOptions(OptionsResolver $resolver): void
         $resolver->setDefaults([
             'choices' => $this->featureChoiceProvider->getChoices(),
             'label' => $this->trans('Feature', 'Admin.Catalog.Feature'),
+            'autocomplete' => true,
             'attr' => [
-                'data-toggle' => 'select2',
                 'class' => 'feature-selector',
             ],
         ]);

From 8a3c0fca4a3944d903269bea81359d8a9d03fa5c Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Tue, 27 Jun 2023 11:16:29 +0300
Subject: [PATCH 0302/1030]  adapt to php8 and inject configurationI instead of
 scalar

---
 .../ChoiceProvider/FeaturesChoiceProvider.php | 37 ++++++-------------
 .../config/services/adapter/form.yml          |  3 --
 2 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/src/Adapter/Form/ChoiceProvider/FeaturesChoiceProvider.php b/src/Adapter/Form/ChoiceProvider/FeaturesChoiceProvider.php
index 4e2d3057077af..1ccaa730535af 100644
--- a/src/Adapter/Form/ChoiceProvider/FeaturesChoiceProvider.php
+++ b/src/Adapter/Form/ChoiceProvider/FeaturesChoiceProvider.php
@@ -30,33 +30,16 @@
 
 use PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureRepository;
 use PrestaShop\PrestaShop\Adapter\LegacyContext;
+use PrestaShop\PrestaShop\Core\ConfigurationInterface;
 use PrestaShop\PrestaShop\Core\Form\FormChoiceProviderInterface;
 
 class FeaturesChoiceProvider implements FormChoiceProviderInterface
 {
-    /**
-     * @var FeatureRepository
-     */
-    private $featureRepository;
-
-    /**
-     * @var int
-     */
-    private $contextLanguageId;
-
-    /**
-     * @var int
-     */
-    private $defaultLanguageId;
-
     public function __construct(
-        FeatureRepository $featureRepository,
-        LegacyContext $legacyContext,
-        int $defaultLanguageId
+        protected readonly FeatureRepository $featureRepository,
+        protected readonly LegacyContext $legacyContext,
+        protected readonly ConfigurationInterface $configuration
     ) {
-        $this->featureRepository = $featureRepository;
-        $this->contextLanguageId = (int) $legacyContext->getLanguage()->getId();
-        $this->defaultLanguageId = $defaultLanguageId;
     }
 
     /**
@@ -64,13 +47,15 @@ public function __construct(
      */
     public function getChoices()
     {
-        $features = $this->featureRepository->getFeatures();
+        $defaultLangId = (int) $this->configuration->get('PS_LANG_DEFAULT');
+        $contextLangId = (int) $this->legacyContext->getLanguage()->getId();
+
         $choices = [];
-        foreach ($features as $feature) {
-            if (!empty($feature['localized_names'][$this->contextLanguageId])) {
-                $featureName = $feature['localized_names'][$this->contextLanguageId];
+        foreach ($this->featureRepository->getFeatures() as $feature) {
+            if (!empty($feature['localized_names'][$contextLangId])) {
+                $featureName = $feature['localized_names'][$contextLangId];
             } else {
-                $featureName = $feature['localized_names'][$this->defaultLanguageId];
+                $featureName = $feature['localized_names'][$defaultLangId];
             }
             $choices[$featureName] = $feature['id_feature'];
         }
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/form.yml b/src/PrestaShopBundle/Resources/config/services/adapter/form.yml
index 8339035d1bef3..6d8511e9a8183 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/form.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/form.yml
@@ -98,7 +98,6 @@ services:
       - '@PrestaShop\PrestaShop\Core\Product\Combination\NameBuilder\CombinationNameBuilderInterface'
       - '@=service("prestashop.adapter.legacy.context").getLanguage().id'
 
-
   PrestaShop\PrestaShop\Adapter\Form\ChoiceProvider\ShopTreeChoiceProvider:
     autowire: true
     public: false
@@ -106,8 +105,6 @@ services:
   PrestaShop\PrestaShop\Adapter\Form\ChoiceProvider\FeaturesChoiceProvider:
     public: false
     autowire: true
-    arguments:
-      $defaultLanguageId: "@=service('prestashop.adapter.legacy.configuration').getInt('PS_LANG_DEFAULT')"
 
   # deprecated
   prestashop.adapter.form.choice_provider.shop_tree_choice_provider:

From 27ddebc088e7361075644a8f732fdf39329e518f Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Tue, 27 Jun 2023 13:33:24 +0300
Subject: [PATCH 0303/1030]  remove renundant data and modify disabled attr
 condition

---
 .../Form/Admin/Sell/Catalog/FeatureValueType.php               | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Catalog/FeatureValueType.php b/src/PrestaShopBundle/Form/Admin/Sell/Catalog/FeatureValueType.php
index 009b554d4be30..9cdf97b32f3eb 100644
--- a/src/PrestaShopBundle/Form/Admin/Sell/Catalog/FeatureValueType.php
+++ b/src/PrestaShopBundle/Form/Admin/Sell/Catalog/FeatureValueType.php
@@ -61,10 +61,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add('feature_id', ChoiceType::class, [
                 'choices' => $this->featureChoiceProvider->getChoices(),
                 'label' => $this->trans('Feature', 'Admin.Global'),
-                'data' => $builder->getData()['feature_id'] ?? null,
                 'attr' => [
                     // disable feature id choices when editing feature value and only allow changing them when creating new one
-                    'disabled' => isset($builder->getData()['feature_value_id']),
+                    'disabled' => !empty($builder->getData()['feature_value_id']),
                 ],
             ])
             ->add('value', TranslatableType::class, [

From 81c1e2bbc71b1485be41c26bb5f2a057cd209159 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Fri, 12 May 2023 12:32:10 +0300
Subject: [PATCH 0304/1030]  wip introducing product restriction command

---
 .../SetCartRuleProductRestrictionsHandler.php | 52 ++++++++++
 .../Repository/CartRuleRepository.php         | 12 +++
 .../SetCartRuleProductRestrictionsCommand.php | 69 ++++++++++++++
 ...uleProductRestrictionsHandlerInterface.php | 36 +++++++
 .../Exception/CartRuleConstraintException.php |  2 +-
 .../Restriction/RestrictionRule.php           | 94 +++++++++++++++++++
 .../Restriction/RestrictionRuleGroup.php      | 66 +++++++++++++
 7 files changed, 330 insertions(+), 1 deletion(-)
 create mode 100644 src/Adapter/CartRule/CommandHandler/SetCartRuleProductRestrictionsHandler.php
 create mode 100644 src/Core/Domain/CartRule/Command/SetCartRuleProductRestrictionsCommand.php
 create mode 100644 src/Core/Domain/CartRule/CommandHandler/SetCartRuleProductRestrictionsHandlerInterface.php
 create mode 100644 src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRule.php
 create mode 100644 src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRuleGroup.php

diff --git a/src/Adapter/CartRule/CommandHandler/SetCartRuleProductRestrictionsHandler.php b/src/Adapter/CartRule/CommandHandler/SetCartRuleProductRestrictionsHandler.php
new file mode 100644
index 0000000000000..918ee3238378f
--- /dev/null
+++ b/src/Adapter/CartRule/CommandHandler/SetCartRuleProductRestrictionsHandler.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler;
+
+use PrestaShop\PrestaShop\Adapter\CartRule\Repository\CartRuleRepository;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\SetCartRuleProductRestrictionsCommand;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\CommandHandler\SetCartRuleProductRestrictionsHandlerInterface;
+
+class SetCartRuleProductRestrictionsHandler implements SetCartRuleProductRestrictionsHandlerInterface
+{
+    /**
+     * @var CartRuleRepository
+     */
+    private $cartRuleRepository;
+
+    public function __construct(
+        CartRuleRepository $cartRuleRepository
+    ) {
+        $this->cartRuleRepository = $cartRuleRepository;
+    }
+
+    public function handle(SetCartRuleProductRestrictionsCommand $command): void
+    {
+        $cartRule = $this->cartRuleRepository->get($command->getCartRuleId());
+    }
+}
diff --git a/src/Adapter/CartRule/Repository/CartRuleRepository.php b/src/Adapter/CartRule/Repository/CartRuleRepository.php
index b4f89312c3275..060be92456a7b 100644
--- a/src/Adapter/CartRule/Repository/CartRuleRepository.php
+++ b/src/Adapter/CartRule/Repository/CartRuleRepository.php
@@ -34,6 +34,7 @@
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CannotEditCartRuleException;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\CartRuleId;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\Restriction\RestrictionRuleGroup;
 use PrestaShop\PrestaShop\Core\Repository\AbstractObjectModelRepository;
 
 class CartRuleRepository extends AbstractObjectModelRepository
@@ -87,6 +88,17 @@ public function get(CartRuleId $cartRuleId): CartRule
         return $cartRule;
     }
 
+    /**
+     * @param CartRuleId $cartRuleId
+     * @param RestrictionRuleGroup[] $restrictionRuleGroups
+     *
+     * @return void
+     */
+    public function setProductRestrictions(CartRuleId $cartRuleId, array $restrictionRuleGroups): void
+    {
+        //@todo: implement
+    }
+
     /**
      * @param CartRule $cartRule
      * @param array<int|string, string|int[]> $propertiesToUpdate
diff --git a/src/Core/Domain/CartRule/Command/SetCartRuleProductRestrictionsCommand.php b/src/Core/Domain/CartRule/Command/SetCartRuleProductRestrictionsCommand.php
new file mode 100644
index 0000000000000..f3851f21b870d
--- /dev/null
+++ b/src/Core/Domain/CartRule/Command/SetCartRuleProductRestrictionsCommand.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\CartRule\Command;
+
+use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\CartRuleId;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\Restriction\RestrictionRuleGroup;
+
+class SetCartRuleProductRestrictionsCommand
+{
+    /**
+     * @var CartRuleId
+     */
+    private $cartRuleId;
+
+    /**
+     * @var RestrictionRuleGroup[]
+     */
+    private $restrictionRuleGroups;
+
+    public function __construct(
+        int $cartRuleId,
+        array $restrictionRuleGroups
+    ) {
+        $this->cartRuleId = new CartRuleId($cartRuleId);
+        $this->restrictionRuleGroups = $restrictionRuleGroups;
+    }
+
+    /**
+     * @return CartRuleId
+     */
+    public function getCartRuleId(): CartRuleId
+    {
+        return $this->cartRuleId;
+    }
+
+    /**
+     * @return RestrictionRuleGroup[]
+     */
+    public function getRestrictionRuleGroups(): array
+    {
+        return $this->restrictionRuleGroups;
+    }
+}
diff --git a/src/Core/Domain/CartRule/CommandHandler/SetCartRuleProductRestrictionsHandlerInterface.php b/src/Core/Domain/CartRule/CommandHandler/SetCartRuleProductRestrictionsHandlerInterface.php
new file mode 100644
index 0000000000000..6901e6221ce6e
--- /dev/null
+++ b/src/Core/Domain/CartRule/CommandHandler/SetCartRuleProductRestrictionsHandlerInterface.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\CartRule\CommandHandler;
+
+use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\SetCartRuleProductRestrictionsCommand;
+
+interface SetCartRuleProductRestrictionsHandlerInterface
+{
+    public function handle(SetCartRuleProductRestrictionsCommand $command): void;
+}
diff --git a/src/Core/Domain/CartRule/Exception/CartRuleConstraintException.php b/src/Core/Domain/CartRule/Exception/CartRuleConstraintException.php
index f0eca7730738a..6794a8e6036c3 100644
--- a/src/Core/Domain/CartRule/Exception/CartRuleConstraintException.php
+++ b/src/Core/Domain/CartRule/Exception/CartRuleConstraintException.php
@@ -72,6 +72,6 @@ class CartRuleConstraintException extends CartRuleException
     public const INVALID_HIGHLIGHT = 36;
     public const INVALID_ACTIVE = 37;
     public const NON_UNIQUE_CODE = 38;
-
     public const INVALID_PRICE_DISCOUNT = 39;
+    public const INVALID_RESTRICTION_RULE = 40;
 }
diff --git a/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRule.php b/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRule.php
new file mode 100644
index 0000000000000..2f9d9580c6161
--- /dev/null
+++ b/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRule.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\Restriction;
+
+use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleConstraintException;
+
+class RestrictionRule
+{
+    public const TYPE_PRODUCT = 'products';
+    public const TYPE_CATEGORY = 'categories';
+    public const TYPE_ATTRIBUTE = 'attributes';
+    public const TYPE_FEATURE = 'features';
+    public const TYPE_BRAND = 'brands';
+    public const TYPE_SUPPLIER = 'suppliers';
+    public const VALID_TYPES = [
+        self::TYPE_PRODUCT => self::TYPE_PRODUCT,
+        self::TYPE_CATEGORY => self::TYPE_CATEGORY,
+        self::TYPE_ATTRIBUTE => self::TYPE_ATTRIBUTE,
+        self::TYPE_FEATURE => self::TYPE_FEATURE,
+        self::TYPE_BRAND => self::TYPE_BRAND,
+        self::TYPE_SUPPLIER => self::TYPE_SUPPLIER,
+    ];
+
+    /**
+     * @var string
+     */
+    private $type;
+
+    /**
+     * @var int[]
+     */
+    private $ids;
+
+    /**
+     * @param string $type
+     * @param int[] $ids
+     */
+    public function __construct(
+        string $type,
+        array $ids
+    ) {
+        $this->assertType($type);
+        $this->type = $type;
+        $this->ids = $ids;
+    }
+
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    public function getIds(): array
+    {
+        return $this->ids;
+    }
+
+    private function assertType(string $type): void
+    {
+        if (in_array($type, self::VALID_TYPES, true)) {
+            return;
+        }
+
+        throw new CartRuleConstraintException(
+          sprintf('Invalid type provided to %s', self::class),
+            CartRuleConstraintException::INVALID_RESTRICTION_RULE
+        );
+    }
+}
diff --git a/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRuleGroup.php b/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRuleGroup.php
new file mode 100644
index 0000000000000..87c57148c9fa7
--- /dev/null
+++ b/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRuleGroup.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\Restriction;
+
+class RestrictionRuleGroup
+{
+    /**
+     * @var int
+     */
+    private $requiredQuantityInCart;
+
+    /**
+     * @var RestrictionRule[]
+     */
+    private $restrictionRules;
+
+    public function __construct(
+        int $requiredQuantityInCart,
+        array $restrictionRules
+    ) {
+        $this->requiredQuantityInCart = $requiredQuantityInCart;
+        $this->restrictionRules = $restrictionRules;
+    }
+
+    /**
+     * @return int
+     */
+    public function getRequiredQuantityInCart(): int
+    {
+        return $this->requiredQuantityInCart;
+    }
+
+    /**
+     * @return RestrictionRule[]
+     */
+    public function getRestrictionRules(): array
+    {
+        return $this->restrictionRules;
+    }
+}

From 3100cc9ba0edef42935c85ead5e015f7fbfda8cf Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Fri, 12 May 2023 17:03:16 +0300
Subject: [PATCH 0305/1030]  implement repository method to delete all product
 restrictions for given cartrule

---
 .../SetCartRuleProductRestrictionsHandler.php |  8 ++-
 .../Repository/CartRuleRepository.php         | 55 +++++++++++++++++--
 .../config/services/adapter/cart_rule.yml     |  7 +++
 3 files changed, 65 insertions(+), 5 deletions(-)

diff --git a/src/Adapter/CartRule/CommandHandler/SetCartRuleProductRestrictionsHandler.php b/src/Adapter/CartRule/CommandHandler/SetCartRuleProductRestrictionsHandler.php
index 918ee3238378f..d2c17ee6aab00 100644
--- a/src/Adapter/CartRule/CommandHandler/SetCartRuleProductRestrictionsHandler.php
+++ b/src/Adapter/CartRule/CommandHandler/SetCartRuleProductRestrictionsHandler.php
@@ -47,6 +47,12 @@ public function __construct(
 
     public function handle(SetCartRuleProductRestrictionsCommand $command): void
     {
-        $cartRule = $this->cartRuleRepository->get($command->getCartRuleId());
+        $cartRuleId = $command->getCartRuleId();
+        $cartRule = $this->cartRuleRepository->get($cartRuleId);
+
+        $this->cartRuleRepository->setProductRestrictions($cartRuleId, $command->getRestrictionRuleGroups());
+
+        $cartRule->product_restriction = !empty($command->getRestrictionRuleGroups());
+        $this->cartRuleRepository->partialUpdate($cartRule, ['product_restriction']);
     }
 }
diff --git a/src/Adapter/CartRule/Repository/CartRuleRepository.php b/src/Adapter/CartRule/Repository/CartRuleRepository.php
index 060be92456a7b..57ec9c6a55310 100644
--- a/src/Adapter/CartRule/Repository/CartRuleRepository.php
+++ b/src/Adapter/CartRule/Repository/CartRuleRepository.php
@@ -40,9 +40,9 @@
 class CartRuleRepository extends AbstractObjectModelRepository
 {
     public function __construct(
-        protected CartRuleValidator $cartRuleValidator,
-        protected Connection $connection,
-        protected string $dbPrefix
+        protected readonly CartRuleValidator $cartRuleValidator,
+        protected readonly Connection $connection,
+        protected readonly string $dbPrefix
     ) {
     }
 
@@ -96,7 +96,9 @@ public function get(CartRuleId $cartRuleId): CartRule
      */
     public function setProductRestrictions(CartRuleId $cartRuleId, array $restrictionRuleGroups): void
     {
-        //@todo: implement
+        // first remove all product restrictions concerning provided cart rule
+        $this->removeProductRestrictions($cartRuleId);
+        // @todo: then set new ones.
     }
 
     /**
@@ -189,4 +191,49 @@ private function removeRestrictedCartRules(CartRuleId $cartRuleId): void
             ->execute()
         ;
     }
+
+    private function removeProductRestrictions(CartRuleId $cartRuleId): void
+    {
+        //delete records from cart_rule_product_rule_value for this cart rule
+        $this->connection->createQueryBuilder()
+            ->delete($this->dbPrefix . 'cart_rule_product_rule_value', 'crprv')
+            ->innerJoin(
+                'crprv',
+                $this->dbPrefix . 'cart_rule_product_rule',
+                'crpr',
+                'crprv.id_product_rule = crpr.id_product_rule'
+            )
+            ->innerJoin(
+                'crpr',
+                $this->dbPrefix . 'cart_rule_product_rule_group',
+                'crprg',
+                'crpr.id_product_rule_group = crprg.id_product_rule_group'
+            )
+            ->where('crprg.id_cart_rule = :cartRuleId')
+            ->setParameter('cartRuleId', $cartRuleId->getValue())
+            ->execute()
+        ;
+
+        // delete records from cart_rule_product_rule for this cart rule
+        $this->connection->createQueryBuilder()
+            ->delete($this->dbPrefix . 'cart_rule_product_rule', 'crpr')
+            ->innerJoin(
+                'crpr',
+                $this->dbPrefix . 'cart_rule_product_rule_group',
+                'crprg',
+                'crpr.id_product_rule_group = crprg.id_product_rule_group'
+            )
+            ->where('crprg.id_cart_rule = :cartRuleId')
+            ->setParameter('cartRuleId', $cartRuleId->getValue())
+            ->execute()
+        ;
+
+        // and finally delete records from cart_rule_product_rule_group for this cart rule
+        $this->connection->createQueryBuilder()
+            ->delete($this->dbPrefix . 'cart_rule_product_rule_group')
+            ->where('id_cart_rule = :cartRuleId')
+            ->setParameter('cartRuleId', $cartRuleId->getValue())
+            ->execute()
+        ;
+    }
 }
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml b/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml
index ec8fbb0c941aa..9c1ee7fcaf830 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml
@@ -66,8 +66,15 @@ services:
     autowire: true
     public: false
 
+
   PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler\SetCartRuleRestrictionsHandler:
     autowire: true
     public: false
     tags:
       - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\CartRule\Command\SetCartRuleRestrictionsCommand }
+
+  PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler\SetCartRuleProductRestrictionsHandler:
+    autowire: true
+    public: false
+    tags:
+      - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\CartRule\Command\SetCartRuleProductRestrictionsCommand }

From b0bb27a208618916786f580f971f545349b00693 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Mon, 15 May 2023 16:03:16 +0300
Subject: [PATCH 0306/1030]  save progress

---
 .../CartRule/Repository/CartRuleRepository.php      | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/Adapter/CartRule/Repository/CartRuleRepository.php b/src/Adapter/CartRule/Repository/CartRuleRepository.php
index 57ec9c6a55310..696aabb6cf515 100644
--- a/src/Adapter/CartRule/Repository/CartRuleRepository.php
+++ b/src/Adapter/CartRule/Repository/CartRuleRepository.php
@@ -98,7 +98,18 @@ public function setProductRestrictions(CartRuleId $cartRuleId, array $restrictio
     {
         // first remove all product restrictions concerning provided cart rule
         $this->removeProductRestrictions($cartRuleId);
-        // @todo: then set new ones.
+        $ruleGroupValues = '';
+
+        foreach ($restrictionRuleGroups as $restrictionRuleGroup) {
+            $qty = $restrictionRuleGroup->getRequiredQuantityInCart();
+            $ruleGroupValues .= sprintf('(%d, %d)', $qty, $cartRuleId->getValue());
+        }
+
+        $ruleGroupsStmt = sprintf(
+            'INSERT INTO (id_cart_rule, quantity) %scart_rule_product_rule_group VALUES %s',
+            $this->dbPrefix,
+            $ruleGroupValues
+        );
     }
 
     /**

From 737d58845a0d38a64c03e442b70710f80dcd24fc Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Thu, 15 Jun 2023 14:10:02 +0300
Subject: [PATCH 0307/1030]  untested method for inserting product restrictions

---
 .../Repository/CartRuleRepository.php         | 64 ++++++++++++++++---
 .../Restriction/RestrictionRule.php           |  9 ++-
 2 files changed, 61 insertions(+), 12 deletions(-)

diff --git a/src/Adapter/CartRule/Repository/CartRuleRepository.php b/src/Adapter/CartRule/Repository/CartRuleRepository.php
index 696aabb6cf515..6fa9d2888b29a 100644
--- a/src/Adapter/CartRule/Repository/CartRuleRepository.php
+++ b/src/Adapter/CartRule/Repository/CartRuleRepository.php
@@ -32,6 +32,7 @@
 use PrestaShop\PrestaShop\Adapter\CartRule\Validate\CartRuleValidator;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CannotAddCartRuleException;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CannotEditCartRuleException;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleConstraintException;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\CartRuleId;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\Restriction\RestrictionRuleGroup;
@@ -98,18 +99,63 @@ public function setProductRestrictions(CartRuleId $cartRuleId, array $restrictio
     {
         // first remove all product restrictions concerning provided cart rule
         $this->removeProductRestrictions($cartRuleId);
-        $ruleGroupValues = '';
 
         foreach ($restrictionRuleGroups as $restrictionRuleGroup) {
-            $qty = $restrictionRuleGroup->getRequiredQuantityInCart();
-            $ruleGroupValues .= sprintf('(%d, %d)', $qty, $cartRuleId->getValue());
-        }
+            if (empty($restrictionRuleGroup->getRestrictionRules())) {
+                throw new CartRuleConstraintException(
+                    'Restriction rules are empty',
+                    CartRuleConstraintException::INVALID_PRODUCT_RESTRICTION
+                );
+            }
 
-        $ruleGroupsStmt = sprintf(
-            'INSERT INTO (id_cart_rule, quantity) %scart_rule_product_rule_group VALUES %s',
-            $this->dbPrefix,
-            $ruleGroupValues
-        );
+            $this->connection->createQueryBuilder()
+                ->insert($this->dbPrefix . 'cart_rule_product_rule_group')
+                ->values([
+                    'id_cart_rule' => $cartRuleId->getValue(),
+                    'quantity' => $restrictionRuleGroup->getRequiredQuantityInCart(),
+                ])
+                ->execute()
+            ;
+
+            $productRuleGroupId = $this->connection->lastInsertId();
+
+            foreach ($restrictionRuleGroup->getRestrictionRules() as $restrictionRule) {
+                if ($restrictionRule->getIds()) {
+                    throw new CartRuleConstraintException(
+                        'Restriction rule products are empty',
+                        CartRuleConstraintException::INVALID_PRODUCT_RESTRICTION
+                    );
+                }
+                $this->connection->createQueryBuilder()
+                    ->insert($this->dbPrefix . 'cart_rule_product_rule')
+                    ->values([
+                        'id_product_rule_group' => $productRuleGroupId,
+                        'type' => $restrictionRule->getType(),
+                    ])
+                    ->execute()
+                ;
+
+                $productRuleId = $this->connection->lastInsertId();
+                $productRuleValues = [];
+                $checkedIds = [];
+                foreach ($restrictionRule->getIds() as $id) {
+                    if (in_array($id, $checkedIds, true)) {
+                        // skip in case there are duplicates
+                        continue;
+                    }
+                    $productRuleValues[] = sprintf('(%d, %d)', $productRuleId, $id);
+                    $checkedIds[] = $id;
+                }
+
+                $productRuleStmt = sprintf(
+                    'INSERT INTO (id_product_rule, id_item) %scart_rule_product_rule_value VALUES %s',
+                    $this->dbPrefix,
+                    implode(',', $productRuleValues)
+                );
+
+                $this->connection->executeStatement($productRuleStmt);
+            }
+        }
     }
 
     /**
diff --git a/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRule.php b/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRule.php
index 2f9d9580c6161..f80dc76f531db 100644
--- a/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRule.php
+++ b/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRule.php
@@ -35,14 +35,12 @@ class RestrictionRule
     public const TYPE_PRODUCT = 'products';
     public const TYPE_CATEGORY = 'categories';
     public const TYPE_ATTRIBUTE = 'attributes';
-    public const TYPE_FEATURE = 'features';
     public const TYPE_BRAND = 'brands';
     public const TYPE_SUPPLIER = 'suppliers';
     public const VALID_TYPES = [
         self::TYPE_PRODUCT => self::TYPE_PRODUCT,
         self::TYPE_CATEGORY => self::TYPE_CATEGORY,
         self::TYPE_ATTRIBUTE => self::TYPE_ATTRIBUTE,
-        self::TYPE_FEATURE => self::TYPE_FEATURE,
         self::TYPE_BRAND => self::TYPE_BRAND,
         self::TYPE_SUPPLIER => self::TYPE_SUPPLIER,
     ];
@@ -53,13 +51,15 @@ class RestrictionRule
     private $type;
 
     /**
+     * Ids of product, attributes, categories, manufacturers or suppliers, depending on restriction rule type
+     *
      * @var int[]
      */
     private $ids;
 
     /**
      * @param string $type
-     * @param int[] $ids
+     * @param int[]
      */
     public function __construct(
         string $type,
@@ -75,6 +75,9 @@ public function getType(): string
         return $this->type;
     }
 
+    /**
+     * @return int[]
+     */
     public function getIds(): array
     {
         return $this->ids;

From 0c3cdc7746e5a167c3d59bb97d01befe789e41dc Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Thu, 15 Jun 2023 16:51:59 +0300
Subject: [PATCH 0308/1030]  wip untested method for retrieving cart rule
 product restrictions

---
 .../GetCartRuleForEditingHandler.php          |  11 +-
 .../Repository/CartRuleRepository.php         | 102 ++++++++++++++++++
 .../CartRuleRestrictionsForEditing.php        |  12 ++-
 .../AbstractCartRuleFeatureContext.php        |  13 ++-
 .../CartRule/AddCartRuleFeatureContext.php    |   2 +-
 .../CartRuleAssertionFeatureContext.php       |  35 +++---
 .../CartRule/set_product_restrictions.feature |  96 +++++++++++++++++
 7 files changed, 247 insertions(+), 24 deletions(-)
 create mode 100644 tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature

diff --git a/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php b/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php
index 3671222264e40..42070ede4a9a4 100644
--- a/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php
+++ b/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php
@@ -122,8 +122,8 @@ private function getCartRuleConditions(CartRule $cartRule): CartRuleConditionsFo
         }
 
         $cartRuleRestrictions = new CartRuleRestrictionsForEditing(
-            // @todo: fill other restrictions when related commands are implemented
             $restrictedCartRules,
+            $this->getRestrictionRuleGroups($cartRule)
         );
 
         return new CartRuleConditionsForEditing(
@@ -137,6 +137,15 @@ private function getCartRuleConditions(CartRule $cartRule): CartRuleConditionsFo
         );
     }
 
+    private function getRestrictionRuleGroups(CartRule $cartRule): array
+    {
+        if (!$cartRule->product_restriction) {
+            return [];
+        }
+
+        return $this->cartRuleRepository->getProductRestrictions(new CartRuleId((int) $cartRule->id));
+    }
+
     private function getCartRuleActions(CartRule $cartRule): CartRuleActionForEditing
     {
         $discountApplicationType = $this->getDiscountApplicationType($cartRule);
diff --git a/src/Adapter/CartRule/Repository/CartRuleRepository.php b/src/Adapter/CartRule/Repository/CartRuleRepository.php
index 6fa9d2888b29a..a7c6e9b53b36a 100644
--- a/src/Adapter/CartRule/Repository/CartRuleRepository.php
+++ b/src/Adapter/CartRule/Repository/CartRuleRepository.php
@@ -33,8 +33,10 @@
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CannotAddCartRuleException;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CannotEditCartRuleException;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleConstraintException;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleException;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\CartRuleId;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\Restriction\RestrictionRule;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\Restriction\RestrictionRuleGroup;
 use PrestaShop\PrestaShop\Core\Repository\AbstractObjectModelRepository;
 
@@ -158,6 +160,106 @@ public function setProductRestrictions(CartRuleId $cartRuleId, array $restrictio
         }
     }
 
+    /**
+     * @param CartRuleId $cartRuleId
+     *
+     * @return RestrictionRuleGroup[]
+     */
+    public function getProductRestrictions(CartRuleId $cartRuleId): array
+    {
+        // retrieve all item ids based on cart rule
+        $ruleValues = $this->connection->createQueryBuilder()
+            ->select('value.id_product_rule, value.id_item')
+            ->from($this->dbPrefix . 'cart_rule_product_rule_value', 'value')
+            ->innerJoin(
+                'value',
+                $this->dbPrefix . 'cart_rule_product_rule',
+                'rule',
+                'value.id_product_rule = rule.id_product_rule'
+            )
+            ->innerJoin(
+                'rule',
+                $this->dbPrefix . 'cart_rule_product_rule_group',
+                'group',
+                'rule.id_product_rule_group = group.id_product_rule_group'
+            )
+            ->where('group.id_cart_rule = :cartRuleId')
+            ->setParameter('cartRuleId', $cartRuleId->getValue())
+            ->execute()
+        ;
+
+        // retrieve all rules based on cart rule
+        $rules = $this->connection->createQueryBuilder()
+            ->select('rule.id_product_rule, rule.id_product_rule_group, rule.type')
+            ->from($this->dbPrefix . 'cart_rule_product_rule', 'rule')
+            ->innerJoin(
+                'rule',
+                $this->dbPrefix . 'cart_rule_product_rule_group',
+                'group',
+                'rule.id_product_rule_group = group.id_product_rule_group'
+            )
+            ->where('group.id_cart_rule = :cartRuleId')
+            ->setParameter('cartRuleId', $cartRuleId->getValue())
+            ->execute()
+            ->fetchAllAssociative()
+        ;
+
+        // retrieve all rule groups based on cart rule
+        $groups = $this->connection->createQueryBuilder()
+            ->select('*')
+            ->from($this->dbPrefix . 'cart_rule_product_rule_group', 'group')
+            ->where('id_cart_rule = :cartRuleId')
+            ->setParameter('cartRuleId', $cartRuleId->getValue())
+            ->execute()
+            ->fetchAllAssociative()
+        ;
+
+        // put quantities under related group
+        $quantityForGroups = [];
+        foreach ($groups as $group) {
+            $productRuleGroupId = (int) $group['id_product_rule_group'];
+            $quantityForGroups[$productRuleGroupId] = (int) $group['quantity'];
+        }
+
+        // put types under related group and product rules
+        $typesForRules = [];
+        foreach ($rules as $rule) {
+            $productRuleId = (int) $rule['id_product_rule'];
+            $typesForRules[$rule['id_product_rule_group']][$productRuleId][] = $rule['type'];
+        }
+
+        // put ids under related product rules
+        $ruleItemIdsForRules = [];
+        foreach ($ruleValues as $ruleValue) {
+            $productRuleId = (int) $ruleValue['id_product_rule'];
+            $ruleItemIdsForRules[$productRuleId][] = (int) $ruleValue['id_item'];
+        }
+
+        // finally build the complex restriction rule groups by retrieving related values by array keys structured above
+        $restrictionRuleGroups = [];
+        foreach ($quantityForGroups as $groupId => $quantity) {
+            if (!isset($typesForRules[$groupId])) {
+                throw new CartRuleException(
+                    sprintf('Unexpected state of cart rule product restrictions. Failed to retrieve types for rules of group %d', $groupId)
+                );
+            }
+
+            $restrictionRules = [];
+            foreach ($typesForRules[$groupId] as $productRuleId => $type) {
+                if (!isset($ruleItemIdsForRules[$productRuleId])) {
+                    throw new CartRuleException(
+                        sprintf('Unexpected state of cart rule product restrictions. Failed to retrieve item ids for rule %d', $productRuleId)
+                    );
+                }
+                $restrictionRules[] = new RestrictionRule($type, $ruleItemIdsForRules[$productRuleId]);
+            }
+
+            $restrictionRuleGroups[] = new RestrictionRuleGroup($quantity, $restrictionRules);
+        }
+
+        return $restrictionRuleGroups;
+    }
+
     /**
      * @param CartRule $cartRule
      * @param array<int|string, string|int[]> $propertiesToUpdate
diff --git a/src/Core/Domain/CartRule/QueryResult/CartRuleRestrictionsForEditing.php b/src/Core/Domain/CartRule/QueryResult/CartRuleRestrictionsForEditing.php
index e21c9bc115d64..16af3f13ea227 100644
--- a/src/Core/Domain/CartRule/QueryResult/CartRuleRestrictionsForEditing.php
+++ b/src/Core/Domain/CartRule/QueryResult/CartRuleRestrictionsForEditing.php
@@ -28,11 +28,19 @@
 
 namespace PrestaShop\PrestaShop\Core\Domain\CartRule\QueryResult;
 
+use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\Restriction\RestrictionRuleGroup;
+
 class CartRuleRestrictionsForEditing
 {
-    //@todo: add other restrictions like country, carrier, group, product, shop (shop association might be handled separatly)
+    /**
+     * @todo: fill other restrictions when related commands are implemented
+     *
+     * @param int[] $restrictedCartRuleIds
+     * @param RestrictionRuleGroup[] $productRestrictionRuleGroups
+     */
     public function __construct(
-        public readonly array $restrictedCartRuleIds
+        public readonly array $restrictedCartRuleIds,
+        public readonly array $productRestrictionRuleGroups
     ) {
     }
 }
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
index 92735e557a743..54f05e8daa6bd 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
@@ -284,6 +284,15 @@ protected function assertCartRuleProperties(CartRuleForEditing $cartRuleForEditi
                 'Unexpected gift_combination'
             );
         }
+
+        if (isset($data['restricted cart rules'])) {
+            $expectedRestrictedCartRuleIds = $this->referencesToIds($data['restricted cart rules']);
+            Assert::assertSame(
+                $expectedRestrictedCartRuleIds,
+                $conditions->getRestrictions()->restrictedCartRuleIds,
+                'Unexpected cart rule restrictions'
+            );
+        }
     }
 
     protected function getCartRuleActionBuilder(): CartRuleActionBuilder
@@ -341,11 +350,11 @@ protected function formatDataForActionBuilder(array $data): array
         return $formattedData;
     }
 
-    protected function getCartRuleForEditing(int $cartRuleId): CartRuleForEditing
+    protected function getCartRuleForEditing(string $cartRuleReference): CartRuleForEditing
     {
         /** @var CartRuleForEditing $cartRuleForEditing */
         $cartRuleForEditing = $this->getQueryBus()->handle(
-            new GetCartRuleForEditing($cartRuleId)
+            new GetCartRuleForEditing($this->getSharedStorage()->get($cartRuleReference))
         );
 
         return $cartRuleForEditing;
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AddCartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AddCartRuleFeatureContext.php
index 92dfc5c30fee1..fee17118403de 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AddCartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AddCartRuleFeatureContext.php
@@ -47,7 +47,7 @@ public function createCartRuleIfNotExists(string $cartRuleReference, TableNode $
             try {
                 // if cart rule already exists we assert all its expected properties
                 $this->assertCartRuleProperties(
-                    $this->getCartRuleForEditing($this->getSharedStorage()->get($cartRuleReference)),
+                    $this->getCartRuleForEditing($cartRuleReference),
                     $data
                 );
 
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
index 40c813d157c75..2376bdb298986 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
@@ -32,8 +32,6 @@
 use PHPUnit\Framework\Assert;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleConstraintException;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleNotFoundException;
-use PrestaShop\PrestaShop\Core\Domain\CartRule\Query\GetCartRuleForEditing;
-use PrestaShop\PrestaShop\Core\Domain\CartRule\QueryResult\CartRuleForEditing;
 use RuntimeException;
 use Tests\Integration\Behaviour\Features\Context\Util\NoExceptionAlthoughExpectedException;
 use Tests\Resources\DatabaseDump;
@@ -55,17 +53,11 @@ public static function restoreCartRules(): void
      * @Then cart rule with reference :cartRuleReference is enabled
      *
      * @param string $cartRuleReference
-     *
-     * @throws CartRuleConstraintException
-     * @throws RuntimeException
      */
     public function assertCartRuleEnabled(string $cartRuleReference): void
     {
-        /** @var CartRuleForEditing $cartRule */
-        $cartRule = $this->getQueryBus()->handle(new GetCartRuleForEditing($this->getSharedStorage()->get($cartRuleReference)));
-
         Assert::assertTrue(
-            $cartRule->getInformation()->isEnabled(),
+            $this->getCartRuleForEditing($cartRuleReference)->getInformation()->isEnabled(),
             sprintf('Cart rule %s is not enabled', $cartRuleReference)
         );
     }
@@ -74,16 +66,11 @@ public function assertCartRuleEnabled(string $cartRuleReference): void
      * @Then cart rule with reference :cartRuleReference is disabled
      *
      * @param string $cartRuleReference
-     *
-     * @throws CartRuleConstraintException
      */
     public function assertCartRuleDisabled(string $cartRuleReference): void
     {
-        /** @var CartRuleForEditing $cartRule */
-        $cartRule = $this->getQueryBus()->handle(new GetCartRuleForEditing($this->getSharedStorage()->get($cartRuleReference)));
-
         Assert::assertFalse(
-            $cartRule->getInformation()->isEnabled(),
+            $this->getCartRuleForEditing($cartRuleReference)->getInformation()->isEnabled(),
             sprintf('Cart rule %s is not disabled', $cartRuleReference)
         );
     }
@@ -93,13 +80,12 @@ public function assertCartRuleDisabled(string $cartRuleReference): void
      *
      * @param string $cartRuleReference
      *
-     * @throws CartRuleConstraintException
      * @throws NoExceptionAlthoughExpectedException
      */
     public function assertCartRuleDeleted(string $cartRuleReference): void
     {
         try {
-            $this->getQueryBus()->handle(new GetCartRuleForEditing($this->getSharedStorage()->get($cartRuleReference)));
+            $this->getCartRuleForEditing($cartRuleReference);
             throw new NoExceptionAlthoughExpectedException(sprintf('Cart rule "%s" was found, but it was expected to be deleted', $cartRuleReference));
         } catch (CartRuleNotFoundException $e) {
             $this->getSharedStorage()->clear($cartRuleReference);
@@ -157,8 +143,21 @@ public function assertCartRuleError(string $error): void
     public function assertCartRule(string $cartRuleReference, TableNode $tableNode): void
     {
         $this->assertCartRuleProperties(
-            $this->getCartRuleForEditing($this->getSharedStorage()->get($cartRuleReference)),
+            $this->getCartRuleForEditing($cartRuleReference),
             $this->localizeByColumns($tableNode)
         );
     }
+
+    /**
+     * @Then cart rule :cartRuleReference should have no product restriction rules
+     *
+     * @return void
+     */
+    public function assertNoProductRestrictionRules(string $cartRuleReference): void
+    {
+        Assert::assertEmpty(
+            $this->getCartRuleForEditing($cartRuleReference)->getConditions()->getRestrictions()->productRestrictionRuleGroups,
+            'Cart rule was expecting to have empty product restriction rule groups'
+        );
+    }
 }
diff --git a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
new file mode 100644
index 0000000000000..fc3e622fe13f8
--- /dev/null
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
@@ -0,0 +1,96 @@
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart_rule --tags set-product-restrictions
+@restore-all-tables-before-feature
+@set-product-restrictions
+Feature: Set cart rule product restrictions in BO
+  PrestaShop allows BO users to add and remove product restrictions of cart rule,
+  Product restrictions are a rulesets that defines what & how many products must be in a cart for cart rule to take effect.
+  As a BO user I must be able to edit cart rules products restrictions
+
+  Background:
+    Given shop "shop1" with name "test_shop" exists
+    And there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
+    And there is a currency named "chf" with iso code "CHF" and exchange rate of 1.25
+    And currency "usd" is the default one
+    And language with iso code "en" is the default one
+    And I create cart rule "rule_free_shipping_1" with following properties:
+      | name[en-US]       | free shipping 1      |
+      | is_active         | true                 |
+      | allow_partial_use | false                |
+      | priority          | 1                    |
+      | valid_from        | 2022-01-01 11:00:00  |
+      | valid_to          | 3001-01-01 12:00:00  |
+      | total_quantity    | 10                   |
+      | quantity_per_user | 10                   |
+      | free_shipping     | true                 |
+      | code              | rule_free_shipping_1 |
+    And I create cart rule "rule_50_percent" with following properties:
+      | name[en-US]                            | Half the price         |
+      | is_active                              | true                   |
+      | allow_partial_use                      | true                   |
+      | priority                               | 2                      |
+      | valid_from                             | 2022-01-01 11:00:00    |
+      | valid_to                               | 3001-01-01 12:00:00    |
+      | total_quantity                         | 10                     |
+      | quantity_per_user                      | 12                     |
+      | free_shipping                          | false                  |
+      | code                                   | rule_50_percent        |
+      | reduction_percentage                   | 50                     |
+      | reduction_apply_to_discounted_products | false                  |
+      | discount_application_type              | order_without_shipping |
+    And I create cart rule "rule_70_percent" with following properties:
+      | name[en-US]                            | Half the price         |
+      | is_active                              | true                   |
+      | allow_partial_use                      | true                   |
+      | priority                               | 3                      |
+      | valid_from                             | 2022-01-01 11:00:00    |
+      | valid_to                               | 3001-01-01 12:00:00    |
+      | total_quantity                         | 10                     |
+      | quantity_per_user                      | 12                     |
+      | free_shipping                          | false                  |
+      | code                                   | rule_70_percent        |
+      | reduction_percentage                   | 70                     |
+      | reduction_apply_to_discounted_products | false                  |
+      | discount_application_type              | order_without_shipping |
+    And cart rule "rule_free_shipping_1" should have no product restriction rules
+
+  Scenario: Restrict cart rule products
+    Given cart rule "rule_free_shipping_1" should have no product restriction rules
+
+#    When I set the following product restriction rules for cart rule rule_free_shipping_1:
+#      | quantity | rule type | references |
+#      | 1        | products  |
+#    When I restrict following cart rules for cart rule rule_free_shipping_1:
+#      | rule_50_percent |
+#    Then cart rule "rule_free_shipping_1" should have the following properties:
+#      | restricted cart rules | rule_50_percent |
+#    And cart rule "rule_50_percent" should have the following properties:
+#      | restricted cart rules | rule_free_shipping_1 |
+#    And cart rule "rule_70_percent" should have the following properties:
+#      | restricted cart rules |  |
+#    When I restrict following cart rules for cart rule rule_free_shipping_1:
+#      | rule_50_percent |
+#      | rule_70_percent |
+#    Then cart rule "rule_free_shipping_1" should have the following properties:
+#      | restricted cart rules | rule_50_percent,rule_70_percent |
+#    And cart rule "rule_50_percent" should have the following properties:
+#      | restricted cart rules | rule_free_shipping_1 |
+#    And cart rule "rule_70_percent" should have the following properties:
+#      | restricted cart rules | rule_free_shipping_1 |
+
+#  @restore-cart-rules-before-scenario
+#  Scenario: Provide non-existing ids for cart rule restriction
+#    When I restrict cart rules for rule_free_shipping_1 providing non-existing cart rules
+#    Then I should get cart rule error about "non-existing cart rule"
+#    And cart rule "rule_free_shipping_1" should have the following properties:
+#      | restricted cart rules |  |
+#
+#  @restore-cart-rules-before-scenario
+#  Scenario: Restrict cart rule combinations providing the same cart rule that is being edited in the restricted cart rules list
+#    Given cart rule "rule_70_percent" should have the following properties:
+#      | restricted cart rules |  |
+#    When I restrict following cart rules for cart rule rule_70_percent:
+#      | rule_50_percent |
+#      | rule_70_percent |
+#    Then I should get cart rule error about "invalid cart rule restriction"
+#    And cart rule "rule_70_percent" should have the following properties:
+#      | restricted cart rules |  |

From f9cb503efbc4d2ae9e510b73a004b9a95e3404f0 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Fri, 16 Jun 2023 16:16:36 +0300
Subject: [PATCH 0309/1030]  add stateful behat steps for saving restrictions
 and fix sql statements

---
 .../Repository/CartRuleRepository.php         | 66 ++++++++-----------
 .../Restriction/RestrictionRuleGroup.php      |  8 +++
 .../CartRule/EditCartRuleFeatureContext.php   | 55 ++++++++++++++++
 .../CartRule/set_product_restrictions.feature | 21 ++++--
 tests/Integration/Behaviour/behat.yml         |  1 +
 5 files changed, 106 insertions(+), 45 deletions(-)

diff --git a/src/Adapter/CartRule/Repository/CartRuleRepository.php b/src/Adapter/CartRule/Repository/CartRuleRepository.php
index a7c6e9b53b36a..b8bcd95e46632 100644
--- a/src/Adapter/CartRule/Repository/CartRuleRepository.php
+++ b/src/Adapter/CartRule/Repository/CartRuleRepository.php
@@ -122,7 +122,7 @@ public function setProductRestrictions(CartRuleId $cartRuleId, array $restrictio
             $productRuleGroupId = $this->connection->lastInsertId();
 
             foreach ($restrictionRuleGroup->getRestrictionRules() as $restrictionRule) {
-                if ($restrictionRule->getIds()) {
+                if (empty($restrictionRule->getIds())) {
                     throw new CartRuleConstraintException(
                         'Restriction rule products are empty',
                         CartRuleConstraintException::INVALID_PRODUCT_RESTRICTION
@@ -131,9 +131,11 @@ public function setProductRestrictions(CartRuleId $cartRuleId, array $restrictio
                 $this->connection->createQueryBuilder()
                     ->insert($this->dbPrefix . 'cart_rule_product_rule')
                     ->values([
-                        'id_product_rule_group' => $productRuleGroupId,
-                        'type' => $restrictionRule->getType(),
+                        'id_product_rule_group' => ':productRuleGroupId',
+                        'type' => ':type',
                     ])
+                    ->setParameter('productRuleGroupId', $productRuleGroupId)
+                    ->setParameter('type', $restrictionRule->getType())
                     ->execute()
                 ;
 
@@ -149,13 +151,10 @@ public function setProductRestrictions(CartRuleId $cartRuleId, array $restrictio
                     $checkedIds[] = $id;
                 }
 
-                $productRuleStmt = sprintf(
-                    'INSERT INTO (id_product_rule, id_item) %scart_rule_product_rule_value VALUES %s',
-                    $this->dbPrefix,
-                    implode(',', $productRuleValues)
-                );
-
-                $this->connection->executeStatement($productRuleStmt);
+                $this->connection->prepare('
+                    INSERT INTO ' . $this->dbPrefix . 'cart_rule_product_rule_value (id_product_rule, id_item)
+                    VALUES ' . implode(',', $productRuleValues)
+                )->executeStatement();
             }
         }
     }
@@ -354,38 +353,25 @@ private function removeRestrictedCartRules(CartRuleId $cartRuleId): void
     private function removeProductRestrictions(CartRuleId $cartRuleId): void
     {
         //delete records from cart_rule_product_rule_value for this cart rule
-        $this->connection->createQueryBuilder()
-            ->delete($this->dbPrefix . 'cart_rule_product_rule_value', 'crprv')
-            ->innerJoin(
-                'crprv',
-                $this->dbPrefix . 'cart_rule_product_rule',
-                'crpr',
-                'crprv.id_product_rule = crpr.id_product_rule'
-            )
-            ->innerJoin(
-                'crpr',
-                $this->dbPrefix . 'cart_rule_product_rule_group',
-                'crprg',
-                'crpr.id_product_rule_group = crprg.id_product_rule_group'
-            )
-            ->where('crprg.id_cart_rule = :cartRuleId')
-            ->setParameter('cartRuleId', $cartRuleId->getValue())
-            ->execute()
-        ;
+        $this->connection->prepare('
+            DELETE crprv
+            FROM ' . $this->dbPrefix . 'cart_rule_product_rule_value AS crprv
+            INNER JOIN ' . $this->dbPrefix . 'cart_rule_product_rule AS crpr ON crprv.id_product_rule = crpr.id_product_rule
+            INNER JOIN ' . $this->dbPrefix . 'cart_rule_product_rule_group AS crprg ON crpr.id_product_rule_group = crprg.id_product_rule_group
+            WHERE crprg.id_cart_rule = :cartRuleId
+        ')->executeStatement([
+            ':cartRuleId' => $cartRuleId->getValue(),
+        ]);
 
         // delete records from cart_rule_product_rule for this cart rule
-        $this->connection->createQueryBuilder()
-            ->delete($this->dbPrefix . 'cart_rule_product_rule', 'crpr')
-            ->innerJoin(
-                'crpr',
-                $this->dbPrefix . 'cart_rule_product_rule_group',
-                'crprg',
-                'crpr.id_product_rule_group = crprg.id_product_rule_group'
-            )
-            ->where('crprg.id_cart_rule = :cartRuleId')
-            ->setParameter('cartRuleId', $cartRuleId->getValue())
-            ->execute()
-        ;
+        $this->connection->prepare('
+            DELETE crpr
+            FROM  ' . $this->dbPrefix . 'cart_rule_product_rule AS crpr
+            INNER JOIN  ' . $this->dbPrefix . 'cart_rule_product_rule_group AS crprg ON crpr.id_product_rule_group = crprg.id_product_rule_group
+            WHERE crprg.id_cart_rule = :cartRuleId
+        ')->executeStatement([
+            ':cartRuleId' => $cartRuleId->getValue(),
+        ]);
 
         // and finally delete records from cart_rule_product_rule_group for this cart rule
         $this->connection->createQueryBuilder()
diff --git a/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRuleGroup.php b/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRuleGroup.php
index 87c57148c9fa7..28adff68e980a 100644
--- a/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRuleGroup.php
+++ b/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRuleGroup.php
@@ -45,6 +45,7 @@ public function __construct(
         array $restrictionRules
     ) {
         $this->requiredQuantityInCart = $requiredQuantityInCart;
+        //@todo: can restricitons be empty?
         $this->restrictionRules = $restrictionRules;
     }
 
@@ -63,4 +64,11 @@ public function getRestrictionRules(): array
     {
         return $this->restrictionRules;
     }
+
+    public function addRestrictionRule(RestrictionRule $restrictionRule): RestrictionRuleGroup
+    {
+        $this->restrictionRules[] = $restrictionRule;
+
+        return $this;
+    }
 }
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
index 26424e5be53dc..59b1f3595fbc7 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
@@ -35,6 +35,9 @@
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\ToggleCartRuleStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleConstraintException;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleNotFoundException;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\SetCartRuleProductRestrictionsCommand;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\Restriction\RestrictionRule;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\Restriction\RestrictionRuleGroup;
 use Tests\Integration\Behaviour\Features\Context\Util\PrimitiveUtils;
 
 class EditCartRuleFeatureContext extends AbstractCartRuleFeatureContext
@@ -44,6 +47,11 @@ class EditCartRuleFeatureContext extends AbstractCartRuleFeatureContext
      */
     private const NON_EXISTING_CART_RULE_ID = 54440051;
 
+    public static function buildProductRestrictionStorageKey(string $cartRuleReference): string
+    {
+        return 'cart_rule_product_restriction_groups_' . $cartRuleReference;
+    }
+
     /**
      * @When /^I (enable|disable) cart rule with reference "(.+)"$/
      *
@@ -116,6 +124,34 @@ public function restrictCartRules(string $cartRuleReference, TableNode $tableNod
         }
     }
 
+    /**
+     *
+     * @When I add a restriction for cart rule :cartRuleReference, which requires at least :quantity products in cart matching one of these rules:
+     *
+     * @param string $cartRuleReference
+     * @param int $quantity
+     * @param TableNode $table
+     *
+     * @return void
+     */
+    public function addRestrictionRule(string $cartRuleReference, int $quantity, TableNode $table): void
+    {
+        $restrictionsKey = $this::buildProductRestrictionStorageKey($cartRuleReference);
+
+        $rules = [];
+        foreach ($table->getColumnsHash() as $row) {
+            $rules[] = new RestrictionRule($row['type'], $this->referencesToIds($row['references']));
+        }
+
+        $restrictionGroups = [];
+        if ($this->getSharedStorage()->exists($restrictionsKey)) {
+            $restrictionGroups = $this->getSharedStorage()->get($restrictionsKey);
+        }
+
+        $restrictionGroups[] = new RestrictionRuleGroup($quantity, $rules);
+        $this->getSharedStorage()->set($restrictionsKey, $restrictionGroups);
+    }
+
     /**
      * @When I restrict cart rules for :cartRuleReference providing non-existing cart rules
      *
@@ -135,6 +171,25 @@ public function restrictCartRulesProvidingNonExistingIds(string $cartRuleReferen
         }
     }
 
+    /**
+     * @When I save product restrictions for cart rule :cartRuleReference
+     *
+     * @param string $cartRuleReference
+     *
+     * @return void
+     */
+    public function setProductRestrictionRules(string $cartRuleReference): void
+    {
+        $restrictionsKey = $this::buildProductRestrictionStorageKey($cartRuleReference);
+
+        $this->getCommandBus()->handle(new SetCartRuleProductRestrictionsCommand(
+            $this->getSharedStorage()->get($cartRuleReference),
+            $this->getSharedStorage()->get($restrictionsKey)
+        ));
+
+        $this->getSharedStorage()->clear($restrictionsKey);
+    }
+
     private function performCartRulesRestriction(int $cartRuleId, array $restrictedCartRuleIds): void
     {
         $this->getCommandBus()->handle(
diff --git a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
index fc3e622fe13f8..827b62548bcb2 100644
--- a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
@@ -11,7 +11,10 @@ Feature: Set cart rule product restrictions in BO
     And there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
     And there is a currency named "chf" with iso code "CHF" and exchange rate of 1.25
     And currency "usd" is the default one
+    And language "language1" with locale "en-US" exists
     And language with iso code "en" is the default one
+    And category "home" in default language named "Home" exists
+    And category "home" is the default one
     And I create cart rule "rule_free_shipping_1" with following properties:
       | name[en-US]       | free shipping 1      |
       | is_active         | true                 |
@@ -52,13 +55,21 @@ Feature: Set cart rule product restrictions in BO
       | reduction_apply_to_discounted_products | false                  |
       | discount_application_type              | order_without_shipping |
     And cart rule "rule_free_shipping_1" should have no product restriction rules
+    And I add product "product1" with following information:
+      | name[en-US] | bottle of beer |
+      | type        | virtual        |
+    And I add product "product2" with following information:
+      | name[en-US] | T-shirt nr.1 |
+      | type        | standard     |
+    And I add product "product3" with following information:
+      | name[en-US] | Shirt - Dom & Jquery |
+      | type        | standard             |
 
   Scenario: Restrict cart rule products
-    Given cart rule "rule_free_shipping_1" should have no product restriction rules
-
-#    When I set the following product restriction rules for cart rule rule_free_shipping_1:
-#      | quantity | rule type | references |
-#      | 1        | products  |
+    When I add a restriction for cart rule rule_free_shipping_1, which requires at least 5 products in cart matching one of these rules:
+      | type     | references        |
+      | products | product1,product2 |
+    And I save product restrictions for cart rule rule_free_shipping_1
 #    When I restrict following cart rules for cart rule rule_free_shipping_1:
 #      | rule_50_percent |
 #    Then cart rule "rule_free_shipping_1" should have the following properties:
diff --git a/tests/Integration/Behaviour/behat.yml b/tests/Integration/Behaviour/behat.yml
index 64d2ae80a1819..dbab1b0e986f9 100644
--- a/tests/Integration/Behaviour/behat.yml
+++ b/tests/Integration/Behaviour/behat.yml
@@ -256,6 +256,7 @@ default:
                 - Tests\Integration\Behaviour\Features\Context\CommonFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\CurrencyFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\CustomerFeatureContext
+                - Tests\Integration\Behaviour\Features\Context\Domain\CategoryFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\AddCartRuleFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\CartRuleAssertionFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\DeleteCartRuleFeatureContext

From 5f5f3b0394778b221147dfd07c0a8dda61830436 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Fri, 16 Jun 2023 16:36:33 +0300
Subject: [PATCH 0310/1030]  fix sql query to to retrieve restrictions and add
 temporary step which expected to fail

---
 .../Repository/CartRuleRepository.php         | 37 ++++++++++---------
 .../CartRule/EditCartRuleFeatureContext.php   |  4 --
 .../CartRule/set_product_restrictions.feature |  2 +
 3 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/src/Adapter/CartRule/Repository/CartRuleRepository.php b/src/Adapter/CartRule/Repository/CartRuleRepository.php
index b8bcd95e46632..67cbab251f3f6 100644
--- a/src/Adapter/CartRule/Repository/CartRuleRepository.php
+++ b/src/Adapter/CartRule/Repository/CartRuleRepository.php
@@ -168,36 +168,37 @@ public function getProductRestrictions(CartRuleId $cartRuleId): array
     {
         // retrieve all item ids based on cart rule
         $ruleValues = $this->connection->createQueryBuilder()
-            ->select('value.id_product_rule, value.id_item')
-            ->from($this->dbPrefix . 'cart_rule_product_rule_value', 'value')
+            ->select('crprv.id_product_rule, crprv.id_item')
+            ->from($this->dbPrefix . 'cart_rule_product_rule_value', 'crprv')
             ->innerJoin(
-                'value',
+                'crprv',
                 $this->dbPrefix . 'cart_rule_product_rule',
-                'rule',
-                'value.id_product_rule = rule.id_product_rule'
+                'crpr',
+                'crprv.id_product_rule = crpr.id_product_rule'
             )
             ->innerJoin(
-                'rule',
+                'crpr',
                 $this->dbPrefix . 'cart_rule_product_rule_group',
-                'group',
-                'rule.id_product_rule_group = group.id_product_rule_group'
+                'crprg',
+                'crpr.id_product_rule_group = crprg.id_product_rule_group'
             )
-            ->where('group.id_cart_rule = :cartRuleId')
+            ->where('crprg.id_cart_rule = :cartRuleId')
             ->setParameter('cartRuleId', $cartRuleId->getValue())
             ->execute()
+            ->fetchAllAssociative()
         ;
 
         // retrieve all rules based on cart rule
         $rules = $this->connection->createQueryBuilder()
-            ->select('rule.id_product_rule, rule.id_product_rule_group, rule.type')
-            ->from($this->dbPrefix . 'cart_rule_product_rule', 'rule')
+            ->select('crpr.id_product_rule, crpr.id_product_rule_group, crpr.type')
+            ->from($this->dbPrefix . 'cart_rule_product_rule', 'crpr')
             ->innerJoin(
-                'rule',
+                'crpr',
                 $this->dbPrefix . 'cart_rule_product_rule_group',
-                'group',
-                'rule.id_product_rule_group = group.id_product_rule_group'
+                'crprg',
+                'crpr.id_product_rule_group = crprg.id_product_rule_group'
             )
-            ->where('group.id_cart_rule = :cartRuleId')
+            ->where('crprg.id_cart_rule = :cartRuleId')
             ->setParameter('cartRuleId', $cartRuleId->getValue())
             ->execute()
             ->fetchAllAssociative()
@@ -205,8 +206,8 @@ public function getProductRestrictions(CartRuleId $cartRuleId): array
 
         // retrieve all rule groups based on cart rule
         $groups = $this->connection->createQueryBuilder()
-            ->select('*')
-            ->from($this->dbPrefix . 'cart_rule_product_rule_group', 'group')
+            ->select('id_product_rule_group, id_cart_rule, quantity')
+            ->from($this->dbPrefix . 'cart_rule_product_rule_group')
             ->where('id_cart_rule = :cartRuleId')
             ->setParameter('cartRuleId', $cartRuleId->getValue())
             ->execute()
@@ -224,7 +225,7 @@ public function getProductRestrictions(CartRuleId $cartRuleId): array
         $typesForRules = [];
         foreach ($rules as $rule) {
             $productRuleId = (int) $rule['id_product_rule'];
-            $typesForRules[$rule['id_product_rule_group']][$productRuleId][] = $rule['type'];
+            $typesForRules[$rule['id_product_rule_group']][$productRuleId] = $rule['type'];
         }
 
         // put ids under related product rules
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
index 59b1f3595fbc7..e120d8665c248 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
@@ -47,10 +47,6 @@ class EditCartRuleFeatureContext extends AbstractCartRuleFeatureContext
      */
     private const NON_EXISTING_CART_RULE_ID = 54440051;
 
-    public static function buildProductRestrictionStorageKey(string $cartRuleReference): string
-    {
-        return 'cart_rule_product_restriction_groups_' . $cartRuleReference;
-    }
 
     /**
      * @When /^I (enable|disable) cart rule with reference "(.+)"$/
diff --git a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
index 827b62548bcb2..c030f34514f74 100644
--- a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
@@ -70,6 +70,8 @@ Feature: Set cart rule product restrictions in BO
       | type     | references        |
       | products | product1,product2 |
     And I save product restrictions for cart rule rule_free_shipping_1
+    #@todo: this step should fail now, later to be changed with step to check actual restrictions
+    Then cart rule "rule_free_shipping_1" should have no product restriction rules
 #    When I restrict following cart rules for cart rule rule_free_shipping_1:
 #      | rule_50_percent |
 #    Then cart rule "rule_free_shipping_1" should have the following properties:

From 976f6b668ee747121e5142ce447a9d8f0a156f65 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Fri, 16 Jun 2023 17:10:34 +0300
Subject: [PATCH 0311/1030]  introduce steps to assert groups and rules within
 groups

---
 .../CartRuleAssertionFeatureContext.php       | 61 +++++++++++++++++++
 .../CartRule/set_product_restrictions.feature | 43 ++-----------
 2 files changed, 67 insertions(+), 37 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
index 2376bdb298986..bc82e7db70e03 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
@@ -32,6 +32,7 @@
 use PHPUnit\Framework\Assert;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleConstraintException;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleNotFoundException;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\Restriction\RestrictionRuleGroup;
 use RuntimeException;
 use Tests\Integration\Behaviour\Features\Context\Util\NoExceptionAlthoughExpectedException;
 use Tests\Resources\DatabaseDump;
@@ -160,4 +161,64 @@ public function assertNoProductRestrictionRules(string $cartRuleReference): void
             'Cart rule was expecting to have empty product restriction rule groups'
         );
     }
+
+    /**
+     * @Then cart rule :cartRuleReference should have the following product restriction rule groups:
+     *
+     * @return void
+     */
+    public function assertProductRestrictionGroups(string $cartRuleReference, TableNode $tableNode): void
+    {
+        $actualRestrictionGroups = $this->getCartRuleForEditing($cartRuleReference)
+            ->getConditions()
+            ->getRestrictions()
+            ->productRestrictionRuleGroups
+        ;
+        $expectedDataRows = $tableNode->getColumnsHash();
+        Assert::assertCount(count($expectedDataRows), $actualRestrictionGroups, 'Unexpected product restriction groups count');
+
+        foreach ($expectedDataRows as $key => $expectedDataRow) {
+            $actualGroup = $actualRestrictionGroups[$key];
+            Assert::assertEquals(
+                $expectedDataRow['quantity'],
+                $actualGroup->getRequiredQuantityInCart(),
+                'Unexpected required quantity in cart in restriction group'
+            );
+            Assert::assertCount((int) $expectedDataRow['rules count'], $actualGroup->getRestrictionRules(), 'Unexpected rules count in restriction group');
+
+            // set group so into shared storage so that following steps can assert its values more in depth
+            $this->getSharedStorage()->set($expectedDataRow['groupReference'], $actualGroup);
+        }
+    }
+
+    /**
+     * @Then the cart rule restriction group :restrictionGroupReference should have the following rules:
+     *
+     * @param string $restrictionGroupReference
+     * @param TableNode $tableNode
+     *
+     * @return void
+     */
+    public function assertProductRestrictionRules(string $restrictionGroupReference, TableNode $tableNode): void
+    {
+        if (!$this->getSharedStorage()->exists($restrictionGroupReference)) {
+            throw new RuntimeException(sprintf(
+                'Restriction group %s was not set in shared storage. You have to first call method assertProductRestrictionGroups"',
+                $restrictionGroupReference
+            ));
+        }
+
+        $group = $this->getSharedStorage()->get($restrictionGroupReference);
+        Assert::assertInstanceOf(RestrictionRuleGroup::class, $group);
+
+        $actualRules = $group->getRestrictionRules();
+        $expectedDataRows = $tableNode->getColumnsHash();
+
+        Assert::assertCount(count($expectedDataRows), $actualRules, 'Unexpected product restriction rules count in group');
+
+        foreach ($expectedDataRows as $key => $expectedRow) {
+            Assert::assertSame($expectedRow['type'], $actualRules[$key]->getType());
+            Assert::assertSame($this->referencesToIds($expectedRow['references']), $actualRules[$key]->getIds());
+        }
+    }
 }
diff --git a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
index c030f34514f74..ba36f123cdd25 100644
--- a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
@@ -70,40 +70,9 @@ Feature: Set cart rule product restrictions in BO
       | type     | references        |
       | products | product1,product2 |
     And I save product restrictions for cart rule rule_free_shipping_1
-    #@todo: this step should fail now, later to be changed with step to check actual restrictions
-    Then cart rule "rule_free_shipping_1" should have no product restriction rules
-#    When I restrict following cart rules for cart rule rule_free_shipping_1:
-#      | rule_50_percent |
-#    Then cart rule "rule_free_shipping_1" should have the following properties:
-#      | restricted cart rules | rule_50_percent |
-#    And cart rule "rule_50_percent" should have the following properties:
-#      | restricted cart rules | rule_free_shipping_1 |
-#    And cart rule "rule_70_percent" should have the following properties:
-#      | restricted cart rules |  |
-#    When I restrict following cart rules for cart rule rule_free_shipping_1:
-#      | rule_50_percent |
-#      | rule_70_percent |
-#    Then cart rule "rule_free_shipping_1" should have the following properties:
-#      | restricted cart rules | rule_50_percent,rule_70_percent |
-#    And cart rule "rule_50_percent" should have the following properties:
-#      | restricted cart rules | rule_free_shipping_1 |
-#    And cart rule "rule_70_percent" should have the following properties:
-#      | restricted cart rules | rule_free_shipping_1 |
-
-#  @restore-cart-rules-before-scenario
-#  Scenario: Provide non-existing ids for cart rule restriction
-#    When I restrict cart rules for rule_free_shipping_1 providing non-existing cart rules
-#    Then I should get cart rule error about "non-existing cart rule"
-#    And cart rule "rule_free_shipping_1" should have the following properties:
-#      | restricted cart rules |  |
-#
-#  @restore-cart-rules-before-scenario
-#  Scenario: Restrict cart rule combinations providing the same cart rule that is being edited in the restricted cart rules list
-#    Given cart rule "rule_70_percent" should have the following properties:
-#      | restricted cart rules |  |
-#    When I restrict following cart rules for cart rule rule_70_percent:
-#      | rule_50_percent |
-#      | rule_70_percent |
-#    Then I should get cart rule error about "invalid cart rule restriction"
-#    And cart rule "rule_70_percent" should have the following properties:
-#      | restricted cart rules |  |
+    Then cart rule "rule_free_shipping_1" should have the following product restriction rule groups:
+      | groupReference | quantity | rules count |
+      | group_nr_1     | 5        | 1           |
+    And the cart rule restriction group "group_nr_1" should have the following rules:
+      | type     | references        |
+      | products | product1,product2 |

From 6ffdbd3d18686cf11b0833facf307fab2fbd4932 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Mon, 19 Jun 2023 12:40:25 +0300
Subject: [PATCH 0312/1030]  improve product restrictions test case and add
 product attribute restrictions case

---
 .../CartRuleAssertionFeatureContext.php       |  2 +-
 .../CartRule/EditCartRuleFeatureContext.php   | 34 +++++++-
 .../CartRule/set_product_restrictions.feature | 79 +++++++++++++------
 3 files changed, 88 insertions(+), 27 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
index bc82e7db70e03..5a872ff5f228f 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
@@ -186,7 +186,7 @@ public function assertProductRestrictionGroups(string $cartRuleReference, TableN
             );
             Assert::assertCount((int) $expectedDataRow['rules count'], $actualGroup->getRestrictionRules(), 'Unexpected rules count in restriction group');
 
-            // set group so into shared storage so that following steps can assert its values more in depth
+            // set group into shared storage so that following steps can assert its values more in depth
             $this->getSharedStorage()->set($expectedDataRow['groupReference'], $actualGroup);
         }
     }
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
index e120d8665c248..2bc94b6c88cd1 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
@@ -47,6 +47,17 @@ class EditCartRuleFeatureContext extends AbstractCartRuleFeatureContext
      */
     private const NON_EXISTING_CART_RULE_ID = 54440051;
 
+    /**
+     * Provides string to set and retrieve certain cart rule product restrictions state from shared storage
+     *
+     * @param string $cartRuleReference
+     *
+     * @return string
+     */
+    public static function buildProductRestrictionStorageKey(string $cartRuleReference): string
+    {
+        return 'cart_rule_product_restriction_groups_' . $cartRuleReference;
+    }
 
     /**
      * @When /^I (enable|disable) cart rule with reference "(.+)"$/
@@ -122,7 +133,7 @@ public function restrictCartRules(string $cartRuleReference, TableNode $tableNod
 
     /**
      *
-     * @When I add a restriction for cart rule :cartRuleReference, which requires at least :quantity products in cart matching one of these rules:
+     * @When I add a restriction for cart rule :cartRuleReference, which requires at least :quantity product(s) in cart matching one of these rules:
      *
      * @param string $cartRuleReference
      * @param int $quantity
@@ -167,6 +178,25 @@ public function restrictCartRulesProvidingNonExistingIds(string $cartRuleReferen
         }
     }
 
+    /**
+     * @When I clear all product restrictions for cart rule :cartRuleReference
+     *
+     * @param string $cartRuleReference
+     *
+     * @return void
+     */
+    public function clearProductRestrictionRules(string $cartRuleReference): void
+    {
+        $restrictionsKey = $this::buildProductRestrictionStorageKey($cartRuleReference);
+
+        $this->getCommandBus()->handle(new SetCartRuleProductRestrictionsCommand(
+            $this->getSharedStorage()->get($cartRuleReference),
+            []
+        ));
+
+        $this->getSharedStorage()->clear($restrictionsKey);
+    }
+
     /**
      * @When I save product restrictions for cart rule :cartRuleReference
      *
@@ -174,7 +204,7 @@ public function restrictCartRulesProvidingNonExistingIds(string $cartRuleReferen
      *
      * @return void
      */
-    public function setProductRestrictionRules(string $cartRuleReference): void
+    public function saveProductRestrictionRules(string $cartRuleReference): void
     {
         $restrictionsKey = $this::buildProductRestrictionStorageKey($cartRuleReference);
 
diff --git a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
index ba36f123cdd25..fac968adefb2f 100644
--- a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
@@ -15,6 +15,23 @@ Feature: Set cart rule product restrictions in BO
     And language with iso code "en" is the default one
     And category "home" in default language named "Home" exists
     And category "home" is the default one
+    And attribute "S" named "S" in en language exists
+    And attribute "M" named "M" in en language exists
+    And attribute "L" named "L" in en language exists
+    And I add product "product1" with following information:
+      | name[en-US] | bottle of beer |
+      | type        | virtual        |
+    And I add product "product2" with following information:
+      | name[en-US] | T-shirt nr1 |
+      | type        | standard    |
+    And I add product "product3" with following information:
+      | name[en-US] | Shirt - Dom & Jquery |
+      | type        | standard             |
+
+  # @todo: create cart rules once in first scenario, so they are not recreated before every scenario.
+  #  This step is temporary and should be replaced by step "Given there is a cart rule..." in backhround
+  #  when following PR is merged: https://github.com/PrestaShop/PrestaShop/pull/32483
+  Scenario: Create cart rules for further steps
     And I create cart rule "rule_free_shipping_1" with following properties:
       | name[en-US]       | free shipping 1      |
       | is_active         | true                 |
@@ -40,39 +57,53 @@ Feature: Set cart rule product restrictions in BO
       | reduction_percentage                   | 50                     |
       | reduction_apply_to_discounted_products | false                  |
       | discount_application_type              | order_without_shipping |
-    And I create cart rule "rule_70_percent" with following properties:
-      | name[en-US]                            | Half the price         |
-      | is_active                              | true                   |
-      | allow_partial_use                      | true                   |
-      | priority                               | 3                      |
-      | valid_from                             | 2022-01-01 11:00:00    |
-      | valid_to                               | 3001-01-01 12:00:00    |
-      | total_quantity                         | 10                     |
-      | quantity_per_user                      | 12                     |
-      | free_shipping                          | false                  |
-      | code                                   | rule_70_percent        |
-      | reduction_percentage                   | 70                     |
-      | reduction_apply_to_discounted_products | false                  |
-      | discount_application_type              | order_without_shipping |
     And cart rule "rule_free_shipping_1" should have no product restriction rules
-    And I add product "product1" with following information:
-      | name[en-US] | bottle of beer |
-      | type        | virtual        |
-    And I add product "product2" with following information:
-      | name[en-US] | T-shirt nr.1 |
-      | type        | standard     |
-    And I add product "product3" with following information:
-      | name[en-US] | Shirt - Dom & Jquery |
-      | type        | standard             |
+    And cart rule "rule_50_percent" should have no product restriction rules
 
-  Scenario: Restrict cart rule products
+  Scenario: Restrict cart rule products and then clear all the restrictions
     When I add a restriction for cart rule rule_free_shipping_1, which requires at least 5 products in cart matching one of these rules:
       | type     | references        |
       | products | product1,product2 |
+    And I add a restriction for cart rule rule_free_shipping_1, which requires at least 1 product in cart matching one of these rules:
+      | type     | references |
+      | products | product1   |
+      | products | product2   |
+      | products | product3   |
     And I save product restrictions for cart rule rule_free_shipping_1
     Then cart rule "rule_free_shipping_1" should have the following product restriction rule groups:
       | groupReference | quantity | rules count |
       | group_nr_1     | 5        | 1           |
+      | group_nr_2     | 1        | 3           |
     And the cart rule restriction group "group_nr_1" should have the following rules:
       | type     | references        |
       | products | product1,product2 |
+    And the cart rule restriction group "group_nr_2" should have the following rules:
+      | type     | references |
+      | products | product1   |
+      | products | product2   |
+      | products | product3   |
+    And cart rule "rule_50_percent" should have no product restriction rules
+    When I clear all product restrictions for cart rule rule_free_shipping_1
+    Then cart rule "rule_free_shipping_1" should have no product restriction rules
+
+  Scenario: Restrict cart rule attributes
+    When I add a restriction for cart rule rule_50_percent, which requires at least 7 products in cart matching one of these rules:
+      | type       | references |
+      | attributes | S,M        |
+    And I add a restriction for cart rule rule_50_percent, which requires at least 2 product in cart matching one of these rules:
+      | type       | references |
+      | attributes | S,M        |
+      | attributes | L          |
+    And I save product restrictions for cart rule rule_50_percent
+    Then cart rule "rule_50_percent" should have the following product restriction rule groups:
+      | groupReference | quantity | rules count |
+      | group_nr_1     | 7        | 1           |
+      | group_nr_2     | 2        | 2           |
+    And the cart rule restriction group "group_nr_1" should have the following rules:
+      | type       | references |
+      | attributes | S,M        |
+    And the cart rule restriction group "group_nr_2" should have the following rules:
+      | type       | references |
+      | attributes | S,M        |
+      | attributes | L          |
+    And cart rule "rule_free_shipping_1" should have no product restriction rules

From 847afde0f65ded0ce82ed7937808a0bf966d2e45 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Mon, 19 Jun 2023 13:07:06 +0300
Subject: [PATCH 0313/1030]  add scenario for category restricitons

---
 .../CartRule/set_product_restrictions.feature | 35 ++++++++++++++++---
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
index fac968adefb2f..03b70241c7843 100644
--- a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
@@ -13,11 +13,17 @@ Feature: Set cart rule product restrictions in BO
     And currency "usd" is the default one
     And language "language1" with locale "en-US" exists
     And language with iso code "en" is the default one
-    And category "home" in default language named "Home" exists
-    And category "home" is the default one
     And attribute "S" named "S" in en language exists
     And attribute "M" named "M" in en language exists
     And attribute "L" named "L" in en language exists
+    And category "home" in default language named "Home" exists
+    And category "home" is the default one
+    And category "clothes" in default language named "Clothes" exists
+    And category "clothes" parent is category "home"
+    And category "men" in default language named "Men" exists
+    And category "men" parent is category "clothes"
+    And category "women" in default language named "Women" exists
+    And category "women" parent is category "clothes"
     And I add product "product1" with following information:
       | name[en-US] | bottle of beer |
       | type        | virtual        |
@@ -60,7 +66,7 @@ Feature: Set cart rule product restrictions in BO
     And cart rule "rule_free_shipping_1" should have no product restriction rules
     And cart rule "rule_50_percent" should have no product restriction rules
 
-  Scenario: Restrict cart rule products and then clear all the restrictions
+  Scenario: Restrict cart rule products and clear all the restrictions
     When I add a restriction for cart rule rule_free_shipping_1, which requires at least 5 products in cart matching one of these rules:
       | type     | references        |
       | products | product1,product2 |
@@ -86,7 +92,7 @@ Feature: Set cart rule product restrictions in BO
     When I clear all product restrictions for cart rule rule_free_shipping_1
     Then cart rule "rule_free_shipping_1" should have no product restriction rules
 
-  Scenario: Restrict cart rule attributes
+  Scenario: Restrict cart rule products by defining attribute matching rules
     When I add a restriction for cart rule rule_50_percent, which requires at least 7 products in cart matching one of these rules:
       | type       | references |
       | attributes | S,M        |
@@ -107,3 +113,24 @@ Feature: Set cart rule product restrictions in BO
       | attributes | S,M        |
       | attributes | L          |
     And cart rule "rule_free_shipping_1" should have no product restriction rules
+
+  Scenario: Restrict cart rule products by defining category matching rules
+    When I add a restriction for cart rule rule_50_percent, which requires at least 3 products in cart matching one of these rules:
+      | type       | references |
+      | categories | home       |
+    And I add a restriction for cart rule rule_50_percent, which requires at least 2 product in cart matching one of these rules:
+      | type       | references  |
+      | attributes | clothes,men |
+      | attributes | women       |
+    And I save product restrictions for cart rule rule_50_percent
+    Then cart rule "rule_50_percent" should have the following product restriction rule groups:
+      | groupReference | quantity | rules count |
+      | group_nr_1     | 3        | 1           |
+      | group_nr_2     | 2        | 2           |
+    And the cart rule restriction group "group_nr_1" should have the following rules:
+      | type       | references |
+      | categories | home       |
+    And the cart rule restriction group "group_nr_2" should have the following rules:
+      | type       | references  |
+      | attributes | clothes,men |
+      | attributes | women       |

From 577f74014e9e5a4ab5415f2027b5dc378618cd81 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Mon, 19 Jun 2023 14:56:05 +0300
Subject: [PATCH 0314/1030]  add scenario step for manufacturer matching
 restrictions

---
 .../Restriction/RestrictionRule.php           |  4 +--
 .../CartRule/set_product_restrictions.feature | 35 +++++++++++++++++++
 tests/Integration/Behaviour/behat.yml         |  1 +
 3 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRule.php b/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRule.php
index f80dc76f531db..eefebbe708f8d 100644
--- a/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRule.php
+++ b/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRule.php
@@ -35,13 +35,13 @@ class RestrictionRule
     public const TYPE_PRODUCT = 'products';
     public const TYPE_CATEGORY = 'categories';
     public const TYPE_ATTRIBUTE = 'attributes';
-    public const TYPE_BRAND = 'brands';
+    public const TYPE_MANUFACTURERS = 'manufacturers';
     public const TYPE_SUPPLIER = 'suppliers';
     public const VALID_TYPES = [
         self::TYPE_PRODUCT => self::TYPE_PRODUCT,
         self::TYPE_CATEGORY => self::TYPE_CATEGORY,
         self::TYPE_ATTRIBUTE => self::TYPE_ATTRIBUTE,
-        self::TYPE_BRAND => self::TYPE_BRAND,
+        self::TYPE_MANUFACTURERS => self::TYPE_MANUFACTURERS,
         self::TYPE_SUPPLIER => self::TYPE_SUPPLIER,
     ];
 
diff --git a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
index 03b70241c7843..7f66adda3e09d 100644
--- a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
@@ -24,6 +24,8 @@ Feature: Set cart rule product restrictions in BO
     And category "men" parent is category "clothes"
     And category "women" in default language named "Women" exists
     And category "women" parent is category "clothes"
+    And manufacturer studioDesign named "Studio Design" exists
+    And manufacturer graphicCorner named "Graphic Corner" exists
     And I add product "product1" with following information:
       | name[en-US] | bottle of beer |
       | type        | virtual        |
@@ -93,6 +95,7 @@ Feature: Set cart rule product restrictions in BO
     Then cart rule "rule_free_shipping_1" should have no product restriction rules
 
   Scenario: Restrict cart rule products by defining attribute matching rules
+    Given I clear all product restrictions for cart rule rule_50_percent
     When I add a restriction for cart rule rule_50_percent, which requires at least 7 products in cart matching one of these rules:
       | type       | references |
       | attributes | S,M        |
@@ -115,6 +118,7 @@ Feature: Set cart rule product restrictions in BO
     And cart rule "rule_free_shipping_1" should have no product restriction rules
 
   Scenario: Restrict cart rule products by defining category matching rules
+    Given I clear all product restrictions for cart rule rule_50_percent
     When I add a restriction for cart rule rule_50_percent, which requires at least 3 products in cart matching one of these rules:
       | type       | references |
       | categories | home       |
@@ -134,3 +138,34 @@ Feature: Set cart rule product restrictions in BO
       | type       | references  |
       | attributes | clothes,men |
       | attributes | women       |
+
+  Scenario: Restrict cart rule products by defining manufacturer matching rules
+    Given I clear all product restrictions for cart rule rule_50_percent
+    And I clear all product restrictions for cart rule rule_free_shipping_1
+    When I add a restriction for cart rule rule_50_percent, which requires at least 2 products in cart matching one of these rules:
+      | type          | references   |
+      | manufacturers | studioDesign |
+    And I add a restriction for cart rule rule_50_percent, which requires at least 1 product in cart matching one of these rules:
+      | type          | references    |
+      | manufacturers | graphicCorner |
+    And I save product restrictions for cart rule rule_50_percent
+    And I add a restriction for cart rule rule_free_shipping_1, which requires at least 4 products in cart matching one of these rules:
+      | type          | references                 |
+      | manufacturers | studioDesign,graphicCorner |
+    And I save product restrictions for cart rule rule_free_shipping_1
+    Then cart rule "rule_50_percent" should have the following product restriction rule groups:
+      | groupReference | quantity | rules count |
+      | 50_nr_1        | 2        | 1           |
+      | 50_nr_2        | 1        | 1           |
+    And the cart rule restriction group "50_nr_1" should have the following rules:
+      | type          | references   |
+      | manufacturers | studioDesign |
+    And the cart rule restriction group "50_nr_2" should have the following rules:
+      | type          | references    |
+      | manufacturers | graphicCorner |
+    And cart rule "rule_free_shipping_1" should have the following product restriction rule groups:
+      | groupReference | quantity | rules count |
+      | free_nr_1      | 4        | 1           |
+    And the cart rule restriction group "free_nr_1" should have the following rules:
+      | type          | references                 |
+      | manufacturers | studioDesign,graphicCorner |
diff --git a/tests/Integration/Behaviour/behat.yml b/tests/Integration/Behaviour/behat.yml
index dbab1b0e986f9..cef993d78601e 100644
--- a/tests/Integration/Behaviour/behat.yml
+++ b/tests/Integration/Behaviour/behat.yml
@@ -261,6 +261,7 @@ default:
                 - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\CartRuleAssertionFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\DeleteCartRuleFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\EditCartRuleFeatureContext
+                - Tests\Integration\Behaviour\Features\Context\Domain\ManufacturerFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\Product\AddProductFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\Product\Combination\CombinationListingFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\Product\Combination\GenerateCombinationFeatureContext

From a16ebce7f182c724e6504b2f15b8b08802d787ed Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Mon, 19 Jun 2023 15:07:18 +0300
Subject: [PATCH 0315/1030]  scenario for suppliers matching rules

---
 .../Context/Domain/SupplierFeatureContext.php | 18 ++++++++++
 .../CartRule/set_product_restrictions.feature | 33 +++++++++++++++++++
 tests/Integration/Behaviour/behat.yml         |  1 +
 3 files changed, 52 insertions(+)

diff --git a/tests/Integration/Behaviour/Features/Context/Domain/SupplierFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/SupplierFeatureContext.php
index 05b253362c0a3..9cbcaf110aabf 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/SupplierFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/SupplierFeatureContext.php
@@ -43,6 +43,7 @@
 use PrestaShop\PrestaShop\Core\Domain\Supplier\ValueObject\SupplierId;
 use RuntimeException;
 use State;
+use Supplier;
 use Tests\Integration\Behaviour\Features\Context\Util\PrimitiveUtils;
 
 class SupplierFeatureContext extends AbstractDomainFeatureContext
@@ -123,6 +124,23 @@ public function createSupplier(string $supplierReference, TableNode $table)
         }
     }
 
+    /**
+     * @Given supplier :manufacturerReference named :name exists
+     *
+     * @param string $name
+     * @param string $supplierReference
+     */
+    public function assertSupplierExistsByName(string $name, string $supplierReference): void
+    {
+        if ($supplierId = Supplier::getIdByName($name)) {
+            $this->getSharedStorage()->set($supplierReference, $supplierId);
+
+            return;
+        }
+
+        throw new RuntimeException(sprintf('Supplier %s named "%s" does not exist', $supplierReference, $name));
+    }
+
     /**
      * @When I edit supplier :supplierReference with the following properties:
      *
diff --git a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
index 7f66adda3e09d..e0b8d37bfa1d0 100644
--- a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
@@ -26,6 +26,8 @@ Feature: Set cart rule product restrictions in BO
     And category "women" parent is category "clothes"
     And manufacturer studioDesign named "Studio Design" exists
     And manufacturer graphicCorner named "Graphic Corner" exists
+    And supplier fashionSupplier named "Fashion supplier" exists
+    And supplier accessoriesSupplier named "Accessories supplier" exists
     And I add product "product1" with following information:
       | name[en-US] | bottle of beer |
       | type        | virtual        |
@@ -169,3 +171,34 @@ Feature: Set cart rule product restrictions in BO
     And the cart rule restriction group "free_nr_1" should have the following rules:
       | type          | references                 |
       | manufacturers | studioDesign,graphicCorner |
+
+  Scenario: Restrict cart rule products by defining manufacturer matching rules
+    Given I clear all product restrictions for cart rule rule_50_percent
+    And I clear all product restrictions for cart rule rule_free_shipping_1
+    When I add a restriction for cart rule rule_50_percent, which requires at least 2 products in cart matching one of these rules:
+      | type      | references      |
+      | suppliers | fashionSupplier |
+    And I add a restriction for cart rule rule_50_percent, which requires at least 1 product in cart matching one of these rules:
+      | type      | references          |
+      | suppliers | accessoriesSupplier |
+    And I save product restrictions for cart rule rule_50_percent
+    And I add a restriction for cart rule rule_free_shipping_1, which requires at least 4 products in cart matching one of these rules:
+      | type      | references                          |
+      | suppliers | fashionSupplier,accessoriesSupplier |
+    And I save product restrictions for cart rule rule_free_shipping_1
+    Then cart rule "rule_50_percent" should have the following product restriction rule groups:
+      | groupReference | quantity | rules count |
+      | 50_nr_1        | 2        | 1           |
+      | 50_nr_2        | 1        | 1           |
+    And the cart rule restriction group "50_nr_1" should have the following rules:
+      | type      | references      |
+      | suppliers | fashionSupplier |
+    And the cart rule restriction group "50_nr_2" should have the following rules:
+      | type      | references          |
+      | suppliers | accessoriesSupplier |
+    And cart rule "rule_free_shipping_1" should have the following product restriction rule groups:
+      | groupReference | quantity | rules count |
+      | free_nr_1      | 4        | 1           |
+    And the cart rule restriction group "free_nr_1" should have the following rules:
+      | type      | references                          |
+      | suppliers | fashionSupplier,accessoriesSupplier |
diff --git a/tests/Integration/Behaviour/behat.yml b/tests/Integration/Behaviour/behat.yml
index cef993d78601e..a88e080d72988 100644
--- a/tests/Integration/Behaviour/behat.yml
+++ b/tests/Integration/Behaviour/behat.yml
@@ -265,6 +265,7 @@ default:
                 - Tests\Integration\Behaviour\Features\Context\Domain\Product\AddProductFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\Product\Combination\CombinationListingFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\Product\Combination\GenerateCombinationFeatureContext
+                - Tests\Integration\Behaviour\Features\Context\Domain\SupplierFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\LanguageFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\ShopFeatureContext
                 - Tests\Integration\Behaviour\Features\Transform\CurrencyTransformContext

From b8cd101d82e46c23fa43d5a059ab0f98ccb8cb25 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Mon, 19 Jun 2023 15:08:48 +0300
Subject: [PATCH 0316/1030]  fix minor copy-paste mistakes from unrelated PR

---
 .../Features/Context/Domain/SupplierFeatureContext.php        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Context/Domain/SupplierFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/SupplierFeatureContext.php
index 9cbcaf110aabf..85d4a8e8bce94 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/SupplierFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/SupplierFeatureContext.php
@@ -218,7 +218,7 @@ public function editSupplier(string $supplierReference, TableNode $table)
      *
      * @param string $supplierReference
      */
-    public function assertManufacturerHasLogoImage(string $supplierReference): void
+    public function assertSupplierHasLogoImage(string $supplierReference): void
     {
         $editableSupplier = $this->getEditableSupplier($supplierReference);
         Assert::assertNotNull($editableSupplier->getLogoImage());
@@ -229,7 +229,7 @@ public function assertManufacturerHasLogoImage(string $supplierReference): void
      *
      * @param string $supplierReference
      */
-    public function assertManufacturerHasNotLogoImage(string $supplierReference)
+    public function assertSupplierHasNoLogoImage(string $supplierReference): void
     {
         $editableSupplier = $this->getEditableSupplier($supplierReference);
         Assert::assertNull($editableSupplier->getLogoImage());

From 0cc13a1c7112533c5ff4aacc1010e90f610a5b71 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Mon, 19 Jun 2023 15:20:11 +0300
Subject: [PATCH 0317/1030]  add scenario for using mixed matching rules

---
 .../Restriction/RestrictionRule.php           |  2 +-
 .../CartRule/set_product_restrictions.feature | 39 +++++++++++++++++--
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRule.php b/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRule.php
index eefebbe708f8d..d0bea8ecaeea9 100644
--- a/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRule.php
+++ b/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRule.php
@@ -59,7 +59,7 @@ class RestrictionRule
 
     /**
      * @param string $type
-     * @param int[]
+     * @param int[] $ids
      */
     public function __construct(
         string $type,
diff --git a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
index e0b8d37bfa1d0..7ffb603981114 100644
--- a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
@@ -126,8 +126,8 @@ Feature: Set cart rule product restrictions in BO
       | categories | home       |
     And I add a restriction for cart rule rule_50_percent, which requires at least 2 product in cart matching one of these rules:
       | type       | references  |
-      | attributes | clothes,men |
-      | attributes | women       |
+      | categories | clothes,men |
+      | categories | women       |
     And I save product restrictions for cart rule rule_50_percent
     Then cart rule "rule_50_percent" should have the following product restriction rule groups:
       | groupReference | quantity | rules count |
@@ -138,8 +138,8 @@ Feature: Set cart rule product restrictions in BO
       | categories | home       |
     And the cart rule restriction group "group_nr_2" should have the following rules:
       | type       | references  |
-      | attributes | clothes,men |
-      | attributes | women       |
+      | categories | clothes,men |
+      | categories | women       |
 
   Scenario: Restrict cart rule products by defining manufacturer matching rules
     Given I clear all product restrictions for cart rule rule_50_percent
@@ -202,3 +202,34 @@ Feature: Set cart rule product restrictions in BO
     And the cart rule restriction group "free_nr_1" should have the following rules:
       | type      | references                          |
       | suppliers | fashionSupplier,accessoriesSupplier |
+
+  Scenario: Restrict cart rule products by defining mixed rules
+    Given I clear all product restrictions for cart rule rule_50_percent
+    And I clear all product restrictions for cart rule rule_free_shipping_1
+    When I add a restriction for cart rule rule_free_shipping_1, which requires at least 1 product in cart matching one of these rules:
+      | type       | references        |
+      | products   | product1,product2 |
+      | products   | product3          |
+      | attributes | S,M               |
+      | categories | clothes,men       |
+      | categories | women             |
+    And I add a restriction for cart rule rule_free_shipping_1, which requires at least 2 products in cart matching one of these rules:
+      | type          | references                          |
+      | suppliers     | fashionSupplier,accessoriesSupplier |
+      | manufacturers | graphicCorner                       |
+    And I save product restrictions for cart rule rule_free_shipping_1
+    Then cart rule "rule_free_shipping_1" should have the following product restriction rule groups:
+      | groupReference | quantity | rules count |
+      | free_nr_1      | 1        | 5           |
+      | free_nr_2      | 2        | 2           |
+    And the cart rule restriction group "free_nr_1" should have the following rules:
+      | type       | references        |
+      | products   | product1,product2 |
+      | products   | product3          |
+      | attributes | S,M               |
+      | categories | clothes,men       |
+      | categories | women             |
+    And the cart rule restriction group "free_nr_2" should have the following rules:
+      | type          | references                          |
+      | suppliers     | fashionSupplier,accessoriesSupplier |
+      | manufacturers | graphicCorner                       |

From 175f491a8ad4dbde613b26dc1dc092d9d4e63a60 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Mon, 19 Jun 2023 15:56:37 +0300
Subject: [PATCH 0318/1030]  add assertion for restriction ids

---
 .../Exception/CartRuleConstraintException.php |  3 ++-
 .../Restriction/RestrictionRule.php           | 22 ++++++++++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/Core/Domain/CartRule/Exception/CartRuleConstraintException.php b/src/Core/Domain/CartRule/Exception/CartRuleConstraintException.php
index 6794a8e6036c3..306157f43bbcb 100644
--- a/src/Core/Domain/CartRule/Exception/CartRuleConstraintException.php
+++ b/src/Core/Domain/CartRule/Exception/CartRuleConstraintException.php
@@ -73,5 +73,6 @@ class CartRuleConstraintException extends CartRuleException
     public const INVALID_ACTIVE = 37;
     public const NON_UNIQUE_CODE = 38;
     public const INVALID_PRICE_DISCOUNT = 39;
-    public const INVALID_RESTRICTION_RULE = 40;
+    public const INVALID_RESTRICTION_RULE_TYPE = 40;
+    public const INVALID_RESTRICTION_RULE_ID = 41;
 }
diff --git a/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRule.php b/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRule.php
index d0bea8ecaeea9..969e8064f48e2 100644
--- a/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRule.php
+++ b/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRule.php
@@ -66,6 +66,7 @@ public function __construct(
         array $ids
     ) {
         $this->assertType($type);
+        $this->assertIds($ids);
         $this->type = $type;
         $this->ids = $ids;
     }
@@ -83,6 +84,25 @@ public function getIds(): array
         return $this->ids;
     }
 
+    /**
+     * @param int[] $ids
+     *
+     * @return void
+     *
+     * @throws CartRuleConstraintException
+     */
+    private function assertIds(array $ids): void
+    {
+        foreach ($ids as $id) {
+            if (!is_int($id) || $id <= 0) {
+                throw new CartRuleConstraintException(
+                    'Restricted item id must be positive integer',
+                    CartRuleConstraintException::INVALID_RESTRICTION_RULE_ID
+                );
+            }
+        }
+    }
+
     private function assertType(string $type): void
     {
         if (in_array($type, self::VALID_TYPES, true)) {
@@ -91,7 +111,7 @@ private function assertType(string $type): void
 
         throw new CartRuleConstraintException(
           sprintf('Invalid type provided to %s', self::class),
-            CartRuleConstraintException::INVALID_RESTRICTION_RULE
+            CartRuleConstraintException::INVALID_RESTRICTION_RULE_TYPE
         );
     }
 }

From 1859a3695e8dd08e379c21defe245cc1042ba96c Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Mon, 19 Jun 2023 16:23:35 +0300
Subject: [PATCH 0319/1030]  scenario with empty restriction rule ids list

---
 .../Exception/CartRuleConstraintException.php |  2 ++
 .../Restriction/RestrictionRule.php           |  8 ++++++-
 .../CartRuleAssertionFeatureContext.php       |  4 ++++
 .../CartRule/EditCartRuleFeatureContext.php   | 24 +++++++++++--------
 .../CartRule/set_product_restrictions.feature |  9 +++++++
 5 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/src/Core/Domain/CartRule/Exception/CartRuleConstraintException.php b/src/Core/Domain/CartRule/Exception/CartRuleConstraintException.php
index 306157f43bbcb..d7bd1555f43a2 100644
--- a/src/Core/Domain/CartRule/Exception/CartRuleConstraintException.php
+++ b/src/Core/Domain/CartRule/Exception/CartRuleConstraintException.php
@@ -75,4 +75,6 @@ class CartRuleConstraintException extends CartRuleException
     public const INVALID_PRICE_DISCOUNT = 39;
     public const INVALID_RESTRICTION_RULE_TYPE = 40;
     public const INVALID_RESTRICTION_RULE_ID = 41;
+
+    public const EMPTY_RESTRICTION_RULE_IDS = 42;
 }
diff --git a/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRule.php b/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRule.php
index 969e8064f48e2..918a2e4c98b46 100644
--- a/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRule.php
+++ b/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRule.php
@@ -93,10 +93,16 @@ public function getIds(): array
      */
     private function assertIds(array $ids): void
     {
+        if (empty($ids)) {
+            throw new CartRuleConstraintException(
+                sprintf('%s item ids cannot be empty', self::class),
+                CartRuleConstraintException::EMPTY_RESTRICTION_RULE_IDS
+            );
+        }
         foreach ($ids as $id) {
             if (!is_int($id) || $id <= 0) {
                 throw new CartRuleConstraintException(
-                    'Restricted item id must be positive integer',
+                    sprintf('%s item id must be positive integer', self::class),
                     CartRuleConstraintException::INVALID_RESTRICTION_RULE_ID
                 );
             }
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
index 5a872ff5f228f..c6fb0efa02359 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
@@ -119,6 +119,10 @@ public function assertCartRuleError(string $error): void
                 'class' => CartRuleConstraintException::class,
                 'code' => CartRuleConstraintException::INVALID_CART_RULE_RESTRICTION,
             ],
+            'empty restriction rule ids' => [
+                'class' => CartRuleConstraintException::class,
+                'code' => CartRuleConstraintException::EMPTY_RESTRICTION_RULE_IDS,
+            ],
             'non-existing cart rule' => [
                 'class' => CartRuleNotFoundException::class,
                 'code' => 0,
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
index 2bc94b6c88cd1..79cdeed23747d 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
@@ -144,19 +144,23 @@ public function restrictCartRules(string $cartRuleReference, TableNode $tableNod
     public function addRestrictionRule(string $cartRuleReference, int $quantity, TableNode $table): void
     {
         $restrictionsKey = $this::buildProductRestrictionStorageKey($cartRuleReference);
-
         $rules = [];
-        foreach ($table->getColumnsHash() as $row) {
-            $rules[] = new RestrictionRule($row['type'], $this->referencesToIds($row['references']));
-        }
 
-        $restrictionGroups = [];
-        if ($this->getSharedStorage()->exists($restrictionsKey)) {
-            $restrictionGroups = $this->getSharedStorage()->get($restrictionsKey);
-        }
+        try {
+            foreach ($table->getColumnsHash() as $row) {
+                $rules[] = new RestrictionRule($row['type'], $this->referencesToIds($row['references']));
+            }
 
-        $restrictionGroups[] = new RestrictionRuleGroup($quantity, $rules);
-        $this->getSharedStorage()->set($restrictionsKey, $restrictionGroups);
+            $restrictionGroups = [];
+            if ($this->getSharedStorage()->exists($restrictionsKey)) {
+                $restrictionGroups = $this->getSharedStorage()->get($restrictionsKey);
+            }
+
+            $restrictionGroups[] = new RestrictionRuleGroup($quantity, $rules);
+            $this->getSharedStorage()->set($restrictionsKey, $restrictionGroups);
+        } catch (CartRuleConstraintException $e) {
+            $this->setLastException($e);
+        }
     }
 
     /**
diff --git a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
index 7ffb603981114..eb45b3b758f27 100644
--- a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
@@ -233,3 +233,12 @@ Feature: Set cart rule product restrictions in BO
       | type          | references                          |
       | suppliers     | fashionSupplier,accessoriesSupplier |
       | manufacturers | graphicCorner                       |
+
+  Scenario: Provide restrictions with empty list of rules
+    Given I clear all product restrictions for cart rule rule_50_percent
+    And I clear all product restrictions for cart rule rule_free_shipping_1
+    When I add a restriction for cart rule rule_free_shipping_1, which requires at least 1 product in cart matching one of these rules:
+      | type     | references |
+      | products |            |
+    Then I should get cart rule error about "empty restriction rule ids"
+    And cart rule rule_free_shipping_1 should have no product restriction rules

From 240468431dd5e5d88e936aff6e1b944fa5c1552f Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Mon, 19 Jun 2023 16:52:42 +0300
Subject: [PATCH 0320/1030]  add scenarios for empty ids,  empty rules and
 providing 0 quantity

---
 .../Repository/CartRuleRepository.php         | 14 -------
 .../Exception/CartRuleConstraintException.php |  2 +-
 .../Restriction/RestrictionRuleGroup.php      | 36 ++++++++++++++++--
 .../CartRuleAssertionFeatureContext.php       |  4 ++
 .../CartRule/EditCartRuleFeatureContext.php   | 12 ++++--
 .../CartRule/set_product_restrictions.feature | 38 ++++++++++++++++++-
 6 files changed, 81 insertions(+), 25 deletions(-)

diff --git a/src/Adapter/CartRule/Repository/CartRuleRepository.php b/src/Adapter/CartRule/Repository/CartRuleRepository.php
index 67cbab251f3f6..a881935df87d8 100644
--- a/src/Adapter/CartRule/Repository/CartRuleRepository.php
+++ b/src/Adapter/CartRule/Repository/CartRuleRepository.php
@@ -32,7 +32,6 @@
 use PrestaShop\PrestaShop\Adapter\CartRule\Validate\CartRuleValidator;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CannotAddCartRuleException;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CannotEditCartRuleException;
-use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleConstraintException;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleException;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\CartRuleId;
@@ -103,13 +102,6 @@ public function setProductRestrictions(CartRuleId $cartRuleId, array $restrictio
         $this->removeProductRestrictions($cartRuleId);
 
         foreach ($restrictionRuleGroups as $restrictionRuleGroup) {
-            if (empty($restrictionRuleGroup->getRestrictionRules())) {
-                throw new CartRuleConstraintException(
-                    'Restriction rules are empty',
-                    CartRuleConstraintException::INVALID_PRODUCT_RESTRICTION
-                );
-            }
-
             $this->connection->createQueryBuilder()
                 ->insert($this->dbPrefix . 'cart_rule_product_rule_group')
                 ->values([
@@ -122,12 +114,6 @@ public function setProductRestrictions(CartRuleId $cartRuleId, array $restrictio
             $productRuleGroupId = $this->connection->lastInsertId();
 
             foreach ($restrictionRuleGroup->getRestrictionRules() as $restrictionRule) {
-                if (empty($restrictionRule->getIds())) {
-                    throw new CartRuleConstraintException(
-                        'Restriction rule products are empty',
-                        CartRuleConstraintException::INVALID_PRODUCT_RESTRICTION
-                    );
-                }
                 $this->connection->createQueryBuilder()
                     ->insert($this->dbPrefix . 'cart_rule_product_rule')
                     ->values([
diff --git a/src/Core/Domain/CartRule/Exception/CartRuleConstraintException.php b/src/Core/Domain/CartRule/Exception/CartRuleConstraintException.php
index d7bd1555f43a2..275f76fcb065c 100644
--- a/src/Core/Domain/CartRule/Exception/CartRuleConstraintException.php
+++ b/src/Core/Domain/CartRule/Exception/CartRuleConstraintException.php
@@ -75,6 +75,6 @@ class CartRuleConstraintException extends CartRuleException
     public const INVALID_PRICE_DISCOUNT = 39;
     public const INVALID_RESTRICTION_RULE_TYPE = 40;
     public const INVALID_RESTRICTION_RULE_ID = 41;
-
     public const EMPTY_RESTRICTION_RULE_IDS = 42;
+    public const EMPTY_RESTRICTION_RULES = 43;
 }
diff --git a/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRuleGroup.php b/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRuleGroup.php
index 28adff68e980a..939afc993c5d2 100644
--- a/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRuleGroup.php
+++ b/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRuleGroup.php
@@ -28,6 +28,9 @@
 
 namespace PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\Restriction;
 
+use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleConstraintException;
+use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
+
 class RestrictionRuleGroup
 {
     /**
@@ -44,8 +47,8 @@ public function __construct(
         int $requiredQuantityInCart,
         array $restrictionRules
     ) {
+        $this->assertRestrictionRules($restrictionRules);
         $this->requiredQuantityInCart = $requiredQuantityInCart;
-        //@todo: can restricitons be empty?
         $this->restrictionRules = $restrictionRules;
     }
 
@@ -65,10 +68,35 @@ public function getRestrictionRules(): array
         return $this->restrictionRules;
     }
 
-    public function addRestrictionRule(RestrictionRule $restrictionRule): RestrictionRuleGroup
+    /**
+     * @param RestrictionRule[] $rules
+     *
+     * @return void
+     *
+     * @throws CartRuleConstraintException
+     * @throws InvalidArgumentException
+     */
+    private function assertRestrictionRules(array $rules): void
     {
-        $this->restrictionRules[] = $restrictionRule;
+        if (empty($rules)) {
+            throw new CartRuleConstraintException(
+                'Restriction rules list cannot be empty',
+                CartRuleConstraintException::EMPTY_RESTRICTION_RULES
+            );
+        }
+
+        foreach ($rules as $rule) {
+            if ($rule instanceof RestrictionRule) {
+                continue;
+            }
 
-        return $this;
+            throw new InvalidArgumentException(
+                sprintf(
+                    'Invalid array element. Expected array of %s, but got %s',
+                    RestrictionRule::class,
+                    var_export($rule, true)
+                )
+            );
+        }
     }
 }
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
index c6fb0efa02359..8a2118e20e77f 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
@@ -123,6 +123,10 @@ public function assertCartRuleError(string $error): void
                 'class' => CartRuleConstraintException::class,
                 'code' => CartRuleConstraintException::EMPTY_RESTRICTION_RULE_IDS,
             ],
+            'empty restriction rules' => [
+                'class' => CartRuleConstraintException::class,
+                'code' => CartRuleConstraintException::EMPTY_RESTRICTION_RULES,
+            ],
             'non-existing cart rule' => [
                 'class' => CartRuleNotFoundException::class,
                 'code' => 0,
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
index 79cdeed23747d..c825f6340b435 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
@@ -134,21 +134,25 @@ public function restrictCartRules(string $cartRuleReference, TableNode $tableNod
     /**
      *
      * @When I add a restriction for cart rule :cartRuleReference, which requires at least :quantity product(s) in cart matching one of these rules:
+     * @When I add a restriction for cart rule :cartRuleReference, which requires any quantity of product(s) in cart matching one of these rules:
+     * @When I add a restriction for cart rule :cartRuleReference, which requires at least :quantity product(s), but I provide empty list of rules
      *
      * @param string $cartRuleReference
      * @param int $quantity
-     * @param TableNode $table
+     * @param TableNode|null $table
      *
      * @return void
      */
-    public function addRestrictionRule(string $cartRuleReference, int $quantity, TableNode $table): void
+    public function addRestrictionRule(string $cartRuleReference, int $quantity = 0, ?TableNode $table = null): void
     {
         $restrictionsKey = $this::buildProductRestrictionStorageKey($cartRuleReference);
         $rules = [];
 
         try {
-            foreach ($table->getColumnsHash() as $row) {
-                $rules[] = new RestrictionRule($row['type'], $this->referencesToIds($row['references']));
+            if ($table) {
+                foreach ($table->getColumnsHash() as $row) {
+                    $rules[] = new RestrictionRule($row['type'], $this->referencesToIds($row['references']));
+                }
             }
 
             $restrictionGroups = [];
diff --git a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
index eb45b3b758f27..44c5a10dee354 100644
--- a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
@@ -235,10 +235,44 @@ Feature: Set cart rule product restrictions in BO
       | manufacturers | graphicCorner                       |
 
   Scenario: Provide restrictions with empty list of rules
-    Given I clear all product restrictions for cart rule rule_50_percent
-    And I clear all product restrictions for cart rule rule_free_shipping_1
+    Given I clear all product restrictions for cart rule rule_free_shipping_1
     When I add a restriction for cart rule rule_free_shipping_1, which requires at least 1 product in cart matching one of these rules:
       | type     | references |
       | products |            |
     Then I should get cart rule error about "empty restriction rule ids"
     And cart rule rule_free_shipping_1 should have no product restriction rules
+
+  Scenario: Rule to require any quantity of product matching certain rules
+    Given I clear all product restrictions for cart rule rule_free_shipping_1
+    When I add a restriction for cart rule rule_free_shipping_1, which requires any quantity of product in cart matching one of these rules:
+      | type       | references  |
+      | products   | product1    |
+      | categories | clothes,men |
+    And I add a restriction for cart rule rule_free_shipping_1, which requires any quantity of product in cart matching one of these rules:
+      | type      | references                          |
+      | suppliers | fashionSupplier,accessoriesSupplier |
+    And I add a restriction for cart rule rule_free_shipping_1, which requires at least 100 product in cart matching one of these rules:
+      | type          | references    |
+      | manufacturers | graphicCorner |
+    And I save product restrictions for cart rule rule_free_shipping_1
+    Then cart rule "rule_free_shipping_1" should have the following product restriction rule groups:
+      | groupReference | quantity | rules count |
+      | free_nr_1      | 0        | 2           |
+      | free_nr_2      | 0        | 1           |
+      | free_nr_3      | 100      | 1           |
+    And the cart rule restriction group "free_nr_1" should have the following rules:
+      | type       | references  |
+      | products   | product1    |
+      | categories | clothes,men |
+    And the cart rule restriction group "free_nr_2" should have the following rules:
+      | type      | references                          |
+      | suppliers | fashionSupplier,accessoriesSupplier |
+    And the cart rule restriction group "free_nr_3" should have the following rules:
+      | type          | references    |
+      | manufacturers | graphicCorner |
+
+  Scenario: Provide restriction group with empty list of restrictions
+    Given I clear all product restrictions for cart rule rule_50_percent
+    When I add a restriction for cart rule rule_50_percent, which requires at least 1 product, but I provide empty list of rules
+    Then I should get cart rule error about "empty restriction rules"
+    And cart rule rule_50_percent should have no product restriction rules

From 46cda5ccf1390b70d7f6464231d96beb6f0eab0d Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Tue, 20 Jun 2023 17:30:22 +0300
Subject: [PATCH 0321/1030]  adapt to php8.2

---
 .../SetCartRuleProductRestrictionsHandler.php | 15 +++------
 .../GetCartRuleForEditingHandler.php          |  8 ++++-
 .../Repository/CartRuleRepository.php         |  8 ++---
 .../SetCartRuleProductRestrictionsCommand.php | 26 +++------------
 .../Restriction/RestrictionRule.php           | 33 ++-----------------
 .../Restriction/RestrictionRuleGroup.php      | 32 +++---------------
 .../CartRuleAssertionFeatureContext.php       | 13 +++++---
 7 files changed, 35 insertions(+), 100 deletions(-)

diff --git a/src/Adapter/CartRule/CommandHandler/SetCartRuleProductRestrictionsHandler.php b/src/Adapter/CartRule/CommandHandler/SetCartRuleProductRestrictionsHandler.php
index d2c17ee6aab00..adf692fb15df4 100644
--- a/src/Adapter/CartRule/CommandHandler/SetCartRuleProductRestrictionsHandler.php
+++ b/src/Adapter/CartRule/CommandHandler/SetCartRuleProductRestrictionsHandler.php
@@ -34,25 +34,20 @@
 
 class SetCartRuleProductRestrictionsHandler implements SetCartRuleProductRestrictionsHandlerInterface
 {
-    /**
-     * @var CartRuleRepository
-     */
-    private $cartRuleRepository;
-
     public function __construct(
-        CartRuleRepository $cartRuleRepository
+        protected CartRuleRepository $cartRuleRepository
     ) {
-        $this->cartRuleRepository = $cartRuleRepository;
     }
 
     public function handle(SetCartRuleProductRestrictionsCommand $command): void
     {
-        $cartRuleId = $command->getCartRuleId();
+        $cartRuleId = $command->cartRuleId;
         $cartRule = $this->cartRuleRepository->get($cartRuleId);
+        $restrictionRuleGroups = $command->restrictionRuleGroups;
 
-        $this->cartRuleRepository->setProductRestrictions($cartRuleId, $command->getRestrictionRuleGroups());
+        $this->cartRuleRepository->setProductRestrictions($cartRuleId, $restrictionRuleGroups);
 
-        $cartRule->product_restriction = !empty($command->getRestrictionRuleGroups());
+        $cartRule->product_restriction = !empty($restrictionRuleGroups);
         $this->cartRuleRepository->partialUpdate($cartRule, ['product_restriction']);
     }
 }
diff --git a/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php b/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php
index 42070ede4a9a4..344720b8b9443 100644
--- a/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php
+++ b/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php
@@ -44,6 +44,7 @@
 use PrestaShop\PrestaShop\Core\Domain\CartRule\QueryResult\CartRuleRestrictionsForEditing;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\CartRuleId;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\DiscountApplicationType;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\Restriction\RestrictionRuleGroup;
 use PrestaShop\PrestaShop\Core\Domain\Customer\ValueObject\CustomerId;
 use PrestaShop\PrestaShop\Core\Domain\Customer\ValueObject\NoCustomerId;
 use PrestaShop\PrestaShop\Core\Util\DateTime\DateTime as DateTimeUtils;
@@ -54,7 +55,7 @@
 class GetCartRuleForEditingHandler implements GetCartRuleForEditingHandlerInterface
 {
     public function __construct(
-        protected CartRuleRepository $cartRuleRepository
+        protected readonly CartRuleRepository $cartRuleRepository
     ) {
     }
 
@@ -137,6 +138,11 @@ private function getCartRuleConditions(CartRule $cartRule): CartRuleConditionsFo
         );
     }
 
+    /**
+     * @param CartRule $cartRule
+     *
+     * @return RestrictionRuleGroup[]
+     */
     private function getRestrictionRuleGroups(CartRule $cartRule): array
     {
         if (!$cartRule->product_restriction) {
diff --git a/src/Adapter/CartRule/Repository/CartRuleRepository.php b/src/Adapter/CartRule/Repository/CartRuleRepository.php
index a881935df87d8..6a092d9aab0f1 100644
--- a/src/Adapter/CartRule/Repository/CartRuleRepository.php
+++ b/src/Adapter/CartRule/Repository/CartRuleRepository.php
@@ -106,14 +106,14 @@ public function setProductRestrictions(CartRuleId $cartRuleId, array $restrictio
                 ->insert($this->dbPrefix . 'cart_rule_product_rule_group')
                 ->values([
                     'id_cart_rule' => $cartRuleId->getValue(),
-                    'quantity' => $restrictionRuleGroup->getRequiredQuantityInCart(),
+                    'quantity' => $restrictionRuleGroup->requiredQuantityInCart,
                 ])
                 ->execute()
             ;
 
             $productRuleGroupId = $this->connection->lastInsertId();
 
-            foreach ($restrictionRuleGroup->getRestrictionRules() as $restrictionRule) {
+            foreach ($restrictionRuleGroup->restrictionRules as $restrictionRule) {
                 $this->connection->createQueryBuilder()
                     ->insert($this->dbPrefix . 'cart_rule_product_rule')
                     ->values([
@@ -121,14 +121,14 @@ public function setProductRestrictions(CartRuleId $cartRuleId, array $restrictio
                         'type' => ':type',
                     ])
                     ->setParameter('productRuleGroupId', $productRuleGroupId)
-                    ->setParameter('type', $restrictionRule->getType())
+                    ->setParameter('type', $restrictionRule->type)
                     ->execute()
                 ;
 
                 $productRuleId = $this->connection->lastInsertId();
                 $productRuleValues = [];
                 $checkedIds = [];
-                foreach ($restrictionRule->getIds() as $id) {
+                foreach ($restrictionRule->ids as $id) {
                     if (in_array($id, $checkedIds, true)) {
                         // skip in case there are duplicates
                         continue;
diff --git a/src/Core/Domain/CartRule/Command/SetCartRuleProductRestrictionsCommand.php b/src/Core/Domain/CartRule/Command/SetCartRuleProductRestrictionsCommand.php
index f3851f21b870d..f57f28cef6868 100644
--- a/src/Core/Domain/CartRule/Command/SetCartRuleProductRestrictionsCommand.php
+++ b/src/Core/Domain/CartRule/Command/SetCartRuleProductRestrictionsCommand.php
@@ -36,34 +36,16 @@ class SetCartRuleProductRestrictionsCommand
     /**
      * @var CartRuleId
      */
-    private $cartRuleId;
+    public readonly CartRuleId $cartRuleId;
 
     /**
-     * @var RestrictionRuleGroup[]
+     * @param int $cartRuleId
+     * @param RestrictionRuleGroup[] $restrictionRuleGroups
      */
-    private $restrictionRuleGroups;
-
     public function __construct(
         int $cartRuleId,
-        array $restrictionRuleGroups
+        public readonly array $restrictionRuleGroups
     ) {
         $this->cartRuleId = new CartRuleId($cartRuleId);
-        $this->restrictionRuleGroups = $restrictionRuleGroups;
-    }
-
-    /**
-     * @return CartRuleId
-     */
-    public function getCartRuleId(): CartRuleId
-    {
-        return $this->cartRuleId;
-    }
-
-    /**
-     * @return RestrictionRuleGroup[]
-     */
-    public function getRestrictionRuleGroups(): array
-    {
-        return $this->restrictionRuleGroups;
     }
 }
diff --git a/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRule.php b/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRule.php
index 918a2e4c98b46..55a74bfdb4aaa 100644
--- a/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRule.php
+++ b/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRule.php
@@ -45,43 +45,16 @@ class RestrictionRule
         self::TYPE_SUPPLIER => self::TYPE_SUPPLIER,
     ];
 
-    /**
-     * @var string
-     */
-    private $type;
-
-    /**
-     * Ids of product, attributes, categories, manufacturers or suppliers, depending on restriction rule type
-     *
-     * @var int[]
-     */
-    private $ids;
-
     /**
      * @param string $type
-     * @param int[] $ids
+     * @param int[] $ids Ids of product, attributes, categories, manufacturers or suppliers, depending on restriction rule type
      */
     public function __construct(
-        string $type,
-        array $ids
+        public readonly string $type,
+        public readonly array $ids
     ) {
         $this->assertType($type);
         $this->assertIds($ids);
-        $this->type = $type;
-        $this->ids = $ids;
-    }
-
-    public function getType(): string
-    {
-        return $this->type;
-    }
-
-    /**
-     * @return int[]
-     */
-    public function getIds(): array
-    {
-        return $this->ids;
     }
 
     /**
diff --git a/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRuleGroup.php b/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRuleGroup.php
index 939afc993c5d2..f35721c283f5d 100644
--- a/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRuleGroup.php
+++ b/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRuleGroup.php
@@ -34,38 +34,14 @@
 class RestrictionRuleGroup
 {
     /**
-     * @var int
+     * @param int $requiredQuantityInCart
+     * @param RestrictionRule[] $restrictionRules
      */
-    private $requiredQuantityInCart;
-
-    /**
-     * @var RestrictionRule[]
-     */
-    private $restrictionRules;
-
     public function __construct(
-        int $requiredQuantityInCart,
-        array $restrictionRules
+        public readonly int $requiredQuantityInCart,
+        public readonly array $restrictionRules
     ) {
         $this->assertRestrictionRules($restrictionRules);
-        $this->requiredQuantityInCart = $requiredQuantityInCart;
-        $this->restrictionRules = $restrictionRules;
-    }
-
-    /**
-     * @return int
-     */
-    public function getRequiredQuantityInCart(): int
-    {
-        return $this->requiredQuantityInCart;
-    }
-
-    /**
-     * @return RestrictionRule[]
-     */
-    public function getRestrictionRules(): array
-    {
-        return $this->restrictionRules;
     }
 
     /**
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
index 8a2118e20e77f..e50eba1831ee4 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
@@ -32,6 +32,7 @@
 use PHPUnit\Framework\Assert;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleConstraintException;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleNotFoundException;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\Restriction\RestrictionRule;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\Restriction\RestrictionRuleGroup;
 use RuntimeException;
 use Tests\Integration\Behaviour\Features\Context\Util\NoExceptionAlthoughExpectedException;
@@ -189,10 +190,10 @@ public function assertProductRestrictionGroups(string $cartRuleReference, TableN
             $actualGroup = $actualRestrictionGroups[$key];
             Assert::assertEquals(
                 $expectedDataRow['quantity'],
-                $actualGroup->getRequiredQuantityInCart(),
+                $actualGroup->requiredQuantityInCart,
                 'Unexpected required quantity in cart in restriction group'
             );
-            Assert::assertCount((int) $expectedDataRow['rules count'], $actualGroup->getRestrictionRules(), 'Unexpected rules count in restriction group');
+            Assert::assertCount((int) $expectedDataRow['rules count'], $actualGroup->restrictionRules, 'Unexpected rules count in restriction group');
 
             // set group into shared storage so that following steps can assert its values more in depth
             $this->getSharedStorage()->set($expectedDataRow['groupReference'], $actualGroup);
@@ -219,14 +220,16 @@ public function assertProductRestrictionRules(string $restrictionGroupReference,
         $group = $this->getSharedStorage()->get($restrictionGroupReference);
         Assert::assertInstanceOf(RestrictionRuleGroup::class, $group);
 
-        $actualRules = $group->getRestrictionRules();
+        $actualRules = $group->restrictionRules;
         $expectedDataRows = $tableNode->getColumnsHash();
 
         Assert::assertCount(count($expectedDataRows), $actualRules, 'Unexpected product restriction rules count in group');
 
         foreach ($expectedDataRows as $key => $expectedRow) {
-            Assert::assertSame($expectedRow['type'], $actualRules[$key]->getType());
-            Assert::assertSame($this->referencesToIds($expectedRow['references']), $actualRules[$key]->getIds());
+            /** @var RestrictionRule $actualRule */
+            $actualRule = $actualRules[$key];
+            Assert::assertSame($expectedRow['type'], $actualRule->type);
+            Assert::assertSame($this->referencesToIds($expectedRow['references']), $actualRule->ids);
         }
     }
 }

From bdabd9522cccf3515214191abe69b80843df5b12 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Wed, 21 Jun 2023 11:02:33 +0300
Subject: [PATCH 0322/1030]  remove redundant assertion

---
 .../Restriction/RestrictionRuleGroup.php         | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRuleGroup.php b/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRuleGroup.php
index f35721c283f5d..8a5850811960e 100644
--- a/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRuleGroup.php
+++ b/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRuleGroup.php
@@ -29,7 +29,6 @@
 namespace PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\Restriction;
 
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleConstraintException;
-use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
 
 class RestrictionRuleGroup
 {
@@ -50,7 +49,6 @@ public function __construct(
      * @return void
      *
      * @throws CartRuleConstraintException
-     * @throws InvalidArgumentException
      */
     private function assertRestrictionRules(array $rules): void
     {
@@ -60,19 +58,5 @@ private function assertRestrictionRules(array $rules): void
                 CartRuleConstraintException::EMPTY_RESTRICTION_RULES
             );
         }
-
-        foreach ($rules as $rule) {
-            if ($rule instanceof RestrictionRule) {
-                continue;
-            }
-
-            throw new InvalidArgumentException(
-                sprintf(
-                    'Invalid array element. Expected array of %s, but got %s',
-                    RestrictionRule::class,
-                    var_export($rule, true)
-                )
-            );
-        }
     }
 }

From 61000aae5986c54e2ed73a45e2388a11b8964a97 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Wed, 21 Jun 2023 15:52:47 +0300
Subject: [PATCH 0323/1030]  readonly prop in heandler

---
 .../CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php b/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php
index 15aca3523f4c9..cac4cf821ece5 100644
--- a/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php
+++ b/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php
@@ -37,7 +37,7 @@
 class SetCartRuleRestrictionsHandler implements SetCartRuleRestrictionsHandlerInterface
 {
     public function __construct(
-        protected CartRuleRepository $cartRuleRepository
+        protected readonly CartRuleRepository $cartRuleRepository
     ) {
     }
 

From d28413db7c1ac138d37aba7f300b66a1c942c946 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Wed, 21 Jun 2023 18:08:38 +0300
Subject: [PATCH 0324/1030]  merge product and cart rule combination
 restrictions into one command and adjust behats

---
 .../SetCartRuleRestrictionsHandler.php        |  43 +++++-
 .../SetCartRuleRestrictionsCommand.php        |  74 ++++++++--
 .../CartRuleAssertionFeatureContext.php       |   6 +-
 .../CartRule/EditCartRuleFeatureContext.php   | 118 +++++++++-------
 ...art_rule_combination_restrictions.feature} |  12 +-
 .../set_mixed_cart_rule_restrictions.feature  | 126 ++++++++++++++++++
 .../CartRule/set_product_restrictions.feature |  20 +--
 7 files changed, 320 insertions(+), 79 deletions(-)
 rename tests/Integration/Behaviour/Features/Scenario/CartRule/{set_cart_rule_restrictions.feature => set_cart_rule_combination_restrictions.feature} (89%)
 create mode 100644 tests/Integration/Behaviour/Features/Scenario/CartRule/set_mixed_cart_rule_restrictions.feature

diff --git a/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php b/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php
index cac4cf821ece5..1c92be3773241 100644
--- a/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php
+++ b/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php
@@ -43,28 +43,57 @@ public function __construct(
 
     public function handle(SetCartRuleRestrictionsCommand $command): void
     {
-        $cartRuleId = $command->cartRuleId;
-        $cartRule = $this->cartRuleRepository->get($cartRuleId);
-        $restrictedCartRuleIds = $command->restrictedCartRuleIds;
+        if ($command->isEmpty()) {
+            // no restrictions were modified
+            return;
+        }
+
+        $cartRule = $this->cartRuleRepository->get($command->cartRuleId);
+
+        $restrictedCartRuleIds = $command->getRestrictedCartRuleIds();
+        if (null !== $restrictedCartRuleIds) {
+            $this->setCartRuleRestrictions($cartRule, $restrictedCartRuleIds);
+            $this->updateRestrictionProperty($cartRule, 'cart_rule_restriction', !empty($restrictedCartRuleIds));
+        }
+        $productRestrictionGroups = $command->getProductRestrictionRuleGroups();
+        if (null !== $productRestrictionGroups) {
+            $this->setProductRestrictions($cartRule, $productRestrictionGroups);
+            $this->updateRestrictionProperty($cartRule, 'product_restriction', !empty($productRestrictionGroups));
+        }
+        // it would be more performant updating all restriction props at the end with one update call,
+        // but that way we might introduce cart rule state failure in case one of steps fails somewhere in the middle
+    }
+
+    private function setCartRuleRestrictions(CartRule $cartRule, array $restrictedCartRuleIds): void
+    {
+        $cartRuleId = new CartRuleId((int) $cartRule->id);
         $this->cartRuleRepository->assertAllCartRulesExists($restrictedCartRuleIds);
         $this->cartRuleRepository->restrictCartRules($cartRuleId, $restrictedCartRuleIds);
         $hasRestrictions = !empty($restrictedCartRuleIds);
 
-        $this->updateRestrictionProperty($cartRule, $hasRestrictions);
+        $this->updateRestrictionProperty($cartRule, 'cart_rule_restriction', $hasRestrictions);
 
         // update cart_rule_restriction property for all the cart rules that have been affected
         foreach ($this->cartRuleRepository->getRestrictedCartRuleIds($cartRuleId) as $restrictedCartRuleId) {
             $affectedCartRule = $this->cartRuleRepository->get(new CartRuleId($restrictedCartRuleId));
-            $this->updateRestrictionProperty($affectedCartRule, $hasRestrictions);
+            $this->updateRestrictionProperty($affectedCartRule, 'cart_rule_restriction', $hasRestrictions);
         }
     }
 
-    private function updateRestrictionProperty(CartRule $cartRule, bool $hasRestrictions): void
+    private function updateRestrictionProperty(CartRule $cartRule, string $propertyName, bool $hasRestrictions): void
     {
         $cartRule->cart_rule_restriction = $hasRestrictions;
         $this->cartRuleRepository->partialUpdate(
             $cartRule,
-            ['cart_rule_restriction']
+            [$propertyName]
         );
     }
+
+    private function setProductRestrictions(CartRule $cartRule, array $restrictionRuleGroups): void
+    {
+        $this->cartRuleRepository->setProductRestrictions(new CartRuleId((int) $cartRule->id), $restrictionRuleGroups);
+
+        $cartRule->product_restriction = !empty($restrictionRuleGroups);
+        $this->cartRuleRepository->partialUpdate($cartRule, ['product_restriction']);
+    }
 }
diff --git a/src/Core/Domain/CartRule/Command/SetCartRuleRestrictionsCommand.php b/src/Core/Domain/CartRule/Command/SetCartRuleRestrictionsCommand.php
index 09102b494ee27..c6c3caea89fde 100644
--- a/src/Core/Domain/CartRule/Command/SetCartRuleRestrictionsCommand.php
+++ b/src/Core/Domain/CartRule/Command/SetCartRuleRestrictionsCommand.php
@@ -30,47 +30,97 @@
 
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleConstraintException;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\CartRuleId;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\Restriction\RestrictionRuleGroup;
 
+/**
+ * Sets cart rule restrictions.
+ * Leaving property as NULL will cause no changes, however having an empty array will clear existing restrictions.
+ */
 class SetCartRuleRestrictionsCommand
 {
     public readonly CartRuleId $cartRuleId;
 
-    /** @var CartRuleId[] */
-    public readonly array $restrictedCartRuleIds;
+    /**
+     * @var CartRuleId[]|null
+     */
+    private ?array $restrictedCartRuleIds = null;
+
+    /**
+     * @var RestrictionRuleGroup[]|null
+     */
+    private ?array $productRestrictionRuleGroups = null;
 
     /**
      * @param int $cartRuleId
-     * @param int[] $restrictedCartRuleIds
      */
     public function __construct(
         int $cartRuleId,
-        array $restrictedCartRuleIds
     ) {
         $this->cartRuleId = new CartRuleId($cartRuleId);
-        $this->restrictedCartRuleIds = $this->assertCartRuleIds($cartRuleId, $restrictedCartRuleIds);
     }
 
     /**
-     * @param int $cartRuleId
      * @param int[] $restrictedCartRuleIds
      *
-     * @return CartRuleId[]
+     * @return self
      *
      * @throws CartRuleConstraintException
      */
-    private function assertCartRuleIds(int $cartRuleId, array $restrictedCartRuleIds): array
+    public function setRestrictedCartRuleIds(array $restrictedCartRuleIds): self
     {
-        $cartRuleIds = [];
+        $this->restrictedCartRuleIds = [];
         foreach ($restrictedCartRuleIds as $restrictedCartRuleId) {
-            if ($restrictedCartRuleId === $cartRuleId) {
+            if ($restrictedCartRuleId === $this->cartRuleId->getValue()) {
                 throw new CartRuleConstraintException(
                     'Restricted CartRule ids cannot contain id of current cart rule',
                     CartRuleConstraintException::INVALID_CART_RULE_RESTRICTION
                 );
             }
-            $cartRuleIds[] = new CartRuleId($restrictedCartRuleId);
+            $this->restrictedCartRuleIds[] = new CartRuleId($restrictedCartRuleId);
         }
 
-        return $cartRuleIds;
+        return $this;
+    }
+
+    /**
+     * @return CartRuleId[]|null
+     */
+    public function getRestrictedCartRuleIds(): ?array
+    {
+        return $this->restrictedCartRuleIds;
+    }
+
+    /**
+     * @param RestrictionRuleGroup[] $productRestrictionRuleGroups
+     *
+     * @return self
+     */
+    public function setProductRestrictionRuleGroups(array $productRestrictionRuleGroups): self
+    {
+        $this->productRestrictionRuleGroups = $productRestrictionRuleGroups;
+
+        return $this;
+    }
+
+    /**
+     * It is possible to have this command empty if none of the restrictions are modified
+     *
+     * @todo: don't forget to adapt this method when all the other restrictions are added.
+     *
+     * @return bool
+     */
+    public function isEmpty(): bool
+    {
+        return null === $this->getRestrictedCartRuleIds()
+            && null === $this->getProductRestrictionRuleGroups()
+        ;
+    }
+
+    /**
+     * @return RestrictionRuleGroup[]|null
+     */
+    public function getProductRestrictionRuleGroups(): ?array
+    {
+        return $this->productRestrictionRuleGroups;
     }
 }
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
index e50eba1831ee4..cb24aa9784088 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
@@ -193,7 +193,11 @@ public function assertProductRestrictionGroups(string $cartRuleReference, TableN
                 $actualGroup->requiredQuantityInCart,
                 'Unexpected required quantity in cart in restriction group'
             );
-            Assert::assertCount((int) $expectedDataRow['rules count'], $actualGroup->restrictionRules, 'Unexpected rules count in restriction group');
+            Assert::assertCount(
+                (int) $expectedDataRow['rules count'],
+                $actualGroup->restrictionRules,
+                sprintf('Unexpected rules count in restriction group referenced as "%s"', $expectedDataRow['groupReference'])
+            );
 
             // set group into shared storage so that following steps can assert its values more in depth
             $this->getSharedStorage()->set($expectedDataRow['groupReference'], $actualGroup);
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
index c825f6340b435..92fc7661e75b7 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
@@ -35,29 +35,27 @@
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\ToggleCartRuleStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleConstraintException;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleNotFoundException;
-use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\SetCartRuleProductRestrictionsCommand;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\Restriction\RestrictionRule;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\Restriction\RestrictionRuleGroup;
+use RuntimeException;
 use Tests\Integration\Behaviour\Features\Context\Util\PrimitiveUtils;
 
 class EditCartRuleFeatureContext extends AbstractCartRuleFeatureContext
 {
     /**
-     * This is just a random number which in theory should never be reached as cart rule id in tests
+     * @var array<string, SetCartRuleRestrictionsCommand[]>
      */
-    private const NON_EXISTING_CART_RULE_ID = 54440051;
+    private array $restrictionCommandsByReference = [];
 
     /**
-     * Provides string to set and retrieve certain cart rule product restrictions state from shared storage
-     *
-     * @param string $cartRuleReference
-     *
-     * @return string
+     * @var array<string, RestrictionRuleGroup[]>
      */
-    public static function buildProductRestrictionStorageKey(string $cartRuleReference): string
-    {
-        return 'cart_rule_product_restriction_groups_' . $cartRuleReference;
-    }
+    private array $productRestrictionGroupsByReference = [];
+
+    /**
+     * This is just a random number which in theory should never be reached as cart rule id in tests
+     */
+    private const NON_EXISTING_CART_RULE_ID = 54440051;
 
     /**
      * @When /^I (enable|disable) cart rule with reference "(.+)"$/
@@ -97,7 +95,7 @@ public function editCartRule(string $cartRuleReference, TableNode $tableNode): v
             $cartRuleId = $this->getSharedStorage()->get($cartRuleReference);
             $command = new EditCartRuleCommand($cartRuleId);
             $data = $this->localizeByRows($tableNode);
-            $this->fillCommand($command, $data);
+            $this->fillEditCommand($command, $data);
             $this->getCommandBus()->handle($command);
 
             if (!empty($data['code'])) {
@@ -117,22 +115,24 @@ public function editCartRule(string $cartRuleReference, TableNode $tableNode): v
      *
      * @return void
      */
-    public function restrictCartRules(string $cartRuleReference, TableNode $tableNode): void
+    public function setRestrictedCartRules(string $cartRuleReference, TableNode $tableNode): void
     {
         $restrictedCartRuleIds = [];
         foreach ($tableNode->getColumn(0) as $restrictedCartRuleReference) {
             $restrictedCartRuleIds[] = $this->getSharedStorage()->get($restrictedCartRuleReference);
         }
 
+        $command = $this->getRestrictionsCommand($cartRuleReference);
+
         try {
-            $this->performCartRulesRestriction($this->getSharedStorage()->get($cartRuleReference), $restrictedCartRuleIds);
+            $command->setRestrictedCartRuleIds($restrictedCartRuleIds);
+            $this->restrictionCommandsByReference[$cartRuleReference] = $command;
         } catch (CartRuleConstraintException $e) {
             $this->setLastException($e);
         }
     }
 
     /**
-     *
      * @When I add a restriction for cart rule :cartRuleReference, which requires at least :quantity product(s) in cart matching one of these rules:
      * @When I add a restriction for cart rule :cartRuleReference, which requires any quantity of product(s) in cart matching one of these rules:
      * @When I add a restriction for cart rule :cartRuleReference, which requires at least :quantity product(s), but I provide empty list of rules
@@ -145,7 +145,6 @@ public function restrictCartRules(string $cartRuleReference, TableNode $tableNod
      */
     public function addRestrictionRule(string $cartRuleReference, int $quantity = 0, ?TableNode $table = null): void
     {
-        $restrictionsKey = $this::buildProductRestrictionStorageKey($cartRuleReference);
         $rules = [];
 
         try {
@@ -156,12 +155,12 @@ public function addRestrictionRule(string $cartRuleReference, int $quantity = 0,
             }
 
             $restrictionGroups = [];
-            if ($this->getSharedStorage()->exists($restrictionsKey)) {
-                $restrictionGroups = $this->getSharedStorage()->get($restrictionsKey);
+            if (isset($this->productRestrictionGroupsByReference[$cartRuleReference])) {
+                $restrictionGroups = $this->productRestrictionGroupsByReference[$cartRuleReference];
             }
 
             $restrictionGroups[] = new RestrictionRuleGroup($quantity, $rules);
-            $this->getSharedStorage()->set($restrictionsKey, $restrictionGroups);
+            $this->productRestrictionGroupsByReference[$cartRuleReference] = $restrictionGroups;
         } catch (CartRuleConstraintException $e) {
             $this->setLastException($e);
         }
@@ -176,11 +175,11 @@ public function addRestrictionRule(string $cartRuleReference, int $quantity = 0,
      */
     public function restrictCartRulesProvidingNonExistingIds(string $cartRuleReference): void
     {
+        $command = $this->getRestrictionsCommand($cartRuleReference);
+        $command->setRestrictedCartRuleIds([self::NON_EXISTING_CART_RULE_ID]);
+
         try {
-            $this->performCartRulesRestriction(
-                $this->getSharedStorage()->get($cartRuleReference),
-                [self::NON_EXISTING_CART_RULE_ID]
-            );
+            $this->getCommandBus()->handle($command);
         } catch (CartRuleNotFoundException $e) {
             $this->setLastException($e);
         }
@@ -195,50 +194,77 @@ public function restrictCartRulesProvidingNonExistingIds(string $cartRuleReferen
      */
     public function clearProductRestrictionRules(string $cartRuleReference): void
     {
-        $restrictionsKey = $this::buildProductRestrictionStorageKey($cartRuleReference);
-
-        $this->getCommandBus()->handle(new SetCartRuleProductRestrictionsCommand(
-            $this->getSharedStorage()->get($cartRuleReference),
-            []
-        ));
+        $command = $this->getRestrictionsCommand($cartRuleReference);
+        $command->setProductRestrictionRuleGroups([]);
 
-        $this->getSharedStorage()->clear($restrictionsKey);
+        $this->getCommandBus()->handle($command);
+        $this->restrictionCommandsByReference[$cartRuleReference] = $command;
+        unset($this->productRestrictionGroupsByReference[$cartRuleReference]);
     }
 
     /**
      * @When I save product restrictions for cart rule :cartRuleReference
+     * @When I save all the restrictions for cart rule :cartRuleReference
      *
      * @param string $cartRuleReference
      *
      * @return void
      */
-    public function saveProductRestrictionRules(string $cartRuleReference): void
+    public function saveRestrictionRules(string $cartRuleReference): void
     {
-        $restrictionsKey = $this::buildProductRestrictionStorageKey($cartRuleReference);
+        $command = $this->getRestrictionsCommand($cartRuleReference);
+
+        if (isset($this->productRestrictionGroupsByReference[$cartRuleReference])) {
+            // set the restrictions that (if) were added step by step before
+            $command->setProductRestrictionRuleGroups($this->productRestrictionGroupsByReference[$cartRuleReference]);
+            unset($this->productRestrictionGroupsByReference[$cartRuleReference]);
+        }
 
-        $this->getCommandBus()->handle(new SetCartRuleProductRestrictionsCommand(
-            $this->getSharedStorage()->get($cartRuleReference),
-            $this->getSharedStorage()->get($restrictionsKey)
-        ));
+        if ($command->isEmpty()) {
+            throw new RuntimeException(
+                sprintf(
+                    '%s is empty for cart rule referenced as "%s". Did you forget to fill the restrictions in other steps?',
+                    $command::class,
+                    $cartRuleReference
+                )
+            );
+        }
 
-        $this->getSharedStorage()->clear($restrictionsKey);
+        try {
+            $this->getCommandBus()->handle($command);
+        } catch (CartRuleConstraintException $e) {
+            $this->setLastException($e);
+        }
     }
 
-    private function performCartRulesRestriction(int $cartRuleId, array $restrictedCartRuleIds): void
+    private function executeRestrictionsCommand(SetCartRuleRestrictionsCommand $command): void
     {
-        $this->getCommandBus()->handle(
-            new SetCartRuleRestrictionsCommand(
-                $cartRuleId,
-                $restrictedCartRuleIds
-            )
-        );
+        try {
+            $this->getCommandBus()->handle($command);
+        } catch (CartRuleConstraintException $e) {
+            $this->setLastException($e);
+        }
+    }
+
+    private function getRestrictionsCommand(string $cartRuleReference): SetCartRuleRestrictionsCommand
+    {
+        if (isset($this->restrictionCommandsByReference[$cartRuleReference])) {
+            $command = $this->restrictionCommandsByReference[$cartRuleReference];
+            if (!($command instanceof SetCartRuleRestrictionsCommand)) {
+                throw new RuntimeException(sprintf('Expected "%s" got "%s', SetCartRuleRestrictionsCommand::class, var_export($command, true)));
+            }
+        } else {
+            $command = new SetCartRuleRestrictionsCommand($this->getSharedStorage()->get($cartRuleReference));
+        }
+
+        return $command;
     }
 
     /**
      * @param EditCartRuleCommand $command
      * @param array<string, mixed> $data
      */
-    private function fillCommand(EditCartRuleCommand $command, array $data): void
+    private function fillEditCommand(EditCartRuleCommand $command, array $data): void
     {
         if (isset($data['name'])) {
             $command->setLocalizedNames($data['name']);
diff --git a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_cart_rule_restrictions.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_cart_rule_combination_restrictions.feature
similarity index 89%
rename from tests/Integration/Behaviour/Features/Scenario/CartRule/set_cart_rule_restrictions.feature
rename to tests/Integration/Behaviour/Features/Scenario/CartRule/set_cart_rule_combination_restrictions.feature
index cc7a297843275..6bb1a3773b9da 100644
--- a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_cart_rule_restrictions.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_cart_rule_combination_restrictions.feature
@@ -1,7 +1,7 @@
-# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart_rule --tags set-cart-rule-restrictions
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart_rule --tags set-cart-rule-combination-restrictions
 @restore-all-tables-before-feature
-@set-cart-rule-restrictions
-Feature: Set cart rule restrictions in BO
+@set-cart-rule-combination-restrictions
+Feature: Set cart rule combination restrictions in BO
   PrestaShop allows BO users to add and remove restrictions of cart rule combinations,
   which defines which cart rules can or cannot be compatible in the same cart
   As a BO user I must be able to edit cart rules compatibility
@@ -57,10 +57,13 @@ Feature: Set cart rule restrictions in BO
       | restricted cart rules |  |
     And cart rule "rule_70_percent" should have the following properties:
       | restricted cart rules |  |
+    And cart rule rule_free_shipping_1 should have no product restriction rules
+    And cart rule rule_50_percent should have no product restriction rules
 
   Scenario: Restrict cart rule combinations
     When I restrict following cart rules for cart rule rule_free_shipping_1:
       | rule_50_percent |
+    And I save all the restrictions for cart rule rule_free_shipping_1
     Then cart rule "rule_free_shipping_1" should have the following properties:
       | restricted cart rules | rule_50_percent |
     And cart rule "rule_50_percent" should have the following properties:
@@ -70,12 +73,15 @@ Feature: Set cart rule restrictions in BO
     When I restrict following cart rules for cart rule rule_free_shipping_1:
       | rule_50_percent |
       | rule_70_percent |
+    And I save all the restrictions for cart rule rule_free_shipping_1
     Then cart rule "rule_free_shipping_1" should have the following properties:
       | restricted cart rules | rule_50_percent,rule_70_percent |
     And cart rule "rule_50_percent" should have the following properties:
       | restricted cart rules | rule_free_shipping_1 |
     And cart rule "rule_70_percent" should have the following properties:
       | restricted cart rules | rule_free_shipping_1 |
+    And cart rule rule_free_shipping_1 should have no product restriction rules
+    And cart rule rule_50_percent should have no product restriction rules
 
   @restore-cart-rules-before-scenario
   Scenario: Provide non-existing ids for cart rule restriction
diff --git a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_mixed_cart_rule_restrictions.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_mixed_cart_rule_restrictions.feature
new file mode 100644
index 0000000000000..553724510b05a
--- /dev/null
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_mixed_cart_rule_restrictions.feature
@@ -0,0 +1,126 @@
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart_rule --tags set-mixed-cart-rule-restrictions
+@restore-all-tables-before-feature
+@set-mixed-cart-rule-restrictions
+Feature: Set cart rule restrictions in BO
+  PrestaShop allows BO users to add and remove various restriction rules which defines
+  how other cart rules, countries, products, carriers or customer groups affects validity of cart rule in cart.
+
+  Background:
+    Given shop "shop1" with name "test_shop" exists
+    And there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
+    And there is a currency named "chf" with iso code "CHF" and exchange rate of 1.25
+    And currency "usd" is the default one
+    And language with iso code "en" is the default one
+    And attribute "S" named "S" in en language exists
+    And attribute "M" named "M" in en language exists
+    And attribute "L" named "L" in en language exists
+    And category "home" in default language named "Home" exists
+    And category "home" is the default one
+    And category "clothes" in default language named "Clothes" exists
+    And category "clothes" parent is category "home"
+    And category "men" in default language named "Men" exists
+    And category "men" parent is category "clothes"
+    And category "women" in default language named "Women" exists
+    And category "women" parent is category "clothes"
+    And manufacturer studioDesign named "Studio Design" exists
+    And manufacturer graphicCorner named "Graphic Corner" exists
+    And supplier fashionSupplier named "Fashion supplier" exists
+    And supplier accessoriesSupplier named "Accessories supplier" exists
+    And I add product "product1" with following information:
+      | name[en-US] | bottle of beer |
+      | type        | virtual        |
+    And I add product "product2" with following information:
+      | name[en-US] | T-shirt nr1 |
+      | type        | standard    |
+    And I add product "product3" with following information:
+      | name[en-US] | Shirt - Dom & Jquery |
+      | type        | standard             |
+    And I create cart rule "rule_free_shipping_1" with following properties:
+      | name[en-US]       | free shipping 1      |
+      | is_active         | true                 |
+      | allow_partial_use | false                |
+      | priority          | 1                    |
+      | valid_from        | 2022-01-01 11:00:00  |
+      | valid_to          | 3001-01-01 12:00:00  |
+      | total_quantity    | 10                   |
+      | quantity_per_user | 10                   |
+      | free_shipping     | true                 |
+      | code              | rule_free_shipping_1 |
+    And I create cart rule "rule_50_percent" with following properties:
+      | name[en-US]                            | Half the price         |
+      | is_active                              | true                   |
+      | allow_partial_use                      | true                   |
+      | priority                               | 2                      |
+      | valid_from                             | 2022-01-01 11:00:00    |
+      | valid_to                               | 3001-01-01 12:00:00    |
+      | total_quantity                         | 10                     |
+      | quantity_per_user                      | 12                     |
+      | free_shipping                          | false                  |
+      | code                                   | rule_50_percent        |
+      | reduction_percentage                   | 50                     |
+      | reduction_apply_to_discounted_products | false                  |
+      | discount_application_type              | order_without_shipping |
+    And I create cart rule "rule_70_percent" with following properties:
+      | name[en-US]                            | Half the price         |
+      | is_active                              | true                   |
+      | allow_partial_use                      | true                   |
+      | priority                               | 3                      |
+      | valid_from                             | 2022-01-01 11:00:00    |
+      | valid_to                               | 3001-01-01 12:00:00    |
+      | total_quantity                         | 10                     |
+      | quantity_per_user                      | 12                     |
+      | free_shipping                          | false                  |
+      | code                                   | rule_70_percent        |
+      | reduction_percentage                   | 70                     |
+      | reduction_apply_to_discounted_products | false                  |
+      | discount_application_type              | order_without_shipping |
+    And cart rule "rule_free_shipping_1" should have the following properties:
+      | restricted cart rules |  |
+    And cart rule "rule_50_percent" should have the following properties:
+      | restricted cart rules |  |
+    And cart rule "rule_70_percent" should have the following properties:
+      | restricted cart rules |  |
+    And cart rule rule_free_shipping_1 should have no product restriction rules
+    And cart rule rule_50_percent should have no product restriction rules
+
+  Scenario: Restrict cart rule combinations and various products restrictions
+    When I restrict following cart rules for cart rule rule_free_shipping_1:
+      | rule_50_percent |
+      | rule_70_percent |
+    And I add a restriction for cart rule rule_free_shipping_1, which requires at least 1 product in cart matching one of these rules:
+      | type          | references                 |
+      | products      | product1                   |
+      | products      | product2                   |
+      | products      | product3                   |
+      | categories    | clothes,men                |
+      | manufacturers | studioDesign,graphicCorner |
+    And I add a restriction for cart rule rule_free_shipping_1, which requires at least 2 product in cart matching one of these rules:
+      | type       | references |
+      | attributes | S,M        |
+      | attributes | L          |
+    And I add a restriction for cart rule rule_free_shipping_1, which requires at least 4 products in cart matching one of these rules:
+      | type      | references                          |
+      | suppliers | fashionSupplier,accessoriesSupplier |
+    And I save all the restrictions for cart rule rule_free_shipping_1
+    Then cart rule "rule_free_shipping_1" should have the following properties:
+      | restricted cart rules | rule_50_percent,rule_70_percent |
+    And cart rule "rule_free_shipping_1" should have the following product restriction rule groups:
+      | groupReference | quantity | rules count |
+      | group_nr_1     | 1        | 5           |
+      | group_nr_2     | 2        | 2           |
+      | group_nr_3     | 4        | 1           |
+    And the cart rule restriction group "group_nr_1" should have the following rules:
+      | type          | references                 |
+      | products      | product1                   |
+      | products      | product2                   |
+      | products      | product3                   |
+      | categories    | clothes,men                |
+      | manufacturers | studioDesign,graphicCorner |
+    And the cart rule restriction group "group_nr_2" should have the following rules:
+      | type       | references |
+      | attributes | S,M        |
+      | attributes | L          |
+    And the cart rule restriction group "group_nr_3" should have the following rules:
+      | type      | references                          |
+      | suppliers | fashionSupplier,accessoriesSupplier |
+    And cart rule rule_50_percent should have no product restriction rules
diff --git a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
index 44c5a10dee354..e89ece6d3979f 100644
--- a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
@@ -39,7 +39,7 @@ Feature: Set cart rule product restrictions in BO
       | type        | standard             |
 
   # @todo: create cart rules once in first scenario, so they are not recreated before every scenario.
-  #  This step is temporary and should be replaced by step "Given there is a cart rule..." in backhround
+  #  This step is temporary and should be replaced by step "Given there is a cart rule..." in background
   #  when following PR is merged: https://github.com/PrestaShop/PrestaShop/pull/32483
   Scenario: Create cart rules for further steps
     And I create cart rule "rule_free_shipping_1" with following properties:
@@ -79,7 +79,7 @@ Feature: Set cart rule product restrictions in BO
       | products | product1   |
       | products | product2   |
       | products | product3   |
-    And I save product restrictions for cart rule rule_free_shipping_1
+    And I save all the restrictions for cart rule rule_free_shipping_1
     Then cart rule "rule_free_shipping_1" should have the following product restriction rule groups:
       | groupReference | quantity | rules count |
       | group_nr_1     | 5        | 1           |
@@ -105,7 +105,7 @@ Feature: Set cart rule product restrictions in BO
       | type       | references |
       | attributes | S,M        |
       | attributes | L          |
-    And I save product restrictions for cart rule rule_50_percent
+    And I save all the restrictions for cart rule rule_50_percent
     Then cart rule "rule_50_percent" should have the following product restriction rule groups:
       | groupReference | quantity | rules count |
       | group_nr_1     | 7        | 1           |
@@ -128,7 +128,7 @@ Feature: Set cart rule product restrictions in BO
       | type       | references  |
       | categories | clothes,men |
       | categories | women       |
-    And I save product restrictions for cart rule rule_50_percent
+    And I save all the restrictions for cart rule rule_50_percent
     Then cart rule "rule_50_percent" should have the following product restriction rule groups:
       | groupReference | quantity | rules count |
       | group_nr_1     | 3        | 1           |
@@ -150,11 +150,11 @@ Feature: Set cart rule product restrictions in BO
     And I add a restriction for cart rule rule_50_percent, which requires at least 1 product in cart matching one of these rules:
       | type          | references    |
       | manufacturers | graphicCorner |
-    And I save product restrictions for cart rule rule_50_percent
+    And I save all the restrictions for cart rule rule_50_percent
     And I add a restriction for cart rule rule_free_shipping_1, which requires at least 4 products in cart matching one of these rules:
       | type          | references                 |
       | manufacturers | studioDesign,graphicCorner |
-    And I save product restrictions for cart rule rule_free_shipping_1
+    And I save all the restrictions for cart rule rule_free_shipping_1
     Then cart rule "rule_50_percent" should have the following product restriction rule groups:
       | groupReference | quantity | rules count |
       | 50_nr_1        | 2        | 1           |
@@ -181,11 +181,11 @@ Feature: Set cart rule product restrictions in BO
     And I add a restriction for cart rule rule_50_percent, which requires at least 1 product in cart matching one of these rules:
       | type      | references          |
       | suppliers | accessoriesSupplier |
-    And I save product restrictions for cart rule rule_50_percent
+    And I save all the restrictions for cart rule rule_50_percent
     And I add a restriction for cart rule rule_free_shipping_1, which requires at least 4 products in cart matching one of these rules:
       | type      | references                          |
       | suppliers | fashionSupplier,accessoriesSupplier |
-    And I save product restrictions for cart rule rule_free_shipping_1
+    And I save all the restrictions for cart rule rule_free_shipping_1
     Then cart rule "rule_50_percent" should have the following product restriction rule groups:
       | groupReference | quantity | rules count |
       | 50_nr_1        | 2        | 1           |
@@ -217,7 +217,7 @@ Feature: Set cart rule product restrictions in BO
       | type          | references                          |
       | suppliers     | fashionSupplier,accessoriesSupplier |
       | manufacturers | graphicCorner                       |
-    And I save product restrictions for cart rule rule_free_shipping_1
+    And I save all the restrictions for cart rule rule_free_shipping_1
     Then cart rule "rule_free_shipping_1" should have the following product restriction rule groups:
       | groupReference | quantity | rules count |
       | free_nr_1      | 1        | 5           |
@@ -254,7 +254,7 @@ Feature: Set cart rule product restrictions in BO
     And I add a restriction for cart rule rule_free_shipping_1, which requires at least 100 product in cart matching one of these rules:
       | type          | references    |
       | manufacturers | graphicCorner |
-    And I save product restrictions for cart rule rule_free_shipping_1
+    And I save all the restrictions for cart rule rule_free_shipping_1
     Then cart rule "rule_free_shipping_1" should have the following product restriction rule groups:
       | groupReference | quantity | rules count |
       | free_nr_1      | 0        | 2           |

From 02bc89838a975819e8efda835faa2086eb6af33e Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Wed, 21 Jun 2023 18:09:45 +0300
Subject: [PATCH 0325/1030]  remove now unused SetCartRuleProductRestrictions
 command and handler

---
 .../SetCartRuleProductRestrictionsHandler.php | 53 -------------------
 .../SetCartRuleProductRestrictionsCommand.php | 51 ------------------
 ...uleProductRestrictionsHandlerInterface.php | 36 -------------
 .../config/services/adapter/cart_rule.yml     |  6 ---
 4 files changed, 146 deletions(-)
 delete mode 100644 src/Adapter/CartRule/CommandHandler/SetCartRuleProductRestrictionsHandler.php
 delete mode 100644 src/Core/Domain/CartRule/Command/SetCartRuleProductRestrictionsCommand.php
 delete mode 100644 src/Core/Domain/CartRule/CommandHandler/SetCartRuleProductRestrictionsHandlerInterface.php

diff --git a/src/Adapter/CartRule/CommandHandler/SetCartRuleProductRestrictionsHandler.php b/src/Adapter/CartRule/CommandHandler/SetCartRuleProductRestrictionsHandler.php
deleted file mode 100644
index adf692fb15df4..0000000000000
--- a/src/Adapter/CartRule/CommandHandler/SetCartRuleProductRestrictionsHandler.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-declare(strict_types=1);
-
-namespace PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler;
-
-use PrestaShop\PrestaShop\Adapter\CartRule\Repository\CartRuleRepository;
-use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\SetCartRuleProductRestrictionsCommand;
-use PrestaShop\PrestaShop\Core\Domain\CartRule\CommandHandler\SetCartRuleProductRestrictionsHandlerInterface;
-
-class SetCartRuleProductRestrictionsHandler implements SetCartRuleProductRestrictionsHandlerInterface
-{
-    public function __construct(
-        protected CartRuleRepository $cartRuleRepository
-    ) {
-    }
-
-    public function handle(SetCartRuleProductRestrictionsCommand $command): void
-    {
-        $cartRuleId = $command->cartRuleId;
-        $cartRule = $this->cartRuleRepository->get($cartRuleId);
-        $restrictionRuleGroups = $command->restrictionRuleGroups;
-
-        $this->cartRuleRepository->setProductRestrictions($cartRuleId, $restrictionRuleGroups);
-
-        $cartRule->product_restriction = !empty($restrictionRuleGroups);
-        $this->cartRuleRepository->partialUpdate($cartRule, ['product_restriction']);
-    }
-}
diff --git a/src/Core/Domain/CartRule/Command/SetCartRuleProductRestrictionsCommand.php b/src/Core/Domain/CartRule/Command/SetCartRuleProductRestrictionsCommand.php
deleted file mode 100644
index f57f28cef6868..0000000000000
--- a/src/Core/Domain/CartRule/Command/SetCartRuleProductRestrictionsCommand.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-declare(strict_types=1);
-
-namespace PrestaShop\PrestaShop\Core\Domain\CartRule\Command;
-
-use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\CartRuleId;
-use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\Restriction\RestrictionRuleGroup;
-
-class SetCartRuleProductRestrictionsCommand
-{
-    /**
-     * @var CartRuleId
-     */
-    public readonly CartRuleId $cartRuleId;
-
-    /**
-     * @param int $cartRuleId
-     * @param RestrictionRuleGroup[] $restrictionRuleGroups
-     */
-    public function __construct(
-        int $cartRuleId,
-        public readonly array $restrictionRuleGroups
-    ) {
-        $this->cartRuleId = new CartRuleId($cartRuleId);
-    }
-}
diff --git a/src/Core/Domain/CartRule/CommandHandler/SetCartRuleProductRestrictionsHandlerInterface.php b/src/Core/Domain/CartRule/CommandHandler/SetCartRuleProductRestrictionsHandlerInterface.php
deleted file mode 100644
index 6901e6221ce6e..0000000000000
--- a/src/Core/Domain/CartRule/CommandHandler/SetCartRuleProductRestrictionsHandlerInterface.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-declare(strict_types=1);
-
-namespace PrestaShop\PrestaShop\Core\Domain\CartRule\CommandHandler;
-
-use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\SetCartRuleProductRestrictionsCommand;
-
-interface SetCartRuleProductRestrictionsHandlerInterface
-{
-    public function handle(SetCartRuleProductRestrictionsCommand $command): void;
-}
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml b/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml
index 9c1ee7fcaf830..631f96a387d78 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml
@@ -72,9 +72,3 @@ services:
     public: false
     tags:
       - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\CartRule\Command\SetCartRuleRestrictionsCommand }
-
-  PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler\SetCartRuleProductRestrictionsHandler:
-    autowire: true
-    public: false
-    tags:
-      - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\CartRule\Command\SetCartRuleProductRestrictionsCommand }

From f52a337038ca2fe4524cd0c0566ced1add9ff2bd Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Wed, 21 Jun 2023 18:20:15 +0300
Subject: [PATCH 0326/1030]  introduce dedicated context class for restrictions

---
 .../CartRule/EditCartRuleFeatureContext.php   | 173 ---------------
 .../SetCartRuleRestrictionsFeatureContext.php | 199 ++++++++++++++++++
 tests/Integration/Behaviour/behat.yml         |   1 +
 3 files changed, 200 insertions(+), 173 deletions(-)
 create mode 100644 tests/Integration/Behaviour/Features/Context/Domain/CartRule/SetCartRuleRestrictionsFeatureContext.php

diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
index 92fc7661e75b7..d5e357b31a16f 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/EditCartRuleFeatureContext.php
@@ -31,32 +31,12 @@
 use DateTimeImmutable;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\BulkToggleCartRuleStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\EditCartRuleCommand;
-use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\SetCartRuleRestrictionsCommand;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\ToggleCartRuleStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleConstraintException;
-use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleNotFoundException;
-use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\Restriction\RestrictionRule;
-use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\Restriction\RestrictionRuleGroup;
-use RuntimeException;
 use Tests\Integration\Behaviour\Features\Context\Util\PrimitiveUtils;
 
 class EditCartRuleFeatureContext extends AbstractCartRuleFeatureContext
 {
-    /**
-     * @var array<string, SetCartRuleRestrictionsCommand[]>
-     */
-    private array $restrictionCommandsByReference = [];
-
-    /**
-     * @var array<string, RestrictionRuleGroup[]>
-     */
-    private array $productRestrictionGroupsByReference = [];
-
-    /**
-     * This is just a random number which in theory should never be reached as cart rule id in tests
-     */
-    private const NON_EXISTING_CART_RULE_ID = 54440051;
-
     /**
      * @When /^I (enable|disable) cart rule with reference "(.+)"$/
      *
@@ -107,159 +87,6 @@ public function editCartRule(string $cartRuleReference, TableNode $tableNode): v
         }
     }
 
-    /**
-     * @When I restrict following cart rules for cart rule :cartRuleReference:
-     *
-     * @param string $cartRuleReference
-     * @param TableNode $tableNode
-     *
-     * @return void
-     */
-    public function setRestrictedCartRules(string $cartRuleReference, TableNode $tableNode): void
-    {
-        $restrictedCartRuleIds = [];
-        foreach ($tableNode->getColumn(0) as $restrictedCartRuleReference) {
-            $restrictedCartRuleIds[] = $this->getSharedStorage()->get($restrictedCartRuleReference);
-        }
-
-        $command = $this->getRestrictionsCommand($cartRuleReference);
-
-        try {
-            $command->setRestrictedCartRuleIds($restrictedCartRuleIds);
-            $this->restrictionCommandsByReference[$cartRuleReference] = $command;
-        } catch (CartRuleConstraintException $e) {
-            $this->setLastException($e);
-        }
-    }
-
-    /**
-     * @When I add a restriction for cart rule :cartRuleReference, which requires at least :quantity product(s) in cart matching one of these rules:
-     * @When I add a restriction for cart rule :cartRuleReference, which requires any quantity of product(s) in cart matching one of these rules:
-     * @When I add a restriction for cart rule :cartRuleReference, which requires at least :quantity product(s), but I provide empty list of rules
-     *
-     * @param string $cartRuleReference
-     * @param int $quantity
-     * @param TableNode|null $table
-     *
-     * @return void
-     */
-    public function addRestrictionRule(string $cartRuleReference, int $quantity = 0, ?TableNode $table = null): void
-    {
-        $rules = [];
-
-        try {
-            if ($table) {
-                foreach ($table->getColumnsHash() as $row) {
-                    $rules[] = new RestrictionRule($row['type'], $this->referencesToIds($row['references']));
-                }
-            }
-
-            $restrictionGroups = [];
-            if (isset($this->productRestrictionGroupsByReference[$cartRuleReference])) {
-                $restrictionGroups = $this->productRestrictionGroupsByReference[$cartRuleReference];
-            }
-
-            $restrictionGroups[] = new RestrictionRuleGroup($quantity, $rules);
-            $this->productRestrictionGroupsByReference[$cartRuleReference] = $restrictionGroups;
-        } catch (CartRuleConstraintException $e) {
-            $this->setLastException($e);
-        }
-    }
-
-    /**
-     * @When I restrict cart rules for :cartRuleReference providing non-existing cart rules
-     *
-     * @param string $cartRuleReference
-     *
-     * @return void
-     */
-    public function restrictCartRulesProvidingNonExistingIds(string $cartRuleReference): void
-    {
-        $command = $this->getRestrictionsCommand($cartRuleReference);
-        $command->setRestrictedCartRuleIds([self::NON_EXISTING_CART_RULE_ID]);
-
-        try {
-            $this->getCommandBus()->handle($command);
-        } catch (CartRuleNotFoundException $e) {
-            $this->setLastException($e);
-        }
-    }
-
-    /**
-     * @When I clear all product restrictions for cart rule :cartRuleReference
-     *
-     * @param string $cartRuleReference
-     *
-     * @return void
-     */
-    public function clearProductRestrictionRules(string $cartRuleReference): void
-    {
-        $command = $this->getRestrictionsCommand($cartRuleReference);
-        $command->setProductRestrictionRuleGroups([]);
-
-        $this->getCommandBus()->handle($command);
-        $this->restrictionCommandsByReference[$cartRuleReference] = $command;
-        unset($this->productRestrictionGroupsByReference[$cartRuleReference]);
-    }
-
-    /**
-     * @When I save product restrictions for cart rule :cartRuleReference
-     * @When I save all the restrictions for cart rule :cartRuleReference
-     *
-     * @param string $cartRuleReference
-     *
-     * @return void
-     */
-    public function saveRestrictionRules(string $cartRuleReference): void
-    {
-        $command = $this->getRestrictionsCommand($cartRuleReference);
-
-        if (isset($this->productRestrictionGroupsByReference[$cartRuleReference])) {
-            // set the restrictions that (if) were added step by step before
-            $command->setProductRestrictionRuleGroups($this->productRestrictionGroupsByReference[$cartRuleReference]);
-            unset($this->productRestrictionGroupsByReference[$cartRuleReference]);
-        }
-
-        if ($command->isEmpty()) {
-            throw new RuntimeException(
-                sprintf(
-                    '%s is empty for cart rule referenced as "%s". Did you forget to fill the restrictions in other steps?',
-                    $command::class,
-                    $cartRuleReference
-                )
-            );
-        }
-
-        try {
-            $this->getCommandBus()->handle($command);
-        } catch (CartRuleConstraintException $e) {
-            $this->setLastException($e);
-        }
-    }
-
-    private function executeRestrictionsCommand(SetCartRuleRestrictionsCommand $command): void
-    {
-        try {
-            $this->getCommandBus()->handle($command);
-        } catch (CartRuleConstraintException $e) {
-            $this->setLastException($e);
-        }
-    }
-
-    private function getRestrictionsCommand(string $cartRuleReference): SetCartRuleRestrictionsCommand
-    {
-        if (isset($this->restrictionCommandsByReference[$cartRuleReference])) {
-            $command = $this->restrictionCommandsByReference[$cartRuleReference];
-            if (!($command instanceof SetCartRuleRestrictionsCommand)) {
-                throw new RuntimeException(sprintf('Expected "%s" got "%s', SetCartRuleRestrictionsCommand::class, var_export($command, true)));
-            }
-        } else {
-            $command = new SetCartRuleRestrictionsCommand($this->getSharedStorage()->get($cartRuleReference));
-        }
-
-        return $command;
-    }
-
     /**
      * @param EditCartRuleCommand $command
      * @param array<string, mixed> $data
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/SetCartRuleRestrictionsFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/SetCartRuleRestrictionsFeatureContext.php
new file mode 100644
index 0000000000000..097a5cea943c6
--- /dev/null
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/SetCartRuleRestrictionsFeatureContext.php
@@ -0,0 +1,199 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace Tests\Integration\Behaviour\Features\Context\Domain\CartRule;
+
+use Behat\Gherkin\Node\TableNode;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\SetCartRuleRestrictionsCommand;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleConstraintException;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleNotFoundException;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\Restriction\RestrictionRule;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\Restriction\RestrictionRuleGroup;
+use RuntimeException;
+
+class SetCartRuleRestrictionsFeatureContext extends AbstractCartRuleFeatureContext
+{
+    /**
+     * @var array<string, SetCartRuleRestrictionsCommand>
+     */
+    private array $restrictionCommandsByReference = [];
+
+    /**
+     * @var array<string, RestrictionRuleGroup[]>
+     */
+    private array $productRestrictionGroupsByReference = [];
+
+    /**
+     * This is just a random number which in theory should never be reached as cart rule id in tests
+     */
+    private const NON_EXISTING_CART_RULE_ID = 54440051;
+
+    /**
+     * @When I restrict following cart rules for cart rule :cartRuleReference:
+     *
+     * @param string $cartRuleReference
+     * @param TableNode $tableNode
+     *
+     * @return void
+     */
+    public function setRestrictedCartRules(string $cartRuleReference, TableNode $tableNode): void
+    {
+        $restrictedCartRuleIds = [];
+        foreach ($tableNode->getColumn(0) as $restrictedCartRuleReference) {
+            $restrictedCartRuleIds[] = $this->getSharedStorage()->get($restrictedCartRuleReference);
+        }
+
+        $command = $this->getRestrictionsCommand($cartRuleReference);
+
+        try {
+            $command->setRestrictedCartRuleIds($restrictedCartRuleIds);
+            $this->restrictionCommandsByReference[$cartRuleReference] = $command;
+        } catch (CartRuleConstraintException $e) {
+            $this->setLastException($e);
+        }
+    }
+
+    /**
+     * @When I add a restriction for cart rule :cartRuleReference, which requires at least :quantity product(s) in cart matching one of these rules:
+     * @When I add a restriction for cart rule :cartRuleReference, which requires any quantity of product(s) in cart matching one of these rules:
+     * @When I add a restriction for cart rule :cartRuleReference, which requires at least :quantity product(s), but I provide empty list of rules
+     *
+     * @param string $cartRuleReference
+     * @param int $quantity
+     * @param TableNode|null $table
+     *
+     * @return void
+     */
+    public function addRestrictionRule(string $cartRuleReference, int $quantity = 0, ?TableNode $table = null): void
+    {
+        $rules = [];
+
+        try {
+            if ($table) {
+                foreach ($table->getColumnsHash() as $row) {
+                    $rules[] = new RestrictionRule($row['type'], $this->referencesToIds($row['references']));
+                }
+            }
+
+            $restrictionGroups = [];
+            if (isset($this->productRestrictionGroupsByReference[$cartRuleReference])) {
+                $restrictionGroups = $this->productRestrictionGroupsByReference[$cartRuleReference];
+            }
+
+            $restrictionGroups[] = new RestrictionRuleGroup($quantity, $rules);
+            $this->productRestrictionGroupsByReference[$cartRuleReference] = $restrictionGroups;
+        } catch (CartRuleConstraintException $e) {
+            $this->setLastException($e);
+        }
+    }
+
+    /**
+     * @When I restrict cart rules for :cartRuleReference providing non-existing cart rules
+     *
+     * @param string $cartRuleReference
+     *
+     * @return void
+     */
+    public function restrictCartRulesProvidingNonExistingIds(string $cartRuleReference): void
+    {
+        $command = $this->getRestrictionsCommand($cartRuleReference);
+        $command->setRestrictedCartRuleIds([self::NON_EXISTING_CART_RULE_ID]);
+
+        try {
+            $this->getCommandBus()->handle($command);
+        } catch (CartRuleNotFoundException $e) {
+            $this->setLastException($e);
+        }
+    }
+
+    /**
+     * @When I clear all product restrictions for cart rule :cartRuleReference
+     *
+     * @param string $cartRuleReference
+     *
+     * @return void
+     */
+    public function clearProductRestrictionRules(string $cartRuleReference): void
+    {
+        $command = $this->getRestrictionsCommand($cartRuleReference);
+        $command->setProductRestrictionRuleGroups([]);
+
+        $this->getCommandBus()->handle($command);
+        $this->restrictionCommandsByReference[$cartRuleReference] = $command;
+        unset($this->productRestrictionGroupsByReference[$cartRuleReference]);
+    }
+
+    /**
+     * @When I save product restrictions for cart rule :cartRuleReference
+     * @When I save all the restrictions for cart rule :cartRuleReference
+     *
+     * @param string $cartRuleReference
+     *
+     * @return void
+     */
+    public function saveRestrictionRules(string $cartRuleReference): void
+    {
+        $command = $this->getRestrictionsCommand($cartRuleReference);
+
+        if (isset($this->productRestrictionGroupsByReference[$cartRuleReference])) {
+            // set the restrictions that (if) were added step by step before
+            $command->setProductRestrictionRuleGroups($this->productRestrictionGroupsByReference[$cartRuleReference]);
+            unset($this->productRestrictionGroupsByReference[$cartRuleReference]);
+        }
+
+        if ($command->isEmpty()) {
+            throw new RuntimeException(
+                sprintf(
+                    '%s is empty for cart rule referenced as "%s". Did you forget to fill the restrictions in other steps?',
+                    $command::class,
+                    $cartRuleReference
+                )
+            );
+        }
+
+        try {
+            $this->getCommandBus()->handle($command);
+        } catch (CartRuleConstraintException $e) {
+            $this->setLastException($e);
+        }
+    }
+
+    private function getRestrictionsCommand(string $cartRuleReference): SetCartRuleRestrictionsCommand
+    {
+        if (isset($this->restrictionCommandsByReference[$cartRuleReference])) {
+            $command = $this->restrictionCommandsByReference[$cartRuleReference];
+            if (!($command instanceof SetCartRuleRestrictionsCommand)) {
+                throw new RuntimeException(sprintf('Expected "%s" got "%s', SetCartRuleRestrictionsCommand::class, var_export($command, true)));
+            }
+        } else {
+            $command = new SetCartRuleRestrictionsCommand($this->getSharedStorage()->get($cartRuleReference));
+        }
+
+        return $command;
+    }
+}
diff --git a/tests/Integration/Behaviour/behat.yml b/tests/Integration/Behaviour/behat.yml
index a88e080d72988..c5256b423df98 100644
--- a/tests/Integration/Behaviour/behat.yml
+++ b/tests/Integration/Behaviour/behat.yml
@@ -261,6 +261,7 @@ default:
                 - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\CartRuleAssertionFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\DeleteCartRuleFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\EditCartRuleFeatureContext
+                - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\SetCartRuleRestrictionsFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\ManufacturerFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\Product\AddProductFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\Product\Combination\CombinationListingFeatureContext

From a4cc1317a72f8d688c52d89663bb7f30fcf0486e Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Thu, 22 Jun 2023 14:33:00 +0300
Subject: [PATCH 0327/1030]  fix after rebase

---
 .../AbstractCartRuleFeatureContext.php        |  4 +-
 .../set_mixed_cart_rule_restrictions.feature  | 52 +++++++++----------
 .../CartRule/set_product_restrictions.feature | 26 +++++-----
 3 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
index 54f05e8daa6bd..bcf474e417690 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
@@ -285,8 +285,8 @@ protected function assertCartRuleProperties(CartRuleForEditing $cartRuleForEditi
             );
         }
 
-        if (isset($data['restricted cart rules'])) {
-            $expectedRestrictedCartRuleIds = $this->referencesToIds($data['restricted cart rules']);
+        if (isset($expectedData['restricted cart rules'])) {
+            $expectedRestrictedCartRuleIds = $this->referencesToIds($expectedData['restricted cart rules']);
             Assert::assertSame(
                 $expectedRestrictedCartRuleIds,
                 $conditions->getRestrictions()->restrictedCartRuleIds,
diff --git a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_mixed_cart_rule_restrictions.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_mixed_cart_rule_restrictions.feature
index 553724510b05a..1724e67a80cc7 100644
--- a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_mixed_cart_rule_restrictions.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_mixed_cart_rule_restrictions.feature
@@ -47,33 +47,33 @@ Feature: Set cart rule restrictions in BO
       | free_shipping     | true                 |
       | code              | rule_free_shipping_1 |
     And I create cart rule "rule_50_percent" with following properties:
-      | name[en-US]                            | Half the price         |
-      | is_active                              | true                   |
-      | allow_partial_use                      | true                   |
-      | priority                               | 2                      |
-      | valid_from                             | 2022-01-01 11:00:00    |
-      | valid_to                               | 3001-01-01 12:00:00    |
-      | total_quantity                         | 10                     |
-      | quantity_per_user                      | 12                     |
-      | free_shipping                          | false                  |
-      | code                                   | rule_50_percent        |
-      | reduction_percentage                   | 50                     |
-      | reduction_apply_to_discounted_products | false                  |
-      | discount_application_type              | order_without_shipping |
+      | name[en-US]                  | Half the price         |
+      | is_active                    | true                   |
+      | allow_partial_use            | true                   |
+      | priority                     | 2                      |
+      | valid_from                   | 2022-01-01 11:00:00    |
+      | valid_to                     | 3001-01-01 12:00:00    |
+      | total_quantity               | 10                     |
+      | quantity_per_user            | 12                     |
+      | free_shipping                | false                  |
+      | code                         | rule_50_percent        |
+      | discount_percentage          | 50                     |
+      | apply_to_discounted_products | false                  |
+      | discount_application_type    | order_without_shipping |
     And I create cart rule "rule_70_percent" with following properties:
-      | name[en-US]                            | Half the price         |
-      | is_active                              | true                   |
-      | allow_partial_use                      | true                   |
-      | priority                               | 3                      |
-      | valid_from                             | 2022-01-01 11:00:00    |
-      | valid_to                               | 3001-01-01 12:00:00    |
-      | total_quantity                         | 10                     |
-      | quantity_per_user                      | 12                     |
-      | free_shipping                          | false                  |
-      | code                                   | rule_70_percent        |
-      | reduction_percentage                   | 70                     |
-      | reduction_apply_to_discounted_products | false                  |
-      | discount_application_type              | order_without_shipping |
+      | name[en-US]                  | Half the price         |
+      | is_active                    | true                   |
+      | allow_partial_use            | true                   |
+      | priority                     | 3                      |
+      | valid_from                   | 2022-01-01 11:00:00    |
+      | valid_to                     | 3001-01-01 12:00:00    |
+      | total_quantity               | 10                     |
+      | quantity_per_user            | 12                     |
+      | free_shipping                | false                  |
+      | code                         | rule_70_percent        |
+      | discount_percentage          | 70                     |
+      | apply_to_discounted_products | false                  |
+      | discount_application_type    | order_without_shipping |
     And cart rule "rule_free_shipping_1" should have the following properties:
       | restricted cart rules |  |
     And cart rule "rule_50_percent" should have the following properties:
diff --git a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
index e89ece6d3979f..0058853a008f4 100644
--- a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
@@ -54,19 +54,19 @@ Feature: Set cart rule product restrictions in BO
       | free_shipping     | true                 |
       | code              | rule_free_shipping_1 |
     And I create cart rule "rule_50_percent" with following properties:
-      | name[en-US]                            | Half the price         |
-      | is_active                              | true                   |
-      | allow_partial_use                      | true                   |
-      | priority                               | 2                      |
-      | valid_from                             | 2022-01-01 11:00:00    |
-      | valid_to                               | 3001-01-01 12:00:00    |
-      | total_quantity                         | 10                     |
-      | quantity_per_user                      | 12                     |
-      | free_shipping                          | false                  |
-      | code                                   | rule_50_percent        |
-      | reduction_percentage                   | 50                     |
-      | reduction_apply_to_discounted_products | false                  |
-      | discount_application_type              | order_without_shipping |
+      | name[en-US]                  | Half the price         |
+      | is_active                    | true                   |
+      | allow_partial_use            | true                   |
+      | priority                     | 2                      |
+      | valid_from                   | 2022-01-01 11:00:00    |
+      | valid_to                     | 3001-01-01 12:00:00    |
+      | total_quantity               | 10                     |
+      | quantity_per_user            | 12                     |
+      | free_shipping                | false                  |
+      | code                         | rule_50_percent        |
+      | discount_percentage          | 50                     |
+      | apply_to_discounted_products | false                  |
+      | discount_application_type    | order_without_shipping |
     And cart rule "rule_free_shipping_1" should have no product restriction rules
     And cart rule "rule_50_percent" should have no product restriction rules
 

From aeebc6b338dcb38f3348eab651ec9703f43f46d2 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Fri, 23 Jun 2023 13:55:41 +0300
Subject: [PATCH 0328/1030]  clean up some redundant code and resolve todo in
 behats

---
 .../SetCartRuleRestrictionsHandler.php        | 19 +++++-----------
 .../SetCartRuleRestrictionsCommand.php        | 14 ------------
 .../config/services/adapter/cart_rule.yml     |  1 -
 .../SetCartRuleRestrictionsFeatureContext.php |  2 +-
 .../CartRule/set_product_restrictions.feature | 22 ++++---------------
 5 files changed, 10 insertions(+), 48 deletions(-)

diff --git a/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php b/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php
index 1c92be3773241..e5eee7b17dd32 100644
--- a/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php
+++ b/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php
@@ -43,7 +43,7 @@ public function __construct(
 
     public function handle(SetCartRuleRestrictionsCommand $command): void
     {
-        if ($command->isEmpty()) {
+        if (null === $command->getRestrictedCartRuleIds() && null === $command->getProductRestrictionRuleGroups()) {
             // no restrictions were modified
             return;
         }
@@ -53,12 +53,10 @@ public function handle(SetCartRuleRestrictionsCommand $command): void
         $restrictedCartRuleIds = $command->getRestrictedCartRuleIds();
         if (null !== $restrictedCartRuleIds) {
             $this->setCartRuleRestrictions($cartRule, $restrictedCartRuleIds);
-            $this->updateRestrictionProperty($cartRule, 'cart_rule_restriction', !empty($restrictedCartRuleIds));
         }
         $productRestrictionGroups = $command->getProductRestrictionRuleGroups();
         if (null !== $productRestrictionGroups) {
             $this->setProductRestrictions($cartRule, $productRestrictionGroups);
-            $this->updateRestrictionProperty($cartRule, 'product_restriction', !empty($productRestrictionGroups));
         }
         // it would be more performant updating all restriction props at the end with one update call,
         // but that way we might introduce cart rule state failure in case one of steps fails somewhere in the middle
@@ -71,24 +69,17 @@ private function setCartRuleRestrictions(CartRule $cartRule, array $restrictedCa
         $this->cartRuleRepository->restrictCartRules($cartRuleId, $restrictedCartRuleIds);
         $hasRestrictions = !empty($restrictedCartRuleIds);
 
-        $this->updateRestrictionProperty($cartRule, 'cart_rule_restriction', $hasRestrictions);
+        $cartRule->cart_rule_restriction = $hasRestrictions;
+        $this->cartRuleRepository->partialUpdate($cartRule, ['cart_rule_restriction']);
 
         // update cart_rule_restriction property for all the cart rules that have been affected
         foreach ($this->cartRuleRepository->getRestrictedCartRuleIds($cartRuleId) as $restrictedCartRuleId) {
             $affectedCartRule = $this->cartRuleRepository->get(new CartRuleId($restrictedCartRuleId));
-            $this->updateRestrictionProperty($affectedCartRule, 'cart_rule_restriction', $hasRestrictions);
+            $affectedCartRule->cart_rule_restriction = $hasRestrictions;
+            $this->cartRuleRepository->partialUpdate($affectedCartRule, ['cart_rule_restriction']);
         }
     }
 
-    private function updateRestrictionProperty(CartRule $cartRule, string $propertyName, bool $hasRestrictions): void
-    {
-        $cartRule->cart_rule_restriction = $hasRestrictions;
-        $this->cartRuleRepository->partialUpdate(
-            $cartRule,
-            [$propertyName]
-        );
-    }
-
     private function setProductRestrictions(CartRule $cartRule, array $restrictionRuleGroups): void
     {
         $this->cartRuleRepository->setProductRestrictions(new CartRuleId((int) $cartRule->id), $restrictionRuleGroups);
diff --git a/src/Core/Domain/CartRule/Command/SetCartRuleRestrictionsCommand.php b/src/Core/Domain/CartRule/Command/SetCartRuleRestrictionsCommand.php
index c6c3caea89fde..e3828f0a16fc8 100644
--- a/src/Core/Domain/CartRule/Command/SetCartRuleRestrictionsCommand.php
+++ b/src/Core/Domain/CartRule/Command/SetCartRuleRestrictionsCommand.php
@@ -102,20 +102,6 @@ public function setProductRestrictionRuleGroups(array $productRestrictionRuleGro
         return $this;
     }
 
-    /**
-     * It is possible to have this command empty if none of the restrictions are modified
-     *
-     * @todo: don't forget to adapt this method when all the other restrictions are added.
-     *
-     * @return bool
-     */
-    public function isEmpty(): bool
-    {
-        return null === $this->getRestrictedCartRuleIds()
-            && null === $this->getProductRestrictionRuleGroups()
-        ;
-    }
-
     /**
      * @return RestrictionRuleGroup[]|null
      */
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml b/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml
index 631f96a387d78..ec8fbb0c941aa 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml
@@ -66,7 +66,6 @@ services:
     autowire: true
     public: false
 
-
   PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler\SetCartRuleRestrictionsHandler:
     autowire: true
     public: false
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/SetCartRuleRestrictionsFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/SetCartRuleRestrictionsFeatureContext.php
index 097a5cea943c6..fc71ef90c643a 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/SetCartRuleRestrictionsFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/SetCartRuleRestrictionsFeatureContext.php
@@ -166,7 +166,7 @@ public function saveRestrictionRules(string $cartRuleReference): void
             unset($this->productRestrictionGroupsByReference[$cartRuleReference]);
         }
 
-        if ($command->isEmpty()) {
+        if (null === $command->getRestrictedCartRuleIds() && null === $command->getProductRestrictionRuleGroups()) {
             throw new RuntimeException(
                 sprintf(
                     '%s is empty for cart rule referenced as "%s". Did you forget to fill the restrictions in other steps?',
diff --git a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
index 0058853a008f4..b99ef79a3e76f 100644
--- a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
@@ -37,12 +37,7 @@ Feature: Set cart rule product restrictions in BO
     And I add product "product3" with following information:
       | name[en-US] | Shirt - Dom & Jquery |
       | type        | standard             |
-
-  # @todo: create cart rules once in first scenario, so they are not recreated before every scenario.
-  #  This step is temporary and should be replaced by step "Given there is a cart rule..." in background
-  #  when following PR is merged: https://github.com/PrestaShop/PrestaShop/pull/32483
-  Scenario: Create cart rules for further steps
-    And I create cart rule "rule_free_shipping_1" with following properties:
+    And there is a cart rule "rule_free_shipping_1" with following properties:
       | name[en-US]       | free shipping 1      |
       | is_active         | true                 |
       | allow_partial_use | false                |
@@ -53,7 +48,7 @@ Feature: Set cart rule product restrictions in BO
       | quantity_per_user | 10                   |
       | free_shipping     | true                 |
       | code              | rule_free_shipping_1 |
-    And I create cart rule "rule_50_percent" with following properties:
+    And there is a cart rule "rule_50_percent" with following properties:
       | name[en-US]                  | Half the price         |
       | is_active                    | true                   |
       | allow_partial_use            | true                   |
@@ -67,6 +62,8 @@ Feature: Set cart rule product restrictions in BO
       | discount_percentage          | 50                     |
       | apply_to_discounted_products | false                  |
       | discount_application_type    | order_without_shipping |
+    And I clear all product restrictions for cart rule rule_free_shipping_1
+    And I clear all product restrictions for cart rule rule_50_percent
     And cart rule "rule_free_shipping_1" should have no product restriction rules
     And cart rule "rule_50_percent" should have no product restriction rules
 
@@ -97,7 +94,6 @@ Feature: Set cart rule product restrictions in BO
     Then cart rule "rule_free_shipping_1" should have no product restriction rules
 
   Scenario: Restrict cart rule products by defining attribute matching rules
-    Given I clear all product restrictions for cart rule rule_50_percent
     When I add a restriction for cart rule rule_50_percent, which requires at least 7 products in cart matching one of these rules:
       | type       | references |
       | attributes | S,M        |
@@ -120,7 +116,6 @@ Feature: Set cart rule product restrictions in BO
     And cart rule "rule_free_shipping_1" should have no product restriction rules
 
   Scenario: Restrict cart rule products by defining category matching rules
-    Given I clear all product restrictions for cart rule rule_50_percent
     When I add a restriction for cart rule rule_50_percent, which requires at least 3 products in cart matching one of these rules:
       | type       | references |
       | categories | home       |
@@ -142,8 +137,6 @@ Feature: Set cart rule product restrictions in BO
       | categories | women       |
 
   Scenario: Restrict cart rule products by defining manufacturer matching rules
-    Given I clear all product restrictions for cart rule rule_50_percent
-    And I clear all product restrictions for cart rule rule_free_shipping_1
     When I add a restriction for cart rule rule_50_percent, which requires at least 2 products in cart matching one of these rules:
       | type          | references   |
       | manufacturers | studioDesign |
@@ -173,8 +166,6 @@ Feature: Set cart rule product restrictions in BO
       | manufacturers | studioDesign,graphicCorner |
 
   Scenario: Restrict cart rule products by defining manufacturer matching rules
-    Given I clear all product restrictions for cart rule rule_50_percent
-    And I clear all product restrictions for cart rule rule_free_shipping_1
     When I add a restriction for cart rule rule_50_percent, which requires at least 2 products in cart matching one of these rules:
       | type      | references      |
       | suppliers | fashionSupplier |
@@ -204,8 +195,6 @@ Feature: Set cart rule product restrictions in BO
       | suppliers | fashionSupplier,accessoriesSupplier |
 
   Scenario: Restrict cart rule products by defining mixed rules
-    Given I clear all product restrictions for cart rule rule_50_percent
-    And I clear all product restrictions for cart rule rule_free_shipping_1
     When I add a restriction for cart rule rule_free_shipping_1, which requires at least 1 product in cart matching one of these rules:
       | type       | references        |
       | products   | product1,product2 |
@@ -235,7 +224,6 @@ Feature: Set cart rule product restrictions in BO
       | manufacturers | graphicCorner                       |
 
   Scenario: Provide restrictions with empty list of rules
-    Given I clear all product restrictions for cart rule rule_free_shipping_1
     When I add a restriction for cart rule rule_free_shipping_1, which requires at least 1 product in cart matching one of these rules:
       | type     | references |
       | products |            |
@@ -243,7 +231,6 @@ Feature: Set cart rule product restrictions in BO
     And cart rule rule_free_shipping_1 should have no product restriction rules
 
   Scenario: Rule to require any quantity of product matching certain rules
-    Given I clear all product restrictions for cart rule rule_free_shipping_1
     When I add a restriction for cart rule rule_free_shipping_1, which requires any quantity of product in cart matching one of these rules:
       | type       | references  |
       | products   | product1    |
@@ -272,7 +259,6 @@ Feature: Set cart rule product restrictions in BO
       | manufacturers | graphicCorner |
 
   Scenario: Provide restriction group with empty list of restrictions
-    Given I clear all product restrictions for cart rule rule_50_percent
     When I add a restriction for cart rule rule_50_percent, which requires at least 1 product, but I provide empty list of rules
     Then I should get cart rule error about "empty restriction rules"
     And cart rule rule_50_percent should have no product restriction rules

From ad55eee1376d98737f1f3eaad70d698d75fdadb6 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Tue, 27 Jun 2023 16:38:33 +0300
Subject: [PATCH 0329/1030]  clean up some steps to stay more consistent and
 fix localizing columns vs rows in assertion

---
 .../Repository/CartRuleRepository.php         |  3 ++-
 .../CartRuleAssertionFeatureContext.php       |  2 +-
 .../SetCartRuleRestrictionsFeatureContext.php | 26 ++++++++++++-------
 ...cart_rule_combination_restrictions.feature | 12 +++++----
 .../set_mixed_cart_rule_restrictions.feature  |  3 +--
 .../CartRule/set_product_restrictions.feature |  3 +++
 6 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/src/Adapter/CartRule/Repository/CartRuleRepository.php b/src/Adapter/CartRule/Repository/CartRuleRepository.php
index 6a092d9aab0f1..e89bf1a2300fa 100644
--- a/src/Adapter/CartRule/Repository/CartRuleRepository.php
+++ b/src/Adapter/CartRule/Repository/CartRuleRepository.php
@@ -302,6 +302,8 @@ public function getRestrictedCartRuleIds(CartRuleId $cartRuleId): array
      */
     public function restrictCartRules(CartRuleId $cartRuleId, array $restrictedCartRuleIds): void
     {
+        $this->removeRestrictedCartRules($cartRuleId);
+
         if (empty($restrictedCartRuleIds)) {
             return;
         }
@@ -317,7 +319,6 @@ public function restrictCartRules(CartRuleId $cartRuleId, array $restrictedCartR
             $checkedIds[] = $restrictedCartRuleId;
         }
 
-        $this->removeRestrictedCartRules($cartRuleId);
         $this->connection->executeStatement(
             sprintf(
                 'INSERT INTO %s (`id_cart_rule_1`, `id_cart_rule_2`) VALUES %s',
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
index cb24aa9784088..9e5e51dea6572 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
@@ -154,7 +154,7 @@ public function assertCartRule(string $cartRuleReference, TableNode $tableNode):
     {
         $this->assertCartRuleProperties(
             $this->getCartRuleForEditing($cartRuleReference),
-            $this->localizeByColumns($tableNode)
+            $this->localizeByRows($tableNode)
         );
     }
 
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/SetCartRuleRestrictionsFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/SetCartRuleRestrictionsFeatureContext.php
index fc71ef90c643a..774d908a8e99b 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/SetCartRuleRestrictionsFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/SetCartRuleRestrictionsFeatureContext.php
@@ -63,15 +63,10 @@ class SetCartRuleRestrictionsFeatureContext extends AbstractCartRuleFeatureConte
      */
     public function setRestrictedCartRules(string $cartRuleReference, TableNode $tableNode): void
     {
-        $restrictedCartRuleIds = [];
-        foreach ($tableNode->getColumn(0) as $restrictedCartRuleReference) {
-            $restrictedCartRuleIds[] = $this->getSharedStorage()->get($restrictedCartRuleReference);
-        }
-
         $command = $this->getRestrictionsCommand($cartRuleReference);
 
         try {
-            $command->setRestrictedCartRuleIds($restrictedCartRuleIds);
+            $command->setRestrictedCartRuleIds($this->referencesToIds($tableNode->getRowsHash()['restricted cart rules']));
             $this->restrictionCommandsByReference[$cartRuleReference] = $command;
         } catch (CartRuleConstraintException $e) {
             $this->setLastException($e);
@@ -143,13 +138,26 @@ public function clearProductRestrictionRules(string $cartRuleReference): void
         $command = $this->getRestrictionsCommand($cartRuleReference);
         $command->setProductRestrictionRuleGroups([]);
 
-        $this->getCommandBus()->handle($command);
         $this->restrictionCommandsByReference[$cartRuleReference] = $command;
-        unset($this->productRestrictionGroupsByReference[$cartRuleReference]);
+        $this->productRestrictionGroupsByReference[$cartRuleReference] = [];
+    }
+
+    /**
+     * @When I clear cart rule combination restrictions for cart rule :cartRuleReference
+     *
+     * @param string $cartRuleReference
+     *
+     * @return void
+     */
+    public function clearCartRuleCombinationRestrictions(string $cartRuleReference): void
+    {
+        $command = $this->getRestrictionsCommand($cartRuleReference);
+        $command->setRestrictedCartRuleIds([]);
+
+        $this->restrictionCommandsByReference[$cartRuleReference] = $command;
     }
 
     /**
-     * @When I save product restrictions for cart rule :cartRuleReference
      * @When I save all the restrictions for cart rule :cartRuleReference
      *
      * @param string $cartRuleReference
diff --git a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_cart_rule_combination_restrictions.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_cart_rule_combination_restrictions.feature
index 6bb1a3773b9da..5b4c4a5ffd8b7 100644
--- a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_cart_rule_combination_restrictions.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_cart_rule_combination_restrictions.feature
@@ -62,7 +62,7 @@ Feature: Set cart rule combination restrictions in BO
 
   Scenario: Restrict cart rule combinations
     When I restrict following cart rules for cart rule rule_free_shipping_1:
-      | rule_50_percent |
+      | restricted cart rules | rule_50_percent |
     And I save all the restrictions for cart rule rule_free_shipping_1
     Then cart rule "rule_free_shipping_1" should have the following properties:
       | restricted cart rules | rule_50_percent |
@@ -71,8 +71,7 @@ Feature: Set cart rule combination restrictions in BO
     And cart rule "rule_70_percent" should have the following properties:
       | restricted cart rules |  |
     When I restrict following cart rules for cart rule rule_free_shipping_1:
-      | rule_50_percent |
-      | rule_70_percent |
+      | restricted cart rules | rule_50_percent,rule_70_percent |
     And I save all the restrictions for cart rule rule_free_shipping_1
     Then cart rule "rule_free_shipping_1" should have the following properties:
       | restricted cart rules | rule_50_percent,rule_70_percent |
@@ -80,6 +79,10 @@ Feature: Set cart rule combination restrictions in BO
       | restricted cart rules | rule_free_shipping_1 |
     And cart rule "rule_70_percent" should have the following properties:
       | restricted cart rules | rule_free_shipping_1 |
+    When I clear cart rule combination restrictions for cart rule rule_70_percent
+    And I save all the restrictions for cart rule rule_70_percent
+    Then cart rule "rule_70_percent" should have the following properties:
+      | restricted cart rules |  |
     And cart rule rule_free_shipping_1 should have no product restriction rules
     And cart rule rule_50_percent should have no product restriction rules
 
@@ -95,8 +98,7 @@ Feature: Set cart rule combination restrictions in BO
     Given cart rule "rule_70_percent" should have the following properties:
       | restricted cart rules |  |
     When I restrict following cart rules for cart rule rule_70_percent:
-      | rule_50_percent |
-      | rule_70_percent |
+      | restricted cart rules | rule_50_percent,rule_70_percent |
     Then I should get cart rule error about "invalid cart rule restriction"
     And cart rule "rule_70_percent" should have the following properties:
       | restricted cart rules |  |
diff --git a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_mixed_cart_rule_restrictions.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_mixed_cart_rule_restrictions.feature
index 1724e67a80cc7..05b8a7b46e1f7 100644
--- a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_mixed_cart_rule_restrictions.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_mixed_cart_rule_restrictions.feature
@@ -85,8 +85,7 @@ Feature: Set cart rule restrictions in BO
 
   Scenario: Restrict cart rule combinations and various products restrictions
     When I restrict following cart rules for cart rule rule_free_shipping_1:
-      | rule_50_percent |
-      | rule_70_percent |
+      | restricted cart rules | rule_50_percent,rule_70_percent |
     And I add a restriction for cart rule rule_free_shipping_1, which requires at least 1 product in cart matching one of these rules:
       | type          | references                 |
       | products      | product1                   |
diff --git a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
index b99ef79a3e76f..caeb13a9e1ae2 100644
--- a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
@@ -64,6 +64,8 @@ Feature: Set cart rule product restrictions in BO
       | discount_application_type    | order_without_shipping |
     And I clear all product restrictions for cart rule rule_free_shipping_1
     And I clear all product restrictions for cart rule rule_50_percent
+    And I save all the restrictions for cart rule rule_free_shipping_1
+    And I save all the restrictions for cart rule rule_50_percent
     And cart rule "rule_free_shipping_1" should have no product restriction rules
     And cart rule "rule_50_percent" should have no product restriction rules
 
@@ -91,6 +93,7 @@ Feature: Set cart rule product restrictions in BO
       | products | product3   |
     And cart rule "rule_50_percent" should have no product restriction rules
     When I clear all product restrictions for cart rule rule_free_shipping_1
+    And I save all the restrictions for cart rule rule_free_shipping_1
     Then cart rule "rule_free_shipping_1" should have no product restriction rules
 
   Scenario: Restrict cart rule products by defining attribute matching rules

From 532cfd838332569567cda697bfe754e98a3c1149 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Wed, 28 Jun 2023 12:48:39 +0300
Subject: [PATCH 0330/1030]  add back getters and setters for commands and vo

---
 .../SetCartRuleRestrictionsHandler.php        |  2 +-
 .../Repository/CartRuleRepository.php         |  8 ++--
 .../SetCartRuleRestrictionsCommand.php        | 12 +++++-
 .../CartRuleRestrictionsForEditing.php        | 32 ++++++++++++++-
 .../Restriction/RestrictionRule.php           | 34 ++++++++++++++--
 .../Restriction/RestrictionRuleGroup.php      | 40 ++++++++++++++++++-
 .../AbstractCartRuleFeatureContext.php        |  2 +-
 .../CartRuleAssertionFeatureContext.php       | 14 +++----
 8 files changed, 121 insertions(+), 23 deletions(-)

diff --git a/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php b/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php
index e5eee7b17dd32..602f3b150ee6a 100644
--- a/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php
+++ b/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php
@@ -48,7 +48,7 @@ public function handle(SetCartRuleRestrictionsCommand $command): void
             return;
         }
 
-        $cartRule = $this->cartRuleRepository->get($command->cartRuleId);
+        $cartRule = $this->cartRuleRepository->get($command->getCartRuleId());
 
         $restrictedCartRuleIds = $command->getRestrictedCartRuleIds();
         if (null !== $restrictedCartRuleIds) {
diff --git a/src/Adapter/CartRule/Repository/CartRuleRepository.php b/src/Adapter/CartRule/Repository/CartRuleRepository.php
index e89bf1a2300fa..9e4bfe45d199e 100644
--- a/src/Adapter/CartRule/Repository/CartRuleRepository.php
+++ b/src/Adapter/CartRule/Repository/CartRuleRepository.php
@@ -106,14 +106,14 @@ public function setProductRestrictions(CartRuleId $cartRuleId, array $restrictio
                 ->insert($this->dbPrefix . 'cart_rule_product_rule_group')
                 ->values([
                     'id_cart_rule' => $cartRuleId->getValue(),
-                    'quantity' => $restrictionRuleGroup->requiredQuantityInCart,
+                    'quantity' => $restrictionRuleGroup->getRequiredQuantityInCart(),
                 ])
                 ->execute()
             ;
 
             $productRuleGroupId = $this->connection->lastInsertId();
 
-            foreach ($restrictionRuleGroup->restrictionRules as $restrictionRule) {
+            foreach ($restrictionRuleGroup->getRestrictionRules() as $restrictionRule) {
                 $this->connection->createQueryBuilder()
                     ->insert($this->dbPrefix . 'cart_rule_product_rule')
                     ->values([
@@ -121,14 +121,14 @@ public function setProductRestrictions(CartRuleId $cartRuleId, array $restrictio
                         'type' => ':type',
                     ])
                     ->setParameter('productRuleGroupId', $productRuleGroupId)
-                    ->setParameter('type', $restrictionRule->type)
+                    ->setParameter('type', $restrictionRule->getType())
                     ->execute()
                 ;
 
                 $productRuleId = $this->connection->lastInsertId();
                 $productRuleValues = [];
                 $checkedIds = [];
-                foreach ($restrictionRule->ids as $id) {
+                foreach ($restrictionRule->getEntityIds() as $id) {
                     if (in_array($id, $checkedIds, true)) {
                         // skip in case there are duplicates
                         continue;
diff --git a/src/Core/Domain/CartRule/Command/SetCartRuleRestrictionsCommand.php b/src/Core/Domain/CartRule/Command/SetCartRuleRestrictionsCommand.php
index e3828f0a16fc8..0767164d8f62a 100644
--- a/src/Core/Domain/CartRule/Command/SetCartRuleRestrictionsCommand.php
+++ b/src/Core/Domain/CartRule/Command/SetCartRuleRestrictionsCommand.php
@@ -38,7 +38,7 @@
  */
 class SetCartRuleRestrictionsCommand
 {
-    public readonly CartRuleId $cartRuleId;
+    private readonly CartRuleId $cartRuleId;
 
     /**
      * @var CartRuleId[]|null
@@ -59,6 +59,14 @@ public function __construct(
         $this->cartRuleId = new CartRuleId($cartRuleId);
     }
 
+    /**
+     * @return CartRuleId
+     */
+    public function getCartRuleId(): CartRuleId
+    {
+        return $this->cartRuleId;
+    }
+
     /**
      * @param int[] $restrictedCartRuleIds
      *
@@ -70,7 +78,7 @@ public function setRestrictedCartRuleIds(array $restrictedCartRuleIds): self
     {
         $this->restrictedCartRuleIds = [];
         foreach ($restrictedCartRuleIds as $restrictedCartRuleId) {
-            if ($restrictedCartRuleId === $this->cartRuleId->getValue()) {
+            if ($restrictedCartRuleId === $this->getCartRuleId()->getValue()) {
                 throw new CartRuleConstraintException(
                     'Restricted CartRule ids cannot contain id of current cart rule',
                     CartRuleConstraintException::INVALID_CART_RULE_RESTRICTION
diff --git a/src/Core/Domain/CartRule/QueryResult/CartRuleRestrictionsForEditing.php b/src/Core/Domain/CartRule/QueryResult/CartRuleRestrictionsForEditing.php
index 16af3f13ea227..b554db16d3d24 100644
--- a/src/Core/Domain/CartRule/QueryResult/CartRuleRestrictionsForEditing.php
+++ b/src/Core/Domain/CartRule/QueryResult/CartRuleRestrictionsForEditing.php
@@ -32,6 +32,16 @@
 
 class CartRuleRestrictionsForEditing
 {
+    /**
+     * @var int[]
+     */
+    private array $restrictedCartRuleIds;
+
+    /**
+     * @var RestrictionRuleGroup[]
+     */
+    private array $productRestrictionRuleGroups;
+
     /**
      * @todo: fill other restrictions when related commands are implemented
      *
@@ -39,8 +49,26 @@ class CartRuleRestrictionsForEditing
      * @param RestrictionRuleGroup[] $productRestrictionRuleGroups
      */
     public function __construct(
-        public readonly array $restrictedCartRuleIds,
-        public readonly array $productRestrictionRuleGroups
+        array $restrictedCartRuleIds,
+        array $productRestrictionRuleGroups
     ) {
+        $this->restrictedCartRuleIds = $restrictedCartRuleIds;
+        $this->productRestrictionRuleGroups = $productRestrictionRuleGroups;
+    }
+
+    /**
+     * @return int[]
+     */
+    public function getRestrictedCartRuleIds(): array
+    {
+        return $this->restrictedCartRuleIds;
+    }
+
+    /**
+     * @return RestrictionRuleGroup[]
+     */
+    public function getProductRestrictionRuleGroups(): array
+    {
+        return $this->productRestrictionRuleGroups;
     }
 }
diff --git a/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRule.php b/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRule.php
index 55a74bfdb4aaa..414892a4ab040 100644
--- a/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRule.php
+++ b/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRule.php
@@ -45,16 +45,42 @@ class RestrictionRule
         self::TYPE_SUPPLIER => self::TYPE_SUPPLIER,
     ];
 
+    private readonly string $type;
+
+    /**
+     * @var int[] Ids of product, attributes, categories, manufacturers or suppliers, depending on restriction rule type
+     */
+    private readonly array $entityIds;
+
     /**
      * @param string $type
-     * @param int[] $ids Ids of product, attributes, categories, manufacturers or suppliers, depending on restriction rule type
+     * @param int[] $entityIds
      */
     public function __construct(
-        public readonly string $type,
-        public readonly array $ids
+        string $type,
+        array $entityIds
     ) {
         $this->assertType($type);
-        $this->assertIds($ids);
+        $this->assertIds($entityIds);
+
+        $this->type = $type;
+        $this->entityIds = $entityIds;
+    }
+
+    /**
+     * @return string
+     */
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    /**
+     * @return int[]
+     */
+    public function getEntityIds(): array
+    {
+        return $this->entityIds;
     }
 
     /**
diff --git a/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRuleGroup.php b/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRuleGroup.php
index 8a5850811960e..9c4d487c990c8 100644
--- a/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRuleGroup.php
+++ b/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRuleGroup.php
@@ -32,15 +32,51 @@
 
 class RestrictionRuleGroup
 {
+    private int $requiredQuantityInCart;
+
+    /**
+     * @var RestrictionRule[]
+     */
+    private array $restrictionRules;
+
     /**
      * @param int $requiredQuantityInCart
      * @param RestrictionRule[] $restrictionRules
      */
     public function __construct(
-        public readonly int $requiredQuantityInCart,
-        public readonly array $restrictionRules
+        int $requiredQuantityInCart,
+        array $restrictionRules
     ) {
+        $this->assertQuantityIsNotNegative($requiredQuantityInCart);
         $this->assertRestrictionRules($restrictionRules);
+        $this->requiredQuantityInCart = $requiredQuantityInCart;
+        $this->restrictionRules = $restrictionRules;
+    }
+
+    /**
+     * @return int
+     */
+    public function getRequiredQuantityInCart(): int
+    {
+        return $this->requiredQuantityInCart;
+    }
+
+    /**
+     * @return RestrictionRule[]
+     */
+    public function getRestrictionRules(): array
+    {
+        return $this->restrictionRules;
+    }
+
+    private function assertQuantityIsNotNegative(int $quantity): void
+    {
+        if ($quantity < 0) {
+            throw new CartRuleConstraintException(
+                'Restrictions required quantity in cart cannot be negative',
+                CartRuleConstraintException::INVALID_QUANTITY
+            );
+        }
     }
 
     /**
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
index bcf474e417690..7ccde7d8adb3b 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
@@ -289,7 +289,7 @@ protected function assertCartRuleProperties(CartRuleForEditing $cartRuleForEditi
             $expectedRestrictedCartRuleIds = $this->referencesToIds($expectedData['restricted cart rules']);
             Assert::assertSame(
                 $expectedRestrictedCartRuleIds,
-                $conditions->getRestrictions()->restrictedCartRuleIds,
+                $conditions->getRestrictions()->getRestrictedCartRuleIds(),
                 'Unexpected cart rule restrictions'
             );
         }
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
index 9e5e51dea6572..0c2cf71000347 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/CartRuleAssertionFeatureContext.php
@@ -166,7 +166,7 @@ public function assertCartRule(string $cartRuleReference, TableNode $tableNode):
     public function assertNoProductRestrictionRules(string $cartRuleReference): void
     {
         Assert::assertEmpty(
-            $this->getCartRuleForEditing($cartRuleReference)->getConditions()->getRestrictions()->productRestrictionRuleGroups,
+            $this->getCartRuleForEditing($cartRuleReference)->getConditions()->getRestrictions()->getProductRestrictionRuleGroups(),
             'Cart rule was expecting to have empty product restriction rule groups'
         );
     }
@@ -181,7 +181,7 @@ public function assertProductRestrictionGroups(string $cartRuleReference, TableN
         $actualRestrictionGroups = $this->getCartRuleForEditing($cartRuleReference)
             ->getConditions()
             ->getRestrictions()
-            ->productRestrictionRuleGroups
+            ->getProductRestrictionRuleGroups()
         ;
         $expectedDataRows = $tableNode->getColumnsHash();
         Assert::assertCount(count($expectedDataRows), $actualRestrictionGroups, 'Unexpected product restriction groups count');
@@ -190,12 +190,12 @@ public function assertProductRestrictionGroups(string $cartRuleReference, TableN
             $actualGroup = $actualRestrictionGroups[$key];
             Assert::assertEquals(
                 $expectedDataRow['quantity'],
-                $actualGroup->requiredQuantityInCart,
+                $actualGroup->getRequiredQuantityInCart(),
                 'Unexpected required quantity in cart in restriction group'
             );
             Assert::assertCount(
                 (int) $expectedDataRow['rules count'],
-                $actualGroup->restrictionRules,
+                $actualGroup->getRestrictionRules(),
                 sprintf('Unexpected rules count in restriction group referenced as "%s"', $expectedDataRow['groupReference'])
             );
 
@@ -224,7 +224,7 @@ public function assertProductRestrictionRules(string $restrictionGroupReference,
         $group = $this->getSharedStorage()->get($restrictionGroupReference);
         Assert::assertInstanceOf(RestrictionRuleGroup::class, $group);
 
-        $actualRules = $group->restrictionRules;
+        $actualRules = $group->getRestrictionRules();
         $expectedDataRows = $tableNode->getColumnsHash();
 
         Assert::assertCount(count($expectedDataRows), $actualRules, 'Unexpected product restriction rules count in group');
@@ -232,8 +232,8 @@ public function assertProductRestrictionRules(string $restrictionGroupReference,
         foreach ($expectedDataRows as $key => $expectedRow) {
             /** @var RestrictionRule $actualRule */
             $actualRule = $actualRules[$key];
-            Assert::assertSame($expectedRow['type'], $actualRule->type);
-            Assert::assertSame($this->referencesToIds($expectedRow['references']), $actualRule->ids);
+            Assert::assertSame($expectedRow['type'], $actualRule->getType());
+            Assert::assertSame($this->referencesToIds($expectedRow['references']), $actualRule->getEntityIds());
         }
     }
 }

From a17342db2463468a6a95ec2d5ac6fa7b4159946a Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Wed, 28 Jun 2023 12:58:30 +0300
Subject: [PATCH 0331/1030]  clear up commands state after executing them in
 behat

---
 .../Domain/CartRule/SetCartRuleRestrictionsFeatureContext.php   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/SetCartRuleRestrictionsFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/SetCartRuleRestrictionsFeatureContext.php
index 774d908a8e99b..2c99e33f6ecf8 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/SetCartRuleRestrictionsFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/SetCartRuleRestrictionsFeatureContext.php
@@ -188,6 +188,8 @@ public function saveRestrictionRules(string $cartRuleReference): void
             $this->getCommandBus()->handle($command);
         } catch (CartRuleConstraintException $e) {
             $this->setLastException($e);
+        } finally {
+            unset($this->restrictionCommandsByReference[$cartRuleReference]);
         }
     }
 

From 5e02fac6709a81f8ac8fcc2dd240c47e8e301213 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Wed, 28 Jun 2023 13:08:01 +0300
Subject: [PATCH 0332/1030]  clean up restrictions in background juts in case
 additional scenarios are added

---
 .../set_mixed_cart_rule_restrictions.feature        | 13 ++++++++++---
 .../CartRule/set_product_restrictions.feature       |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_mixed_cart_rule_restrictions.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_mixed_cart_rule_restrictions.feature
index 05b8a7b46e1f7..7f527c123dac3 100644
--- a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_mixed_cart_rule_restrictions.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_mixed_cart_rule_restrictions.feature
@@ -35,7 +35,7 @@ Feature: Set cart rule restrictions in BO
     And I add product "product3" with following information:
       | name[en-US] | Shirt - Dom & Jquery |
       | type        | standard             |
-    And I create cart rule "rule_free_shipping_1" with following properties:
+    And there is a cart rule "rule_free_shipping_1" with following properties:
       | name[en-US]       | free shipping 1      |
       | is_active         | true                 |
       | allow_partial_use | false                |
@@ -46,7 +46,7 @@ Feature: Set cart rule restrictions in BO
       | quantity_per_user | 10                   |
       | free_shipping     | true                 |
       | code              | rule_free_shipping_1 |
-    And I create cart rule "rule_50_percent" with following properties:
+    And there is a cart rule "rule_50_percent" with following properties:
       | name[en-US]                  | Half the price         |
       | is_active                    | true                   |
       | allow_partial_use            | true                   |
@@ -60,7 +60,7 @@ Feature: Set cart rule restrictions in BO
       | discount_percentage          | 50                     |
       | apply_to_discounted_products | false                  |
       | discount_application_type    | order_without_shipping |
-    And I create cart rule "rule_70_percent" with following properties:
+    And there is a cart rule "rule_70_percent" with following properties:
       | name[en-US]                  | Half the price         |
       | is_active                    | true                   |
       | allow_partial_use            | true                   |
@@ -74,6 +74,12 @@ Feature: Set cart rule restrictions in BO
       | discount_percentage          | 70                     |
       | apply_to_discounted_products | false                  |
       | discount_application_type    | order_without_shipping |
+    And I clear cart rule combination restrictions for cart rule rule_free_shipping_1
+    And I clear all product restrictions for cart rule rule_free_shipping_1
+    And I clear cart rule combination restrictions for cart rule rule_50_percent
+    And I clear all product restrictions for cart rule rule_50_percent
+    And I clear cart rule combination restrictions for cart rule rule_70_percent
+    And I clear all product restrictions for cart rule rule_70_percent
     And cart rule "rule_free_shipping_1" should have the following properties:
       | restricted cart rules |  |
     And cart rule "rule_50_percent" should have the following properties:
@@ -82,6 +88,7 @@ Feature: Set cart rule restrictions in BO
       | restricted cart rules |  |
     And cart rule rule_free_shipping_1 should have no product restriction rules
     And cart rule rule_50_percent should have no product restriction rules
+    And cart rule rule_70_percent should have no product restriction rules
 
   Scenario: Restrict cart rule combinations and various products restrictions
     When I restrict following cart rules for cart rule rule_free_shipping_1:
diff --git a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
index caeb13a9e1ae2..aaf8cf5b2ee5b 100644
--- a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
@@ -168,7 +168,7 @@ Feature: Set cart rule product restrictions in BO
       | type          | references                 |
       | manufacturers | studioDesign,graphicCorner |
 
-  Scenario: Restrict cart rule products by defining manufacturer matching rules
+  Scenario: Restrict cart rule products by defining supplier matching rules
     When I add a restriction for cart rule rule_50_percent, which requires at least 2 products in cart matching one of these rules:
       | type      | references      |
       | suppliers | fashionSupplier |

From 781363bf56e65d1d1474debf05563de354f0dbe2 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Wed, 28 Jun 2023 13:34:30 +0300
Subject: [PATCH 0333/1030]  add steps to modify restrictions at least twice on
 same id rule and check that rules can be removed when passing empty array

---
 .../CartRule/set_product_restrictions.feature   | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
index aaf8cf5b2ee5b..e8c9f4174e525 100644
--- a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_product_restrictions.feature
@@ -225,6 +225,23 @@ Feature: Set cart rule product restrictions in BO
       | type          | references                          |
       | suppliers     | fashionSupplier,accessoriesSupplier |
       | manufacturers | graphicCorner                       |
+    # We add some restrictions again to already existing rule to see if all previously added rules are replaced correctly
+    When I add a restriction for cart rule rule_free_shipping_1, which requires at least 4 products in cart matching one of these rules:
+      | type       | references        |
+      | products   | product3          |
+      | categories | women             |
+    And I save all the restrictions for cart rule rule_free_shipping_1
+    Then cart rule "rule_free_shipping_1" should have the following product restriction rule groups:
+      | groupReference | quantity | rules count |
+      | free_nr_1      | 4        | 2           |
+    And the cart rule restriction group "free_nr_1" should have the following rules:
+      | type       | references        |
+      | products   | product3          |
+      | categories | women             |
+    # Checking that previous product restrictions can be removed
+    And I clear all product restrictions for cart rule rule_free_shipping_1
+    And I save all the restrictions for cart rule rule_free_shipping_1
+    Then cart rule "rule_free_shipping_1" should have no product restriction rules
 
   Scenario: Provide restrictions with empty list of rules
     When I add a restriction for cart rule rule_free_shipping_1, which requires at least 1 product in cart matching one of these rules:

From 74aff31f7e26af688c5eb3bc07d39fca3423aacf Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Mon, 26 Jun 2023 13:27:28 +0300
Subject: [PATCH 0334/1030]  add export action to feature value list

---
 .../FeatureValueGridDefinitionFactory.php     | 34 +-------
 .../Grid/Factory/FeatureValueGridFactory.php  | 78 ++++++++++++++++++-
 .../Sell/Catalog/FeatureValueController.php   | 34 ++++++++
 .../routing/admin/sell/catalog/features.yml   |  7 ++
 4 files changed, 118 insertions(+), 35 deletions(-)

diff --git a/src/Core/Grid/Definition/Factory/FeatureValueGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/FeatureValueGridDefinitionFactory.php
index 6a5a4052cc832..80f4977558d13 100644
--- a/src/Core/Grid/Definition/Factory/FeatureValueGridDefinitionFactory.php
+++ b/src/Core/Grid/Definition/Factory/FeatureValueGridDefinitionFactory.php
@@ -33,8 +33,6 @@
 use PrestaShop\PrestaShop\Core\Grid\Action\GridActionCollectionInterface;
 use PrestaShop\PrestaShop\Core\Grid\Action\Row\RowActionCollection;
 use PrestaShop\PrestaShop\Core\Grid\Action\Row\Type\LinkRowAction;
-use PrestaShop\PrestaShop\Core\Grid\Action\Type\LinkGridAction;
-use PrestaShop\PrestaShop\Core\Grid\Action\Type\SimpleGridAction;
 use PrestaShop\PrestaShop\Core\Grid\Column\ColumnCollection;
 use PrestaShop\PrestaShop\Core\Grid\Column\ColumnCollectionInterface;
 use PrestaShop\PrestaShop\Core\Grid\Column\Type\Common\ActionColumn;
@@ -130,36 +128,8 @@ protected function getColumns(): ColumnCollectionInterface
      */
     protected function getGridActions(): GridActionCollectionInterface
     {
-        return (new GridActionCollection())
-            ->add((new LinkGridAction('import'))
-            ->setName($this->trans('Import', [], 'Admin.Actions'))
-            ->setIcon('cloud_upload')
-            ->setOptions([
-                'route' => 'admin_import',
-                'route_params' => [
-                    'import_type' => 'features',
-                ],
-            ])
-            )
-            ->add((new LinkGridAction('export'))
-            ->setName($this->trans('Export', [], 'Admin.Actions'))
-            ->setIcon('cloud_download')
-            ->setOptions([
-                'route' => 'admin_features_export',
-            ])
-            )
-            ->add((new SimpleGridAction('common_refresh_list'))
-            ->setName($this->trans('Refresh list', [], 'Admin.Advparameters.Feature'))
-            ->setIcon('refresh')
-            )
-            ->add((new SimpleGridAction('common_show_query'))
-            ->setName($this->trans('Show SQL query', [], 'Admin.Actions'))
-            ->setIcon('code')
-            )
-            ->add((new SimpleGridAction('common_export_sql_manager'))
-            ->setName($this->trans('Export to SQL Manager', [], 'Admin.Actions'))
-            ->setIcon('storage')
-            );
+        // actions are filled in FeatureValueGridFactory
+        return new GridActionCollection();
     }
 
     /**
diff --git a/src/Core/Grid/Factory/FeatureValueGridFactory.php b/src/Core/Grid/Factory/FeatureValueGridFactory.php
index 98f3afcb4e505..b4eb682e3415d 100644
--- a/src/Core/Grid/Factory/FeatureValueGridFactory.php
+++ b/src/Core/Grid/Factory/FeatureValueGridFactory.php
@@ -32,6 +32,8 @@
 use PrestaShop\PrestaShop\Core\Domain\Feature\ValueObject\FeatureId;
 use PrestaShop\PrestaShop\Core\Domain\Language\ValueObject\LanguageId;
 use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
+use PrestaShop\PrestaShop\Core\Grid\Action\Type\LinkGridAction;
+use PrestaShop\PrestaShop\Core\Grid\Action\Type\SimpleGridAction;
 use PrestaShop\PrestaShop\Core\Grid\Data\Factory\GridDataFactoryInterface;
 use PrestaShop\PrestaShop\Core\Grid\Definition\Factory\GridDefinitionFactoryInterface;
 use PrestaShop\PrestaShop\Core\Grid\Definition\GridDefinition;
@@ -45,6 +47,7 @@
 use PrestaShop\PrestaShop\Core\Search\Filters\FeatureValueFilters;
 use PrestaShopBundle\Form\Admin\Type\SearchAndResetType;
 use Symfony\Component\DependencyInjection\Container;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * This class allows adapting the feature value grid definition with dynamic values
@@ -68,7 +71,8 @@ public function __construct(
         GridDataFactoryInterface $dataFactory,
         GridFilterFormFactoryInterface $filterFormFactory,
         HookDispatcherInterface $hookDispatcher,
-        protected readonly FeatureRepository $featureRepository
+        protected readonly FeatureRepository $featureRepository,
+        protected readonly TranslatorInterface $translator
     ) {
         parent::__construct($definitionFactory, $dataFactory, $filterFormFactory, $hookDispatcher);
     }
@@ -104,15 +108,37 @@ public function getGrid(SearchCriteriaInterface $searchCriteria): GridInterface
         );
     }
 
-    private function modifyDefinition(GridDefinition $definition, FeatureValueFilters $featureValueFilters): void
+    /**
+     * Some modifications are needed in order to fill some required dynamic values coming from request (which are in filters like the $featureId)
+     *
+     * @param GridDefinition $definition
+     * @param FeatureValueFilters $featureValueFilters
+     *
+     * @return void
+     */
+    protected function modifyDefinition(GridDefinition $definition, FeatureValueFilters $featureValueFilters): void
     {
         $definition->setName($this->featureRepository->getFeatureName(
             new FeatureId($featureValueFilters->getFeatureId()),
             new LanguageId($featureValueFilters->getLanguageId())
         ));
 
+        $this->addFilters($definition, $featureValueFilters);
+        $this->addGridActions($definition, $featureValueFilters);
+    }
+
+    /**
+     * Add filter rows which requires dynamic values from request such as $featureId.
+     *
+     * @param GridDefinition $definition
+     * @param FeatureValueFilters $featureValueFilters
+     *
+     * @return void
+     */
+    protected function addFilters(GridDefinition $definition, FeatureValueFilters $featureValueFilters): void
+    {
         $definition->getFilters()->add((new Filter('actions', SearchAndResetType::class))
-            // action options are added in FeatureValueGridFactory, because they are dynamic and depend on filters
+            // these action options are added in FeatureValueGridFactory, because they are dynamic and depend on filters
             ->setAssociatedColumn('actions')
             ->setAssociatedColumn('actions')
             ->setTypeOptions([
@@ -127,4 +153,50 @@ private function modifyDefinition(GridDefinition $definition, FeatureValueFilter
             ])
         );
     }
+
+    /**
+     * Most of these actions could have been added statically in definition factory, but the export action requires
+     * $featureId which comes from filters, therefore to maintain actions order and avoid complication we fill all of those actions here.
+     *
+     * @param GridDefinition $definition
+     * @param FeatureValueFilters $featureValueFilters
+     *
+     * @return void
+     */
+    protected function addGridActions(GridDefinition $definition, FeatureValueFilters $featureValueFilters): void
+    {
+        $definition->getGridActions()
+            ->add((new LinkGridAction('import'))
+            ->setName($this->translator->trans('Import', [], 'Admin.Actions'))
+            ->setIcon('cloud_upload')
+            ->setOptions([
+                'route' => 'admin_import',
+                'route_params' => [
+                    'import_type' => 'features',
+                ],
+            ])
+            )
+            ->add((new LinkGridAction('export'))
+            ->setName($this->translator->trans('Export', [], 'Admin.Actions'))
+            ->setIcon('cloud_download')
+            ->setOptions([
+                'route' => 'admin_feature_values_export',
+                'route_params' => [
+                    'featureId' => $featureValueFilters->getFeatureId(),
+                ],
+            ])
+            )
+            ->add((new SimpleGridAction('common_refresh_list'))
+            ->setName($this->translator->trans('Refresh list', [], 'Admin.Advparameters.Feature'))
+            ->setIcon('refresh')
+            )
+            ->add((new SimpleGridAction('common_show_query'))
+            ->setName($this->translator->trans('Show SQL query', [], 'Admin.Actions'))
+            ->setIcon('code')
+            )
+            ->add((new SimpleGridAction('common_export_sql_manager'))
+            ->setName($this->translator->trans('Export to SQL Manager', [], 'Admin.Actions'))
+            ->setIcon('storage')
+            );
+    }
 }
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
index 8d942ba7a0925..7f39699c3c073 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
@@ -32,6 +32,7 @@
 use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\FeatureValueNotFoundException;
 use PrestaShop\PrestaShop\Core\Grid\Factory\FeatureValueGridFactory;
 use PrestaShop\PrestaShop\Core\Search\Filters\FeatureValueFilters;
+use PrestaShopBundle\Component\CsvResponse;
 use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
 use PrestaShopBundle\Security\Annotation\AdminSecurity;
 use Symfony\Component\HttpFoundation\Request;
@@ -155,6 +156,39 @@ public function editAction(int $featureId, int $featureValueId, Request $request
         ]);
     }
 
+    /**
+     * @AdminSecurity("is_granted('read', request.get('_legacy_controller'))")
+     *
+     * @param FeatureValueFilters $filters
+     *
+     * @return CsvResponse
+     */
+    public function exportAction(FeatureValueFilters $filters): CsvResponse
+    {
+        $filters = new FeatureValueFilters(['limit' => null] + $filters->all());
+
+        $gridFactory = $this->get(FeatureValueGridFactory::class);
+
+        $headers = [
+            'id_feature_value' => $this->trans('ID', 'Admin.Global'),
+            'value' => $this->trans('Value', 'Admin.Global'),
+        ];
+
+        $data = [];
+
+        foreach ($gridFactory->getGrid($filters)->getData()->getRecords()->all() as $record) {
+            $data[] = [
+                'id_feature_value' => $record['id_feature_value'],
+                'value' => $record['value'],
+            ];
+        }
+
+        return (new CsvResponse())
+            ->setData($data)
+            ->setHeadersData($headers)
+            ->setFileName('feature_' . $filters->getFeatureId() . '_values_' . date('Y-m-d_His') . '.csv');
+    }
+
     /**
      * @return array<string, string|array<int, string>>
      */
diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml
index 47f2e7316ff22..c641f24d043a2 100644
--- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml
+++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml
@@ -127,3 +127,10 @@ admin_feature_values_edit:
     _legacy_feature_flag: feature
     redirectQueryParamsToKeep:
       - 'featureId'
+
+admin_feature_values_export:
+  path: /{featureId}/values/export
+  methods: GET
+  defaults:
+    _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureValueController::exportAction
+    _legacy_controller: AdminFeatures

From d257a74149f194515c95bdf63f76bb787fabe62e Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Mon, 26 Jun 2023 13:57:17 +0300
Subject: [PATCH 0335/1030]  init delete and bulk delete values handlers

---
 .../BulkDeleteFeatureValueHandler.php         | 82 +++++++++++++++++++
 .../DeleteFeatureValueHandler.php             | 46 +++++++++++
 .../Repository/FeatureValueRepository.php     |  6 ++
 .../Command/BulkDeleteFeatureValueCommand.php | 52 ++++++++++++
 .../Command/DeleteFeatureValueCommand.php     | 41 ++++++++++
 ...BulkDeleteFeatureValueHandlerInterface.php | 34 ++++++++
 .../DeleteFeatureValueHandlerInterface.php    | 34 ++++++++
 .../Exception/BulkFeatureValueException.php   | 59 +++++++++++++
 .../CannotDeleteFeatureValueException.php     | 33 ++++++++
 .../config/services/adapter/feature.yml       | 14 ++++
 10 files changed, 401 insertions(+)
 create mode 100644 src/Adapter/Feature/CommandHandler/BulkDeleteFeatureValueHandler.php
 create mode 100644 src/Adapter/Feature/CommandHandler/DeleteFeatureValueHandler.php
 create mode 100644 src/Core/Domain/Feature/Command/BulkDeleteFeatureValueCommand.php
 create mode 100644 src/Core/Domain/Feature/Command/DeleteFeatureValueCommand.php
 create mode 100644 src/Core/Domain/Feature/CommandHandler/BulkDeleteFeatureValueHandlerInterface.php
 create mode 100644 src/Core/Domain/Feature/CommandHandler/DeleteFeatureValueHandlerInterface.php
 create mode 100644 src/Core/Domain/Feature/Exception/BulkFeatureValueException.php
 create mode 100644 src/Core/Domain/Feature/Exception/CannotDeleteFeatureValueException.php

diff --git a/src/Adapter/Feature/CommandHandler/BulkDeleteFeatureValueHandler.php b/src/Adapter/Feature/CommandHandler/BulkDeleteFeatureValueHandler.php
new file mode 100644
index 0000000000000..376b6f44267f3
--- /dev/null
+++ b/src/Adapter/Feature/CommandHandler/BulkDeleteFeatureValueHandler.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Adapter\Feature\CommandHandler;
+
+use PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureValueRepository;
+use PrestaShop\PrestaShop\Core\Domain\AbstractBulkCommandHandler;
+use PrestaShop\PrestaShop\Core\Domain\Exception\BulkCommandExceptionInterface;
+use PrestaShop\PrestaShop\Core\Domain\Feature\Command\BulkDeleteFeatureValueCommand;
+use PrestaShop\PrestaShop\Core\Domain\Feature\CommandHandler\BulkDeleteFeatureValueHandlerInterface;
+use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\BulkFeatureValueException;
+use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\FeatureValueException;
+use PrestaShop\PrestaShop\Core\Domain\Feature\ValueObject\FeatureValueId;
+
+class BulkDeleteFeatureValueHandler extends AbstractBulkCommandHandler implements BulkDeleteFeatureValueHandlerInterface
+{
+    public function __construct(
+        protected readonly FeatureValueRepository $featureValueRepository
+    ) {
+    }
+
+    public function handle(BulkDeleteFeatureValueCommand $command): void
+    {
+        $this->handleBulkAction($command->featureValueIds, FeatureValueException::class);
+    }
+
+    /**
+     * @param FeatureValueId $id
+     * @param mixed $command
+     *
+     * @return void
+     */
+    protected function handleSingleAction(mixed $id, mixed $command): void
+    {
+        $this->featureValueRepository->delete($id);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function buildBulkException(array $caughtExceptions): BulkCommandExceptionInterface
+    {
+        return new BulkFeatureValueException(
+            $caughtExceptions,
+            'Errors occurred during Feature value bulk delete action',
+            BulkFeatureValueException::FAILED_BULK_DELETE
+        );
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function supports($id): bool
+    {
+        return $id instanceof FeatureValueId;
+    }
+}
diff --git a/src/Adapter/Feature/CommandHandler/DeleteFeatureValueHandler.php b/src/Adapter/Feature/CommandHandler/DeleteFeatureValueHandler.php
new file mode 100644
index 0000000000000..c05081d618758
--- /dev/null
+++ b/src/Adapter/Feature/CommandHandler/DeleteFeatureValueHandler.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Adapter\Feature\CommandHandler;
+
+use PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureValueRepository;
+use PrestaShop\PrestaShop\Core\Domain\Feature\Command\DeleteFeatureValueCommand;
+use PrestaShop\PrestaShop\Core\Domain\Feature\CommandHandler\DeleteFeatureValueHandlerInterface;
+
+class DeleteFeatureValueHandler implements DeleteFeatureValueHandlerInterface
+{
+    public function __construct(
+        protected readonly FeatureValueRepository $featureValueRepository
+    ) {
+    }
+
+    public function handle(DeleteFeatureValueCommand $command): void
+    {
+        $this->featureValueRepository->delete($command->featureValueId);
+    }
+}
diff --git a/src/Adapter/Feature/Repository/FeatureValueRepository.php b/src/Adapter/Feature/Repository/FeatureValueRepository.php
index 60c4817d60ee3..1a15986e0ae2b 100644
--- a/src/Adapter/Feature/Repository/FeatureValueRepository.php
+++ b/src/Adapter/Feature/Repository/FeatureValueRepository.php
@@ -33,6 +33,7 @@
 use FeatureValue;
 use PrestaShop\PrestaShop\Adapter\Feature\Validate\FeatureValueValidator;
 use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\CannotAddFeatureValueException;
+use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\CannotDeleteFeatureValueException;
 use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\CannotUpdateFeatureValueException;
 use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\FeatureValueNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\InvalidFeatureValueIdException;
@@ -204,6 +205,11 @@ public function getFeatureValuesCount(?array $filters = []): int
         return (int) $qb->execute()->fetch()['total_feature_values'];
     }
 
+    public function delete(FeatureValueId $featureValueId): void
+    {
+        $this->deleteObjectModel($this->get($featureValueId), CannotDeleteFeatureValueException::class);
+    }
+
     /**
      * @param int $featureValueId
      *
diff --git a/src/Core/Domain/Feature/Command/BulkDeleteFeatureValueCommand.php b/src/Core/Domain/Feature/Command/BulkDeleteFeatureValueCommand.php
new file mode 100644
index 0000000000000..de11696e21d3e
--- /dev/null
+++ b/src/Core/Domain/Feature/Command/BulkDeleteFeatureValueCommand.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\Feature\Command;
+
+use PrestaShop\PrestaShop\Core\Domain\Feature\ValueObject\FeatureValueId;
+
+class BulkDeleteFeatureValueCommand
+{
+    /**
+     * @var FeatureValueId[]
+     */
+    public readonly array $featureValueIds;
+
+    /**
+     * @param int[] $featureValueIds
+     */
+    public function __construct(array $featureValueIds)
+    {
+        $ids = [];
+        foreach ($featureValueIds as $featureValueId) {
+            $ids[] = new FeatureValueId($featureValueId);
+        }
+
+        $this->featureValueIds = $ids;
+    }
+}
diff --git a/src/Core/Domain/Feature/Command/DeleteFeatureValueCommand.php b/src/Core/Domain/Feature/Command/DeleteFeatureValueCommand.php
new file mode 100644
index 0000000000000..eab9397bc7fbb
--- /dev/null
+++ b/src/Core/Domain/Feature/Command/DeleteFeatureValueCommand.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\Feature\Command;
+
+use PrestaShop\PrestaShop\Core\Domain\Feature\ValueObject\FeatureValueId;
+
+class DeleteFeatureValueCommand
+{
+    public readonly FeatureValueId $featureValueId;
+
+    public function __construct(
+        int $featureValueId
+    ) {
+        $this->featureValueId = new FeatureValueId($featureValueId);
+    }
+}
diff --git a/src/Core/Domain/Feature/CommandHandler/BulkDeleteFeatureValueHandlerInterface.php b/src/Core/Domain/Feature/CommandHandler/BulkDeleteFeatureValueHandlerInterface.php
new file mode 100644
index 0000000000000..b83c58c253ae5
--- /dev/null
+++ b/src/Core/Domain/Feature/CommandHandler/BulkDeleteFeatureValueHandlerInterface.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Domain\Feature\CommandHandler;
+
+use PrestaShop\PrestaShop\Core\Domain\Feature\Command\BulkDeleteFeatureValueCommand;
+
+interface BulkDeleteFeatureValueHandlerInterface
+{
+    public function handle(BulkDeleteFeatureValueCommand $command): void;
+}
diff --git a/src/Core/Domain/Feature/CommandHandler/DeleteFeatureValueHandlerInterface.php b/src/Core/Domain/Feature/CommandHandler/DeleteFeatureValueHandlerInterface.php
new file mode 100644
index 0000000000000..90028e3253252
--- /dev/null
+++ b/src/Core/Domain/Feature/CommandHandler/DeleteFeatureValueHandlerInterface.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Domain\Feature\CommandHandler;
+
+use PrestaShop\PrestaShop\Core\Domain\Feature\Command\DeleteFeatureValueCommand;
+
+interface DeleteFeatureValueHandlerInterface
+{
+    public function handle(DeleteFeatureValueCommand $command): void;
+}
diff --git a/src/Core/Domain/Feature/Exception/BulkFeatureValueException.php b/src/Core/Domain/Feature/Exception/BulkFeatureValueException.php
new file mode 100644
index 0000000000000..1a343b2c027d8
--- /dev/null
+++ b/src/Core/Domain/Feature/Exception/BulkFeatureValueException.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\Feature\Exception;
+
+use PrestaShop\PrestaShop\Core\Domain\Exception\BulkCommandExceptionInterface;
+use Throwable;
+
+class BulkFeatureValueException extends FeatureValueException implements BulkCommandExceptionInterface
+{
+    public const FAILED_BULK_DELETE = 1;
+
+    /**
+     * @param Throwable[] $exceptions
+     * @param string $message
+     * @param int $code
+     * @param Throwable|null $previous
+     */
+    public function __construct(
+        private readonly array $exceptions,
+        string $message = 'Errors occurred during Feature bulk action',
+        int $code = 0,
+        Throwable $previous = null
+    ) {
+        parent::__construct($message, $code, $previous);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getExceptions(): array
+    {
+        return $this->exceptions;
+    }
+}
diff --git a/src/Core/Domain/Feature/Exception/CannotDeleteFeatureValueException.php b/src/Core/Domain/Feature/Exception/CannotDeleteFeatureValueException.php
new file mode 100644
index 0000000000000..41dbc33843974
--- /dev/null
+++ b/src/Core/Domain/Feature/Exception/CannotDeleteFeatureValueException.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\Feature\Exception;
+
+class CannotDeleteFeatureValueException extends FeatureValueException
+{
+}
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/feature.yml b/src/PrestaShopBundle/Resources/config/services/adapter/feature.yml
index 5184bb2ba5cd0..c18c4d6ab24b7 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/feature.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/feature.yml
@@ -60,6 +60,20 @@ services:
       - name: tactician.handler
         command: PrestaShop\PrestaShop\Core\Domain\Feature\Command\BulkDeleteFeatureCommand
 
+  PrestaShop\PrestaShop\Adapter\Feature\CommandHandler\DeleteFeatureValueHandler:
+    autowire: true
+    public: false
+    tags:
+      - name: tactician.handler
+        command: PrestaShop\PrestaShop\Core\Domain\Feature\Command\DeleteFeatureValueCommand
+
+  PrestaShop\PrestaShop\Adapter\Feature\CommandHandler\BulkDeleteFeatureValueHandler:
+    autowire: true
+    public: false
+    tags:
+      - name: tactician.handler
+        command: PrestaShop\PrestaShop\Core\Domain\Feature\Command\BulkDeleteFeatureValueCommand
+
   PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureRepository:
     autowire: true
     public: false

From 0902326130d319722d30dab8c07813f67e80eff7 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Mon, 26 Jun 2023 14:26:53 +0300
Subject: [PATCH 0336/1030]  implement delete/bulk-delete feature value
 commands and integrate to list

---
 .../js/pages/feature/feature-value/index.ts   |  4 ++
 .../FeatureValueGridDefinitionFactory.php     | 30 ++++++++-
 .../Grid/Factory/FeatureValueGridFactory.php  | 26 ++++++++
 .../Sell/Catalog/FeatureValueController.php   | 63 +++++++++++++++++++
 .../routing/admin/sell/catalog/features.yml   | 20 ++++++
 5 files changed, 142 insertions(+), 1 deletion(-)

diff --git a/admin-dev/themes/new-theme/js/pages/feature/feature-value/index.ts b/admin-dev/themes/new-theme/js/pages/feature/feature-value/index.ts
index a0b8d85b1233f..b8876ea7d941d 100644
--- a/admin-dev/themes/new-theme/js/pages/feature/feature-value/index.ts
+++ b/admin-dev/themes/new-theme/js/pages/feature/feature-value/index.ts
@@ -30,6 +30,8 @@ import Grid from '@components/grid/grid';
 import ReloadListActionExtension from '@components/grid/extension/reload-list-extension';
 import SortingExtension from '@components/grid/extension/sorting-extension';
 import SubmitRowActionExtension from '@components/grid/extension/action/row/submit-row-action-extension';
+import SubmitBulkExtension from '@components/grid/extension/submit-bulk-action-extension';
+import BulkActionCheckboxExtension from '@components/grid/extension/bulk-action-checkbox-extension';
 
 const {$} = window;
 
@@ -42,4 +44,6 @@ $(() => {
   grid.addExtension(new ReloadListActionExtension());
   grid.addExtension(new SortingExtension());
   grid.addExtension(new SubmitRowActionExtension());
+  grid.addExtension(new SubmitBulkExtension());
+  grid.addExtension(new BulkActionCheckboxExtension());
 });
diff --git a/src/Core/Grid/Definition/Factory/FeatureValueGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/FeatureValueGridDefinitionFactory.php
index 80f4977558d13..61ff4c16bfe5d 100644
--- a/src/Core/Grid/Definition/Factory/FeatureValueGridDefinitionFactory.php
+++ b/src/Core/Grid/Definition/Factory/FeatureValueGridDefinitionFactory.php
@@ -36,6 +36,7 @@
 use PrestaShop\PrestaShop\Core\Grid\Column\ColumnCollection;
 use PrestaShop\PrestaShop\Core\Grid\Column\ColumnCollectionInterface;
 use PrestaShop\PrestaShop\Core\Grid\Column\Type\Common\ActionColumn;
+use PrestaShop\PrestaShop\Core\Grid\Column\Type\Common\BulkActionColumn;
 use PrestaShop\PrestaShop\Core\Grid\Column\Type\Common\DataColumn;
 use PrestaShop\PrestaShop\Core\Grid\Definition\GridDefinition;
 use PrestaShop\PrestaShop\Core\Grid\Definition\GridDefinitionInterface;
@@ -45,12 +46,16 @@
 use PrestaShop\PrestaShop\Core\Grid\Filter\FilterCollectionInterface;
 use Symfony\Component\Form\Extension\Core\Type\NumberType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\HttpFoundation\Request;
 
 /**
  * @see FeatureValueGridFactory - it modifies grid definition to adapt values which depends on request filters (like name and some filter columns)
  */
 class FeatureValueGridDefinitionFactory extends AbstractFilterableGridDefinitionFactory
 {
+    use BulkDeleteActionTrait;
+    use DeleteActionTrait;
+
     public const GRID_ID = 'feature_value';
 
     public function getDefinition(): GridDefinitionInterface
@@ -89,6 +94,11 @@ protected function getName(): string
     protected function getColumns(): ColumnCollectionInterface
     {
         return (new ColumnCollection())
+            ->add((new BulkActionColumn('bulk'))
+            ->setOptions([
+                'bulk_field' => 'id_feature_value',
+            ])
+            )
             ->add((new DataColumn('id_feature_value'))
             ->setName($this->trans('ID', [], 'Admin.Global'))
             ->setOptions([
@@ -117,6 +127,25 @@ protected function getColumns(): ColumnCollectionInterface
                                     'featureId' => 'id_feature',
                                 ],
                             ])
+                    )
+                    ->add((new LinkRowAction('view'))
+                    ->setName($this->trans('View', [], 'Admin.Actions'))
+                    ->setIcon('zoom_in')
+                    ->setOptions([
+                        'route' => 'admin_feature_values_index',
+                        'route_param_name' => 'featureId',
+                        'route_param_field' => 'id_feature',
+                        'clickable_row' => true,
+                    ])
+                    )
+                    ->add(
+                        $this->buildDeleteAction(
+                            'admin_feature_values_delete',
+                            'featureValueId',
+                            'id_feature_value',
+                            Request::METHOD_DELETE,
+                            ['featureId' => 'id_feature'],
+                        )
                     ),
             ])
             )
@@ -164,7 +193,6 @@ protected function getFilters(): FilterCollectionInterface
      */
     protected function getBulkActions(): BulkActionCollectionInterface
     {
-        // @todo: bulk actions will be added in dedicated PR
         return new BulkActionCollection();
     }
 }
diff --git a/src/Core/Grid/Factory/FeatureValueGridFactory.php b/src/Core/Grid/Factory/FeatureValueGridFactory.php
index b4eb682e3415d..b0eda84abcbb1 100644
--- a/src/Core/Grid/Factory/FeatureValueGridFactory.php
+++ b/src/Core/Grid/Factory/FeatureValueGridFactory.php
@@ -35,6 +35,7 @@
 use PrestaShop\PrestaShop\Core\Grid\Action\Type\LinkGridAction;
 use PrestaShop\PrestaShop\Core\Grid\Action\Type\SimpleGridAction;
 use PrestaShop\PrestaShop\Core\Grid\Data\Factory\GridDataFactoryInterface;
+use PrestaShop\PrestaShop\Core\Grid\Definition\Factory\BulkDeleteActionTrait;
 use PrestaShop\PrestaShop\Core\Grid\Definition\Factory\GridDefinitionFactoryInterface;
 use PrestaShop\PrestaShop\Core\Grid\Definition\GridDefinition;
 use PrestaShop\PrestaShop\Core\Grid\Filter\Filter;
@@ -55,6 +56,8 @@
  */
 class FeatureValueGridFactory extends GridFactory
 {
+    use BulkDeleteActionTrait;
+
     /**
      * @param GridDefinitionFactoryInterface $definitionFactory
      * @param GridDataFactoryInterface $dataFactory
@@ -125,6 +128,7 @@ protected function modifyDefinition(GridDefinition $definition, FeatureValueFilt
 
         $this->addFilters($definition, $featureValueFilters);
         $this->addGridActions($definition, $featureValueFilters);
+        $this->addBulkActions($definition, $featureValueFilters);
     }
 
     /**
@@ -199,4 +203,26 @@ protected function addGridActions(GridDefinition $definition, FeatureValueFilter
             ->setIcon('storage')
             );
     }
+
+    /**
+     * Adds bulk actions which requires featureId value from filters
+     *
+     * @param GridDefinition $definition
+     * @param FeatureValueFilters $featureValueFilters
+     *
+     * @return void
+     */
+    protected function addBulkActions(GridDefinition $definition, FeatureValueFilters $featureValueFilters): void
+    {
+        $definition->getBulkActions()->add($this->buildBulkDeleteAction('admin_feature_values_bulk_delete', [
+            'route_params' => [
+                'featureId' => $featureValueFilters->getFeatureId(),
+            ],
+        ]));
+    }
+
+    protected function trans($id, array $options, $domain): string
+    {
+        return $this->translator->trans($id, $options, $domain);
+    }
 }
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
index 7f39699c3c073..3f7097c137685 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
@@ -29,17 +29,24 @@
 namespace PrestaShopBundle\Controller\Admin\Sell\Catalog;
 
 use Exception;
+use PrestaShop\PrestaShop\Core\Domain\Feature\Command\BulkDeleteFeatureValueCommand;
+use PrestaShop\PrestaShop\Core\Domain\Feature\Command\DeleteFeatureValueCommand;
+use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\BulkFeatureValueException;
+use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\CannotDeleteFeatureValueException;
 use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\FeatureValueNotFoundException;
 use PrestaShop\PrestaShop\Core\Grid\Factory\FeatureValueGridFactory;
 use PrestaShop\PrestaShop\Core\Search\Filters\FeatureValueFilters;
 use PrestaShopBundle\Component\CsvResponse;
 use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
+use PrestaShopBundle\Controller\BulkActionsTrait;
 use PrestaShopBundle\Security\Annotation\AdminSecurity;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
 class FeatureValueController extends FrameworkBundleAdminController
 {
+    use BulkActionsTrait;
+
     /**
      * Button name which when submitted indicates that after form submission
      * user wants to be redirected to ADD NEW form to add additional value
@@ -189,6 +196,52 @@ public function exportAction(FeatureValueFilters $filters): CsvResponse
             ->setFileName('feature_' . $filters->getFeatureId() . '_values_' . date('Y-m-d_His') . '.csv');
     }
 
+    /**
+     * @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))")
+     *
+     * @param int $featureId
+     * @param int $featureValueId
+     *
+     * @return Response
+     */
+    public function deleteAction(int $featureId, int $featureValueId): Response
+    {
+        try {
+            $this->getCommandBus()->handle(new DeleteFeatureValueCommand($featureValueId));
+        } catch (Exception $e) {
+            $this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages()));
+        }
+
+        $this->addFlash('success', $this->trans('Successful deletion', 'Admin.Notifications.Success'));
+
+        return $this->redirectToRoute('admin_feature_values_index', [
+            'featureId' => $featureId,
+        ]);
+    }
+
+    /**
+     * @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))")
+     *
+     * @param int $featureid
+     * @param Request $request
+     *
+     * @return Response
+     */
+    public function bulkDeleteAction(int $featureId, Request $request): Response
+    {
+        try {
+            $this->getCommandBus()->handle(new BulkDeleteFeatureValueCommand($this->getBulkActionIds($request, 'feature_value_bulk')));
+        } catch (Exception $e) {
+            $this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages()));
+        }
+
+        $this->addFlash('success', $this->trans('Successful deletion', 'Admin.Notifications.Success'));
+
+        return $this->redirectToRoute('admin_feature_values_index', [
+            'featureId' => $featureId,
+        ]);
+    }
+
     /**
      * @return array<string, string|array<int, string>>
      */
@@ -199,6 +252,16 @@ private function getErrorMessages(): array
                 'The object cannot be loaded (or found).',
                 'Admin.Notifications.Error'
             ),
+            BulkFeatureValueException::class => [
+                BulkFeatureValueException::FAILED_BULK_DELETE => $this->trans(
+                    'An error occurred while deleting this selection.',
+                    'Admin.Notifications.Error'
+                ),
+            ],
+            CannotDeleteFeatureValueException::class => $this->trans(
+                'An error occurred while deleting the object.',
+                'Admin.Notifications.Error'
+            ),
         ];
     }
 }
diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml
index c641f24d043a2..4ef6781d588ac 100644
--- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml
+++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml
@@ -134,3 +134,23 @@ admin_feature_values_export:
   defaults:
     _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureValueController::exportAction
     _legacy_controller: AdminFeatures
+
+admin_feature_values_delete:
+  path: /{featureId}/values/{featureValueId}/delete
+  methods: [ POST, DELETE ]
+  defaults:
+    _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureValueController::deleteAction
+    _legacy_controller: AdminFeatures
+  requirements:
+    featureId: \d+
+    featureValueId: \d+
+
+admin_feature_values_bulk_delete:
+  path: /{featureId}/values/bulk-delete
+  methods: [ POST, DELETE ]
+  defaults:
+    _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureValueController::bulkDeleteAction
+    _legacy_controller: AdminFeatures
+  requirements:
+    featureId: \d+
+    featureValueId: \d+

From 4661b5fcff0ab57a23476613a8c6994aa4fe4cdb Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Mon, 26 Jun 2023 17:14:26 +0300
Subject: [PATCH 0337/1030]  add behats for delete and bulk delete actions

---
 .../Domain/FeatureValueFeatureContext.php     | 26 ++++++++
 .../Feature/feature_value_management.feature  | 65 +++++++++++++++++++
 2 files changed, 91 insertions(+)

diff --git a/tests/Integration/Behaviour/Features/Context/Domain/FeatureValueFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/FeatureValueFeatureContext.php
index 0e4b2fb1fcca7..81aae0bafa494 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/FeatureValueFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/FeatureValueFeatureContext.php
@@ -32,6 +32,8 @@
 use Language;
 use PHPUnit\Framework\Assert;
 use PrestaShop\PrestaShop\Core\Domain\Feature\Command\AddFeatureValueCommand;
+use PrestaShop\PrestaShop\Core\Domain\Feature\Command\BulkDeleteFeatureValueCommand;
+use PrestaShop\PrestaShop\Core\Domain\Feature\Command\DeleteFeatureValueCommand;
 use PrestaShop\PrestaShop\Core\Domain\Feature\Command\EditFeatureValueCommand;
 use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\FeatureValueConstraintException;
 use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\FeatureValueException;
@@ -87,6 +89,30 @@ public function editFeatureValue(string $featureValueReference, TableNode $table
         }
     }
 
+    /**
+     * @When I delete feature value :featureValueReference
+     *
+     * @param string $featureValueReference
+     *
+     * @return void
+     */
+    public function deleteFeatureValue(string $featureValueReference): void
+    {
+        $this->getCommandBus()->handle(new DeleteFeatureValueCommand($this->getSharedStorage()->get($featureValueReference)));
+    }
+
+    /**
+     * @When I bulk delete feature values :featureValueReferences
+     *
+     * @param string $featureValueReferences
+     *
+     * @return void
+     */
+    public function bulkDeleteFeatureValues(string $featureValueReferences): void
+    {
+        $this->getCommandBus()->handle(new BulkDeleteFeatureValueCommand($this->referencesToIds($featureValueReferences)));
+    }
+
     /**
      * @Then feature value :featureValueReference localized value should be:
      *
diff --git a/tests/Integration/Behaviour/Features/Scenario/Feature/feature_value_management.feature b/tests/Integration/Behaviour/Features/Scenario/Feature/feature_value_management.feature
index 855b71cc95b76..d12ea9a4f5b47 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Feature/feature_value_management.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Feature/feature_value_management.feature
@@ -17,6 +17,13 @@ Feature: Product feature value management
     And product feature "element" should have following details:
       | name[en-US] | Nature Element |
       | name[fr-FR] | Nature Element |
+    And I create product feature "legs_count" with specified properties:
+      | name[en-US]      | Legs count          |
+      | name[fr-FR]      | les jambes comptent |
+      | associated shops | shop1               |
+    And product feature "legs_count" should have following details:
+      | name[en-US] | Legs count          |
+      | name[fr-FR] | les jambes comptent |
 
   Scenario: I create and edit feature value
     When I create feature value "fire" for feature "element" with following properties:
@@ -74,3 +81,61 @@ Feature: Product feature value management
       | name[fr-FR] | Planet |
     When I associate feature value "earth" to feature "planet"
     Then feature value "earth" should be associated to feature "planet"
+
+  Scenario: Delete feature value
+    When I create feature value "3_legs" for feature "legs_count" with following properties:
+      | value[en-US] | 3 |
+      | value[fr-FR] | 3 |
+    And I create feature value "4_legs" for feature "legs_count" with following properties:
+      | value[en-US] | 4 |
+      | value[fr-FR] | 4 |
+    Then feature value "3_legs" localized value should be:
+      | locale | value |
+      | en-US  | 3     |
+      | fr-FR  | 3     |
+    And feature value "4_legs" localized value should be:
+      | locale | value |
+      | en-US  | 4     |
+      | fr-FR  | 4     |
+    When I delete feature value "3_legs"
+    Then feature value "3_legs" should not exist
+    When I delete feature value "4_legs"
+    Then feature value "4_legs" should not exist
+
+  Scenario: Bulk delete feature values
+    Given I create feature value "3_legs" for feature "legs_count" with following properties:
+      | value[en-US] | 3 |
+      | value[fr-FR] | 3 |
+    And I create feature value "4_legs" for feature "legs_count" with following properties:
+      | value[en-US] | 4 |
+      | value[fr-FR] | 4 |
+    And feature value "3_legs" localized value should be:
+      | locale | value |
+      | en-US  | 3     |
+      | fr-FR  | 3     |
+    And feature value "4_legs" localized value should be:
+      | locale | value |
+      | en-US  | 4     |
+      | fr-FR  | 4     |
+    And I create feature value "5_legs" for feature "legs_count" with following properties:
+      | value[en-US] | 5 |
+      | value[fr-FR] | 5 |
+    And feature value "5_legs" localized value should be:
+      | locale | value |
+      | en-US  | 5     |
+      | fr-FR  | 5     |
+    And I create feature value "no_element" for feature "element" with following properties:
+      | value[en-US] | No element |
+      | value[fr-FR] | Non        |
+    And feature value "no_element" localized value should be:
+      | locale | value      |
+      | en-US  | No element |
+      | fr-FR  | Non        |
+    When I bulk delete feature values "3_legs,4_legs,no_element"
+    Then feature value "3_legs" should not exist
+    And feature value "4_legs" should not exist
+    And feature value "no_element" should not exist
+    And feature value "5_legs" localized value should be:
+      | locale | value |
+      | en-US  | 5     |
+      | fr-FR  | 5     |

From 915273caa6cf4a9be2ba9aa3751d71cd343ee695 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Mon, 26 Jun 2023 17:15:31 +0300
Subject: [PATCH 0338/1030]  remove mistaken view action from values list

---
 src/Core/Domain/Feature/Exception/BulkFeatureValueException.php | 2 +-
 .../Controller/Admin/Sell/Catalog/FeatureValueController.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Core/Domain/Feature/Exception/BulkFeatureValueException.php b/src/Core/Domain/Feature/Exception/BulkFeatureValueException.php
index 1a343b2c027d8..bc9e4a6633d80 100644
--- a/src/Core/Domain/Feature/Exception/BulkFeatureValueException.php
+++ b/src/Core/Domain/Feature/Exception/BulkFeatureValueException.php
@@ -42,7 +42,7 @@ class BulkFeatureValueException extends FeatureValueException implements BulkCom
      */
     public function __construct(
         private readonly array $exceptions,
-        string $message = 'Errors occurred during Feature bulk action',
+        string $message = 'Errors occurred during Feature value bulk action',
         int $code = 0,
         Throwable $previous = null
     ) {
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
index 3f7097c137685..76d58219cc52f 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
@@ -222,7 +222,7 @@ public function deleteAction(int $featureId, int $featureValueId): Response
     /**
      * @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))")
      *
-     * @param int $featureid
+     * @param int $featureId
      * @param Request $request
      *
      * @return Response

From 7cf24afed097f89b7478170d164703af50c7959f Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Tue, 27 Jun 2023 17:52:23 +0300
Subject: [PATCH 0339/1030]  remove mistaken view action after rebase;

---
 .../Factory/FeatureValueGridDefinitionFactory.php      | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/Core/Grid/Definition/Factory/FeatureValueGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/FeatureValueGridDefinitionFactory.php
index 61ff4c16bfe5d..358cf58b2bc0e 100644
--- a/src/Core/Grid/Definition/Factory/FeatureValueGridDefinitionFactory.php
+++ b/src/Core/Grid/Definition/Factory/FeatureValueGridDefinitionFactory.php
@@ -128,16 +128,6 @@ protected function getColumns(): ColumnCollectionInterface
                                 ],
                             ])
                     )
-                    ->add((new LinkRowAction('view'))
-                    ->setName($this->trans('View', [], 'Admin.Actions'))
-                    ->setIcon('zoom_in')
-                    ->setOptions([
-                        'route' => 'admin_feature_values_index',
-                        'route_param_name' => 'featureId',
-                        'route_param_field' => 'id_feature',
-                        'clickable_row' => true,
-                    ])
-                    )
                     ->add(
                         $this->buildDeleteAction(
                             'admin_feature_values_delete',

From f893b5d38295aea77277975d8189d963552e48c0 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Tue, 27 Jun 2023 17:55:58 +0300
Subject: [PATCH 0340/1030]  redirect to feature view after creation

---
 .../Controller/Admin/Sell/Catalog/FeatureValueController.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
index 76d58219cc52f..5dc153be1ce0f 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
@@ -101,7 +101,9 @@ public function createAction(int $featureId, Request $request): Response
                     ]);
                 }
 
-                return $this->redirectToRoute('admin_features_index');
+                return $this->redirectToRoute('admin_feature_values_index', [
+                    'featureId' => $featureId,
+                ]);
             }
         } catch (Exception $e) {
             $this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages()));
@@ -119,6 +121,7 @@ public function createAction(int $featureId, Request $request): Response
     /**
      * @AdminSecurity("is_granted('update', request.get('_legacy_controller'))")
      *
+     * @param int $featureId
      * @param int $featureValueId
      * @param Request $request
      *

From 2dbce9689f1a1b41cf640cf4b7d3f12685b54323 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Wed, 28 Jun 2023 11:30:53 +0300
Subject: [PATCH 0341/1030]  clean up some redundant code and introduce back
 getters for commands

---
 .../BulkDeleteFeatureValueHandler.php           |  2 +-
 .../DeleteFeatureValueHandler.php               |  2 +-
 .../Command/BulkDeleteFeatureValueCommand.php   | 17 +++++++++++------
 .../Command/DeleteFeatureValueCommand.php       | 10 +++++++++-
 .../FeatureValueGridDefinitionFactory.php       |  1 -
 .../Grid/Factory/FeatureValueGridFactory.php    |  1 -
 6 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/Adapter/Feature/CommandHandler/BulkDeleteFeatureValueHandler.php b/src/Adapter/Feature/CommandHandler/BulkDeleteFeatureValueHandler.php
index 376b6f44267f3..e62dfca3309cf 100644
--- a/src/Adapter/Feature/CommandHandler/BulkDeleteFeatureValueHandler.php
+++ b/src/Adapter/Feature/CommandHandler/BulkDeleteFeatureValueHandler.php
@@ -46,7 +46,7 @@ public function __construct(
 
     public function handle(BulkDeleteFeatureValueCommand $command): void
     {
-        $this->handleBulkAction($command->featureValueIds, FeatureValueException::class);
+        $this->handleBulkAction($command->getFeatureValueIds(), FeatureValueException::class);
     }
 
     /**
diff --git a/src/Adapter/Feature/CommandHandler/DeleteFeatureValueHandler.php b/src/Adapter/Feature/CommandHandler/DeleteFeatureValueHandler.php
index c05081d618758..c5ef03536f8a8 100644
--- a/src/Adapter/Feature/CommandHandler/DeleteFeatureValueHandler.php
+++ b/src/Adapter/Feature/CommandHandler/DeleteFeatureValueHandler.php
@@ -41,6 +41,6 @@ public function __construct(
 
     public function handle(DeleteFeatureValueCommand $command): void
     {
-        $this->featureValueRepository->delete($command->featureValueId);
+        $this->featureValueRepository->delete($command->getFeatureValueId());
     }
 }
diff --git a/src/Core/Domain/Feature/Command/BulkDeleteFeatureValueCommand.php b/src/Core/Domain/Feature/Command/BulkDeleteFeatureValueCommand.php
index de11696e21d3e..21731526d8e97 100644
--- a/src/Core/Domain/Feature/Command/BulkDeleteFeatureValueCommand.php
+++ b/src/Core/Domain/Feature/Command/BulkDeleteFeatureValueCommand.php
@@ -35,18 +35,23 @@ class BulkDeleteFeatureValueCommand
     /**
      * @var FeatureValueId[]
      */
-    public readonly array $featureValueIds;
+    private readonly array $featureValueIds;
 
     /**
      * @param int[] $featureValueIds
      */
     public function __construct(array $featureValueIds)
     {
-        $ids = [];
-        foreach ($featureValueIds as $featureValueId) {
-            $ids[] = new FeatureValueId($featureValueId);
-        }
+        $this->featureValueIds = array_map(static function ($id): FeatureValueId {
+            return new FeatureValueId((int) $id);
+        }, $featureValueIds);
+    }
 
-        $this->featureValueIds = $ids;
+    /**
+     * @return FeatureValueId[]
+     */
+    public function getFeatureValueIds(): array
+    {
+        return $this->featureValueIds;
     }
 }
diff --git a/src/Core/Domain/Feature/Command/DeleteFeatureValueCommand.php b/src/Core/Domain/Feature/Command/DeleteFeatureValueCommand.php
index eab9397bc7fbb..44021a9d15748 100644
--- a/src/Core/Domain/Feature/Command/DeleteFeatureValueCommand.php
+++ b/src/Core/Domain/Feature/Command/DeleteFeatureValueCommand.php
@@ -31,11 +31,19 @@
 
 class DeleteFeatureValueCommand
 {
-    public readonly FeatureValueId $featureValueId;
+    private readonly FeatureValueId $featureValueId;
 
     public function __construct(
         int $featureValueId
     ) {
         $this->featureValueId = new FeatureValueId($featureValueId);
     }
+
+    /**
+     * @return FeatureValueId
+     */
+    public function getFeatureValueId(): FeatureValueId
+    {
+        return $this->featureValueId;
+    }
 }
diff --git a/src/Core/Grid/Definition/Factory/FeatureValueGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/FeatureValueGridDefinitionFactory.php
index 358cf58b2bc0e..4d139280f764b 100644
--- a/src/Core/Grid/Definition/Factory/FeatureValueGridDefinitionFactory.php
+++ b/src/Core/Grid/Definition/Factory/FeatureValueGridDefinitionFactory.php
@@ -53,7 +53,6 @@
  */
 class FeatureValueGridDefinitionFactory extends AbstractFilterableGridDefinitionFactory
 {
-    use BulkDeleteActionTrait;
     use DeleteActionTrait;
 
     public const GRID_ID = 'feature_value';
diff --git a/src/Core/Grid/Factory/FeatureValueGridFactory.php b/src/Core/Grid/Factory/FeatureValueGridFactory.php
index b0eda84abcbb1..1001679795d40 100644
--- a/src/Core/Grid/Factory/FeatureValueGridFactory.php
+++ b/src/Core/Grid/Factory/FeatureValueGridFactory.php
@@ -144,7 +144,6 @@ protected function addFilters(GridDefinition $definition, FeatureValueFilters $f
         $definition->getFilters()->add((new Filter('actions', SearchAndResetType::class))
             // these action options are added in FeatureValueGridFactory, because they are dynamic and depend on filters
             ->setAssociatedColumn('actions')
-            ->setAssociatedColumn('actions')
             ->setTypeOptions([
                 'reset_route' => 'admin_common_reset_search_by_filter_id',
                 'reset_route_params' => [

From ae94804f1b3e0a9879f9006a1df579438a14fa18 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Wed, 28 Jun 2023 13:39:54 +0300
Subject: [PATCH 0342/1030]  integrate FeatureChoiceType

---
 .../Form/Admin/Sell/Catalog/FeatureValueType.php | 16 ++--------------
 .../config/services/bundle/form/form_type.yml    |  5 +----
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Catalog/FeatureValueType.php b/src/PrestaShopBundle/Form/Admin/Sell/Catalog/FeatureValueType.php
index 9cdf97b32f3eb..88af6c4048f18 100644
--- a/src/PrestaShopBundle/Form/Admin/Sell/Catalog/FeatureValueType.php
+++ b/src/PrestaShopBundle/Form/Admin/Sell/Catalog/FeatureValueType.php
@@ -31,26 +31,16 @@
 use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\DefaultLanguage;
 use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\TypedRegex;
 use PrestaShop\PrestaShop\Core\Domain\Feature\FeatureValueSettings;
-use PrestaShop\PrestaShop\Core\Form\FormChoiceProviderInterface;
+use PrestaShopBundle\Form\Admin\Type\FeatureChoiceType;
 use PrestaShopBundle\Form\Admin\Type\TranslatableType;
 use PrestaShopBundle\Form\Admin\Type\TranslatorAwareType;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Validator\Constraints\Length;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
 class FeatureValueType extends TranslatorAwareType
 {
-    public function __construct(
-        TranslatorInterface $translator,
-        array $locales,
-        protected readonly FormChoiceProviderInterface $featureChoiceProvider
-    ) {
-        parent::__construct($translator, $locales);
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -58,9 +48,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('feature_value_id', HiddenType::class)
-            ->add('feature_id', ChoiceType::class, [
-                'choices' => $this->featureChoiceProvider->getChoices(),
-                'label' => $this->trans('Feature', 'Admin.Global'),
+            ->add('feature_id', FeatureChoiceType::class, [
                 'attr' => [
                     // disable feature id choices when editing feature value and only allow changing them when creating new one
                     'disabled' => !empty($builder->getData()['feature_value_id']),
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
index d359be5eb470d..9e782137a1371 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
@@ -431,10 +431,7 @@ services:
       $installedPaymentModulesChoiceProvider: '@prestashop.adapter.form.choice_provider.installed_payment_modules'
 
   PrestaShopBundle\Form\Admin\Sell\Catalog\FeatureType: ~
-  PrestaShopBundle\Form\Admin\Sell\Catalog\FeatureValueType:
-    arguments:
-      $featureChoiceProvider: '@prestashop.adapter.form.choice_provider.features_choice_provider'
-
+  PrestaShopBundle\Form\Admin\Sell\Catalog\FeatureValueType: ~
   PrestaShopBundle\Form\Admin\Sell\Order\ChangeOrderCurrencyType:
     arguments:
       $currencyChoiceProvider: '@PrestaShop\PrestaShop\Core\Form\ChoiceProvider\CurrencyByIdChoiceProvider'

From 4e78de7d2b79c466066aa28c921ba38d5fedd560 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Wed, 28 Jun 2023 14:11:12 +0300
Subject: [PATCH 0343/1030]  build new command instead of relying on state when
 setting non-existing id in behat scenario

---
 .../Domain/CartRule/SetCartRuleRestrictionsFeatureContext.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/SetCartRuleRestrictionsFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/SetCartRuleRestrictionsFeatureContext.php
index 2c99e33f6ecf8..2004829242661 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/SetCartRuleRestrictionsFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/SetCartRuleRestrictionsFeatureContext.php
@@ -116,13 +116,15 @@ public function addRestrictionRule(string $cartRuleReference, int $quantity = 0,
      */
     public function restrictCartRulesProvidingNonExistingIds(string $cartRuleReference): void
     {
-        $command = $this->getRestrictionsCommand($cartRuleReference);
+        $command = new SetCartRuleRestrictionsCommand($this->getSharedStorage()->get($cartRuleReference));
         $command->setRestrictedCartRuleIds([self::NON_EXISTING_CART_RULE_ID]);
 
         try {
             $this->getCommandBus()->handle($command);
         } catch (CartRuleNotFoundException $e) {
             $this->setLastException($e);
+        } finally {
+            unset($this->restrictionCommandsByReference[$cartRuleReference]);
         }
     }
 

From 28c1e8655a3d98dcb89c2e531faf3a8c97e999b8 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Tue, 27 Jun 2023 17:00:45 +0200
Subject: [PATCH 0344/1030] Nightly : Fixed install Node 14

---
 .docker/Dockerfile | 17 ++++++++++++-----
 docker-compose.yml |  1 +
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 40a162885dc27..5a6ebf84e7fc3 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -7,6 +7,7 @@ EXPOSE 443
 
 ARG GROUP_ID
 ARG USER_ID
+ARG NODE_VERSION
 
 RUN groupmod -g $GROUP_ID www-data \
   && usermod -u $USER_ID -g $GROUP_ID www-data
@@ -19,13 +20,19 @@ RUN chown -R www-data:www-data /var/www/.npm
 RUN mkdir -p /var/www/.composer
 RUN chown -R www-data:www-data /var/www/.composer
 
-RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
-RUN apt install -y nodejs
+ENV NVM_DIR       /usr/local/nvm
+RUN mkdir -p $NVM_DIR \
+    && curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash \
+    && . $NVM_DIR/nvm.sh \
+    && nvm install $NODE_VERSION \
+    && nvm alias default $NODE_VERSION \
+    && nvm use default
+
+ENV NODE_PATH     $NVM_DIR/versions/node/v$NODE_VERSION/bin
+ENV PATH          $PATH:$NODE_PATH
 
 # Install mailutils to make sendmail work
-RUN apt install -y \
-    apt-utils \
-    mailutils
+RUN apt update && apt install -y mailutils
 
 RUN php -r "copy('https://getcomposer.org/installer', '/tmp/composer-setup.php');" && php /tmp/composer-setup.php --no-ansi --install-dir=/usr/local/bin --filename=composer && rm -rf /tmp/composer-setup.php
 CMD ["/tmp/docker_run_git.sh"]
diff --git a/docker-compose.yml b/docker-compose.yml
index c6ddf9d7c5945..dde0472585861 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -34,6 +34,7 @@ services:
         - VERSION=${VERSION:-8.1-apache}
         - USER_ID=${USER_ID:-1000}
         - GROUP_ID=${GROUP_ID:-1000}
+        - NODE_VERSION=${NODE_VERSION:-14.21.3}
     environment:
       DISABLE_MAKE: ${DISABLE_MAKE:-0}
       PS_INSTALL_AUTO: ${PS_INSTALL_AUTO:-1}

From d3a488ce6896c63035c2144a5305174d5882cd6c Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Wed, 28 Jun 2023 14:32:45 +0200
Subject: [PATCH 0345/1030] Nightly : Fixed install Node 16

---
 .docker/Dockerfile | 17 ++++++++++++-----
 docker-compose.yml |  1 +
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index ba5cd146df0db..5a6ebf84e7fc3 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -7,6 +7,7 @@ EXPOSE 443
 
 ARG GROUP_ID
 ARG USER_ID
+ARG NODE_VERSION
 
 RUN groupmod -g $GROUP_ID www-data \
   && usermod -u $USER_ID -g $GROUP_ID www-data
@@ -19,13 +20,19 @@ RUN chown -R www-data:www-data /var/www/.npm
 RUN mkdir -p /var/www/.composer
 RUN chown -R www-data:www-data /var/www/.composer
 
-RUN curl -sL https://deb.nodesource.com/setup_16.x | bash -
-RUN apt install -y nodejs
+ENV NVM_DIR       /usr/local/nvm
+RUN mkdir -p $NVM_DIR \
+    && curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash \
+    && . $NVM_DIR/nvm.sh \
+    && nvm install $NODE_VERSION \
+    && nvm alias default $NODE_VERSION \
+    && nvm use default
+
+ENV NODE_PATH     $NVM_DIR/versions/node/v$NODE_VERSION/bin
+ENV PATH          $PATH:$NODE_PATH
 
 # Install mailutils to make sendmail work
-RUN apt install -y \
-    apt-utils \
-    mailutils
+RUN apt update && apt install -y mailutils
 
 RUN php -r "copy('https://getcomposer.org/installer', '/tmp/composer-setup.php');" && php /tmp/composer-setup.php --no-ansi --install-dir=/usr/local/bin --filename=composer && rm -rf /tmp/composer-setup.php
 CMD ["/tmp/docker_run_git.sh"]
diff --git a/docker-compose.yml b/docker-compose.yml
index d0ef4bd97ac28..7aec666dc9354 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -39,6 +39,7 @@ services:
         - VERSION=${VERSION:-8.1-apache}
         - USER_ID=${USER_ID:-1000}
         - GROUP_ID=${GROUP_ID:-1000}
+        - NODE_VERSION=${NODE_VERSION:-16.20.1}
     environment:
       DISABLE_MAKE: ${DISABLE_MAKE:-0}
       PS_INSTALL_AUTO: ${PS_INSTALL_AUTO:-1}

From fe9d09416498d5a103ecde4ace7e735d700f55d9 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Wed, 28 Jun 2023 14:40:09 +0200
Subject: [PATCH 0346/1030] Nightly : Fixed install Node 14

---
 .docker/Dockerfile | 17 ++++++++++++-----
 docker-compose.yml |  1 +
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index b9ee471bfcf13..9adceee4a26bc 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -5,6 +5,7 @@ FROM prestashop/base:$VERSION
 
 ARG GROUP_ID
 ARG USER_ID
+ARG NODE_VERSION
 
 RUN groupmod -g $GROUP_ID www-data \
   && usermod -u $USER_ID -g $GROUP_ID www-data
@@ -17,13 +18,19 @@ RUN chown -R www-data:www-data /var/www/.npm
 RUN mkdir -p /var/www/.composer
 RUN chown -R www-data:www-data /var/www/.composer
 
-RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
-RUN apt install -y nodejs
+ENV NVM_DIR       /usr/local/nvm
+RUN mkdir -p $NVM_DIR \
+    && curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash \
+    && . $NVM_DIR/nvm.sh \
+    && nvm install $NODE_VERSION \
+    && nvm alias default $NODE_VERSION \
+    && nvm use default
+
+ENV NODE_PATH     $NVM_DIR/versions/node/v$NODE_VERSION/bin
+ENV PATH          $PATH:$NODE_PATH
 
 # Install mailutils to make sendmail work
-RUN apt install -y \
-    apt-utils \
-    mailutils
+RUN apt update && apt install -y mailutils
 
 RUN php -r "copy('https://getcomposer.org/installer', '/tmp/composer-setup.php');" && php /tmp/composer-setup.php --no-ansi --install-dir=/usr/local/bin --filename=composer && rm -rf /tmp/composer-setup.php
 CMD ["/tmp/docker_run_git.sh"]
diff --git a/docker-compose.yml b/docker-compose.yml
index c6a7a699ce4ff..3c55f026b6336 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -24,6 +24,7 @@ services:
         - VERSION=${VERSION:-8.1-apache}
         - USER_ID=${USER_ID:-1000}
         - GROUP_ID=${GROUP_ID:-1000}
+        - NODE_VERSION=${NODE_VERSION:-14.21.3}
     environment:
       DISABLE_MAKE: ${DISABLE_MAKE:-0}
       PS_INSTALL_AUTO: ${PS_INSTALL_AUTO:-1}

From 1642cdd1f64fa3ab07ed2d48f2b109e63c06c821 Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Tue, 16 May 2023 17:18:56 +0200
Subject: [PATCH 0347/1030] Update checkOrGenerateImageType $sourceFilePath

---
 src/Adapter/Image/ImageRetriever.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/Adapter/Image/ImageRetriever.php b/src/Adapter/Image/ImageRetriever.php
index 6573c7dd82777..e685e5a9d7767 100644
--- a/src/Adapter/Image/ImageRetriever.php
+++ b/src/Adapter/Image/ImageRetriever.php
@@ -217,9 +217,9 @@ public function getImage($object, $id_image)
 
             foreach ($configuredImageFormats as $imageFormat) {
                 // Generate the thumbnail and optionally a high DPI version
-                $this->checkOrGenerateImageType($originalImagePath, $imageFolderPath, $id_image, $image_type, $imageFormat);
+                $this->checkOrGenerateImageType($imageFolderPath, $id_image, $image_type, $imageFormat);
                 if ($generateHighDpiImages) {
-                    $this->checkOrGenerateImageType($originalImagePath, $imageFolderPath, $id_image, $image_type, $imageFormat, true);
+                    $this->checkOrGenerateImageType($imageFolderPath, $id_image, $image_type, $imageFormat, true);
                 }
 
                 // Get the URL of the thumb and add it to sources
@@ -272,7 +272,6 @@ public function getImage($object, $id_image)
     }
 
     /**
-     * @param string $originalImagePath
      * @param string $imageFolderPath
      * @param int $idImage
      * @param array $imageTypeData
@@ -281,10 +280,9 @@ public function getImage($object, $id_image)
      *
      * @return void
      */
-    private function checkOrGenerateImageType(string $originalImagePath, string $imageFolderPath, int $idImage, array $imageTypeData, string $imageFormat, bool $hdpi = false)
+    private function checkOrGenerateImageType(string $imageFolderPath, int $idImage, array $imageTypeData, string $imageFormat, bool $hdpi = false)
     {
         $fileName = sprintf('%s-%s.%s', $idImage, $imageTypeData['name'], $imageFormat);
-
         if ($hdpi) {
             $fileName = sprintf('%s-%s2x.%s', $idImage, $imageTypeData['name'], $imageFormat);
             $imageTypeData['width'] *= 2;
@@ -302,8 +300,13 @@ private function checkOrGenerateImageType(string $originalImagePath, string $ima
 
         // Check if the thumbnail exists and generate it if needed
         if (!file_exists($resizedImagePath)) {
+            $sourceFile = sprintf('%s-%s.%s', $idImage, $imageTypeData['name'], 'jpg');
+            $sourceFilePath = implode(DIRECTORY_SEPARATOR, [
+                $imageFolderPath,
+                $sourceFile,
+            ]);
             ImageManager::resize(
-                $originalImagePath,
+                $sourceFilePath,
                 $resizedImagePath,
                 (int) $imageTypeData['width'],
                 (int) $imageTypeData['height'],

From c771b51be750753705d56b4d3b1fe08f6a2ffd26 Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Wed, 17 May 2023 14:24:12 +0200
Subject: [PATCH 0348/1030] Remove unused var

---
 src/Adapter/Image/ImageRetriever.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/Adapter/Image/ImageRetriever.php b/src/Adapter/Image/ImageRetriever.php
index e685e5a9d7767..bbcaa6ed9f8bd 100644
--- a/src/Adapter/Image/ImageRetriever.php
+++ b/src/Adapter/Image/ImageRetriever.php
@@ -183,12 +183,6 @@ public function getImage($object, $id_image)
         // Obsolete solution, will be removed
         $generateHighDpiImages = (bool) Configuration::get('PS_HIGHT_DPI');
 
-        // Get path of original uploaded image we will use to get thumbnails (original image extension is always .jpg)
-        $originalImagePath = implode(DIRECTORY_SEPARATOR, [
-            $imageFolderPath,
-            $id_image . '.jpg',
-        ]);
-
         /*
          * Let's resolve which formats we will use for image generation.
          * In new image system, it's multiple formats. In case of legacy, it's only .jpg.

From a3c871b5b768b662752f0b8e8d57665e04e1e983 Mon Sep 17 00:00:00 2001
From: "matthieu.rolland" <matthieu.rolland@prestashop.com>
Date: Wed, 28 Jun 2023 17:51:58 +0200
Subject: [PATCH 0349/1030] bump ps_linklist

---
 composer.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/composer.lock b/composer.lock
index e9095a1c29227..1b99682dcf28c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -6899,16 +6899,16 @@
         },
         {
             "name": "prestashop/ps_linklist",
-            "version": "v6.0.2",
+            "version": "v6.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PrestaShop/ps_linklist.git",
-                "reference": "66bd879f99c665f1fac8aab820f02b17c64df7c9"
+                "reference": "2bf726d44e1e009b794c04068083fda4f2707440"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PrestaShop/ps_linklist/zipball/66bd879f99c665f1fac8aab820f02b17c64df7c9",
-                "reference": "66bd879f99c665f1fac8aab820f02b17c64df7c9",
+                "url": "https://api.github.com/repos/PrestaShop/ps_linklist/zipball/2bf726d44e1e009b794c04068083fda4f2707440",
+                "reference": "2bf726d44e1e009b794c04068083fda4f2707440",
                 "shasum": ""
             },
             "require": {
@@ -6940,9 +6940,9 @@
             "description": "PrestaShop - Link list",
             "homepage": "https://github.com/PrestaShop/ps_linklist",
             "support": {
-                "source": "https://github.com/PrestaShop/ps_linklist/tree/v6.0.2"
+                "source": "https://github.com/PrestaShop/ps_linklist/tree/v6.0.3"
             },
-            "time": "2023-05-23T17:09:26+00:00"
+            "time": "2023-06-23T07:48:32+00:00"
         },
         {
             "name": "prestashop/ps_mainmenu",

From 87c522bf24585deb80e2e31a8856924efdea266f Mon Sep 17 00:00:00 2001
From: prestonBot <prestonBot@users.noreply.github.com>
Date: Wed, 28 Jun 2023 23:06:47 +0000
Subject: [PATCH 0350/1030] Updated PrestaShop Packages

---
 composer.lock | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/composer.lock b/composer.lock
index 946a0a4403ff2..a6734c5f43bc0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -5550,16 +5550,16 @@
         },
         {
             "name": "prestashop/dashtrends",
-            "version": "v2.1.1",
+            "version": "v2.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PrestaShop/dashtrends.git",
-                "reference": "c0ffb850abf1896ae8650522c8c8f4cff1c1dd80"
+                "reference": "e2cbdb088241a17118a8c4424b468a36216f8316"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PrestaShop/dashtrends/zipball/c0ffb850abf1896ae8650522c8c8f4cff1c1dd80",
-                "reference": "c0ffb850abf1896ae8650522c8c8f4cff1c1dd80",
+                "url": "https://api.github.com/repos/PrestaShop/dashtrends/zipball/e2cbdb088241a17118a8c4424b468a36216f8316",
+                "reference": "e2cbdb088241a17118a8c4424b468a36216f8316",
                 "shasum": ""
             },
             "require": {
@@ -5587,9 +5587,9 @@
             "description": "PrestaShop module dashtrends",
             "homepage": "https://github.com/PrestaShop/dashtrends",
             "support": {
-                "source": "https://github.com/PrestaShop/dashtrends/tree/v2.1.1"
+                "source": "https://github.com/PrestaShop/dashtrends/tree/v2.1.2"
             },
-            "time": "2023-03-24T13:19:08+00:00"
+            "time": "2023-06-19T13:25:37+00:00"
         },
         {
             "name": "prestashop/decimal",
@@ -6812,23 +6812,23 @@
         },
         {
             "name": "prestashop/ps_imageslider",
-            "version": "v3.1.2",
+            "version": "v3.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PrestaShop/ps_imageslider.git",
-                "reference": "c5980fe4e99ba6aa5139b4e0755540be42c52b88"
+                "reference": "36f848c1943f84f1dc0c41813f07c0e9b70ae8b0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PrestaShop/ps_imageslider/zipball/c5980fe4e99ba6aa5139b4e0755540be42c52b88",
-                "reference": "c5980fe4e99ba6aa5139b4e0755540be42c52b88",
+                "url": "https://api.github.com/repos/PrestaShop/ps_imageslider/zipball/36f848c1943f84f1dc0c41813f07c0e9b70ae8b0",
+                "reference": "36f848c1943f84f1dc0c41813f07c0e9b70ae8b0",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.4.0"
             },
             "require-dev": {
-                "prestashop/php-dev-tools": "^3.4"
+                "prestashop/php-dev-tools": "^4.3"
             },
             "type": "prestashop-module",
             "autoload": {
@@ -6849,9 +6849,9 @@
             "description": "PrestaShop - Image slider",
             "homepage": "https://github.com/PrestaShop/ps_imageslider",
             "support": {
-                "source": "https://github.com/PrestaShop/ps_imageslider/tree/v3.1.2"
+                "source": "https://github.com/PrestaShop/ps_imageslider/tree/v3.1.3"
             },
-            "time": "2023-03-15T17:45:19+00:00"
+            "time": "2023-06-08T12:48:16+00:00"
         },
         {
             "name": "prestashop/ps_languageselector",

From e2df0311dd180ae7c6c08ceea207ba79157d0c20 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Wed, 8 Feb 2023 11:21:54 +0100
Subject: [PATCH 0351/1030] Functional Tests : Added deprecated as errors

---
 tests/UI/.eslintrc.js                         |   4 +-
 .../viewAndEditOrder/02_productBlock.ts       |  11 +-
 .../viewAndEditOrder/04_documentsTab.ts       |   2 +-
 .../viewAndEditOrder/11_checkInvoice.ts       |   5 +-
 .../viewAndEditOrder/12_checkMultiInvoice.ts  |   5 +-
 .../02_enableDisableTaxBreakdown.ts           |   5 +-
 .../03_creditSlips/04_creditSlipOptions.ts    |   5 +-
 .../01_filterAndQuickEditProducts.ts          |   5 +-
 .../02_paginationAndSortProducts.ts           |   5 +-
 .../01_products/04_previewProductFromList.ts  |   5 +-
 .../05_duplicateProductFromList.ts            |   5 +-
 .../03_catalog/01_products/06_bulkActions.ts  |   5 +-
 .../03_monitoring/02_monitoringProducts.ts    |  41 ++--
 .../02_sortPaginationAndBulkDelete.ts         |   2 +-
 .../08_stocks/04_filterStocksByStatus.ts      |   5 +-
 .../02_addresses/02_CRUDAddressInBO.ts        |  26 ---
 .../03_outstanding/04_pagination.ts           |  14 +-
 .../05_sortFilterOutstanding.ts               |  16 +-
 .../01_customerService/01_viewMessage.ts      |  10 +-
 .../01_customerService/02_changeStatus.ts     |   6 -
 .../01_customerService/03_respondToMessage.ts |   6 -
 .../01_customerService/04_contactOptions.ts   |  19 --
 .../04_pages/pages/02_pagesBulkActions.ts     |   2 +-
 .../16_checkBaseImageFormat.ts                |  28 +--
 .../03_taxes/01_taxes/02_CRUDTaxesInBO.ts     |  26 ---
 .../03_maxSizeShortDescription.ts             |   5 +-
 .../04_quantityDiscountsBasedOn.ts            |   5 +-
 .../05_forceUpdateFriendlyURL.ts              |   5 +-
 .../06_defaultActivationStatus.ts             |   5 +-
 .../01_enableStockManagement.ts               |   5 +-
 .../02_defaultPackStockManagement.ts          |   5 +-
 .../03_displayUnavailableProductAttributes.ts |   5 +-
 .../04_displayRemainingQuantities.ts          |   5 +-
 .../05_allowOrderingOutOfStock.ts             |   5 +-
 .../03_productsStock/07_labelOutOfStock.ts    |   5 +-
 ..._enableDeliveryTimeOfOutOfStockProducts.ts |   5 +-
 .../01_updateNumberOfProductsPerPage.ts       |  24 ++-
 .../05_contact/02_CRUDContact.ts              |  26 ---
 .../04_enableDisableAccentedURL.ts            |   5 +-
 .../04_email/03_sortAndPagination.ts          |   8 +-
 .../08_logs/01_filterSortAndPagination.ts     |   2 +-
 .../functional/BO/15_header/02_quickAccess.ts |  16 +-
 .../functional/BO/15_header/03_searchBar.ts   |   1 +
 .../classic/01_login/01_passwordReminder.ts   |   2 +-
 .../01_checkLinksInHeader.ts                  |   2 +-
 .../01_creditSlips/01_consultCreditSlip.ts    |   5 -
 .../03_userAccount/04_getGDPRDataInPDF.ts     |  39 ++--
 .../03_userAccount/05_getGDPRDataInCSV.ts     |  30 +--
 .../01_consultReturnDetails.ts                |   2 +-
 .../02_checkOrderReturnPDF.ts                 |   2 +-
 .../classic/05_contactUs/04_addAttachment.ts  |   2 +-
 .../FO/classic/06_homePage/03_allProducts.ts  |   5 +-
 .../06_homePage/04_productQuickView.ts        |   6 +-
 .../FO/classic/09_productPage/01_quickView.ts |  14 +-
 .../FO/classic/09_productPage/02_addToCart.ts |  14 +-
 .../productV2/functional/01_filterProducts.ts |   5 +-
 .../functional/02_CRUDStandardProduct.ts      |  23 +-
 .../03_CRUDProductWithCombinations.ts         |  11 +-
 .../functional/04_CRUDPackOfProducts.ts       |  23 +-
 .../functional/05_CRUDVirtualProduct.ts       |  22 +-
 .../functional/06_productBulkActions.ts       |  11 +-
 .../functional/07_duplicateProduct.ts         |  11 +-
 .../productV2/sanity/01_filterProducts.ts     |  11 +-
 .../sanity/02_CRUDStandardProduct.ts          |  24 ++-
 .../sanity/03_CRUDProductWithCombinations.ts  |  15 +-
 .../productV2/sanity/04_CRUDVirtualProduct.ts |   5 +-
 .../productV2/sanity/05_deleteProduct.ts      |  11 +-
 .../06_deleteProductsWithBulkActions.ts       |   5 +-
 .../02_CRUDStandardProductInBO.ts             |  11 +-
 ...CRUDStandardProductWithCombinationsInBO.ts |  11 +-
 .../sanity/03_productsBO/04_deleteProduct.ts  |  13 +-
 .../05_deleteProductsWithBulkActions.ts       |  11 +-
 .../sanity/04_catalogFO/01_filterProducts.ts  |  14 +-
 .../sanity/04_catalogFO/02_checkProduct.ts    |  14 +-
 .../sanity/05_cartFO/01_editCheckCart.ts      |  14 +-
 .../sanity/06_checkoutFO/01_orderProduct.ts   |   6 +-
 .../BO/advancedParameters/newFeatures.ts      |  20 --
 tests/UI/package-lock.json                    | 196 ++++++++++++++----
 tests/UI/package.json                         |   1 +
 tests/UI/pages/BO/BObasePage.ts               |  44 ++--
 .../database/dbBackup/index.ts                |  11 +-
 .../database/sqlManager/add.ts                |   2 +-
 .../database/sqlManager/index.ts              |  27 +--
 .../BO/advancedParameters/email/index.ts      |  37 ++--
 .../advancedParameters/featureFlag/index.ts   |   2 +-
 .../BO/advancedParameters/import/index.ts     |   2 +-
 .../pages/BO/advancedParameters/logs/index.ts |  16 +-
 .../BO/advancedParameters/multistore/add.ts   |   2 +-
 .../BO/advancedParameters/multistore/index.ts |  24 +--
 .../advancedParameters/multistore/shop/add.ts |   4 +-
 .../multistore/shop/index.ts                  |  18 +-
 .../multistore/url/addURL.ts                  |   2 +-
 .../multistore/url/index.ts                   |  22 +-
 .../advancedParameters/performance/index.ts   |   2 +-
 .../pages/BO/advancedParameters/team/add.ts   |   2 +-
 .../team/employeeBasePage.ts                  |   2 +-
 .../pages/BO/advancedParameters/team/index.ts |  27 +--
 .../BO/advancedParameters/team/myProfile.ts   |   2 +-
 .../advancedParameters/team/profiles/add.ts   |   2 +-
 .../advancedParameters/team/profiles/index.ts |  17 +-
 .../BO/advancedParameters/webservice/add.ts   |   2 +-
 .../BO/advancedParameters/webservice/index.ts |  30 +--
 .../BO/catalog/attributes/addAttribute.ts     |   2 +-
 .../pages/BO/catalog/attributes/addValue.ts   |   4 +-
 tests/UI/pages/BO/catalog/attributes/index.ts |  26 +--
 tests/UI/pages/BO/catalog/attributes/view.ts  |  22 +-
 tests/UI/pages/BO/catalog/brands/add.ts       |   2 +-
 .../UI/pages/BO/catalog/brands/addAddress.ts  |   2 +-
 tests/UI/pages/BO/catalog/brands/index.ts     |  29 +--
 tests/UI/pages/BO/catalog/categories/add.ts   |   4 +-
 tests/UI/pages/BO/catalog/categories/index.ts |  31 +--
 tests/UI/pages/BO/catalog/discounts/add.ts    |   4 +-
 .../discounts/catalogPriceRules/add.ts        |   2 +-
 .../discounts/catalogPriceRules/index.ts      |  27 +--
 tests/UI/pages/BO/catalog/discounts/index.ts  |  31 +--
 .../pages/BO/catalog/features/addFeature.ts   |   2 +-
 .../UI/pages/BO/catalog/features/addValue.ts  |   4 +-
 .../pages/BO/catalog/features/editFeature.ts  |   2 +-
 tests/UI/pages/BO/catalog/features/index.ts   |  24 +--
 tests/UI/pages/BO/catalog/features/view.ts    |  22 +-
 tests/UI/pages/BO/catalog/files/add.ts        |   2 +-
 tests/UI/pages/BO/catalog/files/index.ts      |  17 +-
 tests/UI/pages/BO/catalog/monitoring/index.ts |  23 +-
 tests/UI/pages/BO/catalog/products/add.ts     |   8 +-
 tests/UI/pages/BO/catalog/products/index.ts   |  55 ++---
 .../pages/BO/catalog/productsV2/add/index.ts  |  12 +-
 .../BO/catalog/productsV2/add/packTab.ts      |   2 +-
 tests/UI/pages/BO/catalog/productsV2/index.ts |  18 +-
 tests/UI/pages/BO/catalog/suppliers/add.ts    |   2 +-
 tests/UI/pages/BO/catalog/suppliers/index.ts  |  23 +-
 .../customerService/customerService/index.ts  |  19 +-
 .../merchandiseReturns/edit.ts                |  14 +-
 .../merchandiseReturns/index.ts               |   8 +-
 .../BO/customerService/orderMessages/add.ts   |   2 +-
 .../BO/customerService/orderMessages/index.ts |  17 +-
 tests/UI/pages/BO/customers/add.ts            |   4 +-
 tests/UI/pages/BO/customers/addresses/add.ts  |   2 +-
 .../UI/pages/BO/customers/addresses/index.ts  |  19 +-
 tests/UI/pages/BO/customers/index.ts          |  31 +--
 .../pages/BO/customers/outstanding/index.ts   |  16 +-
 tests/UI/pages/BO/customers/view.ts           |   4 +-
 tests/UI/pages/BO/design/emailThemes/index.ts |   4 +-
 .../UI/pages/BO/design/emailThemes/preview.ts |   2 +-
 tests/UI/pages/BO/design/imageSettings/add.ts |   2 +-
 .../UI/pages/BO/design/imageSettings/index.ts |  24 ++-
 tests/UI/pages/BO/design/linkWidgets/add.ts   |   2 +-
 tests/UI/pages/BO/design/linkWidgets/index.ts |   4 +-
 tests/UI/pages/BO/design/pages/add.ts         |   4 +-
 tests/UI/pages/BO/design/pages/index.ts       |  37 ++--
 .../pages/BO/design/pages/pageCategory/add.ts |   2 +-
 .../design/themeAndLogo/themeAndLogo/index.ts |   2 +-
 .../themeAndLogo/themeAndLogoBasePage.ts      |   4 +-
 .../pages/BO/international/currencies/add.ts  |   2 +-
 .../BO/international/currencies/index.ts      |  30 +--
 .../pages/BO/international/languages/add.ts   |   2 +-
 .../pages/BO/international/languages/index.ts |  27 ++-
 .../BO/international/localization/index.ts    |   6 +-
 .../localization/localizationBasePage.ts      |   6 +-
 .../pages/BO/international/locations/add.ts   |   2 +-
 .../international/locations/countries/add.ts  |   2 +-
 .../locations/countries/index.ts              |  28 +--
 .../pages/BO/international/locations/index.ts |  32 +--
 .../BO/international/locations/states/add.ts  |   2 +-
 .../international/locations/states/index.ts   |  27 +--
 tests/UI/pages/BO/international/taxes/add.ts  |   2 +-
 .../UI/pages/BO/international/taxes/index.ts  |  31 +--
 .../BO/international/taxes/taxRules/add.ts    |   4 +-
 .../BO/international/taxes/taxRules/index.ts  |  31 ++-
 .../BO/international/translations/index.ts    |   2 +-
 tests/UI/pages/BO/login/index.ts              |   2 +-
 .../BO/modules/keycloakConnectorDemo/index.ts |   2 +-
 .../pages/BO/modules/productComments/index.ts |   4 +-
 tests/UI/pages/BO/orders/add.ts               |   4 +-
 tests/UI/pages/BO/orders/creditSlips/index.ts |  19 +-
 .../UI/pages/BO/orders/deliverySlips/index.ts |   2 +-
 tests/UI/pages/BO/orders/index.ts             |  40 ++--
 tests/UI/pages/BO/orders/invoices/index.ts    |   2 +-
 .../UI/pages/BO/orders/shoppingCarts/index.ts |  21 +-
 .../UI/pages/BO/orders/shoppingCarts/view.ts  |   4 +-
 .../UI/pages/BO/orders/view/customerBlock.ts  |   2 +-
 .../UI/pages/BO/orders/view/messagesBlock.ts  |   2 +-
 tests/UI/pages/BO/orders/view/paymentBlock.ts |   2 +-
 .../UI/pages/BO/orders/view/productsBlock.ts  |   5 +-
 tests/UI/pages/BO/orders/view/tabListBlock.ts |  12 +-
 .../pages/BO/orders/view/viewOrderBasePage.ts |   2 +-
 tests/UI/pages/BO/quickAccess/add.ts          |   2 +-
 tests/UI/pages/BO/quickAccess/index.ts        |  10 +-
 tests/UI/pages/BO/shipping/carriers/index.ts  |  28 +--
 .../UI/pages/BO/shipping/preferences/index.ts |   6 +-
 .../UI/pages/BO/shopParameters/contact/add.ts |   2 +-
 .../pages/BO/shopParameters/contact/index.ts  |  17 +-
 .../customerSettings/groups/add.ts            |   4 +-
 .../customerSettings/groups/index.ts          |  16 +-
 .../shopParameters/customerSettings/index.ts  |   7 +-
 .../customerSettings/titles/add.ts            |   2 +-
 .../customerSettings/titles/index.ts          |  16 +-
 .../pages/BO/shopParameters/general/index.ts  |   8 +-
 .../general/maintenance/index.ts              |  12 +-
 .../BO/shopParameters/orderSettings/index.ts  |  17 +-
 .../orderSettings/statuses/add.ts             |   2 +-
 .../orderSettings/statuses/index.ts           |  32 +--
 .../statuses/returnStatus/add.ts              |   2 +-
 .../shopParameters/productSettings/index.ts   |  54 +++--
 .../UI/pages/BO/shopParameters/search/add.ts  |   2 +-
 .../pages/BO/shopParameters/search/index.ts   |  24 ++-
 .../BO/shopParameters/search/tags/add.ts      |   2 +-
 .../BO/shopParameters/search/tags/index.ts    |  20 +-
 .../UI/pages/BO/shopParameters/stores/add.ts  |   2 +-
 .../pages/BO/shopParameters/stores/index.ts   |  34 +--
 .../trafficAndSeo/searchEngines/add.ts        |   2 +-
 .../trafficAndSeo/searchEngines/index.ts      |  21 +-
 .../trafficAndSeo/seoAndUrls/add.ts           |   2 +-
 .../trafficAndSeo/seoAndUrls/index.ts         |  30 +--
 tests/UI/pages/FO/FObasePage.ts               |  46 ++--
 tests/UI/pages/FO/cart/index.ts               |   3 +-
 tests/UI/pages/FO/category/index.ts           |   4 +-
 tests/UI/pages/FO/checkout/index.ts           |  16 +-
 .../UI/pages/FO/checkout/orderConfirmation.ts |   2 +-
 tests/UI/pages/FO/home/index.ts               |  10 +-
 tests/UI/pages/FO/login/index.ts              |   7 +-
 tests/UI/pages/FO/myAccount/addAddress.ts     |   2 +-
 tests/UI/pages/FO/myAccount/addresses.ts      |  11 +-
 tests/UI/pages/FO/myAccount/creditSlips.ts    |   6 +-
 .../UI/pages/FO/myAccount/gdprPersonalData.ts |   2 +-
 tests/UI/pages/FO/myAccount/identity.ts       |   4 +-
 tests/UI/pages/FO/myAccount/index.ts          |  18 +-
 .../pages/FO/myAccount/merchandiseReturns.ts  |   2 +-
 tests/UI/pages/FO/myAccount/orderDetails.ts   |   6 +-
 tests/UI/pages/FO/myAccount/orderHistory.ts   |  12 +-
 tests/UI/pages/FO/passwordReminder/index.ts   |   3 +-
 tests/UI/pages/FO/product/index.ts            |  22 +-
 tests/UI/pages/FO/searchResults/index.ts      |   2 +-
 tests/UI/pages/FO/siteMap/index.ts            |   2 +-
 tests/UI/pages/commonPage.ts                  |  36 +++-
 tests/UI/tools/urls.ts                        |  10 +-
 tests/UI/utils/api.ts                         |   6 +-
 236 files changed, 1559 insertions(+), 1345 deletions(-)

diff --git a/tests/UI/.eslintrc.js b/tests/UI/.eslintrc.js
index f9e038f297db7..f38e739817390 100755
--- a/tests/UI/.eslintrc.js
+++ b/tests/UI/.eslintrc.js
@@ -14,6 +14,7 @@ module.exports = {
   parserOptions: {
     ecmaVersion: 2018,
     sourceType: 'module',
+    project: './tsconfig.json',
   },
   rules: {
     'no-plusplus': [2, {allowForLoopAfterthoughts: true}],
@@ -56,7 +57,7 @@ module.exports = {
     {
       files: ['*.ts'],
       parser: '@typescript-eslint/parser',
-      plugins: ['@typescript-eslint'],
+      plugins: ['@typescript-eslint', 'deprecation'],
       extends: ['plugin:@typescript-eslint/eslint-recommended', 'plugin:@typescript-eslint/recommended'],
       rules: {
         'spaced-comment': 0,
@@ -72,6 +73,7 @@ module.exports = {
         '@typescript-eslint/explicit-module-boundary-types': ['error', {allowArgumentsExplicitlyTypedAsAny: true}],
         'func-names': 0,
         'no-new': 0,
+        'deprecation/deprecation': 'error',
       },
     },
   ],
diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/02_productBlock.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/02_productBlock.ts
index e11a564911f35..d8f8fe6f62d28 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/02_productBlock.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/02_productBlock.ts
@@ -3,18 +3,19 @@ import helper from '@utils/helpers';
 import testContext from '@utils/testContext';
 
 // Import commonTests
+import {
+  resetNewProductPageAsDefault,
+  setFeatureFlag,
+} from '@commonTests/BO/advancedParameters/newFeatures';
 import {deleteCartRuleTest} from '@commonTests/BO/catalog/cartRule';
 import {bulkDeleteProductsTest} from '@commonTests/BO/catalog/product';
 import {deleteCustomerTest} from '@commonTests/BO/customers/customer';
 import {enableEcoTaxTest, disableEcoTaxTest} from '@commonTests/BO/international/ecoTax';
 import loginCommon from '@commonTests/BO/loginBO';
 import {createOrderByGuestTest} from '@commonTests/FO/order';
-import {
-  disableNewProductPageTest,
-  resetNewProductPageAsDefault,
-} from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import BO pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import cartRulesPage from '@pages/BO/catalog/discounts';
 import addCartRulePage from '@pages/BO/catalog/discounts/add';
 import productsPage from '@pages/BO/catalog/products';
@@ -211,7 +212,7 @@ describe('BO - Orders - View and edit order : Check product block in view order
   enableEcoTaxTest(`${baseContext}_preTest_2`);
 
   // Pre-condition: Disable new product page
-  disableNewProductPageTest(`${baseContext}_disableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, `${baseContext}_disableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/04_documentsTab.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/04_documentsTab.ts
index 22c864d660955..978ae408e831b 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/04_documentsTab.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/04_documentsTab.ts
@@ -226,7 +226,7 @@ describe('BO - Orders - View and edit order : Check order documents tab', async
 
   // 6 - Check documents tab
   describe('Check documents tab', async () => {
-    it('should click on \'DocumentS\' tab', async function () {
+    it('should click on \'Documents\' tab', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'displayDocumentsTab2', baseContext);
 
       const isTabOpened = await orderPageTabListBlock.goToDocumentsTab(page);
diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/11_checkInvoice.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/11_checkInvoice.ts
index 82bf0d9f0774b..787cbcedcbd91 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/11_checkInvoice.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/11_checkInvoice.ts
@@ -12,11 +12,12 @@ import {enableEcoTaxTest, disableEcoTaxTest} from '@commonTests/BO/international
 import loginCommon from '@commonTests/BO/loginBO';
 import {createOrderByCustomerTest, createOrderSpecificProductTest} from '@commonTests/FO/order';
 import {
-  disableNewProductPageTest,
   resetNewProductPageAsDefault,
+  setFeatureFlag,
 } from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import BO pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import productsPage from '@pages/BO/catalog/products';
 import addProductPage from '@pages/BO/catalog/products/add';
 import dashboardPage from '@pages/BO/dashboard';
@@ -164,7 +165,7 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
   enableEcoTaxTest(`${baseContext}_preTest_2`);
 
   // Pre-condition: Disable new product page
-  disableNewProductPageTest(`${baseContext}_disableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, `${baseContext}_disableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/12_checkMultiInvoice.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/12_checkMultiInvoice.ts
index d628e0db5068a..f079b98ec7808 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/12_checkMultiInvoice.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/12_checkMultiInvoice.ts
@@ -9,11 +9,12 @@ import {createProductTest, bulkDeleteProductsTest} from '@commonTests/BO/catalog
 import loginCommon from '@commonTests/BO/loginBO';
 import {createOrderSpecificProductTest} from '@commonTests/FO/order';
 import {
-  disableNewProductPageTest,
   resetNewProductPageAsDefault,
+  setFeatureFlag,
 } from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import BO pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import ordersPage from '@pages/BO/orders';
 import orderPageProductsBlock from '@pages/BO/orders/view/productsBlock';
@@ -91,7 +92,7 @@ describe('BO - Orders - View and edit order: Check multi invoice', async () => {
   });
 
   // Pre-condition: Disable new product page
-  disableNewProductPageTest(`${baseContext}_disableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, `${baseContext}_disableNewProduct`);
 
   // Pre-condition: Create first product
   createProductTest(firstProduct, `${baseContext}_preTest_1`);
diff --git a/tests/UI/campaigns/functional/BO/02_orders/02_invoices/03_invoiceOptions/02_enableDisableTaxBreakdown.ts b/tests/UI/campaigns/functional/BO/02_orders/02_invoices/03_invoiceOptions/02_enableDisableTaxBreakdown.ts
index d3721f6e6d2a6..6f3f71530a3e2 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/02_invoices/03_invoiceOptions/02_enableDisableTaxBreakdown.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/02_invoices/03_invoiceOptions/02_enableDisableTaxBreakdown.ts
@@ -7,12 +7,13 @@ import testContext from '@utils/testContext';
 import {bulkDeleteProductsTest} from '@commonTests/BO/catalog/product';
 import loginCommon from '@commonTests/BO/loginBO';
 import {
-  disableNewProductPageTest,
   resetNewProductPageAsDefault,
+  setFeatureFlag,
 } from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
 // Import BO pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import addProductPage from '@pages/BO/catalog/products/add';
 import boProductsPage from '@pages/BO/catalog/products';
 import dashboardPage from '@pages/BO/dashboard';
@@ -76,7 +77,7 @@ describe('BO - Orders - Invoices : Enable/Disable tax breakdown', async () => {
   });
 
   // Pre-condition: Disable new product page
-  disableNewProductPageTest(`${baseContext}_dnableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, `${baseContext}_dnableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/functional/BO/02_orders/03_creditSlips/04_creditSlipOptions.ts b/tests/UI/campaigns/functional/BO/02_orders/03_creditSlips/04_creditSlipOptions.ts
index 610bb495012bb..769e2b6f7b47b 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/03_creditSlips/04_creditSlipOptions.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/03_creditSlips/04_creditSlipOptions.ts
@@ -7,11 +7,12 @@ import {createProductTest, deleteProductTest} from '@commonTests/BO/catalog/prod
 import {createOrderSpecificProductTest} from '@commonTests/FO/order';
 import loginCommon from '@commonTests/BO/loginBO';
 import {
-  disableNewProductPageTest,
   resetNewProductPageAsDefault,
+  setFeatureFlag,
 } from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import creditSlipsPage from '@pages/BO/orders/creditSlips';
 import ordersPage from '@pages/BO/orders';
@@ -69,7 +70,7 @@ describe('BO - Orders - Credit slips: Credit slip options', async () => {
   });
 
   // Pre-condition: Disable new product page
-  disableNewProductPageTest(`${baseContext}_disableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, `${baseContext}_disableNewProduct`);
 
   // Pre-condition: Create first product
   createProductTest(product, baseContext);
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/01_products/01_filterAndQuickEditProducts.ts b/tests/UI/campaigns/functional/BO/03_catalog/01_products/01_filterAndQuickEditProducts.ts
index 0adb930cc2146..9374316b11e71 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/01_products/01_filterAndQuickEditProducts.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/01_products/01_filterAndQuickEditProducts.ts
@@ -5,11 +5,12 @@ import testContext from '@utils/testContext';
 // Import commonTests
 import loginCommon from '@commonTests/BO/loginBO';
 import {
-  disableNewProductPageTest,
+  setFeatureFlag,
   resetNewProductPageAsDefault,
 } from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import productsPage from '@pages/BO/catalog/products';
 
@@ -29,7 +30,7 @@ describe('BO - Catalog - Products : Filter and quick edit Products table', async
   let filterValue: string = '';
 
   // Pre-condition: Disable new product page
-  disableNewProductPageTest(`${baseContext}_disableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, `${baseContext}_disableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/01_products/02_paginationAndSortProducts.ts b/tests/UI/campaigns/functional/BO/03_catalog/01_products/02_paginationAndSortProducts.ts
index 39a0a5b7c04df..c79cf7363f6ff 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/01_products/02_paginationAndSortProducts.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/01_products/02_paginationAndSortProducts.ts
@@ -6,11 +6,12 @@ import testContext from '@utils/testContext';
 // Import commonTests
 import loginCommon from '@commonTests/BO/loginBO';
 import {
-  disableNewProductPageTest,
   resetNewProductPageAsDefault,
+  setFeatureFlag,
 } from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import productsPage from '@pages/BO/catalog/products';
 import addProductPage from '@pages/BO/catalog/products/add';
@@ -35,7 +36,7 @@ describe('BO - Catalog - Products : Pagination and sort Products table', async (
   let numberOfProducts: number = 0;
 
   // Pre-condition: Disable new product page
-  disableNewProductPageTest(`${baseContext}_enableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, `${baseContext}_enableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/01_products/04_previewProductFromList.ts b/tests/UI/campaigns/functional/BO/03_catalog/01_products/04_previewProductFromList.ts
index 1d790bd0841ed..89bf68e4e0388 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/01_products/04_previewProductFromList.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/01_products/04_previewProductFromList.ts
@@ -5,12 +5,13 @@ import testContext from '@utils/testContext';
 // Import commonTests
 import loginCommon from '@commonTests/BO/loginBO';
 import {
-  disableNewProductPageTest,
+  setFeatureFlag,
   resetNewProductPageAsDefault,
 } from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
 // Import BO pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import productsPage from '@pages/BO/catalog/products';
 import dashboardPage from '@pages/BO/dashboard';
 // Import FO pages
@@ -37,7 +38,7 @@ describe('BO - Catalog - Products : Preview product from list', async () => {
   let numberOfProducts: number = 0;
 
   // Pre-condition: Disable new product page
-  disableNewProductPageTest(`${baseContext}_disableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, `${baseContext}_disableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/01_products/05_duplicateProductFromList.ts b/tests/UI/campaigns/functional/BO/03_catalog/01_products/05_duplicateProductFromList.ts
index 0e0074bb78849..dacaa0f97217f 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/01_products/05_duplicateProductFromList.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/01_products/05_duplicateProductFromList.ts
@@ -5,11 +5,12 @@ import testContext from '@utils/testContext';
 // Import commonTests
 import loginCommon from '@commonTests/BO/loginBO';
 import {
-  disableNewProductPageTest,
   resetNewProductPageAsDefault,
+  setFeatureFlag,
 } from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import productsPage from '@pages/BO/catalog/products';
 import addProductPage from '@pages/BO/catalog/products/add';
 import dashboardPage from '@pages/BO/dashboard';
@@ -36,7 +37,7 @@ describe('BO - Catalog - Products : Duplicate product from list', async () => {
   let numberOfProducts: number = 0;
 
   // Pre-condition: Disable new product page
-  disableNewProductPageTest(`${baseContext}_disableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, `${baseContext}_disableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/01_products/06_bulkActions.ts b/tests/UI/campaigns/functional/BO/03_catalog/01_products/06_bulkActions.ts
index dacec43b3cdee..aabfbe9724d77 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/01_products/06_bulkActions.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/01_products/06_bulkActions.ts
@@ -5,11 +5,12 @@ import testContext from '@utils/testContext';
 // Import commonTests
 import loginCommon from '@commonTests/BO/loginBO';
 import {
-  disableNewProductPageTest,
   resetNewProductPageAsDefault,
+  setFeatureFlag,
 } from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import productsPage from '@pages/BO/catalog/products';
 import addProductPage from '@pages/BO/catalog/products/add';
 import dashboardPage from '@pages/BO/dashboard';
@@ -38,7 +39,7 @@ describe('BO - Catalog - Products : Bulk actions products', async () => {
   const secondProductData: ProductData = new ProductData({name: 'TO DELETE 2', type: 'Standard product'});
 
   // Pre-condition: Disable new product page
-  disableNewProductPageTest(`${baseContext}_disableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, `${baseContext}_disableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/02_monitoringProducts.ts b/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/02_monitoringProducts.ts
index 6687db30c53b1..4a98cc7901863 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/02_monitoringProducts.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/02_monitoringProducts.ts
@@ -5,11 +5,12 @@ import testContext from '@utils/testContext';
 // Import commonTests
 import loginCommon from '@commonTests/BO/loginBO';
 import {
-  disableNewProductPageTest,
   resetNewProductPageAsDefault,
+  setFeatureFlag,
 } from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import productsPage from '@pages/BO/catalog/products';
 import addProductPage from '@pages/BO/catalog/products/add';
@@ -42,7 +43,7 @@ describe('BO - Catalog - Monitoring : Create different products and delete them
   const productWithoutDescription: ProductData = new ProductData({type: 'Standard product', description: '', summary: ''});
 
   // Pre-condition: Disable new product page
-  disableNewProductPageTest(`${baseContext}_disableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, `${baseContext}_disableNewProduct`);
 
   // before and after functions
   before(async function () {
@@ -113,26 +114,28 @@ describe('BO - Catalog - Monitoring : Create different products and delete them
     },
   ];
 
-  tests.forEach((test) => {
+  tests.forEach((test, index: number) => {
     describe(`Create product ${test.args.productType} in BO`, async () => {
-      it('should go to \'Catalog > Products\' page', async function () {
-        await testContext.addContextItem(
-          this,
-          'testIdentifier',
-          `${test.args.testIdentifier}_goToProductsPage`,
-          baseContext,
-        );
+      if (index === 0) {
+        it('should go to \'Catalog > Products\' page', async function () {
+          await testContext.addContextItem(
+            this,
+            'testIdentifier',
+            `${test.args.testIdentifier}_goToProductsPage`,
+            baseContext,
+          );
 
-        await dashboardPage.goToSubMenu(
-          page,
-          dashboardPage.catalogParentLink,
-          dashboardPage.productsLink,
-        );
-        await productsPage.closeSfToolBar(page);
+          await dashboardPage.goToSubMenu(
+            page,
+            dashboardPage.catalogParentLink,
+            dashboardPage.productsLink,
+          );
+          await productsPage.closeSfToolBar(page);
 
-        const pageTitle = await productsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(productsPage.pageTitle);
-      });
+          const pageTitle = await productsPage.getPageTitle(page);
+          await expect(pageTitle).to.contains(productsPage.pageTitle);
+        });
+      }
 
       it('should reset all filters and get number of products in BO', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}_resetFirst`, baseContext);
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/01_attributes/attributes/02_sortPaginationAndBulkDelete.ts b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/01_attributes/attributes/02_sortPaginationAndBulkDelete.ts
index 0c17a91a536d8..e3fdb59a3f47e 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/01_attributes/attributes/02_sortPaginationAndBulkDelete.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/01_attributes/attributes/02_sortPaginationAndBulkDelete.ts
@@ -26,7 +26,7 @@ Pagination next and previous
 Sort attributes table by ID, Name and Position
 Delete the created attributes by bulk actions
  */
-describe('Bo - Catalog - Attributes & Features : Sort, pagination and bulk delete attributes', async () => {
+describe('BO - Catalog - Attributes & Features : Sort, pagination and bulk delete attributes', async () => {
   let browserContext: BrowserContext;
   let page: Page;
   let numberOfAttributes: number = 0;
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/04_filterStocksByStatus.ts b/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/04_filterStocksByStatus.ts
index 40326f329a882..834153e62271d 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/04_filterStocksByStatus.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/04_filterStocksByStatus.ts
@@ -5,11 +5,12 @@ import testContext from '@utils/testContext';
 // Import commonTests
 import loginCommon from '@commonTests/BO/loginBO';
 import {
-  disableNewProductPageTest,
   resetNewProductPageAsDefault,
+  setFeatureFlag,
 } from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import productsPage from '@pages/BO/catalog/products';
 import addProductPage from '@pages/BO/catalog/products/add';
@@ -36,7 +37,7 @@ describe('BO - Catalog - Stocks : Filter stocks by status', async () => {
   const productData: ProductData = new ProductData({type: 'Standard product', status: false});
 
   // Pre-condition: Disable new product page
-  disableNewProductPageTest(`${baseContext}_disableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, `${baseContext}_disableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/functional/BO/04_customers/02_addresses/02_CRUDAddressInBO.ts b/tests/UI/campaigns/functional/BO/04_customers/02_addresses/02_CRUDAddressInBO.ts
index 0757e206d113b..251b4295f9aad 100644
--- a/tests/UI/campaigns/functional/BO/04_customers/02_addresses/02_CRUDAddressInBO.ts
+++ b/tests/UI/campaigns/functional/BO/04_customers/02_addresses/02_CRUDAddressInBO.ts
@@ -86,19 +86,6 @@ describe('BO - Customers - Addresses : CRUD Address in BO', async () => {
 
   // 2 : Update address
   describe('Update address', async () => {
-    it('should go to \'Customers > Addresses\' page', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'goToAddressesPageToUpdate', baseContext);
-
-      await addressesPage.goToSubMenu(
-        page,
-        addressesPage.customersParentLink,
-        addressesPage.addressesLink,
-      );
-
-      const pageTitle = await addressesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addressesPage.pageTitle);
-    });
-
     it('should filter list by first name and last name', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'filterToUpdate', baseContext);
 
@@ -135,19 +122,6 @@ describe('BO - Customers - Addresses : CRUD Address in BO', async () => {
 
   // 3 : Delete address from BO
   describe('Delete address', async () => {
-    it('should go to \'Customers > Addresses\' page', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'goToAddressesPageToDelete', baseContext);
-
-      await addressesPage.goToSubMenu(
-        page,
-        addressesPage.customersParentLink,
-        addressesPage.addressesLink,
-      );
-
-      const pageTitle = await addressesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addressesPage.pageTitle);
-    });
-
     it('should filter list by first name and last name', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'filterToDelete', baseContext);
 
diff --git a/tests/UI/campaigns/functional/BO/04_customers/03_outstanding/04_pagination.ts b/tests/UI/campaigns/functional/BO/04_customers/03_outstanding/04_pagination.ts
index c0f2de747d04d..84636eff98a85 100644
--- a/tests/UI/campaigns/functional/BO/04_customers/03_outstanding/04_pagination.ts
+++ b/tests/UI/campaigns/functional/BO/04_customers/03_outstanding/04_pagination.ts
@@ -82,11 +82,15 @@ describe('BO - Customers - Outstanding : Pagination of the outstanding page', as
         it('should go to Orders > Orders page', async function () {
           await testContext.addContextItem(this, 'testIdentifier', `goToOrdersPage_${index}`, baseContext);
 
-          await dashboardPage.goToSubMenu(
-            page,
-            dashboardPage.ordersParentLink,
-            dashboardPage.ordersLink,
-          );
+          if (index === 0) {
+            await dashboardPage.goToSubMenu(
+              page,
+              dashboardPage.ordersParentLink,
+              dashboardPage.ordersLink,
+            );
+          } else {
+            await ordersPage.reloadPage(page);
+          }
 
           const pageTitle = await ordersPage.getPageTitle(page);
           await expect(pageTitle).to.contains(ordersPage.pageTitle);
diff --git a/tests/UI/campaigns/functional/BO/04_customers/03_outstanding/05_sortFilterOutstanding.ts b/tests/UI/campaigns/functional/BO/04_customers/03_outstanding/05_sortFilterOutstanding.ts
index 4b775955af67e..ab2560072584c 100644
--- a/tests/UI/campaigns/functional/BO/04_customers/03_outstanding/05_sortFilterOutstanding.ts
+++ b/tests/UI/campaigns/functional/BO/04_customers/03_outstanding/05_sortFilterOutstanding.ts
@@ -77,7 +77,7 @@ describe('BO - Customers - Outstanding : Filter and sort the Outstanding table',
     it('should login to BO', async function () {
       await loginCommon.loginBO(this, page);
     });
-    customersData.forEach((customerData: CustomerData, index: number = 1) => {
+    customersData.forEach((customerData: CustomerData, index: number) => {
       const addressData: AddressData = new AddressData({
         email: customerData.email,
         country: 'France',
@@ -108,11 +108,15 @@ describe('BO - Customers - Outstanding : Filter and sort the Outstanding table',
         it('should go to Orders > Orders page', async function () {
           await testContext.addContextItem(this, 'testIdentifier', `goToOrdersPage_${index}`, baseContext);
 
-          await dashboardPage.goToSubMenu(
-            page,
-            dashboardPage.ordersParentLink,
-            dashboardPage.ordersLink,
-          );
+          if (index === 0) {
+            await dashboardPage.goToSubMenu(
+              page,
+              dashboardPage.ordersParentLink,
+              dashboardPage.ordersLink,
+            );
+          } else {
+            await ordersPage.reloadPage(page);
+          }
 
           const pageTitle = await ordersPage.getPageTitle(page);
           await expect(pageTitle).to.contains(ordersPage.pageTitle);
diff --git a/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/01_viewMessage.ts b/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/01_viewMessage.ts
index 9c61f76ab8cc4..254835e958977 100644
--- a/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/01_viewMessage.ts
+++ b/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/01_viewMessage.ts
@@ -124,7 +124,7 @@ describe('BO - Customer Service : View message', async () => {
       const text = await viewPage.getCustomerMessage(page);
       expect(text).to.contains(contactUsData.emailAddress);
       expect(text).to.contains(contactUsData.subject);
-      expect(text).to.contains(`${messageDateTime.substr(0, 10)} - ${messageDateTime.substr(11, 5)}`);
+      expect(text).to.contains(`${messageDateTime.substring(0, 10)} - ${messageDateTime.substring(11, 16)}`);
       expect(text).to.contains('Attachment');
       expect(text).to.contains(contactUsData.message);
     });
@@ -146,7 +146,7 @@ describe('BO - Customer Service : View message', async () => {
 
       const text = await viewPage.getOrdersAndMessagesTimeline(page);
       expect(text).to.contains('Orders and messages timeline');
-      expect(text).to.contains(`${messageDateTime.substr(0, 10)} - ${messageDateTime.substr(11, 5)}`);
+      expect(text).to.contains(`${messageDateTime.substring(0, 10)} - ${messageDateTime.substring(11, 16)}`);
       expect(text).to.contains(`Message to: ${contactUsData.subject}`);
       expect(text).to.contains(contactUsData.message);
     });
@@ -169,12 +169,6 @@ describe('BO - Customer Service : View message', async () => {
     it('should delete the message', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteMessage', baseContext);
 
-      await dashboardPage.goToSubMenu(
-        page,
-        dashboardPage.customerServiceParentLink,
-        dashboardPage.customerServiceLink,
-      );
-
       const textResult = await customerServicePage.deleteMessage(page, 1);
       await expect(textResult).to.contains(customerServicePage.successfulDeleteMessage);
     });
diff --git a/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/02_changeStatus.ts b/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/02_changeStatus.ts
index 88bea6c696ed8..fc942ed8498c7 100644
--- a/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/02_changeStatus.ts
+++ b/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/02_changeStatus.ts
@@ -221,12 +221,6 @@ describe('BO - Customer Service : Change status', async () => {
     it('should delete the message', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteMessage', baseContext);
 
-      await dashboardPage.goToSubMenu(
-        page,
-        dashboardPage.customerServiceParentLink,
-        dashboardPage.customerServiceLink,
-      );
-
       const textResult = await customerServicePage.deleteMessage(page, 1);
       await expect(textResult).to.contains(customerServicePage.successfulDeleteMessage);
     });
diff --git a/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/03_respondToMessage.ts b/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/03_respondToMessage.ts
index 82b12978bd0bc..0865916521e7a 100644
--- a/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/03_respondToMessage.ts
+++ b/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/03_respondToMessage.ts
@@ -139,12 +139,6 @@ describe('BO - Customer Service : Respond to message', async () => {
     it('should delete the message', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteMessage', baseContext);
 
-      await dashboardPage.goToSubMenu(
-        page,
-        dashboardPage.customerServiceParentLink,
-        dashboardPage.customerServiceLink,
-      );
-
       const textResult = await customerServicePage.deleteMessage(page, 1);
       await expect(textResult).to.contains(customerServicePage.successfulDeleteMessage);
     });
diff --git a/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/04_contactOptions.ts b/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/04_contactOptions.ts
index 337d824e0e14c..16e0975aa478f 100644
--- a/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/04_contactOptions.ts
+++ b/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/04_contactOptions.ts
@@ -193,28 +193,9 @@ describe('BO - Customer Service : Contact options', async () => {
   });
 
   describe('BO : Delete the order message', async () => {
-    it('should go to \'Customer Service > Customer Service\' page', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'goToOrderMessagesPageToDelete', baseContext);
-
-      await dashboardPage.goToSubMenu(
-        page,
-        dashboardPage.customerServiceParentLink,
-        dashboardPage.customerServiceLink,
-      );
-
-      const pageTitle = await customerServicePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customerServicePage.pageTitle);
-    });
-
     it('should delete the message', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteMessage', baseContext);
 
-      await dashboardPage.goToSubMenu(
-        page,
-        dashboardPage.customerServiceParentLink,
-        dashboardPage.customerServiceLink,
-      );
-
       const textResult = await customerServicePage.deleteMessage(page, 1);
       await expect(textResult).to.contains(customerServicePage.successfulDeleteMessage);
     });
diff --git a/tests/UI/campaigns/functional/BO/08_design/04_pages/pages/02_pagesBulkActions.ts b/tests/UI/campaigns/functional/BO/08_design/04_pages/pages/02_pagesBulkActions.ts
index f712b2cc6d00f..f38592d0a90e6 100644
--- a/tests/UI/campaigns/functional/BO/08_design/04_pages/pages/02_pagesBulkActions.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/04_pages/pages/02_pagesBulkActions.ts
@@ -23,7 +23,7 @@ const baseContext: string = 'functional_BO_design_pages_pages_pagesBulkActions';
 Create 2 new pages
 Enable/Disable/Delete pages by bulk actions
  */
-describe('Bo - Design - Pages : Enable/Disable/Delete pages with Bulk Actions', async () => {
+describe('BO - Design - Pages : Enable/Disable/Delete pages with Bulk Actions', async () => {
   let browserContext: BrowserContext;
   let page: Page;
   let numberOfPages: number = 0;
diff --git a/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/16_checkBaseImageFormat.ts b/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/16_checkBaseImageFormat.ts
index 3f07bd5f7e19d..1dc2f0edb213c 100644
--- a/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/16_checkBaseImageFormat.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/16_checkBaseImageFormat.ts
@@ -138,19 +138,21 @@ describe('BO - Design - Image Settings - Check base image format', async () => {
       },
     ].forEach((arg: {baseFormat: string, product: ProductData, extOriginal: string, extGenerated: string}, index: number) => {
       describe(`Base Format : ${arg.baseFormat.toUpperCase()} - Image Extension : ${arg.extOriginal.toUpperCase()}`, async () => {
-        it('should go to \'Design > Image Settings\' page', async function () {
-          await testContext.addContextItem(this, 'testIdentifier', `goToImageSettingsPage${index}`, baseContext);
-
-          await dashboardPage.goToSubMenu(
-            page,
-            dashboardPage.designParentLink,
-            dashboardPage.imageSettingsLink,
-          );
-          await imageSettingsPage.closeSfToolBar(page);
-
-          const pageTitle = await imageSettingsPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(imageSettingsPage.pageTitle);
-        });
+        if (index !== 0) {
+          it('should go to \'Design > Image Settings\' page', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', `goToImageSettingsPage${index}`, baseContext);
+
+            await dashboardPage.goToSubMenu(
+              page,
+              dashboardPage.designParentLink,
+              dashboardPage.imageSettingsLink,
+            );
+            await imageSettingsPage.closeSfToolBar(page);
+
+            const pageTitle = await imageSettingsPage.getPageTitle(page);
+            await expect(pageTitle).to.contains(imageSettingsPage.pageTitle);
+          });
+        }
 
         it(`should enable ${arg.baseFormat.toUpperCase()} as Base Format in Image Generation Options`, async function () {
           await testContext.addContextItem(this, 'testIdentifier', `setBaseFormatImageGenerationOptions${index}`, baseContext);
diff --git a/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/02_CRUDTaxesInBO.ts b/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/02_CRUDTaxesInBO.ts
index fece9d92378bd..fdf7488caac0c 100644
--- a/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/02_CRUDTaxesInBO.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/02_CRUDTaxesInBO.ts
@@ -85,19 +85,6 @@ describe('BO - International - Taxes : Create, Update and Delete Tax', async ()
 
   // 2 : Update Tax with data generated with faker
   describe('Update Tax Created', async () => {
-    it('should go to tax page', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'goToTaxPageToUpdate', baseContext);
-
-      await taxesPage.goToSubMenu(
-        page,
-        taxesPage.internationalParentLink,
-        taxesPage.taxesLink,
-      );
-
-      const pageTitle = await taxesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(taxesPage.pageTitle);
-    });
-
     it('should filter list by tax name', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'filterByNameToUpdate', baseContext);
 
@@ -152,19 +139,6 @@ describe('BO - International - Taxes : Create, Update and Delete Tax', async ()
 
   // 3 : Delete Tax created from dropdown Menu
   describe('Delete Tax', async () => {
-    it('should go to \'International > Taxes\' page', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'goToTaxPageToDelete', baseContext);
-
-      await taxesPage.goToSubMenu(
-        page,
-        taxesPage.internationalParentLink,
-        taxesPage.taxesLink,
-      );
-
-      const pageTitle = await taxesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(taxesPage.pageTitle);
-    });
-
     it('should filter list by Tax name', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'filterByNameToDelete', baseContext);
 
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/03_maxSizeShortDescription.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/03_maxSizeShortDescription.ts
index 1f3d96bdcfbd4..e29c13f282385 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/03_maxSizeShortDescription.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/03_maxSizeShortDescription.ts
@@ -5,11 +5,12 @@ import testContext from '@utils/testContext';
 // Import commonTests
 import loginCommon from '@commonTests/BO/loginBO';
 import {
-  disableNewProductPageTest,
   resetNewProductPageAsDefault,
+  setFeatureFlag,
 } from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import productSettingsPage from '@pages/BO/shopParameters/productSettings';
 import productsPage from '@pages/BO/catalog/products';
@@ -38,7 +39,7 @@ describe('BO - Shop Parameters - Product Settings : Update max size of short des
   const defaultSummarySizeValue: number = 800;
 
   // Pre-condition: Disable new product page
-  disableNewProductPageTest(`${baseContext}_disableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, `${baseContext}_disableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/04_quantityDiscountsBasedOn.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/04_quantityDiscountsBasedOn.ts
index b3d53c4ef42cd..da14e101740f3 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/04_quantityDiscountsBasedOn.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/04_quantityDiscountsBasedOn.ts
@@ -5,12 +5,13 @@ import testContext from '@utils/testContext';
 // Import commonTests
 import loginCommon from '@commonTests/BO/loginBO';
 import {
-  disableNewProductPageTest,
   resetNewProductPageAsDefault,
+  setFeatureFlag,
 } from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
 // Import BO pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import productSettingsPage from '@pages/BO/shopParameters/productSettings';
 import productsPage from '@pages/BO/catalog/products';
@@ -85,7 +86,7 @@ describe('BO - Shop Parameters - Product Settings : Choose quantity discount bas
   const secondCartTotalATI: number = 40;
 
   // Pre-condition: Disable new product page
-  disableNewProductPageTest(`${baseContext}_disableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, `${baseContext}_disableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/05_forceUpdateFriendlyURL.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/05_forceUpdateFriendlyURL.ts
index 3aa31e1b43991..1c89498846ad1 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/05_forceUpdateFriendlyURL.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/05_forceUpdateFriendlyURL.ts
@@ -5,11 +5,12 @@ import testContext from '@utils/testContext';
 // Import commonTests
 import loginCommon from '@commonTests/BO/loginBO';
 import {
-  disableNewProductPageTest,
   resetNewProductPageAsDefault,
+  setFeatureFlag,
 } from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import productSettingsPage from '@pages/BO/shopParameters/productSettings';
 import productsPage from '@pages/BO/catalog/products';
@@ -41,7 +42,7 @@ describe('BO - Shop Parameters - Product Settings : Enable/Disable force update
   });
 
   // Pre-condition: Disable new product page
-  disableNewProductPageTest(`${baseContext}_disableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, `${baseContext}_disableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/06_defaultActivationStatus.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/06_defaultActivationStatus.ts
index 0d9c3a2d4978e..c2cbf3e09c29d 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/06_defaultActivationStatus.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/06_defaultActivationStatus.ts
@@ -5,11 +5,12 @@ import testContext from '@utils/testContext';
 // Import commonTests
 import loginCommon from '@commonTests/BO/loginBO';
 import {
-  disableNewProductPageTest,
   resetNewProductPageAsDefault,
+  setFeatureFlag,
 } from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import productSettingsPage from '@pages/BO/shopParameters/productSettings';
 import productsPage from '@pages/BO/catalog/products';
@@ -31,7 +32,7 @@ describe('BO - Shop Parameters - Product Settings : Enable/Disable default activ
   let page: Page;
 
   // Pre-condition: Disable new product page
-  disableNewProductPageTest(`${baseContext}_disableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, `${baseContext}_disableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/01_enableStockManagement.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/01_enableStockManagement.ts
index 57ea1b7ca0e19..7270a361cf16f 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/01_enableStockManagement.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/01_enableStockManagement.ts
@@ -5,11 +5,12 @@ import testContext from '@utils/testContext';
 // Import commonTests
 import loginCommon from '@commonTests/BO/loginBO';
 import {
-  disableNewProductPageTest,
+  setFeatureFlag,
   resetNewProductPageAsDefault,
 } from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import productSettingsPage from '@pages/BO/shopParameters/productSettings';
 import productsPage from '@pages/BO/catalog/products';
@@ -25,7 +26,7 @@ describe('BO - Shop Parameters - Product Settings : Enable/Disable stock managem
   let page: Page;
 
   // Pre-condition: Disable new product page
-  disableNewProductPageTest(`${baseContext}_disableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, `${baseContext}_disableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/02_defaultPackStockManagement.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/02_defaultPackStockManagement.ts
index 7e3d711c148f4..e435299eb898b 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/02_defaultPackStockManagement.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/02_defaultPackStockManagement.ts
@@ -5,11 +5,12 @@ import testContext from '@utils/testContext';
 // Import commonTests
 import loginCommon from '@commonTests/BO/loginBO';
 import {
-  disableNewProductPageTest,
   resetNewProductPageAsDefault,
+  setFeatureFlag,
 } from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import BO pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import productSettingsPage from '@pages/BO/shopParameters/productSettings';
 import productsPage from '@pages/BO/catalog/products';
@@ -55,7 +56,7 @@ describe('BO - Shop Parameters - Product Settings : Default pack stock managemen
   });
 
   // Pre-condition: Disable new product page
-  disableNewProductPageTest(`${baseContext}_disableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, `${baseContext}_disableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/03_displayUnavailableProductAttributes.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/03_displayUnavailableProductAttributes.ts
index 155d76dd2d9c7..a7963bdb5b8d2 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/03_displayUnavailableProductAttributes.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/03_displayUnavailableProductAttributes.ts
@@ -5,12 +5,13 @@ import testContext from '@utils/testContext';
 // Import commonTests
 import loginCommon from '@commonTests/BO/loginBO';
 import {
-  disableNewProductPageTest,
   resetNewProductPageAsDefault,
+  setFeatureFlag,
 } from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
 // Import BO pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import productSettingsPage from '@pages/BO/shopParameters/productSettings';
 import productsPage from '@pages/BO/catalog/products';
@@ -49,7 +50,7 @@ describe('BO - Shop Parameters - Product Settings : Display unavailable product
   });
 
   // Pre-condition: Disable new product page
-  disableNewProductPageTest(`${baseContext}_disableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, `${baseContext}_disableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/04_displayRemainingQuantities.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/04_displayRemainingQuantities.ts
index 2bb58ce11b613..49d1cfdcaab22 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/04_displayRemainingQuantities.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/04_displayRemainingQuantities.ts
@@ -5,12 +5,13 @@ import testContext from '@utils/testContext';
 // Import commonTests
 import loginCommon from '@commonTests/BO/loginBO';
 import {
-  disableNewProductPageTest,
   resetNewProductPageAsDefault,
+  setFeatureFlag,
 } from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
 // Import BO pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import productSettingsPage from '@pages/BO/shopParameters/productSettings';
 import productsPage from '@pages/BO/catalog/products';
@@ -44,7 +45,7 @@ describe('BO - Shop Parameters - Product Settings : Display remaining quantities
   const defaultRemainingQuantity: number = 3;
 
   // Pre-condition: Disable new product page
-  disableNewProductPageTest(`${baseContext}_disableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, `${baseContext}_disableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/05_allowOrderingOutOfStock.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/05_allowOrderingOutOfStock.ts
index ab144484203e5..31e3eb472bb14 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/05_allowOrderingOutOfStock.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/05_allowOrderingOutOfStock.ts
@@ -5,12 +5,13 @@ import testContext from '@utils/testContext';
 // Import commonTests
 import loginCommon from '@commonTests/BO/loginBO';
 import {
-  disableNewProductPageTest,
   resetNewProductPageAsDefault,
+  setFeatureFlag,
 } from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
 // Import BO pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import productSettingsPage from '@pages/BO/shopParameters/productSettings';
 import productsPage from '@pages/BO/catalog/products';
@@ -35,7 +36,7 @@ describe('BO - Shop Parameters - Product Settings : Allow ordering of out-of-sto
   const productData: ProductData = new ProductData({type: 'Standard product', quantity: 0});
 
   // Pre-condition: Disable new product page
-  disableNewProductPageTest(`${baseContext}_disableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, `${baseContext}_disableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/07_labelOutOfStock.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/07_labelOutOfStock.ts
index 3b9a518820518..04a631a532662 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/07_labelOutOfStock.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/07_labelOutOfStock.ts
@@ -5,12 +5,13 @@ import testContext from '@utils/testContext';
 // Import commonTests
 import loginCommon from '@commonTests/BO/loginBO';
 import {
-  disableNewProductPageTest,
   resetNewProductPageAsDefault,
+  setFeatureFlag,
 } from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
 // Import BO pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import productSettingsPage from '@pages/BO/shopParameters/productSettings';
 import productsPage from '@pages/BO/catalog/products';
@@ -36,7 +37,7 @@ describe('BO - Shop Parameters - product Settings : Set label out-of-stock with
   const productData: ProductData = new ProductData({type: 'Standard product', quantity: 0});
 
   // Pre-condition: Disable new product page
-  disableNewProductPageTest(`${baseContext}_disableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, `${baseContext}_disableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/09_enableDeliveryTimeOfOutOfStockProducts.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/09_enableDeliveryTimeOfOutOfStockProducts.ts
index 0d87131f4f668..5afe602540291 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/09_enableDeliveryTimeOfOutOfStockProducts.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/09_enableDeliveryTimeOfOutOfStockProducts.ts
@@ -5,12 +5,13 @@ import testContext from '@utils/testContext';
 // Import commonTests
 import loginCommon from '@commonTests/BO/loginBO';
 import {
-  disableNewProductPageTest,
   resetNewProductPageAsDefault,
+  setFeatureFlag,
 } from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
 // Import BO pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import productSettingsPage from '@pages/BO/shopParameters/productSettings';
 import productsPage from '@pages/BO/catalog/products';
@@ -35,7 +36,7 @@ describe('BO - Shop Parameters - Product Settings : Enable delivery time out-of-
   const productData: ProductData = new ProductData({type: 'Standard product', quantity: 0});
 
   // Pre-condition: Disable new product page
-  disableNewProductPageTest(`${baseContext}_disableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, `${baseContext}_disableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/04_pagination/01_updateNumberOfProductsPerPage.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/04_pagination/01_updateNumberOfProductsPerPage.ts
index 78aeb093604a8..cb5c9a6f8fb4e 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/04_pagination/01_updateNumberOfProductsPerPage.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/04_pagination/01_updateNumberOfProductsPerPage.ts
@@ -52,19 +52,21 @@ describe('BO - Shop Parameters - Product Settings : Update number of product dis
 
   tests.forEach((test, index: number) => {
     describe(`Update number of product displayed to ${test.args.numberOfProductsPerPage}`, async () => {
-      it('should go to \'Shop parameters > Product Settings\' page', async function () {
-        await testContext.addContextItem(this, 'testIdentifier', `goToProductSettingsPage${index + 1}`, baseContext);
+      if (index === 0) {
+        it('should go to \'Shop parameters > Product Settings\' page', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', `goToProductSettingsPage${index + 1}`, baseContext);
 
-        await dashboardPage.goToSubMenu(
-          page,
-          dashboardPage.shopParametersParentLink,
-          dashboardPage.productSettingsLink,
-        );
-        await productSettingsPage.closeSfToolBar(page);
+          await dashboardPage.goToSubMenu(
+            page,
+            dashboardPage.shopParametersParentLink,
+            dashboardPage.productSettingsLink,
+          );
+          await productSettingsPage.closeSfToolBar(page);
 
-        const pageTitle = await productSettingsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
-      });
+          const pageTitle = await productSettingsPage.getPageTitle(page);
+          await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+        });
+      }
 
       it(
         `should set number of products displayed per page to '${test.args.numberOfProductsPerPage}'`,
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/02_CRUDContact.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/02_CRUDContact.ts
index 1eb6de02ca47e..2ea0b9776f339 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/02_CRUDContact.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/02_CRUDContact.ts
@@ -86,19 +86,6 @@ describe('BO - Shop Parameters - Contact : Create, Update and Delete contact in
 
   // 2 : Update contact
   describe('Update contact created', async () => {
-    it('should go to \'Shop parameters>Contact\' page', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'goToContactsPageForUpdate', baseContext);
-
-      await contactsPage.goToSubMenu(
-        page,
-        contactsPage.shopParametersParentLink,
-        contactsPage.contactLink,
-      );
-
-      const pageTitle = await contactsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(contactsPage.pageTitle);
-    });
-
     it('should filter list by email', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'filterForUpdate', baseContext);
 
@@ -131,19 +118,6 @@ describe('BO - Shop Parameters - Contact : Create, Update and Delete contact in
 
   // 3 : Delete contact from BO
   describe('Delete contact', async () => {
-    it('should go to \'Shop parameters>Contact\' page', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'goToContactsPageForDelete', baseContext);
-
-      await contactsPage.goToSubMenu(
-        page,
-        contactsPage.shopParametersParentLink,
-        contactsPage.contactLink,
-      );
-
-      const pageTitle = await contactsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(contactsPage.pageTitle);
-    });
-
     it('should filter list by email', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'filterForDelete', baseContext);
 
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/01_seoAndUrls/02_setUpUrls/04_enableDisableAccentedURL.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/01_seoAndUrls/02_setUpUrls/04_enableDisableAccentedURL.ts
index a692e10f11730..5e2aafd2e0572 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/01_seoAndUrls/02_setUpUrls/04_enableDisableAccentedURL.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/01_seoAndUrls/02_setUpUrls/04_enableDisableAccentedURL.ts
@@ -5,12 +5,13 @@ import testContext from '@utils/testContext';
 // Import commonTests
 import loginCommon from '@commonTests/BO/loginBO';
 import {
-  disableNewProductPageTest,
   resetNewProductPageAsDefault,
+  setFeatureFlag,
 } from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
 // Import BO pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import seoAndUrlsPage from '@pages/BO/shopParameters/trafficAndSeo/seoAndUrls';
 import productsPage from '@pages/BO/catalog/products';
@@ -35,7 +36,7 @@ describe('BO - Shop Parameters - Traffic & SEO : Enable/Disable accented URL', a
   const productData: ProductData = new ProductData({name: productName, type: 'Standard product'});
 
   // Pre-condition: Disable new product page
-  disableNewProductPageTest(`${baseContext}_disableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, `${baseContext}_disableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/04_email/03_sortAndPagination.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/04_email/03_sortAndPagination.ts
index 77e4a883841ec..dce80325d1bd2 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/04_email/03_sortAndPagination.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/04_email/03_sortAndPagination.ts
@@ -172,13 +172,7 @@ describe('BO - Advanced Parameters - E-mail : Sort and pagination emails', async
     it('should go to \'Advanced parameters > E-mail\' page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'goToEmailPage', baseContext);
 
-      await dashboardPage.goToSubMenu(
-        page,
-        dashboardPage.advancedParametersLink,
-        dashboardPage.emailLink,
-      );
-
-      await dashboardPage.closeSfToolBar(page);
+      await emailPage.reloadPage(page);
 
       const pageTitle = await emailPage.getPageTitle(page);
       await expect(pageTitle).to.contains(emailPage.pageTitle);
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/08_logs/01_filterSortAndPagination.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/08_logs/01_filterSortAndPagination.ts
index a4836cdf62f73..0f05258cc0ed9 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/08_logs/01_filterSortAndPagination.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/08_logs/01_filterSortAndPagination.ts
@@ -104,7 +104,7 @@ describe('BO - Advanced Parameters - Logs : Filter, sort and pagination logs tab
     it('should go to \'Advanced parameters > Logs\' page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'goToLogsPageToFilter', baseContext);
 
-      await dashboardPage.goToSubMenu(page, dashboardPage.advancedParametersLink, dashboardPage.logsLink);
+      await logsPage.reloadPage(page);
 
       const pageTitle = await logsPage.getPageTitle(page);
       await expect(pageTitle).to.contains(logsPage.pageTitle);
diff --git a/tests/UI/campaigns/functional/BO/15_header/02_quickAccess.ts b/tests/UI/campaigns/functional/BO/15_header/02_quickAccess.ts
index d78926de15b05..d5a3c6963b230 100644
--- a/tests/UI/campaigns/functional/BO/15_header/02_quickAccess.ts
+++ b/tests/UI/campaigns/functional/BO/15_header/02_quickAccess.ts
@@ -1,19 +1,16 @@
 // Import utils
 import helper from '@utils/helpers';
-import loginCommon from '@commonTests/BO/loginBO';
-import {expect} from 'chai';
-import type {BrowserContext, Page} from 'playwright';
+import testContext from '@utils/testContext';
 
 // Import common tests
 import {
-  disableNewProductPageTest,
   resetNewProductPageAsDefault,
+  setFeatureFlag,
 } from '@commonTests/BO/advancedParameters/newFeatures';
-
-// Import test context
-import testContext from '@utils/testContext';
+import loginCommon from '@commonTests/BO/loginBO';
 
 // Import pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import statsPage from '@pages/BO/stats';
 import {moduleManager as moduleManagerPage} from '@pages/BO/modules/moduleManager';
@@ -28,6 +25,9 @@ import newCustomerPage from '@pages/BO/customers/add';
 // Import data
 import QuickAccessData from '@data/faker/quickAccess';
 
+import {expect} from 'chai';
+import type {BrowserContext, Page} from 'playwright';
+
 const baseContext: string = 'functional_BO_header_quickAccess';
 
 describe('BO - Header : Quick access links', async () => {
@@ -41,7 +41,7 @@ describe('BO - Header : Quick access links', async () => {
   });
 
   // Pre-condition: Disable new product page
-  disableNewProductPageTest(`${baseContext}_enableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, `${baseContext}_enableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/functional/BO/15_header/03_searchBar.ts b/tests/UI/campaigns/functional/BO/15_header/03_searchBar.ts
index c6bc01dea7a8e..250c7004b1a44 100644
--- a/tests/UI/campaigns/functional/BO/15_header/03_searchBar.ts
+++ b/tests/UI/campaigns/functional/BO/15_header/03_searchBar.ts
@@ -64,6 +64,7 @@ describe('BO - Header : Search bar', async () => {
 
   it('should search for "John Doe"', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'searchForJohnDoe', baseContext);
+
     await searchResultsPage.search(page, 'John Doe');
 
     const pageTitle = await searchResultsPage.getPageTitle(page);
diff --git a/tests/UI/campaigns/functional/FO/classic/01_login/01_passwordReminder.ts b/tests/UI/campaigns/functional/FO/classic/01_login/01_passwordReminder.ts
index 12f6f038d08d0..99f9af8711dac 100644
--- a/tests/UI/campaigns/functional/FO/classic/01_login/01_passwordReminder.ts
+++ b/tests/UI/campaigns/functional/FO/classic/01_login/01_passwordReminder.ts
@@ -153,7 +153,7 @@ describe('FO - Login : Password reminder', async () => {
     it('should try to login with old password and check the error message', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'signInFOWithOldPassword', baseContext);
 
-      await loginPage.customerLogin(page, customerData);
+      await loginPage.customerLogin(page, customerData, false);
 
       const loginError = await loginPage.getLoginError(page);
       await expect(loginError).to.contains(loginPage.loginErrorText);
diff --git a/tests/UI/campaigns/functional/FO/classic/02_headerAndFooter/01_checkLinksInHeader.ts b/tests/UI/campaigns/functional/FO/classic/02_headerAndFooter/01_checkLinksInHeader.ts
index 66d5a2bf4cb2b..9289adb49b9f0 100644
--- a/tests/UI/campaigns/functional/FO/classic/02_headerAndFooter/01_checkLinksInHeader.ts
+++ b/tests/UI/campaigns/functional/FO/classic/02_headerAndFooter/01_checkLinksInHeader.ts
@@ -140,7 +140,7 @@ describe('FO - Header and Footer : Check links in header page', async () => {
   it('should check \'Logo\' link', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'checkLogoLink', baseContext);
 
-    await homePage.clickOnHeaderLink(page, 'Logo');
+    await homePage.clickOnHeaderLink(page, 'Logo', false);
 
     const pageTitle = await homePage.getPageTitle(page);
     await expect(pageTitle).to.equal(homePage.pageTitle);
diff --git a/tests/UI/campaigns/functional/FO/classic/03_userAccount/01_creditSlips/01_consultCreditSlip.ts b/tests/UI/campaigns/functional/FO/classic/03_userAccount/01_creditSlips/01_consultCreditSlip.ts
index f060efbad4f2c..9b39bd0a42a7c 100644
--- a/tests/UI/campaigns/functional/FO/classic/03_userAccount/01_creditSlips/01_consultCreditSlip.ts
+++ b/tests/UI/campaigns/functional/FO/classic/03_userAccount/01_creditSlips/01_consultCreditSlip.ts
@@ -351,11 +351,6 @@ describe('FO - Consult credit slip list & View PDF Credit slip & View order', as
       it('should go to credit slips page', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'goToCreditSlipsPage4', baseContext);
 
-        await homePage.goToMyAccountPage(page);
-
-        const myAccountPageTitle = await myAccountPage.getPageTitle(page);
-        await expect(myAccountPageTitle).to.equal(myAccountPage.pageTitle);
-
         await myAccountPage.goToCreditSlipsPage(page);
 
         const creditSlipsPageTitle = await creditSlipsPage.getPageTitle(page);
diff --git a/tests/UI/campaigns/functional/FO/classic/03_userAccount/04_getGDPRDataInPDF.ts b/tests/UI/campaigns/functional/FO/classic/03_userAccount/04_getGDPRDataInPDF.ts
index 9a40e83f5b341..68ec737fa8ad2 100644
--- a/tests/UI/campaigns/functional/FO/classic/03_userAccount/04_getGDPRDataInPDF.ts
+++ b/tests/UI/campaigns/functional/FO/classic/03_userAccount/04_getGDPRDataInPDF.ts
@@ -75,6 +75,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
   const today: string = date.getDateFormat('mm/dd/yyyy');
   const dateNow: Date = new Date();
   const addressData: AddressData = new AddressData({
+    alias: 'My Address',
     firstName: 'Marc',
     lastName: 'Beier',
     country: 'France',
@@ -195,8 +196,8 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'getRegistrationDate', baseContext);
 
         const registration = await customersPage.getTextColumnFromTableCustomers(page, 1, 'date_add');
-        registrationDate = `${registration.substr(6, 4)}-${registration.substr(0, 2)}-`
-          + `${registration.substr(3, 2)} ${registration.substr(11, 8)}`;
+        registrationDate = `${registration.substring(6, 10)}-${registration.substring(0, 2)}-`
+          + `${registration.substring(3, 5)} ${registration.substring(11, 19)}`;
         await expect(registrationDate).to.contains(dateNow.getFullYear());
       });
 
@@ -204,8 +205,8 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'getLastVisitDate1', baseContext);
 
         const lastVisit = await customersPage.getTextColumnFromTableCustomers(page, 1, 'connect');
-        lastVisitDate = `${lastVisit.substr(6, 4)}-${lastVisit.substr(0, 2)}-`
-          + `${lastVisit.substr(3, 2)} ${lastVisit.substr(11, 8)}`;
+        lastVisitDate = `${lastVisit.substring(6, 10)}-${lastVisit.substring(0, 2)}-`
+          + `${lastVisit.substring(3, 5)} ${lastVisit.substring(11, 19)}`;
         await expect(lastVisitDate).to.contains(dateNow.getFullYear());
       });
 
@@ -428,8 +429,8 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
       it('should check Carts table', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkThatCartsTableIsEmpty2', baseContext);
 
-        shoppingCartDate = `${shoppingCartDate.substr(6, 4)}-${shoppingCartDate.substr(0, 2)}-`
-          + `${shoppingCartDate.substr(3, 2)} ${shoppingCartDate.substr(11, 8)}`;
+        shoppingCartDate = `${shoppingCartDate.substring(6, 10)}-${shoppingCartDate.substring(0, 2)}-`
+          + `${shoppingCartDate.substring(3, 5)} ${shoppingCartDate.substring(11, 19)}`;
 
         const isVisible = await files.isTextInPDF(filePath, `Carts,,Id, ,Total products, ,Date,,#${shoppingCartID}`
           + `, ,1, ,${shoppingCartDate},,Product(s) in the cart :,,Reference, ,Name, ,Quantity,,`
@@ -574,7 +575,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'checkAddressesTable1', baseContext);
 
         const isVisible = await files.isTextInPDF(filePath, 'Addresses,,Alias, ,Company, ,Name, ,Address, ,'
-          + `Phone(s), ,Country, ,Date,,My Address, ,${addressData.company}, ,${addressData.firstName} `
+          + `Phone(s), ,Country, ,Date,,${addressData.alias}, ,${addressData.company}, ,${addressData.firstName} `
           + `${addressData.lastName}, ,${addressData.address},${addressData.postalCode} ${addressData.city},`
           + `${addressData.phone}, ,${addressData.country}`);
         await expect(isVisible, 'Data in Addresses table is not correct!').to.be.true;
@@ -583,8 +584,8 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
       it('should check Orders table', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkOrdersTable1', baseContext);
 
-        const orderCreateDate = `${orderDate.substr(6, 4)}-${orderDate.substr(0, 2)}-`
-          + `${orderDate.substr(3, 2)} ${orderDate.substr(11, 8)}`;
+        const orderCreateDate = `${orderDate.substring(6, 10)}-${orderDate.substring(0, 2)}-`
+          + `${orderDate.substring(3, 5)} ${orderDate.substring(11, 19)}`;
         const isVisible = await files.isTextInPDF(filePath, 'Orders,,Reference, ,Payment, ,Order state, ,Total paid,'
           + ` ,Date,,${orderReference}, ,Bank transfer, ,Awaiting bank wire,payment,${totalPaid} EUR, ,`
           + `${orderCreateDate},,Product(s) in the order :,,Reference, ,Name, ,Quantity,,${Products.demo_1.reference}`
@@ -711,8 +712,8 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
       it('should check Orders table', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkOrdersTable2', baseContext);
 
-        const orderCreateDate = `${orderDate.substr(6, 4)}-${orderDate.substr(0, 2)}-`
-          + `${orderDate.substr(3, 2)} ${orderDate.substr(11, 8)}`;
+        const orderCreateDate = `${orderDate.substring(6, 10)}-${orderDate.substring(0, 2)}-`
+          + `${orderDate.substring(3, 5)} ${orderDate.substring(11, 19)}`;
         const isVisible = await files.isTextInPDF(filePath, 'Orders,,Reference, ,Payment, ,Order state, ,Total paid,'
           + ` ,Date,,${orderReference}, ,Bank transfer, ,Awaiting bank wire,payment,${totalPaid} EUR, ,`
           + `${orderCreateDate},,Product(s) in the order :,,Reference, ,Name, ,Quantity,,${Products.demo_1.reference}`
@@ -730,8 +731,8 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
       it('should check Messages table', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkMessagesTable1', baseContext);
 
-        const dateString = `${messageDate.substr(6, 4)}-${messageDate.substr(0, 2)}-`
-          + `${messageDate.substr(3, 2)} ${messageDate.substr(11, 8)}`;
+        const dateString = `${messageDate.substring(6, 10)}-${messageDate.substring(0, 2)}-`
+          + `${messageDate.substring(3, 5)} ${messageDate.substring(11, 19)}`;
         const isVisible = await files.isTextInPDF(filePath, `Messages,,IP, ,Message, ,Date,,1 / 2 ${today},,`
           + `${contactUsData.firstName} ${contactUsData.lastName},,${ipAddress}, ,${contactUsData.message}, ,${
             dateString}`);
@@ -835,8 +836,8 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'getLastVisitDate2', baseContext);
 
         const lastVisit = await customersPage.getTextColumnFromTableCustomers(page, 1, 'connect');
-        secondLastVisitDate = `${lastVisit.substr(6, 4)}-${lastVisit.substr(0, 2)}-`
-          + `${lastVisit.substr(3, 2)} ${lastVisit.substr(11, 8)}`;
+        secondLastVisitDate = `${lastVisit.substring(6, 10)}-${lastVisit.substring(0, 2)}-`
+          + `${lastVisit.substring(3, 5)} ${lastVisit.substring(11, 19)}`;
         await expect(lastVisitDate).to.contains(dateNow.getFullYear());
       });
 
@@ -876,8 +877,8 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
       it('should check Orders table', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkOrdersTable3', baseContext);
 
-        const orderCreateDate = `${orderDate.substr(6, 4)}-${orderDate.substr(0, 2)}-`
-          + `${orderDate.substr(3, 2)} ${orderDate.substr(11, 8)}`;
+        const orderCreateDate = `${orderDate.substring(6, 10)}-${orderDate.substring(0, 2)}-`
+          + `${orderDate.substring(3, 5)} ${orderDate.substring(11, 19)}`;
         const isVisible = await files.isTextInPDF(filePath, 'Orders,,Reference, ,Payment, ,Order state, ,Total paid,'
           + ` ,Date,,${orderReference}, ,Bank transfer, ,Awaiting bank wire,payment,${totalPaid} EUR, ,`
           + `${orderCreateDate},,Product(s) in the order :,,Reference, ,Name, ,Quantity,,${Products.demo_1.reference}`
@@ -895,8 +896,8 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
       it('should check Messages table', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkMessagesTable2', baseContext);
 
-        const dateString = `${messageDate.substr(6, 4)}-${messageDate.substr(0, 2)}-`
-          + `${messageDate.substr(3, 2)} ${messageDate.substr(11, 8)}`;
+        const dateString = `${messageDate.substring(6, 10)}-${messageDate.substring(0, 2)}-`
+          + `${messageDate.substring(3, 5)} ${messageDate.substring(11, 19)}`;
         const isVisible = await files.isTextInPDF(filePath, `Messages,,IP, ,Message, ,Date,,1 / 2 ${today},,`
           + `${contactUsData.firstName} ${contactUsData.lastName},,${ipAddress}, ,${contactUsData.message}, ,${
             dateString}`);
diff --git a/tests/UI/campaigns/functional/FO/classic/03_userAccount/05_getGDPRDataInCSV.ts b/tests/UI/campaigns/functional/FO/classic/03_userAccount/05_getGDPRDataInCSV.ts
index a8f755590e85f..5dea426c08baf 100644
--- a/tests/UI/campaigns/functional/FO/classic/03_userAccount/05_getGDPRDataInCSV.ts
+++ b/tests/UI/campaigns/functional/FO/classic/03_userAccount/05_getGDPRDataInCSV.ts
@@ -193,8 +193,8 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
 
         const registration = await customersPage.getTextColumnFromTableCustomers(page, 1, 'date_add');
 
-        registrationDate = `${registration.substr(6, 4)}-${registration.substr(0, 2)}-`
-          + `${registration.substr(3, 2)}${registration.substr(11, 8)}`;
+        registrationDate = `${registration.substring(6, 10)}-${registration.substring(0, 2)}-`
+          + `${registration.substring(3, 5)}${registration.substring(11, 19)}`;
         await expect(registrationDate).to.contains(date.getFullYear());
       });
 
@@ -202,8 +202,8 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'getLastVisitDate1', baseContext);
 
         const lastVisit = await customersPage.getTextColumnFromTableCustomers(page, 1, 'connect');
-        lastVisitDate = `${lastVisit.substr(6, 4)}-${lastVisit.substr(0, 2)}-`
-          + `${lastVisit.substr(3, 2)}${lastVisit.substr(11, 8)}`;
+        lastVisitDate = `${lastVisit.substring(6, 10)}-${lastVisit.substring(0, 2)}-`
+          + `${lastVisit.substring(3, 5)}${lastVisit.substring(11, 19)}`;
         await expect(lastVisitDate).to.contains(date.getFullYear());
       });
 
@@ -447,8 +447,8 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'getShoppingCartIDAndDate', baseContext);
 
         shoppingCartDate = await shoppingCartsPage.getTextColumn(page, 1, 'date');
-        shoppingCartDate = `${shoppingCartDate.substr(6, 4)}-${shoppingCartDate.substr(0, 2)}-`
-          + `${shoppingCartDate.substr(3, 2)}${shoppingCartDate.substr(11, 8)}`;
+        shoppingCartDate = `${shoppingCartDate.substring(6, 10)}-${shoppingCartDate.substring(0, 2)}-`
+          + `${shoppingCartDate.substring(3, 5)}${shoppingCartDate.substring(11, 19)}`;
 
         shoppingCartID = await shoppingCartsPage.getTextColumn(page, 1, 'id_cart');
         await expect(parseInt(shoppingCartID, 10)).to.be.greaterThan(5);
@@ -593,8 +593,8 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
 
         totalPaid = await ordersPage.getOrderATIPrice(page);
         orderDate = await ordersPage.getTextColumn(page, 'date_add');
-        orderDate = `${orderDate.substr(6, 4)}-${orderDate.substr(0, 2)}-${orderDate.substr(3, 2)}`
-          + `${orderDate.substr(11, 8)}`;
+        orderDate = `${orderDate.substring(6, 10)}-${orderDate.substring(0, 2)}-${orderDate.substring(3, 5)}`
+          + `${orderDate.substring(11, 19)}`;
       });
 
       it('should reset all filters', async function () {
@@ -611,7 +611,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
 
         const isVisible = await files.isTextInFile(
           filePath,
-          `ADDRESSESAliasCompanyNameAddressPhone(s)CountryDate"MyAddress"${addressData.company}`
+          `ADDRESSESAliasCompanyNameAddressPhone(s)CountryDate"${addressData.alias}"${addressData.company}`
           + `"${addressData.firstName}${addressData.lastName}""${addressData.address.replace(/\s/g, '')}"`
           + `"${addressData.phone}"${addressData.country}"`,
           true,
@@ -741,8 +741,8 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'checkCustomerEmail', baseContext);
 
         messageDate = await customerServicePage.getTextColumn(page, 1, 'date');
-        messageDate = `${messageDate.substr(6, 4)}-${messageDate.substr(0, 2)}-`
-          + `${messageDate.substr(3, 2)}${messageDate.substr(11, 8)}`;
+        messageDate = `${messageDate.substring(6, 10)}-${messageDate.substring(0, 2)}-`
+          + `${messageDate.substring(3, 5)}${messageDate.substring(11, 19)}`;
         await expect(messageDate).to.not.be.null;
       });
     });
@@ -753,7 +753,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
 
         const isVisible = await files.isTextInFile(
           filePath,
-          `ADDRESSESAliasCompanyNameAddressPhone(s)CountryDate"MyAddress"${addressData.company}`
+          `ADDRESSESAliasCompanyNameAddressPhone(s)CountryDate"${addressData.alias}"${addressData.company}`
           + `"${addressData.firstName}${addressData.lastName}""${addressData.address.replace(/\s/g, '')}"`
           + `"${addressData.phone}"${addressData.country}"`,
           true,
@@ -899,8 +899,8 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'getLastVisitDate2', baseContext);
 
         const lastVisit = await customersPage.getTextColumnFromTableCustomers(page, 1, 'connect');
-        secondLastVisitDate = `${lastVisit.substr(6, 4)}-${lastVisit.substr(0, 2)}-`
-          + `${lastVisit.substr(3, 2)}${lastVisit.substr(11, 8)}`;
+        secondLastVisitDate = `${lastVisit.substring(6, 10)}-${lastVisit.substring(0, 2)}-`
+          + `${lastVisit.substring(3, 5)}${lastVisit.substring(11, 19)}`;
         await expect(lastVisitDate).to.contains(date.getFullYear());
       });
 
@@ -936,7 +936,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
 
         const isVisible = await files.isTextInFile(
           filePath,
-          `ADDRESSESAliasCompanyNameAddressPhone(s)CountryDate"MyAddress"${addressData.company}`
+          `ADDRESSESAliasCompanyNameAddressPhone(s)CountryDate"${addressData.alias}"${addressData.company}`
           + `"${addressData.firstName}${addressData.lastName}""${addressData.address.replace(/\s/g, '')}"`
           + `"${addressData.phone}"${addressData.country}"`,
           true,
diff --git a/tests/UI/campaigns/functional/FO/classic/03_userAccount/merchandiseReturns/01_consultReturnDetails.ts b/tests/UI/campaigns/functional/FO/classic/03_userAccount/merchandiseReturns/01_consultReturnDetails.ts
index de36003919a96..3c4e97177aacb 100644
--- a/tests/UI/campaigns/functional/FO/classic/03_userAccount/merchandiseReturns/01_consultReturnDetails.ts
+++ b/tests/UI/campaigns/functional/FO/classic/03_userAccount/merchandiseReturns/01_consultReturnDetails.ts
@@ -128,7 +128,7 @@ describe('FO - Account : Consult return details', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'getOrderDate', baseContext);
 
         orderDate = await ordersPage.getTextColumn(page, 'date_add', 1);
-        orderDate = orderDate.substr(0, 10);
+        orderDate = orderDate.substring(0, 10);
         await expect(orderDate).to.not.be.null;
       });
 
diff --git a/tests/UI/campaigns/functional/FO/classic/03_userAccount/merchandiseReturns/02_checkOrderReturnPDF.ts b/tests/UI/campaigns/functional/FO/classic/03_userAccount/merchandiseReturns/02_checkOrderReturnPDF.ts
index 63b838bd58921..55b047a7926a6 100644
--- a/tests/UI/campaigns/functional/FO/classic/03_userAccount/merchandiseReturns/02_checkOrderReturnPDF.ts
+++ b/tests/UI/campaigns/functional/FO/classic/03_userAccount/merchandiseReturns/02_checkOrderReturnPDF.ts
@@ -133,7 +133,7 @@ describe('FO - Account : Check order return PDF', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'getOrderDate', baseContext);
 
       orderDate = await ordersPage.getTextColumn(page, 'date_add', 1);
-      orderDate = orderDate.substr(0, 10);
+      orderDate = orderDate.substring(0, 10);
       await expect(orderDate).to.not.be.null;
     });
 
diff --git a/tests/UI/campaigns/functional/FO/classic/05_contactUs/04_addAttachment.ts b/tests/UI/campaigns/functional/FO/classic/05_contactUs/04_addAttachment.ts
index 7cb78828ef250..e0b0d635cc6ef 100644
--- a/tests/UI/campaigns/functional/FO/classic/05_contactUs/04_addAttachment.ts
+++ b/tests/UI/campaigns/functional/FO/classic/05_contactUs/04_addAttachment.ts
@@ -177,7 +177,7 @@ describe('FO - Contact us : Add attachment', async () => {
     expect(text)
       .to.contains(contactUsData.emailAddress)
       .and.to.contains(contactUsData.subject)
-      .and.to.contains(`${messageDateTime.substr(0, 10)} - ${messageDateTime.substr(11, 5)}`)
+      .and.to.contains(`${messageDateTime.substring(0, 10)} - ${messageDateTime.substring(11, 16)}`)
       .and.to.contains('Attachment')
       .and.to.contains(contactUsData.message);
   });
diff --git a/tests/UI/campaigns/functional/FO/classic/06_homePage/03_allProducts.ts b/tests/UI/campaigns/functional/FO/classic/06_homePage/03_allProducts.ts
index e7f0665f625bb..975eb50de19c6 100644
--- a/tests/UI/campaigns/functional/FO/classic/06_homePage/03_allProducts.ts
+++ b/tests/UI/campaigns/functional/FO/classic/06_homePage/03_allProducts.ts
@@ -5,12 +5,13 @@ import testContext from '@utils/testContext';
 // Import commonTests
 import loginCommon from '@commonTests/BO/loginBO';
 import {
-  disableNewProductPageTest,
   resetNewProductPageAsDefault,
+  setFeatureFlag,
 } from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
 // Import BO pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import productsPage from '@pages/BO/catalog/products';
 // Import FO pages
@@ -29,7 +30,7 @@ describe('FO - Home Page : Display all products', async () => {
   let numberOfProducts: number;
 
   // Pre-condition: Disable new product page
-  disableNewProductPageTest(`${baseContext}_disableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, `${baseContext}_disableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/functional/FO/classic/06_homePage/04_productQuickView.ts b/tests/UI/campaigns/functional/FO/classic/06_homePage/04_productQuickView.ts
index 8c1056a583be2..4a248b3a21204 100644
--- a/tests/UI/campaigns/functional/FO/classic/06_homePage/04_productQuickView.ts
+++ b/tests/UI/campaigns/functional/FO/classic/06_homePage/04_productQuickView.ts
@@ -5,10 +5,12 @@ import testContext from '@utils/testContext';
 // Import commonTests
 import {createProductTest, deleteProductTest} from '@commonTests/BO/catalog/product';
 import {
-  disableNewProductPageTest,
   resetNewProductPageAsDefault,
+  setFeatureFlag,
 } from '@commonTests/BO/advancedParameters/newFeatures';
 
+// Import BO pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 // Import FO pages
 import {homePage} from '@pages/FO/home';
 import categoryPage from '@pages/FO/category';
@@ -60,7 +62,7 @@ describe('FO - Home Page : Product quick view', async () => {
   });
 
   // Pre-condition: Disable new product page
-  disableNewProductPageTest(`${baseContext}_disableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, `${baseContext}_disableNewProduct`);
 
   // Pre-condition : Create product out of stock not allowed
   createProductTest(productOutOfStockNotAllowed, `${baseContext}_preTest`);
diff --git a/tests/UI/campaigns/functional/FO/classic/09_productPage/01_quickView.ts b/tests/UI/campaigns/functional/FO/classic/09_productPage/01_quickView.ts
index 89f2e208fc640..d51dbd959cf22 100644
--- a/tests/UI/campaigns/functional/FO/classic/09_productPage/01_quickView.ts
+++ b/tests/UI/campaigns/functional/FO/classic/09_productPage/01_quickView.ts
@@ -6,22 +6,22 @@ import testContext from '@utils/testContext';
 // Import commonTests
 import loginCommon from '@commonTests/BO/loginBO';
 import {
-  disableNewProductPageTest,
   resetNewProductPageAsDefault,
+  setFeatureFlag,
 } from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
+// BO
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
+import boDashboardPage from '@pages/BO/dashboard';
+import boProductsPage from '@pages/BO/catalog/products';
+import boAddProductPage from '@pages/BO/catalog/products/add';
 // FO
 import {homePage} from '@pages/FO/home';
 import cartPage from '@pages/FO/cart';
 import productPage from '@pages/FO/product';
 import searchResultsPage from '@pages/FO/searchResults';
 
-// BO
-import boDashboardPage from '@pages/BO/dashboard';
-import boProductsPage from '@pages/BO/catalog/products';
-import boAddProductPage from '@pages/BO/catalog/products/add';
-
 // Import data
 import Products from '@data/demo/products';
 import ProductData from '@data/faker/product';
@@ -106,7 +106,7 @@ describe('FO - product page : Product quick view', async () => {
   ];
 
   // Pre-condition: Disable new product page
-  disableNewProductPageTest(`${baseContext}_disableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, `${baseContext}_disableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/functional/FO/classic/09_productPage/02_addToCart.ts b/tests/UI/campaigns/functional/FO/classic/09_productPage/02_addToCart.ts
index bc5b9d043faba..98a029c8ac44f 100644
--- a/tests/UI/campaigns/functional/FO/classic/09_productPage/02_addToCart.ts
+++ b/tests/UI/campaigns/functional/FO/classic/09_productPage/02_addToCart.ts
@@ -6,22 +6,22 @@ import testContext from '@utils/testContext';
 // Import commonTests
 import loginCommon from '@commonTests/BO/loginBO';
 import {
-  disableNewProductPageTest,
   resetNewProductPageAsDefault,
+  setFeatureFlag,
 } from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
+// BO
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
+import boDashboardPage from '@pages/BO/dashboard';
+import boProductsPage from '@pages/BO/catalog/products';
+import boAddProductPage from '@pages/BO/catalog/products/add';
 // FO
 import {homePage} from '@pages/FO/home';
 import searchResultsPage from '@pages/FO/searchResults';
 import productPage from '@pages/FO/product';
 import cartPage from '@pages/FO/cart';
 
-// BO
-import boDashboardPage from '@pages/BO/dashboard';
-import boProductsPage from '@pages/BO/catalog/products';
-import boAddProductPage from '@pages/BO/catalog/products/add';
-
 // Import data
 import Products from '@data/demo/products';
 import ProductData from '@data/faker/product';
@@ -76,7 +76,7 @@ describe('FO - product page : Add product to cart', async () => {
   let page: Page;
 
   // Pre-condition: Disable new product page
-  disableNewProductPageTest(`${baseContext}_disableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, `${baseContext}_disableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/productV2/functional/01_filterProducts.ts b/tests/UI/campaigns/productV2/functional/01_filterProducts.ts
index 686997125a25c..87dc8e6a04100 100644
--- a/tests/UI/campaigns/productV2/functional/01_filterProducts.ts
+++ b/tests/UI/campaigns/productV2/functional/01_filterProducts.ts
@@ -8,11 +8,12 @@ import testContext from '@utils/testContext';
 // Import common tests
 import loginCommon from '@commonTests/BO/loginBO';
 import {
-  enableNewProductPageTest,
   resetNewProductPageAsDefault,
+  setFeatureFlag,
 } from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import productsPage from '@pages/BO/catalog/productsV2';
 
@@ -29,7 +30,7 @@ describe('BO - Catalog - Products : Filter in Products Page', async () => {
   let numberOfProducts: number = 0;
 
   // Pre-condition: Enable new product page
-  enableNewProductPageTest(`${baseContext}_enableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, true, `${baseContext}_enableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/productV2/functional/02_CRUDStandardProduct.ts b/tests/UI/campaigns/productV2/functional/02_CRUDStandardProduct.ts
index f42c409ddcc0c..0fe3aabbbfcf3 100644
--- a/tests/UI/campaigns/productV2/functional/02_CRUDStandardProduct.ts
+++ b/tests/UI/campaigns/productV2/functional/02_CRUDStandardProduct.ts
@@ -1,28 +1,29 @@
-import type {BrowserContext, Page} from 'playwright';
-import {expect} from 'chai';
-
 // Import utils
 import helper from '@utils/helpers';
 import files from '@utils/files';
 import testContext from '@utils/testContext';
 import basicHelper from '@utils/basicHelper';
 
-// Import pages
-import dashboardPage from '@pages/BO/dashboard';
-import createProductsPage from '@pages/BO/catalog/productsV2/add';
-import productsPage from '@pages/BO/catalog/productsV2';
-import foProductPage from '@pages/FO/product';
-
 // Import common tests
 import loginCommon from '@commonTests/BO/loginBO';
 import {
-  enableNewProductPageTest,
   resetNewProductPageAsDefault,
+  setFeatureFlag,
 } from '@commonTests/BO/advancedParameters/newFeatures';
 
+// Import pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
+import dashboardPage from '@pages/BO/dashboard';
+import createProductsPage from '@pages/BO/catalog/productsV2/add';
+import productsPage from '@pages/BO/catalog/productsV2';
+import foProductPage from '@pages/FO/product';
+
 // Import data
 import ProductData from '@data/faker/product';
 
+import type {BrowserContext, Page} from 'playwright';
+import {expect} from 'chai';
+
 const baseContext: string = 'productV2_functional_CRUDStandardProduct';
 
 describe('BO - Catalog - Products : CRUD standard product', async () => {
@@ -50,7 +51,7 @@ describe('BO - Catalog - Products : CRUD standard product', async () => {
   });
 
   // Pre-condition: Enable new product page
-  enableNewProductPageTest(`${baseContext}_enableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, true, `${baseContext}_enableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/productV2/functional/03_CRUDProductWithCombinations.ts b/tests/UI/campaigns/productV2/functional/03_CRUDProductWithCombinations.ts
index 59dcc9fedaa08..1d1ecbf16514b 100644
--- a/tests/UI/campaigns/productV2/functional/03_CRUDProductWithCombinations.ts
+++ b/tests/UI/campaigns/productV2/functional/03_CRUDProductWithCombinations.ts
@@ -1,6 +1,3 @@
-import {expect} from 'chai';
-import type {BrowserContext, Page} from 'playwright';
-
 // Import utils
 import helper from '@utils/helpers';
 import testContext from '@utils/testContext';
@@ -11,11 +8,12 @@ import basicHelper from '@utils/basicHelper';
 // Import common tests
 import loginCommon from '@commonTests/BO/loginBO';
 import {
-  enableNewProductPageTest,
   resetNewProductPageAsDefault,
+  setFeatureFlag,
 } from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import productsPage from '@pages/BO/catalog/productsV2';
 import createProductsPage from '@pages/BO/catalog/productsV2/add';
@@ -32,6 +30,9 @@ import type {
   ProductCombinationOptions,
 } from '@data/types/product';
 
+import {expect} from 'chai';
+import type {BrowserContext, Page} from 'playwright';
+
 const baseContext: string = 'productV2_functional_CRUDProductWithCombinations';
 
 describe('BO - Catalog - Products : CRUD product with combinations', async () => {
@@ -138,7 +139,7 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
   });
 
   // Pre-condition: Enable new product page
-  enableNewProductPageTest(`${baseContext}_enableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, true, `${baseContext}_enableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/productV2/functional/04_CRUDPackOfProducts.ts b/tests/UI/campaigns/productV2/functional/04_CRUDPackOfProducts.ts
index a55c0abf0f4f2..208d683fef463 100644
--- a/tests/UI/campaigns/productV2/functional/04_CRUDPackOfProducts.ts
+++ b/tests/UI/campaigns/productV2/functional/04_CRUDPackOfProducts.ts
@@ -1,6 +1,3 @@
-import type {BrowserContext, Page} from 'playwright';
-import {expect} from 'chai';
-
 // Import utils
 import helper from '@utils/helpers';
 import testContext from '@utils/testContext';
@@ -8,7 +5,15 @@ import date from '@utils/date';
 import files from '@utils/files';
 import basicHelper from '@utils/basicHelper';
 
+// Import common tests
+import loginCommon from '@commonTests/BO/loginBO';
+import {
+  resetNewProductPageAsDefault,
+  setFeatureFlag,
+} from '@commonTests/BO/advancedParameters/newFeatures';
+
 // Import pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import createProductsPage from '@pages/BO/catalog/productsV2/add';
 import productsPage from '@pages/BO/catalog/productsV2';
@@ -16,19 +21,15 @@ import packTab from '@pages/BO/catalog/productsV2/add/packTab';
 import pricingTab from '@pages/BO/catalog/productsV2/add/pricingTab';
 import foProductPage from '@pages/FO/product';
 
-// Import common tests
-import loginCommon from '@commonTests/BO/loginBO';
-import {
-  enableNewProductPageTest,
-  resetNewProductPageAsDefault,
-} from '@commonTests/BO/advancedParameters/newFeatures';
-
 // Import data
 import ProductData from '@data/faker/product';
 import Employees from '@data/demo/employees';
 import Products from '@data/demo/products';
 import {ProductPackOptions} from '@data/types/product';
 
+import type {BrowserContext, Page} from 'playwright';
+import {expect} from 'chai';
+
 const baseContext: string = 'productV2_functional_CRUDPackOfProducts';
 
 describe('BO - Catalog - Products : CRUD pack of products', async () => {
@@ -83,7 +84,7 @@ describe('BO - Catalog - Products : CRUD pack of products', async () => {
   });
 
   // Pre-condition: Enable new product page
-  enableNewProductPageTest(`${baseContext}_enableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, true, `${baseContext}_enableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/productV2/functional/05_CRUDVirtualProduct.ts b/tests/UI/campaigns/productV2/functional/05_CRUDVirtualProduct.ts
index 7c1db7a918e98..d45b9486d308b 100644
--- a/tests/UI/campaigns/productV2/functional/05_CRUDVirtualProduct.ts
+++ b/tests/UI/campaigns/productV2/functional/05_CRUDVirtualProduct.ts
@@ -1,13 +1,17 @@
-import type {BrowserContext, Page} from 'playwright';
-import {expect} from 'chai';
-
 // Import utils
 import helper from '@utils/helpers';
 import basicHelper from '@utils/basicHelper';
 import files from '@utils/files';
 import testContext from '@utils/testContext';
 
+// Import common tests
+import loginCommon from '@commonTests/BO/loginBO';
+import {
+  resetNewProductPageAsDefault, setFeatureFlag,
+} from '@commonTests/BO/advancedParameters/newFeatures';
+
 // Import pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import createProductsPage from '@pages/BO/catalog/productsV2/add';
 import productsPage from '@pages/BO/catalog/productsV2';
@@ -21,19 +25,15 @@ import {myAccountPage} from '@pages/FO/myAccount';
 import foOrderHistoryPage from '@pages/FO/myAccount/orderHistory';
 import orderDetailsPage from '@pages/FO/myAccount/orderDetails';
 
-// Import common tests
-import loginCommon from '@commonTests/BO/loginBO';
-import {
-  enableNewProductPageTest,
-  resetNewProductPageAsDefault,
-} from '@commonTests/BO/advancedParameters/newFeatures';
-
 // Import data
 import OrderStatuses from '@data/demo/orderStatuses';
 import Customers from '@data/demo/customers';
 import PaymentMethods from '@data/demo/paymentMethods';
 import ProductData from '@data/faker/product';
 
+import type {BrowserContext, Page} from 'playwright';
+import {expect} from 'chai';
+
 const baseContext: string = 'productV2_functional_CRUDVirtualProduct';
 
 describe('BO - Catalog - Products : CRUD virtual product', async () => {
@@ -65,7 +65,7 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
   });
 
   // Pre-condition: Enable new product page
-  enableNewProductPageTest(`${baseContext}_enableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, true, `${baseContext}_enableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/productV2/functional/06_productBulkActions.ts b/tests/UI/campaigns/productV2/functional/06_productBulkActions.ts
index 5dbda4752e173..40e6a43be2592 100644
--- a/tests/UI/campaigns/productV2/functional/06_productBulkActions.ts
+++ b/tests/UI/campaigns/productV2/functional/06_productBulkActions.ts
@@ -1,6 +1,3 @@
-import type {BrowserContext, Page} from 'playwright';
-import {expect} from 'chai';
-
 // Import utils
 import helper from '@utils/helpers';
 import testContext from '@utils/testContext';
@@ -8,11 +5,12 @@ import testContext from '@utils/testContext';
 // Import common tests
 import loginCommon from '@commonTests/BO/loginBO';
 import {
-  enableNewProductPageTest,
   resetNewProductPageAsDefault,
+  setFeatureFlag,
 } from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import productsPage from '@pages/BO/catalog/productsV2';
 import createProductsPage from '@pages/BO/catalog/productsV2/add';
@@ -20,6 +18,9 @@ import createProductsPage from '@pages/BO/catalog/productsV2/add';
 // Import data
 import ProductFaker from '@data/faker/product';
 
+import type {BrowserContext, Page} from 'playwright';
+import {expect} from 'chai';
+
 const baseContext: string = 'productV2_functional_productBulkActions';
 
 describe('BO - Catalog - Products : Enable, disable, duplicate and Delete products with bulk actions', async () => {
@@ -42,7 +43,7 @@ describe('BO - Catalog - Products : Enable, disable, duplicate and Delete produc
   });
 
   // Pre-condition: Enable new product page
-  enableNewProductPageTest(`${baseContext}_enableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, true, `${baseContext}_enableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/productV2/functional/07_duplicateProduct.ts b/tests/UI/campaigns/productV2/functional/07_duplicateProduct.ts
index d7fc6d799b9db..c8947bc072b96 100644
--- a/tests/UI/campaigns/productV2/functional/07_duplicateProduct.ts
+++ b/tests/UI/campaigns/productV2/functional/07_duplicateProduct.ts
@@ -1,6 +1,3 @@
-import {expect} from 'chai';
-import type {BrowserContext, Page} from 'playwright';
-
 // Import utils
 import helper from '@utils/helpers';
 import testContext from '@utils/testContext';
@@ -8,11 +5,12 @@ import testContext from '@utils/testContext';
 // Import common tests
 import loginCommon from '@commonTests/BO/loginBO';
 import {
-  enableNewProductPageTest,
   resetNewProductPageAsDefault,
+  setFeatureFlag,
 } from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import productsPage from '@pages/BO/catalog/productsV2';
 import createProductsPage from '@pages/BO/catalog/productsV2/add';
@@ -20,6 +18,9 @@ import createProductsPage from '@pages/BO/catalog/productsV2/add';
 // Import data
 import Products from '@data/demo/products';
 
+import {expect} from 'chai';
+import type {BrowserContext, Page} from 'playwright';
+
 const baseContext: string = 'productV2_functional_duplicateProduct';
 
 describe('BO - Catalog - Products : Duplicate product', async () => {
@@ -28,7 +29,7 @@ describe('BO - Catalog - Products : Duplicate product', async () => {
   let numberOfProducts: number = 0;
 
   // Pre-condition: Enable new product page
-  enableNewProductPageTest(`${baseContext}_enableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, true, `${baseContext}_enableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/productV2/sanity/01_filterProducts.ts b/tests/UI/campaigns/productV2/sanity/01_filterProducts.ts
index 47ba667b43755..6cfd66e042391 100644
--- a/tests/UI/campaigns/productV2/sanity/01_filterProducts.ts
+++ b/tests/UI/campaigns/productV2/sanity/01_filterProducts.ts
@@ -1,6 +1,3 @@
-import {expect} from 'chai';
-import type {BrowserContext, Page} from 'playwright';
-
 // Import utils
 import helper from '@utils/helpers';
 import testContext from '@utils/testContext';
@@ -8,11 +5,12 @@ import testContext from '@utils/testContext';
 // Import common tests
 import loginCommon from '@commonTests/BO/loginBO';
 import {
-  enableNewProductPageTest,
   resetNewProductPageAsDefault,
+  setFeatureFlag,
 } from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import productsPage from '@pages/BO/catalog/productsV2';
 
@@ -20,6 +18,9 @@ import productsPage from '@pages/BO/catalog/productsV2';
 import Products from '@data/demo/products';
 import Categories from '@data/demo/categories';
 
+import {expect} from 'chai';
+import type {BrowserContext, Page} from 'playwright';
+
 const baseContext: string = 'productV2_sanity_filterProducts';
 
 describe('BO - Catalog - Products : Filter in Products Page', async () => {
@@ -28,7 +29,7 @@ describe('BO - Catalog - Products : Filter in Products Page', async () => {
   let numberOfProducts: number = 0;
 
   // Pre-condition: Enable new product page
-  enableNewProductPageTest(`${baseContext}_enableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, true, `${baseContext}_enableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/productV2/sanity/02_CRUDStandardProduct.ts b/tests/UI/campaigns/productV2/sanity/02_CRUDStandardProduct.ts
index 95e85c3c34a03..8153821ea8aea 100644
--- a/tests/UI/campaigns/productV2/sanity/02_CRUDStandardProduct.ts
+++ b/tests/UI/campaigns/productV2/sanity/02_CRUDStandardProduct.ts
@@ -1,27 +1,29 @@
-import type {BrowserContext, Page} from 'playwright';
-import {expect} from 'chai';
-
 // Import utils
 import helper from '@utils/helpers';
 import basicHelper from '@utils/basicHelper';
 import testContext from '@utils/testContext';
 
-// Import pages
-import foProductPage from '@pages/FO/product';
-import dashboardPage from '@pages/BO/dashboard';
-import productsPage from '@pages/BO/catalog/productsV2';
-import createProductsPage from '@pages/BO/catalog/productsV2/add';
-
 // Import common tests
 import loginCommon from '@commonTests/BO/loginBO';
 import {
-  enableNewProductPageTest,
   resetNewProductPageAsDefault,
+  setFeatureFlag,
 } from '@commonTests/BO/advancedParameters/newFeatures';
 
+// Import BO pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
+// Import FO pages
+import foProductPage from '@pages/FO/product';
+import dashboardPage from '@pages/BO/dashboard';
+import productsPage from '@pages/BO/catalog/productsV2';
+import createProductsPage from '@pages/BO/catalog/productsV2/add';
+
 // Import data
 import ProductData from '@data/faker/product';
 
+import type {BrowserContext, Page} from 'playwright';
+import {expect} from 'chai';
+
 const baseContext: string = 'productV2_sanity_CRUDStandardProduct';
 
 describe('BO - Catalog - Products : CRUD standard product', async () => {
@@ -45,7 +47,7 @@ describe('BO - Catalog - Products : CRUD standard product', async () => {
   });
 
   // Pre-condition: Enable new product page
-  enableNewProductPageTest(`${baseContext}_enableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, true, `${baseContext}_enableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/productV2/sanity/03_CRUDProductWithCombinations.ts b/tests/UI/campaigns/productV2/sanity/03_CRUDProductWithCombinations.ts
index f34cc5e0083c9..98db09e35a1d0 100644
--- a/tests/UI/campaigns/productV2/sanity/03_CRUDProductWithCombinations.ts
+++ b/tests/UI/campaigns/productV2/sanity/03_CRUDProductWithCombinations.ts
@@ -1,6 +1,3 @@
-import {expect} from 'chai';
-import type {BrowserContext, Page} from 'playwright';
-
 // Import utils
 import helper from '@utils/helpers';
 import testContext from '@utils/testContext';
@@ -8,20 +5,26 @@ import testContext from '@utils/testContext';
 // Import common tests
 import loginCommon from '@commonTests/BO/loginBO';
 import {
-  enableNewProductPageTest,
   resetNewProductPageAsDefault,
+  setFeatureFlag,
 } from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
-import foProductPage from '@pages/FO/product';
+// Import BO pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import productsPage from '@pages/BO/catalog/productsV2';
 import createProductsPage from '@pages/BO/catalog/productsV2/add';
 import combinationsTab from '@pages/BO/catalog/productsV2/add/combinationsTab';
+// Import FO pages
+import foProductPage from '@pages/FO/product';
 
 // Import data
 import ProductData from '@data/faker/product';
 
+import {expect} from 'chai';
+import type {BrowserContext, Page} from 'playwright';
+
 const baseContext: string = 'productV2_sanity_CRUDProductWithCombinations';
 
 describe('BO - Catalog - Products : CRUD product with combinations', async () => {
@@ -56,7 +59,7 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
   });
 
   // Pre-condition: Enable new product page
-  enableNewProductPageTest(`${baseContext}_enableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, true, `${baseContext}_enableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/productV2/sanity/04_CRUDVirtualProduct.ts b/tests/UI/campaigns/productV2/sanity/04_CRUDVirtualProduct.ts
index 4ae320125081d..33a9a97d8bd9d 100644
--- a/tests/UI/campaigns/productV2/sanity/04_CRUDVirtualProduct.ts
+++ b/tests/UI/campaigns/productV2/sanity/04_CRUDVirtualProduct.ts
@@ -9,11 +9,12 @@ import testContext from '@utils/testContext';
 // Import common tests
 import loginCommon from '@commonTests/BO/loginBO';
 import {
-  enableNewProductPageTest,
   resetNewProductPageAsDefault,
+  setFeatureFlag,
 } from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import productsPage from '@pages/BO/catalog/productsV2';
 import createProductsPage from '@pages/BO/catalog/productsV2/add';
@@ -45,7 +46,7 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
   });
 
   // Pre-condition: Enable new product page
-  enableNewProductPageTest(`${baseContext}_enableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, true, `${baseContext}_enableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/productV2/sanity/05_deleteProduct.ts b/tests/UI/campaigns/productV2/sanity/05_deleteProduct.ts
index e2cf175b85bee..680d370974427 100644
--- a/tests/UI/campaigns/productV2/sanity/05_deleteProduct.ts
+++ b/tests/UI/campaigns/productV2/sanity/05_deleteProduct.ts
@@ -1,6 +1,3 @@
-import type {BrowserContext, Page} from 'playwright';
-import {expect} from 'chai';
-
 // Import utils
 import helper from '@utils/helpers';
 import testContext from '@utils/testContext';
@@ -8,11 +5,12 @@ import testContext from '@utils/testContext';
 // Import common tests
 import loginCommon from '@commonTests/BO/loginBO';
 import {
-  enableNewProductPageTest,
   resetNewProductPageAsDefault,
+  setFeatureFlag,
 } from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import productsPage from '@pages/BO/catalog/productsV2';
 import createProductsPage from '@pages/BO/catalog/productsV2/add';
@@ -20,6 +18,9 @@ import createProductsPage from '@pages/BO/catalog/productsV2/add';
 // Import data
 import ProductData from '@data/faker/product';
 
+import type {BrowserContext, Page} from 'playwright';
+import {expect} from 'chai';
+
 const baseContext: string = 'productV2_sanity_deleteProduct';
 
 describe('BO - Catalog - Products : Delete product', async () => {
@@ -36,7 +37,7 @@ describe('BO - Catalog - Products : Delete product', async () => {
   });
 
   // Pre-condition: Enable new product page
-  enableNewProductPageTest(`${baseContext}_enableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, true, `${baseContext}_enableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/productV2/sanity/06_deleteProductsWithBulkActions.ts b/tests/UI/campaigns/productV2/sanity/06_deleteProductsWithBulkActions.ts
index 4650904fc31a8..c3894e387bfde 100644
--- a/tests/UI/campaigns/productV2/sanity/06_deleteProductsWithBulkActions.ts
+++ b/tests/UI/campaigns/productV2/sanity/06_deleteProductsWithBulkActions.ts
@@ -8,11 +8,12 @@ import testContext from '@utils/testContext';
 // Import common tests
 import loginCommon from '@commonTests/BO/loginBO';
 import {
-  enableNewProductPageTest,
   resetNewProductPageAsDefault,
+  setFeatureFlag,
 } from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import productsPage from '@pages/BO/catalog/productsV2';
 import createProductsPage from '@pages/BO/catalog/productsV2/add';
@@ -46,7 +47,7 @@ describe('BO - Catalog - Products : Delete products with bulk actions', async ()
   });
 
   // Pre-condition: Enable new product page
-  enableNewProductPageTest(`${baseContext}_enableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, true, `${baseContext}_enableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/sanity/03_productsBO/02_CRUDStandardProductInBO.ts b/tests/UI/campaigns/sanity/03_productsBO/02_CRUDStandardProductInBO.ts
index 4bc66bc657466..26ca1d1ddc501 100644
--- a/tests/UI/campaigns/sanity/03_productsBO/02_CRUDStandardProductInBO.ts
+++ b/tests/UI/campaigns/sanity/03_productsBO/02_CRUDStandardProductInBO.ts
@@ -3,9 +3,14 @@ import helper from '@utils/helpers';
 import testContext from '@utils/testContext';
 
 // Import commonTests
+import {
+  resetNewProductPageAsDefault,
+  setFeatureFlag,
+} from '@commonTests/BO/advancedParameters/newFeatures';
 import loginCommon from '@commonTests/BO/loginBO';
 
 // Import BO pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import productsPage from '@pages/BO/catalog/products';
 import addProductPage from '@pages/BO/catalog/products/add';
@@ -19,10 +24,6 @@ import {ProductInformations} from '@data/types/product';
 
 import {expect} from 'chai';
 import type {BrowserContext, Page} from 'playwright';
-import {
-  disableNewProductPageTest,
-  resetNewProductPageAsDefault,
-} from '@commonTests/BO/advancedParameters/newFeatures';
 
 const baseContext: string = 'sanity_productsBO_CRUDStandardProductInBO';
 
@@ -47,7 +48,7 @@ describe('BO - Catalog - Products : Create, read, update and delete Standard pro
   });
 
   // Pre-condition: Disable new product page
-  disableNewProductPageTest(`${baseContext}_disableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, `${baseContext}_disableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/sanity/03_productsBO/03_CRUDStandardProductWithCombinationsInBO.ts b/tests/UI/campaigns/sanity/03_productsBO/03_CRUDStandardProductWithCombinationsInBO.ts
index f46779754ea59..14dca8753a931 100644
--- a/tests/UI/campaigns/sanity/03_productsBO/03_CRUDStandardProductWithCombinationsInBO.ts
+++ b/tests/UI/campaigns/sanity/03_productsBO/03_CRUDStandardProductWithCombinationsInBO.ts
@@ -4,8 +4,13 @@ import testContext from '@utils/testContext';
 
 // Import commonTests
 import loginCommon from '@commonTests/BO/loginBO';
+import {
+  resetNewProductPageAsDefault,
+  setFeatureFlag,
+} from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import BO pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import productsPage from '@pages/BO/catalog/products';
 import addProductPage from '@pages/BO/catalog/products/add';
@@ -18,10 +23,6 @@ import {ProductInformations} from '@data/types/product';
 
 import {expect} from 'chai';
 import type {BrowserContext, Page} from 'playwright';
-import {
-  disableNewProductPageTest,
-  resetNewProductPageAsDefault,
-} from '@commonTests/BO/advancedParameters/newFeatures';
 
 const baseContext: string = 'sanity_productsBO_CRUDStandardProductWithCombinationsInBO';
 
@@ -47,7 +48,7 @@ describe('BO - Catalog - Products : Create, read, update and delete Standard pro
   });
 
   // Pre-condition: Disable new product page
-  disableNewProductPageTest(`${baseContext}_disableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, `${baseContext}_disableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/sanity/03_productsBO/04_deleteProduct.ts b/tests/UI/campaigns/sanity/03_productsBO/04_deleteProduct.ts
index b7f36748aafe8..3fd727f33d1b1 100644
--- a/tests/UI/campaigns/sanity/03_productsBO/04_deleteProduct.ts
+++ b/tests/UI/campaigns/sanity/03_productsBO/04_deleteProduct.ts
@@ -2,10 +2,15 @@
 import testContext from '@utils/testContext';
 import helper from '@utils/helpers';
 
-// Import login steps
+// Import commonTests
+import {
+  resetNewProductPageAsDefault,
+  setFeatureFlag,
+} from '@commonTests/BO/advancedParameters/newFeatures';
 import loginCommon from '@commonTests/BO/loginBO';
 
 // Import pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import productsPage from '@pages/BO/catalog/products';
 import addProductPage from '@pages/BO/catalog/products/add';
 import dashboardPage from '@pages/BO/dashboard';
@@ -15,10 +20,6 @@ import ProductData from '@data/faker/product';
 
 import {expect} from 'chai';
 import type {BrowserContext, Page} from 'playwright';
-import {
-  disableNewProductPageTest,
-  resetNewProductPageAsDefault,
-} from '@commonTests/BO/advancedParameters/newFeatures';
 
 const baseContext: string = 'sanity_productsBO_deleteProduct';
 
@@ -33,7 +34,7 @@ describe('BO - Catalog - Products : Create Standard product in BO and Delete it
   });
 
   // Pre-condition: Disable new product page
-  disableNewProductPageTest(`${baseContext}_disableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, `${baseContext}_disableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/sanity/03_productsBO/05_deleteProductsWithBulkActions.ts b/tests/UI/campaigns/sanity/03_productsBO/05_deleteProductsWithBulkActions.ts
index 9bd83ec09e0bb..b5533a165050f 100644
--- a/tests/UI/campaigns/sanity/03_productsBO/05_deleteProductsWithBulkActions.ts
+++ b/tests/UI/campaigns/sanity/03_productsBO/05_deleteProductsWithBulkActions.ts
@@ -4,8 +4,13 @@ import helper from '@utils/helpers';
 
 // Import commonTests
 import loginCommon from '@commonTests/BO/loginBO';
+import {
+  resetNewProductPageAsDefault,
+  setFeatureFlag,
+} from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import productsPage from '@pages/BO/catalog/products';
 import addProductPage from '@pages/BO/catalog/products/add';
 import dashboardPage from '@pages/BO/dashboard';
@@ -15,10 +20,6 @@ import ProductData from '@data/faker/product';
 
 import {expect} from 'chai';
 import type {BrowserContext, Page} from 'playwright';
-import {
-  disableNewProductPageTest,
-  resetNewProductPageAsDefault,
-} from '@commonTests/BO/advancedParameters/newFeatures';
 
 const baseContext: string = 'sanity_productsBO_deleteProductsWithBulkActions';
 
@@ -37,7 +38,7 @@ describe('BO - Catalog - Product : Create Standard product in BO and Delete it w
   });
 
   // Pre-condition: Disable new product page
-  disableNewProductPageTest(`${baseContext}_disableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, `${baseContext}_disableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/sanity/04_catalogFO/01_filterProducts.ts b/tests/UI/campaigns/sanity/04_catalogFO/01_filterProducts.ts
index 26b4d92c9994f..3b5bc4a7240b4 100644
--- a/tests/UI/campaigns/sanity/04_catalogFO/01_filterProducts.ts
+++ b/tests/UI/campaigns/sanity/04_catalogFO/01_filterProducts.ts
@@ -2,6 +2,14 @@
 import testContext from '@utils/testContext';
 import helper from '@utils/helpers';
 
+// Import commonTests
+import {
+  resetNewProductPageAsDefault,
+  setFeatureFlag,
+} from '@commonTests/BO/advancedParameters/newFeatures';
+
+// Import BO pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 // Import FO pages
 import {homePage} from '@pages/FO/home';
 
@@ -10,10 +18,6 @@ import Categories from '@data/demo/categories';
 
 import {expect} from 'chai';
 import {BrowserContext, Page} from 'playwright';
-import {
-  disableNewProductPageTest,
-  resetNewProductPageAsDefault,
-} from '@commonTests/BO/advancedParameters/newFeatures';
 
 const baseContext: string = 'sanity_catalogFO_filterProducts';
 
@@ -29,7 +33,7 @@ describe('FO - Catalog : Filter Products by categories in Home page', async () =
   let allProductsNumber: number = 0;
 
   // Pre-condition: Disable new product page
-  disableNewProductPageTest(`${baseContext}_disableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, `${baseContext}_disableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/sanity/04_catalogFO/02_checkProduct.ts b/tests/UI/campaigns/sanity/04_catalogFO/02_checkProduct.ts
index c5de686756e3a..21acb7d540b08 100644
--- a/tests/UI/campaigns/sanity/04_catalogFO/02_checkProduct.ts
+++ b/tests/UI/campaigns/sanity/04_catalogFO/02_checkProduct.ts
@@ -2,6 +2,14 @@
 import helper from '@utils/helpers';
 import testContext from '@utils/testContext';
 
+// Import commonTests
+import {
+  setFeatureFlag,
+  resetNewProductPageAsDefault,
+} from '@commonTests/BO/advancedParameters/newFeatures';
+
+// Import BO pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 // Import FO pages
 import {homePage} from '@pages/FO/home';
 import productPage from '@pages/FO/product';
@@ -11,10 +19,6 @@ import Products from '@data/demo/products';
 
 import {expect} from 'chai';
 import type {BrowserContext, Page} from 'playwright';
-import {
-  disableNewProductPageTest,
-  resetNewProductPageAsDefault,
-} from '@commonTests/BO/advancedParameters/newFeatures';
 
 const baseContext: string = 'sanity_catalogFO_checkProduct';
 
@@ -27,7 +31,7 @@ describe('FO - Catalog : Check the Product page', async () => {
   let page: Page;
 
   // Pre-condition: Disable new product page
-  disableNewProductPageTest(`${baseContext}_disableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, `${baseContext}_disableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/sanity/05_cartFO/01_editCheckCart.ts b/tests/UI/campaigns/sanity/05_cartFO/01_editCheckCart.ts
index d0c952d068f0b..f573556084802 100644
--- a/tests/UI/campaigns/sanity/05_cartFO/01_editCheckCart.ts
+++ b/tests/UI/campaigns/sanity/05_cartFO/01_editCheckCart.ts
@@ -2,6 +2,14 @@
 import helper from '@utils/helpers';
 import testContext from '@utils/testContext';
 
+// Import commonTests
+import {
+  setFeatureFlag,
+  resetNewProductPageAsDefault,
+} from '@commonTests/BO/advancedParameters/newFeatures';
+
+// Import BO pages
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 // Import FO pages
 import cartPage from '@pages/FO/cart';
 import {homePage} from '@pages/FO/home';
@@ -12,10 +20,6 @@ import Products from '@data/demo/products';
 
 import {expect} from 'chai';
 import type {BrowserContext, Page} from 'playwright';
-import {
-  disableNewProductPageTest,
-  resetNewProductPageAsDefault,
-} from '@commonTests/BO/advancedParameters/newFeatures';
 
 const baseContext: string = 'sanity_cartFO_editCheckCart';
 
@@ -33,7 +37,7 @@ describe('FO - Cart : Check Cart in FO', async () => {
   let itemsNumber: number = 0;
 
   // Pre-condition: Disable new product page
-  disableNewProductPageTest(`${baseContext}_disableNewProduct`);
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, `${baseContext}_disableNewProduct`);
 
   // before and after functions
   before(async function () {
diff --git a/tests/UI/campaigns/sanity/06_checkoutFO/01_orderProduct.ts b/tests/UI/campaigns/sanity/06_checkoutFO/01_orderProduct.ts
index 444aa43e6f8d3..4b5c5f4b2d0dc 100644
--- a/tests/UI/campaigns/sanity/06_checkoutFO/01_orderProduct.ts
+++ b/tests/UI/campaigns/sanity/06_checkoutFO/01_orderProduct.ts
@@ -67,7 +67,11 @@ describe('BO - Checkout : Order a product and check order confirmation', async (
   it('should go to home page', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'goToHomePage', baseContext);
 
-    await homePage.goToHomePage(page);
+    const isHomepage = await homePage.isHomePage(page);
+
+    if (!isHomepage) {
+      await homePage.goToHomePage(page);
+    }
 
     const result = await homePage.isHomePage(page);
     await expect(result).to.be.true;
diff --git a/tests/UI/commonTests/BO/advancedParameters/newFeatures.ts b/tests/UI/commonTests/BO/advancedParameters/newFeatures.ts
index aa87aa5c3c368..08d94e22ddcb3 100644
--- a/tests/UI/commonTests/BO/advancedParameters/newFeatures.ts
+++ b/tests/UI/commonTests/BO/advancedParameters/newFeatures.ts
@@ -15,24 +15,6 @@ import type {BrowserContext, Page} from 'playwright';
 let browserContext: BrowserContext;
 let page: Page;
 
-/**
- * Function to enable new product page
- * @param baseContext {string} String to identify the test
- * @deprecated Use setFeatureFlag
- */
-function enableNewProductPageTest(baseContext: string = 'commonTests-enableNewProductPage'): void {
-  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, true, baseContext);
-}
-
-/**
- * Function to disable new product page
- * @param baseContext {string} String to identify the test
- * @deprecated Use setFeatureFlag
- */
-function disableNewProductPageTest(baseContext: string = 'commonTests-disableNewProductPage'): void {
-  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, baseContext);
-}
-
 /**
  * Indicate the default state of new page with feature flags, depending on its initial value we need to
  * adapt the tests behaviour especially the part that enables/disables the page. We keep this value editable
@@ -104,8 +86,6 @@ function setFeatureFlag(featureFlag: string, expectedStatus: boolean, baseContex
 }
 
 export {
-  enableNewProductPageTest,
-  disableNewProductPageTest,
   isNewProductPageEnabledByDefault,
   resetNewProductPageAsDefault,
   setFeatureFlag,
diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index 3dc83960af496..0665794c4cbe4 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -315,7 +315,7 @@
     "@types/json5": {
       "version": "0.0.29",
       "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
+      "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
       "dev": true
     },
     "@types/linkify-it": {
@@ -394,6 +394,99 @@
         }
       }
     },
+    "@typescript-eslint/experimental-utils": {
+      "version": "5.51.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.51.0.tgz",
+      "integrity": "sha512-8/3+ZyBENl2aog1/QB3S39ptkZ2oRhDB+sJt15UWXBE3skgwL1C8BN9RjpOyhTejwR2hVrvqEjcYcNY6qtZ7nw==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/utils": "5.51.0"
+      },
+      "dependencies": {
+        "@typescript-eslint/scope-manager": {
+          "version": "5.51.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.51.0.tgz",
+          "integrity": "sha512-gNpxRdlx5qw3yaHA0SFuTjW4rxeYhpHxt491PEcKF8Z6zpq0kMhe0Tolxt0qjlojS+/wArSDlj/LtE69xUJphQ==",
+          "dev": true,
+          "requires": {
+            "@typescript-eslint/types": "5.51.0",
+            "@typescript-eslint/visitor-keys": "5.51.0"
+          }
+        },
+        "@typescript-eslint/types": {
+          "version": "5.51.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.51.0.tgz",
+          "integrity": "sha512-SqOn0ANn/v6hFn0kjvLwiDi4AzR++CBZz0NV5AnusT2/3y32jdc0G4woXPWHCumWtUXZKPAS27/9vziSsC9jnw==",
+          "dev": true
+        },
+        "@typescript-eslint/typescript-estree": {
+          "version": "5.51.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.51.0.tgz",
+          "integrity": "sha512-TSkNupHvNRkoH9FMA3w7TazVFcBPveAAmb7Sz+kArY6sLT86PA5Vx80cKlYmd8m3Ha2SwofM1KwraF24lM9FvA==",
+          "dev": true,
+          "requires": {
+            "@typescript-eslint/types": "5.51.0",
+            "@typescript-eslint/visitor-keys": "5.51.0",
+            "debug": "^4.3.4",
+            "globby": "^11.1.0",
+            "is-glob": "^4.0.3",
+            "semver": "^7.3.7",
+            "tsutils": "^3.21.0"
+          }
+        },
+        "@typescript-eslint/utils": {
+          "version": "5.51.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.51.0.tgz",
+          "integrity": "sha512-76qs+5KWcaatmwtwsDJvBk4H76RJQBFe+Gext0EfJdC3Vd2kpY2Pf//OHHzHp84Ciw0/rYoGTDnIAr3uWhhJYw==",
+          "dev": true,
+          "requires": {
+            "@types/json-schema": "^7.0.9",
+            "@types/semver": "^7.3.12",
+            "@typescript-eslint/scope-manager": "5.51.0",
+            "@typescript-eslint/types": "5.51.0",
+            "@typescript-eslint/typescript-estree": "5.51.0",
+            "eslint-scope": "^5.1.1",
+            "eslint-utils": "^3.0.0",
+            "semver": "^7.3.7"
+          }
+        },
+        "@typescript-eslint/visitor-keys": {
+          "version": "5.51.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.51.0.tgz",
+          "integrity": "sha512-Oh2+eTdjHjOFjKA27sxESlA87YPSOJafGCR0md5oeMdh1ZcCfAGCIOL216uTBAkAIptvLIfKQhl7lHxMJet4GQ==",
+          "dev": true,
+          "requires": {
+            "@typescript-eslint/types": "5.51.0",
+            "eslint-visitor-keys": "^3.3.0"
+          }
+        },
+        "debug": {
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "eslint-scope": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+          "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+          "dev": true,
+          "requires": {
+            "esrecurse": "^4.3.0",
+            "estraverse": "^4.1.1"
+          }
+        },
+        "eslint-visitor-keys": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+          "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+          "dev": true
+        }
+      }
+    },
     "@typescript-eslint/parser": {
       "version": "5.49.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.49.0.tgz",
@@ -636,7 +729,7 @@
     "addressparser": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz",
-      "integrity": "sha512-aQX7AISOMM7HFE0iZ3+YnD07oIeJqWGVnJ+ZIKaBZAk03ftmVYVqsGas/rbXKR21n4D/hKCSHypvcyOkds/xzg=="
+      "integrity": "sha1-R6++GiqSYhkdtoOOT9HTm0CCF0Y="
     },
     "agent-base": {
       "version": "6.0.2",
@@ -733,7 +826,7 @@
     "array-flatten": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
+      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
     },
     "array-includes": {
       "version": "3.1.6",
@@ -1298,7 +1391,7 @@
     "base32.js": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/base32.js/-/base32.js-0.1.0.tgz",
-      "integrity": "sha512-n3TkB02ixgBOhTvANakDb4xaMXnYUVkNoRFJjQflcqMQhyEKxEHdj3E6N8t8sUQ0mjH/3/JxzlXuz3ul/J90pQ=="
+      "integrity": "sha1-tYLexpPC8R6JPPBk7mrFthMaIgI="
     },
     "base64id": {
       "version": "2.0.0",
@@ -1491,7 +1584,7 @@
     "check-error": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
-      "integrity": "sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA=="
+      "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII="
     },
     "chokidar": {
       "version": "3.5.3",
@@ -1687,7 +1780,7 @@
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
     },
     "config-master": {
       "version": "3.1.0",
@@ -1746,7 +1839,7 @@
     "cookie-signature": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
+      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
     },
     "cors": {
       "version": "2.8.5",
@@ -1830,7 +1923,7 @@
     "decamelize": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
       "dev": true
     },
     "decimal.js": {
@@ -2012,7 +2105,7 @@
     "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
+      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
     },
     "emoji-regex": {
       "version": "8.0.0",
@@ -2022,7 +2115,7 @@
     "encodeurl": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
+      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
     },
     "engine.io": {
       "version": "6.1.3",
@@ -2150,12 +2243,12 @@
     "escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
+      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
     },
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "escodegen": {
       "version": "2.0.0",
@@ -2429,6 +2522,25 @@
         }
       }
     },
+    "eslint-plugin-deprecation": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-deprecation/-/eslint-plugin-deprecation-1.3.3.tgz",
+      "integrity": "sha512-Bbkv6ZN2cCthVXz/oZKPwsSY5S/CbgTLRG4Q2s2gpPpgNsT0uJ0dB5oLNiWzFYY8AgKX4ULxXFG1l/rDav9QFA==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/experimental-utils": "^5.0.0",
+        "tslib": "^2.3.1",
+        "tsutils": "^3.21.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
+          "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==",
+          "dev": true
+        }
+      }
+    },
     "eslint-plugin-html": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-html/-/eslint-plugin-html-7.1.0.tgz",
@@ -2618,7 +2730,7 @@
     "etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="
+      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
     },
     "express": {
       "version": "4.18.2",
@@ -2711,7 +2823,7 @@
     "fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
     },
     "fastq": {
       "version": "1.13.0",
@@ -2865,7 +2977,7 @@
     "fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="
+      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
     },
     "fs-extra": {
       "version": "7.0.1",
@@ -2907,7 +3019,7 @@
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
     "fsevents": {
       "version": "2.3.2",
@@ -2968,7 +3080,7 @@
     "get-func-name": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
-      "integrity": "sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig=="
+      "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE="
     },
     "get-intrinsic": {
       "version": "1.1.1",
@@ -3252,7 +3364,7 @@
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
       "requires": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -3282,7 +3394,7 @@
     "ipv6-normalize": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/ipv6-normalize/-/ipv6-normalize-1.0.1.tgz",
-      "integrity": "sha512-Bm6H79i01DjgGTCWjUuCjJ6QDo1HB96PT/xCYuyJUP9WFbVDrLSbG4EZCvOCun2rNswZb0c3e4Jt/ws795esHA=="
+      "integrity": "sha1-GzJYKQ02X6gyOeiZB93kWS52IKg="
     },
     "is-array-buffer": {
       "version": "3.0.1",
@@ -3677,7 +3789,7 @@
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
     },
     "json5": {
       "version": "1.0.1",
@@ -3691,7 +3803,7 @@
     "jsonfile": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
+      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.1.6"
@@ -3709,7 +3821,7 @@
     "levn": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
       "requires": {
         "prelude-ls": "~1.1.2",
         "type-check": "~0.3.2"
@@ -3752,7 +3864,7 @@
     "lodash.isempty": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz",
-      "integrity": "sha512-oKMuF3xEeqDltrGMfDxAPGIVMSSRv8tbRSODbrs4KGsRRLEhrW8N8Rd4DRgB2+621hY8A8XwwrTVhXWpxFvMzg=="
+      "integrity": "sha1-b4bL7di+TsmHvpqvM8loTbGzHn4="
     },
     "lodash.isfunction": {
       "version": "3.0.9",
@@ -3762,12 +3874,12 @@
     "lodash.isobject": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz",
-      "integrity": "sha512-3/Qptq2vr7WeJbB4KHUSKlq8Pl7ASXi3UG6CMbBm8WRtXi8+GHm7mKaU3urfpSEzWe2wCIChs6/sdocUsTKJiA=="
+      "integrity": "sha1-PI+41bW/S/kK4G4U8qUwpO2TXh0="
     },
     "lodash.isstring": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
-      "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw=="
+      "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE="
     },
     "lodash.merge": {
       "version": "4.6.2",
@@ -3981,12 +4093,12 @@
     "media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="
+      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
     },
     "merge-descriptors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
+      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
     },
     "merge2": {
       "version": "1.4.1",
@@ -3997,7 +4109,7 @@
     "methods": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="
+      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
     },
     "micromatch": {
       "version": "4.0.5",
@@ -4667,7 +4779,7 @@
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
     },
     "object-get": {
       "version": "2.1.1",
@@ -5030,7 +5142,7 @@
     "once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
       "requires": {
         "wrappy": "1"
       }
@@ -5102,7 +5214,7 @@
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
     },
     "path-key": {
       "version": "3.1.1",
@@ -5119,7 +5231,7 @@
     "path-to-regexp": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
+      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
     },
     "path-type": {
       "version": "4.0.0",
@@ -5170,7 +5282,7 @@
     "prelude-ls": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w=="
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
     },
     "prop-types": {
       "version": "15.8.1",
@@ -5367,7 +5479,7 @@
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
     },
     "require-main-filename": {
       "version": "2.0.0",
@@ -5554,7 +5666,7 @@
     "set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
     },
     "setprototypeof": {
       "version": "1.2.0",
@@ -5920,7 +6032,7 @@
     "to-fast-properties": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
       "dev": true
     },
     "to-regex-range": {
@@ -6018,7 +6130,7 @@
     "type-check": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
       "requires": {
         "prelude-ls": "~1.1.2"
       }
@@ -6106,7 +6218,7 @@
     "unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="
+      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
     },
     "uri-js": {
       "version": "4.4.1",
@@ -6145,7 +6257,7 @@
     "utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="
+      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
     },
     "uue": {
       "version": "3.1.2",
@@ -6169,7 +6281,7 @@
     "vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="
+      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
     },
     "w3c-hr-time": {
       "version": "1.0.2",
@@ -6260,7 +6372,7 @@
     "which-module": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
       "dev": true
     },
     "which-typed-array": {
@@ -6348,7 +6460,7 @@
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "xml-name-validator": {
       "version": "4.0.0",
diff --git a/tests/UI/package.json b/tests/UI/package.json
index a70aa619d3dff..30d2f4449238d 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -138,6 +138,7 @@
     "babel-eslint": "^10.1.0",
     "eslint": "^8.33.0",
     "eslint-config-airbnb-base": "^15.0.0",
+    "eslint-plugin-deprecation": "^1.3.3",
     "eslint-plugin-html": "^7.1.0",
     "eslint-plugin-import": "^2.27.5",
     "jsdoc-to-markdown": "^8.0.0",
diff --git a/tests/UI/pages/BO/BObasePage.ts b/tests/UI/pages/BO/BObasePage.ts
index 1039c74b94f9c..532c86263a267 100644
--- a/tests/UI/pages/BO/BObasePage.ts
+++ b/tests/UI/pages/BO/BObasePage.ts
@@ -586,7 +586,7 @@ export default class BOBasePage extends CommonPage {
    * @param page {Page} Browser tab
    */
   async goToDashboardPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.dashboardLink);
+    await this.clickAndWaitForURL(page, this.dashboardLink);
   }
 
   /**
@@ -597,7 +597,7 @@ export default class BOBasePage extends CommonPage {
    */
   async quickAccessToPage(page: Page, linkId: number): Promise<void> {
     await this.waitForSelectorAndClick(page, this.quickAccessDropdownToggle);
-    await this.clickAndWaitForNavigation(page, this.quickAccessLink(linkId));
+    await this.clickAndWaitForURL(page, this.quickAccessLink(linkId));
     await this.waitForPageTitleToLoad(page);
   }
 
@@ -645,7 +645,7 @@ export default class BOBasePage extends CommonPage {
    */
   async goToManageQuickAccessPage(page: Page): Promise<void> {
     await this.waitForSelectorAndClick(page, this.quickAccessDropdownToggle);
-    await this.clickAndWaitForNavigation(page, this.manageYourQuickAccessLink);
+    await this.clickAndWaitForURL(page, this.manageYourQuickAccessLink);
   }
 
   /**
@@ -658,7 +658,7 @@ export default class BOBasePage extends CommonPage {
   async goToSubMenu(page: Page, parentSelector: string, linkSelector: string): Promise<void> {
     await this.clickSubMenu(page, parentSelector);
     await this.scrollTo(page, linkSelector);
-    await this.clickAndWaitForNavigation(page, linkSelector);
+    await this.clickAndWaitForURL(page, linkSelector);
     if (await this.isSidebarCollapsed(page)) {
       await this.waitForHiddenSelector(page, `${linkSelector}.link-active`);
     } else {
@@ -810,7 +810,7 @@ export default class BOBasePage extends CommonPage {
    * @param row {number} row in notification tab
    */
   async clickOnNotification(page: Page, tabName: string, row: number = 1): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.notificationRowInTab(tabName, row));
+    await this.clickAndWaitForURL(page, this.notificationRowInTab(tabName, row));
   }
 
   /**
@@ -829,7 +829,7 @@ export default class BOBasePage extends CommonPage {
     } else {
       await this.waitForVisibleSelector(page, this.userProfileYourProfileLinkNonMigratedPages);
     }
-    await this.clickAndWaitForNavigation(page, this.userProfileYourProfileLink);
+    await this.clickAndWaitForURL(page, this.userProfileYourProfileLink);
   }
 
   /**
@@ -859,7 +859,7 @@ export default class BOBasePage extends CommonPage {
       await page.click(this.userProfileIconNonMigratedPages);
     }
     await this.waitForVisibleSelector(page, this.userProfileLogoutLink);
-    await this.clickAndWaitForNavigation(page, this.userProfileLogoutLink);
+    await this.clickAndWaitForURL(page, this.userProfileLogoutLink);
   }
 
   /**
@@ -964,12 +964,24 @@ export default class BOBasePage extends CommonPage {
     await this.waitForHiddenSelector(page, this.growlMessageBlock);
   }
 
+  /**
+   * Close alert block
+   * @param page {Page} Browser tab
+   * @return {Promise<void>}
+   */
+  async closeAlertBlock(page: Page): Promise<void> {
+    if (await this.elementVisible(page, this.alertBlockCloseButton, 1000)) {
+      await this.waitForSelectorAndClick(page, this.alertBlockCloseButton);
+    }
+  }
+
   /**
    * Get error message from alert danger block
    * @param page {Page} Browser tab
    * @return {Promise<string>}
    */
-  getAlertDangerBlockParagraphContent(page: Page): Promise<string> {
+  async getAlertDangerBlockParagraphContent(page: Page): Promise<string> {
+    await this.elementVisible(page, this.alertDangerBlockParagraph, 2000);
     return this.getTextContent(page, this.alertDangerBlockParagraph);
   }
 
@@ -979,6 +991,7 @@ export default class BOBasePage extends CommonPage {
    * @return {Promise<string>}
    */
   async getAlertBlockContent(page: Page): Promise<string> {
+    await this.elementVisible(page, this.alertTextBlock, 2000);
     return this.getTextContent(page, this.alertTextBlock);
   }
 
@@ -987,7 +1000,8 @@ export default class BOBasePage extends CommonPage {
    * @param page {Frame|Page} Browser tab
    * @return {Promise<string>}
    */
-  getAlertSuccessBlockContent(page: Frame|Page): Promise<string> {
+  async getAlertSuccessBlockContent(page: Frame|Page): Promise<string> {
+    await this.elementVisible(page, this.alertSuccessBlock, 2000);
     return this.getTextContent(page, this.alertSuccessBlock);
   }
 
@@ -996,7 +1010,8 @@ export default class BOBasePage extends CommonPage {
    * @param page {Frame|Page} Browser tab
    * @return {Promise<string>}
    */
-  getAlertSuccessBlockParagraphContent(page: Frame|Page): Promise<string> {
+  async getAlertSuccessBlockParagraphContent(page: Frame|Page): Promise<string> {
+    await this.elementVisible(page, this.alertSuccessBlockParagraph, 2000);
     return this.getTextContent(page, this.alertSuccessBlockParagraph);
   }
 
@@ -1005,12 +1020,13 @@ export default class BOBasePage extends CommonPage {
    * @param page {Page} Browser tab
    * @return {Promise<string>}
    */
-  getAlertInfoBlockParagraphContent(page: Page): Promise<string> {
+  async getAlertInfoBlockParagraphContent(page: Page): Promise<string> {
+    await this.elementVisible(page, this.alertInfoBlockParagraph, 2000);
     return this.getTextContent(page, this.alertInfoBlockParagraph);
   }
 
   /**
-   * Navigate to Bo page without token
+   * Navigate to BO page without token
    * @param page {Page} Browser tab
    * @param url {string} Url to BO page
    * @param continueToPage {boolean} True to continue false to cancel and return to dashboard page
@@ -1019,7 +1035,7 @@ export default class BOBasePage extends CommonPage {
   async navigateToPageWithInvalidToken(page: Page, url: string, continueToPage: boolean = true): Promise<void> {
     await this.goTo(page, url);
     if (await this.elementVisible(page, this.invalidTokenContinueLink, 10000)) {
-      await this.clickAndWaitForNavigation(
+      await this.clickAndWaitForURL(
         page,
         continueToPage ? this.invalidTokenContinueLink : this.invalidTokenCancelLink,
       );
@@ -1035,7 +1051,7 @@ export default class BOBasePage extends CommonPage {
   async search(page: Page, query: string): Promise<void> {
     await this.setValue(page, this.navbarSearchInput, query);
     await page.keyboard.press('Enter');
-    await page.waitForNavigation({waitUntil: 'networkidle'});
+    await page.waitForSelector(this.navbarSearchInput);
   }
 
   /**
diff --git a/tests/UI/pages/BO/advancedParameters/database/dbBackup/index.ts b/tests/UI/pages/BO/advancedParameters/database/dbBackup/index.ts
index 4ed7b57611b22..953dac96ed29b 100644
--- a/tests/UI/pages/BO/advancedParameters/database/dbBackup/index.ts
+++ b/tests/UI/pages/BO/advancedParameters/database/dbBackup/index.ts
@@ -114,7 +114,7 @@ class DbBackup extends BOBasePage {
    * @returns {Promise<void>}
    */
   async goToSqlManagerPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.sqlManagerSubTabLink);
+    await this.clickAndWaitForURL(page, this.sqlManagerSubTabLink);
   }
 
   /* Form and grid methods */
@@ -178,7 +178,7 @@ class DbBackup extends BOBasePage {
    * @return {Promise<void>}
    */
   async confirmDeleteDbBackups(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.confirmDeleteButton);
+    await this.clickAndWaitForURL(page, this.confirmDeleteButton);
   }
 
   /**
@@ -226,9 +226,10 @@ class DbBackup extends BOBasePage {
    * @returns {Promise<string>}
    */
   async selectPaginationLimit(page: Page, number: number): Promise<string> {
+    const currentUrl: string = page.url();
     await Promise.all([
       this.selectByVisibleText(page, this.paginationLimitSelect, number),
-      page.waitForNavigation({waitUntil: 'networkidle'}),
+      page.waitForURL((url: URL): boolean => url.toString() !== currentUrl, {waitUntil: 'networkidle'}),
     ]);
 
     return this.getPaginationLabel(page);
@@ -240,7 +241,7 @@ class DbBackup extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationNext(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink);
+    await this.clickAndWaitForURL(page, this.paginationNextLink);
 
     return this.getPaginationLabel(page);
   }
@@ -251,7 +252,7 @@ class DbBackup extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationPrevious(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink);
+    await this.clickAndWaitForURL(page, this.paginationPreviousLink);
 
     return this.getPaginationLabel(page);
   }
diff --git a/tests/UI/pages/BO/advancedParameters/database/sqlManager/add.ts b/tests/UI/pages/BO/advancedParameters/database/sqlManager/add.ts
index f1cdf5c85550f..61780ac7451d7 100644
--- a/tests/UI/pages/BO/advancedParameters/database/sqlManager/add.ts
+++ b/tests/UI/pages/BO/advancedParameters/database/sqlManager/add.ts
@@ -46,7 +46,7 @@ class AddSQLQuery extends BOBasePage {
   async createEditSQLQuery(page: Page, sqlQueryData: SqlQueryData): Promise<string> {
     await this.setValue(page, this.sqlQueryNameInput, sqlQueryData.name);
     await this.setValue(page, this.sqlQueryTextArea, sqlQueryData.sqlQuery);
-    await this.clickAndWaitForNavigation(page, this.saveButton);
+    await this.clickAndWaitForURL(page, this.saveButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 }
diff --git a/tests/UI/pages/BO/advancedParameters/database/sqlManager/index.ts b/tests/UI/pages/BO/advancedParameters/database/sqlManager/index.ts
index baec530777b22..132c3146bd3bd 100644
--- a/tests/UI/pages/BO/advancedParameters/database/sqlManager/index.ts
+++ b/tests/UI/pages/BO/advancedParameters/database/sqlManager/index.ts
@@ -135,7 +135,7 @@ class SqlManager extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToDbBackupPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.dbBackupSubTabLink);
+    await this.clickAndWaitForURL(page, this.dbBackupSubTabLink);
   }
 
   /**
@@ -144,7 +144,7 @@ class SqlManager extends BOBasePage {
    * @returns {Promise<void>}
    */
   async goToNewSQLQueryPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.addNewSQLQueryButton);
+    await this.clickAndWaitForURL(page, this.addNewSQLQueryButton);
   }
 
   /**
@@ -154,7 +154,8 @@ class SqlManager extends BOBasePage {
    */
   async resetFilter(page: Page): Promise<void> {
     if (await this.elementVisible(page, this.filterResetButton, 2000)) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+      await this.clickAndWaitForLoadState(page, this.filterResetButton);
+      await this.elementNotVisible(page, this.filterResetButton, 2000);
     }
   }
 
@@ -187,7 +188,7 @@ class SqlManager extends BOBasePage {
   async filterSQLQuery(page: Page, filterBy: string, value: string = ''): Promise<void> {
     await this.setValue(page, this.filterInput(filterBy), value);
     // click on search
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await this.clickAndWaitForURL(page, this.filterSearchButton);
   }
 
   /**
@@ -233,7 +234,7 @@ class SqlManager extends BOBasePage {
         `${this.sqlQueryListTableToggleDropDown(row)}[aria-expanded='true']`,
       ),
     ]);
-    await this.clickAndWaitForNavigation(page, this.sqlQueryListTableViewLink(row));
+    await this.clickAndWaitForURL(page, this.sqlQueryListTableViewLink(row));
   }
 
   /**
@@ -249,7 +250,7 @@ class SqlManager extends BOBasePage {
         page,
         `${this.sqlQueryListTableToggleDropDown(row)}[aria-expanded='true']`),
     ]);
-    await this.clickAndWaitForNavigation(page, this.sqlQueryListTableEditLink(row));
+    await this.clickAndWaitForURL(page, this.sqlQueryListTableEditLink(row));
   }
 
   /**
@@ -294,7 +295,7 @@ class SqlManager extends BOBasePage {
    * @return {Promise<void>}
    */
   async confirmDeleteSQLQuery(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.confirmDeleteButton);
+    await this.clickAndWaitForURL(page, this.confirmDeleteButton);
   }
 
   /* Sort functions */
@@ -311,7 +312,7 @@ class SqlManager extends BOBasePage {
 
     let i: number = 0;
     while (await this.elementNotVisible(page, sortColumnDiv, 2000) && i < 2) {
-      await this.clickAndWaitForNavigation(page, sortColumnSpanButton);
+      await this.clickAndWaitForURL(page, sortColumnSpanButton);
       i += 1;
     }
 
@@ -335,9 +336,11 @@ class SqlManager extends BOBasePage {
    * @returns {Promise<string>}
    */
   async selectPaginationLimit(page: Page, number: number): Promise<string> {
+    const currentUrl: string = page.url();
+
     await Promise.all([
       this.selectByVisibleText(page, this.paginationLimitSelect, number),
-      page.waitForNavigation({waitUntil: 'networkidle'}),
+      page.waitForURL((url: URL): boolean => url.toString() !== currentUrl, {waitUntil: 'networkidle'}),
     ]);
 
     return this.getPaginationLabel(page);
@@ -349,7 +352,7 @@ class SqlManager extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationNext(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink);
+    await this.clickAndWaitForURL(page, this.paginationNextLink);
 
     return this.getPaginationLabel(page);
   }
@@ -360,7 +363,7 @@ class SqlManager extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationPrevious(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink);
+    await this.clickAndWaitForURL(page, this.paginationPreviousLink);
 
     return this.getPaginationLabel(page);
   }
@@ -388,7 +391,7 @@ class SqlManager extends BOBasePage {
       page.click(this.bulkActionsDeleteButton),
       this.waitForVisibleSelector(page, this.deleteModal),
     ]);
-    await this.clickAndWaitForNavigation(page, this.modalDeleteButton);
+    await this.clickAndWaitForURL(page, this.modalDeleteButton);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
diff --git a/tests/UI/pages/BO/advancedParameters/email/index.ts b/tests/UI/pages/BO/advancedParameters/email/index.ts
index 2d3cf16961ba1..4d7e11d1564d4 100644
--- a/tests/UI/pages/BO/advancedParameters/email/index.ts
+++ b/tests/UI/pages/BO/advancedParameters/email/index.ts
@@ -169,8 +169,9 @@ class Email extends BOBasePage {
    * @returns {Promise<void>}
    */
   async resetFilter(page: Page): Promise<void> {
-    if (!(await this.elementNotVisible(page, this.filterResetButton, 2000))) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+    if (await this.elementVisible(page, this.filterResetButton, 2000)) {
+      await page.click(this.filterResetButton);
+      await this.elementNotVisible(page, this.filterResetButton, 2000);
     }
   }
 
@@ -199,7 +200,8 @@ class Email extends BOBasePage {
    */
   async resetAndGetNumberOfLines(page: Page): Promise<number> {
     if (await this.elementVisible(page, this.filterResetButton, 2000)) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+      await this.clickAndWaitForLoadState(page, this.filterResetButton);
+      await this.elementNotVisible(page, this.filterResetButton, 2000);
     }
     return this.getTotalElementInGrid(page);
   }
@@ -225,7 +227,8 @@ class Email extends BOBasePage {
       // Do nothing
     }
     // click on search
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await page.click(this.filterSearchButton);
+    await this.elementVisible(page, this.filterResetButton, 2000);
   }
 
   /**
@@ -250,7 +253,7 @@ class Email extends BOBasePage {
     await page.type(this.emailFilterColumnInput('date_add_from'), dateFrom);
     await page.type(this.emailFilterColumnInput('date_add_to'), dateTo);
     // click on search
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await this.clickAndWaitForURL(page, this.filterSearchButton);
   }
 
   /**
@@ -265,7 +268,7 @@ class Email extends BOBasePage {
       this.waitForSelectorAndClick(page, this.deleteRowLink(row)),
       this.waitForVisibleSelector(page, `${this.confirmDeleteModal}.show`),
     ]);
-    await this.clickAndWaitForNavigation(page, this.confirmDeleteButton);
+    await this.clickAndWaitForURL(page, this.confirmDeleteButton);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
@@ -292,7 +295,7 @@ class Email extends BOBasePage {
       this.waitForSelectorAndClick(page, this.bulkActionsDeleteButton),
       this.waitForVisibleSelector(page, `${this.confirmDeleteModal}.show`),
     ]);
-    await this.clickAndWaitForNavigation(page, this.confirmDeleteButton);
+    await this.clickAndWaitForLoadState(page, this.confirmDeleteButton);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
@@ -325,7 +328,7 @@ class Email extends BOBasePage {
     await this.setValue(page, this.smtpPortFormField, port);
     await this.selectByVisibleText(page, this.smtpEncryptionFormField, encryption);
     // Click on Save button
-    await this.clickAndWaitForNavigation(page, this.saveEmailFormButton);
+    await this.clickAndWaitForLoadState(page, this.saveEmailFormButton);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
@@ -341,7 +344,7 @@ class Email extends BOBasePage {
     await this.waitForHiddenSelector(page, this.smtpServerFormField);
 
     // Click on Save button
-    await this.clickAndWaitForNavigation(page, this.saveEmailFormButton);
+    await this.clickAndWaitForLoadState(page, this.saveEmailFormButton);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
@@ -367,7 +370,7 @@ class Email extends BOBasePage {
   async setLogEmails(page: Page, toEnable: boolean): Promise<string> {
     await this.setChecked(page, this.logEmailsToggleInput(toEnable ? 1 : 0));
     await page.$eval(this.saveEmailFormButton, (el: HTMLElement) => el.click());
-    await page.waitForNavigation();
+    await page.waitForURL('');
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
@@ -386,7 +389,7 @@ class Email extends BOBasePage {
    * @param page {Page} Browser tab
    * @return {Promise<string>}
    */
-  getPaginationLabel(page: Page): Promise<string> {
+  async getPaginationLabel(page: Page): Promise<string> {
     return this.getTextContent(page, this.paginationLabel);
   }
 
@@ -397,10 +400,8 @@ class Email extends BOBasePage {
    * @returns {Promise<string>}
    */
   async selectPaginationLimit(page: Page, number: number): Promise<string> {
-    await Promise.all([
-      this.selectByVisibleText(page, this.paginationLimitSelect, number.toString()),
-      page.waitForNavigation({waitUntil: 'networkidle'}),
-    ]);
+    await this.selectByVisibleText(page, this.paginationLimitSelect, number.toString());
+    await page.click(this.paginationLabel);
 
     return this.getPaginationLabel(page);
   }
@@ -411,7 +412,7 @@ class Email extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationNext(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink);
+    await page.click(this.paginationNextLink);
 
     return this.getPaginationLabel(page);
   }
@@ -422,7 +423,7 @@ class Email extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationPrevious(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink);
+    await page.click(this.paginationPreviousLink);
 
     return this.getPaginationLabel(page);
   }
@@ -460,7 +461,7 @@ class Email extends BOBasePage {
     let i: number = 0;
     while (await this.elementNotVisible(page, sortColumnDiv, 2000) && i < 2) {
       await page.hover(this.sortColumnDiv(sortBy));
-      await this.clickAndWaitForNavigation(page, sortColumnSpanButton);
+      await page.click(sortColumnSpanButton);
       i += 1;
     }
 
diff --git a/tests/UI/pages/BO/advancedParameters/featureFlag/index.ts b/tests/UI/pages/BO/advancedParameters/featureFlag/index.ts
index a4a0d25889d97..11e00227ebedb 100644
--- a/tests/UI/pages/BO/advancedParameters/featureFlag/index.ts
+++ b/tests/UI/pages/BO/advancedParameters/featureFlag/index.ts
@@ -81,7 +81,7 @@ class FeatureFlag extends BOBasePage {
     // The confirmation modal is only displayed for experimental/beta feature flags
     if (toEnable && !isStable) {
       await this.waitForVisibleSelector(page, this.modalSubmitFeatureFlag);
-      await this.clickAndWaitForNavigation(page, this.enableExperimentalfeatureButton);
+      await this.clickAndWaitForURL(page, this.enableExperimentalfeatureButton);
     }
 
     return this.getTextContent(page, this.alertSuccess);
diff --git a/tests/UI/pages/BO/advancedParameters/import/index.ts b/tests/UI/pages/BO/advancedParameters/import/index.ts
index 7623c3fad2f41..93f6ec12a749b 100644
--- a/tests/UI/pages/BO/advancedParameters/import/index.ts
+++ b/tests/UI/pages/BO/advancedParameters/import/index.ts
@@ -158,7 +158,7 @@ class Import extends BOBasePage {
    */
   async closeImportModal(page: Page): Promise<boolean> {
     await this.waitForVisibleSelector(page, this.importProgressModalCloseButton);
-    await this.clickAndWaitForNavigation(page, this.importProgressModalCloseButton);
+    await this.clickAndWaitForURL(page, this.importProgressModalCloseButton);
 
     return this.elementNotVisible(page, this.importProgressModalCloseButton, 1000);
   }
diff --git a/tests/UI/pages/BO/advancedParameters/logs/index.ts b/tests/UI/pages/BO/advancedParameters/logs/index.ts
index 057cb8187eb3a..226e6f2e71e46 100644
--- a/tests/UI/pages/BO/advancedParameters/logs/index.ts
+++ b/tests/UI/pages/BO/advancedParameters/logs/index.ts
@@ -96,7 +96,7 @@ class Logs extends BOBasePage {
    */
   async resetFilter(page: Page): Promise<void> {
     if (!(await this.elementNotVisible(page, this.filterResetButton, 2000))) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+      await this.clickAndWaitForURL(page, this.filterResetButton);
     }
   }
 
@@ -144,7 +144,7 @@ class Logs extends BOBasePage {
       // Do nothing
     }
     // click on search
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await this.clickAndWaitForURL(page, this.filterSearchButton);
   }
 
   /**
@@ -211,7 +211,7 @@ class Logs extends BOBasePage {
     let i: number = 0;
     while (await this.elementNotVisible(page, sortColumnDiv, 2000) && i < 2) {
       await page.hover(this.sortColumnDiv(sortBy));
-      await this.clickAndWaitForNavigation(page, sortColumnSpanButton);
+      await this.clickAndWaitForURL(page, sortColumnSpanButton);
       i += 1;
     }
 
@@ -235,9 +235,11 @@ class Logs extends BOBasePage {
    * @returns {Promise<string>}
    */
   async selectPaginationLimit(page: Page, number: number): Promise<string> {
+    const currentUrl: string = page.url();
+
     await Promise.all([
       this.selectByVisibleText(page, this.paginationLimitSelect, number),
-      page.waitForNavigation({waitUntil: 'networkidle'}),
+      page.waitForURL((url: URL): boolean => url.toString() !== currentUrl, {waitUntil: 'networkidle'}),
     ]);
 
     return this.getPaginationLabel(page);
@@ -249,7 +251,7 @@ class Logs extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationNext(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink);
+    await this.clickAndWaitForURL(page, this.paginationNextLink);
 
     return this.getPaginationLabel(page);
   }
@@ -260,7 +262,7 @@ class Logs extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationPrevious(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink);
+    await this.clickAndWaitForURL(page, this.paginationPreviousLink);
 
     return this.getPaginationLabel(page);
   }
@@ -276,7 +278,7 @@ class Logs extends BOBasePage {
     await page.type(this.filterColumnInput('date_add_from'), dateFrom);
     await page.type(this.filterColumnInput('date_add_to'), dateTo);
     // click on search
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await this.clickAndWaitForURL(page, this.filterSearchButton);
   }
 
   // Methods for logs by email form
diff --git a/tests/UI/pages/BO/advancedParameters/multistore/add.ts b/tests/UI/pages/BO/advancedParameters/multistore/add.ts
index 03bbd9354b1b7..5348ade26056b 100644
--- a/tests/UI/pages/BO/advancedParameters/multistore/add.ts
+++ b/tests/UI/pages/BO/advancedParameters/multistore/add.ts
@@ -65,7 +65,7 @@ class AddShopGroup extends BOBasePage {
     );
     await this.setChecked(page, this.statusToggleLabel(shopGroupData.status ? 'on' : 'off'));
 
-    await this.clickAndWaitForNavigation(page, this.saveButton, 'networkidle', 60000);
+    await this.clickAndWaitForURL(page, this.saveButton, 'networkidle', 60000);
     return this.getAlertSuccessBlockContent(page);
   }
 }
diff --git a/tests/UI/pages/BO/advancedParameters/multistore/index.ts b/tests/UI/pages/BO/advancedParameters/multistore/index.ts
index 70a8cc7effdaf..6e5d4028c4080 100644
--- a/tests/UI/pages/BO/advancedParameters/multistore/index.ts
+++ b/tests/UI/pages/BO/advancedParameters/multistore/index.ts
@@ -145,7 +145,7 @@ class MultiStoreSettings extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToNewShopGroupPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.newShopGroupLink);
+    await this.clickAndWaitForURL(page, this.newShopGroupLink);
   }
 
   /**
@@ -154,7 +154,7 @@ class MultiStoreSettings extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToNewShopPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.newShopLink);
+    await this.clickAndWaitForURL(page, this.newShopLink);
   }
 
   /* Filter methods */
@@ -175,7 +175,7 @@ class MultiStoreSettings extends BOBasePage {
    */
   async resetFilter(page: Page): Promise<void> {
     if (!(await this.elementNotVisible(page, this.filterResetButton, 2000))) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+      await this.clickAndWaitForURL(page, this.filterResetButton);
     }
   }
 
@@ -198,7 +198,7 @@ class MultiStoreSettings extends BOBasePage {
    */
   async filterTable(page: Page, filterBy: string, value: string): Promise<void> {
     await this.setValue(page, this.filterColumn(filterBy), value);
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await this.clickAndWaitForURL(page, this.filterSearchButton);
   }
 
   /**
@@ -208,7 +208,7 @@ class MultiStoreSettings extends BOBasePage {
    * @return {Promise<void>}
    */
   async gotoEditShopGroupPage(page: Page, row: number): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.tableColumnActionsEditLink(row));
+    await this.clickAndWaitForURL(page, this.tableColumnActionsEditLink(row));
   }
 
   /**
@@ -226,7 +226,7 @@ class MultiStoreSettings extends BOBasePage {
     await page.click(this.tableColumnActionsDeleteLink(row));
 
     // Confirm delete action
-    await this.clickAndWaitForNavigation(page, this.deleteModalButtonYes);
+    await this.clickAndWaitForURL(page, this.deleteModalButtonYes);
 
     // Get successful message
     return this.getAlertSuccessBlockParagraphContent(page);
@@ -249,7 +249,7 @@ class MultiStoreSettings extends BOBasePage {
    * @returns {Promise<void>}
    */
   async goToShopPage(page: Page, id: number): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.shopLink(id));
+    await this.clickAndWaitForURL(page, this.shopLink(id));
   }
 
   /**
@@ -259,7 +259,7 @@ class MultiStoreSettings extends BOBasePage {
    * @returns {Promise<void>}
    */
   async goToShopURLPage(page: Page, id: number = 1): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.shopUrlLink(id));
+    await this.clickAndWaitForURL(page, this.shopUrlLink(id));
   }
 
   /**
@@ -324,7 +324,7 @@ class MultiStoreSettings extends BOBasePage {
    */
   async selectPaginationLimit(page: Page, number: number): Promise<string> {
     await this.waitForSelectorAndClick(page, this.paginationDropdownButton);
-    await this.clickAndWaitForNavigation(page, this.paginationItems(number));
+    await page.click(this.paginationItems(number));
 
     return this.getPaginationLabel(page);
   }
@@ -335,7 +335,7 @@ class MultiStoreSettings extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationNext(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink);
+    await this.clickAndWaitForURL(page, this.paginationNextLink);
 
     return this.getPaginationLabel(page);
   }
@@ -346,7 +346,7 @@ class MultiStoreSettings extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationPrevious(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink);
+    await this.clickAndWaitForURL(page, this.paginationPreviousLink);
 
     return this.getPaginationLabel(page);
   }
@@ -376,7 +376,7 @@ class MultiStoreSettings extends BOBasePage {
     }
 
     const sortColumnButton = `${columnSelector} i.icon-caret-${sortDirection}`;
-    await this.clickAndWaitForNavigation(page, sortColumnButton);
+    await this.clickAndWaitForURL(page, sortColumnButton);
   }
 }
 
diff --git a/tests/UI/pages/BO/advancedParameters/multistore/shop/add.ts b/tests/UI/pages/BO/advancedParameters/multistore/shop/add.ts
index 265acae968159..6e9ce9afa77cf 100644
--- a/tests/UI/pages/BO/advancedParameters/multistore/shop/add.ts
+++ b/tests/UI/pages/BO/advancedParameters/multistore/shop/add.ts
@@ -53,13 +53,15 @@ class AddShop extends BOBasePage {
    * @returns {Promise<string>}
    */
   async setShop(page: Page, shopData: ShopData): Promise<string> {
+    const currentUrl: string = page.url();
+
     await this.setValue(page, this.nameInput, shopData.name);
     await this.selectByVisibleText(page, this.shopGroupSelect, shopData.shopGroup);
     await this.selectByVisibleText(page, this.categoryRootSelect, shopData.categoryRoot);
 
     await Promise.all([
       page.$eval(this.saveButton, (el: HTMLElement) => el.click()),
-      page.waitForNavigation({waitUntil: 'networkidle', timeout: 30000}),
+      page.waitForURL((url: URL): boolean => url.toString() !== currentUrl, {waitUntil: 'networkidle', timeout: 30000}),
     ]);
 
     return this.getTextContent(page, this.alertSuccessBlock);
diff --git a/tests/UI/pages/BO/advancedParameters/multistore/shop/index.ts b/tests/UI/pages/BO/advancedParameters/multistore/shop/index.ts
index 703d8de7de440..0c832152781e9 100644
--- a/tests/UI/pages/BO/advancedParameters/multistore/shop/index.ts
+++ b/tests/UI/pages/BO/advancedParameters/multistore/shop/index.ts
@@ -125,7 +125,7 @@ class ShopSettings extends BOBasePage {
    * @returns {Promise<void>}
    */
   async goToNewShopPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.addNewShopLink);
+    await this.clickAndWaitForURL(page, this.addNewShopLink);
   }
 
   /* Filter methods */
@@ -146,7 +146,7 @@ class ShopSettings extends BOBasePage {
    */
   async resetFilter(page: Page): Promise<void> {
     if (!(await this.elementNotVisible(page, this.filterResetButton, 2000))) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+      await this.clickAndWaitForURL(page, this.filterResetButton);
     }
   }
 
@@ -169,7 +169,7 @@ class ShopSettings extends BOBasePage {
    */
   async filterTable(page: Page, filterBy: string, value: string): Promise<void> {
     await this.setValue(page, this.filterColumn(filterBy), value);
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await this.clickAndWaitForURL(page, this.filterSearchButton);
   }
 
   /**
@@ -256,7 +256,7 @@ class ShopSettings extends BOBasePage {
    * @return {Promise<void>}
    */
   async gotoEditShopPage(page: Page, row: number): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.tableColumnActionsEditLink(row));
+    await this.clickAndWaitForURL(page, this.tableColumnActionsEditLink(row));
   }
 
   /**
@@ -266,7 +266,7 @@ class ShopSettings extends BOBasePage {
    * @returns {Promise<void>}
    */
   async goToSetURL(page: Page, row: number): Promise<void> {
-    await this.clickAndWaitForNavigation(page, `${this.tableColumn(row, 5)} a`);
+    await this.clickAndWaitForURL(page, `${this.tableColumn(row, 5)} a`);
   }
 
   /* Pagination methods */
@@ -287,7 +287,7 @@ class ShopSettings extends BOBasePage {
    */
   async selectPaginationLimit(page: Page, number: number): Promise<string> {
     await this.waitForSelectorAndClick(page, this.paginationDropdownButton);
-    await this.clickAndWaitForNavigation(page, this.paginationItems(number));
+    await this.clickAndWaitForURL(page, this.paginationItems(number));
 
     return this.getPaginationLabel(page);
   }
@@ -298,7 +298,7 @@ class ShopSettings extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationNext(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink);
+    await this.clickAndWaitForURL(page, this.paginationNextLink);
 
     return this.getPaginationLabel(page);
   }
@@ -309,7 +309,7 @@ class ShopSettings extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationPrevious(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink);
+    await this.clickAndWaitForURL(page, this.paginationPreviousLink);
 
     return this.getPaginationLabel(page);
   }
@@ -351,7 +351,7 @@ class ShopSettings extends BOBasePage {
     }
 
     const sortColumnButton = `${columnSelector} i.icon-caret-${sortDirection}`;
-    await this.clickAndWaitForNavigation(page, sortColumnButton);
+    await this.clickAndWaitForURL(page, sortColumnButton);
   }
 }
 
diff --git a/tests/UI/pages/BO/advancedParameters/multistore/url/addURL.ts b/tests/UI/pages/BO/advancedParameters/multistore/url/addURL.ts
index 7b1062510c1ee..04aa516862a7b 100644
--- a/tests/UI/pages/BO/advancedParameters/multistore/url/addURL.ts
+++ b/tests/UI/pages/BO/advancedParameters/multistore/url/addURL.ts
@@ -46,7 +46,7 @@ class AddUrl extends BOBasePage {
   async setVirtualUrl(page: Page, shopData: ShopData): Promise<string> {
     await this.setValue(page, this.virtualUrlInput, shopData.name);
 
-    await this.clickAndWaitForNavigation(page, this.saveButton, 'networkidle', 60000);
+    await this.clickAndWaitForURL(page, this.saveButton, 'networkidle', 60000);
     return this.getTextContent(page, this.alertSuccessBlock);
   }
 }
diff --git a/tests/UI/pages/BO/advancedParameters/multistore/url/index.ts b/tests/UI/pages/BO/advancedParameters/multistore/url/index.ts
index 057264a6dfd93..8ed4c32c08d78 100644
--- a/tests/UI/pages/BO/advancedParameters/multistore/url/index.ts
+++ b/tests/UI/pages/BO/advancedParameters/multistore/url/index.ts
@@ -160,7 +160,7 @@ class ShopURLSettings extends BOBasePage {
    * @returns {Promise<void>}
    */
   async goToAddNewUrl(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.addNewUrlButton);
+    await this.clickAndWaitForURL(page, this.addNewUrlButton);
   }
 
   /* Filter methods */
@@ -181,7 +181,7 @@ class ShopURLSettings extends BOBasePage {
    */
   async resetFilter(page: Page): Promise<void> {
     if (!(await this.elementNotVisible(page, this.filterResetButton, 2000))) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+      await this.clickAndWaitForURL(page, this.filterResetButton);
     }
   }
 
@@ -204,15 +204,17 @@ class ShopURLSettings extends BOBasePage {
    * @return {Promise<void>}
    */
   async filterTable(page: Page, filterType: string, filterBy: string, value: string): Promise<void> {
+    const currentUrl: string = page.url();
+
     switch (filterType) {
       case 'input':
         await this.setValue(page, this.filterColumn(filterBy), value);
-        await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+        await this.clickAndWaitForURL(page, this.filterSearchButton);
         break;
 
       case 'select':
         await Promise.all([
-          page.waitForNavigation({waitUntil: 'networkidle'}),
+          page.waitForURL((url: URL): boolean => url.toString() !== currentUrl, {waitUntil: 'networkidle'}),
           this.selectByVisibleText(page, this.filterColumn(filterBy), value ? 'Yes' : 'No'),
         ]);
         break;
@@ -299,7 +301,7 @@ class ShopURLSettings extends BOBasePage {
    */
   async selectPaginationLimit(page: Page, number: number): Promise<string> {
     await this.waitForSelectorAndClick(page, this.paginationDropdownButton);
-    await this.clickAndWaitForNavigation(page, this.paginationItems(number));
+    await this.clickAndWaitForURL(page, this.paginationItems(number));
 
     return this.getPaginationLabel(page);
   }
@@ -310,7 +312,7 @@ class ShopURLSettings extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationNext(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink);
+    await this.clickAndWaitForURL(page, this.paginationNextLink);
 
     return this.getPaginationLabel(page);
   }
@@ -321,7 +323,7 @@ class ShopURLSettings extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationPrevious(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink);
+    await this.clickAndWaitForURL(page, this.paginationPreviousLink);
 
     return this.getPaginationLabel(page);
   }
@@ -341,7 +343,7 @@ class ShopURLSettings extends BOBasePage {
     await page.click(this.tableColumnActionsDeleteLink(row));
 
     // Confirm delete action
-    await this.clickAndWaitForNavigation(page, this.deleteModalButtonYes);
+    await this.clickAndWaitForURL(page, this.deleteModalButtonYes);
 
     // Get successful message
     return this.getAlertSuccessBlockParagraphContent(page);
@@ -376,7 +378,7 @@ class ShopURLSettings extends BOBasePage {
     }
 
     const sortColumnButton = `${columnSelector} i.icon-caret-${sortDirection}`;
-    await this.clickAndWaitForNavigation(page, sortColumnButton);
+    await this.clickAndWaitForURL(page, sortColumnButton);
   }
 
   // Quick edit methods
@@ -444,7 +446,7 @@ class ShopURLSettings extends BOBasePage {
       this.waitForVisibleSelector(page, this.bulkEnableLink),
     ]);
 
-    await this.clickAndWaitForNavigation(
+    await this.clickAndWaitForURL(
       page,
       wantedStatus ? this.bulkEnableLink : this.bulkDisableLink,
     );
diff --git a/tests/UI/pages/BO/advancedParameters/performance/index.ts b/tests/UI/pages/BO/advancedParameters/performance/index.ts
index 9ff35c91fe68a..3fc169ee93671 100644
--- a/tests/UI/pages/BO/advancedParameters/performance/index.ts
+++ b/tests/UI/pages/BO/advancedParameters/performance/index.ts
@@ -47,7 +47,7 @@ class Performance extends BOBasePage {
    * @returns {Promise<string>}
    */
   async clearCache(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.clearCacheButton);
+    await this.clickAndWaitForLoadState(page, this.clearCacheButton);
 
     return this.getTextContent(page, this.alertSuccessBlockParagraph);
   }
diff --git a/tests/UI/pages/BO/advancedParameters/team/add.ts b/tests/UI/pages/BO/advancedParameters/team/add.ts
index 32189e665437b..eabbff47743e4 100644
--- a/tests/UI/pages/BO/advancedParameters/team/add.ts
+++ b/tests/UI/pages/BO/advancedParameters/team/add.ts
@@ -49,7 +49,7 @@ class AddEmployee extends EmployeeBasePage {
     }
     // replace toggle by 1 in the selector if active = YES / 0 if active = NO
     await this.setChecked(page, this.statusToggleInput(employeeData.active ? 1 : 0));
-    await this.clickAndWaitForNavigation(page, this.saveButton);
+    await this.clickAndWaitForLoadState(page, this.saveButton);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
diff --git a/tests/UI/pages/BO/advancedParameters/team/employeeBasePage.ts b/tests/UI/pages/BO/advancedParameters/team/employeeBasePage.ts
index 58275603e8693..79b0a986cc605 100644
--- a/tests/UI/pages/BO/advancedParameters/team/employeeBasePage.ts
+++ b/tests/UI/pages/BO/advancedParameters/team/employeeBasePage.ts
@@ -77,6 +77,6 @@ export default class EmployeeBasePage extends BOBasePage {
    * @returns {Promise<void>}
    */
   async cancel(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.cancelButton);
+    await this.clickAndWaitForURL(page, this.cancelButton);
   }
 };
diff --git a/tests/UI/pages/BO/advancedParameters/team/index.ts b/tests/UI/pages/BO/advancedParameters/team/index.ts
index 732633b4d8192..533801cd7aff4 100644
--- a/tests/UI/pages/BO/advancedParameters/team/index.ts
+++ b/tests/UI/pages/BO/advancedParameters/team/index.ts
@@ -144,7 +144,7 @@ class Employees extends BOBasePage {
    * @returns {Promise<boolean>}
    */
   async goToPermissionsTab(page: Page): Promise<boolean> {
-    await this.clickAndWaitForNavigation(page, this.permissionsTab);
+    await this.clickAndWaitForURL(page, this.permissionsTab);
     return this.elementVisible(page, `${this.permissionsTab}.current`, 1000);
   }
 
@@ -155,7 +155,7 @@ class Employees extends BOBasePage {
    * @returns {Promise<void>}
    */
   async goToAddNewEmployeePage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.addNewEmployeeLink);
+    await this.clickAndWaitForURL(page, this.addNewEmployeeLink);
   }
 
   // Tab methods
@@ -165,7 +165,7 @@ class Employees extends BOBasePage {
    * @returns {Promise<void>}
    */
   async goToProfilesPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.profilesTab);
+    await this.clickAndWaitForURL(page, this.profilesTab);
   }
 
   // Columns methods
@@ -185,7 +185,8 @@ class Employees extends BOBasePage {
    */
   async resetAndGetNumberOfLines(page: Page): Promise<number> {
     if (await this.elementVisible(page, this.filterResetButton, 2000)) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+      await this.clickAndWaitForLoadState(page, this.filterResetButton);
+      await this.elementNotVisible(page, this.filterResetButton, 2000);
     }
     return this.getNumberOfElementInGrid(page);
   }
@@ -208,7 +209,7 @@ class Employees extends BOBasePage {
    * @returns {Promise<void>}
    */
   async goToEditEmployeePage(page: Page, row: number): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.employeesListTableEditLink(row));
+    await this.clickAndWaitForURL(page, this.employeesListTableEditLink(row));
   }
 
   /**
@@ -231,7 +232,7 @@ class Employees extends BOBasePage {
       // Do nothing
     }
     // click on search
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await this.clickAndWaitForURL(page, this.filterSearchButton);
   }
 
   /**
@@ -261,7 +262,7 @@ class Employees extends BOBasePage {
    */
   async setStatus(page: Page, row: number, valueWanted: boolean = true): Promise<boolean> {
     if (await this.getStatus(page, row) !== valueWanted) {
-      await this.clickAndWaitForNavigation(page, this.employeesListTableStatusColumn(row));
+      await this.clickAndWaitForURL(page, this.employeesListTableStatusColumn(row));
       return true;
     }
 
@@ -322,7 +323,8 @@ class Employees extends BOBasePage {
    * @return {Promise<void>}
    */
   async confirmDeleteEmployees(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.confirmDeleteButton);
+    await page.click(this.confirmDeleteButton);
+    await this.elementNotVisible(page, this.confirmDeleteModal, 2000);
   }
 
   /**
@@ -343,7 +345,8 @@ class Employees extends BOBasePage {
       this.waitForVisibleSelector(page, `${this.bulkActionsToggleButton}`),
     ]);
     // Click on delete and wait for modal
-    await this.clickAndWaitForNavigation(page, enable ? this.bulkActionsEnableButton : this.bulkActionsDisableButton);
+    await page.click(enable ? this.bulkActionsEnableButton : this.bulkActionsDisableButton);
+    await this.elementNotVisible(page, enable ? this.bulkActionsEnableButton : this.bulkActionsDisableButton, 2000);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
@@ -411,7 +414,7 @@ class Employees extends BOBasePage {
 
     let i = 0;
     while (await this.elementNotVisible(page, sortColumnDiv, 2000) && i < 2) {
-      await this.clickAndWaitForNavigation(page, sortColumnSpanButton);
+      await this.clickAndWaitForURL(page, sortColumnSpanButton);
       i += 1;
     }
 
@@ -437,7 +440,7 @@ class Employees extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationNext(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink);
+    await this.clickAndWaitForURL(page, this.paginationNextLink);
 
     return this.getTextContent(page, this.paginationLabel);
   }
@@ -448,7 +451,7 @@ class Employees extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationPrevious(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink);
+    await this.clickAndWaitForURL(page, this.paginationPreviousLink);
 
     return this.getTextContent(page, this.paginationLabel);
   }
diff --git a/tests/UI/pages/BO/advancedParameters/team/myProfile.ts b/tests/UI/pages/BO/advancedParameters/team/myProfile.ts
index 0860b677616da..107e5f112cb1d 100644
--- a/tests/UI/pages/BO/advancedParameters/team/myProfile.ts
+++ b/tests/UI/pages/BO/advancedParameters/team/myProfile.ts
@@ -77,7 +77,7 @@ class MyProfile extends EmployeeBasePage {
     await this.setValue(page, this.confirmPasswordInput, newEmployeeData.password);
     await this.selectByVisibleText(page, this.languageSelect, newEmployeeData.language);
     await this.selectDefaultPage(page, newEmployeeData.defaultPage);
-    await this.clickAndWaitForNavigation(page, this.saveButton);
+    await this.clickAndWaitForLoadState(page, this.saveButton);
   }
 
   /**
diff --git a/tests/UI/pages/BO/advancedParameters/team/profiles/add.ts b/tests/UI/pages/BO/advancedParameters/team/profiles/add.ts
index e4ccba73d15d0..a1413d53a0106 100644
--- a/tests/UI/pages/BO/advancedParameters/team/profiles/add.ts
+++ b/tests/UI/pages/BO/advancedParameters/team/profiles/add.ts
@@ -45,7 +45,7 @@ class AddProfile extends BOBasePage {
    */
   async createEditProfile(page: Page, profileData: ProfileData): Promise<string> {
     await this.setValue(page, this.nameInput, profileData.name);
-    await this.clickAndWaitForNavigation(page, this.saveButton);
+    await this.clickAndWaitForURL(page, this.saveButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 }
diff --git a/tests/UI/pages/BO/advancedParameters/team/profiles/index.ts b/tests/UI/pages/BO/advancedParameters/team/profiles/index.ts
index dd6decb99f1f8..ab2b1187347e1 100644
--- a/tests/UI/pages/BO/advancedParameters/team/profiles/index.ts
+++ b/tests/UI/pages/BO/advancedParameters/team/profiles/index.ts
@@ -121,7 +121,7 @@ class Profiles extends BOBasePage {
    * @returns {Promise<void>}
    */
   async goToAddNewProfilePage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.addNewProfileLink);
+    await this.clickAndWaitForURL(page, this.addNewProfileLink);
   }
 
   /**
@@ -151,7 +151,8 @@ class Profiles extends BOBasePage {
    */
   async resetAndGetNumberOfLines(page: Page): Promise<number> {
     if (await this.elementVisible(page, this.filterResetButton, 2000)) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+      await this.clickAndWaitForLoadState(page, this.filterResetButton);
+      await this.elementNotVisible(page, this.filterResetButton, 2000);
     }
     return this.getNumberOfElementInGrid(page);
   }
@@ -164,7 +165,7 @@ class Profiles extends BOBasePage {
    */
   async goToEditProfilePage(page: Page, row: number): Promise<void> {
     // Click on edit
-    await this.clickAndWaitForNavigation(page, this.profilesListTableEditLink(row));
+    await this.clickAndWaitForURL(page, this.profilesListTableEditLink(row));
   }
 
   /**
@@ -187,7 +188,7 @@ class Profiles extends BOBasePage {
       // Do nothing
     }
     // click on search
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await this.clickAndWaitForURL(page, this.filterSearchButton);
   }
 
   /**
@@ -220,7 +221,7 @@ class Profiles extends BOBasePage {
    * @return {Promise<void>}
    */
   async confirmDeleteProfiles(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.confirmDeleteButton);
+    await this.clickAndWaitForURL(page, this.confirmDeleteButton);
   }
 
   /**
@@ -268,7 +269,7 @@ class Profiles extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationNext(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.pagesPaginationNextLink);
+    await this.clickAndWaitForURL(page, this.pagesPaginationNextLink);
 
     return this.getTextContent(page, this.pagesPaginationLabel);
   }
@@ -279,7 +280,7 @@ class Profiles extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationPrevious(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.pagesPaginationPreviousLink);
+    await this.clickAndWaitForURL(page, this.pagesPaginationPreviousLink);
 
     return this.getTextContent(page, this.pagesPaginationLabel);
   }
@@ -316,7 +317,7 @@ class Profiles extends BOBasePage {
 
     let i: number = 0;
     while (await this.elementNotVisible(page, sortColumnDiv, 2000) && i < 2) {
-      await this.clickAndWaitForNavigation(page, sortColumnSpanButton);
+      await this.clickAndWaitForURL(page, sortColumnSpanButton);
       i += 1;
     }
 
diff --git a/tests/UI/pages/BO/advancedParameters/webservice/add.ts b/tests/UI/pages/BO/advancedParameters/webservice/add.ts
index 3b067ab9fe8d6..d163d4179c16c 100644
--- a/tests/UI/pages/BO/advancedParameters/webservice/add.ts
+++ b/tests/UI/pages/BO/advancedParameters/webservice/add.ts
@@ -80,7 +80,7 @@ class AddWebserviceKey extends BOBasePage {
       }
     }
 
-    await this.clickAndWaitForNavigation(page, this.saveButton);
+    await this.clickAndWaitForURL(page, this.saveButton);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
diff --git a/tests/UI/pages/BO/advancedParameters/webservice/index.ts b/tests/UI/pages/BO/advancedParameters/webservice/index.ts
index 9e7430991f1fe..35f8079aea302 100644
--- a/tests/UI/pages/BO/advancedParameters/webservice/index.ts
+++ b/tests/UI/pages/BO/advancedParameters/webservice/index.ts
@@ -158,7 +158,7 @@ class WebService extends BOBasePage {
    * @returns {Promise<void>}
    */
   async goToAddNewWebserviceKeyPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.addNewWebserviceLink);
+    await this.clickAndWaitForURL(page, this.addNewWebserviceLink);
   }
 
   /**
@@ -177,7 +177,8 @@ class WebService extends BOBasePage {
    */
   async resetAndGetNumberOfLines(page: Page): Promise<number> {
     if (await this.elementVisible(page, this.filterResetButton, 2000)) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+      await this.clickAndWaitForLoadState(page, this.filterResetButton);
+      await this.elementNotVisible(page, this.filterResetButton, 2000);
     }
     return this.getNumberOfElementInGrid(page);
   }
@@ -200,7 +201,7 @@ class WebService extends BOBasePage {
    * @returns {Promise<void>}
    */
   async goToEditWebservicePage(page: Page, row: number): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.webserviceListTableEditLink(row));
+    await this.clickAndWaitForURL(page, this.webserviceListTableEditLink(row));
   }
 
   /**
@@ -223,7 +224,7 @@ class WebService extends BOBasePage {
       // Do nothing
     }
     // click on search
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await this.clickAndWaitForURL(page, this.filterSearchButton);
   }
 
   /**
@@ -253,7 +254,8 @@ class WebService extends BOBasePage {
    */
   async setStatus(page: Page, row: number, valueWanted: boolean = true): Promise<boolean> {
     if (await this.getStatus(page, row) !== valueWanted) {
-      await this.clickAndWaitForNavigation(page, this.webserviceListTableStatusColumn(row));
+      await page.click(this.webserviceListTableStatusColumn(row));
+
       return true;
     }
 
@@ -291,7 +293,8 @@ class WebService extends BOBasePage {
    * @return {Promise<void>}
    */
   async confirmDeleteWebService(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.confirmDeleteButton);
+    await page.click(this.confirmDeleteButton);
+    await this.elementNotVisible(page, this.confirmDeleteModal, 2000);
   }
 
   /**
@@ -351,7 +354,8 @@ class WebService extends BOBasePage {
     ]);
 
     // Click on enable/Disable and wait for modal
-    await this.clickAndWaitForNavigation(page, enable ? this.bulkActionsEnableButton : this.bulkActionsDisableButton);
+    await page.click(enable ? this.bulkActionsEnableButton : this.bulkActionsDisableButton);
+    await this.elementNotVisible(page, enable ? this.bulkActionsEnableButton : this.bulkActionsDisableButton, 2000);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
@@ -387,7 +391,7 @@ class WebService extends BOBasePage {
 
     let i: number = 0;
     while (await this.elementNotVisible(page, sortColumnDiv, 2000) && i < 2) {
-      await this.clickAndWaitForNavigation(page, sortColumnSpanButton);
+      await this.clickAndWaitForURL(page, sortColumnSpanButton);
       i += 1;
     }
 
@@ -411,9 +415,11 @@ class WebService extends BOBasePage {
    * @returns {Promise<string>}
    */
   async selectPaginationLimit(page: Page, number: number): Promise<string> {
+    const currentUrl: string = page.url();
+
     await Promise.all([
       this.selectByVisibleText(page, this.paginationLimitSelect, number),
-      page.waitForNavigation({waitUntil: 'networkidle'}),
+      page.waitForURL((url: URL): boolean => url.toString() !== currentUrl, {waitUntil: 'networkidle'}),
     ]);
 
     return this.getPaginationLabel(page);
@@ -425,7 +431,7 @@ class WebService extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationNext(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink);
+    await this.clickAndWaitForURL(page, this.paginationNextLink);
 
     return this.getPaginationLabel(page);
   }
@@ -436,7 +442,7 @@ class WebService extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationPrevious(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink);
+    await this.clickAndWaitForURL(page, this.paginationPreviousLink);
 
     return this.getPaginationLabel(page);
   }
@@ -450,7 +456,7 @@ class WebService extends BOBasePage {
    */
   async setWebserviceStatus(page: Page, status: boolean): Promise<string> {
     await this.setChecked(page, this.enableWebserviceToggleInput(status ? 1 : 0));
-    await this.clickAndWaitForNavigation(page, this.configurationFormSubmit);
+    await this.clickAndWaitForLoadState(page, this.configurationFormSubmit);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
diff --git a/tests/UI/pages/BO/catalog/attributes/addAttribute.ts b/tests/UI/pages/BO/catalog/attributes/addAttribute.ts
index f834c51dddab3..8bcf7bb69011b 100644
--- a/tests/UI/pages/BO/catalog/attributes/addAttribute.ts
+++ b/tests/UI/pages/BO/catalog/attributes/addAttribute.ts
@@ -75,7 +75,7 @@ class AddAttribute extends BOBasePage {
     await this.selectByVisibleText(page, this.attributeTypeSelect, attributeData.attributeType);
 
     // Save attribute
-    await this.clickAndWaitForNavigation(page, this.saveButton);
+    await this.clickAndWaitForURL(page, this.saveButton);
 
     // Return successful message
     return this.getAlertSuccessBlockParagraphContent(page);
diff --git a/tests/UI/pages/BO/catalog/attributes/addValue.ts b/tests/UI/pages/BO/catalog/attributes/addValue.ts
index bd92e58145e0a..ce6af13c626cd 100644
--- a/tests/UI/pages/BO/catalog/attributes/addValue.ts
+++ b/tests/UI/pages/BO/catalog/attributes/addValue.ts
@@ -81,9 +81,9 @@ class AddValue extends BOBasePage {
 
     // Save value
     if (saveAndStay) {
-      await this.clickAndWaitForNavigation(page, this.saveAndStayButton);
+      await page.click(this.saveAndStayButton);
     } else {
-      await this.clickAndWaitForNavigation(page, this.saveButton);
+      await this.clickAndWaitForURL(page, this.saveButton);
     }
 
     // Return successful message
diff --git a/tests/UI/pages/BO/catalog/attributes/index.ts b/tests/UI/pages/BO/catalog/attributes/index.ts
index 30b9ce34f7af9..8f0c78d89e3da 100644
--- a/tests/UI/pages/BO/catalog/attributes/index.ts
+++ b/tests/UI/pages/BO/catalog/attributes/index.ts
@@ -184,7 +184,7 @@ class Attributes extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToFeaturesPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.featuresSubtabLink);
+    await this.clickAndWaitForURL(page, this.featuresSubtabLink);
   }
 
   /**
@@ -193,7 +193,7 @@ class Attributes extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToAddAttributePage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.addNewAttributeLink);
+    await this.clickAndWaitForURL(page, this.addNewAttributeLink);
   }
 
   /**
@@ -202,7 +202,7 @@ class Attributes extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToAddNewValuePage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.addNewValueLink);
+    await this.clickAndWaitForURL(page, this.addNewValueLink);
   }
 
   /* Filter methods */
@@ -213,7 +213,7 @@ class Attributes extends BOBasePage {
    */
   async resetFilter(page: Page): Promise<void> {
     if (!(await this.elementNotVisible(page, this.filterResetButton, 2000))) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+      await this.clickAndWaitForURL(page, this.filterResetButton);
     }
     await this.waitForVisibleSelector(page, this.filterSearchButton, 2000);
   }
@@ -246,7 +246,7 @@ class Attributes extends BOBasePage {
    */
   async filterTable(page: Page, filterBy: string, value: string): Promise<void> {
     await this.setValue(page, this.filterColumn(filterBy), value);
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await this.clickAndWaitForURL(page, this.filterSearchButton);
   }
 
   /* Column methods */
@@ -291,7 +291,7 @@ class Attributes extends BOBasePage {
    * @return {Promise<void>}
    */
   async viewAttribute(page: Page, row: number): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.tableColumnActionsViewLink(row));
+    await this.clickAndWaitForURL(page, this.tableColumnActionsViewLink(row));
   }
 
   /**
@@ -316,7 +316,7 @@ class Attributes extends BOBasePage {
   async goToEditAttributePage(page: Page, row: number): Promise<void> {
     await this.openRowActionsDropdown(page, row);
 
-    await this.clickAndWaitForNavigation(page, this.tableColumnActionsEditLink(row));
+    await this.clickAndWaitForURL(page, this.tableColumnActionsEditLink(row));
   }
 
   /**
@@ -331,7 +331,7 @@ class Attributes extends BOBasePage {
     await page.click(this.tableColumnActionsDeleteLink(row));
 
     // Confirm delete action
-    await this.clickAndWaitForNavigation(page, this.deleteModalButtonYes);
+    await this.clickAndWaitForURL(page, this.deleteModalButtonYes);
 
     // Get successful message
     return this.getAlertSuccessBlockParagraphContent(page);
@@ -381,7 +381,7 @@ class Attributes extends BOBasePage {
       this.waitForVisibleSelector(page, this.bulkDeleteLink),
     ]);
 
-    await this.clickAndWaitForNavigation(page, this.bulkDeleteLink);
+    await this.clickAndWaitForURL(page, this.bulkDeleteLink);
 
     // Return successful message
     return this.getAlertSuccessBlockParagraphContent(page);
@@ -405,7 +405,7 @@ class Attributes extends BOBasePage {
    */
   async selectPaginationLimit(page: Page, number: number): Promise<string> {
     await this.waitForSelectorAndClick(page, this.paginationDropdownButton);
-    await this.clickAndWaitForNavigation(page, this.paginationItems(number));
+    await this.clickAndWaitForURL(page, this.paginationItems(number));
 
     return this.getPaginationLabel(page);
   }
@@ -416,7 +416,7 @@ class Attributes extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationNext(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink);
+    await this.clickAndWaitForURL(page, this.paginationNextLink);
 
     return this.getPaginationLabel(page);
   }
@@ -427,7 +427,7 @@ class Attributes extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationPrevious(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink);
+    await this.clickAndWaitForURL(page, this.paginationPreviousLink);
 
     return this.getPaginationLabel(page);
   }
@@ -461,7 +461,7 @@ class Attributes extends BOBasePage {
     }
 
     const sortColumnButton = `${columnSelector} i.icon-caret-${sortDirection}`;
-    await this.clickAndWaitForNavigation(page, sortColumnButton);
+    await this.clickAndWaitForURL(page, sortColumnButton);
   }
 
   /**
diff --git a/tests/UI/pages/BO/catalog/attributes/view.ts b/tests/UI/pages/BO/catalog/attributes/view.ts
index ab4253b69a59c..1e030375b2546 100644
--- a/tests/UI/pages/BO/catalog/attributes/view.ts
+++ b/tests/UI/pages/BO/catalog/attributes/view.ts
@@ -175,7 +175,7 @@ class ViewAttribute extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToAddNewValuePage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.addNewValueLink);
+    await this.clickAndWaitForURL(page, this.addNewValueLink);
   }
 
   /* Filter methods */
@@ -186,7 +186,7 @@ class ViewAttribute extends BOBasePage {
    */
   async resetFilter(page: Page): Promise<void> {
     if (!(await this.elementNotVisible(page, this.filterResetButton, 2000))) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+      await this.clickAndWaitForURL(page, this.filterResetButton);
     }
     await this.waitForVisibleSelector(page, this.gridForm, 2000);
   }
@@ -219,7 +219,7 @@ class ViewAttribute extends BOBasePage {
    */
   async filterTable(page: Page, filterBy: string, value: string): Promise<void> {
     await this.setValue(page, this.filterColumn(filterBy), value);
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await this.clickAndWaitForURL(page, this.filterSearchButton);
   }
 
   /* Column methods */
@@ -266,7 +266,7 @@ class ViewAttribute extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToEditValuePage(page: Page, row: number): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.tableColumnActionsEditLink(row));
+    await this.clickAndWaitForURL(page, this.tableColumnActionsEditLink(row));
   }
 
   /**
@@ -284,7 +284,7 @@ class ViewAttribute extends BOBasePage {
     await page.click(this.tableColumnActionsDeleteLink(row));
 
     // Confirm delete action
-    await this.clickAndWaitForNavigation(page, this.deleteModalButtonYes);
+    await this.clickAndWaitForURL(page, this.deleteModalButtonYes);
 
     // Get successful message
     return this.getAlertSuccessBlockParagraphContent(page);
@@ -297,7 +297,7 @@ class ViewAttribute extends BOBasePage {
    * @constructor
    */
   async backToAttributesList(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.backToListLink);
+    await this.clickAndWaitForURL(page, this.backToListLink);
   }
 
   /**
@@ -344,7 +344,7 @@ class ViewAttribute extends BOBasePage {
       this.waitForVisibleSelector(page, this.bulkDeleteLink),
     ]);
 
-    await this.clickAndWaitForNavigation(page, this.bulkDeleteLink);
+    await this.clickAndWaitForURL(page, this.bulkDeleteLink);
 
     // Return successful message
     return this.getAlertSuccessBlockParagraphContent(page);
@@ -368,7 +368,7 @@ class ViewAttribute extends BOBasePage {
    */
   async selectPaginationLimit(page: Page, number: number): Promise<string> {
     await this.waitForSelectorAndClick(page, this.paginationDropdownButton);
-    await this.clickAndWaitForNavigation(page, this.paginationItems(number));
+    await this.clickAndWaitForURL(page, this.paginationItems(number));
 
     return this.getPaginationLabel(page);
   }
@@ -379,7 +379,7 @@ class ViewAttribute extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationNext(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink);
+    await this.clickAndWaitForURL(page, this.paginationNextLink);
 
     return this.getPaginationLabel(page);
   }
@@ -390,7 +390,7 @@ class ViewAttribute extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationPrevious(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink);
+    await this.clickAndWaitForURL(page, this.paginationPreviousLink);
 
     return this.getPaginationLabel(page);
   }
@@ -428,7 +428,7 @@ class ViewAttribute extends BOBasePage {
     }
 
     const sortColumnButton = `${columnSelector} i.icon-caret-${sortDirection}`;
-    await this.clickAndWaitForNavigation(page, sortColumnButton);
+    await this.clickAndWaitForURL(page, sortColumnButton);
   }
 
   /**
diff --git a/tests/UI/pages/BO/catalog/brands/add.ts b/tests/UI/pages/BO/catalog/brands/add.ts
index 60f5303225553..497b99eea3062 100644
--- a/tests/UI/pages/BO/catalog/brands/add.ts
+++ b/tests/UI/pages/BO/catalog/brands/add.ts
@@ -109,7 +109,7 @@ class AddBrand extends BOBasePage {
     await this.setChecked(page, this.statusToggleInput(brandData.enabled ? 1 : 0));
 
     // Save Created brand
-    await this.clickAndWaitForNavigation(page, this.saveButton);
+    await this.clickAndWaitForURL(page, this.saveButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
diff --git a/tests/UI/pages/BO/catalog/brands/addAddress.ts b/tests/UI/pages/BO/catalog/brands/addAddress.ts
index 4d376b97ab381..5dbbd7ab988f1 100644
--- a/tests/UI/pages/BO/catalog/brands/addAddress.ts
+++ b/tests/UI/pages/BO/catalog/brands/addAddress.ts
@@ -85,7 +85,7 @@ class AddBrandAddress extends BOBasePage {
     await this.setValue(page, this.otherInput, brandAddressData.other);
 
     // Click on Save button and successful message
-    await this.clickAndWaitForNavigation(page, this.saveButton);
+    await this.clickAndWaitForURL(page, this.saveButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 }
diff --git a/tests/UI/pages/BO/catalog/brands/index.ts b/tests/UI/pages/BO/catalog/brands/index.ts
index 8cfa9bfb3b426..bafb53891d273 100644
--- a/tests/UI/pages/BO/catalog/brands/index.ts
+++ b/tests/UI/pages/BO/catalog/brands/index.ts
@@ -184,7 +184,7 @@ class Brands extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToSubTabSuppliers(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.suppliersNavItemLink);
+    await this.clickAndWaitForURL(page, this.suppliersNavItemLink);
   }
 
   /**
@@ -195,7 +195,8 @@ class Brands extends BOBasePage {
    */
   async resetFilter(page: Page, tableName: string): Promise<void> {
     if (await this.elementVisible(page, this.filterResetButton(tableName), 2000)) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton(tableName));
+      await this.clickAndWaitForLoadState(page, this.filterResetButton(tableName));
+      await this.elementNotVisible(page, this.filterResetButton(tableName), 2000);
     }
   }
 
@@ -241,7 +242,7 @@ class Brands extends BOBasePage {
         throw new Error(`Filter ${filterBy} was not found`);
     }
     // click on search
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton(tableName));
+    await this.clickAndWaitForLoadState(page, this.filterSearchButton(tableName));
   }
 
   /**
@@ -305,7 +306,7 @@ class Brands extends BOBasePage {
    */
   async setBrandStatus(page: Page, row: number, valueWanted: boolean = true): Promise<boolean> {
     if (await this.getBrandStatus(page, row) !== valueWanted) {
-      await this.clickAndWaitForNavigation(page, this.brandsTableColumnStatus(row));
+      await this.clickAndWaitForLoadState(page, this.brandsTableColumnStatus(row));
       return true;
     }
 
@@ -318,7 +319,7 @@ class Brands extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToAddNewBrandPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.newBrandLink);
+    await this.clickAndWaitForURL(page, this.newBrandLink);
   }
 
   /**
@@ -327,7 +328,7 @@ class Brands extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToAddNewBrandAddressPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.newBrandAddressLink);
+    await this.clickAndWaitForURL(page, this.newBrandAddressLink);
   }
 
   /**
@@ -337,7 +338,7 @@ class Brands extends BOBasePage {
    * @return {Promise<void>}
    */
   async viewBrand(page: Page, row: number = 1): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.viewBrandLink(row));
+    await this.clickAndWaitForURL(page, this.viewBrandLink(row));
   }
 
   /**
@@ -351,7 +352,7 @@ class Brands extends BOBasePage {
       page.click(this.dropdownToggleButton('manufacturer', row)),
       this.waitForVisibleSelector(page, `${this.dropdownToggleButton('manufacturer', row)}[aria-expanded='true']`),
     ]);
-    await this.clickAndWaitForNavigation(page, this.editBrandLink(row));
+    await this.clickAndWaitForURL(page, this.editBrandLink(row));
   }
 
   /**
@@ -361,7 +362,7 @@ class Brands extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToEditBrandAddressPage(page: Page, row: number = 1): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.editBrandAddressLink(row));
+    await this.clickAndWaitForURL(page, this.editBrandAddressLink(row));
   }
 
   /**
@@ -393,7 +394,7 @@ class Brands extends BOBasePage {
    * @return {Promise<void>}
    */
   async confirmDelete(page: Page, tableName: string): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.confirmDeleteButton(tableName));
+    await this.clickAndWaitForURL(page, this.confirmDeleteButton(tableName));
   }
 
   /**
@@ -436,7 +437,7 @@ class Brands extends BOBasePage {
     ]);
 
     // Click on delete and wait for modal
-    await this.clickAndWaitForNavigation(page, enable ? this.bulkActionsEnableButton : this.bulkActionsDisableButton);
+    await page.click(enable ? this.bulkActionsEnableButton : this.bulkActionsDisableButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -601,7 +602,7 @@ class Brands extends BOBasePage {
 
     let i: number = 0;
     while (await this.elementNotVisible(page, sortColumnDiv, 2000) && i < 2) {
-      await this.clickAndWaitForNavigation(page, sortColumnSpanButton);
+      await this.clickAndWaitForURL(page, sortColumnSpanButton);
       i += 1;
     }
 
@@ -703,7 +704,7 @@ class Brands extends BOBasePage {
    * @return {Promise<string>}
    */
   async paginationNext(page: Page, tableName: string): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink(tableName));
+    await this.clickAndWaitForURL(page, this.paginationNextLink(tableName));
 
     return this.getPaginationLabel(page, tableName);
   }
@@ -715,7 +716,7 @@ class Brands extends BOBasePage {
    * @return {Promise<string>}
    */
   async paginationPrevious(page: Page, tableName: string): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink(tableName));
+    await this.clickAndWaitForURL(page, this.paginationPreviousLink(tableName));
 
     return this.getPaginationLabel(page, tableName);
   }
diff --git a/tests/UI/pages/BO/catalog/categories/add.ts b/tests/UI/pages/BO/catalog/categories/add.ts
index 05fe84ecc29cc..3b06b82ae1822 100644
--- a/tests/UI/pages/BO/catalog/categories/add.ts
+++ b/tests/UI/pages/BO/catalog/categories/add.ts
@@ -111,7 +111,7 @@ class AddCategory extends BOBasePage {
     await this.selectAllGroups(page);
 
     // Save Category
-    await this.clickAndWaitForNavigation(page, this.saveCategoryButton);
+    await this.clickAndWaitForURL(page, this.saveCategoryButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -130,7 +130,7 @@ class AddCategory extends BOBasePage {
     await this.setValue(page, this.rootCategoryMetaDescriptionTextarea, categoryData.metaDescription);
     await this.selectAllGroups(page);
     // Save Category
-    await this.clickAndWaitForNavigation(page, this.saveCategoryButton);
+    await this.clickAndWaitForURL(page, this.saveCategoryButton);
     return this.getPageTitle(page);
   }
 }
diff --git a/tests/UI/pages/BO/catalog/categories/index.ts b/tests/UI/pages/BO/catalog/categories/index.ts
index 0dd166a6b9c28..fe5a427338805 100644
--- a/tests/UI/pages/BO/catalog/categories/index.ts
+++ b/tests/UI/pages/BO/catalog/categories/index.ts
@@ -164,7 +164,7 @@ class Categories extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToAddNewCategoryPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.addNewCategoryLink);
+    await this.clickAndWaitForURL(page, this.addNewCategoryLink);
   }
 
   /**
@@ -173,8 +173,9 @@ class Categories extends BOBasePage {
    * @returns {Promise<void>}
    */
   async resetFilter(page: Page): Promise<void> {
-    if (!(await this.elementNotVisible(page, this.filterResetButton, 2000))) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+    if (await this.elementVisible(page, this.filterResetButton, 2000)) {
+      await page.click(this.filterResetButton);
+      await this.elementNotVisible(page, this.filterResetButton, 2000);
     }
   }
 
@@ -217,7 +218,7 @@ class Categories extends BOBasePage {
         throw new Error(`Filter ${filterBy} was not found`);
     }
     // click on search
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await this.clickAndWaitForURL(page, this.filterSearchButton);
   }
 
   /**
@@ -318,7 +319,7 @@ class Categories extends BOBasePage {
       this.waitForVisibleSelector(page, this.categoriesListTableEditLink(row, 'actions')),
     ]);
     // Click on edit
-    await this.clickAndWaitForNavigation(page, this.categoriesListTableEditLink(row, 'actions'));
+    await this.clickAndWaitForURL(page, this.categoriesListTableEditLink(row, 'actions'));
   }
 
   /**
@@ -331,9 +332,9 @@ class Categories extends BOBasePage {
     if (
       await this.elementVisible(page, this.categoriesListTableViewLink(row, 'actions'), 100)
     ) {
-      await this.clickAndWaitForNavigation(page, this.categoriesListTableViewLink(row, 'actions'));
+      await this.clickAndWaitForURL(page, this.categoriesListTableViewLink(row, 'actions'));
     } else {
-      await this.clickAndWaitForNavigation(page, `${this.categoriesListTableColumn(row, 'name')} a`);
+      await this.clickAndWaitForURL(page, `${this.categoriesListTableColumn(row, 'name')} a`);
     }
   }
 
@@ -371,7 +372,7 @@ class Categories extends BOBasePage {
    */
   async chooseOptionAndDelete(page: Page, modeID: number): Promise<void> {
     await this.setChecked(page, this.deleteCategoryModalModeInput(modeID));
-    await this.clickAndWaitForNavigation(page, this.deleteCategoryModalDeleteButton);
+    await this.clickAndWaitForURL(page, this.deleteCategoryModalDeleteButton);
     await this.waitForVisibleSelector(page, this.alertSuccessBlockParagraph);
   }
 
@@ -395,7 +396,7 @@ class Categories extends BOBasePage {
     ]);
 
     // Click on delete and wait for modal
-    await this.clickAndWaitForNavigation(page, enable ? this.bulkActionsEnableButton : this.bulkActionsDisableButton);
+    await page.click(enable ? this.bulkActionsEnableButton : this.bulkActionsDisableButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -460,7 +461,7 @@ class Categories extends BOBasePage {
     let i: number = 0;
     while (await this.elementNotVisible(page, sortColumnDiv, 2000) && i < 2) {
       await page.hover(this.sortColumnDiv(sortBy));
-      await this.clickAndWaitForNavigation(page, sortColumnSpanButton);
+      await this.clickAndWaitForURL(page, sortColumnSpanButton);
       i += 1;
     }
 
@@ -509,7 +510,7 @@ class Categories extends BOBasePage {
    * @returns {Promise<void>}
    */
   async goToEditHomeCategoryPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.editHomeCategoryButton);
+    await this.clickAndWaitForURL(page, this.editHomeCategoryButton);
   }
 
   /* Pagination methods */
@@ -529,9 +530,11 @@ class Categories extends BOBasePage {
    * @returns {Promise<string>}
    */
   async selectPaginationLimit(page: Page, number: number): Promise<string> {
+    const currentUrl: string = page.url();
+
     await Promise.all([
       this.selectByVisibleText(page, this.paginationLimitSelect, number),
-      page.waitForNavigation({waitUntil: 'networkidle'}),
+      page.waitForURL((url: URL): boolean => url.toString() !== currentUrl, {waitUntil: 'networkidle'}),
     ]);
 
     return this.getPaginationLabel(page);
@@ -543,7 +546,7 @@ class Categories extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationNext(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink);
+    await this.clickAndWaitForURL(page, this.paginationNextLink);
     return this.getPaginationLabel(page);
   }
 
@@ -553,7 +556,7 @@ class Categories extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationPrevious(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink);
+    await this.clickAndWaitForURL(page, this.paginationPreviousLink);
     return this.getPaginationLabel(page);
   }
 }
diff --git a/tests/UI/pages/BO/catalog/discounts/add.ts b/tests/UI/pages/BO/catalog/discounts/add.ts
index fd138825f6805..14e0f5bca0fba 100644
--- a/tests/UI/pages/BO/catalog/discounts/add.ts
+++ b/tests/UI/pages/BO/catalog/discounts/add.ts
@@ -500,7 +500,7 @@ class AddCartRule extends BOBasePage {
 
     if (waitForNavigation) {
       // Save and return successful message
-      await this.clickAndWaitForNavigation(page, this.saveButton);
+      await this.clickAndWaitForURL(page, this.saveButton);
       return this.getAlertSuccessBlockContent(page);
     }
 
@@ -539,7 +539,7 @@ class AddCartRule extends BOBasePage {
    * @return {Promise<void>}
    */
   async clickOnCancelButton(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.cancelButton);
+    await this.clickAndWaitForURL(page, this.cancelButton);
   }
 }
 
diff --git a/tests/UI/pages/BO/catalog/discounts/catalogPriceRules/add.ts b/tests/UI/pages/BO/catalog/discounts/catalogPriceRules/add.ts
index 9019a592e6cec..5aa66d8876781 100644
--- a/tests/UI/pages/BO/catalog/discounts/catalogPriceRules/add.ts
+++ b/tests/UI/pages/BO/catalog/discounts/catalogPriceRules/add.ts
@@ -85,7 +85,7 @@ class AddCatalogPriceRule extends BOBasePage {
     await this.selectByVisibleText(page, this.reductionTypeSelect, priceRuleData.reductionType);
     await this.selectByVisibleText(page, this.reductionTaxSelect, priceRuleData.reductionTax);
     await this.setValue(page, this.reductionInput, priceRuleData.reduction);
-    await this.clickAndWaitForNavigation(page, this.saveButton);
+    await this.clickAndWaitForURL(page, this.saveButton);
 
     return this.getAlertSuccessBlockContent(page);
   }
diff --git a/tests/UI/pages/BO/catalog/discounts/catalogPriceRules/index.ts b/tests/UI/pages/BO/catalog/discounts/catalogPriceRules/index.ts
index 1bef498efb261..d8ef4eff42b82 100644
--- a/tests/UI/pages/BO/catalog/discounts/catalogPriceRules/index.ts
+++ b/tests/UI/pages/BO/catalog/discounts/catalogPriceRules/index.ts
@@ -153,7 +153,7 @@ class CatalogPriceRules extends BOBasePage {
    * @returns {Promise<void>}
    */
   async goToAddNewCatalogPriceRulePage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.addNewCatalogPriceRuleButton);
+    await this.clickAndWaitForURL(page, this.addNewCatalogPriceRuleButton);
   }
 
   /**
@@ -163,7 +163,7 @@ class CatalogPriceRules extends BOBasePage {
    */
   async resetFilter(page: Page): Promise<void> {
     if (!(await this.elementNotVisible(page, this.filterResetButton, 2000))) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+      await this.clickAndWaitForURL(page, this.filterResetButton);
     }
     await this.waitForVisibleSelector(page, this.filterSearchButton, 2000);
   }
@@ -199,7 +199,7 @@ class CatalogPriceRules extends BOBasePage {
     if (await this.elementVisible(page, this.filterColumn('a!name'))) {
       await this.filterPriceRules(page, 'select', 'a!name', ruleName);
     }
-    await this.clickAndWaitForNavigation(page, this.editRowLink(1));
+    await this.clickAndWaitForURL(page, this.editRowLink(1));
   }
 
   /**
@@ -211,15 +211,17 @@ class CatalogPriceRules extends BOBasePage {
    * @returns {Promise<void>}
    */
   async filterPriceRules(page: Page, filterType: string, filterBy: string, value: string): Promise<void> {
+    const currentUrl: string = page.url();
+
     switch (filterType) {
       case 'input':
         await this.setValue(page, this.filterColumn(filterBy), value);
-        await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+        await this.clickAndWaitForURL(page, this.filterSearchButton);
         break;
 
       case 'select':
         await Promise.all([
-          page.waitForNavigation({waitUntil: 'networkidle'}),
+          page.waitForURL((url: URL): boolean => url.toString() !== currentUrl, {waitUntil: 'networkidle'}),
           this.selectByVisibleText(page, this.filterColumn(filterBy), value),
         ]);
         break;
@@ -241,7 +243,8 @@ class CatalogPriceRules extends BOBasePage {
     await page.type(this.filterDateFromColumn(filterBy), dateFrom);
     await page.type(this.filterDateToColumn(filterBy), dateTo);
     // click on search
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await page.click(this.filterSearchButton);
+    await this.elementVisible(page, this.filterResetButton);
   }
 
   /**
@@ -259,7 +262,7 @@ class CatalogPriceRules extends BOBasePage {
       page.click(this.deleteRowLink(1)),
       this.waitForVisibleSelector(page, this.confirmDeleteButton),
     ]);
-    await this.clickAndWaitForNavigation(page, this.confirmDeleteButton);
+    await this.clickAndWaitForURL(page, this.confirmDeleteButton);
 
     return this.getAlertSuccessBlockContent(page);
   }
@@ -350,7 +353,7 @@ class CatalogPriceRules extends BOBasePage {
 
     // Perform delete
     await page.click(this.bulkActionMenuButton);
-    await this.clickAndWaitForNavigation(page, this.bulkDeleteLink);
+    await this.clickAndWaitForURL(page, this.bulkDeleteLink);
 
     // Return successful message
     return this.getAlertSuccessBlockContent(page);
@@ -431,7 +434,7 @@ class CatalogPriceRules extends BOBasePage {
     }
 
     const sortColumnButton = `${columnSelector} i.icon-caret-${sortDirection}`;
-    await this.clickAndWaitForNavigation(page, sortColumnButton);
+    await this.clickAndWaitForURL(page, sortColumnButton);
   }
 
   /* Pagination methods */
@@ -452,7 +455,7 @@ class CatalogPriceRules extends BOBasePage {
    */
   async selectPaginationLimit(page: Page, number: number): Promise<string> {
     await this.waitForSelectorAndClick(page, this.paginationDropdownButton);
-    await this.clickAndWaitForNavigation(page, this.paginationItems(number));
+    await this.clickAndWaitForURL(page, this.paginationItems(number));
 
     return this.getPaginationLabel(page);
   }
@@ -463,7 +466,7 @@ class CatalogPriceRules extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationNext(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink);
+    await this.clickAndWaitForURL(page, this.paginationNextLink);
 
     return this.getPaginationLabel(page);
   }
@@ -474,7 +477,7 @@ class CatalogPriceRules extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationPrevious(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink);
+    await this.clickAndWaitForURL(page, this.paginationPreviousLink);
 
     return this.getPaginationLabel(page);
   }
diff --git a/tests/UI/pages/BO/catalog/discounts/index.ts b/tests/UI/pages/BO/catalog/discounts/index.ts
index c824d54b86316..96183f34e1ab1 100644
--- a/tests/UI/pages/BO/catalog/discounts/index.ts
+++ b/tests/UI/pages/BO/catalog/discounts/index.ts
@@ -185,7 +185,7 @@ class CartRules extends BOBasePage {
    * @returns {Promise<void>}
    */
   async goToCatalogPriceRulesTab(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.catalogPriceRulesTab);
+    await this.clickAndWaitForURL(page, this.catalogPriceRulesTab);
     await this.waitForVisibleSelector(page, `${this.catalogPriceRulesTab}.current`);
   }
 
@@ -195,7 +195,7 @@ class CartRules extends BOBasePage {
    * @returns {Promise<void>}
    */
   async goToAddNewCartRulesPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.addNewCartRuleButton);
+    await this.clickAndWaitForURL(page, this.addNewCartRuleButton);
   }
 
   /* Table methods */
@@ -206,7 +206,7 @@ class CartRules extends BOBasePage {
    * @returns {Promise<void>}
    */
   async goToEditCartRulePage(page: Page, row: number): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.tableColumnActionsEditLink(row));
+    await this.clickAndWaitForURL(page, this.tableColumnActionsEditLink(row));
   }
 
   /**
@@ -226,7 +226,7 @@ class CartRules extends BOBasePage {
     await this.waitForSelectorAndClick(page, this.tableColumnActionsDeleteLink(row));
 
     // Confirm delete action
-    await this.clickAndWaitForNavigation(page, this.deleteModalButtonYes);
+    await this.clickAndWaitForURL(page, this.deleteModalButtonYes);
 
     // Get successful message
     return this.getAlertSuccessBlockContent(page);
@@ -280,7 +280,7 @@ class CartRules extends BOBasePage {
    * @param row {number} Row on table
    * @return {Promise<boolean>}
    */
-  getCartRuleStatus(page: Page, row: number): Promise<boolean> {
+  async getCartRuleStatus(page: Page, row: number): Promise<boolean> {
     return this.elementVisible(page, this.tableColumnStatusEnableLink(row), 1000);
   }
 
@@ -293,7 +293,7 @@ class CartRules extends BOBasePage {
    */
   async setCartRuleStatus(page: Page, row: number, wantedStatus: boolean): Promise<void> {
     if (wantedStatus !== await this.getCartRuleStatus(page, row)) {
-      await this.clickAndWaitForNavigation(page, this.tableColumnStatusLink(row));
+      await page.click(this.tableColumnStatusLink(row));
     }
   }
 
@@ -305,7 +305,8 @@ class CartRules extends BOBasePage {
    */
   async resetFilter(page: Page): Promise<void> {
     if (await this.elementVisible(page, this.filterResetButton, 2000)) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+      await this.clickAndWaitForLoadState(page, this.filterResetButton);
+      await this.elementNotVisible(page, this.filterResetButton, 2000);
     }
 
     // No search button displayed if only one element in table
@@ -341,15 +342,17 @@ class CartRules extends BOBasePage {
    */
   async filterCartRules(page: Page, filterType: string, filterBy: string, value: string): Promise<void> {
     await this.resetFilter(page);
+    const currentUrl: string = page.url();
+
     switch (filterType) {
       case 'input':
         await this.setValue(page, this.filterColumn(filterBy), value);
-        await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+        await this.clickAndWaitForURL(page, this.filterSearchButton);
         break;
 
       case 'select':
         await Promise.all([
-          page.waitForNavigation({waitUntil: 'networkidle'}),
+          page.waitForURL((url: URL): boolean => url.toString() !== currentUrl, {waitUntil: 'networkidle'}),
           this.selectByVisibleText(page, this.filterColumn(filterBy), value === '1' ? 'Yes' : 'No'),
         ]);
         break;
@@ -389,7 +392,7 @@ class CartRules extends BOBasePage {
 
     // Perform delete
     await page.click(this.bulkActionMenuButton);
-    await this.clickAndWaitForNavigation(page, this.bulkDeleteLink);
+    await this.clickAndWaitForURL(page, this.bulkDeleteLink);
 
     // Return successful message
     return this.getAlertSuccessBlockContent(page);
@@ -411,7 +414,7 @@ class CartRules extends BOBasePage {
       this.waitForVisibleSelector(page, this.bulkEnableLink),
     ]);
 
-    await this.clickAndWaitForNavigation(
+    await this.clickAndWaitForURL(
       page,
       wantedStatus ? this.bulkEnableLink : this.bulkDisableLink,
     );
@@ -446,7 +449,7 @@ class CartRules extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationNext(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink);
+    await this.clickAndWaitForURL(page, this.paginationNextLink);
 
     return this.getPaginationLabel(page);
   }
@@ -457,7 +460,7 @@ class CartRules extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationPrevious(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink);
+    await this.clickAndWaitForURL(page, this.paginationPreviousLink);
 
     return this.getPaginationLabel(page);
   }
@@ -521,7 +524,7 @@ class CartRules extends BOBasePage {
     }
 
     const sortColumnButton = `${columnSelector} i.icon-caret-${sortDirection}`;
-    await this.clickAndWaitForNavigation(page, sortColumnButton);
+    await this.clickAndWaitForURL(page, sortColumnButton);
   }
 }
 
diff --git a/tests/UI/pages/BO/catalog/features/addFeature.ts b/tests/UI/pages/BO/catalog/features/addFeature.ts
index ff4a52d7736fd..727be7ac71daf 100644
--- a/tests/UI/pages/BO/catalog/features/addFeature.ts
+++ b/tests/UI/pages/BO/catalog/features/addFeature.ts
@@ -59,7 +59,7 @@ class AddFeature extends BOBasePage {
     await this.setChecked(page, this.indexableToggle(featureData.indexable ? 'on' : 'off'));
 
     // Save feature
-    await this.clickAndWaitForNavigation(page, this.saveButton);
+    await this.clickAndWaitForURL(page, this.saveButton);
 
     // Return successful message
     return this.getAlertSuccessBlockParagraphContent(page);
diff --git a/tests/UI/pages/BO/catalog/features/addValue.ts b/tests/UI/pages/BO/catalog/features/addValue.ts
index 49aa947526271..3f6f542390598 100644
--- a/tests/UI/pages/BO/catalog/features/addValue.ts
+++ b/tests/UI/pages/BO/catalog/features/addValue.ts
@@ -66,11 +66,11 @@ class AddValue extends BOBasePage {
 
     // Save value
     if (saveAndStay) {
-      await this.clickAndWaitForNavigation(page, this.saveAndStayButton);
+      await page.click(this.saveAndStayButton);
       // Return successful message
       return this.getAlertSuccessBlockContent(page);
     }
-    await this.clickAndWaitForNavigation(page, this.saveButton);
+    await this.clickAndWaitForURL(page, this.saveButton);
     // Return successful message
     return this.getAlertSuccessBlockParagraphContent(page);
   }
diff --git a/tests/UI/pages/BO/catalog/features/editFeature.ts b/tests/UI/pages/BO/catalog/features/editFeature.ts
index fb16bac579bde..798ad91aecaa5 100644
--- a/tests/UI/pages/BO/catalog/features/editFeature.ts
+++ b/tests/UI/pages/BO/catalog/features/editFeature.ts
@@ -59,7 +59,7 @@ class EditFeature extends BOBasePage {
     await this.setChecked(page, this.indexableToggle(featureData.indexable ? '1' : '0'));
 
     // Save feature
-    await this.clickAndWaitForNavigation(page, this.saveButton);
+    await this.clickAndWaitForURL(page, this.saveButton);
 
     // Return successful message
     return this.getAlertSuccessBlockParagraphContent(page);
diff --git a/tests/UI/pages/BO/catalog/features/index.ts b/tests/UI/pages/BO/catalog/features/index.ts
index edce5e3583259..87beb7d25884d 100644
--- a/tests/UI/pages/BO/catalog/features/index.ts
+++ b/tests/UI/pages/BO/catalog/features/index.ts
@@ -171,7 +171,7 @@ class Features extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToAddFeaturePage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.addNewFeatureLink);
+    await this.clickAndWaitForURL(page, this.addNewFeatureLink);
   }
 
   /* Filter methods */
@@ -182,7 +182,7 @@ class Features extends BOBasePage {
    */
   async resetFilter(page: Page): Promise<void> {
     if (!(await this.elementNotVisible(page, this.filterResetButton, 2000))) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+      await this.clickAndWaitForURL(page, this.filterResetButton);
     }
     await this.waitForVisibleSelector(page, this.filterSearchButton, 2000);
   }
@@ -215,7 +215,7 @@ class Features extends BOBasePage {
    */
   async filterTable(page: Page, filterBy: string, value: string): Promise<void> {
     await this.setValue(page, this.filterColumn(filterBy), value);
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await this.clickAndWaitForURL(page, this.filterSearchButton);
   }
 
   /* Column methods */
@@ -260,7 +260,7 @@ class Features extends BOBasePage {
    * @return {Promise<void>}
    */
   async viewFeature(page: Page, row: number): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.tableColumnActionsViewLink(row));
+    await this.clickAndWaitForURL(page, this.tableColumnActionsViewLink(row));
   }
 
   /**
@@ -271,7 +271,7 @@ class Features extends BOBasePage {
    */
   async clickOnEditFeature(page: Page, row: number): Promise<void> {
     await this.waitForSelectorAndClick(page, this.tableColumnActionsDropDownButton(row));
-    await this.clickAndWaitForNavigation(page, this.tableColumnActionsEditLink(row));
+    await this.clickAndWaitForURL(page, this.tableColumnActionsEditLink(row));
   }
 
   /**
@@ -282,9 +282,9 @@ class Features extends BOBasePage {
    */
   async deleteFeature(page: Page, row: number): Promise<string> {
     await this.waitForSelectorAndClick(page, this.tableColumnActionsDropDownButton(row));
-    await this.clickAndWaitForNavigation(page, this.tableColumnActionsDeleteLink(row));
+    await this.clickAndWaitForURL(page, this.tableColumnActionsDeleteLink(row));
 
-    await this.clickAndWaitForNavigation(page, this.deleteModalButtonYes);
+    await this.clickAndWaitForURL(page, this.deleteModalButtonYes);
 
     return this.getAlertSuccessBlockContent(page);
   }
@@ -342,7 +342,7 @@ class Features extends BOBasePage {
    */
   async selectPaginationLimit(page: Page, number: number): Promise<string> {
     await this.waitForSelectorAndClick(page, this.paginationDropdownButton);
-    await this.clickAndWaitForNavigation(page, this.paginationItems(number));
+    await this.clickAndWaitForURL(page, this.paginationItems(number));
 
     return this.getPaginationLabel(page);
   }
@@ -353,7 +353,7 @@ class Features extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationNext(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink);
+    await this.clickAndWaitForURL(page, this.paginationNextLink);
 
     return this.getPaginationLabel(page);
   }
@@ -364,7 +364,7 @@ class Features extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationPrevious(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink);
+    await this.clickAndWaitForURL(page, this.paginationPreviousLink);
 
     return this.getPaginationLabel(page);
   }
@@ -398,7 +398,7 @@ class Features extends BOBasePage {
     }
 
     const sortColumnButton = `${columnSelector} i.icon-caret-${sortDirection}`;
-    await this.clickAndWaitForNavigation(page, sortColumnButton);
+    await this.clickAndWaitForURL(page, sortColumnButton);
   }
 
   /**
@@ -445,7 +445,7 @@ class Features extends BOBasePage {
       this.waitForVisibleSelector(page, this.bulkDeleteLink),
     ]);
 
-    await this.clickAndWaitForNavigation(page, this.bulkDeleteLink);
+    await this.clickAndWaitForURL(page, this.bulkDeleteLink);
 
     // Return successful message
     return this.getAlertSuccessBlockContent(page);
diff --git a/tests/UI/pages/BO/catalog/features/view.ts b/tests/UI/pages/BO/catalog/features/view.ts
index 2082027129f8e..2fe8ad6f270ee 100644
--- a/tests/UI/pages/BO/catalog/features/view.ts
+++ b/tests/UI/pages/BO/catalog/features/view.ts
@@ -157,7 +157,7 @@ class ViewFeature extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToAddNewValuePage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.addNewValueLink);
+    await this.clickAndWaitForURL(page, this.addNewValueLink);
   }
 
   /**
@@ -167,7 +167,7 @@ class ViewFeature extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToEditValuePage(page: Page, row: number): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.tableColumnActionsEditLink(row));
+    await this.clickAndWaitForURL(page, this.tableColumnActionsEditLink(row));
   }
 
   /**
@@ -176,7 +176,7 @@ class ViewFeature extends BOBasePage {
    * @return {Promise<void>}
    */
   async clickOnBackToTheListButton(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.backToListButton);
+    await this.clickAndWaitForURL(page, this.backToListButton);
   }
 
   /**
@@ -188,7 +188,7 @@ class ViewFeature extends BOBasePage {
   async deleteValue(page: Page, row: number): Promise<string> {
     await this.waitForSelectorAndClick(page, this.tableColumnActionsToggleButton(row));
     await this.waitForSelectorAndClick(page, this.tableColumnActionsDeleteLink(row));
-    await this.clickAndWaitForNavigation(page, this.deleteModalButtonYes);
+    await this.clickAndWaitForURL(page, this.deleteModalButtonYes);
 
     return this.getAlertSuccessBlockContent(page);
   }
@@ -201,7 +201,7 @@ class ViewFeature extends BOBasePage {
    */
   async resetFilter(page: Page): Promise<void> {
     if (!(await this.elementNotVisible(page, this.filterResetButton, 2000))) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+      await this.clickAndWaitForURL(page, this.filterResetButton);
     }
     await this.waitForVisibleSelector(page, this.filterSearchButton, 2000);
   }
@@ -234,7 +234,7 @@ class ViewFeature extends BOBasePage {
    */
   async filterTable(page: Page, filterBy: string, value: string): Promise<void> {
     await this.setValue(page, this.filterColumn(filterBy), value);
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await this.clickAndWaitForURL(page, this.filterSearchButton);
   }
 
   /* Column methods */
@@ -291,7 +291,7 @@ class ViewFeature extends BOBasePage {
       this.waitForVisibleSelector(page, this.bulkDeleteLink),
     ]);
 
-    await this.clickAndWaitForNavigation(page, this.bulkDeleteLink);
+    await this.clickAndWaitForURL(page, this.bulkDeleteLink);
 
     // Return successful message
     return this.getAlertSuccessBlockContent(page);
@@ -315,7 +315,7 @@ class ViewFeature extends BOBasePage {
    */
   async selectPaginationLimit(page: Page, number: number): Promise<string> {
     await this.waitForSelectorAndClick(page, this.paginationDropdownButton);
-    await this.clickAndWaitForNavigation(page, this.paginationItems(number));
+    await this.clickAndWaitForURL(page, this.paginationItems(number));
 
     return this.getPaginationLabel(page);
   }
@@ -326,7 +326,7 @@ class ViewFeature extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationNext(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink);
+    await this.clickAndWaitForURL(page, this.paginationNextLink);
 
     return this.getPaginationLabel(page);
   }
@@ -337,7 +337,7 @@ class ViewFeature extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationPrevious(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink);
+    await this.clickAndWaitForURL(page, this.paginationPreviousLink);
 
     return this.getPaginationLabel(page);
   }
@@ -367,7 +367,7 @@ class ViewFeature extends BOBasePage {
     }
 
     const sortColumnButton = `${columnSelector} i.icon-caret-${sortDirection}`;
-    await this.clickAndWaitForNavigation(page, sortColumnButton);
+    await this.clickAndWaitForURL(page, sortColumnButton);
   }
 
   /**
diff --git a/tests/UI/pages/BO/catalog/files/add.ts b/tests/UI/pages/BO/catalog/files/add.ts
index b3fa3407bee70..6ce6209c53e57 100644
--- a/tests/UI/pages/BO/catalog/files/add.ts
+++ b/tests/UI/pages/BO/catalog/files/add.ts
@@ -72,7 +72,7 @@ class AddFile extends BOBasePage {
     }
 
     // Save Supplier
-    await this.clickAndWaitForNavigation(page, this.saveButton);
+    await this.clickAndWaitForURL(page, this.saveButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
diff --git a/tests/UI/pages/BO/catalog/files/index.ts b/tests/UI/pages/BO/catalog/files/index.ts
index 04634b114e45e..26fffc4b3561c 100644
--- a/tests/UI/pages/BO/catalog/files/index.ts
+++ b/tests/UI/pages/BO/catalog/files/index.ts
@@ -130,7 +130,7 @@ class Files extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToAddNewFilePage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.newAttachmentLink);
+    await this.clickAndWaitForURL(page, this.newAttachmentLink);
   }
 
   /* Column Methods */
@@ -141,7 +141,7 @@ class Files extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToEditFilePage(page: Page, row: number = 1): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.editRowLink(row));
+    await this.clickAndWaitForURL(page, this.editRowLink(row));
   }
 
   /**
@@ -201,7 +201,8 @@ class Files extends BOBasePage {
    */
   async resetFilter(page: Page): Promise<void> {
     if (await this.elementVisible(page, this.filterResetButton, 2000)) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+      await this.clickAndWaitForLoadState(page, this.filterResetButton);
+      await this.elementNotVisible(page, this.filterResetButton, 2000);
     }
   }
 
@@ -236,7 +237,7 @@ class Files extends BOBasePage {
   async filterTable(page: Page, filterBy: string, value: string = ''): Promise<void> {
     await this.setValue(page, this.filterColumn(filterBy), value);
     // click on search
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await this.clickAndWaitForURL(page, this.filterSearchButton);
   }
 
   /**
@@ -273,7 +274,7 @@ class Files extends BOBasePage {
    * @return {Promise<void>}
    */
   async confirmDeleteFiles(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.confirmDeleteButton);
+    await this.clickAndWaitForLoadState(page, this.confirmDeleteButton);
   }
 
   // Sort methods
@@ -308,7 +309,7 @@ class Files extends BOBasePage {
 
     let i: number = 0;
     while (await this.elementNotVisible(page, sortColumnDiv, 2000) && i < 2) {
-      await this.clickAndWaitForNavigation(page, sortColumnSpanButton);
+      await this.clickAndWaitForURL(page, sortColumnSpanButton);
       i += 1;
     }
 
@@ -342,7 +343,7 @@ class Files extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationNext(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink);
+    await this.clickAndWaitForURL(page, this.paginationNextLink);
     return this.getPaginationLabel(page);
   }
 
@@ -352,7 +353,7 @@ class Files extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationPrevious(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink);
+    await this.clickAndWaitForURL(page, this.paginationPreviousLink);
     return this.getPaginationLabel(page);
   }
 }
diff --git a/tests/UI/pages/BO/catalog/monitoring/index.ts b/tests/UI/pages/BO/catalog/monitoring/index.ts
index 92a0e06697fdb..2aae8a66494d0 100644
--- a/tests/UI/pages/BO/catalog/monitoring/index.ts
+++ b/tests/UI/pages/BO/catalog/monitoring/index.ts
@@ -168,8 +168,9 @@ class Monitoring extends BOBasePage {
    * @return {Promise<void>}
    */
   async resetFilter(page: Page, tableName: string): Promise<void> {
-    if (!(await this.elementNotVisible(page, this.filterResetButton(tableName), 2000))) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton(tableName));
+    if (await this.elementVisible(page, this.filterResetButton(tableName), 2000)) {
+      await page.click(this.filterResetButton(tableName));
+      await this.elementNotVisible(page, this.filterResetButton(tableName), 2000);
     }
   }
 
@@ -206,7 +207,7 @@ class Monitoring extends BOBasePage {
         throw new Error(`Filter column not found : ${filterBy}`);
     }
     // click on search
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton(tableName));
+    await this.clickAndWaitForURL(page, this.filterSearchButton(tableName));
   }
 
   /* table methods */
@@ -252,7 +253,7 @@ class Monitoring extends BOBasePage {
       this.waitForVisibleSelector(page, `${this.deleteProductModal(tableName)}.show`),
     ]);
 
-    await this.clickAndWaitForNavigation(page, this.submitDeleteProductButton(tableName));
+    await this.clickAndWaitForURL(page, this.submitDeleteProductButton(tableName));
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -281,7 +282,7 @@ class Monitoring extends BOBasePage {
       this.waitForVisibleSelector(page, `${this.deleteProductModal(tableName)}.show`),
     ]);
 
-    await this.clickAndWaitForNavigation(page, this.submitDeleteProductButton(tableName));
+    await page.click(this.submitDeleteProductButton(tableName));
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
@@ -306,7 +307,7 @@ class Monitoring extends BOBasePage {
 
     // choose deletion mode
     await page.click(this.deleteModeInput(deletionModePosition));
-    await this.clickAndWaitForNavigation(page, this.submitDeleteCategoryButton);
+    await this.clickAndWaitForURL(page, this.submitDeleteCategoryButton);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
@@ -360,7 +361,7 @@ class Monitoring extends BOBasePage {
 
     let i: number = 0;
     while (await this.elementNotVisible(page, sortColumnDiv, 2000) && i < 2) {
-      await this.clickAndWaitForNavigation(page, sortColumnSpanButton);
+      await this.clickAndWaitForURL(page, sortColumnSpanButton);
       i += 1;
     }
 
@@ -386,9 +387,11 @@ class Monitoring extends BOBasePage {
    * @returns {Promise<string>}
    */
   async selectPaginationLimit(page: Page, tableName: string, number: number): Promise<string> {
+    const currentUrl: string = page.url();
+
     await Promise.all([
       this.selectByVisibleText(page, this.paginationLimitSelect(tableName), number),
-      page.waitForNavigation({waitUntil: 'networkidle'}),
+      page.waitForURL((url: URL): boolean => url.toString() !== currentUrl, {waitUntil: 'networkidle'}),
     ]);
 
     return this.getPaginationLabel(page, tableName);
@@ -401,7 +404,7 @@ class Monitoring extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationNext(page: Page, tableName: string): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink(tableName));
+    await this.clickAndWaitForURL(page, this.paginationNextLink(tableName));
 
     return this.getPaginationLabel(page, tableName);
   }
@@ -413,7 +416,7 @@ class Monitoring extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationPrevious(page: Page, tableName: string): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink(tableName));
+    await this.clickAndWaitForURL(page, this.paginationPreviousLink(tableName));
     return this.getPaginationLabel(page, tableName);
   }
 }
diff --git a/tests/UI/pages/BO/catalog/products/add.ts b/tests/UI/pages/BO/catalog/products/add.ts
index c5fc842a60563..53140b45b72c7 100644
--- a/tests/UI/pages/BO/catalog/products/add.ts
+++ b/tests/UI/pages/BO/catalog/products/add.ts
@@ -455,7 +455,7 @@ class AddProduct extends BOBasePage {
     const textBody = await this.getTextContent(newPage, 'body');
 
     if (textBody.includes('[Debug] This page has moved')) {
-      await this.clickAndWaitForNavigation(newPage, 'a');
+      await this.clickAndWaitForURL(newPage, 'a');
     }
     return newPage;
   }
@@ -470,7 +470,7 @@ class AddProduct extends BOBasePage {
       this.waitForVisibleSelector(page, this.modalDialog),
       page.click(this.productDeleteLink),
     ]);
-    await this.clickAndWaitForNavigation(page, this.modalDialogYesButton);
+    await this.clickAndWaitForURL(page, this.modalDialogYesButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -680,7 +680,7 @@ class AddProduct extends BOBasePage {
    * @returns {Promise<void>}
    */
   async goToCatalogPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.goToCatalogButton);
+    await this.clickAndWaitForURL(page, this.goToCatalogButton);
   }
 
   /**
@@ -689,7 +689,7 @@ class AddProduct extends BOBasePage {
    * @returns {Promise<void>}
    */
   async goToAddProductPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.addNewProductButton);
+    await this.clickAndWaitForURL(page, this.addNewProductButton);
   }
 
   /**
diff --git a/tests/UI/pages/BO/catalog/products/index.ts b/tests/UI/pages/BO/catalog/products/index.ts
index 70c3a732a6aee..c3f148d8f9f26 100644
--- a/tests/UI/pages/BO/catalog/products/index.ts
+++ b/tests/UI/pages/BO/catalog/products/index.ts
@@ -115,6 +115,8 @@ class Products extends BOBasePage {
 
   private readonly filterByCategoriesCategoryLabel: string;
 
+  private readonly filterByCategoriesResetButton: string;
+
   private readonly addProductButton: string;
 
   private readonly catalogDeletionModalDialog: string;
@@ -203,6 +205,7 @@ class Products extends BOBasePage {
     this.filterByCategoriesExpandButton = `${this.treeCategoriesBloc} a#product_catalog_category_tree_filter_expand`;
     this.filterByCategoriesUnselectButton = `${this.treeCategoriesBloc} a#product_catalog_category_tree_filter_reset`;
     this.filterByCategoriesCategoryLabel = `${this.treeCategoriesBloc} label.category-label`;
+    this.filterByCategoriesResetButton = `${this.treeCategoriesBloc} button[type="reset"][name="categories_filter_reset"]`;
 
     // HEADER buttons
     this.addProductButton = '#page-header-desc-configuration-add';
@@ -236,7 +239,8 @@ class Products extends BOBasePage {
   async filterIDProducts(page: Page, idMin: number, idMax: number): Promise<void> {
     await page.type(this.productFilterIDMinInput, idMin.toString());
     await page.type(this.productFilterIDMaxInput, idMax.toString());
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await page.click(this.filterSearchButton);
+    await this.elementVisible(page, this.filterResetButton, 2000);
   }
 
   /**
@@ -289,7 +293,8 @@ class Products extends BOBasePage {
   async filterPriceProducts(page: Page, priceMin: number, priceMax: number): Promise<void> {
     await page.type(this.productFilterPriceMinInput, priceMin.toString());
     await page.type(this.productFilterPriceMaxInput, priceMax.toString());
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await page.click(this.filterSearchButton);
+    await this.elementVisible(page, this.filterResetButton, 2000);
   }
 
   /**
@@ -318,7 +323,8 @@ class Products extends BOBasePage {
   async filterQuantityProducts(page: Page, quantityMin: number, quantityMax: number): Promise<void> {
     await page.type(this.productFilterQuantityMinInput, quantityMin.toString());
     await page.type(this.productFilterQuantityMaxInput, quantityMax.toString());
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await page.click(this.filterSearchButton);
+    await this.elementVisible(page, this.filterResetButton, 2000);
   }
 
   /**
@@ -386,7 +392,7 @@ class Products extends BOBasePage {
       // Do nothing
     }
     // click on search
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await this.clickAndWaitForLoadState(page, this.filterSearchButton);
   }
 
   /**
@@ -480,7 +486,7 @@ class Products extends BOBasePage {
    */
   async resetFilter(page: Page): Promise<void> {
     if (!(await this.elementNotVisible(page, this.filterResetButton, 2000))) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+      await this.clickAndWaitForLoadState(page, this.filterResetButton);
     }
     await this.waitForVisibleSelector(page, this.filterSearchButton, 2000);
   }
@@ -531,7 +537,7 @@ class Products extends BOBasePage {
     if (!found) {
       throw new Error(`${categoryName} not found as a category`);
     }
-    await page.waitForNavigation();
+    await this.elementVisible(page, this.filterByCategoriesResetButton, 2000);
   }
 
   /**
@@ -545,7 +551,7 @@ class Products extends BOBasePage {
     await this.waitForVisibleSelector(page, `${this.filterByCategoriesButton}[aria-expanded='true']`);
 
     // Unselect all categories
-    await this.clickAndWaitForNavigation(page, this.filterByCategoriesUnselectButton);
+    await this.clickAndWaitForURL(page, this.filterByCategoriesUnselectButton);
     await this.waitForVisibleSelector(page, `${this.filterByCategoriesButton}[aria-expanded='false']`);
   }
 
@@ -555,7 +561,7 @@ class Products extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToAddProductPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.addProductButton);
+    await this.clickAndWaitForURL(page, this.addProductButton);
   }
 
   /**
@@ -565,7 +571,7 @@ class Products extends BOBasePage {
    * @returns {Promise<void>}
    */
   async goToEditProductPage(page: Page, row: number): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.productRowEditLink(row));
+    await this.clickAndWaitForURL(page, this.productRowEditLink(row));
   }
 
   /**
@@ -606,7 +612,7 @@ class Products extends BOBasePage {
     await this.openProductDropdown(page, row);
 
     // Duplicate product and go to add product page
-    await this.clickAndWaitForNavigation(page, this.dropdownMenuDuplicateLink(row));
+    await this.clickAndWaitForURL(page, this.dropdownMenuDuplicateLink(row));
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
@@ -632,7 +638,7 @@ class Products extends BOBasePage {
       page.click(this.dropdownMenuDeleteLink(1)),
     ]);
 
-    await this.clickAndWaitForNavigation(page, this.modalDialogDeleteNowButton);
+    await this.clickAndWaitForURL(page, this.modalDialogDeleteNowButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -642,10 +648,8 @@ class Products extends BOBasePage {
    * @returns {Promise<void>}
    */
   async selectAllProducts(page: Page): Promise<void> {
-    await Promise.all([
-      this.waitForVisibleSelector(page, this.productBulkMenuButton),
-      page.$eval(this.selectAllBulkCheckboxLabel, (el: HTMLElement) => el.click()),
-    ]);
+    await this.waitForSelector(page, this.selectAllBulkCheckboxLabel, 'attached');
+    await page.$eval(this.selectAllBulkCheckboxLabel, (el: HTMLElement) => el.click());
   }
 
   /**
@@ -666,7 +670,7 @@ class Products extends BOBasePage {
       page.click(this.productBulkDeleteLink),
     ]);
 
-    await this.clickAndWaitForNavigation(page, this.modalDialogDeleteNowButton);
+    await this.clickAndWaitForURL(page, this.modalDialogDeleteNowButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -683,7 +687,7 @@ class Products extends BOBasePage {
       page.click(this.productBulkMenuButton),
     ]);
 
-    await this.clickAndWaitForNavigation(page, this.productBulkDuplicateLink);
+    await this.clickAndWaitForURL(page, this.productBulkDuplicateLink);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -694,10 +698,7 @@ class Products extends BOBasePage {
    * @return {Promise<string>}
    */
   async bulkSetStatus(page: Page, status: boolean): Promise<string> {
-    if (await this.elementVisible(page, this.alertSuccessBlockParagraph, 1000)) {
-      await this.waitForSelectorAndClick(page, this.alertBlockCloseButton);
-    }
-
+    await this.closeAlertBlock(page);
     await this.selectAllProducts(page);
 
     await Promise.all([
@@ -705,7 +706,7 @@ class Products extends BOBasePage {
       page.click(this.productBulkMenuButton),
     ]);
 
-    await this.clickAndWaitForNavigation(page, status ? this.productBulkEnableLink : this.productBulkDisableLink);
+    await this.clickAndWaitForURL(page, status ? this.productBulkEnableLink : this.productBulkDisableLink);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
@@ -721,7 +722,7 @@ class Products extends BOBasePage {
     const actualValue = await this.getProductStatusFromList(page, row);
 
     if (actualValue !== valueWanted) {
-      await this.clickAndWaitForNavigation(page, this.productsListTableColumnStatus(row));
+      await page.click(this.productsListTableColumnStatus(row));
       return true;
     }
 
@@ -736,7 +737,7 @@ class Products extends BOBasePage {
    */
   async goToProductPage(page: Page, row: number = 1): Promise<void> {
     await this.waitForVisibleSelector(page, this.productsListTableColumnName(row));
-    await this.clickAndWaitForNavigation(page, this.productsListTableColumnName(row));
+    await this.clickAndWaitForURL(page, this.productsListTableColumnName(row));
   }
 
   /* Sort methods */
@@ -754,7 +755,7 @@ class Products extends BOBasePage {
     let i: number = 0;
     while (await this.elementNotVisible(page, sortColumnDiv, 2000) && i < 2) {
       await page.hover(this.sortColumnDiv(sortBy));
-      await this.clickAndWaitForNavigation(page, sortColumnSpanButton);
+      await this.clickAndWaitForURL(page, sortColumnSpanButton);
       i += 1;
     }
 
@@ -789,7 +790,7 @@ class Products extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationNext(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink);
+    await this.clickAndWaitForURL(page, this.paginationNextLink);
 
     return this.getPaginationLabel(page);
   }
@@ -800,7 +801,7 @@ class Products extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationPrevious(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink);
+    await this.clickAndWaitForURL(page, this.paginationPreviousLink);
 
     return this.getPaginationLabel(page);
   }
diff --git a/tests/UI/pages/BO/catalog/productsV2/add/index.ts b/tests/UI/pages/BO/catalog/productsV2/add/index.ts
index a5368af74b63c..ccc7a344eea04 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/index.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/index.ts
@@ -174,7 +174,7 @@ class CreateProduct extends BOBasePage {
    * @returns {Promise<string>}
    */
   async saveProduct(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.saveProductButton);
+    await this.clickAndWaitForLoadState(page, this.saveProductButton);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
@@ -199,7 +199,7 @@ class CreateProduct extends BOBasePage {
     const textBody = await this.getTextContent(newPage, 'body');
 
     if (textBody.includes('[Debug] This page has moved')) {
-      await this.clickAndWaitForNavigation(newPage, 'a');
+      await this.clickAndWaitForURL(newPage, 'a');
     }
     return newPage;
   }
@@ -213,7 +213,7 @@ class CreateProduct extends BOBasePage {
     await this.waitForSelectorAndClick(page, this.footerProductDropDown);
     await this.waitForSelectorAndClick(page, this.deleteProductButton);
     await this.waitForVisibleSelector(page, this.deleteProductFooterModal);
-    await this.clickAndWaitForNavigation(page, this.deleteProductSubmitButton);
+    await this.clickAndWaitForURL(page, this.deleteProductSubmitButton);
 
     return productsPage.getAlertSuccessBlockParagraphContent(page);
   }
@@ -224,7 +224,7 @@ class CreateProduct extends BOBasePage {
    * @returns {Promise<void>}
    */
   async goToCatalogPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.goToCatalogButton);
+    await this.clickAndWaitForURL(page, this.goToCatalogButton);
   }
 
   /**
@@ -260,9 +260,11 @@ class CreateProduct extends BOBasePage {
    * @returns {Promise<void>}
    */
   async chooseProductType(page: Page, productType: string): Promise<void> {
+    const currentUrl: string = page.url();
+
     await productsPage.selectProductType(page, productType);
     await productsPage.clickOnAddNewProduct(page);
-    await page.waitForNavigation({waitUntil: 'networkidle'});
+    await page.waitForURL((url: URL): boolean => url.toString() !== currentUrl, {waitUntil: 'networkidle'});
   }
 
   /**
diff --git a/tests/UI/pages/BO/catalog/productsV2/add/packTab.ts b/tests/UI/pages/BO/catalog/productsV2/add/packTab.ts
index c60daad591433..85f12c54156ce 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/packTab.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/packTab.ts
@@ -201,7 +201,7 @@ class PackTab extends BOBasePage {
    * @param productInList {number} The row of product in pack
    */
   async saveAndGetProductInPackErrorMessage(page: Page, productInList: number): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.saveProductButton);
+    await page.click(this.saveProductButton);
 
     return this.getTextContent(page, this.alertDangerProductInPack(productInList));
   }
diff --git a/tests/UI/pages/BO/catalog/productsV2/index.ts b/tests/UI/pages/BO/catalog/productsV2/index.ts
index 81874bfe1cf7f..7f3e5b96bf867 100644
--- a/tests/UI/pages/BO/catalog/productsV2/index.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/index.ts
@@ -447,7 +447,7 @@ class Products extends BOBasePage {
     const modalBulkActionsProductsProgress = this.modalBulkActionsProductsProgress(
       (action === 'enable' || action === 'disable') ? `${action}_selection` : `bulk_${action}`,
     );
-    await this.clickAndWaitForNavigation(page, modalBulkActionsProductsCloseButton);
+    await this.clickAndWaitForLoadState(page, modalBulkActionsProductsCloseButton);
 
     return this.elementNotVisible(page, modalBulkActionsProductsProgress, 1000);
   }
@@ -488,9 +488,7 @@ class Products extends BOBasePage {
     if (!found) {
       throw new Error(`${categoryName} not found as a category`);
     }
-    await page.waitForNavigation({
-      waitUntil: 'networkidle',
-    });
+    await this.waitForHiddenSelector(page, `${this.filterByCategoriesButton}[aria-expanded='true']`);
   }
 
   /**
@@ -498,7 +496,7 @@ class Products extends BOBasePage {
    * @param page {Page} Browser tab
    * @returns {Promise<string>}
    */
-  getFilterByCategoryButtonName(page: Page): Promise<string> {
+  async getFilterByCategoryButtonName(page: Page): Promise<string> {
     return this.getTextContent(page, this.filterByCategoriesButton);
   }
 
@@ -513,7 +511,7 @@ class Products extends BOBasePage {
     await this.waitForVisibleSelector(page, `${this.filterByCategoriesButton}[aria-expanded='true']`);
 
     // Unselect all categories
-    await this.clickAndWaitForNavigation(page, this.filterByCategoriesUnselectButton);
+    await this.clickAndWaitForURL(page, this.filterByCategoriesUnselectButton);
     await this.waitForVisibleSelector(page, `${this.filterByCategoriesButton}[aria-expanded='false']`);
   }
 
@@ -522,7 +520,7 @@ class Products extends BOBasePage {
    * @param page {Page} Browser tab
    * @returns {Promise<boolean>}
    */
-  isClearFilterLinkVisible(page: Page): Promise<boolean> {
+  async isClearFilterLinkVisible(page: Page): Promise<boolean> {
     return this.elementVisible(page, this.clearFilterButton, 2000);
   }
 
@@ -532,7 +530,7 @@ class Products extends BOBasePage {
    * @returns {Promise<void>}
    */
   async clickOnClearFilterLink(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.clearFilterButton);
+    await page.click(this.clearFilterButton);
   }
 
   /**
@@ -630,7 +628,7 @@ class Products extends BOBasePage {
       // Do nothing
     }
     // click on search
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await this.clickAndWaitForLoadState(page, this.filterSearchButton, 'networkidle', 10000);
   }
 
   /**
@@ -640,7 +638,7 @@ class Products extends BOBasePage {
    */
   async resetFilter(page: Page): Promise<void> {
     if (!(await this.elementNotVisible(page, this.filterResetButton, 2000))) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+      await this.clickAndWaitForLoadState(page, this.filterResetButton);
     }
   }
 
diff --git a/tests/UI/pages/BO/catalog/suppliers/add.ts b/tests/UI/pages/BO/catalog/suppliers/add.ts
index f58aed9993e5f..fd5c68e5559ea 100644
--- a/tests/UI/pages/BO/catalog/suppliers/add.ts
+++ b/tests/UI/pages/BO/catalog/suppliers/add.ts
@@ -158,7 +158,7 @@ class AddSupplier extends BOBasePage {
     await this.setChecked(page, this.statusToggleInput(supplierData.enabled ? 1 : 0));
 
     // Save Supplier
-    await this.clickAndWaitForNavigation(page, this.saveButton);
+    await this.clickAndWaitForURL(page, this.saveButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
diff --git a/tests/UI/pages/BO/catalog/suppliers/index.ts b/tests/UI/pages/BO/catalog/suppliers/index.ts
index 3287db37cfa3d..c329214a2051f 100644
--- a/tests/UI/pages/BO/catalog/suppliers/index.ts
+++ b/tests/UI/pages/BO/catalog/suppliers/index.ts
@@ -151,7 +151,7 @@ class Suppliers extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToAddNewSupplierPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.newSupplierLink);
+    await this.clickAndWaitForURL(page, this.newSupplierLink);
   }
 
   /* Column Methods */
@@ -162,7 +162,7 @@ class Suppliers extends BOBasePage {
    * @return {Promise<void>}
    */
   async viewSupplier(page: Page, row: number = 1): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.viewRowLink(row));
+    await this.clickAndWaitForURL(page, this.viewRowLink(row));
   }
 
   /**
@@ -176,7 +176,7 @@ class Suppliers extends BOBasePage {
       page.click(this.dropdownToggleButton(row)),
       this.waitForVisibleSelector(page, `${this.dropdownToggleButton(row)}[aria-expanded='true']`),
     ]);
-    await this.clickAndWaitForNavigation(page, this.editRowLink(row));
+    await this.clickAndWaitForURL(page, this.editRowLink(row));
   }
 
   /**
@@ -226,7 +226,7 @@ class Suppliers extends BOBasePage {
    */
   async setStatus(page: Page, row: number = 1, valueWanted: boolean = true): Promise<boolean> {
     if (await this.getStatus(page, row) !== valueWanted) {
-      await this.clickAndWaitForNavigation(page, this.statusColumn(row));
+      await this.clickAndWaitForLoadState(page, this.statusColumn(row));
       return true;
     }
 
@@ -252,7 +252,8 @@ class Suppliers extends BOBasePage {
    */
   async resetFilter(page: Page): Promise<void> {
     if (await this.elementVisible(page, this.filterResetButton, 2000)) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+      await this.clickAndWaitForLoadState(page, this.filterResetButton);
+      await this.elementNotVisible(page, this.filterResetButton, 2000);
     }
   }
 
@@ -296,7 +297,7 @@ class Suppliers extends BOBasePage {
       // Do nothing
     }
     // click on search
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await this.clickAndWaitForURL(page, this.filterSearchButton);
   }
 
   /**
@@ -330,7 +331,7 @@ class Suppliers extends BOBasePage {
     ]);
 
     // Click on delete and wait for modal
-    await this.clickAndWaitForNavigation(page, enable ? this.bulkActionsEnableButton : this.bulkActionsDisableButton);
+    await page.click(enable ? this.bulkActionsEnableButton : this.bulkActionsDisableButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -367,7 +368,7 @@ class Suppliers extends BOBasePage {
    * @return {Promise<void>}
    */
   async confirmDeleteSuppliers(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.confirmDeleteButton);
+    await this.clickAndWaitForLoadState(page, this.confirmDeleteButton);
   }
 
   // Sort methods
@@ -406,7 +407,7 @@ class Suppliers extends BOBasePage {
 
     let i: number = 0;
     while (await this.elementNotVisible(page, sortColumnDiv, 2000) && i < 2) {
-      await this.clickAndWaitForNavigation(page, sortColumnSpanButton);
+      await this.clickAndWaitForURL(page, sortColumnSpanButton);
       i += 1;
     }
 
@@ -441,7 +442,7 @@ class Suppliers extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationNext(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink);
+    await this.clickAndWaitForURL(page, this.paginationNextLink);
 
     return this.getPaginationLabel(page);
   }
@@ -452,7 +453,7 @@ class Suppliers extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationPrevious(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink);
+    await this.clickAndWaitForURL(page, this.paginationPreviousLink);
 
     return this.getPaginationLabel(page);
   }
diff --git a/tests/UI/pages/BO/customerService/customerService/index.ts b/tests/UI/pages/BO/customerService/customerService/index.ts
index ed40e89df47ea..d84492b532004 100644
--- a/tests/UI/pages/BO/customerService/customerService/index.ts
+++ b/tests/UI/pages/BO/customerService/customerService/index.ts
@@ -133,7 +133,8 @@ class CustomerService extends BOBasePage {
    */
   async resetFilter(page: Page): Promise<void> {
     if (await this.elementVisible(page, this.filterResetButton, 2000)) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+      await this.clickAndWaitForLoadState(page, this.filterResetButton);
+      await this.elementNotVisible(page, this.filterResetButton, 2000);
     }
   }
 
@@ -147,15 +148,17 @@ class CustomerService extends BOBasePage {
    * @return {Promise<void>}
    */
   async filterTable(page: Page, filterType: string, filterBy: string, value: string): Promise<void> {
+    const currentUrl: string = page.url();
+
     switch (filterType) {
       case 'input':
         await this.setValue(page, this.filterColumn(filterBy), value.toString());
-        await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+        await this.clickAndWaitForURL(page, this.filterSearchButton);
         break;
 
       case 'select':
         await Promise.all([
-          page.waitForNavigation({waitUntil: 'networkidle'}),
+          page.waitForURL((url: URL): boolean => url.toString() !== currentUrl, {waitUntil: 'networkidle'}),
           this.selectByVisibleText(page, this.filterColumn(filterBy), value ? 'Yes' : 'No'),
         ]);
         break;
@@ -275,7 +278,7 @@ class CustomerService extends BOBasePage {
    * @returns {Promise<void>}
    */
   async goToViewMessagePage(page: Page, row: number = 1): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.tableColumnActionsViewLink(row));
+    await this.clickAndWaitForURL(page, this.tableColumnActionsViewLink(row));
   }
 
   /**
@@ -293,7 +296,8 @@ class CustomerService extends BOBasePage {
     await page.click(this.tableColumnActionsDeleteLink(row));
 
     // Confirm delete action
-    await this.clickAndWaitForNavigation(page, this.deleteModalButtonYes);
+    await page.click(this.deleteModalButtonYes);
+    await this.elementNotVisible(page, this.deleteModalButtonYes);
 
     // Get successful message
     return this.getAlertSuccessBlockContent(page);
@@ -307,7 +311,8 @@ class CustomerService extends BOBasePage {
    */
   async allowFileUploading(page: Page, toEnable: boolean = true): Promise<string> {
     await this.setChecked(page, this.allowFileUploadingToggleInput(toEnable ? 'on' : 'off'));
-    await this.clickAndWaitForNavigation(page, this.contactOptionSaveButton);
+    await page.click(this.contactOptionSaveButton);
+    await this.elementNotVisible(page, this.allowFileUploadingToggleInput(!toEnable ? 'on' : 'off'));
 
     return this.getAlertSuccessBlockContent(page);
   }
@@ -320,7 +325,7 @@ class CustomerService extends BOBasePage {
    */
   async setDefaultMessage(page: Page, message: string): Promise<string> {
     await page.fill(this.defaultMessageTextarea, message);
-    await this.clickAndWaitForNavigation(page, this.contactOptionSaveButton);
+    await page.click(this.contactOptionSaveButton);
 
     return this.getAlertSuccessBlockContent(page);
   }
diff --git a/tests/UI/pages/BO/customerService/merchandiseReturns/edit.ts b/tests/UI/pages/BO/customerService/merchandiseReturns/edit.ts
index 52ca4167cb615..4f253db62cf49 100644
--- a/tests/UI/pages/BO/customerService/merchandiseReturns/edit.ts
+++ b/tests/UI/pages/BO/customerService/merchandiseReturns/edit.ts
@@ -63,9 +63,9 @@ class EditMerchandiseReturns extends BOBasePage {
   async setStatus(page: Page, status: string, saveAndStay: boolean = false): Promise<string> {
     await this.selectByVisibleText(page, this.status, status);
     if (saveAndStay) {
-      await this.clickAndWaitForNavigation(page, this.saveAndStayButton);
+      await this.clickAndWaitForURL(page, this.saveAndStayButton);
     } else {
-      await this.clickAndWaitForNavigation(page, this.orderReturnSaveButton);
+      await this.clickAndWaitForURL(page, this.orderReturnSaveButton);
     }
     return this.getAlertSuccessBlockContent(page);
   }
@@ -95,7 +95,7 @@ class EditMerchandiseReturns extends BOBasePage {
    */
   async clickOnCancelButton(page: Page): Promise<void> {
     await this.waitForSelectorAndClick(page, this.orderReturnCancelButton);
-    await this.clickAndWaitForNavigation(page, this.orderReturnCancelButton);
+    await this.clickAndWaitForURL(page, this.orderReturnCancelButton);
   }
 
   /**
@@ -105,7 +105,7 @@ class EditMerchandiseReturns extends BOBasePage {
    * @returns {Promise<string>}
    */
   async clickOnDeleteLastProductButton(page: Page, row: number = 1): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.productsTableDeleteColumn(row));
+    await this.clickAndWaitForURL(page, this.productsTableDeleteColumn(row));
 
     return this.getTextContent(page, this.alertBlock);
   }
@@ -118,13 +118,13 @@ class EditMerchandiseReturns extends BOBasePage {
    * @returns {Promise<string>}
    */
   async deleteProduct(page: Page, row: number = 1, understandTheRisk: boolean = true): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.productsTableDeleteColumn(row));
+    await this.clickAndWaitForURL(page, this.productsTableDeleteColumn(row));
     if (understandTheRisk) {
-      await this.clickAndWaitForNavigation(page, this.continueButton);
+      await this.clickAndWaitForURL(page, this.continueButton);
 
       return this.getTextContent(page, this.alertBlock);
     }
-    await this.clickAndWaitForNavigation(page, this.cancelButton);
+    await this.clickAndWaitForURL(page, this.cancelButton);
 
     return this.getPageTitle(page);
   }
diff --git a/tests/UI/pages/BO/customerService/merchandiseReturns/index.ts b/tests/UI/pages/BO/customerService/merchandiseReturns/index.ts
index 697007bd5aacd..63888076dd1fb 100644
--- a/tests/UI/pages/BO/customerService/merchandiseReturns/index.ts
+++ b/tests/UI/pages/BO/customerService/merchandiseReturns/index.ts
@@ -77,7 +77,7 @@ class MerchandiseReturns extends BOBasePage {
     if (await this.elementVisible(page, this.filterColumn(filterBy), 2000)) {
       await this.setValue(page, this.filterColumn(filterBy), value);
       // click on search
-      await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+      await this.clickAndWaitForURL(page, this.filterSearchButton);
     }
   }
 
@@ -99,7 +99,7 @@ class MerchandiseReturns extends BOBasePage {
    * @returns {Promise<void>}
    */
   async goToMerchandiseReturnPage(page: Page, row: number = 1): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.tableColumn(row, 'id_order_return'));
+    await this.clickAndWaitForURL(page, this.tableColumn(row, 'id_order_return'));
   }
 
   /**
@@ -110,7 +110,7 @@ class MerchandiseReturns extends BOBasePage {
    */
   async setOrderReturnStatus(page: Page, status: boolean = true): Promise<string> {
     await this.setChecked(page, this.enableOrderReturnLabel(status ? 'on' : 'off'));
-    await this.clickAndWaitForNavigation(page, this.saveButton);
+    await this.clickAndWaitForLoadState(page, this.saveButton);
     return this.getTextContent(page, this.alertSuccessBlock);
   }
 
@@ -122,7 +122,7 @@ class MerchandiseReturns extends BOBasePage {
    */
   async setReturnsPrefix(page: Page, prefix: string): Promise<string> {
     await this.setValue(page, this.returnsPrefixInput, prefix);
-    await this.clickAndWaitForNavigation(page, this.saveButton);
+    await this.clickAndWaitForLoadState(page, this.saveButton);
     return this.getTextContent(page, this.alertSuccessBlock);
   }
 }
diff --git a/tests/UI/pages/BO/customerService/orderMessages/add.ts b/tests/UI/pages/BO/customerService/orderMessages/add.ts
index fcbbc3008c019..79adf744a6451 100644
--- a/tests/UI/pages/BO/customerService/orderMessages/add.ts
+++ b/tests/UI/pages/BO/customerService/orderMessages/add.ts
@@ -85,7 +85,7 @@ class AddOrderMessage extends BOBasePage {
     await this.setValue(page, this.nameInput(2), orderMessageData.frName);
     await this.setValue(page, this.messageTextarea(2), orderMessageData.frMessage);
     // Save order message
-    await this.clickAndWaitForNavigation(page, this.saveButton);
+    await this.clickAndWaitForURL(page, this.saveButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 }
diff --git a/tests/UI/pages/BO/customerService/orderMessages/index.ts b/tests/UI/pages/BO/customerService/orderMessages/index.ts
index 499580bc9545e..d06889ea19691 100644
--- a/tests/UI/pages/BO/customerService/orderMessages/index.ts
+++ b/tests/UI/pages/BO/customerService/orderMessages/index.ts
@@ -122,7 +122,7 @@ class OrderMessages extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToAddNewOrderMessagePage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.newOrderMessageLink);
+    await this.clickAndWaitForURL(page, this.newOrderMessageLink);
   }
 
   /* Reset Methods */
@@ -133,7 +133,8 @@ class OrderMessages extends BOBasePage {
    */
   async resetFilter(page: Page): Promise<void> {
     if (await this.elementVisible(page, this.filterResetButton, 2000)) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+      await this.clickAndWaitForLoadState(page, this.filterResetButton);
+      await this.elementNotVisible(page, this.filterResetButton, 2000);
     }
   }
 
@@ -166,7 +167,7 @@ class OrderMessages extends BOBasePage {
    */
   async filterTable(page: Page, filterBy: string, value: string): Promise<void> {
     await this.setValue(page, this.filterColumn(filterBy), value);
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await this.clickAndWaitForURL(page, this.filterSearchButton);
   }
 
   /* Column Methods */
@@ -177,7 +178,7 @@ class OrderMessages extends BOBasePage {
    * @return {Promise<void>}
    */
   async gotoEditOrderMessage(page: Page, row: number = 1): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.editRowLink(row));
+    await this.clickAndWaitForURL(page, this.editRowLink(row));
   }
 
   /**
@@ -250,7 +251,7 @@ class OrderMessages extends BOBasePage {
    * @return {Promise<void>}
    */
   async confirmDeleteOrderMessages(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.confirmDeleteButton);
+    await this.clickAndWaitForURL(page, this.confirmDeleteButton);
   }
 
   /* Pagination methods */
@@ -280,7 +281,7 @@ class OrderMessages extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationNext(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink);
+    await this.clickAndWaitForURL(page, this.paginationNextLink);
     return this.getPaginationLabel(page);
   }
 
@@ -290,7 +291,7 @@ class OrderMessages extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationPrevious(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink);
+    await this.clickAndWaitForURL(page, this.paginationPreviousLink);
     return this.getPaginationLabel(page);
   }
 
@@ -326,7 +327,7 @@ class OrderMessages extends BOBasePage {
 
     let i: number = 0;
     while (await this.elementNotVisible(page, sortColumnDiv, 2000) && i < 2) {
-      await this.clickAndWaitForNavigation(page, sortColumnSpanButton);
+      await this.clickAndWaitForURL(page, sortColumnSpanButton);
       i += 1;
     }
 
diff --git a/tests/UI/pages/BO/customers/add.ts b/tests/UI/pages/BO/customers/add.ts
index 1a2fcdfd1acb5..10f68db907c6a 100644
--- a/tests/UI/pages/BO/customers/add.ts
+++ b/tests/UI/pages/BO/customers/add.ts
@@ -161,7 +161,7 @@ class AddCustomer extends BOBasePage {
 
     // Save Customer
     if (waitForNavigation) {
-      await this.clickAndWaitForNavigation(page, this.saveCustomerButton);
+      await this.clickAndWaitForURL(page, this.saveCustomerButton);
       return this.getAlertSuccessBlockParagraphContent(page);
     }
     await this.waitForSelectorAndClick(page, this.saveCustomerButton);
@@ -179,7 +179,7 @@ class AddCustomer extends BOBasePage {
     await this.fillB2BCustomerForm(page, customerData);
 
     // Save Customer
-    await this.clickAndWaitForNavigation(page, this.saveCustomerButton);
+    await this.clickAndWaitForURL(page, this.saveCustomerButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
diff --git a/tests/UI/pages/BO/customers/addresses/add.ts b/tests/UI/pages/BO/customers/addresses/add.ts
index 79caf8dfba493..c63cf97a970b8 100644
--- a/tests/UI/pages/BO/customers/addresses/add.ts
+++ b/tests/UI/pages/BO/customers/addresses/add.ts
@@ -143,7 +143,7 @@ class AddAddress extends BOBasePage {
    * @returns {Promise<string>}
    */
   async saveAddress(page: Frame|Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.saveAddressButton);
+    await this.clickAndWaitForURL(page, this.saveAddressButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
diff --git a/tests/UI/pages/BO/customers/addresses/index.ts b/tests/UI/pages/BO/customers/addresses/index.ts
index fe38ddabaf0e5..37b5dd11e1330 100644
--- a/tests/UI/pages/BO/customers/addresses/index.ts
+++ b/tests/UI/pages/BO/customers/addresses/index.ts
@@ -135,8 +135,9 @@ class Addresses extends BOBasePage {
    * @returns {Promise<void>}
    */
   async resetFilter(page: Page): Promise<void> {
-    if (!(await this.elementNotVisible(page, this.filterResetButton, 2000))) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+    if (await this.elementVisible(page, this.filterResetButton, 2000)) {
+      await page.click(this.filterResetButton);
+      await this.elementNotVisible(page, this.filterResetButton, 2000);
     }
   }
 
@@ -179,7 +180,7 @@ class Addresses extends BOBasePage {
       // Do nothing
     }
     // click on search
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await this.clickAndWaitForURL(page, this.filterSearchButton);
   }
 
   /**
@@ -217,7 +218,7 @@ class Addresses extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToAddNewAddressPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.addNewAddressLink);
+    await this.clickAndWaitForURL(page, this.addNewAddressLink);
   }
 
   /**
@@ -227,7 +228,7 @@ class Addresses extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToEditAddressPage(page: Page, row: number): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.addressesListTableEditLink(row));
+    await this.clickAndWaitForURL(page, this.addressesListTableEditLink(row));
   }
 
   /**
@@ -293,7 +294,7 @@ class Addresses extends BOBasePage {
 
     let i: number = 0;
     while (await this.elementNotVisible(page, sortColumnDiv, 2000) && i < 2) {
-      await this.clickAndWaitForNavigation(page, sortColumnSpanButton);
+      await this.clickAndWaitForURL(page, sortColumnSpanButton);
       i += 1;
     }
 
@@ -327,7 +328,7 @@ class Addresses extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationNext(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink);
+    await this.clickAndWaitForURL(page, this.paginationNextLink);
     return this.getPaginationLabel(page);
   }
 
@@ -337,7 +338,7 @@ class Addresses extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationPrevious(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink);
+    await this.clickAndWaitForURL(page, this.paginationPreviousLink);
     return this.getPaginationLabel(page);
   }
 
@@ -362,7 +363,7 @@ class Addresses extends BOBasePage {
     await this.setCheckedWithIcon(page, this.requiredFieldCheckBox(id), valueWanted);
 
     // Save setting
-    await this.clickAndWaitForNavigation(page, this.saveButton);
+    await page.click(this.saveButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 }
diff --git a/tests/UI/pages/BO/customers/index.ts b/tests/UI/pages/BO/customers/index.ts
index 7527a71fbb5ee..0911953ff99da 100644
--- a/tests/UI/pages/BO/customers/index.ts
+++ b/tests/UI/pages/BO/customers/index.ts
@@ -166,8 +166,9 @@ class Customers extends BOBasePage {
    * @returns {Promise<void>}
    */
   async resetFilter(page: Page): Promise<void> {
-    if (!(await this.elementNotVisible(page, this.filterResetButton, 2000))) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+    if (await this.elementVisible(page, this.filterResetButton, 2000)) {
+      await this.clickAndWaitForLoadState(page, this.filterResetButton);
+      await this.elementNotVisible(page, this.filterResetButton, 2000);
     }
   }
 
@@ -214,7 +215,7 @@ class Customers extends BOBasePage {
       // Do nothing
     }
     // click on search
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await this.clickAndWaitForURL(page, this.filterSearchButton);
   }
 
   /**
@@ -244,7 +245,7 @@ class Customers extends BOBasePage {
     await page.type(this.customerFilterColumnInput('date_add_from'), dateFrom);
     await page.type(this.customerFilterColumnInput('date_add_to'), dateTo);
     // click on search
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await this.clickAndWaitForURL(page, this.filterSearchButton);
   }
 
   /**
@@ -408,7 +409,7 @@ class Customers extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToAddNewCustomerPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.addNewCustomerLink);
+    await this.clickAndWaitForURL(page, this.addNewCustomerLink);
   }
 
   /**
@@ -422,7 +423,7 @@ class Customers extends BOBasePage {
       page.click(this.customersListTableToggleDropDown(row)),
       this.waitForVisibleSelector(page, `${this.customersListTableToggleDropDown(row)}[aria-expanded='true']`),
     ]);
-    await this.clickAndWaitForNavigation(page, this.customersListTableViewLink(row));
+    await this.clickAndWaitForURL(page, this.customersListTableViewLink(row));
   }
 
   /**
@@ -432,7 +433,7 @@ class Customers extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToEditCustomerPage(page: Page, row: number): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.customersListTableEditLink(row));
+    await this.clickAndWaitForURL(page, this.customersListTableEditLink(row));
   }
 
   /**
@@ -494,7 +495,7 @@ class Customers extends BOBasePage {
     await this.setChecked(page, this.deleteCustomerModalMethodInput(allowRegistrationAfterDelete ? 0 : 1));
 
     // Click on delete button and wait for action to finish
-    await this.clickAndWaitForNavigation(page, this.deleteCustomerModalDeleteButton);
+    await this.clickAndWaitForURL(page, this.deleteCustomerModalDeleteButton);
     await this.waitForVisibleSelector(page, this.alertSuccessBlockParagraph);
   }
 
@@ -516,7 +517,7 @@ class Customers extends BOBasePage {
       this.waitForVisibleSelector(page, `${this.bulkActionsToggleButton}[aria-expanded='true']`),
     ]);
     // Click on delete and wait for modal
-    await this.clickAndWaitForNavigation(page, enable ? this.bulkActionsEnableButton : this.bulkActionsDisableButton);
+    await this.clickAndWaitForLoadState(page, enable ? this.bulkActionsEnableButton : this.bulkActionsDisableButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -534,7 +535,7 @@ class Customers extends BOBasePage {
 
     let i: number = 0;
     while (await this.elementNotVisible(page, sortColumnDiv, 2000) && i < 2) {
-      await this.clickAndWaitForNavigation(page, sortColumnSpanButton);
+      await this.clickAndWaitForURL(page, sortColumnSpanButton);
       i += 1;
     }
 
@@ -561,7 +562,7 @@ class Customers extends BOBasePage {
     await this.setCheckedWithIcon(page, this.requiredFieldCheckBox(id), valueWanted);
 
     // Save setting
-    await this.clickAndWaitForNavigation(page, this.saveButton);
+    await this.clickAndWaitForLoadState(page, this.saveButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -624,9 +625,11 @@ class Customers extends BOBasePage {
    * @returns {Promise<string>}
    */
   async selectPaginationLimit(page: Page, number: number): Promise<string> {
+    const currentUrl: string = page.url();
+
     await Promise.all([
       this.selectByVisibleText(page, this.paginationLimitSelect, number),
-      page.waitForNavigation({waitUntil: 'networkidle'}),
+      page.waitForURL((url: URL): boolean => url.toString() !== currentUrl, {waitUntil: 'networkidle'}),
     ]);
     return this.getPaginationLabel(page);
   }
@@ -638,7 +641,7 @@ class Customers extends BOBasePage {
    */
   async paginationNext(page: Page): Promise<string> {
     await this.scrollTo(page, this.paginationNextLink);
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink);
+    await this.clickAndWaitForURL(page, this.paginationNextLink);
     return this.getPaginationLabel(page);
   }
 
@@ -649,7 +652,7 @@ class Customers extends BOBasePage {
    */
   async paginationPrevious(page: Page): Promise<string> {
     await this.scrollTo(page, this.paginationPreviousLink);
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink);
+    await this.clickAndWaitForURL(page, this.paginationPreviousLink);
     return this.getPaginationLabel(page);
   }
 }
diff --git a/tests/UI/pages/BO/customers/outstanding/index.ts b/tests/UI/pages/BO/customers/outstanding/index.ts
index 147df2e94bfa1..726740b519fa9 100644
--- a/tests/UI/pages/BO/customers/outstanding/index.ts
+++ b/tests/UI/pages/BO/customers/outstanding/index.ts
@@ -83,7 +83,7 @@ class Outstanding extends BOBasePage {
    */
   async resetFilter(page: Page): Promise<void> {
     if (!(await this.elementNotVisible(page, this.filterResetButton, 2000))) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+      await this.clickAndWaitForURL(page, this.filterResetButton);
     }
   }
 
@@ -150,9 +150,11 @@ class Outstanding extends BOBasePage {
    * @returns {Promise<string>}
    */
   async selectPaginationLimit(page: Page, number: number): Promise<string> {
+    const currentUrl: string = page.url();
+
     await Promise.all([
       this.selectByVisibleText(page, this.paginationLimitSelect, number),
-      page.waitForNavigation({waitUntil: 'networkidle'}),
+      page.waitForURL((url: URL): boolean => url.toString() !== currentUrl, {waitUntil: 'networkidle'}),
     ]);
 
     return this.getPaginationLabel(page);
@@ -164,7 +166,7 @@ class Outstanding extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationNext(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink);
+    await this.clickAndWaitForURL(page, this.paginationNextLink);
 
     return this.getPaginationLabel(page);
   }
@@ -175,7 +177,7 @@ class Outstanding extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationPrevious(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink);
+    await this.clickAndWaitForURL(page, this.paginationPreviousLink);
 
     return this.getPaginationLabel(page);
   }
@@ -194,7 +196,7 @@ class Outstanding extends BOBasePage {
 
     let i: number = 0;
     while (await this.elementNotVisible(page, sortColumnDiv, 2000) && i < 2) {
-      await this.clickAndWaitForNavigation(page, sortColumnSpanButton);
+      await this.clickAndWaitForURL(page, sortColumnSpanButton);
       i += 1;
     }
 
@@ -269,7 +271,7 @@ class Outstanding extends BOBasePage {
       // Do nothing
     }
 
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await this.clickAndWaitForURL(page, this.filterSearchButton);
   }
 
   /**
@@ -283,7 +285,7 @@ class Outstanding extends BOBasePage {
     await page.type(this.outstandingFilterColumnInput('date_add_from'), dateFrom);
     await page.type(this.outstandingFilterColumnInput('date_add_to'), dateTo);
     // click on search
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await this.clickAndWaitForURL(page, this.filterSearchButton);
   }
 }
 
diff --git a/tests/UI/pages/BO/customers/view.ts b/tests/UI/pages/BO/customers/view.ts
index 9c35732bed1b0..c4fdad94d3bb5 100644
--- a/tests/UI/pages/BO/customers/view.ts
+++ b/tests/UI/pages/BO/customers/view.ts
@@ -267,7 +267,7 @@ class ViewCustomer extends BOBasePage {
    * @returns {Promise<void>}
    */
   async goToEditCustomerPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.personnalInformationEditButton);
+    await this.clickAndWaitForURL(page, this.personnalInformationEditButton);
   }
 
   /**
@@ -294,7 +294,7 @@ class ViewCustomer extends BOBasePage {
         throw new Error(`${cardTitle} was not found`);
     }
 
-    return this.clickAndWaitForNavigation(page, selector(row));
+    return this.clickAndWaitForURL(page, selector(row));
   }
 
   /**
diff --git a/tests/UI/pages/BO/design/emailThemes/index.ts b/tests/UI/pages/BO/design/emailThemes/index.ts
index f10e9fc56724a..d633ec5c89325 100644
--- a/tests/UI/pages/BO/design/emailThemes/index.ts
+++ b/tests/UI/pages/BO/design/emailThemes/index.ts
@@ -58,7 +58,7 @@ class EmailTheme extends BOBasePage {
    */
   async selectDefaultEmailTheme(page: Page, emailTheme: string): Promise<string> {
     await this.selectByVisibleText(page, this.defaultEmailThemeSelect, emailTheme);
-    await this.clickAndWaitForNavigation(page, this.configurationFormSaveButton);
+    await this.clickAndWaitForLoadState(page, this.configurationFormSaveButton);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
@@ -81,7 +81,7 @@ class EmailTheme extends BOBasePage {
         /* eslint-disable no-loop-func */
         await Promise.all([
           tableRows[i].$eval(this.columnActionPreviewLink, (el: HTMLElement) => el.click()),
-          page.waitForNavigation(),
+          page.waitForURL(''),
         ]);
         /* eslint-enable no-loop-func */
         found = true;
diff --git a/tests/UI/pages/BO/design/emailThemes/preview.ts b/tests/UI/pages/BO/design/emailThemes/preview.ts
index 18d2dab969468..038342d471630 100644
--- a/tests/UI/pages/BO/design/emailThemes/preview.ts
+++ b/tests/UI/pages/BO/design/emailThemes/preview.ts
@@ -71,7 +71,7 @@ class PreviewEmailTheme extends BOBasePage {
    * @return {Promise<void>}
    */
   async goBackToEmailThemesPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.backToConfigurationLink);
+    await this.clickAndWaitForURL(page, this.backToConfigurationLink);
   }
 
   /**
diff --git a/tests/UI/pages/BO/design/imageSettings/add.ts b/tests/UI/pages/BO/design/imageSettings/add.ts
index c57cedd023d0a..b4d781c5ff06e 100644
--- a/tests/UI/pages/BO/design/imageSettings/add.ts
+++ b/tests/UI/pages/BO/design/imageSettings/add.ts
@@ -80,7 +80,7 @@ class AddImageType extends BOBasePage {
     await this.setChecked(page, this.storesToggle(imageTypeData.storesStatus ? 'on' : 'off'));
 
     // Save image type
-    await this.clickAndWaitForNavigation(page, this.saveButton);
+    await this.clickAndWaitForURL(page, this.saveButton);
 
     // Return successful message
     return this.getAlertSuccessBlockParagraphContent(page);
diff --git a/tests/UI/pages/BO/design/imageSettings/index.ts b/tests/UI/pages/BO/design/imageSettings/index.ts
index 46b763fb125a4..71dddabc3a744 100644
--- a/tests/UI/pages/BO/design/imageSettings/index.ts
+++ b/tests/UI/pages/BO/design/imageSettings/index.ts
@@ -209,7 +209,7 @@ class ImageSettings extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToNewImageTypePage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.newImageTypeLink);
+    await this.clickAndWaitForURL(page, this.newImageTypeLink);
   }
 
   /* Filter methods */
@@ -230,7 +230,7 @@ class ImageSettings extends BOBasePage {
    */
   async resetFilter(page: Page): Promise<void> {
     if (!(await this.elementNotVisible(page, this.filterResetButton, 2000))) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+      await this.clickAndWaitForURL(page, this.filterResetButton);
     }
     await this.waitForVisibleSelector(page, this.filterSearchButton, 2000);
   }
@@ -255,15 +255,17 @@ class ImageSettings extends BOBasePage {
    * @return {Promise<void>}
    */
   async filterTable(page: Page, filterType: string, filterBy: string, value: string): Promise<void> {
+    const currentUrl: string = page.url();
+
     switch (filterType) {
       case 'input':
         await this.setValue(page, this.filterColumn(filterBy), value.toString());
-        await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+        await this.clickAndWaitForURL(page, this.filterSearchButton);
         break;
 
       case 'select':
         await Promise.all([
-          page.waitForNavigation({waitUntil: 'networkidle'}),
+          page.waitForURL((url: URL): boolean => url.toString() !== currentUrl, {waitUntil: 'networkidle'}),
           this.selectByVisibleText(page, this.filterColumn(filterBy), value === '1' ? 'Yes' : 'No'),
         ]);
         break;
@@ -322,7 +324,7 @@ class ImageSettings extends BOBasePage {
    * @return {Promise<void>}
    */
   async gotoEditImageTypePage(page: Page, row: number): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.tableColumnActionsEditLink(row));
+    await this.clickAndWaitForURL(page, this.tableColumnActionsEditLink(row));
   }
 
   /**
@@ -344,7 +346,7 @@ class ImageSettings extends BOBasePage {
     await this.setChecked(page, this.deleteModalCheckboxDeleteLinkedImages, deleteLinkedImages);
 
     // Confirm delete action
-    await this.clickAndWaitForNavigation(page, this.deleteModalButtonYes);
+    await this.clickAndWaitForURL(page, this.deleteModalButtonYes);
 
     // Get successful message
     return this.getAlertSuccessBlockParagraphContent(page);
@@ -377,7 +379,7 @@ class ImageSettings extends BOBasePage {
       this.waitForVisibleSelector(page, this.bulkDeleteLink),
     ]);
 
-    await this.clickAndWaitForNavigation(page, this.bulkDeleteLink);
+    await this.clickAndWaitForURL(page, this.bulkDeleteLink);
 
     // Return successful message
     return this.getAlertSuccessBlockParagraphContent(page);
@@ -416,7 +418,7 @@ class ImageSettings extends BOBasePage {
     }
 
     const sortColumnButton = `${columnSelector} i.icon-caret-${sortDirection}`;
-    await this.clickAndWaitForNavigation(page, sortColumnButton);
+    await this.clickAndWaitForURL(page, sortColumnButton);
   }
 
   /* Pagination methods */
@@ -437,7 +439,7 @@ class ImageSettings extends BOBasePage {
    */
   async selectPaginationLimit(page: Page, number: number): Promise<string> {
     await this.waitForSelectorAndClick(page, this.paginationDropdownButton);
-    await this.clickAndWaitForNavigation(page, this.paginationItems(number));
+    await this.clickAndWaitForURL(page, this.paginationItems(number));
 
     return this.getPaginationLabel(page);
   }
@@ -448,7 +450,7 @@ class ImageSettings extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationNext(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink);
+    await this.clickAndWaitForURL(page, this.paginationNextLink);
 
     return this.getPaginationLabel(page);
   }
@@ -459,7 +461,7 @@ class ImageSettings extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationPrevious(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink);
+    await this.clickAndWaitForURL(page, this.paginationPreviousLink);
 
     return this.getPaginationLabel(page);
   }
diff --git a/tests/UI/pages/BO/design/linkWidgets/add.ts b/tests/UI/pages/BO/design/linkWidgets/add.ts
index c6f3b3c22e7b8..2e83f7080f525 100644
--- a/tests/UI/pages/BO/design/linkWidgets/add.ts
+++ b/tests/UI/pages/BO/design/linkWidgets/add.ts
@@ -232,7 +232,7 @@ class AddLinkBlock extends BOBasePage {
     // Add custom pages
     await this.addCustomPages(page, linkWidgetData.customPages);
     // Save
-    await this.clickAndWaitForNavigation(page, this.saveButton);
+    await this.clickAndWaitForURL(page, this.saveButton);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
diff --git a/tests/UI/pages/BO/design/linkWidgets/index.ts b/tests/UI/pages/BO/design/linkWidgets/index.ts
index 23b7cf85b11e4..3fef36cfc60a2 100644
--- a/tests/UI/pages/BO/design/linkWidgets/index.ts
+++ b/tests/UI/pages/BO/design/linkWidgets/index.ts
@@ -63,7 +63,7 @@ class LinkList extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToNewLinkWidgetPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.newBlockLink);
+    await this.clickAndWaitForURL(page, this.newBlockLink);
   }
 
   /* Table methods */
@@ -90,7 +90,7 @@ class LinkList extends BOBasePage {
       page.click(this.dropdownToggleButton(hookName, row)),
       this.waitForVisibleSelector(page, `${this.dropdownToggleButton(hookName, row)}[aria-expanded='true']`),
     ]);
-    await this.clickAndWaitForNavigation(page, this.deleteRowLink(hookName, row));
+    await page.click(this.deleteRowLink(hookName, row));
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
diff --git a/tests/UI/pages/BO/design/pages/add.ts b/tests/UI/pages/BO/design/pages/add.ts
index 5ccb62e4894bd..7054bd6a69649 100644
--- a/tests/UI/pages/BO/design/pages/add.ts
+++ b/tests/UI/pages/BO/design/pages/add.ts
@@ -75,7 +75,7 @@ class AddPage extends BOBasePage {
     await this.setChecked(page, this.displayedToggleInput(pageData.displayed ? 1 : 0));
 
     // Save form
-    await this.clickAndWaitForNavigation(page, this.savePageButton);
+    await this.clickAndWaitForURL(page, this.savePageButton);
 
     // Return successful message
     return this.getAlertSuccessBlockParagraphContent(page);
@@ -96,7 +96,7 @@ class AddPage extends BOBasePage {
    * @return {Promise<void>}
    */
   async cancelPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.cancelButton);
+    await this.clickAndWaitForURL(page, this.cancelButton);
   }
 }
 export default new AddPage();
diff --git a/tests/UI/pages/BO/design/pages/index.ts b/tests/UI/pages/BO/design/pages/index.ts
index 4e1ae94f98f66..f94280275377d 100644
--- a/tests/UI/pages/BO/design/pages/index.ts
+++ b/tests/UI/pages/BO/design/pages/index.ts
@@ -174,7 +174,8 @@ class Pages extends BOBasePage {
     const resetButton = this.filterResetButton(tableName);
 
     if (await this.elementVisible(page, resetButton, 2000)) {
-      await this.clickAndWaitForNavigation(page, resetButton);
+      await page.click(resetButton);
+      await this.elementNotVisible(page, resetButton, 2000);
     }
     return this.getNumberFromText(page, this.gridHeaderTitle(tableName));
   }
@@ -200,7 +201,7 @@ class Pages extends BOBasePage {
       // Do nothing
     }
     // click on search
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton(tableName));
+    await this.clickAndWaitForURL(page, this.filterSearchButton(tableName));
   }
 
   /**
@@ -265,7 +266,8 @@ class Pages extends BOBasePage {
    * @return {Promise<void>}
    */
   async confirmDeleteFromTable(page: Page, tableName: string): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.confirmDeleteButton(tableName));
+    await page.click(this.confirmDeleteButton(tableName));
+    await this.elementNotVisible(page, this.confirmDeleteButton(tableName), 2000);
   }
 
   /**
@@ -297,7 +299,7 @@ class Pages extends BOBasePage {
    */
   async setStatus(page: Page, tableName: string, row: number, valueWanted: boolean = true): Promise<boolean> {
     if (await this.getStatus(page, tableName, row) !== valueWanted) {
-      await this.clickAndWaitForNavigation(page, this.listTableStatusColumn(tableName, row));
+      await page.click(this.listTableStatusColumn(tableName, row));
 
       return true;
     }
@@ -326,10 +328,7 @@ class Pages extends BOBasePage {
     ]);
 
     // Click on enable/disable and wait for modal
-    await this.clickAndWaitForNavigation(
-      page,
-      enable ? this.bulkActionsEnableButton(tableName) : this.bulkActionsDisableButton(tableName),
-    );
+    await page.click(enable ? this.bulkActionsEnableButton(tableName) : this.bulkActionsDisableButton(tableName));
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
@@ -438,7 +437,7 @@ class Pages extends BOBasePage {
 
     let i = 0;
     while (await this.elementNotVisible(page, sortColumnDiv, 2000) && i < 2) {
-      await this.clickAndWaitForNavigation(page, sortColumnSpanButton);
+      await this.clickAndWaitForURL(page, sortColumnSpanButton);
       i += 1;
     }
 
@@ -485,7 +484,7 @@ class Pages extends BOBasePage {
       ),
     ]);
     // Click on edit
-    await this.clickAndWaitForNavigation(page, this.listTableEditLink('cms_page_category', row));
+    await this.clickAndWaitForURL(page, this.listTableEditLink('cms_page_category', row));
   }
 
   /**
@@ -494,7 +493,7 @@ class Pages extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToAddNewPageCategory(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.addNewPageCategoryLink);
+    await this.clickAndWaitForURL(page, this.addNewPageCategoryLink);
   }
 
   /**
@@ -503,7 +502,7 @@ class Pages extends BOBasePage {
    * @return {Promise<void>}
    */
   async backToList(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.backToListButton);
+    await this.clickAndWaitForURL(page, this.backToListButton);
   }
 
   /**
@@ -513,7 +512,7 @@ class Pages extends BOBasePage {
    * @return {Promise<void>}
    */
   async viewCategory(page: Page, row: number): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.categoriesListTableViewLink(row));
+    await this.clickAndWaitForURL(page, this.categoriesListTableViewLink(row));
   }
 
   // Page methods
@@ -524,7 +523,7 @@ class Pages extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToAddNewPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.addNewPageLink);
+    await this.clickAndWaitForURL(page, this.addNewPageLink);
   }
 
   /**
@@ -534,7 +533,7 @@ class Pages extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToEditPage(page: Page, row: number): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.listTableEditLink('cms_page', row));
+    await this.clickAndWaitForURL(page, this.listTableEditLink('cms_page', row));
   }
 
   /**
@@ -555,7 +554,7 @@ class Pages extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationCategoryNext(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.categoriesPaginationNextLink);
+    await this.clickAndWaitForURL(page, this.categoriesPaginationNextLink);
 
     return this.getTextContent(page, this.categoriesPaginationLabel);
   }
@@ -566,7 +565,7 @@ class Pages extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationCategoryPrevious(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.categoriesPaginationPreviousLink);
+    await this.clickAndWaitForURL(page, this.categoriesPaginationPreviousLink);
 
     return this.getTextContent(page, this.categoriesPaginationLabel);
   }
@@ -589,7 +588,7 @@ class Pages extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationPagesNext(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.pagesPaginationNextLink);
+    await this.clickAndWaitForURL(page, this.pagesPaginationNextLink);
 
     return this.getTextContent(page, this.pagesPaginationLabel);
   }
@@ -600,7 +599,7 @@ class Pages extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationPagesPrevious(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.pagesPaginationPreviousLink);
+    await this.clickAndWaitForURL(page, this.pagesPaginationPreviousLink);
 
     return this.getTextContent(page, this.pagesPaginationLabel);
   }
diff --git a/tests/UI/pages/BO/design/pages/pageCategory/add.ts b/tests/UI/pages/BO/design/pages/pageCategory/add.ts
index 7905255668db1..74c72b2456c48 100644
--- a/tests/UI/pages/BO/design/pages/pageCategory/add.ts
+++ b/tests/UI/pages/BO/design/pages/pageCategory/add.ts
@@ -62,7 +62,7 @@ class AddPageCategory extends BOBasePage {
     await this.setValue(page, this.metaTitleInput, pageCategoryData.metaTitle);
     await this.setValue(page, this.metaDescriptionInput, pageCategoryData.metaDescription);
     await this.setValue(page, this.metaKeywordsInput, pageCategoryData.metaKeywords);
-    await this.clickAndWaitForNavigation(page, this.saveCategoryButton);
+    await this.clickAndWaitForURL(page, this.saveCategoryButton);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
diff --git a/tests/UI/pages/BO/design/themeAndLogo/themeAndLogo/index.ts b/tests/UI/pages/BO/design/themeAndLogo/themeAndLogo/index.ts
index 769d81a10706f..d8b6e673c0ba7 100644
--- a/tests/UI/pages/BO/design/themeAndLogo/themeAndLogo/index.ts
+++ b/tests/UI/pages/BO/design/themeAndLogo/themeAndLogo/index.ts
@@ -46,7 +46,7 @@ class ThemeAndLogo extends themeAndLogoBasePage {
    * @returns {Promise<void>}
    */
   async goToNewThemePage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.addNewThemeButton);
+    await this.clickAndWaitForURL(page, this.addNewThemeButton);
   }
 
   /**
diff --git a/tests/UI/pages/BO/design/themeAndLogo/themeAndLogo/themeAndLogoBasePage.ts b/tests/UI/pages/BO/design/themeAndLogo/themeAndLogo/themeAndLogoBasePage.ts
index a1e2d5fd4c410..d1cfc0b33eb10 100644
--- a/tests/UI/pages/BO/design/themeAndLogo/themeAndLogo/themeAndLogoBasePage.ts
+++ b/tests/UI/pages/BO/design/themeAndLogo/themeAndLogo/themeAndLogoBasePage.ts
@@ -96,7 +96,7 @@ export default class themeAndLogoBasePage extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToSubTabPagesConfiguration(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.pagesConfigurationNavItemLink);
+    await this.clickAndWaitForURL(page, this.pagesConfigurationNavItemLink);
   }
 
   /**
@@ -105,7 +105,7 @@ export default class themeAndLogoBasePage extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToSubTabAdvancedCustomization(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.advancedCustomizationNavItemLink);
+    await this.clickAndWaitForURL(page, this.advancedCustomizationNavItemLink);
   }
 
   /**
diff --git a/tests/UI/pages/BO/international/currencies/add.ts b/tests/UI/pages/BO/international/currencies/add.ts
index 3ad2bf9f6ae51..c0f366aa49418 100644
--- a/tests/UI/pages/BO/international/currencies/add.ts
+++ b/tests/UI/pages/BO/international/currencies/add.ts
@@ -210,7 +210,7 @@ class AddCurrency extends LocalizationBasePage {
    * @return {Promise<string>}
    */
   async saveCurrencyForm(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.saveButton);
+    await this.clickAndWaitForURL(page, this.saveButton);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
diff --git a/tests/UI/pages/BO/international/currencies/index.ts b/tests/UI/pages/BO/international/currencies/index.ts
index 4eeca88d3fcd9..0802f51436aca 100644
--- a/tests/UI/pages/BO/international/currencies/index.ts
+++ b/tests/UI/pages/BO/international/currencies/index.ts
@@ -161,7 +161,7 @@ class Currencies extends LocalizationBasePage {
    * @return {Promise<void>}
    */
   async goToAddNewCurrencyPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.newCurrencyLink);
+    await this.clickAndWaitForURL(page, this.newCurrencyLink);
   }
 
   /* filter Method */
@@ -185,7 +185,8 @@ class Currencies extends LocalizationBasePage {
       // Do nothing
     }
     // click on search
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await page.click(this.filterSearchButton);
+    await this.elementVisible(page, this.filterResetButton);
   }
 
   /* Reset Methods */
@@ -196,7 +197,8 @@ class Currencies extends LocalizationBasePage {
    */
   async resetFilter(page: Page): Promise<void> {
     if (await this.elementVisible(page, this.filterResetButton, 2000)) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+      await this.clickAndWaitForLoadState(page, this.filterResetButton);
+      await this.elementNotVisible(page, this.filterResetButton, 2000);
     }
   }
 
@@ -294,7 +296,8 @@ class Currencies extends LocalizationBasePage {
    */
   async setStatus(page: Page, row: number = 1, valueWanted: boolean = true): Promise<boolean> {
     if (await this.getStatus(page, row) !== valueWanted) {
-      await this.clickAndWaitForNavigation(page, this.statusColumn(row));
+      await this.clickAndWaitForLoadState(page, this.statusColumn(row));
+      await this.elementVisible(page, this.alertTextBlock);
       return true;
     }
 
@@ -336,7 +339,8 @@ class Currencies extends LocalizationBasePage {
       page.click(this.deleteSelectionButton),
       this.waitForVisibleSelector(page, `${this.confirmDeleteModal}.show`),
     ]);
-    await this.clickAndWaitForNavigation(page, this.confirmDeleteButton);
+    await this.clickAndWaitForLoadState(page, this.confirmDeleteButton);
+    await this.elementNotVisible(page, this.confirmDeleteModal);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -373,7 +377,7 @@ class Currencies extends LocalizationBasePage {
    * @return {Promise<void>}
    */
   async confirmDeleteCurrency(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.confirmDeleteButton);
+    await this.clickAndWaitForURL(page, this.confirmDeleteButton);
   }
 
   /**
@@ -383,7 +387,7 @@ class Currencies extends LocalizationBasePage {
    * @returns {Promise<void>}
    */
   async goToEditCurrencyPage(page: Page, row: number = 1): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.editRowLink(row));
+    await this.clickAndWaitForURL(page, this.editRowLink(row));
   }
 
   /**
@@ -392,7 +396,7 @@ class Currencies extends LocalizationBasePage {
    * @returns {Promise<string>}
    */
   async updateExchangeRate(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.updateExchangeRatesButton);
+    await page.click(this.updateExchangeRatesButton);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
@@ -414,9 +418,11 @@ class Currencies extends LocalizationBasePage {
    * @returns {Promise<string>}
    */
   async selectPaginationLimit(page: Page, number: number): Promise<string> {
+    const currentUrl: string = page.url();
+
     await Promise.all([
       this.selectByVisibleText(page, this.paginationLimitSelect, number),
-      page.waitForNavigation({waitUntil: 'networkidle'}),
+      page.waitForURL((url: URL): boolean => url.toString() !== currentUrl, {waitUntil: 'networkidle'}),
     ]);
 
     return this.getPaginationLabel(page);
@@ -428,7 +434,7 @@ class Currencies extends LocalizationBasePage {
    * @returns {Promise<string>}
    */
   async paginationNext(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink);
+    await this.clickAndWaitForURL(page, this.paginationNextLink);
 
     return this.getPaginationLabel(page);
   }
@@ -439,7 +445,7 @@ class Currencies extends LocalizationBasePage {
    * @returns {Promise<string>}
    */
   async paginationPrevious(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink);
+    await this.clickAndWaitForURL(page, this.paginationPreviousLink);
 
     return this.getPaginationLabel(page);
   }
@@ -459,7 +465,7 @@ class Currencies extends LocalizationBasePage {
     let i = 0;
     while (await this.elementNotVisible(page, sortColumnDiv, 2000) && i < 2) {
       await page.hover(this.sortColumnDiv(sortBy));
-      await this.clickAndWaitForNavigation(page, sortColumnSpanButton);
+      await this.clickAndWaitForURL(page, sortColumnSpanButton);
       i += 1;
     }
 
diff --git a/tests/UI/pages/BO/international/languages/add.ts b/tests/UI/pages/BO/international/languages/add.ts
index 687c316a48174..07a181b2cdc92 100644
--- a/tests/UI/pages/BO/international/languages/add.ts
+++ b/tests/UI/pages/BO/international/languages/add.ts
@@ -82,7 +82,7 @@ class AddLanguage extends LocalizationBasePage {
     await this.setChecked(page, this.statusToggleInput(languageData.enabled ? 1 : 0));
 
     // Save and return result
-    await this.clickAndWaitForNavigation(page, this.saveButton);
+    await this.clickAndWaitForURL(page, this.saveButton);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
diff --git a/tests/UI/pages/BO/international/languages/index.ts b/tests/UI/pages/BO/international/languages/index.ts
index 0989ff3178695..8c4844ed8cc02 100644
--- a/tests/UI/pages/BO/international/languages/index.ts
+++ b/tests/UI/pages/BO/international/languages/index.ts
@@ -145,7 +145,7 @@ class Languages extends LocalizationBasePage {
    * @return {Promise<void>}
    */
   async goToAddNewLanguage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.addNewLanguageLink);
+    await this.clickAndWaitForURL(page, this.addNewLanguageLink);
   }
 
   /* Reset methods */
@@ -156,7 +156,8 @@ class Languages extends LocalizationBasePage {
    */
   async resetFilter(page: Page): Promise<void> {
     if (!(await this.elementNotVisible(page, this.filterResetButton, 2000))) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+      await this.clickAndWaitForLoadState(page, this.filterResetButton);
+      await this.elementNotVisible(page, this.filterResetButton, 2000);
     }
   }
 
@@ -201,7 +202,7 @@ class Languages extends LocalizationBasePage {
       // Do nothing
     }
     // click on search
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await this.clickAndWaitForURL(page, this.filterSearchButton);
   }
 
   /* Table methods */
@@ -241,7 +242,7 @@ class Languages extends LocalizationBasePage {
    * @return {Promise<void>}
    */
   async goToEditLanguage(page: Page, row: number = 1): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.editRowLink(row));
+    await this.clickAndWaitForURL(page, this.editRowLink(row));
   }
 
   /**
@@ -296,7 +297,7 @@ class Languages extends LocalizationBasePage {
    */
   async setStatus(page: Page, row: number, valueWanted: boolean = true): Promise<boolean> {
     if (await this.getStatus(page, row) !== valueWanted) {
-      await this.clickAndWaitForNavigation(page, this.statusColumn(row));
+      await page.click(this.statusColumn(row));
 
       return true;
     }
@@ -323,7 +324,8 @@ class Languages extends LocalizationBasePage {
       this.waitForVisibleSelector(page, `${this.bulkActionsToggleButton}[aria-expanded='true']`),
     ]);
     // Click on delete and wait for modal
-    await this.clickAndWaitForNavigation(page, toEnable ? this.bulkActionsEnableButton : this.bulkActionsDisableButton);
+    await page.click(toEnable ? this.bulkActionsEnableButton : this.bulkActionsDisableButton);
+    await this.elementNotVisible(page, toEnable ? this.bulkActionsEnableButton : this.bulkActionsDisableButton);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
@@ -360,7 +362,8 @@ class Languages extends LocalizationBasePage {
    * @return {Promise<void>}
    */
   async confirmDeleteLanguages(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.confirmDeleteButton);
+    await page.click(this.confirmDeleteButton);
+    await this.elementNotVisible(page, this.confirmDeleteButton, 2000);
   }
 
   /* Sort functions */
@@ -377,7 +380,7 @@ class Languages extends LocalizationBasePage {
 
     let i = 0;
     while (await this.elementNotVisible(page, sortColumnDiv, 2000) && i < 2) {
-      await this.clickAndWaitForNavigation(page, sortColumnSpanButton);
+      await this.clickAndWaitForURL(page, sortColumnSpanButton);
       i += 1;
     }
 
@@ -401,9 +404,11 @@ class Languages extends LocalizationBasePage {
    * @returns {Promise<string>}
    */
   async selectPaginationLimit(page: Page, number: number): Promise<string> {
+    const currentUrl: string = page.url();
+
     await Promise.all([
       this.selectByVisibleText(page, this.paginationLimitSelect, number),
-      page.waitForNavigation({waitUntil: 'networkidle'}),
+      page.waitForURL((url: URL): boolean => url.toString() !== currentUrl, {waitUntil: 'networkidle'}),
     ]);
 
     return this.getPaginationLabel(page);
@@ -416,7 +421,7 @@ class Languages extends LocalizationBasePage {
    */
   async paginationNext(page: Page): Promise<string> {
     await this.scrollTo(page, this.paginationNextLink);
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink);
+    await this.clickAndWaitForURL(page, this.paginationNextLink);
 
     return this.getPaginationLabel(page);
   }
@@ -428,7 +433,7 @@ class Languages extends LocalizationBasePage {
    */
   async paginationPrevious(page: Page): Promise<string> {
     await this.scrollTo(page, this.paginationPreviousLink);
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink);
+    await this.clickAndWaitForURL(page, this.paginationPreviousLink);
 
     return this.getPaginationLabel(page);
   }
diff --git a/tests/UI/pages/BO/international/localization/index.ts b/tests/UI/pages/BO/international/localization/index.ts
index 27e0195a888e4..55e88edbdb162 100644
--- a/tests/UI/pages/BO/international/localization/index.ts
+++ b/tests/UI/pages/BO/international/localization/index.ts
@@ -106,7 +106,7 @@ class Localization extends LocalizationBasePage {
     await this.setChecked(page, this.downloadPackDataToggleInput(downloadPackData ? 1 : 0));
 
     // Import the pack
-    await this.clickAndWaitForNavigation(page, this.importButton);
+    await page.click(this.importButton);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
@@ -121,7 +121,7 @@ class Localization extends LocalizationBasePage {
   async setDefaultLanguage(page: Page, language: string, languageFromBrowser: boolean = true): Promise<string> {
     await this.selectByVisibleText(page, this.defaultLanguageSelector, language);
     await this.setChecked(page, this.languageFromBrowserToggleInput(languageFromBrowser ? 1 : 0));
-    await this.clickAndWaitForNavigation(page, this.saveConfigurationFormButton);
+    await page.click(this.saveConfigurationFormButton);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
@@ -148,7 +148,7 @@ class Localization extends LocalizationBasePage {
    */
   async setDefaultCountry(page: Page, country: string): Promise<string> {
     await this.selectByVisibleText(page, this.defaultCountrySelect, country);
-    await this.clickAndWaitForNavigation(page, this.saveConfigurationFormButton);
+    await page.click(this.saveConfigurationFormButton);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
diff --git a/tests/UI/pages/BO/international/localization/localizationBasePage.ts b/tests/UI/pages/BO/international/localization/localizationBasePage.ts
index b6eba61313d6f..1aa1baefb7dfc 100644
--- a/tests/UI/pages/BO/international/localization/localizationBasePage.ts
+++ b/tests/UI/pages/BO/international/localization/localizationBasePage.ts
@@ -33,7 +33,7 @@ export default class LocalizationBasePage extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToSubTabLocalizations(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.localizationNavItemLink);
+    await this.clickAndWaitForURL(page, this.localizationNavItemLink);
   }
 
   /**
@@ -42,7 +42,7 @@ export default class LocalizationBasePage extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToSubTabLanguages(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.languagesNavItemLink);
+    await this.clickAndWaitForURL(page, this.languagesNavItemLink);
   }
 
   /**
@@ -51,6 +51,6 @@ export default class LocalizationBasePage extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToSubTabCurrencies(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.currenciesNavItemLink);
+    await this.clickAndWaitForURL(page, this.currenciesNavItemLink);
   }
 };
diff --git a/tests/UI/pages/BO/international/locations/add.ts b/tests/UI/pages/BO/international/locations/add.ts
index 54cb4f6441246..f1790ebec9706 100644
--- a/tests/UI/pages/BO/international/locations/add.ts
+++ b/tests/UI/pages/BO/international/locations/add.ts
@@ -50,7 +50,7 @@ class AddZone extends BOBasePage {
     await this.setChecked(page, this.statusToggle(zoneData.status ? 1 : 0));
 
     // Save zone
-    await this.clickAndWaitForNavigation(page, this.saveZoneButton);
+    await this.clickAndWaitForURL(page, this.saveZoneButton);
 
     // Return successful message
     return this.getAlertSuccessBlockParagraphContent(page);
diff --git a/tests/UI/pages/BO/international/locations/countries/add.ts b/tests/UI/pages/BO/international/locations/countries/add.ts
index a985488a77e40..9322afe08d376 100644
--- a/tests/UI/pages/BO/international/locations/countries/add.ts
+++ b/tests/UI/pages/BO/international/locations/countries/add.ts
@@ -97,7 +97,7 @@ class AddCountry extends BOBasePage {
     );
     await this.setChecked(page, this.displayTaxLabel(countryData.displayTaxNumber ? 'on' : 'off'));
     // Save country
-    await this.clickAndWaitForNavigation(page, this.saveCountryButton);
+    await this.clickAndWaitForURL(page, this.saveCountryButton);
 
     return this.getTextContent(page, this.alertBlock);
   }
diff --git a/tests/UI/pages/BO/international/locations/countries/index.ts b/tests/UI/pages/BO/international/locations/countries/index.ts
index 22b0848731c0e..267abc5106164 100644
--- a/tests/UI/pages/BO/international/locations/countries/index.ts
+++ b/tests/UI/pages/BO/international/locations/countries/index.ts
@@ -174,7 +174,7 @@ class Countries extends BOBasePage {
    * @returns {Promise<void>}
    */
   async goToAddNewCountryPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.addNewCountryButton);
+    await this.clickAndWaitForURL(page, this.addNewCountryButton);
   }
 
   /**
@@ -184,7 +184,7 @@ class Countries extends BOBasePage {
    */
   async resetFilter(page: Page): Promise<void> {
     if (!(await this.elementNotVisible(page, this.filterResetButton, 2000))) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+      await this.clickAndWaitForURL(page, this.filterResetButton);
     }
     await this.waitForVisibleSelector(page, this.filterSearchButton, 2000);
   }
@@ -215,7 +215,7 @@ class Countries extends BOBasePage {
    * @returns {Promise<void>}
    */
   async goToEditCountryPage(page: Page, row: number = 1): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.editRowLink(row));
+    await this.clickAndWaitForURL(page, this.editRowLink(row));
   }
 
   /**
@@ -265,12 +265,13 @@ class Countries extends BOBasePage {
    * @returns {Promise<void>}
    */
   async filterTable(page: Page, filterType: string, filterBy: string, value: string): Promise<void> {
+    const currentUrl: string = page.url();
     let textValue: string = value;
 
     switch (filterType) {
       case 'input':
         await this.setValue(page, this.filterColumn(filterBy), value);
-        await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+        await this.clickAndWaitForURL(page, this.filterSearchButton);
         break;
 
       case 'select':
@@ -279,7 +280,7 @@ class Countries extends BOBasePage {
         }
         await Promise.all([
           this.selectByVisibleText(page, this.filterColumn(filterBy), textValue),
-          page.waitForNavigation({waitUntil: 'networkidle'}),
+          page.waitForURL((url: URL): boolean => url.toString() !== currentUrl, {waitUntil: 'networkidle'}),
         ]);
 
         break;
@@ -308,7 +309,7 @@ class Countries extends BOBasePage {
    */
   async setCountryStatus(page: Page, row: number, wantedStatus: boolean): Promise<void> {
     if (wantedStatus !== await this.getCountryStatus(page, row)) {
-      await this.clickAndWaitForNavigation(page, this.tableColumnStatusLink(row));
+      await page.click(this.tableColumnStatusLink(row));
     }
   }
 
@@ -365,7 +366,7 @@ class Countries extends BOBasePage {
     await page.click(this.bulkActionMenuButton);
 
     // Click on delete
-    await this.clickAndWaitForNavigation(page, this.bulkDeleteLink);
+    await this.clickAndWaitForURL(page, this.bulkDeleteLink);
     return this.getAlertSuccessBlockContent(page);
   }
 
@@ -385,7 +386,7 @@ class Countries extends BOBasePage {
       this.waitForVisibleSelector(page, this.bulkEnableLink),
     ]);
 
-    await this.clickAndWaitForNavigation(
+    await this.clickAndWaitForURL(
       page,
       wantedStatus ? this.bulkEnableLink : this.bulkDisableLink,
     );
@@ -429,7 +430,7 @@ class Countries extends BOBasePage {
     }
 
     const sortColumnButton = `${columnSelector} i.icon-caret-${sortDirection}`;
-    await this.clickAndWaitForNavigation(page, sortColumnButton);
+    await this.clickAndWaitForURL(page, sortColumnButton);
   }
 
   /* Pagination methods */
@@ -450,7 +451,7 @@ class Countries extends BOBasePage {
    */
   async selectPaginationLimit(page: Page, number: number): Promise<string> {
     await this.waitForSelectorAndClick(page, this.paginationDropdownButton);
-    await this.clickAndWaitForNavigation(page, this.paginationItems(number));
+    await this.clickAndWaitForURL(page, this.paginationItems(number));
 
     return this.getPaginationLabel(page);
   }
@@ -461,7 +462,7 @@ class Countries extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationNext(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink);
+    await this.clickAndWaitForURL(page, this.paginationNextLink);
 
     return this.getPaginationLabel(page);
   }
@@ -472,7 +473,7 @@ class Countries extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationPrevious(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink);
+    await this.clickAndWaitForURL(page, this.paginationPreviousLink);
 
     return this.getPaginationLabel(page);
   }
@@ -486,7 +487,8 @@ class Countries extends BOBasePage {
    */
   async setCountriesRestrictions(page: Page, toEnable: boolean = true): Promise<string> {
     await this.setChecked(page, this.enableRestrictCountriesToggleLabel(toEnable ? 'on' : 'off'));
-    await this.clickAndWaitForNavigation(page, this.saveButton);
+    await page.click(this.saveButton);
+    await this.elementNotVisible(page, this.enableRestrictCountriesToggleLabel(!toEnable ? 'on' : 'off'));
 
     return this.getAlertSuccessBlockContent(page);
   }
diff --git a/tests/UI/pages/BO/international/locations/index.ts b/tests/UI/pages/BO/international/locations/index.ts
index 4e5acbbeafff2..bcddbc1433ec0 100644
--- a/tests/UI/pages/BO/international/locations/index.ts
+++ b/tests/UI/pages/BO/international/locations/index.ts
@@ -141,7 +141,7 @@ class Zones extends BOBasePage {
    * @returns {Promise<void>}
    */
   async goToSubTabCountries(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.countriesSubTab);
+    await this.clickAndWaitForURL(page, this.countriesSubTab);
   }
 
   /**
@@ -150,7 +150,7 @@ class Zones extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToSubTabStates(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.statesSubTab);
+    await this.clickAndWaitForURL(page, this.statesSubTab);
   }
 
   /**
@@ -159,7 +159,7 @@ class Zones extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToAddNewZonePage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.addNewZoneLink);
+    await this.clickAndWaitForURL(page, this.addNewZoneLink);
   }
 
   /* Filter Methods */
@@ -169,8 +169,9 @@ class Zones extends BOBasePage {
    * @return {Promise<void>}
    */
   async resetFilter(page: Page): Promise<void> {
-    if (!(await this.elementNotVisible(page, this.resetFilterButton, 2000))) {
-      await this.clickAndWaitForNavigation(page, this.resetFilterButton);
+    if (await this.elementVisible(page, this.resetFilterButton, 2000)) {
+      await page.click(this.resetFilterButton);
+      await this.elementNotVisible(page, this.resetFilterButton, 2000);
     }
     await this.waitForVisibleSelector(page, this.searchFilterButton, 2000);
   }
@@ -217,7 +218,7 @@ class Zones extends BOBasePage {
         throw new Error(`Filter ${filterBy} was not found`);
     }
     // click on search
-    await this.clickAndWaitForNavigation(page, this.searchFilterButton);
+    await this.clickAndWaitForURL(page, this.searchFilterButton);
   }
 
   /* Column methods */
@@ -259,7 +260,7 @@ class Zones extends BOBasePage {
    */
   async setZoneStatus(page: Page, row: number, wantedStatus: boolean): Promise<boolean> {
     if (wantedStatus !== await this.getZoneStatus(page, row)) {
-      await this.clickAndWaitForNavigation(page, this.zonesGridStatusColumn(row));
+      await page.click(this.zonesGridStatusColumn(row));
       return true;
     }
 
@@ -273,7 +274,7 @@ class Zones extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToEditZonePage(page: Page, row: number): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.zonesGridColumnEditLink(row));
+    await this.clickAndWaitForURL(page, this.zonesGridColumnEditLink(row));
   }
 
   /**
@@ -296,7 +297,8 @@ class Zones extends BOBasePage {
       page.click(this.zonesGridDeleteLink(row)),
       this.waitForVisibleSelector(page, `${this.confirmDeleteModal}.show`),
     ]);
-    await this.clickAndWaitForNavigation(page, this.confirmDeleteButton);
+    await page.click(this.confirmDeleteButton);
+    await this.elementNotVisible(page, this.confirmDeleteModal, 2000);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
@@ -352,7 +354,8 @@ class Zones extends BOBasePage {
       page.click(this.deleteSelectionButton),
       this.waitForVisibleSelector(page, `${this.confirmDeleteModal}.show`),
     ]);
-    await this.clickAndWaitForNavigation(page, this.confirmDeleteButton);
+    await page.click(this.confirmDeleteButton);
+    await this.elementNotVisible(page, this.confirmDeleteModal, 2000);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
@@ -372,7 +375,8 @@ class Zones extends BOBasePage {
       this.waitForVisibleSelector(page, `${this.bulkActionsToggleButton}[aria-expanded='true']`),
     ]);
     // Click to change status
-    await this.clickAndWaitForNavigation(page, wantedStatus ? this.enableSelectionButton : this.disableSelectionButton);
+    await page.click(wantedStatus ? this.enableSelectionButton : this.disableSelectionButton);
+    await this.elementNotVisible(page, wantedStatus ? this.enableSelectionButton : this.disableSelectionButton, 2000);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
@@ -390,7 +394,7 @@ class Zones extends BOBasePage {
 
     let i = 0;
     while (await this.elementNotVisible(page, sortColumnDiv, 2000) && i < 2) {
-      await this.clickAndWaitForNavigation(page, sortColumnSpanButton);
+      await this.clickAndWaitForURL(page, sortColumnSpanButton);
       i += 1;
     }
 
@@ -425,7 +429,7 @@ class Zones extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationNext(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink);
+    await this.clickAndWaitForURL(page, this.paginationNextLink);
 
     return this.getPaginationLabel(page);
   }
@@ -436,7 +440,7 @@ class Zones extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationPrevious(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink);
+    await this.clickAndWaitForURL(page, this.paginationPreviousLink);
 
     return this.getPaginationLabel(page);
   }
diff --git a/tests/UI/pages/BO/international/locations/states/add.ts b/tests/UI/pages/BO/international/locations/states/add.ts
index 3e7b6245a681d..649c075cd7488 100644
--- a/tests/UI/pages/BO/international/locations/states/add.ts
+++ b/tests/UI/pages/BO/international/locations/states/add.ts
@@ -63,7 +63,7 @@ class AddState extends BOBasePage {
     await this.setChecked(page, this.statusToggle(stateData.status ? 'on' : 'off'));
 
     // Save zone
-    await this.clickAndWaitForNavigation(page, this.saveStateButton);
+    await this.clickAndWaitForURL(page, this.saveStateButton);
 
     // Return successful message
     return this.getAlertSuccessBlockContent(page);
diff --git a/tests/UI/pages/BO/international/locations/states/index.ts b/tests/UI/pages/BO/international/locations/states/index.ts
index e5bfee4dab1c4..4dfd4a605061a 100644
--- a/tests/UI/pages/BO/international/locations/states/index.ts
+++ b/tests/UI/pages/BO/international/locations/states/index.ts
@@ -175,7 +175,7 @@ class States extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToAddNewStatePage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.addNewStateLink);
+    await this.clickAndWaitForURL(page, this.addNewStateLink);
   }
 
   /* Filter Methods */
@@ -186,7 +186,7 @@ class States extends BOBasePage {
    */
   async resetFilter(page: Page): Promise<void> {
     if (!(await this.elementNotVisible(page, this.filterResetButton, 2000))) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+      await this.clickAndWaitForURL(page, this.filterResetButton);
     }
     await this.waitForVisibleSelector(page, this.filterSearchButton, 2000);
   }
@@ -220,12 +220,13 @@ class States extends BOBasePage {
    * @return {Promise<void>}
    */
   async filterStates(page: Page, filterType: string, filterBy: string, value: string): Promise<void> {
+    const currentUrl: string = page.url();
     let textValue: string = value;
 
     switch (filterType) {
       case 'input':
         await this.setValue(page, this.filterColumn(filterBy), value);
-        await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+        await this.clickAndWaitForURL(page, this.filterSearchButton);
         break;
 
       case 'select':
@@ -234,7 +235,7 @@ class States extends BOBasePage {
         }
         await Promise.all([
           this.selectByVisibleText(page, this.filterColumn(filterBy), textValue),
-          page.waitForNavigation({waitUntil: 'networkidle'}),
+          page.waitForURL((url: URL): boolean => url.toString() !== currentUrl, {waitUntil: 'networkidle'}),
         ]);
 
         break;
@@ -303,7 +304,7 @@ class States extends BOBasePage {
    */
   async setStateStatus(page: Page, row: number, wantedStatus: boolean): Promise<void> {
     if (wantedStatus !== await this.getStateStatus(page, row)) {
-      await this.clickAndWaitForNavigation(page, this.tableColumnStatusLink(row));
+      await this.clickAndWaitForURL(page, this.tableColumnStatusLink(row));
     }
   }
 
@@ -314,7 +315,7 @@ class States extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToEditStatePage(page: Page, row: number): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.columnActionsEditLink(row));
+    await this.clickAndWaitForURL(page, this.columnActionsEditLink(row));
   }
 
   /**
@@ -331,7 +332,7 @@ class States extends BOBasePage {
     await page.click(this.columnActionsDeleteLink(row));
 
     // Confirm delete in modal
-    await this.clickAndWaitForNavigation(page, this.deleteModalButtonYes);
+    await this.clickAndWaitForURL(page, this.deleteModalButtonYes);
 
     // Return successful message
     return this.getAlertSuccessBlockContent(page);
@@ -385,7 +386,7 @@ class States extends BOBasePage {
 
     // Perform delete
     await page.click(this.bulkActionMenuButton);
-    await this.clickAndWaitForNavigation(page, this.bulkDeleteLink);
+    await this.clickAndWaitForURL(page, this.bulkDeleteLink);
 
     // Return successful message
     return this.getAlertSuccessBlockContent(page);
@@ -407,7 +408,7 @@ class States extends BOBasePage {
       this.waitForVisibleSelector(page, this.bulkEnableLink),
     ]);
 
-    await this.clickAndWaitForNavigation(
+    await this.clickAndWaitForURL(
       page,
       wantedStatus ? this.bulkEnableLink : this.bulkDisableLink,
     );
@@ -451,7 +452,7 @@ class States extends BOBasePage {
     }
 
     const sortColumnButton = `${columnSelector} i.icon-caret-${sortDirection}`;
-    await this.clickAndWaitForNavigation(page, sortColumnButton);
+    await this.clickAndWaitForURL(page, sortColumnButton);
   }
 
   /* Pagination methods */
@@ -472,7 +473,7 @@ class States extends BOBasePage {
    */
   async selectPaginationLimit(page: Page, number: number): Promise<string> {
     await this.waitForSelectorAndClick(page, this.paginationDropdownButton);
-    await this.clickAndWaitForNavigation(page, this.paginationItems(number));
+    await this.clickAndWaitForURL(page, this.paginationItems(number));
 
     return this.getPaginationLabel(page);
   }
@@ -483,7 +484,7 @@ class States extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationNext(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink);
+    await this.clickAndWaitForURL(page, this.paginationNextLink);
 
     return this.getPaginationLabel(page);
   }
@@ -494,7 +495,7 @@ class States extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationPrevious(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink);
+    await this.clickAndWaitForURL(page, this.paginationPreviousLink);
 
     return this.getPaginationLabel(page);
   }
diff --git a/tests/UI/pages/BO/international/taxes/add.ts b/tests/UI/pages/BO/international/taxes/add.ts
index f8421f73da2ca..d792f443f0735 100644
--- a/tests/UI/pages/BO/international/taxes/add.ts
+++ b/tests/UI/pages/BO/international/taxes/add.ts
@@ -86,7 +86,7 @@ class AddTax extends BOBasePage {
     await this.setValue(page, this.rateInput, taxData.rate);
     await this.setChecked(page, this.statusToggleInput(taxData.enabled ? 1 : 0));
     // Save Tax
-    await this.clickAndWaitForNavigation(page, this.saveTaxButton);
+    await this.clickAndWaitForURL(page, this.saveTaxButton);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
diff --git a/tests/UI/pages/BO/international/taxes/index.ts b/tests/UI/pages/BO/international/taxes/index.ts
index 824a95b6391a3..10da940002072 100644
--- a/tests/UI/pages/BO/international/taxes/index.ts
+++ b/tests/UI/pages/BO/international/taxes/index.ts
@@ -161,7 +161,8 @@ class Taxes extends BOBasePage {
    */
   async resetFilter(page: Page): Promise<void> {
     if (await this.elementVisible(page, this.resetFilterButton, 2000)) {
-      await this.clickAndWaitForNavigation(page, this.resetFilterButton);
+      await page.click(this.resetFilterButton);
+      await this.elementNotVisible(page, this.resetFilterButton, 2000);
     }
   }
 
@@ -205,7 +206,7 @@ class Taxes extends BOBasePage {
       // Do nothing
     }
     // click on search
-    await this.clickAndWaitForNavigation(page, this.searchFilterButton);
+    await this.clickAndWaitForURL(page, this.searchFilterButton);
   }
 
   /**
@@ -235,7 +236,7 @@ class Taxes extends BOBasePage {
    */
   async setStatus(page: Page, row: number, valueWanted: boolean = true): Promise<boolean> {
     if (await this.getStatus(page, row) !== valueWanted) {
-      await this.clickAndWaitForNavigation(page, this.taxesGridStatusColumn(row));
+      await page.click(this.taxesGridStatusColumn(row));
       return true;
     }
 
@@ -277,7 +278,7 @@ class Taxes extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToAddNewTaxPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.addNewTaxLink);
+    await this.clickAndWaitForURL(page, this.addNewTaxLink);
   }
 
   /**
@@ -287,7 +288,7 @@ class Taxes extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToEditTaxPage(page: Page, row: number): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.taxesGridColumnEditLink(row));
+    await this.clickAndWaitForURL(page, this.taxesGridColumnEditLink(row));
   }
 
   /**
@@ -332,7 +333,9 @@ class Taxes extends BOBasePage {
       this.waitForVisibleSelector(page, `${this.bulkActionsToggleButton}[aria-expanded='true']`),
     ]);
     // Click to change status
-    await this.clickAndWaitForNavigation(page, enable ? this.enableSelectionButton : this.disableSelectionButton);
+    await page.click(enable ? this.enableSelectionButton : this.disableSelectionButton);
+    await this.elementNotVisible(page, enable ? this.enableSelectionButton : this.disableSelectionButton);
+
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -367,7 +370,7 @@ class Taxes extends BOBasePage {
    * @return {Promise<void>}
    */
   async confirmDeleteTaxes(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.confirmDeleteButton);
+    await this.clickAndWaitForURL(page, this.confirmDeleteButton);
   }
 
   /**
@@ -391,7 +394,7 @@ class Taxes extends BOBasePage {
     }
 
     // Click on save tax Option
-    await this.clickAndWaitForNavigation(page, this.saveTaxOptionButton);
+    await page.click(this.saveTaxOptionButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -405,7 +408,9 @@ class Taxes extends BOBasePage {
     await this.setChecked(page, this.useEcoTaxToggleInput(enableEcoTax ? 1 : 0));
 
     // Click on save tax Option
-    await this.clickAndWaitForNavigation(page, this.saveTaxOptionButton);
+    await page.click(this.saveTaxOptionButton);
+    await this.elementNotVisible(page, this.useEcoTaxToggleInput(!enableEcoTax ? 1 : 0));
+
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -415,7 +420,7 @@ class Taxes extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToTaxRulesPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.taxRulesSubTab);
+    await this.clickAndWaitForURL(page, this.taxRulesSubTab);
   }
 
   /* Sort functions */
@@ -432,7 +437,7 @@ class Taxes extends BOBasePage {
 
     let i = 0;
     while (await this.elementNotVisible(page, sortColumnDiv, 2000) && i < 2) {
-      await this.clickAndWaitForNavigation(page, sortColumnSpanButton);
+      await this.clickAndWaitForURL(page, sortColumnSpanButton);
       i += 1;
     }
 
@@ -467,7 +472,7 @@ class Taxes extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationNext(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink);
+    await this.clickAndWaitForURL(page, this.paginationNextLink);
 
     return this.getPaginationLabel(page);
   }
@@ -478,7 +483,7 @@ class Taxes extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationPrevious(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink);
+    await this.clickAndWaitForURL(page, this.paginationPreviousLink);
 
     return this.getPaginationLabel(page);
   }
diff --git a/tests/UI/pages/BO/international/taxes/taxRules/add.ts b/tests/UI/pages/BO/international/taxes/taxRules/add.ts
index 57e8716ea080d..e68486a8609f0 100644
--- a/tests/UI/pages/BO/international/taxes/taxRules/add.ts
+++ b/tests/UI/pages/BO/international/taxes/taxRules/add.ts
@@ -80,7 +80,7 @@ class AddTaxRules extends BOBasePage {
     await this.setValue(page, this.nameInput, taxRuleGroupData.name);
     await this.setChecked(page, this.statusInput(taxRuleGroupData.enabled ? 'on' : 'off'));
     // Save Tax rules group
-    await this.clickAndWaitForNavigation(page, this.saveTaxButton);
+    await this.clickAndWaitForURL(page, this.saveTaxButton);
 
     return this.getAlertSuccessBlockContent(page);
   }
@@ -97,7 +97,7 @@ class AddTaxRules extends BOBasePage {
     await this.selectByVisibleText(page, this.taxSelect, taxRuleData.name);
     await this.setValue(page, this.descriptionInput, taxRuleData.description);
     // Save Tax rules
-    await this.clickAndWaitForNavigation(page, this.saveAndStayButton);
+    await page.click(this.saveAndStayButton);
 
     return this.getAlertSuccessBlockContent(page);
   }
diff --git a/tests/UI/pages/BO/international/taxes/taxRules/index.ts b/tests/UI/pages/BO/international/taxes/taxRules/index.ts
index 16a242c037da3..2f36e229fa94d 100644
--- a/tests/UI/pages/BO/international/taxes/taxRules/index.ts
+++ b/tests/UI/pages/BO/international/taxes/taxRules/index.ts
@@ -162,7 +162,7 @@ class TaxRules extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToAddNewTaxRulesGroupPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.addNewTaxRulesGroupLink);
+    await this.clickAndWaitForURL(page, this.addNewTaxRulesGroupLink);
   }
 
   /**
@@ -172,7 +172,7 @@ class TaxRules extends BOBasePage {
    * @returns {Promise<void>}
    */
   async goToEditTaxRulePage(page: Page, row: number = 1): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.editRowLink(row));
+    await this.clickAndWaitForURL(page, this.editRowLink(row));
   }
 
   /**
@@ -182,7 +182,7 @@ class TaxRules extends BOBasePage {
    */
   async resetFilter(page: Page): Promise<void> {
     if (!(await this.elementNotVisible(page, this.filterResetButton, 2000))) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+      await this.clickAndWaitForURL(page, this.filterResetButton);
     }
     await this.waitForVisibleSelector(page, this.filterSearchButton, 2000);
   }
@@ -261,7 +261,8 @@ class TaxRules extends BOBasePage {
         throw new Error(`Filter ${filterBy} was not found`);
     }
     // click on search
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await page.click(this.filterSearchButton);
+    await this.elementVisible(page, this.filterResetButton, 2000);
   }
 
   /**
@@ -274,9 +275,9 @@ class TaxRules extends BOBasePage {
     // Click on dropDown
     await page.click(this.toggleDropDown(row));
     // Click on delete
-    await this.clickAndWaitForNavigation(page, this.deleteRowLink(row));
+    await this.clickAndWaitForURL(page, this.deleteRowLink(row));
     // Confirm delete action
-    await this.clickAndWaitForNavigation(page, this.deleteModalButtonYes);
+    await this.clickAndWaitForURL(page, this.deleteModalButtonYes);
 
     // Get successful message
     return this.getAlertSuccessBlockContent(page);
@@ -325,7 +326,7 @@ class TaxRules extends BOBasePage {
     }
 
     const sortColumnButton = `${columnSelector} i.icon-caret-${sortDirection}`;
-    await this.clickAndWaitForNavigation(page, sortColumnButton);
+    await this.clickAndWaitForURL(page, sortColumnButton);
   }
 
   /* Pagination methods */
@@ -346,7 +347,7 @@ class TaxRules extends BOBasePage {
    */
   async selectPaginationLimit(page: Page, number: number): Promise<string> {
     await this.waitForSelectorAndClick(page, this.paginationDropdownButton);
-    await this.clickAndWaitForNavigation(page, this.paginationItems(number));
+    await this.clickAndWaitForURL(page, this.paginationItems(number));
 
     return this.getPaginationLabel(page);
   }
@@ -357,7 +358,7 @@ class TaxRules extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationNext(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink);
+    await this.clickAndWaitForURL(page, this.paginationNextLink);
 
     return this.getPaginationLabel(page);
   }
@@ -368,7 +369,7 @@ class TaxRules extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationPrevious(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink);
+    await this.clickAndWaitForURL(page, this.paginationPreviousLink);
 
     return this.getPaginationLabel(page);
   }
@@ -402,7 +403,7 @@ class TaxRules extends BOBasePage {
     await page.click(this.bulkActionMenuButton);
 
     // Click on delete
-    await this.clickAndWaitForNavigation(page, this.bulkDeleteLink);
+    await this.clickAndWaitForURL(page, this.bulkDeleteLink);
 
     return this.getAlertSuccessBlockContent(page);
   }
@@ -421,7 +422,7 @@ class TaxRules extends BOBasePage {
     await page.click(this.bulkActionMenuButton);
 
     // Click to change status
-    await this.clickAndWaitForNavigation(page, enable ? this.bulkEnableLink : this.bulkDisableLink);
+    await this.clickAndWaitForURL(page, enable ? this.bulkEnableLink : this.bulkDisableLink);
 
     return this.getTextContent(page, this.alertSuccessBlock);
   }
@@ -447,10 +448,8 @@ class TaxRules extends BOBasePage {
    */
   async setStatus(page: Page, row: number, valueWanted: boolean = true): Promise<boolean> {
     if (await this.getStatus(page, row) !== valueWanted) {
-      await Promise.all([
-        page.$eval(`${this.tableColumnActive(row)} i`, (el: HTMLElement) => el.click()),
-        page.waitForNavigation({waitUntil: 'networkidle'}),
-      ]);
+      await page.$eval(`${this.tableColumnActive(row)} i`, (el: HTMLElement) => el.click());
+
       return true;
     }
     return false;
diff --git a/tests/UI/pages/BO/international/translations/index.ts b/tests/UI/pages/BO/international/translations/index.ts
index 34b7ecb1aa871..97e8d0232ae84 100644
--- a/tests/UI/pages/BO/international/translations/index.ts
+++ b/tests/UI/pages/BO/international/translations/index.ts
@@ -119,7 +119,7 @@ class Translations extends BOBasePage {
     await this.selectByVisibleText(page, this.typeOfTranslationSelect, translation);
     await this.selectByVisibleText(page, this.selectYourThemeSelect, theme);
     await this.selectByVisibleText(page, this.selectYourLanguageSelect, language);
-    await this.clickAndWaitForNavigation(page, this.modifyTranslationsButton);
+    await this.clickAndWaitForURL(page, this.modifyTranslationsButton);
   }
 
   /**
diff --git a/tests/UI/pages/BO/login/index.ts b/tests/UI/pages/BO/login/index.ts
index c1b344c55aa81..92c3002141e9d 100644
--- a/tests/UI/pages/BO/login/index.ts
+++ b/tests/UI/pages/BO/login/index.ts
@@ -100,7 +100,7 @@ class Login extends BOBasePage {
   async clickOnLoginButton(page: Page, waitForNavigation: boolean): Promise<void> {
     // Wait for navigation if the login is successful
     if (waitForNavigation) {
-      await this.clickAndWaitForNavigation(page, this.submitLoginButton);
+      await this.clickAndWaitForURL(page, this.submitLoginButton);
     } else {
       await page.click(this.submitLoginButton);
     }
diff --git a/tests/UI/pages/BO/modules/keycloakConnectorDemo/index.ts b/tests/UI/pages/BO/modules/keycloakConnectorDemo/index.ts
index 3dceed66bd772..fd2f7c6b6cafc 100644
--- a/tests/UI/pages/BO/modules/keycloakConnectorDemo/index.ts
+++ b/tests/UI/pages/BO/modules/keycloakConnectorDemo/index.ts
@@ -39,7 +39,7 @@ class KeycloakConnectorDemo extends ModuleConfiguration {
   async setKeycloakEndpoint(page: Page, endpoint: string): Promise<string> {
     await page.fill(this.formKeycloakEndpoint, endpoint);
 
-    await this.clickAndWaitForNavigation(page, this.formKeycloakButtonSubmit);
+    await this.clickAndWaitForLoadState(page, this.formKeycloakButtonSubmit);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
diff --git a/tests/UI/pages/BO/modules/productComments/index.ts b/tests/UI/pages/BO/modules/productComments/index.ts
index db600cdcaaa65..c39830399f26a 100755
--- a/tests/UI/pages/BO/modules/productComments/index.ts
+++ b/tests/UI/pages/BO/modules/productComments/index.ts
@@ -170,7 +170,7 @@ class ProductComments extends ModuleConfiguration {
   * @returns {Promise<void>}
   */
   async approveReview(page: Page, row: number = 1): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.approveWaitingReviewButton('waiting-approval', row));
+    await this.clickAndWaitForURL(page, this.approveWaitingReviewButton('waiting-approval', row));
   }
 
   /**
@@ -182,7 +182,7 @@ class ProductComments extends ModuleConfiguration {
    */
   async deleteReview(page: Page, table: string, row: number = 1): Promise<void> {
     await page.click(this.deleteReviewButton(table, row));
-    await this.clickAndWaitForNavigation(page, this.confirmReviewDeletionButton);
+    await this.clickAndWaitForURL(page, this.confirmReviewDeletionButton);
   }
 
   /**
diff --git a/tests/UI/pages/BO/orders/add.ts b/tests/UI/pages/BO/orders/add.ts
index f3f62e979d9a8..9f311a790f2c5 100644
--- a/tests/UI/pages/BO/orders/add.ts
+++ b/tests/UI/pages/BO/orders/add.ts
@@ -1200,7 +1200,7 @@ class AddOrder extends BOBasePage {
    */
   async clickOnCreateOrderButton(page: Page, waitForNavigation: boolean = true): Promise<boolean> {
     if (waitForNavigation) {
-      await this.clickAndWaitForNavigation(page, this.createOrderButton);
+      await this.clickAndWaitForURL(page, this.createOrderButton);
     } else {
       await this.waitForSelectorAndClick(page, this.createOrderButton);
     }
@@ -1260,7 +1260,7 @@ class AddOrder extends BOBasePage {
     await this.setOrderStatus(page, orderToMake.status);
 
     // Create the order
-    await this.clickAndWaitForNavigation(page, this.createOrderButton);
+    await this.clickAndWaitForURL(page, this.createOrderButton);
   }
 }
 
diff --git a/tests/UI/pages/BO/orders/creditSlips/index.ts b/tests/UI/pages/BO/orders/creditSlips/index.ts
index 83626e8c191eb..caf0937c5e3f5 100644
--- a/tests/UI/pages/BO/orders/creditSlips/index.ts
+++ b/tests/UI/pages/BO/orders/creditSlips/index.ts
@@ -130,7 +130,8 @@ class CreditSlips extends BOBasePage {
    */
   async resetFilter(page: Page): Promise<void> {
     if (await this.elementVisible(page, this.filterResetButton, 2000)) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+      await this.clickAndWaitForLoadState(page, this.filterResetButton);
+      await this.elementNotVisible(page, this.filterResetButton, 2000);
     }
   }
 
@@ -163,7 +164,7 @@ class CreditSlips extends BOBasePage {
   async filterCreditSlips(page: Page, filterBy: string, value: string = ''): Promise<void> {
     await this.setValue(page, this.creditSlipsFilterColumnInput(filterBy), value.toString());
     // click on search
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await this.clickAndWaitForURL(page, this.filterSearchButton);
   }
 
   /**
@@ -177,7 +178,7 @@ class CreditSlips extends BOBasePage {
     await page.type(this.creditSlipsFilterColumnInput('date_issued_from'), dateFrom);
     await page.type(this.creditSlipsFilterColumnInput('date_issued_to'), dateTo);
     // click on search
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await this.clickAndWaitForURL(page, this.filterSearchButton);
   }
 
   /**
@@ -274,7 +275,7 @@ class CreditSlips extends BOBasePage {
    * @returns {Promise<string>}
    */
   async saveCreditSlipOptions(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.saveCreditSlipOptionsButton);
+    await page.click(this.saveCreditSlipOptionsButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -292,7 +293,7 @@ class CreditSlips extends BOBasePage {
 
     let i = 0;
     while (await this.elementNotVisible(page, sortColumnDiv, 2000) && i < 2) {
-      await this.clickAndWaitForNavigation(page, sortColumnSpanButton);
+      await this.clickAndWaitForURL(page, sortColumnSpanButton);
       i += 1;
     }
 
@@ -335,9 +336,11 @@ class CreditSlips extends BOBasePage {
    * @returns {Promise<string>}
    */
   async selectPaginationLimit(page: Page, number: number): Promise<string> {
+    const currentUrl: string = page.url();
+
     await Promise.all([
       this.selectByVisibleText(page, this.paginationLimitSelect, number),
-      page.waitForNavigation({waitUntil: 'networkidle'}),
+      page.waitForURL((url: URL): boolean => url.toString() !== currentUrl, {waitUntil: 'networkidle'}),
     ]);
 
     return this.getPaginationLabel(page);
@@ -349,7 +352,7 @@ class CreditSlips extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationNext(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink);
+    await this.clickAndWaitForURL(page, this.paginationNextLink);
 
     return this.getPaginationLabel(page);
   }
@@ -360,7 +363,7 @@ class CreditSlips extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationPrevious(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink);
+    await this.clickAndWaitForURL(page, this.paginationPreviousLink);
 
     return this.getPaginationLabel(page);
   }
diff --git a/tests/UI/pages/BO/orders/deliverySlips/index.ts b/tests/UI/pages/BO/orders/deliverySlips/index.ts
index a4e77a9b6e11e..32d77430b985b 100644
--- a/tests/UI/pages/BO/orders/deliverySlips/index.ts
+++ b/tests/UI/pages/BO/orders/deliverySlips/index.ts
@@ -136,7 +136,7 @@ class DeliverySlips extends BOBasePage {
    * @returns {Promise<string>}
    */
   async saveDeliverySlipOptions(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.saveDeliverySlipOptionsButton);
+    await page.click(this.saveDeliverySlipOptionsButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 }
diff --git a/tests/UI/pages/BO/orders/index.ts b/tests/UI/pages/BO/orders/index.ts
index ed721eb0f695e..3cd11299e8a62 100644
--- a/tests/UI/pages/BO/orders/index.ts
+++ b/tests/UI/pages/BO/orders/index.ts
@@ -200,7 +200,7 @@ class Order extends BOBasePage {
    * @returns {Promise<void>}
    */
   async goToCreateOrderPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.createNewOrderButton);
+    await this.clickAndWaitForURL(page, this.createNewOrderButton);
   }
 
   /**
@@ -243,21 +243,22 @@ class Order extends BOBasePage {
       // Do nothing
     }
     // click on search
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await page.locator(this.filterSearchButton).click();
+    await page.waitForURL(`**/?order**filters**${filterBy}**`, {waitUntil: 'domcontentloaded'});
   }
 
   /**
    * Filter orders by date from and date to
    * @param page {Page} Browser tab
    * @param dateFrom {string} Date from to filter with
-   * @param dateTo {string} Date to to filter with
+   * @param dateTo {string} Date to filter with
    * @returns {Promise<void>}
    */
   async filterOrdersByDate(page: Page, dateFrom: string, dateTo: string): Promise<void> {
     await page.type(this.filterColumn('date_add_from'), dateFrom);
     await page.type(this.filterColumn('date_add_to'), dateTo);
     // click on search
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await this.clickAndWaitForURL(page, this.filterSearchButton);
   }
 
   /**
@@ -266,8 +267,15 @@ class Order extends BOBasePage {
    * @returns {Promise<void>}
    */
   async resetFilter(page: Page): Promise<void> {
-    if (!(await this.elementNotVisible(page, this.filterResetButton, 2000))) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+    if (await this.elementVisible(page, this.filterResetButton, 2000)) {
+      const currentUrl: string = page.url();
+
+      if (currentUrl.indexOf('filters') === -1) {
+        await page.locator(this.filterResetButton).click();
+        await page.waitForResponse(async (response) => response.url().indexOf('common/reset_search/order') !== -1);
+      } else {
+        await this.clickAndWaitForURL(page, this.filterResetButton);
+      }
     }
   }
 
@@ -297,7 +305,7 @@ class Order extends BOBasePage {
    * @returns {Promise<void>}
    */
   async goToOrder(page: Page, orderRow: number): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.viewRowLink(orderRow));
+    await this.clickAndWaitForURL(page, this.viewRowLink(orderRow));
   }
 
   /**
@@ -411,7 +419,9 @@ class Order extends BOBasePage {
       page.click(this.updateStatusInTableButton(row)),
       this.waitForVisibleSelector(page, `${this.updateStatusInTableDropdown(row)}.show`),
     ]);
-    await this.clickAndWaitForNavigation(page, this.updateStatusInTableDropdownChoice(row, status.id));
+    await page.click(this.updateStatusInTableDropdownChoice(row, status.id));
+    await this.elementNotVisible(page, this.updateStatusInTableDropdownChoice(row, status.id), 2000);
+
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -547,7 +557,7 @@ class Order extends BOBasePage {
 
     // Select new orders status in modal and confirm update
     await this.selectByVisibleText(page, this.updateOrdersStatusModalSelect, status);
-    await this.clickAndWaitForNavigation(page, this.updateOrdersStatusModalButton);
+    await page.click(this.updateOrdersStatusModalButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -565,7 +575,7 @@ class Order extends BOBasePage {
 
     let i = 0;
     while (await this.elementNotVisible(page, sortColumnDiv, 2000) && i < 2) {
-      await this.clickAndWaitForNavigation(page, sortColumnSpanButton);
+      await this.clickAndWaitForURL(page, sortColumnSpanButton);
       i += 1;
     }
 
@@ -589,9 +599,11 @@ class Order extends BOBasePage {
    * @returns {Promise<string>}
    */
   async selectPaginationLimit(page: Page, number: number): Promise<string> {
+    const currentUrl: string = page.url();
+
     await Promise.all([
       this.selectByVisibleText(page, this.paginationLimitSelect, number),
-      page.waitForNavigation({waitUntil: 'networkidle'}),
+      page.waitForURL((url: URL): boolean => url.toString() !== currentUrl, {waitUntil: 'networkidle'}),
     ]);
 
     return this.getPaginationLabel(page);
@@ -603,7 +615,7 @@ class Order extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationNext(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink);
+    await this.clickAndWaitForURL(page, this.paginationNextLink);
 
     return this.getPaginationLabel(page);
   }
@@ -614,7 +626,7 @@ class Order extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationPrevious(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink);
+    await this.clickAndWaitForURL(page, this.paginationPreviousLink);
 
     return this.getPaginationLabel(page);
   }
@@ -696,7 +708,7 @@ class Order extends BOBasePage {
    * @returns {Promise<void>}
    */
   async openOrderDetails(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.previewOrderButton);
+    await this.clickAndWaitForURL(page, this.previewOrderButton);
   }
 }
 
diff --git a/tests/UI/pages/BO/orders/invoices/index.ts b/tests/UI/pages/BO/orders/invoices/index.ts
index 67ffe5e56cdf2..41baac840a3ce 100644
--- a/tests/UI/pages/BO/orders/invoices/index.ts
+++ b/tests/UI/pages/BO/orders/invoices/index.ts
@@ -191,7 +191,7 @@ class Invoice extends BOBasePage {
    * @returns {Promise<string>}
    */
   async saveInvoiceOptions(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.saveInvoiceOptionsButton);
+    await page.click(this.saveInvoiceOptionsButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
diff --git a/tests/UI/pages/BO/orders/shoppingCarts/index.ts b/tests/UI/pages/BO/orders/shoppingCarts/index.ts
index 4985f03fc37a6..cc370185ba707 100644
--- a/tests/UI/pages/BO/orders/shoppingCarts/index.ts
+++ b/tests/UI/pages/BO/orders/shoppingCarts/index.ts
@@ -223,7 +223,7 @@ class ShoppingCarts extends BOBasePage {
    */
   async resetFilter(page: Page): Promise<void> {
     if (!(await this.elementNotVisible(page, this.filterResetButton, 2000))) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+      await this.clickAndWaitForURL(page, this.filterResetButton);
     }
     await this.waitForVisibleSelector(page, this.filterSearchButton, 2000);
   }
@@ -247,15 +247,18 @@ class ShoppingCarts extends BOBasePage {
    * @returns {Promise<void>}
    */
   async filterTable(page: Page, filterType: string, filterBy: string, value: string): Promise<void> {
+    const currentUrl: string = page.url();
+
     switch (filterType) {
       case 'input':
         await this.setValue(page, this.filterColumn(filterBy), value);
-        await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+        await page.click(this.filterSearchButton);
+        await this.elementVisible(page, this.filterResetButton);
         break;
 
       case 'select':
         await Promise.all([
-          page.waitForNavigation({waitUntil: 'networkidle'}),
+          page.waitForURL((url: URL): boolean => url.toString() !== currentUrl, {waitUntil: 'networkidle'}),
           this.selectByVisibleText(page, this.filterColumn(filterBy), value === '1' ? 'Yes' : 'No'),
         ]);
         break;
@@ -276,7 +279,7 @@ class ShoppingCarts extends BOBasePage {
     await page.type(this.filterDateFromColumn, dateFrom);
     await page.type(this.filterDateToColumn, dateTo);
     // click on search
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await this.clickAndWaitForURL(page, this.filterSearchButton);
   }
 
   /* Column methods */
@@ -372,7 +375,7 @@ class ShoppingCarts extends BOBasePage {
       this.waitForVisibleSelector(page, this.bulkDeleteLink),
     ]);
 
-    await this.clickAndWaitForNavigation(page, this.bulkDeleteLink);
+    await this.clickAndWaitForURL(page, this.bulkDeleteLink);
 
     // Return successful message
     return this.getAlertSuccessBlockParagraphContent(page);
@@ -406,7 +409,7 @@ class ShoppingCarts extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationNext(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink);
+    await this.clickAndWaitForURL(page, this.paginationNextLink);
     return this.getPaginationLabel(page);
   }
 
@@ -416,7 +419,7 @@ class ShoppingCarts extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationPrevious(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink);
+    await this.clickAndWaitForURL(page, this.paginationPreviousLink);
     return this.getPaginationLabel(page);
   }
 
@@ -461,7 +464,7 @@ class ShoppingCarts extends BOBasePage {
     }
 
     const sortColumnButton = `${columnSelector} i.icon-caret-${sortDirection}`;
-    await this.clickAndWaitForNavigation(page, sortColumnButton);
+    await this.clickAndWaitForURL(page, sortColumnButton);
   }
 
   /**
@@ -471,7 +474,7 @@ class ShoppingCarts extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToViewPage(page: Page, row: number): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.tableColumnActionsViewLink(row));
+    await this.clickAndWaitForURL(page, this.tableColumnActionsViewLink(row));
   }
 }
 
diff --git a/tests/UI/pages/BO/orders/shoppingCarts/view.ts b/tests/UI/pages/BO/orders/shoppingCarts/view.ts
index 99b121aeafa5d..851f672e5b53c 100644
--- a/tests/UI/pages/BO/orders/shoppingCarts/view.ts
+++ b/tests/UI/pages/BO/orders/shoppingCarts/view.ts
@@ -182,7 +182,7 @@ class ViewShoppingCarts extends BOBasePage {
    * @returns {Promise<void>}
    */
   async createOrderFromThisCart(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.orderInformationButtonCreateOrder);
+    await this.clickAndWaitForURL(page, this.orderInformationButtonCreateOrder);
   }
 
   /**
@@ -191,7 +191,7 @@ class ViewShoppingCarts extends BOBasePage {
    * @returns {Promise<void>}
    */
   async goToOrderPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.orderInformationLinkOrder);
+    await this.clickAndWaitForURL(page, this.orderInformationLinkOrder);
   }
 }
 
diff --git a/tests/UI/pages/BO/orders/view/customerBlock.ts b/tests/UI/pages/BO/orders/view/customerBlock.ts
index 7361470d5a352..f1469548afea2 100644
--- a/tests/UI/pages/BO/orders/view/customerBlock.ts
+++ b/tests/UI/pages/BO/orders/view/customerBlock.ts
@@ -98,7 +98,7 @@ class CustomerBlock extends ViewOrderBasePage {
    * @returns {Promise<void>}
    */
   async goToViewFullDetails(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.ViewAllDetailsLink);
+    await this.clickAndWaitForURL(page, this.ViewAllDetailsLink);
   }
 
   /**
diff --git a/tests/UI/pages/BO/orders/view/messagesBlock.ts b/tests/UI/pages/BO/orders/view/messagesBlock.ts
index 7992e9dc57737..fd2d3564b3b0e 100644
--- a/tests/UI/pages/BO/orders/view/messagesBlock.ts
+++ b/tests/UI/pages/BO/orders/view/messagesBlock.ts
@@ -148,7 +148,7 @@ class MessagesBlock extends ViewOrderBasePage {
    * @returns {Promise<void>}
    */
   async clickOnConfigureMessageLink(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.configureLink);
+    await this.clickAndWaitForURL(page, this.configureLink);
   }
 }
 
diff --git a/tests/UI/pages/BO/orders/view/paymentBlock.ts b/tests/UI/pages/BO/orders/view/paymentBlock.ts
index 5bc8c8b4c3511..c41d68bc9db0b 100644
--- a/tests/UI/pages/BO/orders/view/paymentBlock.ts
+++ b/tests/UI/pages/BO/orders/view/paymentBlock.ts
@@ -109,7 +109,7 @@ class PaymentBlock extends ViewOrderBasePage {
       await this.selectByVisibleText(page, this.paymentInvoiceSelect, invoice);
     }
 
-    await this.clickAndWaitForNavigation(page, this.paymentAddButton);
+    await page.click(this.paymentAddButton);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
diff --git a/tests/UI/pages/BO/orders/view/productsBlock.ts b/tests/UI/pages/BO/orders/view/productsBlock.ts
index 2028e0cdb5f21..a2eb2301e4051 100644
--- a/tests/UI/pages/BO/orders/view/productsBlock.ts
+++ b/tests/UI/pages/BO/orders/view/productsBlock.ts
@@ -243,7 +243,7 @@ class ProductsBlock extends ViewOrderBasePage {
     if (shipping !== 0) {
       await this.setValue(page, this.refundShippingCost(productRow), shipping);
     }
-    await this.clickAndWaitForNavigation(page, this.partialRefundSubmitButton);
+    await this.clickAndWaitForLoadState(page, this.partialRefundSubmitButton);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
@@ -580,7 +580,8 @@ class ProductsBlock extends ViewOrderBasePage {
     await this.selectByVisibleText(page, this.addOrderCartRuleTypeSelect, discountData.type);
 
     await this.waitForVisibleSelector(page, `${this.addOrderCartRuleAddButton}:not([disabled])`);
-    await this.clickAndWaitForNavigation(page, this.addOrderCartRuleAddButton);
+    await page.click(this.addOrderCartRuleAddButton);
+    await this.waitForVisibleSelector(page, this.alertBlock);
 
     return this.getTextContent(page, this.alertBlock);
   }
diff --git a/tests/UI/pages/BO/orders/view/tabListBlock.ts b/tests/UI/pages/BO/orders/view/tabListBlock.ts
index a6ea0a645f1c1..9d9262cecf1e9 100644
--- a/tests/UI/pages/BO/orders/view/tabListBlock.ts
+++ b/tests/UI/pages/BO/orders/view/tabListBlock.ts
@@ -211,7 +211,7 @@ class TabListBlock extends ViewOrderBasePage {
    * @returns {Promise<string>}
    */
   async clickOnUpdateStatus(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.secondUpdateStatusButton);
+    await page.click(this.secondUpdateStatusButton);
 
     return this.getAlertDangerBlockParagraphContent(page);
   }
@@ -224,7 +224,7 @@ class TabListBlock extends ViewOrderBasePage {
    */
   async updateOrderStatus(page: Page, status: string): Promise<string> {
     await this.selectByVisibleText(page, this.secondOrderStatusesSelect, status);
-    await this.clickAndWaitForNavigation(page, this.secondUpdateStatusButton);
+    await page.click(this.secondUpdateStatusButton);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
@@ -322,7 +322,7 @@ class TabListBlock extends ViewOrderBasePage {
    * @param page {Page} Browser tab
    * @returns {Promise<boolean>}
    */
-  isGenerateInvoiceButtonVisible(page: Page): Promise<boolean> {
+  async isGenerateInvoiceButtonVisible(page: Page): Promise<boolean> {
     return this.elementVisible(page, this.generateInvoiceButton, 1000);
   }
 
@@ -331,7 +331,7 @@ class TabListBlock extends ViewOrderBasePage {
    * @param page {Page} Browser tab
    * @returns {Promise<number>}
    */
-  getDocumentsNumber(page: Page): Promise<number> {
+  async getDocumentsNumber(page: Page): Promise<number> {
     return this.getNumberFromText(page, `${this.documentTab} .count`);
   }
 
@@ -352,7 +352,7 @@ class TabListBlock extends ViewOrderBasePage {
    * @returns {Promise<string>}
    */
   async generateInvoice(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.generateInvoiceButton);
+    await page.click(this.generateInvoiceButton);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
@@ -559,7 +559,7 @@ class TabListBlock extends ViewOrderBasePage {
     await this.setValue(page, this.trackingNumberInput, shippingData.trackingNumber);
     await page.click(this.carrierSelect);
     await this.waitForSelectorAndClick(page, this.carrierToSelect(shippingData.carrierID));
-    await this.clickAndWaitForNavigation(page, this.updateCarrierButton);
+    await page.click(this.updateCarrierButton);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
diff --git a/tests/UI/pages/BO/orders/view/viewOrderBasePage.ts b/tests/UI/pages/BO/orders/view/viewOrderBasePage.ts
index 13bea1a8d8ecf..3358e2bfa3c37 100644
--- a/tests/UI/pages/BO/orders/view/viewOrderBasePage.ts
+++ b/tests/UI/pages/BO/orders/view/viewOrderBasePage.ts
@@ -169,7 +169,7 @@ class ViewOrderBasePage extends BOBasePage {
 
     if (status !== actualStatus) {
       await this.selectByVisibleText(page, this.orderStatusesSelect, status);
-      await this.clickAndWaitForNavigation(page, this.updateStatusButton);
+      await this.clickAndWaitForLoadState(page, this.updateStatusButton);
       return this.getOrderStatus(page);
     }
 
diff --git a/tests/UI/pages/BO/quickAccess/add.ts b/tests/UI/pages/BO/quickAccess/add.ts
index 1d463c2a0b874..b38ad799098fe 100644
--- a/tests/UI/pages/BO/quickAccess/add.ts
+++ b/tests/UI/pages/BO/quickAccess/add.ts
@@ -49,7 +49,7 @@ class AddQuickAccess extends BOBasePage {
     await this.setValue(page, this.nameInput, quickAccessLinkData.name);
     await this.setValue(page, this.urlInput, quickAccessLinkData.url);
     await this.setChecked(page, this.newWindowToggle(quickAccessLinkData.openNewWindow ? 'on' : 'off'));
-    await this.clickAndWaitForNavigation(page, this.saveButton);
+    await this.clickAndWaitForURL(page, this.saveButton);
 
     // Return successful message
     return this.getAlertSuccessBlockContent(page);
diff --git a/tests/UI/pages/BO/quickAccess/index.ts b/tests/UI/pages/BO/quickAccess/index.ts
index 6153e7bd3da17..9f33739630cfa 100644
--- a/tests/UI/pages/BO/quickAccess/index.ts
+++ b/tests/UI/pages/BO/quickAccess/index.ts
@@ -100,7 +100,7 @@ class QuickAccess extends BOBasePage {
    * @returns {Promise<void>}
    */
   async goToAddNewQuickAccessPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.addNewQuickAccessButton);
+    await this.clickAndWaitForURL(page, this.addNewQuickAccessButton);
   }
 
   /**
@@ -146,15 +146,17 @@ class QuickAccess extends BOBasePage {
    * @return {Promise<void>}
    */
   async filterTable(page: Page, filterType: string, filterBy:string, value: string): Promise<void> {
+    const currentUrl: string = page.url();
+
     switch (filterType) {
       case 'input':
         await this.setValue(page, this.filterColumn(filterBy), value);
-        await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+        await this.clickAndWaitForURL(page, this.filterSearchButton);
         break;
 
       case 'select':
         await Promise.all([
-          page.waitForNavigation({waitUntil: 'networkidle'}),
+          page.waitForURL((url: URL): boolean => url.toString() !== currentUrl, {waitUntil: 'networkidle'}),
           this.selectByVisibleText(page, this.filterColumn(filterBy), value ? 'Yes' : 'No'),
         ]);
         break;
@@ -190,7 +192,7 @@ class QuickAccess extends BOBasePage {
       this.waitForVisibleSelector(page, this.bulkDeleteLink),
     ]);
 
-    await this.clickAndWaitForNavigation(page, this.bulkDeleteLink);
+    await this.clickAndWaitForURL(page, this.bulkDeleteLink);
 
     // Return successful message
     return this.getAlertSuccessBlockContent(page);
diff --git a/tests/UI/pages/BO/shipping/carriers/index.ts b/tests/UI/pages/BO/shipping/carriers/index.ts
index 8597121a7d782..4ef6b05c3f824 100644
--- a/tests/UI/pages/BO/shipping/carriers/index.ts
+++ b/tests/UI/pages/BO/shipping/carriers/index.ts
@@ -183,7 +183,7 @@ class Carriers extends BOBasePage {
    * @returns {Promise<void>}
    */
   async goToAddNewCarrierPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.addNewCarrierLink);
+    await this.clickAndWaitForURL(page, this.addNewCarrierLink);
   }
 
   /* Filter methods */
@@ -204,7 +204,7 @@ class Carriers extends BOBasePage {
    */
   async resetFilter(page: Page): Promise<void> {
     if (!(await this.elementNotVisible(page, this.filterResetButton, 2000))) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+      await this.clickAndWaitForURL(page, this.filterResetButton);
     }
     await this.waitForVisibleSelector(page, this.filterSearchButton, 2000);
   }
@@ -228,15 +228,17 @@ class Carriers extends BOBasePage {
    * @return {Promise<void>}
    */
   async filterTable(page: Page, filterType: string, filterBy: string, value: string): Promise<void> {
+    const currentUrl: string = page.url();
+
     switch (filterType) {
       case 'input':
         await this.setValue(page, this.filterColumn(filterBy), value);
-        await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+        await this.clickAndWaitForURL(page, this.filterSearchButton);
         break;
 
       case 'select':
         await Promise.all([
-          page.waitForNavigation({waitUntil: 'networkidle'}),
+          page.waitForURL((url: URL): boolean => url.toString() !== currentUrl, {waitUntil: 'networkidle'}),
           this.selectByVisibleText(page, this.filterColumn(filterBy), value === '1' ? 'Yes' : 'No'),
         ]);
         break;
@@ -255,7 +257,7 @@ class Carriers extends BOBasePage {
    * @return {Promise<void>}
    */
   async gotoEditCarrierPage(page: Page, row: number): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.tableColumnActionsEditLink(row));
+    await this.clickAndWaitForURL(page, this.tableColumnActionsEditLink(row));
   }
 
   /**
@@ -318,7 +320,7 @@ class Carriers extends BOBasePage {
     await page.click(this.tableColumnActionsDeleteLink(row));
 
     // Confirm delete action
-    await this.clickAndWaitForNavigation(page, this.deleteModalButtonYes);
+    await this.clickAndWaitForURL(page, this.deleteModalButtonYes);
 
     // Get successful message
     return this.getAlertSuccessBlockContent(page);
@@ -371,7 +373,7 @@ class Carriers extends BOBasePage {
     }
 
     const sortColumnButton = `${columnSelector} i.icon-caret-${sortDirection}`;
-    await this.clickAndWaitForNavigation(page, sortColumnButton);
+    await this.clickAndWaitForURL(page, sortColumnButton);
   }
 
   /* Pagination methods */
@@ -402,7 +404,7 @@ class Carriers extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationNext(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink);
+    await this.clickAndWaitForURL(page, this.paginationNextLink);
     return this.getPaginationLabel(page);
   }
 
@@ -412,7 +414,7 @@ class Carriers extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationPrevious(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink);
+    await this.clickAndWaitForURL(page, this.paginationPreviousLink);
     return this.getPaginationLabel(page);
   }
 
@@ -443,7 +445,7 @@ class Carriers extends BOBasePage {
       this.waitForVisibleSelector(page, this.bulkDeleteLink),
     ]);
 
-    await this.clickAndWaitForNavigation(page, this.bulkDeleteLink);
+    await this.clickAndWaitForURL(page, this.bulkDeleteLink);
 
     // Return successful message
     return this.getAlertSuccessBlockContent(page);
@@ -474,9 +476,9 @@ class Carriers extends BOBasePage {
     ]);
 
     if (action === 'Enable') {
-      await this.clickAndWaitForNavigation(page, this.bulkEnableLink);
+      await this.clickAndWaitForURL(page, this.bulkEnableLink);
     } else {
-      await this.clickAndWaitForNavigation(page, this.bulkDisableLink);
+      await this.clickAndWaitForURL(page, this.bulkDisableLink);
     }
 
     // Return successful message
@@ -504,7 +506,7 @@ class Carriers extends BOBasePage {
     await this.waitForVisibleSelector(page, this.tableColumnActive(row), 2000);
 
     if (await this.getStatus(page, row) !== valueWanted) {
-      await this.clickAndWaitForNavigation(page, this.tableColumnActive(row));
+      await page.click(this.tableColumnActive(row));
       return true;
     }
 
diff --git a/tests/UI/pages/BO/shipping/preferences/index.ts b/tests/UI/pages/BO/shipping/preferences/index.ts
index b4577523ad442..717c5ddd0f302 100644
--- a/tests/UI/pages/BO/shipping/preferences/index.ts
+++ b/tests/UI/pages/BO/shipping/preferences/index.ts
@@ -53,7 +53,7 @@ class Preferences extends BOBasePage {
     await this.setValue(page, this.handlingChargesInput, value);
 
     // Save handling form and return successful message
-    await this.clickAndWaitForNavigation(page, this.saveHandlingButton);
+    await page.click(this.saveHandlingButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -73,7 +73,7 @@ class Preferences extends BOBasePage {
     );
 
     // Save configuration and return successful message
-    await this.clickAndWaitForNavigation(page, this.saveCarrierOptionsButton);
+    await page.click(this.saveCarrierOptionsButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -89,7 +89,7 @@ class Preferences extends BOBasePage {
     await this.selectByVisibleText(page, this.orderBySelect, orderBy);
 
     // Save configuration and return successful message
-    await this.clickAndWaitForNavigation(page, this.saveCarrierOptionsButton);
+    await page.click(this.saveCarrierOptionsButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 }
diff --git a/tests/UI/pages/BO/shopParameters/contact/add.ts b/tests/UI/pages/BO/shopParameters/contact/add.ts
index 0166c5a19ad54..fec435c518ece 100644
--- a/tests/UI/pages/BO/shopParameters/contact/add.ts
+++ b/tests/UI/pages/BO/shopParameters/contact/add.ts
@@ -89,7 +89,7 @@ class AddContact extends BOBasePage {
     await this.setValue(page, this.descriptionTextareaFR, contactData.description);
     await this.setChecked(page, this.enableSaveMessagesToggleInput(contactData.saveMessage ? 1 : 0));
     // Save Contact
-    await this.clickAndWaitForNavigation(page, this.saveContactButton);
+    await this.clickAndWaitForURL(page, this.saveContactButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 }
diff --git a/tests/UI/pages/BO/shopParameters/contact/index.ts b/tests/UI/pages/BO/shopParameters/contact/index.ts
index b7fce151345b3..6fd4ec9fd357e 100644
--- a/tests/UI/pages/BO/shopParameters/contact/index.ts
+++ b/tests/UI/pages/BO/shopParameters/contact/index.ts
@@ -111,7 +111,7 @@ class Contacts extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToStoresPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.storesTabLink);
+    await this.clickAndWaitForURL(page, this.storesTabLink);
   }
 
   /**
@@ -120,8 +120,9 @@ class Contacts extends BOBasePage {
    * @returns {Promise<void>}
    */
   async resetFilter(page: Page): Promise<void> {
-    if (!(await this.elementNotVisible(page, this.filterResetButton, 2000))) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+    if (await this.elementVisible(page, this.filterResetButton, 2000)) {
+      await page.click(this.filterResetButton);
+      await this.elementNotVisible(page, this.filterResetButton, 2000);
     }
   }
 
@@ -154,7 +155,7 @@ class Contacts extends BOBasePage {
   async filterContacts(page: Page, filterBy: string, value: string = ''): Promise<void> {
     await this.setValue(page, this.contactFilterInput(filterBy), value.toString());
     // click on search
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await this.clickAndWaitForURL(page, this.filterSearchButton);
   }
 
   /**
@@ -192,7 +193,7 @@ class Contacts extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToAddNewContactPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.addNewContactButton);
+    await this.clickAndWaitForURL(page, this.addNewContactButton);
   }
 
   /**
@@ -202,7 +203,7 @@ class Contacts extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToEditContactPage(page: Page, row: number): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.listTableEditLink(row));
+    await this.clickAndWaitForURL(page, this.listTableEditLink(row));
   }
 
   /**
@@ -236,7 +237,7 @@ class Contacts extends BOBasePage {
    * @return {Promise<void>}
    */
   async confirmDeleteContact(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.confirmDeleteButton);
+    await this.clickAndWaitForURL(page, this.confirmDeleteButton);
   }
 
   /**
@@ -280,7 +281,7 @@ class Contacts extends BOBasePage {
 
     let i = 0;
     while (await this.elementNotVisible(page, sortColumnDiv, 2000) && i < 2) {
-      await this.clickAndWaitForNavigation(page, sortColumnSpanButton);
+      await this.clickAndWaitForURL(page, sortColumnSpanButton);
       i += 1;
     }
 
diff --git a/tests/UI/pages/BO/shopParameters/customerSettings/groups/add.ts b/tests/UI/pages/BO/shopParameters/customerSettings/groups/add.ts
index 49cc81a43de29..0194b6ab1c6d8 100644
--- a/tests/UI/pages/BO/shopParameters/customerSettings/groups/add.ts
+++ b/tests/UI/pages/BO/shopParameters/customerSettings/groups/add.ts
@@ -98,7 +98,7 @@ class AddGroup extends BOBasePage {
     await this.setChecked(page, this.showPricesToggle(groupData.shownPrices ? 'on' : 'off'));
 
     // Save group
-    await this.clickAndWaitForNavigation(page, this.saveButton);
+    await this.clickAndWaitForURL(page, this.saveButton);
 
     // Return successful message
     return this.getAlertSuccessBlockParagraphContent(page);
@@ -114,7 +114,7 @@ class AddGroup extends BOBasePage {
     await this.selectByVisibleText(page, this.priceDisplayMethodSelect, priceDisplayMethod);
 
     // Save customer group
-    await this.clickAndWaitForNavigation(page, this.saveButton);
+    await this.clickAndWaitForURL(page, this.saveButton);
 
     // Return successful message
     return this.getAlertSuccessBlockParagraphContent(page);
diff --git a/tests/UI/pages/BO/shopParameters/customerSettings/groups/index.ts b/tests/UI/pages/BO/shopParameters/customerSettings/groups/index.ts
index 9b628e97661c3..ac7ade3814516 100644
--- a/tests/UI/pages/BO/shopParameters/customerSettings/groups/index.ts
+++ b/tests/UI/pages/BO/shopParameters/customerSettings/groups/index.ts
@@ -116,7 +116,7 @@ class Groups extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToNewGroupPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.newGroupLink);
+    await this.clickAndWaitForURL(page, this.newGroupLink);
   }
 
   /* Filter methods */
@@ -137,7 +137,7 @@ class Groups extends BOBasePage {
    */
   async resetFilter(page: Page): Promise<void> {
     if (!(await this.elementNotVisible(page, this.filterResetButton, 2000))) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+      await this.clickAndWaitForURL(page, this.filterResetButton);
     }
     await this.waitForVisibleSelector(page, this.filterSearchButton, 2000);
   }
@@ -161,15 +161,17 @@ class Groups extends BOBasePage {
    * @return {Promise<void>}
    */
   async filterTable(page: Page, filterType: string, filterBy: string, value: string): Promise<void> {
+    const currentUrl: string = page.url();
+
     switch (filterType) {
       case 'input':
         await this.setValue(page, this.filterColumn(filterBy), value.toString());
-        await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+        await this.clickAndWaitForURL(page, this.filterSearchButton);
         break;
 
       case 'select':
         await Promise.all([
-          page.waitForNavigation({waitUntil: 'networkidle'}),
+          page.waitForURL((url: URL): boolean => url.toString() !== currentUrl, {waitUntil: 'networkidle'}),
           this.selectByVisibleText(page, this.filterColumn(filterBy), value ? 'Yes' : 'No'),
         ]);
         break;
@@ -223,7 +225,7 @@ class Groups extends BOBasePage {
    * @return {Promise<void>}
    */
   async gotoEditGroupPage(page: Page, row: number): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.tableColumnActionsEditLink(row));
+    await this.clickAndWaitForURL(page, this.tableColumnActionsEditLink(row));
   }
 
   /**
@@ -241,7 +243,7 @@ class Groups extends BOBasePage {
     await page.click(this.tableColumnActionsDeleteLink(row));
 
     // Confirm delete action
-    await this.clickAndWaitForNavigation(page, this.deleteModalButtonYes);
+    await this.clickAndWaitForURL(page, this.deleteModalButtonYes);
 
     // Get successful message
     return this.getAlertSuccessBlockParagraphContent(page);
@@ -275,7 +277,7 @@ class Groups extends BOBasePage {
       this.waitForVisibleSelector(page, this.bulkDeleteLink),
     ]);
 
-    await this.clickAndWaitForNavigation(page, this.bulkDeleteLink);
+    await this.clickAndWaitForURL(page, this.bulkDeleteLink);
 
     // Return successful message
     return this.getAlertSuccessBlockParagraphContent(page);
diff --git a/tests/UI/pages/BO/shopParameters/customerSettings/index.ts b/tests/UI/pages/BO/shopParameters/customerSettings/index.ts
index 7a9dbf04d49c4..89165d9705313 100644
--- a/tests/UI/pages/BO/shopParameters/customerSettings/index.ts
+++ b/tests/UI/pages/BO/shopParameters/customerSettings/index.ts
@@ -60,7 +60,7 @@ class CustomerSettings extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToTitlesPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.titlesSubtab);
+    await this.clickAndWaitForURL(page, this.titlesSubtab);
   }
 
   /**
@@ -69,7 +69,7 @@ class CustomerSettings extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToGroupsPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.groupsSubtab);
+    await this.clickAndWaitForURL(page, this.groupsSubtab);
   }
 
   /**
@@ -102,7 +102,8 @@ class CustomerSettings extends BOBasePage {
         throw new Error(`${option} was not found`);
     }
     await this.setChecked(page, selector(toEnable ? 1 : 0));
-    await this.clickAndWaitForNavigation(page, this.saveGeneralFormButton);
+    await page.click(this.saveGeneralFormButton);
+    await this.elementNotVisible(page, selector(!toEnable ? 1 : 0));
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
diff --git a/tests/UI/pages/BO/shopParameters/customerSettings/titles/add.ts b/tests/UI/pages/BO/shopParameters/customerSettings/titles/add.ts
index d0408330ebeff..2842e5a364987 100644
--- a/tests/UI/pages/BO/shopParameters/customerSettings/titles/add.ts
+++ b/tests/UI/pages/BO/shopParameters/customerSettings/titles/add.ts
@@ -106,7 +106,7 @@ class AddTitle extends BOBasePage {
     await this.setValue(page, this.imageHeightInput, titleData.imageHeight);
 
     // Save title
-    await this.clickAndWaitForNavigation(page, this.saveButton);
+    await this.clickAndWaitForURL(page, this.saveButton);
 
     // Return successful message
     return this.getAlertSuccessBlockParagraphContent(page);
diff --git a/tests/UI/pages/BO/shopParameters/customerSettings/titles/index.ts b/tests/UI/pages/BO/shopParameters/customerSettings/titles/index.ts
index 3fbbf0983c98e..14c79e754b3a2 100644
--- a/tests/UI/pages/BO/shopParameters/customerSettings/titles/index.ts
+++ b/tests/UI/pages/BO/shopParameters/customerSettings/titles/index.ts
@@ -129,7 +129,7 @@ class Titles extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToAddNewTitle(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.newTitleLink);
+    await this.clickAndWaitForURL(page, this.newTitleLink);
   }
 
   /* Filter methods */
@@ -143,15 +143,17 @@ class Titles extends BOBasePage {
    * @return {Promise<void>}
    */
   async filterTitles(page: Page, filterType: string, filterBy: string, value: string): Promise<void> {
+    const currentUrl: string = page.url();
+
     switch (filterType) {
       case 'input':
         await this.setValue(page, this.filterColumn(filterBy), value);
-        await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+        await this.clickAndWaitForURL(page, this.filterSearchButton);
         break;
 
       case 'select':
         await Promise.all([
-          page.waitForNavigation({waitUntil: 'networkidle'}),
+          page.waitForURL((url: URL): boolean => url.toString() !== currentUrl, {waitUntil: 'networkidle'}),
           this.selectByVisibleText(page, this.filterColumn(filterBy), value),
         ]);
         break;
@@ -168,7 +170,7 @@ class Titles extends BOBasePage {
    */
   async resetFilter(page: Page): Promise<void> {
     if (!(await this.elementNotVisible(page, this.filterResetButton, 2000))) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+      await this.clickAndWaitForURL(page, this.filterResetButton);
     }
     await this.waitForVisibleSelector(page, this.filterSearchButton, 2000);
   }
@@ -231,7 +233,7 @@ class Titles extends BOBasePage {
    * @return {Promise<void>}
    */
   async gotoEditTitlePage(page: Page, row: number): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.tableColumnActionsEditLink(row));
+    await this.clickAndWaitForURL(page, this.tableColumnActionsEditLink(row));
   }
 
   /**
@@ -249,7 +251,7 @@ class Titles extends BOBasePage {
     await page.click(this.tableColumnActionsDeleteLink(row));
 
     // Confirm delete action
-    await this.clickAndWaitForNavigation(page, this.deleteModalButtonYes);
+    await this.clickAndWaitForURL(page, this.deleteModalButtonYes);
 
     // Get successful message
     return this.getAlertSuccessBlockParagraphContent(page);
@@ -283,7 +285,7 @@ class Titles extends BOBasePage {
       this.waitForVisibleSelector(page, this.bulkDeleteLink),
     ]);
 
-    await this.clickAndWaitForNavigation(page, this.bulkDeleteLink);
+    await this.clickAndWaitForURL(page, this.bulkDeleteLink);
 
     // Return successful message
     return this.getAlertSuccessBlockParagraphContent(page);
diff --git a/tests/UI/pages/BO/shopParameters/general/index.ts b/tests/UI/pages/BO/shopParameters/general/index.ts
index 7792e30c9d447..6386d0abff6e6 100644
--- a/tests/UI/pages/BO/shopParameters/general/index.ts
+++ b/tests/UI/pages/BO/shopParameters/general/index.ts
@@ -47,7 +47,7 @@ class ShopParamsGeneral extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToSubTabMaintenance(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.maintenanceNavItemLink);
+    await this.clickAndWaitForURL(page, this.maintenanceNavItemLink);
   }
 
   /**
@@ -58,7 +58,7 @@ class ShopParamsGeneral extends BOBasePage {
    */
   async setDisplaySuppliers(page: Page, toEnable: boolean = true): Promise<string> {
     await this.setChecked(page, this.displaySuppliersToggleInput(toEnable ? 1 : 0));
-    await this.clickAndWaitForNavigation(page, this.saveFormButton);
+    await this.clickAndWaitForLoadState(page, this.saveFormButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -70,7 +70,7 @@ class ShopParamsGeneral extends BOBasePage {
    */
   async setDisplayBrands(page: Page, toEnable: boolean = true): Promise<string> {
     await this.setChecked(page, this.displayBrandsToggleInput(toEnable ? 1 : 0));
-    await this.clickAndWaitForNavigation(page, this.saveFormButton);
+    await this.clickAndWaitForLoadState(page, this.saveFormButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -82,7 +82,7 @@ class ShopParamsGeneral extends BOBasePage {
    */
   async setMultiStoreStatus(page: Page, toEnable: boolean = true): Promise<string> {
     await this.setChecked(page, this.enableMultiStoreToggleInput(toEnable ? 1 : 0));
-    await this.clickAndWaitForNavigation(page, this.saveFormButton);
+    await this.clickAndWaitForLoadState(page, this.saveFormButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 }
diff --git a/tests/UI/pages/BO/shopParameters/general/maintenance/index.ts b/tests/UI/pages/BO/shopParameters/general/maintenance/index.ts
index 656cf8341550a..56241b28ea48f 100644
--- a/tests/UI/pages/BO/shopParameters/general/maintenance/index.ts
+++ b/tests/UI/pages/BO/shopParameters/general/maintenance/index.ts
@@ -63,7 +63,8 @@ class ShopParamsMaintenance extends BOBasePage {
    */
   async changeShopStatus(page: Page, toEnable: boolean = true): Promise<string> {
     await this.setChecked(page, this.shopStatusToggleInput(toEnable ? 1 : 0));
-    await this.clickAndWaitForNavigation(page, this.saveFormButton);
+    await this.clickAndWaitForLoadState(page, this.saveFormButton);
+    await this.elementNotVisible(page, this.shopStatusToggleInput(!toEnable ? 1 : 0), 2000);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
@@ -76,7 +77,8 @@ class ShopParamsMaintenance extends BOBasePage {
    */
   async changeStoreForLoggedInEmployees(page: Page, toEnable: boolean = true): Promise<string> {
     await this.setChecked(page, this.allowAdminsToggleInput(toEnable ? 1 : 0));
-    await this.clickAndWaitForNavigation(page, this.saveFormButton);
+    await this.clickAndWaitForLoadState(page, this.saveFormButton);
+    await this.elementNotVisible(page, this.allowAdminsToggleInput(!toEnable ? 1 : 0), 2000);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
@@ -91,7 +93,7 @@ class ShopParamsMaintenance extends BOBasePage {
     await this.setValueOnTinymceInput(page, this.maintenanceTextInputEN, text);
     await page.click(this.customMaintenanceFrTab);
     await this.setValueOnTinymceInput(page, this.maintenanceTextInputFR, text);
-    await this.clickAndWaitForNavigation(page, this.saveFormButton);
+    await page.click(this.saveFormButton);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
@@ -103,7 +105,7 @@ class ShopParamsMaintenance extends BOBasePage {
    */
   async addMyIpAddress(page: Page): Promise<string> {
     await page.click(this.addMyIPAddressButton);
-    await this.clickAndWaitForNavigation(page, this.saveFormButton);
+    await page.click(this.saveFormButton);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
@@ -116,7 +118,7 @@ class ShopParamsMaintenance extends BOBasePage {
    */
   async addMaintenanceIPAddress(page: Page, ipAddress: string): Promise<string> {
     await this.setValue(page, this.maintenanceIpInput, ipAddress);
-    await this.clickAndWaitForNavigation(page, this.saveFormButton);
+    await page.click(this.saveFormButton);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
diff --git a/tests/UI/pages/BO/shopParameters/orderSettings/index.ts b/tests/UI/pages/BO/shopParameters/orderSettings/index.ts
index ec7f1e2b69753..98e3d063d9608 100644
--- a/tests/UI/pages/BO/shopParameters/orderSettings/index.ts
+++ b/tests/UI/pages/BO/shopParameters/orderSettings/index.ts
@@ -84,7 +84,8 @@ class OrderSettings extends BOBasePage {
    */
   async setFinalSummaryStatus(page: Page, toEnable: boolean = true): Promise<string> {
     await this.setChecked(page, this.enableFinalSummaryToggleInput(toEnable ? 1 : 0));
-    await this.clickAndWaitForNavigation(page, this.saveGeneralFormButton);
+    await page.click(this.saveGeneralFormButton);
+    await this.elementNotVisible(page, this.enableFinalSummaryToggleInput(!toEnable ? 1 : 0), 2000);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
@@ -97,7 +98,8 @@ class OrderSettings extends BOBasePage {
    */
   async setGuestCheckoutStatus(page: Page, toEnable: boolean = true): Promise<string> {
     await this.setChecked(page, this.enableGuestCheckoutToggleInput(toEnable ? 1 : 0));
-    await this.clickAndWaitForNavigation(page, this.saveGeneralFormButton);
+    await page.click(this.saveGeneralFormButton);
+    await this.elementNotVisible(page, this.enableGuestCheckoutToggleInput(!toEnable ? 1 : 0), 2000);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
@@ -110,7 +112,8 @@ class OrderSettings extends BOBasePage {
    */
   async setReorderOptionStatus(page: Page, toEnable: boolean = true): Promise<string> {
     await this.setChecked(page, this.disableReorderingToggleInput(toEnable ? 1 : 0));
-    await this.clickAndWaitForNavigation(page, this.saveGeneralFormButton);
+    await page.click(this.saveGeneralFormButton);
+    await this.elementNotVisible(page, this.disableReorderingToggleInput(!toEnable ? 1 : 0), 2000);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
@@ -123,7 +126,7 @@ class OrderSettings extends BOBasePage {
    */
   async setMinimumPurchaseRequiredTotal(page: Page, value: number): Promise<string> {
     await this.setValue(page, this.minimumPurchaseRequiredValue, value.toString());
-    await this.clickAndWaitForNavigation(page, this.saveGeneralFormButton);
+    await page.click(this.saveGeneralFormButton);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
@@ -140,7 +143,7 @@ class OrderSettings extends BOBasePage {
     if (toEnable) {
       await this.selectByVisibleText(page, this.pageForTermsAndConditionsSelect, pageName);
     }
-    await this.clickAndWaitForNavigation(page, this.saveGeneralFormButton);
+    await page.click(this.saveGeneralFormButton);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
@@ -168,7 +171,7 @@ class OrderSettings extends BOBasePage {
     }
 
     await this.setChecked(page, this.recycledPackagingToggleInput(recyclePackagingStatus ? 1 : 0));
-    await this.clickAndWaitForNavigation(page, this.saveGiftOptionsFormButton);
+    await page.click(this.saveGiftOptionsFormButton);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
@@ -179,7 +182,7 @@ class OrderSettings extends BOBasePage {
    * @returns {Promise<void>}
    */
   async goToStatusesPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.statusesTab);
+    await this.clickAndWaitForURL(page, this.statusesTab);
   }
 }
 
diff --git a/tests/UI/pages/BO/shopParameters/orderSettings/statuses/add.ts b/tests/UI/pages/BO/shopParameters/orderSettings/statuses/add.ts
index 9bcc25f971fc2..2f976aa464646 100644
--- a/tests/UI/pages/BO/shopParameters/orderSettings/statuses/add.ts
+++ b/tests/UI/pages/BO/shopParameters/orderSettings/statuses/add.ts
@@ -94,7 +94,7 @@ class AddOrderStatus extends BOBasePage {
     await this.setChecked(page, this.deliveryOnCheckbox, orderStatusData.deliveryOn);
 
     // Save order status
-    await this.clickAndWaitForNavigation(page, this.saveButton);
+    await this.clickAndWaitForURL(page, this.saveButton);
 
     // Return successful message
     return this.getAlertSuccessBlockContent(page);
diff --git a/tests/UI/pages/BO/shopParameters/orderSettings/statuses/index.ts b/tests/UI/pages/BO/shopParameters/orderSettings/statuses/index.ts
index 54c19b9e29689..82969e0f6682f 100644
--- a/tests/UI/pages/BO/shopParameters/orderSettings/statuses/index.ts
+++ b/tests/UI/pages/BO/shopParameters/orderSettings/statuses/index.ts
@@ -177,7 +177,7 @@ class Statuses extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToNewOrderStatusPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.newOrderStatusLink);
+    await this.clickAndWaitForURL(page, this.newOrderStatusLink);
   }
 
   /**
@@ -186,7 +186,7 @@ class Statuses extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToNewOrderReturnStatusPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.newOrderReturnStatusLink);
+    await this.clickAndWaitForURL(page, this.newOrderReturnStatusLink);
   }
 
   /* Filter methods */
@@ -208,8 +208,9 @@ class Statuses extends BOBasePage {
    * @return {Promise<void>}
    */
   async resetFilter(page: Page, tableName: string): Promise<void> {
-    if (!(await this.elementNotVisible(page, this.filterResetButton(tableName), 2000))) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton(tableName));
+    if (await this.elementVisible(page, this.filterResetButton(tableName), 2000)) {
+      await page.click(this.filterResetButton(tableName));
+      await this.elementNotVisible(page, this.filterResetButton(tableName), 2000);
     }
     await this.waitForVisibleSelector(page, this.filterSearchButton(tableName), 2000);
   }
@@ -239,19 +240,18 @@ class Statuses extends BOBasePage {
     switch (filterType) {
       case 'input':
         await this.setValue(page, this.filterColumn(tableName, filterBy), value.toString());
-        await this.clickAndWaitForNavigation(page, this.filterSearchButton(tableName));
+        await page.click(this.filterSearchButton(tableName));
         break;
 
       case 'select':
-        await Promise.all([
-          page.waitForNavigation({waitUntil: 'networkidle'}),
-          this.selectByVisibleText(page, this.filterColumn(tableName, filterBy), value === '1' ? 'Yes' : 'No'),
-        ]);
+        await this.selectByVisibleText(page, this.filterColumn(tableName, filterBy), value === '1' ? 'Yes' : 'No');
         break;
 
       default:
         throw new Error(`Filter ${filterBy} was not found`);
     }
+
+    await this.elementVisible(page, this.filterResetButton(tableName), 2000);
   }
 
   /* Column methods */
@@ -276,7 +276,7 @@ class Statuses extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToEditPage(page: Page, tableName: string, row: number): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.tableColumnActionsEditLink(tableName, row));
+    await this.clickAndWaitForURL(page, this.tableColumnActionsEditLink(tableName, row));
   }
 
   /**
@@ -295,7 +295,7 @@ class Statuses extends BOBasePage {
     await page.click(this.tableColumnActionsDeleteLink(tableName, row));
 
     // Confirm delete action
-    await this.clickAndWaitForNavigation(page, this.deleteModalButtonYes);
+    await this.clickAndWaitForURL(page, this.deleteModalButtonYes);
 
     // Get successful message
     return this.getAlertSuccessBlockContent(page);
@@ -321,7 +321,7 @@ class Statuses extends BOBasePage {
    */
   async selectPaginationLimit(page: Page, tableName: string, number: number): Promise<string> {
     await this.waitForSelectorAndClick(page, this.paginationDropdownButton(tableName));
-    await this.clickAndWaitForNavigation(page, this.paginationItems(tableName, number));
+    await page.click(this.paginationItems(tableName, number));
 
     return this.getPaginationLabel(page, tableName);
   }
@@ -333,7 +333,7 @@ class Statuses extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationNext(page: Page, tableName: string): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink(tableName));
+    await page.click(this.paginationNextLink(tableName));
 
     return this.getPaginationLabel(page, tableName);
   }
@@ -345,7 +345,7 @@ class Statuses extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationPrevious(page: Page, tableName: string): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink(tableName));
+    await page.click(this.paginationPreviousLink(tableName));
 
     return this.getPaginationLabel(page, tableName);
   }
@@ -382,7 +382,7 @@ class Statuses extends BOBasePage {
   async sortTable(page: Page, tableName: string, sortBy: string, columnID: number, sortDirection: string): Promise<void> {
     const sortColumnButton: string = `${this.sortColumnDiv(tableName, columnID)} i.icon-caret-${sortDirection}`;
 
-    await this.clickAndWaitForNavigation(page, sortColumnButton);
+    await this.clickAndWaitForURL(page, sortColumnButton);
   }
 
   /* Bulk actions methods */
@@ -416,7 +416,7 @@ class Statuses extends BOBasePage {
     await page.click(this.bulkActionMenuButton(tableName));
 
     // Click on delete
-    await this.clickAndWaitForNavigation(page, this.bulkDeleteLink);
+    await this.clickAndWaitForURL(page, this.bulkDeleteLink);
     return this.getAlertSuccessBlockContent(page);
   }
 
diff --git a/tests/UI/pages/BO/shopParameters/orderSettings/statuses/returnStatus/add.ts b/tests/UI/pages/BO/shopParameters/orderSettings/statuses/returnStatus/add.ts
index f1d57d418008b..82a570d057a79 100644
--- a/tests/UI/pages/BO/shopParameters/orderSettings/statuses/returnStatus/add.ts
+++ b/tests/UI/pages/BO/shopParameters/orderSettings/statuses/returnStatus/add.ts
@@ -53,7 +53,7 @@ class AddOrderReturnStatus extends BOBasePage {
     await this.setValue(page, this.colorInput, orderReturnStatusData.color);
 
     // Save order return status
-    await this.clickAndWaitForNavigation(page, this.saveButton);
+    await this.clickAndWaitForURL(page, this.saveButton);
 
     // Return successful message
     return this.getAlertSuccessBlockContent(page);
diff --git a/tests/UI/pages/BO/shopParameters/productSettings/index.ts b/tests/UI/pages/BO/shopParameters/productSettings/index.ts
index 4870ffd29ec17..ea11fc2ce0e76 100644
--- a/tests/UI/pages/BO/shopParameters/productSettings/index.ts
+++ b/tests/UI/pages/BO/shopParameters/productSettings/index.ts
@@ -133,7 +133,8 @@ class ProductSettings extends BOBasePage {
    */
   async changeCatalogModeStatus(page: Page, toEnable: boolean = true): Promise<string> {
     await this.setChecked(page, this.catalogModeToggleInput(toEnable ? 1 : 0));
-    await this.clickAndWaitForNavigation(page, this.saveProductGeneralFormButton);
+    await this.clickAndWaitForLoadState(page, this.saveProductGeneralFormButton);
+    await this.elementNotVisible(page, this.catalogModeToggleInput(!toEnable ? 1 : 0), 2000);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -145,7 +146,8 @@ class ProductSettings extends BOBasePage {
    */
   async setShowPricesStatus(page: Page, toEnable: boolean = true): Promise<string> {
     await this.setChecked(page, this.showPricesToggleInput(toEnable ? 1 : 0));
-    await this.clickAndWaitForNavigation(page, this.saveProductGeneralFormButton);
+    await this.clickAndWaitForLoadState(page, this.saveProductGeneralFormButton);
+    await this.elementNotVisible(page, this.showPricesToggleInput(!toEnable ? 1 : 0), 2000);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -157,7 +159,7 @@ class ProductSettings extends BOBasePage {
    */
   async updateNumberOfDays(page: Page, numberOfDays: number): Promise<string> {
     await this.setValue(page, this.newDaysNumberInput, numberOfDays.toString());
-    await this.clickAndWaitForNavigation(page, this.saveProductGeneralFormButton);
+    await page.click(this.saveProductGeneralFormButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -169,7 +171,7 @@ class ProductSettings extends BOBasePage {
    */
   async UpdateMaxSizeOfSummary(page: Page, size: number): Promise<string> {
     await this.setValue(page, this.maxSizeShortDescriptionInput, size.toString());
-    await this.clickAndWaitForNavigation(page, this.saveProductGeneralFormButton);
+    await page.click(this.saveProductGeneralFormButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -181,7 +183,8 @@ class ProductSettings extends BOBasePage {
    */
   async setForceUpdateFriendlyURLStatus(page: Page, toEnable: boolean = true): Promise<string> {
     await this.setChecked(page, this.forceUpdateFriendlyUrlToggleInput(toEnable ? 1 : 0));
-    await this.clickAndWaitForNavigation(page, this.saveProductGeneralFormButton);
+    await page.click(this.saveProductGeneralFormButton);
+    await this.elementNotVisible(page, this.forceUpdateFriendlyUrlToggleInput(!toEnable ? 1 : 0), 2000);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -193,7 +196,8 @@ class ProductSettings extends BOBasePage {
    */
   async setDefaultActivationStatus(page: Page, toEnable: boolean = true): Promise<string> {
     await this.setChecked(page, this.defaultActivationStatusToggleInput(toEnable ? 1 : 0));
-    await this.clickAndWaitForNavigation(page, this.saveProductGeneralFormButton);
+    await page.click(this.saveProductGeneralFormButton);
+    await this.elementNotVisible(page, this.defaultActivationStatusToggleInput(!toEnable ? 1 : 0), 2000);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -205,7 +209,7 @@ class ProductSettings extends BOBasePage {
    */
   async chooseQuantityDiscountsBasedOn(page: Page, basedOn: string): Promise<string> {
     await this.selectByVisibleText(page, this.quantityDiscountBasedOnSelect, basedOn);
-    await this.clickAndWaitForNavigation(page, this.saveProductGeneralFormButton);
+    await page.click(this.saveProductGeneralFormButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -216,8 +220,9 @@ class ProductSettings extends BOBasePage {
    * @returns {Promise<string>}
    */
   async setDisplayAvailableQuantitiesStatus(page: Page, toEnable: boolean = true): Promise<string> {
+    await this.closeAlertBlock(page);
     await this.setChecked(page, this.displayAvailableQuantitiesToggleInput(toEnable ? 1 : 0));
-    await this.clickAndWaitForNavigation(page, this.saveProductPageFormButton);
+    await page.click(this.saveProductPageFormButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -228,8 +233,9 @@ class ProductSettings extends BOBasePage {
    * @returns {Promise<string>}
    */
   async setDisplayRemainingQuantities(page: Page, quantity: number): Promise<string> {
+    await this.closeAlertBlock(page);
     await this.setValue(page, this.remainingQuantityInput, quantity.toString());
-    await this.clickAndWaitForNavigation(page, this.saveProductsStockFormButton);
+    await page.click(this.saveProductsStockFormButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -241,7 +247,8 @@ class ProductSettings extends BOBasePage {
    */
   async setDisplayUnavailableProductAttributesStatus(page: Page, toEnable: boolean = true): Promise<string> {
     await this.setChecked(page, this.displayUnavailableAttributesToggleInput(toEnable ? 1 : 0));
-    await this.clickAndWaitForNavigation(page, this.saveProductsStockFormButton);
+    await page.click(this.saveProductsStockFormButton);
+    await this.elementNotVisible(page, this.displayUnavailableAttributesToggleInput(!toEnable ? 1 : 0), 2000);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -253,7 +260,7 @@ class ProductSettings extends BOBasePage {
    */
   async setSeparatorOfAttributeOnProductLink(page: Page, separator: string): Promise<string> {
     await this.selectByVisibleText(page, this.separatorAttributeOnProductPageSelect, separator);
-    await this.clickAndWaitForNavigation(page, this.saveProductPageFormButton);
+    await page.click(this.saveProductPageFormButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -265,7 +272,8 @@ class ProductSettings extends BOBasePage {
    */
   async setAllowOrderingOutOfStockStatus(page: Page, toEnable: boolean = true): Promise<string> {
     await this.setChecked(page, this.allowOrderingOosToggleInput(toEnable ? 1 : 0));
-    await this.clickAndWaitForNavigation(page, this.saveProductsStockFormButton);
+    await page.click(this.saveProductsStockFormButton);
+    await this.elementNotVisible(page, this.allowOrderingOosToggleInput(!toEnable ? 1 : 0), 2000);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -280,7 +288,8 @@ class ProductSettings extends BOBasePage {
     if (toEnable) {
       await this.setChecked(page, this.allowOrderingOosToggleInput(0));
     }
-    await this.clickAndWaitForNavigation(page, this.saveProductsStockFormButton);
+    await page.click(this.saveProductsStockFormButton);
+    await this.elementNotVisible(page, this.enableStockManagementToggleInput(!toEnable ? 1 : 0), 2000);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -292,7 +301,7 @@ class ProductSettings extends BOBasePage {
    */
   async setProductsDisplayedPerPage(page: Page, numberOfProducts: number): Promise<string> {
     await this.setValue(page, this.productsPerPageInput, numberOfProducts);
-    await this.clickAndWaitForNavigation(page, this.savePaginationFormButton);
+    await page.click(this.savePaginationFormButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -326,7 +335,7 @@ class ProductSettings extends BOBasePage {
     // Fill label in french
     await this.changeLanguageForSelectors(page, 'fr');
     await this.setValue(page, this.labelInStock(2), label);
-    await this.clickAndWaitForNavigation(page, this.saveProductsStockFormButton);
+    await page.click(this.saveProductsStockFormButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -338,7 +347,7 @@ class ProductSettings extends BOBasePage {
    */
   async setDeliveryTimeInStock(page: Page, deliveryTimeText: string): Promise<string> {
     await this.setValue(page, this.deliveryTimeInStockInput, deliveryTimeText);
-    await this.clickAndWaitForNavigation(page, this.saveProductsStockFormButton);
+    await page.click(this.saveProductsStockFormButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -350,7 +359,8 @@ class ProductSettings extends BOBasePage {
    */
   async setDisplayDiscountedPriceStatus(page: Page, toEnable: boolean = true): Promise<string> {
     await this.setChecked(page, this.displayDiscountedPriceToggleInput(toEnable ? 1 : 0));
-    await this.clickAndWaitForNavigation(page, this.saveProductPageFormButton);
+    await page.click(this.saveProductPageFormButton);
+    await this.elementNotVisible(page, this.displayDiscountedPriceToggleInput(!toEnable ? 1 : 0), 2000);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -364,7 +374,7 @@ class ProductSettings extends BOBasePage {
   async setDefaultProductsOrder(page: Page, orderBy: string, orderMethod:string = 'Ascending'): Promise<string> {
     await this.selectByVisibleText(page, this.productsDefaultOrderBySelect, orderBy);
     await this.selectByVisibleText(page, this.productsDefaultOrderMethodSelect, orderMethod);
-    await this.clickAndWaitForNavigation(page, this.savePaginationFormButton);
+    await page.click(this.savePaginationFormButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -376,7 +386,7 @@ class ProductSettings extends BOBasePage {
    */
   async setDeliveryTimeOutOfStock(page: Page, deliveryTimeText: string = ''): Promise<string> {
     await this.setValue(page, this.deliveryTimeOutOfStockInput, deliveryTimeText);
-    await this.clickAndWaitForNavigation(page, this.saveProductsStockFormButton);
+    await page.click(this.saveProductsStockFormButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -393,7 +403,7 @@ class ProductSettings extends BOBasePage {
     // Fill label in french
     await this.changeLanguageForSelectors(page, 'fr');
     await this.setValue(page, this.oosAllowedBackordersLabel(2), label);
-    await this.clickAndWaitForNavigation(page, this.saveProductsStockFormButton);
+    await page.click(this.saveProductsStockFormButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -410,7 +420,7 @@ class ProductSettings extends BOBasePage {
     // Fill label in french
     await this.changeLanguageForSelectors(page, 'fr');
     await this.setValue(page, this.oosDeniedBackordersLabel(2), label);
-    await this.clickAndWaitForNavigation(page, this.saveProductsStockFormButton);
+    await page.click(this.saveProductsStockFormButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
@@ -422,7 +432,7 @@ class ProductSettings extends BOBasePage {
    */
   async setDefaultPackStockManagement(page: Page, option: string): Promise<string> {
     await this.selectByVisibleText(page, this.defaultPackStockManagementSelect, option);
-    await this.clickAndWaitForNavigation(page, this.saveProductsStockFormButton);
+    await page.click(this.saveProductsStockFormButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 }
diff --git a/tests/UI/pages/BO/shopParameters/search/add.ts b/tests/UI/pages/BO/shopParameters/search/add.ts
index f8007415f9c15..488cda8aa14aa 100644
--- a/tests/UI/pages/BO/shopParameters/search/add.ts
+++ b/tests/UI/pages/BO/shopParameters/search/add.ts
@@ -47,7 +47,7 @@ class AddAlias extends BOBasePage {
     await this.setValue(page, this.aliasInput, aliasData.alias);
     await this.setValue(page, this.resultInput, aliasData.result);
 
-    await this.clickAndWaitForNavigation(page, this.saveButton);
+    await this.clickAndWaitForURL(page, this.saveButton);
     return this.getAlertSuccessBlockContent(page);
   }
 }
diff --git a/tests/UI/pages/BO/shopParameters/search/index.ts b/tests/UI/pages/BO/shopParameters/search/index.ts
index bec9caf4532c3..0856d9eff8815 100644
--- a/tests/UI/pages/BO/shopParameters/search/index.ts
+++ b/tests/UI/pages/BO/shopParameters/search/index.ts
@@ -167,7 +167,7 @@ class Search extends BOBasePage {
    * @returns {Promise<void>}
    */
   async goToAddNewAliasPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.addNewAliasLink);
+    await this.clickAndWaitForURL(page, this.addNewAliasLink);
   }
 
   /**
@@ -176,7 +176,7 @@ class Search extends BOBasePage {
    * @returns {Promise<void>}
    */
   async goToTagsPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.tagsTabLink);
+    await this.clickAndWaitForURL(page, this.tagsTabLink);
   }
 
   /* Filter methods */
@@ -196,7 +196,7 @@ class Search extends BOBasePage {
    */
   async resetFilter(page: Page): Promise<void> {
     if (!(await this.elementNotVisible(page, this.filterResetButton, 2000))) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+      await this.clickAndWaitForURL(page, this.filterResetButton);
     }
     await this.waitForVisibleSelector(page, this.filterSearchButton, 2000);
   }
@@ -220,15 +220,17 @@ class Search extends BOBasePage {
    * @return {Promise<void>}
    */
   async filterTable(page: Page, filterType: string, filterBy: string, value: string): Promise<void> {
+    const currentUrl: string = page.url();
+
     switch (filterType) {
       case 'input':
         await this.setValue(page, this.filterColumn(filterBy), value.toString());
-        await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+        await this.clickAndWaitForURL(page, this.filterSearchButton);
         break;
 
       case 'select':
         await Promise.all([
-          page.waitForNavigation({waitUntil: 'networkidle'}),
+          page.waitForURL((url: URL): boolean => url.toString() !== currentUrl, {waitUntil: 'networkidle'}),
           this.selectByVisibleText(page, this.filterColumn(filterBy), value === '1' ? 'Yes' : 'No'),
         ]);
         break;
@@ -246,7 +248,7 @@ class Search extends BOBasePage {
    * @return {Promise<void>}
    */
   async gotoEditAliasPage(page: Page, row: number): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.tableColumnActionsEditLink(row));
+    await this.clickAndWaitForURL(page, this.tableColumnActionsEditLink(row));
   }
 
   /**
@@ -298,7 +300,7 @@ class Search extends BOBasePage {
     await page.click(this.tableColumnActionsDeleteLink(row));
 
     // Confirm delete action
-    await this.clickAndWaitForNavigation(page, this.deleteModalButtonYes);
+    await this.clickAndWaitForURL(page, this.deleteModalButtonYes);
 
     // Get successful message
     return this.getAlertSuccessBlockContent(page);
@@ -333,7 +335,7 @@ class Search extends BOBasePage {
     await page.click(this.bulkActionMenuButton);
 
     // Click on delete
-    await this.clickAndWaitForNavigation(page, this.bulkDeleteLink);
+    await this.clickAndWaitForURL(page, this.bulkDeleteLink);
 
     return this.getAlertSuccessBlockContent(page);
   }
@@ -352,7 +354,7 @@ class Search extends BOBasePage {
     await page.click(this.bulkActionMenuButton);
 
     // Click on enable/Disable and wait for modal
-    await this.clickAndWaitForNavigation(page, enable ? this.bulkEnableButton : this.bulkDisableButton);
+    await this.clickAndWaitForURL(page, enable ? this.bulkEnableButton : this.bulkDisableButton);
 
     return this.getTextContent(page, this.alertSuccessBlock);
   }
@@ -396,7 +398,9 @@ class Search extends BOBasePage {
    */
   async setFuzzySearch(page: Page, toEnable: boolean = true): Promise<string> {
     await this.setChecked(page, this.fuzzySearchLabel(toEnable ? 'on' : 'off'));
-    await this.clickAndWaitForNavigation(page, this.saveFormButton);
+    await this.clickAndWaitForLoadState(page, this.saveFormButton);
+    await this.elementNotVisible(page, this.fuzzySearchLabel(!toEnable ? 'on' : 'off'), 2000);
+
     return this.getAlertSuccessBlockContent(page);
   }
 }
diff --git a/tests/UI/pages/BO/shopParameters/search/tags/add.ts b/tests/UI/pages/BO/shopParameters/search/tags/add.ts
index 861eab75a1061..1b3e1b4abfee0 100644
--- a/tests/UI/pages/BO/shopParameters/search/tags/add.ts
+++ b/tests/UI/pages/BO/shopParameters/search/tags/add.ts
@@ -62,7 +62,7 @@ class AddTag extends BOBasePage {
     await this.selectByVisibleText(page, this.productSelect, tagData.products);
     await this.waitForSelectorAndClick(page, this.moveToRightButton);
 
-    await this.clickAndWaitForNavigation(page, this.saveButton);
+    await this.clickAndWaitForURL(page, this.saveButton);
     return this.getAlertSuccessBlockContent(page);
   }
 }
diff --git a/tests/UI/pages/BO/shopParameters/search/tags/index.ts b/tests/UI/pages/BO/shopParameters/search/tags/index.ts
index 674a3f41ff290..f9866b1f7f950 100644
--- a/tests/UI/pages/BO/shopParameters/search/tags/index.ts
+++ b/tests/UI/pages/BO/shopParameters/search/tags/index.ts
@@ -164,7 +164,7 @@ class Tags extends BOBasePage {
    * @returns {Promise<void>}
    */
   async goToAddNewTagPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.addNewTagLink);
+    await this.clickAndWaitForURL(page, this.addNewTagLink);
   }
 
   /* Filter methods */
@@ -184,7 +184,7 @@ class Tags extends BOBasePage {
    */
   async resetFilter(page: Page): Promise<void> {
     if (!(await this.elementNotVisible(page, this.filterResetButton, 2000))) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+      await this.clickAndWaitForURL(page, this.filterResetButton);
     }
     await this.waitForVisibleSelector(page, this.filterSearchButton, 2000);
   }
@@ -210,7 +210,7 @@ class Tags extends BOBasePage {
   async filterTable(page: Page, filterBy: string, value: string = ''): Promise<void> {
     await this.setValue(page, this.filterColumn(filterBy), value);
     // click on search
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await this.clickAndWaitForURL(page, this.filterSearchButton);
   }
 
   /* Column methods */
@@ -221,7 +221,7 @@ class Tags extends BOBasePage {
    * @return {Promise<void>}
    */
   async gotoEditTagPage(page: Page, row: number): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.tableColumnActionsEditLink(row));
+    await this.clickAndWaitForURL(page, this.tableColumnActionsEditLink(row));
   }
 
   /**
@@ -273,7 +273,7 @@ class Tags extends BOBasePage {
     await page.click(this.tableColumnActionsDeleteLink(row));
 
     // Confirm delete action
-    await this.clickAndWaitForNavigation(page, this.deleteModalButtonYes);
+    await this.clickAndWaitForURL(page, this.deleteModalButtonYes);
 
     // Get successful message
     return this.getAlertSuccessBlockContent(page);
@@ -330,7 +330,7 @@ class Tags extends BOBasePage {
     }
 
     const sortColumnButton = `${columnSelector} i.icon-caret-${sortDirection}`;
-    await this.clickAndWaitForNavigation(page, sortColumnButton);
+    await this.clickAndWaitForURL(page, sortColumnButton);
   }
 
   /* Pagination methods */
@@ -351,7 +351,7 @@ class Tags extends BOBasePage {
    */
   async selectPaginationLimit(page: Page, number: number): Promise<string> {
     await this.waitForSelectorAndClick(page, this.paginationDropdownButton);
-    await this.clickAndWaitForNavigation(page, this.paginationItems(number));
+    await this.clickAndWaitForURL(page, this.paginationItems(number));
 
     return this.getPaginationLabel(page);
   }
@@ -362,7 +362,7 @@ class Tags extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationNext(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink);
+    await this.clickAndWaitForURL(page, this.paginationNextLink);
 
     return this.getPaginationLabel(page);
   }
@@ -373,7 +373,7 @@ class Tags extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationPrevious(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink);
+    await this.clickAndWaitForURL(page, this.paginationPreviousLink);
 
     return this.getPaginationLabel(page);
   }
@@ -405,7 +405,7 @@ class Tags extends BOBasePage {
       this.waitForVisibleSelector(page, this.bulkDeleteLink),
     ]);
 
-    await this.clickAndWaitForNavigation(page, this.bulkDeleteLink);
+    await this.clickAndWaitForURL(page, this.bulkDeleteLink);
 
     // Return successful message
     return this.getAlertSuccessBlockContent(page);
diff --git a/tests/UI/pages/BO/shopParameters/stores/add.ts b/tests/UI/pages/BO/shopParameters/stores/add.ts
index a4665d23d1722..332ad66c8863e 100644
--- a/tests/UI/pages/BO/shopParameters/stores/add.ts
+++ b/tests/UI/pages/BO/shopParameters/stores/add.ts
@@ -120,7 +120,7 @@ class AddStore extends BOBasePage {
     }
 
     // Save store
-    await this.clickAndWaitForNavigation(page, this.saveButton);
+    await this.clickAndWaitForURL(page, this.saveButton);
 
     // Return successful message
     return this.getAlertSuccessBlockParagraphContent(page);
diff --git a/tests/UI/pages/BO/shopParameters/stores/index.ts b/tests/UI/pages/BO/shopParameters/stores/index.ts
index 568a6a0e78382..94d4bcf7b744a 100644
--- a/tests/UI/pages/BO/shopParameters/stores/index.ts
+++ b/tests/UI/pages/BO/shopParameters/stores/index.ts
@@ -231,7 +231,7 @@ class Stores extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToNewStorePage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.newStoreLink);
+    await this.clickAndWaitForURL(page, this.newStoreLink);
   }
 
   /* Filter methods */
@@ -252,7 +252,7 @@ class Stores extends BOBasePage {
    */
   async resetFilter(page: Page): Promise<void> {
     if (!(await this.elementNotVisible(page, this.filterResetButton, 2000))) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+      await this.clickAndWaitForURL(page, this.filterResetButton);
     }
     await this.waitForVisibleSelector(page, this.filterSearchButton, 2000);
   }
@@ -276,15 +276,17 @@ class Stores extends BOBasePage {
    * @return {Promise<void>}
    */
   async filterTable(page: Page, filterType: string, filterBy: string, value: string): Promise<void> {
+    const currentUrl: string = page.url();
+
     switch (filterType) {
       case 'input':
         await this.setValue(page, this.filterColumn(filterBy), value.toString());
-        await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+        await this.clickAndWaitForURL(page, this.filterSearchButton);
         break;
 
       case 'select':
         await Promise.all([
-          page.waitForNavigation({waitUntil: 'networkidle'}),
+          page.waitForURL((url: URL): boolean => url.toString() !== currentUrl, {waitUntil: 'networkidle'}),
           this.selectByVisibleText(page, this.filterColumn(filterBy), value === '1' ? 'Yes' : 'No'),
         ]);
         break;
@@ -375,7 +377,7 @@ class Stores extends BOBasePage {
    * @param row {number} Row on table
    * @return {Promise<boolean>}
    */
-  getStoreStatus(page: Page, row: number): Promise<boolean> {
+  async getStoreStatus(page: Page, row: number): Promise<boolean> {
     return this.elementVisible(page, `${this.tableColumnStatus(row)}.action-enabled`, 1000);
   }
 
@@ -390,7 +392,7 @@ class Stores extends BOBasePage {
     const actualStatus = await this.getStoreStatus(page, row);
 
     if (actualStatus !== wantedStatus) {
-      await this.clickAndWaitForNavigation(page, this.tableColumnStatus(row));
+      await page.click(this.tableColumnStatus(row));
     }
   }
 
@@ -401,7 +403,7 @@ class Stores extends BOBasePage {
    * @return {Promise<void>}
    */
   async gotoEditStorePage(page: Page, row: number): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.tableColumnActionsEditLink(row));
+    await this.clickAndWaitForURL(page, this.tableColumnActionsEditLink(row));
   }
 
   /**
@@ -419,7 +421,7 @@ class Stores extends BOBasePage {
     await page.click(this.tableColumnActionsDeleteLink(row));
 
     // Confirm delete action
-    await this.clickAndWaitForNavigation(page, this.deleteModalButtonYes);
+    await this.clickAndWaitForURL(page, this.deleteModalButtonYes);
 
     // Get successful message
     return this.getAlertSuccessBlockParagraphContent(page);
@@ -463,7 +465,7 @@ class Stores extends BOBasePage {
       ),
     ]);
 
-    await this.clickAndWaitForNavigation(
+    await this.clickAndWaitForURL(
       page,
       statusWanted ? this.enableSelectionLink : this.disableSelectionLink,
     );
@@ -487,7 +489,7 @@ class Stores extends BOBasePage {
       this.waitForVisibleSelector(page, this.bulkDeleteLink),
     ]);
 
-    await this.clickAndWaitForNavigation(page, this.bulkDeleteLink);
+    await this.clickAndWaitForURL(page, this.bulkDeleteLink);
 
     // Return successful message
     return this.getAlertSuccessBlockParagraphContent(page);
@@ -538,7 +540,7 @@ class Stores extends BOBasePage {
     }
 
     const sortColumnButton = `${columnSelector} i.icon-caret-${sortDirection}`;
-    await this.clickAndWaitForNavigation(page, sortColumnButton);
+    await this.clickAndWaitForURL(page, sortColumnButton);
   }
 
   /* Form functions */
@@ -568,7 +570,7 @@ class Stores extends BOBasePage {
     await this.setValue(page, this.faxInput, storeContactData.fax);
 
     // Save contact details
-    await this.clickAndWaitForNavigation(page, this.saveButton);
+    await page.click(this.saveButton);
 
     // Return successful message
     return this.getAlertSuccessBlockParagraphContent(page);
@@ -580,7 +582,7 @@ class Stores extends BOBasePage {
    * @param page {Page} Browser tab
    * @return {Promise<string>}
    */
-  getPaginationLabel(page: Page): Promise<string> {
+  async getPaginationLabel(page: Page): Promise<string> {
     return this.getTextContent(page, this.paginationActiveLabel);
   }
 
@@ -592,7 +594,7 @@ class Stores extends BOBasePage {
    */
   async selectPaginationLimit(page: Page, number: number): Promise<string> {
     await this.waitForSelectorAndClick(page, this.paginationDropdownButton);
-    await this.clickAndWaitForNavigation(page, this.paginationItems(number));
+    await this.clickAndWaitForURL(page, this.paginationItems(number));
 
     return this.getPaginationLabel(page);
   }
@@ -603,7 +605,7 @@ class Stores extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationNext(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink);
+    await this.clickAndWaitForURL(page, this.paginationNextLink);
 
     return this.getPaginationLabel(page);
   }
@@ -614,7 +616,7 @@ class Stores extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationPrevious(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink);
+    await this.clickAndWaitForURL(page, this.paginationPreviousLink);
 
     return this.getPaginationLabel(page);
   }
diff --git a/tests/UI/pages/BO/shopParameters/trafficAndSeo/searchEngines/add.ts b/tests/UI/pages/BO/shopParameters/trafficAndSeo/searchEngines/add.ts
index f2b60d4972bbb..3a60faa234a0f 100644
--- a/tests/UI/pages/BO/shopParameters/trafficAndSeo/searchEngines/add.ts
+++ b/tests/UI/pages/BO/shopParameters/trafficAndSeo/searchEngines/add.ts
@@ -51,7 +51,7 @@ class AddSearchEngine extends BOBasePage {
     await this.setValue(page, this.queryKeyInput, searchEngineData.queryKey);
 
     // Save form
-    await this.clickAndWaitForNavigation(page, this.saveButton);
+    await this.clickAndWaitForURL(page, this.saveButton);
 
     // Get successful message
     return this.getAlertSuccessBlockParagraphContent(page);
diff --git a/tests/UI/pages/BO/shopParameters/trafficAndSeo/searchEngines/index.ts b/tests/UI/pages/BO/shopParameters/trafficAndSeo/searchEngines/index.ts
index f1882c393d4b6..73a1a2d7ebf84 100644
--- a/tests/UI/pages/BO/shopParameters/trafficAndSeo/searchEngines/index.ts
+++ b/tests/UI/pages/BO/shopParameters/trafficAndSeo/searchEngines/index.ts
@@ -137,7 +137,7 @@ class SearchEngines extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToNewSearchEnginePage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.newSearchEngineLink);
+    await this.clickAndWaitForURL(page, this.newSearchEngineLink);
   }
 
   /* Filter methods */
@@ -157,11 +157,10 @@ class SearchEngines extends BOBasePage {
    * @return {Promise<void>}
    */
   async resetFilter(page: Page): Promise<void> {
-    if (!(await this.elementNotVisible(page, this.filterResetButton, 2000))) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+    if (await this.elementVisible(page, this.filterResetButton, 2000)) {
+      await this.clickAndWaitForLoadState(page, this.filterResetButton);
+      await this.elementNotVisible(page, this.filterResetButton, 2000);
     }
-
-    await this.waitForVisibleSelector(page, this.filterSearchButton, 2000);
   }
 
   /**
@@ -184,7 +183,7 @@ class SearchEngines extends BOBasePage {
    */
   async filterTable(page: Page, filterBy: string, value: string): Promise<void> {
     await this.setValue(page, this.filterColumn(filterBy), value.toString());
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await this.clickAndWaitForURL(page, this.filterSearchButton);
   }
 
   /* Column methods */
@@ -233,7 +232,7 @@ class SearchEngines extends BOBasePage {
 
     let i = 0;
     while (await this.elementNotVisible(page, sortColumnDiv, 2000) && i < 2) {
-      await this.clickAndWaitForNavigation(page, sortColumnSpanButton);
+      await this.clickAndWaitForURL(page, sortColumnSpanButton);
       i += 1;
     }
 
@@ -247,7 +246,7 @@ class SearchEngines extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToEditSearchEnginePage(page: Page, row: number): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.tableColumnActionsEditLink(row));
+    await this.clickAndWaitForURL(page, this.tableColumnActionsEditLink(row));
   }
 
   /**
@@ -299,7 +298,7 @@ class SearchEngines extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationNext(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink);
+    await this.clickAndWaitForURL(page, this.paginationNextLink);
     return this.getPaginationLabel(page);
   }
 
@@ -309,7 +308,7 @@ class SearchEngines extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationPrevious(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink);
+    await this.clickAndWaitForURL(page, this.paginationPreviousLink);
     return this.getPaginationLabel(page);
   }
 
@@ -353,7 +352,7 @@ class SearchEngines extends BOBasePage {
    * @returns {Promise<void>}
    */
   async confirmDelete(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.deleteModalButtonYes);
+    await this.clickAndWaitForURL(page, this.deleteModalButtonYes);
   }
 }
 
diff --git a/tests/UI/pages/BO/shopParameters/trafficAndSeo/seoAndUrls/add.ts b/tests/UI/pages/BO/shopParameters/trafficAndSeo/seoAndUrls/add.ts
index 100984427b831..16c35138f79ec 100644
--- a/tests/UI/pages/BO/shopParameters/trafficAndSeo/seoAndUrls/add.ts
+++ b/tests/UI/pages/BO/shopParameters/trafficAndSeo/seoAndUrls/add.ts
@@ -128,7 +128,7 @@ class AddSeoUrl extends BOBasePage {
     await this.setValue(page, this.friendlyUrlInput(2), seoPageData.frFriendlyUrl);
 
     // Save seo page
-    await this.clickAndWaitForNavigation(page, this.saveButton);
+    await this.clickAndWaitForURL(page, this.saveButton);
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 }
diff --git a/tests/UI/pages/BO/shopParameters/trafficAndSeo/seoAndUrls/index.ts b/tests/UI/pages/BO/shopParameters/trafficAndSeo/seoAndUrls/index.ts
index 7b49dbba46136..d8ca7a020f41f 100644
--- a/tests/UI/pages/BO/shopParameters/trafficAndSeo/seoAndUrls/index.ts
+++ b/tests/UI/pages/BO/shopParameters/trafficAndSeo/seoAndUrls/index.ts
@@ -157,7 +157,7 @@ class SeoAndUrls extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToNewSeoUrlPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.addNewSeoPageLink);
+    await this.clickAndWaitForURL(page, this.addNewSeoPageLink);
   }
 
   /**
@@ -166,7 +166,7 @@ class SeoAndUrls extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToSearchEnginesPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.searchEnginesSubTabLink);
+    await this.clickAndWaitForURL(page, this.searchEnginesSubTabLink);
   }
 
   /* Bulk actions methods */
@@ -237,7 +237,7 @@ class SeoAndUrls extends BOBasePage {
    * @return {Promise<void>}
    */
   async goToEditSeoUrlPage(page: Page, row: number = 1): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.editRowLink(row));
+    await this.clickAndWaitForURL(page, this.editRowLink(row));
   }
 
   /**
@@ -269,7 +269,7 @@ class SeoAndUrls extends BOBasePage {
    * @return {Promise<void>}
    */
   async confirmDeleteSeoUrlPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.confirmDeleteButton);
+    await this.clickAndWaitForURL(page, this.confirmDeleteButton);
   }
 
   /* Sort functions */
@@ -286,7 +286,7 @@ class SeoAndUrls extends BOBasePage {
 
     let i = 0;
     while (await this.elementNotVisible(page, sortColumnDiv, 2000) && i < 2) {
-      await this.clickAndWaitForNavigation(page, sortColumnSpanButton);
+      await this.clickAndWaitForURL(page, sortColumnSpanButton);
       i += 1;
     }
 
@@ -300,8 +300,9 @@ class SeoAndUrls extends BOBasePage {
    * @return {Promise<void>}
    */
   async resetFilter(page: Page): Promise<void> {
-    if (!(await this.elementNotVisible(page, this.filterResetButton, 2000))) {
-      await this.clickAndWaitForNavigation(page, this.filterResetButton);
+    if (await this.elementVisible(page, this.filterResetButton, 2000)) {
+      await page.click(this.filterResetButton);
+      await this.elementNotVisible(page, this.filterResetButton, 2000);
     }
   }
 
@@ -336,7 +337,7 @@ class SeoAndUrls extends BOBasePage {
   async filterTable(page: Page, filterBy: string, value: string = ''): Promise<void> {
     await this.setValue(page, this.filterColumn(filterBy), value.toString());
     // click on search
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await this.clickAndWaitForURL(page, this.filterSearchButton);
   }
 
   /* Pagination methods */
@@ -367,7 +368,7 @@ class SeoAndUrls extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationNext(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationNextLink);
+    await this.clickAndWaitForURL(page, this.paginationNextLink);
 
     return this.getPaginationLabel(page);
   }
@@ -378,7 +379,7 @@ class SeoAndUrls extends BOBasePage {
    * @returns {Promise<string>}
    */
   async paginationPrevious(page: Page): Promise<string> {
-    await this.clickAndWaitForNavigation(page, this.paginationPreviousLink);
+    await this.clickAndWaitForURL(page, this.paginationPreviousLink);
 
     return this.getPaginationLabel(page);
   }
@@ -392,7 +393,8 @@ class SeoAndUrls extends BOBasePage {
    */
   async enableDisableFriendlyURL(page: Page, toEnable: boolean = true): Promise<string> {
     await this.setChecked(page, this.friendlyUrlToggleInput(toEnable ? 1 : 0));
-    await this.clickAndWaitForNavigation(page, this.saveSeoAndUrlFormButton);
+    await this.clickAndWaitForLoadState(page, this.saveSeoAndUrlFormButton);
+    await this.elementNotVisible(page, this.friendlyUrlToggleInput(!toEnable ? 1 : 0), 2000);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
@@ -405,7 +407,8 @@ class SeoAndUrls extends BOBasePage {
    */
   async enableDisableAccentedURL(page: Page, toEnable: boolean = true): Promise<string> {
     await this.setChecked(page, this.accentedUrlToggleInput(toEnable ? 1 : 0));
-    await this.clickAndWaitForNavigation(page, this.saveSeoAndUrlFormButton);
+    await this.clickAndWaitForLoadState(page, this.saveSeoAndUrlFormButton);
+    await this.elementNotVisible(page, this.accentedUrlToggleInput(!toEnable ? 1 : 0), 2000);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
@@ -418,7 +421,8 @@ class SeoAndUrls extends BOBasePage {
    */
   async setStatusAttributesInProductMetaTitle(page: Page, toEnable: boolean = true): Promise<string> {
     await this.setChecked(page, this.displayAttributesToggleInput(toEnable ? 1 : 0));
-    await this.clickAndWaitForNavigation(page, this.saveSeoOptionsFormButton);
+    await this.clickAndWaitForLoadState(page, this.saveSeoOptionsFormButton);
+    await this.elementNotVisible(page, this.displayAttributesToggleInput(!toEnable ? 1 : 0), 2000);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
diff --git a/tests/UI/pages/FO/FObasePage.ts b/tests/UI/pages/FO/FObasePage.ts
index 699790c1a60c5..75977fad31e70 100644
--- a/tests/UI/pages/FO/FObasePage.ts
+++ b/tests/UI/pages/FO/FObasePage.ts
@@ -221,7 +221,7 @@ export default class FOBasePage extends CommonPage {
    * @param link {string} Header selector that contain link to click on to
    * @returns {Promise<void>}
    */
-  async clickOnHeaderLink(page: Page, link: string): Promise<void> {
+  async clickOnHeaderLink(page: Page, link: string, hasPageChange: boolean = true): Promise<void> {
     let selector;
 
     switch (link) {
@@ -245,7 +245,10 @@ export default class FOBasePage extends CommonPage {
         throw new Error(`The page ${link} was not found`);
     }
 
-    return this.clickAndWaitForNavigation(page, selector);
+    if (hasPageChange) {
+      return this.clickAndWaitForURL(page, selector);
+    }
+    return this.clickAndWaitForLoadState(page, selector);
   }
 
   /**
@@ -255,7 +258,7 @@ export default class FOBasePage extends CommonPage {
    * @returns {Promise<void>}
    */
   async clickOnBreadCrumbLink(page: Page, link: string): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.breadCrumbLink(link));
+    await this.clickAndWaitForURL(page, this.breadCrumbLink(link));
   }
 
   /**
@@ -265,7 +268,7 @@ export default class FOBasePage extends CommonPage {
    */
   async goToHomePage(page: Page): Promise<void> {
     await this.waitForVisibleSelector(page, this.desktopLogo);
-    await this.clickAndWaitForNavigation(page, this.desktopLogoLink);
+    await this.clickAndWaitForLoadState(page, this.desktopLogoLink);
   }
 
   /**
@@ -274,7 +277,7 @@ export default class FOBasePage extends CommonPage {
    * @return {Promise<void>}
    */
   async goToLoginPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.userInfoLink);
+    await this.clickAndWaitForURL(page, this.userInfoLink);
   }
 
   /**
@@ -285,11 +288,12 @@ export default class FOBasePage extends CommonPage {
   async logout(page: Page): Promise<void> {
     if (this.theme === 'hummingbird') {
       await page.click(this.userMenuDropdown);
-      await this.clickAndWaitForNavigation(page, this.logoutLink);
+      await this.clickAndWaitForLoadState(page, this.logoutLink);
+      await this.elementNotVisible(page, this.logoutLink, 2000);
 
       return;
     }
-    await this.clickAndWaitForNavigation(page, this.logoutLink);
+    await this.clickAndWaitForLoadState(page, this.logoutLink);
   }
 
   /**
@@ -309,11 +313,11 @@ export default class FOBasePage extends CommonPage {
   async goToMyAccountPage(page: Page): Promise<void> {
     if (this.theme === 'hummingbird') {
       await page.click(this.userMenuDropdown);
-      await this.clickAndWaitForNavigation(page, this.accountLink);
+      await this.clickAndWaitForURL(page, this.accountLink);
 
       return;
     }
-    await this.clickAndWaitForNavigation(page, this.accountLink);
+    await this.clickAndWaitForURL(page, this.accountLink);
   }
 
   /**
@@ -345,7 +349,7 @@ export default class FOBasePage extends CommonPage {
       page.click(this.languageSelectorExpandIcon),
       this.waitForVisibleSelector(page, this.languageSelectorList),
     ]);
-    await this.clickAndWaitForNavigation(page, this.languageSelectorMenuItemLink(lang));
+    await this.clickAndWaitForLoadState(page, this.languageSelectorMenuItemLink(lang));
   }
 
   /**
@@ -377,13 +381,12 @@ export default class FOBasePage extends CommonPage {
    */
   async changeCurrency(page: Page, isoCode: string = 'EUR', symbol: string = '€'): Promise<void> {
     // If isoCode and symbol are the same, only isoCode id displayed in FO
+    const currentUrl: string = page.url();
     const currency = isoCode === symbol ? isoCode : `${isoCode} ${symbol}`;
 
     await Promise.all([
       this.selectByVisibleText(page, this.currencySelect, currency, true),
-      page.waitForNavigation({
-        waitUntil: 'networkidle',
-      }),
+      page.waitForURL((url: URL): boolean => url.toString() !== currentUrl, {waitUntil: 'networkidle'}),
     ]);
   }
 
@@ -423,7 +426,7 @@ export default class FOBasePage extends CommonPage {
    * @returns {Promise<void>}
    */
   async goToCategory(page: Page, categoryID: number): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.categoryMenu(categoryID));
+    await this.clickAndWaitForURL(page, this.categoryMenu(categoryID));
   }
 
   /**
@@ -435,7 +438,7 @@ export default class FOBasePage extends CommonPage {
    */
   async goToSubCategory(page: Page, categoryID: number, subCategoryID: number): Promise<void> {
     await page.hover(this.categoryMenu(categoryID));
-    await this.clickAndWaitForNavigation(page, this.categoryMenu(subCategoryID));
+    await this.clickAndWaitForURL(page, this.categoryMenu(subCategoryID));
   }
 
   /**
@@ -462,7 +465,7 @@ export default class FOBasePage extends CommonPage {
    * @returns {Promise<void>}
    */
   async goToCartPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.cartLink);
+    await this.clickAndWaitForURL(page, this.cartLink);
   }
 
   /**
@@ -477,7 +480,6 @@ export default class FOBasePage extends CommonPage {
   /**
    * Check if there are autocomplete search result
    * @param page {Page} Browser tab
-   * @param productName {string} Product name to search
    * @returns {Promise<boolean>}
    */
   async isAutocompleteSearchResultVisible(page: Page): Promise<boolean> {
@@ -526,11 +528,11 @@ export default class FOBasePage extends CommonPage {
    * @returns {Promise<void>}
    */
   async searchProduct(page: Page, productName: string): Promise<void > {
+    const currentUrl: string = page.url();
+
     await this.setValue(page, this.searchInput, productName);
     await page.keyboard.press('Enter');
-    await page.waitForNavigation({
-      waitUntil: 'networkidle',
-    });
+    await page.waitForURL((url: URL): boolean => url.toString() !== currentUrl, {waitUntil: 'networkidle'});
   }
 
   /**
@@ -543,7 +545,7 @@ export default class FOBasePage extends CommonPage {
   async clickAutocompleteSearchResult(page: Page, productName: string, nthResult: number): Promise<void> {
     await this.setValue(page, this.searchInput, productName);
     await this.waitForVisibleSelector(page, this.autocompleteSearchResultItem);
-    await this.clickAndWaitForNavigation(page, this.autocompleteSearchResultItemLink(nthResult));
+    await this.clickAndWaitForURL(page, this.autocompleteSearchResultItemLink(nthResult));
   }
 
   // Footer methods
@@ -672,7 +674,7 @@ export default class FOBasePage extends CommonPage {
         throw new Error(`The page ${textSelector} was not found`);
     }
 
-    return this.clickAndWaitForNavigation(page, selector);
+    return this.clickAndWaitForURL(page, selector);
   }
 
   /**
diff --git a/tests/UI/pages/FO/cart/index.ts b/tests/UI/pages/FO/cart/index.ts
index 0691007b72936..76519da96f0f5 100644
--- a/tests/UI/pages/FO/cart/index.ts
+++ b/tests/UI/pages/FO/cart/index.ts
@@ -258,7 +258,8 @@ class Cart extends FOBasePage {
    */
   async clickOnProceedToCheckout(page: Page): Promise<void> {
     await this.waitForVisibleSelector(page, this.proceedToCheckoutButton);
-    await this.clickAndWaitForNavigation(page, this.proceedToCheckoutButton);
+    await this.clickAndWaitForLoadState(page, this.proceedToCheckoutButton);
+    await this.elementNotVisible(page, this.proceedToCheckoutButton, 2000);
   }
 
   /**
diff --git a/tests/UI/pages/FO/category/index.ts b/tests/UI/pages/FO/category/index.ts
index 2f2f2b3d00ff0..9fdd420664c2c 100644
--- a/tests/UI/pages/FO/category/index.ts
+++ b/tests/UI/pages/FO/category/index.ts
@@ -238,7 +238,7 @@ class Category extends FOBasePage {
    * @returns {Promise<void>}
    */
   async goToNextPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.paginationNext);
+    await this.clickAndWaitForURL(page, this.paginationNext);
   }
 
   /**
@@ -247,7 +247,7 @@ class Category extends FOBasePage {
    * @returns {Promise<void>}
    */
   async goToPreviousPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.paginationPrevious);
+    await this.clickAndWaitForURL(page, this.paginationPrevious);
   }
 
   // Quick view methods
diff --git a/tests/UI/pages/FO/checkout/index.ts b/tests/UI/pages/FO/checkout/index.ts
index 911e1aa5d05a1..e04e47a02a709 100644
--- a/tests/UI/pages/FO/checkout/index.ts
+++ b/tests/UI/pages/FO/checkout/index.ts
@@ -451,7 +451,7 @@ class Checkout extends FOBasePage {
    * @returns {Promise<void}
    */
   async clickOnProductImage(page: Page, productRow: number): Promise<void> {
-    return this.clickAndWaitForNavigation(page, this.productDetailsImage(productRow));
+    return this.clickAndWaitForURL(page, this.productDetailsImage(productRow));
   }
 
   /**
@@ -500,7 +500,7 @@ class Checkout extends FOBasePage {
    * @return {Promise<void>}
    */
   async goToPasswordReminderPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.forgetPasswordLink);
+    await this.clickAndWaitForURL(page, this.forgetPasswordLink);
   }
 
   /**
@@ -540,7 +540,7 @@ class Checkout extends FOBasePage {
     await this.waitForVisibleSelector(page, this.emailInput);
     await this.setValue(page, this.emailInput, customer.email);
     await this.setValue(page, this.passwordInput, customer.password);
-    await this.clickAndWaitForNavigation(page, this.personalInformationContinueButton);
+    await this.clickAndWaitForLoadState(page, this.personalInformationContinueButton);
 
     return this.isStepCompleted(page, this.personalInformationStepForm);
   }
@@ -852,7 +852,7 @@ class Checkout extends FOBasePage {
    * @return {Promise<boolean>}
    */
   async goToDeliveryStep(page: Page): Promise<boolean> {
-    await this.clickAndWaitForNavigation(page, this.addressStepContinueButton);
+    await this.clickAndWaitForLoadState(page, this.addressStepContinueButton);
 
     return this.isStepCompleted(page, this.addressStepSection);
   }
@@ -928,7 +928,7 @@ class Checkout extends FOBasePage {
    * @returns {Promise<void>}
    */
   async chooseShippingMethodWithoutValidation(page: Page, shippingMethodID: number, comment: string = ''): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.deliveryOptionLabel(shippingMethodID));
+    await this.clickAndWaitForURL(page, this.deliveryOptionLabel(shippingMethodID));
     await this.setValue(page, this.deliveryMessage, comment);
   }
 
@@ -998,7 +998,7 @@ class Checkout extends FOBasePage {
    * @return {Promise<boolean>}
    */
   async goToPaymentStep(page: Page): Promise<boolean> {
-    await this.clickAndWaitForNavigation(page, this.deliveryStepContinueButton);
+    await this.clickAndWaitForLoadState(page, this.deliveryStepContinueButton);
 
     return this.isStepCompleted(page, this.deliveryStepSection);
   }
@@ -1098,7 +1098,7 @@ class Checkout extends FOBasePage {
       this.waitForVisibleSelector(page, this.paymentConfirmationButton),
       page.click(this.conditionToApproveLabel),
     ]);
-    await this.clickAndWaitForNavigation(page, this.paymentConfirmationButton);
+    await this.clickAndWaitForURL(page, this.paymentConfirmationButton);
   }
 
   /**
@@ -1145,7 +1145,7 @@ class Checkout extends FOBasePage {
     }
 
     // Validate the order
-    await this.clickAndWaitForNavigation(page, this.paymentConfirmationButton);
+    await this.clickAndWaitForURL(page, this.paymentConfirmationButton);
   }
 
   /**
diff --git a/tests/UI/pages/FO/checkout/orderConfirmation.ts b/tests/UI/pages/FO/checkout/orderConfirmation.ts
index a2d9ebcdf4d99..38e5f42c7ab5c 100644
--- a/tests/UI/pages/FO/checkout/orderConfirmation.ts
+++ b/tests/UI/pages/FO/checkout/orderConfirmation.ts
@@ -85,7 +85,7 @@ class OrderConfirmation extends FOBasePage {
    * @returns {Promise<void>}
    */
   async goToContactUsPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.customerSupportLink);
+    await this.clickAndWaitForURL(page, this.customerSupportLink);
   }
 
   /**
diff --git a/tests/UI/pages/FO/home/index.ts b/tests/UI/pages/FO/home/index.ts
index 81587459820ec..b91f76070d13d 100644
--- a/tests/UI/pages/FO/home/index.ts
+++ b/tests/UI/pages/FO/home/index.ts
@@ -280,7 +280,7 @@ class HomePage extends FOBasePage {
    * @returns {Promise<void>}
    */
   async goToProductPage(page: Page, id: number): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.productImg(id));
+    await this.clickAndWaitForURL(page, this.productImg(id));
   }
 
   /**
@@ -309,7 +309,7 @@ class HomePage extends FOBasePage {
    * @return {Promise<void>}
    */
   async goToAllProductsPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.allProductLink);
+    await this.clickAndWaitForURL(page, this.allProductLink);
   }
 
   /**
@@ -407,7 +407,7 @@ class HomePage extends FOBasePage {
         throw new Error(`Block ${blockID} was not found`);
     }
 
-    await this.clickAndWaitForNavigation(page, columnSelector);
+    await this.clickAndWaitForURL(page, columnSelector);
   }
 
   /**
@@ -714,7 +714,7 @@ class HomePage extends FOBasePage {
     }
     /* eslint-enable no-await-in-loop */
 
-    await this.clickAndWaitForNavigation(page, this.productColorLink(id, color));
+    await this.clickAndWaitForURL(page, this.productColorLink(id, color));
   }
 
   /**
@@ -786,7 +786,7 @@ class HomePage extends FOBasePage {
    * @return {Promise<void>}
    */
   async proceedToCheckout(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.cartModalCheckoutLink);
+    await this.clickAndWaitForURL(page, this.cartModalCheckoutLink);
     await page.waitForLoadState('domcontentloaded');
   }
 
diff --git a/tests/UI/pages/FO/login/index.ts b/tests/UI/pages/FO/login/index.ts
index d20c987fd9dd8..bfed08e75ab28 100644
--- a/tests/UI/pages/FO/login/index.ts
+++ b/tests/UI/pages/FO/login/index.ts
@@ -71,7 +71,8 @@ class LoginPage extends FOBasePage {
     await this.setValue(page, this.emailInput, customer.email);
     await this.setValue(page, this.passwordInput, customer.password);
     if (waitForNavigation) {
-      await this.clickAndWaitForNavigation(page, this.signInButton);
+      await this.clickAndWaitForLoadState(page, this.signInButton);
+      await this.elementNotVisible(page, this.signInButton, 2000);
     } else {
       await page.click(this.signInButton);
     }
@@ -112,7 +113,7 @@ class LoginPage extends FOBasePage {
    * @returns {Promise<void>}
    */
   async goToCreateAccountPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.displayRegisterFormLink);
+    await this.clickAndWaitForURL(page, this.displayRegisterFormLink);
   }
 
   /**
@@ -121,7 +122,7 @@ class LoginPage extends FOBasePage {
    * @returns {Promise<void>}
    */
   async goToPasswordReminderPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.passwordReminderLink);
+    await this.clickAndWaitForURL(page, this.passwordReminderLink);
   }
 }
 
diff --git a/tests/UI/pages/FO/myAccount/addAddress.ts b/tests/UI/pages/FO/myAccount/addAddress.ts
index 5e6ff354da4ff..9b19cce10421e 100644
--- a/tests/UI/pages/FO/myAccount/addAddress.ts
+++ b/tests/UI/pages/FO/myAccount/addAddress.ts
@@ -127,7 +127,7 @@ class AddAddress extends FOBasePage {
     }
 
     // Save address
-    await this.clickAndWaitForNavigation(page, this.saveButton);
+    await this.clickAndWaitForURL(page, this.saveButton);
 
     return this.getTextContent(page, this.alertSuccessBlock);
   }
diff --git a/tests/UI/pages/FO/myAccount/addresses.ts b/tests/UI/pages/FO/myAccount/addresses.ts
index e9d83207f776e..a815038b9cecd 100644
--- a/tests/UI/pages/FO/myAccount/addresses.ts
+++ b/tests/UI/pages/FO/myAccount/addresses.ts
@@ -64,7 +64,7 @@ class Addresses extends FOBasePage {
    */
   async openNewAddressForm(page: Page): Promise<void> {
     if (await this.elementVisible(page, this.createNewAddressLink, 2000)) {
-      await this.clickAndWaitForNavigation(page, this.createNewAddressLink);
+      await this.clickAndWaitForURL(page, this.createNewAddressLink);
     }
   }
 
@@ -92,11 +92,10 @@ class Addresses extends FOBasePage {
   async goToEditAddressPage(page: Page, position: string | number = 'last'): Promise<void> {
     const editButtons = await page.$$(this.editAddressLink);
     const positionEditButtons: number = typeof position === 'string' ? (editButtons.length - 1) : (position - 1);
+    const currentUrl: string = page.url();
 
     await Promise.all([
-      page.waitForNavigation({
-        waitUntil: 'networkidle',
-      }),
+      page.waitForURL((url: URL): boolean => url.toString() !== currentUrl, {waitUntil: 'networkidle'}),
       editButtons[positionEditButtons].click(),
     ]);
   }
@@ -112,9 +111,7 @@ class Addresses extends FOBasePage {
     const positionDeleteButtons: number = typeof position === 'string' ? (deleteButtons.length - 1) : (position - 1);
 
     await Promise.all([
-      page.waitForNavigation({
-        waitUntil: 'networkidle',
-      }),
+      page.waitForLoadState(),
       deleteButtons[positionDeleteButtons].click(),
     ]);
 
diff --git a/tests/UI/pages/FO/myAccount/creditSlips.ts b/tests/UI/pages/FO/myAccount/creditSlips.ts
index 6cce8e816f47f..4ea9af10dbd00 100644
--- a/tests/UI/pages/FO/myAccount/creditSlips.ts
+++ b/tests/UI/pages/FO/myAccount/creditSlips.ts
@@ -100,7 +100,7 @@ class CreditSlip extends FOBasePage {
    * @returns {Promise<void>}
    */
   async clickOrderReference(page: Page, creditSlipRow: number = 1): Promise<void> {
-    await this.clickAndWaitForNavigation(page, `${this.creditSlipsTableColumn(creditSlipRow, 1)} a`);
+    await this.clickAndWaitForURL(page, `${this.creditSlipsTableColumn(creditSlipRow, 1)} a`);
   }
 
   /**
@@ -128,7 +128,7 @@ class CreditSlip extends FOBasePage {
    * @returns {Promise<void>}
    */
   async clickBackToYourAccountLink(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.backToYourAccountLink);
+    await this.clickAndWaitForURL(page, this.backToYourAccountLink);
   }
 
   /**
@@ -137,7 +137,7 @@ class CreditSlip extends FOBasePage {
    * @returns {Promise<void>}
    */
   async clickHomeLink(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.homeLink);
+    await this.clickAndWaitForURL(page, this.homeLink);
   }
 }
 
diff --git a/tests/UI/pages/FO/myAccount/gdprPersonalData.ts b/tests/UI/pages/FO/myAccount/gdprPersonalData.ts
index b7a37c6dffb5c..e044ee60cec55 100644
--- a/tests/UI/pages/FO/myAccount/gdprPersonalData.ts
+++ b/tests/UI/pages/FO/myAccount/gdprPersonalData.ts
@@ -62,7 +62,7 @@ class GDPRPersonalData extends FOBasePage {
    * @returns {Promise<void>}
    */
   async goToContactUsPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.contactUsHyperLink);
+    await this.clickAndWaitForURL(page, this.contactUsHyperLink);
   }
 
   /**
diff --git a/tests/UI/pages/FO/myAccount/identity.ts b/tests/UI/pages/FO/myAccount/identity.ts
index beb1c8c9b1c6d..3f78a44726df2 100644
--- a/tests/UI/pages/FO/myAccount/identity.ts
+++ b/tests/UI/pages/FO/myAccount/identity.ts
@@ -111,7 +111,7 @@ class AccountIdentity extends FOBasePage {
       await this.setChecked(page, this.psgdprCheckbox);
     }
 
-    await this.clickAndWaitForNavigation(page, this.saveButton);
+    await this.clickAndWaitForLoadState(page, this.saveButton);
 
     return this.getTextContent(page, this.notificationsBlock);
   }
@@ -158,7 +158,7 @@ class AccountIdentity extends FOBasePage {
     }
     await page.click(this.newsletterCheckbox);
 
-    await this.clickAndWaitForNavigation(page, this.saveButton);
+    await this.clickAndWaitForLoadState(page, this.saveButton);
 
     return this.getTextContent(page, this.alertSuccessBlock);
   }
diff --git a/tests/UI/pages/FO/myAccount/index.ts b/tests/UI/pages/FO/myAccount/index.ts
index 00b87222752a7..75c9c2f8daba4 100644
--- a/tests/UI/pages/FO/myAccount/index.ts
+++ b/tests/UI/pages/FO/myAccount/index.ts
@@ -74,7 +74,7 @@ class MyAccountPage extends FOBasePage {
    * @return {Promise<void>}
    */
   async goToInformationPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.accountInformationLink);
+    await this.clickAndWaitForURL(page, this.accountInformationLink);
   }
 
   /**
@@ -83,7 +83,7 @@ class MyAccountPage extends FOBasePage {
    * @return {Promise<void>}
    */
   async goToCreditSlipsPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.orderSlipsLink);
+    await this.clickAndWaitForURL(page, this.orderSlipsLink);
   }
 
   /**
@@ -92,7 +92,7 @@ class MyAccountPage extends FOBasePage {
    * @returns {Promise<void>}
    */
   async goToHistoryAndDetailsPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.accountHistoryLink);
+    await this.clickAndWaitForURL(page, this.accountHistoryLink);
   }
 
   /**
@@ -111,9 +111,9 @@ class MyAccountPage extends FOBasePage {
    */
   async goToAddressesPage(page: Page): Promise<void> {
     if (await this.elementVisible(page, this.accountFirstAddressLink, 2000)) {
-      await this.clickAndWaitForNavigation(page, this.accountFirstAddressLink);
+      await this.clickAndWaitForURL(page, this.accountFirstAddressLink);
     } else {
-      await this.clickAndWaitForNavigation(page, this.accountAddressesLink);
+      await this.clickAndWaitForURL(page, this.accountAddressesLink);
     }
   }
 
@@ -123,7 +123,7 @@ class MyAccountPage extends FOBasePage {
    * @returns {Promise<void>}
    */
   async goToVouchersPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.accountVouchersLink);
+    await this.clickAndWaitForURL(page, this.accountVouchersLink);
   }
 
   /**
@@ -132,7 +132,7 @@ class MyAccountPage extends FOBasePage {
    * @returns {Promise<void>}
    */
   async goToMerchandiseReturnsPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.merchandiseReturnsLink);
+    await this.clickAndWaitForURL(page, this.merchandiseReturnsLink);
   }
 
   /**
@@ -141,7 +141,7 @@ class MyAccountPage extends FOBasePage {
    * @returns {Promise<void>}
    */
   async logout(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.logoutFooterLink);
+    await this.clickAndWaitForURL(page, this.logoutFooterLink);
   }
 
   /**
@@ -150,7 +150,7 @@ class MyAccountPage extends FOBasePage {
    * @returns {Promise<void>}
    */
   async goToMyGDPRPersonalDataPage(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.psgdprLink);
+    await this.clickAndWaitForURL(page, this.psgdprLink);
   }
 }
 
diff --git a/tests/UI/pages/FO/myAccount/merchandiseReturns.ts b/tests/UI/pages/FO/myAccount/merchandiseReturns.ts
index 22deb6a95fe33..8cfbd6fd59e1a 100644
--- a/tests/UI/pages/FO/myAccount/merchandiseReturns.ts
+++ b/tests/UI/pages/FO/myAccount/merchandiseReturns.ts
@@ -114,7 +114,7 @@ class MerchandiseReturns extends FOBasePage {
    * @returns {Promise<void>}
    */
   async goToReturnDetailsPage(page: Page, row: number = 1): Promise<void> {
-    await this.clickAndWaitForNavigation(page, `${this.tableColumn(row, 2)} a`);
+    await this.clickAndWaitForURL(page, `${this.tableColumn(row, 2)} a`);
   }
 
   /**
diff --git a/tests/UI/pages/FO/myAccount/orderDetails.ts b/tests/UI/pages/FO/myAccount/orderDetails.ts
index 20f2217cced60..c39fc5c7745d3 100644
--- a/tests/UI/pages/FO/myAccount/orderDetails.ts
+++ b/tests/UI/pages/FO/myAccount/orderDetails.ts
@@ -145,7 +145,7 @@ class OrderDetails extends FOBasePage {
   ): Promise<void> {
     await this.chooseProductsToReturn(page, productsNumber, returnData);
     await this.setValue(page, this.returnTextarea, messageText);
-    await this.clickAndWaitForNavigation(page, this.requestReturnButton);
+    await this.clickAndWaitForURL(page, this.requestReturnButton);
   }
 
   /**
@@ -173,7 +173,7 @@ class OrderDetails extends FOBasePage {
   async addAMessage(page: Page, messageOption: string, messageText: string): Promise<string> {
     await this.selectByVisibleText(page, this.productIdSelect, messageOption);
     await this.setValue(page, this.messageTextarea, messageText);
-    await this.clickAndWaitForNavigation(page, this.submitMessageButton);
+    await this.clickAndWaitForURL(page, this.submitMessageButton);
 
     return this.getTextContent(page, this.alertSuccessBlock);
   }
@@ -216,7 +216,7 @@ class OrderDetails extends FOBasePage {
    * @returns {Promise<void>}
    */
   async clickOnReorderLink(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.reorderLink);
+    await this.clickAndWaitForURL(page, this.reorderLink);
   }
 
   /**
diff --git a/tests/UI/pages/FO/myAccount/orderHistory.ts b/tests/UI/pages/FO/myAccount/orderHistory.ts
index e2cd23350364e..aed7d565f5919 100644
--- a/tests/UI/pages/FO/myAccount/orderHistory.ts
+++ b/tests/UI/pages/FO/myAccount/orderHistory.ts
@@ -132,7 +132,7 @@ class OrderHistoryPage extends FOBasePage {
    * @returns {Promise<void>}
    */
   async clickOnReorderLink(page: Page, orderRow: number = 1): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.reorderLink(orderRow));
+    await this.clickAndWaitForURL(page, this.reorderLink(orderRow));
   }
 
   /**
@@ -181,7 +181,7 @@ class OrderHistoryPage extends FOBasePage {
    * @returns {Promise<void>}
    */
   async goToDetailsPage(page: Page, orderRow: number = 1): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.detailsLink(orderRow));
+    await this.clickAndWaitForURL(page, this.detailsLink(orderRow));
   }
 
   /**
@@ -191,7 +191,7 @@ class OrderHistoryPage extends FOBasePage {
    * @returns {Promise<void>}
    */
   async goToOrderDetailsPage(page: Page, orderID: number = 1): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.orderDetailsLink(orderID));
+    await this.clickAndWaitForURL(page, this.orderDetailsLink(orderID));
   }
 
   /**
@@ -199,7 +199,7 @@ class OrderHistoryPage extends FOBasePage {
    * @param page {Page} Browser tab
    */
   async clickOnBackToYourAccountLink(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.backToYourAccountLink);
+    await this.clickAndWaitForURL(page, this.backToYourAccountLink);
   }
 
   /**
@@ -207,7 +207,7 @@ class OrderHistoryPage extends FOBasePage {
    * @param page {Page} Browser tab
    */
   async clickOnHomeLink(page: Page): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.homeLink);
+    await this.clickAndWaitForURL(page, this.homeLink);
   }
 
   // Methods for box messages
@@ -253,7 +253,7 @@ class OrderHistoryPage extends FOBasePage {
     }
 
     await this.setValue(page, this.messageTextarea, messageText.message);
-    await this.clickAndWaitForNavigation(page, this.sendMessageButton);
+    await this.clickAndWaitForURL(page, this.sendMessageButton);
 
     return this.getTextContent(page, this.alertSuccessBlock);
   }
diff --git a/tests/UI/pages/FO/passwordReminder/index.ts b/tests/UI/pages/FO/passwordReminder/index.ts
index 383f4ce699f48..4b3089214bd7e 100644
--- a/tests/UI/pages/FO/passwordReminder/index.ts
+++ b/tests/UI/pages/FO/passwordReminder/index.ts
@@ -67,7 +67,8 @@ class PasswordReminder extends FOBasePage {
    */
   async sendResetPasswordLink(page: Page, email: string): Promise<void> {
     await this.setValue(page, this.emailFormField, email);
-    await this.clickAndWaitForNavigation(page, this.sendResetLinkButton);
+    await this.clickAndWaitForLoadState(page, this.sendResetLinkButton);
+    await this.elementNotVisible(page, this.sendResetLinkButton, 2000);
   }
 
   /**
diff --git a/tests/UI/pages/FO/product/index.ts b/tests/UI/pages/FO/product/index.ts
index 8afe6df23d9c6..a7a537f614491 100644
--- a/tests/UI/pages/FO/product/index.ts
+++ b/tests/UI/pages/FO/product/index.ts
@@ -491,7 +491,7 @@ class Product extends FOBasePage {
 
     if (proceedToCheckout) {
       await this.waitForVisibleSelector(page, this.proceedToCheckoutButton);
-      await this.clickAndWaitForNavigation(page, this.proceedToCheckoutButton);
+      await this.clickAndWaitForURL(page, this.proceedToCheckoutButton);
       await this.waitForPageTitleToLoad(page);
     } else {
       await this.waitForSelectorAndClick(page, this.continueShoppingButton);
@@ -553,7 +553,7 @@ class Product extends FOBasePage {
    * @param page {Page} Browser tab
    * @returns {Promise<boolean>}
    */
-  isAvailabilityQuantityDisplayed(page: Page): Promise<boolean> {
+  async isAvailabilityQuantityDisplayed(page: Page): Promise<boolean> {
     return this.elementVisible(page, this.productAvailabilityIcon, 1000);
   }
 
@@ -562,7 +562,7 @@ class Product extends FOBasePage {
    * @param page {Page} Browser tab
    * @returns {Promise<boolean>}
    */
-  isPriceDisplayed(page: Page): Promise<boolean> {
+  async isPriceDisplayed(page: Page): Promise<boolean> {
     return this.elementVisible(page, this.productPrice, 1000);
   }
 
@@ -571,7 +571,7 @@ class Product extends FOBasePage {
    * @param page {Page} Browser tab
    * @returns {Promise<boolean>}
    */
-  isAddToCartButtonDisplayed(page: Page): Promise<boolean> {
+  async isAddToCartButtonDisplayed(page: Page): Promise<boolean> {
     return this.elementVisible(page, this.addToCartButton, 1000);
   }
 
@@ -592,7 +592,7 @@ class Product extends FOBasePage {
    * @param color {string} Product's color to check
    * @returns {Promise<boolean>}
    */
-  isUnavailableProductColorDisplayed(page: Page, color: string): Promise<boolean> {
+  async isUnavailableProductColorDisplayed(page: Page, color: string): Promise<boolean> {
     return this.elementVisible(page, this.productColorInput(color), 1000);
   }
 
@@ -601,7 +601,7 @@ class Product extends FOBasePage {
    * @param page {Page} Browser tab
    * @returns {Promise<boolean>}
    */
-  isAddToCartButtonEnabled(page: Page): Promise<boolean> {
+  async isAddToCartButtonEnabled(page: Page): Promise<boolean> {
     return this.elementNotVisible(page, `${this.addToCartButton}:disabled`, 1000);
   }
 
@@ -610,7 +610,7 @@ class Product extends FOBasePage {
    * @param page {Page} Browser tab
    * @return {Promise<boolean>}
    */
-  isDeliveryInformationVisible(page: Page): Promise<boolean> {
+  async isDeliveryInformationVisible(page: Page): Promise<boolean> {
     return this.elementVisible(page, this.deliveryInformationSpan, 1000);
   }
 
@@ -640,7 +640,7 @@ class Product extends FOBasePage {
    * @param page {Page} The browser tab
    * @returns {Promise<number>}
    */
-  getNumberOfComments(page: Page): Promise<number> {
+  async getNumberOfComments(page: Page): Promise<number> {
     return page.$$eval(this.productReviewRows, (rows) => rows.length);
   }
 
@@ -650,7 +650,7 @@ class Product extends FOBasePage {
    * @param row {Number} the review number in the list
    * @returns {Promise<string>}
    */
-  getReviewTitle(page: Page, row: number = 1): Promise<string> {
+  async getReviewTitle(page: Page, row: number = 1): Promise<string> {
     return this.getTextContent(page, this.productReviewTitle(row));
   }
 
@@ -660,7 +660,7 @@ class Product extends FOBasePage {
    * @param row {Number} the review number in the list
    * @returns {Promise<string>}
    */
-  getReviewTextContent(page: Page, row: number = 1): Promise<string> {
+  async getReviewTextContent(page: Page, row: number = 1): Promise<string> {
     return this.getTextContent(page, this.productReviewContent(row));
   }
 
@@ -670,7 +670,7 @@ class Product extends FOBasePage {
    * @param row {Number} the review number in the list
    * @returns {Promise<number>}
    */
-  getReviewRating(page: Page, row: number = 1): Promise<number> {
+  async getReviewRating(page: Page, row: number = 1): Promise<number> {
     return page.$$eval(this.productRatingStar(row), (divs) => divs.length);
   }
 }
diff --git a/tests/UI/pages/FO/searchResults/index.ts b/tests/UI/pages/FO/searchResults/index.ts
index 09c3671883b0f..2a0fbedae7e4f 100644
--- a/tests/UI/pages/FO/searchResults/index.ts
+++ b/tests/UI/pages/FO/searchResults/index.ts
@@ -82,7 +82,7 @@ class SearchResults extends FOBasePage {
    * @returns {Promise<void>}
    */
   async goToProductPage(page: Page, id: number): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.productImg(id));
+    await this.clickAndWaitForURL(page, this.productImg(id));
   }
 
   /**
diff --git a/tests/UI/pages/FO/siteMap/index.ts b/tests/UI/pages/FO/siteMap/index.ts
index 76956150c1661..2bf37560d0f3c 100644
--- a/tests/UI/pages/FO/siteMap/index.ts
+++ b/tests/UI/pages/FO/siteMap/index.ts
@@ -95,7 +95,7 @@ class SiteMap extends FOBasePage {
    * @return {Promise<void>}
    */
   async viewCreatedCategory(page: Page, categoryID: number): Promise<void> {
-    return this.clickAndWaitForNavigation(page, this.categoryPageLink(categoryID));
+    return this.clickAndWaitForURL(page, this.categoryPageLink(categoryID));
   }
 }
 
diff --git a/tests/UI/pages/commonPage.ts b/tests/UI/pages/commonPage.ts
index a8b86231f6fae..6d48fd36c06d6 100755
--- a/tests/UI/pages/commonPage.ts
+++ b/tests/UI/pages/commonPage.ts
@@ -85,7 +85,7 @@ export default class CommonPage {
   }
 
   /**
-   * Wait for selector to be visible
+   * Wait for selector to be hidden
    * @param page {Page} Browser tab
    * @param selector {string} selector to wait
    * @param timeout {number} Time to wait on milliseconds before throwing an error
@@ -325,21 +325,43 @@ export default class CommonPage {
   }
 
   /**
-   * Go to Page and wait for navigation
+   * Go to Page and wait for load State
+   * @param page {Frame|Page} Browser tab
+   * @param selector {string} String to locate the element
+   * @param state {'load'|'domcontentloaded'|'networkidle'} The event to wait after click
+   * @param timeout {number} Time to wait for navigation
+   * @return {Promise<void>}
+   */
+  async clickAndWaitForLoadState(
+    page: Frame|Page,
+    selector: string,
+    state: 'load'|'domcontentloaded'|'networkidle' = 'networkidle',
+    timeout: number = 30000,
+  ): Promise<void> {
+    await Promise.all([
+      page.waitForLoadState(state, {timeout}),
+      page.click(selector),
+    ]);
+  }
+
+  /**
+   * Go to Page and wait for change URL
    * @param page {Frame|Page} Browser tab
    * @param selector {string} String to locate the element
    * @param waitUntil {WaitForNavigationWaitUntil} The event to wait after click
    * @param timeout {number} Time to wait for navigation
    * @return {Promise<void>}
    */
-  async clickAndWaitForNavigation(
+  async clickAndWaitForURL(
     page: Frame|Page,
     selector: string,
     waitUntil: WaitForNavigationWaitUntil = 'networkidle',
     timeout: number = 30000,
   ): Promise<void> {
+    const currentUrl: string = page.url();
+
     await Promise.all([
-      page.waitForNavigation({waitUntil, timeout}),
+      page.waitForURL((url: URL): boolean => url.toString() !== currentUrl, {waitUntil, timeout}),
       page.click(selector),
     ]);
   }
@@ -360,7 +382,7 @@ export default class CommonPage {
    * @param selector {string} String to locate the checkbox
    * @return {Promise<boolean>}
    */
-  isDisabled(page: Page, selector: string): Promise<boolean> {
+  async isDisabled(page: Page, selector: string): Promise<boolean> {
     return page.isDisabled(selector);
   }
 
@@ -370,7 +392,7 @@ export default class CommonPage {
    * @param selector {string} String to locate the checkbox
    * @return {Promise<boolean>}
    */
-  isChecked(page: Frame|Page, selector: string): Promise<boolean> {
+  async isChecked(page: Frame|Page, selector: string): Promise<boolean> {
     return page.isChecked(selector);
   }
 
@@ -493,7 +515,7 @@ export default class CommonPage {
     /* eslint-disable no-return-assign, no-param-reassign */
     // Delete the target because a new tab is opened when downloading the file
     if (targetBlank) {
-      await page.$eval(selector, (el: HTMLLinkElement) => el.target = '');
+      await page.$eval(selector, (el: HTMLLinkElement) => el.setAttribute('target', ''));
     }
     /* eslint-enable no-return-assign, no-param-reassign */
 
diff --git a/tests/UI/tools/urls.ts b/tests/UI/tools/urls.ts
index c3a7d6ceff2e2..2c24fc46b4434 100644
--- a/tests/UI/tools/urls.ts
+++ b/tests/UI/tools/urls.ts
@@ -7,12 +7,14 @@ import {Page} from 'playwright';
  * @return {Promise<void>}
  */
 const loginBO = async function (page: Page): Promise<void> {
+  const currentUrl: string = page.url();
+
   await page.type('#email', global.BO.EMAIL);
   await page.type('#passwd', global.BO.PASSWD);
 
   await Promise.all([
     page.click('#submit_login'),
-    page.waitForNavigation({waitUntil: 'networkidle'}),
+    page.waitForURL((url: URL): boolean => url.toString() !== currentUrl, {waitUntil: 'networkidle'}),
   ]);
 
   const block = await page.$('button.onboarding-button-shut-down');
@@ -30,14 +32,14 @@ const loginBO = async function (page: Page): Promise<void> {
  * @return {Promise<void>}
  */
 const loginFO = async function (page: Page): Promise<void> {
+  const currentUrl: string = page.url();
+
   await page.type('#login-form input[name=email]', Customers.johnDoe.email);
   await page.type('#login-form input[name=password]', Customers.johnDoe.password);
 
   await Promise.all([
     page.click('#submit-login'),
-    page.waitForNavigation({
-      waitUntil: 'networkidle',
-    }),
+    page.waitForURL((url: URL): boolean => url.toString() !== currentUrl, {waitUntil: 'networkidle'}),
   ]);
 };
 
diff --git a/tests/UI/utils/api.ts b/tests/UI/utils/api.ts
index e3f417850a81a..a045cca0f9032 100644
--- a/tests/UI/utils/api.ts
+++ b/tests/UI/utils/api.ts
@@ -114,8 +114,8 @@ export default {
     const payloadString: string = JSON.stringify(payload);
 
     // Transform string in base64
-    const headerBase64: string = atob(headerString);
-    const payloadBase64: string = atob(payloadString);
+    const headerBase64: string = Buffer.from(headerString, 'base64').toString();
+    const payloadBase64: string = Buffer.from(payloadString, 'base64').toString();
 
     // Sign the header & payload
     const signatureFunction: crypto.Sign = crypto.createSign('RSA-SHA256');
@@ -129,6 +129,6 @@ export default {
     const headerBuffer: Buffer = Buffer.from(headerString);
     const payloadBuffer: Buffer = Buffer.from(payloadString);
 
-    return `${headerBuffer.toString('base64')}.${payloadBuffer.toString('base64')}.${btoa(signatureBase64)}`;
+    return `${headerBuffer.toString('base64')}.${payloadBuffer.toString('base64')}.${signatureBase64.toString()}`;
   },
 };

From 83669271d70b1d76b4a0d2bcbcbf89f44c9d8f16 Mon Sep 17 00:00:00 2001
From: boherm <boris.hermans@prestashop.com>
Date: Thu, 29 Jun 2023 11:32:54 +0200
Subject: [PATCH 0352/1030] Fix wrong discount amount displayed on cart &
 product pages

---
 src/Adapter/Presenter/Cart/CartPresenter.php       |  9 +++++----
 src/Adapter/Presenter/Product/ProductLazyArray.php | 12 +++++-------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/Adapter/Presenter/Cart/CartPresenter.php b/src/Adapter/Presenter/Cart/CartPresenter.php
index 8d4f7affc4a57..a21480907ce19 100644
--- a/src/Adapter/Presenter/Cart/CartPresenter.php
+++ b/src/Adapter/Presenter/Cart/CartPresenter.php
@@ -151,13 +151,14 @@ private function presentProduct(array $rawProduct)
             }
         }
 
+        $rawProduct['price'] = Tools::ps_round($rawProduct['price'], Context::getContext()->getComputingPrecision());
+        $rawProduct['price_wt'] = Tools::ps_round($rawProduct['price_wt'], Context::getContext()->getComputingPrecision());
+
         if ($this->includeTaxes()) {
-            $rawProduct['price_amount'] = $rawProduct['price_wt'];
-            $rawProduct['price'] = $this->priceFormatter->format($rawProduct['price_wt']);
+            $rawProduct['price_amount'] = $rawProduct['price'] = $rawProduct['price_wt'];
             $rawProduct['unit_price'] = $rawProduct['unit_price_tax_included'];
         } else {
-            $rawProduct['price_amount'] = $rawProduct['price'];
-            $rawProduct['price'] = $rawProduct['price_tax_exc'] = $this->priceFormatter->format($rawProduct['price']);
+            $rawProduct['price_amount'] = $rawProduct['price_tax_exc'] = $rawProduct['price'];
             $rawProduct['unit_price'] = $rawProduct['unit_price_tax_excluded'];
         }
 
diff --git a/src/Adapter/Presenter/Product/ProductLazyArray.php b/src/Adapter/Presenter/Product/ProductLazyArray.php
index 6da4ef15720cc..31f6d155964e2 100644
--- a/src/Adapter/Presenter/Product/ProductLazyArray.php
+++ b/src/Adapter/Presenter/Product/ProductLazyArray.php
@@ -780,16 +780,14 @@ private function addPriceInformation(ProductPresentationSettings $settings, arra
             $this->product['discount_percentage_absolute'] = Tools::displayNumber($presAbsoluteReduction) . '%';
             if ($settings->include_taxes) {
                 $regular_price = $product['price_without_reduction'];
-                $this->product['discount_amount'] = $this->priceFormatter->format(
-                    $product['reduction']
-                );
             } else {
                 $regular_price = $product['price_without_reduction_without_tax'];
-                $this->product['discount_amount'] = $this->priceFormatter->format(
-                    $product['reduction_without_tax']
-                );
             }
-            $this->product['discount_amount_to_display'] = '-' . $this->product['discount_amount'];
+            // We must calculate the real amount of discount.
+            // see @https://github.com/PrestaShop/PrestaShop/issues/32924
+            $product['reduction'] = $regular_price - $price;
+            $this->product['discount_amount'] = $this->priceFormatter->format($product['reduction']);
+            $this->product['discount_amount_to_display'] = '-' . $this->priceFormatter->format($product['reduction']);
         }
 
         $this->product['price_amount'] = $price;

From ef25bcb2dcccc766c62fb009e057c928c7facef9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@prestashop.com>
Date: Thu, 29 Jun 2023 14:53:20 +0200
Subject: [PATCH 0353/1030] Add string casting for boolean fields

---
 src/Adapter/EntityMapper.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Adapter/EntityMapper.php b/src/Adapter/EntityMapper.php
index 3601e4664b5dd..201fd81df6710 100644
--- a/src/Adapter/EntityMapper.php
+++ b/src/Adapter/EntityMapper.php
@@ -95,7 +95,13 @@ public function load($id, $id_lang, $entity, $entity_defs, $id_shop, $should_cac
                 foreach ($object_datas as $key => $value) {
                     if (array_key_exists($key, $entity_defs['fields'])
                         || array_key_exists($key, $objectVars)) {
-                        $entity->{$key} = $value;
+                        if (isset($entity_defs['fields'][$key]['type']) && in_array($entity_defs['fields'][$key]['type'], [
+                            \ObjectModel::TYPE_BOOL,
+                        ])) {
+                            $entity->{$key} = (string) $value;
+                        } else {
+                            $entity->{$key} = $value;
+                        }
                     } else {
                         unset($object_datas[$key]);
                     }

From b3ef2d6f200ec16dc59754b3cc5db735cc76c512 Mon Sep 17 00:00:00 2001
From: Codencode <info@codencode.it>
Date: Fri, 30 Jun 2023 11:01:51 +0200
Subject: [PATCH 0354/1030] Made changes for new image system

---
 .../Uploader/ManufacturerImageUploader.php    | 36 +++++++++++++------
 .../DeleteManufacturerLogoImageHandler.php    | 32 ++++++++++++-----
 2 files changed, 49 insertions(+), 19 deletions(-)

diff --git a/src/Adapter/Image/Uploader/ManufacturerImageUploader.php b/src/Adapter/Image/Uploader/ManufacturerImageUploader.php
index e5989586f42eb..e296292c3155f 100644
--- a/src/Adapter/Image/Uploader/ManufacturerImageUploader.php
+++ b/src/Adapter/Image/Uploader/ManufacturerImageUploader.php
@@ -86,21 +86,35 @@ private function generateDifferentSizeImages($manufacturerId)
             ) {
                 $imageTypes = ImageType::getImagesTypes('manufacturers');
 
+                /** @var PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration $imageFormatConfiguration */
+                $imageFormatConfiguration = \PrestaShop\PrestaShop\Adapter\ServiceLocator::get('PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration');
+                $configuredImageFormats = $imageFormatConfiguration->getGenerationFormats();
+
                 foreach ($imageTypes as $imageType) {
-                    $resized &= ImageManager::resize(
-                        _PS_MANU_IMG_DIR_ . $manufacturerId . '.jpg',
-                        _PS_MANU_IMG_DIR_ . $manufacturerId . '-' . stripslashes($imageType['name']) . '.jpg',
-                        (int) $imageType['width'],
-                        (int) $imageType['height']
-                    );
-
-                    if ($generateHighDpiImages) {
+                    foreach ($configuredImageFormats as $imageFormat) {
+                        // For JPG images, we let Imagemanager decide what to do and choose between JPG/PNG.
+                        // For webp and avif extensions, we want it to follow our command and ignore the original format.
+                        $forceFormat = ($imageFormat !== 'jpg');
+
                         $resized &= ImageManager::resize(
                             _PS_MANU_IMG_DIR_ . $manufacturerId . '.jpg',
-                            _PS_MANU_IMG_DIR_ . $manufacturerId . '-' . stripslashes($imageType['name']) . '2x.jpg',
-                            (int) $imageType['width'] * 2,
-                            (int) $imageType['height'] * 2
+                            _PS_MANU_IMG_DIR_ . $manufacturerId . '-' . stripslashes($imageType['name']) . '.' . $imageFormat,
+                            (int) $imageType['width'],
+                            (int) $imageType['height'],
+                            $imageFormat,
+                            $forceFormat
                         );
+
+                        if ($generateHighDpiImages) {
+                            $resized &= ImageManager::resize(
+                                _PS_MANU_IMG_DIR_ . $manufacturerId . '.jpg',
+                                _PS_MANU_IMG_DIR_ . $manufacturerId . '-' . stripslashes($imageType['name']) . '2x.' . $imageFormat,
+                                (int) $imageType['width'] * 2,
+                                (int) $imageType['height'] * 2,
+                                $imageFormat,
+                                $forceFormat
+                            );
+                        }
                     }
                 }
 
diff --git a/src/Adapter/Manufacturer/CommandHandler/DeleteManufacturerLogoImageHandler.php b/src/Adapter/Manufacturer/CommandHandler/DeleteManufacturerLogoImageHandler.php
index f059213ec36bb..34500aa64e9bc 100644
--- a/src/Adapter/Manufacturer/CommandHandler/DeleteManufacturerLogoImageHandler.php
+++ b/src/Adapter/Manufacturer/CommandHandler/DeleteManufacturerLogoImageHandler.php
@@ -63,15 +63,31 @@ public function handle(DeleteManufacturerLogoImageCommand $command): void
 
         $imageTypes = ImageType::getImagesTypes('manufacturers');
 
+        /** @var PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration $imageFormatConfiguration */
+        $imageFormatConfiguration = \PrestaShop\PrestaShop\Adapter\ServiceLocator::get('PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration');
+        $configuredImageFormats = $imageFormatConfiguration->getGenerationFormats();
+
         foreach ($imageTypes as $imageType) {
-            $path = sprintf(
-                '%s%s-%s.jpg',
-                $this->imageDir,
-                $command->getManufacturerId()->getValue(),
-                stripslashes($imageType['name'])
-            );
-            if ($fs->exists($path)) {
-                $fs->remove($path);
+            foreach ($configuredImageFormats as $imageFormat) {
+                $path = sprintf(
+                    '%s%s-%s.' . $imageFormat,
+                    $this->imageDir,
+                    $command->getManufacturerId()->getValue(),
+                    stripslashes($imageType['name'])
+                );
+                if ($fs->exists($path)) {
+                    $fs->remove($path);
+                }
+
+                $path = sprintf(
+                    '%s%s-%s2x.' . $imageFormat,
+                    $this->imageDir,
+                    $command->getManufacturerId()->getValue(),
+                    stripslashes($imageType['name'])
+                );
+                if ($fs->exists($path)) {
+                    $fs->remove($path);
+                }
             }
         }
 

From 829c6b36abdee63bfb800c4f215d17af4973d3e8 Mon Sep 17 00:00:00 2001
From: Codencode <info@codencode.it>
Date: Fri, 30 Jun 2023 11:28:21 +0200
Subject: [PATCH 0355/1030] Updated variable type definitions

---
 src/Adapter/Image/Uploader/ManufacturerImageUploader.php        | 2 +-
 .../CommandHandler/DeleteManufacturerLogoImageHandler.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Adapter/Image/Uploader/ManufacturerImageUploader.php b/src/Adapter/Image/Uploader/ManufacturerImageUploader.php
index e296292c3155f..513a6539db5a5 100644
--- a/src/Adapter/Image/Uploader/ManufacturerImageUploader.php
+++ b/src/Adapter/Image/Uploader/ManufacturerImageUploader.php
@@ -86,7 +86,7 @@ private function generateDifferentSizeImages($manufacturerId)
             ) {
                 $imageTypes = ImageType::getImagesTypes('manufacturers');
 
-                /** @var PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration $imageFormatConfiguration */
+                /** @var \PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration $imageFormatConfiguration */
                 $imageFormatConfiguration = \PrestaShop\PrestaShop\Adapter\ServiceLocator::get('PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration');
                 $configuredImageFormats = $imageFormatConfiguration->getGenerationFormats();
 
diff --git a/src/Adapter/Manufacturer/CommandHandler/DeleteManufacturerLogoImageHandler.php b/src/Adapter/Manufacturer/CommandHandler/DeleteManufacturerLogoImageHandler.php
index 34500aa64e9bc..755b934957d74 100644
--- a/src/Adapter/Manufacturer/CommandHandler/DeleteManufacturerLogoImageHandler.php
+++ b/src/Adapter/Manufacturer/CommandHandler/DeleteManufacturerLogoImageHandler.php
@@ -63,7 +63,7 @@ public function handle(DeleteManufacturerLogoImageCommand $command): void
 
         $imageTypes = ImageType::getImagesTypes('manufacturers');
 
-        /** @var PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration $imageFormatConfiguration */
+        /** @var \PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration $imageFormatConfiguration */
         $imageFormatConfiguration = \PrestaShop\PrestaShop\Adapter\ServiceLocator::get('PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration');
         $configuredImageFormats = $imageFormatConfiguration->getGenerationFormats();
 

From 9a31d3de27a6c98e999e96edfd8a7001bc3e9782 Mon Sep 17 00:00:00 2001
From: "matthieu.rolland" <matthieu.rolland@prestashop.com>
Date: Fri, 30 Jun 2023 15:14:15 +0200
Subject: [PATCH 0356/1030] fix ui

---
 tests/UI/pages/BO/design/linkWidgets/add.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/UI/pages/BO/design/linkWidgets/add.ts b/tests/UI/pages/BO/design/linkWidgets/add.ts
index c6f3b3c22e7b8..39292761b7dc9 100644
--- a/tests/UI/pages/BO/design/linkWidgets/add.ts
+++ b/tests/UI/pages/BO/design/linkWidgets/add.ts
@@ -45,7 +45,7 @@ class AddLinkBlock extends BOBasePage {
     this.pageTitle = 'Link List •';
 
     // Selectors
-    this.changeNamelangButton = '#form_link_block_block_name';
+    this.changeNamelangButton = '#form_link_block_block_name_dropdown';
     this.changeNameLangSpan = (lang: string) => `div.dropdown-menu span[data-locale='${lang}']`;
     this.nameInput = (id: number) => `#form_link_block_block_name_${id}`;
     this.hookSelect = '#form_link_block_id_hook';

From 745a811569a2d9135d68051ac0167a7001ba5d8e Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Tue, 27 Jun 2023 14:41:07 +0300
Subject: [PATCH 0357/1030]  implement carrier restrictions handling in cqrs
 and add behats

---
 .../SetCartRuleRestrictionsHandler.php        | 24 +++++-
 .../GetCartRuleForEditingHandler.php          | 14 ++-
 .../Repository/CartRuleRepository.php         | 71 ++++++++++++++++
 .../SetCartRuleRestrictionsCommand.php        | 23 +++++
 .../CartRuleRestrictionsForEditing.php        | 18 +++-
 .../Context/CarrierFeatureContext.php         |  2 +-
 .../AbstractCartRuleFeatureContext.php        |  8 ++
 .../SetCartRuleRestrictionsFeatureContext.php | 40 ++++++++-
 .../CartRule/set_carrier_restrictions.feature | 85 +++++++++++++++++++
 tests/Integration/Behaviour/behat.yml         |  4 +
 10 files changed, 282 insertions(+), 7 deletions(-)
 create mode 100644 tests/Integration/Behaviour/Features/Scenario/CartRule/set_carrier_restrictions.feature

diff --git a/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php b/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php
index 602f3b150ee6a..1f36ba15c656f 100644
--- a/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php
+++ b/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php
@@ -30,6 +30,7 @@
 
 use CartRule;
 use PrestaShop\PrestaShop\Adapter\CartRule\Repository\CartRuleRepository;
+use PrestaShop\PrestaShop\Core\Domain\Carrier\ValueObject\CarrierId;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\SetCartRuleRestrictionsCommand;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\CommandHandler\SetCartRuleRestrictionsHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\CartRuleId;
@@ -43,7 +44,10 @@ public function __construct(
 
     public function handle(SetCartRuleRestrictionsCommand $command): void
     {
-        if (null === $command->getRestrictedCartRuleIds() && null === $command->getProductRestrictionRuleGroups()) {
+        if (null === $command->getRestrictedCartRuleIds()
+            && null === $command->getProductRestrictionRuleGroups()
+            && null === $command->getRestrictedCarrierIds()
+        ) {
             // no restrictions were modified
             return;
         }
@@ -58,6 +62,10 @@ public function handle(SetCartRuleRestrictionsCommand $command): void
         if (null !== $productRestrictionGroups) {
             $this->setProductRestrictions($cartRule, $productRestrictionGroups);
         }
+        $restrictedCarrierIds = $command->getRestrictedCarrierIds();
+        if (null !== $restrictedCarrierIds) {
+            $this->setCarrierRestrictions($cartRule, $restrictedCarrierIds);
+        }
         // it would be more performant updating all restriction props at the end with one update call,
         // but that way we might introduce cart rule state failure in case one of steps fails somewhere in the middle
     }
@@ -87,4 +95,18 @@ private function setProductRestrictions(CartRule $cartRule, array $restrictionRu
         $cartRule->product_restriction = !empty($restrictionRuleGroups);
         $this->cartRuleRepository->partialUpdate($cartRule, ['product_restriction']);
     }
+
+    /**
+     * @param CartRule $cartRule
+     * @param CarrierId[] $restrictedCarrierIds
+     *
+     * @return void
+     */
+    private function setCarrierRestrictions(CartRule $cartRule, array $restrictedCarrierIds): void
+    {
+        $this->cartRuleRepository->setCarrierRestrictions(new CartRuleId((int) $cartRule->id), $restrictedCarrierIds);
+
+        $cartRule->carrier_restriction = !empty($restrictedCarrierIds);
+        $this->cartRuleRepository->partialUpdate($cartRule, ['carrier_restriction']);
+    }
 }
diff --git a/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php b/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php
index 344720b8b9443..baa9ea9608ce8 100644
--- a/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php
+++ b/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php
@@ -50,7 +50,7 @@
 use PrestaShop\PrestaShop\Core\Util\DateTime\DateTime as DateTimeUtils;
 
 /**
- * Handles command which gets catalog price rule for editing using legacy object model
+ * Handles command which gets cart rule for editing using legacy object model
  */
 class GetCartRuleForEditingHandler implements GetCartRuleForEditingHandlerInterface
 {
@@ -117,14 +117,22 @@ private function getCartRuleConditions(CartRule $cartRule): CartRuleConditionsFo
             }
         }
 
+        $cartRuleId = new CartRuleId((int) $cartRule->id);
+
         $restrictedCartRules = [];
         if ($cartRule->cart_rule_restriction) {
-            $restrictedCartRules = $this->cartRuleRepository->getRestrictedCartRuleIds(new CartRuleId((int) $cartRule->id));
+            $restrictedCartRules = $this->cartRuleRepository->getRestrictedCartRuleIds($cartRuleId);
+        }
+
+        $restrictedCarrierIds = [];
+        if ($cartRule->carrier_restriction) {
+            $restrictedCarrierIds = $this->cartRuleRepository->getRestrictedCarrierIds($cartRuleId);
         }
 
         $cartRuleRestrictions = new CartRuleRestrictionsForEditing(
             $restrictedCartRules,
-            $this->getRestrictionRuleGroups($cartRule)
+            $this->getRestrictionRuleGroups($cartRule),
+            $restrictedCarrierIds
         );
 
         return new CartRuleConditionsForEditing(
diff --git a/src/Adapter/CartRule/Repository/CartRuleRepository.php b/src/Adapter/CartRule/Repository/CartRuleRepository.php
index 9e4bfe45d199e..c245c9d72a767 100644
--- a/src/Adapter/CartRule/Repository/CartRuleRepository.php
+++ b/src/Adapter/CartRule/Repository/CartRuleRepository.php
@@ -30,6 +30,7 @@
 use CartRule;
 use Doctrine\DBAL\Connection;
 use PrestaShop\PrestaShop\Adapter\CartRule\Validate\CartRuleValidator;
+use PrestaShop\PrestaShop\Core\Domain\Carrier\ValueObject\CarrierId;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CannotAddCartRuleException;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CannotEditCartRuleException;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleException;
@@ -328,6 +329,76 @@ public function restrictCartRules(CartRuleId $cartRuleId, array $restrictedCartR
         );
     }
 
+    /**
+     * @param CartRuleId $cartRuleId
+     * @param CarrierId[] $restrictedCarrierIds
+     *
+     * @return void
+     */
+    public function setCarrierRestrictions(CartRuleId $cartRuleId, array $restrictedCarrierIds): void
+    {
+        $this->removeCarrierRestrictions($cartRuleId);
+
+        if (empty($restrictedCarrierIds)) {
+            return;
+        }
+
+        $checkedIds = [];
+        $insertValues = [];
+        foreach ($restrictedCarrierIds as $restrictedCarrierId) {
+            // skip duplicate ids if for some reason they exist
+            if (in_array($restrictedCarrierId, $checkedIds, true)) {
+                continue;
+            }
+            $insertValues[] = sprintf('(%d,%d)', $cartRuleId->getValue(), $restrictedCarrierId->getValue());
+            $checkedIds[] = $restrictedCarrierId;
+        }
+
+        $this->connection->executeStatement(
+            sprintf(
+                'INSERT INTO %s (`id_cart_rule`, `id_carrier`) VALUES %s',
+                $this->dbPrefix . 'cart_rule_carrier',
+                implode(',', $insertValues)
+            )
+        );
+    }
+
+    /**
+     * @param CartRuleId $cartRuleId
+     *
+     * @return int[]
+     */
+    public function getRestrictedCarrierIds(CartRuleId $cartRuleId): array
+    {
+        $cartRuleIdValue = $cartRuleId->getValue();
+        $results = $this->connection->createQueryBuilder()
+            ->select('crc.id_carrier')
+            ->from($this->dbPrefix . 'cart_rule_carrier', 'crc')
+            ->where('crc.id_cart_rule = :cartRuleId')
+            ->setParameter('cartRuleId', $cartRuleIdValue)
+            ->execute()
+            ->fetchAllAssociative()
+        ;
+
+        if (empty($results)) {
+            return [];
+        }
+
+        return array_map(static function (array $result): int {
+            return (int) $result['id_carrier'];
+        }, $results);
+    }
+
+    private function removeCarrierRestrictions(CartRuleId $cartRuleId): void
+    {
+        $this->connection->createQueryBuilder()
+            ->delete($this->dbPrefix . 'cart_rule_carrier', 'crc')
+            ->where('crc.id_cart_rule = :cartRuleId')
+            ->setParameter('cartRuleId', $cartRuleId->getValue())
+            ->execute()
+        ;
+    }
+
     private function removeRestrictedCartRules(CartRuleId $cartRuleId): void
     {
         $this->connection->createQueryBuilder()
diff --git a/src/Core/Domain/CartRule/Command/SetCartRuleRestrictionsCommand.php b/src/Core/Domain/CartRule/Command/SetCartRuleRestrictionsCommand.php
index 0767164d8f62a..0dedbbe3e3998 100644
--- a/src/Core/Domain/CartRule/Command/SetCartRuleRestrictionsCommand.php
+++ b/src/Core/Domain/CartRule/Command/SetCartRuleRestrictionsCommand.php
@@ -28,6 +28,7 @@
 
 namespace PrestaShop\PrestaShop\Core\Domain\CartRule\Command;
 
+use PrestaShop\PrestaShop\Core\Domain\Carrier\ValueObject\CarrierId;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleConstraintException;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\CartRuleId;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\Restriction\RestrictionRuleGroup;
@@ -50,6 +51,11 @@ class SetCartRuleRestrictionsCommand
      */
     private ?array $productRestrictionRuleGroups = null;
 
+    /**
+     * @var CarrierId[]|null
+     */
+    private ?array $restrictedCarrierIds = null;
+
     /**
      * @param int $cartRuleId
      */
@@ -59,6 +65,23 @@ public function __construct(
         $this->cartRuleId = new CartRuleId($cartRuleId);
     }
 
+    public function setRestrictedCarrierIds(array $restrictedCarrierIds): self
+    {
+        $this->restrictedCarrierIds = array_map(static function ($carrierId): CarrierId {
+            return new CarrierId($carrierId);
+        }, $restrictedCarrierIds);
+
+        return $this;
+    }
+
+    /**
+     * @return CarrierId[]|null
+     */
+    public function getRestrictedCarrierIds(): ?array
+    {
+        return $this->restrictedCarrierIds;
+    }
+
     /**
      * @return CartRuleId
      */
diff --git a/src/Core/Domain/CartRule/QueryResult/CartRuleRestrictionsForEditing.php b/src/Core/Domain/CartRule/QueryResult/CartRuleRestrictionsForEditing.php
index b554db16d3d24..26971e4a01ccc 100644
--- a/src/Core/Domain/CartRule/QueryResult/CartRuleRestrictionsForEditing.php
+++ b/src/Core/Domain/CartRule/QueryResult/CartRuleRestrictionsForEditing.php
@@ -42,18 +42,26 @@ class CartRuleRestrictionsForEditing
      */
     private array $productRestrictionRuleGroups;
 
+    /**
+     * @var int[]
+     */
+    private array $restrictedCarrierIds;
+
     /**
      * @todo: fill other restrictions when related commands are implemented
      *
      * @param int[] $restrictedCartRuleIds
      * @param RestrictionRuleGroup[] $productRestrictionRuleGroups
+     * @param int[] $restrictedCarrierIds
      */
     public function __construct(
         array $restrictedCartRuleIds,
-        array $productRestrictionRuleGroups
+        array $productRestrictionRuleGroups,
+        array $restrictedCarrierIds
     ) {
         $this->restrictedCartRuleIds = $restrictedCartRuleIds;
         $this->productRestrictionRuleGroups = $productRestrictionRuleGroups;
+        $this->restrictedCarrierIds = $restrictedCarrierIds;
     }
 
     /**
@@ -71,4 +79,12 @@ public function getProductRestrictionRuleGroups(): array
     {
         return $this->productRestrictionRuleGroups;
     }
+
+    /**
+     * @return int[]
+     */
+    public function getRestrictedCarrierIds(): array
+    {
+        return $this->restrictedCarrierIds;
+    }
 }
diff --git a/tests/Integration/Behaviour/Features/Context/CarrierFeatureContext.php b/tests/Integration/Behaviour/Features/Context/CarrierFeatureContext.php
index 83bf26daca62d..2e37bf373a43a 100644
--- a/tests/Integration/Behaviour/Features/Context/CarrierFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/CarrierFeatureContext.php
@@ -238,7 +238,7 @@ public function createCarrier($carrierName)
         $carrier->active = true;
         $carrier->add();
         $this->carriers[$carrierName] = $carrier;
-        SharedStorage::getStorage()->set($carrierName, $carrier->id);
+        SharedStorage::getStorage()->set($carrierName, (int) $carrier->id);
 
         $groups = Group::getGroups(Context::getContext()->language->id);
         $groupIds = [];
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
index 7ccde7d8adb3b..f2a15546f008c 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
@@ -293,6 +293,14 @@ protected function assertCartRuleProperties(CartRuleForEditing $cartRuleForEditi
                 'Unexpected cart rule restrictions'
             );
         }
+
+        if (isset($expectedData['restricted carriers'])) {
+            Assert::assertSame(
+                $this->referencesToIds($expectedData['restricted carriers']),
+                $conditions->getRestrictions()->getRestrictedCarrierIds(),
+                'Unexpected restricted carriers'
+            );
+        }
     }
 
     protected function getCartRuleActionBuilder(): CartRuleActionBuilder
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/SetCartRuleRestrictionsFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/SetCartRuleRestrictionsFeatureContext.php
index 2004829242661..98421665cb6fb 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/SetCartRuleRestrictionsFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/SetCartRuleRestrictionsFeatureContext.php
@@ -73,6 +73,26 @@ public function setRestrictedCartRules(string $cartRuleReference, TableNode $tab
         }
     }
 
+    /**
+     * @When I restrict following carriers for cart rule :cartRuleReference:
+     *
+     * @param string $cartRuleReference
+     * @param TableNode $tableNode
+     *
+     * @return void
+     */
+    public function setRestrictedCarriers(string $cartRuleReference, TableNode $tableNode): void
+    {
+        $command = $this->getRestrictionsCommand($cartRuleReference);
+
+        try {
+            $command->setRestrictedCarrierIds($this->referencesToIds($tableNode->getRowsHash()['restricted carriers']));
+            $this->restrictionCommandsByReference[$cartRuleReference] = $command;
+        } catch (CartRuleConstraintException $e) {
+            $this->setLastException($e);
+        }
+    }
+
     /**
      * @When I add a restriction for cart rule :cartRuleReference, which requires at least :quantity product(s) in cart matching one of these rules:
      * @When I add a restriction for cart rule :cartRuleReference, which requires any quantity of product(s) in cart matching one of these rules:
@@ -159,6 +179,21 @@ public function clearCartRuleCombinationRestrictions(string $cartRuleReference):
         $this->restrictionCommandsByReference[$cartRuleReference] = $command;
     }
 
+    /**
+     * @When I clear all carrier restrictions for cart rule :cartRuleReference
+     *
+     * @param string $cartRuleReference
+     *
+     * @return void
+     */
+    public function clearCartRuleCarrierRestrictions(string $cartRuleReference): void
+    {
+        $command = $this->getRestrictionsCommand($cartRuleReference);
+        $command->setRestrictedCarrierIds([]);
+
+        $this->restrictionCommandsByReference[$cartRuleReference] = $command;
+    }
+
     /**
      * @When I save all the restrictions for cart rule :cartRuleReference
      *
@@ -176,7 +211,10 @@ public function saveRestrictionRules(string $cartRuleReference): void
             unset($this->productRestrictionGroupsByReference[$cartRuleReference]);
         }
 
-        if (null === $command->getRestrictedCartRuleIds() && null === $command->getProductRestrictionRuleGroups()) {
+        if (null === $command->getRestrictedCartRuleIds()
+            && null === $command->getProductRestrictionRuleGroups()
+            && null === $command->getRestrictedCarrierIds()
+        ) {
             throw new RuntimeException(
                 sprintf(
                     '%s is empty for cart rule referenced as "%s". Did you forget to fill the restrictions in other steps?',
diff --git a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_carrier_restrictions.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_carrier_restrictions.feature
new file mode 100644
index 0000000000000..b4dd31e97e1c4
--- /dev/null
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_carrier_restrictions.feature
@@ -0,0 +1,85 @@
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart_rule --tags set-carrier-restrictions
+@restore-all-tables-before-feature
+@set-carrier-restrictions
+Feature: Set cart rule carrier restrictions in BO
+  PrestaShop allows BO users to add and remove carrier restrictions of cart rule,
+  which defines whether or not the cart rule should be applicable in a specific carrier
+
+  Background:
+    Given shop "shop1" with name "test_shop" exists
+    And there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
+    And there is a currency named "chf" with iso code "CHF" and exchange rate of 1.25
+    And currency "usd" is the default one
+    And language "language1" with locale "en-US" exists
+    And language with iso code "en" is the default one
+    And there is a carrier named "carrier1"
+    And there is a carrier named "carrier2"
+    And I add product "product1" with following information:
+      | name[en-US] | bottle of beer |
+      | type        | virtual        |
+    And I add product "product2" with following information:
+      | name[en-US] | T-shirt nr1 |
+      | type        | standard    |
+    And I add product "product3" with following information:
+      | name[en-US] | Shirt - Dom & Jquery |
+      | type        | standard             |
+    And there is a cart rule "rule_free_shipping_1" with following properties:
+      | name[en-US]         | free shipping 1      |
+      | is_active           | true                 |
+      | allow_partial_use   | false                |
+      | priority            | 1                    |
+      | valid_from          | 2022-01-01 11:00:00  |
+      | valid_to            | 3001-01-01 12:00:00  |
+      | total_quantity      | 10                   |
+      | quantity_per_user   | 10                   |
+      | free_shipping       | true                 |
+      | code                | rule_free_shipping_1 |
+      | restricted carriers |                      |
+    And there is a cart rule "rule_50_percent" with following properties:
+      | name[en-US]                  | Half the price         |
+      | is_active                    | true                   |
+      | allow_partial_use            | true                   |
+      | priority                     | 2                      |
+      | valid_from                   | 2022-01-01 11:00:00    |
+      | valid_to                     | 3001-01-01 12:00:00    |
+      | total_quantity               | 10                     |
+      | quantity_per_user            | 12                     |
+      | free_shipping                | false                  |
+      | code                         | rule_50_percent        |
+      | discount_percentage          | 50                     |
+      | apply_to_discounted_products | false                  |
+      | discount_application_type    | order_without_shipping |
+      | restricted carriers          |                        |
+    And I clear all carrier restrictions for cart rule rule_free_shipping_1
+    And I clear all carrier restrictions for cart rule rule_50_percent
+    And cart rule "rule_free_shipping_1" should have the following properties:
+      | restricted carriers |  |
+    And cart rule "rule_50_percent" should have the following properties:
+      | restricted carriers |  |
+
+  Scenario: Restrict cart rule carriers and clear the restrictions
+    When I restrict following carriers for cart rule rule_free_shipping_1:
+      | restricted carriers | carrier1,carrier2 |
+    And I save all the restrictions for cart rule rule_free_shipping_1
+    And I restrict following carriers for cart rule rule_50_percent:
+      | restricted carriers | carrier1 |
+    And I save all the restrictions for cart rule rule_50_percent
+    Then cart rule rule_free_shipping_1 should have the following properties:
+      | restricted carriers | carrier1,carrier2 |
+    And cart rule rule_50_percent should have the following properties:
+      | restricted carriers | carrier1 |
+    When I restrict following carriers for cart rule rule_free_shipping_1:
+      | restricted carriers | carrier2 |
+    And I save all the restrictions for cart rule rule_free_shipping_1
+    And I clear all carrier restrictions for cart rule rule_50_percent
+    And I save all the restrictions for cart rule rule_50_percent
+    Then cart rule rule_free_shipping_1 should have the following properties:
+      | restricted carriers | carrier2 |
+    Then cart rule rule_50_percent should have the following properties:
+      | restricted carriers |  |
+    And I clear all carrier restrictions for cart rule rule_free_shipping_1
+    And I save all the restrictions for cart rule rule_free_shipping_1
+    Then cart rule rule_50_percent should have the following properties:
+      | restricted carriers |  |
+    Then cart rule rule_50_percent should have the following properties:
+      | restricted carriers |  |
diff --git a/tests/Integration/Behaviour/behat.yml b/tests/Integration/Behaviour/behat.yml
index c5256b423df98..9ce36ce726936 100644
--- a/tests/Integration/Behaviour/behat.yml
+++ b/tests/Integration/Behaviour/behat.yml
@@ -113,6 +113,7 @@ default:
                 - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\AddCartRuleFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\CartRuleAssertionFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\EditCartRuleFeatureContext
+                - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\SetCartRuleRestrictionsFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\OrderFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\ProductFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\EmployeeFeatureContext
@@ -157,6 +158,7 @@ default:
                 - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\AddCartRuleFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\CartRuleAssertionFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\EditCartRuleFeatureContext
+                - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\SetCartRuleRestrictionsFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\CurrencyFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\CustomerFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\OrderCartFeatureContext
@@ -253,6 +255,7 @@ default:
             contexts:
                 - Tests\Integration\Behaviour\Features\Context\AttributeFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\AttributeGroupFeatureContext
+                - Tests\Integration\Behaviour\Features\Context\CarrierFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\CommonFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\CurrencyFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\CustomerFeatureContext
@@ -262,6 +265,7 @@ default:
                 - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\DeleteCartRuleFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\EditCartRuleFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\SetCartRuleRestrictionsFeatureContext
+                - Tests\Integration\Behaviour\Features\Context\Domain\CountryFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\ManufacturerFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\Product\AddProductFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\Product\Combination\CombinationListingFeatureContext

From 1d1e5cfd29a74ffa0b9639ce042a780d8472dded Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Thu, 29 Jun 2023 13:21:10 +0300
Subject: [PATCH 0358/1030]  replace old carrier restriction steps with new one
 in behats

---
 .../Context/CartRuleFeatureContext.php        | 20 ----
 .../cart_rule_carrier_restriction.feature     | 92 ++++++++++++-------
 .../Cart/CartRule/FrontOffice/carrier.feature | 42 ++++++---
 .../FrontOffice/cart_rule_validation.feature  |  6 +-
 .../Scenario/Order/order_cart_rules.feature   |  6 +-
 tests/Integration/Behaviour/behat.yml         |  1 -
 6 files changed, 99 insertions(+), 68 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
index 4d76a8a38b7df..793d1f030a9f2 100644
--- a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
@@ -160,26 +160,6 @@ public function cartRuleNamedIsRestrictedToProductNamed(
         );
     }
 
-    /**
-     * @Given /^cart rule "(.+)" is restricted to carrier "(.+)"$/
-     */
-    public function cartRuleNamedIsRestrictedToCarrierNamed($cartRuleName, $carrierName)
-    {
-        $this->carrierFeatureContext->checkCarrierWithNameExists($carrierName);
-        $cartRuleId = $this->getCartRuleId($cartRuleName);
-        $cartRule = new CartRule($cartRuleId);
-        $cartRule->carrier_restriction = true;
-        $cartRule->save();
-        $this->cartRules[$cartRuleName] = $cartRule;
-
-        Db::getInstance()->execute('
-          INSERT INTO ' . _DB_PREFIX_ . "cart_rule_carrier(`id_cart_rule`, `id_carrier`)
-          VALUES('" . $cartRuleId . "',
-          '" . (int) $this->carrierFeatureContext->getCarrierWithName($carrierName)->id . "')
-        ");
-        Cache::clear();
-    }
-
     /**
      * @Given /^cart rule "(.+)" is restricted to country "(.+)"$/
      */
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Restrictions/cart_rule_carrier_restriction.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Restrictions/cart_rule_carrier_restriction.feature
index 5bb273eb18033..74dbbec83f4f8 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Restrictions/cart_rule_carrier_restriction.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Restrictions/cart_rule_carrier_restriction.feature
@@ -30,23 +30,31 @@ Feature: Cart calculation with carrier specific cart rules
     And there is a product in the catalog named "product2" with a price of 32.388 and 1000 items in stock
     And there is a product in the catalog named "product3" with a price of 31.188 and 1000 items in stock
     And there is a cart rule "cartrule1" with following properties:
-      | name[en-US]                  | cartrule1              |
-      | total_quantity               | 1000                   |
-      | quantity_per_user            | 1000                   |
-      | priority                     | 1                      |
-      | free_shipping                | false                  |
-      | code                         | foo                    |
-      | discount_percentage          | 50                     |
-    And cart rule "cartrule1" is restricted to carrier "carrier2"
+      | name[en-US]         | cartrule1 |
+      | total_quantity      | 1000      |
+      | quantity_per_user   | 1000      |
+      | priority            | 1         |
+      | free_shipping       | false     |
+      | code                | foo       |
+      | discount_percentage | 50        |
+    And I restrict following carriers for cart rule cartrule1:
+      | restricted carriers | carrier2 |
+    And I save all the restrictions for cart rule cartrule1
+    And cart rule cartrule1 should have the following properties:
+      | restricted carriers | carrier2 |
     And there is a cart rule "cartrule2" with following properties:
-      | name[en-US]                  | cartrule2              |
-      | total_quantity               | 1000                   |
-      | quantity_per_user            | 1000                   |
-      | priority                     | 2                      |
-      | free_shipping                | false                  |
-      | code                         | bar                    |
-      | discount_percentage          | 50                     |
-    And cart rule "cartrule2" is restricted to carrier "carrier1"
+      | name[en-US]         | cartrule2 |
+      | total_quantity      | 1000      |
+      | quantity_per_user   | 1000      |
+      | priority            | 2         |
+      | free_shipping       | false     |
+      | code                | bar       |
+      | discount_percentage | 50        |
+    And I restrict following carriers for cart rule cartrule2:
+      | restricted carriers | carrier1 |
+    And I save all the restrictions for cart rule cartrule2
+    And cart rule cartrule2 should have the following properties:
+      | restricted carriers | carrier1 |
 
   Scenario: I cannot use voucher when it is restricted to specific carrier and that carrier is not selected
     When I add 1 items of product "product1" in my cart
@@ -68,7 +76,11 @@ Feature: Cart calculation with carrier specific cart rules
       | quantity_per_user | 1000       |
       | priority          | 1          |
       | free_shipping     | true       |
-    And cart rule "cartrule10" is restricted to carrier "carrier2"
+    And I restrict following carriers for cart rule cartrule10:
+      | restricted carriers | carrier2 |
+    And I save all the restrictions for cart rule cartrule10
+    And cart rule cartrule10 should have the following properties:
+      | restricted carriers | carrier2 |
     When I add 1 items of product "product1" in my cart
     And I select address "address1" in my cart
     And I select carrier "carrier1" in my cart
@@ -81,13 +93,17 @@ Feature: Cart calculation with carrier specific cart rules
   @restore-cart-rules-after-scenario
   Scenario: Percentage cart rule without code is applied to cart automatically when restricted carrier is selected
     Given there is a cart rule "cartrule11" with following properties:
-      | name[en-US]                  | cartrule11             |
-      | total_quantity               | 1000                   |
-      | quantity_per_user            | 1000                   |
-      | priority                     | 1                      |
-      | free_shipping                | false                  |
-      | discount_percentage          | 55                     |
-    And cart rule "cartrule11" is restricted to carrier "carrier2"
+      | name[en-US]         | cartrule11 |
+      | total_quantity      | 1000       |
+      | quantity_per_user   | 1000       |
+      | priority            | 1          |
+      | free_shipping       | false      |
+      | discount_percentage | 55         |
+    And I restrict following carriers for cart rule cartrule11:
+      | restricted carriers | carrier2 |
+    And I save all the restrictions for cart rule cartrule11
+    And cart rule cartrule11 should have the following properties:
+      | restricted carriers | carrier2 |
     When I add 1 items of product "product1" in my cart
     And I select address "address1" in my cart
     When I select carrier "carrier1" in my cart
@@ -100,15 +116,19 @@ Feature: Cart calculation with carrier specific cart rules
   @restore-cart-rules-after-scenario
   Scenario: Amount cart rule without code is applied to cart automatically when restricted carrier is selected
     Given there is a cart rule "cartrule12" with following properties:
-      | name[en-US]                  | cartrule12             |
-      | total_quantity               | 1000                   |
-      | quantity_per_user            | 1000                   |
-      | priority                     | 1                      |
-      | free_shipping                | false                  |
-      | discount_amount              | 10                     |
-      | discount_currency            | usd                    |
-      | discount_includes_tax        | false                  |
-    And cart rule "cartrule12" is restricted to carrier "carrier2"
+      | name[en-US]           | cartrule12 |
+      | total_quantity        | 1000       |
+      | quantity_per_user     | 1000       |
+      | priority              | 1          |
+      | free_shipping         | false      |
+      | discount_amount       | 10         |
+      | discount_currency     | usd        |
+      | discount_includes_tax | false      |
+    And I restrict following carriers for cart rule cartrule12:
+      | restricted carriers | carrier2 |
+    And I save all the restrictions for cart rule cartrule12
+    And cart rule cartrule12 should have the following properties:
+      | restricted carriers | carrier2 |
     When I add 1 items of product "product1" in my cart
     And I select address "address1" in my cart
     When I select carrier "carrier1" in my cart
@@ -130,7 +150,11 @@ Feature: Cart calculation with carrier specific cart rules
       | discount_percentage          | 55                     |
       | apply_to_discounted_products | true                   |
       | discount_application_type    | order_without_shipping |
-    And cart rule "cartrule3" is restricted to carrier "carrier3"
+    And I restrict following carriers for cart rule cartrule3:
+      | restricted carriers | carrier3 |
+    And I save all the restrictions for cart rule cartrule3
+    And cart rule cartrule3 should have the following properties:
+      | restricted carriers | carrier3 |
     When I add 1 items of product "product1" in my cart
     When I select address "address1" in my cart
     When I select carrier "carrier2" in my cart
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/carrier.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/carrier.feature
index 313e380b8c90b..0e15f99aa9569 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/carrier.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/carrier.feature
@@ -168,7 +168,11 @@ Feature: Cart calculation with cart rules and different carriers
       | discount_percentage          | 50                     |
       | apply_to_discounted_products | true                   |
       | discount_application_type    | order_without_shipping |
-    And cart rule "cartrule7" is restricted to carrier "carrier2"
+    And I restrict following carriers for cart rule cartrule7:
+      | restricted carriers | carrier2 |
+    And I save all the restrictions for cart rule cartrule7
+    And cart rule cartrule7 should have the following properties:
+      | restricted carriers | carrier2 |
     And there is a cart rule "cartrule8" with following properties:
       | name[en-US]                  | cartrule8              |
       | total_quantity               | 1000                   |
@@ -179,7 +183,11 @@ Feature: Cart calculation with cart rules and different carriers
       | discount_percentage          | 50                     |
       | apply_to_discounted_products | true                   |
       | discount_application_type    | order_without_shipping |
-    And cart rule "cartrule8" is restricted to carrier "carrier1"
+    And I restrict following carriers for cart rule cartrule8:
+      | restricted carriers | carrier1 |
+    And I save all the restrictions for cart rule cartrule8
+    And cart rule cartrule8 should have the following properties:
+      | restricted carriers | carrier1 |
     When I add 1 items of product "product1" in my cart
     And I select address "address1" in my cart
     And I select carrier "carrier2" in my cart
@@ -195,15 +203,27 @@ Feature: Cart calculation with cart rules and different carriers
   @restore-cart-rules-after-scenario
   Scenario: one product in cart, quantity 1, cart rule without code correctly (un)applied on corresponding carrier
     Given there is a cart rule "cartrule9" with following properties:
-      | name[en-US]                  | cartrule9              |
-      | total_quantity               | 1000                   |
-      | quantity_per_user            | 1000                   |
-      | priority                     | 3                      |
-      | free_shipping                | false                  |
-      | discount_percentage          | 55                     |
-    And cart rule "cartrule9" is restricted to carrier "carrier3"
-    And cart rule "cartrule5" is restricted to carrier "carrier2"
-    And cart rule "cartrule2" is restricted to carrier "carrier1"
+      | name[en-US]         | cartrule9 |
+      | total_quantity      | 1000      |
+      | quantity_per_user   | 1000      |
+      | priority            | 3         |
+      | free_shipping       | false     |
+      | discount_percentage | 55        |
+    And I restrict following carriers for cart rule cartrule9:
+      | restricted carriers | carrier3 |
+    And I save all the restrictions for cart rule cartrule9
+    And cart rule cartrule9 should have the following properties:
+      | restricted carriers | carrier3 |
+    And I restrict following carriers for cart rule cartrule5:
+      | restricted carriers | carrier2 |
+    And I save all the restrictions for cart rule cartrule5
+    And cart rule cartrule5 should have the following properties:
+      | restricted carriers | carrier2 |
+    And I restrict following carriers for cart rule cartrule2:
+      | restricted carriers | carrier1 |
+    And I save all the restrictions for cart rule cartrule2
+    And cart rule cartrule2 should have the following properties:
+      | restricted carriers | carrier1 |
     When I add 1 items of product "product1" in my cart
     And I select address "address1" in my cart
     And I select carrier "carrier2" in my cart
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature
index 75c59e95ded3d..d3d853dc39550 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/cart_rule_validation.feature
@@ -68,7 +68,11 @@ Feature: Cart rule application is validated before it is applied to cart
       | code                | rule_carrier1 |
       | discount_percentage | 50            |
     And there is a carrier named "carrier1"
-    And cart rule "cart_rule_4" is restricted to carrier "carrier1"
+    And I restrict following carriers for cart rule cart_rule_4:
+      | restricted carriers | carrier1 |
+    And I save all the restrictions for cart rule cart_rule_4
+    And cart rule cart_rule_4 should have the following properties:
+      | restricted carriers | carrier1 |
     And I select carrier "carrier1" in my cart
     And I should have 0 products in my cart
     When I apply the voucher code "foo3"
diff --git a/tests/Integration/Behaviour/Features/Scenario/Order/order_cart_rules.feature b/tests/Integration/Behaviour/Features/Scenario/Order/order_cart_rules.feature
index 057d3b9006452..3faef0ac1802f 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Order/order_cart_rules.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Order/order_cart_rules.feature
@@ -727,7 +727,11 @@ Feature: Order from Back Office (BO)
     And there is a cart rule FreeGift with following properties:
       | name[en-US]  | FreeGift |
       | gift_product | product1 |
-    And cart rule "FreeGift" is restricted to carrier "carrier1"
+    And I restrict following carriers for cart rule FreeGift:
+      | restricted carriers | carrier1 |
+    And I save all the restrictions for cart rule FreeGift
+    And cart rule FreeGift should have the following properties:
+      | restricted carriers | carrier1 |
     When I create an empty cart "dummy_cart_freegift" for customer "testCustomer"
     And I select "FR" address as delivery and invoice address for customer "testCustomer" in cart "dummy_cart_freegift"
     And I add 1 products "product2" to the cart "dummy_cart_freegift"
diff --git a/tests/Integration/Behaviour/behat.yml b/tests/Integration/Behaviour/behat.yml
index 9ce36ce726936..4eb33518cc2ad 100644
--- a/tests/Integration/Behaviour/behat.yml
+++ b/tests/Integration/Behaviour/behat.yml
@@ -265,7 +265,6 @@ default:
                 - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\DeleteCartRuleFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\EditCartRuleFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\SetCartRuleRestrictionsFeatureContext
-                - Tests\Integration\Behaviour\Features\Context\Domain\CountryFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\ManufacturerFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\Product\AddProductFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\Product\Combination\CombinationListingFeatureContext

From e269c78b90b742913873a77a6af0e811e33e4b06 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Sat, 1 Jul 2023 12:40:36 +0300
Subject: [PATCH 0359/1030]  fix setting checked ids and add mixed scenario
 step

---
 .../CartRule/Repository/CartRuleRepository.php        |  7 ++++---
 .../CartRule/set_mixed_cart_rule_restrictions.feature | 11 +++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/Adapter/CartRule/Repository/CartRuleRepository.php b/src/Adapter/CartRule/Repository/CartRuleRepository.php
index c245c9d72a767..f90e1ad05dd99 100644
--- a/src/Adapter/CartRule/Repository/CartRuleRepository.php
+++ b/src/Adapter/CartRule/Repository/CartRuleRepository.php
@@ -346,12 +346,13 @@ public function setCarrierRestrictions(CartRuleId $cartRuleId, array $restricted
         $checkedIds = [];
         $insertValues = [];
         foreach ($restrictedCarrierIds as $restrictedCarrierId) {
+            $restrictedCarrierIdValue = $restrictedCarrierId->getValue();
             // skip duplicate ids if for some reason they exist
-            if (in_array($restrictedCarrierId, $checkedIds, true)) {
+            if (in_array($restrictedCarrierIdValue, $checkedIds, true)) {
                 continue;
             }
-            $insertValues[] = sprintf('(%d,%d)', $cartRuleId->getValue(), $restrictedCarrierId->getValue());
-            $checkedIds[] = $restrictedCarrierId;
+            $insertValues[] = sprintf('(%d,%d)', $cartRuleId->getValue(), $restrictedCarrierIdValue);
+            $checkedIds[] = $restrictedCarrierIdValue;
         }
 
         $this->connection->executeStatement(
diff --git a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_mixed_cart_rule_restrictions.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_mixed_cart_rule_restrictions.feature
index 7f527c123dac3..8bebd220b4059 100644
--- a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_mixed_cart_rule_restrictions.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_mixed_cart_rule_restrictions.feature
@@ -26,6 +26,8 @@ Feature: Set cart rule restrictions in BO
     And manufacturer graphicCorner named "Graphic Corner" exists
     And supplier fashionSupplier named "Fashion supplier" exists
     And supplier accessoriesSupplier named "Accessories supplier" exists
+    And there is a carrier named "carrier1"
+    And there is a carrier named "carrier2"
     And I add product "product1" with following information:
       | name[en-US] | bottle of beer |
       | type        | virtual        |
@@ -76,16 +78,22 @@ Feature: Set cart rule restrictions in BO
       | discount_application_type    | order_without_shipping |
     And I clear cart rule combination restrictions for cart rule rule_free_shipping_1
     And I clear all product restrictions for cart rule rule_free_shipping_1
+    And I clear all carrier restrictions for cart rule rule_free_shipping_1
     And I clear cart rule combination restrictions for cart rule rule_50_percent
     And I clear all product restrictions for cart rule rule_50_percent
+    And I clear all carrier restrictions for cart rule rule_50_percent
     And I clear cart rule combination restrictions for cart rule rule_70_percent
     And I clear all product restrictions for cart rule rule_70_percent
+    And I clear all carrier restrictions for cart rule rule_70_percent
     And cart rule "rule_free_shipping_1" should have the following properties:
       | restricted cart rules |  |
+      | restricted carriers   |  |
     And cart rule "rule_50_percent" should have the following properties:
       | restricted cart rules |  |
+      | restricted carriers   |  |
     And cart rule "rule_70_percent" should have the following properties:
       | restricted cart rules |  |
+      | restricted carriers   |  |
     And cart rule rule_free_shipping_1 should have no product restriction rules
     And cart rule rule_50_percent should have no product restriction rules
     And cart rule rule_70_percent should have no product restriction rules
@@ -93,6 +101,8 @@ Feature: Set cart rule restrictions in BO
   Scenario: Restrict cart rule combinations and various products restrictions
     When I restrict following cart rules for cart rule rule_free_shipping_1:
       | restricted cart rules | rule_50_percent,rule_70_percent |
+    And I restrict following carriers for cart rule rule_free_shipping_1:
+      | restricted carriers | carrier1,carrier2 |
     And I add a restriction for cart rule rule_free_shipping_1, which requires at least 1 product in cart matching one of these rules:
       | type          | references                 |
       | products      | product1                   |
@@ -110,6 +120,7 @@ Feature: Set cart rule restrictions in BO
     And I save all the restrictions for cart rule rule_free_shipping_1
     Then cart rule "rule_free_shipping_1" should have the following properties:
       | restricted cart rules | rule_50_percent,rule_70_percent |
+      | restricted carriers   | carrier1,carrier2               |
     And cart rule "rule_free_shipping_1" should have the following product restriction rule groups:
       | groupReference | quantity | rules count |
       | group_nr_1     | 1        | 5           |

From c71dfc8af5bc922ed8862fca0ba79dc6c30aad5b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Jul 2023 04:20:37 +0000
Subject: [PATCH 0360/1030] Bump @typescript-eslint/eslint-plugin from 5.60.0
 to 5.60.1 in /tests/UI

Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 5.60.0 to 5.60.1.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.60.1/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 68 +++++++++++++++++++-------------------
 tests/UI/package.json      |  2 +-
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index 303f19f3b78fe..84df58bec97d9 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -396,15 +396,15 @@
       "dev": true
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "5.60.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.60.0.tgz",
-      "integrity": "sha512-78B+anHLF1TI8Jn/cD0Q00TBYdMgjdOn980JfAVa9yw5sop8nyTfVOQAv6LWywkOGLclDBtv5z3oxN4w7jxyNg==",
+      "version": "5.60.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.60.1.tgz",
+      "integrity": "sha512-KSWsVvsJsLJv3c4e73y/Bzt7OpqMCADUO846bHcuWYSYM19bldbAeDv7dYyV0jwkbMfJ2XdlzwjhXtuD7OY6bw==",
       "dev": true,
       "requires": {
         "@eslint-community/regexpp": "^4.4.0",
-        "@typescript-eslint/scope-manager": "5.60.0",
-        "@typescript-eslint/type-utils": "5.60.0",
-        "@typescript-eslint/utils": "5.60.0",
+        "@typescript-eslint/scope-manager": "5.60.1",
+        "@typescript-eslint/type-utils": "5.60.1",
+        "@typescript-eslint/utils": "5.60.1",
         "debug": "^4.3.4",
         "grapheme-splitter": "^1.0.4",
         "ignore": "^5.2.0",
@@ -495,23 +495,23 @@
       }
     },
     "@typescript-eslint/scope-manager": {
-      "version": "5.60.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.60.0.tgz",
-      "integrity": "sha512-hakuzcxPwXi2ihf9WQu1BbRj1e/Pd8ZZwVTG9kfbxAMZstKz8/9OoexIwnmLzShtsdap5U/CoQGRCWlSuPbYxQ==",
+      "version": "5.60.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.60.1.tgz",
+      "integrity": "sha512-Dn/LnN7fEoRD+KspEOV0xDMynEmR3iSHdgNsarlXNLGGtcUok8L4N71dxUgt3YvlO8si7E+BJ5Fe3wb5yUw7DQ==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.60.0",
-        "@typescript-eslint/visitor-keys": "5.60.0"
+        "@typescript-eslint/types": "5.60.1",
+        "@typescript-eslint/visitor-keys": "5.60.1"
       }
     },
     "@typescript-eslint/type-utils": {
-      "version": "5.60.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.60.0.tgz",
-      "integrity": "sha512-X7NsRQddORMYRFH7FWo6sA9Y/zbJ8s1x1RIAtnlj6YprbToTiQnM6vxcMu7iYhdunmoC0rUWlca13D5DVHkK2g==",
+      "version": "5.60.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.60.1.tgz",
+      "integrity": "sha512-vN6UztYqIu05nu7JqwQGzQKUJctzs3/Hg7E2Yx8rz9J+4LgtIDFWjjl1gm3pycH0P3mHAcEUBd23LVgfrsTR8A==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/typescript-estree": "5.60.0",
-        "@typescript-eslint/utils": "5.60.0",
+        "@typescript-eslint/typescript-estree": "5.60.1",
+        "@typescript-eslint/utils": "5.60.1",
         "debug": "^4.3.4",
         "tsutils": "^3.21.0"
       },
@@ -528,19 +528,19 @@
       }
     },
     "@typescript-eslint/types": {
-      "version": "5.60.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.60.0.tgz",
-      "integrity": "sha512-ascOuoCpNZBccFVNJRSC6rPq4EmJ2NkuoKnd6LDNyAQmdDnziAtxbCGWCbefG1CNzmDvd05zO36AmB7H8RzKPA==",
+      "version": "5.60.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.60.1.tgz",
+      "integrity": "sha512-zDcDx5fccU8BA0IDZc71bAtYIcG9PowaOwaD8rjYbqwK7dpe/UMQl3inJ4UtUK42nOCT41jTSCwg76E62JpMcg==",
       "dev": true
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "5.60.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.60.0.tgz",
-      "integrity": "sha512-R43thAuwarC99SnvrBmh26tc7F6sPa2B3evkXp/8q954kYL6Ro56AwASYWtEEi+4j09GbiNAHqYwNNZuNlARGQ==",
+      "version": "5.60.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.60.1.tgz",
+      "integrity": "sha512-hkX70J9+2M2ZT6fhti5Q2FoU9zb+GeZK2SLP1WZlvUDqdMbEKhexZODD1WodNRyO8eS+4nScvT0dts8IdaBzfw==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.60.0",
-        "@typescript-eslint/visitor-keys": "5.60.0",
+        "@typescript-eslint/types": "5.60.1",
+        "@typescript-eslint/visitor-keys": "5.60.1",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -560,17 +560,17 @@
       }
     },
     "@typescript-eslint/utils": {
-      "version": "5.60.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.60.0.tgz",
-      "integrity": "sha512-ba51uMqDtfLQ5+xHtwlO84vkdjrqNzOnqrnwbMHMRY8Tqeme8C2Q8Fc7LajfGR+e3/4LoYiWXUM6BpIIbHJ4hQ==",
+      "version": "5.60.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.60.1.tgz",
+      "integrity": "sha512-tiJ7FFdFQOWssFa3gqb94Ilexyw0JVxj6vBzaSpfN/8IhoKkDuSAenUKvsSHw2A/TMpJb26izIszTXaqygkvpQ==",
       "dev": true,
       "requires": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@types/json-schema": "^7.0.9",
         "@types/semver": "^7.3.12",
-        "@typescript-eslint/scope-manager": "5.60.0",
-        "@typescript-eslint/types": "5.60.0",
-        "@typescript-eslint/typescript-estree": "5.60.0",
+        "@typescript-eslint/scope-manager": "5.60.1",
+        "@typescript-eslint/types": "5.60.1",
+        "@typescript-eslint/typescript-estree": "5.60.1",
         "eslint-scope": "^5.1.1",
         "semver": "^7.3.7"
       },
@@ -588,12 +588,12 @@
       }
     },
     "@typescript-eslint/visitor-keys": {
-      "version": "5.60.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.60.0.tgz",
-      "integrity": "sha512-wm9Uz71SbCyhUKgcaPRauBdTegUyY/ZWl8gLwD/i/ybJqscrrdVSFImpvUz16BLPChIeKBK5Fa9s6KDQjsjyWw==",
+      "version": "5.60.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.60.1.tgz",
+      "integrity": "sha512-xEYIxKcultP6E/RMKqube11pGjXH1DCo60mQoWhVYyKfLkwbIVVjYxmOenNMxILx0TjCujPTjjnTIVzm09TXIw==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.60.0",
+        "@typescript-eslint/types": "5.60.1",
         "eslint-visitor-keys": "^3.3.0"
       },
       "dependencies": {
diff --git a/tests/UI/package.json b/tests/UI/package.json
index cf1d70342d6ad..581f9af1583c5 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -132,7 +132,7 @@
     "@types/chai-string": "^1.4.2",
     "@types/mocha": "^10.0.1",
     "@types/mochawesome": "^6.2.1",
-    "@typescript-eslint/eslint-plugin": "^5.60.0",
+    "@typescript-eslint/eslint-plugin": "^5.60.1",
     "@typescript-eslint/parser": "^5.60.0",
     "babel-eslint": "^10.1.0",
     "eslint": "^8.43.0",

From 937c140dd8eab7a3635440612b90fa4be80724b7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Jul 2023 04:20:58 +0000
Subject: [PATCH 0361/1030] Bump typescript from 5.1.3 to 5.1.6 in /tests/UI

Bumps [typescript](https://github.com/Microsoft/TypeScript) from 5.1.3 to 5.1.6.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](https://github.com/Microsoft/TypeScript/commits)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 6 +++---
 tests/UI/package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index 303f19f3b78fe..86456fa9c2c2f 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -6057,9 +6057,9 @@
       }
     },
     "typescript": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.3.tgz",
-      "integrity": "sha512-XH627E9vkeqhlZFQuL+UsyAXEnibT0kWR2FWONlr4sTjvxyJYnyefgrkyECLzM5NenmKzRAy2rR/OlYLA1HkZw==",
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz",
+      "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==",
       "dev": true
     },
     "typical": {
diff --git a/tests/UI/package.json b/tests/UI/package.json
index cf1d70342d6ad..a18205bfddde6 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -142,6 +142,6 @@
     "jsdoc-to-markdown": "^8.0.0",
     "mochawesome-merge": "^4.3.0",
     "ts-mocha": "^10.0.0",
-    "typescript": "^5.1.3"
+    "typescript": "^5.1.6"
   }
 }

From 83e27d5f406f607ae9b63c7aa0d582837a502017 Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Mon, 3 Jul 2023 16:41:22 +0200
Subject: [PATCH 0362/1030] Add optional chaining

---
 .../themes/new-theme/js/pages/order/create/create-order-page.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-dev/themes/new-theme/js/pages/order/create/create-order-page.ts b/admin-dev/themes/new-theme/js/pages/order/create/create-order-page.ts
index 6ef97e81beae4..4840654dafda6 100644
--- a/admin-dev/themes/new-theme/js/pages/order/create/create-order-page.ts
+++ b/admin-dev/themes/new-theme/js/pages/order/create/create-order-page.ts
@@ -733,7 +733,7 @@ export default class CreateOrderPage {
 
     $(createOrderMap.cartBlock).removeClass('d-none');
     $(createOrderMap.cartBlock).data('cartId', cartInfo.cartId);
-    if (cartInfo.shipping.virtual) {
+    if (cartInfo.shipping?.virtual) {
       $(createOrderMap.shippingBlock).addClass('d-none');
     }
   }

From 201d8e7e2c0b097be35c242eafea0e0a340b12ef Mon Sep 17 00:00:00 2001
From: lartist <salim-benouamer.ext@prestashop.com>
Date: Mon, 3 Jul 2023 17:18:16 +0200
Subject: [PATCH 0363/1030] First smarty template replaced by twig

---
 .../themes/new-theme/template/layout.tpl      |  9 +-
 config/smarty.config.inc.php                  | 26 ++++++
 .../views/Admin/Layout/quick_access.html.twig | 83 +++++++++++++++++++
 .../Twig/Extension/AddSlashesExtension.php    | 18 ++++
 .../Twig/Extension/TruncateExtension.php      | 51 ++++++++++++
 5 files changed, 186 insertions(+), 1 deletion(-)
 create mode 100644 src/PrestaShopBundle/Resources/views/Admin/Layout/quick_access.html.twig
 create mode 100644 src/PrestaShopBundle/Twig/Extension/AddSlashesExtension.php
 create mode 100644 src/PrestaShopBundle/Twig/Extension/TruncateExtension.php

diff --git a/admin-dev/themes/new-theme/template/layout.tpl b/admin-dev/themes/new-theme/template/layout.tpl
index 17cd247af5b07..0aebf68ad775c 100644
--- a/admin-dev/themes/new-theme/template/layout.tpl
+++ b/admin-dev/themes/new-theme/template/layout.tpl
@@ -22,7 +22,14 @@
       <span id="shop_version">{$ps_version}</span>
 
       <div class="component" id="quick-access-container">
-        {include file="components/layout/quick_access.tpl"}
+        {render_template
+          smarty_template="components/layout/quick_access.tpl"
+          twig_template="@PrestaShop/Admin/Layout/quick_access.html.twig"
+          quick_access=$quick_access
+          link=$link
+          quick_access_current_link_icon=$quick_access_current_link_icon
+          quick_access_current_link_name=$quick_access_current_link_name
+        }
       </div>
       <div class="component component-search" id="header-search-container">
         <div class="component-search-body">
diff --git a/config/smarty.config.inc.php b/config/smarty.config.inc.php
index 3149a8f20219f..5a6a48af9560f 100644
--- a/config/smarty.config.inc.php
+++ b/config/smarty.config.inc.php
@@ -24,6 +24,8 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
+use PrestaShop\PrestaShop\Adapter\SymfonyContainer;
+
 global $smarty;
 if (Configuration::get('PS_SMARTY_LOCAL')) {
     $smarty = new SmartyCustom();
@@ -91,6 +93,7 @@ function smartyEscape($string, $esc_type = 'html', $char_set = null, $double_enc
 smartyRegisterFunction($smarty, 'modifier', 'classname', 'smartyClassname');
 smartyRegisterFunction($smarty, 'modifier', 'classnames', 'smartyClassnames');
 smartyRegisterFunction($smarty, 'function', 'url', array('Link', 'getUrlSmarty'));
+smartyRegisterFunction($smarty, 'function', 'render_template', 'renderTemplate');
 
 // Native PHP Functions
 smartyRegisterFunction($smarty, 'modifier', 'addcslashes', 'addcslashes');
@@ -229,3 +232,26 @@ function smarty_endWithoutReference($arrayValue)
 {
     return end($arrayValue);
 }
+
+function renderTemplate(array $params) {
+    $twigTemplate = $params['twig_template'];
+    unset($params['twig_template']);
+    $smartyTemplate = $params['smarty_template'];
+    unset($params['smarty_template']);
+
+    //dd(isset($params["quick_access_current_link_icon"]));
+    if (
+        SymfonyContainer::getInstance()
+            ->get('request_stack')
+            ->getCurrentRequest()
+            ->query->has('symfony_layout')
+    ) {
+        /** @var Twig\Environment $twig */
+        $twig = SymfonyContainer::getInstance()->get('twig');
+        return $twig->render($twigTemplate, $params);
+    } else {
+        global $smarty;
+        $smarty->display($smartyTemplate);
+    }
+
+}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/quick_access.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/quick_access.html.twig
new file mode 100644
index 0000000000000..39a28afe3f90e
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/quick_access.html.twig
@@ -0,0 +1,83 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+
+<div class="dropdown quick-accesses">
+  <button class="btn btn-link btn-sm dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" id="quick_select">
+    {{ 'Quick Access'|trans({}, 'Admin.Navigation.Header') }}
+  </button>
+  <div class="dropdown-menu">
+    {% for quick in quick_access %}
+      <a class="
+        dropdown-item quick-row-link
+        {% if quick.class is defined %}{{ quick.class}}{% endif %}
+        {% if link.matchQuickLink(quick.link) %}
+          {% set matchQuickLink = quick.id_quick_access %}
+          active
+        {% endif %}
+      "
+      href="{{ quick.link|escape('html') }}"
+      {% if quick.new_window %} target="_blank"{% endif %}
+      data-item="{{ quick.name }}"
+      >{{ quick.name }}</a>
+    {% endfor %}
+    <div class="dropdown-divider"></div>
+    {% if matchQuickLink is defined %}
+      <a id="quick-remove-link"
+         class="dropdown-item js-quick-link"
+         href="#"
+         data-method="remove"
+         data-quicklink-id="{{ matchQuickLink }}"
+         data-rand="{{ random(1, 200) }}"
+         data-icon="{{ quick_access_current_link_icon }}"
+         data-url="{{ link.getQuickLink(app.request.uri|escape('js')) }}"
+         data-post-link="{{ link.getAdminLink('AdminQuickAccesses') }}"
+         data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header')|escape('js') }}"
+         data-link="{{ quick_access_current_link_name|truncate(32) }}"
+      >
+        <i class="material-icons">remove_circle_outline</i>
+        {{ 'Remove from Quick Access'|trans({}, 'Admin.Navigation.Header') }}
+      </a>
+    {% else %}
+    <a id="quick-add-link"
+       class="dropdown-item js-quick-link"
+       href="#"
+       data-rand="{{ random(1, 200) }}"
+       data-icon="{{ quick_access_current_link_icon }}"
+       data-method="add"
+       data-url="{{ link.getQuickLink(app.request.uri|escape('js')) }}"
+       data-post-link="{{ link.getAdminLink('AdminQuickAccesses') }}"
+       data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header')|escape('js')}}"
+       data-link="{{ quick_access_current_link_name|truncate(32) }}"
+    >
+      <i class="material-icons">add_circle</i>
+      {{ 'Add current page to Quick Access'|trans({}, 'Admin.Actions') }}
+    </a>
+    {% endif %}
+    <a id="quick-manage-link" class="dropdown-item" href="{{ link.getAdminLink("AdminQuickAccesses")|addslashes }}">
+    <i class="material-icons">settings</i>
+    {{ 'Manage your quick accesses'|trans({}, 'Admin.Navigation.Header') }}
+    </a>
+  </div>
+</div>
diff --git a/src/PrestaShopBundle/Twig/Extension/AddSlashesExtension.php b/src/PrestaShopBundle/Twig/Extension/AddSlashesExtension.php
new file mode 100644
index 0000000000000..2ac08b0dd3dc0
--- /dev/null
+++ b/src/PrestaShopBundle/Twig/Extension/AddSlashesExtension.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\Twig\Extension;
+
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFilter;
+
+class AddSlashesExtension extends AbstractExtension
+{
+    public function getFilters()
+    {
+        return [
+            new TwigFilter('addslashes', 'addslashes'),
+        ];
+    }
+}
diff --git a/src/PrestaShopBundle/Twig/Extension/TruncateExtension.php b/src/PrestaShopBundle/Twig/Extension/TruncateExtension.php
new file mode 100644
index 0000000000000..e6c70b6db1f89
--- /dev/null
+++ b/src/PrestaShopBundle/Twig/Extension/TruncateExtension.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\Twig\Extension;
+
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFilter;
+
+class TruncateExtension extends AbstractExtension
+{
+    public function getFilters()
+    {
+        return [
+            new TwigFilter('truncate', [$this, 'truncate']),
+        ];
+    }
+
+    public function truncate(string $string, int $length, string $ellipsis = '...')
+    {
+        if (mb_strlen($string) <= $length) {
+            return $string;
+        }
+
+        return mb_substr($string, 0, $length) . $ellipsis;
+    }
+}

From 3093c8d7d645ca2adbad2f440692de5582abb5dd Mon Sep 17 00:00:00 2001
From: Fabien Papet <fabien.papet@gmail.com>
Date: Fri, 30 Jun 2023 11:21:17 +0200
Subject: [PATCH 0364/1030] Switch listener to attributes

Signed-off-by: Fabien Papet <fabien.papet@gmail.com>
---
 .../EventListener/DemoModeEnabledListener.php | 15 +++++++++++++--
 .../Security/Annotation/DemoRestricted.php    | 19 ++++++++++++++-----
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/PrestaShopBundle/EventListener/DemoModeEnabledListener.php b/src/PrestaShopBundle/EventListener/DemoModeEnabledListener.php
index f51157f225607..e8115e61e304e 100644
--- a/src/PrestaShopBundle/EventListener/DemoModeEnabledListener.php
+++ b/src/PrestaShopBundle/EventListener/DemoModeEnabledListener.php
@@ -109,12 +109,23 @@ public function onKernelController(ControllerEvent $event)
         }
 
         [$controllerObject, $methodName] = $controller;
-        $demoRestricted = $this->getAnnotation($controllerObject, $methodName);
 
-        if (!$demoRestricted instanceof DemoRestricted) {
+        $method = new \ReflectionMethod($controllerObject, $methodName);
+        if ($method->getAttributes(DemoRestricted::class)) {
             return;
         }
 
+        $attributes = $method->getAttributes(DemoRestricted::class);
+
+        if ([] === $attributes) {
+            return;
+        }
+
+        $attribute = $attributes[0];
+
+        /** @var DemoRestricted $value */
+        $demoRestricted = $attribute->newInstance();
+
         $this->showNotificationMessage($demoRestricted);
 
         $routeParametersToKeep = $this->getQueryParamsFromRequestQuery(
diff --git a/src/PrestaShopBundle/Security/Annotation/DemoRestricted.php b/src/PrestaShopBundle/Security/Annotation/DemoRestricted.php
index 70303a9ccf7ea..b448a80e934b2 100644
--- a/src/PrestaShopBundle/Security/Annotation/DemoRestricted.php
+++ b/src/PrestaShopBundle/Security/Annotation/DemoRestricted.php
@@ -26,14 +26,11 @@
 
 namespace PrestaShopBundle\Security\Annotation;
 
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\ConfigurationAnnotation;
-
 /**
  * Forbid access to the page if Demonstration mode is enabled.
- *
- * @Annotation
  */
-class DemoRestricted extends ConfigurationAnnotation
+#[\Attribute(\Attribute::TARGET_METHOD)]
+class DemoRestricted
 {
     /**
      * The translation domain for the message.
@@ -63,6 +60,18 @@ class DemoRestricted extends ConfigurationAnnotation
      */
     protected $redirectQueryParamsToKeep = [];
 
+    public function __construct(
+        ?string $redirectRoute = null,
+        string $domain = 'Admin.Notifications.Error',
+        string $message = 'This functionality has been disabled.',
+        array $redirectQueryParamsToKeep = []
+    ) {
+        $this->domain = $domain;
+        $this->message = $message;
+        $this->redirectRoute = $redirectRoute;
+        $this->redirectQueryParamsToKeep = $redirectQueryParamsToKeep;
+    }
+
     /**
      * @return string
      */

From 153cdbc54b4ae9181fa1b11c71f619334faad03e Mon Sep 17 00:00:00 2001
From: Fabien Papet <fabien.papet@gmail.com>
Date: Fri, 30 Jun 2023 11:21:34 +0200
Subject: [PATCH 0365/1030] Update code with rector

Signed-off-by: Fabien Papet <fabien.papet@gmail.com>
---
 rector.php                                    |  6 ++
 .../AdministrationController.php              |  6 +-
 .../AdvancedParameters/BackupController.php   | 12 ++--
 .../AdvancedParameters/EmailController.php    |  8 +--
 .../AdvancedParameters/EmployeeController.php | 17 +++---
 .../AdvancedParameters/ImportController.php   |  6 +-
 .../ImportDataConfigurationController.php     |  6 +-
 .../AdvancedParameters/LogsController.php     |  4 +-
 .../MemcacheServerController.php              |  6 +-
 .../PerformanceController.php                 | 14 ++---
 .../AdvancedParameters/ProfileController.php  |  8 +--
 .../SqlManagerController.php                  | 12 ++--
 .../WebserviceController.php                  | 12 ++--
 .../ShopParameters/ContactsController.php     |  6 +-
 .../CustomerPreferencesController.php         |  2 +-
 .../ShopParameters/MaintenanceController.php  |  2 +-
 .../ShopParameters/MetaController.php         | 16 ++---
 .../ShopParameters/PreferencesController.php  |  3 +-
 .../ShopParameters/TitleController.php        |  4 +-
 .../Configure/ShowcaseCardController.php      |  2 +-
 .../Improve/Design/CmsPageController.php      | 60 ++++---------------
 .../Admin/Improve/Design/ThemeController.php  | 14 ++---
 .../International/CountryController.php       |  3 +-
 .../International/CurrencyController.php      | 12 ++--
 .../International/GeolocationController.php   |  6 +-
 .../International/LanguageController.php      |  8 +--
 .../International/LocalizationController.php  |  8 +--
 .../Improve/International/StateController.php |  8 +--
 .../Improve/International/TaxController.php   | 12 ++--
 .../Improve/International/ZoneController.php  | 12 ++--
 .../Improve/Shipping/CarriersController.php   | 17 +++---
 .../Sell/Catalog/AttachmentController.php     |  2 +-
 .../Admin/Sell/Catalog/CartRuleController.php | 12 ++--
 .../Catalog/CatalogPriceRuleController.php    |  4 +-
 .../Admin/Sell/Catalog/CategoryController.php | 10 ++--
 .../Sell/Catalog/ManufacturerController.php   | 18 +++---
 .../Catalog/Product/ProductController.php     |  5 +-
 .../Admin/Sell/Catalog/SupplierController.php | 20 ++-----
 .../Sell/Customer/CustomerController.php      |  2 +-
 .../Admin/Sell/Order/OrderController.php      |  5 +-
 40 files changed, 166 insertions(+), 224 deletions(-)

diff --git a/rector.php b/rector.php
index 523480e3747c0..c7605655a15a0 100644
--- a/rector.php
+++ b/rector.php
@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+use PrestaShopBundle\Security\Annotation\DemoRestricted;
 use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector;
 use Rector\CodeQuality\Rector\ClassMethod\OptionalParametersAfterRequiredRector;
 use Rector\Config\RectorConfig;
@@ -24,12 +25,14 @@
 use Rector\Php74\Rector\LNumber\AddLiteralSeparatorToNumberRector;
 use Rector\Php74\Rector\Ternary\ParenthesizeNestedTernaryRector;
 use Rector\Php80\Rector\Catch_\RemoveUnusedVariableInCatchRector;
+use Rector\Php80\Rector\Class_\AnnotationToAttributeRector;
 use Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector;
 use Rector\Php80\Rector\Class_\StringableForToStringRector;
 use Rector\Php80\Rector\FunctionLike\MixedTypeRector;
 use Rector\Php80\Rector\FunctionLike\UnionTypesRector;
 use Rector\Php80\Rector\Switch_\ChangeSwitchToMatchRector;
 use Rector\Php80\Rector\Ternary\GetDebugTypeRector;
+use Rector\Php80\ValueObject\AnnotationToAttribute;
 use Rector\Php81\Rector\Array_\FirstClassCallableRector;
 use Rector\Php81\Rector\ClassConst\FinalizePublicClassConstantRector;
 use Rector\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector;
@@ -89,4 +92,7 @@
         OptionalParametersAfterRequiredRector::class => '*',
     ]);
 
+    $rectorConfig->ruleWithConfiguration(AnnotationToAttributeRector::class, [
+        new AnnotationToAttribute(DemoRestricted::class), ]
+    );
 };
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/AdministrationController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/AdministrationController.php
index 74bc867c3d7eb..ca647e6403b9a 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/AdministrationController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/AdministrationController.php
@@ -85,12 +85,12 @@ public function indexAction()
      *     "is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
      *     message="You do not have permission to update this.",
      *     redirectRoute="admin_administration")
-     * @DemoRestricted(redirectRoute="admin_administration")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_administration')]
     public function processGeneralFormAction(Request $request)
     {
         return $this->processForm(
@@ -107,12 +107,12 @@ public function processGeneralFormAction(Request $request)
      *     "is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
      *     message="You do not have permission to update this.",
      *     redirectRoute="admin_administration")
-     * @DemoRestricted(redirectRoute="admin_administration")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_administration')]
     public function processUploadQuotaFormAction(Request $request)
     {
         return $this->processForm(
@@ -130,12 +130,12 @@ public function processUploadQuotaFormAction(Request $request)
      *     message="You do not have permission to update this.",
      *     redirectRoute="admin_administration"
      * )
-     * @DemoRestricted(redirectRoute="admin_administration")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_administration')]
     public function processNotificationsFormAction(Request $request)
     {
         return $this->processForm(
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/BackupController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/BackupController.php
index 9fc32483917df..95eb4f2bfe166 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/BackupController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/BackupController.php
@@ -99,13 +99,13 @@ public function indexAction(Request $request, BackupFilters $filters)
      * Show file download view.
      *
      * @AdminSecurity("is_granted('read', request.get('_legacy_controller'))")
-     * @DemoRestricted(redirectRoute="admin_backups_index")
      *
      * @param Request $request
      * @param string $downloadFileName
      *
      * @return Response
      */
+    #[DemoRestricted(redirectRoute: 'admin_backups_index')]
     public function downloadViewAction(Request $request, $downloadFileName)
     {
         $backup = new Backup($downloadFileName);
@@ -125,12 +125,12 @@ public function downloadViewAction(Request $request, $downloadFileName)
      * Return a backup content as a download.
      *
      * @AdminSecurity("is_granted('read', request.get('_legacy_controller'))")
-     * @DemoRestricted(redirectRoute="admin_backup")
      *
      * @param string $downloadFileName
      *
      * @return BinaryFileResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_backup')]
     public function downloadContentAction($downloadFileName)
     {
         $backup = new Backup($downloadFileName);
@@ -146,12 +146,12 @@ public function downloadContentAction($downloadFileName)
      *          message="You do not have permission to update this.",
      *          redirectRoute="admin_backups_index"
      * )
-     * @DemoRestricted(redirectRoute="admin_backups_index")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_backups_index')]
     public function saveOptionsAction(Request $request)
     {
         $backupFormHandler = $this->getBackupFormHandler();
@@ -179,10 +179,10 @@ public function saveOptionsAction(Request $request)
      *          message="You do not have permission to create this.",
      *          redirectRoute="admin_backups_index"
      * )
-     * @DemoRestricted(redirectRoute="admin_backups_index")
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_backups_index')]
     public function createAction()
     {
         try {
@@ -220,12 +220,12 @@ public function createAction()
      *          message="You do not have permission to delete this.",
      *          redirectRoute="admin_backups_index"
      * )
-     * @DemoRestricted(redirectRoute="admin_backups_index")
      *
      * @param string $deleteFileName
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_backups_index')]
     public function deleteAction($deleteFileName)
     {
         $backup = new Backup($deleteFileName);
@@ -256,12 +256,12 @@ public function deleteAction($deleteFileName)
      *          message="You do not have permission to delete this.",
      *          redirectRoute="admin_backups_index"
      * )
-     * @DemoRestricted(redirectRoute="admin_backups_index")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_backups_index')]
     public function bulkDeleteAction(Request $request)
     {
         $backupsToDelete = $request->request->all('backup_backup_bulk_file_names');
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/EmailController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/EmailController.php
index 61386d43a611d..280da21f29ef5 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/EmailController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/EmailController.php
@@ -114,7 +114,6 @@ public function searchAction(Request $request)
     /**
      * Process email configuration saving.
      *
-     * @DemoRestricted(redirectRoute="admin_emails_index")
      * @AdminSecurity(
      *     "is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
      *     message="Access denied."
@@ -124,6 +123,7 @@ public function searchAction(Request $request)
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_emails_index')]
     public function saveOptionsAction(Request $request)
     {
         $formHandler = $this->getEmailConfigurationFormHandler();
@@ -149,13 +149,13 @@ public function saveOptionsAction(Request $request)
     /**
      * Delete selected email logs.
      *
-     * @DemoRestricted(redirectRoute="admin_emails_index")
      * @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", message="Access denied.")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_emails_index')]
     public function deleteBulkAction(Request $request)
     {
         $mailLogsToDelete = $request->request->get('email_logs_delete_email_logs');
@@ -178,11 +178,11 @@ public function deleteBulkAction(Request $request)
     /**
      * Delete all email logs.
      *
-     * @DemoRestricted(redirectRoute="admin_emails_index")
      * @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", message="Access denied.")
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_emails_index')]
     public function deleteAllAction()
     {
         $mailLogsEraser = $this->get('prestashop.adapter.email.email_log_eraser');
@@ -197,13 +197,13 @@ public function deleteAllAction()
     /**
      * Delete single email log.
      *
-     * @DemoRestricted(redirectRoute="admin_emails_index")
      * @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", message="Access denied.")
      *
      * @param int $mailId
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_emails_index')]
     public function deleteAction($mailId)
     {
         $mailLogsEraser = $this->get('prestashop.adapter.email.email_log_eraser');
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/EmployeeController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/EmployeeController.php
index 59271cb72e340..fa1fa972b7e12 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/EmployeeController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/EmployeeController.php
@@ -106,7 +106,6 @@ public function indexAction(Request $request, EmployeeFilters $filters)
     /**
      * Save employee options.
      *
-     * @DemoRestricted(redirectRoute="admin_employees_index")
      * @AdminSecurity(
      *     "is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))"
      * )
@@ -115,6 +114,7 @@ public function indexAction(Request $request, EmployeeFilters $filters)
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_employees_index')]
     public function saveOptionsAction(Request $request)
     {
         $employeeOptionsFormHandler = $this->get('prestashop.admin.employee_options.form_handler');
@@ -139,13 +139,13 @@ public function saveOptionsAction(Request $request)
     /**
      * Toggle given employee status.
      *
-     * @DemoRestricted(redirectRoute="admin_employees_index")
      * @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute="admin_employees_index")
      *
      * @param int $employeeId
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_employees_index')]
     public function toggleStatusAction($employeeId)
     {
         try {
@@ -165,13 +165,13 @@ public function toggleStatusAction($employeeId)
     /**
      * Bulk enables employee status action.
      *
-     * @DemoRestricted(redirectRoute="admin_employees_index")
      * @AdminSecurity("is_granted('update', request.get('_legacy_controller'))")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_employees_index')]
     public function bulkStatusEnableAction(Request $request)
     {
         $employeeIds = $request->request->all('employee_employee_bulk');
@@ -195,13 +195,13 @@ public function bulkStatusEnableAction(Request $request)
     /**
      * Bulk disables employee status action.
      *
-     * @DemoRestricted(redirectRoute="admin_employees_index")
      * @AdminSecurity("is_granted('update', request.get('_legacy_controller'))")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_employees_index')]
     public function bulkStatusDisableAction(Request $request)
     {
         $employeeIds = $request->request->all('employee_employee_bulk');
@@ -225,13 +225,13 @@ public function bulkStatusDisableAction(Request $request)
     /**
      * Delete employee.
      *
-     * @DemoRestricted(redirectRoute="admin_employees_index")
      * @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))")
      *
      * @param int $employeeId
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_employees_index')]
     public function deleteAction($employeeId)
     {
         try {
@@ -248,13 +248,13 @@ public function deleteAction($employeeId)
     /**
      * Delete employees in bulk actions.
      *
-     * @DemoRestricted(redirectRoute="admin_employees_index")
      * @AdminSecurity("is_granted('update', request.get('_legacy_controller'))")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_employees_index')]
     public function bulkDeleteAction(Request $request)
     {
         $employeeIds = $request->request->all('employee_employee_bulk');
@@ -276,13 +276,13 @@ public function bulkDeleteAction(Request $request)
     /**
      * Show employee creation form page and handle it's submit.
      *
-     * @DemoRestricted(redirectRoute="admin_employees_index")
      * @AdminSecurity("is_granted('create', request.get('_legacy_controller'))")
      *
      * @param Request $request
      *
      * @return Response
      */
+    #[DemoRestricted(redirectRoute: 'admin_employees_index')]
     public function createAction(Request $request)
     {
         $employeeForm = $this->getEmployeeFormBuilder()->getForm();
@@ -316,13 +316,12 @@ public function createAction(Request $request)
     /**
      * Show Employee edit page.
      *
-     * @DemoRestricted(redirectRoute="admin_employees_index")
-     *
      * @param int $employeeId
      * @param Request $request
      *
      * @return Response
      */
+    #[DemoRestricted(redirectRoute: 'admin_employees_index')]
     public function editAction($employeeId, Request $request)
     {
         $contextEmployeeProvider = $this->get('prestashop.adapter.data_provider.employee');
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ImportController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ImportController.php
index 00877c8bf544c..04c1d71b2c750 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ImportController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ImportController.php
@@ -165,12 +165,12 @@ public function uploadAction(Request $request)
      * Delete import file.
      *
      * @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", message="You do not have permission to update this.", redirectRoute="admin_import")
-     * @DemoRestricted(redirectRoute="admin_import")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_import')]
     public function deleteAction(Request $request)
     {
         $filename = $request->query->get('filename', $request->query->get('csvfilename'));
@@ -189,12 +189,12 @@ public function deleteAction(Request $request)
      *     "is_granted('read', request.get('_legacy_controller')) && is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
      *     message="You do not have permission to update this.", redirectRoute="admin_import"
      * )
-     * @DemoRestricted(redirectRoute="admin_import")
      *
      * @param Request $request
      *
      * @return Response
      */
+    #[DemoRestricted(redirectRoute: 'admin_import')]
     public function downloadAction(Request $request)
     {
         if ($filename = $request->query->get('filename')) {
@@ -266,12 +266,12 @@ public function getAvailableEntityFieldsAction(Request $request)
      *     "is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
      *     redirectRoute="admin_import"
      * )
-     * @DemoRestricted(redirectRoute="admin_import")
      *
      * @param Request $request
      *
      * @return JsonResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_import')]
     public function processImportAction(Request $request)
     {
         $errors = [];
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ImportDataConfigurationController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ImportDataConfigurationController.php
index 9d7463ae43f93..95b29ae0f086a 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ImportDataConfigurationController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ImportDataConfigurationController.php
@@ -46,12 +46,12 @@ class ImportDataConfigurationController extends FrameworkBundleAdminController
      * Shows import data page where the configuration of importable data and the final step of import is handled.
      *
      * @AdminSecurity("is_granted('read', request.get('_legacy_controller'))")
-     * @DemoRestricted(redirectRoute="admin_import")
      *
      * @param Request $request
      *
      * @return RedirectResponse|Response
      */
+    #[DemoRestricted(redirectRoute: 'admin_import')]
     public function indexAction(Request $request)
     {
         $importDirectory = $this->get('prestashop.core.import.dir');
@@ -99,12 +99,12 @@ public function indexAction(Request $request)
      * Create import data match configuration.
      *
      * @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", message="You do not have permission to update this.", redirectRoute="admin_import")
-     * @DemoRestricted(redirectRoute="admin_import")
      *
      * @param Request $request
      *
      * @return JsonResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_import')]
     public function createAction(Request $request)
     {
         $formHandler = $this->get('prestashop.admin.import_data_configuration.form_handler');
@@ -136,12 +136,12 @@ public function createAction(Request $request)
      * Delete import data match configuration.
      *
      * @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", message="You do not have permission to update this.", redirectRoute="admin_import")
-     * @DemoRestricted(redirectRoute="admin_import")
      *
      * @param Request $request
      *
      * @return JsonResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_import')]
     public function deleteAction(Request $request)
     {
         $importMatchRepository = $this->get('prestashop.core.admin.import_match.repository');
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/LogsController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/LogsController.php
index 7c493e13a4f1c..cd1afdf3f1fc7 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/LogsController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/LogsController.php
@@ -78,12 +78,12 @@ public function indexAction(LogsFilters $filters)
      *     "is_granted('read', request.get('_legacy_controller')) && is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
      *     message="You do not have permission to update this.", redirectRoute="admin_logs_index"
      * )
-     * @DemoRestricted(redirectRoute="admin_logs_index")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_logs_index')]
     public function searchAction(Request $request)
     {
         $this->dispatchHook('actionAdminLogsControllerPostProcessBefore', ['controller' => $this]);
@@ -103,12 +103,12 @@ public function searchAction(Request $request)
      *     "is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
      *     message="You do not have permission to update this.", redirectRoute="admin_logs_index"
      * )
-     * @DemoRestricted(redirectRoute="admin_logs_index")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_logs_index')]
     public function saveSettingsAction(Request $request)
     {
         $logsByEmailForm = $this->getFormHandler()->getForm();
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/MemcacheServerController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/MemcacheServerController.php
index 045baf8d63fc5..4a5e47e052148 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/MemcacheServerController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/MemcacheServerController.php
@@ -54,12 +54,12 @@ public function listAction()
 
     /**
      * @AdminSecurity("is_granted('read', request.get('_legacy_controller'))", message="Access denied.")
-     * @DemoRestricted(redirectRoute="admin_servers_test")
      *
      * @param Request $request
      *
      * @return JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_servers_test')]
     public function testAction(Request $request)
     {
         $queryValues = $request->query;
@@ -79,12 +79,12 @@ public function testAction(Request $request)
 
     /**
      * @AdminSecurity("is_granted('create', request.get('_legacy_controller'))", message="Access denied.")
-     * @DemoRestricted(redirectRoute="admin_servers_test")
      *
      * @param Request $request
      *
      * @return JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_servers_test')]
     public function addAction(Request $request)
     {
         if (!in_array(
@@ -138,12 +138,12 @@ public function addAction(Request $request)
 
     /**
      * @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", message="Access denied.")
-     * @DemoRestricted(redirectRoute="admin_servers_test")
      *
      * @param Request $request
      *
      * @return JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_servers_test')]
     public function deleteAction(Request $request)
     {
         if (!in_array(
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/PerformanceController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/PerformanceController.php
index ff71bddee02bb..37057ed237a6c 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/PerformanceController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/PerformanceController.php
@@ -95,12 +95,12 @@ public function indexAction(): Response
      *     "is_granted('read', request.get('_legacy_controller')) && is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
      *     message="You do not have permission to update this."
      * )
-     * @DemoRestricted(redirectRoute="admin_performance")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_performance')]
     public function processSmartyFormAction(Request $request)
     {
         return $this->processForm(
@@ -117,12 +117,12 @@ public function processSmartyFormAction(Request $request)
      *     "is_granted('read', request.get('_legacy_controller')) && is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
      *     message="You do not have permission to update this."
      * )
-     * @DemoRestricted(redirectRoute="admin_performance")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_performance')]
     public function processDebugModeFormAction(Request $request)
     {
         return $this->processForm(
@@ -139,12 +139,12 @@ public function processDebugModeFormAction(Request $request)
      *     "is_granted('read', request.get('_legacy_controller')) && is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
      *     message="You do not have permission to update this."
      * )
-     * @DemoRestricted(redirectRoute="admin_performance")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_performance')]
     public function processOptionalFeaturesFormAction(Request $request)
     {
         return $this->processForm(
@@ -161,12 +161,12 @@ public function processOptionalFeaturesFormAction(Request $request)
      *     "is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
      *     message="You do not have permission to update this."
      * )
-     * @DemoRestricted(redirectRoute="admin_performance")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_performance')]
     public function processCombineCompressCacheFormAction(Request $request)
     {
         return $this->processForm(
@@ -183,12 +183,12 @@ public function processCombineCompressCacheFormAction(Request $request)
      *     "is_granted('read', request.get('_legacy_controller')) && is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
      *     message="You do not have permission to update this."
      * )
-     * @DemoRestricted(redirectRoute="admin_performance")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_performance')]
     public function processMediaServersFormAction(Request $request)
     {
         return $this->processForm(
@@ -205,12 +205,12 @@ public function processMediaServersFormAction(Request $request)
      *     "is_granted('read', request.get('_legacy_controller')) && is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
      *     message="You do not have permission to update this."
      * )
-     * @DemoRestricted(redirectRoute="admin_performance")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_performance')]
     public function processCachingFormAction(Request $request)
     {
         return $this->processForm(
@@ -257,10 +257,10 @@ protected function processForm(Request $request, FormHandlerInterface $formHandl
 
     /**
      * @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", message="Access denied.")
-     * @DemoRestricted(redirectRoute="admin_performance")
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_performance')]
     public function disableNonBuiltInAction(): RedirectResponse
     {
         try {
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ProfileController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ProfileController.php
index 4b850474ecf5e..720ce32335666 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ProfileController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ProfileController.php
@@ -120,12 +120,12 @@ public function searchAction(Request $request)
      * Show profile's create page
      *
      * @AdminSecurity("is_granted('create', request.get('_legacy_controller'))")
-     * @DemoRestricted(redirectRoute="admin_profiles_index")
      *
      * @param Request $request
      *
      * @return Response
      */
+    #[DemoRestricted(redirectRoute: 'admin_profiles_index')]
     public function createAction(Request $request)
     {
         $form = $this->get('prestashop.core.form.identifiable_object.builder.profile_form_builder')->getForm();
@@ -164,13 +164,13 @@ public function createAction(Request $request)
      *     "is_granted('update', request.get('_legacy_controller'))",
      *     message="You do not have permission to edit this."
      * )
-     * @DemoRestricted(redirectRoute="admin_profiles_index")
      *
      * @param int $profileId
      * @param Request $request
      *
      * @return Response
      */
+    #[DemoRestricted(redirectRoute: 'admin_profiles_index')]
     public function editAction($profileId, Request $request)
     {
         $formHandler = $this->get('prestashop.core.form.identifiable_object.handler.profile_form_handler');
@@ -228,12 +228,12 @@ public function editAction($profileId, Request $request)
      *     "is_granted('delete', request.get('_legacy_controller'))",
      *     message="You do not have permission to edit this."
      * )
-     * @DemoRestricted(redirectRoute="admin_profiles_index")
      *
      * @param int $profileId
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_profiles_index')]
     public function deleteAction($profileId)
     {
         try {
@@ -256,12 +256,12 @@ public function deleteAction($profileId)
      *     "is_granted('delete', request.get('_legacy_controller'))",
      *     message="You do not have permission to edit this."
      * )
-     * @DemoRestricted(redirectRoute="admin_profiles_index")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_profiles_index')]
     public function bulkDeleteAction(Request $request)
     {
         $profileIds = $request->request->all('profile_bulk');
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/SqlManagerController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/SqlManagerController.php
index d6b47fe04dd6e..9f389599116d6 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/SqlManagerController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/SqlManagerController.php
@@ -104,12 +104,12 @@ public function indexAction(Request $request, RequestSqlFilters $filters)
      * @deprecated since 1.7.8 and will be removed in next major. Use CommonController:searchGridAction instead
      *
      * @AdminSecurity("is_granted('read', request.get('_legacy_controller'))", redirectRoute="admin_sql_requests_index")
-     * @DemoRestricted(redirectRoute="admin_sql_requests_index")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_sql_requests_index')]
     public function searchAction(Request $request)
     {
         $definitionFactory = $this->get('prestashop.core.grid.definition.factory.request_sql');
@@ -131,7 +131,6 @@ public function searchAction(Request $request)
     /**
      * Process Request SQL settings save.
      *
-     * @DemoRestricted(redirectRoute="admin_sql_requests_index")
      * @AdminSecurity(
      *     "is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
      *      redirectRoute="admin_sql_requests_index"
@@ -141,6 +140,7 @@ public function searchAction(Request $request)
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_sql_requests_index')]
     public function processFormAction(Request $request)
     {
         $handler = $this->getSettingsFormHandler();
@@ -207,7 +207,6 @@ public function createAction(Request $request)
     /**
      * Show Request SQL edit page.
      *
-     * @DemoRestricted(redirectRoute="admin_sql_requests_index")
      * @AdminSecurity(
      *     "is_granted('update', request.get('_legacy_controller'))",
      *     message="You do not have permission to edit this.",
@@ -219,6 +218,7 @@ public function createAction(Request $request)
      *
      * @return Response
      */
+    #[DemoRestricted(redirectRoute: 'admin_sql_requests_index')]
     public function editAction(int $sqlRequestId, Request $request)
     {
         $sqlRequestForm = $this->getSqlRequestFormBuilder()->getFormFor($sqlRequestId);
@@ -260,12 +260,12 @@ public function editAction(int $sqlRequestId, Request $request)
      *     message="You do not have permission to delete this.",
      *     redirectRoute="admin_sql_requests_index"
      * )
-     * @DemoRestricted(redirectRoute="admin_sql_requests_index")
      *
      * @param int $sqlRequestId ID of selected Request SQL
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_sql_requests_index')]
     public function deleteAction(int $sqlRequestId)
     {
         try {
@@ -291,12 +291,12 @@ public function deleteAction(int $sqlRequestId)
      *     message="You do not have permission to delete this.",
      *     redirectRoute="admin_sql_requests_index"
      * )
-     * @DemoRestricted(redirectRoute="admin_sql_requests_index")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_sql_requests_index')]
     public function deleteBulkAction(Request $request)
     {
         try {
@@ -358,12 +358,12 @@ public function viewAction(Request $request, int $sqlRequestId)
      *     "is_granted('read', request.get('_legacy_controller'))",
      *     redirectRoute="admin_sql_requests_index"
      * )
-     * @DemoRestricted(redirectRoute="admin_sql_requests_index")
      *
      * @param int $sqlRequestId Request SQL id
      *
      * @return RedirectResponse|BinaryFileResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_sql_requests_index')]
     public function exportAction(int $sqlRequestId)
     {
         $requestSqlExporter = $this->get('prestashop.core.sql_manager.exporter.sql_request_exporter');
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/WebserviceController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/WebserviceController.php
index c17f5b15165b9..a2bf6a9cf790d 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/WebserviceController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/WebserviceController.php
@@ -182,13 +182,13 @@ public function searchAction(Request $request)
     /**
      * Deletes single record.
      *
-     * @DemoRestricted(redirectRoute="admin_webservice_keys_index")
      * @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", message="You do not have permission to delete this.")
      *
      * @param int $webserviceKeyId
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_webservice_keys_index')]
     public function deleteAction($webserviceKeyId)
     {
         $webserviceEraser = $this->get('prestashop.adapter.webservice.webservice_key_eraser');
@@ -209,13 +209,13 @@ public function deleteAction($webserviceKeyId)
     /**
      * Deletes selected records.
      *
-     * @DemoRestricted(redirectRoute="admin_webservice_keys_index")
      * @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", message="You do not have permission to delete this.")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_webservice_keys_index')]
     public function bulkDeleteAction(Request $request)
     {
         $webserviceToDelete = $request->request->get('webservice_key_bulk_action');
@@ -238,13 +238,13 @@ public function bulkDeleteAction(Request $request)
     /**
      * Enables status for selected rows.
      *
-     * @DemoRestricted(redirectRoute="admin_webservice_keys_index")
      * @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", message="You do not have permission to edit this.")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_webservice_keys_index')]
     public function bulkEnableAction(Request $request)
     {
         $webserviceToEnable = $request->request->get('webservice_key_bulk_action');
@@ -263,13 +263,13 @@ public function bulkEnableAction(Request $request)
     /**
      * Disables status for selected rows.
      *
-     * @DemoRestricted(redirectRoute="admin_webservice_keys_index")
      * @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", message="You do not have permission to edit this.")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_webservice_keys_index')]
     public function bulkDisableAction(Request $request)
     {
         $webserviceToDisable = $request->request->get('webservice_key_bulk_action');
@@ -288,13 +288,13 @@ public function bulkDisableAction(Request $request)
     /**
      * Toggles webservice account status.
      *
-     * @DemoRestricted(redirectRoute="admin_webservice_keys_index")
      * @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", message="You do not have permission to edit this.")
      *
      * @param int $webserviceKeyId
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_webservice_keys_index')]
     public function toggleStatusAction($webserviceKeyId)
     {
         $statusModifier = $this->get('prestashop.adapter.webservice.webservice_key_status_modifier');
@@ -315,7 +315,6 @@ public function toggleStatusAction($webserviceKeyId)
     /**
      * Process the Webservice configuration form.
      *
-     * @DemoRestricted(redirectRoute="admin_webservice_keys_index")
      * @AdminSecurity(
      *     "is_granted('create', request.get('_legacy_controller')) && is_granted('update', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
      *     message="You do not have permission to edit this."
@@ -326,6 +325,7 @@ public function toggleStatusAction($webserviceKeyId)
      *
      * @return Response|RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_webservice_keys_index')]
     public function saveSettingsAction(Request $request, WebserviceKeyFilters $filters)
     {
         $this->dispatchHook('actionAdminAdminWebserviceControllerPostProcessBefore', ['controller' => $this]);
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/ContactsController.php b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/ContactsController.php
index a81f73000f8b2..3d6ee323b7a92 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/ContactsController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/ContactsController.php
@@ -212,12 +212,11 @@ public function editAction($contactId, Request $request)
      *     message="You do not have permission to delete this."
      * )
      *
-     * @DemoRestricted(redirectRoute="admin_contacts_index")
-     *
      * @param int $contactId
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_contacts_index')]
     public function deleteAction($contactId)
     {
         $contactDeleter = $this->get('prestashop.adapter.contact.deleter');
@@ -243,12 +242,11 @@ public function deleteAction($contactId)
      *     message="You do not have permission to delete this."
      * )
      *
-     * @DemoRestricted(redirectRoute="admin_contacts_index")
-     *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_contacts_index')]
     public function deleteBulkAction(Request $request)
     {
         $contactIds = $request->request->all('contact_bulk');
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/CustomerPreferencesController.php b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/CustomerPreferencesController.php
index 93af19739d28d..27474f8e26801 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/CustomerPreferencesController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/CustomerPreferencesController.php
@@ -67,12 +67,12 @@ public function indexAction(Request $request)
      *     "is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
      *     message="You do not have permission to update this.", redirectRoute="admin_customer_preferences"
      * )
-     * @DemoRestricted(redirectRoute="admin_customer_preferences")
      *
      * @param Request $request
      *
      * @return Response
      */
+    #[DemoRestricted(redirectRoute: 'admin_customer_preferences')]
     public function processAction(Request $request)
     {
         $formHandler = $this->get('prestashop.admin.customer_preferences.form_handler');
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/MaintenanceController.php b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/MaintenanceController.php
index dc81825e82eca..e40cab048ae51 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/MaintenanceController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/MaintenanceController.php
@@ -74,10 +74,10 @@ public function indexAction(Request $request, FormInterface $form = null)
      *     "is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
      *     message="You do not have permission to edit this.",
      *     redirectRoute="admin_maintenance")
-     * @DemoRestricted(redirectRoute="admin_maintenance")
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_maintenance')]
     public function processFormAction(Request $request)
     {
         $redirectResponse = $this->redirectToRoute('admin_maintenance');
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/MetaController.php b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/MetaController.php
index f438525db0e36..0cc4724495d34 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/MetaController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/MetaController.php
@@ -83,12 +83,12 @@ public function indexAction(MetaFilters $filters, Request $request)
      * Used for applying filtering actions.
      *
      * @AdminSecurity("is_granted('read', request.get('_legacy_controller'))")
-     * @DemoRestricted(redirectRoute="admin_metas_index")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_metas_index')]
     public function searchAction(Request $request)
     {
         $definitionFactory = $this->get('prestashop.core.grid.definition.factory.meta');
@@ -191,12 +191,12 @@ public function editAction($metaId, Request $request)
      * Removes single element from meta list.
      *
      * @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", message="You do not have permission to delete this.")
-     * @DemoRestricted(redirectRoute="admin_metas_index")
      *
      * @param int $metaId
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_metas_index')]
     public function deleteAction($metaId)
     {
         $metaEraser = $this->get('prestashop.adapter.meta.meta_eraser');
@@ -218,12 +218,12 @@ public function deleteAction($metaId)
      * Removes multiple records from meta list.
      *
      * @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", message="You do not have permission to delete this.")
-     * @DemoRestricted(redirectRoute="admin_metas_index")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_metas_index')]
     public function deleteBulkAction(Request $request)
     {
         $metaToDelete = $request->request->all('meta_bulk');
@@ -245,13 +245,13 @@ public function deleteBulkAction(Request $request)
 
     /**
      * @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", message="You do not have permission to edit this.")
-     * @DemoRestricted(redirectRoute="admin_metas_index")
      *
      * @param MetaFilters $filters
      * @param Request $request
      *
      * @return Response|RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_metas_index')]
     public function processSetUpUrlsFormAction(MetaFilters $filters, Request $request)
     {
         $formProcessResult = $this->processForm(
@@ -278,13 +278,13 @@ public function processSetUpUrlsFormAction(MetaFilters $filters, Request $reques
 
     /**
      * @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", message="You do not have permission to edit this.")
-     * @DemoRestricted(redirectRoute="admin_metas_index")
      *
      * @param MetaFilters $filters
      * @param Request $request
      *
      * @return Response|RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_metas_index')]
     public function processShopUrlsFormAction(MetaFilters $filters, Request $request)
     {
         $formProcessResult = $this->processForm(
@@ -311,13 +311,13 @@ public function processShopUrlsFormAction(MetaFilters $filters, Request $request
 
     /**
      * @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", message="You do not have permission to edit this.")
-     * @DemoRestricted(redirectRoute="admin_metas_index")
      *
      * @param MetaFilters $filters
      * @param Request $request
      *
      * @return Response|RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_metas_index')]
     public function processUrlSchemaFormAction(MetaFilters $filters, Request $request)
     {
         $formProcessResult = $this->processForm(
@@ -339,13 +339,13 @@ public function processUrlSchemaFormAction(MetaFilters $filters, Request $reques
 
     /**
      * @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", message="You do not have permission to edit this.")
-     * @DemoRestricted(redirectRoute="admin_metas_index")
      *
      * @param MetaFilters $filters
      * @param Request $request
      *
      * @return Response|RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_metas_index')]
     public function processSeoOptionsFormAction(MetaFilters $filters, Request $request)
     {
         $formProcessResult = $this->processForm(
@@ -376,10 +376,10 @@ public function processSeoOptionsFormAction(MetaFilters $filters, Request $reque
      * @AdminSecurity(
      *     "is_granted('create', request.get('_legacy_controller')) && is_granted('update', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))"
      * )
-     * @DemoRestricted(redirectRoute="admin_metas_index")
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_metas_index')]
     public function generateRobotsFileAction()
     {
         $robotsTextFileGenerator = $this->get('prestashop.adapter.file.robots_text_file_generator');
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/PreferencesController.php b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/PreferencesController.php
index 767830d76b8aa..facc91c11f276 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/PreferencesController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/PreferencesController.php
@@ -66,12 +66,11 @@ public function indexAction(Request $request, FormInterface $form = null)
      *     message="You do not have permission to update this.",
      *     redirectRoute="admin_preferences")
      *
-     * @DemoRestricted(redirectRoute="admin_preferences")
-     *
      * @return Response
      *
      * @throws \LogicException
      */
+    #[DemoRestricted(redirectRoute: 'admin_preferences')]
     public function processFormAction(Request $request)
     {
         $this->dispatchHook('actionAdminPreferencesControllerPostProcessBefore', ['controller' => $this]);
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/TitleController.php b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/TitleController.php
index d992ced64f208..dce263a40e59e 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/TitleController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/TitleController.php
@@ -164,12 +164,12 @@ public function editAction(int $titleId, Request $request): Response
      *     redirectRoute="admin_title_index",
      *     message="You need permission to delete this."
      * )
-     * @DemoRestricted(redirectRoute="admin_title_index")
      *
      * @param int $titleId
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_title_index')]
     public function deleteAction(int $titleId): RedirectResponse
     {
         try {
@@ -189,12 +189,12 @@ public function deleteAction(int $titleId): RedirectResponse
      * Deletes titles in bulk action
      *
      * @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", redirectRoute="admin_title_index")
-     * @DemoRestricted(redirectRoute="admin_title_index")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_title_index')]
     public function bulkDeleteAction(Request $request): RedirectResponse
     {
         $titleIds = $this->getBulkTitlesFromRequest($request);
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/ShowcaseCardController.php b/src/PrestaShopBundle/Controller/Admin/Configure/ShowcaseCardController.php
index cb43fcb573593..f363561616510 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/ShowcaseCardController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/ShowcaseCardController.php
@@ -53,10 +53,10 @@ class ShowcaseCardController extends FrameworkBundleAdminController
      * @AdminSecurity(
      *     "is_granted('create', 'CONFIGURE') && is_granted('update', 'CONFIGURE')"
      * )
-     * @DemoRestricted(redirectRoute="admin_metas_index")
      *
      * @return JsonResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_metas_index')]
     public function closeShowcaseCardAction(Request $request)
     {
         // check prerequisites
diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/Design/CmsPageController.php b/src/PrestaShopBundle/Controller/Admin/Improve/Design/CmsPageController.php
index c57e14f52ec2a..15d80e798241c 100644
--- a/src/PrestaShopBundle/Controller/Admin/Improve/Design/CmsPageController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Improve/Design/CmsPageController.php
@@ -453,15 +453,12 @@ public function editCmsCategoryAction($cmsCategoryId, Request $request)
      *     redirectQueryParamsToKeep={"id_cms_category"},
      *     message="You do not have permission to delete this."
      * )
-     * @DemoRestricted(
-     *     redirectRoute="admin_cms_pages_index",
-     *     redirectQueryParamsToKeep={"id_cms_category"}
-     * )
      *
      * @param int $cmsCategoryId
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_cms_pages_index', redirectQueryParamsToKeep: ['id_cms_category'])]
     public function deleteCmsCategoryAction($cmsCategoryId)
     {
         try {
@@ -492,15 +489,12 @@ public function deleteCmsCategoryAction($cmsCategoryId)
      *     redirectQueryParamsToKeep={"id_cms_category"},
      *     message="You do not have permission to delete this."
      * )
-     * @DemoRestricted(
-     *     redirectRoute="admin_cms_pages_index",
-     *     redirectQueryParamsToKeep={"id_cms_category"}
-     * )
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_cms_pages_index', redirectQueryParamsToKeep: ['id_cms_category'])]
     public function deleteBulkCmsCategoryAction(Request $request)
     {
         $cmsCategoriesToDelete = $request->request->all('cms_page_category_bulk');
@@ -535,15 +529,12 @@ public function deleteBulkCmsCategoryAction(Request $request)
      *     redirectQueryParamsToKeep={"id_cms_category"},
      *     message="You do not have permission to edit this."
      * )
-     * @DemoRestricted(
-     *     redirectRoute="admin_cms_pages_index",
-     *     redirectQueryParamsToKeep={"id_cms_category"}
-     * )
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_cms_pages_index', redirectQueryParamsToKeep: ['id_cms_category'])]
     public function updateCmsCategoryPositionAction(Request $request)
     {
         $cmsCategoryParentId = $request->query->getInt('id_cms_category') ?:
@@ -590,13 +581,10 @@ public function updateCmsCategoryPositionAction(Request $request)
      *      redirectQueryParamsToKeep={"id_cms_category"},
      *      message="You do not have permission to edit this."
      * )
-     * @DemoRestricted(
-     *     redirectRoute="admin_cms_pages_index",
-     *     redirectQueryParamsToKeep={"id_cms_category"}
-     * )
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_cms_pages_index', redirectQueryParamsToKeep: ['id_cms_category'])]
     public function updateCmsPositionAction(Request $request)
     {
         $cmsCategoryParentId = $request->query->getInt('id_cms_category') ?:
@@ -642,15 +630,12 @@ public function updateCmsPositionAction(Request $request)
      *      redirectQueryParamsToKeep={"id_cms_category"},
      *      message="You do not have permission to edit this."
      * )
-     * @DemoRestricted(
-     *     redirectRoute="admin_cms_pages_index",
-     *     redirectQueryParamsToKeep={"id_cms_category"}
-     * )
      *
      * @param int $cmsCategoryId
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_cms_pages_index', redirectQueryParamsToKeep: ['id_cms_category'])]
     public function toggleCmsCategoryAction($cmsCategoryId)
     {
         try {
@@ -681,15 +666,12 @@ public function toggleCmsCategoryAction($cmsCategoryId)
      *     redirectQueryParamsToKeep={"id_cms_category"},
      *     message="You do not have permission to edit this."
      * )
-     * @DemoRestricted(
-     *     redirectRoute="admin_cms_pages_index",
-     *     redirectQueryParamsToKeep={"id_cms_category"}
-     * )
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_cms_pages_index', redirectQueryParamsToKeep: ['id_cms_category'])]
     public function bulkCmsPageCategoryStatusEnableAction(Request $request)
     {
         $cmsCategoriesToEnable = $request->request->all('cms_page_category_bulk');
@@ -723,15 +705,12 @@ public function bulkCmsPageCategoryStatusEnableAction(Request $request)
      *     redirectQueryParamsToKeep={"id_cms_category"},
      *     message="You do not have permission to edit this."
      * )
-     * @DemoRestricted(
-     *     redirectRoute="admin_cms_pages_index",
-     *     redirectQueryParamsToKeep={"id_cms_category"}
-     * )
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_cms_pages_index', redirectQueryParamsToKeep: ['id_cms_category'])]
     public function bulkCmsPageCategoryStatusDisableAction(Request $request)
     {
         $cmsCategoriesToDisable = $request->request->all('cms_page_category_bulk');
@@ -769,15 +748,12 @@ function ($item) {
      *     redirectQueryParamsToKeep={"id_cms_category"},
      *     message="You do not have permission to edit this."
      * )
-     * @DemoRestricted(
-     *     redirectRoute="admin_cms_pages_index",
-     *     redirectQueryParamsToKeep={"id_cms_category"}
-     * )
      *
      * @param int $cmsId
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_cms_pages_index', redirectQueryParamsToKeep: ['id_cms_category'])]
     public function toggleCmsAction($cmsId)
     {
         try {
@@ -806,15 +782,12 @@ public function toggleCmsAction($cmsId)
      *     redirectQueryParamsToKeep={"id_cms_category"},
      *     message="You do not have permission to edit this."
      * )
-     * @DemoRestricted(
-     *     redirectRoute="admin_cms_pages_index",
-     *     redirectQueryParamsToKeep={"id_cms_category"}
-     * )
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_cms_pages_index', redirectQueryParamsToKeep: ['id_cms_category'])]
     public function bulkDisableCmsPageStatusAction(Request $request)
     {
         $cmsPagesToDisable = $request->request->all('cms_page_bulk');
@@ -849,15 +822,12 @@ public function bulkDisableCmsPageStatusAction(Request $request)
      *     redirectQueryParamsToKeep={"id_cms_category"},
      *     message="You do not have permission to edit this."
      * )
-     * @DemoRestricted(
-     *     redirectRoute="admin_cms_pages_index",
-     *     redirectQueryParamsToKeep={"id_cms_category"}
-     * )
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_cms_pages_index', redirectQueryParamsToKeep: ['id_cms_category'])]
     public function bulkEnableCmsPageStatusAction(Request $request)
     {
         $cmsPagesToDisable = $request->request->all('cms_page_bulk');
@@ -897,15 +867,12 @@ function ($item) {
      *     redirectQueryParamsToKeep={"id_cms_category"},
      *     message="You do not have permission to delete this."
      * )
-     * @DemoRestricted(
-     *     redirectRoute="admin_cms_pages_index",
-     *     redirectQueryParamsToKeep={"id_cms_category"}
-     * )
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_cms_pages_index', redirectQueryParamsToKeep: ['id_cms_category'])]
     public function bulkDeleteCmsPageAction(Request $request)
     {
         $cmsPagesToDisable = $request->request->all('cms_page_bulk');
@@ -947,15 +914,12 @@ function ($item) {
      *     redirectQueryParamsToKeep={"id_cms_category"},
      *     message="You do not have permission to delete this."
      * )
-     * @DemoRestricted(
-     *     redirectRoute="admin_cms_pages_index",
-     *     redirectQueryParamsToKeep={"id_cms_category"}
-     * )
      *
      * @param int $cmsId
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_cms_pages_index', redirectQueryParamsToKeep: ['id_cms_category'])]
     public function deleteCmsAction($cmsId)
     {
         $redirectResponse = $this->redirectToParentIndexPageByCmsPageId($cmsId);
diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/Design/ThemeController.php b/src/PrestaShopBundle/Controller/Admin/Improve/Design/ThemeController.php
index 07a4b597cbcc5..4bd345ba8b278 100644
--- a/src/PrestaShopBundle/Controller/Admin/Improve/Design/ThemeController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Improve/Design/ThemeController.php
@@ -112,12 +112,12 @@ public function indexAction(Request $request)
      * Upload shop logos.
      *
      * @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute="admin_themes_index")
-     * @DemoRestricted(redirectRoute="admin_themes_index")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_themes_index')]
     public function uploadLogosAction(Request $request)
     {
         $logosUploadForm = $this->getLogosUploadForm();
@@ -154,10 +154,10 @@ public function uploadLogosAction(Request $request)
      *     redirectRoute="admin_themes_index",
      *     message="You do not have permission to view this."
      * )
-     * @DemoRestricted(redirectRoute="admin_themes_index")
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_themes_index')]
     public function exportAction()
     {
         $themeProvider = $this->get('prestashop.core.addon.theme.theme_provider');
@@ -185,12 +185,12 @@ public function exportAction()
      *     redirectRoute="admin_themes_index",
      *     message="You do not have permission to add this."
      * )
-     * @DemoRestricted(redirectRoute="admin_themes_index")
      *
      * @param Request $request
      *
      * @return Response
      */
+    #[DemoRestricted(redirectRoute: 'admin_themes_index')]
     public function importAction(Request $request)
     {
         $importThemeForm = $this->createForm(ImportThemeType::class);
@@ -248,12 +248,12 @@ public function importAction(Request $request)
      *     redirectRoute="admin_themes_index",
      *     message="You do not have permission to edit this."
      * )
-     * @DemoRestricted(redirectRoute="admin_themes_index")
      *
      * @param string $themeName
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_themes_index')]
     public function enableAction($themeName)
     {
         try {
@@ -282,12 +282,12 @@ public function enableAction($themeName)
      *     redirectRoute="admin_themes_index",
      *     message="You do not have permission to delete this."
      * )
-     * @DemoRestricted(redirectRoute="admin_themes_index")
      *
      * @param string $themeName
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_themes_index')]
     public function deleteAction($themeName)
     {
         try {
@@ -314,12 +314,12 @@ public function deleteAction($themeName)
      *     redirectRoute="admin_themes_index",
      *     message="You do not have permission to edit this."
      * )
-     * @DemoRestricted(redirectRoute="admin_themes_index")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_themes_index')]
     public function adaptToRTLLanguagesAction(Request $request)
     {
         $form = $this->getAdaptThemeToRtlLanguageForm();
@@ -359,12 +359,12 @@ public function adaptToRTLLanguagesAction(Request $request)
      *     redirectRoute="admin_themes_index",
      *     message="You do not have permission to edit this."
      * )
-     * @DemoRestricted(redirectRoute="admin_themes_index")
      *
      * @param string $themeName
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_themes_index')]
     public function resetLayoutsAction($themeName)
     {
         $this->getCommandBus()->handle(new ResetThemeLayoutsCommand(new ThemeName($themeName)));
diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/International/CountryController.php b/src/PrestaShopBundle/Controller/Admin/Improve/International/CountryController.php
index 0c40cfcd1ce0f..135dc354a3c15 100644
--- a/src/PrestaShopBundle/Controller/Admin/Improve/International/CountryController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Improve/International/CountryController.php
@@ -173,12 +173,11 @@ public function editAction(int $countryId, Request $request): Response
      *     message="You need permission to delete this."
      * )
      *
-     * @DemoRestricted(redirectRoute="admin_countries_index")
-     *
      * @param int $countryId
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_countries_index')]
     public function deleteAction(int $countryId): RedirectResponse
     {
         try {
diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/International/CurrencyController.php b/src/PrestaShopBundle/Controller/Admin/Improve/International/CurrencyController.php
index c51d8ffa5c3f3..a9a0ba4064c76 100644
--- a/src/PrestaShopBundle/Controller/Admin/Improve/International/CurrencyController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Improve/International/CurrencyController.php
@@ -268,12 +268,12 @@ private function getLanguagesData(string $currencyIsoCode)
      *     redirectRoute="admin_currencies_index",
      *     message="You need permission to delete this."
      * )
-     * @DemoRestricted(redirectRoute="admin_currencies_index")
      *
      * @param int $currencyId
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_currencies_index')]
     public function deleteAction($currencyId)
     {
         try {
@@ -295,10 +295,10 @@ public function deleteAction($currencyId)
      * @param string $currencyIsoCode
      *
      * @AdminSecurity("is_granted('read', request.get('_legacy_controller'))")
-     * @DemoRestricted(redirectRoute="admin_currencies_index")
      *
      * @return JsonResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_currencies_index')]
     public function getReferenceDataAction($currencyIsoCode)
     {
         try {
@@ -346,10 +346,10 @@ public function getReferenceDataAction($currencyIsoCode)
      *     redirectRoute="admin_currencies_index",
      *     message="You need permission to edit this."
      * )
-     * @DemoRestricted(redirectRoute="admin_currencies_index")
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_currencies_index')]
     public function toggleStatusAction($currencyId)
     {
         try {
@@ -376,10 +376,10 @@ public function toggleStatusAction($currencyId)
      *     redirectRoute="admin_currencies_index",
      *     message="You need permission to edit this."
      * )
-     * @DemoRestricted(redirectRoute="admin_currencies_index")
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_currencies_index')]
     public function refreshExchangeRatesAction()
     {
         try {
@@ -485,13 +485,13 @@ private function getSettingsFormHandler()
      * Toggles currencies status in bulk action
      *
      * @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute="admin_currencies_index")
-     * @DemoRestricted(redirectRoute="admin_currencies_index")
      *
      * @param Request $request
      * @param string $status
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_currencies_index')]
     public function bulkToggleStatusAction(Request $request, $status)
     {
         $currenciesIds = $this->getBulkCurrenciesFromRequest($request);
@@ -518,12 +518,12 @@ public function bulkToggleStatusAction(Request $request, $status)
      * Deletes currencies in bulk action
      *
      * @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", redirectRoute="admin_currencies_index")
-     * @DemoRestricted(redirectRoute="admin_currencies_index")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_currencies_index')]
     public function bulkDeleteAction(Request $request)
     {
         $currenciesIds = $this->getBulkCurrenciesFromRequest($request);
diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/International/GeolocationController.php b/src/PrestaShopBundle/Controller/Admin/Improve/International/GeolocationController.php
index fe9343681df52..6cdd8b1ddb5dc 100644
--- a/src/PrestaShopBundle/Controller/Admin/Improve/International/GeolocationController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Improve/International/GeolocationController.php
@@ -76,12 +76,12 @@ public function indexAction(Request $request)
      *     message="You do not have permission to edit this.",
      *     redirectRoute="admin_geolocation_index"
      * )
-     * @DemoRestricted(redirectRoute="admin_geolocation_index")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_geolocation_index')]
     public function processByIpAddressFormAction(Request $request)
     {
         return $this->processForm(
@@ -99,12 +99,12 @@ public function processByIpAddressFormAction(Request $request)
      *     message="You do not have permission to edit this.",
      *     redirectRoute="admin_geolocation_index"
      * )
-     * @DemoRestricted(redirectRoute="admin_geolocation_index")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_geolocation_index')]
     public function processWhitelistFormAction(Request $request)
     {
         return $this->processForm(
@@ -122,12 +122,12 @@ public function processWhitelistFormAction(Request $request)
      *     message="You do not have permission to edit this.",
      *     redirectRoute="admin_geolocation_index"
      * )
-     * @DemoRestricted(redirectRoute="admin_geolocation_index")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_geolocation_index')]
     public function processOptionsFormAction(Request $request)
     {
         return $this->processForm(
diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/International/LanguageController.php b/src/PrestaShopBundle/Controller/Admin/Improve/International/LanguageController.php
index 5cd71cad84d81..82ca51b90c870 100644
--- a/src/PrestaShopBundle/Controller/Admin/Improve/International/LanguageController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Improve/International/LanguageController.php
@@ -216,12 +216,12 @@ public function editAction($languageId, Request $request)
      * Deletes language
      *
      * @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", redirectRoute="admin_languages_index")
-     * @DemoRestricted(redirectRoute="admin_languages_index")
      *
      * @param int $languageId
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_languages_index')]
     public function deleteAction($languageId)
     {
         try {
@@ -239,12 +239,12 @@ public function deleteAction($languageId)
      * Deletes languages in bulk action
      *
      * @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", redirectRoute="admin_languages_index")
-     * @DemoRestricted(redirectRoute="admin_languages_index")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_languages_index')]
     public function bulkDeleteAction(Request $request)
     {
         $languageIds = $this->getBulkLanguagesFromRequest($request);
@@ -267,12 +267,12 @@ public function bulkDeleteAction(Request $request)
      * Toggles language status
      *
      * @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute="admin_languages_index")
-     * @DemoRestricted(redirectRoute="admin_languages_index")
      *
      * @param int $languageId
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_languages_index')]
     public function toggleStatusAction($languageId)
     {
         try {
@@ -299,13 +299,13 @@ public function toggleStatusAction($languageId)
      * Toggles languages status in bulk action
      *
      * @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute="admin_languages_index")
-     * @DemoRestricted(redirectRoute="admin_languages_index")
      *
      * @param Request $request
      * @param string $status
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_languages_index')]
     public function bulkToggleStatusAction(Request $request, $status)
     {
         $languageIds = $this->getBulkLanguagesFromRequest($request);
diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/International/LocalizationController.php b/src/PrestaShopBundle/Controller/Admin/Improve/International/LocalizationController.php
index 6c11caffb6d18..1a58b0359a8cb 100644
--- a/src/PrestaShopBundle/Controller/Admin/Improve/International/LocalizationController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Improve/International/LocalizationController.php
@@ -82,12 +82,12 @@ public function indexAction(Request $request)
      *     "is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
      *     message="You do not have permission to edit this."
      * )
-     * @DemoRestricted(redirectRoute="admin_localization_index")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_localization_index')]
     public function processConfigurationFormAction(Request $request)
     {
         return $this->processForm(
@@ -104,12 +104,12 @@ public function processConfigurationFormAction(Request $request)
      *     "is_granted('read', request.get('_legacy_controller')) && is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
      *     message="You do not have permission to edit this."
      * )
-     * @DemoRestricted(redirectRoute="admin_localization_index")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_localization_index')]
     public function processLocalUnitsFormAction(Request $request)
     {
         return $this->processForm(
@@ -126,12 +126,12 @@ public function processLocalUnitsFormAction(Request $request)
      *     "is_granted('read', request.get('_legacy_controller')) && is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
      *     message="You do not have permission to edit this."
      * )
-     * @DemoRestricted(redirectRoute="admin_localization_index")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_localization_index')]
     public function processAdvancedFormAction(Request $request)
     {
         return $this->processForm(
@@ -183,12 +183,12 @@ protected function processForm(Request $request, FormHandlerInterface $formHandl
      *     "is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
      *     message="You do not have permission to edit this."
      * )
-     * @DemoRestricted(redirectRoute="admin_localization_index")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_localization_index')]
     public function importPackAction(Request $request)
     {
         $localizationPackImportForm = $this->createForm(ImportLocalizationPackType::class);
diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/International/StateController.php b/src/PrestaShopBundle/Controller/Admin/Improve/International/StateController.php
index 45f4266ece903..e80df639778de 100644
--- a/src/PrestaShopBundle/Controller/Admin/Improve/International/StateController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Improve/International/StateController.php
@@ -113,12 +113,12 @@ public function indexAction(Request $request, StateFilters $filters): Response
      * Deletes state
      *
      * @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", redirectRoute="admin_states_index")
-     * @DemoRestricted(redirectRoute="admin_states_index")
      *
      * @param int $stateId
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_states_index')]
     public function deleteAction(int $stateId): RedirectResponse
     {
         try {
@@ -231,12 +231,12 @@ public function createAction(Request $request): Response
      * Toggles state status
      *
      * @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute="admin_states_index")
-     * @DemoRestricted(redirectRoute="admin_states_index")
      *
      * @param int $stateId
      *
      * @return JsonResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_states_index')]
     public function toggleStatusAction(int $stateId): JsonResponse
     {
         try {
@@ -294,12 +294,12 @@ public function deleteBulkAction(Request $request): RedirectResponse
      * Enables states on bulk action
      *
      * @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute="admin_states_index")
-     * @DemoRestricted(redirectRoute="admin_states_index")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_states_index')]
     public function bulkEnableAction(Request $request): RedirectResponse
     {
         $stateIds = $this->getBulkStatesFromRequest($request);
@@ -322,12 +322,12 @@ public function bulkEnableAction(Request $request): RedirectResponse
      * Disables states on bulk action
      *
      * @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute="admin_states_index")
-     * @DemoRestricted(redirectRoute="admin_states_index")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_states_index')]
     public function bulkDisableAction(Request $request): RedirectResponse
     {
         $stateIds = $this->getBulkStatesFromRequest($request);
diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/International/TaxController.php b/src/PrestaShopBundle/Controller/Admin/Improve/International/TaxController.php
index 6c7b60b230330..1a53fa5306db0 100644
--- a/src/PrestaShopBundle/Controller/Admin/Improve/International/TaxController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Improve/International/TaxController.php
@@ -84,12 +84,12 @@ public function indexAction(Request $request, TaxFilters $filters)
      *     "is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
      *     redirectRoute="admin_taxes_index"
      * )
-     * @DemoRestricted(redirectRoute="admin_taxes_index")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_taxes_index')]
     public function saveOptionsAction(Request $request)
     {
         $taxOptionsFormHandler = $this->getTaxOptionsFormHandler();
@@ -265,12 +265,12 @@ public function editAction(Request $request, $taxId)
      *     "is_granted('delete', request.get('_legacy_controller'))",
      *     redirectRoute="admin_taxes_index",
      * )
-     * @DemoRestricted(redirectRoute="admin_taxes_index")
      *
      * @param int $taxId
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_taxes_index')]
     public function deleteAction($taxId)
     {
         try {
@@ -294,10 +294,10 @@ public function deleteAction($taxId)
      *     "is_granted('update', request.get('_legacy_controller'))",
      *     redirectRoute="admin_taxes_index",
      * )
-     * @DemoRestricted(redirectRoute="admin_taxes_index")
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_taxes_index')]
     public function toggleStatusAction($taxId)
     {
         try {
@@ -324,10 +324,10 @@ public function toggleStatusAction($taxId)
      *     "is_granted('update', request.get('_legacy_controller'))",
      *     redirectRoute="admin_taxes_index",
      * )
-     * @DemoRestricted(redirectRoute="admin_taxes_index")
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_taxes_index')]
     public function bulkEnableStatusAction(Request $request)
     {
         $taxIds = $request->request->all('tax_bulk');
@@ -353,10 +353,10 @@ public function bulkEnableStatusAction(Request $request)
      *     "is_granted('update', request.get('_legacy_controller'))",
      *     redirectRoute="admin_taxes_index",
      * )
-     * @DemoRestricted(redirectRoute="admin_taxes_index")
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_taxes_index')]
     public function bulkDisableStatusAction(Request $request)
     {
         $taxIds = $request->request->all('tax_bulk');
@@ -382,10 +382,10 @@ public function bulkDisableStatusAction(Request $request)
      *     "is_granted('delete', request.get('_legacy_controller'))",
      *     redirectRoute="admin_taxes_index",
      * )
-     * @DemoRestricted(redirectRoute="admin_taxes_index")
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_taxes_index')]
     public function bulkDeleteAction(Request $request)
     {
         $taxIds = $request->request->all('tax_bulk');
diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/International/ZoneController.php b/src/PrestaShopBundle/Controller/Admin/Improve/International/ZoneController.php
index dfe97b9917254..fff5ad5122cfb 100644
--- a/src/PrestaShopBundle/Controller/Admin/Improve/International/ZoneController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Improve/International/ZoneController.php
@@ -209,12 +209,11 @@ public function editAction(int $zoneId, Request $request): Response
      *     message="You need permission to delete this."
      * )
      *
-     * @DemoRestricted(redirectRoute="admin_zones_index")
-     *
      * @param int $zoneId
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_zones_index')]
     public function deleteAction(int $zoneId): RedirectResponse
     {
         try {
@@ -238,14 +237,11 @@ public function deleteAction(int $zoneId): RedirectResponse
      *     message="You do not have permission to edit this."
      * )
      *
-     * @DemoRestricted(
-     *     redirectRoute="admin_zones_index"
-     * )
-     *
      * @param int $zoneId
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_zones_index')]
     public function toggleStatusAction(int $zoneId): RedirectResponse
     {
         try {
@@ -265,12 +261,12 @@ public function toggleStatusAction(int $zoneId): RedirectResponse
      * Deletes zones in bulk action
      *
      * @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", redirectRoute="admin_zones_index")
-     * @DemoRestricted(redirectRoute="admin_zones_index")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_zones_index')]
     public function bulkDeleteAction(Request $request): RedirectResponse
     {
         $zoneIds = $this->getBulkZonesFromRequest($request);
@@ -296,13 +292,13 @@ public function bulkDeleteAction(Request $request): RedirectResponse
      *     "is_granted('update', request.get('_legacy_controller'))",
      *     redirectRoute="admin_zones_index",
      * )
-     * @DemoRestricted(redirectRoute="admin_zones_index")
      *
      * @param string $status
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_zones_index')]
     public function bulkToggleStatus(string $status, Request $request): RedirectResponse
     {
         $status = $status === 'enable';
diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/Shipping/CarriersController.php b/src/PrestaShopBundle/Controller/Admin/Improve/Shipping/CarriersController.php
index 64feeba0852ec..4967cbc2f9c82 100644
--- a/src/PrestaShopBundle/Controller/Admin/Improve/Shipping/CarriersController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Improve/Shipping/CarriersController.php
@@ -134,12 +134,12 @@ public function editAction(int $carrierId): RedirectResponse
      *     "is_granted('delete', request.get('_legacy_controller'))",
      *     redirectRoute="admin_carriers_index",
      * )
-     * @DemoRestricted(redirectRoute="admin_carriers_index")
      *
      * @param int $carrierId
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_carriers_index')]
     public function deleteAction(int $carrierId): RedirectResponse
     {
         try {
@@ -161,12 +161,11 @@ public function deleteAction(int $carrierId): RedirectResponse
      *     message="You need permission to edit this."
      * )
      *
-     * @DemoRestricted(redirectRoute="admin_carriers_index")
-     *
      * @param int $carrierId
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_carriers_index')]
     public function toggleStatusAction(int $carrierId): RedirectResponse
     {
         try {
@@ -192,12 +191,11 @@ public function toggleStatusAction(int $carrierId): RedirectResponse
      *     message="You need permission to edit this."
      * )
      *
-     * @DemoRestricted(redirectRoute="admin_carriers_index")
-     *
      * @param int $carrierId
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_carriers_index')]
     public function toggleIsFreeAction(int $carrierId): RedirectResponse
     {
         try {
@@ -223,12 +221,11 @@ public function toggleIsFreeAction(int $carrierId): RedirectResponse
      *     message="You need permission to edit this."
      * )
      *
-     * @DemoRestricted(redirectRoute="admin_carriers_index")
-     *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_carriers_index')]
     public function updatePositionAction(Request $request): RedirectResponse
     {
         $positionsData = [
@@ -258,12 +255,12 @@ public function updatePositionAction(Request $request): RedirectResponse
      *     "is_granted('delete', request.get('_legacy_controller'))",
      *     redirectRoute="admin_carriers_index",
      * )
-     * @DemoRestricted(redirectRoute="admin_carriers_index")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_carriers_index')]
     public function bulkDeleteAction(Request $request): RedirectResponse
     {
         $carrierIds = $this->getCarrierIdsFromRequest($request);
@@ -288,12 +285,12 @@ public function bulkDeleteAction(Request $request): RedirectResponse
      *     "is_granted('update', request.get('_legacy_controller'))",
      *     redirectRoute="admin_carriers_index",
      * )
-     * @DemoRestricted(redirectRoute="admin_carriers_index")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_carriers_index')]
     public function bulkEnableStatusAction(Request $request): RedirectResponse
     {
         $carrierIds = $this->getCarrierIdsFromRequest($request);
@@ -318,12 +315,12 @@ public function bulkEnableStatusAction(Request $request): RedirectResponse
      *     "is_granted('update', request.get('_legacy_controller'))",
      *     redirectRoute="admin_carriers_index",
      * )
-     * @DemoRestricted(redirectRoute="admin_carriers_index")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_carriers_index')]
     public function bulkDisableStatusAction(Request $request): RedirectResponse
     {
         $carrierIds = $this->getCarrierIdsFromRequest($request);
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttachmentController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttachmentController.php
index 1d96462da8fc6..b6a3b735793a3 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttachmentController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttachmentController.php
@@ -224,8 +224,8 @@ public function viewAction(int $attachmentId): Response
      * Deletes attachment
      *
      * @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", redirectRoute="admin_attachments_index")
-     * @DemoRestricted(redirectRoute="admin_attachments_index")
      */
+    #[DemoRestricted(redirectRoute: 'admin_attachments_index')]
     public function deleteAction(int $attachmentId): RedirectResponse
     {
         try {
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/CartRuleController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/CartRuleController.php
index baddbba939046..77f4fed696eec 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/CartRuleController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/CartRuleController.php
@@ -126,12 +126,12 @@ public function searchAction(Request $request): JsonResponse
      * Deletes cart rule
      *
      * @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", redirectRoute="admin_cart_rules_index")
-     * @DemoRestricted(redirectRoute="admin_cart_rules_index")
      *
      * @param int $cartRuleId
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_cart_rules_index')]
     public function deleteAction(int $cartRuleId): RedirectResponse
     {
         try {
@@ -151,12 +151,12 @@ public function deleteAction(int $cartRuleId): RedirectResponse
      * Deletes cartRules on bulk action
      *
      * @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", redirectRoute="admin_cart_rules_index")
-     * @DemoRestricted(redirectRoute="admin_cart_rules_index")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_cart_rules_index')]
     public function bulkDeleteAction(Request $request): RedirectResponse
     {
         $cartRuleIds = $this->getBulkActionIds($request, 'cart_rule_bulk');
@@ -178,12 +178,12 @@ public function bulkDeleteAction(Request $request): RedirectResponse
      * Toggles cart rule status
      *
      * @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute="admin_cart_rules_index")
-     * @DemoRestricted(redirectRoute="admin_cart_rules_index")
      *
      * @param int $cartRuleId
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_cart_rules_index')]
     public function toggleStatusAction(int $cartRuleId): RedirectResponse
     {
         try {
@@ -205,10 +205,10 @@ public function toggleStatusAction(int $cartRuleId): RedirectResponse
 
     /**
      * @AdminSecurity("is_granted('create', request.get('_legacy_controller'))", redirectRoute="admin_cart_rules_index")
-     * @DemoRestricted(redirectRoute="admin_cart_rules_index")
      *
      * @return Response
      */
+    #[DemoRestricted(redirectRoute: 'admin_cart_rules_index')]
     public function createAction(Request $request): Response
     {
         $form = $this->getFormBuilder()->getForm($this->prefillFormDataForCreation($request));
@@ -237,12 +237,12 @@ public function createAction(Request $request): Response
      * Enables cart rules on bulk action
      *
      * @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute="admin_cart_rules_index")
-     * @DemoRestricted(redirectRoute="admin_cart_rules_index")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_cart_rules_index')]
     public function bulkEnableAction(Request $request): RedirectResponse
     {
         $cartRuleIds = $this->getBulkActionIds($request, 'cart_rule_bulk');
@@ -265,12 +265,12 @@ public function bulkEnableAction(Request $request): RedirectResponse
      * Disables cart rules on bulk action
      *
      * @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute="admin_cart_rules_index")
-     * @DemoRestricted(redirectRoute="admin_cart_rules_index")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_cart_rules_index')]
     public function bulkDisableAction(Request $request): RedirectResponse
     {
         $cartRuleIds = $this->getBulkActionIds($request, 'cart_rule_bulk');
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/CatalogPriceRuleController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/CatalogPriceRuleController.php
index 5fd9e2066bef4..6e7b07c42850c 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/CatalogPriceRuleController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/CatalogPriceRuleController.php
@@ -137,12 +137,12 @@ public function searchAction(Request $request)
      * Deletes catalog price rule
      *
      * @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", redirectRoute="admin_catalog_price_rules_index")
-     * @DemoRestricted(redirectRoute="admin_catalog_price_rules_index")
      *
      * @param int|string $catalogPriceRuleId
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_catalog_price_rules_index')]
     public function deleteAction($catalogPriceRuleId)
     {
         try {
@@ -162,12 +162,12 @@ public function deleteAction($catalogPriceRuleId)
      * Deletes catalogPriceRules on bulk action
      *
      * @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", redirectRoute="admin_catalog_price_rules_index")
-     * @DemoRestricted(redirectRoute="admin_catalog_price_rules_index")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_catalog_price_rules_index')]
     public function bulkDeleteAction(Request $request)
     {
         $catalogPriceRuleIds = $this->getBulkCatalogPriceRulesFromRequest($request);
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/CategoryController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/CategoryController.php
index 013d647686c4d..3d071753345e8 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/CategoryController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/CategoryController.php
@@ -572,12 +572,12 @@ public function toggleStatusAction($categoryId)
      *     redirectRoute="admin_categories_index",
      *     message="You do not have permission to update this."
      * )
-     * @DemoRestricted(redirectRoute="admin_categories_index")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_categories_index')]
     public function bulkEnableStatusAction(Request $request)
     {
         try {
@@ -606,12 +606,12 @@ public function bulkEnableStatusAction(Request $request)
      *     redirectRoute="admin_categories_index",
      *     message="You do not have permission to update this."
      * )
-     * @DemoRestricted(redirectRoute="admin_categories_index")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_categories_index')]
     public function bulkDisableStatusAction(Request $request)
     {
         try {
@@ -640,12 +640,12 @@ public function bulkDisableStatusAction(Request $request)
      *     redirectRoute="admin_categories_index",
      *     message="You do not have permission to delete this."
      * )
-     * @DemoRestricted(redirectRoute="admin_categories_index")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_categories_index')]
     public function bulkDeleteAction(Request $request)
     {
         $deleteCategoriesForm = $this->createForm(DeleteCategoriesType::class);
@@ -687,12 +687,12 @@ public function bulkDeleteAction(Request $request)
      *     redirectRoute="admin_categories_index",
      *     message="You do not have permission to delete this."
      * )
-     * @DemoRestricted(redirectRoute="admin_categories_index")
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_categories_index')]
     public function deleteAction(Request $request)
     {
         $deleteCategoriesForm = $this->createForm(DeleteCategoriesType::class);
@@ -728,12 +728,12 @@ public function deleteAction(Request $request)
      *     redirectRoute="admin_categories_index",
      *     message="You do not have permission to view this."
      * )
-     * @DemoRestricted(redirectRoute="admin_categories_index")
      *
      * @param CategoryFilters $filters
      *
      * @return Response
      */
+    #[DemoRestricted(redirectRoute: 'admin_categories_index')]
     public function exportAction(CategoryFilters $filters)
     {
         $filters = new CategoryFilters(['limit' => null] + $filters->all());
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/ManufacturerController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/ManufacturerController.php
index 4ef097fc27e29..e6187366a88e5 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/ManufacturerController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/ManufacturerController.php
@@ -264,12 +264,12 @@ public function editAction(Request $request, $manufacturerId)
      * Deletes manufacturer
      *
      * @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", redirectRoute="admin_manufacturers_index")
-     * @DemoRestricted(redirectRoute="admin_manufacturers_index")
      *
      * @param int|string $manufacturerId
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_manufacturers_index')]
     public function deleteAction($manufacturerId)
     {
         try {
@@ -289,10 +289,10 @@ public function deleteAction($manufacturerId)
      * Deletes manufacturers on bulk action
      *
      * @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", redirectRoute="admin_manufacturers_index")
-     * @DemoRestricted(redirectRoute="admin_manufacturers_index")
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_manufacturers_index')]
     public function bulkDeleteAction(Request $request)
     {
         $manufacturerIds = $this->getBulkManufacturersFromRequest($request);
@@ -314,10 +314,10 @@ public function bulkDeleteAction(Request $request)
      * Enables manufacturers on bulk action
      *
      * @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute="admin_manufacturers_index")
-     * @DemoRestricted(redirectRoute="admin_manufacturers_index")
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_manufacturers_index')]
     public function bulkEnableAction(Request $request)
     {
         $manufacturerIds = $this->getBulkManufacturersFromRequest($request);
@@ -340,10 +340,10 @@ public function bulkEnableAction(Request $request)
      * Disables manufacturers on bulk action
      *
      * @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute="admin_manufacturers_index")
-     * @DemoRestricted(redirectRoute="admin_manufacturers_index")
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_manufacturers_index')]
     public function bulkDisableAction(Request $request)
     {
         $manufacturerIds = $this->getBulkManufacturersFromRequest($request);
@@ -366,12 +366,12 @@ public function bulkDisableAction(Request $request)
      * Toggles manufacturer status
      *
      * @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute="admin_manufacturers_index")
-     * @DemoRestricted(redirectRoute="admin_manufacturers_index")
      *
      * @param int $manufacturerId
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_manufacturers_index')]
     public function toggleStatusAction($manufacturerId)
     {
         try {
@@ -398,10 +398,10 @@ public function toggleStatusAction($manufacturerId)
      *     "is_granted('read', request.get('_legacy_controller')) && is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
      *     redirectRoute="admin_manufacturers_index"
      * )
-     * @DemoRestricted(redirectRoute="admin_manufacturers_index")
      *
      * @return Response
      */
+    #[DemoRestricted(redirectRoute: 'admin_manufacturers_index')]
     public function exportAction(ManufacturerFilters $filters)
     {
         $filters = new ManufacturerFilters(['limit' => null] + $filters->all());
@@ -481,12 +481,12 @@ public function deleteLogoImageAction(Request $request, int $manufacturerId): Re
      * Deletes address
      *
      * @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", redirectRoute="admin_manufacturers_index")
-     * @DemoRestricted(redirectRoute="admin_manufacturers_index")
      *
      * @param int $addressId
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_manufacturers_index')]
     public function deleteAddressAction($addressId)
     {
         try {
@@ -509,10 +509,10 @@ public function deleteAddressAction($addressId)
      *     "is_granted('read', request.get('_legacy_controller')) && is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
      *     redirectRoute="admin_manufacturers_index"
      * )
-     * @DemoRestricted(redirectRoute="admin_manufacturers_index")
      *
      * @return Response
      */
+    #[DemoRestricted(redirectRoute: 'admin_manufacturers_index')]
     public function exportAddressAction(ManufacturerAddressFilters $filters)
     {
         $addressesGridFactory = $this->get('prestashop.core.grid.grid_factory.manufacturer_address');
@@ -553,10 +553,10 @@ public function exportAddressAction(ManufacturerAddressFilters $filters)
      * Deletes adresses in bulk action
      *
      * @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", redirectRoute="admin_manufacturers_index")
-     * @DemoRestricted(redirectRoute="admin_manufacturers_index")
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_manufacturers_index')]
     public function bulkDeleteAddressAction(Request $request)
     {
         $addressIds = $this->getBulkAddressesFromRequest($request);
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/Product/ProductController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/Product/ProductController.php
index 7c42fd0d4c432..7c41dbb1ec17c 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/Product/ProductController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/Product/ProductController.php
@@ -727,15 +727,12 @@ public function disableForAllShopsAction(int $productId): RedirectResponse
      *     redirectQueryParamsToKeep={"id_category"},
      *     message="You do not have permission to edit this."
      * )
-     * @DemoRestricted(
-     *     redirectRoute="admin_products_index",
-     *     redirectQueryParamsToKeep={"id_category"}
-     * )
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_products_index', redirectQueryParamsToKeep: ['id_category'])]
     public function updatePositionAction(Request $request): RedirectResponse
     {
         try {
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/SupplierController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/SupplierController.php
index 07bedcc54e386..e2797c29e38db 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/SupplierController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/SupplierController.php
@@ -143,14 +143,12 @@ public function createAction(Request $request)
      *     redirectRoute="admin_suppliers_index",
      *     message="You do not have permission to delete this."
      * )
-     * @DemoRestricted(
-     *     redirectRoute="admin_suppliers_index"
-     * )
      *
      * @param int $supplierId
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_suppliers_index')]
     public function deleteAction($supplierId)
     {
         try {
@@ -175,14 +173,12 @@ public function deleteAction($supplierId)
      *     redirectRoute="admin_suppliers_index",
      *     message="You do not have permission to delete this."
      * )
-     * @DemoRestricted(
-     *     redirectRoute="admin_suppliers_index"
-     * )
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_suppliers_index')]
     public function bulkDeleteAction(Request $request)
     {
         $suppliersToDelete = $request->request->all('supplier_bulk');
@@ -215,14 +211,12 @@ function ($item) {
      *     redirectRoute="admin_suppliers_index",
      *     message="You do not have permission to edit this."
      * )
-     * @DemoRestricted(
-     *     redirectRoute="admin_suppliers_index"
-     * )
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_suppliers_index')]
     public function bulkDisableAction(Request $request)
     {
         $suppliersToDisable = $request->request->all('supplier_bulk');
@@ -254,14 +248,12 @@ function ($item) {
      *     redirectRoute="admin_suppliers_index",
      *     message="You do not have permission to edit this."
      * )
-     * @DemoRestricted(
-     *     redirectRoute="admin_suppliers_index"
-     * )
      *
      * @param Request $request
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_suppliers_index')]
     public function bulkEnableAction(Request $request)
     {
         $suppliersToEnable = $request->request->all('supplier_bulk');
@@ -353,14 +345,12 @@ public function editAction(Request $request, $supplierId)
      *     redirectRoute="admin_suppliers_index",
      *     message="You do not have permission to edit this."
      * )
-     * @DemoRestricted(
-     *     redirectRoute="admin_suppliers_index"
-     * )
      *
      * @param int $supplierId
      *
      * @return RedirectResponse
      */
+    #[DemoRestricted(redirectRoute: 'admin_suppliers_index')]
     public function toggleStatusAction($supplierId)
     {
         try {
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Customer/CustomerController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Customer/CustomerController.php
index c1fbd69e61b45..c43f070876d56 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Customer/CustomerController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Customer/CustomerController.php
@@ -285,7 +285,6 @@ public function editAction($customerId, Request $request)
      * View customer information.
      *
      * @AdminSecurity("is_granted('read', request.get('_legacy_controller'))", redirectRoute="admin_customers_index")
-     * @DemoRestricted(redirectRoute="admin_customers_index")
      *
      * @param int $customerId
      * @param Request $request
@@ -298,6 +297,7 @@ public function editAction($customerId, Request $request)
      *
      * @return Response
      */
+    #[DemoRestricted(redirectRoute: 'admin_customers_index')]
     public function viewAction(
         $customerId,
         Request $request,
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Order/OrderController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Order/OrderController.php
index 597ef887252c5..59eabbcd103b2 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Order/OrderController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Order/OrderController.php
@@ -1272,16 +1272,13 @@ public function duplicateOrderCartAction(int $orderId)
      *     redirectQueryParamsToKeep={"orderId"},
      *     message="You do not have permission to edit this."
      * )
-     * @DemoRestricted(
-     *     redirectRoute="admin_orders_view",
-     *     redirectQueryParamsToKeep={"orderId"}
-     * )
      *
      * @param Request $request
      * @param int $orderId
      *
      * @return Response
      */
+    #[DemoRestricted(redirectRoute: 'admin_orders_view', redirectQueryParamsToKeep: ['orderId'])]
     public function sendMessageAction(Request $request, int $orderId): Response
     {
         $orderMessageForm = $this->createForm(OrderMessageType::class);

From e1d27851ef03427c329dfcb472e9844f08223720 Mon Sep 17 00:00:00 2001
From: Fabien Papet <fabien.papet@gmail.com>
Date: Fri, 30 Jun 2023 11:27:59 +0200
Subject: [PATCH 0366/1030] Cleanup

Signed-off-by: Fabien Papet <fabien.papet@gmail.com>
---
 .../EventListener/DemoModeEnabledListener.php | 35 -------------------
 .../config/services/bundle/event_listener.yml |  1 -
 2 files changed, 36 deletions(-)

diff --git a/src/PrestaShopBundle/EventListener/DemoModeEnabledListener.php b/src/PrestaShopBundle/EventListener/DemoModeEnabledListener.php
index e8115e61e304e..a53964314da5f 100644
--- a/src/PrestaShopBundle/EventListener/DemoModeEnabledListener.php
+++ b/src/PrestaShopBundle/EventListener/DemoModeEnabledListener.php
@@ -58,11 +58,6 @@ class DemoModeEnabledListener
      */
     private $session;
 
-    /**
-     * @var Reader
-     */
-    private $annotationReader;
-
     /**
      * @var bool
      */
@@ -74,20 +69,17 @@ class DemoModeEnabledListener
      * @param RouterInterface $router
      * @param TranslatorInterface $translator
      * @param Session $session
-     * @param Reader $annotationReader
      * @param bool $isDemoModeEnabled
      */
     public function __construct(
         RouterInterface $router,
         TranslatorInterface $translator,
         Session $session,
-        Reader $annotationReader,
         $isDemoModeEnabled
     ) {
         $this->router = $router;
         $this->translator = $translator;
         $this->session = $session;
-        $this->annotationReader = $annotationReader;
         $this->isDemoModeEnabled = $isDemoModeEnabled;
     }
 
@@ -157,33 +149,6 @@ private function showNotificationMessage(DemoRestricted $demoRestricted)
         );
     }
 
-    /**
-     * Retrieve DemoRestricted Annotation.
-     *
-     * @param object $controllerObject
-     * @param string $methodName
-     *
-     * @return DemoRestricted|null
-     */
-    private function getAnnotation($controllerObject, $methodName)
-    {
-        $tokenAnnotation = DemoRestricted::class;
-
-        $classAnnotation = $this->annotationReader->getClassAnnotation(
-            new ReflectionClass(ClassUtils::getClass($controllerObject)),
-            $tokenAnnotation
-        );
-
-        if ($classAnnotation) {
-            return null;
-        }
-
-        $controllerReflectionObject = new ReflectionObject($controllerObject);
-        $reflectionMethod = $controllerReflectionObject->getMethod($methodName);
-
-        return $this->annotationReader->getMethodAnnotation($reflectionMethod, $tokenAnnotation);
-    }
-
     /**
      * Gets query parameters by comparing them to the current request attributes.
      *
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/event_listener.yml b/src/PrestaShopBundle/Resources/config/services/bundle/event_listener.yml
index 72b74f56d094d..db2ade4093e5b 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/event_listener.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/event_listener.yml
@@ -62,7 +62,6 @@ services:
       - "@router"
       - "@translator"
       - "@session"
-      - "@annotation_reader"
       - "@=service('prestashop.adapter.legacy.configuration').getBoolean('_PS_MODE_DEMO_')"
     tags:
       - { name: kernel.event_listener, event: kernel.controller, method: onKernelController }

From 55d142524b1298b131dc311b820c198362bb483d Mon Sep 17 00:00:00 2001
From: Fabien Papet <fabien.papet@gmail.com>
Date: Fri, 30 Jun 2023 11:39:03 +0200
Subject: [PATCH 0367/1030] fix

Signed-off-by: Fabien Papet <fabien.papet@gmail.com>
---
 .../EventListener/DemoModeEnabledListener.php | 68 ++++---------------
 .../config/services/bundle/event_listener.yml | 12 ++--
 2 files changed, 17 insertions(+), 63 deletions(-)

diff --git a/src/PrestaShopBundle/EventListener/DemoModeEnabledListener.php b/src/PrestaShopBundle/EventListener/DemoModeEnabledListener.php
index a53964314da5f..c3774f2adf4c5 100644
--- a/src/PrestaShopBundle/EventListener/DemoModeEnabledListener.php
+++ b/src/PrestaShopBundle/EventListener/DemoModeEnabledListener.php
@@ -26,11 +26,9 @@
 
 namespace PrestaShopBundle\EventListener;
 
-use Doctrine\Common\Annotations\Reader;
-use Doctrine\Common\Util\ClassUtils;
+use PrestaShop\PrestaShop\Core\Domain\Configuration\ShopConfigurationInterface;
 use PrestaShopBundle\Security\Annotation\DemoRestricted;
-use ReflectionClass;
-use ReflectionObject;
+use Symfony\Component\EventDispatcher\Attribute\AsEventListener;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Session\Session;
@@ -38,59 +36,23 @@
 use Symfony\Component\Routing\RouterInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-/**
- * Allow a redirection to the right url when using BetterSecurity annotation.
- */
+#[AsEventListener(
+    event: ControllerEvent::class,
+    method: 'onKernelController',
+)]
 class DemoModeEnabledListener
 {
-    /**
-     * @var RouterInterface
-     */
-    private $router;
-
-    /**
-     * @var TranslatorInterface
-     */
-    private $translator;
-
-    /**
-     * @var Session
-     */
-    private $session;
-
-    /**
-     * @var bool
-     */
-    private $isDemoModeEnabled;
-
-    /**
-     * DemoModeEnabledListener constructor.
-     *
-     * @param RouterInterface $router
-     * @param TranslatorInterface $translator
-     * @param Session $session
-     * @param bool $isDemoModeEnabled
-     */
     public function __construct(
-        RouterInterface $router,
-        TranslatorInterface $translator,
-        Session $session,
-        $isDemoModeEnabled
+        private readonly ShopConfigurationInterface $shopConfiguration,
+        private readonly RouterInterface $router,
+        private readonly TranslatorInterface $translator,
+        private readonly Session $session,
     ) {
-        $this->router = $router;
-        $this->translator = $translator;
-        $this->session = $session;
-        $this->isDemoModeEnabled = $isDemoModeEnabled;
     }
 
-    /**
-     * @param ControllerEvent $event
-     */
-    public function onKernelController(ControllerEvent $event)
+    public function onKernelController(ControllerEvent $event): void
     {
-        if (!$this->isDemoModeEnabled
-            || !$event->isMainRequest()
-        ) {
+        if (!$this->shopConfiguration->getBoolean('_PS_MODE_DEMO_') || !$event->isMainRequest()) {
             return;
         }
 
@@ -103,10 +65,6 @@ public function onKernelController(ControllerEvent $event)
         [$controllerObject, $methodName] = $controller;
 
         $method = new \ReflectionMethod($controllerObject, $methodName);
-        if ($method->getAttributes(DemoRestricted::class)) {
-            return;
-        }
-
         $attributes = $method->getAttributes(DemoRestricted::class);
 
         if ([] === $attributes) {
@@ -115,7 +73,7 @@ public function onKernelController(ControllerEvent $event)
 
         $attribute = $attributes[0];
 
-        /** @var DemoRestricted $value */
+        /** @var DemoRestricted $demoRestricted */
         $demoRestricted = $attribute->newInstance();
 
         $this->showNotificationMessage($demoRestricted);
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/event_listener.yml b/src/PrestaShopBundle/Resources/config/services/bundle/event_listener.yml
index db2ade4093e5b..ff6ec2faf56b7 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/event_listener.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/event_listener.yml
@@ -56,15 +56,11 @@ services:
     tags:
       - { name: kernel.event_listener, event: kernel.exception, method: onKernelException }
 
-  prestashop.demo_mode_enabled.listener:
-    class: PrestaShopBundle\EventListener\DemoModeEnabledListener
+  PrestaShopBundle\EventListener\DemoModeEnabledListener:
+    autowire: true
+    autoconfigure: true
     arguments:
-      - "@router"
-      - "@translator"
-      - "@session"
-      - "@=service('prestashop.adapter.legacy.configuration').getBoolean('_PS_MODE_DEMO_')"
-    tags:
-      - { name: kernel.event_listener, event: kernel.controller, method: onKernelController }
+      $session: "@session"
 
   prestashop.module_activated.listener:
     class: PrestaShopBundle\EventListener\ModuleActivatedListener

From f47d4fc30b512933b105640d3a79c87050f3a156 Mon Sep 17 00:00:00 2001
From: Fabien Papet <fabien.papet@gmail.com>
Date: Mon, 3 Jul 2023 19:18:13 +0200
Subject: [PATCH 0368/1030] Use property promotion

Signed-off-by: Fabien Papet <fabien.papet@gmail.com>
---
 .../Security/Annotation/DemoRestricted.php    | 52 ++++++-------------
 1 file changed, 16 insertions(+), 36 deletions(-)

diff --git a/src/PrestaShopBundle/Security/Annotation/DemoRestricted.php b/src/PrestaShopBundle/Security/Annotation/DemoRestricted.php
index b448a80e934b2..008d7becf598f 100644
--- a/src/PrestaShopBundle/Security/Annotation/DemoRestricted.php
+++ b/src/PrestaShopBundle/Security/Annotation/DemoRestricted.php
@@ -32,44 +32,24 @@
 #[\Attribute(\Attribute::TARGET_METHOD)]
 class DemoRestricted
 {
-    /**
-     * The translation domain for the message.
-     *
-     * @var string
-     */
-    protected $domain = 'Admin.Notifications.Error';
-
-    /**
-     * The message of the exception.
-     *
-     * @var string
-     */
-    protected $message = 'This functionality has been disabled.';
-
-    /**
-     * The route for the redirection.
-     *
-     * @var string
-     */
-    protected $redirectRoute;
-
-    /**
-     * The route params which are used together to generate the redirect route.
-     *
-     * @var array
-     */
-    protected $redirectQueryParamsToKeep = [];
-
     public function __construct(
-        ?string $redirectRoute = null,
-        string $domain = 'Admin.Notifications.Error',
-        string $message = 'This functionality has been disabled.',
-        array $redirectQueryParamsToKeep = []
+        /**
+         * The route for the redirection.
+         */
+        private ?string $redirectRoute = null,
+        /**
+         * The message of the exception.
+         */
+        private string $message = 'This functionality has been disabled.',
+        /**
+         * The translation domain for the message.
+         */
+        private string $domain = 'Admin.Notifications.Error',
+        /**
+         * The route params which are used together to generate the redirect route.
+         */
+        private array $redirectQueryParamsToKeep = []
     ) {
-        $this->domain = $domain;
-        $this->message = $message;
-        $this->redirectRoute = $redirectRoute;
-        $this->redirectQueryParamsToKeep = $redirectQueryParamsToKeep;
     }
 
     /**

From 26ca5626e1dc6c899e33306dc9dcc94cc4086428 Mon Sep 17 00:00:00 2001
From: George Filippakis <28734506+gfilippakis@users.noreply.github.com>
Date: Tue, 4 Jul 2023 00:54:00 +0300
Subject: [PATCH 0369/1030] Fix action variable in postProcess method

The first if block must call its hooks using the $action variable instead of $this->action. $this->action is null when an AJAX request is being processed.
---
 classes/controller/AdminController.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index 7d28f7a6efa85..a87ddf087aa9a 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -995,13 +995,13 @@ public function postProcess()
                 $action = Tools::getValue('action');
                 // no need to use displayConf() here
                 if (!empty($action) && method_exists($this, 'ajaxProcess' . Tools::toCamelCase($action))) {
-                    Hook::exec('actionAdmin' . ucfirst($this->action) . 'Before', ['controller' => $this]);
-                    Hook::exec('action' . get_class($this) . ucfirst($this->action) . 'Before', ['controller' => $this]);
+                    Hook::exec('actionAdmin' . ucfirst($action) . 'Before', ['controller' => $this]);
+                    Hook::exec('action' . get_class($this) . ucfirst($action) . 'Before', ['controller' => $this]);
 
                     $return = $this->{'ajaxProcess' . Tools::toCamelCase($action)}();
 
-                    Hook::exec('actionAdmin' . ucfirst($this->action) . 'After', ['controller' => $this, 'return' => $return]);
-                    Hook::exec('action' . get_class($this) . ucfirst($this->action) . 'After', ['controller' => $this, 'return' => $return]);
+                    Hook::exec('actionAdmin' . ucfirst($action) . 'After', ['controller' => $this, 'return' => $return]);
+                    Hook::exec('action' . get_class($this) . ucfirst($action) . 'After', ['controller' => $this, 'return' => $return]);
 
                     return $return;
                 } elseif (!empty($action) && $this->controller_name == 'AdminModules' && Tools::getIsset('configure')) {

From f6f600179d8396af429ef08c5e98aae90201894c Mon Sep 17 00:00:00 2001
From: Kaikina <finalfantasydeadcrisis@hotmail.fr>
Date: Tue, 4 Jul 2023 08:41:08 +0200
Subject: [PATCH 0370/1030] Update date_time.html.twig better check for
 emptiness

---
 .../views/Admin/Common/Grid/Columns/Content/date_time.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PrestaShopBundle/Resources/views/Admin/Common/Grid/Columns/Content/date_time.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Common/Grid/Columns/Content/date_time.html.twig
index da88506ec581c..542080c376553 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Common/Grid/Columns/Content/date_time.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Common/Grid/Columns/Content/date_time.html.twig
@@ -23,7 +23,7 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  *#}
 
-{% if record[column.id] == constant('PrestaShop\\PrestaShop\\Core\\Util\\DateTime\\DateTime::NULL_VALUE') %}
+{% if record[column.id] == constant('PrestaShop\\PrestaShop\\Core\\Util\\DateTime\\DateTime::NULL_VALUE') or record[column.id] is empty %}
   {{  column.options.empty_data }}
 {% else %}
   <time datetime="{{ record[column.id]|date(constant('PrestaShop\\PrestaShop\\Core\\Util\\DateTime\\DateTime::ISO_DATETIME_FORMAT')) }}">{{ record[column.id]|date(column.options.format) }}</time>

From 573dc42d5a8d1979037ff8c507ff4171b59600d0 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Mon, 19 Jun 2023 18:22:01 +0300
Subject: [PATCH 0371/1030] implement seach controller

---
 .../Query/SearchAliasesForAssociation.php     | 39 +++++++++++++++++
 ...hAliasesForAssociationHandlerInterface.php | 43 +++++++++++++++++++
 .../Alias/QueryResult/AliasForAssociation.php | 39 +++++++++++++++++
 .../ShopParameters/SearchController.php       | 13 ++++++
 .../shop_parameters/search_preferences.yml    | 12 +++++-
 5 files changed, 144 insertions(+), 2 deletions(-)
 create mode 100644 src/Core/Domain/Alias/Query/SearchAliasesForAssociation.php
 create mode 100644 src/Core/Domain/Alias/QueryHandler/SearchAliasesForAssociationHandlerInterface.php
 create mode 100644 src/Core/Domain/Alias/QueryResult/AliasForAssociation.php

diff --git a/src/Core/Domain/Alias/Query/SearchAliasesForAssociation.php b/src/Core/Domain/Alias/Query/SearchAliasesForAssociation.php
new file mode 100644
index 0000000000000..8028081d31bb8
--- /dev/null
+++ b/src/Core/Domain/Alias/Query/SearchAliasesForAssociation.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\Alias\Query;
+
+/**
+ * Class SearchAliasesForAssociation is responsible for searching aliases with particular search terms.
+ */
+class SearchAliasesForAssociation
+{
+    public function __construct(public readonly string $searchTerm)
+    {
+    }
+}
diff --git a/src/Core/Domain/Alias/QueryHandler/SearchAliasesForAssociationHandlerInterface.php b/src/Core/Domain/Alias/QueryHandler/SearchAliasesForAssociationHandlerInterface.php
new file mode 100644
index 0000000000000..0e2a6ed4ef150
--- /dev/null
+++ b/src/Core/Domain/Alias/QueryHandler/SearchAliasesForAssociationHandlerInterface.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Domain\Alias\QueryHandler;
+
+use PrestaShop\PrestaShop\Core\Domain\Alias\Query\SearchAliasesForAssociation;
+use PrestaShop\PrestaShop\Core\Domain\Alias\QueryResult\AliasForAssociation;
+
+/**
+ * Interface SearchAliasesForAssociationHandlerInterface defines contract for SearchAliasesForAssociationHandler
+ */
+interface SearchAliasesForAssociationHandlerInterface
+{
+    /**
+     * @param SearchAliasesForAssociation $query
+     *
+     * @return AliasForAssociation[]
+     */
+    public function handle(SearchAliasesForAssociation $query): array;
+}
diff --git a/src/Core/Domain/Alias/QueryResult/AliasForAssociation.php b/src/Core/Domain/Alias/QueryResult/AliasForAssociation.php
new file mode 100644
index 0000000000000..f9be37c6549f4
--- /dev/null
+++ b/src/Core/Domain/Alias/QueryResult/AliasForAssociation.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\Alias\QueryResult;
+
+/**
+ * Transfers alias data for association.
+ */
+class AliasForAssociation
+{
+    public function __construct(public readonly string $searchTerm)
+    {
+    }
+}
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php
index d251f9a70f326..87f050c7bd682 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php
@@ -31,6 +31,7 @@
 use PrestaShop\PrestaShop\Core\Search\Filters\AliasFilters;
 use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
 use PrestaShopBundle\Security\Annotation\AdminSecurity;
+use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -65,4 +66,16 @@ public function indexAction(Request $request, AliasFilters $filters): Response
             ],
         ]);
     }
+
+    /**
+     * @AdminSecurity("is_granted('read', request.get('_legacy_controller'))")
+     *
+     * @param Request $request
+     *
+     * @return JsonResponse
+     */
+    public function searchAliasesForAssociationAction(Request $request): JsonResponse
+    {
+        return $this->json(null);
+    }
 }
diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/configure/shop_parameters/search_preferences.yml b/src/PrestaShopBundle/Resources/config/routing/admin/configure/shop_parameters/search_preferences.yml
index 02ac7e8ec5cc5..e88c3f583149e 100644
--- a/src/PrestaShopBundle/Resources/config/routing/admin/configure/shop_parameters/search_preferences.yml
+++ b/src/PrestaShopBundle/Resources/config/routing/admin/configure/shop_parameters/search_preferences.yml
@@ -3,7 +3,7 @@ admin_search_index:
   path: /
   methods: [ GET ]
   defaults:
-    _controller: 'PrestaShopBundle\Controller\Admin\Configure\ShopParameters\SearchController::indexAction'
+    _controller: PrestaShopBundle\Controller\Admin\Configure\ShopParameters\SearchController::indexAction
     _legacy_controller: AdminSearchConf
     # _legacy_link: AdminSearchConf
     # _legacy_feature_flag: search
@@ -15,5 +15,13 @@ admin_alias_search:
     _controller: PrestaShopBundle\Controller\Admin\CommonController::searchGridAction
     gridDefinitionFactoryServiceId: prestashop.core.grid.definition.factory.alias
     redirectRoute: admin_search_index
-    _legacy_controller: AdminSearchConf
+#    _legacy_controller: AdminSearchConf
 #    _legacy_link: AdminSearchConf:submitFilteralias
+
+admin_alias_search_search_term_action:
+  path: /
+  methods: [ GET, POST ]
+  defaults:
+    _controller: PrestaShopBundle\Controller\Admin\Configure\ShopParameters\SearchController::searchAliasesForAssociationAction
+#    _legacy_controller: AdminSearchConf
+#    _legacy_link: AdminSearchConf

From 489a9710ed73a41c16e366d547b06a9c7b61da25 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Mon, 19 Jun 2023 20:03:46 +0300
Subject: [PATCH 0372/1030] implement search alias for association repository
 query

---
 .../SearchAliasForAssociationHandler.php      | 53 +++++++++++++++++++
 .../Alias/Repository/AliasRepository.php      | 30 +++++++++++
 .../Exception/AliasConstraintException.php    |  5 ++
 .../Query/SearchAliasesForAssociation.php     |  7 ++-
 .../Alias/QueryResult/AliasForAssociation.php | 11 +++-
 .../config/services/adapter/alias.yml         |  5 ++
 6 files changed, 109 insertions(+), 2 deletions(-)
 create mode 100644 src/Adapter/Alias/QueryHandler/SearchAliasForAssociationHandler.php

diff --git a/src/Adapter/Alias/QueryHandler/SearchAliasForAssociationHandler.php b/src/Adapter/Alias/QueryHandler/SearchAliasForAssociationHandler.php
new file mode 100644
index 0000000000000..97dd1461ea137
--- /dev/null
+++ b/src/Adapter/Alias/QueryHandler/SearchAliasForAssociationHandler.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Adapter\Alias\QueryHandler;
+
+use PrestaShop\PrestaShop\Adapter\Alias\Repository\AliasRepository;
+use PrestaShop\PrestaShop\Core\Domain\Alias\Query\SearchAliasesForAssociation;
+use PrestaShop\PrestaShop\Core\Domain\Alias\QueryHandler\SearchAliasesForAssociationHandlerInterface;
+use PrestaShop\PrestaShop\Core\Domain\Alias\QueryResult\AliasForAssociation;
+
+class SearchAliasForAssociationHandler implements SearchAliasesForAssociationHandlerInterface
+{
+    public function __construct(private readonly AliasRepository $aliasRepository)
+    {
+    }
+
+    /**
+     * @param SearchAliasesForAssociation $query
+     *
+     * @return AliasForAssociation[]
+     */
+    public function handle(SearchAliasesForAssociation $query): array
+    {
+        $searchTerms = $this->aliasRepository->searchAliases($query->searchTerm, $query->limit);
+
+        return $searchTerms;
+    }
+}
diff --git a/src/Adapter/Alias/Repository/AliasRepository.php b/src/Adapter/Alias/Repository/AliasRepository.php
index c1eab578aff7c..29112297550d2 100644
--- a/src/Adapter/Alias/Repository/AliasRepository.php
+++ b/src/Adapter/Alias/Repository/AliasRepository.php
@@ -35,6 +35,7 @@
 use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\BulkAliasException;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\CannotAddAliasException;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\CannotDeleteAliasException;
+use PrestaShop\PrestaShop\Core\Domain\Alias\QueryResult\AliasForAssociation;
 use PrestaShop\PrestaShop\Core\Domain\Alias\ValueObject\AliasId;
 use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\BulkFeatureException;
 use PrestaShop\PrestaShop\Core\Exception\CoreException;
@@ -199,4 +200,33 @@ public function deleteAliasesBySearchTerm(string $searchTerm): void
             );
         }
     }
+
+    /**
+     * @param string $searchPhrase
+     * @param int|null $limit
+     *
+     * @return AliasForAssociation[]
+     */
+    public function searchAliases(string $searchPhrase, ?int $limit = null): array
+    {
+        $dbSearchPhrase = sprintf('"%%%s%%"', $searchPhrase);
+        $qb = $this->connection->createQueryBuilder();
+        $searchTerms = $qb
+            ->addSelect('a.search')
+            ->from($this->dbPrefix . 'alias', 'a')
+            ->addOrderBy('a.search', 'ASC')
+            ->addGroupBy('a.id_alias')
+            ->setMaxResults($limit)
+            ->where($qb->expr()->like('a.search', $dbSearchPhrase))
+            ->execute()
+            ->fetchAllAssociative();
+
+        $aliasesForAssociation = [];
+
+        foreach ($searchTerms as $searchTerm) {
+            $aliasesForAssociation[] = new AliasForAssociation((string) $searchTerm);
+        }
+
+        return $aliasesForAssociation;
+    }
 }
diff --git a/src/Core/Domain/Alias/Exception/AliasConstraintException.php b/src/Core/Domain/Alias/Exception/AliasConstraintException.php
index f3a8160348fbf..e11f981345e82 100644
--- a/src/Core/Domain/Alias/Exception/AliasConstraintException.php
+++ b/src/Core/Domain/Alias/Exception/AliasConstraintException.php
@@ -50,4 +50,9 @@ class AliasConstraintException extends AliasException
      * When alias visibility value is invalid
      */
     public const INVALID_VISIBILITY = 40;
+
+    /**
+     * Search limit must be a positive integer or null
+     */
+    public const INVALID_SEARCH_LIMIT = 50;
 }
diff --git a/src/Core/Domain/Alias/Query/SearchAliasesForAssociation.php b/src/Core/Domain/Alias/Query/SearchAliasesForAssociation.php
index 8028081d31bb8..7de4b16527083 100644
--- a/src/Core/Domain/Alias/Query/SearchAliasesForAssociation.php
+++ b/src/Core/Domain/Alias/Query/SearchAliasesForAssociation.php
@@ -28,12 +28,17 @@
 
 namespace PrestaShop\PrestaShop\Core\Domain\Alias\Query;
 
+use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\AliasConstraintException;
+
 /**
  * Class SearchAliasesForAssociation is responsible for searching aliases with particular search terms.
  */
 class SearchAliasesForAssociation
 {
-    public function __construct(public readonly string $searchTerm)
+    public function __construct(public readonly string $searchTerm, public readonly ?int $limit = null)
     {
+        if (null !== $limit && $limit <= 0) {
+            throw new AliasConstraintException('Search limit must be a positive integer or null', AliasConstraintException::INVALID_SEARCH_LIMIT);
+        }
     }
 }
diff --git a/src/Core/Domain/Alias/QueryResult/AliasForAssociation.php b/src/Core/Domain/Alias/QueryResult/AliasForAssociation.php
index f9be37c6549f4..1d6c0c740d72b 100644
--- a/src/Core/Domain/Alias/QueryResult/AliasForAssociation.php
+++ b/src/Core/Domain/Alias/QueryResult/AliasForAssociation.php
@@ -28,12 +28,21 @@
 
 namespace PrestaShop\PrestaShop\Core\Domain\Alias\QueryResult;
 
+use JsonSerializable;
+
 /**
  * Transfers alias data for association.
  */
-class AliasForAssociation
+class AliasForAssociation implements JsonSerializable
 {
     public function __construct(public readonly string $searchTerm)
     {
     }
+
+    public function jsonSerialize(): mixed
+    {
+        return [
+            'searchTerm' => $this->searchTerm,
+        ];
+    }
 }
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml b/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
index d0226a6a8d48d..58855f6c75040 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
@@ -44,3 +44,8 @@ services:
     tags:
       - name: tactician.handler
         command: PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasCommand
+
+  PrestaShop\PrestaShop\Adapter\Alias\QueryHandler\SearchAliasForAssociationHandler:
+    tags:
+      - name: tactician.handler
+        command: PrestaShop\PrestaShop\Core\Domain\Alias\Query\SearchAliasesForAssociation

From b8b9b11a359bc4a617f9b630d1bfaf5a64124d85 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Mon, 19 Jun 2023 20:04:49 +0300
Subject: [PATCH 0373/1030] fix coding style

---
 .../Alias/QueryHandler/SearchAliasForAssociationHandler.php   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Adapter/Alias/QueryHandler/SearchAliasForAssociationHandler.php b/src/Adapter/Alias/QueryHandler/SearchAliasForAssociationHandler.php
index 97dd1461ea137..ed24a25a0f245 100644
--- a/src/Adapter/Alias/QueryHandler/SearchAliasForAssociationHandler.php
+++ b/src/Adapter/Alias/QueryHandler/SearchAliasForAssociationHandler.php
@@ -46,8 +46,6 @@ public function __construct(private readonly AliasRepository $aliasRepository)
      */
     public function handle(SearchAliasesForAssociation $query): array
     {
-        $searchTerms = $this->aliasRepository->searchAliases($query->searchTerm, $query->limit);
-
-        return $searchTerms;
+        return $this->aliasRepository->searchAliases($query->searchTerm, $query->limit);
     }
 }

From 3be7df5975817959dcba2de743b207b1552cf161 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Mon, 19 Jun 2023 20:08:53 +0300
Subject: [PATCH 0374/1030] implement controller search for association logic

---
 .../ShopParameters/SearchController.php       | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php
index 87f050c7bd682..f362848deb26c 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php
@@ -28,6 +28,9 @@
 
 namespace PrestaShopBundle\Controller\Admin\Configure\ShopParameters;
 
+use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\AliasConstraintException;
+use PrestaShop\PrestaShop\Core\Domain\Alias\Query\SearchAliasesForAssociation;
+use PrestaShop\PrestaShop\Core\Domain\Alias\QueryResult\AliasForAssociation;
 use PrestaShop\PrestaShop\Core\Search\Filters\AliasFilters;
 use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
 use PrestaShopBundle\Security\Annotation\AdminSecurity;
@@ -76,6 +79,22 @@ public function indexAction(Request $request, AliasFilters $filters): Response
      */
     public function searchAliasesForAssociationAction(Request $request): JsonResponse
     {
-        return $this->json(null);
+        try {
+            /** @var AliasForAssociation[] $searchTerms */
+            $searchTerms = $this->getQueryBus()->handle(new SearchAliasesForAssociation(
+                $request->get('query', ''),
+                (int) $request->get('limit', 20)
+            ));
+        } catch (AliasConstraintException $e) {
+            return $this->json([
+                'message' => $e->getMessage(),
+            ], Response::HTTP_BAD_REQUEST);
+        }
+
+        if (empty($searchTerms)) {
+            return $this->json([], Response::HTTP_NOT_FOUND);
+        }
+
+        return $this->json($searchTerms);
     }
 }

From 072510e577fbbf7d29eb0fa35eb6dc2b7719a4bd Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Tue, 20 Jun 2023 12:09:25 +0300
Subject: [PATCH 0375/1030] fix search alias query

---
 src/Adapter/Alias/Repository/AliasRepository.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Adapter/Alias/Repository/AliasRepository.php b/src/Adapter/Alias/Repository/AliasRepository.php
index 29112297550d2..6fea0297a5919 100644
--- a/src/Adapter/Alias/Repository/AliasRepository.php
+++ b/src/Adapter/Alias/Repository/AliasRepository.php
@@ -219,7 +219,7 @@ public function searchAliases(string $searchPhrase, ?int $limit = null): array
             ->setMaxResults($limit)
             ->where($qb->expr()->like('a.search', $dbSearchPhrase))
             ->execute()
-            ->fetchAllAssociative();
+            ->fetchFirstColumn();
 
         $aliasesForAssociation = [];
 

From 3292cf05b3d22662baebeb3c41c830bd3f27973f Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Tue, 20 Jun 2023 13:08:25 +0300
Subject: [PATCH 0376/1030] implement search alias for association tests

---
 .../Alias/Repository/AliasRepository.php      |  6 ++--
 .../Context/Domain/AliasFeatureContext.php    | 35 +++++++++++++++++++
 .../search_alias_for_association.feature      | 34 ++++++++++++++++++
 3 files changed, 72 insertions(+), 3 deletions(-)
 create mode 100644 tests/Integration/Behaviour/Features/Scenario/Search/search_alias_for_association.feature

diff --git a/src/Adapter/Alias/Repository/AliasRepository.php b/src/Adapter/Alias/Repository/AliasRepository.php
index 6fea0297a5919..1322bfe0a39a6 100644
--- a/src/Adapter/Alias/Repository/AliasRepository.php
+++ b/src/Adapter/Alias/Repository/AliasRepository.php
@@ -215,16 +215,16 @@ public function searchAliases(string $searchPhrase, ?int $limit = null): array
             ->addSelect('a.search')
             ->from($this->dbPrefix . 'alias', 'a')
             ->addOrderBy('a.search', 'ASC')
-            ->addGroupBy('a.id_alias')
+            ->addGroupBy('a.search')
             ->setMaxResults($limit)
             ->where($qb->expr()->like('a.search', $dbSearchPhrase))
             ->execute()
-            ->fetchFirstColumn();
+            ->fetchAllAssociative();
 
         $aliasesForAssociation = [];
 
         foreach ($searchTerms as $searchTerm) {
-            $aliasesForAssociation[] = new AliasForAssociation((string) $searchTerm);
+            $aliasesForAssociation[] = new AliasForAssociation((string) $searchTerm['search']);
         }
 
         return $aliasesForAssociation;
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
index f7d300911dadf..f9581d4589ebe 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
@@ -37,6 +37,8 @@
 use PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasCommand;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\AliasException;
+use PrestaShop\PrestaShop\Core\Domain\Alias\Query\SearchAliasesForAssociation;
+use PrestaShop\PrestaShop\Core\Domain\Alias\QueryResult\AliasForAssociation;
 use PrestaShop\PrestaShop\Core\Domain\Alias\ValueObject\AliasId;
 use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
 use PrestaShop\PrestaShop\Core\Grid\Query\AliasQueryBuilder;
@@ -183,6 +185,39 @@ public function bulkDeleteAlias(string $aliasReferences): void
         }
     }
 
+    /**
+     * @When I search for alias search term matching :search I should get following results:
+     *
+     * @param string $search
+     * @param TableNode $tableNode
+     */
+    public function assertSearchProducts(string $search, TableNode $tableNode): void
+    {
+        /** @var AliasForAssociation[] $foundAliasesForAssociation */
+        $foundAliasesForAssociation = $this->getQueryBus()->handle(new SearchAliasesForAssociation($search));
+        $expectedSearchTermsRows = $tableNode->getColumnsHash();
+
+        foreach ($expectedSearchTermsRows as $expectedSearchTermRow) {
+            $expectedSearchTerms = PrimitiveUtils::castStringArrayIntoArray($expectedSearchTermRow['searchTerm']);
+            Assert::assertEquals(count($expectedSearchTerms), count($foundAliasesForAssociation));
+
+            $index = 0;
+            foreach ($expectedSearchTerms as $searchTerm) {
+                $foundAliasSearchTerm = $foundAliasesForAssociation[$index++];
+
+                Assert::assertEquals(
+                    $searchTerm,
+                    $foundAliasSearchTerm->searchTerm,
+                    sprintf(
+                        'Invalid Alias Search Term, expected %d but got %d instead.',
+                        $searchTerm,
+                        $foundAliasSearchTerm->searchTerm
+                    )
+                );
+            }
+        }
+    }
+
     /**
      * @BeforeFeature @restore-aliases-before-feature
      */
diff --git a/tests/Integration/Behaviour/Features/Scenario/Search/search_alias_for_association.feature b/tests/Integration/Behaviour/Features/Scenario/Search/search_alias_for_association.feature
new file mode 100644
index 0000000000000..d52b10ee54e0e
--- /dev/null
+++ b/tests/Integration/Behaviour/Features/Scenario/Search/search_alias_for_association.feature
@@ -0,0 +1,34 @@
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s alias --tags search_alias_for_association
+@restore-aliases-before-feature
+@clear-cache-before-feature
+@clear-cache-after-feature
+@search_alias_for_association
+Feature: Search alias search terms to associate them in the BO
+  As a BO user
+  I need to be able to search for alias search terms in the BO to associate them
+
+  Scenario: I disable multiple aliases
+    Given I add alias with following information:
+      | alias  | large |
+      | search | big   |
+    And I add alias with following information:
+      | alias  | bloom   |
+      | search | blossom |
+    And following aliases should exist:
+      | id reference | alias  | search  |
+      | alias1       | bloose | blouse  |
+      | alias2       | blues  | blouse  |
+      | alias3       | large  | big     |
+      | alias4       | bloom  | blossom |
+    When I search for alias search term matching "blou" I should get following results:
+      | searchTerm |
+      | blouse     |
+    When I search for alias search term matching "blouse" I should get following results:
+      | searchTerm |
+      | blouse     |
+    When I search for alias search term matching "big" I should get following results:
+      | searchTerm |
+      | big        |
+    When I search for alias search term matching "blo" I should get following results:
+      | searchTerm     |
+      | blossom,blouse |

From e56514dc9fad29ea012335e0050e662a87c0e201 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Tue, 20 Jun 2023 13:11:03 +0300
Subject: [PATCH 0377/1030] fix wording

---
 .../Behaviour/Features/Context/Domain/AliasFeatureContext.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
index f9581d4589ebe..af4cbeffeb3bb 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
@@ -191,7 +191,7 @@ public function bulkDeleteAlias(string $aliasReferences): void
      * @param string $search
      * @param TableNode $tableNode
      */
-    public function assertSearchProducts(string $search, TableNode $tableNode): void
+    public function assertSearchAliases(string $search, TableNode $tableNode): void
     {
         /** @var AliasForAssociation[] $foundAliasesForAssociation */
         $foundAliasesForAssociation = $this->getQueryBus()->handle(new SearchAliasesForAssociation($search));

From 84ca58c42ca0792fc5d4b40eaeb9d686b8c53559 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Tue, 20 Jun 2023 13:14:03 +0300
Subject: [PATCH 0378/1030] transfer alias for association building logic to
 handler

---
 .../SearchAliasForAssociationHandler.php           | 10 +++++++++-
 src/Adapter/Alias/Repository/AliasRepository.php   | 14 +++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Adapter/Alias/QueryHandler/SearchAliasForAssociationHandler.php b/src/Adapter/Alias/QueryHandler/SearchAliasForAssociationHandler.php
index ed24a25a0f245..bbe73e0316612 100644
--- a/src/Adapter/Alias/QueryHandler/SearchAliasForAssociationHandler.php
+++ b/src/Adapter/Alias/QueryHandler/SearchAliasForAssociationHandler.php
@@ -46,6 +46,14 @@ public function __construct(private readonly AliasRepository $aliasRepository)
      */
     public function handle(SearchAliasesForAssociation $query): array
     {
-        return $this->aliasRepository->searchAliases($query->searchTerm, $query->limit);
+        $searchTerms = $this->aliasRepository->searchAliases($query->searchTerm, $query->limit);
+
+        $aliasesForAssociation = [];
+
+        foreach ($searchTerms as $searchTerm) {
+            $aliasesForAssociation[] = new AliasForAssociation((string) $searchTerm['search']);
+        }
+
+        return $aliasesForAssociation;
     }
 }
diff --git a/src/Adapter/Alias/Repository/AliasRepository.php b/src/Adapter/Alias/Repository/AliasRepository.php
index 1322bfe0a39a6..21aceb55f5c5a 100644
--- a/src/Adapter/Alias/Repository/AliasRepository.php
+++ b/src/Adapter/Alias/Repository/AliasRepository.php
@@ -35,7 +35,6 @@
 use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\BulkAliasException;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\CannotAddAliasException;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\CannotDeleteAliasException;
-use PrestaShop\PrestaShop\Core\Domain\Alias\QueryResult\AliasForAssociation;
 use PrestaShop\PrestaShop\Core\Domain\Alias\ValueObject\AliasId;
 use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\BulkFeatureException;
 use PrestaShop\PrestaShop\Core\Exception\CoreException;
@@ -205,13 +204,14 @@ public function deleteAliasesBySearchTerm(string $searchTerm): void
      * @param string $searchPhrase
      * @param int|null $limit
      *
-     * @return AliasForAssociation[]
+     * @return array
      */
     public function searchAliases(string $searchPhrase, ?int $limit = null): array
     {
         $dbSearchPhrase = sprintf('"%%%s%%"', $searchPhrase);
         $qb = $this->connection->createQueryBuilder();
-        $searchTerms = $qb
+
+        return $qb
             ->addSelect('a.search')
             ->from($this->dbPrefix . 'alias', 'a')
             ->addOrderBy('a.search', 'ASC')
@@ -220,13 +220,5 @@ public function searchAliases(string $searchPhrase, ?int $limit = null): array
             ->where($qb->expr()->like('a.search', $dbSearchPhrase))
             ->execute()
             ->fetchAllAssociative();
-
-        $aliasesForAssociation = [];
-
-        foreach ($searchTerms as $searchTerm) {
-            $aliasesForAssociation[] = new AliasForAssociation((string) $searchTerm['search']);
-        }
-
-        return $aliasesForAssociation;
     }
 }

From c2477b8d217b3b2ea97804a15897529b45d10d7a Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Tue, 20 Jun 2023 14:18:09 +0300
Subject: [PATCH 0379/1030] minor fixes

---
 .../Domain/Alias/QueryResult/AliasForAssociation.php     | 9 +--------
 .../Admin/Configure/ShopParameters/SearchController.php  | 4 ++--
 .../Features/Context/Domain/AliasFeatureContext.php      | 2 +-
 .../Scenario/Search/search_alias_for_association.feature | 8 ++++----
 4 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/Core/Domain/Alias/QueryResult/AliasForAssociation.php b/src/Core/Domain/Alias/QueryResult/AliasForAssociation.php
index 1d6c0c740d72b..071b62a34304a 100644
--- a/src/Core/Domain/Alias/QueryResult/AliasForAssociation.php
+++ b/src/Core/Domain/Alias/QueryResult/AliasForAssociation.php
@@ -33,16 +33,9 @@
 /**
  * Transfers alias data for association.
  */
-class AliasForAssociation implements JsonSerializable
+class AliasForAssociation
 {
     public function __construct(public readonly string $searchTerm)
     {
     }
-
-    public function jsonSerialize(): mixed
-    {
-        return [
-            'searchTerm' => $this->searchTerm,
-        ];
-    }
 }
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php
index f362848deb26c..450006d46666b 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php
@@ -92,9 +92,9 @@ public function searchAliasesForAssociationAction(Request $request): JsonRespons
         }
 
         if (empty($searchTerms)) {
-            return $this->json([], Response::HTTP_NOT_FOUND);
+            return $this->json(['aliases' => []], Response::HTTP_NOT_FOUND);
         }
 
-        return $this->json($searchTerms);
+        return $this->json(['aliases' => $searchTerms]);
     }
 }
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
index af4cbeffeb3bb..9e730461fea0a 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
@@ -186,7 +186,7 @@ public function bulkDeleteAlias(string $aliasReferences): void
     }
 
     /**
-     * @When I search for alias search term matching :search I should get following results:
+     * @When I search for alias search term matching :search I should get the following results:
      *
      * @param string $search
      * @param TableNode $tableNode
diff --git a/tests/Integration/Behaviour/Features/Scenario/Search/search_alias_for_association.feature b/tests/Integration/Behaviour/Features/Scenario/Search/search_alias_for_association.feature
index d52b10ee54e0e..346ce8574f61e 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Search/search_alias_for_association.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Search/search_alias_for_association.feature
@@ -20,15 +20,15 @@ Feature: Search alias search terms to associate them in the BO
       | alias2       | blues  | blouse  |
       | alias3       | large  | big     |
       | alias4       | bloom  | blossom |
-    When I search for alias search term matching "blou" I should get following results:
+    When I search for alias search term matching "blou" I should get the following results:
       | searchTerm |
       | blouse     |
-    When I search for alias search term matching "blouse" I should get following results:
+    When I search for alias search term matching "blouse" I should get the following results:
       | searchTerm |
       | blouse     |
-    When I search for alias search term matching "big" I should get following results:
+    When I search for alias search term matching "big" I should get the following results:
       | searchTerm |
       | big        |
-    When I search for alias search term matching "blo" I should get following results:
+    When I search for alias search term matching "blo" I should get the following results:
       | searchTerm     |
       | blossom,blouse |

From b326a59bf1edfbc2e1780f1977db6556688b5c51 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Tue, 20 Jun 2023 14:25:10 +0300
Subject: [PATCH 0380/1030] minor fixes

---
 src/Adapter/Alias/Repository/AliasRepository.php            | 6 +++---
 .../Scenario/Search/search_alias_for_association.feature    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Adapter/Alias/Repository/AliasRepository.php b/src/Adapter/Alias/Repository/AliasRepository.php
index 21aceb55f5c5a..56de606bc28a0 100644
--- a/src/Adapter/Alias/Repository/AliasRepository.php
+++ b/src/Adapter/Alias/Repository/AliasRepository.php
@@ -204,11 +204,10 @@ public function deleteAliasesBySearchTerm(string $searchTerm): void
      * @param string $searchPhrase
      * @param int|null $limit
      *
-     * @return array
+     * @return array<string, string>
      */
     public function searchAliases(string $searchPhrase, ?int $limit = null): array
     {
-        $dbSearchPhrase = sprintf('"%%%s%%"', $searchPhrase);
         $qb = $this->connection->createQueryBuilder();
 
         return $qb
@@ -217,7 +216,8 @@ public function searchAliases(string $searchPhrase, ?int $limit = null): array
             ->addOrderBy('a.search', 'ASC')
             ->addGroupBy('a.search')
             ->setMaxResults($limit)
-            ->where($qb->expr()->like('a.search', $dbSearchPhrase))
+            ->where('a.search LIKE :searchPhrase')
+            ->setParameter('searchPhrase', '%' . $searchPhrase. '%')
             ->execute()
             ->fetchAllAssociative();
     }
diff --git a/tests/Integration/Behaviour/Features/Scenario/Search/search_alias_for_association.feature b/tests/Integration/Behaviour/Features/Scenario/Search/search_alias_for_association.feature
index 346ce8574f61e..d78c49c44dad0 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Search/search_alias_for_association.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Search/search_alias_for_association.feature
@@ -1,8 +1,8 @@
-# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s alias --tags search_alias_for_association
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s alias --tags search-alias-for-association
 @restore-aliases-before-feature
 @clear-cache-before-feature
 @clear-cache-after-feature
-@search_alias_for_association
+@search-alias-for-association
 Feature: Search alias search terms to associate them in the BO
   As a BO user
   I need to be able to search for alias search terms in the BO to associate them

From cb811caff2f1b80092273f31b488963ecfd93941 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Tue, 20 Jun 2023 14:46:52 +0300
Subject: [PATCH 0381/1030] fix type error

---
 .../Alias/QueryHandler/SearchAliasForAssociationHandler.php   | 2 +-
 src/Adapter/Alias/Repository/AliasRepository.php              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Adapter/Alias/QueryHandler/SearchAliasForAssociationHandler.php b/src/Adapter/Alias/QueryHandler/SearchAliasForAssociationHandler.php
index bbe73e0316612..8146090d7b619 100644
--- a/src/Adapter/Alias/QueryHandler/SearchAliasForAssociationHandler.php
+++ b/src/Adapter/Alias/QueryHandler/SearchAliasForAssociationHandler.php
@@ -51,7 +51,7 @@ public function handle(SearchAliasesForAssociation $query): array
         $aliasesForAssociation = [];
 
         foreach ($searchTerms as $searchTerm) {
-            $aliasesForAssociation[] = new AliasForAssociation((string) $searchTerm['search']);
+            $aliasesForAssociation[] = new AliasForAssociation($searchTerm['search']);
         }
 
         return $aliasesForAssociation;
diff --git a/src/Adapter/Alias/Repository/AliasRepository.php b/src/Adapter/Alias/Repository/AliasRepository.php
index 56de606bc28a0..4f4b236f13acc 100644
--- a/src/Adapter/Alias/Repository/AliasRepository.php
+++ b/src/Adapter/Alias/Repository/AliasRepository.php
@@ -204,7 +204,7 @@ public function deleteAliasesBySearchTerm(string $searchTerm): void
      * @param string $searchPhrase
      * @param int|null $limit
      *
-     * @return array<string, string>
+     * @return array<int, array<string, string>>
      */
     public function searchAliases(string $searchPhrase, ?int $limit = null): array
     {
@@ -217,7 +217,7 @@ public function searchAliases(string $searchPhrase, ?int $limit = null): array
             ->addGroupBy('a.search')
             ->setMaxResults($limit)
             ->where('a.search LIKE :searchPhrase')
-            ->setParameter('searchPhrase', '%' . $searchPhrase. '%')
+            ->setParameter('searchPhrase', '%' . $searchPhrase . '%')
             ->execute()
             ->fetchAllAssociative();
     }

From 7e016e64ac68ce6dbe48f2e8b5756b9ba91de11e Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Tue, 20 Jun 2023 14:49:16 +0300
Subject: [PATCH 0382/1030] make error message translatable

---
 .../ShopParameters/SearchController.php         | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php
index 450006d46666b..b7317bb81bbc8 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php
@@ -28,6 +28,7 @@
 
 namespace PrestaShopBundle\Controller\Admin\Configure\ShopParameters;
 
+use Exception;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\AliasConstraintException;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Query\SearchAliasesForAssociation;
 use PrestaShop\PrestaShop\Core\Domain\Alias\QueryResult\AliasForAssociation;
@@ -87,7 +88,7 @@ public function searchAliasesForAssociationAction(Request $request): JsonRespons
             ));
         } catch (AliasConstraintException $e) {
             return $this->json([
-                'message' => $e->getMessage(),
+                'message' => $this->getErrorMessage($e),
             ], Response::HTTP_BAD_REQUEST);
         }
 
@@ -97,4 +98,18 @@ public function searchAliasesForAssociationAction(Request $request): JsonRespons
 
         return $this->json(['aliases' => $searchTerms]);
     }
+
+    /**
+     * @param Exception $e
+     *
+     * @return string
+     */
+    private function getErrorMessage(Exception $e): string
+    {
+        return $this->getFallbackErrorMessage(
+            get_class($e),
+            $e->getCode(),
+            $e->getMessage()
+        );
+    }
 }

From 34f4281e75efd4a195752f316f70fef65417ce0b Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Tue, 20 Jun 2023 15:55:26 +0300
Subject: [PATCH 0383/1030] cs fixer fixes

---
 src/Core/Domain/Alias/QueryResult/AliasForAssociation.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Core/Domain/Alias/QueryResult/AliasForAssociation.php b/src/Core/Domain/Alias/QueryResult/AliasForAssociation.php
index 071b62a34304a..f9be37c6549f4 100644
--- a/src/Core/Domain/Alias/QueryResult/AliasForAssociation.php
+++ b/src/Core/Domain/Alias/QueryResult/AliasForAssociation.php
@@ -28,8 +28,6 @@
 
 namespace PrestaShop\PrestaShop\Core\Domain\Alias\QueryResult;
 
-use JsonSerializable;
-
 /**
  * Transfers alias data for association.
  */

From 7f2b8dac7f06ed596ca8cf329bf7dfda12956aa4 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Wed, 21 Jun 2023 11:10:30 +0300
Subject: [PATCH 0384/1030] add additional test message

---
 .../Behaviour/Features/Context/Domain/AliasFeatureContext.php  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
index 9e730461fea0a..a6d9b42cfc37e 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
@@ -199,8 +199,7 @@ public function assertSearchAliases(string $search, TableNode $tableNode): void
 
         foreach ($expectedSearchTermsRows as $expectedSearchTermRow) {
             $expectedSearchTerms = PrimitiveUtils::castStringArrayIntoArray($expectedSearchTermRow['searchTerm']);
-            Assert::assertEquals(count($expectedSearchTerms), count($foundAliasesForAssociation));
-
+            Assert::assertCount(count($expectedSearchTerms), $foundAliasesForAssociation, 'Expected and found search terms count doesn\'t match');
             $index = 0;
             foreach ($expectedSearchTerms as $searchTerm) {
                 $foundAliasSearchTerm = $foundAliasesForAssociation[$index++];

From b00b559362138c0da76002c3d64eccf40fb5352d Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Wed, 21 Jun 2023 11:19:42 +0300
Subject: [PATCH 0385/1030] change argument access

---
 .../Alias/QueryHandler/SearchAliasForAssociationHandler.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Adapter/Alias/QueryHandler/SearchAliasForAssociationHandler.php b/src/Adapter/Alias/QueryHandler/SearchAliasForAssociationHandler.php
index 8146090d7b619..c8599730fe5f5 100644
--- a/src/Adapter/Alias/QueryHandler/SearchAliasForAssociationHandler.php
+++ b/src/Adapter/Alias/QueryHandler/SearchAliasForAssociationHandler.php
@@ -35,7 +35,7 @@
 
 class SearchAliasForAssociationHandler implements SearchAliasesForAssociationHandlerInterface
 {
-    public function __construct(private readonly AliasRepository $aliasRepository)
+    public function __construct(protected readonly AliasRepository $aliasRepository)
     {
     }
 

From 8afef94e0e6a5b9a4cd3fb7c2aca8971c62c069e Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Wed, 21 Jun 2023 11:20:30 +0300
Subject: [PATCH 0386/1030] fix query builder

---
 src/Adapter/Alias/Repository/AliasRepository.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Adapter/Alias/Repository/AliasRepository.php b/src/Adapter/Alias/Repository/AliasRepository.php
index 4f4b236f13acc..d2dacba522dc5 100644
--- a/src/Adapter/Alias/Repository/AliasRepository.php
+++ b/src/Adapter/Alias/Repository/AliasRepository.php
@@ -208,9 +208,7 @@ public function deleteAliasesBySearchTerm(string $searchTerm): void
      */
     public function searchAliases(string $searchPhrase, ?int $limit = null): array
     {
-        $qb = $this->connection->createQueryBuilder();
-
-        return $qb
+        return $this->connection->createQueryBuilder()
             ->addSelect('a.search')
             ->from($this->dbPrefix . 'alias', 'a')
             ->addOrderBy('a.search', 'ASC')

From 60a33a762ecc1417598e3f75188a50cd2f8ee368 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Wed, 21 Jun 2023 11:23:00 +0300
Subject: [PATCH 0387/1030] fix exception

---
 .../Domain/Alias/Query/SearchAliasesForAssociation.php     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Core/Domain/Alias/Query/SearchAliasesForAssociation.php b/src/Core/Domain/Alias/Query/SearchAliasesForAssociation.php
index 7de4b16527083..5f4afae2c9f0c 100644
--- a/src/Core/Domain/Alias/Query/SearchAliasesForAssociation.php
+++ b/src/Core/Domain/Alias/Query/SearchAliasesForAssociation.php
@@ -28,17 +28,20 @@
 
 namespace PrestaShop\PrestaShop\Core\Domain\Alias\Query;
 
-use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\AliasConstraintException;
+use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
 
 /**
  * Class SearchAliasesForAssociation is responsible for searching aliases with particular search terms.
  */
 class SearchAliasesForAssociation
 {
+    /**
+     * @throws InvalidArgumentException
+     */
     public function __construct(public readonly string $searchTerm, public readonly ?int $limit = null)
     {
         if (null !== $limit && $limit <= 0) {
-            throw new AliasConstraintException('Search limit must be a positive integer or null', AliasConstraintException::INVALID_SEARCH_LIMIT);
+            throw new InvalidArgumentException('Search limit must be a positive integer or null');
         }
     }
 }

From 877b31e35701c270eac8952570ab1058861bc562 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Wed, 21 Jun 2023 13:41:23 +0300
Subject: [PATCH 0388/1030] rename classes

---
 ...dler.php => SearchForSearchTermHandler.php} | 18 +++++++++---------
 .../Alias/Repository/AliasRepository.php       |  2 +-
 ...Association.php => SearchForSearchTerm.php} |  4 +++-
 ...=> SearchForSearchTermHandlerInterface.php} | 12 ++++++------
 ...{AliasForAssociation.php => SearchTerm.php} |  2 +-
 .../ShopParameters/SearchController.php        | 10 +++++-----
 .../config/services/adapter/alias.yml          |  4 ++--
 .../Context/Domain/AliasFeatureContext.php     |  8 ++++----
 8 files changed, 31 insertions(+), 29 deletions(-)
 rename src/Adapter/Alias/QueryHandler/{SearchAliasForAssociationHandler.php => SearchForSearchTermHandler.php} (68%)
 rename src/Core/Domain/Alias/Query/{SearchAliasesForAssociation.php => SearchForSearchTerm.php} (95%)
 rename src/Core/Domain/Alias/QueryHandler/{SearchAliasesForAssociationHandlerInterface.php => SearchForSearchTermHandlerInterface.php} (77%)
 rename src/Core/Domain/Alias/QueryResult/{AliasForAssociation.php => SearchTerm.php} (98%)

diff --git a/src/Adapter/Alias/QueryHandler/SearchAliasForAssociationHandler.php b/src/Adapter/Alias/QueryHandler/SearchForSearchTermHandler.php
similarity index 68%
rename from src/Adapter/Alias/QueryHandler/SearchAliasForAssociationHandler.php
rename to src/Adapter/Alias/QueryHandler/SearchForSearchTermHandler.php
index c8599730fe5f5..0656f3cf34894 100644
--- a/src/Adapter/Alias/QueryHandler/SearchAliasForAssociationHandler.php
+++ b/src/Adapter/Alias/QueryHandler/SearchForSearchTermHandler.php
@@ -29,29 +29,29 @@
 namespace PrestaShop\PrestaShop\Adapter\Alias\QueryHandler;
 
 use PrestaShop\PrestaShop\Adapter\Alias\Repository\AliasRepository;
-use PrestaShop\PrestaShop\Core\Domain\Alias\Query\SearchAliasesForAssociation;
-use PrestaShop\PrestaShop\Core\Domain\Alias\QueryHandler\SearchAliasesForAssociationHandlerInterface;
-use PrestaShop\PrestaShop\Core\Domain\Alias\QueryResult\AliasForAssociation;
+use PrestaShop\PrestaShop\Core\Domain\Alias\Query\SearchForSearchTerm;
+use PrestaShop\PrestaShop\Core\Domain\Alias\QueryHandler\SearchForSearchTermHandlerInterface;
+use PrestaShop\PrestaShop\Core\Domain\Alias\QueryResult\SearchTerm;
 
-class SearchAliasForAssociationHandler implements SearchAliasesForAssociationHandlerInterface
+class SearchForSearchTermHandler implements SearchForSearchTermHandlerInterface
 {
     public function __construct(protected readonly AliasRepository $aliasRepository)
     {
     }
 
     /**
-     * @param SearchAliasesForAssociation $query
+     * @param SearchForSearchTerm $query
      *
-     * @return AliasForAssociation[]
+     * @return SearchTerm[]
      */
-    public function handle(SearchAliasesForAssociation $query): array
+    public function handle(SearchForSearchTerm $query): array
     {
-        $searchTerms = $this->aliasRepository->searchAliases($query->searchTerm, $query->limit);
+        $searchTerms = $this->aliasRepository->searchSearchTerms($query->searchTerm, $query->limit);
 
         $aliasesForAssociation = [];
 
         foreach ($searchTerms as $searchTerm) {
-            $aliasesForAssociation[] = new AliasForAssociation($searchTerm['search']);
+            $aliasesForAssociation[] = new SearchTerm($searchTerm['search']);
         }
 
         return $aliasesForAssociation;
diff --git a/src/Adapter/Alias/Repository/AliasRepository.php b/src/Adapter/Alias/Repository/AliasRepository.php
index d2dacba522dc5..3d728c5bfbcb4 100644
--- a/src/Adapter/Alias/Repository/AliasRepository.php
+++ b/src/Adapter/Alias/Repository/AliasRepository.php
@@ -206,7 +206,7 @@ public function deleteAliasesBySearchTerm(string $searchTerm): void
      *
      * @return array<int, array<string, string>>
      */
-    public function searchAliases(string $searchPhrase, ?int $limit = null): array
+    public function searchSearchTerms(string $searchPhrase, ?int $limit = null): array
     {
         return $this->connection->createQueryBuilder()
             ->addSelect('a.search')
diff --git a/src/Core/Domain/Alias/Query/SearchAliasesForAssociation.php b/src/Core/Domain/Alias/Query/SearchForSearchTerm.php
similarity index 95%
rename from src/Core/Domain/Alias/Query/SearchAliasesForAssociation.php
rename to src/Core/Domain/Alias/Query/SearchForSearchTerm.php
index 5f4afae2c9f0c..c75e27397192d 100644
--- a/src/Core/Domain/Alias/Query/SearchAliasesForAssociation.php
+++ b/src/Core/Domain/Alias/Query/SearchForSearchTerm.php
@@ -33,8 +33,10 @@
 /**
  * Class SearchAliasesForAssociation is responsible for searching aliases with particular search terms.
  */
-class SearchAliasesForAssociation
+class SearchForSearchTerm
 {
+    public const DEFAULT_ALIAS_SEARCH_LIMIT = 20;
+
     /**
      * @throws InvalidArgumentException
      */
diff --git a/src/Core/Domain/Alias/QueryHandler/SearchAliasesForAssociationHandlerInterface.php b/src/Core/Domain/Alias/QueryHandler/SearchForSearchTermHandlerInterface.php
similarity index 77%
rename from src/Core/Domain/Alias/QueryHandler/SearchAliasesForAssociationHandlerInterface.php
rename to src/Core/Domain/Alias/QueryHandler/SearchForSearchTermHandlerInterface.php
index 0e2a6ed4ef150..7ad6b02f92681 100644
--- a/src/Core/Domain/Alias/QueryHandler/SearchAliasesForAssociationHandlerInterface.php
+++ b/src/Core/Domain/Alias/QueryHandler/SearchForSearchTermHandlerInterface.php
@@ -26,18 +26,18 @@
 
 namespace PrestaShop\PrestaShop\Core\Domain\Alias\QueryHandler;
 
-use PrestaShop\PrestaShop\Core\Domain\Alias\Query\SearchAliasesForAssociation;
-use PrestaShop\PrestaShop\Core\Domain\Alias\QueryResult\AliasForAssociation;
+use PrestaShop\PrestaShop\Core\Domain\Alias\Query\SearchForSearchTerm;
+use PrestaShop\PrestaShop\Core\Domain\Alias\QueryResult\SearchTerm;
 
 /**
  * Interface SearchAliasesForAssociationHandlerInterface defines contract for SearchAliasesForAssociationHandler
  */
-interface SearchAliasesForAssociationHandlerInterface
+interface SearchForSearchTermHandlerInterface
 {
     /**
-     * @param SearchAliasesForAssociation $query
+     * @param SearchForSearchTerm $query
      *
-     * @return AliasForAssociation[]
+     * @return SearchTerm[]
      */
-    public function handle(SearchAliasesForAssociation $query): array;
+    public function handle(SearchForSearchTerm $query): array;
 }
diff --git a/src/Core/Domain/Alias/QueryResult/AliasForAssociation.php b/src/Core/Domain/Alias/QueryResult/SearchTerm.php
similarity index 98%
rename from src/Core/Domain/Alias/QueryResult/AliasForAssociation.php
rename to src/Core/Domain/Alias/QueryResult/SearchTerm.php
index f9be37c6549f4..d18a2b4a5db96 100644
--- a/src/Core/Domain/Alias/QueryResult/AliasForAssociation.php
+++ b/src/Core/Domain/Alias/QueryResult/SearchTerm.php
@@ -31,7 +31,7 @@
 /**
  * Transfers alias data for association.
  */
-class AliasForAssociation
+class SearchTerm
 {
     public function __construct(public readonly string $searchTerm)
     {
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php
index b7317bb81bbc8..2cb8d0a360a22 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php
@@ -30,8 +30,8 @@
 
 use Exception;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\AliasConstraintException;
-use PrestaShop\PrestaShop\Core\Domain\Alias\Query\SearchAliasesForAssociation;
-use PrestaShop\PrestaShop\Core\Domain\Alias\QueryResult\AliasForAssociation;
+use PrestaShop\PrestaShop\Core\Domain\Alias\Query\SearchForSearchTerm;
+use PrestaShop\PrestaShop\Core\Domain\Alias\QueryResult\SearchTerm;
 use PrestaShop\PrestaShop\Core\Search\Filters\AliasFilters;
 use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
 use PrestaShopBundle\Security\Annotation\AdminSecurity;
@@ -81,10 +81,10 @@ public function indexAction(Request $request, AliasFilters $filters): Response
     public function searchAliasesForAssociationAction(Request $request): JsonResponse
     {
         try {
-            /** @var AliasForAssociation[] $searchTerms */
-            $searchTerms = $this->getQueryBus()->handle(new SearchAliasesForAssociation(
+            /** @var SearchTerm[] $searchTerms */
+            $searchTerms = $this->getQueryBus()->handle(new SearchForSearchTerm(
                 $request->get('query', ''),
-                (int) $request->get('limit', 20)
+                (int) $request->get('limit', SearchForSearchTerm::DEFAULT_ALIAS_SEARCH_LIMIT)
             ));
         } catch (AliasConstraintException $e) {
             return $this->json([
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml b/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
index 58855f6c75040..e1ced98250139 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
@@ -45,7 +45,7 @@ services:
       - name: tactician.handler
         command: PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasCommand
 
-  PrestaShop\PrestaShop\Adapter\Alias\QueryHandler\SearchAliasForAssociationHandler:
+  PrestaShop\PrestaShop\Adapter\Alias\QueryHandler\SearchForSearchTermHandler:
     tags:
       - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Alias\Query\SearchAliasesForAssociation
+        command: PrestaShop\PrestaShop\Core\Domain\Alias\Query\SearchForSearchTerm
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
index a6d9b42cfc37e..590053bd1634d 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
@@ -37,8 +37,8 @@
 use PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasCommand;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\AliasException;
-use PrestaShop\PrestaShop\Core\Domain\Alias\Query\SearchAliasesForAssociation;
-use PrestaShop\PrestaShop\Core\Domain\Alias\QueryResult\AliasForAssociation;
+use PrestaShop\PrestaShop\Core\Domain\Alias\Query\SearchForSearchTerm;
+use PrestaShop\PrestaShop\Core\Domain\Alias\QueryResult\SearchTerm;
 use PrestaShop\PrestaShop\Core\Domain\Alias\ValueObject\AliasId;
 use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
 use PrestaShop\PrestaShop\Core\Grid\Query\AliasQueryBuilder;
@@ -193,8 +193,8 @@ public function bulkDeleteAlias(string $aliasReferences): void
      */
     public function assertSearchAliases(string $search, TableNode $tableNode): void
     {
-        /** @var AliasForAssociation[] $foundAliasesForAssociation */
-        $foundAliasesForAssociation = $this->getQueryBus()->handle(new SearchAliasesForAssociation($search));
+        /** @var SearchTerm[] $foundAliasesForAssociation */
+        $foundAliasesForAssociation = $this->getQueryBus()->handle(new SearchForSearchTerm($search));
         $expectedSearchTermsRows = $tableNode->getColumnsHash();
 
         foreach ($expectedSearchTermsRows as $expectedSearchTermRow) {

From f956ae177329edc7dc73b73f955ff2bf93b3cb22 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Wed, 21 Jun 2023 13:49:53 +0300
Subject: [PATCH 0389/1030] rename variable

---
 .../Alias/QueryHandler/SearchForSearchTermHandler.php       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Adapter/Alias/QueryHandler/SearchForSearchTermHandler.php b/src/Adapter/Alias/QueryHandler/SearchForSearchTermHandler.php
index 0656f3cf34894..a395545301598 100644
--- a/src/Adapter/Alias/QueryHandler/SearchForSearchTermHandler.php
+++ b/src/Adapter/Alias/QueryHandler/SearchForSearchTermHandler.php
@@ -48,12 +48,12 @@ public function handle(SearchForSearchTerm $query): array
     {
         $searchTerms = $this->aliasRepository->searchSearchTerms($query->searchTerm, $query->limit);
 
-        $aliasesForAssociation = [];
+        $searchTermDtos = [];
 
         foreach ($searchTerms as $searchTerm) {
-            $aliasesForAssociation[] = new SearchTerm($searchTerm['search']);
+            $searchTermDtos[] = new SearchTerm($searchTerm['search']);
         }
 
-        return $aliasesForAssociation;
+        return $searchTermDtos;
     }
 }

From 30fd3c81aee082a11e4289246f4047f8b9ce69e8 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Wed, 21 Jun 2023 14:20:25 +0300
Subject: [PATCH 0390/1030] rename constant

---
 src/Core/Domain/Alias/Query/SearchForSearchTerm.php             | 2 +-
 .../Admin/Configure/ShopParameters/SearchController.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Core/Domain/Alias/Query/SearchForSearchTerm.php b/src/Core/Domain/Alias/Query/SearchForSearchTerm.php
index c75e27397192d..4ca836b6cada9 100644
--- a/src/Core/Domain/Alias/Query/SearchForSearchTerm.php
+++ b/src/Core/Domain/Alias/Query/SearchForSearchTerm.php
@@ -35,7 +35,7 @@
  */
 class SearchForSearchTerm
 {
-    public const DEFAULT_ALIAS_SEARCH_LIMIT = 20;
+    public const DEFAULT_SEARCH_TERM_LIMIT = 20;
 
     /**
      * @throws InvalidArgumentException
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php
index 2cb8d0a360a22..b473b2baae87f 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php
@@ -84,7 +84,7 @@ public function searchAliasesForAssociationAction(Request $request): JsonRespons
             /** @var SearchTerm[] $searchTerms */
             $searchTerms = $this->getQueryBus()->handle(new SearchForSearchTerm(
                 $request->get('query', ''),
-                (int) $request->get('limit', SearchForSearchTerm::DEFAULT_ALIAS_SEARCH_LIMIT)
+                (int) $request->get('limit', SearchForSearchTerm::DEFAULT_SEARCH_TERM_LIMIT)
             ));
         } catch (AliasConstraintException $e) {
             return $this->json([

From 46282f90f896fb4af40f63cccb3a5abda0e68b51 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Wed, 21 Jun 2023 14:21:59 +0300
Subject: [PATCH 0391/1030] rename constant

---
 src/Core/Domain/Alias/Query/SearchForSearchTerm.php             | 2 +-
 .../Admin/Configure/ShopParameters/SearchController.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Core/Domain/Alias/Query/SearchForSearchTerm.php b/src/Core/Domain/Alias/Query/SearchForSearchTerm.php
index 4ca836b6cada9..f975801b3bf94 100644
--- a/src/Core/Domain/Alias/Query/SearchForSearchTerm.php
+++ b/src/Core/Domain/Alias/Query/SearchForSearchTerm.php
@@ -35,7 +35,7 @@
  */
 class SearchForSearchTerm
 {
-    public const DEFAULT_SEARCH_TERM_LIMIT = 20;
+    public const DEFAULT_LIMIT = 20;
 
     /**
      * @throws InvalidArgumentException
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php
index b473b2baae87f..3f1ebf32b493c 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php
@@ -84,7 +84,7 @@ public function searchAliasesForAssociationAction(Request $request): JsonRespons
             /** @var SearchTerm[] $searchTerms */
             $searchTerms = $this->getQueryBus()->handle(new SearchForSearchTerm(
                 $request->get('query', ''),
-                (int) $request->get('limit', SearchForSearchTerm::DEFAULT_SEARCH_TERM_LIMIT)
+                (int) $request->get('limit', SearchForSearchTerm::DEFAULT_LIMIT)
             ));
         } catch (AliasConstraintException $e) {
             return $this->json([

From 537ba034fa21b7c8c5f0aec501cb621bb03dd2f2 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Wed, 21 Jun 2023 14:22:48 +0300
Subject: [PATCH 0392/1030] remove unused constant

---
 src/Core/Domain/Alias/Exception/AliasConstraintException.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/Core/Domain/Alias/Exception/AliasConstraintException.php b/src/Core/Domain/Alias/Exception/AliasConstraintException.php
index e11f981345e82..f3a8160348fbf 100644
--- a/src/Core/Domain/Alias/Exception/AliasConstraintException.php
+++ b/src/Core/Domain/Alias/Exception/AliasConstraintException.php
@@ -50,9 +50,4 @@ class AliasConstraintException extends AliasException
      * When alias visibility value is invalid
      */
     public const INVALID_VISIBILITY = 40;
-
-    /**
-     * Search limit must be a positive integer or null
-     */
-    public const INVALID_SEARCH_LIMIT = 50;
 }

From 79a05a940b840a9f1aef0196541efb22bddaede1 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Wed, 28 Jun 2023 09:07:08 +0300
Subject: [PATCH 0393/1030] rework query and query results with getters

---
 .../Alias/Query/SearchForSearchTerm.php       | 24 ++++++++++++++++++-
 .../Domain/Alias/QueryResult/SearchTerm.php   | 13 +++++++++-
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/src/Core/Domain/Alias/Query/SearchForSearchTerm.php b/src/Core/Domain/Alias/Query/SearchForSearchTerm.php
index f975801b3bf94..f28a9572e808d 100644
--- a/src/Core/Domain/Alias/Query/SearchForSearchTerm.php
+++ b/src/Core/Domain/Alias/Query/SearchForSearchTerm.php
@@ -37,13 +37,35 @@ class SearchForSearchTerm
 {
     public const DEFAULT_LIMIT = 20;
 
+    private string $searchTerm;
+
+    private ?int $limit;
+
     /**
      * @throws InvalidArgumentException
      */
-    public function __construct(public readonly string $searchTerm, public readonly ?int $limit = null)
+    public function __construct(string $searchTerm, ?int $limit = null)
     {
         if (null !== $limit && $limit <= 0) {
             throw new InvalidArgumentException('Search limit must be a positive integer or null');
         }
+        $this->searchTerm = $searchTerm;
+        $this->limit = $limit;
+    }
+
+    /**
+     * @return string
+     */
+    public function getSearchTerm(): string
+    {
+        return $this->searchTerm;
+    }
+
+    /**
+     * @return int|null
+     */
+    public function getLimit(): ?int
+    {
+        return $this->limit;
     }
 }
diff --git a/src/Core/Domain/Alias/QueryResult/SearchTerm.php b/src/Core/Domain/Alias/QueryResult/SearchTerm.php
index d18a2b4a5db96..ba9c626083ed8 100644
--- a/src/Core/Domain/Alias/QueryResult/SearchTerm.php
+++ b/src/Core/Domain/Alias/QueryResult/SearchTerm.php
@@ -33,7 +33,18 @@
  */
 class SearchTerm
 {
-    public function __construct(public readonly string $searchTerm)
+    private string $searchTerm;
+
+    public function __construct(string $searchTerm)
+    {
+        $this->searchTerm = $searchTerm;
+    }
+
+    /**
+     * @return string
+     */
+    public function getSearchTerm(): string
     {
+        return $this->searchTerm;
     }
 }

From 694c1f7fc32ea0db3f649f9593b84b8d50fb5dd7 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Wed, 28 Jun 2023 09:18:47 +0300
Subject: [PATCH 0394/1030] fix handler

---
 src/Adapter/Alias/QueryHandler/SearchForSearchTermHandler.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Adapter/Alias/QueryHandler/SearchForSearchTermHandler.php b/src/Adapter/Alias/QueryHandler/SearchForSearchTermHandler.php
index a395545301598..f81fa04c7fb42 100644
--- a/src/Adapter/Alias/QueryHandler/SearchForSearchTermHandler.php
+++ b/src/Adapter/Alias/QueryHandler/SearchForSearchTermHandler.php
@@ -46,7 +46,7 @@ public function __construct(protected readonly AliasRepository $aliasRepository)
      */
     public function handle(SearchForSearchTerm $query): array
     {
-        $searchTerms = $this->aliasRepository->searchSearchTerms($query->searchTerm, $query->limit);
+        $searchTerms = $this->aliasRepository->searchSearchTerms($query->getSearchTerm(), $query->getLimit());
 
         $searchTermDtos = [];
 

From 12ed943046226bffd3bf0ce7348f59566fa6247d Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Wed, 28 Jun 2023 09:20:05 +0300
Subject: [PATCH 0395/1030] fix alias context

---
 .../Behaviour/Features/Context/Domain/AliasFeatureContext.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
index 590053bd1634d..9757a5f71c4fc 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
@@ -206,11 +206,11 @@ public function assertSearchAliases(string $search, TableNode $tableNode): void
 
                 Assert::assertEquals(
                     $searchTerm,
-                    $foundAliasSearchTerm->searchTerm,
+                    $foundAliasSearchTerm->getSearchTerm(),
                     sprintf(
                         'Invalid Alias Search Term, expected %d but got %d instead.',
                         $searchTerm,
-                        $foundAliasSearchTerm->searchTerm
+                        $foundAliasSearchTerm->getSearchTerm()
                     )
                 );
             }

From 50d61bc9dca3527da9a2fc0eec4a67c88ef889b6 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Thu, 29 Jun 2023 09:02:44 +0300
Subject: [PATCH 0396/1030] remove search term vo

---
 .../SearchForSearchTermHandler.php            |  5 +-
 .../Domain/Alias/QueryResult/SearchTerm.php   | 50 -------------------
 .../ShopParameters/SearchController.php       |  2 +-
 3 files changed, 3 insertions(+), 54 deletions(-)
 delete mode 100644 src/Core/Domain/Alias/QueryResult/SearchTerm.php

diff --git a/src/Adapter/Alias/QueryHandler/SearchForSearchTermHandler.php b/src/Adapter/Alias/QueryHandler/SearchForSearchTermHandler.php
index f81fa04c7fb42..c6195346a6d0c 100644
--- a/src/Adapter/Alias/QueryHandler/SearchForSearchTermHandler.php
+++ b/src/Adapter/Alias/QueryHandler/SearchForSearchTermHandler.php
@@ -31,7 +31,6 @@
 use PrestaShop\PrestaShop\Adapter\Alias\Repository\AliasRepository;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Query\SearchForSearchTerm;
 use PrestaShop\PrestaShop\Core\Domain\Alias\QueryHandler\SearchForSearchTermHandlerInterface;
-use PrestaShop\PrestaShop\Core\Domain\Alias\QueryResult\SearchTerm;
 
 class SearchForSearchTermHandler implements SearchForSearchTermHandlerInterface
 {
@@ -42,7 +41,7 @@ public function __construct(protected readonly AliasRepository $aliasRepository)
     /**
      * @param SearchForSearchTerm $query
      *
-     * @return SearchTerm[]
+     * @return string[]
      */
     public function handle(SearchForSearchTerm $query): array
     {
@@ -51,7 +50,7 @@ public function handle(SearchForSearchTerm $query): array
         $searchTermDtos = [];
 
         foreach ($searchTerms as $searchTerm) {
-            $searchTermDtos[] = new SearchTerm($searchTerm['search']);
+            $searchTermDtos[] = $searchTerm['search'];
         }
 
         return $searchTermDtos;
diff --git a/src/Core/Domain/Alias/QueryResult/SearchTerm.php b/src/Core/Domain/Alias/QueryResult/SearchTerm.php
deleted file mode 100644
index ba9c626083ed8..0000000000000
--- a/src/Core/Domain/Alias/QueryResult/SearchTerm.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-declare(strict_types=1);
-
-namespace PrestaShop\PrestaShop\Core\Domain\Alias\QueryResult;
-
-/**
- * Transfers alias data for association.
- */
-class SearchTerm
-{
-    private string $searchTerm;
-
-    public function __construct(string $searchTerm)
-    {
-        $this->searchTerm = $searchTerm;
-    }
-
-    /**
-     * @return string
-     */
-    public function getSearchTerm(): string
-    {
-        return $this->searchTerm;
-    }
-}
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php
index 3f1ebf32b493c..eb07dc0ec4f2e 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php
@@ -81,7 +81,7 @@ public function indexAction(Request $request, AliasFilters $filters): Response
     public function searchAliasesForAssociationAction(Request $request): JsonResponse
     {
         try {
-            /** @var SearchTerm[] $searchTerms */
+            /** @var string[] $searchTerms */
             $searchTerms = $this->getQueryBus()->handle(new SearchForSearchTerm(
                 $request->get('query', ''),
                 (int) $request->get('limit', SearchForSearchTerm::DEFAULT_LIMIT)

From 0256b0cfabd412b37f8a462de8095ae65d1edd07 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Thu, 29 Jun 2023 09:06:38 +0300
Subject: [PATCH 0397/1030] fix behat tests

---
 .../Features/Context/Domain/AliasFeatureContext.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
index 9757a5f71c4fc..6f6d3babd5788 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
@@ -38,7 +38,6 @@
 use PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\AliasException;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Query\SearchForSearchTerm;
-use PrestaShop\PrestaShop\Core\Domain\Alias\QueryResult\SearchTerm;
 use PrestaShop\PrestaShop\Core\Domain\Alias\ValueObject\AliasId;
 use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
 use PrestaShop\PrestaShop\Core\Grid\Query\AliasQueryBuilder;
@@ -193,24 +192,24 @@ public function bulkDeleteAlias(string $aliasReferences): void
      */
     public function assertSearchAliases(string $search, TableNode $tableNode): void
     {
-        /** @var SearchTerm[] $foundAliasesForAssociation */
+        /** @var string[] $foundAliasesForAssociation */
         $foundAliasesForAssociation = $this->getQueryBus()->handle(new SearchForSearchTerm($search));
         $expectedSearchTermsRows = $tableNode->getColumnsHash();
 
         foreach ($expectedSearchTermsRows as $expectedSearchTermRow) {
             $expectedSearchTerms = PrimitiveUtils::castStringArrayIntoArray($expectedSearchTermRow['searchTerm']);
             Assert::assertCount(count($expectedSearchTerms), $foundAliasesForAssociation, 'Expected and found search terms count doesn\'t match');
-            $index = 0;
-            foreach ($expectedSearchTerms as $searchTerm) {
-                $foundAliasSearchTerm = $foundAliasesForAssociation[$index++];
+
+            foreach ($expectedSearchTerms as $index => $searchTerm) {
+                $foundAliasSearchTerm = $foundAliasesForAssociation[$index];
 
                 Assert::assertEquals(
                     $searchTerm,
-                    $foundAliasSearchTerm->getSearchTerm(),
+                    $foundAliasSearchTerm,
                     sprintf(
                         'Invalid Alias Search Term, expected %d but got %d instead.',
                         $searchTerm,
-                        $foundAliasSearchTerm->getSearchTerm()
+                        $foundAliasSearchTerm
                     )
                 );
             }

From 5557de8f3d6172fbc8dc54cc9b0d6f447f589691 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Fri, 30 Jun 2023 10:12:06 +0300
Subject: [PATCH 0398/1030] cdfixer fixes

---
 .../Admin/Configure/ShopParameters/SearchController.php          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php
index eb07dc0ec4f2e..f59f621f40f65 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php
@@ -31,7 +31,6 @@
 use Exception;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\AliasConstraintException;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Query\SearchForSearchTerm;
-use PrestaShop\PrestaShop\Core\Domain\Alias\QueryResult\SearchTerm;
 use PrestaShop\PrestaShop\Core\Search\Filters\AliasFilters;
 use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
 use PrestaShopBundle\Security\Annotation\AdminSecurity;

From 1533f7e12e6ecfe39c9c2802674461d7ff64eed2 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Mon, 3 Jul 2023 10:52:32 +0300
Subject: [PATCH 0399/1030] fix search term handler

---
 .../QueryHandler/SearchForSearchTermHandler.php     | 13 ++++---------
 .../SearchForSearchTermHandlerInterface.php         |  3 +--
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/Adapter/Alias/QueryHandler/SearchForSearchTermHandler.php b/src/Adapter/Alias/QueryHandler/SearchForSearchTermHandler.php
index c6195346a6d0c..08ce5838f99b2 100644
--- a/src/Adapter/Alias/QueryHandler/SearchForSearchTermHandler.php
+++ b/src/Adapter/Alias/QueryHandler/SearchForSearchTermHandler.php
@@ -45,14 +45,9 @@ public function __construct(protected readonly AliasRepository $aliasRepository)
      */
     public function handle(SearchForSearchTerm $query): array
     {
-        $searchTerms = $this->aliasRepository->searchSearchTerms($query->getSearchTerm(), $query->getLimit());
-
-        $searchTermDtos = [];
-
-        foreach ($searchTerms as $searchTerm) {
-            $searchTermDtos[] = $searchTerm['search'];
-        }
-
-        return $searchTermDtos;
+       return array_column(
+           $this->aliasRepository->searchSearchTerms($query->getSearchTerm(), $query->getLimit()),
+           'search'
+       );
     }
 }
diff --git a/src/Core/Domain/Alias/QueryHandler/SearchForSearchTermHandlerInterface.php b/src/Core/Domain/Alias/QueryHandler/SearchForSearchTermHandlerInterface.php
index 7ad6b02f92681..6fcbdb174069f 100644
--- a/src/Core/Domain/Alias/QueryHandler/SearchForSearchTermHandlerInterface.php
+++ b/src/Core/Domain/Alias/QueryHandler/SearchForSearchTermHandlerInterface.php
@@ -27,7 +27,6 @@
 namespace PrestaShop\PrestaShop\Core\Domain\Alias\QueryHandler;
 
 use PrestaShop\PrestaShop\Core\Domain\Alias\Query\SearchForSearchTerm;
-use PrestaShop\PrestaShop\Core\Domain\Alias\QueryResult\SearchTerm;
 
 /**
  * Interface SearchAliasesForAssociationHandlerInterface defines contract for SearchAliasesForAssociationHandler
@@ -37,7 +36,7 @@ interface SearchForSearchTermHandlerInterface
     /**
      * @param SearchForSearchTerm $query
      *
-     * @return SearchTerm[]
+     * @return string[]
      */
     public function handle(SearchForSearchTerm $query): array;
 }

From ea5fddb86c178d8078043fdcc81352be2f2dc3c2 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Mon, 3 Jul 2023 11:08:55 +0300
Subject: [PATCH 0400/1030] rename variable

---
 .../Admin/Configure/ShopParameters/SearchController.php       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php
index f59f621f40f65..8a2699a3f8a4d 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php
@@ -92,10 +92,10 @@ public function searchAliasesForAssociationAction(Request $request): JsonRespons
         }
 
         if (empty($searchTerms)) {
-            return $this->json(['aliases' => []], Response::HTTP_NOT_FOUND);
+            return $this->json(['searchTerms' => []], Response::HTTP_NOT_FOUND);
         }
 
-        return $this->json(['aliases' => $searchTerms]);
+        return $this->json(['searchTerms' => $searchTerms]);
     }
 
     /**

From dfd456985afd0d25e71c1fd72dffd322ed662a09 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Mon, 3 Jul 2023 11:31:26 +0300
Subject: [PATCH 0401/1030] csfixer fixes

---
 src/Adapter/Alias/QueryHandler/SearchForSearchTermHandler.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Adapter/Alias/QueryHandler/SearchForSearchTermHandler.php b/src/Adapter/Alias/QueryHandler/SearchForSearchTermHandler.php
index 08ce5838f99b2..13ce687934227 100644
--- a/src/Adapter/Alias/QueryHandler/SearchForSearchTermHandler.php
+++ b/src/Adapter/Alias/QueryHandler/SearchForSearchTermHandler.php
@@ -45,7 +45,7 @@ public function __construct(protected readonly AliasRepository $aliasRepository)
      */
     public function handle(SearchForSearchTerm $query): array
     {
-       return array_column(
+        return array_column(
            $this->aliasRepository->searchSearchTerms($query->getSearchTerm(), $query->getLimit()),
            'search'
        );

From 41f6faebc3bf1e5d72d22df376dfe8d6d5705c1e Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Tue, 4 Jul 2023 10:08:21 +0200
Subject: [PATCH 0402/1030] Fix merge

---
 src/Adapter/Image/ImageGenerator.php      | 10 ----------
 src/Adapter/Module/ModuleDataProvider.php | 22 +++++++++++++++-------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/Adapter/Image/ImageGenerator.php b/src/Adapter/Image/ImageGenerator.php
index d843093f059af..9a72e36f79805 100644
--- a/src/Adapter/Image/ImageGenerator.php
+++ b/src/Adapter/Image/ImageGenerator.php
@@ -130,16 +130,6 @@ protected function resize(string $filePath, ImageType $imageType, int $imageId =
             )) {
                 $result = false;
             }
-            if ($generate_high_dpi_images && !ImageManager::resize(
-                $filePath,
-                sprintf('%s-%s.%s', dirname($filePath) . DIRECTORY_SEPARATOR . $imageId, stripslashes($imageType->name) . '2x', $imageFormat),
-                $imageType->width * 2,
-                $imageType->height * 2,
-                $imageFormat,
-                $forceFormat
-            )) {
-                $result = false;
-            }
         }
 
         return $result;
diff --git a/src/Adapter/Module/ModuleDataProvider.php b/src/Adapter/Module/ModuleDataProvider.php
index 99b7c80a34c3d..2e2c7d2b0f043 100755
--- a/src/Adapter/Module/ModuleDataProvider.php
+++ b/src/Adapter/Module/ModuleDataProvider.php
@@ -144,7 +144,6 @@ public function getInstalled(): array
 
         $id_shops = (new Context())->getContextListShopID();
         if (count($id_shops) > 0) {
-            $select .= ', ms.`id_module` as active, ms.`enable_device` as active_on_mobile';
             $from .= ' LEFT JOIN `' . _DB_PREFIX_ . 'module_shop` ms ON ms.`id_module` = m.`id_module`';
             $from .= ' AND ms.`id_shop` IN (' . implode(',', array_map('intval', $id_shops)) . ')';
         }
@@ -155,12 +154,7 @@ public function getInstalled(): array
         /** @var array{id: int, name:string, version: string, installed: int}|array{id: int, name:string, version: string, installed: int, active:int} $module */
         foreach ($results as $module) {
             $module['installed'] = (bool) $module['installed'];
-            if (array_key_exists('active', $module)) {
-                $module['active'] = (bool) $module['active'];
-            }
-            if (array_key_exists('active_on_mobile', $module)) {
-                $module['active_on_mobile'] = (bool) ($module['active_on_mobile'] & AddonListFilterDeviceStatus::DEVICE_MOBILE);
-            }
+            $module['active'] = $this->isModuleActive($module['id'], $id_shops);
             $modules[$module['name']] = $module;
         }
 
@@ -344,4 +338,18 @@ public function isOnDisk($name)
 
         return file_exists($path);
     }
+
+    /**
+     * Checks if the module is active on at least one shop of the context.
+     */
+    private function isModuleActive(int $id, array $id_shops): bool
+    {
+        $result = Db::getInstance()->getRow('SELECT m.`active`, ms.`id_module` as `shop_active`, ms.`enable_device` as `enable_device`
+            FROM `' . _DB_PREFIX_ . 'module` m
+            LEFT JOIN `' . _DB_PREFIX_ . 'module_shop` ms ON m.`id_module` = ms.`id_module`
+            WHERE m.`id_module` = ' . $id . '
+            AND ms.`id_shop` IN (' . implode(',', $id_shops) . ')');
+
+        return !empty($result);
+    }
 }

From 18c87b92817eea3f460c22a3b227c161905cadd9 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Wed, 28 Jun 2023 09:27:43 +0300
Subject: [PATCH 0403/1030] rework commands with getters

---
 .../CommandHandler/DeleteAliasHandler.php     |  2 +-
 .../Alias/Command/DeleteAliasCommand.php      | 13 ++++++-
 .../Alias/Command/UpdateAliasCommand.php      | 39 +++++++++++++++++--
 .../Command/UpdateAliasStatusCommand.php      | 26 ++++++++++++-
 4 files changed, 73 insertions(+), 7 deletions(-)

diff --git a/src/Adapter/Alias/CommandHandler/DeleteAliasHandler.php b/src/Adapter/Alias/CommandHandler/DeleteAliasHandler.php
index 4f1672485e6ce..a97c5558c0b33 100644
--- a/src/Adapter/Alias/CommandHandler/DeleteAliasHandler.php
+++ b/src/Adapter/Alias/CommandHandler/DeleteAliasHandler.php
@@ -43,6 +43,6 @@ public function __construct(private readonly AliasRepository $aliasRepository)
      */
     public function handle(DeleteAliasCommand $command): void
     {
-        $this->aliasRepository->delete($command->aliasId);
+        $this->aliasRepository->delete($command->getAliasId());
     }
 }
diff --git a/src/Core/Domain/Alias/Command/DeleteAliasCommand.php b/src/Core/Domain/Alias/Command/DeleteAliasCommand.php
index 58f8cccaba87a..5bedb18e9c030 100644
--- a/src/Core/Domain/Alias/Command/DeleteAliasCommand.php
+++ b/src/Core/Domain/Alias/Command/DeleteAliasCommand.php
@@ -35,7 +35,18 @@
  */
 class DeleteAliasCommand
 {
-    public function __construct(public readonly AliasId $aliasId)
+    private AliasId $aliasId;
+
+    public function __construct(AliasId $aliasId)
+    {
+        $this->aliasId = $aliasId;
+    }
+
+    /**
+     * @return AliasId
+     */
+    public function getAliasId(): AliasId
     {
+        return $this->aliasId;
     }
 }
diff --git a/src/Core/Domain/Alias/Command/UpdateAliasCommand.php b/src/Core/Domain/Alias/Command/UpdateAliasCommand.php
index 219b68c20700c..3bb2e8e753784 100644
--- a/src/Core/Domain/Alias/Command/UpdateAliasCommand.php
+++ b/src/Core/Domain/Alias/Command/UpdateAliasCommand.php
@@ -35,7 +35,14 @@
  */
 class UpdateAliasCommand
 {
-    public readonly AliasId $aliasId;
+    private AliasId $aliasId;
+
+    /**
+     * @var string[]
+     */
+    private array $aliases;
+
+    private string $searchTerm;
 
     /**
      * @param int $aliasId
@@ -44,9 +51,35 @@ class UpdateAliasCommand
      */
     public function __construct(
         int $aliasId,
-        public readonly array $aliases,
-        public readonly string $searchTerm,
+        array $aliases,
+        string $searchTerm,
     ) {
         $this->aliasId = new AliasId($aliasId);
+        $this->aliases = $aliases;
+        $this->searchTerm = $searchTerm;
+    }
+
+    /**
+     * @return AliasId
+     */
+    public function getAliasId(): AliasId
+    {
+        return $this->aliasId;
+    }
+
+    /**
+     * @return array
+     */
+    public function getAliases(): array
+    {
+        return $this->aliases;
+    }
+
+    /**
+     * @return string
+     */
+    public function getSearchTerm(): string
+    {
+        return $this->searchTerm;
     }
 }
diff --git a/src/Core/Domain/Alias/Command/UpdateAliasStatusCommand.php b/src/Core/Domain/Alias/Command/UpdateAliasStatusCommand.php
index 6c35a408676c1..2d999520798fa 100644
--- a/src/Core/Domain/Alias/Command/UpdateAliasStatusCommand.php
+++ b/src/Core/Domain/Alias/Command/UpdateAliasStatusCommand.php
@@ -35,13 +35,35 @@
  */
 class UpdateAliasStatusCommand
 {
+    private AliasId $aliasId;
+
+    private bool $enabled;
+
     /**
      * @param AliasId $aliasId
      * @param bool $enabled
      */
     public function __construct(
-        public readonly AliasId $aliasId,
-        public readonly bool $enabled
+        AliasId $aliasId,
+        bool $enabled
     ) {
+        $this->aliasId = $aliasId;
+        $this->enabled = $enabled;
+    }
+
+    /**
+     * @return AliasId
+     */
+    public function getAliasId(): AliasId
+    {
+        return $this->aliasId;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isEnabled(): bool
+    {
+        return $this->enabled;
     }
 }

From 61607aa1d7a6fce4f54986471dfd2b698410f777 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Wed, 28 Jun 2023 09:35:11 +0300
Subject: [PATCH 0404/1030] rework handlers

---
 src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php       | 4 ++--
 src/Adapter/Alias/CommandHandler/UpdateAliasStatusHandler.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php b/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php
index 7197b3688380b..e10aeac52f362 100644
--- a/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php
+++ b/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php
@@ -44,10 +44,10 @@ public function __construct(
      */
     public function handle(UpdateAliasCommand $command): void
     {
-        $existingAlias = $this->aliasRepository->get($command->aliasId);
+        $existingAlias = $this->aliasRepository->get($command->getAliasId());
 
         // We need to delete existing aliases to add new alias entries
         $this->aliasRepository->deleteAliasesBySearchTerm($existingAlias->search);
-        $this->aliasRepository->create($command->searchTerm, $command->aliases);
+        $this->aliasRepository->create($command->getSearchTerm(), $command->getAliases());
     }
 }
diff --git a/src/Adapter/Alias/CommandHandler/UpdateAliasStatusHandler.php b/src/Adapter/Alias/CommandHandler/UpdateAliasStatusHandler.php
index 4bfc9d33bff98..37aa04c8a7404 100644
--- a/src/Adapter/Alias/CommandHandler/UpdateAliasStatusHandler.php
+++ b/src/Adapter/Alias/CommandHandler/UpdateAliasStatusHandler.php
@@ -53,8 +53,8 @@ public function __construct(
      */
     public function handle(UpdateAliasStatusCommand $command): void
     {
-        $alias = $this->aliasRepository->get($command->aliasId);
-        $alias->active = $command->enabled;
+        $alias = $this->aliasRepository->get($command->getAliasId());
+        $alias->active = $command->isEnabled();
         $this->aliasRepository->partialUpdate($alias, ['active'], CannotUpdateAliasException::class);
     }
 }

From 4fc29db30a3153e4c78195666235fc37f3e5ac30 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Thu, 29 Jun 2023 09:20:11 +0300
Subject: [PATCH 0405/1030] rework alias commands

---
 src/Core/Domain/Alias/Command/DeleteAliasCommand.php          | 4 ++--
 src/Core/Domain/Alias/Command/UpdateAliasStatusCommand.php    | 4 ++--
 .../Behaviour/Features/Context/Domain/AliasFeatureContext.php | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Core/Domain/Alias/Command/DeleteAliasCommand.php b/src/Core/Domain/Alias/Command/DeleteAliasCommand.php
index 5bedb18e9c030..0c1e15ddb312f 100644
--- a/src/Core/Domain/Alias/Command/DeleteAliasCommand.php
+++ b/src/Core/Domain/Alias/Command/DeleteAliasCommand.php
@@ -37,9 +37,9 @@ class DeleteAliasCommand
 {
     private AliasId $aliasId;
 
-    public function __construct(AliasId $aliasId)
+    public function __construct(int $aliasId)
     {
-        $this->aliasId = $aliasId;
+        $this->aliasId = new AliasId($aliasId);
     }
 
     /**
diff --git a/src/Core/Domain/Alias/Command/UpdateAliasStatusCommand.php b/src/Core/Domain/Alias/Command/UpdateAliasStatusCommand.php
index 2d999520798fa..dee06ebea315b 100644
--- a/src/Core/Domain/Alias/Command/UpdateAliasStatusCommand.php
+++ b/src/Core/Domain/Alias/Command/UpdateAliasStatusCommand.php
@@ -44,10 +44,10 @@ class UpdateAliasStatusCommand
      * @param bool $enabled
      */
     public function __construct(
-        AliasId $aliasId,
+        int$aliasId,
         bool $enabled
     ) {
-        $this->aliasId = $aliasId;
+        $this->aliasId = new AliasId($aliasId);
         $this->enabled = $enabled;
     }
 
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
index 6f6d3babd5788..d777385ef2c9c 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
@@ -108,7 +108,7 @@ public function assertAliasesList(TableNode $table): void
     public function updateAliasStatus(bool $enable, string $aliasReference): void
     {
         $this->getCommandBus()->handle(new UpdateAliasStatusCommand(
-            new AliasId((int) $this->getSharedStorage()->get($aliasReference)),
+            (int) $this->getSharedStorage()->get($aliasReference),
             $enable
         ));
     }
@@ -166,7 +166,7 @@ public function deleteAlias(string $reference): void
         $aliasId = $this->getSharedStorage()->get($reference);
 
         try {
-            $this->getCommandBus()->handle(new DeleteAliasCommand(new AliasId((int) $aliasId)));
+            $this->getCommandBus()->handle(new DeleteAliasCommand((int) $aliasId));
         } catch (AliasException $e) {
             $this->setLastException($e);
         }

From 000d4538f8cad7f21796f4f2b4c4275ca9d8fd84 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Thu, 29 Jun 2023 09:20:54 +0300
Subject: [PATCH 0406/1030] csfixer fixes

---
 src/Core/Domain/Alias/Command/UpdateAliasStatusCommand.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Core/Domain/Alias/Command/UpdateAliasStatusCommand.php b/src/Core/Domain/Alias/Command/UpdateAliasStatusCommand.php
index dee06ebea315b..db271c9249804 100644
--- a/src/Core/Domain/Alias/Command/UpdateAliasStatusCommand.php
+++ b/src/Core/Domain/Alias/Command/UpdateAliasStatusCommand.php
@@ -44,7 +44,7 @@ class UpdateAliasStatusCommand
      * @param bool $enabled
      */
     public function __construct(
-        int$aliasId,
+        int $aliasId,
         bool $enabled
     ) {
         $this->aliasId = new AliasId($aliasId);

From b1b4437acc6056a9f77564ad11a67cc5c28d0fda Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Thu, 29 Jun 2023 09:25:13 +0300
Subject: [PATCH 0407/1030] documment alias command

---
 src/Core/Domain/Alias/Command/UpdateAliasCommand.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Core/Domain/Alias/Command/UpdateAliasCommand.php b/src/Core/Domain/Alias/Command/UpdateAliasCommand.php
index 3bb2e8e753784..01b8d69bb23c3 100644
--- a/src/Core/Domain/Alias/Command/UpdateAliasCommand.php
+++ b/src/Core/Domain/Alias/Command/UpdateAliasCommand.php
@@ -46,7 +46,7 @@ class UpdateAliasCommand
 
     /**
      * @param int $aliasId
-     * @param string[] $aliases
+     * @param string[] $aliases this input is array of string aliases that are returned from the form input
      * @param string $searchTerm
      */
     public function __construct(
@@ -68,7 +68,9 @@ public function getAliasId(): AliasId
     }
 
     /**
-     * @return array
+     * Returns array of string aliases that are used in the alias form input.
+     *
+     * @return string[]
      */
     public function getAliases(): array
     {

From ad7f4c905c6e1d6d222e39e9b15f673171f75241 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Mon, 3 Jul 2023 11:13:49 +0300
Subject: [PATCH 0408/1030] fix typehint type

---
 src/Core/Domain/Alias/Command/UpdateAliasStatusCommand.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Core/Domain/Alias/Command/UpdateAliasStatusCommand.php b/src/Core/Domain/Alias/Command/UpdateAliasStatusCommand.php
index db271c9249804..511672f67408a 100644
--- a/src/Core/Domain/Alias/Command/UpdateAliasStatusCommand.php
+++ b/src/Core/Domain/Alias/Command/UpdateAliasStatusCommand.php
@@ -40,7 +40,7 @@ class UpdateAliasStatusCommand
     private bool $enabled;
 
     /**
-     * @param AliasId $aliasId
+     * @param int $aliasId
      * @param bool $enabled
      */
     public function __construct(

From 3aa9e5e26a2c5c0799d7764f05ad0c5af5b9c8c3 Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Tue, 4 Jul 2023 12:01:34 +0300
Subject: [PATCH 0409/1030] remove casting

---
 .../Features/Context/Domain/AliasFeatureContext.php         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
index d777385ef2c9c..133d211b36061 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
@@ -108,7 +108,7 @@ public function assertAliasesList(TableNode $table): void
     public function updateAliasStatus(bool $enable, string $aliasReference): void
     {
         $this->getCommandBus()->handle(new UpdateAliasStatusCommand(
-            (int) $this->getSharedStorage()->get($aliasReference),
+            $this->getSharedStorage()->get($aliasReference),
             $enable
         ));
     }
@@ -162,11 +162,11 @@ public function assertUpdateAlias(string $aliasReference, TableNode $table): voi
      */
     public function deleteAlias(string $reference): void
     {
-        /** @var string[] $aliasId */
+        /** @var int $aliasId */
         $aliasId = $this->getSharedStorage()->get($reference);
 
         try {
-            $this->getCommandBus()->handle(new DeleteAliasCommand((int) $aliasId));
+            $this->getCommandBus()->handle(new DeleteAliasCommand(($aliasId)));
         } catch (AliasException $e) {
             $this->setLastException($e);
         }

From baaac8171029279c833689d1dbf053b469d24dbb Mon Sep 17 00:00:00 2001
From: Darius Aleksiunas <darius.aleksiunas@invertus.eu>
Date: Tue, 4 Jul 2023 12:52:38 +0300
Subject: [PATCH 0410/1030] csfixer fixes

---
 .../Behaviour/Features/Context/Domain/AliasFeatureContext.php    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
index 133d211b36061..11f4ab7255adf 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AliasFeatureContext.php
@@ -38,7 +38,6 @@
 use PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\AliasException;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Query\SearchForSearchTerm;
-use PrestaShop\PrestaShop\Core\Domain\Alias\ValueObject\AliasId;
 use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
 use PrestaShop\PrestaShop\Core\Grid\Query\AliasQueryBuilder;
 use PrestaShop\PrestaShop\Core\Search\Filters;

From af3138bbe64961238c75b3b2e5268164fc3cc670 Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Tue, 4 Jul 2023 12:40:23 +0200
Subject: [PATCH 0411/1030] Fix CI

---
 config/smartyadmin.config.inc.php                           | 6 +-----
 src/Adapter/Module/ModuleDataProvider.php                   | 2 +-
 .../Controller/Admin/Improve/ModuleController.php           | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/config/smartyadmin.config.inc.php b/config/smartyadmin.config.inc.php
index 68e2ac0426113..90f8f25a41856 100644
--- a/config/smartyadmin.config.inc.php
+++ b/config/smartyadmin.config.inc.php
@@ -77,10 +77,6 @@ function smartyTranslate($params, $smarty)
         $sprintf = $params['sprintf'];
     }
 
-    if (($htmlEntities || $addSlashes)) {
-        $sprintf['legacy'] = $htmlEntities ? 'htmlspecialchars': 'addslashes';
-    }
-
     if ($isInPDF && empty($params['d'])) {
         return Translate::postProcessTranslation(
             Translate::getPdfTranslation(
@@ -93,7 +89,7 @@ function smartyTranslate($params, $smarty)
 
     // If the template is part of a module
     if ($isInModule && empty($params['d'])) {
-        return Translate::smartyPostProcessTranslation(
+        return Translate::postProcessTranslation(
             Translate::getModuleTranslation(
                 $params['mod'],
                 $params['s'],
diff --git a/src/Adapter/Module/ModuleDataProvider.php b/src/Adapter/Module/ModuleDataProvider.php
index 2e2c7d2b0f043..8113787e820b3 100755
--- a/src/Adapter/Module/ModuleDataProvider.php
+++ b/src/Adapter/Module/ModuleDataProvider.php
@@ -344,7 +344,7 @@ public function isOnDisk($name)
      */
     private function isModuleActive(int $id, array $id_shops): bool
     {
-        $result = Db::getInstance()->getRow('SELECT m.`active`, ms.`id_module` as `shop_active`, ms.`enable_device` as `enable_device`
+        $result = Db::getInstance()->getRow('SELECT m.`active`, ms.`id_module` as `shop_active`
             FROM `' . _DB_PREFIX_ . 'module` m
             LEFT JOIN `' . _DB_PREFIX_ . 'module_shop` ms ON m.`id_module` = ms.`id_module`
             WHERE m.`id_module` = ' . $id . '
diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/ModuleController.php b/src/PrestaShopBundle/Controller/Admin/Improve/ModuleController.php
index e1e760c99a539..d2eaba31d6aea 100644
--- a/src/PrestaShopBundle/Controller/Admin/Improve/ModuleController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Improve/ModuleController.php
@@ -217,7 +217,7 @@ public function moduleAction(Request $request)
                 $args[] = $source;
             }
             if ($action === ModuleAdapter::ACTION_UNINSTALL) {
-                $args[] = (bool) ($request->request->all('actionParams', [])['deletion'] ?? false);
+                $args[] = (bool) ($request->request->all('actionParams')['deletion'] ?? false);
                 $moduleInstance = $moduleRepository->getModule($moduleName);
                 $response[$moduleName]['refresh_needed'] = $this->moduleNeedsReload($moduleInstance);
                 $response[$moduleName]['has_download_url'] = $moduleInstance->attributes->has('download_url');

From a0db86a2547f2c10b059efb91512f3361ba55bbf Mon Sep 17 00:00:00 2001
From: lartist <salim-benouamer.ext@prestashop.com>
Date: Tue, 4 Jul 2023 13:09:27 +0200
Subject: [PATCH 0412/1030] Add using of twig component

---
 app/AppKernel.php                             |  1 +
 composer.json                                 |  1 +
 composer.lock                                 | 82 ++++++++++++++++++-
 .../Component/Layout/quick_access.html.twig   | 82 +++++++++++++++++++
 .../views/Admin/Layout/quick_access.html.twig | 65 ++-------------
 .../Twig/Component/QuickAccess.php            | 17 ++++
 6 files changed, 188 insertions(+), 60 deletions(-)
 create mode 100644 src/PrestaShopBundle/Resources/views/Admin/Component/Layout/quick_access.html.twig
 create mode 100644 src/PrestaShopBundle/Twig/Component/QuickAccess.php

diff --git a/app/AppKernel.php b/app/AppKernel.php
index aef56f5295062..e5d34e85e5d4b 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -67,6 +67,7 @@ public function registerBundles()
             new TranslationToolsBundle(),
             new League\Tactician\Bundle\TacticianBundle(),
             new FOS\JsRoutingBundle\FOSJsRoutingBundle(),
+            new Symfony\UX\TwigComponent\TwigComponentBundle(),
         );
 
         if (in_array($this->getEnvironment(), array('dev', 'test'), true)) {
diff --git a/composer.json b/composer.json
index 258d9e41ccfc2..58bcb523f5809 100644
--- a/composer.json
+++ b/composer.json
@@ -172,6 +172,7 @@
         "symfony/templating": "5.4.*",
         "symfony/translation": "5.4.*",
         "symfony/twig-bundle": "5.4.*",
+        "symfony/ux-twig-component": "^2.9",
         "symfony/validator": "5.4.*",
         "symfony/var-dumper": "5.4.*",
         "symfony/var-exporter": "5.4.*",
diff --git a/composer.lock b/composer.lock
index 49363a778322b..3491a767e15a5 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "c5cb176c44556351608b37f0799f06a8",
+    "content-hash": "eba26e72868f460f7c14539a77abb19a",
     "packages": [
         {
             "name": "api-platform/core",
@@ -14091,6 +14091,86 @@
             ],
             "time": "2023-02-14T08:03:56+00:00"
         },
+        {
+            "name": "symfony/ux-twig-component",
+            "version": "v2.9.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/ux-twig-component.git",
+                "reference": "4d664e8dd058b4ebc6ae329d89a1aa8348ef06d0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/ux-twig-component/zipball/4d664e8dd058b4ebc6ae329d89a1aa8348ef06d0",
+                "reference": "4d664e8dd058b4ebc6ae329d89a1aa8348ef06d0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.0",
+                "symfony/dependency-injection": "^5.4|^6.0",
+                "symfony/deprecation-contracts": "^2.2|^3.0",
+                "symfony/event-dispatcher": "^5.4|^6.0",
+                "symfony/property-access": "^5.4|^6.0",
+                "twig/twig": "^2.0|^3.0"
+            },
+            "conflict": {
+                "symfony/config": "<5.4.0"
+            },
+            "require-dev": {
+                "symfony/framework-bundle": "^5.4|^6.0",
+                "symfony/phpunit-bridge": "^6.0",
+                "symfony/stimulus-bundle": "^2.9.1",
+                "symfony/twig-bundle": "^5.4|^6.0",
+                "symfony/webpack-encore-bundle": "^1.15"
+            },
+            "type": "symfony-bundle",
+            "extra": {
+                "thanks": {
+                    "name": "symfony/ux",
+                    "url": "https://github.com/symfony/ux"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\UX\\TwigComponent\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Twig components for Symfony",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "components",
+                "symfony-ux",
+                "twig"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/ux-twig-component/tree/v2.9.1"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-05-30T16:00:59+00:00"
+        },
         {
             "name": "symfony/validator",
             "version": "v5.4.23",
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/quick_access.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/quick_access.html.twig
new file mode 100644
index 0000000000000..da30ba645305d
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/quick_access.html.twig
@@ -0,0 +1,82 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+<div class="dropdown quick-accesses">
+  <button class="btn btn-link btn-sm dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" id="quick_select">
+    {{ 'Quick Access'|trans({}, 'Admin.Navigation.Header') }}
+  </button>
+  <div class="dropdown-menu">
+    {% for quick in quickAccess %}
+      <a class="
+        dropdown-item quick-row-link
+        {% if quick.class is defined %}{{ quick.class}}{% endif %}
+        {% if link.matchQuickLink(quick.link) %}
+          {% set matchQuickLink = quick.id_quick_access %}
+          active
+        {% endif %}
+      "
+      href="{{ quick.link|escape('html') }}"
+      {% if quick.new_window %} target="_blank"{% endif %}
+      data-item="{{ quick.name }}"
+      >{{ quick.name }}</a>
+    {% endfor %}
+    <div class="dropdown-divider"></div>
+    {% if matchQuickLink is defined %}
+      <a id="quick-remove-link"
+         class="dropdown-item js-quick-link"
+         href="#"
+         data-method="remove"
+         data-quicklink-id="{{ matchQuickLink }}"
+         data-rand="{{ random(1, 200) }}"
+         data-icon="{{ quickAccessCurrentLinkIcon }}"
+         data-url="{{ link.getQuickLink(app.request.uri|escape('js')) }}"
+         data-post-link="{{ link.getAdminLink('AdminQuickAccesses') }}"
+         data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header')|escape('js') }}"
+         data-link="{{ quickAccessCurrentLinkName|truncate(32) }}"
+      >
+        <i class="material-icons">remove_circle_outline</i>
+        {{ 'Remove from Quick Access'|trans({}, 'Admin.Navigation.Header') }}
+      </a>
+    {% else %}
+    <a id="quick-add-link"
+       class="dropdown-item js-quick-link"
+       href="#"
+       data-rand="{{ random(1, 200) }}"
+       data-icon="{{ quickAccessCurrentLinkIcon }}"
+       data-method="add"
+       data-url="{{ link.getQuickLink(app.request.uri|escape('js')) }}"
+       data-post-link="{{ link.getAdminLink('AdminQuickAccesses') }}"
+       data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header')|escape('js')}}"
+       data-link="{{ quickAccessCurrentLinkName|truncate(32) }}"
+    >
+      <i class="material-icons">add_circle</i>
+      {{ 'Add current page to Quick Access'|trans({}, 'Admin.Actions') }}
+    </a>
+    {% endif %}
+    <a id="quick-manage-link" class="dropdown-item" href="{{ link.getAdminLink("AdminQuickAccesses")|addslashes }}">
+    <i class="material-icons">settings</i>
+    {{ 'Manage your quick accesses'|trans({}, 'Admin.Navigation.Header') }}
+    </a>
+  </div>
+</div>
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/quick_access.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/quick_access.html.twig
index 39a28afe3f90e..2545af77b877e 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Layout/quick_access.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/quick_access.html.twig
@@ -22,62 +22,9 @@
  * @copyright Since 2007 PrestaShop SA and Contributors
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  *#}
-
-<div class="dropdown quick-accesses">
-  <button class="btn btn-link btn-sm dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" id="quick_select">
-    {{ 'Quick Access'|trans({}, 'Admin.Navigation.Header') }}
-  </button>
-  <div class="dropdown-menu">
-    {% for quick in quick_access %}
-      <a class="
-        dropdown-item quick-row-link
-        {% if quick.class is defined %}{{ quick.class}}{% endif %}
-        {% if link.matchQuickLink(quick.link) %}
-          {% set matchQuickLink = quick.id_quick_access %}
-          active
-        {% endif %}
-      "
-      href="{{ quick.link|escape('html') }}"
-      {% if quick.new_window %} target="_blank"{% endif %}
-      data-item="{{ quick.name }}"
-      >{{ quick.name }}</a>
-    {% endfor %}
-    <div class="dropdown-divider"></div>
-    {% if matchQuickLink is defined %}
-      <a id="quick-remove-link"
-         class="dropdown-item js-quick-link"
-         href="#"
-         data-method="remove"
-         data-quicklink-id="{{ matchQuickLink }}"
-         data-rand="{{ random(1, 200) }}"
-         data-icon="{{ quick_access_current_link_icon }}"
-         data-url="{{ link.getQuickLink(app.request.uri|escape('js')) }}"
-         data-post-link="{{ link.getAdminLink('AdminQuickAccesses') }}"
-         data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header')|escape('js') }}"
-         data-link="{{ quick_access_current_link_name|truncate(32) }}"
-      >
-        <i class="material-icons">remove_circle_outline</i>
-        {{ 'Remove from Quick Access'|trans({}, 'Admin.Navigation.Header') }}
-      </a>
-    {% else %}
-    <a id="quick-add-link"
-       class="dropdown-item js-quick-link"
-       href="#"
-       data-rand="{{ random(1, 200) }}"
-       data-icon="{{ quick_access_current_link_icon }}"
-       data-method="add"
-       data-url="{{ link.getQuickLink(app.request.uri|escape('js')) }}"
-       data-post-link="{{ link.getAdminLink('AdminQuickAccesses') }}"
-       data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header')|escape('js')}}"
-       data-link="{{ quick_access_current_link_name|truncate(32) }}"
-    >
-      <i class="material-icons">add_circle</i>
-      {{ 'Add current page to Quick Access'|trans({}, 'Admin.Actions') }}
-    </a>
-    {% endif %}
-    <a id="quick-manage-link" class="dropdown-item" href="{{ link.getAdminLink("AdminQuickAccesses")|addslashes }}">
-    <i class="material-icons">settings</i>
-    {{ 'Manage your quick accesses'|trans({}, 'Admin.Navigation.Header') }}
-    </a>
-  </div>
-</div>
+{{ component('QuickAccess', {
+  quickAccess: quick_access,
+  link: link,
+  quickAccessCurrentLinkIcon: quick_access_current_link_icon,
+  quickAccessCurrentLinkName: quick_access_current_link_name
+}) }}
diff --git a/src/PrestaShopBundle/Twig/Component/QuickAccess.php b/src/PrestaShopBundle/Twig/Component/QuickAccess.php
new file mode 100644
index 0000000000000..3d18272ac1c8b
--- /dev/null
+++ b/src/PrestaShopBundle/Twig/Component/QuickAccess.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\Twig\Component;
+
+use Link;
+use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
+
+#[AsTwigComponent(template: '@PrestaShop/Admin/Component/Layout/quick_access.html.twig')]
+class QuickAccess
+{
+    public array $quickAccess;
+    public Link $link;
+    public string $quickAccessCurrentLinkIcon;
+    public string $quickAccessCurrentLinkName;
+}

From 761702d9fe6de2e4c40cbf4e460c1659d3f9f799 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Tue, 27 Jun 2023 14:41:07 +0300
Subject: [PATCH 0413/1030]  setcountryRestrictions repository method

---
 .../Repository/CartRuleRepository.php         | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/src/Adapter/CartRule/Repository/CartRuleRepository.php b/src/Adapter/CartRule/Repository/CartRuleRepository.php
index f90e1ad05dd99..9cb349f2782d9 100644
--- a/src/Adapter/CartRule/Repository/CartRuleRepository.php
+++ b/src/Adapter/CartRule/Repository/CartRuleRepository.php
@@ -38,6 +38,7 @@
 use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\CartRuleId;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\Restriction\RestrictionRule;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\Restriction\RestrictionRuleGroup;
+use PrestaShop\PrestaShop\Core\Domain\Country\ValueObject\CountryId;
 use PrestaShop\PrestaShop\Core\Repository\AbstractObjectModelRepository;
 
 class CartRuleRepository extends AbstractObjectModelRepository
@@ -363,6 +364,40 @@ public function setCarrierRestrictions(CartRuleId $cartRuleId, array $restricted
             )
         );
     }
+    /**
+     * @param CartRuleId $cartRuleId
+     * @param CountryId[] $restrictedCountryIds
+     *
+     * @return void
+     */
+    public function setCountryRestrictions(CartRuleId $cartRuleId, array $restrictedCountryIds): void
+    {
+        $this->removeCountryRestrictions($cartRuleId);
+
+        if (empty($restrictedCountryIds)) {
+            return;
+        }
+
+        $checkedIds = [];
+        $insertValues = [];
+        foreach ($restrictedCountryIds as $restrictedCountryId) {
+            $restrictedCountryIdValue = $restrictedCountryId->getValue();
+            // skip duplicate ids if for some reason they exist
+            if (in_array($restrictedCountryIdValue, $checkedIds, true)) {
+                continue;
+            }
+            $insertValues[] = sprintf('(%d,%d)', $cartRuleId->getValue(), $restrictedCountryIdValue);
+            $checkedIds[] = $restrictedCountryIdValue;
+        }
+
+        $this->connection->executeStatement(
+            sprintf(
+                'INSERT INTO %s (`id_cart_rule`, `id_country`) VALUES %s',
+                $this->dbPrefix . 'cart_rule_country',
+                implode(',', $insertValues)
+            )
+        );
+    }
 
     /**
      * @param CartRuleId $cartRuleId
@@ -395,6 +430,15 @@ private function removeCarrierRestrictions(CartRuleId $cartRuleId): void
         $this->connection->createQueryBuilder()
             ->delete($this->dbPrefix . 'cart_rule_carrier', 'crc')
             ->where('crc.id_cart_rule = :cartRuleId')
+            ->setParameter('cartRuleId', $cartRuleId->getValue()
+        );
+    }
+
+    private function removeCountryRestrictions(CartRuleId $cartRuleId): void
+    {
+        $this->connection->createQueryBuilder()
+            ->delete($this->dbPrefix . 'cart_rule_country', 'crc')
+            ->where('crc.id_cart_rule = :cartRuleId')
             ->setParameter('cartRuleId', $cartRuleId->getValue())
             ->execute()
         ;

From bd2e6a86f3b7fa43ed2725b51f430013581b165e Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Tue, 27 Jun 2023 14:54:18 +0300
Subject: [PATCH 0414/1030]  set country restrictions in handler

---
 .../SetCartRuleRestrictionsHandler.php        | 21 ++++++++++++++++-
 .../SetCartRuleRestrictionsCommand.php        | 23 +++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php b/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php
index 1f36ba15c656f..143545a6f8424 100644
--- a/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php
+++ b/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php
@@ -34,6 +34,7 @@
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\SetCartRuleRestrictionsCommand;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\CommandHandler\SetCartRuleRestrictionsHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\CartRuleId;
+use PrestaShop\PrestaShop\Core\Domain\Country\ValueObject\CountryId;
 
 class SetCartRuleRestrictionsHandler implements SetCartRuleRestrictionsHandlerInterface
 {
@@ -66,6 +67,10 @@ public function handle(SetCartRuleRestrictionsCommand $command): void
         if (null !== $restrictedCarrierIds) {
             $this->setCarrierRestrictions($cartRule, $restrictedCarrierIds);
         }
+        $restrictedCountryIds = $command->getRestrictedCountryIds();
+        if (null !== $restrictedCountryIds) {
+            $this->setCountryRestrictions($cartRule, $restrictedCountryIds);
+        }
         // it would be more performant updating all restriction props at the end with one update call,
         // but that way we might introduce cart rule state failure in case one of steps fails somewhere in the middle
     }
@@ -104,9 +109,23 @@ private function setProductRestrictions(CartRule $cartRule, array $restrictionRu
      */
     private function setCarrierRestrictions(CartRule $cartRule, array $restrictedCarrierIds): void
     {
-        $this->cartRuleRepository->setCarrierRestrictions(new CartRuleId((int) $cartRule->id), $restrictedCarrierIds);
+        $this->cartRuleRepository->setCarrierRestrictions(new CartRuleId((int)$cartRule->id), $restrictedCarrierIds);
 
         $cartRule->carrier_restriction = !empty($restrictedCarrierIds);
         $this->cartRuleRepository->partialUpdate($cartRule, ['carrier_restriction']);
     }
+
+    /**
+     * @param CartRule $cartRule
+     * @param CountryId[] $restrictedCountryIds
+     *
+     * @return void
+     */
+    private function setCountryRestrictions(CartRule $cartRule, array $restrictedCountryIds): void
+    {
+        $this->cartRuleRepository->setCountryRestrictions(new CartRuleId((int) $cartRule->id), $restrictedCountryIds);
+
+        $cartRule->country_restriction = !empty($restrictedCountryIds);
+        $this->cartRuleRepository->partialUpdate($cartRule, ['country_restriction']);
+    }
 }
diff --git a/src/Core/Domain/CartRule/Command/SetCartRuleRestrictionsCommand.php b/src/Core/Domain/CartRule/Command/SetCartRuleRestrictionsCommand.php
index 0dedbbe3e3998..237fe26146d5a 100644
--- a/src/Core/Domain/CartRule/Command/SetCartRuleRestrictionsCommand.php
+++ b/src/Core/Domain/CartRule/Command/SetCartRuleRestrictionsCommand.php
@@ -32,6 +32,7 @@
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleConstraintException;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\CartRuleId;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\Restriction\RestrictionRuleGroup;
+use PrestaShop\PrestaShop\Core\Domain\Country\ValueObject\CountryId;
 
 /**
  * Sets cart rule restrictions.
@@ -56,6 +57,11 @@ class SetCartRuleRestrictionsCommand
      */
     private ?array $restrictedCarrierIds = null;
 
+    /**
+     * @var CountryId[]|null
+     */
+    private ?array $restrictedCountryIds = null;
+
     /**
      * @param int $cartRuleId
      */
@@ -74,6 +80,15 @@ public function setRestrictedCarrierIds(array $restrictedCarrierIds): self
         return $this;
     }
 
+    public function setRestrictedCountryIds(array $restrictedCountryIds): self
+    {
+        $this->restrictedCountryIds = array_map(static function ($countryId): CountryId {
+            return new CountryId($countryId);
+        }, $restrictedCountryIds);
+
+        return $this;
+    }
+
     /**
      * @return CarrierId[]|null
      */
@@ -82,6 +97,14 @@ public function getRestrictedCarrierIds(): ?array
         return $this->restrictedCarrierIds;
     }
 
+    /**
+     * @return CountryId[]|null
+     */
+    public function getRestrictedCountryIds(): ?array
+    {
+        return $this->restrictedCountryIds;
+    }
+
     /**
      * @return CartRuleId
      */

From 1a8e2f30645bc7fe9dd7eaf326b8f77aa3790817 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Tue, 27 Jun 2023 15:21:26 +0300
Subject: [PATCH 0415/1030]  get country restrictions

---
 .../GetCartRuleForEditingHandler.php          |  7 ++++-
 .../Repository/CartRuleRepository.php         | 26 +++++++++++++++++++
 .../CartRuleRestrictionsForEditing.php        |  3 ++-
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php b/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php
index baa9ea9608ce8..ba04b0c5e0124 100644
--- a/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php
+++ b/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php
@@ -128,11 +128,16 @@ private function getCartRuleConditions(CartRule $cartRule): CartRuleConditionsFo
         if ($cartRule->carrier_restriction) {
             $restrictedCarrierIds = $this->cartRuleRepository->getRestrictedCarrierIds($cartRuleId);
         }
+        $restrictedCountryIds = [];
+        if ($cartRule->country_restriction) {
+            $restrictedCountryIds = $this->cartRuleRepository->getRestrictedCountryIds($cartRuleId);
+        }
 
         $cartRuleRestrictions = new CartRuleRestrictionsForEditing(
             $restrictedCartRules,
             $this->getRestrictionRuleGroups($cartRule),
-            $restrictedCarrierIds
+            $restrictedCarrierIds,
+            $restrictedCountryIds
         );
 
         return new CartRuleConditionsForEditing(
diff --git a/src/Adapter/CartRule/Repository/CartRuleRepository.php b/src/Adapter/CartRule/Repository/CartRuleRepository.php
index 9cb349f2782d9..e532b015b3432 100644
--- a/src/Adapter/CartRule/Repository/CartRuleRepository.php
+++ b/src/Adapter/CartRule/Repository/CartRuleRepository.php
@@ -425,6 +425,32 @@ public function getRestrictedCarrierIds(CartRuleId $cartRuleId): array
         }, $results);
     }
 
+    /**
+     * @param CartRuleId $cartRuleId
+     *
+     * @return CountryId[]
+     */
+    public function getRestrictedCountryIds(CartRuleId $cartRuleId): array
+    {
+        $cartRuleIdValue = $cartRuleId->getValue();
+        $results = $this->connection->createQueryBuilder()
+            ->select('crc.id_country')
+            ->from($this->dbPrefix . 'cart_rule_country', 'crc')
+            ->where('crc.id_cart_rule_1 = :cartRuleId')
+            ->setParameter('cartRuleId', $cartRuleIdValue)
+            ->execute()
+            ->fetchAllAssociative()
+        ;
+
+        if (empty($results)) {
+            return [];
+        }
+
+        return array_map(static function (array $result): CountryId {
+            return new CountryId((int) $result['id_country']);
+        }, $results);
+    }
+
     private function removeCarrierRestrictions(CartRuleId $cartRuleId): void
     {
         $this->connection->createQueryBuilder()
diff --git a/src/Core/Domain/CartRule/QueryResult/CartRuleRestrictionsForEditing.php b/src/Core/Domain/CartRule/QueryResult/CartRuleRestrictionsForEditing.php
index 26971e4a01ccc..8f9b63999bf0b 100644
--- a/src/Core/Domain/CartRule/QueryResult/CartRuleRestrictionsForEditing.php
+++ b/src/Core/Domain/CartRule/QueryResult/CartRuleRestrictionsForEditing.php
@@ -57,7 +57,8 @@ class CartRuleRestrictionsForEditing
     public function __construct(
         array $restrictedCartRuleIds,
         array $productRestrictionRuleGroups,
-        array $restrictedCarrierIds
+        array $restrictedCarrierIds,
+        public readonly array $restrictedCountryIds
     ) {
         $this->restrictedCartRuleIds = $restrictedCartRuleIds;
         $this->productRestrictionRuleGroups = $productRestrictionRuleGroups;

From 7e97012b86eff1ffb04ef680fce8c12f9a90637d Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Tue, 27 Jun 2023 15:46:34 +0300
Subject: [PATCH 0416/1030]  add basic behat scenarios, not yet working due to
 another blocking PR

---
 .../AbstractCartRuleFeatureContext.php        |  8 ++
 .../CartRule/set_country_restrictions.feature | 80 +++++++++++++++++++
 2 files changed, 88 insertions(+)
 create mode 100644 tests/Integration/Behaviour/Features/Scenario/CartRule/set_country_restrictions.feature

diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
index f2a15546f008c..2f70a63b72095 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
@@ -301,6 +301,14 @@ protected function assertCartRuleProperties(CartRuleForEditing $cartRuleForEditi
                 'Unexpected restricted carriers'
             );
         }
+
+        if (isset($expectedData['restricted countries'])) {
+            Assert::assertSame(
+                $this->referencesToIds($expectedData['restricted countries']),
+                $conditions->getRestrictions()->restrictedCountryIds,
+                'Unexpected restricted countries'
+            );
+        }
     }
 
     protected function getCartRuleActionBuilder(): CartRuleActionBuilder
diff --git a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_country_restrictions.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_country_restrictions.feature
new file mode 100644
index 0000000000000..3ecc201bfbfa1
--- /dev/null
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_country_restrictions.feature
@@ -0,0 +1,80 @@
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart_rule --tags set-country-restrictions
+@restore-all-tables-before-feature
+@set-product-restrictions
+Feature: Set cart rule country restrictions in BO
+  PrestaShop allows BO users to add and remove country restrictions of cart rule,
+  which defines whether or not the cart rule should be applicable in a specific country
+
+  Background:
+    Given shop "shop1" with name "test_shop" exists
+    And there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
+    And there is a currency named "chf" with iso code "CHF" and exchange rate of 1.25
+    And currency "usd" is the default one
+    And language "language1" with locale "en-US" exists
+    And language with iso code "en" is the default one
+    And there is a zone named "Europe"
+    And there is a zone named "America"
+    And there is a country named "France" and iso code "FR" in zone "Europe"
+    And there is a country named "United_states" and iso code "US" in zone "America"
+    And I add product "product1" with following information:
+      | name[en-US] | bottle of beer |
+      | type        | virtual        |
+    And I add product "product2" with following information:
+      | name[en-US] | T-shirt nr1 |
+      | type        | standard    |
+    And I add product "product3" with following information:
+      | name[en-US] | Shirt - Dom & Jquery |
+      | type        | standard             |
+    And there is a cart rule "rule_free_shipping_1" with following properties:
+      | name[en-US]          | free shipping 1      |
+      | is_active            | true                 |
+      | allow_partial_use    | false                |
+      | priority             | 1                    |
+      | valid_from           | 2022-01-01 11:00:00  |
+      | valid_to             | 3001-01-01 12:00:00  |
+      | total_quantity       | 10                   |
+      | quantity_per_user    | 10                   |
+      | free_shipping        | true                 |
+      | code                 | rule_free_shipping_1 |
+      | restricted countries |                      |
+    And there is a cart rule "rule_50_percent" with following properties:
+      | name[en-US]                  | Half the price         |
+      | is_active                    | true                   |
+      | allow_partial_use            | true                   |
+      | priority                     | 2                      |
+      | valid_from                   | 2022-01-01 11:00:00    |
+      | valid_to                     | 3001-01-01 12:00:00    |
+      | total_quantity               | 10                     |
+      | quantity_per_user            | 12                     |
+      | free_shipping                | false                  |
+      | code                         | rule_50_percent        |
+      | discount_percentage          | 50                     |
+      | apply_to_discounted_products | false                  |
+      | discount_application_type    | order_without_shipping |
+      | restricted countries         |                        |
+
+  Scenario: Restrict cart rule countries and clear the restrictions
+    #@todo: most of steps are not implemented yet and blocked by PR #32556
+    When I restrict following countries for cart rule rule_free_shipping_1:
+      | France        |
+      | United_states |
+    And I save all the restrictions for cart rule rule_free_shipping_1
+    And I restrict following countries for cart rule rule_50_percent:
+      | France |
+    And I save all the restrictions for cart rule rule_50_percent
+    Then cart rule rule_free_shipping_1 should have the following properties:
+      | restricted countries | France,United_states |
+    And cart rule rule_50_percent should have the following properties:
+      | restricted countries | France |
+    When I restrict following countries for cart rule rule_free_shipping_1:
+      | United_states |
+    Then cart rule rule_free_shipping_1 should have the following properties:
+      | restricted countries | United_states |
+    And I save all the restrictions for cart rule rule_free_shipping_1
+    When I clear all country restrictions for cart rule rule_50_percent
+    Then cart rule rule_50_percent should have the following properties:
+      | restricted countries |  |
+    When I restrict following countries for cart rule rule_free_shipping_1:
+      |  |
+    Then cart rule rule_50_percent should have the following properties:
+      | restricted countries |  |

From 4dde173bed9e13097721fee4afa6e13ec0d546ff Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Wed, 28 Jun 2023 17:30:39 +0300
Subject: [PATCH 0417/1030]  fix promoted properties in command

---
 .../CartRuleRestrictionsForEditing.php          | 17 ++++++++++++++++-
 .../CartRule/AbstractCartRuleFeatureContext.php |  2 +-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/Core/Domain/CartRule/QueryResult/CartRuleRestrictionsForEditing.php b/src/Core/Domain/CartRule/QueryResult/CartRuleRestrictionsForEditing.php
index 8f9b63999bf0b..f2785cc5500eb 100644
--- a/src/Core/Domain/CartRule/QueryResult/CartRuleRestrictionsForEditing.php
+++ b/src/Core/Domain/CartRule/QueryResult/CartRuleRestrictionsForEditing.php
@@ -47,22 +47,29 @@ class CartRuleRestrictionsForEditing
      */
     private array $restrictedCarrierIds;
 
+    /**
+     * @var int[]
+     */
+    private array $restrictedCountryIds;
+
     /**
      * @todo: fill other restrictions when related commands are implemented
      *
      * @param int[] $restrictedCartRuleIds
      * @param RestrictionRuleGroup[] $productRestrictionRuleGroups
      * @param int[] $restrictedCarrierIds
+     * @param int[] $restrictedCountryIds
      */
     public function __construct(
         array $restrictedCartRuleIds,
         array $productRestrictionRuleGroups,
         array $restrictedCarrierIds,
-        public readonly array $restrictedCountryIds
+        array $restrictedCountryIds
     ) {
         $this->restrictedCartRuleIds = $restrictedCartRuleIds;
         $this->productRestrictionRuleGroups = $productRestrictionRuleGroups;
         $this->restrictedCarrierIds = $restrictedCarrierIds;
+        $this->restrictedCountryIds = $restrictedCountryIds;
     }
 
     /**
@@ -88,4 +95,12 @@ public function getRestrictedCarrierIds(): array
     {
         return $this->restrictedCarrierIds;
     }
+
+    /**
+     * @return int[]
+     */
+    public function getRestrictedCountryIds(): array
+    {
+        return $this->restrictedCountryIds;
+    }
 }
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
index 2f70a63b72095..431bab2c69106 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
@@ -305,7 +305,7 @@ protected function assertCartRuleProperties(CartRuleForEditing $cartRuleForEditi
         if (isset($expectedData['restricted countries'])) {
             Assert::assertSame(
                 $this->referencesToIds($expectedData['restricted countries']),
-                $conditions->getRestrictions()->restrictedCountryIds,
+                $conditions->getRestrictions()->getRestrictedCountryIds(),
                 'Unexpected restricted countries'
             );
         }

From 562e92439b58ef7e2b0825882f81fff5aeb43771 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Wed, 28 Jun 2023 18:06:06 +0300
Subject: [PATCH 0418/1030]  finish up behats and fix handler after rebase

---
 .../SetCartRuleRestrictionsHandler.php        |  1 +
 .../Repository/CartRuleRepository.php         |  8 +--
 .../SetCartRuleRestrictionsFeatureContext.php | 36 ++++++++++++
 .../CartRule/set_country_restrictions.feature | 57 ++++++++++++++-----
 .../set_mixed_cart_rule_restrictions.feature  | 17 ++++++
 tests/Integration/Behaviour/behat.yml         |  1 +
 6 files changed, 103 insertions(+), 17 deletions(-)

diff --git a/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php b/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php
index 143545a6f8424..10e49cf307d56 100644
--- a/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php
+++ b/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php
@@ -48,6 +48,7 @@ public function handle(SetCartRuleRestrictionsCommand $command): void
         if (null === $command->getRestrictedCartRuleIds()
             && null === $command->getProductRestrictionRuleGroups()
             && null === $command->getRestrictedCarrierIds()
+            && null === $command->getRestrictedCountryIds()
         ) {
             // no restrictions were modified
             return;
diff --git a/src/Adapter/CartRule/Repository/CartRuleRepository.php b/src/Adapter/CartRule/Repository/CartRuleRepository.php
index e532b015b3432..6c004af1a6cdb 100644
--- a/src/Adapter/CartRule/Repository/CartRuleRepository.php
+++ b/src/Adapter/CartRule/Repository/CartRuleRepository.php
@@ -428,7 +428,7 @@ public function getRestrictedCarrierIds(CartRuleId $cartRuleId): array
     /**
      * @param CartRuleId $cartRuleId
      *
-     * @return CountryId[]
+     * @return int[]
      */
     public function getRestrictedCountryIds(CartRuleId $cartRuleId): array
     {
@@ -436,7 +436,7 @@ public function getRestrictedCountryIds(CartRuleId $cartRuleId): array
         $results = $this->connection->createQueryBuilder()
             ->select('crc.id_country')
             ->from($this->dbPrefix . 'cart_rule_country', 'crc')
-            ->where('crc.id_cart_rule_1 = :cartRuleId')
+            ->where('crc.id_cart_rule = :cartRuleId')
             ->setParameter('cartRuleId', $cartRuleIdValue)
             ->execute()
             ->fetchAllAssociative()
@@ -446,8 +446,8 @@ public function getRestrictedCountryIds(CartRuleId $cartRuleId): array
             return [];
         }
 
-        return array_map(static function (array $result): CountryId {
-            return new CountryId((int) $result['id_country']);
+        return array_map(static function (array $result): int {
+            return (int) $result['id_country'];
         }, $results);
     }
 
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/SetCartRuleRestrictionsFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/SetCartRuleRestrictionsFeatureContext.php
index 98421665cb6fb..71a197c8c835d 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/SetCartRuleRestrictionsFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/SetCartRuleRestrictionsFeatureContext.php
@@ -93,6 +93,26 @@ public function setRestrictedCarriers(string $cartRuleReference, TableNode $tabl
         }
     }
 
+    /**
+     * @When I restrict following countries for cart rule :cartRuleReference:
+     *
+     * @param string $cartRuleReference
+     * @param TableNode $tableNode
+     *
+     * @return void
+     */
+    public function setRestrictedCountries(string $cartRuleReference, TableNode $tableNode): void
+    {
+        $command = $this->getRestrictionsCommand($cartRuleReference);
+
+        try {
+            $command->setRestrictedCountryIds($this->referencesToIds($tableNode->getRowsHash()['restricted countries']));
+            $this->restrictionCommandsByReference[$cartRuleReference] = $command;
+        } catch (CartRuleConstraintException $e) {
+            $this->setLastException($e);
+        }
+    }
+
     /**
      * @When I add a restriction for cart rule :cartRuleReference, which requires at least :quantity product(s) in cart matching one of these rules:
      * @When I add a restriction for cart rule :cartRuleReference, which requires any quantity of product(s) in cart matching one of these rules:
@@ -194,6 +214,21 @@ public function clearCartRuleCarrierRestrictions(string $cartRuleReference): voi
         $this->restrictionCommandsByReference[$cartRuleReference] = $command;
     }
 
+    /**
+     * @When I clear all country restrictions for cart rule :cartRuleReference
+     *
+     * @param string $cartRuleReference
+     *
+     * @return void
+     */
+    public function clearCartRuleCountryRestrictions(string $cartRuleReference): void
+    {
+        $command = $this->getRestrictionsCommand($cartRuleReference);
+        $command->setRestrictedCountryIds([]);
+
+        $this->restrictionCommandsByReference[$cartRuleReference] = $command;
+    }
+
     /**
      * @When I save all the restrictions for cart rule :cartRuleReference
      *
@@ -214,6 +249,7 @@ public function saveRestrictionRules(string $cartRuleReference): void
         if (null === $command->getRestrictedCartRuleIds()
             && null === $command->getProductRestrictionRuleGroups()
             && null === $command->getRestrictedCarrierIds()
+            && null === $command->getRestrictedCountryIds()
         ) {
             throw new RuntimeException(
                 sprintf(
diff --git a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_country_restrictions.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_country_restrictions.feature
index 3ecc201bfbfa1..79797cf4d372b 100644
--- a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_country_restrictions.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_country_restrictions.feature
@@ -1,6 +1,6 @@
 # ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart_rule --tags set-country-restrictions
 @restore-all-tables-before-feature
-@set-product-restrictions
+@set-country-restrictions
 Feature: Set cart rule country restrictions in BO
   PrestaShop allows BO users to add and remove country restrictions of cart rule,
   which defines whether or not the cart rule should be applicable in a specific country
@@ -12,10 +12,34 @@ Feature: Set cart rule country restrictions in BO
     And currency "usd" is the default one
     And language "language1" with locale "en-US" exists
     And language with iso code "en" is the default one
-    And there is a zone named "Europe"
-    And there is a zone named "America"
-    And there is a country named "France" and iso code "FR" in zone "Europe"
-    And there is a country named "United_states" and iso code "US" in zone "America"
+    When I add new country "France" with following properties:
+      | name[en-US]                | France          |
+      | iso_code                   | FR              |
+      | call_prefix                | 123             |
+      | default_currency           | 1               |
+      | zone                       | 1               |
+      | need_zip_code              | true            |
+      | zip_code_format            | 1 NL            |
+      | address_format             | not implemented |
+      | is_enabled                 | true            |
+      | contains_states            | false           |
+      | need_identification_number | false           |
+      | display_tax_label          | true            |
+      | shop_association           | 1               |
+    When I add new country "United_states" with following properties:
+      | name[en-US]                | United States   |
+      | iso_code                   | US              |
+      | call_prefix                | 1234            |
+      | default_currency           | 1               |
+      | zone                       | 2               |
+      | need_zip_code              | true            |
+      | zip_code_format            | 1 NL            |
+      | address_format             | not implemented |
+      | is_enabled                 | true            |
+      | contains_states            | false           |
+      | need_identification_number | false           |
+      | display_tax_label          | true            |
+      | shop_association           | 1               |
     And I add product "product1" with following information:
       | name[en-US] | bottle of beer |
       | type        | virtual        |
@@ -52,29 +76,36 @@ Feature: Set cart rule country restrictions in BO
       | apply_to_discounted_products | false                  |
       | discount_application_type    | order_without_shipping |
       | restricted countries         |                        |
+    And I clear all country restrictions for cart rule rule_free_shipping_1
+    And I clear all country restrictions for cart rule rule_50_percent
+    And cart rule "rule_free_shipping_1" should have the following properties:
+      | restricted countries |  |
+    And cart rule "rule_50_percent" should have the following properties:
+      | restricted countries |  |
 
   Scenario: Restrict cart rule countries and clear the restrictions
-    #@todo: most of steps are not implemented yet and blocked by PR #32556
     When I restrict following countries for cart rule rule_free_shipping_1:
-      | France        |
-      | United_states |
+      | restricted countries | France,United_states |
     And I save all the restrictions for cart rule rule_free_shipping_1
     And I restrict following countries for cart rule rule_50_percent:
-      | France |
+      | restricted countries | France |
     And I save all the restrictions for cart rule rule_50_percent
     Then cart rule rule_free_shipping_1 should have the following properties:
       | restricted countries | France,United_states |
     And cart rule rule_50_percent should have the following properties:
       | restricted countries | France |
     When I restrict following countries for cart rule rule_free_shipping_1:
-      | United_states |
+      | restricted countries | United_states |
+    And I save all the restrictions for cart rule rule_free_shipping_1
+    And I clear all country restrictions for cart rule rule_50_percent
+    And I save all the restrictions for cart rule rule_50_percent
     Then cart rule rule_free_shipping_1 should have the following properties:
       | restricted countries | United_states |
+    Then cart rule rule_50_percent should have the following properties:
+      | restricted countries |  |
+    And I clear all country restrictions for cart rule rule_free_shipping_1
     And I save all the restrictions for cart rule rule_free_shipping_1
-    When I clear all country restrictions for cart rule rule_50_percent
     Then cart rule rule_50_percent should have the following properties:
       | restricted countries |  |
-    When I restrict following countries for cart rule rule_free_shipping_1:
-      |  |
     Then cart rule rule_50_percent should have the following properties:
       | restricted countries |  |
diff --git a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_mixed_cart_rule_restrictions.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_mixed_cart_rule_restrictions.feature
index 8bebd220b4059..34eff2d8ddce3 100644
--- a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_mixed_cart_rule_restrictions.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_mixed_cart_rule_restrictions.feature
@@ -28,6 +28,20 @@ Feature: Set cart rule restrictions in BO
     And supplier accessoriesSupplier named "Accessories supplier" exists
     And there is a carrier named "carrier1"
     And there is a carrier named "carrier2"
+    And I add new country "France" with following properties:
+      | name[en-US]                | France          |
+      | iso_code                   | FR              |
+      | call_prefix                | 123             |
+      | default_currency           | 1               |
+      | zone                       | 1               |
+      | need_zip_code              | true            |
+      | zip_code_format            | 1 NL            |
+      | address_format             | not implemented |
+      | is_enabled                 | true            |
+      | contains_states            | false           |
+      | need_identification_number | false           |
+      | display_tax_label          | true            |
+      | shop_association           | 1               |
     And I add product "product1" with following information:
       | name[en-US] | bottle of beer |
       | type        | virtual        |
@@ -103,6 +117,8 @@ Feature: Set cart rule restrictions in BO
       | restricted cart rules | rule_50_percent,rule_70_percent |
     And I restrict following carriers for cart rule rule_free_shipping_1:
       | restricted carriers | carrier1,carrier2 |
+    And I restrict following countries for cart rule rule_free_shipping_1:
+      | restricted countries | France |
     And I add a restriction for cart rule rule_free_shipping_1, which requires at least 1 product in cart matching one of these rules:
       | type          | references                 |
       | products      | product1                   |
@@ -121,6 +137,7 @@ Feature: Set cart rule restrictions in BO
     Then cart rule "rule_free_shipping_1" should have the following properties:
       | restricted cart rules | rule_50_percent,rule_70_percent |
       | restricted carriers   | carrier1,carrier2               |
+      | restricted countries  | France                          |
     And cart rule "rule_free_shipping_1" should have the following product restriction rule groups:
       | groupReference | quantity | rules count |
       | group_nr_1     | 1        | 5           |
diff --git a/tests/Integration/Behaviour/behat.yml b/tests/Integration/Behaviour/behat.yml
index 4eb33518cc2ad..9ce36ce726936 100644
--- a/tests/Integration/Behaviour/behat.yml
+++ b/tests/Integration/Behaviour/behat.yml
@@ -265,6 +265,7 @@ default:
                 - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\DeleteCartRuleFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\EditCartRuleFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\SetCartRuleRestrictionsFeatureContext
+                - Tests\Integration\Behaviour\Features\Context\Domain\CountryFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\ManufacturerFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\Product\AddProductFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\Product\Combination\CombinationListingFeatureContext

From 355434a0e8bc1189bd54cd12ec4e3383e2beeabd Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Thu, 29 Jun 2023 12:34:17 +0300
Subject: [PATCH 0419/1030]  replace old steps with new country restrictions in
 behat

---
 .../Context/CarrierFeatureContext.php         |  2 ++
 .../Context/CartRuleFeatureContext.php        | 21 -------------------
 .../Context/CountryFeatureContext.php         |  2 ++
 .../cart_rule_country_restriction.feature     | 18 +++++++++-------
 .../Order/order_gift_cart_rule.feature        |  6 +++++-
 5 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Context/CarrierFeatureContext.php b/tests/Integration/Behaviour/Features/Context/CarrierFeatureContext.php
index 2e37bf373a43a..59fdf6c160795 100644
--- a/tests/Integration/Behaviour/Features/Context/CarrierFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/CarrierFeatureContext.php
@@ -132,6 +132,8 @@ public function createCountry($countryName, $isoCode, $zoneName)
         $country->id_zone = $this->zones[$zoneName]->id;
         $country->active = true;
         $country->save();
+
+        $this->getSharedStorage()->set($countryName, (int) $countryId);
     }
 
     /**
diff --git a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
index 793d1f030a9f2..bd8bbb866e8be 100644
--- a/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/CartRuleFeatureContext.php
@@ -160,27 +160,6 @@ public function cartRuleNamedIsRestrictedToProductNamed(
         );
     }
 
-    /**
-     * @Given /^cart rule "(.+)" is restricted to country "(.+)"$/
-     */
-    public function cartRuleNamedIsRestrictedToCountryNamed(string $cartRuleName, string $country)
-    {
-        $this->countryFeatureContext->checkCountryWithIsoCodeExists($country);
-        $cartRuleId = $this->getCartRuleId($cartRuleName);
-
-        $cartRule = new CartRule($cartRuleId);
-        $cartRule->country_restriction = true;
-        $cartRule->save();
-        $this->cartRules[$cartRuleName] = $cartRule;
-
-        $idCountry = (int) $this->countryFeatureContext->getCountryWithIsoCode($country);
-        Db::getInstance()->execute(
-            'INSERT INTO ' . _DB_PREFIX_ . 'cart_rule_country(`id_cart_rule`, `id_country`) ' .
-            'VALUES(' . $cartRuleId . ', ' . $idCountry . ')'
-        );
-        Cache::clear();
-    }
-
     /**
      * @When /^I enable cart rule "(.+)"$/
      */
diff --git a/tests/Integration/Behaviour/Features/Context/CountryFeatureContext.php b/tests/Integration/Behaviour/Features/Context/CountryFeatureContext.php
index 5ea4f83e1ea49..4d047de0969f1 100644
--- a/tests/Integration/Behaviour/Features/Context/CountryFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/CountryFeatureContext.php
@@ -59,6 +59,8 @@ public function enableCountry($countryIsoCode)
         $country = new Country($countryId);
         $country->active = true;
         $country->save();
+
+        $this->getSharedStorage()->set($countryIsoCode, (int) $countryId);
     }
 
     /**
diff --git a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Restrictions/cart_rule_country_restriction.feature b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Restrictions/cart_rule_country_restriction.feature
index 92931ab088d4f..02f2306ccd379 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Restrictions/cart_rule_country_restriction.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Cart/CartRule/FrontOffice/Restrictions/cart_rule_country_restriction.feature
@@ -23,13 +23,17 @@ Feature: Cart calculation with country specific cart rules
     And carrier "carrier1" applies shipping fees of 12.3 in zone "Europe" for price between 0 and 10000
     And carrier "carrier1" applies shipping fees of 45.6 in zone "North America" for price between 0 and 10000
     And there is a cart rule "cartrule1" with following properties:
-      | name[en-US]                  | cartrule1              |
-      | priority                     | 1                      |
-      | free_shipping                | false                  |
-      | discount_amount              | 7.8                    |
-      | discount_currency            | usd                    |
-      | discount_includes_tax        | false                  |
-    And cart rule "cartrule1" is restricted to country "FR"
+      | name[en-US]           | cartrule1 |
+      | priority              | 1         |
+      | free_shipping         | false     |
+      | discount_amount       | 7.8       |
+      | discount_currency     | usd       |
+      | discount_includes_tax | false     |
+    And I restrict following countries for cart rule cartrule1:
+      | restricted countries  | France    |
+    And I save all the restrictions for cart rule cartrule1
+    And cart rule cartrule1 should have the following properties:
+      | restricted countries  | France    |
     And there is a product in the catalog named "Product1" with a price of 90.12 and 100 items in stock
 
   Scenario: Cart with a Product And address restricted by cart rule
diff --git a/tests/Integration/Behaviour/Features/Scenario/Order/order_gift_cart_rule.feature b/tests/Integration/Behaviour/Features/Scenario/Order/order_gift_cart_rule.feature
index ecedf2df59bdd..cd64c3c9eb728 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Order/order_gift_cart_rule.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Order/order_gift_cart_rule.feature
@@ -1344,7 +1344,11 @@ Feature: Order from Back Office (BO)
       | total_quantity    | 100              |
       | quantity_per_user | 100              |
       | gift_product      | Gift product     |
-    And cart rule "cartRuleFreeGift" is restricted to country "US"
+    And I restrict following countries for cart rule cartRuleFreeGift:
+      | restricted countries | US |
+    And I save all the restrictions for cart rule cartRuleFreeGift
+    And cart rule cartRuleFreeGift should have the following properties:
+      | restricted countries | US |
     # Make an order
     And I create an empty cart "dummy_cart" for customer "testCustomer"
     And I select "US" address as delivery and invoice address for customer "testCustomer" in cart "dummy_cart"

From 1a3a6003a377493d7c0cc5503cccb699375f7124 Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Tue, 4 Jul 2023 13:46:41 +0200
Subject: [PATCH 0420/1030] Fix package.lock for tests ui

---
 tests/UI/package-lock.json | 17 +++++++++++++++++
 tests/UI/package.json      |  3 ---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index 8725cdc73642d..b1811011945c0 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -2665,6 +2665,23 @@
         }
       }
     },
+    "eslint-utils": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+      "dev": true,
+      "requires": {
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "dependencies": {
+        "eslint-visitor-keys": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+          "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+          "dev": true
+        }
+      }
+    },
     "eslint-visitor-keys": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
diff --git a/tests/UI/package.json b/tests/UI/package.json
index d5145d98ac912..8ddff61b7040c 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -27,13 +27,10 @@
     "test:sanity:fast-fail": "TEST_PATH='sanity/*' npm run test:specific:fast-fail",
     "test:sanity:productV2": "TEST_PATH='productV2/sanity/**/*' npm run test:specific",
     "test:sanity:productV2:fast-fail": "TEST_PATH='productV2/sanity/*' npm run test:specific:fast-fail",
-
     "// Functional": "Scripts to run functional tests",
     "test:functional": "TEST_PATH='functional/**/*' npm run test:specific",
-
     "// Functional API": "Scripts to run functional API tests",
     "test:functional:API": "TEST_PATH='functional/API/**/*' npm run test:specific",
-
     "// Functional BO": "Scripts to run functional BO tests",
     "test:functional:BO": "TEST_PATH='functional/BO/**/*' npm run test:specific",
     "test:functional:BO:login": "TEST_PATH='functional/BO/00_login/**/*' npm run test:specific",

From 0710df2e4da124e69cb63c8e65155162e5c8b79e Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Tue, 4 Jul 2023 14:47:54 +0300
Subject: [PATCH 0421/1030]  cs fixer

---
 .../CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php  | 2 +-
 src/Adapter/CartRule/Repository/CartRuleRepository.php          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php b/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php
index 10e49cf307d56..38cf3988f9e66 100644
--- a/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php
+++ b/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php
@@ -110,7 +110,7 @@ private function setProductRestrictions(CartRule $cartRule, array $restrictionRu
      */
     private function setCarrierRestrictions(CartRule $cartRule, array $restrictedCarrierIds): void
     {
-        $this->cartRuleRepository->setCarrierRestrictions(new CartRuleId((int)$cartRule->id), $restrictedCarrierIds);
+        $this->cartRuleRepository->setCarrierRestrictions(new CartRuleId((int) $cartRule->id), $restrictedCarrierIds);
 
         $cartRule->carrier_restriction = !empty($restrictedCarrierIds);
         $this->cartRuleRepository->partialUpdate($cartRule, ['carrier_restriction']);
diff --git a/src/Adapter/CartRule/Repository/CartRuleRepository.php b/src/Adapter/CartRule/Repository/CartRuleRepository.php
index 6c004af1a6cdb..37ddc69ca0480 100644
--- a/src/Adapter/CartRule/Repository/CartRuleRepository.php
+++ b/src/Adapter/CartRule/Repository/CartRuleRepository.php
@@ -364,6 +364,7 @@ public function setCarrierRestrictions(CartRuleId $cartRuleId, array $restricted
             )
         );
     }
+
     /**
      * @param CartRuleId $cartRuleId
      * @param CountryId[] $restrictedCountryIds

From 66fb0544d010ea20234fb1efec39b89f1d92949e Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Tue, 4 Jul 2023 14:53:25 +0300
Subject: [PATCH 0422/1030]  rebase mistake fix

---
 src/Adapter/CartRule/Repository/CartRuleRepository.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Adapter/CartRule/Repository/CartRuleRepository.php b/src/Adapter/CartRule/Repository/CartRuleRepository.php
index 37ddc69ca0480..a4684479302a7 100644
--- a/src/Adapter/CartRule/Repository/CartRuleRepository.php
+++ b/src/Adapter/CartRule/Repository/CartRuleRepository.php
@@ -457,8 +457,9 @@ private function removeCarrierRestrictions(CartRuleId $cartRuleId): void
         $this->connection->createQueryBuilder()
             ->delete($this->dbPrefix . 'cart_rule_carrier', 'crc')
             ->where('crc.id_cart_rule = :cartRuleId')
-            ->setParameter('cartRuleId', $cartRuleId->getValue()
-        );
+            ->setParameter('cartRuleId', $cartRuleId->getValue())
+            ->execute()
+        ;
     }
 
     private function removeCountryRestrictions(CartRuleId $cartRuleId): void

From 7606720d571f99ac1e307b2cf796b76707ab40db Mon Sep 17 00:00:00 2001
From: tleon <thomas.leone@prestashop.com>
Date: Tue, 9 May 2023 09:01:12 +0200
Subject: [PATCH 0423/1030] feat(command): improve CQRS list command

---
 .../Command/ListCommandsAndQueriesCommand.php | 129 ++++++++++++++++--
 .../config/services_dev/bundle/command.yml    |   1 +
 2 files changed, 122 insertions(+), 8 deletions(-)

diff --git a/src/PrestaShopBundle/Command/ListCommandsAndQueriesCommand.php b/src/PrestaShopBundle/Command/ListCommandsAndQueriesCommand.php
index 5bdfb99ceaa5f..1c655d1fa72c0 100644
--- a/src/PrestaShopBundle/Command/ListCommandsAndQueriesCommand.php
+++ b/src/PrestaShopBundle/Command/ListCommandsAndQueriesCommand.php
@@ -26,11 +26,15 @@
 
 namespace PrestaShopBundle\Command;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Parser\CommandDefinition;
 use PrestaShop\PrestaShop\Core\CommandBus\Parser\CommandDefinitionParser;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Formatter\OutputFormatterStyle;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouterInterface;
 
 /**
  * Lists all commands and queries definitions
@@ -47,11 +51,36 @@ class ListCommandsAndQueriesCommand extends Command
      */
     private $commandAndQueries;
 
-    public function __construct(CommandDefinitionParser $commandDefinitionParser, array $commandAndQueries)
-    {
+    /**
+     * @var bool
+     */
+    private $isFormatSimple;
+
+    /**
+     * @var bool
+     */
+    private $isOutputToFile;
+
+    /**
+     * @var Route[]
+     */
+    private $apiResourcesList;
+
+    /**
+     * @var RouterInterface
+     */
+    private $router;
+
+    public function __construct(
+        CommandDefinitionParser $commandDefinitionParser,
+        array $commandAndQueries,
+        RouterInterface $router
+    ) {
         parent::__construct();
         $this->commandDefinitionParser = $commandDefinitionParser;
         $this->commandAndQueries = $commandAndQueries;
+        $this->isFormatSimple = false;
+        $this->router = $router;
     }
 
     /**
@@ -62,27 +91,111 @@ public function configure()
         $this
             ->setName('prestashop:list:commands-and-queries')
             ->setDescription('Lists available CQRS commands and queries')
+            ->addOption(
+                'domain',
+                'd',
+                InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED,
+                'Filter available CQRS by domain.'
+            )
+            ->addOption(
+                'format',
+                'f',
+                InputOption::VALUE_REQUIRED,
+                'Outputs either a regular or simplified format.',
+                'regular'
+            )
         ;
     }
 
     /**
      * {@inheritdoc}
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
+        $this->apiResourcesList = $this->getResourceList();
+        $this->handleOptions($input);
+
         $outputStyle = new OutputFormatterStyle('blue', null);
         $output->getFormatter()->setStyle('blue', $outputStyle);
 
         foreach ($this->commandAndQueries as $key => $commandName) {
             $commandDefinition = $this->commandDefinitionParser->parseDefinition($commandName);
+            $isCQRSImplemented = $this->isCQRSImplemented($commandDefinition);
 
-            $output->writeln(++$key . '.');
-            $output->writeln('<blue>Class: </blue><info>' . $commandDefinition->getClassName() . '</info>');
-            $output->writeln('<blue>Type: </blue><info>' . $commandDefinition->getCommandType() . '</info>');
-            $output->writeln('<comment>' . $commandDefinition->getDescription() . '</comment>');
-            $output->writeln('');
+            if ($this->isFormatSimple) {
+                $output->writeln('<info>' . $commandDefinition->getClassName() . ($isCQRSImplemented !== '' ? ' OK' : ' NOT OK') . '</info>');
+            } else {
+                $output->writeln(++$key . '.');
+                $output->writeln('<blue>Class: </blue><info>' . $commandDefinition->getClassName() . '</info>');
+                $output->writeln('<blue>Type: </blue><info>' . $commandDefinition->getCommandType() . '</info>');
+                $output->writeln('<blue>API: </blue><info>' . $isCQRSImplemented . '</info>');
+                $output->writeln('<comment>' . $commandDefinition->getDescription() . '</comment>');
+                $output->writeln('');
+            }
         }
 
         return 0;
     }
+
+    private function handleOptions(InputInterface $input): void
+    {
+        if ($input->getOption('domain') !== null) {
+            $this->filterCQRS($input->getOption('domain'));
+        }
+
+        if ($input->getOption('format') !== null && $input->getOption('format') === 'simple') {
+            $this->isFormatSimple = true;
+        }
+    }
+
+    /**
+     * @param string[] $filter
+     */
+    private function filterCQRS(array $filter): void
+    {
+        $this->commandAndQueries = array_filter($this->commandAndQueries, function (string $currentCQRS) use ($filter) {
+            return preg_match('/' . implode('|', $filter) . '/i', $currentCQRS);
+        });
+    }
+
+    /**
+     * @return Route[]
+     */
+    private function getResourceList(): array
+    {
+        return array_filter($this->router->getRouteCollection()->all(), function ($value, $key) {
+            if (preg_match('/^_api_/', $key) === 1) {
+                return $value;
+            }
+        }, ARRAY_FILTER_USE_BOTH);
+    }
+
+    private function isCQRSImplemented(CommandDefinition $commandDefinition): string
+    {
+        foreach ($this->apiResourcesList as $resource) {
+            $apiResourceClass = explode('\\', $resource->getDefault('_api_resource_class'));
+            if (preg_match('/' . str_replace('/', '', end($apiResourceClass)) . '/i', $commandDefinition->getClassName()) === 1
+                && $this->doesMethodsMatchType($resource->getMethods(), $commandDefinition->getCommandType())
+            ) {
+                return $resource->getPath();
+            }
+        }
+
+        return '';
+    }
+
+    /**
+     * @param string[] $methods
+     */
+    private function doesMethodsMatchType(array $methods, string $commandType): bool
+    {
+        switch ($commandType) {
+            case 'Command':
+                return in_array('POST', $methods) || in_array('PUT', $methods) || in_array('PATCH', $methods);
+            case 'Query':
+                return in_array('GET', $methods) || in_array('DELETE', $methods);
+            default:
+                return false;
+        }
+    }
 }
diff --git a/src/PrestaShopBundle/Resources/config/services_dev/bundle/command.yml b/src/PrestaShopBundle/Resources/config/services_dev/bundle/command.yml
index 29d1f97bfbf5e..d0ccedca98256 100644
--- a/src/PrestaShopBundle/Resources/config/services_dev/bundle/command.yml
+++ b/src/PrestaShopBundle/Resources/config/services_dev/bundle/command.yml
@@ -48,6 +48,7 @@ services:
     arguments:
       - '@prestashop.core.provider.command_definition_provider'
       - '%prestashop.commands_and_queries%'
+      - '@router'
     tags:
       - 'console.command'
 

From 991b4e281d1183675df9c956971d9d63e580d13a Mon Sep 17 00:00:00 2001
From: tleon <thomas.leone@prestashop.com>
Date: Tue, 16 May 2023 09:32:51 +0200
Subject: [PATCH 0424/1030] chore(refacto): reworked some options of the
 command and added some unit test

---
 .../Command/ListCommandsAndQueriesCommand.php |  61 ++++-----
 .../ListCommandsAndQueriesCommandTest.php     | 126 ++++++++++++++++++
 2 files changed, 157 insertions(+), 30 deletions(-)
 create mode 100644 tests/Unit/PrestaShopBundle/Command/ListCommandsAndQueriesCommandTest.php

diff --git a/src/PrestaShopBundle/Command/ListCommandsAndQueriesCommand.php b/src/PrestaShopBundle/Command/ListCommandsAndQueriesCommand.php
index 1c655d1fa72c0..5058121aebf30 100644
--- a/src/PrestaShopBundle/Command/ListCommandsAndQueriesCommand.php
+++ b/src/PrestaShopBundle/Command/ListCommandsAndQueriesCommand.php
@@ -33,6 +33,7 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouterInterface;
 
@@ -41,35 +42,21 @@
  */
 class ListCommandsAndQueriesCommand extends Command
 {
-    /**
-     * @var CommandDefinitionParser
-     */
-    private $commandDefinitionParser;
+    private CommandDefinitionParser $commandDefinitionParser;
 
     /**
-     * @var array
+     * @var string[]
      */
-    private $commandAndQueries;
+    private array $commandAndQueries;
 
-    /**
-     * @var bool
-     */
-    private $isFormatSimple;
-
-    /**
-     * @var bool
-     */
-    private $isOutputToFile;
+    private bool $isFormatSimple;
 
     /**
      * @var Route[]
      */
-    private $apiResourcesList;
+    private array $apiResourcesList;
 
-    /**
-     * @var RouterInterface
-     */
-    private $router;
+    private RouterInterface $router;
 
     public function __construct(
         CommandDefinitionParser $commandDefinitionParser,
@@ -112,6 +99,7 @@ public function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
+        $io = new SymfonyStyle($input, $output);
         $this->apiResourcesList = $this->getResourceList();
         $this->handleOptions($input);
 
@@ -120,15 +108,15 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         foreach ($this->commandAndQueries as $key => $commandName) {
             $commandDefinition = $this->commandDefinitionParser->parseDefinition($commandName);
-            $isCQRSImplemented = $this->isCQRSImplemented($commandDefinition);
+            $CQRSEndpointURI = $this->getCQRSEndpointURI($commandDefinition);
 
             if ($this->isFormatSimple) {
-                $output->writeln('<info>' . $commandDefinition->getClassName() . ($isCQRSImplemented !== '' ? ' OK' : ' NOT OK') . '</info>');
+                $output->writeln('<info>' . $commandDefinition->getClassName() . (!empty($CQRSEndpointURI) ? ' OK' : ' NOT OK') . '</info>');
             } else {
                 $output->writeln(++$key . '.');
                 $output->writeln('<blue>Class: </blue><info>' . $commandDefinition->getClassName() . '</info>');
                 $output->writeln('<blue>Type: </blue><info>' . $commandDefinition->getCommandType() . '</info>');
-                $output->writeln('<blue>API: </blue><info>' . $isCQRSImplemented . '</info>');
+                $output->writeln('<blue>API: </blue><info>' . $CQRSEndpointURI . '</info>');
                 $output->writeln('<comment>' . $commandDefinition->getDescription() . '</comment>');
                 $output->writeln('');
             }
@@ -139,26 +127,35 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
     private function handleOptions(InputInterface $input): void
     {
-        if ($input->getOption('domain') !== null) {
+        if ($input->getOption('domain') !== []) {
             $this->filterCQRS($input->getOption('domain'));
         }
 
-        if ($input->getOption('format') !== null && $input->getOption('format') === 'simple') {
+        if ($input->getOption('format') === 'simple') {
             $this->isFormatSimple = true;
         }
     }
 
     /**
-     * @param string[] $filter
+     * @param string[] $filters
      */
-    private function filterCQRS(array $filter): void
+    private function filterCQRS(array $filters): void
     {
-        $this->commandAndQueries = array_filter($this->commandAndQueries, function (string $currentCQRS) use ($filter) {
-            return preg_match('/' . implode('|', $filter) . '/i', $currentCQRS);
+        $this->commandAndQueries = array_filter($this->commandAndQueries, function (string $currentCQRS) use ($filters) {
+            foreach ($filters as $filter) {
+                // We append a backslash behind the filter to find only exact matches
+                if (str_contains($currentCQRS, $filter . '\\') !== false) {
+                    return true;
+                }
+            }
+
+            return false;
         });
     }
 
     /**
+     * This method takes the list of all routes on the project and filters out all the api-platform endpoints.
+     *
      * @return Route[]
      */
     private function getResourceList(): array
@@ -170,7 +167,11 @@ private function getResourceList(): array
         }, ARRAY_FILTER_USE_BOTH);
     }
 
-    private function isCQRSImplemented(CommandDefinition $commandDefinition): string
+    /**
+     * This method takes the filtered list of routes, and checks it against the list of CQRS.
+     * The CQRS that have a route with the correct method are implemented, so we return the URI of the endpoint.
+     */
+    private function getCQRSEndpointURI(CommandDefinition $commandDefinition): string
     {
         foreach ($this->apiResourcesList as $resource) {
             $apiResourceClass = explode('\\', $resource->getDefault('_api_resource_class'));
diff --git a/tests/Unit/PrestaShopBundle/Command/ListCommandsAndQueriesCommandTest.php b/tests/Unit/PrestaShopBundle/Command/ListCommandsAndQueriesCommandTest.php
new file mode 100644
index 0000000000000..bff631f5fb3c8
--- /dev/null
+++ b/tests/Unit/PrestaShopBundle/Command/ListCommandsAndQueriesCommandTest.php
@@ -0,0 +1,126 @@
+<?php
+
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace Tests\Unit\PrestaShopBundle\Command;
+
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use PrestaShop\PrestaShop\Core\CommandBus\Parser\CommandDefinitionParser;
+use PrestaShopBundle\Command\ListCommandsAndQueriesCommand;
+use Symfony\Component\Console\Tester\CommandTester;
+use Symfony\Component\Routing\RouteCollection;
+use Symfony\Component\Routing\RouterInterface;
+
+class ListCommandsAndQueriesCommandTest extends TestCase
+{
+    /** @var CommandTester */
+    private $commandTester;
+
+    /** @var RouterInterface|MockObject */
+    private $routerMock;
+
+    public function setUp(): void
+    {
+        $this->routerMock = $this->createMock(RouterInterface::class);
+
+        $command = new ListCommandsAndQueriesCommand(
+            new CommandDefinitionParser(),
+            $this->getListOfCQRSCommands(),
+            $this->routerMock
+        );
+
+        $this->commandTester = new CommandTester($command);
+
+        parent::setUp();
+    }
+
+    /**
+     * @dataProvider optionsProvider
+     */
+    public function testExecute(array $options, string $result): void
+    {
+        $routeCollectionMock = $this->createMock(RouteCollection::class);
+        $routeCollectionMock
+            ->method('all')
+            ->willReturn([])
+        ;
+        $this->routerMock
+            ->method('getRouteCollection')
+            ->willReturn($routeCollectionMock)
+        ;
+
+        $this->commandTester->execute($options);
+
+        static::assertEquals($result,
+            $this->commandTester->getDisplay()
+        );
+    }
+
+    public function optionsProvider(): array
+    {
+        return [
+            [
+                [],
+                "1.\nClass: PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Command\AddApplicationCommand\nType: Command\nAPI: \nCreates application with provided data\n\n2.\nClass: PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Command\EditApplicationCommand\nType: Command\nAPI: \nEdit application with provided data\n\n3.\nClass: PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Query\GetApplicationForEditing\nType: Query\nAPI: \nGets application for editing in Back Office\n\n4.\nClass: PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\DeleteCustomerThreadCommand\nType: Command\nAPI: \n\n\n",
+            ],
+            [
+                [
+                    '--domain' => ['CustomerService'],
+                ],
+                "4.\nClass: PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\DeleteCustomerThreadCommand\nType: Command\nAPI: \n\n\n",
+            ],
+            [
+                [
+                    '--format' => 'simple',
+                ],
+                "PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Command\AddApplicationCommand NOT OK\nPrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Command\EditApplicationCommand NOT OK\nPrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Query\GetApplicationForEditing NOT OK\nPrestaShop\PrestaShop\Core\Domain\CustomerService\Command\DeleteCustomerThreadCommand NOT OK\n",
+            ],
+            [
+                [
+                    '--domain' => ['CustomerService'],
+                    '--format' => 'simple',
+                ],
+                "PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\DeleteCustomerThreadCommand NOT OK\n",
+            ],
+        ];
+    }
+
+    /**
+     * @return string[]
+     */
+    private function getListOfCQRSCommands(): array
+    {
+        return [
+            "PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Command\AddApplicationCommand",
+            "PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Command\EditApplicationCommand",
+            "PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Query\GetApplicationForEditing",
+            "PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\DeleteCustomerThreadCommand",
+        ];
+    }
+}

From f05f8bee74c1586fe428311eb167a5776536392b Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Tue, 4 Jul 2023 15:26:13 +0200
Subject: [PATCH 0425/1030] Fix lint errors

---
 .../01_customerService/01_viewCustomerService.ts    |  4 ++--
 .../02_locations/03_states/04_sortAndPagination.ts  |  2 +-
 .../BO/international/locations/states/index.ts      | 13 +++----------
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/01_viewCustomerService.ts b/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/01_viewCustomerService.ts
index 560d2028784c3..48607cd0dc052 100644
--- a/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/01_viewCustomerService.ts
+++ b/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/01_viewCustomerService.ts
@@ -118,7 +118,7 @@ describe('BO - Customer Service : View messages', async () => {
     const text = await viewPage.getCustomerMessage(page);
     expect(text).to.contains(contactUsData.emailAddress);
     expect(text).to.contains(contactUsData.subject);
-    expect(text).to.contains(`${messageDateTime.substr(0, 10)} - ${messageDateTime.substr(11, 5)}`);
+    expect(text).to.contains(`${messageDateTime.substring(0, 10)} - ${messageDateTime.substring(11, 5)}`);
     expect(text).to.contains('Attachment');
     expect(text).to.contains(contactUsData.message);
   });
@@ -140,7 +140,7 @@ describe('BO - Customer Service : View messages', async () => {
 
     const text = await viewPage.getOrdersAndMessagesTimeline(page);
     expect(text).to.contains('Orders and messages timeline');
-    expect(text).to.contains(`${messageDateTime.substr(0, 10)} - ${messageDateTime.substr(11, 5)}`);
+    expect(text).to.contains(`${messageDateTime.substring(0, 10)} - ${messageDateTime.substring(11, 5)}`);
     expect(text).to.contains(`Message to: ${contactUsData.subject}`);
     expect(text).to.contains(contactUsData.message);
   });
diff --git a/tests/UI/campaigns/functional/BO/11_international/02_locations/03_states/04_sortAndPagination.ts b/tests/UI/campaigns/functional/BO/11_international/02_locations/03_states/04_sortAndPagination.ts
index 8e08af2cbfc21..08a0ba6ae4c58 100644
--- a/tests/UI/campaigns/functional/BO/11_international/02_locations/03_states/04_sortAndPagination.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/02_locations/03_states/04_sortAndPagination.ts
@@ -96,7 +96,7 @@ describe('BO - International - States : Sort and pagination', async () => {
 
   // 2 : Sort states table
   describe('Sort states table', async () => {
-    it('should reset all filters', async function () {
+    it(`should filter by country '${Countries.canada.name}'`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'filterBeforeSort', baseContext);
 
       await statesPage.filterStates(page, 'select', 'id_country', Countries.canada.name);
diff --git a/tests/UI/pages/BO/international/locations/states/index.ts b/tests/UI/pages/BO/international/locations/states/index.ts
index 74320be44fe0c..830348af648c9 100644
--- a/tests/UI/pages/BO/international/locations/states/index.ts
+++ b/tests/UI/pages/BO/international/locations/states/index.ts
@@ -257,31 +257,25 @@ class States extends BOBasePage {
    * @return {Promise<void>}
    */
   async filterStates(page: Page, filterType: string, filterBy: string, value: string): Promise<void> {
-    const currentUrl: string = page.url();
     let textValue: string = value;
 
     switch (filterType) {
       case 'input':
         await this.setValue(page, this.filterColumn(filterBy), value);
-        await this.clickAndWaitForURL(page, this.filterSearchButton);
         break;
 
       case 'select':
         if (filterBy === 'active') {
           textValue = value === '1' ? 'Yes' : 'No';
         }
-        await Promise.all([
-          this.selectByVisibleText(page, this.filterColumn(filterBy), textValue),
-          page.waitForURL((url: URL): boolean => url.toString() !== currentUrl, {waitUntil: 'networkidle'}),
-        ]);
-
+        await this.selectByVisibleText(page, this.filterColumn(filterBy), textValue);
         break;
 
       default:
         throw new Error(`Filter ${filterBy} was not found`);
     }
 
-    await this.clickAndWaitForNavigation(page, this.filterSearchButton);
+    await this.clickAndWaitForURL(page, this.filterSearchButton);
   }
 
   /* Column methods */
@@ -546,8 +540,7 @@ class States extends BOBasePage {
    * @returns {Promise<string>}
    */
   async selectPaginationLimit(page: Page, number: number): Promise<string> {
-    await this.waitForSelectorAndClick(page, this.paginationDropdownButton);
-    await this.clickAndWaitForURL(page, this.paginationItems(number));
+    await this.selectByVisibleText(page, this.paginationLimitSelect, number);
 
     return this.getPaginationLabel(page);
   }

From 813d9c1d65d9cc3533ff2dfd26e4395909234be3 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Tue, 4 Jul 2023 15:26:51 +0200
Subject: [PATCH 0426/1030] Fix typeScript check errors

---
 tests/UI/data/xml/country.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/UI/data/xml/country.ts b/tests/UI/data/xml/country.ts
index 7dad996786132..6671ac148a8fa 100644
--- a/tests/UI/data/xml/country.ts
+++ b/tests/UI/data/xml/country.ts
@@ -8,9 +8,9 @@ export default function getCountryXml(idCountry : string | null = null): string
   return ('<?xml version="1.0" encoding="UTF-8"?>'
     + '<prestashop xmlns:xlink="http://www.w3.org/1999/xlink">'
     + `<country>${idCountry !== null ? (`<id><![CDATA[${idCountry}]]></id>`) : ''}`
-    + `<id_zone><![CDATA[${faker.datatype.number({min: 1, max: 5})}]]></id_zone>`
+    + `<id_zone><![CDATA[${faker.number.int({min: 1, max: 5})}]]></id_zone>`
     + '<id_currency><![CDATA[1]]></id_currency>'
-    + `<call_prefix><![CDATA[${faker.datatype.number({min: 100, max: 200})}]]></call_prefix>`
+    + `<call_prefix><![CDATA[${faker.number.int({min: 100, max: 200})}]]></call_prefix>`
     + `<iso_code><![CDATA[${faker.word.adjective(3)}]]></iso_code>`
     + `<active><![CDATA[${faker.helpers.arrayElement([0, 1])}]]></active>`
     + `<contains_states><![CDATA[${faker.helpers.arrayElement([0, 1])}]]></contains_states>`

From 19a8898e188ec9999cdc7a26b439eefbce574e09 Mon Sep 17 00:00:00 2001
From: fatm <fatima.mazhit@gmail.com>
Date: Wed, 5 Jul 2023 12:20:25 +0600
Subject: [PATCH 0427/1030] fix new attachment file button target;

---
 .../js/pages/product/edit/manager/attachments-manager.ts        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-dev/themes/new-theme/js/pages/product/edit/manager/attachments-manager.ts b/admin-dev/themes/new-theme/js/pages/product/edit/manager/attachments-manager.ts
index 65660d9a54785..66b07cc993a72 100644
--- a/admin-dev/themes/new-theme/js/pages/product/edit/manager/attachments-manager.ts
+++ b/admin-dev/themes/new-theme/js/pages/product/edit/manager/attachments-manager.ts
@@ -68,7 +68,7 @@ export default class AttachmentsManager {
         id: 'modal-create-product-attachment',
         modalTitle: this.$addAttachmentBtn.data('modalTitle'),
         formSelector: 'form[name="attachment"]',
-        formUrl: $(event.target).prop('href'),
+        formUrl: $(event.currentTarget).prop('href'),
         closable: true,
         onFormLoaded: (form: HTMLElement, formData: FormData, dataAttributes: DOMStringMap | null): void => {
           if (dataAttributes && dataAttributes.attachmentId) {

From 7b577b6026debb6c97a3fde6758e3778ccc96758 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Tue, 27 Jun 2023 14:41:07 +0300
Subject: [PATCH 0428/1030]  implement customer group restrictions for cart
 rule

---
 .../SetCartRuleRestrictionsHandler.php        | 19 ++++
 .../GetCartRuleForEditingHandler.php          |  7 +-
 .../Repository/CartRuleRepository.php         | 72 +++++++++++++-
 .../SetCartRuleRestrictionsCommand.php        | 23 +++++
 .../CartRuleRestrictionsForEditing.php        | 18 +++-
 .../AbstractCartRuleFeatureContext.php        |  8 ++
 .../SetCartRuleRestrictionsFeatureContext.php | 27 ++++++
 .../CartRule/set_group_restrictions.feature   | 95 +++++++++++++++++++
 .../set_mixed_cart_rule_restrictions.feature  | 45 ++++++++-
 tests/Integration/Behaviour/behat.yml         |  4 +
 10 files changed, 312 insertions(+), 6 deletions(-)
 create mode 100644 tests/Integration/Behaviour/Features/Scenario/CartRule/set_group_restrictions.feature

diff --git a/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php b/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php
index 38cf3988f9e66..50f1c40e17eff 100644
--- a/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php
+++ b/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php
@@ -35,6 +35,7 @@
 use PrestaShop\PrestaShop\Core\Domain\CartRule\CommandHandler\SetCartRuleRestrictionsHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\CartRuleId;
 use PrestaShop\PrestaShop\Core\Domain\Country\ValueObject\CountryId;
+use PrestaShop\PrestaShop\Core\Domain\Customer\Group\ValueObject\GroupId;
 
 class SetCartRuleRestrictionsHandler implements SetCartRuleRestrictionsHandlerInterface
 {
@@ -49,6 +50,7 @@ public function handle(SetCartRuleRestrictionsCommand $command): void
             && null === $command->getProductRestrictionRuleGroups()
             && null === $command->getRestrictedCarrierIds()
             && null === $command->getRestrictedCountryIds()
+            && null === $command->getRestrictedGroupIds()
         ) {
             // no restrictions were modified
             return;
@@ -72,6 +74,10 @@ public function handle(SetCartRuleRestrictionsCommand $command): void
         if (null !== $restrictedCountryIds) {
             $this->setCountryRestrictions($cartRule, $restrictedCountryIds);
         }
+        $restrictedGroupIds = $command->getRestrictedGroupIds();
+        if (null !== $restrictedGroupIds) {
+            $this->setGroupRestrictions($cartRule, $restrictedGroupIds);
+        }
         // it would be more performant updating all restriction props at the end with one update call,
         // but that way we might introduce cart rule state failure in case one of steps fails somewhere in the middle
     }
@@ -129,4 +135,17 @@ private function setCountryRestrictions(CartRule $cartRule, array $restrictedCou
         $cartRule->country_restriction = !empty($restrictedCountryIds);
         $this->cartRuleRepository->partialUpdate($cartRule, ['country_restriction']);
     }
+
+    /**
+     * @param GroupId[] $restrictedGroupIds
+     *
+     * @return void
+     */
+    private function setGroupRestrictions(CartRule $cartRule, array $restrictedGroupIds): void
+    {
+        $this->cartRuleRepository->setGroupRestrictions(new CartRuleId((int) $cartRule->id), $restrictedGroupIds);
+
+        $cartRule->group_restriction = !empty($restrictedGroupIds);
+        $this->cartRuleRepository->partialUpdate($cartRule, ['group_restriction']);
+    }
 }
diff --git a/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php b/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php
index ba04b0c5e0124..10c03cbbdbbef 100644
--- a/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php
+++ b/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php
@@ -132,12 +132,17 @@ private function getCartRuleConditions(CartRule $cartRule): CartRuleConditionsFo
         if ($cartRule->country_restriction) {
             $restrictedCountryIds = $this->cartRuleRepository->getRestrictedCountryIds($cartRuleId);
         }
+        $restrictedGroupIds = [];
+        if ($cartRule->group_restriction) {
+            $restrictedGroupIds = $this->cartRuleRepository->getRestrictedGroupIds($cartRuleId);
+        }
 
         $cartRuleRestrictions = new CartRuleRestrictionsForEditing(
             $restrictedCartRules,
             $this->getRestrictionRuleGroups($cartRule),
             $restrictedCarrierIds,
-            $restrictedCountryIds
+            $restrictedCountryIds,
+            $restrictedGroupIds
         );
 
         return new CartRuleConditionsForEditing(
diff --git a/src/Adapter/CartRule/Repository/CartRuleRepository.php b/src/Adapter/CartRule/Repository/CartRuleRepository.php
index a4684479302a7..b2b1d5ecd6afe 100644
--- a/src/Adapter/CartRule/Repository/CartRuleRepository.php
+++ b/src/Adapter/CartRule/Repository/CartRuleRepository.php
@@ -39,6 +39,7 @@
 use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\Restriction\RestrictionRule;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\Restriction\RestrictionRuleGroup;
 use PrestaShop\PrestaShop\Core\Domain\Country\ValueObject\CountryId;
+use PrestaShop\PrestaShop\Core\Domain\Customer\Group\ValueObject\GroupId;
 use PrestaShop\PrestaShop\Core\Repository\AbstractObjectModelRepository;
 
 class CartRuleRepository extends AbstractObjectModelRepository
@@ -346,6 +347,7 @@ public function setCarrierRestrictions(CartRuleId $cartRuleId, array $restricted
 
         $checkedIds = [];
         $insertValues = [];
+
         foreach ($restrictedCarrierIds as $restrictedCarrierId) {
             $restrictedCarrierIdValue = $restrictedCarrierId->getValue();
             // skip duplicate ids if for some reason they exist
@@ -365,6 +367,40 @@ public function setCarrierRestrictions(CartRuleId $cartRuleId, array $restricted
         );
     }
 
+    /**
+     * @param GroupId[] $restrictedGroupIds
+     *
+     * @return void
+     */
+    public function setGroupRestrictions(CartRuleId $cartRuleId, array $restrictedGroupIds): void
+    {
+        $this->removeGroupRestrictions($cartRuleId);
+
+        if (empty($restrictedGroupIds)) {
+            return;
+        }
+
+        $checkedIds = [];
+        $insertValues = [];
+        foreach ($restrictedGroupIds as $restrictedGroupId) {
+            $restrictedGroupIdValue = $restrictedGroupId->getValue();
+            // skip duplicate ids if for some reason they exist
+            if (in_array($restrictedGroupIdValue, $checkedIds, true)) {
+                continue;
+            }
+            $insertValues[] = sprintf('(%d,%d)', $cartRuleId->getValue(), $restrictedGroupIdValue);
+            $checkedIds[] = $restrictedGroupIdValue;
+        }
+
+        $this->connection->executeStatement(
+            sprintf(
+                'INSERT INTO %s (`id_cart_rule`, `id_carrier`) VALUES %s',
+                $this->dbPrefix . 'cart_rule_carrier',
+                implode(',', $insertValues)
+            )
+        );
+    }
+
     /**
      * @param CartRuleId $cartRuleId
      * @param CountryId[] $restrictedCountryIds
@@ -393,8 +429,8 @@ public function setCountryRestrictions(CartRuleId $cartRuleId, array $restricted
 
         $this->connection->executeStatement(
             sprintf(
-                'INSERT INTO %s (`id_cart_rule`, `id_country`) VALUES %s',
-                $this->dbPrefix . 'cart_rule_country',
+                'INSERT INTO %s (`id_cart_rule`, `id_group`) VALUES %s',
+                $this->dbPrefix . 'cart_rule_group',
                 implode(',', $insertValues)
             )
         );
@@ -414,6 +450,26 @@ public function getRestrictedCarrierIds(CartRuleId $cartRuleId): array
             ->where('crc.id_cart_rule = :cartRuleId')
             ->setParameter('cartRuleId', $cartRuleIdValue)
             ->execute()
+            ->fetchAllAssociative();
+
+        if (empty($results)) {
+            return [];
+        }
+
+        return array_map(static function (array $result): int {
+            return (int)$result['id_carrier'];
+        }, $results);
+    }
+
+    public function getRestrictedGroupIds(CartRuleId $cartRuleId): array
+    {
+        $cartRuleIdValue = $cartRuleId->getValue();
+        $results = $this->connection->createQueryBuilder()
+            ->select('crc.id_group')
+            ->from($this->dbPrefix . 'cart_rule_group', 'crc')
+            ->where('crc.id_cart_rule = :cartRuleId')
+            ->setParameter('cartRuleId', $cartRuleIdValue)
+            ->execute()
             ->fetchAllAssociative()
         ;
 
@@ -422,7 +478,7 @@ public function getRestrictedCarrierIds(CartRuleId $cartRuleId): array
         }
 
         return array_map(static function (array $result): int {
-            return (int) $result['id_carrier'];
+            return (int) $result['id_group'];
         }, $results);
     }
 
@@ -472,6 +528,16 @@ private function removeCountryRestrictions(CartRuleId $cartRuleId): void
         ;
     }
 
+    private function removeGroupRestrictions(CartRuleId $cartRuleId): void
+    {
+        $this->connection->createQueryBuilder()
+            ->delete($this->dbPrefix . 'cart_rule_group', 'crc')
+            ->where('crc.id_cart_rule = :cartRuleId')
+            ->setParameter('cartRuleId', $cartRuleId->getValue())
+            ->execute()
+        ;
+    }
+
     private function removeRestrictedCartRules(CartRuleId $cartRuleId): void
     {
         $this->connection->createQueryBuilder()
diff --git a/src/Core/Domain/CartRule/Command/SetCartRuleRestrictionsCommand.php b/src/Core/Domain/CartRule/Command/SetCartRuleRestrictionsCommand.php
index 237fe26146d5a..546fdca65a4be 100644
--- a/src/Core/Domain/CartRule/Command/SetCartRuleRestrictionsCommand.php
+++ b/src/Core/Domain/CartRule/Command/SetCartRuleRestrictionsCommand.php
@@ -33,6 +33,7 @@
 use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\CartRuleId;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\Restriction\RestrictionRuleGroup;
 use PrestaShop\PrestaShop\Core\Domain\Country\ValueObject\CountryId;
+use PrestaShop\PrestaShop\Core\Domain\Customer\Group\ValueObject\GroupId;
 
 /**
  * Sets cart rule restrictions.
@@ -62,6 +63,11 @@ class SetCartRuleRestrictionsCommand
      */
     private ?array $restrictedCountryIds = null;
 
+    /**
+     * @var GroupId[]|null
+     */
+    private ?array $restrictedGroupIds = null;
+
     /**
      * @param int $cartRuleId
      */
@@ -89,6 +95,15 @@ public function setRestrictedCountryIds(array $restrictedCountryIds): self
         return $this;
     }
 
+    public function setRestrictedGroupIds(array $restrictedGroupIds): self
+    {
+        $this->restrictedGroupIds = array_map(static function ($groupId): GroupId {
+            return new GroupId($groupId);
+        }, $restrictedGroupIds);
+
+        return $this;
+    }
+
     /**
      * @return CarrierId[]|null
      */
@@ -105,6 +120,14 @@ public function getRestrictedCountryIds(): ?array
         return $this->restrictedCountryIds;
     }
 
+    /**
+     * @return GroupId[]|null
+     */
+    public function getRestrictedGroupIds(): ?array
+    {
+        return $this->restrictedGroupIds;
+    }
+
     /**
      * @return CartRuleId
      */
diff --git a/src/Core/Domain/CartRule/QueryResult/CartRuleRestrictionsForEditing.php b/src/Core/Domain/CartRule/QueryResult/CartRuleRestrictionsForEditing.php
index f2785cc5500eb..a79695b912a6e 100644
--- a/src/Core/Domain/CartRule/QueryResult/CartRuleRestrictionsForEditing.php
+++ b/src/Core/Domain/CartRule/QueryResult/CartRuleRestrictionsForEditing.php
@@ -52,6 +52,11 @@ class CartRuleRestrictionsForEditing
      */
     private array $restrictedCountryIds;
 
+    /**
+     * @var int[]
+     */
+    private array $restrictedGroupIds;
+
     /**
      * @todo: fill other restrictions when related commands are implemented
      *
@@ -59,17 +64,20 @@ class CartRuleRestrictionsForEditing
      * @param RestrictionRuleGroup[] $productRestrictionRuleGroups
      * @param int[] $restrictedCarrierIds
      * @param int[] $restrictedCountryIds
+     * @param int[] $restrictedGroupIds
      */
     public function __construct(
         array $restrictedCartRuleIds,
         array $productRestrictionRuleGroups,
         array $restrictedCarrierIds,
-        array $restrictedCountryIds
+        array $restrictedCountryIds,
+        array $restrictedGroupIds
     ) {
         $this->restrictedCartRuleIds = $restrictedCartRuleIds;
         $this->productRestrictionRuleGroups = $productRestrictionRuleGroups;
         $this->restrictedCarrierIds = $restrictedCarrierIds;
         $this->restrictedCountryIds = $restrictedCountryIds;
+        $this->restrictedGroupIds = $restrictedGroupIds;
     }
 
     /**
@@ -103,4 +111,12 @@ public function getRestrictedCountryIds(): array
     {
         return $this->restrictedCountryIds;
     }
+
+    /**
+     * @return int[]
+     */
+    public function getRestrictedGroupIds(): array
+    {
+        return $this->restrictedGroupIds;
+    }
 }
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
index 431bab2c69106..128ba224edf90 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/AbstractCartRuleFeatureContext.php
@@ -309,6 +309,14 @@ protected function assertCartRuleProperties(CartRuleForEditing $cartRuleForEditi
                 'Unexpected restricted countries'
             );
         }
+
+        if (isset($expectedData['restricted groups'])) {
+            Assert::assertSame(
+                $this->referencesToIds($expectedData['restricted groups']),
+                $conditions->getRestrictions()->getRestrictedGroupIds(),
+                'Unexpected restricted groups'
+            );
+        }
     }
 
     protected function getCartRuleActionBuilder(): CartRuleActionBuilder
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/SetCartRuleRestrictionsFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/SetCartRuleRestrictionsFeatureContext.php
index 71a197c8c835d..4de118910ace5 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/SetCartRuleRestrictionsFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/SetCartRuleRestrictionsFeatureContext.php
@@ -74,18 +74,27 @@ public function setRestrictedCartRules(string $cartRuleReference, TableNode $tab
     }
 
     /**
+<<<<<<< HEAD
      * @When I restrict following carriers for cart rule :cartRuleReference:
+=======
+     * @When I restrict following groups for cart rule :cartRuleReference:
+>>>>>>> 81815d6434 ( implement customer group restrictions for cart rule)
      *
      * @param string $cartRuleReference
      * @param TableNode $tableNode
      *
      * @return void
      */
+<<<<<<< HEAD
     public function setRestrictedCarriers(string $cartRuleReference, TableNode $tableNode): void
+=======
+    public function setRestrictedGroups(string $cartRuleReference, TableNode $tableNode): void
+>>>>>>> 81815d6434 ( implement customer group restrictions for cart rule)
     {
         $command = $this->getRestrictionsCommand($cartRuleReference);
 
         try {
+<<<<<<< HEAD
             $command->setRestrictedCarrierIds($this->referencesToIds($tableNode->getRowsHash()['restricted carriers']));
             $this->restrictionCommandsByReference[$cartRuleReference] = $command;
         } catch (CartRuleConstraintException $e) {
@@ -107,6 +116,9 @@ public function setRestrictedCountries(string $cartRuleReference, TableNode $tab
 
         try {
             $command->setRestrictedCountryIds($this->referencesToIds($tableNode->getRowsHash()['restricted countries']));
+=======
+            $command->setRestrictedGroupIds($this->referencesToIds($tableNode->getRowsHash()['restricted groups']));
+>>>>>>> 81815d6434 ( implement customer group restrictions for cart rule)
             $this->restrictionCommandsByReference[$cartRuleReference] = $command;
         } catch (CartRuleConstraintException $e) {
             $this->setLastException($e);
@@ -200,12 +212,17 @@ public function clearCartRuleCombinationRestrictions(string $cartRuleReference):
     }
 
     /**
+<<<<<<< HEAD
      * @When I clear all carrier restrictions for cart rule :cartRuleReference
+=======
+     * @When I clear all group restrictions for cart rule :cartRuleReference
+>>>>>>> 81815d6434 ( implement customer group restrictions for cart rule)
      *
      * @param string $cartRuleReference
      *
      * @return void
      */
+<<<<<<< HEAD
     public function clearCartRuleCarrierRestrictions(string $cartRuleReference): void
     {
         $command = $this->getRestrictionsCommand($cartRuleReference);
@@ -225,6 +242,12 @@ public function clearCartRuleCountryRestrictions(string $cartRuleReference): voi
     {
         $command = $this->getRestrictionsCommand($cartRuleReference);
         $command->setRestrictedCountryIds([]);
+=======
+    public function clearCartRuleGroupRestrictions(string $cartRuleReference): void
+    {
+        $command = $this->getRestrictionsCommand($cartRuleReference);
+        $command->setRestrictedGroupIds([]);
+>>>>>>> 81815d6434 ( implement customer group restrictions for cart rule)
 
         $this->restrictionCommandsByReference[$cartRuleReference] = $command;
     }
@@ -248,8 +271,12 @@ public function saveRestrictionRules(string $cartRuleReference): void
 
         if (null === $command->getRestrictedCartRuleIds()
             && null === $command->getProductRestrictionRuleGroups()
+<<<<<<< HEAD
             && null === $command->getRestrictedCarrierIds()
             && null === $command->getRestrictedCountryIds()
+=======
+            && null === $command->getRestrictedGroupIds()
+>>>>>>> 81815d6434 ( implement customer group restrictions for cart rule)
         ) {
             throw new RuntimeException(
                 sprintf(
diff --git a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_group_restrictions.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_group_restrictions.feature
new file mode 100644
index 0000000000000..2e592071ddf91
--- /dev/null
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_group_restrictions.feature
@@ -0,0 +1,95 @@
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s cart_rule --tags set-group-restrictions
+@restore-all-tables-before-feature
+@set-group-restrictions
+Feature: Set cart rule customer group restrictions in BO
+  PrestaShop allows BO users to add and remove group restrictions of cart rule,
+  which defines whether or not the cart rule should be applicable to a specific customer group
+
+  Background:
+    Given shop "shop1" with name "test_shop" exists
+    And there is a currency named "usd" with iso code "USD" and exchange rate of 0.92
+    And there is a currency named "chf" with iso code "CHF" and exchange rate of 1.25
+    And currency "usd" is the default one
+    And language "language1" with locale "en-US" exists
+    And language with iso code "en" is the default one
+    And I create a Customer Group "group1" with the following details:
+      | name[en-US]             | Name EN |
+      | reduction               | 1.23    |
+      | displayPriceTaxExcluded | true    |
+      | showPrice               | true    |
+      | shopIds                 | shop1   |
+    And I create a Customer Group "group2" with the following details:
+      | name[en-US]             | Name EN |
+      | reduction               | 1.25    |
+      | displayPriceTaxExcluded | true    |
+      | showPrice               | true    |
+      | shopIds                 | shop1   |
+    And I add product "product1" with following information:
+      | name[en-US] | bottle of beer |
+      | type        | virtual        |
+    And I add product "product2" with following information:
+      | name[en-US] | T-shirt nr1 |
+      | type        | standard    |
+    And I add product "product3" with following information:
+      | name[en-US] | Shirt - Dom & Jquery |
+      | type        | standard             |
+    And there is a cart rule "rule_free_shipping_1" with following properties:
+      | name[en-US]       | free shipping 1      |
+      | is_active         | true                 |
+      | allow_partial_use | false                |
+      | priority          | 1                    |
+      | valid_from        | 2022-01-01 11:00:00  |
+      | valid_to          | 3001-01-01 12:00:00  |
+      | total_quantity    | 10                   |
+      | quantity_per_user | 10                   |
+      | free_shipping     | true                 |
+      | code              | rule_free_shipping_1 |
+      | restricted groups |                      |
+    And there is a cart rule "rule_50_percent" with following properties:
+      | name[en-US]                  | Half the price         |
+      | is_active                    | true                   |
+      | allow_partial_use            | true                   |
+      | priority                     | 2                      |
+      | valid_from                   | 2022-01-01 11:00:00    |
+      | valid_to                     | 3001-01-01 12:00:00    |
+      | total_quantity               | 10                     |
+      | quantity_per_user            | 12                     |
+      | free_shipping                | false                  |
+      | code                         | rule_50_percent        |
+      | discount_percentage          | 50                     |
+      | apply_to_discounted_products | false                  |
+      | discount_application_type    | order_without_shipping |
+      | restricted groups            |                        |
+    And I clear all group restrictions for cart rule rule_free_shipping_1
+    And I clear all group restrictions for cart rule rule_50_percent
+    And cart rule "rule_free_shipping_1" should have the following properties:
+      | restricted groups |  |
+    And cart rule "rule_50_percent" should have the following properties:
+      | restricted groups |  |
+
+  Scenario: Restrict cart rule groups and clear the restrictions
+    When I restrict following groups for cart rule rule_free_shipping_1:
+      | restricted groups | group1,group2 |
+    And I save all the restrictions for cart rule rule_free_shipping_1
+    And I restrict following groups for cart rule rule_50_percent:
+      | restricted groups | group1 |
+    And I save all the restrictions for cart rule rule_50_percent
+    Then cart rule rule_free_shipping_1 should have the following properties:
+      | restricted groups | group1,group2 |
+    And cart rule rule_50_percent should have the following properties:
+      | restricted groups | group1 |
+    When I restrict following groups for cart rule rule_free_shipping_1:
+      | restricted groups | group2 |
+    And I save all the restrictions for cart rule rule_free_shipping_1
+    And I clear all group restrictions for cart rule rule_50_percent
+    And I save all the restrictions for cart rule rule_50_percent
+    Then cart rule rule_free_shipping_1 should have the following properties:
+      | restricted groups | group2 |
+    Then cart rule rule_50_percent should have the following properties:
+      | restricted groups |  |
+    And I clear all group restrictions for cart rule rule_free_shipping_1
+    And I save all the restrictions for cart rule rule_free_shipping_1
+    Then cart rule rule_50_percent should have the following properties:
+      | restricted groups |  |
+    Then cart rule rule_50_percent should have the following properties:
+      | restricted groups |  |
diff --git a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_mixed_cart_rule_restrictions.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_mixed_cart_rule_restrictions.feature
index 34eff2d8ddce3..0764b2cee7236 100644
--- a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_mixed_cart_rule_restrictions.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_mixed_cart_rule_restrictions.feature
@@ -3,7 +3,7 @@
 @set-mixed-cart-rule-restrictions
 Feature: Set cart rule restrictions in BO
   PrestaShop allows BO users to add and remove various restriction rules which defines
-  how other cart rules, countries, products, carriers or customer groups affects validity of cart rule in cart.
+  how other cart rules, countries, products, groups or customer groups affects validity of cart rule in cart.
 
   Background:
     Given shop "shop1" with name "test_shop" exists
@@ -26,6 +26,7 @@ Feature: Set cart rule restrictions in BO
     And manufacturer graphicCorner named "Graphic Corner" exists
     And supplier fashionSupplier named "Fashion supplier" exists
     And supplier accessoriesSupplier named "Accessories supplier" exists
+<<<<<<< HEAD
     And there is a carrier named "carrier1"
     And there is a carrier named "carrier2"
     And I add new country "France" with following properties:
@@ -42,6 +43,20 @@ Feature: Set cart rule restrictions in BO
       | need_identification_number | false           |
       | display_tax_label          | true            |
       | shop_association           | 1               |
+=======
+    And I create a Customer Group "group1" with the following details:
+      | name[en-US]             | Name EN |
+      | reduction               | 1.23    |
+      | displayPriceTaxExcluded | true    |
+      | showPrice               | true    |
+      | shopIds                 | shop1   |
+    And I create a Customer Group "group2" with the following details:
+      | name[en-US]             | Name EN |
+      | reduction               | 1.25    |
+      | displayPriceTaxExcluded | true    |
+      | showPrice               | true    |
+      | shopIds                 | shop1   |
+>>>>>>> 81815d6434 ( implement customer group restrictions for cart rule)
     And I add product "product1" with following information:
       | name[en-US] | bottle of beer |
       | type        | virtual        |
@@ -92,6 +107,7 @@ Feature: Set cart rule restrictions in BO
       | discount_application_type    | order_without_shipping |
     And I clear cart rule combination restrictions for cart rule rule_free_shipping_1
     And I clear all product restrictions for cart rule rule_free_shipping_1
+<<<<<<< HEAD
     And I clear all carrier restrictions for cart rule rule_free_shipping_1
     And I clear cart rule combination restrictions for cart rule rule_50_percent
     And I clear all product restrictions for cart rule rule_50_percent
@@ -108,6 +124,24 @@ Feature: Set cart rule restrictions in BO
     And cart rule "rule_70_percent" should have the following properties:
       | restricted cart rules |  |
       | restricted carriers   |  |
+=======
+    And I clear all group restrictions for cart rule rule_free_shipping_1
+    And I clear cart rule combination restrictions for cart rule rule_50_percent
+    And I clear all product restrictions for cart rule rule_50_percent
+    And I clear all group restrictions for cart rule rule_50_percent
+    And I clear cart rule combination restrictions for cart rule rule_70_percent
+    And I clear all product restrictions for cart rule rule_70_percent
+    And I clear all group restrictions for cart rule rule_70_percent
+    And cart rule "rule_free_shipping_1" should have the following properties:
+      | restricted cart rules |  |
+      | restricted groups   |  |
+    And cart rule "rule_50_percent" should have the following properties:
+      | restricted cart rules |  |
+      | restricted groups   |  |
+    And cart rule "rule_70_percent" should have the following properties:
+      | restricted cart rules |  |
+      | restricted groups   |  |
+>>>>>>> 81815d6434 ( implement customer group restrictions for cart rule)
     And cart rule rule_free_shipping_1 should have no product restriction rules
     And cart rule rule_50_percent should have no product restriction rules
     And cart rule rule_70_percent should have no product restriction rules
@@ -115,10 +149,15 @@ Feature: Set cart rule restrictions in BO
   Scenario: Restrict cart rule combinations and various products restrictions
     When I restrict following cart rules for cart rule rule_free_shipping_1:
       | restricted cart rules | rule_50_percent,rule_70_percent |
+<<<<<<< HEAD
     And I restrict following carriers for cart rule rule_free_shipping_1:
       | restricted carriers | carrier1,carrier2 |
     And I restrict following countries for cart rule rule_free_shipping_1:
       | restricted countries | France |
+=======
+    And I restrict following groups for cart rule rule_free_shipping_1:
+      | restricted groups | group1,group2 |
+>>>>>>> 81815d6434 ( implement customer group restrictions for cart rule)
     And I add a restriction for cart rule rule_free_shipping_1, which requires at least 1 product in cart matching one of these rules:
       | type          | references                 |
       | products      | product1                   |
@@ -136,8 +175,12 @@ Feature: Set cart rule restrictions in BO
     And I save all the restrictions for cart rule rule_free_shipping_1
     Then cart rule "rule_free_shipping_1" should have the following properties:
       | restricted cart rules | rule_50_percent,rule_70_percent |
+<<<<<<< HEAD
       | restricted carriers   | carrier1,carrier2               |
       | restricted countries  | France                          |
+=======
+      | restricted groups   | group1,group2               |
+>>>>>>> 81815d6434 ( implement customer group restrictions for cart rule)
     And cart rule "rule_free_shipping_1" should have the following product restriction rule groups:
       | groupReference | quantity | rules count |
       | group_nr_1     | 1        | 5           |
diff --git a/tests/Integration/Behaviour/behat.yml b/tests/Integration/Behaviour/behat.yml
index 9ce36ce726936..3f65af206500c 100644
--- a/tests/Integration/Behaviour/behat.yml
+++ b/tests/Integration/Behaviour/behat.yml
@@ -265,7 +265,11 @@ default:
                 - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\DeleteCartRuleFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\EditCartRuleFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\SetCartRuleRestrictionsFeatureContext
+<<<<<<< HEAD
                 - Tests\Integration\Behaviour\Features\Context\Domain\CountryFeatureContext
+=======
+                - Tests\Integration\Behaviour\Features\Context\Domain\CustomerGroupFeatureContext
+>>>>>>> 81815d6434 ( implement customer group restrictions for cart rule)
                 - Tests\Integration\Behaviour\Features\Context\Domain\ManufacturerFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\Product\AddProductFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\Product\Combination\CombinationListingFeatureContext

From a9127ecf77c3ddbc8a7da240193067c4358039a9 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Wed, 5 Jul 2023 10:53:53 +0300
Subject: [PATCH 0429/1030]  rebase fixes

---
 .../Repository/CartRuleRepository.php         | 22 ++++++--
 .../SetCartRuleRestrictionsFeatureContext.php | 53 +++++++++++--------
 .../set_mixed_cart_rule_restrictions.feature  | 36 +++----------
 tests/Integration/Behaviour/behat.yml         |  3 --
 4 files changed, 55 insertions(+), 59 deletions(-)

diff --git a/src/Adapter/CartRule/Repository/CartRuleRepository.php b/src/Adapter/CartRule/Repository/CartRuleRepository.php
index b2b1d5ecd6afe..729d7ea1c0f69 100644
--- a/src/Adapter/CartRule/Repository/CartRuleRepository.php
+++ b/src/Adapter/CartRule/Repository/CartRuleRepository.php
@@ -358,6 +358,10 @@ public function setCarrierRestrictions(CartRuleId $cartRuleId, array $restricted
             $checkedIds[] = $restrictedCarrierIdValue;
         }
 
+        if (empty($insertValues)) {
+            return;
+        }
+
         $this->connection->executeStatement(
             sprintf(
                 'INSERT INTO %s (`id_cart_rule`, `id_carrier`) VALUES %s',
@@ -392,10 +396,14 @@ public function setGroupRestrictions(CartRuleId $cartRuleId, array $restrictedGr
             $checkedIds[] = $restrictedGroupIdValue;
         }
 
+        if (empty($insertValues)) {
+            return;
+        }
+
         $this->connection->executeStatement(
             sprintf(
-                'INSERT INTO %s (`id_cart_rule`, `id_carrier`) VALUES %s',
-                $this->dbPrefix . 'cart_rule_carrier',
+                'INSERT INTO %s (`id_cart_rule`, `id_group`) VALUES %s',
+                $this->dbPrefix . 'cart_rule_group',
                 implode(',', $insertValues)
             )
         );
@@ -427,10 +435,14 @@ public function setCountryRestrictions(CartRuleId $cartRuleId, array $restricted
             $checkedIds[] = $restrictedCountryIdValue;
         }
 
+        if (empty($insertValues)) {
+            return;
+        }
+
         $this->connection->executeStatement(
             sprintf(
-                'INSERT INTO %s (`id_cart_rule`, `id_group`) VALUES %s',
-                $this->dbPrefix . 'cart_rule_group',
+                'INSERT INTO %s (`id_cart_rule`, `id_country`) VALUES %s',
+                $this->dbPrefix . 'cart_rule_country',
                 implode(',', $insertValues)
             )
         );
@@ -457,7 +469,7 @@ public function getRestrictedCarrierIds(CartRuleId $cartRuleId): array
         }
 
         return array_map(static function (array $result): int {
-            return (int)$result['id_carrier'];
+            return (int) $result['id_carrier'];
         }, $results);
     }
 
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/SetCartRuleRestrictionsFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/SetCartRuleRestrictionsFeatureContext.php
index 4de118910ace5..3ffd58fc479e8 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CartRule/SetCartRuleRestrictionsFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CartRule/SetCartRuleRestrictionsFeatureContext.php
@@ -74,27 +74,18 @@ public function setRestrictedCartRules(string $cartRuleReference, TableNode $tab
     }
 
     /**
-<<<<<<< HEAD
      * @When I restrict following carriers for cart rule :cartRuleReference:
-=======
-     * @When I restrict following groups for cart rule :cartRuleReference:
->>>>>>> 81815d6434 ( implement customer group restrictions for cart rule)
      *
      * @param string $cartRuleReference
      * @param TableNode $tableNode
      *
      * @return void
      */
-<<<<<<< HEAD
     public function setRestrictedCarriers(string $cartRuleReference, TableNode $tableNode): void
-=======
-    public function setRestrictedGroups(string $cartRuleReference, TableNode $tableNode): void
->>>>>>> 81815d6434 ( implement customer group restrictions for cart rule)
     {
         $command = $this->getRestrictionsCommand($cartRuleReference);
 
         try {
-<<<<<<< HEAD
             $command->setRestrictedCarrierIds($this->referencesToIds($tableNode->getRowsHash()['restricted carriers']));
             $this->restrictionCommandsByReference[$cartRuleReference] = $command;
         } catch (CartRuleConstraintException $e) {
@@ -102,6 +93,26 @@ public function setRestrictedGroups(string $cartRuleReference, TableNode $tableN
         }
     }
 
+    /**
+     * @When I restrict following groups for cart rule :cartRuleReference:
+     *
+     * @param string $cartRuleReference
+     * @param TableNode $tableNode
+     *
+     * @return void
+     */
+    public function setRestrictedGroups(string $cartRuleReference, TableNode $tableNode): void
+    {
+        $command = $this->getRestrictionsCommand($cartRuleReference);
+
+        try {
+            $command->setRestrictedGroupIds($this->referencesToIds($tableNode->getRowsHash()['restricted groups']));
+            $this->restrictionCommandsByReference[$cartRuleReference] = $command;
+        } catch (CartRuleConstraintException $e) {
+            $this->setLastException($e);
+        }
+    }
+
     /**
      * @When I restrict following countries for cart rule :cartRuleReference:
      *
@@ -116,9 +127,6 @@ public function setRestrictedCountries(string $cartRuleReference, TableNode $tab
 
         try {
             $command->setRestrictedCountryIds($this->referencesToIds($tableNode->getRowsHash()['restricted countries']));
-=======
-            $command->setRestrictedGroupIds($this->referencesToIds($tableNode->getRowsHash()['restricted groups']));
->>>>>>> 81815d6434 ( implement customer group restrictions for cart rule)
             $this->restrictionCommandsByReference[$cartRuleReference] = $command;
         } catch (CartRuleConstraintException $e) {
             $this->setLastException($e);
@@ -212,17 +220,12 @@ public function clearCartRuleCombinationRestrictions(string $cartRuleReference):
     }
 
     /**
-<<<<<<< HEAD
      * @When I clear all carrier restrictions for cart rule :cartRuleReference
-=======
-     * @When I clear all group restrictions for cart rule :cartRuleReference
->>>>>>> 81815d6434 ( implement customer group restrictions for cart rule)
      *
      * @param string $cartRuleReference
      *
      * @return void
      */
-<<<<<<< HEAD
     public function clearCartRuleCarrierRestrictions(string $cartRuleReference): void
     {
         $command = $this->getRestrictionsCommand($cartRuleReference);
@@ -242,12 +245,21 @@ public function clearCartRuleCountryRestrictions(string $cartRuleReference): voi
     {
         $command = $this->getRestrictionsCommand($cartRuleReference);
         $command->setRestrictedCountryIds([]);
-=======
+
+        $this->restrictionCommandsByReference[$cartRuleReference] = $command;
+    }
+
+    /**
+     * @When I clear all group restrictions for cart rule :cartRuleReference
+     *
+     * @param string $cartRuleReference
+     *
+     * @return void
+     */
     public function clearCartRuleGroupRestrictions(string $cartRuleReference): void
     {
         $command = $this->getRestrictionsCommand($cartRuleReference);
         $command->setRestrictedGroupIds([]);
->>>>>>> 81815d6434 ( implement customer group restrictions for cart rule)
 
         $this->restrictionCommandsByReference[$cartRuleReference] = $command;
     }
@@ -271,12 +283,9 @@ public function saveRestrictionRules(string $cartRuleReference): void
 
         if (null === $command->getRestrictedCartRuleIds()
             && null === $command->getProductRestrictionRuleGroups()
-<<<<<<< HEAD
             && null === $command->getRestrictedCarrierIds()
             && null === $command->getRestrictedCountryIds()
-=======
             && null === $command->getRestrictedGroupIds()
->>>>>>> 81815d6434 ( implement customer group restrictions for cart rule)
         ) {
             throw new RuntimeException(
                 sprintf(
diff --git a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_mixed_cart_rule_restrictions.feature b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_mixed_cart_rule_restrictions.feature
index 0764b2cee7236..9e305d64b47f0 100644
--- a/tests/Integration/Behaviour/Features/Scenario/CartRule/set_mixed_cart_rule_restrictions.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/CartRule/set_mixed_cart_rule_restrictions.feature
@@ -26,7 +26,6 @@ Feature: Set cart rule restrictions in BO
     And manufacturer graphicCorner named "Graphic Corner" exists
     And supplier fashionSupplier named "Fashion supplier" exists
     And supplier accessoriesSupplier named "Accessories supplier" exists
-<<<<<<< HEAD
     And there is a carrier named "carrier1"
     And there is a carrier named "carrier2"
     And I add new country "France" with following properties:
@@ -43,7 +42,6 @@ Feature: Set cart rule restrictions in BO
       | need_identification_number | false           |
       | display_tax_label          | true            |
       | shop_association           | 1               |
-=======
     And I create a Customer Group "group1" with the following details:
       | name[en-US]             | Name EN |
       | reduction               | 1.23    |
@@ -56,7 +54,6 @@ Feature: Set cart rule restrictions in BO
       | displayPriceTaxExcluded | true    |
       | showPrice               | true    |
       | shopIds                 | shop1   |
->>>>>>> 81815d6434 ( implement customer group restrictions for cart rule)
     And I add product "product1" with following information:
       | name[en-US] | bottle of beer |
       | type        | virtual        |
@@ -107,41 +104,28 @@ Feature: Set cart rule restrictions in BO
       | discount_application_type    | order_without_shipping |
     And I clear cart rule combination restrictions for cart rule rule_free_shipping_1
     And I clear all product restrictions for cart rule rule_free_shipping_1
-<<<<<<< HEAD
     And I clear all carrier restrictions for cart rule rule_free_shipping_1
+    And I clear all group restrictions for cart rule rule_free_shipping_1
     And I clear cart rule combination restrictions for cart rule rule_50_percent
     And I clear all product restrictions for cart rule rule_50_percent
+    And I clear all group restrictions for cart rule rule_50_percent
     And I clear all carrier restrictions for cart rule rule_50_percent
     And I clear cart rule combination restrictions for cart rule rule_70_percent
     And I clear all product restrictions for cart rule rule_70_percent
     And I clear all carrier restrictions for cart rule rule_70_percent
+    And I clear all group restrictions for cart rule rule_70_percent
     And cart rule "rule_free_shipping_1" should have the following properties:
       | restricted cart rules |  |
       | restricted carriers   |  |
+      | restricted groups     |  |
     And cart rule "rule_50_percent" should have the following properties:
       | restricted cart rules |  |
       | restricted carriers   |  |
+      | restricted groups     |  |
     And cart rule "rule_70_percent" should have the following properties:
       | restricted cart rules |  |
       | restricted carriers   |  |
-=======
-    And I clear all group restrictions for cart rule rule_free_shipping_1
-    And I clear cart rule combination restrictions for cart rule rule_50_percent
-    And I clear all product restrictions for cart rule rule_50_percent
-    And I clear all group restrictions for cart rule rule_50_percent
-    And I clear cart rule combination restrictions for cart rule rule_70_percent
-    And I clear all product restrictions for cart rule rule_70_percent
-    And I clear all group restrictions for cart rule rule_70_percent
-    And cart rule "rule_free_shipping_1" should have the following properties:
-      | restricted cart rules |  |
-      | restricted groups   |  |
-    And cart rule "rule_50_percent" should have the following properties:
-      | restricted cart rules |  |
-      | restricted groups   |  |
-    And cart rule "rule_70_percent" should have the following properties:
-      | restricted cart rules |  |
-      | restricted groups   |  |
->>>>>>> 81815d6434 ( implement customer group restrictions for cart rule)
+      | restricted groups     |  |
     And cart rule rule_free_shipping_1 should have no product restriction rules
     And cart rule rule_50_percent should have no product restriction rules
     And cart rule rule_70_percent should have no product restriction rules
@@ -149,15 +133,12 @@ Feature: Set cart rule restrictions in BO
   Scenario: Restrict cart rule combinations and various products restrictions
     When I restrict following cart rules for cart rule rule_free_shipping_1:
       | restricted cart rules | rule_50_percent,rule_70_percent |
-<<<<<<< HEAD
     And I restrict following carriers for cart rule rule_free_shipping_1:
       | restricted carriers | carrier1,carrier2 |
     And I restrict following countries for cart rule rule_free_shipping_1:
       | restricted countries | France |
-=======
     And I restrict following groups for cart rule rule_free_shipping_1:
       | restricted groups | group1,group2 |
->>>>>>> 81815d6434 ( implement customer group restrictions for cart rule)
     And I add a restriction for cart rule rule_free_shipping_1, which requires at least 1 product in cart matching one of these rules:
       | type          | references                 |
       | products      | product1                   |
@@ -175,12 +156,9 @@ Feature: Set cart rule restrictions in BO
     And I save all the restrictions for cart rule rule_free_shipping_1
     Then cart rule "rule_free_shipping_1" should have the following properties:
       | restricted cart rules | rule_50_percent,rule_70_percent |
-<<<<<<< HEAD
       | restricted carriers   | carrier1,carrier2               |
       | restricted countries  | France                          |
-=======
-      | restricted groups   | group1,group2               |
->>>>>>> 81815d6434 ( implement customer group restrictions for cart rule)
+      | restricted groups     | group1,group2                   |
     And cart rule "rule_free_shipping_1" should have the following product restriction rule groups:
       | groupReference | quantity | rules count |
       | group_nr_1     | 1        | 5           |
diff --git a/tests/Integration/Behaviour/behat.yml b/tests/Integration/Behaviour/behat.yml
index 3f65af206500c..1808974f40321 100644
--- a/tests/Integration/Behaviour/behat.yml
+++ b/tests/Integration/Behaviour/behat.yml
@@ -265,11 +265,8 @@ default:
                 - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\DeleteCartRuleFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\EditCartRuleFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\CartRule\SetCartRuleRestrictionsFeatureContext
-<<<<<<< HEAD
                 - Tests\Integration\Behaviour\Features\Context\Domain\CountryFeatureContext
-=======
                 - Tests\Integration\Behaviour\Features\Context\Domain\CustomerGroupFeatureContext
->>>>>>> 81815d6434 ( implement customer group restrictions for cart rule)
                 - Tests\Integration\Behaviour\Features\Context\Domain\ManufacturerFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\Product\AddProductFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\Domain\Product\Combination\CombinationListingFeatureContext

From 14917c65d10174f621cb76cc09d1990befc3ad17 Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Wed, 5 Jul 2023 10:55:38 +0300
Subject: [PATCH 0430/1030]  use property promotion in query and add private
 method to reuse code

---
 .../Repository/CartRuleRepository.php         | 185 ++++++------------
 .../CartRuleRestrictionsForEditing.php        |  42 +---
 2 files changed, 63 insertions(+), 164 deletions(-)

diff --git a/src/Adapter/CartRule/Repository/CartRuleRepository.php b/src/Adapter/CartRule/Repository/CartRuleRepository.php
index 729d7ea1c0f69..968e4e61fc843 100644
--- a/src/Adapter/CartRule/Repository/CartRuleRepository.php
+++ b/src/Adapter/CartRule/Repository/CartRuleRepository.php
@@ -40,6 +40,7 @@
 use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\Restriction\RestrictionRuleGroup;
 use PrestaShop\PrestaShop\Core\Domain\Country\ValueObject\CountryId;
 use PrestaShop\PrestaShop\Core\Domain\Customer\Group\ValueObject\GroupId;
+use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
 use PrestaShop\PrestaShop\Core\Repository\AbstractObjectModelRepository;
 
 class CartRuleRepository extends AbstractObjectModelRepository
@@ -339,36 +340,7 @@ public function restrictCartRules(CartRuleId $cartRuleId, array $restrictedCartR
      */
     public function setCarrierRestrictions(CartRuleId $cartRuleId, array $restrictedCarrierIds): void
     {
-        $this->removeCarrierRestrictions($cartRuleId);
-
-        if (empty($restrictedCarrierIds)) {
-            return;
-        }
-
-        $checkedIds = [];
-        $insertValues = [];
-
-        foreach ($restrictedCarrierIds as $restrictedCarrierId) {
-            $restrictedCarrierIdValue = $restrictedCarrierId->getValue();
-            // skip duplicate ids if for some reason they exist
-            if (in_array($restrictedCarrierIdValue, $checkedIds, true)) {
-                continue;
-            }
-            $insertValues[] = sprintf('(%d,%d)', $cartRuleId->getValue(), $restrictedCarrierIdValue);
-            $checkedIds[] = $restrictedCarrierIdValue;
-        }
-
-        if (empty($insertValues)) {
-            return;
-        }
-
-        $this->connection->executeStatement(
-            sprintf(
-                'INSERT INTO %s (`id_cart_rule`, `id_carrier`) VALUES %s',
-                $this->dbPrefix . 'cart_rule_carrier',
-                implode(',', $insertValues)
-            )
-        );
+        $this->setRestrictionsByName($cartRuleId, $restrictedCarrierIds, 'carrier');
     }
 
     /**
@@ -378,35 +350,7 @@ public function setCarrierRestrictions(CartRuleId $cartRuleId, array $restricted
      */
     public function setGroupRestrictions(CartRuleId $cartRuleId, array $restrictedGroupIds): void
     {
-        $this->removeGroupRestrictions($cartRuleId);
-
-        if (empty($restrictedGroupIds)) {
-            return;
-        }
-
-        $checkedIds = [];
-        $insertValues = [];
-        foreach ($restrictedGroupIds as $restrictedGroupId) {
-            $restrictedGroupIdValue = $restrictedGroupId->getValue();
-            // skip duplicate ids if for some reason they exist
-            if (in_array($restrictedGroupIdValue, $checkedIds, true)) {
-                continue;
-            }
-            $insertValues[] = sprintf('(%d,%d)', $cartRuleId->getValue(), $restrictedGroupIdValue);
-            $checkedIds[] = $restrictedGroupIdValue;
-        }
-
-        if (empty($insertValues)) {
-            return;
-        }
-
-        $this->connection->executeStatement(
-            sprintf(
-                'INSERT INTO %s (`id_cart_rule`, `id_group`) VALUES %s',
-                $this->dbPrefix . 'cart_rule_group',
-                implode(',', $insertValues)
-            )
-        );
+        $this->setRestrictionsByName($cartRuleId, $restrictedGroupIds, 'group');
     }
 
     /**
@@ -417,35 +361,7 @@ public function setGroupRestrictions(CartRuleId $cartRuleId, array $restrictedGr
      */
     public function setCountryRestrictions(CartRuleId $cartRuleId, array $restrictedCountryIds): void
     {
-        $this->removeCountryRestrictions($cartRuleId);
-
-        if (empty($restrictedCountryIds)) {
-            return;
-        }
-
-        $checkedIds = [];
-        $insertValues = [];
-        foreach ($restrictedCountryIds as $restrictedCountryId) {
-            $restrictedCountryIdValue = $restrictedCountryId->getValue();
-            // skip duplicate ids if for some reason they exist
-            if (in_array($restrictedCountryIdValue, $checkedIds, true)) {
-                continue;
-            }
-            $insertValues[] = sprintf('(%d,%d)', $cartRuleId->getValue(), $restrictedCountryIdValue);
-            $checkedIds[] = $restrictedCountryIdValue;
-        }
-
-        if (empty($insertValues)) {
-            return;
-        }
-
-        $this->connection->executeStatement(
-            sprintf(
-                'INSERT INTO %s (`id_cart_rule`, `id_country`) VALUES %s',
-                $this->dbPrefix . 'cart_rule_country',
-                implode(',', $insertValues)
-            )
-        );
+        $this->setRestrictionsByName($cartRuleId, $restrictedCountryIds, 'country');
     }
 
     /**
@@ -468,9 +384,7 @@ public function getRestrictedCarrierIds(CartRuleId $cartRuleId): array
             return [];
         }
 
-        return array_map(static function (array $result): int {
-            return (int) $result['id_carrier'];
-        }, $results);
+        return array_map(static fn (array $result): int => (int) $result['id_carrier'], $results);
     }
 
     public function getRestrictedGroupIds(CartRuleId $cartRuleId): array
@@ -489,9 +403,7 @@ public function getRestrictedGroupIds(CartRuleId $cartRuleId): array
             return [];
         }
 
-        return array_map(static function (array $result): int {
-            return (int) $result['id_group'];
-        }, $results);
+        return array_map(static fn (array $result): int => (int) $result['id_group'], $results);
     }
 
     /**
@@ -515,39 +427,7 @@ public function getRestrictedCountryIds(CartRuleId $cartRuleId): array
             return [];
         }
 
-        return array_map(static function (array $result): int {
-            return (int) $result['id_country'];
-        }, $results);
-    }
-
-    private function removeCarrierRestrictions(CartRuleId $cartRuleId): void
-    {
-        $this->connection->createQueryBuilder()
-            ->delete($this->dbPrefix . 'cart_rule_carrier', 'crc')
-            ->where('crc.id_cart_rule = :cartRuleId')
-            ->setParameter('cartRuleId', $cartRuleId->getValue())
-            ->execute()
-        ;
-    }
-
-    private function removeCountryRestrictions(CartRuleId $cartRuleId): void
-    {
-        $this->connection->createQueryBuilder()
-            ->delete($this->dbPrefix . 'cart_rule_country', 'crc')
-            ->where('crc.id_cart_rule = :cartRuleId')
-            ->setParameter('cartRuleId', $cartRuleId->getValue())
-            ->execute()
-        ;
-    }
-
-    private function removeGroupRestrictions(CartRuleId $cartRuleId): void
-    {
-        $this->connection->createQueryBuilder()
-            ->delete($this->dbPrefix . 'cart_rule_group', 'crc')
-            ->where('crc.id_cart_rule = :cartRuleId')
-            ->setParameter('cartRuleId', $cartRuleId->getValue())
-            ->execute()
-        ;
+        return array_map(static fn (array $result): int => (int) $result['id_country'], $results);
     }
 
     private function removeRestrictedCartRules(CartRuleId $cartRuleId): void
@@ -591,4 +471,55 @@ private function removeProductRestrictions(CartRuleId $cartRuleId): void
             ->execute()
         ;
     }
+
+    /**
+     * @param CartRuleId $cartRuleId
+     * @param CarrierId[]|CountryId[]|GroupId[] $entityIds
+     * @param string $entityName
+     *
+     * @return void
+     */
+    private function setRestrictionsByName(CartRuleId $cartRuleId, array $entityIds, string $entityName): void
+    {
+        $availableEntityNames = ['carrier', 'country', 'group'];
+        if (!in_array($entityName, $availableEntityNames, true)) {
+            throw new InvalidArgumentException('Invalid $entityName provided');
+        }
+
+        $this->removeRestrictionsByName($cartRuleId, $entityName);
+
+        if (empty($entityIds)) {
+            return;
+        }
+
+        $checkedIds = [];
+        $insertValues = [];
+        foreach ($entityIds as $entityId) {
+            $entityIdValue = $entityId->getValue();
+            // skip duplicate ids if for some reason they exist
+            if (in_array($entityIdValue, $checkedIds, true)) {
+                continue;
+            }
+            $insertValues[] = sprintf('(%d,%d)', $cartRuleId->getValue(), $entityIdValue);
+            $checkedIds[] = $entityIdValue;
+        }
+
+        $this->connection->executeStatement(
+            sprintf(
+                'INSERT INTO %s (`id_cart_rule`, `id_' . $entityName . '`) VALUES %s',
+                $this->dbPrefix . 'cart_rule_' . $entityName,
+                implode(',', $insertValues)
+            )
+        );
+    }
+
+    private function removeRestrictionsByName(CartRuleId $cartRuleId, string $entityName)
+    {
+        $this->connection->createQueryBuilder()
+            ->delete($this->dbPrefix . 'cart_rule_' . $entityName, 'crc')
+            ->where('crc.id_cart_rule = :cartRuleId')
+            ->setParameter('cartRuleId', $cartRuleId->getValue())
+            ->execute()
+        ;
+    }
 }
diff --git a/src/Core/Domain/CartRule/QueryResult/CartRuleRestrictionsForEditing.php b/src/Core/Domain/CartRule/QueryResult/CartRuleRestrictionsForEditing.php
index a79695b912a6e..1e2bfd7acc3aa 100644
--- a/src/Core/Domain/CartRule/QueryResult/CartRuleRestrictionsForEditing.php
+++ b/src/Core/Domain/CartRule/QueryResult/CartRuleRestrictionsForEditing.php
@@ -33,33 +33,6 @@
 class CartRuleRestrictionsForEditing
 {
     /**
-     * @var int[]
-     */
-    private array $restrictedCartRuleIds;
-
-    /**
-     * @var RestrictionRuleGroup[]
-     */
-    private array $productRestrictionRuleGroups;
-
-    /**
-     * @var int[]
-     */
-    private array $restrictedCarrierIds;
-
-    /**
-     * @var int[]
-     */
-    private array $restrictedCountryIds;
-
-    /**
-     * @var int[]
-     */
-    private array $restrictedGroupIds;
-
-    /**
-     * @todo: fill other restrictions when related commands are implemented
-     *
      * @param int[] $restrictedCartRuleIds
      * @param RestrictionRuleGroup[] $productRestrictionRuleGroups
      * @param int[] $restrictedCarrierIds
@@ -67,17 +40,12 @@ class CartRuleRestrictionsForEditing
      * @param int[] $restrictedGroupIds
      */
     public function __construct(
-        array $restrictedCartRuleIds,
-        array $productRestrictionRuleGroups,
-        array $restrictedCarrierIds,
-        array $restrictedCountryIds,
-        array $restrictedGroupIds
+        private readonly array $restrictedCartRuleIds,
+        private readonly array $productRestrictionRuleGroups,
+        private readonly array $restrictedCarrierIds,
+        private readonly array $restrictedCountryIds,
+        private readonly array $restrictedGroupIds
     ) {
-        $this->restrictedCartRuleIds = $restrictedCartRuleIds;
-        $this->productRestrictionRuleGroups = $productRestrictionRuleGroups;
-        $this->restrictedCarrierIds = $restrictedCarrierIds;
-        $this->restrictedCountryIds = $restrictedCountryIds;
-        $this->restrictedGroupIds = $restrictedGroupIds;
     }
 
     /**

From 185cb0ef6196c6b7e43aaa5eb14cb175894688eb Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Wed, 5 Jul 2023 11:30:24 +0200
Subject: [PATCH 0431/1030] fix UI tests

---
 .../01_viewCustomerService.ts                 | 160 ------------------
 .../03_emailTheme/01_previewEmailThemes.ts    |   2 +-
 tests/UI/pages/BO/design/emailThemes/index.ts |   2 +-
 3 files changed, 2 insertions(+), 162 deletions(-)
 delete mode 100644 tests/UI/campaigns/functional/BO/05_customerService/01_customerService/01_viewCustomerService.ts

diff --git a/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/01_viewCustomerService.ts b/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/01_viewCustomerService.ts
deleted file mode 100644
index 48607cd0dc052..0000000000000
--- a/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/01_viewCustomerService.ts
+++ /dev/null
@@ -1,160 +0,0 @@
-// Import utils
-import files from '@utils/files';
-import helper from '@utils/helpers';
-import testContext from '@utils/testContext';
-
-// Import commonTests
-import loginCommon from '@commonTests/BO/loginBO';
-
-// Import pages
-// Import BO pages
-import customerServicePage from '@pages/BO/customerService/customerService';
-import viewPage from '@pages/BO/customerService/customerService/view';
-import dashboardPage from '@pages/BO/dashboard';
-// Import FO pages
-import contactUsPage from '@pages/FO/contactUs';
-import {homePage} from '@pages/FO/home';
-
-// Import data
-import MessageData from '@data/faker/message';
-
-import {expect} from 'chai';
-import type {BrowserContext, Page} from 'playwright';
-
-const baseContext: string = 'functional_BO_customerService_customerService_viewCustomerService';
-
-/*
-Send message by customer to customer service in FO
-View customer message in BO
- */
-describe('BO - Customer Service : View messages', async () => {
-  let browserContext: BrowserContext;
-  let page: Page;
-  let idCustomer: string = '0';
-  let messageDateTime: string = '';
-
-  const contactUsData: MessageData = new MessageData({subject: 'Customer service'});
-
-  // before and after functions
-  before(async function () {
-    browserContext = await helper.createBrowserContext(this.browser);
-    page = await helper.newTab(browserContext);
-
-    await files.generateImage(`${contactUsData.fileName}.jpg`);
-  });
-
-  after(async () => {
-    await helper.closeBrowserContext(browserContext);
-
-    await files.deleteFile(`${contactUsData.fileName}.jpg`);
-  });
-
-  it('should open the shop page', async function () {
-    await testContext.addContextItem(this, 'testIdentifier', 'openShop', baseContext);
-
-    await homePage.goTo(page, global.FO.URL);
-
-    const isHomePage = await homePage.isHomePage(page);
-    await expect(isHomePage).to.be.true;
-  });
-
-  it('should go to contact us page', async function () {
-    await testContext.addContextItem(this, 'testIdentifier', 'goOnContactPage', baseContext);
-
-    // Go to contact us page
-    await homePage.goToFooterLink(page, 'Contact us');
-
-    const pageTitle = await contactUsPage.getPageTitle(page);
-    await expect(pageTitle).to.equal(contactUsPage.pageTitle);
-  });
-
-  it('should send message to customer service', async function () {
-    await testContext.addContextItem(this, 'testIdentifier', 'sendMessage', baseContext);
-
-    await contactUsPage.sendMessage(page, contactUsData, `${contactUsData.fileName}.jpg`);
-
-    const validationMessage = await contactUsPage.getAlertSuccess(page);
-    await expect(validationMessage).to.equal(contactUsPage.validationMessage);
-  });
-
-  it('should login in BO', async function () {
-    await loginCommon.loginBO(this, page);
-  });
-
-  it('should go to \'Customer Service > Customer Service\' page', async function () {
-    await testContext.addContextItem(this, 'testIdentifier', 'goToOrderMessagesPage', baseContext);
-
-    await dashboardPage.goToSubMenu(
-      page,
-      dashboardPage.customerServiceParentLink,
-      dashboardPage.customerServiceLink,
-    );
-
-    const pageTitle = await customerServicePage.getPageTitle(page);
-    await expect(pageTitle).to.contains(customerServicePage.pageTitle);
-  });
-
-  it('should get the customer service id and the date', async function () {
-    await testContext.addContextItem(this, 'testIdentifier', 'getMessageID', baseContext);
-
-    idCustomer = await customerServicePage.getTextColumn(page, 1, 'id_customer_thread');
-    await expect(parseInt(idCustomer, 10)).to.be.at.least(0);
-
-    messageDateTime = await customerServicePage.getTextColumn(page, 1, 'date');
-  });
-
-  it('should go to view message page', async function () {
-    await testContext.addContextItem(this, 'testIdentifier', 'goToViewMessagePage', baseContext);
-
-    await customerServicePage.goToViewMessagePage(page);
-
-    const pageTitle = await viewPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(viewPage.pageTitle);
-  });
-
-  it('should check the thread form', async function () {
-    await testContext.addContextItem(this, 'testIdentifier', 'checkThreadForm', baseContext);
-
-    const text = await viewPage.getCustomerMessage(page);
-    expect(text).to.contains(contactUsData.emailAddress);
-    expect(text).to.contains(contactUsData.subject);
-    expect(text).to.contains(`${messageDateTime.substring(0, 10)} - ${messageDateTime.substring(11, 5)}`);
-    expect(text).to.contains('Attachment');
-    expect(text).to.contains(contactUsData.message);
-  });
-
-  it('should check your answer form', async function () {
-    await testContext.addContextItem(this, 'testIdentifier', 'checkYourAnswerForm', baseContext);
-
-    // Check that title has email on it
-    const titleContent = await viewPage.getYourAnswerFormTitle(page);
-    expect(titleContent).to.contains(`Your answer to ${contactUsData.emailAddress}`);
-
-    // Check form content
-    const formContent = await viewPage.getYourAnswerFormContent(page);
-    expect(formContent).to.contains('Dear Customer, Regards, Customer service');
-  });
-
-  it('should check orders and messages timeline', async function () {
-    await testContext.addContextItem(this, 'testIdentifier', 'checkOrdersAndMessagesForm', baseContext);
-
-    const text = await viewPage.getOrdersAndMessagesTimeline(page);
-    expect(text).to.contains('Orders and messages timeline');
-    expect(text).to.contains(`${messageDateTime.substring(0, 10)} - ${messageDateTime.substring(11, 5)}`);
-    expect(text).to.contains(`Message to: ${contactUsData.subject}`);
-    expect(text).to.contains(contactUsData.message);
-  });
-
-  it('should delete the message', async function () {
-    await testContext.addContextItem(this, 'testIdentifier', 'deleteMessage', baseContext);
-
-    await dashboardPage.goToSubMenu(
-      page,
-      dashboardPage.customerServiceParentLink,
-      dashboardPage.customerServiceLink,
-    );
-
-    const textResult = await customerServicePage.deleteMessage(page, 1);
-    await expect(textResult).to.contains(customerServicePage.successfulDeleteMessage);
-  });
-});
diff --git a/tests/UI/campaigns/functional/BO/08_design/03_emailTheme/01_previewEmailThemes.ts b/tests/UI/campaigns/functional/BO/08_design/03_emailTheme/01_previewEmailThemes.ts
index 05b8b3154da21..96fe1047c19b4 100644
--- a/tests/UI/campaigns/functional/BO/08_design/03_emailTheme/01_previewEmailThemes.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/03_emailTheme/01_previewEmailThemes.ts
@@ -62,7 +62,7 @@ describe('BO - Design - Email Theme : Preview email theme', async () => {
 
         await emailThemesPage.previewEmailTheme(page, test.args.emailThemeName);
 
-        const pageTitle = await emailThemesPage.getPageTitle(page);
+        const pageTitle = await previewEmailThemesPage.getPageTitle(page);
         await expect(pageTitle).to.contains(
           `${previewEmailThemesPage.pageTitle} ${test.args.emailThemeName}`,
         );
diff --git a/tests/UI/pages/BO/design/emailThemes/index.ts b/tests/UI/pages/BO/design/emailThemes/index.ts
index ca0fdec2ce889..c477f19c3c209 100644
--- a/tests/UI/pages/BO/design/emailThemes/index.ts
+++ b/tests/UI/pages/BO/design/emailThemes/index.ts
@@ -81,7 +81,7 @@ class EmailTheme extends BOBasePage {
         /* eslint-disable no-loop-func */
         await Promise.all([
           tableRows[i].$eval(this.columnActionPreviewLink, (el: HTMLElement) => el.click()),
-          page.waitForURL(''),
+          page.waitForURL('**/mail_theme/preview/**'),
         ]);
         /* eslint-enable no-loop-func */
         found = true;

From 575b89f53e063a9930224e337478fce3b079c843 Mon Sep 17 00:00:00 2001
From: lartist <salim-benouamer.ext@prestashop.com>
Date: Wed, 5 Jul 2023 12:08:19 +0200
Subject: [PATCH 0432/1030] Set escaping on html attribute

---
 config/smarty.config.inc.php                  |  1 -
 phpstan-tmp-legacy-layout-baseline.neon       | 11 +++++++++
 phpstan.neon.dist                             |  1 +
 .../Component/Layout/quick_access.html.twig   | 16 ++++++-------
 .../Twig/Component/QuickAccess.php            | 24 +++++++++++++++++++
 .../Twig/Extension/AddSlashesExtension.php    | 18 --------------
 6 files changed, 44 insertions(+), 27 deletions(-)
 create mode 100644 phpstan-tmp-legacy-layout-baseline.neon
 delete mode 100644 src/PrestaShopBundle/Twig/Extension/AddSlashesExtension.php

diff --git a/config/smarty.config.inc.php b/config/smarty.config.inc.php
index 5a6a48af9560f..ca910bcb888a0 100644
--- a/config/smarty.config.inc.php
+++ b/config/smarty.config.inc.php
@@ -239,7 +239,6 @@ function renderTemplate(array $params) {
     $smartyTemplate = $params['smarty_template'];
     unset($params['smarty_template']);
 
-    //dd(isset($params["quick_access_current_link_icon"]));
     if (
         SymfonyContainer::getInstance()
             ->get('request_stack')
diff --git a/phpstan-tmp-legacy-layout-baseline.neon b/phpstan-tmp-legacy-layout-baseline.neon
new file mode 100644
index 0000000000000..0e265779b1ada
--- /dev/null
+++ b/phpstan-tmp-legacy-layout-baseline.neon
@@ -0,0 +1,11 @@
+parameters:
+	ignoreErrors:
+		-
+			message: "#^Namespace Link is forbidden, No legacy calls inside the prestashop bundle. Please create an interface and an adapter if you need to\\.$#"
+			count: 1
+			path: src/PrestaShopBundle/Twig/Component/QuickAccess.php
+
+		-
+			message: "#^Class Link is forbidden, No legacy calls inside the prestashop bundle. Please create an interface and an adapter if you need to\\.$#"
+			count: 1
+			path: src/PrestaShopBundle/Twig/Component/QuickAccess.php
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index ecd8f106d7091..d790c4c5b6d8f 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -1,6 +1,7 @@
 includes:
 	- phpstan-baseline.neon
 	- phpstan-disallowed-calls.neon
+	- phpstan-tmp-legacy-layout-baseline.neon
 parameters:
   phpVersion: 80100
   level: 5
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/quick_access.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/quick_access.html.twig
index da30ba645305d..17151c29a8488 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/quick_access.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/quick_access.html.twig
@@ -30,16 +30,16 @@
     {% for quick in quickAccess %}
       <a class="
         dropdown-item quick-row-link
-        {% if quick.class is defined %}{{ quick.class}}{% endif %}
+        {% if quick.class is defined %}{{ quick.class|escape('html_attr') }}{% endif %}
         {% if link.matchQuickLink(quick.link) %}
           {% set matchQuickLink = quick.id_quick_access %}
           active
         {% endif %}
       "
-      href="{{ quick.link|escape('html') }}"
+      href="{{ quick.link|escape('html_attr') }}"
       {% if quick.new_window %} target="_blank"{% endif %}
       data-item="{{ quick.name }}"
-      >{{ quick.name }}</a>
+      >{{ quick.name|escape('html_attr') }}</a>
     {% endfor %}
     <div class="dropdown-divider"></div>
     {% if matchQuickLink is defined %}
@@ -50,9 +50,9 @@
          data-quicklink-id="{{ matchQuickLink }}"
          data-rand="{{ random(1, 200) }}"
          data-icon="{{ quickAccessCurrentLinkIcon }}"
-         data-url="{{ link.getQuickLink(app.request.uri|escape('js')) }}"
+         data-url="{{ link.getQuickLink(app.request.uri|escape('html_attr')) }}"
          data-post-link="{{ link.getAdminLink('AdminQuickAccesses') }}"
-         data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header')|escape('js') }}"
+         data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header')|escape('html_attr') }}"
          data-link="{{ quickAccessCurrentLinkName|truncate(32) }}"
       >
         <i class="material-icons">remove_circle_outline</i>
@@ -65,16 +65,16 @@
        data-rand="{{ random(1, 200) }}"
        data-icon="{{ quickAccessCurrentLinkIcon }}"
        data-method="add"
-       data-url="{{ link.getQuickLink(app.request.uri|escape('js')) }}"
+       data-url="{{ link.getQuickLink(app.request.uri|escape('html_attr')) }}"
        data-post-link="{{ link.getAdminLink('AdminQuickAccesses') }}"
-       data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header')|escape('js')}}"
+       data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header')|escape('html_attr')}}"
        data-link="{{ quickAccessCurrentLinkName|truncate(32) }}"
     >
       <i class="material-icons">add_circle</i>
       {{ 'Add current page to Quick Access'|trans({}, 'Admin.Actions') }}
     </a>
     {% endif %}
-    <a id="quick-manage-link" class="dropdown-item" href="{{ link.getAdminLink("AdminQuickAccesses")|addslashes }}">
+    <a id="quick-manage-link" class="dropdown-item" href="{{ link.getAdminLink('AdminQuickAccesses') }}">
     <i class="material-icons">settings</i>
     {{ 'Manage your quick accesses'|trans({}, 'Admin.Navigation.Header') }}
     </a>
diff --git a/src/PrestaShopBundle/Twig/Component/QuickAccess.php b/src/PrestaShopBundle/Twig/Component/QuickAccess.php
index 3d18272ac1c8b..197724e53cbaa 100644
--- a/src/PrestaShopBundle/Twig/Component/QuickAccess.php
+++ b/src/PrestaShopBundle/Twig/Component/QuickAccess.php
@@ -1,4 +1,28 @@
 <?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
 
 declare(strict_types=1);
 
diff --git a/src/PrestaShopBundle/Twig/Extension/AddSlashesExtension.php b/src/PrestaShopBundle/Twig/Extension/AddSlashesExtension.php
deleted file mode 100644
index 2ac08b0dd3dc0..0000000000000
--- a/src/PrestaShopBundle/Twig/Extension/AddSlashesExtension.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace PrestaShopBundle\Twig\Extension;
-
-use Twig\Extension\AbstractExtension;
-use Twig\TwigFilter;
-
-class AddSlashesExtension extends AbstractExtension
-{
-    public function getFilters()
-    {
-        return [
-            new TwigFilter('addslashes', 'addslashes'),
-        ];
-    }
-}

From 4b4b64aa4ad60c423aecfc0cc5fa80fda1ad0bb4 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Wed, 5 Jul 2023 12:59:05 +0200
Subject: [PATCH 0433/1030] Fix UI tests

---
 .../01_installation/04_uninstallAndDeleteModule.ts        | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/tests/UI/campaigns/modules/ps_facetedsearch/01_installation/04_uninstallAndDeleteModule.ts b/tests/UI/campaigns/modules/ps_facetedsearch/01_installation/04_uninstallAndDeleteModule.ts
index c4a971bb07e6b..18f5c510230aa 100644
--- a/tests/UI/campaigns/modules/ps_facetedsearch/01_installation/04_uninstallAndDeleteModule.ts
+++ b/tests/UI/campaigns/modules/ps_facetedsearch/01_installation/04_uninstallAndDeleteModule.ts
@@ -85,10 +85,6 @@ describe('Faceted search module - Uninstall and delete module', async () => {
     const successMessage = await moduleManagerPage.setActionInModule(page, Modules.psFacetedSearch, 'uninstall', false, true);
     await expect(successMessage).to.eq(moduleManagerPage.uninstallModuleSuccessMessage(Modules.psFacetedSearch.tag));
 
-    // Check the button at the right of the module is displaying "Install"
-    const mainAction = await moduleManagerPage.getMainActionInModule(page, Modules.psFacetedSearch);
-    await expect(mainAction).to.be.eq('install');
-
     // Check the directory `modules/Modules.psFacetedSearch.tag`
     const dirExists = await files.doesFileExist(`${files.getRootPath()}/modules/${Modules.psFacetedSearch.tag}/`);
     await expect(dirExists).to.be.false;
@@ -149,8 +145,8 @@ describe('Faceted search module - Uninstall and delete module', async () => {
     it('should close upload module modal', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'closeModal', baseContext);
 
-      const isModalVisible = await moduleManagerPage.closeUploadModuleModal(page);
-      await expect(isModalVisible).to.be.false;
+      const isModalNotVisible = await moduleManagerPage.closeUploadModuleModal(page);
+      await expect(isModalNotVisible).to.be.true;
     });
 
     it(`should search the module '${Modules.psFacetedSearch.name}'`, async function () {

From c68dfc20b0712af4be00e8080fe1f33d0c49fb1a Mon Sep 17 00:00:00 2001
From: lartist <salim-benouamer.ext@prestashop.com>
Date: Wed, 5 Jul 2023 14:48:01 +0200
Subject: [PATCH 0434/1030] Remove twig TruncateExtension and change variable
 name

---
 app/AppKernel.php                             |   1 +
 composer.json                                 |   2 +
 composer.lock                                 | 143 +++++++++++++++++-
 .../Component/Layout/quick_access.html.twig   |  20 +--
 .../Twig/Extension/TruncateExtension.php      |  51 -------
 5 files changed, 155 insertions(+), 62 deletions(-)
 delete mode 100644 src/PrestaShopBundle/Twig/Extension/TruncateExtension.php

diff --git a/app/AppKernel.php b/app/AppKernel.php
index e5d34e85e5d4b..c20c6a96a9441 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -68,6 +68,7 @@ public function registerBundles()
             new League\Tactician\Bundle\TacticianBundle(),
             new FOS\JsRoutingBundle\FOSJsRoutingBundle(),
             new Symfony\UX\TwigComponent\TwigComponentBundle(),
+            new Twig\Extra\TwigExtraBundle\TwigExtraBundle(),
         );
 
         if (in_array($this->getEnvironment(), array('dev', 'test'), true)) {
diff --git a/composer.json b/composer.json
index 58bcb523f5809..b9295a50c8daf 100644
--- a/composer.json
+++ b/composer.json
@@ -180,6 +180,8 @@
         "symfony/yaml": "5.4.*",
         "tecnickcom/tcpdf": "^6.2.12",
         "tijsverkoyen/css-to-inline-styles": "^2.2",
+        "twig/extra-bundle": "^3.6",
+        "twig/string-extra": "^3.6",
         "twig/twig": "^3.0"
     },
     "require-dev": {
diff --git a/composer.lock b/composer.lock
index 3491a767e15a5..be3f0e45f84e4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "eba26e72868f460f7c14539a77abb19a",
+    "content-hash": "a17243862cfc6715e6a18d653902ea60",
     "packages": [
         {
             "name": "api-platform/core",
@@ -14790,6 +14790,147 @@
             },
             "time": "2018-01-15T15:26:51+00:00"
         },
+        {
+            "name": "twig/extra-bundle",
+            "version": "v3.6.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/twigphp/twig-extra-bundle.git",
+                "reference": "802cc2dd46ec88285d6c7fa85c26ab7f2cd5bc49"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/twigphp/twig-extra-bundle/zipball/802cc2dd46ec88285d6c7fa85c26ab7f2cd5bc49",
+                "reference": "802cc2dd46ec88285d6c7fa85c26ab7f2cd5bc49",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "symfony/framework-bundle": "^4.4|^5.0|^6.0",
+                "symfony/twig-bundle": "^4.4|^5.0|^6.0",
+                "twig/twig": "^2.7|^3.0"
+            },
+            "require-dev": {
+                "league/commonmark": "^1.0|^2.0",
+                "symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0",
+                "twig/cache-extra": "^3.0",
+                "twig/cssinliner-extra": "^2.12|^3.0",
+                "twig/html-extra": "^2.12|^3.0",
+                "twig/inky-extra": "^2.12|^3.0",
+                "twig/intl-extra": "^2.12|^3.0",
+                "twig/markdown-extra": "^2.12|^3.0",
+                "twig/string-extra": "^2.12|^3.0"
+            },
+            "type": "symfony-bundle",
+            "autoload": {
+                "psr-4": {
+                    "Twig\\Extra\\TwigExtraBundle\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com",
+                    "homepage": "http://fabien.potencier.org",
+                    "role": "Lead Developer"
+                }
+            ],
+            "description": "A Symfony bundle for extra Twig extensions",
+            "homepage": "https://twig.symfony.com",
+            "keywords": [
+                "bundle",
+                "extra",
+                "twig"
+            ],
+            "support": {
+                "source": "https://github.com/twigphp/twig-extra-bundle/tree/v3.6.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/twig/twig",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-05-06T11:11:46+00:00"
+        },
+        {
+            "name": "twig/string-extra",
+            "version": "v3.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/twigphp/string-extra.git",
+                "reference": "fab682645b3f8730fbdb7bf9ec8fe668d6f76638"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/twigphp/string-extra/zipball/fab682645b3f8730fbdb7bf9ec8fe668d6f76638",
+                "reference": "fab682645b3f8730fbdb7bf9ec8fe668d6f76638",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "symfony/string": "^5.0|^6.0",
+                "symfony/translation-contracts": "^1.1|^2|^3",
+                "twig/twig": "^2.7|^3.0"
+            },
+            "require-dev": {
+                "symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Twig\\Extra\\String\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com",
+                    "homepage": "http://fabien.potencier.org",
+                    "role": "Lead Developer"
+                }
+            ],
+            "description": "A Twig extension for Symfony String",
+            "homepage": "https://twig.symfony.com",
+            "keywords": [
+                "html",
+                "string",
+                "twig",
+                "unicode"
+            ],
+            "support": {
+                "source": "https://github.com/twigphp/string-extra/tree/v3.6.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/twig/twig",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-02-09T06:45:16+00:00"
+        },
         {
             "name": "twig/twig",
             "version": "v3.5.1",
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/quick_access.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/quick_access.html.twig
index 17151c29a8488..d541553b30de9 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/quick_access.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/quick_access.html.twig
@@ -27,19 +27,19 @@
     {{ 'Quick Access'|trans({}, 'Admin.Navigation.Header') }}
   </button>
   <div class="dropdown-menu">
-    {% for quick in quickAccess %}
+    {% for quickAccess in quickAccess %}
       <a class="
         dropdown-item quick-row-link
-        {% if quick.class is defined %}{{ quick.class|escape('html_attr') }}{% endif %}
-        {% if link.matchQuickLink(quick.link) %}
-          {% set matchQuickLink = quick.id_quick_access %}
+        {% if quickAccess.class is defined %}{{ quickAccess.class|escape('html_attr') }}{% endif %}
+        {% if link.matchQuickLink(quickAccess.link) %}
+          {% set matchQuickLink = quickAccess.id_quick_access %}
           active
         {% endif %}
       "
-      href="{{ quick.link|escape('html_attr') }}"
-      {% if quick.new_window %} target="_blank"{% endif %}
-      data-item="{{ quick.name }}"
-      >{{ quick.name|escape('html_attr') }}</a>
+      href="{{ quickAccess.link|escape('html_attr') }}"
+      {% if quickAccess.new_window %} target="_blank"{% endif %}
+      data-item="{{ quickAccess.name }}"
+      >{{ quickAccess.name|escape('html_attr') }}</a>
     {% endfor %}
     <div class="dropdown-divider"></div>
     {% if matchQuickLink is defined %}
@@ -53,7 +53,7 @@
          data-url="{{ link.getQuickLink(app.request.uri|escape('html_attr')) }}"
          data-post-link="{{ link.getAdminLink('AdminQuickAccesses') }}"
          data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header')|escape('html_attr') }}"
-         data-link="{{ quickAccessCurrentLinkName|truncate(32) }}"
+         data-link="{{ quickAccessCurrentLinkName|u.truncate(32, '...') }}"
       >
         <i class="material-icons">remove_circle_outline</i>
         {{ 'Remove from Quick Access'|trans({}, 'Admin.Navigation.Header') }}
@@ -68,7 +68,7 @@
        data-url="{{ link.getQuickLink(app.request.uri|escape('html_attr')) }}"
        data-post-link="{{ link.getAdminLink('AdminQuickAccesses') }}"
        data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header')|escape('html_attr')}}"
-       data-link="{{ quickAccessCurrentLinkName|truncate(32) }}"
+       data-link="{{ quickAccessCurrentLinkName|u.truncate(32, '...') }}"
     >
       <i class="material-icons">add_circle</i>
       {{ 'Add current page to Quick Access'|trans({}, 'Admin.Actions') }}
diff --git a/src/PrestaShopBundle/Twig/Extension/TruncateExtension.php b/src/PrestaShopBundle/Twig/Extension/TruncateExtension.php
deleted file mode 100644
index e6c70b6db1f89..0000000000000
--- a/src/PrestaShopBundle/Twig/Extension/TruncateExtension.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-declare(strict_types=1);
-
-namespace PrestaShopBundle\Twig\Extension;
-
-use Twig\Extension\AbstractExtension;
-use Twig\TwigFilter;
-
-class TruncateExtension extends AbstractExtension
-{
-    public function getFilters()
-    {
-        return [
-            new TwigFilter('truncate', [$this, 'truncate']),
-        ];
-    }
-
-    public function truncate(string $string, int $length, string $ellipsis = '...')
-    {
-        if (mb_strlen($string) <= $length) {
-            return $string;
-        }
-
-        return mb_substr($string, 0, $length) . $ellipsis;
-    }
-}

From a9b83efaf786278816c2f9ccd308cc04410fd1ef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 5 Jul 2023 20:07:07 +0000
Subject: [PATCH 0435/1030] Bump eslint from 8.43.0 to 8.44.0 in /tests/UI

Bumps [eslint](https://github.com/eslint/eslint) from 8.43.0 to 8.44.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.43.0...v8.44.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 58 +++++++++++++++++++++-----------------
 tests/UI/package.json      |  2 +-
 2 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index 84700679b69a5..dd533e5fa703a 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -4,6 +4,12 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@aashutoshrathi/word-wrap": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
+      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
+      "dev": true
+    },
     "@babel/code-frame": {
       "version": "7.16.0",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.0.tgz",
@@ -147,14 +153,14 @@
       "dev": true
     },
     "@eslint/eslintrc": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.3.tgz",
-      "integrity": "sha512-+5gy6OQfk+xx3q0d6jGZZC3f3KzAkXc/IanVxd1is/VIIziRqqt3ongQz0FiTUXqTk0c7aDB3OaFuKnuSoJicQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.0.tgz",
+      "integrity": "sha512-Lj7DECXqIVCqnqjjHMPna4vn6GJcMgul/wuS0je9OZ9gsL0zzDpKPVtcG1HaDVc+9y+qgXneTeUMbCqXJNpH1A==",
       "dev": true,
       "requires": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
-        "espree": "^9.5.2",
+        "espree": "^9.6.0",
         "globals": "^13.19.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
@@ -184,9 +190,9 @@
       }
     },
     "@eslint/js": {
-      "version": "8.43.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.43.0.tgz",
-      "integrity": "sha512-s2UHCoiXfxMvmfzqoN+vrQ84ahUSYde9qNO1MdxmoEhyHWsfmwOpFlwYV+ePJEVc7gFnATGUi376WowX1N7tFg==",
+      "version": "8.44.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.44.0.tgz",
+      "integrity": "sha512-Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw==",
       "dev": true
     },
     "@faker-js/faker": {
@@ -724,9 +730,9 @@
       }
     },
     "acorn": {
-      "version": "8.9.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.9.0.tgz",
-      "integrity": "sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==",
+      "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
+      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
       "dev": true
     },
     "acorn-globals": {
@@ -2306,15 +2312,15 @@
       }
     },
     "eslint": {
-      "version": "8.43.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.43.0.tgz",
-      "integrity": "sha512-aaCpf2JqqKesMFGgmRPessmVKjcGXqdlAYLLC3THM8t5nBRZRQ+st5WM/hoJXkdioEXLLbXgclUpM0TXo5HX5Q==",
+      "version": "8.44.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.44.0.tgz",
+      "integrity": "sha512-0wpHoUbDUHgNCyvFB5aXLiQVfK9B0at6gUvzy83k4kAsQ/u769TQDX6iKC+aO4upIHO9WSaA3QoXYQDHbNwf1A==",
       "dev": true,
       "requires": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.4.0",
-        "@eslint/eslintrc": "^2.0.3",
-        "@eslint/js": "8.43.0",
+        "@eslint/eslintrc": "^2.1.0",
+        "@eslint/js": "8.44.0",
         "@humanwhocodes/config-array": "^0.11.10",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -2326,7 +2332,7 @@
         "escape-string-regexp": "^4.0.0",
         "eslint-scope": "^7.2.0",
         "eslint-visitor-keys": "^3.4.1",
-        "espree": "^9.5.2",
+        "espree": "^9.6.0",
         "esquery": "^1.4.2",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
@@ -2346,7 +2352,7 @@
         "lodash.merge": "^4.6.2",
         "minimatch": "^3.1.2",
         "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
+        "optionator": "^0.9.3",
         "strip-ansi": "^6.0.1",
         "strip-json-comments": "^3.1.0",
         "text-table": "^0.2.0"
@@ -2442,17 +2448,17 @@
           }
         },
         "optionator": {
-          "version": "0.9.1",
-          "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-          "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+          "version": "0.9.3",
+          "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
+          "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
           "dev": true,
           "requires": {
+            "@aashutoshrathi/word-wrap": "^1.2.3",
             "deep-is": "^0.1.3",
             "fast-levenshtein": "^2.0.6",
             "levn": "^0.4.1",
             "prelude-ls": "^1.2.1",
-            "type-check": "^0.4.0",
-            "word-wrap": "^1.2.3"
+            "type-check": "^0.4.0"
           }
         },
         "prelude-ls": {
@@ -2689,12 +2695,12 @@
       "dev": true
     },
     "espree": {
-      "version": "9.5.2",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.2.tgz",
-      "integrity": "sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==",
+      "version": "9.6.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.0.tgz",
+      "integrity": "sha512-1FH/IiruXZ84tpUlm0aCUEwMl2Ho5ilqVh0VvQXw+byAz/4SAciyHLlfmL5WYqsvD38oymdUwBss0LtK8m4s/A==",
       "dev": true,
       "requires": {
-        "acorn": "^8.8.0",
+        "acorn": "^8.9.0",
         "acorn-jsx": "^5.3.2",
         "eslint-visitor-keys": "^3.4.1"
       },
diff --git a/tests/UI/package.json b/tests/UI/package.json
index 6bc4d39ce4c68..34561604fc6c5 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -136,7 +136,7 @@
     "@typescript-eslint/eslint-plugin": "^5.60.1",
     "@typescript-eslint/parser": "^5.60.0",
     "babel-eslint": "^10.1.0",
-    "eslint": "^8.43.0",
+    "eslint": "^8.44.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-deprecation": "^1.3.3",
     "eslint-plugin-html": "^7.1.0",

From 59429706a1163551696b6309baf529509c179d66 Mon Sep 17 00:00:00 2001
From: fatm <fatima.mazhit@gmail.com>
Date: Thu, 6 Jul 2023 15:26:04 +0600
Subject: [PATCH 0436/1030] fix bad display alert when changing product
 combination quantity;

---
 .../themes/new-theme/scss/pages/product/product_page.scss      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/admin-dev/themes/new-theme/scss/pages/product/product_page.scss b/admin-dev/themes/new-theme/scss/pages/product/product_page.scss
index d1c57659ec044..6506159e43df6 100644
--- a/admin-dev/themes/new-theme/scss/pages/product/product_page.scss
+++ b/admin-dev/themes/new-theme/scss/pages/product/product_page.scss
@@ -1996,6 +1996,7 @@ $product-page-padding-bottom: 80px !default;
 
 .combination-page {
   #combination_form {
+    position: relative;
     padding-top: 1rem;
   }
 
@@ -2782,7 +2783,7 @@ $mobile-menu-height: 2.6rem !default;
     .combination-cover-row {
       position: absolute;
       top: 1rem;
-      left: 1rem;
+      left: 0;
       max-width: $product-cover-mobile-size;
       max-height: $product-cover-mobile-size;
     }

From b9b794e13238cfc75b1d0c49e103f281952c72b7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 6 Jul 2023 13:41:31 +0000
Subject: [PATCH 0437/1030] Bump @typescript-eslint/parser from 5.60.0 to
 5.61.0 in /tests/UI

Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 5.60.0 to 5.61.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.61.0/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 46 +++++++++++++++++++-------------------
 tests/UI/package.json      |  2 +-
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index dd533e5fa703a..b80e2cea51f33 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -524,41 +524,41 @@
       }
     },
     "@typescript-eslint/parser": {
-      "version": "5.60.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.60.0.tgz",
-      "integrity": "sha512-jBONcBsDJ9UoTWrARkRRCgDz6wUggmH5RpQVlt7BimSwaTkTjwypGzKORXbR4/2Hqjk9hgwlon2rVQAjWNpkyQ==",
+      "version": "5.61.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.61.0.tgz",
+      "integrity": "sha512-yGr4Sgyh8uO6fSi9hw3jAFXNBHbCtKKFMdX2IkT3ZqpKmtAq3lHS4ixB/COFuAIJpwl9/AqF7j72ZDWYKmIfvg==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "5.60.0",
-        "@typescript-eslint/types": "5.60.0",
-        "@typescript-eslint/typescript-estree": "5.60.0",
+        "@typescript-eslint/scope-manager": "5.61.0",
+        "@typescript-eslint/types": "5.61.0",
+        "@typescript-eslint/typescript-estree": "5.61.0",
         "debug": "^4.3.4"
       },
       "dependencies": {
         "@typescript-eslint/scope-manager": {
-          "version": "5.60.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.60.0.tgz",
-          "integrity": "sha512-hakuzcxPwXi2ihf9WQu1BbRj1e/Pd8ZZwVTG9kfbxAMZstKz8/9OoexIwnmLzShtsdap5U/CoQGRCWlSuPbYxQ==",
+          "version": "5.61.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.61.0.tgz",
+          "integrity": "sha512-W8VoMjoSg7f7nqAROEmTt6LoBpn81AegP7uKhhW5KzYlehs8VV0ZW0fIDVbcZRcaP3aPSW+JZFua+ysQN+m/Nw==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "5.60.0",
-            "@typescript-eslint/visitor-keys": "5.60.0"
+            "@typescript-eslint/types": "5.61.0",
+            "@typescript-eslint/visitor-keys": "5.61.0"
           }
         },
         "@typescript-eslint/types": {
-          "version": "5.60.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.60.0.tgz",
-          "integrity": "sha512-ascOuoCpNZBccFVNJRSC6rPq4EmJ2NkuoKnd6LDNyAQmdDnziAtxbCGWCbefG1CNzmDvd05zO36AmB7H8RzKPA==",
+          "version": "5.61.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.61.0.tgz",
+          "integrity": "sha512-ldyueo58KjngXpzloHUog/h9REmHl59G1b3a5Sng1GfBo14BkS3ZbMEb3693gnP1k//97lh7bKsp6/V/0v1veQ==",
           "dev": true
         },
         "@typescript-eslint/typescript-estree": {
-          "version": "5.60.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.60.0.tgz",
-          "integrity": "sha512-R43thAuwarC99SnvrBmh26tc7F6sPa2B3evkXp/8q954kYL6Ro56AwASYWtEEi+4j09GbiNAHqYwNNZuNlARGQ==",
+          "version": "5.61.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.61.0.tgz",
+          "integrity": "sha512-Fud90PxONnnLZ36oR5ClJBLTLfU4pIWBmnvGwTbEa2cXIqj70AEDEmOmpkFComjBZ/037ueKrOdHuYmSFVD7Rw==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "5.60.0",
-            "@typescript-eslint/visitor-keys": "5.60.0",
+            "@typescript-eslint/types": "5.61.0",
+            "@typescript-eslint/visitor-keys": "5.61.0",
             "debug": "^4.3.4",
             "globby": "^11.1.0",
             "is-glob": "^4.0.3",
@@ -567,12 +567,12 @@
           }
         },
         "@typescript-eslint/visitor-keys": {
-          "version": "5.60.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.60.0.tgz",
-          "integrity": "sha512-wm9Uz71SbCyhUKgcaPRauBdTegUyY/ZWl8gLwD/i/ybJqscrrdVSFImpvUz16BLPChIeKBK5Fa9s6KDQjsjyWw==",
+          "version": "5.61.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.61.0.tgz",
+          "integrity": "sha512-50XQ5VdbWrX06mQXhy93WywSFZZGsv3EOjq+lqp6WC2t+j3mb6A9xYVdrRxafvK88vg9k9u+CT4l6D8PEatjKg==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "5.60.0",
+            "@typescript-eslint/types": "5.61.0",
             "eslint-visitor-keys": "^3.3.0"
           }
         },
diff --git a/tests/UI/package.json b/tests/UI/package.json
index 34561604fc6c5..950dc87c23968 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -134,7 +134,7 @@
     "@types/mocha": "^10.0.1",
     "@types/mochawesome": "^6.2.1",
     "@typescript-eslint/eslint-plugin": "^5.60.1",
-    "@typescript-eslint/parser": "^5.60.0",
+    "@typescript-eslint/parser": "^5.61.0",
     "babel-eslint": "^10.1.0",
     "eslint": "^8.44.0",
     "eslint-config-airbnb-base": "^15.0.0",

From 726a22eb43a81d523be06a3cbe9c7a13d02efdf7 Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Tue, 23 May 2023 17:05:55 +0200
Subject: [PATCH 0438/1030] Replacing and updating $originalImagePath parameter

---
 src/Adapter/Image/ImageRetriever.php | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/Adapter/Image/ImageRetriever.php b/src/Adapter/Image/ImageRetriever.php
index bbcaa6ed9f8bd..c62c4de719c79 100644
--- a/src/Adapter/Image/ImageRetriever.php
+++ b/src/Adapter/Image/ImageRetriever.php
@@ -208,12 +208,25 @@ public function getImage($object, $id_image)
         $image_types = ImageType::getImagesTypes($type, true);
         foreach ($image_types as $image_type) {
             $sources = [];
+            $formattedName = ImageType::getFormattedName('small');
+
+            if ($type === 'categories' && $formattedName === $image_type['name']) {
+                $originalFileName = $id_image . '_thumb.jpg';
+            } else {
+                $originalFileName = $id_image . '.jpg';
+            }
+
+            // Get path of original uploaded image we will use to get thumbnails (original image extension is always .jpg)
+            $originalImagePath = implode(DIRECTORY_SEPARATOR, [
+                $imageFolderPath,
+                $originalFileName,
+            ]);
 
             foreach ($configuredImageFormats as $imageFormat) {
                 // Generate the thumbnail and optionally a high DPI version
-                $this->checkOrGenerateImageType($imageFolderPath, $id_image, $image_type, $imageFormat);
+                $this->checkOrGenerateImageType($originalImagePath, $imageFolderPath, $id_image, $image_type, $imageFormat);
                 if ($generateHighDpiImages) {
-                    $this->checkOrGenerateImageType($imageFolderPath, $id_image, $image_type, $imageFormat, true);
+                    $this->checkOrGenerateImageType($originalImagePath, $imageFolderPath, $id_image, $image_type, $imageFormat, true);
                 }
 
                 // Get the URL of the thumb and add it to sources
@@ -266,6 +279,7 @@ public function getImage($object, $id_image)
     }
 
     /**
+     * @param string $originalImagePath
      * @param string $imageFolderPath
      * @param int $idImage
      * @param array $imageTypeData
@@ -274,9 +288,10 @@ public function getImage($object, $id_image)
      *
      * @return void
      */
-    private function checkOrGenerateImageType(string $imageFolderPath, int $idImage, array $imageTypeData, string $imageFormat, bool $hdpi = false)
+    private function checkOrGenerateImageType(string $originalImagePath, string $imageFolderPath, int $idImage, array $imageTypeData, string $imageFormat, bool $hdpi = false)
     {
         $fileName = sprintf('%s-%s.%s', $idImage, $imageTypeData['name'], $imageFormat);
+
         if ($hdpi) {
             $fileName = sprintf('%s-%s2x.%s', $idImage, $imageTypeData['name'], $imageFormat);
             $imageTypeData['width'] *= 2;
@@ -294,13 +309,8 @@ private function checkOrGenerateImageType(string $imageFolderPath, int $idImage,
 
         // Check if the thumbnail exists and generate it if needed
         if (!file_exists($resizedImagePath)) {
-            $sourceFile = sprintf('%s-%s.%s', $idImage, $imageTypeData['name'], 'jpg');
-            $sourceFilePath = implode(DIRECTORY_SEPARATOR, [
-                $imageFolderPath,
-                $sourceFile,
-            ]);
             ImageManager::resize(
-                $sourceFilePath,
+                $originalImagePath,
                 $resizedImagePath,
                 (int) $imageTypeData['width'],
                 (int) $imageTypeData['height'],

From 0e826853d9618a1f27d36fd0a3a27c20b509ed49 Mon Sep 17 00:00:00 2001
From: lartist <salim-benouamer.ext@prestashop.com>
Date: Thu, 6 Jul 2023 16:52:53 +0200
Subject: [PATCH 0439/1030] Replace nav bar (left menu) smarty template by twig
 component

---
 .../themes/new-theme/template/layout.tpl      |  10 +-
 .../Admin/Component/Layout/nav_bar.html.twig  | 133 ++++++++++++++++++
 .../views/Admin/Layout/nav_bar.html.twig      |  31 ++++
 .../Twig/Component/NavBar.php                 |  41 ++++++
 4 files changed, 214 insertions(+), 1 deletion(-)
 create mode 100644 src/PrestaShopBundle/Resources/views/Admin/Component/Layout/nav_bar.html.twig
 create mode 100644 src/PrestaShopBundle/Resources/views/Admin/Layout/nav_bar.html.twig
 create mode 100644 src/PrestaShopBundle/Twig/Component/NavBar.php

diff --git a/admin-dev/themes/new-theme/template/layout.tpl b/admin-dev/themes/new-theme/template/layout.tpl
index 0aebf68ad775c..dbb5172fd61e2 100644
--- a/admin-dev/themes/new-theme/template/layout.tpl
+++ b/admin-dev/themes/new-theme/template/layout.tpl
@@ -116,7 +116,15 @@
 {/if}
 
 {if $display_header}
-  {include file='components/layout/nav_bar.tpl'}
+    {render_template
+      smarty_template="components/layout/nav_bar.tpl"
+      twig_template="@PrestaShop/Admin/Layout/nav_bar.html.twig"
+      toggle_navigation_url=$toggle_navigation_url
+      default_tab_link=$default_tab_link
+      ps_version=$ps_version
+      collapse_menu=$collapse_menu
+      tabs=$tabs
+    }
 {/if}
 
 {if isset($page_header_toolbar)}{$page_header_toolbar}{/if}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/nav_bar.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/nav_bar.html.twig
new file mode 100644
index 0000000000000..6b63d59fad2a0
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/nav_bar.html.twig
@@ -0,0 +1,133 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+<nav class="nav-bar d-none d-print-none d-md-block">
+  <span class="menu-collapse" data-toggle-url="{{ toggleNavigationUrl }}">
+    <i class="material-icons rtl-flip">chevron_left</i>
+    <i class="material-icons rtl-flip">chevron_left</i>
+  </span>
+
+  <div class="nav-bar-overflow">
+    <div class="logo-container">
+      <div class="d-flex align-items-center">
+        <a id="header_logo" class="logo float-left" href="{{ defaultTabLink|escape('html_attr') }}"></a>
+        <span id="shop_version" class="header-version">{{ psVersion }}</span>
+      </div>
+      <div class="logo-container__close js-mobile-menu">
+        <i class="material-icons close-btn">close</i>
+      </div>
+    </div>
+
+    <ul class="main-menu{% if collapseMenu %} sidebar-closed{% endif %}">
+      {% for level1 in tabs %}
+        {% if level1.active %}
+
+        {% set level1Href = level1.href %}
+        {% if level1.sub_tabs|length > 0 and level1.sub_tabs[0].href is defined %}
+          {% set level1Href = level1.sub_tabs[0].href %}
+        {% endif %}
+
+        {% set level1Name = level1.name %}
+        {% if level1.name is same as ''%}
+          {% set level1Name = level1.class_name %}
+        {% endif %}
+
+        {% if level1.icon is not same as '' %}
+
+          <li class="link-levelone{% if level1.current %} link-levelone-active{% endif %}" data-submenu="{{ level1.id_tab }}" id="tab-{{ level1.class_name }}">
+            <a href="{{ level1Href }}" class="link" >
+              <i class="material-icons">{{ level1.icon }}</i> <span>{{ level1Name }}</span>
+            </a>
+          </li>
+
+        {% else %}
+
+        <li class="category-title{% if level1.current %} link-active{% endif %}" data-submenu="{{ level1.id_tab }}" id="tab-{{ level1.class_name }}">
+          <span class="title">{{ level1Name }}</span>
+        </li>
+
+        {% for level2 in level1.sub_tabs %}
+        {% if level2.active %}
+
+        {% set level2Href = level2.href %}
+
+        {% set level2Name = level2.name %}
+        {% if level2.name is same as '' %}
+          {% set level2Name = level2.class_name %}
+        {% endif %}
+        {% set levelOneClass = '' %}
+
+        {% if level2.current and not collapseMenu %}
+          {% set levelOneClass = " link-active open ul-open" %}
+        {% elseif level2.current and collapseMenu %}
+          {% set levelOneClass =" link-active" %}
+        {% endif %}
+
+        <li class="link-levelone{% if level2.sub_tabs|length > 0 %} has_submenu{% endif %}{{ levelOneClass }}" data-submenu="{{ level2.id_tab }}" id="subtab-{{ level2.class_name }}">
+          <a href="{{ level2Href }}" class="link">
+            <i class="material-icons mi-{{ level2.icon }}">{{ level2.icon }}</i>
+            <span>{{ level2Name }}</span>
+            {% if level1.sub_tabs|length > 0 %}
+              <i class="material-icons sub-tabs-arrow">
+                {% if level2.current %}
+                  keyboard_arrow_up
+                {% else %}
+                  keyboard_arrow_down
+                {% endif %}
+              </i>
+            {% endif %}
+          </a>
+          {% if level2.sub_tabs|length > 0 %}
+            <ul id="collapse-{{ level2.id_tab }}" class="submenu panel-collapse">
+              {% for level3 in level2.sub_tabs %}
+              {% if level3.active %}
+
+              {% set level3Href = level3.href %}
+
+              {% set level3Name = level3.name %}
+              {% if level3.name is same as ''%}
+                {% set level3Name = level3.class_name %}
+              {% endif %}
+
+              <li class="link-leveltwo{% if level3.current %} link-active{% endif %}" data-submenu="{{ level3.id_tab }}" id="subtab-{{ level3.class_name }}">
+                <a href="{{ level3Href }}" class="link"> {{ level3Name }}</a>
+              </li>
+
+              {% endif %}
+              {% endfor %}
+            </ul>
+          {% endif %}
+        </li>
+        {% endif %}
+        {% endfor %}
+
+        {% endif %}
+
+        {% endif %}
+      {% endfor%}
+    </ul>
+  </div>
+  {{ renderhook('displayAdminNavBarBeforeEnd') }}
+</nav>
+
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/nav_bar.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/nav_bar.html.twig
new file mode 100644
index 0000000000000..f2e1b3be1d2f6
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/nav_bar.html.twig
@@ -0,0 +1,31 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+{{ component('NavBar', {
+  toggleNavigationUrl: toggle_navigation_url,
+  defaultTabLink: default_tab_link,
+  psVersion: ps_version,
+  collapseMenu: collapse_menu,
+  tabs: tabs,
+}) }}
diff --git a/src/PrestaShopBundle/Twig/Component/NavBar.php b/src/PrestaShopBundle/Twig/Component/NavBar.php
new file mode 100644
index 0000000000000..cd49f7c9a6b6c
--- /dev/null
+++ b/src/PrestaShopBundle/Twig/Component/NavBar.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\Twig\Component;
+
+use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
+
+#[AsTwigComponent(template: '@PrestaShop/Admin/Component/Layout/nav_bar.html.twig')]
+class NavBar
+{
+    public string $toggleNavigationUrl;
+    public string $defaultTabLink;
+    public string $psVersion;
+    public bool $collapseMenu;
+    public array $tabs;
+}

From e22c7a7a67fa7ee5c40ea0b84334bb3364304190 Mon Sep 17 00:00:00 2001
From: Krystian Podemski <podemski.krystian@gmail.com>
Date: Fri, 7 Jul 2023 00:07:30 +0200
Subject: [PATCH 0440/1030] Fix translations for themes in multishop and child
 themes

---
 .../Translation/Loader/SqlTranslationLoader.php             | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/PrestaShopBundle/Translation/Loader/SqlTranslationLoader.php b/src/PrestaShopBundle/Translation/Loader/SqlTranslationLoader.php
index fc7ef56ccc6e5..a1d6e450443fd 100644
--- a/src/PrestaShopBundle/Translation/Loader/SqlTranslationLoader.php
+++ b/src/PrestaShopBundle/Translation/Loader/SqlTranslationLoader.php
@@ -74,11 +74,15 @@ public function load($resource, $locale, $domain = 'messages')
             throw new NotFoundResourceException(sprintf('Language not found in database: %s', $locale));
         }
 
+        // If we get translations for a theme, realistically we need to get translations
+        // for all active themes from the database, since different stores can use different themes.
+        // If we don't do that, the first store's theme you visit after the cache is cleared will
+        // be the only one that has translations.
         $selectTranslationsQuery = '
             SELECT `key`, `translation`, `domain`
             FROM `' . _DB_PREFIX_ . 'translation`
             WHERE `id_lang` = ' . $localeResults[$locale]['id_lang'] . '
-            AND theme ' . ($this->theme !== null ? '= "' . $this->theme->getName() . '"' : 'IS NULL');
+            AND theme ' . ($this->theme !== null ? ' IN (SELECT `theme` FROM `' . _DB_PREFIX_ . 'shop` WHERE `active` = 1)' : 'IS NULL');
 
         $translations = Db::getInstance()->executeS($selectTranslationsQuery) ?: [];
 

From bd74d2b69cf5685e1d130914a5d473d24904526b Mon Sep 17 00:00:00 2001
From: Krystian Podemski <podemski.krystian@gmail.com>
Date: Fri, 7 Jul 2023 08:53:36 +0200
Subject: [PATCH 0441/1030] Register commonly used deprecated modifiers to
 Smarty config

---
 config/smarty.config.inc.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/config/smarty.config.inc.php b/config/smarty.config.inc.php
index 0a66fed853afc..6fa40c63e7857 100644
--- a/config/smarty.config.inc.php
+++ b/config/smarty.config.inc.php
@@ -119,6 +119,18 @@ function smartyEscape($string, $esc_type = 'html', $char_set = null, $double_enc
 smartyRegisterFunction($smarty, 'modifier', 'var_dump', 'var_dump');
 smartyRegisterFunction($smarty, 'modifier', 'lcfirst', 'lcfirst');
 smartyRegisterFunction($smarty, 'modifier', 'nl2br', 'nl2br');
+smartyRegisterFunction($smarty, 'modifier', 'sizeof', 'sizeof');
+smartyRegisterFunction($smarty, 'modifier', 'in_array', 'in_array');
+smartyRegisterFunction($smarty, 'modifier', 'substr', 'substr');
+smartyRegisterFunction($smarty, 'modifier', 'intval', 'intval');
+smartyRegisterFunction($smarty, 'modifier', 'date', 'date');
+smartyRegisterFunction($smarty, 'modifier', 'trim', 'trim');
+smartyRegisterFunction($smarty, 'modifier', 'json_encode', 'json_encode');
+smartyRegisterFunction($smarty, 'modifier', 'in_array', 'in_array');
+smartyRegisterFunction($smarty, 'modifier', 'stripslashes', 'stripslashes');
+smartyRegisterFunction($smarty, 'modifier', 'mt_rand', 'mt_rand');
+smartyRegisterFunction($smarty, 'modifier', 'md5', 'md5');
+smartyRegisterFunction($smarty, 'modifier', 'floatval', 'floatval');
 
 function smarty_modifier_htmlentitiesUTF8($string)
 {

From 840c0cca9d9577c160e25e0a5c61cf0ae83f6603 Mon Sep 17 00:00:00 2001
From: lartist <salim-benouamer.ext@prestashop.com>
Date: Fri, 7 Jul 2023 10:57:55 +0200
Subject: [PATCH 0442/1030] Replace notifications center smarty template by
 twig component

---
 .../themes/new-theme/template/layout.tpl      |  11 +-
 .../Layout/notifications_center.html.twig     | 150 ++++++++++++++++++
 .../Layout/notifications_center.html.twig     |  32 ++++
 .../Twig/Component/NotificationsCenter.php    |  42 +++++
 4 files changed, 234 insertions(+), 1 deletion(-)
 create mode 100644 src/PrestaShopBundle/Resources/views/Admin/Component/Layout/notifications_center.html.twig
 create mode 100644 src/PrestaShopBundle/Resources/views/Admin/Layout/notifications_center.html.twig
 create mode 100644 src/PrestaShopBundle/Twig/Component/NotificationsCenter.php

diff --git a/admin-dev/themes/new-theme/template/layout.tpl b/admin-dev/themes/new-theme/template/layout.tpl
index 0aebf68ad775c..3f1be380f30c4 100644
--- a/admin-dev/themes/new-theme/template/layout.tpl
+++ b/admin-dev/themes/new-theme/template/layout.tpl
@@ -102,7 +102,16 @@
         {/if}
         {if $show_new_orders || $show_new_customers || $show_new_messages}
           <div class="component header-right-component" id="header-notifications-container">
-            {include file="components/layout/notifications_center.tpl"}
+              {render_template
+                smarty_template="components/layout/notifications_center.tpl"
+                twig_template="@PrestaShop/Admin/Layout/notifications_center.html.twig"
+                show_new_orders=$show_new_orders
+                show_new_customers=$show_new_customers
+                show_new_messages=$show_new_messages
+                no_order_tip=$no_order_tip
+                no_customer_tip=$no_customer_tip
+                no_customer_message_tip=$no_customer_message_tip
+              }
           </div>
         {/if}
 
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/notifications_center.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/notifications_center.html.twig
new file mode 100644
index 0000000000000..ecc925014e2e1
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/notifications_center.html.twig
@@ -0,0 +1,150 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+<div id="notif" class="notification-center dropdown dropdown-clickable">
+  <button class="btn notification js-notification dropdown-toggle" data-toggle="dropdown">
+    <i class="material-icons">notifications_none</i>
+    <span id="notifications-total" class="count hide">0</span>
+  </button>
+  <div class="dropdown-menu dropdown-menu-right js-notifs_dropdown">
+    <div class="notifications">
+      <ul class="nav nav-tabs" role="tablist">
+        {% set active = "active" %}
+        {% if showNewOrders %}
+        <li class="nav-item">
+          <a
+            class="nav-link {{ active }}"
+            id="orders-tab"
+            data-toggle="tab"
+            data-type="order"
+            href="#orders-notifications"
+            role="tab"
+          >
+            {{ 'Orders[1][/1]'|trans({'[1]': '', '[/1]': ''}, 'Admin.Navigation.Notification')|raw }}
+            <span id="_nb_new_orders_"></span>
+          </a>
+        </li>
+        {% set active = "" %}
+        {% endif %}
+        {% if showNewCustomers %}
+        <li class="nav-item">
+          <a
+            class="nav-link {{ active }}"
+            id="customers-tab"
+            data-toggle="tab"
+            data-type="customer"
+            href="#customers-notifications"
+            role="tab"
+          >
+            {{ 'Customers[1][/1]'|trans({'[1]': '', '[/1]': ''}, 'Admin.Navigation.Notification') }}
+            <span id="_nb_new_customers_"></span>
+          </a>
+        </li>
+        {% set active = "" %}
+        {% endif %}
+        {% if showNewMessages %}
+        <li class="nav-item">
+          <a
+            class="nav-link {{ active }}"
+            id="messages-tab"
+            data-toggle="tab"
+            data-type="customer_message"
+            href="#messages-notifications"
+            role="tab"
+          >
+            {{ 'Messages[1][/1]'|trans({'[1]': '', '[/1]': ''}, 'Admin.Navigation.Notification') }}
+            <span id="_nb_new_messages_"></span>
+          </a>
+        </li>
+        {% set active = "" %}
+        {% endif %}
+      </ul>
+
+      <!-- Tab panes -->
+      <div class="tab-content">
+        {% set active = "active" %}
+        {% if showNewOrders %}
+        <div class="tab-pane {{ active }} empty" id="orders-notifications" role="tabpanel">
+          <p class="no-notification">
+            {{ 'No new order for now :('|trans({}, 'Admin.Navigation.Notification') }}<br>
+            {{ noOrderTip|raw }}
+          </p>
+          <div class="notification-elements"></div>
+        </div>
+        {% set active = "" %}
+        {% endif %}
+        {% if showNewCustomers %}
+        <div class="tab-pane {{ active }} empty" id="customers-notifications" role="tabpanel">
+          <p class="no-notification">
+            {{ 'No new customer for now :('|trans({}, 'Admin.Navigation.Notification') }}<br>
+            {{ noCustomerTip }}
+          </p>
+          <div class="notification-elements"></div>
+        </div>
+        {% set active = "" %}
+        {% endif %}
+        {% if showNewMessages %}
+        <div class="tab-pane {{ active }} empty" id="messages-notifications" role="tabpanel">
+          <p class="no-notification">
+            {{ 'No new message for now.'|trans({}, 'Admin.Navigation.Notification') }}<br>
+            {{ noCustomerMessageTip }}
+          </p>
+          <div class="notification-elements"></div>
+        </div>
+        {% set active = "" %}
+        {% endif %}
+      </div>
+    </div>
+  </div>
+</div>
+
+{% if showNewOrders %}
+<script type="text/html" id="order-notification-template">
+  <a class="notif" href='order_url'>
+    #_id_order_ -
+    {{ 'from'|trans({}, 'Admin.Navigation.Notification') }} <strong>_customer_name_</strong> (_iso_code_)_carrier_
+    <strong class="float-sm-right">_total_paid_</strong>
+  </a>
+</script>
+{% endif %}
+
+{% if showNewCustomers %}
+<script type="text/html" id="customer-notification-template">
+  <a class="notif" href='customer_url'>
+    #_id_customer_ - <strong>_customer_name_</strong>_company_ - {{ 'registered'|trans({}, 'Admin.Navigation.Notification') }} <strong>_date_add_</strong>
+  </a>
+</script>
+{% endif %}
+
+{% if showNewMessages %}
+<script type="text/html" id="message-notification-template">
+  <a class="notif" href='message_url'>
+    <span class="message-notification-status _status_">
+      <i class="material-icons">fiber_manual_record</i> _status_
+    </span>
+    - <strong>_customer_name_</strong> (_company_) - <i class="material-icons">access_time</i> _date_add_
+  </a>
+</script>
+{% endif %}
+
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/notifications_center.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/notifications_center.html.twig
new file mode 100644
index 0000000000000..414808ce7cc5d
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/notifications_center.html.twig
@@ -0,0 +1,32 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+{{ component('NotificationsCenter', {
+  showNewOrders: show_new_orders,
+  showNewCustomers: show_new_customers,
+  showNewMessages: show_new_messages,
+  noOrderTip: no_order_tip,
+  noCustomerTip: no_customer_tip,
+  noCustomerMessageTip: no_customer_message_tip,
+}) }}
diff --git a/src/PrestaShopBundle/Twig/Component/NotificationsCenter.php b/src/PrestaShopBundle/Twig/Component/NotificationsCenter.php
new file mode 100644
index 0000000000000..bffd3ed74e1b2
--- /dev/null
+++ b/src/PrestaShopBundle/Twig/Component/NotificationsCenter.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\Twig\Component;
+
+use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
+
+#[AsTwigComponent(template: '@PrestaShop/Admin/Component/Layout/notifications_center.html.twig')]
+class NotificationsCenter
+{
+    public bool $showNewOrders;
+    public bool $showNewCustomers;
+    public bool $showNewMessages;
+    public string $noOrderTip;
+    public string $noCustomerTip;
+    public string $noCustomerMessageTip;
+}

From e80e0cbee83baee5e3b6680ba5f981d78b482eff Mon Sep 17 00:00:00 2001
From: lartist <salim-benouamer.ext@prestashop.com>
Date: Wed, 5 Jul 2023 17:53:06 +0200
Subject: [PATCH 0443/1030] Replace employee dropdown smarty template by twig
 template

---
 .../themes/new-theme/template/layout.tpl      |  9 ++-
 phpstan-tmp-legacy-layout-baseline.neon       | 24 ++++++-
 .../Layout/employee_dropdown.html.twig        | 72 +++++++++++++++++++
 .../Admin/Layout/employee_dropdown.html.twig  | 30 ++++++++
 .../Twig/Component/EmployeeDropdown.php       | 43 +++++++++++
 5 files changed, 175 insertions(+), 3 deletions(-)
 create mode 100644 src/PrestaShopBundle/Resources/views/Admin/Component/Layout/employee_dropdown.html.twig
 create mode 100644 src/PrestaShopBundle/Resources/views/Admin/Layout/employee_dropdown.html.twig
 create mode 100644 src/PrestaShopBundle/Twig/Component/EmployeeDropdown.php

diff --git a/admin-dev/themes/new-theme/template/layout.tpl b/admin-dev/themes/new-theme/template/layout.tpl
index 0aebf68ad775c..7676774e698eb 100644
--- a/admin-dev/themes/new-theme/template/layout.tpl
+++ b/admin-dev/themes/new-theme/template/layout.tpl
@@ -107,7 +107,14 @@
         {/if}
 
         <div class="component" id="header-employee-container">
-          {include file="components/layout/employee_dropdown.tpl"}
+            {render_template
+              smarty_template="components/layout/employee_dropdown.tpl"
+              twig_template="@PrestaShop/Admin/Layout/employee_dropdown.html.twig"
+              employee=$employee
+              link=$link
+              displayBackOfficeEmployeeMenu=$displayBackOfficeEmployeeMenu
+              logout_link=$logout_link
+            }
         </div>
         {if isset($displayBackOfficeTop)}{$displayBackOfficeTop}{/if}
       </div>
diff --git a/phpstan-tmp-legacy-layout-baseline.neon b/phpstan-tmp-legacy-layout-baseline.neon
index 0e265779b1ada..6c118ddace55a 100644
--- a/phpstan-tmp-legacy-layout-baseline.neon
+++ b/phpstan-tmp-legacy-layout-baseline.neon
@@ -1,11 +1,31 @@
 parameters:
 	ignoreErrors:
 		-
-			message: "#^Namespace Link is forbidden, No legacy calls inside the prestashop bundle. Please create an interface and an adapter if you need to\\.$#"
+			message: "#^Class Employee is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+			count: 1
+			path: src/PrestaShopBundle/Twig/Component/EmployeeDropdown.php
+
+		-
+			message: "#^Class Link is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+			count: 1
+			path: src/PrestaShopBundle/Twig/Component/EmployeeDropdown.php
+
+		-
+			message: "#^Namespace Employee is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+			count: 1
+			path: src/PrestaShopBundle/Twig/Component/EmployeeDropdown.php
+
+		-
+			message: "#^Namespace Link is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+			count: 1
+			path: src/PrestaShopBundle/Twig/Component/EmployeeDropdown.php
+
+		-
+			message: "#^Class Link is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
 			count: 1
 			path: src/PrestaShopBundle/Twig/Component/QuickAccess.php
 
 		-
-			message: "#^Class Link is forbidden, No legacy calls inside the prestashop bundle. Please create an interface and an adapter if you need to\\.$#"
+			message: "#^Namespace Link is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
 			count: 1
 			path: src/PrestaShopBundle/Twig/Component/QuickAccess.php
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/employee_dropdown.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/employee_dropdown.html.twig
new file mode 100644
index 0000000000000..f5ed762abf61c
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/employee_dropdown.html.twig
@@ -0,0 +1,72 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+
+<div class="dropdown employee-dropdown">
+    <div class="rounded-circle person" data-toggle="dropdown">
+      <i class="material-icons">account_circle</i>
+    </div>
+    <div class="dropdown-menu dropdown-menu-right">
+      <div class="employee-wrapper-avatar">
+        <div class="employee-top">
+          <span class="employee-avatar">
+            <img class="avatar rounded-circle" src="{{ employee.getImage }}" alt="{{ employee.firstname }}" />
+          </span>
+          <span class="employee_profile">
+            {{ 'Welcome back %name%'|trans({'%name%': employee.firstname}, 'Admin.Navigation.Header') }}
+          </span>
+        </div>
+
+        <a class="dropdown-item employee-link profile-link" href="{{ path('admin_employees_edit', {employeeId: employee.id}) }}">
+          <i class="material-icons">edit</i>
+          <span>
+            {{ 'Your profile'|trans({}, 'Admin.Navigation.Header') }}
+          </span>
+        </a>
+      </div>
+
+      <p class="divider"></p>
+
+      {% for menuItem in displayBackOfficeEmployeeMenu %}
+        {% set menuItemProperties = menuItem.getProperties %}
+        <a class="dropdown-item {{ menuItem.getClass }}" href="{{ menuItemProperties.link }}" target="_blank" rel="noopener noreferrer nofollow">
+          {% if menuItemProperties.icon is defined %}
+            <i class="material-icons">{{ menuItemProperties.icon }}</i>
+          {% endif %}
+          {{ menuItem.getContent }}
+        </a>
+        {% if loop.last %}
+          <p class="divider"></p>
+        {% endif %}
+      {% endfor %}
+
+      <a class="dropdown-item employee-link text-center" id="header_logout" href="{{ logout_link|escape('html_attr') }}">
+        <i class="material-icons d-lg-none">power_settings_new</i>
+        <span>
+          {{ 'Sign out'|trans({}, 'Admin.Navigation.Header') }}
+        </span>
+      </a>
+    </div>
+</div>
+
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/employee_dropdown.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/employee_dropdown.html.twig
new file mode 100644
index 0000000000000..0b6e16fbeaa4c
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/employee_dropdown.html.twig
@@ -0,0 +1,30 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+{{ component('EmployeeDropdown', {
+  employee: employee,
+  link: link,
+  displayBackOfficeEmployeeMenu: displayBackOfficeEmployeeMenu,
+  logout_link: logout_link,
+}) }}
diff --git a/src/PrestaShopBundle/Twig/Component/EmployeeDropdown.php b/src/PrestaShopBundle/Twig/Component/EmployeeDropdown.php
new file mode 100644
index 0000000000000..38eba318494b6
--- /dev/null
+++ b/src/PrestaShopBundle/Twig/Component/EmployeeDropdown.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\Twig\Component;
+
+use Employee;
+use Link;
+use PrestaShop\PrestaShop\Core\Action\ActionsBarButtonsCollection;
+use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
+
+#[AsTwigComponent(template: '@PrestaShop/Admin/Component/Layout/employee_dropdown.html.twig')]
+class EmployeeDropdown
+{
+    public Employee $employee;
+    public Link $link;
+    public ActionsBarButtonsCollection $displayBackOfficeEmployeeMenu;
+    public string $logout_link;
+}

From 46806530cfe1dd0a2bdb013fdc62b8c74ec46779 Mon Sep 17 00:00:00 2001
From: Jonathan Lelievre <jonathan.lelievre@prestashop.com>
Date: Fri, 7 Jul 2023 15:55:29 +0200
Subject: [PATCH 0444/1030] Update autoload library

---
 composer.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/composer.lock b/composer.lock
index 1b99682dcf28c..a5f2f5a6f624d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -5145,16 +5145,16 @@
         },
         {
             "name": "prestashop/autoload",
-            "version": "v1.0.0",
+            "version": "v1.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PrestaShop/autoload.git",
-                "reference": "9b057242f67076a50e55e7cb77a65d595bfb15b4"
+                "reference": "b84a116564d624e3db04fce648dbfee135df87c0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PrestaShop/autoload/zipball/9b057242f67076a50e55e7cb77a65d595bfb15b4",
-                "reference": "9b057242f67076a50e55e7cb77a65d595bfb15b4",
+                "url": "https://api.github.com/repos/PrestaShop/autoload/zipball/b84a116564d624e3db04fce648dbfee135df87c0",
+                "reference": "b84a116564d624e3db04fce648dbfee135df87c0",
                 "shasum": ""
             },
             "require": {
@@ -5190,9 +5190,9 @@
             ],
             "description": "PrestaShop legacy autoloading",
             "support": {
-                "source": "https://github.com/PrestaShop/autoload/tree/v1.0.0"
+                "source": "https://github.com/PrestaShop/autoload/tree/v1.0.1"
             },
-            "time": "2022-11-29T16:54:18+00:00"
+            "time": "2023-07-07T13:49:33+00:00"
         },
         {
             "name": "prestashop/blockreassurance",

From 1596624725a5cd7f3dc4da4170daf3b7dbbc0175 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Fri, 7 Jul 2023 16:32:44 +0200
Subject: [PATCH 0445/1030] Fix sanity product V2

---
 tests/UI/pages/BO/catalog/productsV2/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/UI/pages/BO/catalog/productsV2/index.ts b/tests/UI/pages/BO/catalog/productsV2/index.ts
index 7f3e5b96bf867..2f24967fc1a8b 100644
--- a/tests/UI/pages/BO/catalog/productsV2/index.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/index.ts
@@ -638,7 +638,7 @@ class Products extends BOBasePage {
    */
   async resetFilter(page: Page): Promise<void> {
     if (!(await this.elementNotVisible(page, this.filterResetButton, 2000))) {
-      await this.clickAndWaitForLoadState(page, this.filterResetButton);
+      await this.clickAndWaitForURL(page, this.filterResetButton);
     }
   }
 

From 9ad7ad37953a6bb3e1b0be9f7b3daaab885f50d5 Mon Sep 17 00:00:00 2001
From: Jens Wilke <jw_github@headissue.com>
Date: Sat, 8 Jul 2023 10:07:15 +0200
Subject: [PATCH 0446/1030] Fixes:
 https://github.com/PrestaShop/PrestaShop/issues/31287

---
 controllers/admin/AdminProductsController.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 85c823e95df10..a4e076035a296 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -1899,6 +1899,16 @@ public function processUpdate()
                 if (Shop::isFeatureActive() && Shop::getContext() != Shop::CONTEXT_SHOP) {
                     $values = (array) Tools::getValue('multishop_check', []);
                     $values['state'] = Product::STATE_SAVED;
+                    $values['id_manufacturer'] = true;
+                    $values['ean13'] = true;
+                    $values['mpn'] = true;
+                    $values['isbn'] = true;
+                    $values['upc'] = true;
+                    $values['reference'] = true;
+                    $values['weight'] = true;
+                    $values['depth'] = true;
+                    $values['width'] = true;
+                    $values['height'] = true;
 
                     $object->setFieldsToUpdate($values);
                 }

From b833d1f9457485cb6f6558d12c1197ab44842ec9 Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Sat, 8 Jul 2023 11:26:52 +0200
Subject: [PATCH 0447/1030] Generate image for store after uploading it

---
 controllers/admin/AdminStoresController.php | 48 ++++++++++++++++-----
 1 file changed, 37 insertions(+), 11 deletions(-)

diff --git a/controllers/admin/AdminStoresController.php b/controllers/admin/AdminStoresController.php
index dc80f9e33fd67..3f4575dcab56c 100644
--- a/controllers/admin/AdminStoresController.php
+++ b/controllers/admin/AdminStoresController.php
@@ -24,6 +24,10 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
+use PrestaShop\PrestaShop\Adapter\SymfonyContainer;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
+use PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration;
+
 /**
  * @property Store $object
  */
@@ -415,23 +419,45 @@ protected function postImage($id)
         // Should we generate high DPI images?
         $generate_hight_dpi_images = (bool) Configuration::get('PS_HIGHT_DPI');
 
+        /*
+        * Let's resolve which formats we will use for image generation.
+        * In new image system, it's multiple formats. In case of legacy, it's only .jpg.
+        *
+        * In case of .jpg images, the actual format inside is decided by ImageManager.
+        */
+        $sfContainer = SymfonyContainer::getInstance();
+        if ($sfContainer->get('prestashop.core.admin.feature_flag.repository')->isEnabled(FeatureFlagSettings::FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT)) {
+            $configuredImageFormats = $sfContainer->get(ImageFormatConfiguration::class)->getGenerationFormats();
+        } else {
+            $configuredImageFormats = ['jpg'];
+        }
+
         if (($id_store = (int) Tools::getValue('id_store')) && count($_FILES) && file_exists(_PS_STORE_IMG_DIR_ . $id_store . '.jpg')) {
             $images_types = ImageType::getImagesTypes('stores');
             foreach ($images_types as $image_type) {
-                ImageManager::resize(
-                    _PS_STORE_IMG_DIR_ . $id_store . '.jpg',
-                    _PS_STORE_IMG_DIR_ . $id_store . '-' . stripslashes($image_type['name']) . '.jpg',
-                    (int) $image_type['width'],
-                    (int) $image_type['height']
-                );
-
-                if ($generate_hight_dpi_images) {
+                foreach ($configuredImageFormats as $imageFormat) {
+                    // For JPG images, we let Imagemanager decide what to do and choose between JPG/PNG.
+                    // For webp and avif extensions, we want it to follow our command and ignore the original format.
+                    $forceFormat = ($imageFormat !== 'jpg');
                     ImageManager::resize(
                         _PS_STORE_IMG_DIR_ . $id_store . '.jpg',
-                        _PS_STORE_IMG_DIR_ . $id_store . '-' . stripslashes($image_type['name']) . '2x.jpg',
-                        (int) $image_type['width'] * 2,
-                        (int) $image_type['height'] * 2
+                        _PS_STORE_IMG_DIR_ . $id_store . '-' . stripslashes($image_type['name']) . '.' . $imageFormat,
+                        (int) $image_type['width'],
+                        (int) $image_type['height'],
+                        $imageFormat,
+                        $forceFormat
                     );
+
+                    if ($generate_hight_dpi_images) {
+                        ImageManager::resize(
+                            _PS_STORE_IMG_DIR_ . $id_store . '.jpg',
+                            _PS_STORE_IMG_DIR_ . $id_store . '-' . stripslashes($image_type['name']) . '2x.' . $imageFormat,
+                            (int) $image_type['width'] * 2,
+                            (int) $image_type['height'] * 2,
+                            $imageFormat,
+                            $forceFormat
+                        );
+                    }
                 }
             }
         }

From d883234badf9d28a40691865219e6818fc778407 Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Sat, 8 Jul 2023 12:44:48 +0200
Subject: [PATCH 0448/1030] Check if product is active and orderable during
 checkout

---
 classes/Cart.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/classes/Cart.php b/classes/Cart.php
index bbcaec5dcb579..d14eedf84dda1 100644
--- a/classes/Cart.php
+++ b/classes/Cart.php
@@ -4991,10 +4991,10 @@ public static function isGuestCartByCartId($id_cart)
     }
 
     /**
-     * Are all products of the Cart still available in the current state ? They might have been converted to another
-     * type of product since then
+     * Checks if all products of the cart are still available in the current state. They might have been converted to another
+     * type of product since then, ordering disabled or deactivated.
      *
-     * @return bool False if one of the products from the cart has been changed into a new type of product
+     * @return bool False if one of the product not publicly orderable anymore.
      */
     public function checkAllProductsAreStillAvailableInThisState()
     {
@@ -5002,9 +5002,15 @@ public function checkAllProductsAreStillAvailableInThisState()
             $currentProduct = new Product();
             $currentProduct->hydrate($product);
 
+            // Check if the product combinations state is still valid
             if ($currentProduct->hasAttributes() && $product['id_product_attribute'] === '0') {
                 return false;
             }
+
+            // Check if product is still active and possible to order
+            if (!$product['active'] || !$product['available_for_order']) {
+                return false;
+            }
         }
 
         return true;

From 16509622ee60093a376b1856e561d09c5651bf23 Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Sat, 8 Jul 2023 17:49:08 +0200
Subject: [PATCH 0449/1030] Fix tests

---
 classes/Cart.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/Cart.php b/classes/Cart.php
index d14eedf84dda1..56430e6c95bbc 100644
--- a/classes/Cart.php
+++ b/classes/Cart.php
@@ -4994,7 +4994,7 @@ public static function isGuestCartByCartId($id_cart)
      * Checks if all products of the cart are still available in the current state. They might have been converted to another
      * type of product since then, ordering disabled or deactivated.
      *
-     * @return bool False if one of the product not publicly orderable anymore.
+     * @return bool false if one of the product not publicly orderable anymore
      */
     public function checkAllProductsAreStillAvailableInThisState()
     {

From d2c17601222ed9a9d2e8830d6f0ae8979e6d4996 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Jul 2023 04:52:34 +0000
Subject: [PATCH 0450/1030] Bump eslint-plugin-deprecation from 1.3.3 to 1.4.1
 in /tests/UI

Bumps [eslint-plugin-deprecation](https://github.com/gund/eslint-plugin-deprecation) from 1.3.3 to 1.4.1.
- [Release notes](https://github.com/gund/eslint-plugin-deprecation/releases)
- [Changelog](https://github.com/gund/eslint-plugin-deprecation/blob/master/CHANGELOG.md)
- [Commits](https://github.com/gund/eslint-plugin-deprecation/compare/v1.3.3...v1.4.1)

---
updated-dependencies:
- dependency-name: eslint-plugin-deprecation
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 124 +++----------------------------------
 tests/UI/package.json      |   2 +-
 2 files changed, 8 insertions(+), 118 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index b80e2cea51f33..dcce21a74b181 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -430,99 +430,6 @@
         }
       }
     },
-    "@typescript-eslint/experimental-utils": {
-      "version": "5.51.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.51.0.tgz",
-      "integrity": "sha512-8/3+ZyBENl2aog1/QB3S39ptkZ2oRhDB+sJt15UWXBE3skgwL1C8BN9RjpOyhTejwR2hVrvqEjcYcNY6qtZ7nw==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/utils": "5.51.0"
-      },
-      "dependencies": {
-        "@typescript-eslint/scope-manager": {
-          "version": "5.51.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.51.0.tgz",
-          "integrity": "sha512-gNpxRdlx5qw3yaHA0SFuTjW4rxeYhpHxt491PEcKF8Z6zpq0kMhe0Tolxt0qjlojS+/wArSDlj/LtE69xUJphQ==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "5.51.0",
-            "@typescript-eslint/visitor-keys": "5.51.0"
-          }
-        },
-        "@typescript-eslint/types": {
-          "version": "5.51.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.51.0.tgz",
-          "integrity": "sha512-SqOn0ANn/v6hFn0kjvLwiDi4AzR++CBZz0NV5AnusT2/3y32jdc0G4woXPWHCumWtUXZKPAS27/9vziSsC9jnw==",
-          "dev": true
-        },
-        "@typescript-eslint/typescript-estree": {
-          "version": "5.51.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.51.0.tgz",
-          "integrity": "sha512-TSkNupHvNRkoH9FMA3w7TazVFcBPveAAmb7Sz+kArY6sLT86PA5Vx80cKlYmd8m3Ha2SwofM1KwraF24lM9FvA==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "5.51.0",
-            "@typescript-eslint/visitor-keys": "5.51.0",
-            "debug": "^4.3.4",
-            "globby": "^11.1.0",
-            "is-glob": "^4.0.3",
-            "semver": "^7.3.7",
-            "tsutils": "^3.21.0"
-          }
-        },
-        "@typescript-eslint/utils": {
-          "version": "5.51.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.51.0.tgz",
-          "integrity": "sha512-76qs+5KWcaatmwtwsDJvBk4H76RJQBFe+Gext0EfJdC3Vd2kpY2Pf//OHHzHp84Ciw0/rYoGTDnIAr3uWhhJYw==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.9",
-            "@types/semver": "^7.3.12",
-            "@typescript-eslint/scope-manager": "5.51.0",
-            "@typescript-eslint/types": "5.51.0",
-            "@typescript-eslint/typescript-estree": "5.51.0",
-            "eslint-scope": "^5.1.1",
-            "eslint-utils": "^3.0.0",
-            "semver": "^7.3.7"
-          }
-        },
-        "@typescript-eslint/visitor-keys": {
-          "version": "5.51.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.51.0.tgz",
-          "integrity": "sha512-Oh2+eTdjHjOFjKA27sxESlA87YPSOJafGCR0md5oeMdh1ZcCfAGCIOL216uTBAkAIptvLIfKQhl7lHxMJet4GQ==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "5.51.0",
-            "eslint-visitor-keys": "^3.3.0"
-          }
-        },
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "eslint-scope": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-          "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-          "dev": true,
-          "requires": {
-            "esrecurse": "^4.3.0",
-            "estraverse": "^4.1.1"
-          }
-        },
-        "eslint-visitor-keys": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-          "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-          "dev": true
-        }
-      }
-    },
     "@typescript-eslint/parser": {
       "version": "5.61.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.61.0.tgz",
@@ -2559,20 +2466,20 @@
       }
     },
     "eslint-plugin-deprecation": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-deprecation/-/eslint-plugin-deprecation-1.3.3.tgz",
-      "integrity": "sha512-Bbkv6ZN2cCthVXz/oZKPwsSY5S/CbgTLRG4Q2s2gpPpgNsT0uJ0dB5oLNiWzFYY8AgKX4ULxXFG1l/rDav9QFA==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-deprecation/-/eslint-plugin-deprecation-1.4.1.tgz",
+      "integrity": "sha512-4vxTghWzxsBukPJVQupi6xlTuDc8Pyi1QlRCrFiLgwLPMJQW3cJCNaehJUKQqQFvuue5m4W27e179Y3Qjzeghg==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/experimental-utils": "^5.0.0",
+        "@typescript-eslint/utils": "^5.57.0",
         "tslib": "^2.3.1",
         "tsutils": "^3.21.0"
       },
       "dependencies": {
         "tslib": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
-          "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==",
+          "version": "2.6.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz",
+          "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==",
           "dev": true
         }
       }
@@ -2671,23 +2578,6 @@
         }
       }
     },
-    "eslint-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-      "dev": true,
-      "requires": {
-        "eslint-visitor-keys": "^2.0.0"
-      },
-      "dependencies": {
-        "eslint-visitor-keys": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-          "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-          "dev": true
-        }
-      }
-    },
     "eslint-visitor-keys": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
diff --git a/tests/UI/package.json b/tests/UI/package.json
index 950dc87c23968..0ce4b88d5f363 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -138,7 +138,7 @@
     "babel-eslint": "^10.1.0",
     "eslint": "^8.44.0",
     "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-plugin-deprecation": "^1.3.3",
+    "eslint-plugin-deprecation": "^1.4.1",
     "eslint-plugin-html": "^7.1.0",
     "eslint-plugin-import": "^2.27.5",
     "jsdoc-to-markdown": "^8.0.0",

From d4de08f59d8dc1fe29474a05113d628440f3e0d9 Mon Sep 17 00:00:00 2001
From: lartist <salim-benouamer.ext@prestashop.com>
Date: Thu, 1 Jun 2023 12:30:45 +0200
Subject: [PATCH 0451/1030] Removing of league/tactician-bundle librairy

---
 app/AppKernel.php |   1 -
 composer.json     |   1 -
 composer.lock     | 248 ----------------------------------------------
 3 files changed, 250 deletions(-)

diff --git a/app/AppKernel.php b/app/AppKernel.php
index c20c6a96a9441..2f202228375a0 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -65,7 +65,6 @@ public function registerBundles()
             new PrestaShopBundle\PrestaShopBundle(),
             // PrestaShop Translation parser
             new TranslationToolsBundle(),
-            new League\Tactician\Bundle\TacticianBundle(),
             new FOS\JsRoutingBundle\FOSJsRoutingBundle(),
             new Symfony\UX\TwigComponent\TwigComponentBundle(),
             new Twig\Extra\TwigExtraBundle\TwigExtraBundle(),
diff --git a/composer.json b/composer.json
index b9295a50c8daf..19529a3b6b050 100644
--- a/composer.json
+++ b/composer.json
@@ -47,7 +47,6 @@
         "jakeasmith/http_build_url": "^1",
         "lcobucci/jwt": "^5.0.0",
         "league/oauth2-server": "^8.3",
-        "league/tactician-bundle": "^1.4",
         "martinlindhe/php-mb-helpers": "^0.1.6",
         "matthiasmullie/minify": "~1.3.0",
         "mobiledetect/mobiledetectlib": "^3.74.0",
diff --git a/composer.lock b/composer.lock
index f6cd93371fdbc..bda330288f10e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3225,254 +3225,6 @@
             ],
             "time": "2023-04-04T10:20:16+00:00"
         },
-        {
-            "name": "league/tactician",
-            "version": "v1.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/thephpleague/tactician.git",
-                "reference": "e79f763170f3d5922ec29e85cffca0bac5cd8975"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/tactician/zipball/e79f763170f3d5922ec29e85cffca0bac5cd8975",
-                "reference": "e79f763170f3d5922ec29e85cffca0bac5cd8975",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "require-dev": {
-                "mockery/mockery": "^1.3",
-                "phpunit/phpunit": "^7.5.20 || ^9.3.8",
-                "squizlabs/php_codesniffer": "^3.5.8"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "League\\Tactician\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Ross Tuck",
-                    "homepage": "http://tactician.thephpleague.com"
-                }
-            ],
-            "description": "A small, flexible command bus. Handy for building service layers.",
-            "keywords": [
-                "command",
-                "command bus",
-                "service layer"
-            ],
-            "support": {
-                "issues": "https://github.com/thephpleague/tactician/issues",
-                "source": "https://github.com/thephpleague/tactician/tree/v1.1.0"
-            },
-            "time": "2021-02-14T15:29:04+00:00"
-        },
-        {
-            "name": "league/tactician-bundle",
-            "version": "v1.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/thephpleague/tactician-bundle.git",
-                "reference": "8340e83ded7c804d2b2c417a0f697fac9c15e520"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/tactician-bundle/zipball/8340e83ded7c804d2b2c417a0f697fac9c15e520",
-                "reference": "8340e83ded7c804d2b2c417a0f697fac9c15e520",
-                "shasum": ""
-            },
-            "require": {
-                "league/tactician": "^1.0",
-                "league/tactician-container": "^2.0|^3.0",
-                "league/tactician-logger": "^0.10|^0.11",
-                "php": ">=7.2",
-                "symfony/config": "^3.4|^4.4|^5.0|^6.0",
-                "symfony/dependency-injection": "^3.4|^4.4|^5.0|^6.0",
-                "symfony/http-kernel": "^3.4|^4.4|^5.0|^6.0",
-                "symfony/yaml": "^3.4|^4.4|^5.0|^6.0"
-            },
-            "require-dev": {
-                "matthiasnoback/symfony-config-test": "^4.2.1",
-                "matthiasnoback/symfony-dependency-injection-test": "^4.2.1",
-                "mockery/mockery": "~1.0",
-                "phpunit/phpunit": "~8.5",
-                "symfony/console": "^3.4|^4.4|^5.0|^6.0",
-                "symfony/framework-bundle": "^3.4.31|^4.4|^5.0|^6.0",
-                "symfony/security-bundle": "^3.4|^4.4|^5.0|^6.0",
-                "symfony/security-core": "^3.4|^4.4|^5.0|^6.0",
-                "symfony/validator": "^3.4|^4.4|^5.0|^6.0"
-            },
-            "suggest": {
-                "league/tactician-doctrine": "For doctrine transaction middleware",
-                "symfony/console": "For debugging command-to-handler routing using the tactician:debug console command",
-                "symfony/security": "For command security middleware",
-                "symfony/validator": "For command validator middleware"
-            },
-            "type": "symfony-bundle",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "League\\Tactician\\Bundle\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Rafael Dohms",
-                    "homepage": "http://doh.ms"
-                },
-                {
-                    "name": "Richard Tuin",
-                    "homepage": "http://www.rtuin.nl/"
-                },
-                {
-                    "name": "Xander Smalbil",
-                    "email": "xander@videofunk.nl"
-                },
-                {
-                    "name": "Ross Tuck",
-                    "email": "me@rosstuck.com"
-                }
-            ],
-            "description": "Bundle to integrate Tactician with Symfony projects",
-            "keywords": [
-                "bundle",
-                "symfony",
-                "tactician"
-            ],
-            "support": {
-                "issues": "https://github.com/thephpleague/tactician-bundle/issues",
-                "source": "https://github.com/thephpleague/tactician-bundle/tree/v1.4.0"
-            },
-            "time": "2022-06-15T06:56:49+00:00"
-        },
-        {
-            "name": "league/tactician-container",
-            "version": "2.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/thephpleague/tactician-container.git",
-                "reference": "d1a5d884e072b8cafbff802d07766076eb2ffcb0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/tactician-container/zipball/d1a5d884e072b8cafbff802d07766076eb2ffcb0",
-                "reference": "d1a5d884e072b8cafbff802d07766076eb2ffcb0",
-                "shasum": ""
-            },
-            "require": {
-                "league/tactician": "^1.0",
-                "php": ">=5.5",
-                "psr/container": "^1.0"
-            },
-            "require-dev": {
-                "league/container": "~2.3",
-                "phpunit/phpunit": "~4.3",
-                "squizlabs/php_codesniffer": "~2.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "League\\Tactician\\Container\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nigel Greenway",
-                    "homepage": "http://futurepixels.co.uk"
-                }
-            ],
-            "description": "Tactician integration for any container implementing PSR-11",
-            "keywords": [
-                "container",
-                "container-interop",
-                "di",
-                "interoperable",
-                "league",
-                "tactician"
-            ],
-            "support": {
-                "issues": "https://github.com/thephpleague/tactician-container/issues",
-                "source": "https://github.com/thephpleague/tactician-container/tree/master"
-            },
-            "time": "2017-04-13T06:27:12+00:00"
-        },
-        {
-            "name": "league/tactician-logger",
-            "version": "v0.10.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/thephpleague/tactician-logger.git",
-                "reference": "3ff9ee04e4cbec100af827f829ed4c7ff7c08442"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/tactician-logger/zipball/3ff9ee04e4cbec100af827f829ed4c7ff7c08442",
-                "reference": "3ff9ee04e4cbec100af827f829ed4c7ff7c08442",
-                "shasum": ""
-            },
-            "require": {
-                "league/tactician": "^1.0",
-                "php": ">=5.5.0",
-                "psr/log": "~1.0"
-            },
-            "require-dev": {
-                "mockery/mockery": "^0.9",
-                "phpunit/phpunit": "4.*",
-                "squizlabs/php_codesniffer": "~2.3"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "League\\Tactician\\Logger\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Ross Tuck"
-                }
-            ],
-            "description": "Adds PSR-3 logging support to the Tactician command bus",
-            "homepage": "https://github.com/thephpleague/tactician-logger",
-            "keywords": [
-                "log",
-                "logging",
-                "tactician"
-            ],
-            "support": {
-                "issues": "https://github.com/thephpleague/tactician-logger/issues",
-                "source": "https://github.com/thephpleague/tactician-logger/tree/master"
-            },
-            "time": "2016-08-23T05:50:38+00:00"
-        },
         {
             "name": "league/uri",
             "version": "6.8.0",

From d9c605c030d71f500b4f75aece1a954a3f1343b3 Mon Sep 17 00:00:00 2001
From: lartist <salim-benouamer.ext@prestashop.com>
Date: Thu, 1 Jun 2023 19:56:29 +0200
Subject: [PATCH 0452/1030] Replace tactician references by messenger
 references

---
 .../CommandBus/ExecutedCommandRegistry.php    |   2 +-
 ...ter.php => MessengerCommandBusAdapter.php} |  28 +--
 .../config/services/adapter/address.yml       |  54 +++---
 .../config/services/adapter/alias.yml         |  20 ++-
 .../config/services/adapter/attachment.yml    |  22 +--
 .../config/services/adapter/attribute.yml     |  10 +-
 .../services/adapter/attribute_group.yml      |  20 ++-
 .../config/services/adapter/carrier.yml       |  10 +-
 .../config/services/adapter/cart.yml          |  85 ++++++----
 .../config/services/adapter/cart_rule.yml     |  28 +--
 .../services/adapter/catalog_price_rule.yml   |  30 ++--
 .../config/services/adapter/category.yml      |  71 ++++----
 .../config/services/adapter/cms_page.yml      |  45 +++--
 .../services/adapter/cms_page_category.yml    |  55 +++---
 .../config/services/adapter/configuration.yml |   2 +-
 .../config/services/adapter/contact.yml       |   6 +-
 .../config/services/adapter/country.yml       |  13 +-
 .../config/services/adapter/credit_slip.yml   |   5 +-
 .../config/services/adapter/currency.yml      |  24 +--
 .../config/services/adapter/customer.yml      |  68 +++++---
 .../config/services/adapter/employee.yml      |  16 +-
 .../config/services/adapter/feature.yml       |  40 +++--
 .../config/services/adapter/group.yml         |  10 +-
 .../config/services/adapter/hook.yml          |  10 +-
 .../config/services/adapter/language.yml      |  35 ++--
 .../config/services/adapter/manufacturer.yml  |  33 ++--
 .../config/services/adapter/meta.yml          |  20 ++-
 .../config/services/adapter/module.yml        |   5 +-
 .../config/services/adapter/notification.yml  |  10 +-
 .../config/services/adapter/order.yml         | 130 ++++++++------
 .../config/services/adapter/order_message.yml |  25 +--
 .../config/services/adapter/order_return.yml  |  10 +-
 .../services/adapter/order_return_state.yml   |  25 +--
 .../config/services/adapter/order_state.yml   |  19 ++-
 .../config/services/adapter/product.yml       | 160 +++++++++++-------
 .../services/adapter/product/_combination.yml |  70 +++++---
 .../adapter/product/_customization.yml        |  15 +-
 .../adapter/product/_feature_value.yml        |  15 +-
 .../services/adapter/product/_image.yml       |  35 ++--
 .../config/services/adapter/product/_pack.yml |  15 +-
 .../adapter/product/_specific_prices.yml      |  35 ++--
 .../services/adapter/product/_stock.yml       |  10 +-
 .../adapter/product/_virtual_product.yml      |  15 +-
 .../config/services/adapter/profile.yml       |  40 +++--
 .../config/services/adapter/search_engine.yml |  25 +--
 .../config/services/adapter/security.yml      |  30 ++--
 .../config/services/adapter/shop.yml          |  12 +-
 .../config/services/adapter/sql_manager.yml   |  16 +-
 .../config/services/adapter/state.yml         |  35 ++--
 .../config/services/adapter/store.yml         |  10 +-
 .../config/services/adapter/supplier.yml      |  50 +++---
 .../Resources/config/services/adapter/tab.yml |   2 +-
 .../Resources/config/services/adapter/tax.yml |  23 +--
 .../services/adapter/tax_rules_group.yml      |  35 ++--
 .../config/services/adapter/title.yml         |  25 +--
 .../config/services/adapter/webservice.yml    |  15 +-
 .../config/services/adapter/zone.yml          |  35 ++--
 .../config/services/core/command_bus.yml      |   4 +-
 .../core/domain/authorization_server.yml      |  15 +-
 .../services/core/domain/customer_service.yml |  40 +++--
 .../services/core/domain/showcase_card.yml    |  10 +-
 .../services/core/domain/sql_management.yml   |  10 +-
 .../config/services/core/domain/theme.yml     |  16 +-
 .../config/services/core/mail_template.yml    |   5 +-
 .../EditRootCategoryHandlerTest.php           |   4 +-
 .../GetCategoryForEditingHandlerTest.php      |   4 +-
 ...php => MessengerCommandBusAdapterTest.php} |   7 +-
 67 files changed, 1074 insertions(+), 750 deletions(-)
 rename src/Core/CommandBus/{TacticianCommandBusAdapter.php => MessengerCommandBusAdapter.php} (63%)
 rename tests/Unit/Core/CommandBus/{TacticianCommandBusAdapterTest.php => MessengerCommandBusAdapterTest.php} (83%)

diff --git a/src/Core/CommandBus/ExecutedCommandRegistry.php b/src/Core/CommandBus/ExecutedCommandRegistry.php
index 02b4ff90b3450..e2b0713796aaa 100644
--- a/src/Core/CommandBus/ExecutedCommandRegistry.php
+++ b/src/Core/CommandBus/ExecutedCommandRegistry.php
@@ -115,7 +115,7 @@ private function getTrace(): array
         $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, self::BACKTRACE_LIMIT);
 
         foreach ($trace as $step) {
-            if ($step['class'] === TacticianCommandBusAdapter::class
+            if ($step['class'] === MessengerCommandBusAdapter::class
                 && $step['function'] === 'handle'
             ) {
                 return [
diff --git a/src/Core/CommandBus/TacticianCommandBusAdapter.php b/src/Core/CommandBus/MessengerCommandBusAdapter.php
similarity index 63%
rename from src/Core/CommandBus/TacticianCommandBusAdapter.php
rename to src/Core/CommandBus/MessengerCommandBusAdapter.php
index 275b0cfa0c557..783bcba712adf 100644
--- a/src/Core/CommandBus/TacticianCommandBusAdapter.php
+++ b/src/Core/CommandBus/MessengerCommandBusAdapter.php
@@ -26,24 +26,18 @@
 
 namespace PrestaShop\PrestaShop\Core\CommandBus;
 
-use League\Tactician\CommandBus;
+use Symfony\Component\Messenger\Exception\HandlerFailedException;
+use Symfony\Component\Messenger\MessageBusInterface;
+use Symfony\Component\Messenger\Stamp\HandledStamp;
 
 /**
- * Class TacticianCommandBusAdapter is Tactician's CommandsBus implementation for PrestaShop's contract.
+ * Class MessengerCommandBusAdapter is the Symfony Messenger CommandsBus implementation for PrestaShop's contract.
  */
-final class TacticianCommandBusAdapter implements CommandBusInterface
+final class MessengerCommandBusAdapter implements CommandBusInterface
 {
-    /**
-     * @var CommandBus
-     */
-    private $bus;
 
-    /**
-     * @param CommandBus $bus
-     */
-    public function __construct(CommandBus $bus)
+    public function __construct(private readonly MessageBusInterface $commandBus)
     {
-        $this->bus = $bus;
     }
 
     /**
@@ -51,6 +45,14 @@ public function __construct(CommandBus $bus)
      */
     public function handle($command)
     {
-        return $this->bus->handle($command);
+        try {
+            return $this->commandBus
+                ->dispatch($command)
+                ->last(HandledStamp::class)
+                ->getResult()
+                ;
+        } catch (HandlerFailedException $exception) {
+            throw $exception->getPrevious();
+        }
     }
 }
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/address.yml b/src/PrestaShopBundle/Resources/config/services/adapter/address.yml
index d351c2a681550..639cc492b8ed5 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/address.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/address.yml
@@ -7,60 +7,68 @@ services:
   prestashop.adapter.address.command_handler.delete_address_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\DeleteAddressHandler'
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\DeleteAddressCommand' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\DeleteAddressCommand', method: 'handle' }
 
   prestashop.adapter.address.command_handler.bulk_delete_address_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\BulkDeleteAddressHandler'
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\BulkDeleteAddressCommand' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\BulkDeleteAddressCommand', method: 'handle' }
 
   prestashop.adapter.address.command_handler.add_manufacturer_address_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\AddManufacturerAddressHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\AddManufacturerAddressCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\AddManufacturerAddressCommand'
+        method: handle
 
   prestashop.adapter.address.command_handler.edit_manufacturer_address_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\EditManufacturerAddressHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\EditManufacturerAddressCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\EditManufacturerAddressCommand'
+        method: handle
 
   prestashop.adapter.address.query_handler.get_manufacturer_address_for_editing_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Address\QueryHandler\GetManufacturerAddressForEditingHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Address\Query\GetManufacturerAddressForEditing'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Address\Query\GetManufacturerAddressForEditing'
+        method: handle
 
   prestashop.adapter.address.query_handler.get_required_fields_for_address:
     class: 'PrestaShop\PrestaShop\Adapter\Address\QueryHandler\GetRequiredFieldsForAddressHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Address\Query\GetRequiredFieldsForAddress'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Address\Query\GetRequiredFieldsForAddress'
+        method: handle
 
   prestashop.adapter.address.command_handler.set_required_fields_for_address:
     class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\SetRequiredFieldsForAddressHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\SetRequiredFieldsForAddressCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\SetRequiredFieldsForAddressCommand'
+        method: handle
 
   prestashop.adapter.address.command_handler.add_customer_address_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\AddCustomerAddressHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\AddCustomerAddressCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\AddCustomerAddressCommand'
+        method: handle
 
   prestashop.adapter.address.query_handler.get_customer_address_for_editing_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Address\QueryHandler\GetCustomerAddressForEditingHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Address\Query\GetCustomerAddressForEditing'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Address\Query\GetCustomerAddressForEditing'
+        method: handle
 
   prestashop.adapter.address.command_handler.edit_customer_address_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\EditCustomerAddressHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\EditCustomerAddressCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\EditCustomerAddressCommand'
+        method: handle
 
   prestashop.adapter.address.command_handler.edit_order_address_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\EditOrderAddressHandler'
@@ -69,16 +77,18 @@ services:
       - '@prestashop.adapter.order.command_handler.change_order_delivery_address_handler'
       - '@prestashop.adapter.order.command_handler.change_order_invoice_address_handler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\EditOrderAddressCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\EditOrderAddressCommand'
+        method: handle
 
   prestashop.adapter.address.command_handler.edit_cart_address_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\EditCartAddressHandler'
     arguments:
       - '@prestashop.adapter.address.command_handler.edit_customer_address_handler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\EditCartAddressCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\EditCartAddressCommand'
+        method: handle
 
   prestashop.adapter.address.formatter:
     class: 'PrestaShop\PrestaShop\Adapter\Address\AddressFormatter'
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml b/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
index e1ced98250139..b2d5d2f763da7 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
@@ -12,13 +12,15 @@ services:
 
   PrestaShop\PrestaShop\Adapter\Alias\CommandHandler\AddAliasHandler:
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Alias\Command\AddAliasCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Alias\Command\AddAliasCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Alias\QueryHandler\GetAliasForEditingHandler:
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Alias\Query\GetAliasForEditing
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Alias\Query\GetAliasForEditing
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Alias\CommandHandler\DeleteAliasHandler:
     tags:
@@ -32,13 +34,15 @@ services:
 
   PrestaShop\PrestaShop\Adapter\Alias\CommandHandler\UpdateAliasStatusHandler:
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasStatusCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasStatusCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Alias\CommandHandler\BulkUpdateAliasStatusHandler:
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Alias\Command\BulkUpdateAliasStatusCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Alias\Command\BulkUpdateAliasStatusCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Alias\CommandHandler\UpdateAliasHandler:
     tags:
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/attachment.yml b/src/PrestaShopBundle/Resources/config/services/adapter/attachment.yml
index 684557a660c6b..923c83d2d8436 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/attachment.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/attachment.yml
@@ -7,26 +7,26 @@ services:
     class: 'PrestaShop\PrestaShop\Adapter\Attachment\CommandHandler\DeleteAttachmentHandler'
     parent: 'prestashop.adapter.attachment.command_handler.abstract_attachment_handler'
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Command\DeleteAttachmentCommand' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Command\DeleteAttachmentCommand', method: handle }
 
   prestashop.adapter.attachment.command_handler.bulk_delete_attachment_handler:
     public: true
     class: 'PrestaShop\PrestaShop\Adapter\Attachment\CommandHandler\BulkDeleteAttachmentsHandler'
     parent: 'prestashop.adapter.attachment.command_handler.abstract_attachment_handler'
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Command\BulkDeleteAttachmentsCommand' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Command\BulkDeleteAttachmentsCommand', method: handle }
 
   prestashop.adapter.attachment.query_handler.get_attachment_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Attachment\QueryHandler\GetAttachmentHandler'
     arguments:
       - !php/const _PS_DOWNLOAD_DIR_
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Query\GetAttachment' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Query\GetAttachment', method: handle }
 
   prestashop.adapter.contact.query_handler.get_attachment_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Attachment\QueryHandler\GetAttachmentForEditingHandler'
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Query\GetAttachmentForEditing' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Query\GetAttachmentForEditing', method: handle }
 
   prestashop.adapter.attachment.uploader.attachment_file_uploader:
     class: 'PrestaShop\PrestaShop\Adapter\File\Uploader\AttachmentFileUploader'
@@ -47,7 +47,7 @@ services:
     arguments:
       - '@prestashop.adapter.attachment.uploader.attachment_file_uploader'
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Command\EditAttachmentCommand' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Command\EditAttachmentCommand', method: handle }
 
   prestashop.adapter.attachment.command_handler.create_attachment_handler:
     public: true
@@ -56,7 +56,7 @@ services:
     arguments:
       - '@prestashop.adapter.attachment.uploader.attachment_file_uploader'
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Command\AddAttachmentCommand' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Command\AddAttachmentCommand', method: handle }
 
   PrestaShop\PrestaShop\Adapter\Attachment\AttachmentRepository:
     arguments:
@@ -72,13 +72,15 @@ services:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Attachment\AttachmentRepository'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Attachment\Query\GetAttachmentInformation
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Attachment\Query\GetAttachmentInformation
+        method: handle
 
   prestashop.adapter.attachment.query_handler.search_attachment_handler:
     class: PrestaShop\PrestaShop\Adapter\Attachment\QueryHandler\SearchAttachmentHandler
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Attachment\AttachmentRepository'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Attachment\Query\SearchAttachment
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Attachment\Query\SearchAttachment
+        method: handle
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/attribute.yml b/src/PrestaShopBundle/Resources/config/services/adapter/attribute.yml
index d2f64172939e1..906d8f70dbe5c 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/attribute.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/attribute.yml
@@ -4,13 +4,15 @@ services:
 
   PrestaShop\PrestaShop\Adapter\Attribute\CommandHandler\DeleteAttributeHandler:
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\Command\DeleteAttributeCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\Command\DeleteAttributeCommand'
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Attribute\CommandHandler\BulkDeleteAttributeHandler:
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\Command\BulkDeleteAttributeCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\Command\BulkDeleteAttributeCommand'
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Attribute\Repository\AttributeRepository:
     arguments:
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/attribute_group.yml b/src/PrestaShopBundle/Resources/config/services/adapter/attribute_group.yml
index eecc159e7d5c8..10710da9345ab 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/attribute_group.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/attribute_group.yml
@@ -13,28 +13,32 @@ services:
 
   PrestaShop\PrestaShop\Adapter\AttributeGroup\CommandHandler\DeleteAttributeGroupHandler:
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\DeleteAttributeGroupCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\DeleteAttributeGroupCommand'
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\AttributeGroup\CommandHandler\BulkDeleteAttributeGroupHandler:
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\BulkDeleteAttributeGroupCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\BulkDeleteAttributeGroupCommand'
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\AttributeGroup\QueryHandler\GetAttributeGroupListHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Attribute\Repository\AttributeRepository'
       - '@PrestaShop\PrestaShop\Adapter\AttributeGroup\Repository\AttributeGroupRepository'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Query\GetAttributeGroupList'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Query\GetAttributeGroupList'
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\AttributeGroup\QueryHandler\GetProductAttributeGroupsHandler:
     autowire: true
     public: false
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Product\AttributeGroup\Query\GetProductAttributeGroups'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Product\AttributeGroup\Query\GetProductAttributeGroups'
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\AttributeGroup\Repository\AttributeGroupRepository:
     arguments:
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/carrier.yml b/src/PrestaShopBundle/Resources/config/services/adapter/carrier.yml
index 11ae6131bdb92..6d4f766a8ae5e 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/carrier.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/carrier.yml
@@ -10,27 +10,27 @@ services:
   prestashop.adapter.carrier.command_handler.toggle_carrier_status:
     class: 'PrestaShop\PrestaShop\Adapter\Carrier\CommandHandler\ToggleCarrierStatusHandler'
     tags:
-      - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Carrier\Command\ToggleCarrierStatusCommand }
+      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Carrier\Command\ToggleCarrierStatusCommand, method: handle }
 
   prestashop.adapter.carrier.command_handler.toggle_carrier_is_free_status:
     class: 'PrestaShop\PrestaShop\Adapter\Carrier\CommandHandler\ToggleCarrierIsFreeHandler'
     tags:
-      - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Carrier\Command\ToggleCarrierIsFreeCommand }
+      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Carrier\Command\ToggleCarrierIsFreeCommand, method: handle }
 
   prestashop.adapter.carrier.command_handler.delete_carrier:
     class: 'PrestaShop\PrestaShop\Adapter\Carrier\CommandHandler\DeleteCarrierHandler'
     tags:
-      - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Carrier\Command\DeleteCarrierCommand }
+      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Carrier\Command\DeleteCarrierCommand, method: handle }
 
   prestashop.adapter.carrier.command_handler.bulk_delete_carrier:
     class: 'PrestaShop\PrestaShop\Adapter\Carrier\CommandHandler\BulkDeleteCarrierHandler'
     tags:
-      - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Carrier\Command\BulkDeleteCarrierCommand }
+      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Carrier\Command\BulkDeleteCarrierCommand, method: handle }
 
   prestashop.adapter.carrier.command_handler.bulk_toggle_carrier_status:
     class: 'PrestaShop\PrestaShop\Adapter\Carrier\CommandHandler\BulkToggleCarrierStatusHandler'
     tags:
-      - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Carrier\Command\BulkToggleCarrierStatusCommand }
+      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Carrier\Command\BulkToggleCarrierStatusCommand, method: handle }
 
   prestashop.adapter.carrier.carrier_module_advice_alert_checker:
     class: 'PrestaShop\PrestaShop\Adapter\Carrier\CarrierModuleAdviceAlertChecker'
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/cart.yml b/src/PrestaShopBundle/Resources/config/services/adapter/cart.yml
index 54a8255738874..145beaee07121 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/cart.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/cart.yml
@@ -5,28 +5,32 @@ services:
   prestashop.adapter.cart.command_handler.create_empty_customer_cart_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\CreateEmptyCustomerCartHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\CreateEmptyCustomerCartCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\CreateEmptyCustomerCartCommand'
+        method: handle
 
   prestashop.adapter.cart.command_handler.update_cart_currency_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\UpdateCartCurrencyHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartCurrencyCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartCurrencyCommand'
+        method: handle
 
   prestashop.adapter.cart.command_handler.update_cart_language_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\UpdateCartLanguageHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartLanguageCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartLanguageCommand'
+        method: handle
 
   prestashop.adapter.cart.command_handler.update_cart_addresses_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\UpdateCartAddressesHandler'
     arguments:
       - '@prestashop.adapter.command_handler.update_cart_carrier_handler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartAddressesCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartAddressesCommand'
+        method: handle
 
   prestashop.adapter.cart.command_handler.update_delivery_options_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\UpdateCartDeliverySettingsHandler'
@@ -34,58 +38,66 @@ services:
       - '@translator'
       - '@prestashop.adapter.legacy.configuration'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartDeliverySettingsCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartDeliverySettingsCommand'
+        method: handle
 
   prestashop.adapter.command_handler.update_product_quantity_in_cart_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\UpdateProductQuantityInCartHandler'
     arguments:
       - '@prestashop.adapter.context_state_manager'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateProductQuantityInCartCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateProductQuantityInCartCommand'
+        method: handle
 
   prestashop.adapter.command_handler.update_cart_carrier_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\UpdateCartCarrierHandler'
     arguments:
       - '@prestashop.adapter.context_state_manager'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartCarrierCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartCarrierCommand'
+        method: handle
 
   prestashop.adapter.command_handler.add_cart_rule_to_cart_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\AddCartRuleToCartHandler'
     arguments:
       - '@prestashop.adapter.context_state_manager'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\AddCartRuleToCartCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\AddCartRuleToCartCommand'
+        method: handle
 
   prestashop.adapter.command_handler.remove_cart_rule_from_cart_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\RemoveCartRuleFromCartHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\RemoveCartRuleFromCartCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\RemoveCartRuleFromCartCommand'
+        method: handle
 
   prestashop.adapter.command_handler.remove_product_from_cart_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\RemoveProductFromCartHandler'
     arguments:
       - '@prestashop.adapter.context_state_manager'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\RemoveProductFromCartCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\RemoveProductFromCartCommand'
+        method: handle
 
   prestashop.adapter.command_handler.update_product_price_in_cart_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\UpdateProductPriceInCartHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateProductPriceInCartCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateProductPriceInCartCommand'
+        method: handle
 
   prestashop.adapter.command_handler.send_cart_to_customer_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\SendCartToCustomerHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\SendCartToCustomerCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\SendCartToCustomerCommand'
+        method: handle
 
   prestashop.adapter.query_handler.get_cart_for_viewing_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\QueryHandler\GetCartForViewingHandler'
@@ -93,14 +105,16 @@ services:
       - '@PrestaShop\PrestaShop\Adapter\ImageManager'
       - "@prestashop.core.localization.locale.context_locale"
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Query\GetCartForViewing'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Cart\Query\GetCartForViewing'
+        method: handle
 
   prestashop.adapter.cart.query_handler.get_last_empty_customer_cart_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\QueryHandler\GetLastEmptyCustomerCartHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Query\GetLastEmptyCustomerCart'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Cart\Query\GetLastEmptyCustomerCart'
+        method: handle
 
   prestashop.adapter.query_handler.get_cart_information_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\QueryHandler\GetCartForOrderCreationHandler'
@@ -111,14 +125,16 @@ services:
       - '@prestashop.adapter.context_state_manager'
       - '@=service("prestashop.adapter.legacy.configuration").getInt("PS_CARRIER_DEFAULT")'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Query\GetCartForOrderCreation'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Cart\Query\GetCartForOrderCreation'
+        method: handle
 
   prestashop.adapter.command_handler.add_customization_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\AddCustomizationHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\AddCustomizationCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\AddCustomizationCommand'
+        method: handle
 
   prestashop.adapter.command_handler.add_product_to_cart_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\AddProductToCartHandler'
@@ -126,5 +142,6 @@ services:
       - '@prestashop.adapter.command_handler.add_customization_handler'
       - '@prestashop.adapter.command_handler.update_product_quantity_in_cart_handler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\AddProductToCartCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\AddProductToCartCommand'
+        method: handle
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml b/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml
index ec8fbb0c941aa..0bc5d3635ec89 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml
@@ -6,44 +6,48 @@ services:
     autowire: true
     public: false
     tags:
-      - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\CartRule\Command\AddCartRuleCommand }
+      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\CartRule\Command\AddCartRuleCommand, method: handle }
 
   PrestaShop\PrestaShop\Adapter\CartRule\QueryHandler\GetCartRuleForEditingHandler:
     autowire: true
     public: false
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\CartRule\Query\GetCartRuleForEditing'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\CartRule\Query\GetCartRuleForEditing'
+        method: handle
 
   prestashop.adapter.cart_rule.query_handler.search_cart_rules_handler:
     class: PrestaShop\PrestaShop\Adapter\CartRule\QueryHandler\SearchCartRulesHandler
     arguments:
       - "@=service('prestashop.adapter.legacy.context').getContext().language.id"
     tags:
-      - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\CartRule\Query\SearchCartRules }
+      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\CartRule\Query\SearchCartRules, method: handle }
 
   prestashop.adapter.cart_rule.command_handler.delete_cart_rule_handler:
     class: 'PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler\DeleteCartRuleHandler'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\CartRule\Command\DeleteCartRuleCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\CartRule\Command\DeleteCartRuleCommand'
+        method: handle
 
   prestashop.adapter.cart_rule.command_handler.bulk_delete_cart_rule_handler:
     class: 'PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler\BulkDeleteCartRuleHandler'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\CartRule\Command\BulkDeleteCartRuleCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\CartRule\Command\BulkDeleteCartRuleCommand'
+        method: handle
 
   prestashop.adapter.cart_rule.command_handler.toggle_cart_rule_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler\ToggleCartRuleStatusHandler'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\CartRule\Command\ToggleCartRuleStatusCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\CartRule\Command\ToggleCartRuleStatusCommand'
+        method: handle
 
   prestashop.adapter.cart_rule.command_handler.bulk_toggle_cart_rule_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler\BulkToggleCartRuleStatusHandler'
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\CartRule\Command\BulkToggleCartRuleStatusCommand' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\CartRule\Command\BulkToggleCartRuleStatusCommand', method: handle }
 
   PrestaShop\PrestaShop\Adapter\CartRule\Validate\CartRuleValidator:
     autowire: true
@@ -60,7 +64,7 @@ services:
     autowire: true
     public: false
     tags:
-      - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\CartRule\Command\EditCartRuleCommand }
+      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\CartRule\Command\EditCartRuleCommand, method: handle }
 
   PrestaShop\PrestaShop\Adapter\CartRule\CartRuleActionFiller:
     autowire: true
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/catalog_price_rule.yml b/src/PrestaShopBundle/Resources/config/services/adapter/catalog_price_rule.yml
index 01947881d413c..6da3ec4f710a6 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/catalog_price_rule.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/catalog_price_rule.yml
@@ -5,40 +5,46 @@ services:
   prestashop.adapter.catalog_price_rule.command_handler.delete_catalog_price_rule_handler:
     class: 'PrestaShop\PrestaShop\Adapter\CatalogPriceRule\CommandHandler\DeleteCatalogPriceRuleHandler'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Command\DeleteCatalogPriceRuleCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Command\DeleteCatalogPriceRuleCommand'
+        method: handle
 
   prestashop.adapter.catalog_price_rule.command_handler.bulk_delete_catalog_price_rule_handler:
     class: 'PrestaShop\PrestaShop\Adapter\CatalogPriceRule\CommandHandler\BulkDeleteCatalogPriceRuleHandler'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Command\BulkDeleteCatalogPriceRuleCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Command\BulkDeleteCatalogPriceRuleCommand'
+        method: handle
 
   prestashop.adapter.catalog_price_rule.command_handler.add_catalog_price_rule_handler:
     class: 'PrestaShop\PrestaShop\Adapter\CatalogPriceRule\CommandHandler\AddCatalogPriceRuleHandler'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Command\AddCatalogPriceRuleCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Command\AddCatalogPriceRuleCommand'
+        method: handle
 
   prestashop.adapter.catalog_price_rule.command_handler.edit_catalog_price_rule_handler:
     class: 'PrestaShop\PrestaShop\Adapter\CatalogPriceRule\CommandHandler\EditCatalogPriceRuleHandler'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Command\EditCatalogPriceRuleCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Command\EditCatalogPriceRuleCommand'
+        method: handle
 
   prestashop.adapter.catalog_price_rule.command_handler.get_catalog_price_rule_for_editing_handler:
     class: 'PrestaShop\PrestaShop\Adapter\CatalogPriceRule\QueryHandler\GetCatalogPriceRuleForEditingHandler'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Query\GetCatalogPriceRuleForEditing'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Query\GetCatalogPriceRuleForEditing'
+        method: handle
 
   prestashop.adapter.catalog_price_rule.query_handler.get_catalog_price_rule_list_for_product_handler:
     class: 'PrestaShop\PrestaShop\Adapter\CatalogPriceRule\QueryHandler\GetCatalogPriceRuleListForProductHandler'
     arguments:
       - '@prestashop.adapter.catalog_price_rule.repository.catalog_price_rule_repository'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Query\GetCatalogPriceRuleListForProduct'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Query\GetCatalogPriceRuleListForProduct'
+        method: handle
 
   prestashop.adapter.catalog_price_rule.repository.catalog_price_rule_repository:
     class: PrestaShop\PrestaShop\Adapter\CatalogPriceRule\Repository\CatalogPriceRuleRepository
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/category.yml b/src/PrestaShopBundle/Resources/config/services/adapter/category.yml
index 9af97e74fa899..e8cd73d7030c0 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/category.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/category.yml
@@ -13,26 +13,30 @@ services:
   prestashop.adapter.category.command_handler.bulk_update_categories_status_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\BulkUpdateCategoriesStatusHandler
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Category\Command\BulkUpdateCategoriesStatusCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Category\Command\BulkUpdateCategoriesStatusCommand
+        method: handle
 
   prestashop.adapter.category.command_handler.bulk_enable_categories_status_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\BulkUpdateCategoriesStatusHandler
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Category\Command\BulkEnableCategoriesCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Category\Command\BulkEnableCategoriesCommand
+        method: handle
 
   prestashop.adapter.category.command_handler.bulk_disable_categories_status_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\BulkUpdateCategoriesStatusHandler
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Category\Command\BulkDisableCategoriesCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Category\Command\BulkDisableCategoriesCommand
+        method: handle
 
   prestashop.adapter.category.command_handler.set_category_is_enabled_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\SetCategoryIsEnabledHandler
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Category\Command\SetCategoryIsEnabledCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Category\Command\SetCategoryIsEnabledCommand
+        method: handle
 
   prestashop.adapter.category.command_handler.abstract_delete_category_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\AbstractDeleteCategoryHandler
@@ -47,23 +51,25 @@ services:
     parent: prestashop.adapter.category.command_handler.abstract_delete_category_handler
     public: true
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryCommand
+        method: handle
 
   prestashop.adapter.category.command_handler.bulk_delete_categories_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\BulkDeleteCategoriesHandler
     parent: prestashop.adapter.category.command_handler.abstract_delete_category_handler
     public: true
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Category\Command\BulkDeleteCategoriesCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Category\Command\BulkDeleteCategoriesCommand
+        method: handle
 
   prestashop.adapter.category.command_handler.add_category_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\AddCategoryHandler
     public: true
     autowire: true
     tags:
-      - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Category\Command\AddCategoryCommand }
+      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Category\Command\AddCategoryCommand, method: handle }
 
   prestashop.adapter.category.command_handler.add_root_category_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\AddRootCategoryHandler
@@ -72,30 +78,32 @@ services:
     public: true
     autowire: true
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Category\Command\AddRootCategoryCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Category\Command\AddRootCategoryCommand
+        method: handle
 
   prestashop.adapter.category.command_handler.edit_root_category_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\EditRootCategoryHandler
     public: true
     autowire: true
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Category\Command\EditRootCategoryCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Category\Command\EditRootCategoryCommand
+        method: handle
 
   prestashop.adapter.category.command_handler.edit_category_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\EditCategoryHandler
     public: true
     autowire: true
     tags:
-      - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Category\Command\EditCategoryCommand }
+      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Category\Command\EditCategoryCommand, method: handle }
 
   prestashop.adapter.category.query_handler.get_category_for_editing:
     class: PrestaShop\PrestaShop\Adapter\Category\QueryHandler\GetCategoryForEditingHandler
     arguments:
       - '@prestashop.core.image.parser.image_tag_source_parser'
     tags:
-      - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Category\Query\GetCategoryForEditing }
+      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Category\Query\GetCategoryForEditing, method: handle }
 
   prestashop.adapter.category.command_handler.delete_category_cover_image_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\DeleteCategoryCoverImageHandler
@@ -103,8 +111,9 @@ services:
       - '@filesystem'
       - '@prestashop.adapter.legacy.configuration'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryCoverImageCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryCoverImageCommand
+        method: handle
 
   prestashop.adapter.category.command_handler.delete_category_menu_thumbnail_image_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\DeleteCategoryMenuThumbnailImageHandler
@@ -113,20 +122,23 @@ services:
       - '@prestashop.adapter.legacy.configuration'
       - '@prestashop.adapter.cache.clearer.smarty_cache_clearer'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryMenuThumbnailImageCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryMenuThumbnailImageCommand
+        method: handle
 
   prestashop.adapter.category.command_handler.update_category_position_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\UpdateCategoryPositionHandler
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Category\Command\UpdateCategoryPositionCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Category\Command\UpdateCategoryPositionCommand
+        method: handle
 
   prestashop.adapter.category.command_handler.get_category_status_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\QueryHandler\GetCategoryIsEnabledHandler
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Category\Query\GetCategoryIsEnabled
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Category\Query\GetCategoryIsEnabled
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Category\Repository\CategoryRepository:
     arguments:
@@ -150,5 +162,6 @@ services:
       - '@PrestaShop\PrestaShop\Adapter\Shop\Repository\ShopRepository'
       - "@=service('prestashop.adapter.legacy.configuration').get('PS_ROOT_CATEGORY')"
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Category\Query\GetCategoriesTree
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Category\Query\GetCategoriesTree
+        method: handle
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/cms_page.yml b/src/PrestaShopBundle/Resources/config/services/adapter/cms_page.yml
index ad15bb12b6544..8629f353c5560 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/cms_page.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/cms_page.yml
@@ -5,50 +5,58 @@ services:
   prestashop.adapter.cms_page.command_handler.bulk_disable_cms_page:
     class: PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler\BulkDisableCmsPageHandler
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\BulkDisableCmsPageCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\BulkDisableCmsPageCommand
+        method: handle
 
   prestashop.adapter.cms_page.command_handler.bulk_enable_cms_page:
     class: PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler\BulkEnableCmsPageHandler
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\BulkEnableCmsPageCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\BulkEnableCmsPageCommand
+        method: handle
 
   prestashop.adapter.cms_page.command_handler.toggle_cms_page_status:
     class: PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler\ToggleCmsPageStatusHandler
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\ToggleCmsPageStatusCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\ToggleCmsPageStatusCommand
+        method: handle
 
   prestashop.adapter.cms_page.query_handler.get_cms_category_id_for_redirection:
     class: PrestaShop\PrestaShop\Adapter\CMS\Page\QueryHandler\GetCmsCategoryIdForRedirectionHandler
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Query\GetCmsCategoryIdForRedirection
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\CmsPage\Query\GetCmsCategoryIdForRedirection
+        method: handle
 
   prestashop.adapter.cms_page.command_handler.delete_cms_page:
     class: PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler\DeleteCmsPageHandler
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\DeleteCmsPageCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\DeleteCmsPageCommand
+        method: handle
 
   prestashop.adapter.cms_page.command_handler.bulk_delete_cms_page:
     class: PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler\BulkDeleteCmsPageHandler
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\BulkDeleteCmsPageCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\BulkDeleteCmsPageCommand
+        method: handle
 
   prestashop.adapter.cms_page.command_handler.add_cms_page_handler:
     class: PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler\AddCmsPageHandler
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\AddCmsPageCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\AddCmsPageCommand
+        method: handle
 
   prestashop.adapter.cms_page.command_handler.edit_cms_page_handler:
     class: PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler\EditCmsPageHandler
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\EditCmsPageCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\EditCmsPageCommand
+        method: handle
 
   prestashop.adapter.cms_page.query_handler.get_cms_page_for_editing_handler:
     class: PrestaShop\PrestaShop\Adapter\CMS\Page\QueryHandler\GetCmsPageForEditingHandler
@@ -56,5 +64,6 @@ services:
       - "@=service('prestashop.adapter.legacy.context').getContext().link"
       - "@=service('prestashop.adapter.legacy.context').getContext().language.id"
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Query\GetCmsPageForEditing
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\CmsPage\Query\GetCmsPageForEditing
+        method: handle
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/cms_page_category.yml b/src/PrestaShopBundle/Resources/config/services/adapter/cms_page_category.yml
index 055ceea1bb90c..1336fde744045 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/cms_page_category.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/cms_page_category.yml
@@ -13,47 +13,54 @@ services:
   prestashop.adapter.cms_page_category.command_handler.delete_cms_page_category_handler:
     class: PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler\DeleteCmsPageCategoryHandler
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\DeleteCmsPageCategoryCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\DeleteCmsPageCategoryCommand
+        method: handle
 
   prestashop.adapter.cms_page_category.command_handler.toggle_cms_page_category_status_handler:
     class: PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler\ToggleCmsPageCategoryStatusHandler
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\ToggleCmsPageCategoryStatusCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\ToggleCmsPageCategoryStatusCommand
+        method: handle
 
   prestashop.adapter.cms_page_category.command_handler.bulk_delete_cms_page_category_handler:
     class: PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler\BulkDeleteCmsPageCategoryHandler
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\BulkDeleteCmsPageCategoryCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\BulkDeleteCmsPageCategoryCommand
+        method: handle
 
   prestashop.adapter.cms_page.command_handler.bulk_enable_cms_page_category_handler:
     class: PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler\BulkEnableCmsPageCategoryHandler
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\BulkEnableCmsPageCategoryCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\BulkEnableCmsPageCategoryCommand
+        method: handle
 
   prestashop.adapter.cms_page.command_handler.bulk_disable_cms_page_category_handler:
     class: PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler\BulkDisableCmsPageCategoryHandler
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\BulkDisableCmsPageCategoryCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\BulkDisableCmsPageCategoryCommand
+        method: handle
 
   prestashop.adapter.cms_page.command_handler.add_cms_page_category_handler:
     class: 'PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler\AddCmsPageCategoryHandler'
     parent: 'prestashop.adapter.cms_page_category.command_handler.abstract_cms_page_category_handler'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\AddCmsPageCategoryCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\AddCmsPageCategoryCommand
+        method: handle
     public: true
 
   prestashop.adapter.cms_page.command_handler.edit_cms_page_category_handler:
     class: 'PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler\EditCmsPageCategoryHandler'
     parent: 'prestashop.adapter.cms_page_category.command_handler.abstract_cms_page_category_handler'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\EditCmsPageCategoryCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\EditCmsPageCategoryCommand
+        method: handle
     public: true
 
   # Query handlers
@@ -63,20 +70,23 @@ services:
     arguments:
       - '@=service("prestashop.adapter.legacy.context").getContext().language.id'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Query\GetCmsPageCategoriesForBreadcrumb
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Query\GetCmsPageCategoriesForBreadcrumb
+        method: handle
 
   prestashop.adapter.cms_page.query_handler.get_cms_page_categories_for_redirection:
     class: PrestaShop\PrestaShop\Adapter\CMS\PageCategory\QueryHandler\GetCmsPageParentCategoryIdForRedirectionHandler
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Query\GetCmsPageParentCategoryIdForRedirection
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Query\GetCmsPageParentCategoryIdForRedirection
+        method: handle
 
   prestashop.adapter.cms_page.query_handler.get_cms_page_category_for_editing:
     class: PrestaShop\PrestaShop\Adapter\CMS\PageCategory\QueryHandler\GetCmsPageCategoryForEditingHandler
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Query\GetCmsPageCategoryForEditing
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Query\GetCmsPageCategoryForEditing
+        method: handle
 
   prestashop.adapter.cms_page.categories_provider:
     class: 'PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CategoriesProvider'
@@ -90,5 +100,6 @@ services:
       - '@=service("prestashop.adapter.legacy.context").getContext().language.id'
       - '@request_stack'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Query\GetCmsPageCategoryNameForListing
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Query\GetCmsPageCategoryNameForListing
+        method: handle
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/configuration.yml b/src/PrestaShopBundle/Resources/config/services/adapter/configuration.yml
index e9576c231416e..3ea39f020890e 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/configuration.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/configuration.yml
@@ -7,4 +7,4 @@ services:
     arguments:
       - '@prestashop.adapter.debug_mode'
     tags:
-      - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Configuration\Command\SwitchDebugModeCommand }
+      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Configuration\Command\SwitchDebugModeCommand, method: handle }
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/contact.yml b/src/PrestaShopBundle/Resources/config/services/adapter/contact.yml
index 009814f0c3d92..764633c984aee 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/contact.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/contact.yml
@@ -13,18 +13,18 @@ services:
     arguments:
       - '@PrestaShopBundle\Form\DataTransformer\StringArrayToIntegerArrayDataTransformer'
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Contact\Query\GetContactForEditing' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Contact\Query\GetContactForEditing', method: handle }
 
   prestashop.adapter.contact.command_handler.edit_contact:
     class: 'PrestaShop\PrestaShop\Adapter\Contact\CommandHandler\EditContactHandler'
     arguments:
       - '@validator'
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Contact\Command\EditContactCommand' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Contact\Command\EditContactCommand', method: handle }
 
   prestashop.adapter.contact.command_handler.add_contact:
     class: 'PrestaShop\PrestaShop\Adapter\Contact\CommandHandler\AddContactHandler'
     arguments:
       - '@validator'
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Contact\Command\AddContactCommand' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Contact\Command\AddContactCommand', method: handle }
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/country.yml b/src/PrestaShopBundle/Resources/config/services/adapter/country.yml
index d6e76e945d882..2a63a4ea41ded 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/country.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/country.yml
@@ -7,8 +7,9 @@ services:
     arguments:
       - '@prestashop.adapter.country.country_required_fields_provider'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Country\Query\GetCountryRequiredFields'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Country\Query\GetCountryRequiredFields'
+        method: handle
 
   prestashop.adapter.country.country_zip_code_requirements_provider:
     class: 'PrestaShop\PrestaShop\Adapter\Country\CountryZipCodeRequirementsProvider'
@@ -28,24 +29,24 @@ services:
     public: true
     autowire: true
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Country\Command\AddCountryCommand' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Country\Command\AddCountryCommand', method: handle }
 
   PrestaShop\PrestaShop\Adapter\Country\CommandHandler\DeleteCountryHandler:
     public: false
     autowire: true
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Country\Command\DeleteCountryCommand' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Country\Command\DeleteCountryCommand', method: handle }
 
   PrestaShop\PrestaShop\Adapter\Country\CommandHandler\EditCountryHandler:
     public: false
     autowire: true
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Country\Command\EditCountryCommand' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Country\Command\EditCountryCommand', method: handle }
 
   PrestaShop\PrestaShop\Adapter\Country\QueryHandler\GetCountryForEditingHandler:
     public: false
     autowire: true
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Country\Query\GetCountryForEditing' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Country\Query\GetCountryForEditing', method: handle }
 
   PrestaShop\PrestaShop\Adapter\Country\Validate\CountryValidator:
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/credit_slip.yml b/src/PrestaShopBundle/Resources/config/services/adapter/credit_slip.yml
index 14fa44bda7c9a..09acf2348a096 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/credit_slip.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/credit_slip.yml
@@ -5,5 +5,6 @@ services:
   prestashop.adapter.credit_slip.query_handler.get_credit_slip_ids_by_date_range_handler:
     class: 'PrestaShop\PrestaShop\Adapter\CreditSlip\QueryHandler\GetCreditSlipIdsByDateRangeHandler'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\CreditSlip\Query\GetCreditSlipIdsByDateRange
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\CreditSlip\Query\GetCreditSlipIdsByDateRange
+        method: handle
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/currency.yml b/src/PrestaShopBundle/Resources/config/services/adapter/currency.yml
index 5643cf03faf09..0905271537208 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/currency.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/currency.yml
@@ -17,14 +17,14 @@ services:
     arguments:
       - '@=service("prestashop.adapter.legacy.configuration").get("PS_CURRENCY_DEFAULT")'
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\ToggleCurrencyStatusCommand' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\ToggleCurrencyStatusCommand', method: handle }
 
   prestashop.adapter.currency.command_handler.delete_currency:
     class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\DeleteCurrencyHandler'
     arguments:
       - '@=service("prestashop.adapter.legacy.configuration").get("PS_CURRENCY_DEFAULT")'
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\DeleteCurrencyCommand' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\DeleteCurrencyCommand', method: handle }
 
   prestashop.adapter.currency.command_handler.create_currency:
     class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\AddOfficialCurrencyHandler'
@@ -35,7 +35,7 @@ services:
       - '@prestashop.adapter.data_provider.currency'
       - '@prestashop.core.localization.currency.pattern_transformer'
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\AddCurrencyCommand' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\AddCurrencyCommand', method: 'handle' }
 
   prestashop.adapter.currency.command_handler.create_unofficial_currency:
     class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\AddUnofficialCurrencyHandler'
@@ -46,7 +46,7 @@ services:
       - '@prestashop.adapter.data_provider.currency'
       - '@prestashop.core.localization.currency.pattern_transformer'
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\AddUnofficialCurrencyCommand' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\AddUnofficialCurrencyCommand', method: handle }
 
   prestashop.adapter.currency.command_handler.update_official_currency:
     class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\EditOfficialCurrencyHandler'
@@ -56,7 +56,7 @@ services:
       - "@prestashop.adapter.currency.command_handler.command_validator"
       - "@prestashop.core.localization.currency.pattern_transformer"
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\EditCurrencyCommand' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\EditCurrencyCommand', method: handle }
 
   prestashop.adapter.currency.command_handler.update_unofficial_currency:
     class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\EditUnofficialCurrencyHandler'
@@ -66,26 +66,26 @@ services:
       - "@prestashop.adapter.currency.command_handler.command_validator"
       - "@prestashop.core.localization.currency.pattern_transformer"
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\EditUnofficialCurrencyCommand' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\EditUnofficialCurrencyCommand', method: handle }
 
   prestashop.adapter.currency.command_handler.update_exchange_rates:
     class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\RefreshExchangeRatesHandler'
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\RefreshExchangeRatesCommand' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\RefreshExchangeRatesCommand', method: handle }
 
   prestashop.adapter.currency.command_handler.bulk_toggle_currencies_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\BulkToggleCurrenciesStatusHandler'
     arguments:
       - '@=service("prestashop.adapter.legacy.configuration").get("PS_CURRENCY_DEFAULT")'
     tags:
-      - { name: tactician.handler, command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\BulkToggleCurrenciesStatusCommand' }
+      - { name: messenger.message_handler, handles: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\BulkToggleCurrenciesStatusCommand', method: handle }
 
   prestashop.adapter.currency.command_handler.bulk_delete_currencies_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\BulkDeleteCurrenciesHandler'
     arguments:
       - '@=service("prestashop.adapter.legacy.configuration").get("PS_CURRENCY_DEFAULT")'
     tags:
-      - { name: tactician.handler, command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\BulkDeleteCurrenciesCommand' }
+      - { name: messenger.message_handler, handles: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\BulkDeleteCurrenciesCommand', method: handle }
 
 
   # Query handlers
@@ -96,14 +96,14 @@ services:
       - '@=service("prestashop.adapter.legacy.context").getContext().shop.id'
       - '@prestashop.core.localization.currency.pattern_transformer'
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Query\GetCurrencyForEditing' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Currency\Query\GetCurrencyForEditing', method: handle }
 
   prestashop.adapter.currency.query_handler.get_currency_exchange_rate:
     class: 'PrestaShop\PrestaShop\Adapter\Currency\QueryHandler\GetCurrencyExchangeRateHandler'
     arguments:
       - '@prestashop.core.exchange_rate.provider'
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Query\GetCurrencyExchangeRate' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Currency\Query\GetCurrencyExchangeRate', method: handle }
 
   prestashop.adapter.currency.query_handler.get_reference_currency:
     class: 'PrestaShop\PrestaShop\Adapter\Currency\QueryHandler\GetReferenceCurrencyHandler'
@@ -111,7 +111,7 @@ services:
       - '@prestashop.core.localization.cldr.locale_repository'
       - '@=service("prestashop.core.admin.lang.repository").findAll()'
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Query\GetReferenceCurrency' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Currency\Query\GetReferenceCurrency', method: handle }
 
   PrestaShop\PrestaShop\Adapter\Currency\Repository\CurrencyRepository: ~
 
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/customer.yml b/src/PrestaShopBundle/Resources/config/services/adapter/customer.yml
index 4b936239c50b6..dac48c09200a9 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/customer.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/customer.yml
@@ -9,34 +9,39 @@ services:
       - "@=service('prestashop.adapter.legacy.context').getContext().language.id"
       - "@prestashop.core.localization.locale.context_locale"
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerForViewing'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerForViewing'
+        method: handle
 
   prestashop.adapter.customer.command_handler.set_private_note_about_customer_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\SetPrivateNoteAboutCustomerHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\SetPrivateNoteAboutCustomerCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\SetPrivateNoteAboutCustomerCommand'
+        method: handle
 
   prestashop.adapter.customer.command_handler.transform_guest_to_customer:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\TransformGuestToCustomerHandler'
     arguments:
       - "@=service('prestashop.adapter.legacy.context').getContext().language.id"
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\TransformGuestToCustomerCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\TransformGuestToCustomerCommand'
+        method: handle
 
   prestashop.adapter.customer.command_handler.set_required_fields_for_customer:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\SetRequiredFieldsForCustomerHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\SetRequiredFieldsForCustomerCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\SetRequiredFieldsForCustomerCommand'
+        method: handle
 
   prestashop.adapter.customer.query_handler.get_required_fields_for_customer:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\QueryHandler\GetRequiredFieldsForCustomerHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetRequiredFieldsForCustomer'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetRequiredFieldsForCustomer'
+        method: handle
 
   prestashop.adapter.customer.command_handler.add_customer:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\AddCustomerHandler'
@@ -44,14 +49,16 @@ services:
       - '@prestashop.core.crypto.hashing'
       - '@=service("prestashop.adapter.legacy.configuration").get("_COOKIE_KEY_")'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\AddCustomerCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\AddCustomerCommand'
+        method: handle
 
   prestashop.adapter.customer.query_handler.get_customer_for_editing:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\QueryHandler\GetCustomerForEditingHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerForEditing'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerForEditing'
+        method: handle
 
   prestashop.adapter.customer.command_handler.edit_customer_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\EditCustomerHandler'
@@ -59,28 +66,29 @@ services:
       - '@prestashop.core.crypto.hashing'
       - '@=service("prestashop.adapter.legacy.configuration").get("_COOKIE_KEY_")'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\EditCustomerCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\EditCustomerCommand'
+        method: handle
 
   prestashop.adapter.customer.command_handler.bulk_enable_customer_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\BulkEnableCustomerHandler'
     tags:
-      - { name: tactician.handler, command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\BulkEnableCustomerCommand' }
+      - { name: messenger.message_handler, handles: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\BulkEnableCustomerCommand', method: handle }
 
   prestashop.adapter.customer.command_handler.bulk_disable_customer_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\BulkDisableCustomerHandler'
     tags:
-      - { name: tactician.handler, command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\BulkDisableCustomerCommand' }
+      - { name: messenger.message_handler, handles: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\BulkDisableCustomerCommand', method: handle }
 
   prestashop.adapter.customer.command_handler.delete_customer_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\DeleteCustomerHandler'
     tags:
-      - { name: tactician.handler, command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\DeleteCustomerCommand' }
+      - { name: messenger.message_handler, handles: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\DeleteCustomerCommand', method: handle }
 
   prestashop.adapter.customer.command_handler.bulk_delete_customer_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\BulkDeleteCustomerHandler'
     tags:
-      - { name: tactician.handler, command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\BulkDeleteCustomerCommand' }
+      - { name: messenger.message_handler, handles: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\BulkDeleteCustomerCommand', method: handle }
 
   prestashop.adapter.customer.query_handler.search_customers:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\QueryHandler\SearchCustomersHandler'
@@ -88,30 +96,34 @@ services:
       - '@prestashop.adapter.legacy.configuration'
       - "@=service('prestashop.adapter.legacy.context').getContext().language.id"
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\SearchCustomers'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\SearchCustomers'
+        method: handle
 
   prestashop.adapter.customer.query_handler.get_customer_carts_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\QueryHandler\GetCustomerCartsHandler'
     arguments:
       - "@prestashop.core.localization.locale.context_locale"
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerCarts'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerCarts'
+        method: handle
 
   prestashop.adapter.customer.query_handler.get_customer_orders_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\QueryHandler\GetCustomerOrdersHandler'
     arguments:
       - "@prestashop.core.localization.locale.context_locale"
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerOrders'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerOrders'
+        method: handle
 
   prestashop.adapter.customer.query_handler.get_customer_for_address_creation:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\QueryHandler\GetCustomerForAddressCreationHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerForAddressCreation'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerForAddressCreation'
+        method: handle
 
   prestashop.adapter.customer.customer_data_source:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\CustomerDataSource'
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/employee.yml b/src/PrestaShopBundle/Resources/config/services/adapter/employee.yml
index e710c3461df5d..fda56b2d827a5 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/employee.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/employee.yml
@@ -5,29 +5,29 @@ services:
   prestashop.adapter.profile.employee.command_handler.toggle_employee_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Profile\Employee\CommandHandler\ToggleEmployeeStatusHandler'
     tags:
-      - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Employee\Command\ToggleEmployeeStatusCommand }
+      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Employee\Command\ToggleEmployeeStatusCommand, method: handle }
 
   prestashop.adapter.profile.employee.command_handler.bulk_update_employee_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Profile\Employee\CommandHandler\BulkUpdateEmployeeStatusHandler'
     tags:
-      - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Employee\Command\BulkUpdateEmployeeStatusCommand }
+      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Employee\Command\BulkUpdateEmployeeStatusCommand, method: handle }
 
   prestashop.adapter.profile.employee.command_handler.delete_employee_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Profile\Employee\CommandHandler\DeleteEmployeeHandler'
     tags:
-      - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Employee\Command\DeleteEmployeeCommand }
+      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Employee\Command\DeleteEmployeeCommand, method: handle }
 
   prestashop.adapter.profile.employee.command_handler.bulk_delete_employee_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Profile\Employee\CommandHandler\BulkDeleteEmployeeHandler'
     tags:
-      - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Employee\Command\BulkDeleteEmployeeCommand }
+      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Employee\Command\BulkDeleteEmployeeCommand, method: handle }
 
   prestashop.adapter.employee.query_handler.get_employee_for_editing:
     class: 'PrestaShop\PrestaShop\Adapter\Profile\Employee\QueryHandler\GetEmployeeForEditingHandler'
     arguments:
       - '@prestashop.core.image.parser.image_tag_source_parser'
     tags:
-      - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Employee\Query\GetEmployeeForEditing }
+      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Employee\Query\GetEmployeeForEditing, method: handle }
 
   prestashop.adapter.employee.form_access_checker:
     class: 'PrestaShop\PrestaShop\Adapter\Employee\EmployeeFormAccessChecker'
@@ -42,7 +42,7 @@ services:
       - '@prestashop.core.employee.profile_access_checker'
       - '@prestashop.adapter.data_provider.employee'
     tags:
-      - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Employee\Command\AddEmployeeCommand }
+      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Employee\Command\AddEmployeeCommand, method: handle }
 
   prestashop.adapter.employee.command_handler.edit_employee_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Profile\Employee\CommandHandler\EditEmployeeHandler'
@@ -52,7 +52,7 @@ services:
       - '@prestashop.adapter.data_provider.employee'
       - '@prestashop.adapter.legacy.context'
     tags:
-      - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Employee\Command\EditEmployeeCommand }
+      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Employee\Command\EditEmployeeCommand, method: handle }
 
   prestashop.adapter.employee.avatar_provider:
     class: 'PrestaShop\PrestaShop\Adapter\Employee\AvatarProvider'
@@ -75,4 +75,4 @@ services:
   prestashop.adapter.employee.query_handler.get_employee_email_by_id_handler:
     class: PrestaShop\PrestaShop\Adapter\Profile\Employee\QueryHandler\GetEmployeeEmailByIdHandler
     tags:
-      - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Employee\Query\GetEmployeeEmailById }
+      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Employee\Query\GetEmployeeEmailById, method: handle }
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/feature.yml b/src/PrestaShopBundle/Resources/config/services/adapter/feature.yml
index c18c4d6ab24b7..9429e780fcd9c 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/feature.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/feature.yml
@@ -9,56 +9,64 @@ services:
     autowire: true
     public: false
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Feature\Command\AddFeatureCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Feature\Command\AddFeatureCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Feature\CommandHandler\EditFeatureHandler:
     autowire: true
     public: false
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Feature\Command\EditFeatureCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Feature\Command\EditFeatureCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Feature\QueryHandler\GetFeatureForEditingHandler:
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Feature\Query\GetFeatureForEditing
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Feature\Query\GetFeatureForEditing
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Feature\CommandHandler\AddFeatureValueHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureRepository'
       - '@PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureValueRepository'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Feature\Command\AddFeatureValueCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Feature\Command\AddFeatureValueCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Feature\CommandHandler\EditFeatureValueHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureValueRepository'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Feature\Command\EditFeatureValueCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Feature\Command\EditFeatureValueCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Feature\QueryHandler\GetFeatureValueForEditingHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureValueRepository'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Feature\Query\GetFeatureValueForEditing
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Feature\Query\GetFeatureValueForEditing
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Feature\CommandHandler\DeleteFeatureHandler:
     autowire: true
     public: false
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Feature\Command\DeleteFeatureCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Feature\Command\DeleteFeatureCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Feature\CommandHandler\BulkDeleteFeatureHandler:
     autowire: true
     public: false
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Feature\Command\BulkDeleteFeatureCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Feature\Command\BulkDeleteFeatureCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Feature\CommandHandler\DeleteFeatureValueHandler:
     autowire: true
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/group.yml b/src/PrestaShopBundle/Resources/config/services/adapter/group.yml
index 739be9702fe2a..303724bb5e7f7 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/group.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/group.yml
@@ -22,15 +22,17 @@ services:
     public: false
     autowire: true
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Group\Command\AddCustomerGroupCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Customer\Group\Command\AddCustomerGroupCommand'
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Customer\Group\QueryHandler\GetCustomerGroupForEditingHandler:
     public: false
     autowire: true
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Group\Query\GetCustomerGroupForEditing'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Customer\Group\Query\GetCustomerGroupForEditing'
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Customer\Group\Validate\CustomerGroupValidator:
     public: false
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/hook.yml b/src/PrestaShopBundle/Resources/config/services/adapter/hook.yml
index 278d5adcd350d..8586d132b08aa 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/hook.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/hook.yml
@@ -5,14 +5,16 @@ services:
   prestashop.adapter.hook.command_handler.update_hook_status_handler:
     class: PrestaShop\PrestaShop\Adapter\Hook\CommandHandler\UpdateHookStatusCommandHandler
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Hook\Command\UpdateHookStatusCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Hook\Command\UpdateHookStatusCommand
+        method: handle
 
   prestashop.adapter.hook.command_handler.get_hook_status_handler:
     class: PrestaShop\PrestaShop\Adapter\Hook\QueryHandler\GetHookStatusHandler
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHookStatus
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHookStatus
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\HookManager: ~
 
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/language.yml b/src/PrestaShopBundle/Resources/config/services/adapter/language.yml
index bfeda68434a13..60946b0218bae 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/language.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/language.yml
@@ -25,54 +25,61 @@ services:
       - '@PrestaShop\PrestaShop\Adapter\Image\ImageValidator'
       - '@prestashop.adapter.file.robots_text_file_generator'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\AddLanguageCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\AddLanguageCommand'
+        method: handle
 
   prestashop.adapter.language.command_handler.edit_language_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Language\CommandHandler\EditLanguageHandler'
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Image\ImageValidator'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\EditLanguageCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\EditLanguageCommand'
+        method: handle
 
   prestashop.adapter.language.query_handler.get_language_for_editing:
     class: 'PrestaShop\PrestaShop\Adapter\Language\QueryHandler\GetLanguageForEditingHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Language\Query\GetLanguageForEditing'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Language\Query\GetLanguageForEditing'
+        method: handle
 
   prestashop.adapter.language.command_handler.toggle_language_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Language\CommandHandler\ToggleLanguageStatusHandler'
     arguments:
       - '@prestashop.adapter.file.robots_text_file_generator'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\ToggleLanguageStatusCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\ToggleLanguageStatusCommand'
+        method: handle
 
   prestashop.adapter.language.command_handler.bulk_toggle_languages_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Language\CommandHandler\BulkToggleLanguagesStatusHandler'
     arguments:
       - '@prestashop.adapter.file.robots_text_file_generator'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\BulkToggleLanguagesStatusCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\BulkToggleLanguagesStatusCommand'
+        method: handle
 
   prestashop.adapter.language.command_handler.bulk_delete_languages_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Language\CommandHandler\BulkDeleteLanguagesHandler'
     arguments:
       - '@prestashop.adapter.file.robots_text_file_generator'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\BulkDeleteLanguagesCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\BulkDeleteLanguagesCommand'
+        method: handle
 
   prestashop.adapter.language.command_handler.delete_language_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Language\CommandHandler\DeleteLanguageHandler'
     arguments:
       - '@prestashop.adapter.file.robots_text_file_generator'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\DeleteLanguageCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\DeleteLanguageCommand'
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Language\ContextLanguageProvider:
     autowire: true
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/manufacturer.yml b/src/PrestaShopBundle/Resources/config/services/adapter/manufacturer.yml
index 92e52d0b5eff8..da97bc2bb7112 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/manufacturer.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/manufacturer.yml
@@ -12,17 +12,17 @@ services:
   prestashop.adapter.manufacturer.command_handler.toggle_manufacturer_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler\ToggleManufacturerStatusHandler'
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\ToggleManufacturerStatusCommand' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\ToggleManufacturerStatusCommand', method: handle }
 
   prestashop.adapter.manufacturer.command_handler.bulk_toggle_manufacturer_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler\BulkToggleManufacturerStatusHandler'
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\BulkToggleManufacturerStatusCommand' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\BulkToggleManufacturerStatusCommand', method: handle }
 
   prestashop.adapter.manufacturer.command_handler.delete_manufacturer_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler\DeleteManufacturerHandler'
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\DeleteManufacturerCommand' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\DeleteManufacturerCommand', method: handle }
 
   prestashop.adapter.manufacturer.command_handler.delete_manufacturer_logo_image_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler\DeleteManufacturerLogoImageHandler'
@@ -30,38 +30,43 @@ services:
       - !php/const _PS_MANU_IMG_DIR_
       - !php/const _PS_TMP_IMG_DIR_
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\DeleteManufacturerLogoImageCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\DeleteManufacturerLogoImageCommand'
+        method: handle
 
   prestashop.adapter.manufacturer.command_handler.bulk_delete_manufacturer_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler\BulkDeleteManufacturerHandler'
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\BulkDeleteManufacturerCommand' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\BulkDeleteManufacturerCommand', method: handle }
 
   prestashop.adapter.manufacturer.query_handler.get_manufacturer_for_editing:
     class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\QueryHandler\GetManufacturerForEditingHandler'
     arguments:
       - '@prestashop.core.image.parser.image_tag_source_parser'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Query\GetManufacturerForEditing'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Query\GetManufacturerForEditing'
+        method: handle
 
   prestashop.adapter.manufacturer.command_handler.edit_manufacturer_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler\EditManufacturerHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\EditManufacturerCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\EditManufacturerCommand'
+        method: handle
 
   prestashop.adapter.manufacturer.command_handler.add_manufacturer_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler\AddManufacturerHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\AddManufacturerCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\AddManufacturerCommand'
+        method: handle
 
   prestashop.adapter.manufacturer.query_handler.get_manufacturer_for_viewing_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\QueryHandler\GetManufacturerForViewingHandler'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Manufacturer\Query\GetManufacturerForViewing
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Manufacturer\Query\GetManufacturerForViewing
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Manufacturer\Repository\ManufacturerRepository: ~
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/meta.yml b/src/PrestaShopBundle/Resources/config/services/adapter/meta.yml
index 5094f1b53a687..11b709da304ae 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/meta.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/meta.yml
@@ -18,8 +18,9 @@ services:
       - '@=service("prestashop.adapter.legacy.configuration").get("PS_LANG_DEFAULT")'
       - '@prestashop.adapter.meta.data_provider'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Meta\Command\AddMetaCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Meta\Command\AddMetaCommand'
+        method: handle
 
   prestashop.adapter.meta.command_handler.edit_meta:
     class: 'PrestaShop\PrestaShop\Adapter\Meta\CommandHandler\EditMetaHandler'
@@ -27,16 +28,18 @@ services:
       - '@validator'
       - '@prestashop.adapter.meta.data_provider'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Meta\Command\EditMetaCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Meta\Command\EditMetaCommand'
+        method: handle
 
   # QUERY HANDLERS
 
   prestashop.adapter.meta.query_handler.get_meta_for_editing:
     class: 'PrestaShop\PrestaShop\Adapter\Meta\QueryHandler\GetMetaForEditingHandler'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Meta\Query\GetMetaForEditing'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Meta\Query\GetMetaForEditing'
+        method: handle
 
 
   prestashop.adapter.meta.query_handler.get_pages_for_layout_customization_handler:
@@ -44,5 +47,6 @@ services:
     arguments:
       - '@=service("prestashop.adapter.legacy.context").getContext().language.id'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Meta\Query\GetPagesForLayoutCustomization'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Meta\Query\GetPagesForLayoutCustomization'
+        method: handle
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/module.yml b/src/PrestaShopBundle/Resources/config/services/adapter/module.yml
index 9f5753377620f..c1d88d3ca410e 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/module.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/module.yml
@@ -9,8 +9,9 @@ services:
       - '@prestashop.adapter.legacy.logger'
       - '@prestashop.core.cache.clearer.cache_clearer_chain'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Module\Command\BulkToggleModuleStatusCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Module\Command\BulkToggleModuleStatusCommand'
+        method: 'handle'
 
   prestashop.adapter.module.self_configurator:
     class: PrestaShop\PrestaShop\Adapter\Module\Configuration\ModuleSelfConfigurator
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/notification.yml b/src/PrestaShopBundle/Resources/config/services/adapter/notification.yml
index 1000612dbfba7..9a1884615e8df 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/notification.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/notification.yml
@@ -6,13 +6,15 @@ services:
   prestashop.adapter.notification.command_handler.update_employee_notification_last_element_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Notification\CommandHandler\UpdateEmployeeNotificationLastElementHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Notification\Command\UpdateEmployeeNotificationLastElementCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Notification\Command\UpdateEmployeeNotificationLastElementCommand'
+        method: handle
 
   prestashop.adapter.notification.query_handler.get_notification_last_elements_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Notification\QueryHandler\GetNotificationLastElementsHandler'
     arguments:
       - '@prestashop.adapter.notifications.configuration'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Notification\Query\GetNotificationLastElements'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Notification\Query\GetNotificationLastElements'
+        method: handle
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/order.yml b/src/PrestaShopBundle/Resources/config/services/adapter/order.yml
index faa5b37caa72d..3412449bb92df 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/order.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/order.yml
@@ -7,16 +7,18 @@ services:
     arguments:
       - '@prestashop.adapter.context_state_manager'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Order\Command\DuplicateOrderCartCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Order\Command\DuplicateOrderCartCommand'
+        method: handle
 
   prestashop.adapter.order.command_handler.add_order_from_back_office_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Order\CommandHandler\AddOrderFromBackOfficeHandler'
     arguments:
       - '@prestashop.adapter.context_state_manager'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Order\Command\AddOrderFromBackOfficeCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Order\Command\AddOrderFromBackOfficeCommand'
+        method: handle
 
   prestashop.adapter.order.command_handler.add_product_to_order_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\AddProductToOrderHandler
@@ -27,14 +29,16 @@ services:
       - '@prestashop.adapter.order.product_quantity.updater'
       - '@prestashop.adapter.order.order_detail.updater'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Product\Command\AddProductToOrderCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Order\Product\Command\AddProductToOrderCommand
+        method: handle
 
   prestashop.adapter.order.command_handler.update_order_status_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\UpdateOrderStatusHandler
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\UpdateOrderStatusCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Order\Command\UpdateOrderStatusCommand
+        method: handle
 
   prestashop.adapter.order.command_handler.update_product_in_order_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\UpdateProductInOrderHandler
@@ -43,8 +47,9 @@ services:
       - '@prestashop.adapter.order.order_detail.updater'
       - '@prestashop.adapter.context_state_manager'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Product\Command\UpdateProductInOrderCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Order\Product\Command\UpdateProductInOrderCommand
+        method: handle
 
   prestashop.adapter.order.command_handler.change_order_delivery_address_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\ChangeOrderDeliveryAddressHandler
@@ -54,8 +59,9 @@ services:
       - '@prestashop.adapter.context_state_manager'
       - '@prestashop.adapter.order.product_quantity.updater'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\ChangeOrderDeliveryAddressCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Order\Command\ChangeOrderDeliveryAddressCommand
+        method: handle
 
   prestashop.adapter.order.command_handler.change_order_invoice_address_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\ChangeOrderInvoiceAddressHandler
@@ -63,26 +69,30 @@ services:
       - '@prestashop.adapter.order.amount.updater'
       - '@prestashop.adapter.order.order_detail.updater'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\ChangeOrderInvoiceAddressCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Order\Command\ChangeOrderInvoiceAddressCommand
+        method: handle
 
   prestashop.adapter.order.command_handler.change_order_currency_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\ChangeOrderCurrencyHandler
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\ChangeOrderCurrencyCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Order\Command\ChangeOrderCurrencyCommand
+        method: handle
 
   prestashop.adapter.order.command_handler.add_payment_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\AddPaymentHandler
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Payment\Command\AddPaymentCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Order\Payment\Command\AddPaymentCommand
+        method: handle
 
   prestashop.adapter.order.command_handler.generate_invoice_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\GenerateInvoiceHandler
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Invoice\Command\GenerateInvoiceCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Order\Invoice\Command\GenerateInvoiceCommand
+        method: handle
 
   prestashop.adapter.order.command_handler.update_order_shipping_details_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\UpdateOrderShippingDetailsHandler
@@ -90,8 +100,9 @@ services:
       - '@prestashop.adapter.order.amount.updater'
       - '@prestashop.adapter.context_state_manager'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\UpdateOrderShippingDetailsCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Order\Command\UpdateOrderShippingDetailsCommand
+        method: handle
 
   prestashop.adapter.order.command_handler.delete_cart_rule_from_order_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\DeleteCartRuleFromOrderHandler
@@ -100,8 +111,9 @@ services:
       - '@prestashop.adapter.order.product_quantity.updater'
       - '@prestashop.adapter.context_state_manager'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\DeleteCartRuleFromOrderCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Order\Command\DeleteCartRuleFromOrderCommand
+        method: handle
 
   prestashop.adapter.order.command_handler.add_cart_rule_to_order_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\AddCartRuleToOrderHandler
@@ -109,14 +121,16 @@ services:
       - '@prestashop.adapter.order.amount.updater'
       - '@prestashop.adapter.context_state_manager'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\AddCartRuleToOrderCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Order\Command\AddCartRuleToOrderCommand
+        method: handle
 
   prestashop.adapter.order.command_handler.update_invoice_note_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\UpdateInvoiceNoteHandler
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Invoice\Command\UpdateInvoiceNoteCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Order\Invoice\Command\UpdateInvoiceNoteCommand
+        method: handle
 
   prestashop.adapter.order.command_handler.issue_partial_refund_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\IssuePartialRefundHandler
@@ -128,8 +142,9 @@ services:
       - '@prestashop.adapter.order.refund.updater'
       - '@prestashop.adapter.context_state_manager'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\IssuePartialRefundCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Order\Command\IssuePartialRefundCommand
+        method: handle
 
   prestashop.adapter.order.command_handler.issue_standard_refund_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\IssueStandardRefundHandler
@@ -141,8 +156,9 @@ services:
       - '@prestashop.adapter.order.refund.updater'
       - '@prestashop.adapter.context_state_manager'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\IssueStandardRefundCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Order\Command\IssueStandardRefundCommand
+        method: handle
 
   prestashop.adapter.order.command_handler.issue_return_product_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\IssueReturnProductHandler
@@ -154,8 +170,9 @@ services:
       - '@prestashop.adapter.order.refund.updater'
       - '@prestashop.adapter.context_state_manager'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\IssueReturnProductCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Order\Command\IssueReturnProductCommand
+        method: handle
 
   prestashop.adapter.order.refund.order_refund_calculator:
     class: PrestaShop\PrestaShop\Adapter\Order\Refund\OrderRefundCalculator
@@ -184,14 +201,16 @@ services:
       - '@prestashop.adapter.context_state_manager'
       - '@prestashop.adapter.order.product_quantity.updater'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Product\Command\DeleteProductFromOrderCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Order\Product\Command\DeleteProductFromOrderCommand
+        method: handle
 
   prestashop.adapter.order.command_handler.bulk_change_order_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Order\CommandHandler\BulkChangeOrderStatusHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Order\Command\BulkChangeOrderStatusCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Order\Command\BulkChangeOrderStatusCommand'
+        method: handle
 
   prestashop.adapter.order.query_handler.get_order_for_viewing_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\QueryHandler\GetOrderForViewingHandler
@@ -205,8 +224,9 @@ services:
       - '@prestashop.adapter.legacy.configuration'
       - '@prestashop.adapter.address.formatter'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Query\GetOrderForViewing
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Order\Query\GetOrderForViewing
+        method: handle
 
   prestashop.adapter.order.query_handler.get_order_products_for_viewing_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\QueryHandler\GetOrderProductsForViewingHandler
@@ -215,15 +235,17 @@ services:
       - '@=service("prestashop.adapter.legacy.context").getContext().language.id'
       - "@prestashop.core.localization.locale.context_locale"
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Query\GetOrderProductsForViewing
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Order\Query\GetOrderProductsForViewing
+        method: handle
 
 
   prestashop.adapter.order.command_handler.resend_order_email_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\ResendOrderEmailHandler
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\ResendOrderEmailCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Order\Command\ResendOrderEmailCommand
+        method: handle
 
   prestashop.adapter.order.query_handler.get_order_preview_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Order\QueryHandler\GetOrderPreviewHandler'
@@ -232,8 +254,9 @@ services:
       - "@=service('prestashop.adapter.legacy.context').getContext().language.getLocale()"
       - '@prestashop.adapter.address.formatter'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Order\Query\GetOrderPreview'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Order\Query\GetOrderPreview'
+        method: handle
 
   prestashop.adapter.order.command_handler.send_process_order_email_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\SendProcessOrderEmailHandler
@@ -241,8 +264,9 @@ services:
       - '@translator'
       - '@=service("prestashop.adapter.legacy.context").getContext().link'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\SendProcessOrderEmailCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Order\Command\SendProcessOrderEmailCommand
+        method: handle
 
   prestashop.adapter.order.command_handler.cancel_order_product_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\CancelOrderProductHandler
@@ -251,8 +275,9 @@ services:
       - '@logger'
       - '@translator'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\CancelOrderProductCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Order\Command\CancelOrderProductCommand
+        method: handle
 
   prestashop.adapter.order.order_sibling_provider:
     class: PrestaShop\PrestaShop\Adapter\Order\OrderSiblingProvider
@@ -281,8 +306,9 @@ services:
   prestashop.adapter.order.command_handler.set_internal_order_note_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\SetInternalOrderNoteHandler
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\SetInternalOrderNoteCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Order\Command\SetInternalOrderNoteCommand
+        method: handle
 
   prestashop.adapter.order.repository.order_repository:
     class: PrestaShop\PrestaShop\Adapter\Order\Repository\OrderRepository
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/order_message.yml b/src/PrestaShopBundle/Resources/config/services/adapter/order_message.yml
index 8a958836bda53..7f4c30ca37a25 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/order_message.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/order_message.yml
@@ -5,32 +5,37 @@ services:
   prestashop.adapter.order_message.command_handler.add_order_message_handler:
     class: PrestaShop\PrestaShop\Adapter\OrderMessage\CommandHandler\AddOrderMessageHandler
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\OrderMessage\Command\AddOrderMessageCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\OrderMessage\Command\AddOrderMessageCommand
+        method: handle
 
   prestashop.adapter.order_message.command_handler.edit_order_message_handler:
     class: PrestaShop\PrestaShop\Adapter\OrderMessage\CommandHandler\EditOrderMessageHandler
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\OrderMessage\Command\EditOrderMessageCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\OrderMessage\Command\EditOrderMessageCommand
+        method: handle
 
   prestashop.adapter.order_message.query_handler.get_order_message_for_editing_handler:
     class: PrestaShop\PrestaShop\Adapter\OrderMessage\QueryHandler\GetOrderMessageForEditingHandler
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\OrderMessage\Query\GetOrderMessageForEditing
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\OrderMessage\Query\GetOrderMessageForEditing
+        method: handle
 
   prestashop.adapter.order_message.command_handler.delete_order_message_handler:
     class: PrestaShop\PrestaShop\Adapter\OrderMessage\CommandHandler\DeleteOrderMessageHandler
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\OrderMessage\Command\DeleteOrderMessageCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\OrderMessage\Command\DeleteOrderMessageCommand
+        method: handle
 
   prestashop.adapter.order_message.command_handler.bulk_delete_order_message_handler:
     class: PrestaShop\PrestaShop\Adapter\OrderMessage\CommandHandler\BulkDeleteOrderMessageHandler
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\OrderMessage\Command\BulkDeleteOrderMessageCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\OrderMessage\Command\BulkDeleteOrderMessageCommand
+        method: handle
 
   prestashop.adapter.order_message.order_message_provider:
     class: 'PrestaShop\PrestaShop\Adapter\OrderMessage\OrderMessageProvider'
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/order_return.yml b/src/PrestaShopBundle/Resources/config/services/adapter/order_return.yml
index 6d679c03643fd..212c19a7711ff 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/order_return.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/order_return.yml
@@ -5,8 +5,9 @@ services:
   prestashop.adapter.order_return.query_handler.get_order_return_for_editing_handler:
     class: 'PrestaShop\PrestaShop\Adapter\OrderReturn\QueryHandler\GetOrderReturnForEditingHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\OrderReturn\Query\GetOrderReturnForEditing'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\OrderReturn\Query\GetOrderReturnForEditing'
+        method: handle
     arguments:
       - '@prestashop.adapter.order_return.repository.order_return_repository'
       - '@PrestaShop\PrestaShop\Adapter\Customer\Repository\CustomerRepository'
@@ -15,8 +16,9 @@ services:
   prestashop.adapter.order_return.command_handler.update_order_return_state_handler:
     class: 'PrestaShop\PrestaShop\Adapter\OrderReturn\CommandHandler\UpdateOrderReturnStateHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\OrderReturn\Command\UpdateOrderReturnStateCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\OrderReturn\Command\UpdateOrderReturnStateCommand'
+        method: handle
     arguments:
       - '@prestashop.adapter.order_return.repository.order_return_repository'
       - '@prestashop.adapter.order_return_state.repository.order_return_state_repository'
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/order_return_state.yml b/src/PrestaShopBundle/Resources/config/services/adapter/order_return_state.yml
index ca7adcbe44089..c676ffb836542 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/order_return_state.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/order_return_state.yml
@@ -5,20 +5,23 @@ services:
   prestashop.adapter.order_return_state.command_handler.add_order_return_state:
     class: 'PrestaShop\PrestaShop\Adapter\OrderReturnState\CommandHandler\AddOrderReturnStateHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Command\AddOrderReturnStateCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Command\AddOrderReturnStateCommand'
+        method: handle
 
   prestashop.adapter.order_return_state.query_handler.get_order_return_state_for_editing:
     class: 'PrestaShop\PrestaShop\Adapter\OrderReturnState\QueryHandler\GetOrderReturnStateForEditingHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Query\GetOrderReturnStateForEditing'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Query\GetOrderReturnStateForEditing'
+        method: handle
 
   prestashop.adapter.order_return_state.command_handler.edit_order_return_state_handler:
     class: 'PrestaShop\PrestaShop\Adapter\OrderReturnState\CommandHandler\EditOrderReturnStateHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Command\EditOrderReturnStateCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Command\EditOrderReturnStateCommand'
+        method: handle
 
   prestashop.adapter.order_return_state.repository.order_return_state_repository:
     class: 'PrestaShop\PrestaShop\Adapter\OrderReturnState\Repository\OrderReturnStateRepository'
@@ -26,11 +29,13 @@ services:
   prestashop.adapter.order_return_state.command_handler.delete_order_return_state_handler:
     class: 'PrestaShop\PrestaShop\Adapter\OrderReturnState\CommandHandler\DeleteOrderReturnStateHandler'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Command\DeleteOrderReturnStateCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Command\DeleteOrderReturnStateCommand'
+        method: handle
 
   prestashop.adapter.order_return_state.command_handler.bulk_delete_order_return_state_handler:
     class: 'PrestaShop\PrestaShop\Adapter\OrderReturnState\CommandHandler\BulkDeleteOrderReturnStateHandler'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Command\BulkDeleteOrderReturnStateCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Command\BulkDeleteOrderReturnStateCommand'
+        method: handle
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/order_state.yml b/src/PrestaShopBundle/Resources/config/services/adapter/order_state.yml
index afcf58137f047..6dedfc1cb8b47 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/order_state.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/order_state.yml
@@ -5,27 +5,30 @@ services:
   prestashop.adapter.order_state.command_handler.add_order_state:
     class: 'PrestaShop\PrestaShop\Adapter\OrderState\CommandHandler\AddOrderStateHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\OrderState\Command\AddOrderStateCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\OrderState\Command\AddOrderStateCommand'
+        method: handle
 
   prestashop.adapter.order_state.query_handler.get_order_state_for_editing:
     class: 'PrestaShop\PrestaShop\Adapter\OrderState\QueryHandler\GetOrderStateForEditingHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\OrderState\Query\GetOrderStateForEditing'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\OrderState\Query\GetOrderStateForEditing'
+        method: handle
 
   prestashop.adapter.order_state.command_handler.edit_order_state_handler:
     class: 'PrestaShop\PrestaShop\Adapter\OrderState\CommandHandler\EditOrderStateHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\OrderState\Command\EditOrderStateCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\OrderState\Command\EditOrderStateCommand'
+        method: handle
 
   prestashop.adapter.order_state.command_handler.delete_order_state_handler:
     class: 'PrestaShop\PrestaShop\Adapter\OrderState\CommandHandler\DeleteOrderStateHandler'
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\OrderState\Command\DeleteOrderStateCommand' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\OrderState\Command\DeleteOrderStateCommand', method: handle }
 
   prestashop.adapter.order_state.command_handler.bulk_delete_order_state_handler:
     class: 'PrestaShop\PrestaShop\Adapter\OrderState\CommandHandler\BulkDeleteOrderStateHandler'
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\OrderState\Command\BulkDeleteOrderStateCommand' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\OrderState\Command\BulkDeleteOrderStateCommand', method: handle }
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product.yml
index 80dbbf45ad95d..943fcda0f1eb9 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/product.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/product.yml
@@ -67,8 +67,9 @@ services:
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\AssignProductToCategoryHandler:
     autowire: true
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\AssignProductToCategoryCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Command\AssignProductToCategoryCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\QueryHandler\SearchProductsHandler:
     arguments:
@@ -78,20 +79,23 @@ services:
       - '@PrestaShop\PrestaShop\Core\Currency\CurrencyDataProviderInterface'
       - '@PrestaShop\PrestaShop\Adapter\ContextStateManager'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Query\SearchProducts
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Query\SearchProducts
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\QueryHandler\SearchProductsForAssociationHandler:
     autowire: true
     public: false
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Query\SearchProductsForAssociation
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Query\SearchProductsForAssociation
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\QueryHandler\GetProductIsEnabledHandler:
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Query\GetProductIsEnabled
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Query\GetProductIsEnabled
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\Grid\Data\Factory\ProductGridDataFactoryDecorator:
     arguments:
@@ -129,22 +133,25 @@ services:
     arguments:
       $countryId: '@=service("PrestaShop\\PrestaShop\\Adapter\\Configuration").getInt("PS_COUNTRY_DEFAULT")'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Query\GetProductForEditing
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Query\GetProductForEditing
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\AddProductHandler:
     autowire: true
     public: false
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\AddProductCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Command\AddProductCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\SetProductTagsHandler:
     autowire: true
     public: false
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\SetProductTagsCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Command\SetProductTagsCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\UpdateProductsPositionsHandler:
     arguments:
@@ -152,78 +159,89 @@ services:
       - '@PrestaShop\PrestaShop\Core\Grid\Position\PositionUpdateFactoryInterface'
       - '@PrestaShop\PrestaShop\Core\Grid\Position\GridPositionUpdaterInterface'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\UpdateProductsPositionsCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Command\UpdateProductsPositionsCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\RemoveAllProductTagsHandler:
     autowire: true
     public: false
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\RemoveAllProductTagsCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Command\RemoveAllProductTagsCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\SetAssociatedProductCategoriesHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductCategoryUpdater'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\SetAssociatedProductCategoriesCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Command\SetAssociatedProductCategoriesCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\RemoveAllAssociatedProductCategoriesHandler:
     autowire: true
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\RemoveAllAssociatedProductCategoriesCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Command\RemoveAllAssociatedProductCategoriesCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\SetCarriersHandler:
     autowire: true
     public: false
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\SetCarriersCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Command\SetCarriersCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\QueryHandler\GetProductSupplierOptionsHandler:
     autowire: true
     public: false
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Query\GetProductSupplierOptions
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Query\GetProductSupplierOptions
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\Supplier\QueryHandler\GetAssociatedSuppliersHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Repository\ProductSupplierRepository'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Query\GetAssociatedSuppliers
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Query\GetAssociatedSuppliers
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\Supplier\CommandHandler\SetSuppliersHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Command\SetSuppliersCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Command\SetSuppliersCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\Supplier\CommandHandler\SetProductDefaultSupplierHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Command\SetProductDefaultSupplierCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Command\SetProductDefaultSupplierCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\Supplier\CommandHandler\UpdateProductSuppliersHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater'
       - '@PrestaShop\PrestaShop\Adapter\Product\Repository\ProductSupplierRepository'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Command\UpdateProductSuppliersCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Command\UpdateProductSuppliersCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\Supplier\CommandHandler\RemoveAllAssociatedProductSuppliersHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Command\RemoveAllAssociatedProductSuppliersCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Command\RemoveAllAssociatedProductSuppliersCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\Update\ProductAttachmentUpdater:
     autowire: true
@@ -247,42 +265,48 @@ services:
     autowire: true
     public: false
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\DeleteProductCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Command\DeleteProductCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\BulkDeleteProductHandler:
     autowire: true
     public: false
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\BulkDeleteProductCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Command\BulkDeleteProductCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\BulkDuplicateProductHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductDuplicator'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\BulkDuplicateProductCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Command\BulkDuplicateProductCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\BulkUpdateProductStatusHandler:
     autowire: true
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\BulkUpdateProductStatusCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Command\BulkUpdateProductStatusCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\Attachment\CommandHandler\SetAssociatedProductAttachmentsHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductAttachmentUpdater'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Attachment\Command\SetAssociatedProductAttachmentsCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Attachment\Command\SetAssociatedProductAttachmentsCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\Attachment\CommandHandler\RemoveAllAssociatedProductAttachmentsHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductAttachmentUpdater'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Attachment\Command\RemoveAllAssociatedProductAttachmentsCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Attachment\Command\RemoveAllAssociatedProductAttachmentsCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\Validate\ProductSupplierValidator:
     autowire: true
@@ -308,22 +332,25 @@ services:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\RelatedProductsUpdater'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\SetRelatedProductsCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Command\SetRelatedProductsCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\QueryHandler\GetRelatedProductsHandler:
     autowire: true
     public: false
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Query\GetRelatedProducts
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Query\GetRelatedProducts
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\RemoveAllRelatedProductsHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\RelatedProductsUpdater'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\RemoveAllRelatedProductsCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Command\RemoveAllRelatedProductsCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\Repository\TagRepository:
     arguments:
@@ -343,8 +370,9 @@ services:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductDuplicator'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\DuplicateProductCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Command\DuplicateProductCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\Update\ProductDuplicator:
     autowire: true
@@ -357,8 +385,9 @@ services:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductTypeUpdater'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\UpdateProductTypeCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Command\UpdateProductTypeCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\Update\ProductIndexationUpdater:
     arguments:
@@ -377,8 +406,9 @@ services:
     autowire: true
     public: false
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Shop\Command\SetProductShopsCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Shop\Command\SetProductShopsCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\UpdateProductHandler:
     autowire: true
@@ -386,15 +416,17 @@ services:
     arguments:
       $productUpdatablePropertyFiller: '@PrestaShop\PrestaShop\Adapter\Product\Update\Filler\ProductFiller'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\UpdateProductCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Command\UpdateProductCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\Stock\CommandHandler\UpdateProductStockAvailableHandler:
     autowire: true
     public: false
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Stock\Command\UpdateProductStockAvailableCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Stock\Command\UpdateProductStockAvailableCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\Update\Filler\ProductFiller:
     arguments:
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product/_combination.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product/_combination.yml
index a756081305e9f..2ba9bbf7e7f29 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/product/_combination.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/product/_combination.yml
@@ -7,20 +7,23 @@ services:
       - '@PrestaShop\PrestaShop\Adapter\Product\Combination\Create\CombinationCreator'
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\GenerateProductCombinationsCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\GenerateProductCombinationsCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler\UpdateCombinationHandler:
     autowire: true
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\UpdateCombinationCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\UpdateCombinationCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler\UpdateCombinationStockAvailableHandler:
     autowire: true
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\UpdateCombinationStockAvailableCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\UpdateCombinationStockAvailableCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\Combination\QueryHandler\GetCombinationForEditingHandler:
     autowire: true
@@ -28,8 +31,9 @@ services:
     arguments:
       $contextLanguageId: "@=service('prestashop.adapter.legacy.context').getContext().language.id"
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\GetCombinationForEditing
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\GetCombinationForEditing
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\Combination\QueryHandler\GetEditableCombinationsListHandler:
     autowire: true
@@ -37,15 +41,17 @@ services:
     arguments:
       $combinationQueryBuilder: '@PrestaShop\PrestaShop\Core\Grid\Query\ProductCombinationQueryBuilder'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\GetEditableCombinationsList
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\GetEditableCombinationsList
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\Combination\QueryHandler\SearchCombinationsForAssociationHandler:
     autowire: true
     public: false
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\SearchCombinationsForAssociation
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\SearchCombinationsForAssociation
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\Combination\Validate\CombinationValidator: ~
 
@@ -87,56 +93,64 @@ services:
       - '@PrestaShop\PrestaShop\Adapter\Product\Repository\ProductSupplierRepository'
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\UpdateCombinationSuppliersCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\UpdateCombinationSuppliersCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\Combination\QueryHandler\GetCombinationSuppliersHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Repository\ProductSupplierRepository'
       - '@PrestaShop\PrestaShop\Adapter\Product\Combination\Repository\CombinationRepository'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\GetCombinationSuppliers
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\GetCombinationSuppliers
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler\SetCombinationImagesHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Combination\Update\CombinationImagesUpdater'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\SetCombinationImagesCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\SetCombinationImagesCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler\RemoveAllCombinationImagesHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Combination\Update\CombinationImagesUpdater'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\RemoveAllCombinationImagesCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\RemoveAllCombinationImagesCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler\DeleteCombinationHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Combination\Update\CombinationDeleter'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\DeleteCombinationCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\DeleteCombinationCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler\BulkDeleteCombinationHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Combination\Update\CombinationDeleter'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\BulkDeleteCombinationCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\BulkDeleteCombinationCommand
+        method: handle
 
   PrestaShop\PrestaShop\Core\Domain\Product\Combination\QueryHandler\SearchProductCombinationsHandler:
     autowire: true
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\SearchProductCombinations
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\SearchProductCombinations
+        method: handle
 
   PrestaShop\PrestaShop\Core\Domain\Product\Combination\QueryHandler\GetCombinationIdsHandler:
     autowire: true
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\GetCombinationIds
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\GetCombinationIds
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\Combination\Update\Filler\CombinationFiller:
     arguments:
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product/_customization.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product/_customization.yml
index bd92cab05b0c6..c192a1898dd08 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/product/_customization.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/product/_customization.yml
@@ -22,20 +22,23 @@ services:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Customization\Repository\CustomizationFieldRepository'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Customization\Query\GetProductCustomizationFields
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Customization\Query\GetProductCustomizationFields
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\Customization\CommandHandler\SetProductCustomizationFieldsHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Customization\Repository\CustomizationFieldRepository'
       - '@PrestaShop\PrestaShop\Adapter\Product\Customization\Update\ProductCustomizationFieldUpdater'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Customization\Command\SetProductCustomizationFieldsCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Customization\Command\SetProductCustomizationFieldsCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\Customization\CommandHandler\RemoveAllCustomizationFieldsFromProductHandler:
     autowire: true
     public: false
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Customization\Command\RemoveAllCustomizationFieldsFromProductCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Customization\Command\RemoveAllCustomizationFieldsFromProductCommand
+        method: handle
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product/_feature_value.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product/_feature_value.yml
index 72abbecfd26a2..93a1e5530f639 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/product/_feature_value.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/product/_feature_value.yml
@@ -6,22 +6,25 @@ services:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\FeatureValue\Update\ProductFeatureValueUpdater'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\FeatureValue\Command\SetProductFeatureValuesCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\FeatureValue\Command\SetProductFeatureValuesCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\FeatureValue\CommandHandler\RemoveAllFeatureValuesFromProductHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\FeatureValue\Update\ProductFeatureValueUpdater'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\FeatureValue\Command\RemoveAllFeatureValuesFromProductCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\FeatureValue\Command\RemoveAllFeatureValuesFromProductCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\FeatureValue\QueryHandler\GetProductFeatureValuesHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureValueRepository'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\FeatureValue\Query\GetProductFeatureValues
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\FeatureValue\Query\GetProductFeatureValues
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\FeatureValue\Update\ProductFeatureValueUpdater:
     autowire: true
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product/_image.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product/_image.yml
index 8fd704e727e1a..bb3be3d49053e 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/product/_image.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/product/_image.yml
@@ -6,8 +6,9 @@ services:
     autowire: true
     public: false
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Image\Command\AddProductImageCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Image\Command\AddProductImageCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\Image\CommandHandler\UpdateProductImageHandler:
     arguments:
@@ -16,43 +17,49 @@ services:
       - '@PrestaShop\PrestaShop\Adapter\Product\Image\Uploader\ProductImageUploader'
       - '@PrestaShop\PrestaShop\Adapter\Image\ProductImageFileValidator'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Image\Command\UpdateProductImageCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Image\Command\UpdateProductImageCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\Image\CommandHandler\DeleteProductImageHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Image\Update\ProductImageUpdater'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Image\Command\DeleteProductImageCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Image\Command\DeleteProductImageCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\Image\CommandHandler\SetProductImagesForAllShopHandler:
     autowire: true
     public: false
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Image\Command\SetProductImagesForAllShopCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Image\Command\SetProductImagesForAllShopCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\Image\QueryHandler\GetProductImagesHandler:
     autowire: true
     public: false
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Image\Query\GetProductImages
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Image\Query\GetProductImages
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\Image\QueryHandler\GetShopProductImagesHandler:
     autowire: true
     public: false
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Image\Query\GetShopProductImages
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Image\Query\GetShopProductImages
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\Image\QueryHandler\GetProductImageHandler:
     autowire: true
     public: false
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Image\Query\GetProductImage
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Image\Query\GetProductImage
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\Image\Validate\ProductImageValidator: ~
 
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product/_pack.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product/_pack.yml
index 6620d43b7b762..d65e7c549605e 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/product/_pack.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/product/_pack.yml
@@ -15,15 +15,17 @@ services:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Pack\Update\ProductPackUpdater'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Pack\Command\SetPackProductsCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Pack\Command\SetPackProductsCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\Pack\CommandHandler\RemoveAllProductsFromPackHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Pack\Update\ProductPackUpdater'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Pack\Command\RemoveAllProductsFromPackCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Pack\Command\RemoveAllProductsFromPackCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\Pack\QueryHandler\GetPackedProductsHandler:
     autowire: true
@@ -32,5 +34,6 @@ services:
       $defaultLangId: '@=service("prestashop.adapter.legacy.context").getContext().language.id'
       $translator: '@translator'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Pack\Query\GetPackedProducts
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Pack\Query\GetPackedProducts
+        method: handle
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product/_specific_prices.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product/_specific_prices.yml
index 3b4a92122d60d..43e0ff991b1db 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/product/_specific_prices.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/product/_specific_prices.yml
@@ -8,51 +8,58 @@ services:
       - '@PrestaShop\PrestaShop\Adapter\Attribute\Repository\AttributeRepository'
       - '@PrestaShop\PrestaShop\Core\Product\Combination\NameBuilder\CombinationNameBuilderInterface'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Query\GetSpecificPriceList
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Query\GetSpecificPriceList
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\QueryHandler\GetSpecificPriceForEditingHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Repository\SpecificPriceRepository'
       - '@PrestaShop\PrestaShop\Adapter\Customer\Repository\CustomerRepository'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Query\GetSpecificPriceForEditing
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Query\GetSpecificPriceForEditing
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\CommandHandler\AddSpecificPriceHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Repository\SpecificPriceRepository'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\AddSpecificPriceCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\AddSpecificPriceCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\CommandHandler\EditSpecificPriceHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Repository\SpecificPriceRepository'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\EditSpecificPriceCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\EditSpecificPriceCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\CommandHandler\DeleteSpecificPriceHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Repository\SpecificPriceRepository'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\DeleteSpecificPriceCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\DeleteSpecificPriceCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\CommandHandler\SetSpecificPricePriorityForProductHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Update\SpecificPricePriorityUpdater'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\SetSpecificPricePriorityForProductCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\SetSpecificPricePriorityForProductCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\CommandHandler\RemoveSpecificPricePriorityForProductHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Update\SpecificPricePriorityUpdater'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\RemoveSpecificPricePriorityForProductCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\RemoveSpecificPricePriorityForProductCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Update\SpecificPricePriorityUpdater:
     public: true
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product/_stock.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product/_stock.yml
index 886f026e61c76..542f1cff68cc2 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/product/_stock.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/product/_stock.yml
@@ -26,8 +26,9 @@ services:
       - '@PrestaShop\PrestaShop\Adapter\Product\Stock\Repository\StockMovementRepository'
       - '@translator'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Stock\Query\GetProductStockMovements
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Stock\Query\GetProductStockMovements
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\Stock\QueryHandler\GetCombinationStockMovementsHandler:
     arguments:
@@ -35,8 +36,9 @@ services:
       - '@PrestaShop\PrestaShop\Adapter\Product\Stock\Repository\StockMovementRepository'
       - '@translator'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Stock\Query\GetCombinationStockMovements
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\Stock\Query\GetCombinationStockMovements
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\Stock\Update\ProductStockUpdater:
     autowire: true
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product/_virtual_product.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product/_virtual_product.yml
index 24a32ebd09961..6c2cd3e777447 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/product/_virtual_product.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/product/_virtual_product.yml
@@ -6,16 +6,18 @@ services:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\Update\VirtualProductUpdater'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\VirtualProductFile\Command\AddVirtualProductFileCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\VirtualProductFile\Command\AddVirtualProductFileCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\CommandHandler\UpdateVirtualProductFileHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\Update\VirtualProductUpdater'
       - '@PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\Repository\VirtualProductFileRepository'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\VirtualProductFile\Command\UpdateVirtualProductFileCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\VirtualProductFile\Command\UpdateVirtualProductFileCommand
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\Update\VirtualProductUpdater:
     autowire: true
@@ -40,5 +42,6 @@ services:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\Update\VirtualProductUpdater'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\VirtualProductFile\Command\DeleteVirtualProductFileCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\Product\VirtualProductFile\Command\DeleteVirtualProductFileCommand
+        method: handle
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/profile.yml b/src/PrestaShopBundle/Resources/config/services/adapter/profile.yml
index db16e18a38193..1f019759a47de 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/profile.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/profile.yml
@@ -9,8 +9,9 @@ services:
       - '@=service("prestashop.adapter.legacy.configuration").get("_PS_ADMIN_PROFILE_")'
       - '@prestashop.adapter.data_provider.employee'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Profile\Command\DeleteProfileCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Profile\Command\DeleteProfileCommand'
+        method: handle
 
   prestashop.adapter.profile.command_handler.bulk_delete_profile:
     class: 'PrestaShop\PrestaShop\Adapter\Profile\CommandHandler\BulkDeleteProfileHandler'
@@ -18,20 +19,23 @@ services:
       - '@=service("prestashop.adapter.legacy.configuration").get("_PS_ADMIN_PROFILE_")'
       - '@prestashop.adapter.data_provider.employee'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Profile\Command\BulkDeleteProfileCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Profile\Command\BulkDeleteProfileCommand'
+        method: handle
 
   prestashop.adapter.profile.command_handler.add_profile_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Profile\CommandHandler\AddProfileHandler'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Profile\Command\AddProfileCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Profile\Command\AddProfileCommand'
+        method: handle
 
   prestashop.adapter.profile.command_handler.edit_profile_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Profile\CommandHandler\EditProfileHandler'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Profile\Command\EditProfileCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Profile\Command\EditProfileCommand'
+        method: handle
 
   prestashop.adapter.profile.query_handler.get_profile_for_editing_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Profile\QueryHandler\GetProfileForEditingHandler'
@@ -40,14 +44,16 @@ services:
       - '@prestashop.core.image.parser.image_tag_source_parser'
       - !php/const _PS_PROFILE_IMG_DIR_
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Profile\Query\GetProfileForEditing'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Profile\Query\GetProfileForEditing'
+        method: handle
 
   prestashop.adapter.profile.permission.command_handler.update_tab_permissions_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Profile\Permission\CommandHandler\UpdateTabPermissionsHandler'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Profile\Permission\Command\UpdateTabPermissionsCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Profile\Permission\Command\UpdateTabPermissionsCommand'
+        method: handle
 
   prestashop.adapter.profile.permission.query_handler.get_permissions_for_configuration_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Profile\Permission\QueryHandler\GetPermissionsForConfigurationHandler'
@@ -59,11 +65,13 @@ services:
         - 'AdminQuickAccesses'
         - 'AdminTabs'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Profile\Permission\Query\GetPermissionsForConfiguration'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Profile\Permission\Query\GetPermissionsForConfiguration'
+        method: handle
 
   prestashop.adapter.profile.permission.command_handler.update_module_permissions_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Profile\Permission\CommandHandler\UpdateModulePermissionsHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Profile\Permission\Command\UpdateModulePermissionsCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Profile\Permission\Command\UpdateModulePermissionsCommand'
+        method: handle
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/search_engine.yml b/src/PrestaShopBundle/Resources/config/services/adapter/search_engine.yml
index 001ed1ce3d2a6..e47c54466fc36 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/search_engine.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/search_engine.yml
@@ -6,30 +6,35 @@ services:
   prestashop.adapter.search_engine.command_handler.add_search_engine_handler:
     class: PrestaShop\PrestaShop\Adapter\SearchEngine\CommandHandler\AddSearchEngineHandler
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\SearchEngine\Command\AddSearchEngineCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\SearchEngine\Command\AddSearchEngineCommand
+        method: handle
 
   prestashop.adapter.search_engine.command_handler.bulk_delete_search_engine_handler:
     class: PrestaShop\PrestaShop\Adapter\SearchEngine\CommandHandler\BulkDeleteSearchEngineHandler
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\SearchEngine\Command\BulkDeleteSearchEngineCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\SearchEngine\Command\BulkDeleteSearchEngineCommand
+        method: handle
 
   prestashop.adapter.search_engine.command_handler.delete_search_engine_handler:
     class: PrestaShop\PrestaShop\Adapter\SearchEngine\CommandHandler\DeleteSearchEngineHandler
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\SearchEngine\Command\DeleteSearchEngineCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\SearchEngine\Command\DeleteSearchEngineCommand
+        method: handle
 
   prestashop.adapter.search_engine.command_handler.edit_search_engine_handler:
     class: PrestaShop\PrestaShop\Adapter\SearchEngine\CommandHandler\EditSearchEngineHandler
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\SearchEngine\Command\EditSearchEngineCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\SearchEngine\Command\EditSearchEngineCommand
+        method: handle
 
   # Query Handlers
   prestashop.adapter.search_engine.query_handler.get_search_engine_for_editing_handler:
     class: PrestaShop\PrestaShop\Adapter\SearchEngine\QueryHandler\GetSearchEngineForEditingHandler
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\SearchEngine\Query\GetSearchEngineForEditing
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\SearchEngine\Query\GetSearchEngineForEditing
+        method: handle
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/security.yml b/src/PrestaShopBundle/Resources/config/services/adapter/security.yml
index 5df6c5eec6bb2..e596809fa1532 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/security.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/security.yml
@@ -7,48 +7,54 @@ services:
     arguments:
       - '@prestashop.adapter.security.repository.customer_session_repository'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\DeleteCustomerSessionCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\DeleteCustomerSessionCommand'
+        method: handle
 
   prestashop.adapter.security.command_handler.clear_customer_session_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Security\CommandHandler\ClearOutdatedCustomerSessionHandler'
     arguments:
       - '@prestashop.adapter.security.repository.customer_session_repository'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\ClearOutdatedCustomerSessionCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\ClearOutdatedCustomerSessionCommand'
+        method: handle
 
   prestashop.adapter.security.command_handler.delete_employee_session_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Security\CommandHandler\DeleteEmployeeSessionHandler'
     arguments:
       - '@prestashop.adapter.security.repository.employee_session_repository'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\DeleteEmployeeSessionCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\DeleteEmployeeSessionCommand'
+        method: handle
 
   prestashop.adapter.security.command_handler.clear_employee_session_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Security\CommandHandler\ClearOutdatedEmployeeSessionHandler'
     arguments:
       - '@prestashop.adapter.security.repository.employee_session_repository'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\ClearOutdatedEmployeeSessionCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\ClearOutdatedEmployeeSessionCommand'
+        method: handle
 
   prestashop.adapter.security.command_handler.bulk_delete_employees_sessions_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Security\CommandHandler\BulkDeleteEmployeeSessionsHandler'
     arguments:
       - '@prestashop.adapter.security.repository.employee_session_repository'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\BulkDeleteEmployeeSessionsCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\BulkDeleteEmployeeSessionsCommand'
+        method: handle
 
   prestashop.adapter.security.command_handler.bulk_delete_customers_sessions_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Security\CommandHandler\BulkDeleteCustomerSessionsHandler'
     arguments:
       - '@prestashop.adapter.security.repository.customer_session_repository'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\BulkDeleteCustomerSessionsCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\BulkDeleteCustomerSessionsCommand'
+        method: handle
 
   prestashop.adapter.security.repository.customer_session_repository:
     class: 'PrestaShop\PrestaShop\Adapter\Session\Repository\CustomerSessionRepository'
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/shop.yml b/src/PrestaShopBundle/Resources/config/services/adapter/shop.yml
index 2d5c0186cc130..f635e3149e6f9 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/shop.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/shop.yml
@@ -9,7 +9,7 @@ services:
       - '@prestashop.core.shop.logo_uploader'
       - '@prestashop.core.hook.dispatcher'
     tags:
-      - { name: tactician.handler, command: 'PrestaShop\PrestaShop\Core\Domain\Shop\Command\UploadLogosCommand' }
+      - { name: messenger.message_handler, handles: 'PrestaShop\PrestaShop\Core\Domain\Shop\Command\UploadLogosCommand', method: handle }
 
   prestashop.adapter.shop.url.base_url_provider:
     class: 'PrestaShop\PrestaShop\Adapter\Shop\Url\BaseUrlProvider'
@@ -52,8 +52,9 @@ services:
       - '@=service("prestashop.adapter.legacy.configuration").get("_PS_IMG_")'
       - '@=service("prestashop.adapter.legacy.configuration").get("_PS_IMG_DIR_")'
     tags:
-      - name: 'tactician.handler'
-        command: PrestaShop\PrestaShop\Core\Domain\Shop\Query\GetLogosPaths
+      - name: 'messenger.message_handler'
+        handles: PrestaShop\PrestaShop\Core\Domain\Shop\Query\GetLogosPaths
+        method: handle
 
   prestashop.adapter.shop.query_handler.search_shops_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Shop\QueryHandler\SearchShopsHandler'
@@ -61,8 +62,9 @@ services:
       - '@prestashop.core.admin.shop.repository'
       - '@prestashop.core.admin.shop_group.repository'
     tags:
-      - name: 'tactician.handler'
-        command: PrestaShop\PrestaShop\Core\Domain\Shop\Query\SearchShops
+      - name: 'messenger.message_handler'
+        handles: PrestaShop\PrestaShop\Core\Domain\Shop\Query\SearchShops
+        method: handle
 
   prestashop.adapter.shop.url.product_image_folder_provider:
     class: 'PrestaShop\PrestaShop\Adapter\Shop\Url\ImageFolderProvider'
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/sql_manager.yml b/src/PrestaShopBundle/Resources/config/services/adapter/sql_manager.yml
index e6d77133de820..0f664da7e114b 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/sql_manager.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/sql_manager.yml
@@ -12,7 +12,7 @@ services:
       - '@prestashop.adapter.sql_manager.sql_query_validator'
       - '@translator'
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\AddSqlRequestCommand' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\AddSqlRequestCommand', method: handle }
 
   prestashop.adapter.sql_manager.command_handler.edit_request_sql:
     class: 'PrestaShop\PrestaShop\Adapter\SqlManager\CommandHandler\EditSqlRequestHandler'
@@ -20,37 +20,37 @@ services:
       - '@prestashop.adapter.sql_manager.sql_query_validator'
       - '@translator'
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\EditSqlRequestCommand' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\EditSqlRequestCommand', method: handle }
 
   prestashop.adapter.sql_manager.command_handler.delete_request_sql:
     class: 'PrestaShop\PrestaShop\Adapter\SqlManager\CommandHandler\DeleteSqlRequestHandler'
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\DeleteSqlRequestCommand' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\DeleteSqlRequestCommand', method: handle }
 
   prestashop.adapter.sql_manager.command_handler.bulk_delete_request_sql:
     class: 'PrestaShop\PrestaShop\Adapter\SqlManager\CommandHandler\BulkDeleteSqlRequestHandler'
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\BulkDeleteSqlRequestCommand' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\BulkDeleteSqlRequestCommand', method: handle }
 
   # Query handlers
   prestashop.adapter.sql_manager.query_handler.get_request_sql_for_editing:
     class: 'PrestaShop\PrestaShop\Adapter\SqlManager\QueryHandler\GetSqlRequestForEditingHandler'
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetSqlRequestForEditing' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetSqlRequestForEditing', method: handle }
 
   prestashop.adapter.sql_manager.query_handler.get_request_sql_execution_result:
     class: 'PrestaShop\PrestaShop\Adapter\SqlManager\QueryHandler\GetSqlRequestExecutionResultHandler'
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetSqlRequestExecutionResult' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetSqlRequestExecutionResult', method: handle }
 
   prestashop.adapter.sql_manager.query_handler.get_database_tables_list:
     class: 'PrestaShop\PrestaShop\Adapter\SqlManager\QueryHandler\GetDatabaseTablesListHandler'
     arguments:
       - '@prestashop.adapter.legacy.configuration'
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetDatabaseTablesList' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetDatabaseTablesList', method: handle }
 
   prestashop.adapter.sql_manager.query_handler.get_database_table_fields_list:
     class: 'PrestaShop\PrestaShop\Adapter\SqlManager\QueryHandler\GetDatabaseTableFieldsListHandler'
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetDatabaseTableFieldsList' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetDatabaseTableFieldsList', method: handle }
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/state.yml b/src/PrestaShopBundle/Resources/config/services/adapter/state.yml
index 39ad090a40587..56e7deeb61a49 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/state.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/state.yml
@@ -5,41 +5,48 @@ services:
   prestashop.adapter.state.command_handler.create_state_handler:
     class: 'PrestaShop\PrestaShop\Adapter\State\CommandHandler\AddStateHandler'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\State\Command\AddStateCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\State\Command\AddStateCommand'
+        method: handle
 
   prestashop.adapter.state.command_handler.edit_state_handler:
     class: 'PrestaShop\PrestaShop\Adapter\State\CommandHandler\EditStateHandler'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\State\Command\EditStateCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\State\Command\EditStateCommand'
+        method: handle
 
   prestashop.adapter.state.command_handler.toggle_state_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\State\CommandHandler\ToggleStateStatusHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\State\Command\ToggleStateStatusCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\State\Command\ToggleStateStatusCommand'
+        method: handle
 
   prestashop.adapter.state.query_handler.get_state_for_editing_handler:
     class: 'PrestaShop\PrestaShop\Adapter\State\QueryHandler\GetStateForEditingHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\State\Query\GetStateForEditing'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\State\Query\GetStateForEditing'
+        method: handle
 
   prestashop.adapter.state.command_handler.delete_state_handler:
     class: 'PrestaShop\PrestaShop\Adapter\State\CommandHandler\DeleteStateHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\State\Command\DeleteStateCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\State\Command\DeleteStateCommand'
+        method: handle
 
   prestashop.adapter.state.command_handler.bulk_delete_state_handler:
     class: 'PrestaShop\PrestaShop\Adapter\State\CommandHandler\BulkDeleteStateHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\State\Command\BulkDeleteStateCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\State\Command\BulkDeleteStateCommand'
+        method: handle
 
   prestashop.adapter.state.command_handler.bulk_toggle_state_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\State\CommandHandler\BulkToggleStateStatusHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\State\Command\BulkToggleStateStatusCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\State\Command\BulkToggleStateStatusCommand'
+        method: handle
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/store.yml b/src/PrestaShopBundle/Resources/config/services/adapter/store.yml
index 661eb9da1b6ad..c381876209d92 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/store.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/store.yml
@@ -14,35 +14,35 @@ services:
     arguments:
       - '@prestashop.core.domain.store.repository.store_repository'
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Store\Query\GetStoreForEditing' }
+      - { name: 'messenger.message_handler',handles: 'PrestaShop\PrestaShop\Core\Domain\Store\Query\GetStoreForEditing', method: handle }
 
   prestashop.adapter.store.command_handler.toggle_store_status:
     class: 'PrestaShop\PrestaShop\Adapter\Store\CommandHandler\ToggleStoreStatusHandler'
     arguments:
       - '@prestashop.core.domain.store.repository.store_repository'
     tags:
-      - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Store\Command\ToggleStoreStatusCommand }
+      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Store\Command\ToggleStoreStatusCommand, method: handle }
 
   prestashop.adapter.store.command_handler.bulk_toggle_store_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Store\CommandHandler\BulkUpdateStoreStatusHandler'
     arguments:
       - '@prestashop.core.domain.store.repository.store_repository'
     tags:
-      - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Store\Command\BulkUpdateStoreStatusCommand }
+      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Store\Command\BulkUpdateStoreStatusCommand, method: handle }
 
   prestashop.adapter.store.command_handler.delete_store:
     class: 'PrestaShop\PrestaShop\Adapter\Store\CommandHandler\DeleteStoreHandler'
     arguments:
       - '@prestashop.core.domain.store.repository.store_repository'
     tags:
-      - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Store\Command\DeleteStoreCommand }
+      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Store\Command\DeleteStoreCommand, method: handle }
 
   prestashop.adapter.store.command_handler.bulk_delete_store_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Store\CommandHandler\BulkDeleteStoreHandler'
     arguments:
       - '@prestashop.core.domain.store.repository.store_repository'
     tags:
-      - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Store\Command\BulkDeleteStoreCommand }
+      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Store\Command\BulkDeleteStoreCommand, method: handle }
 
   # deprecated
   prestashop.core.domain.store.repository.store_repository:
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/supplier.yml b/src/PrestaShopBundle/Resources/config/services/adapter/supplier.yml
index 48e29eb47a986..47749ed92bd61 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/supplier.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/supplier.yml
@@ -29,15 +29,17 @@ services:
   prestashop.adapter.supplier.command_handler.toggle_supplier_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler\ToggleSupplierStatusHandler'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\ToggleSupplierStatusCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\ToggleSupplierStatusCommand'
+        method: handle
 
   prestashop.adapter.supplier.command_handler.delete_supplier_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler\DeleteSupplierHandler'
     parent: 'prestashop.adapter.supplier.command_handler.abstract_delete_supplier_handler'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\DeleteSupplierCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\DeleteSupplierCommand'
+        method: handle
     public: true
 
   prestashop.adapter.supplier.command_handler.delete_supplier_logo_image_handler:
@@ -46,28 +48,32 @@ services:
       - !php/const _PS_SUPP_IMG_DIR_
       - !php/const _PS_TMP_IMG_DIR_
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\DeleteSupplierLogoImageCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\DeleteSupplierLogoImageCommand'
+        method: handle
 
   prestashop.adapter.supplier.command_handler.bulk_delete_supplier_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler\BulkDeleteSupplierHandler'
     parent: 'prestashop.adapter.supplier.command_handler.abstract_delete_supplier_handler'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\BulkDeleteSupplierCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\BulkDeleteSupplierCommand'
+        method: handle
     public: true
 
   prestashop.adapter.supplier.command_handler.bulk_disable_supplier_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler\BulkDisableSupplierHandler'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\BulkDisableSupplierCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\BulkDisableSupplierCommand'
+        method: handle
 
   prestashop.adapter.supplier.command_handler.bulk_enable_supplier_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler\BulkEnableSupplierHandler'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\BulkEnableSupplierCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\BulkEnableSupplierCommand'
+        method: handle
 
   prestashop.adapter.supplier.query_handler.get_supplier_for_viewing_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Supplier\QueryHandler\GetSupplierForViewingHandler'
@@ -75,27 +81,31 @@ services:
       - '@prestashop.core.localization.locale.context_locale'
       - '@=service("prestashop.adapter.legacy.configuration").get("PS_CURRENCY_DEFAULT")'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Query\GetSupplierForViewing'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Query\GetSupplierForViewing'
+        method: handle
 
   prestashop.adapter.supplier.command_handler.add_supplier_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler\AddSupplierHandler'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\AddSupplierCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\AddSupplierCommand'
+        method: handle
 
   prestashop.adapter.supplier.query_handler.get_supplier_for_editing:
     class: 'PrestaShop\PrestaShop\Adapter\Supplier\QueryHandler\GetSupplierForEditingHandler'
     arguments:
       - '@prestashop.core.image.parser.image_tag_source_parser'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Query\GetSupplierForEditing'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Query\GetSupplierForEditing'
+        method: handle
 
   prestashop.adapter.supplier.command_handler.edit_supplier_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler\EditSupplierHandler'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\EditSupplierCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\EditSupplierCommand'
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Supplier\Repository\SupplierRepository: ~
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/tab.yml b/src/PrestaShopBundle/Resources/config/services/adapter/tab.yml
index 086cafad801ef..41008f8aab83d 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/tab.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/tab.yml
@@ -7,4 +7,4 @@ services:
     arguments:
       - '@doctrine.orm.entity_manager'
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Tab\Command\UpdateTabStatusByClassNameCommand' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Tab\Command\UpdateTabStatusByClassNameCommand', method: handle }
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/tax.yml b/src/PrestaShopBundle/Resources/config/services/adapter/tax.yml
index da64cc9f2b05a..d0a2ab93da507 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/tax.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/tax.yml
@@ -17,37 +17,40 @@ services:
   prestashop.adapter.tax.command_handler.delete_tax_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Tax\CommandHandler\DeleteTaxHandler'
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\DeleteTaxCommand' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\DeleteTaxCommand', method: handle }
 
   prestashop.adapter.tax.command_handler.toggle_tax_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Tax\CommandHandler\ToggleTaxStatusHandler'
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\ToggleTaxStatusCommand' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\ToggleTaxStatusCommand', method: handle }
 
   prestashop.adapter.tax.command_handler.bulk_toggle_tax_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Tax\CommandHandler\BulkToggleTaxStatusHandler'
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\BulkToggleTaxStatusCommand' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\BulkToggleTaxStatusCommand', method: handle }
 
   prestashop.adapter.tax.command_handler.bulk_delete_tax_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Tax\CommandHandler\BulkDeleteTaxHandler'
     tags:
-      - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\BulkDeleteTaxCommand' }
+      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\BulkDeleteTaxCommand', method: handle }
 
   prestashop.adapter.tax.query_handler.get_tax_for_editing_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Tax\QueryHandler\GetTaxForEditingHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Tax\Query\GetTaxForEditing'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Tax\Query\GetTaxForEditing'
+        method: handle
 
   prestashop.adapter.tax.command_handler.edit_tax_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Tax\CommandHandler\EditTaxHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\EditTaxCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\EditTaxCommand'
+        method: handle
 
   prestashop.adapter.tax.command_handler.add_tax_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Tax\CommandHandler\AddTaxHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\AddTaxCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\AddTaxCommand'
+        method: handle
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/tax_rules_group.yml b/src/PrestaShopBundle/Resources/config/services/adapter/tax_rules_group.yml
index 4681ec56f5ac0..b9da781ce5292 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/tax_rules_group.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/tax_rules_group.yml
@@ -5,44 +5,51 @@ services:
   PrestaShop\PrestaShop\Adapter\TaxRulesGroup\CommandHandler\AddTaxRulesGroupHandler:
     autowire: true
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\AddTaxRulesGroupCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\AddTaxRulesGroupCommand'
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\TaxRulesGroup\CommandHandler\EditTaxRulesGroupHandler:
     autowire: true
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\EditTaxRulesGroupCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\EditTaxRulesGroupCommand'
+        method: handle
 
   prestashop.adapter.tax_rules_group.command_handler.delete_tax_rules_group_handler:
     class: 'PrestaShop\PrestaShop\Adapter\TaxRulesGroup\CommandHandler\DeleteTaxRulesGroupHandler'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\DeleteTaxRulesGroupCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\DeleteTaxRulesGroupCommand'
+        method: handle
 
   prestashop.adapter.tax_rules_group.command_handler.bulk_delete_tax_rules_group_handler:
     class: 'PrestaShop\PrestaShop\Adapter\TaxRulesGroup\CommandHandler\BulkDeleteTaxRulesGroupHandler'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\BulkDeleteTaxRulesGroupCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\BulkDeleteTaxRulesGroupCommand'
+        method: handle
 
   prestashop.adapter.tax_rules_group.command_handler.bulk_set_tax_rules_group_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\TaxRulesGroup\CommandHandler\BulkSetTaxRulesGroupStatusHandler'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\BulkSetTaxRulesGroupStatusCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\BulkSetTaxRulesGroupStatusCommand'
+        method: handle
 
   prestashop.adapter.tax_rules_group.query_handler.get_tax_rules_group_for_editing:
     class: 'PrestaShop\PrestaShop\Adapter\TaxRulesGroup\QueryHandler\GetTaxRulesGroupForEditingHandler'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Query\GetTaxRulesGroupForEditing'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Query\GetTaxRulesGroupForEditing'
+        method: handle
 
   prestashop.adapter.tax_rules_group.command_handler.set_tax_rules_group_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\TaxRulesGroup\CommandHandler\SetTaxRulesGroupStatusHandler'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\SetTaxRulesGroupStatusCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\SetTaxRulesGroupStatusCommand'
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\TaxRulesGroup\Repository\TaxRulesGroupRepository:
     arguments:
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/title.yml b/src/PrestaShopBundle/Resources/config/services/adapter/title.yml
index 1aa157cddd615..96afb46f0e916 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/title.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/title.yml
@@ -5,14 +5,16 @@ services:
   PrestaShop\PrestaShop\Adapter\Title\CommandHandler\AddTitleHandler:
     autowire: true
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Title\Command\AddTitleCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Title\Command\AddTitleCommand'
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Title\CommandHandler\EditTitleHandler:
     autowire: true
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Title\Command\EditTitleCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Title\Command\EditTitleCommand'
+        method: handle
 
   prestashop.adapter.title.title_image_thumbnail_provider:
     class: 'PrestaShop\PrestaShop\Adapter\Title\TitleImageThumbnailProvider'
@@ -25,21 +27,24 @@ services:
     class: 'PrestaShop\PrestaShop\Adapter\Title\CommandHandler\DeleteTitleHandler'
     autowire: true
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Title\Command\DeleteTitleCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Title\Command\DeleteTitleCommand'
+        method: handle
 
   prestashop.adapter.title.command_handler.bulk_delete_title_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Title\CommandHandler\BulkDeleteTitleHandler'
     autowire: true
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Title\Command\BulkDeleteTitleCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Title\Command\BulkDeleteTitleCommand'
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Title\QueryHandler\GetTitleForEditingHandler:
     autowire: true
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Title\Query\GetTitleForEditing'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Title\Query\GetTitleForEditing'
+        method: handle
 
   PrestaShop\PrestaShop\Adapter\Title\Repository\TitleRepository:
     autowire: true
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/webservice.yml b/src/PrestaShopBundle/Resources/config/services/adapter/webservice.yml
index 14ad8b58e51cb..238e6576f0d5b 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/webservice.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/webservice.yml
@@ -13,17 +13,20 @@ services:
   prestashop.adapter.webservice.query_handler.get_webservice_key_for_editing_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Webservice\QueryHandler\GetWebserviceKeyForEditingHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Webservice\Query\GetWebserviceKeyForEditing'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Webservice\Query\GetWebserviceKeyForEditing'
+        method: handle
 
   prestashop.adapter.webservice.command_handler.add_webservice_key_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Webservice\CommandHandler\AddWebserviceKeyHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Webservice\Command\AddWebserviceKeyCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Webservice\Command\AddWebserviceKeyCommand'
+        method: handle
 
   prestashop.adapter.webservice.command_handler.edit_webservice_key_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Webservice\CommandHandler\EditWebserviceKeyHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Webservice\Command\EditWebserviceKeyCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Webservice\Command\EditWebserviceKeyCommand'
+        method: handle
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/zone.yml b/src/PrestaShopBundle/Resources/config/services/adapter/zone.yml
index 4481644edaa4d..0e7102577636e 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/zone.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/zone.yml
@@ -5,41 +5,48 @@ services:
   prestashop.adapter.zone.command_handler.add_zone_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Zone\CommandHandler\AddZoneHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\AddZoneCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\AddZoneCommand'
+        method: handle
 
   prestashop.adapter.zone.command_handler.toggle_zone_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Zone\CommandHandler\ToggleZoneStatusHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\ToggleZoneStatusCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\ToggleZoneStatusCommand'
+        method: handle
 
   prestashop.adapter.zone.command_handler.edit_zone_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Zone\CommandHandler\EditZoneHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\EditZoneCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\EditZoneCommand'
+        method: handle
 
   prestashop.adapter.zone.query_handler.get_zone_for_editing_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Zone\QueryHandler\GetZoneForEditingHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Zone\Query\GetZoneForEditing'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Zone\Query\GetZoneForEditing'
+        method: handle
 
   prestashop.adapter.zone.command_handler.delete_zone_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Zone\CommandHandler\DeleteZoneHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\DeleteZoneCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\DeleteZoneCommand'
+        method: handle
 
   prestashop.adapter.zone.command_handler.bulk_delete_zone_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Zone\CommandHandler\BulkDeleteZoneHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\BulkDeleteZoneCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\BulkDeleteZoneCommand'
+        method: handle
 
   prestashop.adapter.zone.command_handler.bulk_toggle_zone_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Zone\CommandHandler\BulkToggleZoneStatusHandler'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\BulkToggleZoneStatusCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\BulkToggleZoneStatusCommand'
+        method: handle
diff --git a/src/PrestaShopBundle/Resources/config/services/core/command_bus.yml b/src/PrestaShopBundle/Resources/config/services/core/command_bus.yml
index 5b3cead8fdd53..e7ae9c8c2cdbd 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/command_bus.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/command_bus.yml
@@ -6,11 +6,9 @@ services:
     alias: PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface
 
   PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface:
-    class: PrestaShop\PrestaShop\Core\CommandBus\TacticianCommandBusAdapter
+    class: PrestaShop\PrestaShop\Core\CommandBus\MessengerCommandBusAdapter
     autowire: true
     public: false
-    arguments:
-      - '@tactician.commandbus.default'
 
   prestashop.core.query_bus:
     parent: 'prestashop.core.command_bus'
diff --git a/src/PrestaShopBundle/Resources/config/services/core/domain/authorization_server.yml b/src/PrestaShopBundle/Resources/config/services/core/domain/authorization_server.yml
index d86ca0f38156e..e8a27940fe18f 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/domain/authorization_server.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/domain/authorization_server.yml
@@ -8,18 +8,21 @@ services:
 
   PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\CommandHandler\AddApplicationHandler:
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Command\AddApplicationCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Command\AddApplicationCommand'
+        method: handle
 
   PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\CommandHandler\EditApplicationHandler:
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Command\EditApplicationCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Command\EditApplicationCommand'
+        method: handle
 
   PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\QueryHandler\GetApplicationForEditingHandler:
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Query\GetApplicationForEditing'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Query\GetApplicationForEditing'
+        method: handle
 
   PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\CommandHandler\DeleteApplicationHandler:
     tags:
diff --git a/src/PrestaShopBundle/Resources/config/services/core/domain/customer_service.yml b/src/PrestaShopBundle/Resources/config/services/core/domain/customer_service.yml
index ea4a2d64a8830..71be8e8c307c0 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/domain/customer_service.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/domain/customer_service.yml
@@ -7,16 +7,18 @@ services:
     arguments:
       - '@prestashop.core.domain.customer_service.repository.customer_thread_repository'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\DeleteCustomerThreadCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\DeleteCustomerThreadCommand
+        method: handle
 
   prestashop.core.domain.customer_service.command_handler.bulk_delete_customer_thread_handler:
     class: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\CommandHandler\BulkDeleteCustomerThreadHandler'
     arguments:
       - '@prestashop.core.domain.customer_service.repository.customer_thread_repository'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\BulkDeleteCustomerThreadCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\BulkDeleteCustomerThreadCommand
+        method: handle
 
   prestashop.core.domain.customer_service.command_handler.add_order_customer_message:
     class: PrestaShop\PrestaShop\Core\Domain\CustomerService\CommandHandler\AddOrderCustomerMessageHandler
@@ -27,8 +29,9 @@ services:
       - '@=service("prestashop.adapter.legacy.context").getContext().language.id'
       - '@=service("prestashop.adapter.legacy.context").getContext().employee.id'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\CustomerMessage\Command\AddOrderCustomerMessageCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\CustomerMessage\Command\AddOrderCustomerMessageCommand
+        method: handle
 
   prestashop.core.domain.customer_service.query_handler.get_customer_thread_for_viewing_handler:
     class: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\QueryHandler\GetCustomerThreadForViewingHandler'
@@ -36,16 +39,18 @@ services:
       - '@=service("prestashop.adapter.legacy.context").getContext()'
       - '@prestashop.core.localization.locale.context_locale'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\Query\GetCustomerThreadForViewing'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\Query\GetCustomerThreadForViewing'
+        method: handle
 
   prestashop.core.domain.customer_service.query_handler.get_customer_service_signature_handler:
     class: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\QueryHandler\GetCustomerServiceSignatureHandler'
     arguments:
       - '@prestashop.adapter.legacy.configuration'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\Query\GetCustomerServiceSignature'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\Query\GetCustomerServiceSignature'
+        method: handle
 
   prestashop.core.domain.customer_service.command_handler.forward_customer_thread_handler:
     class: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\CommandHandler\ForwardCustomerThreadHandler'
@@ -53,16 +58,18 @@ services:
       - '@=service("prestashop.adapter.legacy.context").getContext()'
       - '@prestashop.adapter.legacy.configuration'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\ForwardCustomerThreadCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\ForwardCustomerThreadCommand'
+        method: handle
 
   prestashop.core.domain.customer_service.command_handler.reply_to_customer_thread_handler:
     class: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\CommandHandler\ReplyToCustomerThreadHandler'
     arguments:
       - '@=service("prestashop.adapter.legacy.context").getContext()'
     tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\ReplyToCustomerThreadCommand'
+      - name: messenger.message_handler
+        handles: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\ReplyToCustomerThreadCommand'
+        method: handle
 
   prestashop.core.domain.customer_service.command_handler.update_customer_thread_status_handler:
     class: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\CommandHandler\UpdateCustomerThreadStatusHandler'
@@ -70,8 +77,9 @@ services:
       $connection: '@doctrine.dbal.default_connection'
       $dbPrefix: '%database_prefix%'
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\UpdateCustomerThreadStatusCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\UpdateCustomerThreadStatusCommand
+        method: handle
 
   prestashop.core.domain.customer_service.repository.customer_thread_repository:
     class: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\Repository\CustomerThreadRepository'
diff --git a/src/PrestaShopBundle/Resources/config/services/core/domain/showcase_card.yml b/src/PrestaShopBundle/Resources/config/services/core/domain/showcase_card.yml
index dba0f6db4caba..a7fccccf0f947 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/domain/showcase_card.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/domain/showcase_card.yml
@@ -13,8 +13,9 @@ services:
       - '@prestashop.adapter.legacy.configuration'
       - '@prestashop.core.showcase_card.configuration_map'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\Command\CloseShowcaseCardCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\Command\CloseShowcaseCardCommand'
+        method: handle
 
   # Query handlers
 
@@ -24,5 +25,6 @@ services:
       - '@prestashop.adapter.legacy.configuration'
       - '@prestashop.core.showcase_card.configuration_map'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\Query\GetShowcaseCardIsClosed'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\Query\GetShowcaseCardIsClosed'
+        method: handle
diff --git a/src/PrestaShopBundle/Resources/config/services/core/domain/sql_management.yml b/src/PrestaShopBundle/Resources/config/services/core/domain/sql_management.yml
index 5bd6a897e5a25..2345835681be2 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/domain/sql_management.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/domain/sql_management.yml
@@ -9,8 +9,9 @@ services:
     arguments:
       - '@prestashop.adapter.legacy.configuration'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\SaveSqlRequestSettingsCommand'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\SaveSqlRequestSettingsCommand'
+        method: handle
 
   # QUERY HANDLERS
 
@@ -19,5 +20,6 @@ services:
     arguments:
       - '@prestashop.adapter.legacy.configuration'
     tags:
-      - name: 'tactician.handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetSqlRequestSettings'
+      - name: 'messenger.message_handler'
+        handles: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetSqlRequestSettings'
+        method: handle
diff --git a/src/PrestaShopBundle/Resources/config/services/core/domain/theme.yml b/src/PrestaShopBundle/Resources/config/services/core/domain/theme.yml
index 21e57d91e318d..9f9e07fc64d05 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/domain/theme.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/domain/theme.yml
@@ -11,7 +11,7 @@ services:
       - '@prestashop.core.addon.theme.theme_manager'
       - '@prestashop.adapter.legacy.configuration'
     tags:
-      - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Theme\Command\ImportThemeCommand }
+      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Theme\Command\ImportThemeCommand, method: handle }
 
   prestashop.core.domain.theme.command_handler.enable_theme_handler:
     class: 'PrestaShop\PrestaShop\Core\Domain\Theme\CommandHandler\EnableThemeHandler'
@@ -20,27 +20,29 @@ services:
       - '@prestashop.adapter.cache.clearer.smarty_cache_clearer'
       - '@=service("prestashop.adapter.shop.context").isSingleShopContext()'
     tags:
-      - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Theme\Command\EnableThemeCommand }
+      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Theme\Command\EnableThemeCommand, method: handle }
 
   prestashop.core.domain.theme.command_handler.delete_theme_handler:
     class: 'PrestaShop\PrestaShop\Core\Domain\Theme\CommandHandler\DeleteThemeHandler'
     arguments:
       - '@prestashop.core.addon.theme.theme_manager'
     tags:
-      - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Theme\Command\DeleteThemeCommand }
+      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Theme\Command\DeleteThemeCommand, method: handle }
 
   prestashop.core.domain.theme.command_handler.adapt_theme_to_rtl_languages_handler:
     class: 'PrestaShop\PrestaShop\Core\Domain\Theme\CommandHandler\AdaptThemeToRTLLanguagesHandler'
     arguments:
       - '@PrestaShop\PrestaShop\Core\Localization\RTL\StyleSheetProcessorFactory'
     tags:
-      - name: 'tactician.handler'
-        command: PrestaShop\PrestaShop\Core\Domain\Theme\Command\AdaptThemeToRTLLanguagesCommand
+      - name: 'messenger.message_handler'
+        handles: PrestaShop\PrestaShop\Core\Domain\Theme\Command\AdaptThemeToRTLLanguagesCommand
+        method: handle
 
   prestashop.core.domain.theme.command_handler.reset_theme_layouts_handler:
     class: 'PrestaShop\PrestaShop\Core\Domain\Theme\CommandHandler\ResetThemeLayoutsHandler'
     arguments:
       - '@prestashop.core.addon.theme.theme_manager'
     tags:
-      - name: 'tactician.handler'
-        command: PrestaShop\PrestaShop\Core\Domain\Theme\Command\ResetThemeLayoutsCommand
+      - name: 'messenger.message_handler'
+        handles: PrestaShop\PrestaShop\Core\Domain\Theme\Command\ResetThemeLayoutsCommand
+        method: handle
diff --git a/src/PrestaShopBundle/Resources/config/services/core/mail_template.yml b/src/PrestaShopBundle/Resources/config/services/core/mail_template.yml
index ae0ed197bf6c3..3e44c61b9fc46 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/mail_template.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/mail_template.yml
@@ -44,5 +44,6 @@ services:
       - "@=service('prestashop.adapter.legacy.configuration').get('_PS_MODULE_DIR_')"
     public: true
     tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\MailTemplate\Command\GenerateThemeMailTemplatesCommand
+      - name: messenger.message_handler
+        handles: PrestaShop\PrestaShop\Core\Domain\MailTemplate\Command\GenerateThemeMailTemplatesCommand
+        method: handle
diff --git a/tests/Integration/Adapter/Category/QueryHandler/EditRootCategoryHandlerTest.php b/tests/Integration/Adapter/Category/QueryHandler/EditRootCategoryHandlerTest.php
index d127799813e80..7dcc6629916af 100644
--- a/tests/Integration/Adapter/Category/QueryHandler/EditRootCategoryHandlerTest.php
+++ b/tests/Integration/Adapter/Category/QueryHandler/EditRootCategoryHandlerTest.php
@@ -27,7 +27,7 @@
 
 namespace Tests\Integration\Adapter\Category\QueryHandler;
 
-use PrestaShop\PrestaShop\Core\CommandBus\TacticianCommandBusAdapter;
+use PrestaShop\PrestaShop\Core\CommandBus\MessengerCommandBusAdapter;
 use PrestaShop\PrestaShop\Core\Domain\Category\Command\EditRootCategoryCommand;
 use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CannotEditRootCategoryException;
 use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CategoryNotFoundException;
@@ -37,7 +37,7 @@
 class EditRootCategoryHandlerTest extends KernelTestCase
 {
     /**
-     * @var object|TacticianCommandBusAdapter|null
+     * @var object|MessengerCommandBusAdapter|null
      */
     private $commandBus;
     /**
diff --git a/tests/Integration/Adapter/Category/QueryHandler/GetCategoryForEditingHandlerTest.php b/tests/Integration/Adapter/Category/QueryHandler/GetCategoryForEditingHandlerTest.php
index f363bfa09d370..9c3b45a4aebfc 100644
--- a/tests/Integration/Adapter/Category/QueryHandler/GetCategoryForEditingHandlerTest.php
+++ b/tests/Integration/Adapter/Category/QueryHandler/GetCategoryForEditingHandlerTest.php
@@ -27,7 +27,7 @@
 
 namespace Tests\Integration\Adapter\Category\QueryHandler;
 
-use PrestaShop\PrestaShop\Core\CommandBus\TacticianCommandBusAdapter;
+use PrestaShop\PrestaShop\Core\CommandBus\MessengerCommandBusAdapter;
 use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CannotEditRootCategoryException;
 use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CategoryNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Category\Query\GetCategoryForEditing;
@@ -38,7 +38,7 @@
 class GetCategoryForEditingHandlerTest extends KernelTestCase
 {
     /**
-     * @var object|TacticianCommandBusAdapter|null
+     * @var object|MessengerCommandBusAdapter|null
      */
     private $commandBus;
     /**
diff --git a/tests/Unit/Core/CommandBus/TacticianCommandBusAdapterTest.php b/tests/Unit/Core/CommandBus/MessengerCommandBusAdapterTest.php
similarity index 83%
rename from tests/Unit/Core/CommandBus/TacticianCommandBusAdapterTest.php
rename to tests/Unit/Core/CommandBus/MessengerCommandBusAdapterTest.php
index 6aa3d682a00dc..d2bcb9e7b34cd 100644
--- a/tests/Unit/Core/CommandBus/TacticianCommandBusAdapterTest.php
+++ b/tests/Unit/Core/CommandBus/MessengerCommandBusAdapterTest.php
@@ -29,13 +29,14 @@
 use League\Tactician\CommandBus;
 use PHPUnit\Framework\TestCase;
 use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
-use PrestaShop\PrestaShop\Core\CommandBus\TacticianCommandBusAdapter;
+use PrestaShop\PrestaShop\Core\CommandBus\MessengerCommandBusAdapter;
+use Symfony\Component\Messenger\MessageBusInterface;
 
-class TacticianCommandBusAdapterTest extends TestCase
+class MessengerCommandBusAdapterTest extends TestCase
 {
     public function testIsValidImplementation()
     {
-        $commandBudAdapter = new TacticianCommandBusAdapter($this->createMock(CommandBus::class));
+        $commandBudAdapter = new MessengerCommandBusAdapter($this->createMock(MessageBusInterface::class));
 
         $this->assertInstanceOf(CommandBusInterface::class, $commandBudAdapter);
     }

From 2b0184f799bc01adf1f33ac129fb15b0c60e5197 Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Thu, 8 Jun 2023 18:02:44 +0200
Subject: [PATCH 0453/1030] Remove tactician dev config

---
 app/config/config_dev.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml
index 6133b038b2346..5ca052631ee8f 100644
--- a/app/config/config_dev.yml
+++ b/app/config/config_dev.yml
@@ -48,10 +48,3 @@ prestashop:
   addons:
     api_client:
       ttl: 300  # 5min
-
-tactician:
-  commandbus:
-    default:
-      middleware:
-        - prestashop.core.command_bus.middleware.command_register_middleware
-        - tactician.middleware.command_handler

From a629ce3e48993078b8a077e47abb9a4a6e1d41c8 Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Fri, 9 Jun 2023 11:24:14 +0200
Subject: [PATCH 0454/1030] Update CommandRegisterMiddleware

---
 .../Middleware/CommandRegisterMiddleware.php  | 52 +++++--------------
 .../config/services/core/command_bus.yml      |  9 ++--
 2 files changed, 18 insertions(+), 43 deletions(-)

diff --git a/src/Core/CommandBus/Middleware/CommandRegisterMiddleware.php b/src/Core/CommandBus/Middleware/CommandRegisterMiddleware.php
index 476af16739f7a..e5ba2742d6df4 100644
--- a/src/Core/CommandBus/Middleware/CommandRegisterMiddleware.php
+++ b/src/Core/CommandBus/Middleware/CommandRegisterMiddleware.php
@@ -26,56 +26,32 @@
 
 namespace PrestaShop\PrestaShop\Core\CommandBus\Middleware;
 
-use League\Tactician\Handler\CommandNameExtractor\CommandNameExtractor;
-use League\Tactician\Handler\Locator\HandlerLocator;
-use League\Tactician\Middleware;
 use PrestaShop\PrestaShop\Core\CommandBus\ExecutedCommandRegistry;
+use Symfony\Component\Messenger\Envelope;
+use Symfony\Component\Messenger\Handler\HandlersLocatorInterface;
+use Symfony\Component\Messenger\Middleware\MiddlewareInterface;
+use Symfony\Component\Messenger\Middleware\StackInterface;
 
 /**
  * Registers every command that was executed in system
  */
-final class CommandRegisterMiddleware implements Middleware
+final class CommandRegisterMiddleware implements MiddlewareInterface
 {
-    /**
-     * @var HandlerLocator
-     */
-    private $handlerLocator;
-
-    /**
-     * @var CommandNameExtractor
-     */
-    private $commandNameExtractor;
-
-    /**
-     * @var ExecutedCommandRegistry
-     */
-    private $executedCommandRegistry;
-
-    /**
-     * @param HandlerLocator $handlerLocator
-     * @param CommandNameExtractor $commandNameExtractor
-     * @param ExecutedCommandRegistry $executedCommandRegistry
-     */
     public function __construct(
-        HandlerLocator $handlerLocator,
-        CommandNameExtractor $commandNameExtractor,
-        ExecutedCommandRegistry $executedCommandRegistry
+        private readonly HandlersLocatorInterface $handlersLocator,
+        private readonly ExecutedCommandRegistry $executedCommandRegistry
     ) {
-        $this->handlerLocator = $handlerLocator;
-        $this->commandNameExtractor = $commandNameExtractor;
-        $this->executedCommandRegistry = $executedCommandRegistry;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function execute($command, callable $next)
+    public function handle(Envelope $envelope, StackInterface $stack): Envelope
     {
-        $commandName = $this->commandNameExtractor->extract($command);
-        $handler = $this->handlerLocator->getHandlerForCommand($commandName);
+        $command = $envelope->getMessage();
+        $handlers = $this->handlersLocator->getHandlers($envelope);
 
-        $this->executedCommandRegistry->register($command, $handler);
+        foreach ($handlers as $handler) {
+            $this->executedCommandRegistry->register($command, $handler);
+        }
 
-        return $next($command);
+        return $stack->next()->handle($envelope, $stack);
     }
 }
diff --git a/src/PrestaShopBundle/Resources/config/services/core/command_bus.yml b/src/PrestaShopBundle/Resources/config/services/core/command_bus.yml
index e7ae9c8c2cdbd..faf8518f020c5 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/command_bus.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/command_bus.yml
@@ -17,12 +17,11 @@ services:
   prestashop.core.provider.command_definition_provider:
     class: 'PrestaShop\PrestaShop\Core\CommandBus\Parser\CommandDefinitionParser'
 
-  prestashop.core.command_bus.middleware.command_register_middleware:
-    class: PrestaShop\PrestaShop\Core\CommandBus\Middleware\CommandRegisterMiddleware
+  PrestaShop\PrestaShop\Core\CommandBus\Middleware\CommandRegisterMiddleware:
+    autowire: true
+    public: false
     arguments:
-      - '@tactician.handler.locator.symfony'
-      - '@tactician.handler.command_name_extractor.class_name'
-      - '@prestashop.core.command_bus.executed_command_registry'
+      - $executedCommandRegistry: '@prestashop.core.command_bus.executed_command_registry'
 
   prestashop.core.command_bus.executed_command_registry:
     class: PrestaShop\PrestaShop\Core\CommandBus\ExecutedCommandRegistry

From 67cc75b215e34b5b79d11c79792bc351752828aa Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Fri, 9 Jun 2023 11:46:46 +0200
Subject: [PATCH 0455/1030] Update composer.lock

---
 composer.lock | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/composer.lock b/composer.lock
index bda330288f10e..ccb637b419a4d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "a17243862cfc6715e6a18d653902ea60",
+    "content-hash": "781bcf6519b2d5df9ff7e09ed4b8890e",
     "packages": [
         {
             "name": "api-platform/core",
@@ -10853,16 +10853,16 @@
         },
         {
             "name": "symfony/messenger",
-            "version": "v5.4.23",
+            "version": "v5.4.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/messenger.git",
-                "reference": "f81b9dab3d9a2f0519a4e1d077a0d40f8978bcb0"
+                "reference": "75e57d48758d43127377d1310970882446ec7d91"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/messenger/zipball/f81b9dab3d9a2f0519a4e1d077a0d40f8978bcb0",
-                "reference": "f81b9dab3d9a2f0519a4e1d077a0d40f8978bcb0",
+                "url": "https://api.github.com/repos/symfony/messenger/zipball/75e57d48758d43127377d1310970882446ec7d91",
+                "reference": "75e57d48758d43127377d1310970882446ec7d91",
                 "shasum": ""
             },
             "require": {
@@ -10923,7 +10923,7 @@
             "description": "Helps applications send and receive messages to/from other applications or via message queues",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/messenger/tree/v5.4.23"
+                "source": "https://github.com/symfony/messenger/tree/v5.4.24"
             },
             "funding": [
                 {
@@ -10939,7 +10939,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-04-18T12:56:00+00:00"
+            "time": "2023-05-12T08:59:19+00:00"
         },
         {
             "name": "symfony/mime",

From cf0787a462c6fc81d912a7b1b2cc27b4b5daf70f Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Fri, 9 Jun 2023 11:59:21 +0200
Subject: [PATCH 0456/1030] Yaml lint - CS-fixer

---
 src/Core/CommandBus/MessengerCommandBusAdapter.php     | 10 +++++-----
 .../Resources/config/services/adapter/store.yml        |  2 +-
 .../Core/CommandBus/MessengerCommandBusAdapterTest.php |  1 -
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/Core/CommandBus/MessengerCommandBusAdapter.php b/src/Core/CommandBus/MessengerCommandBusAdapter.php
index 783bcba712adf..efdcca6da1e96 100644
--- a/src/Core/CommandBus/MessengerCommandBusAdapter.php
+++ b/src/Core/CommandBus/MessengerCommandBusAdapter.php
@@ -35,7 +35,6 @@
  */
 final class MessengerCommandBusAdapter implements CommandBusInterface
 {
-
     public function __construct(private readonly MessageBusInterface $commandBus)
     {
     }
@@ -46,11 +45,12 @@ public function __construct(private readonly MessageBusInterface $commandBus)
     public function handle($command)
     {
         try {
-            return $this->commandBus
+            $stamp = $this->commandBus
                 ->dispatch($command)
-                ->last(HandledStamp::class)
-                ->getResult()
-                ;
+                ->last(HandledStamp::class);
+            if ($stamp instanceof HandledStamp) {
+                return $stamp->getResult();
+            }
         } catch (HandlerFailedException $exception) {
             throw $exception->getPrevious();
         }
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/store.yml b/src/PrestaShopBundle/Resources/config/services/adapter/store.yml
index c381876209d92..05eec8a278152 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/store.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/store.yml
@@ -14,7 +14,7 @@ services:
     arguments:
       - '@prestashop.core.domain.store.repository.store_repository'
     tags:
-      - { name: 'messenger.message_handler',handles: 'PrestaShop\PrestaShop\Core\Domain\Store\Query\GetStoreForEditing', method: handle }
+      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Store\Query\GetStoreForEditing, method: handle }
 
   prestashop.adapter.store.command_handler.toggle_store_status:
     class: 'PrestaShop\PrestaShop\Adapter\Store\CommandHandler\ToggleStoreStatusHandler'
diff --git a/tests/Unit/Core/CommandBus/MessengerCommandBusAdapterTest.php b/tests/Unit/Core/CommandBus/MessengerCommandBusAdapterTest.php
index d2bcb9e7b34cd..59b85df1454b7 100644
--- a/tests/Unit/Core/CommandBus/MessengerCommandBusAdapterTest.php
+++ b/tests/Unit/Core/CommandBus/MessengerCommandBusAdapterTest.php
@@ -26,7 +26,6 @@
 
 namespace Tests\Unit\Core\CommandBus;
 
-use League\Tactician\CommandBus;
 use PHPUnit\Framework\TestCase;
 use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
 use PrestaShop\PrestaShop\Core\CommandBus\MessengerCommandBusAdapter;

From b2a74a12a35b6f320467e0b9867b2ead7d97b893 Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Fri, 9 Jun 2023 18:25:22 +0200
Subject: [PATCH 0457/1030] Update CommandAndQueryCollectorPass

---
 src/Core/CommandBus/MessengerCommandBusAdapter.php          | 2 +-
 .../Compiler/CommandAndQueryCollectorPass.php               | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Core/CommandBus/MessengerCommandBusAdapter.php b/src/Core/CommandBus/MessengerCommandBusAdapter.php
index efdcca6da1e96..4ee26e5847ed2 100644
--- a/src/Core/CommandBus/MessengerCommandBusAdapter.php
+++ b/src/Core/CommandBus/MessengerCommandBusAdapter.php
@@ -48,7 +48,7 @@ public function handle($command)
             $stamp = $this->commandBus
                 ->dispatch($command)
                 ->last(HandledStamp::class);
-            if ($stamp instanceof HandledStamp) {
+            if ($stamp instanceof HandledStamp && $stamp->getResult() !== null) {
                 return $stamp->getResult();
             }
         } catch (HandlerFailedException $exception) {
diff --git a/src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryCollectorPass.php b/src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryCollectorPass.php
index eeab752d8d0ce..6cff92b6dc2cc 100644
--- a/src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryCollectorPass.php
+++ b/src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryCollectorPass.php
@@ -56,12 +56,12 @@ public function process(ContainerBuilder $container)
      */
     private function findCommandsAndQueries(ContainerBuilder $container)
     {
-        $handlers = $container->findTaggedServiceIds('tactician.handler');
+        $handlers = $container->findTaggedServiceIds('messenger.message_handler');
 
         $commands = [];
         foreach ($handlers as $handler) {
-            if (isset(current($handler)['command'])) {
-                $commands[] = current($handler)['command'];
+            if (isset(current($handler)['handles'])) {
+                $commands[] = current($handler)['handles'];
             }
         }
 

From 9f82ad2f698166a37b0d9057bf3e752a5ffb2fdc Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Mon, 19 Jun 2023 17:17:51 +0200
Subject: [PATCH 0458/1030] Update commandBus adapter

---
 .../CommandBus/MessengerCommandBusAdapter.php | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/Core/CommandBus/MessengerCommandBusAdapter.php b/src/Core/CommandBus/MessengerCommandBusAdapter.php
index 4ee26e5847ed2..249540b702b35 100644
--- a/src/Core/CommandBus/MessengerCommandBusAdapter.php
+++ b/src/Core/CommandBus/MessengerCommandBusAdapter.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Core\CommandBus;
 
 use Symfony\Component\Messenger\Exception\HandlerFailedException;
+use Symfony\Component\Messenger\Exception\LogicException;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Messenger\Stamp\HandledStamp;
 
@@ -45,12 +46,23 @@ public function __construct(private readonly MessageBusInterface $commandBus)
     public function handle($command)
     {
         try {
-            $stamp = $this->commandBus
-                ->dispatch($command)
-                ->last(HandledStamp::class);
-            if ($stamp instanceof HandledStamp && $stamp->getResult() !== null) {
-                return $stamp->getResult();
+            $envelope = $this->commandBus->dispatch($command);
+            /** @var HandledStamp[] $handledStamps */
+            $handledStamps = $envelope->all(HandledStamp::class);
+
+            if (!$handledStamps) {
+                throw new LogicException(sprintf('Message of type "%s" was handled zero times. Exactly one handler is expected when using "%s::%s()".', get_debug_type($envelope->getMessage()), MessengerCommandBusAdapter::class, __FUNCTION__));
             }
+
+            if (\count($handledStamps) > 1) {
+                $handlers = implode(', ', array_map(function (HandledStamp $stamp): string {
+                    return sprintf('"%s"', $stamp->getHandlerName());
+                }, $handledStamps));
+
+                throw new LogicException(sprintf('Message of type "%s" was handled multiple times. Only one handler is expected when using "%s::%s()", got %d: %s.', get_debug_type($envelope->getMessage()), MessengerCommandBusAdapter::class, __FUNCTION__, \count($handledStamps), $handlers));
+            }
+
+            return $handledStamps[0]->getResult();
         } catch (HandlerFailedException $exception) {
             throw $exception->getPrevious();
         }

From 156370fa9b5a4e008cfa2255847bc27ee65442af Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Wed, 21 Jun 2023 15:08:59 +0200
Subject: [PATCH 0459/1030] remove inheritance for currency messages

---
 .../AbstractCurrencyHandler.php               |  10 +-
 .../CurrencyCommandValidator.php              |   9 +-
 .../Command/AddUnofficialCurrencyCommand.php  | 165 +++++++++++++++-
 .../Command/EditUnofficialCurrencyCommand.php | 181 +++++++++++++++++-
 4 files changed, 347 insertions(+), 18 deletions(-)

diff --git a/src/Adapter/Currency/CommandHandler/AbstractCurrencyHandler.php b/src/Adapter/Currency/CommandHandler/AbstractCurrencyHandler.php
index cb5e7c009ad2d..5f5a2f2c22972 100644
--- a/src/Adapter/Currency/CommandHandler/AbstractCurrencyHandler.php
+++ b/src/Adapter/Currency/CommandHandler/AbstractCurrencyHandler.php
@@ -30,7 +30,9 @@
 use Currency;
 use PrestaShop\PrestaShop\Adapter\Domain\AbstractObjectModelHandler;
 use PrestaShop\PrestaShop\Core\Domain\Currency\Command\AddCurrencyCommand;
+use PrestaShop\PrestaShop\Core\Domain\Currency\Command\AddUnofficialCurrencyCommand;
 use PrestaShop\PrestaShop\Core\Domain\Currency\Command\EditCurrencyCommand;
+use PrestaShop\PrestaShop\Core\Domain\Currency\Command\EditUnofficialCurrencyCommand;
 use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CannotCreateCurrencyException;
 use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CannotDeleteDefaultCurrencyException;
 use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CannotUpdateCurrencyException;
@@ -151,7 +153,7 @@ protected function applyPatternTransformations(Currency $entity, array $localize
 
     /**
      * @param Currency $entity
-     * @param AddCurrencyCommand $command
+     * @param AddCurrencyCommand|AddUnofficialCurrencyCommand $command
      *
      * @throws CannotCreateCurrencyException
      * @throws LanguageNotFoundException
@@ -159,7 +161,7 @@ protected function applyPatternTransformations(Currency $entity, array $localize
      * @throws PrestaShopDatabaseException
      * @throws PrestaShopException
      */
-    protected function addEntity(Currency $entity, AddCurrencyCommand $command)
+    protected function addEntity(Currency $entity, AddCurrencyCommand|AddUnofficialCurrencyCommand $command)
     {
         $entity->iso_code = $command->getIsoCode()->getValue();
         $entity->active = $command->isEnabled();
@@ -185,7 +187,7 @@ protected function addEntity(Currency $entity, AddCurrencyCommand $command)
 
     /**
      * @param Currency $entity
-     * @param EditCurrencyCommand $command
+     * @param EditCurrencyCommand|EditUnofficialCurrencyCommand $command
      *
      * @throws CannotUpdateCurrencyException
      * @throws LanguageNotFoundException
@@ -193,7 +195,7 @@ protected function addEntity(Currency $entity, AddCurrencyCommand $command)
      * @throws PrestaShopDatabaseException
      * @throws PrestaShopException
      */
-    protected function updateEntity(Currency $entity, EditCurrencyCommand $command)
+    protected function updateEntity(Currency $entity, EditCurrencyCommand|EditUnofficialCurrencyCommand $command)
     {
         if (null !== $command->getExchangeRate()) {
             $entity->conversion_rate = $command->getExchangeRate()->getValue();
diff --git a/src/Adapter/Currency/CommandHandler/CurrencyCommandValidator.php b/src/Adapter/Currency/CommandHandler/CurrencyCommandValidator.php
index 93658b4f3df28..5943f21a20502 100644
--- a/src/Adapter/Currency/CommandHandler/CurrencyCommandValidator.php
+++ b/src/Adapter/Currency/CommandHandler/CurrencyCommandValidator.php
@@ -30,6 +30,7 @@
 use Currency;
 use PrestaShop\PrestaShop\Core\Currency\CurrencyDataProviderInterface;
 use PrestaShop\PrestaShop\Core\Domain\Currency\Command\EditCurrencyCommand;
+use PrestaShop\PrestaShop\Core\Domain\Currency\Command\EditUnofficialCurrencyCommand;
 use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CannotDisableDefaultCurrencyException;
 use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CurrencyConstraintException;
 use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\DefaultCurrencyInMultiShopException;
@@ -110,11 +111,11 @@ public function assertCurrencyIsNotAvailableInDatabase(string $isoCode)
     /**
      * Prevents from default currency being disabled.
      *
-     * @param EditCurrencyCommand $command
+     * @param EditCurrencyCommand|EditUnofficialCurrencyCommand $command
      *
      * @throws CannotDisableDefaultCurrencyException
      */
-    public function assertDefaultCurrencyIsNotBeingDisabled(EditCurrencyCommand $command)
+    public function assertDefaultCurrencyIsNotBeingDisabled(EditCurrencyCommand|EditUnofficialCurrencyCommand $command)
     {
         if (!$command->isEnabled() && $command->getCurrencyId()->getValue() === $this->defaultCurrencyId) {
             throw new CannotDisableDefaultCurrencyException(sprintf('Currency with id "%s" is the default currency and cannot be disabled.', $command->getCurrencyId()->getValue()));
@@ -126,11 +127,11 @@ public function assertDefaultCurrencyIsNotBeingDisabled(EditCurrencyCommand $com
      * from each shop and checks that the shop is not being disabled as well.
      *
      * @param Currency $currency
-     * @param EditCurrencyCommand $command
+     * @param EditCurrencyCommand|EditUnofficialCurrencyCommand $command
      *
      * @throws DefaultCurrencyInMultiShopException
      */
-    public function assertDefaultCurrencyIsNotBeingRemovedOrDisabledFromShop(Currency $currency, EditCurrencyCommand $command)
+    public function assertDefaultCurrencyIsNotBeingRemovedOrDisabledFromShop(Currency $currency, EditCurrencyCommand|EditUnofficialCurrencyCommand $command)
     {
         if (empty($command->getShopIds())) {
             return;
diff --git a/src/Core/Domain/Currency/Command/AddUnofficialCurrencyCommand.php b/src/Core/Domain/Currency/Command/AddUnofficialCurrencyCommand.php
index 5cca992021caf..6136e3efc5785 100644
--- a/src/Core/Domain/Currency/Command/AddUnofficialCurrencyCommand.php
+++ b/src/Core/Domain/Currency/Command/AddUnofficialCurrencyCommand.php
@@ -26,9 +26,172 @@
 
 namespace PrestaShop\PrestaShop\Core\Domain\Currency\Command;
 
+use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CurrencyConstraintException;
+use PrestaShop\PrestaShop\Core\Domain\Currency\ValueObject\AlphaIsoCode;
+use PrestaShop\PrestaShop\Core\Domain\Currency\ValueObject\ExchangeRate;
+use PrestaShop\PrestaShop\Core\Domain\Currency\ValueObject\Precision;
+
 /**
  * Class AddUnofficialCurrencyCommand used to add an alternative currency
  */
-class AddUnofficialCurrencyCommand extends AddCurrencyCommand
+class AddUnofficialCurrencyCommand
 {
+    protected AlphaIsoCode $isoCode;
+
+    protected ExchangeRate $exchangeRate;
+
+    protected ?Precision $precision = null;
+
+    /**
+     * @var string[]
+     */
+    protected array $localizedNames = [];
+
+    /**
+     * @var string[]
+     */
+    protected array $localizedSymbols = [];
+
+    protected bool $isEnabled;
+
+    /**
+     * @var int[]
+     */
+    protected array $shopIds = [];
+
+    /**
+     * @var string[]
+     */
+    protected array $localizedTransformations = [];
+
+    /**
+     * @throws CurrencyConstraintException
+     */
+    public function __construct(
+        string $isoCode,
+        float $exchangeRate,
+        bool $isEnabled
+    ) {
+        $this->isoCode = new AlphaIsoCode($isoCode);
+        $this->exchangeRate = new ExchangeRate($exchangeRate);
+        $this->isEnabled = $isEnabled;
+    }
+
+    public function getIsoCode(): AlphaIsoCode
+    {
+        return $this->isoCode;
+    }
+
+    public function getPrecision(): ?Precision
+    {
+        return $this->precision;
+    }
+
+    /**
+     * @throws CurrencyConstraintException
+     */
+    public function setPrecision(int|string $precision): self
+    {
+        $this->precision = new Precision($precision);
+
+        return $this;
+    }
+
+    public function getExchangeRate(): ExchangeRate
+    {
+        return $this->exchangeRate;
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getLocalizedNames(): array
+    {
+        return $this->localizedNames;
+    }
+
+    /**
+     * @param string[] $localizedNames currency's localized names, indexed by language id
+     *
+     * @throws CurrencyConstraintException
+     */
+    public function setLocalizedNames(array $localizedNames): self
+    {
+        if (empty($localizedNames)) {
+            throw new CurrencyConstraintException('Currency name cannot be empty', CurrencyConstraintException::EMPTY_NAME);
+        }
+
+        $this->localizedNames = $localizedNames;
+
+        return $this;
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getLocalizedSymbols(): array
+    {
+        return $this->localizedSymbols;
+    }
+
+    /**
+     * @param string[] $localizedSymbols currency's localized symbols, indexed by language id
+     *
+     * @throws CurrencyConstraintException
+     */
+    public function setLocalizedSymbols(array $localizedSymbols): self
+    {
+        if (empty($localizedSymbols)) {
+            throw new CurrencyConstraintException('Currency symbol cannot be empty', CurrencyConstraintException::EMPTY_SYMBOL);
+        }
+
+        $this->localizedSymbols = $localizedSymbols;
+
+        return $this;
+    }
+
+    public function isEnabled(): bool
+    {
+        return $this->isEnabled;
+    }
+
+    /**
+     * @return int[]
+     */
+    public function getShopIds(): array
+    {
+        return $this->shopIds;
+    }
+
+    /**
+     * @param int[] $shopIds
+     */
+    public function setShopIds(array $shopIds): self
+    {
+        $this->shopIds = $shopIds;
+
+        return $this;
+    }
+
+    /**
+     * Returns the currency's localized transformations, indexed by language id
+     *
+     * @return string[]
+     */
+    public function getLocalizedTransformations(): array
+    {
+        return $this->localizedTransformations;
+    }
+
+    /**
+     * @param string[] $localizedTransformations currency's localized transformations, indexed by language id
+     *
+     * @return $this
+     */
+    public function setLocalizedTransformations(array $localizedTransformations): self
+    {
+        $this->localizedTransformations = $localizedTransformations;
+
+        return $this;
+    }
 }
diff --git a/src/Core/Domain/Currency/Command/EditUnofficialCurrencyCommand.php b/src/Core/Domain/Currency/Command/EditUnofficialCurrencyCommand.php
index 8b029b81295de..991a73279fa4f 100644
--- a/src/Core/Domain/Currency/Command/EditUnofficialCurrencyCommand.php
+++ b/src/Core/Domain/Currency/Command/EditUnofficialCurrencyCommand.php
@@ -27,31 +27,194 @@
 namespace PrestaShop\PrestaShop\Core\Domain\Currency\Command;
 
 use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CurrencyConstraintException;
+use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CurrencyException;
 use PrestaShop\PrestaShop\Core\Domain\Currency\ValueObject\AlphaIsoCode;
+use PrestaShop\PrestaShop\Core\Domain\Currency\ValueObject\CurrencyId;
+use PrestaShop\PrestaShop\Core\Domain\Currency\ValueObject\ExchangeRate;
+use PrestaShop\PrestaShop\Core\Domain\Currency\ValueObject\Precision;
 
-class EditUnofficialCurrencyCommand extends EditCurrencyCommand
+class EditUnofficialCurrencyCommand
 {
+    private ?AlphaIsoCode $isoCode = null;
+
+    protected CurrencyId $currencyId;
+
+    protected ?ExchangeRate $exchangeRate = null;
+
+    protected ?Precision $precision = null;
+
+    /**
+     * @var string[]
+     */
+    protected array $localizedNames = [];
+
+    /**
+     * @var string[]
+     */
+    protected array $localizedSymbols = [];
+
+    protected bool $isEnabled;
+
+    /**
+     * @var int[]
+     */
+    protected array $shopIds = [];
+
     /**
-     * @var AlphaIsoCode|null
+     * @var string[]
      */
-    private $isoCode;
+    protected array $localizedTransformations = [];
 
     /**
-     * @return AlphaIsoCode|null
+     * @throws CurrencyException
      */
-    public function getIsoCode()
+    public function __construct(int $currencyId)
     {
-        return $this->isoCode;
+        $this->currencyId = new CurrencyId($currencyId);
+    }
+
+    public function getCurrencyId(): CurrencyId
+    {
+        return $this->currencyId;
+    }
+
+    public function getExchangeRate(): ?ExchangeRate
+    {
+        return $this->exchangeRate;
     }
 
     /**
-     * @param string $isoCode
+     * @throws CurrencyConstraintException
+     */
+    public function setExchangeRate(float $exchangeRate): self
+    {
+        $this->exchangeRate = new ExchangeRate($exchangeRate);
+
+        return $this;
+    }
+
+    public function getPrecision(): ?Precision
+    {
+        return $this->precision;
+    }
+
+    /**
+     * @throws CurrencyConstraintException
+     */
+    public function setPrecision(int|string $precision): self
+    {
+        $this->precision = new Precision($precision);
+
+        return $this;
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getLocalizedNames(): array
+    {
+        return $this->localizedNames;
+    }
+
+    /**
+     * @param string[] $localizedNames currency's localized names, indexed by language id
      *
-     * @return self
+     * @throws CurrencyConstraintException
+     */
+    public function setLocalizedNames(array $localizedNames): self
+    {
+        if (empty($localizedNames)) {
+            throw new CurrencyConstraintException('Currency name cannot be empty', CurrencyConstraintException::EMPTY_NAME);
+        }
+
+        $this->localizedNames = $localizedNames;
+
+        return $this;
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getLocalizedSymbols(): array
+    {
+        return $this->localizedSymbols;
+    }
+
+    /**
+     * @param string[] $localizedSymbols currency's localized symbols, indexed by language id
+     *
+     * @throws CurrencyConstraintException
+     */
+    public function setLocalizedSymbols(array $localizedSymbols): self
+    {
+        if (empty($localizedSymbols)) {
+            throw new CurrencyConstraintException('Currency symbol cannot be empty', CurrencyConstraintException::EMPTY_SYMBOL);
+        }
+
+        $this->localizedSymbols = $localizedSymbols;
+
+        return $this;
+    }
+
+    public function isEnabled(): bool
+    {
+        return $this->isEnabled;
+    }
+
+    public function setIsEnabled(bool $isEnabled): self
+    {
+        $this->isEnabled = $isEnabled;
+
+        return $this;
+    }
+
+    /**
+     * @return int[]
+     */
+    public function getShopIds(): array
+    {
+        return $this->shopIds;
+    }
+
+    /**
+     * @param int[] $shopIds
+     */
+    public function setShopIds(array $shopIds): self
+    {
+        $this->shopIds = $shopIds;
+
+        return $this;
+    }
+
+    /**
+     * Returns the currency's localized transformations, indexed by language id
      *
+     * @return string[]
+     */
+    public function getLocalizedTransformations(): array
+    {
+        return $this->localizedTransformations;
+    }
+
+    /**
+     * @param string[] $localizedTransformations currency's localized transformations, indexed by language id
+     */
+    public function setLocalizedTransformations(array $localizedTransformations): self
+    {
+        $this->localizedTransformations = $localizedTransformations;
+
+        return $this;
+    }
+
+    public function getIsoCode(): ?AlphaIsoCode
+    {
+        return $this->isoCode;
+    }
+
+    /**
      * @throws CurrencyConstraintException
      */
-    public function setIsoCode($isoCode)
+    public function setIsoCode(string $isoCode): self
     {
         $this->isoCode = new AlphaIsoCode($isoCode);
 

From 7a866cd8f193cf21c5b1094393c9ba513ca37d54 Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Wed, 21 Jun 2023 16:18:43 +0200
Subject: [PATCH 0460/1030] update inheritance for IssueReturnProductCommand

---
 .../Command/IssueReturnProductCommand.php     | 27 +++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/Core/Domain/Order/Command/IssueReturnProductCommand.php b/src/Core/Domain/Order/Command/IssueReturnProductCommand.php
index 2a5fbb6a57b02..3f7d3a6aa0ddf 100644
--- a/src/Core/Domain/Order/Command/IssueReturnProductCommand.php
+++ b/src/Core/Domain/Order/Command/IssueReturnProductCommand.php
@@ -28,12 +28,15 @@
 
 use PrestaShop\PrestaShop\Core\Domain\Order\Exception\InvalidCancelProductException;
 use PrestaShop\PrestaShop\Core\Domain\Order\Exception\OrderException;
+use PrestaShop\PrestaShop\Core\Domain\Order\ValueObject\OrderDetailRefund;
 
 /**
  * Issues return product for given order.
  */
-class IssueReturnProductCommand extends IssueStandardRefundCommand
+class IssueReturnProductCommand extends AbstractRefundCommand
 {
+    protected bool $refundShippingCost;
+
     /**
      * The expected format for $orderDetailRefunds is an associative array indexed
      * by OrderDetail id containing one fields quantity
@@ -67,11 +70,31 @@ public function __construct(
         parent::__construct(
             $orderId,
             $orderDetailRefunds,
-            $refundShippingCost,
+            true,
             $generateCreditSlip,
             $generateVoucher,
             $voucherRefundType
         );
+        $this->refundShippingCost = $refundShippingCost;
         $this->restockRefundedProducts = $restockRefundedProducts;
     }
+
+    public function refundShippingCost(): bool
+    {
+        return $this->refundShippingCost;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function setOrderDetailRefunds(array $orderDetailRefunds): void
+    {
+        $this->orderDetailRefunds = [];
+        foreach ($orderDetailRefunds as $orderDetailId => $detailRefund) {
+            $this->orderDetailRefunds[] = OrderDetailRefund::createStandardRefund(
+                $orderDetailId,
+                $detailRefund['quantity']
+            );
+        }
+    }
 }

From b6cd48e7e3b4a670f2d73cd8bb0a22385ef6fb7d Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Wed, 21 Jun 2023 17:07:54 +0200
Subject: [PATCH 0461/1030] update services definition

---
 .../Compiler/CommandAndQueryCollectorPass.php |  32 ++--
 src/PrestaShopBundle/PrestaShopBundle.php     |   2 +-
 .../config/services/adapter/address.yml       |  54 +++---
 .../config/services/adapter/alias.yml         |  26 ++-
 .../config/services/adapter/attachment.yml    |  22 ++-
 .../config/services/adapter/attribute.yml     |  10 +-
 .../services/adapter/attribute_group.yml      |  20 +--
 .../config/services/adapter/carrier.yml       |  10 +-
 .../config/services/adapter/cart.yml          |  85 ++++------
 .../config/services/adapter/cart_rule.yml     |  28 ++-
 .../services/adapter/catalog_price_rule.yml   |  30 ++--
 .../config/services/adapter/category.yml      |  71 ++++----
 .../config/services/adapter/cms_page.yml      |  45 ++---
 .../services/adapter/cms_page_category.yml    |  55 +++---
 .../config/services/adapter/configuration.yml |   2 +-
 .../config/services/adapter/contact.yml       |   6 +-
 .../config/services/adapter/country.yml       |  13 +-
 .../config/services/adapter/credit_slip.yml   |   5 +-
 .../config/services/adapter/currency.yml      |  24 +--
 .../config/services/adapter/customer.yml      |  68 +++-----
 .../config/services/adapter/employee.yml      |  16 +-
 .../config/services/adapter/feature.yml       |  40 ++---
 .../config/services/adapter/group.yml         |  10 +-
 .../config/services/adapter/hook.yml          |  10 +-
 .../config/services/adapter/language.yml      |  35 ++--
 .../config/services/adapter/manufacturer.yml  |  33 ++--
 .../config/services/adapter/meta.yml          |  20 +--
 .../config/services/adapter/module.yml        |   5 +-
 .../config/services/adapter/notification.yml  |  10 +-
 .../config/services/adapter/order.yml         | 130 ++++++--------
 .../config/services/adapter/order_message.yml |  25 ++-
 .../config/services/adapter/order_return.yml  |  10 +-
 .../services/adapter/order_return_state.yml   |  25 ++-
 .../config/services/adapter/order_state.yml   |  19 +--
 .../config/services/adapter/product.yml       | 160 +++++++-----------
 .../services/adapter/product/_combination.yml |  70 +++-----
 .../adapter/product/_customization.yml        |  15 +-
 .../adapter/product/_feature_value.yml        |  15 +-
 .../services/adapter/product/_image.yml       |  35 ++--
 .../config/services/adapter/product/_pack.yml |  15 +-
 .../adapter/product/_specific_prices.yml      |  35 ++--
 .../services/adapter/product/_stock.yml       |  10 +-
 .../adapter/product/_virtual_product.yml      |  15 +-
 .../config/services/adapter/profile.yml       |  40 ++---
 .../config/services/adapter/search_engine.yml |  25 ++-
 .../config/services/adapter/security.yml      |  30 ++--
 .../config/services/adapter/shop.yml          |  12 +-
 .../config/services/adapter/sql_manager.yml   |  16 +-
 .../config/services/adapter/state.yml         |  35 ++--
 .../config/services/adapter/store.yml         |  10 +-
 .../config/services/adapter/supplier.yml      |  50 +++---
 .../Resources/config/services/adapter/tab.yml |   2 +-
 .../Resources/config/services/adapter/tax.yml |  23 ++-
 .../services/adapter/tax_rules_group.yml      |  35 ++--
 .../config/services/adapter/title.yml         |  25 ++-
 .../config/services/adapter/webservice.yml    |  15 +-
 .../config/services/adapter/zone.yml          |  35 ++--
 .../core/domain/authorization_server.yml      |  15 +-
 .../services/core/domain/customer_service.yml |  40 ++---
 .../services/core/domain/showcase_card.yml    |  10 +-
 .../services/core/domain/sql_management.yml   |  10 +-
 .../config/services/core/domain/theme.yml     |  16 +-
 .../config/services/core/mail_template.yml    |   5 +-
 63 files changed, 752 insertions(+), 1063 deletions(-)

diff --git a/src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryCollectorPass.php b/src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryCollectorPass.php
index 6cff92b6dc2cc..c266906217d61 100644
--- a/src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryCollectorPass.php
+++ b/src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryCollectorPass.php
@@ -30,41 +30,53 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
- * Collects all Commands & Queries and puts them into container for later processing.
+ * Aggregates and organizes all Commands & Queries, storing them in a container for future processing,
+ * while simultaneously transforming custom tags into Symfony Messenger tags.
  */
 class CommandAndQueryCollectorPass implements CompilerPassInterface
 {
     /**
      * {@inheritdoc}
      */
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         if (!in_array($container->getParameter('kernel.environment'), ['dev', 'test'])) {
             return;
         }
 
-        $commandsAndQueries = $this->findCommandsAndQueries($container);
+        $handlers = $container->findTaggedServiceIds('messenger.cqrs_handler');
+        $commandsAndQueries = $this->findCommandsAndQueries($handlers);
+        $this->updateMessengerTags($container, $handlers);
+
         $container->setParameter('prestashop.commands_and_queries', $commandsAndQueries);
     }
 
     /**
      * Gets command for each provided handler
      *
-     * @param ContainerBuilder $container
-     *
      * @return string[]
      */
-    private function findCommandsAndQueries(ContainerBuilder $container)
+    private function findCommandsAndQueries(array $handlers): array
     {
-        $handlers = $container->findTaggedServiceIds('messenger.message_handler');
-
         $commands = [];
         foreach ($handlers as $handler) {
-            if (isset(current($handler)['handles'])) {
-                $commands[] = current($handler)['handles'];
+            if (isset(current($handler)['command'])) {
+                $commands[] = current($handler)['command'];
             }
         }
 
         return $commands;
     }
+
+    /**
+     * update messenger tags allowing the recognition of handlers by symfony
+     */
+    private function updateMessengerTags(ContainerBuilder $container, array $handlers): void
+    {
+        foreach ($handlers as $key => $value) {
+            $definition = $container->findDefinition($key);
+            $definition->addTag('messenger.message_handler', ['method' => 'handle', 'handles' => current($value)['command']]);
+            $definition->clearTag('messenger.cqrs_handler');
+        }
+    }
 }
diff --git a/src/PrestaShopBundle/PrestaShopBundle.php b/src/PrestaShopBundle/PrestaShopBundle.php
index 9207a084109ab..bc874d47041e5 100644
--- a/src/PrestaShopBundle/PrestaShopBundle.php
+++ b/src/PrestaShopBundle/PrestaShopBundle.php
@@ -75,7 +75,7 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new RouterPass(), PassConfig::TYPE_AFTER_REMOVING);
         $container->addCompilerPass(new OverrideTranslatorServiceCompilerPass());
         $container->addCompilerPass(new ModulesDoctrineCompilerPass());
-        $container->addCompilerPass(new CommandAndQueryCollectorPass());
+        $container->addCompilerPass(new CommandAndQueryCollectorPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, self::LOAD_MODULE_SERVICES_PASS_PRIORITY);
         $container->addCompilerPass(new OptionsFormHookNameCollectorPass());
         $container->addCompilerPass(new GridDefinitionServiceIdsCollectorPass());
         $container->addCompilerPass(new IdentifiableObjectFormTypesCollectorPass());
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/address.yml b/src/PrestaShopBundle/Resources/config/services/adapter/address.yml
index 639cc492b8ed5..962ec93b7d2a5 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/address.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/address.yml
@@ -7,68 +7,60 @@ services:
   prestashop.adapter.address.command_handler.delete_address_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\DeleteAddressHandler'
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\DeleteAddressCommand', method: 'handle' }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\DeleteAddressCommand' }
 
   prestashop.adapter.address.command_handler.bulk_delete_address_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\BulkDeleteAddressHandler'
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\BulkDeleteAddressCommand', method: 'handle' }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\BulkDeleteAddressCommand' }
 
   prestashop.adapter.address.command_handler.add_manufacturer_address_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\AddManufacturerAddressHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\AddManufacturerAddressCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\AddManufacturerAddressCommand'
 
   prestashop.adapter.address.command_handler.edit_manufacturer_address_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\EditManufacturerAddressHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\EditManufacturerAddressCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\EditManufacturerAddressCommand'
 
   prestashop.adapter.address.query_handler.get_manufacturer_address_for_editing_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Address\QueryHandler\GetManufacturerAddressForEditingHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Address\Query\GetManufacturerAddressForEditing'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Address\Query\GetManufacturerAddressForEditing'
 
   prestashop.adapter.address.query_handler.get_required_fields_for_address:
     class: 'PrestaShop\PrestaShop\Adapter\Address\QueryHandler\GetRequiredFieldsForAddressHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Address\Query\GetRequiredFieldsForAddress'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Address\Query\GetRequiredFieldsForAddress'
 
   prestashop.adapter.address.command_handler.set_required_fields_for_address:
     class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\SetRequiredFieldsForAddressHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\SetRequiredFieldsForAddressCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\SetRequiredFieldsForAddressCommand'
 
   prestashop.adapter.address.command_handler.add_customer_address_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\AddCustomerAddressHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\AddCustomerAddressCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\AddCustomerAddressCommand'
 
   prestashop.adapter.address.query_handler.get_customer_address_for_editing_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Address\QueryHandler\GetCustomerAddressForEditingHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Address\Query\GetCustomerAddressForEditing'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Address\Query\GetCustomerAddressForEditing'
 
   prestashop.adapter.address.command_handler.edit_customer_address_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\EditCustomerAddressHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\EditCustomerAddressCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\EditCustomerAddressCommand'
 
   prestashop.adapter.address.command_handler.edit_order_address_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\EditOrderAddressHandler'
@@ -77,18 +69,16 @@ services:
       - '@prestashop.adapter.order.command_handler.change_order_delivery_address_handler'
       - '@prestashop.adapter.order.command_handler.change_order_invoice_address_handler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\EditOrderAddressCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\EditOrderAddressCommand'
 
   prestashop.adapter.address.command_handler.edit_cart_address_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\EditCartAddressHandler'
     arguments:
       - '@prestashop.adapter.address.command_handler.edit_customer_address_handler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\EditCartAddressCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\EditCartAddressCommand'
 
   prestashop.adapter.address.formatter:
     class: 'PrestaShop\PrestaShop\Adapter\Address\AddressFormatter'
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml b/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
index b2d5d2f763da7..d3bcdd06529ba 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
@@ -12,41 +12,37 @@ services:
 
   PrestaShop\PrestaShop\Adapter\Alias\CommandHandler\AddAliasHandler:
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Alias\Command\AddAliasCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Alias\Command\AddAliasCommand
 
   PrestaShop\PrestaShop\Adapter\Alias\QueryHandler\GetAliasForEditingHandler:
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Alias\Query\GetAliasForEditing
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Alias\Query\GetAliasForEditing
 
   PrestaShop\PrestaShop\Adapter\Alias\CommandHandler\DeleteAliasHandler:
     tags:
-      - name: tactician.handler
+      - name: messenger.cqrs_handler
         command: PrestaShop\PrestaShop\Core\Domain\Alias\Command\DeleteAliasCommand
 
   PrestaShop\PrestaShop\Adapter\Alias\CommandHandler\BulkDeleteAliasHandler:
     tags:
-      - name: tactician.handler
+      - name: messenger.cqrs_handler
         command: PrestaShop\PrestaShop\Core\Domain\Alias\Command\BulkDeleteAliasCommand
 
   PrestaShop\PrestaShop\Adapter\Alias\CommandHandler\UpdateAliasStatusHandler:
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasStatusCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasStatusCommand
 
   PrestaShop\PrestaShop\Adapter\Alias\CommandHandler\BulkUpdateAliasStatusHandler:
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Alias\Command\BulkUpdateAliasStatusCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Alias\Command\BulkUpdateAliasStatusCommand
 
   PrestaShop\PrestaShop\Adapter\Alias\CommandHandler\UpdateAliasHandler:
     tags:
-      - name: tactician.handler
+      - name: messenger.cqrs_handler
         command: PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasCommand
 
   PrestaShop\PrestaShop\Adapter\Alias\QueryHandler\SearchForSearchTermHandler:
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/attachment.yml b/src/PrestaShopBundle/Resources/config/services/adapter/attachment.yml
index 923c83d2d8436..d92d0b2514c3d 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/attachment.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/attachment.yml
@@ -7,26 +7,26 @@ services:
     class: 'PrestaShop\PrestaShop\Adapter\Attachment\CommandHandler\DeleteAttachmentHandler'
     parent: 'prestashop.adapter.attachment.command_handler.abstract_attachment_handler'
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Command\DeleteAttachmentCommand', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Command\DeleteAttachmentCommand' }
 
   prestashop.adapter.attachment.command_handler.bulk_delete_attachment_handler:
     public: true
     class: 'PrestaShop\PrestaShop\Adapter\Attachment\CommandHandler\BulkDeleteAttachmentsHandler'
     parent: 'prestashop.adapter.attachment.command_handler.abstract_attachment_handler'
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Command\BulkDeleteAttachmentsCommand', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Command\BulkDeleteAttachmentsCommand' }
 
   prestashop.adapter.attachment.query_handler.get_attachment_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Attachment\QueryHandler\GetAttachmentHandler'
     arguments:
       - !php/const _PS_DOWNLOAD_DIR_
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Query\GetAttachment', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Query\GetAttachment' }
 
   prestashop.adapter.contact.query_handler.get_attachment_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Attachment\QueryHandler\GetAttachmentForEditingHandler'
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Query\GetAttachmentForEditing', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Query\GetAttachmentForEditing' }
 
   prestashop.adapter.attachment.uploader.attachment_file_uploader:
     class: 'PrestaShop\PrestaShop\Adapter\File\Uploader\AttachmentFileUploader'
@@ -47,7 +47,7 @@ services:
     arguments:
       - '@prestashop.adapter.attachment.uploader.attachment_file_uploader'
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Command\EditAttachmentCommand', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Command\EditAttachmentCommand' }
 
   prestashop.adapter.attachment.command_handler.create_attachment_handler:
     public: true
@@ -56,7 +56,7 @@ services:
     arguments:
       - '@prestashop.adapter.attachment.uploader.attachment_file_uploader'
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Command\AddAttachmentCommand', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Command\AddAttachmentCommand' }
 
   PrestaShop\PrestaShop\Adapter\Attachment\AttachmentRepository:
     arguments:
@@ -72,15 +72,13 @@ services:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Attachment\AttachmentRepository'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Attachment\Query\GetAttachmentInformation
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Attachment\Query\GetAttachmentInformation
 
   prestashop.adapter.attachment.query_handler.search_attachment_handler:
     class: PrestaShop\PrestaShop\Adapter\Attachment\QueryHandler\SearchAttachmentHandler
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Attachment\AttachmentRepository'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Attachment\Query\SearchAttachment
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Attachment\Query\SearchAttachment
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/attribute.yml b/src/PrestaShopBundle/Resources/config/services/adapter/attribute.yml
index 906d8f70dbe5c..25164a357a658 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/attribute.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/attribute.yml
@@ -4,15 +4,13 @@ services:
 
   PrestaShop\PrestaShop\Adapter\Attribute\CommandHandler\DeleteAttributeHandler:
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\Command\DeleteAttributeCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\Command\DeleteAttributeCommand'
 
   PrestaShop\PrestaShop\Adapter\Attribute\CommandHandler\BulkDeleteAttributeHandler:
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\Command\BulkDeleteAttributeCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\Command\BulkDeleteAttributeCommand'
 
   PrestaShop\PrestaShop\Adapter\Attribute\Repository\AttributeRepository:
     arguments:
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/attribute_group.yml b/src/PrestaShopBundle/Resources/config/services/adapter/attribute_group.yml
index 10710da9345ab..7fd46c5576752 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/attribute_group.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/attribute_group.yml
@@ -13,32 +13,28 @@ services:
 
   PrestaShop\PrestaShop\Adapter\AttributeGroup\CommandHandler\DeleteAttributeGroupHandler:
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\DeleteAttributeGroupCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\DeleteAttributeGroupCommand'
 
   PrestaShop\PrestaShop\Adapter\AttributeGroup\CommandHandler\BulkDeleteAttributeGroupHandler:
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\BulkDeleteAttributeGroupCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\BulkDeleteAttributeGroupCommand'
 
   PrestaShop\PrestaShop\Adapter\AttributeGroup\QueryHandler\GetAttributeGroupListHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Attribute\Repository\AttributeRepository'
       - '@PrestaShop\PrestaShop\Adapter\AttributeGroup\Repository\AttributeGroupRepository'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Query\GetAttributeGroupList'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Query\GetAttributeGroupList'
 
   PrestaShop\PrestaShop\Adapter\Product\AttributeGroup\QueryHandler\GetProductAttributeGroupsHandler:
     autowire: true
     public: false
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Product\AttributeGroup\Query\GetProductAttributeGroups'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\Product\AttributeGroup\Query\GetProductAttributeGroups'
 
   PrestaShop\PrestaShop\Adapter\AttributeGroup\Repository\AttributeGroupRepository:
     arguments:
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/carrier.yml b/src/PrestaShopBundle/Resources/config/services/adapter/carrier.yml
index 6d4f766a8ae5e..6810c9ee587e9 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/carrier.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/carrier.yml
@@ -10,27 +10,27 @@ services:
   prestashop.adapter.carrier.command_handler.toggle_carrier_status:
     class: 'PrestaShop\PrestaShop\Adapter\Carrier\CommandHandler\ToggleCarrierStatusHandler'
     tags:
-      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Carrier\Command\ToggleCarrierStatusCommand, method: handle }
+      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Carrier\Command\ToggleCarrierStatusCommand }
 
   prestashop.adapter.carrier.command_handler.toggle_carrier_is_free_status:
     class: 'PrestaShop\PrestaShop\Adapter\Carrier\CommandHandler\ToggleCarrierIsFreeHandler'
     tags:
-      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Carrier\Command\ToggleCarrierIsFreeCommand, method: handle }
+      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Carrier\Command\ToggleCarrierIsFreeCommand }
 
   prestashop.adapter.carrier.command_handler.delete_carrier:
     class: 'PrestaShop\PrestaShop\Adapter\Carrier\CommandHandler\DeleteCarrierHandler'
     tags:
-      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Carrier\Command\DeleteCarrierCommand, method: handle }
+      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Carrier\Command\DeleteCarrierCommand }
 
   prestashop.adapter.carrier.command_handler.bulk_delete_carrier:
     class: 'PrestaShop\PrestaShop\Adapter\Carrier\CommandHandler\BulkDeleteCarrierHandler'
     tags:
-      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Carrier\Command\BulkDeleteCarrierCommand, method: handle }
+      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Carrier\Command\BulkDeleteCarrierCommand }
 
   prestashop.adapter.carrier.command_handler.bulk_toggle_carrier_status:
     class: 'PrestaShop\PrestaShop\Adapter\Carrier\CommandHandler\BulkToggleCarrierStatusHandler'
     tags:
-      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Carrier\Command\BulkToggleCarrierStatusCommand, method: handle }
+      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Carrier\Command\BulkToggleCarrierStatusCommand }
 
   prestashop.adapter.carrier.carrier_module_advice_alert_checker:
     class: 'PrestaShop\PrestaShop\Adapter\Carrier\CarrierModuleAdviceAlertChecker'
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/cart.yml b/src/PrestaShopBundle/Resources/config/services/adapter/cart.yml
index 145beaee07121..cad6106584b7a 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/cart.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/cart.yml
@@ -5,32 +5,28 @@ services:
   prestashop.adapter.cart.command_handler.create_empty_customer_cart_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\CreateEmptyCustomerCartHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\CreateEmptyCustomerCartCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\CreateEmptyCustomerCartCommand'
 
   prestashop.adapter.cart.command_handler.update_cart_currency_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\UpdateCartCurrencyHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartCurrencyCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartCurrencyCommand'
 
   prestashop.adapter.cart.command_handler.update_cart_language_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\UpdateCartLanguageHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartLanguageCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartLanguageCommand'
 
   prestashop.adapter.cart.command_handler.update_cart_addresses_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\UpdateCartAddressesHandler'
     arguments:
       - '@prestashop.adapter.command_handler.update_cart_carrier_handler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartAddressesCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartAddressesCommand'
 
   prestashop.adapter.cart.command_handler.update_delivery_options_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\UpdateCartDeliverySettingsHandler'
@@ -38,66 +34,58 @@ services:
       - '@translator'
       - '@prestashop.adapter.legacy.configuration'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartDeliverySettingsCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartDeliverySettingsCommand'
 
   prestashop.adapter.command_handler.update_product_quantity_in_cart_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\UpdateProductQuantityInCartHandler'
     arguments:
       - '@prestashop.adapter.context_state_manager'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateProductQuantityInCartCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateProductQuantityInCartCommand'
 
   prestashop.adapter.command_handler.update_cart_carrier_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\UpdateCartCarrierHandler'
     arguments:
       - '@prestashop.adapter.context_state_manager'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartCarrierCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartCarrierCommand'
 
   prestashop.adapter.command_handler.add_cart_rule_to_cart_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\AddCartRuleToCartHandler'
     arguments:
       - '@prestashop.adapter.context_state_manager'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\AddCartRuleToCartCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\AddCartRuleToCartCommand'
 
   prestashop.adapter.command_handler.remove_cart_rule_from_cart_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\RemoveCartRuleFromCartHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\RemoveCartRuleFromCartCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\RemoveCartRuleFromCartCommand'
 
   prestashop.adapter.command_handler.remove_product_from_cart_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\RemoveProductFromCartHandler'
     arguments:
       - '@prestashop.adapter.context_state_manager'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\RemoveProductFromCartCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\RemoveProductFromCartCommand'
 
   prestashop.adapter.command_handler.update_product_price_in_cart_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\UpdateProductPriceInCartHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateProductPriceInCartCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateProductPriceInCartCommand'
 
   prestashop.adapter.command_handler.send_cart_to_customer_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\SendCartToCustomerHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\SendCartToCustomerCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\SendCartToCustomerCommand'
 
   prestashop.adapter.query_handler.get_cart_for_viewing_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\QueryHandler\GetCartForViewingHandler'
@@ -105,16 +93,14 @@ services:
       - '@PrestaShop\PrestaShop\Adapter\ImageManager'
       - "@prestashop.core.localization.locale.context_locale"
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Cart\Query\GetCartForViewing'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Query\GetCartForViewing'
 
   prestashop.adapter.cart.query_handler.get_last_empty_customer_cart_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\QueryHandler\GetLastEmptyCustomerCartHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Cart\Query\GetLastEmptyCustomerCart'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Query\GetLastEmptyCustomerCart'
 
   prestashop.adapter.query_handler.get_cart_information_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\QueryHandler\GetCartForOrderCreationHandler'
@@ -125,16 +111,14 @@ services:
       - '@prestashop.adapter.context_state_manager'
       - '@=service("prestashop.adapter.legacy.configuration").getInt("PS_CARRIER_DEFAULT")'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Cart\Query\GetCartForOrderCreation'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Query\GetCartForOrderCreation'
 
   prestashop.adapter.command_handler.add_customization_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\AddCustomizationHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\AddCustomizationCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\AddCustomizationCommand'
 
   prestashop.adapter.command_handler.add_product_to_cart_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\AddProductToCartHandler'
@@ -142,6 +126,5 @@ services:
       - '@prestashop.adapter.command_handler.add_customization_handler'
       - '@prestashop.adapter.command_handler.update_product_quantity_in_cart_handler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\AddProductToCartCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\AddProductToCartCommand'
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml b/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml
index 0bc5d3635ec89..351e6ee5963db 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml
@@ -6,48 +6,44 @@ services:
     autowire: true
     public: false
     tags:
-      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\CartRule\Command\AddCartRuleCommand, method: handle }
+      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\CartRule\Command\AddCartRuleCommand }
 
   PrestaShop\PrestaShop\Adapter\CartRule\QueryHandler\GetCartRuleForEditingHandler:
     autowire: true
     public: false
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\CartRule\Query\GetCartRuleForEditing'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\CartRule\Query\GetCartRuleForEditing'
 
   prestashop.adapter.cart_rule.query_handler.search_cart_rules_handler:
     class: PrestaShop\PrestaShop\Adapter\CartRule\QueryHandler\SearchCartRulesHandler
     arguments:
       - "@=service('prestashop.adapter.legacy.context').getContext().language.id"
     tags:
-      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\CartRule\Query\SearchCartRules, method: handle }
+      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\CartRule\Query\SearchCartRules }
 
   prestashop.adapter.cart_rule.command_handler.delete_cart_rule_handler:
     class: 'PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler\DeleteCartRuleHandler'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\CartRule\Command\DeleteCartRuleCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\CartRule\Command\DeleteCartRuleCommand'
 
   prestashop.adapter.cart_rule.command_handler.bulk_delete_cart_rule_handler:
     class: 'PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler\BulkDeleteCartRuleHandler'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\CartRule\Command\BulkDeleteCartRuleCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\CartRule\Command\BulkDeleteCartRuleCommand'
 
   prestashop.adapter.cart_rule.command_handler.toggle_cart_rule_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler\ToggleCartRuleStatusHandler'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\CartRule\Command\ToggleCartRuleStatusCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\CartRule\Command\ToggleCartRuleStatusCommand'
 
   prestashop.adapter.cart_rule.command_handler.bulk_toggle_cart_rule_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler\BulkToggleCartRuleStatusHandler'
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\CartRule\Command\BulkToggleCartRuleStatusCommand', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\CartRule\Command\BulkToggleCartRuleStatusCommand' }
 
   PrestaShop\PrestaShop\Adapter\CartRule\Validate\CartRuleValidator:
     autowire: true
@@ -64,7 +60,7 @@ services:
     autowire: true
     public: false
     tags:
-      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\CartRule\Command\EditCartRuleCommand, method: handle }
+      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\CartRule\Command\EditCartRuleCommand }
 
   PrestaShop\PrestaShop\Adapter\CartRule\CartRuleActionFiller:
     autowire: true
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/catalog_price_rule.yml b/src/PrestaShopBundle/Resources/config/services/adapter/catalog_price_rule.yml
index 6da3ec4f710a6..279fd2de6a9bc 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/catalog_price_rule.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/catalog_price_rule.yml
@@ -5,46 +5,40 @@ services:
   prestashop.adapter.catalog_price_rule.command_handler.delete_catalog_price_rule_handler:
     class: 'PrestaShop\PrestaShop\Adapter\CatalogPriceRule\CommandHandler\DeleteCatalogPriceRuleHandler'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Command\DeleteCatalogPriceRuleCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Command\DeleteCatalogPriceRuleCommand'
 
   prestashop.adapter.catalog_price_rule.command_handler.bulk_delete_catalog_price_rule_handler:
     class: 'PrestaShop\PrestaShop\Adapter\CatalogPriceRule\CommandHandler\BulkDeleteCatalogPriceRuleHandler'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Command\BulkDeleteCatalogPriceRuleCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Command\BulkDeleteCatalogPriceRuleCommand'
 
   prestashop.adapter.catalog_price_rule.command_handler.add_catalog_price_rule_handler:
     class: 'PrestaShop\PrestaShop\Adapter\CatalogPriceRule\CommandHandler\AddCatalogPriceRuleHandler'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Command\AddCatalogPriceRuleCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Command\AddCatalogPriceRuleCommand'
 
   prestashop.adapter.catalog_price_rule.command_handler.edit_catalog_price_rule_handler:
     class: 'PrestaShop\PrestaShop\Adapter\CatalogPriceRule\CommandHandler\EditCatalogPriceRuleHandler'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Command\EditCatalogPriceRuleCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Command\EditCatalogPriceRuleCommand'
 
   prestashop.adapter.catalog_price_rule.command_handler.get_catalog_price_rule_for_editing_handler:
     class: 'PrestaShop\PrestaShop\Adapter\CatalogPriceRule\QueryHandler\GetCatalogPriceRuleForEditingHandler'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Query\GetCatalogPriceRuleForEditing'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Query\GetCatalogPriceRuleForEditing'
 
   prestashop.adapter.catalog_price_rule.query_handler.get_catalog_price_rule_list_for_product_handler:
     class: 'PrestaShop\PrestaShop\Adapter\CatalogPriceRule\QueryHandler\GetCatalogPriceRuleListForProductHandler'
     arguments:
       - '@prestashop.adapter.catalog_price_rule.repository.catalog_price_rule_repository'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Query\GetCatalogPriceRuleListForProduct'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Query\GetCatalogPriceRuleListForProduct'
 
   prestashop.adapter.catalog_price_rule.repository.catalog_price_rule_repository:
     class: PrestaShop\PrestaShop\Adapter\CatalogPriceRule\Repository\CatalogPriceRuleRepository
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/category.yml b/src/PrestaShopBundle/Resources/config/services/adapter/category.yml
index e8cd73d7030c0..e80fa33a448f3 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/category.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/category.yml
@@ -13,30 +13,26 @@ services:
   prestashop.adapter.category.command_handler.bulk_update_categories_status_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\BulkUpdateCategoriesStatusHandler
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Category\Command\BulkUpdateCategoriesStatusCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Category\Command\BulkUpdateCategoriesStatusCommand
 
   prestashop.adapter.category.command_handler.bulk_enable_categories_status_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\BulkUpdateCategoriesStatusHandler
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Category\Command\BulkEnableCategoriesCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Category\Command\BulkEnableCategoriesCommand
 
   prestashop.adapter.category.command_handler.bulk_disable_categories_status_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\BulkUpdateCategoriesStatusHandler
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Category\Command\BulkDisableCategoriesCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Category\Command\BulkDisableCategoriesCommand
 
   prestashop.adapter.category.command_handler.set_category_is_enabled_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\SetCategoryIsEnabledHandler
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Category\Command\SetCategoryIsEnabledCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Category\Command\SetCategoryIsEnabledCommand
 
   prestashop.adapter.category.command_handler.abstract_delete_category_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\AbstractDeleteCategoryHandler
@@ -51,25 +47,23 @@ services:
     parent: prestashop.adapter.category.command_handler.abstract_delete_category_handler
     public: true
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryCommand
 
   prestashop.adapter.category.command_handler.bulk_delete_categories_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\BulkDeleteCategoriesHandler
     parent: prestashop.adapter.category.command_handler.abstract_delete_category_handler
     public: true
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Category\Command\BulkDeleteCategoriesCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Category\Command\BulkDeleteCategoriesCommand
 
   prestashop.adapter.category.command_handler.add_category_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\AddCategoryHandler
     public: true
     autowire: true
     tags:
-      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Category\Command\AddCategoryCommand, method: handle }
+      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Category\Command\AddCategoryCommand }
 
   prestashop.adapter.category.command_handler.add_root_category_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\AddRootCategoryHandler
@@ -78,32 +72,30 @@ services:
     public: true
     autowire: true
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Category\Command\AddRootCategoryCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Category\Command\AddRootCategoryCommand
 
   prestashop.adapter.category.command_handler.edit_root_category_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\EditRootCategoryHandler
     public: true
     autowire: true
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Category\Command\EditRootCategoryCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Category\Command\EditRootCategoryCommand
 
   prestashop.adapter.category.command_handler.edit_category_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\EditCategoryHandler
     public: true
     autowire: true
     tags:
-      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Category\Command\EditCategoryCommand, method: handle }
+      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Category\Command\EditCategoryCommand }
 
   prestashop.adapter.category.query_handler.get_category_for_editing:
     class: PrestaShop\PrestaShop\Adapter\Category\QueryHandler\GetCategoryForEditingHandler
     arguments:
       - '@prestashop.core.image.parser.image_tag_source_parser'
     tags:
-      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Category\Query\GetCategoryForEditing, method: handle }
+      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Category\Query\GetCategoryForEditing }
 
   prestashop.adapter.category.command_handler.delete_category_cover_image_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\DeleteCategoryCoverImageHandler
@@ -111,9 +103,8 @@ services:
       - '@filesystem'
       - '@prestashop.adapter.legacy.configuration'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryCoverImageCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryCoverImageCommand
 
   prestashop.adapter.category.command_handler.delete_category_menu_thumbnail_image_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\DeleteCategoryMenuThumbnailImageHandler
@@ -122,23 +113,20 @@ services:
       - '@prestashop.adapter.legacy.configuration'
       - '@prestashop.adapter.cache.clearer.smarty_cache_clearer'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryMenuThumbnailImageCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryMenuThumbnailImageCommand
 
   prestashop.adapter.category.command_handler.update_category_position_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\UpdateCategoryPositionHandler
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Category\Command\UpdateCategoryPositionCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Category\Command\UpdateCategoryPositionCommand
 
   prestashop.adapter.category.command_handler.get_category_status_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\QueryHandler\GetCategoryIsEnabledHandler
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Category\Query\GetCategoryIsEnabled
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Category\Query\GetCategoryIsEnabled
 
   PrestaShop\PrestaShop\Adapter\Category\Repository\CategoryRepository:
     arguments:
@@ -162,6 +150,5 @@ services:
       - '@PrestaShop\PrestaShop\Adapter\Shop\Repository\ShopRepository'
       - "@=service('prestashop.adapter.legacy.configuration').get('PS_ROOT_CATEGORY')"
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Category\Query\GetCategoriesTree
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Category\Query\GetCategoriesTree
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/cms_page.yml b/src/PrestaShopBundle/Resources/config/services/adapter/cms_page.yml
index 8629f353c5560..1604314b114f3 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/cms_page.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/cms_page.yml
@@ -5,58 +5,50 @@ services:
   prestashop.adapter.cms_page.command_handler.bulk_disable_cms_page:
     class: PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler\BulkDisableCmsPageHandler
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\BulkDisableCmsPageCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\BulkDisableCmsPageCommand
 
   prestashop.adapter.cms_page.command_handler.bulk_enable_cms_page:
     class: PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler\BulkEnableCmsPageHandler
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\BulkEnableCmsPageCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\BulkEnableCmsPageCommand
 
   prestashop.adapter.cms_page.command_handler.toggle_cms_page_status:
     class: PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler\ToggleCmsPageStatusHandler
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\ToggleCmsPageStatusCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\ToggleCmsPageStatusCommand
 
   prestashop.adapter.cms_page.query_handler.get_cms_category_id_for_redirection:
     class: PrestaShop\PrestaShop\Adapter\CMS\Page\QueryHandler\GetCmsCategoryIdForRedirectionHandler
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\CmsPage\Query\GetCmsCategoryIdForRedirection
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Query\GetCmsCategoryIdForRedirection
 
   prestashop.adapter.cms_page.command_handler.delete_cms_page:
     class: PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler\DeleteCmsPageHandler
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\DeleteCmsPageCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\DeleteCmsPageCommand
 
   prestashop.adapter.cms_page.command_handler.bulk_delete_cms_page:
     class: PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler\BulkDeleteCmsPageHandler
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\BulkDeleteCmsPageCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\BulkDeleteCmsPageCommand
 
   prestashop.adapter.cms_page.command_handler.add_cms_page_handler:
     class: PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler\AddCmsPageHandler
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\AddCmsPageCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\AddCmsPageCommand
 
   prestashop.adapter.cms_page.command_handler.edit_cms_page_handler:
     class: PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler\EditCmsPageHandler
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\EditCmsPageCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\EditCmsPageCommand
 
   prestashop.adapter.cms_page.query_handler.get_cms_page_for_editing_handler:
     class: PrestaShop\PrestaShop\Adapter\CMS\Page\QueryHandler\GetCmsPageForEditingHandler
@@ -64,6 +56,5 @@ services:
       - "@=service('prestashop.adapter.legacy.context').getContext().link"
       - "@=service('prestashop.adapter.legacy.context').getContext().language.id"
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\CmsPage\Query\GetCmsPageForEditing
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Query\GetCmsPageForEditing
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/cms_page_category.yml b/src/PrestaShopBundle/Resources/config/services/adapter/cms_page_category.yml
index 1336fde744045..35a8a64e3c85b 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/cms_page_category.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/cms_page_category.yml
@@ -13,54 +13,47 @@ services:
   prestashop.adapter.cms_page_category.command_handler.delete_cms_page_category_handler:
     class: PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler\DeleteCmsPageCategoryHandler
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\DeleteCmsPageCategoryCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\DeleteCmsPageCategoryCommand
 
   prestashop.adapter.cms_page_category.command_handler.toggle_cms_page_category_status_handler:
     class: PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler\ToggleCmsPageCategoryStatusHandler
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\ToggleCmsPageCategoryStatusCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\ToggleCmsPageCategoryStatusCommand
 
   prestashop.adapter.cms_page_category.command_handler.bulk_delete_cms_page_category_handler:
     class: PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler\BulkDeleteCmsPageCategoryHandler
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\BulkDeleteCmsPageCategoryCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\BulkDeleteCmsPageCategoryCommand
 
   prestashop.adapter.cms_page.command_handler.bulk_enable_cms_page_category_handler:
     class: PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler\BulkEnableCmsPageCategoryHandler
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\BulkEnableCmsPageCategoryCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\BulkEnableCmsPageCategoryCommand
 
   prestashop.adapter.cms_page.command_handler.bulk_disable_cms_page_category_handler:
     class: PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler\BulkDisableCmsPageCategoryHandler
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\BulkDisableCmsPageCategoryCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\BulkDisableCmsPageCategoryCommand
 
   prestashop.adapter.cms_page.command_handler.add_cms_page_category_handler:
     class: 'PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler\AddCmsPageCategoryHandler'
     parent: 'prestashop.adapter.cms_page_category.command_handler.abstract_cms_page_category_handler'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\AddCmsPageCategoryCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\AddCmsPageCategoryCommand
     public: true
 
   prestashop.adapter.cms_page.command_handler.edit_cms_page_category_handler:
     class: 'PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler\EditCmsPageCategoryHandler'
     parent: 'prestashop.adapter.cms_page_category.command_handler.abstract_cms_page_category_handler'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\EditCmsPageCategoryCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\EditCmsPageCategoryCommand
     public: true
 
   # Query handlers
@@ -70,23 +63,20 @@ services:
     arguments:
       - '@=service("prestashop.adapter.legacy.context").getContext().language.id'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Query\GetCmsPageCategoriesForBreadcrumb
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Query\GetCmsPageCategoriesForBreadcrumb
 
   prestashop.adapter.cms_page.query_handler.get_cms_page_categories_for_redirection:
     class: PrestaShop\PrestaShop\Adapter\CMS\PageCategory\QueryHandler\GetCmsPageParentCategoryIdForRedirectionHandler
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Query\GetCmsPageParentCategoryIdForRedirection
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Query\GetCmsPageParentCategoryIdForRedirection
 
   prestashop.adapter.cms_page.query_handler.get_cms_page_category_for_editing:
     class: PrestaShop\PrestaShop\Adapter\CMS\PageCategory\QueryHandler\GetCmsPageCategoryForEditingHandler
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Query\GetCmsPageCategoryForEditing
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Query\GetCmsPageCategoryForEditing
 
   prestashop.adapter.cms_page.categories_provider:
     class: 'PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CategoriesProvider'
@@ -100,6 +90,5 @@ services:
       - '@=service("prestashop.adapter.legacy.context").getContext().language.id'
       - '@request_stack'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Query\GetCmsPageCategoryNameForListing
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Query\GetCmsPageCategoryNameForListing
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/configuration.yml b/src/PrestaShopBundle/Resources/config/services/adapter/configuration.yml
index 3ea39f020890e..b7a3ad4abcb99 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/configuration.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/configuration.yml
@@ -7,4 +7,4 @@ services:
     arguments:
       - '@prestashop.adapter.debug_mode'
     tags:
-      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Configuration\Command\SwitchDebugModeCommand, method: handle }
+      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Configuration\Command\SwitchDebugModeCommand }
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/contact.yml b/src/PrestaShopBundle/Resources/config/services/adapter/contact.yml
index 764633c984aee..3ac8553928734 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/contact.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/contact.yml
@@ -13,18 +13,18 @@ services:
     arguments:
       - '@PrestaShopBundle\Form\DataTransformer\StringArrayToIntegerArrayDataTransformer'
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Contact\Query\GetContactForEditing', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Contact\Query\GetContactForEditing' }
 
   prestashop.adapter.contact.command_handler.edit_contact:
     class: 'PrestaShop\PrestaShop\Adapter\Contact\CommandHandler\EditContactHandler'
     arguments:
       - '@validator'
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Contact\Command\EditContactCommand', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Contact\Command\EditContactCommand' }
 
   prestashop.adapter.contact.command_handler.add_contact:
     class: 'PrestaShop\PrestaShop\Adapter\Contact\CommandHandler\AddContactHandler'
     arguments:
       - '@validator'
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Contact\Command\AddContactCommand', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Contact\Command\AddContactCommand' }
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/country.yml b/src/PrestaShopBundle/Resources/config/services/adapter/country.yml
index 2a63a4ea41ded..c1234eae71a67 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/country.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/country.yml
@@ -7,9 +7,8 @@ services:
     arguments:
       - '@prestashop.adapter.country.country_required_fields_provider'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Country\Query\GetCountryRequiredFields'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Country\Query\GetCountryRequiredFields'
 
   prestashop.adapter.country.country_zip_code_requirements_provider:
     class: 'PrestaShop\PrestaShop\Adapter\Country\CountryZipCodeRequirementsProvider'
@@ -29,24 +28,24 @@ services:
     public: true
     autowire: true
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Country\Command\AddCountryCommand', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Country\Command\AddCountryCommand' }
 
   PrestaShop\PrestaShop\Adapter\Country\CommandHandler\DeleteCountryHandler:
     public: false
     autowire: true
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Country\Command\DeleteCountryCommand', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Country\Command\DeleteCountryCommand' }
 
   PrestaShop\PrestaShop\Adapter\Country\CommandHandler\EditCountryHandler:
     public: false
     autowire: true
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Country\Command\EditCountryCommand', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Country\Command\EditCountryCommand' }
 
   PrestaShop\PrestaShop\Adapter\Country\QueryHandler\GetCountryForEditingHandler:
     public: false
     autowire: true
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Country\Query\GetCountryForEditing', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Country\Query\GetCountryForEditing' }
 
   PrestaShop\PrestaShop\Adapter\Country\Validate\CountryValidator:
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/credit_slip.yml b/src/PrestaShopBundle/Resources/config/services/adapter/credit_slip.yml
index 09acf2348a096..a3279e166fea3 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/credit_slip.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/credit_slip.yml
@@ -5,6 +5,5 @@ services:
   prestashop.adapter.credit_slip.query_handler.get_credit_slip_ids_by_date_range_handler:
     class: 'PrestaShop\PrestaShop\Adapter\CreditSlip\QueryHandler\GetCreditSlipIdsByDateRangeHandler'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\CreditSlip\Query\GetCreditSlipIdsByDateRange
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\CreditSlip\Query\GetCreditSlipIdsByDateRange
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/currency.yml b/src/PrestaShopBundle/Resources/config/services/adapter/currency.yml
index 0905271537208..0c818a284c02c 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/currency.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/currency.yml
@@ -17,14 +17,14 @@ services:
     arguments:
       - '@=service("prestashop.adapter.legacy.configuration").get("PS_CURRENCY_DEFAULT")'
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\ToggleCurrencyStatusCommand', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\ToggleCurrencyStatusCommand' }
 
   prestashop.adapter.currency.command_handler.delete_currency:
     class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\DeleteCurrencyHandler'
     arguments:
       - '@=service("prestashop.adapter.legacy.configuration").get("PS_CURRENCY_DEFAULT")'
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\DeleteCurrencyCommand', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\DeleteCurrencyCommand' }
 
   prestashop.adapter.currency.command_handler.create_currency:
     class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\AddOfficialCurrencyHandler'
@@ -35,7 +35,7 @@ services:
       - '@prestashop.adapter.data_provider.currency'
       - '@prestashop.core.localization.currency.pattern_transformer'
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\AddCurrencyCommand', method: 'handle' }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\AddCurrencyCommand' }
 
   prestashop.adapter.currency.command_handler.create_unofficial_currency:
     class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\AddUnofficialCurrencyHandler'
@@ -46,7 +46,7 @@ services:
       - '@prestashop.adapter.data_provider.currency'
       - '@prestashop.core.localization.currency.pattern_transformer'
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\AddUnofficialCurrencyCommand', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\AddUnofficialCurrencyCommand' }
 
   prestashop.adapter.currency.command_handler.update_official_currency:
     class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\EditOfficialCurrencyHandler'
@@ -56,7 +56,7 @@ services:
       - "@prestashop.adapter.currency.command_handler.command_validator"
       - "@prestashop.core.localization.currency.pattern_transformer"
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\EditCurrencyCommand', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\EditCurrencyCommand' }
 
   prestashop.adapter.currency.command_handler.update_unofficial_currency:
     class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\EditUnofficialCurrencyHandler'
@@ -66,26 +66,26 @@ services:
       - "@prestashop.adapter.currency.command_handler.command_validator"
       - "@prestashop.core.localization.currency.pattern_transformer"
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\EditUnofficialCurrencyCommand', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\EditUnofficialCurrencyCommand' }
 
   prestashop.adapter.currency.command_handler.update_exchange_rates:
     class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\RefreshExchangeRatesHandler'
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\RefreshExchangeRatesCommand', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\RefreshExchangeRatesCommand' }
 
   prestashop.adapter.currency.command_handler.bulk_toggle_currencies_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\BulkToggleCurrenciesStatusHandler'
     arguments:
       - '@=service("prestashop.adapter.legacy.configuration").get("PS_CURRENCY_DEFAULT")'
     tags:
-      - { name: messenger.message_handler, handles: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\BulkToggleCurrenciesStatusCommand', method: handle }
+      - { name: messenger.cqrs_handler, command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\BulkToggleCurrenciesStatusCommand' }
 
   prestashop.adapter.currency.command_handler.bulk_delete_currencies_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\BulkDeleteCurrenciesHandler'
     arguments:
       - '@=service("prestashop.adapter.legacy.configuration").get("PS_CURRENCY_DEFAULT")'
     tags:
-      - { name: messenger.message_handler, handles: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\BulkDeleteCurrenciesCommand', method: handle }
+      - { name: messenger.cqrs_handler, command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\BulkDeleteCurrenciesCommand' }
 
 
   # Query handlers
@@ -96,14 +96,14 @@ services:
       - '@=service("prestashop.adapter.legacy.context").getContext().shop.id'
       - '@prestashop.core.localization.currency.pattern_transformer'
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Currency\Query\GetCurrencyForEditing', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Query\GetCurrencyForEditing' }
 
   prestashop.adapter.currency.query_handler.get_currency_exchange_rate:
     class: 'PrestaShop\PrestaShop\Adapter\Currency\QueryHandler\GetCurrencyExchangeRateHandler'
     arguments:
       - '@prestashop.core.exchange_rate.provider'
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Currency\Query\GetCurrencyExchangeRate', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Query\GetCurrencyExchangeRate' }
 
   prestashop.adapter.currency.query_handler.get_reference_currency:
     class: 'PrestaShop\PrestaShop\Adapter\Currency\QueryHandler\GetReferenceCurrencyHandler'
@@ -111,7 +111,7 @@ services:
       - '@prestashop.core.localization.cldr.locale_repository'
       - '@=service("prestashop.core.admin.lang.repository").findAll()'
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Currency\Query\GetReferenceCurrency', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Query\GetReferenceCurrency' }
 
   PrestaShop\PrestaShop\Adapter\Currency\Repository\CurrencyRepository: ~
 
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/customer.yml b/src/PrestaShopBundle/Resources/config/services/adapter/customer.yml
index dac48c09200a9..00db8491da9aa 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/customer.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/customer.yml
@@ -9,39 +9,34 @@ services:
       - "@=service('prestashop.adapter.legacy.context').getContext().language.id"
       - "@prestashop.core.localization.locale.context_locale"
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerForViewing'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerForViewing'
 
   prestashop.adapter.customer.command_handler.set_private_note_about_customer_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\SetPrivateNoteAboutCustomerHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\SetPrivateNoteAboutCustomerCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\SetPrivateNoteAboutCustomerCommand'
 
   prestashop.adapter.customer.command_handler.transform_guest_to_customer:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\TransformGuestToCustomerHandler'
     arguments:
       - "@=service('prestashop.adapter.legacy.context').getContext().language.id"
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\TransformGuestToCustomerCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\TransformGuestToCustomerCommand'
 
   prestashop.adapter.customer.command_handler.set_required_fields_for_customer:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\SetRequiredFieldsForCustomerHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\SetRequiredFieldsForCustomerCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\SetRequiredFieldsForCustomerCommand'
 
   prestashop.adapter.customer.query_handler.get_required_fields_for_customer:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\QueryHandler\GetRequiredFieldsForCustomerHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetRequiredFieldsForCustomer'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetRequiredFieldsForCustomer'
 
   prestashop.adapter.customer.command_handler.add_customer:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\AddCustomerHandler'
@@ -49,16 +44,14 @@ services:
       - '@prestashop.core.crypto.hashing'
       - '@=service("prestashop.adapter.legacy.configuration").get("_COOKIE_KEY_")'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\AddCustomerCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\AddCustomerCommand'
 
   prestashop.adapter.customer.query_handler.get_customer_for_editing:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\QueryHandler\GetCustomerForEditingHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerForEditing'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerForEditing'
 
   prestashop.adapter.customer.command_handler.edit_customer_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\EditCustomerHandler'
@@ -66,29 +59,28 @@ services:
       - '@prestashop.core.crypto.hashing'
       - '@=service("prestashop.adapter.legacy.configuration").get("_COOKIE_KEY_")'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\EditCustomerCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\EditCustomerCommand'
 
   prestashop.adapter.customer.command_handler.bulk_enable_customer_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\BulkEnableCustomerHandler'
     tags:
-      - { name: messenger.message_handler, handles: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\BulkEnableCustomerCommand', method: handle }
+      - { name: messenger.cqrs_handler, command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\BulkEnableCustomerCommand' }
 
   prestashop.adapter.customer.command_handler.bulk_disable_customer_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\BulkDisableCustomerHandler'
     tags:
-      - { name: messenger.message_handler, handles: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\BulkDisableCustomerCommand', method: handle }
+      - { name: messenger.cqrs_handler, command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\BulkDisableCustomerCommand' }
 
   prestashop.adapter.customer.command_handler.delete_customer_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\DeleteCustomerHandler'
     tags:
-      - { name: messenger.message_handler, handles: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\DeleteCustomerCommand', method: handle }
+      - { name: messenger.cqrs_handler, command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\DeleteCustomerCommand' }
 
   prestashop.adapter.customer.command_handler.bulk_delete_customer_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\BulkDeleteCustomerHandler'
     tags:
-      - { name: messenger.message_handler, handles: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\BulkDeleteCustomerCommand', method: handle }
+      - { name: messenger.cqrs_handler, command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\BulkDeleteCustomerCommand' }
 
   prestashop.adapter.customer.query_handler.search_customers:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\QueryHandler\SearchCustomersHandler'
@@ -96,34 +88,30 @@ services:
       - '@prestashop.adapter.legacy.configuration'
       - "@=service('prestashop.adapter.legacy.context').getContext().language.id"
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\SearchCustomers'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\SearchCustomers'
 
   prestashop.adapter.customer.query_handler.get_customer_carts_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\QueryHandler\GetCustomerCartsHandler'
     arguments:
       - "@prestashop.core.localization.locale.context_locale"
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerCarts'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerCarts'
 
   prestashop.adapter.customer.query_handler.get_customer_orders_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\QueryHandler\GetCustomerOrdersHandler'
     arguments:
       - "@prestashop.core.localization.locale.context_locale"
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerOrders'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerOrders'
 
   prestashop.adapter.customer.query_handler.get_customer_for_address_creation:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\QueryHandler\GetCustomerForAddressCreationHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerForAddressCreation'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerForAddressCreation'
 
   prestashop.adapter.customer.customer_data_source:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\CustomerDataSource'
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/employee.yml b/src/PrestaShopBundle/Resources/config/services/adapter/employee.yml
index fda56b2d827a5..4bb6b3746f0cd 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/employee.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/employee.yml
@@ -5,29 +5,29 @@ services:
   prestashop.adapter.profile.employee.command_handler.toggle_employee_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Profile\Employee\CommandHandler\ToggleEmployeeStatusHandler'
     tags:
-      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Employee\Command\ToggleEmployeeStatusCommand, method: handle }
+      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Employee\Command\ToggleEmployeeStatusCommand }
 
   prestashop.adapter.profile.employee.command_handler.bulk_update_employee_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Profile\Employee\CommandHandler\BulkUpdateEmployeeStatusHandler'
     tags:
-      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Employee\Command\BulkUpdateEmployeeStatusCommand, method: handle }
+      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Employee\Command\BulkUpdateEmployeeStatusCommand }
 
   prestashop.adapter.profile.employee.command_handler.delete_employee_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Profile\Employee\CommandHandler\DeleteEmployeeHandler'
     tags:
-      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Employee\Command\DeleteEmployeeCommand, method: handle }
+      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Employee\Command\DeleteEmployeeCommand }
 
   prestashop.adapter.profile.employee.command_handler.bulk_delete_employee_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Profile\Employee\CommandHandler\BulkDeleteEmployeeHandler'
     tags:
-      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Employee\Command\BulkDeleteEmployeeCommand, method: handle }
+      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Employee\Command\BulkDeleteEmployeeCommand }
 
   prestashop.adapter.employee.query_handler.get_employee_for_editing:
     class: 'PrestaShop\PrestaShop\Adapter\Profile\Employee\QueryHandler\GetEmployeeForEditingHandler'
     arguments:
       - '@prestashop.core.image.parser.image_tag_source_parser'
     tags:
-      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Employee\Query\GetEmployeeForEditing, method: handle }
+      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Employee\Query\GetEmployeeForEditing }
 
   prestashop.adapter.employee.form_access_checker:
     class: 'PrestaShop\PrestaShop\Adapter\Employee\EmployeeFormAccessChecker'
@@ -42,7 +42,7 @@ services:
       - '@prestashop.core.employee.profile_access_checker'
       - '@prestashop.adapter.data_provider.employee'
     tags:
-      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Employee\Command\AddEmployeeCommand, method: handle }
+      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Employee\Command\AddEmployeeCommand }
 
   prestashop.adapter.employee.command_handler.edit_employee_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Profile\Employee\CommandHandler\EditEmployeeHandler'
@@ -52,7 +52,7 @@ services:
       - '@prestashop.adapter.data_provider.employee'
       - '@prestashop.adapter.legacy.context'
     tags:
-      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Employee\Command\EditEmployeeCommand, method: handle }
+      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Employee\Command\EditEmployeeCommand }
 
   prestashop.adapter.employee.avatar_provider:
     class: 'PrestaShop\PrestaShop\Adapter\Employee\AvatarProvider'
@@ -75,4 +75,4 @@ services:
   prestashop.adapter.employee.query_handler.get_employee_email_by_id_handler:
     class: PrestaShop\PrestaShop\Adapter\Profile\Employee\QueryHandler\GetEmployeeEmailByIdHandler
     tags:
-      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Employee\Query\GetEmployeeEmailById, method: handle }
+      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Employee\Query\GetEmployeeEmailById }
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/feature.yml b/src/PrestaShopBundle/Resources/config/services/adapter/feature.yml
index 9429e780fcd9c..8eb34a33b0092 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/feature.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/feature.yml
@@ -9,64 +9,56 @@ services:
     autowire: true
     public: false
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Feature\Command\AddFeatureCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Feature\Command\AddFeatureCommand
 
   PrestaShop\PrestaShop\Adapter\Feature\CommandHandler\EditFeatureHandler:
     autowire: true
     public: false
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Feature\Command\EditFeatureCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Feature\Command\EditFeatureCommand
 
   PrestaShop\PrestaShop\Adapter\Feature\QueryHandler\GetFeatureForEditingHandler:
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Feature\Query\GetFeatureForEditing
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Feature\Query\GetFeatureForEditing
 
   PrestaShop\PrestaShop\Adapter\Feature\CommandHandler\AddFeatureValueHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureRepository'
       - '@PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureValueRepository'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Feature\Command\AddFeatureValueCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Feature\Command\AddFeatureValueCommand
 
   PrestaShop\PrestaShop\Adapter\Feature\CommandHandler\EditFeatureValueHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureValueRepository'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Feature\Command\EditFeatureValueCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Feature\Command\EditFeatureValueCommand
 
   PrestaShop\PrestaShop\Adapter\Feature\QueryHandler\GetFeatureValueForEditingHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureValueRepository'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Feature\Query\GetFeatureValueForEditing
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Feature\Query\GetFeatureValueForEditing
 
   PrestaShop\PrestaShop\Adapter\Feature\CommandHandler\DeleteFeatureHandler:
     autowire: true
     public: false
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Feature\Command\DeleteFeatureCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Feature\Command\DeleteFeatureCommand
 
   PrestaShop\PrestaShop\Adapter\Feature\CommandHandler\BulkDeleteFeatureHandler:
     autowire: true
     public: false
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Feature\Command\BulkDeleteFeatureCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Feature\Command\BulkDeleteFeatureCommand
 
   PrestaShop\PrestaShop\Adapter\Feature\CommandHandler\DeleteFeatureValueHandler:
     autowire: true
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/group.yml b/src/PrestaShopBundle/Resources/config/services/adapter/group.yml
index 303724bb5e7f7..bcec9ca6c26b9 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/group.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/group.yml
@@ -22,17 +22,15 @@ services:
     public: false
     autowire: true
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Customer\Group\Command\AddCustomerGroupCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Group\Command\AddCustomerGroupCommand'
 
   PrestaShop\PrestaShop\Adapter\Customer\Group\QueryHandler\GetCustomerGroupForEditingHandler:
     public: false
     autowire: true
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Customer\Group\Query\GetCustomerGroupForEditing'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Group\Query\GetCustomerGroupForEditing'
 
   PrestaShop\PrestaShop\Adapter\Customer\Group\Validate\CustomerGroupValidator:
     public: false
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/hook.yml b/src/PrestaShopBundle/Resources/config/services/adapter/hook.yml
index 8586d132b08aa..7d754aea627cb 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/hook.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/hook.yml
@@ -5,16 +5,14 @@ services:
   prestashop.adapter.hook.command_handler.update_hook_status_handler:
     class: PrestaShop\PrestaShop\Adapter\Hook\CommandHandler\UpdateHookStatusCommandHandler
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Hook\Command\UpdateHookStatusCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Hook\Command\UpdateHookStatusCommand
 
   prestashop.adapter.hook.command_handler.get_hook_status_handler:
     class: PrestaShop\PrestaShop\Adapter\Hook\QueryHandler\GetHookStatusHandler
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHookStatus
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHookStatus
 
   PrestaShop\PrestaShop\Adapter\HookManager: ~
 
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/language.yml b/src/PrestaShopBundle/Resources/config/services/adapter/language.yml
index 60946b0218bae..cb6a38f02f6a1 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/language.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/language.yml
@@ -25,61 +25,54 @@ services:
       - '@PrestaShop\PrestaShop\Adapter\Image\ImageValidator'
       - '@prestashop.adapter.file.robots_text_file_generator'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\AddLanguageCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\AddLanguageCommand'
 
   prestashop.adapter.language.command_handler.edit_language_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Language\CommandHandler\EditLanguageHandler'
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Image\ImageValidator'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\EditLanguageCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\EditLanguageCommand'
 
   prestashop.adapter.language.query_handler.get_language_for_editing:
     class: 'PrestaShop\PrestaShop\Adapter\Language\QueryHandler\GetLanguageForEditingHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Language\Query\GetLanguageForEditing'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Language\Query\GetLanguageForEditing'
 
   prestashop.adapter.language.command_handler.toggle_language_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Language\CommandHandler\ToggleLanguageStatusHandler'
     arguments:
       - '@prestashop.adapter.file.robots_text_file_generator'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\ToggleLanguageStatusCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\ToggleLanguageStatusCommand'
 
   prestashop.adapter.language.command_handler.bulk_toggle_languages_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Language\CommandHandler\BulkToggleLanguagesStatusHandler'
     arguments:
       - '@prestashop.adapter.file.robots_text_file_generator'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\BulkToggleLanguagesStatusCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\BulkToggleLanguagesStatusCommand'
 
   prestashop.adapter.language.command_handler.bulk_delete_languages_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Language\CommandHandler\BulkDeleteLanguagesHandler'
     arguments:
       - '@prestashop.adapter.file.robots_text_file_generator'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\BulkDeleteLanguagesCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\BulkDeleteLanguagesCommand'
 
   prestashop.adapter.language.command_handler.delete_language_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Language\CommandHandler\DeleteLanguageHandler'
     arguments:
       - '@prestashop.adapter.file.robots_text_file_generator'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\DeleteLanguageCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\DeleteLanguageCommand'
 
   PrestaShop\PrestaShop\Adapter\Language\ContextLanguageProvider:
     autowire: true
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/manufacturer.yml b/src/PrestaShopBundle/Resources/config/services/adapter/manufacturer.yml
index da97bc2bb7112..69de2eddfa49d 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/manufacturer.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/manufacturer.yml
@@ -12,17 +12,17 @@ services:
   prestashop.adapter.manufacturer.command_handler.toggle_manufacturer_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler\ToggleManufacturerStatusHandler'
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\ToggleManufacturerStatusCommand', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\ToggleManufacturerStatusCommand' }
 
   prestashop.adapter.manufacturer.command_handler.bulk_toggle_manufacturer_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler\BulkToggleManufacturerStatusHandler'
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\BulkToggleManufacturerStatusCommand', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\BulkToggleManufacturerStatusCommand' }
 
   prestashop.adapter.manufacturer.command_handler.delete_manufacturer_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler\DeleteManufacturerHandler'
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\DeleteManufacturerCommand', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\DeleteManufacturerCommand' }
 
   prestashop.adapter.manufacturer.command_handler.delete_manufacturer_logo_image_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler\DeleteManufacturerLogoImageHandler'
@@ -30,43 +30,38 @@ services:
       - !php/const _PS_MANU_IMG_DIR_
       - !php/const _PS_TMP_IMG_DIR_
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\DeleteManufacturerLogoImageCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\DeleteManufacturerLogoImageCommand'
 
   prestashop.adapter.manufacturer.command_handler.bulk_delete_manufacturer_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler\BulkDeleteManufacturerHandler'
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\BulkDeleteManufacturerCommand', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\BulkDeleteManufacturerCommand' }
 
   prestashop.adapter.manufacturer.query_handler.get_manufacturer_for_editing:
     class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\QueryHandler\GetManufacturerForEditingHandler'
     arguments:
       - '@prestashop.core.image.parser.image_tag_source_parser'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Query\GetManufacturerForEditing'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Query\GetManufacturerForEditing'
 
   prestashop.adapter.manufacturer.command_handler.edit_manufacturer_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler\EditManufacturerHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\EditManufacturerCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\EditManufacturerCommand'
 
   prestashop.adapter.manufacturer.command_handler.add_manufacturer_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler\AddManufacturerHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\AddManufacturerCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\AddManufacturerCommand'
 
   prestashop.adapter.manufacturer.query_handler.get_manufacturer_for_viewing_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\QueryHandler\GetManufacturerForViewingHandler'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Manufacturer\Query\GetManufacturerForViewing
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Manufacturer\Query\GetManufacturerForViewing
 
   PrestaShop\PrestaShop\Adapter\Manufacturer\Repository\ManufacturerRepository: ~
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/meta.yml b/src/PrestaShopBundle/Resources/config/services/adapter/meta.yml
index 11b709da304ae..16c5d5ed50189 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/meta.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/meta.yml
@@ -18,9 +18,8 @@ services:
       - '@=service("prestashop.adapter.legacy.configuration").get("PS_LANG_DEFAULT")'
       - '@prestashop.adapter.meta.data_provider'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Meta\Command\AddMetaCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\Meta\Command\AddMetaCommand'
 
   prestashop.adapter.meta.command_handler.edit_meta:
     class: 'PrestaShop\PrestaShop\Adapter\Meta\CommandHandler\EditMetaHandler'
@@ -28,18 +27,16 @@ services:
       - '@validator'
       - '@prestashop.adapter.meta.data_provider'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Meta\Command\EditMetaCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\Meta\Command\EditMetaCommand'
 
   # QUERY HANDLERS
 
   prestashop.adapter.meta.query_handler.get_meta_for_editing:
     class: 'PrestaShop\PrestaShop\Adapter\Meta\QueryHandler\GetMetaForEditingHandler'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Meta\Query\GetMetaForEditing'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\Meta\Query\GetMetaForEditing'
 
 
   prestashop.adapter.meta.query_handler.get_pages_for_layout_customization_handler:
@@ -47,6 +44,5 @@ services:
     arguments:
       - '@=service("prestashop.adapter.legacy.context").getContext().language.id'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Meta\Query\GetPagesForLayoutCustomization'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\Meta\Query\GetPagesForLayoutCustomization'
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/module.yml b/src/PrestaShopBundle/Resources/config/services/adapter/module.yml
index c1d88d3ca410e..2385ca71619ec 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/module.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/module.yml
@@ -9,9 +9,8 @@ services:
       - '@prestashop.adapter.legacy.logger'
       - '@prestashop.core.cache.clearer.cache_clearer_chain'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Module\Command\BulkToggleModuleStatusCommand'
-        method: 'handle'
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\Module\Command\BulkToggleModuleStatusCommand'
 
   prestashop.adapter.module.self_configurator:
     class: PrestaShop\PrestaShop\Adapter\Module\Configuration\ModuleSelfConfigurator
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/notification.yml b/src/PrestaShopBundle/Resources/config/services/adapter/notification.yml
index 9a1884615e8df..ee017becdbcf0 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/notification.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/notification.yml
@@ -6,15 +6,13 @@ services:
   prestashop.adapter.notification.command_handler.update_employee_notification_last_element_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Notification\CommandHandler\UpdateEmployeeNotificationLastElementHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Notification\Command\UpdateEmployeeNotificationLastElementCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Notification\Command\UpdateEmployeeNotificationLastElementCommand'
 
   prestashop.adapter.notification.query_handler.get_notification_last_elements_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Notification\QueryHandler\GetNotificationLastElementsHandler'
     arguments:
       - '@prestashop.adapter.notifications.configuration'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Notification\Query\GetNotificationLastElements'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Notification\Query\GetNotificationLastElements'
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/order.yml b/src/PrestaShopBundle/Resources/config/services/adapter/order.yml
index 3412449bb92df..a61e145bb0b81 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/order.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/order.yml
@@ -7,18 +7,16 @@ services:
     arguments:
       - '@prestashop.adapter.context_state_manager'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Order\Command\DuplicateOrderCartCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Order\Command\DuplicateOrderCartCommand'
 
   prestashop.adapter.order.command_handler.add_order_from_back_office_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Order\CommandHandler\AddOrderFromBackOfficeHandler'
     arguments:
       - '@prestashop.adapter.context_state_manager'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Order\Command\AddOrderFromBackOfficeCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Order\Command\AddOrderFromBackOfficeCommand'
 
   prestashop.adapter.order.command_handler.add_product_to_order_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\AddProductToOrderHandler
@@ -29,16 +27,14 @@ services:
       - '@prestashop.adapter.order.product_quantity.updater'
       - '@prestashop.adapter.order.order_detail.updater'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Order\Product\Command\AddProductToOrderCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Order\Product\Command\AddProductToOrderCommand
 
   prestashop.adapter.order.command_handler.update_order_status_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\UpdateOrderStatusHandler
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Order\Command\UpdateOrderStatusCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\UpdateOrderStatusCommand
 
   prestashop.adapter.order.command_handler.update_product_in_order_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\UpdateProductInOrderHandler
@@ -47,9 +43,8 @@ services:
       - '@prestashop.adapter.order.order_detail.updater'
       - '@prestashop.adapter.context_state_manager'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Order\Product\Command\UpdateProductInOrderCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Order\Product\Command\UpdateProductInOrderCommand
 
   prestashop.adapter.order.command_handler.change_order_delivery_address_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\ChangeOrderDeliveryAddressHandler
@@ -59,9 +54,8 @@ services:
       - '@prestashop.adapter.context_state_manager'
       - '@prestashop.adapter.order.product_quantity.updater'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Order\Command\ChangeOrderDeliveryAddressCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\ChangeOrderDeliveryAddressCommand
 
   prestashop.adapter.order.command_handler.change_order_invoice_address_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\ChangeOrderInvoiceAddressHandler
@@ -69,30 +63,26 @@ services:
       - '@prestashop.adapter.order.amount.updater'
       - '@prestashop.adapter.order.order_detail.updater'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Order\Command\ChangeOrderInvoiceAddressCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\ChangeOrderInvoiceAddressCommand
 
   prestashop.adapter.order.command_handler.change_order_currency_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\ChangeOrderCurrencyHandler
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Order\Command\ChangeOrderCurrencyCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\ChangeOrderCurrencyCommand
 
   prestashop.adapter.order.command_handler.add_payment_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\AddPaymentHandler
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Order\Payment\Command\AddPaymentCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Order\Payment\Command\AddPaymentCommand
 
   prestashop.adapter.order.command_handler.generate_invoice_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\GenerateInvoiceHandler
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Order\Invoice\Command\GenerateInvoiceCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Order\Invoice\Command\GenerateInvoiceCommand
 
   prestashop.adapter.order.command_handler.update_order_shipping_details_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\UpdateOrderShippingDetailsHandler
@@ -100,9 +90,8 @@ services:
       - '@prestashop.adapter.order.amount.updater'
       - '@prestashop.adapter.context_state_manager'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Order\Command\UpdateOrderShippingDetailsCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\UpdateOrderShippingDetailsCommand
 
   prestashop.adapter.order.command_handler.delete_cart_rule_from_order_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\DeleteCartRuleFromOrderHandler
@@ -111,9 +100,8 @@ services:
       - '@prestashop.adapter.order.product_quantity.updater'
       - '@prestashop.adapter.context_state_manager'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Order\Command\DeleteCartRuleFromOrderCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\DeleteCartRuleFromOrderCommand
 
   prestashop.adapter.order.command_handler.add_cart_rule_to_order_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\AddCartRuleToOrderHandler
@@ -121,16 +109,14 @@ services:
       - '@prestashop.adapter.order.amount.updater'
       - '@prestashop.adapter.context_state_manager'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Order\Command\AddCartRuleToOrderCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\AddCartRuleToOrderCommand
 
   prestashop.adapter.order.command_handler.update_invoice_note_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\UpdateInvoiceNoteHandler
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Order\Invoice\Command\UpdateInvoiceNoteCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Order\Invoice\Command\UpdateInvoiceNoteCommand
 
   prestashop.adapter.order.command_handler.issue_partial_refund_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\IssuePartialRefundHandler
@@ -142,9 +128,8 @@ services:
       - '@prestashop.adapter.order.refund.updater'
       - '@prestashop.adapter.context_state_manager'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Order\Command\IssuePartialRefundCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\IssuePartialRefundCommand
 
   prestashop.adapter.order.command_handler.issue_standard_refund_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\IssueStandardRefundHandler
@@ -156,9 +141,8 @@ services:
       - '@prestashop.adapter.order.refund.updater'
       - '@prestashop.adapter.context_state_manager'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Order\Command\IssueStandardRefundCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\IssueStandardRefundCommand
 
   prestashop.adapter.order.command_handler.issue_return_product_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\IssueReturnProductHandler
@@ -170,9 +154,8 @@ services:
       - '@prestashop.adapter.order.refund.updater'
       - '@prestashop.adapter.context_state_manager'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Order\Command\IssueReturnProductCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\IssueReturnProductCommand
 
   prestashop.adapter.order.refund.order_refund_calculator:
     class: PrestaShop\PrestaShop\Adapter\Order\Refund\OrderRefundCalculator
@@ -201,16 +184,14 @@ services:
       - '@prestashop.adapter.context_state_manager'
       - '@prestashop.adapter.order.product_quantity.updater'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Order\Product\Command\DeleteProductFromOrderCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Order\Product\Command\DeleteProductFromOrderCommand
 
   prestashop.adapter.order.command_handler.bulk_change_order_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Order\CommandHandler\BulkChangeOrderStatusHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Order\Command\BulkChangeOrderStatusCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Order\Command\BulkChangeOrderStatusCommand'
 
   prestashop.adapter.order.query_handler.get_order_for_viewing_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\QueryHandler\GetOrderForViewingHandler
@@ -224,9 +205,8 @@ services:
       - '@prestashop.adapter.legacy.configuration'
       - '@prestashop.adapter.address.formatter'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Order\Query\GetOrderForViewing
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Order\Query\GetOrderForViewing
 
   prestashop.adapter.order.query_handler.get_order_products_for_viewing_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\QueryHandler\GetOrderProductsForViewingHandler
@@ -235,17 +215,15 @@ services:
       - '@=service("prestashop.adapter.legacy.context").getContext().language.id'
       - "@prestashop.core.localization.locale.context_locale"
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Order\Query\GetOrderProductsForViewing
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Order\Query\GetOrderProductsForViewing
 
 
   prestashop.adapter.order.command_handler.resend_order_email_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\ResendOrderEmailHandler
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Order\Command\ResendOrderEmailCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\ResendOrderEmailCommand
 
   prestashop.adapter.order.query_handler.get_order_preview_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Order\QueryHandler\GetOrderPreviewHandler'
@@ -254,9 +232,8 @@ services:
       - "@=service('prestashop.adapter.legacy.context').getContext().language.getLocale()"
       - '@prestashop.adapter.address.formatter'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Order\Query\GetOrderPreview'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Order\Query\GetOrderPreview'
 
   prestashop.adapter.order.command_handler.send_process_order_email_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\SendProcessOrderEmailHandler
@@ -264,9 +241,8 @@ services:
       - '@translator'
       - '@=service("prestashop.adapter.legacy.context").getContext().link'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Order\Command\SendProcessOrderEmailCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\SendProcessOrderEmailCommand
 
   prestashop.adapter.order.command_handler.cancel_order_product_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\CancelOrderProductHandler
@@ -275,9 +251,8 @@ services:
       - '@logger'
       - '@translator'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Order\Command\CancelOrderProductCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\CancelOrderProductCommand
 
   prestashop.adapter.order.order_sibling_provider:
     class: PrestaShop\PrestaShop\Adapter\Order\OrderSiblingProvider
@@ -306,9 +281,8 @@ services:
   prestashop.adapter.order.command_handler.set_internal_order_note_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\SetInternalOrderNoteHandler
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Order\Command\SetInternalOrderNoteCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\SetInternalOrderNoteCommand
 
   prestashop.adapter.order.repository.order_repository:
     class: PrestaShop\PrestaShop\Adapter\Order\Repository\OrderRepository
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/order_message.yml b/src/PrestaShopBundle/Resources/config/services/adapter/order_message.yml
index 7f4c30ca37a25..fc26abc133a98 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/order_message.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/order_message.yml
@@ -5,37 +5,32 @@ services:
   prestashop.adapter.order_message.command_handler.add_order_message_handler:
     class: PrestaShop\PrestaShop\Adapter\OrderMessage\CommandHandler\AddOrderMessageHandler
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\OrderMessage\Command\AddOrderMessageCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\OrderMessage\Command\AddOrderMessageCommand
 
   prestashop.adapter.order_message.command_handler.edit_order_message_handler:
     class: PrestaShop\PrestaShop\Adapter\OrderMessage\CommandHandler\EditOrderMessageHandler
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\OrderMessage\Command\EditOrderMessageCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\OrderMessage\Command\EditOrderMessageCommand
 
   prestashop.adapter.order_message.query_handler.get_order_message_for_editing_handler:
     class: PrestaShop\PrestaShop\Adapter\OrderMessage\QueryHandler\GetOrderMessageForEditingHandler
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\OrderMessage\Query\GetOrderMessageForEditing
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\OrderMessage\Query\GetOrderMessageForEditing
 
   prestashop.adapter.order_message.command_handler.delete_order_message_handler:
     class: PrestaShop\PrestaShop\Adapter\OrderMessage\CommandHandler\DeleteOrderMessageHandler
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\OrderMessage\Command\DeleteOrderMessageCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\OrderMessage\Command\DeleteOrderMessageCommand
 
   prestashop.adapter.order_message.command_handler.bulk_delete_order_message_handler:
     class: PrestaShop\PrestaShop\Adapter\OrderMessage\CommandHandler\BulkDeleteOrderMessageHandler
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\OrderMessage\Command\BulkDeleteOrderMessageCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\OrderMessage\Command\BulkDeleteOrderMessageCommand
 
   prestashop.adapter.order_message.order_message_provider:
     class: 'PrestaShop\PrestaShop\Adapter\OrderMessage\OrderMessageProvider'
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/order_return.yml b/src/PrestaShopBundle/Resources/config/services/adapter/order_return.yml
index 212c19a7711ff..ea59be8cb3a51 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/order_return.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/order_return.yml
@@ -5,9 +5,8 @@ services:
   prestashop.adapter.order_return.query_handler.get_order_return_for_editing_handler:
     class: 'PrestaShop\PrestaShop\Adapter\OrderReturn\QueryHandler\GetOrderReturnForEditingHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\OrderReturn\Query\GetOrderReturnForEditing'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\OrderReturn\Query\GetOrderReturnForEditing'
     arguments:
       - '@prestashop.adapter.order_return.repository.order_return_repository'
       - '@PrestaShop\PrestaShop\Adapter\Customer\Repository\CustomerRepository'
@@ -16,9 +15,8 @@ services:
   prestashop.adapter.order_return.command_handler.update_order_return_state_handler:
     class: 'PrestaShop\PrestaShop\Adapter\OrderReturn\CommandHandler\UpdateOrderReturnStateHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\OrderReturn\Command\UpdateOrderReturnStateCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\OrderReturn\Command\UpdateOrderReturnStateCommand'
     arguments:
       - '@prestashop.adapter.order_return.repository.order_return_repository'
       - '@prestashop.adapter.order_return_state.repository.order_return_state_repository'
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/order_return_state.yml b/src/PrestaShopBundle/Resources/config/services/adapter/order_return_state.yml
index c676ffb836542..8b7d51ef829e2 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/order_return_state.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/order_return_state.yml
@@ -5,23 +5,20 @@ services:
   prestashop.adapter.order_return_state.command_handler.add_order_return_state:
     class: 'PrestaShop\PrestaShop\Adapter\OrderReturnState\CommandHandler\AddOrderReturnStateHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Command\AddOrderReturnStateCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Command\AddOrderReturnStateCommand'
 
   prestashop.adapter.order_return_state.query_handler.get_order_return_state_for_editing:
     class: 'PrestaShop\PrestaShop\Adapter\OrderReturnState\QueryHandler\GetOrderReturnStateForEditingHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Query\GetOrderReturnStateForEditing'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Query\GetOrderReturnStateForEditing'
 
   prestashop.adapter.order_return_state.command_handler.edit_order_return_state_handler:
     class: 'PrestaShop\PrestaShop\Adapter\OrderReturnState\CommandHandler\EditOrderReturnStateHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Command\EditOrderReturnStateCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Command\EditOrderReturnStateCommand'
 
   prestashop.adapter.order_return_state.repository.order_return_state_repository:
     class: 'PrestaShop\PrestaShop\Adapter\OrderReturnState\Repository\OrderReturnStateRepository'
@@ -29,13 +26,11 @@ services:
   prestashop.adapter.order_return_state.command_handler.delete_order_return_state_handler:
     class: 'PrestaShop\PrestaShop\Adapter\OrderReturnState\CommandHandler\DeleteOrderReturnStateHandler'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Command\DeleteOrderReturnStateCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Command\DeleteOrderReturnStateCommand'
 
   prestashop.adapter.order_return_state.command_handler.bulk_delete_order_return_state_handler:
     class: 'PrestaShop\PrestaShop\Adapter\OrderReturnState\CommandHandler\BulkDeleteOrderReturnStateHandler'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Command\BulkDeleteOrderReturnStateCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Command\BulkDeleteOrderReturnStateCommand'
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/order_state.yml b/src/PrestaShopBundle/Resources/config/services/adapter/order_state.yml
index 6dedfc1cb8b47..c5ab403a1bea4 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/order_state.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/order_state.yml
@@ -5,30 +5,27 @@ services:
   prestashop.adapter.order_state.command_handler.add_order_state:
     class: 'PrestaShop\PrestaShop\Adapter\OrderState\CommandHandler\AddOrderStateHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\OrderState\Command\AddOrderStateCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\OrderState\Command\AddOrderStateCommand'
 
   prestashop.adapter.order_state.query_handler.get_order_state_for_editing:
     class: 'PrestaShop\PrestaShop\Adapter\OrderState\QueryHandler\GetOrderStateForEditingHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\OrderState\Query\GetOrderStateForEditing'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\OrderState\Query\GetOrderStateForEditing'
 
   prestashop.adapter.order_state.command_handler.edit_order_state_handler:
     class: 'PrestaShop\PrestaShop\Adapter\OrderState\CommandHandler\EditOrderStateHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\OrderState\Command\EditOrderStateCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\OrderState\Command\EditOrderStateCommand'
 
   prestashop.adapter.order_state.command_handler.delete_order_state_handler:
     class: 'PrestaShop\PrestaShop\Adapter\OrderState\CommandHandler\DeleteOrderStateHandler'
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\OrderState\Command\DeleteOrderStateCommand', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\OrderState\Command\DeleteOrderStateCommand' }
 
   prestashop.adapter.order_state.command_handler.bulk_delete_order_state_handler:
     class: 'PrestaShop\PrestaShop\Adapter\OrderState\CommandHandler\BulkDeleteOrderStateHandler'
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\OrderState\Command\BulkDeleteOrderStateCommand', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\OrderState\Command\BulkDeleteOrderStateCommand' }
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product.yml
index 943fcda0f1eb9..3498cebc6ce83 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/product.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/product.yml
@@ -67,9 +67,8 @@ services:
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\AssignProductToCategoryHandler:
     autowire: true
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Command\AssignProductToCategoryCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\AssignProductToCategoryCommand
 
   PrestaShop\PrestaShop\Adapter\Product\QueryHandler\SearchProductsHandler:
     arguments:
@@ -79,23 +78,20 @@ services:
       - '@PrestaShop\PrestaShop\Core\Currency\CurrencyDataProviderInterface'
       - '@PrestaShop\PrestaShop\Adapter\ContextStateManager'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Query\SearchProducts
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Query\SearchProducts
 
   PrestaShop\PrestaShop\Adapter\Product\QueryHandler\SearchProductsForAssociationHandler:
     autowire: true
     public: false
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Query\SearchProductsForAssociation
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Query\SearchProductsForAssociation
 
   PrestaShop\PrestaShop\Adapter\Product\QueryHandler\GetProductIsEnabledHandler:
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Query\GetProductIsEnabled
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Query\GetProductIsEnabled
 
   PrestaShop\PrestaShop\Adapter\Product\Grid\Data\Factory\ProductGridDataFactoryDecorator:
     arguments:
@@ -133,25 +129,22 @@ services:
     arguments:
       $countryId: '@=service("PrestaShop\\PrestaShop\\Adapter\\Configuration").getInt("PS_COUNTRY_DEFAULT")'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Query\GetProductForEditing
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Query\GetProductForEditing
 
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\AddProductHandler:
     autowire: true
     public: false
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Command\AddProductCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\AddProductCommand
 
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\SetProductTagsHandler:
     autowire: true
     public: false
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Command\SetProductTagsCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\SetProductTagsCommand
 
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\UpdateProductsPositionsHandler:
     arguments:
@@ -159,89 +152,78 @@ services:
       - '@PrestaShop\PrestaShop\Core\Grid\Position\PositionUpdateFactoryInterface'
       - '@PrestaShop\PrestaShop\Core\Grid\Position\GridPositionUpdaterInterface'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Command\UpdateProductsPositionsCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\UpdateProductsPositionsCommand
 
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\RemoveAllProductTagsHandler:
     autowire: true
     public: false
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Command\RemoveAllProductTagsCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\RemoveAllProductTagsCommand
 
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\SetAssociatedProductCategoriesHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductCategoryUpdater'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Command\SetAssociatedProductCategoriesCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\SetAssociatedProductCategoriesCommand
 
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\RemoveAllAssociatedProductCategoriesHandler:
     autowire: true
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Command\RemoveAllAssociatedProductCategoriesCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\RemoveAllAssociatedProductCategoriesCommand
 
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\SetCarriersHandler:
     autowire: true
     public: false
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Command\SetCarriersCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\SetCarriersCommand
 
   PrestaShop\PrestaShop\Adapter\Product\QueryHandler\GetProductSupplierOptionsHandler:
     autowire: true
     public: false
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Query\GetProductSupplierOptions
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Query\GetProductSupplierOptions
 
   PrestaShop\PrestaShop\Adapter\Product\Supplier\QueryHandler\GetAssociatedSuppliersHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Repository\ProductSupplierRepository'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Query\GetAssociatedSuppliers
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Query\GetAssociatedSuppliers
 
   PrestaShop\PrestaShop\Adapter\Product\Supplier\CommandHandler\SetSuppliersHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Command\SetSuppliersCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Command\SetSuppliersCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Supplier\CommandHandler\SetProductDefaultSupplierHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Command\SetProductDefaultSupplierCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Command\SetProductDefaultSupplierCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Supplier\CommandHandler\UpdateProductSuppliersHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater'
       - '@PrestaShop\PrestaShop\Adapter\Product\Repository\ProductSupplierRepository'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Command\UpdateProductSuppliersCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Command\UpdateProductSuppliersCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Supplier\CommandHandler\RemoveAllAssociatedProductSuppliersHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Command\RemoveAllAssociatedProductSuppliersCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Command\RemoveAllAssociatedProductSuppliersCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Update\ProductAttachmentUpdater:
     autowire: true
@@ -265,48 +247,42 @@ services:
     autowire: true
     public: false
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Command\DeleteProductCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\DeleteProductCommand
 
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\BulkDeleteProductHandler:
     autowire: true
     public: false
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Command\BulkDeleteProductCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\BulkDeleteProductCommand
 
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\BulkDuplicateProductHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductDuplicator'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Command\BulkDuplicateProductCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\BulkDuplicateProductCommand
 
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\BulkUpdateProductStatusHandler:
     autowire: true
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Command\BulkUpdateProductStatusCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\BulkUpdateProductStatusCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Attachment\CommandHandler\SetAssociatedProductAttachmentsHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductAttachmentUpdater'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Attachment\Command\SetAssociatedProductAttachmentsCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Attachment\Command\SetAssociatedProductAttachmentsCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Attachment\CommandHandler\RemoveAllAssociatedProductAttachmentsHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductAttachmentUpdater'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Attachment\Command\RemoveAllAssociatedProductAttachmentsCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Attachment\Command\RemoveAllAssociatedProductAttachmentsCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Validate\ProductSupplierValidator:
     autowire: true
@@ -332,25 +308,22 @@ services:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\RelatedProductsUpdater'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Command\SetRelatedProductsCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\SetRelatedProductsCommand
 
   PrestaShop\PrestaShop\Adapter\Product\QueryHandler\GetRelatedProductsHandler:
     autowire: true
     public: false
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Query\GetRelatedProducts
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Query\GetRelatedProducts
 
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\RemoveAllRelatedProductsHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\RelatedProductsUpdater'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Command\RemoveAllRelatedProductsCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\RemoveAllRelatedProductsCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Repository\TagRepository:
     arguments:
@@ -370,9 +343,8 @@ services:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductDuplicator'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Command\DuplicateProductCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\DuplicateProductCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Update\ProductDuplicator:
     autowire: true
@@ -385,9 +357,8 @@ services:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductTypeUpdater'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Command\UpdateProductTypeCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\UpdateProductTypeCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Update\ProductIndexationUpdater:
     arguments:
@@ -406,9 +377,8 @@ services:
     autowire: true
     public: false
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Shop\Command\SetProductShopsCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Shop\Command\SetProductShopsCommand
 
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\UpdateProductHandler:
     autowire: true
@@ -416,17 +386,15 @@ services:
     arguments:
       $productUpdatablePropertyFiller: '@PrestaShop\PrestaShop\Adapter\Product\Update\Filler\ProductFiller'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Command\UpdateProductCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\UpdateProductCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Stock\CommandHandler\UpdateProductStockAvailableHandler:
     autowire: true
     public: false
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Stock\Command\UpdateProductStockAvailableCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Stock\Command\UpdateProductStockAvailableCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Update\Filler\ProductFiller:
     arguments:
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product/_combination.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product/_combination.yml
index 2ba9bbf7e7f29..bfb5dd868df2f 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/product/_combination.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/product/_combination.yml
@@ -7,23 +7,20 @@ services:
       - '@PrestaShop\PrestaShop\Adapter\Product\Combination\Create\CombinationCreator'
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\GenerateProductCombinationsCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\GenerateProductCombinationsCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler\UpdateCombinationHandler:
     autowire: true
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\UpdateCombinationCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\UpdateCombinationCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler\UpdateCombinationStockAvailableHandler:
     autowire: true
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\UpdateCombinationStockAvailableCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\UpdateCombinationStockAvailableCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Combination\QueryHandler\GetCombinationForEditingHandler:
     autowire: true
@@ -31,9 +28,8 @@ services:
     arguments:
       $contextLanguageId: "@=service('prestashop.adapter.legacy.context').getContext().language.id"
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\GetCombinationForEditing
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\GetCombinationForEditing
 
   PrestaShop\PrestaShop\Adapter\Product\Combination\QueryHandler\GetEditableCombinationsListHandler:
     autowire: true
@@ -41,17 +37,15 @@ services:
     arguments:
       $combinationQueryBuilder: '@PrestaShop\PrestaShop\Core\Grid\Query\ProductCombinationQueryBuilder'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\GetEditableCombinationsList
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\GetEditableCombinationsList
 
   PrestaShop\PrestaShop\Adapter\Product\Combination\QueryHandler\SearchCombinationsForAssociationHandler:
     autowire: true
     public: false
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\SearchCombinationsForAssociation
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\SearchCombinationsForAssociation
 
   PrestaShop\PrestaShop\Adapter\Product\Combination\Validate\CombinationValidator: ~
 
@@ -93,64 +87,56 @@ services:
       - '@PrestaShop\PrestaShop\Adapter\Product\Repository\ProductSupplierRepository'
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\UpdateCombinationSuppliersCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\UpdateCombinationSuppliersCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Combination\QueryHandler\GetCombinationSuppliersHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Repository\ProductSupplierRepository'
       - '@PrestaShop\PrestaShop\Adapter\Product\Combination\Repository\CombinationRepository'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\GetCombinationSuppliers
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\GetCombinationSuppliers
 
   PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler\SetCombinationImagesHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Combination\Update\CombinationImagesUpdater'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\SetCombinationImagesCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\SetCombinationImagesCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler\RemoveAllCombinationImagesHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Combination\Update\CombinationImagesUpdater'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\RemoveAllCombinationImagesCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\RemoveAllCombinationImagesCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler\DeleteCombinationHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Combination\Update\CombinationDeleter'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\DeleteCombinationCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\DeleteCombinationCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler\BulkDeleteCombinationHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Combination\Update\CombinationDeleter'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\BulkDeleteCombinationCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\BulkDeleteCombinationCommand
 
   PrestaShop\PrestaShop\Core\Domain\Product\Combination\QueryHandler\SearchProductCombinationsHandler:
     autowire: true
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\SearchProductCombinations
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\SearchProductCombinations
 
   PrestaShop\PrestaShop\Core\Domain\Product\Combination\QueryHandler\GetCombinationIdsHandler:
     autowire: true
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\GetCombinationIds
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\GetCombinationIds
 
   PrestaShop\PrestaShop\Adapter\Product\Combination\Update\Filler\CombinationFiller:
     arguments:
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product/_customization.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product/_customization.yml
index c192a1898dd08..8d8c723d5e159 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/product/_customization.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/product/_customization.yml
@@ -22,23 +22,20 @@ services:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Customization\Repository\CustomizationFieldRepository'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Customization\Query\GetProductCustomizationFields
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Customization\Query\GetProductCustomizationFields
 
   PrestaShop\PrestaShop\Adapter\Product\Customization\CommandHandler\SetProductCustomizationFieldsHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Customization\Repository\CustomizationFieldRepository'
       - '@PrestaShop\PrestaShop\Adapter\Product\Customization\Update\ProductCustomizationFieldUpdater'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Customization\Command\SetProductCustomizationFieldsCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Customization\Command\SetProductCustomizationFieldsCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Customization\CommandHandler\RemoveAllCustomizationFieldsFromProductHandler:
     autowire: true
     public: false
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Customization\Command\RemoveAllCustomizationFieldsFromProductCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Customization\Command\RemoveAllCustomizationFieldsFromProductCommand
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product/_feature_value.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product/_feature_value.yml
index 93a1e5530f639..c659664317fbe 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/product/_feature_value.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/product/_feature_value.yml
@@ -6,25 +6,22 @@ services:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\FeatureValue\Update\ProductFeatureValueUpdater'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\FeatureValue\Command\SetProductFeatureValuesCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\FeatureValue\Command\SetProductFeatureValuesCommand
 
   PrestaShop\PrestaShop\Adapter\Product\FeatureValue\CommandHandler\RemoveAllFeatureValuesFromProductHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\FeatureValue\Update\ProductFeatureValueUpdater'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\FeatureValue\Command\RemoveAllFeatureValuesFromProductCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\FeatureValue\Command\RemoveAllFeatureValuesFromProductCommand
 
   PrestaShop\PrestaShop\Adapter\Product\FeatureValue\QueryHandler\GetProductFeatureValuesHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureValueRepository'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\FeatureValue\Query\GetProductFeatureValues
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\FeatureValue\Query\GetProductFeatureValues
 
   PrestaShop\PrestaShop\Adapter\Product\FeatureValue\Update\ProductFeatureValueUpdater:
     autowire: true
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product/_image.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product/_image.yml
index bb3be3d49053e..de0a739d32683 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/product/_image.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/product/_image.yml
@@ -6,9 +6,8 @@ services:
     autowire: true
     public: false
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Image\Command\AddProductImageCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Image\Command\AddProductImageCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Image\CommandHandler\UpdateProductImageHandler:
     arguments:
@@ -17,49 +16,43 @@ services:
       - '@PrestaShop\PrestaShop\Adapter\Product\Image\Uploader\ProductImageUploader'
       - '@PrestaShop\PrestaShop\Adapter\Image\ProductImageFileValidator'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Image\Command\UpdateProductImageCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Image\Command\UpdateProductImageCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Image\CommandHandler\DeleteProductImageHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Image\Update\ProductImageUpdater'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Image\Command\DeleteProductImageCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Image\Command\DeleteProductImageCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Image\CommandHandler\SetProductImagesForAllShopHandler:
     autowire: true
     public: false
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Image\Command\SetProductImagesForAllShopCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Image\Command\SetProductImagesForAllShopCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Image\QueryHandler\GetProductImagesHandler:
     autowire: true
     public: false
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Image\Query\GetProductImages
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Image\Query\GetProductImages
 
   PrestaShop\PrestaShop\Adapter\Product\Image\QueryHandler\GetShopProductImagesHandler:
     autowire: true
     public: false
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Image\Query\GetShopProductImages
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Image\Query\GetShopProductImages
 
   PrestaShop\PrestaShop\Adapter\Product\Image\QueryHandler\GetProductImageHandler:
     autowire: true
     public: false
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Image\Query\GetProductImage
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Image\Query\GetProductImage
 
   PrestaShop\PrestaShop\Adapter\Product\Image\Validate\ProductImageValidator: ~
 
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product/_pack.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product/_pack.yml
index d65e7c549605e..1d0bdc7485dc6 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/product/_pack.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/product/_pack.yml
@@ -15,17 +15,15 @@ services:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Pack\Update\ProductPackUpdater'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Pack\Command\SetPackProductsCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Pack\Command\SetPackProductsCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Pack\CommandHandler\RemoveAllProductsFromPackHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Pack\Update\ProductPackUpdater'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Pack\Command\RemoveAllProductsFromPackCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Pack\Command\RemoveAllProductsFromPackCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Pack\QueryHandler\GetPackedProductsHandler:
     autowire: true
@@ -34,6 +32,5 @@ services:
       $defaultLangId: '@=service("prestashop.adapter.legacy.context").getContext().language.id'
       $translator: '@translator'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Pack\Query\GetPackedProducts
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Pack\Query\GetPackedProducts
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product/_specific_prices.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product/_specific_prices.yml
index 43e0ff991b1db..6a666a7b42c7d 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/product/_specific_prices.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/product/_specific_prices.yml
@@ -8,58 +8,51 @@ services:
       - '@PrestaShop\PrestaShop\Adapter\Attribute\Repository\AttributeRepository'
       - '@PrestaShop\PrestaShop\Core\Product\Combination\NameBuilder\CombinationNameBuilderInterface'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Query\GetSpecificPriceList
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Query\GetSpecificPriceList
 
   PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\QueryHandler\GetSpecificPriceForEditingHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Repository\SpecificPriceRepository'
       - '@PrestaShop\PrestaShop\Adapter\Customer\Repository\CustomerRepository'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Query\GetSpecificPriceForEditing
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Query\GetSpecificPriceForEditing
 
   PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\CommandHandler\AddSpecificPriceHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Repository\SpecificPriceRepository'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\AddSpecificPriceCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\AddSpecificPriceCommand
 
   PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\CommandHandler\EditSpecificPriceHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Repository\SpecificPriceRepository'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\EditSpecificPriceCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\EditSpecificPriceCommand
 
   PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\CommandHandler\DeleteSpecificPriceHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Repository\SpecificPriceRepository'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\DeleteSpecificPriceCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\DeleteSpecificPriceCommand
 
   PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\CommandHandler\SetSpecificPricePriorityForProductHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Update\SpecificPricePriorityUpdater'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\SetSpecificPricePriorityForProductCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\SetSpecificPricePriorityForProductCommand
 
   PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\CommandHandler\RemoveSpecificPricePriorityForProductHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Update\SpecificPricePriorityUpdater'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\RemoveSpecificPricePriorityForProductCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\RemoveSpecificPricePriorityForProductCommand
 
   PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Update\SpecificPricePriorityUpdater:
     public: true
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product/_stock.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product/_stock.yml
index 542f1cff68cc2..629a2d845b6d8 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/product/_stock.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/product/_stock.yml
@@ -26,9 +26,8 @@ services:
       - '@PrestaShop\PrestaShop\Adapter\Product\Stock\Repository\StockMovementRepository'
       - '@translator'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Stock\Query\GetProductStockMovements
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Stock\Query\GetProductStockMovements
 
   PrestaShop\PrestaShop\Adapter\Product\Stock\QueryHandler\GetCombinationStockMovementsHandler:
     arguments:
@@ -36,9 +35,8 @@ services:
       - '@PrestaShop\PrestaShop\Adapter\Product\Stock\Repository\StockMovementRepository'
       - '@translator'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\Stock\Query\GetCombinationStockMovements
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\Stock\Query\GetCombinationStockMovements
 
   PrestaShop\PrestaShop\Adapter\Product\Stock\Update\ProductStockUpdater:
     autowire: true
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product/_virtual_product.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product/_virtual_product.yml
index 6c2cd3e777447..32cdcc4d6c68e 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/product/_virtual_product.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/product/_virtual_product.yml
@@ -6,18 +6,16 @@ services:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\Update\VirtualProductUpdater'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\VirtualProductFile\Command\AddVirtualProductFileCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\VirtualProductFile\Command\AddVirtualProductFileCommand
 
   PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\CommandHandler\UpdateVirtualProductFileHandler:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\Update\VirtualProductUpdater'
       - '@PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\Repository\VirtualProductFileRepository'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\VirtualProductFile\Command\UpdateVirtualProductFileCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\VirtualProductFile\Command\UpdateVirtualProductFileCommand
 
   PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\Update\VirtualProductUpdater:
     autowire: true
@@ -42,6 +40,5 @@ services:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\Update\VirtualProductUpdater'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\Product\VirtualProductFile\Command\DeleteVirtualProductFileCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\Product\VirtualProductFile\Command\DeleteVirtualProductFileCommand
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/profile.yml b/src/PrestaShopBundle/Resources/config/services/adapter/profile.yml
index 1f019759a47de..47a12b1a935df 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/profile.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/profile.yml
@@ -9,9 +9,8 @@ services:
       - '@=service("prestashop.adapter.legacy.configuration").get("_PS_ADMIN_PROFILE_")'
       - '@prestashop.adapter.data_provider.employee'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Profile\Command\DeleteProfileCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\Profile\Command\DeleteProfileCommand'
 
   prestashop.adapter.profile.command_handler.bulk_delete_profile:
     class: 'PrestaShop\PrestaShop\Adapter\Profile\CommandHandler\BulkDeleteProfileHandler'
@@ -19,23 +18,20 @@ services:
       - '@=service("prestashop.adapter.legacy.configuration").get("_PS_ADMIN_PROFILE_")'
       - '@prestashop.adapter.data_provider.employee'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Profile\Command\BulkDeleteProfileCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\Profile\Command\BulkDeleteProfileCommand'
 
   prestashop.adapter.profile.command_handler.add_profile_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Profile\CommandHandler\AddProfileHandler'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Profile\Command\AddProfileCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\Profile\Command\AddProfileCommand'
 
   prestashop.adapter.profile.command_handler.edit_profile_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Profile\CommandHandler\EditProfileHandler'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Profile\Command\EditProfileCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\Profile\Command\EditProfileCommand'
 
   prestashop.adapter.profile.query_handler.get_profile_for_editing_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Profile\QueryHandler\GetProfileForEditingHandler'
@@ -44,16 +40,14 @@ services:
       - '@prestashop.core.image.parser.image_tag_source_parser'
       - !php/const _PS_PROFILE_IMG_DIR_
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Profile\Query\GetProfileForEditing'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\Profile\Query\GetProfileForEditing'
 
   prestashop.adapter.profile.permission.command_handler.update_tab_permissions_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Profile\Permission\CommandHandler\UpdateTabPermissionsHandler'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Profile\Permission\Command\UpdateTabPermissionsCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\Profile\Permission\Command\UpdateTabPermissionsCommand'
 
   prestashop.adapter.profile.permission.query_handler.get_permissions_for_configuration_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Profile\Permission\QueryHandler\GetPermissionsForConfigurationHandler'
@@ -65,13 +59,11 @@ services:
         - 'AdminQuickAccesses'
         - 'AdminTabs'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Profile\Permission\Query\GetPermissionsForConfiguration'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\Profile\Permission\Query\GetPermissionsForConfiguration'
 
   prestashop.adapter.profile.permission.command_handler.update_module_permissions_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Profile\Permission\CommandHandler\UpdateModulePermissionsHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Profile\Permission\Command\UpdateModulePermissionsCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Profile\Permission\Command\UpdateModulePermissionsCommand'
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/search_engine.yml b/src/PrestaShopBundle/Resources/config/services/adapter/search_engine.yml
index e47c54466fc36..f1ffd9eb98903 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/search_engine.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/search_engine.yml
@@ -6,35 +6,30 @@ services:
   prestashop.adapter.search_engine.command_handler.add_search_engine_handler:
     class: PrestaShop\PrestaShop\Adapter\SearchEngine\CommandHandler\AddSearchEngineHandler
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\SearchEngine\Command\AddSearchEngineCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\SearchEngine\Command\AddSearchEngineCommand
 
   prestashop.adapter.search_engine.command_handler.bulk_delete_search_engine_handler:
     class: PrestaShop\PrestaShop\Adapter\SearchEngine\CommandHandler\BulkDeleteSearchEngineHandler
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\SearchEngine\Command\BulkDeleteSearchEngineCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\SearchEngine\Command\BulkDeleteSearchEngineCommand
 
   prestashop.adapter.search_engine.command_handler.delete_search_engine_handler:
     class: PrestaShop\PrestaShop\Adapter\SearchEngine\CommandHandler\DeleteSearchEngineHandler
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\SearchEngine\Command\DeleteSearchEngineCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\SearchEngine\Command\DeleteSearchEngineCommand
 
   prestashop.adapter.search_engine.command_handler.edit_search_engine_handler:
     class: PrestaShop\PrestaShop\Adapter\SearchEngine\CommandHandler\EditSearchEngineHandler
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\SearchEngine\Command\EditSearchEngineCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\SearchEngine\Command\EditSearchEngineCommand
 
   # Query Handlers
   prestashop.adapter.search_engine.query_handler.get_search_engine_for_editing_handler:
     class: PrestaShop\PrestaShop\Adapter\SearchEngine\QueryHandler\GetSearchEngineForEditingHandler
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\SearchEngine\Query\GetSearchEngineForEditing
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\SearchEngine\Query\GetSearchEngineForEditing
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/security.yml b/src/PrestaShopBundle/Resources/config/services/adapter/security.yml
index e596809fa1532..8826c6b9b5af5 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/security.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/security.yml
@@ -7,54 +7,48 @@ services:
     arguments:
       - '@prestashop.adapter.security.repository.customer_session_repository'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\DeleteCustomerSessionCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\DeleteCustomerSessionCommand'
 
   prestashop.adapter.security.command_handler.clear_customer_session_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Security\CommandHandler\ClearOutdatedCustomerSessionHandler'
     arguments:
       - '@prestashop.adapter.security.repository.customer_session_repository'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\ClearOutdatedCustomerSessionCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\ClearOutdatedCustomerSessionCommand'
 
   prestashop.adapter.security.command_handler.delete_employee_session_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Security\CommandHandler\DeleteEmployeeSessionHandler'
     arguments:
       - '@prestashop.adapter.security.repository.employee_session_repository'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\DeleteEmployeeSessionCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\DeleteEmployeeSessionCommand'
 
   prestashop.adapter.security.command_handler.clear_employee_session_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Security\CommandHandler\ClearOutdatedEmployeeSessionHandler'
     arguments:
       - '@prestashop.adapter.security.repository.employee_session_repository'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\ClearOutdatedEmployeeSessionCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\ClearOutdatedEmployeeSessionCommand'
 
   prestashop.adapter.security.command_handler.bulk_delete_employees_sessions_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Security\CommandHandler\BulkDeleteEmployeeSessionsHandler'
     arguments:
       - '@prestashop.adapter.security.repository.employee_session_repository'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\BulkDeleteEmployeeSessionsCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\BulkDeleteEmployeeSessionsCommand'
 
   prestashop.adapter.security.command_handler.bulk_delete_customers_sessions_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Security\CommandHandler\BulkDeleteCustomerSessionsHandler'
     arguments:
       - '@prestashop.adapter.security.repository.customer_session_repository'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\BulkDeleteCustomerSessionsCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\BulkDeleteCustomerSessionsCommand'
 
   prestashop.adapter.security.repository.customer_session_repository:
     class: 'PrestaShop\PrestaShop\Adapter\Session\Repository\CustomerSessionRepository'
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/shop.yml b/src/PrestaShopBundle/Resources/config/services/adapter/shop.yml
index f635e3149e6f9..8002a00207a3d 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/shop.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/shop.yml
@@ -9,7 +9,7 @@ services:
       - '@prestashop.core.shop.logo_uploader'
       - '@prestashop.core.hook.dispatcher'
     tags:
-      - { name: messenger.message_handler, handles: 'PrestaShop\PrestaShop\Core\Domain\Shop\Command\UploadLogosCommand', method: handle }
+      - { name: messenger.cqrs_handler, command: 'PrestaShop\PrestaShop\Core\Domain\Shop\Command\UploadLogosCommand' }
 
   prestashop.adapter.shop.url.base_url_provider:
     class: 'PrestaShop\PrestaShop\Adapter\Shop\Url\BaseUrlProvider'
@@ -52,9 +52,8 @@ services:
       - '@=service("prestashop.adapter.legacy.configuration").get("_PS_IMG_")'
       - '@=service("prestashop.adapter.legacy.configuration").get("_PS_IMG_DIR_")'
     tags:
-      - name: 'messenger.message_handler'
-        handles: PrestaShop\PrestaShop\Core\Domain\Shop\Query\GetLogosPaths
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: PrestaShop\PrestaShop\Core\Domain\Shop\Query\GetLogosPaths
 
   prestashop.adapter.shop.query_handler.search_shops_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Shop\QueryHandler\SearchShopsHandler'
@@ -62,9 +61,8 @@ services:
       - '@prestashop.core.admin.shop.repository'
       - '@prestashop.core.admin.shop_group.repository'
     tags:
-      - name: 'messenger.message_handler'
-        handles: PrestaShop\PrestaShop\Core\Domain\Shop\Query\SearchShops
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: PrestaShop\PrestaShop\Core\Domain\Shop\Query\SearchShops
 
   prestashop.adapter.shop.url.product_image_folder_provider:
     class: 'PrestaShop\PrestaShop\Adapter\Shop\Url\ImageFolderProvider'
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/sql_manager.yml b/src/PrestaShopBundle/Resources/config/services/adapter/sql_manager.yml
index 0f664da7e114b..2c2b525fd28e2 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/sql_manager.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/sql_manager.yml
@@ -12,7 +12,7 @@ services:
       - '@prestashop.adapter.sql_manager.sql_query_validator'
       - '@translator'
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\AddSqlRequestCommand', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\AddSqlRequestCommand' }
 
   prestashop.adapter.sql_manager.command_handler.edit_request_sql:
     class: 'PrestaShop\PrestaShop\Adapter\SqlManager\CommandHandler\EditSqlRequestHandler'
@@ -20,37 +20,37 @@ services:
       - '@prestashop.adapter.sql_manager.sql_query_validator'
       - '@translator'
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\EditSqlRequestCommand', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\EditSqlRequestCommand' }
 
   prestashop.adapter.sql_manager.command_handler.delete_request_sql:
     class: 'PrestaShop\PrestaShop\Adapter\SqlManager\CommandHandler\DeleteSqlRequestHandler'
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\DeleteSqlRequestCommand', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\DeleteSqlRequestCommand' }
 
   prestashop.adapter.sql_manager.command_handler.bulk_delete_request_sql:
     class: 'PrestaShop\PrestaShop\Adapter\SqlManager\CommandHandler\BulkDeleteSqlRequestHandler'
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\BulkDeleteSqlRequestCommand', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\BulkDeleteSqlRequestCommand' }
 
   # Query handlers
   prestashop.adapter.sql_manager.query_handler.get_request_sql_for_editing:
     class: 'PrestaShop\PrestaShop\Adapter\SqlManager\QueryHandler\GetSqlRequestForEditingHandler'
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetSqlRequestForEditing', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetSqlRequestForEditing' }
 
   prestashop.adapter.sql_manager.query_handler.get_request_sql_execution_result:
     class: 'PrestaShop\PrestaShop\Adapter\SqlManager\QueryHandler\GetSqlRequestExecutionResultHandler'
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetSqlRequestExecutionResult', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetSqlRequestExecutionResult' }
 
   prestashop.adapter.sql_manager.query_handler.get_database_tables_list:
     class: 'PrestaShop\PrestaShop\Adapter\SqlManager\QueryHandler\GetDatabaseTablesListHandler'
     arguments:
       - '@prestashop.adapter.legacy.configuration'
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetDatabaseTablesList', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetDatabaseTablesList' }
 
   prestashop.adapter.sql_manager.query_handler.get_database_table_fields_list:
     class: 'PrestaShop\PrestaShop\Adapter\SqlManager\QueryHandler\GetDatabaseTableFieldsListHandler'
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetDatabaseTableFieldsList', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetDatabaseTableFieldsList' }
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/state.yml b/src/PrestaShopBundle/Resources/config/services/adapter/state.yml
index 56e7deeb61a49..378091c246970 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/state.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/state.yml
@@ -5,48 +5,41 @@ services:
   prestashop.adapter.state.command_handler.create_state_handler:
     class: 'PrestaShop\PrestaShop\Adapter\State\CommandHandler\AddStateHandler'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\State\Command\AddStateCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\State\Command\AddStateCommand'
 
   prestashop.adapter.state.command_handler.edit_state_handler:
     class: 'PrestaShop\PrestaShop\Adapter\State\CommandHandler\EditStateHandler'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\State\Command\EditStateCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\State\Command\EditStateCommand'
 
   prestashop.adapter.state.command_handler.toggle_state_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\State\CommandHandler\ToggleStateStatusHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\State\Command\ToggleStateStatusCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\State\Command\ToggleStateStatusCommand'
 
   prestashop.adapter.state.query_handler.get_state_for_editing_handler:
     class: 'PrestaShop\PrestaShop\Adapter\State\QueryHandler\GetStateForEditingHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\State\Query\GetStateForEditing'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\State\Query\GetStateForEditing'
 
   prestashop.adapter.state.command_handler.delete_state_handler:
     class: 'PrestaShop\PrestaShop\Adapter\State\CommandHandler\DeleteStateHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\State\Command\DeleteStateCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\State\Command\DeleteStateCommand'
 
   prestashop.adapter.state.command_handler.bulk_delete_state_handler:
     class: 'PrestaShop\PrestaShop\Adapter\State\CommandHandler\BulkDeleteStateHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\State\Command\BulkDeleteStateCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\State\Command\BulkDeleteStateCommand'
 
   prestashop.adapter.state.command_handler.bulk_toggle_state_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\State\CommandHandler\BulkToggleStateStatusHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\State\Command\BulkToggleStateStatusCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\State\Command\BulkToggleStateStatusCommand'
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/store.yml b/src/PrestaShopBundle/Resources/config/services/adapter/store.yml
index 05eec8a278152..b7d9c67d1338a 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/store.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/store.yml
@@ -14,35 +14,35 @@ services:
     arguments:
       - '@prestashop.core.domain.store.repository.store_repository'
     tags:
-      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Store\Query\GetStoreForEditing, method: handle }
+      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Store\Query\GetStoreForEditing }
 
   prestashop.adapter.store.command_handler.toggle_store_status:
     class: 'PrestaShop\PrestaShop\Adapter\Store\CommandHandler\ToggleStoreStatusHandler'
     arguments:
       - '@prestashop.core.domain.store.repository.store_repository'
     tags:
-      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Store\Command\ToggleStoreStatusCommand, method: handle }
+      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Store\Command\ToggleStoreStatusCommand }
 
   prestashop.adapter.store.command_handler.bulk_toggle_store_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Store\CommandHandler\BulkUpdateStoreStatusHandler'
     arguments:
       - '@prestashop.core.domain.store.repository.store_repository'
     tags:
-      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Store\Command\BulkUpdateStoreStatusCommand, method: handle }
+      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Store\Command\BulkUpdateStoreStatusCommand }
 
   prestashop.adapter.store.command_handler.delete_store:
     class: 'PrestaShop\PrestaShop\Adapter\Store\CommandHandler\DeleteStoreHandler'
     arguments:
       - '@prestashop.core.domain.store.repository.store_repository'
     tags:
-      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Store\Command\DeleteStoreCommand, method: handle }
+      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Store\Command\DeleteStoreCommand }
 
   prestashop.adapter.store.command_handler.bulk_delete_store_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Store\CommandHandler\BulkDeleteStoreHandler'
     arguments:
       - '@prestashop.core.domain.store.repository.store_repository'
     tags:
-      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Store\Command\BulkDeleteStoreCommand, method: handle }
+      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Store\Command\BulkDeleteStoreCommand }
 
   # deprecated
   prestashop.core.domain.store.repository.store_repository:
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/supplier.yml b/src/PrestaShopBundle/Resources/config/services/adapter/supplier.yml
index 47749ed92bd61..a067a0111214d 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/supplier.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/supplier.yml
@@ -29,17 +29,15 @@ services:
   prestashop.adapter.supplier.command_handler.toggle_supplier_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler\ToggleSupplierStatusHandler'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\ToggleSupplierStatusCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\ToggleSupplierStatusCommand'
 
   prestashop.adapter.supplier.command_handler.delete_supplier_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler\DeleteSupplierHandler'
     parent: 'prestashop.adapter.supplier.command_handler.abstract_delete_supplier_handler'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\DeleteSupplierCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\DeleteSupplierCommand'
     public: true
 
   prestashop.adapter.supplier.command_handler.delete_supplier_logo_image_handler:
@@ -48,32 +46,28 @@ services:
       - !php/const _PS_SUPP_IMG_DIR_
       - !php/const _PS_TMP_IMG_DIR_
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\DeleteSupplierLogoImageCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\DeleteSupplierLogoImageCommand'
 
   prestashop.adapter.supplier.command_handler.bulk_delete_supplier_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler\BulkDeleteSupplierHandler'
     parent: 'prestashop.adapter.supplier.command_handler.abstract_delete_supplier_handler'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\BulkDeleteSupplierCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\BulkDeleteSupplierCommand'
     public: true
 
   prestashop.adapter.supplier.command_handler.bulk_disable_supplier_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler\BulkDisableSupplierHandler'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\BulkDisableSupplierCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\BulkDisableSupplierCommand'
 
   prestashop.adapter.supplier.command_handler.bulk_enable_supplier_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler\BulkEnableSupplierHandler'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\BulkEnableSupplierCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\BulkEnableSupplierCommand'
 
   prestashop.adapter.supplier.query_handler.get_supplier_for_viewing_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Supplier\QueryHandler\GetSupplierForViewingHandler'
@@ -81,31 +75,27 @@ services:
       - '@prestashop.core.localization.locale.context_locale'
       - '@=service("prestashop.adapter.legacy.configuration").get("PS_CURRENCY_DEFAULT")'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Query\GetSupplierForViewing'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Query\GetSupplierForViewing'
 
   prestashop.adapter.supplier.command_handler.add_supplier_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler\AddSupplierHandler'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\AddSupplierCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\AddSupplierCommand'
 
   prestashop.adapter.supplier.query_handler.get_supplier_for_editing:
     class: 'PrestaShop\PrestaShop\Adapter\Supplier\QueryHandler\GetSupplierForEditingHandler'
     arguments:
       - '@prestashop.core.image.parser.image_tag_source_parser'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Query\GetSupplierForEditing'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Query\GetSupplierForEditing'
 
   prestashop.adapter.supplier.command_handler.edit_supplier_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler\EditSupplierHandler'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\EditSupplierCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\EditSupplierCommand'
 
   PrestaShop\PrestaShop\Adapter\Supplier\Repository\SupplierRepository: ~
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/tab.yml b/src/PrestaShopBundle/Resources/config/services/adapter/tab.yml
index 41008f8aab83d..f84b658d3057d 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/tab.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/tab.yml
@@ -7,4 +7,4 @@ services:
     arguments:
       - '@doctrine.orm.entity_manager'
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Tab\Command\UpdateTabStatusByClassNameCommand', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Tab\Command\UpdateTabStatusByClassNameCommand' }
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/tax.yml b/src/PrestaShopBundle/Resources/config/services/adapter/tax.yml
index d0a2ab93da507..76dedbdba4b6e 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/tax.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/tax.yml
@@ -17,40 +17,37 @@ services:
   prestashop.adapter.tax.command_handler.delete_tax_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Tax\CommandHandler\DeleteTaxHandler'
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\DeleteTaxCommand', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\DeleteTaxCommand' }
 
   prestashop.adapter.tax.command_handler.toggle_tax_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Tax\CommandHandler\ToggleTaxStatusHandler'
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\ToggleTaxStatusCommand', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\ToggleTaxStatusCommand' }
 
   prestashop.adapter.tax.command_handler.bulk_toggle_tax_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Tax\CommandHandler\BulkToggleTaxStatusHandler'
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\BulkToggleTaxStatusCommand', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\BulkToggleTaxStatusCommand' }
 
   prestashop.adapter.tax.command_handler.bulk_delete_tax_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Tax\CommandHandler\BulkDeleteTaxHandler'
     tags:
-      - { name: 'messenger.message_handler', handles: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\BulkDeleteTaxCommand', method: handle }
+      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\BulkDeleteTaxCommand' }
 
   prestashop.adapter.tax.query_handler.get_tax_for_editing_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Tax\QueryHandler\GetTaxForEditingHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Tax\Query\GetTaxForEditing'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Tax\Query\GetTaxForEditing'
 
   prestashop.adapter.tax.command_handler.edit_tax_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Tax\CommandHandler\EditTaxHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\EditTaxCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\EditTaxCommand'
 
   prestashop.adapter.tax.command_handler.add_tax_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Tax\CommandHandler\AddTaxHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\AddTaxCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\AddTaxCommand'
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/tax_rules_group.yml b/src/PrestaShopBundle/Resources/config/services/adapter/tax_rules_group.yml
index b9da781ce5292..e4dcdfc156520 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/tax_rules_group.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/tax_rules_group.yml
@@ -5,51 +5,44 @@ services:
   PrestaShop\PrestaShop\Adapter\TaxRulesGroup\CommandHandler\AddTaxRulesGroupHandler:
     autowire: true
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\AddTaxRulesGroupCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\AddTaxRulesGroupCommand'
 
   PrestaShop\PrestaShop\Adapter\TaxRulesGroup\CommandHandler\EditTaxRulesGroupHandler:
     autowire: true
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\EditTaxRulesGroupCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\EditTaxRulesGroupCommand'
 
   prestashop.adapter.tax_rules_group.command_handler.delete_tax_rules_group_handler:
     class: 'PrestaShop\PrestaShop\Adapter\TaxRulesGroup\CommandHandler\DeleteTaxRulesGroupHandler'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\DeleteTaxRulesGroupCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\DeleteTaxRulesGroupCommand'
 
   prestashop.adapter.tax_rules_group.command_handler.bulk_delete_tax_rules_group_handler:
     class: 'PrestaShop\PrestaShop\Adapter\TaxRulesGroup\CommandHandler\BulkDeleteTaxRulesGroupHandler'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\BulkDeleteTaxRulesGroupCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\BulkDeleteTaxRulesGroupCommand'
 
   prestashop.adapter.tax_rules_group.command_handler.bulk_set_tax_rules_group_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\TaxRulesGroup\CommandHandler\BulkSetTaxRulesGroupStatusHandler'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\BulkSetTaxRulesGroupStatusCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\BulkSetTaxRulesGroupStatusCommand'
 
   prestashop.adapter.tax_rules_group.query_handler.get_tax_rules_group_for_editing:
     class: 'PrestaShop\PrestaShop\Adapter\TaxRulesGroup\QueryHandler\GetTaxRulesGroupForEditingHandler'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Query\GetTaxRulesGroupForEditing'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Query\GetTaxRulesGroupForEditing'
 
   prestashop.adapter.tax_rules_group.command_handler.set_tax_rules_group_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\TaxRulesGroup\CommandHandler\SetTaxRulesGroupStatusHandler'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\SetTaxRulesGroupStatusCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\SetTaxRulesGroupStatusCommand'
 
   PrestaShop\PrestaShop\Adapter\TaxRulesGroup\Repository\TaxRulesGroupRepository:
     arguments:
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/title.yml b/src/PrestaShopBundle/Resources/config/services/adapter/title.yml
index 96afb46f0e916..a5d8e750d07b9 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/title.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/title.yml
@@ -5,16 +5,14 @@ services:
   PrestaShop\PrestaShop\Adapter\Title\CommandHandler\AddTitleHandler:
     autowire: true
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Title\Command\AddTitleCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\Title\Command\AddTitleCommand'
 
   PrestaShop\PrestaShop\Adapter\Title\CommandHandler\EditTitleHandler:
     autowire: true
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Title\Command\EditTitleCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\Title\Command\EditTitleCommand'
 
   prestashop.adapter.title.title_image_thumbnail_provider:
     class: 'PrestaShop\PrestaShop\Adapter\Title\TitleImageThumbnailProvider'
@@ -27,24 +25,21 @@ services:
     class: 'PrestaShop\PrestaShop\Adapter\Title\CommandHandler\DeleteTitleHandler'
     autowire: true
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Title\Command\DeleteTitleCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Title\Command\DeleteTitleCommand'
 
   prestashop.adapter.title.command_handler.bulk_delete_title_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Title\CommandHandler\BulkDeleteTitleHandler'
     autowire: true
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Title\Command\BulkDeleteTitleCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Title\Command\BulkDeleteTitleCommand'
 
   PrestaShop\PrestaShop\Adapter\Title\QueryHandler\GetTitleForEditingHandler:
     autowire: true
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Title\Query\GetTitleForEditing'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Title\Query\GetTitleForEditing'
 
   PrestaShop\PrestaShop\Adapter\Title\Repository\TitleRepository:
     autowire: true
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/webservice.yml b/src/PrestaShopBundle/Resources/config/services/adapter/webservice.yml
index 238e6576f0d5b..d567ef3daee9d 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/webservice.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/webservice.yml
@@ -13,20 +13,17 @@ services:
   prestashop.adapter.webservice.query_handler.get_webservice_key_for_editing_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Webservice\QueryHandler\GetWebserviceKeyForEditingHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Webservice\Query\GetWebserviceKeyForEditing'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Webservice\Query\GetWebserviceKeyForEditing'
 
   prestashop.adapter.webservice.command_handler.add_webservice_key_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Webservice\CommandHandler\AddWebserviceKeyHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Webservice\Command\AddWebserviceKeyCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Webservice\Command\AddWebserviceKeyCommand'
 
   prestashop.adapter.webservice.command_handler.edit_webservice_key_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Webservice\CommandHandler\EditWebserviceKeyHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Webservice\Command\EditWebserviceKeyCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Webservice\Command\EditWebserviceKeyCommand'
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/zone.yml b/src/PrestaShopBundle/Resources/config/services/adapter/zone.yml
index 0e7102577636e..6f8d513605ade 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/zone.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/zone.yml
@@ -5,48 +5,41 @@ services:
   prestashop.adapter.zone.command_handler.add_zone_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Zone\CommandHandler\AddZoneHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\AddZoneCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\AddZoneCommand'
 
   prestashop.adapter.zone.command_handler.toggle_zone_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Zone\CommandHandler\ToggleZoneStatusHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\ToggleZoneStatusCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\ToggleZoneStatusCommand'
 
   prestashop.adapter.zone.command_handler.edit_zone_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Zone\CommandHandler\EditZoneHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\EditZoneCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\EditZoneCommand'
 
   prestashop.adapter.zone.query_handler.get_zone_for_editing_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Zone\QueryHandler\GetZoneForEditingHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Zone\Query\GetZoneForEditing'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Zone\Query\GetZoneForEditing'
 
   prestashop.adapter.zone.command_handler.delete_zone_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Zone\CommandHandler\DeleteZoneHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\DeleteZoneCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\DeleteZoneCommand'
 
   prestashop.adapter.zone.command_handler.bulk_delete_zone_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Zone\CommandHandler\BulkDeleteZoneHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\BulkDeleteZoneCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\BulkDeleteZoneCommand'
 
   prestashop.adapter.zone.command_handler.bulk_toggle_zone_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Zone\CommandHandler\BulkToggleZoneStatusHandler'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\BulkToggleZoneStatusCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\BulkToggleZoneStatusCommand'
diff --git a/src/PrestaShopBundle/Resources/config/services/core/domain/authorization_server.yml b/src/PrestaShopBundle/Resources/config/services/core/domain/authorization_server.yml
index e8a27940fe18f..b10e3553307ec 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/domain/authorization_server.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/domain/authorization_server.yml
@@ -8,21 +8,18 @@ services:
 
   PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\CommandHandler\AddApplicationHandler:
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Command\AddApplicationCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Command\AddApplicationCommand'
 
   PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\CommandHandler\EditApplicationHandler:
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Command\EditApplicationCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Command\EditApplicationCommand'
 
   PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\QueryHandler\GetApplicationForEditingHandler:
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Query\GetApplicationForEditing'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Query\GetApplicationForEditing'
 
   PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\CommandHandler\DeleteApplicationHandler:
     tags:
diff --git a/src/PrestaShopBundle/Resources/config/services/core/domain/customer_service.yml b/src/PrestaShopBundle/Resources/config/services/core/domain/customer_service.yml
index 71be8e8c307c0..1be9df24d396a 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/domain/customer_service.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/domain/customer_service.yml
@@ -7,18 +7,16 @@ services:
     arguments:
       - '@prestashop.core.domain.customer_service.repository.customer_thread_repository'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\DeleteCustomerThreadCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\DeleteCustomerThreadCommand
 
   prestashop.core.domain.customer_service.command_handler.bulk_delete_customer_thread_handler:
     class: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\CommandHandler\BulkDeleteCustomerThreadHandler'
     arguments:
       - '@prestashop.core.domain.customer_service.repository.customer_thread_repository'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\BulkDeleteCustomerThreadCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\BulkDeleteCustomerThreadCommand
 
   prestashop.core.domain.customer_service.command_handler.add_order_customer_message:
     class: PrestaShop\PrestaShop\Core\Domain\CustomerService\CommandHandler\AddOrderCustomerMessageHandler
@@ -29,9 +27,8 @@ services:
       - '@=service("prestashop.adapter.legacy.context").getContext().language.id'
       - '@=service("prestashop.adapter.legacy.context").getContext().employee.id'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\CustomerMessage\Command\AddOrderCustomerMessageCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\CustomerMessage\Command\AddOrderCustomerMessageCommand
 
   prestashop.core.domain.customer_service.query_handler.get_customer_thread_for_viewing_handler:
     class: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\QueryHandler\GetCustomerThreadForViewingHandler'
@@ -39,18 +36,16 @@ services:
       - '@=service("prestashop.adapter.legacy.context").getContext()'
       - '@prestashop.core.localization.locale.context_locale'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\Query\GetCustomerThreadForViewing'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\Query\GetCustomerThreadForViewing'
 
   prestashop.core.domain.customer_service.query_handler.get_customer_service_signature_handler:
     class: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\QueryHandler\GetCustomerServiceSignatureHandler'
     arguments:
       - '@prestashop.adapter.legacy.configuration'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\Query\GetCustomerServiceSignature'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\Query\GetCustomerServiceSignature'
 
   prestashop.core.domain.customer_service.command_handler.forward_customer_thread_handler:
     class: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\CommandHandler\ForwardCustomerThreadHandler'
@@ -58,18 +53,16 @@ services:
       - '@=service("prestashop.adapter.legacy.context").getContext()'
       - '@prestashop.adapter.legacy.configuration'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\ForwardCustomerThreadCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\ForwardCustomerThreadCommand'
 
   prestashop.core.domain.customer_service.command_handler.reply_to_customer_thread_handler:
     class: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\CommandHandler\ReplyToCustomerThreadHandler'
     arguments:
       - '@=service("prestashop.adapter.legacy.context").getContext()'
     tags:
-      - name: messenger.message_handler
-        handles: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\ReplyToCustomerThreadCommand'
-        method: handle
+      - name: messenger.cqrs_handler
+        command: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\ReplyToCustomerThreadCommand'
 
   prestashop.core.domain.customer_service.command_handler.update_customer_thread_status_handler:
     class: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\CommandHandler\UpdateCustomerThreadStatusHandler'
@@ -77,9 +70,8 @@ services:
       $connection: '@doctrine.dbal.default_connection'
       $dbPrefix: '%database_prefix%'
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\UpdateCustomerThreadStatusCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\UpdateCustomerThreadStatusCommand
 
   prestashop.core.domain.customer_service.repository.customer_thread_repository:
     class: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\Repository\CustomerThreadRepository'
diff --git a/src/PrestaShopBundle/Resources/config/services/core/domain/showcase_card.yml b/src/PrestaShopBundle/Resources/config/services/core/domain/showcase_card.yml
index a7fccccf0f947..fc68f580f1bc3 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/domain/showcase_card.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/domain/showcase_card.yml
@@ -13,9 +13,8 @@ services:
       - '@prestashop.adapter.legacy.configuration'
       - '@prestashop.core.showcase_card.configuration_map'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\Command\CloseShowcaseCardCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\Command\CloseShowcaseCardCommand'
 
   # Query handlers
 
@@ -25,6 +24,5 @@ services:
       - '@prestashop.adapter.legacy.configuration'
       - '@prestashop.core.showcase_card.configuration_map'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\Query\GetShowcaseCardIsClosed'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\Query\GetShowcaseCardIsClosed'
diff --git a/src/PrestaShopBundle/Resources/config/services/core/domain/sql_management.yml b/src/PrestaShopBundle/Resources/config/services/core/domain/sql_management.yml
index 2345835681be2..eb88d05379b56 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/domain/sql_management.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/domain/sql_management.yml
@@ -9,9 +9,8 @@ services:
     arguments:
       - '@prestashop.adapter.legacy.configuration'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\SaveSqlRequestSettingsCommand'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\SaveSqlRequestSettingsCommand'
 
   # QUERY HANDLERS
 
@@ -20,6 +19,5 @@ services:
     arguments:
       - '@prestashop.adapter.legacy.configuration'
     tags:
-      - name: 'messenger.message_handler'
-        handles: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetSqlRequestSettings'
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetSqlRequestSettings'
diff --git a/src/PrestaShopBundle/Resources/config/services/core/domain/theme.yml b/src/PrestaShopBundle/Resources/config/services/core/domain/theme.yml
index 9f9e07fc64d05..170d57886123b 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/domain/theme.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/domain/theme.yml
@@ -11,7 +11,7 @@ services:
       - '@prestashop.core.addon.theme.theme_manager'
       - '@prestashop.adapter.legacy.configuration'
     tags:
-      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Theme\Command\ImportThemeCommand, method: handle }
+      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Theme\Command\ImportThemeCommand }
 
   prestashop.core.domain.theme.command_handler.enable_theme_handler:
     class: 'PrestaShop\PrestaShop\Core\Domain\Theme\CommandHandler\EnableThemeHandler'
@@ -20,29 +20,27 @@ services:
       - '@prestashop.adapter.cache.clearer.smarty_cache_clearer'
       - '@=service("prestashop.adapter.shop.context").isSingleShopContext()'
     tags:
-      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Theme\Command\EnableThemeCommand, method: handle }
+      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Theme\Command\EnableThemeCommand }
 
   prestashop.core.domain.theme.command_handler.delete_theme_handler:
     class: 'PrestaShop\PrestaShop\Core\Domain\Theme\CommandHandler\DeleteThemeHandler'
     arguments:
       - '@prestashop.core.addon.theme.theme_manager'
     tags:
-      - { name: messenger.message_handler, handles: PrestaShop\PrestaShop\Core\Domain\Theme\Command\DeleteThemeCommand, method: handle }
+      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Theme\Command\DeleteThemeCommand }
 
   prestashop.core.domain.theme.command_handler.adapt_theme_to_rtl_languages_handler:
     class: 'PrestaShop\PrestaShop\Core\Domain\Theme\CommandHandler\AdaptThemeToRTLLanguagesHandler'
     arguments:
       - '@PrestaShop\PrestaShop\Core\Localization\RTL\StyleSheetProcessorFactory'
     tags:
-      - name: 'messenger.message_handler'
-        handles: PrestaShop\PrestaShop\Core\Domain\Theme\Command\AdaptThemeToRTLLanguagesCommand
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: PrestaShop\PrestaShop\Core\Domain\Theme\Command\AdaptThemeToRTLLanguagesCommand
 
   prestashop.core.domain.theme.command_handler.reset_theme_layouts_handler:
     class: 'PrestaShop\PrestaShop\Core\Domain\Theme\CommandHandler\ResetThemeLayoutsHandler'
     arguments:
       - '@prestashop.core.addon.theme.theme_manager'
     tags:
-      - name: 'messenger.message_handler'
-        handles: PrestaShop\PrestaShop\Core\Domain\Theme\Command\ResetThemeLayoutsCommand
-        method: handle
+      - name: 'messenger.cqrs_handler'
+        command: PrestaShop\PrestaShop\Core\Domain\Theme\Command\ResetThemeLayoutsCommand
diff --git a/src/PrestaShopBundle/Resources/config/services/core/mail_template.yml b/src/PrestaShopBundle/Resources/config/services/core/mail_template.yml
index 3e44c61b9fc46..bf2f01c51606b 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/mail_template.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/mail_template.yml
@@ -44,6 +44,5 @@ services:
       - "@=service('prestashop.adapter.legacy.configuration').get('_PS_MODULE_DIR_')"
     public: true
     tags:
-      - name: messenger.message_handler
-        handles: PrestaShop\PrestaShop\Core\Domain\MailTemplate\Command\GenerateThemeMailTemplatesCommand
-        method: handle
+      - name: messenger.cqrs_handler
+        command: PrestaShop\PrestaShop\Core\Domain\MailTemplate\Command\GenerateThemeMailTemplatesCommand

From f7f6b368c4a6370fb3e23a7ea98e87fd4cf6c9e3 Mon Sep 17 00:00:00 2001
From: Morgan PICHAT <morgan.pichat@prestashop.com>
Date: Wed, 21 Jun 2023 20:28:01 +0200
Subject: [PATCH 0462/1030] update GenerateThemeMailTemplatesHandler class name

---
 ...mmandHandler.php => GenerateThemeMailTemplatesHandler.php} | 4 ++--
 ...ace.php => GenerateThemeMailTemplatesHandlerInterface.php} | 4 ++--
 .../Resources/config/services/core/mail_template.yml          | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename src/Core/Domain/MailTemplate/CommandHandler/{GenerateThemeMailTemplatesCommandHandler.php => GenerateThemeMailTemplatesHandler.php} (94%)
 rename src/Core/Domain/MailTemplate/CommandHandler/{GenerateThemeMailTemplatesCommandHandlerInterface.php => GenerateThemeMailTemplatesHandlerInterface.php} (92%)

diff --git a/src/Core/Domain/MailTemplate/CommandHandler/GenerateThemeMailTemplatesCommandHandler.php b/src/Core/Domain/MailTemplate/CommandHandler/GenerateThemeMailTemplatesHandler.php
similarity index 94%
rename from src/Core/Domain/MailTemplate/CommandHandler/GenerateThemeMailTemplatesCommandHandler.php
rename to src/Core/Domain/MailTemplate/CommandHandler/GenerateThemeMailTemplatesHandler.php
index de117e2c251be..eefef37c01c15 100644
--- a/src/Core/Domain/MailTemplate/CommandHandler/GenerateThemeMailTemplatesCommandHandler.php
+++ b/src/Core/Domain/MailTemplate/CommandHandler/GenerateThemeMailTemplatesHandler.php
@@ -34,11 +34,11 @@
 use PrestaShop\PrestaShop\Core\MailTemplate\ThemeInterface;
 
 /**
- * Class GenerateThemeMailTemplatesCommandHandler generates email templates with parameters provided
+ * Class GenerateThemeMailTemplatesHandler generates email templates with parameters provided
  * by GenerateThemeMailTemplatesCommand. If no output folders are defined by the command its output
  * folders are the default ones.
  */
-class GenerateThemeMailTemplatesCommandHandler implements GenerateThemeMailTemplatesCommandHandlerInterface
+class GenerateThemeMailTemplatesHandler implements GenerateThemeMailTemplatesHandlerInterface
 {
     /** @var LanguageRepositoryInterface */
     private $languageRepository;
diff --git a/src/Core/Domain/MailTemplate/CommandHandler/GenerateThemeMailTemplatesCommandHandlerInterface.php b/src/Core/Domain/MailTemplate/CommandHandler/GenerateThemeMailTemplatesHandlerInterface.php
similarity index 92%
rename from src/Core/Domain/MailTemplate/CommandHandler/GenerateThemeMailTemplatesCommandHandlerInterface.php
rename to src/Core/Domain/MailTemplate/CommandHandler/GenerateThemeMailTemplatesHandlerInterface.php
index 1f3737bff22f0..5e58ee5b611c1 100644
--- a/src/Core/Domain/MailTemplate/CommandHandler/GenerateThemeMailTemplatesCommandHandlerInterface.php
+++ b/src/Core/Domain/MailTemplate/CommandHandler/GenerateThemeMailTemplatesHandlerInterface.php
@@ -29,9 +29,9 @@
 use PrestaShop\PrestaShop\Core\Domain\MailTemplate\Command\GenerateThemeMailTemplatesCommand;
 
 /**
- * Interface GenerateThemeMailsHandlerInterface
+ * Interface GenerateThemeMailTemplatesHandlerInterface
  */
-interface GenerateThemeMailTemplatesCommandHandlerInterface
+interface GenerateThemeMailTemplatesHandlerInterface
 {
     /**
      * @param GenerateThemeMailTemplatesCommand $command
diff --git a/src/PrestaShopBundle/Resources/config/services/core/mail_template.yml b/src/PrestaShopBundle/Resources/config/services/core/mail_template.yml
index bf2f01c51606b..ef701c66d7109 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/mail_template.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/mail_template.yml
@@ -35,7 +35,7 @@ services:
     class: 'PrestaShop\PrestaShop\Core\MailTemplate\Transformation\HTMLToTextTransformation'
 
   prestashop.core.mail_template.command_handler.generate_theme_mails_handler:
-    class: 'PrestaShop\PrestaShop\Core\Domain\MailTemplate\CommandHandler\GenerateThemeMailTemplatesCommandHandler'
+    class: 'PrestaShop\PrestaShop\Core\Domain\MailTemplate\CommandHandler\GenerateThemeMailTemplatesHandler'
     arguments:
       - '@prestashop.core.admin.lang.repository'
       - '@prestashop.core.mail_template.theme_catalog'

From 324ffd26250ec649164294d89cffce7c594fbed6 Mon Sep 17 00:00:00 2001
From: Morgan PICHAT <morgan.pichat@prestashop.com>
Date: Wed, 21 Jun 2023 20:39:34 +0200
Subject: [PATCH 0463/1030] Create abstract class for currency command

---
 .../Command/AbstractAddCurrencyCommand.php    | 192 +++++++++++++++
 .../Command/AbstractEditCurrencyCommand.php   | 205 ++++++++++++++++
 .../Currency/Command/AddCurrencyCommand.php   | 203 +---------------
 .../Command/AddUnofficialCurrencyCommand.php  | 165 +------------
 .../Currency/Command/EditCurrencyCommand.php  | 223 +-----------------
 .../Command/EditUnofficialCurrencyCommand.php | 175 +-------------
 6 files changed, 401 insertions(+), 762 deletions(-)
 create mode 100644 src/Core/Domain/Currency/Command/AbstractAddCurrencyCommand.php
 create mode 100644 src/Core/Domain/Currency/Command/AbstractEditCurrencyCommand.php

diff --git a/src/Core/Domain/Currency/Command/AbstractAddCurrencyCommand.php b/src/Core/Domain/Currency/Command/AbstractAddCurrencyCommand.php
new file mode 100644
index 0000000000000..0bad74ee4275f
--- /dev/null
+++ b/src/Core/Domain/Currency/Command/AbstractAddCurrencyCommand.php
@@ -0,0 +1,192 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Domain\Currency\Command;
+
+use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CurrencyConstraintException;
+use PrestaShop\PrestaShop\Core\Domain\Currency\ValueObject\AlphaIsoCode;
+use PrestaShop\PrestaShop\Core\Domain\Currency\ValueObject\ExchangeRate;
+use PrestaShop\PrestaShop\Core\Domain\Currency\ValueObject\Precision;
+
+abstract class AbstractAddCurrencyCommand
+{
+    protected AlphaIsoCode $isoCode;
+
+    protected ExchangeRate $exchangeRate;
+
+    protected ?Precision $precision = null;
+
+    /**
+     * @var string[]
+     */
+    protected array $localizedNames = [];
+
+    /**
+     * @var string[]
+     */
+    protected array $localizedSymbols = [];
+
+    protected bool $isEnabled;
+
+    /**
+     * @var int[]
+     */
+    protected array $shopIds = [];
+
+    /**
+     * @var string[]
+     */
+    protected array $localizedTransformations = [];
+
+    /**
+     * @throws CurrencyConstraintException
+     */
+    public function __construct(
+        string $isoCode,
+        float $exchangeRate,
+        bool $isEnabled
+    ) {
+        $this->isoCode = new AlphaIsoCode($isoCode);
+        $this->exchangeRate = new ExchangeRate($exchangeRate);
+        $this->isEnabled = $isEnabled;
+    }
+
+    public function getIsoCode(): AlphaIsoCode
+    {
+        return $this->isoCode;
+    }
+
+    public function getPrecision(): ?Precision
+    {
+        return $this->precision;
+    }
+
+    /**
+     * @throws CurrencyConstraintException
+     */
+    public function setPrecision(int|string $precision): self
+    {
+        $this->precision = new Precision($precision);
+
+        return $this;
+    }
+
+    public function getExchangeRate(): ExchangeRate
+    {
+        return $this->exchangeRate;
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getLocalizedNames(): array
+    {
+        return $this->localizedNames;
+    }
+
+    /**
+     * @param string[] $localizedNames currency's localized names, indexed by language id
+     *
+     * @throws CurrencyConstraintException
+     */
+    public function setLocalizedNames(array $localizedNames): self
+    {
+        if (empty($localizedNames)) {
+            throw new CurrencyConstraintException('Currency name cannot be empty', CurrencyConstraintException::EMPTY_NAME);
+        }
+
+        $this->localizedNames = $localizedNames;
+
+        return $this;
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getLocalizedSymbols(): array
+    {
+        return $this->localizedSymbols;
+    }
+
+    /**
+     * @param string[] $localizedSymbols currency's localized symbols, indexed by language id
+     *
+     * @throws CurrencyConstraintException
+     */
+    public function setLocalizedSymbols(array $localizedSymbols): self
+    {
+        if (empty($localizedSymbols)) {
+            throw new CurrencyConstraintException('Currency symbol cannot be empty', CurrencyConstraintException::EMPTY_SYMBOL);
+        }
+
+        $this->localizedSymbols = $localizedSymbols;
+
+        return $this;
+    }
+
+    public function isEnabled(): bool
+    {
+        return $this->isEnabled;
+    }
+
+    /**
+     * @return int[]
+     */
+    public function getShopIds(): array
+    {
+        return $this->shopIds;
+    }
+
+    /**
+     * @param int[] $shopIds
+     */
+    public function setShopIds(array $shopIds): self
+    {
+        $this->shopIds = $shopIds;
+
+        return $this;
+    }
+
+    /**
+     * Returns the currency's localized transformations, indexed by language id
+     *
+     * @return string[]
+     */
+    public function getLocalizedTransformations(): array
+    {
+        return $this->localizedTransformations;
+    }
+
+    /**
+     * @param string[] $localizedTransformations currency's localized transformations, indexed by language id
+     */
+    public function setLocalizedTransformations(array $localizedTransformations): self
+    {
+        $this->localizedTransformations = $localizedTransformations;
+
+        return $this;
+    }
+}
diff --git a/src/Core/Domain/Currency/Command/AbstractEditCurrencyCommand.php b/src/Core/Domain/Currency/Command/AbstractEditCurrencyCommand.php
new file mode 100644
index 0000000000000..29deea684751a
--- /dev/null
+++ b/src/Core/Domain/Currency/Command/AbstractEditCurrencyCommand.php
@@ -0,0 +1,205 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Domain\Currency\Command;
+
+use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CurrencyConstraintException;
+use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CurrencyException;
+use PrestaShop\PrestaShop\Core\Domain\Currency\ValueObject\CurrencyId;
+use PrestaShop\PrestaShop\Core\Domain\Currency\ValueObject\ExchangeRate;
+use PrestaShop\PrestaShop\Core\Domain\Currency\ValueObject\Precision;
+
+abstract class AbstractEditCurrencyCommand
+{
+    protected CurrencyId $currencyId;
+
+    protected ?ExchangeRate $exchangeRate = null;
+
+    protected ?Precision $precision = null;
+
+    /**
+     * @var string[]
+     */
+    protected array $localizedNames = [];
+
+    /**
+     * @var string[]
+     */
+    protected array $localizedSymbols = [];
+
+    protected bool $isEnabled = false;
+
+    /**
+     * @var int[]
+     */
+    protected array $shopIds = [];
+
+    /**
+     * @var string[]
+     */
+    protected array $localizedTransformations = [];
+
+    /**
+     * @throws CurrencyException
+     */
+    public function __construct(int $currencyId)
+    {
+        $this->currencyId = new CurrencyId($currencyId);
+    }
+
+    public function getCurrencyId(): CurrencyId
+    {
+        return $this->currencyId;
+    }
+
+    public function getExchangeRate(): ?ExchangeRate
+    {
+        return $this->exchangeRate;
+    }
+
+    /**
+     * @throws CurrencyConstraintException
+     */
+    public function setExchangeRate(float $exchangeRate): self
+    {
+        $this->exchangeRate = new ExchangeRate($exchangeRate);
+
+        return $this;
+    }
+
+    public function getPrecision(): ?Precision
+    {
+        return $this->precision;
+    }
+
+    /**
+     * @throws CurrencyConstraintException
+     */
+    public function setPrecision(int|string $precision): self
+    {
+        $this->precision = new Precision($precision);
+
+        return $this;
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getLocalizedNames(): array
+    {
+        return $this->localizedNames;
+    }
+
+    /**
+     * @param string[] $localizedNames currency's localized names, indexed by language id
+     *
+     * @throws CurrencyConstraintException
+     */
+    public function setLocalizedNames(array $localizedNames): self
+    {
+        if (empty($localizedNames)) {
+            throw new CurrencyConstraintException('Currency name cannot be empty', CurrencyConstraintException::EMPTY_NAME);
+        }
+
+        $this->localizedNames = $localizedNames;
+
+        return $this;
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getLocalizedSymbols(): array
+    {
+        return $this->localizedSymbols;
+    }
+
+    /**
+     * @param string[] $localizedSymbols currency's localized symbols, indexed by language id
+     *
+     * @throws CurrencyConstraintException
+     */
+    public function setLocalizedSymbols(array $localizedSymbols): self
+    {
+        if (empty($localizedSymbols)) {
+            throw new CurrencyConstraintException('Currency symbol cannot be empty', CurrencyConstraintException::EMPTY_SYMBOL);
+        }
+
+        $this->localizedSymbols = $localizedSymbols;
+
+        return $this;
+    }
+
+    public function isEnabled(): bool
+    {
+        return $this->isEnabled;
+    }
+
+    public function setIsEnabled(bool $isEnabled): self
+    {
+        $this->isEnabled = $isEnabled;
+
+        return $this;
+    }
+
+    /**
+     * @return int[]
+     */
+    public function getShopIds(): array
+    {
+        return $this->shopIds;
+    }
+
+    /**
+     * @param int[] $shopIds
+     */
+    public function setShopIds(array $shopIds): self
+    {
+        $this->shopIds = $shopIds;
+
+        return $this;
+    }
+
+    /**
+     * Returns the currency's localized transformations, indexed by language id
+     *
+     * @return string[]
+     */
+    public function getLocalizedTransformations(): array
+    {
+        return $this->localizedTransformations;
+    }
+
+    /**
+     * @param string[] $localizedTransformations currency's localized transformations, indexed by language id
+     */
+    public function setLocalizedTransformations(array $localizedTransformations): self
+    {
+        $this->localizedTransformations = $localizedTransformations;
+
+        return $this;
+    }
+}
diff --git a/src/Core/Domain/Currency/Command/AddCurrencyCommand.php b/src/Core/Domain/Currency/Command/AddCurrencyCommand.php
index c1a1ea7cc475e..922a42ea288bb 100644
--- a/src/Core/Domain/Currency/Command/AddCurrencyCommand.php
+++ b/src/Core/Domain/Currency/Command/AddCurrencyCommand.php
@@ -26,210 +26,9 @@
 
 namespace PrestaShop\PrestaShop\Core\Domain\Currency\Command;
 
-use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CurrencyConstraintException;
-use PrestaShop\PrestaShop\Core\Domain\Currency\ValueObject\AlphaIsoCode;
-use PrestaShop\PrestaShop\Core\Domain\Currency\ValueObject\ExchangeRate;
-use PrestaShop\PrestaShop\Core\Domain\Currency\ValueObject\Precision;
-
 /**
  * Class AddCurrencyCommand used to add an official currency
  */
-class AddCurrencyCommand
+class AddCurrencyCommand extends AbstractAddCurrencyCommand
 {
-    /**
-     * @var AlphaIsoCode
-     */
-    protected $isoCode;
-
-    /**
-     * @var ExchangeRate
-     */
-    protected $exchangeRate;
-
-    /**
-     * @var Precision|null
-     */
-    protected $precision;
-
-    /**
-     * @var string[]
-     */
-    protected $localizedNames = [];
-
-    /**
-     * @var string[]
-     */
-    protected $localizedSymbols = [];
-
-    /**
-     * @var bool
-     */
-    protected $isEnabled;
-
-    /**
-     * @var int[]
-     */
-    protected $shopIds = [];
-
-    /**
-     * @var string[]
-     */
-    protected $localizedTransformations = [];
-
-    /**
-     * @param string $isoCode
-     * @param float $exchangeRate
-     * @param bool $isEnabled
-     *
-     * @throws CurrencyConstraintException
-     */
-    public function __construct(
-        $isoCode,
-        $exchangeRate,
-        $isEnabled
-    ) {
-        $this->isoCode = new AlphaIsoCode($isoCode);
-        $this->exchangeRate = new ExchangeRate($exchangeRate);
-        $this->isEnabled = $isEnabled;
-    }
-
-    /**
-     * @return AlphaIsoCode
-     */
-    public function getIsoCode()
-    {
-        return $this->isoCode;
-    }
-
-    /**
-     * @return Precision|null
-     */
-    public function getPrecision(): ?Precision
-    {
-        return $this->precision;
-    }
-
-    /**
-     * @param int|string $precision
-     *
-     * @return self
-     *
-     * @throws CurrencyConstraintException
-     */
-    public function setPrecision($precision): AddCurrencyCommand
-    {
-        $this->precision = new Precision($precision);
-
-        return $this;
-    }
-
-    /**
-     * @return ExchangeRate
-     */
-    public function getExchangeRate()
-    {
-        return $this->exchangeRate;
-    }
-
-    /**
-     * @return string[]
-     */
-    public function getLocalizedNames(): array
-    {
-        return $this->localizedNames;
-    }
-
-    /**
-     * @param string[] $localizedNames currency's localized names, indexed by language id
-     *
-     * @return $this
-     *
-     * @throws CurrencyConstraintException
-     */
-    public function setLocalizedNames(array $localizedNames): AddCurrencyCommand
-    {
-        if (empty($localizedNames)) {
-            throw new CurrencyConstraintException('Currency name cannot be empty', CurrencyConstraintException::EMPTY_NAME);
-        }
-
-        $this->localizedNames = $localizedNames;
-
-        return $this;
-    }
-
-    /**
-     * @return string[]
-     */
-    public function getLocalizedSymbols(): array
-    {
-        return $this->localizedSymbols;
-    }
-
-    /**
-     * @param string[] $localizedSymbols currency's localized symbols, indexed by language id
-     *
-     * @return $this
-     *
-     * @throws CurrencyConstraintException
-     */
-    public function setLocalizedSymbols(array $localizedSymbols): AddCurrencyCommand
-    {
-        if (empty($localizedSymbols)) {
-            throw new CurrencyConstraintException('Currency symbol cannot be empty', CurrencyConstraintException::EMPTY_SYMBOL);
-        }
-
-        $this->localizedSymbols = $localizedSymbols;
-
-        return $this;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isEnabled()
-    {
-        return $this->isEnabled;
-    }
-
-    /**
-     * @return int[]
-     */
-    public function getShopIds()
-    {
-        return $this->shopIds;
-    }
-
-    /**
-     * @param int[] $shopIds
-     *
-     * @return self
-     */
-    public function setShopIds(array $shopIds)
-    {
-        $this->shopIds = $shopIds;
-
-        return $this;
-    }
-
-    /**
-     * Returns the currency's localized transformations, indexed by language id
-     *
-     * @return string[]
-     */
-    public function getLocalizedTransformations(): array
-    {
-        return $this->localizedTransformations;
-    }
-
-    /**
-     * @param string[] $localizedTransformations currency's localized transformations, indexed by language id
-     *
-     * @return $this
-     */
-    public function setLocalizedTransformations(array $localizedTransformations): AddCurrencyCommand
-    {
-        $this->localizedTransformations = $localizedTransformations;
-
-        return $this;
-    }
 }
diff --git a/src/Core/Domain/Currency/Command/AddUnofficialCurrencyCommand.php b/src/Core/Domain/Currency/Command/AddUnofficialCurrencyCommand.php
index 6136e3efc5785..ed2e891425ffd 100644
--- a/src/Core/Domain/Currency/Command/AddUnofficialCurrencyCommand.php
+++ b/src/Core/Domain/Currency/Command/AddUnofficialCurrencyCommand.php
@@ -26,172 +26,9 @@
 
 namespace PrestaShop\PrestaShop\Core\Domain\Currency\Command;
 
-use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CurrencyConstraintException;
-use PrestaShop\PrestaShop\Core\Domain\Currency\ValueObject\AlphaIsoCode;
-use PrestaShop\PrestaShop\Core\Domain\Currency\ValueObject\ExchangeRate;
-use PrestaShop\PrestaShop\Core\Domain\Currency\ValueObject\Precision;
-
 /**
  * Class AddUnofficialCurrencyCommand used to add an alternative currency
  */
-class AddUnofficialCurrencyCommand
+class AddUnofficialCurrencyCommand extends AbstractAddCurrencyCommand
 {
-    protected AlphaIsoCode $isoCode;
-
-    protected ExchangeRate $exchangeRate;
-
-    protected ?Precision $precision = null;
-
-    /**
-     * @var string[]
-     */
-    protected array $localizedNames = [];
-
-    /**
-     * @var string[]
-     */
-    protected array $localizedSymbols = [];
-
-    protected bool $isEnabled;
-
-    /**
-     * @var int[]
-     */
-    protected array $shopIds = [];
-
-    /**
-     * @var string[]
-     */
-    protected array $localizedTransformations = [];
-
-    /**
-     * @throws CurrencyConstraintException
-     */
-    public function __construct(
-        string $isoCode,
-        float $exchangeRate,
-        bool $isEnabled
-    ) {
-        $this->isoCode = new AlphaIsoCode($isoCode);
-        $this->exchangeRate = new ExchangeRate($exchangeRate);
-        $this->isEnabled = $isEnabled;
-    }
-
-    public function getIsoCode(): AlphaIsoCode
-    {
-        return $this->isoCode;
-    }
-
-    public function getPrecision(): ?Precision
-    {
-        return $this->precision;
-    }
-
-    /**
-     * @throws CurrencyConstraintException
-     */
-    public function setPrecision(int|string $precision): self
-    {
-        $this->precision = new Precision($precision);
-
-        return $this;
-    }
-
-    public function getExchangeRate(): ExchangeRate
-    {
-        return $this->exchangeRate;
-    }
-
-    /**
-     * @return string[]
-     */
-    public function getLocalizedNames(): array
-    {
-        return $this->localizedNames;
-    }
-
-    /**
-     * @param string[] $localizedNames currency's localized names, indexed by language id
-     *
-     * @throws CurrencyConstraintException
-     */
-    public function setLocalizedNames(array $localizedNames): self
-    {
-        if (empty($localizedNames)) {
-            throw new CurrencyConstraintException('Currency name cannot be empty', CurrencyConstraintException::EMPTY_NAME);
-        }
-
-        $this->localizedNames = $localizedNames;
-
-        return $this;
-    }
-
-    /**
-     * @return string[]
-     */
-    public function getLocalizedSymbols(): array
-    {
-        return $this->localizedSymbols;
-    }
-
-    /**
-     * @param string[] $localizedSymbols currency's localized symbols, indexed by language id
-     *
-     * @throws CurrencyConstraintException
-     */
-    public function setLocalizedSymbols(array $localizedSymbols): self
-    {
-        if (empty($localizedSymbols)) {
-            throw new CurrencyConstraintException('Currency symbol cannot be empty', CurrencyConstraintException::EMPTY_SYMBOL);
-        }
-
-        $this->localizedSymbols = $localizedSymbols;
-
-        return $this;
-    }
-
-    public function isEnabled(): bool
-    {
-        return $this->isEnabled;
-    }
-
-    /**
-     * @return int[]
-     */
-    public function getShopIds(): array
-    {
-        return $this->shopIds;
-    }
-
-    /**
-     * @param int[] $shopIds
-     */
-    public function setShopIds(array $shopIds): self
-    {
-        $this->shopIds = $shopIds;
-
-        return $this;
-    }
-
-    /**
-     * Returns the currency's localized transformations, indexed by language id
-     *
-     * @return string[]
-     */
-    public function getLocalizedTransformations(): array
-    {
-        return $this->localizedTransformations;
-    }
-
-    /**
-     * @param string[] $localizedTransformations currency's localized transformations, indexed by language id
-     *
-     * @return $this
-     */
-    public function setLocalizedTransformations(array $localizedTransformations): self
-    {
-        $this->localizedTransformations = $localizedTransformations;
-
-        return $this;
-    }
 }
diff --git a/src/Core/Domain/Currency/Command/EditCurrencyCommand.php b/src/Core/Domain/Currency/Command/EditCurrencyCommand.php
index b2b33250a053f..c9c7417a57550 100644
--- a/src/Core/Domain/Currency/Command/EditCurrencyCommand.php
+++ b/src/Core/Domain/Currency/Command/EditCurrencyCommand.php
@@ -26,230 +26,9 @@
 
 namespace PrestaShop\PrestaShop\Core\Domain\Currency\Command;
 
-use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CurrencyConstraintException;
-use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CurrencyException;
-use PrestaShop\PrestaShop\Core\Domain\Currency\ValueObject\CurrencyId;
-use PrestaShop\PrestaShop\Core\Domain\Currency\ValueObject\ExchangeRate;
-use PrestaShop\PrestaShop\Core\Domain\Currency\ValueObject\Precision;
-
 /**
  * Class EditCurrencyCommand
  */
-class EditCurrencyCommand
+class EditCurrencyCommand extends AbstractEditCurrencyCommand
 {
-    /**
-     * @var CurrencyId
-     */
-    protected $currencyId;
-
-    /**
-     * @var ExchangeRate|null
-     */
-    protected $exchangeRate;
-
-    /**
-     * @var Precision|null
-     */
-    protected $precision;
-
-    /**
-     * @var string[]
-     */
-    protected $localizedNames = [];
-
-    /**
-     * @var string[]
-     */
-    protected $localizedSymbols = [];
-
-    /**
-     * @var bool
-     */
-    protected $isEnabled;
-
-    /**
-     * @var int[]
-     */
-    protected $shopIds = [];
-
-    /**
-     * @var string[]
-     */
-    protected $localizedTransformations = [];
-
-    /**
-     * @param int $currencyId
-     *
-     * @throws CurrencyException
-     */
-    public function __construct($currencyId)
-    {
-        $this->currencyId = new CurrencyId($currencyId);
-    }
-
-    /**
-     * @return CurrencyId
-     */
-    public function getCurrencyId()
-    {
-        return $this->currencyId;
-    }
-
-    /**
-     * @return ExchangeRate|null
-     */
-    public function getExchangeRate()
-    {
-        return $this->exchangeRate;
-    }
-
-    /**
-     * @param float $exchangeRate
-     *
-     * @return self
-     *
-     * @throws CurrencyConstraintException
-     */
-    public function setExchangeRate($exchangeRate)
-    {
-        $this->exchangeRate = new ExchangeRate($exchangeRate);
-
-        return $this;
-    }
-
-    /**
-     * @return Precision|null
-     */
-    public function getPrecision(): ?Precision
-    {
-        return $this->precision;
-    }
-
-    /**
-     * @param int|string $precision
-     *
-     * @return self
-     *
-     * @throws CurrencyConstraintException
-     */
-    public function setPrecision($precision): EditCurrencyCommand
-    {
-        $this->precision = new Precision($precision);
-
-        return $this;
-    }
-
-    /**
-     * @return string[]
-     */
-    public function getLocalizedNames(): array
-    {
-        return $this->localizedNames;
-    }
-
-    /**
-     * @param string[] $localizedNames currency's localized names, indexed by language id
-     *
-     * @return $this
-     *
-     * @throws CurrencyConstraintException
-     */
-    public function setLocalizedNames(array $localizedNames): EditCurrencyCommand
-    {
-        if (empty($localizedNames)) {
-            throw new CurrencyConstraintException('Currency name cannot be empty', CurrencyConstraintException::EMPTY_NAME);
-        }
-
-        $this->localizedNames = $localizedNames;
-
-        return $this;
-    }
-
-    /**
-     * @return string[]
-     */
-    public function getLocalizedSymbols()
-    {
-        return $this->localizedSymbols;
-    }
-
-    /**
-     * @param string[] $localizedSymbols currency's localized symbols, indexed by language id
-     *
-     * @return $this
-     *
-     * @throws CurrencyConstraintException
-     */
-    public function setLocalizedSymbols(array $localizedSymbols): EditCurrencyCommand
-    {
-        if (empty($localizedSymbols)) {
-            throw new CurrencyConstraintException('Currency symbol cannot be empty', CurrencyConstraintException::EMPTY_SYMBOL);
-        }
-
-        $this->localizedSymbols = $localizedSymbols;
-
-        return $this;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isEnabled()
-    {
-        return $this->isEnabled;
-    }
-
-    /**
-     * @param bool $isEnabled
-     *
-     * @return self
-     */
-    public function setIsEnabled($isEnabled)
-    {
-        $this->isEnabled = $isEnabled;
-
-        return $this;
-    }
-
-    /**
-     * @return int[]
-     */
-    public function getShopIds()
-    {
-        return $this->shopIds;
-    }
-
-    /**
-     * @param int[] $shopIds
-     *
-     * @return self
-     */
-    public function setShopIds(array $shopIds)
-    {
-        $this->shopIds = $shopIds;
-
-        return $this;
-    }
-
-    /**
-     * Returns the currency's localized transformations, indexed by language id
-     *
-     * @return string[]
-     */
-    public function getLocalizedTransformations(): array
-    {
-        return $this->localizedTransformations;
-    }
-
-    /**
-     * @param string[] $localizedTransformations currency's localized transformations, indexed by language id
-     *
-     * @return $this
-     */
-    public function setLocalizedTransformations(array $localizedTransformations): EditCurrencyCommand
-    {
-        $this->localizedTransformations = $localizedTransformations;
-
-        return $this;
-    }
 }
diff --git a/src/Core/Domain/Currency/Command/EditUnofficialCurrencyCommand.php b/src/Core/Domain/Currency/Command/EditUnofficialCurrencyCommand.php
index 991a73279fa4f..46a370a22c5f1 100644
--- a/src/Core/Domain/Currency/Command/EditUnofficialCurrencyCommand.php
+++ b/src/Core/Domain/Currency/Command/EditUnofficialCurrencyCommand.php
@@ -27,185 +27,12 @@
 namespace PrestaShop\PrestaShop\Core\Domain\Currency\Command;
 
 use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CurrencyConstraintException;
-use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CurrencyException;
 use PrestaShop\PrestaShop\Core\Domain\Currency\ValueObject\AlphaIsoCode;
-use PrestaShop\PrestaShop\Core\Domain\Currency\ValueObject\CurrencyId;
-use PrestaShop\PrestaShop\Core\Domain\Currency\ValueObject\ExchangeRate;
-use PrestaShop\PrestaShop\Core\Domain\Currency\ValueObject\Precision;
 
-class EditUnofficialCurrencyCommand
+class EditUnofficialCurrencyCommand extends AbstractEditCurrencyCommand
 {
     private ?AlphaIsoCode $isoCode = null;
 
-    protected CurrencyId $currencyId;
-
-    protected ?ExchangeRate $exchangeRate = null;
-
-    protected ?Precision $precision = null;
-
-    /**
-     * @var string[]
-     */
-    protected array $localizedNames = [];
-
-    /**
-     * @var string[]
-     */
-    protected array $localizedSymbols = [];
-
-    protected bool $isEnabled;
-
-    /**
-     * @var int[]
-     */
-    protected array $shopIds = [];
-
-    /**
-     * @var string[]
-     */
-    protected array $localizedTransformations = [];
-
-    /**
-     * @throws CurrencyException
-     */
-    public function __construct(int $currencyId)
-    {
-        $this->currencyId = new CurrencyId($currencyId);
-    }
-
-    public function getCurrencyId(): CurrencyId
-    {
-        return $this->currencyId;
-    }
-
-    public function getExchangeRate(): ?ExchangeRate
-    {
-        return $this->exchangeRate;
-    }
-
-    /**
-     * @throws CurrencyConstraintException
-     */
-    public function setExchangeRate(float $exchangeRate): self
-    {
-        $this->exchangeRate = new ExchangeRate($exchangeRate);
-
-        return $this;
-    }
-
-    public function getPrecision(): ?Precision
-    {
-        return $this->precision;
-    }
-
-    /**
-     * @throws CurrencyConstraintException
-     */
-    public function setPrecision(int|string $precision): self
-    {
-        $this->precision = new Precision($precision);
-
-        return $this;
-    }
-
-    /**
-     * @return string[]
-     */
-    public function getLocalizedNames(): array
-    {
-        return $this->localizedNames;
-    }
-
-    /**
-     * @param string[] $localizedNames currency's localized names, indexed by language id
-     *
-     * @throws CurrencyConstraintException
-     */
-    public function setLocalizedNames(array $localizedNames): self
-    {
-        if (empty($localizedNames)) {
-            throw new CurrencyConstraintException('Currency name cannot be empty', CurrencyConstraintException::EMPTY_NAME);
-        }
-
-        $this->localizedNames = $localizedNames;
-
-        return $this;
-    }
-
-    /**
-     * @return string[]
-     */
-    public function getLocalizedSymbols(): array
-    {
-        return $this->localizedSymbols;
-    }
-
-    /**
-     * @param string[] $localizedSymbols currency's localized symbols, indexed by language id
-     *
-     * @throws CurrencyConstraintException
-     */
-    public function setLocalizedSymbols(array $localizedSymbols): self
-    {
-        if (empty($localizedSymbols)) {
-            throw new CurrencyConstraintException('Currency symbol cannot be empty', CurrencyConstraintException::EMPTY_SYMBOL);
-        }
-
-        $this->localizedSymbols = $localizedSymbols;
-
-        return $this;
-    }
-
-    public function isEnabled(): bool
-    {
-        return $this->isEnabled;
-    }
-
-    public function setIsEnabled(bool $isEnabled): self
-    {
-        $this->isEnabled = $isEnabled;
-
-        return $this;
-    }
-
-    /**
-     * @return int[]
-     */
-    public function getShopIds(): array
-    {
-        return $this->shopIds;
-    }
-
-    /**
-     * @param int[] $shopIds
-     */
-    public function setShopIds(array $shopIds): self
-    {
-        $this->shopIds = $shopIds;
-
-        return $this;
-    }
-
-    /**
-     * Returns the currency's localized transformations, indexed by language id
-     *
-     * @return string[]
-     */
-    public function getLocalizedTransformations(): array
-    {
-        return $this->localizedTransformations;
-    }
-
-    /**
-     * @param string[] $localizedTransformations currency's localized transformations, indexed by language id
-     */
-    public function setLocalizedTransformations(array $localizedTransformations): self
-    {
-        $this->localizedTransformations = $localizedTransformations;
-
-        return $this;
-    }
-
     public function getIsoCode(): ?AlphaIsoCode
     {
         return $this->isoCode;

From d0420598c201b8cacca499979b5766379f11caf2 Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Thu, 22 Jun 2023 09:37:23 +0200
Subject: [PATCH 0464/1030] update CommandAndQueryCollectorPass

---
 .../Compiler/CommandAndQueryCollectorPass.php               | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryCollectorPass.php b/src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryCollectorPass.php
index c266906217d61..ec03de83ad135 100644
--- a/src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryCollectorPass.php
+++ b/src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryCollectorPass.php
@@ -40,14 +40,14 @@ class CommandAndQueryCollectorPass implements CompilerPassInterface
      */
     public function process(ContainerBuilder $container): void
     {
+        $handlers = $container->findTaggedServiceIds('messenger.cqrs_handler');
+        $this->updateMessengerTags($container, $handlers);
+
         if (!in_array($container->getParameter('kernel.environment'), ['dev', 'test'])) {
             return;
         }
 
-        $handlers = $container->findTaggedServiceIds('messenger.cqrs_handler');
         $commandsAndQueries = $this->findCommandsAndQueries($handlers);
-        $this->updateMessengerTags($container, $handlers);
-
         $container->setParameter('prestashop.commands_and_queries', $commandsAndQueries);
     }
 

From be81bb049e98f09bd76812a3c577c3f09b7399c5 Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Thu, 22 Jun 2023 09:55:54 +0200
Subject: [PATCH 0465/1030] update composer lock

---
 composer.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.lock b/composer.lock
index ccb637b419a4d..121bc13bb4be9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "781bcf6519b2d5df9ff7e09ed4b8890e",
+    "content-hash": "622d610759f0e0f08e6b0ddad7692a96",
     "packages": [
         {
             "name": "api-platform/core",

From 5e7412e43cdcbe9e6a7ab9f8163ff23633e8badd Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Thu, 22 Jun 2023 10:19:17 +0200
Subject: [PATCH 0466/1030] Update services after rebase

---
 .../Resources/config/services/adapter/cart_rule.yml             | 2 +-
 .../config/services/core/domain/authorization_server.yml        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml b/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml
index 351e6ee5963db..553cb5668fcac 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml
@@ -70,4 +70,4 @@ services:
     autowire: true
     public: false
     tags:
-      - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\CartRule\Command\SetCartRuleRestrictionsCommand }
+      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\CartRule\Command\SetCartRuleRestrictionsCommand }
diff --git a/src/PrestaShopBundle/Resources/config/services/core/domain/authorization_server.yml b/src/PrestaShopBundle/Resources/config/services/core/domain/authorization_server.yml
index b10e3553307ec..d174677c468a4 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/domain/authorization_server.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/domain/authorization_server.yml
@@ -23,7 +23,7 @@ services:
 
   PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\CommandHandler\DeleteApplicationHandler:
     tags:
-      - name: tactician.handler
+      - name: messenger.cqrs_handler
         command: 'PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Command\DeleteApplicationCommand'
 
   PrestaShopBundle\Model\AuthorizationServer\AuthorizedApplicationFactory: ~

From f15dfeb38c82935fbe6dfff88206d820ab06a912 Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Thu, 22 Jun 2023 14:21:27 +0200
Subject: [PATCH 0467/1030] use HandleTrait

---
 .../CommandBus/MessengerCommandBusAdapter.php | 28 ++++++-------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/Core/CommandBus/MessengerCommandBusAdapter.php b/src/Core/CommandBus/MessengerCommandBusAdapter.php
index 249540b702b35..906f6d80dedc3 100644
--- a/src/Core/CommandBus/MessengerCommandBusAdapter.php
+++ b/src/Core/CommandBus/MessengerCommandBusAdapter.php
@@ -27,17 +27,21 @@
 namespace PrestaShop\PrestaShop\Core\CommandBus;
 
 use Symfony\Component\Messenger\Exception\HandlerFailedException;
-use Symfony\Component\Messenger\Exception\LogicException;
+use Symfony\Component\Messenger\HandleTrait;
 use Symfony\Component\Messenger\MessageBusInterface;
-use Symfony\Component\Messenger\Stamp\HandledStamp;
 
 /**
  * Class MessengerCommandBusAdapter is the Symfony Messenger CommandsBus implementation for PrestaShop's contract.
  */
 final class MessengerCommandBusAdapter implements CommandBusInterface
 {
-    public function __construct(private readonly MessageBusInterface $commandBus)
+    use HandleTrait {
+        HandleTrait::handle as process;
+    }
+
+    public function __construct(MessageBusInterface $messageBus)
     {
+        $this->messageBus = $messageBus;
     }
 
     /**
@@ -46,23 +50,7 @@ public function __construct(private readonly MessageBusInterface $commandBus)
     public function handle($command)
     {
         try {
-            $envelope = $this->commandBus->dispatch($command);
-            /** @var HandledStamp[] $handledStamps */
-            $handledStamps = $envelope->all(HandledStamp::class);
-
-            if (!$handledStamps) {
-                throw new LogicException(sprintf('Message of type "%s" was handled zero times. Exactly one handler is expected when using "%s::%s()".', get_debug_type($envelope->getMessage()), MessengerCommandBusAdapter::class, __FUNCTION__));
-            }
-
-            if (\count($handledStamps) > 1) {
-                $handlers = implode(', ', array_map(function (HandledStamp $stamp): string {
-                    return sprintf('"%s"', $stamp->getHandlerName());
-                }, $handledStamps));
-
-                throw new LogicException(sprintf('Message of type "%s" was handled multiple times. Only one handler is expected when using "%s::%s()", got %d: %s.', get_debug_type($envelope->getMessage()), MessengerCommandBusAdapter::class, __FUNCTION__, \count($handledStamps), $handlers));
-            }
-
-            return $handledStamps[0]->getResult();
+            return $this->process($command);
         } catch (HandlerFailedException $exception) {
             throw $exception->getPrevious();
         }

From 525b8da978ec3c34a1cd240e1ede1906915af892 Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Fri, 23 Jun 2023 16:48:22 +0200
Subject: [PATCH 0468/1030] Create Command and query attributes and use its

---
 .../AddCustomerAddressHandler.php             |   2 +
 .../AddManufacturerAddressHandler.php         |   2 +
 .../BulkDeleteAddressHandler.php              |   2 +
 .../CommandHandler/DeleteAddressHandler.php   |   2 +
 .../CommandHandler/EditCartAddressHandler.php |   2 +
 .../EditCustomerAddressHandler.php            |   2 +
 .../EditManufacturerAddressHandler.php        |   2 +
 .../EditOrderAddressHandler.php               |   2 +
 .../SetRequiredFieldsForAddressHandler.php    |   2 +
 .../GetCustomerAddressForEditingHandler.php   |   2 +
 ...etManufacturerAddressForEditingHandler.php |   2 +
 .../GetRequiredFieldsForAddressHandler.php    |   2 +
 .../Alias/CommandHandler/AddAliasHandler.php  |   2 +
 .../CommandHandler/BulkDeleteAliasHandler.php |   2 +
 .../BulkUpdateAliasStatusHandler.php          |   2 +
 .../CommandHandler/DeleteAliasHandler.php     |   2 +
 .../CommandHandler/UpdateAliasHandler.php     |   2 +
 .../UpdateAliasStatusHandler.php              |   2 +
 .../GetAliasForEditingHandler.php             |   2 +
 .../CommandHandler/AddAttachmentHandler.php   |   2 +
 .../BulkDeleteAttachmentsHandler.php          |   2 +
 .../DeleteAttachmentHandler.php               |   2 +
 .../CommandHandler/EditAttachmentHandler.php  |   2 +
 .../GetAttachmentForEditingHandler.php        |   2 +
 .../QueryHandler/GetAttachmentHandler.php     |   2 +
 .../GetAttachmentInformationHandler.php       |   2 +
 .../QueryHandler/SearchAttachmentHandler.php  |   2 +
 .../BulkDeleteAttributeHandler.php            |   2 +
 .../CommandHandler/DeleteAttributeHandler.php |   2 +
 .../BulkDeleteAttributeGroupHandler.php       |   2 +
 .../DeleteAttributeGroupHandler.php           |   2 +
 .../GetAttributeGroupListHandler.php          |   2 +
 .../Page/CommandHandler/AddCmsPageHandler.php |   2 +
 .../BulkDeleteCmsPageHandler.php              |   2 +
 .../BulkDisableCmsPageHandler.php             |   2 +
 .../BulkEnableCmsPageHandler.php              |   2 +
 .../CommandHandler/DeleteCmsPageHandler.php   |   2 +
 .../CommandHandler/EditCmsPageHandler.php     |   2 +
 .../ToggleCmsPageStatusHandler.php            |   2 +
 .../GetCmsCategoryIdForRedirectionHandler.php |   2 +
 .../GetCmsPageForEditingHandler.php           |   2 +
 .../AddCmsPageCategoryHandler.php             |   2 +
 .../BulkDeleteCmsPageCategoryHandler.php      |   2 +
 .../BulkDisableCmsPageCategoryHandler.php     |   2 +
 .../BulkEnableCmsPageCategoryHandler.php      |   2 +
 .../DeleteCmsPageCategoryHandler.php          |   2 +
 .../EditCmsPageCategoryHandler.php            |   2 +
 .../ToggleCmsPageCategoryStatusHandler.php    |   2 +
 ...tCmsPageCategoriesForBreadcrumbHandler.php |   2 +
 .../GetCmsPageCategoryForEditingHandler.php   |   2 +
 ...etCmsPageCategoryNameForListingHandler.php |   2 +
 ...eParentCategoryIdForRedirectionHandler.php |   2 +
 .../BulkDeleteCarrierHandler.php              |   2 +
 .../BulkToggleCarrierStatusHandler.php        |   2 +
 .../CommandHandler/DeleteCarrierHandler.php   |   2 +
 .../ToggleCarrierIsFreeHandler.php            |   2 +
 .../ToggleCarrierStatusHandler.php            |   2 +
 .../AddCartRuleToCartHandler.php              |   2 +
 .../AddCustomizationHandler.php               |   2 +
 .../AddProductToCartHandler.php               |   2 +
 .../CreateEmptyCustomerCartHandler.php        |   2 +
 .../RemoveCartRuleFromCartHandler.php         |   2 +
 .../RemoveProductFromCartHandler.php          |   2 +
 .../SendCartToCustomerHandler.php             |   2 +
 .../UpdateCartAddressesHandler.php            |   2 +
 .../UpdateCartCarrierHandler.php              |   2 +
 .../UpdateCartCurrencyHandler.php             |   2 +
 .../UpdateCartDeliverySettingsHandler.php     |   2 +
 .../UpdateCartLanguageHandler.php             |   2 +
 .../UpdateProductPriceInCartHandler.php       |   2 +
 .../UpdateProductQuantityInCartHandler.php    |   2 +
 .../GetCartForOrderCreationHandler.php        |   2 +
 .../QueryHandler/GetCartForViewingHandler.php |   2 +
 .../GetLastEmptyCustomerCartHandler.php       |   2 +
 .../CommandHandler/AddCartRuleHandler.php     |   2 +
 .../BulkDeleteCartRuleHandler.php             |   2 +
 .../BulkToggleCartRuleStatusHandler.php       |   2 +
 .../CommandHandler/DeleteCartRuleHandler.php  |   2 +
 .../CommandHandler/EditCartRuleHandler.php    |   2 +
 .../SetCartRuleRestrictionsHandler.php        |   2 +
 .../ToggleCartRuleStatusHandler.php           |   2 +
 .../GetCartRuleForEditingHandler.php          |   2 +
 .../QueryHandler/SearchCartRulesHandler.php   |   2 +
 .../AddCatalogPriceRuleHandler.php            |   2 +
 .../BulkDeleteCatalogPriceRuleHandler.php     |   2 +
 .../DeleteCatalogPriceRuleHandler.php         |   2 +
 .../EditCatalogPriceRuleHandler.php           |   2 +
 .../GetCatalogPriceRuleForEditingHandler.php  |   2 +
 ...tCatalogPriceRuleListForProductHandler.php |   2 +
 .../CommandHandler/AddCategoryHandler.php     |   2 +
 .../CommandHandler/AddRootCategoryHandler.php |   2 +
 .../BulkDeleteCategoriesHandler.php           |   2 +
 .../BulkUpdateCategoriesStatusHandler.php     |   2 +
 .../DeleteCategoryCoverImageHandler.php       |   2 +
 .../CommandHandler/DeleteCategoryHandler.php  |   2 +
 ...eleteCategoryMenuThumbnailImageHandler.php |   2 +
 .../CommandHandler/EditCategoryHandler.php    |   2 +
 .../EditRootCategoryHandler.php               |   2 +
 .../SetCategoryIsEnabledHandler.php           |   2 +
 .../UpdateCategoryPositionHandler.php         |   2 +
 .../QueryHandler/GetCategoriesTreeHandler.php |   2 +
 .../GetCategoryForEditingHandler.php          |   2 +
 .../GetCategoryIsEnabledHandler.php           |   2 +
 .../CommandHandler/SwitchDebugModeHandler.php |   2 +
 .../CommandHandler/AddContactHandler.php      |   2 +
 .../CommandHandler/EditContactHandler.php     |   2 +
 .../GetContactForEditingHandler.php           |   2 +
 .../CommandHandler/AddCountryHandler.php      |   2 +
 .../CommandHandler/DeleteCountryHandler.php   |   2 +
 .../CommandHandler/EditCountryHandler.php     |   2 +
 .../GetCountryForEditingHandler.php           |   2 +
 .../GetCountryRequiredFieldsHandler.php       |   2 +
 .../GetCreditSlipIdsByDateRangeHandler.php    |   2 +
 .../AddOfficialCurrencyHandler.php            |   2 +
 .../AddUnofficialCurrencyHandler.php          |   2 +
 .../BulkDeleteCurrenciesHandler.php           |   2 +
 .../BulkToggleCurrenciesStatusHandler.php     |   2 +
 .../CommandHandler/DeleteCurrencyHandler.php  |   2 +
 .../EditOfficialCurrencyHandler.php           |   2 +
 .../EditUnofficialCurrencyHandler.php         |   2 +
 .../RefreshExchangeRatesHandler.php           |   2 +
 .../ToggleCurrencyStatusHandler.php           |   2 +
 .../GetCurrencyExchangeRateHandler.php        |   2 +
 .../GetCurrencyForEditingHandler.php          |   2 +
 .../GetReferenceCurrencyHandler.php           |   2 +
 .../CommandHandler/AddCustomerHandler.php     |   2 +
 .../BulkDeleteCustomerHandler.php             |   2 +
 .../BulkDisableCustomerHandler.php            |   2 +
 .../BulkEnableCustomerHandler.php             |   2 +
 .../CommandHandler/DeleteCustomerHandler.php  |   2 +
 .../CommandHandler/EditCustomerHandler.php    |   2 +
 .../SetPrivateNoteAboutCustomerHandler.php    |   2 +
 .../SetRequiredFieldsForCustomerHandler.php   |   2 +
 .../TransformGuestToCustomerHandler.php       |   2 +
 .../AddCustomerGroupHandler.php               |   2 +
 .../GetCustomerGroupForEditingHandler.php     |   2 +
 .../QueryHandler/GetCustomerCartsHandler.php  |   2 +
 .../GetCustomerForAddressCreationHandler.php  |   2 +
 .../GetCustomerForEditingHandler.php          |   2 +
 .../GetCustomerForViewingHandler.php          |   2 +
 .../QueryHandler/GetCustomerOrdersHandler.php |   2 +
 .../GetRequiredFieldsForCustomerHandler.php   |   2 +
 .../QueryHandler/SearchCustomersHandler.php   |   2 +
 .../CommandHandler/AddFeatureHandler.php      |   2 +
 .../CommandHandler/AddFeatureValueHandler.php |   2 +
 .../BulkDeleteFeatureHandler.php              |   2 +
 .../CommandHandler/DeleteFeatureHandler.php   |   2 +
 .../CommandHandler/EditFeatureHandler.php     |   2 +
 .../EditFeatureValueHandler.php               |   2 +
 .../GetFeatureForEditingHandler.php           |   2 +
 .../GetFeatureValueForEditingHandler.php      |   2 +
 .../UpdateHookStatusCommandHandler.php        |   2 +
 .../QueryHandler/GetHookStatusHandler.php     |   2 +
 .../CommandHandler/AddLanguageHandler.php     |   2 +
 .../BulkDeleteLanguagesHandler.php            |   2 +
 .../BulkToggleLanguagesStatusHandler.php      |   2 +
 .../CommandHandler/DeleteLanguageHandler.php  |   2 +
 .../CommandHandler/EditLanguageHandler.php    |   2 +
 .../ToggleLanguageStatusHandler.php           |   2 +
 .../GetLanguageForEditingHandler.php          |   2 +
 .../CommandHandler/AddManufacturerHandler.php |   2 +
 .../BulkDeleteManufacturerHandler.php         |   2 +
 .../BulkToggleManufacturerStatusHandler.php   |   2 +
 .../DeleteManufacturerHandler.php             |   2 +
 .../DeleteManufacturerLogoImageHandler.php    |   2 +
 .../EditManufacturerHandler.php               |   2 +
 .../ToggleManufacturerStatusHandler.php       |   2 +
 .../GetManufacturerForEditingHandler.php      |   2 +
 .../GetManufacturerForViewingHandler.php      |   2 +
 .../Meta/CommandHandler/AddMetaHandler.php    |   2 +
 .../Meta/CommandHandler/EditMetaHandler.php   |   2 +
 .../QueryHandler/GetMetaForEditingHandler.php |   2 +
 .../GetPagesForLayoutCustomizationHandler.php |   2 +
 .../BulkToggleModuleStatusHandler.php         |   2 +
 ...EmployeeNotificationLastElementHandler.php |   2 +
 .../GetNotificationLastElementsHandler.php    |   2 +
 .../AddCartRuleToOrderHandler.php             |   2 +
 .../AddOrderFromBackOfficeHandler.php         |   2 +
 .../CommandHandler/AddPaymentHandler.php      |   2 +
 .../AddProductToOrderHandler.php              |   2 +
 .../BulkChangeOrderStatusHandler.php          |   2 +
 .../CancelOrderProductHandler.php             |   2 +
 .../ChangeOrderCurrencyHandler.php            |   2 +
 .../ChangeOrderDeliveryAddressHandler.php     |   2 +
 .../ChangeOrderInvoiceAddressHandler.php      |   2 +
 .../DeleteCartRuleFromOrderHandler.php        |   2 +
 .../DeleteProductFromOrderHandler.php         |   2 +
 .../DuplicateOrderCartHandler.php             |   2 +
 .../CommandHandler/GenerateInvoiceHandler.php |   2 +
 .../IssuePartialRefundHandler.php             |   2 +
 .../IssueReturnProductHandler.php             |   2 +
 .../IssueStandardRefundHandler.php            |   2 +
 .../ResendOrderEmailHandler.php               |   2 +
 .../SendProcessOrderEmailHandler.php          |   2 +
 .../SetInternalOrderNoteHandler.php           |   2 +
 .../UpdateInvoiceNoteHandler.php              |   2 +
 .../UpdateOrderShippingDetailsHandler.php     |   2 +
 .../UpdateOrderStatusHandler.php              |   2 +
 .../UpdateProductInOrderHandler.php           |   2 +
 .../GetOrderForViewingHandler.php             |   2 +
 .../QueryHandler/GetOrderPreviewHandler.php   |   2 +
 .../GetOrderProductsForViewingHandler.php     |   2 +
 .../CommandHandler/AddOrderMessageHandler.php |   2 +
 .../BulkDeleteOrderMessageHandler.php         |   2 +
 .../DeleteOrderMessageHandler.php             |   2 +
 .../EditOrderMessageHandler.php               |   2 +
 .../GetOrderMessageForEditingHandler.php      |   2 +
 .../UpdateOrderReturnStateHandler.php         |   2 +
 .../GetOrderReturnForEditingHandler.php       |   2 +
 .../AddOrderReturnStateHandler.php            |   2 +
 .../BulkDeleteOrderReturnStateHandler.php     |   2 +
 .../DeleteOrderReturnStateHandler.php         |   2 +
 .../EditOrderReturnStateHandler.php           |   2 +
 .../GetOrderReturnStateForEditingHandler.php  |   2 +
 .../CommandHandler/AddOrderStateHandler.php   |   2 +
 .../BulkDeleteOrderStateHandler.php           |   2 +
 .../DeleteOrderStateHandler.php               |   2 +
 .../CommandHandler/EditOrderStateHandler.php  |   2 +
 .../GetOrderStateForEditingHandler.php        |   2 +
 ...AllAssociatedProductAttachmentsHandler.php |   2 +
 ...SetAssociatedProductAttachmentsHandler.php |   2 +
 .../GetProductAttributeGroupsHandler.php      |   2 +
 .../BulkDeleteCombinationHandler.php          |   2 +
 .../DeleteCombinationHandler.php              |   2 +
 .../GenerateProductCombinationsHandler.php    |   2 +
 .../RemoveAllCombinationImagesHandler.php     |   2 +
 .../SetCombinationImagesHandler.php           |   2 +
 .../UpdateCombinationHandler.php              |   2 +
 ...UpdateCombinationStockAvailableHandler.php |   2 +
 .../UpdateCombinationSuppliersHandler.php     |   2 +
 .../GetCombinationForEditingHandler.php       |   2 +
 .../GetCombinationSuppliersHandler.php        |   2 +
 .../GetEditableCombinationsListHandler.php    |   2 +
 ...earchCombinationsForAssociationHandler.php |   2 +
 .../CommandHandler/AddProductHandler.php      |   2 +
 .../AssignProductToCategoryHandler.php        |   2 +
 .../BulkDeleteProductHandler.php              |   2 +
 .../BulkDuplicateProductHandler.php           |   2 +
 .../BulkUpdateProductStatusHandler.php        |   2 +
 .../CommandHandler/DeleteProductHandler.php   |   2 +
 .../DuplicateProductHandler.php               |   2 +
 ...eAllAssociatedProductCategoriesHandler.php |   2 +
 .../RemoveAllProductTagsHandler.php           |   2 +
 .../RemoveAllRelatedProductsHandler.php       |   2 +
 .../SetAssociatedProductCategoriesHandler.php |   2 +
 .../CommandHandler/SetCarriersHandler.php     |   2 +
 .../CommandHandler/SetProductTagsHandler.php  |   2 +
 .../SetRelatedProductsHandler.php             |   2 +
 .../CommandHandler/UpdateProductHandler.php   |   2 +
 .../UpdateProductTypeHandler.php              |   2 +
 .../UpdateProductsPositionsHandler.php        |   2 +
 ...lCustomizationFieldsFromProductHandler.php |   2 +
 .../SetProductCustomizationFieldsHandler.php  |   2 +
 .../GetProductCustomizationFieldsHandler.php  |   2 +
 ...moveAllFeatureValuesFromProductHandler.php |   2 +
 .../SetProductFeatureValuesHandler.php        |   2 +
 .../GetProductFeatureValuesHandler.php        |   2 +
 .../CommandHandler/AddProductImageHandler.php |   2 +
 .../DeleteProductImageHandler.php             |   2 +
 .../SetProductImagesForAllShopHandler.php     |   2 +
 .../UpdateProductImageHandler.php             |   2 +
 .../QueryHandler/GetProductImageHandler.php   |   2 +
 .../QueryHandler/GetProductImagesHandler.php  |   2 +
 .../GetShopProductImagesHandler.php           |   2 +
 .../RemoveAllProductsFromPackHandler.php      |   2 +
 .../CommandHandler/SetPackProductsHandler.php |   2 +
 .../QueryHandler/GetPackedProductsHandler.php |   2 +
 .../GetProductForEditingHandler.php           |   2 +
 .../GetProductIsEnabledHandler.php            |   2 +
 .../GetProductSupplierOptionsHandler.php      |   2 +
 .../GetRelatedProductsHandler.php             |   2 +
 .../SearchProductsForAssociationHandler.php   |   2 +
 .../QueryHandler/SearchProductsHandler.php    |   2 +
 .../CommandHandler/SetProductShopsHandler.php |   2 +
 .../AddSpecificPriceHandler.php               |   2 +
 .../DeleteSpecificPriceHandler.php            |   2 +
 .../EditSpecificPriceHandler.php              |   2 +
 ...SpecificPricePriorityForProductHandler.php |   2 +
 ...SpecificPricePriorityForProductHandler.php |   2 +
 .../GetSpecificPriceForEditingHandler.php     |   2 +
 .../GetSpecificPriceListHandler.php           |   2 +
 .../UpdateProductStockAvailableHandler.php    |   2 +
 .../GetCombinationStockMovementsHandler.php   |   2 +
 .../GetProductStockMovementsHandler.php       |   2 +
 ...veAllAssociatedProductSuppliersHandler.php |   2 +
 .../SetProductDefaultSupplierHandler.php      |   2 +
 .../CommandHandler/SetSuppliersHandler.php    |   2 +
 .../UpdateProductSuppliersHandler.php         |   2 +
 .../GetAssociatedSuppliersHandler.php         |   2 +
 .../AddVirtualProductFileHandler.php          |   2 +
 .../DeleteVirtualProductFileHandler.php       |   2 +
 .../UpdateVirtualProductFileHandler.php       |   2 +
 .../CommandHandler/AddProfileHandler.php      |   2 +
 .../BulkDeleteProfileHandler.php              |   2 +
 .../CommandHandler/DeleteProfileHandler.php   |   2 +
 .../CommandHandler/EditProfileHandler.php     |   2 +
 .../CommandHandler/AddEmployeeHandler.php     |   2 +
 .../BulkDeleteEmployeeHandler.php             |   2 +
 .../BulkUpdateEmployeeStatusHandler.php       |   2 +
 .../CommandHandler/DeleteEmployeeHandler.php  |   2 +
 .../CommandHandler/EditEmployeeHandler.php    |   2 +
 .../ToggleEmployeeStatusHandler.php           |   2 +
 .../GetEmployeeEmailByIdHandler.php           |   2 +
 .../GetEmployeeForEditingHandler.php          |   2 +
 .../UpdateModulePermissionsHandler.php        |   2 +
 .../UpdateTabPermissionsHandler.php           |   2 +
 .../GetPermissionsForConfigurationHandler.php |   2 +
 .../GetProfileForEditingHandler.php           |   2 +
 .../CommandHandler/AddSearchEngineHandler.php |   2 +
 .../BulkDeleteSearchEngineHandler.php         |   2 +
 .../DeleteSearchEngineHandler.php             |   2 +
 .../EditSearchEngineHandler.php               |   2 +
 .../GetSearchEngineForEditingHandler.php      |   2 +
 .../BulkDeleteCustomerSessionsHandler.php     |   2 +
 .../BulkDeleteEmployeeSessionsHandler.php     |   2 +
 .../ClearOutdatedCustomerSessionHandler.php   |   2 +
 .../ClearOutdatedEmployeeSessionHandler.php   |   2 +
 .../DeleteCustomerSessionHandler.php          |   2 +
 .../DeleteEmployeeSessionHandler.php          |   2 +
 .../CommandHandler/UploadLogosHandler.php     |   2 +
 .../QueryHandler/GetLogosPathsHandler.php     |   2 +
 .../Shop/QueryHandler/SearchShopsHandler.php  |   2 +
 .../CommandHandler/AddSqlRequestHandler.php   |   2 +
 .../BulkDeleteSqlRequestHandler.php           |   2 +
 .../DeleteSqlRequestHandler.php               |   2 +
 .../CommandHandler/EditSqlRequestHandler.php  |   2 +
 .../GetDatabaseTableFieldsListHandler.php     |   2 +
 .../GetDatabaseTablesListHandler.php          |   2 +
 .../GetSqlRequestExecutionResultHandler.php   |   2 +
 .../GetSqlRequestForEditingHandler.php        |   2 +
 .../State/CommandHandler/AddStateHandler.php  |   2 +
 .../CommandHandler/BulkDeleteStateHandler.php |   2 +
 .../BulkToggleStateStatusHandler.php          |   2 +
 .../CommandHandler/DeleteStateHandler.php     |   2 +
 .../State/CommandHandler/EditStateHandler.php |   2 +
 .../ToggleStateStatusHandler.php              |   2 +
 .../GetStateForEditingHandler.php             |   2 +
 .../CommandHandler/BulkDeleteStoreHandler.php |   2 +
 .../BulkUpdateStoreStatusHandler.php          |   2 +
 .../CommandHandler/DeleteStoreHandler.php     |   2 +
 .../ToggleStoreStatusHandler.php              |   2 +
 .../GetStoreForEditingHandler.php             |   2 +
 .../CommandHandler/AddSupplierHandler.php     |   2 +
 .../BulkDeleteSupplierHandler.php             |   2 +
 .../BulkDisableSupplierHandler.php            |   2 +
 .../BulkEnableSupplierHandler.php             |   2 +
 .../CommandHandler/DeleteSupplierHandler.php  |   2 +
 .../DeleteSupplierLogoImageHandler.php        |   2 +
 .../CommandHandler/EditSupplierHandler.php    |   2 +
 .../ToggleSupplierStatusHandler.php           |   2 +
 .../GetSupplierForEditingHandler.php          |   2 +
 .../GetSupplierForViewingHandler.php          |   2 +
 .../UpdateTabStatusByClassNameHandler.php     |   2 +
 .../Tax/CommandHandler/AddTaxHandler.php      |   2 +
 .../CommandHandler/BulkDeleteTaxHandler.php   |   2 +
 .../BulkToggleTaxStatusHandler.php            |   2 +
 .../Tax/CommandHandler/DeleteTaxHandler.php   |   2 +
 .../Tax/CommandHandler/EditTaxHandler.php     |   2 +
 .../CommandHandler/ToggleTaxStatusHandler.php |   2 +
 .../QueryHandler/GetTaxForEditingHandler.php  |   2 +
 .../AddTaxRulesGroupHandler.php               |   2 +
 .../BulkDeleteTaxRulesGroupHandler.php        |   2 +
 .../BulkSetTaxRulesGroupStatusHandler.php     |   2 +
 .../DeleteTaxRulesGroupHandler.php            |   2 +
 .../EditTaxRulesGroupHandler.php              |   2 +
 .../SetTaxRulesGroupStatusHandler.php         |   2 +
 .../GetTaxRulesGroupForEditingHandler.php     |   2 +
 .../Title/CommandHandler/AddTitleHandler.php  |   2 +
 .../CommandHandler/BulkDeleteTitleHandler.php |   2 +
 .../CommandHandler/DeleteTitleHandler.php     |   2 +
 .../Title/CommandHandler/EditTitleHandler.php |   2 +
 .../GetTitleForEditingHandler.php             |   2 +
 .../AddWebserviceKeyHandler.php               |   2 +
 .../EditWebserviceKeyHandler.php              |   2 +
 .../GetWebserviceKeyForEditingHandler.php     |   2 +
 .../Zone/CommandHandler/AddZoneHandler.php    |   2 +
 .../CommandHandler/BulkDeleteZoneHandler.php  |   2 +
 .../BulkToggleZoneStatusHandler.php           |   2 +
 .../Zone/CommandHandler/DeleteZoneHandler.php |   2 +
 .../Zone/CommandHandler/EditZoneHandler.php   |   2 +
 .../ToggleZoneStatusHandler.php               |   2 +
 .../QueryHandler/GetZoneForEditingHandler.php |   2 +
 .../Attributes/AsCommandHandler.php           |  37 +++++
 .../CommandBus/Attributes/AsQueryHandler.php  |  37 +++++
 .../CommandHandler/AddApplicationHandler.php  |   2 +
 .../DeleteApplicationHandler.php              |   2 +
 .../CommandHandler/EditApplicationHandler.php |   2 +
 .../GetApplicationForEditingHandler.php       |   2 +
 .../AddOrderCustomerMessageHandler.php        |   2 +
 .../BulkDeleteCustomerThreadHandler.php       |   2 +
 .../DeleteCustomerThreadHandler.php           |   2 +
 .../ForwardCustomerThreadHandler.php          |   2 +
 .../ReplyToCustomerThreadHandler.php          |   2 +
 .../UpdateCustomerThreadStatusHandler.php     |   2 +
 .../GetCustomerServiceSignatureHandler.php    |   2 +
 .../GetCustomerThreadForViewingHandler.php    |   2 +
 .../GenerateThemeMailTemplatesHandler.php     |   2 +
 .../QueryHandler/GetCombinationIdsHandler.php |   2 +
 .../SearchProductCombinationsHandler.php      |   2 +
 .../CloseShowcaseCardHandler.php              |   2 +
 .../GetShowcaseCardIsClosedHandler.php        |   2 +
 .../SaveSqlRequestSettingsHandler.php         |   2 +
 .../GetSqlRequestSettingsHandler.php          |   2 +
 .../AdaptThemeToRTLLanguagesHandler.php       |   2 +
 .../CommandHandler/DeleteThemeHandler.php     |   2 +
 .../CommandHandler/EnableThemeHandler.php     |   2 +
 .../CommandHandler/ImportThemeHandler.php     |   2 +
 .../ResetThemeLayoutsHandler.php              |   2 +
 .../Compiler/CommandAndQueryCollectorPass.php |  41 ++++--
 .../config/services/adapter/address.yml       |  46 ++-----
 .../config/services/adapter/alias.yml         |  28 +---
 .../config/services/adapter/attachment.yml    |  26 ++--
 .../config/services/adapter/attribute.yml     |   8 +-
 .../services/adapter/attribute_group.yml      |  16 +--
 .../config/services/adapter/carrier.yml       |  15 +-
 .../config/services/adapter/cart.yml          |  68 +++-------
 .../config/services/adapter/cart_rule.yml     |  31 ++---
 .../services/adapter/catalog_price_rule.yml   |  24 +---
 .../config/services/adapter/category.yml      |  61 +++------
 .../config/services/adapter/cms_page.yml      |  36 ++---
 .../services/adapter/cms_page_category.yml    |  44 ++----
 .../config/services/adapter/configuration.yml |   3 +-
 .../config/services/adapter/contact.yml       |   9 +-
 .../config/services/adapter/country.yml       |  16 +--
 .../config/services/adapter/credit_slip.yml   |   4 +-
 .../config/services/adapter/currency.yml      |  37 ++---
 .../config/services/adapter/customer.yml      |  60 +++-----
 .../config/services/adapter/employee.yml      |  24 ++--
 .../config/services/adapter/feature.yml       |  32 ++---
 .../config/services/adapter/group.yml         |   8 +-
 .../config/services/adapter/hook.yml          |   8 +-
 .../config/services/adapter/language.yml      |  28 +---
 .../config/services/adapter/manufacturer.yml  |  32 ++---
 .../config/services/adapter/meta.yml          |  16 +--
 .../config/services/adapter/module.yml        |   4 +-
 .../config/services/adapter/notification.yml  |   8 +-
 .../config/services/adapter/order.yml         | 105 ++++----------
 .../config/services/adapter/order_message.yml |  20 +--
 .../config/services/adapter/order_return.yml  |   8 +-
 .../services/adapter/order_return_state.yml   |  20 +--
 .../config/services/adapter/order_state.yml   |  18 +--
 .../config/services/adapter/product.yml       | 128 +++++-------------
 .../services/adapter/product/_combination.yml |  56 ++------
 .../adapter/product/_customization.yml        |  12 +-
 .../adapter/product/_feature_value.yml        |  12 +-
 .../services/adapter/product/_image.yml       |  28 +---
 .../config/services/adapter/product/_pack.yml |  12 +-
 .../adapter/product/_specific_prices.yml      |  28 +---
 .../services/adapter/product/_stock.yml       |   8 +-
 .../adapter/product/_virtual_product.yml      |  12 +-
 .../config/services/adapter/profile.yml       |  32 ++---
 .../config/services/adapter/search_engine.yml |  20 +--
 .../config/services/adapter/security.yml      |  24 +---
 .../config/services/adapter/shop.yml          |  11 +-
 .../config/services/adapter/sql_manager.yml   |  24 ++--
 .../config/services/adapter/state.yml         |  28 +---
 .../config/services/adapter/store.yml         |  15 +-
 .../config/services/adapter/supplier.yml      |  40 ++----
 .../Resources/config/services/adapter/tab.yml |   3 +-
 .../Resources/config/services/adapter/tax.yml |  24 +---
 .../services/adapter/tax_rules_group.yml      |  28 +---
 .../config/services/adapter/title.yml         |  20 +--
 .../config/services/adapter/webservice.yml    |  12 +-
 .../config/services/adapter/zone.yml          |  28 +---
 .../core/domain/authorization_server.yml      |  16 +--
 .../services/core/domain/customer_service.yml |  32 ++---
 .../services/core/domain/showcase_card.yml    |   8 +-
 .../services/core/domain/sql_management.yml   |   8 +-
 .../config/services/core/domain/theme.yml     |  17 +--
 .../config/services/core/mail_template.yml    |   4 +-
 470 files changed, 1325 insertions(+), 1155 deletions(-)
 create mode 100644 src/Core/CommandBus/Attributes/AsCommandHandler.php
 create mode 100644 src/Core/CommandBus/Attributes/AsQueryHandler.php

diff --git a/src/Adapter/Address/CommandHandler/AddCustomerAddressHandler.php b/src/Adapter/Address/CommandHandler/AddCustomerAddressHandler.php
index 348caafe9fb52..d26239a59a3a5 100644
--- a/src/Adapter/Address/CommandHandler/AddCustomerAddressHandler.php
+++ b/src/Adapter/Address/CommandHandler/AddCustomerAddressHandler.php
@@ -28,6 +28,7 @@
 
 use Address;
 use PrestaShop\PrestaShop\Adapter\Address\AbstractAddressHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Address\Command\AddCustomerAddressCommand;
 use PrestaShop\PrestaShop\Core\Domain\Address\CommandHandler\AddCustomerAddressHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Address\Exception\AddressConstraintException;
@@ -36,6 +37,7 @@
 use PrestaShop\PrestaShop\Core\Domain\Address\ValueObject\AddressId;
 use PrestaShopException;
 
+#[AsCommandHandler]
 final class AddCustomerAddressHandler extends AbstractAddressHandler implements AddCustomerAddressHandlerInterface
 {
     /**
diff --git a/src/Adapter/Address/CommandHandler/AddManufacturerAddressHandler.php b/src/Adapter/Address/CommandHandler/AddManufacturerAddressHandler.php
index 3c5337c5c5740..463b47e23ce67 100644
--- a/src/Adapter/Address/CommandHandler/AddManufacturerAddressHandler.php
+++ b/src/Adapter/Address/CommandHandler/AddManufacturerAddressHandler.php
@@ -28,6 +28,7 @@
 
 use Address;
 use PrestaShop\PrestaShop\Adapter\Address\AbstractAddressHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Address\Command\AddManufacturerAddressCommand;
 use PrestaShop\PrestaShop\Core\Domain\Address\CommandHandler\AddManufacturerAddressHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Address\Exception\AddressException;
@@ -37,6 +38,7 @@
 /**
  * Adds manufacturer address using legacy object model
  */
+#[AsCommandHandler]
 final class AddManufacturerAddressHandler extends AbstractAddressHandler implements AddManufacturerAddressHandlerInterface
 {
     /**
diff --git a/src/Adapter/Address/CommandHandler/BulkDeleteAddressHandler.php b/src/Adapter/Address/CommandHandler/BulkDeleteAddressHandler.php
index d8025f883dc56..6639d75c5decd 100644
--- a/src/Adapter/Address/CommandHandler/BulkDeleteAddressHandler.php
+++ b/src/Adapter/Address/CommandHandler/BulkDeleteAddressHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Address\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Address\AbstractAddressHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Address\Command\BulkDeleteAddressCommand;
 use PrestaShop\PrestaShop\Core\Domain\Address\CommandHandler\BulkDeleteAddressHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Address\Exception\AddressException;
@@ -35,6 +36,7 @@
 /**
  * Handles command which deletes addresses in bulk action
  */
+#[AsCommandHandler]
 final class BulkDeleteAddressHandler extends AbstractAddressHandler implements BulkDeleteAddressHandlerInterface
 {
     /**
diff --git a/src/Adapter/Address/CommandHandler/DeleteAddressHandler.php b/src/Adapter/Address/CommandHandler/DeleteAddressHandler.php
index 5c1f443253857..92d08fce6e58e 100644
--- a/src/Adapter/Address/CommandHandler/DeleteAddressHandler.php
+++ b/src/Adapter/Address/CommandHandler/DeleteAddressHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Address\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Address\AbstractAddressHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Address\Command\DeleteAddressCommand;
 use PrestaShop\PrestaShop\Core\Domain\Address\CommandHandler\DeleteAddressHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Address\Exception\DeleteAddressException;
@@ -34,6 +35,7 @@
 /**
  * Handles command which deletes address
  */
+#[AsCommandHandler]
 final class DeleteAddressHandler extends AbstractAddressHandler implements DeleteAddressHandlerInterface
 {
     /**
diff --git a/src/Adapter/Address/CommandHandler/EditCartAddressHandler.php b/src/Adapter/Address/CommandHandler/EditCartAddressHandler.php
index 657952c3e1576..3ce0438e37625 100644
--- a/src/Adapter/Address/CommandHandler/EditCartAddressHandler.php
+++ b/src/Adapter/Address/CommandHandler/EditCartAddressHandler.php
@@ -29,6 +29,7 @@
 
 use Cart;
 use PrestaShop\PrestaShop\Adapter\Validate;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Address\Command\EditCartAddressCommand;
 use PrestaShop\PrestaShop\Core\Domain\Address\Command\EditCustomerAddressCommand;
 use PrestaShop\PrestaShop\Core\Domain\Address\CommandHandler\EditCartAddressHandlerInterface;
@@ -46,6 +47,7 @@
  * EditCartAddressHandler manages an address update, it then updates cart
  * relation to the newly created address.
  */
+#[AsCommandHandler]
 class EditCartAddressHandler implements EditCartAddressHandlerInterface
 {
     /**
diff --git a/src/Adapter/Address/CommandHandler/EditCustomerAddressHandler.php b/src/Adapter/Address/CommandHandler/EditCustomerAddressHandler.php
index da1a12b895ee0..277a9723b6f61 100644
--- a/src/Adapter/Address/CommandHandler/EditCustomerAddressHandler.php
+++ b/src/Adapter/Address/CommandHandler/EditCustomerAddressHandler.php
@@ -29,6 +29,7 @@
 use Address;
 use Country;
 use PrestaShop\PrestaShop\Adapter\Address\AbstractAddressHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Address\Command\EditCustomerAddressCommand;
 use PrestaShop\PrestaShop\Core\Domain\Address\CommandHandler\EditCustomerAddressHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Address\Exception\AddressConstraintException;
@@ -43,6 +44,7 @@
 /**
  * Handles update of customer address
  */
+#[AsCommandHandler]
 final class EditCustomerAddressHandler extends AbstractAddressHandler implements EditCustomerAddressHandlerInterface
 {
     /**
diff --git a/src/Adapter/Address/CommandHandler/EditManufacturerAddressHandler.php b/src/Adapter/Address/CommandHandler/EditManufacturerAddressHandler.php
index bf55bd40b0e28..1907b9072a18c 100644
--- a/src/Adapter/Address/CommandHandler/EditManufacturerAddressHandler.php
+++ b/src/Adapter/Address/CommandHandler/EditManufacturerAddressHandler.php
@@ -29,6 +29,7 @@
 use Address;
 use Country;
 use PrestaShop\PrestaShop\Adapter\Address\AbstractAddressHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Address\Command\EditManufacturerAddressCommand;
 use PrestaShop\PrestaShop\Core\Domain\Address\CommandHandler\EditManufacturerAddressHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Address\Exception\AddressException;
@@ -37,6 +38,7 @@
 /**
  * Handles command which edits manufacturer address
  */
+#[AsCommandHandler]
 final class EditManufacturerAddressHandler extends AbstractAddressHandler implements EditManufacturerAddressHandlerInterface
 {
     /**
diff --git a/src/Adapter/Address/CommandHandler/EditOrderAddressHandler.php b/src/Adapter/Address/CommandHandler/EditOrderAddressHandler.php
index ad5e52480182a..ad8f605a58723 100644
--- a/src/Adapter/Address/CommandHandler/EditOrderAddressHandler.php
+++ b/src/Adapter/Address/CommandHandler/EditOrderAddressHandler.php
@@ -28,6 +28,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Address\CommandHandler;
 
 use Order;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Address\Command\EditCustomerAddressCommand;
 use PrestaShop\PrestaShop\Core\Domain\Address\Command\EditOrderAddressCommand;
 use PrestaShop\PrestaShop\Core\Domain\Address\CommandHandler\EditCustomerAddressHandlerInterface;
@@ -48,6 +49,7 @@
  * EditOrderAddressCommandHandler manages an address update, it then updates order and cart
  * relation to the newly created address.
  */
+#[AsCommandHandler]
 class EditOrderAddressHandler implements EditOrderAddressHandlerInterface
 {
     /**
diff --git a/src/Adapter/Address/CommandHandler/SetRequiredFieldsForAddressHandler.php b/src/Adapter/Address/CommandHandler/SetRequiredFieldsForAddressHandler.php
index 5de8e36889746..41b653e61ad36 100644
--- a/src/Adapter/Address/CommandHandler/SetRequiredFieldsForAddressHandler.php
+++ b/src/Adapter/Address/CommandHandler/SetRequiredFieldsForAddressHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Address\CommandHandler;
 
 use CustomerAddress;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Address\Command\SetRequiredFieldsForAddressCommand;
 use PrestaShop\PrestaShop\Core\Domain\Address\CommandHandler\SetRequiredFieldsForAddressHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Address\Exception\CannotSetRequiredFieldsForAddressException;
@@ -37,6 +38,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class SetRequiredFieldsForAddressHandler implements SetRequiredFieldsForAddressHandlerInterface
 {
     /**
diff --git a/src/Adapter/Address/QueryHandler/GetCustomerAddressForEditingHandler.php b/src/Adapter/Address/QueryHandler/GetCustomerAddressForEditingHandler.php
index 9b07745ef0e86..12a7d0375c6a7 100644
--- a/src/Adapter/Address/QueryHandler/GetCustomerAddressForEditingHandler.php
+++ b/src/Adapter/Address/QueryHandler/GetCustomerAddressForEditingHandler.php
@@ -28,6 +28,7 @@
 
 use Customer;
 use PrestaShop\PrestaShop\Adapter\Address\AbstractCustomerAddressHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Address\Exception\AddressException;
 use PrestaShop\PrestaShop\Core\Domain\Address\Exception\AddressNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Address\Query\GetCustomerAddressForEditing;
@@ -46,6 +47,7 @@
 /**
  * Handles query which gets customer address for editing
  */
+#[AsQueryHandler]
 final class GetCustomerAddressForEditingHandler extends AbstractCustomerAddressHandler implements GetCustomerAddressForEditingHandlerInterface
 {
     /**
diff --git a/src/Adapter/Address/QueryHandler/GetManufacturerAddressForEditingHandler.php b/src/Adapter/Address/QueryHandler/GetManufacturerAddressForEditingHandler.php
index c0747f8e3013d..d57a45ce04c26 100644
--- a/src/Adapter/Address/QueryHandler/GetManufacturerAddressForEditingHandler.php
+++ b/src/Adapter/Address/QueryHandler/GetManufacturerAddressForEditingHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Address\QueryHandler;
 
 use PrestaShop\PrestaShop\Adapter\Address\AbstractAddressHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Address\Query\GetManufacturerAddressForEditing;
 use PrestaShop\PrestaShop\Core\Domain\Address\QueryHandler\GetManufacturerAddressForEditingHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Address\QueryResult\EditableManufacturerAddress;
@@ -34,6 +35,7 @@
 /**
  * Handles query which gets manufacturer address for editing
  */
+#[AsQueryHandler]
 final class GetManufacturerAddressForEditingHandler extends AbstractAddressHandler implements GetManufacturerAddressForEditingHandlerInterface
 {
     /**
diff --git a/src/Adapter/Address/QueryHandler/GetRequiredFieldsForAddressHandler.php b/src/Adapter/Address/QueryHandler/GetRequiredFieldsForAddressHandler.php
index 4cdb508363d12..b6cf153df14ed 100644
--- a/src/Adapter/Address/QueryHandler/GetRequiredFieldsForAddressHandler.php
+++ b/src/Adapter/Address/QueryHandler/GetRequiredFieldsForAddressHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Address\QueryHandler;
 
 use PrestaShop\PrestaShop\Adapter\Address\AbstractCustomerAddressHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Address\Exception\AddressException;
 use PrestaShop\PrestaShop\Core\Domain\Address\Query\GetRequiredFieldsForAddress;
 use PrestaShop\PrestaShop\Core\Domain\Address\QueryHandler\GetRequiredFieldsForAddressHandlerInterface;
@@ -36,6 +37,7 @@
  *
  * @internal
  */
+#[AsQueryHandler]
 final class GetRequiredFieldsForAddressHandler extends AbstractCustomerAddressHandler implements GetRequiredFieldsForAddressHandlerInterface
 {
     /**
diff --git a/src/Adapter/Alias/CommandHandler/AddAliasHandler.php b/src/Adapter/Alias/CommandHandler/AddAliasHandler.php
index a3240766465b6..7d6a5383ca102 100644
--- a/src/Adapter/Alias/CommandHandler/AddAliasHandler.php
+++ b/src/Adapter/Alias/CommandHandler/AddAliasHandler.php
@@ -29,9 +29,11 @@
 namespace PrestaShop\PrestaShop\Adapter\Alias\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Alias\Repository\AliasRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Command\AddAliasCommand;
 use PrestaShop\PrestaShop\Core\Domain\Alias\CommandHandler\AddAliasHandlerInterface;
 
+#[AsCommandHandler]
 class AddAliasHandler implements AddAliasHandlerInterface
 {
     /**
diff --git a/src/Adapter/Alias/CommandHandler/BulkDeleteAliasHandler.php b/src/Adapter/Alias/CommandHandler/BulkDeleteAliasHandler.php
index f158f08f05fa5..a87d9397a3e31 100644
--- a/src/Adapter/Alias/CommandHandler/BulkDeleteAliasHandler.php
+++ b/src/Adapter/Alias/CommandHandler/BulkDeleteAliasHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Alias\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Alias\Repository\AliasRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\AbstractBulkCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Command\BulkDeleteAliasCommand;
 use PrestaShop\PrestaShop\Core\Domain\Alias\CommandHandler\BulkDeleteAliasHandlerInterface;
@@ -40,6 +41,7 @@
 /**
  * Handles command which deletes aliases in bulk action
  */
+#[AsCommandHandler]
 class BulkDeleteAliasHandler extends AbstractBulkCommandHandler implements BulkDeleteAliasHandlerInterface
 {
     public function __construct(protected AliasRepository $aliasRepository)
diff --git a/src/Adapter/Alias/CommandHandler/BulkUpdateAliasStatusHandler.php b/src/Adapter/Alias/CommandHandler/BulkUpdateAliasStatusHandler.php
index a136d0c30a1cf..cb2f15b56157b 100644
--- a/src/Adapter/Alias/CommandHandler/BulkUpdateAliasStatusHandler.php
+++ b/src/Adapter/Alias/CommandHandler/BulkUpdateAliasStatusHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Alias\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Alias\Repository\AliasRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\AbstractBulkCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Command\BulkUpdateAliasStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\Alias\CommandHandler\BulkUpdateAliasStatusHandlerInterface;
@@ -39,6 +40,7 @@
 use PrestaShop\PrestaShop\Core\Domain\Exception\BulkCommandExceptionInterface;
 use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\BulkFeatureException;
 
+#[AsCommandHandler]
 class BulkUpdateAliasStatusHandler extends AbstractBulkCommandHandler implements BulkUpdateAliasStatusHandlerInterface
 {
     /**
diff --git a/src/Adapter/Alias/CommandHandler/DeleteAliasHandler.php b/src/Adapter/Alias/CommandHandler/DeleteAliasHandler.php
index a97c5558c0b33..820f198d945cb 100644
--- a/src/Adapter/Alias/CommandHandler/DeleteAliasHandler.php
+++ b/src/Adapter/Alias/CommandHandler/DeleteAliasHandler.php
@@ -29,9 +29,11 @@
 namespace PrestaShop\PrestaShop\Adapter\Alias\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Alias\Repository\AliasRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Command\DeleteAliasCommand;
 use PrestaShop\PrestaShop\Core\Domain\Alias\CommandHandler\DeleteAliasHandlerInterface;
 
+#[AsCommandHandler]
 class DeleteAliasHandler implements DeleteAliasHandlerInterface
 {
     public function __construct(private readonly AliasRepository $aliasRepository)
diff --git a/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php b/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php
index e10aeac52f362..2a4314eb34310 100644
--- a/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php
+++ b/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php
@@ -29,9 +29,11 @@
 namespace PrestaShop\PrestaShop\Adapter\Alias\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Alias\Repository\AliasRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasCommand;
 use PrestaShop\PrestaShop\Core\Domain\Alias\CommandHandler\UpdateAliasHandlerInterface;
 
+#[AsCommandHandler]
 class UpdateAliasHandler implements UpdateAliasHandlerInterface
 {
     public function __construct(
diff --git a/src/Adapter/Alias/CommandHandler/UpdateAliasStatusHandler.php b/src/Adapter/Alias/CommandHandler/UpdateAliasStatusHandler.php
index 37aa04c8a7404..90b061003d2c0 100644
--- a/src/Adapter/Alias/CommandHandler/UpdateAliasStatusHandler.php
+++ b/src/Adapter/Alias/CommandHandler/UpdateAliasStatusHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Alias\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Alias\Repository\AliasRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\Alias\CommandHandler\UpdateAliasStatusHandlerInterfaces;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\CannotUpdateAliasException;
@@ -36,6 +37,7 @@
 /**
  * Toggles alias status
  */
+#[AsCommandHandler]
 class UpdateAliasStatusHandler implements UpdateAliasStatusHandlerInterfaces
 {
     /**
diff --git a/src/Adapter/Alias/QueryHandler/GetAliasForEditingHandler.php b/src/Adapter/Alias/QueryHandler/GetAliasForEditingHandler.php
index 07ccdcde53ada..ab189e08cceca 100644
--- a/src/Adapter/Alias/QueryHandler/GetAliasForEditingHandler.php
+++ b/src/Adapter/Alias/QueryHandler/GetAliasForEditingHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Alias\QueryHandler;
 
 use PrestaShop\PrestaShop\Adapter\Alias\Repository\AliasRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Query\GetAliasForEditing;
 use PrestaShop\PrestaShop\Core\Domain\Alias\QueryHandler\GetAliasForEditingHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Alias\QueryResult\AliasForEditing;
@@ -36,6 +37,7 @@
 /**
  * Handles the query @see GetAliasForEditing using legacy ObjectModel
  */
+#[AsQueryHandler]
 class GetAliasForEditingHandler implements GetAliasForEditingHandlerInterface
 {
     /**
diff --git a/src/Adapter/Attachment/CommandHandler/AddAttachmentHandler.php b/src/Adapter/Attachment/CommandHandler/AddAttachmentHandler.php
index e1bf26ac15053..340c5c69f52da 100644
--- a/src/Adapter/Attachment/CommandHandler/AddAttachmentHandler.php
+++ b/src/Adapter/Attachment/CommandHandler/AddAttachmentHandler.php
@@ -28,6 +28,7 @@
 
 use Attachment;
 use PrestaShop\PrestaShop\Adapter\Attachment\AbstractAttachmentHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Attachment\AttachmentFileUploaderInterface;
 use PrestaShop\PrestaShop\Core\Domain\Attachment\Command\AddAttachmentCommand;
 use PrestaShop\PrestaShop\Core\Domain\Attachment\CommandHandler\AddAttachmentHandlerInterface;
@@ -43,6 +44,7 @@
 /**
  * Handles attachment creation and file uploading procedures
  */
+#[AsCommandHandler]
 final class AddAttachmentHandler extends AbstractAttachmentHandler implements AddAttachmentHandlerInterface
 {
     /**
diff --git a/src/Adapter/Attachment/CommandHandler/BulkDeleteAttachmentsHandler.php b/src/Adapter/Attachment/CommandHandler/BulkDeleteAttachmentsHandler.php
index e638805047234..810ee787ae975 100644
--- a/src/Adapter/Attachment/CommandHandler/BulkDeleteAttachmentsHandler.php
+++ b/src/Adapter/Attachment/CommandHandler/BulkDeleteAttachmentsHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Attachment\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Attachment\AbstractAttachmentHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Attachment\Command\BulkDeleteAttachmentsCommand;
 use PrestaShop\PrestaShop\Core\Domain\Attachment\CommandHandler\BulkDeleteAttachmentsHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Attachment\Exception\AttachmentException;
@@ -35,6 +36,7 @@
 /**
  * Bulk delete attachments handler
  */
+#[AsCommandHandler]
 final class BulkDeleteAttachmentsHandler extends AbstractAttachmentHandler implements BulkDeleteAttachmentsHandlerInterface
 {
     /**
diff --git a/src/Adapter/Attachment/CommandHandler/DeleteAttachmentHandler.php b/src/Adapter/Attachment/CommandHandler/DeleteAttachmentHandler.php
index 09730822eab62..55a170b56710f 100644
--- a/src/Adapter/Attachment/CommandHandler/DeleteAttachmentHandler.php
+++ b/src/Adapter/Attachment/CommandHandler/DeleteAttachmentHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Attachment\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Attachment\AbstractAttachmentHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Attachment\Command\DeleteAttachmentCommand;
 use PrestaShop\PrestaShop\Core\Domain\Attachment\CommandHandler\DeleteAttachmentHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Attachment\Exception\AttachmentNotFoundException;
@@ -35,6 +36,7 @@
 /**
  * Delete attachment handler
  */
+#[AsCommandHandler]
 final class DeleteAttachmentHandler extends AbstractAttachmentHandler implements DeleteAttachmentHandlerInterface
 {
     /**
diff --git a/src/Adapter/Attachment/CommandHandler/EditAttachmentHandler.php b/src/Adapter/Attachment/CommandHandler/EditAttachmentHandler.php
index f62ef727f5dd7..bf06fe0b47d72 100644
--- a/src/Adapter/Attachment/CommandHandler/EditAttachmentHandler.php
+++ b/src/Adapter/Attachment/CommandHandler/EditAttachmentHandler.php
@@ -28,6 +28,7 @@
 
 use Attachment;
 use PrestaShop\PrestaShop\Adapter\Attachment\AbstractAttachmentHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Attachment\AttachmentFileUploaderInterface;
 use PrestaShop\PrestaShop\Core\Domain\Attachment\Command\EditAttachmentCommand;
 use PrestaShop\PrestaShop\Core\Domain\Attachment\CommandHandler\EditAttachmentHandlerInterface;
@@ -41,6 +42,7 @@
 /**
  * Handles editing of attachment and file uploading procedures
  */
+#[AsCommandHandler]
 final class EditAttachmentHandler extends AbstractAttachmentHandler implements EditAttachmentHandlerInterface
 {
     /**
diff --git a/src/Adapter/Attachment/QueryHandler/GetAttachmentForEditingHandler.php b/src/Adapter/Attachment/QueryHandler/GetAttachmentForEditingHandler.php
index 00fc65b0a33d8..a5710e7c7ef72 100644
--- a/src/Adapter/Attachment/QueryHandler/GetAttachmentForEditingHandler.php
+++ b/src/Adapter/Attachment/QueryHandler/GetAttachmentForEditingHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Attachment\QueryHandler;
 
 use Attachment;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Attachment\Exception\AttachmentNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Attachment\Query\GetAttachmentForEditing;
 use PrestaShop\PrestaShop\Core\Domain\Attachment\QueryHandler\GetAttachmentForEditingHandlerInterface;
@@ -39,6 +40,7 @@
  *
  * @internal
  */
+#[AsQueryHandler]
 final class GetAttachmentForEditingHandler implements GetAttachmentForEditingHandlerInterface
 {
     /**
diff --git a/src/Adapter/Attachment/QueryHandler/GetAttachmentHandler.php b/src/Adapter/Attachment/QueryHandler/GetAttachmentHandler.php
index 316fb8e2454a6..70ff1badad28d 100644
--- a/src/Adapter/Attachment/QueryHandler/GetAttachmentHandler.php
+++ b/src/Adapter/Attachment/QueryHandler/GetAttachmentHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Attachment\QueryHandler;
 
 use PrestaShop\PrestaShop\Adapter\Attachment\AbstractAttachmentHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Attachment\Exception\AttachmentNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Attachment\Query\GetAttachment;
 use PrestaShop\PrestaShop\Core\Domain\Attachment\QueryHandler\GetAttachmentHandlerInterface;
@@ -35,6 +36,7 @@
 /**
  * Provides path and original file name of attachment
  */
+#[AsQueryHandler]
 final class GetAttachmentHandler extends AbstractAttachmentHandler implements GetAttachmentHandlerInterface
 {
     /**
diff --git a/src/Adapter/Attachment/QueryHandler/GetAttachmentInformationHandler.php b/src/Adapter/Attachment/QueryHandler/GetAttachmentInformationHandler.php
index efaa3e136e5b7..d0cf58d823dca 100644
--- a/src/Adapter/Attachment/QueryHandler/GetAttachmentInformationHandler.php
+++ b/src/Adapter/Attachment/QueryHandler/GetAttachmentInformationHandler.php
@@ -28,6 +28,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Attachment\QueryHandler;
 
 use PrestaShop\PrestaShop\Adapter\Attachment\AttachmentRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Attachment\Query\GetAttachmentInformation;
 use PrestaShop\PrestaShop\Core\Domain\Attachment\QueryHandler\GetAttachmentInformationHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Attachment\QueryResult\AttachmentInformation;
@@ -35,6 +36,7 @@
 /**
  * Handles @see GetAttachmentInformation query using legacy object model
  */
+#[AsQueryHandler]
 class GetAttachmentInformationHandler implements GetAttachmentInformationHandlerInterface
 {
     /**
diff --git a/src/Adapter/Attachment/QueryHandler/SearchAttachmentHandler.php b/src/Adapter/Attachment/QueryHandler/SearchAttachmentHandler.php
index e6817b1ad7f06..a7c3fafbb61d0 100644
--- a/src/Adapter/Attachment/QueryHandler/SearchAttachmentHandler.php
+++ b/src/Adapter/Attachment/QueryHandler/SearchAttachmentHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Attachment\QueryHandler;
 
 use PrestaShop\PrestaShop\Adapter\Attachment\AttachmentRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Attachment\Exception\EmptySearchException;
 use PrestaShop\PrestaShop\Core\Domain\Attachment\Query\SearchAttachment;
 use PrestaShop\PrestaShop\Core\Domain\Attachment\QueryHandler\SearchAttachmentHandlerInterface;
@@ -37,6 +38,7 @@
 /**
  * Handles @see SearchAttachment query using legacy object model
  */
+#[AsQueryHandler]
 class SearchAttachmentHandler implements SearchAttachmentHandlerInterface
 {
     /**
diff --git a/src/Adapter/Attribute/CommandHandler/BulkDeleteAttributeHandler.php b/src/Adapter/Attribute/CommandHandler/BulkDeleteAttributeHandler.php
index f281e9bc8f450..94c570eff6553 100644
--- a/src/Adapter/Attribute/CommandHandler/BulkDeleteAttributeHandler.php
+++ b/src/Adapter/Attribute/CommandHandler/BulkDeleteAttributeHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Attribute\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Attribute\AbstractAttributeHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\Command\BulkDeleteAttributeCommand;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\CommandHandler\BulkDeleteAttributeHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\Exception\AttributeException;
@@ -35,6 +36,7 @@
 /**
  * Handles command which deletes attributes in bulk action using legacy object model
  */
+#[AsCommandHandler]
 final class BulkDeleteAttributeHandler extends AbstractAttributeHandler implements BulkDeleteAttributeHandlerInterface
 {
     /**
diff --git a/src/Adapter/Attribute/CommandHandler/DeleteAttributeHandler.php b/src/Adapter/Attribute/CommandHandler/DeleteAttributeHandler.php
index cae898336f537..c31de23ba1721 100644
--- a/src/Adapter/Attribute/CommandHandler/DeleteAttributeHandler.php
+++ b/src/Adapter/Attribute/CommandHandler/DeleteAttributeHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Attribute\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Attribute\AbstractAttributeHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\Command\DeleteAttributeCommand;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\CommandHandler\DeleteAttributeHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\Exception\AttributeException;
@@ -35,6 +36,7 @@
 /**
  * Handles command which deletes the Attribute using legacy object model
  */
+#[AsCommandHandler]
 final class DeleteAttributeHandler extends AbstractAttributeHandler implements DeleteAttributeHandlerInterface
 {
     /**
diff --git a/src/Adapter/AttributeGroup/CommandHandler/BulkDeleteAttributeGroupHandler.php b/src/Adapter/AttributeGroup/CommandHandler/BulkDeleteAttributeGroupHandler.php
index 1d2c7832855fc..e4322f0106051 100644
--- a/src/Adapter/AttributeGroup/CommandHandler/BulkDeleteAttributeGroupHandler.php
+++ b/src/Adapter/AttributeGroup/CommandHandler/BulkDeleteAttributeGroupHandler.php
@@ -28,6 +28,7 @@
 namespace PrestaShop\PrestaShop\Adapter\AttributeGroup\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\AttributeGroup\AbstractAttributeGroupHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\BulkDeleteAttributeGroupCommand;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\CommandHandler\BulkDeleteAttributeGroupHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\DeleteAttributeGroupException;
@@ -35,6 +36,7 @@
 /**
  * Handles command which deletes multiple attribute groups using legacy object model
  */
+#[AsCommandHandler]
 final class BulkDeleteAttributeGroupHandler extends AbstractAttributeGroupHandler implements BulkDeleteAttributeGroupHandlerInterface
 {
     /**
diff --git a/src/Adapter/AttributeGroup/CommandHandler/DeleteAttributeGroupHandler.php b/src/Adapter/AttributeGroup/CommandHandler/DeleteAttributeGroupHandler.php
index 55970b2912c8f..f5dfc4d6ee3ef 100644
--- a/src/Adapter/AttributeGroup/CommandHandler/DeleteAttributeGroupHandler.php
+++ b/src/Adapter/AttributeGroup/CommandHandler/DeleteAttributeGroupHandler.php
@@ -28,6 +28,7 @@
 namespace PrestaShop\PrestaShop\Adapter\AttributeGroup\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\AttributeGroup\AbstractAttributeGroupHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\DeleteAttributeGroupCommand;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\CommandHandler\DeleteAttributeGroupHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupException;
@@ -36,6 +37,7 @@
 /**
  * Handles command which deletes attribute group using legacy object model
  */
+#[AsCommandHandler]
 final class DeleteAttributeGroupHandler extends AbstractAttributeGroupHandler implements DeleteAttributeGroupHandlerInterface
 {
     /**
diff --git a/src/Adapter/AttributeGroup/QueryHandler/GetAttributeGroupListHandler.php b/src/Adapter/AttributeGroup/QueryHandler/GetAttributeGroupListHandler.php
index dd517d108e4ba..b94c6beb7cdd7 100644
--- a/src/Adapter/AttributeGroup/QueryHandler/GetAttributeGroupListHandler.php
+++ b/src/Adapter/AttributeGroup/QueryHandler/GetAttributeGroupListHandler.php
@@ -28,6 +28,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\AttributeGroup\QueryHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Query\GetAttributeGroupList;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\QueryHandler\GetAttributeGroupListHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupId;
@@ -35,6 +36,7 @@
 /**
  * Handles the query GetAttributeGroupList using Doctrine repository
  */
+#[AsQueryHandler]
 class GetAttributeGroupListHandler extends AbstractAttributeGroupQueryHandler implements GetAttributeGroupListHandlerInterface
 {
     /**
diff --git a/src/Adapter/CMS/Page/CommandHandler/AddCmsPageHandler.php b/src/Adapter/CMS/Page/CommandHandler/AddCmsPageHandler.php
index de47853c8195d..cc72585db09a8 100644
--- a/src/Adapter/CMS/Page/CommandHandler/AddCmsPageHandler.php
+++ b/src/Adapter/CMS/Page/CommandHandler/AddCmsPageHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler;
 
 use CMS;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\AddCmsPageCommand;
 use PrestaShop\PrestaShop\Core\Domain\CmsPage\CommandHandler\AddCmsPageHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\CmsPage\Exception\CannotAddCmsPageException;
@@ -37,6 +38,7 @@
 /**
  * Handles AddCmsPageCommand using legacy object model
  */
+#[AsCommandHandler]
 final class AddCmsPageHandler extends AbstractCmsPageHandler implements AddCmsPageHandlerInterface
 {
     /**
diff --git a/src/Adapter/CMS/Page/CommandHandler/BulkDeleteCmsPageHandler.php b/src/Adapter/CMS/Page/CommandHandler/BulkDeleteCmsPageHandler.php
index 40fa53a69e394..e1a96f39a07ef 100644
--- a/src/Adapter/CMS/Page/CommandHandler/BulkDeleteCmsPageHandler.php
+++ b/src/Adapter/CMS/Page/CommandHandler/BulkDeleteCmsPageHandler.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\BulkDeleteCmsPageCommand;
 use PrestaShop\PrestaShop\Core\Domain\CmsPage\CommandHandler\BulkDeleteCmsPageHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\CmsPage\Exception\CannotDeleteCmsPageException;
@@ -35,6 +36,7 @@
 /**
  * Deletes multiple cms pages
  */
+#[AsCommandHandler]
 final class BulkDeleteCmsPageHandler extends AbstractCmsPageHandler implements BulkDeleteCmsPageHandlerInterface
 {
     /**
diff --git a/src/Adapter/CMS/Page/CommandHandler/BulkDisableCmsPageHandler.php b/src/Adapter/CMS/Page/CommandHandler/BulkDisableCmsPageHandler.php
index c28b9f2e20068..918f2e3fe3cfa 100644
--- a/src/Adapter/CMS/Page/CommandHandler/BulkDisableCmsPageHandler.php
+++ b/src/Adapter/CMS/Page/CommandHandler/BulkDisableCmsPageHandler.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\BulkDisableCmsPageCommand;
 use PrestaShop\PrestaShop\Core\Domain\CmsPage\CommandHandler\BulkDisableCmsPageHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\CmsPage\Exception\CannotDisableCmsPageException;
@@ -36,6 +37,7 @@
 /**
  * Disables multiple cms pages.
  */
+#[AsCommandHandler]
 final class BulkDisableCmsPageHandler extends AbstractCmsPageHandler implements BulkDisableCmsPageHandlerInterface
 {
     /**
diff --git a/src/Adapter/CMS/Page/CommandHandler/BulkEnableCmsPageHandler.php b/src/Adapter/CMS/Page/CommandHandler/BulkEnableCmsPageHandler.php
index 6f2ce07ca12e9..27ecae4854024 100644
--- a/src/Adapter/CMS/Page/CommandHandler/BulkEnableCmsPageHandler.php
+++ b/src/Adapter/CMS/Page/CommandHandler/BulkEnableCmsPageHandler.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\BulkEnableCmsPageCommand;
 use PrestaShop\PrestaShop\Core\Domain\CmsPage\CommandHandler\BulkEnableCmsPageHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\CmsPage\Exception\CannotEnableCmsPageException;
@@ -36,6 +37,7 @@
 /**
  * Enables multiple cms pages.
  */
+#[AsCommandHandler]
 final class BulkEnableCmsPageHandler extends AbstractCmsPageHandler implements BulkEnableCmsPageHandlerInterface
 {
     /**
diff --git a/src/Adapter/CMS/Page/CommandHandler/DeleteCmsPageHandler.php b/src/Adapter/CMS/Page/CommandHandler/DeleteCmsPageHandler.php
index 739575d3352f4..c59548b58ea6b 100644
--- a/src/Adapter/CMS/Page/CommandHandler/DeleteCmsPageHandler.php
+++ b/src/Adapter/CMS/Page/CommandHandler/DeleteCmsPageHandler.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\DeleteCmsPageCommand;
 use PrestaShop\PrestaShop\Core\Domain\CmsPage\CommandHandler\DeleteCmsPageHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\CmsPage\Exception\CannotDeleteCmsPageException;
@@ -35,6 +36,7 @@
 /**
  * Deletes given cms page.
  */
+#[AsCommandHandler]
 final class DeleteCmsPageHandler extends AbstractCmsPageHandler implements DeleteCmsPageHandlerInterface
 {
     /**
diff --git a/src/Adapter/CMS/Page/CommandHandler/EditCmsPageHandler.php b/src/Adapter/CMS/Page/CommandHandler/EditCmsPageHandler.php
index 3c6e4a5843b1d..720ab56f21c1f 100644
--- a/src/Adapter/CMS/Page/CommandHandler/EditCmsPageHandler.php
+++ b/src/Adapter/CMS/Page/CommandHandler/EditCmsPageHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler;
 
 use CMS;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\EditCmsPageCommand;
 use PrestaShop\PrestaShop\Core\Domain\CmsPage\CommandHandler\EditCmsPageHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\CmsPage\Exception\CannotEditCmsPageException;
@@ -38,6 +39,7 @@
 /**
  * Edits cms page
  */
+#[AsCommandHandler]
 final class EditCmsPageHandler extends AbstractCmsPageHandler implements EditCmsPageHandlerInterface
 {
     /**
diff --git a/src/Adapter/CMS/Page/CommandHandler/ToggleCmsPageStatusHandler.php b/src/Adapter/CMS/Page/CommandHandler/ToggleCmsPageStatusHandler.php
index b592cacada8f4..dabe7356d56a1 100644
--- a/src/Adapter/CMS/Page/CommandHandler/ToggleCmsPageStatusHandler.php
+++ b/src/Adapter/CMS/Page/CommandHandler/ToggleCmsPageStatusHandler.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\ToggleCmsPageStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\CmsPage\CommandHandler\ToggleCmsPageStatusHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\CmsPage\Exception\CannotToggleCmsPageException;
@@ -35,6 +36,7 @@
 /**
  * Changes the status of cms page.
  */
+#[AsCommandHandler]
 final class ToggleCmsPageStatusHandler extends AbstractCmsPageHandler implements ToggleCmsPageStatusHandlerInterface
 {
     /**
diff --git a/src/Adapter/CMS/Page/QueryHandler/GetCmsCategoryIdForRedirectionHandler.php b/src/Adapter/CMS/Page/QueryHandler/GetCmsCategoryIdForRedirectionHandler.php
index 491920daeacad..95bd8f7d61e89 100644
--- a/src/Adapter/CMS/Page/QueryHandler/GetCmsCategoryIdForRedirectionHandler.php
+++ b/src/Adapter/CMS/Page/QueryHandler/GetCmsCategoryIdForRedirectionHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\CMS\Page\QueryHandler;
 
 use PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler\AbstractCmsPageHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\CmsPage\Exception\CmsPageException;
 use PrestaShop\PrestaShop\Core\Domain\CmsPage\Query\GetCmsCategoryIdForRedirection;
 use PrestaShop\PrestaShop\Core\Domain\CmsPage\QueryHandler\GetCmsCategoryIdHandlerForRedirectionInterface;
@@ -36,6 +37,7 @@
  * This class is used for getting the id which is used later on to redirect to the right page after certain controller
  * actions.
  */
+#[AsQueryHandler]
 final class GetCmsCategoryIdForRedirectionHandler extends AbstractCmsPageHandler implements GetCmsCategoryIdHandlerForRedirectionInterface
 {
     /**
diff --git a/src/Adapter/CMS/Page/QueryHandler/GetCmsPageForEditingHandler.php b/src/Adapter/CMS/Page/QueryHandler/GetCmsPageForEditingHandler.php
index 83c887962d88b..5bb322fd1a314 100644
--- a/src/Adapter/CMS/Page/QueryHandler/GetCmsPageForEditingHandler.php
+++ b/src/Adapter/CMS/Page/QueryHandler/GetCmsPageForEditingHandler.php
@@ -28,6 +28,7 @@
 
 use Link;
 use PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler\AbstractCmsPageHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\CmsPage\Exception\CmsPageException;
 use PrestaShop\PrestaShop\Core\Domain\CmsPage\Exception\CmsPageNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\CmsPage\Query\GetCmsPageForEditing;
@@ -39,6 +40,7 @@
 /**
  * Gets cms page for editing
  */
+#[AsQueryHandler]
 final class GetCmsPageForEditingHandler extends AbstractCmsPageHandler implements GetCmsPageForEditingHandlerInterface
 {
     /**
diff --git a/src/Adapter/CMS/PageCategory/CommandHandler/AddCmsPageCategoryHandler.php b/src/Adapter/CMS/PageCategory/CommandHandler/AddCmsPageCategoryHandler.php
index ea67b22cb0642..a597486455d19 100644
--- a/src/Adapter/CMS/PageCategory/CommandHandler/AddCmsPageCategoryHandler.php
+++ b/src/Adapter/CMS/PageCategory/CommandHandler/AddCmsPageCategoryHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler;
 
 use CMSCategory;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\AddCmsPageCategoryCommand;
 use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\CommandHandler\AddCmsPageCategoryHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Exception\CannotAddCmsPageCategoryException;
@@ -38,6 +39,7 @@
 /**
  * Adds cms page category
  */
+#[AsCommandHandler]
 final class AddCmsPageCategoryHandler extends AbstractCmsPageCategoryHandler implements AddCmsPageCategoryHandlerInterface
 {
     /**
diff --git a/src/Adapter/CMS/PageCategory/CommandHandler/BulkDeleteCmsPageCategoryHandler.php b/src/Adapter/CMS/PageCategory/CommandHandler/BulkDeleteCmsPageCategoryHandler.php
index f9a9c6ae43388..7a22aa4126150 100644
--- a/src/Adapter/CMS/PageCategory/CommandHandler/BulkDeleteCmsPageCategoryHandler.php
+++ b/src/Adapter/CMS/PageCategory/CommandHandler/BulkDeleteCmsPageCategoryHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler;
 
 use CMSCategory;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\BulkDeleteCmsPageCategoryCommand;
 use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\CommandHandler\BulkDeleteCmsPageCategoryHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Exception\CannotDeleteCmsPageCategoryException;
@@ -37,6 +38,7 @@
 /**
  * Class BulkDeleteCmsPageCategoryHandler is responsible for deleting multiple cms page categories.
  */
+#[AsCommandHandler]
 final class BulkDeleteCmsPageCategoryHandler implements BulkDeleteCmsPageCategoryHandlerInterface
 {
     /**
diff --git a/src/Adapter/CMS/PageCategory/CommandHandler/BulkDisableCmsPageCategoryHandler.php b/src/Adapter/CMS/PageCategory/CommandHandler/BulkDisableCmsPageCategoryHandler.php
index d05ef260b9818..94d2a3ca56a19 100644
--- a/src/Adapter/CMS/PageCategory/CommandHandler/BulkDisableCmsPageCategoryHandler.php
+++ b/src/Adapter/CMS/PageCategory/CommandHandler/BulkDisableCmsPageCategoryHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler;
 
 use CMSCategory;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\BulkDisableCmsPageCategoryCommand;
 use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\CommandHandler\BulkDisableCmsPageCategoryHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Exception\CannotDisableCmsPageCategoryException;
@@ -37,6 +38,7 @@
 /**
  * Class BulkDisableCmsPageCategoryHandler is responsible for deleting multiple cms page categories.
  */
+#[AsCommandHandler]
 final class BulkDisableCmsPageCategoryHandler implements BulkDisableCmsPageCategoryHandlerInterface
 {
     /**
diff --git a/src/Adapter/CMS/PageCategory/CommandHandler/BulkEnableCmsPageCategoryHandler.php b/src/Adapter/CMS/PageCategory/CommandHandler/BulkEnableCmsPageCategoryHandler.php
index 009dfb7a1525f..c609c4a28f2d8 100644
--- a/src/Adapter/CMS/PageCategory/CommandHandler/BulkEnableCmsPageCategoryHandler.php
+++ b/src/Adapter/CMS/PageCategory/CommandHandler/BulkEnableCmsPageCategoryHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler;
 
 use CMSCategory;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\BulkEnableCmsPageCategoryCommand;
 use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\CommandHandler\BulkEnableCmsPageCategoryHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Exception\CannotEnableCmsPageCategoryException;
@@ -37,6 +38,7 @@
 /**
  * Class BulkEnableCmsPageCategoryCommand is responsible for enabling cms category pages.
  */
+#[AsCommandHandler]
 final class BulkEnableCmsPageCategoryHandler implements BulkEnableCmsPageCategoryHandlerInterface
 {
     /**
diff --git a/src/Adapter/CMS/PageCategory/CommandHandler/DeleteCmsPageCategoryHandler.php b/src/Adapter/CMS/PageCategory/CommandHandler/DeleteCmsPageCategoryHandler.php
index 76ae18407c717..1c2a17efc4e6b 100644
--- a/src/Adapter/CMS/PageCategory/CommandHandler/DeleteCmsPageCategoryHandler.php
+++ b/src/Adapter/CMS/PageCategory/CommandHandler/DeleteCmsPageCategoryHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler;
 
 use CMSCategory;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\DeleteCmsPageCategoryCommand;
 use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\CommandHandler\DeleteCmsPageCategoryHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Exception\CannotDeleteCmsPageCategoryException;
@@ -37,6 +38,7 @@
 /**
  * Class DeleteCmsPageCategoryHandler is responsible for deleting cms page category.
  */
+#[AsCommandHandler]
 final class DeleteCmsPageCategoryHandler implements DeleteCmsPageCategoryHandlerInterface
 {
     /**
diff --git a/src/Adapter/CMS/PageCategory/CommandHandler/EditCmsPageCategoryHandler.php b/src/Adapter/CMS/PageCategory/CommandHandler/EditCmsPageCategoryHandler.php
index e954064edf909..1aa723507ca8f 100644
--- a/src/Adapter/CMS/PageCategory/CommandHandler/EditCmsPageCategoryHandler.php
+++ b/src/Adapter/CMS/PageCategory/CommandHandler/EditCmsPageCategoryHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler;
 
 use CMSCategory;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\EditCmsPageCategoryCommand;
 use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\CommandHandler\EditCmsPageCategoryHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Exception\CannotUpdateCmsPageCategoryException;
@@ -38,6 +39,7 @@
 /**
  * Edits cms page category.
  */
+#[AsCommandHandler]
 final class EditCmsPageCategoryHandler extends AbstractCmsPageCategoryHandler implements EditCmsPageCategoryHandlerInterface
 {
     /**
diff --git a/src/Adapter/CMS/PageCategory/CommandHandler/ToggleCmsPageCategoryStatusHandler.php b/src/Adapter/CMS/PageCategory/CommandHandler/ToggleCmsPageCategoryStatusHandler.php
index f48a04cefb12c..d03d125c58ad7 100644
--- a/src/Adapter/CMS/PageCategory/CommandHandler/ToggleCmsPageCategoryStatusHandler.php
+++ b/src/Adapter/CMS/PageCategory/CommandHandler/ToggleCmsPageCategoryStatusHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler;
 
 use CMSCategory;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\ToggleCmsPageCategoryStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\CommandHandler\ToggleCmsPageCategoryStatusHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Exception\CannotToggleCmsPageCategoryStatusException;
@@ -37,6 +38,7 @@
 /**
  * Class ToggleCmsPageCategoryStatusHandler is responsible for turning on and off cms page category status.
  */
+#[AsCommandHandler]
 final class ToggleCmsPageCategoryStatusHandler implements ToggleCmsPageCategoryStatusHandlerInterface
 {
     /**
diff --git a/src/Adapter/CMS/PageCategory/QueryHandler/GetCmsPageCategoriesForBreadcrumbHandler.php b/src/Adapter/CMS/PageCategory/QueryHandler/GetCmsPageCategoriesForBreadcrumbHandler.php
index f28a8db7c963e..66143bfb6fc85 100644
--- a/src/Adapter/CMS/PageCategory/QueryHandler/GetCmsPageCategoriesForBreadcrumbHandler.php
+++ b/src/Adapter/CMS/PageCategory/QueryHandler/GetCmsPageCategoriesForBreadcrumbHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\CMS\PageCategory\QueryHandler;
 
 use CMSCategory;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Exception\CmsPageCategoryException;
 use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Exception\CmsPageCategoryNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Query\GetCmsPageCategoriesForBreadcrumb;
@@ -40,6 +41,7 @@
  * Class GetCmsPageCategoriesForBreadcrumbHandler is responsible for providing required data for displaying cms page category
  * breadcrumbs.
  */
+#[AsQueryHandler]
 final class GetCmsPageCategoriesForBreadcrumbHandler implements GetCmsPageCategoriesForBreadcrumbHandlerInterface
 {
     /**
diff --git a/src/Adapter/CMS/PageCategory/QueryHandler/GetCmsPageCategoryForEditingHandler.php b/src/Adapter/CMS/PageCategory/QueryHandler/GetCmsPageCategoryForEditingHandler.php
index 2df16abfc6c4c..0621ab11e28ca 100644
--- a/src/Adapter/CMS/PageCategory/QueryHandler/GetCmsPageCategoryForEditingHandler.php
+++ b/src/Adapter/CMS/PageCategory/QueryHandler/GetCmsPageCategoryForEditingHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\CMS\PageCategory\QueryHandler;
 
 use CMSCategory;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Exception\CmsPageCategoryException;
 use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Exception\CmsPageCategoryNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Query\GetCmsPageCategoryForEditing;
@@ -39,6 +40,7 @@
  *
  * @internal
  */
+#[AsQueryHandler]
 final class GetCmsPageCategoryForEditingHandler implements GetCmsPageCategoryForEditingHandlerInterface
 {
     /**
diff --git a/src/Adapter/CMS/PageCategory/QueryHandler/GetCmsPageCategoryNameForListingHandler.php b/src/Adapter/CMS/PageCategory/QueryHandler/GetCmsPageCategoryNameForListingHandler.php
index d19cd31a5c7de..bd181fd65ec01 100644
--- a/src/Adapter/CMS/PageCategory/QueryHandler/GetCmsPageCategoryNameForListingHandler.php
+++ b/src/Adapter/CMS/PageCategory/QueryHandler/GetCmsPageCategoryNameForListingHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\CMS\PageCategory\QueryHandler;
 
 use CMSCategory;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Query\GetCmsPageCategoryNameForListing;
 use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\QueryHandler\GetCmsPageCategoryNameForListingHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\ValueObject\CmsPageCategoryId;
@@ -35,6 +36,7 @@
 /**
  * Gets name by cms category which are used for display in cms listing.
  */
+#[AsQueryHandler]
 final class GetCmsPageCategoryNameForListingHandler implements GetCmsPageCategoryNameForListingHandlerInterface
 {
     /**
diff --git a/src/Adapter/CMS/PageCategory/QueryHandler/GetCmsPageParentCategoryIdForRedirectionHandler.php b/src/Adapter/CMS/PageCategory/QueryHandler/GetCmsPageParentCategoryIdForRedirectionHandler.php
index 3221262a84b85..91ec56107c794 100644
--- a/src/Adapter/CMS/PageCategory/QueryHandler/GetCmsPageParentCategoryIdForRedirectionHandler.php
+++ b/src/Adapter/CMS/PageCategory/QueryHandler/GetCmsPageParentCategoryIdForRedirectionHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\CMS\PageCategory\QueryHandler;
 
 use CMSCategory;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Exception\CmsPageCategoryException;
 use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Query\GetCmsPageParentCategoryIdForRedirection;
 use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\QueryHandler\GetCmsPageParentCategoryIdForRedirectionHandlerInterface;
@@ -37,6 +38,7 @@
  * Class GetCmsPageParentCategoryIdForRedirectionHandler is responsible for providing cms page categories parent id
  * for redirecting to the right controller after create, edit, delete, toggle actions.
  */
+#[AsQueryHandler]
 final class GetCmsPageParentCategoryIdForRedirectionHandler implements GetCmsPageParentCategoryIdForRedirectionHandlerInterface
 {
     /**
diff --git a/src/Adapter/Carrier/CommandHandler/BulkDeleteCarrierHandler.php b/src/Adapter/Carrier/CommandHandler/BulkDeleteCarrierHandler.php
index e83a310325a13..7c7c05c345463 100644
--- a/src/Adapter/Carrier/CommandHandler/BulkDeleteCarrierHandler.php
+++ b/src/Adapter/Carrier/CommandHandler/BulkDeleteCarrierHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Carrier\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Carrier\AbstractCarrierHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Carrier\Command\BulkDeleteCarrierCommand;
 use PrestaShop\PrestaShop\Core\Domain\Carrier\CommandHandler\BulkDeleteCarrierHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Carrier\Exception\CannotDeleteCarrierException;
@@ -38,6 +39,7 @@
 /**
  * Bulk deletes carriers
  */
+#[AsCommandHandler]
 class BulkDeleteCarrierHandler extends AbstractCarrierHandler implements BulkDeleteCarrierHandlerInterface
 {
     /**
diff --git a/src/Adapter/Carrier/CommandHandler/BulkToggleCarrierStatusHandler.php b/src/Adapter/Carrier/CommandHandler/BulkToggleCarrierStatusHandler.php
index 12f4ae78706b2..e23c53c165da6 100644
--- a/src/Adapter/Carrier/CommandHandler/BulkToggleCarrierStatusHandler.php
+++ b/src/Adapter/Carrier/CommandHandler/BulkToggleCarrierStatusHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Carrier\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Carrier\AbstractCarrierHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Carrier\Command\BulkToggleCarrierStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\Carrier\CommandHandler\BulkToggleCarrierStatusHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Carrier\Exception\CannotToggleCarrierStatusException;
@@ -38,6 +39,7 @@
 /**
  * Bulk toggles carriers status
  */
+#[AsCommandHandler]
 class BulkToggleCarrierStatusHandler extends AbstractCarrierHandler implements BulkToggleCarrierStatusHandlerInterface
 {
     /**
diff --git a/src/Adapter/Carrier/CommandHandler/DeleteCarrierHandler.php b/src/Adapter/Carrier/CommandHandler/DeleteCarrierHandler.php
index 58a7861066402..f468398d39e45 100644
--- a/src/Adapter/Carrier/CommandHandler/DeleteCarrierHandler.php
+++ b/src/Adapter/Carrier/CommandHandler/DeleteCarrierHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Carrier\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Carrier\AbstractCarrierHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Carrier\Command\DeleteCarrierCommand;
 use PrestaShop\PrestaShop\Core\Domain\Carrier\CommandHandler\DeleteCarrierHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Carrier\Exception\CannotDeleteCarrierException;
@@ -38,6 +39,7 @@
 /**
  * Handles command that deletes carrier
  */
+#[AsCommandHandler]
 class DeleteCarrierHandler extends AbstractCarrierHandler implements DeleteCarrierHandlerInterface
 {
     /**
diff --git a/src/Adapter/Carrier/CommandHandler/ToggleCarrierIsFreeHandler.php b/src/Adapter/Carrier/CommandHandler/ToggleCarrierIsFreeHandler.php
index a58f1745a4cfa..451fa15af78a6 100644
--- a/src/Adapter/Carrier/CommandHandler/ToggleCarrierIsFreeHandler.php
+++ b/src/Adapter/Carrier/CommandHandler/ToggleCarrierIsFreeHandler.php
@@ -29,12 +29,14 @@
 namespace PrestaShop\PrestaShop\Adapter\Carrier\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Carrier\AbstractCarrierHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Carrier\Command\ToggleCarrierIsFreeCommand;
 use PrestaShop\PrestaShop\Core\Domain\Carrier\CommandHandler\ToggleCarrierIsFreeHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Carrier\Exception\CannotToggleCarrierIsFreeStatusException;
 use PrestaShop\PrestaShop\Core\Domain\Carrier\Exception\CarrierException;
 use PrestaShopException;
 
+#[AsCommandHandler]
 class ToggleCarrierIsFreeHandler extends AbstractCarrierHandler implements ToggleCarrierIsFreeHandlerInterface
 {
     /**
diff --git a/src/Adapter/Carrier/CommandHandler/ToggleCarrierStatusHandler.php b/src/Adapter/Carrier/CommandHandler/ToggleCarrierStatusHandler.php
index f7fee0bd7cc55..25bc6486cc67a 100644
--- a/src/Adapter/Carrier/CommandHandler/ToggleCarrierStatusHandler.php
+++ b/src/Adapter/Carrier/CommandHandler/ToggleCarrierStatusHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Carrier\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Carrier\AbstractCarrierHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Carrier\Command\ToggleCarrierStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\Carrier\CommandHandler\ToggleCarrierStatusHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Carrier\Exception\CannotToggleCarrierStatusException;
@@ -38,6 +39,7 @@
 /**
  * Handles command that toggle carrier status
  */
+#[AsCommandHandler]
 class ToggleCarrierStatusHandler extends AbstractCarrierHandler implements ToggleCarrierStatusHandlerInterface
 {
     /**
diff --git a/src/Adapter/Cart/CommandHandler/AddCartRuleToCartHandler.php b/src/Adapter/Cart/CommandHandler/AddCartRuleToCartHandler.php
index 73506b64f6519..5f3386422046c 100644
--- a/src/Adapter/Cart/CommandHandler/AddCartRuleToCartHandler.php
+++ b/src/Adapter/Cart/CommandHandler/AddCartRuleToCartHandler.php
@@ -34,6 +34,7 @@
 use Customer;
 use PrestaShop\PrestaShop\Adapter\Cart\AbstractCartHandler;
 use PrestaShop\PrestaShop\Adapter\ContextStateManager;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Cart\Command\AddCartRuleToCartCommand;
 use PrestaShop\PrestaShop\Core\Domain\Cart\CommandHandler\AddCartRuleToCartHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Cart\Exception\CartException;
@@ -43,6 +44,7 @@
 /**
  * @internal
  */
+#[AsCommandHandler]
 final class AddCartRuleToCartHandler extends AbstractCartHandler implements AddCartRuleToCartHandlerInterface
 {
     /**
diff --git a/src/Adapter/Cart/CommandHandler/AddCustomizationHandler.php b/src/Adapter/Cart/CommandHandler/AddCustomizationHandler.php
index 58d5836c496a5..e865f79182add 100644
--- a/src/Adapter/Cart/CommandHandler/AddCustomizationHandler.php
+++ b/src/Adapter/Cart/CommandHandler/AddCustomizationHandler.php
@@ -30,6 +30,7 @@
 use CustomizationField;
 use ImageManager;
 use PrestaShop\PrestaShop\Adapter\Cart\AbstractCartHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Cart\Command\AddCustomizationCommand;
 use PrestaShop\PrestaShop\Core\Domain\Cart\CommandHandler\AddCustomizationHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Cart\Exception\CartNotFoundException;
@@ -46,6 +47,7 @@
 /**
  * Handles @var AddCustomizationCommand using legacy object model.
  */
+#[AsCommandHandler]
 final class AddCustomizationHandler extends AbstractCartHandler implements AddCustomizationHandlerInterface
 {
     /**
diff --git a/src/Adapter/Cart/CommandHandler/AddProductToCartHandler.php b/src/Adapter/Cart/CommandHandler/AddProductToCartHandler.php
index 8a3861731efd2..4d17af6b918ad 100644
--- a/src/Adapter/Cart/CommandHandler/AddProductToCartHandler.php
+++ b/src/Adapter/Cart/CommandHandler/AddProductToCartHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Cart\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Cart\AbstractCartHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Cart\Command\AddCustomizationCommand;
 use PrestaShop\PrestaShop\Core\Domain\Cart\Command\AddProductToCartCommand;
 use PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateProductQuantityInCartCommand;
@@ -38,6 +39,7 @@
 /**
  * Handles add product to cart command
  */
+#[AsCommandHandler]
 final class AddProductToCartHandler extends AbstractCartHandler implements AddProductToCartHandlerInterface
 {
     /**
diff --git a/src/Adapter/Cart/CommandHandler/CreateEmptyCustomerCartHandler.php b/src/Adapter/Cart/CommandHandler/CreateEmptyCustomerCartHandler.php
index 0478f23a2fcb2..c97b268aab0c6 100644
--- a/src/Adapter/Cart/CommandHandler/CreateEmptyCustomerCartHandler.php
+++ b/src/Adapter/Cart/CommandHandler/CreateEmptyCustomerCartHandler.php
@@ -30,6 +30,7 @@
 use Configuration;
 use Currency;
 use Customer;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Cart\Command\CreateEmptyCustomerCartCommand;
 use PrestaShop\PrestaShop\Core\Domain\Cart\CommandHandler\CreateEmptyCustomerCartHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Cart\ValueObject\CartId;
@@ -38,6 +39,7 @@
 /**
  * @internal
  */
+#[AsCommandHandler]
 final class CreateEmptyCustomerCartHandler implements CreateEmptyCustomerCartHandlerInterface
 {
     /**
diff --git a/src/Adapter/Cart/CommandHandler/RemoveCartRuleFromCartHandler.php b/src/Adapter/Cart/CommandHandler/RemoveCartRuleFromCartHandler.php
index 03fe93a280782..d3bbfe90afff3 100644
--- a/src/Adapter/Cart/CommandHandler/RemoveCartRuleFromCartHandler.php
+++ b/src/Adapter/Cart/CommandHandler/RemoveCartRuleFromCartHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Cart\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Cart\AbstractCartHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Cart\Command\RemoveCartRuleFromCartCommand;
 use PrestaShop\PrestaShop\Core\Domain\Cart\CommandHandler\RemoveCartRuleFromCartHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Cart\Exception\CartException;
@@ -34,6 +35,7 @@
 /**
  * @internal
  */
+#[AsCommandHandler]
 final class RemoveCartRuleFromCartHandler extends AbstractCartHandler implements RemoveCartRuleFromCartHandlerInterface
 {
     /**
diff --git a/src/Adapter/Cart/CommandHandler/RemoveProductFromCartHandler.php b/src/Adapter/Cart/CommandHandler/RemoveProductFromCartHandler.php
index b62bb960d90c9..adf5c08f2a0b3 100644
--- a/src/Adapter/Cart/CommandHandler/RemoveProductFromCartHandler.php
+++ b/src/Adapter/Cart/CommandHandler/RemoveProductFromCartHandler.php
@@ -30,6 +30,7 @@
 use Customer;
 use PrestaShop\PrestaShop\Adapter\Cart\AbstractCartHandler;
 use PrestaShop\PrestaShop\Adapter\ContextStateManager;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Cart\Command\RemoveProductFromCartCommand;
 use PrestaShop\PrestaShop\Core\Domain\Cart\CommandHandler\RemoveProductFromCartHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Cart\Exception\CartException;
@@ -40,6 +41,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class RemoveProductFromCartHandler extends AbstractCartHandler implements RemoveProductFromCartHandlerInterface
 {
     /**
diff --git a/src/Adapter/Cart/CommandHandler/SendCartToCustomerHandler.php b/src/Adapter/Cart/CommandHandler/SendCartToCustomerHandler.php
index 5e693c300d486..f3c0a16792e2c 100644
--- a/src/Adapter/Cart/CommandHandler/SendCartToCustomerHandler.php
+++ b/src/Adapter/Cart/CommandHandler/SendCartToCustomerHandler.php
@@ -30,6 +30,7 @@
 use Context;
 use Customer;
 use Mail;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Cart\Command\SendCartToCustomerCommand;
 use PrestaShop\PrestaShop\Core\Domain\Cart\CommandHandler\SendCartToCustomerHanlderInterface;
 use PrestaShop\PrestaShop\Core\Domain\Cart\Exception\CartException;
@@ -40,6 +41,7 @@
 /**
  * @internal
  */
+#[AsCommandHandler]
 final class SendCartToCustomerHandler implements SendCartToCustomerHanlderInterface
 {
     /**
diff --git a/src/Adapter/Cart/CommandHandler/UpdateCartAddressesHandler.php b/src/Adapter/Cart/CommandHandler/UpdateCartAddressesHandler.php
index c497e9f7ca339..713c78b6d1814 100644
--- a/src/Adapter/Cart/CommandHandler/UpdateCartAddressesHandler.php
+++ b/src/Adapter/Cart/CommandHandler/UpdateCartAddressesHandler.php
@@ -28,6 +28,7 @@
 
 use Cart;
 use PrestaShop\PrestaShop\Adapter\Cart\AbstractCartHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartAddressesCommand;
 use PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartCarrierCommand;
 use PrestaShop\PrestaShop\Core\Domain\Cart\CommandHandler\UpdateCartAddressesHandlerInterface;
@@ -37,6 +38,7 @@
 /**
  * @internal
  */
+#[AsCommandHandler]
 final class UpdateCartAddressesHandler extends AbstractCartHandler implements UpdateCartAddressesHandlerInterface
 {
     /**
diff --git a/src/Adapter/Cart/CommandHandler/UpdateCartCarrierHandler.php b/src/Adapter/Cart/CommandHandler/UpdateCartCarrierHandler.php
index 38ad820c4992e..8c88434ed4970 100644
--- a/src/Adapter/Cart/CommandHandler/UpdateCartCarrierHandler.php
+++ b/src/Adapter/Cart/CommandHandler/UpdateCartCarrierHandler.php
@@ -29,6 +29,7 @@
 use Carrier;
 use PrestaShop\PrestaShop\Adapter\Cart\AbstractCartHandler;
 use PrestaShop\PrestaShop\Adapter\ContextStateManager;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartCarrierCommand;
 use PrestaShop\PrestaShop\Core\Domain\Cart\CommandHandler\UpdateCartCarrierHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Cart\Exception\CartConstraintException;
@@ -37,6 +38,7 @@
 /**
  * @internal
  */
+#[AsCommandHandler]
 final class UpdateCartCarrierHandler extends AbstractCartHandler implements UpdateCartCarrierHandlerInterface
 {
     /**
diff --git a/src/Adapter/Cart/CommandHandler/UpdateCartCurrencyHandler.php b/src/Adapter/Cart/CommandHandler/UpdateCartCurrencyHandler.php
index 114d4f886b618..aafbc2b8f8b68 100644
--- a/src/Adapter/Cart/CommandHandler/UpdateCartCurrencyHandler.php
+++ b/src/Adapter/Cart/CommandHandler/UpdateCartCurrencyHandler.php
@@ -28,6 +28,7 @@
 
 use Currency;
 use PrestaShop\PrestaShop\Adapter\Cart\AbstractCartHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartCurrencyCommand;
 use PrestaShop\PrestaShop\Core\Domain\Cart\CommandHandler\UpdateCartCurrencyHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Cart\Exception\CartException;
@@ -39,6 +40,7 @@
 /**
  * @internal
  */
+#[AsCommandHandler]
 final class UpdateCartCurrencyHandler extends AbstractCartHandler implements UpdateCartCurrencyHandlerInterface
 {
     /**
diff --git a/src/Adapter/Cart/CommandHandler/UpdateCartDeliverySettingsHandler.php b/src/Adapter/Cart/CommandHandler/UpdateCartDeliverySettingsHandler.php
index 1bffb3f8cebf3..02463269b0fe2 100644
--- a/src/Adapter/Cart/CommandHandler/UpdateCartDeliverySettingsHandler.php
+++ b/src/Adapter/Cart/CommandHandler/UpdateCartDeliverySettingsHandler.php
@@ -29,6 +29,7 @@
 use Cart;
 use CartRule;
 use PrestaShop\PrestaShop\Adapter\Cart\AbstractCartHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\ConfigurationInterface;
 use PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartDeliverySettingsCommand;
 use PrestaShop\PrestaShop\Core\Domain\Cart\CommandHandler\UpdateCartDeliverySettingsHandlerInterface;
@@ -43,6 +44,7 @@
 /**
  * @internal
  */
+#[AsCommandHandler]
 final class UpdateCartDeliverySettingsHandler extends AbstractCartHandler implements UpdateCartDeliverySettingsHandlerInterface
 {
     /**
diff --git a/src/Adapter/Cart/CommandHandler/UpdateCartLanguageHandler.php b/src/Adapter/Cart/CommandHandler/UpdateCartLanguageHandler.php
index cd6279c6816e9..dd874ea05e348 100644
--- a/src/Adapter/Cart/CommandHandler/UpdateCartLanguageHandler.php
+++ b/src/Adapter/Cart/CommandHandler/UpdateCartLanguageHandler.php
@@ -28,6 +28,7 @@
 
 use Language;
 use PrestaShop\PrestaShop\Adapter\Cart\AbstractCartHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartLanguageCommand;
 use PrestaShop\PrestaShop\Core\Domain\Cart\CommandHandler\UpdateCartLanguageHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Cart\Exception\CartException;
@@ -39,6 +40,7 @@
 /**
  * @internal
  */
+#[AsCommandHandler]
 final class UpdateCartLanguageHandler extends AbstractCartHandler implements UpdateCartLanguageHandlerInterface
 {
     /**
diff --git a/src/Adapter/Cart/CommandHandler/UpdateProductPriceInCartHandler.php b/src/Adapter/Cart/CommandHandler/UpdateProductPriceInCartHandler.php
index 29debc44705f4..10d7def6c4e95 100644
--- a/src/Adapter/Cart/CommandHandler/UpdateProductPriceInCartHandler.php
+++ b/src/Adapter/Cart/CommandHandler/UpdateProductPriceInCartHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Cart\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Cart\AbstractCartHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateProductPriceInCartCommand;
 use PrestaShop\PrestaShop\Core\Domain\Cart\CommandHandler\UpdateProductPriceInCartHandlerInterface;
 use SpecificPrice;
@@ -36,6 +37,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class UpdateProductPriceInCartHandler extends AbstractCartHandler implements UpdateProductPriceInCartHandlerInterface
 {
     /**
diff --git a/src/Adapter/Cart/CommandHandler/UpdateProductQuantityInCartHandler.php b/src/Adapter/Cart/CommandHandler/UpdateProductQuantityInCartHandler.php
index 35ca87f8ed2b6..c50d178ed2e39 100644
--- a/src/Adapter/Cart/CommandHandler/UpdateProductQuantityInCartHandler.php
+++ b/src/Adapter/Cart/CommandHandler/UpdateProductQuantityInCartHandler.php
@@ -32,6 +32,7 @@
 use Pack;
 use PrestaShop\PrestaShop\Adapter\Cart\AbstractCartHandler;
 use PrestaShop\PrestaShop\Adapter\ContextStateManager;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateProductQuantityInCartCommand;
 use PrestaShop\PrestaShop\Core\Domain\Cart\CommandHandler\UpdateProductQuantityInCartHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Cart\Exception\CartConstraintException;
@@ -50,6 +51,7 @@
 /**
  * @internal
  */
+#[AsCommandHandler]
 final class UpdateProductQuantityInCartHandler extends AbstractCartHandler implements UpdateProductQuantityInCartHandlerInterface
 {
     /**
diff --git a/src/Adapter/Cart/QueryHandler/GetCartForOrderCreationHandler.php b/src/Adapter/Cart/QueryHandler/GetCartForOrderCreationHandler.php
index 07444a81a1bc7..1e199d0c2d9ba 100644
--- a/src/Adapter/Cart/QueryHandler/GetCartForOrderCreationHandler.php
+++ b/src/Adapter/Cart/QueryHandler/GetCartForOrderCreationHandler.php
@@ -38,6 +38,7 @@
 use PrestaShop\Decimal\DecimalNumber;
 use PrestaShop\PrestaShop\Adapter\Cart\AbstractCartHandler;
 use PrestaShop\PrestaShop\Adapter\ContextStateManager;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Cart\Exception\CartNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Cart\Query\GetCartForOrderCreation;
 use PrestaShop\PrestaShop\Core\Domain\Cart\QueryHandler\GetCartForOrderCreationHandlerInterface;
@@ -59,6 +60,7 @@
 /**
  * Handles GetCartForOrderCreation query using legacy object models
  */
+#[AsQueryHandler]
 final class GetCartForOrderCreationHandler extends AbstractCartHandler implements GetCartForOrderCreationHandlerInterface
 {
     /**
diff --git a/src/Adapter/Cart/QueryHandler/GetCartForViewingHandler.php b/src/Adapter/Cart/QueryHandler/GetCartForViewingHandler.php
index 846d2715d6dc1..bd4b9049c2ced 100644
--- a/src/Adapter/Cart/QueryHandler/GetCartForViewingHandler.php
+++ b/src/Adapter/Cart/QueryHandler/GetCartForViewingHandler.php
@@ -35,6 +35,7 @@
 use Group;
 use Order;
 use PrestaShop\PrestaShop\Adapter\ImageManager;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Cart\Exception\CartNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Cart\Query\GetCartForViewing;
 use PrestaShop\PrestaShop\Core\Domain\Cart\QueryHandler\GetCartForViewingHandlerInterface;
@@ -48,6 +49,7 @@
 /**
  * @internal
  */
+#[AsQueryHandler]
 final class GetCartForViewingHandler implements GetCartForViewingHandlerInterface
 {
     /**
diff --git a/src/Adapter/Cart/QueryHandler/GetLastEmptyCustomerCartHandler.php b/src/Adapter/Cart/QueryHandler/GetLastEmptyCustomerCartHandler.php
index b97f5a2bfebc6..51d2ff5bcc5e2 100644
--- a/src/Adapter/Cart/QueryHandler/GetLastEmptyCustomerCartHandler.php
+++ b/src/Adapter/Cart/QueryHandler/GetLastEmptyCustomerCartHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Cart\QueryHandler;
 
 use Customer;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Cart\Exception\CartConstraintException;
 use PrestaShop\PrestaShop\Core\Domain\Cart\Exception\CartException;
 use PrestaShop\PrestaShop\Core\Domain\Cart\Exception\CartNotFoundException;
@@ -39,6 +40,7 @@
 /**
  * Gets last empty cart for customer using legacy object model
  */
+#[AsQueryHandler]
 final class GetLastEmptyCustomerCartHandler implements GetLastEmptyCustomerCartHandlerInterface
 {
     /**
diff --git a/src/Adapter/CartRule/CommandHandler/AddCartRuleHandler.php b/src/Adapter/CartRule/CommandHandler/AddCartRuleHandler.php
index d47be1e08a0f6..e6cc7e608131a 100644
--- a/src/Adapter/CartRule/CommandHandler/AddCartRuleHandler.php
+++ b/src/Adapter/CartRule/CommandHandler/AddCartRuleHandler.php
@@ -30,6 +30,7 @@
 use DateTimeImmutable;
 use PrestaShop\PrestaShop\Adapter\CartRule\CartRuleActionFiller;
 use PrestaShop\PrestaShop\Adapter\CartRule\Repository\CartRuleRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\AddCartRuleCommand;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\CommandHandler\AddCartRuleHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\CartRuleId;
@@ -39,6 +40,7 @@
 /**
  * Handles adding new cart rule using legacy logic.
  */
+#[AsCommandHandler]
 class AddCartRuleHandler implements AddCartRuleHandlerInterface
 {
     /**
diff --git a/src/Adapter/CartRule/CommandHandler/BulkDeleteCartRuleHandler.php b/src/Adapter/CartRule/CommandHandler/BulkDeleteCartRuleHandler.php
index d1b75079539b7..450ed752ea4e6 100644
--- a/src/Adapter/CartRule/CommandHandler/BulkDeleteCartRuleHandler.php
+++ b/src/Adapter/CartRule/CommandHandler/BulkDeleteCartRuleHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\CartRule\AbstractCartRuleHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\BulkDeleteCartRuleCommand;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\CommandHandler\BulkDeleteCartRuleHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\BulkDeleteCartRuleException;
@@ -37,6 +38,7 @@
 /**
  * Deletes cart rules in bulk action using legacy object model
  */
+#[AsCommandHandler]
 final class BulkDeleteCartRuleHandler extends AbstractCartRuleHandler implements BulkDeleteCartRuleHandlerInterface
 {
     /**
diff --git a/src/Adapter/CartRule/CommandHandler/BulkToggleCartRuleStatusHandler.php b/src/Adapter/CartRule/CommandHandler/BulkToggleCartRuleStatusHandler.php
index d0161e57a4a86..82746001936d1 100644
--- a/src/Adapter/CartRule/CommandHandler/BulkToggleCartRuleStatusHandler.php
+++ b/src/Adapter/CartRule/CommandHandler/BulkToggleCartRuleStatusHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\CartRule\AbstractCartRuleHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\BulkToggleCartRuleStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\CommandHandler\BulkToggleCartRuleStatusHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\BulkToggleCartRuleException;
@@ -37,6 +38,7 @@
 /**
  * Handles command which toggles cart rule status in bulk action
  */
+#[AsCommandHandler]
 final class BulkToggleCartRuleStatusHandler extends AbstractCartRuleHandler implements BulkToggleCartRuleStatusHandlerInterface
 {
     /**
diff --git a/src/Adapter/CartRule/CommandHandler/DeleteCartRuleHandler.php b/src/Adapter/CartRule/CommandHandler/DeleteCartRuleHandler.php
index 4206a005d4ca7..fd722bd087095 100644
--- a/src/Adapter/CartRule/CommandHandler/DeleteCartRuleHandler.php
+++ b/src/Adapter/CartRule/CommandHandler/DeleteCartRuleHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\CartRule\AbstractCartRuleHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\DeleteCartRuleCommand;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\CommandHandler\DeleteCartRuleHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CannotDeleteCartRuleException;
@@ -36,6 +37,7 @@
 /**
  * Handles deletion of cart rule using legacy object model
  */
+#[AsCommandHandler]
 final class DeleteCartRuleHandler extends AbstractCartRuleHandler implements DeleteCartRuleHandlerInterface
 {
     /**
diff --git a/src/Adapter/CartRule/CommandHandler/EditCartRuleHandler.php b/src/Adapter/CartRule/CommandHandler/EditCartRuleHandler.php
index 295d459d1b1ce..bb448e08359d8 100644
--- a/src/Adapter/CartRule/CommandHandler/EditCartRuleHandler.php
+++ b/src/Adapter/CartRule/CommandHandler/EditCartRuleHandler.php
@@ -30,10 +30,12 @@
 use CartRule;
 use PrestaShop\PrestaShop\Adapter\CartRule\CartRuleActionFiller;
 use PrestaShop\PrestaShop\Adapter\CartRule\Repository\CartRuleRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\EditCartRuleCommand;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\CommandHandler\EditCartRuleHandlerInterface;
 use PrestaShop\PrestaShop\Core\Util\DateTime\DateTime as DateTimeUtil;
 
+#[AsCommandHandler]
 class EditCartRuleHandler implements EditCartRuleHandlerInterface
 {
     /**
diff --git a/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php b/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php
index 50f1c40e17eff..4c364d20b7531 100644
--- a/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php
+++ b/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php
@@ -30,6 +30,7 @@
 
 use CartRule;
 use PrestaShop\PrestaShop\Adapter\CartRule\Repository\CartRuleRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Carrier\ValueObject\CarrierId;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\SetCartRuleRestrictionsCommand;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\CommandHandler\SetCartRuleRestrictionsHandlerInterface;
@@ -37,6 +38,7 @@
 use PrestaShop\PrestaShop\Core\Domain\Country\ValueObject\CountryId;
 use PrestaShop\PrestaShop\Core\Domain\Customer\Group\ValueObject\GroupId;
 
+#[AsCommandHandler]
 class SetCartRuleRestrictionsHandler implements SetCartRuleRestrictionsHandlerInterface
 {
     public function __construct(
diff --git a/src/Adapter/CartRule/CommandHandler/ToggleCartRuleStatusHandler.php b/src/Adapter/CartRule/CommandHandler/ToggleCartRuleStatusHandler.php
index 54304736e864e..19468d6be4a38 100644
--- a/src/Adapter/CartRule/CommandHandler/ToggleCartRuleStatusHandler.php
+++ b/src/Adapter/CartRule/CommandHandler/ToggleCartRuleStatusHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\CartRule\AbstractCartRuleHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\ToggleCartRuleStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\CommandHandler\ToggleCartRuleStatusHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\UpdateCartRuleException;
@@ -36,6 +37,7 @@
 /**
  * Handles command which toggles cart rule status
  */
+#[AsCommandHandler]
 final class ToggleCartRuleStatusHandler extends AbstractCartRuleHandler implements ToggleCartRuleStatusHandlerInterface
 {
     /**
diff --git a/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php b/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php
index 10c03cbbdbbef..541d8f9f0a4c6 100644
--- a/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php
+++ b/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php
@@ -33,6 +33,7 @@
 use PrestaShop\Decimal\DecimalNumber;
 use PrestaShop\PrestaShop\Adapter\CartRule\LegacyDiscountApplicationType;
 use PrestaShop\PrestaShop\Adapter\CartRule\Repository\CartRuleRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Query\GetCartRuleForEditing;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\QueryHandler\GetCartRuleForEditingHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\QueryResult\CartRuleActionForEditing;
@@ -52,6 +53,7 @@
 /**
  * Handles command which gets cart rule for editing using legacy object model
  */
+#[AsQueryHandler]
 class GetCartRuleForEditingHandler implements GetCartRuleForEditingHandlerInterface
 {
     public function __construct(
diff --git a/src/Adapter/CartRule/QueryHandler/SearchCartRulesHandler.php b/src/Adapter/CartRule/QueryHandler/SearchCartRulesHandler.php
index ce05ddcf032e6..c4b96fce5e60a 100644
--- a/src/Adapter/CartRule/QueryHandler/SearchCartRulesHandler.php
+++ b/src/Adapter/CartRule/QueryHandler/SearchCartRulesHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\CartRule\QueryHandler;
 
 use CartRule;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Query\SearchCartRules;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\QueryHandler\SearchCartRulesHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\QueryResult\FoundCartRule;
@@ -34,6 +35,7 @@
 /**
  * Searches for cart rules by search phrase using legacy object model
  */
+#[AsQueryHandler]
 final class SearchCartRulesHandler implements SearchCartRulesHandlerInterface
 {
     /**
diff --git a/src/Adapter/CatalogPriceRule/CommandHandler/AddCatalogPriceRuleHandler.php b/src/Adapter/CatalogPriceRule/CommandHandler/AddCatalogPriceRuleHandler.php
index b2ae3f4d9eaf4..4792fe925d005 100644
--- a/src/Adapter/CatalogPriceRule/CommandHandler/AddCatalogPriceRuleHandler.php
+++ b/src/Adapter/CatalogPriceRule/CommandHandler/AddCatalogPriceRuleHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\CatalogPriceRule\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\CatalogPriceRule\AbstractCatalogPriceRuleHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Command\AddCatalogPriceRuleCommand;
 use PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\CommandHandler\AddCatalogPriceRuleHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Exception\CatalogPriceRuleException;
@@ -37,6 +38,7 @@
 /**
  * Handles adding new catalog price rule using legacy object model
  */
+#[AsCommandHandler]
 final class AddCatalogPriceRuleHandler extends AbstractCatalogPriceRuleHandler implements AddCatalogPriceRuleHandlerInterface
 {
     /**
diff --git a/src/Adapter/CatalogPriceRule/CommandHandler/BulkDeleteCatalogPriceRuleHandler.php b/src/Adapter/CatalogPriceRule/CommandHandler/BulkDeleteCatalogPriceRuleHandler.php
index 48bd217504fc7..7d975f4e930e3 100644
--- a/src/Adapter/CatalogPriceRule/CommandHandler/BulkDeleteCatalogPriceRuleHandler.php
+++ b/src/Adapter/CatalogPriceRule/CommandHandler/BulkDeleteCatalogPriceRuleHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\CatalogPriceRule\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\CatalogPriceRule\AbstractCatalogPriceRuleHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Command\BulkDeleteCatalogPriceRuleCommand;
 use PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\CommandHandler\BulkDeleteCatalogPriceRuleHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Exception\CannotDeleteCatalogPriceRuleException;
@@ -34,6 +35,7 @@
 /**
  * Deletes catalog prices rules in bulk action using legacy object model
  */
+#[AsCommandHandler]
 final class BulkDeleteCatalogPriceRuleHandler extends AbstractCatalogPriceRuleHandler implements BulkDeleteCatalogPriceRuleHandlerInterface
 {
     /**
diff --git a/src/Adapter/CatalogPriceRule/CommandHandler/DeleteCatalogPriceRuleHandler.php b/src/Adapter/CatalogPriceRule/CommandHandler/DeleteCatalogPriceRuleHandler.php
index 842db7cfc9101..5a40683134693 100644
--- a/src/Adapter/CatalogPriceRule/CommandHandler/DeleteCatalogPriceRuleHandler.php
+++ b/src/Adapter/CatalogPriceRule/CommandHandler/DeleteCatalogPriceRuleHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\CatalogPriceRule\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\CatalogPriceRule\AbstractCatalogPriceRuleHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Command\DeleteCatalogPriceRuleCommand;
 use PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\CommandHandler\DeleteCatalogPriceRuleHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Exception\CannotDeleteCatalogPriceRuleException;
@@ -34,6 +35,7 @@
 /**
  * Handles deletion of catalog price rule using legacy object model
  */
+#[AsCommandHandler]
 final class DeleteCatalogPriceRuleHandler extends AbstractCatalogPriceRuleHandler implements DeleteCatalogPriceRuleHandlerInterface
 {
     /**
diff --git a/src/Adapter/CatalogPriceRule/CommandHandler/EditCatalogPriceRuleHandler.php b/src/Adapter/CatalogPriceRule/CommandHandler/EditCatalogPriceRuleHandler.php
index ea38ef707a329..fadad953e9497 100644
--- a/src/Adapter/CatalogPriceRule/CommandHandler/EditCatalogPriceRuleHandler.php
+++ b/src/Adapter/CatalogPriceRule/CommandHandler/EditCatalogPriceRuleHandler.php
@@ -28,6 +28,7 @@
 
 use DateTime;
 use PrestaShop\PrestaShop\Adapter\CatalogPriceRule\AbstractCatalogPriceRuleHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Command\EditCatalogPriceRuleCommand;
 use PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\CommandHandler\EditCatalogPriceRuleHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Exception\CannotUpdateCatalogPriceRuleException;
@@ -40,6 +41,7 @@
 /**
  * Handles command which edits catalog price rule handler using legacy object model
  */
+#[AsCommandHandler]
 final class EditCatalogPriceRuleHandler extends AbstractCatalogPriceRuleHandler implements EditCatalogPriceRuleHandlerInterface
 {
     /**
diff --git a/src/Adapter/CatalogPriceRule/QueryHandler/GetCatalogPriceRuleForEditingHandler.php b/src/Adapter/CatalogPriceRule/QueryHandler/GetCatalogPriceRuleForEditingHandler.php
index 5b708eb775672..523b5321e52a8 100644
--- a/src/Adapter/CatalogPriceRule/QueryHandler/GetCatalogPriceRuleForEditingHandler.php
+++ b/src/Adapter/CatalogPriceRule/QueryHandler/GetCatalogPriceRuleForEditingHandler.php
@@ -29,6 +29,7 @@
 use DateTime;
 use PrestaShop\Decimal\DecimalNumber;
 use PrestaShop\PrestaShop\Adapter\CatalogPriceRule\AbstractCatalogPriceRuleHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Query\GetCatalogPriceRuleForEditing;
 use PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\QueryHandler\GetCatalogPriceRuleForEditingHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\QueryResult\EditableCatalogPriceRule;
@@ -39,6 +40,7 @@
 /**
  * Handles command which gets catalog price rule for editing using legacy object model
  */
+#[AsQueryHandler]
 final class GetCatalogPriceRuleForEditingHandler extends AbstractCatalogPriceRuleHandler implements GetCatalogPriceRuleForEditingHandlerInterface
 {
     /**
diff --git a/src/Adapter/CatalogPriceRule/QueryHandler/GetCatalogPriceRuleListForProductHandler.php b/src/Adapter/CatalogPriceRule/QueryHandler/GetCatalogPriceRuleListForProductHandler.php
index 710bcd3b0a4a7..7db668a53b8e8 100644
--- a/src/Adapter/CatalogPriceRule/QueryHandler/GetCatalogPriceRuleListForProductHandler.php
+++ b/src/Adapter/CatalogPriceRule/QueryHandler/GetCatalogPriceRuleListForProductHandler.php
@@ -30,6 +30,7 @@
 
 use PrestaShop\Decimal\DecimalNumber;
 use PrestaShop\PrestaShop\Adapter\CatalogPriceRule\Repository\CatalogPriceRuleRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Query\GetCatalogPriceRuleListForProduct;
 use PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\QueryHandler\GetCatalogPriceRuleListForProductHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\QueryResult\CatalogPriceRuleForListing;
@@ -39,6 +40,7 @@
 /**
  * Handles @see GetCatalogPriceRuleListForProduct
  */
+#[AsQueryHandler]
 class GetCatalogPriceRuleListForProductHandler implements GetCatalogPriceRuleListForProductHandlerInterface
 {
     /**
diff --git a/src/Adapter/Category/CommandHandler/AddCategoryHandler.php b/src/Adapter/Category/CommandHandler/AddCategoryHandler.php
index 572fd78f09d68..960f4935f4303 100644
--- a/src/Adapter/Category/CommandHandler/AddCategoryHandler.php
+++ b/src/Adapter/Category/CommandHandler/AddCategoryHandler.php
@@ -29,6 +29,7 @@
 use Category;
 use PrestaShop\PrestaShop\Adapter\Domain\AbstractObjectModelHandler;
 use PrestaShop\PrestaShop\Adapter\Image\Uploader\CategoryImageUploader;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Category\Command\AddCategoryCommand;
 use PrestaShop\PrestaShop\Core\Domain\Category\CommandHandler\AddCategoryHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CannotAddCategoryException;
@@ -41,6 +42,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class AddCategoryHandler extends AbstractObjectModelHandler implements AddCategoryHandlerInterface
 {
     /**
diff --git a/src/Adapter/Category/CommandHandler/AddRootCategoryHandler.php b/src/Adapter/Category/CommandHandler/AddRootCategoryHandler.php
index 4ca835b9826a2..5ed1c7dc78165 100644
--- a/src/Adapter/Category/CommandHandler/AddRootCategoryHandler.php
+++ b/src/Adapter/Category/CommandHandler/AddRootCategoryHandler.php
@@ -29,6 +29,7 @@
 use Category;
 use PrestaShop\PrestaShop\Adapter\Domain\AbstractObjectModelHandler;
 use PrestaShop\PrestaShop\Adapter\Image\Uploader\CategoryImageUploader;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\ConfigurationInterface;
 use PrestaShop\PrestaShop\Core\Domain\Category\Command\AddRootCategoryCommand;
 use PrestaShop\PrestaShop\Core\Domain\Category\CommandHandler\AddRootCategoryHandlerInterface;
@@ -41,6 +42,7 @@
 /**
  * Class AddRootCategoryHandler.
  */
+#[AsCommandHandler]
 final class AddRootCategoryHandler extends AbstractObjectModelHandler implements AddRootCategoryHandlerInterface
 {
     /**
diff --git a/src/Adapter/Category/CommandHandler/BulkDeleteCategoriesHandler.php b/src/Adapter/Category/CommandHandler/BulkDeleteCategoriesHandler.php
index c431d526c2048..fa97171a4edf2 100644
--- a/src/Adapter/Category/CommandHandler/BulkDeleteCategoriesHandler.php
+++ b/src/Adapter/Category/CommandHandler/BulkDeleteCategoriesHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Category\CommandHandler;
 
 use Category;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Category\Command\BulkDeleteCategoriesCommand;
 use PrestaShop\PrestaShop\Core\Domain\Category\CommandHandler\BulkDeleteCategoriesHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CannotDeleteRootCategoryForShopException;
@@ -36,6 +37,7 @@
 /**
  * Class BulkDeleteCategoriesHandler.
  */
+#[AsCommandHandler]
 final class BulkDeleteCategoriesHandler extends AbstractDeleteCategoryHandler implements BulkDeleteCategoriesHandlerInterface
 {
     /**
diff --git a/src/Adapter/Category/CommandHandler/BulkUpdateCategoriesStatusHandler.php b/src/Adapter/Category/CommandHandler/BulkUpdateCategoriesStatusHandler.php
index cf6cf198944c4..f8c41b35c153d 100644
--- a/src/Adapter/Category/CommandHandler/BulkUpdateCategoriesStatusHandler.php
+++ b/src/Adapter/Category/CommandHandler/BulkUpdateCategoriesStatusHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Category\CommandHandler;
 
 use Category;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Category\Command\BulkUpdateCategoriesStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\Category\CommandHandler\BulkUpdateCategoriesStatusHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CannotUpdateCategoryStatusException;
@@ -37,6 +38,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class BulkUpdateCategoriesStatusHandler implements BulkUpdateCategoriesStatusHandlerInterface
 {
     /**
diff --git a/src/Adapter/Category/CommandHandler/DeleteCategoryCoverImageHandler.php b/src/Adapter/Category/CommandHandler/DeleteCategoryCoverImageHandler.php
index c2bb49e4279ae..be66382156d8b 100644
--- a/src/Adapter/Category/CommandHandler/DeleteCategoryCoverImageHandler.php
+++ b/src/Adapter/Category/CommandHandler/DeleteCategoryCoverImageHandler.php
@@ -28,6 +28,7 @@
 
 use Category;
 use ImageType;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\ConfigurationInterface;
 use PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryCoverImageCommand;
 use PrestaShop\PrestaShop\Core\Domain\Category\CommandHandler\DeleteCategoryCoverImageHandlerInterface;
@@ -42,6 +43,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class DeleteCategoryCoverImageHandler implements DeleteCategoryCoverImageHandlerInterface
 {
     /**
diff --git a/src/Adapter/Category/CommandHandler/DeleteCategoryHandler.php b/src/Adapter/Category/CommandHandler/DeleteCategoryHandler.php
index d1d1f4f3822f7..5d99af4daaf61 100644
--- a/src/Adapter/Category/CommandHandler/DeleteCategoryHandler.php
+++ b/src/Adapter/Category/CommandHandler/DeleteCategoryHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Category\CommandHandler;
 
 use Category;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryCommand;
 use PrestaShop\PrestaShop\Core\Domain\Category\CommandHandler\DeleteCategoryHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CannotDeleteRootCategoryForShopException;
@@ -36,6 +37,7 @@
 /**
  * Class DeleteCategoryHandler.
  */
+#[AsCommandHandler]
 final class DeleteCategoryHandler extends AbstractDeleteCategoryHandler implements DeleteCategoryHandlerInterface
 {
     /**
diff --git a/src/Adapter/Category/CommandHandler/DeleteCategoryMenuThumbnailImageHandler.php b/src/Adapter/Category/CommandHandler/DeleteCategoryMenuThumbnailImageHandler.php
index d094afb01929b..1333d72e15a3b 100644
--- a/src/Adapter/Category/CommandHandler/DeleteCategoryMenuThumbnailImageHandler.php
+++ b/src/Adapter/Category/CommandHandler/DeleteCategoryMenuThumbnailImageHandler.php
@@ -28,6 +28,7 @@
 
 use Category;
 use PrestaShop\PrestaShop\Core\Cache\Clearer\CacheClearerInterface;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\ConfigurationInterface;
 use PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryMenuThumbnailImageCommand;
 use PrestaShop\PrestaShop\Core\Domain\Category\CommandHandler\DeleteCategoryMenuThumbnailImageHandlerInterface;
@@ -41,6 +42,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class DeleteCategoryMenuThumbnailImageHandler implements DeleteCategoryMenuThumbnailImageHandlerInterface
 {
     /**
diff --git a/src/Adapter/Category/CommandHandler/EditCategoryHandler.php b/src/Adapter/Category/CommandHandler/EditCategoryHandler.php
index 255620cdd6719..c18b3a337aa43 100644
--- a/src/Adapter/Category/CommandHandler/EditCategoryHandler.php
+++ b/src/Adapter/Category/CommandHandler/EditCategoryHandler.php
@@ -30,6 +30,7 @@
 use PrestaShop\PrestaShop\Adapter\Domain\AbstractObjectModelHandler;
 use PrestaShop\PrestaShop\Adapter\Image\Uploader\CategoryImageUploader;
 use PrestaShop\PrestaShop\Core\Category\Provider\MenuThumbnailAvailableKeyProvider;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Category\Command\EditCategoryCommand;
 use PrestaShop\PrestaShop\Core\Domain\Category\CommandHandler\EditCategoryHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CannotEditCategoryException;
@@ -42,6 +43,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class EditCategoryHandler extends AbstractObjectModelHandler implements EditCategoryHandlerInterface
 {
     /**
diff --git a/src/Adapter/Category/CommandHandler/EditRootCategoryHandler.php b/src/Adapter/Category/CommandHandler/EditRootCategoryHandler.php
index 593d2e7562e50..8bc13aa1b8412 100644
--- a/src/Adapter/Category/CommandHandler/EditRootCategoryHandler.php
+++ b/src/Adapter/Category/CommandHandler/EditRootCategoryHandler.php
@@ -30,6 +30,7 @@
 use PrestaShop\PrestaShop\Adapter\Domain\AbstractObjectModelHandler;
 use PrestaShop\PrestaShop\Adapter\Image\Uploader\CategoryImageUploader;
 use PrestaShop\PrestaShop\Core\Category\Provider\MenuThumbnailAvailableKeyProvider;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Category\Command\EditRootCategoryCommand;
 use PrestaShop\PrestaShop\Core\Domain\Category\CommandHandler\EditRootCategoryHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CannotEditCategoryException;
@@ -41,6 +42,7 @@
 /**
  * Class EditRootCategoryHandler.
  */
+#[AsCommandHandler]
 final class EditRootCategoryHandler extends AbstractObjectModelHandler implements EditRootCategoryHandlerInterface
 {
     /**
diff --git a/src/Adapter/Category/CommandHandler/SetCategoryIsEnabledHandler.php b/src/Adapter/Category/CommandHandler/SetCategoryIsEnabledHandler.php
index 729ed04bcd7f1..2b8ee083ef9a5 100644
--- a/src/Adapter/Category/CommandHandler/SetCategoryIsEnabledHandler.php
+++ b/src/Adapter/Category/CommandHandler/SetCategoryIsEnabledHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Category\CommandHandler;
 
 use Category;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Category\Command\SetCategoryIsEnabledCommand;
 use PrestaShop\PrestaShop\Core\Domain\Category\CommandHandler\SetCategoryIsEnabledHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CannotUpdateCategoryStatusException;
@@ -35,6 +36,7 @@
 /**
  * @internal
  */
+#[AsCommandHandler]
 final class SetCategoryIsEnabledHandler implements SetCategoryIsEnabledHandlerInterface
 {
     /**
diff --git a/src/Adapter/Category/CommandHandler/UpdateCategoryPositionHandler.php b/src/Adapter/Category/CommandHandler/UpdateCategoryPositionHandler.php
index f944e9cbae93c..850c15da26aea 100644
--- a/src/Adapter/Category/CommandHandler/UpdateCategoryPositionHandler.php
+++ b/src/Adapter/Category/CommandHandler/UpdateCategoryPositionHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Category\CommandHandler;
 
 use Category;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Category\Command\UpdateCategoryPositionCommand;
 use PrestaShop\PrestaShop\Core\Domain\Category\CommandHandler\UpdateCategoryPositionHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CategoryException;
@@ -35,6 +36,7 @@
 /**
  * Updates category position using legacy object model
  */
+#[AsCommandHandler]
 final class UpdateCategoryPositionHandler implements UpdateCategoryPositionHandlerInterface
 {
     /**
diff --git a/src/Adapter/Category/QueryHandler/GetCategoriesTreeHandler.php b/src/Adapter/Category/QueryHandler/GetCategoriesTreeHandler.php
index ef9358eb83110..4ab01fe248121 100644
--- a/src/Adapter/Category/QueryHandler/GetCategoriesTreeHandler.php
+++ b/src/Adapter/Category/QueryHandler/GetCategoriesTreeHandler.php
@@ -31,6 +31,7 @@
 use PrestaShop\PrestaShop\Adapter\ContextStateManager;
 use PrestaShop\PrestaShop\Adapter\Shop\Repository\ShopRepository;
 use PrestaShop\PrestaShop\Core\Category\NameBuilder\CategoryDisplayNameBuilder;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Category\Query\GetCategoriesTree;
 use PrestaShop\PrestaShop\Core\Domain\Category\QueryHandler\GetCategoriesTreeHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Category\QueryResult\CategoryForTree;
@@ -41,6 +42,7 @@
 /**
  * Handles @see GetCategoriesTree using legacy object model
  */
+#[AsQueryHandler]
 final class GetCategoriesTreeHandler implements GetCategoriesTreeHandlerInterface
 {
     /**
diff --git a/src/Adapter/Category/QueryHandler/GetCategoryForEditingHandler.php b/src/Adapter/Category/QueryHandler/GetCategoryForEditingHandler.php
index ede0b38351634..f8ba5448d00eb 100644
--- a/src/Adapter/Category/QueryHandler/GetCategoryForEditingHandler.php
+++ b/src/Adapter/Category/QueryHandler/GetCategoryForEditingHandler.php
@@ -31,6 +31,7 @@
 use ImageManager;
 use ImageType;
 use PDO;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CannotEditRootCategoryException;
 use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CategoryNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Category\Query\GetCategoryForEditing;
@@ -44,6 +45,7 @@
 /**
  * Class GetCategoryForEditingHandler.
  */
+#[AsQueryHandler]
 final class GetCategoryForEditingHandler implements GetCategoryForEditingHandlerInterface
 {
     /**
diff --git a/src/Adapter/Category/QueryHandler/GetCategoryIsEnabledHandler.php b/src/Adapter/Category/QueryHandler/GetCategoryIsEnabledHandler.php
index c6ae80f845e7a..256b0b16da47d 100644
--- a/src/Adapter/Category/QueryHandler/GetCategoryIsEnabledHandler.php
+++ b/src/Adapter/Category/QueryHandler/GetCategoryIsEnabledHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Category\QueryHandler;
 
 use Category;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CategoryNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Category\Query\GetCategoryIsEnabled;
 use PrestaShop\PrestaShop\Core\Domain\Category\QueryHandler\GetCategoryIsEnabledHandlerInterface;
@@ -34,6 +35,7 @@
 /**
  * @internal
  */
+#[AsQueryHandler]
 final class GetCategoryIsEnabledHandler implements GetCategoryIsEnabledHandlerInterface
 {
     /**
diff --git a/src/Adapter/Configuration/CommandHandler/SwitchDebugModeHandler.php b/src/Adapter/Configuration/CommandHandler/SwitchDebugModeHandler.php
index 283d4ba629df5..3874b231be079 100644
--- a/src/Adapter/Configuration/CommandHandler/SwitchDebugModeHandler.php
+++ b/src/Adapter/Configuration/CommandHandler/SwitchDebugModeHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Configuration\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Debug\DebugMode;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Configuration\Command\SwitchDebugModeCommand;
 use PrestaShop\PrestaShop\Core\Domain\Configuration\CommandHandler\SwitchDebugModeHandlerInterface;
 
@@ -35,6 +36,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class SwitchDebugModeHandler implements SwitchDebugModeHandlerInterface
 {
     /**
diff --git a/src/Adapter/Contact/CommandHandler/AddContactHandler.php b/src/Adapter/Contact/CommandHandler/AddContactHandler.php
index c6b807c55e7c2..30ff3c6856792 100644
--- a/src/Adapter/Contact/CommandHandler/AddContactHandler.php
+++ b/src/Adapter/Contact/CommandHandler/AddContactHandler.php
@@ -28,6 +28,7 @@
 
 use Contact;
 use PrestaShop\PrestaShop\Adapter\Domain\AbstractObjectModelHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\CleanHtml;
 use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\DefaultLanguage;
 use PrestaShop\PrestaShop\Core\Domain\Contact\Command\AddContactCommand;
@@ -44,6 +45,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class AddContactHandler extends AbstractObjectModelHandler implements AddContactHandlerInterface
 {
     /**
diff --git a/src/Adapter/Contact/CommandHandler/EditContactHandler.php b/src/Adapter/Contact/CommandHandler/EditContactHandler.php
index 249fb9032950f..41f90fd2c419f 100644
--- a/src/Adapter/Contact/CommandHandler/EditContactHandler.php
+++ b/src/Adapter/Contact/CommandHandler/EditContactHandler.php
@@ -28,6 +28,7 @@
 
 use Contact;
 use PrestaShop\PrestaShop\Adapter\Domain\AbstractObjectModelHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\CleanHtml;
 use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\DefaultLanguage;
 use PrestaShop\PrestaShop\Core\Domain\Contact\Command\EditContactCommand;
@@ -45,6 +46,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class EditContactHandler extends AbstractObjectModelHandler implements EditContactHandlerInterface
 {
     /**
diff --git a/src/Adapter/Contact/QueryHandler/GetContactForEditingHandler.php b/src/Adapter/Contact/QueryHandler/GetContactForEditingHandler.php
index a9085902aeb50..8acd421bd005a 100644
--- a/src/Adapter/Contact/QueryHandler/GetContactForEditingHandler.php
+++ b/src/Adapter/Contact/QueryHandler/GetContactForEditingHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Contact\QueryHandler;
 
 use Contact;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Contact\Exception\ContactException;
 use PrestaShop\PrestaShop\Core\Domain\Contact\Exception\ContactNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Contact\Query\GetContactForEditing;
@@ -40,6 +41,7 @@
  *
  * @internal
  */
+#[AsQueryHandler]
 final class GetContactForEditingHandler implements GetContactForEditingHandlerInterface
 {
     /**
diff --git a/src/Adapter/Country/CommandHandler/AddCountryHandler.php b/src/Adapter/Country/CommandHandler/AddCountryHandler.php
index 04d111fe0d959..fda9ba13c1a9a 100644
--- a/src/Adapter/Country/CommandHandler/AddCountryHandler.php
+++ b/src/Adapter/Country/CommandHandler/AddCountryHandler.php
@@ -30,6 +30,7 @@
 
 use Country;
 use PrestaShop\PrestaShop\Adapter\Country\Repository\CountryRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Country\Command\AddCountryCommand;
 use PrestaShop\PrestaShop\Core\Domain\Country\CommandHandler\AddCountryHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Country\ValueObject\CountryId;
@@ -37,6 +38,7 @@
 /**
  * Handles creation of country and address format
  */
+#[AsCommandHandler]
 class AddCountryHandler implements AddCountryHandlerInterface
 {
     /**
diff --git a/src/Adapter/Country/CommandHandler/DeleteCountryHandler.php b/src/Adapter/Country/CommandHandler/DeleteCountryHandler.php
index 862829481c3b9..09534f14bd728 100644
--- a/src/Adapter/Country/CommandHandler/DeleteCountryHandler.php
+++ b/src/Adapter/Country/CommandHandler/DeleteCountryHandler.php
@@ -30,12 +30,14 @@
 
 use Country;
 use PrestaShop\PrestaShop\Adapter\Country\Repository\CountryRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Country\Command\DeleteCountryCommand;
 use PrestaShop\PrestaShop\Core\Domain\Country\CommandHandler\DeleteCountryHandlerInterface;
 
 /**
  * Handles country deletion
  */
+#[AsCommandHandler]
 class DeleteCountryHandler implements DeleteCountryHandlerInterface
 {
     /**
diff --git a/src/Adapter/Country/CommandHandler/EditCountryHandler.php b/src/Adapter/Country/CommandHandler/EditCountryHandler.php
index 9a3d5d785379e..fb6a43b6b3900 100644
--- a/src/Adapter/Country/CommandHandler/EditCountryHandler.php
+++ b/src/Adapter/Country/CommandHandler/EditCountryHandler.php
@@ -29,12 +29,14 @@
 namespace PrestaShop\PrestaShop\Adapter\Country\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Country\Repository\CountryRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Country\Command\EditCountryCommand;
 use PrestaShop\PrestaShop\Core\Domain\Country\CommandHandler\EditCountryHandlerInterface;
 
 /**
  * Handles update of country and address format
  */
+#[AsCommandHandler]
 class EditCountryHandler implements EditCountryHandlerInterface
 {
     /**
diff --git a/src/Adapter/Country/QueryHandler/GetCountryForEditingHandler.php b/src/Adapter/Country/QueryHandler/GetCountryForEditingHandler.php
index 1b2d5e1778af8..89e98ac63b22d 100644
--- a/src/Adapter/Country/QueryHandler/GetCountryForEditingHandler.php
+++ b/src/Adapter/Country/QueryHandler/GetCountryForEditingHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Country\QueryHandler;
 
 use PrestaShop\PrestaShop\Adapter\Country\Repository\CountryRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Country\Query\GetCountryForEditing;
 use PrestaShop\PrestaShop\Core\Domain\Country\QueryHandler\GetCountryForEditingHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Country\QueryResult\CountryForEditing;
@@ -36,6 +37,7 @@
 /**
  * Handles editable country query
  */
+#[AsQueryHandler]
 class GetCountryForEditingHandler implements GetCountryForEditingHandlerInterface
 {
     /**
diff --git a/src/Adapter/Country/QueryHandler/GetCountryRequiredFieldsHandler.php b/src/Adapter/Country/QueryHandler/GetCountryRequiredFieldsHandler.php
index 276d12cb68a03..4a45f51cd05aa 100644
--- a/src/Adapter/Country/QueryHandler/GetCountryRequiredFieldsHandler.php
+++ b/src/Adapter/Country/QueryHandler/GetCountryRequiredFieldsHandler.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Country\QueryHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Country\CountryRequiredFieldsProviderInterface;
 use PrestaShop\PrestaShop\Core\Domain\Country\Query\GetCountryRequiredFields;
 use PrestaShop\PrestaShop\Core\Domain\Country\QueryHandler\GetCountryRequiredFieldsHandlerInterface;
@@ -34,6 +35,7 @@
 /**
  * Handles and provides country state requirements
  */
+#[AsQueryHandler]
 final class GetCountryRequiredFieldsHandler implements GetCountryRequiredFieldsHandlerInterface
 {
     /** @var CountryRequiredFieldsProviderInterface */
diff --git a/src/Adapter/CreditSlip/QueryHandler/GetCreditSlipIdsByDateRangeHandler.php b/src/Adapter/CreditSlip/QueryHandler/GetCreditSlipIdsByDateRangeHandler.php
index 6af8fd766a54e..e8258d0bd4bd1 100644
--- a/src/Adapter/CreditSlip/QueryHandler/GetCreditSlipIdsByDateRangeHandler.php
+++ b/src/Adapter/CreditSlip/QueryHandler/GetCreditSlipIdsByDateRangeHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\CreditSlip\QueryHandler;
 
 use OrderSlip;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\CreditSlip\Exception\CreditSlipException;
 use PrestaShop\PrestaShop\Core\Domain\CreditSlip\Exception\CreditSlipNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\CreditSlip\Query\GetCreditSlipIdsByDateRange;
@@ -37,6 +38,7 @@
 /**
  * Handles query which gets CreditSlipIds by provided date range
  */
+#[AsQueryHandler]
 final class GetCreditSlipIdsByDateRangeHandler implements GetCreditSlipIdsByDateRangeHandlerInterface
 {
     /**
diff --git a/src/Adapter/Currency/CommandHandler/AddOfficialCurrencyHandler.php b/src/Adapter/Currency/CommandHandler/AddOfficialCurrencyHandler.php
index 8494799e8bd05..6173d136f73e6 100644
--- a/src/Adapter/Currency/CommandHandler/AddOfficialCurrencyHandler.php
+++ b/src/Adapter/Currency/CommandHandler/AddOfficialCurrencyHandler.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Currency\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Currency\CurrencyDataProviderInterface;
 use PrestaShop\PrestaShop\Core\Domain\Currency\Command\AddCurrencyCommand;
 use PrestaShop\PrestaShop\Core\Domain\Currency\CommandHandler\AddCurrencyHandlerInterface;
@@ -47,6 +48,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class AddOfficialCurrencyHandler extends AbstractCurrencyHandler implements AddCurrencyHandlerInterface
 {
     /**
diff --git a/src/Adapter/Currency/CommandHandler/AddUnofficialCurrencyHandler.php b/src/Adapter/Currency/CommandHandler/AddUnofficialCurrencyHandler.php
index fac5509266668..e92b2e18062dc 100644
--- a/src/Adapter/Currency/CommandHandler/AddUnofficialCurrencyHandler.php
+++ b/src/Adapter/Currency/CommandHandler/AddUnofficialCurrencyHandler.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Currency\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Currency\CurrencyDataProviderInterface;
 use PrestaShop\PrestaShop\Core\Domain\Currency\Command\AddUnofficialCurrencyCommand;
 use PrestaShop\PrestaShop\Core\Domain\Currency\CommandHandler\AddUnofficialCurrencyHandlerInterface;
@@ -46,6 +47,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class AddUnofficialCurrencyHandler extends AbstractCurrencyHandler implements AddUnofficialCurrencyHandlerInterface
 {
     /**
diff --git a/src/Adapter/Currency/CommandHandler/BulkDeleteCurrenciesHandler.php b/src/Adapter/Currency/CommandHandler/BulkDeleteCurrenciesHandler.php
index 47d8e97c22008..35ed9be84f5b9 100644
--- a/src/Adapter/Currency/CommandHandler/BulkDeleteCurrenciesHandler.php
+++ b/src/Adapter/Currency/CommandHandler/BulkDeleteCurrenciesHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Currency\CommandHandler;
 
 use Currency;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Currency\Command\BulkDeleteCurrenciesCommand;
 use PrestaShop\PrestaShop\Core\Domain\Currency\CommandHandler\BulkDeleteCurrenciesHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\BulkDeleteCurrenciesException;
@@ -40,6 +41,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class BulkDeleteCurrenciesHandler extends AbstractCurrencyHandler implements BulkDeleteCurrenciesHandlerInterface
 {
     /**
diff --git a/src/Adapter/Currency/CommandHandler/BulkToggleCurrenciesStatusHandler.php b/src/Adapter/Currency/CommandHandler/BulkToggleCurrenciesStatusHandler.php
index 1960f14b4cbbf..37305e3ae8b3f 100644
--- a/src/Adapter/Currency/CommandHandler/BulkToggleCurrenciesStatusHandler.php
+++ b/src/Adapter/Currency/CommandHandler/BulkToggleCurrenciesStatusHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Currency\CommandHandler;
 
 use Currency;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Currency\Command\BulkToggleCurrenciesStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\Currency\CommandHandler\BulkToggleCurrenciesStatusHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\BulkToggleCurrenciesException;
@@ -40,6 +41,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class BulkToggleCurrenciesStatusHandler extends AbstractCurrencyHandler implements BulkToggleCurrenciesStatusHandlerInterface
 {
     /**
diff --git a/src/Adapter/Currency/CommandHandler/DeleteCurrencyHandler.php b/src/Adapter/Currency/CommandHandler/DeleteCurrencyHandler.php
index ab4061155519d..0545f5d4187d7 100644
--- a/src/Adapter/Currency/CommandHandler/DeleteCurrencyHandler.php
+++ b/src/Adapter/Currency/CommandHandler/DeleteCurrencyHandler.php
@@ -28,6 +28,7 @@
 
 use Configuration;
 use Currency;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Currency\Command\DeleteCurrencyCommand;
 use PrestaShop\PrestaShop\Core\Domain\Currency\CommandHandler\DeleteCurrencyHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CannotDeleteCurrencyException;
@@ -43,6 +44,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class DeleteCurrencyHandler implements DeleteCurrencyHandlerInterface
 {
     /**
diff --git a/src/Adapter/Currency/CommandHandler/EditOfficialCurrencyHandler.php b/src/Adapter/Currency/CommandHandler/EditOfficialCurrencyHandler.php
index ee33f9cd06835..a56e6b5e4c998 100644
--- a/src/Adapter/Currency/CommandHandler/EditOfficialCurrencyHandler.php
+++ b/src/Adapter/Currency/CommandHandler/EditOfficialCurrencyHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Currency\CommandHandler;
 
 use Currency;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Currency\Command\EditCurrencyCommand;
 use PrestaShop\PrestaShop\Core\Domain\Currency\CommandHandler\EditCurrencyHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CannotDisableDefaultCurrencyException;
@@ -43,6 +44,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class EditOfficialCurrencyHandler extends AbstractCurrencyHandler implements EditCurrencyHandlerInterface
 {
     /**
diff --git a/src/Adapter/Currency/CommandHandler/EditUnofficialCurrencyHandler.php b/src/Adapter/Currency/CommandHandler/EditUnofficialCurrencyHandler.php
index 9205c2824f35f..5a6b49dfe8d47 100644
--- a/src/Adapter/Currency/CommandHandler/EditUnofficialCurrencyHandler.php
+++ b/src/Adapter/Currency/CommandHandler/EditUnofficialCurrencyHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Currency\CommandHandler;
 
 use Currency;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Currency\Command\EditUnofficialCurrencyCommand;
 use PrestaShop\PrestaShop\Core\Domain\Currency\CommandHandler\EditUnofficialCurrencyHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CannotDisableDefaultCurrencyException;
@@ -45,6 +46,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class EditUnofficialCurrencyHandler extends AbstractCurrencyHandler implements EditUnofficialCurrencyHandlerInterface
 {
     /**
diff --git a/src/Adapter/Currency/CommandHandler/RefreshExchangeRatesHandler.php b/src/Adapter/Currency/CommandHandler/RefreshExchangeRatesHandler.php
index c2cad8b8081e3..92344bce66a90 100644
--- a/src/Adapter/Currency/CommandHandler/RefreshExchangeRatesHandler.php
+++ b/src/Adapter/Currency/CommandHandler/RefreshExchangeRatesHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Currency\CommandHandler;
 
 use Currency;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Currency\Command\RefreshExchangeRatesCommand;
 use PrestaShop\PrestaShop\Core\Domain\Currency\CommandHandler\RefreshExchangeRatesHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CannotRefreshExchangeRatesException;
@@ -37,6 +38,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class RefreshExchangeRatesHandler implements RefreshExchangeRatesHandlerInterface
 {
     /**
diff --git a/src/Adapter/Currency/CommandHandler/ToggleCurrencyStatusHandler.php b/src/Adapter/Currency/CommandHandler/ToggleCurrencyStatusHandler.php
index 6b125ff285222..b1cf7cbfff8fa 100644
--- a/src/Adapter/Currency/CommandHandler/ToggleCurrencyStatusHandler.php
+++ b/src/Adapter/Currency/CommandHandler/ToggleCurrencyStatusHandler.php
@@ -28,6 +28,7 @@
 
 use Configuration;
 use Currency;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Currency\Command\ToggleCurrencyStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\Currency\CommandHandler\ToggleCurrencyStatusHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CannotDisableDefaultCurrencyException;
@@ -43,6 +44,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class ToggleCurrencyStatusHandler implements ToggleCurrencyStatusHandlerInterface
 {
     /**
diff --git a/src/Adapter/Currency/QueryHandler/GetCurrencyExchangeRateHandler.php b/src/Adapter/Currency/QueryHandler/GetCurrencyExchangeRateHandler.php
index 0520b9aff7d66..f538f366423c4 100644
--- a/src/Adapter/Currency/QueryHandler/GetCurrencyExchangeRateHandler.php
+++ b/src/Adapter/Currency/QueryHandler/GetCurrencyExchangeRateHandler.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Currency\QueryHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Currency\Exception\CurrencyFeedException;
 use PrestaShop\PrestaShop\Core\Currency\ExchangeRateProvider;
 use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\ExchangeRateNotFoundException;
@@ -37,6 +38,7 @@
  * Class GetCurrencyExchangeRateHandler handles the GetCurrencyExchangeRate query
  * and returns the exchange rate of a specified currency via a ExchangeRate value object.
  */
+#[AsQueryHandler]
 class GetCurrencyExchangeRateHandler implements GetCurrencyExchangeRateHandlerInterface
 {
     /** @var ExchangeRateProvider */
diff --git a/src/Adapter/Currency/QueryHandler/GetCurrencyForEditingHandler.php b/src/Adapter/Currency/QueryHandler/GetCurrencyForEditingHandler.php
index 95bb772bc1e49..1048f80dc1e92 100644
--- a/src/Adapter/Currency/QueryHandler/GetCurrencyForEditingHandler.php
+++ b/src/Adapter/Currency/QueryHandler/GetCurrencyForEditingHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Currency\QueryHandler;
 
 use Currency;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CurrencyNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Currency\Query\GetCurrencyForEditing;
 use PrestaShop\PrestaShop\Core\Domain\Currency\QueryHandler\GetCurrencyForEditingHandlerInterface;
@@ -38,6 +39,7 @@
  *
  * @internal
  */
+#[AsQueryHandler]
 final class GetCurrencyForEditingHandler implements GetCurrencyForEditingHandlerInterface
 {
     /**
diff --git a/src/Adapter/Currency/QueryHandler/GetReferenceCurrencyHandler.php b/src/Adapter/Currency/QueryHandler/GetReferenceCurrencyHandler.php
index 2c7e4d79742cf..ceae8bf4bde15 100644
--- a/src/Adapter/Currency/QueryHandler/GetReferenceCurrencyHandler.php
+++ b/src/Adapter/Currency/QueryHandler/GetReferenceCurrencyHandler.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Currency\QueryHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CurrencyNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Currency\Query\GetReferenceCurrency;
 use PrestaShop\PrestaShop\Core\Domain\Currency\QueryHandler\GetReferenceCurrencyHandlerInterface;
@@ -34,6 +35,7 @@
 use PrestaShop\PrestaShop\Core\Localization\CLDR\CurrencyInterface;
 use PrestaShop\PrestaShop\Core\Localization\CLDR\LocaleRepository;
 
+#[AsQueryHandler]
 class GetReferenceCurrencyHandler implements GetReferenceCurrencyHandlerInterface
 {
     /**
diff --git a/src/Adapter/Customer/CommandHandler/AddCustomerHandler.php b/src/Adapter/Customer/CommandHandler/AddCustomerHandler.php
index 87d5e6e3ef10f..45a75ecf7a755 100644
--- a/src/Adapter/Customer/CommandHandler/AddCustomerHandler.php
+++ b/src/Adapter/Customer/CommandHandler/AddCustomerHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Customer\CommandHandler;
 
 use Customer;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Crypto\Hashing;
 use PrestaShop\PrestaShop\Core\Domain\Customer\Command\AddCustomerCommand;
 use PrestaShop\PrestaShop\Core\Domain\Customer\CommandHandler\AddCustomerHandlerInterface;
@@ -42,6 +43,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class AddCustomerHandler extends AbstractCustomerHandler implements AddCustomerHandlerInterface
 {
     /**
diff --git a/src/Adapter/Customer/CommandHandler/BulkDeleteCustomerHandler.php b/src/Adapter/Customer/CommandHandler/BulkDeleteCustomerHandler.php
index b2f083602f167..56c9796f1295d 100644
--- a/src/Adapter/Customer/CommandHandler/BulkDeleteCustomerHandler.php
+++ b/src/Adapter/Customer/CommandHandler/BulkDeleteCustomerHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Customer\CommandHandler;
 
 use Customer;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Customer\Command\BulkDeleteCustomerCommand;
 use PrestaShop\PrestaShop\Core\Domain\Customer\CommandHandler\BulkDeleteCustomerHandlerInterface;
 
@@ -35,6 +36,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class BulkDeleteCustomerHandler extends AbstractCustomerHandler implements BulkDeleteCustomerHandlerInterface
 {
     /**
diff --git a/src/Adapter/Customer/CommandHandler/BulkDisableCustomerHandler.php b/src/Adapter/Customer/CommandHandler/BulkDisableCustomerHandler.php
index d69e760aba39e..3ecd29e7581af 100644
--- a/src/Adapter/Customer/CommandHandler/BulkDisableCustomerHandler.php
+++ b/src/Adapter/Customer/CommandHandler/BulkDisableCustomerHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Customer\CommandHandler;
 
 use Customer;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Customer\Command\BulkDisableCustomerCommand;
 use PrestaShop\PrestaShop\Core\Domain\Customer\CommandHandler\BulkDisableCustomerHandlerInterface;
 
@@ -35,6 +36,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class BulkDisableCustomerHandler extends AbstractCustomerHandler implements BulkDisableCustomerHandlerInterface
 {
     /**
diff --git a/src/Adapter/Customer/CommandHandler/BulkEnableCustomerHandler.php b/src/Adapter/Customer/CommandHandler/BulkEnableCustomerHandler.php
index 444db4f08f18e..5c515d55836f8 100644
--- a/src/Adapter/Customer/CommandHandler/BulkEnableCustomerHandler.php
+++ b/src/Adapter/Customer/CommandHandler/BulkEnableCustomerHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Customer\CommandHandler;
 
 use Customer;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Customer\Command\BulkEnableCustomerCommand;
 use PrestaShop\PrestaShop\Core\Domain\Customer\CommandHandler\BulkEnableCustomerHandlerInterface;
 
@@ -35,6 +36,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class BulkEnableCustomerHandler extends AbstractCustomerHandler implements BulkEnableCustomerHandlerInterface
 {
     /**
diff --git a/src/Adapter/Customer/CommandHandler/DeleteCustomerHandler.php b/src/Adapter/Customer/CommandHandler/DeleteCustomerHandler.php
index d7732388a3db6..3803f5e02903e 100644
--- a/src/Adapter/Customer/CommandHandler/DeleteCustomerHandler.php
+++ b/src/Adapter/Customer/CommandHandler/DeleteCustomerHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Customer\CommandHandler;
 
 use Customer;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Customer\Command\DeleteCustomerCommand;
 use PrestaShop\PrestaShop\Core\Domain\Customer\CommandHandler\DeleteCustomerHandlerInterface;
 
@@ -35,6 +36,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class DeleteCustomerHandler extends AbstractCustomerHandler implements DeleteCustomerHandlerInterface
 {
     /**
diff --git a/src/Adapter/Customer/CommandHandler/EditCustomerHandler.php b/src/Adapter/Customer/CommandHandler/EditCustomerHandler.php
index 97805e6514647..563081118d3eb 100644
--- a/src/Adapter/Customer/CommandHandler/EditCustomerHandler.php
+++ b/src/Adapter/Customer/CommandHandler/EditCustomerHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Customer\CommandHandler;
 
 use Customer;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Crypto\Hashing;
 use PrestaShop\PrestaShop\Core\Domain\Customer\Command\EditCustomerCommand;
 use PrestaShop\PrestaShop\Core\Domain\Customer\CommandHandler\EditCustomerHandlerInterface;
@@ -41,6 +42,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class EditCustomerHandler extends AbstractCustomerHandler implements EditCustomerHandlerInterface
 {
     /**
diff --git a/src/Adapter/Customer/CommandHandler/SetPrivateNoteAboutCustomerHandler.php b/src/Adapter/Customer/CommandHandler/SetPrivateNoteAboutCustomerHandler.php
index c1a7753735619..35000525d0f8f 100644
--- a/src/Adapter/Customer/CommandHandler/SetPrivateNoteAboutCustomerHandler.php
+++ b/src/Adapter/Customer/CommandHandler/SetPrivateNoteAboutCustomerHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Customer\CommandHandler;
 
 use Customer;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Customer\Command\SetPrivateNoteAboutCustomerCommand;
 use PrestaShop\PrestaShop\Core\Domain\Customer\CommandHandler\SetPrivateNoteAboutCustomerHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Customer\Exception\CustomerNotFoundException;
@@ -36,6 +37,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class SetPrivateNoteAboutCustomerHandler implements SetPrivateNoteAboutCustomerHandlerInterface
 {
     /**
diff --git a/src/Adapter/Customer/CommandHandler/SetRequiredFieldsForCustomerHandler.php b/src/Adapter/Customer/CommandHandler/SetRequiredFieldsForCustomerHandler.php
index 0080481f835a8..e06d7f8662eee 100644
--- a/src/Adapter/Customer/CommandHandler/SetRequiredFieldsForCustomerHandler.php
+++ b/src/Adapter/Customer/CommandHandler/SetRequiredFieldsForCustomerHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Customer\CommandHandler;
 
 use Customer;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Customer\Command\SetRequiredFieldsForCustomerCommand;
 use PrestaShop\PrestaShop\Core\Domain\Customer\CommandHandler\SetRequiredFieldsForCustomerHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Customer\Exception\CannotSetRequiredFieldsForCustomerException;
@@ -36,6 +37,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class SetRequiredFieldsForCustomerHandler implements SetRequiredFieldsForCustomerHandlerInterface
 {
     /**
diff --git a/src/Adapter/Customer/CommandHandler/TransformGuestToCustomerHandler.php b/src/Adapter/Customer/CommandHandler/TransformGuestToCustomerHandler.php
index c160663525cbf..fcfe1684459d3 100644
--- a/src/Adapter/Customer/CommandHandler/TransformGuestToCustomerHandler.php
+++ b/src/Adapter/Customer/CommandHandler/TransformGuestToCustomerHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Customer\CommandHandler;
 
 use Customer;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Customer\Command\TransformGuestToCustomerCommand;
 use PrestaShop\PrestaShop\Core\Domain\Customer\CommandHandler\TransformGuestToCustomerHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Customer\Exception\CustomerNotFoundException;
@@ -38,6 +39,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class TransformGuestToCustomerHandler implements TransformGuestToCustomerHandlerInterface
 {
     /**
diff --git a/src/Adapter/Customer/Group/CommandHandler/AddCustomerGroupHandler.php b/src/Adapter/Customer/Group/CommandHandler/AddCustomerGroupHandler.php
index 3d62f42a50339..44b105c60de0f 100644
--- a/src/Adapter/Customer/Group/CommandHandler/AddCustomerGroupHandler.php
+++ b/src/Adapter/Customer/Group/CommandHandler/AddCustomerGroupHandler.php
@@ -30,10 +30,12 @@
 use Group as CustomerGroup;
 use PrestaShop\PrestaShop\Adapter\Customer\Group\Repository\GroupRepository;
 use PrestaShop\PrestaShop\Adapter\Customer\Group\Validate\CustomerGroupValidator;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Customer\Group\Command\AddCustomerGroupCommand;
 use PrestaShop\PrestaShop\Core\Domain\Customer\Group\CommandHandler\AddCustomerGroupHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Customer\Group\ValueObject\GroupId;
 
+#[AsCommandHandler]
 class AddCustomerGroupHandler implements AddCustomerGroupHandlerInterface
 {
     /**
diff --git a/src/Adapter/Customer/Group/QueryHandler/GetCustomerGroupForEditingHandler.php b/src/Adapter/Customer/Group/QueryHandler/GetCustomerGroupForEditingHandler.php
index ac5efa0dbe26d..0d2bae53eb847 100644
--- a/src/Adapter/Customer/Group/QueryHandler/GetCustomerGroupForEditingHandler.php
+++ b/src/Adapter/Customer/Group/QueryHandler/GetCustomerGroupForEditingHandler.php
@@ -29,11 +29,13 @@
 
 use PrestaShop\Decimal\DecimalNumber;
 use PrestaShop\PrestaShop\Adapter\Customer\Group\Repository\GroupRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Customer\Group\Exception\GroupNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Customer\Group\Query\GetCustomerGroupForEditing;
 use PrestaShop\PrestaShop\Core\Domain\Customer\Group\QueryHandler\GetCustomerGroupForEditingHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Customer\Group\QueryResult\EditableCustomerGroup;
 
+#[AsQueryHandler]
 class GetCustomerGroupForEditingHandler implements GetCustomerGroupForEditingHandlerInterface
 {
     /**
diff --git a/src/Adapter/Customer/QueryHandler/GetCustomerCartsHandler.php b/src/Adapter/Customer/QueryHandler/GetCustomerCartsHandler.php
index 90be229fb30c0..2d1ce3a2c47ac 100644
--- a/src/Adapter/Customer/QueryHandler/GetCustomerCartsHandler.php
+++ b/src/Adapter/Customer/QueryHandler/GetCustomerCartsHandler.php
@@ -30,6 +30,7 @@
 use Currency;
 use Customer;
 use PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\AbstractCustomerHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerCarts;
 use PrestaShop\PrestaShop\Core\Domain\Customer\QueryHandler\GetCustomerCartsHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Customer\QueryResult\CartSummary;
@@ -39,6 +40,7 @@
 /**
  * Handles GetCustomerCartsQuery using legacy object models
  */
+#[AsQueryHandler]
 final class GetCustomerCartsHandler extends AbstractCustomerHandler implements GetCustomerCartsHandlerInterface
 {
     /**
diff --git a/src/Adapter/Customer/QueryHandler/GetCustomerForAddressCreationHandler.php b/src/Adapter/Customer/QueryHandler/GetCustomerForAddressCreationHandler.php
index 4c0d7e7a44ca2..5a6a9cd659686 100644
--- a/src/Adapter/Customer/QueryHandler/GetCustomerForAddressCreationHandler.php
+++ b/src/Adapter/Customer/QueryHandler/GetCustomerForAddressCreationHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Customer\QueryHandler;
 
 use Customer;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Customer\Exception\CustomerByEmailNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Customer\Exception\CustomerException;
 use PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerForAddressCreation;
@@ -37,6 +38,7 @@
 /**
  * Handles finding customer by email
  */
+#[AsQueryHandler]
 final class GetCustomerForAddressCreationHandler implements GetCustomerForAddressCreationHandlerInterface
 {
     /**
diff --git a/src/Adapter/Customer/QueryHandler/GetCustomerForEditingHandler.php b/src/Adapter/Customer/QueryHandler/GetCustomerForEditingHandler.php
index 5deed8c34b1f2..4323423a97a8c 100644
--- a/src/Adapter/Customer/QueryHandler/GetCustomerForEditingHandler.php
+++ b/src/Adapter/Customer/QueryHandler/GetCustomerForEditingHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Customer\QueryHandler;
 
 use Customer;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Customer\Exception\CustomerNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerForEditing;
 use PrestaShop\PrestaShop\Core\Domain\Customer\QueryHandler\GetCustomerForEditingHandlerInterface;
@@ -41,6 +42,7 @@
  *
  * @internal
  */
+#[AsQueryHandler]
 final class GetCustomerForEditingHandler implements GetCustomerForEditingHandlerInterface
 {
     /**
diff --git a/src/Adapter/Customer/QueryHandler/GetCustomerForViewingHandler.php b/src/Adapter/Customer/QueryHandler/GetCustomerForViewingHandler.php
index 5527663a34ba7..c81eae6263fbc 100644
--- a/src/Adapter/Customer/QueryHandler/GetCustomerForViewingHandler.php
+++ b/src/Adapter/Customer/QueryHandler/GetCustomerForViewingHandler.php
@@ -34,6 +34,7 @@
 use Group;
 use Language;
 use PrestaShop\PrestaShop\Adapter\LegacyContext;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Customer\Exception\CustomerNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerForViewing;
 use PrestaShop\PrestaShop\Core\Domain\Customer\QueryHandler\GetCustomerForViewingHandlerInterface;
@@ -58,6 +59,7 @@
  *
  * @internal
  */
+#[AsQueryHandler]
 final class GetCustomerForViewingHandler implements GetCustomerForViewingHandlerInterface
 {
     /**
diff --git a/src/Adapter/Customer/QueryHandler/GetCustomerOrdersHandler.php b/src/Adapter/Customer/QueryHandler/GetCustomerOrdersHandler.php
index 0b4fe60c02453..80100536da0a3 100644
--- a/src/Adapter/Customer/QueryHandler/GetCustomerOrdersHandler.php
+++ b/src/Adapter/Customer/QueryHandler/GetCustomerOrdersHandler.php
@@ -30,6 +30,7 @@
 use Customer;
 use Order;
 use PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\AbstractCustomerHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Customer\Exception\CustomerNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerOrders;
 use PrestaShop\PrestaShop\Core\Domain\Customer\QueryHandler\GetCustomerOrdersHandlerInterface;
@@ -40,6 +41,7 @@
 /**
  * Handles GetCustomerOrders query using legacy object models
  */
+#[AsQueryHandler]
 final class GetCustomerOrdersHandler extends AbstractCustomerHandler implements GetCustomerOrdersHandlerInterface
 {
     /**
diff --git a/src/Adapter/Customer/QueryHandler/GetRequiredFieldsForCustomerHandler.php b/src/Adapter/Customer/QueryHandler/GetRequiredFieldsForCustomerHandler.php
index 580b64a42faa8..b01567fa1d990 100644
--- a/src/Adapter/Customer/QueryHandler/GetRequiredFieldsForCustomerHandler.php
+++ b/src/Adapter/Customer/QueryHandler/GetRequiredFieldsForCustomerHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Customer\QueryHandler;
 
 use Customer;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetRequiredFieldsForCustomer;
 use PrestaShop\PrestaShop\Core\Domain\Customer\QueryHandler\GetRequiredFieldsForCustomerHandlerInterface;
 
@@ -35,6 +36,7 @@
  *
  * @internal
  */
+#[AsQueryHandler]
 final class GetRequiredFieldsForCustomerHandler implements GetRequiredFieldsForCustomerHandlerInterface
 {
     /**
diff --git a/src/Adapter/Customer/QueryHandler/SearchCustomersHandler.php b/src/Adapter/Customer/QueryHandler/SearchCustomersHandler.php
index 531534120b326..25562fa244fe1 100644
--- a/src/Adapter/Customer/QueryHandler/SearchCustomersHandler.php
+++ b/src/Adapter/Customer/QueryHandler/SearchCustomersHandler.php
@@ -29,6 +29,7 @@
 use Customer;
 use Group;
 use PrestaShop\PrestaShop\Adapter\Configuration;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Customer\Query\SearchCustomers;
 use PrestaShop\PrestaShop\Core\Domain\Customer\QueryHandler\SearchCustomersHandlerInterface;
 
@@ -37,6 +38,7 @@
  *
  * @internal
  */
+#[AsQueryHandler]
 final class SearchCustomersHandler implements SearchCustomersHandlerInterface
 {
     /**
diff --git a/src/Adapter/Feature/CommandHandler/AddFeatureHandler.php b/src/Adapter/Feature/CommandHandler/AddFeatureHandler.php
index f7e4dc4befef5..d2baa7952b523 100644
--- a/src/Adapter/Feature/CommandHandler/AddFeatureHandler.php
+++ b/src/Adapter/Feature/CommandHandler/AddFeatureHandler.php
@@ -28,6 +28,7 @@
 
 use PrestaShop\PrestaShop\Adapter\Domain\AbstractObjectModelHandler;
 use PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Feature\Command\AddFeatureCommand;
 use PrestaShop\PrestaShop\Core\Domain\Feature\CommandHandler\AddFeatureHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Feature\ValueObject\FeatureId;
@@ -35,6 +36,7 @@
 /**
  * Handles adding of features using legacy logic.
  */
+#[AsCommandHandler]
 class AddFeatureHandler extends AbstractObjectModelHandler implements AddFeatureHandlerInterface
 {
     /**
diff --git a/src/Adapter/Feature/CommandHandler/AddFeatureValueHandler.php b/src/Adapter/Feature/CommandHandler/AddFeatureValueHandler.php
index effeef1e70053..c453ae23e4955 100644
--- a/src/Adapter/Feature/CommandHandler/AddFeatureValueHandler.php
+++ b/src/Adapter/Feature/CommandHandler/AddFeatureValueHandler.php
@@ -31,6 +31,7 @@
 use FeatureValue;
 use PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureRepository;
 use PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureValueRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Feature\Command\AddFeatureValueCommand;
 use PrestaShop\PrestaShop\Core\Domain\Feature\CommandHandler\AddFeatureValueHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Feature\ValueObject\FeatureValueId;
@@ -38,6 +39,7 @@
 /**
  * Handles adding of feature value using legacy model.
  */
+#[AsCommandHandler]
 class AddFeatureValueHandler implements AddFeatureValueHandlerInterface
 {
     /**
diff --git a/src/Adapter/Feature/CommandHandler/BulkDeleteFeatureHandler.php b/src/Adapter/Feature/CommandHandler/BulkDeleteFeatureHandler.php
index 268069ad4be0b..55df4c0763827 100644
--- a/src/Adapter/Feature/CommandHandler/BulkDeleteFeatureHandler.php
+++ b/src/Adapter/Feature/CommandHandler/BulkDeleteFeatureHandler.php
@@ -28,6 +28,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Feature\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\AbstractBulkCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Exception\BulkCommandExceptionInterface;
 use PrestaShop\PrestaShop\Core\Domain\Feature\Command\BulkDeleteFeatureCommand;
@@ -36,6 +37,7 @@
 use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\FeatureException;
 use PrestaShop\PrestaShop\Core\Domain\Feature\ValueObject\FeatureId;
 
+#[AsCommandHandler]
 class BulkDeleteFeatureHandler extends AbstractBulkCommandHandler implements BulkDeleteFeatureHandlerInterface
 {
     /**
diff --git a/src/Adapter/Feature/CommandHandler/DeleteFeatureHandler.php b/src/Adapter/Feature/CommandHandler/DeleteFeatureHandler.php
index 9e21623848ac7..b2a80bcf51307 100644
--- a/src/Adapter/Feature/CommandHandler/DeleteFeatureHandler.php
+++ b/src/Adapter/Feature/CommandHandler/DeleteFeatureHandler.php
@@ -28,9 +28,11 @@
 namespace PrestaShop\PrestaShop\Adapter\Feature\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Feature\Command\DeleteFeatureCommand;
 use PrestaShop\PrestaShop\Core\Domain\Feature\CommandHandler\DeleteFeatureHandlerInterface;
 
+#[AsCommandHandler]
 class DeleteFeatureHandler implements DeleteFeatureHandlerInterface
 {
     /**
diff --git a/src/Adapter/Feature/CommandHandler/EditFeatureHandler.php b/src/Adapter/Feature/CommandHandler/EditFeatureHandler.php
index 3d74d9eb33c50..e35367bb55e02 100644
--- a/src/Adapter/Feature/CommandHandler/EditFeatureHandler.php
+++ b/src/Adapter/Feature/CommandHandler/EditFeatureHandler.php
@@ -28,6 +28,7 @@
 
 use PrestaShop\PrestaShop\Adapter\Domain\AbstractObjectModelHandler;
 use PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Feature\Command\EditFeatureCommand;
 use PrestaShop\PrestaShop\Core\Domain\Feature\CommandHandler\EditFeatureHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopId;
@@ -35,6 +36,7 @@
 /**
  * Handles feature editing.
  */
+#[AsCommandHandler]
 class EditFeatureHandler extends AbstractObjectModelHandler implements EditFeatureHandlerInterface
 {
     /**
diff --git a/src/Adapter/Feature/CommandHandler/EditFeatureValueHandler.php b/src/Adapter/Feature/CommandHandler/EditFeatureValueHandler.php
index eb1ee4b9cc820..18dc6e4aa9275 100644
--- a/src/Adapter/Feature/CommandHandler/EditFeatureValueHandler.php
+++ b/src/Adapter/Feature/CommandHandler/EditFeatureValueHandler.php
@@ -29,12 +29,14 @@
 namespace PrestaShop\PrestaShop\Adapter\Feature\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureValueRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Feature\Command\EditFeatureValueCommand;
 use PrestaShop\PrestaShop\Core\Domain\Feature\CommandHandler\EditFeatureValueHandlerInterface;
 
 /**
  * Handles edition of feature value using legacy model.
  */
+#[AsCommandHandler]
 class EditFeatureValueHandler implements EditFeatureValueHandlerInterface
 {
     /**
diff --git a/src/Adapter/Feature/QueryHandler/GetFeatureForEditingHandler.php b/src/Adapter/Feature/QueryHandler/GetFeatureForEditingHandler.php
index da6ad2520f3bf..619b1ff2edaaa 100644
--- a/src/Adapter/Feature/QueryHandler/GetFeatureForEditingHandler.php
+++ b/src/Adapter/Feature/QueryHandler/GetFeatureForEditingHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Feature\QueryHandler;
 
 use Feature;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\FeatureNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Feature\Query\GetFeatureForEditing;
 use PrestaShop\PrestaShop\Core\Domain\Feature\QueryHandler\GetFeatureForEditingHandlerInterface;
@@ -35,6 +36,7 @@
 /**
  * Handles get feature for editing query.
  */
+#[AsQueryHandler]
 final class GetFeatureForEditingHandler implements GetFeatureForEditingHandlerInterface
 {
     /**
diff --git a/src/Adapter/Feature/QueryHandler/GetFeatureValueForEditingHandler.php b/src/Adapter/Feature/QueryHandler/GetFeatureValueForEditingHandler.php
index af294689a3439..104205ba15be5 100644
--- a/src/Adapter/Feature/QueryHandler/GetFeatureValueForEditingHandler.php
+++ b/src/Adapter/Feature/QueryHandler/GetFeatureValueForEditingHandler.php
@@ -29,11 +29,13 @@
 namespace PrestaShop\PrestaShop\Adapter\Feature\QueryHandler;
 
 use PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureValueRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Feature\Query\GetFeatureValueForEditing;
 use PrestaShop\PrestaShop\Core\Domain\Feature\QueryHandler\GetFeatureValueForEditingHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Feature\QueryResult\EditableFeatureValue;
 use PrestaShop\PrestaShop\Core\Domain\Feature\ValueObject\FeatureId;
 
+#[AsQueryHandler]
 class GetFeatureValueForEditingHandler implements GetFeatureValueForEditingHandlerInterface
 {
     /**
diff --git a/src/Adapter/Hook/CommandHandler/UpdateHookStatusCommandHandler.php b/src/Adapter/Hook/CommandHandler/UpdateHookStatusCommandHandler.php
index db7a2d8714a1b..31b22327dacb2 100644
--- a/src/Adapter/Hook/CommandHandler/UpdateHookStatusCommandHandler.php
+++ b/src/Adapter/Hook/CommandHandler/UpdateHookStatusCommandHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Hook\CommandHandler;
 
 use Hook;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Hook\Command\UpdateHookStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\Hook\CommandHandler\UpdateHookStatusCommandHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Hook\Exception\CannotUpdateHookException;
@@ -37,6 +38,7 @@
 /**
  * @internal
  */
+#[AsCommandHandler]
 class UpdateHookStatusCommandHandler implements UpdateHookStatusCommandHandlerInterface
 {
     /**
diff --git a/src/Adapter/Hook/QueryHandler/GetHookStatusHandler.php b/src/Adapter/Hook/QueryHandler/GetHookStatusHandler.php
index 00b1cbff1ebdb..692df8741d2c7 100644
--- a/src/Adapter/Hook/QueryHandler/GetHookStatusHandler.php
+++ b/src/Adapter/Hook/QueryHandler/GetHookStatusHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Hook\QueryHandler;
 
 use Hook;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Hook\Exception\HookNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHookStatus;
 use PrestaShop\PrestaShop\Core\Domain\Hook\QueryHandler\GetHookStatusHandlerInterface;
@@ -37,6 +38,7 @@
 /**
  * @internal
  */
+#[AsQueryHandler]
 final class GetHookStatusHandler implements GetHookStatusHandlerInterface
 {
     /**
diff --git a/src/Adapter/Language/CommandHandler/AddLanguageHandler.php b/src/Adapter/Language/CommandHandler/AddLanguageHandler.php
index a4b3fae36d167..462a592f733b8 100644
--- a/src/Adapter/Language/CommandHandler/AddLanguageHandler.php
+++ b/src/Adapter/Language/CommandHandler/AddLanguageHandler.php
@@ -29,6 +29,7 @@
 use Language;
 use PrestaShop\PrestaShop\Adapter\File\RobotsTextFileGenerator;
 use PrestaShop\PrestaShop\Adapter\Image\ImageValidator;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Language\Command\AddLanguageCommand;
 use PrestaShop\PrestaShop\Core\Domain\Language\CommandHandler\AddLanguageHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Language\Exception\LanguageConstraintException;
@@ -41,6 +42,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class AddLanguageHandler extends AbstractLanguageHandler implements AddLanguageHandlerInterface
 {
     /**
diff --git a/src/Adapter/Language/CommandHandler/BulkDeleteLanguagesHandler.php b/src/Adapter/Language/CommandHandler/BulkDeleteLanguagesHandler.php
index 06f472f8b05b0..4c079591a0666 100644
--- a/src/Adapter/Language/CommandHandler/BulkDeleteLanguagesHandler.php
+++ b/src/Adapter/Language/CommandHandler/BulkDeleteLanguagesHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Language\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\File\RobotsTextFileGenerator;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Language\Command\BulkDeleteLanguagesCommand;
 use PrestaShop\PrestaShop\Core\Domain\Language\CommandHandler\BulkDeleteLanguagesHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Language\Exception\DefaultLanguageException;
@@ -38,6 +39,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class BulkDeleteLanguagesHandler extends AbstractLanguageHandler implements BulkDeleteLanguagesHandlerInterface
 {
     /**
diff --git a/src/Adapter/Language/CommandHandler/BulkToggleLanguagesStatusHandler.php b/src/Adapter/Language/CommandHandler/BulkToggleLanguagesStatusHandler.php
index 31da14bf9bd0b..c1bf5dc683d8c 100644
--- a/src/Adapter/Language/CommandHandler/BulkToggleLanguagesStatusHandler.php
+++ b/src/Adapter/Language/CommandHandler/BulkToggleLanguagesStatusHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Language\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\File\RobotsTextFileGenerator;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Language\Command\BulkToggleLanguagesStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\Language\CommandHandler\BulkToggleLanguagesStatusHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Language\Exception\LanguageException;
@@ -36,6 +37,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class BulkToggleLanguagesStatusHandler extends AbstractLanguageHandler implements BulkToggleLanguagesStatusHandlerInterface
 {
     /**
diff --git a/src/Adapter/Language/CommandHandler/DeleteLanguageHandler.php b/src/Adapter/Language/CommandHandler/DeleteLanguageHandler.php
index 1beea0b7b302f..dd6686c29877b 100644
--- a/src/Adapter/Language/CommandHandler/DeleteLanguageHandler.php
+++ b/src/Adapter/Language/CommandHandler/DeleteLanguageHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Language\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\File\RobotsTextFileGenerator;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Language\Command\DeleteLanguageCommand;
 use PrestaShop\PrestaShop\Core\Domain\Language\CommandHandler\DeleteLanguageHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Language\Exception\DefaultLanguageException;
@@ -38,6 +39,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class DeleteLanguageHandler extends AbstractLanguageHandler implements DeleteLanguageHandlerInterface
 {
     /**
diff --git a/src/Adapter/Language/CommandHandler/EditLanguageHandler.php b/src/Adapter/Language/CommandHandler/EditLanguageHandler.php
index dd0b8747ca265..ab2efa2b535b3 100644
--- a/src/Adapter/Language/CommandHandler/EditLanguageHandler.php
+++ b/src/Adapter/Language/CommandHandler/EditLanguageHandler.php
@@ -30,6 +30,7 @@
 use Db;
 use Language;
 use PrestaShop\PrestaShop\Adapter\Image\ImageValidator;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Language\Command\EditLanguageCommand;
 use PrestaShop\PrestaShop\Core\Domain\Language\CommandHandler\EditLanguageHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Language\Exception\CannotDisableDefaultLanguageException;
@@ -42,6 +43,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class EditLanguageHandler extends AbstractLanguageHandler implements EditLanguageHandlerInterface
 {
     /**
diff --git a/src/Adapter/Language/CommandHandler/ToggleLanguageStatusHandler.php b/src/Adapter/Language/CommandHandler/ToggleLanguageStatusHandler.php
index 840f73b7997b8..ec8aee7e03118 100644
--- a/src/Adapter/Language/CommandHandler/ToggleLanguageStatusHandler.php
+++ b/src/Adapter/Language/CommandHandler/ToggleLanguageStatusHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Language\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\File\RobotsTextFileGenerator;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Language\Command\ToggleLanguageStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\Language\CommandHandler\ToggleLanguageStatusHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Language\Exception\LanguageException;
@@ -36,6 +37,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class ToggleLanguageStatusHandler extends AbstractLanguageHandler implements ToggleLanguageStatusHandlerInterface
 {
     /**
diff --git a/src/Adapter/Language/QueryHandler/GetLanguageForEditingHandler.php b/src/Adapter/Language/QueryHandler/GetLanguageForEditingHandler.php
index 793c45ef24e96..bbf13670561b6 100644
--- a/src/Adapter/Language/QueryHandler/GetLanguageForEditingHandler.php
+++ b/src/Adapter/Language/QueryHandler/GetLanguageForEditingHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Language\QueryHandler;
 
 use Language;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Language\Exception\LanguageNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Language\Query\GetLanguageForEditing;
 use PrestaShop\PrestaShop\Core\Domain\Language\QueryHandler\GetLanguageForEditingHandlerInterface;
@@ -40,6 +41,7 @@
  *
  * @internal
  */
+#[AsQueryHandler]
 final class GetLanguageForEditingHandler implements GetLanguageForEditingHandlerInterface
 {
     /**
diff --git a/src/Adapter/Manufacturer/CommandHandler/AddManufacturerHandler.php b/src/Adapter/Manufacturer/CommandHandler/AddManufacturerHandler.php
index f247cc0d9e91c..75cdc6258fc6a 100644
--- a/src/Adapter/Manufacturer/CommandHandler/AddManufacturerHandler.php
+++ b/src/Adapter/Manufacturer/CommandHandler/AddManufacturerHandler.php
@@ -28,6 +28,7 @@
 
 use Manufacturer;
 use PrestaShop\PrestaShop\Adapter\Manufacturer\AbstractManufacturerHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\AddManufacturerCommand;
 use PrestaShop\PrestaShop\Core\Domain\Manufacturer\CommandHandler\AddManufacturerHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Manufacturer\Exception\ManufacturerException;
@@ -36,6 +37,7 @@
 /**
  * Handles command which adds new manufacturer using legacy object model
  */
+#[AsCommandHandler]
 final class AddManufacturerHandler extends AbstractManufacturerHandler implements AddManufacturerHandlerInterface
 {
     /**
diff --git a/src/Adapter/Manufacturer/CommandHandler/BulkDeleteManufacturerHandler.php b/src/Adapter/Manufacturer/CommandHandler/BulkDeleteManufacturerHandler.php
index 561d7c1008f8a..ac7634c54104b 100644
--- a/src/Adapter/Manufacturer/CommandHandler/BulkDeleteManufacturerHandler.php
+++ b/src/Adapter/Manufacturer/CommandHandler/BulkDeleteManufacturerHandler.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\BulkDeleteManufacturerCommand;
 use PrestaShop\PrestaShop\Core\Domain\Manufacturer\CommandHandler\BulkDeleteManufacturerHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Manufacturer\Exception\DeleteManufacturerException;
@@ -33,6 +34,7 @@
 /**
  * Handles command which deletes manufacturers in bulk action
  */
+#[AsCommandHandler]
 final class BulkDeleteManufacturerHandler extends AbstractManufacturerCommandHandler implements BulkDeleteManufacturerHandlerInterface
 {
     /**
diff --git a/src/Adapter/Manufacturer/CommandHandler/BulkToggleManufacturerStatusHandler.php b/src/Adapter/Manufacturer/CommandHandler/BulkToggleManufacturerStatusHandler.php
index 59b510fca84da..aa2a5e4a39f4a 100644
--- a/src/Adapter/Manufacturer/CommandHandler/BulkToggleManufacturerStatusHandler.php
+++ b/src/Adapter/Manufacturer/CommandHandler/BulkToggleManufacturerStatusHandler.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\BulkToggleManufacturerStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\Manufacturer\CommandHandler\BulkToggleManufacturerStatusHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Manufacturer\Exception\UpdateManufacturerException;
@@ -33,6 +34,7 @@
 /**
  * Handles command which toggles manufacturer status in bulk action
  */
+#[AsCommandHandler]
 final class BulkToggleManufacturerStatusHandler extends AbstractManufacturerCommandHandler implements BulkToggleManufacturerStatusHandlerInterface
 {
     /**
diff --git a/src/Adapter/Manufacturer/CommandHandler/DeleteManufacturerHandler.php b/src/Adapter/Manufacturer/CommandHandler/DeleteManufacturerHandler.php
index 45d621b71f74d..e2c89804a1cd7 100644
--- a/src/Adapter/Manufacturer/CommandHandler/DeleteManufacturerHandler.php
+++ b/src/Adapter/Manufacturer/CommandHandler/DeleteManufacturerHandler.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\DeleteManufacturerCommand;
 use PrestaShop\PrestaShop\Core\Domain\Manufacturer\CommandHandler\DeleteManufacturerHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Manufacturer\Exception\DeleteManufacturerException;
@@ -33,6 +34,7 @@
 /**
  * Handles command which deletes manufacturer using legacy object model
  */
+#[AsCommandHandler]
 final class DeleteManufacturerHandler extends AbstractManufacturerCommandHandler implements DeleteManufacturerHandlerInterface
 {
     /**
diff --git a/src/Adapter/Manufacturer/CommandHandler/DeleteManufacturerLogoImageHandler.php b/src/Adapter/Manufacturer/CommandHandler/DeleteManufacturerLogoImageHandler.php
index f059213ec36bb..9dcc50b60a000 100644
--- a/src/Adapter/Manufacturer/CommandHandler/DeleteManufacturerLogoImageHandler.php
+++ b/src/Adapter/Manufacturer/CommandHandler/DeleteManufacturerLogoImageHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler;
 
 use ImageType;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\DeleteManufacturerLogoImageCommand;
 use PrestaShop\PrestaShop\Core\Domain\Manufacturer\CommandHandler\DeleteManufacturerLogoImageHandlerInterface;
 use Symfony\Component\Filesystem\Filesystem;
@@ -36,6 +37,7 @@
 /**
  * Handles command which deletes manufacturer cover image using legacy object model
  */
+#[AsCommandHandler]
 class DeleteManufacturerLogoImageHandler extends AbstractManufacturerCommandHandler implements DeleteManufacturerLogoImageHandlerInterface
 {
     /**
diff --git a/src/Adapter/Manufacturer/CommandHandler/EditManufacturerHandler.php b/src/Adapter/Manufacturer/CommandHandler/EditManufacturerHandler.php
index a44ca3d17b66b..f91acedca916a 100644
--- a/src/Adapter/Manufacturer/CommandHandler/EditManufacturerHandler.php
+++ b/src/Adapter/Manufacturer/CommandHandler/EditManufacturerHandler.php
@@ -28,6 +28,7 @@
 
 use Manufacturer;
 use PrestaShop\PrestaShop\Adapter\Manufacturer\AbstractManufacturerHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\EditManufacturerCommand;
 use PrestaShop\PrestaShop\Core\Domain\Manufacturer\CommandHandler\EditManufacturerHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Manufacturer\Exception\ManufacturerException;
@@ -36,6 +37,7 @@
 /**
  * Handles command which edits manufacturer using legacy object model
  */
+#[AsCommandHandler]
 final class EditManufacturerHandler extends AbstractManufacturerHandler implements EditManufacturerHandlerInterface
 {
     /**
diff --git a/src/Adapter/Manufacturer/CommandHandler/ToggleManufacturerStatusHandler.php b/src/Adapter/Manufacturer/CommandHandler/ToggleManufacturerStatusHandler.php
index d8f19099cdfa6..7e5123a44375c 100644
--- a/src/Adapter/Manufacturer/CommandHandler/ToggleManufacturerStatusHandler.php
+++ b/src/Adapter/Manufacturer/CommandHandler/ToggleManufacturerStatusHandler.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\ToggleManufacturerStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\Manufacturer\CommandHandler\ToggleManufacturerStatusHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Manufacturer\Exception\UpdateManufacturerException;
@@ -33,6 +34,7 @@
 /**
  * Handles command which toggles manufacturer status
  */
+#[AsCommandHandler]
 final class ToggleManufacturerStatusHandler extends AbstractManufacturerCommandHandler implements ToggleManufacturerStatusHandlerInterface
 {
     /**
diff --git a/src/Adapter/Manufacturer/QueryHandler/GetManufacturerForEditingHandler.php b/src/Adapter/Manufacturer/QueryHandler/GetManufacturerForEditingHandler.php
index 1adb47253dbb9..33774f6651d8e 100644
--- a/src/Adapter/Manufacturer/QueryHandler/GetManufacturerForEditingHandler.php
+++ b/src/Adapter/Manufacturer/QueryHandler/GetManufacturerForEditingHandler.php
@@ -28,6 +28,7 @@
 
 use ImageManager;
 use PrestaShop\PrestaShop\Adapter\Manufacturer\AbstractManufacturerHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Manufacturer\Query\GetManufacturerForEditing;
 use PrestaShop\PrestaShop\Core\Domain\Manufacturer\QueryHandler\GetManufacturerForEditingHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Manufacturer\QueryResult\EditableManufacturer;
@@ -37,6 +38,7 @@
 /**
  * Handles query which gets manufacturer for editing
  */
+#[AsQueryHandler]
 final class GetManufacturerForEditingHandler extends AbstractManufacturerHandler implements GetManufacturerForEditingHandlerInterface
 {
     /**
diff --git a/src/Adapter/Manufacturer/QueryHandler/GetManufacturerForViewingHandler.php b/src/Adapter/Manufacturer/QueryHandler/GetManufacturerForViewingHandler.php
index 9d36539c5ad8c..e913b93e0d38d 100644
--- a/src/Adapter/Manufacturer/QueryHandler/GetManufacturerForViewingHandler.php
+++ b/src/Adapter/Manufacturer/QueryHandler/GetManufacturerForViewingHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Manufacturer\QueryHandler;
 
 use Manufacturer;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Language\ValueObject\LanguageId;
 use PrestaShop\PrestaShop\Core\Domain\Manufacturer\Exception\ManufacturerNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Manufacturer\Query\GetManufacturerForViewing;
@@ -38,6 +39,7 @@
 /**
  * Handles getting manufacturer for viewing query using legacy object model
  */
+#[AsQueryHandler]
 final class GetManufacturerForViewingHandler implements GetManufacturerForViewingHandlerInterface
 {
     /**
diff --git a/src/Adapter/Meta/CommandHandler/AddMetaHandler.php b/src/Adapter/Meta/CommandHandler/AddMetaHandler.php
index 7cf16394c7f45..88c51fe86a434 100644
--- a/src/Adapter/Meta/CommandHandler/AddMetaHandler.php
+++ b/src/Adapter/Meta/CommandHandler/AddMetaHandler.php
@@ -28,6 +28,7 @@
 
 use Meta;
 use PrestaShop\PrestaShop\Adapter\Meta\MetaDataProvider;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\DefaultLanguage;
 use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\IsUrlRewrite;
 use PrestaShop\PrestaShop\Core\Domain\Meta\Command\AddMetaCommand;
@@ -45,6 +46,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class AddMetaHandler implements AddMetaHandlerInterface
 {
     /**
diff --git a/src/Adapter/Meta/CommandHandler/EditMetaHandler.php b/src/Adapter/Meta/CommandHandler/EditMetaHandler.php
index 03c2e16071b0c..22e5f54fff3e8 100644
--- a/src/Adapter/Meta/CommandHandler/EditMetaHandler.php
+++ b/src/Adapter/Meta/CommandHandler/EditMetaHandler.php
@@ -28,6 +28,7 @@
 
 use Meta;
 use PrestaShop\PrestaShop\Adapter\Meta\MetaDataProvider;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\DefaultLanguage;
 use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\IsUrlRewrite;
 use PrestaShop\PrestaShop\Core\Domain\Meta\Command\EditMetaCommand;
@@ -44,6 +45,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class EditMetaHandler implements EditMetaHandlerInterface
 {
     /**
diff --git a/src/Adapter/Meta/QueryHandler/GetMetaForEditingHandler.php b/src/Adapter/Meta/QueryHandler/GetMetaForEditingHandler.php
index 6d47a77d20d1b..3e51d1e366b5c 100644
--- a/src/Adapter/Meta/QueryHandler/GetMetaForEditingHandler.php
+++ b/src/Adapter/Meta/QueryHandler/GetMetaForEditingHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Meta\QueryHandler;
 
 use Meta;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Meta\Exception\MetaNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Meta\Query\GetMetaForEditing;
 use PrestaShop\PrestaShop\Core\Domain\Meta\QueryHandler\GetMetaForEditingHandlerInterface;
@@ -37,6 +38,7 @@
  *
  * @internal
  */
+#[AsQueryHandler]
 final class GetMetaForEditingHandler implements GetMetaForEditingHandlerInterface
 {
     /**
diff --git a/src/Adapter/Meta/QueryHandler/GetPagesForLayoutCustomizationHandler.php b/src/Adapter/Meta/QueryHandler/GetPagesForLayoutCustomizationHandler.php
index 78cd3adb12d31..6853ae5a34d14 100644
--- a/src/Adapter/Meta/QueryHandler/GetPagesForLayoutCustomizationHandler.php
+++ b/src/Adapter/Meta/QueryHandler/GetPagesForLayoutCustomizationHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Meta\QueryHandler;
 
 use Meta;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Meta\Query\GetPagesForLayoutCustomization;
 use PrestaShop\PrestaShop\Core\Domain\Meta\QueryHandler\GetPagesForLayoutCustomizationHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Meta\QueryResult\LayoutCustomizationPage;
@@ -34,6 +35,7 @@
 /**
  * Class GetMetaPagesListHandler.
  */
+#[AsQueryHandler]
 final class GetPagesForLayoutCustomizationHandler implements GetPagesForLayoutCustomizationHandlerInterface
 {
     /**
diff --git a/src/Adapter/Module/CommandHandler/BulkToggleModuleStatusHandler.php b/src/Adapter/Module/CommandHandler/BulkToggleModuleStatusHandler.php
index 31d1fd74e0aab..3bf2209900a81 100755
--- a/src/Adapter/Module/CommandHandler/BulkToggleModuleStatusHandler.php
+++ b/src/Adapter/Module/CommandHandler/BulkToggleModuleStatusHandler.php
@@ -30,6 +30,7 @@
 
 use Module;
 use PrestaShop\PrestaShop\Core\Cache\Clearer\CacheClearerInterface;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Module\Command\BulkToggleModuleStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\Module\CommandHandler\BulkToggleModuleStatusHandlerInterface;
 use PrestaShop\PrestaShop\Core\Module\ModuleManager;
@@ -39,6 +40,7 @@
 /**
  * Bulk toggles Module status
  */
+#[AsCommandHandler]
 class BulkToggleModuleStatusHandler implements BulkToggleModuleStatusHandlerInterface
 {
     /**
diff --git a/src/Adapter/Notification/CommandHandler/UpdateEmployeeNotificationLastElementHandler.php b/src/Adapter/Notification/CommandHandler/UpdateEmployeeNotificationLastElementHandler.php
index 9f554cb780d43..68a04065fef5d 100644
--- a/src/Adapter/Notification/CommandHandler/UpdateEmployeeNotificationLastElementHandler.php
+++ b/src/Adapter/Notification/CommandHandler/UpdateEmployeeNotificationLastElementHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Notification\CommandHandler;
 
 use Notification;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Notification\Command\UpdateEmployeeNotificationLastElementCommand;
 use PrestaShop\PrestaShop\Core\Domain\Notification\CommandHandler\UpdateEmployeeNotificationLastElementCommandHandlerInterface;
 
@@ -35,6 +36,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class UpdateEmployeeNotificationLastElementHandler implements UpdateEmployeeNotificationLastElementCommandHandlerInterface
 {
     /**
diff --git a/src/Adapter/Notification/QueryHandler/GetNotificationLastElementsHandler.php b/src/Adapter/Notification/QueryHandler/GetNotificationLastElementsHandler.php
index eafe8e9724568..190860b657e4c 100644
--- a/src/Adapter/Notification/QueryHandler/GetNotificationLastElementsHandler.php
+++ b/src/Adapter/Notification/QueryHandler/GetNotificationLastElementsHandler.php
@@ -28,6 +28,7 @@
 
 use Notification;
 use PrestaShop\PrestaShop\Adapter\Admin\NotificationsConfiguration;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Notification\Query\GetNotificationLastElements;
 use PrestaShop\PrestaShop\Core\Domain\Notification\QueryHandler\GetNotificationLastElementsHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Notification\QueryResult\NotificationResult;
@@ -39,6 +40,7 @@
  *
  * @internal
  */
+#[AsQueryHandler]
 final class GetNotificationLastElementsHandler implements GetNotificationLastElementsHandlerInterface
 {
     /**
diff --git a/src/Adapter/Order/CommandHandler/AddCartRuleToOrderHandler.php b/src/Adapter/Order/CommandHandler/AddCartRuleToOrderHandler.php
index 48a43e5ceb9bc..a8da35efd9c04 100644
--- a/src/Adapter/Order/CommandHandler/AddCartRuleToOrderHandler.php
+++ b/src/Adapter/Order/CommandHandler/AddCartRuleToOrderHandler.php
@@ -37,6 +37,7 @@
 use PrestaShop\PrestaShop\Adapter\ContextStateManager;
 use PrestaShop\PrestaShop\Adapter\Order\AbstractOrderHandler;
 use PrestaShop\PrestaShop\Adapter\Order\OrderAmountUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\InvalidCartRuleDiscountValueException;
 use PrestaShop\PrestaShop\Core\Domain\Order\Command\AddCartRuleToOrderCommand;
 use PrestaShop\PrestaShop\Core\Domain\Order\CommandHandler\AddCartRuleToOrderHandlerInterface;
@@ -49,6 +50,7 @@
 /**
  * @internal
  */
+#[AsCommandHandler]
 final class AddCartRuleToOrderHandler extends AbstractOrderHandler implements AddCartRuleToOrderHandlerInterface
 {
     /**
diff --git a/src/Adapter/Order/CommandHandler/AddOrderFromBackOfficeHandler.php b/src/Adapter/Order/CommandHandler/AddOrderFromBackOfficeHandler.php
index 642a4c5cb26da..201f21229fa47 100644
--- a/src/Adapter/Order/CommandHandler/AddOrderFromBackOfficeHandler.php
+++ b/src/Adapter/Order/CommandHandler/AddOrderFromBackOfficeHandler.php
@@ -39,6 +39,7 @@
 use Module;
 use PaymentModule;
 use PrestaShop\PrestaShop\Adapter\ContextStateManager;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Order\Command\AddOrderFromBackOfficeCommand;
 use PrestaShop\PrestaShop\Core\Domain\Order\CommandHandler\AddOrderFromBackOfficeHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Order\Exception\OrderConstraintException;
@@ -49,6 +50,7 @@
 /**
  * @internal
  */
+#[AsCommandHandler]
 final class AddOrderFromBackOfficeHandler extends AbstractOrderCommandHandler implements AddOrderFromBackOfficeHandlerInterface
 {
     /**
diff --git a/src/Adapter/Order/CommandHandler/AddPaymentHandler.php b/src/Adapter/Order/CommandHandler/AddPaymentHandler.php
index 6d7ef9d44cb73..f6d9721d704c8 100644
--- a/src/Adapter/Order/CommandHandler/AddPaymentHandler.php
+++ b/src/Adapter/Order/CommandHandler/AddPaymentHandler.php
@@ -29,6 +29,7 @@
 use Currency;
 use OrderInvoice;
 use PrestaShop\PrestaShop\Adapter\Order\AbstractOrderHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Order\Exception\OrderException;
 use PrestaShop\PrestaShop\Core\Domain\Order\Payment\Command\AddPaymentCommand;
 use PrestaShop\PrestaShop\Core\Domain\Order\Payment\CommandHandler\AddPaymentHandlerInterface;
@@ -37,6 +38,7 @@
 /**
  * @internal
  */
+#[AsCommandHandler]
 final class AddPaymentHandler extends AbstractOrderHandler implements AddPaymentHandlerInterface
 {
     /**
diff --git a/src/Adapter/Order/CommandHandler/AddProductToOrderHandler.php b/src/Adapter/Order/CommandHandler/AddProductToOrderHandler.php
index 6f98efc774207..a6b084de18ee7 100644
--- a/src/Adapter/Order/CommandHandler/AddProductToOrderHandler.php
+++ b/src/Adapter/Order/CommandHandler/AddProductToOrderHandler.php
@@ -49,6 +49,7 @@
 use PrestaShop\PrestaShop\Adapter\Order\OrderAmountUpdater;
 use PrestaShop\PrestaShop\Adapter\Order\OrderDetailUpdater;
 use PrestaShop\PrestaShop\Adapter\Order\OrderProductQuantityUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Order\Exception\DuplicateProductInOrderException;
 use PrestaShop\PrestaShop\Core\Domain\Order\Exception\DuplicateProductInOrderInvoiceException;
 use PrestaShop\PrestaShop\Core\Domain\Order\Exception\OrderException;
@@ -67,6 +68,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class AddProductToOrderHandler extends AbstractOrderHandler implements AddProductToOrderHandlerInterface
 {
     /**
diff --git a/src/Adapter/Order/CommandHandler/BulkChangeOrderStatusHandler.php b/src/Adapter/Order/CommandHandler/BulkChangeOrderStatusHandler.php
index 992cb4f8bad4e..000a2c13a9c49 100644
--- a/src/Adapter/Order/CommandHandler/BulkChangeOrderStatusHandler.php
+++ b/src/Adapter/Order/CommandHandler/BulkChangeOrderStatusHandler.php
@@ -32,6 +32,7 @@
 use Order;
 use OrderHistory;
 use OrderState;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Order\Command\BulkChangeOrderStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\Order\CommandHandler\BulkChangeOrderStatusHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Order\Exception\ChangeOrderStatusException;
@@ -43,6 +44,7 @@
 /**
  * @internal
  */
+#[AsCommandHandler]
 final class BulkChangeOrderStatusHandler implements BulkChangeOrderStatusHandlerInterface
 {
     /**
diff --git a/src/Adapter/Order/CommandHandler/CancelOrderProductHandler.php b/src/Adapter/Order/CommandHandler/CancelOrderProductHandler.php
index 02f7caa9274af..bef45868cc044 100644
--- a/src/Adapter/Order/CommandHandler/CancelOrderProductHandler.php
+++ b/src/Adapter/Order/CommandHandler/CancelOrderProductHandler.php
@@ -34,6 +34,7 @@
 use OrderHistory;
 use OrderInvoice;
 use PrestaShop\PrestaShop\Adapter\Order\OrderProductQuantityUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Order\CancellationActionType;
 use PrestaShop\PrestaShop\Core\Domain\Order\Command\CancelOrderProductCommand;
 use PrestaShop\PrestaShop\Core\Domain\Order\CommandHandler\CancelOrderProductHandlerInterface;
@@ -45,6 +46,7 @@
 /**
  * @internal
  */
+#[AsCommandHandler]
 final class CancelOrderProductHandler extends AbstractOrderCommandHandler implements CancelOrderProductHandlerInterface
 {
     /**
diff --git a/src/Adapter/Order/CommandHandler/ChangeOrderCurrencyHandler.php b/src/Adapter/Order/CommandHandler/ChangeOrderCurrencyHandler.php
index 70bcdb482eebd..cb7024468d0ff 100644
--- a/src/Adapter/Order/CommandHandler/ChangeOrderCurrencyHandler.php
+++ b/src/Adapter/Order/CommandHandler/ChangeOrderCurrencyHandler.php
@@ -34,6 +34,7 @@
 use OrderDetail;
 use OrderInvoice;
 use PrestaShop\PrestaShop\Adapter\Order\AbstractOrderHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Order\Command\ChangeOrderCurrencyCommand;
 use PrestaShop\PrestaShop\Core\Domain\Order\CommandHandler\ChangeOrderCurrencyHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Order\Exception\OrderException;
@@ -45,6 +46,7 @@
 /**
  * @internal
  */
+#[AsCommandHandler]
 final class ChangeOrderCurrencyHandler extends AbstractOrderHandler implements ChangeOrderCurrencyHandlerInterface
 {
     /**
diff --git a/src/Adapter/Order/CommandHandler/ChangeOrderDeliveryAddressHandler.php b/src/Adapter/Order/CommandHandler/ChangeOrderDeliveryAddressHandler.php
index 2d2f3796d39b2..d6d0b52a901f7 100644
--- a/src/Adapter/Order/CommandHandler/ChangeOrderDeliveryAddressHandler.php
+++ b/src/Adapter/Order/CommandHandler/ChangeOrderDeliveryAddressHandler.php
@@ -37,6 +37,7 @@
 use PrestaShop\PrestaShop\Adapter\Order\OrderAmountUpdater;
 use PrestaShop\PrestaShop\Adapter\Order\OrderDetailUpdater;
 use PrestaShop\PrestaShop\Adapter\Order\OrderProductQuantityUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Order\Command\ChangeOrderDeliveryAddressCommand;
 use PrestaShop\PrestaShop\Core\Domain\Order\CommandHandler\ChangeOrderDeliveryAddressHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Order\Exception\OrderException;
@@ -45,6 +46,7 @@
 /**
  * @internal
  */
+#[AsCommandHandler]
 final class ChangeOrderDeliveryAddressHandler extends AbstractOrderCommandHandler implements ChangeOrderDeliveryAddressHandlerInterface
 {
     /**
diff --git a/src/Adapter/Order/CommandHandler/ChangeOrderInvoiceAddressHandler.php b/src/Adapter/Order/CommandHandler/ChangeOrderInvoiceAddressHandler.php
index f916fdb441aca..35497461cddcc 100644
--- a/src/Adapter/Order/CommandHandler/ChangeOrderInvoiceAddressHandler.php
+++ b/src/Adapter/Order/CommandHandler/ChangeOrderInvoiceAddressHandler.php
@@ -31,6 +31,7 @@
 use PrestaShop\PrestaShop\Adapter\Order\AbstractOrderHandler;
 use PrestaShop\PrestaShop\Adapter\Order\OrderAmountUpdater;
 use PrestaShop\PrestaShop\Adapter\Order\OrderDetailUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Order\Command\ChangeOrderInvoiceAddressCommand;
 use PrestaShop\PrestaShop\Core\Domain\Order\CommandHandler\ChangeOrderInvoiceAddressHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Order\Exception\OrderException;
@@ -39,6 +40,7 @@
 /**
  * @internal
  */
+#[AsCommandHandler]
 final class ChangeOrderInvoiceAddressHandler extends AbstractOrderHandler implements ChangeOrderInvoiceAddressHandlerInterface
 {
     /**
diff --git a/src/Adapter/Order/CommandHandler/DeleteCartRuleFromOrderHandler.php b/src/Adapter/Order/CommandHandler/DeleteCartRuleFromOrderHandler.php
index 0af8bdc0ecfa8..b7542a69e6e29 100644
--- a/src/Adapter/Order/CommandHandler/DeleteCartRuleFromOrderHandler.php
+++ b/src/Adapter/Order/CommandHandler/DeleteCartRuleFromOrderHandler.php
@@ -39,6 +39,7 @@
 use PrestaShop\PrestaShop\Adapter\Order\AbstractOrderHandler;
 use PrestaShop\PrestaShop\Adapter\Order\OrderAmountUpdater;
 use PrestaShop\PrestaShop\Adapter\Order\OrderProductQuantityUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Order\Command\DeleteCartRuleFromOrderCommand;
 use PrestaShop\PrestaShop\Core\Domain\Order\CommandHandler\DeleteCartRuleFromOrderHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Order\Exception\OrderException;
@@ -48,6 +49,7 @@
 /**
  * @internal
  */
+#[AsCommandHandler]
 final class DeleteCartRuleFromOrderHandler extends AbstractOrderHandler implements DeleteCartRuleFromOrderHandlerInterface
 {
     /**
diff --git a/src/Adapter/Order/CommandHandler/DeleteProductFromOrderHandler.php b/src/Adapter/Order/CommandHandler/DeleteProductFromOrderHandler.php
index 36e0908241621..9dd15fd0282c7 100644
--- a/src/Adapter/Order/CommandHandler/DeleteProductFromOrderHandler.php
+++ b/src/Adapter/Order/CommandHandler/DeleteProductFromOrderHandler.php
@@ -35,6 +35,7 @@
 use OrderInvoice;
 use PrestaShop\PrestaShop\Adapter\ContextStateManager;
 use PrestaShop\PrestaShop\Adapter\Order\OrderProductQuantityUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Order\Exception\OrderException;
 use PrestaShop\PrestaShop\Core\Domain\Order\Exception\OrderNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Order\Product\Command\DeleteProductFromOrderCommand;
@@ -46,6 +47,7 @@
 /**
  * @internal
  */
+#[AsCommandHandler]
 final class DeleteProductFromOrderHandler extends AbstractOrderCommandHandler implements DeleteProductFromOrderHandlerInterface
 {
     /**
diff --git a/src/Adapter/Order/CommandHandler/DuplicateOrderCartHandler.php b/src/Adapter/Order/CommandHandler/DuplicateOrderCartHandler.php
index 274c133b847e2..c7a475fad3942 100644
--- a/src/Adapter/Order/CommandHandler/DuplicateOrderCartHandler.php
+++ b/src/Adapter/Order/CommandHandler/DuplicateOrderCartHandler.php
@@ -30,6 +30,7 @@
 use Currency;
 use Customer;
 use PrestaShop\PrestaShop\Adapter\ContextStateManager;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Cart\ValueObject\CartId;
 use PrestaShop\PrestaShop\Core\Domain\Order\Command\DuplicateOrderCartCommand;
 use PrestaShop\PrestaShop\Core\Domain\Order\CommandHandler\DuplicateOrderCartHandlerInterface;
@@ -39,6 +40,7 @@
 /**
  * @internal
  */
+#[AsCommandHandler]
 final class DuplicateOrderCartHandler implements DuplicateOrderCartHandlerInterface
 {
     /**
diff --git a/src/Adapter/Order/CommandHandler/GenerateInvoiceHandler.php b/src/Adapter/Order/CommandHandler/GenerateInvoiceHandler.php
index b230a051cddd4..9751de4d8693c 100644
--- a/src/Adapter/Order/CommandHandler/GenerateInvoiceHandler.php
+++ b/src/Adapter/Order/CommandHandler/GenerateInvoiceHandler.php
@@ -28,6 +28,7 @@
 
 use Configuration;
 use PrestaShop\PrestaShop\Adapter\Order\AbstractOrderHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Order\Exception\OrderException;
 use PrestaShop\PrestaShop\Core\Domain\Order\Invoice\Command\GenerateInvoiceCommand;
 use PrestaShop\PrestaShop\Core\Domain\Order\Invoice\CommandHandler\GenerateOrderInvoiceHandlerInterface;
@@ -35,6 +36,7 @@
 /**
  * @internal
  */
+#[AsCommandHandler]
 final class GenerateInvoiceHandler extends AbstractOrderHandler implements GenerateOrderInvoiceHandlerInterface
 {
     /**
diff --git a/src/Adapter/Order/CommandHandler/IssuePartialRefundHandler.php b/src/Adapter/Order/CommandHandler/IssuePartialRefundHandler.php
index d5c4f013beec7..9bf754b239335 100644
--- a/src/Adapter/Order/CommandHandler/IssuePartialRefundHandler.php
+++ b/src/Adapter/Order/CommandHandler/IssuePartialRefundHandler.php
@@ -35,6 +35,7 @@
 use PrestaShop\PrestaShop\Adapter\Order\Refund\OrderRefundUpdater;
 use PrestaShop\PrestaShop\Adapter\Order\Refund\OrderSlipCreator;
 use PrestaShop\PrestaShop\Adapter\Order\Refund\VoucherGenerator;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\ConfigurationInterface;
 use PrestaShop\PrestaShop\Core\Domain\Order\CancellationActionType;
 use PrestaShop\PrestaShop\Core\Domain\Order\Command\IssuePartialRefundCommand;
@@ -45,6 +46,7 @@
 /**
  * @internal
  */
+#[AsCommandHandler]
 final class IssuePartialRefundHandler extends AbstractOrderCommandHandler implements IssuePartialRefundHandlerInterface
 {
     /**
diff --git a/src/Adapter/Order/CommandHandler/IssueReturnProductHandler.php b/src/Adapter/Order/CommandHandler/IssueReturnProductHandler.php
index b2cd8e6ea6f36..0f443ebeb3995 100644
--- a/src/Adapter/Order/CommandHandler/IssueReturnProductHandler.php
+++ b/src/Adapter/Order/CommandHandler/IssueReturnProductHandler.php
@@ -37,6 +37,7 @@
 use PrestaShop\PrestaShop\Adapter\Order\Refund\OrderRefundUpdater;
 use PrestaShop\PrestaShop\Adapter\Order\Refund\OrderSlipCreator;
 use PrestaShop\PrestaShop\Adapter\Order\Refund\VoucherGenerator;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\ConfigurationInterface;
 use PrestaShop\PrestaShop\Core\Domain\Order\CancellationActionType;
 use PrestaShop\PrestaShop\Core\Domain\Order\Command\IssueReturnProductCommand;
@@ -48,6 +49,7 @@
 /**
  * @internal
  */
+#[AsCommandHandler]
 class IssueReturnProductHandler extends AbstractOrderCommandHandler implements IssueReturnProductHandlerInterface
 {
     /**
diff --git a/src/Adapter/Order/CommandHandler/IssueStandardRefundHandler.php b/src/Adapter/Order/CommandHandler/IssueStandardRefundHandler.php
index 0cbe8b99f5851..36624bbc32d74 100644
--- a/src/Adapter/Order/CommandHandler/IssueStandardRefundHandler.php
+++ b/src/Adapter/Order/CommandHandler/IssueStandardRefundHandler.php
@@ -36,6 +36,7 @@
 use PrestaShop\PrestaShop\Adapter\Order\Refund\OrderRefundUpdater;
 use PrestaShop\PrestaShop\Adapter\Order\Refund\OrderSlipCreator;
 use PrestaShop\PrestaShop\Adapter\Order\Refund\VoucherGenerator;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\ConfigurationInterface;
 use PrestaShop\PrestaShop\Core\Domain\Order\CancellationActionType;
 use PrestaShop\PrestaShop\Core\Domain\Order\Command\IssueStandardRefundCommand;
@@ -47,6 +48,7 @@
 /**
  * @internal
  */
+#[AsCommandHandler]
 class IssueStandardRefundHandler extends AbstractOrderCommandHandler implements IssueStandardRefundHandlerInterface
 {
     /**
diff --git a/src/Adapter/Order/CommandHandler/ResendOrderEmailHandler.php b/src/Adapter/Order/CommandHandler/ResendOrderEmailHandler.php
index 2d90bc4d91f9a..1832d468afeb6 100644
--- a/src/Adapter/Order/CommandHandler/ResendOrderEmailHandler.php
+++ b/src/Adapter/Order/CommandHandler/ResendOrderEmailHandler.php
@@ -30,6 +30,7 @@
 use Configuration;
 use OrderHistory;
 use OrderState;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Order\Command\ResendOrderEmailCommand;
 use PrestaShop\PrestaShop\Core\Domain\Order\CommandHandler\ResendOrderEmailHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Order\Exception\OrderEmailSendException;
@@ -39,6 +40,7 @@
 /**
  * @internal
  */
+#[AsCommandHandler]
 final class ResendOrderEmailHandler extends AbstractOrderCommandHandler implements ResendOrderEmailHandlerInterface
 {
     /**
diff --git a/src/Adapter/Order/CommandHandler/SendProcessOrderEmailHandler.php b/src/Adapter/Order/CommandHandler/SendProcessOrderEmailHandler.php
index cd072d5ef129f..ee85165a92d53 100644
--- a/src/Adapter/Order/CommandHandler/SendProcessOrderEmailHandler.php
+++ b/src/Adapter/Order/CommandHandler/SendProcessOrderEmailHandler.php
@@ -31,6 +31,7 @@
 use Language;
 use Link;
 use Mail;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Cart\Exception\CartNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Cart\ValueObject\CartId;
 use PrestaShop\PrestaShop\Core\Domain\Customer\Exception\CustomerNotFoundException;
@@ -45,6 +46,7 @@
 /**
  * Handles SendProcessOrderEmail command using legacy object model
  */
+#[AsCommandHandler]
 class SendProcessOrderEmailHandler implements SendProcessOrderEmailHandlerInterface
 {
     /**
diff --git a/src/Adapter/Order/CommandHandler/SetInternalOrderNoteHandler.php b/src/Adapter/Order/CommandHandler/SetInternalOrderNoteHandler.php
index 28562bbacc06b..3d0e20d0c145e 100644
--- a/src/Adapter/Order/CommandHandler/SetInternalOrderNoteHandler.php
+++ b/src/Adapter/Order/CommandHandler/SetInternalOrderNoteHandler.php
@@ -30,6 +30,7 @@
 
 use Order;
 use PrestaShop\PrestaShop\Adapter\Order\AbstractOrderHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Order\Command\SetInternalOrderNoteCommand;
 use PrestaShop\PrestaShop\Core\Domain\Order\CommandHandler\SetInternalOrderNoteHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Order\Exception\OrderConstraintException;
@@ -41,6 +42,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class SetInternalOrderNoteHandler extends AbstractOrderHandler implements SetInternalOrderNoteHandlerInterface
 {
     /**
diff --git a/src/Adapter/Order/CommandHandler/UpdateInvoiceNoteHandler.php b/src/Adapter/Order/CommandHandler/UpdateInvoiceNoteHandler.php
index bfb2d682e9406..f6f4102e662c1 100644
--- a/src/Adapter/Order/CommandHandler/UpdateInvoiceNoteHandler.php
+++ b/src/Adapter/Order/CommandHandler/UpdateInvoiceNoteHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Order\CommandHandler;
 
 use OrderInvoice;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Order\Invoice\Command\UpdateInvoiceNoteCommand;
 use PrestaShop\PrestaShop\Core\Domain\Order\Invoice\CommandHandler\UpdateInvoiceNoteHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Order\Invoice\Exception\InvoiceException;
@@ -36,6 +37,7 @@
 /**
  * @internal
  */
+#[AsCommandHandler]
 final class UpdateInvoiceNoteHandler implements UpdateInvoiceNoteHandlerInterface
 {
     /**
diff --git a/src/Adapter/Order/CommandHandler/UpdateOrderShippingDetailsHandler.php b/src/Adapter/Order/CommandHandler/UpdateOrderShippingDetailsHandler.php
index f89ebde47d834..ea92b1c0a6a20 100644
--- a/src/Adapter/Order/CommandHandler/UpdateOrderShippingDetailsHandler.php
+++ b/src/Adapter/Order/CommandHandler/UpdateOrderShippingDetailsHandler.php
@@ -35,6 +35,7 @@
 use PrestaShop\PrestaShop\Adapter\ContextStateManager;
 use PrestaShop\PrestaShop\Adapter\Order\AbstractOrderHandler;
 use PrestaShop\PrestaShop\Adapter\Order\OrderAmountUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Order\Command\UpdateOrderShippingDetailsCommand;
 use PrestaShop\PrestaShop\Core\Domain\Order\CommandHandler\UpdateOrderShippingDetailsHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Order\Exception\OrderException;
@@ -44,6 +45,7 @@
 /**
  * @internal
  */
+#[AsCommandHandler]
 final class UpdateOrderShippingDetailsHandler extends AbstractOrderHandler implements UpdateOrderShippingDetailsHandlerInterface
 {
     /**
diff --git a/src/Adapter/Order/CommandHandler/UpdateOrderStatusHandler.php b/src/Adapter/Order/CommandHandler/UpdateOrderStatusHandler.php
index e6210ed04087b..7bb4c997ce23b 100644
--- a/src/Adapter/Order/CommandHandler/UpdateOrderStatusHandler.php
+++ b/src/Adapter/Order/CommandHandler/UpdateOrderStatusHandler.php
@@ -32,6 +32,7 @@
 use OrderHistory;
 use OrderState;
 use PrestaShop\PrestaShop\Adapter\Order\AbstractOrderHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Order\Command\UpdateOrderStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\Order\CommandHandler\UpdateOrderStatusHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Order\Exception\ChangeOrderStatusException;
@@ -41,6 +42,7 @@
 /**
  * @internal
  */
+#[AsCommandHandler]
 final class UpdateOrderStatusHandler extends AbstractOrderHandler implements UpdateOrderStatusHandlerInterface
 {
     /**
diff --git a/src/Adapter/Order/CommandHandler/UpdateProductInOrderHandler.php b/src/Adapter/Order/CommandHandler/UpdateProductInOrderHandler.php
index 4d126f60227b3..3a0cee5591c2b 100644
--- a/src/Adapter/Order/CommandHandler/UpdateProductInOrderHandler.php
+++ b/src/Adapter/Order/CommandHandler/UpdateProductInOrderHandler.php
@@ -37,6 +37,7 @@
 use PrestaShop\PrestaShop\Adapter\ContextStateManager;
 use PrestaShop\PrestaShop\Adapter\Order\OrderDetailUpdater;
 use PrestaShop\PrestaShop\Adapter\Order\OrderProductQuantityUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Order\Exception\CannotEditDeliveredOrderProductException;
 use PrestaShop\PrestaShop\Core\Domain\Order\Exception\CannotFindProductInOrderException;
 use PrestaShop\PrestaShop\Core\Domain\Order\Exception\DuplicateProductInOrderInvoiceException;
@@ -51,6 +52,7 @@
 /**
  * @internal
  */
+#[AsCommandHandler]
 final class UpdateProductInOrderHandler extends AbstractOrderCommandHandler implements UpdateProductInOrderHandlerInterface
 {
     /**
diff --git a/src/Adapter/Order/QueryHandler/GetOrderForViewingHandler.php b/src/Adapter/Order/QueryHandler/GetOrderForViewingHandler.php
index e8f50d2c7065a..8e74887c4c92f 100644
--- a/src/Adapter/Order/QueryHandler/GetOrderForViewingHandler.php
+++ b/src/Adapter/Order/QueryHandler/GetOrderForViewingHandler.php
@@ -50,6 +50,7 @@
 use PrestaShop\PrestaShop\Adapter\Customer\CustomerDataProvider;
 use PrestaShop\PrestaShop\Adapter\Order\AbstractOrderHandler;
 use PrestaShop\PrestaShop\Core\Address\AddressFormatterInterface;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Address\ValueObject\AddressId;
 use PrestaShop\PrestaShop\Core\Domain\Exception\InvalidSortingException;
 use PrestaShop\PrestaShop\Core\Domain\Order\Exception\OrderException;
@@ -97,6 +98,7 @@
  *
  * @internal
  */
+#[AsQueryHandler]
 final class GetOrderForViewingHandler extends AbstractOrderHandler implements GetOrderForViewingHandlerInterface
 {
     /**
diff --git a/src/Adapter/Order/QueryHandler/GetOrderPreviewHandler.php b/src/Adapter/Order/QueryHandler/GetOrderPreviewHandler.php
index 9d600c74f14dc..0a1b0aad468b5 100644
--- a/src/Adapter/Order/QueryHandler/GetOrderPreviewHandler.php
+++ b/src/Adapter/Order/QueryHandler/GetOrderPreviewHandler.php
@@ -37,6 +37,7 @@
 use PrestaShop\PrestaShop\Adapter\Address\AddressFormatter;
 use PrestaShop\PrestaShop\Adapter\Entity\Address;
 use PrestaShop\PrestaShop\Core\Address\AddressFormatterInterface;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Address\ValueObject\AddressId;
 use PrestaShop\PrestaShop\Core\Domain\Order\Exception\OrderNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Order\Query\GetOrderPreview;
@@ -55,6 +56,7 @@
 /**
  * Handles GetOrderPreview query using legacy object model
  */
+#[AsQueryHandler]
 final class GetOrderPreviewHandler implements GetOrderPreviewHandlerInterface
 {
     /**
diff --git a/src/Adapter/Order/QueryHandler/GetOrderProductsForViewingHandler.php b/src/Adapter/Order/QueryHandler/GetOrderProductsForViewingHandler.php
index 9775b9b86031c..0b234f9acc5be 100644
--- a/src/Adapter/Order/QueryHandler/GetOrderProductsForViewingHandler.php
+++ b/src/Adapter/Order/QueryHandler/GetOrderProductsForViewingHandler.php
@@ -37,6 +37,7 @@
 use Pack;
 use PrestaShop\Decimal\DecimalNumber;
 use PrestaShop\PrestaShop\Adapter\Order\AbstractOrderHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Order\Query\GetOrderProductsForViewing;
 use PrestaShop\PrestaShop\Core\Domain\Order\QueryHandler\GetOrderProductsForViewingHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Order\QueryResult\OrderProductCustomizationForViewing;
@@ -56,6 +57,7 @@
 /**
  * Handles GetOrderProductsForViewing query using legacy object models
  */
+#[AsQueryHandler]
 final class GetOrderProductsForViewingHandler extends AbstractOrderHandler implements GetOrderProductsForViewingHandlerInterface
 {
     /**
diff --git a/src/Adapter/OrderMessage/CommandHandler/AddOrderMessageHandler.php b/src/Adapter/OrderMessage/CommandHandler/AddOrderMessageHandler.php
index 3139cfd05e66b..45702ad350654 100644
--- a/src/Adapter/OrderMessage/CommandHandler/AddOrderMessageHandler.php
+++ b/src/Adapter/OrderMessage/CommandHandler/AddOrderMessageHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\OrderMessage\CommandHandler;
 
 use OrderMessage;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\OrderMessage\Command\AddOrderMessageCommand;
 use PrestaShop\PrestaShop\Core\Domain\OrderMessage\CommandHandler\AddOrderMessageHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\OrderMessage\Exception\OrderMessageException;
@@ -39,6 +40,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class AddOrderMessageHandler implements AddOrderMessageHandlerInterface
 {
     /**
diff --git a/src/Adapter/OrderMessage/CommandHandler/BulkDeleteOrderMessageHandler.php b/src/Adapter/OrderMessage/CommandHandler/BulkDeleteOrderMessageHandler.php
index cd9b22a6c9574..1360ebcaa7b14 100644
--- a/src/Adapter/OrderMessage/CommandHandler/BulkDeleteOrderMessageHandler.php
+++ b/src/Adapter/OrderMessage/CommandHandler/BulkDeleteOrderMessageHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\OrderMessage\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\OrderMessage\AbstractOrderMessageHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\OrderMessage\Command\BulkDeleteOrderMessageCommand;
 use PrestaShop\PrestaShop\Core\Domain\OrderMessage\CommandHandler\BulkDeleteOrderMessageHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\OrderMessage\Exception\OrderMessageException;
@@ -37,6 +38,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class BulkDeleteOrderMessageHandler extends AbstractOrderMessageHandler implements BulkDeleteOrderMessageHandlerInterface
 {
     /**
diff --git a/src/Adapter/OrderMessage/CommandHandler/DeleteOrderMessageHandler.php b/src/Adapter/OrderMessage/CommandHandler/DeleteOrderMessageHandler.php
index 2ed4e5389bbd9..4b42775cb5696 100644
--- a/src/Adapter/OrderMessage/CommandHandler/DeleteOrderMessageHandler.php
+++ b/src/Adapter/OrderMessage/CommandHandler/DeleteOrderMessageHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\OrderMessage\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\OrderMessage\AbstractOrderMessageHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\OrderMessage\Command\DeleteOrderMessageCommand;
 use PrestaShop\PrestaShop\Core\Domain\OrderMessage\CommandHandler\DeleteOrderMessageHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\OrderMessage\Exception\OrderMessageException;
@@ -37,6 +38,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class DeleteOrderMessageHandler extends AbstractOrderMessageHandler implements DeleteOrderMessageHandlerInterface
 {
     /**
diff --git a/src/Adapter/OrderMessage/CommandHandler/EditOrderMessageHandler.php b/src/Adapter/OrderMessage/CommandHandler/EditOrderMessageHandler.php
index af98153157410..7cc6310452139 100644
--- a/src/Adapter/OrderMessage/CommandHandler/EditOrderMessageHandler.php
+++ b/src/Adapter/OrderMessage/CommandHandler/EditOrderMessageHandler.php
@@ -28,6 +28,7 @@
 
 use OrderMessage;
 use PrestaShop\PrestaShop\Adapter\OrderMessage\AbstractOrderMessageHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\OrderMessage\Command\EditOrderMessageCommand;
 use PrestaShop\PrestaShop\Core\Domain\OrderMessage\CommandHandler\EditOrderMessageHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\OrderMessage\Exception\OrderMessageException;
@@ -39,6 +40,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class EditOrderMessageHandler extends AbstractOrderMessageHandler implements EditOrderMessageHandlerInterface
 {
     /**
diff --git a/src/Adapter/OrderMessage/QueryHandler/GetOrderMessageForEditingHandler.php b/src/Adapter/OrderMessage/QueryHandler/GetOrderMessageForEditingHandler.php
index 99936fff23139..a92bce4f3f047 100644
--- a/src/Adapter/OrderMessage/QueryHandler/GetOrderMessageForEditingHandler.php
+++ b/src/Adapter/OrderMessage/QueryHandler/GetOrderMessageForEditingHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\OrderMessage\QueryHandler;
 
 use PrestaShop\PrestaShop\Adapter\OrderMessage\AbstractOrderMessageHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\OrderMessage\Query\GetOrderMessageForEditing;
 use PrestaShop\PrestaShop\Core\Domain\OrderMessage\QueryHandler\GetOrderMessageForEditingHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\OrderMessage\QueryResult\EditableOrderMessage;
@@ -36,6 +37,7 @@
  *
  * @internal
  */
+#[AsQueryHandler]
 final class GetOrderMessageForEditingHandler extends AbstractOrderMessageHandler implements GetOrderMessageForEditingHandlerInterface
 {
     /**
diff --git a/src/Adapter/OrderReturn/CommandHandler/UpdateOrderReturnStateHandler.php b/src/Adapter/OrderReturn/CommandHandler/UpdateOrderReturnStateHandler.php
index bf7663c0b6fae..4f9d621c3c3ed 100644
--- a/src/Adapter/OrderReturn/CommandHandler/UpdateOrderReturnStateHandler.php
+++ b/src/Adapter/OrderReturn/CommandHandler/UpdateOrderReturnStateHandler.php
@@ -31,10 +31,12 @@
 use OrderReturn;
 use PrestaShop\PrestaShop\Adapter\OrderReturn\Repository\OrderReturnRepository;
 use PrestaShop\PrestaShop\Adapter\OrderReturnState\Repository\OrderReturnStateRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\OrderReturn\Command\UpdateOrderReturnStateCommand;
 use PrestaShop\PrestaShop\Core\Domain\OrderReturn\CommandHandler\UpdateOrderReturnStateHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\OrderReturn\Exception\OrderReturnException;
 
+#[AsCommandHandler]
 class UpdateOrderReturnStateHandler implements UpdateOrderReturnStateHandlerInterface
 {
     /**
diff --git a/src/Adapter/OrderReturn/QueryHandler/GetOrderReturnForEditingHandler.php b/src/Adapter/OrderReturn/QueryHandler/GetOrderReturnForEditingHandler.php
index abc997bef2b7f..c83711a308485 100644
--- a/src/Adapter/OrderReturn/QueryHandler/GetOrderReturnForEditingHandler.php
+++ b/src/Adapter/OrderReturn/QueryHandler/GetOrderReturnForEditingHandler.php
@@ -32,6 +32,7 @@
 use PrestaShop\PrestaShop\Adapter\Customer\Repository\CustomerRepository;
 use PrestaShop\PrestaShop\Adapter\Order\Repository\OrderRepository;
 use PrestaShop\PrestaShop\Adapter\OrderReturn\Repository\OrderReturnRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Customer\ValueObject\CustomerId;
 use PrestaShop\PrestaShop\Core\Domain\Order\ValueObject\OrderId;
 use PrestaShop\PrestaShop\Core\Domain\OrderReturn\Query\GetOrderReturnForEditing;
@@ -41,6 +42,7 @@
 /**
  * Handles query which gets order return for editing
  */
+#[AsQueryHandler]
 class GetOrderReturnForEditingHandler implements GetOrderReturnForEditingHandlerInterface
 {
     /**
diff --git a/src/Adapter/OrderReturnState/CommandHandler/AddOrderReturnStateHandler.php b/src/Adapter/OrderReturnState/CommandHandler/AddOrderReturnStateHandler.php
index 26a3624e89abe..a6bcfbcb1641d 100644
--- a/src/Adapter/OrderReturnState/CommandHandler/AddOrderReturnStateHandler.php
+++ b/src/Adapter/OrderReturnState/CommandHandler/AddOrderReturnStateHandler.php
@@ -28,6 +28,7 @@
 namespace PrestaShop\PrestaShop\Adapter\OrderReturnState\CommandHandler;
 
 use OrderReturnState;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Command\AddOrderReturnStateCommand;
 use PrestaShop\PrestaShop\Core\Domain\OrderReturnState\CommandHandler\AddOrderReturnStateHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Exception\OrderReturnStateException;
@@ -38,6 +39,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class AddOrderReturnStateHandler extends AbstractOrderReturnStateHandler implements AddOrderReturnStateHandlerInterface
 {
     /**
diff --git a/src/Adapter/OrderReturnState/CommandHandler/BulkDeleteOrderReturnStateHandler.php b/src/Adapter/OrderReturnState/CommandHandler/BulkDeleteOrderReturnStateHandler.php
index 6121d18d59195..958d58f1dff94 100644
--- a/src/Adapter/OrderReturnState/CommandHandler/BulkDeleteOrderReturnStateHandler.php
+++ b/src/Adapter/OrderReturnState/CommandHandler/BulkDeleteOrderReturnStateHandler.php
@@ -28,6 +28,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\OrderReturnState\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Command\BulkDeleteOrderReturnStateCommand;
 use PrestaShop\PrestaShop\Core\Domain\OrderReturnState\CommandHandler\BulkDeleteOrderReturnStateHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Exception\BulkDeleteOrderReturnStateException;
@@ -36,6 +37,7 @@
 /**
  * Handles command which deletes OrderReturnStates in bulk action
  */
+#[AsCommandHandler]
 class BulkDeleteOrderReturnStateHandler extends AbstractOrderReturnStateHandler implements BulkDeleteOrderReturnStateHandlerInterface
 {
     /**
diff --git a/src/Adapter/OrderReturnState/CommandHandler/DeleteOrderReturnStateHandler.php b/src/Adapter/OrderReturnState/CommandHandler/DeleteOrderReturnStateHandler.php
index 4b09453addcc9..6071d578a1b66 100644
--- a/src/Adapter/OrderReturnState/CommandHandler/DeleteOrderReturnStateHandler.php
+++ b/src/Adapter/OrderReturnState/CommandHandler/DeleteOrderReturnStateHandler.php
@@ -28,6 +28,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\OrderReturnState\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Command\DeleteOrderReturnStateCommand;
 use PrestaShop\PrestaShop\Core\Domain\OrderReturnState\CommandHandler\DeleteOrderReturnStateHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Exception\DeleteOrderReturnStateException;
@@ -35,6 +36,7 @@
 /**
  * Handles command which deletes order states
  */
+#[AsCommandHandler]
 class DeleteOrderReturnStateHandler extends AbstractOrderReturnStateHandler implements DeleteOrderReturnStateHandlerInterface
 {
     /**
diff --git a/src/Adapter/OrderReturnState/CommandHandler/EditOrderReturnStateHandler.php b/src/Adapter/OrderReturnState/CommandHandler/EditOrderReturnStateHandler.php
index fc9b66e333de6..b9b69e1ac44af 100644
--- a/src/Adapter/OrderReturnState/CommandHandler/EditOrderReturnStateHandler.php
+++ b/src/Adapter/OrderReturnState/CommandHandler/EditOrderReturnStateHandler.php
@@ -28,6 +28,7 @@
 namespace PrestaShop\PrestaShop\Adapter\OrderReturnState\CommandHandler;
 
 use OrderReturnState;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Command\EditOrderReturnStateCommand;
 use PrestaShop\PrestaShop\Core\Domain\OrderReturnState\CommandHandler\EditOrderReturnStateHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Exception\OrderReturnStateException;
@@ -37,6 +38,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class EditOrderReturnStateHandler extends AbstractOrderReturnStateHandler implements EditOrderReturnStateHandlerInterface
 {
     /**
diff --git a/src/Adapter/OrderReturnState/QueryHandler/GetOrderReturnStateForEditingHandler.php b/src/Adapter/OrderReturnState/QueryHandler/GetOrderReturnStateForEditingHandler.php
index cc31493f9bcc3..45d1f81e53423 100644
--- a/src/Adapter/OrderReturnState/QueryHandler/GetOrderReturnStateForEditingHandler.php
+++ b/src/Adapter/OrderReturnState/QueryHandler/GetOrderReturnStateForEditingHandler.php
@@ -28,6 +28,7 @@
 namespace PrestaShop\PrestaShop\Adapter\OrderReturnState\QueryHandler;
 
 use OrderReturnState;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Exception\OrderReturnStateNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Query\GetOrderReturnStateForEditing;
 use PrestaShop\PrestaShop\Core\Domain\OrderReturnState\QueryHandler\GetOrderReturnStateForEditingHandlerInterface;
@@ -38,6 +39,7 @@
  *
  * @internal
  */
+#[AsQueryHandler]
 final class GetOrderReturnStateForEditingHandler implements GetOrderReturnStateForEditingHandlerInterface
 {
     /**
diff --git a/src/Adapter/OrderState/CommandHandler/AddOrderStateHandler.php b/src/Adapter/OrderState/CommandHandler/AddOrderStateHandler.php
index e1e1718ca569a..1919ccaacdd7f 100644
--- a/src/Adapter/OrderState/CommandHandler/AddOrderStateHandler.php
+++ b/src/Adapter/OrderState/CommandHandler/AddOrderStateHandler.php
@@ -28,6 +28,7 @@
 namespace PrestaShop\PrestaShop\Adapter\OrderState\CommandHandler;
 
 use OrderState;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\OrderState\Command\AddOrderStateCommand;
 use PrestaShop\PrestaShop\Core\Domain\OrderState\CommandHandler\AddOrderStateHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\OrderState\Exception\OrderStateException;
@@ -38,6 +39,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class AddOrderStateHandler extends AbstractOrderStateHandler implements AddOrderStateHandlerInterface
 {
     /**
diff --git a/src/Adapter/OrderState/CommandHandler/BulkDeleteOrderStateHandler.php b/src/Adapter/OrderState/CommandHandler/BulkDeleteOrderStateHandler.php
index cabcd351c6349..1cb4dbbeac45c 100644
--- a/src/Adapter/OrderState/CommandHandler/BulkDeleteOrderStateHandler.php
+++ b/src/Adapter/OrderState/CommandHandler/BulkDeleteOrderStateHandler.php
@@ -28,6 +28,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\OrderState\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\OrderState\Command\BulkDeleteOrderStateCommand;
 use PrestaShop\PrestaShop\Core\Domain\OrderState\CommandHandler\BulkDeleteOrderStateHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\OrderState\Exception\BulkDeleteOrderStateException;
@@ -36,6 +37,7 @@
 /**
  * Handles command which deletes OrderStatees in bulk action
  */
+#[AsCommandHandler]
 class BulkDeleteOrderStateHandler extends AbstractOrderStateHandler implements BulkDeleteOrderStateHandlerInterface
 {
     /**
diff --git a/src/Adapter/OrderState/CommandHandler/DeleteOrderStateHandler.php b/src/Adapter/OrderState/CommandHandler/DeleteOrderStateHandler.php
index e887718e5bbd8..c1f51bdcb16c2 100644
--- a/src/Adapter/OrderState/CommandHandler/DeleteOrderStateHandler.php
+++ b/src/Adapter/OrderState/CommandHandler/DeleteOrderStateHandler.php
@@ -28,6 +28,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\OrderState\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\OrderState\Command\DeleteOrderStateCommand;
 use PrestaShop\PrestaShop\Core\Domain\OrderState\CommandHandler\DeleteOrderStateHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\OrderState\Exception\DeleteOrderStateException;
@@ -35,6 +36,7 @@
 /**
  * Handles command which deletes order states
  */
+#[AsCommandHandler]
 class DeleteOrderStateHandler extends AbstractOrderStateHandler implements DeleteOrderStateHandlerInterface
 {
     /**
diff --git a/src/Adapter/OrderState/CommandHandler/EditOrderStateHandler.php b/src/Adapter/OrderState/CommandHandler/EditOrderStateHandler.php
index 6d4cd61385f98..b2d81aa53e9a9 100644
--- a/src/Adapter/OrderState/CommandHandler/EditOrderStateHandler.php
+++ b/src/Adapter/OrderState/CommandHandler/EditOrderStateHandler.php
@@ -28,6 +28,7 @@
 namespace PrestaShop\PrestaShop\Adapter\OrderState\CommandHandler;
 
 use OrderState;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\OrderState\Command\EditOrderStateCommand;
 use PrestaShop\PrestaShop\Core\Domain\OrderState\CommandHandler\EditOrderStateHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\OrderState\Exception\MissingOrderStateRequiredFieldsException;
@@ -38,6 +39,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class EditOrderStateHandler extends AbstractOrderStateHandler implements EditOrderStateHandlerInterface
 {
     /**
diff --git a/src/Adapter/OrderState/QueryHandler/GetOrderStateForEditingHandler.php b/src/Adapter/OrderState/QueryHandler/GetOrderStateForEditingHandler.php
index 7891e7299aed2..29381af2e4de6 100644
--- a/src/Adapter/OrderState/QueryHandler/GetOrderStateForEditingHandler.php
+++ b/src/Adapter/OrderState/QueryHandler/GetOrderStateForEditingHandler.php
@@ -28,6 +28,7 @@
 namespace PrestaShop\PrestaShop\Adapter\OrderState\QueryHandler;
 
 use OrderState;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\OrderState\Exception\OrderStateNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\OrderState\Query\GetOrderStateForEditing;
 use PrestaShop\PrestaShop\Core\Domain\OrderState\QueryHandler\GetOrderStateForEditingHandlerInterface;
@@ -38,6 +39,7 @@
  *
  * @internal
  */
+#[AsQueryHandler]
 final class GetOrderStateForEditingHandler implements GetOrderStateForEditingHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/Attachment/CommandHandler/RemoveAllAssociatedProductAttachmentsHandler.php b/src/Adapter/Product/Attachment/CommandHandler/RemoveAllAssociatedProductAttachmentsHandler.php
index 4cbfd81c217a4..0e750b315d965 100644
--- a/src/Adapter/Product/Attachment/CommandHandler/RemoveAllAssociatedProductAttachmentsHandler.php
+++ b/src/Adapter/Product/Attachment/CommandHandler/RemoveAllAssociatedProductAttachmentsHandler.php
@@ -29,12 +29,14 @@
 namespace PrestaShop\PrestaShop\Adapter\Product\Attachment\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Product\Update\ProductAttachmentUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Attachment\Command\RemoveAllAssociatedProductAttachmentsCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\Attachment\CommandHandler\RemoveAllAssociatedProductAttachmentsHandlerInterface;
 
 /**
  * Removes all product-attachment associations for given product
  */
+#[AsCommandHandler]
 final class RemoveAllAssociatedProductAttachmentsHandler implements RemoveAllAssociatedProductAttachmentsHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/Attachment/CommandHandler/SetAssociatedProductAttachmentsHandler.php b/src/Adapter/Product/Attachment/CommandHandler/SetAssociatedProductAttachmentsHandler.php
index 54996888548a3..6f11f332ff3f1 100644
--- a/src/Adapter/Product/Attachment/CommandHandler/SetAssociatedProductAttachmentsHandler.php
+++ b/src/Adapter/Product/Attachment/CommandHandler/SetAssociatedProductAttachmentsHandler.php
@@ -29,12 +29,14 @@
 namespace PrestaShop\PrestaShop\Adapter\Product\Attachment\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Product\Update\ProductAttachmentUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Attachment\Command\SetAssociatedProductAttachmentsCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\Attachment\CommandHandler\SetAssociatedProductAttachmentsHandlerInterface;
 
 /**
  * Handles @see SetAssociatedProductAttachmentsCommand using legacy object model
  */
+#[AsCommandHandler]
 final class SetAssociatedProductAttachmentsHandler implements SetAssociatedProductAttachmentsHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/AttributeGroup/QueryHandler/GetProductAttributeGroupsHandler.php b/src/Adapter/Product/AttributeGroup/QueryHandler/GetProductAttributeGroupsHandler.php
index c44a8c98c4e44..e1cbd36f34a0e 100644
--- a/src/Adapter/Product/AttributeGroup/QueryHandler/GetProductAttributeGroupsHandler.php
+++ b/src/Adapter/Product/AttributeGroup/QueryHandler/GetProductAttributeGroupsHandler.php
@@ -32,12 +32,14 @@
 use PrestaShop\PrestaShop\Adapter\AttributeGroup\QueryHandler\AbstractAttributeGroupQueryHandler;
 use PrestaShop\PrestaShop\Adapter\AttributeGroup\Repository\AttributeGroupRepository;
 use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\AttributeGroup\Query\GetProductAttributeGroups;
 use PrestaShop\PrestaShop\Core\Domain\Product\AttributeGroup\QueryHandler\GetProductAttributeGroupsHandlerInterface;
 
 /**
  * Handles the query GetProductAttributeGroups using adapter repository
  */
+#[AsQueryHandler]
 class GetProductAttributeGroupsHandler extends AbstractAttributeGroupQueryHandler implements GetProductAttributeGroupsHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/Combination/CommandHandler/BulkDeleteCombinationHandler.php b/src/Adapter/Product/Combination/CommandHandler/BulkDeleteCombinationHandler.php
index 5ca9d30cada8c..a1383f614529f 100644
--- a/src/Adapter/Product/Combination/CommandHandler/BulkDeleteCombinationHandler.php
+++ b/src/Adapter/Product/Combination/CommandHandler/BulkDeleteCombinationHandler.php
@@ -28,12 +28,14 @@
 namespace PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Product\Combination\Update\CombinationDeleter;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\BulkDeleteCombinationCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\Combination\CommandHandler\BulkDeleteCombinationHandlerInterface;
 
 /**
  * Deletes multiple combinations using legacy object model
  */
+#[AsCommandHandler]
 class BulkDeleteCombinationHandler implements BulkDeleteCombinationHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/Combination/CommandHandler/DeleteCombinationHandler.php b/src/Adapter/Product/Combination/CommandHandler/DeleteCombinationHandler.php
index a99d453f83444..a7b5ba6e46daa 100644
--- a/src/Adapter/Product/Combination/CommandHandler/DeleteCombinationHandler.php
+++ b/src/Adapter/Product/Combination/CommandHandler/DeleteCombinationHandler.php
@@ -29,12 +29,14 @@
 namespace PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Product\Combination\Update\CombinationDeleter;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\DeleteCombinationCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\Combination\CommandHandler\DeleteCombinationHandlerInterface;
 
 /**
  * Handles @see DeleteCombinationCommand using adapter udpater service
  */
+#[AsCommandHandler]
 class DeleteCombinationHandler implements DeleteCombinationHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/Combination/CommandHandler/GenerateProductCombinationsHandler.php b/src/Adapter/Product/Combination/CommandHandler/GenerateProductCombinationsHandler.php
index 5698ac2ff135c..caf0323eaa740 100644
--- a/src/Adapter/Product/Combination/CommandHandler/GenerateProductCombinationsHandler.php
+++ b/src/Adapter/Product/Combination/CommandHandler/GenerateProductCombinationsHandler.php
@@ -30,12 +30,14 @@
 
 use PrestaShop\PrestaShop\Adapter\Product\Combination\Create\CombinationCreator;
 use PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\GenerateProductCombinationsCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\Combination\CommandHandler\GenerateProductCombinationsHandlerInterface;
 
 /**
  * Handles @see GenerateProductCombinationsCommand using legacy object model
  */
+#[AsCommandHandler]
 final class GenerateProductCombinationsHandler implements GenerateProductCombinationsHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/Combination/CommandHandler/RemoveAllCombinationImagesHandler.php b/src/Adapter/Product/Combination/CommandHandler/RemoveAllCombinationImagesHandler.php
index 698fe193ad4bc..caaea212c0576 100644
--- a/src/Adapter/Product/Combination/CommandHandler/RemoveAllCombinationImagesHandler.php
+++ b/src/Adapter/Product/Combination/CommandHandler/RemoveAllCombinationImagesHandler.php
@@ -29,12 +29,14 @@
 namespace PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Product\Combination\Update\CombinationImagesUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\RemoveAllCombinationImagesCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\Combination\CommandHandler\RemoveAllCombinationImagesHandlerInterface;
 
 /**
  * Handles @see RemoveAllCombinationImagesCommand using adapter udpater service
  */
+#[AsCommandHandler]
 final class RemoveAllCombinationImagesHandler implements RemoveAllCombinationImagesHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/Combination/CommandHandler/SetCombinationImagesHandler.php b/src/Adapter/Product/Combination/CommandHandler/SetCombinationImagesHandler.php
index 27e30a818c7f5..c4ac14c75e3d4 100644
--- a/src/Adapter/Product/Combination/CommandHandler/SetCombinationImagesHandler.php
+++ b/src/Adapter/Product/Combination/CommandHandler/SetCombinationImagesHandler.php
@@ -29,12 +29,14 @@
 namespace PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Product\Combination\Update\CombinationImagesUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\SetCombinationImagesCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\Combination\CommandHandler\SetCombinationImagesHandlerInterface;
 
 /**
  * Handles @see SetCombinationImagesCommand using adapter udpater service
  */
+#[AsCommandHandler]
 final class SetCombinationImagesHandler implements SetCombinationImagesHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/Combination/CommandHandler/UpdateCombinationHandler.php b/src/Adapter/Product/Combination/CommandHandler/UpdateCombinationHandler.php
index 9fef2044660e4..39f983aa8a601 100644
--- a/src/Adapter/Product/Combination/CommandHandler/UpdateCombinationHandler.php
+++ b/src/Adapter/Product/Combination/CommandHandler/UpdateCombinationHandler.php
@@ -31,6 +31,7 @@
 use PrestaShop\PrestaShop\Adapter\Product\Combination\Repository\CombinationRepository;
 use PrestaShop\PrestaShop\Adapter\Product\Combination\Update\DefaultCombinationUpdater;
 use PrestaShop\PrestaShop\Adapter\Product\Combination\Update\Filler\CombinationFillerInterface;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\UpdateCombinationCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\Combination\CommandHandler\UpdateCombinationHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Product\Combination\Exception\CannotUpdateCombinationException;
@@ -38,6 +39,7 @@
 /**
  * Handles the @see UpdateCombinationCommand using legacy object model
  */
+#[AsCommandHandler]
 class UpdateCombinationHandler implements UpdateCombinationHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/Combination/CommandHandler/UpdateCombinationStockAvailableHandler.php b/src/Adapter/Product/Combination/CommandHandler/UpdateCombinationStockAvailableHandler.php
index 4a9054ffc9b9f..ee08a4ad00e40 100644
--- a/src/Adapter/Product/Combination/CommandHandler/UpdateCombinationStockAvailableHandler.php
+++ b/src/Adapter/Product/Combination/CommandHandler/UpdateCombinationStockAvailableHandler.php
@@ -30,6 +30,7 @@
 
 use PrestaShop\PrestaShop\Adapter\Product\Combination\Update\CombinationStockProperties;
 use PrestaShop\PrestaShop\Adapter\Product\Combination\Update\CombinationStockUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\UpdateCombinationStockAvailableCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\Combination\CommandHandler\UpdateCombinationStockAvailableHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Product\Stock\ValueObject\StockModification;
@@ -37,6 +38,7 @@
 /**
  * Updates combination stock available using legacy object model
  */
+#[AsCommandHandler]
 class UpdateCombinationStockAvailableHandler implements UpdateCombinationStockAvailableHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/Combination/CommandHandler/UpdateCombinationSuppliersHandler.php b/src/Adapter/Product/Combination/CommandHandler/UpdateCombinationSuppliersHandler.php
index 784b497e29255..456c4c6b28307 100644
--- a/src/Adapter/Product/Combination/CommandHandler/UpdateCombinationSuppliersHandler.php
+++ b/src/Adapter/Product/Combination/CommandHandler/UpdateCombinationSuppliersHandler.php
@@ -31,9 +31,11 @@
 use PrestaShop\PrestaShop\Adapter\Product\Combination\Repository\CombinationRepository;
 use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductSupplierRepository;
 use PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\UpdateCombinationSuppliersCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\Combination\CommandHandler\UpdateCombinationSuppliersHandlerInterface;
 
+#[AsCommandHandler]
 class UpdateCombinationSuppliersHandler extends AbstractProductSupplierHandler implements UpdateCombinationSuppliersHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/Combination/QueryHandler/GetCombinationForEditingHandler.php b/src/Adapter/Product/Combination/QueryHandler/GetCombinationForEditingHandler.php
index d4c57d47a8108..f47badb0ae95b 100644
--- a/src/Adapter/Product/Combination/QueryHandler/GetCombinationForEditingHandler.php
+++ b/src/Adapter/Product/Combination/QueryHandler/GetCombinationForEditingHandler.php
@@ -37,6 +37,7 @@
 use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductRepository;
 use PrestaShop\PrestaShop\Adapter\Product\Stock\Repository\StockAvailableRepository;
 use PrestaShop\PrestaShop\Adapter\Tax\TaxComputer;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Configuration\ShopConfigurationInterface;
 use PrestaShop\PrestaShop\Core\Domain\Country\ValueObject\CountryId;
 use PrestaShop\PrestaShop\Core\Domain\Language\ValueObject\LanguageId;
@@ -60,6 +61,7 @@
 /**
  * Handles @see GetCombinationForEditing query using legacy object model
  */
+#[AsQueryHandler]
 class GetCombinationForEditingHandler implements GetCombinationForEditingHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/Combination/QueryHandler/GetCombinationSuppliersHandler.php b/src/Adapter/Product/Combination/QueryHandler/GetCombinationSuppliersHandler.php
index 74e6c0ac2238f..9735c9e9b1b49 100644
--- a/src/Adapter/Product/Combination/QueryHandler/GetCombinationSuppliersHandler.php
+++ b/src/Adapter/Product/Combination/QueryHandler/GetCombinationSuppliersHandler.php
@@ -30,9 +30,11 @@
 use PrestaShop\PrestaShop\Adapter\Product\AbstractProductSupplierHandler;
 use PrestaShop\PrestaShop\Adapter\Product\Combination\Repository\CombinationRepository;
 use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductSupplierRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\GetCombinationSuppliers;
 use PrestaShop\PrestaShop\Core\Domain\Product\Combination\QueryHandler\GetCombinationSuppliersHandlerInterface;
 
+#[AsQueryHandler]
 class GetCombinationSuppliersHandler extends AbstractProductSupplierHandler implements GetCombinationSuppliersHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/Combination/QueryHandler/GetEditableCombinationsListHandler.php b/src/Adapter/Product/Combination/QueryHandler/GetEditableCombinationsListHandler.php
index 8d2191ee2b04f..65ced47113fb9 100644
--- a/src/Adapter/Product/Combination/QueryHandler/GetEditableCombinationsListHandler.php
+++ b/src/Adapter/Product/Combination/QueryHandler/GetEditableCombinationsListHandler.php
@@ -33,6 +33,7 @@
 use PrestaShop\PrestaShop\Adapter\Attribute\Repository\AttributeRepository;
 use PrestaShop\PrestaShop\Adapter\Product\Image\ProductImagePathFactory;
 use PrestaShop\PrestaShop\Adapter\Product\Image\Repository\ProductImageRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Combination\CombinationAttributeInformation;
 use PrestaShop\PrestaShop\Core\Domain\Product\Combination\Exception\CombinationException;
 use PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\GetEditableCombinationsList;
@@ -48,6 +49,7 @@
 /**
  * Handles @see GetEditableCombinationsList using legacy object model
  */
+#[AsQueryHandler]
 final class GetEditableCombinationsListHandler implements GetEditableCombinationsListHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/Combination/QueryHandler/SearchCombinationsForAssociationHandler.php b/src/Adapter/Product/Combination/QueryHandler/SearchCombinationsForAssociationHandler.php
index 9f52280ee30ae..f328d22cb181e 100644
--- a/src/Adapter/Product/Combination/QueryHandler/SearchCombinationsForAssociationHandler.php
+++ b/src/Adapter/Product/Combination/QueryHandler/SearchCombinationsForAssociationHandler.php
@@ -31,6 +31,7 @@
 use PrestaShop\PrestaShop\Adapter\Attribute\Repository\AttributeRepository;
 use PrestaShop\PrestaShop\Adapter\Product\Image\ProductImagePathFactory;
 use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Language\ValueObject\LanguageId;
 use PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\SearchCombinationsForAssociation;
 use PrestaShop\PrestaShop\Core\Domain\Product\Combination\QueryHandler\SearchCombinationsForAssociationHandlerInterface;
@@ -40,6 +41,7 @@
 use PrestaShop\PrestaShop\Core\Domain\Product\Image\ValueObject\ImageId;
 use PrestaShop\PrestaShop\Core\Product\Combination\NameBuilder\CombinationNameBuilderInterface;
 
+#[AsQueryHandler]
 class SearchCombinationsForAssociationHandler implements SearchCombinationsForAssociationHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/CommandHandler/AddProductHandler.php b/src/Adapter/Product/CommandHandler/AddProductHandler.php
index bfd70b68f3644..b9138c58726ac 100644
--- a/src/Adapter/Product/CommandHandler/AddProductHandler.php
+++ b/src/Adapter/Product/CommandHandler/AddProductHandler.php
@@ -30,6 +30,7 @@
 
 use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductRepository;
 use PrestaShop\PrestaShop\Adapter\Tools;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Command\AddProductCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\CommandHandler\AddProductHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Product\ValueObject\ProductId;
@@ -37,6 +38,7 @@
 /**
  * Handles @see AddProductCommand using legacy object model
  */
+#[AsCommandHandler]
 final class AddProductHandler implements AddProductHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/CommandHandler/AssignProductToCategoryHandler.php b/src/Adapter/Product/CommandHandler/AssignProductToCategoryHandler.php
index 296338ab0af6e..83d9b03105a10 100644
--- a/src/Adapter/Product/CommandHandler/AssignProductToCategoryHandler.php
+++ b/src/Adapter/Product/CommandHandler/AssignProductToCategoryHandler.php
@@ -28,6 +28,7 @@
 
 use PrestaShop\PrestaShop\Adapter\Domain\AbstractObjectModelHandler;
 use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Command\AssignProductToCategoryCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\CommandHandler\AssignProductToCategoryHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Product\Exception\CannotAssignProductToCategoryException;
@@ -37,6 +38,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class AssignProductToCategoryHandler extends AbstractObjectModelHandler implements AssignProductToCategoryHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/CommandHandler/BulkDeleteProductHandler.php b/src/Adapter/Product/CommandHandler/BulkDeleteProductHandler.php
index af257e1d929ce..7f42d90e5c290 100644
--- a/src/Adapter/Product/CommandHandler/BulkDeleteProductHandler.php
+++ b/src/Adapter/Product/CommandHandler/BulkDeleteProductHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Product\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Product\ProductDeleter;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Command\BulkDeleteProductCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\CommandHandler\BulkDeleteProductHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Product\Exception\BulkProductException;
@@ -39,6 +40,7 @@
 /**
  * Handles command which deletes products in bulk action
  */
+#[AsCommandHandler]
 final class BulkDeleteProductHandler extends AbstractBulkHandler implements BulkDeleteProductHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/CommandHandler/BulkDuplicateProductHandler.php b/src/Adapter/Product/CommandHandler/BulkDuplicateProductHandler.php
index 1f84f53c26e58..9885951eda732 100644
--- a/src/Adapter/Product/CommandHandler/BulkDuplicateProductHandler.php
+++ b/src/Adapter/Product/CommandHandler/BulkDuplicateProductHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Product\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Product\Update\ProductDuplicator;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Command\BulkDuplicateProductCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\CommandHandler\BulkDuplicateProductHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Product\Exception\BulkProductException;
@@ -38,6 +39,7 @@
 /**
  * Handles command which deletes addresses in bulk action
  */
+#[AsCommandHandler]
 class BulkDuplicateProductHandler extends AbstractBulkHandler implements BulkDuplicateProductHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/CommandHandler/BulkUpdateProductStatusHandler.php b/src/Adapter/Product/CommandHandler/BulkUpdateProductStatusHandler.php
index 1be645a139056..5bb3cd1fb1044 100644
--- a/src/Adapter/Product/CommandHandler/BulkUpdateProductStatusHandler.php
+++ b/src/Adapter/Product/CommandHandler/BulkUpdateProductStatusHandler.php
@@ -30,6 +30,7 @@
 
 use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductRepository;
 use PrestaShop\PrestaShop\Adapter\Product\Update\ProductIndexationUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Command\BulkUpdateProductStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\CommandHandler\BulkUpdateProductStatusHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Product\Exception\BulkProductException;
@@ -40,6 +41,7 @@
 /**
  * Handles command which deletes addresses in bulk action
  */
+#[AsCommandHandler]
 class BulkUpdateProductStatusHandler extends AbstractBulkHandler implements BulkUpdateProductStatusHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/CommandHandler/DeleteProductHandler.php b/src/Adapter/Product/CommandHandler/DeleteProductHandler.php
index 5af7900659c0a..7ce0cfe5e6aa7 100644
--- a/src/Adapter/Product/CommandHandler/DeleteProductHandler.php
+++ b/src/Adapter/Product/CommandHandler/DeleteProductHandler.php
@@ -29,12 +29,14 @@
 namespace PrestaShop\PrestaShop\Adapter\Product\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Product\ProductDeleter;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Command\DeleteProductCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\CommandHandler\DeleteProductHandlerInterface;
 
 /**
  * Handles @see DeleteProductCommand using legacy object model
  */
+#[AsCommandHandler]
 class DeleteProductHandler implements DeleteProductHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/CommandHandler/DuplicateProductHandler.php b/src/Adapter/Product/CommandHandler/DuplicateProductHandler.php
index 7b33c360c03e0..98cdb4ec352ef 100644
--- a/src/Adapter/Product/CommandHandler/DuplicateProductHandler.php
+++ b/src/Adapter/Product/CommandHandler/DuplicateProductHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Product\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Product\Update\ProductDuplicator;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Command\DuplicateProductCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\CommandHandler\DuplicateProductHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Product\ValueObject\ProductId;
@@ -36,6 +37,7 @@
 /**
  * Handles @see DuplicateProductCommand
  */
+#[AsCommandHandler]
 final class DuplicateProductHandler implements DuplicateProductHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/CommandHandler/RemoveAllAssociatedProductCategoriesHandler.php b/src/Adapter/Product/CommandHandler/RemoveAllAssociatedProductCategoriesHandler.php
index d6230a30418fe..8b370c377ce69 100644
--- a/src/Adapter/Product/CommandHandler/RemoveAllAssociatedProductCategoriesHandler.php
+++ b/src/Adapter/Product/CommandHandler/RemoveAllAssociatedProductCategoriesHandler.php
@@ -29,12 +29,14 @@
 namespace PrestaShop\PrestaShop\Adapter\Product\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Product\Update\ProductCategoryUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Command\RemoveAllAssociatedProductCategoriesCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\CommandHandler\RemoveAllAssociatedProductCategoriesHandlerInterface;
 
 /**
  * Handles @see RemoveAllAssociatedProductCategoriesCommand using legacy object model
  */
+#[AsCommandHandler]
 final class RemoveAllAssociatedProductCategoriesHandler implements RemoveAllAssociatedProductCategoriesHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/CommandHandler/RemoveAllProductTagsHandler.php b/src/Adapter/Product/CommandHandler/RemoveAllProductTagsHandler.php
index 76dc06f4eb4eb..6aeb3990e7080 100644
--- a/src/Adapter/Product/CommandHandler/RemoveAllProductTagsHandler.php
+++ b/src/Adapter/Product/CommandHandler/RemoveAllProductTagsHandler.php
@@ -30,9 +30,11 @@
 
 use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductRepository;
 use PrestaShop\PrestaShop\Adapter\Product\Update\ProductTagUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Command\RemoveAllProductTagsCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\CommandHandler\RemoveAllProductTagsHandlerInterface;
 
+#[AsCommandHandler]
 final class RemoveAllProductTagsHandler implements RemoveAllProductTagsHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/CommandHandler/RemoveAllRelatedProductsHandler.php b/src/Adapter/Product/CommandHandler/RemoveAllRelatedProductsHandler.php
index 5514af3204b1b..a7488a0b4e4d5 100644
--- a/src/Adapter/Product/CommandHandler/RemoveAllRelatedProductsHandler.php
+++ b/src/Adapter/Product/CommandHandler/RemoveAllRelatedProductsHandler.php
@@ -29,12 +29,14 @@
 namespace PrestaShop\PrestaShop\Adapter\Product\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Product\Update\RelatedProductsUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Command\RemoveAllRelatedProductsCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\CommandHandler\RemoveAllRelatedProductsHandlerInterface;
 
 /**
  * Handles @see RemoveAllRelatedProductsCommand using legacy object model
  */
+#[AsCommandHandler]
 final class RemoveAllRelatedProductsHandler implements RemoveAllRelatedProductsHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/CommandHandler/SetAssociatedProductCategoriesHandler.php b/src/Adapter/Product/CommandHandler/SetAssociatedProductCategoriesHandler.php
index 00876cd0f03ae..88d8e5be740ed 100644
--- a/src/Adapter/Product/CommandHandler/SetAssociatedProductCategoriesHandler.php
+++ b/src/Adapter/Product/CommandHandler/SetAssociatedProductCategoriesHandler.php
@@ -29,12 +29,14 @@
 namespace PrestaShop\PrestaShop\Adapter\Product\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Product\Update\ProductCategoryUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Command\SetAssociatedProductCategoriesCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\CommandHandler\SetAssociatedProductCategoriesHandlerInterface;
 
 /**
  * Handles @var SetAssociatedProductCategoriesCommand using legacy object model
  */
+#[AsCommandHandler]
 final class SetAssociatedProductCategoriesHandler implements SetAssociatedProductCategoriesHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/CommandHandler/SetCarriersHandler.php b/src/Adapter/Product/CommandHandler/SetCarriersHandler.php
index 9373e1bac33ac..3185997520c85 100644
--- a/src/Adapter/Product/CommandHandler/SetCarriersHandler.php
+++ b/src/Adapter/Product/CommandHandler/SetCarriersHandler.php
@@ -29,12 +29,14 @@
 namespace PrestaShop\PrestaShop\Adapter\Product\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Command\SetCarriersCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\CommandHandler\SetCarriersHandlerInterface;
 
 /**
  * Handles @var SetCarriersCommand using repository
  */
+#[AsCommandHandler]
 class SetCarriersHandler implements SetCarriersHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/CommandHandler/SetProductTagsHandler.php b/src/Adapter/Product/CommandHandler/SetProductTagsHandler.php
index dd30f9e5dfb4a..ae3ceb784fe69 100644
--- a/src/Adapter/Product/CommandHandler/SetProductTagsHandler.php
+++ b/src/Adapter/Product/CommandHandler/SetProductTagsHandler.php
@@ -30,12 +30,14 @@
 
 use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductRepository;
 use PrestaShop\PrestaShop\Adapter\Product\Update\ProductTagUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Command\SetProductTagsCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\CommandHandler\UpdateProductTagsHandlerInterface;
 
 /**
  * Handles UpdateProductTagsCommand using legacy object model
  */
+#[AsCommandHandler]
 final class SetProductTagsHandler implements UpdateProductTagsHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/CommandHandler/SetRelatedProductsHandler.php b/src/Adapter/Product/CommandHandler/SetRelatedProductsHandler.php
index 368dfdbdb02ec..ca4a6c2900c40 100644
--- a/src/Adapter/Product/CommandHandler/SetRelatedProductsHandler.php
+++ b/src/Adapter/Product/CommandHandler/SetRelatedProductsHandler.php
@@ -29,12 +29,14 @@
 namespace PrestaShop\PrestaShop\Adapter\Product\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Product\Update\RelatedProductsUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Command\SetRelatedProductsCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\CommandHandler\SetRelatedProductsHandlerInterface;
 
 /**
  * handles @see SetRelatedProductsCommand using legacy object models
  */
+#[AsCommandHandler]
 final class SetRelatedProductsHandler implements SetRelatedProductsHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/CommandHandler/UpdateProductHandler.php b/src/Adapter/Product/CommandHandler/UpdateProductHandler.php
index d991a7378259c..c2afe19696546 100644
--- a/src/Adapter/Product/CommandHandler/UpdateProductHandler.php
+++ b/src/Adapter/Product/CommandHandler/UpdateProductHandler.php
@@ -30,6 +30,7 @@
 use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductRepository;
 use PrestaShop\PrestaShop\Adapter\Product\Update\Filler\ProductFillerInterface;
 use PrestaShop\PrestaShop\Adapter\Product\Update\ProductIndexationUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Command\UpdateProductCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\CommandHandler\UpdateProductHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Product\Exception\CannotUpdateProductException;
@@ -37,6 +38,7 @@
 /**
  * Handles the @see UpdateProductCommand using legacy object model
  */
+#[AsCommandHandler]
 class UpdateProductHandler implements UpdateProductHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/CommandHandler/UpdateProductTypeHandler.php b/src/Adapter/Product/CommandHandler/UpdateProductTypeHandler.php
index 34e232291411a..ba789ca393741 100644
--- a/src/Adapter/Product/CommandHandler/UpdateProductTypeHandler.php
+++ b/src/Adapter/Product/CommandHandler/UpdateProductTypeHandler.php
@@ -29,12 +29,14 @@
 namespace PrestaShop\PrestaShop\Adapter\Product\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Product\Update\ProductTypeUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Command\UpdateProductTypeCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\CommandHandler\UpdateProductTypeHandlerInterface;
 
 /**
  * Handle @see UpdateProductTypeCommand
  */
+#[AsCommandHandler]
 class UpdateProductTypeHandler implements UpdateProductTypeHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/CommandHandler/UpdateProductsPositionsHandler.php b/src/Adapter/Product/CommandHandler/UpdateProductsPositionsHandler.php
index b962107090c22..ce2c176c25154 100644
--- a/src/Adapter/Product/CommandHandler/UpdateProductsPositionsHandler.php
+++ b/src/Adapter/Product/CommandHandler/UpdateProductsPositionsHandler.php
@@ -28,6 +28,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Product\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Position\ValueObject\RowPosition;
 use PrestaShop\PrestaShop\Core\Domain\Product\Command\UpdateProductsPositionsCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\CommandHandler\UpdateProductsPositionsHandlerInterface;
@@ -41,6 +42,7 @@
 /**
  * Updates category position using legacy object model
  */
+#[AsCommandHandler]
 class UpdateProductsPositionsHandler implements UpdateProductsPositionsHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/Customization/CommandHandler/RemoveAllCustomizationFieldsFromProductHandler.php b/src/Adapter/Product/Customization/CommandHandler/RemoveAllCustomizationFieldsFromProductHandler.php
index b034ace64bd8b..a1dfdbe2ed8b9 100644
--- a/src/Adapter/Product/Customization/CommandHandler/RemoveAllCustomizationFieldsFromProductHandler.php
+++ b/src/Adapter/Product/Customization/CommandHandler/RemoveAllCustomizationFieldsFromProductHandler.php
@@ -31,6 +31,7 @@
 use PrestaShop\PrestaShop\Adapter\Product\Customization\Update\CustomizationFieldDeleter;
 use PrestaShop\PrestaShop\Adapter\Product\Customization\Update\ProductCustomizationFieldUpdater;
 use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Customization\Command\RemoveAllCustomizationFieldsFromProductCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\Customization\CommandHandler\RemoveAllCustomizationFieldsFromProductHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Product\Customization\ValueObject\CustomizationFieldId;
@@ -38,6 +39,7 @@
 /**
  * Handles @see RemoveAllCustomizationFieldsFromProductCommand using legacy object model
  */
+#[AsCommandHandler]
 final class RemoveAllCustomizationFieldsFromProductHandler implements RemoveAllCustomizationFieldsFromProductHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/Customization/CommandHandler/SetProductCustomizationFieldsHandler.php b/src/Adapter/Product/Customization/CommandHandler/SetProductCustomizationFieldsHandler.php
index fa1eb0ad29bf8..3338267821506 100644
--- a/src/Adapter/Product/Customization/CommandHandler/SetProductCustomizationFieldsHandler.php
+++ b/src/Adapter/Product/Customization/CommandHandler/SetProductCustomizationFieldsHandler.php
@@ -31,6 +31,7 @@
 use CustomizationField;
 use PrestaShop\PrestaShop\Adapter\Product\Customization\Repository\CustomizationFieldRepository;
 use PrestaShop\PrestaShop\Adapter\Product\Customization\Update\ProductCustomizationFieldUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Customization\Command\SetProductCustomizationFieldsCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\Customization\CommandHandler\SetProductCustomizationFieldsHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Product\Customization\CustomizationField as CustomizationFieldDTO;
@@ -40,6 +41,7 @@
 /**
  * Handles @see SetProductCustomizationFieldsCommand using legacy object model
  */
+#[AsCommandHandler]
 class SetProductCustomizationFieldsHandler implements SetProductCustomizationFieldsHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/Customization/QueryHandler/GetProductCustomizationFieldsHandler.php b/src/Adapter/Product/Customization/QueryHandler/GetProductCustomizationFieldsHandler.php
index ee96378f92872..23d737e1fdb1e 100644
--- a/src/Adapter/Product/Customization/QueryHandler/GetProductCustomizationFieldsHandler.php
+++ b/src/Adapter/Product/Customization/QueryHandler/GetProductCustomizationFieldsHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Product\Customization\QueryHandler;
 
 use PrestaShop\PrestaShop\Adapter\Product\Customization\Repository\CustomizationFieldRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Customization\Query\GetProductCustomizationFields;
 use PrestaShop\PrestaShop\Core\Domain\Product\Customization\QueryHandler\GetProductCustomizationFieldsHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Product\Customization\QueryResult\CustomizationField;
@@ -38,6 +39,7 @@
 /**
  * Defines contract to handle @var GetProductCustomizationFields query
  */
+#[AsQueryHandler]
 final class GetProductCustomizationFieldsHandler implements GetProductCustomizationFieldsHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/FeatureValue/CommandHandler/RemoveAllFeatureValuesFromProductHandler.php b/src/Adapter/Product/FeatureValue/CommandHandler/RemoveAllFeatureValuesFromProductHandler.php
index 085768253ccaa..047940f02df2f 100644
--- a/src/Adapter/Product/FeatureValue/CommandHandler/RemoveAllFeatureValuesFromProductHandler.php
+++ b/src/Adapter/Product/FeatureValue/CommandHandler/RemoveAllFeatureValuesFromProductHandler.php
@@ -29,12 +29,14 @@
 namespace PrestaShop\PrestaShop\Adapter\Product\FeatureValue\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Product\FeatureValue\Update\ProductFeatureValueUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\FeatureValue\Command\RemoveAllFeatureValuesFromProductCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\FeatureValue\CommandHandler\RemoveAllFeatureValuesFromProductHandlerInterface;
 
 /**
  * Handles @see RemoveAllFeatureValuesFromProductCommand using legacy object model
  */
+#[AsCommandHandler]
 class RemoveAllFeatureValuesFromProductHandler implements RemoveAllFeatureValuesFromProductHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/FeatureValue/CommandHandler/SetProductFeatureValuesHandler.php b/src/Adapter/Product/FeatureValue/CommandHandler/SetProductFeatureValuesHandler.php
index 2a0d0bc9a9def..5294b3652d01a 100644
--- a/src/Adapter/Product/FeatureValue/CommandHandler/SetProductFeatureValuesHandler.php
+++ b/src/Adapter/Product/FeatureValue/CommandHandler/SetProductFeatureValuesHandler.php
@@ -29,12 +29,14 @@
 namespace PrestaShop\PrestaShop\Adapter\Product\FeatureValue\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Product\FeatureValue\Update\ProductFeatureValueUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\FeatureValue\Command\SetProductFeatureValuesCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\FeatureValue\CommandHandler\SetProductFeatureValuesHandlerInterface;
 
 /**
  * Handles @see SetProductFeatureValuesCommand using legacy object model
  */
+#[AsCommandHandler]
 class SetProductFeatureValuesHandler implements SetProductFeatureValuesHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/FeatureValue/QueryHandler/GetProductFeatureValuesHandler.php b/src/Adapter/Product/FeatureValue/QueryHandler/GetProductFeatureValuesHandler.php
index 36e834a881076..2648d711f3549 100644
--- a/src/Adapter/Product/FeatureValue/QueryHandler/GetProductFeatureValuesHandler.php
+++ b/src/Adapter/Product/FeatureValue/QueryHandler/GetProductFeatureValuesHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Product\FeatureValue\QueryHandler;
 
 use PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureValueRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\FeatureValue\Query\GetProductFeatureValues;
 use PrestaShop\PrestaShop\Core\Domain\Product\FeatureValue\QueryHandler\GetProductFeatureValuesHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Product\FeatureValue\QueryResult\ProductFeatureValue;
@@ -36,6 +37,7 @@
 /**
  * Defines contract to handle @var GetProductFeatureValues query
  */
+#[AsQueryHandler]
 class GetProductFeatureValuesHandler implements GetProductFeatureValuesHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/Image/CommandHandler/AddProductImageHandler.php b/src/Adapter/Product/Image/CommandHandler/AddProductImageHandler.php
index c85a096ebd328..71969575d24b1 100644
--- a/src/Adapter/Product/Image/CommandHandler/AddProductImageHandler.php
+++ b/src/Adapter/Product/Image/CommandHandler/AddProductImageHandler.php
@@ -31,6 +31,7 @@
 use PrestaShop\PrestaShop\Adapter\Image\ProductImageFileValidator;
 use PrestaShop\PrestaShop\Adapter\Product\Image\Repository\ProductImageRepository;
 use PrestaShop\PrestaShop\Adapter\Product\Image\Uploader\ProductImageUploader;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Image\Command\AddProductImageCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\Image\CommandHandler\AddProductImageHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Product\Image\ValueObject\ImageId;
@@ -38,6 +39,7 @@
 /**
  * Handles @see AddProductImageCommand
  */
+#[AsCommandHandler]
 final class AddProductImageHandler implements AddProductImageHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/Image/CommandHandler/DeleteProductImageHandler.php b/src/Adapter/Product/Image/CommandHandler/DeleteProductImageHandler.php
index 16e150012e023..499014569db3c 100644
--- a/src/Adapter/Product/Image/CommandHandler/DeleteProductImageHandler.php
+++ b/src/Adapter/Product/Image/CommandHandler/DeleteProductImageHandler.php
@@ -29,12 +29,14 @@
 namespace PrestaShop\PrestaShop\Adapter\Product\Image\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Product\Image\Update\ProductImageUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Image\Command\DeleteProductImageCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\Image\CommandHandler\DeleteProductImageHandlerInterface;
 
 /**
  * Handles @see DeleteProductImageCommand
  */
+#[AsCommandHandler]
 class DeleteProductImageHandler implements DeleteProductImageHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/Image/CommandHandler/SetProductImagesForAllShopHandler.php b/src/Adapter/Product/Image/CommandHandler/SetProductImagesForAllShopHandler.php
index f9faf5c301664..091c0db9ffb7a 100644
--- a/src/Adapter/Product/Image/CommandHandler/SetProductImagesForAllShopHandler.php
+++ b/src/Adapter/Product/Image/CommandHandler/SetProductImagesForAllShopHandler.php
@@ -31,6 +31,7 @@
 use Image;
 use PrestaShop\PrestaShop\Adapter\Product\Image\Repository\ProductImageRepository;
 use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Image\Command\ProductImageSetting;
 use PrestaShop\PrestaShop\Core\Domain\Product\Image\Command\SetProductImagesForAllShopCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\Image\CommandHandler\SetProductImagesForAllShopHandlerInterface;
@@ -39,6 +40,7 @@
 use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopConstraint;
 use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopId;
 
+#[AsCommandHandler]
 class SetProductImagesForAllShopHandler implements SetProductImagesForAllShopHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/Image/CommandHandler/UpdateProductImageHandler.php b/src/Adapter/Product/Image/CommandHandler/UpdateProductImageHandler.php
index d20bb32ef1051..3692389d88ec6 100644
--- a/src/Adapter/Product/Image/CommandHandler/UpdateProductImageHandler.php
+++ b/src/Adapter/Product/Image/CommandHandler/UpdateProductImageHandler.php
@@ -32,12 +32,14 @@
 use PrestaShop\PrestaShop\Adapter\Product\Image\Repository\ProductImageRepository;
 use PrestaShop\PrestaShop\Adapter\Product\Image\Update\ProductImageUpdater;
 use PrestaShop\PrestaShop\Adapter\Product\Image\Uploader\ProductImageUploader;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Image\Command\UpdateProductImageCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\Image\CommandHandler\UpdateProductImageHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Product\Image\Exception\CannotUpdateProductImageException;
 use PrestaShop\PrestaShop\Core\Domain\Shop\Exception\InvalidShopConstraintException;
 use PrestaShop\PrestaShop\Core\Domain\Shop\Exception\ShopAssociationNotFound;
 
+#[AsCommandHandler]
 class UpdateProductImageHandler implements UpdateProductImageHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/Image/QueryHandler/GetProductImageHandler.php b/src/Adapter/Product/Image/QueryHandler/GetProductImageHandler.php
index a800a27347bf4..18c199ab79326 100644
--- a/src/Adapter/Product/Image/QueryHandler/GetProductImageHandler.php
+++ b/src/Adapter/Product/Image/QueryHandler/GetProductImageHandler.php
@@ -31,6 +31,7 @@
 use Image;
 use PrestaShop\PrestaShop\Adapter\Product\Image\ProductImagePathFactory;
 use PrestaShop\PrestaShop\Adapter\Product\Image\Repository\ProductImageRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Image\Query\GetProductImage;
 use PrestaShop\PrestaShop\Core\Domain\Product\Image\QueryHandler\GetProductImageHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Product\Image\QueryResult\ProductImage;
@@ -41,6 +42,7 @@
 /**
  * Handles @see GetProductImage query
  */
+#[AsQueryHandler]
 class GetProductImageHandler implements GetProductImageHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/Image/QueryHandler/GetProductImagesHandler.php b/src/Adapter/Product/Image/QueryHandler/GetProductImagesHandler.php
index 8e2fb4c0ae7d0..677ac0c45b754 100644
--- a/src/Adapter/Product/Image/QueryHandler/GetProductImagesHandler.php
+++ b/src/Adapter/Product/Image/QueryHandler/GetProductImagesHandler.php
@@ -32,6 +32,7 @@
 use PrestaShop\PrestaShop\Adapter\Product\Image\ProductImagePathFactory;
 use PrestaShop\PrestaShop\Adapter\Product\Image\Repository\ProductImageRepository;
 use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Image\Query\GetProductImages;
 use PrestaShop\PrestaShop\Core\Domain\Product\Image\QueryHandler\GetProductImagesHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Product\Image\QueryResult\ProductImage;
@@ -43,6 +44,7 @@
 /**
  * Handles @see GetProductImages query
  */
+#[AsQueryHandler]
 final class GetProductImagesHandler implements GetProductImagesHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/Image/QueryHandler/GetShopProductImagesHandler.php b/src/Adapter/Product/Image/QueryHandler/GetShopProductImagesHandler.php
index 2cef0713d2a91..283498f150df7 100644
--- a/src/Adapter/Product/Image/QueryHandler/GetShopProductImagesHandler.php
+++ b/src/Adapter/Product/Image/QueryHandler/GetShopProductImagesHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Product\Image\QueryHandler;
 
 use PrestaShop\PrestaShop\Adapter\Product\Image\Repository\ProductImageRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Image\Query\GetShopProductImages;
 use PrestaShop\PrestaShop\Core\Domain\Product\Image\QueryHandler\GetShopProductImagesHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Product\Image\QueryResult\Shop\ShopProductImagesCollection;
@@ -36,6 +37,7 @@
 /**
  * Handles @see GetShopProductImages query
  */
+#[AsQueryHandler]
 final class GetShopProductImagesHandler implements GetShopProductImagesHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/Pack/CommandHandler/RemoveAllProductsFromPackHandler.php b/src/Adapter/Product/Pack/CommandHandler/RemoveAllProductsFromPackHandler.php
index d5e979996a12a..fc9ded8828622 100644
--- a/src/Adapter/Product/Pack/CommandHandler/RemoveAllProductsFromPackHandler.php
+++ b/src/Adapter/Product/Pack/CommandHandler/RemoveAllProductsFromPackHandler.php
@@ -29,12 +29,14 @@
 namespace PrestaShop\PrestaShop\Adapter\Product\Pack\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Product\Pack\Update\ProductPackUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Pack\Command\RemoveAllProductsFromPackCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\Pack\CommandHandler\RemoveAllProductsFromPackHandlerInterface;
 
 /**
  * Handles @see RemoveAllProductsFromPackCommand using legacy object model
  */
+#[AsCommandHandler]
 final class RemoveAllProductsFromPackHandler implements RemoveAllProductsFromPackHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/Pack/CommandHandler/SetPackProductsHandler.php b/src/Adapter/Product/Pack/CommandHandler/SetPackProductsHandler.php
index 40acdeae0256a..f57327510dc91 100644
--- a/src/Adapter/Product/Pack/CommandHandler/SetPackProductsHandler.php
+++ b/src/Adapter/Product/Pack/CommandHandler/SetPackProductsHandler.php
@@ -29,12 +29,14 @@
 namespace PrestaShop\PrestaShop\Adapter\Product\Pack\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Product\Pack\Update\ProductPackUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Pack\Command\SetPackProductsCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\Pack\CommandHandler\SetPackProductsHandlerInterface;
 
 /**
  * Handles @see SetPackProductsCommand using legacy object model
  */
+#[AsCommandHandler]
 final class SetPackProductsHandler implements SetPackProductsHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/Pack/QueryHandler/GetPackedProductsHandler.php b/src/Adapter/Product/Pack/QueryHandler/GetPackedProductsHandler.php
index c577d9ac74fa5..ef837fd1780d3 100644
--- a/src/Adapter/Product/Pack/QueryHandler/GetPackedProductsHandler.php
+++ b/src/Adapter/Product/Pack/QueryHandler/GetPackedProductsHandler.php
@@ -33,6 +33,7 @@
 use PrestaShop\PrestaShop\Adapter\Product\Image\Repository\ProductImageRepository;
 use PrestaShop\PrestaShop\Adapter\Product\Pack\Repository\ProductPackRepository;
 use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Language\ValueObject\LanguageId;
 use PrestaShop\PrestaShop\Core\Domain\Product\Combination\ValueObject\CombinationId;
 use PrestaShop\PrestaShop\Core\Domain\Product\Combination\ValueObject\NoCombinationId;
@@ -49,6 +50,7 @@
 /**
  * Handles GetPackedProducts query using legacy object model
  */
+#[AsQueryHandler]
 class GetPackedProductsHandler implements GetPackedProductsHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/QueryHandler/GetProductForEditingHandler.php b/src/Adapter/Product/QueryHandler/GetProductForEditingHandler.php
index 451188a9ac2d4..704e359bf850c 100644
--- a/src/Adapter/Product/QueryHandler/GetProductForEditingHandler.php
+++ b/src/Adapter/Product/QueryHandler/GetProductForEditingHandler.php
@@ -41,6 +41,7 @@
 use PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\Repository\VirtualProductFileRepository;
 use PrestaShop\PrestaShop\Adapter\Tax\TaxComputer;
 use PrestaShop\PrestaShop\Core\Category\NameBuilder\CategoryDisplayNameBuilder;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Attachment\QueryResult\AttachmentInformation;
 use PrestaShop\PrestaShop\Core\Domain\Category\ValueObject\CategoryId;
 use PrestaShop\PrestaShop\Core\Domain\Country\ValueObject\CountryId;
@@ -76,6 +77,7 @@
 /**
  * Handles the query @see GetProductForEditing using legacy ObjectModel
  */
+#[AsQueryHandler]
 class GetProductForEditingHandler implements GetProductForEditingHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/QueryHandler/GetProductIsEnabledHandler.php b/src/Adapter/Product/QueryHandler/GetProductIsEnabledHandler.php
index d4a267147ea0f..3c3516310b78d 100644
--- a/src/Adapter/Product/QueryHandler/GetProductIsEnabledHandler.php
+++ b/src/Adapter/Product/QueryHandler/GetProductIsEnabledHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Product\QueryHandler;
 
 use PrestaShop\PrestaShop\Adapter\Entity\Product;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Exception\ProductNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Product\Query\GetProductIsEnabled;
 use PrestaShop\PrestaShop\Core\Domain\Product\QueryHandler\GetProductIsEnabledHandlerInterface;
@@ -34,6 +35,7 @@
 /**
  * @internal
  */
+#[AsQueryHandler]
 final class GetProductIsEnabledHandler implements GetProductIsEnabledHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/QueryHandler/GetProductSupplierOptionsHandler.php b/src/Adapter/Product/QueryHandler/GetProductSupplierOptionsHandler.php
index c6e32bbc2dfc2..0590442214ad6 100644
--- a/src/Adapter/Product/QueryHandler/GetProductSupplierOptionsHandler.php
+++ b/src/Adapter/Product/QueryHandler/GetProductSupplierOptionsHandler.php
@@ -31,6 +31,7 @@
 use PrestaShop\PrestaShop\Adapter\Product\AbstractProductSupplierHandler;
 use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductRepository;
 use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductSupplierRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Query\GetProductSupplierOptions;
 use PrestaShop\PrestaShop\Core\Domain\Product\Supplier\QueryHandler\GetProductSupplierOptionsHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Product\Supplier\QueryResult\ProductSupplierOptions;
@@ -40,6 +41,7 @@
 /**
  * Handles @see GetProductSupplierOptions query
  */
+#[AsQueryHandler]
 class GetProductSupplierOptionsHandler extends AbstractProductSupplierHandler implements GetProductSupplierOptionsHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/QueryHandler/GetRelatedProductsHandler.php b/src/Adapter/Product/QueryHandler/GetRelatedProductsHandler.php
index 3515df7193806..4edd810a4365c 100644
--- a/src/Adapter/Product/QueryHandler/GetRelatedProductsHandler.php
+++ b/src/Adapter/Product/QueryHandler/GetRelatedProductsHandler.php
@@ -31,11 +31,13 @@
 use PrestaShop\PrestaShop\Adapter\Product\Image\ProductImagePathFactory;
 use PrestaShop\PrestaShop\Adapter\Product\Image\Repository\ProductImageRepository;
 use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Query\GetRelatedProducts;
 use PrestaShop\PrestaShop\Core\Domain\Product\QueryHandler\GetRelatedProductsHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Product\QueryResult\RelatedProduct;
 use PrestaShop\PrestaShop\Core\Domain\Product\ValueObject\ProductId;
 
+#[AsQueryHandler]
 class GetRelatedProductsHandler implements GetRelatedProductsHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/QueryHandler/SearchProductsForAssociationHandler.php b/src/Adapter/Product/QueryHandler/SearchProductsForAssociationHandler.php
index 4a0057c466ab4..c6eec613b7e9a 100644
--- a/src/Adapter/Product/QueryHandler/SearchProductsForAssociationHandler.php
+++ b/src/Adapter/Product/QueryHandler/SearchProductsForAssociationHandler.php
@@ -30,11 +30,13 @@
 
 use PrestaShop\PrestaShop\Adapter\Product\Image\ProductImagePathFactory;
 use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Image\ValueObject\ImageId;
 use PrestaShop\PrestaShop\Core\Domain\Product\Query\SearchProductsForAssociation;
 use PrestaShop\PrestaShop\Core\Domain\Product\QueryHandler\SearchProductsForAssociationHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Product\QueryResult\ProductForAssociation;
 
+#[AsQueryHandler]
 class SearchProductsForAssociationHandler implements SearchProductsForAssociationHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/QueryHandler/SearchProductsHandler.php b/src/Adapter/Product/QueryHandler/SearchProductsHandler.php
index 8a6583071ed05..6e8257c0fdf6f 100644
--- a/src/Adapter/Product/QueryHandler/SearchProductsHandler.php
+++ b/src/Adapter/Product/QueryHandler/SearchProductsHandler.php
@@ -36,6 +36,7 @@
 use PrestaShop\PrestaShop\Adapter\Currency\CurrencyDataProvider;
 use PrestaShop\PrestaShop\Adapter\Order\AbstractOrderHandler;
 use PrestaShop\PrestaShop\Adapter\Tools;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Query\SearchProducts;
 use PrestaShop\PrestaShop\Core\Domain\Product\QueryHandler\SearchProductsHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Product\QueryResult\FoundProduct;
@@ -49,6 +50,7 @@
 /**
  * Handles products search using legacy object model
  */
+#[AsQueryHandler]
 final class SearchProductsHandler extends AbstractOrderHandler implements SearchProductsHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/Shop/CommandHandler/SetProductShopsHandler.php b/src/Adapter/Product/Shop/CommandHandler/SetProductShopsHandler.php
index 7d4afdb3637c3..9df80a07b4289 100644
--- a/src/Adapter/Product/Shop/CommandHandler/SetProductShopsHandler.php
+++ b/src/Adapter/Product/Shop/CommandHandler/SetProductShopsHandler.php
@@ -30,11 +30,13 @@
 use PrestaShop\PrestaShop\Adapter\Product\ProductDeleter;
 use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductRepository;
 use PrestaShop\PrestaShop\Adapter\Product\Update\ProductShopUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Exception\InvalidProductShopAssociationException;
 use PrestaShop\PrestaShop\Core\Domain\Product\Shop\Command\SetProductShopsCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\Shop\CommandHandler\SetProductShopsHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopId;
 
+#[AsCommandHandler]
 class SetProductShopsHandler implements SetProductShopsHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/SpecificPrice/CommandHandler/AddSpecificPriceHandler.php b/src/Adapter/Product/SpecificPrice/CommandHandler/AddSpecificPriceHandler.php
index aea5045c851ba..c7113552666f7 100644
--- a/src/Adapter/Product/SpecificPrice/CommandHandler/AddSpecificPriceHandler.php
+++ b/src/Adapter/Product/SpecificPrice/CommandHandler/AddSpecificPriceHandler.php
@@ -30,6 +30,7 @@
 
 use PrestaShop\Decimal\DecimalNumber;
 use PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Repository\SpecificPriceRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\AddSpecificPriceCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\CommandHandler\AddSpecificPriceHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Exception\SpecificPriceConstraintException;
@@ -42,6 +43,7 @@
 /**
  * Handles AddProductSpecificPriceCommand using legacy object model
  */
+#[AsCommandHandler]
 class AddSpecificPriceHandler implements AddSpecificPriceHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/SpecificPrice/CommandHandler/DeleteSpecificPriceHandler.php b/src/Adapter/Product/SpecificPrice/CommandHandler/DeleteSpecificPriceHandler.php
index 3415e5461952c..5eb45a8754493 100644
--- a/src/Adapter/Product/SpecificPrice/CommandHandler/DeleteSpecificPriceHandler.php
+++ b/src/Adapter/Product/SpecificPrice/CommandHandler/DeleteSpecificPriceHandler.php
@@ -29,12 +29,14 @@
 namespace PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Repository\SpecificPriceRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\DeleteSpecificPriceCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\CommandHandler\DeleteSpecificPriceHandlerInterface;
 
 /**
  * Handles DeleteSpecificPriceCommand using legacy object model
  */
+#[AsCommandHandler]
 class DeleteSpecificPriceHandler implements DeleteSpecificPriceHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/SpecificPrice/CommandHandler/EditSpecificPriceHandler.php b/src/Adapter/Product/SpecificPrice/CommandHandler/EditSpecificPriceHandler.php
index 54cabdcbda275..29dd4c5ea9fb0 100644
--- a/src/Adapter/Product/SpecificPrice/CommandHandler/EditSpecificPriceHandler.php
+++ b/src/Adapter/Product/SpecificPrice/CommandHandler/EditSpecificPriceHandler.php
@@ -29,6 +29,7 @@
 
 use PrestaShop\Decimal\DecimalNumber;
 use PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Repository\SpecificPriceRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\EditSpecificPriceCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\CommandHandler\EditSpecificPriceHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\ValueObject\Reduction;
@@ -38,6 +39,7 @@
 /**
  * Handles @see EditSpecificPriceCommand using legacy object model
  */
+#[AsCommandHandler]
 class EditSpecificPriceHandler implements EditSpecificPriceHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/SpecificPrice/CommandHandler/RemoveSpecificPricePriorityForProductHandler.php b/src/Adapter/Product/SpecificPrice/CommandHandler/RemoveSpecificPricePriorityForProductHandler.php
index 48952291aa96a..8bf22379223c1 100644
--- a/src/Adapter/Product/SpecificPrice/CommandHandler/RemoveSpecificPricePriorityForProductHandler.php
+++ b/src/Adapter/Product/SpecificPrice/CommandHandler/RemoveSpecificPricePriorityForProductHandler.php
@@ -28,9 +28,11 @@
 namespace PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Update\SpecificPricePriorityUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\RemoveSpecificPricePriorityForProductCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\CommandHandler\RemoveSpecificPricePriorityForProductHandlerInterface;
 
+#[AsCommandHandler]
 class RemoveSpecificPricePriorityForProductHandler implements RemoveSpecificPricePriorityForProductHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/SpecificPrice/CommandHandler/SetSpecificPricePriorityForProductHandler.php b/src/Adapter/Product/SpecificPrice/CommandHandler/SetSpecificPricePriorityForProductHandler.php
index 7d008f47be5de..0da1e3b1dd145 100644
--- a/src/Adapter/Product/SpecificPrice/CommandHandler/SetSpecificPricePriorityForProductHandler.php
+++ b/src/Adapter/Product/SpecificPrice/CommandHandler/SetSpecificPricePriorityForProductHandler.php
@@ -29,12 +29,14 @@
 namespace PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Update\SpecificPricePriorityUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\SetSpecificPricePriorityForProductCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\CommandHandler\SetSpecificPricePriorityForProductHandlerInterface;
 
 /**
  * Handles @see SetSpecificPricePriorityForProductCommand using legacy obj model
  */
+#[AsCommandHandler]
 class SetSpecificPricePriorityForProductHandler implements SetSpecificPricePriorityForProductHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/SpecificPrice/QueryHandler/GetSpecificPriceForEditingHandler.php b/src/Adapter/Product/SpecificPrice/QueryHandler/GetSpecificPriceForEditingHandler.php
index ad1e3db65f6ed..2f57eef51bf09 100644
--- a/src/Adapter/Product/SpecificPrice/QueryHandler/GetSpecificPriceForEditingHandler.php
+++ b/src/Adapter/Product/SpecificPrice/QueryHandler/GetSpecificPriceForEditingHandler.php
@@ -31,6 +31,7 @@
 use PrestaShop\Decimal\DecimalNumber;
 use PrestaShop\PrestaShop\Adapter\Customer\Repository\CustomerRepository;
 use PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Repository\SpecificPriceRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Customer\ValueObject\CustomerId;
 use PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Query\GetSpecificPriceForEditing;
 use PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\QueryHandler\GetSpecificPriceForEditingHandlerInterface;
@@ -45,6 +46,7 @@
 /**
  * Handles @see GetSpecificPriceForEditing using legacy object model
  */
+#[AsQueryHandler]
 class GetSpecificPriceForEditingHandler implements GetSpecificPriceForEditingHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/SpecificPrice/QueryHandler/GetSpecificPriceListHandler.php b/src/Adapter/Product/SpecificPrice/QueryHandler/GetSpecificPriceListHandler.php
index dd2e7852d61fe..cfca284573f05 100644
--- a/src/Adapter/Product/SpecificPrice/QueryHandler/GetSpecificPriceListHandler.php
+++ b/src/Adapter/Product/SpecificPrice/QueryHandler/GetSpecificPriceListHandler.php
@@ -31,6 +31,7 @@
 use PrestaShop\Decimal\DecimalNumber;
 use PrestaShop\PrestaShop\Adapter\Attribute\Repository\AttributeRepository;
 use PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Repository\SpecificPriceRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Language\ValueObject\LanguageId;
 use PrestaShop\PrestaShop\Core\Domain\Product\Combination\CombinationAttributeInformation;
 use PrestaShop\PrestaShop\Core\Domain\Product\Combination\Exception\CombinationException;
@@ -48,6 +49,7 @@
 /**
  * Handles @see GetSpecificPriceList using legacy object model
  */
+#[AsQueryHandler]
 class GetSpecificPriceListHandler implements GetSpecificPriceListHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/Stock/CommandHandler/UpdateProductStockAvailableHandler.php b/src/Adapter/Product/Stock/CommandHandler/UpdateProductStockAvailableHandler.php
index 318441ec7ec6d..1979d498ee4a1 100644
--- a/src/Adapter/Product/Stock/CommandHandler/UpdateProductStockAvailableHandler.php
+++ b/src/Adapter/Product/Stock/CommandHandler/UpdateProductStockAvailableHandler.php
@@ -31,6 +31,7 @@
 use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductRepository;
 use PrestaShop\PrestaShop\Adapter\Product\Stock\Update\ProductStockProperties;
 use PrestaShop\PrestaShop\Adapter\Product\Stock\Update\ProductStockUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Stock\Command\UpdateProductStockAvailableCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\Stock\CommandHandler\UpdateProductStockHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Product\Stock\ValueObject\StockModification;
@@ -39,6 +40,7 @@
 /**
  * Updates product stock using legacy object model
  */
+#[AsCommandHandler]
 class UpdateProductStockAvailableHandler implements UpdateProductStockHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/Stock/QueryHandler/GetCombinationStockMovementsHandler.php b/src/Adapter/Product/Stock/QueryHandler/GetCombinationStockMovementsHandler.php
index 98f98260ea3e9..4fe44b1062a54 100644
--- a/src/Adapter/Product/Stock/QueryHandler/GetCombinationStockMovementsHandler.php
+++ b/src/Adapter/Product/Stock/QueryHandler/GetCombinationStockMovementsHandler.php
@@ -28,12 +28,14 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Product\Stock\QueryHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Stock\Query\GetCombinationStockMovements;
 use PrestaShop\PrestaShop\Core\Domain\Product\Stock\QueryHandler\GetCombinationStockMovementsHandlerInterface;
 
 /**
  * Handles @see GetCombinationStockMovements using the adapter repositories.
  */
+#[AsQueryHandler]
 class GetCombinationStockMovementsHandler extends AbstractGetStockMovementsHandler implements GetCombinationStockMovementsHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/Stock/QueryHandler/GetProductStockMovementsHandler.php b/src/Adapter/Product/Stock/QueryHandler/GetProductStockMovementsHandler.php
index c007eded2c389..14e0bf61b5a55 100644
--- a/src/Adapter/Product/Stock/QueryHandler/GetProductStockMovementsHandler.php
+++ b/src/Adapter/Product/Stock/QueryHandler/GetProductStockMovementsHandler.php
@@ -28,12 +28,14 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Product\Stock\QueryHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Stock\Query\GetProductStockMovements;
 use PrestaShop\PrestaShop\Core\Domain\Product\Stock\QueryHandler\GetProductStockMovementsHandlerInterface;
 
 /**
  * Handles @see GetProductStockMovements using the adapter repositories.
  */
+#[AsQueryHandler]
 class GetProductStockMovementsHandler extends AbstractGetStockMovementsHandler implements GetProductStockMovementsHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/Supplier/CommandHandler/RemoveAllAssociatedProductSuppliersHandler.php b/src/Adapter/Product/Supplier/CommandHandler/RemoveAllAssociatedProductSuppliersHandler.php
index a72963e450974..884eef8847a23 100644
--- a/src/Adapter/Product/Supplier/CommandHandler/RemoveAllAssociatedProductSuppliersHandler.php
+++ b/src/Adapter/Product/Supplier/CommandHandler/RemoveAllAssociatedProductSuppliersHandler.php
@@ -29,12 +29,14 @@
 namespace PrestaShop\PrestaShop\Adapter\Product\Supplier\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Command\RemoveAllAssociatedProductSuppliersCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\Supplier\CommandHandler\RemoveAllAssociatedProductSuppliersHandlerInterface;
 
 /**
  * Handles @see RemoveAllAssociatedProductSuppliersCommand using legacy object model
  */
+#[AsCommandHandler]
 final class RemoveAllAssociatedProductSuppliersHandler implements RemoveAllAssociatedProductSuppliersHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/Supplier/CommandHandler/SetProductDefaultSupplierHandler.php b/src/Adapter/Product/Supplier/CommandHandler/SetProductDefaultSupplierHandler.php
index 81b59d2da4fe7..d4ce33b4ce0a1 100644
--- a/src/Adapter/Product/Supplier/CommandHandler/SetProductDefaultSupplierHandler.php
+++ b/src/Adapter/Product/Supplier/CommandHandler/SetProductDefaultSupplierHandler.php
@@ -29,12 +29,14 @@
 namespace PrestaShop\PrestaShop\Adapter\Product\Supplier\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Command\SetProductDefaultSupplierCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\Supplier\CommandHandler\SetProductDefaultSupplierHandlerInterface;
 
 /**
  * Handles @see SetProductDefaultSupplierCommand using legacy object model
  */
+#[AsCommandHandler]
 class SetProductDefaultSupplierHandler implements SetProductDefaultSupplierHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/Supplier/CommandHandler/SetSuppliersHandler.php b/src/Adapter/Product/Supplier/CommandHandler/SetSuppliersHandler.php
index 4b9e677326afe..9273f1c71ea84 100644
--- a/src/Adapter/Product/Supplier/CommandHandler/SetSuppliersHandler.php
+++ b/src/Adapter/Product/Supplier/CommandHandler/SetSuppliersHandler.php
@@ -29,12 +29,14 @@
 namespace PrestaShop\PrestaShop\Adapter\Product\Supplier\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Command\SetSuppliersCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\Supplier\CommandHandler\SetSuppliersHandlerInterface;
 
 /**
  * Handles @see SetSuppliersCommand using legacy object model
  */
+#[AsCommandHandler]
 class SetSuppliersHandler implements SetSuppliersHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/Supplier/CommandHandler/UpdateProductSuppliersHandler.php b/src/Adapter/Product/Supplier/CommandHandler/UpdateProductSuppliersHandler.php
index 7e6a9f200f3f8..8da2d37aa2214 100644
--- a/src/Adapter/Product/Supplier/CommandHandler/UpdateProductSuppliersHandler.php
+++ b/src/Adapter/Product/Supplier/CommandHandler/UpdateProductSuppliersHandler.php
@@ -31,12 +31,14 @@
 use PrestaShop\PrestaShop\Adapter\Product\AbstractProductSupplierHandler;
 use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductSupplierRepository;
 use PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Command\UpdateProductSuppliersCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\Supplier\CommandHandler\UpdateProductSuppliersHandlerInterface;
 
 /**
  * Handles @see UpdateProductSuppliersCommand using legacy object model
  */
+#[AsCommandHandler]
 final class UpdateProductSuppliersHandler extends AbstractProductSupplierHandler implements UpdateProductSuppliersHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/Supplier/QueryHandler/GetAssociatedSuppliersHandler.php b/src/Adapter/Product/Supplier/QueryHandler/GetAssociatedSuppliersHandler.php
index c9544390a6b24..6d753ade46b71 100644
--- a/src/Adapter/Product/Supplier/QueryHandler/GetAssociatedSuppliersHandler.php
+++ b/src/Adapter/Product/Supplier/QueryHandler/GetAssociatedSuppliersHandler.php
@@ -29,12 +29,14 @@
 namespace PrestaShop\PrestaShop\Adapter\Product\Supplier\QueryHandler;
 
 use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductSupplierRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Query\GetAssociatedSuppliers;
 use PrestaShop\PrestaShop\Core\Domain\Product\Supplier\QueryHandler\GetAssociatedSuppliersHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Product\Supplier\QueryResult\AssociatedSuppliers;
 use PrestaShop\PrestaShop\Core\Domain\Supplier\ValueObject\NoSupplierId;
 use PrestaShop\PrestaShop\Core\Domain\Supplier\ValueObject\SupplierId;
 
+#[AsQueryHandler]
 class GetAssociatedSuppliersHandler implements GetAssociatedSuppliersHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/VirtualProduct/CommandHandler/AddVirtualProductFileHandler.php b/src/Adapter/Product/VirtualProduct/CommandHandler/AddVirtualProductFileHandler.php
index 3f8bfa58c3be9..d49e00bcc8394 100644
--- a/src/Adapter/Product/VirtualProduct/CommandHandler/AddVirtualProductFileHandler.php
+++ b/src/Adapter/Product/VirtualProduct/CommandHandler/AddVirtualProductFileHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\Update\VirtualProductUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\VirtualProductFile\Command\AddVirtualProductFileCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\VirtualProductFile\CommandHandler\AddVirtualProductFileHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Product\VirtualProductFile\ValueObject\VirtualProductFileId;
@@ -40,6 +41,7 @@
  *
  * Legacy object ProductDownload is referred as VirtualProductFile in Core
  */
+#[AsCommandHandler]
 final class AddVirtualProductFileHandler implements AddVirtualProductFileHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/VirtualProduct/CommandHandler/DeleteVirtualProductFileHandler.php b/src/Adapter/Product/VirtualProduct/CommandHandler/DeleteVirtualProductFileHandler.php
index d0af89202eaac..e1dd034a604f3 100644
--- a/src/Adapter/Product/VirtualProduct/CommandHandler/DeleteVirtualProductFileHandler.php
+++ b/src/Adapter/Product/VirtualProduct/CommandHandler/DeleteVirtualProductFileHandler.php
@@ -28,12 +28,14 @@
 namespace PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\Update\VirtualProductUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\VirtualProductFile\Command\DeleteVirtualProductFileCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\VirtualProductFile\CommandHandler\DeleteVirtualProductFileHandlerInterface;
 
 /**
  * Deletes virtual product file using legacy object model
  */
+#[AsCommandHandler]
 class DeleteVirtualProductFileHandler implements DeleteVirtualProductFileHandlerInterface
 {
     /**
diff --git a/src/Adapter/Product/VirtualProduct/CommandHandler/UpdateVirtualProductFileHandler.php b/src/Adapter/Product/VirtualProduct/CommandHandler/UpdateVirtualProductFileHandler.php
index c153865604efc..653156f436739 100644
--- a/src/Adapter/Product/VirtualProduct/CommandHandler/UpdateVirtualProductFileHandler.php
+++ b/src/Adapter/Product/VirtualProduct/CommandHandler/UpdateVirtualProductFileHandler.php
@@ -29,6 +29,7 @@
 
 use PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\Repository\VirtualProductFileRepository;
 use PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\Update\VirtualProductUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\VirtualProductFile\Command\UpdateVirtualProductFileCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\VirtualProductFile\CommandHandler\UpdateVirtualProductFileHandlerInterface;
 use PrestaShop\PrestaShop\Core\Util\DateTime\DateTime;
@@ -37,6 +38,7 @@
 /**
  * Updates VirtualProductFile using legacy object model. (ProductDownload is referenced as VirtualProduct in core)
  */
+#[AsCommandHandler]
 final class UpdateVirtualProductFileHandler implements UpdateVirtualProductFileHandlerInterface
 {
     /**
diff --git a/src/Adapter/Profile/CommandHandler/AddProfileHandler.php b/src/Adapter/Profile/CommandHandler/AddProfileHandler.php
index f0bd4d88eb181..f1911b02991bd 100644
--- a/src/Adapter/Profile/CommandHandler/AddProfileHandler.php
+++ b/src/Adapter/Profile/CommandHandler/AddProfileHandler.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Profile\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Profile\Command\AddProfileCommand;
 use PrestaShop\PrestaShop\Core\Domain\Profile\CommandHandler\AddProfileHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Profile\Exception\ProfileException;
@@ -35,6 +36,7 @@
 /**
  * Adds new employee profile using legacy object model
  */
+#[AsCommandHandler]
 final class AddProfileHandler implements AddProfileHandlerInterface
 {
     /**
diff --git a/src/Adapter/Profile/CommandHandler/BulkDeleteProfileHandler.php b/src/Adapter/Profile/CommandHandler/BulkDeleteProfileHandler.php
index 7d569204ab0e9..10bdb933dbd84 100644
--- a/src/Adapter/Profile/CommandHandler/BulkDeleteProfileHandler.php
+++ b/src/Adapter/Profile/CommandHandler/BulkDeleteProfileHandler.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Profile\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Profile\Command\BulkDeleteProfileCommand;
 use PrestaShop\PrestaShop\Core\Domain\Profile\CommandHandler\BulkDeleteProfileHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Profile\Exception\CannotDeleteSuperAdminProfileException;
@@ -41,6 +42,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class BulkDeleteProfileHandler extends AbstractProfileHandler implements BulkDeleteProfileHandlerInterface
 {
     /**
diff --git a/src/Adapter/Profile/CommandHandler/DeleteProfileHandler.php b/src/Adapter/Profile/CommandHandler/DeleteProfileHandler.php
index e2e87a2e16596..6b26dd04ae564 100644
--- a/src/Adapter/Profile/CommandHandler/DeleteProfileHandler.php
+++ b/src/Adapter/Profile/CommandHandler/DeleteProfileHandler.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Profile\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Profile\Command\DeleteProfileCommand;
 use PrestaShop\PrestaShop\Core\Domain\Profile\CommandHandler\DeleteProfileHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Profile\Exception\CannotDeleteSuperAdminProfileException;
@@ -41,6 +42,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class DeleteProfileHandler extends AbstractProfileHandler implements DeleteProfileHandlerInterface
 {
     /**
diff --git a/src/Adapter/Profile/CommandHandler/EditProfileHandler.php b/src/Adapter/Profile/CommandHandler/EditProfileHandler.php
index 9d147e2f2c8ce..43923d833f818 100644
--- a/src/Adapter/Profile/CommandHandler/EditProfileHandler.php
+++ b/src/Adapter/Profile/CommandHandler/EditProfileHandler.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Profile\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Profile\Command\EditProfileCommand;
 use PrestaShop\PrestaShop\Core\Domain\Profile\CommandHandler\EditProfileHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Profile\Exception\ProfileException;
@@ -36,6 +37,7 @@
 /**
  * Edits Profile using legacy object model
  */
+#[AsCommandHandler]
 final class EditProfileHandler implements EditProfileHandlerInterface
 {
     /**
diff --git a/src/Adapter/Profile/Employee/CommandHandler/AddEmployeeHandler.php b/src/Adapter/Profile/Employee/CommandHandler/AddEmployeeHandler.php
index 502590730e24c..891414a4b255e 100644
--- a/src/Adapter/Profile/Employee/CommandHandler/AddEmployeeHandler.php
+++ b/src/Adapter/Profile/Employee/CommandHandler/AddEmployeeHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Profile\Employee\CommandHandler;
 
 use Employee;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Crypto\Hashing;
 use PrestaShop\PrestaShop\Core\Domain\Employee\Command\AddEmployeeCommand;
 use PrestaShop\PrestaShop\Core\Domain\Employee\CommandHandler\AddEmployeeHandlerInterface;
@@ -42,6 +43,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class AddEmployeeHandler extends AbstractEmployeeHandler implements AddEmployeeHandlerInterface
 {
     /**
diff --git a/src/Adapter/Profile/Employee/CommandHandler/BulkDeleteEmployeeHandler.php b/src/Adapter/Profile/Employee/CommandHandler/BulkDeleteEmployeeHandler.php
index 0374ebed96c80..0e66ea555b2ec 100644
--- a/src/Adapter/Profile/Employee/CommandHandler/BulkDeleteEmployeeHandler.php
+++ b/src/Adapter/Profile/Employee/CommandHandler/BulkDeleteEmployeeHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Profile\Employee\CommandHandler;
 
 use Employee;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Employee\Command\BulkDeleteEmployeeCommand;
 use PrestaShop\PrestaShop\Core\Domain\Employee\CommandHandler\BulkDeleteEmployeeHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Employee\Exception\CannotDeleteEmployeeException;
@@ -34,6 +35,7 @@
 /**
  * Class BulkDeleteEmployeeHandler.
  */
+#[AsCommandHandler]
 final class BulkDeleteEmployeeHandler extends AbstractEmployeeHandler implements BulkDeleteEmployeeHandlerInterface
 {
     /**
diff --git a/src/Adapter/Profile/Employee/CommandHandler/BulkUpdateEmployeeStatusHandler.php b/src/Adapter/Profile/Employee/CommandHandler/BulkUpdateEmployeeStatusHandler.php
index ed3cbcd96510f..6395e8abf0b35 100644
--- a/src/Adapter/Profile/Employee/CommandHandler/BulkUpdateEmployeeStatusHandler.php
+++ b/src/Adapter/Profile/Employee/CommandHandler/BulkUpdateEmployeeStatusHandler.php
@@ -27,12 +27,14 @@
 namespace PrestaShop\PrestaShop\Adapter\Profile\Employee\CommandHandler;
 
 use Employee;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Employee\Command\BulkUpdateEmployeeStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\Employee\CommandHandler\BulkUpdateEmployeeStatusHandlerInterface;
 
 /**
  * Class BulkUpdateEmployeeStatusHandler.
  */
+#[AsCommandHandler]
 final class BulkUpdateEmployeeStatusHandler extends AbstractEmployeeHandler implements BulkUpdateEmployeeStatusHandlerInterface
 {
     /**
diff --git a/src/Adapter/Profile/Employee/CommandHandler/DeleteEmployeeHandler.php b/src/Adapter/Profile/Employee/CommandHandler/DeleteEmployeeHandler.php
index d26cd017aaa2e..a2e1a3ab82530 100644
--- a/src/Adapter/Profile/Employee/CommandHandler/DeleteEmployeeHandler.php
+++ b/src/Adapter/Profile/Employee/CommandHandler/DeleteEmployeeHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Profile\Employee\CommandHandler;
 
 use Employee;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Employee\Command\DeleteEmployeeCommand;
 use PrestaShop\PrestaShop\Core\Domain\Employee\CommandHandler\DeleteEmployeeHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Employee\Exception\CannotDeleteEmployeeException;
@@ -34,6 +35,7 @@
 /**
  * Class DeleteEmployeeHandler.
  */
+#[AsCommandHandler]
 final class DeleteEmployeeHandler extends AbstractEmployeeHandler implements DeleteEmployeeHandlerInterface
 {
     /**
diff --git a/src/Adapter/Profile/Employee/CommandHandler/EditEmployeeHandler.php b/src/Adapter/Profile/Employee/CommandHandler/EditEmployeeHandler.php
index 05032a019f7e4..e78639cfe583c 100644
--- a/src/Adapter/Profile/Employee/CommandHandler/EditEmployeeHandler.php
+++ b/src/Adapter/Profile/Employee/CommandHandler/EditEmployeeHandler.php
@@ -28,6 +28,7 @@
 
 use Employee;
 use PrestaShop\PrestaShop\Adapter\LegacyContext;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Crypto\Hashing;
 use PrestaShop\PrestaShop\Core\Domain\Employee\Command\EditEmployeeCommand;
 use PrestaShop\PrestaShop\Core\Domain\Employee\CommandHandler\EditEmployeeHandlerInterface;
@@ -44,6 +45,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class EditEmployeeHandler extends AbstractEmployeeHandler implements EditEmployeeHandlerInterface
 {
     /**
diff --git a/src/Adapter/Profile/Employee/CommandHandler/ToggleEmployeeStatusHandler.php b/src/Adapter/Profile/Employee/CommandHandler/ToggleEmployeeStatusHandler.php
index 90307344dee7b..3e12bbc9daa9e 100644
--- a/src/Adapter/Profile/Employee/CommandHandler/ToggleEmployeeStatusHandler.php
+++ b/src/Adapter/Profile/Employee/CommandHandler/ToggleEmployeeStatusHandler.php
@@ -27,12 +27,14 @@
 namespace PrestaShop\PrestaShop\Adapter\Profile\Employee\CommandHandler;
 
 use Employee;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Employee\Command\ToggleEmployeeStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\Employee\CommandHandler\ToggleEmployeeStatusHandlerInterface;
 
 /**
  * Class ToggleEmployeeStatusHandler encapsulates Employee status toggling using legacy Employee object model.
  */
+#[AsCommandHandler]
 final class ToggleEmployeeStatusHandler extends AbstractEmployeeHandler implements ToggleEmployeeStatusHandlerInterface
 {
     /**
diff --git a/src/Adapter/Profile/Employee/QueryHandler/GetEmployeeEmailByIdHandler.php b/src/Adapter/Profile/Employee/QueryHandler/GetEmployeeEmailByIdHandler.php
index 3ab5907740b89..40ac21a643058 100644
--- a/src/Adapter/Profile/Employee/QueryHandler/GetEmployeeEmailByIdHandler.php
+++ b/src/Adapter/Profile/Employee/QueryHandler/GetEmployeeEmailByIdHandler.php
@@ -27,10 +27,12 @@
 namespace PrestaShop\PrestaShop\Adapter\Profile\Employee\QueryHandler;
 
 use PrestaShop\PrestaShop\Adapter\Profile\Employee\AbstractEmployeeHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Employee\Query\GetEmployeeEmailById;
 use PrestaShop\PrestaShop\Core\Domain\Employee\QueryHandler\GetEmployeeEmailByIdHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\ValueObject\Email;
 
+#[AsQueryHandler]
 final class GetEmployeeEmailByIdHandler extends AbstractEmployeeHandler implements GetEmployeeEmailByIdHandlerInterface
 {
     /**
diff --git a/src/Adapter/Profile/Employee/QueryHandler/GetEmployeeForEditingHandler.php b/src/Adapter/Profile/Employee/QueryHandler/GetEmployeeForEditingHandler.php
index f73b6a67c1fbf..c81e20112ed7b 100644
--- a/src/Adapter/Profile/Employee/QueryHandler/GetEmployeeForEditingHandler.php
+++ b/src/Adapter/Profile/Employee/QueryHandler/GetEmployeeForEditingHandler.php
@@ -28,6 +28,7 @@
 
 use Employee;
 use PrestaShop\PrestaShop\Adapter\Domain\AbstractObjectModelHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Employee\Exception\EmployeeNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Employee\Query\GetEmployeeForEditing;
 use PrestaShop\PrestaShop\Core\Domain\Employee\QueryHandler\GetEmployeeForEditingHandlerInterface;
@@ -41,6 +42,7 @@
 /**
  * Handles command that gets employee for editing.
  */
+#[AsQueryHandler]
 final class GetEmployeeForEditingHandler extends AbstractObjectModelHandler implements GetEmployeeForEditingHandlerInterface
 {
     /**
diff --git a/src/Adapter/Profile/Permission/CommandHandler/UpdateModulePermissionsHandler.php b/src/Adapter/Profile/Permission/CommandHandler/UpdateModulePermissionsHandler.php
index 5e72292d689f2..fade25ec2e6df 100644
--- a/src/Adapter/Profile/Permission/CommandHandler/UpdateModulePermissionsHandler.php
+++ b/src/Adapter/Profile/Permission/CommandHandler/UpdateModulePermissionsHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Profile\Permission\CommandHandler;
 
 use Access;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Profile\Permission\Command\UpdateModulePermissionsCommand;
 use PrestaShop\PrestaShop\Core\Domain\Profile\Permission\CommandHandler\UpdateModulePermissionsHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Profile\Permission\Exception\PermissionUpdateException;
@@ -38,6 +39,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class UpdateModulePermissionsHandler implements UpdateModulePermissionsHandlerInterface
 {
     /**
diff --git a/src/Adapter/Profile/Permission/CommandHandler/UpdateTabPermissionsHandler.php b/src/Adapter/Profile/Permission/CommandHandler/UpdateTabPermissionsHandler.php
index 4847a0ccac5d1..87542e17d65a3 100644
--- a/src/Adapter/Profile/Permission/CommandHandler/UpdateTabPermissionsHandler.php
+++ b/src/Adapter/Profile/Permission/CommandHandler/UpdateTabPermissionsHandler.php
@@ -30,6 +30,7 @@
 
 use Access;
 use Exception;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Profile\Permission\Command\UpdateTabPermissionsCommand;
 use PrestaShop\PrestaShop\Core\Domain\Profile\Permission\CommandHandler\UpdateTabPermissionsHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Profile\Permission\Exception\PermissionUpdateException;
@@ -40,6 +41,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class UpdateTabPermissionsHandler implements UpdateTabPermissionsHandlerInterface
 {
     /**
diff --git a/src/Adapter/Profile/Permission/QueryHandler/GetPermissionsForConfigurationHandler.php b/src/Adapter/Profile/Permission/QueryHandler/GetPermissionsForConfigurationHandler.php
index c632a213599c1..9b2e2eaacfeeb 100644
--- a/src/Adapter/Profile/Permission/QueryHandler/GetPermissionsForConfigurationHandler.php
+++ b/src/Adapter/Profile/Permission/QueryHandler/GetPermissionsForConfigurationHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Profile\Permission\QueryHandler;
 
 use Module;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Profile\Permission\Query\GetPermissionsForConfiguration;
 use PrestaShop\PrestaShop\Core\Domain\Profile\Permission\QueryHandler\GetPermissionsForConfigurationHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Profile\Permission\QueryResult\ConfigurablePermissions;
@@ -44,6 +45,7 @@
  *
  * @internal
  */
+#[AsQueryHandler]
 class GetPermissionsForConfigurationHandler implements GetPermissionsForConfigurationHandlerInterface
 {
     /**
diff --git a/src/Adapter/Profile/QueryHandler/GetProfileForEditingHandler.php b/src/Adapter/Profile/QueryHandler/GetProfileForEditingHandler.php
index 9c66da8b004fb..7168ded690c21 100644
--- a/src/Adapter/Profile/QueryHandler/GetProfileForEditingHandler.php
+++ b/src/Adapter/Profile/QueryHandler/GetProfileForEditingHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Profile\QueryHandler;
 
 use PrestaShop\PrestaShop\Adapter\Domain\AbstractObjectModelHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Profile\Exception\ProfileNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Profile\Query\GetProfileForEditing;
 use PrestaShop\PrestaShop\Core\Domain\Profile\QueryHandler\GetProfileForEditingHandlerInterface;
@@ -38,6 +39,7 @@
 /**
  * Gets Profile for editing using legacy object model
  */
+#[AsQueryHandler]
 final class GetProfileForEditingHandler extends AbstractObjectModelHandler implements GetProfileForEditingHandlerInterface
 {
     /**
diff --git a/src/Adapter/SearchEngine/CommandHandler/AddSearchEngineHandler.php b/src/Adapter/SearchEngine/CommandHandler/AddSearchEngineHandler.php
index bb370f255f762..3944ac0c1e62d 100644
--- a/src/Adapter/SearchEngine/CommandHandler/AddSearchEngineHandler.php
+++ b/src/Adapter/SearchEngine/CommandHandler/AddSearchEngineHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\SearchEngine\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\SearchEngine\AbstractSearchEngineHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\SearchEngine\Command\AddSearchEngineCommand;
 use PrestaShop\PrestaShop\Core\Domain\SearchEngine\CommandHandler\AddSearchEngineHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\SearchEngine\Exception\SearchEngineException;
@@ -39,6 +40,7 @@
 /**
  * Handles command what is responsible for creating new search engine.
  */
+#[AsCommandHandler]
 final class AddSearchEngineHandler extends AbstractSearchEngineHandler implements AddSearchEngineHandlerInterface
 {
     /**
diff --git a/src/Adapter/SearchEngine/CommandHandler/BulkDeleteSearchEngineHandler.php b/src/Adapter/SearchEngine/CommandHandler/BulkDeleteSearchEngineHandler.php
index e4cd1c18cb538..851e013ee7cb5 100644
--- a/src/Adapter/SearchEngine/CommandHandler/BulkDeleteSearchEngineHandler.php
+++ b/src/Adapter/SearchEngine/CommandHandler/BulkDeleteSearchEngineHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\SearchEngine\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\SearchEngine\AbstractSearchEngineHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\SearchEngine\Command\BulkDeleteSearchEngineCommand;
 use PrestaShop\PrestaShop\Core\Domain\SearchEngine\CommandHandler\BulkDeleteSearchEngineHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\SearchEngine\Exception\DeleteSearchEngineException;
@@ -38,6 +39,7 @@
 /**
  * Handles command that deletes Search Engines in bulk action.
  */
+#[AsCommandHandler]
 final class BulkDeleteSearchEngineHandler extends AbstractSearchEngineHandler implements BulkDeleteSearchEngineHandlerInterface
 {
     /**
diff --git a/src/Adapter/SearchEngine/CommandHandler/DeleteSearchEngineHandler.php b/src/Adapter/SearchEngine/CommandHandler/DeleteSearchEngineHandler.php
index ca9289744638b..0961adb0a5230 100644
--- a/src/Adapter/SearchEngine/CommandHandler/DeleteSearchEngineHandler.php
+++ b/src/Adapter/SearchEngine/CommandHandler/DeleteSearchEngineHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\SearchEngine\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\SearchEngine\AbstractSearchEngineHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\SearchEngine\Command\DeleteSearchEngineCommand;
 use PrestaShop\PrestaShop\Core\Domain\SearchEngine\CommandHandler\DeleteSearchEngineHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\SearchEngine\Exception\DeleteSearchEngineException;
@@ -38,6 +39,7 @@
 /**
  * Handles command that deletes Search Engine.
  */
+#[AsCommandHandler]
 final class DeleteSearchEngineHandler extends AbstractSearchEngineHandler implements DeleteSearchEngineHandlerInterface
 {
     /**
diff --git a/src/Adapter/SearchEngine/CommandHandler/EditSearchEngineHandler.php b/src/Adapter/SearchEngine/CommandHandler/EditSearchEngineHandler.php
index a56d203f8454c..3139b65a644dc 100644
--- a/src/Adapter/SearchEngine/CommandHandler/EditSearchEngineHandler.php
+++ b/src/Adapter/SearchEngine/CommandHandler/EditSearchEngineHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\SearchEngine\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\SearchEngine\AbstractSearchEngineHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\SearchEngine\Command\EditSearchEngineCommand;
 use PrestaShop\PrestaShop\Core\Domain\SearchEngine\CommandHandler\EditSearchEngineHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\SearchEngine\Exception\SearchEngineException;
@@ -37,6 +38,7 @@
 /**
  * Handles command what edits search engine.
  */
+#[AsCommandHandler]
 final class EditSearchEngineHandler extends AbstractSearchEngineHandler implements EditSearchEngineHandlerInterface
 {
     /**
diff --git a/src/Adapter/SearchEngine/QueryHandler/GetSearchEngineForEditingHandler.php b/src/Adapter/SearchEngine/QueryHandler/GetSearchEngineForEditingHandler.php
index d88d73b59b079..c87eb4fff331e 100644
--- a/src/Adapter/SearchEngine/QueryHandler/GetSearchEngineForEditingHandler.php
+++ b/src/Adapter/SearchEngine/QueryHandler/GetSearchEngineForEditingHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\SearchEngine\QueryHandler;
 
 use PrestaShop\PrestaShop\Adapter\SearchEngine\AbstractSearchEngineHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\SearchEngine\Exception\SearchEngineException;
 use PrestaShop\PrestaShop\Core\Domain\SearchEngine\Query\GetSearchEngineForEditing;
 use PrestaShop\PrestaShop\Core\Domain\SearchEngine\QueryHandler\GetSearchEngineForEditingHandlerInterface;
@@ -37,6 +38,7 @@
 /**
  * Handles query what gets search engine for editing.
  */
+#[AsQueryHandler]
 final class GetSearchEngineForEditingHandler extends AbstractSearchEngineHandler implements GetSearchEngineForEditingHandlerInterface
 {
     /**
diff --git a/src/Adapter/Security/CommandHandler/BulkDeleteCustomerSessionsHandler.php b/src/Adapter/Security/CommandHandler/BulkDeleteCustomerSessionsHandler.php
index 4209198fb9242..3be961f464e76 100644
--- a/src/Adapter/Security/CommandHandler/BulkDeleteCustomerSessionsHandler.php
+++ b/src/Adapter/Security/CommandHandler/BulkDeleteCustomerSessionsHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Security\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Session\Repository\CustomerSessionRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Security\Command\BulkDeleteCustomerSessionsCommand;
 use PrestaShop\PrestaShop\Core\Domain\Security\CommandHandler\BulkDeleteCustomerSessionsHandlerInterface;
 
@@ -37,6 +38,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class BulkDeleteCustomerSessionsHandler implements BulkDeleteCustomerSessionsHandlerInterface
 {
     /**
diff --git a/src/Adapter/Security/CommandHandler/BulkDeleteEmployeeSessionsHandler.php b/src/Adapter/Security/CommandHandler/BulkDeleteEmployeeSessionsHandler.php
index 6cf7e737196ef..8a3c045ce28ff 100644
--- a/src/Adapter/Security/CommandHandler/BulkDeleteEmployeeSessionsHandler.php
+++ b/src/Adapter/Security/CommandHandler/BulkDeleteEmployeeSessionsHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Security\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Session\Repository\EmployeeSessionRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Security\Command\BulkDeleteEmployeeSessionsCommand;
 use PrestaShop\PrestaShop\Core\Domain\Security\CommandHandler\BulkDeleteEmployeeSessionsHandlerInterface;
 
@@ -37,6 +38,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class BulkDeleteEmployeeSessionsHandler implements BulkDeleteEmployeeSessionsHandlerInterface
 {
     /**
diff --git a/src/Adapter/Security/CommandHandler/ClearOutdatedCustomerSessionHandler.php b/src/Adapter/Security/CommandHandler/ClearOutdatedCustomerSessionHandler.php
index 9fc280f1a6100..af02e3f64cb0e 100644
--- a/src/Adapter/Security/CommandHandler/ClearOutdatedCustomerSessionHandler.php
+++ b/src/Adapter/Security/CommandHandler/ClearOutdatedCustomerSessionHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Security\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Session\Repository\CustomerSessionRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Security\Command\ClearOutdatedCustomerSessionCommand;
 use PrestaShop\PrestaShop\Core\Domain\Security\CommandHandler\ClearOutdatedCustomerSessionHandlerInterface;
 
@@ -37,6 +38,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 class ClearOutdatedCustomerSessionHandler implements ClearOutdatedCustomerSessionHandlerInterface
 {
     /**
diff --git a/src/Adapter/Security/CommandHandler/ClearOutdatedEmployeeSessionHandler.php b/src/Adapter/Security/CommandHandler/ClearOutdatedEmployeeSessionHandler.php
index a3b3d34d80ba7..a298a925b8eb6 100644
--- a/src/Adapter/Security/CommandHandler/ClearOutdatedEmployeeSessionHandler.php
+++ b/src/Adapter/Security/CommandHandler/ClearOutdatedEmployeeSessionHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Security\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Session\Repository\EmployeeSessionRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Security\Command\ClearOutdatedEmployeeSessionCommand;
 use PrestaShop\PrestaShop\Core\Domain\Security\CommandHandler\ClearOutdatedEmployeeSessionHandlerInterface;
 
@@ -37,6 +38,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 class ClearOutdatedEmployeeSessionHandler implements ClearOutdatedEmployeeSessionHandlerInterface
 {
     /**
diff --git a/src/Adapter/Security/CommandHandler/DeleteCustomerSessionHandler.php b/src/Adapter/Security/CommandHandler/DeleteCustomerSessionHandler.php
index dc39a67982744..8ebb5901f53ea 100644
--- a/src/Adapter/Security/CommandHandler/DeleteCustomerSessionHandler.php
+++ b/src/Adapter/Security/CommandHandler/DeleteCustomerSessionHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Security\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Session\Repository\CustomerSessionRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Security\Command\DeleteCustomerSessionCommand;
 use PrestaShop\PrestaShop\Core\Domain\Security\CommandHandler\DeleteCustomerSessionHandlerInterface;
 
@@ -37,6 +38,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class DeleteCustomerSessionHandler implements DeleteCustomerSessionHandlerInterface
 {
     /**
diff --git a/src/Adapter/Security/CommandHandler/DeleteEmployeeSessionHandler.php b/src/Adapter/Security/CommandHandler/DeleteEmployeeSessionHandler.php
index 518f124e81dc1..da498055ea2e1 100644
--- a/src/Adapter/Security/CommandHandler/DeleteEmployeeSessionHandler.php
+++ b/src/Adapter/Security/CommandHandler/DeleteEmployeeSessionHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Security\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Session\Repository\EmployeeSessionRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Security\Command\DeleteEmployeeSessionCommand;
 use PrestaShop\PrestaShop\Core\Domain\Security\CommandHandler\DeleteEmployeeSessionHandlerInterface;
 
@@ -37,6 +38,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class DeleteEmployeeSessionHandler implements DeleteEmployeeSessionHandlerInterface
 {
     /**
diff --git a/src/Adapter/Shop/CommandHandler/UploadLogosHandler.php b/src/Adapter/Shop/CommandHandler/UploadLogosHandler.php
index 0e23e392038e4..c4a953d803342 100644
--- a/src/Adapter/Shop/CommandHandler/UploadLogosHandler.php
+++ b/src/Adapter/Shop/CommandHandler/UploadLogosHandler.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Shop\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\ConfigurationInterface;
 use PrestaShop\PrestaShop\Core\Domain\Exception\FileUploadException;
 use PrestaShop\PrestaShop\Core\Domain\Shop\Command\UploadLogosCommand;
@@ -40,6 +41,7 @@
 /**
  * Class UploadLogosHandler
  */
+#[AsCommandHandler]
 final class UploadLogosHandler implements UploadLogosHandlerInterface
 {
     /**
diff --git a/src/Adapter/Shop/QueryHandler/GetLogosPathsHandler.php b/src/Adapter/Shop/QueryHandler/GetLogosPathsHandler.php
index 95d79639ec9a0..7180e3626f59e 100644
--- a/src/Adapter/Shop/QueryHandler/GetLogosPathsHandler.php
+++ b/src/Adapter/Shop/QueryHandler/GetLogosPathsHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Shop\QueryHandler;
 
 use Configuration;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Shop\Query\GetLogosPaths;
 use PrestaShop\PrestaShop\Core\Domain\Shop\QueryHandler\GetLogosPathsHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Shop\QueryResult\LogosPaths;
@@ -34,6 +35,7 @@
 /**
  * Responsible for providing header, email, invoice and favicon logo paths for specific shop context.
  */
+#[AsQueryHandler]
 final class GetLogosPathsHandler implements GetLogosPathsHandlerInterface
 {
     /**
diff --git a/src/Adapter/Shop/QueryHandler/SearchShopsHandler.php b/src/Adapter/Shop/QueryHandler/SearchShopsHandler.php
index 2765811e2a20b..5b58aee6d4709 100644
--- a/src/Adapter/Shop/QueryHandler/SearchShopsHandler.php
+++ b/src/Adapter/Shop/QueryHandler/SearchShopsHandler.php
@@ -28,6 +28,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Shop\QueryHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Shop\Query\SearchShops;
 use PrestaShop\PrestaShop\Core\Domain\Shop\QueryHandler\SearchShopsHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Shop\QueryResult\FoundShop;
@@ -38,6 +39,7 @@
 /**
  * Responsible for getting shops for a given search term.
  */
+#[AsQueryHandler]
 final class SearchShopsHandler implements SearchShopsHandlerInterface
 {
     /**
diff --git a/src/Adapter/SqlManager/CommandHandler/AddSqlRequestHandler.php b/src/Adapter/SqlManager/CommandHandler/AddSqlRequestHandler.php
index 467a4b69ddd26..365093388aa71 100644
--- a/src/Adapter/SqlManager/CommandHandler/AddSqlRequestHandler.php
+++ b/src/Adapter/SqlManager/CommandHandler/AddSqlRequestHandler.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\SqlManager\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\AddSqlRequestCommand;
 use PrestaShop\PrestaShop\Core\Domain\SqlManagement\CommandHandler\AddSqlRequestHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\SqlManagement\Exception\CannotAddSqlRequestException;
@@ -39,6 +40,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class AddSqlRequestHandler extends AbstractSqlRequestHandler implements AddSqlRequestHandlerInterface
 {
     /**
diff --git a/src/Adapter/SqlManager/CommandHandler/BulkDeleteSqlRequestHandler.php b/src/Adapter/SqlManager/CommandHandler/BulkDeleteSqlRequestHandler.php
index 3c507a8a814d5..3f7d77b7f2acd 100644
--- a/src/Adapter/SqlManager/CommandHandler/BulkDeleteSqlRequestHandler.php
+++ b/src/Adapter/SqlManager/CommandHandler/BulkDeleteSqlRequestHandler.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\SqlManager\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\BulkDeleteSqlRequestCommand;
 use PrestaShop\PrestaShop\Core\Domain\SqlManagement\CommandHandler\BulkDeleteSqlRequestHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\SqlManagement\Exception\CannotDeleteSqlRequestException;
@@ -36,6 +37,7 @@
 /**
  * Class BulkDeleteSqlRequestHandler handles bulk delete of SqlRequest command.
  */
+#[AsCommandHandler]
 final class BulkDeleteSqlRequestHandler implements BulkDeleteSqlRequestHandlerInterface
 {
     /**
diff --git a/src/Adapter/SqlManager/CommandHandler/DeleteSqlRequestHandler.php b/src/Adapter/SqlManager/CommandHandler/DeleteSqlRequestHandler.php
index ccc5d4eaca829..c7569e5aa7040 100644
--- a/src/Adapter/SqlManager/CommandHandler/DeleteSqlRequestHandler.php
+++ b/src/Adapter/SqlManager/CommandHandler/DeleteSqlRequestHandler.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\SqlManager\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\DeleteSqlRequestCommand;
 use PrestaShop\PrestaShop\Core\Domain\SqlManagement\CommandHandler\DeleteSqlRequestHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\SqlManagement\Exception\CannotDeleteSqlRequestException;
@@ -39,6 +40,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class DeleteSqlRequestHandler implements DeleteSqlRequestHandlerInterface
 {
     /**
diff --git a/src/Adapter/SqlManager/CommandHandler/EditSqlRequestHandler.php b/src/Adapter/SqlManager/CommandHandler/EditSqlRequestHandler.php
index 424deca9721e7..e89c7f6fbd78d 100644
--- a/src/Adapter/SqlManager/CommandHandler/EditSqlRequestHandler.php
+++ b/src/Adapter/SqlManager/CommandHandler/EditSqlRequestHandler.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\SqlManager\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\EditSqlRequestCommand;
 use PrestaShop\PrestaShop\Core\Domain\SqlManagement\CommandHandler\EditSqlRequestHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\SqlManagement\Exception\CannotEditSqlRequestException;
@@ -39,6 +40,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class EditSqlRequestHandler extends AbstractSqlRequestHandler implements EditSqlRequestHandlerInterface
 {
     /**
diff --git a/src/Adapter/SqlManager/QueryHandler/GetDatabaseTableFieldsListHandler.php b/src/Adapter/SqlManager/QueryHandler/GetDatabaseTableFieldsListHandler.php
index f1cdb1f3e2c63..4510a496965cb 100644
--- a/src/Adapter/SqlManager/QueryHandler/GetDatabaseTableFieldsListHandler.php
+++ b/src/Adapter/SqlManager/QueryHandler/GetDatabaseTableFieldsListHandler.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\SqlManager\QueryHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\SqlManagement\DatabaseTableFields;
 use PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetDatabaseTableFieldsList;
 use PrestaShop\PrestaShop\Core\Domain\SqlManagement\QueryHandler\GetDatabaseTableFieldsListHandlerInterface;
@@ -37,6 +38,7 @@
  *
  * @internal
  */
+#[AsQueryHandler]
 final class GetDatabaseTableFieldsListHandler implements GetDatabaseTableFieldsListHandlerInterface
 {
     /**
diff --git a/src/Adapter/SqlManager/QueryHandler/GetDatabaseTablesListHandler.php b/src/Adapter/SqlManager/QueryHandler/GetDatabaseTablesListHandler.php
index 5653832f5aa2e..aa1023543066c 100644
--- a/src/Adapter/SqlManager/QueryHandler/GetDatabaseTablesListHandler.php
+++ b/src/Adapter/SqlManager/QueryHandler/GetDatabaseTablesListHandler.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\SqlManager\QueryHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\SqlManagement\DatabaseTablesList;
 use PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetDatabaseTablesList;
 use PrestaShop\PrestaShop\Core\Domain\SqlManagement\QueryHandler\GetDatabaseTablesListHandlerInterface;
@@ -36,6 +37,7 @@
  *
  * @internal
  */
+#[AsQueryHandler]
 final class GetDatabaseTablesListHandler implements GetDatabaseTablesListHandlerInterface
 {
     /**
diff --git a/src/Adapter/SqlManager/QueryHandler/GetSqlRequestExecutionResultHandler.php b/src/Adapter/SqlManager/QueryHandler/GetSqlRequestExecutionResultHandler.php
index 96c336d476ddd..25c56567ef01c 100644
--- a/src/Adapter/SqlManager/QueryHandler/GetSqlRequestExecutionResultHandler.php
+++ b/src/Adapter/SqlManager/QueryHandler/GetSqlRequestExecutionResultHandler.php
@@ -28,6 +28,7 @@
 
 use Db;
 use PHPSQLParser\PHPSQLParser;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\SqlManagement\Exception\SqlRequestException;
 use PrestaShop\PrestaShop\Core\Domain\SqlManagement\Exception\SqlRequestNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetSqlRequestExecutionResult;
@@ -41,6 +42,7 @@
  *
  * @internal
  */
+#[AsQueryHandler]
 final class GetSqlRequestExecutionResultHandler implements GetSqlRequestExecutionResultHandlerInterface
 {
     /**
diff --git a/src/Adapter/SqlManager/QueryHandler/GetSqlRequestForEditingHandler.php b/src/Adapter/SqlManager/QueryHandler/GetSqlRequestForEditingHandler.php
index 10a65ae90c2bb..9746c320f69da 100644
--- a/src/Adapter/SqlManager/QueryHandler/GetSqlRequestForEditingHandler.php
+++ b/src/Adapter/SqlManager/QueryHandler/GetSqlRequestForEditingHandler.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\SqlManager\QueryHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\SqlManagement\EditableSqlRequest;
 use PrestaShop\PrestaShop\Core\Domain\SqlManagement\Exception\SqlRequestException;
 use PrestaShop\PrestaShop\Core\Domain\SqlManagement\Exception\SqlRequestNotFoundException;
@@ -39,6 +40,7 @@
  *
  * @internal
  */
+#[AsQueryHandler]
 final class GetSqlRequestForEditingHandler implements GetSqlRequestForEditingHandlerInterface
 {
     /**
diff --git a/src/Adapter/State/CommandHandler/AddStateHandler.php b/src/Adapter/State/CommandHandler/AddStateHandler.php
index 329ba3f3211b3..fd9cd42defb4f 100644
--- a/src/Adapter/State/CommandHandler/AddStateHandler.php
+++ b/src/Adapter/State/CommandHandler/AddStateHandler.php
@@ -28,6 +28,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\State\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\State\Command\AddStateCommand;
 use PrestaShop\PrestaShop\Core\Domain\State\CommandHandler\AddStateHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\State\Exception\CannotAddStateException;
@@ -40,6 +41,7 @@
 /**
  * Handles creation of state
  */
+#[AsCommandHandler]
 class AddStateHandler implements AddStateHandlerInterface
 {
     /**
diff --git a/src/Adapter/State/CommandHandler/BulkDeleteStateHandler.php b/src/Adapter/State/CommandHandler/BulkDeleteStateHandler.php
index 1d36f905c1847..bb0cdb085d05c 100644
--- a/src/Adapter/State/CommandHandler/BulkDeleteStateHandler.php
+++ b/src/Adapter/State/CommandHandler/BulkDeleteStateHandler.php
@@ -28,6 +28,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\State\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\State\Command\BulkDeleteStateCommand;
 use PrestaShop\PrestaShop\Core\Domain\State\CommandHandler\BulkDeleteStateHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\State\Exception\DeleteStateException;
@@ -37,6 +38,7 @@
 /**
  * Handles command that bulk delete states
  */
+#[AsCommandHandler]
 class BulkDeleteStateHandler implements BulkDeleteStateHandlerInterface
 {
     /**
diff --git a/src/Adapter/State/CommandHandler/BulkToggleStateStatusHandler.php b/src/Adapter/State/CommandHandler/BulkToggleStateStatusHandler.php
index 2468953f784fc..c620b896cef3f 100644
--- a/src/Adapter/State/CommandHandler/BulkToggleStateStatusHandler.php
+++ b/src/Adapter/State/CommandHandler/BulkToggleStateStatusHandler.php
@@ -28,6 +28,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\State\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\State\Command\BulkToggleStateStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\State\CommandHandler\BulkToggleStateStatusHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\State\Exception\CannotToggleStateStatusException;
@@ -39,6 +40,7 @@
 /**
  * Handles command that toggles states status in bulk action
  */
+#[AsCommandHandler]
 class BulkToggleStateStatusHandler implements BulkToggleStateStatusHandlerInterface
 {
     /**
diff --git a/src/Adapter/State/CommandHandler/DeleteStateHandler.php b/src/Adapter/State/CommandHandler/DeleteStateHandler.php
index 9e1f015d9257a..97192c88dc775 100644
--- a/src/Adapter/State/CommandHandler/DeleteStateHandler.php
+++ b/src/Adapter/State/CommandHandler/DeleteStateHandler.php
@@ -28,6 +28,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\State\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\State\Command\DeleteStateCommand;
 use PrestaShop\PrestaShop\Core\Domain\State\CommandHandler\DeleteStateHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\State\Exception\DeleteStateException;
@@ -37,6 +38,7 @@
 /**
  * Handles command that delete state
  */
+#[AsCommandHandler]
 class DeleteStateHandler implements DeleteStateHandlerInterface
 {
     /**
diff --git a/src/Adapter/State/CommandHandler/EditStateHandler.php b/src/Adapter/State/CommandHandler/EditStateHandler.php
index 67f5805c1ae2f..5f6b1bb47ce0a 100644
--- a/src/Adapter/State/CommandHandler/EditStateHandler.php
+++ b/src/Adapter/State/CommandHandler/EditStateHandler.php
@@ -28,6 +28,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\State\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\State\Command\EditStateCommand;
 use PrestaShop\PrestaShop\Core\Domain\State\CommandHandler\EditStateHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\State\Exception\CannotUpdateStateException;
@@ -41,6 +42,7 @@
 /**
  * Handles state editing
  */
+#[AsCommandHandler]
 class EditStateHandler implements EditStateHandlerInterface
 {
     /**
diff --git a/src/Adapter/State/CommandHandler/ToggleStateStatusHandler.php b/src/Adapter/State/CommandHandler/ToggleStateStatusHandler.php
index b283df8436ec4..d1da3ed45d3b1 100644
--- a/src/Adapter/State/CommandHandler/ToggleStateStatusHandler.php
+++ b/src/Adapter/State/CommandHandler/ToggleStateStatusHandler.php
@@ -28,6 +28,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\State\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\State\Command\ToggleStateStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\State\CommandHandler\ToggleStateStatusHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\State\Exception\CannotToggleStateStatusException;
@@ -36,6 +37,7 @@
 use PrestaShopException;
 use State;
 
+#[AsCommandHandler]
 class ToggleStateStatusHandler implements ToggleStateStatusHandlerInterface
 {
     /**
diff --git a/src/Adapter/State/QueryHandler/GetStateForEditingHandler.php b/src/Adapter/State/QueryHandler/GetStateForEditingHandler.php
index 62f90974520f1..3d08861a0ab5a 100644
--- a/src/Adapter/State/QueryHandler/GetStateForEditingHandler.php
+++ b/src/Adapter/State/QueryHandler/GetStateForEditingHandler.php
@@ -28,6 +28,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\State\QueryHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Country\ValueObject\CountryId;
 use PrestaShop\PrestaShop\Core\Domain\State\Exception\StateNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\State\Query\GetStateForEditing;
@@ -41,6 +42,7 @@
  *
  * @internal
  */
+#[AsQueryHandler]
 class GetStateForEditingHandler implements GetStateForEditingHandlerInterface
 {
     /**
diff --git a/src/Adapter/Store/CommandHandler/BulkDeleteStoreHandler.php b/src/Adapter/Store/CommandHandler/BulkDeleteStoreHandler.php
index 8de1668c12700..d92d92426e29e 100644
--- a/src/Adapter/Store/CommandHandler/BulkDeleteStoreHandler.php
+++ b/src/Adapter/Store/CommandHandler/BulkDeleteStoreHandler.php
@@ -28,6 +28,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Store\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Store\Command\BulkDeleteStoreCommand;
 use PrestaShop\PrestaShop\Core\Domain\Store\CommandHandler\BulkDeleteStoreHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Store\Exception\CannotDeleteStoreException;
@@ -36,6 +37,7 @@
 /**
  * Handles command that deletes stores
  */
+#[AsCommandHandler]
 class BulkDeleteStoreHandler implements BulkDeleteStoreHandlerInterface
 {
     /**
diff --git a/src/Adapter/Store/CommandHandler/BulkUpdateStoreStatusHandler.php b/src/Adapter/Store/CommandHandler/BulkUpdateStoreStatusHandler.php
index a7320ef8d196d..2e189ed09dbf6 100644
--- a/src/Adapter/Store/CommandHandler/BulkUpdateStoreStatusHandler.php
+++ b/src/Adapter/Store/CommandHandler/BulkUpdateStoreStatusHandler.php
@@ -28,6 +28,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Store\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Store\Command\BulkUpdateStoreStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\Store\CommandHandler\BulkUpdateStoreStatusHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Store\Exception\CannotToggleStoreStatusException;
@@ -36,6 +37,7 @@
 /**
  * Handles command that toggle store status
  */
+#[AsCommandHandler]
 class BulkUpdateStoreStatusHandler implements BulkUpdateStoreStatusHandlerInterface
 {
     /**
diff --git a/src/Adapter/Store/CommandHandler/DeleteStoreHandler.php b/src/Adapter/Store/CommandHandler/DeleteStoreHandler.php
index 56d1deff10242..f937609ab761c 100644
--- a/src/Adapter/Store/CommandHandler/DeleteStoreHandler.php
+++ b/src/Adapter/Store/CommandHandler/DeleteStoreHandler.php
@@ -28,6 +28,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Store\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Store\Command\DeleteStoreCommand;
 use PrestaShop\PrestaShop\Core\Domain\Store\CommandHandler\DeleteStoreHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Store\Repository\StoreRepository;
@@ -35,6 +36,7 @@
 /**
  * Handles command that deletes store
  */
+#[AsCommandHandler]
 class DeleteStoreHandler implements DeleteStoreHandlerInterface
 {
     /**
diff --git a/src/Adapter/Store/CommandHandler/ToggleStoreStatusHandler.php b/src/Adapter/Store/CommandHandler/ToggleStoreStatusHandler.php
index 0121edca93d47..be5a5ee81a9ac 100644
--- a/src/Adapter/Store/CommandHandler/ToggleStoreStatusHandler.php
+++ b/src/Adapter/Store/CommandHandler/ToggleStoreStatusHandler.php
@@ -28,6 +28,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Store\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Store\Command\ToggleStoreStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\Store\CommandHandler\ToggleStoreStatusHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Store\Exception\CannotToggleStoreStatusException;
@@ -36,6 +37,7 @@
 /**
  * Handles command that toggle store status
  */
+#[AsCommandHandler]
 class ToggleStoreStatusHandler implements ToggleStoreStatusHandlerInterface
 {
     /**
diff --git a/src/Adapter/Store/QueryHandler/GetStoreForEditingHandler.php b/src/Adapter/Store/QueryHandler/GetStoreForEditingHandler.php
index 5f53e71622d5f..c9dc4a8d707fe 100644
--- a/src/Adapter/Store/QueryHandler/GetStoreForEditingHandler.php
+++ b/src/Adapter/Store/QueryHandler/GetStoreForEditingHandler.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Store\QueryHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Store\Exception\StoreException;
 use PrestaShop\PrestaShop\Core\Domain\Store\Exception\StoreNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Store\Query\GetStoreForEditing;
@@ -34,6 +35,7 @@
 use PrestaShop\PrestaShop\Core\Domain\Store\Repository\StoreRepository;
 use PrestaShopException;
 
+#[AsQueryHandler]
 class GetStoreForEditingHandler implements GetStoreForEditingHandlerInterface
 {
     /**
diff --git a/src/Adapter/Supplier/CommandHandler/AddSupplierHandler.php b/src/Adapter/Supplier/CommandHandler/AddSupplierHandler.php
index 9976b04dd7b83..0d486ad3471b5 100644
--- a/src/Adapter/Supplier/CommandHandler/AddSupplierHandler.php
+++ b/src/Adapter/Supplier/CommandHandler/AddSupplierHandler.php
@@ -29,6 +29,7 @@
 
 use Address;
 use PrestaShop\PrestaShop\Adapter\Supplier\AbstractSupplierHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Supplier\Command\AddSupplierCommand;
 use PrestaShop\PrestaShop\Core\Domain\Supplier\CommandHandler\AddSupplierHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Supplier\Exception\SupplierException;
@@ -40,6 +41,7 @@
 /**
  * Handles command which adds new supplier using legacy object model
  */
+#[AsCommandHandler]
 final class AddSupplierHandler extends AbstractSupplierHandler implements AddSupplierHandlerInterface
 {
     /**
diff --git a/src/Adapter/Supplier/CommandHandler/BulkDeleteSupplierHandler.php b/src/Adapter/Supplier/CommandHandler/BulkDeleteSupplierHandler.php
index dc670ff8fbb49..02ae51ddd211b 100644
--- a/src/Adapter/Supplier/CommandHandler/BulkDeleteSupplierHandler.php
+++ b/src/Adapter/Supplier/CommandHandler/BulkDeleteSupplierHandler.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Supplier\Command\BulkDeleteSupplierCommand;
 use PrestaShop\PrestaShop\Core\Domain\Supplier\CommandHandler\BulkDeleteSupplierHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Supplier\Exception\CannotDeleteSupplierException;
@@ -34,6 +35,7 @@
 /**
  * Class BulkDeleteSupplierHandler is responsible for deleting multiple suppliers.
  */
+#[AsCommandHandler]
 final class BulkDeleteSupplierHandler extends AbstractDeleteSupplierHandler implements BulkDeleteSupplierHandlerInterface
 {
     /**
diff --git a/src/Adapter/Supplier/CommandHandler/BulkDisableSupplierHandler.php b/src/Adapter/Supplier/CommandHandler/BulkDisableSupplierHandler.php
index 0cbc86f5ccacd..a68278713cc51 100644
--- a/src/Adapter/Supplier/CommandHandler/BulkDisableSupplierHandler.php
+++ b/src/Adapter/Supplier/CommandHandler/BulkDisableSupplierHandler.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Supplier\Command\BulkDisableSupplierCommand;
 use PrestaShop\PrestaShop\Core\Domain\Supplier\CommandHandler\BulkDisableSupplierHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Supplier\Exception\CannotUpdateSupplierStatusException;
@@ -37,6 +38,7 @@
 /**
  * Class BulkDisableSupplierHandler is responsible for disabling multiple suppliers.
  */
+#[AsCommandHandler]
 final class BulkDisableSupplierHandler implements BulkDisableSupplierHandlerInterface
 {
     /**
diff --git a/src/Adapter/Supplier/CommandHandler/BulkEnableSupplierHandler.php b/src/Adapter/Supplier/CommandHandler/BulkEnableSupplierHandler.php
index 47524f48beb7e..dccc2888be505 100644
--- a/src/Adapter/Supplier/CommandHandler/BulkEnableSupplierHandler.php
+++ b/src/Adapter/Supplier/CommandHandler/BulkEnableSupplierHandler.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Supplier\Command\BulkEnableSupplierCommand;
 use PrestaShop\PrestaShop\Core\Domain\Supplier\CommandHandler\BulkEnableSupplierHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Supplier\Exception\CannotUpdateSupplierStatusException;
@@ -37,6 +38,7 @@
 /**
  * Class BulkEnableSupplierHandler is responsible for enabling multiple suppliers.
  */
+#[AsCommandHandler]
 final class BulkEnableSupplierHandler implements BulkEnableSupplierHandlerInterface
 {
     /**
diff --git a/src/Adapter/Supplier/CommandHandler/DeleteSupplierHandler.php b/src/Adapter/Supplier/CommandHandler/DeleteSupplierHandler.php
index 9720236f90b76..10d69b807c5bc 100644
--- a/src/Adapter/Supplier/CommandHandler/DeleteSupplierHandler.php
+++ b/src/Adapter/Supplier/CommandHandler/DeleteSupplierHandler.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Supplier\Command\DeleteSupplierCommand;
 use PrestaShop\PrestaShop\Core\Domain\Supplier\CommandHandler\DeleteSupplierHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Supplier\Exception\CannotDeleteSupplierException;
@@ -34,6 +35,7 @@
 /**
  * Class DeleteSupplierHandler is responsible for deleting the supplier.
  */
+#[AsCommandHandler]
 final class DeleteSupplierHandler extends AbstractDeleteSupplierHandler implements DeleteSupplierHandlerInterface
 {
     /**
diff --git a/src/Adapter/Supplier/CommandHandler/DeleteSupplierLogoImageHandler.php b/src/Adapter/Supplier/CommandHandler/DeleteSupplierLogoImageHandler.php
index 1688223de7132..9b6b5427ce5ec 100644
--- a/src/Adapter/Supplier/CommandHandler/DeleteSupplierLogoImageHandler.php
+++ b/src/Adapter/Supplier/CommandHandler/DeleteSupplierLogoImageHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler;
 
 use ImageType;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Supplier\Command\DeleteSupplierLogoImageCommand;
 use PrestaShop\PrestaShop\Core\Domain\Supplier\CommandHandler\DeleteSupplierLogoImageHandlerInterface;
 use Symfony\Component\Filesystem\Filesystem;
@@ -36,6 +37,7 @@
 /**
  * Handles command which deletes supplier cover image using legacy object model
  */
+#[AsCommandHandler]
 class DeleteSupplierLogoImageHandler implements DeleteSupplierLogoImageHandlerInterface
 {
     /**
diff --git a/src/Adapter/Supplier/CommandHandler/EditSupplierHandler.php b/src/Adapter/Supplier/CommandHandler/EditSupplierHandler.php
index 93c051d3b2ae3..8968553d6de74 100644
--- a/src/Adapter/Supplier/CommandHandler/EditSupplierHandler.php
+++ b/src/Adapter/Supplier/CommandHandler/EditSupplierHandler.php
@@ -29,6 +29,7 @@
 
 use Address;
 use PrestaShop\PrestaShop\Adapter\Supplier\AbstractSupplierHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Supplier\Command\EditSupplierCommand;
 use PrestaShop\PrestaShop\Core\Domain\Supplier\CommandHandler\EditSupplierHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Supplier\Exception\SupplierException;
@@ -38,6 +39,7 @@
 /**
  * Handles command which edits supplier using legacy object model
  */
+#[AsCommandHandler]
 final class EditSupplierHandler extends AbstractSupplierHandler implements EditSupplierHandlerInterface
 {
     /**
diff --git a/src/Adapter/Supplier/CommandHandler/ToggleSupplierStatusHandler.php b/src/Adapter/Supplier/CommandHandler/ToggleSupplierStatusHandler.php
index fc6de9d795160..7c945450e1ba4 100644
--- a/src/Adapter/Supplier/CommandHandler/ToggleSupplierStatusHandler.php
+++ b/src/Adapter/Supplier/CommandHandler/ToggleSupplierStatusHandler.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Supplier\Command\ToggleSupplierStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\Supplier\CommandHandler\ToggleSupplierStatusHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Supplier\Exception\CannotToggleSupplierStatusException;
@@ -37,6 +38,7 @@
 /**
  * Class ToggleSupplierStatusHandler is responsible for toggling supplier status.
  */
+#[AsCommandHandler]
 final class ToggleSupplierStatusHandler implements ToggleSupplierStatusHandlerInterface
 {
     /**
diff --git a/src/Adapter/Supplier/QueryHandler/GetSupplierForEditingHandler.php b/src/Adapter/Supplier/QueryHandler/GetSupplierForEditingHandler.php
index 9a90814dc48dd..c6d5afa3be7ed 100644
--- a/src/Adapter/Supplier/QueryHandler/GetSupplierForEditingHandler.php
+++ b/src/Adapter/Supplier/QueryHandler/GetSupplierForEditingHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Supplier\QueryHandler;
 
 use PrestaShop\PrestaShop\Adapter\Supplier\AbstractSupplierHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Supplier\Query\GetSupplierForEditing;
 use PrestaShop\PrestaShop\Core\Domain\Supplier\QueryHandler\GetSupplierForEditingHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Supplier\QueryResult\EditableSupplier;
@@ -35,6 +36,7 @@
 /**
  * Handles query which gets supplier for editing
  */
+#[AsQueryHandler]
 final class GetSupplierForEditingHandler extends AbstractSupplierHandler implements GetSupplierForEditingHandlerInterface
 {
     /**
diff --git a/src/Adapter/Supplier/QueryHandler/GetSupplierForViewingHandler.php b/src/Adapter/Supplier/QueryHandler/GetSupplierForViewingHandler.php
index 386bd7a383e34..bd622951c413f 100644
--- a/src/Adapter/Supplier/QueryHandler/GetSupplierForViewingHandler.php
+++ b/src/Adapter/Supplier/QueryHandler/GetSupplierForViewingHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Supplier\QueryHandler;
 
 use Currency;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Language\ValueObject\LanguageId;
 use PrestaShop\PrestaShop\Core\Domain\Supplier\Exception\SupplierException;
 use PrestaShop\PrestaShop\Core\Domain\Supplier\Exception\SupplierNotFoundException;
@@ -42,6 +43,7 @@
 /**
  * Handles query which gets supplier for viewing
  */
+#[AsQueryHandler]
 final class GetSupplierForViewingHandler implements GetSupplierForViewingHandlerInterface
 {
     /**
diff --git a/src/Adapter/Tab/CommandHandler/UpdateTabStatusByClassNameHandler.php b/src/Adapter/Tab/CommandHandler/UpdateTabStatusByClassNameHandler.php
index 13950d8f6a87e..c07961a508db6 100644
--- a/src/Adapter/Tab/CommandHandler/UpdateTabStatusByClassNameHandler.php
+++ b/src/Adapter/Tab/CommandHandler/UpdateTabStatusByClassNameHandler.php
@@ -29,11 +29,13 @@
 namespace PrestaShop\PrestaShop\Adapter\Tab\CommandHandler;
 
 use Doctrine\ORM\EntityManager;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Tab\Command\UpdateTabStatusByClassNameCommand;
 use PrestaShop\PrestaShop\Core\Domain\Tab\CommandHandler\UpdateTabStatusByClassNameHandlerInterface;
 use PrestaShopBundle\Entity\Repository\TabRepository;
 use PrestaShopBundle\Entity\Tab;
 
+#[AsCommandHandler]
 class UpdateTabStatusByClassNameHandler implements UpdateTabStatusByClassNameHandlerInterface
 {
     /**
diff --git a/src/Adapter/Tax/CommandHandler/AddTaxHandler.php b/src/Adapter/Tax/CommandHandler/AddTaxHandler.php
index 4517770641e2a..306cd50527db0 100644
--- a/src/Adapter/Tax/CommandHandler/AddTaxHandler.php
+++ b/src/Adapter/Tax/CommandHandler/AddTaxHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Tax\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Tax\AbstractTaxHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Tax\Command\AddTaxCommand;
 use PrestaShop\PrestaShop\Core\Domain\Tax\CommandHandler\AddTaxHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Tax\Exception\TaxException;
@@ -37,6 +38,7 @@
 /**
  * Handles command which is responsible for tax editing
  */
+#[AsCommandHandler]
 final class AddTaxHandler extends AbstractTaxHandler implements AddTaxHandlerInterface
 {
     /**
diff --git a/src/Adapter/Tax/CommandHandler/BulkDeleteTaxHandler.php b/src/Adapter/Tax/CommandHandler/BulkDeleteTaxHandler.php
index d41f4679c2668..348cf576272cc 100644
--- a/src/Adapter/Tax/CommandHandler/BulkDeleteTaxHandler.php
+++ b/src/Adapter/Tax/CommandHandler/BulkDeleteTaxHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Tax\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Tax\AbstractTaxHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Tax\Command\BulkDeleteTaxCommand;
 use PrestaShop\PrestaShop\Core\Domain\Tax\CommandHandler\BulkDeleteTaxHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Tax\Exception\DeleteTaxException;
@@ -36,6 +37,7 @@
 /**
  * Handles command which deletes Taxes on bulk action using legacy object model
  */
+#[AsCommandHandler]
 final class BulkDeleteTaxHandler extends AbstractTaxHandler implements BulkDeleteTaxHandlerInterface
 {
     /**
diff --git a/src/Adapter/Tax/CommandHandler/BulkToggleTaxStatusHandler.php b/src/Adapter/Tax/CommandHandler/BulkToggleTaxStatusHandler.php
index c4ece4709f128..4ff7e631fb940 100644
--- a/src/Adapter/Tax/CommandHandler/BulkToggleTaxStatusHandler.php
+++ b/src/Adapter/Tax/CommandHandler/BulkToggleTaxStatusHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Tax\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Tax\AbstractTaxHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Tax\Command\BulkToggleTaxStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\Tax\CommandHandler\BulkToggleTaxStatusHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Tax\Exception\TaxException;
@@ -36,6 +37,7 @@
 /**
  * Handles command which toggles taxes status on bulk action using legacy object model
  */
+#[AsCommandHandler]
 final class BulkToggleTaxStatusHandler extends AbstractTaxHandler implements BulkToggleTaxStatusHandlerInterface
 {
     /**
diff --git a/src/Adapter/Tax/CommandHandler/DeleteTaxHandler.php b/src/Adapter/Tax/CommandHandler/DeleteTaxHandler.php
index e67e358a84eea..ce388e52722c1 100644
--- a/src/Adapter/Tax/CommandHandler/DeleteTaxHandler.php
+++ b/src/Adapter/Tax/CommandHandler/DeleteTaxHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Tax\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Tax\AbstractTaxHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Tax\Command\DeleteTaxCommand;
 use PrestaShop\PrestaShop\Core\Domain\Tax\CommandHandler\DeleteTaxHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Tax\Exception\DeleteTaxException;
@@ -36,6 +37,7 @@
 /**
  * Handles command which deletes Tax using legacy object model
  */
+#[AsCommandHandler]
 final class DeleteTaxHandler extends AbstractTaxHandler implements DeleteTaxHandlerInterface
 {
     /**
diff --git a/src/Adapter/Tax/CommandHandler/EditTaxHandler.php b/src/Adapter/Tax/CommandHandler/EditTaxHandler.php
index a55f3dbab6d8b..eed604bf70bf8 100644
--- a/src/Adapter/Tax/CommandHandler/EditTaxHandler.php
+++ b/src/Adapter/Tax/CommandHandler/EditTaxHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Tax\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Tax\AbstractTaxHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Tax\Command\EditTaxCommand;
 use PrestaShop\PrestaShop\Core\Domain\Tax\CommandHandler\EditTaxHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Tax\Exception\TaxException;
@@ -36,6 +37,7 @@
 /**
  * Handles command which is responsible for tax editing
  */
+#[AsCommandHandler]
 final class EditTaxHandler extends AbstractTaxHandler implements EditTaxHandlerInterface
 {
     /**
diff --git a/src/Adapter/Tax/CommandHandler/ToggleTaxStatusHandler.php b/src/Adapter/Tax/CommandHandler/ToggleTaxStatusHandler.php
index 22f94124e589f..49bc09e498e17 100644
--- a/src/Adapter/Tax/CommandHandler/ToggleTaxStatusHandler.php
+++ b/src/Adapter/Tax/CommandHandler/ToggleTaxStatusHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Tax\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Tax\AbstractTaxHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Tax\Command\ToggleTaxStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\Tax\CommandHandler\ToggleTaxStatusHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Tax\Exception\TaxException;
@@ -36,6 +37,7 @@
 /**
  * Handles command which toggles Tax status using legacy object model
  */
+#[AsCommandHandler]
 final class ToggleTaxStatusHandler extends AbstractTaxHandler implements ToggleTaxStatusHandlerInterface
 {
     /**
diff --git a/src/Adapter/Tax/QueryHandler/GetTaxForEditingHandler.php b/src/Adapter/Tax/QueryHandler/GetTaxForEditingHandler.php
index 0e19942fd7221..d312284a41828 100644
--- a/src/Adapter/Tax/QueryHandler/GetTaxForEditingHandler.php
+++ b/src/Adapter/Tax/QueryHandler/GetTaxForEditingHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Tax\QueryHandler;
 
 use PrestaShop\PrestaShop\Adapter\Tax\AbstractTaxHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Tax\Query\GetTaxForEditing;
 use PrestaShop\PrestaShop\Core\Domain\Tax\QueryHandler\GetTaxForEditingHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Tax\QueryResult\EditableTax;
@@ -34,6 +35,7 @@
 /**
  * Handles query which gets tax for editing
  */
+#[AsQueryHandler]
 final class GetTaxForEditingHandler extends AbstractTaxHandler implements GetTaxForEditingHandlerInterface
 {
     /**
diff --git a/src/Adapter/TaxRulesGroup/CommandHandler/AddTaxRulesGroupHandler.php b/src/Adapter/TaxRulesGroup/CommandHandler/AddTaxRulesGroupHandler.php
index 04b81fdc18d44..d2209710ddc08 100644
--- a/src/Adapter/TaxRulesGroup/CommandHandler/AddTaxRulesGroupHandler.php
+++ b/src/Adapter/TaxRulesGroup/CommandHandler/AddTaxRulesGroupHandler.php
@@ -30,6 +30,7 @@
 
 use PrestaShop\PrestaShop\Adapter\TaxRulesGroup\AbstractTaxRulesGroupHandler;
 use PrestaShop\PrestaShop\Adapter\TaxRulesGroup\Repository\TaxRulesGroupRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopId;
 use PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\AddTaxRulesGroupCommand;
 use PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\CommandHandler\AddTaxRulesGroupHandlerInterface;
@@ -39,6 +40,7 @@
 /**
  * Handles tax rules group addition
  */
+#[AsCommandHandler]
 class AddTaxRulesGroupHandler extends AbstractTaxRulesGroupHandler implements AddTaxRulesGroupHandlerInterface
 {
     /**
diff --git a/src/Adapter/TaxRulesGroup/CommandHandler/BulkDeleteTaxRulesGroupHandler.php b/src/Adapter/TaxRulesGroup/CommandHandler/BulkDeleteTaxRulesGroupHandler.php
index 3a13d923026d1..41b4e7cc00ecf 100644
--- a/src/Adapter/TaxRulesGroup/CommandHandler/BulkDeleteTaxRulesGroupHandler.php
+++ b/src/Adapter/TaxRulesGroup/CommandHandler/BulkDeleteTaxRulesGroupHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\TaxRulesGroup\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\TaxRulesGroup\AbstractTaxRulesGroupHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\BulkDeleteTaxRulesGroupCommand;
 use PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\CommandHandler\BulkDeleteTaxRulesGroupHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Exception\CannotBulkDeleteTaxRulesGroupException;
@@ -35,6 +36,7 @@
 /**
  * Handles multiple tax rules group deletion
  */
+#[AsCommandHandler]
 final class BulkDeleteTaxRulesGroupHandler extends AbstractTaxRulesGroupHandler implements BulkDeleteTaxRulesGroupHandlerInterface
 {
     /**
diff --git a/src/Adapter/TaxRulesGroup/CommandHandler/BulkSetTaxRulesGroupStatusHandler.php b/src/Adapter/TaxRulesGroup/CommandHandler/BulkSetTaxRulesGroupStatusHandler.php
index 9a27e22800bad..ae5e57696646d 100644
--- a/src/Adapter/TaxRulesGroup/CommandHandler/BulkSetTaxRulesGroupStatusHandler.php
+++ b/src/Adapter/TaxRulesGroup/CommandHandler/BulkSetTaxRulesGroupStatusHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\TaxRulesGroup\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\TaxRulesGroup\AbstractTaxRulesGroupHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\BulkSetTaxRulesGroupStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\CommandHandler\BulkToggleTaxRulesGroupStatusHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Exception\CannotBulkUpdateTaxRulesGroupException;
@@ -35,6 +36,7 @@
 /**
  * Handles toggling of multiple tax rules groups statuses
  */
+#[AsCommandHandler]
 final class BulkSetTaxRulesGroupStatusHandler extends AbstractTaxRulesGroupHandler implements BulkToggleTaxRulesGroupStatusHandlerInterface
 {
     /**
diff --git a/src/Adapter/TaxRulesGroup/CommandHandler/DeleteTaxRulesGroupHandler.php b/src/Adapter/TaxRulesGroup/CommandHandler/DeleteTaxRulesGroupHandler.php
index af80ae7f2bdbf..4b94bb321754d 100644
--- a/src/Adapter/TaxRulesGroup/CommandHandler/DeleteTaxRulesGroupHandler.php
+++ b/src/Adapter/TaxRulesGroup/CommandHandler/DeleteTaxRulesGroupHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\TaxRulesGroup\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\TaxRulesGroup\AbstractTaxRulesGroupHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\DeleteTaxRulesGroupCommand;
 use PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\CommandHandler\DeleteTaxRulesGroupHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Exception\CannotDeleteTaxRulesGroupException;
@@ -35,6 +36,7 @@
 /**
  * Handles deletion of single tax rules group
  */
+#[AsCommandHandler]
 final class DeleteTaxRulesGroupHandler extends AbstractTaxRulesGroupHandler implements DeleteTaxRulesGroupHandlerInterface
 {
     /**
diff --git a/src/Adapter/TaxRulesGroup/CommandHandler/EditTaxRulesGroupHandler.php b/src/Adapter/TaxRulesGroup/CommandHandler/EditTaxRulesGroupHandler.php
index 44ba89e43e599..d23caea67fce9 100644
--- a/src/Adapter/TaxRulesGroup/CommandHandler/EditTaxRulesGroupHandler.php
+++ b/src/Adapter/TaxRulesGroup/CommandHandler/EditTaxRulesGroupHandler.php
@@ -30,6 +30,7 @@
 
 use PrestaShop\PrestaShop\Adapter\TaxRulesGroup\AbstractTaxRulesGroupHandler;
 use PrestaShop\PrestaShop\Adapter\TaxRulesGroup\Repository\TaxRulesGroupRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopId;
 use PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\EditTaxRulesGroupCommand;
 use PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\CommandHandler\EditTaxRulesGroupHandlerInterface;
@@ -39,6 +40,7 @@
 /**
  * Handles tax rules group edition
  */
+#[AsCommandHandler]
 class EditTaxRulesGroupHandler extends AbstractTaxRulesGroupHandler implements EditTaxRulesGroupHandlerInterface
 {
     /**
diff --git a/src/Adapter/TaxRulesGroup/CommandHandler/SetTaxRulesGroupStatusHandler.php b/src/Adapter/TaxRulesGroup/CommandHandler/SetTaxRulesGroupStatusHandler.php
index 2fb82ace2edeb..df39cb9e12dbd 100644
--- a/src/Adapter/TaxRulesGroup/CommandHandler/SetTaxRulesGroupStatusHandler.php
+++ b/src/Adapter/TaxRulesGroup/CommandHandler/SetTaxRulesGroupStatusHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\TaxRulesGroup\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\TaxRulesGroup\AbstractTaxRulesGroupHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\SetTaxRulesGroupStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\CommandHandler\ToggleTaxRulesGroupStatusHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Exception\CannotUpdateTaxRulesGroupException;
@@ -36,6 +37,7 @@
 /**
  * Handles tax rules group status toggling
  */
+#[AsCommandHandler]
 final class SetTaxRulesGroupStatusHandler extends AbstractTaxRulesGroupHandler implements ToggleTaxRulesGroupStatusHandlerInterface
 {
     /**
diff --git a/src/Adapter/TaxRulesGroup/QueryHandler/GetTaxRulesGroupForEditingHandler.php b/src/Adapter/TaxRulesGroup/QueryHandler/GetTaxRulesGroupForEditingHandler.php
index 71a4e881a67c8..14497e1258355 100644
--- a/src/Adapter/TaxRulesGroup/QueryHandler/GetTaxRulesGroupForEditingHandler.php
+++ b/src/Adapter/TaxRulesGroup/QueryHandler/GetTaxRulesGroupForEditingHandler.php
@@ -27,6 +27,7 @@
 namespace PrestaShop\PrestaShop\Adapter\TaxRulesGroup\QueryHandler;
 
 use PrestaShop\PrestaShop\Adapter\TaxRulesGroup\AbstractTaxRulesGroupHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Exception\TaxRulesGroupNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Query\GetTaxRulesGroupForEditing;
 use PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\QueryHandler\GetTaxRulesGroupForEditingHandlerInterface;
@@ -35,6 +36,7 @@
 /**
  * Handles query which gets tax rules group for editing
  */
+#[AsQueryHandler]
 final class GetTaxRulesGroupForEditingHandler extends AbstractTaxRulesGroupHandler implements GetTaxRulesGroupForEditingHandlerInterface
 {
     /**
diff --git a/src/Adapter/Title/CommandHandler/AddTitleHandler.php b/src/Adapter/Title/CommandHandler/AddTitleHandler.php
index 0b88a6a2c4410..67944054372eb 100644
--- a/src/Adapter/Title/CommandHandler/AddTitleHandler.php
+++ b/src/Adapter/Title/CommandHandler/AddTitleHandler.php
@@ -30,6 +30,7 @@
 
 use Gender;
 use PrestaShop\PrestaShop\Adapter\Title\AbstractTitleHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Title\Command\AddTitleCommand;
 use PrestaShop\PrestaShop\Core\Domain\Title\CommandHandler\AddTitleHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Title\Exception\TitleException;
@@ -39,6 +40,7 @@
 /**
  * Handles creation of title
  */
+#[AsCommandHandler]
 class AddTitleHandler extends AbstractTitleHandler implements AddTitleHandlerInterface
 {
     /**
diff --git a/src/Adapter/Title/CommandHandler/BulkDeleteTitleHandler.php b/src/Adapter/Title/CommandHandler/BulkDeleteTitleHandler.php
index b4fe35018b173..99c2246fed28a 100644
--- a/src/Adapter/Title/CommandHandler/BulkDeleteTitleHandler.php
+++ b/src/Adapter/Title/CommandHandler/BulkDeleteTitleHandler.php
@@ -29,12 +29,14 @@
 namespace PrestaShop\PrestaShop\Adapter\Title\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Title\AbstractTitleHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Title\Command\BulkDeleteTitleCommand;
 use PrestaShop\PrestaShop\Core\Domain\Title\CommandHandler\BulkDeleteTitleHandlerInterface;
 
 /**
  * Handles command that bulk delete titles
  */
+#[AsCommandHandler]
 class BulkDeleteTitleHandler extends AbstractTitleHandler implements BulkDeleteTitleHandlerInterface
 {
     /**
diff --git a/src/Adapter/Title/CommandHandler/DeleteTitleHandler.php b/src/Adapter/Title/CommandHandler/DeleteTitleHandler.php
index 03e9efd987d4c..fb3a35fac627f 100644
--- a/src/Adapter/Title/CommandHandler/DeleteTitleHandler.php
+++ b/src/Adapter/Title/CommandHandler/DeleteTitleHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Title\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Title\AbstractTitleHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Title\Command\DeleteTitleCommand;
 use PrestaShop\PrestaShop\Core\Domain\Title\CommandHandler\DeleteTitleHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Title\Exception\CannotDeleteTitleException;
@@ -36,6 +37,7 @@
 /**
  * Handles command that delete title
  */
+#[AsCommandHandler]
 class DeleteTitleHandler extends AbstractTitleHandler implements DeleteTitleHandlerInterface
 {
     /**
diff --git a/src/Adapter/Title/CommandHandler/EditTitleHandler.php b/src/Adapter/Title/CommandHandler/EditTitleHandler.php
index cc36b7e7b35ac..b6dce216d3da0 100644
--- a/src/Adapter/Title/CommandHandler/EditTitleHandler.php
+++ b/src/Adapter/Title/CommandHandler/EditTitleHandler.php
@@ -30,6 +30,7 @@
 
 use Gender;
 use PrestaShop\PrestaShop\Adapter\Title\AbstractTitleHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Title\Command\EditTitleCommand;
 use PrestaShop\PrestaShop\Core\Domain\Title\CommandHandler\EditTitleHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Title\Exception\CannotUpdateTitleException;
@@ -38,6 +39,7 @@
 /**
  * Handles edition of title
  */
+#[AsCommandHandler]
 class EditTitleHandler extends AbstractTitleHandler implements EditTitleHandlerInterface
 {
     /**
diff --git a/src/Adapter/Title/QueryHandler/GetTitleForEditingHandler.php b/src/Adapter/Title/QueryHandler/GetTitleForEditingHandler.php
index 22462136e03e8..e79b59101fdab 100644
--- a/src/Adapter/Title/QueryHandler/GetTitleForEditingHandler.php
+++ b/src/Adapter/Title/QueryHandler/GetTitleForEditingHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Title\QueryHandler;
 
 use PrestaShop\PrestaShop\Adapter\Title\AbstractTitleHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Title\Query\GetTitleForEditing;
 use PrestaShop\PrestaShop\Core\Domain\Title\QueryHandler\GetTitleForEditingHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Title\QueryResult\EditableTitle;
@@ -38,6 +39,7 @@
  *
  * @internal
  */
+#[AsQueryHandler]
 class GetTitleForEditingHandler extends AbstractTitleHandler implements GetTitleForEditingHandlerInterface
 {
     /**
diff --git a/src/Adapter/Webservice/CommandHandler/AddWebserviceKeyHandler.php b/src/Adapter/Webservice/CommandHandler/AddWebserviceKeyHandler.php
index 69dcc28ba5867..b44505f62b373 100644
--- a/src/Adapter/Webservice/CommandHandler/AddWebserviceKeyHandler.php
+++ b/src/Adapter/Webservice/CommandHandler/AddWebserviceKeyHandler.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Webservice\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Webservice\Command\AddWebserviceKeyCommand;
 use PrestaShop\PrestaShop\Core\Domain\Webservice\CommandHandler\AddWebserviceKeyHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Webservice\Exception\DuplicateWebserviceKeyException;
@@ -40,6 +41,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class AddWebserviceKeyHandler extends AbstractWebserviceKeyHandler implements AddWebserviceKeyHandlerInterface
 {
     /**
diff --git a/src/Adapter/Webservice/CommandHandler/EditWebserviceKeyHandler.php b/src/Adapter/Webservice/CommandHandler/EditWebserviceKeyHandler.php
index fc21d49b322ae..0368c2d3a5bf5 100644
--- a/src/Adapter/Webservice/CommandHandler/EditWebserviceKeyHandler.php
+++ b/src/Adapter/Webservice/CommandHandler/EditWebserviceKeyHandler.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Webservice\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Webservice\Command\EditWebserviceKeyCommand;
 use PrestaShop\PrestaShop\Core\Domain\Webservice\CommandHandler\EditWebserviceKeyHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Webservice\Exception\WebserviceConstraintException;
@@ -39,6 +40,7 @@
  *
  * @internal
  */
+#[AsCommandHandler]
 final class EditWebserviceKeyHandler extends AbstractWebserviceKeyHandler implements EditWebserviceKeyHandlerInterface
 {
     /**
diff --git a/src/Adapter/Webservice/QueryHandler/GetWebserviceKeyForEditingHandler.php b/src/Adapter/Webservice/QueryHandler/GetWebserviceKeyForEditingHandler.php
index 4be10847941a8..d7305481f6d75 100644
--- a/src/Adapter/Webservice/QueryHandler/GetWebserviceKeyForEditingHandler.php
+++ b/src/Adapter/Webservice/QueryHandler/GetWebserviceKeyForEditingHandler.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Webservice\QueryHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Webservice\Exception\WebserviceKeyNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Webservice\Query\GetWebserviceKeyForEditing;
 use PrestaShop\PrestaShop\Core\Domain\Webservice\QueryHandler\GetWebserviceKeyForEditingHandlerInterface;
@@ -38,6 +39,7 @@
  *
  * @internal
  */
+#[AsQueryHandler]
 final class GetWebserviceKeyForEditingHandler implements GetWebserviceKeyForEditingHandlerInterface
 {
     /**
diff --git a/src/Adapter/Zone/CommandHandler/AddZoneHandler.php b/src/Adapter/Zone/CommandHandler/AddZoneHandler.php
index e7daee988019b..d178b02cc6481 100644
--- a/src/Adapter/Zone/CommandHandler/AddZoneHandler.php
+++ b/src/Adapter/Zone/CommandHandler/AddZoneHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Zone\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Domain\AbstractObjectModelHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Zone\Command\AddZoneCommand;
 use PrestaShop\PrestaShop\Core\Domain\Zone\CommandHandler\AddZoneHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Zone\Exception\MissingZoneRequiredFieldsException;
@@ -40,6 +41,7 @@
 /**
  * Handles command that adds new zone.
  */
+#[AsCommandHandler]
 final class AddZoneHandler extends AbstractObjectModelHandler implements AddZoneHandlerInterface
 {
     /**
diff --git a/src/Adapter/Zone/CommandHandler/BulkDeleteZoneHandler.php b/src/Adapter/Zone/CommandHandler/BulkDeleteZoneHandler.php
index 2b64bdbf62574..c9ff624cf42b7 100644
--- a/src/Adapter/Zone/CommandHandler/BulkDeleteZoneHandler.php
+++ b/src/Adapter/Zone/CommandHandler/BulkDeleteZoneHandler.php
@@ -28,6 +28,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Zone\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Zone\Command\BulkDeleteZoneCommand;
 use PrestaShop\PrestaShop\Core\Domain\Zone\CommandHandler\BulkDeleteZoneHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Zone\Exception\DeleteZoneException;
@@ -37,6 +38,7 @@
 /**
  * Handles command that bulk delete zones
  */
+#[AsCommandHandler]
 final class BulkDeleteZoneHandler implements BulkDeleteZoneHandlerInterface
 {
     /**
diff --git a/src/Adapter/Zone/CommandHandler/BulkToggleZoneStatusHandler.php b/src/Adapter/Zone/CommandHandler/BulkToggleZoneStatusHandler.php
index 9ce9735aed28a..9094049c14a06 100644
--- a/src/Adapter/Zone/CommandHandler/BulkToggleZoneStatusHandler.php
+++ b/src/Adapter/Zone/CommandHandler/BulkToggleZoneStatusHandler.php
@@ -28,6 +28,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Zone\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Zone\Command\BulkToggleZoneStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\Zone\CommandHandler\BulkToggleZoneStatusHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Zone\Exception\CannotToggleZoneStatusException;
@@ -39,6 +40,7 @@
 /**
  * Handles command that toggles zones status in bulk action
  */
+#[AsCommandHandler]
 final class BulkToggleZoneStatusHandler implements BulkToggleZoneStatusHandlerInterface
 {
     /**
diff --git a/src/Adapter/Zone/CommandHandler/DeleteZoneHandler.php b/src/Adapter/Zone/CommandHandler/DeleteZoneHandler.php
index 13de97bc4b57c..b917f13aa84d5 100644
--- a/src/Adapter/Zone/CommandHandler/DeleteZoneHandler.php
+++ b/src/Adapter/Zone/CommandHandler/DeleteZoneHandler.php
@@ -28,6 +28,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Zone\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Zone\Command\DeleteZoneCommand;
 use PrestaShop\PrestaShop\Core\Domain\Zone\CommandHandler\DeleteZoneHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Zone\Exception\DeleteZoneException;
@@ -37,6 +38,7 @@
 /**
  * Handles command that delete zone
  */
+#[AsCommandHandler]
 final class DeleteZoneHandler implements DeleteZoneHandlerInterface
 {
     /**
diff --git a/src/Adapter/Zone/CommandHandler/EditZoneHandler.php b/src/Adapter/Zone/CommandHandler/EditZoneHandler.php
index 978b2ab14a7aa..ead1964056117 100644
--- a/src/Adapter/Zone/CommandHandler/EditZoneHandler.php
+++ b/src/Adapter/Zone/CommandHandler/EditZoneHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Zone\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Domain\AbstractObjectModelHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Zone\Command\EditZoneCommand;
 use PrestaShop\PrestaShop\Core\Domain\Zone\CommandHandler\EditZoneHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Zone\Exception\CannotEditZoneException;
@@ -37,6 +38,7 @@
 use PrestaShopException;
 use Zone;
 
+#[AsCommandHandler]
 final class EditZoneHandler extends AbstractObjectModelHandler implements EditZoneHandlerInterface
 {
     /**
diff --git a/src/Adapter/Zone/CommandHandler/ToggleZoneStatusHandler.php b/src/Adapter/Zone/CommandHandler/ToggleZoneStatusHandler.php
index 90fec33961e0d..a02a6febb8759 100644
--- a/src/Adapter/Zone/CommandHandler/ToggleZoneStatusHandler.php
+++ b/src/Adapter/Zone/CommandHandler/ToggleZoneStatusHandler.php
@@ -28,6 +28,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Zone\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Zone\Command\ToggleZoneStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\Zone\CommandHandler\ToggleZoneStatusHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Zone\Exception\CannotToggleZoneStatusException;
@@ -36,6 +37,7 @@
 use PrestaShopException;
 use Zone;
 
+#[AsCommandHandler]
 final class ToggleZoneStatusHandler implements ToggleZoneStatusHandlerInterface
 {
     /**
diff --git a/src/Adapter/Zone/QueryHandler/GetZoneForEditingHandler.php b/src/Adapter/Zone/QueryHandler/GetZoneForEditingHandler.php
index c657192b4e095..9960351c5c8e6 100644
--- a/src/Adapter/Zone/QueryHandler/GetZoneForEditingHandler.php
+++ b/src/Adapter/Zone/QueryHandler/GetZoneForEditingHandler.php
@@ -28,6 +28,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Zone\QueryHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Zone\Exception\ZoneNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Zone\Query\GetZoneForEditing;
 use PrestaShop\PrestaShop\Core\Domain\Zone\QueryHandler\GetZoneForEditingHandlerInterface;
@@ -39,6 +40,7 @@
  *
  * @internal
  */
+#[AsQueryHandler]
 final class GetZoneForEditingHandler implements GetZoneForEditingHandlerInterface
 {
     /**
diff --git a/src/Core/CommandBus/Attributes/AsCommandHandler.php b/src/Core/CommandBus/Attributes/AsCommandHandler.php
new file mode 100644
index 0000000000000..894d82549d65d
--- /dev/null
+++ b/src/Core/CommandBus/Attributes/AsCommandHandler.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\CommandBus\Attributes;
+
+#[\Attribute(\Attribute::TARGET_CLASS)]
+class AsCommandHandler
+{
+    public function __construct(public $method = 'handle')
+    {
+    }
+}
diff --git a/src/Core/CommandBus/Attributes/AsQueryHandler.php b/src/Core/CommandBus/Attributes/AsQueryHandler.php
new file mode 100644
index 0000000000000..65d8700bfa8f9
--- /dev/null
+++ b/src/Core/CommandBus/Attributes/AsQueryHandler.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\CommandBus\Attributes;
+
+#[\Attribute(\Attribute::TARGET_CLASS)]
+class AsQueryHandler
+{
+    public function __construct(public $method = 'handle')
+    {
+    }
+}
diff --git a/src/Core/Domain/AuthorizationServer/CommandHandler/AddApplicationHandler.php b/src/Core/Domain/AuthorizationServer/CommandHandler/AddApplicationHandler.php
index 6d1f8d7492a6b..5e02c0a83e335 100644
--- a/src/Core/Domain/AuthorizationServer/CommandHandler/AddApplicationHandler.php
+++ b/src/Core/Domain/AuthorizationServer/CommandHandler/AddApplicationHandler.php
@@ -28,6 +28,7 @@
 
 namespace PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Command\AddApplicationCommand;
 use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Exception\ApplicationConstraintException;
 use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Exception\ApplicationNotFoundException;
@@ -41,6 +42,7 @@
  *
  * @experimental
  */
+#[AsCommandHandler]
 class AddApplicationHandler implements AddApplicationHandlerInterface
 {
     /**
diff --git a/src/Core/Domain/AuthorizationServer/CommandHandler/DeleteApplicationHandler.php b/src/Core/Domain/AuthorizationServer/CommandHandler/DeleteApplicationHandler.php
index 0083bb5a348e4..cc75b1d2a0213 100644
--- a/src/Core/Domain/AuthorizationServer/CommandHandler/DeleteApplicationHandler.php
+++ b/src/Core/Domain/AuthorizationServer/CommandHandler/DeleteApplicationHandler.php
@@ -28,6 +28,7 @@
 
 namespace PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Command\DeleteApplicationCommand;
 use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Exception\DeleteApplicationException;
 use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Model\ApiAccessRepositoryInterface;
@@ -40,6 +41,7 @@
  *
  * @experimental
  */
+#[AsCommandHandler]
 class DeleteApplicationHandler implements DeleteApplicationHandlerInterface
 {
     /**
diff --git a/src/Core/Domain/AuthorizationServer/CommandHandler/EditApplicationHandler.php b/src/Core/Domain/AuthorizationServer/CommandHandler/EditApplicationHandler.php
index b8141b4ba5457..bbffe5c7cbd60 100644
--- a/src/Core/Domain/AuthorizationServer/CommandHandler/EditApplicationHandler.php
+++ b/src/Core/Domain/AuthorizationServer/CommandHandler/EditApplicationHandler.php
@@ -28,6 +28,7 @@
 
 namespace PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Command\EditApplicationCommand;
 use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Exception\ApplicationNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Exception\DuplicateApplicationNameException;
@@ -39,6 +40,7 @@
  *
  * @experimental
  */
+#[AsCommandHandler]
 class EditApplicationHandler implements EditApplicationHandlerInterface
 {
     /**
diff --git a/src/Core/Domain/AuthorizationServer/QueryHandler/GetApplicationForEditingHandler.php b/src/Core/Domain/AuthorizationServer/QueryHandler/GetApplicationForEditingHandler.php
index 20395f6a41778..7c97ce45fc68e 100644
--- a/src/Core/Domain/AuthorizationServer/QueryHandler/GetApplicationForEditingHandler.php
+++ b/src/Core/Domain/AuthorizationServer/QueryHandler/GetApplicationForEditingHandler.php
@@ -28,6 +28,7 @@
 
 namespace PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\QueryHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Model\AuthorizedApplicationRepositoryInterface;
 use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Query\GetApplicationForEditing;
 use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\QueryResult\EditableApplication;
@@ -37,6 +38,7 @@
  *
  * @experimental
  */
+#[AsQueryHandler]
 class GetApplicationForEditingHandler implements GetApplicationForEditingHandlerInterface
 {
     /**
diff --git a/src/Core/Domain/CustomerService/CommandHandler/AddOrderCustomerMessageHandler.php b/src/Core/Domain/CustomerService/CommandHandler/AddOrderCustomerMessageHandler.php
index 57a9a6cbab3fb..7dc20423ad448 100644
--- a/src/Core/Domain/CustomerService/CommandHandler/AddOrderCustomerMessageHandler.php
+++ b/src/Core/Domain/CustomerService/CommandHandler/AddOrderCustomerMessageHandler.php
@@ -32,6 +32,7 @@
 use CustomerThread;
 use Mail;
 use Order;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\CleanHtml;
 use PrestaShop\PrestaShop\Core\Domain\CustomerMessage\Command\AddOrderCustomerMessageCommand;
 use PrestaShop\PrestaShop\Core\Domain\CustomerMessage\CommandHandler\AddOrderCustomerMessageHandlerInterface;
@@ -43,6 +44,7 @@
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Tools;
 
+#[AsCommandHandler]
 class AddOrderCustomerMessageHandler implements AddOrderCustomerMessageHandlerInterface
 {
     /**
diff --git a/src/Core/Domain/CustomerService/CommandHandler/BulkDeleteCustomerThreadHandler.php b/src/Core/Domain/CustomerService/CommandHandler/BulkDeleteCustomerThreadHandler.php
index 9113c62420204..47121d8a89ded 100644
--- a/src/Core/Domain/CustomerService/CommandHandler/BulkDeleteCustomerThreadHandler.php
+++ b/src/Core/Domain/CustomerService/CommandHandler/BulkDeleteCustomerThreadHandler.php
@@ -28,12 +28,14 @@
 
 namespace PrestaShop\PrestaShop\Core\Domain\CustomerService\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\BulkDeleteCustomerThreadCommand;
 use PrestaShop\PrestaShop\Core\Domain\CustomerService\Repository\CustomerThreadRepository;
 
 /**
  * Handles command for customer thread bulk deletion
  */
+#[AsCommandHandler]
 class BulkDeleteCustomerThreadHandler implements BulkDeleteCustomerThreadHandlerInterface
 {
     /**
diff --git a/src/Core/Domain/CustomerService/CommandHandler/DeleteCustomerThreadHandler.php b/src/Core/Domain/CustomerService/CommandHandler/DeleteCustomerThreadHandler.php
index 7e4d9836ac3c6..adc43fe2a4eb0 100644
--- a/src/Core/Domain/CustomerService/CommandHandler/DeleteCustomerThreadHandler.php
+++ b/src/Core/Domain/CustomerService/CommandHandler/DeleteCustomerThreadHandler.php
@@ -28,12 +28,14 @@
 
 namespace PrestaShop\PrestaShop\Core\Domain\CustomerService\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\DeleteCustomerThreadCommand;
 use PrestaShop\PrestaShop\Core\Domain\CustomerService\Repository\CustomerThreadRepository;
 
 /**
  * Handles command for customer thread deletion
  */
+#[AsCommandHandler]
 class DeleteCustomerThreadHandler implements DeleteCustomerThreadHandlerInterface
 {
     /**
diff --git a/src/Core/Domain/CustomerService/CommandHandler/ForwardCustomerThreadHandler.php b/src/Core/Domain/CustomerService/CommandHandler/ForwardCustomerThreadHandler.php
index 77458c46a5b02..2429319010eee 100644
--- a/src/Core/Domain/CustomerService/CommandHandler/ForwardCustomerThreadHandler.php
+++ b/src/Core/Domain/CustomerService/CommandHandler/ForwardCustomerThreadHandler.php
@@ -33,6 +33,7 @@
 use Employee;
 use Mail;
 use Order;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\ConfigurationInterface;
 use PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\ForwardCustomerThreadCommand;
 use PrestaShop\PrestaShop\Core\Domain\CustomerService\Exception\CustomerServiceException;
@@ -44,6 +45,7 @@
 /**
  * @internal
  */
+#[AsCommandHandler]
 class ForwardCustomerThreadHandler implements ForwardCustomerThreadHandlerInterface
 {
     /**
diff --git a/src/Core/Domain/CustomerService/CommandHandler/ReplyToCustomerThreadHandler.php b/src/Core/Domain/CustomerService/CommandHandler/ReplyToCustomerThreadHandler.php
index 1727d1e362ca4..23833783a4880 100644
--- a/src/Core/Domain/CustomerService/CommandHandler/ReplyToCustomerThreadHandler.php
+++ b/src/Core/Domain/CustomerService/CommandHandler/ReplyToCustomerThreadHandler.php
@@ -33,6 +33,7 @@
 use CustomerThread;
 use Language;
 use Mail;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\ReplyToCustomerThreadCommand;
 use PrestaShop\PrestaShop\Core\Domain\CustomerService\Exception\CustomerServiceException;
 use PrestaShop\PrestaShop\Core\Domain\CustomerService\ValueObject\CustomerThreadStatus;
@@ -44,6 +45,7 @@
 /**
  * @internal
  */
+#[AsCommandHandler]
 class ReplyToCustomerThreadHandler implements ReplyToCustomerThreadHandlerInterface
 {
     /**
diff --git a/src/Core/Domain/CustomerService/CommandHandler/UpdateCustomerThreadStatusHandler.php b/src/Core/Domain/CustomerService/CommandHandler/UpdateCustomerThreadStatusHandler.php
index 39fecc9911562..00040802f5344 100644
--- a/src/Core/Domain/CustomerService/CommandHandler/UpdateCustomerThreadStatusHandler.php
+++ b/src/Core/Domain/CustomerService/CommandHandler/UpdateCustomerThreadStatusHandler.php
@@ -27,12 +27,14 @@
 namespace PrestaShop\PrestaShop\Core\Domain\CustomerService\CommandHandler;
 
 use Doctrine\DBAL\Driver\Connection;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\UpdateCustomerThreadStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\CustomerService\Exception\CustomerServiceException;
 
 /**
  * @internal
  */
+#[AsCommandHandler]
 class UpdateCustomerThreadStatusHandler implements UpdateCustomerThreadStatusHandlerInterface
 {
     /**
diff --git a/src/Core/Domain/CustomerService/QueryHandler/GetCustomerServiceSignatureHandler.php b/src/Core/Domain/CustomerService/QueryHandler/GetCustomerServiceSignatureHandler.php
index 22107e97497c5..97d07629a00d6 100644
--- a/src/Core/Domain/CustomerService/QueryHandler/GetCustomerServiceSignatureHandler.php
+++ b/src/Core/Domain/CustomerService/QueryHandler/GetCustomerServiceSignatureHandler.php
@@ -26,12 +26,14 @@
 
 namespace PrestaShop\PrestaShop\Core\Domain\CustomerService\QueryHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\ConfigurationInterface;
 use PrestaShop\PrestaShop\Core\Domain\CustomerService\Query\GetCustomerServiceSignature;
 
 /**
  * @internal
  */
+#[AsQueryHandler]
 final class GetCustomerServiceSignatureHandler implements GetCustomerServiceSignatureHandlerInterface
 {
     /**
diff --git a/src/Core/Domain/CustomerService/QueryHandler/GetCustomerThreadForViewingHandler.php b/src/Core/Domain/CustomerService/QueryHandler/GetCustomerThreadForViewingHandler.php
index 5117f4cb8810e..51029b5df3af3 100644
--- a/src/Core/Domain/CustomerService/QueryHandler/GetCustomerThreadForViewingHandler.php
+++ b/src/Core/Domain/CustomerService/QueryHandler/GetCustomerThreadForViewingHandler.php
@@ -34,6 +34,7 @@
 use DateTime;
 use Employee;
 use Order;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\CustomerService\Exception\CustomerThreadNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\CustomerService\Query\GetCustomerThreadForViewing;
 use PrestaShop\PrestaShop\Core\Domain\CustomerService\QueryResult\CustomerInformation;
@@ -54,6 +55,7 @@
 /**
  * @internal
  */
+#[AsQueryHandler]
 class GetCustomerThreadForViewingHandler implements GetCustomerThreadForViewingHandlerInterface
 {
     /**
diff --git a/src/Core/Domain/MailTemplate/CommandHandler/GenerateThemeMailTemplatesHandler.php b/src/Core/Domain/MailTemplate/CommandHandler/GenerateThemeMailTemplatesHandler.php
index eefef37c01c15..b34cd3a7bcaf1 100644
--- a/src/Core/Domain/MailTemplate/CommandHandler/GenerateThemeMailTemplatesHandler.php
+++ b/src/Core/Domain/MailTemplate/CommandHandler/GenerateThemeMailTemplatesHandler.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Core\Domain\MailTemplate\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\MailTemplate\Command\GenerateThemeMailTemplatesCommand;
 use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
 use PrestaShop\PrestaShop\Core\Language\LanguageRepositoryInterface;
@@ -38,6 +39,7 @@
  * by GenerateThemeMailTemplatesCommand. If no output folders are defined by the command its output
  * folders are the default ones.
  */
+#[AsCommandHandler]
 class GenerateThemeMailTemplatesHandler implements GenerateThemeMailTemplatesHandlerInterface
 {
     /** @var LanguageRepositoryInterface */
diff --git a/src/Core/Domain/Product/Combination/QueryHandler/GetCombinationIdsHandler.php b/src/Core/Domain/Product/Combination/QueryHandler/GetCombinationIdsHandler.php
index d617de59c5f9e..e2c98614adf12 100644
--- a/src/Core/Domain/Product/Combination/QueryHandler/GetCombinationIdsHandler.php
+++ b/src/Core/Domain/Product/Combination/QueryHandler/GetCombinationIdsHandler.php
@@ -27,11 +27,13 @@
 
 namespace PrestaShop\PrestaShop\Core\Domain\Product\Combination\QueryHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\GetCombinationIds;
 use PrestaShop\PrestaShop\Core\Domain\Product\Combination\ValueObject\CombinationId;
 use PrestaShop\PrestaShop\Core\Grid\Query\ProductCombinationQueryBuilder;
 use PrestaShop\PrestaShop\Core\Search\Filters\ProductCombinationFilters;
 
+#[AsQueryHandler]
 class GetCombinationIdsHandler implements GetCombinationIdsHandlerInterface
 {
     /**
diff --git a/src/Core/Domain/Product/Combination/QueryHandler/SearchProductCombinationsHandler.php b/src/Core/Domain/Product/Combination/QueryHandler/SearchProductCombinationsHandler.php
index 139ad60ba7e00..c547c6878d3a8 100644
--- a/src/Core/Domain/Product/Combination/QueryHandler/SearchProductCombinationsHandler.php
+++ b/src/Core/Domain/Product/Combination/QueryHandler/SearchProductCombinationsHandler.php
@@ -28,11 +28,13 @@
 namespace PrestaShop\PrestaShop\Core\Domain\Product\Combination\QueryHandler;
 
 use PrestaShop\PrestaShop\Adapter\Product\Combination\Repository\CombinationRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\SearchProductCombinations;
 use PrestaShop\PrestaShop\Core\Domain\Product\Combination\QueryResult\ProductCombination;
 use PrestaShop\PrestaShop\Core\Domain\Product\Combination\QueryResult\ProductCombinationsCollection;
 use PrestaShop\PrestaShop\Core\Product\Combination\NameBuilder\CombinationNameBuilderInterface;
 
+#[AsQueryHandler]
 class SearchProductCombinationsHandler implements SearchProductCombinationsHandlerInterface
 {
     /**
diff --git a/src/Core/Domain/ShowcaseCard/CommandHandler/CloseShowcaseCardHandler.php b/src/Core/Domain/ShowcaseCard/CommandHandler/CloseShowcaseCardHandler.php
index 9a5d63784671e..63f57076aae50 100644
--- a/src/Core/Domain/ShowcaseCard/CommandHandler/CloseShowcaseCardHandler.php
+++ b/src/Core/Domain/ShowcaseCard/CommandHandler/CloseShowcaseCardHandler.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\ConfigurationInterface;
 use PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\Command\CloseShowcaseCardCommand;
 use PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\ConfigurationMap;
@@ -33,6 +34,7 @@
 /**
  * Saves the showcase card status to keep it closed
  */
+#[AsCommandHandler]
 final class CloseShowcaseCardHandler implements CloseShowcaseCardHandlerInterface
 {
     /**
diff --git a/src/Core/Domain/ShowcaseCard/QueryHandler/GetShowcaseCardIsClosedHandler.php b/src/Core/Domain/ShowcaseCard/QueryHandler/GetShowcaseCardIsClosedHandler.php
index d801f51690c79..8d5ffdcae390f 100644
--- a/src/Core/Domain/ShowcaseCard/QueryHandler/GetShowcaseCardIsClosedHandler.php
+++ b/src/Core/Domain/ShowcaseCard/QueryHandler/GetShowcaseCardIsClosedHandler.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\QueryHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\ConfigurationInterface;
 use PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\ConfigurationMap;
 use PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\Exception\ShowcaseCardException;
@@ -34,6 +35,7 @@
 /**
  * Finds out if a showcase card has been closed
  */
+#[AsQueryHandler]
 final class GetShowcaseCardIsClosedHandler implements GetShowcaseCardIsClosedHandlerInterface
 {
     /**
diff --git a/src/Core/Domain/SqlManagement/CommandHandler/SaveSqlRequestSettingsHandler.php b/src/Core/Domain/SqlManagement/CommandHandler/SaveSqlRequestSettingsHandler.php
index 0e5772567196d..f4c43dc320804 100644
--- a/src/Core/Domain/SqlManagement/CommandHandler/SaveSqlRequestSettingsHandler.php
+++ b/src/Core/Domain/SqlManagement/CommandHandler/SaveSqlRequestSettingsHandler.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Core\Domain\SqlManagement\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\ConfigurationInterface;
 use PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\SaveSqlRequestSettingsCommand;
 use PrestaShop\PrestaShop\Core\Domain\SqlManagement\SqlRequestSettings;
@@ -34,6 +35,7 @@
 /**
  * Class SaveSqlRequestSettingsHandler handles command to save SqlRequest settings.
  */
+#[AsCommandHandler]
 final class SaveSqlRequestSettingsHandler implements SaveSqlRequestSettingsHandlerInterface
 {
     /**
diff --git a/src/Core/Domain/SqlManagement/QueryHandler/GetSqlRequestSettingsHandler.php b/src/Core/Domain/SqlManagement/QueryHandler/GetSqlRequestSettingsHandler.php
index 608fb05944801..5accb6c88c94a 100644
--- a/src/Core/Domain/SqlManagement/QueryHandler/GetSqlRequestSettingsHandler.php
+++ b/src/Core/Domain/SqlManagement/QueryHandler/GetSqlRequestSettingsHandler.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Core\Domain\SqlManagement\QueryHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\ConfigurationInterface;
 use PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetSqlRequestSettings;
 use PrestaShop\PrestaShop\Core\Domain\SqlManagement\SqlRequestSettings;
@@ -34,6 +35,7 @@
 /**
  * Class GetSqlRequestSettingsHandler handles query to get SqlRequest settings.
  */
+#[AsQueryHandler]
 final class GetSqlRequestSettingsHandler implements GetSqlRequestSettingsHandlerInterface
 {
     /**
diff --git a/src/Core/Domain/Theme/CommandHandler/AdaptThemeToRTLLanguagesHandler.php b/src/Core/Domain/Theme/CommandHandler/AdaptThemeToRTLLanguagesHandler.php
index a5036dd73218c..82668f44968c1 100644
--- a/src/Core/Domain/Theme/CommandHandler/AdaptThemeToRTLLanguagesHandler.php
+++ b/src/Core/Domain/Theme/CommandHandler/AdaptThemeToRTLLanguagesHandler.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Core\Domain\Theme\CommandHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Theme\Command\AdaptThemeToRTLLanguagesCommand;
 use PrestaShop\PrestaShop\Core\Domain\Theme\Exception\CannotAdaptThemeToRTLLanguagesException;
 use PrestaShop\PrestaShop\Core\Localization\RTL\Exception\GenerationException;
@@ -34,6 +35,7 @@
 /**
  * Class AdaptThemeToRTLLanguagesHandler
  */
+#[AsCommandHandler]
 final class AdaptThemeToRTLLanguagesHandler implements AdaptThemeToRTLLanguagesHandlerInterface
 {
     /**
diff --git a/src/Core/Domain/Theme/CommandHandler/DeleteThemeHandler.php b/src/Core/Domain/Theme/CommandHandler/DeleteThemeHandler.php
index 7bf7a8b02acae..de895a11afd76 100644
--- a/src/Core/Domain/Theme/CommandHandler/DeleteThemeHandler.php
+++ b/src/Core/Domain/Theme/CommandHandler/DeleteThemeHandler.php
@@ -27,12 +27,14 @@
 namespace PrestaShop\PrestaShop\Core\Domain\Theme\CommandHandler;
 
 use PrestaShop\PrestaShop\Core\Addon\Theme\ThemeManager;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Theme\Command\DeleteThemeCommand;
 use PrestaShop\PrestaShop\Core\Domain\Theme\Exception\CannotDeleteThemeException;
 
 /**
  * Class DeleteThemeHandler
  */
+#[AsCommandHandler]
 final class DeleteThemeHandler implements DeleteThemeHandlerInterface
 {
     /**
diff --git a/src/Core/Domain/Theme/CommandHandler/EnableThemeHandler.php b/src/Core/Domain/Theme/CommandHandler/EnableThemeHandler.php
index a01cb1b9f58f9..db56dadec9e8d 100644
--- a/src/Core/Domain/Theme/CommandHandler/EnableThemeHandler.php
+++ b/src/Core/Domain/Theme/CommandHandler/EnableThemeHandler.php
@@ -28,6 +28,7 @@
 
 use PrestaShop\PrestaShop\Core\Addon\Theme\ThemeManager;
 use PrestaShop\PrestaShop\Core\Cache\Clearer\CacheClearerInterface;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Theme\Command\EnableThemeCommand;
 use PrestaShop\PrestaShop\Core\Domain\Theme\Exception\CannotEnableThemeException;
 use PrestaShop\PrestaShop\Core\Domain\Theme\Exception\ThemeConstraintException;
@@ -35,6 +36,7 @@
 /**
  * Class EnableThemeHandler
  */
+#[AsCommandHandler]
 final class EnableThemeHandler implements EnableThemeHandlerInterface
 {
     /**
diff --git a/src/Core/Domain/Theme/CommandHandler/ImportThemeHandler.php b/src/Core/Domain/Theme/CommandHandler/ImportThemeHandler.php
index c27dbbcbc577c..02800f9124723 100644
--- a/src/Core/Domain/Theme/CommandHandler/ImportThemeHandler.php
+++ b/src/Core/Domain/Theme/CommandHandler/ImportThemeHandler.php
@@ -29,6 +29,7 @@
 use PrestaShop\PrestaShop\Core\Addon\Theme\Exception\ThemeAlreadyExistsException;
 use PrestaShop\PrestaShop\Core\Addon\Theme\ThemeManager;
 use PrestaShop\PrestaShop\Core\Addon\Theme\ThemeUploaderInterface;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\ConfigurationInterface;
 use PrestaShop\PrestaShop\Core\Domain\Theme\Command\ImportThemeCommand;
 use PrestaShop\PrestaShop\Core\Domain\Theme\Exception\ImportedThemeAlreadyExistsException;
@@ -38,6 +39,7 @@
 /**
  * Class ImportThemeHandler
  */
+#[AsCommandHandler]
 final class ImportThemeHandler implements ImportThemeHandlerInterface
 {
     /**
diff --git a/src/Core/Domain/Theme/CommandHandler/ResetThemeLayoutsHandler.php b/src/Core/Domain/Theme/CommandHandler/ResetThemeLayoutsHandler.php
index 0d7ba52575134..cacab4b8ca359 100644
--- a/src/Core/Domain/Theme/CommandHandler/ResetThemeLayoutsHandler.php
+++ b/src/Core/Domain/Theme/CommandHandler/ResetThemeLayoutsHandler.php
@@ -27,12 +27,14 @@
 namespace PrestaShop\PrestaShop\Core\Domain\Theme\CommandHandler;
 
 use PrestaShop\PrestaShop\Core\Addon\Theme\ThemeManager;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Theme\Command\ResetThemeLayoutsCommand;
 use PrestaShop\PrestaShop\Core\Domain\Theme\Exception\CannotResetThemeLayoutsException;
 
 /**
  * Class ResetThemeLayoutsHandler
  */
+#[AsCommandHandler]
 final class ResetThemeLayoutsHandler implements ResetThemeLayoutsHandlerInterface
 {
     /**
diff --git a/src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryCollectorPass.php b/src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryCollectorPass.php
index ec03de83ad135..c5aa16ecf2e20 100644
--- a/src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryCollectorPass.php
+++ b/src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryCollectorPass.php
@@ -26,6 +26,11 @@
 
 namespace PrestaShopBundle\DependencyInjection\Compiler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
+use ReflectionClass;
+use RuntimeException;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
@@ -40,14 +45,13 @@ class CommandAndQueryCollectorPass implements CompilerPassInterface
      */
     public function process(ContainerBuilder $container): void
     {
-        $handlers = $container->findTaggedServiceIds('messenger.cqrs_handler');
-        $this->updateMessengerTags($container, $handlers);
+        $this->registerMessengerTags($container);
 
         if (!in_array($container->getParameter('kernel.environment'), ['dev', 'test'])) {
             return;
         }
 
-        $commandsAndQueries = $this->findCommandsAndQueries($handlers);
+        $commandsAndQueries = $this->findCommandsAndQueries($container);
         $container->setParameter('prestashop.commands_and_queries', $commandsAndQueries);
     }
 
@@ -56,8 +60,9 @@ public function process(ContainerBuilder $container): void
      *
      * @return string[]
      */
-    private function findCommandsAndQueries(array $handlers): array
+    private function findCommandsAndQueries(ContainerBuilder $container): array
     {
+        $handlers = $container->findTaggedServiceIds('messenger.cqrs_handler');
         $commands = [];
         foreach ($handlers as $handler) {
             if (isset(current($handler)['command'])) {
@@ -69,14 +74,30 @@ private function findCommandsAndQueries(array $handlers): array
     }
 
     /**
-     * update messenger tags allowing the recognition of handlers by symfony
+     * register messenger tags allowing the recognition of handlers by symfony
      */
-    private function updateMessengerTags(ContainerBuilder $container, array $handlers): void
+    private function registerMessengerTags(ContainerBuilder $container): void
     {
-        foreach ($handlers as $key => $value) {
-            $definition = $container->findDefinition($key);
-            $definition->addTag('messenger.message_handler', ['method' => 'handle', 'handles' => current($value)['command']]);
-            $definition->clearTag('messenger.cqrs_handler');
+        $container->registerAttributeForAutoconfiguration(AsCommandHandler::class, static function (ChildDefinition $definition, AsCommandHandler $attribute, ReflectionClass $reflector): void {
+            $definition->addTag('messenger.message_handler', ['method' => $attribute->method, 'handles' => self::guessHandledClasses($reflector, $attribute->method)]);
+        });
+
+        $container->registerAttributeForAutoconfiguration(AsQueryHandler::class, static function (ChildDefinition $definition, AsQueryHandler $attribute, ReflectionClass $reflector): void {
+            $definition->addTag('messenger.message_handler', ['method' => $attribute->method, 'handles' => self::guessHandledClasses($reflector, $attribute->method)]);
+        });
+    }
+
+    private static function guessHandledClasses(ReflectionClass $class, string $method): ?string
+    {
+        $reflectionMethod = $class->getMethod($method);
+        $parameters = $reflectionMethod->getParameters();
+
+        if (count($parameters) != 1) {
+            throw new RuntimeException(sprintf('Invalid handler service "%s": number of argument "$%s" in method "%s" must be 1 , "%s" given.', $class->getName(), $parameters[0]->getName(), $method, count($parameters)));
         }
+
+        $firstParameter = $parameters[0];
+
+        return $firstParameter->getType()->getName();
     }
 }
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/address.yml b/src/PrestaShopBundle/Resources/config/services/adapter/address.yml
index 962ec93b7d2a5..34910b8166726 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/address.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/address.yml
@@ -6,79 +6,57 @@ services:
 
   prestashop.adapter.address.command_handler.delete_address_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\DeleteAddressHandler'
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\DeleteAddressCommand' }
+    autoconfigure: true
 
   prestashop.adapter.address.command_handler.bulk_delete_address_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\BulkDeleteAddressHandler'
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\BulkDeleteAddressCommand' }
+    autoconfigure: true
 
   prestashop.adapter.address.command_handler.add_manufacturer_address_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\AddManufacturerAddressHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\AddManufacturerAddressCommand'
+    autoconfigure: true
 
   prestashop.adapter.address.command_handler.edit_manufacturer_address_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\EditManufacturerAddressHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\EditManufacturerAddressCommand'
+    autoconfigure: true
 
   prestashop.adapter.address.query_handler.get_manufacturer_address_for_editing_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Address\QueryHandler\GetManufacturerAddressForEditingHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Address\Query\GetManufacturerAddressForEditing'
+    autoconfigure: true
 
   prestashop.adapter.address.query_handler.get_required_fields_for_address:
     class: 'PrestaShop\PrestaShop\Adapter\Address\QueryHandler\GetRequiredFieldsForAddressHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Address\Query\GetRequiredFieldsForAddress'
+    autoconfigure: true
 
   prestashop.adapter.address.command_handler.set_required_fields_for_address:
     class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\SetRequiredFieldsForAddressHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\SetRequiredFieldsForAddressCommand'
+    autoconfigure: true
 
   prestashop.adapter.address.command_handler.add_customer_address_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\AddCustomerAddressHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\AddCustomerAddressCommand'
+    autoconfigure: true
 
   prestashop.adapter.address.query_handler.get_customer_address_for_editing_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Address\QueryHandler\GetCustomerAddressForEditingHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Address\Query\GetCustomerAddressForEditing'
+    autoconfigure: true
 
   prestashop.adapter.address.command_handler.edit_customer_address_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\EditCustomerAddressHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\EditCustomerAddressCommand'
+    autoconfigure: true
 
   prestashop.adapter.address.command_handler.edit_order_address_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\EditOrderAddressHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.address.command_handler.edit_customer_address_handler'
       - '@prestashop.adapter.order.command_handler.change_order_delivery_address_handler'
       - '@prestashop.adapter.order.command_handler.change_order_invoice_address_handler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\EditOrderAddressCommand'
 
   prestashop.adapter.address.command_handler.edit_cart_address_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\EditCartAddressHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.address.command_handler.edit_customer_address_handler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\EditCartAddressCommand'
 
   prestashop.adapter.address.formatter:
     class: 'PrestaShop\PrestaShop\Adapter\Address\AddressFormatter'
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml b/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
index d3bcdd06529ba..1b8d20e4baf88 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
@@ -11,39 +11,25 @@ services:
       $dbPrefix: '%database_prefix%'
 
   PrestaShop\PrestaShop\Adapter\Alias\CommandHandler\AddAliasHandler:
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Alias\Command\AddAliasCommand
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Alias\QueryHandler\GetAliasForEditingHandler:
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Alias\Query\GetAliasForEditing
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Alias\CommandHandler\DeleteAliasHandler:
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Alias\Command\DeleteAliasCommand
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Alias\CommandHandler\BulkDeleteAliasHandler:
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Alias\Command\BulkDeleteAliasCommand
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Alias\CommandHandler\UpdateAliasStatusHandler:
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasStatusCommand
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Alias\CommandHandler\BulkUpdateAliasStatusHandler:
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Alias\Command\BulkUpdateAliasStatusCommand
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Alias\CommandHandler\UpdateAliasHandler:
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasCommand
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Alias\QueryHandler\SearchForSearchTermHandler:
     tags:
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/attachment.yml b/src/PrestaShopBundle/Resources/config/services/adapter/attachment.yml
index d92d0b2514c3d..ac0069d5ba481 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/attachment.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/attachment.yml
@@ -4,29 +4,25 @@ services:
 
   prestashop.adapter.attachment.command_handler.delete_attachment_handler:
     public: true
+    autoconfigure: true
     class: 'PrestaShop\PrestaShop\Adapter\Attachment\CommandHandler\DeleteAttachmentHandler'
     parent: 'prestashop.adapter.attachment.command_handler.abstract_attachment_handler'
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Command\DeleteAttachmentCommand' }
 
   prestashop.adapter.attachment.command_handler.bulk_delete_attachment_handler:
     public: true
+    autoconfigure: true
     class: 'PrestaShop\PrestaShop\Adapter\Attachment\CommandHandler\BulkDeleteAttachmentsHandler'
     parent: 'prestashop.adapter.attachment.command_handler.abstract_attachment_handler'
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Command\BulkDeleteAttachmentsCommand' }
 
   prestashop.adapter.attachment.query_handler.get_attachment_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Attachment\QueryHandler\GetAttachmentHandler'
+    autoconfigure: true
     arguments:
       - !php/const _PS_DOWNLOAD_DIR_
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Query\GetAttachment' }
 
   prestashop.adapter.contact.query_handler.get_attachment_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Attachment\QueryHandler\GetAttachmentForEditingHandler'
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Query\GetAttachmentForEditing' }
+    autoconfigure: true
 
   prestashop.adapter.attachment.uploader.attachment_file_uploader:
     class: 'PrestaShop\PrestaShop\Adapter\File\Uploader\AttachmentFileUploader'
@@ -42,21 +38,19 @@ services:
 
   prestashop.adapter.attachment.command_handler.edit_attachment_handler:
     public: true
+    autoconfigure: true
     class: 'PrestaShop\PrestaShop\Adapter\Attachment\CommandHandler\EditAttachmentHandler'
     parent: 'prestashop.adapter.attachment.command_handler.abstract_attachment_handler'
     arguments:
       - '@prestashop.adapter.attachment.uploader.attachment_file_uploader'
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Command\EditAttachmentCommand' }
 
   prestashop.adapter.attachment.command_handler.create_attachment_handler:
     public: true
+    autoconfigure: true
     class: 'PrestaShop\PrestaShop\Adapter\Attachment\CommandHandler\AddAttachmentHandler'
     parent: 'prestashop.adapter.attachment.command_handler.abstract_attachment_handler'
     arguments:
       - '@prestashop.adapter.attachment.uploader.attachment_file_uploader'
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Command\AddAttachmentCommand' }
 
   PrestaShop\PrestaShop\Adapter\Attachment\AttachmentRepository:
     arguments:
@@ -69,16 +63,12 @@ services:
 
   prestashop.adapter.attachment.query_handler.get_attachment_information_handler:
     class: PrestaShop\PrestaShop\Adapter\Attachment\QueryHandler\GetAttachmentInformationHandler
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Attachment\AttachmentRepository'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Attachment\Query\GetAttachmentInformation
 
   prestashop.adapter.attachment.query_handler.search_attachment_handler:
     class: PrestaShop\PrestaShop\Adapter\Attachment\QueryHandler\SearchAttachmentHandler
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Attachment\AttachmentRepository'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Attachment\Query\SearchAttachment
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/attribute.yml b/src/PrestaShopBundle/Resources/config/services/adapter/attribute.yml
index 25164a357a658..1b8c7ca4cf143 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/attribute.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/attribute.yml
@@ -3,14 +3,10 @@ services:
     public: true
 
   PrestaShop\PrestaShop\Adapter\Attribute\CommandHandler\DeleteAttributeHandler:
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\Command\DeleteAttributeCommand'
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Attribute\CommandHandler\BulkDeleteAttributeHandler:
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\Command\BulkDeleteAttributeCommand'
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Attribute\Repository\AttributeRepository:
     arguments:
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/attribute_group.yml b/src/PrestaShopBundle/Resources/config/services/adapter/attribute_group.yml
index 7fd46c5576752..b1e3089c7fa8c 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/attribute_group.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/attribute_group.yml
@@ -12,29 +12,21 @@ services:
     deprecated: ~
 
   PrestaShop\PrestaShop\Adapter\AttributeGroup\CommandHandler\DeleteAttributeGroupHandler:
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\DeleteAttributeGroupCommand'
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\AttributeGroup\CommandHandler\BulkDeleteAttributeGroupHandler:
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\BulkDeleteAttributeGroupCommand'
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\AttributeGroup\QueryHandler\GetAttributeGroupListHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Attribute\Repository\AttributeRepository'
       - '@PrestaShop\PrestaShop\Adapter\AttributeGroup\Repository\AttributeGroupRepository'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Query\GetAttributeGroupList'
 
   PrestaShop\PrestaShop\Adapter\Product\AttributeGroup\QueryHandler\GetProductAttributeGroupsHandler:
     autowire: true
     public: false
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Product\AttributeGroup\Query\GetProductAttributeGroups'
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\AttributeGroup\Repository\AttributeGroupRepository:
     arguments:
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/carrier.yml b/src/PrestaShopBundle/Resources/config/services/adapter/carrier.yml
index 6810c9ee587e9..c2bfaacb6622b 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/carrier.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/carrier.yml
@@ -9,28 +9,23 @@ services:
 
   prestashop.adapter.carrier.command_handler.toggle_carrier_status:
     class: 'PrestaShop\PrestaShop\Adapter\Carrier\CommandHandler\ToggleCarrierStatusHandler'
-    tags:
-      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Carrier\Command\ToggleCarrierStatusCommand }
+    autoconfigure: true
 
   prestashop.adapter.carrier.command_handler.toggle_carrier_is_free_status:
     class: 'PrestaShop\PrestaShop\Adapter\Carrier\CommandHandler\ToggleCarrierIsFreeHandler'
-    tags:
-      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Carrier\Command\ToggleCarrierIsFreeCommand }
+    autoconfigure: true
 
   prestashop.adapter.carrier.command_handler.delete_carrier:
     class: 'PrestaShop\PrestaShop\Adapter\Carrier\CommandHandler\DeleteCarrierHandler'
-    tags:
-      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Carrier\Command\DeleteCarrierCommand }
+    autoconfigure: true
 
   prestashop.adapter.carrier.command_handler.bulk_delete_carrier:
     class: 'PrestaShop\PrestaShop\Adapter\Carrier\CommandHandler\BulkDeleteCarrierHandler'
-    tags:
-      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Carrier\Command\BulkDeleteCarrierCommand }
+    autoconfigure: true
 
   prestashop.adapter.carrier.command_handler.bulk_toggle_carrier_status:
     class: 'PrestaShop\PrestaShop\Adapter\Carrier\CommandHandler\BulkToggleCarrierStatusHandler'
-    tags:
-      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Carrier\Command\BulkToggleCarrierStatusCommand }
+    autoconfigure: true
 
   prestashop.adapter.carrier.carrier_module_advice_alert_checker:
     class: 'PrestaShop\PrestaShop\Adapter\Carrier\CarrierModuleAdviceAlertChecker'
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/cart.yml b/src/PrestaShopBundle/Resources/config/services/adapter/cart.yml
index cad6106584b7a..d50690de87b46 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/cart.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/cart.yml
@@ -4,127 +4,93 @@ services:
 
   prestashop.adapter.cart.command_handler.create_empty_customer_cart_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\CreateEmptyCustomerCartHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\CreateEmptyCustomerCartCommand'
+    autoconfigure: true
 
   prestashop.adapter.cart.command_handler.update_cart_currency_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\UpdateCartCurrencyHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartCurrencyCommand'
+    autoconfigure: true
 
   prestashop.adapter.cart.command_handler.update_cart_language_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\UpdateCartLanguageHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartLanguageCommand'
+    autoconfigure: true
 
   prestashop.adapter.cart.command_handler.update_cart_addresses_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\UpdateCartAddressesHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.command_handler.update_cart_carrier_handler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartAddressesCommand'
 
   prestashop.adapter.cart.command_handler.update_delivery_options_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\UpdateCartDeliverySettingsHandler'
+    autoconfigure: true
     arguments:
       - '@translator'
       - '@prestashop.adapter.legacy.configuration'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartDeliverySettingsCommand'
 
   prestashop.adapter.command_handler.update_product_quantity_in_cart_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\UpdateProductQuantityInCartHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.context_state_manager'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateProductQuantityInCartCommand'
 
   prestashop.adapter.command_handler.update_cart_carrier_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\UpdateCartCarrierHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.context_state_manager'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartCarrierCommand'
 
   prestashop.adapter.command_handler.add_cart_rule_to_cart_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\AddCartRuleToCartHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.context_state_manager'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\AddCartRuleToCartCommand'
 
   prestashop.adapter.command_handler.remove_cart_rule_from_cart_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\RemoveCartRuleFromCartHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\RemoveCartRuleFromCartCommand'
+    autoconfigure: true
 
   prestashop.adapter.command_handler.remove_product_from_cart_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\RemoveProductFromCartHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.context_state_manager'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\RemoveProductFromCartCommand'
 
   prestashop.adapter.command_handler.update_product_price_in_cart_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\UpdateProductPriceInCartHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateProductPriceInCartCommand'
+    autoconfigure: true
 
   prestashop.adapter.command_handler.send_cart_to_customer_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\SendCartToCustomerHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\SendCartToCustomerCommand'
+    autoconfigure: true
 
   prestashop.adapter.query_handler.get_cart_for_viewing_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\QueryHandler\GetCartForViewingHandler'
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\ImageManager'
       - "@prestashop.core.localization.locale.context_locale"
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Query\GetCartForViewing'
 
   prestashop.adapter.cart.query_handler.get_last_empty_customer_cart_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\QueryHandler\GetLastEmptyCustomerCartHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Query\GetLastEmptyCustomerCart'
+    autoconfigure: true
 
   prestashop.adapter.query_handler.get_cart_information_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\QueryHandler\GetCartForOrderCreationHandler'
+    autoconfigure: true
     arguments:
       - "@prestashop.core.localization.locale.context_locale"
       - '@=service("prestashop.adapter.legacy.context").getContext().language.id'
       - '@=service("prestashop.adapter.legacy.context").getContext().link'
       - '@prestashop.adapter.context_state_manager'
       - '@=service("prestashop.adapter.legacy.configuration").getInt("PS_CARRIER_DEFAULT")'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Query\GetCartForOrderCreation'
 
   prestashop.adapter.command_handler.add_customization_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\AddCustomizationHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\AddCustomizationCommand'
+    autoconfigure: true
 
   prestashop.adapter.command_handler.add_product_to_cart_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\AddProductToCartHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.command_handler.add_customization_handler'
       - '@prestashop.adapter.command_handler.update_product_quantity_in_cart_handler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\AddProductToCartCommand'
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml b/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml
index 553cb5668fcac..f32173a3fc13b 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml
@@ -5,45 +5,34 @@ services:
   PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler\AddCartRuleHandler:
     autowire: true
     public: false
-    tags:
-      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\CartRule\Command\AddCartRuleCommand }
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\CartRule\QueryHandler\GetCartRuleForEditingHandler:
     autowire: true
     public: false
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\CartRule\Query\GetCartRuleForEditing'
+    autoconfigure: true
 
   prestashop.adapter.cart_rule.query_handler.search_cart_rules_handler:
     class: PrestaShop\PrestaShop\Adapter\CartRule\QueryHandler\SearchCartRulesHandler
+    autoconfigure: true
     arguments:
       - "@=service('prestashop.adapter.legacy.context').getContext().language.id"
-    tags:
-      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\CartRule\Query\SearchCartRules }
 
   prestashop.adapter.cart_rule.command_handler.delete_cart_rule_handler:
     class: 'PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler\DeleteCartRuleHandler'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\CartRule\Command\DeleteCartRuleCommand'
+    autoconfigure: true
 
   prestashop.adapter.cart_rule.command_handler.bulk_delete_cart_rule_handler:
     class: 'PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler\BulkDeleteCartRuleHandler'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\CartRule\Command\BulkDeleteCartRuleCommand'
+    autoconfigure: true
 
   prestashop.adapter.cart_rule.command_handler.toggle_cart_rule_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler\ToggleCartRuleStatusHandler'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\CartRule\Command\ToggleCartRuleStatusCommand'
+    autoconfigure: true
 
   prestashop.adapter.cart_rule.command_handler.bulk_toggle_cart_rule_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler\BulkToggleCartRuleStatusHandler'
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\CartRule\Command\BulkToggleCartRuleStatusCommand' }
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\CartRule\Validate\CartRuleValidator:
     autowire: true
@@ -59,8 +48,7 @@ services:
   PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler\EditCartRuleHandler:
     autowire: true
     public: false
-    tags:
-      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\CartRule\Command\EditCartRuleCommand }
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\CartRule\CartRuleActionFiller:
     autowire: true
@@ -69,5 +57,4 @@ services:
   PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler\SetCartRuleRestrictionsHandler:
     autowire: true
     public: false
-    tags:
-      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\CartRule\Command\SetCartRuleRestrictionsCommand }
+    autoconfigure: true
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/catalog_price_rule.yml b/src/PrestaShopBundle/Resources/config/services/adapter/catalog_price_rule.yml
index 279fd2de6a9bc..e01531b99bb2a 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/catalog_price_rule.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/catalog_price_rule.yml
@@ -4,41 +4,29 @@ services:
 
   prestashop.adapter.catalog_price_rule.command_handler.delete_catalog_price_rule_handler:
     class: 'PrestaShop\PrestaShop\Adapter\CatalogPriceRule\CommandHandler\DeleteCatalogPriceRuleHandler'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Command\DeleteCatalogPriceRuleCommand'
+    autoconfigure: true
 
   prestashop.adapter.catalog_price_rule.command_handler.bulk_delete_catalog_price_rule_handler:
     class: 'PrestaShop\PrestaShop\Adapter\CatalogPriceRule\CommandHandler\BulkDeleteCatalogPriceRuleHandler'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Command\BulkDeleteCatalogPriceRuleCommand'
+    autoconfigure: true
 
   prestashop.adapter.catalog_price_rule.command_handler.add_catalog_price_rule_handler:
     class: 'PrestaShop\PrestaShop\Adapter\CatalogPriceRule\CommandHandler\AddCatalogPriceRuleHandler'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Command\AddCatalogPriceRuleCommand'
+    autoconfigure: true
 
   prestashop.adapter.catalog_price_rule.command_handler.edit_catalog_price_rule_handler:
     class: 'PrestaShop\PrestaShop\Adapter\CatalogPriceRule\CommandHandler\EditCatalogPriceRuleHandler'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Command\EditCatalogPriceRuleCommand'
+    autoconfigure: true
 
   prestashop.adapter.catalog_price_rule.command_handler.get_catalog_price_rule_for_editing_handler:
     class: 'PrestaShop\PrestaShop\Adapter\CatalogPriceRule\QueryHandler\GetCatalogPriceRuleForEditingHandler'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Query\GetCatalogPriceRuleForEditing'
+    autoconfigure: true
 
   prestashop.adapter.catalog_price_rule.query_handler.get_catalog_price_rule_list_for_product_handler:
     class: 'PrestaShop\PrestaShop\Adapter\CatalogPriceRule\QueryHandler\GetCatalogPriceRuleListForProductHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.catalog_price_rule.repository.catalog_price_rule_repository'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Query\GetCatalogPriceRuleListForProduct'
 
   prestashop.adapter.catalog_price_rule.repository.catalog_price_rule_repository:
     class: PrestaShop\PrestaShop\Adapter\CatalogPriceRule\Repository\CatalogPriceRuleRepository
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/category.yml b/src/PrestaShopBundle/Resources/config/services/adapter/category.yml
index e80fa33a448f3..6f411620774f9 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/category.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/category.yml
@@ -12,27 +12,19 @@ services:
 
   prestashop.adapter.category.command_handler.bulk_update_categories_status_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\BulkUpdateCategoriesStatusHandler
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Category\Command\BulkUpdateCategoriesStatusCommand
+    autoconfigure: true
 
   prestashop.adapter.category.command_handler.bulk_enable_categories_status_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\BulkUpdateCategoriesStatusHandler
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Category\Command\BulkEnableCategoriesCommand
+    autoconfigure: true
 
   prestashop.adapter.category.command_handler.bulk_disable_categories_status_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\BulkUpdateCategoriesStatusHandler
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Category\Command\BulkDisableCategoriesCommand
+    autoconfigure: true
 
   prestashop.adapter.category.command_handler.set_category_is_enabled_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\SetCategoryIsEnabledHandler
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Category\Command\SetCategoryIsEnabledCommand
+    autoconfigure: true
 
   prestashop.adapter.category.command_handler.abstract_delete_category_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\AbstractDeleteCategoryHandler
@@ -46,24 +38,19 @@ services:
     class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\DeleteCategoryHandler
     parent: prestashop.adapter.category.command_handler.abstract_delete_category_handler
     public: true
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryCommand
+    autoconfigure: true
 
   prestashop.adapter.category.command_handler.bulk_delete_categories_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\BulkDeleteCategoriesHandler
     parent: prestashop.adapter.category.command_handler.abstract_delete_category_handler
     public: true
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Category\Command\BulkDeleteCategoriesCommand
+    autoconfigure: true
 
   prestashop.adapter.category.command_handler.add_category_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\AddCategoryHandler
     public: true
     autowire: true
-    tags:
-      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Category\Command\AddCategoryCommand }
+    autoconfigure: true
 
   prestashop.adapter.category.command_handler.add_root_category_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\AddRootCategoryHandler
@@ -71,62 +58,48 @@ services:
       - '@prestashop.adapter.legacy.configuration'
     public: true
     autowire: true
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Category\Command\AddRootCategoryCommand
+    autoconfigure: true
 
   prestashop.adapter.category.command_handler.edit_root_category_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\EditRootCategoryHandler
     public: true
     autowire: true
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Category\Command\EditRootCategoryCommand
+    autoconfigure: true
 
   prestashop.adapter.category.command_handler.edit_category_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\EditCategoryHandler
     public: true
     autowire: true
-    tags:
-      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Category\Command\EditCategoryCommand }
+    autoconfigure: true
 
   prestashop.adapter.category.query_handler.get_category_for_editing:
     class: PrestaShop\PrestaShop\Adapter\Category\QueryHandler\GetCategoryForEditingHandler
+    autoconfigure: true
     arguments:
       - '@prestashop.core.image.parser.image_tag_source_parser'
-    tags:
-      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Category\Query\GetCategoryForEditing }
 
   prestashop.adapter.category.command_handler.delete_category_cover_image_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\DeleteCategoryCoverImageHandler
+    autoconfigure: true
     arguments:
       - '@filesystem'
       - '@prestashop.adapter.legacy.configuration'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryCoverImageCommand
 
   prestashop.adapter.category.command_handler.delete_category_menu_thumbnail_image_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\DeleteCategoryMenuThumbnailImageHandler
+    autoconfigure: true
     arguments:
       - '@filesystem'
       - '@prestashop.adapter.legacy.configuration'
       - '@prestashop.adapter.cache.clearer.smarty_cache_clearer'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryMenuThumbnailImageCommand
 
   prestashop.adapter.category.command_handler.update_category_position_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\UpdateCategoryPositionHandler
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Category\Command\UpdateCategoryPositionCommand
+    autoconfigure: true
 
   prestashop.adapter.category.command_handler.get_category_status_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\QueryHandler\GetCategoryIsEnabledHandler
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Category\Query\GetCategoryIsEnabled
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Category\Repository\CategoryRepository:
     arguments:
@@ -144,11 +117,9 @@ services:
 
   prestashop.adapter.category.query_handler.get_categories_tree_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\QueryHandler\GetCategoriesTreeHandler
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Core\Category\NameBuilder\CategoryDisplayNameBuilder'
       - '@prestashop.adapter.context_state_manager'
       - '@PrestaShop\PrestaShop\Adapter\Shop\Repository\ShopRepository'
       - "@=service('prestashop.adapter.legacy.configuration').get('PS_ROOT_CATEGORY')"
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Category\Query\GetCategoriesTree
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/cms_page.yml b/src/PrestaShopBundle/Resources/config/services/adapter/cms_page.yml
index 1604314b114f3..61d090dc92b27 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/cms_page.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/cms_page.yml
@@ -4,57 +4,39 @@ services:
 
   prestashop.adapter.cms_page.command_handler.bulk_disable_cms_page:
     class: PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler\BulkDisableCmsPageHandler
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\BulkDisableCmsPageCommand
+    autoconfigure: true
 
   prestashop.adapter.cms_page.command_handler.bulk_enable_cms_page:
     class: PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler\BulkEnableCmsPageHandler
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\BulkEnableCmsPageCommand
+    autoconfigure: true
 
   prestashop.adapter.cms_page.command_handler.toggle_cms_page_status:
     class: PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler\ToggleCmsPageStatusHandler
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\ToggleCmsPageStatusCommand
+    autoconfigure: true
 
   prestashop.adapter.cms_page.query_handler.get_cms_category_id_for_redirection:
     class: PrestaShop\PrestaShop\Adapter\CMS\Page\QueryHandler\GetCmsCategoryIdForRedirectionHandler
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Query\GetCmsCategoryIdForRedirection
+    autoconfigure: true
 
   prestashop.adapter.cms_page.command_handler.delete_cms_page:
     class: PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler\DeleteCmsPageHandler
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\DeleteCmsPageCommand
+    autoconfigure: true
 
   prestashop.adapter.cms_page.command_handler.bulk_delete_cms_page:
     class: PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler\BulkDeleteCmsPageHandler
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\BulkDeleteCmsPageCommand
+    autoconfigure: true
 
   prestashop.adapter.cms_page.command_handler.add_cms_page_handler:
     class: PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler\AddCmsPageHandler
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\AddCmsPageCommand
+    autoconfigure: true
 
   prestashop.adapter.cms_page.command_handler.edit_cms_page_handler:
     class: PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler\EditCmsPageHandler
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\EditCmsPageCommand
+    autoconfigure: true
 
   prestashop.adapter.cms_page.query_handler.get_cms_page_for_editing_handler:
     class: PrestaShop\PrestaShop\Adapter\CMS\Page\QueryHandler\GetCmsPageForEditingHandler
+    autoconfigure: true
     arguments:
       - "@=service('prestashop.adapter.legacy.context').getContext().link"
       - "@=service('prestashop.adapter.legacy.context').getContext().language.id"
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Query\GetCmsPageForEditing
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/cms_page_category.yml b/src/PrestaShopBundle/Resources/config/services/adapter/cms_page_category.yml
index 35a8a64e3c85b..db2cff2547582 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/cms_page_category.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/cms_page_category.yml
@@ -12,71 +12,51 @@ services:
 
   prestashop.adapter.cms_page_category.command_handler.delete_cms_page_category_handler:
     class: PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler\DeleteCmsPageCategoryHandler
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\DeleteCmsPageCategoryCommand
+    autoconfigure: true
 
   prestashop.adapter.cms_page_category.command_handler.toggle_cms_page_category_status_handler:
     class: PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler\ToggleCmsPageCategoryStatusHandler
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\ToggleCmsPageCategoryStatusCommand
+    autoconfigure: true
 
   prestashop.adapter.cms_page_category.command_handler.bulk_delete_cms_page_category_handler:
     class: PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler\BulkDeleteCmsPageCategoryHandler
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\BulkDeleteCmsPageCategoryCommand
+    autoconfigure: true
 
   prestashop.adapter.cms_page.command_handler.bulk_enable_cms_page_category_handler:
     class: PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler\BulkEnableCmsPageCategoryHandler
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\BulkEnableCmsPageCategoryCommand
+    autoconfigure: true
 
   prestashop.adapter.cms_page.command_handler.bulk_disable_cms_page_category_handler:
     class: PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler\BulkDisableCmsPageCategoryHandler
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\BulkDisableCmsPageCategoryCommand
+    autoconfigure: true
 
   prestashop.adapter.cms_page.command_handler.add_cms_page_category_handler:
     class: 'PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler\AddCmsPageCategoryHandler'
     parent: 'prestashop.adapter.cms_page_category.command_handler.abstract_cms_page_category_handler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\AddCmsPageCategoryCommand
+    autoconfigure: true
     public: true
 
   prestashop.adapter.cms_page.command_handler.edit_cms_page_category_handler:
     class: 'PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler\EditCmsPageCategoryHandler'
     parent: 'prestashop.adapter.cms_page_category.command_handler.abstract_cms_page_category_handler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\EditCmsPageCategoryCommand
+    autoconfigure: true
     public: true
 
   # Query handlers
 
   prestashop.adapter.cms_page.query_handler.get_cms_page_categories_for_breadcrumbs:
     class: PrestaShop\PrestaShop\Adapter\CMS\PageCategory\QueryHandler\GetCmsPageCategoriesForBreadcrumbHandler
+    autoconfigure: true
     arguments:
       - '@=service("prestashop.adapter.legacy.context").getContext().language.id'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Query\GetCmsPageCategoriesForBreadcrumb
 
   prestashop.adapter.cms_page.query_handler.get_cms_page_categories_for_redirection:
     class: PrestaShop\PrestaShop\Adapter\CMS\PageCategory\QueryHandler\GetCmsPageParentCategoryIdForRedirectionHandler
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Query\GetCmsPageParentCategoryIdForRedirection
+    autoconfigure: true
 
   prestashop.adapter.cms_page.query_handler.get_cms_page_category_for_editing:
     class: PrestaShop\PrestaShop\Adapter\CMS\PageCategory\QueryHandler\GetCmsPageCategoryForEditingHandler
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Query\GetCmsPageCategoryForEditing
+    autoconfigure: true
 
   prestashop.adapter.cms_page.categories_provider:
     class: 'PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CategoriesProvider'
@@ -86,9 +66,7 @@ services:
 
   prestashop.adapter.cms_page.query_handler.get_cms_page_category_name_for_listing:
     class: PrestaShop\PrestaShop\Adapter\CMS\PageCategory\QueryHandler\GetCmsPageCategoryNameForListingHandler
+    autoconfigure: true
     arguments:
       - '@=service("prestashop.adapter.legacy.context").getContext().language.id'
       - '@request_stack'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Query\GetCmsPageCategoryNameForListing
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/configuration.yml b/src/PrestaShopBundle/Resources/config/services/adapter/configuration.yml
index b7a3ad4abcb99..071425b1c57ee 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/configuration.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/configuration.yml
@@ -4,7 +4,6 @@ services:
 
   prestashop.adapter.configuration.command_handler.switch_debug_mode_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Configuration\CommandHandler\SwitchDebugModeHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.debug_mode'
-    tags:
-      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Configuration\Command\SwitchDebugModeCommand }
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/contact.yml b/src/PrestaShopBundle/Resources/config/services/adapter/contact.yml
index 3ac8553928734..35d144e02008a 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/contact.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/contact.yml
@@ -10,21 +10,18 @@ services:
 
   prestashop.adapter.contact.query_handler.get_contact_for_editing:
     class: 'PrestaShop\PrestaShop\Adapter\Contact\QueryHandler\GetContactForEditingHandler'
+    autoconfigure: true
     arguments:
       - '@PrestaShopBundle\Form\DataTransformer\StringArrayToIntegerArrayDataTransformer'
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Contact\Query\GetContactForEditing' }
 
   prestashop.adapter.contact.command_handler.edit_contact:
     class: 'PrestaShop\PrestaShop\Adapter\Contact\CommandHandler\EditContactHandler'
+    autoconfigure: true
     arguments:
       - '@validator'
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Contact\Command\EditContactCommand' }
 
   prestashop.adapter.contact.command_handler.add_contact:
     class: 'PrestaShop\PrestaShop\Adapter\Contact\CommandHandler\AddContactHandler'
+    autoconfigure: true
     arguments:
       - '@validator'
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Contact\Command\AddContactCommand' }
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/country.yml b/src/PrestaShopBundle/Resources/config/services/adapter/country.yml
index c1234eae71a67..bd7be5588ae8b 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/country.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/country.yml
@@ -4,11 +4,9 @@ services:
 
   prestashop.adapter.country.query_handler.get_country_required_fields:
     class: 'PrestaShop\PrestaShop\Adapter\Country\QueryHandler\GetCountryRequiredFieldsHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.country.country_required_fields_provider'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Country\Query\GetCountryRequiredFields'
 
   prestashop.adapter.country.country_zip_code_requirements_provider:
     class: 'PrestaShop\PrestaShop\Adapter\Country\CountryZipCodeRequirementsProvider'
@@ -27,25 +25,21 @@ services:
   PrestaShop\PrestaShop\Adapter\Country\CommandHandler\AddCountryHandler:
     public: true
     autowire: true
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Country\Command\AddCountryCommand' }
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Country\CommandHandler\DeleteCountryHandler:
     public: false
     autowire: true
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Country\Command\DeleteCountryCommand' }
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Country\CommandHandler\EditCountryHandler:
     public: false
     autowire: true
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Country\Command\EditCountryCommand' }
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Country\QueryHandler\GetCountryForEditingHandler:
     public: false
     autowire: true
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Country\Query\GetCountryForEditing' }
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Country\Validate\CountryValidator:
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/credit_slip.yml b/src/PrestaShopBundle/Resources/config/services/adapter/credit_slip.yml
index a3279e166fea3..4d74fa5ff0631 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/credit_slip.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/credit_slip.yml
@@ -4,6 +4,4 @@ services:
 
   prestashop.adapter.credit_slip.query_handler.get_credit_slip_ids_by_date_range_handler:
     class: 'PrestaShop\PrestaShop\Adapter\CreditSlip\QueryHandler\GetCreditSlipIdsByDateRangeHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\CreditSlip\Query\GetCreditSlipIdsByDateRange
+    autoconfigure: true
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/currency.yml b/src/PrestaShopBundle/Resources/config/services/adapter/currency.yml
index 0c818a284c02c..169e382cd7c4d 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/currency.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/currency.yml
@@ -14,104 +14,91 @@ services:
 
   prestashop.adapter.currency.command_handler.toggle_currency_status:
     class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\ToggleCurrencyStatusHandler'
+    autoconfigure: true
     arguments:
       - '@=service("prestashop.adapter.legacy.configuration").get("PS_CURRENCY_DEFAULT")'
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\ToggleCurrencyStatusCommand' }
 
   prestashop.adapter.currency.command_handler.delete_currency:
     class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\DeleteCurrencyHandler'
+    autoconfigure: true
     arguments:
       - '@=service("prestashop.adapter.legacy.configuration").get("PS_CURRENCY_DEFAULT")'
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\DeleteCurrencyCommand' }
 
   prestashop.adapter.currency.command_handler.create_currency:
     class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\AddOfficialCurrencyHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.core.localization.cldr.locale_repository'
       - "@=service('prestashop.core.admin.lang.repository').findAll()"
       - "@prestashop.adapter.currency.command_handler.command_validator"
       - '@prestashop.adapter.data_provider.currency'
       - '@prestashop.core.localization.currency.pattern_transformer'
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\AddCurrencyCommand' }
 
   prestashop.adapter.currency.command_handler.create_unofficial_currency:
     class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\AddUnofficialCurrencyHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.core.localization.cldr.locale_repository'
       - "@=service('prestashop.core.admin.lang.repository').findAll()"
       - "@prestashop.adapter.currency.command_handler.command_validator"
       - '@prestashop.adapter.data_provider.currency'
       - '@prestashop.core.localization.currency.pattern_transformer'
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\AddUnofficialCurrencyCommand' }
 
   prestashop.adapter.currency.command_handler.update_official_currency:
     class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\EditOfficialCurrencyHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.core.localization.cldr.locale_repository'
       - "@=service('prestashop.core.admin.lang.repository').findAll()"
       - "@prestashop.adapter.currency.command_handler.command_validator"
       - "@prestashop.core.localization.currency.pattern_transformer"
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\EditCurrencyCommand' }
 
   prestashop.adapter.currency.command_handler.update_unofficial_currency:
     class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\EditUnofficialCurrencyHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.core.localization.cldr.locale_repository'
       - "@=service('prestashop.core.admin.lang.repository').findAll()"
       - "@prestashop.adapter.currency.command_handler.command_validator"
       - "@prestashop.core.localization.currency.pattern_transformer"
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\EditUnofficialCurrencyCommand' }
 
   prestashop.adapter.currency.command_handler.update_exchange_rates:
     class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\RefreshExchangeRatesHandler'
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\RefreshExchangeRatesCommand' }
+    autoconfigure: true
 
   prestashop.adapter.currency.command_handler.bulk_toggle_currencies_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\BulkToggleCurrenciesStatusHandler'
+    autoconfigure: true
     arguments:
       - '@=service("prestashop.adapter.legacy.configuration").get("PS_CURRENCY_DEFAULT")'
-    tags:
-      - { name: messenger.cqrs_handler, command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\BulkToggleCurrenciesStatusCommand' }
 
   prestashop.adapter.currency.command_handler.bulk_delete_currencies_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\BulkDeleteCurrenciesHandler'
+    autoconfigure: true
     arguments:
       - '@=service("prestashop.adapter.legacy.configuration").get("PS_CURRENCY_DEFAULT")'
-    tags:
-      - { name: messenger.cqrs_handler, command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\BulkDeleteCurrenciesCommand' }
-
 
   # Query handlers
 
   prestashop.adapter.currency.query_handler.get_currency_for_editing:
     class: 'PrestaShop\PrestaShop\Adapter\Currency\QueryHandler\GetCurrencyForEditingHandler'
+    autoconfigure: true
     arguments:
       - '@=service("prestashop.adapter.legacy.context").getContext().shop.id'
       - '@prestashop.core.localization.currency.pattern_transformer'
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Query\GetCurrencyForEditing' }
 
   prestashop.adapter.currency.query_handler.get_currency_exchange_rate:
     class: 'PrestaShop\PrestaShop\Adapter\Currency\QueryHandler\GetCurrencyExchangeRateHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.core.exchange_rate.provider'
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Query\GetCurrencyExchangeRate' }
 
   prestashop.adapter.currency.query_handler.get_reference_currency:
     class: 'PrestaShop\PrestaShop\Adapter\Currency\QueryHandler\GetReferenceCurrencyHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.core.localization.cldr.locale_repository'
       - '@=service("prestashop.core.admin.lang.repository").findAll()'
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Query\GetReferenceCurrency' }
 
   PrestaShop\PrestaShop\Adapter\Currency\Repository\CurrencyRepository: ~
 
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/customer.yml b/src/PrestaShopBundle/Resources/config/services/adapter/customer.yml
index 00db8491da9aa..4e4f86535a2bf 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/customer.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/customer.yml
@@ -4,114 +4,86 @@ services:
 
   prestashop.adapter.customer.query_handler.get_customer_for_viewing:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\QueryHandler\GetCustomerForViewingHandler'
+    autoconfigure: true
     arguments:
       - '@translator'
       - "@=service('prestashop.adapter.legacy.context').getContext().language.id"
       - "@prestashop.core.localization.locale.context_locale"
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerForViewing'
 
   prestashop.adapter.customer.command_handler.set_private_note_about_customer_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\SetPrivateNoteAboutCustomerHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\SetPrivateNoteAboutCustomerCommand'
+    autoconfigure: true
 
   prestashop.adapter.customer.command_handler.transform_guest_to_customer:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\TransformGuestToCustomerHandler'
+    autoconfigure: true
     arguments:
       - "@=service('prestashop.adapter.legacy.context').getContext().language.id"
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\TransformGuestToCustomerCommand'
 
   prestashop.adapter.customer.command_handler.set_required_fields_for_customer:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\SetRequiredFieldsForCustomerHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\SetRequiredFieldsForCustomerCommand'
+    autoconfigure: true
 
   prestashop.adapter.customer.query_handler.get_required_fields_for_customer:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\QueryHandler\GetRequiredFieldsForCustomerHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetRequiredFieldsForCustomer'
+    autoconfigure: true
 
   prestashop.adapter.customer.command_handler.add_customer:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\AddCustomerHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.core.crypto.hashing'
       - '@=service("prestashop.adapter.legacy.configuration").get("_COOKIE_KEY_")'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\AddCustomerCommand'
 
   prestashop.adapter.customer.query_handler.get_customer_for_editing:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\QueryHandler\GetCustomerForEditingHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerForEditing'
+    autoconfigure: true
 
   prestashop.adapter.customer.command_handler.edit_customer_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\EditCustomerHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.core.crypto.hashing'
       - '@=service("prestashop.adapter.legacy.configuration").get("_COOKIE_KEY_")'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\EditCustomerCommand'
 
   prestashop.adapter.customer.command_handler.bulk_enable_customer_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\BulkEnableCustomerHandler'
-    tags:
-      - { name: messenger.cqrs_handler, command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\BulkEnableCustomerCommand' }
+    autoconfigure: true
 
   prestashop.adapter.customer.command_handler.bulk_disable_customer_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\BulkDisableCustomerHandler'
-    tags:
-      - { name: messenger.cqrs_handler, command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\BulkDisableCustomerCommand' }
+    autoconfigure: true
 
   prestashop.adapter.customer.command_handler.delete_customer_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\DeleteCustomerHandler'
-    tags:
-      - { name: messenger.cqrs_handler, command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\DeleteCustomerCommand' }
+    autoconfigure: true
 
   prestashop.adapter.customer.command_handler.bulk_delete_customer_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\BulkDeleteCustomerHandler'
-    tags:
-      - { name: messenger.cqrs_handler, command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\BulkDeleteCustomerCommand' }
+    autoconfigure: true
 
   prestashop.adapter.customer.query_handler.search_customers:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\QueryHandler\SearchCustomersHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.legacy.configuration'
       - "@=service('prestashop.adapter.legacy.context').getContext().language.id"
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\SearchCustomers'
 
   prestashop.adapter.customer.query_handler.get_customer_carts_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\QueryHandler\GetCustomerCartsHandler'
+    autoconfigure: true
     arguments:
       - "@prestashop.core.localization.locale.context_locale"
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerCarts'
 
   prestashop.adapter.customer.query_handler.get_customer_orders_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\QueryHandler\GetCustomerOrdersHandler'
+    autoconfigure: true
     arguments:
       - "@prestashop.core.localization.locale.context_locale"
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerOrders'
 
   prestashop.adapter.customer.query_handler.get_customer_for_address_creation:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\QueryHandler\GetCustomerForAddressCreationHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerForAddressCreation'
+    autoconfigure: true
 
   prestashop.adapter.customer.customer_data_source:
     class: 'PrestaShop\PrestaShop\Adapter\Customer\CustomerDataSource'
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/employee.yml b/src/PrestaShopBundle/Resources/config/services/adapter/employee.yml
index 4bb6b3746f0cd..f23f0eee3f1f0 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/employee.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/employee.yml
@@ -4,30 +4,25 @@ services:
 
   prestashop.adapter.profile.employee.command_handler.toggle_employee_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Profile\Employee\CommandHandler\ToggleEmployeeStatusHandler'
-    tags:
-      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Employee\Command\ToggleEmployeeStatusCommand }
+    autoconfigure: true
 
   prestashop.adapter.profile.employee.command_handler.bulk_update_employee_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Profile\Employee\CommandHandler\BulkUpdateEmployeeStatusHandler'
-    tags:
-      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Employee\Command\BulkUpdateEmployeeStatusCommand }
+    autoconfigure: true
 
   prestashop.adapter.profile.employee.command_handler.delete_employee_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Profile\Employee\CommandHandler\DeleteEmployeeHandler'
-    tags:
-      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Employee\Command\DeleteEmployeeCommand }
+    autoconfigure: true
 
   prestashop.adapter.profile.employee.command_handler.bulk_delete_employee_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Profile\Employee\CommandHandler\BulkDeleteEmployeeHandler'
-    tags:
-      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Employee\Command\BulkDeleteEmployeeCommand }
+    autoconfigure: true
 
   prestashop.adapter.employee.query_handler.get_employee_for_editing:
     class: 'PrestaShop\PrestaShop\Adapter\Profile\Employee\QueryHandler\GetEmployeeForEditingHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.core.image.parser.image_tag_source_parser'
-    tags:
-      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Employee\Query\GetEmployeeForEditing }
 
   prestashop.adapter.employee.form_access_checker:
     class: 'PrestaShop\PrestaShop\Adapter\Employee\EmployeeFormAccessChecker'
@@ -37,22 +32,20 @@ services:
 
   prestashop.adapter.employee.command_handler.add_employee_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Profile\Employee\CommandHandler\AddEmployeeHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.core.crypto.hashing'
       - '@prestashop.core.employee.profile_access_checker'
       - '@prestashop.adapter.data_provider.employee'
-    tags:
-      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Employee\Command\AddEmployeeCommand }
 
   prestashop.adapter.employee.command_handler.edit_employee_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Profile\Employee\CommandHandler\EditEmployeeHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.core.crypto.hashing'
       - '@prestashop.core.employee.profile_access_checker'
       - '@prestashop.adapter.data_provider.employee'
       - '@prestashop.adapter.legacy.context'
-    tags:
-      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Employee\Command\EditEmployeeCommand }
 
   prestashop.adapter.employee.avatar_provider:
     class: 'PrestaShop\PrestaShop\Adapter\Employee\AvatarProvider'
@@ -74,5 +67,4 @@ services:
 
   prestashop.adapter.employee.query_handler.get_employee_email_by_id_handler:
     class: PrestaShop\PrestaShop\Adapter\Profile\Employee\QueryHandler\GetEmployeeEmailByIdHandler
-    tags:
-      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Employee\Query\GetEmployeeEmailById }
+    autoconfigure: true
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/feature.yml b/src/PrestaShopBundle/Resources/config/services/adapter/feature.yml
index 8eb34a33b0092..0ff215f7d0881 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/feature.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/feature.yml
@@ -8,57 +8,41 @@ services:
   PrestaShop\PrestaShop\Adapter\Feature\CommandHandler\AddFeatureHandler:
     autowire: true
     public: false
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Feature\Command\AddFeatureCommand
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Feature\CommandHandler\EditFeatureHandler:
     autowire: true
     public: false
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Feature\Command\EditFeatureCommand
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Feature\QueryHandler\GetFeatureForEditingHandler:
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Feature\Query\GetFeatureForEditing
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Feature\CommandHandler\AddFeatureValueHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureRepository'
       - '@PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureValueRepository'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Feature\Command\AddFeatureValueCommand
 
   PrestaShop\PrestaShop\Adapter\Feature\CommandHandler\EditFeatureValueHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureValueRepository'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Feature\Command\EditFeatureValueCommand
 
   PrestaShop\PrestaShop\Adapter\Feature\QueryHandler\GetFeatureValueForEditingHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureValueRepository'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Feature\Query\GetFeatureValueForEditing
 
   PrestaShop\PrestaShop\Adapter\Feature\CommandHandler\DeleteFeatureHandler:
     autowire: true
     public: false
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Feature\Command\DeleteFeatureCommand
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Feature\CommandHandler\BulkDeleteFeatureHandler:
     autowire: true
     public: false
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Feature\Command\BulkDeleteFeatureCommand
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Feature\CommandHandler\DeleteFeatureValueHandler:
     autowire: true
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/group.yml b/src/PrestaShopBundle/Resources/config/services/adapter/group.yml
index bcec9ca6c26b9..5561adb28a62d 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/group.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/group.yml
@@ -21,16 +21,12 @@ services:
   PrestaShop\PrestaShop\Adapter\Customer\Group\CommandHandler\AddCustomerGroupHandler:
     public: false
     autowire: true
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Group\Command\AddCustomerGroupCommand'
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Customer\Group\QueryHandler\GetCustomerGroupForEditingHandler:
     public: false
     autowire: true
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Group\Query\GetCustomerGroupForEditing'
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Customer\Group\Validate\CustomerGroupValidator:
     public: false
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/hook.yml b/src/PrestaShopBundle/Resources/config/services/adapter/hook.yml
index 7d754aea627cb..fc10e8e1ae70e 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/hook.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/hook.yml
@@ -4,15 +4,11 @@ services:
 
   prestashop.adapter.hook.command_handler.update_hook_status_handler:
     class: PrestaShop\PrestaShop\Adapter\Hook\CommandHandler\UpdateHookStatusCommandHandler
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Hook\Command\UpdateHookStatusCommand
+    autoconfigure: true
 
   prestashop.adapter.hook.command_handler.get_hook_status_handler:
     class: PrestaShop\PrestaShop\Adapter\Hook\QueryHandler\GetHookStatusHandler
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHookStatus
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\HookManager: ~
 
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/language.yml b/src/PrestaShopBundle/Resources/config/services/adapter/language.yml
index cb6a38f02f6a1..e8a3f1878b966 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/language.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/language.yml
@@ -21,58 +21,44 @@ services:
 
   prestashop.adapter.language.command_handler.add_language_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Language\CommandHandler\AddLanguageHandler'
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Image\ImageValidator'
       - '@prestashop.adapter.file.robots_text_file_generator'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\AddLanguageCommand'
 
   prestashop.adapter.language.command_handler.edit_language_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Language\CommandHandler\EditLanguageHandler'
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Image\ImageValidator'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\EditLanguageCommand'
 
   prestashop.adapter.language.query_handler.get_language_for_editing:
     class: 'PrestaShop\PrestaShop\Adapter\Language\QueryHandler\GetLanguageForEditingHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Language\Query\GetLanguageForEditing'
+    autoconfigure: true
 
   prestashop.adapter.language.command_handler.toggle_language_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Language\CommandHandler\ToggleLanguageStatusHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.file.robots_text_file_generator'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\ToggleLanguageStatusCommand'
 
   prestashop.adapter.language.command_handler.bulk_toggle_languages_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Language\CommandHandler\BulkToggleLanguagesStatusHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.file.robots_text_file_generator'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\BulkToggleLanguagesStatusCommand'
 
   prestashop.adapter.language.command_handler.bulk_delete_languages_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Language\CommandHandler\BulkDeleteLanguagesHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.file.robots_text_file_generator'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\BulkDeleteLanguagesCommand'
 
   prestashop.adapter.language.command_handler.delete_language_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Language\CommandHandler\DeleteLanguageHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.file.robots_text_file_generator'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\DeleteLanguageCommand'
 
   PrestaShop\PrestaShop\Adapter\Language\ContextLanguageProvider:
     autowire: true
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/manufacturer.yml b/src/PrestaShopBundle/Resources/config/services/adapter/manufacturer.yml
index 69de2eddfa49d..1be890cdb0f23 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/manufacturer.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/manufacturer.yml
@@ -11,57 +11,43 @@ services:
 
   prestashop.adapter.manufacturer.command_handler.toggle_manufacturer_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler\ToggleManufacturerStatusHandler'
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\ToggleManufacturerStatusCommand' }
+    autoconfigure: true
 
   prestashop.adapter.manufacturer.command_handler.bulk_toggle_manufacturer_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler\BulkToggleManufacturerStatusHandler'
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\BulkToggleManufacturerStatusCommand' }
+    autoconfigure: true
 
   prestashop.adapter.manufacturer.command_handler.delete_manufacturer_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler\DeleteManufacturerHandler'
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\DeleteManufacturerCommand' }
+    autoconfigure: true
 
   prestashop.adapter.manufacturer.command_handler.delete_manufacturer_logo_image_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler\DeleteManufacturerLogoImageHandler'
+    autoconfigure: true
     arguments:
       - !php/const _PS_MANU_IMG_DIR_
       - !php/const _PS_TMP_IMG_DIR_
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\DeleteManufacturerLogoImageCommand'
 
   prestashop.adapter.manufacturer.command_handler.bulk_delete_manufacturer_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler\BulkDeleteManufacturerHandler'
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\BulkDeleteManufacturerCommand' }
+    autoconfigure: true
 
   prestashop.adapter.manufacturer.query_handler.get_manufacturer_for_editing:
     class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\QueryHandler\GetManufacturerForEditingHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.core.image.parser.image_tag_source_parser'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Query\GetManufacturerForEditing'
 
   prestashop.adapter.manufacturer.command_handler.edit_manufacturer_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler\EditManufacturerHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\EditManufacturerCommand'
+    autoconfigure: true
 
   prestashop.adapter.manufacturer.command_handler.add_manufacturer_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler\AddManufacturerHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\AddManufacturerCommand'
+    autoconfigure: true
 
   prestashop.adapter.manufacturer.query_handler.get_manufacturer_for_viewing_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\QueryHandler\GetManufacturerForViewingHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Manufacturer\Query\GetManufacturerForViewing
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Manufacturer\Repository\ManufacturerRepository: ~
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/meta.yml b/src/PrestaShopBundle/Resources/config/services/adapter/meta.yml
index 16c5d5ed50189..5fe20bf161c61 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/meta.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/meta.yml
@@ -12,37 +12,29 @@ services:
 
   prestashop.adapter.meta.command_handler.save_meta:
     class: 'PrestaShop\PrestaShop\Adapter\Meta\CommandHandler\AddMetaHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.core.hook.dispatcher'
       - '@validator'
       - '@=service("prestashop.adapter.legacy.configuration").get("PS_LANG_DEFAULT")'
       - '@prestashop.adapter.meta.data_provider'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Meta\Command\AddMetaCommand'
 
   prestashop.adapter.meta.command_handler.edit_meta:
     class: 'PrestaShop\PrestaShop\Adapter\Meta\CommandHandler\EditMetaHandler'
+    autoconfigure: true
     arguments:
       - '@validator'
       - '@prestashop.adapter.meta.data_provider'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Meta\Command\EditMetaCommand'
 
   # QUERY HANDLERS
 
   prestashop.adapter.meta.query_handler.get_meta_for_editing:
     class: 'PrestaShop\PrestaShop\Adapter\Meta\QueryHandler\GetMetaForEditingHandler'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Meta\Query\GetMetaForEditing'
+    autoconfigure: true
 
 
   prestashop.adapter.meta.query_handler.get_pages_for_layout_customization_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Meta\QueryHandler\GetPagesForLayoutCustomizationHandler'
+    autoconfigure: true
     arguments:
       - '@=service("prestashop.adapter.legacy.context").getContext().language.id'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Meta\Query\GetPagesForLayoutCustomization'
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/module.yml b/src/PrestaShopBundle/Resources/config/services/adapter/module.yml
index 2385ca71619ec..773a2ecb2b8c0 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/module.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/module.yml
@@ -4,13 +4,11 @@ services:
 
   prestashop.adapter.module.command_handler.bulk_toggle_module_status_handler:
     class: PrestaShop\PrestaShop\Adapter\Module\CommandHandler\BulkToggleModuleStatusHandler
+    autoconfigure: true
     arguments:
       - '@prestashop.module.manager'
       - '@prestashop.adapter.legacy.logger'
       - '@prestashop.core.cache.clearer.cache_clearer_chain'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Module\Command\BulkToggleModuleStatusCommand'
 
   prestashop.adapter.module.self_configurator:
     class: PrestaShop\PrestaShop\Adapter\Module\Configuration\ModuleSelfConfigurator
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/notification.yml b/src/PrestaShopBundle/Resources/config/services/adapter/notification.yml
index ee017becdbcf0..667da21dc97c9 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/notification.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/notification.yml
@@ -5,14 +5,10 @@ services:
 
   prestashop.adapter.notification.command_handler.update_employee_notification_last_element_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Notification\CommandHandler\UpdateEmployeeNotificationLastElementHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Notification\Command\UpdateEmployeeNotificationLastElementCommand'
+    autoconfigure: true
 
   prestashop.adapter.notification.query_handler.get_notification_last_elements_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Notification\QueryHandler\GetNotificationLastElementsHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.notifications.configuration'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Notification\Query\GetNotificationLastElements'
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/order.yml b/src/PrestaShopBundle/Resources/config/services/adapter/order.yml
index a61e145bb0b81..904b39ac01908 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/order.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/order.yml
@@ -4,122 +4,95 @@ services:
 
   prestashop.adapter.order.command_handler.duplicate_order_cart_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Order\CommandHandler\DuplicateOrderCartHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.context_state_manager'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Order\Command\DuplicateOrderCartCommand'
 
   prestashop.adapter.order.command_handler.add_order_from_back_office_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Order\CommandHandler\AddOrderFromBackOfficeHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.context_state_manager'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Order\Command\AddOrderFromBackOfficeCommand'
 
   prestashop.adapter.order.command_handler.add_product_to_order_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\AddProductToOrderHandler
+    autoconfigure: true
     arguments:
       - '@translator'
       - '@prestashop.adapter.context_state_manager'
       - '@prestashop.adapter.order.amount.updater'
       - '@prestashop.adapter.order.product_quantity.updater'
       - '@prestashop.adapter.order.order_detail.updater'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Product\Command\AddProductToOrderCommand
 
   prestashop.adapter.order.command_handler.update_order_status_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\UpdateOrderStatusHandler
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\UpdateOrderStatusCommand
+    autoconfigure: true
 
   prestashop.adapter.order.command_handler.update_product_in_order_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\UpdateProductInOrderHandler
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.order.product_quantity.updater'
       - '@prestashop.adapter.order.order_detail.updater'
       - '@prestashop.adapter.context_state_manager'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Product\Command\UpdateProductInOrderCommand
 
   prestashop.adapter.order.command_handler.change_order_delivery_address_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\ChangeOrderDeliveryAddressHandler
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.order.amount.updater'
       - '@prestashop.adapter.order.order_detail.updater'
       - '@prestashop.adapter.context_state_manager'
       - '@prestashop.adapter.order.product_quantity.updater'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\ChangeOrderDeliveryAddressCommand
 
   prestashop.adapter.order.command_handler.change_order_invoice_address_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\ChangeOrderInvoiceAddressHandler
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.order.amount.updater'
       - '@prestashop.adapter.order.order_detail.updater'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\ChangeOrderInvoiceAddressCommand
 
   prestashop.adapter.order.command_handler.change_order_currency_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\ChangeOrderCurrencyHandler
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\ChangeOrderCurrencyCommand
+    autoconfigure: true
 
   prestashop.adapter.order.command_handler.add_payment_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\AddPaymentHandler
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Payment\Command\AddPaymentCommand
+    autoconfigure: true
 
   prestashop.adapter.order.command_handler.generate_invoice_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\GenerateInvoiceHandler
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Invoice\Command\GenerateInvoiceCommand
+    autoconfigure: true
 
   prestashop.adapter.order.command_handler.update_order_shipping_details_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\UpdateOrderShippingDetailsHandler
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.order.amount.updater'
       - '@prestashop.adapter.context_state_manager'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\UpdateOrderShippingDetailsCommand
 
   prestashop.adapter.order.command_handler.delete_cart_rule_from_order_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\DeleteCartRuleFromOrderHandler
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.order.amount.updater'
       - '@prestashop.adapter.order.product_quantity.updater'
       - '@prestashop.adapter.context_state_manager'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\DeleteCartRuleFromOrderCommand
 
   prestashop.adapter.order.command_handler.add_cart_rule_to_order_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\AddCartRuleToOrderHandler
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.order.amount.updater'
       - '@prestashop.adapter.context_state_manager'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\AddCartRuleToOrderCommand
 
   prestashop.adapter.order.command_handler.update_invoice_note_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\UpdateInvoiceNoteHandler
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Invoice\Command\UpdateInvoiceNoteCommand
+    autoconfigure: true
 
   prestashop.adapter.order.command_handler.issue_partial_refund_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\IssuePartialRefundHandler
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.legacy.configuration'
       - '@prestashop.adapter.order.refund.order_refund_calculator'
@@ -127,12 +100,10 @@ services:
       - '@prestashop.adapter.order.refund.voucher_generator'
       - '@prestashop.adapter.order.refund.updater'
       - '@prestashop.adapter.context_state_manager'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\IssuePartialRefundCommand
 
   prestashop.adapter.order.command_handler.issue_standard_refund_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\IssueStandardRefundHandler
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.legacy.configuration'
       - '@prestashop.adapter.order.refund.order_refund_calculator'
@@ -140,12 +111,10 @@ services:
       - '@prestashop.adapter.order.refund.voucher_generator'
       - '@prestashop.adapter.order.refund.updater'
       - '@prestashop.adapter.context_state_manager'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\IssueStandardRefundCommand
 
   prestashop.adapter.order.command_handler.issue_return_product_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\IssueReturnProductHandler
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.legacy.configuration'
       - '@prestashop.adapter.order.refund.order_refund_calculator'
@@ -153,9 +122,6 @@ services:
       - '@prestashop.adapter.order.refund.voucher_generator'
       - '@prestashop.adapter.order.refund.updater'
       - '@prestashop.adapter.context_state_manager'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\IssueReturnProductCommand
 
   prestashop.adapter.order.refund.order_refund_calculator:
     class: PrestaShop\PrestaShop\Adapter\Order\Refund\OrderRefundCalculator
@@ -180,21 +146,18 @@ services:
 
   prestashop.adapter.order.command_handler.delete_product_from_order_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\DeleteProductFromOrderHandler
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.context_state_manager'
       - '@prestashop.adapter.order.product_quantity.updater'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Product\Command\DeleteProductFromOrderCommand
 
   prestashop.adapter.order.command_handler.bulk_change_order_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Order\CommandHandler\BulkChangeOrderStatusHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Order\Command\BulkChangeOrderStatusCommand'
+    autoconfigure: true
 
   prestashop.adapter.order.query_handler.get_order_for_viewing_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\QueryHandler\GetOrderForViewingHandler
+    autoconfigure: true
     arguments:
       - '@translator'
       - '@=service("prestashop.adapter.legacy.context").getContext().language.id'
@@ -204,55 +167,41 @@ services:
       - '@prestashop.adapter.order.query_handler.get_order_products_for_viewing_handler'
       - '@prestashop.adapter.legacy.configuration'
       - '@prestashop.adapter.address.formatter'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Query\GetOrderForViewing
 
   prestashop.adapter.order.query_handler.get_order_products_for_viewing_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\QueryHandler\GetOrderProductsForViewingHandler
+    autoconfigure: true
     arguments:
       - '@prestashop.core.image.parser.image_tag_source_parser'
       - '@=service("prestashop.adapter.legacy.context").getContext().language.id'
       - "@prestashop.core.localization.locale.context_locale"
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Query\GetOrderProductsForViewing
-
 
   prestashop.adapter.order.command_handler.resend_order_email_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\ResendOrderEmailHandler
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\ResendOrderEmailCommand
+    autoconfigure: true
 
   prestashop.adapter.order.query_handler.get_order_preview_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Order\QueryHandler\GetOrderPreviewHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.core.localization.locale.repository'
       - "@=service('prestashop.adapter.legacy.context').getContext().language.getLocale()"
       - '@prestashop.adapter.address.formatter'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Order\Query\GetOrderPreview'
 
   prestashop.adapter.order.command_handler.send_process_order_email_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\SendProcessOrderEmailHandler
+    autoconfigure: true
     arguments:
       - '@translator'
       - '@=service("prestashop.adapter.legacy.context").getContext().link'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\SendProcessOrderEmailCommand
 
   prestashop.adapter.order.command_handler.cancel_order_product_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\CancelOrderProductHandler
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.order.product_quantity.updater'
       - '@logger'
       - '@translator'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\CancelOrderProductCommand
 
   prestashop.adapter.order.order_sibling_provider:
     class: PrestaShop\PrestaShop\Adapter\Order\OrderSiblingProvider
@@ -280,9 +229,7 @@ services:
 
   prestashop.adapter.order.command_handler.set_internal_order_note_handler:
     class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\SetInternalOrderNoteHandler
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Order\Command\SetInternalOrderNoteCommand
+    autoconfigure: true
 
   prestashop.adapter.order.repository.order_repository:
     class: PrestaShop\PrestaShop\Adapter\Order\Repository\OrderRepository
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/order_message.yml b/src/PrestaShopBundle/Resources/config/services/adapter/order_message.yml
index fc26abc133a98..4e5fec11330ab 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/order_message.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/order_message.yml
@@ -4,33 +4,23 @@ services:
 
   prestashop.adapter.order_message.command_handler.add_order_message_handler:
     class: PrestaShop\PrestaShop\Adapter\OrderMessage\CommandHandler\AddOrderMessageHandler
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\OrderMessage\Command\AddOrderMessageCommand
+    autoconfigure: true
 
   prestashop.adapter.order_message.command_handler.edit_order_message_handler:
     class: PrestaShop\PrestaShop\Adapter\OrderMessage\CommandHandler\EditOrderMessageHandler
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\OrderMessage\Command\EditOrderMessageCommand
+    autoconfigure: true
 
   prestashop.adapter.order_message.query_handler.get_order_message_for_editing_handler:
     class: PrestaShop\PrestaShop\Adapter\OrderMessage\QueryHandler\GetOrderMessageForEditingHandler
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\OrderMessage\Query\GetOrderMessageForEditing
+    autoconfigure: true
 
   prestashop.adapter.order_message.command_handler.delete_order_message_handler:
     class: PrestaShop\PrestaShop\Adapter\OrderMessage\CommandHandler\DeleteOrderMessageHandler
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\OrderMessage\Command\DeleteOrderMessageCommand
+    autoconfigure: true
 
   prestashop.adapter.order_message.command_handler.bulk_delete_order_message_handler:
     class: PrestaShop\PrestaShop\Adapter\OrderMessage\CommandHandler\BulkDeleteOrderMessageHandler
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\OrderMessage\Command\BulkDeleteOrderMessageCommand
+    autoconfigure: true
 
   prestashop.adapter.order_message.order_message_provider:
     class: 'PrestaShop\PrestaShop\Adapter\OrderMessage\OrderMessageProvider'
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/order_return.yml b/src/PrestaShopBundle/Resources/config/services/adapter/order_return.yml
index ea59be8cb3a51..b3335b105e1b9 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/order_return.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/order_return.yml
@@ -4,9 +4,7 @@ services:
 
   prestashop.adapter.order_return.query_handler.get_order_return_for_editing_handler:
     class: 'PrestaShop\PrestaShop\Adapter\OrderReturn\QueryHandler\GetOrderReturnForEditingHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\OrderReturn\Query\GetOrderReturnForEditing'
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.order_return.repository.order_return_repository'
       - '@PrestaShop\PrestaShop\Adapter\Customer\Repository\CustomerRepository'
@@ -14,9 +12,7 @@ services:
 
   prestashop.adapter.order_return.command_handler.update_order_return_state_handler:
     class: 'PrestaShop\PrestaShop\Adapter\OrderReturn\CommandHandler\UpdateOrderReturnStateHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\OrderReturn\Command\UpdateOrderReturnStateCommand'
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.order_return.repository.order_return_repository'
       - '@prestashop.adapter.order_return_state.repository.order_return_state_repository'
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/order_return_state.yml b/src/PrestaShopBundle/Resources/config/services/adapter/order_return_state.yml
index 8b7d51ef829e2..7d53f660562b0 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/order_return_state.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/order_return_state.yml
@@ -4,33 +4,23 @@ services:
 
   prestashop.adapter.order_return_state.command_handler.add_order_return_state:
     class: 'PrestaShop\PrestaShop\Adapter\OrderReturnState\CommandHandler\AddOrderReturnStateHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Command\AddOrderReturnStateCommand'
+    autoconfigure: true
 
   prestashop.adapter.order_return_state.query_handler.get_order_return_state_for_editing:
     class: 'PrestaShop\PrestaShop\Adapter\OrderReturnState\QueryHandler\GetOrderReturnStateForEditingHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Query\GetOrderReturnStateForEditing'
+    autoconfigure: true
 
   prestashop.adapter.order_return_state.command_handler.edit_order_return_state_handler:
     class: 'PrestaShop\PrestaShop\Adapter\OrderReturnState\CommandHandler\EditOrderReturnStateHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Command\EditOrderReturnStateCommand'
+    autoconfigure: true
 
   prestashop.adapter.order_return_state.repository.order_return_state_repository:
     class: 'PrestaShop\PrestaShop\Adapter\OrderReturnState\Repository\OrderReturnStateRepository'
 
   prestashop.adapter.order_return_state.command_handler.delete_order_return_state_handler:
     class: 'PrestaShop\PrestaShop\Adapter\OrderReturnState\CommandHandler\DeleteOrderReturnStateHandler'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Command\DeleteOrderReturnStateCommand'
+    autoconfigure: true
 
   prestashop.adapter.order_return_state.command_handler.bulk_delete_order_return_state_handler:
     class: 'PrestaShop\PrestaShop\Adapter\OrderReturnState\CommandHandler\BulkDeleteOrderReturnStateHandler'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Command\BulkDeleteOrderReturnStateCommand'
+    autoconfigure: true
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/order_state.yml b/src/PrestaShopBundle/Resources/config/services/adapter/order_state.yml
index c5ab403a1bea4..f69f7acd2eb16 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/order_state.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/order_state.yml
@@ -4,28 +4,20 @@ services:
 
   prestashop.adapter.order_state.command_handler.add_order_state:
     class: 'PrestaShop\PrestaShop\Adapter\OrderState\CommandHandler\AddOrderStateHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\OrderState\Command\AddOrderStateCommand'
+    autoconfigure: true
 
   prestashop.adapter.order_state.query_handler.get_order_state_for_editing:
     class: 'PrestaShop\PrestaShop\Adapter\OrderState\QueryHandler\GetOrderStateForEditingHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\OrderState\Query\GetOrderStateForEditing'
+    autoconfigure: true
 
   prestashop.adapter.order_state.command_handler.edit_order_state_handler:
     class: 'PrestaShop\PrestaShop\Adapter\OrderState\CommandHandler\EditOrderStateHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\OrderState\Command\EditOrderStateCommand'
+    autoconfigure: true
 
   prestashop.adapter.order_state.command_handler.delete_order_state_handler:
     class: 'PrestaShop\PrestaShop\Adapter\OrderState\CommandHandler\DeleteOrderStateHandler'
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\OrderState\Command\DeleteOrderStateCommand' }
+    autoconfigure: true
 
   prestashop.adapter.order_state.command_handler.bulk_delete_order_state_handler:
     class: 'PrestaShop\PrestaShop\Adapter\OrderState\CommandHandler\BulkDeleteOrderStateHandler'
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\OrderState\Command\BulkDeleteOrderStateCommand' }
+    autoconfigure: true
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product.yml
index 3498cebc6ce83..11937580d5ee6 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/product.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/product.yml
@@ -66,32 +66,24 @@ services:
 
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\AssignProductToCategoryHandler:
     autowire: true
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\AssignProductToCategoryCommand
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Product\QueryHandler\SearchProductsHandler:
+    autoconfigure: true
     arguments:
       - '@=service("PrestaShop\\PrestaShop\\Adapter\\LegacyContext").getContext().language.id'
       - '@PrestaShop\PrestaShop\Core\Localization\LocaleInterface'
       - '@PrestaShop\PrestaShop\Adapter\Tools'
       - '@PrestaShop\PrestaShop\Core\Currency\CurrencyDataProviderInterface'
       - '@PrestaShop\PrestaShop\Adapter\ContextStateManager'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Query\SearchProducts
 
   PrestaShop\PrestaShop\Adapter\Product\QueryHandler\SearchProductsForAssociationHandler:
     autowire: true
     public: false
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Query\SearchProductsForAssociation
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Product\QueryHandler\GetProductIsEnabledHandler:
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Query\GetProductIsEnabled
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Product\Grid\Data\Factory\ProductGridDataFactoryDecorator:
     arguments:
@@ -126,104 +118,76 @@ services:
   PrestaShop\PrestaShop\Adapter\Product\QueryHandler\GetProductForEditingHandler:
     autowire: true
     public: false
+    autoconfigure: true
     arguments:
       $countryId: '@=service("PrestaShop\\PrestaShop\\Adapter\\Configuration").getInt("PS_COUNTRY_DEFAULT")'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Query\GetProductForEditing
 
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\AddProductHandler:
     autowire: true
     public: false
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\AddProductCommand
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\SetProductTagsHandler:
     autowire: true
     public: false
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\SetProductTagsCommand
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\UpdateProductsPositionsHandler:
+    autoconfigure: true
     arguments:
       - '@prestashop.core.grid.product.position_definition'
       - '@PrestaShop\PrestaShop\Core\Grid\Position\PositionUpdateFactoryInterface'
       - '@PrestaShop\PrestaShop\Core\Grid\Position\GridPositionUpdaterInterface'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\UpdateProductsPositionsCommand
 
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\RemoveAllProductTagsHandler:
     autowire: true
     public: false
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\RemoveAllProductTagsCommand
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\SetAssociatedProductCategoriesHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductCategoryUpdater'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\SetAssociatedProductCategoriesCommand
 
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\RemoveAllAssociatedProductCategoriesHandler:
     autowire: true
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\RemoveAllAssociatedProductCategoriesCommand
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\SetCarriersHandler:
     autowire: true
     public: false
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\SetCarriersCommand
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Product\QueryHandler\GetProductSupplierOptionsHandler:
     autowire: true
     public: false
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Query\GetProductSupplierOptions
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Product\Supplier\QueryHandler\GetAssociatedSuppliersHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Repository\ProductSupplierRepository'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Query\GetAssociatedSuppliers
 
   PrestaShop\PrestaShop\Adapter\Product\Supplier\CommandHandler\SetSuppliersHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Command\SetSuppliersCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Supplier\CommandHandler\SetProductDefaultSupplierHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Command\SetProductDefaultSupplierCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Supplier\CommandHandler\UpdateProductSuppliersHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater'
       - '@PrestaShop\PrestaShop\Adapter\Product\Repository\ProductSupplierRepository'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Command\UpdateProductSuppliersCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Supplier\CommandHandler\RemoveAllAssociatedProductSuppliersHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Command\RemoveAllAssociatedProductSuppliersCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Update\ProductAttachmentUpdater:
     autowire: true
@@ -246,43 +210,31 @@ services:
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\DeleteProductHandler:
     autowire: true
     public: false
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\DeleteProductCommand
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\BulkDeleteProductHandler:
     autowire: true
     public: false
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\BulkDeleteProductCommand
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\BulkDuplicateProductHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductDuplicator'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\BulkDuplicateProductCommand
 
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\BulkUpdateProductStatusHandler:
     autowire: true
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\BulkUpdateProductStatusCommand
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Product\Attachment\CommandHandler\SetAssociatedProductAttachmentsHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductAttachmentUpdater'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Attachment\Command\SetAssociatedProductAttachmentsCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Attachment\CommandHandler\RemoveAllAssociatedProductAttachmentsHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductAttachmentUpdater'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Attachment\Command\RemoveAllAssociatedProductAttachmentsCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Validate\ProductSupplierValidator:
     autowire: true
@@ -305,25 +257,19 @@ services:
     public: false
 
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\SetRelatedProductsHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\RelatedProductsUpdater'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\SetRelatedProductsCommand
 
   PrestaShop\PrestaShop\Adapter\Product\QueryHandler\GetRelatedProductsHandler:
     autowire: true
     public: false
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Query\GetRelatedProducts
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\RemoveAllRelatedProductsHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\RelatedProductsUpdater'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\RemoveAllRelatedProductsCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Repository\TagRepository:
     arguments:
@@ -340,11 +286,9 @@ services:
     public: false
 
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\DuplicateProductHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductDuplicator'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\DuplicateProductCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Update\ProductDuplicator:
     autowire: true
@@ -354,11 +298,9 @@ services:
       $productImageSystemPathFactory: '@prestashop.adapter.product.image.product_image_filesystem_path_factory'
 
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\UpdateProductTypeHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductTypeUpdater'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\UpdateProductTypeCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Update\ProductIndexationUpdater:
     arguments:
@@ -376,25 +318,19 @@ services:
   PrestaShop\PrestaShop\Adapter\Product\Shop\CommandHandler\SetProductShopsHandler:
     autowire: true
     public: false
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Shop\Command\SetProductShopsCommand
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\UpdateProductHandler:
     autowire: true
     public: false
+    autoconfigure: true
     arguments:
       $productUpdatablePropertyFiller: '@PrestaShop\PrestaShop\Adapter\Product\Update\Filler\ProductFiller'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Command\UpdateProductCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Stock\CommandHandler\UpdateProductStockAvailableHandler:
     autowire: true
     public: false
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Stock\Command\UpdateProductStockAvailableCommand
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Product\Update\Filler\ProductFiller:
     arguments:
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product/_combination.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product/_combination.yml
index bfb5dd868df2f..88cc9cf54de30 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/product/_combination.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/product/_combination.yml
@@ -3,49 +3,37 @@ services:
     public: true
 
   PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler\GenerateProductCombinationsHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Combination\Create\CombinationCreator'
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\GenerateProductCombinationsCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler\UpdateCombinationHandler:
     autowire: true
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\UpdateCombinationCommand
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler\UpdateCombinationStockAvailableHandler:
     autowire: true
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\UpdateCombinationStockAvailableCommand
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Product\Combination\QueryHandler\GetCombinationForEditingHandler:
     autowire: true
     public: false
+    autoconfigure: true
     arguments:
       $contextLanguageId: "@=service('prestashop.adapter.legacy.context').getContext().language.id"
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\GetCombinationForEditing
 
   PrestaShop\PrestaShop\Adapter\Product\Combination\QueryHandler\GetEditableCombinationsListHandler:
     autowire: true
     public: false
+    autoconfigure: true
     arguments:
       $combinationQueryBuilder: '@PrestaShop\PrestaShop\Core\Grid\Query\ProductCombinationQueryBuilder'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\GetEditableCombinationsList
 
   PrestaShop\PrestaShop\Adapter\Product\Combination\QueryHandler\SearchCombinationsForAssociationHandler:
     autowire: true
     public: false
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\SearchCombinationsForAssociation
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Product\Combination\Validate\CombinationValidator: ~
 
@@ -82,61 +70,45 @@ services:
       - '%database_prefix%'
 
   PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler\UpdateCombinationSuppliersHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Combination\Repository\CombinationRepository'
       - '@PrestaShop\PrestaShop\Adapter\Product\Repository\ProductSupplierRepository'
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\UpdateCombinationSuppliersCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Combination\QueryHandler\GetCombinationSuppliersHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Repository\ProductSupplierRepository'
       - '@PrestaShop\PrestaShop\Adapter\Product\Combination\Repository\CombinationRepository'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\GetCombinationSuppliers
 
   PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler\SetCombinationImagesHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Combination\Update\CombinationImagesUpdater'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\SetCombinationImagesCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler\RemoveAllCombinationImagesHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Combination\Update\CombinationImagesUpdater'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\RemoveAllCombinationImagesCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler\DeleteCombinationHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Combination\Update\CombinationDeleter'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\DeleteCombinationCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler\BulkDeleteCombinationHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Combination\Update\CombinationDeleter'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\BulkDeleteCombinationCommand
 
   PrestaShop\PrestaShop\Core\Domain\Product\Combination\QueryHandler\SearchProductCombinationsHandler:
     autowire: true
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\SearchProductCombinations
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Core\Domain\Product\Combination\QueryHandler\GetCombinationIdsHandler:
     autowire: true
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\GetCombinationIds
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Product\Combination\Update\Filler\CombinationFiller:
     arguments:
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product/_customization.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product/_customization.yml
index 8d8c723d5e159..63357e4c4ae2a 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/product/_customization.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/product/_customization.yml
@@ -19,23 +19,17 @@ services:
     public: false
 
   PrestaShop\PrestaShop\Adapter\Product\Customization\QueryHandler\GetProductCustomizationFieldsHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Customization\Repository\CustomizationFieldRepository'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Customization\Query\GetProductCustomizationFields
 
   PrestaShop\PrestaShop\Adapter\Product\Customization\CommandHandler\SetProductCustomizationFieldsHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Customization\Repository\CustomizationFieldRepository'
       - '@PrestaShop\PrestaShop\Adapter\Product\Customization\Update\ProductCustomizationFieldUpdater'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Customization\Command\SetProductCustomizationFieldsCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Customization\CommandHandler\RemoveAllCustomizationFieldsFromProductHandler:
     autowire: true
     public: false
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Customization\Command\RemoveAllCustomizationFieldsFromProductCommand
+    autoconfigure: true
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product/_feature_value.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product/_feature_value.yml
index c659664317fbe..b2f8e621ecfe6 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/product/_feature_value.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/product/_feature_value.yml
@@ -3,25 +3,19 @@ services:
     public: true
 
   PrestaShop\PrestaShop\Adapter\Product\FeatureValue\CommandHandler\SetProductFeatureValuesHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\FeatureValue\Update\ProductFeatureValueUpdater'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\FeatureValue\Command\SetProductFeatureValuesCommand
 
   PrestaShop\PrestaShop\Adapter\Product\FeatureValue\CommandHandler\RemoveAllFeatureValuesFromProductHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\FeatureValue\Update\ProductFeatureValueUpdater'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\FeatureValue\Command\RemoveAllFeatureValuesFromProductCommand
 
   PrestaShop\PrestaShop\Adapter\Product\FeatureValue\QueryHandler\GetProductFeatureValuesHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureValueRepository'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\FeatureValue\Query\GetProductFeatureValues
 
   PrestaShop\PrestaShop\Adapter\Product\FeatureValue\Update\ProductFeatureValueUpdater:
     autowire: true
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product/_image.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product/_image.yml
index de0a739d32683..f9cf25c76dc0c 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/product/_image.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/product/_image.yml
@@ -5,54 +5,40 @@ services:
   PrestaShop\PrestaShop\Adapter\Product\Image\CommandHandler\AddProductImageHandler:
     autowire: true
     public: false
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Image\Command\AddProductImageCommand
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Product\Image\CommandHandler\UpdateProductImageHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Image\Repository\ProductImageRepository'
       - '@PrestaShop\PrestaShop\Adapter\Product\Image\Update\ProductImageUpdater'
       - '@PrestaShop\PrestaShop\Adapter\Product\Image\Uploader\ProductImageUploader'
       - '@PrestaShop\PrestaShop\Adapter\Image\ProductImageFileValidator'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Image\Command\UpdateProductImageCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Image\CommandHandler\DeleteProductImageHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Image\Update\ProductImageUpdater'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Image\Command\DeleteProductImageCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Image\CommandHandler\SetProductImagesForAllShopHandler:
     autowire: true
     public: false
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Image\Command\SetProductImagesForAllShopCommand
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Product\Image\QueryHandler\GetProductImagesHandler:
     autowire: true
     public: false
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Image\Query\GetProductImages
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Product\Image\QueryHandler\GetShopProductImagesHandler:
     autowire: true
     public: false
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Image\Query\GetShopProductImages
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Product\Image\QueryHandler\GetProductImageHandler:
     autowire: true
     public: false
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Image\Query\GetProductImage
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Product\Image\Validate\ProductImageValidator: ~
 
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product/_pack.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product/_pack.yml
index 1d0bdc7485dc6..75a637081d597 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/product/_pack.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/product/_pack.yml
@@ -12,25 +12,19 @@ services:
     public: false
 
   PrestaShop\PrestaShop\Adapter\Product\Pack\CommandHandler\SetPackProductsHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Pack\Update\ProductPackUpdater'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Pack\Command\SetPackProductsCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Pack\CommandHandler\RemoveAllProductsFromPackHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Pack\Update\ProductPackUpdater'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Pack\Command\RemoveAllProductsFromPackCommand
 
   PrestaShop\PrestaShop\Adapter\Product\Pack\QueryHandler\GetPackedProductsHandler:
     autowire: true
     public: false
+    autoconfigure: true
     arguments:
       $defaultLangId: '@=service("prestashop.adapter.legacy.context").getContext().language.id'
       $translator: '@translator'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Pack\Query\GetPackedProducts
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product/_specific_prices.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product/_specific_prices.yml
index 6a666a7b42c7d..c1e461dd94947 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/product/_specific_prices.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/product/_specific_prices.yml
@@ -3,56 +3,42 @@ services:
     public: true
 
   PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\QueryHandler\GetSpecificPriceListHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Repository\SpecificPriceRepository'
       - '@PrestaShop\PrestaShop\Adapter\Attribute\Repository\AttributeRepository'
       - '@PrestaShop\PrestaShop\Core\Product\Combination\NameBuilder\CombinationNameBuilderInterface'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Query\GetSpecificPriceList
 
   PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\QueryHandler\GetSpecificPriceForEditingHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Repository\SpecificPriceRepository'
       - '@PrestaShop\PrestaShop\Adapter\Customer\Repository\CustomerRepository'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Query\GetSpecificPriceForEditing
 
   PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\CommandHandler\AddSpecificPriceHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Repository\SpecificPriceRepository'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\AddSpecificPriceCommand
 
   PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\CommandHandler\EditSpecificPriceHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Repository\SpecificPriceRepository'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\EditSpecificPriceCommand
 
   PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\CommandHandler\DeleteSpecificPriceHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Repository\SpecificPriceRepository'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\DeleteSpecificPriceCommand
 
   PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\CommandHandler\SetSpecificPricePriorityForProductHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Update\SpecificPricePriorityUpdater'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\SetSpecificPricePriorityForProductCommand
 
   PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\CommandHandler\RemoveSpecificPricePriorityForProductHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Update\SpecificPricePriorityUpdater'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\RemoveSpecificPricePriorityForProductCommand
 
   PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Update\SpecificPricePriorityUpdater:
     public: true
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product/_stock.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product/_stock.yml
index 629a2d845b6d8..e8abef4d9ecd7 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/product/_stock.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/product/_stock.yml
@@ -21,22 +21,18 @@ services:
       - '@PrestaShop\PrestaShop\Core\ConfigurationInterface'
 
   PrestaShop\PrestaShop\Adapter\Product\Stock\QueryHandler\GetProductStockMovementsHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Stock\Repository\StockAvailableRepository'
       - '@PrestaShop\PrestaShop\Adapter\Product\Stock\Repository\StockMovementRepository'
       - '@translator'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Stock\Query\GetProductStockMovements
 
   PrestaShop\PrestaShop\Adapter\Product\Stock\QueryHandler\GetCombinationStockMovementsHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\Stock\Repository\StockAvailableRepository'
       - '@PrestaShop\PrestaShop\Adapter\Product\Stock\Repository\StockMovementRepository'
       - '@translator'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\Stock\Query\GetCombinationStockMovements
 
   PrestaShop\PrestaShop\Adapter\Product\Stock\Update\ProductStockUpdater:
     autowire: true
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product/_virtual_product.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product/_virtual_product.yml
index 32cdcc4d6c68e..8468854cf0054 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/product/_virtual_product.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/product/_virtual_product.yml
@@ -3,19 +3,15 @@ services:
     public: true
 
   PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\CommandHandler\AddVirtualProductFileHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\Update\VirtualProductUpdater'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\VirtualProductFile\Command\AddVirtualProductFileCommand
 
   PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\CommandHandler\UpdateVirtualProductFileHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\Update\VirtualProductUpdater'
       - '@PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\Repository\VirtualProductFileRepository'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\VirtualProductFile\Command\UpdateVirtualProductFileCommand
 
   PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\Update\VirtualProductUpdater:
     autowire: true
@@ -37,8 +33,6 @@ services:
       - !php/const _PS_DOWNLOAD_DIR_
 
   PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\CommandHandler\DeleteVirtualProductFileHandler:
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\Update\VirtualProductUpdater'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\Product\VirtualProductFile\Command\DeleteVirtualProductFileCommand
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/profile.yml b/src/PrestaShopBundle/Resources/config/services/adapter/profile.yml
index 47a12b1a935df..7d2b6c68c1905 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/profile.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/profile.yml
@@ -5,52 +5,41 @@ services:
 
   prestashop.adapter.profile.command_handler.delete_profile:
     class: 'PrestaShop\PrestaShop\Adapter\Profile\CommandHandler\DeleteProfileHandler'
+    autoconfigure: true
     arguments:
       - '@=service("prestashop.adapter.legacy.configuration").get("_PS_ADMIN_PROFILE_")'
       - '@prestashop.adapter.data_provider.employee'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Profile\Command\DeleteProfileCommand'
 
   prestashop.adapter.profile.command_handler.bulk_delete_profile:
     class: 'PrestaShop\PrestaShop\Adapter\Profile\CommandHandler\BulkDeleteProfileHandler'
+    autoconfigure: true
     arguments:
       - '@=service("prestashop.adapter.legacy.configuration").get("_PS_ADMIN_PROFILE_")'
       - '@prestashop.adapter.data_provider.employee'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Profile\Command\BulkDeleteProfileCommand'
 
   prestashop.adapter.profile.command_handler.add_profile_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Profile\CommandHandler\AddProfileHandler'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Profile\Command\AddProfileCommand'
+    autoconfigure: true
 
   prestashop.adapter.profile.command_handler.edit_profile_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Profile\CommandHandler\EditProfileHandler'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Profile\Command\EditProfileCommand'
+    autoconfigure: true
 
   prestashop.adapter.profile.query_handler.get_profile_for_editing_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Profile\QueryHandler\GetProfileForEditingHandler'
+    autoconfigure: true
     arguments:
       - '@=service("prestashop.adapter.employee.avatar_provider").getDefaultAvatarUrl()'
       - '@prestashop.core.image.parser.image_tag_source_parser'
       - !php/const _PS_PROFILE_IMG_DIR_
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Profile\Query\GetProfileForEditing'
 
   prestashop.adapter.profile.permission.command_handler.update_tab_permissions_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Profile\Permission\CommandHandler\UpdateTabPermissionsHandler'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Profile\Permission\Command\UpdateTabPermissionsCommand'
+    autoconfigure: true
 
   prestashop.adapter.profile.permission.query_handler.get_permissions_for_configuration_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Profile\Permission\QueryHandler\GetPermissionsForConfigurationHandler'
+    autoconfigure: true
     arguments:
       - '@security.authorization_checker'
       - '@=service("prestashop.adapter.legacy.context").getContext().language.id'
@@ -58,12 +47,7 @@ services:
         - 'AdminLogin'
         - 'AdminQuickAccesses'
         - 'AdminTabs'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Profile\Permission\Query\GetPermissionsForConfiguration'
 
   prestashop.adapter.profile.permission.command_handler.update_module_permissions_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Profile\Permission\CommandHandler\UpdateModulePermissionsHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Profile\Permission\Command\UpdateModulePermissionsCommand'
+    autoconfigure: true
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/search_engine.yml b/src/PrestaShopBundle/Resources/config/services/adapter/search_engine.yml
index f1ffd9eb98903..bfc6e8ecf1916 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/search_engine.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/search_engine.yml
@@ -5,31 +5,21 @@ services:
   # Command Handlers
   prestashop.adapter.search_engine.command_handler.add_search_engine_handler:
     class: PrestaShop\PrestaShop\Adapter\SearchEngine\CommandHandler\AddSearchEngineHandler
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\SearchEngine\Command\AddSearchEngineCommand
+    autoconfigure: true
 
   prestashop.adapter.search_engine.command_handler.bulk_delete_search_engine_handler:
     class: PrestaShop\PrestaShop\Adapter\SearchEngine\CommandHandler\BulkDeleteSearchEngineHandler
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\SearchEngine\Command\BulkDeleteSearchEngineCommand
+    autoconfigure: true
 
   prestashop.adapter.search_engine.command_handler.delete_search_engine_handler:
     class: PrestaShop\PrestaShop\Adapter\SearchEngine\CommandHandler\DeleteSearchEngineHandler
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\SearchEngine\Command\DeleteSearchEngineCommand
+    autoconfigure: true
 
   prestashop.adapter.search_engine.command_handler.edit_search_engine_handler:
     class: PrestaShop\PrestaShop\Adapter\SearchEngine\CommandHandler\EditSearchEngineHandler
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\SearchEngine\Command\EditSearchEngineCommand
+    autoconfigure: true
 
   # Query Handlers
   prestashop.adapter.search_engine.query_handler.get_search_engine_for_editing_handler:
     class: PrestaShop\PrestaShop\Adapter\SearchEngine\QueryHandler\GetSearchEngineForEditingHandler
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\SearchEngine\Query\GetSearchEngineForEditing
+    autoconfigure: true
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/security.yml b/src/PrestaShopBundle/Resources/config/services/adapter/security.yml
index 8826c6b9b5af5..1b64152380aa4 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/security.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/security.yml
@@ -4,51 +4,39 @@ services:
 
   prestashop.adapter.security.command_handler.delete_customer_session_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Security\CommandHandler\DeleteCustomerSessionHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.security.repository.customer_session_repository'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\DeleteCustomerSessionCommand'
 
   prestashop.adapter.security.command_handler.clear_customer_session_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Security\CommandHandler\ClearOutdatedCustomerSessionHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.security.repository.customer_session_repository'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\ClearOutdatedCustomerSessionCommand'
 
   prestashop.adapter.security.command_handler.delete_employee_session_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Security\CommandHandler\DeleteEmployeeSessionHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.security.repository.employee_session_repository'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\DeleteEmployeeSessionCommand'
 
   prestashop.adapter.security.command_handler.clear_employee_session_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Security\CommandHandler\ClearOutdatedEmployeeSessionHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.security.repository.employee_session_repository'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\ClearOutdatedEmployeeSessionCommand'
 
   prestashop.adapter.security.command_handler.bulk_delete_employees_sessions_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Security\CommandHandler\BulkDeleteEmployeeSessionsHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.security.repository.employee_session_repository'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\BulkDeleteEmployeeSessionsCommand'
 
   prestashop.adapter.security.command_handler.bulk_delete_customers_sessions_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Security\CommandHandler\BulkDeleteCustomerSessionsHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.security.repository.customer_session_repository'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\BulkDeleteCustomerSessionsCommand'
 
   prestashop.adapter.security.repository.customer_session_repository:
     class: 'PrestaShop\PrestaShop\Adapter\Session\Repository\CustomerSessionRepository'
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/shop.yml b/src/PrestaShopBundle/Resources/config/services/adapter/shop.yml
index 8002a00207a3d..68e7ba04e3cb4 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/shop.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/shop.yml
@@ -4,12 +4,11 @@ services:
 
   prestashop.adapter.shop.command_handler.upload_logos_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Shop\CommandHandler\UploadLogosHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.legacy.configuration'
       - '@prestashop.core.shop.logo_uploader'
       - '@prestashop.core.hook.dispatcher'
-    tags:
-      - { name: messenger.cqrs_handler, command: 'PrestaShop\PrestaShop\Core\Domain\Shop\Command\UploadLogosCommand' }
 
   prestashop.adapter.shop.url.base_url_provider:
     class: 'PrestaShop\PrestaShop\Adapter\Shop\Url\BaseUrlProvider'
@@ -48,21 +47,17 @@ services:
 
   prestashop.adapter.shop.query_handler.get_logos_paths_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Shop\QueryHandler\GetLogosPathsHandler'
+    autoconfigure: true
     arguments:
       - '@=service("prestashop.adapter.legacy.configuration").get("_PS_IMG_")'
       - '@=service("prestashop.adapter.legacy.configuration").get("_PS_IMG_DIR_")'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: PrestaShop\PrestaShop\Core\Domain\Shop\Query\GetLogosPaths
 
   prestashop.adapter.shop.query_handler.search_shops_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Shop\QueryHandler\SearchShopsHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.core.admin.shop.repository'
       - '@prestashop.core.admin.shop_group.repository'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: PrestaShop\PrestaShop\Core\Domain\Shop\Query\SearchShops
 
   prestashop.adapter.shop.url.product_image_folder_provider:
     class: 'PrestaShop\PrestaShop\Adapter\Shop\Url\ImageFolderProvider'
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/sql_manager.yml b/src/PrestaShopBundle/Resources/config/services/adapter/sql_manager.yml
index 2c2b525fd28e2..1b359991a4603 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/sql_manager.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/sql_manager.yml
@@ -8,49 +8,41 @@ services:
   # Command handlers
   prestashop.adapter.sql_manager.command_handler.add_request_sql:
     class: 'PrestaShop\PrestaShop\Adapter\SqlManager\CommandHandler\AddSqlRequestHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.sql_manager.sql_query_validator'
       - '@translator'
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\AddSqlRequestCommand' }
 
   prestashop.adapter.sql_manager.command_handler.edit_request_sql:
     class: 'PrestaShop\PrestaShop\Adapter\SqlManager\CommandHandler\EditSqlRequestHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.sql_manager.sql_query_validator'
       - '@translator'
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\EditSqlRequestCommand' }
 
   prestashop.adapter.sql_manager.command_handler.delete_request_sql:
     class: 'PrestaShop\PrestaShop\Adapter\SqlManager\CommandHandler\DeleteSqlRequestHandler'
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\DeleteSqlRequestCommand' }
+    autoconfigure: true
 
   prestashop.adapter.sql_manager.command_handler.bulk_delete_request_sql:
     class: 'PrestaShop\PrestaShop\Adapter\SqlManager\CommandHandler\BulkDeleteSqlRequestHandler'
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\BulkDeleteSqlRequestCommand' }
+    autoconfigure: true
 
   # Query handlers
   prestashop.adapter.sql_manager.query_handler.get_request_sql_for_editing:
     class: 'PrestaShop\PrestaShop\Adapter\SqlManager\QueryHandler\GetSqlRequestForEditingHandler'
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetSqlRequestForEditing' }
+    autoconfigure: true
 
   prestashop.adapter.sql_manager.query_handler.get_request_sql_execution_result:
     class: 'PrestaShop\PrestaShop\Adapter\SqlManager\QueryHandler\GetSqlRequestExecutionResultHandler'
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetSqlRequestExecutionResult' }
+    autoconfigure: true
 
   prestashop.adapter.sql_manager.query_handler.get_database_tables_list:
     class: 'PrestaShop\PrestaShop\Adapter\SqlManager\QueryHandler\GetDatabaseTablesListHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.legacy.configuration'
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetDatabaseTablesList' }
 
   prestashop.adapter.sql_manager.query_handler.get_database_table_fields_list:
     class: 'PrestaShop\PrestaShop\Adapter\SqlManager\QueryHandler\GetDatabaseTableFieldsListHandler'
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetDatabaseTableFieldsList' }
+    autoconfigure: true
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/state.yml b/src/PrestaShopBundle/Resources/config/services/adapter/state.yml
index 378091c246970..63311e7be8b86 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/state.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/state.yml
@@ -4,42 +4,28 @@ services:
 
   prestashop.adapter.state.command_handler.create_state_handler:
     class: 'PrestaShop\PrestaShop\Adapter\State\CommandHandler\AddStateHandler'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\State\Command\AddStateCommand'
+    autoconfigure: true
 
   prestashop.adapter.state.command_handler.edit_state_handler:
     class: 'PrestaShop\PrestaShop\Adapter\State\CommandHandler\EditStateHandler'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\State\Command\EditStateCommand'
+    autoconfigure: true
 
   prestashop.adapter.state.command_handler.toggle_state_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\State\CommandHandler\ToggleStateStatusHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\State\Command\ToggleStateStatusCommand'
+    autoconfigure: true
 
   prestashop.adapter.state.query_handler.get_state_for_editing_handler:
     class: 'PrestaShop\PrestaShop\Adapter\State\QueryHandler\GetStateForEditingHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\State\Query\GetStateForEditing'
+    autoconfigure: true
 
   prestashop.adapter.state.command_handler.delete_state_handler:
     class: 'PrestaShop\PrestaShop\Adapter\State\CommandHandler\DeleteStateHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\State\Command\DeleteStateCommand'
+    autoconfigure: true
 
   prestashop.adapter.state.command_handler.bulk_delete_state_handler:
     class: 'PrestaShop\PrestaShop\Adapter\State\CommandHandler\BulkDeleteStateHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\State\Command\BulkDeleteStateCommand'
+    autoconfigure: true
 
   prestashop.adapter.state.command_handler.bulk_toggle_state_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\State\CommandHandler\BulkToggleStateStatusHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\State\Command\BulkToggleStateStatusCommand'
+    autoconfigure: true
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/store.yml b/src/PrestaShopBundle/Resources/config/services/adapter/store.yml
index b7d9c67d1338a..ffcd1ac7b5d4e 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/store.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/store.yml
@@ -11,38 +11,33 @@ services:
 
   prestashop.adapter.store.query_handler.get_store_for_editing:
     class: 'PrestaShop\PrestaShop\Adapter\Store\QueryHandler\GetStoreForEditingHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.core.domain.store.repository.store_repository'
-    tags:
-      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Store\Query\GetStoreForEditing }
 
   prestashop.adapter.store.command_handler.toggle_store_status:
     class: 'PrestaShop\PrestaShop\Adapter\Store\CommandHandler\ToggleStoreStatusHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.core.domain.store.repository.store_repository'
-    tags:
-      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Store\Command\ToggleStoreStatusCommand }
 
   prestashop.adapter.store.command_handler.bulk_toggle_store_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Store\CommandHandler\BulkUpdateStoreStatusHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.core.domain.store.repository.store_repository'
-    tags:
-      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Store\Command\BulkUpdateStoreStatusCommand }
 
   prestashop.adapter.store.command_handler.delete_store:
     class: 'PrestaShop\PrestaShop\Adapter\Store\CommandHandler\DeleteStoreHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.core.domain.store.repository.store_repository'
-    tags:
-      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Store\Command\DeleteStoreCommand }
 
   prestashop.adapter.store.command_handler.bulk_delete_store_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Store\CommandHandler\BulkDeleteStoreHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.core.domain.store.repository.store_repository'
-    tags:
-      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Store\Command\BulkDeleteStoreCommand }
 
   # deprecated
   prestashop.core.domain.store.repository.store_repository:
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/supplier.yml b/src/PrestaShopBundle/Resources/config/services/adapter/supplier.yml
index a067a0111214d..3ceeb360110e2 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/supplier.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/supplier.yml
@@ -28,74 +28,54 @@ services:
 
   prestashop.adapter.supplier.command_handler.toggle_supplier_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler\ToggleSupplierStatusHandler'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\ToggleSupplierStatusCommand'
+    autoconfigure: true
 
   prestashop.adapter.supplier.command_handler.delete_supplier_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler\DeleteSupplierHandler'
     parent: 'prestashop.adapter.supplier.command_handler.abstract_delete_supplier_handler'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\DeleteSupplierCommand'
+    autoconfigure: true
     public: true
 
   prestashop.adapter.supplier.command_handler.delete_supplier_logo_image_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler\DeleteSupplierLogoImageHandler'
+    autoconfigure: true
     arguments:
       - !php/const _PS_SUPP_IMG_DIR_
       - !php/const _PS_TMP_IMG_DIR_
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\DeleteSupplierLogoImageCommand'
 
   prestashop.adapter.supplier.command_handler.bulk_delete_supplier_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler\BulkDeleteSupplierHandler'
     parent: 'prestashop.adapter.supplier.command_handler.abstract_delete_supplier_handler'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\BulkDeleteSupplierCommand'
+    autoconfigure: true
     public: true
 
   prestashop.adapter.supplier.command_handler.bulk_disable_supplier_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler\BulkDisableSupplierHandler'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\BulkDisableSupplierCommand'
+    autoconfigure: true
 
   prestashop.adapter.supplier.command_handler.bulk_enable_supplier_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler\BulkEnableSupplierHandler'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\BulkEnableSupplierCommand'
+    autoconfigure: true
 
   prestashop.adapter.supplier.query_handler.get_supplier_for_viewing_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Supplier\QueryHandler\GetSupplierForViewingHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.core.localization.locale.context_locale'
       - '@=service("prestashop.adapter.legacy.configuration").get("PS_CURRENCY_DEFAULT")'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Query\GetSupplierForViewing'
 
   prestashop.adapter.supplier.command_handler.add_supplier_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler\AddSupplierHandler'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\AddSupplierCommand'
+    autoconfigure: true
 
   prestashop.adapter.supplier.query_handler.get_supplier_for_editing:
     class: 'PrestaShop\PrestaShop\Adapter\Supplier\QueryHandler\GetSupplierForEditingHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.core.image.parser.image_tag_source_parser'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Query\GetSupplierForEditing'
 
   prestashop.adapter.supplier.command_handler.edit_supplier_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler\EditSupplierHandler'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\EditSupplierCommand'
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Supplier\Repository\SupplierRepository: ~
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/tab.yml b/src/PrestaShopBundle/Resources/config/services/adapter/tab.yml
index f84b658d3057d..2c79a2c7f562d 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/tab.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/tab.yml
@@ -4,7 +4,6 @@ services:
 
   prestashop.adapter.tab.command_handler.update_tab_status_by_class_name_command_handler:
     class: PrestaShop\PrestaShop\Adapter\Tab\CommandHandler\UpdateTabStatusByClassNameHandler
+    autoconfigure: true
     arguments:
       - '@doctrine.orm.entity_manager'
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Tab\Command\UpdateTabStatusByClassNameCommand' }
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/tax.yml b/src/PrestaShopBundle/Resources/config/services/adapter/tax.yml
index 76dedbdba4b6e..54d68482b7aa6 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/tax.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/tax.yml
@@ -16,38 +16,28 @@ services:
   # Command handlers
   prestashop.adapter.tax.command_handler.delete_tax_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Tax\CommandHandler\DeleteTaxHandler'
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\DeleteTaxCommand' }
+    autoconfigure: true
 
   prestashop.adapter.tax.command_handler.toggle_tax_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Tax\CommandHandler\ToggleTaxStatusHandler'
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\ToggleTaxStatusCommand' }
+    autoconfigure: true
 
   prestashop.adapter.tax.command_handler.bulk_toggle_tax_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Tax\CommandHandler\BulkToggleTaxStatusHandler'
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\BulkToggleTaxStatusCommand' }
+    autoconfigure: true
 
   prestashop.adapter.tax.command_handler.bulk_delete_tax_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Tax\CommandHandler\BulkDeleteTaxHandler'
-    tags:
-      - { name: 'messenger.cqrs_handler', command: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\BulkDeleteTaxCommand' }
+    autoconfigure: true
 
   prestashop.adapter.tax.query_handler.get_tax_for_editing_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Tax\QueryHandler\GetTaxForEditingHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Tax\Query\GetTaxForEditing'
+    autoconfigure: true
 
   prestashop.adapter.tax.command_handler.edit_tax_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Tax\CommandHandler\EditTaxHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\EditTaxCommand'
+    autoconfigure: true
 
   prestashop.adapter.tax.command_handler.add_tax_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Tax\CommandHandler\AddTaxHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\AddTaxCommand'
+    autoconfigure: true
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/tax_rules_group.yml b/src/PrestaShopBundle/Resources/config/services/adapter/tax_rules_group.yml
index e4dcdfc156520..52889c07c70a9 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/tax_rules_group.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/tax_rules_group.yml
@@ -4,45 +4,31 @@ services:
 
   PrestaShop\PrestaShop\Adapter\TaxRulesGroup\CommandHandler\AddTaxRulesGroupHandler:
     autowire: true
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\AddTaxRulesGroupCommand'
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\TaxRulesGroup\CommandHandler\EditTaxRulesGroupHandler:
     autowire: true
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\EditTaxRulesGroupCommand'
+    autoconfigure: true
 
   prestashop.adapter.tax_rules_group.command_handler.delete_tax_rules_group_handler:
     class: 'PrestaShop\PrestaShop\Adapter\TaxRulesGroup\CommandHandler\DeleteTaxRulesGroupHandler'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\DeleteTaxRulesGroupCommand'
+    autoconfigure: true
 
   prestashop.adapter.tax_rules_group.command_handler.bulk_delete_tax_rules_group_handler:
     class: 'PrestaShop\PrestaShop\Adapter\TaxRulesGroup\CommandHandler\BulkDeleteTaxRulesGroupHandler'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\BulkDeleteTaxRulesGroupCommand'
+    autoconfigure: true
 
   prestashop.adapter.tax_rules_group.command_handler.bulk_set_tax_rules_group_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\TaxRulesGroup\CommandHandler\BulkSetTaxRulesGroupStatusHandler'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\BulkSetTaxRulesGroupStatusCommand'
+    autoconfigure: true
 
   prestashop.adapter.tax_rules_group.query_handler.get_tax_rules_group_for_editing:
     class: 'PrestaShop\PrestaShop\Adapter\TaxRulesGroup\QueryHandler\GetTaxRulesGroupForEditingHandler'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Query\GetTaxRulesGroupForEditing'
+    autoconfigure: true
 
   prestashop.adapter.tax_rules_group.command_handler.set_tax_rules_group_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\TaxRulesGroup\CommandHandler\SetTaxRulesGroupStatusHandler'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\SetTaxRulesGroupStatusCommand'
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\TaxRulesGroup\Repository\TaxRulesGroupRepository:
     arguments:
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/title.yml b/src/PrestaShopBundle/Resources/config/services/adapter/title.yml
index a5d8e750d07b9..afcb28f58b840 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/title.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/title.yml
@@ -4,15 +4,11 @@ services:
 
   PrestaShop\PrestaShop\Adapter\Title\CommandHandler\AddTitleHandler:
     autowire: true
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Title\Command\AddTitleCommand'
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Title\CommandHandler\EditTitleHandler:
     autowire: true
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\Title\Command\EditTitleCommand'
+    autoconfigure: true
 
   prestashop.adapter.title.title_image_thumbnail_provider:
     class: 'PrestaShop\PrestaShop\Adapter\Title\TitleImageThumbnailProvider'
@@ -24,22 +20,16 @@ services:
   prestashop.adapter.title.command_handler.delete_title_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Title\CommandHandler\DeleteTitleHandler'
     autowire: true
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Title\Command\DeleteTitleCommand'
+    autoconfigure: true
 
   prestashop.adapter.title.command_handler.bulk_delete_title_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Title\CommandHandler\BulkDeleteTitleHandler'
     autowire: true
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Title\Command\BulkDeleteTitleCommand'
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Title\QueryHandler\GetTitleForEditingHandler:
     autowire: true
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Title\Query\GetTitleForEditing'
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Title\Repository\TitleRepository:
     autowire: true
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/webservice.yml b/src/PrestaShopBundle/Resources/config/services/adapter/webservice.yml
index d567ef3daee9d..607730bfa5906 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/webservice.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/webservice.yml
@@ -12,18 +12,12 @@ services:
 
   prestashop.adapter.webservice.query_handler.get_webservice_key_for_editing_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Webservice\QueryHandler\GetWebserviceKeyForEditingHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Webservice\Query\GetWebserviceKeyForEditing'
+    autoconfigure: true
 
   prestashop.adapter.webservice.command_handler.add_webservice_key_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Webservice\CommandHandler\AddWebserviceKeyHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Webservice\Command\AddWebserviceKeyCommand'
+    autoconfigure: true
 
   prestashop.adapter.webservice.command_handler.edit_webservice_key_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Webservice\CommandHandler\EditWebserviceKeyHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Webservice\Command\EditWebserviceKeyCommand'
+    autoconfigure: true
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/zone.yml b/src/PrestaShopBundle/Resources/config/services/adapter/zone.yml
index 6f8d513605ade..dd1e485e047c6 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/zone.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/zone.yml
@@ -4,42 +4,28 @@ services:
 
   prestashop.adapter.zone.command_handler.add_zone_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Zone\CommandHandler\AddZoneHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\AddZoneCommand'
+    autoconfigure: true
 
   prestashop.adapter.zone.command_handler.toggle_zone_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Zone\CommandHandler\ToggleZoneStatusHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\ToggleZoneStatusCommand'
+    autoconfigure: true
 
   prestashop.adapter.zone.command_handler.edit_zone_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Zone\CommandHandler\EditZoneHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\EditZoneCommand'
+    autoconfigure: true
 
   prestashop.adapter.zone.query_handler.get_zone_for_editing_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Zone\QueryHandler\GetZoneForEditingHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Zone\Query\GetZoneForEditing'
+    autoconfigure: true
 
   prestashop.adapter.zone.command_handler.delete_zone_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Zone\CommandHandler\DeleteZoneHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\DeleteZoneCommand'
+    autoconfigure: true
 
   prestashop.adapter.zone.command_handler.bulk_delete_zone_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Zone\CommandHandler\BulkDeleteZoneHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\BulkDeleteZoneCommand'
+    autoconfigure: true
 
   prestashop.adapter.zone.command_handler.bulk_toggle_zone_status_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Zone\CommandHandler\BulkToggleZoneStatusHandler'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\BulkToggleZoneStatusCommand'
+    autoconfigure: true
diff --git a/src/PrestaShopBundle/Resources/config/services/core/domain/authorization_server.yml b/src/PrestaShopBundle/Resources/config/services/core/domain/authorization_server.yml
index d174677c468a4..1ff31f5b80bfa 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/domain/authorization_server.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/domain/authorization_server.yml
@@ -7,24 +7,16 @@ services:
   PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Model\ApiAccessRepositoryInterface: '@PrestaShopBundle\Entity\Repository\ApiAccessRepository'
 
   PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\CommandHandler\AddApplicationHandler:
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Command\AddApplicationCommand'
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\CommandHandler\EditApplicationHandler:
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Command\EditApplicationCommand'
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\QueryHandler\GetApplicationForEditingHandler:
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Query\GetApplicationForEditing'
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\CommandHandler\DeleteApplicationHandler:
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Command\DeleteApplicationCommand'
+    autoconfigure: true
 
   PrestaShopBundle\Model\AuthorizationServer\AuthorizedApplicationFactory: ~
 
diff --git a/src/PrestaShopBundle/Resources/config/services/core/domain/customer_service.yml b/src/PrestaShopBundle/Resources/config/services/core/domain/customer_service.yml
index 1be9df24d396a..468bd5d78a38f 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/domain/customer_service.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/domain/customer_service.yml
@@ -4,74 +4,58 @@ services:
 
   prestashop.core.domain.customer_service.command_handler.delete_customer_thread_handler:
     class: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\CommandHandler\DeleteCustomerThreadHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.core.domain.customer_service.repository.customer_thread_repository'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\DeleteCustomerThreadCommand
 
   prestashop.core.domain.customer_service.command_handler.bulk_delete_customer_thread_handler:
     class: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\CommandHandler\BulkDeleteCustomerThreadHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.core.domain.customer_service.repository.customer_thread_repository'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\BulkDeleteCustomerThreadCommand
 
   prestashop.core.domain.customer_service.command_handler.add_order_customer_message:
     class: PrestaShop\PrestaShop\Core\Domain\CustomerService\CommandHandler\AddOrderCustomerMessageHandler
+    autoconfigure: true
     arguments:
       - '@translator'
       - '@validator'
       - '@=service("prestashop.adapter.legacy.context").getContext().shop.id'
       - '@=service("prestashop.adapter.legacy.context").getContext().language.id'
       - '@=service("prestashop.adapter.legacy.context").getContext().employee.id'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\CustomerMessage\Command\AddOrderCustomerMessageCommand
 
   prestashop.core.domain.customer_service.query_handler.get_customer_thread_for_viewing_handler:
     class: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\QueryHandler\GetCustomerThreadForViewingHandler'
+    autoconfigure: true
     arguments:
       - '@=service("prestashop.adapter.legacy.context").getContext()'
       - '@prestashop.core.localization.locale.context_locale'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\Query\GetCustomerThreadForViewing'
 
   prestashop.core.domain.customer_service.query_handler.get_customer_service_signature_handler:
     class: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\QueryHandler\GetCustomerServiceSignatureHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.legacy.configuration'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\Query\GetCustomerServiceSignature'
 
   prestashop.core.domain.customer_service.command_handler.forward_customer_thread_handler:
     class: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\CommandHandler\ForwardCustomerThreadHandler'
+    autoconfigure: true
     arguments:
       - '@=service("prestashop.adapter.legacy.context").getContext()'
       - '@prestashop.adapter.legacy.configuration'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\ForwardCustomerThreadCommand'
 
   prestashop.core.domain.customer_service.command_handler.reply_to_customer_thread_handler:
     class: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\CommandHandler\ReplyToCustomerThreadHandler'
+    autoconfigure: true
     arguments:
       - '@=service("prestashop.adapter.legacy.context").getContext()'
-    tags:
-      - name: messenger.cqrs_handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\ReplyToCustomerThreadCommand'
 
   prestashop.core.domain.customer_service.command_handler.update_customer_thread_status_handler:
     class: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\CommandHandler\UpdateCustomerThreadStatusHandler'
+    autoconfigure: true
     arguments:
       $connection: '@doctrine.dbal.default_connection'
       $dbPrefix: '%database_prefix%'
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\UpdateCustomerThreadStatusCommand
 
   prestashop.core.domain.customer_service.repository.customer_thread_repository:
     class: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\Repository\CustomerThreadRepository'
diff --git a/src/PrestaShopBundle/Resources/config/services/core/domain/showcase_card.yml b/src/PrestaShopBundle/Resources/config/services/core/domain/showcase_card.yml
index fc68f580f1bc3..8d0161a49f1c2 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/domain/showcase_card.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/domain/showcase_card.yml
@@ -9,20 +9,16 @@ services:
 
   prestashop.core.showcase_card.command_handler.close_showcase_card:
     class: 'PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\CommandHandler\CloseShowcaseCardHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.legacy.configuration'
       - '@prestashop.core.showcase_card.configuration_map'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\Command\CloseShowcaseCardCommand'
 
   # Query handlers
 
   prestashop.core.domain.showcase_card.query_handler.get_showcase_card_is_closed_handler:
     class: PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\QueryHandler\GetShowcaseCardIsClosedHandler
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.legacy.configuration'
       - '@prestashop.core.showcase_card.configuration_map'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\Query\GetShowcaseCardIsClosed'
diff --git a/src/PrestaShopBundle/Resources/config/services/core/domain/sql_management.yml b/src/PrestaShopBundle/Resources/config/services/core/domain/sql_management.yml
index eb88d05379b56..349617703dfce 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/domain/sql_management.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/domain/sql_management.yml
@@ -6,18 +6,14 @@ services:
 
   prestashop.core.domain.sql_management.command_handler.save_settings:
     class: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\CommandHandler\SaveSqlRequestSettingsHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.legacy.configuration'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\SaveSqlRequestSettingsCommand'
 
   # QUERY HANDLERS
 
   prestashop.core.domain.sql_management.query_handler.get_sql_request_settings:
     class: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\QueryHandler\GetSqlRequestSettingsHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.adapter.legacy.configuration'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetSqlRequestSettings'
diff --git a/src/PrestaShopBundle/Resources/config/services/core/domain/theme.yml b/src/PrestaShopBundle/Resources/config/services/core/domain/theme.yml
index 170d57886123b..b6f9fd1dc3212 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/domain/theme.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/domain/theme.yml
@@ -6,41 +6,34 @@ services:
 
   prestashop.core.domain.theme.command_handler.import_theme_handler:
     class: 'PrestaShop\PrestaShop\Core\Domain\Theme\CommandHandler\ImportThemeHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.core.addon.theme.theme_zip_uploader'
       - '@prestashop.core.addon.theme.theme_manager'
       - '@prestashop.adapter.legacy.configuration'
-    tags:
-      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Theme\Command\ImportThemeCommand }
 
   prestashop.core.domain.theme.command_handler.enable_theme_handler:
     class: 'PrestaShop\PrestaShop\Core\Domain\Theme\CommandHandler\EnableThemeHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.core.addon.theme.theme_manager'
       - '@prestashop.adapter.cache.clearer.smarty_cache_clearer'
       - '@=service("prestashop.adapter.shop.context").isSingleShopContext()'
-    tags:
-      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Theme\Command\EnableThemeCommand }
 
   prestashop.core.domain.theme.command_handler.delete_theme_handler:
     class: 'PrestaShop\PrestaShop\Core\Domain\Theme\CommandHandler\DeleteThemeHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.core.addon.theme.theme_manager'
-    tags:
-      - { name: messenger.cqrs_handler, command: PrestaShop\PrestaShop\Core\Domain\Theme\Command\DeleteThemeCommand }
 
   prestashop.core.domain.theme.command_handler.adapt_theme_to_rtl_languages_handler:
     class: 'PrestaShop\PrestaShop\Core\Domain\Theme\CommandHandler\AdaptThemeToRTLLanguagesHandler'
+    autoconfigure: true
     arguments:
       - '@PrestaShop\PrestaShop\Core\Localization\RTL\StyleSheetProcessorFactory'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: PrestaShop\PrestaShop\Core\Domain\Theme\Command\AdaptThemeToRTLLanguagesCommand
 
   prestashop.core.domain.theme.command_handler.reset_theme_layouts_handler:
     class: 'PrestaShop\PrestaShop\Core\Domain\Theme\CommandHandler\ResetThemeLayoutsHandler'
+    autoconfigure: true
     arguments:
       - '@prestashop.core.addon.theme.theme_manager'
-    tags:
-      - name: 'messenger.cqrs_handler'
-        command: PrestaShop\PrestaShop\Core\Domain\Theme\Command\ResetThemeLayoutsCommand
diff --git a/src/PrestaShopBundle/Resources/config/services/core/mail_template.yml b/src/PrestaShopBundle/Resources/config/services/core/mail_template.yml
index ef701c66d7109..f2e56baa7728c 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/mail_template.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/mail_template.yml
@@ -43,6 +43,4 @@ services:
       - '%kernel.project_dir%/mails'
       - "@=service('prestashop.adapter.legacy.configuration').get('_PS_MODULE_DIR_')"
     public: true
-    tags:
-      - name: messenger.cqrs_handler
-        command: PrestaShop\PrestaShop\Core\Domain\MailTemplate\Command\GenerateThemeMailTemplatesCommand
+    autoconfigure: true

From 215fcba268cc621e16243272af5f6d5bb65c5a0d Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Mon, 26 Jun 2023 16:55:54 +0200
Subject: [PATCH 0469/1030] Update phpstan ignoreErrors

---
 phpstan-baseline.neon | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index fa66ead4e3f3b..0ce3fc6bb3dfb 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -1769,3 +1769,14 @@ parameters:
 			message: "#^Namespace Currency is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
 			count: 1
 			path: src/PrestaShopBundle/Twig/LayoutExtension.php
+
+		-
+			message: "#^Parameter \\#2 \\$configurator of method Symfony\\\\Component\\\\DependencyInjection\\\\ContainerBuilder::registerAttributeForAutoconfiguration\\(\\) expects callable#"
+			count: 2
+			path: src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryCollectorPass.php
+
+		-
+			message: "#^Call to an undefined method ReflectionType::getName\\(\\)#"
+			count: 1
+			path: src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryCollectorPass.php
+

From 6a655ee2493c5f93abe418d957ab3e1e75dd1128 Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Tue, 27 Jun 2023 11:52:10 +0200
Subject: [PATCH 0470/1030] Fix Command And Query Collector Pass

---
 phpstan-baseline.neon                         |   4 +-
 .../Compiler/CommandAndQueryCollectorPass.php |  59 +++++-----
 .../Compiler/CommandAndQueryRegisterPass.php  | 103 ++++++++++++++++++
 src/PrestaShopBundle/PrestaShopBundle.php     |   4 +-
 4 files changed, 140 insertions(+), 30 deletions(-)
 create mode 100644 src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryRegisterPass.php

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 0ce3fc6bb3dfb..5d7949a0facaa 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -1773,10 +1773,10 @@ parameters:
 		-
 			message: "#^Parameter \\#2 \\$configurator of method Symfony\\\\Component\\\\DependencyInjection\\\\ContainerBuilder::registerAttributeForAutoconfiguration\\(\\) expects callable#"
 			count: 2
-			path: src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryCollectorPass.php
+			path: src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryRegisterPass.php
 
 		-
 			message: "#^Call to an undefined method ReflectionType::getName\\(\\)#"
 			count: 1
-			path: src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryCollectorPass.php
+			path: src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryRegisterPass.php
 
diff --git a/src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryCollectorPass.php b/src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryCollectorPass.php
index c5aa16ecf2e20..82b74cf068c17 100644
--- a/src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryCollectorPass.php
+++ b/src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryCollectorPass.php
@@ -28,15 +28,13 @@
 
 use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
+use ReflectionAttribute;
 use ReflectionClass;
-use RuntimeException;
-use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
- * Aggregates and organizes all Commands & Queries, storing them in a container for future processing,
- * while simultaneously transforming custom tags into Symfony Messenger tags.
+ * Aggregates and organizes all Commands & Queries and storing them in a container for future processing
  */
 class CommandAndQueryCollectorPass implements CompilerPassInterface
 {
@@ -45,8 +43,6 @@ class CommandAndQueryCollectorPass implements CompilerPassInterface
      */
     public function process(ContainerBuilder $container): void
     {
-        $this->registerMessengerTags($container);
-
         if (!in_array($container->getParameter('kernel.environment'), ['dev', 'test'])) {
             return;
         }
@@ -62,42 +58,51 @@ public function process(ContainerBuilder $container): void
      */
     private function findCommandsAndQueries(ContainerBuilder $container): array
     {
-        $handlers = $container->findTaggedServiceIds('messenger.cqrs_handler');
+        $handlers = $container->findTaggedServiceIds('messenger.message_handler');
         $commands = [];
-        foreach ($handlers as $handler) {
-            if (isset(current($handler)['command'])) {
-                $commands[] = current($handler)['command'];
+        foreach ($handlers as $key => $value) {
+            if (count(current($value)) == 0) {
+                continue;
             }
+
+            $className = $container->getDefinition($key)->getClass();
+            $handlerAttributes = $this->getHandlerAttributes($className);
+            $this->processHandlerAttributes($handlerAttributes, $value, $commands);
         }
 
         return $commands;
     }
 
     /**
-     * register messenger tags allowing the recognition of handlers by symfony
+     * Get the attributes of a message handler using reflection.
+     *
+     * @return ReflectionAttribute[]
      */
-    private function registerMessengerTags(ContainerBuilder $container): void
+    private function getHandlerAttributes(string $handlerClassName): array
     {
-        $container->registerAttributeForAutoconfiguration(AsCommandHandler::class, static function (ChildDefinition $definition, AsCommandHandler $attribute, ReflectionClass $reflector): void {
-            $definition->addTag('messenger.message_handler', ['method' => $attribute->method, 'handles' => self::guessHandledClasses($reflector, $attribute->method)]);
-        });
+        $handler = new ReflectionClass($handlerClassName);
 
-        $container->registerAttributeForAutoconfiguration(AsQueryHandler::class, static function (ChildDefinition $definition, AsQueryHandler $attribute, ReflectionClass $reflector): void {
-            $definition->addTag('messenger.message_handler', ['method' => $attribute->method, 'handles' => self::guessHandledClasses($reflector, $attribute->method)]);
-        });
+        return $handler->getAttributes();
     }
 
-    private static function guessHandledClasses(ReflectionClass $class, string $method): ?string
+    /**
+     * Process the handler attributes and add commands and queries to the result.
+     *
+     * @param ReflectionAttribute[] $handlerAttributes
+     * @param array $value
+     * @param string[] $commands
+     *
+     * @return void
+     */
+    private function processHandlerAttributes(array $handlerAttributes, array $value, array &$commands): void
     {
-        $reflectionMethod = $class->getMethod($method);
-        $parameters = $reflectionMethod->getParameters();
+        foreach ($handlerAttributes as $handlerAttribute) {
+            $isCommandHandler = $handlerAttribute->getName() === AsCommandHandler::class;
+            $isQueryHandler = $handlerAttribute->getName() === AsQueryHandler::class;
 
-        if (count($parameters) != 1) {
-            throw new RuntimeException(sprintf('Invalid handler service "%s": number of argument "$%s" in method "%s" must be 1 , "%s" given.', $class->getName(), $parameters[0]->getName(), $method, count($parameters)));
+            if (($isCommandHandler || $isQueryHandler) && isset(current($value)['handles'])) {
+                $commands[] = current($value)['handles'];
+            }
         }
-
-        $firstParameter = $parameters[0];
-
-        return $firstParameter->getType()->getName();
     }
 }
diff --git a/src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryRegisterPass.php b/src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryRegisterPass.php
new file mode 100644
index 0000000000000..fc55162a84110
--- /dev/null
+++ b/src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryRegisterPass.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShopBundle\DependencyInjection\Compiler;
+
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
+use ReflectionClass;
+use RuntimeException;
+use Symfony\Component\DependencyInjection\ChildDefinition;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+ * This class automatically configures the 'AsCommandHandler' and 'AsQueryHandler' attributes
+ * as tags for auto-detection in Symfony.
+ *
+ * Classes marked with the 'AsCommandHandler' attribute will be registered as command handlers,
+ * while classes marked with 'AsQueryHandler' will be registered as query handlers.
+ *
+ * To make this work, make sure to add the appropriate annotations to the classes that need to
+ * be detected as command or query handlers.
+ *
+ * Usage example:
+ *
+ *     #[AsCommandHandler]
+ *     class MyCommandHandler
+ *     {
+ *         // ...
+ *     }
+ *
+ *     #[AsQueryHandler]
+ *     class MyQueryHandler
+ *     {
+ *         // ...
+ *     }
+ *
+ * These classes will be automatically discovered and registered in the Symfony service container
+ * using the `registerAttributeForAutoconfiguration` method.
+ *
+ * @see https://symfony.com/doc/current/service_container/tags.html#autoconfiguring-tags-with-attributes
+ */
+class CommandAndQueryRegisterPass implements CompilerPassInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function process(ContainerBuilder $container): void
+    {
+        $this->registerMessengerTags($container);
+    }
+
+    /**
+     * register messenger tags allowing the recognition of handlers by symfony
+     */
+    private function registerMessengerTags(ContainerBuilder $container): void
+    {
+        $container->registerAttributeForAutoconfiguration(AsCommandHandler::class, static function (ChildDefinition $definition, AsCommandHandler $attribute, ReflectionClass $reflector): void {
+            $definition->addTag('messenger.message_handler', ['method' => $attribute->method, 'handles' => self::guessHandledClasses($reflector, $attribute->method)]);
+        });
+
+        $container->registerAttributeForAutoconfiguration(AsQueryHandler::class, static function (ChildDefinition $definition, AsQueryHandler $attribute, ReflectionClass $reflector): void {
+            $definition->addTag('messenger.message_handler', ['method' => $attribute->method, 'handles' => self::guessHandledClasses($reflector, $attribute->method)]);
+        });
+    }
+
+    private static function guessHandledClasses(ReflectionClass $class, string $method): ?string
+    {
+        $reflectionMethod = $class->getMethod($method);
+        $parameters = $reflectionMethod->getParameters();
+
+        if (count($parameters) != 1) {
+            throw new RuntimeException(sprintf('Invalid handler service "%s": number of argument "$%s" in method "%s" must be 1 , "%s" given.', $class->getName(), $parameters[0]->getName(), $method, count($parameters)));
+        }
+
+        $firstParameter = $parameters[0];
+
+        return $firstParameter->getType()->getName();
+    }
+}
diff --git a/src/PrestaShopBundle/PrestaShopBundle.php b/src/PrestaShopBundle/PrestaShopBundle.php
index bc874d47041e5..254e67f9a2043 100644
--- a/src/PrestaShopBundle/PrestaShopBundle.php
+++ b/src/PrestaShopBundle/PrestaShopBundle.php
@@ -27,6 +27,7 @@
 namespace PrestaShopBundle;
 
 use PrestaShopBundle\DependencyInjection\Compiler\CommandAndQueryCollectorPass;
+use PrestaShopBundle\DependencyInjection\Compiler\CommandAndQueryRegisterPass;
 use PrestaShopBundle\DependencyInjection\Compiler\DynamicRolePass;
 use PrestaShopBundle\DependencyInjection\Compiler\GridDefinitionServiceIdsCollectorPass;
 use PrestaShopBundle\DependencyInjection\Compiler\IdentifiableObjectFormTypesCollectorPass;
@@ -75,7 +76,8 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new RouterPass(), PassConfig::TYPE_AFTER_REMOVING);
         $container->addCompilerPass(new OverrideTranslatorServiceCompilerPass());
         $container->addCompilerPass(new ModulesDoctrineCompilerPass());
-        $container->addCompilerPass(new CommandAndQueryCollectorPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, self::LOAD_MODULE_SERVICES_PASS_PRIORITY);
+        $container->addCompilerPass(new CommandAndQueryRegisterPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, self::LOAD_MODULE_SERVICES_PASS_PRIORITY);
+        $container->addCompilerPass(new CommandAndQueryCollectorPass());
         $container->addCompilerPass(new OptionsFormHookNameCollectorPass());
         $container->addCompilerPass(new GridDefinitionServiceIdsCollectorPass());
         $container->addCompilerPass(new IdentifiableObjectFormTypesCollectorPass());

From 4ce0fc7bf53ff7390fac07b0aaf66ee9e3ddb2d6 Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Thu, 29 Jun 2023 18:32:28 +0200
Subject: [PATCH 0471/1030] Update after rebase

---
 .../CommandHandler/BulkDeleteFeatureValueHandler.php      | 2 ++
 .../Feature/CommandHandler/DeleteFeatureValueHandler.php  | 2 ++
 .../QueryHandler/GetApplicationForViewingHandler.php      | 2 ++
 .../Resources/config/services/adapter/feature.yml         | 8 ++------
 .../config/services/core/domain/authorization_server.yml  | 4 +---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Adapter/Feature/CommandHandler/BulkDeleteFeatureValueHandler.php b/src/Adapter/Feature/CommandHandler/BulkDeleteFeatureValueHandler.php
index e62dfca3309cf..3129a5ae104e6 100644
--- a/src/Adapter/Feature/CommandHandler/BulkDeleteFeatureValueHandler.php
+++ b/src/Adapter/Feature/CommandHandler/BulkDeleteFeatureValueHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\Feature\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureValueRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\AbstractBulkCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Exception\BulkCommandExceptionInterface;
 use PrestaShop\PrestaShop\Core\Domain\Feature\Command\BulkDeleteFeatureValueCommand;
@@ -37,6 +38,7 @@
 use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\FeatureValueException;
 use PrestaShop\PrestaShop\Core\Domain\Feature\ValueObject\FeatureValueId;
 
+#[AsCommandHandler]
 class BulkDeleteFeatureValueHandler extends AbstractBulkCommandHandler implements BulkDeleteFeatureValueHandlerInterface
 {
     public function __construct(
diff --git a/src/Adapter/Feature/CommandHandler/DeleteFeatureValueHandler.php b/src/Adapter/Feature/CommandHandler/DeleteFeatureValueHandler.php
index c5ef03536f8a8..d8c0bf40d651f 100644
--- a/src/Adapter/Feature/CommandHandler/DeleteFeatureValueHandler.php
+++ b/src/Adapter/Feature/CommandHandler/DeleteFeatureValueHandler.php
@@ -29,9 +29,11 @@
 namespace PrestaShop\PrestaShop\Adapter\Feature\CommandHandler;
 
 use PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureValueRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Feature\Command\DeleteFeatureValueCommand;
 use PrestaShop\PrestaShop\Core\Domain\Feature\CommandHandler\DeleteFeatureValueHandlerInterface;
 
+#[AsCommandHandler]
 class DeleteFeatureValueHandler implements DeleteFeatureValueHandlerInterface
 {
     public function __construct(
diff --git a/src/Core/Domain/AuthorizationServer/QueryHandler/GetApplicationForViewingHandler.php b/src/Core/Domain/AuthorizationServer/QueryHandler/GetApplicationForViewingHandler.php
index 49368879f164a..d87516f01563d 100644
--- a/src/Core/Domain/AuthorizationServer/QueryHandler/GetApplicationForViewingHandler.php
+++ b/src/Core/Domain/AuthorizationServer/QueryHandler/GetApplicationForViewingHandler.php
@@ -28,6 +28,7 @@
 
 namespace PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\QueryHandler;
 
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Model\AuthorizedApplicationRepositoryInterface;
 use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Query\GetApplicationForViewing;
 use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\QueryResult\ViewableApplication;
@@ -35,6 +36,7 @@
 /**
  * Handles query which gets application for viewing
  */
+#[AsQueryHandler]
 class GetApplicationForViewingHandler implements GetApplicationForViewingHandlerInterface
 {
     /**
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/feature.yml b/src/PrestaShopBundle/Resources/config/services/adapter/feature.yml
index 0ff215f7d0881..a9c779812343a 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/feature.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/feature.yml
@@ -47,16 +47,12 @@ services:
   PrestaShop\PrestaShop\Adapter\Feature\CommandHandler\DeleteFeatureValueHandler:
     autowire: true
     public: false
-    tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Feature\Command\DeleteFeatureValueCommand
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Feature\CommandHandler\BulkDeleteFeatureValueHandler:
     autowire: true
     public: false
-    tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Feature\Command\BulkDeleteFeatureValueCommand
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureRepository:
     autowire: true
diff --git a/src/PrestaShopBundle/Resources/config/services/core/domain/authorization_server.yml b/src/PrestaShopBundle/Resources/config/services/core/domain/authorization_server.yml
index 1ff31f5b80bfa..973a9e565953a 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/domain/authorization_server.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/domain/authorization_server.yml
@@ -23,9 +23,7 @@ services:
   PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Model\AuthorizedApplicationFactoryInterface: '@PrestaShopBundle\Model\AuthorizationServer\AuthorizedApplicationFactory'
 
   PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\QueryHandler\GetApplicationForViewingHandler:
-    tags:
-      - name: tactician.handler
-        command: 'PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Query\GetApplicationForViewing'
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Core\Search\Builder\TypedBuilder\ApiAccessFiltersBuilder:
     class: 'PrestaShop\PrestaShop\Core\Search\Builder\TypedBuilder\ApiAccessFiltersBuilder'

From d4c9d02784c4118b5935b904ebbbe642b3275541 Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Thu, 6 Jul 2023 10:28:12 +0200
Subject: [PATCH 0472/1030] Update for rebase

---
 composer.lock                                      | 14 +++++++-------
 .../QueryHandler/SearchForSearchTermHandler.php    |  2 ++
 src/Core/CommandBus/MessengerCommandBusAdapter.php |  1 +
 .../Resources/config/services/adapter/alias.yml    |  4 +---
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/composer.lock b/composer.lock
index 121bc13bb4be9..b37b1771bf71d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "622d610759f0e0f08e6b0ddad7692a96",
+    "content-hash": "b88c467dd6901d0a85beedf63bc3aae2",
     "packages": [
         {
             "name": "api-platform/core",
@@ -10853,16 +10853,16 @@
         },
         {
             "name": "symfony/messenger",
-            "version": "v5.4.24",
+            "version": "v5.4.25",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/messenger.git",
-                "reference": "75e57d48758d43127377d1310970882446ec7d91"
+                "reference": "e3ba2b2fa84bf54923fe71bd8725968ecaaf117c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/messenger/zipball/75e57d48758d43127377d1310970882446ec7d91",
-                "reference": "75e57d48758d43127377d1310970882446ec7d91",
+                "url": "https://api.github.com/repos/symfony/messenger/zipball/e3ba2b2fa84bf54923fe71bd8725968ecaaf117c",
+                "reference": "e3ba2b2fa84bf54923fe71bd8725968ecaaf117c",
                 "shasum": ""
             },
             "require": {
@@ -10923,7 +10923,7 @@
             "description": "Helps applications send and receive messages to/from other applications or via message queues",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/messenger/tree/v5.4.24"
+                "source": "https://github.com/symfony/messenger/tree/v5.4.25"
             },
             "funding": [
                 {
@@ -10939,7 +10939,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-12T08:59:19+00:00"
+            "time": "2023-06-14T08:23:01+00:00"
         },
         {
             "name": "symfony/mime",
diff --git a/src/Adapter/Alias/QueryHandler/SearchForSearchTermHandler.php b/src/Adapter/Alias/QueryHandler/SearchForSearchTermHandler.php
index 13ce687934227..1531c44d1c172 100644
--- a/src/Adapter/Alias/QueryHandler/SearchForSearchTermHandler.php
+++ b/src/Adapter/Alias/QueryHandler/SearchForSearchTermHandler.php
@@ -29,9 +29,11 @@
 namespace PrestaShop\PrestaShop\Adapter\Alias\QueryHandler;
 
 use PrestaShop\PrestaShop\Adapter\Alias\Repository\AliasRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\Alias\Query\SearchForSearchTerm;
 use PrestaShop\PrestaShop\Core\Domain\Alias\QueryHandler\SearchForSearchTermHandlerInterface;
 
+#[AsQueryHandler]
 class SearchForSearchTermHandler implements SearchForSearchTermHandlerInterface
 {
     public function __construct(protected readonly AliasRepository $aliasRepository)
diff --git a/src/Core/CommandBus/MessengerCommandBusAdapter.php b/src/Core/CommandBus/MessengerCommandBusAdapter.php
index 906f6d80dedc3..8a6ab69d617c2 100644
--- a/src/Core/CommandBus/MessengerCommandBusAdapter.php
+++ b/src/Core/CommandBus/MessengerCommandBusAdapter.php
@@ -41,6 +41,7 @@ final class MessengerCommandBusAdapter implements CommandBusInterface
 
     public function __construct(MessageBusInterface $messageBus)
     {
+        // used in HandleTrait
         $this->messageBus = $messageBus;
     }
 
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml b/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
index 1b8d20e4baf88..e15ee34c8c6ac 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml
@@ -32,6 +32,4 @@ services:
     autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\Alias\QueryHandler\SearchForSearchTermHandler:
-    tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\Alias\Query\SearchForSearchTerm
+    autoconfigure: true

From 78db3a2ff6161f13abdd6f7a4883583b8bdf871b Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Fri, 7 Jul 2023 09:29:12 +0200
Subject: [PATCH 0473/1030] Fix phpstan errors

---
 phpstan-baseline.neon                         | 11 -----------
 .../Compiler/CommandAndQueryRegisterPass.php  | 19 +++++++++++++++----
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 5d7949a0facaa..fa66ead4e3f3b 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -1769,14 +1769,3 @@ parameters:
 			message: "#^Namespace Currency is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
 			count: 1
 			path: src/PrestaShopBundle/Twig/LayoutExtension.php
-
-		-
-			message: "#^Parameter \\#2 \\$configurator of method Symfony\\\\Component\\\\DependencyInjection\\\\ContainerBuilder::registerAttributeForAutoconfiguration\\(\\) expects callable#"
-			count: 2
-			path: src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryRegisterPass.php
-
-		-
-			message: "#^Call to an undefined method ReflectionType::getName\\(\\)#"
-			count: 1
-			path: src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryRegisterPass.php
-
diff --git a/src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryRegisterPass.php b/src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryRegisterPass.php
index fc55162a84110..2c749cf3726a1 100644
--- a/src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryRegisterPass.php
+++ b/src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryRegisterPass.php
@@ -29,6 +29,8 @@
 use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use ReflectionClass;
+use ReflectionNamedType;
+use Reflector;
 use RuntimeException;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
@@ -78,11 +80,17 @@ public function process(ContainerBuilder $container): void
      */
     private function registerMessengerTags(ContainerBuilder $container): void
     {
-        $container->registerAttributeForAutoconfiguration(AsCommandHandler::class, static function (ChildDefinition $definition, AsCommandHandler $attribute, ReflectionClass $reflector): void {
+        $container->registerAttributeForAutoconfiguration(AsCommandHandler::class, static function (ChildDefinition $definition, AsCommandHandler $attribute, Reflector $reflector): void {
+            if (!$reflector instanceof ReflectionClass) {
+                throw new RuntimeException(sprintf('AsCommandHandler must be a class attribute, "%s" given.', $reflector::class));
+            }
             $definition->addTag('messenger.message_handler', ['method' => $attribute->method, 'handles' => self::guessHandledClasses($reflector, $attribute->method)]);
         });
 
-        $container->registerAttributeForAutoconfiguration(AsQueryHandler::class, static function (ChildDefinition $definition, AsQueryHandler $attribute, ReflectionClass $reflector): void {
+        $container->registerAttributeForAutoconfiguration(AsQueryHandler::class, static function (ChildDefinition $definition, AsQueryHandler $attribute, Reflector $reflector): void {
+            if (!$reflector instanceof ReflectionClass) {
+                throw new RuntimeException(sprintf('AsQueryHandler must be a class attribute, "%s" given.', $reflector::class));
+            }
             $definition->addTag('messenger.message_handler', ['method' => $attribute->method, 'handles' => self::guessHandledClasses($reflector, $attribute->method)]);
         });
     }
@@ -96,8 +104,11 @@ private static function guessHandledClasses(ReflectionClass $class, string $meth
             throw new RuntimeException(sprintf('Invalid handler service "%s": number of argument "$%s" in method "%s" must be 1 , "%s" given.', $class->getName(), $parameters[0]->getName(), $method, count($parameters)));
         }
 
-        $firstParameter = $parameters[0];
+        $firstParameter = $parameters[0]->getType();
+        if (!$firstParameter instanceof ReflectionNamedType) {
+            throw new RuntimeException(sprintf('Invalid parameter type: must be ReflectionNamedType , "%s" given.', $firstParameter::class));
+        }
 
-        return $firstParameter->getType()->getName();
+        return $firstParameter->getName();
     }
 }

From e8712501ab74d7282b8fa686de0fe57cf895794a Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Fri, 7 Jul 2023 09:31:02 +0200
Subject: [PATCH 0474/1030] Class fix

---
 src/Core/CommandBus/ExecutedCommandRegistry.php               | 2 +-
 .../Category/QueryHandler/EditRootCategoryHandlerTest.php     | 4 ++--
 .../QueryHandler/GetCategoryForEditingHandlerTest.php         | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Core/CommandBus/ExecutedCommandRegistry.php b/src/Core/CommandBus/ExecutedCommandRegistry.php
index e2b0713796aaa..417590fb8fa8c 100644
--- a/src/Core/CommandBus/ExecutedCommandRegistry.php
+++ b/src/Core/CommandBus/ExecutedCommandRegistry.php
@@ -115,7 +115,7 @@ private function getTrace(): array
         $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, self::BACKTRACE_LIMIT);
 
         foreach ($trace as $step) {
-            if ($step['class'] === MessengerCommandBusAdapter::class
+            if ($step['class'] instanceof MessengerCommandBusAdapter
                 && $step['function'] === 'handle'
             ) {
                 return [
diff --git a/tests/Integration/Adapter/Category/QueryHandler/EditRootCategoryHandlerTest.php b/tests/Integration/Adapter/Category/QueryHandler/EditRootCategoryHandlerTest.php
index 7dcc6629916af..afb198cc57fd7 100644
--- a/tests/Integration/Adapter/Category/QueryHandler/EditRootCategoryHandlerTest.php
+++ b/tests/Integration/Adapter/Category/QueryHandler/EditRootCategoryHandlerTest.php
@@ -27,7 +27,7 @@
 
 namespace Tests\Integration\Adapter\Category\QueryHandler;
 
-use PrestaShop\PrestaShop\Core\CommandBus\MessengerCommandBusAdapter;
+use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
 use PrestaShop\PrestaShop\Core\Domain\Category\Command\EditRootCategoryCommand;
 use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CannotEditRootCategoryException;
 use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CategoryNotFoundException;
@@ -37,7 +37,7 @@
 class EditRootCategoryHandlerTest extends KernelTestCase
 {
     /**
-     * @var object|MessengerCommandBusAdapter|null
+     * @var object|CommandBusInterface|null
      */
     private $commandBus;
     /**
diff --git a/tests/Integration/Adapter/Category/QueryHandler/GetCategoryForEditingHandlerTest.php b/tests/Integration/Adapter/Category/QueryHandler/GetCategoryForEditingHandlerTest.php
index 9c3b45a4aebfc..382332eb38d86 100644
--- a/tests/Integration/Adapter/Category/QueryHandler/GetCategoryForEditingHandlerTest.php
+++ b/tests/Integration/Adapter/Category/QueryHandler/GetCategoryForEditingHandlerTest.php
@@ -27,7 +27,7 @@
 
 namespace Tests\Integration\Adapter\Category\QueryHandler;
 
-use PrestaShop\PrestaShop\Core\CommandBus\MessengerCommandBusAdapter;
+use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
 use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CannotEditRootCategoryException;
 use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CategoryNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Category\Query\GetCategoryForEditing;
@@ -38,7 +38,7 @@
 class GetCategoryForEditingHandlerTest extends KernelTestCase
 {
     /**
-     * @var object|MessengerCommandBusAdapter|null
+     * @var object|CommandBusInterface|null
      */
     private $commandBus;
     /**

From c7aa4658fd8f321da8efce67fa62a89a0b124193 Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Fri, 7 Jul 2023 11:45:31 +0200
Subject: [PATCH 0475/1030] Fix middleware

---
 app/config/config.yml                                      | 1 +
 app/config/messenger.yml                                   | 6 ++++++
 .../Resources/config/services/bundle/data_collector.yml    | 7 +++----
 .../Resources/config/services/core/command_bus.yml         | 5 ++---
 4 files changed, 12 insertions(+), 7 deletions(-)
 create mode 100644 app/config/messenger.yml

diff --git a/app/config/config.yml b/app/config/config.yml
index a08fa87423606..b7d5e3b4f89fe 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -3,6 +3,7 @@ imports:
   - { resource: services.yml }
   - { resource: addons/*.yml }
   - { resource: doctrine.yml }
+  - { resource: messenger.yml }
 
 # Put parameters here that don't need to change on each machine where the app is deployed
 # http://symfony.com/doc/current/best_practices/configuration.html#application-related-configuration
diff --git a/app/config/messenger.yml b/app/config/messenger.yml
new file mode 100644
index 0000000000000..1daa9262adcc9
--- /dev/null
+++ b/app/config/messenger.yml
@@ -0,0 +1,6 @@
+framework:
+  messenger:
+    buses:
+      messenger.bus.default:
+        middleware:
+          - 'PrestaShop\PrestaShop\Core\CommandBus\Middleware\CommandRegisterMiddleware'
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/data_collector.yml b/src/PrestaShopBundle/Resources/config/services/bundle/data_collector.yml
index 634840ea86b9b..c2228e16710fb 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/data_collector.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/data_collector.yml
@@ -12,10 +12,9 @@ services:
     tags:
       - { name: data_collector, template: '@PrestaShop/Admin/WebProfiler/hooks_collector.html.twig', id: 'ps.hooks_collector' }
 
-  prestashop.bundle.data_collector.commands_and_queries_collector:
-    class: PrestaShopBundle\DataCollector\CommandsAndQueriesDataCollector
-    arguments:
-      - '@prestashop.core.command_bus.executed_command_registry'
+  PrestaShopBundle\DataCollector\CommandsAndQueriesDataCollector:
+    autowire: true
+    public: false
     tags:
       - name: data_collector
         id: ps.commands_and_queries_collector
diff --git a/src/PrestaShopBundle/Resources/config/services/core/command_bus.yml b/src/PrestaShopBundle/Resources/config/services/core/command_bus.yml
index faf8518f020c5..da4c95af22b98 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/command_bus.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/command_bus.yml
@@ -21,10 +21,9 @@ services:
     autowire: true
     public: false
     arguments:
-      - $executedCommandRegistry: '@prestashop.core.command_bus.executed_command_registry'
+      - '@messenger.bus.default.messenger.handlers_locator'
 
-  prestashop.core.command_bus.executed_command_registry:
-    class: PrestaShop\PrestaShop\Core\CommandBus\ExecutedCommandRegistry
+  PrestaShop\PrestaShop\Core\CommandBus\ExecutedCommandRegistry:
     arguments:
       - '@prestashop.core.command_bus.parser.command_type_parser'
 

From 9a322e7928880e16d7f144fdce66caa582e93ca1 Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Fri, 7 Jul 2023 14:01:22 +0200
Subject: [PATCH 0476/1030] Fix php stan

---
 src/Core/CommandBus/ExecutedCommandRegistry.php                 | 2 +-
 .../Compiler/CommandAndQueryRegisterPass.php                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Core/CommandBus/ExecutedCommandRegistry.php b/src/Core/CommandBus/ExecutedCommandRegistry.php
index 417590fb8fa8c..e2b0713796aaa 100644
--- a/src/Core/CommandBus/ExecutedCommandRegistry.php
+++ b/src/Core/CommandBus/ExecutedCommandRegistry.php
@@ -115,7 +115,7 @@ private function getTrace(): array
         $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, self::BACKTRACE_LIMIT);
 
         foreach ($trace as $step) {
-            if ($step['class'] instanceof MessengerCommandBusAdapter
+            if ($step['class'] === MessengerCommandBusAdapter::class
                 && $step['function'] === 'handle'
             ) {
                 return [
diff --git a/src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryRegisterPass.php b/src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryRegisterPass.php
index 2c749cf3726a1..1defc1aab6ea4 100644
--- a/src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryRegisterPass.php
+++ b/src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryRegisterPass.php
@@ -95,7 +95,7 @@ private function registerMessengerTags(ContainerBuilder $container): void
         });
     }
 
-    private static function guessHandledClasses(ReflectionClass $class, string $method): ?string
+    private static function guessHandledClasses(ReflectionClass $class, string $method): string
     {
         $reflectionMethod = $class->getMethod($method);
         $parameters = $reflectionMethod->getParameters();

From 64654d131d8e3cb685fad6af996d9276e017fa8c Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Fri, 7 Jul 2023 15:46:32 +0200
Subject: [PATCH 0477/1030] Move CommandRegisterMiddleware and
 MessengerCommandBusAdapter  in PrestaShopBundle

---
 app/config/messenger.yml                                      | 2 +-
 src/Core/CommandBus/ExecutedCommandRegistry.php               | 1 +
 .../CommandBus/MessengerCommandBusAdapter.php                 | 3 ++-
 .../CommandBus/Middleware/CommandRegisterMiddleware.php       | 2 +-
 .../Resources/config/services/core/command_bus.yml            | 4 ++--
 tests/Unit/Core/CommandBus/MessengerCommandBusAdapterTest.php | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)
 rename src/{Core => PrestaShopBundle}/CommandBus/MessengerCommandBusAdapter.php (94%)
 rename src/{Core => PrestaShopBundle}/CommandBus/Middleware/CommandRegisterMiddleware.php (97%)

diff --git a/app/config/messenger.yml b/app/config/messenger.yml
index 1daa9262adcc9..5babdcf47d374 100644
--- a/app/config/messenger.yml
+++ b/app/config/messenger.yml
@@ -3,4 +3,4 @@ framework:
     buses:
       messenger.bus.default:
         middleware:
-          - 'PrestaShop\PrestaShop\Core\CommandBus\Middleware\CommandRegisterMiddleware'
+          - 'PrestaShopBundle\CommandBus\Middleware\CommandRegisterMiddleware'
diff --git a/src/Core/CommandBus/ExecutedCommandRegistry.php b/src/Core/CommandBus/ExecutedCommandRegistry.php
index e2b0713796aaa..1d4b6255e7016 100644
--- a/src/Core/CommandBus/ExecutedCommandRegistry.php
+++ b/src/Core/CommandBus/ExecutedCommandRegistry.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Core\CommandBus;
 
 use PrestaShop\PrestaShop\Core\CommandBus\Parser\CommandTypeParser;
+use PrestaShopBundle\CommandBus\MessengerCommandBusAdapter;
 
 /**
  * Stores information about executed commands/queries
diff --git a/src/Core/CommandBus/MessengerCommandBusAdapter.php b/src/PrestaShopBundle/CommandBus/MessengerCommandBusAdapter.php
similarity index 94%
rename from src/Core/CommandBus/MessengerCommandBusAdapter.php
rename to src/PrestaShopBundle/CommandBus/MessengerCommandBusAdapter.php
index 8a6ab69d617c2..334f471380e22 100644
--- a/src/Core/CommandBus/MessengerCommandBusAdapter.php
+++ b/src/PrestaShopBundle/CommandBus/MessengerCommandBusAdapter.php
@@ -24,8 +24,9 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
-namespace PrestaShop\PrestaShop\Core\CommandBus;
+namespace PrestaShopBundle\CommandBus;
 
+use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
 use Symfony\Component\Messenger\Exception\HandlerFailedException;
 use Symfony\Component\Messenger\HandleTrait;
 use Symfony\Component\Messenger\MessageBusInterface;
diff --git a/src/Core/CommandBus/Middleware/CommandRegisterMiddleware.php b/src/PrestaShopBundle/CommandBus/Middleware/CommandRegisterMiddleware.php
similarity index 97%
rename from src/Core/CommandBus/Middleware/CommandRegisterMiddleware.php
rename to src/PrestaShopBundle/CommandBus/Middleware/CommandRegisterMiddleware.php
index e5ba2742d6df4..338d059988388 100644
--- a/src/Core/CommandBus/Middleware/CommandRegisterMiddleware.php
+++ b/src/PrestaShopBundle/CommandBus/Middleware/CommandRegisterMiddleware.php
@@ -24,7 +24,7 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
-namespace PrestaShop\PrestaShop\Core\CommandBus\Middleware;
+namespace PrestaShopBundle\CommandBus\Middleware;
 
 use PrestaShop\PrestaShop\Core\CommandBus\ExecutedCommandRegistry;
 use Symfony\Component\Messenger\Envelope;
diff --git a/src/PrestaShopBundle/Resources/config/services/core/command_bus.yml b/src/PrestaShopBundle/Resources/config/services/core/command_bus.yml
index da4c95af22b98..50d92d6cb6e30 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/command_bus.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/command_bus.yml
@@ -6,7 +6,7 @@ services:
     alias: PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface
 
   PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface:
-    class: PrestaShop\PrestaShop\Core\CommandBus\MessengerCommandBusAdapter
+    class: PrestaShopBundle\CommandBus\MessengerCommandBusAdapter
     autowire: true
     public: false
 
@@ -17,7 +17,7 @@ services:
   prestashop.core.provider.command_definition_provider:
     class: 'PrestaShop\PrestaShop\Core\CommandBus\Parser\CommandDefinitionParser'
 
-  PrestaShop\PrestaShop\Core\CommandBus\Middleware\CommandRegisterMiddleware:
+  PrestaShopBundle\CommandBus\Middleware\CommandRegisterMiddleware:
     autowire: true
     public: false
     arguments:
diff --git a/tests/Unit/Core/CommandBus/MessengerCommandBusAdapterTest.php b/tests/Unit/Core/CommandBus/MessengerCommandBusAdapterTest.php
index 59b85df1454b7..e9ebc217d5b17 100644
--- a/tests/Unit/Core/CommandBus/MessengerCommandBusAdapterTest.php
+++ b/tests/Unit/Core/CommandBus/MessengerCommandBusAdapterTest.php
@@ -28,7 +28,7 @@
 
 use PHPUnit\Framework\TestCase;
 use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
-use PrestaShop\PrestaShop\Core\CommandBus\MessengerCommandBusAdapter;
+use PrestaShopBundle\CommandBus\MessengerCommandBusAdapter;
 use Symfony\Component\Messenger\MessageBusInterface;
 
 class MessengerCommandBusAdapterTest extends TestCase

From e2e3f1fa570464ac802151eca1f2cf4c24d672f0 Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Fri, 7 Jul 2023 17:18:23 +0200
Subject: [PATCH 0478/1030] Fix Commands and queries debug

---
 src/Core/CommandBus/ExecutedCommandRegistry.php           | 8 ++++----
 ...engerCommandBusAdapter.php => MessengerCommandBus.php} | 4 ++--
 .../Resources/config/services/core/command_bus.yml        | 2 +-
 ...mandBusAdapterTest.php => MessengerCommandBusTest.php} | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename src/PrestaShopBundle/CommandBus/{MessengerCommandBusAdapter.php => MessengerCommandBus.php} (90%)
 rename tests/Unit/Core/CommandBus/{MessengerCommandBusAdapterTest.php => MessengerCommandBusTest.php} (86%)

diff --git a/src/Core/CommandBus/ExecutedCommandRegistry.php b/src/Core/CommandBus/ExecutedCommandRegistry.php
index 1d4b6255e7016..bafcc10cbfd88 100644
--- a/src/Core/CommandBus/ExecutedCommandRegistry.php
+++ b/src/Core/CommandBus/ExecutedCommandRegistry.php
@@ -29,14 +29,14 @@
 namespace PrestaShop\PrestaShop\Core\CommandBus;
 
 use PrestaShop\PrestaShop\Core\CommandBus\Parser\CommandTypeParser;
-use PrestaShopBundle\CommandBus\MessengerCommandBusAdapter;
+use PrestaShopBundle\CommandBus\MessengerCommandBus;
 
 /**
  * Stores information about executed commands/queries
  */
 final class ExecutedCommandRegistry
 {
-    private const BACKTRACE_LIMIT = 10;
+    private const BACKTRACE_LIMIT = 15;
 
     /**
      * @var array
@@ -115,8 +115,8 @@ private function getTrace(): array
     {
         $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, self::BACKTRACE_LIMIT);
 
-        foreach ($trace as $step) {
-            if ($step['class'] === MessengerCommandBusAdapter::class
+        foreach ($trace as $key => $step) {
+            if (is_a($step['class'], MessengerCommandBus::class, true)
                 && $step['function'] === 'handle'
             ) {
                 return [
diff --git a/src/PrestaShopBundle/CommandBus/MessengerCommandBusAdapter.php b/src/PrestaShopBundle/CommandBus/MessengerCommandBus.php
similarity index 90%
rename from src/PrestaShopBundle/CommandBus/MessengerCommandBusAdapter.php
rename to src/PrestaShopBundle/CommandBus/MessengerCommandBus.php
index 334f471380e22..c4fd52c6a3174 100644
--- a/src/PrestaShopBundle/CommandBus/MessengerCommandBusAdapter.php
+++ b/src/PrestaShopBundle/CommandBus/MessengerCommandBus.php
@@ -32,9 +32,9 @@
 use Symfony\Component\Messenger\MessageBusInterface;
 
 /**
- * Class MessengerCommandBusAdapter is the Symfony Messenger CommandsBus implementation for PrestaShop's contract.
+ * Class MessengerCommandBus is the Symfony Messenger CommandsBus implementation for PrestaShop's contract.
  */
-final class MessengerCommandBusAdapter implements CommandBusInterface
+final class MessengerCommandBus implements CommandBusInterface
 {
     use HandleTrait {
         HandleTrait::handle as process;
diff --git a/src/PrestaShopBundle/Resources/config/services/core/command_bus.yml b/src/PrestaShopBundle/Resources/config/services/core/command_bus.yml
index 50d92d6cb6e30..a1bf215949387 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/command_bus.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/command_bus.yml
@@ -6,7 +6,7 @@ services:
     alias: PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface
 
   PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface:
-    class: PrestaShopBundle\CommandBus\MessengerCommandBusAdapter
+    class: PrestaShopBundle\CommandBus\MessengerCommandBus
     autowire: true
     public: false
 
diff --git a/tests/Unit/Core/CommandBus/MessengerCommandBusAdapterTest.php b/tests/Unit/Core/CommandBus/MessengerCommandBusTest.php
similarity index 86%
rename from tests/Unit/Core/CommandBus/MessengerCommandBusAdapterTest.php
rename to tests/Unit/Core/CommandBus/MessengerCommandBusTest.php
index e9ebc217d5b17..04097351a62c8 100644
--- a/tests/Unit/Core/CommandBus/MessengerCommandBusAdapterTest.php
+++ b/tests/Unit/Core/CommandBus/MessengerCommandBusTest.php
@@ -28,14 +28,14 @@
 
 use PHPUnit\Framework\TestCase;
 use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
-use PrestaShopBundle\CommandBus\MessengerCommandBusAdapter;
+use PrestaShopBundle\CommandBus\MessengerCommandBus;
 use Symfony\Component\Messenger\MessageBusInterface;
 
-class MessengerCommandBusAdapterTest extends TestCase
+class MessengerCommandBusTest extends TestCase
 {
     public function testIsValidImplementation()
     {
-        $commandBudAdapter = new MessengerCommandBusAdapter($this->createMock(MessageBusInterface::class));
+        $commandBudAdapter = new MessengerCommandBus($this->createMock(MessageBusInterface::class));
 
         $this->assertInstanceOf(CommandBusInterface::class, $commandBudAdapter);
     }

From c5808964ad343f543423dc6126ff45963085bb87 Mon Sep 17 00:00:00 2001
From: lartist <salim-benouamer.ext@prestashop.com>
Date: Mon, 10 Jul 2023 10:41:11 +0200
Subject: [PATCH 0479/1030] Replace footer smarty template by twig component

---
 .../themes/new-theme/template/layout.tpl      |  5 ++-
 .../Admin/Component/Layout/footer.html.twig   | 27 ++++++++++++++
 .../views/Admin/Layout/footer.html.twig       | 25 +++++++++++++
 .../Twig/Component/Footer.php                 | 36 +++++++++++++++++++
 4 files changed, 92 insertions(+), 1 deletion(-)
 create mode 100644 src/PrestaShopBundle/Resources/views/Admin/Component/Layout/footer.html.twig
 create mode 100644 src/PrestaShopBundle/Resources/views/Admin/Layout/footer.html.twig
 create mode 100644 src/PrestaShopBundle/Twig/Component/Footer.php

diff --git a/admin-dev/themes/new-theme/template/layout.tpl b/admin-dev/themes/new-theme/template/layout.tpl
index 0aebf68ad775c..617c3243baa95 100644
--- a/admin-dev/themes/new-theme/template/layout.tpl
+++ b/admin-dev/themes/new-theme/template/layout.tpl
@@ -152,7 +152,10 @@
   <div class="mobile-layer"></div>
 
   {if $display_footer}
-    {include file='footer.tpl'}
+      {render_template
+        smarty_template="footer.tpl"
+        twig_template="@PrestaShop/Admin/Layout/footer.html.twig"
+      }
   {/if}
 {/if}
 
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/footer.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/footer.html.twig
new file mode 100644
index 0000000000000..78489c4cea98c
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/footer.html.twig
@@ -0,0 +1,27 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+<div id="footer" class="bootstrap">
+  {{ renderhook('displayBackOfficeFooter') }}
+</div>
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/footer.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/footer.html.twig
new file mode 100644
index 0000000000000..539dc092e31d8
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/footer.html.twig
@@ -0,0 +1,25 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+{{ component('Footer') }}
diff --git a/src/PrestaShopBundle/Twig/Component/Footer.php b/src/PrestaShopBundle/Twig/Component/Footer.php
new file mode 100644
index 0000000000000..b0e487e4db52c
--- /dev/null
+++ b/src/PrestaShopBundle/Twig/Component/Footer.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\Twig\Component;
+
+use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
+
+#[AsTwigComponent(template: '@PrestaShop/Admin/Component/Layout/footer.html.twig')]
+class Footer
+{
+}

From 54ab03a17c8f52a8ae7c2d517353b69952d29ab9 Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Mon, 10 Jul 2023 11:26:33 +0200
Subject: [PATCH 0480/1030] Fix authorized application column length

---
 src/PrestaShopBundle/Entity/AuthorizedApplication.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PrestaShopBundle/Entity/AuthorizedApplication.php b/src/PrestaShopBundle/Entity/AuthorizedApplication.php
index d095acce46a15..f1fb2473ed939 100644
--- a/src/PrestaShopBundle/Entity/AuthorizedApplication.php
+++ b/src/PrestaShopBundle/Entity/AuthorizedApplication.php
@@ -52,7 +52,7 @@ class AuthorizedApplication
     /**
      * @var string
      *
-     * @ORM\Column(name="name", type="string", length=255, unique=true)
+     * @ORM\Column(name="name", type="string", length=50, unique=true)
      */
     private $name;
 

From 1b0f4a98d409c5f93cc54b1a5a4f4180ba64aec9 Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Mon, 10 Jul 2023 14:11:58 +0200
Subject: [PATCH 0481/1030] Update getTrace condition

---
 src/Core/CommandBus/ExecutedCommandRegistry.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Core/CommandBus/ExecutedCommandRegistry.php b/src/Core/CommandBus/ExecutedCommandRegistry.php
index bafcc10cbfd88..066c1413540df 100644
--- a/src/Core/CommandBus/ExecutedCommandRegistry.php
+++ b/src/Core/CommandBus/ExecutedCommandRegistry.php
@@ -29,7 +29,6 @@
 namespace PrestaShop\PrestaShop\Core\CommandBus;
 
 use PrestaShop\PrestaShop\Core\CommandBus\Parser\CommandTypeParser;
-use PrestaShopBundle\CommandBus\MessengerCommandBus;
 
 /**
  * Stores information about executed commands/queries
@@ -115,9 +114,9 @@ private function getTrace(): array
     {
         $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, self::BACKTRACE_LIMIT);
 
-        foreach ($trace as $key => $step) {
-            if (is_a($step['class'], MessengerCommandBus::class, true)
-                && $step['function'] === 'handle'
+        foreach ($trace as $step) {
+            if ($step['function'] === 'handle'
+                && is_a($step['class'], CommandBusInterface::class, true)
             ) {
                 return [
                     'file' => $step['file'],

From 377e2cf66d1855b7c1492f10a58ec5d79e0f1fb2 Mon Sep 17 00:00:00 2001
From: lartist <salim-benouamer.ext@prestashop.com>
Date: Mon, 10 Jul 2023 15:21:02 +0200
Subject: [PATCH 0482/1030] Replace php error smarty template by twig component

---
 .../themes/new-theme/template/layout.tpl      |  6 ++-
 .../Component/Layout/php_errors.html.twig     | 44 +++++++++++++++++++
 .../views/Admin/Layout/php_errors.html.twig   | 27 ++++++++++++
 .../Twig/Component/PHPErrors.php              | 37 ++++++++++++++++
 4 files changed, 113 insertions(+), 1 deletion(-)
 create mode 100644 src/PrestaShopBundle/Resources/views/Admin/Component/Layout/php_errors.html.twig
 create mode 100644 src/PrestaShopBundle/Resources/views/Admin/Layout/php_errors.html.twig
 create mode 100644 src/PrestaShopBundle/Twig/Component/PHPErrors.php

diff --git a/admin-dev/themes/new-theme/template/layout.tpl b/admin-dev/themes/new-theme/template/layout.tpl
index 0aebf68ad775c..7884f8cd842a9 100644
--- a/admin-dev/themes/new-theme/template/layout.tpl
+++ b/admin-dev/themes/new-theme/template/layout.tpl
@@ -157,7 +157,11 @@
 {/if}
 
 {if isset($php_errors)}
-  {include file="error.tpl"}
+    {render_template
+      smarty_template="error.tpl"
+      twig_template="@PrestaShop/Admin/Layout/php_errors.html.twig"
+      php_errors=$php_errors
+    }
 {/if}
 
 {if (!isset($lite_display) || (isset($lite_display) && !$lite_display))}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/php_errors.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/php_errors.html.twig
new file mode 100644
index 0000000000000..20f8e7b894b2a
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/php_errors.html.twig
@@ -0,0 +1,44 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+{% if phpErrors|length > 0 %}
+<div class="bootstrap">
+  <div id="error-modal" class="modal fade">
+    <div class="modal-dialog">
+      <div class="alert alert-danger clearfix">
+        {% for phpError in phpErrors %}
+          {{ '%1$s on line %2$s in file %3$s'|trans({
+            '%1$s': phpError.type,
+            '%2$s': phpError.errline,
+            '%3$s': phpError.errfile,
+            }, 'Admin.Notifications.Error')
+          }}<br />
+          [{{ phpError.errno }}] {{ phpError.errstr }}<br /><br />
+        {% endfor %}
+        <button type="button" class="btn btn-default float-right" data-dismiss="modal"><i class="icon-remove"></i> {{ 'Close'|trans({}, 'Admin.Actions') }}</button>
+      </div>
+    </div>
+  </div>
+</div>
+{% endif %}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/php_errors.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/php_errors.html.twig
new file mode 100644
index 0000000000000..3475f33e68bf5
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/php_errors.html.twig
@@ -0,0 +1,27 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+{{ component('PHPErrors', {
+  phpErrors: php_errors,
+}) }}
diff --git a/src/PrestaShopBundle/Twig/Component/PHPErrors.php b/src/PrestaShopBundle/Twig/Component/PHPErrors.php
new file mode 100644
index 0000000000000..e5bf250c3ca2c
--- /dev/null
+++ b/src/PrestaShopBundle/Twig/Component/PHPErrors.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\Twig\Component;
+
+use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
+
+#[AsTwigComponent(template: '@PrestaShop/Admin/Component/Layout/php_errors.html.twig')]
+class PHPErrors
+{
+    public array $phpErrors;
+}

From d06218f8e6a58a1e398800b0a9eac410ca2042a5 Mon Sep 17 00:00:00 2001
From: lartist <salim-benouamer.ext@prestashop.com>
Date: Mon, 10 Jul 2023 15:47:00 +0200
Subject: [PATCH 0483/1030] Replace non responsive smarty template by twig
 component

---
 .../themes/new-theme/template/layout.tpl      |  6 ++-
 .../Component/Layout/non_responsive.html.twig | 41 +++++++++++++++++++
 .../Admin/Layout/non_responsive.html.twig     | 27 ++++++++++++
 .../Twig/Component/NonResponsive.php          | 37 +++++++++++++++++
 4 files changed, 110 insertions(+), 1 deletion(-)
 create mode 100644 src/PrestaShopBundle/Resources/views/Admin/Component/Layout/non_responsive.html.twig
 create mode 100644 src/PrestaShopBundle/Resources/views/Admin/Layout/non_responsive.html.twig
 create mode 100644 src/PrestaShopBundle/Twig/Component/NonResponsive.php

diff --git a/admin-dev/themes/new-theme/template/layout.tpl b/admin-dev/themes/new-theme/template/layout.tpl
index 0aebf68ad775c..42bf8c870315c 100644
--- a/admin-dev/themes/new-theme/template/layout.tpl
+++ b/admin-dev/themes/new-theme/template/layout.tpl
@@ -148,7 +148,11 @@
 </div>
 
 {if (!isset($lite_display) || (isset($lite_display) && !$lite_display))}
-  {include file='components/layout/non-responsive.tpl'}
+    {render_template
+      smarty_template="components/layout/non-responsive.tpl"
+      twig_template="@PrestaShop/Admin/Layout/non_responsive.html.twig"
+      default_tab_link=$default_tab_link
+    }
   <div class="mobile-layer"></div>
 
   {if $display_footer}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/non_responsive.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/non_responsive.html.twig
new file mode 100644
index 0000000000000..f5833596da55f
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/non_responsive.html.twig
@@ -0,0 +1,41 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+<div id="non-responsive" class="js-non-responsive">
+  <h1>{{ 'Oh no!'|trans }}</h1>
+  <p class="mt-3">
+    {{ 'The mobile version of this page is not available yet.'|trans }}
+  </p>
+  <p class="mt-2">
+    {{ 'Please use a desktop computer to access this page, until is adapted to mobile.'|trans }}
+  </p>
+  <p class="mt-2">
+    {{ 'Thank you.'|trans }}
+  </p>
+  <a href="{{ defaultTabLink|escape('html_attr') }}" class="btn btn-primary py-1 mt-3">
+    <i class="material-icons rtl-flip">arrow_back</i>
+    {{ 'Back'|trans({}, 'Admin.Global') }}
+  </a>
+</div>
+
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/non_responsive.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/non_responsive.html.twig
new file mode 100644
index 0000000000000..01e7cbd07750f
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/non_responsive.html.twig
@@ -0,0 +1,27 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+{{ component('NonResponsive', {
+  defaultTabLink: default_tab_link
+}) }}
diff --git a/src/PrestaShopBundle/Twig/Component/NonResponsive.php b/src/PrestaShopBundle/Twig/Component/NonResponsive.php
new file mode 100644
index 0000000000000..83da3e20ee846
--- /dev/null
+++ b/src/PrestaShopBundle/Twig/Component/NonResponsive.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\Twig\Component;
+
+use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
+
+#[AsTwigComponent(template: '@PrestaShop/Admin/Component/Layout/non_responsive.html.twig')]
+class NonResponsive
+{
+    public string $defaultTabLink;
+}

From 4669c8f7355217970eef65a8aa2ecb54c9bb7033 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Fri, 7 Jul 2023 11:58:42 +0200
Subject: [PATCH 0484/1030] fix bug in product v2 tests

---
 .../productV2/functional/03_CRUDProductWithCombinations.ts  | 2 +-
 .../productV2/sanity/03_CRUDProductWithCombinations.ts      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/UI/campaigns/productV2/functional/03_CRUDProductWithCombinations.ts b/tests/UI/campaigns/productV2/functional/03_CRUDProductWithCombinations.ts
index 1d1ecbf16514b..30cde308848a8 100644
--- a/tests/UI/campaigns/productV2/functional/03_CRUDProductWithCombinations.ts
+++ b/tests/UI/campaigns/productV2/functional/03_CRUDProductWithCombinations.ts
@@ -55,7 +55,7 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       },
       {
         name: 'color',
-        values: ['Grey', 'Taupe', 'Beige', 'White', 'Red', 'Black', 'Orange', 'Green', 'Yellow', 'Brown'],
+        values: ['Gray', 'Taupe', 'Beige', 'White', 'Red', 'Black', 'Orange', 'Green', 'Yellow', 'Brown'],
       },
     ],
     status: false,
diff --git a/tests/UI/campaigns/productV2/sanity/03_CRUDProductWithCombinations.ts b/tests/UI/campaigns/productV2/sanity/03_CRUDProductWithCombinations.ts
index 98db09e35a1d0..f4d26cd9a7b09 100644
--- a/tests/UI/campaigns/productV2/sanity/03_CRUDProductWithCombinations.ts
+++ b/tests/UI/campaigns/productV2/sanity/03_CRUDProductWithCombinations.ts
@@ -49,7 +49,7 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
     attributes: [
       {
         name: 'color',
-        values: ['Grey', 'Taupe', 'Red'],
+        values: ['Gray', 'Taupe', 'Red'],
       },
       {
         name: 'size',
@@ -149,7 +149,7 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       await expect(successMessage).to.equal('Successfully generated 4 combinations.');
     });
 
-    it('combinations generation modal should be closed', async function () {
+    it('should check that combinations generation modal is closed', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'generateCombinationsModalIsClosed2', baseContext);
 
       const isModalClosed = await combinationsTab.generateCombinationModalIsClosed(page);
@@ -231,7 +231,7 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       await expect(successMessage).to.equal('Successfully generated 6 combinations.');
     });
 
-    it('combinations generation modal should be closed', async function () {
+    it('should check that combinations generation modal is closed', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'generateCombinationsModalIsClosed2', baseContext);
 
       const isModalClosed = await combinationsTab.generateCombinationModalIsClosed(page);

From 93634bf93fc03c79dec16a7614df5cf91d7e1cee Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Mon, 10 Jul 2023 16:39:16 +0200
Subject: [PATCH 0485/1030] Fix sanity product V2 tests

---
 .../productV2/sanity/03_CRUDProductWithCombinations.js          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/UI/campaigns/productV2/sanity/03_CRUDProductWithCombinations.js b/tests/UI/campaigns/productV2/sanity/03_CRUDProductWithCombinations.js
index 51aec5ed92607..19a2a0642a63f 100644
--- a/tests/UI/campaigns/productV2/sanity/03_CRUDProductWithCombinations.js
+++ b/tests/UI/campaigns/productV2/sanity/03_CRUDProductWithCombinations.js
@@ -43,7 +43,7 @@ const editProductData = new ProductFaker({
   minimumQuantity: 1,
   status: true,
   attributes: {
-    color: ['Grey', 'Taupe', 'Red'],
+    color: ['Gray', 'Taupe', 'Red'],
     size: ['L', 'XL'],
   },
 });

From aca4c65af0ad382ca1d516c740d4676458951a76 Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Mon, 26 Jun 2023 13:57:54 +0200
Subject: [PATCH 0486/1030] Fix 'New' Translation domain

---
 src/Adapter/Presenter/Product/ProductLazyArray.php          | 2 +-
 .../Form/ChoiceProvider/ProductConditionChoiceProvider.php  | 6 +++---
 src/PrestaShopBundle/Form/Admin/Product/ProductOptions.php  | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Adapter/Presenter/Product/ProductLazyArray.php b/src/Adapter/Presenter/Product/ProductLazyArray.php
index 154039d6b65c2..787968a5c3cf3 100644
--- a/src/Adapter/Presenter/Product/ProductLazyArray.php
+++ b/src/Adapter/Presenter/Product/ProductLazyArray.php
@@ -486,7 +486,7 @@ public function getFlags()
         if ($this->product['new']) {
             $flags['new'] = [
                 'type' => 'new',
-                'label' => $this->translator->trans('New', [], 'Shop.Theme.Catalog'),
+                'label' => $this->translator->trans('New', [], 'Shop.Theme.Global'),
             ];
         }
 
diff --git a/src/Core/Form/ChoiceProvider/ProductConditionChoiceProvider.php b/src/Core/Form/ChoiceProvider/ProductConditionChoiceProvider.php
index 57f7c5a09d7c1..cc1ecb53b9b95 100644
--- a/src/Core/Form/ChoiceProvider/ProductConditionChoiceProvider.php
+++ b/src/Core/Form/ChoiceProvider/ProductConditionChoiceProvider.php
@@ -54,9 +54,9 @@ public function __construct(
     public function getChoices()
     {
         return [
-            $this->translator->trans('New', [], 'Shop.Theme.Catalog') => ProductCondition::NEW,
-            $this->translator->trans('Used', [], 'Shop.Theme.Catalog') => ProductCondition::USED,
-            $this->translator->trans('Refurbished', [], 'Shop.Theme.Catalog') => ProductCondition::REFURBISHED,
+            $this->translator->trans('New', [], 'Admin.Catalog.Feature') => ProductCondition::NEW,
+            $this->translator->trans('Used', [], 'Admin.Catalog.Feature') => ProductCondition::USED,
+            $this->translator->trans('Refurbished', [], 'Admin.Catalog.Feature') => ProductCondition::REFURBISHED,
         ];
     }
 }
diff --git a/src/PrestaShopBundle/Form/Admin/Product/ProductOptions.php b/src/PrestaShopBundle/Form/Admin/Product/ProductOptions.php
index ff9968ec42b99..12139b79300f3 100644
--- a/src/PrestaShopBundle/Form/Admin/Product/ProductOptions.php
+++ b/src/PrestaShopBundle/Form/Admin/Product/ProductOptions.php
@@ -197,9 +197,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ])
             ->add('condition', FormType\ChoiceType::class, [
                 'choices' => [
-                    $this->translator->trans('New', [], 'Admin.Global') => 'new',
-                    $this->translator->trans('Used', [], 'Shop.Theme.Catalog') => 'used',
-                    $this->translator->trans('Refurbished', [], 'Shop.Theme.Catalog') => 'refurbished',
+                    $this->translator->trans('New', [], 'Admin.Catalog.Feature') => 'new',
+                    $this->translator->trans('Used', [], 'Admin.Catalog.Feature') => 'used',
+                    $this->translator->trans('Refurbished', [], 'Admin.Catalog.Feature') => 'refurbished',
                 ],
                 'attr' => [
                     'class' => 'custom-select',

From 2a66c3b9213444bb8eb37162b6111346bc212792 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Thu, 6 Jul 2023 17:18:46 +0200
Subject: [PATCH 0487/1030] Nightly : 8.1.x : Fixed error in filterTaxes

---
 .../03_taxes/01_taxes/01_filterAndQuickEditTaxes.ts           | 4 ++--
 tests/UI/pages/BO/international/taxes/index.ts                | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/01_filterAndQuickEditTaxes.ts b/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/01_filterAndQuickEditTaxes.ts
index 13eb73a217c16..db6fc4e5fddc7 100644
--- a/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/01_filterAndQuickEditTaxes.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/01_filterAndQuickEditTaxes.ts
@@ -129,13 +129,13 @@ describe('BO - International - Taxes : Filter And Quick Edit', async () => {
     it('should filter by name', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'filterForQuickEdit', baseContext);
 
-      await taxesPage.filterTaxes(page, 'input', 'name', tax.VatUkTax.name);
+      await taxesPage.filterTaxes(page, 'input', 'name', tax.DefaultFrTax.name);
 
       const numberOfTaxesAfterFilter = await taxesPage.getNumberOfElementInGrid(page);
       await expect(numberOfTaxesAfterFilter).to.be.at.most(numberOfTaxes);
 
       const textColumn = await taxesPage.getTextColumnFromTableTaxes(page, 1, 'name');
-      await expect(textColumn).to.contains(tax.VatUkTax.name);
+      await expect(textColumn).to.contains(tax.DefaultFrTax.name);
     });
 
     [
diff --git a/tests/UI/pages/BO/international/taxes/index.ts b/tests/UI/pages/BO/international/taxes/index.ts
index 10da940002072..d258f26502742 100644
--- a/tests/UI/pages/BO/international/taxes/index.ts
+++ b/tests/UI/pages/BO/international/taxes/index.ts
@@ -200,7 +200,7 @@ class Taxes extends BOBasePage {
         await this.setValue(page, this.taxesFilterColumnInput(filterBy), value);
         break;
       case 'select':
-        await this.selectByVisibleText(page, this.taxesFilterColumnInput(filterBy), value ? 'Yes' : 'No');
+        await this.selectByVisibleText(page, this.taxesFilterColumnInput(filterBy), value === '1' ? 'Yes' : 'No');
         break;
       default:
       // Do nothing

From 2c40a2419f1004a462f8124f81b4e5d55b07e766 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Thu, 6 Jul 2023 17:19:47 +0200
Subject: [PATCH 0488/1030] Nightly : Develop : Fixed error in filterTaxes

---
 .../03_taxes/01_taxes/01_filterAndQuickEditTaxes.ts           | 4 ++--
 tests/UI/pages/BO/international/taxes/index.ts                | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/01_filterAndQuickEditTaxes.ts b/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/01_filterAndQuickEditTaxes.ts
index 13eb73a217c16..db6fc4e5fddc7 100644
--- a/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/01_filterAndQuickEditTaxes.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/01_filterAndQuickEditTaxes.ts
@@ -129,13 +129,13 @@ describe('BO - International - Taxes : Filter And Quick Edit', async () => {
     it('should filter by name', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'filterForQuickEdit', baseContext);
 
-      await taxesPage.filterTaxes(page, 'input', 'name', tax.VatUkTax.name);
+      await taxesPage.filterTaxes(page, 'input', 'name', tax.DefaultFrTax.name);
 
       const numberOfTaxesAfterFilter = await taxesPage.getNumberOfElementInGrid(page);
       await expect(numberOfTaxesAfterFilter).to.be.at.most(numberOfTaxes);
 
       const textColumn = await taxesPage.getTextColumnFromTableTaxes(page, 1, 'name');
-      await expect(textColumn).to.contains(tax.VatUkTax.name);
+      await expect(textColumn).to.contains(tax.DefaultFrTax.name);
     });
 
     [
diff --git a/tests/UI/pages/BO/international/taxes/index.ts b/tests/UI/pages/BO/international/taxes/index.ts
index 682a30bdcc55a..53a1043a5d3e0 100644
--- a/tests/UI/pages/BO/international/taxes/index.ts
+++ b/tests/UI/pages/BO/international/taxes/index.ts
@@ -200,7 +200,7 @@ class Taxes extends BOBasePage {
         await this.setValue(page, this.taxesFilterColumnInput(filterBy), value);
         break;
       case 'select':
-        await this.selectByVisibleText(page, this.taxesFilterColumnInput(filterBy), value ? 'Yes' : 'No');
+        await this.selectByVisibleText(page, this.taxesFilterColumnInput(filterBy), value === '1' ? 'Yes' : 'No');
         break;
       default:
       // Do nothing

From 842c21784fb568917b159b08521b8e5fff4f86eb Mon Sep 17 00:00:00 2001
From: tleon <thomas.leone@prestashop.com>
Date: Wed, 28 Jun 2023 12:10:44 +0200
Subject: [PATCH 0489/1030] chore(command): changed the way to obtain
 ressources informations from router to api platform attributes

---
 .../Command/ListCommandsAndQueriesCommand.php | 84 +++++++++----------
 .../DomainClassNameMalformedException.php     | 39 +++++++++
 .../config/services_dev/bundle/command.yml    |  3 +-
 .../ListCommandsAndQueriesCommandTest.php     | 54 ++++++++----
 4 files changed, 122 insertions(+), 58 deletions(-)
 create mode 100644 src/PrestaShopBundle/Exception/DomainClassNameMalformedException.php

diff --git a/src/PrestaShopBundle/Command/ListCommandsAndQueriesCommand.php b/src/PrestaShopBundle/Command/ListCommandsAndQueriesCommand.php
index 5058121aebf30..620d7fb4bb88d 100644
--- a/src/PrestaShopBundle/Command/ListCommandsAndQueriesCommand.php
+++ b/src/PrestaShopBundle/Command/ListCommandsAndQueriesCommand.php
@@ -26,48 +26,38 @@
 
 namespace PrestaShopBundle\Command;
 
+use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
+use ApiPlatform\Metadata\Resource\Factory\ResourceNameCollectionFactoryInterface;
+use ApiPlatform\Metadata\Resource\ResourceMetadataCollection;
 use PrestaShop\PrestaShop\Core\CommandBus\Parser\CommandDefinition;
 use PrestaShop\PrestaShop\Core\CommandBus\Parser\CommandDefinitionParser;
+use PrestaShopBundle\Exception\DomainClassNameMalformedException;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Formatter\OutputFormatterStyle;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Style\SymfonyStyle;
-use Symfony\Component\Routing\Route;
-use Symfony\Component\Routing\RouterInterface;
 
 /**
  * Lists all commands and queries definitions
  */
 class ListCommandsAndQueriesCommand extends Command
 {
-    private CommandDefinitionParser $commandDefinitionParser;
-
-    /**
-     * @var string[]
-     */
-    private array $commandAndQueries;
-
     private bool $isFormatSimple;
 
     /**
-     * @var Route[]
+     * @var ResourceMetadataCollection[]
      */
     private array $apiResourcesList;
 
-    private RouterInterface $router;
-
     public function __construct(
-        CommandDefinitionParser $commandDefinitionParser,
-        array $commandAndQueries,
-        RouterInterface $router
+        private CommandDefinitionParser $commandDefinitionParser,
+        private array $commandAndQueries,
+        private ResourceNameCollectionFactoryInterface $resourceNameCollectionFactory,
+        private ResourceMetadataCollectionFactoryInterface $resourceMetadataFactory
     ) {
         parent::__construct();
-        $this->commandDefinitionParser = $commandDefinitionParser;
-        $this->commandAndQueries = $commandAndQueries;
         $this->isFormatSimple = false;
-        $this->router = $router;
     }
 
     /**
@@ -99,7 +89,6 @@ public function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        $io = new SymfonyStyle($input, $output);
         $this->apiResourcesList = $this->getResourceList();
         $this->handleOptions($input);
 
@@ -108,15 +97,15 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         foreach ($this->commandAndQueries as $key => $commandName) {
             $commandDefinition = $this->commandDefinitionParser->parseDefinition($commandName);
-            $CQRSEndpointURI = $this->getCQRSEndpointURI($commandDefinition);
+            $cqrsEndpointURI = $this->getCQRSEndpointURI($commandDefinition);
 
             if ($this->isFormatSimple) {
-                $output->writeln('<info>' . $commandDefinition->getClassName() . (!empty($CQRSEndpointURI) ? ' OK' : ' NOT OK') . '</info>');
+                $output->writeln('<info>' . $commandDefinition->getClassName() . (!empty($cqrsEndpointURI) ? ' OK' : ' NOT OK') . '</info>');
             } else {
                 $output->writeln(++$key . '.');
                 $output->writeln('<blue>Class: </blue><info>' . $commandDefinition->getClassName() . '</info>');
                 $output->writeln('<blue>Type: </blue><info>' . $commandDefinition->getCommandType() . '</info>');
-                $output->writeln('<blue>API: </blue><info>' . $CQRSEndpointURI . '</info>');
+                $output->writeln('<blue>API: </blue><info>' . $cqrsEndpointURI . '</info>');
                 $output->writeln('<comment>' . $commandDefinition->getDescription() . '</comment>');
                 $output->writeln('');
             }
@@ -154,17 +143,18 @@ private function filterCQRS(array $filters): void
     }
 
     /**
-     * This method takes the list of all routes on the project and filters out all the api-platform endpoints.
+     * This method rebuild the resources from the api platform attributes.
      *
-     * @return Route[]
+     * @return ResourceMetadataCollection[]
      */
     private function getResourceList(): array
     {
-        return array_filter($this->router->getRouteCollection()->all(), function ($value, $key) {
-            if (preg_match('/^_api_/', $key) === 1) {
-                return $value;
-            }
-        }, ARRAY_FILTER_USE_BOTH);
+        $resourceMetadataCollection = [];
+        foreach ($this->resourceNameCollectionFactory->create() as $resourceClass) {
+            $resourceMetadataCollection[] = $this->resourceMetadataFactory->create($resourceClass);
+        }
+
+        return $resourceMetadataCollection;
     }
 
     /**
@@ -173,28 +163,38 @@ private function getResourceList(): array
      */
     private function getCQRSEndpointURI(CommandDefinition $commandDefinition): string
     {
-        foreach ($this->apiResourcesList as $resource) {
-            $apiResourceClass = explode('\\', $resource->getDefault('_api_resource_class'));
-            if (preg_match('/' . str_replace('/', '', end($apiResourceClass)) . '/i', $commandDefinition->getClassName()) === 1
-                && $this->doesMethodsMatchType($resource->getMethods(), $commandDefinition->getCommandType())
-            ) {
-                return $resource->getPath();
+        $domainArray = explode('\\', $commandDefinition->getClassName());
+        if (count($domainArray) >= 5) {
+            $domain = $domainArray[4];
+        } else {
+            throw new DomainClassNameMalformedException();
+        }
+
+        foreach ($this->apiResourcesList as $apiResources) {
+            foreach ($apiResources as $resource) {
+                if ($resource->getShortName() !== $domain) {
+                    return '';
+                }
+
+                $apiResourceOperations = $resource->getOperations();
+                foreach ($apiResourceOperations as $operation) {
+                    if ($this->doesMethodsMatchType($operation->getMethod(), $commandDefinition->getCommandType())) {
+                        return $operation->getUriTemplate();
+                    }
+                }
             }
         }
 
         return '';
     }
 
-    /**
-     * @param string[] $methods
-     */
-    private function doesMethodsMatchType(array $methods, string $commandType): bool
+    private function doesMethodsMatchType(string $method, string $commandType): bool
     {
         switch ($commandType) {
             case 'Command':
-                return in_array('POST', $methods) || in_array('PUT', $methods) || in_array('PATCH', $methods);
+                return $method === 'POST' || $method === 'PUT';
             case 'Query':
-                return in_array('GET', $methods) || in_array('DELETE', $methods);
+                return $method === 'GET' || $method === 'DELETE';
             default:
                 return false;
         }
diff --git a/src/PrestaShopBundle/Exception/DomainClassNameMalformedException.php b/src/PrestaShopBundle/Exception/DomainClassNameMalformedException.php
new file mode 100644
index 0000000000000..7adc9ed335dcb
--- /dev/null
+++ b/src/PrestaShopBundle/Exception/DomainClassNameMalformedException.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\Exception;
+
+use PrestaShop\PrestaShop\Core\Domain\Exception\DomainException;
+
+/**
+ * Is thrown if the class name of the CQRS list is not a correct class name
+ */
+class DomainClassNameMalformedException extends DomainException
+{
+}
diff --git a/src/PrestaShopBundle/Resources/config/services_dev/bundle/command.yml b/src/PrestaShopBundle/Resources/config/services_dev/bundle/command.yml
index d0ccedca98256..9e3c93bdab85b 100644
--- a/src/PrestaShopBundle/Resources/config/services_dev/bundle/command.yml
+++ b/src/PrestaShopBundle/Resources/config/services_dev/bundle/command.yml
@@ -48,7 +48,8 @@ services:
     arguments:
       - '@prestashop.core.provider.command_definition_provider'
       - '%prestashop.commands_and_queries%'
-      - '@router'
+      - '@api_platform.metadata.resource.name_collection_factory.attributes'
+      - '@api_platform.metadata.resource.metadata_collection_factory.attributes'
     tags:
       - 'console.command'
 
diff --git a/tests/Unit/PrestaShopBundle/Command/ListCommandsAndQueriesCommandTest.php b/tests/Unit/PrestaShopBundle/Command/ListCommandsAndQueriesCommandTest.php
index bff631f5fb3c8..28633d2b67535 100644
--- a/tests/Unit/PrestaShopBundle/Command/ListCommandsAndQueriesCommandTest.php
+++ b/tests/Unit/PrestaShopBundle/Command/ListCommandsAndQueriesCommandTest.php
@@ -29,30 +29,42 @@
 
 namespace Tests\Unit\PrestaShopBundle\Command;
 
+use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
+use ApiPlatform\Metadata\Resource\Factory\ResourceNameCollectionFactoryInterface;
+use ApiPlatform\Metadata\Resource\ResourceMetadataCollection;
+use ApiPlatform\Metadata\Resource\ResourceNameCollection;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use PrestaShop\PrestaShop\Core\CommandBus\Parser\CommandDefinitionParser;
 use PrestaShopBundle\Command\ListCommandsAndQueriesCommand;
+use PrestaShopBundle\Exception\DomainClassNameMalformedException;
 use Symfony\Component\Console\Tester\CommandTester;
-use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\Routing\RouterInterface;
 
 class ListCommandsAndQueriesCommandTest extends TestCase
 {
     /** @var CommandTester */
     private $commandTester;
 
-    /** @var RouterInterface|MockObject */
-    private $routerMock;
+    /**
+     * @var ResourceNameCollectionFactoryInterface|MockObject
+     */
+    private $resourceNameCollectionMock;
+
+    /**
+     * @var ResourceMetadataCollectionFactoryInterface|MockObject
+     */
+    private $resourceMetadataCollectionMock;
 
     public function setUp(): void
     {
-        $this->routerMock = $this->createMock(RouterInterface::class);
+        $this->resourceNameCollectionMock = $this->createMock(ResourceNameCollectionFactoryInterface::class);
+        $this->resourceMetadataCollectionMock = $this->createMock(ResourceMetadataCollectionFactoryInterface::class);
 
         $command = new ListCommandsAndQueriesCommand(
             new CommandDefinitionParser(),
             $this->getListOfCQRSCommands(),
-            $this->routerMock
+            $this->resourceNameCollectionMock,
+            $this->resourceMetadataCollectionMock
         );
 
         $this->commandTester = new CommandTester($command);
@@ -65,15 +77,9 @@ public function setUp(): void
      */
     public function testExecute(array $options, string $result): void
     {
-        $routeCollectionMock = $this->createMock(RouteCollection::class);
-        $routeCollectionMock
-            ->method('all')
-            ->willReturn([])
-        ;
-        $this->routerMock
-            ->method('getRouteCollection')
-            ->willReturn($routeCollectionMock)
-        ;
+        $this->resourceNameCollectionMock->method('create')->willReturn(new ResourceNameCollection());
+
+        $this->resourceMetadataCollectionMock->method('create')->willReturn(new ResourceMetadataCollection(''));
 
         $this->commandTester->execute($options);
 
@@ -82,6 +88,24 @@ public function testExecute(array $options, string $result): void
         );
     }
 
+    public function testExecuteWithWrongClass(): void
+    {
+        $this->resourceNameCollectionMock->method('create')->willReturn(new ResourceNameCollection());
+        $this->resourceMetadataCollectionMock->method('create')->willReturn(new ResourceMetadataCollection(''));
+
+        $command = new ListCommandsAndQueriesCommand(
+            new CommandDefinitionParser(),
+            ["PrestaShop\PrestaShop\Adapter\HookManager"],
+            $this->resourceNameCollectionMock,
+            $this->resourceMetadataCollectionMock
+        );
+
+        $commandTester = new CommandTester($command);
+
+        $this->expectException(DomainClassNameMalformedException::class);
+        $commandTester->execute([]);
+    }
+
     public function optionsProvider(): array
     {
         return [

From 9a8c245b42ef6a9f7f01432d401aa875f4c3c074 Mon Sep 17 00:00:00 2001
From: boherm <boris.hermans@prestashop.com>
Date: Tue, 4 Jul 2023 16:34:21 +0200
Subject: [PATCH 0490/1030] Fix comments

---
 .env                                          |   2 +
 admin-dev/index.php                           |  14 +--
 bin/console                                   |  14 +--
 classes/FeatureFlag.php                       |   2 +-
 classes/Image.php                             |   4 +-
 classes/QuickAccess.php                       |   3 +-
 controllers/admin/AdminImagesController.php   |   4 +-
 controllers/admin/AdminProductsController.php |   4 +-
 src/Adapter/Image/ImageGenerator.php          |   6 +-
 ...FlagService.php => FeatureFlagManager.php} |  34 +++---
 src/Core/FeatureFlag/FeatureFlagSettings.php  |   9 +-
 ...p => FeatureFlagStateCheckerInterface.php} |  18 +--
 .../DbHandler.php => Layer/DbLayer.php}       |  14 ++-
 .../DotEnvLayer.php}                          |  41 +++++--
 .../EnvHandler.php => Layer/EnvLayer.php}     |  12 +-
 src/Core/FeatureFlag/Layer/QueryLayer.php     | 110 ++++++++++++++++++
 ...erInterface.php => TypeLayerInterface.php} |   2 +-
 src/Core/Shop/LogoUploader.php                |   6 +-
 .../Command/FeatureFlagCommand.php            |  14 +--
 .../Controller/Admin/ProductController.php    |   4 +-
 .../Catalog/Product/ProductController.php     |   4 +-
 src/PrestaShopBundle/Entity/FeatureFlag.php   |   6 +-
 .../FeatureFlag/FeatureFlagType.php           |  36 ++----
 .../FeatureFlagsFormDataProvider.php          |  20 ++--
 .../Form/Admin/Type/FeatureFlagSwitchType.php |  77 ++++++++++++
 .../config/services/adapter/image.yml         |   2 +-
 .../bundle/form/form_data_provider.yml        |   4 +-
 .../config/services/bundle/routing.yml        |   2 +-
 .../Resources/config/services/core/common.yml |   4 +
 .../config/services/core/feature_flag.yml     |  13 ++-
 .../Resources/config/services/core/shop.yml   |   2 +-
 .../FormTheme/feature_flag_form.html.twig     |  53 +++++++++
 .../Routing/Converter/LegacyRouteFactory.php  |   6 +-
 .../controller/AdminControllerTest.php        |  14 +--
 .../Command/FeatureFlagCommandTest.php        |   8 +-
 .../Entity/FeatureFlagTest.php                |   2 +
 .../Converter/LegacyRouteFactoryTest.php      |  10 +-
 .../Converter/LegacyUrlConverterTest.php      |  42 +++----
 .../Routing/Converter/RouterProviderTest.php  |  16 +--
 39 files changed, 454 insertions(+), 184 deletions(-)
 create mode 100644 .env
 rename src/Core/FeatureFlag/{FeatureFlagService.php => FeatureFlagManager.php} (72%)
 rename src/Core/FeatureFlag/{Handler/AbstractHandler.php => FeatureFlagStateCheckerInterface.php} (77%)
 rename src/Core/FeatureFlag/{Handler/DbHandler.php => Layer/DbLayer.php} (87%)
 rename src/Core/FeatureFlag/{Handler/DotEnvHandler.php => Layer/DotEnvLayer.php} (73%)
 rename src/Core/FeatureFlag/{Handler/EnvHandler.php => Layer/EnvLayer.php} (84%)
 create mode 100644 src/Core/FeatureFlag/Layer/QueryLayer.php
 rename src/Core/FeatureFlag/{TypeHandlerInterface.php => TypeLayerInterface.php} (98%)
 create mode 100644 src/PrestaShopBundle/Form/Admin/Type/FeatureFlagSwitchType.php
 create mode 100644 src/PrestaShopBundle/Resources/views/Admin/Configure/AdvancedParameters/FeatureFlag/FormTheme/feature_flag_form.html.twig

diff --git a/.env b/.env
new file mode 100644
index 0000000000000..84ea89d821216
--- /dev/null
+++ b/.env
@@ -0,0 +1,2 @@
+# You can specify here some variables to use in PrestaShop application
+# -> enable a feature flag: PS_FF_{FEATURE_FLAG_NAME}=true
diff --git a/admin-dev/index.php b/admin-dev/index.php
index 85909952daf6b..cca457eeb8b21 100644
--- a/admin-dev/index.php
+++ b/admin-dev/index.php
@@ -72,15 +72,13 @@
     Debug::enable();
 }
 
-// Loads .env file from the root of project if present
+// Loads .env file from the root of project
 $dotEnvFile = dirname(__FILE__, 2) . '/.env';
-if (file_exists($dotEnvFile)) {
-    (new Dotenv())
-        // DO NOT use putEnv
-        ->usePutenv(false)
-        ->loadEnv($dotEnvFile, _PS_ENV_)
-    ;
-}
+(new Dotenv())
+    // DO NOT use putEnv
+    ->usePutenv(false)
+    ->loadEnv($dotEnvFile)
+;
 
 require_once __DIR__ . '/../app/AppKernel.php';
 
diff --git a/bin/console b/bin/console
index 5ec36acfbeaba..b70f3edaff0c5 100755
--- a/bin/console
+++ b/bin/console
@@ -23,15 +23,13 @@ if ($debug) {
     Debug::enable();
 }
 
-// Loads .env file from the root of project if present
+// Loads .env file from the root of project
 $dotEnvFile = dirname(__FILE__, 2) . '/.env';
-if (file_exists($dotEnvFile)) {
-    (new Dotenv())
-    // DO NOT use putEnv
-        ->usePutenv(false)
-        ->loadEnv($dotEnvFile, _PS_ENV_)
-  ;
-}
+  (new Dotenv())
+  // DO NOT use putEnv
+      ->usePutenv(false)
+      ->loadEnv($dotEnvFile)
+;
 
 $kernel = new AppKernel($env, $debug);
 $application = new Application($kernel);
diff --git a/classes/FeatureFlag.php b/classes/FeatureFlag.php
index 556d0f5fcf58d..deae337077841 100644
--- a/classes/FeatureFlag.php
+++ b/classes/FeatureFlag.php
@@ -86,7 +86,7 @@ class FeatureFlagCore extends ObjectModel
                 'type' => self::TYPE_STRING,
                 'required' => true,
                 'size' => 64,
-                'default' => FeatureFlagSettings::TYPE_DB,
+                'default' => FeatureFlagSettings::TYPE_DEFAULT,
             ],
             'label_wording' => ['type' => self::TYPE_STRING, 'required' => true, 'size' => 191],
             'label_domain' => ['type' => self::TYPE_STRING, 'required' => true, 'size' => 255],
diff --git a/classes/Image.php b/classes/Image.php
index ac3d839bb7610..71941e723a8cd 100644
--- a/classes/Image.php
+++ b/classes/Image.php
@@ -26,8 +26,8 @@
 
 use PrestaShop\PrestaShop\Adapter\SymfonyContainer;
 use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
-use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService;
 use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagStateCheckerInterface;
 use PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration;
 
 /**
@@ -638,7 +638,7 @@ public function deleteImage($forceDelete = false)
         // Delete auto-generated images
         $image_types = ImageType::getImagesTypes();
         $sfContainer = SymfonyContainer::getInstance();
-        $isMultipleImageFormatFeatureEnabled = $sfContainer->get(FeatureFlagService::class)->isEnabled(FeatureFlagSettings::FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT);
+        $isMultipleImageFormatFeatureEnabled = $sfContainer->get(FeatureFlagStateCheckerInterface::class)->isEnabled(FeatureFlagSettings::FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT);
 
         foreach ($image_types as $imageType) {
             $filesToDelete = $this->deleteAutoGeneratedImage($imageType, $this->image_format, $filesToDelete);
diff --git a/classes/QuickAccess.php b/classes/QuickAccess.php
index 1708e3c068a6a..a0b0a75f0e168 100644
--- a/classes/QuickAccess.php
+++ b/classes/QuickAccess.php
@@ -26,6 +26,7 @@
 
 use PrestaShop\PrestaShop\Adapter\SymfonyContainer;
 use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagStateCheckerInterface;
 
 /**
  * Class QuickAccessCore.
@@ -168,6 +169,6 @@ public function toggleNewWindow()
      */
     private static function productPageV2Enabled(): bool
     {
-        return SymfonyContainer::getInstance()->get('PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService')->isEnabled(FeatureFlagSettings::FEATURE_FLAG_PRODUCT_PAGE_V2);
+        return SymfonyContainer::getInstance()->get(FeatureFlagStateCheckerInterface::class)->isEnabled(FeatureFlagSettings::FEATURE_FLAG_PRODUCT_PAGE_V2);
     }
 }
diff --git a/controllers/admin/AdminImagesController.php b/controllers/admin/AdminImagesController.php
index 2d833210b5d66..338d3dd230e33 100644
--- a/controllers/admin/AdminImagesController.php
+++ b/controllers/admin/AdminImagesController.php
@@ -24,8 +24,8 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
-use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService;
 use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagStateCheckerInterface;
 use PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration;
 
 /**
@@ -83,7 +83,7 @@ public function init()
         parent::init();
 
         $this->canGenerateAvif = $this->get('PrestaShop\PrestaShop\Core\Image\AvifExtensionChecker')->isAvailable();
-        $this->isMultipleImageFormatFeatureEnabled = $this->get(FeatureFlagService::class)->isEnabled(FeatureFlagSettings::FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT);
+        $this->isMultipleImageFormatFeatureEnabled = $this->get(FeatureFlagStateCheckerInterface::class)->isEnabled(FeatureFlagSettings::FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT);
         $this->imageFormatConfiguration = $this->get('PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration');
 
         $formFields = [];
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 5549e5969cc74..1c3e4697f47ba 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -27,8 +27,8 @@
 use PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Update\SpecificPricePriorityUpdater;
 use PrestaShop\PrestaShop\Adapter\SymfonyContainer;
 use PrestaShop\PrestaShop\Core\Exception\CoreException;
-use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService;
 use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagStateCheckerInterface;
 use PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration;
 
 /**
@@ -2892,7 +2892,7 @@ public function ajaxProcessaddProductImage($idProduct = null, $inputFileName = '
                     *
                     * In case of .jpg images, the actual format inside is decided by ImageManager.
                     */
-                    if ($sfContainer->get(FeatureFlagService::class)->isEnabled(FeatureFlagSettings::FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT)) {
+                    if ($sfContainer->get(FeatureFlagStateCheckerInterface::class)->isEnabled(FeatureFlagSettings::FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT)) {
                         $configuredImageFormats = $sfContainer->get(ImageFormatConfiguration::class)->getGenerationFormats();
                     } else {
                         $configuredImageFormats = ['jpg'];
diff --git a/src/Adapter/Image/ImageGenerator.php b/src/Adapter/Image/ImageGenerator.php
index ac8806e037bf5..c48ab6ee36704 100644
--- a/src/Adapter/Image/ImageGenerator.php
+++ b/src/Adapter/Image/ImageGenerator.php
@@ -30,7 +30,7 @@
 
 use ImageManager;
 use ImageType;
-use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagManager;
 use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
 use PrestaShop\PrestaShop\Core\Image\Exception\ImageOptimizationException;
 use PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration;
@@ -43,7 +43,7 @@
 class ImageGenerator
 {
     public function __construct(
-        private readonly FeatureFlagService $featureFlagService,
+        private readonly FeatureFlagManager $featureFlagManager,
         private readonly ImageFormatConfiguration $imageFormatConfiguration
     ) {
     }
@@ -96,7 +96,7 @@ protected function resize(string $filePath, ImageType $imageType): bool
          *
          * In case of .jpg images, the actual format inside is decided by ImageManager.
          */
-        if ($this->featureFlagService->isEnabled(FeatureFlagSettings::FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT)) {
+        if ($this->featureFlagManager->isEnabled(FeatureFlagSettings::FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT)) {
             $configuredImageFormats = $this->imageFormatConfiguration->getGenerationFormats();
         } else {
             $configuredImageFormats = ['jpg'];
diff --git a/src/Core/FeatureFlag/FeatureFlagService.php b/src/Core/FeatureFlag/FeatureFlagManager.php
similarity index 72%
rename from src/Core/FeatureFlag/FeatureFlagService.php
rename to src/Core/FeatureFlag/FeatureFlagManager.php
index 153212e0a55f3..8a6aa78afc714 100644
--- a/src/Core/FeatureFlag/FeatureFlagService.php
+++ b/src/Core/FeatureFlag/FeatureFlagManager.php
@@ -28,14 +28,15 @@
 
 namespace PrestaShop\PrestaShop\Core\FeatureFlag;
 
-use PrestaShop\PrestaShop\Core\FeatureFlag\Handler\DbHandler;
-use PrestaShop\PrestaShop\Core\FeatureFlag\Handler\DotEnvHandler;
-use PrestaShop\PrestaShop\Core\FeatureFlag\Handler\EnvHandler;
+use PrestaShop\PrestaShop\Core\FeatureFlag\Layer\DbLayer;
+use PrestaShop\PrestaShop\Core\FeatureFlag\Layer\DotEnvLayer;
+use PrestaShop\PrestaShop\Core\FeatureFlag\Layer\EnvLayer;
+use PrestaShop\PrestaShop\Core\FeatureFlag\Layer\QueryLayer;
 use PrestaShopBundle\Entity\Repository\FeatureFlagRepository;
 use Psr\Container\ContainerInterface;
 use Symfony\Contracts\Service\ServiceSubscriberInterface;
 
-class FeatureFlagService implements ServiceSubscriberInterface
+class FeatureFlagManager implements ServiceSubscriberInterface, FeatureFlagStateCheckerInterface
 {
     public function __construct(
         private readonly ContainerInterface $locator,
@@ -51,20 +52,21 @@ public function __construct(
     public static function getSubscribedServices(): array
     {
         return [
-            FeatureFlagSettings::TYPE_ENV => EnvHandler::class,
-            FeatureFlagSettings::TYPE_DOTENV => DotEnvHandler::class,
-            FeatureFlagSettings::TYPE_DB => DbHandler::class,
+            FeatureFlagSettings::TYPE_ENV => EnvLayer::class,
+            FeatureFlagSettings::TYPE_QUERY => QueryLayer::class,
+            FeatureFlagSettings::TYPE_DOTENV => DotEnvLayer::class,
+            FeatureFlagSettings::TYPE_DB => DbLayer::class,
         ];
     }
 
     /**
-     * Get used handle for the feature flag.
+     * Get used layer for the feature flag.
      */
-    private function getHandler(string $featureFlagName): TypeHandlerInterface
+    private function getLayer(string $featureFlagName): TypeLayerInterface
     {
         $featureFlag = $this->featureFlagRepository->getByName($featureFlagName);
         if (null !== $featureFlag) {
-            foreach ($featureFlag->getTypeOrder() as $type) {
+            foreach ($featureFlag->getOrderedTypes() as $type) {
                 if ($this->locator->has($type)) {
                     $handler = $this->locator->get($type);
                     if ($handler->canBeUsed($featureFlagName)) {
@@ -80,9 +82,9 @@ private function getHandler(string $featureFlagName): TypeHandlerInterface
     /**
      * Get type of handler used by this feature flag.
      */
-    public function getTypeUsed(string $featureFlagName): string
+    public function getUsedType(string $featureFlagName): string
     {
-        return $this->getHandler($featureFlagName)->getTypeName();
+        return $this->getLayer($featureFlagName)->getTypeName();
     }
 
     /**
@@ -90,7 +92,7 @@ public function getTypeUsed(string $featureFlagName): string
      */
     public function isReadonly(string $featureFlagName): bool
     {
-        return $this->getHandler($featureFlagName)->isReadonly();
+        return $this->getLayer($featureFlagName)->isReadonly();
     }
 
     /**
@@ -98,7 +100,7 @@ public function isReadonly(string $featureFlagName): bool
      */
     public function isEnabled(string $featureFlagName): bool
     {
-        return $this->getHandler($featureFlagName)->isEnabled($featureFlagName);
+        return $this->getLayer($featureFlagName)->isEnabled($featureFlagName);
     }
 
     /**
@@ -114,7 +116,7 @@ public function isDisabled(string $featureFlagName): bool
      */
     public function enable(string $featureFlagName): void
     {
-        $this->getHandler($featureFlagName)->enable($featureFlagName);
+        $this->getLayer($featureFlagName)->enable($featureFlagName);
     }
 
     /**
@@ -122,6 +124,6 @@ public function enable(string $featureFlagName): void
      */
     public function disable(string $featureFlagName): void
     {
-        $this->getHandler($featureFlagName)->disable($featureFlagName);
+        $this->getLayer($featureFlagName)->disable($featureFlagName);
     }
 }
diff --git a/src/Core/FeatureFlag/FeatureFlagSettings.php b/src/Core/FeatureFlag/FeatureFlagSettings.php
index 2d088c36746af..12aefecd3af9a 100644
--- a/src/Core/FeatureFlag/FeatureFlagSettings.php
+++ b/src/Core/FeatureFlag/FeatureFlagSettings.php
@@ -39,9 +39,16 @@ class FeatureFlagSettings
     /**
      * Type consts
      */
-    public const TYPE_DB = 'db';
+    public const TYPE_DEFAULT = 'env,dotenv,db';
     public const TYPE_ENV = 'env';
+    public const TYPE_QUERY = 'query';
     public const TYPE_DOTENV = 'dotenv';
+    public const TYPE_DB = 'db';
+
+    /**
+     * Prefix for DotEnv & Env Layers
+     */
+    public const PREFIX = 'PS_FF_';
 
     /**
      * @deprecated Deprecated in 8.1 will be removed in next major.
diff --git a/src/Core/FeatureFlag/Handler/AbstractHandler.php b/src/Core/FeatureFlag/FeatureFlagStateCheckerInterface.php
similarity index 77%
rename from src/Core/FeatureFlag/Handler/AbstractHandler.php
rename to src/Core/FeatureFlag/FeatureFlagStateCheckerInterface.php
index 0bd53db8d0a79..ac651363389b2 100644
--- a/src/Core/FeatureFlag/Handler/AbstractHandler.php
+++ b/src/Core/FeatureFlag/FeatureFlagStateCheckerInterface.php
@@ -26,17 +26,17 @@
 
 declare(strict_types=1);
 
-namespace PrestaShop\PrestaShop\Core\FeatureFlag\Handler;
+namespace PrestaShop\PrestaShop\Core\FeatureFlag;
 
-use PrestaShop\PrestaShop\Core\FeatureFlag\TypeHandlerInterface;
-
-abstract class AbstractHandler implements TypeHandlerInterface
+interface FeatureFlagStateCheckerInterface
 {
     /**
-     * {@inheritdoc}
+     * Retrieve if the feature flag is enabled.
+     */
+    public function isEnabled(string $featureFlagName): bool;
+
+    /**
+     * Retrieve if the feature flag is enabled.
      */
-    public function isReadonly(): bool
-    {
-        return false;
-    }
+    public function isDisabled(string $featureFlagName): bool;
 }
diff --git a/src/Core/FeatureFlag/Handler/DbHandler.php b/src/Core/FeatureFlag/Layer/DbLayer.php
similarity index 87%
rename from src/Core/FeatureFlag/Handler/DbHandler.php
rename to src/Core/FeatureFlag/Layer/DbLayer.php
index dd18b69173790..6fa62dbb00c82 100644
--- a/src/Core/FeatureFlag/Handler/DbHandler.php
+++ b/src/Core/FeatureFlag/Layer/DbLayer.php
@@ -26,18 +26,28 @@
 
 declare(strict_types=1);
 
-namespace PrestaShop\PrestaShop\Core\FeatureFlag\Handler;
+namespace PrestaShop\PrestaShop\Core\FeatureFlag\Layer;
 
 use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
+use PrestaShop\PrestaShop\Core\FeatureFlag\TypeLayerInterface;
 use PrestaShopBundle\Entity\Repository\FeatureFlagRepository;
 
-class DbHandler extends AbstractHandler
+class DbLayer implements TypeLayerInterface
 {
     public function __construct(
         protected readonly FeatureFlagRepository $featureFlagRepository
     ) {
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function isReadonly(): bool
+    {
+        // It's always editable via DB layer!
+        return false;
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Core/FeatureFlag/Handler/DotEnvHandler.php b/src/Core/FeatureFlag/Layer/DotEnvLayer.php
similarity index 73%
rename from src/Core/FeatureFlag/Handler/DotEnvHandler.php
rename to src/Core/FeatureFlag/Layer/DotEnvLayer.php
index 28260b9c63fa9..12ddc699a1a76 100644
--- a/src/Core/FeatureFlag/Handler/DotEnvHandler.php
+++ b/src/Core/FeatureFlag/Layer/DotEnvLayer.php
@@ -26,12 +26,29 @@
 
 declare(strict_types=1);
 
-namespace PrestaShop\PrestaShop\Core\FeatureFlag\Handler;
+namespace PrestaShop\PrestaShop\Core\FeatureFlag\Layer;
 
+use PrestaShop\PrestaShop\Core\EnvironmentInterface;
 use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
+use PrestaShop\PrestaShop\Core\FeatureFlag\TypeLayerInterface;
 
-class DotEnvHandler extends AbstractHandler
+class DotEnvLayer implements TypeLayerInterface
 {
+    public function __construct(
+        private EnvironmentInterface $environment,
+        private string $rootDir,
+    ) {
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isReadonly(): bool
+    {
+        // It's always editable via DotEnv layer!
+        return false;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -45,7 +62,7 @@ public function getTypeName(): string
      */
     public function getVarName(string $featureFlagName): string
     {
-        return 'PS_FF_' . strtoupper($featureFlagName);
+        return FeatureFlagSettings::PREFIX . strtoupper($featureFlagName);
     }
 
     /**
@@ -53,7 +70,8 @@ public function getVarName(string $featureFlagName): string
      */
     public function canBeUsed(string $featureFlagName): bool
     {
-        return isset($_ENV['SYMFONY_DOTENV_VARS']) && str_contains($_ENV['SYMFONY_DOTENV_VARS'], $this->getVarName($featureFlagName));
+        return isset($_ENV['SYMFONY_DOTENV_VARS']) &&
+            str_contains($_ENV['SYMFONY_DOTENV_VARS'], $this->getVarName($featureFlagName));
     }
 
     /**
@@ -61,7 +79,8 @@ public function canBeUsed(string $featureFlagName): bool
      */
     public function isEnabled(string $featureFlagName): bool
     {
-        return isset($_ENV[$this->getVarName($featureFlagName)]) && strtoupper($_ENV[$this->getVarName($featureFlagName)]) === 'TRUE';
+        return isset($_ENV[$this->getVarName($featureFlagName)]) &&
+            filter_var($_ENV[$this->getVarName($featureFlagName)], \FILTER_VALIDATE_BOOLEAN);
     }
 
     /**
@@ -85,11 +104,11 @@ public function disable(string $featureFlagName): void
      */
     private function locateDotEnvFile(string $featureFlagName): string
     {
-        $env = _PS_ENV_;
+        $env = $this->environment->getName();
         $filesToCheck = [".env.$env.local", ".env.$env", '.env'];
 
         foreach ($filesToCheck as $file) {
-            $path = _PS_ROOT_DIR_ . '/' . $file;
+            $path = $this->rootDir . '/' . $file;
             if (file_exists($path) && str_contains(file_get_contents($path), $this->getVarName($featureFlagName))) {
                 return $path;
             }
@@ -106,9 +125,9 @@ private function setStatus(string $featureFlagName, bool $status): void
         if ($pathDotenv = $this->locateDotEnvFile($featureFlagName)) {
             file_put_contents(
                 $pathDotenv,
-                str_ireplace(
-                    "{$this->getVarName($featureFlagName)}=" . $this->boolLabel($this->isEnabled($featureFlagName)),
-                    "{$this->getVarName($featureFlagName)}=" . $this->boolLabel($status),
+                preg_replace(
+                    "/({$this->getVarName($featureFlagName)})=(.*)/",
+                    "$1={$this->boolLabel($status)}",
                     file_get_contents($pathDotenv)
                 )
             );
@@ -124,6 +143,6 @@ private function setStatus(string $featureFlagName, bool $status): void
      */
     private function boolLabel(bool $status): string
     {
-        return $status ? 'TRUE' : 'FALSE';
+        return $status ? 'true' : 'false';
     }
 }
diff --git a/src/Core/FeatureFlag/Handler/EnvHandler.php b/src/Core/FeatureFlag/Layer/EnvLayer.php
similarity index 84%
rename from src/Core/FeatureFlag/Handler/EnvHandler.php
rename to src/Core/FeatureFlag/Layer/EnvLayer.php
index bdb4aa735c62f..1fbabb8a8919d 100644
--- a/src/Core/FeatureFlag/Handler/EnvHandler.php
+++ b/src/Core/FeatureFlag/Layer/EnvLayer.php
@@ -26,11 +26,12 @@
 
 declare(strict_types=1);
 
-namespace PrestaShop\PrestaShop\Core\FeatureFlag\Handler;
+namespace PrestaShop\PrestaShop\Core\FeatureFlag\Layer;
 
 use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
+use PrestaShop\PrestaShop\Core\FeatureFlag\TypeLayerInterface;
 
-class EnvHandler extends AbstractHandler
+class EnvLayer implements TypeLayerInterface
 {
     /**
      * {@inheritdoc}
@@ -45,7 +46,7 @@ public function getTypeName(): string
      */
     public function isReadonly(): bool
     {
-        // It's always NOT editable via Env!
+        // It's always NOT editable via Env layer!
         return true;
     }
 
@@ -54,7 +55,7 @@ public function isReadonly(): bool
      */
     public function getConstName(string $featureFlagName): string
     {
-        return 'PS_FF_' . strtoupper($featureFlagName);
+        return FeatureFlagSettings::PREFIX . strtoupper($featureFlagName);
     }
 
     /**
@@ -71,7 +72,8 @@ public function canBeUsed(string $featureFlagName): bool
      */
     public function isEnabled(string $featureFlagName): bool
     {
-        return $this->canBeUsed($featureFlagName) && strtoupper(getenv($this->getConstName($featureFlagName))) === 'TRUE';
+        return $this->canBeUsed($featureFlagName) &&
+            filter_var(getenv($this->getConstName($featureFlagName)), \FILTER_VALIDATE_BOOLEAN);
     }
 
     /**
diff --git a/src/Core/FeatureFlag/Layer/QueryLayer.php b/src/Core/FeatureFlag/Layer/QueryLayer.php
new file mode 100644
index 0000000000000..11b8768f8d4fc
--- /dev/null
+++ b/src/Core/FeatureFlag/Layer/QueryLayer.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\FeatureFlag\Layer;
+
+use PrestaShop\PrestaShop\Core\EnvironmentInterface;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
+use PrestaShop\PrestaShop\Core\FeatureFlag\TypeLayerInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
+
+class QueryLayer implements TypeLayerInterface
+{
+    public function __construct(
+        private EnvironmentInterface $environment,
+        private RequestStack $requestStack,
+    ) {
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTypeName(): string
+    {
+        return FeatureFlagSettings::TYPE_QUERY;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isReadonly(): bool
+    {
+        // It's always NOT editable via Query layer!
+        return true;
+    }
+
+    /**
+     * Retrieve the var name of this feature flag.
+     */
+    public function getVarName(string $featureFlagName): string
+    {
+        return FeatureFlagSettings::PREFIX . strtoupper($featureFlagName);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function canBeUsed(string $featureFlagName): bool
+    {
+        // Only for debug environment.
+        if (!$this->environment->isDebug()) {
+            return false;
+        }
+
+        // Check if PS_FF_{featureFlag's name} is on query variable.
+        return null !== $this->requestStack->getMainRequest()?->query->get($this->getVarName($featureFlagName));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isEnabled(string $featureFlagName): bool
+    {
+        return $this->canBeUsed($featureFlagName) &&
+            filter_var(
+                $this->requestStack->getMainRequest()?->query->get($this->getVarName($featureFlagName)),
+                \FILTER_VALIDATE_BOOLEAN
+            );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function enable(string $featureFlagName): void
+    {
+        throw new \InvalidArgumentException(sprintf('We cannot change status of the query feature flag %s.', $featureFlagName));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function disable(string $featureFlagName): void
+    {
+        throw new \InvalidArgumentException(sprintf('We cannot change status of the query feature flag %s.', $featureFlagName));
+    }
+}
diff --git a/src/Core/FeatureFlag/TypeHandlerInterface.php b/src/Core/FeatureFlag/TypeLayerInterface.php
similarity index 98%
rename from src/Core/FeatureFlag/TypeHandlerInterface.php
rename to src/Core/FeatureFlag/TypeLayerInterface.php
index 27256af466ef4..6104fd7903c20 100644
--- a/src/Core/FeatureFlag/TypeHandlerInterface.php
+++ b/src/Core/FeatureFlag/TypeLayerInterface.php
@@ -28,7 +28,7 @@
 
 namespace PrestaShop\PrestaShop\Core\FeatureFlag;
 
-interface TypeHandlerInterface
+interface TypeLayerInterface
 {
     /**
      * Get type name of this handler.
diff --git a/src/Core/Shop/LogoUploader.php b/src/Core/Shop/LogoUploader.php
index ec8d2ef5a9f8b..fdba87c8dfa38 100644
--- a/src/Core/Shop/LogoUploader.php
+++ b/src/Core/Shop/LogoUploader.php
@@ -30,8 +30,8 @@
 use Context;
 use ImageManager;
 use PrestaShop\PrestaShop\Core\Domain\Shop\DTO\ShopLogoSettings;
-use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService;
 use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagStateCheckerInterface;
 use PrestaShop\PrestaShop\Core\Image\ImageFormatConfigurationInterface;
 use PrestaShopException;
 use Shop;
@@ -50,7 +50,7 @@ class LogoUploader
     public function __construct(
         private Shop $shop,
         private ImageFormatConfigurationInterface $imageFormatConfiguration,
-        private FeatureFlagService $featureFlagService,
+        private FeatureFlagStateCheckerInterface $featureFlagStateChecker,
         private string $imageDirection
     ) {
     }
@@ -136,7 +136,7 @@ public function update($fieldName, $logoPrefix, array $files = [])
                     *
                     * In case of .jpg images, the actual format inside is decided by ImageManager.
                     */
-                    if ($this->featureFlagService->isEnabled(FeatureFlagSettings::FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT)) {
+                    if ($this->featureFlagStateChecker->isEnabled(FeatureFlagSettings::FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT)) {
                         $configuredImageFormats = $this->imageFormatConfiguration->getGenerationFormats();
                     } else {
                         $configuredImageFormats = ['jpg'];
diff --git a/src/PrestaShopBundle/Command/FeatureFlagCommand.php b/src/PrestaShopBundle/Command/FeatureFlagCommand.php
index 41fefcb293f1b..2ba2cf2190ef3 100644
--- a/src/PrestaShopBundle/Command/FeatureFlagCommand.php
+++ b/src/PrestaShopBundle/Command/FeatureFlagCommand.php
@@ -28,7 +28,7 @@
 
 namespace PrestaShopBundle\Command;
 
-use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagManager;
 use PrestaShopBundle\Entity\FeatureFlag;
 use PrestaShopBundle\Entity\Repository\FeatureFlagRepository;
 use Symfony\Component\Console\Command\Command;
@@ -58,7 +58,7 @@ class FeatureFlagCommand extends Command
 
     public function __construct(
         private readonly FeatureFlagRepository $featureFlagRepository,
-        private readonly FeatureFlagService $featureFlagService
+        private readonly FeatureFlagManager $featureFlagManager
     ) {
         parent::__construct();
     }
@@ -101,7 +101,7 @@ private function listFeatureFlags(OutputInterface $output): int
             $table->addRow([
                 $featureFlag->getName(),
                 $this->getTypeRow($featureFlag),
-                $this->featureFlagService->isEnabled($featureFlag->getName()) ? 'Enabled' : 'Disabled',
+                $this->featureFlagManager->isEnabled($featureFlag->getName()) ? 'Enabled' : 'Disabled',
             ]);
         }
         $table->render();
@@ -113,8 +113,8 @@ private function getTypeRow(FeatureFlag $featureFlag): string
     {
         $out = [];
 
-        foreach ($featureFlag->getTypeOrder() as $type) {
-            if ($this->featureFlagService->getTypeUsed($featureFlag->getName()) === $type) {
+        foreach ($featureFlag->getOrderedTypes() as $type) {
+            if ($this->featureFlagManager->getUsedType($featureFlag->getName()) === $type) {
                 $out[] = "[$type]";
             } else {
                 $out[] = $type;
@@ -144,13 +144,13 @@ private function toggleFeatureFlag(bool $expectedState, InputInterface $input, O
         }
 
         if ($expectedState) {
-            $this->featureFlagService->enable($featureFlagArgument);
+            $this->featureFlagManager->enable($featureFlagArgument);
             $output->writeln(sprintf(
                 '<info>Feature flag %s was enabled</info>',
                 $featureFlagArgument
             ));
         } else {
-            $this->featureFlagService->disable($featureFlagArgument);
+            $this->featureFlagManager->disable($featureFlagArgument);
             $output->writeln(sprintf(
                 '<info>Feature flag %s was disabled</info>',
                 $featureFlagArgument
diff --git a/src/PrestaShopBundle/Controller/Admin/ProductController.php b/src/PrestaShopBundle/Controller/Admin/ProductController.php
index 409e60bae2f17..6dc05d083b4d3 100644
--- a/src/PrestaShopBundle/Controller/Admin/ProductController.php
+++ b/src/PrestaShopBundle/Controller/Admin/ProductController.php
@@ -41,8 +41,8 @@
 use PrestaShop\PrestaShop\Core\Domain\Product\Exception\ProductNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Product\Query\GetProductForEditing;
 use PrestaShop\PrestaShop\Core\Domain\Product\QueryResult\ProductForEditing;
-use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService;
 use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagStateCheckerInterface;
 use PrestaShop\PrestaShop\Core\Hook\HookDispatcher;
 use PrestaShop\PrestaShop\Core\Product\ProductCsvExporter;
 use PrestaShop\PrestaShop\Core\Security\Permission;
@@ -1306,6 +1306,6 @@ private function getLogDataContext($id_product = null, $error_code = null, $allo
      */
     private function shouldRedirectToV2(): bool
     {
-        return $this->get(FeatureFlagService::class)->isEnabled(FeatureFlagSettings::FEATURE_FLAG_PRODUCT_PAGE_V2);
+        return $this->get(FeatureFlagStateCheckerInterface::class)->isEnabled(FeatureFlagSettings::FEATURE_FLAG_PRODUCT_PAGE_V2);
     }
 }
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/Product/ProductController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/Product/ProductController.php
index 5a4c13ed9f5de..89827bad06edd 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/Product/ProductController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/Product/ProductController.php
@@ -57,8 +57,8 @@
 use PrestaShop\PrestaShop\Core\Domain\Shop\Exception\ShopAssociationNotFound;
 use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopConstraint;
 use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopId;
-use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService;
 use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagStateCheckerInterface;
 use PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\FormBuilderInterface;
 use PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Handler\FormHandlerInterface;
 use PrestaShop\PrestaShop\Core\Grid\Definition\Factory\GridDefinitionFactoryInterface;
@@ -1508,7 +1508,7 @@ private function getGridAdminFilter(): ?AdminFilter
      */
     private function shouldRedirectToV1(): bool
     {
-        return $this->get(FeatureFlagService::class)->isDisabled(FeatureFlagSettings::FEATURE_FLAG_PRODUCT_PAGE_V2);
+        return $this->get(FeatureFlagStateCheckerInterface::class)->isDisabled(FeatureFlagSettings::FEATURE_FLAG_PRODUCT_PAGE_V2);
     }
 
     /**
diff --git a/src/PrestaShopBundle/Entity/FeatureFlag.php b/src/PrestaShopBundle/Entity/FeatureFlag.php
index 2d690f297db27..5ea2b1a60d9c1 100644
--- a/src/PrestaShopBundle/Entity/FeatureFlag.php
+++ b/src/PrestaShopBundle/Entity/FeatureFlag.php
@@ -61,7 +61,7 @@ class FeatureFlag
     /**
      * @var string
      *
-     * @ORM\Column(name="type", type="string", length=64, options={"default":"db"})
+     * @ORM\Column(name="type", type="string", length=64, options={"default": FeatureFlagSettings::TYPE_DEFAULT})
      */
     private $type;
 
@@ -116,7 +116,7 @@ public function __construct(string $name)
             throw new InvalidArgumentException('Feature flag name cannot be empty');
         }
         $this->name = $name;
-        $this->type = FeatureFlagSettings::TYPE_DB;
+        $this->type = FeatureFlagSettings::TYPE_DEFAULT;
         $this->state = false;
         $this->descriptionWording = '';
         $this->descriptionDomain = '';
@@ -282,7 +282,7 @@ public function getType(): string
      *
      * @return array
      */
-    public function getTypeOrder(): array
+    public function getOrderedTypes(): array
     {
         return explode(',', $this->type);
     }
diff --git a/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/FeatureFlag/FeatureFlagType.php b/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/FeatureFlag/FeatureFlagType.php
index d89675cb837bc..12711b15b623e 100644
--- a/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/FeatureFlag/FeatureFlagType.php
+++ b/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/FeatureFlag/FeatureFlagType.php
@@ -28,7 +28,7 @@
 
 namespace PrestaShopBundle\Form\Admin\Configure\AdvancedParameters\FeatureFlag;
 
-use PrestaShopBundle\Form\Admin\Type\SwitchType;
+use PrestaShopBundle\Form\Admin\Type\FeatureFlagSwitchType;
 use PrestaShopBundle\Form\Admin\Type\TranslatorAwareType;
 use PrestaShopBundle\Form\FormCloner;
 use Symfony\Component\Form\Event\PreSetDataEvent;
@@ -56,7 +56,7 @@ public function __construct(
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('enabled', SwitchType::class, [
+            ->add('enabled', FeatureFlagSwitchType::class, [
                 'choices' => [
                     $this->trans('Disabled', 'Admin.Global') => false,
                     $this->trans('Enabled', 'Admin.Global') => true,
@@ -72,37 +72,15 @@ public function adaptSwitchOption(PreSetDataEvent $event): void
         $featureFlagData = $event->getData();
         $form = $event->getForm();
         $form->add($this->formCloner->cloneForm($form->get('enabled'), [
-            'label' => $this->trans($featureFlagData['label'], $featureFlagData['label_domain']) . $this->getHandlerLabel($featureFlagData),
-            'help' => $this->trans($featureFlagData['description'], $featureFlagData['description_domain']) . $this->getForcedByEnvMessage($featureFlagData),
+            'label' => $this->trans($featureFlagData['label'], $featureFlagData['label_domain']),
+            'help' => $this->trans($featureFlagData['description'], $featureFlagData['description_domain']),
             'attr' => ['disabled' => $featureFlagData['disabled']],
+            'types' => $featureFlagData['type'],
+            'used_type' => $featureFlagData['type_used'],
+            'forced_by_env' => $featureFlagData['forced_by_env'],
         ]));
     }
 
-    private function getHandlerLabel(array $featureFlagData): string
-    {
-        $template = '<br><small class="form-text">%s</small>';
-
-        $htmlType = [];
-        foreach ($featureFlagData['type'] as $type) {
-            if ($type === $featureFlagData['type_used']) {
-                $htmlType[] = sprintf('<strong>%s</strong>', addslashes($type));
-            } else {
-                $htmlType[] = $type;
-            }
-        }
-
-        return sprintf($template, implode(', ', $htmlType));
-    }
-
-    private function getForcedByEnvMessage(array $featureFlagData): string
-    {
-        if ($featureFlagData['forced_by_env']) {
-            return '<br/><strong>' . $this->trans('This FeatureFlag is forced by Env.', 'Admin.Advparameters.Help') . '</strong>';
-        }
-
-        return '';
-    }
-
     public function configureOptions(OptionsResolver $resolver)
     {
         parent::configureOptions($resolver);
diff --git a/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/FeatureFlag/FeatureFlagsFormDataProvider.php b/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/FeatureFlag/FeatureFlagsFormDataProvider.php
index 5fccefa35d637..595ae53bc440c 100644
--- a/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/FeatureFlag/FeatureFlagsFormDataProvider.php
+++ b/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/FeatureFlag/FeatureFlagsFormDataProvider.php
@@ -30,7 +30,7 @@
 
 use Doctrine\ORM\EntityManagerInterface;
 use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
-use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagManager;
 use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
 use PrestaShop\PrestaShop\Core\Form\FormDataProviderInterface;
 use PrestaShopBundle\Entity\FeatureFlag;
@@ -51,7 +51,7 @@ public function __construct(
         protected EntityManagerInterface $doctrineEntityManager,
         protected readonly string $stability,
         private CacheCleanerInterface $cacheCleaner,
-        private FeatureFlagService $featureFlagService
+        private FeatureFlagManager $featureFlagManager
     ) {
     }
 
@@ -63,16 +63,16 @@ public function getData()
         foreach ($featureFlags as $featureFlag) {
             $flagName = $featureFlag->getName();
             $featureFlagsData[$flagName] = [
-                'enabled' => $this->featureFlagService->isEnabled($flagName),
+                'enabled' => $this->featureFlagManager->isEnabled($flagName),
                 'name' => $featureFlag->getName(),
                 'label' => $featureFlag->getLabelWording(),
                 'label_domain' => $featureFlag->getLabelDomain(),
                 'description' => $featureFlag->getDescriptionWording(),
                 'description_domain' => $featureFlag->getDescriptionDomain(),
-                'type' => $featureFlag->getTypeOrder(),
-                'type_used' => $this->featureFlagService->getTypeUsed($flagName),
-                'disabled' => $this->featureFlagService->isReadOnly($flagName),
-                'forced_by_env' => $this->featureFlagService->getTypeUsed($flagName) === FeatureFlagSettings::TYPE_ENV,
+                'type' => $featureFlag->getOrderedTypes(),
+                'type_used' => $this->featureFlagManager->getUsedType($flagName),
+                'disabled' => $this->featureFlagManager->isReadOnly($flagName),
+                'forced_by_env' => $this->featureFlagManager->getUsedType($flagName) === FeatureFlagSettings::TYPE_ENV,
             ];
         }
 
@@ -93,15 +93,15 @@ public function setData(array $flagsData)
                 throw new InvalidArgumentException(sprintf('Invalid feature flag configuration submitted, flag %s does not exist', $flagName));
             }
 
-            if ($this->featureFlagService->isReadonly($flagName)) {
+            if ($this->featureFlagManager->isReadonly($flagName)) {
                 continue;
             }
 
             $flagState = $flagData['enabled'] ?? false;
             if ($flagState) {
-                $this->featureFlagService->enable($flagName);
+                $this->featureFlagManager->enable($flagName);
             } else {
-                $this->featureFlagService->disable($flagName);
+                $this->featureFlagManager->disable($flagName);
             }
         }
 
diff --git a/src/PrestaShopBundle/Form/Admin/Type/FeatureFlagSwitchType.php b/src/PrestaShopBundle/Form/Admin/Type/FeatureFlagSwitchType.php
new file mode 100644
index 0000000000000..0ff690389276a
--- /dev/null
+++ b/src/PrestaShopBundle/Form/Admin/Type/FeatureFlagSwitchType.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\Form\Admin\Type;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+/**
+ * Displays a switch (ON / OFF by default) for feature flags.
+ */
+class FeatureFlagSwitchType extends AbstractType
+{
+    public const TRANS_DOMAIN = 'Admin.Global';
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+            'block_prefix' => 'feature_flag',
+            'form_theme' => '@PrestaShop/Admin/Configure/AdvancedParameters/FeatureFlag/FormTheme/feature_flag_form.html.twig',
+            'types' => [],
+            'used_type' => null,
+            'forced_by_env' => false,
+        ]);
+        $resolver->setAllowedTypes('types', 'array');
+        $resolver->setAllowedTypes('used_type', ['null', 'string']);
+        $resolver->setAllowedTypes('forced_by_env', 'bool');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function buildView(FormView $view, FormInterface $form, array $options)
+    {
+        $view->vars['types'] = $options['types'];
+        $view->vars['used_type'] = $options['used_type'];
+        $view->vars['forced_by_env'] = $options['forced_by_env'];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getParent()
+    {
+        return SwitchType::class;
+    }
+}
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/image.yml b/src/PrestaShopBundle/Resources/config/services/adapter/image.yml
index 1b56afafd757e..14271a13119fa 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/image.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/image.yml
@@ -41,7 +41,7 @@ services:
 
   PrestaShop\PrestaShop\Adapter\Image\ImageGenerator:
     arguments:
-      - '@PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService'
+      - '@PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagManager'
       - '@PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration'
 
   PrestaShop\PrestaShop\Adapter\Image\ImageValidator:
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_data_provider.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_data_provider.yml
index af54b514f1ee1..e040a9faaf51d 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_data_provider.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_data_provider.yml
@@ -274,7 +274,7 @@ services:
       - '@doctrine.orm.entity_manager'
       - 'stable'
       - '@prestashop.bundle.routing.converter.cache_provider'
-      - '@PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService'
+      - '@PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagManager'
 
   prestashop.admin.configure.advanced_parameters.beta_feature_flags_form_data_provider:
     class: 'PrestaShopBundle\Form\Admin\Configure\AdvancedParameters\FeatureFlag\FeatureFlagsFormDataProvider'
@@ -282,7 +282,7 @@ services:
       - '@doctrine.orm.entity_manager'
       - 'beta'
       - '@prestashop.bundle.routing.converter.cache_provider'
-      - '@PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService'
+      - '@PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagManager'
 
   prestashop.adapter.security.general.form_provider:
     class: 'PrestaShopBundle\Form\Admin\Configure\AdvancedParameters\Security\FormDataProvider'
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/routing.yml b/src/PrestaShopBundle/Resources/config/services/bundle/routing.yml
index c721a31771f2a..ed455a03983a0 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/routing.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/routing.yml
@@ -26,7 +26,7 @@ services:
   PrestaShopBundle\Routing\Converter\LegacyRouteFactory:
     autowire: true
     arguments:
-      - '@PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService'
+      - '@PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagStateCheckerInterface'
 
   # We set this alias so that we can override it in test environment (to avoid memory limit crashes)
   prestashop.bundle.routing.converter.cache:
diff --git a/src/PrestaShopBundle/Resources/config/services/core/common.yml b/src/PrestaShopBundle/Resources/config/services/core/common.yml
index be57c3ee5c02b..161ee4c4365f5 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/common.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/common.yml
@@ -1,2 +1,6 @@
 imports:
   - { resource: ./circuit_breaker.yml }
+
+services:
+  PrestaShop\PrestaShop\Core\EnvironmentInterface:
+    alias: prestashop.adapter.environment
diff --git a/src/PrestaShopBundle/Resources/config/services/core/feature_flag.yml b/src/PrestaShopBundle/Resources/config/services/core/feature_flag.yml
index dc8e62fd3df07..990ab7346c0c2 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/feature_flag.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/feature_flag.yml
@@ -3,9 +3,14 @@ services:
     autowire: true
     autoconfigure: true
 
-  PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService:
+  PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagStateCheckerInterface:
+    alias: PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagManager
     public: true
 
-  PrestaShop\PrestaShop\Core\FeatureFlag\Handler\DbHandler: ~
-  PrestaShop\PrestaShop\Core\FeatureFlag\Handler\EnvHandler: ~
-  PrestaShop\PrestaShop\Core\FeatureFlag\Handler\DotEnvHandler: ~
+  PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagManager: ~
+  PrestaShop\PrestaShop\Core\FeatureFlag\Layer\EnvLayer: ~
+  PrestaShop\PrestaShop\Core\FeatureFlag\Layer\DbLayer: ~
+  PrestaShop\PrestaShop\Core\FeatureFlag\Layer\DotEnvLayer:
+    arguments:
+      $rootDir: !php/const _PS_ROOT_DIR_
+  PrestaShop\PrestaShop\Core\FeatureFlag\Layer\QueryLayer: ~
diff --git a/src/PrestaShopBundle/Resources/config/services/core/shop.yml b/src/PrestaShopBundle/Resources/config/services/core/shop.yml
index 9d92e4b1b34e0..6e7e4697a2a4c 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/shop.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/shop.yml
@@ -7,5 +7,5 @@ services:
     arguments:
       - '@=service("prestashop.adapter.legacy.context").getContext().shop'
       - '@PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration'
-      - '@PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService'
+      - '@PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagStateCheckerInterface'
       - !php/const _PS_IMG_DIR_
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Configure/AdvancedParameters/FeatureFlag/FormTheme/feature_flag_form.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Configure/AdvancedParameters/FeatureFlag/FormTheme/feature_flag_form.html.twig
new file mode 100644
index 0000000000000..e137de933e3e2
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Configure/AdvancedParameters/FeatureFlag/FormTheme/feature_flag_form.html.twig
@@ -0,0 +1,53 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+
+{% block feature_flag_row %}
+  <div class="form-group row feature_flag-widget">
+    <div class="form-control-label">
+      {{ form_label(form) }}
+    </div>
+    <div class="col-sm input-container">
+      {{ form_widget(form) }}
+    </div>
+  </div>
+{% endblock %}
+
+{% block feature_flag_label %}
+  <label for="{{ id }}">{{ label }}</label>
+  <div>
+    <ul class="list-inline small form-text">
+      {% for type in types %}
+        <li class="list-inline-item {% if type == used_type %}font-weight-bold{% endif %}">{{ type }}</li>
+      {% endfor %}
+    </ul>
+  </div>
+{% endblock %}
+
+{% block feature_flag_widget %}
+  {{ block('switch_widget') }}
+  {% if forced_by_env %}
+    <div class="small form-text font-weight-bold">{{ "This FeatureFlag is forced by Env."|trans({}, 'Admin.Advparameters.Help') }}</div>
+  {% endif %}
+{% endblock feature_flag_widget %}
diff --git a/src/PrestaShopBundle/Routing/Converter/LegacyRouteFactory.php b/src/PrestaShopBundle/Routing/Converter/LegacyRouteFactory.php
index 6c83db7d4ff55..34796a46ca87b 100644
--- a/src/PrestaShopBundle/Routing/Converter/LegacyRouteFactory.php
+++ b/src/PrestaShopBundle/Routing/Converter/LegacyRouteFactory.php
@@ -26,14 +26,14 @@
 
 namespace PrestaShopBundle\Routing\Converter;
 
-use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagStateCheckerInterface;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
 
 class LegacyRouteFactory
 {
     public function __construct(
-        private readonly FeatureFlagService $featureFlagService
+        private readonly FeatureFlagStateCheckerInterface $featureFlagStateChecker,
     ) {
     }
 
@@ -56,7 +56,7 @@ private function isLegacyRoute(Route $route): bool
 
         if (isset($routeDefaults[RouterProvider::LEGACY_LINK_ROUTE_ATTRIBUTE])) {
             if (isset($routeDefaults[RouterProvider::FEATURE_FLAG_NAME])) {
-                return $this->featureFlagService->isEnabled($routeDefaults[RouterProvider::FEATURE_FLAG_NAME]);
+                return $this->featureFlagStateChecker->isEnabled($routeDefaults[RouterProvider::FEATURE_FLAG_NAME]);
             }
 
             return true;
diff --git a/tests/Integration/Classes/controller/AdminControllerTest.php b/tests/Integration/Classes/controller/AdminControllerTest.php
index 7a3d8731dc9a5..2d4a9d7edaf0a 100644
--- a/tests/Integration/Classes/controller/AdminControllerTest.php
+++ b/tests/Integration/Classes/controller/AdminControllerTest.php
@@ -36,7 +36,7 @@
 use PrestaShop\PrestaShop\Adapter\EntityMapper;
 use PrestaShop\PrestaShop\Adapter\ServiceLocator;
 use PrestaShop\PrestaShop\Core\Feature\FeatureInterface;
-use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagStateCheckerInterface;
 use PrestaShop\PrestaShop\Core\Foundation\IoC\Container;
 use PrestaShop\PrestaShop\Core\Foundation\IoC\Container as LegacyContainer;
 use PrestaShop\PrestaShop\Core\Image\AvifExtensionChecker;
@@ -293,8 +293,8 @@ private function getMockContainerBuilder(): ContainerBuilder
                 if ($param === 'PrestaShop\PrestaShop\Core\Image\AvifExtensionChecker') {
                     return $this->getMockedAvifExtensionChecker();
                 }
-                if ($param === 'PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService' || $param === FeatureFlagService::class) {
-                    return $this->getMockedFeatureFlagService();
+                if ($param === FeatureFlagStateCheckerInterface::class) {
+                    return $this->getMockedFeatureFlagStateCheckerInterface();
                 }
             });
 
@@ -375,15 +375,15 @@ private function getMockedAvifExtensionChecker(): AvifExtensionChecker
         return $mockAvifExtensionChecker;
     }
 
-    private function getMockedFeatureFlagService(): FeatureFlagService
+    private function getMockedFeatureFlagStateCheckerInterface(): FeatureFlagStateCheckerInterface
     {
-        $mockFeatureFlagService = $this->getMockBuilder(FeatureFlagService::class)
+        $mockFeatureFlagStateChecker = $this->getMockBuilder(FeatureFlagStateCheckerInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $mockFeatureFlagService->method('isEnabled')->willReturn(false);
+        $mockFeatureFlagStateChecker->method('isEnabled')->willReturn(false);
 
-        return $mockFeatureFlagService;
+        return $mockFeatureFlagStateChecker;
     }
 
     private function getMockNumberSpecification(): NumberSpecification
diff --git a/tests/Integration/PrestaShopBundle/Command/FeatureFlagCommandTest.php b/tests/Integration/PrestaShopBundle/Command/FeatureFlagCommandTest.php
index a5dcb5bde9aa9..2789517c92eaf 100644
--- a/tests/Integration/PrestaShopBundle/Command/FeatureFlagCommandTest.php
+++ b/tests/Integration/PrestaShopBundle/Command/FeatureFlagCommandTest.php
@@ -29,7 +29,7 @@
 namespace Integration\PrestaShopBundle\Command;
 
 use Doctrine\ORM\EntityManagerInterface;
-use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagStateCheckerInterface;
 use PrestaShopBundle\Entity\FeatureFlag;
 use PrestaShopBundle\Entity\Repository\FeatureFlagRepository;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
@@ -63,13 +63,13 @@ public function testList(): void
         $kernel = self::bootKernel();
         /** @var FeatureFlagRepository $featureFlagRepository */
         $featureFlagRepository = $kernel->getContainer()->get(FeatureFlagRepository::class);
-        $featureFlagService = $kernel->getContainer()->get(FeatureFlagService::class);
+        $featureFlagStateChecker = $kernel->getContainer()->get(FeatureFlagStateCheckerInterface::class);
         $featureFlags = $featureFlagRepository->findAll();
         /** @var FeatureFlag $featureFlag */
         foreach ($featureFlags as $featureFlag) {
             // This method is based on the output of the list action so it indirectly tests it
             $flagState = $this->getFeatureFlagState($kernel, $featureFlag->getName());
-            $this->assertEquals($flagState, $featureFlagService->isEnabled($featureFlag->getName()));
+            $this->assertEquals($flagState, $featureFlagStateChecker->isEnabled($featureFlag->getName()));
         }
     }
 
@@ -117,6 +117,8 @@ private function getFeatureFlagState(KernelInterface $kernel, string $featureFla
         $regexp = sprintf('/\|[ ]+%s[ ]+\|[ ]+([^ ]+)[ ]+\|[ ]+([^ ]+)[ ]+\|/', $featureFlag);
         $matches = [];
         preg_match($regexp, $output, $matches);
+        $type = $matches[1];
+        $this->assertEquals($type, 'env,dotenv,[db]');
         $state = $matches[2];
         $this->assertTrue(in_array($state, ['Enabled', 'Disabled']));
 
diff --git a/tests/Unit/PrestaShopBundle/Entity/FeatureFlagTest.php b/tests/Unit/PrestaShopBundle/Entity/FeatureFlagTest.php
index 44fe5f077acd8..e914a7458b1a2 100644
--- a/tests/Unit/PrestaShopBundle/Entity/FeatureFlagTest.php
+++ b/tests/Unit/PrestaShopBundle/Entity/FeatureFlagTest.php
@@ -57,6 +57,8 @@ public function testAssertFeatureFlagProperties()
         $this->assertEquals('A.B.C', $featureFlag->getDescriptionDomain());
         $this->assertEquals('a b c d', $featureFlag->getLabelWording());
         $this->assertEquals('A.B.L', $featureFlag->getLabelDomain());
+        $this->assertEquals('env,dotenv,db', $featureFlag->getType());
+        $this->assertEquals(['env', 'dotenv', 'db'], $featureFlag->getOrderedTypes());
     }
 
     public function testToggleWorks()
diff --git a/tests/Unit/PrestaShopBundle/Routing/Converter/LegacyRouteFactoryTest.php b/tests/Unit/PrestaShopBundle/Routing/Converter/LegacyRouteFactoryTest.php
index 8c3fdc3192877..9abfa9ced1019 100644
--- a/tests/Unit/PrestaShopBundle/Routing/Converter/LegacyRouteFactoryTest.php
+++ b/tests/Unit/PrestaShopBundle/Routing/Converter/LegacyRouteFactoryTest.php
@@ -27,7 +27,7 @@
 namespace Tests\Unit\PrestaShopBundle\Routing\Converter;
 
 use PHPUnit\Framework\TestCase;
-use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagManager;
 use PrestaShopBundle\Routing\Converter\LegacyRoute;
 use PrestaShopBundle\Routing\Converter\LegacyRouteFactory;
 use Symfony\Component\Routing\Route;
@@ -41,10 +41,10 @@ class LegacyRouteFactoryTest extends TestCase
     public function testRouteEnabledWithEnabledFeatureFlags(Route $route): void
     {
         $factory = new LegacyRouteFactory(
-            $featureFlagService = $this->createMock(FeatureFlagService::class)
+            $featureFlagManager = $this->createMock(FeatureFlagManager::class)
         );
 
-        $featureFlagService
+        $featureFlagManager
             ->method('isEnabled')
             ->willReturn(true)
         ;
@@ -76,11 +76,11 @@ public function testRouteWithoutFeatureFlagShouldNeverCallRepository(
         Route $route
     ): void {
         $factory = new LegacyRouteFactory(
-            $featureFlagService = $this->createMock(FeatureFlagService::class)
+            $featureFlagManager = $this->createMock(FeatureFlagManager::class)
         );
 
         // assert no calls to repository
-        $featureFlagService
+        $featureFlagManager
             ->expects(self::never())
             ->method('isEnabled')
         ;
diff --git a/tests/Unit/PrestaShopBundle/Routing/Converter/LegacyUrlConverterTest.php b/tests/Unit/PrestaShopBundle/Routing/Converter/LegacyUrlConverterTest.php
index 64cf6ec5410f9..6d39747b8e58d 100644
--- a/tests/Unit/PrestaShopBundle/Routing/Converter/LegacyUrlConverterTest.php
+++ b/tests/Unit/PrestaShopBundle/Routing/Converter/LegacyUrlConverterTest.php
@@ -28,7 +28,7 @@
 
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagManager;
 use PrestaShopBundle\Routing\Converter\Exception\ArgumentException;
 use PrestaShopBundle\Routing\Converter\Exception\RouteNotFoundException;
 use PrestaShopBundle\Routing\Converter\LegacyRouteFactory;
@@ -46,7 +46,7 @@ class LegacyUrlConverterTest extends TestCase
     public function testBasic()
     {
         $router = $this->buildRouterMock('admin_products_index', '/products', 'AdminProducts');
-        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagService::class))));
+        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagManager::class))));
         $url = $converter->convertByParameters([
             'controller' => 'AdminProducts',
         ]);
@@ -59,7 +59,7 @@ public function testBasic()
     public function testMinifiedController()
     {
         $router = $this->buildRouterMock('admin_products_index', '/products', 'AdminProducts');
-        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagService::class))));
+        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagManager::class))));
         $url = $converter->convertByParameters([
             'controller' => 'adminproducts',
         ]);
@@ -72,7 +72,7 @@ public function testMinifiedController()
     public function testBasicTab()
     {
         $router = $this->buildRouterMock('admin_products_index', '/products', 'AdminProducts');
-        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagService::class))));
+        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagManager::class))));
         $url = $converter->convertByParameters([
             'tab' => 'AdminProducts',
         ]);
@@ -85,7 +85,7 @@ public function testBasicTab()
     public function testIndexAlias()
     {
         $router = $this->buildRouterMock('admin_products_index', '/products', 'AdminProducts');
-        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagService::class))));
+        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagManager::class))));
         $url = $converter->convertByParameters([
             'controller' => 'AdminProducts',
             'action' => 'index',
@@ -99,7 +99,7 @@ public function testIndexAlias()
     public function testTabIndexAlias()
     {
         $router = $this->buildRouterMock('admin_products_index', '/products', 'AdminProducts');
-        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagService::class))));
+        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagManager::class))));
         $url = $converter->convertByParameters([
             'tab' => 'AdminProducts',
             'action' => 'index',
@@ -113,7 +113,7 @@ public function testTabIndexAlias()
     public function testInsensitiveListAlias()
     {
         $router = $this->buildRouterMock('admin_products_index', '/products', 'AdminProducts');
-        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagService::class))));
+        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagManager::class))));
         $url = $converter->convertByParameters([
             'controller' => 'AdminProducts',
             'action' => 'LIST',
@@ -127,7 +127,7 @@ public function testInsensitiveListAlias()
     public function testAction()
     {
         $router = $this->buildRouterMock('admin_products_create', '/products/create', 'AdminProducts:create');
-        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagService::class))));
+        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagManager::class))));
         $url = $converter->convertByParameters([
             'controller' => 'AdminProducts',
             'action' => 'create',
@@ -141,7 +141,7 @@ public function testAction()
     public function testTabAction()
     {
         $router = $this->buildRouterMock('admin_products_create', '/products/create', 'AdminProducts:create');
-        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagService::class))));
+        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagManager::class))));
         $url = $converter->convertByParameters([
             'tab' => 'AdminProducts',
             'action' => 'create',
@@ -155,7 +155,7 @@ public function testTabAction()
     public function testActionWithTrue()
     {
         $router = $this->buildRouterMock('admin_products_create', '/products/create', 'AdminProducts:create');
-        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagService::class))));
+        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagManager::class))));
         $url = $converter->convertByParameters([
             'controller' => 'AdminProducts',
             'create' => true,
@@ -169,7 +169,7 @@ public function testActionWithTrue()
     public function testActionWithEmptyString()
     {
         $router = $this->buildRouterMock('admin_products_create', '/products/create', 'AdminProducts:create');
-        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagService::class))));
+        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagManager::class))));
         $url = $converter->convertByParameters([
             'controller' => 'AdminProducts',
             'create' => '',
@@ -186,7 +186,7 @@ public function testMultipleLegacyLinks()
             'AdminModulesManage',
             'AdminModulesSf',
         ]);
-        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagService::class))));
+        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagManager::class))));
 
         //First controller
         $url = $converter->convertByParameters([
@@ -214,7 +214,7 @@ public function testMultipleLegacyLinks()
     public function testNonExistentAction()
     {
         $router = $this->buildRouterMock('admin_products_index', '/products', 'AdminProducts');
-        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagService::class))));
+        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagManager::class))));
 
         $caughtException = null;
 
@@ -287,7 +287,7 @@ public function testNonExistentAction()
     public function testIdEqualToOne()
     {
         $router = $this->buildRouterMock('admin_products_index', '/products', 'AdminProducts');
-        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagService::class))));
+        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagManager::class))));
         $convertedUrl = $converter->convertByUrl('?controller=AdminProducts&id_product=1');
         $this->assertEquals('/products', $convertedUrl);
 
@@ -305,7 +305,7 @@ public function testActionWithArgument()
             ['id' => 2]
         );
 
-        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagService::class))));
+        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagManager::class))));
         $url = $converter->convertByParameters([
             'controller' => 'AdminProducts',
             'action' => 'edit',
@@ -333,7 +333,7 @@ public function testActionWithArgumentWithoutMatching()
             ['id' => 42]
         );
 
-        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagService::class))));
+        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagManager::class))));
         $url = $converter->convertByParameters([
             'controller' => 'AdminProducts',
             'action' => 'edit',
@@ -373,7 +373,7 @@ public function testConvertByRequest()
             ->method('getContext')
             ->willReturn($contextMock);
 
-        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagService::class))));
+        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagManager::class))));
         $url = $converter->convertByRequest($request);
         $this->assertEquals('/products/create', $url);
     }
@@ -381,7 +381,7 @@ public function testConvertByRequest()
     public function testMissingController()
     {
         $router = $this->buildRouterMock('admin_products_create', '/products/create', 'AdminProducts:create');
-        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagService::class))));
+        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagManager::class))));
         $this->expectException(ArgumentException::class);
         $this->expectExceptionMessage('Missing required controller argument');
         $converter->convertByParameters([
@@ -392,7 +392,7 @@ public function testMissingController()
     public function testControllerNotFound()
     {
         $router = $this->buildRouterMock('admin_products_create', '/products/create', 'AdminProducts:create');
-        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagService::class))));
+        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagManager::class))));
 
         /** @var RouteNotFoundException $caughtException */
         $caughtException = null;
@@ -413,7 +413,7 @@ public function testControllerNotFound()
     public function testActionNotFound()
     {
         $router = $this->buildRouterMock('admin_products_create', '/products/create', 'AdminProducts:create');
-        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagService::class))));
+        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagManager::class))));
 
         /** @var RouteNotFoundException $caughtException */
         $caughtException = null;
@@ -452,7 +452,7 @@ public function testMultipleRoutesActionWithTrue()
                 '_legacy_link' => 'AdminProducts:add',
             ],
         ]);
-        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagService::class))));
+        $converter = new LegacyUrlConverter($router, new RouterProvider($router, new LegacyRouteFactory($this->createMock(FeatureFlagManager::class))));
 
         //Test index by parameter
         $url = $converter->convertByParameters([
diff --git a/tests/Unit/PrestaShopBundle/Routing/Converter/RouterProviderTest.php b/tests/Unit/PrestaShopBundle/Routing/Converter/RouterProviderTest.php
index c071b64fd70af..19bb02e5f2d26 100644
--- a/tests/Unit/PrestaShopBundle/Routing/Converter/RouterProviderTest.php
+++ b/tests/Unit/PrestaShopBundle/Routing/Converter/RouterProviderTest.php
@@ -28,7 +28,7 @@
 
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagService;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagManager;
 use PrestaShopBundle\Routing\Converter\Exception\RouteNotFoundException;
 use PrestaShopBundle\Routing\Converter\LegacyRoute;
 use PrestaShopBundle\Routing\Converter\LegacyRouteFactory;
@@ -59,7 +59,7 @@ public function testBuildRoutes()
 
         $routerProvider = new RouterProvider(
             $router,
-            new LegacyRouteFactory($this->createMock(FeatureFlagService::class))
+            new LegacyRouteFactory($this->createMock(FeatureFlagManager::class))
         );
 
         $legacyRoutes = $routerProvider->getLegacyRoutes();
@@ -108,7 +108,7 @@ public function testControllersActions()
         ]);
         $routerProvider = new RouterProvider(
             $router,
-            new LegacyRouteFactory($this->createMock(FeatureFlagService::class))
+            new LegacyRouteFactory($this->createMock(FeatureFlagManager::class))
         );
         $controllersActions = $routerProvider->getControllersActions();
         $this->assertCount(2, $controllersActions);
@@ -153,7 +153,7 @@ public function testGetActionsByController()
 
         $routerProvider = new RouterProvider(
             $router,
-            new LegacyRouteFactory($this->createMock(FeatureFlagService::class))
+            new LegacyRouteFactory($this->createMock(FeatureFlagManager::class))
         );
 
         $controllerActions = $routerProvider->getActionsByController('AdminProducts');
@@ -189,7 +189,7 @@ public function testGetActionsByControllerInsensitive()
 
         $routerProvider = new RouterProvider(
             $router,
-            new LegacyRouteFactory($this->createMock(FeatureFlagService::class))
+            new LegacyRouteFactory($this->createMock(FeatureFlagManager::class))
         );
 
         $controllerActions = $routerProvider->getActionsByController('adminproducts');
@@ -245,7 +245,7 @@ public function testGetLegacyRouteByAction()
 
         $routerProvider = new RouterProvider(
             $router,
-            new LegacyRouteFactory($this->createMock(FeatureFlagService::class))
+            new LegacyRouteFactory($this->createMock(FeatureFlagManager::class))
         );
 
         $legacyRoute = $routerProvider->getLegacyRouteByAction('AdminProducts', 'index');
@@ -323,7 +323,7 @@ public function testGetLegacyRouteByActionInsensitive()
 
         $routerProvider = new RouterProvider(
             $router,
-            new LegacyRouteFactory($this->createMock(FeatureFlagService::class))
+            new LegacyRouteFactory($this->createMock(FeatureFlagManager::class))
         );
 
         $legacyRoute = $routerProvider->getLegacyRouteByAction('adminproducts', 'index');
@@ -362,7 +362,7 @@ public function testControllerNotFound()
 
         $routerProvider = new RouterProvider(
             $router,
-            new LegacyRouteFactory($this->createMock(FeatureFlagService::class))
+            new LegacyRouteFactory($this->createMock(FeatureFlagManager::class))
         );
 
         $caughtException = null;

From 21b71ab860fc52c97ccbf463e0dae4bffb5122a9 Mon Sep 17 00:00:00 2001
From: boherm <boris.hermans@prestashop.com>
Date: Wed, 5 Jul 2023 16:41:08 +0200
Subject: [PATCH 0491/1030] Add tests

---
 tests/Resources/env/.gitkeep                  |   0
 .../FeatureFlag/FeatureFlagManagerTest.php    | 246 ++++++++++++++++++
 .../Core/FeatureFlag/Layer/DbLayerTest.php    | 114 ++++++++
 .../FeatureFlag/Layer/DotEnvLayerTest.php     | 177 +++++++++++++
 .../Core/FeatureFlag/Layer/EnvLayerTest.php   | 144 ++++++++++
 .../Core/FeatureFlag/Layer/QueryLayerTest.php | 157 +++++++++++
 6 files changed, 838 insertions(+)
 create mode 100644 tests/Resources/env/.gitkeep
 create mode 100644 tests/Unit/Core/FeatureFlag/FeatureFlagManagerTest.php
 create mode 100644 tests/Unit/Core/FeatureFlag/Layer/DbLayerTest.php
 create mode 100644 tests/Unit/Core/FeatureFlag/Layer/DotEnvLayerTest.php
 create mode 100644 tests/Unit/Core/FeatureFlag/Layer/EnvLayerTest.php
 create mode 100644 tests/Unit/Core/FeatureFlag/Layer/QueryLayerTest.php

diff --git a/tests/Resources/env/.gitkeep b/tests/Resources/env/.gitkeep
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/tests/Unit/Core/FeatureFlag/FeatureFlagManagerTest.php b/tests/Unit/Core/FeatureFlag/FeatureFlagManagerTest.php
new file mode 100644
index 0000000000000..084f389c88c8f
--- /dev/null
+++ b/tests/Unit/Core/FeatureFlag/FeatureFlagManagerTest.php
@@ -0,0 +1,246 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace Tests\Unit\Core\FeatureFlag;
+
+use Generator;
+use PHPUnit\Framework\TestCase;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagManager;
+use PrestaShop\PrestaShop\Core\FeatureFlag\Layer\DbLayer;
+use PrestaShop\PrestaShop\Core\FeatureFlag\Layer\DotEnvLayer;
+use PrestaShop\PrestaShop\Core\FeatureFlag\Layer\EnvLayer;
+use PrestaShop\PrestaShop\Core\FeatureFlag\Layer\QueryLayer;
+use PrestaShopBundle\Entity\FeatureFlag;
+use PrestaShopBundle\Entity\Repository\FeatureFlagRepository;
+use Psr\Container\ContainerInterface;
+
+class FeatureFlagManagerTest extends TestCase
+{
+    /**
+     * Test FeatureFlagManager with some cases.
+     *
+     * @dataProvider provideLayersTestsData
+     */
+    public function testManagerForDbFeatureFlag(array $testsData): void
+    {
+        $featureFlag = new FeatureFlag('test_ff');
+        $featureFlag->setType('env,query,dotenv,db');
+
+        $envLayer = $this->createLayerMock(EnvLayer::class, $testsData['layers']['env']);
+        $queryLayer = $this->createLayerMock(QueryLayer::class, $testsData['layers']['query']);
+        $dotenvLayer = $this->createLayerMock(DotEnvLayer::class, $testsData['layers']['dotenv']);
+        $dbLayer = $this->createLayerMock(DbLayer::class, $testsData['layers']['db']);
+
+        $featureFlagRepository = $this->createFeatureFlagRepositoryMock($featureFlag);
+        $container = $this->createContainerInterfaceMock($envLayer, $queryLayer, $dotenvLayer, $dbLayer);
+        $featureFlagManager = new FeatureFlagManager($container, $featureFlagRepository);
+
+        $usedLayer = $featureFlagManager->getUsedType($featureFlag->getName());
+        $this->assertEquals($testsData['layerUsed'], $usedLayer);
+
+        $isReadonly = $featureFlagManager->isReadonly($featureFlag->getname());
+        $this->assertEquals($testsData['isReadonly'], $isReadonly);
+
+        $isEnabled = $featureFlagManager->isEnabled($featureFlag->getName());
+        $this->assertEquals($testsData['isEnabled'], $isEnabled);
+
+        $isDisabled = $featureFlagManager->isDisabled($featureFlag->getName());
+        $this->assertEquals(!$testsData['isEnabled'], $isDisabled);
+
+        $mockedLayerUsed = match ($testsData['layerUsed']) {
+            'env' => $envLayer,
+            'query' => $queryLayer,
+            'dotenv' => $dotenvLayer,
+            'db' => $dbLayer,
+            default => null
+        };
+
+        $mockedLayerUsed->expects($this->once())
+            ->method('enable')
+            ->with($featureFlag->getName());
+        $featureFlagManager->enable($featureFlag->getName());
+
+        $mockedLayerUsed->expects($this->once())
+            ->method('disable')
+            ->with($featureFlag->getName());
+        $featureFlagManager->disable($featureFlag->getName());
+    }
+
+    public function provideLayersTestsData(): Generator
+    {
+        yield 'EnvLayer must be in used & feature flag is enabled' => [[
+            'layers' => [
+                'env' => ['canBeUsed' => true, 'isEnabled' => true],
+                'query' => ['canBeUsed' => true, 'isEnabled' => false],
+                'dotenv' => ['canBeUsed' => true, 'isEnabled' => false],
+                'db' => ['canBeUsed' => true, 'isEnabled' => false],
+            ],
+            'layerUsed' => 'env',
+            'isReadonly' => true,
+            'isEnabled' => true,
+        ]];
+        yield 'EnvLayer must be in used & feature flag is disabled' => [[
+            'layers' => [
+                'env' => ['canBeUsed' => true, 'isEnabled' => false],
+                'query' => ['canBeUsed' => true, 'isEnabled' => true],
+                'dotenv' => ['canBeUsed' => true, 'isEnabled' => true],
+                'db' => ['canBeUsed' => true, 'isEnabled' => true],
+            ],
+            'layerUsed' => 'env',
+            'isReadonly' => true,
+            'isEnabled' => false,
+        ]];
+
+        yield 'QueryLayer must be in used & feature flag is enabled' => [[
+            'layers' => [
+                'env' => ['canBeUsed' => false, 'isEnabled' => false],
+                'query' => ['canBeUsed' => true, 'isEnabled' => true],
+                'dotenv' => ['canBeUsed' => true, 'isEnabled' => false],
+                'db' => ['canBeUsed' => true, 'isEnabled' => false],
+            ],
+            'layerUsed' => 'query',
+            'isReadonly' => true,
+            'isEnabled' => true,
+        ]];
+        yield 'QueryLayer must be in used & feature flag is disabled' => [[
+            'layers' => [
+                'env' => ['canBeUsed' => false, 'isEnabled' => true],
+                'query' => ['canBeUsed' => true, 'isEnabled' => false],
+                'dotenv' => ['canBeUsed' => true, 'isEnabled' => true],
+                'db' => ['canBeUsed' => true, 'isEnabled' => true],
+            ],
+            'layerUsed' => 'query',
+            'isReadonly' => true,
+            'isEnabled' => false,
+        ]];
+
+        yield 'DotEnvLayer must be in used & feature flag is enabled' => [[
+            'layers' => [
+                'env' => ['canBeUsed' => false, 'isEnabled' => false],
+                'query' => ['canBeUsed' => false, 'isEnabled' => false],
+                'dotenv' => ['canBeUsed' => true, 'isEnabled' => true],
+                'db' => ['canBeUsed' => true, 'isEnabled' => false],
+            ],
+            'layerUsed' => 'dotenv',
+            'isReadonly' => false,
+            'isEnabled' => true,
+        ]];
+        yield 'DotEnvLayer must be in used & feature flag is disabled' => [[
+            'layers' => [
+                'env' => ['canBeUsed' => false, 'isEnabled' => true],
+                'query' => ['canBeUsed' => false, 'isEnabled' => true],
+                'dotenv' => ['canBeUsed' => true, 'isEnabled' => false],
+                'db' => ['canBeUsed' => true, 'isEnabled' => true],
+            ],
+            'layerUsed' => 'dotenv',
+            'isReadonly' => false,
+            'isEnabled' => false,
+        ]];
+
+        yield 'DbLayer must be in used & feature flag is enabled' => [[
+            'layers' => [
+                'env' => ['canBeUsed' => false, 'isEnabled' => false],
+                'query' => ['canBeUsed' => false, 'isEnabled' => false],
+                'dotenv' => ['canBeUsed' => false, 'isEnabled' => false],
+                'db' => ['canBeUsed' => true, 'isEnabled' => true],
+            ],
+            'layerUsed' => 'db',
+            'isReadonly' => false,
+            'isEnabled' => true,
+        ]];
+        yield 'DbLayer must be in used & feature flag is disabled' => [[
+            'layers' => [
+                'env' => ['canBeUsed' => false, 'isEnabled' => true],
+                'query' => ['canBeUsed' => false, 'isEnabled' => true],
+                'dotenv' => ['canBeUsed' => false, 'isEnabled' => true],
+                'db' => ['canBeUsed' => true, 'isEnabled' => false],
+            ],
+            'layerUsed' => 'db',
+            'isReadonly' => false,
+            'isEnabled' => false,
+        ]];
+    }
+
+    private function createContainerInterfaceMock($envLayer, $queryLayer, $dotenvLayer, $dbLayer)
+    {
+        $mock = $this->getMockBuilder(ContainerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $mock->expects($this->atLeastOnce())
+            ->method('has')
+            ->willReturnCallback(fn ($layer) => match ($layer) {
+                'env' => true,
+                'query' => true,
+                'dotenv' => true,
+                'db' => true,
+                default => false
+            });
+
+        $mock->expects($this->atLeastOnce())
+            ->method('get')
+            ->willReturnCallback(fn ($layer) => match ($layer) {
+                'env' => $envLayer,
+                'query' => $queryLayer,
+                'dotenv' => $dotenvLayer,
+                'db' => $dbLayer,
+                default => null
+            });
+
+        return $mock;
+    }
+
+    private function createFeatureFlagRepositoryMock(FeatureFlag $featureFlag)
+    {
+        $mock = $this->getMockBuilder(FeatureFlagRepository::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $mock->expects($this->any())
+            ->method('getByName')
+            ->will($this->returnValue($featureFlag));
+
+        return $mock;
+    }
+
+    private function createLayerMock(string $className, array $testCase)
+    {
+        $mock = $this->getMockBuilder($className)
+            ->onlyMethods(['canBeUsed', 'isEnabled', 'disable', 'enable'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $mock->expects($this->any())
+            ->method('canBeUsed')
+            ->will($this->returnValue($testCase['canBeUsed']));
+
+        $mock->expects($this->any())
+            ->method('isEnabled')
+            ->will($this->returnValue($testCase['isEnabled']));
+
+        return $mock;
+    }
+}
diff --git a/tests/Unit/Core/FeatureFlag/Layer/DbLayerTest.php b/tests/Unit/Core/FeatureFlag/Layer/DbLayerTest.php
new file mode 100644
index 0000000000000..03b36123e61c4
--- /dev/null
+++ b/tests/Unit/Core/FeatureFlag/Layer/DbLayerTest.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace Tests\Unit\Core\FeatureFlag\Layer;
+
+use PHPUnit\Framework\TestCase;
+use PrestaShop\PrestaShop\Core\FeatureFlag\Layer\DbLayer;
+use PrestaShopBundle\Entity\FeatureFlag;
+use PrestaShopBundle\Entity\Repository\FeatureFlagRepository;
+
+class DbLayerTest extends TestCase
+{
+    private const FEATURE_FLAG_TEST = 'feature_flag_test';
+    private $featureFlag;
+    private $featureFlagRepository;
+
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->featureFlag = new FeatureFlag(self::FEATURE_FLAG_TEST);
+
+        $this->featureFlagRepository = $this->getMockBuilder(FeatureFlagRepository::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->featureFlagRepository->expects($this->any())
+            ->method('getByName')
+            ->will($this->returnValue($this->featureFlag));
+    }
+
+    public function testIsReadonly()
+    {
+        $layer = new DbLayer($this->featureFlagRepository);
+        $this->assertFalse($layer->isReadonly());
+    }
+
+    public function testGetTypeName()
+    {
+        $layer = new DbLayer($this->featureFlagRepository);
+        $this->assertEquals('db', $layer->getTypeName());
+    }
+
+    public function testCanBeUsed()
+    {
+        $layer = new DbLayer($this->featureFlagRepository);
+        $this->assertTrue($layer->canBeUsed($this->featureFlag->getName()));
+    }
+
+    public function testIsEnabled()
+    {
+        $layer = new DbLayer($this->featureFlagRepository);
+        $this->featureFlagRepository->expects($this->once())
+            ->method('isEnabled')
+            ->willReturnCallback(fn ($featureFlagName) => match ($featureFlagName) {
+                self::FEATURE_FLAG_TEST => true,
+                default => false
+            });
+        $this->assertTrue($layer->isEnabled(self::FEATURE_FLAG_TEST));
+    }
+
+    public function testIsDisabled()
+    {
+        $layer = new DbLayer($this->featureFlagRepository);
+        $this->featureFlagRepository->expects($this->once())
+            ->method('isEnabled')
+            ->willReturnCallback(fn ($featureFlagName) => match ($featureFlagName) {
+                self::FEATURE_FLAG_TEST => false,
+                default => true
+            });
+        $this->assertFalse($layer->isEnabled(self::FEATURE_FLAG_TEST));
+    }
+
+    public function testEnable()
+    {
+        $layer = new DbLayer($this->featureFlagRepository);
+        $this->featureFlagRepository->expects($this->once())
+            ->method('enable')
+            ->with(self::FEATURE_FLAG_TEST);
+        $layer->enable(self::FEATURE_FLAG_TEST);
+    }
+
+    public function testDisable()
+    {
+        $layer = new DbLayer($this->featureFlagRepository);
+        $this->featureFlagRepository->expects($this->once())
+            ->method('disable')
+            ->with(self::FEATURE_FLAG_TEST);
+        $layer->disable(self::FEATURE_FLAG_TEST);
+    }
+}
diff --git a/tests/Unit/Core/FeatureFlag/Layer/DotEnvLayerTest.php b/tests/Unit/Core/FeatureFlag/Layer/DotEnvLayerTest.php
new file mode 100644
index 0000000000000..2db28d0b22ee1
--- /dev/null
+++ b/tests/Unit/Core/FeatureFlag/Layer/DotEnvLayerTest.php
@@ -0,0 +1,177 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace Tests\Unit\Core\FeatureFlag\Layer;
+
+use Generator;
+use PHPUnit\Framework\TestCase;
+use PrestaShop\PrestaShop\Adapter\Environment;
+use PrestaShop\PrestaShop\Core\FeatureFlag\Layer\DotEnvLayer;
+
+class DotEnvLayerTest extends TestCase
+{
+    private const FEATURE_FLAG_TEST = 'feature_flag_test';
+    private const VAR_FEATURE_FLAG_TEST = 'PS_FF_FEATURE_FLAG_TEST';
+    private const DOTENV_PATH = _PS_ROOT_DIR_ . '/tests/Resources/env/.env.unit.local';
+    public static $save_dotenv_vars = null;
+
+    public static function setUpBeforeClass(): void
+    {
+        static::$save_dotenv_vars = $_ENV['SYMFONY_DOTENV_VARS'] ?? '';
+    }
+
+    public function setUp(): void
+    {
+        $this->resetEnv();
+    }
+
+    public function tearDown(): void
+    {
+        $this->resetEnv();
+    }
+
+    public function provideEnabledValues(): Generator
+    {
+        yield ['1'];
+        yield ['true'];
+        yield ['TRUE'];
+        yield ['on'];
+        yield ['yes'];
+    }
+
+    public function provideDisabledValues(): Generator
+    {
+        yield ['0'];
+        yield ['false'];
+        yield ['FALSE'];
+        yield ['off'];
+        yield ['no'];
+    }
+
+    public function testIsReadonly()
+    {
+        $layer = $this->createLayer();
+        $this->assertFalse($layer->isReadonly());
+    }
+
+    public function testGetTypeName()
+    {
+        $layer = $this->createLayer();
+        $this->assertEquals('dotenv', $layer->getTypeName());
+    }
+
+    public function testGetConstName()
+    {
+        $layer = $this->createLayer();
+        $this->assertEquals(
+            self::VAR_FEATURE_FLAG_TEST,
+            $layer->getVarName(self::FEATURE_FLAG_TEST)
+        );
+    }
+
+    public function testCanBeUsed()
+    {
+        $this->setEnv(true);
+        $layer = $this->createLayer();
+        $this->assertTrue($layer->canBeUsed(self::FEATURE_FLAG_TEST));
+    }
+
+    public function testCannotBeUsed()
+    {
+        $layer = $this->createLayer();
+        $this->assertFalse($layer->canBeUsed(self::FEATURE_FLAG_TEST));
+    }
+
+    /**
+     * @dataProvider provideEnabledValues
+     */
+    public function testIsEnabled(string $enabledValue)
+    {
+        $this->setEnv($enabledValue);
+        $layer = $this->createLayer();
+        $this->assertTrue($layer->isEnabled(self::FEATURE_FLAG_TEST));
+    }
+
+    /**
+     * @dataProvider provideDisabledValues
+     */
+    public function testIsDisabled(string $disabledValue)
+    {
+        $this->setEnv($disabledValue);
+        $layer = $this->createLayer();
+        $this->assertFalse($layer->isEnabled(self::FEATURE_FLAG_TEST));
+    }
+
+    /**
+     * @dataProvider provideEnabledValues
+     */
+    public function testEnable(string $enabledValue)
+    {
+        file_put_contents(self::DOTENV_PATH, self::VAR_FEATURE_FLAG_TEST . "={$enabledValue}");
+        $layer = $this->createLayer();
+        $layer->enable(self::FEATURE_FLAG_TEST);
+        $this->assertEquals(
+            self::VAR_FEATURE_FLAG_TEST . '=true',
+            file_get_contents(self::DOTENV_PATH)
+        );
+    }
+
+    /**
+     * @dataProvider provideDisabledValues
+     */
+    public function testDisable(string $disabledValue)
+    {
+        $this->setEnv(true);
+        file_put_contents(self::DOTENV_PATH, self::VAR_FEATURE_FLAG_TEST . "={$disabledValue}");
+        $layer = $this->createLayer();
+        $layer->disable(self::FEATURE_FLAG_TEST);
+        $this->assertEquals(
+            self::VAR_FEATURE_FLAG_TEST . '=false',
+            file_get_contents(self::DOTENV_PATH)
+        );
+    }
+
+    private function resetEnv(): void
+    {
+        unset($_ENV[self::VAR_FEATURE_FLAG_TEST]);
+        $_ENV['SYMFONY_DOTENV_VARS'] = static::$save_dotenv_vars;
+        @unlink(self::DOTENV_PATH);
+    }
+
+    private function setEnv($status): void
+    {
+        $_ENV[self::VAR_FEATURE_FLAG_TEST] = $status;
+        $_ENV['SYMFONY_DOTENV_VARS'] .= ',' . self::VAR_FEATURE_FLAG_TEST;
+    }
+
+    private function createLayer(): DotEnvLayer
+    {
+        return new DotEnvLayer(
+            new Environment(false, 'unit'),
+            dirname(self::DOTENV_PATH)
+        );
+    }
+}
diff --git a/tests/Unit/Core/FeatureFlag/Layer/EnvLayerTest.php b/tests/Unit/Core/FeatureFlag/Layer/EnvLayerTest.php
new file mode 100644
index 0000000000000..6655a5ad7d9b0
--- /dev/null
+++ b/tests/Unit/Core/FeatureFlag/Layer/EnvLayerTest.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace Tests\Unit\Core\FeatureFlag\Layer;
+
+use Generator;
+use InvalidArgumentException;
+use PHPUnit\Framework\TestCase;
+use PrestaShop\PrestaShop\Core\FeatureFlag\Layer\EnvLayer;
+
+class EnvLayerTest extends TestCase
+{
+    private const FEATURE_FLAG_TEST = 'feature_flag_test';
+    private const VAR_FEATURE_FLAG_TEST = 'PS_FF_FEATURE_FLAG_TEST';
+
+    public function setUp(): void
+    {
+        $this->resetEnv();
+    }
+
+    public function tearDown(): void
+    {
+        $this->resetEnv();
+    }
+
+    public function provideEnabledValues(): Generator
+    {
+        yield ['1'];
+        yield ['true'];
+        yield ['TRUE'];
+        yield ['on'];
+        yield ['yes'];
+    }
+
+    public function provideDisabledValues(): Generator
+    {
+        yield ['0'];
+        yield ['false'];
+        yield ['FALSE'];
+        yield ['off'];
+        yield ['no'];
+    }
+
+    public function testIsReadonly()
+    {
+        $layer = new EnvLayer();
+        $this->assertTrue($layer->isReadonly());
+    }
+
+    public function testGetTypeName()
+    {
+        $layer = new EnvLayer();
+        $this->assertEquals('env', $layer->getTypeName());
+    }
+
+    public function testGetConstName()
+    {
+        $layer = new EnvLayer();
+        $this->assertEquals(
+            self::VAR_FEATURE_FLAG_TEST,
+            $layer->getConstName(self::FEATURE_FLAG_TEST)
+        );
+    }
+
+    public function testCanBeUsed()
+    {
+        $this->setEnv('true');
+        $layer = new EnvLayer();
+        $this->assertTrue($layer->canBeUsed(self::FEATURE_FLAG_TEST));
+    }
+
+    public function testCannotBeUsed()
+    {
+        $layer = new EnvLayer();
+        $this->assertFalse($layer->canBeUsed(self::FEATURE_FLAG_TEST));
+    }
+
+    /**
+     * @dataProvider provideEnabledValues
+     */
+    public function testIsEnabled(string $enabledValue)
+    {
+        $this->setEnv($enabledValue);
+        $layer = new EnvLayer();
+        $this->assertTrue($layer->isEnabled(self::FEATURE_FLAG_TEST));
+    }
+
+    /**
+     * @dataProvider provideDisabledValues
+     */
+    public function testIsDisabled(string $disabledValue)
+    {
+        $this->setEnv($disabledValue);
+        $layer = new EnvLayer();
+        $this->assertFalse($layer->isEnabled(self::FEATURE_FLAG_TEST));
+    }
+
+    public function testEnable()
+    {
+        $layer = new EnvLayer();
+        $this->expectException(InvalidArgumentException::class);
+        $layer->enable(self::FEATURE_FLAG_TEST);
+    }
+
+    public function testDisable()
+    {
+        $layer = new EnvLayer();
+        $this->expectException(InvalidArgumentException::class);
+        $layer->disable(self::FEATURE_FLAG_TEST);
+    }
+
+    private function resetEnv(): void
+    {
+        putenv(self::VAR_FEATURE_FLAG_TEST);
+    }
+
+    private function setEnv(string $status): void
+    {
+        putenv(self::VAR_FEATURE_FLAG_TEST . "={$status}");
+    }
+}
diff --git a/tests/Unit/Core/FeatureFlag/Layer/QueryLayerTest.php b/tests/Unit/Core/FeatureFlag/Layer/QueryLayerTest.php
new file mode 100644
index 0000000000000..748473d290dbd
--- /dev/null
+++ b/tests/Unit/Core/FeatureFlag/Layer/QueryLayerTest.php
@@ -0,0 +1,157 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace Tests\Unit\Core\FeatureFlag\Layer;
+
+use Generator;
+use InvalidArgumentException;
+use PHPUnit\Framework\TestCase;
+use PrestaShop\PrestaShop\Adapter\Environment;
+use PrestaShop\PrestaShop\Core\FeatureFlag\Layer\QueryLayer;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+
+class QueryLayerTest extends TestCase
+{
+    private const FEATURE_FLAG_TEST = 'feature_flag_test';
+    private const VAR_FEATURE_FLAG_TEST = 'PS_FF_FEATURE_FLAG_TEST';
+
+    public function provideEnabledValues(): Generator
+    {
+        yield ['1'];
+        yield ['true'];
+        yield ['TRUE'];
+        yield ['on'];
+        yield ['yes'];
+    }
+
+    public function provideDisabledValues(): Generator
+    {
+        yield ['0'];
+        yield ['false'];
+        yield ['FALSE'];
+        yield ['off'];
+        yield ['no'];
+    }
+
+    public function testIsReadonly()
+    {
+        $layer = $this->createLayer(true);
+        $this->assertTrue($layer->isReadonly());
+    }
+
+    public function testGetTypeName()
+    {
+        $layer = $this->createLayer(true);
+        $this->assertEquals('query', $layer->getTypeName());
+    }
+
+    public function testGetConstName()
+    {
+        $layer = $this->createLayer(true);
+        $this->assertEquals(
+            self::VAR_FEATURE_FLAG_TEST,
+            $layer->getVarName(self::FEATURE_FLAG_TEST)
+        );
+    }
+
+    public function testCanBeUsed()
+    {
+        $layer = $this->createLayer(true, 'on');
+        $this->assertTrue($layer->canBeUsed(self::FEATURE_FLAG_TEST));
+    }
+
+    public function testCannotBeUsedWhenStateNotAvailable()
+    {
+        $layer = $this->createLayer(true);
+        $this->assertFalse($layer->canBeUsed(self::FEATURE_FLAG_TEST));
+    }
+
+    public function testCannotBeUsedInProdEvenStateAvailable()
+    {
+        $layer = $this->createLayer(false, 'on');
+        $this->assertFalse($layer->canBeUsed(self::FEATURE_FLAG_TEST));
+    }
+
+    /**
+     * @dataProvider provideEnabledValues
+     */
+    public function testIsEnabled(string $enabledValue)
+    {
+        $layer = $this->createLayer(true, $enabledValue);
+        $this->assertTrue($layer->isEnabled(self::FEATURE_FLAG_TEST));
+    }
+
+    /**
+     * @dataProvider provideDisabledValues
+     */
+    public function testIsDisabled(string $disabledValue)
+    {
+        $layer = $this->createLayer(true, $disabledValue);
+        $this->assertFalse($layer->isEnabled(self::FEATURE_FLAG_TEST));
+    }
+
+    public function testEnable()
+    {
+        $layer = $this->createLayer(true);
+        $this->expectException(InvalidArgumentException::class);
+        $layer->enable(self::FEATURE_FLAG_TEST);
+    }
+
+    public function testDisable()
+    {
+        $layer = $this->createLayer(true);
+        $this->expectException(InvalidArgumentException::class);
+        $layer->disable(self::FEATURE_FLAG_TEST);
+    }
+
+    private function createLayer(bool $modeDev, ?string $featureFlagState = null): QueryLayer
+    {
+        return new QueryLayer(
+            $this->createEnvironment($modeDev),
+            $this->createRequestStack($featureFlagState)
+        );
+    }
+
+    private function createEnvironment(bool $status): Environment
+    {
+        return new Environment($status, 'unit');
+    }
+
+    private function createRequestStack(?string $status): RequestStack
+    {
+        $requestStack = new RequestStack();
+        $request = new Request();
+
+        if (null !== $status) {
+            $request->query->set(self::VAR_FEATURE_FLAG_TEST, $status);
+        }
+
+        $requestStack->push($request);
+
+        return $requestStack;
+    }
+}

From be393599c29661e8c345eeb162eb200293404f4e Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Thu, 6 Jul 2023 17:17:08 +0200
Subject: [PATCH 0492/1030] Nightly : 8.0.x : Fixed error in filterTaxes

---
 .../03_taxes/01_taxes/01_filterAndQuickEditTaxes.js    | 10 +++++-----
 tests/UI/pages/BO/international/taxes/index.js         |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/01_filterAndQuickEditTaxes.js b/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/01_filterAndQuickEditTaxes.js
index 4a255cbe5da94..bd93a21782a70 100644
--- a/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/01_filterAndQuickEditTaxes.js
+++ b/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/01_filterAndQuickEditTaxes.js
@@ -5,7 +5,7 @@ const helper = require('@utils/helpers');
 const loginCommon = require('@commonTests/BO/loginBO');
 
 // Import data
-const {DefaultFrTax, VatUkTax} = require('@data/demo/tax');
+const {DefaultFrTax} = require('@data/demo/tax');
 
 // Import pages
 const dashboardPage = require('@pages/BO/dashboard');
@@ -87,7 +87,7 @@ describe('BO - International - Taxes : Filter And Quick Edit', async () => {
             testIdentifier: 'filterActive',
             filterType: 'select',
             filterBy: 'active',
-            filterValue: DefaultFrTax.enabled,
+            filterValue: DefaultFrTax.enabled ? '1' : '0',
           },
       },
     ];
@@ -106,7 +106,7 @@ describe('BO - International - Taxes : Filter And Quick Edit', async () => {
         for (let i = 1; i <= numberOfTaxesAfterFilter; i++) {
           if (test.args.filterBy === 'active') {
             const taxStatus = await taxesPage.getStatus(page, i);
-            await expect(taxStatus).to.equal(test.args.filterValue);
+            await expect(taxStatus).to.equal(test.args.filterValue === '1');
           } else {
             const textColumn = await taxesPage.getTextColumnFromTableTaxes(page, i, test.args.filterBy);
             await expect(textColumn).to.contains(test.args.filterValue);
@@ -128,13 +128,13 @@ describe('BO - International - Taxes : Filter And Quick Edit', async () => {
     it('should filter by name', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'filterForQuickEdit', baseContext);
 
-      await taxesPage.filterTaxes(page, 'input', 'name', VatUkTax.name);
+      await taxesPage.filterTaxes(page, 'input', 'name', DefaultFrTax.name);
 
       const numberOfTaxesAfterFilter = await taxesPage.getNumberOfElementInGrid(page);
       await expect(numberOfTaxesAfterFilter).to.be.at.most(numberOfTaxes);
 
       const textColumn = await taxesPage.getTextColumnFromTableTaxes(page, 1, 'name');
-      await expect(textColumn).to.contains(VatUkTax.name);
+      await expect(textColumn).to.contains(DefaultFrTax.name);
     });
 
     [
diff --git a/tests/UI/pages/BO/international/taxes/index.js b/tests/UI/pages/BO/international/taxes/index.js
index 2696737a62b77..2572925a452c5 100644
--- a/tests/UI/pages/BO/international/taxes/index.js
+++ b/tests/UI/pages/BO/international/taxes/index.js
@@ -120,7 +120,7 @@ class Taxes extends BOBasePage {
         await this.setValue(page, this.taxesFilterColumnInput(filterBy), value);
         break;
       case 'select':
-        await this.selectByVisibleText(page, this.taxesFilterColumnInput(filterBy), value ? 'Yes' : 'No');
+        await this.selectByVisibleText(page, this.taxesFilterColumnInput(filterBy), value === '1' ? 'Yes' : 'No');
         break;
       default:
       // Do nothing

From f32ca573b41830e1eeafb4a7802be164abd8e04a Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Thu, 23 Feb 2023 11:05:36 +0100
Subject: [PATCH 0493/1030] Order Statuses/Order Return Statuses : Use the new
 form theme

---
 .../OrderReturnStateType.php                  | 11 ++++
 .../OrderStates/OrderStateType.php            | 25 ++++++++-
 .../Admin/Type/TranslatableChoiceType.php     |  3 ++
 .../OrderReturnStates/Blocks/form.html.twig   | 19 +------
 .../OrderStates/Blocks/form.html.twig         | 52 +------------------
 .../bootstrap_4_layout.html.twig              |  1 +
 6 files changed, 42 insertions(+), 69 deletions(-)

diff --git a/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderReturnStates/OrderReturnStateType.php b/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderReturnStates/OrderReturnStateType.php
index 0767ce866688c..7c32ca117fa9b 100644
--- a/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderReturnStates/OrderReturnStateType.php
+++ b/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderReturnStates/OrderReturnStateType.php
@@ -41,6 +41,8 @@
  */
 class OrderReturnStateType extends TranslatorAwareType
 {
+    protected const NAME_CHARS = '!<>,;?=+()@#"{}_$%:';
+
     /**
      * {@inheritdoc}
      */
@@ -48,6 +50,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('name', TranslatableType::class, [
+                'label' => $this->trans('Status name', 'Admin.Shopparameters.Feature'),
+                'help' => sprintf(
+                    '%s %s %s',
+                    $this->trans('Status name', 'Admin.Shopparameters.Feature'),
+                    $this->trans('Invalid characters: numbers and', 'Admin.Shopparameters.Feature'),
+                    static::NAME_CHARS
+                ),
                 'type' => TextType::class,
                 'constraints' => [
                     new DefaultLanguage(),
@@ -61,6 +70,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 ],
             ])
             ->add('color', ColorPickerType::class, [
+                'label' => $this->trans('Color', 'Admin.Shopparameters.Feature'),
+                'help' => $this->trans('Status will be highlighted in this color. HTML colors only.', 'Admin.Shopparameters.Help'),
                 'required' => true,
             ])
         ;
diff --git a/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderStates/OrderStateType.php b/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderStates/OrderStateType.php
index 1445048e9e085..3924b22039f77 100644
--- a/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderStates/OrderStateType.php
+++ b/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderStates/OrderStateType.php
@@ -30,6 +30,7 @@
 use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\DefaultLanguage;
 use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\TypedRegex;
 use PrestaShop\PrestaShop\Core\Domain\Configuration\ShopConfigurationInterface;
+use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
 use PrestaShop\PrestaShop\Core\MailTemplate\Layout\Layout;
 use PrestaShop\PrestaShop\Core\MailTemplate\ThemeCatalogInterface;
 use PrestaShopBundle\Form\Admin\Type\ColorPickerType;
@@ -48,6 +49,8 @@
  */
 class OrderStateType extends TranslatorAwareType
 {
+    protected const NAME_CHARS = '!<>,;?=+()@#"{}_$%:';
+
     /**
      * @var array
      */
@@ -65,7 +68,7 @@ class OrderStateType extends TranslatorAwareType
      * @param UrlGeneratorInterface $routing
      * @param ShopConfigurationInterface $configuration
      *
-     * @throws \PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public function __construct(
         TranslatorInterface $translator,
@@ -111,6 +114,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('name', TranslatableType::class, [
+                'label' => $this->trans('Status name', 'Admin.Shopparameters.Feature'),
+                'help' => sprintf(
+                    '%s %s %s',
+                    $this->trans('Order status (e.g. \'Pending\').', 'Admin.Shopparameters.Help'),
+                    $this->trans('Invalid characters: numbers and', 'Admin.Shopparameters.Help'),
+                    static::NAME_CHARS
+                ),
                 'type' => TextType::class,
                 'constraints' => [
                     new DefaultLanguage(),
@@ -125,6 +135,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ])
             ->add('color', ColorPickerType::class, [
                 'required' => true,
+                'label' => $this->trans('Color', 'Admin.Shopparameters.Feature'),
+                'help' => $this->trans('Status will be highlighted in this color. HTML colors only.', 'Admin.Shopparameters.Help'),
             ])
             ->add('loggable', CheckboxType::class, [
                 'required' => false,
@@ -190,6 +202,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 ],
             ])
             ->add('template', TranslatableChoiceType::class, [
+                'label' => $this->trans('Email template', 'Admin.Shopparameters.Feature'),
                 'hint' => sprintf(
                     '%s<br>%s',
                     $this->trans('Only letters, numbers and underscores ("_") are allowed.', 'Admin.Shopparameters.Help'),
@@ -197,7 +210,15 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 ),
                 'required' => false,
                 'choices' => $this->templates,
-                'row_attr' => $this->templateAttributes,
+                'row_attr' => $this->templateAttributes + [
+                    'class' => 'order_state_template_select',
+                ],
+                'button' => [
+                    'label' => $this->trans('Preview', 'Admin.Actions'),
+                    'icon' => 'visibility',
+                    'class' => 'btn btn-primary',
+                    'id' => 'order_state_template_preview',
+                ],
             ])
         ;
     }
diff --git a/src/PrestaShopBundle/Form/Admin/Type/TranslatableChoiceType.php b/src/PrestaShopBundle/Form/Admin/Type/TranslatableChoiceType.php
index 793cf3e50e355..127f04f16dff3 100644
--- a/src/PrestaShopBundle/Form/Admin/Type/TranslatableChoiceType.php
+++ b/src/PrestaShopBundle/Form/Admin/Type/TranslatableChoiceType.php
@@ -42,6 +42,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
 
         $view->vars['default_locale'] = reset($options['locales'])['iso_code'];
         $view->vars['choices'] = $options['choices'];
+        $view->vars['button'] = $options['button'];
     }
 
     /**
@@ -50,11 +51,13 @@ public function buildView(FormView $view, FormInterface $form, array $options)
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
+            'button' => [],
             'choices' => [],
             'choice_translation_domain' => false,
             'allow_extra_fields' => true,
         ]);
 
+        $resolver->setAllowedTypes('button', 'array');
         $resolver->setAllowedTypes('choices', 'array');
 
         parent::configureOptions($resolver);
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Configure/ShopParameters/OrderReturnStates/Blocks/form.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Configure/ShopParameters/OrderReturnStates/Blocks/form.html.twig
index eb88dccc09798..afb3fc5d9000b 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Configure/ShopParameters/OrderReturnStates/Blocks/form.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Configure/ShopParameters/OrderReturnStates/Blocks/form.html.twig
@@ -23,7 +23,7 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  *#}
 
-{% import '@PrestaShop/Admin/macros.html.twig' as ps %}
+{% form_theme orderReturnStateForm '@PrestaShop/Admin/TwigTemplateForm/prestashop_ui_kit.html.twig' %}
 
 {% block order_return_state_form %}
   {{ form_start(orderReturnStateForm) }}
@@ -34,22 +34,7 @@
       </h3>
       <div class="card-body">
         <div class="form-wrapper">
-          {{ form_errors(orderReturnStateForm) }}
-
-          {{ ps.form_group_row(orderReturnStateForm.name, {}, {
-            'label': 'Status name'|trans({}, 'Admin.Shopparameters.Feature'),
-            'help': 'Order\'s return status name.'|trans({}, 'Admin.Shopparameters.Help')
-                    ~ ' '
-                    ~ 'Invalid characters: numbers and'|trans({}, 'Admin.Shopparameters.Help')
-                    ~ ' !<>,;?=+()@#"{}_$%:'
-          }) }}
-
-          {{ ps.form_group_row(orderReturnStateForm.color, {}, {
-            'label': 'Color'|trans({}, 'Admin.Shopparameters.Feature'),
-            'help': 'Status will be highlighted in this color. HTML colors only.'|trans({}, 'Admin.Shopparameters.Help') ~ ' "lightblue", "#CC6600")'
-          }) }}
-
-          {% block order_return_state_form_reset %}
+          {% block order_return_state_form_rest %}
             {{ form_rest(orderReturnStateForm) }}
           {% endblock %}
         </div>
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Configure/ShopParameters/OrderStates/Blocks/form.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Configure/ShopParameters/OrderStates/Blocks/form.html.twig
index 2015f1e895c5c..6b2d777159148 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Configure/ShopParameters/OrderStates/Blocks/form.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Configure/ShopParameters/OrderStates/Blocks/form.html.twig
@@ -23,7 +23,7 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  *#}
 
-{% import '@PrestaShop/Admin/macros.html.twig' as ps %}
+{% form_theme orderStateForm '@PrestaShop/Admin/TwigTemplateForm/prestashop_ui_kit.html.twig' %}
 
 {% block order_state_form %}
   {{ form_start(orderStateForm) }}
@@ -36,55 +36,7 @@
         <div class="form-wrapper">
           {{ form_errors(orderStateForm) }}
 
-          {{ ps.form_group_row(orderStateForm.name, {}, {
-            'label': 'Status name'|trans({}, 'Admin.Shopparameters.Feature'),
-            'help': 'Order status (e.g. \'Pending\').'|trans({}, 'Admin.Shopparameters.Help')
-                    ~ ' '
-                    ~ 'Invalid characters: numbers and'|trans({}, 'Admin.Shopparameters.Help')
-                    ~ ' !<>,;?=+()@#"{}_$%:'
-          }) }}
-
-          {{ ps.form_group_row(orderStateForm.color, {}, {
-            'label': 'Color'|trans({}, 'Admin.Shopparameters.Feature'),
-            'help': 'Status will be highlighted in this color. HTML colors only.'|trans({}, 'Admin.Shopparameters.Help') ~ ' "lightblue", "#CC6600")'
-          }) }}
-
-          {{ ps.form_group_row(orderStateForm.loggable, {}, {'label': ''}) }}
-
-          {{ ps.form_group_row(orderStateForm.invoice, {}, {'label': ''}) }}
-
-          {{ ps.form_group_row(orderStateForm.hidden, {}, {'label': ''}) }}
-
-          {{ ps.form_group_row(orderStateForm.send_email, {}, {'label': ''}) }}
-
-          {{ ps.form_group_row(orderStateForm.pdf_invoice, {}, {'label': ''}) }}
-
-          {{ ps.form_group_row(orderStateForm.pdf_delivery, {}, {'label': ''}) }}
-
-          {{ ps.form_group_row(orderStateForm.shipped, {}, {'label': ''}) }}
-
-          {{ ps.form_group_row(orderStateForm.paid, {}, {'label': ''}) }}
-
-          {{ ps.form_group_row(orderStateForm.delivery, {}, {'label': ''}) }}
-
-          {{ ps.form_group_row(orderStateForm.template, {
-              'options_extra': {
-                'data-preview': templatesPreviewUrl
-              },
-              'button': {
-                'label': 'Preview'|trans({}, 'Admin.Actions'),
-                'icon': 'visibility',
-                'class': 'btn btn-primary',
-                'id': 'order_state_template_preview'
-              }
-            },
-            {
-              'label': 'Email template'|trans({}, 'Admin.Shopparameters.Feature'),
-              'hint': 'Status will be highlighted in this color. HTML colors only.'|trans({}, 'Admin.Shopparameters.Help') ~ ' "lightblue", "#CC6600")',
-              'class': 'order_state_template_select'
-            }) }}
-
-          {% block order_state_form_reset %}
+          {% block order_state_form_rest %}
             {{ form_rest(orderStateForm) }}
           {% endblock %}
         </div>
diff --git a/src/PrestaShopBundle/Resources/views/Admin/TwigTemplateForm/bootstrap_4_layout.html.twig b/src/PrestaShopBundle/Resources/views/Admin/TwigTemplateForm/bootstrap_4_layout.html.twig
index dc32dbc0bb3ea..8fc90a4d48ccb 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/TwigTemplateForm/bootstrap_4_layout.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/TwigTemplateForm/bootstrap_4_layout.html.twig
@@ -364,6 +364,7 @@
     <div class="input-group colorpicker">
       <input type="text" {{ block('widget_attributes') }} {% if value is not empty %}value="{{ value }}" {% endif %}/>
     </div>
+    {{- block('form_help') -}}
   {% endapply %}
 {% endblock color_picker_widget %}
 

From f13649c1643b0f1c051c9e4a19a0e96ca3e0c28a Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Fri, 23 Jun 2023 16:43:27 +0200
Subject: [PATCH 0494/1030] Order Statuses/Order Return Statuses : Added file
 for Order Status and Fixes feedbacks

---
 .../File/Uploader/OrderStateFileUploader.php  | 104 ++++++++++++++++++
 .../CommandHandler/AddOrderStateHandler.php   |  17 +++
 .../CommandHandler/EditOrderStateHandler.php  |  18 +++
 .../GetOrderStateForEditingHandler.php        |   5 +
 .../Command/AddOrderStateCommand.php          |  70 ++++++++++++
 .../Command/EditOrderStateCommand.php         |  70 ++++++++++++
 .../OrderStateConstraintException.php         |   4 +
 .../OrderStateUploadFailedException.php       |  35 ++++++
 .../OrderStateFileUploaderInterface.php       |  37 +++++++
 .../QueryResult/EditableOrderState.php        |  15 +++
 .../DataHandler/OrderStateFormDataHandler.php |  25 +++++
 .../OrderReturnStateFormDataProvider.php      |   6 +-
 .../OrderStateFormDataProvider.php            |   6 +-
 .../OrderReturnStateType.php                  |   2 +-
 .../OrderStates/OrderStateType.php            |  10 +-
 .../config/services/adapter/order_state.yml   |   8 ++
 16 files changed, 421 insertions(+), 11 deletions(-)
 create mode 100644 src/Adapter/File/Uploader/OrderStateFileUploader.php
 create mode 100644 src/Core/Domain/OrderState/Exception/OrderStateUploadFailedException.php
 create mode 100644 src/Core/Domain/OrderState/OrderStateFileUploaderInterface.php

diff --git a/src/Adapter/File/Uploader/OrderStateFileUploader.php b/src/Adapter/File/Uploader/OrderStateFileUploader.php
new file mode 100644
index 0000000000000..54c9fdf25c8f5
--- /dev/null
+++ b/src/Adapter/File/Uploader/OrderStateFileUploader.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Adapter\File\Uploader;
+
+use PrestaShop\PrestaShop\Core\Configuration\UploadSizeConfigurationInterface;
+use PrestaShop\PrestaShop\Core\Domain\OrderState\Exception\OrderStateConstraintException;
+use PrestaShop\PrestaShop\Core\Domain\OrderState\Exception\OrderStateUploadFailedException;
+use PrestaShop\PrestaShop\Core\Domain\OrderState\OrderStateFileUploaderInterface;
+use Symfony\Component\HttpFoundation\File\Exception\FileException;
+
+/**
+ * Uploads order state file
+ */
+class OrderStateFileUploader implements OrderStateFileUploaderInterface
+{
+    /**
+     * @var UploadSizeConfigurationInterface
+     */
+    protected $uploadSizeConfiguration;
+
+    /**
+     * @param UploadSizeConfigurationInterface $uploadSizeConfiguration
+     */
+    public function __construct(UploadSizeConfigurationInterface $uploadSizeConfiguration)
+    {
+        $this->uploadSizeConfiguration = $uploadSizeConfiguration;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param bool $throwExceptionOnFailure
+     *
+     * @throws OrderStateConstraintException
+     * @throws OrderStateUploadFailedException
+     */
+    public function upload(
+        string $filePath,
+        int $id,
+        int $fileSize,
+        bool $throwExceptionOnFailure = true
+    ): void {
+        $this->checkFileAllowedForUpload($fileSize);
+        $this->uploadFile($filePath, $id);
+    }
+
+    /**
+     * @param string $filePath
+     * @param int $id
+     *
+     * @throws OrderStateUploadFailedException
+     */
+    protected function uploadFile(string $filePath, int $id): void
+    {
+        try {
+            move_uploaded_file($filePath, _PS_ORDER_STATE_IMG_DIR_ . $id . '.gif');
+        } catch (FileException $e) {
+            throw new OrderStateUploadFailedException(sprintf('Failed to copy the file %s.', $filePath), 0, $e);
+        }
+    }
+
+    /**
+     * @param int $fileSize
+     *
+     * @throws OrderStateConstraintException
+     */
+    protected function checkFileAllowedForUpload(int $fileSize): void
+    {
+        $maxFileSize = $this->uploadSizeConfiguration->getMaxUploadSizeInBytes();
+
+        if ($maxFileSize > 0 && $fileSize > $maxFileSize) {
+            throw new OrderStateConstraintException(
+                sprintf('Max file size allowed is "%s" bytes. Uploaded file size is "%s".', $maxFileSize, $fileSize),
+                OrderStateConstraintException::INVALID_FILE_SIZE
+            );
+        }
+    }
+}
diff --git a/src/Adapter/OrderState/CommandHandler/AddOrderStateHandler.php b/src/Adapter/OrderState/CommandHandler/AddOrderStateHandler.php
index 1919ccaacdd7f..5529d464f47f3 100644
--- a/src/Adapter/OrderState/CommandHandler/AddOrderStateHandler.php
+++ b/src/Adapter/OrderState/CommandHandler/AddOrderStateHandler.php
@@ -32,6 +32,7 @@
 use PrestaShop\PrestaShop\Core\Domain\OrderState\Command\AddOrderStateCommand;
 use PrestaShop\PrestaShop\Core\Domain\OrderState\CommandHandler\AddOrderStateHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\OrderState\Exception\OrderStateException;
+use PrestaShop\PrestaShop\Core\Domain\OrderState\OrderStateFileUploaderInterface;
 use PrestaShop\PrestaShop\Core\Domain\OrderState\ValueObject\OrderStateId;
 
 /**
@@ -42,6 +43,19 @@
 #[AsCommandHandler]
 final class AddOrderStateHandler extends AbstractOrderStateHandler implements AddOrderStateHandlerInterface
 {
+    /**
+     * @var OrderStateFileUploaderInterface
+     */
+    protected $fileUploader;
+
+    /**
+     * @param OrderStateFileUploaderInterface $fileUploader
+     */
+    public function __construct(OrderStateFileUploaderInterface $fileUploader)
+    {
+        $this->fileUploader = $fileUploader;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -57,6 +71,9 @@ public function handle(AddOrderStateCommand $command)
         }
 
         $orderState->add();
+        if ($command->getFilePathName()) {
+            $this->fileUploader->upload($command->getFilePathName(), (int) $orderState->id, $command->getFileSize());
+        }
 
         return new OrderStateId((int) $orderState->id);
     }
diff --git a/src/Adapter/OrderState/CommandHandler/EditOrderStateHandler.php b/src/Adapter/OrderState/CommandHandler/EditOrderStateHandler.php
index b2d81aa53e9a9..5083a50a4a910 100644
--- a/src/Adapter/OrderState/CommandHandler/EditOrderStateHandler.php
+++ b/src/Adapter/OrderState/CommandHandler/EditOrderStateHandler.php
@@ -33,6 +33,7 @@
 use PrestaShop\PrestaShop\Core\Domain\OrderState\CommandHandler\EditOrderStateHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\OrderState\Exception\MissingOrderStateRequiredFieldsException;
 use PrestaShop\PrestaShop\Core\Domain\OrderState\Exception\OrderStateException;
+use PrestaShop\PrestaShop\Core\Domain\OrderState\OrderStateFileUploaderInterface;
 
 /**
  * Handles commands which edits given order state with provided data.
@@ -42,6 +43,19 @@
 #[AsCommandHandler]
 final class EditOrderStateHandler extends AbstractOrderStateHandler implements EditOrderStateHandlerInterface
 {
+    /**
+     * @var OrderStateFileUploaderInterface
+     */
+    protected $fileUploader;
+
+    /**
+     * @param OrderStateFileUploaderInterface $fileUploader
+     */
+    public function __construct(OrderStateFileUploaderInterface $fileUploader)
+    {
+        $this->fileUploader = $fileUploader;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -63,6 +77,10 @@ public function handle(EditOrderStateCommand $command)
         if (false === $orderState->update()) {
             throw new OrderStateException('Failed to update order state');
         }
+
+        if ($command->getFilePathName()) {
+            $this->fileUploader->upload($command->getFilePathName(), $orderStateId->getValue(), $command->getFileSize());
+        }
     }
 
     /**
diff --git a/src/Adapter/OrderState/QueryHandler/GetOrderStateForEditingHandler.php b/src/Adapter/OrderState/QueryHandler/GetOrderStateForEditingHandler.php
index 29381af2e4de6..5863e0bdaa4d3 100644
--- a/src/Adapter/OrderState/QueryHandler/GetOrderStateForEditingHandler.php
+++ b/src/Adapter/OrderState/QueryHandler/GetOrderStateForEditingHandler.php
@@ -33,6 +33,7 @@
 use PrestaShop\PrestaShop\Core\Domain\OrderState\Query\GetOrderStateForEditing;
 use PrestaShop\PrestaShop\Core\Domain\OrderState\QueryHandler\GetOrderStateForEditingHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\OrderState\QueryResult\EditableOrderState;
+use SplFileInfo;
 
 /**
  * Handles command that gets orderState for editing
@@ -54,9 +55,13 @@ public function handle(GetOrderStateForEditing $query)
             throw new OrderStateNotFoundException($orderStateId, sprintf('OrderState with id "%s" was not found', $orderStateId->getValue()));
         }
 
+        $filePath = _PS_ORDER_STATE_IMG_DIR_ . $orderState->id . '.gif';
+        $file = file_exists($filePath) ? new SplFileInfo($filePath) : null;
+
         return new EditableOrderState(
             $orderStateId,
             $orderState->name,
+            $file,
             $orderState->color,
             (bool) $orderState->logable,
             (bool) $orderState->invoice,
diff --git a/src/Core/Domain/OrderState/Command/AddOrderStateCommand.php b/src/Core/Domain/OrderState/Command/AddOrderStateCommand.php
index 008ebf754a2d1..6541517a2b173 100644
--- a/src/Core/Domain/OrderState/Command/AddOrderStateCommand.php
+++ b/src/Core/Domain/OrderState/Command/AddOrderStateCommand.php
@@ -84,6 +84,26 @@ class AddOrderStateCommand
      */
     private $localizedTemplates;
 
+    /**
+     * @var string|null
+     */
+    protected $pathName;
+
+    /**
+     * @var int|null
+     */
+    protected $fileSize;
+
+    /**
+     * @var string|null
+     */
+    protected $mimeType;
+
+    /**
+     * @var string|null
+     */
+    protected $originalName;
+
     /**
      * @param string[] $localizedNames
      * @param string[] $localizedTemplates
@@ -229,4 +249,54 @@ public function getLocalizedTemplates()
     {
         return $this->localizedTemplates;
     }
+
+    /**
+     * @param string $pathName
+     * @param int $fileSize
+     * @param string $mimeType
+     * @param string $originalName
+     */
+    public function setFileInformation(
+        string $pathName,
+        int $fileSize,
+        string $mimeType,
+        string $originalName
+    ): void {
+        $this->pathName = $pathName;
+        $this->fileSize = $fileSize;
+        $this->mimeType = $mimeType;
+        $this->originalName = $originalName;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getFilePathName(): ?string
+    {
+        return $this->pathName;
+    }
+
+    /**
+     * @return int|null
+     */
+    public function getFileSize(): ?int
+    {
+        return $this->fileSize;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getMimeType(): ?string
+    {
+        return $this->mimeType;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getOriginalName(): ?string
+    {
+        return $this->originalName;
+    }
 }
diff --git a/src/Core/Domain/OrderState/Command/EditOrderStateCommand.php b/src/Core/Domain/OrderState/Command/EditOrderStateCommand.php
index afdb11ffc8550..bb21a383f5e67 100644
--- a/src/Core/Domain/OrderState/Command/EditOrderStateCommand.php
+++ b/src/Core/Domain/OrderState/Command/EditOrderStateCommand.php
@@ -106,6 +106,26 @@ class EditOrderStateCommand
      */
     private $template;
 
+    /**
+     * @var string|null
+     */
+    protected $pathName;
+
+    /**
+     * @var int|null
+     */
+    protected $fileSize;
+
+    /**
+     * @var string|null
+     */
+    protected $mimeType;
+
+    /**
+     * @var string|null
+     */
+    protected $originalName;
+
     /**
      * @param int $orderStateId
      */
@@ -339,4 +359,54 @@ public function setTemplate(?array $template)
 
         return $this;
     }
+
+    /**
+     * @param string $pathName
+     * @param int $fileSize
+     * @param string $mimeType
+     * @param string $originalName
+     */
+    public function setFileInformation(
+        string $pathName,
+        int $fileSize,
+        string $mimeType,
+        string $originalName
+    ): void {
+        $this->pathName = $pathName;
+        $this->fileSize = $fileSize;
+        $this->mimeType = $mimeType;
+        $this->originalName = $originalName;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getFilePathName(): ?string
+    {
+        return $this->pathName;
+    }
+
+    /**
+     * @return int|null
+     */
+    public function getFileSize(): ?int
+    {
+        return $this->fileSize;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getMimeType(): ?string
+    {
+        return $this->mimeType;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getOriginalName(): ?string
+    {
+        return $this->originalName;
+    }
 }
diff --git a/src/Core/Domain/OrderState/Exception/OrderStateConstraintException.php b/src/Core/Domain/OrderState/Exception/OrderStateConstraintException.php
index d3138793d9d42..f3c0fdb3447bb 100644
--- a/src/Core/Domain/OrderState/Exception/OrderStateConstraintException.php
+++ b/src/Core/Domain/OrderState/Exception/OrderStateConstraintException.php
@@ -40,4 +40,8 @@ class OrderStateConstraintException extends OrderStateException
      * @var int Code is used when empty name is provided for order state
      */
     public const EMPTY_NAME = 2;
+    /**
+     * @var int
+     */
+    public const INVALID_FILE_SIZE = 3;
 }
diff --git a/src/Core/Domain/OrderState/Exception/OrderStateUploadFailedException.php b/src/Core/Domain/OrderState/Exception/OrderStateUploadFailedException.php
new file mode 100644
index 0000000000000..ea0b2a8be3848
--- /dev/null
+++ b/src/Core/Domain/OrderState/Exception/OrderStateUploadFailedException.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\OrderState\Exception;
+
+/**
+ * Class OrderStateUploadFailedException
+ */
+class OrderStateUploadFailedException extends OrderStateException
+{
+}
diff --git a/src/Core/Domain/OrderState/OrderStateFileUploaderInterface.php b/src/Core/Domain/OrderState/OrderStateFileUploaderInterface.php
new file mode 100644
index 0000000000000..25965c0d5fb3d
--- /dev/null
+++ b/src/Core/Domain/OrderState/OrderStateFileUploaderInterface.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Domain\OrderState;
+
+interface OrderStateFileUploaderInterface
+{
+    /**
+     * @param string $filePath
+     * @param int $id
+     * @param int $fileSize
+     */
+    public function upload(string $filePath, int $id, int $fileSize): void;
+}
diff --git a/src/Core/Domain/OrderState/QueryResult/EditableOrderState.php b/src/Core/Domain/OrderState/QueryResult/EditableOrderState.php
index c693340e96409..9b83aa43a9351 100644
--- a/src/Core/Domain/OrderState/QueryResult/EditableOrderState.php
+++ b/src/Core/Domain/OrderState/QueryResult/EditableOrderState.php
@@ -28,6 +28,7 @@
 namespace PrestaShop\PrestaShop\Core\Domain\OrderState\QueryResult;
 
 use PrestaShop\PrestaShop\Core\Domain\OrderState\ValueObject\OrderStateId;
+use SplFileInfo;
 
 /**
  * Stores editable data for order state
@@ -42,6 +43,10 @@ class EditableOrderState
      * @var array
      */
     private $localizedNames;
+    /**
+     * @var SplFileInfo|null
+     */
+    protected $icon;
     /**
      * @var string
      */
@@ -94,6 +99,7 @@ class EditableOrderState
     public function __construct(
         OrderStateId $orderStateId,
         array $name,
+        ?SplFileInfo $icon,
         string $color,
         bool $loggable,
         bool $invoice,
@@ -109,6 +115,7 @@ public function __construct(
     ) {
         $this->orderStateId = $orderStateId;
         $this->localizedNames = $name;
+        $this->icon = $icon;
         $this->color = $color;
         $this->loggable = $loggable;
         $this->invoice = $invoice;
@@ -234,4 +241,12 @@ public function getLocalizedTemplates()
     {
         return $this->localizedTemplates;
     }
+
+    /**
+     * @return SplFileInfo|null
+     */
+    public function getIcon(): ?SplFileInfo
+    {
+        return $this->icon;
+    }
 }
diff --git a/src/Core/Form/IdentifiableObject/DataHandler/OrderStateFormDataHandler.php b/src/Core/Form/IdentifiableObject/DataHandler/OrderStateFormDataHandler.php
index 3e5bf0de2873f..c98c97c5f2b1c 100644
--- a/src/Core/Form/IdentifiableObject/DataHandler/OrderStateFormDataHandler.php
+++ b/src/Core/Form/IdentifiableObject/DataHandler/OrderStateFormDataHandler.php
@@ -31,6 +31,7 @@
 use PrestaShop\PrestaShop\Core\Domain\OrderState\Command\AddOrderStateCommand;
 use PrestaShop\PrestaShop\Core\Domain\OrderState\Command\EditOrderStateCommand;
 use PrestaShop\PrestaShop\Core\Domain\OrderState\ValueObject\OrderStateId;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 /**
  * Saves or updates order state data submitted in form
@@ -91,6 +92,18 @@ private function buildOrderStateAddCommandFromFormData(array $data)
             $data['template']
         );
 
+        if (isset($data['icon'])) {
+            /** @var UploadedFile $fileObject */
+            $fileObject = $data['icon'];
+
+            $command->setFileInformation(
+                $fileObject->getPathname(),
+                $fileObject->getSize(),
+                $fileObject->getMimeType(),
+                $fileObject->getClientOriginalName()
+            );
+        }
+
         return $command;
     }
 
@@ -116,6 +129,18 @@ private function buildOrderStateEditCommand($orderStateId, array $data)
             ->setTemplate($data['template'])
         ;
 
+        /** @var UploadedFile|null $fileObject */
+        $fileObject = $data['icon'];
+
+        if ($fileObject instanceof UploadedFile) {
+            $command->setFileInformation(
+                $fileObject->getPathname(),
+                $fileObject->getSize(),
+                $fileObject->getMimeType(),
+                $fileObject->getClientOriginalName()
+            );
+        }
+
         return $command;
     }
 }
diff --git a/src/Core/Form/IdentifiableObject/DataProvider/OrderReturnStateFormDataProvider.php b/src/Core/Form/IdentifiableObject/DataProvider/OrderReturnStateFormDataProvider.php
index 6563c0f93a3b0..803600c1846c6 100644
--- a/src/Core/Form/IdentifiableObject/DataProvider/OrderReturnStateFormDataProvider.php
+++ b/src/Core/Form/IdentifiableObject/DataProvider/OrderReturnStateFormDataProvider.php
@@ -66,10 +66,8 @@ public function getData($orderStateId)
      */
     public function getDefaultData()
     {
-        $data = [
-            'is_enabled' => true,
+        return [
+            'color' => '#ffffff',
         ];
-
-        return $data;
     }
 }
diff --git a/src/Core/Form/IdentifiableObject/DataProvider/OrderStateFormDataProvider.php b/src/Core/Form/IdentifiableObject/DataProvider/OrderStateFormDataProvider.php
index 86f9822087b61..496f6400d7aea 100644
--- a/src/Core/Form/IdentifiableObject/DataProvider/OrderStateFormDataProvider.php
+++ b/src/Core/Form/IdentifiableObject/DataProvider/OrderStateFormDataProvider.php
@@ -76,10 +76,8 @@ public function getData($orderStateId)
      */
     public function getDefaultData()
     {
-        $data = [
-            'is_enabled' => true,
+        return [
+            'color' => '#ffffff',
         ];
-
-        return $data;
     }
 }
diff --git a/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderReturnStates/OrderReturnStateType.php b/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderReturnStates/OrderReturnStateType.php
index 7c32ca117fa9b..5d3de90bbc147 100644
--- a/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderReturnStates/OrderReturnStateType.php
+++ b/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderReturnStates/OrderReturnStateType.php
@@ -72,7 +72,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add('color', ColorPickerType::class, [
                 'label' => $this->trans('Color', 'Admin.Shopparameters.Feature'),
                 'help' => $this->trans('Status will be highlighted in this color. HTML colors only.', 'Admin.Shopparameters.Help'),
-                'required' => true,
+                'required' => false,
             ])
         ;
     }
diff --git a/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderStates/OrderStateType.php b/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderStates/OrderStateType.php
index 3924b22039f77..ba3225bfd763b 100644
--- a/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderStates/OrderStateType.php
+++ b/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderStates/OrderStateType.php
@@ -38,6 +38,7 @@
 use PrestaShopBundle\Form\Admin\Type\TranslatableType;
 use PrestaShopBundle\Form\Admin\Type\TranslatorAwareType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\FileType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -133,8 +134,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     ],
                 ],
             ])
+            ->add('icon', FileType::class, [
+                'required' => false,
+                'label' => $this->trans('Icon', 'Admin.Shopparameters.Feature'),
+                'help' => $this->trans('Upload an icon from your computer (File type: .gif, suggested size: 16x16).', 'Admin.Shopparameters.Help'),
+            ])
             ->add('color', ColorPickerType::class, [
-                'required' => true,
+                'required' => false,
                 'label' => $this->trans('Color', 'Admin.Shopparameters.Feature'),
                 'help' => $this->trans('Status will be highlighted in this color. HTML colors only.', 'Admin.Shopparameters.Help'),
             ])
@@ -202,7 +208,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 ],
             ])
             ->add('template', TranslatableChoiceType::class, [
-                'label' => $this->trans('Email template', 'Admin.Shopparameters.Feature'),
+                'label' => $this->trans('Template', 'Admin.Shopparameters.Feature'),
                 'hint' => sprintf(
                     '%s<br>%s',
                     $this->trans('Only letters, numbers and underscores ("_") are allowed.', 'Admin.Shopparameters.Help'),
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/order_state.yml b/src/PrestaShopBundle/Resources/config/services/adapter/order_state.yml
index f69f7acd2eb16..4a5cd8c111350 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/order_state.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/order_state.yml
@@ -5,6 +5,8 @@ services:
   prestashop.adapter.order_state.command_handler.add_order_state:
     class: 'PrestaShop\PrestaShop\Adapter\OrderState\CommandHandler\AddOrderStateHandler'
     autoconfigure: true
+    arguments:
+      - '@PrestaShop\PrestaShop\Adapter\File\Uploader\OrderStateFileUploader'
 
   prestashop.adapter.order_state.query_handler.get_order_state_for_editing:
     class: 'PrestaShop\PrestaShop\Adapter\OrderState\QueryHandler\GetOrderStateForEditingHandler'
@@ -13,6 +15,8 @@ services:
   prestashop.adapter.order_state.command_handler.edit_order_state_handler:
     class: 'PrestaShop\PrestaShop\Adapter\OrderState\CommandHandler\EditOrderStateHandler'
     autoconfigure: true
+    arguments:
+      - '@PrestaShop\PrestaShop\Adapter\File\Uploader\OrderStateFileUploader'
 
   prestashop.adapter.order_state.command_handler.delete_order_state_handler:
     class: 'PrestaShop\PrestaShop\Adapter\OrderState\CommandHandler\DeleteOrderStateHandler'
@@ -21,3 +25,7 @@ services:
   prestashop.adapter.order_state.command_handler.bulk_delete_order_state_handler:
     class: 'PrestaShop\PrestaShop\Adapter\OrderState\CommandHandler\BulkDeleteOrderStateHandler'
     autoconfigure: true
+
+  PrestaShop\PrestaShop\Adapter\File\Uploader\OrderStateFileUploader:
+    arguments:
+      - '@prestashop.core.configuration.upload_size_configuration'

From 5e9c40a200f00468cfc77aca881f0dcbd4edbdfb Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Tue, 11 Jul 2023 09:52:45 +0200
Subject: [PATCH 0495/1030] Update SqlTranslationLoader ignoreErrors

---
 phpstan-baseline.neon | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index fa66ead4e3f3b..4a6bdf3d84fbc 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -1747,7 +1747,7 @@ parameters:
 
 		-
 			message: "#^Using _DB_PREFIX_ is forbidden, Use dependency injection instead$#"
-			count: 2
+			count: 3
 			path: src/PrestaShopBundle/Translation/Loader/SqlTranslationLoader.php
 
 		-

From 3e1522ea4ea072aa0e5ce6498608da89f22e7e2c Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Thu, 6 Jul 2023 18:35:23 +0200
Subject: [PATCH 0496/1030] Add filter on tax is active

---
 classes/tax/TaxRulesGroup.php                      | 3 ++-
 controllers/admin/AdminTaxRulesGroupController.php | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/classes/tax/TaxRulesGroup.php b/classes/tax/TaxRulesGroup.php
index 964d7f05666e0..025af52be1f0d 100644
--- a/classes/tax/TaxRulesGroup.php
+++ b/classes/tax/TaxRulesGroup.php
@@ -187,11 +187,12 @@ private static function getTaxRulesGroupsData($onlyActive = true, bool $includeR
                 INNER JOIN ' . _DB_PREFIX_ . 'tax_rule tr
                 ON g.id_tax_rules_group = tr.id_tax_rules_group
                 INNER JOIN ' . _DB_PREFIX_ . 'tax t
-                ON tr.id_tax = t.id_tax
+                ON (tr.id_tax = t.id_tax AND t.active = 1)
             ';
         }
 
         $sql .= Shop::addSqlAssociation('tax_rules_group', 'g') . ' WHERE g.deleted = 0'
+            . ($onlyActive ? ' AND g.`active` = 1' : '')
             . ($onlyActive ? ' AND g.`active` = 1' : '')
             . ' ORDER BY name ASC';
 
diff --git a/controllers/admin/AdminTaxRulesGroupController.php b/controllers/admin/AdminTaxRulesGroupController.php
index bceab616b618e..c9abfed7fe685 100644
--- a/controllers/admin/AdminTaxRulesGroupController.php
+++ b/controllers/admin/AdminTaxRulesGroupController.php
@@ -153,7 +153,7 @@ public function initRulesList($id_group)
 			LEFT JOIN `' . _DB_PREFIX_ . 'state` s
 				ON (a.`id_state` = s.`id_state`)
 			LEFT JOIN `' . _DB_PREFIX_ . 'tax` t
-				ON (a.`id_tax` = t.`id_tax`)';
+				ON (a.`id_tax` = t.`id_tax` AND t.active = 1)';
         $this->_where = 'AND `id_tax_rules_group` = ' . (int) $id_group;
         $this->_use_found_rows = false;
 

From eb989c272539643e0226bd2916f9c96c58af6740 Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Tue, 6 Jun 2023 17:05:39 +0200
Subject: [PATCH 0497/1030] Type hint front controllers

---
 classes/controller/FrontController.php        |  2 +-
 controllers/front/AttachmentController.php    |  2 +-
 controllers/front/CartController.php          |  6 ++---
 controllers/front/CmsController.php           |  2 +-
 controllers/front/DiscountController.php      | 25 +++++++++++++------
 controllers/front/GetFileController.php       |  2 +-
 controllers/front/HistoryController.php       |  4 +--
 .../front/OrderConfirmationController.php     |  4 +--
 controllers/front/OrderReturnController.php   |  4 +--
 controllers/front/PageNotFoundController.php  |  2 +-
 controllers/front/ProductController.php       | 18 ++++++-------
 controllers/front/StoresController.php        |  2 +-
 .../front/listing/CategoryController.php      |  4 +--
 .../front/listing/ManufacturerController.php  |  2 +-
 .../front/listing/SupplierController.php      |  2 +-
 .../02_conditions/01_limitToSingleCustomer.ts |  2 +-
 .../classic/03_userAccount/03_viewVouchers.ts |  2 +-
 17 files changed, 48 insertions(+), 37 deletions(-)

diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php
index 09ab27a1ca09d..ec6ab3e2b3c66 100644
--- a/classes/controller/FrontController.php
+++ b/classes/controller/FrontController.php
@@ -778,7 +778,7 @@ protected function sslRedirection()
      *
      * @param string $canonical_url
      */
-    protected function canonicalRedirection($canonical_url = '')
+    protected function canonicalRedirection(string $canonical_url = '')
     {
         if (!$canonical_url || !Configuration::get('PS_CANONICAL_REDIRECT') || strtoupper($_SERVER['REQUEST_METHOD']) != 'GET') {
             return;
diff --git a/controllers/front/AttachmentController.php b/controllers/front/AttachmentController.php
index c13d177381391..92d810bb918e5 100644
--- a/controllers/front/AttachmentController.php
+++ b/controllers/front/AttachmentController.php
@@ -50,7 +50,7 @@ public function postProcess()
     /**
      * @see   http://ca2.php.net/manual/en/function.readfile.php#54295
      */
-    public function readfileChunked($filename, $retbytes = true)
+    public function readfileChunked(string $filename, bool $retbytes = true)
     {
         // how many bytes per chunk
         $chunksize = 1 * (1024 * 1024);
diff --git a/controllers/front/CartController.php b/controllers/front/CartController.php
index 7d3820356907a..73f3a80ab2b45 100644
--- a/controllers/front/CartController.php
+++ b/controllers/front/CartController.php
@@ -56,7 +56,7 @@ class CartControllerCore extends FrontController
      *
      * @param string $canonicalURL
      */
-    public function canonicalRedirection($canonicalURL = '')
+    public function canonicalRedirection(string $canonicalURL = '')
     {
     }
 
@@ -538,7 +538,7 @@ protected function processChangeProductInCart()
      *
      * @return bool
      */
-    public function productInCartMatchesCriteria($productInCart)
+    public function productInCartMatchesCriteria(array $productInCart)
     {
         return (
             !isset($this->id_product_attribute) ||
@@ -582,7 +582,7 @@ public function getTemplateVarPage()
      *
      * @return bool
      */
-    protected function shouldAvailabilityErrorBeRaised($product, $qtyToCheck)
+    protected function shouldAvailabilityErrorBeRaised(Product $product, int $qtyToCheck)
     {
         if (($this->id_product_attribute)) {
             return !Product::isAvailableWhenOutOfStock($product->out_of_stock)
diff --git a/controllers/front/CmsController.php b/controllers/front/CmsController.php
index 774eeae6d7745..e8463819da481 100644
--- a/controllers/front/CmsController.php
+++ b/controllers/front/CmsController.php
@@ -45,7 +45,7 @@ class CmsControllerCore extends FrontController
     /** @var bool */
     public $ssl = false;
 
-    public function canonicalRedirection($canonicalURL = '')
+    public function canonicalRedirection(string $canonicalURL = '')
     {
         if (Validate::isLoadedObject($this->cms) && ($canonicalURL = $this->context->link->getCMSLink($this->cms, $this->cms->link_rewrite, $this->ssl))) {
             parent::canonicalRedirection($canonicalURL);
diff --git a/controllers/front/DiscountController.php b/controllers/front/DiscountController.php
index 82c6c0633fd18..92f0820dcd8a5 100644
--- a/controllers/front/DiscountController.php
+++ b/controllers/front/DiscountController.php
@@ -104,7 +104,7 @@ public function getBreadcrumbLinks()
      *
      * @return mixed
      */
-    protected function getCombinableVoucherTranslation($voucher)
+    protected function getCombinableVoucherTranslation(array $voucher)
     {
         if ($voucher['cart_rule_restriction']) {
             $combinableVoucherTranslation = $this->trans('No', [], 'Shop.Theme.Global');
@@ -116,13 +116,15 @@ protected function getCombinableVoucherTranslation($voucher)
     }
 
     /**
+     * Formats a value of a voucher with fixed reduction
+     *
      * @param bool $hasTaxIncluded
      * @param float $amount
      * @param int $currencyId
      *
      * @return string
      */
-    protected function formatReductionAmount($hasTaxIncluded, $amount, $currencyId)
+    protected function formatReductionAmount(bool $hasTaxIncluded, float $amount, int $currencyId)
     {
         if ($hasTaxIncluded) {
             $taxTranslation = $this->trans('Tax included', [], 'Shop.Theme.Checkout');
@@ -137,32 +139,36 @@ protected function formatReductionAmount($hasTaxIncluded, $amount, $currencyId)
     }
 
     /**
+     * Formats a value of a voucher with percentage reduction
+     *
      * @param float $percentage
      *
      * @return string
      */
-    protected function formatReductionInPercentage($percentage)
+    protected function formatReductionInPercentage(float $percentage)
     {
         return sprintf('%s%%', $percentage);
     }
 
     /**
+     * Formats all reductions and benefits of a voucher. (One voucher can provide a discount and gift at the same time.)
+     *
      * @param array $voucher
      *
      * @return array
      */
-    protected function accumulateCartRuleValue($voucher)
+    protected function accumulateCartRuleValue(array $voucher)
     {
         $cartRuleValue = [];
 
         if ($voucher['reduction_percent'] > 0) {
-            $cartRuleValue[] = $this->formatReductionInPercentage($voucher['reduction_percent']);
+            $cartRuleValue[] = $this->formatReductionInPercentage((float) $voucher['reduction_percent']);
         }
 
         if ($voucher['reduction_amount'] > 0) {
             $cartRuleValue[] = $this->formatReductionAmount(
-                $voucher['reduction_tax'],
-                $voucher['reduction_amount'],
+                (bool) $voucher['reduction_tax'],
+                (float) $voucher['reduction_amount'],
                 $voucher['reduction_currency']
             );
         }
@@ -182,6 +188,8 @@ protected function accumulateCartRuleValue($voucher)
     }
 
     /**
+     * Prepares a single row of voucher table to show it to customer.
+     *
      * @param array $voucher
      *
      * @return array
@@ -201,8 +209,11 @@ protected function buildCartRuleFromVoucher(array $voucher): array
 
         $voucher['voucher_cumulable'] = $this->getCombinableVoucherTranslation($voucher);
 
+        // Get all benefits of this voucher into array (discount, gift, free shipping etc.)
         $cartRuleValues = $this->accumulateCartRuleValue($voucher);
 
+        // And combine them into a string
+        // If for some magical reason the voucher has no benefit (should not be achievable in BO), we display a dash
         if (0 === count($cartRuleValues)) {
             $voucher['value'] = '-';
         } else {
diff --git a/controllers/front/GetFileController.php b/controllers/front/GetFileController.php
index c0588e3cd9b1a..7fcc88e147b82 100644
--- a/controllers/front/GetFileController.php
+++ b/controllers/front/GetFileController.php
@@ -336,7 +336,7 @@ private function getMimeType(string $file, string $filename): string
      *
      * @param string $msg
      */
-    protected function displayCustomError($msg)
+    protected function displayCustomError(string $msg)
     {
         $translations = [
             'Invalid key.' => $this->trans('Invalid key.', [], 'Shop.Notifications.Error'),
diff --git a/controllers/front/HistoryController.php b/controllers/front/HistoryController.php
index 427fa1aa4a44c..b1d8c4801a29e 100644
--- a/controllers/front/HistoryController.php
+++ b/controllers/front/HistoryController.php
@@ -85,7 +85,7 @@ public function getTemplateVarOrders()
      *
      * @return string
      */
-    public static function getUrlToInvoice($order, $context)
+    public static function getUrlToInvoice(Order $order, Context $context)
     {
         $url_to_invoice = '';
 
@@ -109,7 +109,7 @@ public static function getUrlToInvoice($order, $context)
      *
      * @return string
      */
-    public static function getUrlToReorder($id_order, $context)
+    public static function getUrlToReorder(int $id_order, Context $context)
     {
         $url_to_reorder = '';
         if (!(bool) Configuration::get('PS_DISALLOW_HISTORY_REORDERING')) {
diff --git a/controllers/front/OrderConfirmationController.php b/controllers/front/OrderConfirmationController.php
index 8953b8ab0e791..3bd6dc6fa1b01 100644
--- a/controllers/front/OrderConfirmationController.php
+++ b/controllers/front/OrderConfirmationController.php
@@ -232,7 +232,7 @@ public function initContent()
     /**
      * Execute the hook displayPaymentReturn.
      */
-    public function displayPaymentReturn($order)
+    public function displayPaymentReturn(Order $order)
     {
         if (!Validate::isUnsignedId($this->id_module)) {
             return false;
@@ -244,7 +244,7 @@ public function displayPaymentReturn($order)
     /**
      * Execute the hook displayOrderConfirmation.
      */
-    public function displayOrderConfirmation($order)
+    public function displayOrderConfirmation(Order $order)
     {
         return Hook::exec('displayOrderConfirmation', ['order' => $order]);
     }
diff --git a/controllers/front/OrderReturnController.php b/controllers/front/OrderReturnController.php
index 3c266e1aaaf8b..125c842ff6966 100644
--- a/controllers/front/OrderReturnController.php
+++ b/controllers/front/OrderReturnController.php
@@ -92,7 +92,7 @@ public function initContent()
         $this->setTemplate('customer/order-return');
     }
 
-    public function getTemplateVarOrderReturn($orderReturn)
+    public function getTemplateVarOrderReturn(OrderReturn $orderReturn)
     {
         $orderReturns = OrderReturn::getOrdersReturn($orderReturn->id_customer, $orderReturn->id_order, false, null, $orderReturn->id);
 
@@ -108,7 +108,7 @@ public function getTemplateVarOrderReturn($orderReturn)
         return $orderReturnPresenter->present(array_shift($orderReturns));
     }
 
-    public function getTemplateVarProducts($order_return_id, $order)
+    public function getTemplateVarProducts(int $order_return_id, Order $order)
     {
         $products = [];
         $return_products = OrderReturn::getOrdersReturnProducts((int) $order_return_id, $order);
diff --git a/controllers/front/PageNotFoundController.php b/controllers/front/PageNotFoundController.php
index 4f9b81f6a87a9..e3b2390870c13 100644
--- a/controllers/front/PageNotFoundController.php
+++ b/controllers/front/PageNotFoundController.php
@@ -46,7 +46,7 @@ public function initContent()
         $this->setTemplate('errors/404');
     }
 
-    protected function canonicalRedirection($canonical_url = '')
+    protected function canonicalRedirection(string $canonical_url = '')
     {
         // 404 - no need to redirect to the canonical url
     }
diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php
index 198a8bf98a8d7..3ca1a51e04933 100644
--- a/controllers/front/ProductController.php
+++ b/controllers/front/ProductController.php
@@ -74,7 +74,7 @@ class ProductControllerCore extends ProductPresentingFrontControllerCore
      */
     protected $isPreview = false;
 
-    public function canonicalRedirection($canonical_url = '')
+    public function canonicalRedirection(string $canonical_url = '')
     {
         // This is there to prevent error, because this function is also called
         // in parent front controller before we have even loaded our data.
@@ -601,7 +601,7 @@ protected function assignPriceAndTax()
     /**
      * Assign template vars related to attribute groups and colors.
      */
-    protected function assignAttributesGroups($product_for_template = null)
+    protected function assignAttributesGroups(ProductLazyArray|null $product_for_template = null)
     {
         $colors = [];
         $groups = [];
@@ -876,7 +876,7 @@ protected function assignCategory()
         }
     }
 
-    protected function transformDescriptionWithImg($desc)
+    protected function transformDescriptionWithImg(string $desc)
     {
         $reg = '/\[img\-([0-9]+)\-(left|right)\-([a-zA-Z0-9-_]+)\]/';
         while (preg_match($reg, $desc, $matches)) {
@@ -966,7 +966,7 @@ protected function textRecord()
      *
      * @return array
      */
-    protected function formatQuantityDiscounts($specific_prices, $price, $tax_rate, $ecotax_amount)
+    protected function formatQuantityDiscounts(array $specific_prices, float $price, float $tax_rate, float $ecotax_amount)
     {
         $priceCalculationMethod = Group::getPriceDisplayMethod(Group::getCurrent()->id);
         $isTaxIncluded = false;
@@ -1058,7 +1058,7 @@ private function getIdProductAttributeByGroupOrRequestOrDefault()
      *
      * @return int
      */
-    protected function tryToGetAvailableIdProductAttribute($checkedIdProductAttribute)
+    protected function tryToGetAvailableIdProductAttribute(int $checkedIdProductAttribute)
     {
         if (!Configuration::get('PS_DISP_UNAVAILABLE_ATTR')) {
             $productCombinations = $this->product->getAttributeCombinations();
@@ -1220,7 +1220,7 @@ public function getTemplateVarProduct()
      *
      * @return int
      */
-    protected function getProductMinimalQuantity($product)
+    protected function getProductMinimalQuantity(ProductLazyArray|array $product)
     {
         $minimal_quantity = 1;
 
@@ -1272,7 +1272,7 @@ protected function getProductEcotax(array $product): float
      *
      * @return ProductController|null
      */
-    public function findProductCombinationById($combinationId)
+    public function findProductCombinationById(int $combinationId)
     {
         $combinations = $this->product->getAttributesGroups($this->context->language->id, $combinationId);
 
@@ -1288,7 +1288,7 @@ public function findProductCombinationById($combinationId)
      *
      * @return int
      */
-    protected function getRequiredQuantity($product)
+    protected function getRequiredQuantity(array $product)
     {
         $requiredQuantity = (int) Tools::getValue('quantity_wanted', $this->getProductMinimalQuantity($product));
         if ($requiredQuantity < $product['minimal_quantity']) {
@@ -1499,7 +1499,7 @@ private function getProductPageTitle(array $meta = null)
      *
      * @return bool
      */
-    protected function isValidCombination($productAttributeId, $productId)
+    protected function isValidCombination(int $productAttributeId, int $productId)
     {
         if ($productAttributeId > 0 && $productId > 0) {
             $combination = new Combination($productAttributeId);
diff --git a/controllers/front/StoresController.php b/controllers/front/StoresController.php
index 1ac0d1817b9ee..7a4c5dab5458f 100644
--- a/controllers/front/StoresController.php
+++ b/controllers/front/StoresController.php
@@ -40,7 +40,7 @@ class StoresControllerCore extends FrontController
      *
      * @return string
      */
-    protected function processStoreAddress($store)
+    protected function processStoreAddress(array $store)
     {
         $ignore_field = [
             'firstname',
diff --git a/controllers/front/listing/CategoryController.php b/controllers/front/listing/CategoryController.php
index 7915a9568192b..2dde7d13b5b2b 100644
--- a/controllers/front/listing/CategoryController.php
+++ b/controllers/front/listing/CategoryController.php
@@ -44,7 +44,7 @@ class CategoryControllerCore extends ProductListingFrontController
      */
     protected $category;
 
-    public function canonicalRedirection($canonicalURL = '')
+    public function canonicalRedirection(string $canonicalURL = '')
     {
         if (Validate::isLoadedObject($this->category)) {
             parent::canonicalRedirection($this->context->link->getCategoryLink($this->category));
@@ -232,7 +232,7 @@ protected function getTemplateVarSubCategories()
         }, $this->category->getSubCategories($this->context->language->id));
     }
 
-    protected function getImage($object, $id_image)
+    protected function getImage(Category $object, int $id_image)
     {
         $retriever = new ImageRetriever(
             $this->context->link
diff --git a/controllers/front/listing/ManufacturerController.php b/controllers/front/listing/ManufacturerController.php
index b64708c381448..5c3ddf0aa2997 100644
--- a/controllers/front/listing/ManufacturerController.php
+++ b/controllers/front/listing/ManufacturerController.php
@@ -40,7 +40,7 @@ class ManufacturerControllerCore extends ProductListingFrontController
     /** @var ManufacturerPresenter */
     protected $manufacturerPresenter;
 
-    public function canonicalRedirection($canonicalURL = '')
+    public function canonicalRedirection(string $canonicalURL = '')
     {
         if (Validate::isLoadedObject($this->manufacturer)) {
             parent::canonicalRedirection($this->context->link->getManufacturerLink($this->manufacturer));
diff --git a/controllers/front/listing/SupplierController.php b/controllers/front/listing/SupplierController.php
index 29e267ee74fda..2da67b720d7a5 100644
--- a/controllers/front/listing/SupplierController.php
+++ b/controllers/front/listing/SupplierController.php
@@ -40,7 +40,7 @@ class SupplierControllerCore extends ProductListingFrontController
     /** @var SupplierPresenter */
     protected $supplierPresenter;
 
-    public function canonicalRedirection($canonicalURL = '')
+    public function canonicalRedirection(string $canonicalURL = '')
     {
         if (Validate::isLoadedObject($this->supplier)) {
             parent::canonicalRedirection($this->context->link->getSupplierLink($this->supplier));
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/01_limitToSingleCustomer.ts b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/01_limitToSingleCustomer.ts
index 7cd0a4b206575..838e6f22ebc85 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/01_limitToSingleCustomer.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/01_limitToSingleCustomer.ts
@@ -143,7 +143,7 @@ describe('BO - Catalog - Cart rules : Limit to single customer', async () => {
       {args: {column: 'code', value: ''}},
       {args: {column: 'description', value: newCartRuleData.name}},
       {args: {column: 'quantity', value: '1'}},
-      {args: {column: 'value', value: '20.00%'}},
+      {args: {column: 'value', value: '20%'}},
       {args: {column: 'minimum', value: 'None'}},
       {args: {column: 'cumulative', value: 'Yes'}},
       {args: {column: 'expiration_date', value: expirationDate}},
diff --git a/tests/UI/campaigns/functional/FO/classic/03_userAccount/03_viewVouchers.ts b/tests/UI/campaigns/functional/FO/classic/03_userAccount/03_viewVouchers.ts
index 3a050c23b8ed5..3cb8b69a9bfe4 100644
--- a/tests/UI/campaigns/functional/FO/classic/03_userAccount/03_viewVouchers.ts
+++ b/tests/UI/campaigns/functional/FO/classic/03_userAccount/03_viewVouchers.ts
@@ -118,7 +118,7 @@ describe('FO - Account : View vouchers', async () => {
       {args: {column: 'code', row: 1, value: firstCartRule.code}},
       {args: {column: 'description', row: 1, value: firstCartRule.name}},
       {args: {column: 'quantity', row: 1, value: '1'}},
-      {args: {column: 'value', row: 1, value: '20.00%'}},
+      {args: {column: 'value', row: 1, value: '20%'}},
       {args: {column: 'minimum', row: 1, value: 'None'}},
       {args: {column: 'cumulative', row: 1, value: 'Yes'}},
       {args: {column: 'expiration_date', row: 1, value: expirationDate}},

From 8a40d3f4e487e41f7b2b8143104ac22d4001f0a6 Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Tue, 11 Jul 2023 10:40:30 +0200
Subject: [PATCH 0498/1030] Format number according to locale

---
 controllers/front/DiscountController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controllers/front/DiscountController.php b/controllers/front/DiscountController.php
index 92f0820dcd8a5..bf982fea7d8a8 100644
--- a/controllers/front/DiscountController.php
+++ b/controllers/front/DiscountController.php
@@ -147,7 +147,7 @@ protected function formatReductionAmount(bool $hasTaxIncluded, float $amount, in
      */
     protected function formatReductionInPercentage(float $percentage)
     {
-        return sprintf('%s%%', $percentage);
+        return sprintf('%s%%', $this->context->getCurrentLocale()->formatNumber($percentage));
     }
 
     /**

From aff4bc61e0e0d99418241a9105b1988e806b3ee8 Mon Sep 17 00:00:00 2001
From: matthieu-rolland <matthieu.rolland@prestashop.com>
Date: Tue, 11 Jul 2023 11:12:59 +0200
Subject: [PATCH 0499/1030] add missing html attributes

---
 classes/Validate.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/classes/Validate.php b/classes/Validate.php
index d7679ea4df58f..8feb706aaabee 100644
--- a/classes/Validate.php
+++ b/classes/Validate.php
@@ -521,6 +521,7 @@ public static function isCleanHtml($html, $allow_iframe = false)
         $events .= '|ondragleave|ondragover|ondragstart|ondrop|onerrorupdate|onfilterchange|onfinish|onfocusin|onfocusout|onhashchange|onhelp|oninput|onlosecapture|onmessage|onmouseup|onmovestart';
         $events .= '|onoffline|ononline|onpaste|onpropertychange|onreadystatechange|onresizeend|onresizestart|onrowenter|onrowexit|onrowsdelete|onrowsinserted|onscroll|onsearch|onselectionchange';
         $events .= '|onselectstart|onstart|onstop|onanimationcancel|onanimationend|onanimationiteration|onanimationstart';
+        $events .= '|onpointerover|onpointerenter|onpointerdown|onpointermove|onpointerup|onpointerout|onpointerleave|onpointercancel|ongotpointercapture|onlostpointercapture';
 
         if (preg_match('/<[\s]*script/ims', $html) || preg_match('/(' . $events . ')[\s]*=/ims', $html) || preg_match('/.*script\:/ims', $html)) {
             return false;

From 48a210ab867bd741e661123de81917d7f30df7c1 Mon Sep 17 00:00:00 2001
From: Daniel Hlavacek <daniel.hlavacek@hotmail.cz>
Date: Tue, 11 Jul 2023 12:19:33 +0200
Subject: [PATCH 0500/1030] Do not drop existing notifications

---
 classes/controller/FrontController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php
index 714ff34131b05..e4d7b2d62bc24 100644
--- a/classes/controller/FrontController.php
+++ b/classes/controller/FrontController.php
@@ -733,10 +733,10 @@ protected function prepareNotifications()
         }
 
         if (session_status() == PHP_SESSION_ACTIVE && isset($_SESSION['notifications'])) {
-            $notifications = array_merge($notifications, json_decode($_SESSION['notifications'], true));
+            $notifications = array_merge_recursive($notifications, json_decode($_SESSION['notifications'], true));
             unset($_SESSION['notifications']);
         } elseif (isset($_COOKIE['notifications'])) {
-            $notifications = array_merge($notifications, json_decode($_COOKIE['notifications'], true));
+            $notifications = array_merge_recursive($notifications, json_decode($_COOKIE['notifications'], true));
             unset($_COOKIE['notifications']);
         }
 

From 7d03a6db42adafc7530cf5d70aedfe6904137fc5 Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Tue, 11 Jul 2023 14:50:40 +0200
Subject: [PATCH 0501/1030] Disable wrapping of maintenance mode

---
 admin-dev/themes/default/template/header.tpl   | 2 +-
 admin-dev/themes/new-theme/template/layout.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin-dev/themes/default/template/header.tpl b/admin-dev/themes/default/template/header.tpl
index 2a69a1ef52138..399e07f127722 100644
--- a/admin-dev/themes/default/template/header.tpl
+++ b/admin-dev/themes/default/template/header.tpl
@@ -239,7 +239,7 @@
 
       {if isset($maintenance_mode) && $maintenance_mode == true}
         {capture name="title"}
-          <p class="text-left text-nowrap">
+          <p class="text-left">
             <strong>{l s='Your store is in maintenance mode.' d='Admin.Navigation.Notification'}</strong>
           </p>
           <p class="text-left">
diff --git a/admin-dev/themes/new-theme/template/layout.tpl b/admin-dev/themes/new-theme/template/layout.tpl
index 17cd247af5b07..af46571e69450 100644
--- a/admin-dev/themes/new-theme/template/layout.tpl
+++ b/admin-dev/themes/new-theme/template/layout.tpl
@@ -55,7 +55,7 @@
 
       {if isset($maintenance_mode) && $maintenance_mode == true}
         {capture name="title"}
-          <p class="text-left text-nowrap">
+          <p class="text-left">
             <strong>{l s='Your store is in maintenance mode.' d='Admin.Navigation.Notification'}</strong>
           </p>
           <p class="text-left">

From 6738c1372ba988434e2a83801b845690064f9473 Mon Sep 17 00:00:00 2001
From: Jonathan Lelievre <jonathan.lelievre@prestashop.com>
Date: Tue, 11 Jul 2023 14:46:33 +0200
Subject: [PATCH 0502/1030] Introduce symfony_layout feature flag and integrate
 it in smarty renderTemplate function

---
 classes/lang/KeysReference/FeatureFlagLang.php             | 3 +++
 config/smarty.config.inc.php                               | 7 ++++---
 install-dev/data/xml/feature_flag.xml                      | 1 +
 src/Core/FeatureFlag/FeatureFlagSettings.php               | 1 +
 .../PrestaShopBundle/Command/FeatureFlagCommandTest.php    | 2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/classes/lang/KeysReference/FeatureFlagLang.php b/classes/lang/KeysReference/FeatureFlagLang.php
index b510b166fa840..930a253af6550 100644
--- a/classes/lang/KeysReference/FeatureFlagLang.php
+++ b/classes/lang/KeysReference/FeatureFlagLang.php
@@ -94,3 +94,6 @@
 
 trans('Features', 'Admin.Advparameters.Feature');
 trans('Enable or disable the migrated features page.', 'Admin.Advparameters.Help');
+
+trans('Symfony layout', 'Admin.Advparameters.Feature');
+trans('Enable / Disable symfony layout (in opposition to legacy layout).', 'Admin.Advparameters.Help');
diff --git a/config/smarty.config.inc.php b/config/smarty.config.inc.php
index ca910bcb888a0..3fb9e1417f231 100644
--- a/config/smarty.config.inc.php
+++ b/config/smarty.config.inc.php
@@ -25,6 +25,8 @@
  */
 
 use PrestaShop\PrestaShop\Adapter\SymfonyContainer;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagStateCheckerInterface;
 
 global $smarty;
 if (Configuration::get('PS_SMARTY_LOCAL')) {
@@ -241,9 +243,8 @@ function renderTemplate(array $params) {
 
     if (
         SymfonyContainer::getInstance()
-            ->get('request_stack')
-            ->getCurrentRequest()
-            ->query->has('symfony_layout')
+            ->get(FeatureFlagStateCheckerInterface::class)
+            ->isEnabled(FeatureFlagSettings::FEATURE_FLAG_SYMFONY_LAYOUT)
     ) {
         /** @var Twig\Environment $twig */
         $twig = SymfonyContainer::getInstance()->get('twig');
diff --git a/install-dev/data/xml/feature_flag.xml b/install-dev/data/xml/feature_flag.xml
index e3c531e8a24d4..22287d24c5b31 100644
--- a/install-dev/data/xml/feature_flag.xml
+++ b/install-dev/data/xml/feature_flag.xml
@@ -26,5 +26,6 @@
     <feature_flag id="customer_threads" name="customer_threads" type="env,dotenv,db" label_wording="Customer threads" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated customer threads page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
     <feature_flag id="order_state" name="order_state" type="env,dotenv,db" label_wording="Order states" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated order states page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
     <feature_flag id="feature" name="feature" type="env,dotenv,db" label_wording="Features" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated features page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
+    <feature_flag id="symfony_layout" name="symfony_layout" type="env,query,dotenv,db" label_wording="Symfony layout" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable symfony layout (in opposition to legacy layout)." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
   </entities>
 </entity_feature_flag>
diff --git a/src/Core/FeatureFlag/FeatureFlagSettings.php b/src/Core/FeatureFlag/FeatureFlagSettings.php
index 12aefecd3af9a..fe91bb923f18f 100644
--- a/src/Core/FeatureFlag/FeatureFlagSettings.php
+++ b/src/Core/FeatureFlag/FeatureFlagSettings.php
@@ -62,4 +62,5 @@ class FeatureFlagSettings
 
     public const FEATURE_FLAG_AUTHORIZATION_SERVER = 'authorization_server';
     public const FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT = 'multiple_image_format';
+    public const FEATURE_FLAG_SYMFONY_LAYOUT = 'symfony_layout';
 }
diff --git a/tests/Integration/PrestaShopBundle/Command/FeatureFlagCommandTest.php b/tests/Integration/PrestaShopBundle/Command/FeatureFlagCommandTest.php
index 2789517c92eaf..1350daa160331 100644
--- a/tests/Integration/PrestaShopBundle/Command/FeatureFlagCommandTest.php
+++ b/tests/Integration/PrestaShopBundle/Command/FeatureFlagCommandTest.php
@@ -118,7 +118,7 @@ private function getFeatureFlagState(KernelInterface $kernel, string $featureFla
         $matches = [];
         preg_match($regexp, $output, $matches);
         $type = $matches[1];
-        $this->assertEquals($type, 'env,dotenv,[db]');
+        $this->assertTrue($type === 'env,dotenv,[db]' || $type === 'env,query,dotenv,[db]');
         $state = $matches[2];
         $this->assertTrue(in_array($state, ['Enabled', 'Disabled']));
 

From c9845934201a86021ff7689c08e66ec0bacf5ee3 Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Tue, 11 Jul 2023 09:59:04 +0200
Subject: [PATCH 0503/1030] Do not delete associated tax to tax rule when
 change tax status

---
 classes/tax/Tax.php | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/classes/tax/Tax.php b/classes/tax/Tax.php
index 5996e8de0e5fa..42dd110330d96 100644
--- a/classes/tax/Tax.php
+++ b/classes/tax/Tax.php
@@ -86,15 +86,6 @@ public function historize()
         return parent::update();
     }
 
-    public function toggleStatus()
-    {
-        if (parent::toggleStatus()) {
-            return $this->_onStatusChange();
-        }
-
-        return false;
-    }
-
     public function update($null_values = false)
     {
         if (!$this->deleted && $this->isUsed()) {
@@ -110,21 +101,12 @@ public function update($null_values = false)
 
             return $res;
         } elseif (parent::update($null_values)) {
-            return $this->_onStatusChange();
+            return true;
         }
 
         return false;
     }
 
-    protected function _onStatusChange()
-    {
-        if (!$this->active) {
-            return TaxRule::deleteTaxRuleByIdTax($this->id);
-        }
-
-        return true;
-    }
-
     /**
      * Returns true if the tax is used in an order details.
      *

From 289505d560e8d1a6e1fe4aba9eaa16bd6bf41da2 Mon Sep 17 00:00:00 2001
From: tleon <thomas.leone@prestashop.com>
Date: Tue, 4 Jul 2023 14:36:26 +0200
Subject: [PATCH 0504/1030] feat(api): Handle partial output for an API based
 on a single DTO

---
 .../UpdateHookStatusCommandHandler.php        |   2 +-
 .../Hook/QueryHandler/GetHookHandler.php      |  52 ++++++++
 .../QueryHandler/GetHookStatusHandler.php     |   2 +-
 .../Hook/Command/UpdateHookStatusCommand.php  |  23 ++--
 src/Core/Domain/Hook/Query/GetHook.php        |  46 +++++++
 src/Core/Domain/Hook/Query/GetHookStatus.php  |  15 +--
 .../QueryHandler/GetHookHandlerInterface.php  |  37 ++++++
 .../NoExtraPropertiesFoundException.php       |  39 ++++++
 .../ApiPlatform/Provider/QueryProvider.php    |  33 ++++-
 .../ApiPlatform/Resources/Hook.php            |  41 ++++--
 .../config/services/adapter/hook.yml          |   4 +
 .../config/services/bundle/services.yml       |   2 -
 .../ApiPlatform/GetHookStatusTest.php         |   4 +-
 tests/Integration/ApiPlatform/GetHookTest.php |  77 +++++++++++
 .../StateProvider/QueryProviderTest.php       | 122 +++++++++++++++---
 15 files changed, 433 insertions(+), 66 deletions(-)
 create mode 100644 src/Adapter/Hook/QueryHandler/GetHookHandler.php
 create mode 100644 src/Core/Domain/Hook/Query/GetHook.php
 create mode 100644 src/Core/Domain/Hook/QueryHandler/GetHookHandlerInterface.php
 create mode 100644 src/PrestaShopBundle/ApiPlatform/Exception/NoExtraPropertiesFoundException.php
 create mode 100644 tests/Integration/ApiPlatform/GetHookTest.php

diff --git a/src/Adapter/Hook/CommandHandler/UpdateHookStatusCommandHandler.php b/src/Adapter/Hook/CommandHandler/UpdateHookStatusCommandHandler.php
index 31b22327dacb2..91d9514d9394c 100644
--- a/src/Adapter/Hook/CommandHandler/UpdateHookStatusCommandHandler.php
+++ b/src/Adapter/Hook/CommandHandler/UpdateHookStatusCommandHandler.php
@@ -53,7 +53,7 @@ public function handle(UpdateHookStatusCommand $command)
             throw new HookNotFoundException(sprintf('Hook with id "%d" was not found', $hookId));
         }
 
-        $hook->active = $command->getStatus();
+        $hook->active = $command->isActive();
         if (!$hook->save()) {
             throw new CannotUpdateHookException(sprintf('Cannot update status for hook with id "%d"', $hookId));
         }
diff --git a/src/Adapter/Hook/QueryHandler/GetHookHandler.php b/src/Adapter/Hook/QueryHandler/GetHookHandler.php
new file mode 100644
index 0000000000000..805bd3e9d2927
--- /dev/null
+++ b/src/Adapter/Hook/QueryHandler/GetHookHandler.php
@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Adapter\Hook\QueryHandler;
+
+use Hook;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
+use PrestaShop\PrestaShop\Core\Domain\Hook\Exception\HookNotFoundException;
+use PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHook;
+use PrestaShop\PrestaShop\Core\Domain\Hook\QueryHandler\GetHookHandlerInterface;
+
+#[AsQueryHandler]
+final class GetHookHandler implements GetHookHandlerInterface
+{
+    public function handle(GetHook $query)
+    {
+        $hookId = $query->getId()->getValue();
+        $hook = new Hook($hookId);
+
+        if ($hook->id !== $hookId) {
+            throw new HookNotFoundException(sprintf('Hook with id "%d" was not found.', $hookId));
+        }
+
+        return $hook;
+    }
+}
diff --git a/src/Adapter/Hook/QueryHandler/GetHookStatusHandler.php b/src/Adapter/Hook/QueryHandler/GetHookStatusHandler.php
index 692df8741d2c7..b74401228ab44 100644
--- a/src/Adapter/Hook/QueryHandler/GetHookStatusHandler.php
+++ b/src/Adapter/Hook/QueryHandler/GetHookStatusHandler.php
@@ -46,7 +46,7 @@ final class GetHookStatusHandler implements GetHookStatusHandlerInterface
      */
     public function handle(GetHookStatus $query)
     {
-        $hookId = $query->getHookId()->getValue();
+        $hookId = $query->getId()->getValue();
         $hook = new Hook($hookId);
 
         if ($hook->id !== $hookId) {
diff --git a/src/Core/Domain/Hook/Command/UpdateHookStatusCommand.php b/src/Core/Domain/Hook/Command/UpdateHookStatusCommand.php
index dc1afbe02eb8f..d027b7ec93d69 100644
--- a/src/Core/Domain/Hook/Command/UpdateHookStatusCommand.php
+++ b/src/Core/Domain/Hook/Command/UpdateHookStatusCommand.php
@@ -35,28 +35,25 @@
  */
 class UpdateHookStatusCommand
 {
-    /**
-     * @var hookId
-     */
-    private $hookId;
+    private HookId $id;
 
     /**
      * New hook status
      *
      * @var bool
      */
-    private $status;
+    private $active;
 
     /**
      * UpdateHookStatusCommand constructor.
      *
-     * @param int $hookId
-     * @param bool $status
+     * @param int $id
+     * @param bool $active
      */
-    public function __construct(int $hookId, bool $status)
+    public function __construct(int $id, bool $active)
     {
-        $this->hookId = new HookId($hookId);
-        $this->status = $status;
+        $this->id = new HookId($id);
+        $this->active = $active;
     }
 
     /**
@@ -64,14 +61,14 @@ public function __construct(int $hookId, bool $status)
      */
     public function getHookId(): HookId
     {
-        return $this->hookId;
+        return $this->id;
     }
 
     /**
      * @return bool
      */
-    public function getStatus(): bool
+    public function isActive(): bool
     {
-        return $this->status;
+        return $this->active;
     }
 }
diff --git a/src/Core/Domain/Hook/Query/GetHook.php b/src/Core/Domain/Hook/Query/GetHook.php
new file mode 100644
index 0000000000000..11579dc5d1b18
--- /dev/null
+++ b/src/Core/Domain/Hook/Query/GetHook.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\Hook\Query;
+
+use PrestaShop\PrestaShop\Core\Domain\Hook\ValueObject\HookId;
+
+class GetHook
+{
+    private HookId $id;
+
+    public function __construct(int $id)
+    {
+        $this->id = new HookId($id);
+    }
+
+    public function getId(): HookId
+    {
+        return $this->id;
+    }
+}
diff --git a/src/Core/Domain/Hook/Query/GetHookStatus.php b/src/Core/Domain/Hook/Query/GetHookStatus.php
index 9dc867ff15c07..d90c3bfea22e5 100644
--- a/src/Core/Domain/Hook/Query/GetHookStatus.php
+++ b/src/Core/Domain/Hook/Query/GetHookStatus.php
@@ -35,26 +35,23 @@
  */
 class GetHookStatus
 {
-    /**
-     * @var HookId
-     */
-    private $hookId;
+    private HookId $id;
 
     /**
      * GetHookStatus constructor.
      *
-     * @param int $hookId
+     * @param int $id
      */
-    public function __construct(int $hookId)
+    public function __construct(int $id)
     {
-        $this->hookId = new HookId($hookId);
+        $this->id = new HookId($id);
     }
 
     /**
      * @return HookId
      */
-    public function getHookId(): HookId
+    public function getId(): HookId
     {
-        return $this->hookId;
+        return $this->id;
     }
 }
diff --git a/src/Core/Domain/Hook/QueryHandler/GetHookHandlerInterface.php b/src/Core/Domain/Hook/QueryHandler/GetHookHandlerInterface.php
new file mode 100644
index 0000000000000..377000313d2a4
--- /dev/null
+++ b/src/Core/Domain/Hook/QueryHandler/GetHookHandlerInterface.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\Hook\QueryHandler;
+
+use PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHook;
+
+interface GetHookHandlerInterface
+{
+    public function handle(GetHook $query);
+}
diff --git a/src/PrestaShopBundle/ApiPlatform/Exception/NoExtraPropertiesFoundException.php b/src/PrestaShopBundle/ApiPlatform/Exception/NoExtraPropertiesFoundException.php
new file mode 100644
index 0000000000000..4041f7d59dc17
--- /dev/null
+++ b/src/PrestaShopBundle/ApiPlatform/Exception/NoExtraPropertiesFoundException.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\ApiPlatform\Exception;
+
+use PrestaShop\PrestaShop\Core\Domain\Exception\DomainException;
+
+/**
+ * Is thrown when the query provider does not match any extra properties.
+ */
+class NoExtraPropertiesFoundException extends DomainException
+{
+}
diff --git a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
index 4e34e03905bec..361b79193f141 100644
--- a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
+++ b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
@@ -31,20 +31,41 @@
 use ApiPlatform\Metadata\Operation;
 use ApiPlatform\State\ProviderInterface;
 use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
+use PrestaShopBundle\ApiPlatform\Exception\NoExtraPropertiesFoundException;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
 
 class QueryProvider implements ProviderInterface
 {
-    private $queryBus;
-
-    public function __construct(CommandBusInterface $queryBus)
+    public function __construct(private CommandBusInterface $queryBus, private DenormalizerInterface $serializer)
     {
-        $this->queryBus = $queryBus;
     }
 
     public function provide(Operation $operation, array $uriVariables = [], array $context = [])
     {
-        $query = $operation->getExtraProperties()['query'];
+        $extraProperties = $operation->getExtraProperties();
+
+        $query = array_key_exists('query', $extraProperties) ? $extraProperties['query'] : null;
+        $command = array_key_exists('command', $extraProperties) ? $extraProperties['command'] : null;
+        $dto = array_key_exists('dto', $extraProperties) ? $extraProperties['dto'] : null;
 
-        return $this->queryBus->handle(new $query(...$uriVariables));
+        if (null !== $query) {
+            return $this->queryBus->handle(new $query(...$uriVariables));
+        } elseif (null !== $command) {
+            // the command case has yet to be implemented.
+            return null;
+        } elseif (null !== $dto) {
+            $coreObject = $this->queryBus->handle(new $dto(...$uriVariables));
+            // We use get_object_var to convert the ObjectModel into an array and then denormalize it into the DTO.
+            // We handle things this way because we are unable to normalize an ObjectModel
+            // directly with the symfony serializer.
+            return $this->serializer->denormalize(
+                get_object_vars($coreObject),
+                $extraProperties['denormalizer'],
+                context: [ObjectNormalizer::DISABLE_TYPE_ENFORCEMENT => true]
+            );
+        } else {
+            throw new NoExtraPropertiesFoundException();
+        }
     }
 }
diff --git a/src/PrestaShopBundle/ApiPlatform/Resources/Hook.php b/src/PrestaShopBundle/ApiPlatform/Resources/Hook.php
index ba8f36f110a23..b4cc3dc8c3b99 100644
--- a/src/PrestaShopBundle/ApiPlatform/Resources/Hook.php
+++ b/src/PrestaShopBundle/ApiPlatform/Resources/Hook.php
@@ -34,21 +34,23 @@
 use ApiPlatform\Metadata\Put;
 use PrestaShop\PrestaShop\Core\Domain\Hook\Command\UpdateHookStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\Hook\Exception\HookNotFoundException;
+use PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHook;
 use PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHookStatus;
 use PrestaShopBundle\ApiPlatform\Processor\CommandProcessor;
 use PrestaShopBundle\ApiPlatform\Provider\QueryProvider;
+use Symfony\Component\Serializer\Annotation\Groups;
 
 #[ApiResource(
     operations: [
         new Get(
-            uriTemplate: '/hook-status/{hookId}',
+            uriTemplate: '/hook-status/{id}',
             requirements: ['id' => '\d+'],
             openapiContext: [
                 'summary' => 'Get hook status A',
                 'description' => 'Get hook status B',
                 'parameters' => [
                     [
-                        'name' => 'hookId',
+                        'name' => 'id',
                         'in' => 'path',
                         'required' => true,
                         'schema' => [
@@ -72,18 +74,35 @@
             processor: CommandProcessor::class,
             extraProperties: ['command' => UpdateHookStatusCommand::class]
         ),
-    ]
+        new Get(
+          uriTemplate: '/hooks/{id}',
+            requirements: ['id' => '\d+'],
+            exceptionToStatus: [HookNotFoundException::class => 404],
+            normalizationContext: [
+                'groups' => [
+                    'hook-status:read',
+                ],
+            ],
+            provider: QueryProvider::class,
+            extraProperties: [
+                'dto' => GetHook::class,
+                'denormalizer' => Hook::class,
+            ]
+        ),
+    ],
 )]
 class Hook
 {
-    /**
-     * @var int
-     */
     #[ApiProperty(identifier: true)]
-    public int $hookId;
+    #[Groups(['hook-status:read'])]
+    public int $id;
+
+    #[Groups(['hook-status:read'])]
+    public bool $active;
+
+    public string $name;
+
+    public string $title;
 
-    /**
-     * @var bool
-     */
-    public bool $status;
+    public string $description;
 }
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/hook.yml b/src/PrestaShopBundle/Resources/config/services/adapter/hook.yml
index fc10e8e1ae70e..bdddc9d3f7571 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/hook.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/hook.yml
@@ -10,6 +10,10 @@ services:
     class: PrestaShop\PrestaShop\Adapter\Hook\QueryHandler\GetHookStatusHandler
     autoconfigure: true
 
+  prestashop.adapter.hook.command_handler.get_hook_handler:
+    class: PrestaShop\PrestaShop\Adapter\Hook\QueryHandler\GetHookHandler
+    autoconfigure: true
+
   PrestaShop\PrestaShop\Adapter\HookManager: ~
 
   prestashop.adapter.hook.manager:
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/services.yml b/src/PrestaShopBundle/Resources/config/services/bundle/services.yml
index 78576f2bd1b79..56a48dd30185d 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/services.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/services.yml
@@ -108,8 +108,6 @@ services:
     tags: [ 'api_platform.state_provider' ]
     public: false
     autowire: true
-    arguments:
-      - '@prestashop.core.query_bus'
 
   PrestaShopBundle\ApiPlatform\Processor\CommandProcessor:
     tags: [ 'api_platform.state_processor' ]
diff --git a/tests/Integration/ApiPlatform/GetHookStatusTest.php b/tests/Integration/ApiPlatform/GetHookStatusTest.php
index 7b5383b742443..807e1f85b60fc 100644
--- a/tests/Integration/ApiPlatform/GetHookStatusTest.php
+++ b/tests/Integration/ApiPlatform/GetHookStatusTest.php
@@ -80,7 +80,7 @@ public function testDisableHook(): void
         $bearerToken = $this->getBearerToken();
         static::createClient()->request('PUT', '/new-api/hook-status', [
             'auth_bearer' => $bearerToken,
-            'json' => ['hookId' => (int) $hook->id, 'status' => false],
+            'json' => ['id' => (int) $hook->id, 'active' => false],
         ]);
         self::assertResponseStatusCodeSame(200);
 
@@ -99,7 +99,7 @@ public function testEnableHook(): void
         $bearerToken = $this->getBearerToken();
         static::createClient()->request('PUT', '/new-api/hook-status', [
             'auth_bearer' => $bearerToken,
-            'json' => ['hookId' => (int) $hook->id, 'status' => true],
+            'json' => ['id' => (int) $hook->id, 'active' => true],
         ]);
         self::assertResponseStatusCodeSame(200);
 
diff --git a/tests/Integration/ApiPlatform/GetHookTest.php b/tests/Integration/ApiPlatform/GetHookTest.php
new file mode 100644
index 0000000000000..188c5ccb2e3c0
--- /dev/null
+++ b/tests/Integration/ApiPlatform/GetHookTest.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace Tests\Integration\ApiPlatform;
+
+use ApiPlatform\Symfony\Bundle\Test\ApiTestCase;
+use Tests\Resources\DatabaseDump;
+
+class GetHookTest extends ApiTestCase
+{
+    public static function setUpBeforeClass(): void
+    {
+        parent::setUpBeforeClass();
+        DatabaseDump::restoreTables(['hook']);
+    }
+
+    public function testGetHook(): void
+    {
+        $hook = new \Hook();
+        $hook->name = 'testHook';
+        $hook->active = true;
+        $hook->add();
+
+        $bearerToken = $this->getBearerToken();
+
+        $response = static::createClient()->request('GET', '/new-api/hooks/' . (int) $hook->id, ['auth_bearer' => $bearerToken]);
+        self::assertEquals(json_decode($response->getContent())->active, $hook->active);
+        self::assertResponseStatusCodeSame(200);
+
+        static::createClient()->request('GET', '/new-api/hooks/' . 9999, ['auth_bearer' => $bearerToken]);
+        self::assertResponseStatusCodeSame(404);
+
+        static::createClient()->request('GET', '/new-api/hooks/' . $hook->id);
+        self::assertResponseStatusCodeSame(401);
+
+        $hook->delete();
+    }
+
+    private function getBearerToken(): string
+    {
+        $parameters = ['parameters' => [
+            'client_id' => 'my_client_id',
+            'client_secret' => 'prestashop',
+            'grant_type' => 'client_credentials',
+        ]];
+        $options = ['extra' => $parameters];
+        $response = static::createClient()->request('POST', '/api/oauth2/token', $options);
+
+        return json_decode($response->getContent())->access_token;
+    }
+}
diff --git a/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php b/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
index 2a20a952f9249..f2b8219798b6b 100644
--- a/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
+++ b/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
@@ -31,10 +31,15 @@
 use ApiPlatform\Metadata\Get;
 use PHPUnit\Framework\TestCase;
 use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
+use PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHook;
 use PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHookStatus;
 use PrestaShop\PrestaShop\Core\Domain\Hook\QueryResult\HookStatus;
+use PrestaShopBundle\ApiPlatform\Exception\NoExtraPropertiesFoundException;
 use PrestaShopBundle\ApiPlatform\Provider\QueryProvider;
+use PrestaShopBundle\ApiPlatform\Resources\Hook;
 use RuntimeException;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\Serializer;
 
 class QueryProviderTest extends TestCase
 {
@@ -43,44 +48,119 @@ class QueryProviderTest extends TestCase
      */
     private $queryBus;
 
-    /**
-     * Set up dependencies for HookStatusProvider
-     */
-    public function setUp(): void
+    private function createResultBasedOnQuery(GetHookStatus $query): HookStatus
     {
-        $this->queryBus = $this->createMock(CommandBusInterface::class);
-        $this->queryBus
-            ->method('handle')
-            ->with($this->isInstanceOf(GetHookStatus::class))
-            ->willReturnCallback(function ($query) {
-                return $this->createResultBasedOnQuery($query);
-            })
-        ;
+        if ($query->getId()->getValue() === 1) {
+            return new HookStatus($query->getId()->getValue(), false);
+        }
+
+        if ($query->getId()->getValue() === 2) {
+            return new HookStatus($query->getId()->getValue(), true);
+        }
+
+        throw new RuntimeException(sprintf('Hook "%s" was not expected in query bus mock', $query->getId()->getValue()));
     }
 
-    private function createResultBasedOnQuery(GetHookStatus $query): HookStatus
+    private function createResultBasedOnObjectModel(GetHook $query): \stdClass
     {
-        if ($query->getHookId()->getValue() === 1) {
-            return new HookStatus($query->getHookId()->getValue(), false);
+        if ($query->getId()->getValue() === 1) {
+            $objectModelHook = new \stdClass();
+            $objectModelHook->active = false;
+
+            return $objectModelHook;
         }
 
-        if ($query->getHookId()->getValue() === 2) {
-            return new HookStatus($query->getHookId()->getValue(), true);
+        if ($query->getId()->getValue() === 2) {
+            $objectModelHook = new \stdClass();
+            $objectModelHook->active = true;
+
+            return $objectModelHook;
         }
 
-        throw new RuntimeException(sprintf('Hook "%s" was not expected in query bus mock', $query->getHookId()->getValue()));
+        throw new RuntimeException(sprintf('Hook "%s" was not expected in query bus mock', $query->getId()->getValue()));
     }
 
     public function testProvideHookStatus(): void
     {
-        $hookStatusProvider = new QueryProvider($this->queryBus);
+        $this->queryBus = $this->createMock(CommandBusInterface::class);
+        $this->queryBus
+            ->method('handle')
+            ->with($this->isInstanceOf(GetHookStatus::class))
+            ->willReturnCallback(function ($query) {
+                return $this->createResultBasedOnQuery($query);
+            })
+        ;
+        $hookStatusProvider = new QueryProvider(
+            $this->queryBus,
+            $this->createMock(DenormalizerInterface::class)
+        );
         $get = new Get();
         $get = $get->withExtraProperties(['query' => "PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHookStatus"]);
         /** @var HookStatus $hookStatus */
-        $hookStatus = $hookStatusProvider->provide($get, ['hookId' => 1]);
+        $hookStatus = $hookStatusProvider->provide($get, ['id' => 1]);
         self::assertEquals(false, $hookStatus->isActive());
         /** @var HookStatus $hookStatus */
-        $hookStatus = $hookStatusProvider->provide($get, ['hookId' => 2]);
+        $hookStatus = $hookStatusProvider->provide($get, ['id' => 2]);
         self::assertTrue($hookStatus->isActive());
     }
+
+    public function testProvideHook(): void
+    {
+        $this->queryBus = $this->createMock(CommandBusInterface::class);
+        $this->queryBus
+            ->method('handle')
+            ->with($this->isInstanceOf(GetHook::class))
+            ->willReturnCallback(function ($query) {
+                return $this->createResultBasedOnObjectModel($query);
+            })
+        ;
+
+        $hookStatusProvider = new QueryProvider(
+            $this->queryBus,
+            $this->setUpSerializerMock()
+        );
+        $get = new Get();
+        $get = $get->withExtraProperties([
+            'dto' => "PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHook",
+            'denormalizer' => "src\PrestaShopBundle\ApiPlatform\Resources\Hook.php",
+        ]);
+        /** @var Hook $hookDto */
+        $hookDto = $hookStatusProvider->provide($get, ['id' => 1]);
+        self::assertEquals(false, $hookDto->active);
+        /** @var Hook $hookDto */
+        $hookDto = $hookStatusProvider->provide($get, ['id' => 2]);
+        self::assertTrue($hookDto->active);
+    }
+
+    public function testProvideNoQueryThrowsException(): void
+    {
+        $hookStatusProvider = new QueryProvider(
+            $this->createMock(CommandBusInterface::class),
+            $this->createMock(DenormalizerInterface::class)
+        );
+        $get = new Get();
+
+        $this->expectException(NoExtraPropertiesFoundException::class);
+        $hookStatusProvider->provide($get, ['id' => 1]);
+    }
+
+    private function setUpSerializerMock(): Serializer
+    {
+        $firstHookDto = new Hook();
+        $firstHookDto->active = false;
+
+        $secondHookDto = new Hook();
+        $secondHookDto->active = true;
+
+        $serializerMock = $this->createMock(Serializer::class);
+        $serializerMock
+            ->expects(static::exactly(2))
+            ->method('denormalize')
+            ->willReturnOnConsecutiveCalls(
+                $firstHookDto, $secondHookDto
+            )
+        ;
+
+        return $serializerMock;
+    }
 }

From 0ac5f316829d06d81a79645e38e7000b7cd5d462 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Tue, 11 Jul 2023 17:57:43 +0200
Subject: [PATCH 0505/1030] Add new test to add new theme

---
 .../01_themeAndLogo/01_addNewTheme.ts         | 87 +++++++++++++++++++
 .../themeAndLogo/themeAndLogo/import.ts       |  6 ++
 2 files changed, 93 insertions(+)
 create mode 100644 tests/UI/campaigns/functional/BO/08_design/01_themeAndLogo/01_themeAndLogo/01_addNewTheme.ts

diff --git a/tests/UI/campaigns/functional/BO/08_design/01_themeAndLogo/01_themeAndLogo/01_addNewTheme.ts b/tests/UI/campaigns/functional/BO/08_design/01_themeAndLogo/01_themeAndLogo/01_addNewTheme.ts
new file mode 100644
index 0000000000000..12462489bb3a2
--- /dev/null
+++ b/tests/UI/campaigns/functional/BO/08_design/01_themeAndLogo/01_themeAndLogo/01_addNewTheme.ts
@@ -0,0 +1,87 @@
+// Import utils
+import helper from '@utils/helpers';
+import testContext from '@utils/testContext';
+
+// Import login steps
+import loginCommon from '@commonTests/BO/loginBO';
+import themeImportPage from '@pages/BO/design/themeAndLogo/themeAndLogo/import';
+
+// Import BO pages
+import dashboardPage from '@pages/BO/dashboard';
+import themeAndLogoPage from '@pages/BO/design/themeAndLogo/themeAndLogo';
+
+import {expect} from 'chai';
+import type {BrowserContext, Page} from 'playwright';
+import files from "@utils/files";
+import Modules from "@data/demo/modules";
+
+const baseContext: string = 'functional_BO_design_themeAndLogo_themeAndLogo_addNewTheme';
+
+describe('BO - Design - Theme & Logo : Add new theme', async () => {
+  let browserContext: BrowserContext;
+  let page: Page;
+
+  const urlTheme: string = 'https://github.com/PrestaShop/hummingbird/releases/download/v0.1.5/hummingbird.zip';
+
+  // before and after functions
+  before(async function () {
+    browserContext = await helper.createBrowserContext(this.browser);
+    page = await helper.newTab(browserContext);
+  });
+
+  after(async () => {
+    await helper.closeBrowserContext(browserContext);
+  });
+
+  it('should login in BO', async function () {
+    await loginCommon.loginBO(this, page);
+  });
+
+  it('should go to \'Design > Theme & Logo\' page', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'goToThemeAndLogoPage', baseContext);
+
+    await dashboardPage.goToSubMenu(
+      page,
+      dashboardPage.designParentLink,
+      dashboardPage.themeAndLogoParentLink,
+    );
+    await themeAndLogoPage.closeSfToolBar(page);
+
+    const pageTitle = await themeAndLogoPage.getPageTitle(page);
+    await expect(pageTitle).to.contains(themeAndLogoPage.pageTitle);
+  });
+
+  it('should go to \'Add new theme\' page', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'goToAddNewTheme', baseContext);
+
+    await themeAndLogoPage.goToNewThemePage(page);
+
+    const pageTitle = await themeImportPage.getPageTitle(page);
+    await expect(pageTitle).to.contains(themeImportPage.pageTitle);
+  });
+
+  it('should download theme from the web', async function(){
+    await testContext.addContextItem(this, 'testIdentifier', 'importTheme', baseContext);
+
+    await files.downloadFile(urlTheme, 'theme.zip');
+
+    const found = await files.doesFileExist('module.zip');
+    await expect(found).to.be.true;
+  });
+
+  it('should import theme from your computer', asyn function(){
+    await testContext.addContextItem(this, 'testIdentifier', 'importThemeFromComputer', baseContext);
+  });
+
+  it('should import from the web the Hummingbird theme', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'importThemeFromWeb', baseContext);
+
+    await themeImportPage.importTheme(page, urlTheme);
+
+    const pageTitle = await themeAndLogoPage.getPageTitle(page);
+    await expect(pageTitle).to.contains(themeAndLogoPage.pageTitle);
+
+    const numThemes = await themeAndLogoPage.getNumberOfThemes(page);
+    await expect(numThemes).to.eq(2);
+  });
+});
diff --git a/tests/UI/pages/BO/design/themeAndLogo/themeAndLogo/import.ts b/tests/UI/pages/BO/design/themeAndLogo/themeAndLogo/import.ts
index f8f73f939b8d8..d47ba6cca33ab 100644
--- a/tests/UI/pages/BO/design/themeAndLogo/themeAndLogo/import.ts
+++ b/tests/UI/pages/BO/design/themeAndLogo/themeAndLogo/import.ts
@@ -31,6 +31,12 @@ class ImportTheme extends themeAndLogoBasePage {
     this.importWebSubmit = `${this.importForm} > div.row > div:nth-child(2) div.card-footer button`;
   }
 
+  /**
+   * Import theme from web
+   * @param page  {Page} Browser tab
+   * @param themeUrl {string} Theme URL link to import
+   * @returns {Promise<void>}
+   */
   async importTheme(page: Page, themeUrl: string): Promise<void> {
     await this.setValue(page, this.inputArchiveURL, themeUrl);
     await page.click(this.importWebSubmit);

From f497b5bc1cd1657a0c486848d32e019a4dbb980a Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Tue, 11 Jul 2023 17:59:44 +0200
Subject: [PATCH 0506/1030] Fix CI

---
 .../productV2/functional/03_CRUDProductWithCombinations.ts      | 2 +-
 .../productV2/sanity/03_CRUDProductWithCombinations.ts          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/UI/campaigns/productV2/functional/03_CRUDProductWithCombinations.ts b/tests/UI/campaigns/productV2/functional/03_CRUDProductWithCombinations.ts
index 30cde308848a8..1d1ecbf16514b 100644
--- a/tests/UI/campaigns/productV2/functional/03_CRUDProductWithCombinations.ts
+++ b/tests/UI/campaigns/productV2/functional/03_CRUDProductWithCombinations.ts
@@ -55,7 +55,7 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       },
       {
         name: 'color',
-        values: ['Gray', 'Taupe', 'Beige', 'White', 'Red', 'Black', 'Orange', 'Green', 'Yellow', 'Brown'],
+        values: ['Grey', 'Taupe', 'Beige', 'White', 'Red', 'Black', 'Orange', 'Green', 'Yellow', 'Brown'],
       },
     ],
     status: false,
diff --git a/tests/UI/campaigns/productV2/sanity/03_CRUDProductWithCombinations.ts b/tests/UI/campaigns/productV2/sanity/03_CRUDProductWithCombinations.ts
index f4d26cd9a7b09..0891882498f87 100644
--- a/tests/UI/campaigns/productV2/sanity/03_CRUDProductWithCombinations.ts
+++ b/tests/UI/campaigns/productV2/sanity/03_CRUDProductWithCombinations.ts
@@ -49,7 +49,7 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
     attributes: [
       {
         name: 'color',
-        values: ['Gray', 'Taupe', 'Red'],
+        values: ['Grey', 'Taupe', 'Red'],
       },
       {
         name: 'size',

From 0411dd874fe3b3457c6fbb5a872252484bbdec39 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Tue, 11 Jul 2023 18:27:11 +0200
Subject: [PATCH 0507/1030] Functional Tests : WS - Countries : Check Blank &
 Synopsis

---
 .../functional/WS/01_countriesCRUD.ts         | 121 +++++++++++++++++-
 tests/UI/package-lock.json                    |  97 ++++++++------
 tests/UI/package.json                         |   1 +
 tests/UI/utils/xml.ts                         |  43 +++++++
 tests/UI/webservices/baseWs.ts                |  44 +++++++
 tests/UI/webservices/country/countryWs.ts     |  24 ++++
 6 files changed, 286 insertions(+), 44 deletions(-)

diff --git a/tests/UI/campaigns/functional/WS/01_countriesCRUD.ts b/tests/UI/campaigns/functional/WS/01_countriesCRUD.ts
index 050f71ff28d12..6ac52aa7fadd3 100644
--- a/tests/UI/campaigns/functional/WS/01_countriesCRUD.ts
+++ b/tests/UI/campaigns/functional/WS/01_countriesCRUD.ts
@@ -1,9 +1,10 @@
 // Import utils
 import helper from '@utils/helpers';
 import testContext from '@utils/testContext';
-import countryXml from '@webservices/country/countryXml';
+import xml from '@utils/xml';
 
 // Import webservices
+import countryXml from '@webservices/country/countryXml';
 import CountryWS from '@webservices/country/countryWs';
 
 // Import commonTests
@@ -104,6 +105,123 @@ describe('WS - Countries : CRUD', async () => {
       });
     });
 
+    describe(`Endpoint : ${CountryWS.endpoint} - Schema : Blank `, () => {
+      let apiResponse: APIResponse;
+      let xmlResponse : string;
+
+      it('should check response status', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestBlankStatus', baseContext);
+
+        apiResponse = await CountryWS.getBlank(
+          apiContext,
+          authorization,
+        );
+        await expect(apiResponse.status()).to.eq(200);
+      });
+
+      it('should check that the blank XML can be parsed', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestBlankValid', baseContext);
+
+        xmlResponse = await apiResponse.text();
+
+        const isValidXML = xml.isValid(xmlResponse);
+        await expect(isValidXML).to.be.true;
+      });
+
+      it('should check response root node', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestBlankRootNode', baseContext);
+
+        expect(countryXml.getRootNodeName(xmlResponse)).to.be.eq('prestashop');
+      });
+
+      it('should check number of node under prestashop', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestBlankChildNode', baseContext);
+
+        const rootNodes = countryXml.getPrestaShopNodes(xmlResponse);
+        expect(rootNodes.length).to.be.eq(1);
+        expect(rootNodes[0].nodeName).to.be.eq('country');
+      });
+
+      it('should check each node name, attributes and has empty values', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestBlankChildNodes', baseContext);
+
+        const nodes = countryXml.getCountryNodes(xmlResponse);
+        expect(nodes.length).to.be.gt(0);
+
+        for (let c: number = 0; c < nodes.length; c++) {
+          const countryNode: Element = nodes[c];
+
+          // Attributes
+          const countryNodeAttributes: NamedNodeMap = countryNode.attributes;
+          expect(countryNodeAttributes.length).to.be.eq(0);
+
+          // Empty value
+          const isEmpty = xml.isEmpty(countryNode);
+          expect(isEmpty, `The node ${countryNode.nodeName} is not empty`).to.be.true;
+        }
+      });
+    });
+
+    describe(`Endpoint : ${CountryWS.endpoint} - Schema : Synopsis `, () => {
+      let apiResponse: APIResponse;
+      let xmlResponse : string;
+
+      it('should check response status', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestSynopsisStatus', baseContext);
+
+        apiResponse = await CountryWS.getSynopsis(
+          apiContext,
+          authorization,
+        );
+        await expect(apiResponse.status()).to.eq(200);
+      });
+
+      it('should check that the synopsis XML can be parsed', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestSynopsisValid', baseContext);
+
+        xmlResponse = await apiResponse.text();
+
+        const isValidXML = xml.isValid(xmlResponse);
+        await expect(isValidXML).to.be.true;
+      });
+
+      it('should check response root node', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestBlankRootNode', baseContext);
+
+        expect(countryXml.getRootNodeName(xmlResponse)).to.be.eq('prestashop');
+      });
+
+      it('should check number of node under prestashop', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestBlankChildNode', baseContext);
+
+        const rootNodes = countryXml.getPrestaShopNodes(xmlResponse);
+        expect(rootNodes.length).to.be.eq(1);
+        expect(rootNodes[0].nodeName).to.be.eq('country');
+      });
+
+      it('should check each node name, attributes and has empty values', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestGetCheckAll1', baseContext);
+
+        const nodes = countryXml.getCountryNodes(xmlResponse);
+        expect(nodes.length).to.be.gt(0);
+
+        for (let c: number = 0; c < nodes.length; c++) {
+          const node: Element = nodes[c];
+
+          // Attributes
+          const nodeAttributes: NamedNodeMap = node.attributes;
+          expect(nodeAttributes.length).to.be.gte(1);
+
+          // Attribute : format
+          expect(nodeAttributes[nodeAttributes.length - 1].nodeName).to.be.eq('format');
+
+          // Empty value
+          const isEmpty = xml.isEmpty(node);
+          expect(isEmpty, `The node ${node.nodeName} is not empty`).to.be.true;
+        }
+      });
+    });
+
     describe(`Endpoint : ${CountryWS.endpoint} - Method : GET `, () => {
       let apiResponse : APIResponse;
       let xmlResponse : string;
@@ -178,7 +296,6 @@ describe('WS - Countries : CRUD', async () => {
             authorization,
             xmlCreate,
           );
-
           await expect(apiResponse.status()).to.eq(201);
         });
 
diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index b80e2cea51f33..59b3b6e43271c 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -350,7 +350,7 @@
     "@types/json5": {
       "version": "0.0.29",
       "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
+      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
       "dev": true
     },
     "@types/linkify-it": {
@@ -765,7 +765,7 @@
     "addressparser": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz",
-      "integrity": "sha1-R6++GiqSYhkdtoOOT9HTm0CCF0Y="
+      "integrity": "sha512-aQX7AISOMM7HFE0iZ3+YnD07oIeJqWGVnJ+ZIKaBZAk03ftmVYVqsGas/rbXKR21n4D/hKCSHypvcyOkds/xzg=="
     },
     "agent-base": {
       "version": "6.0.2",
@@ -862,7 +862,7 @@
     "array-flatten": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
+      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
     },
     "array-includes": {
       "version": "3.1.6",
@@ -1427,7 +1427,7 @@
     "base32.js": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/base32.js/-/base32.js-0.1.0.tgz",
-      "integrity": "sha1-tYLexpPC8R6JPPBk7mrFthMaIgI="
+      "integrity": "sha512-n3TkB02ixgBOhTvANakDb4xaMXnYUVkNoRFJjQflcqMQhyEKxEHdj3E6N8t8sUQ0mjH/3/JxzlXuz3ul/J90pQ=="
     },
     "base64id": {
       "version": "2.0.0",
@@ -1620,7 +1620,7 @@
     "check-error": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
-      "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII="
+      "integrity": "sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA=="
     },
     "chokidar": {
       "version": "3.5.3",
@@ -1816,7 +1816,7 @@
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
     },
     "config-master": {
       "version": "3.1.0",
@@ -1875,7 +1875,7 @@
     "cookie-signature": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
+      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
     },
     "cors": {
       "version": "2.8.5",
@@ -1959,7 +1959,7 @@
     "decamelize": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
       "dev": true
     },
     "decimal.js": {
@@ -2141,7 +2141,7 @@
     "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
     },
     "emoji-regex": {
       "version": "8.0.0",
@@ -2151,7 +2151,7 @@
     "encodeurl": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
     },
     "engine.io": {
       "version": "6.1.3",
@@ -2279,12 +2279,12 @@
     "escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
     },
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="
     },
     "escodegen": {
       "version": "2.0.0",
@@ -2766,7 +2766,7 @@
     "etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="
     },
     "express": {
       "version": "4.18.2",
@@ -2859,7 +2859,15 @@
     "fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
+    },
+    "fast-xml-parser": {
+      "version": "4.2.5",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.5.tgz",
+      "integrity": "sha512-B9/wizE4WngqQftFPmdaMYlXoJlJOYxGQOanC77fq9k8+Z0v5dDSVh+3glErdIROP//s/jgb7ZuxKfB8nVyo0g==",
+      "requires": {
+        "strnum": "^1.0.5"
+      }
     },
     "fastq": {
       "version": "1.13.0",
@@ -3013,7 +3021,7 @@
     "fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="
     },
     "fs-extra": {
       "version": "7.0.1",
@@ -3055,7 +3063,7 @@
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
     },
     "fsevents": {
       "version": "2.3.2",
@@ -3116,7 +3124,7 @@
     "get-func-name": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
-      "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE="
+      "integrity": "sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig=="
     },
     "get-intrinsic": {
       "version": "1.1.1",
@@ -3406,7 +3414,7 @@
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
       "requires": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -3436,7 +3444,7 @@
     "ipv6-normalize": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/ipv6-normalize/-/ipv6-normalize-1.0.1.tgz",
-      "integrity": "sha1-GzJYKQ02X6gyOeiZB93kWS52IKg="
+      "integrity": "sha512-Bm6H79i01DjgGTCWjUuCjJ6QDo1HB96PT/xCYuyJUP9WFbVDrLSbG4EZCvOCun2rNswZb0c3e4Jt/ws795esHA=="
     },
     "is-array-buffer": {
       "version": "3.0.1",
@@ -3825,7 +3833,7 @@
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+      "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="
     },
     "json5": {
       "version": "1.0.1",
@@ -3839,7 +3847,7 @@
     "jsonfile": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.1.6"
@@ -3857,7 +3865,7 @@
     "levn": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
       "requires": {
         "prelude-ls": "~1.1.2",
         "type-check": "~0.3.2"
@@ -3900,7 +3908,7 @@
     "lodash.isempty": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz",
-      "integrity": "sha1-b4bL7di+TsmHvpqvM8loTbGzHn4="
+      "integrity": "sha512-oKMuF3xEeqDltrGMfDxAPGIVMSSRv8tbRSODbrs4KGsRRLEhrW8N8Rd4DRgB2+621hY8A8XwwrTVhXWpxFvMzg=="
     },
     "lodash.isfunction": {
       "version": "3.0.9",
@@ -3910,12 +3918,12 @@
     "lodash.isobject": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz",
-      "integrity": "sha1-PI+41bW/S/kK4G4U8qUwpO2TXh0="
+      "integrity": "sha512-3/Qptq2vr7WeJbB4KHUSKlq8Pl7ASXi3UG6CMbBm8WRtXi8+GHm7mKaU3urfpSEzWe2wCIChs6/sdocUsTKJiA=="
     },
     "lodash.isstring": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
-      "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE="
+      "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw=="
     },
     "lodash.merge": {
       "version": "4.6.2",
@@ -4129,12 +4137,12 @@
     "media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
+      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="
     },
     "merge-descriptors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
+      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
     },
     "merge2": {
       "version": "1.4.1",
@@ -4145,7 +4153,7 @@
     "methods": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
+      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="
     },
     "micromatch": {
       "version": "4.0.5",
@@ -4812,7 +4820,7 @@
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
     },
     "object-get": {
       "version": "2.1.1",
@@ -5175,7 +5183,7 @@
     "once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
       "requires": {
         "wrappy": "1"
       }
@@ -5247,7 +5255,7 @@
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="
     },
     "path-key": {
       "version": "3.1.1",
@@ -5264,7 +5272,7 @@
     "path-to-regexp": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
+      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
     },
     "path-type": {
       "version": "4.0.0",
@@ -5313,7 +5321,7 @@
     "prelude-ls": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
+      "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w=="
     },
     "prop-types": {
       "version": "15.8.1",
@@ -5504,7 +5512,7 @@
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
     },
     "require-main-filename": {
       "version": "2.0.0",
@@ -5691,7 +5699,7 @@
     "set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
+      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
     },
     "setprototypeof": {
       "version": "1.2.0",
@@ -5942,6 +5950,11 @@
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
       "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="
     },
+    "strnum": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz",
+      "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA=="
+    },
     "supports-color": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -6057,7 +6070,7 @@
     "to-fast-properties": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
       "dev": true
     },
     "to-regex-range": {
@@ -6155,7 +6168,7 @@
     "type-check": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
       "requires": {
         "prelude-ls": "~1.1.2"
       }
@@ -6243,7 +6256,7 @@
     "unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
+      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="
     },
     "uri-js": {
       "version": "4.4.1",
@@ -6282,7 +6295,7 @@
     "utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
+      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="
     },
     "uue": {
       "version": "3.1.2",
@@ -6306,7 +6319,7 @@
     "vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
+      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="
     },
     "w3c-hr-time": {
       "version": "1.0.2",
@@ -6397,7 +6410,7 @@
     "which-module": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+      "integrity": "sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==",
       "dev": true
     },
     "which-typed-array": {
@@ -6485,7 +6498,7 @@
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
     },
     "xml-name-validator": {
       "version": "4.0.0",
diff --git a/tests/UI/package.json b/tests/UI/package.json
index 950dc87c23968..aba3e22928294 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -118,6 +118,7 @@
     "chai-string": "^1.5.0",
     "csv-writer": "^1.6.0",
     "dotenv": "^16.3.1",
+    "fast-xml-parser": "^4.2.5",
     "jpeg-js": "^0.4.4",
     "js-image-generator": "^1.0.4",
     "maildev": "^2.0.5",
diff --git a/tests/UI/utils/xml.ts b/tests/UI/utils/xml.ts
index b62c189acc516..af96c5b96c205 100644
--- a/tests/UI/utils/xml.ts
+++ b/tests/UI/utils/xml.ts
@@ -1,4 +1,5 @@
 import {DOMParser} from '@xmldom/xmldom';
+import {XMLValidator} from 'fast-xml-parser';
 import * as xpath from 'xpath-ts';
 
 const domParser: DOMParser = new DOMParser();
@@ -60,4 +61,46 @@ export default {
 
     return xpath.select1(`string(${path})`, xmlDocument) as string;
   },
+
+  /**
+   * Returns if the XML is parseable
+   * @param {string} xml
+   * @return {boolean}
+   */
+  isValid(xml: string): boolean {
+    const result = XMLValidator.validate(xml, {
+      allowBooleanAttributes: true,
+    });
+
+    return result === true;
+  },
+
+  /**
+   * Returns if a Node Element is empty
+   * @param {Element} element
+   * @return {boolean}
+   */
+  isEmpty(element: Element): boolean {
+    if (element.childNodes.length > 0) {
+      for (let o: number = 0; o < element.childNodes.length; o++) {
+        if (!this.isEmpty(element.childNodes[o] as Element)) {
+          return false;
+        }
+      }
+
+      return true;
+    }
+
+    let xmlString: string = `<${element.nodeName}`;
+
+    for (let a: number = 0; a < element.attributes.length; a++) {
+      if (element.attributes[a].nodeName === 'xlink:href') {
+        xmlString += ' xmlns:xlink="http://www.w3.org/1999/xlink"';
+      }
+      xmlString += ` ${element.attributes[a].nodeName}="${element.attributes[a].nodeValue}"`;
+    }
+    xmlString += '/>';
+
+    return element.toString() === xmlString;
+  },
 };
diff --git a/tests/UI/webservices/baseWs.ts b/tests/UI/webservices/baseWs.ts
index 8d03de6d79a94..2c4317c95776d 100644
--- a/tests/UI/webservices/baseWs.ts
+++ b/tests/UI/webservices/baseWs.ts
@@ -1,6 +1,50 @@
 import type {APIRequestContext, APIResponse} from 'playwright';
 
 export default class BaseWS {
+  /**
+   * Returns a blank XML tree of the chosen resource
+   * @param apiContext {APIRequestContext}
+   * @param url {string}
+   * @param authorization {string}
+   */
+  protected static getBlank(
+    apiContext: APIRequestContext,
+    url: string,
+    authorization: string,
+  ): Promise<APIResponse> {
+    return apiContext.get(`${url}`, {
+      headers: {
+        Authorization: authorization,
+      },
+      params: {
+        schema: 'blank',
+        display: 'full',
+      },
+    });
+  };
+
+  /**
+   * Returns a blank XML tree of the chosen resource, with the format that is expected for each value and specific indicators
+   * @param apiContext {APIRequestContext}
+   * @param url {string}
+   * @param authorization {string}
+   */
+  protected static getSynopsis(
+    apiContext: APIRequestContext,
+    url: string,
+    authorization: string,
+  ): Promise<APIResponse> {
+    return apiContext.get(`${url}`, {
+      headers: {
+        Authorization: authorization,
+      },
+      params: {
+        schema: 'synopsis',
+        display: 'full',
+      },
+    });
+  };
+
   /**
    * Get all element
    * @param apiContext {APIRequestContext}
diff --git a/tests/UI/webservices/country/countryWs.ts b/tests/UI/webservices/country/countryWs.ts
index 366e109e2c226..60f71213354a2 100644
--- a/tests/UI/webservices/country/countryWs.ts
+++ b/tests/UI/webservices/country/countryWs.ts
@@ -4,6 +4,30 @@ import {APIRequestContext, APIResponse} from 'playwright';
 export default class CountryWS extends BaseWS {
   public static endpoint = 'api/countries';
 
+  /**
+   * Get Blank
+   * @param apiContext {APIRequestContext}
+   * @param authorization {string}
+   */
+  public static async getBlank(
+    apiContext: APIRequestContext,
+    authorization: string,
+  ): Promise<APIResponse> {
+    return super.getBlank(apiContext, this.endpoint, authorization);
+  }
+
+  /**
+   * Get Synopsis
+   * @param apiContext {APIRequestContext}
+   * @param authorization {string}
+   */
+  public static async getSynopsis(
+    apiContext: APIRequestContext,
+    authorization: string,
+  ): Promise<APIResponse> {
+    return super.getSynopsis(apiContext, this.endpoint, authorization);
+  }
+
   /**
    * Get All Countries
    * @param apiContext {APIRequestContext}

From 09c84e4900285e913e3e138514d9a0c32c1399ec Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Tue, 11 Jul 2023 18:45:55 +0200
Subject: [PATCH 0508/1030] Functional Tests : WS - Countries : Check Blank &
 Synopsis (ESLint)

---
 .../functional/WS/01_countriesCRUD.ts         | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/UI/campaigns/functional/WS/01_countriesCRUD.ts b/tests/UI/campaigns/functional/WS/01_countriesCRUD.ts
index 6ac52aa7fadd3..21edcec8a8421 100644
--- a/tests/UI/campaigns/functional/WS/01_countriesCRUD.ts
+++ b/tests/UI/campaigns/functional/WS/01_countriesCRUD.ts
@@ -149,15 +149,15 @@ describe('WS - Countries : CRUD', async () => {
         expect(nodes.length).to.be.gt(0);
 
         for (let c: number = 0; c < nodes.length; c++) {
-          const countryNode: Element = nodes[c];
+          const node: Element = nodes[c];
 
           // Attributes
-          const countryNodeAttributes: NamedNodeMap = countryNode.attributes;
-          expect(countryNodeAttributes.length).to.be.eq(0);
+          const nodeAttributes: NamedNodeMap = node.attributes;
+          expect(nodeAttributes.length).to.be.eq(0);
 
           // Empty value
-          const isEmpty = xml.isEmpty(countryNode);
-          expect(isEmpty, `The node ${countryNode.nodeName} is not empty`).to.be.true;
+          const isEmptyNode: boolean = xml.isEmpty(node);
+          await expect(isEmptyNode, `The node ${node.nodeName} is not empty`).to.be.true;
         }
       });
     });
@@ -186,13 +186,13 @@ describe('WS - Countries : CRUD', async () => {
       });
 
       it('should check response root node', async function () {
-        await testContext.addContextItem(this, 'testIdentifier', 'requestBlankRootNode', baseContext);
+        await testContext.addContextItem(this, 'testIdentifier', 'requestSynopsisRootNode', baseContext);
 
         expect(countryXml.getRootNodeName(xmlResponse)).to.be.eq('prestashop');
       });
 
       it('should check number of node under prestashop', async function () {
-        await testContext.addContextItem(this, 'testIdentifier', 'requestBlankChildNode', baseContext);
+        await testContext.addContextItem(this, 'testIdentifier', 'requestSynopsisChildNode', baseContext);
 
         const rootNodes = countryXml.getPrestaShopNodes(xmlResponse);
         expect(rootNodes.length).to.be.eq(1);
@@ -200,7 +200,7 @@ describe('WS - Countries : CRUD', async () => {
       });
 
       it('should check each node name, attributes and has empty values', async function () {
-        await testContext.addContextItem(this, 'testIdentifier', 'requestGetCheckAll1', baseContext);
+        await testContext.addContextItem(this, 'testIdentifier', 'requestSynopsisChildNodes', baseContext);
 
         const nodes = countryXml.getCountryNodes(xmlResponse);
         expect(nodes.length).to.be.gt(0);
@@ -216,8 +216,8 @@ describe('WS - Countries : CRUD', async () => {
           expect(nodeAttributes[nodeAttributes.length - 1].nodeName).to.be.eq('format');
 
           // Empty value
-          const isEmpty = xml.isEmpty(node);
-          expect(isEmpty, `The node ${node.nodeName} is not empty`).to.be.true;
+          const isEmptyNode = xml.isEmpty(node);
+          await expect(isEmptyNode, `The node ${node.nodeName} is not empty`).to.be.true;
         }
       });
     });

From e459a06e937d8724348a69fe3cbb554a22e01f95 Mon Sep 17 00:00:00 2001
From: Antonin 0x346e3730 CLAUZIER <antonin@clauzier.dev>
Date: Wed, 24 May 2023 18:10:56 +0400
Subject: [PATCH 0509/1030] New API Modularity - Modules can add Ressources WIP

---
 .../PrestaShopExtension.php                   | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/PrestaShopBundle/DependencyInjection/PrestaShopExtension.php b/src/PrestaShopBundle/DependencyInjection/PrestaShopExtension.php
index 23ab79276986b..c6fd4c2404178 100644
--- a/src/PrestaShopBundle/DependencyInjection/PrestaShopExtension.php
+++ b/src/PrestaShopBundle/DependencyInjection/PrestaShopExtension.php
@@ -26,16 +26,23 @@
 
 namespace PrestaShopBundle\DependencyInjection;
 
+use PrestaShop\PrestaShop\Adapter\Module\Repository\ModuleRepository;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 /**
  * Adds main PrestaShop core services to the Symfony container.
  */
-class PrestaShopExtension extends Extension
+class PrestaShopExtension extends Extension implements PrependExtensionInterface
 {
+    public function __construct()
+    {
+        $this->activeModulesPaths = (new ModuleRepository(_PS_ROOT_DIR_, _PS_MODULE_DIR_))->getActiveModulesPaths();
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -66,4 +73,16 @@ public function getAlias()
     {
         return 'prestashop';
     }
+
+    public function prepend(ContainerBuilder $container)
+    {
+        foreach ($this->activeModulesPaths as $modulePath) {
+            if (str_ends_with($modulePath, 'api_module')) {
+                $moduleResourcesPath = sprintf('%s/config/api_platform', $modulePath);
+                if (file_exists($moduleResourcesPath)) {
+                    $container->prependExtensionConfig('api_platform', ['mapping' => ['paths' => [$moduleResourcesPath]]]);
+                }
+            }
+        }
+    }
 }

From ba2359b649d29b54d34b4641345677ffc5f5fecd Mon Sep 17 00:00:00 2001
From: Antonin 0x346e3730 CLAUZIER <antonin@clauzier.dev>
Date: Wed, 24 May 2023 18:28:40 +0400
Subject: [PATCH 0510/1030] =?UTF-8?q?Load=20Ressources=20and=20or=20Entiti?=
 =?UTF-8?q?es=20too=20=F0=9F=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DependencyInjection/PrestaShopExtension.php    | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/PrestaShopBundle/DependencyInjection/PrestaShopExtension.php b/src/PrestaShopBundle/DependencyInjection/PrestaShopExtension.php
index c6fd4c2404178..35ddd78d6be5d 100644
--- a/src/PrestaShopBundle/DependencyInjection/PrestaShopExtension.php
+++ b/src/PrestaShopBundle/DependencyInjection/PrestaShopExtension.php
@@ -78,9 +78,17 @@ public function prepend(ContainerBuilder $container)
     {
         foreach ($this->activeModulesPaths as $modulePath) {
             if (str_ends_with($modulePath, 'api_module')) {
-                $moduleResourcesPath = sprintf('%s/config/api_platform', $modulePath);
-                if (file_exists($moduleResourcesPath)) {
-                    $container->prependExtensionConfig('api_platform', ['mapping' => ['paths' => [$moduleResourcesPath]]]);
+                $moduleConfigPath = sprintf('%s/config/api_platform', $modulePath);
+                if (file_exists($moduleConfigPath)) {
+                    $container->prependExtensionConfig('api_platform', ['mapping' => ['paths' => [$moduleConfigPath]]]);
+                }
+                $entitiesRessourcesPath = sprintf('%s/src/Entity', $modulePath);
+                if (file_exists($entitiesRessourcesPath)) {
+                    $container->prependExtensionConfig('api_platform', ['mapping' => ['paths' => [$entitiesRessourcesPath]]]);
+                }
+                $moduleRessourcesPath = sprintf('%s/src/ApiPlatform/Resources', $modulePath);
+                if (file_exists($moduleRessourcesPath)) {
+                    $container->prependExtensionConfig('api_platform', ['mapping' => ['paths' => [$moduleRessourcesPath]]]);
                 }
             }
         }

From 9310243de2512bf306c7209caf4ce44d351f9c6a Mon Sep 17 00:00:00 2001
From: Antonin 0x346e3730 CLAUZIER <antonin@clauzier.dev>
Date: Fri, 9 Jun 2023 11:21:06 +0400
Subject: [PATCH 0511/1030] Modularation API minus Symfony entities

---
 .../PrestaShopExtension.php                   | 45 +++++++++++++------
 1 file changed, 32 insertions(+), 13 deletions(-)

diff --git a/src/PrestaShopBundle/DependencyInjection/PrestaShopExtension.php b/src/PrestaShopBundle/DependencyInjection/PrestaShopExtension.php
index 35ddd78d6be5d..e89259a2513f6 100644
--- a/src/PrestaShopBundle/DependencyInjection/PrestaShopExtension.php
+++ b/src/PrestaShopBundle/DependencyInjection/PrestaShopExtension.php
@@ -38,6 +38,8 @@
  */
 class PrestaShopExtension extends Extension implements PrependExtensionInterface
 {
+    private $activeModulesPaths;
+
     public function __construct()
     {
         $this->activeModulesPaths = (new ModuleRepository(_PS_ROOT_DIR_, _PS_MODULE_DIR_))->getActiveModulesPaths();
@@ -76,21 +78,38 @@ public function getAlias()
 
     public function prepend(ContainerBuilder $container)
     {
+        $this->preprendApiConfig($container);
+    }
+
+    public function preprendApiConfig(ContainerBuilder $container)
+    {
+        $paths = [];
         foreach ($this->activeModulesPaths as $modulePath) {
-            if (str_ends_with($modulePath, 'api_module')) {
-                $moduleConfigPath = sprintf('%s/config/api_platform', $modulePath);
-                if (file_exists($moduleConfigPath)) {
-                    $container->prependExtensionConfig('api_platform', ['mapping' => ['paths' => [$moduleConfigPath]]]);
-                }
-                $entitiesRessourcesPath = sprintf('%s/src/Entity', $modulePath);
-                if (file_exists($entitiesRessourcesPath)) {
-                    $container->prependExtensionConfig('api_platform', ['mapping' => ['paths' => [$entitiesRessourcesPath]]]);
-                }
-                $moduleRessourcesPath = sprintf('%s/src/ApiPlatform/Resources', $modulePath);
-                if (file_exists($moduleRessourcesPath)) {
-                    $container->prependExtensionConfig('api_platform', ['mapping' => ['paths' => [$moduleRessourcesPath]]]);
-                }
+            // Load YAML definition from the config/api_platform folder in the module
+            $moduleConfigPath = sprintf('%s/config/api_platform', $modulePath);
+            if (file_exists($moduleConfigPath)) {
+                $paths[] = $moduleConfigPath;
+            }
+
+            /**
+             * TODO: Understand why this crashes PrestaShop and redirects to Front Office - no support of entities until then
+            // Load Doctrine entities that could be used as ApiPlatform DTO resources as well in the src/Entity folder
+            $entitiesRessourcesPath = sprintf('%s/src/Entity', $modulePath);
+            if (file_exists($entitiesRessourcesPath)) {
+                $paths[] = $entitiesRessourcesPath;
+            }
+             *
+             */
+
+            // Load ApiPLatform DTOs from the src/ApiPlatform/Resources folder
+            $moduleRessourcesPath = sprintf('%s/src/ApiPlatform/Resource', $modulePath);
+            if (file_exists($moduleRessourcesPath)) {
+                $paths[] = $moduleRessourcesPath;
             }
         }
+
+        if (!empty($paths)) {
+            $container->prependExtensionConfig('api_platform', ['mapping' => ['paths' => $paths]]);
+        }
     }
 }

From ce14f9e4430bad9ee509e7162514fe14239972ad Mon Sep 17 00:00:00 2001
From: Antonin 0x346e3730 CLAUZIER <antonin@clauzier.dev>
Date: Fri, 9 Jun 2023 16:10:11 +0400
Subject: [PATCH 0512/1030] PHPStan

---
 .../DependencyInjection/PrestaShopExtension.php       | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/PrestaShopBundle/DependencyInjection/PrestaShopExtension.php b/src/PrestaShopBundle/DependencyInjection/PrestaShopExtension.php
index e89259a2513f6..b0d5f5f22b0cb 100644
--- a/src/PrestaShopBundle/DependencyInjection/PrestaShopExtension.php
+++ b/src/PrestaShopBundle/DependencyInjection/PrestaShopExtension.php
@@ -93,12 +93,11 @@ public function preprendApiConfig(ContainerBuilder $container)
 
             /**
              * TODO: Understand why this crashes PrestaShop and redirects to Front Office - no support of entities until then
-            // Load Doctrine entities that could be used as ApiPlatform DTO resources as well in the src/Entity folder
-            $entitiesRessourcesPath = sprintf('%s/src/Entity', $modulePath);
-            if (file_exists($entitiesRessourcesPath)) {
-                $paths[] = $entitiesRessourcesPath;
-            }
-             *
+             * // Load Doctrine entities that could be used as ApiPlatform DTO resources as well in the src/Entity folder
+             * $entitiesRessourcesPath = sprintf('%s/src/Entity', $modulePath);
+             * if (file_exists($entitiesRessourcesPath)) {
+             *   $paths[] = $entitiesRessourcesPath;
+             * }
              */
 
             // Load ApiPLatform DTOs from the src/ApiPlatform/Resources folder

From e4352926081d2f79e57e70a9eee46bc3a1dfb5e1 Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Wed, 28 Jun 2023 19:06:09 +0200
Subject: [PATCH 0513/1030] Improve active module list loading

---
 app/AppKernel.php                             | 20 +++++--------------
 .../ContainerParametersExtension.php          |  6 +++++-
 src/Adapter/ContainerBuilder.php              |  6 +-----
 .../Compiler/LoadServicesFromModulesPass.php  | 15 ++++----------
 .../Compiler/ModulesDoctrineCompilerPass.php  |  8 +-------
 .../PrestaShopExtension.php                   | 14 +++++--------
 6 files changed, 21 insertions(+), 48 deletions(-)

diff --git a/app/AppKernel.php b/app/AppKernel.php
index 2f202228375a0..3f26811e46524 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -161,19 +161,6 @@ protected function cleanKernelReferences(): void
         SymfonyContainer::resetStaticCache();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function getKernelParameters()
-    {
-        $kernelParameters = parent::getKernelParameters();
-
-        return array_merge(
-            $kernelParameters,
-            array('kernel.active_modules' => $this->getActiveModules())
-        );
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -206,7 +193,6 @@ public function getLogDir()
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
         $installedModules = $this->getActiveModules();
-
         $loader->load($this->getRootDir() . '/config/config_' . $this->getEnvironment() . '.yml');
 
         $moduleTranslationsPaths = [];
@@ -233,9 +219,13 @@ public function registerContainerConfiguration(LoaderInterface $loader)
             }
         }
 
-        $loader->load(function (ContainerBuilder $container) use ($moduleTranslationsPaths) {
+        $loader->load(function (ContainerBuilder $container) use ($moduleTranslationsPaths, $installedModules) {
             $container->setParameter('container.autowiring.strict_mode', true);
             $container->setParameter('container.dumper.inline_class_loader', false);
+            $container->setParameter('prestashop.module_dir', _PS_MODULE_DIR_);
+            /** @deprecated kernel.active_modules is deprecated. Use prestashop.installed_modules instead. */
+            $container->setParameter('kernel.active_modules', $installedModules);
+            $container->setParameter('prestashop.installed_modules', $installedModules);
             $container->addObjectResource($this);
             $container->setParameter('modules_translation_paths', $moduleTranslationsPaths);
         });
diff --git a/src/Adapter/Container/ContainerParametersExtension.php b/src/Adapter/Container/ContainerParametersExtension.php
index c5cf39e2a2ffa..04871bcfef223 100644
--- a/src/Adapter/Container/ContainerParametersExtension.php
+++ b/src/Adapter/Container/ContainerParametersExtension.php
@@ -80,7 +80,11 @@ public function build(ContainerBuilder $container)
         $container->setParameter('kernel.cache_dir', $this->environment->getCacheDir());
 
         //Init the active modules
-        $container->setParameter('kernel.active_modules', (new ModuleRepository(_PS_ROOT_DIR_, _PS_MODULE_DIR_))->getActiveModules());
+        $activeModules = (new ModuleRepository(_PS_ROOT_DIR_, _PS_MODULE_DIR_))->getActiveModules();
+        /* @deprecated kernel.active_modules is deprecated. Use prestashop.installed_modules instead. */
+        $container->setParameter('kernel.active_modules', $activeModules);
+        $container->setParameter('prestashop.installed_modules', $activeModules);
+        $container->setParameter('prestashop.module_dir', _PS_MODULE_DIR_);
 
         if (!$container->hasParameter('kernel.project_dir')) {
             $container->setParameter('kernel.project_dir', _PS_ROOT_DIR_);
diff --git a/src/Adapter/ContainerBuilder.php b/src/Adapter/ContainerBuilder.php
index eddaa26f3f65b..35e97ab46bbd5 100644
--- a/src/Adapter/ContainerBuilder.php
+++ b/src/Adapter/ContainerBuilder.php
@@ -243,11 +243,7 @@ private function loadServicesFromConfig(LegacyContainerBuilder $container)
      */
     private function loadModulesAutoloader(ContainerInterface $container)
     {
-        if (!$container->hasParameter('kernel.active_modules')) {
-            return;
-        }
-
-        $activeModules = $container->getParameter('kernel.active_modules');
+        $activeModules = $container->getParameter('prestashop.installed_modules');
         /** @var array<string> $activeModules */
         foreach ($activeModules as $module) {
             $autoloader = _PS_MODULE_DIR_ . $module . '/vendor/autoload.php';
diff --git a/src/PrestaShopBundle/DependencyInjection/Compiler/LoadServicesFromModulesPass.php b/src/PrestaShopBundle/DependencyInjection/Compiler/LoadServicesFromModulesPass.php
index 4d9b66b75377d..4e36b0f47ebcb 100644
--- a/src/PrestaShopBundle/DependencyInjection/Compiler/LoadServicesFromModulesPass.php
+++ b/src/PrestaShopBundle/DependencyInjection/Compiler/LoadServicesFromModulesPass.php
@@ -26,7 +26,6 @@
 
 namespace PrestaShopBundle\DependencyInjection\Compiler;
 
-use PrestaShop\PrestaShop\Adapter\Module\Repository\ModuleRepository;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Loader\LoaderResolver;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
@@ -45,11 +44,6 @@ class LoadServicesFromModulesPass implements CompilerPassInterface
      */
     private $configPath;
 
-    /**
-     * @var array
-     */
-    private $activeModulesPaths;
-
     /**
      * Used to identify which scope of services need to be loaded (front services, admin
      * services or generic ones)
@@ -59,7 +53,6 @@ class LoadServicesFromModulesPass implements CompilerPassInterface
     public function __construct($containerName = '')
     {
         $this->configPath = '/config/' . (empty($containerName) ? '' : trim($containerName, '/') . '/');
-        $this->activeModulesPaths = (new ModuleRepository(_PS_ROOT_DIR_, _PS_MODULE_DIR_))->getActiveModulesPaths();
     }
 
     /**
@@ -67,11 +60,11 @@ public function __construct($containerName = '')
      */
     public function process(ContainerBuilder $container)
     {
-        if (empty($this->activeModulesPaths)) {
-            return;
-        }
+        $installedModules = $container->getParameter('prestashop.installed_modules');
+        $moduleDir = $container->getParameter('prestashop.module_dir');
 
-        foreach ($this->activeModulesPaths as $modulePath) {
+        foreach ($installedModules as $moduleName) {
+            $modulePath = $moduleDir . $moduleName;
             $moduleConfigPath = $modulePath . $this->configPath;
             if (file_exists($moduleConfigPath . 'services.yml')) {
                 $fileLocator = new FileLocator($moduleConfigPath);
diff --git a/src/PrestaShopBundle/DependencyInjection/Compiler/ModulesDoctrineCompilerPass.php b/src/PrestaShopBundle/DependencyInjection/Compiler/ModulesDoctrineCompilerPass.php
index 933d9a2c2de89..68859efedb196 100644
--- a/src/PrestaShopBundle/DependencyInjection/Compiler/ModulesDoctrineCompilerPass.php
+++ b/src/PrestaShopBundle/DependencyInjection/Compiler/ModulesDoctrineCompilerPass.php
@@ -47,13 +47,7 @@ class ModulesDoctrineCompilerPass implements CompilerPassInterface
      */
     public function process(ContainerBuilder $container)
     {
-        //We need the list of active modules to load their config, during install the parameter might no be available
-        //if the parameters file has not been generated yet, so we skip this part of the build
-        if (!$container->hasParameter('kernel.active_modules')) {
-            return;
-        }
-
-        $activeModules = $container->getParameter('kernel.active_modules');
+        $activeModules = $container->getParameter('prestashop.installed_modules');
         $compilerPassList = $this->getCompilerPassList($activeModules);
         /** @var CompilerPassInterface $compilerPass */
         foreach ($compilerPassList as $compilerResourcePath => $compilerPass) {
diff --git a/src/PrestaShopBundle/DependencyInjection/PrestaShopExtension.php b/src/PrestaShopBundle/DependencyInjection/PrestaShopExtension.php
index b0d5f5f22b0cb..e22a1a64f275a 100644
--- a/src/PrestaShopBundle/DependencyInjection/PrestaShopExtension.php
+++ b/src/PrestaShopBundle/DependencyInjection/PrestaShopExtension.php
@@ -26,7 +26,6 @@
 
 namespace PrestaShopBundle\DependencyInjection;
 
-use PrestaShop\PrestaShop\Adapter\Module\Repository\ModuleRepository;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
@@ -38,13 +37,6 @@
  */
 class PrestaShopExtension extends Extension implements PrependExtensionInterface
 {
-    private $activeModulesPaths;
-
-    public function __construct()
-    {
-        $this->activeModulesPaths = (new ModuleRepository(_PS_ROOT_DIR_, _PS_MODULE_DIR_))->getActiveModulesPaths();
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -84,7 +76,11 @@ public function prepend(ContainerBuilder $container)
     public function preprendApiConfig(ContainerBuilder $container)
     {
         $paths = [];
-        foreach ($this->activeModulesPaths as $modulePath) {
+        $installedModules = $container->getParameter('prestashop.installed_modules');
+        $moduleDir = $container->getParameter('prestashop.module_dir');
+
+        foreach ($installedModules as $moduleName) {
+            $modulePath = $moduleDir . $moduleName;
             // Load YAML definition from the config/api_platform folder in the module
             $moduleConfigPath = sprintf('%s/config/api_platform', $modulePath);
             if (file_exists($moduleConfigPath)) {

From 419011b9d06b3248776228e5b53392a9e623ab1b Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Sat, 8 Jul 2023 16:19:52 +0200
Subject: [PATCH 0514/1030] Remove advanced stock management

---
 .../themes/default/js/bundle/product/form.js  |   74 --
 .../js/bundle/product/product-combinations.js |    1 -
 .../new-theme/js/product-page/combination.js  |    1 -
 classes/Address.php                           |    9 +-
 classes/Carrier.php                           |   17 +-
 classes/Cart.php                              |  295 ++---
 classes/Pack.php                              |   36 +-
 classes/PaymentModule.php                     |   18 +-
 classes/Product.php                           |  257 +---
 classes/controller/AdminController.php        |    2 +-
 .../lang/KeysReference/StockMvtReasonLang.php |    6 -
 classes/lang/KeysReference/TabLang.php        |    2 -
 classes/order/Order.php                       |   34 +-
 classes/order/OrderDetail.php                 |   46 +-
 classes/order/OrderHistory.php                |   90 +-
 classes/order/OrderInvoice.php                |   17 -
 classes/pdf/HTMLTemplateSupplyOrderForm.php   |    1 +
 classes/pdf/PDF.php                           |    2 +
 classes/stock/Stock.php                       |    1 +
 classes/stock/StockAvailable.php              |  315 +----
 classes/stock/StockManager.php                |   43 +-
 classes/stock/StockManagerFactory.php         |    4 +-
 classes/stock/StockManagerInterface.php       |    1 +
 classes/stock/StockManagerModule.php          |    1 +
 classes/stock/StockMvt.php                    |    3 +-
 classes/stock/StockMvtReason.php              |    4 +
 classes/stock/StockMvtWS.php                  |    1 +
 classes/stock/SupplyOrder.php                 |    1 +
 classes/stock/SupplyOrderDetail.php           |    1 +
 classes/stock/SupplyOrderHistory.php          |    1 +
 classes/stock/SupplyOrderReceiptHistory.php   |    1 +
 classes/stock/SupplyOrderState.php            |    1 +
 classes/stock/Warehouse.php                   |   32 +-
 classes/stock/WarehouseProductLocation.php    |    1 +
 classes/webservice/WebserviceRequest.php      |    6 -
 controllers/admin/AdminCarriersController.php |   15 -
 .../admin/AdminCountriesController.php        |    1 -
 controllers/admin/AdminImportController.php   |  645 +--------
 controllers/admin/AdminPdfController.php      |   20 +-
 controllers/admin/AdminProductsController.php |  240 +---
 controllers/admin/AdminShopController.php     |    1 -
 .../admin/AdminSuppliersController.php        |    3 -
 install-dev/data/xml/access.xml               |   12 -
 install-dev/data/xml/authorization_role.xml   |   12 -
 install-dev/data/xml/configuration.xml        |    3 -
 install-dev/data/xml/stock_mvt_reason.xml     |    5 +
 install-dev/data/xml/supply_order_state.xml   |   19 -
 install-dev/data/xml/tab.xml                  | 1166 ++++++++---------
 install-dev/fixtures/fashion/data/access.xml  |    8 -
 install-dev/fixtures/fashion/data/address.xml |   11 +-
 .../fixtures/fashion/data/order_detail.xml    |   15 +-
 install-dev/fixtures/fashion/data/product.xml |   39 +-
 .../fixtures/fashion/data/stock_available.xml |  117 +-
 .../langs/en/data/supplier_order_state.xml    |   21 -
 .../langs/en/data/supply_order_state.xml      |   21 -
 install-dev/langs/en/data/tab.xml             |    1 -
 js/admin.js                                   |    1 -
 js/admin/products.js                          |   73 +-
 phpstan-disallowed-calls.neon                 |    9 -
 ...minAttributeGeneratorControllerWrapper.php |   38 +-
 .../Import/Handler/ProductImportHandler.php   |  128 +-
 src/Adapter/Import/ImportEntityDeleter.php    |    2 -
 .../AbstractOrderCommandHandler.php           |  131 +-
 .../AddProductToOrderHandler.php              |    1 -
 .../BulkChangeOrderStatusHandler.php          |    9 -
 .../UpdateOrderStatusHandler.php              |   14 +-
 .../Order/OrderProductQuantityUpdater.php     |  130 +-
 .../GetOrderProductsForViewingHandler.php     |   16 -
 src/Adapter/Order/Refund/OrderSlipCreator.php |    8 -
 .../Presenter/Product/ProductLazyArray.php    |    1 -
 src/Adapter/Product/AdminProductWrapper.php   |   17 -
 .../Stock/Update/ProductStockUpdater.php      |   13 -
 .../Validate/StockAvailableValidator.php      |    1 -
 .../AbstractEmployeeHandler.php               |   20 -
 .../BulkDeleteEmployeeHandler.php             |    1 -
 .../CommandHandler/DeleteEmployeeHandler.php  |    1 -
 src/Adapter/StockManager.php                  |   12 +-
 .../AbstractDeleteSupplierHandler.php         |   32 -
 .../Supplier/SupplierOrderValidator.php       |   11 +-
 .../Warehouse/WarehouseDataProvider.php       |   81 --
 .../CannotDeleteWarehouseManagerException.php |   34 -
 .../ProductPackConstraintException.php        |    3 +-
 .../Provider/CombinationFieldsProvider.php    |   15 -
 .../Provider/ProductFieldsProvider.php        |   24 -
 src/Core/Stock/StockManager.php               |    4 -
 .../Bridge/Smarty/HeaderConfigurator.php      |    2 +-
 .../Controller/Admin/ProductController.php    |   19 -
 .../Controller/Admin/SupplierController.php   |    1 -
 .../Controller/Admin/WarehouseController.php  |  104 --
 src/PrestaShopBundle/Entity/StockMvt.php      |    4 +-
 .../Form/Admin/Product/ProductQuantity.php    |   33 -
 .../Form/Admin/Product/ProductShipping.php    |   26 -
 .../Product/ProductWarehouseCombination.php   |  102 --
 .../Model/Product/AdminModelAdapter.php       |   76 --
 .../admin/sell/catalog/products/products.yml  |    4 -
 .../sell/catalog/products/warehouses.yml      |    9 -
 .../config/services/adapter/data_provider.yml |    4 -
 .../config/services/adapter/services.yml      |    1 -
 .../config/services/adapter/supplier.yml      |    2 +-
 .../config/services/bundle/form/form_type.yml |    3 -
 .../ProductPage/Forms/form_shipping.html.twig |    8 -
 .../Forms/form_supplier_choice.html.twig      |   10 +-
 .../form_warehouse_combination.html.twig      |   67 -
 .../ProductPage/Panels/combinations.html.twig |   21 +-
 .../Product/ProductPage/product.html.twig     |    8 +-
 .../Service/DataProvider/StockInterface.php   |    2 +
 .../Features/Context/CommonFeatureContext.php |   12 -
 .../Product/AbstractProductFeatureContext.php |    2 -
 .../Shop/update_stock_multishop.feature       |    1 -
 .../Scenario/Product/update_stock.feature     |    1 -
 .../Webservice/Endpoints/addresses.feature    |    4 -
 .../Model/Product/AdminModelAdapterTest.php   |    3 -
 tests/Resources/Resetter/ProductResetter.php  |    1 -
 .../override/AdminProductsController.php      |  374 +-----
 .../admin/AdminProductsController.php         |    3 +-
 .../admin/AdminProductsController.php         |  442 +------
 tests/Unit/Classes/ToolsTest.php              |    5 -
 117 files changed, 1062 insertions(+), 4822 deletions(-)
 delete mode 100644 install-dev/data/xml/supply_order_state.xml
 delete mode 100644 install-dev/langs/en/data/supplier_order_state.xml
 delete mode 100644 install-dev/langs/en/data/supply_order_state.xml
 delete mode 100644 src/Adapter/Warehouse/WarehouseDataProvider.php
 delete mode 100644 src/Core/Domain/Employee/Exception/CannotDeleteWarehouseManagerException.php
 delete mode 100644 src/PrestaShopBundle/Controller/Admin/WarehouseController.php
 delete mode 100644 src/PrestaShopBundle/Form/Admin/Product/ProductWarehouseCombination.php
 delete mode 100644 src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products/warehouses.yml
 delete mode 100644 src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/Forms/form_warehouse_combination.html.twig

diff --git a/admin-dev/themes/default/js/bundle/product/form.js b/admin-dev/themes/default/js/bundle/product/form.js
index 6367d776dd0ff..8d19eb3f01592 100644
--- a/admin-dev/themes/default/js/bundle/product/form.js
+++ b/admin-dev/themes/default/js/bundle/product/form.js
@@ -31,7 +31,6 @@ $(() => {
   formCategory.init();
   stock.init();
   supplier.init();
-  warehouseCombinations.init();
   customFieldCollection.init();
   virtualProduct.init();
   attachmentProduct.init();
@@ -543,22 +542,6 @@ window.stock = (function () {
         }
       });
 
-      /** if GSA : Show depends_on_stock choice only if advanced_stock_management checked */
-      $('#form_step3_advanced_stock_management').on('change', (e) => {
-        if (e.target.checked) {
-          $('#depends_on_stock_div').show();
-        } else {
-          $('#depends_on_stock_div').hide();
-        }
-        warehouseCombinations.refresh();
-      });
-
-      /** if GSA activation change on 'depend on stock', update quantities fields */
-      // eslint-disable-next-line
-      $('#form_step3_depends_on_stock_0, #form_step3_depends_on_stock_1, #form_step3_advanced_stock_management').on('change', (e) => {
-        displayFieldsManager.refresh();
-        warehouseCombinations.refresh();
-      });
       displayFieldsManager.refresh();
     },
   };
@@ -588,63 +571,6 @@ window.nav = (function () {
   };
 }());
 
-/**
- * Warehouse combination collection management (ASM only)
- */
-window.warehouseCombinations = (function () {
-  const idProduct = $('#form_id_product').val();
-  const collectionHolder = $('#warehouse_combination_collection');
-
-  return {
-    init() {
-      // toggle all button action
-      $(document).on('click', 'div[id^="warehouse_combination_"] button.check_all_warehouse', function () {
-        const checkboxes = $(this).closest('div[id^="warehouse_combination_"]')
-          .find('input[type="checkbox"][id$="_activated"]');
-        checkboxes.prop('checked', checkboxes.filter(':checked').length === 0);
-      });
-      // location disablation depending on 'stored' checkbox
-      // eslint-disable-next-line
-      $(document).on('change', 'div[id^="warehouse_combination_"] input[id^="form_step4_warehouse_combination_"][id$="_activated"]', function () {
-        const checked = $(this).prop('checked');
-        const location = $(this).closest('div.form-group')
-          .find('input[id^="form_step4_warehouse_combination_"][id$="_location"]');
-        location.prop('disabled', !checked);
-        if (!checked) {
-          location.val('');
-        }
-      });
-      this.locationDisabler();
-    },
-    locationDisabler() {
-      // eslint-disable-next-line
-      $('div[id^="warehouse_combination_"] input[id^="form_step4_warehouse_combination_"][id$="_activated"]', collectionHolder).each(function () {
-        const checked = $(this).prop('checked');
-        const location = $(this).closest('div.form-group')
-          .find('input[id^="form_step4_warehouse_combination_"][id$="_location"]');
-        location.prop('disabled', !checked);
-      });
-    },
-    refresh() {
-      const show = $('input#form_step3_advanced_stock_management:checked').length > 0;
-
-      if (show) {
-        const url = collectionHolder.attr('data-url').replace(/\/\d+(?=\?.*)/, `/${idProduct}`);
-        $.ajax({
-          url,
-          success(response) {
-            collectionHolder.empty().append(response);
-            collectionHolder.show();
-            warehouseCombinations.locationDisabler();
-          },
-        });
-      } else {
-        collectionHolder.hide();
-      }
-    },
-  };
-}());
-
 /**
  * Form management
  */
diff --git a/admin-dev/themes/default/js/bundle/product/product-combinations.js b/admin-dev/themes/default/js/bundle/product/product-combinations.js
index f3629600f84fb..e75a962ee8794 100644
--- a/admin-dev/themes/default/js/bundle/product/product-combinations.js
+++ b/admin-dev/themes/default/js/bundle/product/product-combinations.js
@@ -44,7 +44,6 @@ window.combinations = (function () {
             elem.removeAttr('disabled');
             $('#create-combinations, #apply-on-combinations, #submit, .btn-submit').removeAttr('disabled');
             supplierCombinations.refresh();
-            warehouseCombinations.refresh();
             if ($('.js-combinations-list .combination').length <= 0) {
               $('#combinations_thead').fadeOut();
             }
diff --git a/admin-dev/themes/new-theme/js/product-page/combination.js b/admin-dev/themes/new-theme/js/product-page/combination.js
index a01046592d31d..1095738759d52 100644
--- a/admin-dev/themes/new-theme/js/product-page/combination.js
+++ b/admin-dev/themes/new-theme/js/product-page/combination.js
@@ -211,7 +211,6 @@ export default function () {
         $('#create-combinations, #submit, .btn-submit').removeAttr('disabled');
         activateCombinationsBulk();
         window.supplierCombinations.refresh();
-        window.warehouseCombinations.refresh();
       },
     });
   };
diff --git a/classes/Address.php b/classes/Address.php
index 9339ebd0ded0f..edc8566fe5eb6 100644
--- a/classes/Address.php
+++ b/classes/Address.php
@@ -38,12 +38,11 @@ class AddressCore extends ObjectModel
     /** @var int Supplier ID which address belongs to */
     public $id_supplier = null;
 
-    /**
-     * @since 1.5.0
+    /** @var int Id warehouse the address belongs to
      *
-     * @var int Warehouse ID which address belongs to
+     * @deprecated since 9.0, advanced stock management has been completely removed
      */
-    public $id_warehouse = null;
+    public $id_warehouse = 0;
 
     /** @var int Country ID */
     public $id_country;
@@ -156,7 +155,6 @@ class AddressCore extends ObjectModel
             'id_customer' => ['xlink_resource' => 'customers'],
             'id_manufacturer' => ['xlink_resource' => 'manufacturers'],
             'id_supplier' => ['xlink_resource' => 'suppliers'],
-            'id_warehouse' => ['xlink_resource' => 'warehouse'],
             'id_country' => ['xlink_resource' => 'countries'],
             'id_state' => ['xlink_resource' => 'states'],
         ],
@@ -611,7 +609,6 @@ public static function getAddressIdBySupplierId($id_supplier)
         $query->where('deleted = 0');
         $query->where('id_customer = 0');
         $query->where('id_manufacturer = 0');
-        $query->where('id_warehouse = 0');
 
         return (int) Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($query);
     }
diff --git a/classes/Carrier.php b/classes/Carrier.php
index 76855434f2789..744eee88fefab 100644
--- a/classes/Carrier.php
+++ b/classes/Carrier.php
@@ -1457,12 +1457,12 @@ public static function getHigherPosition()
     }
 
     /**
-     * For a given {product, warehouse}, gets the carrier available.
+     * For a given product, gets the carrier available.
      *
      * @since 1.5.0
      *
      * @param Product $product The id of the product, or an array with at least the package size and weight
-     * @param int|null $id_warehouse Warehouse ID
+     * @param int|null $id_warehouse Warehouse ID - not used anymore
      * @param int|null $id_address_delivery Delivery Address ID
      * @param int|null$id_shop Shop ID
      * @param CartCore|null $cart Cart object
@@ -1472,7 +1472,7 @@ public static function getHigherPosition()
      *
      * @throws PrestaShopDatabaseException
      */
-    public static function getAvailableCarrierList(Product $product, $id_warehouse, $id_address_delivery = null, $id_shop = null, $cart = null, &$error = [])
+    public static function getAvailableCarrierList(Product $product, $id_warehouse = 0, $id_address_delivery = null, $id_shop = null, $cart = null, &$error = [])
     {
         static $ps_country_default = null;
 
@@ -1537,13 +1537,6 @@ public static function getAvailableCarrierList(Product $product, $id_warehouse,
             }//no linked carrier are available for this zone
         }
 
-        // The product is not directly linked with a carrier
-        // Get all the carriers linked to a warehouse
-        if ($id_warehouse) {
-            $warehouse = new Warehouse($id_warehouse);
-            $warehouse_carrier_list = $warehouse->getCarriers();
-        }
-
         $available_carrier_list = [];
         $cache_id = 'Carrier::getAvailableCarrierList_getCarriersForOrder_' . (int) $id_zone . '-' . (int) $cart->id;
         if (!Cache::isStored($cache_id)) {
@@ -1567,10 +1560,6 @@ public static function getAvailableCarrierList(Product $product, $id_warehouse,
             $carrier_list = $available_carrier_list;
         }
 
-        if (isset($warehouse_carrier_list)) {
-            $carrier_list = array_intersect($carrier_list, $warehouse_carrier_list);
-        }
-
         $cart_quantity = 0;
         $cart_weight = 0;
 
diff --git a/classes/Cart.php b/classes/Cart.php
index c98bfb3cb0468..e9aeb3e5e0dba 100644
--- a/classes/Cart.php
+++ b/classes/Cart.php
@@ -669,7 +669,7 @@ public function getProducts($refresh = false, $id_product = false, $id_country =
                         stock.`quantity` AS quantity_available, p.`width`, p.`height`, p.`depth`, stock.`out_of_stock`, p.`weight`,
                         p.`available_date`, p.`date_add`, p.`date_upd`, IFNULL(stock.quantity, 0) as quantity, pl.`link_rewrite`, cl.`link_rewrite` AS category,
                         CONCAT(LPAD(cp.`id_product`, 10, 0), LPAD(IFNULL(cp.`id_product_attribute`, 0), 10, 0), IFNULL(cp.`id_address_delivery`, 0), IFNULL(cp.`id_customization`, 0)) AS unique_id, cp.id_address_delivery,
-                        product_shop.advanced_stock_management, ps.product_supplier_reference supplier_reference');
+                        ps.product_supplier_reference supplier_reference');
 
         // Build FROM
         $sql->from('cart_product', 'cp');
@@ -2448,7 +2448,6 @@ public function getNbOfPackages()
      *               0 => array(  // First package
      *               'product_list' => array(...),
      *               'carrier_list' => array(...),
-     *               'id_warehouse' => array(...),
      *               ),
      *               ),
      *               );
@@ -2457,120 +2456,52 @@ public function getNbOfPackages()
      */
     public function getPackageList($flush = false)
     {
+        // Resolve cache key, we will get the info from cache if present and we are not forcing a refresh
         $cache_key = (int) $this->id . '_' . (int) $this->id_address_delivery;
         if (isset(static::$cachePackageList[$cache_key]) && static::$cachePackageList[$cache_key] !== false && !$flush) {
             return static::$cachePackageList[$cache_key];
         }
 
+        // Load products, hard refresh if needed
         $product_list = $this->getProducts($flush);
-        // Step 1 : Get product informations (warehouse_list and carrier_list), count warehouse
-        // Determine the best warehouse to determine the packages
-        // For that we count the number of time we can use a warehouse for a specific delivery address
-        $warehouse_count_by_address = [];
 
-        $stock_management_active = Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT');
+        // Step 1 - We assign some basic information (load their carriers) to products and separate them by their stock quantities.
+        $grouped_by_stock = [];
 
         foreach ($product_list as &$product) {
+            // Add cart's delivery address to products that don't have it for some reason
             if ((int) $product['id_address_delivery'] == 0) {
                 $product['id_address_delivery'] = (int) $this->id_address_delivery;
             }
 
-            if (!isset($warehouse_count_by_address[$product['id_address_delivery']])) {
-                $warehouse_count_by_address[$product['id_address_delivery']] = [];
-            }
-
-            $product['warehouse_list'] = [];
-
-            if ($stock_management_active &&
-                (int) $product['advanced_stock_management'] == 1) {
-                $warehouse_list = Warehouse::getProductWarehouseList($product['id_product'], $product['id_product_attribute'], $this->id_shop);
-                if (count($warehouse_list) == 0) {
-                    $warehouse_list = Warehouse::getProductWarehouseList($product['id_product'], $product['id_product_attribute']);
-                }
-                // Does the product is in stock ?
-                // If yes, get only warehouse where the product is in stock
-
-                $warehouse_in_stock = [];
-                $manager = StockManagerFactory::getManager();
-
-                foreach ($warehouse_list as $key => $warehouse) {
-                    $product_real_quantities = $manager->getProductRealQuantities(
-                        $product['id_product'],
-                        $product['id_product_attribute'],
-                        [$warehouse['id_warehouse']],
-                        true
-                    );
-
-                    if ($product_real_quantities > 0 || Pack::isPack((int) $product['id_product'])) {
-                        $warehouse_in_stock[] = $warehouse;
-                    }
-                }
-
-                if (!empty($warehouse_in_stock)) {
-                    $warehouse_list = $warehouse_in_stock;
-                    $product['in_stock'] = true;
-                } else {
-                    $product['in_stock'] = false;
-                }
-            } else {
-                //simulate default warehouse
-                $warehouse_list = [0 => ['id_warehouse' => 0]];
-                $product['in_stock'] = StockAvailable::getQuantityAvailableByProduct($product['id_product'], $product['id_product_attribute']) > 0;
-            }
-
-            foreach ($warehouse_list as $warehouse) {
-                $product['warehouse_list'][$warehouse['id_warehouse']] = $warehouse['id_warehouse'];
-                if (!isset($warehouse_count_by_address[$product['id_address_delivery']][$warehouse['id_warehouse']])) {
-                    $warehouse_count_by_address[$product['id_address_delivery']][$warehouse['id_warehouse']] = 0;
-                }
-
-                ++$warehouse_count_by_address[$product['id_address_delivery']][$warehouse['id_warehouse']];
-            }
-        }
-        unset($product);
-
-        arsort($warehouse_count_by_address);
-
-        // Step 2 : Group product by warehouse
-        $grouped_by_warehouse = [];
-
-        foreach ($product_list as &$product) {
-            if (!isset($grouped_by_warehouse[$product['id_address_delivery']])) {
-                $grouped_by_warehouse[$product['id_address_delivery']] = [
+            // Initialize our array if it's the first product going to that address
+            if (!isset($grouped_by_stock[$product['id_address_delivery']])) {
+                $grouped_by_stock[$product['id_address_delivery']] = [
                     'in_stock' => [],
                     'out_of_stock' => [],
                 ];
             }
 
-            $product['carrier_list'] = [];
-            $id_warehouse = 0;
-            foreach ($warehouse_count_by_address[$product['id_address_delivery']] as $id_war => $val) {
-                if (array_key_exists((int) $id_war, $product['warehouse_list'])) {
-                    $product['carrier_list'] = array_replace(
-                        $product['carrier_list'],
-                        Carrier::getAvailableCarrierList(
-                            new Product($product['id_product']),
-                            $id_war,
-                            $product['id_address_delivery'],
-                            null,
-                            $this
-                        )
-                    );
-                    if (!$id_warehouse) {
-                        $id_warehouse = (int) $id_war;
-                    }
-                }
-            }
+            // Get product's carriers - the product can have some specific limitations
+            $product['carrier_list'] = Carrier::getAvailableCarrierList(
+                new Product($product['id_product']),
+                0,
+                $product['id_address_delivery'],
+                null,
+                $this
+            );
 
-            if (!isset($grouped_by_warehouse[$product['id_address_delivery']]['in_stock'][$id_warehouse])) {
-                $grouped_by_warehouse[$product['id_address_delivery']]['in_stock'][$id_warehouse] = [];
-                $grouped_by_warehouse[$product['id_address_delivery']]['out_of_stock'][$id_warehouse] = [];
+            // Apply fallback if no carrier is found
+            if (empty($product['carrier_list'])) {
+                $product['carrier_list'] = [0 => 0];
             }
 
+            // If "send in-stock items first" is enabled and properly implemented sometime in the future, we separate products by stock
             if (!$this->allow_seperated_package) {
-                $key = 'in_stock';
+                $stockGroupKey = 'in_stock';
             } else {
-                $key = $product['in_stock'] ? 'in_stock' : 'out_of_stock';
+                $product['in_stock'] = StockAvailable::getQuantityAvailableByProduct($product['id_product'], $product['id_product_attribute']) > 0;
+                $stockGroupKey = $product['in_stock'] ? 'in_stock' : 'out_of_stock';
                 $product_quantity_in_stock = StockAvailable::getQuantityAvailableByProduct($product['id_product'], $product['id_product_attribute']);
                 if ($product['in_stock'] && $product['cart_quantity'] > $product_quantity_in_stock) {
                     $out_stock_part = $product['cart_quantity'] - $product_quantity_in_stock;
@@ -2578,55 +2509,56 @@ public function getPackageList($flush = false)
                     $product_bis['cart_quantity'] = $out_stock_part;
                     $product_bis['in_stock'] = 0;
                     $product['cart_quantity'] -= $out_stock_part;
-                    $grouped_by_warehouse[$product['id_address_delivery']]['out_of_stock'][$id_warehouse][] = $product_bis;
+                    $grouped_by_stock[$product['id_address_delivery']]['out_of_stock'][] = $product_bis;
                 }
             }
 
-            if (empty($product['carrier_list'])) {
-                $product['carrier_list'] = [0 => 0];
-            }
-
-            $grouped_by_warehouse[$product['id_address_delivery']][$key][$id_warehouse][] = $product;
+            $grouped_by_stock[$product['id_address_delivery']][$stockGroupKey][] = $product;
         }
         unset($product);
+        // Now we have them in two groups, those in stock and those not in stock.
 
-        // Step 3 : grouped product from grouped_by_warehouse by available carriers
+        // Step 2 - We divide those two groups once more into groups by their carriers.
         $grouped_by_carriers = [];
-        foreach ($grouped_by_warehouse as $id_address_delivery => $products_in_stock_list) {
+        foreach ($grouped_by_stock as $id_address_delivery => $products_in_stock_list) {
+            // Initialize our array if it's the first product going to that address
             if (!isset($grouped_by_carriers[$id_address_delivery])) {
                 $grouped_by_carriers[$id_address_delivery] = [
                     'in_stock' => [],
                     'out_of_stock' => [],
                 ];
             }
-            foreach ($products_in_stock_list as $key => $warehouse_list) {
-                if (!isset($grouped_by_carriers[$id_address_delivery][$key])) {
-                    $grouped_by_carriers[$id_address_delivery][$key] = [];
-                }
-                foreach ($warehouse_list as $id_warehouse => $product_list) {
-                    if (!isset($grouped_by_carriers[$id_address_delivery][$key][$id_warehouse])) {
-                        $grouped_by_carriers[$id_address_delivery][$key][$id_warehouse] = [];
-                    }
-                    foreach ($product_list as $product) {
-                        $package_carriers_key = implode(',', $product['carrier_list']);
-
-                        if (!isset($grouped_by_carriers[$id_address_delivery][$key][$id_warehouse][$package_carriers_key])) {
-                            $grouped_by_carriers[$id_address_delivery][$key][$id_warehouse][$package_carriers_key] = [
-                                'product_list' => [],
-                                'carrier_list' => $product['carrier_list'],
-                                'warehouse_list' => $product['warehouse_list'],
-                            ];
-                        }
 
-                        $grouped_by_carriers[$id_address_delivery][$key][$id_warehouse][$package_carriers_key]['product_list'][] = $product;
+            foreach ($products_in_stock_list as $key => $product_list) {
+                foreach ($product_list as $product) {
+                    // We construct unique key by combining IDs of their carriers
+                    $package_carriers_key = implode(',', $product['carrier_list']);
+
+                    // Initialize our array if it's the first product with this combination of these carriers
+                    if (!isset($grouped_by_carriers[$id_address_delivery][$key][$package_carriers_key])) {
+                        $grouped_by_carriers[$id_address_delivery][$key][$package_carriers_key] = [
+                            'product_list' => [],
+                            'carrier_list' => $product['carrier_list'],
+                        ];
                     }
+
+                    // Add this product to this carrier combination group
+                    $grouped_by_carriers[$id_address_delivery][$key][$package_carriers_key]['product_list'][] = $product;
                 }
             }
         }
+        // Now we have them in two groups, those in stock and those not in stock, then grouped by their common carriers.
 
+        /*
+         * Step 3 - merge product from grouped_by_carriers into $package to minimize the number of package.
+         * Example:
+         * Product A can be sent with carriers A and B
+         * Product B can be sent with carriers A and C
+         * Resulting package will be 1 with carrier A
+         */
         $package_list = [];
-        // Step 4 : merge product from grouped_by_carriers into $package to minimize the number of package
         foreach ($grouped_by_carriers as $id_address_delivery => $products_in_stock_list) {
+            // Initialize our array if it's the first product going to that address
             if (!isset($package_list[$id_address_delivery])) {
                 $package_list[$id_address_delivery] = [
                     'in_stock' => [],
@@ -2634,67 +2566,57 @@ public function getPackageList($flush = false)
                 ];
             }
 
-            foreach ($products_in_stock_list as $key => $warehouse_list) {
-                if (!isset($package_list[$id_address_delivery][$key])) {
-                    $package_list[$id_address_delivery][$key] = [];
-                }
-                // Count occurance of each carriers to minimize the number of packages
-                $carrier_count = [];
-                foreach ($warehouse_list as $id_warehouse => $products_grouped_by_carriers) {
-                    foreach ($products_grouped_by_carriers as $data) {
-                        foreach ($data['carrier_list'] as $id_carrier) {
-                            if (!isset($carrier_count[$id_carrier])) {
-                                $carrier_count[$id_carrier] = 0;
-                            }
-                            ++$carrier_count[$id_carrier];
+            // Count occurance of each carriers to minimize the number of packages
+            $carrier_count = [];
+            foreach ($products_in_stock_list as $key => $products_grouped_by_carriers) {
+                foreach ($products_grouped_by_carriers as $data) {
+                    foreach ($data['carrier_list'] as $id_carrier) {
+                        if (!isset($carrier_count[$id_carrier])) {
+                            $carrier_count[$id_carrier] = 0;
                         }
+                        ++$carrier_count[$id_carrier];
                     }
                 }
-                arsort($carrier_count);
-                foreach ($warehouse_list as $id_warehouse => $products_grouped_by_carriers) {
-                    if (!isset($package_list[$id_address_delivery][$key][$id_warehouse])) {
-                        $package_list[$id_address_delivery][$key][$id_warehouse] = [];
-                    }
-                    foreach ($products_grouped_by_carriers as $data) {
-                        foreach ($carrier_count as $id_carrier => $rate) {
-                            if (array_key_exists($id_carrier, $data['carrier_list'])) {
-                                if (!isset($package_list[$id_address_delivery][$key][$id_warehouse][$id_carrier])) {
-                                    $package_list[$id_address_delivery][$key][$id_warehouse][$id_carrier] = [
-                                        'carrier_list' => $data['carrier_list'],
-                                        'warehouse_list' => $data['warehouse_list'],
-                                        'product_list' => [],
-                                    ];
-                                }
-                                $package_list[$id_address_delivery][$key][$id_warehouse][$id_carrier]['carrier_list'] =
-                                    array_intersect($package_list[$id_address_delivery][$key][$id_warehouse][$id_carrier]['carrier_list'], $data['carrier_list']);
-                                $package_list[$id_address_delivery][$key][$id_warehouse][$id_carrier]['product_list'] =
-                                    array_merge($package_list[$id_address_delivery][$key][$id_warehouse][$id_carrier]['product_list'], $data['product_list']);
-
-                                break;
+            }
+            arsort($carrier_count);
+            foreach ($products_in_stock_list as $key => $products_grouped_by_carriers) {
+                foreach ($products_grouped_by_carriers as $data) {
+                    foreach ($carrier_count as $id_carrier => $rate) {
+                        if (array_key_exists($id_carrier, $data['carrier_list'])) {
+                            if (!isset($package_list[$id_address_delivery][$key][$id_carrier])) {
+                                $package_list[$id_address_delivery][$key][$id_carrier] = [
+                                    'carrier_list' => $data['carrier_list'],
+                                    'product_list' => [],
+                                ];
                             }
+                            $package_list[$id_address_delivery][$key][$id_carrier]['carrier_list'] =
+                                array_intersect($package_list[$id_address_delivery][$key][$id_carrier]['carrier_list'], $data['carrier_list']);
+                            $package_list[$id_address_delivery][$key][$id_carrier]['product_list'] =
+                                array_merge($package_list[$id_address_delivery][$key][$id_carrier]['product_list'], $data['product_list']);
+
+                            break;
                         }
                     }
                 }
             }
         }
 
-        // Step 5 : Reduce depth of $package_list
+        // Step 4 - Reduce depth of $package_list
         $final_package_list = [];
         foreach ($package_list as $id_address_delivery => $products_in_stock_list) {
+            // Initialize our array if it's the first product going to that address
             if (!isset($final_package_list[$id_address_delivery])) {
                 $final_package_list[$id_address_delivery] = [];
             }
 
-            foreach ($products_in_stock_list as $key => $warehouse_list) {
-                foreach ($warehouse_list as $id_warehouse => $products_grouped_by_carriers) {
-                    foreach ($products_grouped_by_carriers as $data) {
-                        $final_package_list[$id_address_delivery][] = [
-                            'product_list' => $data['product_list'],
-                            'carrier_list' => $data['carrier_list'],
-                            'warehouse_list' => $data['warehouse_list'],
-                            'id_warehouse' => $id_warehouse,
-                        ];
-                    }
+            foreach ($products_in_stock_list as $products_grouped_by_carriers) {
+                foreach ($products_grouped_by_carriers as $data) {
+                    $final_package_list[$id_address_delivery][] = [
+                        'product_list' => $data['product_list'],
+                        'carrier_list' => $data['carrier_list'],
+                        'warehouse_list' => [0 => 0], // For backward compatibility - not used
+                        'id_warehouse' => 0, // For backward compatibility - not used
+                    ];
                 }
             }
         }
@@ -2704,25 +2626,15 @@ public function getPackageList($flush = false)
         return $final_package_list;
     }
 
+    /**
+     * @deprecated Since 9.0 and will be removed in 10.0
+     */
     public function getPackageIdWarehouse($package, $id_carrier = null)
     {
-        if ($id_carrier === null) {
-            if (isset($package['id_carrier'])) {
-                $id_carrier = (int) $package['id_carrier'];
-            }
-        }
-
-        if ($id_carrier == null) {
-            return $package['id_warehouse'];
-        }
-
-        foreach ($package['warehouse_list'] as $id_warehouse) {
-            $warehouse = new Warehouse((int) $id_warehouse);
-            $available_warehouse_carriers = $warehouse->getCarriers();
-            if (in_array($id_carrier, $available_warehouse_carriers)) {
-                return (int) $id_warehouse;
-            }
-        }
+        @trigger_error(sprintf(
+            '%s is deprecated since 9.0 and will be removed in 10.0.',
+            __METHOD__
+        ), E_USER_DEPRECATED);
 
         return 0;
     }
@@ -4040,23 +3952,6 @@ public function checkQuantities($returnProductOnFailure = false)
         }
 
         foreach ($this->getProducts() as $product) {
-            if (
-                !$this->allow_seperated_package
-                && !$product['allow_oosp']
-                && StockAvailable::dependsOnStock($product['id_product'])
-                && $product['advanced_stock_management']
-                && (bool) Context::getContext()->customer->isLogged()
-            ) {
-                $delivery = $this->getDeliveryOption();
-                if (!empty($delivery)) {
-                    $product['stock_quantity'] = StockManager::getStockByCarrier(
-                        (int) $product['id_product'],
-                        (int) $product['id_product_attribute'],
-                        $delivery
-                    );
-                }
-            }
-
             if (
                 !$product['active'] ||
                 !$product['available_for_order'] ||
diff --git a/classes/Pack.php b/classes/Pack.php
index 67f2549dec1c0..75f5dcb5cd5f4 100644
--- a/classes/Pack.php
+++ b/classes/Pack.php
@@ -531,21 +531,16 @@ public static function isCurrentlyUsed($table = null, $has_active_column = false
      * @param int $id_product id_pack
      *
      * @return bool
+     *
+     * @deprecated Since 9.0 and will be removed in 10.0
      */
     public static function usesAdvancedStockManagement($id_product)
     {
-        if (!Pack::isPack($id_product)) {
-            return false;
-        }
+        @trigger_error(sprintf(
+            '%s is deprecated since 9.0 and will be removed in 10.0.',
+            __METHOD__
+        ), E_USER_DEPRECATED);
 
-        $products = Pack::getItems($id_product, Configuration::get('PS_LANG_DEFAULT'));
-        foreach ($products as $product) {
-            // if one product uses the advanced stock management
-            if ($product->advanced_stock_management == 1) {
-                return true;
-            }
-        }
-        // not used
         return false;
     }
 
@@ -555,22 +550,17 @@ public static function usesAdvancedStockManagement($id_product)
      * @param int $id_product id_pack
      *
      * @return bool
+     *
+     * @deprecated Since 9.0 and will be removed in 10.0
      */
     public static function allUsesAdvancedStockManagement($id_product)
     {
-        if (!Pack::isPack($id_product)) {
-            return false;
-        }
+        @trigger_error(sprintf(
+            '%s is deprecated since 9.0 and will be removed in 10.0.',
+            __METHOD__
+        ), E_USER_DEPRECATED);
 
-        $products = Pack::getItems($id_product, Configuration::get('PS_LANG_DEFAULT'));
-        foreach ($products as $product) {
-            // if one product uses the advanced stock management
-            if ($product->advanced_stock_management == 0) {
-                return false;
-            }
-        }
-        // not used
-        return true;
+        return false;
     }
 
     /**
diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php
index 24560f01b44ed..10f13b23d4039 100644
--- a/classes/PaymentModule.php
+++ b/classes/PaymentModule.php
@@ -297,8 +297,6 @@ public function validateOrder(
         foreach ($cart_delivery_option as $id_address => $key_carriers) {
             foreach ($delivery_option_list[$id_address][$key_carriers]['carrier_list'] as $id_carrier => $data) {
                 foreach ($data['package_list'] as $id_package) {
-                    // Rewrite the id_warehouse
-                    $package_list[$id_address][$id_package]['id_warehouse'] = (int) $this->context->cart->getPackageIdWarehouse($package_list[$id_address][$id_package], (int) $id_carrier);
                     $package_list[$id_address][$id_package]['id_carrier'] = $id_carrier;
                 }
             }
@@ -346,7 +344,7 @@ public function validateOrder(
                     $this->name,
                     $dont_touch_amount,
                     $amount_paid,
-                    $package_list[$id_address][$id_package]['id_warehouse'],
+                    0,
                     $cart_total_paid,
                     self::DEBUG_MODE,
                     $order_status,
@@ -721,18 +719,6 @@ public function validateOrder(
                 }
             }
 
-            // updates stock in shops
-            if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) {
-                $product_list = $order->getProducts();
-                foreach ($product_list as $product) {
-                    // if the available quantities depends on the physical stock
-                    if (StockAvailable::dependsOnStock($product['product_id'])) {
-                        // synchronizes
-                        StockAvailable::synchronize($product['product_id'], $order->id_shop);
-                    }
-                }
-            }
-
             $order->updateOrderDetailTax();
 
             // sync all stock
@@ -1099,7 +1085,7 @@ protected function createOrderFromCart(
 
         // Insert new Order detail list using cart for the current order
         $order_detail = new OrderDetail(null, null, $context);
-        $order_detail->createList($order, $cart, $id_order_state, $order->product_list, 0, true, $warehouseId);
+        $order_detail->createList($order, $cart, $id_order_state, $order->product_list, 0, true);
 
         if ($debug) {
             PrestaShopLogger::addLog('PaymentModule::validateOrder - OrderCarrier is about to be added', 1, null, 'Cart', (int) $cart->id, true);
diff --git a/classes/Product.php b/classes/Product.php
index 9d1941fae56b4..4900b003b5d49 100644
--- a/classes/Product.php
+++ b/classes/Product.php
@@ -26,7 +26,6 @@
  */
 
 use PrestaShop\Decimal\DecimalNumber;
-use PrestaShop\PrestaShop\Adapter\ServiceLocator;
 use PrestaShop\PrestaShop\Core\Domain\Product\Pack\ValueObject\PackStockType;
 use PrestaShop\PrestaShop\Core\Domain\Product\ProductSettings;
 use PrestaShop\PrestaShop\Core\Domain\Product\Stock\ValueObject\OutOfStockType;
@@ -298,7 +297,7 @@ class ProductCore extends ObjectModel
      *
      * @var bool|null
      */
-    public $depends_on_stock;
+    public $depends_on_stock = false;
 
     /**
      * @var bool
@@ -841,17 +840,6 @@ public function update($null_values = false)
         $this->setGroupReduction();
         $this->updateUnitRatio();
 
-        // Sync stock Reference, EAN13, MPN and UPC
-        if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && StockAvailable::dependsOnStock($this->id, Context::getContext()->shop->id)) {
-            Db::getInstance()->update('stock', [
-                'reference' => pSQL($this->reference),
-                'ean13' => pSQL($this->ean13),
-                'isbn' => pSQL($this->isbn),
-                'upc' => pSQL($this->upc),
-                'mpn' => pSQL($this->mpn),
-            ], 'id_product = ' . (int) $this->id . ' AND id_product_attribute = 0');
-        }
-
         Hook::exec('actionProductSave', ['id_product' => (int) $this->id, 'product' => $this]);
         Hook::exec('actionProductUpdate', ['id_product' => (int) $this->id, 'product' => $this]);
         if ($this->getType() == Product::PTYPE_VIRTUAL && $this->active && !Configuration::get('PS_VIRTUAL_PROD_FEATURE_ACTIVE')) {
@@ -1297,33 +1285,6 @@ public function validateField($field, $value, $id_lang = null, $skip = [], $huma
      */
     public function delete()
     {
-        /*
-         * @since 1.5.0
-         * It is NOT possible to delete a product if there are currently:
-         * - physical stock for this product
-         * - supply order(s) for this product
-         */
-        if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && $this->advanced_stock_management) {
-            $stock_manager = StockManagerFactory::getManager();
-            $physical_quantity = $stock_manager->getProductPhysicalQuantities($this->id, 0);
-            $real_quantity = $stock_manager->getProductRealQuantities($this->id, 0);
-            if ($physical_quantity > 0) {
-                return false;
-            }
-            if ($real_quantity > $physical_quantity) {
-                return false;
-            }
-
-            $warehouse_product_locations = ServiceLocator::get('\\PrestaShop\\PrestaShop\\Core\\Foundation\\Database\\EntityManager')->getRepository('WarehouseProductLocation')->findByIdProduct($this->id);
-            foreach ($warehouse_product_locations as $warehouse_product_location) {
-                $warehouse_product_location->delete();
-            }
-
-            $stocks = ServiceLocator::get('\\PrestaShop\\PrestaShop\\Core\\Foundation\\Database\\EntityManager')->getRepository('Stock')->findByIdProduct($this->id);
-            foreach ($stocks as $stock) {
-                $stock->delete();
-            }
-        }
         $result = parent::delete();
 
         // Removes the product from StockAvailable, for the current shop
@@ -1803,7 +1764,6 @@ public function productAttributeExists($attributes_list, $current_product_attrib
      * The supplier_reference params now set the supplier reference of the default supplier of the product if possible
      *
      * @deprecated since 1.5.0
-     * @see StockManager if you want to manage real stock
      * @see StockAvailable if you want to manage available quantities for sale on your shop(s)
      * @see ProductSupplier for manage supplier reference(s)
      *
@@ -2346,17 +2306,6 @@ public function updateAttribute(
             $this->cache_default_attribute = $id_default_attribute;
         }
 
-        // Sync stock Reference, EAN13, ISBN, MPN and UPC for this attribute
-        if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && StockAvailable::dependsOnStock($this->id, Context::getContext()->shop->id)) {
-            Db::getInstance()->update('stock', [
-                'reference' => pSQL($reference),
-                'ean13' => pSQL($ean13),
-                'isbn' => pSQL($isbn),
-                'upc' => pSQL($upc),
-                'mpn' => pSQL($mpn),
-            ], 'id_product = ' . $this->id . ' AND id_product_attribute = ' . (int) $id_product_attribute);
-        }
-
         Hook::exec('actionProductAttributeUpdate', ['id_product_attribute' => (int) $id_product_attribute]);
 
         return true;
@@ -2473,38 +2422,9 @@ public function addAttribute(
             $combination->setImages($id_images);
         }
 
-        if (Configuration::get('PS_DEFAULT_WAREHOUSE_NEW_PRODUCT') != 0 && Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) {
-            $warehouse_location_entity = new WarehouseProductLocation();
-            $warehouse_location_entity->id_product = $this->id;
-            $warehouse_location_entity->id_product_attribute = (int) $combination->id;
-            $warehouse_location_entity->id_warehouse = (int) Configuration::get('PS_DEFAULT_WAREHOUSE_NEW_PRODUCT');
-            $warehouse_location_entity->location = pSQL('');
-            $warehouse_location_entity->save();
-        }
-
         return (int) $combination->id;
     }
 
-    /**
-     * @deprecated since 1.5.0
-     *
-     * @return bool
-     */
-    public function updateQuantityProductWithAttributeQuantity()
-    {
-        Tools::displayAsDeprecated();
-
-        return Db::getInstance()->execute('
-        UPDATE `' . _DB_PREFIX_ . 'product`
-        SET `quantity` = IFNULL(
-        (
-            SELECT SUM(`quantity`)
-            FROM `' . _DB_PREFIX_ . 'product_attribute`
-            WHERE `id_product` = ' . (int) $this->id . '
-        ), \'0\')
-        WHERE `id_product` = ' . (int) $this->id);
-    }
-
     /**
      * Delete product attributes.
      *
@@ -4899,7 +4819,7 @@ public static function searchByName($id_lang, $query, Context $context = null, $
             Tools::displayParameterAsDeprecated('context');
         }
         $sql = new DbQuery();
-        $sql->select('p.`id_product`, pl.`name`, p.`ean13`, p.`isbn`, p.`upc`, p.`mpn`, p.`active`, p.`reference`, m.`name` AS manufacturer_name, stock.`quantity`, product_shop.advanced_stock_management, p.`customizable`');
+        $sql->select('p.`id_product`, pl.`name`, p.`ean13`, p.`isbn`, p.`upc`, p.`mpn`, p.`active`, p.`reference`, m.`name` AS manufacturer_name, stock.`quantity`, p.`customizable`');
         $sql->from('product', 'p');
         $sql->join(Shop::addSqlAssociation('product', 'p'));
         $sql->leftJoin(
@@ -6720,81 +6640,6 @@ public static function checkAccessStatic($id_product, $id_customer)
         return Cache::retrieve($cache_id);
     }
 
-    /**
-     * Add a stock movement for current product.
-     *
-     * Since 1.5, this method only permit to add/remove available quantities of the current product in the current shop
-     *
-     * @see StockManager if you want to manage real stock
-     * @see StockAvailable if you want to manage available quantities for sale on your shop(s)
-     * @deprecated since 1.5.0
-     *
-     * @param int $quantity
-     * @param int $id_reason StockMvtReason identifier - useless
-     * @param int|null $id_product_attribute Attribute identifier
-     * @param int|null $id_order Order identifier - DEPRECATED
-     * @param int|null $id_employee Employee identifier - DEPRECATED
-     *
-     * @return bool
-     */
-    public function addStockMvt($quantity, $id_reason, $id_product_attribute = null, $id_order = null, $id_employee = null)
-    {
-        if (!$this->id || !$id_reason) {
-            return false;
-        }
-
-        if ($id_product_attribute == null) {
-            $id_product_attribute = 0;
-        }
-
-        $reason = new StockMvtReason((int) $id_reason);
-        if (!Validate::isLoadedObject($reason)) {
-            return false;
-        }
-
-        $quantity = abs((int) $quantity) * $reason->sign;
-
-        return StockAvailable::updateQuantity($this->id, $id_product_attribute, $quantity);
-    }
-
-    /**
-     * @deprecated since 1.5.0
-     *
-     * @param int $id_lang Language identifier
-     *
-     * @return array
-     */
-    public function getStockMvts($id_lang)
-    {
-        Tools::displayAsDeprecated();
-
-        return Db::getInstance()->executeS('
-            SELECT sm.id_stock_mvt, sm.date_add, sm.quantity, sm.id_order,
-            CONCAT(pl.name, \' \', GROUP_CONCAT(IFNULL(al.name, \'\'), \'\')) product_name, CONCAT(e.lastname, \' \', e.firstname) employee, mrl.name reason
-            FROM `' . _DB_PREFIX_ . 'stock_mvt` sm
-            LEFT JOIN `' . _DB_PREFIX_ . 'product_lang` pl ON (
-                sm.id_product = pl.id_product
-                AND pl.id_lang = ' . (int) $id_lang . Shop::addSqlRestrictionOnLang('pl') . '
-            )
-            LEFT JOIN `' . _DB_PREFIX_ . 'stock_mvt_reason_lang` mrl ON (
-                sm.id_stock_mvt_reason = mrl.id_stock_mvt_reason
-                AND mrl.id_lang = ' . (int) $id_lang . '
-            )
-            LEFT JOIN `' . _DB_PREFIX_ . 'employee` e ON (
-                e.id_employee = sm.id_employee
-            )
-            LEFT JOIN `' . _DB_PREFIX_ . 'product_attribute_combination` pac ON (
-                pac.id_product_attribute = sm.id_product_attribute
-            )
-            LEFT JOIN `' . _DB_PREFIX_ . 'attribute_lang` al ON (
-                al.id_attribute = pac.id_attribute
-                AND al.id_lang = ' . (int) $id_lang . '
-            )
-            WHERE sm.id_product=' . (int) $this->id . '
-            GROUP BY sm.id_stock_mvt
-        ');
-    }
-
     /**
      * @return int TaxRulesGroup identifier
      */
@@ -7719,28 +7564,14 @@ public function updateWs($null_values = false)
      *
      * @param int $id_product Product identifier
      * @param int $id_product_attribute Attribute identifier
-     * @param int $id_warehouse Warehouse identifier
+     * @param int $id_warehouse Warehouse identifier - not used anymore
      * @param int|null $id_shop Shop identifier
      *
      * @return int real_quantity
      */
     public static function getRealQuantity($id_product, $id_product_attribute = 0, $id_warehouse = 0, $id_shop = null)
     {
-        static $manager = null;
-
-        if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && null === $manager) {
-            $manager = StockManagerFactory::getManager();
-        }
-
-        if (
-            Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')
-            && Product::usesAdvancedStockManagement($id_product)
-            && StockAvailable::dependsOnStock($id_product, $id_shop)
-        ) {
-            return $manager->getProductRealQuantities($id_product, $id_product_attribute, $id_warehouse, true);
-        } else {
-            return StockAvailable::getQuantityAvailableByProduct($id_product, $id_product_attribute, $id_shop);
-        }
+        return StockAvailable::getQuantityAvailableByProduct($id_product, $id_product_attribute, $id_shop);
     }
 
     /**
@@ -7751,16 +7582,17 @@ public static function getRealQuantity($id_product, $id_product_attribute = 0, $
      * @param int $id_product Product identifier
      *
      * @return bool
+     *
+     * @deprecated Since 9.0 and will be removed in 10.0
      */
     public static function usesAdvancedStockManagement($id_product)
     {
-        $query = new DbQuery();
-        $query->select('product_shop.advanced_stock_management');
-        $query->from('product', 'p');
-        $query->join(Shop::addSqlAssociation('product', 'p'));
-        $query->where('p.id_product = ' . (int) $id_product);
+        @trigger_error(sprintf(
+            '%s is deprecated since 9.0 and will be removed in 10.0.',
+            __METHOD__
+        ), E_USER_DEPRECATED);
 
-        return (bool) Db::getInstance()->getValue($query);
+        return false;
     }
 
     /**
@@ -7811,67 +7643,54 @@ public function loadStockData()
         // Default product quantity is available quantity to sell in current shop
         $this->quantity = StockAvailable::getQuantityAvailableByProduct($this->id, 0);
         $this->out_of_stock = StockAvailable::outOfStock($this->id);
-        $this->depends_on_stock = StockAvailable::dependsOnStock($this->id);
         $this->location = StockAvailable::getLocation($this->id) ?: '';
-
-        if (Context::getContext()->shop->getContext() == Shop::CONTEXT_GROUP && Context::getContext()->shop->getContextShopGroup()->share_stock == 1) {
-            $this->advanced_stock_management = $this->useAdvancedStockManagement();
-        }
     }
 
     /**
-     * Get Advanced Stock Management status for this product
+     * Get the default category id according to the shop.
      *
-     * @return bool 0 for disabled, 1 for enabled
+     * @return int
      */
-    public function useAdvancedStockManagement()
+    public function getDefaultCategory(): int
     {
-        return (bool) Db::getInstance()->getValue(
-            'SELECT `advanced_stock_management`
-            FROM ' . _DB_PREFIX_ . 'product_shop
-            WHERE id_product=' . (int) $this->id . Shop::addSqlRestriction()
+        $defaultCategory = Db::getInstance()->getValue(
+            'SELECT product_shop.`id_category_default`
+            FROM `' . _DB_PREFIX_ . 'product` p
+            ' . Shop::addSqlAssociation('product', 'p') . '
+            WHERE p.`id_product` = ' . (int) $this->id
         );
+
+        return (int) ($defaultCategory ?? Context::getContext()->shop->id_category);
     }
 
     /**
-     * Set Advanced Stock Management status for this product
+     * Get Advanced Stock Management status for this product
      *
-     * @param bool $value false for disabled, true for enabled
+     * @return bool 0 for disabled, 1 for enabled
      */
-    public function setAdvancedStockManagement($value)
+    public function useAdvancedStockManagement()
     {
-        $this->advanced_stock_management = (bool) $value;
-        if (
-            Context::getContext()->shop->getContext() == Shop::CONTEXT_GROUP
-            && Context::getContext()->shop->getContextShopGroup()->share_stock == 1
-        ) {
-            Db::getInstance()->execute(
-                '
-                UPDATE `' . _DB_PREFIX_ . 'product_shop`
-                SET `advanced_stock_management`=' . (int) $value . '
-                WHERE id_product=' . (int) $this->id . Shop::addSqlRestriction()
-            );
-        } else {
-            $this->setFieldsToUpdate(['advanced_stock_management' => true]);
-            $this->save();
-        }
+        @trigger_error(sprintf(
+            '%s is deprecated since 9.0 and will be removed in 10.0.',
+            __METHOD__
+        ), E_USER_DEPRECATED);
+
+        return false;
     }
 
     /**
-     * Get the default category id according to the shop.
+     * Set Advanced Stock Management status for this product
      *
-     * @return int
+     * @param bool $value false for disabled, true for enabled
      */
-    public function getDefaultCategory(): int
+    public function setAdvancedStockManagement($value)
     {
-        $defaultCategory = Db::getInstance()->getValue(
-            'SELECT product_shop.`id_category_default`
-            FROM `' . _DB_PREFIX_ . 'product` p
-            ' . Shop::addSqlAssociation('product', 'p') . '
-            WHERE p.`id_product` = ' . (int) $this->id
-        );
+        @trigger_error(sprintf(
+            '%s is deprecated since 9.0 and will be removed in 10.0.',
+            __METHOD__
+        ), E_USER_DEPRECATED);
 
-        return (int) ($defaultCategory ?? Context::getContext()->shop->id_category);
+        return;
     }
 
     /**
diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index a87ddf087aa9a..7bf0dc6771523 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -2135,7 +2135,7 @@ private function getTabs($parentId = 0, $level = 0)
         foreach ($tabs as $index => $tab) {
             if (!Tab::checkTabRights($tab['id_tab'])
                 || !$tab['enabled']
-                || ($tab['class_name'] == 'AdminStock' && Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') == 0)
+                || $tab['class_name'] == 'AdminStock'
                 || $tab['class_name'] == 'AdminCarrierWizard') {
                 unset($tabs[$index]);
 
diff --git a/classes/lang/KeysReference/StockMvtReasonLang.php b/classes/lang/KeysReference/StockMvtReasonLang.php
index f3724239991b2..f9f5ef67c72c1 100644
--- a/classes/lang/KeysReference/StockMvtReasonLang.php
+++ b/classes/lang/KeysReference/StockMvtReasonLang.php
@@ -31,12 +31,6 @@
 
 trans('Adjustment following an inventory of stock', 'Admin.Catalog.Feature');
 
-trans('Transfer to another warehouse', 'Admin.Catalog.Feature');
-
-trans('Transfer from another warehouse', 'Admin.Catalog.Feature');
-
-trans('Supply Order', 'Admin.Catalog.Feature');
-
 trans('Product Return', 'Admin.Catalog.Feature');
 
 trans('Manual Entry', 'Admin.Catalog.Feature');
diff --git a/classes/lang/KeysReference/TabLang.php b/classes/lang/KeysReference/TabLang.php
index 13ef4aebfedab..78afe8d27ea6e 100644
--- a/classes/lang/KeysReference/TabLang.php
+++ b/classes/lang/KeysReference/TabLang.php
@@ -119,7 +119,6 @@
 trans('Stock', 'Admin.Navigation.Menu');
 trans('Stores', 'Admin.Navigation.Menu');
 trans('Suppliers', 'Admin.Navigation.Menu');
-trans('Supply orders', 'Admin.Navigation.Menu');
 trans('Tags', 'Admin.Navigation.Menu');
 trans('Taxes', 'Admin.Navigation.Menu');
 trans('Tax Rules', 'Admin.Navigation.Menu');
@@ -128,7 +127,6 @@
 trans('Titles', 'Admin.Navigation.Menu');
 trans('Traffic & SEO', 'Admin.Navigation.Menu');
 trans('Translations', 'Admin.Navigation.Menu');
-trans('Warehouses', 'Admin.Navigation.Menu');
 trans('Webservice', 'Admin.Navigation.Menu');
 trans('Authorization Server', 'Admin.Navigation.Menu');
 trans('Zones', 'Admin.Navigation.Menu');
diff --git a/classes/order/Order.php b/classes/order/Order.php
index d32cde4ee5f87..3064219545f94 100644
--- a/classes/order/Order.php
+++ b/classes/order/Order.php
@@ -737,21 +737,13 @@ protected function setProductCustomizedDatas(&$product, $customized_datas)
     /**
      * This method allow to add stock information on a product detail.
      *
-     * If advanced stock management is active, get physical stock of this product in the warehouse associated to the ptoduct for the current order
-     * Else get the available quantity of the product in fucntion of the shop associated to the order
+     * Get the available quantity of the product in fucntion of the shop associated to the order
      *
      * @param array $product
      */
     protected function setProductCurrentStock(&$product)
     {
-        if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')
-            && (int) $product['advanced_stock_management'] == 1
-            && (int) $product['id_warehouse'] > 0) {
-            $product['current_stock'] = StockManagerFactory::getManager()->getProductPhysicalQuantities($product['product_id'], $product['product_attribute_id'], (int) $product['id_warehouse'], true);
-        } else {
-            $product['current_stock'] = StockAvailable::getQuantityAvailableByProduct($product['product_id'], $product['product_attribute_id'], (int) $this->id_shop);
-        }
-
+        $product['current_stock'] = StockAvailable::getQuantityAvailableByProduct($product['product_id'], $product['product_attribute_id'], (int) $this->id_shop);
         $product['location'] = StockAvailable::getLocation($product['product_id'], $product['product_attribute_id'], (int) $this->id_shop);
     }
 
@@ -2249,25 +2241,17 @@ public function getOrderInvoiceIdIfHasDelivery()
      * Get warehouse associated to the order.
      *
      * return array List of warehouse
+     *
+     * @deprecated Since 9.0 and will be removed in 10.0
      */
     public function getWarehouseList()
     {
-        $results = Db::getInstance()->executeS(
-            'SELECT id_warehouse
-            FROM `' . _DB_PREFIX_ . 'order_detail`
-            WHERE `id_order` =  ' . (int) $this->id . '
-            GROUP BY id_warehouse'
-        );
-        if (!$results) {
-            return [];
-        }
-
-        $warehouse_list = [];
-        foreach ($results as $row) {
-            $warehouse_list[] = $row['id_warehouse'];
-        }
+        @trigger_error(sprintf(
+            '%s is deprecated since 9.0 and will be removed in 10.0.',
+            __METHOD__
+        ), E_USER_DEPRECATED);
 
-        return $warehouse_list;
+        return [0];
     }
 
     /**
diff --git a/classes/order/OrderDetail.php b/classes/order/OrderDetail.php
index ee3935857582b..7c8d5069ddd2e 100644
--- a/classes/order/OrderDetail.php
+++ b/classes/order/OrderDetail.php
@@ -163,8 +163,11 @@ class OrderDetailCore extends ObjectModel
     /** @var int Id tax rules group */
     public $id_tax_rules_group;
 
-    /** @var int Id warehouse */
-    public $id_warehouse;
+    /** @var int Id warehouse
+     *
+     * @deprecated since 9.0, advanced stock management has been completely removed
+     */
+    public $id_warehouse = 0;
 
     /** @var float additional shipping price tax excl */
     public $total_shipping_price_tax_excl;
@@ -547,24 +550,20 @@ protected function updateProductQuantityInStock($product, $orderStateId): void
         if (in_array($orderStateId, $dismissOrderStateIds)) {
             return;
         }
-        if (!StockAvailable::dependsOnStock($product['id_product'])) {
-            $orderState = new OrderState($orderStateId, $this->id_lang);
-            $isQuantityUpdated = StockAvailable::updateQuantity(
-                $product['id_product'],
-                $product['id_product_attribute'],
-                -(int) $product['cart_quantity'],
-                $product['id_shop'],
-                // Add stock movement only if order state is flagged as shipped
-                true === (bool) $orderState->shipped,
-                [
-                    'id_order' => $this->id_order,
-                    // Only one stock movement reason fits a new order creation
-                    'id_stock_mvt_reason' => Configuration::get('PS_STOCK_CUSTOMER_ORDER_REASON'),
-                ]
-            );
-        } else {
-            $isQuantityUpdated = true;
-        }
+        $orderState = new OrderState($orderStateId, $this->id_lang);
+        $isQuantityUpdated = StockAvailable::updateQuantity(
+            $product['id_product'],
+            $product['id_product_attribute'],
+            -(int) $product['cart_quantity'],
+            $product['id_shop'],
+            // Add stock movement only if order state is flagged as shipped
+            true === (bool) $orderState->shipped,
+            [
+                'id_order' => $this->id_order,
+                // Only one stock movement reason fits a new order creation
+                'id_stock_mvt_reason' => Configuration::get('PS_STOCK_CUSTOMER_ORDER_REASON'),
+            ]
+        );
         if ($isQuantityUpdated === true) {
             $product['stock_quantity'] -= $product['cart_quantity'];
         }
@@ -750,7 +749,7 @@ protected function setDetailProductPrice(Order $order, Cart $cart, $product)
      * @param int $id_order_state
      * @param int $id_order_invoice
      * @param bool $use_taxes set to false if you don't want to use taxes
-     * @param int $id_warehouse
+     * @param int $id_warehouse - not used anymore
      */
     protected function create(Order $order, Cart $cart, $product, $id_order_state, $id_order_invoice, $use_taxes = true, $id_warehouse = 0)
     {
@@ -776,7 +775,6 @@ protected function create(Order $order, Cart $cart, $product, $id_order_state, $
         $this->product_supplier_reference = empty($product['supplier_reference']) ? null : pSQL($product['supplier_reference']);
         $product_weight = $product['id_product_attribute'] ? (float) $product['weight_attribute'] : (float) $product['weight'];
         $this->product_weight = $product_weight + Customization::getCustomizationWeight($product['id_customization']);
-        $this->id_warehouse = $id_warehouse;
 
         // We get the real quantity of the product in stock and save how much of the ordered quantity was in stock
         $product_quantity_in_stock = (int) Product::getQuantity($this->product_id, $this->product_attribute_id);
@@ -819,7 +817,7 @@ protected function create(Order $order, Cart $cart, $product, $id_order_state, $
      * @param array $product_list
      * @param int $id_order_invoice
      * @param bool $use_taxes set to false if you don't want to use taxes
-     * @param int $id_warehouse
+     * @param int $id_warehouse - not used anymore
      */
     public function createList(Order $order, Cart $cart, $id_order_state, $product_list, $id_order_invoice = 0, $use_taxes = true, $id_warehouse = 0)
     {
@@ -830,7 +828,7 @@ public function createList(Order $order, Cart $cart, $id_order_state, $product_l
         $this->outOfStock = false;
 
         foreach ($product_list as $product) {
-            $this->create($order, $cart, $product, $id_order_state, $id_order_invoice, $use_taxes, $id_warehouse);
+            $this->create($order, $cart, $product, $id_order_state, $id_order_invoice, $use_taxes);
         }
 
         unset(
diff --git a/classes/order/OrderHistory.php b/classes/order/OrderHistory.php
index d8c449679e00f..e342b756e42be 100644
--- a/classes/order/OrderHistory.php
+++ b/classes/order/OrderHistory.php
@@ -197,9 +197,6 @@ public function changeIdOrderState($new_order_state, $id_order, $use_existing_pa
 
             /** @since 1.5.0 : gets the stock manager */
             $manager = null;
-            if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) {
-                $manager = StockManagerFactory::getManager();
-            }
 
             $error_or_canceled_statuses = [Configuration::get('PS_OS_ERROR'), Configuration::get('PS_OS_CANCELED')];
 
@@ -224,8 +221,7 @@ public function changeIdOrderState($new_order_state, $id_order, $use_existing_pa
                         ProductSale::addProductSale($product['product_id'], $product['product_quantity']);
                         // @since 1.5.0 - Stock Management
                         if (!Pack::isPack($product['product_id']) &&
-                            in_array($old_os->id, $error_or_canceled_statuses) &&
-                            !StockAvailable::dependsOnStock($product['id_product'], (int) $order->id_shop)) {
+                            in_array($old_os->id, $error_or_canceled_statuses)) {
                             StockAvailable::updateQuantity($product['product_id'], $product['product_attribute_id'], -(int) $product['product_quantity'], $order->id_shop);
                         }
                     } elseif (!$new_os->logable && $old_os->logable) {
@@ -234,14 +230,12 @@ public function changeIdOrderState($new_order_state, $id_order, $use_existing_pa
 
                         // @since 1.5.0 - Stock Management
                         if (!Pack::isPack($product['product_id']) &&
-                            in_array($new_os->id, $error_or_canceled_statuses) &&
-                            !StockAvailable::dependsOnStock($product['id_product'])) {
+                            in_array($new_os->id, $error_or_canceled_statuses)) {
                             StockAvailable::updateQuantity($product['product_id'], $product['product_attribute_id'], (int) $product['product_quantity'], $order->id_shop);
                         }
                     } elseif (!$new_os->logable && !$old_os->logable &&
                         in_array($new_os->id, $error_or_canceled_statuses) &&
-                        !in_array($old_os->id, $error_or_canceled_statuses) &&
-                        !StockAvailable::dependsOnStock($product['id_product'])
+                        !in_array($old_os->id, $error_or_canceled_statuses)
                     ) {
                         // if waiting for payment => payment error/canceled
                         StockAvailable::updateQuantity($product['product_id'], $product['product_attribute_id'], (int) $product['product_quantity'], $order->id_shop);
@@ -250,85 +244,9 @@ public function changeIdOrderState($new_order_state, $id_order, $use_existing_pa
                 // From here, there is 2 cases : $old_os exists, and we can test shipped state evolution,
                 // Or old_os does not exists, and we should consider that initial shipped state is 0 (to allow decrease of stocks)
 
-                // @since 1.5.0 : if the order is being shipped and this products uses the advanced stock management :
-                // decrements the physical stock using $id_warehouse
-                if ($new_os->shipped == 1 && (!Validate::isLoadedObject($old_os) || $old_os->shipped == 0) &&
-                    Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') &&
-                    Warehouse::exists($product['id_warehouse']) &&
-                    $manager != null &&
-                    (int) $product['advanced_stock_management'] == 1) {
-                    // gets the warehouse
-                    $warehouse = new Warehouse($product['id_warehouse']);
-
-                    // decrements the stock (if it's a pack, the StockManager does what is needed)
-                    $manager->removeProduct(
-                        $product['product_id'],
-                        $product['product_attribute_id'],
-                        $warehouse,
-                        ($product['product_quantity'] - $product['product_quantity_refunded'] - $product['product_quantity_return']),
-                        (int) Configuration::get('PS_STOCK_CUSTOMER_ORDER_REASON'),
-                        true,
-                        (int) $order->id
-                    );
-                } elseif ($new_os->shipped == 0 && Validate::isLoadedObject($old_os) && $old_os->shipped == 1 &&
-                    Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') &&
-                    Warehouse::exists($product['id_warehouse']) &&
-                    $manager != null &&
-                    (int) $product['advanced_stock_management'] == 1
-                ) {
-                    // @since.1.5.0 : if the order was shipped, and is not anymore, we need to restock products
-
-                    // if the product is a pack, we restock every products in the pack using the last negative stock mvts
-                    if (Pack::isPack($product['product_id'])) {
-                        $pack_products = Pack::getItems($product['product_id'], Configuration::get('PS_LANG_DEFAULT', null, null, $order->id_shop));
-                        foreach ($pack_products as $pack_product) {
-                            if ($pack_product->advanced_stock_management == 1) {
-                                $mvts = StockMvt::getNegativeStockMvts($order->id, $pack_product->id, 0, $pack_product->pack_quantity * $product['product_quantity']);
-                                foreach ($mvts as $mvt) {
-                                    $manager->addProduct(
-                                        $pack_product->id,
-                                        0,
-                                        new Warehouse($mvt['id_warehouse']),
-                                        $mvt['physical_quantity'],
-                                        null,
-                                        $mvt['price_te'],
-                                        true,
-                                        null
-                                    );
-                                }
-                                if (!StockAvailable::dependsOnStock($product['id_product'])) {
-                                    StockAvailable::updateQuantity($pack_product->id, 0, (int) $pack_product->pack_quantity * $product['product_quantity'], $order->id_shop);
-                                }
-                            }
-                        }
-                    } else {
-                        // else, it's not a pack, re-stock using the last negative stock mvts
-
-                        $mvts = StockMvt::getNegativeStockMvts(
-                            $order->id,
-                            $product['product_id'],
-                            $product['product_attribute_id'],
-                            ($product['product_quantity'] - $product['product_quantity_refunded'] - $product['product_quantity_return'])
-                        );
-
-                        foreach ($mvts as $mvt) {
-                            $manager->addProduct(
-                                $product['product_id'],
-                                $product['product_attribute_id'],
-                                new Warehouse($mvt['id_warehouse']),
-                                $mvt['physical_quantity'],
-                                null,
-                                $mvt['price_te'],
-                                true
-                            );
-                        }
-                    }
-                }
-
                 // Save movement if :
-                // not Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')
                 // new_os->shipped != old_os->shipped
-                if (Validate::isLoadedObject($old_os) && Validate::isLoadedObject($new_os) && $new_os->shipped != $old_os->shipped && !Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) {
+                if (Validate::isLoadedObject($old_os) && Validate::isLoadedObject($new_os) && $new_os->shipped != $old_os->shipped) {
                     $product_quantity = (int) ($product['product_quantity'] - $product['product_quantity_refunded'] - $product['product_quantity_return']);
 
                     if ($product_quantity > 0) {
diff --git a/classes/order/OrderInvoice.php b/classes/order/OrderInvoice.php
index b72cdabc1752f..f959537573c9c 100644
--- a/classes/order/OrderInvoice.php
+++ b/classes/order/OrderInvoice.php
@@ -196,7 +196,6 @@ public function getProducts($products = false, $selected_products = false, $sele
             }
 
             $this->setProductImageInformations($row);
-            $this->setProductCurrentStock($row);
 
             $customized_datas = Product::getAllCustomizedDatas($order->id_cart, null, true, null, (int) $row['id_customization']);
             $this->setProductCustomizedDatas($row, $customized_datas);
@@ -263,22 +262,6 @@ protected function setProductCustomizedDatas(&$product, $customized_datas)
         }
     }
 
-    /**
-     * This method allow to add stock information on a product detail.
-     *
-     * @param array $product
-     */
-    protected function setProductCurrentStock(&$product)
-    {
-        if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')
-            && (int) $product['advanced_stock_management'] == 1
-            && (int) $product['id_warehouse'] > 0) {
-            $product['current_stock'] = StockManagerFactory::getManager()->getProductPhysicalQuantities($product['product_id'], $product['product_attribute_id'], null, true);
-        } else {
-            $product['current_stock'] = '--';
-        }
-    }
-
     /**
      * This method allow to add image information on a product detail.
      *
diff --git a/classes/pdf/HTMLTemplateSupplyOrderForm.php b/classes/pdf/HTMLTemplateSupplyOrderForm.php
index 58d94d60851d3..0eede155385b6 100644
--- a/classes/pdf/HTMLTemplateSupplyOrderForm.php
+++ b/classes/pdf/HTMLTemplateSupplyOrderForm.php
@@ -26,6 +26,7 @@
 
 /**
  * @since 1.5
+ * @deprecated since 9.0 and will be removed in 10.0, stock is now managed by new logic
  */
 class HTMLTemplateSupplyOrderFormCore extends HTMLTemplate
 {
diff --git a/classes/pdf/PDF.php b/classes/pdf/PDF.php
index 71fb2ea3ec6d9..94fb9020f89e2 100644
--- a/classes/pdf/PDF.php
+++ b/classes/pdf/PDF.php
@@ -63,6 +63,8 @@ class PDFCore
     public const TEMPLATE_ORDER_RETURN = 'OrderReturn';
     public const TEMPLATE_ORDER_SLIP = 'OrderSlip';
     public const TEMPLATE_DELIVERY_SLIP = 'DeliverySlip';
+
+    /** @deprecated since 9.0 and will be removed in 10.0 **/
     public const TEMPLATE_SUPPLY_ORDER_FORM = 'SupplyOrderForm';
 
     /**
diff --git a/classes/stock/Stock.php b/classes/stock/Stock.php
index fdd505a73e8ac..bd8e1f3af4f92 100644
--- a/classes/stock/Stock.php
+++ b/classes/stock/Stock.php
@@ -28,6 +28,7 @@
  * Represents the products kept in warehouses.
  *
  * @since 1.5.0
+ * @deprecated since 9.0 and will be removed in 10.0, stock is now managed by new logic
  */
 class StockCore extends ObjectModel
 {
diff --git a/classes/stock/StockAvailable.php b/classes/stock/StockAvailable.php
index 7910d61e163e1..c092836c6adce 100644
--- a/classes/stock/StockAvailable.php
+++ b/classes/stock/StockAvailable.php
@@ -111,14 +111,6 @@ class StockAvailableCore extends ObjectModel
      */
     public function updateWs()
     {
-        if ($this->depends_on_stock) {
-            return WebserviceRequest::getInstance()->setError(
-                500,
-                $this->trans('You cannot update the available stock when it depends on stock.', [], 'Admin.Catalog.Notification'),
-                133
-            );
-        }
-
         return $this->update();
     }
 
@@ -146,193 +138,17 @@ public static function getStockAvailableIdByProductId($id_product, $id_product_a
      * For a given id_product, synchronizes StockAvailable::quantity with Stock::usable_quantity.
      *
      * @param int $id_product
-     */
-    public static function synchronize($id_product, $order_id_shop = null)
-    {
-        if (!Validate::isUnsignedId($id_product)) {
-            return false;
-        }
-
-        //if product is pack sync recursivly product in pack
-        if (Pack::isPack($id_product)) {
-            if (Validate::isLoadedObject($product = new Product((int) $id_product))) {
-                if ($product->pack_stock_type == Pack::STOCK_TYPE_PRODUCTS_ONLY
-                    || $product->pack_stock_type == Pack::STOCK_TYPE_PACK_BOTH
-                    || ($product->pack_stock_type == Pack::STOCK_TYPE_DEFAULT
-                        && Configuration::get('PS_PACK_STOCK_TYPE') > 0)
-                ) {
-                    $products_pack = Pack::getItems($id_product, (int) Configuration::get('PS_LANG_DEFAULT'));
-                    foreach ($products_pack as $product_pack) {
-                        StockAvailable::synchronize($product_pack->id, $order_id_shop);
-                    }
-                }
-            } else {
-                return false;
-            }
-        }
-
-        // gets warehouse ids grouped by shops
-        $ids_warehouse = Warehouse::getWarehousesGroupedByShops();
-        $order_warehouses = [];
-        if ($order_id_shop !== null) {
-            $wh = Warehouse::getWarehouses(false, (int) $order_id_shop);
-            foreach ($wh as $warehouse) {
-                $order_warehouses[] = $warehouse['id_warehouse'];
-            }
-        }
-
-        // gets all product attributes ids
-        $ids_product_attribute = [];
-        foreach (Product::getProductAttributesIds($id_product) as $id_product_attribute) {
-            $ids_product_attribute[] = $id_product_attribute['id_product_attribute'];
-        }
-
-        // Allow to order the product when out of stock?
-        $out_of_stock = StockAvailable::outOfStock($id_product);
-
-        $manager = StockManagerFactory::getManager();
-        // loops on $ids_warehouse to synchronize quantities
-        foreach ($ids_warehouse as $id_shop => $warehouses) {
-            // first, checks if the product depends on stock for the given shop $id_shop
-            if (StockAvailable::dependsOnStock($id_product, $id_shop)) {
-                // init quantity
-                $product_quantity = 0;
-
-                // if it's a simple product
-                if (empty($ids_product_attribute)) {
-                    $allowed_warehouse_for_product = Warehouse::getProductWarehouseList((int) $id_product, 0, (int) $id_shop);
-                    $allowed_warehouse_for_product_clean = [];
-                    foreach ($allowed_warehouse_for_product as $warehouse) {
-                        $allowed_warehouse_for_product_clean[] = (int) $warehouse['id_warehouse'];
-                    }
-                    $allowed_warehouse_for_product_clean = array_intersect($allowed_warehouse_for_product_clean, $warehouses);
-                    if ($order_id_shop != null && !count(array_intersect($allowed_warehouse_for_product_clean, $order_warehouses))) {
-                        continue;
-                    }
-
-                    $product_quantity = $manager->getProductRealQuantities($id_product, 0, $allowed_warehouse_for_product_clean, true);
-
-                    Hook::exec(
-                        'actionUpdateQuantity',
-                                    [
-                                        'id_product' => $id_product,
-                                        'id_product_attribute' => 0,
-                                        'quantity' => $product_quantity,
-                                        'id_shop' => $id_shop,
-                                    ]
-                    );
-                } else {
-                    // else this product has attributes, hence loops on $ids_product_attribute
-                    foreach ($ids_product_attribute as $id_product_attribute) {
-                        $allowed_warehouse_for_combination = Warehouse::getProductWarehouseList((int) $id_product, (int) $id_product_attribute, (int) $id_shop);
-                        $allowed_warehouse_for_combination_clean = [];
-                        foreach ($allowed_warehouse_for_combination as $warehouse) {
-                            $allowed_warehouse_for_combination_clean[] = (int) $warehouse['id_warehouse'];
-                        }
-                        $allowed_warehouse_for_combination_clean = array_intersect($allowed_warehouse_for_combination_clean, $warehouses);
-                        if ($order_id_shop != null && !count(array_intersect($allowed_warehouse_for_combination_clean, $order_warehouses))) {
-                            continue;
-                        }
-
-                        $quantity = $manager->getProductRealQuantities($id_product, $id_product_attribute, $allowed_warehouse_for_combination_clean, true);
-
-                        $query = new DbQuery();
-                        $query->select('COUNT(*)');
-                        $query->from('stock_available');
-                        $query->where('id_product = ' . (int) $id_product . ' AND id_product_attribute = ' . (int) $id_product_attribute .
-                            StockAvailable::addSqlShopRestriction(null, $id_shop));
-
-                        if ((int) Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($query)) {
-                            $query = [
-                                'table' => 'stock_available',
-                                'data' => ['quantity' => $quantity],
-                                'where' => 'id_product = ' . (int) $id_product . ' AND id_product_attribute = ' . (int) $id_product_attribute .
-                                StockAvailable::addSqlShopRestriction(null, $id_shop),
-                            ];
-                            Db::getInstance()->update($query['table'], $query['data'], $query['where']);
-                        } else {
-                            $query = [
-                                'table' => 'stock_available',
-                                'data' => [
-                                    'quantity' => $quantity,
-                                    'depends_on_stock' => 1,
-                                    'out_of_stock' => $out_of_stock,
-                                    'id_product' => (int) $id_product,
-                                    'id_product_attribute' => (int) $id_product_attribute,
-                                ],
-                            ];
-                            StockAvailable::addSqlShopParams($query['data'], $id_shop);
-                            Db::getInstance()->insert($query['table'], $query['data']);
-                        }
-
-                        $product_quantity += $quantity;
-
-                        Hook::exec(
-                            'actionUpdateQuantity',
-                                    [
-                                        'id_product' => $id_product,
-                                        'id_product_attribute' => $id_product_attribute,
-                                        'quantity' => $quantity,
-                                        'id_shop' => $id_shop,
-                                    ]
-                        );
-                    }
-                }
-                // updates
-                // if $id_product has attributes, it also updates the sum for all attributes
-                if (($order_id_shop != null && array_intersect($warehouses, $order_warehouses)) || $order_id_shop == null) {
-                    $query = [
-                        'table' => 'stock_available',
-                        'data' => ['quantity' => $product_quantity],
-                        'where' => 'id_product = ' . (int) $id_product . ' AND id_product_attribute = 0' .
-                        StockAvailable::addSqlShopRestriction(null, $id_shop),
-                    ];
-                    Db::getInstance()->update($query['table'], $query['data'], $query['where']);
-                }
-            }
-        }
-        // In case there are no warehouses, removes product from StockAvailable
-        if (count($ids_warehouse) == 0 && StockAvailable::dependsOnStock((int) $id_product)) {
-            Db::getInstance()->update('stock_available', ['quantity' => 0], 'id_product = ' . (int) $id_product);
-        }
-
-        Cache::clean('StockAvailable::getQuantityAvailableByProduct_' . (int) $id_product . '*');
-    }
-
-    /**
-     * For a given id_product, sets if stock available depends on stock.
      *
-     * @param int $id_product
-     * @param bool $depends_on_stock Optional : true by default
-     * @param int $id_shop Optional : gets context by default
+     * @deprecated Since 9.0 and will be removed in 10.0
      */
-    public static function setProductDependsOnStock($id_product, $depends_on_stock = true, $id_shop = null, $id_product_attribute = 0)
+    public static function synchronize($id_product, $order_id_shop = null)
     {
-        if (!Validate::isUnsignedId($id_product)) {
-            return false;
-        }
+        @trigger_error(sprintf(
+            '%s is deprecated since 9.0 and will be removed in 10.0.',
+            __METHOD__
+        ), E_USER_DEPRECATED);
 
-        $existing_id = StockAvailable::getStockAvailableIdByProductId((int) $id_product, (int) $id_product_attribute, $id_shop);
-        if ($existing_id > 0) {
-            Db::getInstance()->update('stock_available', [
-                'depends_on_stock' => (int) $depends_on_stock,
-            ], 'id_stock_available = ' . (int) $existing_id);
-        } else {
-            $params = [
-                'depends_on_stock' => (int) $depends_on_stock,
-                'id_product' => (int) $id_product,
-                'id_product_attribute' => (int) $id_product_attribute,
-            ];
-
-            StockAvailable::addSqlShopParams($params, $id_shop);
-
-            Db::getInstance()->insert('stock_available', $params);
-        }
-
-        // depends on stock.. hence synchronizes
-        if ($depends_on_stock) {
-            StockAvailable::synchronize($id_product);
-        }
+        return true;
     }
 
     /**
@@ -579,61 +395,59 @@ public static function setQuantity($id_product, $id_product_attribute, $quantity
         if ($id_shop === null && Shop::getContext() != Shop::CONTEXT_GROUP) {
             $id_shop = (int) $context->shop->id;
         }
-        $depends_on_stock = StockAvailable::dependsOnStock($id_product);
+
         //Try to set available quantity if product does not depend on physical stock
-        if (!$depends_on_stock) {
-            $stockManager = ServiceLocator::get('\\PrestaShop\\PrestaShop\\Core\\Stock\\StockManager');
+        $stockManager = ServiceLocator::get('\\PrestaShop\\PrestaShop\\Core\\Stock\\StockManager');
 
-            $id_stock_available = (int) StockAvailable::getStockAvailableIdByProductId($id_product, $id_product_attribute, $id_shop);
-            if ($id_stock_available) {
-                $stock_available = new StockAvailable($id_stock_available);
+        $id_stock_available = (int) StockAvailable::getStockAvailableIdByProductId($id_product, $id_product_attribute, $id_shop);
+        if ($id_stock_available) {
+            $stock_available = new StockAvailable($id_stock_available);
 
-                $deltaQuantity = (int) $quantity - (int) $stock_available->quantity;
+            $deltaQuantity = (int) $quantity - (int) $stock_available->quantity;
 
-                $stock_available->quantity = (int) $quantity;
-                $stock_available->update();
+            $stock_available->quantity = (int) $quantity;
+            $stock_available->update();
 
-                if (true === $add_movement && 0 != $deltaQuantity) {
-                    $stockManager->saveMovement($id_product, $id_product_attribute, $deltaQuantity);
-                }
+            if (true === $add_movement && 0 != $deltaQuantity) {
+                $stockManager->saveMovement($id_product, $id_product_attribute, $deltaQuantity);
+            }
+        } else {
+            $out_of_stock = StockAvailable::outOfStock($id_product, $id_shop);
+            $stock_available = new StockAvailable();
+            $stock_available->out_of_stock = (int) $out_of_stock;
+            $stock_available->id_product = (int) $id_product;
+            $stock_available->id_product_attribute = (int) $id_product_attribute;
+            $stock_available->quantity = (int) $quantity;
+            if ($id_shop === null) {
+                $shop_group = Shop::getContextShopGroup();
             } else {
-                $out_of_stock = StockAvailable::outOfStock($id_product, $id_shop);
-                $stock_available = new StockAvailable();
-                $stock_available->out_of_stock = (int) $out_of_stock;
-                $stock_available->id_product = (int) $id_product;
-                $stock_available->id_product_attribute = (int) $id_product_attribute;
-                $stock_available->quantity = (int) $quantity;
-                if ($id_shop === null) {
-                    $shop_group = Shop::getContextShopGroup();
-                } else {
-                    $shop_group = new ShopGroup((int) Shop::getGroupFromShop((int) $id_shop));
-                }
-                // if quantities are shared between shops of the group
-                if ($shop_group->share_stock) {
-                    $stock_available->id_shop = 0;
-                    $stock_available->id_shop_group = (int) $shop_group->id;
-                } else {
-                    $stock_available->id_shop = (int) $id_shop;
-                    $stock_available->id_shop_group = 0;
-                }
-                $stock_available->add();
-
-                if (true === $add_movement && 0 != $quantity) {
-                    $stockManager->saveMovement($id_product, $id_product_attribute, (int) $quantity);
-                }
+                $shop_group = new ShopGroup((int) Shop::getGroupFromShop((int) $id_shop));
+            }
+            // if quantities are shared between shops of the group
+            if ($shop_group->share_stock) {
+                $stock_available->id_shop = 0;
+                $stock_available->id_shop_group = (int) $shop_group->id;
+            } else {
+                $stock_available->id_shop = (int) $id_shop;
+                $stock_available->id_shop_group = 0;
             }
+            $stock_available->add();
 
-            Hook::exec(
-                'actionUpdateQuantity',
-                [
-                    'id_product' => $id_product,
-                    'id_product_attribute' => $id_product_attribute,
-                    'quantity' => $stock_available->quantity,
-                    'delta_quantity' => $deltaQuantity ?? null,
-                    'id_shop' => $id_shop,
-                ]
-            );
+            if (true === $add_movement && 0 != $quantity) {
+                $stockManager->saveMovement($id_product, $id_product_attribute, (int) $quantity);
+            }
         }
+
+        Hook::exec(
+            'actionUpdateQuantity',
+            [
+                'id_product' => $id_product,
+                'id_product_attribute' => $id_product_attribute,
+                'quantity' => $stock_available->quantity,
+                'delta_quantity' => $deltaQuantity ?? null,
+                'id_shop' => $id_shop,
+            ]
+        );
         Cache::clean('StockAvailable::getQuantityAvailableByProduct_' . (int) $id_product . '*');
     }
 
@@ -726,38 +540,13 @@ public static function resetProductFromStockAvailableByShopGroup(ShopGroup $shop
         return Db::getInstance()->update('stock_available', ['quantity' => 0], 'id_shop_group = ' . $shop_group->id);
     }
 
-    /**
-     * For a given product, tells if it depends on the physical (usable) stock.
-     *
-     * @param int $id_product
-     * @param int $id_shop Optional : gets context if null @see Context::getContext()
-     *
-     * @return bool : depends on stock @see $depends_on_stock
-     */
-    public static function dependsOnStock($id_product, $id_shop = null)
-    {
-        if (!Validate::isUnsignedId($id_product)) {
-            return false;
-        }
-
-        $query = new DbQuery();
-        $query->select('depends_on_stock');
-        $query->from('stock_available');
-        $query->where('id_product = ' . (int) $id_product);
-        $query->where('id_product_attribute = 0');
-
-        $query = StockAvailable::addSqlShopRestriction($query, $id_shop);
-
-        return (bool) Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($query);
-    }
-
     /**
      * For a given product, get its "out of stock" flag.
      *
      * @param int $id_product
      * @param int|null $id_shop Optional : gets context if null @see Context::getContext()
      *
-     * @return int|bool : depends on stock @see $depends_on_stock
+     * @return int|bool out_of_stock flag
      */
     public static function outOfStock($id_product, $id_shop = null)
     {
diff --git a/classes/stock/StockManager.php b/classes/stock/StockManager.php
index 1b4b9e3ddd22c..f5c2dd2c88cce 100644
--- a/classes/stock/StockManager.php
+++ b/classes/stock/StockManager.php
@@ -28,6 +28,7 @@
  * StockManager : implementation of StockManagerInterface.
  *
  * @since 1.5.0
+ * @deprecated since 9.0 and will be removed in 10.0, stock is now managed by new logic
  */
 class StockManagerCore implements StockManagerInterface
 {
@@ -241,33 +242,6 @@ public function removeProduct(
         // Special case of a pack
         if (Pack::isPack((int) $id_product) && !$ignore_pack) {
             if (Validate::isLoadedObject($product = new Product((int) $id_product))) {
-                // Gets items
-                if ($product->pack_stock_type == Pack::STOCK_TYPE_PRODUCTS_ONLY
-                    || $product->pack_stock_type == Pack::STOCK_TYPE_PACK_BOTH
-                    || ($product->pack_stock_type == Pack::STOCK_TYPE_DEFAULT
-                        && Configuration::get('PS_PACK_STOCK_TYPE') > 0)
-                ) {
-                    $products_pack = Pack::getItems((int) $id_product, (int) Configuration::get('PS_LANG_DEFAULT'));
-                    // Foreach item
-                    foreach ($products_pack as $product_pack) {
-                        if ($product_pack->advanced_stock_management == 1) {
-                            $product_warehouses = Warehouse::getProductWarehouseList($product_pack->id, $product_pack->id_pack_product_attribute);
-                            $warehouse_stock_found = false;
-                            foreach ($product_warehouses as $product_warehouse) {
-                                if (!$warehouse_stock_found) {
-                                    if (Warehouse::exists($product_warehouse['id_warehouse'])) {
-                                        $current_warehouse = new Warehouse($product_warehouse['id_warehouse']);
-                                        $return[] = $this->removeProduct($product_pack->id, $product_pack->id_pack_product_attribute, $current_warehouse, $product_pack->pack_quantity * $quantity, $id_stock_mvt_reason, $is_usable, $id_order, $ignore_pack, $employee);
-
-                                        // The product was found on this warehouse. Stop the stock searching.
-                                        $warehouse_stock_found = !empty($return[count($return) - 1]);
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-
                 if ($product->pack_stock_type == Pack::STOCK_TYPE_PACK_ONLY
                     || $product->pack_stock_type == Pack::STOCK_TYPE_PACK_BOTH
                     || (
@@ -488,21 +462,6 @@ public function removeProduct(
                     $stock_available_quantity = $quantity_in_stock - $quantity;
                     $max_pack_quantity = max([0, floor($stock_available_quantity / $quantity_by_pack)]);
                     $quantity_delta = Pack::getQuantity($pack->id) - $max_pack_quantity;
-
-                    if ($pack->advanced_stock_management == 1 && $quantity_delta > 0) {
-                        $product_warehouses = Warehouse::getPackWarehouses($pack->id);
-                        $warehouse_stock_found = false;
-                        foreach ($product_warehouses as $product_warehouse) {
-                            if (!$warehouse_stock_found) {
-                                if (Warehouse::exists($product_warehouse)) {
-                                    $current_warehouse = new Warehouse($product_warehouse);
-                                    $return[] = $this->removeProduct($pack->id, null, $current_warehouse, $quantity_delta, $id_stock_mvt_reason, $is_usable, $id_order, 1);
-                                    // The product was found on this warehouse. Stop the stock searching.
-                                    $warehouse_stock_found = !empty($return[count($return) - 1]);
-                                }
-                            }
-                        }
-                    }
                 }
             }
         }
diff --git a/classes/stock/StockManagerFactory.php b/classes/stock/StockManagerFactory.php
index fd66ed4e37e3a..65ec8547242dc 100644
--- a/classes/stock/StockManagerFactory.php
+++ b/classes/stock/StockManagerFactory.php
@@ -24,9 +24,11 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
-/*
+/**
  * StockManagerFactory : factory of stock manager
+ *
  * @since 1.5.0
+ * @deprecated since 9.0 and will be removed in 10.0, stock is now managed by new logic
  */
 class StockManagerFactoryCore
 {
diff --git a/classes/stock/StockManagerInterface.php b/classes/stock/StockManagerInterface.php
index b62e377de55b4..c2c5036ae4ff0 100644
--- a/classes/stock/StockManagerInterface.php
+++ b/classes/stock/StockManagerInterface.php
@@ -28,6 +28,7 @@
  * StockManagerInterface : defines a way to manage stock.
  *
  * @since 1.5.0
+ * @deprecated since 9.0 and will be removed in 10.0, stock is now managed by new logic
  */
 interface StockManagerInterface
 {
diff --git a/classes/stock/StockManagerModule.php b/classes/stock/StockManagerModule.php
index 443745f195bd3..03acda35645ee 100644
--- a/classes/stock/StockManagerModule.php
+++ b/classes/stock/StockManagerModule.php
@@ -26,6 +26,7 @@
 
 /**
  * @since 1.5.0
+ * @deprecated since 9.0 and will be removed in 10.0, stock is now managed by new logic
  */
 abstract class StockManagerModuleCore extends Module
 {
diff --git a/classes/stock/StockMvt.php b/classes/stock/StockMvt.php
index f21922b20bfab..0bd748159c3b5 100644
--- a/classes/stock/StockMvt.php
+++ b/classes/stock/StockMvt.php
@@ -25,7 +25,8 @@
  */
 
 /**
- * @since 1.5.0 It now defines stock movements when the advanced stock management system is available
+ * @since 1.5.0 Defines stock movements
+ * @deprecated since 9.0 and will be removed in 10.0, this object model is no longer needed
  */
 class StockMvtCore extends ObjectModel
 {
diff --git a/classes/stock/StockMvtReason.php b/classes/stock/StockMvtReason.php
index 501295a43d8c3..aecda5f2cb4e2 100644
--- a/classes/stock/StockMvtReason.php
+++ b/classes/stock/StockMvtReason.php
@@ -23,6 +23,10 @@
  * @copyright Since 2007 PrestaShop SA and Contributors
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
+
+/**
+ * @deprecated since 9.0 and will be removed in 10.0, this object model is no longer needed
+ */
 class StockMvtReasonCore extends ObjectModel
 {
     /** @var int identifier of the movement reason */
diff --git a/classes/stock/StockMvtWS.php b/classes/stock/StockMvtWS.php
index 88c445d34543f..99c7dee0804b1 100644
--- a/classes/stock/StockMvtWS.php
+++ b/classes/stock/StockMvtWS.php
@@ -28,6 +28,7 @@
  * Webservice entity for stock movements.
  *
  * @since 1.5.0
+ * @deprecated since 9.0 and will be removed in 10.0, this object model is no longer needed
  */
 class StockMvtWSCore extends ObjectModelCore
 {
diff --git a/classes/stock/SupplyOrder.php b/classes/stock/SupplyOrder.php
index 47f3e8e5bc949..dc49ffa2f87f8 100644
--- a/classes/stock/SupplyOrder.php
+++ b/classes/stock/SupplyOrder.php
@@ -26,6 +26,7 @@
 
 /**
  * @since 1.5.0
+ * @deprecated since 9.0 and will be removed in 10.0
  */
 class SupplyOrderCore extends ObjectModel
 {
diff --git a/classes/stock/SupplyOrderDetail.php b/classes/stock/SupplyOrderDetail.php
index a37c775980038..c574d249584ee 100644
--- a/classes/stock/SupplyOrderDetail.php
+++ b/classes/stock/SupplyOrderDetail.php
@@ -28,6 +28,7 @@
  * Represents one product ordered.
  *
  * @since 1.5.0
+ * @deprecated since 9.0 and will be removed in 10.0
  */
 class SupplyOrderDetailCore extends ObjectModel
 {
diff --git a/classes/stock/SupplyOrderHistory.php b/classes/stock/SupplyOrderHistory.php
index 78d1ee16a619c..bc669bfc2ad65 100644
--- a/classes/stock/SupplyOrderHistory.php
+++ b/classes/stock/SupplyOrderHistory.php
@@ -26,6 +26,7 @@
 
 /**
  * @since 1.5.0
+ * @deprecated since 9.0 and will be removed in 10.0
  */
 class SupplyOrderHistoryCore extends ObjectModel
 {
diff --git a/classes/stock/SupplyOrderReceiptHistory.php b/classes/stock/SupplyOrderReceiptHistory.php
index bc3771463adda..499df27a9abbc 100644
--- a/classes/stock/SupplyOrderReceiptHistory.php
+++ b/classes/stock/SupplyOrderReceiptHistory.php
@@ -28,6 +28,7 @@
  * History of receipts.
  *
  * @since 1.5.0
+ * @deprecated since 9.0 and will be removed in 10.0
  */
 class SupplyOrderReceiptHistoryCore extends ObjectModel
 {
diff --git a/classes/stock/SupplyOrderState.php b/classes/stock/SupplyOrderState.php
index b4a504951f781..4336c0d033b81 100644
--- a/classes/stock/SupplyOrderState.php
+++ b/classes/stock/SupplyOrderState.php
@@ -26,6 +26,7 @@
 
 /**
  * @since 1.5.0
+ * @deprecated since 9.0 and will be removed in 10.0
  */
 class SupplyOrderStateCore extends ObjectModel
 {
diff --git a/classes/stock/Warehouse.php b/classes/stock/Warehouse.php
index 0033d14894f10..9c97f3fec6620 100644
--- a/classes/stock/Warehouse.php
+++ b/classes/stock/Warehouse.php
@@ -28,6 +28,7 @@
  * Holds Stock.
  *
  * @since 1.5.0
+ * @deprecated since 9.0 and will be removed in 10.0
  */
 class WarehouseCore extends ObjectModel
 {
@@ -306,7 +307,6 @@ public static function getProductLocation($id_product, $id_product_attribute, $i
      */
     public static function getProductWarehouseList($id_product, $id_product_attribute = 0, $id_shop = null)
     {
-        // if it's a pack, returns warehouses if and only if some products use the advanced stock management
         $share_stock = false;
         if ($id_shop === null) {
             if (Shop::getContext() == Shop::CONTEXT_GROUP) {
@@ -522,8 +522,6 @@ public static function getPackWarehouses($id_product, $id_shop = null)
 
         // warehouses of the pack
         $pack_warehouses = WarehouseProductLocation::getCollection((int) $id_product);
-        // products in the pack
-        $products = Pack::getItems((int) $id_product, Configuration::get('PS_LANG_DEFAULT'));
 
         // array with all warehouses id to check
         $list = [];
@@ -534,34 +532,26 @@ public static function getPackWarehouses($id_product, $id_shop = null)
             $list['pack_warehouses'][] = (int) $pack_warehouse->id_warehouse;
         }
 
-        // for each products in the pack
-        foreach ($products as $product) {
-            if ($product->advanced_stock_management) {
-                // gets the warehouses of one product
-                $product_warehouses = Warehouse::getProductWarehouseList((int) $product->id, (int) $product->cache_default_attribute, (int) $id_shop);
-                $list[(int) $product->id] = [];
-                // fills array with warehouses for this product
-                foreach ($product_warehouses as $product_warehouse) {
-                    $list[(int) $product->id][] = $product_warehouse['id_warehouse'];
-                }
-            }
-        }
-
         $res = false;
         // returns final list
-        if (count($list) > 1) {
+        if (!empty($list)) {
             $res = call_user_func_array('array_intersect', $list);
         }
 
         return $res;
     }
 
+    /**
+     * @deprecated Since 9.0 and will be removed in 10.0
+     */
     public function resetStockAvailable()
     {
-        $products = WarehouseProductLocation::getProducts((int) $this->id);
-        foreach ($products as $product) {
-            StockAvailable::synchronize((int) $product['id_product']);
-        }
+        @trigger_error(sprintf(
+            '%s is deprecated since 9.0 and will be removed in 10.0.',
+            __METHOD__
+        ), E_USER_DEPRECATED);
+
+        return true;
     }
 
     /*********************************\
diff --git a/classes/stock/WarehouseProductLocation.php b/classes/stock/WarehouseProductLocation.php
index 2d35d3658c437..150be6cb35be0 100644
--- a/classes/stock/WarehouseProductLocation.php
+++ b/classes/stock/WarehouseProductLocation.php
@@ -25,6 +25,7 @@
  */
 /**
  * @since 1.5.0
+ * @deprecated since 9.0 and will be removed in 10.0
  */
 class WarehouseProductLocationCore extends ObjectModel
 {
diff --git a/classes/webservice/WebserviceRequest.php b/classes/webservice/WebserviceRequest.php
index ee2a809ff18d7..057789e074142 100644
--- a/classes/webservice/WebserviceRequest.php
+++ b/classes/webservice/WebserviceRequest.php
@@ -338,12 +338,6 @@ public static function getResources()
             'warehouses' => ['description' => 'Warehouses', 'class' => 'Warehouse', 'forbidden_method' => ['DELETE']],
             'stocks' => ['description' => 'Stocks', 'class' => 'Stock', 'forbidden_method' => ['PUT', 'POST', 'PATCH', 'DELETE']],
             'stock_availables' => ['description' => 'Available quantities', 'class' => 'StockAvailable', 'forbidden_method' => ['POST', 'DELETE']],
-            'warehouse_product_locations' => ['description' => 'Location of products in warehouses', 'class' => 'WarehouseProductLocation', 'forbidden_method' => ['PUT', 'POST', 'PATCH', 'DELETE']],
-            'supply_orders' => ['description' => 'Supply Orders', 'class' => 'SupplyOrder', 'forbidden_method' => ['PUT', 'POST', 'PATCH', 'DELETE']],
-            'supply_order_details' => ['description' => 'Supply Order Details', 'class' => 'SupplyOrderDetail', 'forbidden_method' => ['PUT', 'POST', 'PATCH', 'DELETE']],
-            'supply_order_states' => ['description' => 'Supply Order Statuses', 'class' => 'SupplyOrderState', 'forbidden_method' => ['PUT', 'POST', 'PATCH', 'DELETE']],
-            'supply_order_histories' => ['description' => 'Supply Order Histories', 'class' => 'SupplyOrderHistory', 'forbidden_method' => ['PUT', 'POST', 'PATCH', 'DELETE']],
-            'supply_order_receipt_histories' => ['description' => 'Supply Order Receipt Histories', 'class' => 'SupplyOrderReceiptHistory', 'forbidden_method' => ['PUT', 'POST', 'PATCH', 'DELETE']],
             'product_suppliers' => ['description' => 'Product Suppliers', 'class' => 'ProductSupplier'],
             'tax_rules' => ['description' => 'Tax rules entity', 'class' => 'TaxRule'],
             'tax_rule_groups' => ['description' => 'Tax rule groups', 'class' => 'TaxRulesGroup'],
diff --git a/controllers/admin/AdminCarriersController.php b/controllers/admin/AdminCarriersController.php
index 57890fec49fcf..6b6f777c7b8a8 100644
--- a/controllers/admin/AdminCarriersController.php
+++ b/controllers/admin/AdminCarriersController.php
@@ -497,21 +497,6 @@ public function postProcess()
 
             $this->processIsFree();
         } else {
-            // if deletion : removes the carrier from the warehouse/carrier association
-            if (Tools::isSubmit('delete' . $this->table)) {
-                $id = (int) Tools::getValue('id_' . $this->table);
-                // Delete from the reference_id and not from the carrier id
-                $carrier = new Carrier((int) $id);
-                Warehouse::removeCarrier($carrier->id_reference);
-            } elseif (Tools::isSubmit($this->table . 'Box') && count(Tools::getValue($this->table . 'Box', [])) > 0) {
-                $ids = Tools::getValue($this->table . 'Box');
-                array_walk($ids, 'intval');
-                foreach ($ids as $id) {
-                    // Delete from the reference_id and not from the carrier id
-                    $carrier = new Carrier((int) $id);
-                    Warehouse::removeCarrier($carrier->id_reference);
-                }
-            }
             parent::postProcess();
             Carrier::cleanPositions();
         }
diff --git a/controllers/admin/AdminCountriesController.php b/controllers/admin/AdminCountriesController.php
index d6f8b82c4d43d..9a6ed94762f56 100644
--- a/controllers/admin/AdminCountriesController.php
+++ b/controllers/admin/AdminCountriesController.php
@@ -493,7 +493,6 @@ protected function displayValidFields()
     {
         /* The following translations are needed later - don't remove the comments!
         $this->trans('Customer', [], 'Admin.Global');
-        $this->trans('Warehouse', [], 'Admin.Global');
         $this->trans('Country', [], 'Admin.Global');
         $this->trans('State', [], 'Admin.Global');
         $this->trans('Address', [], 'Admin.Global');
diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php
index 5a0c885117bcb..ac2783718d032 100644
--- a/controllers/admin/AdminImportController.php
+++ b/controllers/admin/AdminImportController.php
@@ -111,15 +111,6 @@ public function __construct()
         ];
 
         // @since 1.5.0
-        if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) {
-            $this->entities = array_merge(
-                $this->entities,
-                [
-                    $this->trans('Supply Orders', [], 'Admin.Advparameters.Feature'),
-                    $this->trans('Supply Order Details', [], 'Admin.Advparameters.Feature'),
-                ]
-            );
-        }
 
         $this->entities = array_flip($this->entities);
 
@@ -164,18 +155,6 @@ public function __construct()
                         'label' => $this->trans('ID / Name of the store', [], 'Admin.Advparameters.Feature'),
                         'help' => $this->trans('Ignore this field if you don\'t use the Multistore tool. If you leave this field empty, the default store will be used.', [], 'Admin.Advparameters.Help'),
                     ],
-                    'advanced_stock_management' => [
-                        'label' => $this->trans('Advanced Stock Management', [], 'Admin.Advparameters.Feature'),
-                        'help' => $this->trans('Enable advanced stock management on product (0 = No, 1 = Yes)', [], 'Admin.Advparameters.Help'),
-                    ],
-                    'depends_on_stock' => [
-                        'label' => $this->trans('Depends on stock', [], 'Admin.Advparameters.Feature'),
-                        'help' => $this->trans('0 = Use quantity set in product, 1 = Use quantity from warehouse.', [], 'Admin.Advparameters.Help'),
-                    ],
-                    'warehouse' => [
-                        'label' => $this->trans('Warehouse', [], 'Admin.Advparameters.Feature'),
-                        'help' => $this->trans('ID of the warehouse to set as storage.', [], 'Admin.Advparameters.Help'),
-                    ],
                 ];
 
                 self::$default_values = [
@@ -193,8 +172,6 @@ public function __construct()
                     'low_stock_alert' => false,
                     'weight' => 0,
                     'default_on' => null,
-                    'advanced_stock_management' => 0,
-                    'depends_on_stock' => 0,
                     'available_date' => date('Y-m-d'),
                 ];
 
@@ -326,18 +303,6 @@ public function __construct()
                         'label' => $this->trans('ID / Name of the store', [], 'Admin.Advparameters.Feature'),
                         'help' => $this->trans('Ignore this field if you don\'t use the Multistore tool. If you leave this field empty, the default store will be used.', [], 'Admin.Advparameters.Help'),
                     ],
-                    'advanced_stock_management' => [
-                        'label' => $this->trans('Advanced Stock Management', [], 'Admin.Advparameters.Feature'),
-                        'help' => $this->trans('Enable advanced stock management on product (0 = No, 1 = Yes).', [], 'Admin.Advparameters.Help'),
-                    ],
-                    'depends_on_stock' => [
-                        'label' => $this->trans('Depends on stock', [], 'Admin.Advparameters.Feature'),
-                        'help' => $this->trans('0 = Use quantity set in product, 1 = Use quantity from warehouse.', [], 'Admin.Advparameters.Help'),
-                    ],
-                    'warehouse' => [
-                        'label' => $this->trans('Warehouse', [], 'Admin.Advparameters.Feature'),
-                        'help' => $this->trans('ID of the warehouse to set as storage.', [], 'Admin.Advparameters.Help'),
-                    ],
                     'accessories' => ['label' => $this->trans('Accessories (x,y,z...)', [], 'Admin.Advparameters.Feature')],
                 ];
 
@@ -368,8 +333,6 @@ public function __construct()
                     'customizable' => 0,
                     'uploadable_files' => 0,
                     'text_fields' => 0,
-                    'advanced_stock_management' => 0,
-                    'depends_on_stock' => 0,
                     'is_virtual' => 0,
                 ];
 
@@ -550,68 +513,6 @@ public function __construct()
                 break;
         }
 
-        // @since 1.5.0
-        if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) {
-            switch ((int) Tools::getValue('entity')) {
-                case $this->entities[$this->trans('Supply Orders', [], 'Admin.Advparameters.Feature')]:
-                    // required fields
-                    $this->required_fields = [
-                        'id_supplier',
-                        'id_warehouse',
-                        'reference',
-                        'date_delivery_expected',
-                    ];
-                    // available fields
-                    $this->available_fields = [
-                        'no' => ['label' => $this->trans('Ignore this column', [], 'Admin.Advparameters.Feature')],
-                        'id' => ['label' => $this->trans('ID', [], 'Admin.Global')],
-                        'id_supplier' => ['label' => $this->trans('Supplier ID *', [], 'Admin.Advparameters.Feature')],
-                        'id_lang' => ['label' => $this->trans('Lang ID', [], 'Admin.Advparameters.Feature')],
-                        'id_warehouse' => ['label' => $this->trans('Warehouse ID *', [], 'Admin.Advparameters.Feature')],
-                        'id_currency' => ['label' => $this->trans('Currency ID *', [], 'Admin.Advparameters.Feature')],
-                        'reference' => ['label' => $this->trans('Supply Order Reference *', [], 'Admin.Advparameters.Feature')],
-                        'date_delivery_expected' => ['label' => $this->trans('Delivery Date (Y-M-D)*', [], 'Admin.Advparameters.Feature')],
-                        'discount_rate' => ['label' => $this->trans('Discount rate', [], 'Admin.Advparameters.Feature')],
-                        'is_template' => ['label' => $this->trans('Template', [], 'Admin.Advparameters.Feature')],
-                    ];
-                    // default values
-                    self::$default_values = [
-                        'id_lang' => (int) Configuration::get('PS_LANG_DEFAULT'),
-                        'id_currency' => Currency::getDefaultCurrency()->id,
-                        'discount_rate' => '0',
-                        'is_template' => '0',
-                    ];
-
-                    break;
-                case $this->entities[$this->trans('Supply Order Details', [], 'Admin.Advparameters.Feature')]:
-                    // required fields
-                    $this->required_fields = [
-                        'supply_order_reference',
-                        'id_product',
-                        'unit_price_te',
-                        'quantity_expected',
-                    ];
-                    // available fields
-                    $this->available_fields = [
-                        'no' => ['label' => $this->trans('Ignore this column', [], 'Admin.Advparameters.Feature')],
-                        'supply_order_reference' => ['label' => $this->trans('Supply Order Reference *', [], 'Admin.Advparameters.Feature')],
-                        'id_product' => ['label' => $this->trans('Product ID *', [], 'Admin.Advparameters.Feature')],
-                        'id_product_attribute' => ['label' => $this->trans('Product Attribute ID', [], 'Admin.Advparameters.Feature')],
-                        'unit_price_te' => ['label' => $this->trans('Unit Price (tax excl.)*', [], 'Admin.Advparameters.Feature')],
-                        'quantity_expected' => ['label' => $this->trans('Quantity Expected *', [], 'Admin.Advparameters.Feature')],
-                        'discount_rate' => ['label' => $this->trans('Discount Rate', [], 'Admin.Advparameters.Feature')],
-                        'tax_rate' => ['label' => $this->trans('Tax Rate', [], 'Admin.Advparameters.Feature')],
-                    ];
-                    // default values
-                    self::$default_values = [
-                        'discount_rate' => '0',
-                        'tax_rate' => '0',
-                    ];
-
-                    break;
-            }
-        }
-
         $this->separator = ($separator = Tools::substr((string) (trim(Tools::getValue('separator'))), 0, 1)) ? $separator : ';';
         $this->convert = false;
         $this->multiple_value_separator = ($separator = Tools::substr((string) (trim(Tools::getValue('multiple_value_separator'))), 0, 1)) ? $separator : ',';
@@ -774,7 +675,6 @@ public function renderForm()
             'id_language' => ($id_lang_selected) ? $id_lang_selected : $this->context->language->id,
             'available_fields' => $this->getAvailableFields(),
             'truncateAuthorized' => (Shop::isFeatureActive() && $this->context->employee->isSuperAdmin()) || !Shop::isFeatureActive(),
-            'PS_ADVANCED_STOCK_MANAGEMENT' => Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT'),
         ];
 
         return parent::renderForm();
@@ -1650,10 +1550,8 @@ protected function productImportOne($info, $default_language_id, $id_lang, $forc
             return;
         }
 
-        $update_advanced_stock_management_value = false;
         if (isset($product->id) && $product->id && Product::existsInDatabase((int) $product->id, 'product')) {
             $product->loadStockData();
-            $update_advanced_stock_management_value = true;
             $category_data = Product::getProductCategories((int) $product->id);
 
             if (is_array($category_data)) {
@@ -2206,124 +2104,7 @@ protected function productImportOne($info, $default_language_id, $id_lang, $forc
             // clean feature positions to avoid conflict
             Feature::cleanPositions();
 
-            // set advanced stock managment
             if (!$validateOnly) {
-                /* @phpstan-ignore-next-line Data from the property `advanced_stock_management` come from the database */
-                if ($product->advanced_stock_management != 1 && $product->advanced_stock_management != 0) {
-                    $this->warnings[] = $this->trans(
-                        'Advanced stock management has incorrect value. Not set for product %name%',
-                        [
-                            '%name%' => Tools::htmlentitiesUTF8($product->name[$default_language_id]),
-                        ],
-                        'Admin.Advparameters.Notification'
-                    );
-                } elseif (!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && $product->advanced_stock_management == 1) {
-                    $this->warnings[] = $this->trans(
-                        'Advanced stock management is not enabled, cannot enable on product %name%',
-                        [
-                            '%name%' => Tools::htmlentitiesUTF8($product->name[$default_language_id]),
-                        ],
-                        'Admin.Advparameters.Notification'
-                    );
-                } elseif ($update_advanced_stock_management_value) {
-                    $product->setAdvancedStockManagement($product->advanced_stock_management);
-                }
-                // automaticly disable depends on stock, if a_s_m set to disabled
-                if (StockAvailable::dependsOnStock($product->id) == 1 && $product->advanced_stock_management == 0) {
-                    StockAvailable::setProductDependsOnStock($product->id, false);
-                }
-            }
-
-            // Check if warehouse exists
-            if (isset($product->warehouse) && $product->warehouse) {
-                if (!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) {
-                    $this->warnings[] = $this->trans(
-                        'Advanced stock management is not enabled, warehouse not set on product %name%',
-                        [
-                            '%name%' => Tools::htmlentitiesUTF8($product->name[$default_language_id]),
-                        ],
-                        'Admin.Advparameters.Notification'
-                    );
-                } elseif (!$validateOnly) {
-                    if (Warehouse::exists($product->warehouse)) {
-                        // Get already associated warehouses
-                        $associated_warehouses_collection = WarehouseProductLocation::getCollection($product->id);
-                        // Delete any entry in warehouse for this product
-                        foreach ($associated_warehouses_collection as $awc) {
-                            $awc->delete();
-                        }
-                        $warehouse_location_entity = new WarehouseProductLocation();
-                        $warehouse_location_entity->id_product = $product->id;
-                        $warehouse_location_entity->id_product_attribute = 0;
-                        $warehouse_location_entity->id_warehouse = $product->warehouse;
-                        if (WarehouseProductLocation::getProductLocation($product->id, 0, $product->warehouse) !== false) {
-                            $warehouse_location_entity->update();
-                        } else {
-                            $warehouse_location_entity->save();
-                        }
-                        StockAvailable::synchronize($product->id);
-                    } else {
-                        $this->warnings[] = $this->trans(
-                            'Warehouse did not exist, cannot set on product %name%.',
-                            [
-                                '%name%' => Tools::htmlentitiesUTF8($product->name[$default_language_id]),
-                            ],
-                            'Admin.Advparameters.Notification'
-                        );
-                    }
-                }
-            }
-
-            // stock available
-            if (isset($product->depends_on_stock)) {
-                /* @phpstan-ignore-next-line Data from the property `depends_on_stock` come from the database */
-                if ($product->depends_on_stock != 0 && $product->depends_on_stock != 1) {
-                    $this->warnings[] = $this->trans(
-                        'Incorrect value for "Depends on stock" for product %name%',
-                        [
-                            '%name%' => Tools::htmlentitiesUTF8($product->name[$default_language_id]),
-                        ],
-                        'Admin.Advparameters.Notification'
-                    );
-                /* @phpstan-ignore-next-line Data from properties `advanced_stock_management` & `depends_on_stock` come from the database */
-                } elseif ((!$product->advanced_stock_management || $product->advanced_stock_management == 0) && $product->depends_on_stock == 1) {
-                    $this->warnings[] = $this->trans(
-                        'Advanced stock management is not enabled, cannot set "Depends on stock" for product %name%',
-                        [
-                            '%name%' => Tools::htmlentitiesUTF8($product->name[$default_language_id]),
-                        ],
-                        'Admin.Advparameters.Notification'
-                    );
-                } elseif (!$validateOnly) {
-                    StockAvailable::setProductDependsOnStock($product->id, $product->depends_on_stock);
-                }
-
-                // This code allows us to set qty and disable depends on stock
-                if (!$validateOnly) {
-                    // if depends on stock and quantity, add quantity to stock
-                    if ($product->depends_on_stock == 1) {
-                        $stock_manager = StockManagerFactory::getManager();
-                        $price = str_replace(',', '.', (string) $product->wholesale_price);
-                        if ($price == '0') {
-                            $price = 0.000001;
-                        }
-                        $price = round((float) $price, 6);
-                        $warehouse = new Warehouse($product->warehouse);
-                        if ($stock_manager->addProduct((int) $product->id, 0, $warehouse, (int) $product->quantity, 1, $price, true)) {
-                            StockAvailable::synchronize((int) $product->id);
-                        }
-                    } else {
-                        if ($shop_is_feature_active) {
-                            foreach ($shops as $shop) {
-                                StockAvailable::setQuantity((int) $product->id, 0, (int) $product->quantity, (int) $shop);
-                            }
-                        } else {
-                            StockAvailable::setQuantity((int) $product->id, 0, (int) $product->quantity, (int) $this->context->shop->id);
-                        }
-                    }
-                }
-            } elseif (!$validateOnly) {
-                // if not depends_on_stock set, use normal qty
                 if ($shop_is_feature_active) {
                     foreach ($shops as $shop) {
                         StockAvailable::setQuantity((int) $product->id, 0, (int) $product->quantity, (int) $shop);
@@ -2800,114 +2581,8 @@ protected function attributeImportOne($info, $default_language, &$groups, &$attr
                 }
             }
 
-            // set advanced stock managment
-            if (isset($info['advanced_stock_management'])) {
-                if ($info['advanced_stock_management'] != 1 && $info['advanced_stock_management'] != 0) {
-                    $this->warnings[] = $this->trans(
-                        'Advanced stock management has incorrect value. Not set for product with id %id%.',
-                        [
-                            '%id%' => Tools::htmlentitiesUTF8($product->id),
-                        ],
-                        'Admin.Advparameters.Notification'
-                    );
-                } elseif (!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && $info['advanced_stock_management'] == 1) {
-                    $this->warnings[] = $this->trans(
-                        'Advanced stock management is not enabled, cannot enable on product with id %id%.',
-                        [
-                            '%id%' => Tools::htmlentitiesUTF8($product->id),
-                        ],
-                        'Admin.Advparameters.Notification'
-                    );
-                } elseif (!$validateOnly) {
-                    $product->setAdvancedStockManagement($info['advanced_stock_management']);
-                }
-                // automaticly disable depends on stock, if a_s_m set to disabled
-                if (!$validateOnly && StockAvailable::dependsOnStock($product->id) == 1 && $info['advanced_stock_management'] == 0) {
-                    StockAvailable::setProductDependsOnStock($product->id, false, null, $id_product_attribute);
-                }
-            }
-
-            // Check if warehouse exists
-            if (isset($info['warehouse']) && $info['warehouse']) {
-                if (!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) {
-                    $this->warnings[] = $this->trans(
-                        'Advanced stock management is not enabled, warehouse is not set on product with id %id%.',
-                        ['%id%' => Tools::htmlentitiesUTF8($product->id)],
-                        'Admin.Advparameters.Notification'
-                    );
-                } else {
-                    if (Warehouse::exists($info['warehouse'])) {
-                        $warehouse_location_entity = new WarehouseProductLocation();
-                        $warehouse_location_entity->id_product = $product->id;
-                        $warehouse_location_entity->id_product_attribute = $id_product_attribute;
-                        $warehouse_location_entity->id_warehouse = $info['warehouse'];
-                        if (!$validateOnly) {
-                            if (WarehouseProductLocation::getProductLocation($product->id, $id_product_attribute, $info['warehouse']) !== false) {
-                                $warehouse_location_entity->update();
-                            } else {
-                                $warehouse_location_entity->save();
-                            }
-                            StockAvailable::synchronize($product->id);
-                        }
-                    } else {
-                        $this->warnings[] = $this->trans(
-                            'Warehouse did not exist, cannot set on product %name%.',
-                            [
-                                '%name%' => Tools::htmlentitiesUTF8($product->name[$default_language]),
-                            ],
-                            'Admin.Advparameters.Notification'
-                        );
-                    }
-                }
-            }
-
             // stock available
-            if (isset($info['depends_on_stock'])) {
-                if ($info['depends_on_stock'] != 0 && $info['depends_on_stock'] != 1) {
-                    $this->warnings[] = $this->trans(
-                        'Incorrect value for "Depends on stock" for product %name%',
-                        [
-                            '%name%' => Tools::htmlentitiesUTF8($product->name[$default_language]),
-                        ],
-                        'Admin.Notifications.Error'
-                    );
-                } elseif ((!$info['advanced_stock_management'] || $info['advanced_stock_management'] == 0) && $info['depends_on_stock'] == 1) {
-                    $this->warnings[] = $this->trans(
-                        'Advanced stock management is not enabled, cannot set "Depends on stock" for product %name%',
-                        [
-                            '%name%' => Tools::htmlentitiesUTF8($product->name[$default_language]),
-                        ],
-                        'Admin.Advparameters.Notification'
-                    );
-                } elseif (!$validateOnly) {
-                    StockAvailable::setProductDependsOnStock($product->id, $info['depends_on_stock'], null, $id_product_attribute);
-                }
-
-                // This code allows us to set qty and disable depends on stock
-                if (isset($info['quantity'])) {
-                    // if depends on stock and quantity, add quantity to stock
-                    if ($info['depends_on_stock'] == 1) {
-                        $stock_manager = StockManagerFactory::getManager();
-                        $price = str_replace(',', '.', $info['wholesale_price']);
-                        if ($price == '0') {
-                            $price = 0.000001;
-                        }
-                        $price = round((float) $price, 6);
-                        $warehouse = new Warehouse($info['warehouse']);
-                        if (!$validateOnly && $stock_manager->addProduct((int) $product->id, $id_product_attribute, $warehouse, (int) $info['quantity'], 1, $price, true)) {
-                            StockAvailable::synchronize((int) $product->id);
-                        }
-                    } elseif (!$validateOnly) {
-                        if ($shop_is_feature_active) {
-                            foreach ($id_shop_list as $shop) {
-                                StockAvailable::setQuantity((int) $product->id, $id_product_attribute, (int) $info['quantity'], (int) $shop);
-                            }
-                        } else {
-                            StockAvailable::setQuantity((int) $product->id, $id_product_attribute, (int) $info['quantity'], $this->context->shop->id);
-                        }
-                    }
-                }
-            } elseif (!$validateOnly) { // if not depends_on_stock set, use normal qty
+            if (!$validateOnly) {
                 if ($shop_is_feature_active) {
                     foreach ($id_shop_list as $shop) {
                         StockAvailable::setQuantity((int) $product->id, $id_product_attribute, (int) $info['quantity'], (int) $shop);
@@ -3996,305 +3671,29 @@ public function storeContactImportOne($info, $shop_is_feature_active, $regenerat
 
     /**
      * @since 1.5.0
+     * @deprecated Since 9.0 and will be removed in 10.0
      */
     public function supplyOrdersImport($offset = false, $limit = false, $validateOnly = false)
     {
-        // opens CSV & sets locale
-        $this->receiveTab();
-        $handle = $this->openCsvFile($offset);
-        if (!$handle) {
-            return false;
-        }
-
-        AdminImportController::setLocale();
-
-        $force_ids = Tools::getValue('forceIDs');
-
-        // main loop, for each supply orders to import
-        $line_count = 0;
-        for ($current_line = 0; ($line = fgetcsv($handle, MAX_LINE_SIZE, $this->separator)) && (!$limit || $current_line < $limit); ++$current_line) {
-            ++$line_count;
-            if ($this->convert) {
-                $line = $this->utf8EncodeArray($line);
-            }
-            $info = AdminImportController::getMaskedRow($line);
-
-            $this->supplyOrdersImportOne(
-                $info,
-                $force_ids,
-                $current_line,
-                $validateOnly
-            );
-        }
-        // closes
-        $this->closeCsvFile($handle);
-
-        return $line_count;
-    }
-
-    protected function supplyOrdersImportOne($info, $force_ids, $current_line, $validateOnly = false)
-    {
-        // sets default values if needed
-        AdminImportController::setDefaultValues($info);
+        @trigger_error(sprintf(
+            '%s is deprecated since 9.0 and will be removed in 10.0.',
+            __METHOD__
+        ), E_USER_DEPRECATED);
 
-        // if an id is set, instanciates a supply order with this id if possible
-        if (array_key_exists('id', $info) && (int) $info['id'] && SupplyOrder::exists((int) $info['id'])) {
-            $supply_order = new SupplyOrder((int) $info['id']);
-        } elseif (array_key_exists('reference', $info) && $info['reference'] && SupplyOrder::exists(pSQL($info['reference']))) {
-            $supply_order = SupplyOrder::getSupplyOrderByReference(pSQL($info['reference']));
-        } else { // new supply order
-            $supply_order = new SupplyOrder();
-        }
-
-        // gets parameters
-        $id_supplier = (int) $info['id_supplier'];
-        $id_lang = (int) $info['id_lang'];
-        $id_warehouse = (int) $info['id_warehouse'];
-        $id_currency = (int) $info['id_currency'];
-        $reference = pSQL($info['reference']);
-        $date_delivery_expected = pSQL($info['date_delivery_expected']);
-        $discount_rate = (float) $info['discount_rate'];
-        $is_template = (bool) $info['is_template'];
-
-        $error = '';
-        // checks parameters
-        if (!Supplier::supplierExists($id_supplier)) {
-            $error = $this->trans('Supplier ID (%id%) is not valid (at line %line%).', ['%id%' => $id_supplier, '%line%' => $current_line + 1], 'Admin.Advparameters.Notification');
-        }
-        if (!Language::getLanguage($id_lang)) {
-            $error = $this->trans('Lang ID (%id%) is not valid (at line %line%).', ['%id%' => $id_lang, '%line%' => $current_line + 1], 'Admin.Advparameters.Notification');
-        }
-        if (!Warehouse::exists($id_warehouse)) {
-            $error = $this->trans('Warehouse ID (%id%) is not valid (at line %line%).', ['%id%' => $id_warehouse, '%line%' => $current_line + 1], 'Admin.Advparameters.Notification');
-        }
-        if (!Currency::getCurrency($id_currency)) {
-            $error = $this->trans('Currency ID (%id%) is not valid (at line %line%).', ['%id%' => $id_currency, '%line%' => $current_line + 1], 'Admin.Advparameters.Notification');
-        }
-        if (empty($supply_order->reference) && SupplyOrder::exists($reference)) {
-            $error = $this->trans('Reference (%ref%) already exists (at line %line%).', ['%ref%' => $reference, '%line%' => $current_line + 1], 'Admin.Advparameters.Notification');
-        }
-        if (!empty($supply_order->reference) && ($supply_order->reference != $reference && SupplyOrder::exists($reference))) {
-            $error = $this->trans('Reference (%ref%) already exists (at line %line%).', ['%ref%' => $reference, '%line%' => $current_line + 1], 'Admin.Advparameters.Notification');
-        }
-        if (!Validate::isDateFormat($date_delivery_expected)) {
-            $error = $this->trans('Date format (%date%) is not valid (at line %line%). It should be: %date_format%.', ['%date%' => $date_delivery_expected, '%line%' => $current_line + 1, '%date_format%' => $this->trans('YYYY-MM-DD', [], 'Admin.Advparameters.Notification')], 'Admin.Advparameters.Notification');
-        } elseif (new DateTime($date_delivery_expected) <= new DateTime('yesterday')) {
-            $error = $this->trans('Date (%date%) cannot be in the past (at line %line%). Format: %date_format%.', ['%date%' => $date_delivery_expected, '%line%' => $current_line + 1, '%date_format%' => $this->trans('YYYY-MM-DD', [], 'Admin.Advparameters.Notification')], 'Admin.Advparameters.Notification');
-        }
-        if ($discount_rate < 0 || $discount_rate > 100) {
-            $error = $this->trans(
-                'Discount rate (%rate%) is not valid (at line %line%). %format%.',
-                ['%rate%' => $discount_rate, '%line%' => $current_line + 1, '%format%' => $this->trans('Format: Between 0 and 100', [], 'Admin.Advparameters.Notification')],
-                'Admin.Advparameters.Notification'
-            );
-        }
-        if ($supply_order->id > 0 && !$supply_order->isEditable()) {
-            $error = $this->trans('Supply Order (%id%) is not editable (at line %line%).', ['%id%' => $supply_order->id, '%line%' => $current_line + 1], 'Admin.Advparameters.Notification');
-        }
-
-        // if no errors, sets supply order
-        if (empty($error)) {
-            // adds parameters
-            $info['id_ref_currency'] = (int) Currency::getDefaultCurrency()->id;
-            $info['supplier_name'] = pSQL(Supplier::getNameById($id_supplier));
-            if ($supply_order->id > 0) {
-                $info['id_supply_order_state'] = (int) $supply_order->id_supply_order_state;
-                $info['id'] = (int) $supply_order->id;
-            } else {
-                $info['id_supply_order_state'] = 1;
-            }
-
-            // sets parameters
-            AdminImportController::arrayWalk($info, ['AdminImportController', 'fillInfo'], $supply_order);
-
-            /** @var SupplyOrder $supply_order */
-            if ((int) $supply_order->id && ($supply_order->exists((int) $supply_order->id) || $supply_order->exists($supply_order->reference))) {
-                $res = ($validateOnly || $supply_order->update());
-            } else {
-                $supply_order->force_id = (bool) $force_ids;
-                $res = ($validateOnly || $supply_order->add());
-            }
-
-            // errors
-            if (!$res) {
-                $this->errors[] = $this->trans('Supply Order could not be saved (at line %line%).', ['%line%' => $current_line + 1], 'Admin.Advparameters.Notification');
-            }
-        } else {
-            $this->errors[] = $error;
-        }
+        return 0;
     }
 
+    /**
+     * @deprecated Since 9.0 and will be removed in 10.0
+     */
     public function supplyOrdersDetailsImport($offset = false, $limit = false, &$crossStepsVariables = false, $validateOnly = false)
     {
-        // opens CSV & sets locale
-        $this->receiveTab();
-        $handle = $this->openCsvFile($offset);
-        if (!$handle) {
-            return false;
-        }
-
-        AdminImportController::setLocale();
-
-        $products = [];
-        $reset = true;
-        if ($crossStepsVariables !== false && array_key_exists('products', $crossStepsVariables)) {
-            $products = $crossStepsVariables['products'];
-        }
-        if ($crossStepsVariables !== false && array_key_exists('reset', $crossStepsVariables)) {
-            $reset = $crossStepsVariables['reset'];
-        }
-
-        $force_ids = Tools::getValue('forceIDs');
-
-        // main loop, for each supply orders details to import
-        $line_count = 0;
-        for ($current_line = 0; ($line = fgetcsv($handle, MAX_LINE_SIZE, $this->separator)) && (!$limit || $current_line < $limit); ++$current_line) {
-            ++$line_count;
-            if ($this->convert) {
-                $line = $this->utf8EncodeArray($line);
-            }
-            $info = AdminImportController::getMaskedRow($line);
-
-            $this->supplyOrdersDetailsImportOne(
-                $info,
-                $products, // by ref
-                $reset, // by ref
-                $force_ids,
-                $current_line,
-                $validateOnly
-            );
-        }
-        // closes
-        $this->closeCsvFile($handle);
-
-        if ($crossStepsVariables !== false) {
-            $crossStepsVariables['products'] = $products;
-            $crossStepsVariables['reset'] = $reset;
-        }
-
-        return $line_count;
-    }
-
-    protected function supplyOrdersDetailsImportOne($info, &$products, &$reset, $force_ids, $current_line, $validateOnly = false)
-    {
-        // sets default values if needed
-        AdminImportController::setDefaultValues($info);
-
-        // gets the supply order
-        if (array_key_exists('supply_order_reference', $info) && pSQL($info['supply_order_reference']) && SupplyOrder::exists(pSQL($info['supply_order_reference']))) {
-            $supply_order = SupplyOrder::getSupplyOrderByReference(pSQL($info['supply_order_reference']));
-        } else {
-            $this->errors[] = sprintf(
-                $this->trans('Supply Order (%s) could not be loaded (at line %d).', [], 'Admin.Advparameters.Notification'),
-                Tools::htmlentitiesUTF8($info['supply_order_reference']),
-                $current_line + 1
-            );
+        @trigger_error(sprintf(
+            '%s is deprecated since 9.0 and will be removed in 10.0.',
+            __METHOD__
+        ), E_USER_DEPRECATED);
 
-            return;
-        }
-
-        // sets parameters
-        $id_product = (int) $info['id_product'];
-        if (empty($info['id_product_attribute'])) {
-            $info['id_product_attribute'] = 0;
-        }
-        $id_product_attribute = (int) $info['id_product_attribute'];
-        $unit_price_te = (float) $info['unit_price_te'];
-        $quantity_expected = (int) $info['quantity_expected'];
-        $discount_rate = (float) $info['discount_rate'];
-        $tax_rate = (float) $info['tax_rate'];
-
-        // checks if one product/attribute is there only once
-        if (isset($products[$id_product][$id_product_attribute])) {
-            $this->errors[] = sprintf(
-                $this->trans('Product/Attribute (%d/%d) cannot be added twice (at line %d).', [], 'Admin.Advparameters.Notification'),
-                $id_product,
-                $id_product_attribute,
-                $current_line + 1
-            );
-        } else {
-            $products[$id_product][$id_product_attribute] = $quantity_expected;
-        }
-
-        // checks parameters
-        $supplier_reference = ProductSupplier::getProductSupplierReference($id_product, $id_product_attribute, $supply_order->id_supplier);
-        if (false === $supplier_reference) {
-            $this->errors[] = sprintf(
-                $this->trans('Product (%d/%d) is not available for this order (at line %d).', [], 'Admin.Advparameters.Notification'),
-                $id_product,
-                $id_product_attribute,
-                $current_line + 1
-            );
-        }
-        if ($unit_price_te < 0) {
-            $this->errors[] = sprintf($this->trans('Unit Price (tax excl.) (%d) is not valid (at line %d).', [], 'Admin.Advparameters.Notification'), $unit_price_te, $current_line + 1);
-        }
-        if ($quantity_expected < 0) {
-            $this->errors[] = sprintf($this->trans('Quantity Expected (%d) is not valid (at line %d).', [], 'Admin.Advparameters.Notification'), $quantity_expected, $current_line + 1);
-        }
-        if ($discount_rate < 0 || $discount_rate > 100) {
-            $this->errors[] = sprintf(
-                $this->trans('Discount rate (%d) is not valid (at line %d). %s.', [], 'Admin.Advparameters.Notification'),
-                $discount_rate,
-                $current_line + 1,
-                $this->trans('Format: Between 0 and 100', [], 'Admin.Advparameters.Notification')
-            );
-        }
-        if ($tax_rate < 0 || $tax_rate > 100) {
-            $this->errors[] = sprintf(
-                $this->trans('Quantity Expected (%d) is not valid (at line %d).', [], 'Admin.Advparameters.Notification'),
-                $tax_rate,
-                $current_line + 1,
-                $this->trans('Format: Between 0 and 100', [], 'Admin.Advparameters.Notification')
-            );
-        }
-
-        // if no errors, sets supply order details
-        if (empty($this->errors)) {
-            // resets order if needed
-            if (!$validateOnly && $reset) {
-                $supply_order->resetProducts();
-                $reset = false;
-            }
-
-            // creates new product
-            $supply_order_detail = new SupplyOrderDetail();
-            AdminImportController::arrayWalk($info, ['AdminImportController', 'fillInfo'], $supply_order_detail);
-
-            /* @var SupplyOrderDetail $supply_order_detail */
-
-            // sets parameters
-            $supply_order_detail->id_supply_order = $supply_order->id;
-            $currency = new Currency($supply_order->id_ref_currency);
-            $supply_order_detail->id_currency = $currency->id;
-            $supply_order_detail->exchange_rate = $currency->conversion_rate;
-            $supply_order_detail->supplier_reference = $supplier_reference;
-            $supply_order_detail->name = Product::getProductName($id_product, $id_product_attribute, $supply_order->id_lang);
-
-            // gets ean13 / ref / upc
-            $query = new DbQuery();
-            $query->select('
-                IFNULL(pa.reference, IFNULL(p.reference, \'\')) as reference,
-                IFNULL(pa.ean13, IFNULL(p.ean13, \'\')) as ean13,
-                IFNULL(pa.upc, IFNULL(p.upc, \'\')) as upc
-            ');
-            $query->from('product', 'p');
-            $query->leftJoin('product_attribute', 'pa', 'pa.id_product = p.id_product AND id_product_attribute = ' . (int) $id_product_attribute);
-            $query->where('p.id_product = ' . (int) $id_product);
-            $query->where('p.is_virtual = 0 AND p.cache_is_pack = 0');
-            $res = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query);
-            $product_infos = $res['0'];
-
-            $supply_order_detail->reference = $product_infos['reference'];
-            $supply_order_detail->ean13 = $product_infos['ean13'];
-            $supply_order_detail->upc = $product_infos['upc'];
-            $supply_order_detail->force_id = (bool) $force_ids;
-            if (!$validateOnly) {
-                $supply_order_detail->add();
-                $supply_order->update();
-            }
-            unset($supply_order_detail);
-        }
+        return 0;
     }
 
     public function utf8EncodeArray($array)
@@ -4439,13 +3838,11 @@ protected function truncateTables($case)
                 Db::getInstance()->execute('TRUNCATE TABLE `' . _DB_PREFIX_ . 'product_group_reduction_cache`');
                 Db::getInstance()->execute('TRUNCATE TABLE `' . _DB_PREFIX_ . 'product_sale`');
                 Db::getInstance()->execute('TRUNCATE TABLE `' . _DB_PREFIX_ . 'product_supplier`');
-                Db::getInstance()->execute('TRUNCATE TABLE `' . _DB_PREFIX_ . 'warehouse_product_location`');
                 Db::getInstance()->execute('TRUNCATE TABLE `' . _DB_PREFIX_ . 'stock`');
                 Db::getInstance()->execute('TRUNCATE TABLE `' . _DB_PREFIX_ . 'stock_available`');
                 Db::getInstance()->execute('TRUNCATE TABLE `' . _DB_PREFIX_ . 'stock_mvt`');
                 Db::getInstance()->execute('TRUNCATE TABLE `' . _DB_PREFIX_ . 'customization`');
                 Db::getInstance()->execute('TRUNCATE TABLE `' . _DB_PREFIX_ . 'customization_field`');
-                Db::getInstance()->execute('TRUNCATE TABLE `' . _DB_PREFIX_ . 'supply_order_detail`');
                 Db::getInstance()->execute('TRUNCATE TABLE `' . _DB_PREFIX_ . 'product_attribute`');
                 Db::getInstance()->execute('TRUNCATE TABLE `' . _DB_PREFIX_ . 'product_attribute_shop`');
                 Db::getInstance()->execute('TRUNCATE TABLE `' . _DB_PREFIX_ . 'product_attribute_combination`');
@@ -4651,18 +4048,6 @@ public function importByGroups($offset = false, $limit = false, &$results = null
                     break;
             }
 
-            // @since 1.5.0
-            if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) {
-                switch ((int) Tools::getValue('entity')) {
-                    case $this->entities[$import_type = $this->trans('Supply Orders', [], 'Admin.Advparameters.Feature')]:
-                        $doneCount += $this->supplyOrdersImport($offset, $limit, $validateOnly);
-                        break;
-                    case $this->entities[$import_type = $this->trans('Supply Order Details', [], 'Admin.Advparameters.Feature')]:
-                        $doneCount += $this->supplyOrdersDetailsImport($offset, $limit, $crossStepsVariables, $validateOnly);
-                        break;
-                }
-            }
-
             if ($results !== null) {
                 $results['isFinished'] = ($doneCount < $limit);
                 if ($results['isFinished'] && $clearCache && !$validateOnly) {
diff --git a/controllers/admin/AdminPdfController.php b/controllers/admin/AdminPdfController.php
index 79dd8ad9c4b55..23f202290625e 100644
--- a/controllers/admin/AdminPdfController.php
+++ b/controllers/admin/AdminPdfController.php
@@ -158,20 +158,16 @@ public function processGenerateDeliverySlipsPDF()
         $this->generatePDF($order_invoice_collection, PDF::TEMPLATE_DELIVERY_SLIP);
     }
 
+    /**
+     * @deprecated Since 9.0 and will be removed in 10.0
+     */
     public function processGenerateSupplyOrderFormPDF()
     {
-        if (!Tools::isSubmit('id_supply_order')) {
-            die($this->trans('The supply order ID is missing.', [], 'Admin.Orderscustomers.Notification'));
-        }
-
-        $id_supply_order = (int) Tools::getValue('id_supply_order');
-        $supply_order = new SupplyOrder($id_supply_order);
-
-        if (!Validate::isLoadedObject($supply_order)) {
-            die($this->trans('The supply order cannot be found within your database.', [], 'Admin.Orderscustomers.Notification'));
-        }
-
-        $this->generatePDF($supply_order, PDF::TEMPLATE_SUPPLY_ORDER_FORM);
+        @trigger_error(sprintf(
+            '%s is deprecated since 9.0 and will be removed in 10.0.',
+            __METHOD__
+        ), E_USER_DEPRECATED);
+        die;
     }
 
     public function generateDeliverySlipPDFByIdOrderInvoice($id_order_invoice)
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 1c3e4697f47ba..47dbe5d69b716 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -601,21 +601,6 @@ public function processDelete()
             if (isset($object->noZeroObject) && count($taxes = call_user_func([$this->className, $object->noZeroObject])) <= 1) {
                 $this->errors[] = $this->trans('You need at least one object.', [], 'Admin.Notifications.Error') . ' <b>' . $this->table . '</b><br />' . $this->trans('You cannot delete all of the items.', [], 'Admin.Notifications.Error');
             } else {
-                /*
-                 * @since 1.5.0
-                 * It is NOT possible to delete a product if there are currently:
-                 * - physical stock for this product
-                 * - supply order(s) for this product
-                 */
-                if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && $object->advanced_stock_management) {
-                    $stock_manager = StockManagerFactory::getManager();
-                    $physical_quantity = $stock_manager->getProductPhysicalQuantities($object->id, 0);
-                    $real_quantity = $stock_manager->getProductRealQuantities($object->id, 0);
-                    if ($physical_quantity > 0 || $real_quantity > $physical_quantity) {
-                        $this->errors[] = $this->trans('You cannot delete this product because there is physical stock left.', [], 'Admin.Catalog.Notification');
-                    }
-                }
-
                 if (!count($this->errors)) {
                     if ($object->delete()) {
                         $id_category = (int) Tools::getValue('id_category');
@@ -691,25 +676,8 @@ protected function processBulkDelete()
                             ini_set('max_execution_time', (string) round($count * 1.5));
                         }
 
-                        if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) {
-                            $stock_manager = StockManagerFactory::getManager();
-                        }
-
                         foreach ($products as $id_product) {
                             $product = new Product((int) $id_product);
-                            /*
-                             * @since 1.5.0
-                             * It is NOT possible to delete a product if there are currently:
-                             * - physical stock for this product
-                             * - supply order(s) for this product
-                             */
-                            if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && $product->advanced_stock_management && isset($stock_manager)) { // @phpstan-ignore-line
-                                $physical_quantity = $stock_manager->getProductPhysicalQuantities($product->id, 0);
-                                $real_quantity = $stock_manager->getProductRealQuantities($product->id, 0);
-                                if ($physical_quantity > 0 || $real_quantity > $physical_quantity) {
-                                    $this->errors[] = $this->trans('You cannot delete the product #%d because there is physical stock left.', [$product->id], 'Admin.Catalog.Notification');
-                                }
-                            }
                             if (!count($this->errors)) {
                                 if ($product->delete()) {
                                     PrestaShopLogger::addLog(sprintf('%s deletion', $this->className), 1, null, $this->className, (int) $product->id, true, (int) $this->context->employee->id);
@@ -822,7 +790,6 @@ public function processProductAttribute()
                                 Tools::getValue('attribute_low_stock_alert'),
                                 Tools::getValue('attribute_mpn')
                             );
-                            StockAvailable::setProductDependsOnStock((int) $product->id, $product->depends_on_stock, null, (int) $id_product_attribute);
                             StockAvailable::setProductOutOfStock((int) $product->id, $product->out_of_stock, null, (int) $id_product_attribute);
                         }
                     } else {
@@ -856,7 +823,6 @@ public function processProductAttribute()
                                 Tools::getValue('attribute_low_stock_alert'),
                                 Tools::getValue('attribute_mpn')
                             );
-                            StockAvailable::setProductDependsOnStock((int) $product->id, $product->depends_on_stock, null, (int) $id_product_attribute);
                             StockAvailable::setProductOutOfStock((int) $product->id, $product->out_of_stock, null, (int) $id_product_attribute);
                         }
                     } else {
@@ -1369,34 +1335,20 @@ public function ajaxProcessDeleteProductAttribute()
             $id_product_attribute = (int) Tools::getValue('id_product_attribute');
 
             if ($id_product && Validate::isUnsignedId($id_product) && Validate::isLoadedObject($product = new Product($id_product))) {
-                if (($depends_on_stock = StockAvailable::dependsOnStock($id_product)) && StockAvailable::getQuantityAvailableByProduct($id_product, $id_product_attribute)) {
-                    $json = [
-                        'status' => 'error',
-                        'message' => 'It is not possible to delete a combination while it still has some quantities in the Advanced Stock Management. You must delete its stock first.',
-                    ];
+                $product->deleteAttributeCombination((int) $id_product_attribute);
+                $product->checkDefaultAttributes();
+                if (!$product->hasAttributes()) {
+                    $product->cache_default_attribute = 0;
+                    $product->update();
                 } else {
-                    $product->deleteAttributeCombination((int) $id_product_attribute);
-                    $product->checkDefaultAttributes();
-                    if (!$product->hasAttributes()) {
-                        $product->cache_default_attribute = 0;
-                        $product->update();
-                    } else {
-                        Product::updateDefaultAttribute($id_product);
-                    }
-
-                    if ($depends_on_stock && !Stock::deleteStockByIds($id_product, $id_product_attribute)) {
-                        $json = [
-                            'status' => 'error',
-                            'message' => 'Error while deleting the stock',
-                        ];
-                    } else {
-                        $json = [
-                            'status' => 'ok',
-                            'message' => $this->_conf[1],
-                            'id_product_attribute' => (int) $id_product_attribute,
-                        ];
-                    }
+                    Product::updateDefaultAttribute($id_product);
                 }
+
+                $json = [
+                    'status' => 'ok',
+                    'message' => $this->_conf[1],
+                    'id_product_attribute' => (int) $id_product_attribute,
+                ];
             } else {
                 $json = [
                     'status' => 'error',
@@ -1769,15 +1721,6 @@ public function processAdd()
             $this->updatePackItems($this->object);
             $this->updateDownloadProduct($this->object);
 
-            if (Configuration::get('PS_FORCE_ASM_NEW_PRODUCT') && Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && $this->object->getType() != Product::PTYPE_VIRTUAL) {
-                $this->object->advanced_stock_management = 1;
-                $this->object->save();
-                $id_shops = Shop::getContextListShopID();
-                foreach ($id_shops as $id_shop) {
-                    StockAvailable::setProductDependsOnStock($this->object->id, true, (int) $id_shop, 0);
-                }
-            }
-
             if (empty($this->errors)) {
                 $languages = Language::getLanguages(false);
                 if ($this->isProductFieldUpdated('category_box') && !$this->object->updateCategories(Tools::getValue('categoryBox'))) {
@@ -1797,15 +1740,6 @@ public function processAdd()
                     }
                 }
 
-                if (Configuration::get('PS_DEFAULT_WAREHOUSE_NEW_PRODUCT') != 0 && Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) {
-                    $warehouse_location_entity = new WarehouseProductLocation();
-                    $warehouse_location_entity->id_product = $this->object->id;
-                    $warehouse_location_entity->id_product_attribute = 0;
-                    $warehouse_location_entity->id_warehouse = (int) Configuration::get('PS_DEFAULT_WAREHOUSE_NEW_PRODUCT');
-                    $warehouse_location_entity->location = '';
-                    $warehouse_location_entity->save();
-                }
-
                 // Apply groups reductions
                 $this->object->setGroupReduction();
 
@@ -1937,9 +1871,7 @@ public function processUpdate()
                     // If the product doesn't exist in the current shop but exists in another shop
                     if (Shop::getContext() == Shop::CONTEXT_SHOP && !$existing_product->isAssociatedToShop($this->context->shop->id)) {
                         $out_of_stock = StockAvailable::outOfStock($existing_product->id, $existing_product->id_shop_default);
-                        $depends_on_stock = StockAvailable::dependsOnStock($existing_product->id, $existing_product->id_shop_default);
                         StockAvailable::setProductOutOfStock((int) $this->object->id, $out_of_stock, $this->context->shop->id);
-                        StockAvailable::setProductDependsOnStock((int) $this->object->id, $depends_on_stock, $this->context->shop->id);
                     }
 
                     PrestaShopLogger::addLog(sprintf('%s modification', $this->className), 1, null, $this->className, (int) $this->object->id, true, (int) $this->context->employee->id);
@@ -1974,10 +1906,6 @@ public function processUpdate()
                         }
 
                         $this->updatePackItems($object);
-                        // Disallow avanced stock management if the product become a pack
-                        if ($product_type_before == Product::PTYPE_SIMPLE && $object->getType() == Product::PTYPE_PACK) {
-                            StockAvailable::setProductDependsOnStock((int) $object->id, false);
-                        }
                         $this->updateDownloadProduct($object, 1);
                         $this->updateTags(Language::getLanguages(false), $object);
 
@@ -1992,9 +1920,6 @@ public function processUpdate()
                         }
                     }
 
-                    if ($this->isTabSubmitted('Warehouses')) {
-                        $this->processWarehouses();
-                    }
                     if (empty($this->errors)) {
                         if (in_array($object->visibility, ['both', 'search']) && Configuration::get('PS_SEARCH_INDEXATION')) {
                             Search::indexation(false, $object->id);
@@ -2606,79 +2531,6 @@ public function processSuppliers($id_product = null)
         }
     }
 
-    /**
-     * Post treatment for warehouses.
-     */
-    public function processWarehouses()
-    {
-        if ((int) Tools::getValue('warehouse_loaded') === 1 && Validate::isLoadedObject($product = new Product((int) $id_product = Tools::getValue('id_product')))) {
-            // Get all id_product_attribute
-            $attributes = $product->getAttributesResume($this->context->language->id);
-            if (empty($attributes)) {
-                $attributes[] = [
-                    'id_product_attribute' => 0,
-                    'attribute_designation' => '',
-                ];
-            }
-
-            // Get all available warehouses
-            $warehouses = Warehouse::getWarehouses(true);
-
-            // Get already associated warehouses
-            $associated_warehouses_collection = WarehouseProductLocation::getCollection($product->id);
-
-            $elements_to_manage = [];
-
-            // get form information
-            foreach ($attributes as $attribute) {
-                foreach ($warehouses as $warehouse) {
-                    $key = $warehouse['id_warehouse'] . '_' . $product->id . '_' . $attribute['id_product_attribute'];
-
-                    // get elements to manage
-                    if (Tools::isSubmit('check_warehouse_' . $key)) {
-                        $location = Tools::getValue('location_warehouse_' . $key, '');
-                        $elements_to_manage[$key] = $location;
-                    }
-                }
-            }
-
-            // Delete entry if necessary
-            foreach ($associated_warehouses_collection as $awc) {
-                /** @var WarehouseProductLocation $awc */
-                if (!array_key_exists($awc->id_warehouse . '_' . $awc->id_product . '_' . $awc->id_product_attribute, $elements_to_manage)) {
-                    $awc->delete();
-                }
-            }
-
-            // Manage locations
-            foreach ($elements_to_manage as $key => $location) {
-                $params = explode('_', $key);
-
-                $wpl_id = (int) WarehouseProductLocation::getIdByProductAndWarehouse((int) $params[1], (int) $params[2], (int) $params[0]);
-
-                if (empty($wpl_id)) {
-                    //create new record
-                    $warehouse_location_entity = new WarehouseProductLocation();
-                    $warehouse_location_entity->id_product = (int) $params[1];
-                    $warehouse_location_entity->id_product_attribute = (int) $params[2];
-                    $warehouse_location_entity->id_warehouse = (int) $params[0];
-                    $warehouse_location_entity->location = pSQL($location);
-                    $warehouse_location_entity->save();
-                } else {
-                    $warehouse_location_entity = new WarehouseProductLocation((int) $wpl_id);
-
-                    $location = pSQL($location);
-
-                    if ($location != $warehouse_location_entity->location) {
-                        $warehouse_location_entity->location = pSQL($location);
-                        $warehouse_location_entity->update();
-                    }
-                }
-            }
-            StockAvailable::synchronize((int) $id_product);
-        }
-    }
-
     /**
      * Get an array of pack items for display from the product object if specified, else from POST/GET values.
      *
@@ -2969,41 +2821,6 @@ public function ajaxProcessProductQuantity()
 
         $product = new Product((int) Tools::getValue('id_product'), true);
         switch (Tools::getValue('actionQty')) {
-            case 'depends_on_stock':
-                if (Tools::getValue('value') === false) {
-                    die(json_encode(['error' => 'Undefined value']));
-                }
-                if ((int) Tools::getValue('value') != 0 && (int) Tools::getValue('value') != 1) {
-                    die(json_encode(['error' => 'Incorrect value']));
-                }
-                if (!$product->advanced_stock_management && (int) Tools::getValue('value') == 1) {
-                    die(json_encode(['error' => 'Not possible if advanced stock management is disabled.']));
-                }
-                if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')
-                    && (int) Tools::getValue('value') == 1
-                    && (
-                        Pack::isPack($product->id)
-                        && !Pack::allUsesAdvancedStockManagement($product->id)
-                        && (
-                            $product->pack_stock_type == Pack::STOCK_TYPE_PACK_BOTH
-                            || $product->pack_stock_type == Pack::STOCK_TYPE_PRODUCTS_ONLY
-                            || (
-                                $product->pack_stock_type == Pack::STOCK_TYPE_DEFAULT
-                                && (Configuration::get('PS_PACK_STOCK_TYPE') == Pack::STOCK_TYPE_PRODUCTS_ONLY
-                                    || Configuration::get('PS_PACK_STOCK_TYPE') == Pack::STOCK_TYPE_PACK_BOTH)
-                            )
-                        )
-                    )
-                ) {
-                    die(json_encode(['error' => 'You cannot use advanced stock management for this pack because' . '<br />' .
-                        '- advanced stock management is not enabled for these products' . '<br />' .
-                        '- you have chosen to decrement products quantities.', ]));
-                }
-
-                StockAvailable::setProductDependsOnStock($product->id, (bool) Tools::getValue('value'));
-
-                break;
-
             case 'pack_stock_type':
                 $value = Tools::getValue('value');
                 if ($value === false) {
@@ -3013,22 +2830,6 @@ public function ajaxProcessProductQuantity()
                     && (int) $value != 2 && (int) $value != 3) {
                     die(json_encode(['error' => 'Incorrect value']));
                 }
-                if ($product->depends_on_stock
-                    && !Pack::allUsesAdvancedStockManagement($product->id)
-                    && (
-                        (int) $value == 1
-                        || (int) $value == 2
-                        || (
-                            (int) $value == 3
-                            && (Configuration::get('PS_PACK_STOCK_TYPE') == Pack::STOCK_TYPE_PRODUCTS_ONLY
-                                || Configuration::get('PS_PACK_STOCK_TYPE') == Pack::STOCK_TYPE_PACK_BOTH)
-                        )
-                    )
-                ) {
-                    die(json_encode(['error' => 'You cannot use this stock management option because:' . '<br />' .
-                        '- advanced stock management is not enabled for these products' . '<br />' .
-                        '- advanced stock management is enabled for the pack', ]));
-                }
 
                 Product::setPackStockType($product->id, $value);
 
@@ -3065,23 +2866,6 @@ public function ajaxProcessProductQuantity()
                     die(json_encode(['error' => $error]));
                 }
 
-                break;
-            case 'advanced_stock_management':
-                if (Tools::getValue('value') === false) {
-                    die(json_encode(['error' => 'Undefined value']));
-                }
-                if ((int) Tools::getValue('value') != 1 && (int) Tools::getValue('value') != 0) {
-                    die(json_encode(['error' => 'Incorrect value']));
-                }
-                if (!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && (int) Tools::getValue('value') == 1) {
-                    die(json_encode(['error' => 'Not possible if advanced stock management is disabled. ']));
-                }
-
-                $product->setAdvancedStockManagement((bool) Tools::getValue('value'));
-                if (StockAvailable::dependsOnStock($product->id) == 1 && (int) Tools::getValue('value') == 0) {
-                    StockAvailable::setProductDependsOnStock($product->id, false);
-                }
-
                 break;
         }
         die(json_encode(['error' => false]));
diff --git a/controllers/admin/AdminShopController.php b/controllers/admin/AdminShopController.php
index 3adf35b18c710..bed57835c44b9 100644
--- a/controllers/admin/AdminShopController.php
+++ b/controllers/admin/AdminShopController.php
@@ -585,7 +585,6 @@ public function renderForm()
             'product_attribute' => $this->trans('Product combinations', [], 'Admin.Advparameters.Feature'),
             'stock_available' => $this->trans('Available quantities for sale', [], 'Admin.Advparameters.Feature'),
             'store' => $this->trans('Stores', [], 'Admin.Global'),
-            'warehouse' => $this->trans('Warehouses', [], 'Admin.Advparameters.Feature'),
             'webservice_account' => $this->trans('Webservice accounts', [], 'Admin.Advparameters.Feature'),
             'attribute_group' => $this->trans('Attribute groups', [], 'Admin.Advparameters.Feature'),
             'feature' => $this->trans('Features', [], 'Admin.Global'),
diff --git a/controllers/admin/AdminSuppliersController.php b/controllers/admin/AdminSuppliersController.php
index 8c03736ccd74c..3ddf04b211dd2 100644
--- a/controllers/admin/AdminSuppliersController.php
+++ b/controllers/admin/AdminSuppliersController.php
@@ -98,7 +98,6 @@ public function initPageHeaderToolbar()
      */
     public function renderForm()
     {
-        // loads current warehouse
         if (!($obj = $this->loadObject(true))) {
             return;
         }
@@ -531,8 +530,6 @@ public function postProcess()
         } elseif (Tools::isSubmit('delete' . $this->table)) {
             if (!($obj = $this->loadObject(true))) {
                 return;
-            } elseif (SupplyOrder::supplierHasPendingOrders($obj->id)) {
-                $this->errors[] = $this->trans('It is not possible to delete a supplier if there are pending supplier orders.', [], 'Admin.Catalog.Notification');
             } else {
                 //delete all product_supplier linked to this supplier
                 Db::getInstance()->execute('DELETE FROM `' . _DB_PREFIX_ . 'product_supplier` WHERE `id_supplier`=' . (int) $obj->id);
diff --git a/install-dev/data/xml/access.xml b/install-dev/data/xml/access.xml
index f82b8f8fb591f..7e77d51ed9e55 100644
--- a/install-dev/data/xml/access.xml
+++ b/install-dev/data/xml/access.xml
@@ -249,10 +249,6 @@
     <access id="access_1_263" id_profile="SuperAdmin" id_authorization_role="TAB_ADMINPARENTSHIPPING_READ"/>
     <access id="access_1_264" id_profile="SuperAdmin" id_authorization_role="TAB_ADMINPARENTSHIPPING_UPDATE"/>
     <access id="access_1_265" id_profile="SuperAdmin" id_authorization_role="TAB_ADMINPARENTSHIPPING_DELETE"/>
-    <access id="access_1_266" id_profile="SuperAdmin" id_authorization_role="TAB_ADMINPARENTSTOCKMANAGEMENT_CREATE"/>
-    <access id="access_1_267" id_profile="SuperAdmin" id_authorization_role="TAB_ADMINPARENTSTOCKMANAGEMENT_READ"/>
-    <access id="access_1_268" id_profile="SuperAdmin" id_authorization_role="TAB_ADMINPARENTSTOCKMANAGEMENT_UPDATE"/>
-    <access id="access_1_269" id_profile="SuperAdmin" id_authorization_role="TAB_ADMINPARENTSTOCKMANAGEMENT_DELETE"/>
     <access id="access_1_270" id_profile="SuperAdmin" id_authorization_role="TAB_ADMINPARENTSTORES_CREATE"/>
     <access id="access_1_271" id_profile="SuperAdmin" id_authorization_role="TAB_ADMINPARENTSTORES_READ"/>
     <access id="access_1_272" id_profile="SuperAdmin" id_authorization_role="TAB_ADMINPARENTSTORES_UPDATE"/>
@@ -337,10 +333,6 @@
     <access id="access_1_355" id_profile="SuperAdmin" id_authorization_role="TAB_ADMINSTATUSES_READ"/>
     <access id="access_1_356" id_profile="SuperAdmin" id_authorization_role="TAB_ADMINSTATUSES_UPDATE"/>
     <access id="access_1_357" id_profile="SuperAdmin" id_authorization_role="TAB_ADMINSTATUSES_DELETE"/>
-    <access id="access_1_358" id_profile="SuperAdmin" id_authorization_role="TAB_ADMINSTOCK_CREATE"/>
-    <access id="access_1_359" id_profile="SuperAdmin" id_authorization_role="TAB_ADMINSTOCK_READ"/>
-    <access id="access_1_360" id_profile="SuperAdmin" id_authorization_role="TAB_ADMINSTOCK_UPDATE"/>
-    <access id="access_1_361" id_profile="SuperAdmin" id_authorization_role="TAB_ADMINSTOCK_DELETE"/>
     <access id="access_1_373" id_profile="SuperAdmin" id_authorization_role="TAB_ADMINSTOCKMANAGEMENT_CREATE"/>
     <access id="access_1_374" id_profile="SuperAdmin" id_authorization_role="TAB_ADMINSTOCKMANAGEMENT_READ"/>
     <access id="access_1_375" id_profile="SuperAdmin" id_authorization_role="TAB_ADMINSTOCKMANAGEMENT_UPDATE"/>
@@ -377,10 +369,6 @@
     <access id="access_1_418" id_profile="SuperAdmin" id_authorization_role="TAB_ADMINTRANSLATIONS_READ"/>
     <access id="access_1_419" id_profile="SuperAdmin" id_authorization_role="TAB_ADMINTRANSLATIONS_UPDATE"/>
     <access id="access_1_420" id_profile="SuperAdmin" id_authorization_role="TAB_ADMINTRANSLATIONS_DELETE"/>
-    <access id="access_1_421" id_profile="SuperAdmin" id_authorization_role="TAB_ADMINWAREHOUSES_CREATE"/>
-    <access id="access_1_422" id_profile="SuperAdmin" id_authorization_role="TAB_ADMINWAREHOUSES_READ"/>
-    <access id="access_1_423" id_profile="SuperAdmin" id_authorization_role="TAB_ADMINWAREHOUSES_UPDATE"/>
-    <access id="access_1_424" id_profile="SuperAdmin" id_authorization_role="TAB_ADMINWAREHOUSES_DELETE"/>
     <access id="access_1_425" id_profile="SuperAdmin" id_authorization_role="TAB_ADMINWEBSERVICE_CREATE"/>
     <access id="access_1_426" id_profile="SuperAdmin" id_authorization_role="TAB_ADMINWEBSERVICE_READ"/>
     <access id="access_1_427" id_profile="SuperAdmin" id_authorization_role="TAB_ADMINWEBSERVICE_UPDATE"/>
diff --git a/install-dev/data/xml/authorization_role.xml b/install-dev/data/xml/authorization_role.xml
index becfb2586eccc..f758d6d14b2b6 100644
--- a/install-dev/data/xml/authorization_role.xml
+++ b/install-dev/data/xml/authorization_role.xml
@@ -274,10 +274,6 @@
     <authorization_role id="TAB_ADMINPARENTSHIPPING_READ" slug="ROLE_MOD_TAB_ADMINPARENTSHIPPING_READ"/>
     <authorization_role id="TAB_ADMINPARENTSHIPPING_UPDATE" slug="ROLE_MOD_TAB_ADMINPARENTSHIPPING_UPDATE"/>
     <authorization_role id="TAB_ADMINPARENTSHIPPING_DELETE" slug="ROLE_MOD_TAB_ADMINPARENTSHIPPING_DELETE"/>
-    <authorization_role id="TAB_ADMINPARENTSTOCKMANAGEMENT_CREATE" slug="ROLE_MOD_TAB_ADMINPARENTSTOCKMANAGEMENT_CREATE"/>
-    <authorization_role id="TAB_ADMINPARENTSTOCKMANAGEMENT_READ" slug="ROLE_MOD_TAB_ADMINPARENTSTOCKMANAGEMENT_READ"/>
-    <authorization_role id="TAB_ADMINPARENTSTOCKMANAGEMENT_UPDATE" slug="ROLE_MOD_TAB_ADMINPARENTSTOCKMANAGEMENT_UPDATE"/>
-    <authorization_role id="TAB_ADMINPARENTSTOCKMANAGEMENT_DELETE" slug="ROLE_MOD_TAB_ADMINPARENTSTOCKMANAGEMENT_DELETE"/>
     <authorization_role id="TAB_ADMINPARENTSTORES_CREATE" slug="ROLE_MOD_TAB_ADMINPARENTSTORES_CREATE"/>
     <authorization_role id="TAB_ADMINPARENTSTORES_READ" slug="ROLE_MOD_TAB_ADMINPARENTSTORES_READ"/>
     <authorization_role id="TAB_ADMINPARENTSTORES_UPDATE" slug="ROLE_MOD_TAB_ADMINPARENTSTORES_UPDATE"/>
@@ -366,10 +362,6 @@
     <authorization_role id="TAB_ADMINSTATUSES_READ" slug="ROLE_MOD_TAB_ADMINSTATUSES_READ"/>
     <authorization_role id="TAB_ADMINSTATUSES_UPDATE" slug="ROLE_MOD_TAB_ADMINSTATUSES_UPDATE"/>
     <authorization_role id="TAB_ADMINSTATUSES_DELETE" slug="ROLE_MOD_TAB_ADMINSTATUSES_DELETE"/>
-    <authorization_role id="TAB_ADMINSTOCK_CREATE" slug="ROLE_MOD_TAB_ADMINSTOCK_CREATE"/>
-    <authorization_role id="TAB_ADMINSTOCK_READ" slug="ROLE_MOD_TAB_ADMINSTOCK_READ"/>
-    <authorization_role id="TAB_ADMINSTOCK_UPDATE" slug="ROLE_MOD_TAB_ADMINSTOCK_UPDATE"/>
-    <authorization_role id="TAB_ADMINSTOCK_DELETE" slug="ROLE_MOD_TAB_ADMINSTOCK_DELETE"/>
     <authorization_role id="TAB_ADMINSTOCKMANAGEMENT_CREATE" slug="ROLE_MOD_TAB_ADMINSTOCKMANAGEMENT_CREATE"/>
     <authorization_role id="TAB_ADMINSTOCKMANAGEMENT_READ" slug="ROLE_MOD_TAB_ADMINSTOCKMANAGEMENT_READ"/>
     <authorization_role id="TAB_ADMINSTOCKMANAGEMENT_UPDATE" slug="ROLE_MOD_TAB_ADMINSTOCKMANAGEMENT_UPDATE"/>
@@ -406,10 +398,6 @@
     <authorization_role id="TAB_ADMINTRANSLATIONS_READ" slug="ROLE_MOD_TAB_ADMINTRANSLATIONS_READ"/>
     <authorization_role id="TAB_ADMINTRANSLATIONS_UPDATE" slug="ROLE_MOD_TAB_ADMINTRANSLATIONS_UPDATE"/>
     <authorization_role id="TAB_ADMINTRANSLATIONS_DELETE" slug="ROLE_MOD_TAB_ADMINTRANSLATIONS_DELETE"/>
-    <authorization_role id="TAB_ADMINWAREHOUSES_CREATE" slug="ROLE_MOD_TAB_ADMINWAREHOUSES_CREATE"/>
-    <authorization_role id="TAB_ADMINWAREHOUSES_READ" slug="ROLE_MOD_TAB_ADMINWAREHOUSES_READ"/>
-    <authorization_role id="TAB_ADMINWAREHOUSES_UPDATE" slug="ROLE_MOD_TAB_ADMINWAREHOUSES_UPDATE"/>
-    <authorization_role id="TAB_ADMINWAREHOUSES_DELETE" slug="ROLE_MOD_TAB_ADMINWAREHOUSES_DELETE"/>
     <authorization_role id="TAB_ADMINWEBSERVICE_CREATE" slug="ROLE_MOD_TAB_ADMINWEBSERVICE_CREATE"/>
     <authorization_role id="TAB_ADMINWEBSERVICE_READ" slug="ROLE_MOD_TAB_ADMINWEBSERVICE_READ"/>
     <authorization_role id="TAB_ADMINWEBSERVICE_UPDATE" slug="ROLE_MOD_TAB_ADMINWEBSERVICE_UPDATE"/>
diff --git a/install-dev/data/xml/configuration.xml b/install-dev/data/xml/configuration.xml
index c6cbb231807e9..6dbcc19ddb2b3 100644
--- a/install-dev/data/xml/configuration.xml
+++ b/install-dev/data/xml/configuration.xml
@@ -455,9 +455,6 @@
   <configuration id="PS_STOCK_MVT_DEC_REASON_DEFAULT" name="PS_STOCK_MVT_DEC_REASON_DEFAULT">
     <value>2</value>
   </configuration>
-  <configuration id="PS_ADVANCED_STOCK_MANAGEMENT" name="PS_ADVANCED_STOCK_MANAGEMENT">
-    <value>0</value>
-  </configuration>
   <configuration id="PS_STOCK_MVT_TRANSFER_TO" name="PS_STOCK_MVT_TRANSFER_TO">
     <value>7</value>
   </configuration>
diff --git a/install-dev/data/xml/stock_mvt_reason.xml b/install-dev/data/xml/stock_mvt_reason.xml
index ce8467acb6eea..9a9b6bf8be26b 100644
--- a/install-dev/data/xml/stock_mvt_reason.xml
+++ b/install-dev/data/xml/stock_mvt_reason.xml
@@ -9,9 +9,14 @@
     <stock_mvt_reason id="Customer_Order" sign="-1"/>
     <stock_mvt_reason id="Regulation_following_an_inventory_of_stock" sign="-1"/>
     <stock_mvt_reason id="Regulation_following_an_inventory_of_stock_1" sign="1"/>
+
+    <!-- 3 reasons below are unused, but kept only to keep proper IDs. They are tied to IDs in configuration table. -->
+    <!-- If you delete them, make sure to change PS_STOCK_MVT_INC_EMPLOYEE_EDITION from 11 to 8 for example. -->
     <stock_mvt_reason id="Transfer_to_another_warehouse" sign="-1"/>
     <stock_mvt_reason id="Transfer_from_another_warehouse" sign="1"/>
     <stock_mvt_reason id="Supply_Order" sign="1"/>
+    <!-- / -->
+
     <stock_mvt_reason id="Customer_Order_1" sign="1"/>
     <stock_mvt_reason id="Product_Return" sign="1"/>
     <stock_mvt_reason id="Employee_Edition" sign="1"/>
diff --git a/install-dev/data/xml/supply_order_state.xml b/install-dev/data/xml/supply_order_state.xml
deleted file mode 100644
index f7a0299d3e8d5..0000000000000
--- a/install-dev/data/xml/supply_order_state.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<entity_supply_order_state>
-  <fields class="SupplyOrderState">
-    <field name="delivery_note"/>
-    <field name="editable"/>
-    <field name="receipt_state"/>
-    <field name="pending_receipt"/>
-    <field name="enclosed"/>
-    <field name="color"/>
-  </fields>
-  <entities>
-    <supply_order_state id="supply_order_state_1" delivery_note="0" editable="1" receipt_state="0" pending_receipt="0" enclosed="0" color="#faab00"/>
-    <supply_order_state id="supply_order_state_2" delivery_note="1" editable="0" receipt_state="0" pending_receipt="0" enclosed="0" color="#273cff"/>
-    <supply_order_state id="supply_order_state_3" delivery_note="0" editable="0" receipt_state="0" pending_receipt="1" enclosed="0" color="#ff37f5"/>
-    <supply_order_state id="supply_order_state_4" delivery_note="0" editable="0" receipt_state="1" pending_receipt="1" enclosed="0" color="#ff3e33"/>
-    <supply_order_state id="supply_order_state_5" delivery_note="0" editable="0" receipt_state="1" pending_receipt="0" enclosed="1" color="#00d60c"/>
-    <supply_order_state id="supply_order_state_6" delivery_note="0" editable="0" receipt_state="0" pending_receipt="0" enclosed="1" color="#666666"/>
-  </entities>
-</entity_supply_order_state>
diff --git a/install-dev/data/xml/tab.xml b/install-dev/data/xml/tab.xml
index 49c329dd42c4e..4b39ae76e75df 100644
--- a/install-dev/data/xml/tab.xml
+++ b/install-dev/data/xml/tab.xml
@@ -24,198 +24,165 @@
             <wording_domain>Admin.Navigation.Menu</wording_domain>
         </tab>
 
-            <!--ORDERS-->
-            <tab id="Orders" id_parent="SELL" active="1" enabled="1" icon="shopping_basket">
-                <class_name>AdminParentOrders</class_name>
-                <wording>Orders</wording>
-                <wording_domain>Admin.Navigation.Menu</wording_domain>
-            </tab>
-
-                <tab id="Orders_1" id_parent="Orders" active="1" enabled="1">
-                    <class_name>AdminOrders</class_name>
-                    <wording>Orders</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-                <tab id="Invoices" id_parent="Orders" active="1" enabled="1">
-                    <class_name>AdminInvoices</class_name>
-                    <wording>Invoices</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-                <tab id="Credit_Slips" id_parent="Orders" active="1" enabled="1">
-                    <class_name>AdminSlip</class_name>
-                    <wording>Credit Slips</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-                <tab id="Delivery_Slips" id_parent="Orders" active="1" enabled="1">
-                    <class_name>AdminDeliverySlip</class_name>
-                    <wording>Delivery Slips</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-                <tab id="Shopping_Carts" id_parent="Orders" active="1" enabled="1">
-                    <class_name>AdminCarts</class_name>
-                    <wording>Shopping Carts</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-
-            <!--CATALOG-->
-            <tab id="Catalog" id_parent="SELL" active="1" enabled="1" icon="store">
-                <class_name>AdminCatalog</class_name>
-                <wording>Catalog</wording>
-                <wording_domain>Admin.Navigation.Menu</wording_domain>
-            </tab>
-
-                <tab id="Products" id_parent="Catalog" active="1" enabled="1">
-                    <class_name>AdminProducts</class_name>
-                    <wording>Products</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-                <tab id="Categories" id_parent="Catalog" active="1" enabled="1">
-                    <class_name>AdminCategories</class_name>
-                    <wording>Categories</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-                <tab id="Monitoring" id_parent="Catalog" active="1" enabled="1">
-                    <class_name>AdminTracking</class_name>
-                    <wording>Monitoring</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-                <tab id="Attributes_and_features" id_parent="Catalog" active="1" enabled="1">
-                    <class_name>AdminParentAttributesGroups</class_name>
-                    <wording>Attributes &amp; Features</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-
-                    <tab id="Attributes_and_Values" id_parent="Attributes_and_features" active="1" enabled="1">
-                        <class_name>AdminAttributesGroups</class_name>
-                        <wording>Attributes</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
-                    <tab id="Features" id_parent="Attributes_and_features" active="1" enabled="1">
-                        <class_name>AdminFeatures</class_name>
-                        <wording>Features</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
-
-                <tab id="Manufacturers_and_suppliers" id_parent="Catalog" active="1" enabled="1">
-                    <class_name>AdminParentManufacturers</class_name>
-                    <wording>Brands &amp; Suppliers</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-
-                    <tab id="Manufacturers" id_parent="Manufacturers_and_suppliers" active="1" enabled="1">
-                        <class_name>AdminManufacturers</class_name>
-                        <wording>Brands</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
-                    <tab id="Suppliers" id_parent="Manufacturers_and_suppliers" active="1" enabled="1">
-                        <class_name>AdminSuppliers</class_name>
-                        <wording>Suppliers</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
-
-                <tab id="Attachments" id_parent="Catalog" active="1" enabled="1">
-                    <class_name>AdminAttachments</class_name>
-                    <wording>Files</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-                <tab id="Price_Rules" id_parent="Catalog" active="1" enabled="1">
-                    <class_name>AdminParentCartRules</class_name>
-                    <wording>Discounts</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-
-                    <tab id="Cart_Rules" id_parent="Price_Rules" active="1" enabled="1">
-                        <class_name>AdminCartRules</class_name>
-                        <wording>Cart Rules</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
-                    <tab id="Catalog_Price_Rules" id_parent="Price_Rules" active="1" enabled="1">
-                        <class_name>AdminSpecificPriceRule</class_name>
-                        <wording>Catalog Price Rules</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
-                <tab id="Stock" id_parent="Catalog" active="1" enabled="1">
-                    <class_name>AdminStockManagement</class_name>
-                    <wording>Stock</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-
-            <!--CUSTOMERS-->
-            <tab id="Customers" id_parent="SELL" active="1" enabled="1" icon="account_circle">
-                <class_name>AdminParentCustomer</class_name>
-                <wording>Customers</wording>
-                <wording_domain>Admin.Navigation.Menu</wording_domain>
-            </tab>
-
-                <tab id="Customers_2" id_parent="Customers" active="1" enabled="1">
-                    <class_name>AdminCustomers</class_name>
-                    <wording>Customers</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-                <tab id="Addresses" id_parent="Customers" active="1" enabled="1">
-                    <class_name>AdminAddresses</class_name>
-                    <wording>Addresses</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-                <tab id="Outstanding" id_parent="Customers" active="0" enabled="1">
-                    <class_name>AdminOutstanding</class_name>
-                    <wording>Outstanding</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-
-            <!--CUSTOMER SERVICE-->
-            <tab id="Customer_Service" id_parent="SELL" active="1" enabled="1" icon="chat">
-                <class_name>AdminParentCustomerThreads</class_name>
-                <wording>Customer Service</wording>
-                <wording_domain>Admin.Navigation.Menu</wording_domain>
-            </tab>
-
-                <tab id="Customer_Service_2" id_parent="Customer_Service" active="1" enabled="1">
-                    <class_name>AdminCustomerThreads</class_name>
-                    <wording>Customer Service</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-                <tab id="Order_Messages" id_parent="Customer_Service" active="1" enabled="1">
-                    <class_name>AdminOrderMessage</class_name>
-                    <wording>Order Messages</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-                <tab id="Merchandise_Returns" id_parent="Customer_Service" active="1" enabled="1">
-                    <class_name>AdminReturn</class_name>
-                    <wording>Merchandise Returns</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
+        <!--ORDERS-->
+        <tab id="Orders" id_parent="SELL" active="1" enabled="1" icon="shopping_basket">
+            <class_name>AdminParentOrders</class_name>
+            <wording>Orders</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Orders_1" id_parent="Orders" active="1" enabled="1">
+            <class_name>AdminOrders</class_name>
+            <wording>Orders</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Invoices" id_parent="Orders" active="1" enabled="1">
+            <class_name>AdminInvoices</class_name>
+            <wording>Invoices</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Credit_Slips" id_parent="Orders" active="1" enabled="1">
+            <class_name>AdminSlip</class_name>
+            <wording>Credit Slips</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Delivery_Slips" id_parent="Orders" active="1" enabled="1">
+            <class_name>AdminDeliverySlip</class_name>
+            <wording>Delivery Slips</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Shopping_Carts" id_parent="Orders" active="1" enabled="1">
+            <class_name>AdminCarts</class_name>
+            <wording>Shopping Carts</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
 
-            <!--STATISTICS-->
-            <tab id="Stats" id_parent="SELL" active="1" enabled="1" icon="assessment">
-                <class_name>AdminStats</class_name>
-                <wording>Stats</wording>
-                <wording_domain>Admin.Navigation.Menu</wording_domain>
-            </tab>
+        <!--CATALOG-->
+        <tab id="Catalog" id_parent="SELL" active="1" enabled="1" icon="store">
+            <class_name>AdminCatalog</class_name>
+            <wording>Catalog</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Products" id_parent="Catalog" active="1" enabled="1">
+            <class_name>AdminProducts</class_name>
+            <wording>Products</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Categories" id_parent="Catalog" active="1" enabled="1">
+            <class_name>AdminCategories</class_name>
+            <wording>Categories</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Monitoring" id_parent="Catalog" active="1" enabled="1">
+            <class_name>AdminTracking</class_name>
+            <wording>Monitoring</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Attributes_and_features" id_parent="Catalog" active="1" enabled="1">
+            <class_name>AdminParentAttributesGroups</class_name>
+            <wording>Attributes &amp; Features</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Attributes_and_Values" id_parent="Attributes_and_features" active="1" enabled="1">
+            <class_name>AdminAttributesGroups</class_name>
+            <wording>Attributes</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Features" id_parent="Attributes_and_features" active="1" enabled="1">
+            <class_name>AdminFeatures</class_name>
+            <wording>Features</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Manufacturers_and_suppliers" id_parent="Catalog" active="1" enabled="1">
+            <class_name>AdminParentManufacturers</class_name>
+            <wording>Brands &amp; Suppliers</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Manufacturers" id_parent="Manufacturers_and_suppliers" active="1" enabled="1">
+            <class_name>AdminManufacturers</class_name>
+            <wording>Brands</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Suppliers" id_parent="Manufacturers_and_suppliers" active="1" enabled="1">
+            <class_name>AdminSuppliers</class_name>
+            <wording>Suppliers</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Attachments" id_parent="Catalog" active="1" enabled="1">
+            <class_name>AdminAttachments</class_name>
+            <wording>Files</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Price_Rules" id_parent="Catalog" active="1" enabled="1">
+            <class_name>AdminParentCartRules</class_name>
+            <wording>Discounts</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Cart_Rules" id_parent="Price_Rules" active="1" enabled="1">
+            <class_name>AdminCartRules</class_name>
+            <wording>Cart Rules</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Catalog_Price_Rules" id_parent="Price_Rules" active="1" enabled="1">
+            <class_name>AdminSpecificPriceRule</class_name>
+            <wording>Catalog Price Rules</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Stock" id_parent="Catalog" active="1" enabled="1">
+            <class_name>AdminStockManagement</class_name>
+            <wording>Stock</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
 
-            <!--ADVANCED STOCK MANAGEMENT-->
-            <tab id="Advanced_stock_management" id_parent="SELL" active="1" enabled="1" icon="store">
-                <class_name>AdminStock</class_name>
-                <wording/>
-                <wording_domain/>
-            </tab>
+        <!--CUSTOMERS-->
+        <tab id="Customers" id_parent="SELL" active="1" enabled="1" icon="account_circle">
+            <class_name>AdminParentCustomer</class_name>
+            <wording>Customers</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Customers_2" id_parent="Customers" active="1" enabled="1">
+            <class_name>AdminCustomers</class_name>
+            <wording>Customers</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Addresses" id_parent="Customers" active="1" enabled="1">
+            <class_name>AdminAddresses</class_name>
+            <wording>Addresses</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Outstanding" id_parent="Customers" active="0" enabled="1">
+            <class_name>AdminOutstanding</class_name>
+            <wording>Outstanding</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
 
-                <tab id="Warehouses" id_parent="Advanced_stock_management" active="1" enabled="1">
-                    <class_name>AdminWarehouses</class_name>
-                    <wording>Warehouses</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-                <tab id="Stock_Management_Parent" id_parent="Advanced_stock_management" active="1" enabled="1">
-                    <class_name>AdminParentStockManagement</class_name>
-                    <wording>Stock Management</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
+        <!--CUSTOMER SERVICE-->
+        <tab id="Customer_Service" id_parent="SELL" active="1" enabled="1" icon="chat">
+            <class_name>AdminParentCustomerThreads</class_name>
+            <wording>Customer Service</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Customer_Service_2" id_parent="Customer_Service" active="1" enabled="1">
+            <class_name>AdminCustomerThreads</class_name>
+            <wording>Customer Service</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Order_Messages" id_parent="Customer_Service" active="1" enabled="1">
+            <class_name>AdminOrderMessage</class_name>
+            <wording>Order Messages</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Merchandise_Returns" id_parent="Customer_Service" active="1" enabled="1">
+            <class_name>AdminReturn</class_name>
+            <wording>Merchandise Returns</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
 
-                    <tab id="Stock_Management" id_parent="Stock_Management_Parent" active="1" enabled="1">
-                        <class_name>AdminStockManagement</class_name>
-                        <wording>Stock Management</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
+        <!--STATISTICS-->
+        <tab id="Stats" id_parent="SELL" active="1" enabled="1" icon="assessment">
+            <class_name>AdminStats</class_name>
+            <wording>Stats</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
 
         <!--IMPROVE-->
         <tab id="IMPROVE" id_parent="" active="1" enabled="1">
@@ -224,182 +191,170 @@
             <wording_domain>Admin.Navigation.Menu</wording_domain>
         </tab>
 
-            <!--MODULES-->
-            <tab id="Modules" id_parent="IMPROVE" active="1" enabled="1" icon="extension">
-                <class_name>AdminParentModulesSf</class_name>
-                <wording>Modules</wording>
-                <wording_domain>Admin.Navigation.Menu</wording_domain>
-            </tab>
-                <tab id="Module_Page" id_parent="Modules" active="1" enabled="1">
-                    <class_name>AdminModulesSf</class_name>
-                    <wording>Module Manager</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-                    <tab id="Module_Page_Manage" id_parent="Module_Page" active="1" enabled="1">
-                        <class_name>AdminModulesManage</class_name>
-                        <wording>Modules</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
-                    <tab id="Module_Page_Notifications" id_parent="Module_Page" active="1" enabled="1">
-                        <class_name>AdminModulesNotifications</class_name>
-                        <wording>Alerts</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
-                    <tab id="Module_Page_Updates" id_parent="Module_Page" active="1" enabled="1">
-                        <class_name>AdminModulesUpdates</class_name>
-                        <wording>Updates</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
-            <!--LOOK & FEEL-->
-            <tab id="Look_feel" id_parent="IMPROVE" active="1" enabled="1" icon="desktop_mac">
-                <class_name>AdminParentThemes</class_name>
-                <wording>Design</wording>
-                <wording_domain>Admin.Navigation.Menu</wording_domain>
-            </tab>
-
-                <tab id="Themes" id_parent="Look_feel" active="1" enabled="1">
-                    <class_name>AdminThemes</class_name>
-                    <wording>Theme &amp; Logo</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-                <tab id="Mail_Theme_Parent" id_parent="Look_feel" active="1" enabled="1">
-                    <class_name>AdminParentMailTheme</class_name>
-                    <wording>Email Theme</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-                    <tab id="Mail_Theme" id_parent="Mail_Theme_Parent" active="1" enabled="1">
-                        <class_name>AdminMailTheme</class_name>
-                        <wording>Email Theme</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
-
-                <tab id="Pages" id_parent="Look_feel" active="1" enabled="1">
-                    <class_name>AdminCmsContent</class_name>
-                    <wording>Pages</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-                <tab id="Positions" id_parent="Look_feel" active="1" enabled="1">
-                    <class_name>AdminModulesPositions</class_name>
-                    <wording>Positions</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-                <tab id="Image_Settings" id_parent="Look_feel" active="1" enabled="1">
-                    <class_name>AdminImages</class_name>
-                    <wording>Image Settings</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-
-                <tab id="Shipping" id_parent="IMPROVE" active="1" enabled="1" icon="local_shipping">
-                    <class_name>AdminParentShipping</class_name>
-                    <wording>Shipping</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-
-                    <tab id="Carriers" id_parent="Shipping" active="1" enabled="1">
-                        <class_name>AdminCarriers</class_name>
-                        <wording>Carriers</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
-                    <tab id="Shipping_1" id_parent="Shipping" active="1" enabled="1">
-                        <class_name>AdminShipping</class_name>
-                        <wording>Preferences</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
-
-                <tab id="Payment" id_parent="IMPROVE" active="1" enabled="1" icon="payment">
-                    <class_name>AdminParentPayment</class_name>
-                    <wording>Payment</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-
-                    <tab id="Payment_methods" id_parent="Payment" active="1" enabled="1">
-                        <class_name>AdminPayment</class_name>
-                        <wording>Payment Methods</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
-                    <tab id="Payment_preferences" id_parent="Payment" active="1" enabled="1">
-                        <class_name>AdminPaymentPreferences</class_name>
-                        <wording>Preferences</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
-
-            <!--INTERNATIONAL OK-->
-            <tab id="International" id_parent="IMPROVE" active="1" enabled="1" icon="language">
-                <class_name>AdminInternational</class_name>
-                <wording>International</wording>
-                <wording_domain>Admin.Navigation.Menu</wording_domain>
-            </tab>
-
-                <tab id="Localization" id_parent="International" active="1" enabled="1">
-                    <class_name>AdminParentLocalization</class_name>
-                    <wording>Localization</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-
-                    <tab id="Localization_1" id_parent="Localization" active="1" enabled="1">
-                        <class_name>AdminLocalization</class_name>
-                        <wording>Localization</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
-                    <tab id="Languages" id_parent="Localization" active="1" enabled="1">
-                        <class_name>AdminLanguages</class_name>
-                        <wording>Languages</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
-                    <tab id="Currencies" id_parent="Localization" active="1" enabled="1">
-                        <class_name>AdminCurrencies</class_name>
-                        <wording>Currencies</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
-                    <tab id="Geolocation" id_parent="Localization" active="1" enabled="1">
-                        <class_name>AdminGeolocation</class_name>
-                        <wording>Geolocation</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
-
-                <tab id="Locations" id_parent="International" active="1" enabled="1">
-                    <class_name>AdminParentCountries</class_name>
-                    <wording>Locations</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-                    <tab id="Zones" id_parent="Locations" active="1" enabled="1">
-                        <class_name>AdminZones</class_name>
-                        <wording>Zones</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
-                    <tab id="Countries" id_parent="Locations" active="1" enabled="1">
-                        <class_name>AdminCountries</class_name>
-                        <wording>Countries</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
-                    <tab id="States" id_parent="Locations" active="1" enabled="1">
-                        <class_name>AdminStates</class_name>
-                        <wording>States</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
-
-                <tab id="Tax_Management" id_parent="International" active="1" enabled="1">
-                    <class_name>AdminParentTaxes</class_name>
-                    <wording>Taxes</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-
-                    <tab id="Taxes" id_parent="Tax_Management" active="1" enabled="1">
-                        <class_name>AdminTaxes</class_name>
-                        <wording>Taxes</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
-                    <tab id="Tax_Rules" id_parent="Tax_Management" active="1" enabled="1">
-                        <class_name>AdminTaxRulesGroup</class_name>
-                        <wording>Tax Rules</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
+        <!--MODULES-->
+        <tab id="Modules" id_parent="IMPROVE" active="1" enabled="1" icon="extension">
+            <class_name>AdminParentModulesSf</class_name>
+            <wording>Modules</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Module_Page" id_parent="Modules" active="1" enabled="1">
+            <class_name>AdminModulesSf</class_name>
+            <wording>Module Manager</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Module_Page_Manage" id_parent="Module_Page" active="1" enabled="1">
+            <class_name>AdminModulesManage</class_name>
+            <wording>Modules</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Module_Page_Notifications" id_parent="Module_Page" active="1" enabled="1">
+            <class_name>AdminModulesNotifications</class_name>
+            <wording>Alerts</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Module_Page_Updates" id_parent="Module_Page" active="1" enabled="1">
+            <class_name>AdminModulesUpdates</class_name>
+            <wording>Updates</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <!--LOOK & FEEL-->
+        <tab id="Look_feel" id_parent="IMPROVE" active="1" enabled="1" icon="desktop_mac">
+            <class_name>AdminParentThemes</class_name>
+            <wording>Design</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Themes" id_parent="Look_feel" active="1" enabled="1">
+            <class_name>AdminThemes</class_name>
+            <wording>Theme &amp; Logo</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Mail_Theme_Parent" id_parent="Look_feel" active="1" enabled="1">
+            <class_name>AdminParentMailTheme</class_name>
+            <wording>Email Theme</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Mail_Theme" id_parent="Mail_Theme_Parent" active="1" enabled="1">
+            <class_name>AdminMailTheme</class_name>
+            <wording>Email Theme</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Pages" id_parent="Look_feel" active="1" enabled="1">
+            <class_name>AdminCmsContent</class_name>
+            <wording>Pages</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Positions" id_parent="Look_feel" active="1" enabled="1">
+            <class_name>AdminModulesPositions</class_name>
+            <wording>Positions</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Image_Settings" id_parent="Look_feel" active="1" enabled="1">
+            <class_name>AdminImages</class_name>
+            <wording>Image Settings</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Shipping" id_parent="IMPROVE" active="1" enabled="1" icon="local_shipping">
+            <class_name>AdminParentShipping</class_name>
+            <wording>Shipping</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Carriers" id_parent="Shipping" active="1" enabled="1">
+            <class_name>AdminCarriers</class_name>
+            <wording>Carriers</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Shipping_1" id_parent="Shipping" active="1" enabled="1">
+            <class_name>AdminShipping</class_name>
+            <wording>Preferences</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Payment" id_parent="IMPROVE" active="1" enabled="1" icon="payment">
+            <class_name>AdminParentPayment</class_name>
+            <wording>Payment</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Payment_methods" id_parent="Payment" active="1" enabled="1">
+            <class_name>AdminPayment</class_name>
+            <wording>Payment Methods</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Payment_preferences" id_parent="Payment" active="1" enabled="1">
+            <class_name>AdminPaymentPreferences</class_name>
+            <wording>Preferences</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
 
-                <tab id="Translations" id_parent="International" active="1" enabled="1">
-                    <class_name>AdminTranslations</class_name>
-                    <wording>Translations</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
+        <!--INTERNATIONAL OK-->
+        <tab id="International" id_parent="IMPROVE" active="1" enabled="1" icon="language">
+            <class_name>AdminInternational</class_name>
+            <wording>International</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Localization" id_parent="International" active="1" enabled="1">
+            <class_name>AdminParentLocalization</class_name>
+            <wording>Localization</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Localization_1" id_parent="Localization" active="1" enabled="1">
+            <class_name>AdminLocalization</class_name>
+            <wording>Localization</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Languages" id_parent="Localization" active="1" enabled="1">
+            <class_name>AdminLanguages</class_name>
+            <wording>Languages</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Currencies" id_parent="Localization" active="1" enabled="1">
+            <class_name>AdminCurrencies</class_name>
+            <wording>Currencies</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Geolocation" id_parent="Localization" active="1" enabled="1">
+            <class_name>AdminGeolocation</class_name>
+            <wording>Geolocation</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Locations" id_parent="International" active="1" enabled="1">
+            <class_name>AdminParentCountries</class_name>
+            <wording>Locations</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Zones" id_parent="Locations" active="1" enabled="1">
+            <class_name>AdminZones</class_name>
+            <wording>Zones</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Countries" id_parent="Locations" active="1" enabled="1">
+            <class_name>AdminCountries</class_name>
+            <wording>Countries</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="States" id_parent="Locations" active="1" enabled="1">
+            <class_name>AdminStates</class_name>
+            <wording>States</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Tax_Management" id_parent="International" active="1" enabled="1">
+            <class_name>AdminParentTaxes</class_name>
+            <wording>Taxes</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Taxes" id_parent="Tax_Management" active="1" enabled="1">
+            <class_name>AdminTaxes</class_name>
+            <wording>Taxes</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Tax_Rules" id_parent="Tax_Management" active="1" enabled="1">
+            <class_name>AdminTaxRulesGroup</class_name>
+            <wording>Tax Rules</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Translations" id_parent="International" active="1" enabled="1">
+            <class_name>AdminTranslations</class_name>
+            <wording>Translations</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
 
         <!--CONFIGURE-->
         <tab id="CONFIGURE" id_parent="" active="1" enabled="1">
@@ -408,261 +363,242 @@
             <wording_domain>Admin.Navigation.Menu</wording_domain>
         </tab>
 
-            <!--SHOP PARAMETERS-->
-            <tab id="Shop_parameters" id_parent="CONFIGURE" active="1" enabled="1" icon="settings">
-                <class_name>ShopParameters</class_name>
-                <wording>Shop Parameters</wording>
-                <wording_domain>Admin.Navigation.Menu</wording_domain>
-            </tab>
-
-                <tab id="General" id_parent="Shop_parameters" active="1" enabled="1">
-                    <class_name>AdminParentPreferences</class_name>
-                    <wording>General</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-
-                    <tab id="General_1" id_parent="General" active="1" enabled="1">
-                        <class_name>AdminPreferences</class_name>
-                        <wording>General</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
-                    <tab id="Maintenance" id_parent="General" active="1" enabled="1">
-                        <class_name>AdminMaintenance</class_name>
-                        <wording>Maintenance</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
-
-                <tab id="Order_settings" id_parent="Shop_parameters" active="1" enabled="1">
-                    <class_name>AdminParentOrderPreferences</class_name>
-                    <wording>Order Settings</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-
-                    <tab id="Order_settings_2" id_parent="Order_settings" active="1" enabled="1">
-                        <class_name>AdminOrderPreferences</class_name>
-                        <wording>Order Settings</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
-                    <tab id="Statuses" id_parent="Order_settings" active="1" enabled="1">
-                        <class_name>AdminStatuses</class_name>
-                        <wording>Statuses</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
-
-                <tab id="Products_1" id_parent="Shop_parameters" active="1" enabled="1">
-                    <class_name>AdminPPreferences</class_name>
-                    <wording>Product Settings</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-                <tab id="Customer_settings" id_parent="Shop_parameters" active="1" enabled="1">
-                    <class_name>AdminParentCustomerPreferences</class_name>
-                    <wording>Customer Settings</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-
-                    <tab id="Customers_2" id_parent="Customer_settings" active="1" enabled="1">
-                        <class_name>AdminCustomerPreferences</class_name>
-                        <wording>Customer Settings</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
-                    <tab id="Groups" id_parent="Customer_settings" active="1" enabled="1">
-                        <class_name>AdminGroups</class_name>
-                        <wording>Groups</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
-                    <tab id="Titles" id_parent="Customer_settings" active="1" enabled="1">
-                        <class_name>AdminGenders</class_name>
-                        <wording>Titles</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
-
-                <tab id="Contact" id_parent="Shop_parameters" active="1" enabled="1">
-                    <class_name>AdminParentStores</class_name>
-                    <wording>Contact</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-
-                    <tab id="Contacts" id_parent="Contact" active="1" enabled="1">
-                        <class_name>AdminContacts</class_name>
-                        <wording>Contacts</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
-                    <tab id="Store_Contacts" id_parent="Contact" active="1" enabled="1">
-                        <class_name>AdminStores</class_name>
-                        <wording>Stores</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
-
-                <tab id="Traffic" id_parent="Shop_parameters" active="1" enabled="1">
-                    <class_name>AdminParentMeta</class_name>
-                    <wording>Traffic &amp; SEO</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-
-                    <tab id="SEO_URLs" id_parent="Traffic" active="1" enabled="1">
-                        <class_name>AdminMeta</class_name>
-                        <wording>SEO &amp; URLs</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
-                    <tab id="Search_Engines" id_parent="Traffic" active="1" enabled="1">
-                        <class_name>AdminSearchEngines</class_name>
-                        <wording>Search Engines</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
-
-                <tab id="Search" id_parent="Shop_parameters" active="1" enabled="1">
-                    <class_name>AdminParentSearchConf</class_name>
-                    <wording>Search</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-
-                    <tab id="Search_1" id_parent="Search" active="1" enabled="1">
-                        <class_name>AdminSearchConf</class_name>
-                        <wording>Search</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
-                    <tab id="Tags" id_parent="Search" active="1" enabled="1">
-                        <class_name>AdminTags</class_name>
-                        <wording>Tags</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
-
-            <!--ADVANCED PARAMETERS-->
-            <tab id="Advanced_Parameters" id_parent="CONFIGURE" active="1" enabled="1" icon="settings_applications">
-                <class_name>AdminAdvancedParameters</class_name>
-                <wording>Advanced Parameters</wording>
-                <wording_domain>Admin.Navigation.Menu</wording_domain>
-            </tab>
-
-                <tab id="Information" id_parent="Advanced_Parameters" active="1" enabled="1">
-                    <class_name>AdminInformation</class_name>
-                    <wording>Information</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-                <tab id="Performance" id_parent="Advanced_Parameters" active="1" enabled="1">
-                    <class_name>AdminPerformance</class_name>
-                    <wording>Performance</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-                <tab id="Administration" id_parent="Advanced_Parameters" active="1" enabled="1">
-                    <class_name>AdminAdminPreferences</class_name>
-                    <wording>Administration</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-                <tab id="E-mail" id_parent="Advanced_Parameters" active="1" enabled="1">
-                    <class_name>AdminEmails</class_name>
-                    <wording>E-mail</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-                <tab id="CSV_Import" id_parent="Advanced_Parameters" active="1" enabled="1">
-                    <class_name>AdminImport</class_name>
-                    <wording>Import</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-
-                <tab id="Employees" id_parent="Advanced_Parameters" active="1" enabled="1">
-                    <class_name>AdminParentEmployees</class_name>
-                    <wording>Team</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-
-                    <tab id="Employees_1" id_parent="Employees" active="1" enabled="1">
-                        <class_name>AdminEmployees</class_name>
-                        <wording>Employees</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
-                    <tab id="Profiles" id_parent="Employees" active="1" enabled="1">
-                        <class_name>AdminProfiles</class_name>
-                        <wording>Roles</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
-                    <tab id="Permissions" id_parent="Employees" active="1" enabled="1">
-                        <class_name>AdminAccess</class_name>
-                        <wording>Permissions</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
-
-                <tab id="Database" id_parent="Advanced_Parameters" active="1" enabled="1">
-                    <class_name>AdminParentRequestSql</class_name>
-                    <wording>Database</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-
-                    <tab id="SQL_Manager" id_parent="Database" active="1" enabled="1">
-                        <class_name>AdminRequestSql</class_name>
-                        <wording>SQL Manager</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
-                    <tab id="DB_Backup" id_parent="Database" active="1" enabled="1">
-                        <class_name>AdminBackup</class_name>
-                        <wording>DB Backup</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
-
-                <tab id="Logs" id_parent="Advanced_Parameters" active="1" enabled="1">
-                    <class_name>AdminLogs</class_name>
-                    <wording>Logs</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-                <tab id="Webservice" id_parent="Advanced_Parameters" active="1" enabled="1">
-                    <class_name>AdminWebservice</class_name>
-                    <wording>Webservice</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-                <tab id="AuthorizationServer" id_parent="Advanced_Parameters" active="0" enabled="1">
-                  <class_name>AdminAuthorizationServer</class_name>
-                  <wording>Authorization Server</wording>
-                  <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-                <tab id="Multistore" id_parent="Advanced_Parameters" active="0" enabled="1">
-                    <class_name>AdminShopGroup</class_name>
-                    <wording>Multistore</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-                <tab id="Multistore" id_parent="Advanced_Parameters" active="0" enabled="1">
-                    <class_name>AdminShopUrl</class_name>
-                    <wording>Multistore</wording>
-                    <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-                <tab id="FeatureFlag" id_parent="Advanced_Parameters" active="1" enabled="1" icon="">
-                  <class_name>AdminFeatureFlag</class_name>
-                  <wording>New &amp; Experimental Features</wording>
-                  <wording_domain>Admin.Navigation.Menu</wording_domain>
-                </tab>
-                <tab id="Security" id_parent="Advanced_Parameters" active="1" enabled="1">
-                    <class_name>AdminParentSecurity</class_name>
-                </tab>
-                    <tab id="Security_1" id_parent="Security" active="1" enabled="1" route_name="admin_security">
-                        <class_name>AdminSecurity</class_name>
-                        <wording>Security</wording>
-                        <wording_domain>Admin.Navigation.Menu</wording_domain>
-                    </tab>
-                    <tab id="EmployeeSessions" id_parent="Security" active="1" enabled="1" route_name="admin_security_sessions_employee_list">
-                        <class_name>AdminSecuritySessionEmployee</class_name>
-                    </tab>
-                    <tab id="CustomerSessions" id_parent="Security" active="1" enabled="1" route_name="admin_security_sessions_customer_list">
+        <!--SHOP PARAMETERS-->
+        <tab id="Shop_parameters" id_parent="CONFIGURE" active="1" enabled="1" icon="settings">
+            <class_name>ShopParameters</class_name>
+            <wording>Shop Parameters</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="General" id_parent="Shop_parameters" active="1" enabled="1">
+            <class_name>AdminParentPreferences</class_name>
+            <wording>General</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="General_1" id_parent="General" active="1" enabled="1">
+            <class_name>AdminPreferences</class_name>
+            <wording>General</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Maintenance" id_parent="General" active="1" enabled="1">
+            <class_name>AdminMaintenance</class_name>
+            <wording>Maintenance</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Order_settings" id_parent="Shop_parameters" active="1" enabled="1">
+            <class_name>AdminParentOrderPreferences</class_name>
+            <wording>Order Settings</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Order_settings_2" id_parent="Order_settings" active="1" enabled="1">
+            <class_name>AdminOrderPreferences</class_name>
+            <wording>Order Settings</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Statuses" id_parent="Order_settings" active="1" enabled="1">
+            <class_name>AdminStatuses</class_name>
+            <wording>Statuses</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Products_1" id_parent="Shop_parameters" active="1" enabled="1">
+            <class_name>AdminPPreferences</class_name>
+            <wording>Product Settings</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Customer_settings" id_parent="Shop_parameters" active="1" enabled="1">
+            <class_name>AdminParentCustomerPreferences</class_name>
+            <wording>Customer Settings</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Customers_2" id_parent="Customer_settings" active="1" enabled="1">
+            <class_name>AdminCustomerPreferences</class_name>
+            <wording>Customer Settings</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Groups" id_parent="Customer_settings" active="1" enabled="1">
+            <class_name>AdminGroups</class_name>
+            <wording>Groups</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Titles" id_parent="Customer_settings" active="1" enabled="1">
+            <class_name>AdminGenders</class_name>
+            <wording>Titles</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Contact" id_parent="Shop_parameters" active="1" enabled="1">
+            <class_name>AdminParentStores</class_name>
+            <wording>Contact</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Contacts" id_parent="Contact" active="1" enabled="1">
+            <class_name>AdminContacts</class_name>
+            <wording>Contacts</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Store_Contacts" id_parent="Contact" active="1" enabled="1">
+            <class_name>AdminStores</class_name>
+            <wording>Stores</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Traffic" id_parent="Shop_parameters" active="1" enabled="1">
+            <class_name>AdminParentMeta</class_name>
+            <wording>Traffic &amp; SEO</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="SEO_URLs" id_parent="Traffic" active="1" enabled="1">
+            <class_name>AdminMeta</class_name>
+            <wording>SEO &amp; URLs</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Search_Engines" id_parent="Traffic" active="1" enabled="1">
+            <class_name>AdminSearchEngines</class_name>
+            <wording>Search Engines</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Search" id_parent="Shop_parameters" active="1" enabled="1">
+            <class_name>AdminParentSearchConf</class_name>
+            <wording>Search</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Search_1" id_parent="Search" active="1" enabled="1">
+            <class_name>AdminSearchConf</class_name>
+            <wording>Search</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Tags" id_parent="Search" active="1" enabled="1">
+            <class_name>AdminTags</class_name>
+            <wording>Tags</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
 
-                        <class_name>AdminSecuritySessionCustomer</class_name>
-                    </tab>
+        <!--ADVANCED PARAMETERS-->
+        <tab id="Advanced_Parameters" id_parent="CONFIGURE" active="1" enabled="1" icon="settings_applications">
+            <class_name>AdminAdvancedParameters</class_name>
+            <wording>Advanced Parameters</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Information" id_parent="Advanced_Parameters" active="1" enabled="1">
+            <class_name>AdminInformation</class_name>
+            <wording>Information</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Performance" id_parent="Advanced_Parameters" active="1" enabled="1">
+            <class_name>AdminPerformance</class_name>
+            <wording>Performance</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Administration" id_parent="Advanced_Parameters" active="1" enabled="1">
+            <class_name>AdminAdminPreferences</class_name>
+            <wording>Administration</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="E-mail" id_parent="Advanced_Parameters" active="1" enabled="1">
+            <class_name>AdminEmails</class_name>
+            <wording>E-mail</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="CSV_Import" id_parent="Advanced_Parameters" active="1" enabled="1">
+            <class_name>AdminImport</class_name>
+            <wording>Import</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Employees" id_parent="Advanced_Parameters" active="1" enabled="1">
+            <class_name>AdminParentEmployees</class_name>
+            <wording>Team</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Employees_1" id_parent="Employees" active="1" enabled="1">
+            <class_name>AdminEmployees</class_name>
+            <wording>Employees</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Profiles" id_parent="Employees" active="1" enabled="1">
+            <class_name>AdminProfiles</class_name>
+            <wording>Roles</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Permissions" id_parent="Employees" active="1" enabled="1">
+            <class_name>AdminAccess</class_name>
+            <wording>Permissions</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Database" id_parent="Advanced_Parameters" active="1" enabled="1">
+            <class_name>AdminParentRequestSql</class_name>
+            <wording>Database</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="SQL_Manager" id_parent="Database" active="1" enabled="1">
+            <class_name>AdminRequestSql</class_name>
+            <wording>SQL Manager</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="DB_Backup" id_parent="Database" active="1" enabled="1">
+            <class_name>AdminBackup</class_name>
+            <wording>DB Backup</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Logs" id_parent="Advanced_Parameters" active="1" enabled="1">
+            <class_name>AdminLogs</class_name>
+            <wording>Logs</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Webservice" id_parent="Advanced_Parameters" active="1" enabled="1">
+            <class_name>AdminWebservice</class_name>
+            <wording>Webservice</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="AuthorizationServer" id_parent="Advanced_Parameters" active="0" enabled="1">
+            <class_name>AdminAuthorizationServer</class_name>
+            <wording>Authorization Server</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Multistore" id_parent="Advanced_Parameters" active="0" enabled="1">
+            <class_name>AdminShopGroup</class_name>
+            <wording>Multistore</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Multistore" id_parent="Advanced_Parameters" active="0" enabled="1">
+            <class_name>AdminShopUrl</class_name>
+            <wording>Multistore</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="FeatureFlag" id_parent="Advanced_Parameters" active="1" enabled="1" icon="">
+            <class_name>AdminFeatureFlag</class_name>
+            <wording>New &amp; Experimental Features</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Security" id_parent="Advanced_Parameters" active="1" enabled="1">
+            <class_name>AdminParentSecurity</class_name>
+        </tab>
+        <tab id="Security_1" id_parent="Security" active="1" enabled="1" route_name="admin_security">
+            <class_name>AdminSecurity</class_name>
+            <wording>Security</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="EmployeeSessions" id_parent="Security" active="1" enabled="1" route_name="admin_security_sessions_employee_list">
+            <class_name>AdminSecuritySessionEmployee</class_name>
+        </tab>
+        <tab id="CustomerSessions" id_parent="Security" active="1" enabled="1" route_name="admin_security_sessions_customer_list">
 
-      <!--QUICK ACCESS-->
-      <tab id="Quick_Access" id_parent="-1" active="1" enabled="1">
-          <class_name>AdminQuickAccesses</class_name>
-          <wording>Quick Access</wording>
-          <wording_domain>Admin.Navigation.Menu</wording_domain>
-      </tab>
+            <class_name>AdminSecuritySessionCustomer</class_name>
+        </tab>
 
-      <!--DEFAULT-->
-      <tab id="DEFAULT" id_parent="" active="1" enabled="1">
-          <class_name>DEFAULT</class_name>
-          <wording>More</wording>
-          <wording_domain>Admin.Navigation.Menu</wording_domain>
-      </tab>
+        <!--QUICK ACCESS-->
+        <tab id="Quick_Access" id_parent="-1" active="1" enabled="1">
+            <class_name>AdminQuickAccesses</class_name>
+            <wording>Quick Access</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
 
-      <tab id="Patterns" id_parent="-1" active="1" enabled="1">
-          <class_name>AdminPatterns</class_name>
-          <wording/>
-          <wording_domain/>
-      </tab>
+        <!--DEFAULT-->
+        <tab id="DEFAULT" id_parent="" active="1" enabled="1">
+            <class_name>DEFAULT</class_name>
+            <wording>More</wording>
+            <wording_domain>Admin.Navigation.Menu</wording_domain>
+        </tab>
+        <tab id="Patterns" id_parent="-1" active="1" enabled="1">
+            <class_name>AdminPatterns</class_name>
+            <wording/>
+            <wording_domain/>
+        </tab>
     </entities>
 </entity_tab>
diff --git a/install-dev/fixtures/fashion/data/access.xml b/install-dev/fixtures/fashion/data/access.xml
index 21d81641cd322..b3c86d35adb5b 100644
--- a/install-dev/fixtures/fashion/data/access.xml
+++ b/install-dev/fixtures/fashion/data/access.xml
@@ -77,14 +77,6 @@
     <!--<access id="access_3_50"  id_profile="Logistician"   id_authorization_role="Price_Ranges" view="1" add="1" edit="1" delete="1"/>-->
     <!--<access id="access_3_51"  id_profile="Logistician"   id_authorization_role="Weight_Ranges" view="1" add="1" edit="1" delete="1"/>-->
     <!--<access id="access_3_61"  id_profile="Logistician"   id_authorization_role="Modules_1" view="1" add="0" edit="1" delete="0"/>-->
-    <access id="access_3_67"  id_profile="Logistician"   id_authorization_role="TAB_ADMINWAREHOUSES_CREATE"/>
-    <access id="access_3_68"  id_profile="Logistician"   id_authorization_role="TAB_ADMINWAREHOUSES_READ"/>
-    <access id="access_3_69"  id_profile="Logistician"   id_authorization_role="TAB_ADMINWAREHOUSES_UPDATE"/>
-    <access id="access_3_70"  id_profile="Logistician"   id_authorization_role="TAB_ADMINWAREHOUSES_DELETE"/>
-    <access id="access_3_71"  id_profile="Logistician"   id_authorization_role="TAB_ADMINPARENTSTOCKMANAGEMENT_CREATE"/>
-    <access id="access_3_72"  id_profile="Logistician"   id_authorization_role="TAB_ADMINPARENTSTOCKMANAGEMENT_READ"/>
-    <access id="access_3_73"  id_profile="Logistician"   id_authorization_role="TAB_ADMINPARENTSTOCKMANAGEMENT_UPDATE"/>
-    <access id="access_3_74"  id_profile="Logistician"   id_authorization_role="TAB_ADMINPARENTSTOCKMANAGEMENT_DELETE"/>
     <access id="access_3_87" id_profile="Logistician" id_authorization_role="TAB_IMPROVE_CREATE"/>
     <access id="access_3_88" id_profile="Logistician" id_authorization_role="TAB_IMPROVE_READ"/>
     <access id="access_3_89" id_profile="Logistician" id_authorization_role="TAB_IMPROVE_UPDATE"/>
diff --git a/install-dev/fixtures/fashion/data/address.xml b/install-dev/fixtures/fashion/data/address.xml
index 6516e2148e73d..2f88e54d1cddf 100644
--- a/install-dev/fixtures/fashion/data/address.xml
+++ b/install-dev/fixtures/fashion/data/address.xml
@@ -6,7 +6,6 @@
     <field name="id_customer" relation="customer"/>
     <field name="id_manufacturer" relation="manufacturer"/>
     <field name="id_supplier" relation="supplier"/>
-    <field name="id_warehouse"/>
     <field name="alias"/>
     <field name="company"/>
     <field name="lastname"/>
@@ -23,35 +22,35 @@
     <field name="active"/>
   </fields>
   <entities>
-    <address id="Mon_adresse" id_country="FR" id_state="" id_customer="John" id_manufacturer="" id_supplier="" id_warehouse="0" alias="Mon adresse" lastname="DOE" firstname="John" postcode="75002" phone="0102030405" phone_mobile="" vat_number="" dni="" active="1">
+    <address id="Mon_adresse" id_country="FR" id_state="" id_customer="John" id_manufacturer="" id_supplier="" alias="Mon adresse" lastname="DOE" firstname="John" postcode="75002" phone="0102030405" phone_mobile="" vat_number="" dni="" active="1">
       <company>My Company</company>
       <address1>16, Main street</address1>
       <address2>2nd floor</address2>
       <city>Paris </city>
       <other/>
     </address>
-    <address id="supplier" id_country="US" id_state="NY" id_customer="" id_manufacturer="" id_supplier="Fashion_Supplier" id_warehouse="0" alias="supplier" lastname="supplier" firstname="supplier" postcode="10153" phone="(212) 336-1440" phone_mobile="" vat_number="" dni="" active="1">
+    <address id="supplier" id_country="US" id_state="NY" id_customer="" id_manufacturer="" id_supplier="Fashion_Supplier" alias="supplier" lastname="supplier" firstname="supplier" postcode="10153" phone="(212) 336-1440" phone_mobile="" vat_number="" dni="" active="1">
       <company>Fashion</company>
       <address1>767 Fifth Ave.</address1>
       <address2/>
       <city>New York</city>
       <other/>
     </address>
-    <address id="manufacturer" id_country="US" id_state="NY" id_customer="" id_manufacturer="1" id_supplier="" id_warehouse="0" alias="manufacturer" lastname="manufacturer" firstname="manufacturer" postcode="10154" phone="(212) 336-1666" phone_mobile="" vat_number="" dni="" active="1">
+    <address id="manufacturer" id_country="US" id_state="NY" id_customer="" id_manufacturer="1" id_supplier="" alias="manufacturer" lastname="manufacturer" firstname="manufacturer" postcode="10154" phone="(212) 336-1666" phone_mobile="" vat_number="" dni="" active="1">
       <company>Fashion</company>
       <address1>767 Fifth Ave.</address1>
       <address2/>
       <city>New York</city>
       <other/>
     </address>
-    <address id="My_address" id_country="US" id_state="FL" id_customer="John" id_manufacturer="" id_supplier="" id_warehouse="0" alias="My address" lastname="DOE" firstname="John" postcode="33133" phone="0102030405" phone_mobile="" vat_number="" dni="" active="1">
+    <address id="My_address" id_country="US" id_state="FL" id_customer="John" id_manufacturer="" id_supplier="" alias="My address" lastname="DOE" firstname="John" postcode="33133" phone="0102030405" phone_mobile="" vat_number="" dni="" active="1">
       <company>My Company</company>
       <address1>16, Main street</address1>
       <address2>2nd floor</address2>
       <city>Miami</city>
       <other/>
     </address>
-    <address id="accessories_supplier" id_country="FR" id_state="" id_customer="" id_manufacturer="" id_supplier="Accessories_Supplier" id_warehouse="0" alias="accessories_supplier" lastname="accessories" firstname="accessories" postcode="64990" phone="0102030405" phone_mobile="" vat_number="" dni="" active="1">
+    <address id="accessories_supplier" id_country="FR" id_state="" id_customer="" id_manufacturer="" id_supplier="Accessories_Supplier" alias="accessories_supplier" lastname="accessories" firstname="accessories" postcode="64990" phone="0102030405" phone_mobile="" vat_number="" dni="" active="1">
       <company>Accessories and Co</company>
       <address1>42 Avenue Maréchal Soult</address1>
       <address2/>
diff --git a/install-dev/fixtures/fashion/data/order_detail.xml b/install-dev/fixtures/fashion/data/order_detail.xml
index afaf0f4cb3978..05b8e09d64d14 100644
--- a/install-dev/fixtures/fashion/data/order_detail.xml
+++ b/install-dev/fixtures/fashion/data/order_detail.xml
@@ -3,7 +3,6 @@
     <fields class="OrderDetail">
         <field name="id_order" relation="orders"/>
         <field name="id_order_invoice"/>
-        <field name="id_warehouse"/>
         <field name="id_shop"/>
         <field name="product_id" relation="product"/>
         <field name="product_attribute_id" relation="product_attribute"/>
@@ -44,7 +43,7 @@
         <field name="original_product_price"/>
     </fields>
     <entities>
-        <order_detail id="order_detail_1" id_order="1" id_order_invoice="0" id_warehouse="0" id_shop="1"
+        <order_detail id="order_detail_1" id_order="1" id_order_invoice="0" id_shop="1"
                       product_id="Hummingbird_printed_t-shirt" product_attribute_id="product_attribute_46" product_quantity="1"
                       product_quantity_in_stock="1" product_quantity_refunded="0" product_quantity_return="0"
                       product_quantity_reinjected="0" product_price="23.900000" reduction_percent="0.00"
@@ -60,7 +59,7 @@
             <product_name>Hummingbird printed t-shirt - Color : White, Size : S</product_name>
             <download_hash/>
         </order_detail>
-        <order_detail id="order_detail_2" id_order="1" id_order_invoice="0" id_warehouse="0" id_shop="1"
+        <order_detail id="order_detail_2" id_order="1" id_order_invoice="0" id_shop="1"
                       product_id="Hummingbird_printed_sweater" product_attribute_id="product_attribute_62" product_quantity="1"
                       product_quantity_in_stock="1" product_quantity_refunded="0" product_quantity_return="0"
                       product_quantity_reinjected="0" product_price="35.900000" reduction_percent="0.00"
@@ -76,7 +75,7 @@
             <product_name>Hummingbird printed sweater - Color : White, Size : S</product_name>
             <download_hash/>
         </order_detail>
-        <order_detail id="order_detail_3" id_order="2" id_order_invoice="0" id_warehouse="0" id_shop="1"
+        <order_detail id="order_detail_3" id_order="2" id_order_invoice="0" id_shop="1"
                       product_id="The_adventure_begins_Framed_poster" product_attribute_id="product_attribute_75" product_quantity="2"
                       product_quantity_in_stock="3" product_quantity_refunded="0" product_quantity_return="0"
                       product_quantity_reinjected="0" product_price="79.000000" reduction_percent="0.00"
@@ -92,7 +91,7 @@
             <product_name>The adventure begins Framed poster - Size : 80x120cm</product_name>
             <download_hash/>
         </order_detail>
-        <order_detail id="order_detail_4" id_order="2" id_order_invoice="0" id_warehouse="0" id_shop="1"
+        <order_detail id="order_detail_4" id_order="2" id_order_invoice="0" id_shop="1"
                       product_id="Mug_Today_is_a_good_day" product_attribute_id=""
                       product_quantity="1" product_quantity_in_stock="1" product_quantity_refunded="0"
                       product_quantity_return="0" product_quantity_reinjected="0" product_price="11.900000"
@@ -108,7 +107,7 @@
             <product_name>Mug Today is a good day</product_name>
             <download_hash/>
         </order_detail>
-        <order_detail id="order_detail_5" id_order="3" id_order_invoice="0" id_warehouse="0" id_shop="1"
+        <order_detail id="order_detail_5" id_order="3" id_order_invoice="0" id_shop="1"
                       product_id="Mountain_fox_notebook" product_attribute_id="product_attribute_85"
                       product_quantity="1" product_quantity_in_stock="1" product_quantity_refunded="0"
                       product_quantity_return="0" product_quantity_reinjected="0" product_price="12.900000"
@@ -124,7 +123,7 @@
             <product_name>Mountain fox notebook Style : Ruled</product_name>
             <download_hash/>
         </order_detail>
-        <order_detail id="order_detail_6" id_order="4" id_order_invoice="0" id_warehouse="0" id_shop="1"
+        <order_detail id="order_detail_6" id_order="4" id_order_invoice="0" id_shop="1"
                       product_id="Mountain_fox_notebook" product_attribute_id="product_attribute_86"
                       product_quantity="1" product_quantity_in_stock="1" product_quantity_refunded="0"
                       product_quantity_return="0" product_quantity_reinjected="0" product_price="12.900000"
@@ -140,7 +139,7 @@
             <product_name>Mountain fox notebook Style : Plain</product_name>
             <download_hash/>
         </order_detail>
-        <order_detail id="order_detail_7" id_order="5" id_order_invoice="0" id_warehouse="0" id_shop="1"
+        <order_detail id="order_detail_7" id_order="5" id_order_invoice="0" id_shop="1"
                       product_id="Brown_bear_cushion" product_attribute_id="product_attribute_82"
                       product_quantity="1" product_quantity_in_stock="1" product_quantity_refunded="0"
                       product_quantity_return="0" product_quantity_reinjected="0" product_price="18.900000"
diff --git a/install-dev/fixtures/fashion/data/product.xml b/install-dev/fixtures/fashion/data/product.xml
index aabd6e033c9d9..c7fa588aa20d1 100644
--- a/install-dev/fixtures/fashion/data/product.xml
+++ b/install-dev/fixtures/fashion/data/product.xml
@@ -41,83 +41,82 @@
     <field name="cache_has_attachments"/>
     <field name="is_virtual"/>
     <field name="cache_default_attribute"/>
-    <field name="advanced_stock_management"/>
     <field name="product_type"/>
   </fields>
   <entities>
-    <product id="Hummingbird_printed_t-shirt" id_supplier="Fashion_Supplier" id_manufacturer="Studio_Design" id_category_default="Men" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="23.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_1" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="46" advanced_stock_management="0" product_type="combinations">
+    <product id="Hummingbird_printed_t-shirt" id_supplier="Fashion_Supplier" id_manufacturer="Studio_Design" id_category_default="Men" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="23.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_1" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="46" product_type="combinations">
       <unity/>
       <location/>
     </product>
-    <product id="Hummingbird_printed_sweater" id_supplier="Fashion_Supplier" id_manufacturer="Studio_Design" id_category_default="Women" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="35.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_3" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="404" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="62" advanced_stock_management="0" product_type="combinations">
+    <product id="Hummingbird_printed_sweater" id_supplier="Fashion_Supplier" id_manufacturer="Studio_Design" id_category_default="Women" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="35.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_3" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="404" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="62" product_type="combinations">
       <unity/>
       <location/>
     </product>
-    <product id="The_best_is_yet_to_come_Framed_poster" id_supplier="Fashion_Supplier" id_manufacturer="Graphic_Corner" id_category_default="Art" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="29.000000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_6" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="70" advanced_stock_management="0" product_type="combinations">
+    <product id="The_best_is_yet_to_come_Framed_poster" id_supplier="Fashion_Supplier" id_manufacturer="Graphic_Corner" id_category_default="Art" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="29.000000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_6" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="70" product_type="combinations">
       <unity/>
       <location/>
     </product>
-    <product id="The_adventure_begins_Framed_poster" id_supplier="Fashion_Supplier" id_manufacturer="Graphic_Corner" id_category_default="Art" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="29.000000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_5" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="404" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="73" advanced_stock_management="0" product_type="combinations">
+    <product id="The_adventure_begins_Framed_poster" id_supplier="Fashion_Supplier" id_manufacturer="Graphic_Corner" id_category_default="Art" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="29.000000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_5" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="404" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="73" product_type="combinations">
       <unity/>
       <location/>
     </product>
-    <product id="Today_is_a_good_day_Framed_poster" id_supplier="Fashion_Supplier" id_manufacturer="Graphic_Corner" id_category_default="Art" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="29.000000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_7" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="76" advanced_stock_management="0" product_type="combinations">
+    <product id="Today_is_a_good_day_Framed_poster" id_supplier="Fashion_Supplier" id_manufacturer="Graphic_Corner" id_category_default="Art" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="29.000000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_7" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="76" product_type="combinations">
       <unity/>
       <location/>
     </product>
-    <product id="Mug_The_best_is_yet_to_come" id_supplier="Accessories_Supplier" id_manufacturer="Studio_Design" id_category_default="Home_Accessories" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="11.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_11" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0" product_type="standard">
+    <product id="Mug_The_best_is_yet_to_come" id_supplier="Accessories_Supplier" id_manufacturer="Studio_Design" id_category_default="Home_Accessories" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="11.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_11" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" product_type="standard">
       <unity/>
       <location/>
     </product>
-    <product id="Mug_The_adventure_begins" id_supplier="Accessories_Supplier" id_manufacturer="Studio_Design" id_category_default="Home_Accessories" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="11.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_12" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0" product_type="standard">
+    <product id="Mug_The_adventure_begins" id_supplier="Accessories_Supplier" id_manufacturer="Studio_Design" id_category_default="Home_Accessories" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="11.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_12" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" product_type="standard">
       <unity/>
       <location/>
     </product>
-    <product id="Mug_Today_is_a_good_day" id_supplier="Accessories_Supplier" id_manufacturer="Studio_Design" id_category_default="Home_Accessories" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="11.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_13" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="404" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0" product_type="standard">
+    <product id="Mug_Today_is_a_good_day" id_supplier="Accessories_Supplier" id_manufacturer="Studio_Design" id_category_default="Home_Accessories" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="11.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_13" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="404" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" product_type="standard">
       <unity/>
       <location/>
     </product>
-    <product id="Mountain_fox_cushion" id_supplier="Accessories_Supplier" id_manufacturer="Studio_Design" id_category_default="Home_Accessories" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="18.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_15" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="79" advanced_stock_management="0" product_type="combinations">
+    <product id="Mountain_fox_cushion" id_supplier="Accessories_Supplier" id_manufacturer="Studio_Design" id_category_default="Home_Accessories" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="18.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_15" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="79" product_type="combinations">
       <unity/>
       <location/>
     </product>
-    <product id="Brown_bear_cushion" id_supplier="Accessories_Supplier" id_manufacturer="Studio_Design" id_category_default="Home_Accessories" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="18.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_16" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="81" advanced_stock_management="0" product_type="combinations">
+    <product id="Brown_bear_cushion" id_supplier="Accessories_Supplier" id_manufacturer="Studio_Design" id_category_default="Home_Accessories" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="18.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_16" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="81" product_type="combinations">
       <unity/>
       <location/>
     </product>
-    <product id="Hummingbird_cushion" id_supplier="Accessories_Supplier" id_manufacturer="Studio_Design" id_category_default="Home_Accessories" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="18.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_17" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="83" advanced_stock_management="0" product_type="combinations">
+    <product id="Hummingbird_cushion" id_supplier="Accessories_Supplier" id_manufacturer="Studio_Design" id_category_default="Home_Accessories" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="18.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_17" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="83" product_type="combinations">
       <unity/>
       <location/>
     </product>
-    <product id="Mountain_fox_-_Vector_graphics" id_supplier="Accessories_Supplier" id_manufacturer="Graphic_Corner" id_category_default="Art" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="9.000000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_18" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="1" cache_default_attribute="0" advanced_stock_management="0" product_type="virtual">
+    <product id="Mountain_fox_-_Vector_graphics" id_supplier="Accessories_Supplier" id_manufacturer="Graphic_Corner" id_category_default="Art" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="9.000000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_18" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="1" cache_default_attribute="0" product_type="virtual">
       <unity/>
       <location/>
     </product>
-    <product id="Brown_bear_-_Vector_graphics" id_supplier="Accessories_Supplier" id_manufacturer="Graphic_Corner" id_category_default="Art" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="9.000000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_19" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="1" cache_default_attribute="0" advanced_stock_management="0" product_type="virtual">
+    <product id="Brown_bear_-_Vector_graphics" id_supplier="Accessories_Supplier" id_manufacturer="Graphic_Corner" id_category_default="Art" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="9.000000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_19" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="1" cache_default_attribute="0" product_type="virtual">
       <unity/>
       <location/>
     </product>
-    <product id="Hummingbird_-_Vector_graphics" id_supplier="Accessories_Supplier" id_manufacturer="Graphic_Corner" id_category_default="Art" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="9.000000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_20" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="1" cache_default_attribute="0" advanced_stock_management="0" product_type="virtual">
+    <product id="Hummingbird_-_Vector_graphics" id_supplier="Accessories_Supplier" id_manufacturer="Graphic_Corner" id_category_default="Art" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="9.000000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_20" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="1" cache_default_attribute="0" product_type="virtual">
       <unity/>
       <location/>
     </product>
-    <product id="Pack_Mug_Framed_poster" id_supplier="Accessories_Supplier" id_manufacturer="" id_category_default="Home_Accessories" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="35.000000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_21" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="1" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0" product_type="pack">
+    <product id="Pack_Mug_Framed_poster" id_supplier="Accessories_Supplier" id_manufacturer="" id_category_default="Home_Accessories" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="35.000000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_21" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="1" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" product_type="pack">
       <unity/>
       <location/>
     </product>
-    <product id="Mountain_fox_notebook" id_supplier="Accessories_Supplier" id_manufacturer="Graphic_Corner" id_category_default="Stationery" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="12.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_8" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="85" advanced_stock_management="0" product_type="combinations">
+    <product id="Mountain_fox_notebook" id_supplier="Accessories_Supplier" id_manufacturer="Graphic_Corner" id_category_default="Stationery" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="12.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_8" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="85" product_type="combinations">
       <unity/>
       <location/>
     </product>
-    <product id="Brown_bear_notebook" id_supplier="Accessories_Supplier" id_manufacturer="Graphic_Corner" id_category_default="Stationery" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="12.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_9" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="89" advanced_stock_management="0" product_type="combinations">
+    <product id="Brown_bear_notebook" id_supplier="Accessories_Supplier" id_manufacturer="Graphic_Corner" id_category_default="Stationery" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="12.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_9" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="89" product_type="combinations">
       <unity/>
       <location/>
     </product>
-    <product id="Hummingbird_notebook" id_supplier="Accessories_Supplier" id_manufacturer="Graphic_Corner" id_category_default="Stationery" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="12.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_10" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="93" advanced_stock_management="0" product_type="combinations">
+    <product id="Hummingbird_notebook" id_supplier="Accessories_Supplier" id_manufacturer="Graphic_Corner" id_category_default="Stationery" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="12.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_10" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="93" product_type="combinations">
       <unity/>
       <location/>
     </product>
-    <product id="Customizable_mug" id_supplier="Accessories_Supplier" id_manufacturer="Studio_Design" id_category_default="Home_Accessories" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="13.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_14" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="1" uploadable_files="0" text_fields="1" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0" product_type="standard">
+    <product id="Customizable_mug" id_supplier="Accessories_Supplier" id_manufacturer="Studio_Design" id_category_default="Home_Accessories" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="13.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_14" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="1" uploadable_files="0" text_fields="1" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" product_type="standard">
       <unity/>
       <location/>
     </product>
diff --git a/install-dev/fixtures/fashion/data/stock_available.xml b/install-dev/fixtures/fashion/data/stock_available.xml
index 78324562023e7..3c7a40ecd47bc 100644
--- a/install-dev/fixtures/fashion/data/stock_available.xml
+++ b/install-dev/fixtures/fashion/data/stock_available.xml
@@ -6,67 +6,66 @@
     <field name="id_shop"/>
     <field name="id_shop_group"/>
     <field name="quantity"/>
-    <field name="depends_on_stock"/>
     <field name="out_of_stock"/>
   </fields>
   <entities>
-    <stock_available id="stock_available_53" id_product="1" id_product_attribute="0" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_54" id_product="1" id_product_attribute="1" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_55" id_product="1" id_product_attribute="2" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_56" id_product="1" id_product_attribute="3" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_57" id_product="1" id_product_attribute="4" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_58" id_product="1" id_product_attribute="5" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_59" id_product="1" id_product_attribute="6" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_60" id_product="1" id_product_attribute="7" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_61" id_product="1" id_product_attribute="8" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_70" id_product="2" id_product_attribute="0" id_shop="1" id_shop_group="0" quantity="1200" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_71" id_product="2" id_product_attribute="9" id_shop="1" id_shop_group="0" quantity="1200" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_72" id_product="2" id_product_attribute="10" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_73" id_product="2" id_product_attribute="11" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_74" id_product="2" id_product_attribute="12" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_80" id_product="3" id_product_attribute="0" id_shop="1" id_shop_group="0" quantity="900" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_81" id_product="3" id_product_attribute="13" id_shop="1" id_shop_group="0" quantity="900" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_82" id_product="3" id_product_attribute="14" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_83" id_product="3" id_product_attribute="15" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_84" id_product="4" id_product_attribute="0" id_shop="1" id_shop_group="0" quantity="900" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_85" id_product="4" id_product_attribute="16" id_shop="1" id_shop_group="0" quantity="900" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_86" id_product="4" id_product_attribute="17" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_87" id_product="4" id_product_attribute="18" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_89" id_product="5" id_product_attribute="0" id_shop="1" id_shop_group="0" quantity="900" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_90" id_product="5" id_product_attribute="19" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_91" id_product="5" id_product_attribute="20" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_92" id_product="5" id_product_attribute="21" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_93" id_product="6" id_product_attribute="0" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_94" id_product="7" id_product_attribute="0" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_95" id_product="8" id_product_attribute="0" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_103" id_product="9" id_product_attribute="0" id_shop="1" id_shop_group="0" quantity="600" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_104" id_product="9" id_product_attribute="22" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_105" id_product="9" id_product_attribute="23" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_106" id_product="10" id_product_attribute="0" id_shop="1" id_shop_group="0" quantity="600" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_107" id_product="10" id_product_attribute="24" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_108" id_product="10" id_product_attribute="25" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_109" id_product="11" id_product_attribute="0" id_shop="1" id_shop_group="0" quantity="600" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_110" id_product="11" id_product_attribute="26" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_111" id_product="11" id_product_attribute="27" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_112" id_product="12" id_product_attribute="0" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_113" id_product="13" id_product_attribute="0" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_114" id_product="14" id_product_attribute="0" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_115" id_product="15" id_product_attribute="0" id_shop="1" id_shop_group="0" quantity="100" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_118" id_product="16" id_product_attribute="0" id_shop="1" id_shop_group="0" quantity="1200" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_119" id_product="17" id_product_attribute="0" id_shop="1" id_shop_group="0" quantity="1200" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_120" id_product="18" id_product_attribute="0" id_shop="1" id_shop_group="0" quantity="1200" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_123" id_product="19" id_product_attribute="0" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_124" id_product="16" id_product_attribute="28" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_125" id_product="16" id_product_attribute="29" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_126" id_product="16" id_product_attribute="30" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_127" id_product="16" id_product_attribute="31" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_128" id_product="17" id_product_attribute="32" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_129" id_product="17" id_product_attribute="33" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_130" id_product="17" id_product_attribute="34" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_131" id_product="17" id_product_attribute="35" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_132" id_product="18" id_product_attribute="36" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_133" id_product="18" id_product_attribute="37" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_134" id_product="18" id_product_attribute="38" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
-    <stock_available id="stock_available_135" id_product="18" id_product_attribute="39" id_shop="1" id_shop_group="0" quantity="300" depends_on_stock="0" out_of_stock="2"/>
+    <stock_available id="stock_available_53" id_product="1" id_product_attribute="0" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_54" id_product="1" id_product_attribute="1" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_55" id_product="1" id_product_attribute="2" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_56" id_product="1" id_product_attribute="3" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_57" id_product="1" id_product_attribute="4" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_58" id_product="1" id_product_attribute="5" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_59" id_product="1" id_product_attribute="6" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_60" id_product="1" id_product_attribute="7" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_61" id_product="1" id_product_attribute="8" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_70" id_product="2" id_product_attribute="0" id_shop="1" id_shop_group="0" quantity="1200" out_of_stock="2"/>
+    <stock_available id="stock_available_71" id_product="2" id_product_attribute="9" id_shop="1" id_shop_group="0" quantity="1200" out_of_stock="2"/>
+    <stock_available id="stock_available_72" id_product="2" id_product_attribute="10" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_73" id_product="2" id_product_attribute="11" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_74" id_product="2" id_product_attribute="12" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_80" id_product="3" id_product_attribute="0" id_shop="1" id_shop_group="0" quantity="900" out_of_stock="2"/>
+    <stock_available id="stock_available_81" id_product="3" id_product_attribute="13" id_shop="1" id_shop_group="0" quantity="900" out_of_stock="2"/>
+    <stock_available id="stock_available_82" id_product="3" id_product_attribute="14" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_83" id_product="3" id_product_attribute="15" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_84" id_product="4" id_product_attribute="0" id_shop="1" id_shop_group="0" quantity="900" out_of_stock="2"/>
+    <stock_available id="stock_available_85" id_product="4" id_product_attribute="16" id_shop="1" id_shop_group="0" quantity="900" out_of_stock="2"/>
+    <stock_available id="stock_available_86" id_product="4" id_product_attribute="17" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_87" id_product="4" id_product_attribute="18" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_89" id_product="5" id_product_attribute="0" id_shop="1" id_shop_group="0" quantity="900" out_of_stock="2"/>
+    <stock_available id="stock_available_90" id_product="5" id_product_attribute="19" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_91" id_product="5" id_product_attribute="20" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_92" id_product="5" id_product_attribute="21" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_93" id_product="6" id_product_attribute="0" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_94" id_product="7" id_product_attribute="0" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_95" id_product="8" id_product_attribute="0" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_103" id_product="9" id_product_attribute="0" id_shop="1" id_shop_group="0" quantity="600" out_of_stock="2"/>
+    <stock_available id="stock_available_104" id_product="9" id_product_attribute="22" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_105" id_product="9" id_product_attribute="23" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_106" id_product="10" id_product_attribute="0" id_shop="1" id_shop_group="0" quantity="600" out_of_stock="2"/>
+    <stock_available id="stock_available_107" id_product="10" id_product_attribute="24" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_108" id_product="10" id_product_attribute="25" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_109" id_product="11" id_product_attribute="0" id_shop="1" id_shop_group="0" quantity="600" out_of_stock="2"/>
+    <stock_available id="stock_available_110" id_product="11" id_product_attribute="26" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_111" id_product="11" id_product_attribute="27" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_112" id_product="12" id_product_attribute="0" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_113" id_product="13" id_product_attribute="0" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_114" id_product="14" id_product_attribute="0" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_115" id_product="15" id_product_attribute="0" id_shop="1" id_shop_group="0" quantity="100" out_of_stock="2"/>
+    <stock_available id="stock_available_118" id_product="16" id_product_attribute="0" id_shop="1" id_shop_group="0" quantity="1200" out_of_stock="2"/>
+    <stock_available id="stock_available_119" id_product="17" id_product_attribute="0" id_shop="1" id_shop_group="0" quantity="1200" out_of_stock="2"/>
+    <stock_available id="stock_available_120" id_product="18" id_product_attribute="0" id_shop="1" id_shop_group="0" quantity="1200" out_of_stock="2"/>
+    <stock_available id="stock_available_123" id_product="19" id_product_attribute="0" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_124" id_product="16" id_product_attribute="28" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_125" id_product="16" id_product_attribute="29" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_126" id_product="16" id_product_attribute="30" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_127" id_product="16" id_product_attribute="31" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_128" id_product="17" id_product_attribute="32" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_129" id_product="17" id_product_attribute="33" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_130" id_product="17" id_product_attribute="34" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_131" id_product="17" id_product_attribute="35" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_132" id_product="18" id_product_attribute="36" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_133" id_product="18" id_product_attribute="37" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_134" id_product="18" id_product_attribute="38" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
+    <stock_available id="stock_available_135" id_product="18" id_product_attribute="39" id_shop="1" id_shop_group="0" quantity="300" out_of_stock="2"/>
   </entities>
 </entity_stock_available>
diff --git a/install-dev/langs/en/data/supplier_order_state.xml b/install-dev/langs/en/data/supplier_order_state.xml
deleted file mode 100644
index dfc4ce42e2583..0000000000000
--- a/install-dev/langs/en/data/supplier_order_state.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entity_supplier_order_state>
-	<supplier_order_state id="creation_in_progress">
-		<name><![CDATA[creation in progress]]></name>
-	</supplier_order_state>
-	<supplier_order_state id="Order_validated">
-		<name><![CDATA[Order validated]]></name>
-	</supplier_order_state>
-	<supplier_order_state id="Pending_receipt">
-		<name><![CDATA[Pending receipt]]></name>
-	</supplier_order_state>
-	<supplier_order_state id="Order_received_in_part">
-		<name><![CDATA[Order received in part]]></name>
-	</supplier_order_state>
-	<supplier_order_state id="Order_received_completely">
-		<name><![CDATA[Order received completely]]></name>
-	</supplier_order_state>
-	<supplier_order_state id="order_fenced">
-		<name><![CDATA[order fenced]]></name>
-	</supplier_order_state>
-</entity_supplier_order_state>
\ No newline at end of file
diff --git a/install-dev/langs/en/data/supply_order_state.xml b/install-dev/langs/en/data/supply_order_state.xml
deleted file mode 100644
index 1e8903f0f91d5..0000000000000
--- a/install-dev/langs/en/data/supply_order_state.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<entity_supply_order_state>
-  <supply_order_state id="supply_order_state_1">
-    <name>1 - Creation in progress</name>
-  </supply_order_state>
-  <supply_order_state id="supply_order_state_2">
-    <name>2 - Order validated</name>
-  </supply_order_state>
-  <supply_order_state id="supply_order_state_3">
-    <name>3 - Pending receipt</name>
-  </supply_order_state>
-  <supply_order_state id="supply_order_state_4">
-    <name>4 - Order received in part</name>
-  </supply_order_state>
-  <supply_order_state id="supply_order_state_5">
-    <name>5 - Order received completely</name>
-  </supply_order_state>
-  <supply_order_state id="supply_order_state_6">
-    <name>6 - Order canceled</name>
-  </supply_order_state>
-</entity_supply_order_state>
diff --git a/install-dev/langs/en/data/tab.xml b/install-dev/langs/en/data/tab.xml
index f1ab8a4d1fb7f..587f8f2ff17cd 100644
--- a/install-dev/langs/en/data/tab.xml
+++ b/install-dev/langs/en/data/tab.xml
@@ -130,7 +130,6 @@
     <tab id="Titles" name="Titles" />
     <tab id="Traffic" name="Traffic &amp; SEO" />
     <tab id="Translations" name="Translations" />
-    <tab id="Warehouses" name="Warehouses" />
     <tab id="Webservice" name="Webservice" />
     <tab id="AuthorizationServer" name="Authorization Server" />
     <tab id="Zones" name="Zones" />
diff --git a/js/admin.js b/js/admin.js
index 99720d1639786..1854cf69c6e58 100644
--- a/js/admin.js
+++ b/js/admin.js
@@ -413,7 +413,6 @@ function stockManagementActivationAuthorization()
     getE('PS_ORDER_OUT_OF_STOCK_on').checked = true;
     getE('PS_ORDER_OUT_OF_STOCK_on').disabled = 'disabled';
     getE('PS_ORDER_OUT_OF_STOCK_off').disabled = 'disabled';
-    getE('PS_DEFAULT_WAREHOUSE_NEW_PRODUCT').disabled = 'disabled';
   }
 }
 
diff --git a/js/admin/products.js b/js/admin/products.js
index 19151dba23786..9467155573d5f 100644
--- a/js/admin/products.js
+++ b/js/admin/products.js
@@ -1451,16 +1451,8 @@ product_tabs['Quantities'] = new function(){
 
 	this.refreshQtyAvailabilityForm = function()
 	{
-		if ($('#depends_on_stock_0').prop('checked'))
-		{
-			$('.available_quantity').find('input').show();
-			$('.available_quantity').find('span').hide();
-		}
-		else
-		{
-			$('.available_quantity').find('input').hide();
-			$('.available_quantity').find('span').show();
-		}
+		$('.available_quantity').find('input').show();
+		$('.available_quantity').find('span').hide();
 	};
 
 	this.onReady = function(){
@@ -1470,37 +1462,6 @@ product_tabs['Quantities'] = new function(){
 			dateFormat: 'yy-mm-dd'
 		});
 
-		$('.depends_on_stock').on('click', function(e)
-		{
-			self.refreshQtyAvailabilityForm();
-			self.ajaxCall( { actionQty: 'depends_on_stock', value: $(this).val() } );
-			if($(this).val() == 0)
-				$('.available_quantity input').trigger('change');
-		});
-
-		$('.advanced_stock_management').on('click', function(e)
-		{
-			var val = 0;
-			if ($(this).prop('checked'))
-				val = 1;
-
-			self.ajaxCall({actionQty: 'advanced_stock_management', value: val});
-			if (val == 1)
-			{
-				$(this).val(1);
-				$('#depends_on_stock_1').attr('disabled', false);
-			}
-			else
-			{
-				$(this).val(0);
-				$('#depends_on_stock_1').attr('disabled', true);
-				$('#depends_on_stock_0').attr('checked', true);
-				self.ajaxCall({actionQty: 'depends_on_stock', value: 0});
-				self.refreshQtyAvailabilityForm();
-			}
-			self.refreshQtyAvailabilityForm();
-		});
-
 		$('.available_quantity').find('input').on('change', function(e, init_val)
 		{
 			self.ajaxCall({actionQty: 'set_qty', id_product_attribute: $(this).parent().attr('id').split('_')[1], value: $(this).val()});
@@ -1641,36 +1602,6 @@ product_tabs['VirtualProduct'] = new function(){
 	}
 }
 
-product_tabs['Warehouses'] = new function(){
-	this.onReady = function(){
-		$('.check_all_warehouse').on('click', function() {
-			//get all checkboxes of current warehouse
-			var checkboxes = $('input[name*="'+$(this).val()+'"]');
-			var checked = false;
-
-			for (var i=0; i<checkboxes.length; i++)
-			{
-				var item = $(checkboxes[i]);
-
-				if (item.is(':checked'))
-				{
-					item.removeAttr("checked");
-				}
-				else
-				{
-					item.attr("checked", true);
-					checked = true;
-				}
-			}
-
-			if (checked)
-				$(this).find('i').removeClass('icon-check-sign').addClass('icon-check-empty');
-			else
-				$(this).find('i').removeClass('icon-check-empty').addClass('icon-check-sign');
-		});
-	};
-}
-
 /**
  * Update the product image list position buttons
  *
diff --git a/phpstan-disallowed-calls.neon b/phpstan-disallowed-calls.neon
index 1feda95bf49c5..65196bac52620 100644
--- a/phpstan-disallowed-calls.neon
+++ b/phpstan-disallowed-calls.neon
@@ -224,12 +224,6 @@ parameters:
               - StylesheetManager
               - Supplier
               - SupplierAddress
-              - SupplyOrder
-              - SupplyOrderDetail
-              - SupplyOrderHistory
-              - SupplyOrderReceiptHistory
-              - SupplyOrderState
-              - SupplyOrderStateLang
               - Tab
               - TabLang
               - Tag
@@ -256,9 +250,6 @@ parameters:
               - Uploader
               - Validate
               - ValidateConstraintTranslator
-              - Warehouse
-              - WarehouseAddress
-              - WarehouseProductLocation
               - WebserviceException
               - WebserviceKey
               - WebserviceOutputBuilder
diff --git a/src/Adapter/Attribute/AdminAttributeGeneratorControllerWrapper.php b/src/Adapter/Attribute/AdminAttributeGeneratorControllerWrapper.php
index 833a398cefd29..04954a8574e3f 100644
--- a/src/Adapter/Attribute/AdminAttributeGeneratorControllerWrapper.php
+++ b/src/Adapter/Attribute/AdminAttributeGeneratorControllerWrapper.php
@@ -31,8 +31,6 @@
 use PrestaShopBundle\Translation\TranslatorComponent;
 use Product;
 use SpecificPriceRule;
-use Stock;
-use StockAvailable;
 use Validate;
 
 /**
@@ -112,33 +110,19 @@ public function ajaxProcessDeleteProductAttribute($idAttribute, $idProduct)
         }
 
         if ($idProduct && Validate::isUnsignedId($idProduct) && Validate::isLoadedObject($product = new Product($idProduct))) {
-            if (($depends_on_stock = StockAvailable::dependsOnStock($idProduct)) && StockAvailable::getQuantityAvailableByProduct($idProduct, $idAttribute)) {
-                return [
-                    'status' => 'error',
-                    'message' => $this->translator->trans('It is not possible to delete a combination while it still has some quantities in the Advanced Stock Management. You must delete its stock first.', [], 'Admin.Catalog.Notification'),
-                ];
+            $product->deleteAttributeCombination((int) $idAttribute);
+            $product->checkDefaultAttributes();
+            if (!$product->hasAttributes()) {
+                $product->cache_default_attribute = 0;
+                $product->update();
             } else {
-                $product->deleteAttributeCombination((int) $idAttribute);
-                $product->checkDefaultAttributes();
-                if (!$product->hasAttributes()) {
-                    $product->cache_default_attribute = 0;
-                    $product->update();
-                } else {
-                    Product::updateDefaultAttribute($idProduct);
-                }
-
-                if ($depends_on_stock && !Stock::deleteStockByIds($idProduct, $idAttribute)) {
-                    return [
-                        'status' => 'error',
-                        'message' => $this->translator->trans('Error while deleting the stock', [], 'Admin.Catalog.Notification'),
-                    ];
-                } else {
-                    return [
-                        'status' => 'ok',
-                        'message' => $this->translator->trans('Successful deletion', [], 'Admin.Catalog.Notification'),
-                    ];
-                }
+                Product::updateDefaultAttribute($idProduct);
             }
+
+            return [
+                'status' => 'ok',
+                'message' => $this->translator->trans('Successful deletion', [], 'Admin.Catalog.Notification'),
+            ];
         } else {
             return [
                 'status' => 'error',
diff --git a/src/Adapter/Import/Handler/ProductImportHandler.php b/src/Adapter/Import/Handler/ProductImportHandler.php
index 0432fdd9b9fcb..0cddab0e0f5ca 100644
--- a/src/Adapter/Import/Handler/ProductImportHandler.php
+++ b/src/Adapter/Import/Handler/ProductImportHandler.php
@@ -52,14 +52,11 @@
 use Shop;
 use SpecificPrice;
 use StockAvailable;
-use StockManagerFactory;
 use Supplier;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Tag;
 use TaxManagerFactory;
 use TaxRulesGroup;
-use Warehouse;
-use WarehouseProductLocation;
 
 /**
  * Class ProductImportHandler is responsible for product import.
@@ -182,8 +179,6 @@ public function __construct(
             'customizable' => 0,
             'uploadable_files' => 0,
             'text_fields' => 0,
-            'advanced_stock_management' => 0,
-            'depends_on_stock' => 0,
             'is_virtual' => 0,
         ];
         $this->shopAddress = $shopAddress;
@@ -1228,72 +1223,6 @@ private function saveFeatures(Product $product, ImportConfigInterface $importCon
      */
     private function saveStock(Product $product, $validateOnly, $productExists)
     {
-        $asmEnabled = $this->configuration->getBoolean('PS_ADVANCED_STOCK_MANAGEMENT');
-
-        // set advanced stock managment
-        if (!$validateOnly) {
-            /* @phpstan-ignore-next-line Data of the property `advanced_stock_management` comes from database */
-            if ($product->advanced_stock_management != 1 && $product->advanced_stock_management != 0) {
-                $this->warning(
-                    $this->translator->trans(
-                        'Advanced stock management has incorrect value. Not set for product %name%',
-                        ['%name%' => $product->name[$this->languageId]],
-                        'Admin.Advparameters.Notification'
-                    )
-                );
-            } elseif (!$asmEnabled && $product->advanced_stock_management == 1) {
-                $this->warning(
-                    $this->translator->trans(
-                        'Advanced stock management is not enabled, cannot enable on product %name%',
-                        ['%name%' => $product->name[$this->languageId]],
-                        'Admin.Advparameters.Notification'
-                    )
-                );
-            } elseif ($productExists) {
-                $product->setAdvancedStockManagement($product->advanced_stock_management);
-            }
-            // automaticly disable depends on stock, if a_s_m set to disabled
-            if (StockAvailable::dependsOnStock($product->id) == 1 && $product->advanced_stock_management == 0) {
-                StockAvailable::setProductDependsOnStock($product->id, false);
-            }
-        }
-
-        // Check if warehouse exists
-        if (isset($product->warehouse) && $product->warehouse) {
-            if (!$asmEnabled) {
-                $this->warning(
-                    $this->translator->trans(
-                        'Advanced stock management is not enabled, warehouse not set on product %name%',
-                        ['%name%' => $product->name[$this->languageId]],
-                        'Admin.Advparameters.Notification'
-                    )
-                );
-            } elseif (!$validateOnly) {
-                if (Warehouse::exists($product->warehouse)) {
-                    // Get already associated warehouses
-                    $associatedWarehousesCollection = WarehouseProductLocation::getCollection($product->id);
-                    // Delete any entry in warehouse for this product
-                    foreach ($associatedWarehousesCollection as $awc) {
-                        $awc->delete();
-                    }
-                    $warehouseLocationEntity = new WarehouseProductLocation();
-                    $warehouseLocationEntity->id_product = $product->id;
-                    $warehouseLocationEntity->id_product_attribute = 0;
-                    $warehouseLocationEntity->id_warehouse = $product->warehouse;
-                    $warehouseLocationEntity->save();
-                    StockAvailable::synchronize($product->id);
-                } else {
-                    $this->warning(
-                        $this->translator->trans(
-                            'Warehouse did not exist, cannot set on product %name%',
-                            ['%name%' => $product->name[$this->languageId]],
-                            'Admin.Advparameters.Notification'
-                        )
-                    );
-                }
-            }
-        }
-
         if ($this->isMultistoreEnabled) {
             $shopIds = $product->id_shop_list;
         } else {
@@ -1302,62 +1231,7 @@ private function saveStock(Product $product, $validateOnly, $productExists)
             ];
         }
 
-        // stock available
-        if (isset($product->depends_on_stock)) {
-            /* @phpstan-ignore-next-line Data of the property `depends_on_stock` comes from database */
-            if ($product->depends_on_stock != 0 && $product->depends_on_stock != 1) {
-                $this->warning(
-                    $this->translator->trans(
-                        'Incorrect value for "Depends on stock" for product %name%',
-                        ['%name%' => $product->name[$this->languageId]],
-                        'Admin.Advparameters.Notification'
-                    )
-                );
-            /* @phpstan-ignore-next-line Data of properties `advanced_stock_management` & `depends_on_stock` comes from database */
-            } elseif ((!$product->advanced_stock_management || $product->advanced_stock_management == 0) && $product->depends_on_stock == 1) {
-                $this->warning(
-                    $this->translator->trans(
-                        'Advanced stock management is not enabled, cannot set "Depends on stock" for product %name%',
-                        ['%name%' => $product->name[$this->languageId]],
-                        'Admin.Advparameters.Notification'
-                    )
-                );
-            } elseif (!$validateOnly) {
-                StockAvailable::setProductDependsOnStock($product->id, $product->depends_on_stock);
-            }
-
-            // This code allows us to set qty and disable depends on stock
-            if (!$validateOnly) {
-                // if depends on stock and quantity, add quantity to stock
-                if ($product->depends_on_stock == 1) {
-                    $stockManager = StockManagerFactory::getManager();
-                    $price = str_replace(',', '.', (string) $product->wholesale_price);
-                    if ($price == 0) {
-                        $price = 0.000001;
-                    }
-                    $price = round(floatval($price), 6);
-                    $warehouse = new Warehouse($product->warehouse);
-                    $productAdded = $stockManager->addProduct(
-                        (int) $product->id,
-                        0,
-                        $warehouse,
-                        (int) $product->quantity,
-                        1,
-                        $price,
-                        true
-                    );
-
-                    if ($productAdded) {
-                        StockAvailable::synchronize((int) $product->id);
-                    }
-                } else {
-                    foreach ($shopIds as $shop) {
-                        StockAvailable::setQuantity((int) $product->id, 0, (int) $product->quantity, (int) $shop);
-                    }
-                }
-            }
-        } elseif (!$validateOnly) {
-            // if not depends_on_stock set, use normal qty
+        if (!$validateOnly) {
             foreach ($shopIds as $shop) {
                 StockAvailable::setQuantity((int) $product->id, 0, (int) $product->quantity, (int) $shop);
             }
diff --git a/src/Adapter/Import/ImportEntityDeleter.php b/src/Adapter/Import/ImportEntityDeleter.php
index 095a1fac8dd42..dc51fb27ad711 100644
--- a/src/Adapter/Import/ImportEntityDeleter.php
+++ b/src/Adapter/Import/ImportEntityDeleter.php
@@ -221,13 +221,11 @@ private function deleteProducts()
             'product_group_reduction_cache',
             'product_sale',
             'product_supplier',
-            'warehouse_product_location',
             'stock',
             'stock_available',
             'stock_mvt',
             'customization',
             'customization_field',
-            'supply_order_detail',
             'product_attribute',
             'product_attribute_shop',
             'product_attribute_combination',
diff --git a/src/Adapter/Order/CommandHandler/AbstractOrderCommandHandler.php b/src/Adapter/Order/CommandHandler/AbstractOrderCommandHandler.php
index 5bcf2821a7633..d706b6bc95000 100644
--- a/src/Adapter/Order/CommandHandler/AbstractOrderCommandHandler.php
+++ b/src/Adapter/Order/CommandHandler/AbstractOrderCommandHandler.php
@@ -29,23 +29,17 @@
 use Address;
 use Cart;
 use Configuration;
-use Context;
 use Country;
 use Currency;
 use Customer;
 use Order;
 use OrderDetail;
-use Pack;
 use PrestaShop\PrestaShop\Adapter\ContextStateManager;
 use PrestaShop\PrestaShop\Adapter\Order\AbstractOrderHandler;
 use PrestaShop\PrestaShop\Adapter\StockManager;
-use PrestaShop\PrestaShop\Core\Domain\Order\Exception\OrderException;
 use Product;
 use Shop;
 use StockAvailable;
-use StockManagerFactory;
-use StockMvt;
-use Warehouse;
 
 /**
  * Abstracts reusable functionality for Order subdomain handlers.
@@ -65,116 +59,29 @@ protected function reinjectQuantity(OrderDetail $orderDetail, $productQuantity,
         $reinjectableQuantity = (int) $orderDetail->product_quantity - (int) $orderDetail->product_quantity_reinjected;
         $quantityToReinject = $productQuantity > $reinjectableQuantity ? $reinjectableQuantity : $productQuantity;
 
-        $product = new Product(
+        StockAvailable::updateQuantity(
             $orderDetail->product_id,
-            false,
-            (int) Context::getContext()->language->id,
-            (int) $orderDetail->id_shop
+            $orderDetail->product_attribute_id,
+            $quantityToReinject,
+            $orderDetail->id_shop,
+            true,
+            [
+                'id_order' => $orderDetail->id_order,
+                'id_stock_mvt_reason' => Configuration::get('PS_STOCK_CUSTOMER_RETURN_REASON'),
+            ]
         );
 
-        if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')
-            && $product->advanced_stock_management
-            && $orderDetail->id_warehouse != 0
-        ) {
-            $manager = StockManagerFactory::getManager();
-            $movements = StockMvt::getNegativeStockMvts(
-                $orderDetail->id_order,
-                $orderDetail->product_id,
-                $orderDetail->product_attribute_id,
-                $quantityToReinject
-            );
-
-            foreach ($movements as $movement) {
-                if ($quantityToReinject > $movement['physical_quantity']) {
-                    $quantityToReinject = $movement['physical_quantity'];
-                }
-
-                if (Pack::isPack((int) $product->id)) {
-                    // Gets items
-                    if ($product->pack_stock_type == Pack::STOCK_TYPE_PRODUCTS_ONLY
-                        || $product->pack_stock_type == Pack::STOCK_TYPE_PACK_BOTH
-                        || ($product->pack_stock_type == Pack::STOCK_TYPE_DEFAULT
-                            && Configuration::get('PS_PACK_STOCK_TYPE') > 0)
-                    ) {
-                        $products_pack = Pack::getItems((int) $product->id, (int) Configuration::get('PS_LANG_DEFAULT'));
-                        // Foreach item
-                        foreach ($products_pack as $product_pack) {
-                            if ($product_pack->advanced_stock_management == 1) {
-                                $manager->addProduct(
-                                    $product_pack->id,
-                                    $product_pack->id_pack_product_attribute,
-                                    new Warehouse($movement['id_warehouse']),
-                                    $product_pack->pack_quantity * $quantityToReinject,
-                                    null,
-                                    $movement['price_te']
-                                );
-                            }
-                        }
-                    }
-
-                    if ($product->pack_stock_type == Pack::STOCK_TYPE_PACK_ONLY
-                        || $product->pack_stock_type == Pack::STOCK_TYPE_PACK_BOTH
-                        || (
-                            $product->pack_stock_type == Pack::STOCK_TYPE_DEFAULT
-                            && (Configuration::get('PS_PACK_STOCK_TYPE') == Pack::STOCK_TYPE_PACK_ONLY
-                                || Configuration::get('PS_PACK_STOCK_TYPE') == Pack::STOCK_TYPE_PACK_BOTH)
-                        )
-                    ) {
-                        $manager->addProduct(
-                            $orderDetail->product_id,
-                            $orderDetail->product_attribute_id,
-                            new Warehouse($movement['id_warehouse']),
-                            $quantityToReinject,
-                            null,
-                            $movement['price_te']
-                        );
-                    }
-                } else {
-                    $manager->addProduct(
-                        $orderDetail->product_id,
-                        $orderDetail->product_attribute_id,
-                        new Warehouse($movement['id_warehouse']),
-                        $quantityToReinject,
-                        null,
-                        $movement['price_te']
-                    );
-                }
-            }
-
-            $productId = $orderDetail->product_id;
-
-            if ($delete) {
-                $orderDetail->delete();
-            }
-
-            StockAvailable::synchronize($productId);
-        } elseif ($orderDetail->id_warehouse == 0) {
-            StockAvailable::updateQuantity(
-                $orderDetail->product_id,
-                $orderDetail->product_attribute_id,
-                $quantityToReinject,
-                $orderDetail->id_shop,
-                true,
-                [
-                    'id_order' => $orderDetail->id_order,
-                    'id_stock_mvt_reason' => Configuration::get('PS_STOCK_CUSTOMER_RETURN_REASON'),
-                ]
-            );
-
-            // sync all stock
-            (new StockManager())->updatePhysicalProductQuantity(
-                (int) $orderDetail->id_shop,
-                (int) Configuration::get('PS_OS_ERROR'),
-                (int) Configuration::get('PS_OS_CANCELED'),
-                null,
-                (int) $orderDetail->id_order
-            );
+        // sync all stock
+        (new StockManager())->updatePhysicalProductQuantity(
+            (int) $orderDetail->id_shop,
+            (int) Configuration::get('PS_OS_ERROR'),
+            (int) Configuration::get('PS_OS_CANCELED'),
+            null,
+            (int) $orderDetail->id_order
+        );
 
-            if ($delete) {
-                $orderDetail->delete();
-            }
-        } else {
-            throw new OrderException('This product cannot be re-stocked.');
+        if ($delete) {
+            $orderDetail->delete();
         }
     }
 
diff --git a/src/Adapter/Order/CommandHandler/AddProductToOrderHandler.php b/src/Adapter/Order/CommandHandler/AddProductToOrderHandler.php
index a6b084de18ee7..49de3d8fd1e57 100644
--- a/src/Adapter/Order/CommandHandler/AddProductToOrderHandler.php
+++ b/src/Adapter/Order/CommandHandler/AddProductToOrderHandler.php
@@ -211,7 +211,6 @@ public function handle(AddProductToOrderCommand $command)
                 $command->getProductPriceTaxExcluded(),
                 $command->getProductPriceTaxIncluded()
             );
-            StockAvailable::synchronize($product->id);
 
             $this->updateAffectedOrderDetails(
                 $order,
diff --git a/src/Adapter/Order/CommandHandler/BulkChangeOrderStatusHandler.php b/src/Adapter/Order/CommandHandler/BulkChangeOrderStatusHandler.php
index 000a2c13a9c49..bb76d0daf7eae 100644
--- a/src/Adapter/Order/CommandHandler/BulkChangeOrderStatusHandler.php
+++ b/src/Adapter/Order/CommandHandler/BulkChangeOrderStatusHandler.php
@@ -39,7 +39,6 @@
 use PrestaShop\PrestaShop\Core\Domain\Order\Exception\OrderException;
 use PrestaShop\PrestaShop\Core\Domain\Order\Exception\OrderNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Order\ValueObject\OrderId;
-use StockAvailable;
 
 /**
  * @internal
@@ -97,14 +96,6 @@ public function handle(BulkChangeOrderStatusCommand $command)
 
                 continue;
             }
-
-            if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) {
-                foreach ($order->getProducts() as $product) {
-                    if (StockAvailable::dependsOnStock($product['product_id'])) {
-                        StockAvailable::synchronize($product['product_id'], (int) $product['id_shop']);
-                    }
-                }
-            }
         }
 
         if (!empty($ordersWithFailedToUpdateStatus)
diff --git a/src/Adapter/Order/CommandHandler/UpdateOrderStatusHandler.php b/src/Adapter/Order/CommandHandler/UpdateOrderStatusHandler.php
index 7bb4c997ce23b..259cd89e7eb8d 100644
--- a/src/Adapter/Order/CommandHandler/UpdateOrderStatusHandler.php
+++ b/src/Adapter/Order/CommandHandler/UpdateOrderStatusHandler.php
@@ -37,7 +37,6 @@
 use PrestaShop\PrestaShop\Core\Domain\Order\CommandHandler\UpdateOrderStatusHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Order\Exception\ChangeOrderStatusException;
 use PrestaShop\PrestaShop\Core\Domain\Order\Exception\OrderException;
-use StockAvailable;
 
 /**
  * @internal
@@ -81,18 +80,7 @@ public function handle(UpdateOrderStatusCommand $command)
         }
 
         // Save all changes
-        $historyAdded = $history->addWithemail(true, $templateVars);
-
-        if ($historyAdded) {
-            // synchronizes quantities if needed..
-            if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) {
-                foreach ($order->getProducts() as $product) {
-                    if (StockAvailable::dependsOnStock($product['product_id'])) {
-                        StockAvailable::synchronize($product['product_id'], (int) $product['id_shop']);
-                    }
-                }
-            }
-
+        if ($history->addWithemail(true, $templateVars)) {
             return;
         }
 
diff --git a/src/Adapter/Order/OrderProductQuantityUpdater.php b/src/Adapter/Order/OrderProductQuantityUpdater.php
index 84964b5763d9e..1dfd3d57f59b9 100644
--- a/src/Adapter/Order/OrderProductQuantityUpdater.php
+++ b/src/Adapter/Order/OrderProductQuantityUpdater.php
@@ -30,7 +30,6 @@
 
 use Cart;
 use Configuration;
-use Context;
 use Currency;
 use Customer;
 use Customization;
@@ -38,7 +37,6 @@
 use Order;
 use OrderDetail;
 use OrderInvoice;
-use Pack;
 use PrestaShop\PrestaShop\Adapter\Cart\Comparator\CartProductsComparator;
 use PrestaShop\PrestaShop\Adapter\Cart\Comparator\CartProductUpdate;
 use PrestaShop\PrestaShop\Adapter\ContextStateManager;
@@ -49,9 +47,6 @@
 use Product;
 use Shop;
 use StockAvailable;
-use StockManagerFactory;
-use StockMvt;
-use Warehouse;
 
 /**
  * Increase or decrease quantity of an order's product.
@@ -389,116 +384,29 @@ protected function reinjectQuantity(
         $reinjectableQuantity = $oldQuantity - $newQuantity;
         $quantityToReinject = $oldQuantity > $reinjectableQuantity ? $reinjectableQuantity : $oldQuantity;
 
-        $product = new Product(
+        StockAvailable::updateQuantity(
             $orderDetail->product_id,
-            false,
-            (int) Context::getContext()->language->id,
-            (int) $orderDetail->id_shop
+            $orderDetail->product_attribute_id,
+            $quantityToReinject,
+            $orderDetail->id_shop,
+            true,
+            [
+                'id_order' => $orderDetail->id_order,
+                'id_stock_mvt_reason' => Configuration::get('PS_STOCK_CUSTOMER_RETURN_REASON'),
+            ]
         );
 
-        if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')
-            && $product->advanced_stock_management
-            && $orderDetail->id_warehouse != 0
-        ) {
-            $manager = StockManagerFactory::getManager();
-            $movements = StockMvt::getNegativeStockMvts(
-                $orderDetail->id_order,
-                $orderDetail->product_id,
-                $orderDetail->product_attribute_id,
-                $quantityToReinject
-            );
-
-            foreach ($movements as $movement) {
-                if ($quantityToReinject > $movement['physical_quantity']) {
-                    $quantityToReinject = $movement['physical_quantity'];
-                }
-
-                if (Pack::isPack((int) $product->id)) {
-                    // Gets items
-                    if ($product->pack_stock_type == Pack::STOCK_TYPE_PRODUCTS_ONLY
-                        || $product->pack_stock_type == Pack::STOCK_TYPE_PACK_BOTH
-                        || ($product->pack_stock_type == Pack::STOCK_TYPE_DEFAULT
-                            && Configuration::get('PS_PACK_STOCK_TYPE') > 0)
-                    ) {
-                        $products_pack = Pack::getItems((int) $product->id, (int) Configuration::get('PS_LANG_DEFAULT'));
-                        // Foreach item
-                        foreach ($products_pack as $product_pack) {
-                            if ($product_pack->advanced_stock_management == 1) {
-                                $manager->addProduct(
-                                    $product_pack->id,
-                                    $product_pack->id_pack_product_attribute,
-                                    new Warehouse($movement['id_warehouse']),
-                                    $product_pack->pack_quantity * $quantityToReinject,
-                                    null,
-                                    $movement['price_te']
-                                );
-                            }
-                        }
-                    }
-
-                    if ($product->pack_stock_type == Pack::STOCK_TYPE_PACK_ONLY
-                        || $product->pack_stock_type == Pack::STOCK_TYPE_PACK_BOTH
-                        || (
-                            $product->pack_stock_type == Pack::STOCK_TYPE_DEFAULT
-                            && (Configuration::get('PS_PACK_STOCK_TYPE') == Pack::STOCK_TYPE_PACK_ONLY
-                                || Configuration::get('PS_PACK_STOCK_TYPE') == Pack::STOCK_TYPE_PACK_BOTH)
-                        )
-                    ) {
-                        $manager->addProduct(
-                            $orderDetail->product_id,
-                            $orderDetail->product_attribute_id,
-                            new Warehouse($movement['id_warehouse']),
-                            $quantityToReinject,
-                            null,
-                            $movement['price_te']
-                        );
-                    }
-                } else {
-                    $manager->addProduct(
-                        $orderDetail->product_id,
-                        $orderDetail->product_attribute_id,
-                        new Warehouse($movement['id_warehouse']),
-                        $quantityToReinject,
-                        null,
-                        $movement['price_te']
-                    );
-                }
-            }
-
-            $productId = $orderDetail->product_id;
-
-            if ($delete) {
-                $orderDetail->delete();
-            }
-
-            StockAvailable::synchronize($productId);
-        } elseif ($orderDetail->id_warehouse == 0) {
-            StockAvailable::updateQuantity(
-                $orderDetail->product_id,
-                $orderDetail->product_attribute_id,
-                $quantityToReinject,
-                $orderDetail->id_shop,
-                true,
-                [
-                    'id_order' => $orderDetail->id_order,
-                    'id_stock_mvt_reason' => Configuration::get('PS_STOCK_CUSTOMER_RETURN_REASON'),
-                ]
-            );
-
-            // sync all stock
-            (new StockManager())->updatePhysicalProductQuantity(
-                (int) $orderDetail->id_shop,
-                (int) Configuration::get('PS_OS_ERROR'),
-                (int) Configuration::get('PS_OS_CANCELED'),
-                null,
-                (int) $orderDetail->id_order
-            );
+        // sync all stock
+        (new StockManager())->updatePhysicalProductQuantity(
+            (int) $orderDetail->id_shop,
+            (int) Configuration::get('PS_OS_ERROR'),
+            (int) Configuration::get('PS_OS_CANCELED'),
+            null,
+            (int) $orderDetail->id_order
+        );
 
-            if ($delete) {
-                $orderDetail->delete();
-            }
-        } else {
-            throw new OrderException('This product cannot be re-stocked.');
+        if ($delete) {
+            $orderDetail->delete();
         }
     }
 
diff --git a/src/Adapter/Order/QueryHandler/GetOrderProductsForViewingHandler.php b/src/Adapter/Order/QueryHandler/GetOrderProductsForViewingHandler.php
index 0b234f9acc5be..b6543259c1e89 100644
--- a/src/Adapter/Order/QueryHandler/GetOrderProductsForViewingHandler.php
+++ b/src/Adapter/Order/QueryHandler/GetOrderProductsForViewingHandler.php
@@ -51,8 +51,6 @@
 use Product;
 use Shop;
 use StockAvailable;
-use Warehouse;
-use WarehouseProductLocation;
 
 /**
  * Handles GetOrderProductsForViewing query using legacy object models
@@ -140,20 +138,6 @@ public function handle(GetOrderProductsForViewing $query): OrderProductsForViewi
             $product['refund_history'] = OrderSlip::getProductSlipDetail($product['id_order_detail']);
             $product['return_history'] = OrderReturn::getProductReturnDetail($product['id_order_detail']);
 
-            if ($product['id_warehouse'] != 0) {
-                $warehouse = new Warehouse((int) $product['id_warehouse']);
-                $product['warehouse_name'] = $warehouse->name;
-                $warehouse_location = WarehouseProductLocation::getProductLocation($product['product_id'], $product['product_attribute_id'], $product['id_warehouse']);
-                if (!empty($warehouse_location)) {
-                    $product['warehouse_location'] = $warehouse_location;
-                } else {
-                    $product['warehouse_location'] = false;
-                }
-            } else {
-                $product['warehouse_name'] = '--';
-                $product['warehouse_location'] = false;
-            }
-
             $pack_items = $product['cache_is_pack'] ? Pack::getItemTable($product['id_product'], $this->contextLanguageId, true) : [];
             foreach ($pack_items as &$pack_item) {
                 $pack_item['current_stock'] = StockAvailable::getQuantityAvailableByProduct($pack_item['id_product'], $pack_item['id_product_attribute'], $pack_item['id_shop']);
diff --git a/src/Adapter/Order/Refund/OrderSlipCreator.php b/src/Adapter/Order/Refund/OrderSlipCreator.php
index da8367a6cada5..835ccd30c5d58 100644
--- a/src/Adapter/Order/Refund/OrderSlipCreator.php
+++ b/src/Adapter/Order/Refund/OrderSlipCreator.php
@@ -42,7 +42,6 @@
 use PrestaShop\PrestaShop\Core\Domain\Order\VoucherRefundType;
 use PrestaShopDatabaseException;
 use PrestaShopException;
-use StockAvailable;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use TaxCalculator;
 use TaxManagerFactory;
@@ -144,13 +143,6 @@ public function create(
                 true,
                 (int) $order->id_shop
             );
-
-            /** @var OrderDetail $orderDetail */
-            foreach ($orderRefundSummary->getOrderDetails() as $orderDetail) {
-                if ($this->configuration->get('PS_ADVANCED_STOCK_MANAGEMENT')) {
-                    StockAvailable::synchronize($orderDetail->product_id);
-                }
-            }
         } else {
             throw new InvalidCancelProductException(InvalidCancelProductException::INVALID_AMOUNT);
         }
diff --git a/src/Adapter/Presenter/Product/ProductLazyArray.php b/src/Adapter/Presenter/Product/ProductLazyArray.php
index cb474ff8a66f2..244e08da6b8db 100644
--- a/src/Adapter/Presenter/Product/ProductLazyArray.php
+++ b/src/Adapter/Presenter/Product/ProductLazyArray.php
@@ -1059,7 +1059,6 @@ protected function getProductAttributeWhitelist()
             'active',
             'add_to_cart_url',
             'additional_shipping_cost',
-            'advanced_stock_management',
             'allow_oosp',
             'attachments',
             'attribute_price',
diff --git a/src/Adapter/Product/AdminProductWrapper.php b/src/Adapter/Product/AdminProductWrapper.php
index 5daedc591c7f4..88750d9a7adf2 100644
--- a/src/Adapter/Product/AdminProductWrapper.php
+++ b/src/Adapter/Product/AdminProductWrapper.php
@@ -194,7 +194,6 @@ public function processProductAttribute($product, $combinationValues)
             $combinationValues['attribute_mpn']
         );
 
-        StockAvailable::setProductDependsOnStock((int) $product->id, $product->depends_on_stock, null, $id_product_attribute);
         StockAvailable::setProductOutOfStock((int) $product->id, $product->out_of_stock, null, $id_product_attribute);
         StockAvailable::setLocation((int) $product->id, $combinationValues['attribute_location'], null, $id_product_attribute);
 
@@ -224,8 +223,6 @@ public function processProductAttribute($product, $combinationValues)
     /**
      * Update a quantity for a product or a combination.
      *
-     * Does not work in Advanced stock management.
-     *
      * @param Product $product
      * @param int $quantity
      * @param int $forAttributeId
@@ -257,20 +254,6 @@ public function processLocation(Product $product, $location)
         StockAvailable::setLocation($product->id, $location);
     }
 
-    /**
-     * Set if a product depends on stock (ASM). For a product or a combination.
-     *
-     * Does work only in Advanced stock management.
-     *
-     * @param Product $product
-     * @param bool $dependsOnStock
-     * @param int $forAttributeId
-     */
-    public function processDependsOnStock(Product $product, $dependsOnStock, $forAttributeId = 0)
-    {
-        StockAvailable::setProductDependsOnStock((int) $product->id, $dependsOnStock, null, $forAttributeId);
-    }
-
     /**
      * Add/Update a SpecificPrice object.
      *
diff --git a/src/Adapter/Product/Stock/Update/ProductStockUpdater.php b/src/Adapter/Product/Stock/Update/ProductStockUpdater.php
index 758592ec68cec..786a722321589 100644
--- a/src/Adapter/Product/Stock/Update/ProductStockUpdater.php
+++ b/src/Adapter/Product/Stock/Update/ProductStockUpdater.php
@@ -121,10 +121,6 @@ public function update(ProductId $productId, ProductStockProperties $properties,
         }
 
         $this->updateStockByShopConstraint($stockAvailable, $properties, $shopConstraint);
-
-        if ($this->isAdvancedStockEnabled($shopConstraint) && $product->depends_on_stock) {
-            StockAvailable::synchronize($product->id);
-        }
     }
 
     /**
@@ -185,10 +181,6 @@ public function resetStock(ProductId $productId, ShopConstraint $shopConstraint)
                 new OrderStateId((int) $this->configuration->get('PS_OS_ERROR', null, $shopConstraint)),
                 new OrderStateId((int) $this->configuration->get('PS_OS_CANCELED', null, $shopConstraint))
             );
-
-            if ($this->isAdvancedStockEnabled($shopConstraint)) {
-                StockAvailable::synchronize($productId->getValue(), $shopId->getValue());
-            }
         }
     }
 
@@ -323,9 +315,4 @@ private function saveMovement(StockAvailable $stockAvailable, StockModification
             ]
         );
     }
-
-    private function isAdvancedStockEnabled(ShopConstraint $shopConstraint): bool
-    {
-        return (bool) $this->configuration->get('PS_ADVANCED_STOCK_MANAGEMENT', null, $shopConstraint);
-    }
 }
diff --git a/src/Adapter/Product/Stock/Validate/StockAvailableValidator.php b/src/Adapter/Product/Stock/Validate/StockAvailableValidator.php
index 966d10afad29a..19fe746fff187 100644
--- a/src/Adapter/Product/Stock/Validate/StockAvailableValidator.php
+++ b/src/Adapter/Product/Stock/Validate/StockAvailableValidator.php
@@ -48,7 +48,6 @@ public function validate(StockAvailable $stockAvailable): void
         $this->validateStockAvailableProperty($stockAvailable, 'quantity', ProductStockConstraintException::INVALID_QUANTITY);
         $this->validateStockAvailableProperty($stockAvailable, 'location', ProductStockConstraintException::INVALID_LOCATION);
         $this->validateStockAvailableProperty($stockAvailable, 'out_of_stock', ProductStockConstraintException::INVALID_OUT_OF_STOCK);
-        $this->validateStockAvailableProperty($stockAvailable, 'depends_on_stock');
         $this->validateStockAvailableProperty($stockAvailable, 'id_product');
         $this->validateStockAvailableProperty($stockAvailable, 'id_product_attribute');
         $this->validateStockAvailableProperty($stockAvailable, 'id_shop');
diff --git a/src/Adapter/Profile/Employee/CommandHandler/AbstractEmployeeHandler.php b/src/Adapter/Profile/Employee/CommandHandler/AbstractEmployeeHandler.php
index b5130ca122606..f9785272deba7 100644
--- a/src/Adapter/Profile/Employee/CommandHandler/AbstractEmployeeHandler.php
+++ b/src/Adapter/Profile/Employee/CommandHandler/AbstractEmployeeHandler.php
@@ -30,11 +30,9 @@
 use Employee;
 use PrestaShop\PrestaShop\Adapter\Domain\AbstractObjectModelHandler;
 use PrestaShop\PrestaShop\Core\Domain\Employee\Exception\AdminEmployeeException;
-use PrestaShop\PrestaShop\Core\Domain\Employee\Exception\CannotDeleteWarehouseManagerException;
 use PrestaShop\PrestaShop\Core\Domain\Employee\Exception\EmployeeCannotChangeItselfException;
 use PrestaShop\PrestaShop\Core\Domain\Employee\Exception\EmployeeNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Employee\ValueObject\EmployeeId;
-use Warehouse;
 
 /**
  * Class AbstractEmployeeStatusHandler.
@@ -77,22 +75,4 @@ protected function assertLoggedInEmployeeIsNotTheSameAsBeingUpdatedEmployee(Empl
             throw new EmployeeCannotChangeItselfException('Employee cannot change status of itself.', EmployeeCannotChangeItselfException::CANNOT_CHANGE_STATUS);
         }
     }
-
-    /**
-     * Make sure that given employee does not manage any warehouse.
-     *
-     * Even though Warehouse feature was removed in 1.7
-     * but the code related to it still exists
-     * thus assertion is kept for BC i guess.
-     *
-     * @param Employee $employee
-     */
-    protected function assertEmployeeDoesNotManageWarehouse(Employee $employee)
-    {
-        $warehouses = Warehouse::getWarehousesByEmployee($employee->id);
-
-        if (count($warehouses) > 0) {
-            throw new CannotDeleteWarehouseManagerException(sprintf('Employee with id %s is warehouse manager and cannot be deleted.', $employee->id));
-        }
-    }
 }
diff --git a/src/Adapter/Profile/Employee/CommandHandler/BulkDeleteEmployeeHandler.php b/src/Adapter/Profile/Employee/CommandHandler/BulkDeleteEmployeeHandler.php
index 0e66ea555b2ec..749cc6f0cc3ea 100644
--- a/src/Adapter/Profile/Employee/CommandHandler/BulkDeleteEmployeeHandler.php
+++ b/src/Adapter/Profile/Employee/CommandHandler/BulkDeleteEmployeeHandler.php
@@ -49,7 +49,6 @@ public function handle(BulkDeleteEmployeeCommand $command)
             $this->assertEmployeeWasFoundById($employeeId, $employee);
             $this->assertLoggedInEmployeeIsNotTheSameAsBeingUpdatedEmployee($employee);
             $this->assertEmployeeIsNotTheOnlyAdminInShop($employee);
-            $this->assertEmployeeDoesNotManageWarehouse($employee);
 
             if (!$employee->delete()) {
                 throw new CannotDeleteEmployeeException($employeeId, sprintf('Cannot delete employee with id "%s".', $employeeId->getValue()));
diff --git a/src/Adapter/Profile/Employee/CommandHandler/DeleteEmployeeHandler.php b/src/Adapter/Profile/Employee/CommandHandler/DeleteEmployeeHandler.php
index a2e1a3ab82530..b337bb8c55ee8 100644
--- a/src/Adapter/Profile/Employee/CommandHandler/DeleteEmployeeHandler.php
+++ b/src/Adapter/Profile/Employee/CommandHandler/DeleteEmployeeHandler.php
@@ -49,7 +49,6 @@ public function handle(DeleteEmployeeCommand $command)
         $this->assertEmployeeWasFoundById($employeeId, $employee);
         $this->assertLoggedInEmployeeIsNotTheSameAsBeingUpdatedEmployee($employee);
         $this->assertEmployeeIsNotTheOnlyAdminInShop($employee);
-        $this->assertEmployeeDoesNotManageWarehouse($employee);
 
         if (!$employee->delete()) {
             throw new CannotDeleteEmployeeException($employeeId, sprintf('Cannot delete employee with id "%s".', $employeeId->getValue()));
diff --git a/src/Adapter/StockManager.php b/src/Adapter/StockManager.php
index 56f2f98d1f48d..889f493d4b8ab 100644
--- a/src/Adapter/StockManager.php
+++ b/src/Adapter/StockManager.php
@@ -27,7 +27,6 @@
 namespace PrestaShop\PrestaShop\Adapter;
 
 use Db;
-use PrestaShop\PrestaShop\Adapter\Configuration as ConfigurationAdapter;
 use PrestaShop\PrestaShop\Adapter\Shop\Context as ShopAdapter;
 use PrestaShopBundle\Service\DataProvider\StockInterface;
 use StockAvailable;
@@ -84,10 +83,17 @@ public function getStockAvailableByProduct($product, $id_product_attribute = nul
      * Returns True if Stocks are managed by a module (or by legacy ASM).
      *
      * @return bool True if Stocks are managed by a module (or by legacy ASM)
+     *
+     * @deprecated Since 9.0 and will be removed in 10.0
      */
     public function isAsmGloballyActivated()
     {
-        return (bool) (new ConfigurationAdapter())->get('PS_ADVANCED_STOCK_MANAGEMENT');
+        @trigger_error(sprintf(
+            '%s is deprecated since 9.0 and will be removed in 10.0.',
+            __METHOD__
+        ), E_USER_DEPRECATED);
+
+        return false;
     }
 
     /**
@@ -230,7 +236,7 @@ public function getStockAvailableIdByProductId($productId, $productAttributeId =
      * @param int $productId
      * @param int $shopId Optional : gets context if null @see Context::getContext()
      *
-     * @return bool : depends on stock @see $depends_on_stock
+     * @return bool True if product is orderable when out of stock
      */
     public function outOfStock($productId, $shopId = null)
     {
diff --git a/src/Adapter/Supplier/CommandHandler/AbstractDeleteSupplierHandler.php b/src/Adapter/Supplier/CommandHandler/AbstractDeleteSupplierHandler.php
index b20c84739ba12..06eb753b81155 100644
--- a/src/Adapter/Supplier/CommandHandler/AbstractDeleteSupplierHandler.php
+++ b/src/Adapter/Supplier/CommandHandler/AbstractDeleteSupplierHandler.php
@@ -30,10 +30,8 @@
 use Db;
 use PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater;
 use PrestaShop\PrestaShop\Adapter\Supplier\SupplierAddressProvider;
-use PrestaShop\PrestaShop\Adapter\Supplier\SupplierOrderValidator;
 use PrestaShop\PrestaShop\Core\Domain\Product\ValueObject\ProductId;
 use PrestaShop\PrestaShop\Core\Domain\Supplier\Exception\CannotDeleteSupplierAddressException;
-use PrestaShop\PrestaShop\Core\Domain\Supplier\Exception\CannotDeleteSupplierException;
 use PrestaShop\PrestaShop\Core\Domain\Supplier\Exception\CannotDeleteSupplierProductRelationException;
 use PrestaShop\PrestaShop\Core\Domain\Supplier\Exception\SupplierException;
 use PrestaShop\PrestaShop\Core\Domain\Supplier\Exception\SupplierNotFoundException;
@@ -47,11 +45,6 @@
  */
 abstract class AbstractDeleteSupplierHandler
 {
-    /**
-     * @var SupplierOrderValidator
-     */
-    private $supplierOrderValidator;
-
     /**
      * @var string
      */
@@ -68,18 +61,15 @@ abstract class AbstractDeleteSupplierHandler
     private $productSupplierUpdater;
 
     /**
-     * @param SupplierOrderValidator $supplierOrderValidator
      * @param SupplierAddressProvider $supplierAddressProvider
      * @param ProductSupplierUpdater $productSupplierUpdater
      * @param string $dbPrefix
      */
     public function __construct(
-        SupplierOrderValidator $supplierOrderValidator,
         SupplierAddressProvider $supplierAddressProvider,
         ProductSupplierUpdater $productSupplierUpdater,
         string $dbPrefix
     ) {
-        $this->supplierOrderValidator = $supplierOrderValidator;
         $this->dbPrefix = $dbPrefix;
         $this->supplierAddressProvider = $supplierAddressProvider;
         $this->productSupplierUpdater = $productSupplierUpdater;
@@ -102,16 +92,6 @@ protected function removeSupplier(SupplierId $supplierId)
                 throw new SupplierNotFoundException(sprintf('Supplier object with id "%s" was not found for deletion.', $supplierId->getValue()));
             }
 
-            if ($this->hasPendingOrders($supplierId)) {
-                throw new CannotDeleteSupplierException(
-                    sprintf(
-                        'Supplier with id %d cannot be deleted due to it has pending orders',
-                        $supplierId->getValue()
-                    ),
-                    CannotDeleteSupplierException::HAS_PENDING_ORDERS
-                );
-            }
-
             if (false === $this->deleteProductSupplierRelation($supplierId)) {
                 throw new CannotDeleteSupplierProductRelationException(
                     sprintf(
@@ -186,16 +166,4 @@ private function deleteSupplierAddress(SupplierId $supplierId)
 
         return true;
     }
-
-    /**
-     * Checks if the given supplier has pending orders.
-     *
-     * @param SupplierId $supplierId
-     *
-     * @return bool
-     */
-    private function hasPendingOrders(SupplierId $supplierId)
-    {
-        return $this->supplierOrderValidator->hasPendingOrders($supplierId->getValue());
-    }
 }
diff --git a/src/Adapter/Supplier/SupplierOrderValidator.php b/src/Adapter/Supplier/SupplierOrderValidator.php
index 2bc4198da0e17..58cc3987503b0 100644
--- a/src/Adapter/Supplier/SupplierOrderValidator.php
+++ b/src/Adapter/Supplier/SupplierOrderValidator.php
@@ -26,10 +26,10 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Supplier;
 
-use SupplyOrder;
-
 /**
  * Class SupplierOrderValidator is responsible for handling supplier and its corresponding order validity.
+ *
+ * @deprecated since 9.0 and will be removed in 10.0
  */
 class SupplierOrderValidator
 {
@@ -42,6 +42,11 @@ class SupplierOrderValidator
      */
     public function hasPendingOrders($supplierId)
     {
-        return SupplyOrder::supplierHasPendingOrders($supplierId);
+        @trigger_error(sprintf(
+            '%s is deprecated since 9.0 and will be removed in 10.0.',
+            __METHOD__
+        ), E_USER_DEPRECATED);
+
+        return false;
     }
 }
diff --git a/src/Adapter/Warehouse/WarehouseDataProvider.php b/src/Adapter/Warehouse/WarehouseDataProvider.php
deleted file mode 100644
index 9f3e61abbbadd..0000000000000
--- a/src/Adapter/Warehouse/WarehouseDataProvider.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-namespace PrestaShop\PrestaShop\Adapter\Warehouse;
-
-use Warehouse;
-use WarehouseProductLocation;
-
-/**
- * @deprecated since 8.1 and will be removed in next major.
- *
- * This class will provide data from DB / ORM about Warehouse.
- */
-class WarehouseDataProvider
-{
-    /**
-     * Get product warehouses.
-     *
-     * @param int $id_product
-     *
-     * @return array Warehouses
-     */
-    public function getWarehouseProductLocations($id_product)
-    {
-        $collection = WarehouseProductLocation::getCollection($id_product);
-
-        return $collection->getResults();
-    }
-
-    /**
-     * Get all warehouses.
-     *
-     * @param bool $ignore_shop Optional, false by default - Allows to get only the warehouses that are associated to one/some shops (@see $id_shop)
-     * @param int $id_shop optional, Context::shop::Id by default - Allows to define a specific shop to filter
-     *
-     * @return array Warehouses (ID, reference/name concatenated)
-     */
-    public function getWarehouses($ignore_shop = false, $id_shop = null)
-    {
-        return Warehouse::getWarehouses($ignore_shop, $id_shop);
-    }
-
-    /**
-     * For a given product and warehouse, gets the product warehouse data.
-     *
-     * @param int $id_product
-     * @param int $id_product_attribute
-     * @param int $id_warehouse
-     *
-     * @return array
-     */
-    public function getWarehouseProductLocationData($id_product, $id_product_attribute, $id_warehouse)
-    {
-        $location = WarehouseProductLocation::getProductLocation($id_product, $id_product_attribute, $id_warehouse);
-        // for 'activated', we test if $location is ===false or ==="", that's the only difference to know it...
-        return ['location' => $location, 'activated' => ($location !== false), 'product_id' => $id_product];
-    }
-}
diff --git a/src/Core/Domain/Employee/Exception/CannotDeleteWarehouseManagerException.php b/src/Core/Domain/Employee/Exception/CannotDeleteWarehouseManagerException.php
deleted file mode 100644
index 1460aaf424b32..0000000000000
--- a/src/Core/Domain/Employee/Exception/CannotDeleteWarehouseManagerException.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-namespace PrestaShop\PrestaShop\Core\Domain\Employee\Exception;
-
-/**
- * Is thrown when warehouse manager cannot be deleted
- */
-class CannotDeleteWarehouseManagerException extends EmployeeException
-{
-}
diff --git a/src/Core/Domain/Product/Pack/Exception/ProductPackConstraintException.php b/src/Core/Domain/Product/Pack/Exception/ProductPackConstraintException.php
index e223c03f3975e..145460ef2b072 100644
--- a/src/Core/Domain/Product/Pack/Exception/ProductPackConstraintException.php
+++ b/src/Core/Domain/Product/Pack/Exception/ProductPackConstraintException.php
@@ -49,8 +49,7 @@ class ProductPackConstraintException extends ProductPackException
     public const INVALID_STOCK_TYPE = 30;
 
     /**
-     * Code is used when trying to link a pack stock with its product and one of them
-     * has no advanced stock
+     * Code is used when trying to link a pack stock with its product and one of them has no advanced stock
      */
     public const INCOMPATIBLE_STOCK_TYPE = 40;
 }
diff --git a/src/Core/Import/EntityField/Provider/CombinationFieldsProvider.php b/src/Core/Import/EntityField/Provider/CombinationFieldsProvider.php
index 9a10b49bc3969..f84ad67f0a2f5 100644
--- a/src/Core/Import/EntityField/Provider/CombinationFieldsProvider.php
+++ b/src/Core/Import/EntityField/Provider/CombinationFieldsProvider.php
@@ -84,21 +84,6 @@ public function getCollection()
                 $this->trans('ID / Name of the store', 'Admin.Advparameters.Feature'),
                 $this->trans('Ignore this field if you don\'t use the Multistore tool. If you leave this field empty, the default store will be used.', 'Admin.Advparameters.Help')
             ),
-            new EntityField(
-                'advanced_stock_management',
-                $this->trans('Advanced stock management', 'Admin.Advparameters.Feature'),
-                $this->trans('Enable advanced stock management on product (0 = No, 1 = Yes)', 'Admin.Advparameters.Help')
-            ),
-            new EntityField(
-                'depends_on_stock',
-                $this->trans('Depends on stock', 'Admin.Advparameters.Feature'),
-                $this->trans('0 = Use quantity set in product, 1 = Use quantity from warehouse.', 'Admin.Advparameters.Help')
-            ),
-            new EntityField(
-                'warehouse',
-                $this->trans('Warehouse', 'Admin.Advparameters.Feature'),
-                $this->trans('ID of the warehouse to set as storage.', 'Admin.Advparameters.Help')
-            ),
         ];
 
         return EntityFieldCollection::createFromArray($fields);
diff --git a/src/Core/Import/EntityField/Provider/ProductFieldsProvider.php b/src/Core/Import/EntityField/Provider/ProductFieldsProvider.php
index 44c950623fbb0..b7384b64f210f 100644
--- a/src/Core/Import/EntityField/Provider/ProductFieldsProvider.php
+++ b/src/Core/Import/EntityField/Provider/ProductFieldsProvider.php
@@ -148,30 +148,6 @@ public function getCollection()
                     'Admin.Advparameters.Help'
                 )
             ),
-            new EntityField(
-                'advanced_stock_management',
-                $this->trans('Advanced stock management', 'Admin.Advparameters.Feature'),
-                $this->trans(
-                    'Enable advanced stock management on product (0 = No, 1 = Yes).',
-                    'Admin.Advparameters.Help'
-                )
-            ),
-            new EntityField(
-                'depends_on_stock',
-                $this->trans('Depends on stock', 'Admin.Advparameters.Feature'),
-                $this->trans(
-                    '0 = Use quantity set in product, 1 = Use quantity from warehouse.',
-                    'Admin.Advparameters.Help'
-                )
-            ),
-            new EntityField(
-                'warehouse',
-                $this->trans('Warehouse', 'Admin.Advparameters.Feature'),
-                $this->trans(
-                    'ID of the warehouse to set as storage.',
-                    'Admin.Advparameters.Help'
-                )
-            ),
             new EntityField('accessories', $this->trans('Accessories (x,y,z...)', 'Admin.Advparameters.Feature')),
         ];
 
diff --git a/src/Core/Stock/StockManager.php b/src/Core/Stock/StockManager.php
index f1957fba50f7f..9b24ff671186e 100644
--- a/src/Core/Stock/StockManager.php
+++ b/src/Core/Stock/StockManager.php
@@ -400,10 +400,6 @@ private function prepareMovement($productId, $productAttributeId, $deltaQuantity
                     $stockMvt->setIdStockMvtReason((int) $params['id_stock_mvt_reason']);
                 }
 
-                if (!empty($params['id_supply_order'])) {
-                    $stockMvt->setIdSupplyOrder((int) $params['id_supply_order']);
-                }
-
                 $stockMvt->setSign($deltaQuantity >= 1 ? 1 : -1);
                 $stockMvt->setPhysicalQuantity(abs($deltaQuantity));
 
diff --git a/src/PrestaShopBundle/Bridge/Smarty/HeaderConfigurator.php b/src/PrestaShopBundle/Bridge/Smarty/HeaderConfigurator.php
index 7454c957c8965..b156ed872731d 100644
--- a/src/PrestaShopBundle/Bridge/Smarty/HeaderConfigurator.php
+++ b/src/PrestaShopBundle/Bridge/Smarty/HeaderConfigurator.php
@@ -283,7 +283,7 @@ private function getTabs(ControllerConfiguration $controllerConfiguration, $pare
         foreach ($tabs as $index => $tab) {
             if (!Tab::checkTabRights($tab['id_tab'])
                 || !$tab['enabled']
-                || ($tab['class_name'] == 'AdminStock' && $this->configuration->get('PS_ADVANCED_STOCK_MANAGEMENT') == 0)
+                || $tab['class_name'] == 'AdminStock'
                 || $tab['class_name'] == 'AdminCarrierWizard') {
                 unset($tabs[$index]);
 
diff --git a/src/PrestaShopBundle/Controller/Admin/ProductController.php b/src/PrestaShopBundle/Controller/Admin/ProductController.php
index 6dc05d083b4d3..45c42f4f588ba 100644
--- a/src/PrestaShopBundle/Controller/Admin/ProductController.php
+++ b/src/PrestaShopBundle/Controller/Admin/ProductController.php
@@ -33,7 +33,6 @@
 use PrestaShop\PrestaShop\Adapter\Product\FilterCategoriesRequestPurifier;
 use PrestaShop\PrestaShop\Adapter\Product\ListParametersUpdater;
 use PrestaShop\PrestaShop\Adapter\Tax\TaxRuleDataProvider;
-use PrestaShop\PrestaShop\Adapter\Warehouse\WarehouseDataProvider;
 use PrestaShop\PrestaShop\Core\Domain\Product\Command\UpdateProductCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\Exception\CannotUpdateProductException;
 use PrestaShop\PrestaShop\Core\Domain\Product\Exception\ProductConstraintException;
@@ -63,7 +62,6 @@
 use PrestaShopBundle\Model\Product\AdminModelAdapter;
 use PrestaShopBundle\Security\Annotation\AdminSecurity;
 use PrestaShopBundle\Service\DataProvider\Admin\ProductInterface as ProductInterfaceProvider;
-use PrestaShopBundle\Service\DataProvider\StockInterface;
 use PrestaShopBundle\Service\DataUpdater\Admin\ProductInterface as ProductInterfaceUpdater;
 use PrestaShopBundle\Service\Hook\HookFinder;
 use Product;
@@ -561,14 +559,7 @@ public function formAction($id, Request $request): Response
                     $adminProductController->processSpecificPricePriorities();
                     foreach ($_POST['combinations'] as $combinationValues) {
                         $adminProductWrapper->processProductAttribute($product, $combinationValues);
-                        // For now, each attribute set the same value.
-                        $adminProductWrapper->processDependsOnStock(
-                            $product,
-                            ($_POST['depends_on_stock'] == '1'),
-                            $combinationValues['id_product_attribute']
-                        );
                     }
-                    $adminProductWrapper->processDependsOnStock($product, ($_POST['depends_on_stock'] == '1'));
 
                     // If there is no combination, then quantity and location are managed for the whole product (as combination ID 0)
                     // In all cases, legacy hooks are triggered: actionProductUpdate and actionUpdateQuantity
@@ -585,8 +576,6 @@ public function formAction($id, Request $request): Response
 
                     $adminProductWrapper->processAttachments($product, $_POST['attachments']);
 
-                    $adminProductController->processWarehouses();
-
                     $response = new JsonResponse();
                     $response->setData([
                         'product' => $product,
@@ -616,12 +605,6 @@ public function formAction($id, Request $request): Response
             throw $e;
         }
 
-        /** @var StockInterface $stockManager */
-        $stockManager = $this->get('prestashop.core.data_provider.stock_interface');
-
-        /** @var WarehouseDataProvider $warehouseProvider */
-        $warehouseProvider = $this->get('prestashop.adapter.data_provider.warehouse');
-
         //If context shop is define to a group shop, disable the form
         if ($shopContext->isGroupShopContext()) {
             return $this->render('@Product/ProductPage/disabled_form_alert.html.twig', ['showContentHeader' => false]);
@@ -658,8 +641,6 @@ public function formAction($id, Request $request): Response
             'ids_product_attribute' => (isset($formData['step3']['id_product_attributes']) ? implode(',', $formData['step3']['id_product_attributes']) : ''),
             'has_combinations' => (isset($formData['step3']['id_product_attributes']) && count($formData['step3']['id_product_attributes']) > 0),
             'combinations_count' => isset($formData['step3']['id_product_attributes']) ? count($formData['step3']['id_product_attributes']) : 0,
-            'asm_globally_activated' => $stockManager->isAsmGloballyActivated(),
-            'warehouses' => ($stockManager->isAsmGloballyActivated()) ? $warehouseProvider->getWarehouses() : [],
             'is_multishop_context' => $isMultiShopContext,
             'is_combination_active' => $this->getConfiguration()->getBoolean('PS_COMBINATION_FEATURE_ACTIVE'),
             'showContentHeader' => false,
diff --git a/src/PrestaShopBundle/Controller/Admin/SupplierController.php b/src/PrestaShopBundle/Controller/Admin/SupplierController.php
index dbb6a5f2c2933..4b93ee475633c 100644
--- a/src/PrestaShopBundle/Controller/Admin/SupplierController.php
+++ b/src/PrestaShopBundle/Controller/Admin/SupplierController.php
@@ -86,7 +86,6 @@ public function refreshProductSupplierCombinationFormAction($idProduct, $supplie
             $this->get(Tools::class),
             $this->get('prestashop.adapter.data_provider.product'),
             $this->get('prestashop.adapter.data_provider.supplier'),
-            $this->get('prestashop.adapter.data_provider.warehouse'),
             $this->get('prestashop.adapter.data_provider.feature'),
             $this->get('prestashop.adapter.data_provider.pack'),
             $this->get('prestashop.adapter.shop.context'),
diff --git a/src/PrestaShopBundle/Controller/Admin/WarehouseController.php b/src/PrestaShopBundle/Controller/Admin/WarehouseController.php
deleted file mode 100644
index 2544ddb199306..0000000000000
--- a/src/PrestaShopBundle/Controller/Admin/WarehouseController.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-namespace PrestaShopBundle\Controller\Admin;
-
-use PrestaShop\PrestaShop\Adapter\Product\AdminProductWrapper;
-use PrestaShop\PrestaShop\Adapter\Tools;
-use PrestaShopBundle\Model\Product\AdminModelAdapter as ProductAdminModelAdapter;
-use PrestaShopBundle\Security\Annotation\AdminSecurity;
-use Symfony\Component\HttpFoundation\Response;
-
-/**
- * @deprecated since 8.1 and will be removed in next major.
- *
- * Admin controller for warehouse on the /product/form page.
- */
-class WarehouseController extends FrameworkBundleAdminController
-{
-    /**
-     * Refresh the WarehouseCombination data for the given product ID.
-     *
-     * @AdminSecurity("is_granted('create', request.get('_legacy_controller')) || is_granted('update', request.get('_legacy_controller'))")
-     *
-     * @param int $idProduct
-     *
-     * @return string|Response
-     */
-    public function refreshProductWarehouseCombinationFormAction($idProduct)
-    {
-        $productAdapter = $this->get('prestashop.adapter.data_provider.product');
-        $warehouseAdapter = $this->get('prestashop.adapter.data_provider.warehouse');
-        $response = new Response();
-
-        //get product and all warehouses
-        $product = $productAdapter->getProduct((int) $idProduct);
-        if (!is_object($product) || empty($product->id)) {
-            $response->setStatusCode(400);
-
-            return $response;
-        }
-        $warehouses = $warehouseAdapter->getWarehouses();
-
-        $modelMapper = new ProductAdminModelAdapter(
-            $this->get('prestashop.adapter.legacy.context'),
-            $this->get(AdminProductWrapper::class),
-            $this->get(Tools::class),
-            $this->get('prestashop.adapter.data_provider.product'),
-            $this->get('prestashop.adapter.data_provider.supplier'),
-            $this->get('prestashop.adapter.data_provider.warehouse'),
-            $this->get('prestashop.adapter.data_provider.feature'),
-            $this->get('prestashop.adapter.data_provider.pack'),
-            $this->get('prestashop.adapter.shop.context'),
-            $this->get('prestashop.adapter.data_provider.tax'),
-            $this->get('prestashop.adapter.legacy.configuration'),
-            $this->get('router')
-        );
-        $allFormData = $modelMapper->getFormData($product);
-
-        $form = $this->createFormBuilder($allFormData);
-        $simpleSubForm = $form->create('step4', 'form');
-
-        foreach ($warehouses as $warehouse) {
-            $simpleSubForm->add('warehouse_combination_' . $warehouse['id_warehouse'], 'Symfony\Component\Form\Extension\Core\Type\CollectionType', [
-                'entry_type' => 'PrestaShopBundle\Form\Admin\Product\ProductWarehouseCombination',
-                'entry_options' => [
-                    'id_warehouse' => $warehouse['id_warehouse'],
-                ],
-                'allow_add' => true,
-                'required' => false,
-                'label' => $warehouse['name'],
-            ]);
-        }
-
-        $form->add($simpleSubForm);
-
-        return $this->render('@Product/ProductPage/Forms/form_warehouse_combination.html.twig', [
-            'warehouses' => $warehouses,
-            'form' => $form->getForm()['step4']->createView(),
-        ]);
-    }
-}
diff --git a/src/PrestaShopBundle/Entity/StockMvt.php b/src/PrestaShopBundle/Entity/StockMvt.php
index ae0ba3a902c2e..efec851b1a673 100644
--- a/src/PrestaShopBundle/Entity/StockMvt.php
+++ b/src/PrestaShopBundle/Entity/StockMvt.php
@@ -63,9 +63,9 @@ class StockMvt
     /**
      * @var int
      *
-     * @ORM\Column(name="id_supply_order", type="integer", nullable=true)
+     * @ORM\Column(name="id_supply_order", type="integer", nullable=true, options={"default":0})
      */
-    private $idSupplyOrder;
+    private $idSupplyOrder = 0;
 
     /**
      * @var int
diff --git a/src/PrestaShopBundle/Form/Admin/Product/ProductQuantity.php b/src/PrestaShopBundle/Form/Admin/Product/ProductQuantity.php
index ec79161227180..8562ef3f3c616 100644
--- a/src/PrestaShopBundle/Form/Admin/Product/ProductQuantity.php
+++ b/src/PrestaShopBundle/Form/Admin/Product/ProductQuantity.php
@@ -119,42 +119,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'empty_data' => '',
                 ]
             )
-            ->add(
-                'advanced_stock_management',
-                FormType\CheckboxType::class,
-                [
-                    'required' => false,
-                    'label' => $this->translator->trans(
-                        'I want to use the advanced stock management system for this product.',
-                        [],
-                        'Admin.Catalog.Feature'
-                    ),
-                ]
-            )
             ->add(
                 'pack_stock_type',
                 FormType\ChoiceType::class
-            )//see eventListener for details
-            ->add(
-                'depends_on_stock',
-                FormType\ChoiceType::class,
-                [
-                    'choices' => [
-                        $this->translator->trans(
-                            'The available quantities for the current product and its combinations are based on the stock in your warehouse (using the advanced stock management system). ',
-                            [],
-                            'Admin.Catalog.Feature'
-                        ) => 1,
-                        $this->translator->trans(
-                            'I want to specify available quantities manually.',
-                            [],
-                            'Admin.Catalog.Feature'
-                        ) => 0,
-                    ],
-                    'expanded' => true,
-                    'required' => true,
-                    'multiple' => false,
-                ]
             );
 
         if ($is_stock_management) {
diff --git a/src/PrestaShopBundle/Form/Admin/Product/ProductShipping.php b/src/PrestaShopBundle/Form/Admin/Product/ProductShipping.php
index 9ea5c55bd579c..546c6b6d5c323 100644
--- a/src/PrestaShopBundle/Form/Admin/Product/ProductShipping.php
+++ b/src/PrestaShopBundle/Form/Admin/Product/ProductShipping.php
@@ -29,12 +29,10 @@
 use Currency;
 use PrestaShop\PrestaShop\Adapter\Carrier\CarrierDataProvider;
 use PrestaShop\PrestaShop\Adapter\LegacyContext;
-use PrestaShop\PrestaShop\Adapter\Warehouse\WarehouseDataProvider;
 use PrestaShopBundle\Form\Admin\Type\CommonAbstractType;
 use PrestaShopBundle\Form\Admin\Type\TranslateType;
 use PrestaShopBundle\Form\FormHelper;
 use Symfony\Component\Form\Extension\Core\Type as FormType;
-use Symfony\Component\Form\Extension\Core\Type\CollectionType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Contracts\Translation\TranslatorInterface;
@@ -66,10 +64,6 @@ class ProductShipping extends CommonAbstractType
      * @var TranslatorInterface
      */
     public $translator;
-    /**
-     * @var array
-     */
-    private $warehouses;
     /**
      * @var string
      */
@@ -84,7 +78,6 @@ class ProductShipping extends CommonAbstractType
      *
      * @param TranslatorInterface $translator
      * @param LegacyContext $legacyContext
-     * @param WarehouseDataProvider $warehouseDataProvider
      * @param CarrierDataProvider $carrierDataProvider
      * @param string $dimensionUnit
      * @param string $weightUnit
@@ -92,7 +85,6 @@ class ProductShipping extends CommonAbstractType
     public function __construct(
         TranslatorInterface $translator,
         LegacyContext $legacyContext,
-        WarehouseDataProvider $warehouseDataProvider,
         CarrierDataProvider $carrierDataProvider,
         string $dimensionUnit,
         string $weightUnit
@@ -101,7 +93,6 @@ public function __construct(
         $this->legacyContext = $legacyContext;
         $this->currency = $legacyContext->getContext()->currency;
         $this->locales = $this->legacyContext->getLanguages();
-        $this->warehouses = $warehouseDataProvider->getWarehouses();
 
         $carriers = $carrierDataProvider->getCarriers(
             $this->locales[0]['id_lang'],
@@ -261,23 +252,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'label' => $this->translator->trans('Delivery time of in-stock products:', [], 'Admin.Catalog.Feature'),
                 ]
             );
-
-        foreach ($this->warehouses as $warehouse) {
-            $builder->add(
-                'warehouse_combination_' . $warehouse['id_warehouse'],
-                CollectionType::class,
-                [
-                    'entry_type' => 'PrestaShopBundle\Form\Admin\Product\ProductWarehouseCombination',
-                    'entry_options' => [
-                        'id_warehouse' => $warehouse['id_warehouse'],
-                    ],
-                    'prototype' => true,
-                    'allow_add' => true,
-                    'required' => false,
-                    'label' => $warehouse['name'],
-                ]
-            );
-        }
     }
 
     /**
diff --git a/src/PrestaShopBundle/Form/Admin/Product/ProductWarehouseCombination.php b/src/PrestaShopBundle/Form/Admin/Product/ProductWarehouseCombination.php
deleted file mode 100644
index a39f45a31cc55..0000000000000
--- a/src/PrestaShopBundle/Form/Admin/Product/ProductWarehouseCombination.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-namespace PrestaShopBundle\Form\Admin\Product;
-
-use PrestaShopBundle\Form\Admin\Type\CommonAbstractType;
-use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
-use Symfony\Component\Form\Extension\Core\Type\HiddenType;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Contracts\Translation\TranslatorInterface;
-
-/**
- * @deprecated since 8.1 and will be removed in next major.
- *
- * This form class is responsible to generate the basic product Warehouse combinations form.
- */
-class ProductWarehouseCombination extends CommonAbstractType
-{
-    private $translator;
-
-    /**
-     * Constructor.
-     *
-     * @param TranslatorInterface $translator
-     */
-    public function __construct(TranslatorInterface $translator)
-    {
-        $this->translator = $translator;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * Builds form
-     */
-    public function buildForm(FormBuilderInterface $builder, array $options)
-    {
-        $builder->add('activated', CheckboxType::class, [
-            'required' => false,
-            'label' => $this->translator->trans('Stored', [], 'Admin.Catalog.Feature'),
-        ])
-            ->add('id_product_attribute', HiddenType::class)
-            ->add('product_id', HiddenType::class)
-            ->add('warehouse_id', HiddenType::class)
-            ->add('location', TextType::class, [
-                'required' => false,
-                'label' => $this->translator->trans('Location (optional)', [], 'Admin.Catalog.Feature'),
-                'empty_data' => '',
-            ]);
-
-        //set default minimal values for collection prototype
-        $builder->setData([
-            'warehouse_id' => $options['id_warehouse'],
-            'warehouse_activated' => false,
-        ]);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function configureOptions(OptionsResolver $resolver)
-    {
-        $resolver->setDefaults([
-            'id_warehouse' => null,
-        ]);
-    }
-
-    /**
-     * Returns the block prefix of this type.
-     *
-     * @return string The prefix name
-     */
-    public function getBlockPrefix()
-    {
-        return 'product_warehouse_combination';
-    }
-}
diff --git a/src/PrestaShopBundle/Model/Product/AdminModelAdapter.php b/src/PrestaShopBundle/Model/Product/AdminModelAdapter.php
index 6f1b14a5ab906..8b374c8300e7b 100644
--- a/src/PrestaShopBundle/Model/Product/AdminModelAdapter.php
+++ b/src/PrestaShopBundle/Model/Product/AdminModelAdapter.php
@@ -37,7 +37,6 @@
 use PrestaShop\PrestaShop\Adapter\Supplier\SupplierDataProvider;
 use PrestaShop\PrestaShop\Adapter\Tax\TaxRuleDataProvider;
 use PrestaShop\PrestaShop\Adapter\Tools;
-use PrestaShop\PrestaShop\Adapter\Warehouse\WarehouseDataProvider;
 use PrestaShop\PrestaShop\Core\Domain\Product\ValueObject\RedirectType;
 use PrestaShopBundle\Utils\FloatParser;
 use Product;
@@ -75,8 +74,6 @@ class AdminModelAdapter extends \PrestaShopBundle\Model\AdminModelAdapter
     private $taxRuleDataProvider;
     /** @var array */
     private $productPricePriority;
-    /** @var WarehouseDataProvider */
-    private $warehouseAdapter;
     /** @var Configuration */
     private $configuration;
     /** @var Router */
@@ -179,7 +176,6 @@ class AdminModelAdapter extends \PrestaShopBundle\Model\AdminModelAdapter
      * @param Tools $toolsAdapter
      * @param ProductDataProvider $productDataProvider
      * @param SupplierDataProvider $supplierDataProvider
-     * @param WarehouseDataProvider $warehouseDataProvider
      * @param FeatureDataProvider $featureDataProvider
      * @param PackDataProvider $packDataProvider
      * @param ShopContext $shopContext
@@ -194,7 +190,6 @@ public function __construct(
         Tools $toolsAdapter,
         ProductDataProvider $productDataProvider,
         SupplierDataProvider $supplierDataProvider,
-        WarehouseDataProvider $warehouseDataProvider,
         FeatureDataProvider $featureDataProvider,
         PackDataProvider $packDataProvider,
         ShopContext $shopContext,
@@ -210,7 +205,6 @@ public function __construct(
         $this->tools = $toolsAdapter;
         $this->productAdapter = $productDataProvider;
         $this->supplierAdapter = $supplierDataProvider;
-        $this->warehouseAdapter = $warehouseDataProvider;
         $this->featureAdapter = $featureDataProvider;
         $this->packAdapter = $packDataProvider;
         $this->shopContext = $shopContext;
@@ -422,23 +416,6 @@ public function getModelData($form_data, $isMultiShopContext = false)
             $form_data['inputAccessories'] = $inputAccessories;
         }
 
-        //map warehouseProductLocations
-        $form_data['warehouse_loaded'] = 1;
-        $warehouses = $this->warehouseAdapter->getWarehouses();
-        foreach ($warehouses as $warehouse) {
-            foreach ($form_data['warehouse_combination_' . $warehouse['id_warehouse']] as $combination) {
-                $key = $combination['warehouse_id']
-                    . '_' . $combination['product_id']
-                    . '_' . $combination['id_product_attribute'];
-                if ($combination['activated']) {
-                    $form_data['check_warehouse_' . $key] = '1';
-                }
-                $form_data['location_warehouse_' . $key] = $combination['location'];
-
-                unset($form_data['warehouse_combination_' . $warehouse['id_warehouse']]);
-            }
-        }
-
         //force customization fields values
         $form_data['uploadable_files'] = 0;
         $form_data['text_fields'] = 0;
@@ -503,12 +480,6 @@ public function getFormData(Product $product)
         //Inject data form for supplier combinations
         $this->formData['step6'] = array_merge($this->formData['step6'], $this->getDataSuppliersCombinations($product));
 
-        //Inject data form for warehouse combinations
-        $this->formData['step4'] = array_merge(
-            $this->formData['step4'],
-            $this->getDataWarehousesCombinations($product)
-        );
-
         return $this->formData;
     }
 
@@ -616,8 +587,6 @@ private function mapStep2FormData(Product $product)
     private function mapStep3FormData(Product $product)
     {
         return [
-            'advanced_stock_management' => (bool) $product->advanced_stock_management,
-            'depends_on_stock' => $product->depends_on_stock ? '1' : '0',
             'qty_0' => $product::getQuantity($product->id),
             'id_product_attributes' => $this->getProductAttributes($product),
             'out_of_stock' => $product->out_of_stock,
@@ -872,51 +841,6 @@ private function getDataSuppliersCombinations(Product $product)
         return $dataSuppliersCombinations;
     }
 
-    /**
-     * Generate form warehouses/combinations references.
-     *
-     * @param Product $product
-     *
-     * @return array filled data form references combinations
-     */
-    private function getDataWarehousesCombinations(Product $product)
-    {
-        $combinations = $product->getAttributesResume($this->locales[0]['id_lang']) ?: [];
-        if (empty($combinations)) {
-            $combinations[] = [
-                'id_product' => $product->id,
-                'id_product_attribute' => 0,
-                'attribute_designation' => $product->name[$this->locales[0]['id_lang']],
-            ];
-        }
-
-        //for each warehouse, generate combinations list
-        $dataWarehousesCombinations = [];
-
-        foreach ($this->warehouseAdapter->getWarehouses() as $warehouse) {
-            $warehouseId = $warehouse['id_warehouse'];
-            foreach ($combinations as $combination) {
-                $warehouseProductLocationData = $this->warehouseAdapter->getWarehouseProductLocationData(
-                    $product->id,
-                    $combination['id_product_attribute'],
-                    $warehouseId
-                );
-                $dataWarehousesCombinations['warehouse_combination_' . $warehouseId][] = [
-                    'label' => $combination['attribute_designation'],
-                    'activated' => (bool) $warehouseProductLocationData['activated'],
-                    'warehouse_id' => $warehouseId,
-                    'product_id' => $product->id,
-                    'id_product_attribute' => $combination['id_product_attribute'],
-                    'location' => isset($warehouseProductLocationData['location'])
-                        ? $warehouseProductLocationData['location']
-                        : '',
-                ];
-            }
-        }
-
-        return $dataWarehousesCombinations;
-    }
-
     /**
      * get form product features.
      *
diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products/products.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products/products.yml
index 79b166876e496..d3f0258c3264b 100644
--- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products/products.yml
+++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products/products.yml
@@ -25,10 +25,6 @@ _product_suppliers:
   resource: "suppliers.yml"
   prefix: /suppliers/
 
-_product_warehouses:
-  resource: "warehouses.yml"
-  prefix: /warehouses/
-
 # Product List
 admin_product_catalog:
   path: /{offset}/{limit}/{orderBy}/{sortOrder}
diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products/warehouses.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products/warehouses.yml
deleted file mode 100644
index ad4aa218d7b72..0000000000000
--- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products/warehouses.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-admin_warehouse_refresh_product_warehouse_combination_form:
-  path: /refresh-product-warehouse-combination-form/{idProduct}
-  methods: [ GET ]
-  defaults:
-    _controller: PrestaShopBundle\Controller\Admin\WarehouseController::refreshProductWarehouseCombinationFormAction
-    _legacy_controller: AdminProducts
-    idProduct: 0
-  requirements:
-    idProduct: \d+
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml b/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml
index 90c44d6409ea7..ed2d5dfe1ecfb 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml
@@ -20,10 +20,6 @@ services:
     class: PrestaShop\PrestaShop\Adapter\Supplier\SupplierDataProvider
     deprecated: ~
 
-  prestashop.adapter.data_provider.warehouse:
-    class: PrestaShop\PrestaShop\Adapter\Warehouse\WarehouseDataProvider
-    deprecated: ~
-
   prestashop.adapter.data_provider.category:
     class: PrestaShop\PrestaShop\Adapter\Category\CategoryDataProvider
     arguments: [ "@=service('prestashop.adapter.legacy.context')" ]
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/services.yml b/src/PrestaShopBundle/Resources/config/services/adapter/services.yml
index 5757b327fc17e..ff64063b1f8b7 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/services.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/services.yml
@@ -100,7 +100,6 @@ services:
       - '@PrestaShop\PrestaShop\Adapter\Tools'
       - "@prestashop.adapter.data_provider.product"
       - "@prestashop.adapter.data_provider.supplier"
-      - "@prestashop.adapter.data_provider.warehouse"
       - "@prestashop.adapter.data_provider.feature"
       - "@prestashop.adapter.data_provider.pack"
       - "@prestashop.adapter.shop.context"
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/supplier.yml b/src/PrestaShopBundle/Resources/config/services/adapter/supplier.yml
index 3ceeb360110e2..e14ee787a8ca2 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/supplier.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/supplier.yml
@@ -13,6 +13,7 @@ services:
 
   prestashop.adapter.supplier.supplier_order_validator:
     class: 'PrestaShop\PrestaShop\Adapter\Supplier\SupplierOrderValidator'
+    deprecated: ~
 
   # Command handlers
 
@@ -20,7 +21,6 @@ services:
     class: 'PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler\AbstractDeleteSupplierHandler'
     abstract: true
     arguments:
-      - '@prestashop.adapter.supplier.supplier_order_validator'
       - '@prestashop.adapter.supplier.provider.supplier_address'
       - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater'
       - '%database_prefix%'
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
index 9e782137a1371..a825e45a225fe 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
@@ -126,7 +126,6 @@ services:
     deprecated: ~
   PrestaShopBundle\Form\Admin\Product\ProductShipping:
     arguments:
-      $warehouseDataProvider: "@prestashop.adapter.data_provider.warehouse"
       $carrierDataProvider: "@prestashop.adapter.data_provider.carrier"
     deprecated: ~
   PrestaShopBundle\Form\Admin\Product\ProductSpecificPrice:
@@ -145,8 +144,6 @@ services:
     deprecated: ~
   PrestaShopBundle\Form\Admin\Product\ProductVirtual:
     deprecated: ~
-  PrestaShopBundle\Form\Admin\Product\ProductWarehouseCombination:
-    deprecated: ~
   PrestaShopBundle\Form\Admin\Type\TypeaheadProductCollectionType:
     arguments:
       - "@prestashop.adapter.data_provider.product"
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/Forms/form_shipping.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/Forms/form_shipping.html.twig
index 644ff3d62956b..d0b914fc10da0 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/Forms/form_shipping.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/Forms/form_shipping.html.twig
@@ -141,12 +141,4 @@
   </div>
 </div>
 
-<div class="col-md-12">
-  <div id="warehouse_combination_collection" class="col-md-12 form-group" data-url="{{ path('admin_warehouse_refresh_product_warehouse_combination_form') }}">
-    {% if asm_globally_activated and isNotVirtual and isChecked %}
-      {{ include('@PrestaShop/Admin/Product/ProductPage/Forms/form_warehouse_combination.html.twig', { 'warehouses': warehouses, 'form': form }) }}
-    {% endif %}
-  </div>
-</div>
-
 {{ renderhook('displayAdminProductsShippingStepBottom', { 'id_product': id_product }) }}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/Forms/form_supplier_choice.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/Forms/form_supplier_choice.html.twig
index 3d6678b80e095..c81a1f7e28a1b 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/Forms/form_supplier_choice.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/Forms/form_supplier_choice.html.twig
@@ -26,19 +26,11 @@
   <div id="form_step6_suppliers_custom_fields">
     <h2>{{ form.suppliers.vars.label }}</h2>
     <div class="mb-1">
-      <div class="alert expandable-alert alert-info" role="alert">
-        <button type="button" class="read-more btn-link" data-toggle="collapse" data-target="#suppliersInfo" aria-expanded="false" aria-controls="collapseDanger">
-          {{ 'Read more'|trans({}, 'Admin.Actions')|raw }}
-        </button>
+      <div class="alert alert-info" role="alert">
         <p class="alert-text">
           {{ 'This interface allows you to specify the suppliers of the current product and its combinations, if any.'|trans({}, 'Admin.Catalog.Help')|raw }}<br>
           {{ 'You can specify supplier references according to previously associated suppliers.'|trans({}, 'Admin.Catalog.Help')|raw }}
         </p>
-        <div class="alert-more collapse" id="suppliersInfo">
-          <p>
-            {{ 'When using the advanced stock management tool (see Shop Parameters > Products settings), the values you define (price, references) will be used in supply orders.'|trans({}, 'Admin.Catalog.Help')|raw }}
-          </p>
-        </div>
       </div>
     </div>
 
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/Forms/form_warehouse_combination.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/Forms/form_warehouse_combination.html.twig
deleted file mode 100644
index e485ed9d6e321..0000000000000
--- a/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/Forms/form_warehouse_combination.html.twig
+++ /dev/null
@@ -1,67 +0,0 @@
-{#**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- *#}
-{% if warehouses|length > 0 %}
-    <h4>{{ 'Product location in warehouses'|trans({}, 'Admin.Catalog.Feature') }}</h4>
-
-    <div class="alert alert-info" style="display:block; position: 'auto';" role="alert">
-        <div class="alert-text">
-            <p>{{ 'This interface allows you to specify the warehouse in which the product is stocked.'|trans({}, 'Admin.Catalog.Help') }}</p>
-            <p>{{ 'It is also possible to specify the location within the warehouse for each product or combination.'|trans({}, 'Admin.Catalog.Help') }}</p>
-        </div>
-    </div>
-    <p>{{ 'Please choose the warehouses associated with this product.'|trans({}, 'Admin.Catalog.Feature') }}</p>
-
-    {% for warehouse in warehouses %}
-        <div class="panel panel-default">
-            {% set collectionName = 'warehouse_combination_' ~ warehouse.id_warehouse %}
-            <div class="form-group" id="warehouse_combination_{{ warehouse.id_warehouse }}">
-                <label class="col-sm-2 control-label">
-                    <h4>{{ form[collectionName].vars.label }}</h4><br/>
-                    {% if form[collectionName]|length() > 1 %}
-                        <button type="button" class="btn btn-default check_all_warehouse">
-                            <i class="icon-check-sign"></i> {{ 'Check / Uncheck all'|trans({}, 'Admin.Actions') }}
-                        </button>
-                    {% endif %}
-                </label>
-                <div class="col-sm-10">
-                    {{ form_errors(form[collectionName]) }}
-                    {% for warehouse_combination in form[collectionName] %}
-                        <div class="form-group">
-                            <label class="col-sm-2 control-label">{{ warehouse_combination.vars.value.label }}</label>
-                            <div class="col-sm-10">
-                                <div class="float-left col-lg-1">{{ form_widget(warehouse_combination.activated) }}</div>
-                                {{ form_label(warehouse_combination.location) }}
-                                <div class="float-left col-lg-3">{{ form_widget(warehouse_combination.location) }}</div>
-                                {{ form_widget(warehouse_combination.id_product_attribute) }}
-                                {{ form_widget(warehouse_combination.warehouse_id) }}
-                                {{ form_widget(warehouse_combination.product_id) }}
-                            </div>
-                        </div>
-                    {% endfor %}
-                </div>
-            </div>
-        </div>
-    {% endfor %}
-{% endif %}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/Panels/combinations.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/Panels/combinations.html.twig
index 504289679b640..f0b7fdb7387a5 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/Panels/combinations.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/Panels/combinations.html.twig
@@ -25,7 +25,7 @@
 <div role="tabpanel" class="form-contenttab tab-pane" id="step3">
   <div class="container-fluid">
 
-    <div id="quantities" style="{% if has_combinations or formDependsOnStocks.vars.value != "0" %}display: none;{% endif %}">
+    <div id="quantities" style="{% if has_combinations %}display: none;{% endif %}">
       <h2>{{ 'Quantities'|trans({}, 'Admin.Catalog.Feature') }}</h2>
       <fieldset class="form-group">
         <div class="row">
@@ -163,25 +163,6 @@
 
     </div>
 
-    {% if asm_globally_activated and formType.vars.value != "2" %}
-      <div class="form-group" id="asm_quantity_management">
-        <label class="col-sm-2 control-label" for="form_step3_advanced_stock_management"></label>
-        <div class="col-sm-10">
-          {{ form_errors(formAdvancedStockManagement) }}
-          {{ form_widget(formAdvancedStockManagement) }}
-          {% if form.step1.type_product.vars.value == "1" %}
-            {{ 'When enabling advanced stock management for a pack, please make sure it is also enabled for its product(s) – if you choose to decrement product quantities.'|trans({}, 'Admin.Catalog.Notification') }}
-          {% endif %}
-        </div>
-      </div>
-      <div class="form-group" id="depends_on_stock_div" style="{% if not(formAdvancedStockManagement.vars.checked) %}display: none;{% endif %}">
-        <label class="col-sm-2 control-label" for="form_step3_depends_on_stock"></label>
-        <div class="col-sm-10">
-          {{ form_errors(formDependsOnStocks) }}
-          {{ form_widget(formDependsOnStocks) }}
-        </div>
-      </div>
-    {% endif %}
     {% if configuration('PS_STOCK_MANAGEMENT') %}
       <div id="pack_stock_type">
         <h2>{{ formPackStockType.vars.label }}</h2>
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/product.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/product.html.twig
index 4de5e04ebb3e3..f3da756947d7f 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/product.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/product.html.twig
@@ -91,7 +91,6 @@
         {% block product_panel_combinations %}
           {% set formStockQuantity = form.step3.qty_0 is defined ? form.step3.qty_0 : null  %}
           {{ include('@Product/ProductPage/Panels/combinations.html.twig', {
-              'formDependsOnStocks': form.step3.depends_on_stock,
               'productId': id_product,
               'formStockQuantity': formStockQuantity,
               'formStockMinimalQuantity': form.step3.minimal_quantity,
@@ -99,9 +98,7 @@
               'formLocation': form.step3.location,
               'formLowStockAlert': form.step3.low_stock_alert,
               'formVirtualProduct': form.step3.virtual_product,
-              'asm_globally_activated': asm_globally_activated,
               'formType': form.step1.type_product,
-              'formAdvancedStockManagement': form.step3.advanced_stock_management,
               'formPackStockType': form.step3.pack_stock_type,
               'formStep3': form.step3,
               'formCombinations': formCombinations,
@@ -118,10 +115,7 @@
                   <div class="row">
                     {{ include('@Product/ProductPage/Forms/form_shipping.html.twig', {
                       'form' : form.step4,
-                      'asm_globally_activated': asm_globally_activated,
-                      'isNotVirtual': form.step1.type_product.vars.value != "2",
-                      'isChecked': form.step3.advanced_stock_management.vars.checked,
-                      'warehouses': warehouses
+                      'isNotVirtual': form.step1.type_product.vars.value != "2"
                     }) }}
                   </div>
                 </div>
diff --git a/src/PrestaShopBundle/Service/DataProvider/StockInterface.php b/src/PrestaShopBundle/Service/DataProvider/StockInterface.php
index f63a87732d552..4b5509d79f126 100644
--- a/src/PrestaShopBundle/Service/DataProvider/StockInterface.php
+++ b/src/PrestaShopBundle/Service/DataProvider/StockInterface.php
@@ -39,6 +39,8 @@ interface StockInterface
      * Returns True if Stocks are managed by a module (or by legacy ASM).
      *
      * @return bool True if Stocks are managed by a module (or by legacy ASM)
+     *
+     * @deprecated Since 9.0 and will be removed in 10.0
      */
     public function isAsmGloballyActivated();
 }
diff --git a/tests/Integration/Behaviour/Features/Context/CommonFeatureContext.php b/tests/Integration/Behaviour/Features/Context/CommonFeatureContext.php
index 3d46394a4ab95..bc858ded64dc2 100644
--- a/tests/Integration/Behaviour/Features/Context/CommonFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/CommonFeatureContext.php
@@ -106,15 +106,10 @@
 use State;
 use Stock;
 use StockAvailable;
-use StockMvt;
 use StockMvtReason;
 use StockMvtWS;
 use Store;
 use Supplier;
-use SupplyOrder;
-use SupplyOrderDetail;
-use SupplyOrderHistory;
-use SupplyOrderState;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Tab;
 use Tag;
@@ -125,7 +120,6 @@
 use Tests\Integration\Utility\ContextMocker;
 use Tests\Resources\DatabaseDump;
 use Tests\Resources\ResourceResetter;
-use WarehouseProductLocation;
 use WebserviceKey;
 use Zone;
 
@@ -691,14 +685,8 @@ private static function clearCache(): void
         ShopUrl::resetStaticCache();
         Stock::resetStaticCache();
         StockAvailable::resetStaticCache();
-        StockMvt::resetStaticCache();
         StockMvtReason::resetStaticCache();
         StockMvtWS::resetStaticCache();
-        SupplyOrder::resetStaticCache();
-        SupplyOrderDetail::resetStaticCache();
-        SupplyOrderHistory::resetStaticCache();
-        SupplyOrderState::resetStaticCache();
-        WarehouseProductLocation::resetStaticCache();
         Tax::resetStaticCache();
         TaxRule::resetStaticCache();
         TaxRulesGroup::resetStaticCache();
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/Product/AbstractProductFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/Product/AbstractProductFeatureContext.php
index e1964353ce3f3..26ad9cbe74661 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/Product/AbstractProductFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/Product/AbstractProductFeatureContext.php
@@ -306,8 +306,6 @@ protected function extractValueFromProductForEditing(ProductForEditing $productF
             'link_rewrite' => 'productSeoOptions.localizedLinkRewrites',
             'redirect_type' => 'productSeoOptions.redirectType',
             'redirect_target' => 'productSeoOptions.redirectTarget',
-            'use_advanced_stock_management' => 'stockInformation.useAdvancedStockManagement',
-            'depends_on_stock' => 'stockInformation.dependsOnStock',
             'pack_stock_type' => 'stockInformation.packStockType',
             'out_of_stock_type' => 'stockInformation.outOfStockType',
             'quantity' => 'stockInformation.quantity',
diff --git a/tests/Integration/Behaviour/Features/Scenario/Product/Shop/update_stock_multishop.feature b/tests/Integration/Behaviour/Features/Scenario/Product/Shop/update_stock_multishop.feature
index b02a9fa090838..db84657538f83 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Product/Shop/update_stock_multishop.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Product/Shop/update_stock_multishop.feature
@@ -19,7 +19,6 @@ Feature: Update product price fields from Back Office (BO) for multiple shops.
     And I add a shop "shop3" with name "test_third_shop" and color "blue" for the group "test_second_shop_group"
     And I add a shop "shop4" with name "test_shop_without_url" and color "blue" for the group "test_second_shop_group"
     And single shop context is loaded
-    And shop configuration for "PS_ADVANCED_STOCK_MANAGEMENT" is set to 0
     And language "french" with locale "fr-FR" exists
     Given I add product "product1" with following information:
       | name[en-US] | magic staff |
diff --git a/tests/Integration/Behaviour/Features/Scenario/Product/update_stock.feature b/tests/Integration/Behaviour/Features/Scenario/Product/update_stock.feature
index 183660757c248..cbf0961bae538 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Product/update_stock.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Product/update_stock.feature
@@ -12,7 +12,6 @@ Feature: Update product stock from Back Office (BO)
     Given shop "shop1" with name "test_shop" exists
     # Single shop context is required to modify product quantity
     And single shop shop1 context is loaded
-    And shop configuration for "PS_ADVANCED_STOCK_MANAGEMENT" is set to 0
 
   Scenario: I check default stock values
     When I add product "product1" with following information:
diff --git a/tests/Integration/Behaviour/Features/Scenario/Webservice/Endpoints/addresses.feature b/tests/Integration/Behaviour/Features/Scenario/Webservice/Endpoints/addresses.feature
index 28c000ed66085..482a271bef09c 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Webservice/Endpoints/addresses.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Webservice/Endpoints/addresses.feature
@@ -87,7 +87,6 @@ Feature: Webservice key management
       | id_customer     | 0              |
       | id_manufacturer | 0              |
       | id_supplier     | 0              |
-      | id_warehouse    | 0              |
       | id_country      | 8              |
       | id_state        |                |
       | alias           | dadadada       |
@@ -113,7 +112,6 @@ Feature: Webservice key management
       | id_customer     | 0              |
       | id_manufacturer | 0              |
       | id_supplier     | 0              |
-      | id_warehouse    | 0              |
       | id_country      | 8              |
       | id_state        | 0              |
       | alias           | dadadada       |
@@ -136,7 +134,6 @@ Feature: Webservice key management
       | id_customer     | 0              |
       | id_manufacturer | 0              |
       | id_supplier     | 0              |
-      | id_warehouse    | 0              |
       | id_country      | 8              |
       | id_state        |                |
       | alias           | alias          |
@@ -159,7 +156,6 @@ Feature: Webservice key management
       | id_customer     | 0              |
       | id_manufacturer | 0              |
       | id_supplier     | 0              |
-      | id_warehouse    | 0              |
       | id_country      | 8              |
       | id_state        | 0              |
       | alias           | alias          |
diff --git a/tests/Integration/PrestaShopBundle/Model/Product/AdminModelAdapterTest.php b/tests/Integration/PrestaShopBundle/Model/Product/AdminModelAdapterTest.php
index afa625f29ac84..55cba878f1891 100644
--- a/tests/Integration/PrestaShopBundle/Model/Product/AdminModelAdapterTest.php
+++ b/tests/Integration/PrestaShopBundle/Model/Product/AdminModelAdapterTest.php
@@ -81,8 +81,6 @@ private function fakeFormData(): array
                 'specificPricePriority_3' => '',
             ],
             'step3' => [
-                'advanced_stock_management' => '',
-                'depends_on_stock' => '',
                 'qty_0' => '',
                 'combinations' => [],
                 'out_of_stock' => '',
@@ -185,7 +183,6 @@ protected function setUp(): void
             self::$kernel->getContainer()->get(Tools::class),
             self::$kernel->getContainer()->get('prestashop.adapter.data_provider.product'),
             self::$kernel->getContainer()->get('prestashop.adapter.data_provider.supplier'),
-            self::$kernel->getContainer()->get('prestashop.adapter.data_provider.warehouse'),
             self::$kernel->getContainer()->get('prestashop.adapter.data_provider.feature'),
             self::$kernel->getContainer()->get('prestashop.adapter.data_provider.pack'),
             self::$kernel->getContainer()->get('prestashop.adapter.shop.context'),
diff --git a/tests/Resources/Resetter/ProductResetter.php b/tests/Resources/Resetter/ProductResetter.php
index 888c75d690e4b..8b86c610634fa 100644
--- a/tests/Resources/Resetter/ProductResetter.php
+++ b/tests/Resources/Resetter/ProductResetter.php
@@ -74,7 +74,6 @@ public static function resetProducts(): void
             // Miscellaneous relationships
             'category_product',
             'feature_product',
-            'warehouse_product_location',
         ]);
     }
 }
diff --git a/tests/Resources/modules_tests/override/AdminProductsController.php b/tests/Resources/modules_tests/override/AdminProductsController.php
index b62c9769b475d..fa9fa9a5fbca9 100644
--- a/tests/Resources/modules_tests/override/AdminProductsController.php
+++ b/tests/Resources/modules_tests/override/AdminProductsController.php
@@ -448,14 +448,6 @@ public function processDelete()
             if (isset($object->noZeroObject) && count($taxes = call_user_func([$this->className, $object->noZeroObject])) <= 1) {
                 $this->errors[] = Tools::displayError('You need at least one object.') . ' <b>' . $this->table . '</b><br />' . Tools::displayError('You cannot delete all of the items.');
             } else {
-                if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && $object->advanced_stock_management) {
-                    $stock_manager = StockManagerFactory::getManager();
-                    $physical_quantity = $stock_manager->getProductPhysicalQuantities($object->id, 0);
-                    $real_quantity = $stock_manager->getProductRealQuantities($object->id, 0);
-                    if ($physical_quantity > 0 || $real_quantity > $physical_quantity) {
-                        $this->errors[] = Tools::displayError('You cannot delete this product because there is physical stock left.');
-                    }
-                }
                 if (!count($this->errors)) {
                     if ($object->delete()) {
                         $id_category = (int) Tools::getValue('id_category');
@@ -527,19 +519,8 @@ protected function processBulkDelete()
                         if ((int) (ini_get('max_execution_time')) < round($count * 1.5)) {
                             ini_set('max_execution_time', round($count * 1.5));
                         }
-                        if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) {
-                            $stock_manager = StockManagerFactory::getManager();
-                        }
                         foreach ($products as $id_product) {
                             $product = new Product((int) $id_product);
-
-                            if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && $product->advanced_stock_management) {
-                                $physical_quantity = $stock_manager->getProductPhysicalQuantities($product->id, 0);
-                                $real_quantity = $stock_manager->getProductRealQuantities($product->id, 0);
-                                if ($physical_quantity > 0 || $real_quantity > $physical_quantity) {
-                                    $this->errors[] = sprintf(Tools::displayError('You cannot delete the product #%d because there is physical stock left.'), $product->id);
-                                }
-                            }
                             if (!count($this->errors)) {
                                 if ($product->delete()) {
                                     PrestaShopLogger::addLog(sprintf($this->l('%s deletion', 'AdminTab', false, false), $this->className), 1, null, $this->className, (int) $product->id, true, (int) $this->context->employee->id);
@@ -643,7 +624,6 @@ public function processProductAttribute()
                                 $this->isProductFieldUpdated('available_date_attribute') ? Tools::getValue('available_date_attribute') : null,
                                 false
                             );
-                            StockAvailable::setProductDependsOnStock((int) $product->id, $product->depends_on_stock, null, (int) $id_product_attribute);
                             StockAvailable::setProductOutOfStock((int) $product->id, $product->out_of_stock, null, (int) $id_product_attribute);
                         }
                     } else {
@@ -673,7 +653,6 @@ public function processProductAttribute()
                                 Tools::getValue('available_date_attribute'),
                                 Tools::getValue('attribute_isbn')
                             );
-                            StockAvailable::setProductDependsOnStock((int) $product->id, $product->depends_on_stock, null, (int) $id_product_attribute);
                             StockAvailable::setProductOutOfStock((int) $product->id, $product->out_of_stock, null, (int) $id_product_attribute);
                         }
                     } else {
@@ -1168,33 +1147,19 @@ public function ajaxProcessDeleteProductAttribute()
             $id_product = (int) Tools::getValue('id_product');
             $id_product_attribute = (int) Tools::getValue('id_product_attribute');
             if ($id_product && Validate::isUnsignedId($id_product) && Validate::isLoadedObject($product = new Product($id_product))) {
-                if (($depends_on_stock = StockAvailable::dependsOnStock($id_product)) && StockAvailable::getQuantityAvailableByProduct($id_product, $id_product_attribute)) {
-                    $json = [
-                        'status' => 'error',
-                        'message' => $this->l('It is not possible to delete a combination while it still has some quantities in the Advanced Stock Management. You must delete its stock first.'),
-                    ];
+                $product->deleteAttributeCombination((int) $id_product_attribute);
+                $product->checkDefaultAttributes();
+                if (!$product->hasAttributes()) {
+                    $product->cache_default_attribute = 0;
+                    $product->update();
                 } else {
-                    $product->deleteAttributeCombination((int) $id_product_attribute);
-                    $product->checkDefaultAttributes();
-                    if (!$product->hasAttributes()) {
-                        $product->cache_default_attribute = 0;
-                        $product->update();
-                    } else {
-                        Product::updateDefaultAttribute($id_product);
-                    }
-                    if ($depends_on_stock && !Stock::deleteStockByIds($id_product, $id_product_attribute)) {
-                        $json = [
-                            'status' => 'error',
-                            'message' => $this->l('Error while deleting the stock'),
-                        ];
-                    } else {
-                        $json = [
-                            'status' => 'ok',
-                            'message' => $this->_conf[1],
-                            'id_product_attribute' => (int) $id_product_attribute,
-                        ];
-                    }
+                    Product::updateDefaultAttribute($id_product);
                 }
+                $json = [
+                    'status' => 'ok',
+                    'message' => $this->_conf[1],
+                    'id_product_attribute' => (int) $id_product_attribute,
+                ];
             } else {
                 $json = [
                     'status' => 'error',
@@ -1568,11 +1533,6 @@ public function processAdd()
             $this->updateAccessories($this->object);
             $this->updatePackItems($this->object);
             $this->updateDownloadProduct($this->object);
-            if (Configuration::get('PS_FORCE_ASM_NEW_PRODUCT') && Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) {
-                $this->object->advanced_stock_management = 1;
-                StockAvailable::setProductDependsOnStock($this->object->id, true, (int) $this->context->shop->id, 0);
-                $this->object->save();
-            }
             if (empty($this->errors)) {
                 $languages = Language::getLanguages(false);
                 if ($this->isProductFieldUpdated('category_box') && !$this->object->updateCategories(Tools::getValue('categoryBox'))) {
@@ -1585,14 +1545,6 @@ public function processAdd()
                         Search::indexation(false, $this->object->id);
                     }
                 }
-                if (Configuration::get('PS_DEFAULT_WAREHOUSE_NEW_PRODUCT') != 0 && Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) {
-                    $warehouse_location_entity = new WarehouseProductLocation();
-                    $warehouse_location_entity->id_product = $this->object->id;
-                    $warehouse_location_entity->id_product_attribute = 0;
-                    $warehouse_location_entity->id_warehouse = Configuration::get('PS_DEFAULT_WAREHOUSE_NEW_PRODUCT');
-                    $warehouse_location_entity->location = pSQL('');
-                    $warehouse_location_entity->save();
-                }
                 $this->object->setGroupReduction();
                 if (Tools::isSubmit('submitAddProductAndPreview')) {
                     $this->redirect_after = $this->getPreviewUrl($this->object);
@@ -1706,9 +1658,7 @@ public function processUpdate()
                 if ($object->update()) {
                     if (Shop::getContext() == Shop::CONTEXT_SHOP && !$existing_product->isAssociatedToShop($this->context->shop->id)) {
                         $out_of_stock = StockAvailable::outOfStock($existing_product->id, $existing_product->id_shop_default);
-                        $depends_on_stock = StockAvailable::dependsOnStock($existing_product->id, $existing_product->id_shop_default);
                         StockAvailable::setProductOutOfStock((int) $this->object->id, $out_of_stock, $this->context->shop->id);
-                        StockAvailable::setProductDependsOnStock((int) $this->object->id, $depends_on_stock, $this->context->shop->id);
                     }
                     PrestaShopLogger::addLog(sprintf($this->l('%s modification', 'AdminTab', false, false), $this->className), 1, null, $this->className, (int) $this->object->id, true, (int) $this->context->employee->id);
                     if (in_array($this->context->shop->getContext(), [Shop::CONTEXT_SHOP, Shop::CONTEXT_ALL])) {
@@ -1741,18 +1691,13 @@ public function processUpdate()
                             $this->processImageLegends();
                         }
                         $this->updatePackItems($object);
-                        if ($product_type_before == Product::PTYPE_SIMPLE && $object->getType() == Product::PTYPE_PACK) {
-                            StockAvailable::setProductDependsOnStock((int) $object->id, false);
-                        }
                         $this->updateDownloadProduct($object, 1);
                         $this->updateTags(Language::getLanguages(false), $object);
                         if ($this->isProductFieldUpdated('category_box') && !$object->updateCategories(Tools::getValue('categoryBox'))) {
                             $this->errors[] = Tools::displayError('An error occurred while linking the object.') . ' <b>' . $this->table . '</b> ' . Tools::displayError('To categories');
                         }
                     }
-                    if ($this->isTabSubmitted('Warehouses')) {
-                        $this->processWarehouses();
-                    }
+
                     if (empty($this->errors)) {
                         if (in_array($object->visibility, ['both', 'search']) && Configuration::get('PS_SEARCH_INDEXATION')) {
                             Search::indexation(false, $object->id);
@@ -2099,11 +2044,7 @@ public function initContent($token = null)
                 if (!method_exists($this, 'initForm' . $this->tab_display)) {
                     $this->tab_display = $this->default_tab;
                 }
-                $advanced_stock_management_active = Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT');
                 foreach ($this->available_tabs as $product_tab => $value) {
-                    if ($advanced_stock_management_active == 0 && $product_tab == 'Warehouses') {
-                        continue;
-                    }
                     $product_tabs[$product_tab] = [
                         'id' => $product_tab,
                         'selected' => (strtolower($product_tab) == strtolower($this->tab_display) || (isset($this->tab_display_module) && 'module' . $this->tab_display_module == Tools::strtolower($product_tab))),
@@ -2665,61 +2606,6 @@ public function processSuppliers()
         }
     }
 
-    /*
-    * module: pscsx32412
-    * date: 2018-12-26 14:14:05
-    * version: 1
-    */
-    public function processWarehouses()
-    {
-        if ((int) Tools::getValue('warehouse_loaded') === 1 && Validate::isLoadedObject($product = new Product((int) $id_product = Tools::getValue('id_product')))) {
-            $attributes = $product->getAttributesResume($this->context->language->id);
-            if (empty($attributes)) {
-                $attributes[] = [
-                    'id_product_attribute' => 0,
-                    'attribute_designation' => '',
-                ];
-            }
-            $warehouses = Warehouse::getWarehouses(true);
-            $associated_warehouses_collection = WarehouseProductLocation::getCollection($product->id);
-            $elements_to_manage = [];
-            foreach ($attributes as $attribute) {
-                foreach ($warehouses as $warehouse) {
-                    $key = $warehouse['id_warehouse'] . '_' . $product->id . '_' . $attribute['id_product_attribute'];
-                    if (Tools::isSubmit('check_warehouse_' . $key)) {
-                        $location = Tools::getValue('location_warehouse_' . $key, '');
-                        $elements_to_manage[$key] = $location;
-                    }
-                }
-            }
-            foreach ($associated_warehouses_collection as $awc) {
-                if (!array_key_exists($awc->id_warehouse . '_' . $awc->id_product . '_' . $awc->id_product_attribute, $elements_to_manage)) {
-                    $awc->delete();
-                }
-            }
-            foreach ($elements_to_manage as $key => $location) {
-                $params = explode('_', $key);
-                $wpl_id = (int) WarehouseProductLocation::getIdByProductAndWarehouse((int) $params[1], (int) $params[2], (int) $params[0]);
-                if (empty($wpl_id)) {
-                    $warehouse_location_entity = new WarehouseProductLocation();
-                    $warehouse_location_entity->id_product = (int) $params[1];
-                    $warehouse_location_entity->id_product_attribute = (int) $params[2];
-                    $warehouse_location_entity->id_warehouse = (int) $params[0];
-                    $warehouse_location_entity->location = pSQL($location);
-                    $warehouse_location_entity->save();
-                } else {
-                    $warehouse_location_entity = new WarehouseProductLocation((int) $wpl_id);
-                    $location = pSQL($location);
-                    if ($location != $warehouse_location_entity->location) {
-                        $warehouse_location_entity->location = pSQL($location);
-                        $warehouse_location_entity->update();
-                    }
-                }
-            }
-            StockAvailable::synchronize((int) $id_product);
-        }
-    }
-
     /*
     * module: pscsx32412
     * date: 2018-12-26 14:14:05
@@ -3828,7 +3714,6 @@ public function initFormAttributes($product)
                     $data->assign('ps_weight_unit', Configuration::get('PS_WEIGHT_UNIT'));
                     $data->assign('ps_use_ecotax', Configuration::get('PS_USE_ECOTAX'));
                     $data->assign('field_value_unity', $this->getFieldValue($product, 'unity'));
-                    $data->assign('reasons', $reasons = StockMvtReason::getStockMvtReasons($this->context->language->id));
                     $data->assign('ps_stock_mvt_reason_default', $ps_stock_mvt_reason_default = Configuration::get('PS_STOCK_MVT_REASON_DEFAULT'));
                     $data->assign('minimal_quantity', $this->getFieldValue($product, 'minimal_quantity') ? $this->getFieldValue($product, 'minimal_quantity') : 1);
                     $data->assign('available_date', ($this->getFieldValue($product, 'available_date') != 0) ? stripslashes(htmlentities($this->getFieldValue($product, 'available_date'), $this->context->language->id)) : '0000-00-00');
@@ -3950,130 +3835,6 @@ public function renderListAttributes($product, $currency)
         return $helper->generateList($comb_array, $this->fields_list);
     }
 
-    /*
-    * module: pscsx32412
-    * date: 2018-12-26 14:14:05
-    * version: 1
-    */
-    public function initFormQuantities($obj)
-    {
-        if (!$this->default_form_language) {
-            $this->getLanguages();
-        }
-        $data = $this->createTemplate($this->tpl_form);
-        $data->assign('default_form_language', $this->default_form_language);
-        if ($obj->id) {
-            if ($this->product_exists_in_shop) {
-                $attributes = $obj->getAttributesResume($this->context->language->id);
-                if (empty($attributes)) {
-                    $attributes[] = [
-                        'id_product_attribute' => 0,
-                        'attribute_designation' => '',
-                    ];
-                }
-                $available_quantity = [];
-                $product_designation = [];
-                foreach ($attributes as $attribute) {
-                    $available_quantity[$attribute['id_product_attribute']] = StockAvailable::getQuantityAvailableByProduct(
-                        (int) $obj->id,
-                                                                                                                            $attribute['id_product_attribute']
-                    );
-                    $product_designation[$attribute['id_product_attribute']] = rtrim(
-                        $obj->name[$this->context->language->id] . ' - ' . $attribute['attribute_designation'],
-                        ' - '
-                    );
-                }
-                $show_quantities = true;
-                $shop_context = Shop::getContext();
-                $shop_group = new ShopGroup((int) Shop::getContextShopGroupID());
-                if (Shop::isFeatureActive() && $shop_context == Shop::CONTEXT_ALL) {
-                    $show_quantities = false;
-                } elseif (Shop::isFeatureActive() && $shop_context == Shop::CONTEXT_GROUP) {
-                    if (!$shop_group->share_stock) {
-                        $show_quantities = false;
-                    }
-                } else {
-                    if ($shop_group->share_stock) {
-                        $show_quantities = false;
-                    }
-                }
-                $data->assign('ps_stock_management', Configuration::get('PS_STOCK_MANAGEMENT'));
-                $data->assign('has_attribute', $obj->hasAttributes());
-                if (Combination::isFeatureActive()) {
-                    $data->assign('countAttributes', (int) Db::getInstance()->getValue('SELECT COUNT(id_product) FROM ' . _DB_PREFIX_ . 'product_attribute WHERE id_product = ' . (int) $obj->id));
-                } else {
-                    $data->assign('countAttributes', false);
-                }
-                $advanced_stock_management_warning = false;
-                if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && $obj->advanced_stock_management) {
-                    $p_attributes = Product::getProductAttributesIds($obj->id);
-                    $warehouses = [];
-                    if (!$p_attributes) {
-                        $warehouses[] = Warehouse::getProductWarehouseList($obj->id, 0);
-                    }
-                    foreach ($p_attributes as $p_attribute) {
-                        $ws = Warehouse::getProductWarehouseList($obj->id, $p_attribute['id_product_attribute']);
-                        if ($ws) {
-                            $warehouses[] = $ws;
-                        }
-                    }
-                    $warehouses = Tools::arrayUnique($warehouses);
-                    if (empty($warehouses)) {
-                        $advanced_stock_management_warning = true;
-                    }
-                }
-                if ($advanced_stock_management_warning) {
-                    $this->displayWarning($this->l('If you wish to use the advanced stock management, you must:'));
-                    $this->displayWarning('- ' . $this->l('associate your products with warehouses.'));
-                    $this->displayWarning('- ' . $this->l('associate your warehouses with carriers.'));
-                    $this->displayWarning('- ' . $this->l('associate your warehouses with the appropriate shops.'));
-                }
-                $pack_quantity = null;
-                if (Pack::isPack($obj->id)) {
-                    $items = Pack::getItems((int) $obj->id, Configuration::get('PS_LANG_DEFAULT'));
-                    $pack_quantities = [];
-                    foreach ($items as $item) {
-                        if (!$item->isAvailableWhenOutOfStock((int) $item->out_of_stock)) {
-                            $pack_id_product_attribute = Product::getDefaultAttribute($item->id, 1);
-                            $pack_quantities[] = Product::getQuantity($item->id, $pack_id_product_attribute) / ($item->pack_quantity !== 0 ? $item->pack_quantity : 1);
-                        }
-                    }
-                    if (count($pack_quantities)) {
-                        $pack_quantity = $pack_quantities[0];
-                        foreach ($pack_quantities as $value) {
-                            if ($pack_quantity > $value) {
-                                $pack_quantity = $value;
-                            }
-                        }
-                    }
-                    if (!Warehouse::getPackWarehouses((int) $obj->id)) {
-                        $this->displayWarning($this->l('You must have a common warehouse between this pack and its product.'));
-                    }
-                }
-                $data->assign([
-                    'attributes' => $attributes,
-                    'available_quantity' => $available_quantity,
-                    'pack_quantity' => $pack_quantity,
-                    'stock_management_active' => Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT'),
-                    'product_designation' => $product_designation,
-                    'product' => $obj,
-                    'show_quantities' => $show_quantities,
-                    'order_out_of_stock' => Configuration::get('PS_ORDER_OUT_OF_STOCK'),
-                    'pack_stock_type' => Configuration::get('PS_PACK_STOCK_TYPE'),
-                    'token_preferences' => Tools::getAdminTokenLite('AdminPPreferences'),
-                    'token' => $this->token,
-                    'languages' => $this->_languages,
-                    'id_lang' => $this->context->language->id,
-                ]);
-            } else {
-                $this->displayWarning($this->l('You must save the product in this shop before managing quantities.'));
-            }
-        } else {
-            $this->displayWarning($this->l('You must save this product before managing quantities.'));
-        }
-        $this->tpl_form_vars['custom_form'] = $data->fetch();
-    }
-
     /*
     * module: pscsx32412
     * date: 2018-12-26 14:14:05
@@ -4139,51 +3900,6 @@ public function initFormSuppliers($obj)
         $this->tpl_form_vars['custom_form'] = $data->fetch();
     }
 
-    /*
-    * module: pscsx32412
-    * date: 2018-12-26 14:14:05
-    * version: 1
-    */
-    public function initFormWarehouses($obj)
-    {
-        $data = $this->createTemplate($this->tpl_form);
-        if ($obj->id) {
-            if ($this->product_exists_in_shop) {
-                $attributes = $obj->getAttributesResume($this->context->language->id);
-                if (empty($attributes)) {
-                    $attributes[] = [
-                        'id_product' => $obj->id,
-                        'id_product_attribute' => 0,
-                        'attribute_designation' => '',
-                    ];
-                }
-                $product_designation = [];
-                foreach ($attributes as $attribute) {
-                    $product_designation[$attribute['id_product_attribute']] = rtrim(
-                        $obj->name[$this->context->language->id] . ' - ' . $attribute['attribute_designation'],
-                        ' - '
-                    );
-                }
-                $warehouses = Warehouse::getWarehouses(true);
-                $associated_warehouses_collection = WarehouseProductLocation::getCollection($obj->id);
-                $data->assign([
-                    'attributes' => $attributes,
-                    'warehouses' => $warehouses,
-                    'associated_warehouses' => $associated_warehouses_collection,
-                    'product_designation' => $product_designation,
-                    'product' => $obj,
-                    'link' => $this->context->link,
-                    'token' => $this->token,
-                ]);
-            } else {
-                $this->displayWarning($this->l('You must save the product in this shop before managing warehouses.'));
-            }
-        } else {
-            $this->displayWarning($this->l('You must save this product before managing warehouses.'));
-        }
-        $this->tpl_form_vars['custom_form'] = $data->fetch();
-    }
-
     /*
     * module: pscsx32412
     * date: 2018-12-26 14:14:05
@@ -4250,38 +3966,6 @@ public function ajaxProcessProductQuantity()
         }
         $product = new Product((int) Tools::getValue('id_product'), true);
         switch (Tools::getValue('actionQty')) {
-            case 'depends_on_stock':
-                if (Tools::getValue('value') === false) {
-                    die(json_encode(['error' => $this->l('Undefined value')]));
-                }
-                if ((int) Tools::getValue('value') != 0 && (int) Tools::getValue('value') != 1) {
-                    die(json_encode(['error' => $this->l('Incorrect value')]));
-                }
-                if (!$product->advanced_stock_management && (int) Tools::getValue('value') == 1) {
-                    die(json_encode(['error' => $this->l('Not possible if advanced stock management is disabled. ')]));
-                }
-                if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')
-                    && (int) Tools::getValue('value') == 1
-                    && (
-                        Pack::isPack($product->id)
-                        && !Pack::allUsesAdvancedStockManagement($product->id)
-                        && (
-                            $product->pack_stock_type == Pack::STOCK_TYPE_PACK_BOTH
-                            || $product->pack_stock_type == Pack::STOCK_TYPE_PRODUCTS_ONLY
-                            || (
-                                $product->pack_stock_type == Pack::STOCK_TYPE_DEFAULT
-                                && (Configuration::get('PS_PACK_STOCK_TYPE') == Pack::STOCK_TYPE_PRODUCTS_ONLY
-                                    || Configuration::get('PS_PACK_STOCK_TYPE') == Pack::STOCK_TYPE_PACK_BOTH)
-                            )
-                        )
-                    )
-                ) {
-                    die(json_encode(['error' => $this->l('You cannot use advanced stock management for this pack because') . '</br>' .
-                        $this->l('- advanced stock management is not enabled for these products') . '</br>' .
-                        $this->l('- you have chosen to decrement products quantities.'), ]));
-                }
-                StockAvailable::setProductDependsOnStock($product->id, (int) Tools::getValue('value'));
-                break;
             case 'pack_stock_type':
                 $value = Tools::getValue('value');
                 if ($value === false) {
@@ -4291,22 +3975,6 @@ public function ajaxProcessProductQuantity()
                     && (int) $value != 2 && (int) $value != 3) {
                     die(json_encode(['error' => $this->l('Incorrect value')]));
                 }
-                if ($product->depends_on_stock
-                    && !Pack::allUsesAdvancedStockManagement($product->id)
-                    && (
-                        (int) $value == 1
-                        || (int) $value == 2
-                        || (
-                            (int) $value == 3
-                            && (Configuration::get('PS_PACK_STOCK_TYPE') == Pack::STOCK_TYPE_PRODUCTS_ONLY
-                                || Configuration::get('PS_PACK_STOCK_TYPE') == Pack::STOCK_TYPE_PACK_BOTH)
-                        )
-                    )
-                ) {
-                    die(json_encode(['error' => $this->l('You cannot use this stock management option because:') . '</br>' .
-                        $this->l('- advanced stock management is not enabled for these products') . '</br>' .
-                        $this->l('- advanced stock management is enabled for the pack'), ]));
-                }
                 Product::setPackStockType($product->id, $value);
                 break;
             case 'out_of_stock':
@@ -4333,21 +4001,6 @@ public function ajaxProcessProductQuantity()
                     die(json_encode(['error' => $error]));
                 }
                 break;
-            case 'advanced_stock_management':
-                if (Tools::getValue('value') === false) {
-                    die(json_encode(['error' => $this->l('Undefined value')]));
-                }
-                if ((int) Tools::getValue('value') != 1 && (int) Tools::getValue('value') != 0) {
-                    die(json_encode(['error' => $this->l('Incorrect value')]));
-                }
-                if (!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && (int) Tools::getValue('value') == 1) {
-                    die(json_encode(['error' => $this->l('Not possible if advanced stock management is disabled. ')]));
-                }
-                $product->setAdvancedStockManagement((int) Tools::getValue('value'));
-                if (StockAvailable::dependsOnStock($product->id) == 1 && (int) Tools::getValue('value') == 0) {
-                    StockAvailable::setProductDependsOnStock($product->id, 0);
-                }
-                break;
         }
         die(json_encode(['error' => false]));
     }
@@ -4721,9 +4374,8 @@ public function __construct()
             'Attachments' => $this->l('Attachments'),
             'Quantities' => $this->l('Quantities'),
             'Suppliers' => $this->l('Suppliers'),
-            'Warehouses' => $this->l('Warehouses'),
         ];
-        $this->available_tabs = ['Quantities' => 6, 'Warehouses' => 14];
+        $this->available_tabs = ['Quantities' => 6];
         if ($this->context->shop->getContext() != Shop::CONTEXT_GROUP) {
             $this->available_tabs = array_merge($this->available_tabs, [
                 'Informations' => 0,
diff --git a/tests/Resources/modules_tests/pscsx3241/override/controllers/admin/AdminProductsController.php b/tests/Resources/modules_tests/pscsx3241/override/controllers/admin/AdminProductsController.php
index 02fa7267917d4..519f3b571176e 100644
--- a/tests/Resources/modules_tests/pscsx3241/override/controllers/admin/AdminProductsController.php
+++ b/tests/Resources/modules_tests/pscsx3241/override/controllers/admin/AdminProductsController.php
@@ -98,10 +98,9 @@ public function __construct()
             'Attachments' => $this->l('Attachments'),
             'Quantities' => $this->l('Quantities'),
             'Suppliers' => $this->l('Suppliers'),
-            'Warehouses' => $this->l('Warehouses'),
         ];
 
-        $this->available_tabs = ['Quantities' => 6, 'Warehouses' => 14];
+        $this->available_tabs = ['Quantities' => 6];
         if ($this->context->shop->getContext() != Shop::CONTEXT_GROUP) {
             $this->available_tabs = array_merge($this->available_tabs, [
                 'Informations' => 0,
diff --git a/tests/Resources/modules_tests/pscsx32412/override/controllers/admin/AdminProductsController.php b/tests/Resources/modules_tests/pscsx32412/override/controllers/admin/AdminProductsController.php
index 713773a6f6b6d..16a18f4b0ee10 100644
--- a/tests/Resources/modules_tests/pscsx32412/override/controllers/admin/AdminProductsController.php
+++ b/tests/Resources/modules_tests/pscsx32412/override/controllers/admin/AdminProductsController.php
@@ -446,21 +446,6 @@ public function processDelete()
             if (isset($object->noZeroObject) && count($taxes = call_user_func([$this->className, $object->noZeroObject])) <= 1) {
                 $this->errors[] = Tools::displayError('You need at least one object.') . ' <b>' . $this->table . '</b><br />' . Tools::displayError('You cannot delete all of the items.');
             } else {
-                /*
-                 * @since 1.5.0
-                 * It is NOT possible to delete a product if there are currently:
-                 * - physical stock for this product
-                 * - supply order(s) for this product
-                 */
-                if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && $object->advanced_stock_management) {
-                    $stock_manager = StockManagerFactory::getManager();
-                    $physical_quantity = $stock_manager->getProductPhysicalQuantities($object->id, 0);
-                    $real_quantity = $stock_manager->getProductRealQuantities($object->id, 0);
-                    if ($physical_quantity > 0 || $real_quantity > $physical_quantity) {
-                        $this->errors[] = Tools::displayError('You cannot delete this product because there is physical stock left.');
-                    }
-                }
-
                 if (!count($this->errors)) {
                     if ($object->delete()) {
                         $id_category = (int) Tools::getValue('id_category');
@@ -531,25 +516,8 @@ protected function processBulkDelete()
                             ini_set('max_execution_time', round($count * 1.5));
                         }
 
-                        if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) {
-                            $stock_manager = StockManagerFactory::getManager();
-                        }
-
                         foreach ($products as $id_product) {
                             $product = new Product((int) $id_product);
-                            /*
-                             * @since 1.5.0
-                             * It is NOT possible to delete a product if there are currently:
-                             * - physical stock for this product
-                             * - supply order(s) for this product
-                             */
-                            if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && $product->advanced_stock_management) {
-                                $physical_quantity = $stock_manager->getProductPhysicalQuantities($product->id, 0);
-                                $real_quantity = $stock_manager->getProductRealQuantities($product->id, 0);
-                                if ($physical_quantity > 0 || $real_quantity > $physical_quantity) {
-                                    $this->errors[] = sprintf(Tools::displayError('You cannot delete the product #%d because there is physical stock left.'), $product->id);
-                                }
-                            }
                             if (!count($this->errors)) {
                                 if ($product->delete()) {
                                     PrestaShopLogger::addLog(sprintf($this->l('%s deletion', 'AdminTab', false, false), $this->className), 1, null, $this->className, (int) $product->id, true, (int) $this->context->employee->id);
@@ -655,7 +623,6 @@ public function processProductAttribute()
                                 $this->isProductFieldUpdated('available_date_attribute') ? Tools::getValue('available_date_attribute') : null,
                                 false
                             );
-                            StockAvailable::setProductDependsOnStock((int) $product->id, $product->depends_on_stock, null, (int) $id_product_attribute);
                             StockAvailable::setProductOutOfStock((int) $product->id, $product->out_of_stock, null, (int) $id_product_attribute);
                         }
                     } else {
@@ -686,7 +653,6 @@ public function processProductAttribute()
                                 Tools::getValue('available_date_attribute'),
                                 Tools::getValue('attribute_isbn')
                             );
-                            StockAvailable::setProductDependsOnStock((int) $product->id, $product->depends_on_stock, null, (int) $id_product_attribute);
                             StockAvailable::setProductOutOfStock((int) $product->id, $product->out_of_stock, null, (int) $id_product_attribute);
                         }
                     } else {
@@ -1176,34 +1142,20 @@ public function ajaxProcessDeleteProductAttribute()
             $id_product_attribute = (int) Tools::getValue('id_product_attribute');
 
             if ($id_product && Validate::isUnsignedId($id_product) && Validate::isLoadedObject($product = new Product($id_product))) {
-                if (($depends_on_stock = StockAvailable::dependsOnStock($id_product)) && StockAvailable::getQuantityAvailableByProduct($id_product, $id_product_attribute)) {
-                    $json = [
-                        'status' => 'error',
-                        'message' => $this->l('It is not possible to delete a combination while it still has some quantities in the Advanced Stock Management. You must delete its stock first.'),
-                    ];
+                $product->deleteAttributeCombination((int) $id_product_attribute);
+                $product->checkDefaultAttributes();
+                if (!$product->hasAttributes()) {
+                    $product->cache_default_attribute = 0;
+                    $product->update();
                 } else {
-                    $product->deleteAttributeCombination((int) $id_product_attribute);
-                    $product->checkDefaultAttributes();
-                    if (!$product->hasAttributes()) {
-                        $product->cache_default_attribute = 0;
-                        $product->update();
-                    } else {
-                        Product::updateDefaultAttribute($id_product);
-                    }
-
-                    if ($depends_on_stock && !Stock::deleteStockByIds($id_product, $id_product_attribute)) {
-                        $json = [
-                            'status' => 'error',
-                            'message' => $this->l('Error while deleting the stock'),
-                        ];
-                    } else {
-                        $json = [
-                            'status' => 'ok',
-                            'message' => $this->_conf[1],
-                            'id_product_attribute' => (int) $id_product_attribute,
-                        ];
-                    }
+                    Product::updateDefaultAttribute($id_product);
                 }
+
+                $json = [
+                    'status' => 'ok',
+                    'message' => $this->_conf[1],
+                    'id_product_attribute' => (int) $id_product_attribute,
+                ];
             } else {
                 $json = [
                     'status' => 'error',
@@ -1552,12 +1504,6 @@ public function processAdd()
             $this->updatePackItems($this->object);
             $this->updateDownloadProduct($this->object);
 
-            if (Configuration::get('PS_FORCE_ASM_NEW_PRODUCT') && Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) {
-                $this->object->advanced_stock_management = 1;
-                StockAvailable::setProductDependsOnStock($this->object->id, true, (int) $this->context->shop->id, 0);
-                $this->object->save();
-            }
-
             if (empty($this->errors)) {
                 $languages = Language::getLanguages(false);
                 if ($this->isProductFieldUpdated('category_box') && !$this->object->updateCategories(Tools::getValue('categoryBox'))) {
@@ -1571,15 +1517,6 @@ public function processAdd()
                     }
                 }
 
-                if (Configuration::get('PS_DEFAULT_WAREHOUSE_NEW_PRODUCT') != 0 && Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) {
-                    $warehouse_location_entity = new WarehouseProductLocation();
-                    $warehouse_location_entity->id_product = $this->object->id;
-                    $warehouse_location_entity->id_product_attribute = 0;
-                    $warehouse_location_entity->id_warehouse = Configuration::get('PS_DEFAULT_WAREHOUSE_NEW_PRODUCT');
-                    $warehouse_location_entity->location = pSQL('');
-                    $warehouse_location_entity->save();
-                }
-
                 // Apply groups reductions
                 $this->object->setGroupReduction();
 
@@ -1699,9 +1636,7 @@ public function processUpdate()
                     // If the product doesn't exist in the current shop but exists in another shop
                     if (Shop::getContext() == Shop::CONTEXT_SHOP && !$existing_product->isAssociatedToShop($this->context->shop->id)) {
                         $out_of_stock = StockAvailable::outOfStock($existing_product->id, $existing_product->id_shop_default);
-                        $depends_on_stock = StockAvailable::dependsOnStock($existing_product->id, $existing_product->id_shop_default);
                         StockAvailable::setProductOutOfStock((int) $this->object->id, $out_of_stock, $this->context->shop->id);
-                        StockAvailable::setProductDependsOnStock((int) $this->object->id, $depends_on_stock, $this->context->shop->id);
                     }
 
                     PrestaShopLogger::addLog(sprintf($this->l('%s modification', 'AdminTab', false, false), $this->className), 1, null, $this->className, (int) $this->object->id, true, (int) $this->context->employee->id);
@@ -1736,10 +1671,6 @@ public function processUpdate()
                         }
 
                         $this->updatePackItems($object);
-                        // Disallow avanced stock management if the product become a pack
-                        if ($product_type_before == Product::PTYPE_SIMPLE && $object->getType() == Product::PTYPE_PACK) {
-                            StockAvailable::setProductDependsOnStock((int) $object->id, false);
-                        }
                         $this->updateDownloadProduct($object, 1);
                         $this->updateTags(Language::getLanguages(false), $object);
 
@@ -1748,9 +1679,6 @@ public function processUpdate()
                         }
                     }
 
-                    if ($this->isTabSubmitted('Warehouses')) {
-                        $this->processWarehouses();
-                    }
                     if (empty($this->errors)) {
                         if (in_array($object->visibility, ['both', 'search']) && Configuration::get('PS_SEARCH_INDEXATION')) {
                             Search::indexation(false, $object->id);
@@ -2134,13 +2062,7 @@ public function initContent($token = null)
                     $this->tab_display = $this->default_tab;
                 }
 
-                $advanced_stock_management_active = Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT');
                 foreach ($this->available_tabs as $product_tab => $value) {
-                    // if it's the warehouses tab and advanced stock management is disabled, continue
-                    if ($advanced_stock_management_active == 0 && $product_tab == 'Warehouses') {
-                        continue;
-                    }
-
                     $product_tabs[$product_tab] = [
                         'id' => $product_tab,
                         'selected' => (strtolower($product_tab) == strtolower($this->tab_display) || (isset($this->tab_display_module) && 'module' . $this->tab_display_module == Tools::strtolower($product_tab))),
@@ -2760,78 +2682,6 @@ public function processSuppliers()
         }
     }
 
-    /**
-     * Post treatment for warehouses
-     */
-    public function processWarehouses()
-    {
-        if ((int) Tools::getValue('warehouse_loaded') === 1 && Validate::isLoadedObject($product = new Product((int) $id_product = Tools::getValue('id_product')))) {
-            // Get all id_product_attribute
-            $attributes = $product->getAttributesResume($this->context->language->id);
-            if (empty($attributes)) {
-                $attributes[] = [
-                    'id_product_attribute' => 0,
-                    'attribute_designation' => '',
-                ];
-            }
-
-            // Get all available warehouses
-            $warehouses = Warehouse::getWarehouses(true);
-
-            // Get already associated warehouses
-            $associated_warehouses_collection = WarehouseProductLocation::getCollection($product->id);
-
-            $elements_to_manage = [];
-
-            // get form inforamtion
-            foreach ($attributes as $attribute) {
-                foreach ($warehouses as $warehouse) {
-                    $key = $warehouse['id_warehouse'] . '_' . $product->id . '_' . $attribute['id_product_attribute'];
-
-                    // get elements to manage
-                    if (Tools::isSubmit('check_warehouse_' . $key)) {
-                        $location = Tools::getValue('location_warehouse_' . $key, '');
-                        $elements_to_manage[$key] = $location;
-                    }
-                }
-            }
-
-            // Delete entry if necessary
-            foreach ($associated_warehouses_collection as $awc) {
-                if (!array_key_exists($awc->id_warehouse . '_' . $awc->id_product . '_' . $awc->id_product_attribute, $elements_to_manage)) {
-                    $awc->delete();
-                }
-            }
-
-            // Manage locations
-            foreach ($elements_to_manage as $key => $location) {
-                $params = explode('_', $key);
-
-                $wpl_id = (int) WarehouseProductLocation::getIdByProductAndWarehouse((int) $params[1], (int) $params[2], (int) $params[0]);
-
-                if (empty($wpl_id)) {
-                    //create new record
-                    $warehouse_location_entity = new WarehouseProductLocation();
-                    $warehouse_location_entity->id_product = (int) $params[1];
-                    $warehouse_location_entity->id_product_attribute = (int) $params[2];
-                    $warehouse_location_entity->id_warehouse = (int) $params[0];
-                    $warehouse_location_entity->location = pSQL($location);
-                    $warehouse_location_entity->save();
-                } else {
-                    $warehouse_location_entity = new WarehouseProductLocation((int) $wpl_id);
-
-                    $location = pSQL($location);
-
-                    if ($location != $warehouse_location_entity->location) {
-                        $warehouse_location_entity->location = pSQL($location);
-                        $warehouse_location_entity->update();
-                    }
-                }
-            }
-            StockAvailable::synchronize((int) $id_product);
-        }
-    }
-
     public function initFormAssociations($obj)
     {
         $product = $obj;
@@ -3999,7 +3849,6 @@ public function initFormAttributes($product)
                     $data->assign('ps_use_ecotax', Configuration::get('PS_USE_ECOTAX'));
                     $data->assign('field_value_unity', $this->getFieldValue($product, 'unity'));
 
-                    $data->assign('reasons', $reasons = StockMvtReason::getStockMvtReasons($this->context->language->id));
                     $data->assign('ps_stock_mvt_reason_default', $ps_stock_mvt_reason_default = Configuration::get('PS_STOCK_MVT_REASON_DEFAULT'));
                     $data->assign('minimal_quantity', $this->getFieldValue($product, 'minimal_quantity') ? $this->getFieldValue($product, 'minimal_quantity') : 1);
                     $data->assign('available_date', ($this->getFieldValue($product, 'available_date') != 0) ? stripslashes(htmlentities($this->getFieldValue($product, 'available_date'), $this->context->language->id)) : '0000-00-00');
@@ -4131,155 +3980,6 @@ public function renderListAttributes($product, $currency)
         return $helper->generateList($comb_array, $this->fields_list);
     }
 
-    public function initFormQuantities($obj)
-    {
-        if (!$this->default_form_language) {
-            $this->getLanguages();
-        }
-
-        $data = $this->createTemplate($this->tpl_form);
-        $data->assign('default_form_language', $this->default_form_language);
-
-        if ($obj->id) {
-            if ($this->product_exists_in_shop) {
-                // Get all id_product_attribute
-                $attributes = $obj->getAttributesResume($this->context->language->id);
-                if (empty($attributes)) {
-                    $attributes[] = [
-                        'id_product_attribute' => 0,
-                        'attribute_designation' => '',
-                    ];
-                }
-
-                // Get available quantities
-                $available_quantity = [];
-                $product_designation = [];
-
-                foreach ($attributes as $attribute) {
-                    // Get available quantity for the current product attribute in the current shop
-                    $available_quantity[$attribute['id_product_attribute']] = StockAvailable::getQuantityAvailableByProduct(
-                        (int) $obj->id,
-                                                                                                                            $attribute['id_product_attribute']
-                    );
-                    // Get all product designation
-                    $product_designation[$attribute['id_product_attribute']] = rtrim(
-                        $obj->name[$this->context->language->id] . ' - ' . $attribute['attribute_designation'],
-                        ' - '
-                    );
-                }
-
-                $show_quantities = true;
-                $shop_context = Shop::getContext();
-                $shop_group = new ShopGroup((int) Shop::getContextShopGroupID());
-
-                // if we are in all shops context, it's not possible to manage quantities at this level
-                if (Shop::isFeatureActive() && $shop_context == Shop::CONTEXT_ALL) {
-                    $show_quantities = false;
-                } elseif (Shop::isFeatureActive() && $shop_context == Shop::CONTEXT_GROUP) {
-                    // if we are in group shop context
-                    // if quantities are not shared between shops of the group, it's not possible to manage them at group level
-                    if (!$shop_group->share_stock) {
-                        $show_quantities = false;
-                    }
-                } else {
-                    // if we are in shop context
-                    // if quantities are shared between shops of the group, it's not possible to manage them for a given shop
-                    if ($shop_group->share_stock) {
-                        $show_quantities = false;
-                    }
-                }
-
-                $data->assign('ps_stock_management', Configuration::get('PS_STOCK_MANAGEMENT'));
-                $data->assign('has_attribute', $obj->hasAttributes());
-                // Check if product has combination, to display the available date only for the product or for each combination
-                if (Combination::isFeatureActive()) {
-                    $data->assign('countAttributes', (int) Db::getInstance()->getValue('SELECT COUNT(id_product) FROM ' . _DB_PREFIX_ . 'product_attribute WHERE id_product = ' . (int) $obj->id));
-                } else {
-                    $data->assign('countAttributes', false);
-                }
-                // if advanced stock management is active, checks associations
-                $advanced_stock_management_warning = false;
-                if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && $obj->advanced_stock_management) {
-                    $p_attributes = Product::getProductAttributesIds($obj->id);
-                    $warehouses = [];
-
-                    if (!$p_attributes) {
-                        $warehouses[] = Warehouse::getProductWarehouseList($obj->id, 0);
-                    }
-
-                    foreach ($p_attributes as $p_attribute) {
-                        $ws = Warehouse::getProductWarehouseList($obj->id, $p_attribute['id_product_attribute']);
-                        if ($ws) {
-                            $warehouses[] = $ws;
-                        }
-                    }
-                    $warehouses = Tools::arrayUnique($warehouses);
-
-                    if (empty($warehouses)) {
-                        $advanced_stock_management_warning = true;
-                    }
-                }
-                if ($advanced_stock_management_warning) {
-                    $this->displayWarning($this->l('If you wish to use the advanced stock management, you must:'));
-                    $this->displayWarning('- ' . $this->l('associate your products with warehouses.'));
-                    $this->displayWarning('- ' . $this->l('associate your warehouses with carriers.'));
-                    $this->displayWarning('- ' . $this->l('associate your warehouses with the appropriate shops.'));
-                }
-
-                $pack_quantity = null;
-                // if product is a pack
-                if (Pack::isPack($obj->id)) {
-                    $items = Pack::getItems((int) $obj->id, Configuration::get('PS_LANG_DEFAULT'));
-
-                    // gets an array of quantities (quantity for the product / quantity in pack)
-                    $pack_quantities = [];
-                    foreach ($items as $item) {
-                        if (!$item->isAvailableWhenOutOfStock((int) $item->out_of_stock)) {
-                            $pack_id_product_attribute = Product::getDefaultAttribute($item->id, 1);
-                            $pack_quantities[] = Product::getQuantity($item->id, $pack_id_product_attribute) / ($item->pack_quantity !== 0 ? $item->pack_quantity : 1);
-                        }
-                    }
-
-                    // gets the minimum
-                    if (count($pack_quantities)) {
-                        $pack_quantity = $pack_quantities[0];
-                        foreach ($pack_quantities as $value) {
-                            if ($pack_quantity > $value) {
-                                $pack_quantity = $value;
-                            }
-                        }
-                    }
-
-                    if (!Warehouse::getPackWarehouses((int) $obj->id)) {
-                        $this->displayWarning($this->l('You must have a common warehouse between this pack and its product.'));
-                    }
-                }
-
-                $data->assign([
-                    'attributes' => $attributes,
-                    'available_quantity' => $available_quantity,
-                    'pack_quantity' => $pack_quantity,
-                    'stock_management_active' => Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT'),
-                    'product_designation' => $product_designation,
-                    'product' => $obj,
-                    'show_quantities' => $show_quantities,
-                    'order_out_of_stock' => Configuration::get('PS_ORDER_OUT_OF_STOCK'),
-                    'pack_stock_type' => Configuration::get('PS_PACK_STOCK_TYPE'),
-                    'token_preferences' => Tools::getAdminTokenLite('AdminPPreferences'),
-                    'token' => $this->token,
-                    'languages' => $this->_languages,
-                    'id_lang' => $this->context->language->id,
-                ]);
-            } else {
-                $this->displayWarning($this->l('You must save the product in this shop before managing quantities.'));
-            }
-        } else {
-            $this->displayWarning($this->l('You must save this product before managing quantities.'));
-        }
-
-        $this->tpl_form_vars['custom_form'] = $data->fetch();
-    }
-
     public function initFormSuppliers($obj)
     {
         $data = $this->createTemplate($this->tpl_form);
@@ -4356,56 +4056,6 @@ public function initFormSuppliers($obj)
         $this->tpl_form_vars['custom_form'] = $data->fetch();
     }
 
-    public function initFormWarehouses($obj)
-    {
-        $data = $this->createTemplate($this->tpl_form);
-
-        if ($obj->id) {
-            if ($this->product_exists_in_shop) {
-                // Get all id_product_attribute
-                $attributes = $obj->getAttributesResume($this->context->language->id);
-                if (empty($attributes)) {
-                    $attributes[] = [
-                        'id_product' => $obj->id,
-                        'id_product_attribute' => 0,
-                        'attribute_designation' => '',
-                    ];
-                }
-
-                $product_designation = [];
-
-                foreach ($attributes as $attribute) {
-                    $product_designation[$attribute['id_product_attribute']] = rtrim(
-                        $obj->name[$this->context->language->id] . ' - ' . $attribute['attribute_designation'],
-                        ' - '
-                    );
-                }
-
-                // Get all available warehouses
-                $warehouses = Warehouse::getWarehouses(true);
-
-                // Get already associated warehouses
-                $associated_warehouses_collection = WarehouseProductLocation::getCollection($obj->id);
-
-                $data->assign([
-                    'attributes' => $attributes,
-                    'warehouses' => $warehouses,
-                    'associated_warehouses' => $associated_warehouses_collection,
-                    'product_designation' => $product_designation,
-                    'product' => $obj,
-                    'link' => $this->context->link,
-                    'token' => $this->token,
-                ]);
-            } else {
-                $this->displayWarning($this->l('You must save the product in this shop before managing warehouses.'));
-            }
-        } else {
-            $this->displayWarning($this->l('You must save this product before managing warehouses.'));
-        }
-
-        $this->tpl_form_vars['custom_form'] = $data->fetch();
-    }
-
     public function initFormFeatures($obj)
     {
         if (!$this->default_form_language) {
@@ -4470,41 +4120,6 @@ public function ajaxProcessProductQuantity()
 
         $product = new Product((int) Tools::getValue('id_product'), true);
         switch (Tools::getValue('actionQty')) {
-            case 'depends_on_stock':
-                if (Tools::getValue('value') === false) {
-                    die(json_encode(['error' => $this->l('Undefined value')]));
-                }
-                if ((int) Tools::getValue('value') != 0 && (int) Tools::getValue('value') != 1) {
-                    die(json_encode(['error' => $this->l('Incorrect value')]));
-                }
-                if (!$product->advanced_stock_management && (int) Tools::getValue('value') == 1) {
-                    die(json_encode(['error' => $this->l('Not possible if advanced stock management is disabled. ')]));
-                }
-                if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')
-                    && (int) Tools::getValue('value') == 1
-                    && (
-                        Pack::isPack($product->id)
-                        && !Pack::allUsesAdvancedStockManagement($product->id)
-                        && (
-                            $product->pack_stock_type == Pack::STOCK_TYPE_PACK_BOTH
-                            || $product->pack_stock_type == Pack::STOCK_TYPE_PRODUCTS_ONLY
-                            || (
-                                $product->pack_stock_type == Pack::STOCK_TYPE_DEFAULT
-                                && (Configuration::get('PS_PACK_STOCK_TYPE') == Pack::STOCK_TYPE_PRODUCTS_ONLY
-                                    || Configuration::get('PS_PACK_STOCK_TYPE') == Pack::STOCK_TYPE_PACK_BOTH)
-                            )
-                        )
-                    )
-                ) {
-                    die(json_encode(['error' => $this->l('You cannot use advanced stock management for this pack because') . '</br>' .
-                        $this->l('- advanced stock management is not enabled for these products') . '</br>' .
-                        $this->l('- you have chosen to decrement products quantities.'), ]));
-                }
-
-                StockAvailable::setProductDependsOnStock($product->id, (int) Tools::getValue('value'));
-
-                break;
-
             case 'pack_stock_type':
                 $value = Tools::getValue('value');
                 if ($value === false) {
@@ -4514,22 +4129,6 @@ public function ajaxProcessProductQuantity()
                     && (int) $value != 2 && (int) $value != 3) {
                     die(json_encode(['error' => $this->l('Incorrect value')]));
                 }
-                if ($product->depends_on_stock
-                    && !Pack::allUsesAdvancedStockManagement($product->id)
-                    && (
-                        (int) $value == 1
-                        || (int) $value == 2
-                        || (
-                            (int) $value == 3
-                            && (Configuration::get('PS_PACK_STOCK_TYPE') == Pack::STOCK_TYPE_PRODUCTS_ONLY
-                                || Configuration::get('PS_PACK_STOCK_TYPE') == Pack::STOCK_TYPE_PACK_BOTH)
-                        )
-                    )
-                ) {
-                    die(json_encode(['error' => $this->l('You cannot use this stock management option because:') . '</br>' .
-                        $this->l('- advanced stock management is not enabled for these products') . '</br>' .
-                        $this->l('- advanced stock management is enabled for the pack'), ]));
-                }
 
                 Product::setPackStockType($product->id, $value);
 
@@ -4565,23 +4164,6 @@ public function ajaxProcessProductQuantity()
                     die(json_encode(['error' => $error]));
                 }
 
-                break;
-            case 'advanced_stock_management':
-                if (Tools::getValue('value') === false) {
-                    die(json_encode(['error' => $this->l('Undefined value')]));
-                }
-                if ((int) Tools::getValue('value') != 1 && (int) Tools::getValue('value') != 0) {
-                    die(json_encode(['error' => $this->l('Incorrect value')]));
-                }
-                if (!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && (int) Tools::getValue('value') == 1) {
-                    die(json_encode(['error' => $this->l('Not possible if advanced stock management is disabled. ')]));
-                }
-
-                $product->setAdvancedStockManagement((int) Tools::getValue('value'));
-                if (StockAvailable::dependsOnStock($product->id) == 1 && (int) Tools::getValue('value') == 0) {
-                    StockAvailable::setProductDependsOnStock($product->id, 0);
-                }
-
                 break;
         }
         die(json_encode(['error' => false]));
diff --git a/tests/Unit/Classes/ToolsTest.php b/tests/Unit/Classes/ToolsTest.php
index 7fc6cd2d53c0f..0a583f729c8bc 100644
--- a/tests/Unit/Classes/ToolsTest.php
+++ b/tests/Unit/Classes/ToolsTest.php
@@ -339,17 +339,12 @@ public function providerToCamelCase(): array
             ['stock_mvt_reason_lang', 'stockMvtReasonLang', false],
             ['store_lang', 'storeLang', false],
             ['supplier_lang', 'supplierLang', false],
-            ['supply_order_state', 'supplyOrderState', false],
-            ['supply_order_state_lang', 'supplyOrderStateLang', false],
             ['tab', 'tab', false],
             ['tax_lang', 'taxLang', false],
-            ['warehouse', 'warehouse', false],
             ['web_browser', 'webBrowser', false],
             ['zone', 'zone', false],
             // True
             ['supplier_lang', 'SupplierLang', true],
-            ['supply_order_state', 'SupplyOrderState', true],
-            ['supply_order_state_lang', 'SupplyOrderStateLang', true],
             ['tab', 'Tab', true],
         ];
     }

From c99a10889d30a97376373af1bf496dc73cc2dc4b Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Wed, 12 Jul 2023 14:06:54 +0200
Subject: [PATCH 0515/1030] Nightly : 8.1.x - Skip test for the issue 32914

---
 .../11_international/03_taxes/01_taxes/04_taxOptionsForm.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/04_taxOptionsForm.ts b/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/04_taxOptionsForm.ts
index 69e115fbce868..0d5bcf76b9358 100644
--- a/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/04_taxOptionsForm.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/04_taxOptionsForm.ts
@@ -62,6 +62,12 @@ describe('BO - International - Taxes : Edit Tax options with all EcoTax values',
       \tEcotax: '${taxOption.ecoTax}'`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `updateForm${index + 1}`, baseContext);
 
+        // @todo : https://github.com/PrestaShop/PrestaShop/issues/32914
+        if (taxOption.ecoTax === 'FR Taux standard (20%)') {
+          this.skip();
+          return;
+        }
+
         const textResult = await taxesPage.updateTaxOption(page, taxOption);
         await expect(textResult).to.be.equal('Update successful');
       });

From 0c392a9416d92e2de88d5b71cd625a206957f384 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Wed, 12 Jul 2023 14:14:22 +0200
Subject: [PATCH 0516/1030] Nightly : 8.0.x - Skip test for the issue 32914

---
 .../11_international/03_taxes/01_taxes/04_taxOptionsForm.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/04_taxOptionsForm.js b/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/04_taxOptionsForm.js
index d4eabe6e12657..e51ab53ad3e67 100644
--- a/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/04_taxOptionsForm.js
+++ b/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/04_taxOptionsForm.js
@@ -60,6 +60,12 @@ describe('BO - International - Taxes : Edit Tax options with all EcoTax values',
       \tEcotax: '${taxOption.ecoTax}'`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `updateForm${index + 1}`, baseContext);
 
+        // @todo : https://github.com/PrestaShop/PrestaShop/issues/32914
+        if (taxOption.ecoTax === 'FR Taux standard (20%)') {
+          this.skip();
+          return;
+        }
+
         const textResult = await taxesPage.updateTaxOption(page, taxOption);
         await expect(textResult).to.be.equal('Update successful');
       });

From 1edebbef49cc00b020c18436aa16941d42e28af0 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Wed, 12 Jul 2023 09:34:57 +0200
Subject: [PATCH 0517/1030] Product Page : Remove v1 & Set v2 as main for
 Sanity Tests

---
 .github/workflows/sanity-productV2.yml        |  53 -----
 .../productV2/sanity/01_filterProducts.ts     | 171 --------------
 .../sanity/03_productsBO/01_filterProducts.ts | 157 ++++++++-----
 .../03_productsBO}/02_CRUDStandardProduct.ts  |   0
 .../02_CRUDStandardProductInBO.ts             | 217 ------------------
 .../03_CRUDProductWithCombinations.ts         |   0
 ...CRUDStandardProductWithCombinationsInBO.ts | 192 ----------------
 .../03_productsBO}/04_CRUDVirtualProduct.ts   |   0
 .../sanity/03_productsBO/04_deleteProduct.ts  | 119 ----------
 .../03_productsBO}/05_deleteProduct.ts        |   0
 .../05_deleteProductsWithBulkActions.ts       | 128 -----------
 .../06_deleteProductsWithBulkActions.ts       |   0
 tests/UI/package.json                         |   2 -
 13 files changed, 100 insertions(+), 939 deletions(-)
 delete mode 100644 .github/workflows/sanity-productV2.yml
 delete mode 100644 tests/UI/campaigns/productV2/sanity/01_filterProducts.ts
 rename tests/UI/campaigns/{productV2/sanity => sanity/03_productsBO}/02_CRUDStandardProduct.ts (100%)
 delete mode 100644 tests/UI/campaigns/sanity/03_productsBO/02_CRUDStandardProductInBO.ts
 rename tests/UI/campaigns/{productV2/sanity => sanity/03_productsBO}/03_CRUDProductWithCombinations.ts (100%)
 delete mode 100644 tests/UI/campaigns/sanity/03_productsBO/03_CRUDStandardProductWithCombinationsInBO.ts
 rename tests/UI/campaigns/{productV2/sanity => sanity/03_productsBO}/04_CRUDVirtualProduct.ts (100%)
 delete mode 100644 tests/UI/campaigns/sanity/03_productsBO/04_deleteProduct.ts
 rename tests/UI/campaigns/{productV2/sanity => sanity/03_productsBO}/05_deleteProduct.ts (100%)
 delete mode 100644 tests/UI/campaigns/sanity/03_productsBO/05_deleteProductsWithBulkActions.ts
 rename tests/UI/campaigns/{productV2/sanity => sanity/03_productsBO}/06_deleteProductsWithBulkActions.ts (100%)

diff --git a/.github/workflows/sanity-productV2.yml b/.github/workflows/sanity-productV2.yml
deleted file mode 100644
index 095900282f713..0000000000000
--- a/.github/workflows/sanity-productV2.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-name: UI tests Product V2
-on:
-  pull_request:
-
-concurrency:
-  group: ${{ github.event_name }}-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-jobs:
-  sanity_product_v2:
-    runs-on: ubuntu-latest
-    name: Sanity Product V2
-    strategy:
-      matrix:
-        php: [ '8.1', '8.2' ]
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Setup environment
-        uses: ./.github/actions/setup-prestashop-env
-        with:
-          php-version: ${{ matrix.php }}
-          mysql-version: '5.7'
-          mysql-database: 'prestashop'
-          mysql-root-password: 'password'
-          node-version: '16'
-          npm-version: '7'
-          ps-auto-install: 'true'
-          ps-dev-mode: 'false'
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Cache Playwright browsers
-        uses: actions/cache@v3
-        with:
-          path: ~/.cache/ms-playwright/
-          key: ${{ runner.os }}-browsers
-
-      - name: Run tests
-        run: npm ci && npm run test:sanity:productV2:fast-fail
-        env:
-          URL_FO: https://localhost/
-          DB_NAME: prestashop
-          DB_PASSWD: password
-          HEADLESS: true
-          ENABLE_SSL: true
-          TAKE_SCREENSHOT_AFTER_FAIL: true
-        working-directory: ./tests/UI
-
-      - uses: actions/upload-artifact@v3
-        if: ${{ always() }}
-        with:
-          name: screenshots-${{ matrix.php }}
-          path: ./tests/UI/screenshots/
diff --git a/tests/UI/campaigns/productV2/sanity/01_filterProducts.ts b/tests/UI/campaigns/productV2/sanity/01_filterProducts.ts
deleted file mode 100644
index 6cfd66e042391..0000000000000
--- a/tests/UI/campaigns/productV2/sanity/01_filterProducts.ts
+++ /dev/null
@@ -1,171 +0,0 @@
-// Import utils
-import helper from '@utils/helpers';
-import testContext from '@utils/testContext';
-
-// Import common tests
-import loginCommon from '@commonTests/BO/loginBO';
-import {
-  resetNewProductPageAsDefault,
-  setFeatureFlag,
-} from '@commonTests/BO/advancedParameters/newFeatures';
-
-// Import pages
-import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
-import dashboardPage from '@pages/BO/dashboard';
-import productsPage from '@pages/BO/catalog/productsV2';
-
-// Import data
-import Products from '@data/demo/products';
-import Categories from '@data/demo/categories';
-
-import {expect} from 'chai';
-import type {BrowserContext, Page} from 'playwright';
-
-const baseContext: string = 'productV2_sanity_filterProducts';
-
-describe('BO - Catalog - Products : Filter in Products Page', async () => {
-  let browserContext: BrowserContext;
-  let page: Page;
-  let numberOfProducts: number = 0;
-
-  // Pre-condition: Enable new product page
-  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, true, `${baseContext}_enableNewProduct`);
-
-  // before and after functions
-  before(async function () {
-    browserContext = await helper.createBrowserContext(this.browser);
-    page = await helper.newTab(browserContext);
-  });
-
-  after(async () => {
-    await helper.closeBrowserContext(browserContext);
-  });
-
-  describe('Filter products table by : ID, Name, Reference, Category, Price, Quantity and Status', async () => {
-    it('should login in BO', async function () {
-      await loginCommon.loginBO(this, page);
-    });
-
-    it('should go to \'Catalog > Products\' page', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'goToProductsPage', baseContext);
-
-      await dashboardPage.goToSubMenu(
-        page,
-        dashboardPage.catalogParentLink,
-        dashboardPage.productsLink,
-      );
-
-      const pageTitle: string = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
-    });
-
-    it('should check that no filter is applied by default', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'checkNoFilter', baseContext);
-
-      const isVisible: boolean = await productsPage.isResetButtonVisible(page);
-      await expect(isVisible, 'Reset button is visible!').to.be.false;
-    });
-
-    it('should get number of products', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'getNumberOfProduct', baseContext);
-
-      numberOfProducts = await productsPage.getNumberOfProductsFromHeader(page);
-      await expect(numberOfProducts).to.be.above(0);
-    });
-
-    [
-      {
-        args: {
-          identifier: 'filterIDMinMax',
-          filterBy: 'id_product',
-          filterValue: {min: 5, max: 10},
-          filterType: 'input',
-        },
-      },
-      {
-        args: {
-          identifier: 'filterName',
-          filterBy: 'product_name',
-          filterValue: Products.demo_14.name,
-          filterType: 'input',
-        },
-      },
-      {
-        args: {
-          identifier: 'filterReference',
-          filterBy: 'reference',
-          filterValue: Products.demo_1.reference,
-          filterType: 'input',
-        },
-      },
-      {
-        args: {
-          identifier: 'filterCategory',
-          filterBy: 'category',
-          filterValue: Categories.women.name,
-          filterType: 'input',
-        },
-      },
-      {
-        args: {
-          identifier: 'filterPriceMinMax',
-          filterBy: 'price',
-          filterValue: {min: 5, max: 10},
-          filterType: 'input',
-        },
-      },
-      {
-        args: {
-          identifier: 'filterQuantityMinMax',
-          filterBy: 'quantity',
-          filterValue: {min: 100, max: 1000},
-          filterType: 'input',
-        },
-      },
-      {
-        args: {
-          identifier: 'filterStatus',
-          filterBy: 'active',
-          filterValue: 'Yes',
-          filterType: 'select',
-        },
-      },
-    ].forEach((test) => {
-      it(`should filter list by '${test.args.filterBy}' and check result`, async function () {
-        await testContext.addContextItem(this, 'testIdentifier', `${test.args.identifier}`, baseContext);
-
-        await productsPage.filterProducts(page, test.args.filterBy, test.args.filterValue, test.args.filterType);
-
-        const numberOfProductsAfterFilter: number = await productsPage.getNumberOfProductsFromList(page);
-
-        if (test.args.filterBy === 'active') {
-          await expect(numberOfProductsAfterFilter).to.be.above(0);
-        } else {
-          await expect(numberOfProductsAfterFilter).to.be.below(numberOfProducts);
-        }
-
-        for (let i = 1; i <= numberOfProductsAfterFilter; i++) {
-          const textColumn = await productsPage.getTextColumn(page, test.args.filterBy, i);
-
-          if (typeof test.args.filterValue !== 'string') {
-            await expect(textColumn).to.within(test.args.filterValue.min, test.args.filterValue.max);
-          } else if (test.args.filterBy === 'active') {
-            await expect(textColumn).to.be.true;
-          } else {
-            await expect(textColumn).to.be.contain(test.args.filterValue);
-          }
-        }
-      });
-
-      it('should reset filter', async function () {
-        await testContext.addContextItem(this, 'testIdentifier', `resetAfter${test.args.identifier}`, baseContext);
-
-        const numberOfProductsAfterReset: number = await productsPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfProductsAfterReset).to.equal(numberOfProducts);
-      });
-    });
-  });
-
-  // Post-condition: Reset initial state
-  resetNewProductPageAsDefault(`${baseContext}_resetNewProduct`);
-});
diff --git a/tests/UI/campaigns/sanity/03_productsBO/01_filterProducts.ts b/tests/UI/campaigns/sanity/03_productsBO/01_filterProducts.ts
index 8f8c5d3084a33..6cfd66e042391 100644
--- a/tests/UI/campaigns/sanity/03_productsBO/01_filterProducts.ts
+++ b/tests/UI/campaigns/sanity/03_productsBO/01_filterProducts.ts
@@ -1,38 +1,35 @@
 // Import utils
-import testContext from '@utils/testContext';
 import helper from '@utils/helpers';
+import testContext from '@utils/testContext';
 
-// Import commonTests
+// Import common tests
 import loginCommon from '@commonTests/BO/loginBO';
 import {
-  setFeatureFlag,
   resetNewProductPageAsDefault,
+  setFeatureFlag,
 } from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
 import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
-import productsPage from '@pages/BO/catalog/products';
+import productsPage from '@pages/BO/catalog/productsV2';
 
 // Import data
-import Categories from '@data/demo/categories';
 import Products from '@data/demo/products';
-import tax from '@data/demo/tax';
+import Categories from '@data/demo/categories';
 
 import {expect} from 'chai';
 import type {BrowserContext, Page} from 'playwright';
 
-const baseContext: string = 'sanity_productsBO_filterProducts';
+const baseContext: string = 'productV2_sanity_filterProducts';
 
-// Test of filters in products page
 describe('BO - Catalog - Products : Filter in Products Page', async () => {
   let browserContext: BrowserContext;
   let page: Page;
   let numberOfProducts: number = 0;
-  let numberOfProductsOnPage: number = 0;
 
-  // Pre-condition: Disable new product page
-  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, `${baseContext}_disableNewProduct`);
+  // Pre-condition: Enable new product page
+  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, true, `${baseContext}_enableNewProduct`);
 
   // before and after functions
   before(async function () {
@@ -44,8 +41,7 @@ describe('BO - Catalog - Products : Filter in Products Page', async () => {
     await helper.closeBrowserContext(browserContext);
   });
 
-  describe('Product page V1: Filter products table by : Name, Reference, Category', async () => {
-    // Steps
+  describe('Filter products table by : ID, Name, Reference, Category, Price, Quantity and Status', async () => {
     it('should login in BO', async function () {
       await loginCommon.loginBO(this, page);
     });
@@ -59,65 +55,112 @@ describe('BO - Catalog - Products : Filter in Products Page', async () => {
         dashboardPage.productsLink,
       );
 
-      const pageTitle = await productsPage.getPageTitle(page);
+      const pageTitle: string = await productsPage.getPageTitle(page);
       await expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
-    it('should reset all filters and get number of products in BO', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'resetFilters', baseContext);
-
-      await productsPage.resetFilterCategory(page);
-
-      numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProducts).to.be.above(0);
+    it('should check that no filter is applied by default', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'checkNoFilter', baseContext);
 
-      // Do not loop more than the products displayed via the pagination
-      numberOfProductsOnPage = await productsPage.getNumberOfProductsOnPage(page);
+      const isVisible: boolean = await productsPage.isResetButtonVisible(page);
+      await expect(isVisible, 'Reset button is visible!').to.be.false;
     });
 
-    it('should check that prices have correct tax values', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'checkTaxRules', baseContext);
+    it('should get number of products', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'getNumberOfProduct', baseContext);
 
-      // Check that prices have correct tax values
-      for (let i = 1; i <= numberOfProducts && i <= numberOfProductsOnPage; i++) {
-        const productPrice = await productsPage.getProductPriceFromList(page, i, false);
-        const productPriceATI = await productsPage.getProductPriceFromList(page, i, true);
-        const conversionRate = (100 + parseInt(tax.DefaultFrTax.rate, 10)) / 100;
-        await expect(productPrice).to.equal(parseFloat((productPriceATI / conversionRate).toFixed(2)));
-      }
+      numberOfProducts = await productsPage.getNumberOfProductsFromHeader(page);
+      await expect(numberOfProducts).to.be.above(0);
     });
 
-    const tests = [
-      {args: {identifier: 'filterName', filterBy: 'name', filterValue: Products.demo_14.name}},
-      {args: {identifier: 'filterReference', filterBy: 'reference', filterValue: Products.demo_1.reference}},
-      {args: {identifier: 'filterCategory', filterBy: 'category', filterValue: Categories.men.name}},
-    ];
-    tests.forEach((test) => {
-      it(`should filter list by ${test.args.filterBy} and check result`, async function () {
-        await testContext.addContextItem(this, 'testIdentifier', `filterBy_${test.args.identifier}`, baseContext);
-
-        if (test.args.filterBy === 'category') {
-          await productsPage.filterProductsByCategory(page, test.args.filterValue);
+    [
+      {
+        args: {
+          identifier: 'filterIDMinMax',
+          filterBy: 'id_product',
+          filterValue: {min: 5, max: 10},
+          filterType: 'input',
+        },
+      },
+      {
+        args: {
+          identifier: 'filterName',
+          filterBy: 'product_name',
+          filterValue: Products.demo_14.name,
+          filterType: 'input',
+        },
+      },
+      {
+        args: {
+          identifier: 'filterReference',
+          filterBy: 'reference',
+          filterValue: Products.demo_1.reference,
+          filterType: 'input',
+        },
+      },
+      {
+        args: {
+          identifier: 'filterCategory',
+          filterBy: 'category',
+          filterValue: Categories.women.name,
+          filterType: 'input',
+        },
+      },
+      {
+        args: {
+          identifier: 'filterPriceMinMax',
+          filterBy: 'price',
+          filterValue: {min: 5, max: 10},
+          filterType: 'input',
+        },
+      },
+      {
+        args: {
+          identifier: 'filterQuantityMinMax',
+          filterBy: 'quantity',
+          filterValue: {min: 100, max: 1000},
+          filterType: 'input',
+        },
+      },
+      {
+        args: {
+          identifier: 'filterStatus',
+          filterBy: 'active',
+          filterValue: 'Yes',
+          filterType: 'select',
+        },
+      },
+    ].forEach((test) => {
+      it(`should filter list by '${test.args.filterBy}' and check result`, async function () {
+        await testContext.addContextItem(this, 'testIdentifier', `${test.args.identifier}`, baseContext);
+
+        await productsPage.filterProducts(page, test.args.filterBy, test.args.filterValue, test.args.filterType);
+
+        const numberOfProductsAfterFilter: number = await productsPage.getNumberOfProductsFromList(page);
+
+        if (test.args.filterBy === 'active') {
+          await expect(numberOfProductsAfterFilter).to.be.above(0);
         } else {
-          await productsPage.filterProducts(page, test.args.filterBy, test.args.filterValue);
+          await expect(numberOfProductsAfterFilter).to.be.below(numberOfProducts);
         }
 
-        const numberOfProductsAfterFilter = await productsPage.getNumberOfProductsFromList(page);
-        await expect(numberOfProductsAfterFilter).to.be.below(numberOfProducts);
-      });
-
-      it('should reset filter and check result', async function () {
-        await testContext.addContextItem(this, 'testIdentifier', `resetFilters_${test.args.identifier}`, baseContext);
+        for (let i = 1; i <= numberOfProductsAfterFilter; i++) {
+          const textColumn = await productsPage.getTextColumn(page, test.args.filterBy, i);
 
-        let numberOfProductsAfterReset;
-
-        if (test.args.filterBy === 'category') {
-          await productsPage.resetFilterCategory(page);
-          numberOfProductsAfterReset = await productsPage.getNumberOfProductsFromList(page);
-        } else {
-          numberOfProductsAfterReset = await productsPage.resetAndGetNumberOfLines(page);
+          if (typeof test.args.filterValue !== 'string') {
+            await expect(textColumn).to.within(test.args.filterValue.min, test.args.filterValue.max);
+          } else if (test.args.filterBy === 'active') {
+            await expect(textColumn).to.be.true;
+          } else {
+            await expect(textColumn).to.be.contain(test.args.filterValue);
+          }
         }
+      });
+
+      it('should reset filter', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', `resetAfter${test.args.identifier}`, baseContext);
 
+        const numberOfProductsAfterReset: number = await productsPage.resetAndGetNumberOfLines(page);
         await expect(numberOfProductsAfterReset).to.equal(numberOfProducts);
       });
     });
diff --git a/tests/UI/campaigns/productV2/sanity/02_CRUDStandardProduct.ts b/tests/UI/campaigns/sanity/03_productsBO/02_CRUDStandardProduct.ts
similarity index 100%
rename from tests/UI/campaigns/productV2/sanity/02_CRUDStandardProduct.ts
rename to tests/UI/campaigns/sanity/03_productsBO/02_CRUDStandardProduct.ts
diff --git a/tests/UI/campaigns/sanity/03_productsBO/02_CRUDStandardProductInBO.ts b/tests/UI/campaigns/sanity/03_productsBO/02_CRUDStandardProductInBO.ts
deleted file mode 100644
index 26ca1d1ddc501..0000000000000
--- a/tests/UI/campaigns/sanity/03_productsBO/02_CRUDStandardProductInBO.ts
+++ /dev/null
@@ -1,217 +0,0 @@
-// Import utils
-import helper from '@utils/helpers';
-import testContext from '@utils/testContext';
-
-// Import commonTests
-import {
-  resetNewProductPageAsDefault,
-  setFeatureFlag,
-} from '@commonTests/BO/advancedParameters/newFeatures';
-import loginCommon from '@commonTests/BO/loginBO';
-
-// Import BO pages
-import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
-import dashboardPage from '@pages/BO/dashboard';
-import productsPage from '@pages/BO/catalog/products';
-import addProductPage from '@pages/BO/catalog/products/add';
-// Import FO pages
-import foProductPage from '@pages/FO/product';
-
-// Import data
-import tax from '@data/demo/tax';
-import ProductData from '@data/faker/product';
-import {ProductInformations} from '@data/types/product';
-
-import {expect} from 'chai';
-import type {BrowserContext, Page} from 'playwright';
-
-const baseContext: string = 'sanity_productsBO_CRUDStandardProductInBO';
-
-// Create, read, update and delete Standard product in BO
-describe('BO - Catalog - Products : Create, read, update and delete Standard product in BO', async () => {
-  let browserContext: BrowserContext;
-  let page: Page;
-  let productInformation: ProductInformations = {
-    price: 0,
-    name: '',
-    description: '',
-    summary: '',
-  };
-
-  const productData: ProductData = new ProductData({
-    type: 'Standard product',
-    productHasCombinations: false,
-  });
-  const editedProductData: ProductData = new ProductData({
-    type: 'Standard product',
-    productHasCombinations: false,
-  });
-
-  // Pre-condition: Disable new product page
-  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, `${baseContext}_disableNewProduct`);
-
-  // before and after functions
-  before(async function () {
-    browserContext = await helper.createBrowserContext(this.browser);
-    page = await helper.newTab(browserContext);
-  });
-
-  after(async () => {
-    await helper.closeBrowserContext(browserContext);
-  });
-
-  describe('Product page V1: Perform basic crud operations', async () => {
-    // Steps
-    it('should login in BO', async function () {
-      await loginCommon.loginBO(this, page);
-    });
-
-    it('should go to \'Catalog > Products\' page', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'goToProductsPage', baseContext);
-
-      await dashboardPage.goToSubMenu(
-        page,
-        dashboardPage.catalogParentLink,
-        dashboardPage.productsLink,
-      );
-      await productsPage.closeSfToolBar(page);
-
-      const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
-    });
-
-    it('should reset all filters', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'resetFilters', baseContext);
-
-      await productsPage.resetFilterCategory(page);
-
-      const numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProducts).to.be.above(0);
-    });
-
-    it('should create product', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'createProduct', baseContext);
-
-      await productsPage.goToAddProductPage(page);
-
-      const createProductMessage = await addProductPage.createEditBasicProduct(page, productData);
-      await expect(createProductMessage).to.equal(addProductPage.settingUpdatedMessage);
-    });
-
-    it('should preview product and get all information', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'previewProduct1', baseContext);
-
-      // Preview product in FO and get product information
-      page = await addProductPage.previewProduct(page);
-      productInformation = await foProductPage.getProductInformation(page);
-
-      const pageTitle = await foProductPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productData.name);
-    });
-
-    it('should go back to BO', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'goBackToBO1', baseContext);
-
-      // Go back to BO
-      page = await foProductPage.closePage(browserContext, page, 0);
-
-      const pageTitle = await addProductPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addProductPage.pageTitle);
-    });
-
-    it('should check that all product attributes are correct', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'checkProductAttributes1', baseContext);
-
-      // Check that all Product attribute are correct
-      await Promise.all([
-        expect(productInformation.name).to.equal(productData.name),
-        expect(productInformation.price).to.equal(productData.price),
-        expect(productInformation.summary).to.equal(productData.summary),
-        expect(productInformation.description).to.contains(productData.description),
-      ]);
-    });
-
-    it('should edit Product', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'editProduct', baseContext);
-
-      const createProductMessage = await addProductPage.createEditBasicProduct(page, editedProductData);
-      await expect(createProductMessage).to.equal(addProductPage.settingUpdatedMessage);
-    });
-
-    it('should preview product and get all information', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'previewProduct2', baseContext);
-
-      page = await addProductPage.previewProduct(page);
-      productInformation = await foProductPage.getProductInformation(page);
-    });
-
-    it('should go back to BO', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'goBackToBO2', baseContext);
-
-      page = await foProductPage.closePage(browserContext, page, 0);
-
-      const pageTitle = await addProductPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addProductPage.pageTitle);
-    });
-
-    it('should check that all product attributes are correct', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'checkProductAttributes2', baseContext);
-
-      // Check that all Product attribute are correct
-      await Promise.all([
-        expect(productInformation.name).to.equal(editedProductData.name),
-        expect(productInformation.price).to.equal(editedProductData.price),
-        expect(productInformation.summary).to.be.equal(editedProductData.summary),
-        expect(productInformation.description).to.be.equal(editedProductData.description),
-      ]);
-    });
-
-    it('should go to \'Catalog > Products\' page', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'goToProductsPageToCheckPrices', baseContext);
-
-      await addProductPage.goToSubMenu(
-        page,
-        addProductPage.catalogParentLink,
-        addProductPage.productsLink,
-      );
-
-      const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
-    });
-
-    it('should filter list by reference and check prices', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'checkProductsPrices', baseContext);
-
-      await productsPage.filterProducts(page, 'reference', editedProductData.reference);
-
-      const productPrice = await productsPage.getProductPriceFromList(page, 1, false);
-      const productPriceATI = await productsPage.getProductPriceFromList(page, 1, true);
-
-      const conversionRate = (100 + parseInt(tax.DefaultFrTax.rate, 10)) / 100;
-      await expect(productPrice).to.equal(parseFloat((editedProductData.price / conversionRate).toFixed(2)));
-      await expect(productPriceATI).to.equal(editedProductData.price);
-    });
-
-    it('should go to edit product page', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'goToEditProductPage', baseContext);
-
-      await productsPage.goToEditProductPage(page, 1);
-
-      const pageTitle = await addProductPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addProductPage.pageTitle);
-    });
-
-    it('should delete product and be on product list page', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'deleteProduct', baseContext);
-
-      const testResult = await addProductPage.deleteProduct(page);
-      await expect(testResult).to.equal(productsPage.productDeletedSuccessfulMessage);
-
-      const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
-    });
-  });
-
-  // Post-condition: Reset initial state
-  resetNewProductPageAsDefault(`${baseContext}_resetNewProduct`);
-});
diff --git a/tests/UI/campaigns/productV2/sanity/03_CRUDProductWithCombinations.ts b/tests/UI/campaigns/sanity/03_productsBO/03_CRUDProductWithCombinations.ts
similarity index 100%
rename from tests/UI/campaigns/productV2/sanity/03_CRUDProductWithCombinations.ts
rename to tests/UI/campaigns/sanity/03_productsBO/03_CRUDProductWithCombinations.ts
diff --git a/tests/UI/campaigns/sanity/03_productsBO/03_CRUDStandardProductWithCombinationsInBO.ts b/tests/UI/campaigns/sanity/03_productsBO/03_CRUDStandardProductWithCombinationsInBO.ts
deleted file mode 100644
index 14dca8753a931..0000000000000
--- a/tests/UI/campaigns/sanity/03_productsBO/03_CRUDStandardProductWithCombinationsInBO.ts
+++ /dev/null
@@ -1,192 +0,0 @@
-// Import utils
-import helper from '@utils/helpers';
-import testContext from '@utils/testContext';
-
-// Import commonTests
-import loginCommon from '@commonTests/BO/loginBO';
-import {
-  resetNewProductPageAsDefault,
-  setFeatureFlag,
-} from '@commonTests/BO/advancedParameters/newFeatures';
-
-// Import BO pages
-import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
-import dashboardPage from '@pages/BO/dashboard';
-import productsPage from '@pages/BO/catalog/products';
-import addProductPage from '@pages/BO/catalog/products/add';
-// Import FO pages
-import foProductPage from '@pages/FO/product';
-
-// Import data
-import ProductData from '@data/faker/product';
-import {ProductInformations} from '@data/types/product';
-
-import {expect} from 'chai';
-import type {BrowserContext, Page} from 'playwright';
-
-const baseContext: string = 'sanity_productsBO_CRUDStandardProductWithCombinationsInBO';
-
-// Create, read, update and delete Standard product with combinations in BO
-describe('BO - Catalog - Products : Create, read, update and delete Standard product '
-  + 'with combinations in BO', async () => {
-  let browserContext: BrowserContext;
-  let page: Page;
-  let productInformation: ProductInformations = {
-    price: 0,
-    name: '',
-    description: '',
-    summary: '',
-  };
-
-  const productWithCombinations: ProductData = new ProductData({
-    type: 'Standard product',
-    productHasCombinations: true,
-  });
-  const editedProductWithCombinations: ProductData = new ProductData({
-    type: 'Standard product',
-    productHasCombinations: true,
-  });
-
-  // Pre-condition: Disable new product page
-  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, `${baseContext}_disableNewProduct`);
-
-  // before and after functions
-  before(async function () {
-    browserContext = await helper.createBrowserContext(this.browser);
-    page = await helper.newTab(browserContext);
-  });
-
-  after(async () => {
-    await helper.closeBrowserContext(browserContext);
-  });
-
-  describe('Product page V1: Perform basic crud operations with combinations', async () => {
-    // Steps
-    it('should login in BO', async function () {
-      await loginCommon.loginBO(this, page);
-    });
-
-    it('should go to \'Catalog > Products\' page', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'goToProductsPage', baseContext);
-
-      await dashboardPage.goToSubMenu(
-        page,
-        dashboardPage.catalogParentLink,
-        dashboardPage.productsLink,
-      );
-      await productsPage.closeSfToolBar(page);
-
-      const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
-    });
-
-    it('should reset all filters', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'resetFilters', baseContext);
-
-      await productsPage.resetFilterCategory(page);
-
-      const numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProducts).to.be.above(0);
-    });
-
-    it('should create Product with Combinations', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'createProduct', baseContext);
-
-      await productsPage.goToAddProductPage(page);
-      await addProductPage.createEditBasicProduct(page, productWithCombinations);
-
-      const createProductMessage = await addProductPage.setAttributesInProduct(
-        page,
-        productWithCombinations,
-      );
-      await expect(createProductMessage).to.equal(addProductPage.settingUpdatedMessage);
-    });
-
-    it('should preview product', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'previewProduct1', baseContext);
-
-      page = await addProductPage.previewProduct(page);
-      productInformation = await foProductPage.getProductInformation(page);
-
-      const pageTitle = await foProductPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productWithCombinations.name);
-    });
-
-    it('should go back to BO', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'goBackToBO', baseContext);
-
-      page = await foProductPage.closePage(browserContext, page, 0);
-
-      const pageTitle = await addProductPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addProductPage.pageTitle);
-    });
-
-    it('should check that all product attributes are correct', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'checkProductAttributes1', baseContext);
-
-      // Check that all Product attribute are correct
-      await Promise.all([
-        expect(productInformation.name).to.equal(productWithCombinations.name),
-        expect(productInformation.price).to.equal(productWithCombinations.price),
-        expect(productInformation.description).to.contains(productWithCombinations.description),
-        expect(productInformation.summary).to.contains(productWithCombinations.summary),
-      ]);
-    });
-
-    it('should edit product', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'editProduct', baseContext);
-
-      await addProductPage.createEditBasicProduct(page, editedProductWithCombinations);
-
-      const createProductMessage = await addProductPage.setAttributesInProduct(
-        page,
-        editedProductWithCombinations,
-      );
-      await expect(createProductMessage).to.equal(addProductPage.settingUpdatedMessage);
-    });
-
-    it('should preview product', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'previewProduct2', baseContext);
-
-      page = await addProductPage.previewProduct(page);
-      productInformation = await foProductPage.getProductInformation(page);
-
-      const pageTitle = await foProductPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(editedProductWithCombinations.name);
-    });
-
-    it('should go back to BO', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'goBackToBO2', baseContext);
-
-      page = await foProductPage.closePage(browserContext, page, 0);
-
-      const pageTitle = await addProductPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addProductPage.pageTitle);
-    });
-
-    it('should check that all product attributes are correct', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'checkProductAttributes2', baseContext);
-
-      // Check that all Product attribute are correct
-      await Promise.all([
-        expect(productInformation.name).to.equal(editedProductWithCombinations.name),
-        expect(productInformation.price).to.equal(editedProductWithCombinations.price),
-        expect(productInformation.summary).to.contains(editedProductWithCombinations.summary),
-        expect(productInformation.description).to.contains(editedProductWithCombinations.description),
-      ]);
-    });
-
-    it('should delete product and be on product list page', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'deleteProduct', baseContext);
-
-      const testResult = await addProductPage.deleteProduct(page);
-      await expect(testResult).to.equal(productsPage.productDeletedSuccessfulMessage);
-
-      const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
-    });
-  });
-
-  // Post-condition: Reset initial state
-  resetNewProductPageAsDefault(`${baseContext}_resetNewProduct`);
-});
diff --git a/tests/UI/campaigns/productV2/sanity/04_CRUDVirtualProduct.ts b/tests/UI/campaigns/sanity/03_productsBO/04_CRUDVirtualProduct.ts
similarity index 100%
rename from tests/UI/campaigns/productV2/sanity/04_CRUDVirtualProduct.ts
rename to tests/UI/campaigns/sanity/03_productsBO/04_CRUDVirtualProduct.ts
diff --git a/tests/UI/campaigns/sanity/03_productsBO/04_deleteProduct.ts b/tests/UI/campaigns/sanity/03_productsBO/04_deleteProduct.ts
deleted file mode 100644
index 9b32f7e467411..0000000000000
--- a/tests/UI/campaigns/sanity/03_productsBO/04_deleteProduct.ts
+++ /dev/null
@@ -1,119 +0,0 @@
-// Import utils
-import testContext from '@utils/testContext';
-import helper from '@utils/helpers';
-
-// Import commonTests
-import {
-  resetNewProductPageAsDefault,
-  setFeatureFlag,
-} from '@commonTests/BO/advancedParameters/newFeatures';
-import loginCommon from '@commonTests/BO/loginBO';
-
-// Import pages
-import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
-import productsPage from '@pages/BO/catalog/products';
-import addProductPage from '@pages/BO/catalog/products/add';
-import dashboardPage from '@pages/BO/dashboard';
-
-// Import data
-import ProductData from '@data/faker/product';
-
-import {expect} from 'chai';
-import type {BrowserContext, Page} from 'playwright';
-
-const baseContext: string = 'sanity_productsBO_deleteProduct';
-
-// Create Standard product in BO and Delete it with DropDown Menu
-describe('BO - Catalog - Products : Create Standard product in BO and Delete it with DropDown Menu', async () => {
-  let browserContext: BrowserContext;
-  let page: Page;
-
-  const productData: ProductData = new ProductData({
-    type: 'Standard product',
-    productHasCombinations: false,
-  });
-
-  // Pre-condition: Disable new product page
-  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, `${baseContext}_disableNewProduct`);
-
-  // before and after functions
-  before(async function () {
-    browserContext = await helper.createBrowserContext(this.browser);
-    page = await helper.newTab(browserContext);
-  });
-
-  after(async () => {
-    await helper.closeBrowserContext(browserContext);
-  });
-
-  describe('Product page V1: Delete product', async () => {
-    // Steps
-    it('should login in BO', async function () {
-      await loginCommon.loginBO(this, page);
-    });
-
-    it('should go to \'Catalog > Products\' page', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'goToProductsPage1', baseContext);
-
-      await dashboardPage.goToSubMenu(
-        page,
-        dashboardPage.catalogParentLink,
-        dashboardPage.productsLink,
-      );
-
-      const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
-    });
-
-    it('should reset all filters', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'resetFilters1', baseContext);
-
-      await productsPage.resetFilterCategory(page);
-
-      const numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProducts).to.be.above(0);
-    });
-
-    it('should create product', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'createProduct', baseContext);
-
-      await productsPage.goToAddProductPage(page);
-      await productsPage.closeSfToolBar(page);
-
-      const createProductMessage = await addProductPage.createEditBasicProduct(page, productData);
-      await expect(createProductMessage).to.equal(addProductPage.settingUpdatedMessage);
-    });
-
-    it('should go to \'Catalog > Products\' page', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'goToProductsPage2', baseContext);
-
-      await addProductPage.goToSubMenu(
-        page,
-        addProductPage.catalogParentLink,
-        addProductPage.productsLink,
-      );
-
-      const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
-    });
-
-    it('should delete product from DropDown Menu', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'deleteProduct', baseContext);
-
-      const deleteTextResult = await productsPage.deleteProduct(page, productData);
-      await expect(deleteTextResult).to.equal(productsPage.productDeletedSuccessfulMessage);
-    });
-
-    it('should reset all filters', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'resetFilters2', baseContext);
-
-      await productsPage.resetFilterCategory(page);
-
-      const numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProducts).to.be.above(0);
-    });
-  });
-
-  // Post-condition: Reset initial state
-  resetNewProductPageAsDefault(`${baseContext}_resetNewProduct`);
-});
diff --git a/tests/UI/campaigns/productV2/sanity/05_deleteProduct.ts b/tests/UI/campaigns/sanity/03_productsBO/05_deleteProduct.ts
similarity index 100%
rename from tests/UI/campaigns/productV2/sanity/05_deleteProduct.ts
rename to tests/UI/campaigns/sanity/03_productsBO/05_deleteProduct.ts
diff --git a/tests/UI/campaigns/sanity/03_productsBO/05_deleteProductsWithBulkActions.ts b/tests/UI/campaigns/sanity/03_productsBO/05_deleteProductsWithBulkActions.ts
deleted file mode 100644
index 5277ece236d62..0000000000000
--- a/tests/UI/campaigns/sanity/03_productsBO/05_deleteProductsWithBulkActions.ts
+++ /dev/null
@@ -1,128 +0,0 @@
-// Import utils
-import testContext from '@utils/testContext';
-import helper from '@utils/helpers';
-
-// Import commonTests
-import loginCommon from '@commonTests/BO/loginBO';
-import {
-  resetNewProductPageAsDefault,
-  setFeatureFlag,
-} from '@commonTests/BO/advancedParameters/newFeatures';
-
-// Import pages
-import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
-import productsPage from '@pages/BO/catalog/products';
-import addProductPage from '@pages/BO/catalog/products/add';
-import dashboardPage from '@pages/BO/dashboard';
-
-// Import data
-import ProductData from '@data/faker/product';
-
-import {expect} from 'chai';
-import type {BrowserContext, Page} from 'playwright';
-
-const baseContext: string = 'sanity_productsBO_deleteProductsWithBulkActions';
-
-// Create 2 Standard products in BO and Delete it with Bulk Actions
-describe('BO - Catalog - Product : Create Standard product in BO and Delete it with Bulk Actions', async () => {
-  let browserContext: BrowserContext;
-  let page: Page;
-
-  const firstProductData: ProductData = new ProductData({
-    name: 'product To Delete 1',
-    type: 'Standard product',
-  });
-  const secondProductData: ProductData = new ProductData({
-    name: 'product To Delete 2',
-    type: 'Standard product',
-  });
-
-  // Pre-condition: Disable new product page
-  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, false, `${baseContext}_disableNewProduct`);
-
-  // before and after functions
-  before(async function () {
-    browserContext = await helper.createBrowserContext(this.browser);
-    page = await helper.newTab(browserContext);
-  });
-
-  after(async () => {
-    await helper.closeBrowserContext(browserContext);
-  });
-
-  describe('Product page V1: Delete product with bulk actions', async () => {
-    // Steps
-    it('should login in BO', async function () {
-      await loginCommon.loginBO(this, page);
-    });
-
-    it('should go to \'Catalog > Products\' page', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'goToProductsPage1', baseContext);
-
-      await dashboardPage.goToSubMenu(
-        page,
-        dashboardPage.catalogParentLink,
-        dashboardPage.productsLink,
-      );
-
-      const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
-    });
-
-    it('should reset all filters', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'resetFilters', baseContext);
-
-      await productsPage.resetFilterCategory(page);
-
-      const numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProducts).to.be.above(0);
-    });
-
-    [firstProductData, secondProductData].forEach((productData: ProductData, index: number) => {
-      it('should create new product', async function () {
-        await testContext.addContextItem(this, 'testIdentifier', `createProduct${index + 1}`, baseContext);
-
-        await productsPage.goToAddProductPage(page);
-        await productsPage.closeSfToolBar(page);
-
-        const createProductMessage = await addProductPage.createEditBasicProduct(page, productData);
-        await expect(createProductMessage).to.equal(addProductPage.settingUpdatedMessage);
-      });
-
-      it('should go to \'Catalog > Products\' page', async function () {
-        await testContext.addContextItem(this, 'testIdentifier', `goToProductsPageAfterCreate${index + 1}`, baseContext);
-
-        await addProductPage.goToSubMenu(
-          page,
-          addProductPage.catalogParentLink,
-          addProductPage.productsLink,
-        );
-
-        const pageTitle = await productsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(productsPage.pageTitle);
-      });
-    });
-
-    it('should delete products with bulk Actions', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'bulkDelete', baseContext);
-
-      // Filter By reference first
-      await productsPage.filterProducts(page, 'name', 'product To Delete ');
-
-      const deleteTextResult = await productsPage.deleteAllProductsWithBulkActions(page);
-      await expect(deleteTextResult).to.equal(productsPage.productMultiDeletedSuccessfulMessage);
-    });
-
-    it('should reset all filters', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'resetFiltersLast', baseContext);
-
-      await productsPage.resetFilterCategory(page);
-
-      const numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProducts).to.be.above(0);
-    });
-  });
-
-  // Post-condition: Reset initial state
-  resetNewProductPageAsDefault(`${baseContext}_resetNewProduct`);
-});
diff --git a/tests/UI/campaigns/productV2/sanity/06_deleteProductsWithBulkActions.ts b/tests/UI/campaigns/sanity/03_productsBO/06_deleteProductsWithBulkActions.ts
similarity index 100%
rename from tests/UI/campaigns/productV2/sanity/06_deleteProductsWithBulkActions.ts
rename to tests/UI/campaigns/sanity/03_productsBO/06_deleteProductsWithBulkActions.ts
diff --git a/tests/UI/package.json b/tests/UI/package.json
index 950dc87c23968..47d754670cd37 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -25,8 +25,6 @@
     "// Sanity": "Scripts to run sanity tests",
     "test:sanity": "TEST_PATH='sanity/**/*' npm run test:specific",
     "test:sanity:fast-fail": "TEST_PATH='sanity/*' npm run test:specific:fast-fail",
-    "test:sanity:productV2": "TEST_PATH='productV2/sanity/**/*' npm run test:specific",
-    "test:sanity:productV2:fast-fail": "TEST_PATH='productV2/sanity/*' npm run test:specific:fast-fail",
     "// Functional": "Scripts to run functional tests",
     "test:functional": "TEST_PATH='functional/**/*' npm run test:specific",
     "// Functional API": "Scripts to run functional API tests",

From edb1076b69422aaa44575fc14f281b99d19b929c Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Wed, 12 Jul 2023 09:56:29 +0200
Subject: [PATCH 0518/1030] Product Page : Removed sanity:productV2 from
 nightly

---
 .github/workflows/cron_nightly_tests_reusable.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/cron_nightly_tests_reusable.yml b/.github/workflows/cron_nightly_tests_reusable.yml
index 68c354820a9ab..900e23d19bd3e 100644
--- a/.github/workflows/cron_nightly_tests_reusable.yml
+++ b/.github/workflows/cron_nightly_tests_reusable.yml
@@ -150,6 +150,8 @@ jobs:
             CAMPAIGN: 'functional:FO:04-07'
           - BRANCH: develop
             CAMPAIGN: 'functional:FO:08-12'
+          - BRANCH: develop
+            CAMPAIGN: 'sanity:productV2'
 
     env:
       GH_BRANCH: ${{ matrix.BRANCH }}  # Branch to test

From 6a77b85455a34521bbe1a20bf9b0e4f51216c3f8 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Wed, 12 Jul 2023 10:23:24 +0200
Subject: [PATCH 0519/1030] Product Page : Removed Experimental Feature for
 Sanity

---
 .../sanity/03_productsBO/01_filterProducts.ts       | 11 -----------
 .../sanity/03_productsBO/02_CRUDStandardProduct.ts  | 12 ------------
 .../03_productsBO/03_CRUDProductWithCombinations.ts | 13 +------------
 .../sanity/03_productsBO/04_CRUDVirtualProduct.ts   | 11 -----------
 .../sanity/03_productsBO/05_deleteProduct.ts        | 11 -----------
 .../06_deleteProductsWithBulkActions.ts             | 11 -----------
 6 files changed, 1 insertion(+), 68 deletions(-)

diff --git a/tests/UI/campaigns/sanity/03_productsBO/01_filterProducts.ts b/tests/UI/campaigns/sanity/03_productsBO/01_filterProducts.ts
index 6cfd66e042391..a3b1f7182f084 100644
--- a/tests/UI/campaigns/sanity/03_productsBO/01_filterProducts.ts
+++ b/tests/UI/campaigns/sanity/03_productsBO/01_filterProducts.ts
@@ -4,13 +4,8 @@ import testContext from '@utils/testContext';
 
 // Import common tests
 import loginCommon from '@commonTests/BO/loginBO';
-import {
-  resetNewProductPageAsDefault,
-  setFeatureFlag,
-} from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
-import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import productsPage from '@pages/BO/catalog/productsV2';
 
@@ -28,9 +23,6 @@ describe('BO - Catalog - Products : Filter in Products Page', async () => {
   let page: Page;
   let numberOfProducts: number = 0;
 
-  // Pre-condition: Enable new product page
-  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, true, `${baseContext}_enableNewProduct`);
-
   // before and after functions
   before(async function () {
     browserContext = await helper.createBrowserContext(this.browser);
@@ -165,7 +157,4 @@ describe('BO - Catalog - Products : Filter in Products Page', async () => {
       });
     });
   });
-
-  // Post-condition: Reset initial state
-  resetNewProductPageAsDefault(`${baseContext}_resetNewProduct`);
 });
diff --git a/tests/UI/campaigns/sanity/03_productsBO/02_CRUDStandardProduct.ts b/tests/UI/campaigns/sanity/03_productsBO/02_CRUDStandardProduct.ts
index 8153821ea8aea..8fc911b355824 100644
--- a/tests/UI/campaigns/sanity/03_productsBO/02_CRUDStandardProduct.ts
+++ b/tests/UI/campaigns/sanity/03_productsBO/02_CRUDStandardProduct.ts
@@ -5,13 +5,7 @@ import testContext from '@utils/testContext';
 
 // Import common tests
 import loginCommon from '@commonTests/BO/loginBO';
-import {
-  resetNewProductPageAsDefault,
-  setFeatureFlag,
-} from '@commonTests/BO/advancedParameters/newFeatures';
 
-// Import BO pages
-import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 // Import FO pages
 import foProductPage from '@pages/FO/product';
 import dashboardPage from '@pages/BO/dashboard';
@@ -46,9 +40,6 @@ describe('BO - Catalog - Products : CRUD standard product', async () => {
     status: true,
   });
 
-  // Pre-condition: Enable new product page
-  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, true, `${baseContext}_enableNewProduct`);
-
   // before and after functions
   before(async function () {
     browserContext = await helper.createBrowserContext(this.browser);
@@ -207,7 +198,4 @@ describe('BO - Catalog - Products : CRUD standard product', async () => {
       await expect(createProductMessage).to.equal(productsPage.successfulDeleteMessage);
     });
   });
-
-  // Post-condition: Reset initial state
-  resetNewProductPageAsDefault(`${baseContext}_resetNewProduct`);
 });
diff --git a/tests/UI/campaigns/sanity/03_productsBO/03_CRUDProductWithCombinations.ts b/tests/UI/campaigns/sanity/03_productsBO/03_CRUDProductWithCombinations.ts
index 0891882498f87..e67d14c316e07 100644
--- a/tests/UI/campaigns/sanity/03_productsBO/03_CRUDProductWithCombinations.ts
+++ b/tests/UI/campaigns/sanity/03_productsBO/03_CRUDProductWithCombinations.ts
@@ -4,14 +4,9 @@ import testContext from '@utils/testContext';
 
 // Import common tests
 import loginCommon from '@commonTests/BO/loginBO';
-import {
-  resetNewProductPageAsDefault,
-  setFeatureFlag,
-} from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
 // Import BO pages
-import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import productsPage from '@pages/BO/catalog/productsV2';
 import createProductsPage from '@pages/BO/catalog/productsV2/add';
@@ -58,9 +53,6 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
     ],
   });
 
-  // Pre-condition: Enable new product page
-  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, true, `${baseContext}_enableNewProduct`);
-
   // before and after functions
   before(async function () {
     browserContext = await helper.createBrowserContext(this.browser);
@@ -150,7 +142,7 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
     });
 
     it('should check that combinations generation modal is closed', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'generateCombinationsModalIsClosed2', baseContext);
+      await testContext.addContextItem(this, 'testIdentifier', 'generateCombinationsModalIsClosed', baseContext);
 
       const isModalClosed = await combinationsTab.generateCombinationModalIsClosed(page);
       await expect(isModalClosed).to.be.true;
@@ -294,7 +286,4 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       await expect(createProductMessage).to.equal(productsPage.successfulDeleteMessage);
     });
   });
-
-  // Post-condition: Reset initial state
-  resetNewProductPageAsDefault(`${baseContext}_resetNewProduct`);
 });
diff --git a/tests/UI/campaigns/sanity/03_productsBO/04_CRUDVirtualProduct.ts b/tests/UI/campaigns/sanity/03_productsBO/04_CRUDVirtualProduct.ts
index 33a9a97d8bd9d..7461f6c790afe 100644
--- a/tests/UI/campaigns/sanity/03_productsBO/04_CRUDVirtualProduct.ts
+++ b/tests/UI/campaigns/sanity/03_productsBO/04_CRUDVirtualProduct.ts
@@ -8,13 +8,8 @@ import testContext from '@utils/testContext';
 
 // Import common tests
 import loginCommon from '@commonTests/BO/loginBO';
-import {
-  resetNewProductPageAsDefault,
-  setFeatureFlag,
-} from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
-import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import productsPage from '@pages/BO/catalog/productsV2';
 import createProductsPage from '@pages/BO/catalog/productsV2/add';
@@ -45,9 +40,6 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
     status: true,
   });
 
-  // Pre-condition: Enable new product page
-  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, true, `${baseContext}_enableNewProduct`);
-
   // before and after functions
   before(async function () {
     browserContext = await helper.createBrowserContext(this.browser);
@@ -206,7 +198,4 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
       await expect(createProductMessage).to.equal(productsPage.successfulDeleteMessage);
     });
   });
-
-  // Post-condition: Reset initial state
-  resetNewProductPageAsDefault(`${baseContext}_resetNewProduct`);
 });
diff --git a/tests/UI/campaigns/sanity/03_productsBO/05_deleteProduct.ts b/tests/UI/campaigns/sanity/03_productsBO/05_deleteProduct.ts
index 680d370974427..8ae5ec64bc3c0 100644
--- a/tests/UI/campaigns/sanity/03_productsBO/05_deleteProduct.ts
+++ b/tests/UI/campaigns/sanity/03_productsBO/05_deleteProduct.ts
@@ -4,13 +4,8 @@ import testContext from '@utils/testContext';
 
 // Import common tests
 import loginCommon from '@commonTests/BO/loginBO';
-import {
-  resetNewProductPageAsDefault,
-  setFeatureFlag,
-} from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
-import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import productsPage from '@pages/BO/catalog/productsV2';
 import createProductsPage from '@pages/BO/catalog/productsV2/add';
@@ -36,9 +31,6 @@ describe('BO - Catalog - Products : Delete product', async () => {
     status: true,
   });
 
-  // Pre-condition: Enable new product page
-  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, true, `${baseContext}_enableNewProduct`);
-
   // before and after functions
   before(async function () {
     browserContext = await helper.createBrowserContext(this.browser);
@@ -153,7 +145,4 @@ describe('BO - Catalog - Products : Delete product', async () => {
       await expect(numberOfProductsAfterReset).to.equal(numberOfProducts);
     });
   });
-
-  // Post-condition: Reset initial state
-  resetNewProductPageAsDefault(`${baseContext}_resetNewProduct`);
 });
diff --git a/tests/UI/campaigns/sanity/03_productsBO/06_deleteProductsWithBulkActions.ts b/tests/UI/campaigns/sanity/03_productsBO/06_deleteProductsWithBulkActions.ts
index c3894e387bfde..85c6b0f075a1d 100644
--- a/tests/UI/campaigns/sanity/03_productsBO/06_deleteProductsWithBulkActions.ts
+++ b/tests/UI/campaigns/sanity/03_productsBO/06_deleteProductsWithBulkActions.ts
@@ -7,13 +7,8 @@ import testContext from '@utils/testContext';
 
 // Import common tests
 import loginCommon from '@commonTests/BO/loginBO';
-import {
-  resetNewProductPageAsDefault,
-  setFeatureFlag,
-} from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
-import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import productsPage from '@pages/BO/catalog/productsV2';
 import createProductsPage from '@pages/BO/catalog/productsV2/add';
@@ -46,9 +41,6 @@ describe('BO - Catalog - Products : Delete products with bulk actions', async ()
     status: true,
   });
 
-  // Pre-condition: Enable new product page
-  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, true, `${baseContext}_enableNewProduct`);
-
   // before and after functions
   before(async function () {
     browserContext = await helper.createBrowserContext(this.browser);
@@ -205,7 +197,4 @@ describe('BO - Catalog - Products : Delete products with bulk actions', async ()
       await expect(numberOfProductsAfterReset).to.equal(numberOfProducts);
     });
   });
-
-  // Post-condition: Reset initial state
-  resetNewProductPageAsDefault(`${baseContext}_resetNewProduct`);
 });

From 760b83385255737432dda9e789bda69629da0f28 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Wed, 12 Jul 2023 10:30:24 +0200
Subject: [PATCH 0520/1030] Product Page : Fixed BaseContext

---
 tests/UI/campaigns/sanity/03_productsBO/01_filterProducts.ts    | 2 +-
 .../UI/campaigns/sanity/03_productsBO/02_CRUDStandardProduct.ts | 2 +-
 .../sanity/03_productsBO/03_CRUDProductWithCombinations.ts      | 2 +-
 .../UI/campaigns/sanity/03_productsBO/04_CRUDVirtualProduct.ts  | 2 +-
 tests/UI/campaigns/sanity/03_productsBO/05_deleteProduct.ts     | 2 +-
 .../sanity/03_productsBO/06_deleteProductsWithBulkActions.ts    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/UI/campaigns/sanity/03_productsBO/01_filterProducts.ts b/tests/UI/campaigns/sanity/03_productsBO/01_filterProducts.ts
index a3b1f7182f084..f33e4e5213aa0 100644
--- a/tests/UI/campaigns/sanity/03_productsBO/01_filterProducts.ts
+++ b/tests/UI/campaigns/sanity/03_productsBO/01_filterProducts.ts
@@ -16,7 +16,7 @@ import Categories from '@data/demo/categories';
 import {expect} from 'chai';
 import type {BrowserContext, Page} from 'playwright';
 
-const baseContext: string = 'productV2_sanity_filterProducts';
+const baseContext: string = 'sanity_productsBO_filterProducts';
 
 describe('BO - Catalog - Products : Filter in Products Page', async () => {
   let browserContext: BrowserContext;
diff --git a/tests/UI/campaigns/sanity/03_productsBO/02_CRUDStandardProduct.ts b/tests/UI/campaigns/sanity/03_productsBO/02_CRUDStandardProduct.ts
index 8fc911b355824..c0b134fa00e7b 100644
--- a/tests/UI/campaigns/sanity/03_productsBO/02_CRUDStandardProduct.ts
+++ b/tests/UI/campaigns/sanity/03_productsBO/02_CRUDStandardProduct.ts
@@ -18,7 +18,7 @@ import ProductData from '@data/faker/product';
 import type {BrowserContext, Page} from 'playwright';
 import {expect} from 'chai';
 
-const baseContext: string = 'productV2_sanity_CRUDStandardProduct';
+const baseContext: string = 'sanity_productsBO_CRUDStandardProduct';
 
 describe('BO - Catalog - Products : CRUD standard product', async () => {
   let browserContext: BrowserContext;
diff --git a/tests/UI/campaigns/sanity/03_productsBO/03_CRUDProductWithCombinations.ts b/tests/UI/campaigns/sanity/03_productsBO/03_CRUDProductWithCombinations.ts
index e67d14c316e07..ea83491623a6b 100644
--- a/tests/UI/campaigns/sanity/03_productsBO/03_CRUDProductWithCombinations.ts
+++ b/tests/UI/campaigns/sanity/03_productsBO/03_CRUDProductWithCombinations.ts
@@ -20,7 +20,7 @@ import ProductData from '@data/faker/product';
 import {expect} from 'chai';
 import type {BrowserContext, Page} from 'playwright';
 
-const baseContext: string = 'productV2_sanity_CRUDProductWithCombinations';
+const baseContext: string = 'sanity_productsBO_CRUDProductWithCombinations';
 
 describe('BO - Catalog - Products : CRUD product with combinations', async () => {
   let browserContext: BrowserContext;
diff --git a/tests/UI/campaigns/sanity/03_productsBO/04_CRUDVirtualProduct.ts b/tests/UI/campaigns/sanity/03_productsBO/04_CRUDVirtualProduct.ts
index 7461f6c790afe..45b271be58b8e 100644
--- a/tests/UI/campaigns/sanity/03_productsBO/04_CRUDVirtualProduct.ts
+++ b/tests/UI/campaigns/sanity/03_productsBO/04_CRUDVirtualProduct.ts
@@ -18,7 +18,7 @@ import foProductPage from '@pages/FO/product';
 // Import data
 import ProductData from '@data/faker/product';
 
-const baseContext: string = 'productV2_sanity_CRUDVirtualProduct';
+const baseContext: string = 'sanity_productsBO_CRUDVirtualProduct';
 
 describe('BO - Catalog - Products : CRUD virtual product', async () => {
   let browserContext: BrowserContext;
diff --git a/tests/UI/campaigns/sanity/03_productsBO/05_deleteProduct.ts b/tests/UI/campaigns/sanity/03_productsBO/05_deleteProduct.ts
index 8ae5ec64bc3c0..afcad2fe2d7b7 100644
--- a/tests/UI/campaigns/sanity/03_productsBO/05_deleteProduct.ts
+++ b/tests/UI/campaigns/sanity/03_productsBO/05_deleteProduct.ts
@@ -16,7 +16,7 @@ import ProductData from '@data/faker/product';
 import type {BrowserContext, Page} from 'playwright';
 import {expect} from 'chai';
 
-const baseContext: string = 'productV2_sanity_deleteProduct';
+const baseContext: string = 'sanity_productsBO_deleteProduct';
 
 describe('BO - Catalog - Products : Delete product', async () => {
   let browserContext: BrowserContext;
diff --git a/tests/UI/campaigns/sanity/03_productsBO/06_deleteProductsWithBulkActions.ts b/tests/UI/campaigns/sanity/03_productsBO/06_deleteProductsWithBulkActions.ts
index 85c6b0f075a1d..ec0a8d6262200 100644
--- a/tests/UI/campaigns/sanity/03_productsBO/06_deleteProductsWithBulkActions.ts
+++ b/tests/UI/campaigns/sanity/03_productsBO/06_deleteProductsWithBulkActions.ts
@@ -16,7 +16,7 @@ import createProductsPage from '@pages/BO/catalog/productsV2/add';
 // Import data
 import ProductData from '@data/faker/product';
 
-const baseContext: string = 'productV2_sanity_deleteProductsWithBulkActions';
+const baseContext: string = 'sanity_productsBO_deleteProductsWithBulkActions';
 
 describe('BO - Catalog - Products : Delete products with bulk actions', async () => {
   let browserContext: BrowserContext;

From 7911279caa5a651a16edae435b92757a81fc75cb Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Wed, 12 Jul 2023 10:44:54 +0200
Subject: [PATCH 0521/1030] Product Page : Increased the timeout

---
 tests/UI/pages/BO/catalog/productsV2/add/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/UI/pages/BO/catalog/productsV2/add/index.ts b/tests/UI/pages/BO/catalog/productsV2/add/index.ts
index ccc7a344eea04..1f6bbe9f0edbd 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/index.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/index.ts
@@ -174,7 +174,7 @@ class CreateProduct extends BOBasePage {
    * @returns {Promise<string>}
    */
   async saveProduct(page: Page): Promise<string> {
-    await this.clickAndWaitForLoadState(page, this.saveProductButton);
+    await this.clickAndWaitForURL(page, this.saveProductButton);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }

From 39b0b121981194b965518d9f6fe8f10c7ae33721 Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Wed, 12 Jul 2023 14:42:47 +0200
Subject: [PATCH 0522/1030] Remove purpose of store during install and in
 config

---
 install-dev/classes/datas.php                 |  6 ----
 install-dev/classes/session.php               |  1 -
 install-dev/controllers/console/process.php   |  3 +-
 install-dev/controllers/http/configure.php    | 32 -------------------
 install-dev/controllers/http/process.php      |  3 +-
 install-dev/data/xml/configuration.xml        |  3 --
 install-dev/theme/views/configure.php         | 14 --------
 .../Preferences/PreferencesConfiguration.php  |  2 --
 .../General/PreferencesType.php               | 29 -----------------
 src/PrestaShopBundle/Install/Install.php      |  2 --
 .../PreferencesConfigurationTest.php          |  5 ---
 11 files changed, 2 insertions(+), 98 deletions(-)

diff --git a/install-dev/classes/datas.php b/install-dev/classes/datas.php
index 350dc7caf4548..d3c0bfff2c34d 100644
--- a/install-dev/classes/datas.php
+++ b/install-dev/classes/datas.php
@@ -40,7 +40,6 @@
  * @property string $database_prefix
  * @property string $database_engine
  * @property string $shop_name
- * @property int $shop_activity
  * @property string $shop_country
  * @property string $admin_firstname
  * @property string $admin_lastname
@@ -140,11 +139,6 @@ class Datas
             'validate' => 'isGenericName',
             'default' => 'PrestaShop',
         ],
-        'shop_activity' => [
-            'name' => 'activity',
-            'default' => 0,
-            'validate' => 'isInt',
-        ],
         'shop_country' => [
             'name' => 'country',
             'validate' => 'isLanguageIsoCode',
diff --git a/install-dev/classes/session.php b/install-dev/classes/session.php
index 8bb39cd4e50d3..4b607c429460d 100644
--- a/install-dev/classes/session.php
+++ b/install-dev/classes/session.php
@@ -41,7 +41,6 @@
  * @property string $database_engine
  * @property string $shop_name
  * @property array $xml_loader_ids
- * @property int $shop_activity
  * @property string $shop_country
  * @property string $admin_firstname
  * @property string $admin_lastname
diff --git a/install-dev/controllers/console/process.php b/install-dev/controllers/console/process.php
index 260ac7940dc67..755f215bded91 100644
--- a/install-dev/controllers/console/process.php
+++ b/install-dev/controllers/console/process.php
@@ -262,7 +262,6 @@ public function processConfigureShop()
 
         return $this->model_install->configureShop([
             'shop_name' => $this->datas->shop_name,
-            'shop_activity' => $this->datas->shop_activity,
             'shop_country' => $this->datas->shop_country,
             'shop_timezone' => $this->datas->timezone,
             'use_smtp' => false,
@@ -305,7 +304,7 @@ public function processInstallFixtures()
         }
 
         $this->model_install->xml_loader_ids = $this->datas->xml_loader_ids;
-        $result = $this->model_install->installFixtures(null, ['shop_activity' => $this->datas->shop_activity, 'shop_country' => $this->datas->shop_country]);
+        $result = $this->model_install->installFixtures(null, ['shop_country' => $this->datas->shop_country]);
         $this->datas->xml_loader_ids = $this->model_install->xml_loader_ids;
 
         return $result;
diff --git a/install-dev/controllers/http/configure.php b/install-dev/controllers/http/configure.php
index 0dadd4eaed43a..0fe8417d1ffa8 100644
--- a/install-dev/controllers/http/configure.php
+++ b/install-dev/controllers/http/configure.php
@@ -29,10 +29,6 @@
  */
 class InstallControllerHttpConfigure extends InstallControllerHttp implements HttpConfigureInterface
 {
-    /**
-     * @var array
-     */
-    public $list_activities = [];
     /**
      * @var array
      */
@@ -54,7 +50,6 @@ public function processNextStep(): void
         if (Tools::isSubmit('shop_name')) {
             // Save shop configuration
             $this->session->shop_name = trim(Tools::getValue('shop_name'));
-            $this->session->shop_activity = Tools::getValue('shop_activity');
             $this->session->enable_ssl = (bool) Tools::getValue('enable_ssl');
             $this->session->shop_country = Tools::getValue('shop_country');
             $this->session->shop_timezone = Tools::getValue('shop_timezone');
@@ -197,33 +192,6 @@ public function getTimezoneByIso($iso): string
      */
     public function display(): void
     {
-        // List of activities
-        $list_activities = [
-            1 => $this->translator->trans('Lingerie and Adult', [], 'Install'),
-            2 => $this->translator->trans('Animals and Pets', [], 'Install'),
-            3 => $this->translator->trans('Art and Culture', [], 'Install'),
-            4 => $this->translator->trans('Babies', [], 'Install'),
-            5 => $this->translator->trans('Beauty and Personal Care', [], 'Install'),
-            6 => $this->translator->trans('Cars', [], 'Install'),
-            7 => $this->translator->trans('Computer Hardware and Software', [], 'Install'),
-            8 => $this->translator->trans('Download', [], 'Install'),
-            9 => $this->translator->trans('Fashion and Accessories', [], 'Install'),
-            10 => $this->translator->trans('Flowers, Gifts and Crafts', [], 'Install'),
-            11 => $this->translator->trans('Food and beverage', [], 'Install'),
-            12 => $this->translator->trans('HiFi, Photo and Video', [], 'Install'),
-            13 => $this->translator->trans('Home and Garden', [], 'Install'),
-            14 => $this->translator->trans('Home Appliances', [], 'Install'),
-            15 => $this->translator->trans('Jewelry', [], 'Install'),
-            16 => $this->translator->trans('Mobile and Telecom', [], 'Install'),
-            17 => $this->translator->trans('Services', [], 'Install'),
-            18 => $this->translator->trans('Shoes and accessories', [], 'Install'),
-            19 => $this->translator->trans('Sports and Entertainment', [], 'Install'),
-            20 => $this->translator->trans('Travel', [], 'Install'),
-        ];
-
-        asort($list_activities);
-        $this->list_activities = $list_activities;
-
         // Countries list
         $this->list_countries = [];
         $countries = $this->language->getCountries();
diff --git a/install-dev/controllers/http/process.php b/install-dev/controllers/http/process.php
index 10b43ae0ea8f7..996b9d88bfd1c 100644
--- a/install-dev/controllers/http/process.php
+++ b/install-dev/controllers/http/process.php
@@ -212,7 +212,6 @@ public function processConfigureShop()
 
         $success = $this->model_install->configureShop([
             'shop_name' => $this->session->shop_name,
-            'shop_activity' => $this->session->shop_activity,
             'shop_country' => $this->session->shop_country,
             'shop_timezone' => $this->session->shop_timezone,
             'admin_firstname' => $this->session->admin_firstname,
@@ -274,7 +273,7 @@ public function processInstallFixtures()
         $this->initializeContext();
 
         $this->model_install->xml_loader_ids = $this->session->xml_loader_ids;
-        if (!$this->model_install->installFixtures(Tools::getValue('entity', null), ['shop_activity' => $this->session->shop_activity, 'shop_country' => $this->session->shop_country]) || $this->model_install->getErrors()) {
+        if (!$this->model_install->installFixtures(Tools::getValue('entity', null), ['shop_country' => $this->session->shop_country]) || $this->model_install->getErrors()) {
             $this->ajaxJsonAnswer(false, $this->model_install->getErrors());
         }
         $this->session->xml_loader_ids = $this->model_install->xml_loader_ids;
diff --git a/install-dev/data/xml/configuration.xml b/install-dev/data/xml/configuration.xml
index c6cbb231807e9..7280e036f3f8c 100644
--- a/install-dev/data/xml/configuration.xml
+++ b/install-dev/data/xml/configuration.xml
@@ -712,9 +712,6 @@ Country</value>
   <configuration id="PS_MAIL_SUBJECT_PREFIX" name="PS_MAIL_SUBJECT_PREFIX">
     <value>1</value>
   </configuration>
-  <configuration id="PS_SHOP_ACTIVITY" name="PS_SHOP_ACTIVITY">
-    <value>Animaux</value>
-  </configuration>
   <configuration id="PS_LOGO" name="PS_LOGO">
     <value>logo.png</value>
   </configuration>
diff --git a/install-dev/theme/views/configure.php b/install-dev/theme/views/configure.php
index c26445decd9a2..49d955a016975 100644
--- a/install-dev/theme/views/configure.php
+++ b/install-dev/theme/views/configure.php
@@ -36,20 +36,6 @@
 	<?php echo $this->displayError('shop_name'); ?>
   </div>
 
-  <div class="field clearfix">
-	<label for="infosActivity" class="aligned"><?php echo $this->translator->trans('Main activity', [], 'Install'); ?></label>
-	<div class="contentinput">
-	  <select id="infosActivity" name="shop_activity" class="chosen">
-		<option value="0" style="font-weight: bold" <?php if (!$this->session->shop_activity) { ?>selected="selected"<?php } ?>><?php echo $this->translator->trans('Please choose your main activity', [], 'Install'); ?></option>
-		<?php foreach ($this->list_activities as $i => $activity) { ?>
-		  <option value="<?php echo $i; ?>" <?php if (isset($this->session->shop_activity) && $this->session->shop_activity == $i) { ?>selected="selected"<?php } ?>><?php echo $activity; ?></option>
-		<?php } ?>
-		<option value="0"><?php echo $this->translator->trans('Other activity...', [], 'Install'); ?></option>
-	  </select>
-	</div>
-	<p class="userInfos aligned"><?php echo $this->translator->trans('Help us learn more about your store so we can offer you optimal guidance and the best features for your business!', [], 'Install'); ?></p>
-  </div>
-
   <div class="field clearfix">
 	<label for="infosCountry" class="aligned"><?php echo $this->translator->trans('Country', [], 'Install'); ?></label>
 	<div class="contentinput">
diff --git a/src/Adapter/Preferences/PreferencesConfiguration.php b/src/Adapter/Preferences/PreferencesConfiguration.php
index e35f551184ec1..94de452fd324e 100644
--- a/src/Adapter/Preferences/PreferencesConfiguration.php
+++ b/src/Adapter/Preferences/PreferencesConfiguration.php
@@ -63,7 +63,6 @@ public function getConfiguration()
             'display_manufacturers' => $this->configuration->getBoolean('PS_DISPLAY_MANUFACTURERS'),
             'display_best_sellers' => $this->configuration->getBoolean('PS_DISPLAY_BEST_SELLERS'),
             'multishop_feature_active' => $this->configuration->getBoolean('PS_MULTISHOP_FEATURE_ACTIVE'),
-            'shop_activity' => $this->configuration->get('PS_SHOP_ACTIVITY'),
         ];
     }
 
@@ -105,7 +104,6 @@ public function updateConfiguration(array $configuration)
         $this->configuration->set('PS_DISPLAY_MANUFACTURERS', $configuration['display_manufacturers']);
         $this->configuration->set('PS_DISPLAY_BEST_SELLERS', $configuration['display_best_sellers']);
         $this->configuration->set('PS_MULTISHOP_FEATURE_ACTIVE', $configuration['multishop_feature_active']);
-        $this->configuration->set('PS_SHOP_ACTIVITY', $configuration['shop_activity']);
 
         return [];
     }
diff --git a/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/General/PreferencesType.php b/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/General/PreferencesType.php
index 56c1d94c7353c..5cff0699e45e0 100644
--- a/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/General/PreferencesType.php
+++ b/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/General/PreferencesType.php
@@ -214,35 +214,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'The multistore feature allows you to manage several front offices from a single back office. If this feature is enabled, a Multistore page is available in the Advanced Parameters menu.',
                     'Admin.Shopparameters.Help'
                 ),
-            ])
-            ->add('shop_activity', ChoiceType::class, [
-                'required' => false,
-                'placeholder' => $this->trans('-- Please choose your main activity --', 'Install'),
-                'choices' => [
-                    'Animals and Pets' => 2,
-                    'Art and Culture' => 3,
-                    'Babies' => 4,
-                    'Beauty and Personal Care' => 5,
-                    'Cars' => 6,
-                    'Computer Hardware and Software' => 7,
-                    'Download' => 8,
-                    'Fashion and accessories' => 9,
-                    'Flowers, Gifts and Crafts' => 10,
-                    'Food and beverage' => 11,
-                    'HiFi, Photo and Video' => 12,
-                    'Home and Garden' => 13,
-                    'Home Appliances' => 14,
-                    'Jewelry' => 15,
-                    'Lingerie and Adult' => 1,
-                    'Mobile and Telecom' => 16,
-                    'Services' => 17,
-                    'Shoes and accessories' => 18,
-                    'Sport and Entertainment' => 19,
-                    'Travel' => 20,
-                ],
-                'label' => $this->trans('Main Shop Activity', 'Admin.Shopparameters.Feature'),
-                'choice_translation_domain' => 'Install',
-                'autocomplete' => true,
             ]);
     }
 
diff --git a/src/PrestaShopBundle/Install/Install.php b/src/PrestaShopBundle/Install/Install.php
index 8eb2bbb19dccd..c15f133afb49f 100644
--- a/src/PrestaShopBundle/Install/Install.php
+++ b/src/PrestaShopBundle/Install/Install.php
@@ -751,7 +751,6 @@ public function configureShop(array $data = [])
 
         $default_data = [
             'shop_name' => 'My Shop',
-            'shop_activity' => '',
             'shop_country' => 'us',
             'shop_timezone' => 'US/Eastern', // TODO : this timezone is deprecated
             'use_smtp' => false,
@@ -778,7 +777,6 @@ public function configureShop(array $data = [])
         Configuration::updateGlobalValue('PS_INSTALL_VERSION', _PS_INSTALL_VERSION_);
         Configuration::updateGlobalValue('PS_LOCALE_LANGUAGE', $this->language->getLanguageIso());
         Configuration::updateGlobalValue('PS_SHOP_NAME', $data['shop_name']);
-        Configuration::updateGlobalValue('PS_SHOP_ACTIVITY', $data['shop_activity']);
         Configuration::updateGlobalValue('PS_COUNTRY_DEFAULT', $id_country);
         Configuration::updateGlobalValue('PS_LOCALE_COUNTRY', $data['shop_country']);
         Configuration::updateGlobalValue('PS_TIMEZONE', $data['shop_timezone']);
diff --git a/tests/Unit/Adapter/Preferences/PreferencesConfigurationTest.php b/tests/Unit/Adapter/Preferences/PreferencesConfigurationTest.php
index 015edf73997ca..2247292b4fe3d 100644
--- a/tests/Unit/Adapter/Preferences/PreferencesConfigurationTest.php
+++ b/tests/Unit/Adapter/Preferences/PreferencesConfigurationTest.php
@@ -63,7 +63,6 @@ public function testGetConfiguration()
                 [
                     ['PS_PRICE_ROUND_MODE', null, null, 'test'],
                     ['PS_ROUND_TYPE', null, null, 'test'],
-                    ['PS_SHOP_ACTIVITY', null, null, 'test'],
                 ]
             );
 
@@ -97,7 +96,6 @@ public function testGetConfiguration()
                 'display_manufacturers' => true,
                 'display_best_sellers' => false,
                 'multishop_feature_active' => true,
-                'shop_activity' => 'test',
             ],
             $result
         );
@@ -149,7 +147,6 @@ public function testUpdateConfigurationWithInvalidSSLConfiguration()
                     'display_manufacturers' => true,
                     'display_best_sellers' => false,
                     'multishop_feature_active' => true,
-                    'shop_activity' => 'test',
                 ]
             )
         );
@@ -179,7 +176,6 @@ public function testUpdateConfiguration()
                     ['PS_MULTISHOP_FEATURE_ACTIVE', true],
                     ['PS_PRICE_ROUND_MODE', 'test'],
                     ['PS_ROUND_TYPE', 'test'],
-                    ['PS_SHOP_ACTIVITY', 'test'],
                 ]
             );
 
@@ -205,7 +201,6 @@ public function testUpdateConfiguration()
                     'display_manufacturers' => true,
                     'display_best_sellers' => false,
                     'multishop_feature_active' => true,
-                    'shop_activity' => 'test',
                 ]
             )
         );

From e441570caf117356640758e89e84182b80e9e872 Mon Sep 17 00:00:00 2001
From: matthieu-rolland <matthieu.rolland@prestashop.com>
Date: Wed, 12 Jul 2023 15:12:46 +0200
Subject: [PATCH 0523/1030] escape variable to prevent sql injection

---
 src/Adapter/Product/Repository/ProductRepository.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Adapter/Product/Repository/ProductRepository.php b/src/Adapter/Product/Repository/ProductRepository.php
index f65b55ba9974e..1098ffc30835e 100644
--- a/src/Adapter/Product/Repository/ProductRepository.php
+++ b/src/Adapter/Product/Repository/ProductRepository.php
@@ -889,7 +889,7 @@ protected function getSearchQueryBuilder(
             ->addGroupBy('p.id_product')
         ;
 
-        $dbSearchPhrase = sprintf('"%%%s%%"', $searchPhrase);
+        $dbSearchPhrase = sprintf('"%%%s%%"', pSQL($searchPhrase));
         $qb->where($qb->expr()->or(
             $qb->expr()->like('pl.name', $dbSearchPhrase),
 

From 1aeeae9376bfeba69c3723e7c4d2a30d914fe520 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Wed, 12 Jul 2023 15:31:22 +0200
Subject: [PATCH 0524/1030] Add some steps to add new theme test

---
 .../01_themeAndLogo/01_addNewTheme.ts         | 119 +++++++++++++++---
 .../themeAndLogo/themeAndLogo/import.ts       |  41 +++++-
 2 files changed, 139 insertions(+), 21 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/08_design/01_themeAndLogo/01_themeAndLogo/01_addNewTheme.ts b/tests/UI/campaigns/functional/BO/08_design/01_themeAndLogo/01_themeAndLogo/01_addNewTheme.ts
index 12462489bb3a2..7e29c830cacd2 100644
--- a/tests/UI/campaigns/functional/BO/08_design/01_themeAndLogo/01_themeAndLogo/01_addNewTheme.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/01_themeAndLogo/01_themeAndLogo/01_addNewTheme.ts
@@ -1,19 +1,18 @@
 // Import utils
 import helper from '@utils/helpers';
 import testContext from '@utils/testContext';
+import files from '@utils/files';
 
-// Import login steps
+// Import common tests
 import loginCommon from '@commonTests/BO/loginBO';
-import themeImportPage from '@pages/BO/design/themeAndLogo/themeAndLogo/import';
 
 // Import BO pages
 import dashboardPage from '@pages/BO/dashboard';
 import themeAndLogoPage from '@pages/BO/design/themeAndLogo/themeAndLogo';
+import themeImportPage from '@pages/BO/design/themeAndLogo/themeAndLogo/import';
 
 import {expect} from 'chai';
 import type {BrowserContext, Page} from 'playwright';
-import files from "@utils/files";
-import Modules from "@data/demo/modules";
 
 const baseContext: string = 'functional_BO_design_themeAndLogo_themeAndLogo_addNewTheme';
 
@@ -31,6 +30,12 @@ describe('BO - Design - Theme & Logo : Add new theme', async () => {
 
   after(async () => {
     await helper.closeBrowserContext(browserContext);
+
+    await Promise.all([
+      files.deleteFile('theme.zip'),
+      files.deleteFile('../../themes/theme.zip'),
+      files.deleteFile('../../admin-dev/hummingbird.zip'),
+    ]);
   });
 
   it('should login in BO', async function () {
@@ -52,7 +57,7 @@ describe('BO - Design - Theme & Logo : Add new theme', async () => {
   });
 
   it('should go to \'Add new theme\' page', async function () {
-    await testContext.addContextItem(this, 'testIdentifier', 'goToAddNewTheme', baseContext);
+    await testContext.addContextItem(this, 'testIdentifier', 'goToAddNewTheme1', baseContext);
 
     await themeAndLogoPage.goToNewThemePage(page);
 
@@ -60,28 +65,104 @@ describe('BO - Design - Theme & Logo : Add new theme', async () => {
     await expect(pageTitle).to.contains(themeImportPage.pageTitle);
   });
 
-  it('should download theme from the web', async function(){
-    await testContext.addContextItem(this, 'testIdentifier', 'importTheme', baseContext);
+  describe('Import from your computer', async () => {
+    it('should download theme from the web', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'downloadTheme', baseContext);
+
+      await files.downloadFile(urlTheme, 'theme.zip');
+
+      const found = await files.doesFileExist('theme.zip');
+      await expect(found).to.be.true;
+    });
+
+    it('should import theme from your computer', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'importThemeFromComputer', baseContext);
+
+      await themeImportPage.importFromYourComputer(page, 'theme.zip');
 
-    await files.downloadFile(urlTheme, 'theme.zip');
+      const pageTitle = await themeAndLogoPage.getPageTitle(page);
+      await expect(pageTitle).to.contains(themeAndLogoPage.pageTitle);
 
-    const found = await files.doesFileExist('module.zip');
-    await expect(found).to.be.true;
+      const numThemes = await themeAndLogoPage.getNumberOfThemes(page);
+      await expect(numThemes).to.eq(2);
+    });
+
+    it('should remove the theme Hummingbird', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'removeThemeHummingbird1', baseContext);
+
+      const result = await themeAndLogoPage.removeTheme(page, 'hummingbird');
+      await expect(result).to.eq(themeAndLogoPage.successfulDeleteMessage);
+
+      const numThemes = await themeAndLogoPage.getNumberOfThemes(page);
+      await expect(numThemes).to.eq(1);
+    });
   });
 
-  it('should import theme from your computer', asyn function(){
-    await testContext.addContextItem(this, 'testIdentifier', 'importThemeFromComputer', baseContext);
+  describe('Import from the web', async () => {
+    it('should go to \'Add new theme\' page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToAddNewTheme2', baseContext);
+
+      await themeAndLogoPage.goToNewThemePage(page);
+
+      const pageTitle = await themeImportPage.getPageTitle(page);
+      await expect(pageTitle).to.contains(themeImportPage.pageTitle);
+    });
+
+    it('should import from the web the Hummingbird theme', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'importThemeFromWeb', baseContext);
+
+      await themeImportPage.importTheme(page, urlTheme);
+
+      const pageTitle = await themeAndLogoPage.getPageTitle(page);
+      await expect(pageTitle).to.contains(themeAndLogoPage.pageTitle);
+
+      const numThemes = await themeAndLogoPage.getNumberOfThemes(page);
+      await expect(numThemes).to.eq(2);
+    });
+
+    it('should remove the theme Hummingbird', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'removeThemeHummingbird2', baseContext);
+
+      const result = await themeAndLogoPage.removeTheme(page, 'hummingbird');
+      await expect(result).to.eq(themeAndLogoPage.successfulDeleteMessage);
+
+      const numThemes = await themeAndLogoPage.getNumberOfThemes(page);
+      await expect(numThemes).to.eq(1);
+    });
   });
 
-  it('should import from the web the Hummingbird theme', async function () {
-    await testContext.addContextItem(this, 'testIdentifier', 'importThemeFromWeb', baseContext);
+  describe('Import from FTP', async () => {
+    it('should go to \'Add new theme\' page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToAddNewTheme3', baseContext);
 
-    await themeImportPage.importTheme(page, urlTheme);
+      await files.downloadFile(urlTheme, '../../themes/theme.zip');
 
-    const pageTitle = await themeAndLogoPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(themeAndLogoPage.pageTitle);
+      await themeAndLogoPage.goToNewThemePage(page);
+
+      const pageTitle = await themeImportPage.getPageTitle(page);
+      await expect(pageTitle).to.contains(themeImportPage.pageTitle);
+    });
+
+    it('should import from FTP', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'importFromFTP', baseContext);
+
+      await themeImportPage.importFromFTP(page, 'theme.zip');
+
+      const pageTitle = await themeAndLogoPage.getPageTitle(page);
+      await expect(pageTitle).to.contains(themeAndLogoPage.pageTitle);
+
+      const numThemes = await themeAndLogoPage.getNumberOfThemes(page);
+      await expect(numThemes).to.eq(2);
+    });
+
+    it('should remove the theme Hummingbird', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'removeThemeHummingbird3', baseContext);
+
+      const result = await themeAndLogoPage.removeTheme(page, 'hummingbird');
+      await expect(result).to.eq(themeAndLogoPage.successfulDeleteMessage);
 
-    const numThemes = await themeAndLogoPage.getNumberOfThemes(page);
-    await expect(numThemes).to.eq(2);
+      const numThemes = await themeAndLogoPage.getNumberOfThemes(page);
+      await expect(numThemes).to.eq(1);
+    });
   });
 });
diff --git a/tests/UI/pages/BO/design/themeAndLogo/themeAndLogo/import.ts b/tests/UI/pages/BO/design/themeAndLogo/themeAndLogo/import.ts
index d47ba6cca33ab..09032037970e4 100644
--- a/tests/UI/pages/BO/design/themeAndLogo/themeAndLogo/import.ts
+++ b/tests/UI/pages/BO/design/themeAndLogo/themeAndLogo/import.ts
@@ -16,6 +16,14 @@ class ImportTheme extends themeAndLogoBasePage {
 
   private readonly importWebSubmit: string;
 
+  private readonly importFromYourComputerSubmit: string;
+
+  private readonly zipFileUploadButton: string;
+
+  private readonly selectArchive: string;
+
+  private readonly importFTPSubmit: string;
+
   /**
    * @constructs
    * Setting up texts and selectors to use on theme & logo page
@@ -26,14 +34,33 @@ class ImportTheme extends themeAndLogoBasePage {
     this.pageTitle = `Theme import • ${global.INSTALL.SHOP_NAME}`;
 
     this.importForm = 'form[name="import_theme"]';
+    // Form "Import from your computer"
+    this.zipFileUploadButton = '#import_theme_import_from_computer';
+    this.importFromYourComputerSubmit = `${this.importForm} div.row div:nth-child(1) div.card-footer button`;
+
     // Form "Import from the web"
     this.inputArchiveURL = '#import_theme_import_from_web';
-    this.importWebSubmit = `${this.importForm} > div.row > div:nth-child(2) div.card-footer button`;
+    this.importWebSubmit = `${this.importForm} div.row div:nth-child(2) div.card-footer button`;
+
+    // From FTP
+    this.selectArchive = '#import_theme_import_from_ftp';
+    this.importFTPSubmit = `${this.importForm} div.row div:nth-child(3) div.card-footer button`;
+  }
+
+  /**
+   * Import theme from your computer
+   * @param page {Page} Browser tab
+   * @param path {string} Theme path to import
+   * @returns {Promise<void>}
+   */
+  async importFromYourComputer(page: Page, path: string): Promise<void> {
+    await this.uploadFile(page, this.zipFileUploadButton, path);
+    await page.click(this.importFromYourComputerSubmit);
   }
 
   /**
    * Import theme from web
-   * @param page  {Page} Browser tab
+   * @param page {Page} Browser tab
    * @param themeUrl {string} Theme URL link to import
    * @returns {Promise<void>}
    */
@@ -41,6 +68,16 @@ class ImportTheme extends themeAndLogoBasePage {
     await this.setValue(page, this.inputArchiveURL, themeUrl);
     await page.click(this.importWebSubmit);
   }
+
+  /**
+   * Import theme from ftp
+   * @param page {Page} Browser tab
+   * @param zipName {string} Zip name to select
+   */
+  async importFromFTP(page: Page, zipName: string): Promise<void> {
+    await this.selectByVisibleText(page, this.selectArchive, zipName);
+    await page.click(this.importFTPSubmit);
+  }
 }
 
 export default new ImportTheme();

From edbcc56c67ff8b473e8fa1461ba2ed30c98dc9ea Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Wed, 12 Jul 2023 15:36:38 +0200
Subject: [PATCH 0525/1030] Fix jsDoc

---
 tests/UI/pages/BO/design/themeAndLogo/themeAndLogo/import.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/UI/pages/BO/design/themeAndLogo/themeAndLogo/import.ts b/tests/UI/pages/BO/design/themeAndLogo/themeAndLogo/import.ts
index 09032037970e4..f6ea185b663bf 100644
--- a/tests/UI/pages/BO/design/themeAndLogo/themeAndLogo/import.ts
+++ b/tests/UI/pages/BO/design/themeAndLogo/themeAndLogo/import.ts
@@ -73,6 +73,7 @@ class ImportTheme extends themeAndLogoBasePage {
    * Import theme from ftp
    * @param page {Page} Browser tab
    * @param zipName {string} Zip name to select
+   * @returns {Promise<void>}
    */
   async importFromFTP(page: Page, zipName: string): Promise<void> {
     await this.selectByVisibleText(page, this.selectArchive, zipName);

From 33e4e6564f5c7383c46c7c51c5a362373f6471b3 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Wed, 12 Jul 2023 17:02:12 +0200
Subject: [PATCH 0526/1030] Fix review

---
 .../08_design/01_themeAndLogo/01_themeAndLogo/01_addNewTheme.ts | 2 +-
 tests/UI/commonTests/FO/hummingbird.ts                          | 2 +-
 tests/UI/pages/BO/design/themeAndLogo/themeAndLogo/import.ts    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/08_design/01_themeAndLogo/01_themeAndLogo/01_addNewTheme.ts b/tests/UI/campaigns/functional/BO/08_design/01_themeAndLogo/01_themeAndLogo/01_addNewTheme.ts
index 7e29c830cacd2..7d9afb64d38b5 100644
--- a/tests/UI/campaigns/functional/BO/08_design/01_themeAndLogo/01_themeAndLogo/01_addNewTheme.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/01_themeAndLogo/01_themeAndLogo/01_addNewTheme.ts
@@ -111,7 +111,7 @@ describe('BO - Design - Theme & Logo : Add new theme', async () => {
     it('should import from the web the Hummingbird theme', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'importThemeFromWeb', baseContext);
 
-      await themeImportPage.importTheme(page, urlTheme);
+      await themeImportPage.importFromWeb(page, urlTheme);
 
       const pageTitle = await themeAndLogoPage.getPageTitle(page);
       await expect(pageTitle).to.contains(themeAndLogoPage.pageTitle);
diff --git a/tests/UI/commonTests/FO/hummingbird.ts b/tests/UI/commonTests/FO/hummingbird.ts
index 4244c048375c5..91659db17a3d4 100644
--- a/tests/UI/commonTests/FO/hummingbird.ts
+++ b/tests/UI/commonTests/FO/hummingbird.ts
@@ -60,7 +60,7 @@ function installHummingbird(baseContext: string = 'commonTests-installHummingbir
     it('should import from the web the Hummingbird theme', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'importTheme', baseContext);
 
-      await themeImportPage.importTheme(page, urlTheme);
+      await themeImportPage.importFromWeb(page, urlTheme);
 
       const pageTitle = await themeAndLogoPage.getPageTitle(page);
       await expect(pageTitle).to.contains(themeAndLogoPage.pageTitle);
diff --git a/tests/UI/pages/BO/design/themeAndLogo/themeAndLogo/import.ts b/tests/UI/pages/BO/design/themeAndLogo/themeAndLogo/import.ts
index f6ea185b663bf..356f74da178c8 100644
--- a/tests/UI/pages/BO/design/themeAndLogo/themeAndLogo/import.ts
+++ b/tests/UI/pages/BO/design/themeAndLogo/themeAndLogo/import.ts
@@ -64,7 +64,7 @@ class ImportTheme extends themeAndLogoBasePage {
    * @param themeUrl {string} Theme URL link to import
    * @returns {Promise<void>}
    */
-  async importTheme(page: Page, themeUrl: string): Promise<void> {
+  async importFromWeb(page: Page, themeUrl: string): Promise<void> {
     await this.setValue(page, this.inputArchiveURL, themeUrl);
     await page.click(this.importWebSubmit);
   }

From a87f1268ce55e9964ff89bbd1f8254dcc1c3543a Mon Sep 17 00:00:00 2001
From: matthieu-rolland <matthieu.rolland@prestashop.com>
Date: Wed, 12 Jul 2023 17:31:01 +0200
Subject: [PATCH 0527/1030] protect from path traversal attack

---
 controllers/admin/AdminTranslationsController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php
index d159c378fb842..4b21bddaff8d6 100644
--- a/controllers/admin/AdminTranslationsController.php
+++ b/controllers/admin/AdminTranslationsController.php
@@ -3296,7 +3296,7 @@ public static function getEmailHTML($email)
             $email_file = _PS_ROOT_DIR_ . $email;
         }
 
-        if (file_exists($email_file)) {
+        if (strpos(realpath($email_file), _PS_ROOT_DIR_) === 0 && file_exists($email_file)) {
             $email_html = file_get_contents($email_file);
         } else {
             $email_html = '';

From dfa9105130d55fb4bc10b7bf2fe2397d77cb83b7 Mon Sep 17 00:00:00 2001
From: matthieu-rolland <matthieu.rolland@prestashop.com>
Date: Wed, 12 Jul 2023 17:44:51 +0200
Subject: [PATCH 0528/1030] protect against path traversal attack

---
 src/Core/Import/File/FileRemoval.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Core/Import/File/FileRemoval.php b/src/Core/Import/File/FileRemoval.php
index cb2ab2a8bf928..61027d0307830 100644
--- a/src/Core/Import/File/FileRemoval.php
+++ b/src/Core/Import/File/FileRemoval.php
@@ -52,6 +52,7 @@ public function __construct(ImportDirectory $importDirectory)
     public function remove($filename)
     {
         $fs = new Filesystem();
+        $filename = basename($filename);
         $filesToRemove = [
             $this->importDirectory . $filename,
             $this->importDirectory . 'csvfromexcel/' . $filename,

From a0425e35a37f0318bd702023cb4992cf16430dae Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Wed, 12 Jul 2023 15:40:48 +0200
Subject: [PATCH 0529/1030] Update module cache key

---
 src/Core/Addon/Module/ModuleManagerBuilder.php        |  3 ++-
 src/Core/Module/ModuleRepository.php                  | 11 +++++++++--
 .../Resources/config/services/core/module.yml         |  2 ++
 .../Integration/Core/Module/ModuleRepositoryTest.php  |  3 ++-
 tests/Unit/Core/Module/ModuleRepositoryTest.php       |  1 +
 5 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/Core/Addon/Module/ModuleManagerBuilder.php b/src/Core/Addon/Module/ModuleManagerBuilder.php
index e99f17dbdf48e..be50ef1ee6e30 100644
--- a/src/Core/Addon/Module/ModuleManagerBuilder.php
+++ b/src/Core/Addon/Module/ModuleManagerBuilder.php
@@ -136,7 +136,8 @@ public function buildRepository()
                     self::$adminModuleDataProvider,
                     self::$cacheProvider,
                     new HookManager(),
-                    _PS_MODULE_DIR_
+                    _PS_MODULE_DIR_,
+                    Context::getContext()->language->id
                 );
             }
         }
diff --git a/src/Core/Module/ModuleRepository.php b/src/Core/Module/ModuleRepository.php
index 5905360022929..1be92b271ee85 100644
--- a/src/Core/Module/ModuleRepository.php
+++ b/src/Core/Module/ModuleRepository.php
@@ -74,18 +74,25 @@ class ModuleRepository implements ModuleRepositoryInterface
     /** @var Module[] */
     private $modulesFromHook;
 
+    /**
+     * @var int
+     */
+    private $contextLangId;
+
     public function __construct(
         ModuleDataProvider $moduleDataProvider,
         AdminModuleDataProvider $adminModuleDataProvider,
         CacheProvider $cacheProvider,
         HookManager $hookManager,
-        string $modulePath
+        string $modulePath,
+        int $contextLangId
     ) {
         $this->moduleDataProvider = $moduleDataProvider;
         $this->adminModuleDataProvider = $adminModuleDataProvider;
         $this->cacheProvider = $cacheProvider;
         $this->hookManager = $hookManager;
         $this->modulePath = $modulePath;
+        $this->contextLangId = $contextLangId;
     }
 
     public function getList(): ModuleCollection
@@ -227,7 +234,7 @@ protected function getCacheKey(string $moduleName, ?int $shopId = null): string
     {
         $shop = $shopId ? [$shopId] : Shop::getContextListShopID();
 
-        return $moduleName . implode('-', $shop);
+        return $moduleName . implode('-', $shop) . $this->contextLangId;
     }
 
     private function getModuleAttributes(string $moduleName, bool $isValid): array
diff --git a/src/PrestaShopBundle/Resources/config/services/core/module.yml b/src/PrestaShopBundle/Resources/config/services/core/module.yml
index 79975c7d097cc..a1cf4e1736d2e 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/module.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/module.yml
@@ -12,12 +12,14 @@ services:
 
   PrestaShop\PrestaShop\Core\Module\ModuleRepository:
     public: false
+    lazy: true
     arguments:
       - '@prestashop.adapter.data_provider.module'
       - '@prestashop.adapter.admin.data_provider.module'
       - '@doctrine.cache.provider'
       - '@prestashop.adapter.hook.manager'
       - "@=service('prestashop.adapter.legacy.configuration').get('_PS_MODULE_DIR_')"
+      - '@=service("prestashop.adapter.legacy.context").getContext().language.id'
 
   prestashop.core.admin.module.repository.eventsubscriber:
     class: PrestaShop\PrestaShop\Core\Module\EventSubscriber
diff --git a/tests/Integration/Core/Module/ModuleRepositoryTest.php b/tests/Integration/Core/Module/ModuleRepositoryTest.php
index 8c9f5d4f94643..9934aed81276d 100644
--- a/tests/Integration/Core/Module/ModuleRepositoryTest.php
+++ b/tests/Integration/Core/Module/ModuleRepositoryTest.php
@@ -94,7 +94,8 @@ protected function setUp(): void
             $this->createMock(AdminModuleDataProvider::class),
             new DoctrineProvider(new ArrayAdapter()),
             $hookManager,
-            dirname(__DIR__, 3) . '/Resources/modules/'
+            dirname(__DIR__, 3) . '/Resources/modules/',
+            1
         );
     }
 
diff --git a/tests/Unit/Core/Module/ModuleRepositoryTest.php b/tests/Unit/Core/Module/ModuleRepositoryTest.php
index 1852ccbc31b6a..0f99139948560 100644
--- a/tests/Unit/Core/Module/ModuleRepositoryTest.php
+++ b/tests/Unit/Core/Module/ModuleRepositoryTest.php
@@ -75,6 +75,7 @@ public function setUp(): void
                 $this->createMock(CacheProvider::class),
                 $this->createMock(HookManager::class),
                 dirname(__DIR__, 3) . '/Resources/modules',
+                1,
             ])
             ->onlyMethods(['getModule'])
             ->getMock()

From ea4d36901e26fc2acdc1cee60bc7e55b4247d11d Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Wed, 12 Jul 2023 16:30:45 +0200
Subject: [PATCH 0530/1030] Add doctrine cache clear

---
 .../Cache/Clearer/DoctrineCacheClearer.php    | 50 +++++++++++++++++++
 .../config/services/adapter/cache.yml         |  4 ++
 .../Resources/config/services/core/cache.yml  |  1 +
 3 files changed, 55 insertions(+)
 create mode 100644 src/Adapter/Cache/Clearer/DoctrineCacheClearer.php

diff --git a/src/Adapter/Cache/Clearer/DoctrineCacheClearer.php b/src/Adapter/Cache/Clearer/DoctrineCacheClearer.php
new file mode 100644
index 0000000000000..130f48d939ea5
--- /dev/null
+++ b/src/Adapter/Cache/Clearer/DoctrineCacheClearer.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Adapter\Cache\Clearer;
+
+use PrestaShop\PrestaShop\Core\Cache\Clearer\CacheClearerInterface;
+use Symfony\Component\Cache\DoctrineProvider;
+
+final class DoctrineCacheClearer implements CacheClearerInterface
+{
+    /** @var DoctrineProvider */
+    private $doctrineProvider;
+
+    public function __construct(
+        DoctrineProvider $doctrineProvider
+    ) {
+        $this->doctrineProvider = $doctrineProvider;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function clear()
+    {
+        $this->doctrineProvider->deleteAll();
+    }
+}
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/cache.yml b/src/PrestaShopBundle/Resources/config/services/adapter/cache.yml
index ae571d917cca4..dc488cbd9bc8d 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/cache.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/cache.yml
@@ -16,3 +16,7 @@ services:
 
   prestashop.adapter.cache.clearer.xml_cache_clearer:
     class: 'PrestaShop\PrestaShop\Adapter\Cache\Clearer\XmlCacheClearer'
+
+  PrestaShop\PrestaShop\Adapter\Cache\Clearer\DoctrineCacheClearer:
+    arguments:
+      - '@doctrine.cache.provider'
diff --git a/src/PrestaShopBundle/Resources/config/services/core/cache.yml b/src/PrestaShopBundle/Resources/config/services/core/cache.yml
index e1a60197942e5..1202143718ea1 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/cache.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/cache.yml
@@ -19,6 +19,7 @@ services:
       - '@prestashop.adapter.cache.clearer.xml_cache_clearer'
       - '@prestashop.adapter.cache.clearer.media_cache_clearer'
       - '@prestashop.adapter.cache.clearer.class_index_cache_clearer'
+      - '@PrestaShop\PrestaShop\Adapter\Cache\Clearer\DoctrineCacheClearer'
 
   prestashop.core.cache.clearer.product_cache_clearer_chain:
     class: 'PrestaShop\PrestaShop\Core\Cache\Clearer\CacheClearerChain'

From d5f229d8aedba22880d091ead216aa4b270545fd Mon Sep 17 00:00:00 2001
From: matthieu-rolland <matthieu.rolland@prestashop.com>
Date: Wed, 12 Jul 2023 18:15:24 +0200
Subject: [PATCH 0531/1030] protect from writing files on server through SQL
 form

---
 classes/RequestSql.php | 1 +
 classes/db/Db.php      | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/classes/RequestSql.php b/classes/RequestSql.php
index caaa4faaefb05..528c01d92c606 100644
--- a/classes/RequestSql.php
+++ b/classes/RequestSql.php
@@ -65,6 +65,7 @@ class RequestSqlCore extends ObjectModel
             'RESET', 'START', 'STOP', 'PURGE', 'EXECUTE', 'PREPARE', 'DEALLOCATE', 'LOCK', 'USING', 'DROP', 'FOR', 'UPDATE', 'BEGIN', 'BY', 'ALL', 'SHARE',
             'MODE', 'TO', 'KEY', 'DISTINCTROW', 'DISTINCT',  'HIGH_PRIORITY', 'LOW_PRIORITY', 'DELAYED', 'IGNORE', 'FORCE', 'STRAIGHT_JOIN',
             'SQL_SMALL_RESULT', 'SQL_BIG_RESULT', 'QUICK', 'SQL_BUFFER_RESULT', 'SQL_CACHE', 'SQL_NO_CACHE', 'SQL_CALC_FOUND_ROWS', 'WITH',
+            'OUTFILE', 'DUMPFILE',
         ],
     ];
 
diff --git a/classes/db/Db.php b/classes/db/Db.php
index 9d44e5e0fe1eb..6223b6a1d03f7 100644
--- a/classes/db/Db.php
+++ b/classes/db/Db.php
@@ -603,7 +603,11 @@ public function executeS($sql, $array = true, $use_cache = true)
         }
 
         // This method must be used only with queries which display results
-        if (!preg_match('#^\s*\(?\s*(select|show|explain|describe|desc|checksum)\s#i', $sql)) {
+        if (
+            !preg_match('#^\s*\(?\s*(select|show|explain|describe|desc|checksum)\s#i', $sql)
+            || stripos($sql, 'outfile') !== false
+            || stripos($sql, 'dumpfile') !== false
+        ) {
             throw new PrestaShopDatabaseException('Db->executeS() must be used only with select, show, explain or describe queries');
         }
 

From 79f352c81c46556093f643b9ead563afddeecffa Mon Sep 17 00:00:00 2001
From: matthieu-rolland <matthieu.rolland@prestashop.com>
Date: Wed, 12 Jul 2023 18:17:39 +0200
Subject: [PATCH 0532/1030] protect from writing files on server through SQL
 form

---
 classes/RequestSql.php | 1 +
 classes/db/Db.php      | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/classes/RequestSql.php b/classes/RequestSql.php
index 8ec78a0e3f089..ee99e83ef4ba7 100644
--- a/classes/RequestSql.php
+++ b/classes/RequestSql.php
@@ -65,6 +65,7 @@ class RequestSqlCore extends ObjectModel
             'RESET', 'START', 'STOP', 'PURGE', 'EXECUTE', 'PREPARE', 'DEALLOCATE', 'LOCK', 'USING', 'DROP', 'FOR', 'UPDATE', 'BEGIN', 'BY', 'ALL', 'SHARE',
             'MODE', 'TO', 'KEY', 'DISTINCTROW', 'DISTINCT',  'HIGH_PRIORITY', 'LOW_PRIORITY', 'DELAYED', 'IGNORE', 'FORCE', 'STRAIGHT_JOIN',
             'SQL_SMALL_RESULT', 'SQL_BIG_RESULT', 'QUICK', 'SQL_BUFFER_RESULT', 'SQL_CACHE', 'SQL_NO_CACHE', 'SQL_CALC_FOUND_ROWS', 'WITH',
+            'OUTFILE', 'DUMPFILE',
         ],
     ];
 
diff --git a/classes/db/Db.php b/classes/db/Db.php
index 9d44e5e0fe1eb..6223b6a1d03f7 100644
--- a/classes/db/Db.php
+++ b/classes/db/Db.php
@@ -603,7 +603,11 @@ public function executeS($sql, $array = true, $use_cache = true)
         }
 
         // This method must be used only with queries which display results
-        if (!preg_match('#^\s*\(?\s*(select|show|explain|describe|desc|checksum)\s#i', $sql)) {
+        if (
+            !preg_match('#^\s*\(?\s*(select|show|explain|describe|desc|checksum)\s#i', $sql)
+            || stripos($sql, 'outfile') !== false
+            || stripos($sql, 'dumpfile') !== false
+        ) {
             throw new PrestaShopDatabaseException('Db->executeS() must be used only with select, show, explain or describe queries');
         }
 

From da6e262e5e6318d3b08f99c356ca0384d95995f0 Mon Sep 17 00:00:00 2001
From: Ibrahima SOW <ibrahima.sow@prestashop.com>
Date: Wed, 12 Jul 2023 19:56:50 +0000
Subject: [PATCH 0533/1030] Module manager - Empty category - Add raw filter to
 display html content

---
 .../views/Admin/Module/Includes/grid_manage_empty.html.twig     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PrestaShopBundle/Resources/views/Admin/Module/Includes/grid_manage_empty.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Module/Includes/grid_manage_empty.html.twig
index 045ca2e7521f7..626d6872c0b9d 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Module/Includes/grid_manage_empty.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Module/Includes/grid_manage_empty.html.twig
@@ -29,7 +29,7 @@
     <div class="module-short-list">
       <span id="{{ category.refMenu }}_modules" class="module-search-result-title">{{ category.name | trans({}, 'Admin.Modules.Feature') }}</span>
       <div class="modules-list module-list-empty" data-name="{{ category.refMenu }}">
-        {{ hookData }}
+        {{ hookData|raw }}
       </div>
     </div>
   {% endif %}

From 1be55f1b68cc119cc61db071d796b06e59f7455d Mon Sep 17 00:00:00 2001
From: lartist <salim-benouamer.ext@prestashop.com>
Date: Mon, 10 Jul 2023 16:26:33 +0200
Subject: [PATCH 0534/1030] Replace mobile quick access smarty template by twig
 component

---
 .../themes/new-theme/template/layout.tpl      | 10 ++-
 phpstan-tmp-legacy-layout-baseline.neon       | 10 +++
 .../Layout/mobile_quick_access.html.twig      | 73 +++++++++++++++++++
 .../Component/Layout/quick_access.html.twig   |  4 +-
 .../Layout/mobile_quick_access.html.twig      | 30 ++++++++
 .../Twig/Component/MobileQuickAccess.php      | 41 +++++++++++
 6 files changed, 164 insertions(+), 4 deletions(-)
 create mode 100644 src/PrestaShopBundle/Resources/views/Admin/Component/Layout/mobile_quick_access.html.twig
 create mode 100644 src/PrestaShopBundle/Resources/views/Admin/Layout/mobile_quick_access.html.twig
 create mode 100644 src/PrestaShopBundle/Twig/Component/MobileQuickAccess.php

diff --git a/admin-dev/themes/new-theme/template/layout.tpl b/admin-dev/themes/new-theme/template/layout.tpl
index f2708ed9bebf6..3e8d74e24450d 100644
--- a/admin-dev/themes/new-theme/template/layout.tpl
+++ b/admin-dev/themes/new-theme/template/layout.tpl
@@ -37,8 +37,14 @@
             {include file="components/layout/search_form.tpl"}
             <button class="component-search-cancel d-none">{l|escape s='Cancel' d='Admin.Actions'}</button>
           </div>
-
-          {include file="components/layout/mobile_quickaccess.tpl"}
+            {render_template
+              smarty_template="components/layout/mobile_quickaccess.tpl"
+              twig_template="@PrestaShop/Admin/Layout/mobile_quick_access.html.twig"
+              quick_access=$quick_access
+              link=$link
+              quick_access_current_link_icon=$quick_access_current_link_icon
+              quick_access_current_link_name=$quick_access_current_link_name
+            }
         </div>
 
         <div class="component-search-background d-none"></div>
diff --git a/phpstan-tmp-legacy-layout-baseline.neon b/phpstan-tmp-legacy-layout-baseline.neon
index 6c118ddace55a..fb08e46111a08 100644
--- a/phpstan-tmp-legacy-layout-baseline.neon
+++ b/phpstan-tmp-legacy-layout-baseline.neon
@@ -20,6 +20,16 @@ parameters:
 			count: 1
 			path: src/PrestaShopBundle/Twig/Component/EmployeeDropdown.php
 
+		-
+			message: "#^Class Link is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+			count: 1
+			path: src/PrestaShopBundle/Twig/Component/MobileQuickAccess.php
+
+		-
+			message: "#^Namespace Link is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+			count: 1
+			path: src/PrestaShopBundle/Twig/Component/MobileQuickAccess.php
+
 		-
 			message: "#^Class Link is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
 			count: 1
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/mobile_quick_access.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/mobile_quick_access.html.twig
new file mode 100644
index 0000000000000..7698e86f0c8a2
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/mobile_quick_access.html.twig
@@ -0,0 +1,73 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+<div class="component-search-quickaccess d-none">
+  <p class="component-search-title">{{ 'Quick Access'|trans({}, 'Admin.Navigation.Header') }}</p>
+  {% for quick in quickAccess %}
+    <a class="dropdown-item quick-row-link{% if link.matchQuickLink(quick.link) %}{% set matchQuickLink = quick.id_quick_access %} active{% endif %}"
+      href="{{ quick.link|escape('html_attr') }}"
+      {% if quick.new_window %} target="_blank"{% endif %}
+      data-item="{{ quick.name }}"
+      >
+      {{ quick.name }}
+  </a>
+  {% endfor %}
+  <div class="dropdown-divider"></div>
+  {% if matchQuickLink is defined %}
+  <a id="quick-remove-link"
+     class="dropdown-item js-quick-link"
+     href="#"
+     data-method="remove"
+     data-quicklink-id="{{ matchQuickLink }}"
+     data-rand="{{ random(1, 200) }}"
+     data-icon="{{ quickAccessCurrentLinkIcon }}"
+     data-url="{{ link.getQuickLink(app.request.uri) }}"
+     data-post-link="{{ link.getAdminLink('AdminQuickAccesses') }}"
+     data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header')|escape('html_attr')}}"
+     data-link="{{ quickAccessCurrentLinkName|u.truncate(32, '...') }}"
+  >
+    <i class="material-icons">remove_circle_outline</i>
+    {{ 'Remove from Quick Access'|trans({}, 'Admin.Navigation.Header') }}
+  </a>
+  {% else %}
+  <a id="quick-add-link"
+     class="dropdown-item js-quick-link"
+     href="#"
+     data-rand="{{ random(1, 200) }}"
+     data-icon="{{ quickAccessCurrentLinkIcon }}"
+     data-method="add"
+     data-url="{{ link.getQuickLink(app.request.uri) }}"
+     data-post-link="{{ link.getAdminLink('AdminQuickAccesses') }}"
+     data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header')|escape('html_attr')}}"
+     data-link="{{ quickAccessCurrentLinkName|u.truncate(32, '...') }}"
+  >
+    <i class="material-icons">add_circle</i>
+    {{ 'Add current page to Quick Access'|trans({}, 'Admin.Actions') }}
+  </a>
+  {% endif %}
+  <a id="quick-manage-link" class="dropdown-item" href="{{ link.getAdminLink('AdminQuickAccesses') }}">
+  <i class="material-icons">settings</i>
+    {{ 'Manage your quick accesses'|trans({}, 'Admin.Navigation.Header') }}
+  </a>
+</div>
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/quick_access.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/quick_access.html.twig
index d541553b30de9..140c5d6f0fe09 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/quick_access.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/quick_access.html.twig
@@ -50,7 +50,7 @@
          data-quicklink-id="{{ matchQuickLink }}"
          data-rand="{{ random(1, 200) }}"
          data-icon="{{ quickAccessCurrentLinkIcon }}"
-         data-url="{{ link.getQuickLink(app.request.uri|escape('html_attr')) }}"
+         data-url="{{ link.getQuickLink(app.request.uri) }}"
          data-post-link="{{ link.getAdminLink('AdminQuickAccesses') }}"
          data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header')|escape('html_attr') }}"
          data-link="{{ quickAccessCurrentLinkName|u.truncate(32, '...') }}"
@@ -65,7 +65,7 @@
        data-rand="{{ random(1, 200) }}"
        data-icon="{{ quickAccessCurrentLinkIcon }}"
        data-method="add"
-       data-url="{{ link.getQuickLink(app.request.uri|escape('html_attr')) }}"
+       data-url="{{ link.getQuickLink(app.request.uri) }}"
        data-post-link="{{ link.getAdminLink('AdminQuickAccesses') }}"
        data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header')|escape('html_attr')}}"
        data-link="{{ quickAccessCurrentLinkName|u.truncate(32, '...') }}"
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/mobile_quick_access.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/mobile_quick_access.html.twig
new file mode 100644
index 0000000000000..e1df44308bb01
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/mobile_quick_access.html.twig
@@ -0,0 +1,30 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+{{ component('MobileQuickAccess', {
+  quickAccess: quick_access,
+  link: link,
+  quickAccessCurrentLinkIcon: quick_access_current_link_icon,
+  quickAccessCurrentLinkName: quick_access_current_link_name
+}) }}
diff --git a/src/PrestaShopBundle/Twig/Component/MobileQuickAccess.php b/src/PrestaShopBundle/Twig/Component/MobileQuickAccess.php
new file mode 100644
index 0000000000000..414d88da10e1f
--- /dev/null
+++ b/src/PrestaShopBundle/Twig/Component/MobileQuickAccess.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\Twig\Component;
+
+use Link;
+use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
+
+#[AsTwigComponent(template: '@PrestaShop/Admin/Component/Layout/mobile_quick_access.html.twig')]
+class MobileQuickAccess
+{
+    public array $quickAccess;
+    public Link $link;
+    public string $quickAccessCurrentLinkIcon;
+    public string $quickAccessCurrentLinkName;
+}

From e3c71f21a2b74cc99f656119035acf5122c857b1 Mon Sep 17 00:00:00 2001
From: matthieu-rolland <matthieu.rolland@prestashop.com>
Date: Thu, 13 Jul 2023 10:21:39 +0200
Subject: [PATCH 0535/1030] add missing html attributes

---
 classes/Validate.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/classes/Validate.php b/classes/Validate.php
index 452dd032e970b..6f34ae88bb65e 100644
--- a/classes/Validate.php
+++ b/classes/Validate.php
@@ -512,6 +512,7 @@ public static function isCleanHtml($html, $allow_iframe = false)
         $events .= '|ondragleave|ondragover|ondragstart|ondrop|onerrorupdate|onfilterchange|onfinish|onfocusin|onfocusout|onhashchange|onhelp|oninput|onlosecapture|onmessage|onmouseup|onmovestart';
         $events .= '|onoffline|ononline|onpaste|onpropertychange|onreadystatechange|onresizeend|onresizestart|onrowenter|onrowexit|onrowsdelete|onrowsinserted|onscroll|onsearch|onselectionchange';
         $events .= '|onselectstart|onstart|onstop|onanimationcancel|onanimationend|onanimationiteration|onanimationstart';
+        $events .= '|onpointerover|onpointerenter|onpointerdown|onpointermove|onpointerup|onpointerout|onpointerleave|onpointercancel|ongotpointercapture|onlostpointercapture';
 
         if (preg_match('/<[\s]*script/ims', $html) || preg_match('/(' . $events . ')[\s]*=/ims', $html) || preg_match('/.*script\:/ims', $html)) {
             return false;

From 3149f85da2825506e4d7409f9730d4420a19891c Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Thu, 13 Jul 2023 11:21:42 +0200
Subject: [PATCH 0536/1030] Fix Design > Pages tests

---
 ...ndSortPages.ts => 03_paginationOfPages.ts} | 126 ++++--------------
 .../08_design/04_pages/pages/04_sortPages.ts  | 120 +++++++++++++++++
 2 files changed, 148 insertions(+), 98 deletions(-)
 rename tests/UI/campaigns/functional/BO/08_design/04_pages/pages/{03_paginationAndSortPages.ts => 03_paginationOfPages.ts} (53%)
 create mode 100644 tests/UI/campaigns/functional/BO/08_design/04_pages/pages/04_sortPages.ts

diff --git a/tests/UI/campaigns/functional/BO/08_design/04_pages/pages/03_paginationAndSortPages.ts b/tests/UI/campaigns/functional/BO/08_design/04_pages/pages/03_paginationOfPages.ts
similarity index 53%
rename from tests/UI/campaigns/functional/BO/08_design/04_pages/pages/03_paginationAndSortPages.ts
rename to tests/UI/campaigns/functional/BO/08_design/04_pages/pages/03_paginationOfPages.ts
index 30fcba7aeee18..f2497758e17cd 100644
--- a/tests/UI/campaigns/functional/BO/08_design/04_pages/pages/03_paginationAndSortPages.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/04_pages/pages/03_paginationOfPages.ts
@@ -17,15 +17,13 @@ import CMSPageData from '@data/faker/CMSpage';
 import {expect} from 'chai';
 import type {BrowserContext, Page} from 'playwright';
 
-const baseContext: string = 'functional_BO_design_pages_pages_paginationAndSortPages';
+const baseContext: string = 'functional_BO_design_pages_pages_paginationOfPages';
 
 /*
 Create 11 pages
 Paginate between pages
-Sort pages table by id, url, title, position
-Delete pages with bulk actions
  */
-describe('BO - design - Pages : Pagination and sort Pages table', async () => {
+describe('BO - design - Pages : Pagination of Pages table', async () => {
   let browserContext: BrowserContext;
   let page: Page;
   let numberOfPages: number = 0;
@@ -40,35 +38,35 @@ describe('BO - design - Pages : Pagination and sort Pages table', async () => {
     await helper.closeBrowserContext(browserContext);
   });
 
-  it('should login in BO', async function () {
-    await loginCommon.loginBO(this, page);
-  });
+  // Pre-condition : Create 11 pages
+  describe('PRE-TEST: Create 11 pages in BO', async () => {
+    it('should login in BO', async function () {
+      await loginCommon.loginBO(this, page);
+    });
 
-  it('should go to \'Design > Pages\' page', async function () {
-    await testContext.addContextItem(this, 'testIdentifier', 'goToCmsPagesPage', baseContext);
+    it('should go to \'Design > Pages\' page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToCmsPagesPage', baseContext);
 
-    await dashboardPage.goToSubMenu(
-      page,
-      dashboardPage.designParentLink,
-      dashboardPage.pagesLink,
-    );
-    await pagesPage.closeSfToolBar(page);
+      await dashboardPage.goToSubMenu(
+        page,
+        dashboardPage.designParentLink,
+        dashboardPage.pagesLink,
+      );
+      await pagesPage.closeSfToolBar(page);
 
-    const pageTitle = await pagesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(pagesPage.pageTitle);
-  });
+      const pageTitle = await pagesPage.getPageTitle(page);
+      await expect(pageTitle).to.contains(pagesPage.pageTitle);
+    });
 
-  it('should reset all filters and get number of pages in BO', async function () {
-    await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
+    it('should reset all filters and get number of pages in BO', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
-    numberOfPages = await pagesPage.resetAndGetNumberOfLines(page, 'cms_page');
-    if (numberOfPages !== 0) {
-      await expect(numberOfPages).to.be.above(0);
-    }
-  });
+      numberOfPages = await pagesPage.resetAndGetNumberOfLines(page, 'cms_page');
+      if (numberOfPages !== 0) {
+        await expect(numberOfPages).to.be.above(0);
+      }
+    });
 
-  // 1 : Create 11 pages
-  describe('Create 11 pages in BO', async () => {
     const tests = new Array(11).fill(0, 0, 11);
     tests.forEach((test: number, index: number) => {
       const createPageData: CMSPageData = new CMSPageData({title: `todelete${index}`});
@@ -98,7 +96,7 @@ describe('BO - design - Pages : Pagination and sort Pages table', async () => {
     });
   });
 
-  // 2 : Test pagination
+  // Test pagination
   describe('Pagination next and previous', async () => {
     it('should change the items number to 10 per page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'changeItemsNumberTo10', baseContext);
@@ -129,76 +127,8 @@ describe('BO - design - Pages : Pagination and sort Pages table', async () => {
     });
   });
 
-  // 3 : Sort pages table
-  describe('Sort pages table', async () => {
-    const sortTests = [
-      {
-        args:
-          {
-            testIdentifier: 'sortByPositionDesc', sortBy: 'position', sortDirection: 'desc', isFloat: true,
-          },
-      },
-      {
-        args:
-          {
-            testIdentifier: 'sortByIdAsc', sortBy: 'id_cms', sortDirection: 'asc', isFloat: true,
-          },
-      },
-      {
-        args:
-          {
-            testIdentifier: 'sortByIdDesc', sortBy: 'id_cms', sortDirection: 'desc', isFloat: true,
-          },
-      },
-      {args: {testIdentifier: 'sortByUrlAsc', sortBy: 'link_rewrite', sortDirection: 'asc'}},
-      {args: {testIdentifier: 'sortByUrlDesc', sortBy: 'link_rewrite', sortDirection: 'desc'}},
-      {args: {testIdentifier: 'sortByTitleAsc', sortBy: 'meta_title', sortDirection: 'asc'}},
-      {args: {testIdentifier: 'sortByTitleDesc', sortBy: 'meta_title', sortDirection: 'desc'}},
-      {args: {testIdentifier: 'sortByStatusAsc', sortBy: 'active', sortDirection: 'asc'}},
-      {args: {testIdentifier: 'sortByStatusDesc', sortBy: 'active', sortDirection: 'desc'}},
-      {
-        args:
-          {
-            testIdentifier: 'sortByPositionAsc', sortBy: 'position', sortDirection: 'asc', isFloat: true,
-          },
-      },
-    ];
-
-    sortTests.forEach((test) => {
-      it(`should sort by '${test.args.sortBy}' '${test.args.sortDirection}' and check result`, async function () {
-        await testContext.addContextItem(this, 'testIdentifier', test.args.testIdentifier, baseContext);
-
-        const nonSortedTable = await pagesPage.getAllRowsColumnContentTableCmsPage(page, test.args.sortBy);
-        await pagesPage.sortTableCmsPage(page, test.args.sortBy, test.args.sortDirection);
-
-        const sortedTable = await pagesPage.getAllRowsColumnContentTableCmsPage(page, test.args.sortBy);
-
-        if (test.args.isFloat) {
-          const nonSortedTableFloat: number[] = nonSortedTable.map((text: string): number => parseFloat(text));
-          const sortedTableFloat: number[] = sortedTable.map((text: string): number => parseFloat(text));
-
-          const expectedResult: number[] = await basicHelper.sortArrayNumber(nonSortedTableFloat);
-
-          if (test.args.sortDirection === 'asc') {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult);
-          } else {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
-          }
-        } else {
-          const expectedResult = await basicHelper.sortArray(nonSortedTable);
-
-          if (test.args.sortDirection === 'asc') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
-          } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
-          }
-        }
-      });
-    });
-  });
-
-  // 4 : Delete the 11 pages with bulk actions
-  describe('Delete pages with Bulk Actions', async () => {
+  // POST-TEST : Delete the 11 pages with bulk actions
+  describe('POST-TEST: Delete pages with Bulk Actions', async () => {
     it('should filter list by title', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'filterForBulkDelete', baseContext);
 
diff --git a/tests/UI/campaigns/functional/BO/08_design/04_pages/pages/04_sortPages.ts b/tests/UI/campaigns/functional/BO/08_design/04_pages/pages/04_sortPages.ts
new file mode 100644
index 0000000000000..c1b1985d792f9
--- /dev/null
+++ b/tests/UI/campaigns/functional/BO/08_design/04_pages/pages/04_sortPages.ts
@@ -0,0 +1,120 @@
+// Import utils
+import basicHelper from '@utils/basicHelper';
+import helper from '@utils/helpers';
+import testContext from '@utils/testContext';
+
+// Import commonTests
+import loginCommon from '@commonTests/BO/loginBO';
+
+// Import pages
+import dashboardPage from '@pages/BO/dashboard';
+import pagesPage from '@pages/BO/design/pages';
+
+import {expect} from 'chai';
+import type {BrowserContext, Page} from 'playwright';
+
+const baseContext: string = 'functional_BO_design_pages_pages_sortPages';
+
+/*
+Sort pages table by id, url, title, position
+ */
+describe('BO - design - Pages : Sort Pages table', async () => {
+  let browserContext: BrowserContext;
+  let page: Page;
+
+  // before and after functions
+  before(async function () {
+    browserContext = await helper.createBrowserContext(this.browser);
+    page = await helper.newTab(browserContext);
+  });
+
+  after(async () => {
+    await helper.closeBrowserContext(browserContext);
+  });
+
+  it('should login in BO', async function () {
+    await loginCommon.loginBO(this, page);
+  });
+
+  it('should go to \'Design > Pages\' page', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'goToCmsPagesPage', baseContext);
+
+    await dashboardPage.goToSubMenu(
+      page,
+      dashboardPage.designParentLink,
+      dashboardPage.pagesLink,
+    );
+    await pagesPage.closeSfToolBar(page);
+
+    const pageTitle = await pagesPage.getPageTitle(page);
+    await expect(pageTitle).to.contains(pagesPage.pageTitle);
+  });
+
+  // Sort pages table
+  describe('Sort pages table', async () => {
+    const sortTests = [
+      {
+        args:
+          {
+            testIdentifier: 'sortByPositionDesc', sortBy: 'position', sortDirection: 'desc', isFloat: true,
+          },
+      },
+      {
+        args:
+          {
+            testIdentifier: 'sortByIdAsc', sortBy: 'id_cms', sortDirection: 'asc', isFloat: true,
+          },
+      },
+      {
+        args:
+          {
+            testIdentifier: 'sortByIdDesc', sortBy: 'id_cms', sortDirection: 'desc', isFloat: true,
+          },
+      },
+      {args: {testIdentifier: 'sortByUrlAsc', sortBy: 'link_rewrite', sortDirection: 'asc'}},
+      {args: {testIdentifier: 'sortByUrlDesc', sortBy: 'link_rewrite', sortDirection: 'desc'}},
+      {args: {testIdentifier: 'sortByTitleAsc', sortBy: 'meta_title', sortDirection: 'asc'}},
+      {args: {testIdentifier: 'sortByTitleDesc', sortBy: 'meta_title', sortDirection: 'desc'}},
+      {args: {testIdentifier: 'sortByStatusAsc', sortBy: 'active', sortDirection: 'asc'}},
+      {args: {testIdentifier: 'sortByStatusDesc', sortBy: 'active', sortDirection: 'desc'}},
+      {
+        args:
+          {
+            testIdentifier: 'sortByPositionAsc', sortBy: 'position', sortDirection: 'asc', isFloat: true,
+          },
+      },
+    ];
+
+    sortTests.forEach((test) => {
+      it(`should sort by '${test.args.sortBy}' '${test.args.sortDirection}' and check result`, async function () {
+        await testContext.addContextItem(this, 'testIdentifier', test.args.testIdentifier, baseContext);
+
+        const nonSortedTable = await pagesPage.getAllRowsColumnContentTableCmsPage(page, test.args.sortBy);
+        await pagesPage.sortTableCmsPage(page, test.args.sortBy, test.args.sortDirection);
+
+        const sortedTable = await pagesPage.getAllRowsColumnContentTableCmsPage(page, test.args.sortBy);
+
+        if (test.args.isFloat) {
+          const nonSortedTableFloat: number[] = nonSortedTable.map((text: string): number => parseFloat(text));
+          const sortedTableFloat: number[] = sortedTable.map((text: string): number => parseFloat(text));
+
+          const expectedResult: number[] = await basicHelper.sortArrayNumber(nonSortedTableFloat);
+
+          if (test.args.sortDirection === 'asc') {
+            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+          } else {
+            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+          }
+        } else {
+          const expectedResult = await basicHelper.sortArray(nonSortedTable);
+
+          if (test.args.sortDirection === 'asc') {
+            await expect(sortedTable).to.deep.equal(expectedResult);
+          } else {
+            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+          }
+        }
+      });
+    });
+  });
+});

From 03b532b23e64ad69e6d3e2ce026fd50c6ed85982 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Thu, 13 Jul 2023 11:24:15 +0200
Subject: [PATCH 0537/1030] Fix base context

---
 .../pages/{03_paginationOfPages.ts => 03_pagination.ts}        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename tests/UI/campaigns/functional/BO/08_design/04_pages/pages/{03_paginationOfPages.ts => 03_pagination.ts} (98%)

diff --git a/tests/UI/campaigns/functional/BO/08_design/04_pages/pages/03_paginationOfPages.ts b/tests/UI/campaigns/functional/BO/08_design/04_pages/pages/03_pagination.ts
similarity index 98%
rename from tests/UI/campaigns/functional/BO/08_design/04_pages/pages/03_paginationOfPages.ts
rename to tests/UI/campaigns/functional/BO/08_design/04_pages/pages/03_pagination.ts
index f2497758e17cd..c36163b45a229 100644
--- a/tests/UI/campaigns/functional/BO/08_design/04_pages/pages/03_paginationOfPages.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/04_pages/pages/03_pagination.ts
@@ -1,5 +1,4 @@
 // Import utils
-import basicHelper from '@utils/basicHelper';
 import helper from '@utils/helpers';
 import testContext from '@utils/testContext';
 
@@ -17,7 +16,7 @@ import CMSPageData from '@data/faker/CMSpage';
 import {expect} from 'chai';
 import type {BrowserContext, Page} from 'playwright';
 
-const baseContext: string = 'functional_BO_design_pages_pages_paginationOfPages';
+const baseContext: string = 'functional_BO_design_pages_pages_pagination';
 
 /*
 Create 11 pages

From 1ab3c78950685d32a8aee48c75a6529d85525038 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Thu, 13 Jul 2023 11:29:54 +0200
Subject: [PATCH 0538/1030] Functional Tests : BO - Advanced Parameter -
 Authorization Server - CRUD

---
 .../12_authorizationServer/01_CRUD.ts         | 125 +++++++++++++++
 .../BO/advancedParameters/newFeatures.ts      |   3 +
 tests/UI/data/faker/authorizedApplication.ts  |  30 ++++
 .../UI/data/types/authorizedApplication.d.ts  |   7 +
 tests/UI/package.json                         |   1 +
 tests/UI/pages/BO/BObasePage.ts               |   4 +
 .../authorizationServer/add.ts                |  64 ++++++++
 .../authorizationServer/index.ts              | 146 ++++++++++++++++++
 .../advancedParameters/featureFlag/index.ts   |   7 +-
 9 files changed, 386 insertions(+), 1 deletion(-)
 create mode 100644 tests/UI/campaigns/functional/BO/14_advancedParameters/12_authorizationServer/01_CRUD.ts
 create mode 100644 tests/UI/data/faker/authorizedApplication.ts
 create mode 100644 tests/UI/data/types/authorizedApplication.d.ts
 create mode 100644 tests/UI/pages/BO/advancedParameters/authorizationServer/add.ts
 create mode 100644 tests/UI/pages/BO/advancedParameters/authorizationServer/index.ts

diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/12_authorizationServer/01_CRUD.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/12_authorizationServer/01_CRUD.ts
new file mode 100644
index 0000000000000..91bed8b2decf1
--- /dev/null
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/12_authorizationServer/01_CRUD.ts
@@ -0,0 +1,125 @@
+// Import utils
+import helper from '@utils/helpers';
+import testContext from '@utils/testContext';
+
+// Import commonTests
+import loginCommon from '@commonTests/BO/loginBO';
+import {setFeatureFlag} from '@commonTests/BO/advancedParameters/newFeatures';
+
+// Import pages
+import authorizationServerPage from '@pages/BO/advancedParameters/authorizationServer';
+import addNewAuthorizedAppPage from '@pages/BO/advancedParameters/authorizationServer/add';
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
+import dashboardPage from '@pages/BO/dashboard';
+
+// Import data
+import AuthorizedApplicationData from '@data/faker/authorizedApplication';
+
+import {expect} from 'chai';
+import type {BrowserContext, Page} from 'playwright';
+
+const baseContext: string = 'functional_BO_advancedParameters_authorizationServer_CRUD';
+
+describe('BO - Advanced Parameter - Authorization Server : CRUD', async () => {
+  let browserContext: BrowserContext;
+  let page: Page;
+
+  const createApplication: AuthorizedApplicationData = new AuthorizedApplicationData({
+    appName: 'Application XYZ',
+    description: 'Description ABC',
+  });
+  const editApplication: AuthorizedApplicationData = new AuthorizedApplicationData({
+    appName: 'Application UVW',
+    description: 'Description DEF',
+  });
+
+  // Pre-condition: Enable experimental feature : Authorization server
+  setFeatureFlag(featureFlagPage.featureFlagAuthorizationServer, true, `${baseContext}_enableAuthorizationServer`);
+
+  // before and after functions
+  before(async function () {
+    browserContext = await helper.createBrowserContext(this.browser);
+    page = await helper.newTab(browserContext);
+  });
+
+  after(async () => {
+    await helper.closeBrowserContext(browserContext);
+  });
+
+  describe('BO - Advanced Parameter - Authorization Server : CRUD', async () => {
+    it('should login in BO', async function () {
+      await loginCommon.loginBO(this, page);
+    });
+
+    it('should go to \'Advanced Parameters > Authorization Server\' page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToAuthorizationServerPage', baseContext);
+
+      await dashboardPage.goToSubMenu(
+        page,
+        dashboardPage.advancedParametersLink,
+        dashboardPage.authorizationServerLink,
+      );
+
+      const pageTitle = await authorizationServerPage.getPageTitle(page);
+      await expect(pageTitle).to.eq(authorizationServerPage.pageTitle);
+    });
+
+    it('should check that no records found', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'checkThatNoRecordFound', baseContext);
+
+      const noRecordsFoundText = await authorizationServerPage.getTextForEmptyTable(page);
+      await expect(noRecordsFoundText).to.contains('warning No records found');
+    });
+
+    it('should go to add New Authorized App page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToNewAuthorizedAppPage', baseContext);
+
+      await authorizationServerPage.goToNewAuthorizedAppPage(page);
+
+      const pageTitle = await addNewAuthorizedAppPage.getPageTitle(page);
+      await expect(pageTitle).to.eq(addNewAuthorizedAppPage.pageTitleCreate);
+    });
+
+    it('should create authorized app', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'createAuthorizedApp', baseContext);
+
+      const textResult = await addNewAuthorizedAppPage.addAuthorizedApplication(page, createApplication);
+      await expect(textResult).to.equal(addNewAuthorizedAppPage.successfulCreationMessage);
+
+      const numElements = await authorizationServerPage.getNumberOfElementInGrid(page);
+      await expect(numElements).to.equal(1);
+    });
+
+    it('should go to edit Authorized App page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToEditAuthorizedAppPage', baseContext);
+
+      await authorizationServerPage.goToEditAuthorizedAppPage(page, 1);
+
+      const pageTitle = await addNewAuthorizedAppPage.getPageTitle(page);
+      await expect(pageTitle).to.eq(addNewAuthorizedAppPage.pageTitleEdit(createApplication.appName));
+    });
+
+    it('should edit authorized app', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'editAuthorizedApp', baseContext);
+
+      const textResult = await addNewAuthorizedAppPage.addAuthorizedApplication(page, editApplication);
+      await expect(textResult).to.equal(addNewAuthorizedAppPage.successfulUpdateMessage);
+
+      const numElements = await authorizationServerPage.getNumberOfElementInGrid(page);
+      await expect(numElements).to.equal(1);
+    });
+
+    it('should delete authorized app', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'deleteAuthorizedApp', baseContext);
+
+      const textResult = await authorizationServerPage.deleteAuthorizationApplication(page, 1);
+      await expect(textResult).to.equal(addNewAuthorizedAppPage.successfulDeleteMessage);
+
+      const numElements = await authorizationServerPage.getNumberOfElementInGrid(page);
+      await expect(numElements).to.equal(0);
+    });
+  });
+
+  // Post-condition: Disable experimental feature : Authorization server
+  setFeatureFlag(featureFlagPage.featureFlagAuthorizationServer, false, `${baseContext}_disableAuthorizationServer`);
+});
diff --git a/tests/UI/commonTests/BO/advancedParameters/newFeatures.ts b/tests/UI/commonTests/BO/advancedParameters/newFeatures.ts
index 08d94e22ddcb3..d238caf71a0cc 100644
--- a/tests/UI/commonTests/BO/advancedParameters/newFeatures.ts
+++ b/tests/UI/commonTests/BO/advancedParameters/newFeatures.ts
@@ -37,6 +37,9 @@ function setFeatureFlag(featureFlag: string, expectedStatus: boolean, baseContex
   let title: string;
 
   switch (featureFlag) {
+    case featureFlagPage.featureFlagAuthorizationServer:
+      title = 'Authorization server';
+      break;
     case featureFlagPage.featureFlagMultipleImageFormats:
       title = 'Multiple image formats';
       break;
diff --git a/tests/UI/data/faker/authorizedApplication.ts b/tests/UI/data/faker/authorizedApplication.ts
new file mode 100644
index 0000000000000..d84c5a31f8a5a
--- /dev/null
+++ b/tests/UI/data/faker/authorizedApplication.ts
@@ -0,0 +1,30 @@
+import type AuthorizedApplicationCreator from '@data/types/authorizedApplication';
+
+import {faker} from '@faker-js/faker';
+
+/**
+ * Create new authorized Application
+ * @class
+ */
+export default class AuthorizedApplicationData {
+  public readonly id: number;
+
+  public readonly appName: string;
+
+  public readonly description: string;
+
+  /**
+   * Constructor for class AuthorizedApplicationData
+   * @param authorizedApplicationToCreate {AuthorizedApplicationCreator} Could be used to force the value of some members
+   */
+  constructor(authorizedApplicationToCreate: AuthorizedApplicationCreator = {}) {
+    /** @type {string} Id of the application */
+    this.id = authorizedApplicationToCreate.id || 0;
+
+    /** @type {string} Address Name */
+    this.appName = authorizedApplicationToCreate.appName || faker.word.noun();
+
+    /** @type {string} Customer firstname */
+    this.description = authorizedApplicationToCreate.description || faker.lorem.sentence();
+  }
+}
diff --git a/tests/UI/data/types/authorizedApplication.d.ts b/tests/UI/data/types/authorizedApplication.d.ts
new file mode 100644
index 0000000000000..191e7e04bd077
--- /dev/null
+++ b/tests/UI/data/types/authorizedApplication.d.ts
@@ -0,0 +1,7 @@
+type AuthorizedApplicationCreator = {
+  id?: number
+  appName?: string
+  description?: string
+};
+
+export default AuthorizedApplicationCreator;
diff --git a/tests/UI/package.json b/tests/UI/package.json
index 3ac2b8ba1a7bc..7c7aa593b1b2c 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -64,6 +64,7 @@
     "test:functional:BO:advanced-parameters": "TEST_PATH='functional/BO/14_advancedParameters/**/*' npm run test:specific",
     "test:functional:BO:advanced-parameters:01-06": "TEST_PATH='functional/BO/14_advancedParameters/0[1-6]*/**/*' npm run test:specific",
     "test:functional:BO:advanced-parameters:07-10": "TEST_PATH='functional/BO/14_advancedParameters/{0[7-9],10}*/**/*' npm run test:specific",
+    "test:functional:BO:advanced-parameters:11-12": "TEST_PATH='functional/BO/14_advancedParameters/{11,12}*/**/*' npm run test:specific",
     "test:functional:BO:header": "TEST_PATH='functional/BO/15_header/**/*' npm run test:specific",
     "test:functional:productV2": "TEST_PATH='productV2/functional/**/*' npm run test:specific",
     "// Functional FO": "Scripts to run functional FO tests",
diff --git a/tests/UI/pages/BO/BObasePage.ts b/tests/UI/pages/BO/BObasePage.ts
index 3b8cfc27efa17..8f6136d62acef 100644
--- a/tests/UI/pages/BO/BObasePage.ts
+++ b/tests/UI/pages/BO/BObasePage.ts
@@ -199,6 +199,8 @@ export default class BOBasePage extends CommonPage {
 
   public readonly logsLink: string;
 
+  public readonly authorizationServerLink: string;
+
   public readonly featureFlagLink: string;
 
   private readonly securityLink: string;
@@ -438,6 +440,8 @@ export default class BOBasePage extends CommonPage {
     this.webserviceLink = '#subtab-AdminWebservice';
     // Logs
     this.logsLink = '#subtab-AdminLogs';
+    // Authorization Server
+    this.authorizationServerLink = '#subtab-AdminAuthorizationServer';
     // New & Experimental Features
     this.featureFlagLink = '#subtab-AdminFeatureFlag';
     // Security
diff --git a/tests/UI/pages/BO/advancedParameters/authorizationServer/add.ts b/tests/UI/pages/BO/advancedParameters/authorizationServer/add.ts
new file mode 100644
index 0000000000000..450662db1c31b
--- /dev/null
+++ b/tests/UI/pages/BO/advancedParameters/authorizationServer/add.ts
@@ -0,0 +1,64 @@
+// Import pages
+import BOBasePage from '@pages/BO/BObasePage';
+
+// Import data
+import AuthorizedApplicationData from '@data/faker/authorizedApplication';
+
+import type {Page} from 'playwright';
+
+/**
+ * New authorized application page, contains functions that can be used on the page
+ * @class
+ * @extends BOBasePage
+ */
+class AddNewAuthorizedApp extends BOBasePage {
+  public readonly pageTitleCreate: string;
+
+  public readonly pageTitleEdit: (appName: string) => string;
+
+  private readonly formApplication: string;
+
+  private readonly appNameInput: string;
+
+  private readonly descriptionInput: string;
+
+  private readonly saveButton: string;
+
+  /**
+   * @constructs
+   * Setting up texts and selectors to use on Performance page
+   */
+  constructor() {
+    super();
+
+    this.pageTitleCreate = `New authorized application • ${global.INSTALL.SHOP_NAME}`;
+    this.pageTitleEdit = (appName: string) => `Editing application ${appName} • ${global.INSTALL.SHOP_NAME}`;
+
+    // Selectors
+    this.formApplication = 'form[name="application"]';
+    this.appNameInput = `${this.formApplication} #application_name`;
+    this.descriptionInput = `${this.formApplication} #application_description`;
+    this.saveButton = `${this.formApplication} .card-footer button`;
+  }
+
+  /*
+  Methods
+   */
+
+  /**
+   * Add authorized Application
+   * @param page {Page} Browser tab
+   * @param authorizedApplicationData {AuthorizedApplicationData}}
+   * @return {Promise<string>}
+   */
+  async addAuthorizedApplication(page: Page, authorizedApplicationData: AuthorizedApplicationData): Promise<string> {
+    await this.setValue(page, this.appNameInput, authorizedApplicationData.appName);
+    await this.setValue(page, this.descriptionInput, authorizedApplicationData.description);
+    // Save
+    await this.clickAndWaitForURL(page, this.saveButton);
+
+    return this.getAlertSuccessBlockParagraphContent(page);
+  }
+}
+
+export default new AddNewAuthorizedApp();
diff --git a/tests/UI/pages/BO/advancedParameters/authorizationServer/index.ts b/tests/UI/pages/BO/advancedParameters/authorizationServer/index.ts
new file mode 100644
index 0000000000000..11c8291c4ea7c
--- /dev/null
+++ b/tests/UI/pages/BO/advancedParameters/authorizationServer/index.ts
@@ -0,0 +1,146 @@
+import BOBasePage from '@pages/BO/BObasePage';
+
+import type {Page} from 'playwright';
+
+/**
+ * AuthorizationServer page, contains functions that can be used on the page
+ * @class
+ * @extends BOBasePage
+ */
+class AuthorizationServer extends BOBasePage {
+  public readonly pageTitle: string;
+
+  private readonly newAuthorizedAppLink: string;
+
+  private readonly gridPanel: string;
+
+  private readonly gridHeader: string;
+
+  private readonly gridHeaderTitle: string;
+
+  private readonly gridTable: string;
+
+  private readonly gridTableBody: string;
+
+  private readonly gridTableEmptyRow: string;
+
+  private readonly gridTableRow: (row: number) => string;
+
+  private readonly gridTableColumn: (row: number, column: string) => string;
+
+  private readonly gridTableColumnAction: (row: number) => string;
+
+  private readonly gridTableToggleDropDown: (row: number) => string;
+
+  private readonly gridTableDeleteLink: (row: number) => string;
+
+  private readonly gridTableEditLink: (row: number) => string;
+
+  private readonly confirmDeleteModal: string;
+
+  private readonly confirmDeleteButton: string;
+
+  /**
+   * @constructs
+   * Setting up texts and selectors to use on AuthorizationServer page
+   */
+  constructor() {
+    super();
+
+    this.pageTitle = `Authorization Server Management • ${global.INSTALL.SHOP_NAME}`;
+
+    // Selectors
+
+    // Header
+    this.newAuthorizedAppLink = '#page-header-desc-configuration-addApplication';
+
+    // Selectors grid panel
+    this.gridPanel = '#authorized_application_grid_panel';
+    this.gridHeader = `${this.gridPanel} .card-header`;
+    this.gridHeaderTitle = `${this.gridHeader} h3`;
+
+    // Table rows and columns
+    this.gridTable = '#authorized_application_grid_table';
+    this.gridTableBody = `${this.gridTable} tbody`;
+    this.gridTableEmptyRow = `${this.gridTableBody} tr.empty_row`;
+    this.gridTableRow = (row: number) => `${this.gridTable} tbody tr:nth-child(${row})`;
+    this.gridTableColumn = (row: number, column: string) => `${this.gridTableRow(row)} td.column-${column}`;
+    this.gridTableColumnAction = (row: number) => this.gridTableColumn(row, 'actions');
+    this.gridTableToggleDropDown = (row: number) => `${this.gridTableColumnAction(row)
+    } a[data-toggle='dropdown']`;
+    this.gridTableDeleteLink = (row: number) => `${this.gridTableColumnAction(row)} a.grid-delete-row-link`;
+    this.gridTableEditLink = (row: number) => `${this.gridTableColumnAction(row)} a.grid-edit-row-link`;
+
+    // Delete modal
+    this.confirmDeleteModal = '#authorized_application-grid-confirm-modal';
+    this.confirmDeleteButton = `${this.confirmDeleteModal} button.btn-confirm-submit`;
+  }
+
+  /*
+  Methods
+   */
+  /* Header methods */
+  /**
+   * Go to new Authorized App page
+   * @param page {Page} Browser tab
+   * @return {Promise<void>}
+   */
+  async goToNewAuthorizedAppPage(page: Page): Promise<void> {
+    await this.clickAndWaitForURL(page, this.newAuthorizedAppLink);
+  }
+
+  /**
+   * Go to edit Authorized App page
+   * @param page {Page} Browser tab
+   * @param row {number} Row on table
+   * @returns {Promise<void>}
+   */
+  async goToEditAuthorizedAppPage(page: Page, row: number): Promise<void> {
+    await this.clickAndWaitForURL(page, this.gridTableEditLink(row));
+  }
+
+  /* Grid methods */
+  /**
+   * Get text for empty table
+   * @param page {Page} Browser tab
+   * @returns {Promise<string>}
+   */
+  async getTextForEmptyTable(page: Page): Promise<string> {
+    return this.getTextContent(page, this.gridTableEmptyRow);
+  }
+
+  /**
+   * Get number of elements in grid
+   * @param page {Page} Browser tab
+   * @return {Promise<number>}
+   */
+  async getNumberOfElementInGrid(page: Page): Promise<number> {
+    return this.getNumberFromText(page, this.gridHeaderTitle);
+  }
+
+  /**
+   * Delete webservice key
+   * @param page {Page} Browser tab
+   * @param row {number} Row on table
+   * @returns {Promise<string>}
+   */
+  async deleteAuthorizationApplication(page: Page, row: number): Promise<string> {
+    // Click on dropDown
+    await Promise.all([
+      page.click(this.gridTableToggleDropDown(row)),
+      this.waitForVisibleSelector(page, `${this.gridTableToggleDropDown(row)}[aria-expanded='true']`),
+    ]);
+    // Click on delete
+    await Promise.all([
+      page.click(this.gridTableDeleteLink(row)),
+      this.waitForVisibleSelector(page, `${this.confirmDeleteModal}.show`),
+    ]);
+
+    await page.click(this.confirmDeleteButton);
+    await this.elementNotVisible(page, this.confirmDeleteModal, 2000);
+
+    return this.getAlertSuccessBlockParagraphContent(page);
+  }
+}
+
+export default new AuthorizationServer();
diff --git a/tests/UI/pages/BO/advancedParameters/featureFlag/index.ts b/tests/UI/pages/BO/advancedParameters/featureFlag/index.ts
index ae9ef67f49cd6..f2527d8d36bb9 100644
--- a/tests/UI/pages/BO/advancedParameters/featureFlag/index.ts
+++ b/tests/UI/pages/BO/advancedParameters/featureFlag/index.ts
@@ -13,6 +13,8 @@ class FeatureFlag extends BOBasePage {
 
   public readonly featureFlagMultipleImageFormats: string;
 
+  public readonly featureFlagAuthorizationServer: string;
+
   private readonly featureFlagSwitchButton: (status: string, feature: string, toggle: number) => string;
 
   private readonly submitButton: (status: string) => string;
@@ -36,7 +38,7 @@ class FeatureFlag extends BOBasePage {
     // Feature Flag
     this.featureFlagProductPageV2 = 'product_page_v2';
     this.featureFlagMultipleImageFormats = 'multiple_image_format';
-
+    this.featureFlagAuthorizationServer = 'authorization_server';
     // Selectors
     this.featureFlagSwitchButton = (status: string, feature: string, toggle: number) => `#feature_flag_${
       status}_feature_flags_${feature}_enabled_${toggle}`;
@@ -63,6 +65,9 @@ class FeatureFlag extends BOBasePage {
       case this.featureFlagProductPageV2:
         isStable = true;
         break;
+      case this.featureFlagAuthorizationServer:
+        isStable = false;
+        break;
       default:
         throw new Error(`The feature flag ${featureFlag} is not defined`);
     }

From f7870f76eb19bae25b5445c06659a0bd02043e5d Mon Sep 17 00:00:00 2001
From: lartist <salim-benouamer.ext@prestashop.com>
Date: Mon, 10 Jul 2023 11:56:50 +0200
Subject: [PATCH 0539/1030] Replace search form smarty template by twig
 component

---
 .../themes/new-theme/template/layout.tpl      |  7 +-
 phpstan-tmp-legacy-layout-baseline.neon       | 10 +++
 .../Component/Layout/search_form.html.twig    | 66 +++++++++++++++++++
 .../views/Admin/Layout/search_form.html.twig  | 28 ++++++++
 .../Twig/Component/SearchForm.php             | 39 +++++++++++
 5 files changed, 149 insertions(+), 1 deletion(-)
 create mode 100644 src/PrestaShopBundle/Resources/views/Admin/Component/Layout/search_form.html.twig
 create mode 100644 src/PrestaShopBundle/Resources/views/Admin/Layout/search_form.html.twig
 create mode 100644 src/PrestaShopBundle/Twig/Component/SearchForm.php

diff --git a/admin-dev/themes/new-theme/template/layout.tpl b/admin-dev/themes/new-theme/template/layout.tpl
index 3e8d74e24450d..e5e4fb11aff56 100644
--- a/admin-dev/themes/new-theme/template/layout.tpl
+++ b/admin-dev/themes/new-theme/template/layout.tpl
@@ -34,7 +34,12 @@
       <div class="component component-search" id="header-search-container">
         <div class="component-search-body">
           <div class="component-search-top">
-            {include file="components/layout/search_form.tpl"}
+              {render_template
+                smarty_template="components/layout/search_form.tpl"
+                twig_template="@PrestaShop/Admin/Layout/search_form.html.twig"
+                bo_query=$bo_query
+                link=$link
+              }
             <button class="component-search-cancel d-none">{l|escape s='Cancel' d='Admin.Actions'}</button>
           </div>
             {render_template
diff --git a/phpstan-tmp-legacy-layout-baseline.neon b/phpstan-tmp-legacy-layout-baseline.neon
index fb08e46111a08..d9a9541161e05 100644
--- a/phpstan-tmp-legacy-layout-baseline.neon
+++ b/phpstan-tmp-legacy-layout-baseline.neon
@@ -39,3 +39,13 @@ parameters:
 			message: "#^Namespace Link is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
 			count: 1
 			path: src/PrestaShopBundle/Twig/Component/QuickAccess.php
+
+		-
+			message: "#^Class Link is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+			count: 1
+			path: src/PrestaShopBundle/Twig/Component/SearchForm.php
+
+		-
+			message: "#^Namespace Link is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+			count: 1
+			path: src/PrestaShopBundle/Twig/Component/SearchForm.php
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/search_form.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/search_form.html.twig
new file mode 100644
index 0000000000000..2af5ead286a98
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/search_form.html.twig
@@ -0,0 +1,66 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+<form id="header_search"
+      class="bo_search_form dropdown-form js-dropdown-form collapsed"
+      method="post"
+      action="{{ link.getAdminLink('AdminSearch') }}"
+      role="search">
+  <input type="hidden" name="bo_search_type" id="bo_search_type" class="js-search-type" />
+  {% if show_clear_btn is defined and show_clear_btn %}
+    <a href="#" class="clear_search hide"><i class="icon-remove"></i></a>
+  {% endif %}
+  <div class="input-group">
+    <input type="text" class="form-control js-form-search" id="bo_query" name="bo_query" value="{{ boQuery }}" placeholder="{{ 'Search (e.g.: product reference, customer name…)'|trans({}, 'Admin.Navigation.Header') }}" aria-label="{{ 'Searchbar'|trans({}, 'Admin.Navigation.Header') }}">
+    <div class="input-group-append">
+      <button type="button" class="btn btn-outline-secondary dropdown-toggle js-dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+        {{ 'Everywhere'|trans({}, 'Admin.Navigation.Header') }}
+      </button>
+      <div class="dropdown-menu js-items-list">
+        <a class="dropdown-item" data-item="{{ 'Everywhere'|trans({}, 'Admin.Navigation.Header') }}" href="#" data-value="0" data-placeholder="{{ 'What are you looking for?'|trans({}, 'Admin.Navigation.Header') }}" data-icon="icon-search"><i class="material-icons">search</i> {{ 'Everywhere'|trans({}, 'Admin.Navigation.Header') }}</a>
+        <div class="dropdown-divider"></div>
+        <a class="dropdown-item" data-item="{{ 'Catalog'|trans({}, 'Admin.Global') }}" href="#" data-value="1" data-placeholder="{{ 'Product name, reference, etc.'|trans({}, 'Admin.Navigation.Header') }}" data-icon="icon-book"><i class="material-icons">store_mall_directory</i> {{ 'Catalog'|trans({}, 'Admin.Global') }}</a>
+        <a class="dropdown-item" data-item="{{ 'Customers'|trans({}, 'Admin.Navigation.Header') }} {{ 'by name'|trans }}" href="#" data-value="2" data-placeholder="{{ 'Name'|trans({}, 'Admin.Navigation.Header') }}" data-icon="icon-group"><i class="material-icons">group</i> {{ 'Customers'|trans({}, 'Admin.Navigation.Header') }} {{ 'by name'|trans({}, 'Admin.Navigation.Header') }} </a>
+        <a class="dropdown-item" data-item="{{ 'Customers'|trans({}, 'Admin.Navigation.Header') }} {{ 'by ip address'|trans }}" href="#" data-value="6" data-placeholder="{{ '123.45.67.89'|trans({}, 'Admin.Navigation.Header') }}" data-icon="icon-desktop"><i class="material-icons">desktop_mac</i>{{ 'Customers'|trans({}, 'Admin.Navigation.Header') }} {{ 'by IP address'|trans({}, 'Admin.Navigation.Header') }}</a>
+        <a class="dropdown-item" data-item="{{ 'Orders'|trans({}, 'Admin.Global') }}" href="#" data-value="3" data-placeholder="{{ 'Order ID'|trans({}, 'Admin.Navigation.Header') }}" data-icon="icon-credit-card"><i class="material-icons">shopping_basket</i> {{ 'Orders'|trans({}, 'Admin.Global') }}</a>
+        <a class="dropdown-item" data-item="{{ 'Invoices'|trans({}, 'Admin.Global') }}" href="#" data-value="4" data-placeholder="{{ 'Invoice number'|trans({}, 'Admin.Navigation.Header') }}" data-icon="icon-book"><i class="material-icons">book</i> {{ 'Invoices'|trans({}, 'Admin.Global') }}</a>
+        <a class="dropdown-item" data-item="{{ 'Carts'|trans({}, 'Admin.Global') }}" href="#" data-value="5" data-placeholder="{{ 'Cart ID'|trans({}, 'Admin.Navigation.Header') }}" data-icon="icon-shopping-cart"><i class="material-icons">shopping_cart</i> {{ 'Carts'|trans({}, 'Admin.Global') }}</a>
+        <a class="dropdown-item" data-item="{{ 'Modules'|trans({}, 'Admin.Global') }}" href="#" data-value="7" data-placeholder="{{ 'Module name'|trans({}, 'Admin.Navigation.Header') }}" data-icon="icon-puzzle-piece"><i class="material-icons">extension</i> {{ 'Modules'|trans({}, 'Admin.Global') }}</a>
+      </div>
+      <button class="btn btn-primary" type="submit"><span class="d-none">{{ 'SEARCH'|trans({}, 'Admin.Navigation.Header') }}</span><i class="material-icons">search</i></button>
+    </div>
+  </div>
+</form>
+
+<script type="text/javascript">
+  $(function(){
+    {% if search_type is defined and search_type %}
+      $('.search-option a[data-value=' + {{ search_type ? 1 : 0 }} + ']').click();
+    {% endif %}
+      $('#bo_query').one('click', function() {
+        $(this).closest('form').removeClass('collapsed');
+      });
+    });
+</script>
+
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/search_form.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/search_form.html.twig
new file mode 100644
index 0000000000000..5a078da4243ba
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/search_form.html.twig
@@ -0,0 +1,28 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+{{ component('SearchForm', {
+  boQuery: bo_query,
+  link: link,
+}) }}
diff --git a/src/PrestaShopBundle/Twig/Component/SearchForm.php b/src/PrestaShopBundle/Twig/Component/SearchForm.php
new file mode 100644
index 0000000000000..6194a535c2ae3
--- /dev/null
+++ b/src/PrestaShopBundle/Twig/Component/SearchForm.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\Twig\Component;
+
+use Link;
+use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
+
+#[AsTwigComponent(template: '@PrestaShop/Admin/Component/Layout/search_form.html.twig')]
+class SearchForm
+{
+    public string $boQuery;
+    public Link $link;
+}

From 9cfd110522f205831a4f43cb140d5ccc905365be Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Jul 2023 13:41:20 +0000
Subject: [PATCH 0540/1030] Bump @typescript-eslint/eslint-plugin from 5.60.1
 to 5.62.0 in /tests/UI

Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 5.60.1 to 5.62.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.62.0/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 176 +++++++++++++++++++++++++++++++++----
 tests/UI/package.json      |   2 +-
 2 files changed, 159 insertions(+), 19 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index ab31fd9d6a731..4c028d2cb2fa7 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -402,23 +402,80 @@
       "dev": true
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "5.60.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.60.1.tgz",
-      "integrity": "sha512-KSWsVvsJsLJv3c4e73y/Bzt7OpqMCADUO846bHcuWYSYM19bldbAeDv7dYyV0jwkbMfJ2XdlzwjhXtuD7OY6bw==",
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz",
+      "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==",
       "dev": true,
       "requires": {
         "@eslint-community/regexpp": "^4.4.0",
-        "@typescript-eslint/scope-manager": "5.60.1",
-        "@typescript-eslint/type-utils": "5.60.1",
-        "@typescript-eslint/utils": "5.60.1",
+        "@typescript-eslint/scope-manager": "5.62.0",
+        "@typescript-eslint/type-utils": "5.62.0",
+        "@typescript-eslint/utils": "5.62.0",
         "debug": "^4.3.4",
-        "grapheme-splitter": "^1.0.4",
+        "graphemer": "^1.4.0",
         "ignore": "^5.2.0",
         "natural-compare-lite": "^1.4.0",
         "semver": "^7.3.7",
         "tsutils": "^3.21.0"
       },
       "dependencies": {
+        "@typescript-eslint/scope-manager": {
+          "version": "5.62.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
+          "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
+          "dev": true,
+          "requires": {
+            "@typescript-eslint/types": "5.62.0",
+            "@typescript-eslint/visitor-keys": "5.62.0"
+          }
+        },
+        "@typescript-eslint/types": {
+          "version": "5.62.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
+          "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
+          "dev": true
+        },
+        "@typescript-eslint/typescript-estree": {
+          "version": "5.62.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
+          "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
+          "dev": true,
+          "requires": {
+            "@typescript-eslint/types": "5.62.0",
+            "@typescript-eslint/visitor-keys": "5.62.0",
+            "debug": "^4.3.4",
+            "globby": "^11.1.0",
+            "is-glob": "^4.0.3",
+            "semver": "^7.3.7",
+            "tsutils": "^3.21.0"
+          }
+        },
+        "@typescript-eslint/utils": {
+          "version": "5.62.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz",
+          "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==",
+          "dev": true,
+          "requires": {
+            "@eslint-community/eslint-utils": "^4.2.0",
+            "@types/json-schema": "^7.0.9",
+            "@types/semver": "^7.3.12",
+            "@typescript-eslint/scope-manager": "5.62.0",
+            "@typescript-eslint/types": "5.62.0",
+            "@typescript-eslint/typescript-estree": "5.62.0",
+            "eslint-scope": "^5.1.1",
+            "semver": "^7.3.7"
+          }
+        },
+        "@typescript-eslint/visitor-keys": {
+          "version": "5.62.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
+          "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
+          "dev": true,
+          "requires": {
+            "@typescript-eslint/types": "5.62.0",
+            "eslint-visitor-keys": "^3.3.0"
+          }
+        },
         "debug": {
           "version": "4.3.4",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@@ -427,6 +484,22 @@
           "requires": {
             "ms": "2.1.2"
           }
+        },
+        "eslint-scope": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+          "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+          "dev": true,
+          "requires": {
+            "esrecurse": "^4.3.0",
+            "estraverse": "^4.1.1"
+          }
+        },
+        "eslint-visitor-keys": {
+          "version": "3.4.1",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
+          "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
+          "dev": true
         }
       }
     },
@@ -511,17 +584,74 @@
       }
     },
     "@typescript-eslint/type-utils": {
-      "version": "5.60.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.60.1.tgz",
-      "integrity": "sha512-vN6UztYqIu05nu7JqwQGzQKUJctzs3/Hg7E2Yx8rz9J+4LgtIDFWjjl1gm3pycH0P3mHAcEUBd23LVgfrsTR8A==",
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz",
+      "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/typescript-estree": "5.60.1",
-        "@typescript-eslint/utils": "5.60.1",
+        "@typescript-eslint/typescript-estree": "5.62.0",
+        "@typescript-eslint/utils": "5.62.0",
         "debug": "^4.3.4",
         "tsutils": "^3.21.0"
       },
       "dependencies": {
+        "@typescript-eslint/scope-manager": {
+          "version": "5.62.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
+          "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
+          "dev": true,
+          "requires": {
+            "@typescript-eslint/types": "5.62.0",
+            "@typescript-eslint/visitor-keys": "5.62.0"
+          }
+        },
+        "@typescript-eslint/types": {
+          "version": "5.62.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
+          "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
+          "dev": true
+        },
+        "@typescript-eslint/typescript-estree": {
+          "version": "5.62.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
+          "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
+          "dev": true,
+          "requires": {
+            "@typescript-eslint/types": "5.62.0",
+            "@typescript-eslint/visitor-keys": "5.62.0",
+            "debug": "^4.3.4",
+            "globby": "^11.1.0",
+            "is-glob": "^4.0.3",
+            "semver": "^7.3.7",
+            "tsutils": "^3.21.0"
+          }
+        },
+        "@typescript-eslint/utils": {
+          "version": "5.62.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz",
+          "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==",
+          "dev": true,
+          "requires": {
+            "@eslint-community/eslint-utils": "^4.2.0",
+            "@types/json-schema": "^7.0.9",
+            "@types/semver": "^7.3.12",
+            "@typescript-eslint/scope-manager": "5.62.0",
+            "@typescript-eslint/types": "5.62.0",
+            "@typescript-eslint/typescript-estree": "5.62.0",
+            "eslint-scope": "^5.1.1",
+            "semver": "^7.3.7"
+          }
+        },
+        "@typescript-eslint/visitor-keys": {
+          "version": "5.62.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
+          "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
+          "dev": true,
+          "requires": {
+            "@typescript-eslint/types": "5.62.0",
+            "eslint-visitor-keys": "^3.3.0"
+          }
+        },
         "debug": {
           "version": "4.3.4",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@@ -530,6 +660,22 @@
           "requires": {
             "ms": "2.1.2"
           }
+        },
+        "eslint-scope": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+          "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+          "dev": true,
+          "requires": {
+            "esrecurse": "^4.3.0",
+            "estraverse": "^4.1.1"
+          }
+        },
+        "eslint-visitor-keys": {
+          "version": "3.4.1",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
+          "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
+          "dev": true
         }
       }
     },
@@ -3127,12 +3273,6 @@
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
       "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
     },
-    "grapheme-splitter": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
-      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
-      "dev": true
-    },
     "graphemer": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
diff --git a/tests/UI/package.json b/tests/UI/package.json
index 90340a5e99341..e02145df9a1e8 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -132,7 +132,7 @@
     "@types/chai-string": "^1.4.2",
     "@types/mocha": "^10.0.1",
     "@types/mochawesome": "^6.2.1",
-    "@typescript-eslint/eslint-plugin": "^5.60.1",
+    "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.61.0",
     "babel-eslint": "^10.1.0",
     "eslint": "^8.44.0",

From 055ba0ee8bd84f331bb489c7d5300f355a06cf05 Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Thu, 13 Jul 2023 16:07:31 +0200
Subject: [PATCH 0541/1030] Upgrade PS version

---
 install-dev/install_version.php | 2 +-
 src/Core/Version.php            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/install-dev/install_version.php b/install-dev/install_version.php
index 14c8475c173ad..2761133584a81 100644
--- a/install-dev/install_version.php
+++ b/install-dev/install_version.php
@@ -24,7 +24,7 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
-define('_PS_INSTALL_VERSION_', '8.1.0');
+define('_PS_INSTALL_VERSION_', '8.1.1');
 define('_PS_INSTALL_MINIMUM_PHP_VERSION_ID_', 70205);
 define('_PS_INSTALL_MAXIMUM_PHP_VERSION_ID_', 81099);
 
diff --git a/src/Core/Version.php b/src/Core/Version.php
index c5353865528b8..07d50273f8300 100644
--- a/src/Core/Version.php
+++ b/src/Core/Version.php
@@ -32,11 +32,11 @@
  */
 final class Version
 {
-    public const VERSION = '8.1.0';
+    public const VERSION = '8.1.1';
     public const MAJOR_VERSION_STRING = '8';
     public const MAJOR_VERSION = 8;
     public const MINOR_VERSION = 1;
-    public const RELEASE_VERSION = 0;
+    public const RELEASE_VERSION = 1;
 
     // This class should not be instanciated
     private function __construct()

From 3801e8cd3abe6f44f08f03936d104df8eeb4c5cf Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Thu, 13 Jul 2023 11:31:32 +0200
Subject: [PATCH 0542/1030] Nightly : Added new campaign to the nightly

---
 .github/workflows/cron_nightly_tests_reusable.yml         | 7 +++++++
 tests/UI/pages/BO/advancedParameters/featureFlag/index.ts | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cron_nightly_tests_reusable.yml b/.github/workflows/cron_nightly_tests_reusable.yml
index 900e23d19bd3e..c993f805af821 100644
--- a/.github/workflows/cron_nightly_tests_reusable.yml
+++ b/.github/workflows/cron_nightly_tests_reusable.yml
@@ -78,6 +78,7 @@ jobs:
           - 'functional:BO:shop-parameters:05-07'
           - 'functional:BO:advanced-parameters:01-06'
           - 'functional:BO:advanced-parameters:07-10'
+          - 'functional:BO:advanced-parameters:11-12'
           - 'functional:BO:header'
           - 'functional:FO:01-03'
           - 'functional:FO:04-07'
@@ -95,6 +96,8 @@ jobs:
           ## 1.7.8.x
           - BRANCH: 1.7.8.x
             CAMPAIGN: 'cldr'
+          - BRANCH: 1.7.8.x
+            CAMPAIGN: 'functional:BO:advanced-parameters:11-12'
           - BRANCH: 1.7.8.x
             CAMPAIGN: 'functional:BO:dashboard'
           - BRANCH: 1.7.8.x
@@ -118,6 +121,8 @@ jobs:
           ## 8.0.x
           - BRANCH: 8.0.x
             CAMPAIGN: 'cldr'
+          - BRANCH: 8.0.x
+            CAMPAIGN: 'functional:BO:advanced-parameters:11-12'
           - BRANCH: 8.0.x
             CAMPAIGN: 'functional:BO:dashboard'
           - BRANCH: 8.0.x
@@ -137,6 +142,8 @@ jobs:
           - BRANCH: 8.0.x
             CAMPAIGN: 'modules'
           ## 8.1.x
+          - BRANCH: 8.1.x
+            CAMPAIGN: 'functional:BO:advanced-parameters:11-12'
           - BRANCH: 8.1.x
             CAMPAIGN: 'functional:FO:01-03'
           - BRANCH: 8.1.x
diff --git a/tests/UI/pages/BO/advancedParameters/featureFlag/index.ts b/tests/UI/pages/BO/advancedParameters/featureFlag/index.ts
index f2527d8d36bb9..2584da893cf2b 100644
--- a/tests/UI/pages/BO/advancedParameters/featureFlag/index.ts
+++ b/tests/UI/pages/BO/advancedParameters/featureFlag/index.ts
@@ -86,10 +86,10 @@ class FeatureFlag extends BOBasePage {
     // The confirmation modal is only displayed for experimental/beta feature flags
     if (toEnable && !isStable) {
       await this.waitForVisibleSelector(page, this.modalSubmitFeatureFlag);
-      await this.clickAndWaitForURL(page, this.enableExperimentalfeatureButton);
+      await this.clickAndWaitForLoadState(page, this.enableExperimentalfeatureButton);
     }
 
-    return this.getTextContent(page, this.alertSuccess);
+    return this.getTextContent(page, this.alertSuccess, true);
   }
 }
 

From 2f7f63e9177bcf008f8e31cff4a39678c131dd09 Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Thu, 13 Jul 2023 16:56:59 +0200
Subject: [PATCH 0543/1030] Upgrade PS version

---
 app/AppKernel.php               | 4 ++--
 install-dev/install_version.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/AppKernel.php b/app/AppKernel.php
index 4437ab2fe5385..98e744cf7403e 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -32,11 +32,11 @@
 
 class AppKernel extends Kernel
 {
-    const VERSION = '8.0.4';
+    const VERSION = '8.0.5';
     const MAJOR_VERSION_STRING = '8';
     const MAJOR_VERSION = 8;
     const MINOR_VERSION = 0;
-    const RELEASE_VERSION = 4;
+    const RELEASE_VERSION = 5;
 
     /**
      * Lock stream is saved as static field, this way if multiple AppKernel are instanciated (this can happen in
diff --git a/install-dev/install_version.php b/install-dev/install_version.php
index c8e9462116767..03f06b526b8bf 100644
--- a/install-dev/install_version.php
+++ b/install-dev/install_version.php
@@ -24,7 +24,7 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
-define('_PS_INSTALL_VERSION_', '8.0.4');
+define('_PS_INSTALL_VERSION_', '8.0.5');
 define('_PS_INSTALL_MINIMUM_PHP_VERSION_ID_', 70205);
 define('_PS_INSTALL_MAXIMUM_PHP_VERSION_ID_', 81099);
 

From 84a652c385f0a9dc7e8dc400d058d0dcb71ac332 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Thu, 13 Jul 2023 17:02:23 +0200
Subject: [PATCH 0544/1030] Functional Tests : FO - Login : Create account (Add
 check for email)

---
 .../FO/classic/01_login/04_createAccount.ts   | 96 ++++++++++++-------
 1 file changed, 62 insertions(+), 34 deletions(-)

diff --git a/tests/UI/campaigns/functional/FO/classic/01_login/04_createAccount.ts b/tests/UI/campaigns/functional/FO/classic/01_login/04_createAccount.ts
index aa304b3b068f7..c0a6213d0df5a 100644
--- a/tests/UI/campaigns/functional/FO/classic/01_login/04_createAccount.ts
+++ b/tests/UI/campaigns/functional/FO/classic/01_login/04_createAccount.ts
@@ -1,8 +1,10 @@
 // Import utils
 import helper from '@utils/helpers';
+import mailHelper from '@utils/mailHelper';
 import testContext from '@utils/testContext';
 
 // Import commonTests
+import {resetSmtpConfigTest, setupSmtpConfigTest} from '@commonTests/BO/advancedParameters/smtp';
 import {deleteCustomerTest} from '@commonTests/BO/customers/customer';
 
 // Import FO pages
@@ -12,8 +14,10 @@ import {createAccountPage} from '@pages/FO/myAccount/add';
 
 // Import data
 import CustomerData from '@data/faker/customer';
+import type MailDevEmail from '@data/types/maildevEmail';
 
 import {expect} from 'chai';
+import type MailDev from 'maildev';
 import type {BrowserContext, Page} from 'playwright';
 
 const baseContext: string = 'functional_FO_classic_login_createAccount';
@@ -21,6 +25,8 @@ const baseContext: string = 'functional_FO_classic_login_createAccount';
 describe('FO - Login : Create account', async () => {
   let browserContext: BrowserContext;
   let page: Page;
+  let newMail: MailDevEmail;
+  let mailListener: MailDev;
 
   const customerData: CustomerData = new CustomerData();
 
@@ -28,64 +34,86 @@ describe('FO - Login : Create account', async () => {
   before(async function () {
     browserContext = await helper.createBrowserContext(this.browser);
     page = await helper.newTab(browserContext);
+
+    mailListener = mailHelper.createMailListener();
+    mailHelper.startListener(mailListener);
+    // Handle every new email
+    mailListener.on('new', (email: MailDevEmail) => {
+      newMail = email;
+    });
   });
 
   after(async () => {
     await helper.closeBrowserContext(browserContext);
+    mailHelper.stopListener(mailListener);
   });
 
-  it('should open the shop page', async function () {
-    await testContext.addContextItem(this, 'testIdentifier', 'goToShopFO', baseContext);
+  // Pre-Condition : Setup config SMTP
+  setupSmtpConfigTest(`${baseContext}_preTest_1`);
 
-    await homePage.goTo(page, global.FO.URL);
+  describe('FO - Login : Create account', async () => {
+    it('should open the shop page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToShopFO', baseContext);
 
-    const result = await homePage.isHomePage(page);
-    await expect(result).to.be.true;
-  });
+      await homePage.goTo(page, global.FO.URL);
 
-  it('should go to login page', async function () {
-    await testContext.addContextItem(this, 'testIdentifier', 'goToLoginPage', baseContext);
+      const result = await homePage.isHomePage(page);
+      await expect(result).to.be.true;
+    });
 
-    await homePage.goToLoginPage(page);
+    it('should go to login page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToLoginPage', baseContext);
 
-    const pageTitle = await loginPage.getPageTitle(page);
-    await expect(pageTitle).to.equal(loginPage.pageTitle);
-  });
+      await homePage.goToLoginPage(page);
 
-  it('should go to create account page', async function () {
-    await testContext.addContextItem(this, 'testIdentifier', 'goToCreateAccountPage', baseContext);
+      const pageTitle = await loginPage.getPageTitle(page);
+      await expect(pageTitle).to.equal(loginPage.pageTitle);
+    });
 
-    await loginPage.goToCreateAccountPage(page);
+    it('should go to create account page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToCreateAccountPage', baseContext);
 
-    const pageHeaderTitle = await createAccountPage.getHeaderTitle(page);
-    await expect(pageHeaderTitle).to.equal(createAccountPage.formTitle);
-  });
+      await loginPage.goToCreateAccountPage(page);
 
-  it('should create new account', async function () {
-    await testContext.addContextItem(this, 'testIdentifier', 'createAccount', baseContext);
+      const pageHeaderTitle = await createAccountPage.getHeaderTitle(page);
+      await expect(pageHeaderTitle).to.equal(createAccountPage.formTitle);
+    });
 
-    await createAccountPage.createAccount(page, customerData);
+    it('should create new account', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'createAccount', baseContext);
 
-    const isCustomerConnected = await homePage.isCustomerConnected(page);
-    await expect(isCustomerConnected, 'Created customer is not connected!').to.be.true;
-  });
+      await createAccountPage.createAccount(page, customerData);
 
-  it('should check if the page is redirected to home page', async function () {
-    await testContext.addContextItem(this, 'testIdentifier', 'isHomePage', baseContext);
+      const isCustomerConnected = await homePage.isCustomerConnected(page);
+      await expect(isCustomerConnected, 'Created customer is not connected!').to.be.true;
+    });
 
-    const isHomePage = await homePage.isHomePage(page);
-    await expect(isHomePage, 'Fail to redirect to FO home page!').to.be.true;
-  });
+    it('should check if the page is redirected to home page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'isHomePage', baseContext);
+
+      const isHomePage = await homePage.isHomePage(page);
+      await expect(isHomePage, 'Fail to redirect to FO home page!').to.be.true;
+    });
+
+    it('should check if welcome mail is in mailbox', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'checkWelcomeMail', baseContext);
 
-  it('should sign out from FO', async function () {
-    await testContext.addContextItem(this, 'testIdentifier', 'signOutFO', baseContext);
+      await expect(newMail.subject).to.contains('Welcome!');
+    });
 
-    await homePage.logout(page);
+    it('should sign out from FO', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'signOutFO', baseContext);
 
-    const isCustomerConnected = await homePage.isCustomerConnected(page);
-    await expect(isCustomerConnected, 'Customer is connected!').to.be.false;
+      await homePage.logout(page);
+
+      const isCustomerConnected = await homePage.isCustomerConnected(page);
+      await expect(isCustomerConnected, 'Customer is connected!').to.be.false;
+    });
   });
 
   // Post-condition: Delete created customer account from BO
   deleteCustomerTest(customerData, `${baseContext}_postTest_1`);
+
+  // Post-condition : Reset SMTP config
+  resetSmtpConfigTest(`${baseContext}_postTest_2`);
 });

From 68903c6b08f88e51655a77f7bd5d3976dadd35e2 Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Fri, 14 Jul 2023 09:53:12 +0200
Subject: [PATCH 0545/1030] Add information about stock

---
 classes/order/OrderInvoice.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/classes/order/OrderInvoice.php b/classes/order/OrderInvoice.php
index f959537573c9c..813ee3673bc3a 100644
--- a/classes/order/OrderInvoice.php
+++ b/classes/order/OrderInvoice.php
@@ -196,6 +196,7 @@ public function getProducts($products = false, $selected_products = false, $sele
             }
 
             $this->setProductImageInformations($row);
+            $this->setProductCurrentStock($row);
 
             $customized_datas = Product::getAllCustomizedDatas($order->id_cart, null, true, null, (int) $row['id_customization']);
             $this->setProductCustomizedDatas($row, $customized_datas);
@@ -262,6 +263,17 @@ protected function setProductCustomizedDatas(&$product, $customized_datas)
         }
     }
 
+    /**
+     * This method allow to add stock information on a product detail.
+     *
+     * @param array $product
+     */
+    protected function setProductCurrentStock(&$product)
+    {
+        $product['current_stock'] = StockAvailable::getQuantityAvailableByProduct((int) $product['product_id'], (int) $product['product_attribute_id'], (int) $product['id_shop']);
+        $product['location'] = StockAvailable::getLocation((int) $product['product_id'], (int) $product['product_attribute_id'], (int) $product['id_shop']);
+    }
+
     /**
      * This method allow to add image information on a product detail.
      *

From 4c74debdb53202875ba87fb8d36a322a3bfa274b Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Fri, 14 Jul 2023 09:58:21 +0200
Subject: [PATCH 0546/1030] Deprecate properties

---
 classes/Product.php              | 12 ++++++------
 classes/stock/StockAvailable.php |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/classes/Product.php b/classes/Product.php
index 4900b003b5d49..082eea649b0c6 100644
--- a/classes/Product.php
+++ b/classes/Product.php
@@ -77,7 +77,7 @@ class ProductCore extends ObjectModel
     public $description_short;
 
     /**
-     * @deprecated since 1.7.8
+     * @deprecated since 1.7.8 and will be removed in future version.
      * @see StockAvailable::$quantity instead
      *
      * @var int Quantity available
@@ -273,15 +273,15 @@ class ProductCore extends ObjectModel
     public $id_color_default = 0;
 
     /**
-     * @deprecated since 1.7.8
-     * The advanced stock management feature is not maintained anymore
+     * @deprecated since 1.7.8 and will be removed in future version.
+     * This property was only relevant to advanced stock management and that feature is not maintained anymore.
      *
      * @var bool Tells if the product uses the advanced stock management
      */
     public $advanced_stock_management = false;
 
     /**
-     * @deprecated since 1.7.8
+     * @deprecated since 1.7.8 and will be removed in future version.
      * @see StockAvailable::$out_of_stock instead
      *
      * @var int
@@ -292,8 +292,8 @@ class ProductCore extends ObjectModel
     public $out_of_stock = OutOfStockType::OUT_OF_STOCK_DEFAULT;
 
     /**
-     * @deprecated since 1.7.8
-     * This property was only relevant to advanced stock management and that feature is not maintained anymore
+     * @deprecated since 1.7.8 and will be removed in future version.
+     * This property was only relevant to advanced stock management and that feature is not maintained anymore.
      *
      * @var bool|null
      */
diff --git a/classes/stock/StockAvailable.php b/classes/stock/StockAvailable.php
index c092836c6adce..5bbfa06d8211b 100644
--- a/classes/stock/StockAvailable.php
+++ b/classes/stock/StockAvailable.php
@@ -50,8 +50,8 @@ class StockAvailableCore extends ObjectModel
     public $quantity = 0;
 
     /**
-     * @deprecated since 1.7.8
-     * This property was only relevant to advanced stock management and that feature is not maintained anymore
+     * @deprecated since 1.7.8 and will be removed in future version.
+     * This property was only relevant to advanced stock management and that feature is not maintained anymore.
      *
      * @var bool determine if the available stock value depends on physical stock
      */

From 388a270347fee070d3eeb2cc3263b00c9f959f1b Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Fri, 14 Jul 2023 10:00:06 +0200
Subject: [PATCH 0547/1030] Deprecate Product::getRealQuantity

---
 classes/Product.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/classes/Product.php b/classes/Product.php
index 082eea649b0c6..fdc78450ddaf9 100644
--- a/classes/Product.php
+++ b/classes/Product.php
@@ -7568,9 +7568,16 @@ public function updateWs($null_values = false)
      * @param int|null $id_shop Shop identifier
      *
      * @return int real_quantity
+     *
+     * @deprecated Since 9.0 and will be removed in 10.0 - use StockAvailable::getQuantityAvailableByProduct directly
      */
     public static function getRealQuantity($id_product, $id_product_attribute = 0, $id_warehouse = 0, $id_shop = null)
     {
+        @trigger_error(sprintf(
+            '%s is deprecated since 9.0 and will be removed in 10.0.',
+            __METHOD__
+        ), E_USER_DEPRECATED);
+
         return StockAvailable::getQuantityAvailableByProduct($id_product, $id_product_attribute, $id_shop);
     }
 

From 2ff7e9ac11567728cdea3fbd8810b3de896f0a88 Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Fri, 14 Jul 2023 10:33:35 +0200
Subject: [PATCH 0548/1030] Remove unnecessary movement reasons

---
 install-dev/data/xml/configuration.xml        | 39 +++++++------------
 install-dev/data/xml/stock_mvt_reason.xml     | 17 +++-----
 .../langs/en/data/stock_mvt_reason.xml        | 21 ----------
 .../override/AdminProductsController.php      |  1 -
 .../admin/AdminProductsController.php         |  1 -
 5 files changed, 18 insertions(+), 61 deletions(-)

diff --git a/install-dev/data/xml/configuration.xml b/install-dev/data/xml/configuration.xml
index 6dbcc19ddb2b3..3eb03d8659b2f 100644
--- a/install-dev/data/xml/configuration.xml
+++ b/install-dev/data/xml/configuration.xml
@@ -242,9 +242,6 @@
   <configuration id="PS_BLOCK_SPECIALS_DISPLAY" name="PS_BLOCK_SPECIALS_DISPLAY">
     <value>0</value>
   </configuration>
-  <configuration id="PS_STOCK_MVT_REASON_DEFAULT" name="PS_STOCK_MVT_REASON_DEFAULT">
-    <value>3</value>
-  </configuration>
   <configuration id="PS_SPECIFIC_PRICE_PRIORITIES" name="PS_SPECIFIC_PRICE_PRIORITIES">
     <value>id_group;id_currency;id_country;id_shop</value>
   </configuration>
@@ -449,39 +446,25 @@
   <configuration id="PS_CARRIER_DEFAULT_SORT" name="PS_CARRIER_DEFAULT_SORT">
     <value>0</value>
   </configuration>
-  <configuration id="PS_STOCK_MVT_INC_REASON_DEFAULT" name="PS_STOCK_MVT_INC_REASON_DEFAULT">
+
+  <!-- Stock movement reasons -->
+  <configuration id="PS_STOCK_CUSTOMER_ORDER_REASON" name="PS_STOCK_CUSTOMER_ORDER_REASON">
     <value>1</value>
   </configuration>
-  <configuration id="PS_STOCK_MVT_DEC_REASON_DEFAULT" name="PS_STOCK_MVT_DEC_REASON_DEFAULT">
+  <configuration id="PS_STOCK_CUSTOMER_ORDER_CANCEL_REASON" name="PS_STOCK_CUSTOMER_ORDER_CANCEL_REASON">
     <value>2</value>
   </configuration>
-  <configuration id="PS_STOCK_MVT_TRANSFER_TO" name="PS_STOCK_MVT_TRANSFER_TO">
-    <value>7</value>
-  </configuration>
-  <configuration id="PS_STOCK_MVT_TRANSFER_FROM" name="PS_STOCK_MVT_TRANSFER_FROM">
-    <value>6</value>
-  </configuration>
-  <configuration id="PS_CARRIER_DEFAULT_ORDER" name="PS_CARRIER_DEFAULT_ORDER">
-    <value>0</value>
-  </configuration>
-  <configuration id="PS_STOCK_MVT_SUPPLY_ORDER" name="PS_STOCK_MVT_SUPPLY_ORDER">
-    <value>8</value>
-  </configuration>
-  <configuration id="PS_STOCK_CUSTOMER_ORDER_CANCEL_REASON" name="PS_STOCK_CUSTOMER_ORDER_CANCEL_REASON">
-    <value>9</value>
-</configuration>
   <configuration id="PS_STOCK_CUSTOMER_RETURN_REASON" name="PS_STOCK_CUSTOMER_RETURN_REASON">
-    <value>10</value>
+    <value>3</value>
   </configuration>
   <configuration id="PS_STOCK_MVT_INC_EMPLOYEE_EDITION" name="PS_STOCK_MVT_INC_EMPLOYEE_EDITION">
-    <value>11</value>
+    <value>4</value>
   </configuration>
   <configuration id="PS_STOCK_MVT_DEC_EMPLOYEE_EDITION" name="PS_STOCK_MVT_DEC_EMPLOYEE_EDITION">
-    <value>12</value>
-  </configuration>
-  <configuration id="PS_STOCK_CUSTOMER_ORDER_REASON" name="PS_STOCK_CUSTOMER_ORDER_REASON">
-    <value>3</value>
+    <value>5</value>
   </configuration>
+
+  <!-- Default customer group IDs -->
   <configuration id="PS_UNIDENTIFIED_GROUP" name="PS_UNIDENTIFIED_GROUP">
     <value>1</value>
   </configuration>
@@ -491,6 +474,10 @@
   <configuration id="PS_CUSTOMER_GROUP" name="PS_CUSTOMER_GROUP">
     <value>3</value>
   </configuration>
+
+  <configuration id="PS_CARRIER_DEFAULT_ORDER" name="PS_CARRIER_DEFAULT_ORDER">
+    <value>0</value>
+  </configuration>
   <configuration id="PS_SMARTY_CONSOLE" name="PS_SMARTY_CONSOLE">
     <value>0</value>
   </configuration>
diff --git a/install-dev/data/xml/stock_mvt_reason.xml b/install-dev/data/xml/stock_mvt_reason.xml
index 9a9b6bf8be26b..0497166b96482 100644
--- a/install-dev/data/xml/stock_mvt_reason.xml
+++ b/install-dev/data/xml/stock_mvt_reason.xml
@@ -4,22 +4,15 @@
     <field name="sign"/>
   </fields>
   <entities>
-    <stock_mvt_reason id="Increase" sign="1"/>
-    <stock_mvt_reason id="Decrease" sign="-1"/>
+    <!-- 1 PS_STOCK_CUSTOMER_ORDER_REASON -->
     <stock_mvt_reason id="Customer_Order" sign="-1"/>
-    <stock_mvt_reason id="Regulation_following_an_inventory_of_stock" sign="-1"/>
-    <stock_mvt_reason id="Regulation_following_an_inventory_of_stock_1" sign="1"/>
-
-    <!-- 3 reasons below are unused, but kept only to keep proper IDs. They are tied to IDs in configuration table. -->
-    <!-- If you delete them, make sure to change PS_STOCK_MVT_INC_EMPLOYEE_EDITION from 11 to 8 for example. -->
-    <stock_mvt_reason id="Transfer_to_another_warehouse" sign="-1"/>
-    <stock_mvt_reason id="Transfer_from_another_warehouse" sign="1"/>
-    <stock_mvt_reason id="Supply_Order" sign="1"/>
-    <!-- / -->
-
+    <!-- 2 PS_STOCK_CUSTOMER_ORDER_CANCEL_REASON -->
     <stock_mvt_reason id="Customer_Order_1" sign="1"/>
+    <!-- 3 PS_STOCK_CUSTOMER_RETURN_REASON -->
     <stock_mvt_reason id="Product_Return" sign="1"/>
+    <!-- 4 PS_STOCK_MVT_INC_EMPLOYEE_EDITION -->
     <stock_mvt_reason id="Employee_Edition" sign="1"/>
+    <!-- 5 PS_STOCK_MVT_DEC_EMPLOYEE_EDITION -->
     <stock_mvt_reason id="Employee_Edition_1" sign="-1"/>
   </entities>
 </entity_stock_mvt_reason>
diff --git a/install-dev/langs/en/data/stock_mvt_reason.xml b/install-dev/langs/en/data/stock_mvt_reason.xml
index 4b26042d70efe..77edb2e4dbd85 100644
--- a/install-dev/langs/en/data/stock_mvt_reason.xml
+++ b/install-dev/langs/en/data/stock_mvt_reason.xml
@@ -1,29 +1,8 @@
 <?xml version="1.0"?>
 <entity_stock_mvt_reason>
-  <stock_mvt_reason id="Increase">
-    <name>Increase</name>
-  </stock_mvt_reason>
-  <stock_mvt_reason id="Decrease">
-    <name>Decrease</name>
-  </stock_mvt_reason>
   <stock_mvt_reason id="Customer_Order">
     <name>Customer Order</name>
   </stock_mvt_reason>
-  <stock_mvt_reason id="Regulation_following_an_inventory_of_stock">
-    <name>Regulation following an inventory of stock</name>
-  </stock_mvt_reason>
-  <stock_mvt_reason id="Regulation_following_an_inventory_of_stock_1">
-    <name>Regulation following an inventory of stock</name>
-  </stock_mvt_reason>
-  <stock_mvt_reason id="Transfer_to_another_warehouse">
-    <name>Transfer to another warehouse</name>
-  </stock_mvt_reason>
-  <stock_mvt_reason id="Transfer_from_another_warehouse">
-    <name>Transfer from another warehouse</name>
-  </stock_mvt_reason>
-  <stock_mvt_reason id="Supply_Order">
-    <name>Supply Order</name>
-  </stock_mvt_reason>
   <stock_mvt_reason id="Customer_Order_1">
     <name>Customer Order</name>
   </stock_mvt_reason>
diff --git a/tests/Resources/modules_tests/override/AdminProductsController.php b/tests/Resources/modules_tests/override/AdminProductsController.php
index fa9fa9a5fbca9..ebef7ac042f5d 100644
--- a/tests/Resources/modules_tests/override/AdminProductsController.php
+++ b/tests/Resources/modules_tests/override/AdminProductsController.php
@@ -3714,7 +3714,6 @@ public function initFormAttributes($product)
                     $data->assign('ps_weight_unit', Configuration::get('PS_WEIGHT_UNIT'));
                     $data->assign('ps_use_ecotax', Configuration::get('PS_USE_ECOTAX'));
                     $data->assign('field_value_unity', $this->getFieldValue($product, 'unity'));
-                    $data->assign('ps_stock_mvt_reason_default', $ps_stock_mvt_reason_default = Configuration::get('PS_STOCK_MVT_REASON_DEFAULT'));
                     $data->assign('minimal_quantity', $this->getFieldValue($product, 'minimal_quantity') ? $this->getFieldValue($product, 'minimal_quantity') : 1);
                     $data->assign('available_date', ($this->getFieldValue($product, 'available_date') != 0) ? stripslashes(htmlentities($this->getFieldValue($product, 'available_date'), $this->context->language->id)) : '0000-00-00');
                     $i = 0;
diff --git a/tests/Resources/modules_tests/pscsx32412/override/controllers/admin/AdminProductsController.php b/tests/Resources/modules_tests/pscsx32412/override/controllers/admin/AdminProductsController.php
index 16a18f4b0ee10..8e95e80b9768a 100644
--- a/tests/Resources/modules_tests/pscsx32412/override/controllers/admin/AdminProductsController.php
+++ b/tests/Resources/modules_tests/pscsx32412/override/controllers/admin/AdminProductsController.php
@@ -3849,7 +3849,6 @@ public function initFormAttributes($product)
                     $data->assign('ps_use_ecotax', Configuration::get('PS_USE_ECOTAX'));
                     $data->assign('field_value_unity', $this->getFieldValue($product, 'unity'));
 
-                    $data->assign('ps_stock_mvt_reason_default', $ps_stock_mvt_reason_default = Configuration::get('PS_STOCK_MVT_REASON_DEFAULT'));
                     $data->assign('minimal_quantity', $this->getFieldValue($product, 'minimal_quantity') ? $this->getFieldValue($product, 'minimal_quantity') : 1);
                     $data->assign('available_date', ($this->getFieldValue($product, 'available_date') != 0) ? stripslashes(htmlentities($this->getFieldValue($product, 'available_date'), $this->context->language->id)) : '0000-00-00');
 

From 1f57aa5854d309794a1354aeed8ceeee7c4940c7 Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Tue, 11 Jul 2023 16:41:39 +0200
Subject: [PATCH 0549/1030] Prevent removing non restricted cart rules

---
 classes/CartRule.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/classes/CartRule.php b/classes/CartRule.php
index 0948440488c66..a0345d0a5dd2d 100644
--- a/classes/CartRule.php
+++ b/classes/CartRule.php
@@ -611,6 +611,12 @@ public static function cartRuleExists($code)
      */
     public static function deleteByIdCustomer($id_customer)
     {
+        // Remove cart rules only if we got some sensible ID of a customer.
+        // If we would pass zero further below, it would delete all non-customer-restricted cart rules.
+        if (empty($id_customer)) {
+            return false;
+        }
+
         $return = true;
         $cart_rules = new PrestaShopCollection('CartRule');
         $cart_rules->where('id_customer', '=', $id_customer);

From 1b9e9c3a90bc0840a2670272c0f4dc2b204939fd Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Fri, 14 Jul 2023 16:40:40 +0200
Subject: [PATCH 0550/1030] Prevent deleting main URLs of store

---
 controllers/admin/AdminShopUrlController.php | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/controllers/admin/AdminShopUrlController.php b/controllers/admin/AdminShopUrlController.php
index 3fcbd9156cb22..d0632f7cf6091 100644
--- a/controllers/admin/AdminShopUrlController.php
+++ b/controllers/admin/AdminShopUrlController.php
@@ -106,7 +106,8 @@ public function viewAccess($disable = false)
 
     public function renderList()
     {
-        $this->addRowActionSkipList('delete', [1]);
+        // We will hide "delete" action for all URLs that are set as main ones for the store
+        $this->addRowActionSkipList('delete', $this->getUnremovableUrls());
 
         $this->addRowAction('edit');
         $this->addRowAction('delete');
@@ -122,6 +123,19 @@ public function renderList()
         return parent::renderList();
     }
 
+    /**
+     * Returns a list of URLs that are selected as main ones for some store.
+     *
+     * @return array of URLs that are selected as main
+     */
+    protected function getUnremovableUrls()
+    {
+        return array_column(
+            Db::getInstance()->executeS('SELECT id_shop_url FROM ' . _DB_PREFIX_ . 'shop_url WHERE main = 1'),
+            'id_shop_url'
+        );
+    }
+
     /**
      * @return string|void
      *

From f52a2655f9fe6ea09acc23f664808e66909bdad7 Mon Sep 17 00:00:00 2001
From: Daniel Hlavacek <daniel.hlavacek@hotmail.cz>
Date: Fri, 14 Jul 2023 16:58:19 +0200
Subject: [PATCH 0551/1030] Enable related tests

---
 .../BO/08_design/06_imageSettings/15_checkStoreImageFormat.ts  | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/15_checkStoreImageFormat.ts b/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/15_checkStoreImageFormat.ts
index 681a0d8c3f642..fdedf008c0c94 100644
--- a/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/15_checkStoreImageFormat.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/15_checkStoreImageFormat.ts
@@ -218,8 +218,6 @@ describe('BO - Design - Image Settings - Check product image format', async () =
         await expect(imageTypeJPG).to.be.eq(arg.extOriginal);
 
         // Check the WebP file
-        /*
-         * @todo : https://github.com/PrestaShop/PrestaShop/issues/32528
         const pathImageWEBP: string = `${files.getRootPath()}/img/st/${idStore}-stores_default.webp`;
 
         const fileExistsWEBP = await files.doesFileExist(pathImageWEBP);
@@ -227,7 +225,6 @@ describe('BO - Design - Image Settings - Check product image format', async () =
 
         const imageTypeWEBP = await files.getImageType(pathImageWEBP);
         await expect(imageTypeWEBP).to.be.eq('webp');
-         */
       });
 
       it('should go to FO page', async function () {

From 9c68f71a33c37efdfe2318b9290855cd30525e10 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jul 2023 04:51:38 +0000
Subject: [PATCH 0552/1030] Bump eslint from 8.44.0 to 8.45.0 in /tests/UI

Bumps [eslint](https://github.com/eslint/eslint) from 8.44.0 to 8.45.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.44.0...v8.45.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 20 +++++++++-----------
 tests/UI/package.json      |  2 +-
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index 4c028d2cb2fa7..16a4c30b4790c 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -2365,9 +2365,9 @@
       }
     },
     "eslint": {
-      "version": "8.44.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.44.0.tgz",
-      "integrity": "sha512-0wpHoUbDUHgNCyvFB5aXLiQVfK9B0at6gUvzy83k4kAsQ/u769TQDX6iKC+aO4upIHO9WSaA3QoXYQDHbNwf1A==",
+      "version": "8.45.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.45.0.tgz",
+      "integrity": "sha512-pd8KSxiQpdYRfYa9Wufvdoct3ZPQQuVuU5O6scNgMuOMYuxvH0IGaYK0wUFjo4UYYQQCUndlXiMbnxopwvvTiw==",
       "dev": true,
       "requires": {
         "@eslint-community/eslint-utils": "^4.2.0",
@@ -2395,7 +2395,6 @@
         "globals": "^13.19.0",
         "graphemer": "^1.4.0",
         "ignore": "^5.2.0",
-        "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
         "is-path-inside": "^3.0.3",
@@ -2407,7 +2406,6 @@
         "natural-compare": "^1.4.0",
         "optionator": "^0.9.3",
         "strip-ansi": "^6.0.1",
-        "strip-json-comments": "^3.1.0",
         "text-table": "^0.2.0"
       },
       "dependencies": {
@@ -2707,9 +2705,9 @@
       }
     },
     "eslint-scope": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz",
-      "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==",
+      "version": "7.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.1.tgz",
+      "integrity": "sha512-CvefSOsDdaYYvxChovdrPo/ZGt8d5lrJWleAc1diXRKhHGiTYEI26cvo8Kle/wGnsizoCJjK73FMg1/IkIwiNA==",
       "dev": true,
       "requires": {
         "esrecurse": "^4.3.0",
@@ -2731,9 +2729,9 @@
       "dev": true
     },
     "espree": {
-      "version": "9.6.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.0.tgz",
-      "integrity": "sha512-1FH/IiruXZ84tpUlm0aCUEwMl2Ho5ilqVh0VvQXw+byAz/4SAciyHLlfmL5WYqsvD38oymdUwBss0LtK8m4s/A==",
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
       "dev": true,
       "requires": {
         "acorn": "^8.9.0",
diff --git a/tests/UI/package.json b/tests/UI/package.json
index e02145df9a1e8..856cfc49caa4a 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -135,7 +135,7 @@
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.61.0",
     "babel-eslint": "^10.1.0",
-    "eslint": "^8.44.0",
+    "eslint": "^8.45.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-deprecation": "^1.4.1",
     "eslint-plugin-html": "^7.1.0",

From ab269125d0e877b035d0d7b6f6e69f5aad11c427 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jul 2023 04:52:42 +0000
Subject: [PATCH 0553/1030] Bump @xmldom/xmldom from 0.8.8 to 0.8.9 in
 /tests/UI

Bumps [@xmldom/xmldom](https://github.com/xmldom/xmldom) from 0.8.8 to 0.8.9.
- [Release notes](https://github.com/xmldom/xmldom/releases)
- [Changelog](https://github.com/xmldom/xmldom/blob/master/CHANGELOG.md)
- [Commits](https://github.com/xmldom/xmldom/compare/0.8.8...0.8.9)

---
updated-dependencies:
- dependency-name: "@xmldom/xmldom"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 6 +++---
 tests/UI/package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index 4c028d2cb2fa7..bce9495f91ef5 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -758,9 +758,9 @@
       }
     },
     "@xmldom/xmldom": {
-      "version": "0.8.8",
-      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.8.tgz",
-      "integrity": "sha512-0LNz4EY8B/8xXY86wMrQ4tz6zEHZv9ehFMJPm8u2gq5lQ71cfRKdaKyxfJAx5aUoyzx0qzgURblTisPGgz3d+Q=="
+      "version": "0.8.9",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.9.tgz",
+      "integrity": "sha512-4VSbbcMoxc4KLjb1gs96SRmi7w4h1SF+fCoiK0XaQX62buCc1G5d0DC5bJ9xJBNPDSVCmIrcl8BiYxzjrqaaJA=="
     },
     "abab": {
       "version": "2.0.6",
diff --git a/tests/UI/package.json b/tests/UI/package.json
index e02145df9a1e8..45bbae64f4566 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -111,7 +111,7 @@
   "dependencies": {
     "@faker-js/faker": "^8.0.2",
     "@s3pweb/keycloak-admin-client-cjs": "^21.0.1",
-    "@xmldom/xmldom": "^0.8.8",
+    "@xmldom/xmldom": "^0.8.9",
     "chai": "^4.3.7",
     "chai-string": "^1.5.0",
     "csv-writer": "^1.6.0",

From 0fc33caa8c24fe1433b10b648f3363eee7a8145b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jul 2023 04:56:39 +0000
Subject: [PATCH 0554/1030] Bump playwright from 1.35.1 to 1.36.1 in /tests/UI

Bumps [playwright](https://github.com/Microsoft/playwright) from 1.35.1 to 1.36.1.
- [Release notes](https://github.com/Microsoft/playwright/releases)
- [Commits](https://github.com/Microsoft/playwright/compare/v1.35.1...v1.36.1)

---
updated-dependencies:
- dependency-name: playwright
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 14 +++++++-------
 tests/UI/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index 4c028d2cb2fa7..ff206c5030155 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -5336,17 +5336,17 @@
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
     },
     "playwright": {
-      "version": "1.35.1",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.35.1.tgz",
-      "integrity": "sha512-NbwBeGJLu5m7VGM0+xtlmLAH9VUfWwYOhUi/lSEDyGg46r1CA9RWlvoc5yywxR9AzQb0mOCm7bWtOXV7/w43ZA==",
+      "version": "1.36.1",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.36.1.tgz",
+      "integrity": "sha512-2ZqHpD0U0COKR8bqR3W5IkyIAAM0mT9FgGJB9xWCI1qAUkqLxJskA1ueeQOTH2Qfz3+oxdwwf2EzdOX+RkZmmQ==",
       "requires": {
-        "playwright-core": "1.35.1"
+        "playwright-core": "1.36.1"
       }
     },
     "playwright-core": {
-      "version": "1.35.1",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.35.1.tgz",
-      "integrity": "sha512-pNXb6CQ7OqmGDRspEjlxE49w+4YtR6a3X6mT1hZXeJHWmsEz7SunmvZeiG/+y1yyMZdHnnn73WKYdtV1er0Xyg=="
+      "version": "1.36.1",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.36.1.tgz",
+      "integrity": "sha512-7+tmPuMcEW4xeCL9cp9KxmYpQYHKkyjwoXRnoeTowaeNat8PoBMk/HwCYhqkH2fRkshfKEOiVus/IhID2Pg8kg=="
     },
     "prelude-ls": {
       "version": "1.1.2",
diff --git a/tests/UI/package.json b/tests/UI/package.json
index e02145df9a1e8..48b9a4791d10d 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -124,7 +124,7 @@
     "mochawesome": "^7.1.3",
     "module-alias": "^2.2.3",
     "pdfjs-dist": "^3.4.120",
-    "playwright": "^1.35.1",
+    "playwright": "^1.36.1",
     "xpath-ts": "^1.3.13"
   },
   "devDependencies": {

From 0d787f08488f750811100f937d6779e3725a5bc7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jul 2023 07:29:25 +0000
Subject: [PATCH 0555/1030] Bump @typescript-eslint/parser from 5.61.0 to
 5.62.0 in /tests/UI

Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 5.61.0 to 5.62.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.62.0/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 46 +++++++++++++++++++-------------------
 tests/UI/package.json      |  2 +-
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index 16a4c30b4790c..ac6d6a1cfdc1c 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -504,41 +504,41 @@
       }
     },
     "@typescript-eslint/parser": {
-      "version": "5.61.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.61.0.tgz",
-      "integrity": "sha512-yGr4Sgyh8uO6fSi9hw3jAFXNBHbCtKKFMdX2IkT3ZqpKmtAq3lHS4ixB/COFuAIJpwl9/AqF7j72ZDWYKmIfvg==",
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz",
+      "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "5.61.0",
-        "@typescript-eslint/types": "5.61.0",
-        "@typescript-eslint/typescript-estree": "5.61.0",
+        "@typescript-eslint/scope-manager": "5.62.0",
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/typescript-estree": "5.62.0",
         "debug": "^4.3.4"
       },
       "dependencies": {
         "@typescript-eslint/scope-manager": {
-          "version": "5.61.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.61.0.tgz",
-          "integrity": "sha512-W8VoMjoSg7f7nqAROEmTt6LoBpn81AegP7uKhhW5KzYlehs8VV0ZW0fIDVbcZRcaP3aPSW+JZFua+ysQN+m/Nw==",
+          "version": "5.62.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
+          "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "5.61.0",
-            "@typescript-eslint/visitor-keys": "5.61.0"
+            "@typescript-eslint/types": "5.62.0",
+            "@typescript-eslint/visitor-keys": "5.62.0"
           }
         },
         "@typescript-eslint/types": {
-          "version": "5.61.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.61.0.tgz",
-          "integrity": "sha512-ldyueo58KjngXpzloHUog/h9REmHl59G1b3a5Sng1GfBo14BkS3ZbMEb3693gnP1k//97lh7bKsp6/V/0v1veQ==",
+          "version": "5.62.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
+          "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
           "dev": true
         },
         "@typescript-eslint/typescript-estree": {
-          "version": "5.61.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.61.0.tgz",
-          "integrity": "sha512-Fud90PxONnnLZ36oR5ClJBLTLfU4pIWBmnvGwTbEa2cXIqj70AEDEmOmpkFComjBZ/037ueKrOdHuYmSFVD7Rw==",
+          "version": "5.62.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
+          "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "5.61.0",
-            "@typescript-eslint/visitor-keys": "5.61.0",
+            "@typescript-eslint/types": "5.62.0",
+            "@typescript-eslint/visitor-keys": "5.62.0",
             "debug": "^4.3.4",
             "globby": "^11.1.0",
             "is-glob": "^4.0.3",
@@ -547,12 +547,12 @@
           }
         },
         "@typescript-eslint/visitor-keys": {
-          "version": "5.61.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.61.0.tgz",
-          "integrity": "sha512-50XQ5VdbWrX06mQXhy93WywSFZZGsv3EOjq+lqp6WC2t+j3mb6A9xYVdrRxafvK88vg9k9u+CT4l6D8PEatjKg==",
+          "version": "5.62.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
+          "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "5.61.0",
+            "@typescript-eslint/types": "5.62.0",
             "eslint-visitor-keys": "^3.3.0"
           }
         },
diff --git a/tests/UI/package.json b/tests/UI/package.json
index 856cfc49caa4a..1debba9d5ce0b 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -133,7 +133,7 @@
     "@types/mocha": "^10.0.1",
     "@types/mochawesome": "^6.2.1",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
-    "@typescript-eslint/parser": "^5.61.0",
+    "@typescript-eslint/parser": "^5.62.0",
     "babel-eslint": "^10.1.0",
     "eslint": "^8.45.0",
     "eslint-config-airbnb-base": "^15.0.0",

From f83809d0257f19acddb176df47f6a888ff0ac801 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@prestashop.com>
Date: Mon, 17 Jul 2023 10:20:19 +0200
Subject: [PATCH 0556/1030] Change CODEOWNERS rules for 8.0.x

---
 .github/CODEOWNERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 383c0bdf9f781..c6e3747faedcb 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,4 +1,4 @@
 # See: https://help.github.com/en/articles/about-code-owners
 
-* @PrestaShop/prestashop-maintainers
+* @PrestaShop/committers
 tests/UI @PrestaShop/ui-tests-maintainers

From a57ecc4b4983b4b8667a1848e84beb4c1e0c1425 Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Mon, 17 Jul 2023 10:52:40 +0200
Subject: [PATCH 0557/1030] Update dependencies

---
 composer.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.lock b/composer.lock
index a5f2f5a6f624d..aaa1c7b1c7666 100644
--- a/composer.lock
+++ b/composer.lock
@@ -5769,12 +5769,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/PrestaShop/laminas-code-lts.git",
-                "reference": "3dbe7f7f48a5d877e02cc70e4f58cb0e1e5cca82"
+                "reference": "c22c7aee2092bcec532b910a1f4dbac0ce6a3bbf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PrestaShop/laminas-code-lts/zipball/3dbe7f7f48a5d877e02cc70e4f58cb0e1e5cca82",
-                "reference": "3dbe7f7f48a5d877e02cc70e4f58cb0e1e5cca82",
+                "url": "https://api.github.com/repos/PrestaShop/laminas-code-lts/zipball/c22c7aee2092bcec532b910a1f4dbac0ce6a3bbf",
+                "reference": "c22c7aee2092bcec532b910a1f4dbac0ce6a3bbf",
                 "shasum": ""
             },
             "require": {
@@ -5831,7 +5831,7 @@
                 "rss": "https://github.com/laminas/laminas-code/releases.atom",
                 "source": "https://github.com/laminas/laminas-code"
             },
-            "time": "2022-05-03T11:51:53+00:00"
+            "time": "2023-06-13T07:18:53+00:00"
         },
         {
             "name": "prestashop/pagesnotfound",

From 169d350635503ddb3343fda22e7e82b5ce00735e Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Tue, 4 Jul 2023 14:10:22 +0200
Subject: [PATCH 0558/1030] Add new test to edit URL options

---
 .../10_multistore/07_editUrlOptions.ts        | 174 ++++++++++++++++++
 .../BO/advancedParameters/multistore.ts       | 104 +++++++++++
 .../multistore/url/addURL.ts                  |  32 +++-
 .../multistore/url/index.ts                   |   7 +
 4 files changed, 316 insertions(+), 1 deletion(-)
 create mode 100644 tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/07_editUrlOptions.ts
 create mode 100644 tests/UI/commonTests/BO/advancedParameters/multistore.ts

diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/07_editUrlOptions.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/07_editUrlOptions.ts
new file mode 100644
index 0000000000000..06c5e70e4b164
--- /dev/null
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/07_editUrlOptions.ts
@@ -0,0 +1,174 @@
+// Import utils
+import helper from '@utils/helpers';
+import testContext from '@utils/testContext';
+
+// Import commonTests
+import loginCommon from '@commonTests/BO/loginBO';
+import {disableMultiStoreTest, enableMultiStoreTest} from '@commonTests/BO/advancedParameters/multistore';
+
+// Import pages
+import dashboardPage from '@pages/BO/dashboard';
+import multiStorePage from '@pages/BO/advancedParameters/multistore';
+import shopUrlPage from '@pages/BO/advancedParameters/multistore/url';
+import shopPage from '@pages/BO/advancedParameters/multistore/shop';
+import editShopUrlPage from '@pages/BO/advancedParameters/multistore/url/addURL';
+
+// Import data
+import ShopData from '@data/faker/shop';
+
+import {expect} from 'chai';
+import type {BrowserContext, Page} from 'playwright';
+
+const baseContext: string = 'functional_BO_advancedParameters_multistore_editUrlOptions';
+
+/*
+Pre-condition:
+- Enable multistore
+Scenario:
+- Disable option "Is it the main URL for this shop?" and Disable the shop
+Post-condition:
+-Disable multistore
+ */
+describe('BO - Advanced Parameters - Multistore : Edit URL options', async () => {
+  let browserContext: BrowserContext;
+  let page: Page;
+  const ShopUrlData: ShopData = new ShopData({name: 'polpol', shopGroup: '', categoryRoot: ''});
+
+  //Pre-condition: Enable multistore
+  enableMultiStoreTest(baseContext);
+
+  // before and after functions
+  before(async function () {
+    browserContext = await helper.createBrowserContext(this.browser);
+    page = await helper.newTab(browserContext);
+  });
+
+  after(async () => {
+    await helper.closeBrowserContext(browserContext);
+  });
+
+  // 1 : Go to multistore page
+  describe('Go to \'Multistore\' page', async () => {
+    it('should login in BO', async function () {
+      await loginCommon.loginBO(this, page);
+    });
+
+    it('should go to \'Advanced Parameters > Multistore\' page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToMultiStorePage', baseContext);
+
+      await dashboardPage.goToSubMenu(
+        page,
+        dashboardPage.advancedParametersLink,
+        dashboardPage.multistoreLink,
+      );
+
+      const pageTitle = await multiStorePage.getPageTitle(page);
+      await expect(pageTitle).to.contains(multiStorePage.pageTitle);
+    });
+
+    it('should go to \'Shop Urls\' page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToShopUrlsPage', baseContext);
+
+      await multiStorePage.goToShopURLPage(page, 1);
+
+      const pageTitle = await multiStorePage.getPageTitle(page);
+      await expect(pageTitle).to.contains(multiStorePage.pageTitle);
+    });
+  });
+
+  // 2 : Edit url options
+  describe('Edit URL options', async () => {
+    it('should go to edit the first shop URL page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToEditShopUrlsPage', baseContext);
+
+      await shopUrlPage.goToEditShopURLPage(page, 1);
+
+      const pageTitle = await editShopUrlPage.getPageTitle(page);
+      await expect(pageTitle).to.contains(editShopUrlPage.pageTitleEdit);
+    });
+
+    it('should disable the main URL and check the error message', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'disableMainURL', baseContext);
+
+      const errorAlertMessage = await editShopUrlPage.setMainURL(page, 'off');
+      await expect(errorAlertMessage).to.contains(editShopUrlPage.errorDisableMainURLMessage);
+    });
+
+    it('should disable the shop and check the error message', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'disableShop', baseContext);
+
+      const errorAlertMessage = await editShopUrlPage.setShopStatus(page, 'off');
+      await expect(errorAlertMessage).to.contains(editShopUrlPage.errorDisableMainURLMessage)
+        .and.to.contains(editShopUrlPage.ErrorDisableShopMessage);
+    });
+
+    it('should go to add shop URL', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToAddURL', baseContext);
+
+      await shopUrlPage.goToAddNewUrl(page);
+
+      const pageTitle = await editShopUrlPage.getPageTitle(page);
+      await expect(pageTitle).to.contains(editShopUrlPage.pageTitleCreate);
+    });
+
+    it('should create shop URL', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'addURL', baseContext);
+
+      const textResult = await editShopUrlPage.setVirtualUrl(page, ShopUrlData);
+      await expect(textResult).to.contains(editShopUrlPage.successfulCreationMessage);
+    });
+
+    it('should enable the main URL for the created url', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'disableSHopURL', baseContext);
+
+      const isActionPerformed = await shopUrlPage.setStatus(page, 2, '5', true);
+
+      if (isActionPerformed) {
+        const resultMessage = await shopUrlPage.getAlertSuccessBlockContent(page);
+        await expect(resultMessage).to.contains(shopUrlPage.successfulUpdateMessage);
+      }
+
+      const carrierStatus = await shopUrlPage.getStatus(page, 1, '6');
+      await expect(carrierStatus).to.be.true;
+    });
+
+    it('should disable the shop URL for the created url', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'disableSHopURL', baseContext);
+
+      const isActionPerformed = await shopUrlPage.setStatus(page, 2, '6', false);
+
+      if (isActionPerformed) {
+        const resultMessage = await shopUrlPage.getAlertSuccessBlockContent(page);
+        await expect(resultMessage).to.contains(shopUrlPage.successUpdateMessage);
+      }
+
+      const status = await shopUrlPage.getStatus(page, 1, '6');
+      await expect(status).to.be.false;
+    });
+
+    it('should enable the main URL for the first url', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'disableSHopURL', baseContext);
+
+      await shopUrlPage.setStatus(page, 1, '5', true);
+
+      const resultMessage = await shopUrlPage.getAlertSuccessBlockContent(page);
+      await expect(resultMessage).to.contains(shopUrlPage.successfulUpdateMessage);
+
+      const mainStatus = await shopUrlPage.getStatus(page, 1, '6');
+      await expect(mainStatus).to.be.true;
+    });
+  });
+
+  // Post-condition : Delete created shop URL
+  describe('POST-TEST: Delete created shop URL', async () => {
+    it('should delete the shop', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'deleteShop', baseContext);
+
+      const textResult = await shopPage.deleteShop(page, 2);
+      await expect(textResult).to.contains(shopPage.successfulDeleteMessage);
+    });
+  });
+
+  // Post-condition : Disable multi store
+  disableMultiStoreTest(baseContext);
+});
diff --git a/tests/UI/commonTests/BO/advancedParameters/multistore.ts b/tests/UI/commonTests/BO/advancedParameters/multistore.ts
new file mode 100644
index 0000000000000..2c6762b8b6526
--- /dev/null
+++ b/tests/UI/commonTests/BO/advancedParameters/multistore.ts
@@ -0,0 +1,104 @@
+// Import utils
+import helper from '@utils/helpers';
+import testContext from '@utils/testContext';
+
+// Import commonTests
+import loginCommon from '@commonTests/BO/loginBO';
+
+// Import BO pages
+import dashboardPage from '@pages/BO/dashboard';
+import generalPage from '@pages/BO/shopParameters/general';
+
+import {expect} from 'chai';
+import type {BrowserContext, Page} from 'playwright';
+
+let browserContext: BrowserContext;
+let page: Page;
+
+/**
+ * Function to enable multistore
+ * @param baseContext {string} String to identify the test
+ */
+function enableMultiStoreTest(baseContext: string = 'commonTests-enableMultiSToreTest'): void {
+  describe('PRE-TEST: Enable multistore', async () => {
+    // before and after functions
+    before(async function () {
+      browserContext = await helper.createBrowserContext(this.browser);
+      page = await helper.newTab(browserContext);
+    });
+
+    after(async () => {
+      await helper.closeBrowserContext(browserContext);
+    });
+
+    it('should login in BO', async function () {
+      await loginCommon.loginBO(this, page);
+    });
+
+    it('should go to \'Shop Parameters > General\' page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToGeneralPage', baseContext);
+
+      await dashboardPage.goToSubMenu(
+        page,
+        dashboardPage.shopParametersParentLink,
+        dashboardPage.shopParametersGeneralLink,
+      );
+      await generalPage.closeSfToolBar(page);
+
+      const pageTitle = await generalPage.getPageTitle(page);
+      await expect(pageTitle).to.contains(generalPage.pageTitle);
+    });
+
+    it('should enable \'Multistore\'', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'enableMultiStore', baseContext);
+
+      const result = await generalPage.setMultiStoreStatus(page, true);
+      await expect(result).to.contains(generalPage.successfulUpdateMessage);
+    });
+  });
+}
+
+/**
+ * Function to disable multistore
+ * @param baseContext {string} String to identify the test
+ */
+function disableMultiStoreTest(baseContext: string = 'commonTests-disableMultiSToreTest'): void {
+  describe('POST-TEST: Disable multistore', async () => {
+    // before and after functions
+    before(async function () {
+      browserContext = await helper.createBrowserContext(this.browser);
+      page = await helper.newTab(browserContext);
+    });
+
+    after(async () => {
+      await helper.closeBrowserContext(browserContext);
+    });
+
+    it('should login in BO', async function () {
+      await loginCommon.loginBO(this, page);
+    });
+
+    it('should go to \'Shop Parameters > General\' page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToGeneralPage', baseContext);
+
+      await dashboardPage.goToSubMenu(
+        page,
+        dashboardPage.shopParametersParentLink,
+        dashboardPage.shopParametersGeneralLink,
+      );
+      await generalPage.closeSfToolBar(page);
+
+      const pageTitle = await generalPage.getPageTitle(page);
+      await expect(pageTitle).to.contains(generalPage.pageTitle);
+    });
+
+    it('should disable \'Multistore\'', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'disableMultiStore', baseContext);
+
+      const result = await generalPage.setMultiStoreStatus(page, false);
+      await expect(result).to.contains(generalPage.successfulUpdateMessage);
+    });
+  });
+}
+
+export {enableMultiStoreTest, disableMultiStoreTest};
diff --git a/tests/UI/pages/BO/advancedParameters/multistore/url/addURL.ts b/tests/UI/pages/BO/advancedParameters/multistore/url/addURL.ts
index 04aa516862a7b..337a84dede763 100644
--- a/tests/UI/pages/BO/advancedParameters/multistore/url/addURL.ts
+++ b/tests/UI/pages/BO/advancedParameters/multistore/url/addURL.ts
@@ -14,8 +14,18 @@ class AddUrl extends BOBasePage {
 
   public readonly pageTitleEdit: string;
 
+  public readonly errorDisableMainURLMessage: string;
+
+  public readonly ErrorDisableShopMessage: string;
+
+  private readonly domainInput: string;
+
   private readonly virtualUrlInput: string;
 
+  private readonly mainURLButton: (status: string) => string;
+
+  private readonly enabledButton: (status: string) => string;
+
   private readonly saveButton: string;
 
   /**
@@ -26,10 +36,16 @@ class AddUrl extends BOBasePage {
     super();
 
     this.pageTitleCreate = 'Add new •';
-    this.pageTitleEdit = 'Edit:';
+    this.pageTitleEdit = 'Multistore > Edit';
+    this.errorDisableMainURLMessage = 'You cannot change a main URL to a non-main URL. You have to set another URL'
+      + ' as your Main URL for the selected shop.';
+    this.ErrorDisableShopMessage = 'You cannot disable the Main URL.';
 
     // Selectors
+    this.domainInput = '#domain';
     this.virtualUrlInput = '#virtual_uri';
+    this.mainURLButton = (status: string) => `#main_${status}`;
+    this.enabledButton = (status: string) => `#active_${status}`;
     this.saveButton = '#shop_url_form_submit_btn_1';
   }
 
@@ -49,6 +65,20 @@ class AddUrl extends BOBasePage {
     await this.clickAndWaitForURL(page, this.saveButton, 'networkidle', 60000);
     return this.getTextContent(page, this.alertSuccessBlock);
   }
+
+  async setMainURL(page: Page, status: string): Promise<string> {
+    await this.setChecked(page, this.mainURLButton(status));
+    await this.clickAndWaitForNavigation(page, this.saveButton);
+
+    return this.getTextContent(page, this.alertBlock);
+  }
+
+  async setShopStatus(page: Page, status: string): Promise<string> {
+    await this.setChecked(page, this.enabledButton(status));
+    await this.clickAndWaitForNavigation(page, this.saveButton);
+
+    return this.getTextContent(page, this.alertBlock);
+  }
 }
 
 export default new AddUrl();
diff --git a/tests/UI/pages/BO/advancedParameters/multistore/url/index.ts b/tests/UI/pages/BO/advancedParameters/multistore/url/index.ts
index 8ed4c32c08d78..43626c037e11c 100644
--- a/tests/UI/pages/BO/advancedParameters/multistore/url/index.ts
+++ b/tests/UI/pages/BO/advancedParameters/multistore/url/index.ts
@@ -38,6 +38,8 @@ class ShopURLSettings extends BOBasePage {
 
   private readonly tableColumnActionsEditLink: (row: number) => string;
 
+  private readonly tableColumnActionsEditButton: (row: number) => string;
+
   private readonly tableColumnActionsToggleButton: (row: number) => string;
 
   private readonly tableColumnActionsDropdownMenu: (row: number) => string;
@@ -117,6 +119,7 @@ class ShopURLSettings extends BOBasePage {
     // Row actions selectors
     this.tableColumnActions = (row: number) => `${this.tableBodyColumn(row)} .btn-group-action`;
     this.tableColumnActionsEditLink = (row: number) => `${this.tableColumnActions(row)} a.edit`;
+    this.tableColumnActionsEditButton = (row: number) => `${this.tableBodyColumn(row)} a.edit`;
     this.tableColumnActionsToggleButton = (row: number) => `${this.tableColumnActions(row)} button.dropdown-toggle`;
     this.tableColumnActionsDropdownMenu = (row: number) => `${this.tableColumnActions(row)} .dropdown-menu`;
     this.tableColumnActionsDeleteLink = (row: number) => `${this.tableColumnActionsDropdownMenu(row)} a.delete`;
@@ -163,6 +166,10 @@ class ShopURLSettings extends BOBasePage {
     await this.clickAndWaitForURL(page, this.addNewUrlButton);
   }
 
+  async goToEditShopURLPage(page: Page, row: number): Promise<void> {
+    await this.clickAndWaitForNavigation(page, this.tableColumnActionsEditButton(row));
+  }
+
   /* Filter methods */
 
   /**

From 8e9f05460cfb2fc88d66d417ba73f7578bf2cd8a Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Tue, 4 Jul 2023 16:30:09 +0200
Subject: [PATCH 0559/1030] Add some fixes

---
 .../10_multistore/07_editUrlOptions.ts        | 29 +++++++++----------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/07_editUrlOptions.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/07_editUrlOptions.ts
index 06c5e70e4b164..a9f7d38ea3153 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/07_editUrlOptions.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/07_editUrlOptions.ts
@@ -25,7 +25,9 @@ const baseContext: string = 'functional_BO_advancedParameters_multistore_editUrl
 Pre-condition:
 - Enable multistore
 Scenario:
-- Disable option "Is it the main URL for this shop?" and Disable the shop
+- Disable option "Is it the main URL for this shop?" and Disable the shop url
+- Create new shop URL
+- Enable option "Is it the main URL for this shop?" and enable the shop url
 Post-condition:
 -Disable multistore
  */
@@ -118,32 +120,27 @@ describe('BO - Advanced Parameters - Multistore : Edit URL options', async () =>
       await expect(textResult).to.contains(editShopUrlPage.successfulCreationMessage);
     });
 
-    it('should enable the main URL for the created url', async function () {
+    it('should disable the shop URL for the created url', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'disableSHopURL', baseContext);
 
-      const isActionPerformed = await shopUrlPage.setStatus(page, 2, '5', true);
+      await shopUrlPage.setStatus(page, 2, '6', false);
 
-      if (isActionPerformed) {
-        const resultMessage = await shopUrlPage.getAlertSuccessBlockContent(page);
-        await expect(resultMessage).to.contains(shopUrlPage.successfulUpdateMessage);
-      }
-
-      const carrierStatus = await shopUrlPage.getStatus(page, 1, '6');
-      await expect(carrierStatus).to.be.true;
+      const resultMessage = await shopUrlPage.getAlertSuccessBlockContent(page);
+      await expect(resultMessage).to.contains(shopUrlPage.successUpdateMessage);
     });
 
-    it('should disable the shop URL for the created url', async function () {
+    it('should enable the main URL for the created url', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'disableSHopURL', baseContext);
 
-      const isActionPerformed = await shopUrlPage.setStatus(page, 2, '6', false);
+      const isActionPerformed = await shopUrlPage.setStatus(page, 2, '5', true);
 
       if (isActionPerformed) {
         const resultMessage = await shopUrlPage.getAlertSuccessBlockContent(page);
-        await expect(resultMessage).to.contains(shopUrlPage.successUpdateMessage);
+        await expect(resultMessage).to.contains(shopUrlPage.successfulUpdateMessage);
       }
 
       const status = await shopUrlPage.getStatus(page, 1, '6');
-      await expect(status).to.be.false;
+      await expect(status).to.be.true;
     });
 
     it('should enable the main URL for the first url', async function () {
@@ -161,10 +158,10 @@ describe('BO - Advanced Parameters - Multistore : Edit URL options', async () =>
 
   // Post-condition : Delete created shop URL
   describe('POST-TEST: Delete created shop URL', async () => {
-    it('should delete the shop', async function () {
+    it('should delete the created shop url', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteShop', baseContext);
 
-      const textResult = await shopPage.deleteShop(page, 2);
+      const textResult = await shopUrlPage.deleteShopURL(page, 2);
       await expect(textResult).to.contains(shopPage.successfulDeleteMessage);
     });
   });

From e7d0e427df7d4982778e3b483e062e245d427b92 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Tue, 4 Jul 2023 16:54:54 +0200
Subject: [PATCH 0560/1030] Add common test to enable/disable multistore

---
 .../10_multistore/01_CRUDShopGroups.ts        | 61 +++-------------
 .../02_filterSortAndPaginationShopGroups.ts   | 65 ++++-------------
 .../10_multistore/03_CRUDShops.ts             | 61 +++-------------
 .../04_filterSortAndPaginationShops.ts        | 72 +++++--------------
 .../05_filterSortAndPaginationShopUrls.ts     | 65 ++++-------------
 .../06_quickEditAndBulkActionsShopUrls.ts     | 69 ++++--------------
 .../multistore/url/index.ts                   |  6 ++
 7 files changed, 80 insertions(+), 319 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/01_CRUDShopGroups.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/01_CRUDShopGroups.ts
index 5f6bc4c5134b4..0841d7e8aa628 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/01_CRUDShopGroups.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/01_CRUDShopGroups.ts
@@ -4,6 +4,7 @@ import testContext from '@utils/testContext';
 
 // Import commonTests
 import loginCommon from '@commonTests/BO/loginBO';
+import {disableMultiStoreTest, enableMultiStoreTest} from '@commonTests/BO/advancedParameters/multistore';
 
 // Import pages
 import dashboardPage from '@pages/BO/dashboard';
@@ -34,6 +35,9 @@ describe('BO - Advanced Parameters - Multistore : Create, Read, Update and Delet
   const updateShopGroupData: ShopGroupData = new ShopGroupData();
   const shopData: ShopData = new ShopData({shopGroup: updateShopGroupData.name, categoryRoot: 'Home'});
 
+  //Pre-condition: Enable multistore
+  enableMultiStoreTest(baseContext);
+
   // before and after functions
   before(async function () {
     browserContext = await helper.createBrowserContext(this.browser);
@@ -44,36 +48,12 @@ describe('BO - Advanced Parameters - Multistore : Create, Read, Update and Delet
     await helper.closeBrowserContext(browserContext);
   });
 
-  it('should login in BO', async function () {
-    await loginCommon.loginBO(this, page);
-  });
-
-  // 1 : Enable multi store
-  describe('Enable \'Multistore\'', async () => {
-    it('should go to \'Shop Parameters > General\' page', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'goToGeneralPage', baseContext);
-
-      await dashboardPage.goToSubMenu(
-        page,
-        dashboardPage.shopParametersParentLink,
-        dashboardPage.shopParametersGeneralLink,
-      );
-      await generalPage.closeSfToolBar(page);
-
-      const pageTitle = await generalPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(generalPage.pageTitle);
-    });
-
-    it('should enable \'Multistore\'', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'enableMultiStore', baseContext);
-
-      const result = await generalPage.setMultiStoreStatus(page, true);
-      await expect(result).to.contains(generalPage.successfulUpdateMessage);
-    });
-  });
-
   // 2 : Create shop group
   describe('Create shop group', async () => {
+    it('should login in BO', async function () {
+      await loginCommon.loginBO(this, page);
+    });
+
     it('should go to \'Advanced Parameters > Multistore\' page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'goToMultiStorePage', baseContext);
 
@@ -244,27 +224,6 @@ describe('BO - Advanced Parameters - Multistore : Create, Read, Update and Delet
     });
   });
 
-  // 7 : Disable multi store
-  describe('Disable \'Multistore\'', async () => {
-    it('should go to \'Shop Parameters > General\' page', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'goToGeneralPage2', baseContext);
-
-      await dashboardPage.goToSubMenu(
-        page,
-        dashboardPage.shopParametersParentLink,
-        dashboardPage.shopParametersGeneralLink,
-      );
-      await generalPage.closeSfToolBar(page);
-
-      const pageTitle = await generalPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(generalPage.pageTitle);
-    });
-
-    it('should disable \'Multistore\'', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'disableMultiStore', baseContext);
-
-      const result = await generalPage.setMultiStoreStatus(page, false);
-      await expect(result).to.contains(generalPage.successfulUpdateMessage);
-    });
-  });
+  // Post-condition : Disable multi store
+  disableMultiStoreTest(baseContext);
 });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/02_filterSortAndPaginationShopGroups.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/02_filterSortAndPaginationShopGroups.ts
index 8d00ac5f6d8a5..385136fb8b99b 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/02_filterSortAndPaginationShopGroups.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/02_filterSortAndPaginationShopGroups.ts
@@ -5,6 +5,7 @@ import testContext from '@utils/testContext';
 
 // Import commonTests
 import loginCommon from '@commonTests/BO/loginBO';
+import {disableMultiStoreTest, enableMultiStoreTest} from '@commonTests/BO/advancedParameters/multistore';
 
 // Import pages
 import dashboardPage from '@pages/BO/dashboard';
@@ -35,6 +36,9 @@ describe('BO - Advanced Parameters - MultiStore : Filter, sort and pagination sh
 
   let numberOfShopGroups: number = 0;
 
+  //Pre-condition: Enable multistore
+  enableMultiStoreTest(baseContext);
+
   // before and after functions
   before(async function () {
     browserContext = await helper.createBrowserContext(this.browser);
@@ -45,36 +49,12 @@ describe('BO - Advanced Parameters - MultiStore : Filter, sort and pagination sh
     await helper.closeBrowserContext(browserContext);
   });
 
-  it('should login in BO', async function () {
-    await loginCommon.loginBO(this, page);
-  });
-
-  // 1 : Enable multi store
-  describe('Enable \'Multistore\'', async () => {
-    it('should go to \'Shop Parameters > General\' page', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'goToGeneralPage', baseContext);
-
-      await dashboardPage.goToSubMenu(
-        page,
-        dashboardPage.shopParametersParentLink,
-        dashboardPage.shopParametersGeneralLink,
-      );
-      await generalPage.closeSfToolBar(page);
-
-      const pageTitle = await generalPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(generalPage.pageTitle);
-    });
-
-    it('should enable \'Multistore\'', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'enableMultiStore', baseContext);
-
-      const result = await generalPage.setMultiStoreStatus(page, true);
-      await expect(result).to.contains(generalPage.successfulUpdateMessage);
-    });
-  });
-
   // 2 : Go to multistore page
   describe('Go to \'Advanced Parameters > Multistore\' page', async () => {
+    it('should login in BO', async function () {
+      await loginCommon.loginBO(this, page);
+    });
+
     it('should go to \'Advanced Parameters > Multistore\' page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'goToMultiStorePage', baseContext);
 
@@ -127,7 +107,7 @@ describe('BO - Advanced Parameters - MultiStore : Filter, sort and pagination sh
     [
       {args: {filterBy: 'id_shop_group', filterValue: '10'}},
       {args: {filterBy: 'a!name', filterValue: 'todelete10'}},
-    ].forEach((test: { args: {filterBy: string, filterValue: string}}, index: number) => {
+    ].forEach((test: { args: { filterBy: string, filterValue: string } }, index: number) => {
       it(`should filter list by ${test.args.filterBy}`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `filterBy_${test.args.filterBy}`, baseContext);
 
@@ -208,7 +188,7 @@ describe('BO - Advanced Parameters - MultiStore : Filter, sort and pagination sh
             testIdentifier: 'sortByIdAsc', sortBy: 'id_shop_group', sortDirection: 'up', isFloat: true,
           },
       },
-    ].forEach((test: {args: {testIdentifier: string, sortBy: string, sortDirection: string, isFloat?: boolean}}) => {
+    ].forEach((test: { args: { testIdentifier: string, sortBy: string, sortDirection: string, isFloat?: boolean } }) => {
       it(`should sort by '${test.args.sortBy}' '${test.args.sortDirection}' and check result`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', test.args.testIdentifier, baseContext);
 
@@ -258,27 +238,6 @@ describe('BO - Advanced Parameters - MultiStore : Filter, sort and pagination sh
     });
   });
 
-  // 8 : Disable multi store
-  describe('Disable \'Multistore\'', async () => {
-    it('should go to \'Shop Parameters > General\' page', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'goToGeneralPage2', baseContext);
-
-      await dashboardPage.goToSubMenu(
-        page,
-        dashboardPage.shopParametersParentLink,
-        dashboardPage.shopParametersGeneralLink,
-      );
-      await generalPage.closeSfToolBar(page);
-
-      const pageTitle = await generalPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(generalPage.pageTitle);
-    });
-
-    it('should disable \'Multistore\'', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'disableMultiStore', baseContext);
-
-      const result = await generalPage.setMultiStoreStatus(page, false);
-      await expect(result).to.contains(generalPage.successfulUpdateMessage);
-    });
-  });
+  // Post-condition : Disable multi store
+  disableMultiStoreTest(baseContext);
 });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/03_CRUDShops.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/03_CRUDShops.ts
index 0e95c8ff9cd37..7d9401f58056b 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/03_CRUDShops.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/03_CRUDShops.ts
@@ -4,6 +4,7 @@ import testContext from '@utils/testContext';
 
 // Import commonTests
 import loginCommon from '@commonTests/BO/loginBO';
+import {disableMultiStoreTest, enableMultiStoreTest} from '@commonTests/BO/advancedParameters/multistore';
 
 // Import pages
 import dashboardPage from '@pages/BO/dashboard';
@@ -31,6 +32,9 @@ describe('BO - Advanced Parameters - Multistore : Create, Read, Update and Delet
   const createShopData: ShopData = new ShopData({shopGroup: 'Default', categoryRoot: 'Home'});
   const updateShopData: ShopData = new ShopData({shopGroup: 'Default', categoryRoot: 'Home'});
 
+  //Pre-condition: Enable multistore
+  enableMultiStoreTest(baseContext);
+
   // before and after functions
   before(async function () {
     browserContext = await helper.createBrowserContext(this.browser);
@@ -41,36 +45,12 @@ describe('BO - Advanced Parameters - Multistore : Create, Read, Update and Delet
     await helper.closeBrowserContext(browserContext);
   });
 
-  it('should login in BO', async function () {
-    await loginCommon.loginBO(this, page);
-  });
-
-  // 1 : Enable multi store
-  describe('Enable \'Multistore\'', async () => {
-    it('should go to \'Shop parameters > General\' page', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'goToGeneralPage', baseContext);
-
-      await dashboardPage.goToSubMenu(
-        page,
-        dashboardPage.shopParametersParentLink,
-        dashboardPage.shopParametersGeneralLink,
-      );
-      await generalPage.closeSfToolBar(page);
-
-      const pageTitle = await generalPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(generalPage.pageTitle);
-    });
-
-    it('should enable \'Multistore\'', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'enableMultiStore', baseContext);
-
-      const result = await generalPage.setMultiStoreStatus(page, true);
-      await expect(result).to.contains(generalPage.successfulUpdateMessage);
-    });
-  });
-
   // 2 : Create shop
   describe('Create shop', async () => {
+    it('should login in BO', async function () {
+      await loginCommon.loginBO(this, page);
+    });
+
     it('should go to \'Advanced Parameters > Multistore\' page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'goToMultiStorePage', baseContext);
 
@@ -179,27 +159,6 @@ describe('BO - Advanced Parameters - Multistore : Create, Read, Update and Delet
     });
   });
 
-  // 5 : Disable multi store
-  describe('Disable \'Multistore\'', async () => {
-    it('should go to \'Shop parameters > General\' page', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'goToGeneralPage2', baseContext);
-
-      await dashboardPage.goToSubMenu(
-        page,
-        dashboardPage.shopParametersParentLink,
-        dashboardPage.shopParametersGeneralLink,
-      );
-      await generalPage.closeSfToolBar(page);
-
-      const pageTitle = await generalPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(generalPage.pageTitle);
-    });
-
-    it('should disable \'Multistore\'', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'disableMultiStore', baseContext);
-
-      const result = await generalPage.setMultiStoreStatus(page, false);
-      await expect(result).to.contains(generalPage.successfulUpdateMessage);
-    });
-  });
+  // Post-condition : Disable multi store
+  disableMultiStoreTest(baseContext);
 });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/04_filterSortAndPaginationShops.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/04_filterSortAndPaginationShops.ts
index 31c07ce44092b..c1d62dc8d5a5d 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/04_filterSortAndPaginationShops.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/04_filterSortAndPaginationShops.ts
@@ -5,6 +5,7 @@ import testContext from '@utils/testContext';
 
 // Import commonTests
 import loginCommon from '@commonTests/BO/loginBO';
+import {disableMultiStoreTest, enableMultiStoreTest} from '@commonTests/BO/advancedParameters/multistore';
 
 // Import pages
 import dashboardPage from '@pages/BO/dashboard';
@@ -35,6 +36,9 @@ describe('BO - Advanced Parameters - Multistore : Filter, sort and pagination sh
   let page: Page;
   const shopCreate: ShopData = new ShopData({name: 'todelete0', shopGroup: 'Default', categoryRoot: 'Home'});
 
+  //Pre-condition: Enable multistore
+  enableMultiStoreTest(baseContext);
+
   // before and after functions
   before(async function () {
     browserContext = await helper.createBrowserContext(this.browser);
@@ -45,36 +49,12 @@ describe('BO - Advanced Parameters - Multistore : Filter, sort and pagination sh
     await helper.closeBrowserContext(browserContext);
   });
 
-  it('should login in BO', async function () {
-    await loginCommon.loginBO(this, page);
-  });
-
-  // 1 : Enable multi store
-  describe('Enable \'Multistore\'', async () => {
-    it('should go to \'Shop Parameters > General\' page', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'goToGeneralPage', baseContext);
-
-      await dashboardPage.goToSubMenu(
-        page,
-        dashboardPage.shopParametersParentLink,
-        dashboardPage.shopParametersGeneralLink,
-      );
-      await generalPage.closeSfToolBar(page);
-
-      const pageTitle = await generalPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(generalPage.pageTitle);
-    });
-
-    it('should enable \'Multistore\'', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'enableMultiStore', baseContext);
-
-      const result = await generalPage.setMultiStoreStatus(page, true);
-      await expect(result).to.contains(generalPage.successfulUpdateMessage);
-    });
-  });
-
   // 2 : Go to multistore page
   describe('Go to \'Multistore\' page and create the first shop', async () => {
+    it('should login in BO', async function () {
+      await loginCommon.loginBO(this, page);
+    });
+
     it('should go to \'Advanced Parameters > Multistore\' page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'goToMultiStorePage', baseContext);
 
@@ -109,7 +89,11 @@ describe('BO - Advanced Parameters - Multistore : Filter, sort and pagination sh
   // 3 : Create 19 shops
   describe('Create 19 shops', async () => {
     Array(19).fill(0, 0, 19).forEach((test: number, index: number) => {
-      const shopCreate: ShopData = new ShopData({name: `Todelete${index + 1}`, shopGroup: 'Default', categoryRoot: 'Home'});
+      const shopCreate: ShopData = new ShopData({
+        name: `Todelete${index + 1}`,
+        shopGroup: 'Default',
+        categoryRoot: 'Home'
+      });
       it('should go to add new shop page', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `goToAddNewShopsPage${index}`, baseContext);
 
@@ -136,7 +120,7 @@ describe('BO - Advanced Parameters - Multistore : Filter, sort and pagination sh
       {args: {filterBy: 'gs!name', filterValue: 'Default'}},
       {args: {filterBy: 'cl!name', filterValue: 'Home'}},
       {args: {filterBy: 'url', filterValue: 'Click here'}},
-    ].forEach((test: {args: {filterBy: string, filterValue: string}}, index: number) => {
+    ].forEach((test: { args: { filterBy: string, filterValue: string } }, index: number) => {
       it(`should filter list by ${test.args.filterBy}`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `filterBy_${test.args.filterBy}`, baseContext);
 
@@ -253,7 +237,7 @@ describe('BO - Advanced Parameters - Multistore : Filter, sort and pagination sh
             testIdentifier: 'sortByIdAsc', sortBy: 'id_shop', sortDirection: 'up', isFloat: true,
           },
       },
-    ].forEach((test: {args: {testIdentifier: string, sortBy: string, sortDirection: string, isFloat?: boolean}}) => {
+    ].forEach((test: { args: { testIdentifier: string, sortBy: string, sortDirection: string, isFloat?: boolean } }) => {
       it(`should sort by '${test.args.sortBy}' '${test.args.sortDirection}' and check result`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', test.args.testIdentifier, baseContext);
 
@@ -300,28 +284,6 @@ describe('BO - Advanced Parameters - Multistore : Filter, sort and pagination sh
     });
   });
 
-  // 8 : Disable multi store
-  describe('Disable \'Multistore\'', async () => {
-    it('should go to \'Shop Parameters > General\' page', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'goToGeneralPage2', baseContext);
-
-      await dashboardPage.goToSubMenu(
-        page,
-        dashboardPage.shopParametersParentLink,
-        dashboardPage.shopParametersGeneralLink,
-      );
-
-      await generalPage.closeSfToolBar(page);
-
-      const pageTitle = await generalPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(generalPage.pageTitle);
-    });
-
-    it('should disable \'Multistore\'', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'disableMultiStore', baseContext);
-
-      const result = await generalPage.setMultiStoreStatus(page, false);
-      await expect(result).to.contains(generalPage.successfulUpdateMessage);
-    });
-  });
+  // Post-condition : Disable multi store
+  disableMultiStoreTest(baseContext);
 });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/05_filterSortAndPaginationShopUrls.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/05_filterSortAndPaginationShopUrls.ts
index 95a38bbd2407e..93471286e3538 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/05_filterSortAndPaginationShopUrls.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/05_filterSortAndPaginationShopUrls.ts
@@ -18,6 +18,7 @@ import ShopData from '@data/faker/shop';
 
 import {expect} from 'chai';
 import type {BrowserContext, Page} from 'playwright';
+import {disableMultiStoreTest, enableMultiStoreTest} from "@commonTests/BO/advancedParameters/multistore";
 
 const baseContext: string = 'functional_BO_advancedParameters_multistore_filterSortAndPaginationShopUrls';
 
@@ -34,6 +35,9 @@ describe('BO - Advanced Parameters - Multistore : Filter, sort and pagination sh
   let browserContext: BrowserContext;
   let page: Page;
 
+  //Pre-condition: Enable multistore
+  enableMultiStoreTest(baseContext);
+
   // before and after functions
   before(async function () {
     browserContext = await helper.createBrowserContext(this.browser);
@@ -44,36 +48,12 @@ describe('BO - Advanced Parameters - Multistore : Filter, sort and pagination sh
     await helper.closeBrowserContext(browserContext);
   });
 
-  it('should login in BO', async function () {
-    await loginCommon.loginBO(this, page);
-  });
-
-  // 1 : Enable multi store
-  describe('Enable \'Multistore\'', async () => {
-    it('should go to \'Shop Parameters > General\' page', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'goToGeneralPage', baseContext);
-
-      await dashboardPage.goToSubMenu(
-        page,
-        dashboardPage.shopParametersParentLink,
-        dashboardPage.shopParametersGeneralLink,
-      );
-      await generalPage.closeSfToolBar(page);
-
-      const pageTitle = await generalPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(generalPage.pageTitle);
-    });
-
-    it('should enable \'Multistore\'', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'enableMultiStore', baseContext);
-
-      const result = await generalPage.setMultiStoreStatus(page, true);
-      await expect(result).to.contains(generalPage.successfulUpdateMessage);
-    });
-  });
-
   // 2 : Go to multistore page
   describe('Go to \'Multistore\' page', async () => {
+    it('should login in BO', async function () {
+      await loginCommon.loginBO(this, page);
+    });
+
     it('should go to \'Advanced Parameters > Multistore\' page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'goToMultiStorePage', baseContext);
 
@@ -132,7 +112,7 @@ describe('BO - Advanced Parameters - Multistore : Filter, sort and pagination sh
       {args: {filterBy: 'main', filterValue: 'Yes', filterType: 'select'}, expected: 'Enabled'},
       {args: {filterBy: 'active', filterValue: 'Yes', filterType: 'select'}, expected: 'Enabled'},
     ].forEach((
-      test: {args:{filterBy: string, filterValue: string, filterType: string}, expected?: string},
+      test: { args: { filterBy: string, filterValue: string, filterType: string }, expected?: string },
       index: number,
     ) => {
       it(`should filter list by ${test.args.filterBy}`, async function () {
@@ -232,7 +212,7 @@ describe('BO - Advanced Parameters - Multistore : Filter, sort and pagination sh
             testIdentifier: 'sortByIdAsc', sortBy: 'id_shop_url', sortDirection: 'up', isFloat: true,
           },
       },
-    ].forEach((test: {args: {testIdentifier: string, sortBy: string, sortDirection: string, isFloat?: boolean}}) => {
+    ].forEach((test: { args: { testIdentifier: string, sortBy: string, sortDirection: string, isFloat?: boolean } }) => {
       it(`should sort by '${test.args.sortBy}' '${test.args.sortDirection}' and check result`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', test.args.testIdentifier, baseContext);
 
@@ -279,27 +259,6 @@ describe('BO - Advanced Parameters - Multistore : Filter, sort and pagination sh
     });
   });
 
-  // 8 : Disable multi store
-  describe('Disable \'Multistore\'', async () => {
-    it('should go to \'Shop Parameters > General\' page', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'goToGeneralPage2', baseContext);
-
-      await dashboardPage.goToSubMenu(
-        page,
-        dashboardPage.shopParametersParentLink,
-        dashboardPage.shopParametersGeneralLink,
-      );
-      await generalPage.closeSfToolBar(page);
-
-      const pageTitle = await generalPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(generalPage.pageTitle);
-    });
-
-    it('should disable \'Multistore\'', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'disableMultiStore', baseContext);
-
-      const result = await generalPage.setMultiStoreStatus(page, false);
-      await expect(result).to.contains(generalPage.successfulUpdateMessage);
-    });
-  });
+  // Post-condition : Disable multi store
+  disableMultiStoreTest(baseContext);
 });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/06_quickEditAndBulkActionsShopUrls.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/06_quickEditAndBulkActionsShopUrls.ts
index af9c6cb3ba7d1..093483be36139 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/06_quickEditAndBulkActionsShopUrls.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/06_quickEditAndBulkActionsShopUrls.ts
@@ -4,6 +4,7 @@ import testContext from '@utils/testContext';
 
 // Import commonTests
 import loginCommon from '@commonTests/BO/loginBO';
+import {disableMultiStoreTest, enableMultiStoreTest} from '@commonTests/BO/advancedParameters/multistore';
 
 // Import pages
 import dashboardPage from '@pages/BO/dashboard';
@@ -32,7 +33,10 @@ describe('BO - Advanced Parameters - Multistore : Quick edit and bulk actions sh
   let browserContext: BrowserContext;
   let page: Page;
   let numberOfShopUrls: number = 0;
-  const ShopUrlData:ShopData = new ShopData({name: 'ToDelete', shopGroup: '', categoryRoot: ''});
+  const ShopUrlData: ShopData = new ShopData({name: 'ToDelete', shopGroup: '', categoryRoot: ''});
+
+  //Pre-condition: Enable multistore
+  enableMultiStoreTest(baseContext);
 
   // before and after functions
   before(async function () {
@@ -44,37 +48,12 @@ describe('BO - Advanced Parameters - Multistore : Quick edit and bulk actions sh
     await helper.closeBrowserContext(browserContext);
   });
 
-  it('should login in BO', async function () {
-    await loginCommon.loginBO(this, page);
-  });
-
-  // 1 : Enable multi store
-  describe('Enable \'Multistore\'', async () => {
-    it('should go to \'Shop Parameters > General\' page', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'goToGeneralPage', baseContext);
-
-      await dashboardPage.goToSubMenu(
-        page,
-        dashboardPage.shopParametersParentLink,
-        dashboardPage.shopParametersGeneralLink,
-      );
-
-      await generalPage.closeSfToolBar(page);
-
-      const pageTitle = await generalPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(generalPage.pageTitle);
-    });
-
-    it('should enable \'Multistore\'', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'enableMultiStore', baseContext);
-
-      const result = await generalPage.setMultiStoreStatus(page, true);
-      await expect(result).to.contains(generalPage.successfulUpdateMessage);
-    });
-  });
-
   // 2 : Go to multistore page
   describe('Go to \'Multistore\' page', async () => {
+    it('should login in BO', async function () {
+      await loginCommon.loginBO(this, page);
+    });
+
     it('should go to \'Advanced parameters > Multistore\' page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'goToMultiStorePage', baseContext);
 
@@ -155,7 +134,7 @@ describe('BO - Advanced Parameters - Multistore : Quick edit and bulk actions sh
           column: '5', columnName: 'Is it the mail URL', action: 'enable', enabledValue: true,
         },
       },
-    ].forEach((test: {args: {column: string, columnName: string, action: string, enabledValue: boolean}}, index: number) => {
+    ].forEach((test: { args: { column: string, columnName: string, action: string, enabledValue: boolean } }, index: number) => {
       it(`should ${test.args.action} the column '${test.args.columnName}'`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.action}_${index}`, baseContext);
 
@@ -216,7 +195,7 @@ describe('BO - Advanced Parameters - Multistore : Quick edit and bulk actions sh
     [
       {args: {status: 'disable', enable: false}},
       {args: {status: 'enable', enable: true}},
-    ].forEach((test: {args: {status: string, enable: boolean}}) => {
+    ].forEach((test: { args: { status: string, enable: boolean } }) => {
       it(`should ${test.args.status} shop url with Bulk Actions and check result`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.status}ShopUrl`, baseContext);
 
@@ -247,28 +226,6 @@ describe('BO - Advanced Parameters - Multistore : Quick edit and bulk actions sh
     });
   });
 
-  // 7 : Disable multi store
-  describe('Disable \'Multistore\'', async () => {
-    it('should go to \'Shop parameters > General\' page', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'goToGeneralPage2', baseContext);
-
-      await dashboardPage.goToSubMenu(
-        page,
-        dashboardPage.shopParametersParentLink,
-        dashboardPage.shopParametersGeneralLink,
-      );
-
-      await generalPage.closeSfToolBar(page);
-
-      const pageTitle = await generalPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(generalPage.pageTitle);
-    });
-
-    it('should disable \'Multistore\'', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'disableMultiStore', baseContext);
-
-      const result = await generalPage.setMultiStoreStatus(page, false);
-      await expect(result).to.contains(generalPage.successfulUpdateMessage);
-    });
-  });
+  // Post-condition : Disable multi store
+  disableMultiStoreTest(baseContext);
 });
diff --git a/tests/UI/pages/BO/advancedParameters/multistore/url/index.ts b/tests/UI/pages/BO/advancedParameters/multistore/url/index.ts
index 43626c037e11c..14d69bf312010 100644
--- a/tests/UI/pages/BO/advancedParameters/multistore/url/index.ts
+++ b/tests/UI/pages/BO/advancedParameters/multistore/url/index.ts
@@ -166,6 +166,12 @@ class ShopURLSettings extends BOBasePage {
     await this.clickAndWaitForURL(page, this.addNewUrlButton);
   }
 
+  /**
+   * Go to edit shop url
+   * @param page {Page} Browser tab
+   * @param row {number} Row number to edit
+   * @returns {Promise<void>}
+   */
   async goToEditShopURLPage(page: Page, row: number): Promise<void> {
     await this.clickAndWaitForNavigation(page, this.tableColumnActionsEditButton(row));
   }

From fb963cf98658fb8807c4f93086fdfee1d3065527 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Tue, 4 Jul 2023 16:59:21 +0200
Subject: [PATCH 0561/1030] Fix lint errors

---
 .../14_advancedParameters/10_multistore/01_CRUDShopGroups.ts   | 1 -
 .../10_multistore/02_filterSortAndPaginationShopGroups.ts      | 1 -
 .../BO/14_advancedParameters/10_multistore/03_CRUDShops.ts     | 1 -
 .../10_multistore/04_filterSortAndPaginationShops.ts           | 3 +--
 .../10_multistore/05_filterSortAndPaginationShopUrls.ts        | 3 +--
 .../10_multistore/06_quickEditAndBulkActionsShopUrls.ts        | 1 -
 6 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/01_CRUDShopGroups.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/01_CRUDShopGroups.ts
index 0841d7e8aa628..d88f52acda13e 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/01_CRUDShopGroups.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/01_CRUDShopGroups.ts
@@ -8,7 +8,6 @@ import {disableMultiStoreTest, enableMultiStoreTest} from '@commonTests/BO/advan
 
 // Import pages
 import dashboardPage from '@pages/BO/dashboard';
-import generalPage from '@pages/BO/shopParameters/general';
 import multiStorePage from '@pages/BO/advancedParameters/multistore';
 import addShopGroupPage from '@pages/BO/advancedParameters/multistore/add';
 import addShopPage from '@pages/BO/advancedParameters/multistore/shop/add';
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/02_filterSortAndPaginationShopGroups.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/02_filterSortAndPaginationShopGroups.ts
index 385136fb8b99b..061c7117b5715 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/02_filterSortAndPaginationShopGroups.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/02_filterSortAndPaginationShopGroups.ts
@@ -9,7 +9,6 @@ import {disableMultiStoreTest, enableMultiStoreTest} from '@commonTests/BO/advan
 
 // Import pages
 import dashboardPage from '@pages/BO/dashboard';
-import generalPage from '@pages/BO/shopParameters/general';
 import multiStorePage from '@pages/BO/advancedParameters/multistore';
 import addShopGroupPage from '@pages/BO/advancedParameters/multistore/add';
 
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/03_CRUDShops.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/03_CRUDShops.ts
index 7d9401f58056b..196f86041e290 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/03_CRUDShops.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/03_CRUDShops.ts
@@ -8,7 +8,6 @@ import {disableMultiStoreTest, enableMultiStoreTest} from '@commonTests/BO/advan
 
 // Import pages
 import dashboardPage from '@pages/BO/dashboard';
-import generalPage from '@pages/BO/shopParameters/general';
 import multiStorePage from '@pages/BO/advancedParameters/multistore';
 import addShopPage from '@pages/BO/advancedParameters/multistore/shop/add';
 import addShopUrlPage from '@pages/BO/advancedParameters/multistore/url/addURL';
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/04_filterSortAndPaginationShops.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/04_filterSortAndPaginationShops.ts
index c1d62dc8d5a5d..47db513dd30c1 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/04_filterSortAndPaginationShops.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/04_filterSortAndPaginationShops.ts
@@ -9,7 +9,6 @@ import {disableMultiStoreTest, enableMultiStoreTest} from '@commonTests/BO/advan
 
 // Import pages
 import dashboardPage from '@pages/BO/dashboard';
-import generalPage from '@pages/BO/shopParameters/general';
 import multiStorePage from '@pages/BO/advancedParameters/multistore';
 import addShopPage from '@pages/BO/advancedParameters/multistore/shop/add';
 import shopPage from '@pages/BO/advancedParameters/multistore/shop';
@@ -92,7 +91,7 @@ describe('BO - Advanced Parameters - Multistore : Filter, sort and pagination sh
       const shopCreate: ShopData = new ShopData({
         name: `Todelete${index + 1}`,
         shopGroup: 'Default',
-        categoryRoot: 'Home'
+        categoryRoot: 'Home',
       });
       it('should go to add new shop page', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `goToAddNewShopsPage${index}`, baseContext);
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/05_filterSortAndPaginationShopUrls.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/05_filterSortAndPaginationShopUrls.ts
index 93471286e3538..edf32237d5314 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/05_filterSortAndPaginationShopUrls.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/05_filterSortAndPaginationShopUrls.ts
@@ -8,7 +8,6 @@ import loginCommon from '@commonTests/BO/loginBO';
 
 // Import pages
 import dashboardPage from '@pages/BO/dashboard';
-import generalPage from '@pages/BO/shopParameters/general';
 import multiStorePage from '@pages/BO/advancedParameters/multistore';
 import addShopUrlPage from '@pages/BO/advancedParameters/multistore/url/addURL';
 import shopUrlPage from '@pages/BO/advancedParameters/multistore/url';
@@ -18,7 +17,7 @@ import ShopData from '@data/faker/shop';
 
 import {expect} from 'chai';
 import type {BrowserContext, Page} from 'playwright';
-import {disableMultiStoreTest, enableMultiStoreTest} from "@commonTests/BO/advancedParameters/multistore";
+import {disableMultiStoreTest, enableMultiStoreTest} from '@commonTests/BO/advancedParameters/multistore';
 
 const baseContext: string = 'functional_BO_advancedParameters_multistore_filterSortAndPaginationShopUrls';
 
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/06_quickEditAndBulkActionsShopUrls.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/06_quickEditAndBulkActionsShopUrls.ts
index 093483be36139..9671a8e1b0175 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/06_quickEditAndBulkActionsShopUrls.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/06_quickEditAndBulkActionsShopUrls.ts
@@ -8,7 +8,6 @@ import {disableMultiStoreTest, enableMultiStoreTest} from '@commonTests/BO/advan
 
 // Import pages
 import dashboardPage from '@pages/BO/dashboard';
-import generalPage from '@pages/BO/shopParameters/general';
 import multiStorePage from '@pages/BO/advancedParameters/multistore';
 import addShopUrlPage from '@pages/BO/advancedParameters/multistore/url/addURL';
 import shopUrlPage from '@pages/BO/advancedParameters/multistore/url';

From d4a92c3e1a67ead82f645adf76f3e6446746a262 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Tue, 4 Jul 2023 17:05:48 +0200
Subject: [PATCH 0562/1030] Add js doc for new methods

---
 .../BO/advancedParameters/multistore/url/addURL.ts   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tests/UI/pages/BO/advancedParameters/multistore/url/addURL.ts b/tests/UI/pages/BO/advancedParameters/multistore/url/addURL.ts
index 337a84dede763..2ea4355d08dae 100644
--- a/tests/UI/pages/BO/advancedParameters/multistore/url/addURL.ts
+++ b/tests/UI/pages/BO/advancedParameters/multistore/url/addURL.ts
@@ -66,6 +66,12 @@ class AddUrl extends BOBasePage {
     return this.getTextContent(page, this.alertSuccessBlock);
   }
 
+  /**
+   * Set main URL
+   * @param page {Page} Browser tab
+   * @param status {string} Main url status
+   * @returns {Promise<string>}
+   */
   async setMainURL(page: Page, status: string): Promise<string> {
     await this.setChecked(page, this.mainURLButton(status));
     await this.clickAndWaitForNavigation(page, this.saveButton);
@@ -73,6 +79,12 @@ class AddUrl extends BOBasePage {
     return this.getTextContent(page, this.alertBlock);
   }
 
+  /**
+   * Set shop url status
+   * @param page {Page} Browser tab
+   * @param status {string} shop url status
+   * @returns {Promise<string>}
+   */
   async setShopStatus(page: Page, status: string): Promise<string> {
     await this.setChecked(page, this.enabledButton(status));
     await this.clickAndWaitForNavigation(page, this.saveButton);

From a9d87703611eda861966defe5112798981ec6b81 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Mon, 17 Jul 2023 10:52:55 +0200
Subject: [PATCH 0563/1030] Fix review

---
 .../10_multistore/01_CRUDShopGroups.ts        |  6 +-
 .../02_filterSortAndPaginationShopGroups.ts   |  6 +-
 .../10_multistore/03_CRUDShops.ts             |  6 +-
 .../04_filterSortAndPaginationShops.ts        |  6 +-
 .../05_filterSortAndPaginationShopUrls.ts     |  8 +--
 .../06_quickEditAndBulkActionsShopUrls.ts     |  8 +--
 .../10_multistore/07_editUrlOptions.ts        |  6 +-
 .../BO/advancedParameters/multistore.ts       | 58 +++----------------
 8 files changed, 31 insertions(+), 73 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/01_CRUDShopGroups.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/01_CRUDShopGroups.ts
index d88f52acda13e..704ad6fe70721 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/01_CRUDShopGroups.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/01_CRUDShopGroups.ts
@@ -4,7 +4,7 @@ import testContext from '@utils/testContext';
 
 // Import commonTests
 import loginCommon from '@commonTests/BO/loginBO';
-import {disableMultiStoreTest, enableMultiStoreTest} from '@commonTests/BO/advancedParameters/multistore';
+import setMultiStoreStatus from '@commonTests/BO/advancedParameters/multistore';
 
 // Import pages
 import dashboardPage from '@pages/BO/dashboard';
@@ -35,7 +35,7 @@ describe('BO - Advanced Parameters - Multistore : Create, Read, Update and Delet
   const shopData: ShopData = new ShopData({shopGroup: updateShopGroupData.name, categoryRoot: 'Home'});
 
   //Pre-condition: Enable multistore
-  enableMultiStoreTest(baseContext);
+  setMultiStoreStatus(true, `${baseContext}_preTest`);
 
   // before and after functions
   before(async function () {
@@ -224,5 +224,5 @@ describe('BO - Advanced Parameters - Multistore : Create, Read, Update and Delet
   });
 
   // Post-condition : Disable multi store
-  disableMultiStoreTest(baseContext);
+  setMultiStoreStatus(false, `${baseContext}_postTest`);
 });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/02_filterSortAndPaginationShopGroups.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/02_filterSortAndPaginationShopGroups.ts
index 061c7117b5715..7c0b9ce9a2647 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/02_filterSortAndPaginationShopGroups.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/02_filterSortAndPaginationShopGroups.ts
@@ -5,7 +5,7 @@ import testContext from '@utils/testContext';
 
 // Import commonTests
 import loginCommon from '@commonTests/BO/loginBO';
-import {disableMultiStoreTest, enableMultiStoreTest} from '@commonTests/BO/advancedParameters/multistore';
+import setMultiStoreStatus from '@commonTests/BO/advancedParameters/multistore';
 
 // Import pages
 import dashboardPage from '@pages/BO/dashboard';
@@ -36,7 +36,7 @@ describe('BO - Advanced Parameters - MultiStore : Filter, sort and pagination sh
   let numberOfShopGroups: number = 0;
 
   //Pre-condition: Enable multistore
-  enableMultiStoreTest(baseContext);
+  setMultiStoreStatus(true, `${baseContext}_preTest`);
 
   // before and after functions
   before(async function () {
@@ -238,5 +238,5 @@ describe('BO - Advanced Parameters - MultiStore : Filter, sort and pagination sh
   });
 
   // Post-condition : Disable multi store
-  disableMultiStoreTest(baseContext);
+  setMultiStoreStatus(false, `${baseContext}_postTest`);
 });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/03_CRUDShops.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/03_CRUDShops.ts
index 196f86041e290..2c62baf76e0c8 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/03_CRUDShops.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/03_CRUDShops.ts
@@ -4,7 +4,7 @@ import testContext from '@utils/testContext';
 
 // Import commonTests
 import loginCommon from '@commonTests/BO/loginBO';
-import {disableMultiStoreTest, enableMultiStoreTest} from '@commonTests/BO/advancedParameters/multistore';
+import setMultiStoreStatus from '@commonTests/BO/advancedParameters/multistore';
 
 // Import pages
 import dashboardPage from '@pages/BO/dashboard';
@@ -32,7 +32,7 @@ describe('BO - Advanced Parameters - Multistore : Create, Read, Update and Delet
   const updateShopData: ShopData = new ShopData({shopGroup: 'Default', categoryRoot: 'Home'});
 
   //Pre-condition: Enable multistore
-  enableMultiStoreTest(baseContext);
+  setMultiStoreStatus(true, `${baseContext}_preTest`);
 
   // before and after functions
   before(async function () {
@@ -159,5 +159,5 @@ describe('BO - Advanced Parameters - Multistore : Create, Read, Update and Delet
   });
 
   // Post-condition : Disable multi store
-  disableMultiStoreTest(baseContext);
+  setMultiStoreStatus(false, `${baseContext}_postTest`);
 });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/04_filterSortAndPaginationShops.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/04_filterSortAndPaginationShops.ts
index 47db513dd30c1..fcaa2cd7b44ca 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/04_filterSortAndPaginationShops.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/04_filterSortAndPaginationShops.ts
@@ -5,7 +5,7 @@ import testContext from '@utils/testContext';
 
 // Import commonTests
 import loginCommon from '@commonTests/BO/loginBO';
-import {disableMultiStoreTest, enableMultiStoreTest} from '@commonTests/BO/advancedParameters/multistore';
+import setMultiStoreStatus from '@commonTests/BO/advancedParameters/multistore';
 
 // Import pages
 import dashboardPage from '@pages/BO/dashboard';
@@ -36,7 +36,7 @@ describe('BO - Advanced Parameters - Multistore : Filter, sort and pagination sh
   const shopCreate: ShopData = new ShopData({name: 'todelete0', shopGroup: 'Default', categoryRoot: 'Home'});
 
   //Pre-condition: Enable multistore
-  enableMultiStoreTest(baseContext);
+  setMultiStoreStatus(true, `${baseContext}_preTest`);
 
   // before and after functions
   before(async function () {
@@ -284,5 +284,5 @@ describe('BO - Advanced Parameters - Multistore : Filter, sort and pagination sh
   });
 
   // Post-condition : Disable multi store
-  disableMultiStoreTest(baseContext);
+  setMultiStoreStatus(false, `${baseContext}_postTest`);
 });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/05_filterSortAndPaginationShopUrls.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/05_filterSortAndPaginationShopUrls.ts
index edf32237d5314..6bff9d0c36ec0 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/05_filterSortAndPaginationShopUrls.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/05_filterSortAndPaginationShopUrls.ts
@@ -5,6 +5,7 @@ import testContext from '@utils/testContext';
 
 // Import commonTests
 import loginCommon from '@commonTests/BO/loginBO';
+import setMultiStoreStatus from '@commonTests/BO/advancedParameters/multistore';
 
 // Import pages
 import dashboardPage from '@pages/BO/dashboard';
@@ -17,7 +18,6 @@ import ShopData from '@data/faker/shop';
 
 import {expect} from 'chai';
 import type {BrowserContext, Page} from 'playwright';
-import {disableMultiStoreTest, enableMultiStoreTest} from '@commonTests/BO/advancedParameters/multistore';
 
 const baseContext: string = 'functional_BO_advancedParameters_multistore_filterSortAndPaginationShopUrls';
 
@@ -34,8 +34,8 @@ describe('BO - Advanced Parameters - Multistore : Filter, sort and pagination sh
   let browserContext: BrowserContext;
   let page: Page;
 
-  //Pre-condition: Enable multistore
-  enableMultiStoreTest(baseContext);
+  // Pre-condition: Enable multistore
+  setMultiStoreStatus(true, `${baseContext}_preTest`);
 
   // before and after functions
   before(async function () {
@@ -259,5 +259,5 @@ describe('BO - Advanced Parameters - Multistore : Filter, sort and pagination sh
   });
 
   // Post-condition : Disable multi store
-  disableMultiStoreTest(baseContext);
+  setMultiStoreStatus(false, `${baseContext}_postTest`);
 });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/06_quickEditAndBulkActionsShopUrls.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/06_quickEditAndBulkActionsShopUrls.ts
index 9671a8e1b0175..83d0e21766e5a 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/06_quickEditAndBulkActionsShopUrls.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/06_quickEditAndBulkActionsShopUrls.ts
@@ -4,7 +4,7 @@ import testContext from '@utils/testContext';
 
 // Import commonTests
 import loginCommon from '@commonTests/BO/loginBO';
-import {disableMultiStoreTest, enableMultiStoreTest} from '@commonTests/BO/advancedParameters/multistore';
+import setMultiStoreStatus from '@commonTests/BO/advancedParameters/multistore';
 
 // Import pages
 import dashboardPage from '@pages/BO/dashboard';
@@ -34,8 +34,8 @@ describe('BO - Advanced Parameters - Multistore : Quick edit and bulk actions sh
   let numberOfShopUrls: number = 0;
   const ShopUrlData: ShopData = new ShopData({name: 'ToDelete', shopGroup: '', categoryRoot: ''});
 
-  //Pre-condition: Enable multistore
-  enableMultiStoreTest(baseContext);
+  // Pre-condition: Enable multistore
+  setMultiStoreStatus(true, `${baseContext}_preTest`);
 
   // before and after functions
   before(async function () {
@@ -226,5 +226,5 @@ describe('BO - Advanced Parameters - Multistore : Quick edit and bulk actions sh
   });
 
   // Post-condition : Disable multi store
-  disableMultiStoreTest(baseContext);
+  setMultiStoreStatus(false, `${baseContext}_postTest`);
 });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/07_editUrlOptions.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/07_editUrlOptions.ts
index a9f7d38ea3153..269c2030086f9 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/07_editUrlOptions.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/07_editUrlOptions.ts
@@ -4,7 +4,7 @@ import testContext from '@utils/testContext';
 
 // Import commonTests
 import loginCommon from '@commonTests/BO/loginBO';
-import {disableMultiStoreTest, enableMultiStoreTest} from '@commonTests/BO/advancedParameters/multistore';
+import setMultiStoreStatus from '@commonTests/BO/advancedParameters/multistore';
 
 // Import pages
 import dashboardPage from '@pages/BO/dashboard';
@@ -37,7 +37,7 @@ describe('BO - Advanced Parameters - Multistore : Edit URL options', async () =>
   const ShopUrlData: ShopData = new ShopData({name: 'polpol', shopGroup: '', categoryRoot: ''});
 
   //Pre-condition: Enable multistore
-  enableMultiStoreTest(baseContext);
+  setMultiStoreStatus(true, `${baseContext}_preTest`);
 
   // before and after functions
   before(async function () {
@@ -167,5 +167,5 @@ describe('BO - Advanced Parameters - Multistore : Edit URL options', async () =>
   });
 
   // Post-condition : Disable multi store
-  disableMultiStoreTest(baseContext);
+  setMultiStoreStatus(false, `${baseContext}_postTest`);
 });
diff --git a/tests/UI/commonTests/BO/advancedParameters/multistore.ts b/tests/UI/commonTests/BO/advancedParameters/multistore.ts
index 2c6762b8b6526..5c1d3b9ff4039 100644
--- a/tests/UI/commonTests/BO/advancedParameters/multistore.ts
+++ b/tests/UI/commonTests/BO/advancedParameters/multistore.ts
@@ -16,11 +16,12 @@ let browserContext: BrowserContext;
 let page: Page;
 
 /**
- * Function to enable multistore
+ * Function to set multistore status
+ * @param status {boolean} Status of the multistore
  * @param baseContext {string} String to identify the test
  */
-function enableMultiStoreTest(baseContext: string = 'commonTests-enableMultiSToreTest'): void {
-  describe('PRE-TEST: Enable multistore', async () => {
+function setMultiStoreStatus(status: boolean, baseContext: string = 'commonTests-setMultiStoreStatus'): void {
+  describe(`${status ? 'Enable' : 'Disable'} the Webservice`, async () => {
     // before and after functions
     before(async function () {
       browserContext = await helper.createBrowserContext(this.browser);
@@ -49,56 +50,13 @@ function enableMultiStoreTest(baseContext: string = 'commonTests-enableMultiSTor
       await expect(pageTitle).to.contains(generalPage.pageTitle);
     });
 
-    it('should enable \'Multistore\'', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'enableMultiStore', baseContext);
+    it(`should ${status ? 'enable' : 'disable'} the webservice`, async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'setMultiStoreStatus', baseContext);
 
-      const result = await generalPage.setMultiStoreStatus(page, true);
+      const result = await generalPage.setMultiStoreStatus(page, status);
       await expect(result).to.contains(generalPage.successfulUpdateMessage);
     });
   });
 }
 
-/**
- * Function to disable multistore
- * @param baseContext {string} String to identify the test
- */
-function disableMultiStoreTest(baseContext: string = 'commonTests-disableMultiSToreTest'): void {
-  describe('POST-TEST: Disable multistore', async () => {
-    // before and after functions
-    before(async function () {
-      browserContext = await helper.createBrowserContext(this.browser);
-      page = await helper.newTab(browserContext);
-    });
-
-    after(async () => {
-      await helper.closeBrowserContext(browserContext);
-    });
-
-    it('should login in BO', async function () {
-      await loginCommon.loginBO(this, page);
-    });
-
-    it('should go to \'Shop Parameters > General\' page', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'goToGeneralPage', baseContext);
-
-      await dashboardPage.goToSubMenu(
-        page,
-        dashboardPage.shopParametersParentLink,
-        dashboardPage.shopParametersGeneralLink,
-      );
-      await generalPage.closeSfToolBar(page);
-
-      const pageTitle = await generalPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(generalPage.pageTitle);
-    });
-
-    it('should disable \'Multistore\'', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'disableMultiStore', baseContext);
-
-      const result = await generalPage.setMultiStoreStatus(page, false);
-      await expect(result).to.contains(generalPage.successfulUpdateMessage);
-    });
-  });
-}
-
-export {enableMultiStoreTest, disableMultiStoreTest};
+export default setMultiStoreStatus;

From 22c4017d9a297d10e4f9f97efe571d04301e7628 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Mon, 17 Jul 2023 10:54:18 +0200
Subject: [PATCH 0564/1030] Add some fixes after rebase

---
 tests/UI/pages/BO/advancedParameters/multistore/url/addURL.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/UI/pages/BO/advancedParameters/multistore/url/addURL.ts b/tests/UI/pages/BO/advancedParameters/multistore/url/addURL.ts
index 2ea4355d08dae..25076c2d37512 100644
--- a/tests/UI/pages/BO/advancedParameters/multistore/url/addURL.ts
+++ b/tests/UI/pages/BO/advancedParameters/multistore/url/addURL.ts
@@ -74,7 +74,7 @@ class AddUrl extends BOBasePage {
    */
   async setMainURL(page: Page, status: string): Promise<string> {
     await this.setChecked(page, this.mainURLButton(status));
-    await this.clickAndWaitForNavigation(page, this.saveButton);
+    await this.clickAndWaitForURL(page, this.saveButton);
 
     return this.getTextContent(page, this.alertBlock);
   }
@@ -87,7 +87,7 @@ class AddUrl extends BOBasePage {
    */
   async setShopStatus(page: Page, status: string): Promise<string> {
     await this.setChecked(page, this.enabledButton(status));
-    await this.clickAndWaitForNavigation(page, this.saveButton);
+    await this.clickAndWaitForURL(page, this.saveButton);
 
     return this.getTextContent(page, this.alertBlock);
   }

From 650118593a48e001cfdc3e49671b9f56b9be5dd9 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Mon, 17 Jul 2023 11:07:19 +0200
Subject: [PATCH 0565/1030] Nightly : 8.0.x : Unskip test for the issue 32914

---
 .../11_international/03_taxes/01_taxes/04_taxOptionsForm.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/04_taxOptionsForm.js b/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/04_taxOptionsForm.js
index e51ab53ad3e67..d4eabe6e12657 100644
--- a/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/04_taxOptionsForm.js
+++ b/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/04_taxOptionsForm.js
@@ -60,12 +60,6 @@ describe('BO - International - Taxes : Edit Tax options with all EcoTax values',
       \tEcotax: '${taxOption.ecoTax}'`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `updateForm${index + 1}`, baseContext);
 
-        // @todo : https://github.com/PrestaShop/PrestaShop/issues/32914
-        if (taxOption.ecoTax === 'FR Taux standard (20%)') {
-          this.skip();
-          return;
-        }
-
         const textResult = await taxesPage.updateTaxOption(page, taxOption);
         await expect(textResult).to.be.equal('Update successful');
       });

From bb934cf2c12506bc87d06261780c276d4d45e280 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Mon, 17 Jul 2023 11:10:40 +0200
Subject: [PATCH 0566/1030] Nightly : 8.1.x : Unskip test for the issue 32914

---
 .../11_international/03_taxes/01_taxes/04_taxOptionsForm.ts | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/04_taxOptionsForm.ts b/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/04_taxOptionsForm.ts
index 0d5bcf76b9358..69e115fbce868 100644
--- a/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/04_taxOptionsForm.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/04_taxOptionsForm.ts
@@ -62,12 +62,6 @@ describe('BO - International - Taxes : Edit Tax options with all EcoTax values',
       \tEcotax: '${taxOption.ecoTax}'`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `updateForm${index + 1}`, baseContext);
 
-        // @todo : https://github.com/PrestaShop/PrestaShop/issues/32914
-        if (taxOption.ecoTax === 'FR Taux standard (20%)') {
-          this.skip();
-          return;
-        }
-
         const textResult = await taxesPage.updateTaxOption(page, taxOption);
         await expect(textResult).to.be.equal('Update successful');
       });

From 091ae79ee68d79eac2516756e9749582230777a2 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Mon, 17 Jul 2023 11:48:52 +0200
Subject: [PATCH 0567/1030] Fix double steps identif

---
 .../14_advancedParameters/10_multistore/07_editUrlOptions.ts  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/07_editUrlOptions.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/07_editUrlOptions.ts
index 269c2030086f9..bcfd6d3892856 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/07_editUrlOptions.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/07_editUrlOptions.ts
@@ -121,7 +121,7 @@ describe('BO - Advanced Parameters - Multistore : Edit URL options', async () =>
     });
 
     it('should disable the shop URL for the created url', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'disableSHopURL', baseContext);
+      await testContext.addContextItem(this, 'testIdentifier', 'disableShopURL', baseContext);
 
       await shopUrlPage.setStatus(page, 2, '6', false);
 
@@ -130,7 +130,7 @@ describe('BO - Advanced Parameters - Multistore : Edit URL options', async () =>
     });
 
     it('should enable the main URL for the created url', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'disableSHopURL', baseContext);
+      await testContext.addContextItem(this, 'testIdentifier', 'enableMainURL', baseContext);
 
       const isActionPerformed = await shopUrlPage.setStatus(page, 2, '5', true);
 

From 1fe76487814984ace9a3a0ac5712e0ac2077d2b8 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Mon, 17 Jul 2023 11:50:01 +0200
Subject: [PATCH 0568/1030] Fix typeScript check

---
 tests/UI/pages/BO/advancedParameters/multistore/url/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/UI/pages/BO/advancedParameters/multistore/url/index.ts b/tests/UI/pages/BO/advancedParameters/multistore/url/index.ts
index 14d69bf312010..0952d60aaa6f4 100644
--- a/tests/UI/pages/BO/advancedParameters/multistore/url/index.ts
+++ b/tests/UI/pages/BO/advancedParameters/multistore/url/index.ts
@@ -173,7 +173,7 @@ class ShopURLSettings extends BOBasePage {
    * @returns {Promise<void>}
    */
   async goToEditShopURLPage(page: Page, row: number): Promise<void> {
-    await this.clickAndWaitForNavigation(page, this.tableColumnActionsEditButton(row));
+    await this.clickAndWaitForURL(page, this.tableColumnActionsEditButton(row));
   }
 
   /* Filter methods */

From 2e2863d0e69369b3e70d9c4fcab4d5b8602cedfd Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Thu, 13 Jul 2023 16:18:23 +0200
Subject: [PATCH 0569/1030] Functional Tests : Faceted search module - Edit
 template - Product brand filter

---
 .../15_editTemplateProductBrandFilter.ts      | 180 ++++++++++++++++++
 .../modules/psFacetedSearch/filterTemplate.ts |  85 +++++++++
 .../pages/BO/modules/psFacetedSearch/index.ts |  59 ++++++
 tests/UI/pages/FO/category/index.ts           |  40 +++-
 tests/UI/pages/FO/home/index.ts               |   2 +-
 5 files changed, 363 insertions(+), 3 deletions(-)
 create mode 100644 tests/UI/campaigns/modules/ps_facetedsearch/02_configuration/15_editTemplateProductBrandFilter.ts
 create mode 100644 tests/UI/pages/BO/modules/psFacetedSearch/filterTemplate.ts
 create mode 100644 tests/UI/pages/BO/modules/psFacetedSearch/index.ts

diff --git a/tests/UI/campaigns/modules/ps_facetedsearch/02_configuration/15_editTemplateProductBrandFilter.ts b/tests/UI/campaigns/modules/ps_facetedsearch/02_configuration/15_editTemplateProductBrandFilter.ts
new file mode 100644
index 0000000000000..3a181999c0df8
--- /dev/null
+++ b/tests/UI/campaigns/modules/ps_facetedsearch/02_configuration/15_editTemplateProductBrandFilter.ts
@@ -0,0 +1,180 @@
+// Import utils
+import files from '@utils/files';
+import helper from '@utils/helpers';
+import testContext from '@utils/testContext';
+
+// Import commonTests
+import loginCommon from '@commonTests/BO/loginBO';
+
+// Import pages
+// Import BO pages
+import dashboardPage from '@pages/BO/dashboard';
+import {moduleManager as moduleManagerPage} from '@pages/BO/modules/moduleManager';
+import psFacetedSearch from '@pages/BO/modules/psFacetedSearch';
+import psFacetedSearchFilterTemplate from '@pages/BO/modules/psFacetedSearch/filterTemplate';
+// Import FO pages
+import categoryPageFO from '@pages/FO/category';
+import {homePage} from '@pages/FO/home';
+
+// Import data
+import Modules from '@data/demo/modules';
+
+import {expect} from 'chai';
+import type {BrowserContext, Page} from 'playwright';
+
+const baseContext: string = 'modules_ps_facetedsearch_configuration_editTemplateProductBrandFilter';
+
+describe('Faceted search module - Edit template - Product brand filter', async () => {
+  let browserContext: BrowserContext;
+  let page: Page;
+
+  // before and after functions
+  before(async function () {
+    browserContext = await helper.createBrowserContext(this.browser);
+    page = await helper.newTab(browserContext);
+  });
+
+  after(async () => {
+    await helper.closeBrowserContext(browserContext);
+    await files.deleteFile('module.zip');
+  });
+
+  it('should login in BO', async function () {
+    await loginCommon.loginBO(this, page);
+  });
+
+  it('should go to \'Modules > Module Manager\' page', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'goToModuleManagerPage', baseContext);
+
+    await dashboardPage.goToSubMenu(
+      page,
+      dashboardPage.modulesParentLink,
+      dashboardPage.moduleManagerLink,
+    );
+    await moduleManagerPage.closeSfToolBar(page);
+
+    const pageTitle = await moduleManagerPage.getPageTitle(page);
+    await expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
+  });
+
+  it(`should search the module ${Modules.psFacetedSearch.name}`, async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'searchModule', baseContext);
+
+    const isModuleVisible = await moduleManagerPage.searchModule(page, Modules.psFacetedSearch);
+    await expect(isModuleVisible).to.be.true;
+  });
+
+  it(`should go to the configuration page of the module '${Modules.psFacetedSearch.name}'`, async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'goToConfigurationPage', baseContext);
+
+    await moduleManagerPage.goToConfigurationPage(page, Modules.psFacetedSearch.tag);
+
+    const pageTitle = await psFacetedSearch.getPageSubtitle(page);
+    await expect(pageTitle).to.eq(psFacetedSearch.pageSubTitle);
+  });
+
+  [
+    {
+      filterStatus: false,
+      filterType: '',
+      expectedHasSearchFilters: false,
+      expectedIsSearchFilterRadio: false,
+      expectedIsSearchFilterDropdown: false,
+      expectedIsSearchFilterCheckbox: false,
+    },
+    {
+      filterStatus: true,
+      filterType: 'radio',
+      expectedHasSearchFilters: true,
+      expectedIsSearchFilterRadio: true,
+      expectedIsSearchFilterDropdown: false,
+      expectedIsSearchFilterCheckbox: false,
+    },
+    {
+      filterStatus: true,
+      filterType: 'dropdown',
+      expectedHasSearchFilters: true,
+      expectedIsSearchFilterRadio: false,
+      expectedIsSearchFilterDropdown: true,
+      expectedIsSearchFilterCheckbox: false,
+    },
+    {
+      filterStatus: true,
+      filterType: 'checkbox',
+      expectedHasSearchFilters: true,
+      expectedIsSearchFilterRadio: false,
+      expectedIsSearchFilterDropdown: false,
+      expectedIsSearchFilterCheckbox: true,
+    },
+  ].forEach((test: {
+    filterStatus: boolean,
+    filterType: string,
+    expectedHasSearchFilters: boolean,
+    expectedIsSearchFilterRadio: boolean,
+    expectedIsSearchFilterDropdown: boolean,
+    expectedIsSearchFilterCheckbox: boolean,
+  }, index: number) => {
+    it('should edit the filter template', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', `editFilterTemplate_${index}`, baseContext);
+
+      await psFacetedSearch.editFilterTemplate(page, 1);
+
+      const pageTitle = await psFacetedSearchFilterTemplate.getPanelTitle(page);
+      await expect(pageTitle).to.eq(psFacetedSearchFilterTemplate.title);
+    });
+
+    it(
+      `should ${test.filterStatus ? 'enable' : 'disable'} the filter "Product brand filter" `
+      + `${test.filterType ? `with filter mode "${test.filterType}"` : ''}`,
+      async function () {
+        await testContext.addContextItem(this, 'testIdentifier', `setProductBrandFilter_${index}`, baseContext);
+
+        const textResult = await psFacetedSearchFilterTemplate.setFilterForm(
+          page,
+          'Product brand filter',
+          test.filterStatus,
+          test.filterType,
+        );
+        await expect(textResult).to.match(/× Your filter "[-A-Za-z0-9\s]+" was updated successfully./);
+      });
+
+    it('should view my shop', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', `viewMyShop_${index}`, baseContext);
+
+      page = await psFacetedSearch.viewMyShop(page);
+
+      const isHomePage = await homePage.isHomePage(page);
+      await expect(isHomePage).to.be.true;
+    });
+
+    it('should check the "All products" page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', `goToAllProductsPage_${index}`, baseContext);
+
+      await homePage.goToAllProductsBlockPage(page, 1);
+
+      const isCategoryPageVisible = await categoryPageFO.isCategoryPage(page);
+      await expect(isCategoryPageVisible).to.be.true;
+
+      const hasSearchFilters = await categoryPageFO.hasSearchFilters(page);
+      await expect(hasSearchFilters).to.be.eq(test.expectedHasSearchFilters);
+
+      const isSearchFilterRadio = await categoryPageFO.isSearchFilterRadio(page);
+      await expect(isSearchFilterRadio).to.be.eq(test.expectedIsSearchFilterRadio);
+
+      const isSearchFilterDropdown = await categoryPageFO.isSearchFilterDropdown(page);
+      await expect(isSearchFilterDropdown).to.be.eq(test.expectedIsSearchFilterDropdown);
+
+      const isSearchFiltersCheckbox = await categoryPageFO.isSearchFiltersCheckbox(page);
+      await expect(isSearchFiltersCheckbox).to.be.eq(test.expectedIsSearchFilterCheckbox);
+    });
+
+    it('should close the page and return to the backOffice', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', `closePageFo_${index}`, baseContext);
+
+      page = await categoryPageFO.closePage(browserContext, page, 0);
+
+      const pageTitle = await psFacetedSearch.getPageSubtitle(page);
+      await expect(pageTitle).to.eq(psFacetedSearch.pageSubTitle);
+    });
+  });
+});
diff --git a/tests/UI/pages/BO/modules/psFacetedSearch/filterTemplate.ts b/tests/UI/pages/BO/modules/psFacetedSearch/filterTemplate.ts
new file mode 100644
index 0000000000000..1cdabb56d7092
--- /dev/null
+++ b/tests/UI/pages/BO/modules/psFacetedSearch/filterTemplate.ts
@@ -0,0 +1,85 @@
+import {ModuleConfiguration} from '@pages/BO/modules/moduleConfiguration';
+
+import type {Page} from 'playwright';
+
+/**
+ * Module configuration page for module : ps_facetedsearch, contains selectors and functions for the page
+ * @class
+ * @extends ModuleConfiguration
+ */
+class PsFacetedSearchFilterTemplate extends ModuleConfiguration {
+  public readonly title: string;
+
+  private readonly panelTitle: string;
+
+  public readonly submitFilter: string;
+
+  /**
+   * @constructs
+   * Setting up titles and selectors to use on ps email subscription page
+   */
+  constructor() {
+    super();
+
+    this.title = 'New filters template';
+
+    // Selectors
+    this.panelTitle = '#content .panel h3';
+    this.submitFilter = '#submit-filter';
+  }
+
+  /* Methods */
+  /**
+   * Returns the panel title
+   * @param page {Page} Browser tab
+   * @returns {Promise<string>}
+   */
+  async getPanelTitle(page: Page): Promise<string> {
+    return this.getTextContent(page, this.panelTitle);
+  }
+
+  /**
+   * Returns the panel title
+   * @param page {Page} Browser tab
+   * @param filterName {string} Filter Name
+   * @param status {boolean} Status
+   * @param filterType {string} Filter Type (checkbox, radio, dropdown)
+   * @returns {Promise<string>}
+   */
+  async setFilterForm(page: Page, filterName: string, status: boolean, filterType: string = ''): Promise<string> {
+    let selectorStatus: string;
+    let selectorFilterType: string;
+
+    switch (filterName) {
+      case 'Product brand filter':
+        selectorStatus = 'layered_selection_manufacturer';
+        break;
+      default:
+        throw new Error(`The filter "${filterName}" has no defined selector.`);
+    }
+    await this.setChecked(page, `#${selectorStatus}`, status);
+
+    if (filterType !== '') {
+      switch (filterType) {
+        case 'checkbox':
+          selectorFilterType = 'Checkbox';
+          break;
+        case 'radio':
+          selectorFilterType = 'Radio button';
+          break;
+        case 'dropdown':
+          selectorFilterType = 'Drop-down list';
+          break;
+        default:
+          throw new Error(`The filter type "${filterType}" has no defined selector.`);
+      }
+      await this.selectByVisibleText(page, `select[name="${selectorStatus}_filter_type"]`, selectorFilterType);
+    }
+
+    await this.clickAndWaitForURL(page, this.submitFilter);
+
+    return this.getAlertSuccessBlockContent(page);
+  }
+}
+
+export default new PsFacetedSearchFilterTemplate();
diff --git a/tests/UI/pages/BO/modules/psFacetedSearch/index.ts b/tests/UI/pages/BO/modules/psFacetedSearch/index.ts
new file mode 100644
index 0000000000000..ae8dd5df6d0ef
--- /dev/null
+++ b/tests/UI/pages/BO/modules/psFacetedSearch/index.ts
@@ -0,0 +1,59 @@
+import {ModuleConfiguration} from '@pages/BO/modules/moduleConfiguration';
+import psFacetedSearchFilterTemplatePage from '@pages/BO/modules/psFacetedSearch/filterTemplate';
+
+import type {Page} from 'playwright';
+
+/**
+ * Module configuration page for module : ps_facetedsearch, contains selectors and functions for the page
+ * @class
+ * @extends ModuleConfiguration
+ */
+class PsFacetedSearch extends ModuleConfiguration {
+  public readonly pageSubTitle: string;
+
+  private readonly gridTable: string;
+
+  private readonly gridTableBody: string;
+
+  private readonly gridTableBodyRows: string;
+
+  private readonly gridTableBodyRow: (row: number) => string;
+
+  private readonly gridTableBodyColumn: (row: number) => string;
+
+  private readonly gridTableColumnActions: (row: number) => string;
+
+  private readonly gridTableColumnActionsEditLink: (row: number) => string;
+
+  /**
+   * @constructs
+   * Setting up titles and selectors to use on ps email subscription page
+   */
+  constructor() {
+    super();
+
+    this.pageSubTitle = 'Faceted search';
+
+    this.gridTable = 'table.table';
+    this.gridTableBody = `${this.gridTable} tbody`;
+    this.gridTableBodyRows = `${this.gridTableBody} tr`;
+    this.gridTableBodyRow = (row: number) => `${this.gridTableBodyRows}:nth-child(${row})`;
+    this.gridTableBodyColumn = (row: number) => `${this.gridTableBodyRow(row)} td`;
+    this.gridTableColumnActions = (row: number) => `${this.gridTableBodyColumn(row)} .btn-group-action`;
+    this.gridTableColumnActionsEditLink = (row: number) => `${this.gridTableColumnActions(row)} a.btn`;
+  }
+
+  /* Methods */
+  /**
+   *
+   * @param page {Page} Browser tab
+   * @param row {number} Row number
+   * @returns {Promise<number>}
+   */
+  async editFilterTemplate(page: Page, row: number): Promise<void> {
+    await this.clickAndWaitForLoadState(page, this.gridTableColumnActionsEditLink(row));
+    await this.elementVisible(page, psFacetedSearchFilterTemplatePage.submitFilter);
+  }
+}
+
+export default new PsFacetedSearch();
diff --git a/tests/UI/pages/FO/category/index.ts b/tests/UI/pages/FO/category/index.ts
index 005473f48fbe9..458a922dc835e 100644
--- a/tests/UI/pages/FO/category/index.ts
+++ b/tests/UI/pages/FO/category/index.ts
@@ -65,6 +65,12 @@ class Category extends FOBasePage {
 
   private readonly searchFilters: string;
 
+  private readonly searchFiltersCheckbox: string;
+
+  private readonly searchFiltersRadio: string;
+
+  private readonly searchFiltersDropdown: string;
+
   /**
    * @constructs
    * Setting up texts and selectors to use on category page
@@ -111,7 +117,10 @@ class Category extends FOBasePage {
     this.categoryDescription = '#category-description';
 
     // Filter
-    this.searchFilters = '#search_filters_wrapper';
+    this.searchFilters = '#search_filters';
+    this.searchFiltersCheckbox = `${this.searchFilters} ul[id^="facet"] label.facet-label input[type="checkbox"]`;
+    this.searchFiltersRadio = `${this.searchFilters} ul[id^="facet"] label.facet-label input[type="radio"]`;
+    this.searchFiltersDropdown = `${this.searchFilters} ul[id^="facet"] .facet-dropdown`;
   }
 
   /* Methods */
@@ -352,7 +361,34 @@ class Category extends FOBasePage {
    * @return {Promise<boolean>}
    */
   async hasSearchFilters(page: Page): Promise<boolean> {
-    return this.elementVisible(page, this.searchFilters);
+    return page.$$eval(this.searchFilters, (all) => all.length !== 0);
+  }
+
+  /**
+   * Return if search filters use checkbox button
+   * @param page {Page} Browser tab
+   * @return {Promise<boolean>}
+   */
+  async isSearchFiltersCheckbox(page: Page): Promise<boolean> {
+    return page.$$eval(this.searchFiltersCheckbox, (all) => all.length !== 0);
+  }
+
+  /**
+   * Return if search filters use radio button
+   * @param page {Page} Browser tab
+   * @return {Promise<boolean>}
+   */
+  async isSearchFilterRadio(page: Page): Promise<boolean> {
+    return page.$$eval(this.searchFiltersRadio, (all) => all.length !== 0);
+  }
+
+  /**
+   * Return if search filters use radio button
+   * @param page {Page} Browser tab
+   * @return {Promise<boolean>}
+   */
+  async isSearchFilterDropdown(page: Page): Promise<boolean> {
+    return page.$$eval(this.searchFiltersDropdown, (all) => all.length !== 0);
   }
 }
 
diff --git a/tests/UI/pages/FO/home/index.ts b/tests/UI/pages/FO/home/index.ts
index b91f76070d13d..963d7ade19be4 100644
--- a/tests/UI/pages/FO/home/index.ts
+++ b/tests/UI/pages/FO/home/index.ts
@@ -467,7 +467,7 @@ class HomePage extends FOBasePage {
    * @param page {Page} Browser tab
    * @returns {Promise<boolean>}
    */
-  isQuickViewProductModalVisible(page: Page): Promise<boolean> {
+  async isQuickViewProductModalVisible(page: Page): Promise<boolean> {
     return this.elementVisible(page, this.quickViewModalDiv, 2000);
   }
 

From ac5e420b0798c83a886d0fad916a6657047ff320 Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Mon, 17 Jul 2023 10:37:03 +0200
Subject: [PATCH 0570/1030] Add file headers and bump some dependencies

---
 composer.lock                                 | 58 +++++++++----------
 .../Product/Combination/not_found.html.twig   |  4 +-
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/composer.lock b/composer.lock
index b4100e0ff57b8..b03b9d973aa50 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4803,16 +4803,16 @@
         },
         {
             "name": "prestashop/dashtrends",
-            "version": "v2.1.1",
+            "version": "v2.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PrestaShop/dashtrends.git",
-                "reference": "c0ffb850abf1896ae8650522c8c8f4cff1c1dd80"
+                "reference": "e2cbdb088241a17118a8c4424b468a36216f8316"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PrestaShop/dashtrends/zipball/c0ffb850abf1896ae8650522c8c8f4cff1c1dd80",
-                "reference": "c0ffb850abf1896ae8650522c8c8f4cff1c1dd80",
+                "url": "https://api.github.com/repos/PrestaShop/dashtrends/zipball/e2cbdb088241a17118a8c4424b468a36216f8316",
+                "reference": "e2cbdb088241a17118a8c4424b468a36216f8316",
                 "shasum": ""
             },
             "require": {
@@ -4840,9 +4840,9 @@
             "description": "PrestaShop module dashtrends",
             "homepage": "https://github.com/PrestaShop/dashtrends",
             "support": {
-                "source": "https://github.com/PrestaShop/dashtrends/tree/v2.1.1"
+                "source": "https://github.com/PrestaShop/dashtrends/tree/v2.1.2"
             },
-            "time": "2023-03-24T13:19:08+00:00"
+            "time": "2023-06-19T13:25:37+00:00"
         },
         {
             "name": "prestashop/decimal",
@@ -4975,16 +4975,16 @@
         },
         {
             "name": "prestashop/gsitemap",
-            "version": "v4.2.1",
+            "version": "v4.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PrestaShop/gsitemap.git",
-                "reference": "5d7c4bf591fcbbd3ac66e15bd9805b78abb47694"
+                "reference": "06763bb45c7643c92726cb3e43783183b37c3506"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PrestaShop/gsitemap/zipball/5d7c4bf591fcbbd3ac66e15bd9805b78abb47694",
-                "reference": "5d7c4bf591fcbbd3ac66e15bd9805b78abb47694",
+                "url": "https://api.github.com/repos/PrestaShop/gsitemap/zipball/06763bb45c7643c92726cb3e43783183b37c3506",
+                "reference": "06763bb45c7643c92726cb3e43783183b37c3506",
                 "shasum": ""
             },
             "require": {
@@ -5012,9 +5012,9 @@
             "description": "PrestaShop module gsitemap",
             "homepage": "https://github.com/PrestaShop/gsitemap",
             "support": {
-                "source": "https://github.com/PrestaShop/gsitemap/tree/v4.2.1"
+                "source": "https://github.com/PrestaShop/gsitemap/tree/v4.3.0"
             },
-            "time": "2023-01-10T10:10:23+00:00"
+            "time": "2023-04-05T13:04:34+00:00"
         },
         {
             "name": "prestashop/laminas-code-lts",
@@ -5022,12 +5022,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/PrestaShop/laminas-code-lts.git",
-                "reference": "3dbe7f7f48a5d877e02cc70e4f58cb0e1e5cca82"
+                "reference": "c22c7aee2092bcec532b910a1f4dbac0ce6a3bbf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PrestaShop/laminas-code-lts/zipball/3dbe7f7f48a5d877e02cc70e4f58cb0e1e5cca82",
-                "reference": "3dbe7f7f48a5d877e02cc70e4f58cb0e1e5cca82",
+                "url": "https://api.github.com/repos/PrestaShop/laminas-code-lts/zipball/c22c7aee2092bcec532b910a1f4dbac0ce6a3bbf",
+                "reference": "c22c7aee2092bcec532b910a1f4dbac0ce6a3bbf",
                 "shasum": ""
             },
             "require": {
@@ -5084,7 +5084,7 @@
                 "rss": "https://github.com/laminas/laminas-code/releases.atom",
                 "source": "https://github.com/laminas/laminas-code"
             },
-            "time": "2022-05-03T11:51:53+00:00"
+            "time": "2023-06-13T07:18:53+00:00"
         },
         {
             "name": "prestashop/pagesnotfound",
@@ -6065,23 +6065,23 @@
         },
         {
             "name": "prestashop/ps_imageslider",
-            "version": "v3.1.2",
+            "version": "v3.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PrestaShop/ps_imageslider.git",
-                "reference": "c5980fe4e99ba6aa5139b4e0755540be42c52b88"
+                "reference": "36f848c1943f84f1dc0c41813f07c0e9b70ae8b0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PrestaShop/ps_imageslider/zipball/c5980fe4e99ba6aa5139b4e0755540be42c52b88",
-                "reference": "c5980fe4e99ba6aa5139b4e0755540be42c52b88",
+                "url": "https://api.github.com/repos/PrestaShop/ps_imageslider/zipball/36f848c1943f84f1dc0c41813f07c0e9b70ae8b0",
+                "reference": "36f848c1943f84f1dc0c41813f07c0e9b70ae8b0",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.4.0"
             },
             "require-dev": {
-                "prestashop/php-dev-tools": "^3.4"
+                "prestashop/php-dev-tools": "^4.3"
             },
             "type": "prestashop-module",
             "autoload": {
@@ -6102,9 +6102,9 @@
             "description": "PrestaShop - Image slider",
             "homepage": "https://github.com/PrestaShop/ps_imageslider",
             "support": {
-                "source": "https://github.com/PrestaShop/ps_imageslider/tree/v3.1.2"
+                "source": "https://github.com/PrestaShop/ps_imageslider/tree/v3.1.3"
             },
-            "time": "2023-03-15T17:45:19+00:00"
+            "time": "2023-06-08T12:48:16+00:00"
         },
         {
             "name": "prestashop/ps_languageselector",
@@ -6516,16 +6516,16 @@
         },
         {
             "name": "prestashop/ps_themecusto",
-            "version": "v1.2.2",
+            "version": "v1.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PrestaShop/ps_themecusto.git",
-                "reference": "e421bfdc27f247c2e6361dd5eb8983e806f52459"
+                "reference": "cfea8fa485c61a05755eadb5f9764f12e666f2a8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PrestaShop/ps_themecusto/zipball/e421bfdc27f247c2e6361dd5eb8983e806f52459",
-                "reference": "e421bfdc27f247c2e6361dd5eb8983e806f52459",
+                "url": "https://api.github.com/repos/PrestaShop/ps_themecusto/zipball/cfea8fa485c61a05755eadb5f9764f12e666f2a8",
+                "reference": "cfea8fa485c61a05755eadb5f9764f12e666f2a8",
                 "shasum": ""
             },
             "require": {
@@ -6555,9 +6555,9 @@
             "description": "PrestaShop module ps_themecusto",
             "homepage": "https://github.com/PrestaShop/ps_themecusto",
             "support": {
-                "source": "https://github.com/PrestaShop/ps_themecusto/tree/v1.2.2"
+                "source": "https://github.com/PrestaShop/ps_themecusto/tree/v1.2.3"
             },
-            "time": "2023-03-08T22:14:35+00:00"
+            "time": "2023-05-11T14:00:59+00:00"
         },
         {
             "name": "prestashop/ps_viewedproduct",
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Product/Combination/not_found.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Product/Combination/not_found.html.twig
index b6bc25eb06545..9c5bacee715ee 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Product/Combination/not_found.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Product/Combination/not_found.html.twig
@@ -1,4 +1,4 @@
-{# **
+{#**
  * Copyright since 2007 PrestaShop SA and Contributors
  * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
  *
@@ -21,7 +21,7 @@
  * @author    PrestaShop SA and Contributors <contact@prestashop.com>
  * @copyright Since 2007 PrestaShop SA and Contributors
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- * #}
+ *#}
 {% extends '@PrestaShop/base.html.twig' %}
 {% block stylesheets %}
   <link rel="stylesheet" href="{{ asset('themes/new-theme/public/theme' ~ rtl_suffix ~ '.css') }}"/>

From 580e1ed0850cd2f31dd2bda92470a8f72f07a975 Mon Sep 17 00:00:00 2001
From: lartist <salim-benouamer.ext@prestashop.com>
Date: Tue, 18 Jul 2023 06:36:35 +0200
Subject: [PATCH 0571/1030] Missing variables adding

---
 admin-dev/themes/new-theme/template/layout.tpl            | 3 +++
 .../views/Admin/Component/Layout/search_form.html.twig    | 6 +++---
 .../Resources/views/Admin/Layout/search_form.html.twig    | 2 ++
 src/PrestaShopBundle/Twig/Component/SearchForm.php        | 8 ++++++++
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/admin-dev/themes/new-theme/template/layout.tpl b/admin-dev/themes/new-theme/template/layout.tpl
index e5e4fb11aff56..80765d54a10c7 100644
--- a/admin-dev/themes/new-theme/template/layout.tpl
+++ b/admin-dev/themes/new-theme/template/layout.tpl
@@ -34,11 +34,14 @@
       <div class="component component-search" id="header-search-container">
         <div class="component-search-body">
           <div class="component-search-top">
+
               {render_template
                 smarty_template="components/layout/search_form.tpl"
                 twig_template="@PrestaShop/Admin/Layout/search_form.html.twig"
                 bo_query=$bo_query
                 link=$link
+                show_clear_btn= $show_clear_btn|default:null
+                search_type= $search_type|default:null
               }
             <button class="component-search-cancel d-none">{l|escape s='Cancel' d='Admin.Actions'}</button>
           </div>
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/search_form.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/search_form.html.twig
index 2af5ead286a98..b54ce34edccf0 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/search_form.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/search_form.html.twig
@@ -28,7 +28,7 @@
       action="{{ link.getAdminLink('AdminSearch') }}"
       role="search">
   <input type="hidden" name="bo_search_type" id="bo_search_type" class="js-search-type" />
-  {% if show_clear_btn is defined and show_clear_btn %}
+  {% if showClearBtn is defined and showClearBtn %}
     <a href="#" class="clear_search hide"><i class="icon-remove"></i></a>
   {% endif %}
   <div class="input-group">
@@ -55,8 +55,8 @@
 
 <script type="text/javascript">
   $(function(){
-    {% if search_type is defined and search_type %}
-      $('.search-option a[data-value=' + {{ search_type ? 1 : 0 }} + ']').click();
+    {% if searchType is defined and searchType %}
+      $('.search-option a[data-value=' + {{ searchType ? 1 : 0 }} + ']').click();
     {% endif %}
       $('#bo_query').one('click', function() {
         $(this).closest('form').removeClass('collapsed');
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/search_form.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/search_form.html.twig
index 5a078da4243ba..383527d049c53 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Layout/search_form.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/search_form.html.twig
@@ -25,4 +25,6 @@
 {{ component('SearchForm', {
   boQuery: bo_query,
   link: link,
+  showClearBtn: show_clear_btn,
+  searchType: search_type
 }) }}
diff --git a/src/PrestaShopBundle/Twig/Component/SearchForm.php b/src/PrestaShopBundle/Twig/Component/SearchForm.php
index 6194a535c2ae3..8067192e72d6e 100644
--- a/src/PrestaShopBundle/Twig/Component/SearchForm.php
+++ b/src/PrestaShopBundle/Twig/Component/SearchForm.php
@@ -36,4 +36,12 @@ class SearchForm
 {
     public string $boQuery;
     public Link $link;
+    public bool $showClearBtn;
+    public bool $searchType;
+
+    public function mount(bool $showClearBtn = null, bool $searchType = null): void
+    {
+        $this->showClearBtn = $showClearBtn ?? false;
+        $this->searchType = $searchType ?? false;
+    }
 }

From 65476bb097a2e199644cfe51f2797f3669434577 Mon Sep 17 00:00:00 2001
From: lartist <salim-benouamer.ext@prestashop.com>
Date: Tue, 11 Jul 2023 16:53:39 +0200
Subject: [PATCH 0572/1030] Flash messages Bridge from legacy to Symfony

---
 classes/controller/AdminController.php        | 17 +++++
 .../Bridge/Helper/AddFlashMessage.php         | 74 +++++++++++++++++++
 .../bundle/bridge/_admin_controller.yml       |  3 +
 3 files changed, 94 insertions(+)
 create mode 100644 src/PrestaShopBundle/Bridge/Helper/AddFlashMessage.php

diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index a87ddf087aa9a..93a24f6630760 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -29,12 +29,15 @@
 use PrestaShop\PrestaShop\Core\Action\ActionsBarButtonsCollection;
 use PrestaShop\PrestaShop\Core\Exception\TypeException;
 use PrestaShop\PrestaShop\Core\Feature\TokenInUrls;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagStateCheckerInterface;
 use PrestaShop\PrestaShop\Core\Localization\Locale;
 use PrestaShop\PrestaShop\Core\Localization\Specification\Number as NumberSpecification;
 use PrestaShop\PrestaShop\Core\Localization\Specification\Price as PriceSpecification;
 use PrestaShop\PrestaShop\Core\Security\Permission;
 use PrestaShop\PrestaShop\Core\Util\ColorBrightnessCalculator;
 use PrestaShop\PrestaShop\Core\Util\Url\UrlCleaner;
+use PrestaShopBundle\Bridge\Helper\AddFlashMessage;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Routing\Exception\RouteNotFoundException;
 
@@ -1931,6 +1934,20 @@ public function display()
             if (!is_array($this->$type)) {
                 $this->$type = (array) $this->$type;
             }
+
+            if (
+                SymfonyContainer::getInstance()
+                    ?->get(FeatureFlagStateCheckerInterface::class)
+                    ->isEnabled(FeatureFlagSettings::FEATURE_FLAG_SYMFONY_LAYOUT)
+            ) {
+                /** @var AddFlashMessage $addFlashMessage */
+                $addFlashMessage = SymfonyContainer::getInstance()->get(AddFlashMessage::class);
+                foreach ($this->$type as $message) {
+                    $addFlashMessage->addMessage($type, $message);
+                }
+                $this->$type = [];
+            }
+
             $this->context->smarty->assign($type, $this->json ? json_encode(array_unique($this->$type)) : array_unique($this->$type));
         }
 
diff --git a/src/PrestaShopBundle/Bridge/Helper/AddFlashMessage.php b/src/PrestaShopBundle/Bridge/Helper/AddFlashMessage.php
new file mode 100644
index 0000000000000..4dfee3d1cc4d2
--- /dev/null
+++ b/src/PrestaShopBundle/Bridge/Helper/AddFlashMessage.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+declare(strict_types=1);
+
+namespace PrestaShopBundle\Bridge\Helper;
+
+use Symfony\Component\HttpFoundation\Exception\SessionNotFoundException;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Session\Session;
+use Symfony\Component\HttpFoundation\Session\SessionInterface;
+
+class AddFlashMessage
+{
+    private const TYPES = [
+        'errors' => 'error',
+        'warnings' => 'warning',
+        'informations' => 'info',
+        'confirmations' => 'success',
+    ];
+
+    public function __construct(private readonly RequestStack $requestStack)
+    {
+    }
+
+    public function addMessage(string $type, string $message): void
+    {
+        $type = self::TYPES[$type] ?? $type;
+
+        try {
+            $session = $this->requestStack->getCurrentRequest()->getSession();
+
+            if (!$session instanceof Session) {
+                throw new \LogicException(sprintf(
+                    'You can use the flashbag only with the %s implementation of %s',
+                    Session::class,
+                    SessionInterface::class
+                ));
+            }
+
+            $flashBag = $session->getFlashBag();
+
+            //This condition is to avoid duplicate messages
+            $messages = $flashBag->peekAll()[$type] ?? [];
+            if (!in_array($message, $messages, true)) {
+                $flashBag->add($type, $message);
+            }
+        } catch (SessionNotFoundException $e) {
+            throw new \LogicException('You cannot use the addFlash method if sessions are disabled. Enable them in "config/packages/framework.yaml".', 0, $e);
+        }
+    }
+}
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/bridge/_admin_controller.yml b/src/PrestaShopBundle/Resources/config/services/bundle/bridge/_admin_controller.yml
index ec7e5c9c87fa5..1a6e59453441f 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/bridge/_admin_controller.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/bridge/_admin_controller.yml
@@ -22,3 +22,6 @@ services:
     arguments:
       - '@prestashop.adapter.legacy.context'
       - '@prestashop.core.localization.locale.repository'
+
+  PrestaShopBundle\Bridge\Helper\AddFlashMessage:
+    autowire: true

From f7baee3053831855865e58c8161ea123ed964338 Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Fri, 14 Jul 2023 19:56:35 +0200
Subject: [PATCH 0573/1030] Remove deprecated methods in Cart class

---
 classes/Cart.php | 98 +++---------------------------------------------
 1 file changed, 6 insertions(+), 92 deletions(-)

diff --git a/classes/Cart.php b/classes/Cart.php
index c98bfb3cb0468..d669edff38338 100644
--- a/classes/Cart.php
+++ b/classes/Cart.php
@@ -1421,36 +1421,6 @@ public function getProductQuantity($idProduct, $idProductAttribute = 0, $idCusto
         return Db::getInstance()->getRow($parentSql);
     }
 
-    /**
-     * Check if the Cart contains the given Product (Attribute).
-     *
-     * @deprecated 1.7.3.1
-     * @see Cart::getProductQuantity()
-     *
-     * @param int $id_product Product ID
-     * @param int $id_product_attribute ProductAttribute ID
-     * @param int $id_customization Customization ID
-     * @param int $id_address_delivery Delivery Address ID
-     *
-     * @return array|bool Whether the Cart contains the Product
-     *                    Result comes directly from the database
-     */
-    public function containsProduct($id_product, $id_product_attribute = 0, $id_customization = 0, $id_address_delivery = 0)
-    {
-        $result = $this->getProductQuantity(
-            $id_product,
-            $id_product_attribute,
-            $id_customization,
-            $id_address_delivery
-        );
-
-        if (empty($result['quantity'])) {
-            return false;
-        }
-
-        return ['quantity' => $result['quantity']];
-    }
-
     /**
      * Update Product quantity.
      *
@@ -3099,74 +3069,14 @@ public function carrierIsSelected($id_carrier, $id_address)
         return true;
     }
 
-    /**
-     * Get all deliveries options available for the current cart formatted like Carriers::getCarriersForOrder
-     * This method was wrote for retrocompatibility with 1.4 theme
-     * New theme need to use Cart::getDeliveryOptionList() to generate carriers option in the checkout process.
-     *
-     * @since 1.5.0
-     * @deprecated 1.7.0
-     *
-     * @param Country $default_country Default Country
-     * @param bool $flush Force flushing cache
-     *
-     * @return array
-     */
-    public function simulateCarriersOutput(Country $default_country = null, $flush = false)
-    {
-        $delivery_option_list = $this->getDeliveryOptionList($default_country, $flush);
-
-        // This method cannot work if there is multiple address delivery
-        if (count($delivery_option_list) > 1 || empty($delivery_option_list)) {
-            return [];
-        }
-
-        $carriers = [];
-        foreach (reset($delivery_option_list) as $key => $option) {
-            $price = $option['total_price_with_tax'];
-            $price_tax_exc = $option['total_price_without_tax'];
-            $name = $img = $delay = '';
-
-            if ($option['unique_carrier']) {
-                $carrier = reset($option['carrier_list']);
-                if (isset($carrier['instance'])) {
-                    $name = $carrier['instance']->name;
-                    $delay = $carrier['instance']->delay;
-                    $delay = isset($delay[Context::getContext()->language->id]) ?
-                        $delay[Context::getContext()->language->id] : $delay[(int) Configuration::get('PS_LANG_DEFAULT')];
-                }
-                if (isset($carrier['logo'])) {
-                    $img = $carrier['logo'];
-                }
-            } else {
-                $nameList = [];
-                foreach ($option['carrier_list'] as $carrier) {
-                    $nameList[] = $carrier['instance']->name;
-                }
-                $name = implode(' -', $nameList);
-                $img = ''; // No images if multiple carriers
-                $delay = '';
-            }
-            $carriers[] = [
-                'name' => $name,
-                'img' => $img,
-                'delay' => $delay,
-                'price' => $price,
-                'price_tax_exc' => $price_tax_exc,
-                'id_carrier' => Cart::intifier($key), // Need to translate to an integer for retrocompatibility reason, in 1.4 template we used intval
-                'is_module' => false,
-            ];
-        }
-
-        return $carriers;
-    }
-
     /**
      * Simulate output of selected Carrier.
      *
      * @param bool $use_cache Use cache
      *
      * @return int Intified Cart output
+     *
+     * @deprecated Since 9.0 and will be removed in 10.0
      */
     public function simulateCarrierSelectedOutput($use_cache = true)
     {
@@ -3187,6 +3097,8 @@ public function simulateCarrierSelectedOutput($use_cache = true)
      * The size of this sequence is fixed by the first digit of the return
      *
      * @return string Intified value
+     *
+     * @deprecated Since 9.0 and will be removed in 10.0
      */
     public static function intifier($string, $delimiter = ',')
     {
@@ -3198,6 +3110,8 @@ public static function intifier($string, $delimiter = ',')
 
     /**
      * Translate an int option_delivery identifier (3240002000) in a string ('24,3,').
+     *
+     * @deprecated Since 9.0 and will be removed in 10.0
      */
     public static function desintifier($int, $delimiter = ',')
     {

From 1a480dcdaca5ca771f753c6930e9075ba9275c7f Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Tue, 18 Jul 2023 15:04:39 +0200
Subject: [PATCH 0574/1030] Fix error in edit url options test

---
 tests/UI/pages/BO/advancedParameters/multistore/url/addURL.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/UI/pages/BO/advancedParameters/multistore/url/addURL.ts b/tests/UI/pages/BO/advancedParameters/multistore/url/addURL.ts
index 25076c2d37512..1bfb42c9951af 100644
--- a/tests/UI/pages/BO/advancedParameters/multistore/url/addURL.ts
+++ b/tests/UI/pages/BO/advancedParameters/multistore/url/addURL.ts
@@ -87,7 +87,7 @@ class AddUrl extends BOBasePage {
    */
   async setShopStatus(page: Page, status: string): Promise<string> {
     await this.setChecked(page, this.enabledButton(status));
-    await this.clickAndWaitForURL(page, this.saveButton);
+    await this.waitForSelectorAndClick(page, this.saveButton);
 
     return this.getTextContent(page, this.alertBlock);
   }

From bdbefe948a784886c06bf1c8b5cc829078fa6666 Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Tue, 18 Jul 2023 15:34:57 +0200
Subject: [PATCH 0575/1030] Add a check for key generation

---
 classes/ConfigurationTest.php                 | 15 +++++++++++++++
 install-dev/controllers/http/system.php       |  1 +
 src/Adapter/Requirement/CheckRequirements.php |  1 +
 3 files changed, 17 insertions(+)

diff --git a/classes/ConfigurationTest.php b/classes/ConfigurationTest.php
index ed1ea39a07616..bfeaf7b0260a7 100644
--- a/classes/ConfigurationTest.php
+++ b/classes/ConfigurationTest.php
@@ -82,6 +82,7 @@ public static function getDefaultTests()
             'files' => false,
             'mails_dir' => 'mails',
             'openssl' => false,
+            'openssl_key_generation' => false,
             'simplexml' => false,
             'zip' => false,
             'fileinfo' => false,
@@ -398,6 +399,20 @@ public static function test_openssl()
         return function_exists('openssl_encrypt');
     }
 
+    public static function test_openssl_key_generation()
+    {
+        $privateKey = openssl_pkey_new([
+            'private_key_bits' => 2048,
+            'private_key_type' => OPENSSL_KEYTYPE_RSA,
+        ]);
+
+        if ($privateKey === false) {
+            return false;
+        }
+
+        return true;
+    }
+
     public static function test_sessions()
     {
         return in_array(session_status(), [PHP_SESSION_ACTIVE, PHP_SESSION_NONE], true);
diff --git a/install-dev/controllers/http/system.php b/install-dev/controllers/http/system.php
index f428cf9428e92..7cfad76148b30 100644
--- a/install-dev/controllers/http/system.php
+++ b/install-dev/controllers/http/system.php
@@ -95,6 +95,7 @@ public function display(): void
                         'gd' => $this->translator->trans('GD library is not installed', [], 'Install'),
                         'json' => $this->translator->trans('JSON extension is not loaded', [], 'Install'),
                         'openssl' => $this->translator->trans('PHP OpenSSL extension is not loaded', [], 'Install'),
+                        'openssl_key_generation' => $this->translator->trans('Unable to generate private keys using openssl_pkey_new. Check your OpenSSL configuration, especially the path to openssl.cafile.', [], 'Install'),
                         'pdo_mysql' => $this->translator->trans('PDO MySQL extension is not loaded', [], 'Install'),
                         'simplexml' => $this->translator->trans('SimpleXML extension is not loaded', [], 'Install'),
                         'zip' => $this->translator->trans('ZIP extension is not enabled', [], 'Install'),
diff --git a/src/Adapter/Requirement/CheckRequirements.php b/src/Adapter/Requirement/CheckRequirements.php
index d159383feb606..35894e1c77731 100644
--- a/src/Adapter/Requirement/CheckRequirements.php
+++ b/src/Adapter/Requirement/CheckRequirements.php
@@ -101,6 +101,7 @@ private function getErrorMessages()
             'json' => $this->translator->trans('Enable the JSON extension on your server.', [], 'Admin.Advparameters.Notification'),
             'mbstring' => $this->translator->trans('Enable the Mbstring extension on your server.', [], 'Admin.Advparameters.Notification'),
             'openssl' => $this->translator->trans('Enable the OpenSSL extension on your server.', [], 'Admin.Advparameters.Notification'),
+            'openssl_key_generation' => $this->translator->trans('Unable to generate private keys using openssl_pkey_new. Check your OpenSSL configuration, especially the path to openssl.cafile.', [], 'Admin.Advparameters.Notification'),
             'pdo_mysql' => $this->translator->trans('Enable the PDO Mysql extension on your server.', [], 'Admin.Advparameters.Notification'),
             'simplexml' => $this->translator->trans('Enable the XML extension on your server.', [], 'Admin.Advparameters.Notification'),
             'zip' => $this->translator->trans('Enable the ZIP extension on your server.', [], 'Admin.Advparameters.Notification'),

From 75a1320765fe129ee64c790a11b69a67fd8559f3 Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Tue, 18 Jul 2023 17:15:52 +0200
Subject: [PATCH 0576/1030] Change translation key when enable/disable/delete
 product

---
 .../Definition/Factory/ProductGridDefinitionFactory.php   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Core/Grid/Definition/Factory/ProductGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/ProductGridDefinitionFactory.php
index 69ab3f124d367..4fb46a94beee0 100644
--- a/src/Core/Grid/Definition/Factory/ProductGridDefinitionFactory.php
+++ b/src/Core/Grid/Definition/Factory/ProductGridDefinitionFactory.php
@@ -694,10 +694,10 @@ protected function getBulkActions()
             $bulkDuplicateRoute = 'admin_products_bulk_duplicate_all_shops';
             $bulkDeleteRoute = 'admin_products_bulk_delete_from_all_shops';
             $routeParams = [];
-            $bulkEnableLabel = $this->trans('Activate selection for all stores', [], 'Admin.Actions');
-            $bulkDisableLabel = $this->trans('Deactivate selection for all stores', [], 'Admin.Actions');
-            $bulkDuplicateLabel = $this->trans('Duplicate selection for all stores', [], 'Admin.Actions');
-            $bulkDeleteLabel = $this->trans('Delete selection for all stores', [], 'Admin.Actions');
+            $bulkEnableLabel = $this->trans('Activate selection for associated stores', [], 'Admin.Actions');
+            $bulkDisableLabel = $this->trans('Deactivate selection for associated stores', [], 'Admin.Actions');
+            $bulkDuplicateLabel = $this->trans('Duplicate selection for associated stores', [], 'Admin.Actions');
+            $bulkDeleteLabel = $this->trans('Delete selection for associated stores', [], 'Admin.Actions');
         }
 
         return (new BulkActionCollection())

From c47d10abffb64c4ea9cf479d25ae0f88cad2853b Mon Sep 17 00:00:00 2001
From: lartist <salim-benouamer.ext@prestashop.com>
Date: Wed, 19 Jul 2023 05:01:14 +0200
Subject: [PATCH 0577/1030] Get employee dropdown twig component independent

---
 .../themes/new-theme/template/layout.tpl      |  4 -
 phpstan-tmp-legacy-layout-baseline.neon       |  9 +-
 .../Layout/employee_dropdown.html.twig        |  8 +-
 .../Admin/Layout/employee_dropdown.html.twig  |  7 +-
 .../Twig/Component/EmployeeDropdown.php       | 40 +++++++--
 .../Twig/Extension/PathExtension.php          | 82 +++++++++++++++++++
 6 files changed, 124 insertions(+), 26 deletions(-)
 create mode 100644 src/PrestaShopBundle/Twig/Extension/PathExtension.php

diff --git a/admin-dev/themes/new-theme/template/layout.tpl b/admin-dev/themes/new-theme/template/layout.tpl
index 2364aa933d121..a3dde67629852 100644
--- a/admin-dev/themes/new-theme/template/layout.tpl
+++ b/admin-dev/themes/new-theme/template/layout.tpl
@@ -125,10 +125,6 @@
             {render_template
               smarty_template="components/layout/employee_dropdown.tpl"
               twig_template="@PrestaShop/Admin/Layout/employee_dropdown.html.twig"
-              employee=$employee
-              link=$link
-              displayBackOfficeEmployeeMenu=$displayBackOfficeEmployeeMenu
-              logout_link=$logout_link
             }
         </div>
         {if isset($displayBackOfficeTop)}{$displayBackOfficeTop}{/if}
diff --git a/phpstan-tmp-legacy-layout-baseline.neon b/phpstan-tmp-legacy-layout-baseline.neon
index fb08e46111a08..e073c469736fb 100644
--- a/phpstan-tmp-legacy-layout-baseline.neon
+++ b/phpstan-tmp-legacy-layout-baseline.neon
@@ -6,8 +6,8 @@ parameters:
 			path: src/PrestaShopBundle/Twig/Component/EmployeeDropdown.php
 
 		-
-			message: "#^Class Link is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
-			count: 1
+			message: "#^Namespace Context is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+			count: 2
 			path: src/PrestaShopBundle/Twig/Component/EmployeeDropdown.php
 
 		-
@@ -15,11 +15,6 @@ parameters:
 			count: 1
 			path: src/PrestaShopBundle/Twig/Component/EmployeeDropdown.php
 
-		-
-			message: "#^Namespace Link is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
-			count: 1
-			path: src/PrestaShopBundle/Twig/Component/EmployeeDropdown.php
-
 		-
 			message: "#^Class Link is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
 			count: 1
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/employee_dropdown.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/employee_dropdown.html.twig
index f5ed762abf61c..6e4f1f901e139 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/employee_dropdown.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/employee_dropdown.html.twig
@@ -31,14 +31,14 @@
       <div class="employee-wrapper-avatar">
         <div class="employee-top">
           <span class="employee-avatar">
-            <img class="avatar rounded-circle" src="{{ employee.getImage }}" alt="{{ employee.firstname }}" />
+            <img class="avatar rounded-circle" src="{{ this.employee.getImage }}" alt="{{ this.employee.firstname }}" />
           </span>
           <span class="employee_profile">
-            {{ 'Welcome back %name%'|trans({'%name%': employee.firstname}, 'Admin.Navigation.Header') }}
+            {{ 'Welcome back %name%'|trans({'%name%': this.employee.firstname}, 'Admin.Navigation.Header') }}
           </span>
         </div>
 
-        <a class="dropdown-item employee-link profile-link" href="{{ path('admin_employees_edit', {employeeId: employee.id}) }}">
+        <a class="dropdown-item employee-link profile-link" href="{{ path('admin_employees_edit', {employeeId: this.employee.id}) }}">
           <i class="material-icons">edit</i>
           <span>
             {{ 'Your profile'|trans({}, 'Admin.Navigation.Header') }}
@@ -61,7 +61,7 @@
         {% endif %}
       {% endfor %}
 
-      <a class="dropdown-item employee-link text-center" id="header_logout" href="{{ logout_link|escape('html_attr') }}">
+      <a class="dropdown-item employee-link text-center" id="header_logout" href="{{ path('AdminLogin', {'logout' : 1})|escape('html_attr') }}">
         <i class="material-icons d-lg-none">power_settings_new</i>
         <span>
           {{ 'Sign out'|trans({}, 'Admin.Navigation.Header') }}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/employee_dropdown.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/employee_dropdown.html.twig
index 0b6e16fbeaa4c..ae0598106e806 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Layout/employee_dropdown.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/employee_dropdown.html.twig
@@ -22,9 +22,4 @@
  * @copyright Since 2007 PrestaShop SA and Contributors
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  *#}
-{{ component('EmployeeDropdown', {
-  employee: employee,
-  link: link,
-  displayBackOfficeEmployeeMenu: displayBackOfficeEmployeeMenu,
-  logout_link: logout_link,
-}) }}
+{{ component('EmployeeDropdown') }}
diff --git a/src/PrestaShopBundle/Twig/Component/EmployeeDropdown.php b/src/PrestaShopBundle/Twig/Component/EmployeeDropdown.php
index 38eba318494b6..fafd4d6831a5e 100644
--- a/src/PrestaShopBundle/Twig/Component/EmployeeDropdown.php
+++ b/src/PrestaShopBundle/Twig/Component/EmployeeDropdown.php
@@ -28,16 +28,46 @@
 
 namespace PrestaShopBundle\Twig\Component;
 
+use Context;
 use Employee;
-use Link;
 use PrestaShop\PrestaShop\Core\Action\ActionsBarButtonsCollection;
+use PrestaShop\PrestaShop\Core\Hook\HookDispatcherInterface;
 use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
 
 #[AsTwigComponent(template: '@PrestaShop/Admin/Component/Layout/employee_dropdown.html.twig')]
 class EmployeeDropdown
 {
-    public Employee $employee;
-    public Link $link;
-    public ActionsBarButtonsCollection $displayBackOfficeEmployeeMenu;
-    public string $logout_link;
+    private ?Employee $employee = null;
+    public ?ActionsBarButtonsCollection $displayBackOfficeEmployeeMenu = null;
+
+    public function __construct(private HookDispatcherInterface $hookDispatcher)
+    {
+    }
+
+    public function getEmployee()
+    {
+        if ($this->employee === null) {
+            $this->employee = Context::getContext()->employee;
+        }
+
+        return $this->employee;
+    }
+
+    public function getDisplayBackOfficeEmployeeMenu()
+    {
+        if ($this->displayBackOfficeEmployeeMenu === null) {
+            $menuLinksCollections = new ActionsBarButtonsCollection();
+
+            $this->hookDispatcher->dispatchWithParameters(
+                'displayBackOfficeEmployeeMenu',
+                [
+                    'links' => $menuLinksCollections,
+                ]
+            );
+
+            $this->displayBackOfficeEmployeeMenu = $menuLinksCollections;
+        }
+
+        return $this->displayBackOfficeEmployeeMenu;
+    }
 }
diff --git a/src/PrestaShopBundle/Twig/Extension/PathExtension.php b/src/PrestaShopBundle/Twig/Extension/PathExtension.php
new file mode 100644
index 0000000000000..a54afecd5c518
--- /dev/null
+++ b/src/PrestaShopBundle/Twig/Extension/PathExtension.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShopBundle\Twig\Extension;
+
+use PrestaShop\PrestaShop\Adapter\LegacyContext;
+use Symfony\Component\Routing\Exception\RouteNotFoundException;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFunction;
+
+/**
+ * This class adds a function to twig template which points to back url if such is found in current request.
+ */
+class PathExtension extends AbstractExtension
+{
+    public function __construct(
+        private readonly UrlGeneratorInterface $urlGenerator,
+        private readonly LegacyContext $context
+    ) {
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFunctions(): array
+    {
+        return [
+            new TwigFunction(
+                'path',
+                [$this, 'getPath']
+            ),
+        ];
+    }
+
+    /**
+     * Get path for legacy or symfony link.
+     *
+     * @param string $routeName
+     * @param array $parameters
+     * @param bool $relative (only for symfony links)
+     *
+     * @return string
+     */
+    public function getPath(string $routeName, array $parameters = [], bool $relative = false): string
+    {
+        try {
+            $url = $this->urlGenerator->generate(
+                $routeName,
+                $parameters,
+                $relative ? UrlGeneratorInterface::RELATIVE_PATH : UrlGeneratorInterface::ABSOLUTE_PATH
+            );
+        } catch (RouteNotFoundException $ex) {
+            $url = $this->context->getAdminLink(controller: $routeName, extraParams: $parameters);
+        }
+
+        return $url;
+    }
+}

From f8092212098131c2ddf6c8942dc661e37fb56d2e Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Wed, 19 Jul 2023 11:45:18 +0200
Subject: [PATCH 0578/1030] // Changelog 8.0.5

---
 CONTRIBUTORS.md    |  2 ++
 docs/CHANGELOG.txt | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index e97852af98900..f9f92c38c09f1 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -648,6 +648,7 @@ GitHub contributors:
 - Petyuska
 - Philip Iezzi
 - PhpMadman
+- PICHAT Morgan
 - Pierre
 - Pierre Avizou
 - Pierre Joube
@@ -851,6 +852,7 @@ GitHub contributors:
 - tiledcode
 - timactive
 - timsit
+- tleon
 - tmackay
 - TMMeilleur
 - tolispy
diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
index 45ab895e7dfa3..b071c429742a8 100644
--- a/docs/CHANGELOG.txt
+++ b/docs/CHANGELOG.txt
@@ -23,6 +23,41 @@ needs please refer to https://devdocs.prestashop.com/ for more information.
 
 Changelog for PrestaShop 8
 
+####################################
+#   v8.0.5 - (2023-07-19)
+####################################
+
+- Core:
+  - Improvement:
+    - GHSA-xw2r-f8xv-c8xp add missing html attributes (by @matthieu-rolland)
+- Back Office:
+  - Improvement:
+    - #33276: Add file headers and bump some dependencies (by @mflasquin)
+    - GHSA-gf46-prm4-56pc protect from writing files on server through SQL form (by @matthieu-rolland)
+  - Bug fix:
+    - #33234: Update module's information cache and add clear cache for doctrine (by @M0rgan01)
+    - #33008: Fix 'New' Translation domain (by @mflasquin)
+    - #33124: Fix issue when disable tax, do not delete tax rules (by @mflasquin)
+    - #33048: Add string casting for boolean fields (by @nicosomb)
+    - #31379: Fix disabling a module for a specific shop applied to all shops (by @matthieu-rolland)
+    - #32790: Fix PDF translations in backoffice (by @mflasquin)
+    - #32715: Fix: [BO] : Error notification displayed in Multistore page (by @Codencode)
+- Front Office:
+  - Bug fix:
+    - #32596: Fix availability display logic (by @mflasquin)
+    - #32345: Hide vouchers with no available quantities (by @tleon)
+- Tests:
+  - Bug fix:
+    - #33279: Nightly : 8.0.x : Unskip test for the issue 32914 (by @Progi1984)
+    - #33131: Nightly : 8.0.x : Fixed error in filterTaxes (by @Progi1984)
+    - #33033: Nightly : Fixed install Node 14 (by @Progi1984)
+    - #33012: Nightly : Fixed mocha loader (8.0.x) (by @Progi1984)
+    - #32834: Nightly : 8.0.x : Fixed error in package.json (by @Progi1984)
+    - #32829: Nightly : Fixed functional/BO/02*/01*/viewAndEditOrder/11* (by @Progi1984)
+  - Refactoring:
+    - #33230: Nightly : 8.0.x - Skip test for the issue 32914 (by @Progi1984)
+    - #33174: Sanity Tests - Fix bug in product V2 tests (by @nesrineabdmouleh)
+
 ####################################
 #   v8.0.4 - (2023-04-13)
 ####################################

From 5ba48b6e8deff13cd085ce030488209cf7855a0e Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Wed, 19 Jul 2023 13:32:45 +0200
Subject: [PATCH 0579/1030] Functional Tests : BO - Orders - Create order :
 Check summary (Add check for email)

---
 .../01_orders/createOrders/10_checkSummary.ts | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/10_checkSummary.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/10_checkSummary.ts
index 177ab876c3823..ea48601f20eb5 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/10_checkSummary.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/10_checkSummary.ts
@@ -1,9 +1,11 @@
 // Import utils
 import basicHelper from '@utils/basicHelper';
 import helper from '@utils/helpers';
+import mailHelper from '@utils/mailHelper';
 import testContext from '@utils/testContext';
 
 // Import common tests
+import {resetSmtpConfigTest, setupSmtpConfigTest} from '@commonTests/BO/advancedParameters/smtp';
 import {createCartRuleTest, deleteCartRuleTest} from '@commonTests/BO/catalog/cartRule';
 import loginCommon from '@commonTests/BO/loginBO';
 
@@ -22,9 +24,11 @@ import OrderStatuses from '@data/demo/orderStatuses';
 import PaymentMethods from '@data/demo/paymentMethods';
 import Products from '@data/demo/products';
 import CartRuleData from '@data/faker/cartRule';
+import type MailDevEmail from '@data/types/maildevEmail';
 
 import {expect} from 'chai';
 import type {BrowserContext, Page} from 'playwright';
+import type MailDev from 'maildev';
 
 const baseContext: string = 'functional_BO_orders_orders_createOrders_checkSummary';
 
@@ -43,6 +47,8 @@ Post-condition:
 describe('BO - Orders - Create order : Check summary', async () => {
   let browserContext: BrowserContext;
   let page: Page;
+  let newMail: MailDevEmail;
+  let mailListener: MailDev;
 
   // Data to create cart rule with code
   const cartRuleWithCodeData: CartRuleData = new CartRuleData({
@@ -61,13 +67,28 @@ describe('BO - Orders - Create order : Check summary', async () => {
   // Pre-condition: Create cart rule with code
   createCartRuleTest(cartRuleWithCodeData, `${baseContext}_preTest_1`);
 
+  // Pre-Condition: Setup config SMTP
+  setupSmtpConfigTest(`${baseContext}_preTest_2`);
+
   before(async function () {
     browserContext = await helper.createBrowserContext(this.browser);
     page = await helper.newTab(browserContext);
+
+    // Start listening to maildev server
+    mailListener = mailHelper.createMailListener();
+    mailHelper.startListener(mailListener);
+
+    // Handle every new email
+    mailListener.on('new', (email: MailDevEmail) => {
+      newMail = email;
+    });
   });
 
   after(async () => {
     await helper.closeBrowserContext(browserContext);
+
+    // Stop listening to maildev server
+    mailHelper.stopListener(mailListener);
   });
 
   // 1 - Go to create order page and add product to cart
@@ -248,6 +269,13 @@ describe('BO - Orders - Create order : Check summary', async () => {
         await expect(textMessage, 'Invalid success message!').to.be.equal(addOrderPage.emailSendSuccessMessage);
       });
 
+      it('should check if the mail is in mailbox', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'checkIfMailIsInMailbox', baseContext);
+
+        await expect(newMail.subject).to.eq(`[${global.INSTALL.SHOP_NAME}] Process the payment of your order`);
+        await expect(newMail.text).to.contains('A new order has been generated on your behalf.');
+      });
+
       it('should choose \'Proceed to checkout in the front office\' from more actions', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'proceedToCheckout', baseContext);
 
@@ -318,4 +346,7 @@ describe('BO - Orders - Create order : Check summary', async () => {
 
   // Post-condition: Delete created cart rule
   deleteCartRuleTest(cartRuleWithCodeData.name, `${baseContext}_postTest_1`);
+
+  // Post-Condition: Reset SMTP config
+  resetSmtpConfigTest(`${baseContext}_postTest_2`);
 });

From d4b7bd0b3458727a171081883ae3904c973ba063 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Wed, 19 Jul 2023 13:39:14 +0200
Subject: [PATCH 0580/1030] Deprecated SendCartToCustomer in v9

---
 src/Adapter/Cart/CommandHandler/SendCartToCustomerHandler.php    | 1 +
 src/Core/Domain/Cart/Command/SendCartToCustomerCommand.php       | 1 +
 .../Cart/CommandHandler/SendCartToCustomerHanlderInterface.php   | 1 +
 src/PrestaShopBundle/Resources/config/services/adapter/cart.yml  | 1 +
 4 files changed, 4 insertions(+)

diff --git a/src/Adapter/Cart/CommandHandler/SendCartToCustomerHandler.php b/src/Adapter/Cart/CommandHandler/SendCartToCustomerHandler.php
index f3c0a16792e2c..f33224877a085 100644
--- a/src/Adapter/Cart/CommandHandler/SendCartToCustomerHandler.php
+++ b/src/Adapter/Cart/CommandHandler/SendCartToCustomerHandler.php
@@ -40,6 +40,7 @@
 
 /**
  * @internal
+ * @deprecated Since 9.0 and will be removed in the next major.
  */
 #[AsCommandHandler]
 final class SendCartToCustomerHandler implements SendCartToCustomerHanlderInterface
diff --git a/src/Core/Domain/Cart/Command/SendCartToCustomerCommand.php b/src/Core/Domain/Cart/Command/SendCartToCustomerCommand.php
index 071f0cee05a46..c3835dfda7c76 100644
--- a/src/Core/Domain/Cart/Command/SendCartToCustomerCommand.php
+++ b/src/Core/Domain/Cart/Command/SendCartToCustomerCommand.php
@@ -30,6 +30,7 @@
 
 /**
  * Sends email to the customer to process the payment for cart.
+ * @deprecated Since 9.0 and will be removed in the next major.
  */
 class SendCartToCustomerCommand
 {
diff --git a/src/Core/Domain/Cart/CommandHandler/SendCartToCustomerHanlderInterface.php b/src/Core/Domain/Cart/CommandHandler/SendCartToCustomerHanlderInterface.php
index a1288fcbfbfe9..31ba14cc7b311 100644
--- a/src/Core/Domain/Cart/CommandHandler/SendCartToCustomerHanlderInterface.php
+++ b/src/Core/Domain/Cart/CommandHandler/SendCartToCustomerHanlderInterface.php
@@ -30,6 +30,7 @@
 
 /**
  * Interface for service that handles sending cart to customer.
+ * @deprecated Since 9.0 and will be removed in the next major.
  */
 interface SendCartToCustomerHanlderInterface
 {
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/cart.yml b/src/PrestaShopBundle/Resources/config/services/adapter/cart.yml
index d50690de87b46..840ab61d208f9 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/cart.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/cart.yml
@@ -61,6 +61,7 @@ services:
 
   prestashop.adapter.command_handler.send_cart_to_customer_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\SendCartToCustomerHandler'
+    deprecated: 'The "%service_id%" service is deprecated since 9.0 and will be removed in next major.'
     autoconfigure: true
 
   prestashop.adapter.query_handler.get_cart_for_viewing_handler:

From 714b9616e362c66be07ac7f1505d5f3e086eac16 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Wed, 19 Jul 2023 14:00:35 +0200
Subject: [PATCH 0581/1030] Deprecated SendCartToCustomer in v9 : Fixed
 PHPCSFixer errors

---
 src/Adapter/Cart/CommandHandler/SendCartToCustomerHandler.php    | 1 +
 src/Core/Domain/Cart/Command/SendCartToCustomerCommand.php       | 1 +
 .../Cart/CommandHandler/SendCartToCustomerHanlderInterface.php   | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/Adapter/Cart/CommandHandler/SendCartToCustomerHandler.php b/src/Adapter/Cart/CommandHandler/SendCartToCustomerHandler.php
index f33224877a085..23a98c3afcbcb 100644
--- a/src/Adapter/Cart/CommandHandler/SendCartToCustomerHandler.php
+++ b/src/Adapter/Cart/CommandHandler/SendCartToCustomerHandler.php
@@ -40,6 +40,7 @@
 
 /**
  * @internal
+ *
  * @deprecated Since 9.0 and will be removed in the next major.
  */
 #[AsCommandHandler]
diff --git a/src/Core/Domain/Cart/Command/SendCartToCustomerCommand.php b/src/Core/Domain/Cart/Command/SendCartToCustomerCommand.php
index c3835dfda7c76..bd01d07463546 100644
--- a/src/Core/Domain/Cart/Command/SendCartToCustomerCommand.php
+++ b/src/Core/Domain/Cart/Command/SendCartToCustomerCommand.php
@@ -30,6 +30,7 @@
 
 /**
  * Sends email to the customer to process the payment for cart.
+ *
  * @deprecated Since 9.0 and will be removed in the next major.
  */
 class SendCartToCustomerCommand
diff --git a/src/Core/Domain/Cart/CommandHandler/SendCartToCustomerHanlderInterface.php b/src/Core/Domain/Cart/CommandHandler/SendCartToCustomerHanlderInterface.php
index 31ba14cc7b311..1ff4090423b33 100644
--- a/src/Core/Domain/Cart/CommandHandler/SendCartToCustomerHanlderInterface.php
+++ b/src/Core/Domain/Cart/CommandHandler/SendCartToCustomerHanlderInterface.php
@@ -30,6 +30,7 @@
 
 /**
  * Interface for service that handles sending cart to customer.
+ *
  * @deprecated Since 9.0 and will be removed in the next major.
  */
 interface SendCartToCustomerHanlderInterface

From 0268bee76ef2c38d3afe3f2303f3f774c208636b Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Wed, 19 Jul 2023 15:09:30 +0200
Subject: [PATCH 0582/1030] Nightly : 8.1.x - Multistore (Removed Delete shop
 url)

---
 .../10_multistore/03_CRUDShops.ts                    | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/03_CRUDShops.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/03_CRUDShops.ts
index 0e95c8ff9cd37..b970c1b6f1218 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/03_CRUDShops.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/03_CRUDShops.ts
@@ -148,18 +148,8 @@ describe('BO - Advanced Parameters - Multistore : Create, Read, Update and Delet
     });
   });
 
-  // 4 : Delete shop URL
-  describe('delete shop URL', async () => {
-    it('should delete the shop URL', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'deleteShopURL', baseContext);
-
-      const textResult = await shopUrlPage.deleteShopURL(page, 1);
-      await expect(textResult).to.contains(shopPage.successfulDeleteMessage);
-    });
-  });
-
   // 4 : Delete the shop
-  describe('delete shop', async () => {
+  describe('Delete shop', async () => {
     it('should go to the created shop page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'goToCreatedShopPage', baseContext);
 

From 4cc5207c8af38896258534d2431950e3e173baa9 Mon Sep 17 00:00:00 2001
From: tleon <thomas.leone@prestashop.com>
Date: Wed, 12 Jul 2023 11:31:27 +0200
Subject: [PATCH 0583/1030] chore(api): added complete hook query

---
 .../Hook/QueryHandler/GetHookHandler.php      |  9 ++-
 .../Hook/Command/UpdateHookStatusCommand.php  |  4 +-
 src/Core/Domain/Hook/QueryResult/Hook.php     | 67 ++++++++++++++++++
 .../ApiPlatform/Provider/QueryProvider.php    | 27 ++-----
 .../ApiPlatform/Resources/Customer.php        | 70 +++++++++++++++++++
 .../ApiPlatform/Resources/Hook.php            | 13 +---
 .../config/services/adapter/hook.yml          |  3 +-
 .../StateProvider/QueryProviderTest.php       | 70 +++++++------------
 8 files changed, 177 insertions(+), 86 deletions(-)
 create mode 100644 src/Core/Domain/Hook/QueryResult/Hook.php
 create mode 100644 src/PrestaShopBundle/ApiPlatform/Resources/Customer.php

diff --git a/src/Adapter/Hook/QueryHandler/GetHookHandler.php b/src/Adapter/Hook/QueryHandler/GetHookHandler.php
index 805bd3e9d2927..94972dcfe0856 100644
--- a/src/Adapter/Hook/QueryHandler/GetHookHandler.php
+++ b/src/Adapter/Hook/QueryHandler/GetHookHandler.php
@@ -34,6 +34,7 @@
 use PrestaShop\PrestaShop\Core\Domain\Hook\Exception\HookNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHook;
 use PrestaShop\PrestaShop\Core\Domain\Hook\QueryHandler\GetHookHandlerInterface;
+use PrestaShop\PrestaShop\Core\Domain\Hook\QueryResult\Hook as HookQueryResult;
 
 #[AsQueryHandler]
 final class GetHookHandler implements GetHookHandlerInterface
@@ -47,6 +48,12 @@ public function handle(GetHook $query)
             throw new HookNotFoundException(sprintf('Hook with id "%d" was not found.', $hookId));
         }
 
-        return $hook;
+        return new HookQueryResult(
+            $hook->id,
+            (bool) $hook->active,
+            $hook->name,
+            $hook->title,
+            $hook->description
+        );
     }
 }
diff --git a/src/Core/Domain/Hook/Command/UpdateHookStatusCommand.php b/src/Core/Domain/Hook/Command/UpdateHookStatusCommand.php
index d027b7ec93d69..2c00b47e466ad 100644
--- a/src/Core/Domain/Hook/Command/UpdateHookStatusCommand.php
+++ b/src/Core/Domain/Hook/Command/UpdateHookStatusCommand.php
@@ -39,10 +39,8 @@ class UpdateHookStatusCommand
 
     /**
      * New hook status
-     *
-     * @var bool
      */
-    private $active;
+    private bool $active;
 
     /**
      * UpdateHookStatusCommand constructor.
diff --git a/src/Core/Domain/Hook/QueryResult/Hook.php b/src/Core/Domain/Hook/QueryResult/Hook.php
new file mode 100644
index 0000000000000..09a0e2174106a
--- /dev/null
+++ b/src/Core/Domain/Hook/QueryResult/Hook.php
@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\Hook\QueryResult;
+
+class Hook
+{
+    public function __construct(
+        public readonly int $id,
+        public readonly bool $active,
+        public readonly string $name,
+        public readonly string $title,
+        public readonly string $description
+    ) {
+    }
+
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    public function isActive(): bool
+    {
+        return $this->active;
+    }
+
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    public function getTitle(): string
+    {
+        return $this->title;
+    }
+
+    public function getDescription(): string
+    {
+        return $this->description;
+    }
+}
diff --git a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
index 361b79193f141..1678d81095555 100644
--- a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
+++ b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
@@ -32,12 +32,10 @@
 use ApiPlatform\State\ProviderInterface;
 use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
 use PrestaShopBundle\ApiPlatform\Exception\NoExtraPropertiesFoundException;
-use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
-use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
 
 class QueryProvider implements ProviderInterface
 {
-    public function __construct(private CommandBusInterface $queryBus, private DenormalizerInterface $serializer)
+    public function __construct(private CommandBusInterface $queryBus)
     {
     }
 
@@ -45,27 +43,12 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
     {
         $extraProperties = $operation->getExtraProperties();
 
-        $query = array_key_exists('query', $extraProperties) ? $extraProperties['query'] : null;
-        $command = array_key_exists('command', $extraProperties) ? $extraProperties['command'] : null;
-        $dto = array_key_exists('dto', $extraProperties) ? $extraProperties['dto'] : null;
+        $query = $extraProperties['query'] ?? null;
 
-        if (null !== $query) {
-            return $this->queryBus->handle(new $query(...$uriVariables));
-        } elseif (null !== $command) {
-            // the command case has yet to be implemented.
-            return null;
-        } elseif (null !== $dto) {
-            $coreObject = $this->queryBus->handle(new $dto(...$uriVariables));
-            // We use get_object_var to convert the ObjectModel into an array and then denormalize it into the DTO.
-            // We handle things this way because we are unable to normalize an ObjectModel
-            // directly with the symfony serializer.
-            return $this->serializer->denormalize(
-                get_object_vars($coreObject),
-                $extraProperties['denormalizer'],
-                context: [ObjectNormalizer::DISABLE_TYPE_ENFORCEMENT => true]
-            );
-        } else {
+        if (null === $query) {
             throw new NoExtraPropertiesFoundException();
         }
+
+        return $this->queryBus->handle(new $query(...$uriVariables));
     }
 }
diff --git a/src/PrestaShopBundle/ApiPlatform/Resources/Customer.php b/src/PrestaShopBundle/ApiPlatform/Resources/Customer.php
new file mode 100644
index 0000000000000..b17421271e639
--- /dev/null
+++ b/src/PrestaShopBundle/ApiPlatform/Resources/Customer.php
@@ -0,0 +1,70 @@
+<?php
+
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\ApiPlatform\Resources;
+
+use ApiPlatform\Metadata\ApiProperty;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Post;
+use PrestaShop\Decimal\DecimalNumber;
+use PrestaShop\PrestaShop\Core\Domain\Customer\Group\Command\AddCustomerGroupCommand;
+use PrestaShopBundle\ApiPlatform\Processor\CommandProcessor;
+
+#[ApiResource(
+    operations: [
+        new Post(
+            uriTemplate: '/customers',
+            provider: CommandProcessor::class,
+            extraProperties: [
+                'command' => AddCustomerGroupCommand::class,
+            ],
+        ),
+    ]
+)]
+class Customer
+{
+    /**
+     * @param string[] $localizedNames
+     * @param int[] $shopIds
+     */
+    public function __construct(
+        #[ApiProperty(
+            example: 'array<string>',
+        )]
+        public array $localizedNames,
+        public DecimalNumber $reductionPercent,
+        public bool $displayPriceTaxExcluded,
+        public bool $showPrice,
+        #[ApiProperty(
+            example: 'array<int>',
+        )]
+        public array $shopIds
+    ) {
+    }
+}
diff --git a/src/PrestaShopBundle/ApiPlatform/Resources/Hook.php b/src/PrestaShopBundle/ApiPlatform/Resources/Hook.php
index b4cc3dc8c3b99..737217f059fe3 100644
--- a/src/PrestaShopBundle/ApiPlatform/Resources/Hook.php
+++ b/src/PrestaShopBundle/ApiPlatform/Resources/Hook.php
@@ -38,7 +38,6 @@
 use PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHookStatus;
 use PrestaShopBundle\ApiPlatform\Processor\CommandProcessor;
 use PrestaShopBundle\ApiPlatform\Provider\QueryProvider;
-use Symfony\Component\Serializer\Annotation\Groups;
 
 #[ApiResource(
     operations: [
@@ -78,26 +77,16 @@
           uriTemplate: '/hooks/{id}',
             requirements: ['id' => '\d+'],
             exceptionToStatus: [HookNotFoundException::class => 404],
-            normalizationContext: [
-                'groups' => [
-                    'hook-status:read',
-                ],
-            ],
             provider: QueryProvider::class,
-            extraProperties: [
-                'dto' => GetHook::class,
-                'denormalizer' => Hook::class,
-            ]
+            extraProperties: ['query' => GetHook::class]
         ),
     ],
 )]
 class Hook
 {
     #[ApiProperty(identifier: true)]
-    #[Groups(['hook-status:read'])]
     public int $id;
 
-    #[Groups(['hook-status:read'])]
     public bool $active;
 
     public string $name;
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/hook.yml b/src/PrestaShopBundle/Resources/config/services/adapter/hook.yml
index bdddc9d3f7571..0d0d487611f0b 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/hook.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/hook.yml
@@ -10,8 +10,7 @@ services:
     class: PrestaShop\PrestaShop\Adapter\Hook\QueryHandler\GetHookStatusHandler
     autoconfigure: true
 
-  prestashop.adapter.hook.command_handler.get_hook_handler:
-    class: PrestaShop\PrestaShop\Adapter\Hook\QueryHandler\GetHookHandler
+  PrestaShop\PrestaShop\Adapter\Hook\QueryHandler\GetHookHandler:
     autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\HookManager: ~
diff --git a/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php b/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
index f2b8219798b6b..42671d0dc541d 100644
--- a/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
+++ b/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
@@ -33,13 +33,11 @@
 use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
 use PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHook;
 use PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHookStatus;
+use PrestaShop\PrestaShop\Core\Domain\Hook\QueryResult\Hook as HookQuery;
 use PrestaShop\PrestaShop\Core\Domain\Hook\QueryResult\HookStatus;
 use PrestaShopBundle\ApiPlatform\Exception\NoExtraPropertiesFoundException;
 use PrestaShopBundle\ApiPlatform\Provider\QueryProvider;
-use PrestaShopBundle\ApiPlatform\Resources\Hook;
 use RuntimeException;
-use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
-use Symfony\Component\Serializer\Serializer;
 
 class QueryProviderTest extends TestCase
 {
@@ -48,7 +46,7 @@ class QueryProviderTest extends TestCase
      */
     private $queryBus;
 
-    private function createResultBasedOnQuery(GetHookStatus $query): HookStatus
+    private function createResultBasedOnHookStatusQuery(GetHookStatus $query): HookStatus
     {
         if ($query->getId()->getValue() === 1) {
             return new HookStatus($query->getId()->getValue(), false);
@@ -61,20 +59,26 @@ private function createResultBasedOnQuery(GetHookStatus $query): HookStatus
         throw new RuntimeException(sprintf('Hook "%s" was not expected in query bus mock', $query->getId()->getValue()));
     }
 
-    private function createResultBasedOnObjectModel(GetHook $query): \stdClass
+    private function createResultBasedOnHookQuery(GetHook $query): HookQuery
     {
         if ($query->getId()->getValue() === 1) {
-            $objectModelHook = new \stdClass();
-            $objectModelHook->active = false;
-
-            return $objectModelHook;
+            return new HookQuery(
+                $query->getId()->getValue(),
+                false,
+                'testName1',
+                'testTitle1',
+                'testDescription1'
+            );
         }
 
         if ($query->getId()->getValue() === 2) {
-            $objectModelHook = new \stdClass();
-            $objectModelHook->active = true;
-
-            return $objectModelHook;
+            return new HookQuery(
+                $query->getId()->getValue(),
+                true,
+                'testName1',
+                'testTitle1',
+                'testDescription1'
+            );
         }
 
         throw new RuntimeException(sprintf('Hook "%s" was not expected in query bus mock', $query->getId()->getValue()));
@@ -87,12 +91,11 @@ public function testProvideHookStatus(): void
             ->method('handle')
             ->with($this->isInstanceOf(GetHookStatus::class))
             ->willReturnCallback(function ($query) {
-                return $this->createResultBasedOnQuery($query);
+                return $this->createResultBasedOnHookStatusQuery($query);
             })
         ;
         $hookStatusProvider = new QueryProvider(
             $this->queryBus,
-            $this->createMock(DenormalizerInterface::class)
         );
         $get = new Get();
         $get = $get->withExtraProperties(['query' => "PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHookStatus"]);
@@ -111,56 +114,31 @@ public function testProvideHook(): void
             ->method('handle')
             ->with($this->isInstanceOf(GetHook::class))
             ->willReturnCallback(function ($query) {
-                return $this->createResultBasedOnObjectModel($query);
+                return $this->createResultBasedOnHookQuery($query);
             })
         ;
 
         $hookStatusProvider = new QueryProvider(
             $this->queryBus,
-            $this->setUpSerializerMock()
         );
         $get = new Get();
-        $get = $get->withExtraProperties([
-            'dto' => "PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHook",
-            'denormalizer' => "src\PrestaShopBundle\ApiPlatform\Resources\Hook.php",
-        ]);
-        /** @var Hook $hookDto */
+        $get = $get->withExtraProperties(['query' => 'PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHook']);
+        /** @var HookQuery $hookDto */
         $hookDto = $hookStatusProvider->provide($get, ['id' => 1]);
-        self::assertEquals(false, $hookDto->active);
-        /** @var Hook $hookDto */
+        self::assertEquals(false, $hookDto->isActive());
+        /** @var HookQuery $hookDto */
         $hookDto = $hookStatusProvider->provide($get, ['id' => 2]);
-        self::assertTrue($hookDto->active);
+        self::assertTrue($hookDto->isActive());
     }
 
     public function testProvideNoQueryThrowsException(): void
     {
         $hookStatusProvider = new QueryProvider(
             $this->createMock(CommandBusInterface::class),
-            $this->createMock(DenormalizerInterface::class)
         );
         $get = new Get();
 
         $this->expectException(NoExtraPropertiesFoundException::class);
         $hookStatusProvider->provide($get, ['id' => 1]);
     }
-
-    private function setUpSerializerMock(): Serializer
-    {
-        $firstHookDto = new Hook();
-        $firstHookDto->active = false;
-
-        $secondHookDto = new Hook();
-        $secondHookDto->active = true;
-
-        $serializerMock = $this->createMock(Serializer::class);
-        $serializerMock
-            ->expects(static::exactly(2))
-            ->method('denormalize')
-            ->willReturnOnConsecutiveCalls(
-                $firstHookDto, $secondHookDto
-            )
-        ;
-
-        return $serializerMock;
-    }
 }

From 19eea50e7c84f10ee8e3764e1863539b229a01c3 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Wed, 19 Jul 2023 17:38:36 +0200
Subject: [PATCH 0584/1030] Functional Tests : Hummingbird - FO - Login -
 Password reminder

---
 .../classic/01_login/01_passwordReminder.ts   |   2 +-
 .../05_passwordReminder.ts                    |   2 +-
 .../01_login/01_passwordReminder.ts           | 211 ++++++++++++++++++
 .../UI/commonTests/FO/hummingbird/account.ts  |  78 +++++++
 tests/UI/pages/FO/FObasePage.ts               |  25 +++
 tests/UI/pages/FO/hummingbird/login/index.ts  |   1 +
 .../FO/hummingbird/passwordReminder/index.ts  |  25 +++
 tests/UI/pages/FO/login/index.ts              |   2 +-
 tests/UI/pages/FO/passwordReminder/index.ts   |  11 +-
 9 files changed, 349 insertions(+), 8 deletions(-)
 create mode 100644 tests/UI/campaigns/functional/FO/hummingbird/01_login/01_passwordReminder.ts
 create mode 100644 tests/UI/commonTests/FO/hummingbird/account.ts
 create mode 100644 tests/UI/pages/FO/hummingbird/passwordReminder/index.ts

diff --git a/tests/UI/campaigns/functional/FO/classic/01_login/01_passwordReminder.ts b/tests/UI/campaigns/functional/FO/classic/01_login/01_passwordReminder.ts
index 99f9af8711dac..a3235300abca1 100644
--- a/tests/UI/campaigns/functional/FO/classic/01_login/01_passwordReminder.ts
+++ b/tests/UI/campaigns/functional/FO/classic/01_login/01_passwordReminder.ts
@@ -12,7 +12,7 @@ import {createAccountTest} from '@commonTests/FO/account';
 import {homePage} from '@pages/FO/home';
 import {loginPage} from '@pages/FO/login';
 import {myAccountPage} from '@pages/FO/myAccount';
-import passwordReminderPage from '@pages/FO/passwordReminder';
+import {passwordReminderPage} from '@pages/FO/passwordReminder';
 
 // Import data
 import CustomerData from '@data/faker/customer';
diff --git a/tests/UI/campaigns/functional/FO/classic/11_checkout/01_personalInformation/05_passwordReminder.ts b/tests/UI/campaigns/functional/FO/classic/11_checkout/01_personalInformation/05_passwordReminder.ts
index 9e70db6d64106..0eaf51377de51 100644
--- a/tests/UI/campaigns/functional/FO/classic/11_checkout/01_personalInformation/05_passwordReminder.ts
+++ b/tests/UI/campaigns/functional/FO/classic/11_checkout/01_personalInformation/05_passwordReminder.ts
@@ -13,7 +13,7 @@ import {homePage} from '@pages/FO/home';
 import productPage from '@pages/FO/product';
 import cartPage from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
-import passwordReminderPage from '@pages/FO/passwordReminder';
+import {passwordReminderPage} from '@pages/FO/passwordReminder';
 import {myAccountPage} from '@pages/FO/myAccount';
 
 // Import data
diff --git a/tests/UI/campaigns/functional/FO/hummingbird/01_login/01_passwordReminder.ts b/tests/UI/campaigns/functional/FO/hummingbird/01_login/01_passwordReminder.ts
new file mode 100644
index 0000000000000..88efc7ddd913d
--- /dev/null
+++ b/tests/UI/campaigns/functional/FO/hummingbird/01_login/01_passwordReminder.ts
@@ -0,0 +1,211 @@
+// Import utils
+import helper from '@utils/helpers';
+import mailHelper from '@utils/mailHelper';
+import testContext from '@utils/testContext';
+
+// Import commonTests
+import {setupSmtpConfigTest, resetSmtpConfigTest} from '@commonTests/BO/advancedParameters/smtp';
+import {deleteCustomerTest} from '@commonTests/BO/customers/customer';
+import createAccountTest from '@commonTests/FO/hummingbird/account';
+import {installHummingbird, uninstallHummingbird} from '@commonTests/FO/hummingbird';
+
+// Import FO pages
+import homePage from '@pages/FO/hummingbird/home';
+import loginPage from '@pages/FO/hummingbird/login';
+import myAccountPage from '@pages/FO/hummingbird/myAccount';
+import passwordReminderPage from '@pages/FO/hummingbird/passwordReminder';
+
+// Import data
+import CustomerData from '@data/faker/customer';
+import type MailDevEmail from '@data/types/maildevEmail';
+
+import {expect} from 'chai';
+import type MailDev from 'maildev';
+import type {BrowserContext, Page} from 'playwright';
+
+const baseContext: string = 'functional_FO_hummingbird_login_passwordReminder';
+
+/*
+Pre-condition:
+- Config smtp
+- Create new customer on FO
+Scenario:
+- Send an email to reset password
+- Reset password
+- Try to sign in with old password and check error message
+- Try to sign in with new password
+Post-condition:
+- Delete created customer
+- Go back to default smtp config
+ */
+describe('FO - Login : Password reminder', async () => {
+  let browserContext: BrowserContext;
+  let page: Page;
+  let newMail: MailDevEmail;
+  let mailListener: MailDev;
+
+  const resetPasswordMailSubject: string = 'Password query confirmation';
+  const customerData: CustomerData = new CustomerData();
+  const newPassword: string = 'new test password';
+  const customerNewPassword: CustomerData = new CustomerData();
+  customerNewPassword.email = customerData.email;
+  customerNewPassword.password = newPassword;
+
+  // Pre-condition : Install Hummingbird
+  installHummingbird(`${baseContext}_preTest_1`);
+
+  // Pre-Condition : Setup config SMTP
+  setupSmtpConfigTest(`${baseContext}_preTest_2`);
+
+  // Pre-condition : Create new customer on FO
+  createAccountTest(customerData, `${baseContext}_preTest_3`);
+
+  // before and after functions
+  before(async function () {
+    browserContext = await helper.createBrowserContext(this.browser);
+    page = await helper.newTab(browserContext);
+
+    mailListener = mailHelper.createMailListener();
+    mailHelper.startListener(mailListener);
+    // Handle every new email
+    mailListener.on('new', (email: MailDevEmail) => {
+      newMail = email;
+    });
+  });
+
+  after(async () => {
+    await helper.closeBrowserContext(browserContext);
+    mailHelper.stopListener(mailListener);
+  });
+
+  describe('Go to FO and check the password reminder', async () => {
+    it('should open the shop page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToShopFO', baseContext);
+
+      await homePage.goTo(page, global.FO.URL);
+
+      const result = await homePage.isHomePage(page);
+      await expect(result).to.be.true;
+    });
+
+    it('should go to login page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToLoginPage', baseContext);
+
+      await homePage.goToLoginPage(page);
+
+      const pageTitle = await loginPage.getPageTitle(page);
+      await expect(pageTitle).to.equal(loginPage.pageTitle);
+    });
+
+    it('should click on \'Forgot your password?\' link', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToPasswordReminderPage', baseContext);
+
+      await loginPage.goToPasswordReminderPage(page);
+
+      const pageTitle = await passwordReminderPage.getPageTitle(page);
+      await expect(pageTitle).to.equal(passwordReminderPage.pageTitle);
+    });
+
+    it('should set the email address and send reset link', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'sendResetPasswordLink', baseContext);
+
+      await passwordReminderPage.sendResetPasswordLink(page, customerData.email);
+
+      const successAlertContent = await passwordReminderPage.checkResetLinkSuccess(page);
+      await expect(successAlertContent).to.contains(customerData.email);
+    });
+
+    it('should check if reset password mail is in mailbox', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'checkResetPasswordMail', baseContext);
+
+      await expect(newMail.subject).to.contains(resetPasswordMailSubject);
+    });
+
+    it('should open reset password link', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'openResetPasswordLink', baseContext);
+
+      await passwordReminderPage.openForgotPasswordPage(page, newMail.text);
+
+      const pageTitle = await passwordReminderPage.getPageTitle(page);
+      await expect(pageTitle).to.equal(passwordReminderPage.pageTitle);
+    });
+
+    it('should check the email address to reset password', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'checkEmailAddress', baseContext);
+
+      const emailAddress = await passwordReminderPage.getEmailAddressToReset(page);
+      await expect(emailAddress).to.contains(customerData.email);
+    });
+
+    it('should change the password and check the validation message', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'changePassword', baseContext);
+
+      await passwordReminderPage.setNewPassword(page, newPassword);
+
+      const successMessage = await myAccountPage.getSuccessMessageAlert(page);
+      await expect(successMessage).to.equal(`${myAccountPage.resetPasswordSuccessMessage} ${customerData.email}`);
+    });
+
+    it('should logout from FO', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'signOutFO', baseContext);
+
+      await myAccountPage.logout(page);
+      const isCustomerConnected = await myAccountPage.isCustomerConnected(page);
+      await expect(isCustomerConnected, 'Customer is connected').to.be.false;
+    });
+
+    it('should try to login with old password and check the error message', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'signInFOWithOldPassword', baseContext);
+
+      await loginPage.customerLogin(page, customerData, false);
+
+      const loginError = await loginPage.getLoginError(page);
+      await expect(loginError).to.contains(loginPage.loginErrorText);
+    });
+
+    it('should sign in with new password', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'signInFO', baseContext);
+
+      await loginPage.customerLogin(page, customerNewPassword);
+
+      const isCustomerConnected = await myAccountPage.isCustomerConnected(page);
+      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+    });
+
+    it('should logout from FO', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'signOutFO2', baseContext);
+
+      await myAccountPage.logout(page);
+
+      const isCustomerConnected = await myAccountPage.isCustomerConnected(page);
+      await expect(isCustomerConnected, 'Customer is connected').to.be.false;
+    });
+
+    it('should click on \'Forgot your password?\' link', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'clickOnForgetPassword2', baseContext);
+
+      await loginPage.goToPasswordReminderPage(page);
+
+      const pageTitle = await passwordReminderPage.getPageTitle(page);
+      await expect(pageTitle).to.equal(passwordReminderPage.pageTitle);
+    });
+
+    it('should set the customer email and check the error alert', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'checkErrorMessage', baseContext);
+
+      await passwordReminderPage.sendResetPasswordLink(page, customerData.email);
+
+      const regeneratePasswordAlert = await passwordReminderPage.getErrorMessage(page);
+      await expect(regeneratePasswordAlert).to.contains(passwordReminderPage.errorMessage);
+    });
+  });
+
+  // Post-condition : Delete created customer
+  deleteCustomerTest(customerData, `${baseContext}_postTest_1`);
+
+  // Post-condition : Reset SMTP config
+  resetSmtpConfigTest(`${baseContext}_postTest_2`);
+
+  // Post-condition : Uninstall Hummingbird
+  uninstallHummingbird(`${baseContext}_postTest_3`);
+});
diff --git a/tests/UI/commonTests/FO/hummingbird/account.ts b/tests/UI/commonTests/FO/hummingbird/account.ts
new file mode 100644
index 0000000000000..60f0c26c29b15
--- /dev/null
+++ b/tests/UI/commonTests/FO/hummingbird/account.ts
@@ -0,0 +1,78 @@
+// Import utils
+import helper from '@utils/helpers';
+import testContext from '@utils/testContext';
+
+// Import FO pages
+import homePage from '@pages/FO/hummingbird/home';
+import foLoginPage from '@pages/FO/hummingbird/login';
+import foCreateAccountPage from '@pages/FO/hummingbird/myAccount/add';
+
+// Import data
+import type CustomerData from '@data/faker/customer';
+
+import {expect} from 'chai';
+import type {BrowserContext, Page} from 'playwright';
+
+let browserContext: BrowserContext;
+let page: Page;
+
+/**
+ * Function to create account in FO
+ * @param customerData {CustomerData} Data to set when creating the account
+ * @param baseContext {string} String to identify the test
+ */
+function createAccountTest(customerData: CustomerData, baseContext: string = 'commonTests-createAccountTest'): void {
+  describe('PRE-TEST: Create account on FO', async () => {
+    // before and after functions
+    before(async function () {
+      browserContext = await helper.createBrowserContext(this.browser);
+      page = await helper.newTab(browserContext);
+    });
+
+    after(async () => {
+      await helper.closeBrowserContext(browserContext);
+    });
+
+    it('should open FO page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'openFO', baseContext);
+
+      // Go to FO and change language
+      await homePage.goToFo(page);
+      await homePage.changeLanguage(page, 'en');
+
+      const isHomePage = await homePage.isHomePage(page);
+      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+    });
+
+    it('should go to create account page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToCreateAccountPage', baseContext);
+
+      await homePage.goToLoginPage(page);
+      await foLoginPage.goToCreateAccountPage(page);
+
+      const pageHeaderTitle = await foCreateAccountPage.getHeaderTitle(page);
+      await expect(pageHeaderTitle).to.equal(foCreateAccountPage.formTitle);
+    });
+
+    it('should create new account', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'createAccount', baseContext);
+
+      await foCreateAccountPage.createAccount(page, customerData);
+
+      const isCustomerConnected = await homePage.isCustomerConnected(page);
+      await expect(isCustomerConnected).to.be.true;
+    });
+
+    it('should sign out from FO', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'signOutFO', baseContext);
+
+      await foCreateAccountPage.goToHomePage(page);
+      await homePage.logout(page);
+
+      const isCustomerConnected = await homePage.isCustomerConnected(page);
+      await expect(isCustomerConnected, 'Customer is connected').to.be.false;
+    });
+  });
+}
+
+export default createAccountTest;
diff --git a/tests/UI/pages/FO/FObasePage.ts b/tests/UI/pages/FO/FObasePage.ts
index 75977fad31e70..dd320f32e0495 100644
--- a/tests/UI/pages/FO/FObasePage.ts
+++ b/tests/UI/pages/FO/FObasePage.ts
@@ -125,6 +125,10 @@ export default class FOBasePage extends CommonPage {
 
   protected readonly userMenuDropdown: string;
 
+  protected readonly languageSelector: string;
+
+  protected readonly navbarLink: string;
+
   protected theme: string;
 
   /**
@@ -210,6 +214,8 @@ export default class FOBasePage extends CommonPage {
 
     // Hummingbird
     this.userMenuDropdown = '#userMenuButton';
+    this.languageSelector = '#language-selector';
+    this.navbarLink = '.navbar-brand';
 
     this.theme = 'classic';
   }
@@ -267,6 +273,12 @@ export default class FOBasePage extends CommonPage {
    * @returns {Promise<void>}
    */
   async goToHomePage(page: Page): Promise<void> {
+    if (this.theme === 'hummingbird') {
+      await this.waitForVisibleSelector(page, this.navbarLink);
+      await this.clickAndWaitForLoadState(page, this.navbarLink);
+      return;
+    }
+
     await this.waitForVisibleSelector(page, this.desktopLogo);
     await this.clickAndWaitForLoadState(page, this.desktopLogoLink);
   }
@@ -345,6 +357,19 @@ export default class FOBasePage extends CommonPage {
    * @return {Promise<void>}
    */
   async changeLanguage(page: Page, lang: string = 'en'): Promise<void> {
+    if (this.theme === 'hummingbird') {
+      const langOptions = await page.$$(`${this.languageSelector} option`);
+
+      // eslint-disable-next-line no-restricted-syntax
+      for (const [keyOption, langOption] of Object.entries(langOptions)) {
+        if ((await langOption.getAttribute('data-iso-code')) === lang) {
+          await page.selectOption(this.languageSelector, {index: parseInt(keyOption, 10)});
+          return;
+        }
+      }
+
+      return;
+    }
     await Promise.all([
       page.click(this.languageSelectorExpandIcon),
       this.waitForVisibleSelector(page, this.languageSelectorList),
diff --git a/tests/UI/pages/FO/hummingbird/login/index.ts b/tests/UI/pages/FO/hummingbird/login/index.ts
index b15dbcc3a9446..4ff1f36eab6ca 100644
--- a/tests/UI/pages/FO/hummingbird/login/index.ts
+++ b/tests/UI/pages/FO/hummingbird/login/index.ts
@@ -17,6 +17,7 @@ class Login extends LoginPage {
     this.theme = 'hummingbird';
 
     this.displayRegisterFormLink = 'div a[data-link-action=\'display-register-form\']';
+    this.passwordReminderLink = '.login__forgot-password a';
     this.alertDangerTextBlock = '.login .help-block .alert.alert-danger';
   }
 }
diff --git a/tests/UI/pages/FO/hummingbird/passwordReminder/index.ts b/tests/UI/pages/FO/hummingbird/passwordReminder/index.ts
new file mode 100644
index 0000000000000..03b977f0c917b
--- /dev/null
+++ b/tests/UI/pages/FO/hummingbird/passwordReminder/index.ts
@@ -0,0 +1,25 @@
+// Import FO pages
+import {PasswordReminderPage} from '@pages/FO/passwordReminder/index';
+
+/**
+ * Password Reminder page, contains functions that can be used on the page
+ * @class
+ * @extends FOBasePage
+ */
+class PasswordReminder extends PasswordReminderPage {
+  /**
+   * @constructs
+   * Setting up texts and selectors to use on my account page
+   */
+  constructor() {
+    super();
+
+    this.theme = 'hummingbird';
+
+    this.emailAddressText = 'section.renew-password > div.mb-3:nth-child(1)';
+    this.sendResetLinkSuccessAlert = '#content .alert-success';
+    this.errorMessageAlert = '#content .alert-danger';
+  }
+}
+
+export default new PasswordReminder();
diff --git a/tests/UI/pages/FO/login/index.ts b/tests/UI/pages/FO/login/index.ts
index bfed08e75ab28..b9b080216019f 100644
--- a/tests/UI/pages/FO/login/index.ts
+++ b/tests/UI/pages/FO/login/index.ts
@@ -28,7 +28,7 @@ class LoginPage extends FOBasePage {
 
   protected displayRegisterFormLink: string;
 
-  private readonly passwordReminderLink: string;
+  protected passwordReminderLink: string;
 
   private readonly showPasswordButton: string;
 
diff --git a/tests/UI/pages/FO/passwordReminder/index.ts b/tests/UI/pages/FO/passwordReminder/index.ts
index 4b3089214bd7e..61463b772d5d5 100644
--- a/tests/UI/pages/FO/passwordReminder/index.ts
+++ b/tests/UI/pages/FO/passwordReminder/index.ts
@@ -7,7 +7,7 @@ import type {Page} from 'playwright';
  * @class
  * @extends FOBasePage
  */
-class PasswordReminder extends FOBasePage {
+class PasswordReminderPage extends FOBasePage {
   public readonly pageTitle: string;
 
   public readonly errorMessage: string;
@@ -18,7 +18,7 @@ class PasswordReminder extends FOBasePage {
 
   private readonly sendResetLinkButton: string;
 
-  private readonly emailAddressText: string;
+  protected emailAddressText: string;
 
   private readonly newPasswordInput: string;
 
@@ -26,9 +26,9 @@ class PasswordReminder extends FOBasePage {
 
   private readonly submitButton: string;
 
-  private readonly sendResetLinkSuccessAlert: string;
+  protected sendResetLinkSuccessAlert: string;
 
-  private readonly errorMessageAlert: string;
+  protected errorMessageAlert: string;
 
   /**
    * @constructs
@@ -123,4 +123,5 @@ class PasswordReminder extends FOBasePage {
   }
 }
 
-export default new PasswordReminder();
+const passwordReminderPage = new PasswordReminderPage();
+export {passwordReminderPage, PasswordReminderPage};

From ef1d1d9373e1a30f90dcbbb7ff826d51a8167a5f Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Wed, 19 Jul 2023 20:24:28 +0200
Subject: [PATCH 0585/1030] Fixed ESLint error

---
 .../BO/14_advancedParameters/10_multistore/03_CRUDShops.ts       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/03_CRUDShops.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/03_CRUDShops.ts
index b970c1b6f1218..31f18388b6bd5 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/03_CRUDShops.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/03_CRUDShops.ts
@@ -12,7 +12,6 @@ import multiStorePage from '@pages/BO/advancedParameters/multistore';
 import addShopPage from '@pages/BO/advancedParameters/multistore/shop/add';
 import addShopUrlPage from '@pages/BO/advancedParameters/multistore/url/addURL';
 import shopPage from '@pages/BO/advancedParameters/multistore/shop';
-import shopUrlPage from '@pages/BO/advancedParameters/multistore/url';
 
 // Import data
 import ShopData from '@data/faker/shop';

From 8a2cc1c3fb96c00b082a6abf6a709788caba186e Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Thu, 20 Jul 2023 09:55:23 +0200
Subject: [PATCH 0586/1030] Delete data from product_carrier table

---
 classes/Product.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/classes/Product.php b/classes/Product.php
index 3b059984e42f7..82b574ee2325b 100644
--- a/classes/Product.php
+++ b/classes/Product.php
@@ -1346,6 +1346,7 @@ public function delete()
             !$this->deleteProductSale() ||
             !$this->deleteSearchIndexes() ||
             !$this->deleteAccessories() ||
+            !$this->deleteCarrierRestrictions() ||
             !$this->deleteFromAccessories() ||
             !$this->deleteFromSupplier() ||
             !$this->deleteDownload() ||
@@ -4582,6 +4583,20 @@ public function deleteAccessories()
         return Db::getInstance()->delete('accessory', 'id_product_1 = ' . (int) $this->id);
     }
 
+    /**
+     * Delete product carrier restriction.
+     *
+     * @return bool Deletion result
+     */
+    public function deleteCarrierRestrictions()
+    {
+        $all_shops = Context::getContext()->shop->getContext() == Shop::CONTEXT_ALL ? true : false;
+
+        return Db::getInstance()->execute('DELETE FROM `' . _DB_PREFIX_ . 'product_carrier`
+            WHERE `id_product` = ' . (int) $this->id . (!$all_shops ? ' AND `id_shop` = ' . (int) Context::getContext()->shop->id : '')
+        );
+    }
+
     /**
      * Delete product from other products accessories.
      *

From f7749a47681ff2b1d52c5cabcfe99933fa1db548 Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Thu, 20 Jul 2023 10:38:21 +0200
Subject: [PATCH 0587/1030] // Changelog 8.1.1

---
 CONTRIBUTORS.md    |  4 +++
 docs/CHANGELOG.txt | 87 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 91 insertions(+)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index fa13540260fdf..75c893e96f79b 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -270,8 +270,10 @@ GitHub contributors:
 - Fabio Chelly
 - Fabio Vannini
 - Fabrice Pantanella
+- fatm
 - Fatma BOUCHEKOI
 - Fatma Bouchekoua
+- Fatima Mazhit
 - fchellypresta
 - Felipe Uribe
 - fetis
@@ -677,6 +679,7 @@ GitHub contributors:
 - Petyuska
 - Philip Iezzi
 - PhpMadman
+- PICHAT Morgan
 - Pierre
 - Pierre Avizou
 - Pierre Joube
@@ -885,6 +888,7 @@ GitHub contributors:
 - tiledcode
 - timactive
 - timsit
+- tleon
 - tmackay
 - TMMeilleur
 - tolispy
diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
index 8bc8a34ba13e1..7cbeb65eab51f 100644
--- a/docs/CHANGELOG.txt
+++ b/docs/CHANGELOG.txt
@@ -23,6 +23,93 @@ needs please refer to https://devdocs.prestashop.com/ for more information.
 
 Changelog for PrestaShop 8
 
+####################################
+#   v8.1.1 - (2023-07-20)
+####################################
+
+- Back Office:
+  - Improvement:
+    - #33278: Update dependencies (by @mflasquin)
+    - #32894: Admin search - Transmit the search query param (by @sowbiba)
+    - #32789: Warning on Modules List page when Distribution API cannot be contacted (by @0x346e3730)
+    - GHSA-gf46-prm4-56pc Protect from writing files on server through SQL form (by @Matthieu Rolland)
+    - GHSA-m9r4-3fg7-pqm2 Protect file name from path traversal attack (by @Matthieu Rolland)
+    - GHSA-75p5-jwx4-qw9h Escape variable to prevent sql injection (by @Matthieu Rolland)
+    - GHSA-hpf4-v7v2-95p2 Protect translation file reading form path traversal attack (by @Matthieu Rolland)
+    - GHSA-2rf5-3fw8-qm47 Keep file name from containing path traversal (by @Matthieu Rolland)
+    - GHSA-v4gr-v679-42p7 Keep file name from containing path traversal (by @Matthieu Rolland)
+  - Bug fix:
+    - #32493: Fix: When updating object images, old thumbnails are not deleted and updated (by @Codencode)
+    - #33255: Prevent deleting main URL of a store (by @Hlavtox)
+    - #33008: Fix 'New' Translation domain (by @mflasquin)
+    - #33124: Fix issue when disable tax, do not delete tax rules (by @mflasquin)
+    - #33236: Module manager - Empty category - Add raw filter to display html content (by @sowbiba)
+    - #33164: Fix authorized application column length (by @mflasquin)
+    - #33151:  Fix for product editor is not storing some fields in multi shop context conservative fix for 8.1.x (by @cruftex)
+    - #33120: Fix bad display alert when changing product combination quantity (by @fatm-dev)
+    - #33107: Fix new file button target in product attachment form; (by @fatm-dev)
+    - #33048: Add string casting for boolean fields (by @nicosomb)
+    - #32662: Remove module list item when force deletion (by @M0rgan01)
+    - #32906: Fix clear filter options on missing category (by @FabienPapet)
+    - #32615: Update ImageGenerator resize destination path (by @M0rgan01)
+    - #31379: Fix disabling a module for a specific shop applied to all shops (by @matthieu-rolland)
+    - #32790: Fix PDF translations in backoffice (by @mflasquin)
+    - #32715: Fix: [BO] : Error notification displayed in Multistore page (by @Codencode)
+    - #32656: Fix: Warning on the Cart Rules creation/editing page (by @Codencode)
+- Front Office:
+  - Bug fix:
+    - #32597: Update checkOrGenerateImageType $sourceFilePath (by @M0rgan01)
+    - #33156: Check if product is active and orderable during checkout (by @Hlavtox)
+    - #33043: Fix wrong discount amount displayed (by @boherm)
+    - #32596: Fix availability display logic (by @mflasquin)
+- Core:
+  - Bug fix:
+    - #33136: Register commonly used deprecated modifiers to Smarty config (by @kpodemski)
+    - #33148: Update autoload library to v1.0.1 (by @jolelievre)
+    - #33133:  Fix for child themes/multishop themes translations (by @kpodemski)
+  - Improvement:
+    - GHSA-xw2r-f8xv-c8xp Add missing html attributes (by @Matthieu Rolland)
+- Installer:
+  - Improvement:
+    - #32752: Update default catalog 8.1.x (by @ps-jarvis)
+- Web Services:
+  - Bug fix:
+    - #32842: Changed error code when access token is invalid (by @nicosomb)
+- Tests:
+  - Improvement:
+    - #33312: Nightly : 8.1.x - Multistore (Removed Delete shop url) (by @Progi1984)
+    - #31275: Functional Tests : Added deprecated as errors (by @Progi1984)
+    - #32769: Functional Tests : API : External Auth Server - Resource Endpoint (by @Progi1984)
+    - #32756: Functional Tests : Faceted search module - Uninstall and delete module (by @Progi1984)
+    - #32666: Functional Tests : BO - Design - Image Settings - Check base image format (by @Progi1984)
+    - #32668: Functional Tests : Cash on delivery (COD) module - Reset module (by @Progi1984)
+    - #32674: Functional Tests : Hummingbird : FO - Login : Login in FO (by @Progi1984)
+  - Bug fix:
+    - #33279: Nightly : 8.0.x : Unskip test for the issue 32914 (by @Progi1984)
+    - #33281: Nightly : 8.1.x : Unskip test for the issue 32914 (by @Progi1984)
+    - #33130: Nightly : 8.1.x : Fixed error in filterTaxes (by @Progi1984)
+    - #33131: Nightly : 8.0.x : Fixed error in filterTaxes (by @Progi1984)
+    - #33033: Nightly : Fixed install Node 14 (by @Progi1984)
+    - #33023: Nightly : Fixed install Node 14 (by @Progi1984)
+    - #33011: Nightly : Fixed mocha loader (8.1.x) (by @Progi1984)
+    - #33012: Nightly : Fixed mocha loader (8.0.x) (by @Progi1984)
+    - #32849: Nightly : Fixed functional/BO/04*/01*/08* (by @Progi1984)
+    - #32835: Nightly : 8.1.x : Fixed error in package.json (by @Progi1984)
+    - #32834: Nightly : 8.0.x : Fixed error in package.json (by @Progi1984)
+    - #32829: Nightly : Fixed functional/BO/02*/01*/viewAndEditOrder/11* (by @Progi1984)
+    - #32706: Nightly : Fixed check of shipping price (by @Progi1984)
+  - Refactoring:
+    - #33228: Nightly : 8.1.x - Skip test for the issue 32914 (by @Progi1984)
+    - #33230: Nightly : 8.0.x - Skip test for the issue 32914 (by @Progi1984)
+    - #33174: Sanity Tests - Fix bug in product V2 tests (by @nesrineabdmouleh)
+    - #33146: Product V2 tests - Fix bug in product V2 tests (Sanity & Functional campaigns) (by @nesrineabdmouleh)
+    - #32859: Refacto WS tests countries (by @boubkerbribri)
+    - #32792: Functional tests - Add new test 'Design > Position > Filter module' (by @nesrineabdmouleh)
+    - #32782: Functional tests - Add new tests 'Stock > Sort and pagination movements table' (by @nesrineabdmouleh)
+    - #32718: Functional tests - Add some tests in 'FO > Carts' page (by @nesrineabdmouleh)
+    - #32598: Functional tests - Add some tests in "Module manager > Alerts tab" (by @nesrineabdmouleh)
+    - #32640: Fix nightly 18-05 - Add reset filter step to products table (by @nesrineabdmouleh)
+
 ####################################
 #   v8.1.0 - (2023-06-20)
 ####################################

From 114fc26012c8056dccfa4bf584d45a911881a9cd Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Thu, 20 Jul 2023 11:26:13 +0200
Subject: [PATCH 0588/1030] Nightly : Develop - Fixed Mocha Loader

---
 tests/UI/package.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/UI/package.json b/tests/UI/package.json
index 851c3a8e161b0..f61861378bc3c 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -38,13 +38,13 @@
     "test:functional:BO:orders:01:0-1": "TEST_PATH='functional/BO/02_orders/01*/{0*,1*}.ts' npm run test:specific",
     "test:functional:BO:orders:01-create-orders": "TEST_PATH='functional/BO/02_orders/01*/createOrders/**/*' npm run test:specific",
     "test:functional:BO:orders:01-view-and-edit-order": "TEST_PATH='functional/BO/02_orders/01*/viewAndEditOrder/**/*' npm run test:specific",
-    "test:functional:BO:orders:02": "TEST_PATH='functional/BO/02_orders/02*/**/*' npm run test:specific",
-    "test:functional:BO:orders:03-05": "TEST_PATH='functional/BO/02_orders/0[3-5]*/**/*' npm run test:specific",
+    "test:functional:BO:orders:02": "TEST_PATH='functional/BO/02_orders/02*/*' npm run test:specific",
+    "test:functional:BO:orders:03-05": "TEST_PATH='functional/BO/02_orders/0[3-5]*/*' npm run test:specific",
     "test:functional:BO:catalog": "TEST_PATH='functional/BO/03_catalog/**/*' npm run test:specific",
     "test:functional:BO:catalog:01-02": "TEST_PATH='functional/BO/03_catalog/0[1-2]*/**/*' npm run test:specific",
-    "test:functional:BO:catalog:03-04": "TEST_PATH='functional/BO/03_catalog/0[3-4]*/**/*' npm run test:specific",
+    "test:functional:BO:catalog:03-04": "TEST_PATH='functional/BO/03_catalog/0[3-4]*/*' npm run test:specific",
     "test:functional:BO:catalog:05-06": "TEST_PATH='functional/BO/03_catalog/0[5-6]*/**/*' npm run test:specific",
-    "test:functional:BO:catalog:07-08": "TEST_PATH='functional/BO/03_catalog/0[7-8]*/**/*' npm run test:specific",
+    "test:functional:BO:catalog:07-08": "TEST_PATH='functional/BO/03_catalog/0[7-8]*/*' npm run test:specific",
     "test:functional:BO:customer": "TEST_PATH='functional/BO/04_customers/**/*' npm run test:specific",
     "test:functional:BO:customer:01": "TEST_PATH='functional/BO/04_customers/01*/**/*' npm run test:specific",
     "test:functional:BO:customer:02-03": "TEST_PATH='functional/BO/04_customers/0[2-3]*/**/*' npm run test:specific",
@@ -60,9 +60,9 @@
     "test:functional:BO:shop-parameters": "TEST_PATH='functional/BO/13_shopParameters/**/*' npm run test:specific",
     "test:functional:BO:shop-parameters:01-02": "TEST_PATH='functional/BO/13_shopParameters/0[1-2]*/**/*' npm run test:specific",
     "test:functional:BO:shop-parameters:03-04": "TEST_PATH='functional/BO/13_shopParameters/0[3-4]*/**/*' npm run test:specific",
-    "test:functional:BO:shop-parameters:05-07": "TEST_PATH='functional/BO/13_shopParameters/0[5-7]*/**/*' npm run test:specific",
+    "test:functional:BO:shop-parameters:05-07": "TEST_PATH='functional/BO/13_shopParameters/0[5-7]*/*' npm run test:specific",
     "test:functional:BO:advanced-parameters": "TEST_PATH='functional/BO/14_advancedParameters/**/*' npm run test:specific",
-    "test:functional:BO:advanced-parameters:01-06": "TEST_PATH='functional/BO/14_advancedParameters/0[1-6]*/**/*' npm run test:specific",
+    "test:functional:BO:advanced-parameters:01-06": "TEST_PATH='functional/BO/14_advancedParameters/0[1-6]*/*' npm run test:specific",
     "test:functional:BO:advanced-parameters:07-10": "TEST_PATH='functional/BO/14_advancedParameters/{0[7-9],10}*/**/*' npm run test:specific",
     "test:functional:BO:advanced-parameters:11-12": "TEST_PATH='functional/BO/14_advancedParameters/{11,12}*/**/*' npm run test:specific",
     "test:functional:BO:header": "TEST_PATH='functional/BO/15_header/**/*' npm run test:specific",

From fd508c5119302dae359e01cf3db46b093e60d71c Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Thu, 20 Jul 2023 11:35:36 +0200
Subject: [PATCH 0589/1030] Remove non responsive component

---
 admin-dev/themes/default/js/admin-theme.js    |  1 -
 admin-dev/themes/new-theme/js/nav_bar.ts      |  1 -
 .../components/layout/_non_responsive.scss    | 19 ---------
 admin-dev/themes/new-theme/scss/theme.scss    |  1 -
 .../components/layout/non-responsive.tpl      | 40 ------------------
 .../themes/new-theme/template/layout.tpl      |  5 ---
 .../Component/Layout/non_responsive.html.twig | 41 -------------------
 .../Admin/Layout/non_responsive.html.twig     | 27 ------------
 .../Twig/Component/NonResponsive.php          | 37 -----------------
 9 files changed, 172 deletions(-)
 delete mode 100644 admin-dev/themes/new-theme/scss/components/layout/_non_responsive.scss
 delete mode 100644 admin-dev/themes/new-theme/template/components/layout/non-responsive.tpl
 delete mode 100644 src/PrestaShopBundle/Resources/views/Admin/Component/Layout/non_responsive.html.twig
 delete mode 100644 src/PrestaShopBundle/Resources/views/Admin/Layout/non_responsive.html.twig
 delete mode 100644 src/PrestaShopBundle/Twig/Component/NonResponsive.php

diff --git a/admin-dev/themes/default/js/admin-theme.js b/admin-dev/themes/default/js/admin-theme.js
index 1c087c4a41473..4c4b41b8479a6 100644
--- a/admin-dev/themes/default/js/admin-theme.js
+++ b/admin-dev/themes/default/js/admin-theme.js
@@ -338,7 +338,6 @@ $(() => {
       .removeClass('collapse')
       .addClass('submenu');
     $('.shop-list-title').remove();
-    $('.js-non-responsive').hide();
     $('.mobile-layer')
       .addClass('d-none')
       .removeClass('expanded');
diff --git a/admin-dev/themes/new-theme/js/nav_bar.ts b/admin-dev/themes/new-theme/js/nav_bar.ts
index e636cef2c1d2a..aefb8c857535a 100644
--- a/admin-dev/themes/new-theme/js/nav_bar.ts
+++ b/admin-dev/themes/new-theme/js/nav_bar.ts
@@ -290,7 +290,6 @@ export default class NavBar {
       .removeClass('collapse')
       .addClass('submenu');
     $('.shop-list-title').remove();
-    $('.js-non-responsive').hide();
     $('.mobile-layer')
       .addClass('d-none')
       .removeClass('expanded');
diff --git a/admin-dev/themes/new-theme/scss/components/layout/_non_responsive.scss b/admin-dev/themes/new-theme/scss/components/layout/_non_responsive.scss
deleted file mode 100644
index ca88c5ff15842..0000000000000
--- a/admin-dev/themes/new-theme/scss/components/layout/_non_responsive.scss
+++ /dev/null
@@ -1,19 +0,0 @@
-#non-responsive {
-  position: fixed;
-  top: 3.438rem;
-  left: 0.125rem;
-  z-index: 501;
-  display: none;
-  width: 100%;
-  height: 100%;
-  padding: 4.375rem 2.5rem 0;
-  font-size: 1.063rem;
-  color: $white;
-  background: $gray-dark;
-
-  h1 {
-    font-size: 1.875rem;
-    font-weight: 400;
-    color: $white;
-  }
-}
diff --git a/admin-dev/themes/new-theme/scss/theme.scss b/admin-dev/themes/new-theme/scss/theme.scss
index 1d6bb854ef9a1..e4cdd0a91a147 100644
--- a/admin-dev/themes/new-theme/scss/theme.scss
+++ b/admin-dev/themes/new-theme/scss/theme.scss
@@ -49,7 +49,6 @@
 @import "components/layout/light_display";
 @import "components/layout/main_header";
 @import "components/layout/nav_bar";
-@import "components/layout/non_responsive";
 @import "components/material_choice_tree";
 @import "components/modal";
 @import "components/modulescards";
diff --git a/admin-dev/themes/new-theme/template/components/layout/non-responsive.tpl b/admin-dev/themes/new-theme/template/components/layout/non-responsive.tpl
deleted file mode 100644
index 32b0dd55aa858..0000000000000
--- a/admin-dev/themes/new-theme/template/components/layout/non-responsive.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-{**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- *}
-<div id="non-responsive" class="js-non-responsive">
-  <h1>{l s='Oh no!'}</h1>
-  <p class="mt-3">
-    {l s='The mobile version of this page is not available yet.'}
-  </p>
-  <p class="mt-2">
-    {l s='Please use a desktop computer to access this page, until is adapted to mobile.'}
-  </p>
-  <p class="mt-2">
-    {l s='Thank you.'}
-  </p>
-  <a href="{$default_tab_link|escape:'html':'UTF-8'}" class="btn btn-primary py-1 mt-3">
-    <i class="material-icons rtl-flip">arrow_back</i>
-    {l s='Back' d='Admin.Global'}
-  </a>
-</div>
diff --git a/admin-dev/themes/new-theme/template/layout.tpl b/admin-dev/themes/new-theme/template/layout.tpl
index 93e665f6d1ba8..04ef2d8d12db8 100644
--- a/admin-dev/themes/new-theme/template/layout.tpl
+++ b/admin-dev/themes/new-theme/template/layout.tpl
@@ -186,11 +186,6 @@
 </div>
 
 {if (!isset($lite_display) || (isset($lite_display) && !$lite_display))}
-    {render_template
-      smarty_template="components/layout/non-responsive.tpl"
-      twig_template="@PrestaShop/Admin/Layout/non_responsive.html.twig"
-      default_tab_link=$default_tab_link
-    }
   <div class="mobile-layer"></div>
 
   {if $display_footer}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/non_responsive.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/non_responsive.html.twig
deleted file mode 100644
index f5833596da55f..0000000000000
--- a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/non_responsive.html.twig
+++ /dev/null
@@ -1,41 +0,0 @@
-{#**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- *#}
-<div id="non-responsive" class="js-non-responsive">
-  <h1>{{ 'Oh no!'|trans }}</h1>
-  <p class="mt-3">
-    {{ 'The mobile version of this page is not available yet.'|trans }}
-  </p>
-  <p class="mt-2">
-    {{ 'Please use a desktop computer to access this page, until is adapted to mobile.'|trans }}
-  </p>
-  <p class="mt-2">
-    {{ 'Thank you.'|trans }}
-  </p>
-  <a href="{{ defaultTabLink|escape('html_attr') }}" class="btn btn-primary py-1 mt-3">
-    <i class="material-icons rtl-flip">arrow_back</i>
-    {{ 'Back'|trans({}, 'Admin.Global') }}
-  </a>
-</div>
-
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/non_responsive.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/non_responsive.html.twig
deleted file mode 100644
index 01e7cbd07750f..0000000000000
--- a/src/PrestaShopBundle/Resources/views/Admin/Layout/non_responsive.html.twig
+++ /dev/null
@@ -1,27 +0,0 @@
-{#**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- *#}
-{{ component('NonResponsive', {
-  defaultTabLink: default_tab_link
-}) }}
diff --git a/src/PrestaShopBundle/Twig/Component/NonResponsive.php b/src/PrestaShopBundle/Twig/Component/NonResponsive.php
deleted file mode 100644
index 83da3e20ee846..0000000000000
--- a/src/PrestaShopBundle/Twig/Component/NonResponsive.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-declare(strict_types=1);
-
-namespace PrestaShopBundle\Twig\Component;
-
-use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
-
-#[AsTwigComponent(template: '@PrestaShop/Admin/Component/Layout/non_responsive.html.twig')]
-class NonResponsive
-{
-    public string $defaultTabLink;
-}

From 6a2f83fcd2032ebfb4ca85595d5ac81791852698 Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Thu, 20 Jul 2023 12:28:05 +0200
Subject: [PATCH 0590/1030] Condition out manufacturer if not present

---
 controllers/front/ProductController.php | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php
index 3ca1a51e04933..f1ff52a0f5380 100644
--- a/controllers/front/ProductController.php
+++ b/controllers/front/ProductController.php
@@ -437,11 +437,22 @@ public function initContent()
                 $product_for_template = $filteredProduct['object'];
             }
 
-            $manufacturerPresenter = new ManufacturerPresenter($this->context->link);
-            $productManufacturer = $manufacturerPresenter->present(
-                new Manufacturer((int) $this->product->id_manufacturer, $this->context->language->id),
-                $this->context->language
-            );
+            // Prepare information about product manufacturer
+            $productManufacturer = null;
+            $manufacturerImageUrl = null;
+            $productBrandUrl = null;
+
+            if (!empty($this->product->id_manufacturer)) {
+                $manufacturerPresenter = new ManufacturerPresenter($this->context->link);
+                $productManufacturer = $manufacturerPresenter->present(
+                    new Manufacturer((int) $this->product->id_manufacturer, $this->context->language->id),
+                    $this->context->language
+                );
+
+                // These two variables are deprecated are kept just for backward compatibility and will be removed in v10
+                $manufacturerImageUrl = $productManufacturer['image']['small']['url'];
+                $productBrandUrl = $productManufacturer['url'];
+            }
 
             $this->context->smarty->assign([
                 'priceDisplay' => $priceDisplay,
@@ -452,8 +463,8 @@ public function initContent()
                 'product' => $product_for_template,
                 'displayUnitPrice' => !empty($this->product->unity) && $this->product->unit_price > 0.000000,
                 'product_manufacturer' => $productManufacturer,
-                'manufacturer_image_url' => $productManufacturer['image']['small']['url'],
-                'product_brand_url' => $productManufacturer['url'],
+                'manufacturer_image_url' => $manufacturerImageUrl,
+                'product_brand_url' => $productBrandUrl,
             ]);
 
             // Assign attribute groups to the template

From 4cc15c7917b79ea6eaffbcf1ef1ca10e67256f66 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Thu, 20 Jul 2023 12:28:58 +0200
Subject: [PATCH 0591/1030] Nightly : 8.1.x - Fixed Mocha Loader

---
 tests/UI/package.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/UI/package.json b/tests/UI/package.json
index 0cb1d49105250..6f2c65176a4b2 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -43,13 +43,13 @@
     "test:functional:BO:orders:01:0-1": "TEST_PATH='functional/BO/02_orders/01*/{0*,1*}.ts' npm run test:specific",
     "test:functional:BO:orders:01-create-orders": "TEST_PATH='functional/BO/02_orders/01*/createOrders/**/*' npm run test:specific",
     "test:functional:BO:orders:01-view-and-edit-order": "TEST_PATH='functional/BO/02_orders/01*/viewAndEditOrder/**/*' npm run test:specific",
-    "test:functional:BO:orders:02": "TEST_PATH='functional/BO/02_orders/02*/**/*' npm run test:specific",
-    "test:functional:BO:orders:03-05": "TEST_PATH='functional/BO/02_orders/0[3-5]*/**/*' npm run test:specific",
+    "test:functional:BO:orders:02": "TEST_PATH='functional/BO/02_orders/02*/*' npm run test:specific",
+    "test:functional:BO:orders:03-05": "TEST_PATH='functional/BO/02_orders/0[3-5]*/*' npm run test:specific",
     "test:functional:BO:catalog": "TEST_PATH='functional/BO/03_catalog/**/*' npm run test:specific",
     "test:functional:BO:catalog:01-02": "TEST_PATH='functional/BO/03_catalog/0[1-2]*/**/*' npm run test:specific",
-    "test:functional:BO:catalog:03-04": "TEST_PATH='functional/BO/03_catalog/0[3-4]*/**/*' npm run test:specific",
+    "test:functional:BO:catalog:03-04": "TEST_PATH='functional/BO/03_catalog/0[3-4]*/*' npm run test:specific",
     "test:functional:BO:catalog:05-06": "TEST_PATH='functional/BO/03_catalog/0[5-6]*/**/*' npm run test:specific",
-    "test:functional:BO:catalog:07-08": "TEST_PATH='functional/BO/03_catalog/0[7-8]*/**/*' npm run test:specific",
+    "test:functional:BO:catalog:07-08": "TEST_PATH='functional/BO/03_catalog/0[7-8]*/*' npm run test:specific",
     "test:functional:BO:customer": "TEST_PATH='functional/BO/04_customers/**/*' npm run test:specific",
     "test:functional:BO:customer:01": "TEST_PATH='functional/BO/04_customers/01*/**/*' npm run test:specific",
     "test:functional:BO:customer:02-03": "TEST_PATH='functional/BO/04_customers/0[2-3]*/**/*' npm run test:specific",
@@ -65,9 +65,9 @@
     "test:functional:BO:shop-parameters": "TEST_PATH='functional/BO/13_shopParameters/**/*' npm run test:specific",
     "test:functional:BO:shop-parameters:01-02": "TEST_PATH='functional/BO/13_shopParameters/0[1-2]*/**/*' npm run test:specific",
     "test:functional:BO:shop-parameters:03-04": "TEST_PATH='functional/BO/13_shopParameters/0[3-4]*/**/*' npm run test:specific",
-    "test:functional:BO:shop-parameters:05-07": "TEST_PATH='functional/BO/13_shopParameters/0[5-7]*/**/*' npm run test:specific",
+    "test:functional:BO:shop-parameters:05-07": "TEST_PATH='functional/BO/13_shopParameters/0[5-7]*/*' npm run test:specific",
     "test:functional:BO:advanced-parameters": "TEST_PATH='functional/BO/14_advancedParameters/**/*' npm run test:specific",
-    "test:functional:BO:advanced-parameters:01-06": "TEST_PATH='functional/BO/14_advancedParameters/0[1-6]*/**/*' npm run test:specific",
+    "test:functional:BO:advanced-parameters:01-06": "TEST_PATH='functional/BO/14_advancedParameters/0[1-6]*/*' npm run test:specific",
     "test:functional:BO:advanced-parameters:07-10": "TEST_PATH='functional/BO/14_advancedParameters/{0[7-9],10}*/**/*' npm run test:specific",
     "test:functional:BO:header": "TEST_PATH='functional/BO/15_header/**/*' npm run test:specific",
     "test:functional:productV2": "TEST_PATH='productV2/functional/**/*' npm run test:specific",

From a3ba728e1c5c88f07a4d00cfa2cf9ac13bc16c88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@prestashop.com>
Date: Mon, 12 Jun 2023 14:49:13 +0200
Subject: [PATCH 0592/1030] Added www-authenticate: bearer if the access token
 is invalid

---
 app/config/config.yml                    |  2 --
 src/Core/Security/TokenAuthenticator.php | 10 ++++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/config/config.yml b/app/config/config.yml
index 7b40aa8850874..51e9aaf9b338b 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -108,5 +108,3 @@ api_platform:
       - '%kernel.project_dir%/app/config/api_platform'
 
   metadata_backward_compatibility_layer: false
-  exception_to_status:
-    Lcobucci\JWT\Token\InvalidTokenStructure: 401
diff --git a/src/Core/Security/TokenAuthenticator.php b/src/Core/Security/TokenAuthenticator.php
index 4d057740dee14..9330c9798d6df 100644
--- a/src/Core/Security/TokenAuthenticator.php
+++ b/src/Core/Security/TokenAuthenticator.php
@@ -28,6 +28,8 @@
 
 namespace PrestaShop\PrestaShop\Core\Security;
 
+use Lcobucci\JWT\Parser;
+use Lcobucci\JWT\Token\InvalidTokenStructure;
 use PrestaShop\PrestaShop\Core\Security\OAuth2\ResourceServerInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface;
@@ -69,6 +71,14 @@ public function start(Request $request, AuthenticationException $authException =
 
     public function supports(Request $request): bool
     {
+        try {
+            $authorization = $request->headers->get('Authorization') ?? null;
+            $token = explode(' ', $authorization)[1];
+            (new Parser())->parse($token);
+        } catch (InvalidTokenStructure $e) {
+            return false;
+        }
+
         // Every request to the API should be handled by this Authenticator
         return true;
     }

From 25d30f2591c76afdd68c58ec38f5e7c0bf302915 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@prestashop.com>
Date: Mon, 12 Jun 2023 15:00:08 +0200
Subject: [PATCH 0593/1030] UI testsg

---
 .../02_externalAuthServer/02_resourceEndpoint.ts                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts b/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts
index ff35f20b40af6..93678da52d9d0 100644
--- a/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts
+++ b/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts
@@ -134,7 +134,7 @@ describe('API : External Auth Server - Resource Endpoint', async () => {
     });
 
     // @todo : https://github.com/PrestaShop/PrestaShop/issues/32768
-    it.skip('should request the endpoint /admin-dev/new-api/hook-status/1 with invalid access token', async function () {
+    it('should request the endpoint /admin-dev/new-api/hook-status/1 with invalid access token', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'requestEndpointWithInvalidAccessToken', baseContext);
 
       const apiResponse = await apiContext.get('new-api/hook-status/1', {

From 869edb300938167bc2cea854ab021df7578bf977 Mon Sep 17 00:00:00 2001
From: boubkerbribri <boubker.bribri@prestashop.com>
Date: Thu, 20 Jul 2023 14:22:51 +0200
Subject: [PATCH 0594/1030] UI tests: use tsconfig-paths and delete
 module_alias

---
 tests/UI/.mocharc.json     |    8 +-
 tests/UI/package-lock.json | 9246 +++++++++++++++++++++++++++++++++++-
 tests/UI/package.json      |   16 +-
 tests/UI/utils/setup.ts    |    1 -
 4 files changed, 9213 insertions(+), 58 deletions(-)

diff --git a/tests/UI/.mocharc.json b/tests/UI/.mocharc.json
index c5af1d822e68f..2f2ee7d51cd92 100644
--- a/tests/UI/.mocharc.json
+++ b/tests/UI/.mocharc.json
@@ -1,8 +1,10 @@
 {
+  "require": [
+    "tsconfig-paths/register"
+  ],
   "slow": 45000,
   "timeout": 0,
   "reporter": "mochawesome",
-  "extension": [
-    "ts"
-  ]
+  "extension": ["ts"],
+  "recursive": true
 }
diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index e86ba00ce23f7..cd6b97ea84cd5 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -1,8 +1,9123 @@
 {
   "name": "ui-tests",
   "version": "1.0.0",
-  "lockfileVersion": 1,
+  "lockfileVersion": 2,
   "requires": true,
+  "packages": {
+    "": {
+      "name": "ui-tests",
+      "version": "1.0.0",
+      "license": "OSL-3.0",
+      "dependencies": {
+        "@faker-js/faker": "^8.0.2",
+        "@s3pweb/keycloak-admin-client-cjs": "^21.0.1",
+        "@xmldom/xmldom": "^0.8.9",
+        "chai": "^4.3.7",
+        "chai-string": "^1.5.0",
+        "csv-writer": "^1.6.0",
+        "dotenv": "^16.3.1",
+        "fast-xml-parser": "^4.2.5",
+        "jpeg-js": "^0.4.4",
+        "js-image-generator": "^1.0.4",
+        "maildev": "^2.0.5",
+        "mocha": "^10.2.0",
+        "mochawesome": "^7.1.3",
+        "pdfjs-dist": "^3.4.120",
+        "playwright": "^1.36.1",
+        "xpath-ts": "^1.3.13"
+      },
+      "devDependencies": {
+        "@types/chai": "^4.3.5",
+        "@types/chai-string": "^1.4.2",
+        "@types/mocha": "^10.0.1",
+        "@types/mochawesome": "^6.2.1",
+        "@typescript-eslint/eslint-plugin": "^5.62.0",
+        "@typescript-eslint/parser": "^5.62.0",
+        "babel-eslint": "^10.1.0",
+        "eslint": "^8.45.0",
+        "eslint-config-airbnb-base": "^15.0.0",
+        "eslint-plugin-deprecation": "^1.4.1",
+        "eslint-plugin-html": "^7.1.0",
+        "eslint-plugin-import": "^2.27.5",
+        "jsdoc-to-markdown": "^8.0.0",
+        "mochawesome-merge": "^4.3.0",
+        "ts-mocha": "^10.0.0",
+        "tsconfig-paths": "^4.2.0",
+        "typescript": "^5.1.6"
+      }
+    },
+    "node_modules/@aashutoshrathi/word-wrap": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
+      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@babel/code-frame": {
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.0.tgz",
+      "integrity": "sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/highlight": "^7.16.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/generator": {
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.0.tgz",
+      "integrity": "sha512-RR8hUCfRQn9j9RPKEVXo9LiwoxLPYn6hNZlvUOR8tSnaxlD0p0+la00ZP9/SnRt6HchKr+X0fO2r8vrETiJGew==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.16.0",
+        "jsesc": "^2.5.1",
+        "source-map": "^0.5.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-function-name": {
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.0.tgz",
+      "integrity": "sha512-BZh4mEk1xi2h4HFjWUXRQX5AEx4rvaZxHgax9gcjdLWdkjsY7MKt5p0otjsg5noXw+pB+clMCjw+aEVYADMjog==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-get-function-arity": "^7.16.0",
+        "@babel/template": "^7.16.0",
+        "@babel/types": "^7.16.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-get-function-arity": {
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz",
+      "integrity": "sha512-ASCquNcywC1NkYh/z7Cgp3w31YW8aojjYIlNg4VeJiHkqyP4AzIvr4qx7pYDb4/s8YcsZWqqOSxgkvjUz1kpDQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.16.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-hoist-variables": {
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz",
+      "integrity": "sha512-1AZlpazjUR0EQZQv3sgRNfM9mEVWPK3M6vlalczA+EECcPz3XPh6VplbErL5UoMpChhSck5wAJHthlj1bYpcmg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.16.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-split-export-declaration": {
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.0.tgz",
+      "integrity": "sha512-0YMMRpuDFNGTHNRiiqJX19GjNXA4H0E8jZ2ibccfSxaCogbm3am5WN/2nQNj0YnQwGWM1J06GOcQ2qnh3+0paw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.16.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.15.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz",
+      "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight": {
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.0.tgz",
+      "integrity": "sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.15.7",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/parser": {
+      "version": "7.16.4",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.4.tgz",
+      "integrity": "sha512-6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng==",
+      "dev": true,
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/template": {
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.0.tgz",
+      "integrity": "sha512-MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.16.0",
+        "@babel/parser": "^7.16.0",
+        "@babel/types": "^7.16.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/traverse": {
+      "version": "7.16.3",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.3.tgz",
+      "integrity": "sha512-eolumr1vVMjqevCpwVO99yN/LoGL0EyHiLO5I043aYQvwOJ9eR5UsZSClHVCzfhBduMAsSzgA/6AyqPjNayJag==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.16.0",
+        "@babel/generator": "^7.16.0",
+        "@babel/helper-function-name": "^7.16.0",
+        "@babel/helper-hoist-variables": "^7.16.0",
+        "@babel/helper-split-export-declaration": "^7.16.0",
+        "@babel/parser": "^7.16.3",
+        "@babel/types": "^7.16.0",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/types": {
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.16.0.tgz",
+      "integrity": "sha512-PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.15.7",
+        "to-fast-properties": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@eslint-community/eslint-utils": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.2.0.tgz",
+      "integrity": "sha512-gB8T4H4DEfX2IV9zGDJPOBgP1e/DbfCPDTtEqUMckpvzS1OYtva8JdFYBqMwYk7xAQ429WGF/UPqn8uQ//h2vQ==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+      }
+    },
+    "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@eslint-community/regexpp": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.4.0.tgz",
+      "integrity": "sha512-A9983Q0LnDGdLPjxyXQ00sbV+K+O+ko2Dr+CZigbHWtX9pNfxlaBkMR8X1CztI73zuEyEBXTVjx7CE+/VSwDiQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@eslint/eslintrc": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.0.tgz",
+      "integrity": "sha512-Lj7DECXqIVCqnqjjHMPna4vn6GJcMgul/wuS0je9OZ9gsL0zzDpKPVtcG1HaDVc+9y+qgXneTeUMbCqXJNpH1A==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.6.0",
+        "globals": "^13.19.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/globals": {
+      "version": "13.20.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
+      "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/@eslint/js": {
+      "version": "8.44.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.44.0.tgz",
+      "integrity": "sha512-Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@faker-js/faker": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-8.0.2.tgz",
+      "integrity": "sha512-Uo3pGspElQW91PCvKSIAXoEgAUlRnH29sX2/p89kg7sP1m2PzCufHINd0FhTXQf6DYGiUlVncdSPa2F9wxed2A==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fakerjs"
+        }
+      ],
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0",
+        "npm": ">=6.14.13"
+      }
+    },
+    "node_modules/@humanwhocodes/config-array": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz",
+      "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==",
+      "dev": true,
+      "dependencies": {
+        "@humanwhocodes/object-schema": "^1.2.1",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.5"
+      },
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
+    "node_modules/@humanwhocodes/config-array/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/@humanwhocodes/module-importer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.22"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
+    },
+    "node_modules/@humanwhocodes/object-schema": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+      "dev": true
+    },
+    "node_modules/@jsdoc/salty": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/@jsdoc/salty/-/salty-0.2.1.tgz",
+      "integrity": "sha512-JXwylDNSHa549N9uceDYu8D4GMXwSo3H8CCPYEQqxhhHpxD28+lRl2b3bS/caaPj5w1YD3SWtrficJNTnUjGpg==",
+      "dev": true,
+      "dependencies": {
+        "lodash": "^4.17.21"
+      },
+      "engines": {
+        "node": ">=v12.0.0"
+      }
+    },
+    "node_modules/@keycloak/keycloak-admin-client": {
+      "version": "21.0.1",
+      "resolved": "https://registry.npmjs.org/@keycloak/keycloak-admin-client/-/keycloak-admin-client-21.0.1.tgz",
+      "integrity": "sha512-YPVcgsQvEOQwiLqX94mX4Hn1/u5bg6eKsoBusFIOdBlrCXaG2BsVPjxZs+UIGeTw1w/FTElcVoN2Jn4zLy19cw==",
+      "dependencies": {
+        "axios": "^0.27.2",
+        "camelize-ts": "^2.1.1",
+        "lodash-es": "^4.17.21",
+        "url-join": "^5.0.0",
+        "url-template": "^3.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      }
+    },
+    "node_modules/@mapbox/node-pre-gyp": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.10.tgz",
+      "integrity": "sha512-4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA==",
+      "optional": true,
+      "dependencies": {
+        "detect-libc": "^2.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "make-dir": "^3.1.0",
+        "node-fetch": "^2.6.7",
+        "nopt": "^5.0.0",
+        "npmlog": "^5.0.1",
+        "rimraf": "^3.0.2",
+        "semver": "^7.3.5",
+        "tar": "^6.1.11"
+      },
+      "bin": {
+        "node-pre-gyp": "bin/node-pre-gyp"
+      }
+    },
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@s3pweb/keycloak-admin-client-cjs": {
+      "version": "21.0.1",
+      "resolved": "https://registry.npmjs.org/@s3pweb/keycloak-admin-client-cjs/-/keycloak-admin-client-cjs-21.0.1.tgz",
+      "integrity": "sha512-JN5A7d1UE943GMWLcA+Gp5JZvTXCfLnq2V6rUEkk7jHPQkhz/HGz0/U/8+Bw8UjSke1j9FL6TQBFbSTYUoxVag==",
+      "dependencies": {
+        "@keycloak/keycloak-admin-client": "21.0.1"
+      }
+    },
+    "node_modules/@tootallnate/once": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
+      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@types/chai": {
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.5.tgz",
+      "integrity": "sha512-mEo1sAde+UCE6b2hxn332f1g1E8WfYRu6p5SvTKr2ZKC1f7gFJXk4h5PyGP9Dt6gCaG8y8XhwnXWC6Iy2cmBng==",
+      "dev": true
+    },
+    "node_modules/@types/chai-string": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/@types/chai-string/-/chai-string-1.4.2.tgz",
+      "integrity": "sha512-ld/1hV5qcPRGuwlPdvRfvM3Ka/iofOk2pH4VkasK4b1JJP1LjNmWWn0LsISf6RRzyhVOvs93rb9tM09e+UuF8Q==",
+      "dev": true,
+      "dependencies": {
+        "@types/chai": "*"
+      }
+    },
+    "node_modules/@types/component-emitter": {
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/@types/component-emitter/-/component-emitter-1.2.11.tgz",
+      "integrity": "sha512-SRXjM+tfsSlA9VuG8hGO2nft2p8zjXCK1VcC6N4NXbBbYbSia9kzCChYQajIjzIqOOOuh5Ock6MmV2oux4jDZQ=="
+    },
+    "node_modules/@types/cookie": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz",
+      "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q=="
+    },
+    "node_modules/@types/cors": {
+      "version": "2.8.12",
+      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz",
+      "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw=="
+    },
+    "node_modules/@types/json-schema": {
+      "version": "7.0.12",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz",
+      "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==",
+      "dev": true
+    },
+    "node_modules/@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
+      "dev": true
+    },
+    "node_modules/@types/linkify-it": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.2.tgz",
+      "integrity": "sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==",
+      "dev": true
+    },
+    "node_modules/@types/markdown-it": {
+      "version": "12.2.3",
+      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-12.2.3.tgz",
+      "integrity": "sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/linkify-it": "*",
+        "@types/mdurl": "*"
+      }
+    },
+    "node_modules/@types/mdurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.2.tgz",
+      "integrity": "sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==",
+      "dev": true
+    },
+    "node_modules/@types/mocha": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.1.tgz",
+      "integrity": "sha512-/fvYntiO1GeICvqbQ3doGDIP97vWmvFt83GKguJ6prmQM2iXZfFcq6YE8KteFyRtX2/h5Hf91BYvPodJKFYv5Q==",
+      "dev": true
+    },
+    "node_modules/@types/mochawesome": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/@types/mochawesome/-/mochawesome-6.2.1.tgz",
+      "integrity": "sha512-AhQdBkT/CBdx3sI9ATeljqa5uJ3dGNKEJnsgzw9IkPeg9d9Lzxsz1eKFnenxq1qQojIW0XkIsCgdheRRXP2SQA==",
+      "dev": true,
+      "dependencies": {
+        "@types/mocha": "*"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "16.11.12",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.12.tgz",
+      "integrity": "sha512-+2Iggwg7PxoO5Kyhvsq9VarmPbIelXP070HMImEpbtGCoyWNINQj4wzjbQCXzdHTRXnqufutJb5KAURZANNBAw=="
+    },
+    "node_modules/@types/semver": {
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz",
+      "integrity": "sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==",
+      "dev": true
+    },
+    "node_modules/@typescript-eslint/eslint-plugin": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz",
+      "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/regexpp": "^4.4.0",
+        "@typescript-eslint/scope-manager": "5.62.0",
+        "@typescript-eslint/type-utils": "5.62.0",
+        "@typescript-eslint/utils": "5.62.0",
+        "debug": "^4.3.4",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.2.0",
+        "natural-compare-lite": "^1.4.0",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/parser": "^5.0.0",
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
+      "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/visitor-keys": "5.62.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
+      "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
+      "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/visitor-keys": "5.62.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz",
+      "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@types/json-schema": "^7.0.9",
+        "@types/semver": "^7.3.12",
+        "@typescript-eslint/scope-manager": "5.62.0",
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/typescript-estree": "5.62.0",
+        "eslint-scope": "^5.1.1",
+        "semver": "^7.3.7"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
+      "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.62.0",
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-visitor-keys": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
+      "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/parser": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz",
+      "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/scope-manager": "5.62.0",
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/typescript-estree": "5.62.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
+      "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/visitor-keys": "5.62.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
+      "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
+      "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/visitor-keys": "5.62.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
+      "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.62.0",
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/eslint-visitor-keys": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
+      "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/scope-manager": {
+      "version": "5.60.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.60.1.tgz",
+      "integrity": "sha512-Dn/LnN7fEoRD+KspEOV0xDMynEmR3iSHdgNsarlXNLGGtcUok8L4N71dxUgt3YvlO8si7E+BJ5Fe3wb5yUw7DQ==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.60.1",
+        "@typescript-eslint/visitor-keys": "5.60.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz",
+      "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/typescript-estree": "5.62.0",
+        "@typescript-eslint/utils": "5.62.0",
+        "debug": "^4.3.4",
+        "tsutils": "^3.21.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "*"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/scope-manager": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
+      "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/visitor-keys": "5.62.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
+      "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
+      "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/visitor-keys": "5.62.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz",
+      "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@types/json-schema": "^7.0.9",
+        "@types/semver": "^7.3.12",
+        "@typescript-eslint/scope-manager": "5.62.0",
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/typescript-estree": "5.62.0",
+        "eslint-scope": "^5.1.1",
+        "semver": "^7.3.7"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
+      "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.62.0",
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/eslint-visitor-keys": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
+      "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/types": {
+      "version": "5.60.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.60.1.tgz",
+      "integrity": "sha512-zDcDx5fccU8BA0IDZc71bAtYIcG9PowaOwaD8rjYbqwK7dpe/UMQl3inJ4UtUK42nOCT41jTSCwg76E62JpMcg==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree": {
+      "version": "5.60.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.60.1.tgz",
+      "integrity": "sha512-hkX70J9+2M2ZT6fhti5Q2FoU9zb+GeZK2SLP1WZlvUDqdMbEKhexZODD1WodNRyO8eS+4nScvT0dts8IdaBzfw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.60.1",
+        "@typescript-eslint/visitor-keys": "5.60.1",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/utils": {
+      "version": "5.60.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.60.1.tgz",
+      "integrity": "sha512-tiJ7FFdFQOWssFa3gqb94Ilexyw0JVxj6vBzaSpfN/8IhoKkDuSAenUKvsSHw2A/TMpJb26izIszTXaqygkvpQ==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@types/json-schema": "^7.0.9",
+        "@types/semver": "^7.3.12",
+        "@typescript-eslint/scope-manager": "5.60.1",
+        "@typescript-eslint/types": "5.60.1",
+        "@typescript-eslint/typescript-estree": "5.60.1",
+        "eslint-scope": "^5.1.1",
+        "semver": "^7.3.7"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/utils/node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/visitor-keys": {
+      "version": "5.60.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.60.1.tgz",
+      "integrity": "sha512-xEYIxKcultP6E/RMKqube11pGjXH1DCo60mQoWhVYyKfLkwbIVVjYxmOenNMxILx0TjCujPTjjnTIVzm09TXIw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.60.1",
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
+      "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@xmldom/xmldom": {
+      "version": "0.8.9",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.9.tgz",
+      "integrity": "sha512-4VSbbcMoxc4KLjb1gs96SRmi7w4h1SF+fCoiK0XaQX62buCc1G5d0DC5bJ9xJBNPDSVCmIrcl8BiYxzjrqaaJA==",
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/abab": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
+      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA=="
+    },
+    "node_modules/abbrev": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+      "optional": true
+    },
+    "node_modules/accepts": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+      "dependencies": {
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/acorn": {
+      "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
+      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-globals": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
+      "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
+      "dependencies": {
+        "acorn": "^7.1.1",
+        "acorn-walk": "^7.1.1"
+      }
+    },
+    "node_modules/acorn-globals/node_modules/acorn": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true,
+      "peerDependencies": {
+        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/acorn-walk": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
+      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/addressparser": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz",
+      "integrity": "sha512-aQX7AISOMM7HFE0iZ3+YnD07oIeJqWGVnJ+ZIKaBZAk03ftmVYVqsGas/rbXKR21n4D/hKCSHypvcyOkds/xzg=="
+    },
+    "node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ansi-colors": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ansi-escape-sequences": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-escape-sequences/-/ansi-escape-sequences-4.1.0.tgz",
+      "integrity": "sha512-dzW9kHxH011uBsidTXd14JXgzye/YLb2LzeKZ4bsgl/Knwx8AtbSFkkGxagdNOoh0DlqHCmfiEjWKBaqjOanVw==",
+      "dev": true,
+      "dependencies": {
+        "array-back": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/ansi-escape-sequences/node_modules/array-back": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz",
+      "integrity": "sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/anymatch": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/aproba": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
+      "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==",
+      "optional": true
+    },
+    "node_modules/are-we-there-yet": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
+      "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
+      "optional": true,
+      "dependencies": {
+        "delegates": "^1.0.0",
+        "readable-stream": "^3.6.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
+    },
+    "node_modules/array-back": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/array-back/-/array-back-6.2.2.tgz",
+      "integrity": "sha512-gUAZ7HPyb4SJczXAMUXMGAvI976JoK3qEx9v1FTmeYuJj0IBiaKttG1ydtGKdkfqWkIkouke7nG8ufGy77+Cvw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.17"
+      }
+    },
+    "node_modules/array-flatten": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
+    },
+    "node_modules/array-includes": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
+      "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "get-intrinsic": "^1.1.3",
+        "is-string": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/define-properties": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+      "dev": true,
+      "dependencies": {
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/es-abstract": {
+      "version": "1.21.1",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.1.tgz",
+      "integrity": "sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==",
+      "dev": true,
+      "dependencies": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "es-set-tostringtag": "^2.0.1",
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "function.prototype.name": "^1.1.5",
+        "get-intrinsic": "^1.1.3",
+        "get-symbol-description": "^1.0.0",
+        "globalthis": "^1.0.3",
+        "gopd": "^1.0.1",
+        "has": "^1.0.3",
+        "has-property-descriptors": "^1.0.0",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.4",
+        "is-array-buffer": "^3.0.1",
+        "is-callable": "^1.2.7",
+        "is-negative-zero": "^2.0.2",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.2",
+        "is-string": "^1.0.7",
+        "is-typed-array": "^1.1.10",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.12.2",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.4",
+        "regexp.prototype.flags": "^1.4.3",
+        "safe-regex-test": "^1.0.0",
+        "string.prototype.trimend": "^1.0.6",
+        "string.prototype.trimstart": "^1.0.6",
+        "typed-array-length": "^1.0.4",
+        "unbox-primitive": "^1.0.2",
+        "which-typed-array": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/get-intrinsic": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
+      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/internal-slot": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz",
+      "integrity": "sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.3",
+        "has": "^1.0.3",
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/array-includes/node_modules/is-callable": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/is-shared-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/object-inspect": {
+      "version": "1.12.3",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
+      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/object.assign": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
+      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "has-symbols": "^1.0.3",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/string.prototype.trimend": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
+      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/string.prototype.trimstart": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
+      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/unbox-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
+        "which-boxed-primitive": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/array.prototype.flat": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
+      "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flat/node_modules/define-properties": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+      "dev": true,
+      "dependencies": {
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flat/node_modules/es-abstract": {
+      "version": "1.21.1",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.1.tgz",
+      "integrity": "sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==",
+      "dev": true,
+      "dependencies": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "es-set-tostringtag": "^2.0.1",
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "function.prototype.name": "^1.1.5",
+        "get-intrinsic": "^1.1.3",
+        "get-symbol-description": "^1.0.0",
+        "globalthis": "^1.0.3",
+        "gopd": "^1.0.1",
+        "has": "^1.0.3",
+        "has-property-descriptors": "^1.0.0",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.4",
+        "is-array-buffer": "^3.0.1",
+        "is-callable": "^1.2.7",
+        "is-negative-zero": "^2.0.2",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.2",
+        "is-string": "^1.0.7",
+        "is-typed-array": "^1.1.10",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.12.2",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.4",
+        "regexp.prototype.flags": "^1.4.3",
+        "safe-regex-test": "^1.0.0",
+        "string.prototype.trimend": "^1.0.6",
+        "string.prototype.trimstart": "^1.0.6",
+        "typed-array-length": "^1.0.4",
+        "unbox-primitive": "^1.0.2",
+        "which-typed-array": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flat/node_modules/get-intrinsic": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
+      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flat/node_modules/has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flat/node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flat/node_modules/internal-slot": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz",
+      "integrity": "sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.3",
+        "has": "^1.0.3",
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/array.prototype.flat/node_modules/is-callable": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flat/node_modules/is-shared-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flat/node_modules/object-inspect": {
+      "version": "1.12.3",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
+      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flat/node_modules/object.assign": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
+      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "has-symbols": "^1.0.3",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flat/node_modules/string.prototype.trimend": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
+      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flat/node_modules/string.prototype.trimstart": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
+      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flat/node_modules/unbox-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
+        "which-boxed-primitive": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flatmap": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
+      "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flatmap/node_modules/define-properties": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+      "dev": true,
+      "dependencies": {
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flatmap/node_modules/es-abstract": {
+      "version": "1.21.1",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.1.tgz",
+      "integrity": "sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==",
+      "dev": true,
+      "dependencies": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "es-set-tostringtag": "^2.0.1",
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "function.prototype.name": "^1.1.5",
+        "get-intrinsic": "^1.1.3",
+        "get-symbol-description": "^1.0.0",
+        "globalthis": "^1.0.3",
+        "gopd": "^1.0.1",
+        "has": "^1.0.3",
+        "has-property-descriptors": "^1.0.0",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.4",
+        "is-array-buffer": "^3.0.1",
+        "is-callable": "^1.2.7",
+        "is-negative-zero": "^2.0.2",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.2",
+        "is-string": "^1.0.7",
+        "is-typed-array": "^1.1.10",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.12.2",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.4",
+        "regexp.prototype.flags": "^1.4.3",
+        "safe-regex-test": "^1.0.0",
+        "string.prototype.trimend": "^1.0.6",
+        "string.prototype.trimstart": "^1.0.6",
+        "typed-array-length": "^1.0.4",
+        "unbox-primitive": "^1.0.2",
+        "which-typed-array": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flatmap/node_modules/get-intrinsic": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
+      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flatmap/node_modules/has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flatmap/node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flatmap/node_modules/internal-slot": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz",
+      "integrity": "sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.3",
+        "has": "^1.0.3",
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/array.prototype.flatmap/node_modules/is-callable": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flatmap/node_modules/is-shared-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flatmap/node_modules/object-inspect": {
+      "version": "1.12.3",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
+      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flatmap/node_modules/object.assign": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
+      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "has-symbols": "^1.0.3",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flatmap/node_modules/string.prototype.trimend": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
+      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flatmap/node_modules/string.prototype.trimstart": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
+      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flatmap/node_modules/unbox-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
+        "which-boxed-primitive": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/arrify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+      "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/assertion-error": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
+      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/async": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
+      "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="
+    },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
+    },
+    "node_modules/available-typed-arrays": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
+      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/axios": {
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
+      "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
+      "dependencies": {
+        "follow-redirects": "^1.14.9",
+        "form-data": "^4.0.0"
+      }
+    },
+    "node_modules/babel-eslint": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.1.0.tgz",
+      "integrity": "sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==",
+      "deprecated": "babel-eslint is now @babel/eslint-parser. This package will no longer receive updates.",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "@babel/parser": "^7.7.0",
+        "@babel/traverse": "^7.7.0",
+        "@babel/types": "^7.7.0",
+        "eslint-visitor-keys": "^1.0.0",
+        "resolve": "^1.12.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "peerDependencies": {
+        "eslint": ">= 4.12.1"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+    },
+    "node_modules/base32.js": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/base32.js/-/base32.js-0.1.0.tgz",
+      "integrity": "sha512-n3TkB02ixgBOhTvANakDb4xaMXnYUVkNoRFJjQflcqMQhyEKxEHdj3E6N8t8sUQ0mjH/3/JxzlXuz3ul/J90pQ==",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/base64id": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz",
+      "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==",
+      "engines": {
+        "node": "^4.5.0 || >= 5.9"
+      }
+    },
+    "node_modules/binary-extensions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/bluebird": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+      "dev": true
+    },
+    "node_modules/body-parser": {
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+      "dependencies": {
+        "bytes": "3.1.2",
+        "content-type": "~1.0.4",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "on-finished": "2.4.1",
+        "qs": "6.11.0",
+        "raw-body": "2.5.1",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
+    },
+    "node_modules/body-parser/node_modules/bytes": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/body-parser/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/body-parser/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dependencies": {
+        "fill-range": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/browser-process-hrtime": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
+      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="
+    },
+    "node_modules/browser-stdout": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
+      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw=="
+    },
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true
+    },
+    "node_modules/bytes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+      "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/cache-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/cache-point/-/cache-point-2.0.0.tgz",
+      "integrity": "sha512-4gkeHlFpSKgm3vm2gJN5sPqfmijYRFYCQ6tv5cLw0xVmT6r1z1vd4FNnpuOREco3cBs1G709sZ72LdgddKvL5w==",
+      "dev": true,
+      "dependencies": {
+        "array-back": "^4.0.1",
+        "fs-then-native": "^2.0.0",
+        "mkdirp2": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cache-point/node_modules/array-back": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/array-back/-/array-back-4.0.2.tgz",
+      "integrity": "sha512-NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/camelize-ts": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/camelize-ts/-/camelize-ts-2.5.0.tgz",
+      "integrity": "sha512-ERaOJadw+ID9MuKGeTOF1kQOb/zZIv6Vkt44kFYZraiAFiZU6E3TwnJebp8jofsW/hDxME/U63lFdNKIkSqijw==",
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      }
+    },
+    "node_modules/canvas": {
+      "version": "2.11.2",
+      "resolved": "https://registry.npmjs.org/canvas/-/canvas-2.11.2.tgz",
+      "integrity": "sha512-ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw==",
+      "hasInstallScript": true,
+      "optional": true,
+      "dependencies": {
+        "@mapbox/node-pre-gyp": "^1.0.0",
+        "nan": "^2.17.0",
+        "simple-get": "^3.0.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/catharsis": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.9.0.tgz",
+      "integrity": "sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A==",
+      "dev": true,
+      "dependencies": {
+        "lodash": "^4.17.15"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/chai": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.7.tgz",
+      "integrity": "sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==",
+      "dependencies": {
+        "assertion-error": "^1.1.0",
+        "check-error": "^1.0.2",
+        "deep-eql": "^4.1.2",
+        "get-func-name": "^2.0.0",
+        "loupe": "^2.3.1",
+        "pathval": "^1.1.1",
+        "type-detect": "^4.0.5"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/chai-string": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/chai-string/-/chai-string-1.5.0.tgz",
+      "integrity": "sha512-sydDC3S3pNAQMYwJrs6dQX0oBQ6KfIPuOZ78n7rocW0eJJlsHPh2t3kwW7xfwYA/1Bf6/arGtSUo16rxR2JFlw==",
+      "peerDependencies": {
+        "chai": "^4.1.2"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/check-error": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
+      "integrity": "sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/chokidar": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ],
+      "dependencies": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/chownr": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+      "optional": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cliui": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
+      }
+    },
+    "node_modules/collect-all": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/collect-all/-/collect-all-1.0.4.tgz",
+      "integrity": "sha512-RKZhRwJtJEP5FWul+gkSMEnaK6H3AGPTTWOiRimCcs+rc/OmQE3Yhy1Q7A7KsdkG3ZXVdZq68Y6ONSdvkeEcKA==",
+      "dev": true,
+      "dependencies": {
+        "stream-connect": "^1.0.2",
+        "stream-via": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/color-support": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
+      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
+      "optional": true,
+      "bin": {
+        "color-support": "bin.js"
+      }
+    },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/command-line-args": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/command-line-args/-/command-line-args-5.2.1.tgz",
+      "integrity": "sha512-H4UfQhZyakIjC74I9d34fGYDwk3XpSr17QhEd0Q3I9Xq1CETHo4Hcuo87WyWHpAF1aSLjLRf5lD9ZGX2qStUvg==",
+      "dev": true,
+      "dependencies": {
+        "array-back": "^3.1.0",
+        "find-replace": "^3.0.0",
+        "lodash.camelcase": "^4.3.0",
+        "typical": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/command-line-args/node_modules/array-back": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz",
+      "integrity": "sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/command-line-args/node_modules/typical": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/typical/-/typical-4.0.0.tgz",
+      "integrity": "sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/command-line-tool": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/command-line-tool/-/command-line-tool-0.8.0.tgz",
+      "integrity": "sha512-Xw18HVx/QzQV3Sc5k1vy3kgtOeGmsKIqwtFFoyjI4bbcpSgnw2CWVULvtakyw4s6fhyAdI6soQQhXc2OzJy62g==",
+      "dev": true,
+      "dependencies": {
+        "ansi-escape-sequences": "^4.0.0",
+        "array-back": "^2.0.0",
+        "command-line-args": "^5.0.0",
+        "command-line-usage": "^4.1.0",
+        "typical": "^2.6.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/command-line-tool/node_modules/array-back": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/array-back/-/array-back-2.0.0.tgz",
+      "integrity": "sha512-eJv4pLLufP3g5kcZry0j6WXpIbzYw9GUB4mVJZno9wfwiBxbizTnHCw3VJb07cBihbFX48Y7oSrW9y+gt4glyw==",
+      "dev": true,
+      "dependencies": {
+        "typical": "^2.6.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/command-line-usage": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/command-line-usage/-/command-line-usage-4.1.0.tgz",
+      "integrity": "sha512-MxS8Ad995KpdAC0Jopo/ovGIroV/m0KHwzKfXxKag6FHOkGsH8/lv5yjgablcRxCJJC0oJeUMuO/gmaq+Wq46g==",
+      "dev": true,
+      "dependencies": {
+        "ansi-escape-sequences": "^4.0.0",
+        "array-back": "^2.0.0",
+        "table-layout": "^0.4.2",
+        "typical": "^2.6.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/command-line-usage/node_modules/array-back": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/array-back/-/array-back-2.0.0.tgz",
+      "integrity": "sha512-eJv4pLLufP3g5kcZry0j6WXpIbzYw9GUB4mVJZno9wfwiBxbizTnHCw3VJb07cBihbFX48Y7oSrW9y+gt4glyw==",
+      "dev": true,
+      "dependencies": {
+        "typical": "^2.6.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/common-sequence": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/common-sequence/-/common-sequence-2.0.2.tgz",
+      "integrity": "sha512-jAg09gkdkrDO9EWTdXfv80WWH3yeZl5oT69fGfedBNS9pXUKYInVJ1bJ+/ht2+Moeei48TmSbQDYMc8EOx9G0g==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/component-emitter": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
+      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="
+    },
+    "node_modules/compressible": {
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
+      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
+      "dependencies": {
+        "mime-db": ">= 1.43.0 < 2"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/compression": {
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
+      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
+      "dependencies": {
+        "accepts": "~1.3.5",
+        "bytes": "3.0.0",
+        "compressible": "~2.0.16",
+        "debug": "2.6.9",
+        "on-headers": "~1.0.2",
+        "safe-buffer": "5.1.2",
+        "vary": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/compression/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/compression/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+    },
+    "node_modules/config-master": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/config-master/-/config-master-3.1.0.tgz",
+      "integrity": "sha1-ZnZjWQUFooO/JqSE1oSJ10xUhdo=",
+      "dev": true,
+      "dependencies": {
+        "walk-back": "^2.0.1"
+      }
+    },
+    "node_modules/config-master/node_modules/walk-back": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/walk-back/-/walk-back-2.0.1.tgz",
+      "integrity": "sha1-VU4qnYdPrEeoywBr9EwvDEmYoKQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/confusing-browser-globals": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
+      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
+      "dev": true
+    },
+    "node_modules/console-control-strings": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
+      "optional": true
+    },
+    "node_modules/content-disposition": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+      "dependencies": {
+        "safe-buffer": "5.2.1"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/content-disposition/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/content-type": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/cookie": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
+    },
+    "node_modules/cors": {
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
+      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
+      "dependencies": {
+        "object-assign": "^4",
+        "vary": "^1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/cssom": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz",
+      "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw=="
+    },
+    "node_modules/cssstyle": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
+      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
+      "dependencies": {
+        "cssom": "~0.3.6"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cssstyle/node_modules/cssom": {
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="
+    },
+    "node_modules/csv-writer": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/csv-writer/-/csv-writer-1.6.0.tgz",
+      "integrity": "sha512-NOx7YDFWEsM/fTRAJjRpPp8t+MKRVvniAg9wQlUKx20MFrPs73WLJhFf5iteqrxNYnsy924K3Iroh3yNHeYd2g=="
+    },
+    "node_modules/data-urls": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz",
+      "integrity": "sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==",
+      "dependencies": {
+        "abab": "^2.0.6",
+        "whatwg-mimetype": "^3.0.0",
+        "whatwg-url": "^11.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/data-urls/node_modules/whatwg-url": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz",
+      "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==",
+      "dependencies": {
+        "tr46": "^3.0.0",
+        "webidl-conversions": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/dateformat": {
+      "version": "4.6.3",
+      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-4.6.3.tgz",
+      "integrity": "sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA==",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/debug": {
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/decimal.js": {
+      "version": "10.4.2",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.2.tgz",
+      "integrity": "sha512-ic1yEvwT6GuvaYwBLLY6/aFFgjZdySKTE8en/fkU3QICTmRtgtSlFn0u0BXN06InZwtfCelR7j8LRiDI/02iGA=="
+    },
+    "node_modules/decompress-response": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
+      "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
+      "optional": true,
+      "dependencies": {
+        "mimic-response": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/deep-eql": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz",
+      "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==",
+      "dependencies": {
+        "type-detect": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/deep-extend": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
+    },
+    "node_modules/define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "dev": true,
+      "dependencies": {
+        "object-keys": "^1.0.12"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
+      "optional": true
+    },
+    "node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/destroy": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
+    },
+    "node_modules/detect-libc": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
+      "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==",
+      "optional": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/diff": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
+    "node_modules/dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+      "dev": true,
+      "dependencies": {
+        "path-type": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/dmd": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/dmd/-/dmd-6.2.0.tgz",
+      "integrity": "sha512-uXWxLF1H7TkUAuoHK59/h/ts5cKavm2LnhrIgJWisip4BVzPoXavlwyoprFFn2CzcahKYgvkfaebS6oxzgflkg==",
+      "dev": true,
+      "dependencies": {
+        "array-back": "^6.2.2",
+        "cache-point": "^2.0.0",
+        "common-sequence": "^2.0.2",
+        "file-set": "^4.0.2",
+        "handlebars": "^4.7.7",
+        "marked": "^4.2.3",
+        "object-get": "^2.1.1",
+        "reduce-flatten": "^3.0.1",
+        "reduce-unique": "^2.0.1",
+        "reduce-without": "^1.0.1",
+        "test-value": "^3.0.0",
+        "walk-back": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/dmd/node_modules/reduce-flatten": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-3.0.1.tgz",
+      "integrity": "sha512-bYo+97BmUUOzg09XwfkwALt4PQH1M5L0wzKerBt6WLm3Fhdd43mMS89HiT1B9pJIqko/6lWx3OnV4J9f2Kqp5Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/dom-serializer": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
+      "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.2",
+        "entities": "^4.2.0"
+      },
+      "funding": {
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+      }
+    },
+    "node_modules/domelementtype": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ]
+    },
+    "node_modules/domexception": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
+      "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
+      "dependencies": {
+        "webidl-conversions": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/domhandler": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
+      "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.3.0"
+      },
+      "engines": {
+        "node": ">= 4"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
+      }
+    },
+    "node_modules/dompurify": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.4.0.tgz",
+      "integrity": "sha512-Be9tbQMZds4a3C6xTmz68NlMfeONA//4dOavl/1rNw50E+/QO0KVpbcU0PcaW0nsQxurXls9ZocqFxk8R2mWEA=="
+    },
+    "node_modules/domutils": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.0.1.tgz",
+      "integrity": "sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==",
+      "dev": true,
+      "dependencies": {
+        "dom-serializer": "^2.0.0",
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domutils?sponsor=1"
+      }
+    },
+    "node_modules/dotenv": {
+      "version": "16.3.1",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz",
+      "integrity": "sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/motdotla/dotenv?sponsor=1"
+      }
+    },
+    "node_modules/ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
+    "node_modules/encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/engine.io": {
+      "version": "6.1.3",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.1.3.tgz",
+      "integrity": "sha512-rqs60YwkvWTLLnfazqgZqLa/aKo+9cueVfEi/dZ8PyGyaf8TLOxj++4QMIgeG3Gn0AhrWiFXvghsoY9L9h25GA==",
+      "dependencies": {
+        "@types/cookie": "^0.4.1",
+        "@types/cors": "^2.8.12",
+        "@types/node": ">=10.0.0",
+        "accepts": "~1.3.4",
+        "base64id": "2.0.0",
+        "cookie": "~0.4.1",
+        "cors": "~2.8.5",
+        "debug": "~4.3.1",
+        "engine.io-parser": "~5.0.3",
+        "ws": "~8.2.3"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/engine.io-parser": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.4.tgz",
+      "integrity": "sha512-+nVFp+5z1E3HcToEnO7ZIj3g+3k9389DvWtvJZz0T6/eOCPIyyxehFcedoYrZQrp0LgQbD9pPXhpMBKMd5QURg==",
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/engine.io/node_modules/cookie": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
+      "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/engine.io/node_modules/ws": {
+      "version": "8.2.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz",
+      "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==",
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/entities": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.4.0.tgz",
+      "integrity": "sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/es-abstract": {
+      "version": "1.19.1",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
+      "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.1.1",
+        "get-symbol-description": "^1.0.0",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.2",
+        "internal-slot": "^1.0.3",
+        "is-callable": "^1.2.4",
+        "is-negative-zero": "^2.0.1",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.1",
+        "is-string": "^1.0.7",
+        "is-weakref": "^1.0.1",
+        "object-inspect": "^1.11.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.2",
+        "string.prototype.trimend": "^1.0.4",
+        "string.prototype.trimstart": "^1.0.4",
+        "unbox-primitive": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es-set-tostringtag": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
+      "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.3",
+        "has": "^1.0.3",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-set-tostringtag/node_modules/get-intrinsic": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
+      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es-set-tostringtag/node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es-shim-unscopables": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
+      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+      "dev": true,
+      "dependencies": {
+        "has": "^1.0.3"
+      }
+    },
+    "node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/escodegen": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
+      "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
+      "dependencies": {
+        "esprima": "^4.0.1",
+        "estraverse": "^5.2.0",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.6.1"
+      }
+    },
+    "node_modules/escodegen/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/escodegen/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eslint": {
+      "version": "8.45.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.45.0.tgz",
+      "integrity": "sha512-pd8KSxiQpdYRfYa9Wufvdoct3ZPQQuVuU5O6scNgMuOMYuxvH0IGaYK0wUFjo4UYYQQCUndlXiMbnxopwvvTiw==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.4.0",
+        "@eslint/eslintrc": "^2.1.0",
+        "@eslint/js": "8.44.0",
+        "@humanwhocodes/config-array": "^0.11.10",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@nodelib/fs.walk": "^1.2.8",
+        "ajv": "^6.10.0",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.2.0",
+        "eslint-visitor-keys": "^3.4.1",
+        "espree": "^9.6.0",
+        "esquery": "^1.4.2",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "globals": "^13.19.0",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.2.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "is-path-inside": "^3.0.3",
+        "js-yaml": "^4.1.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.3",
+        "strip-ansi": "^6.0.1",
+        "text-table": "^0.2.0"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-config-airbnb-base": {
+      "version": "15.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz",
+      "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==",
+      "dev": true,
+      "dependencies": {
+        "confusing-browser-globals": "^1.0.10",
+        "object.assign": "^4.1.2",
+        "object.entries": "^1.1.5",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^7.32.0 || ^8.2.0",
+        "eslint-plugin-import": "^2.25.2"
+      }
+    },
+    "node_modules/eslint-config-airbnb-base/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/eslint-import-resolver-node": {
+      "version": "0.3.7",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz",
+      "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.7",
+        "is-core-module": "^2.11.0",
+        "resolve": "^1.22.1"
+      }
+    },
+    "node_modules/eslint-import-resolver-node/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-import-resolver-node/node_modules/is-core-module": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
+      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
+      "dev": true,
+      "dependencies": {
+        "has": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/eslint-module-utils": {
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz",
+      "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.7"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependenciesMeta": {
+        "eslint": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-module-utils/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-plugin-deprecation": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-deprecation/-/eslint-plugin-deprecation-1.4.1.tgz",
+      "integrity": "sha512-4vxTghWzxsBukPJVQupi6xlTuDc8Pyi1QlRCrFiLgwLPMJQW3cJCNaehJUKQqQFvuue5m4W27e179Y3Qjzeghg==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/utils": "^5.57.0",
+        "tslib": "^2.3.1",
+        "tsutils": "^3.21.0"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0",
+        "typescript": "^3.7.5 || ^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-deprecation/node_modules/tslib": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz",
+      "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==",
+      "dev": true
+    },
+    "node_modules/eslint-plugin-html": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-html/-/eslint-plugin-html-7.1.0.tgz",
+      "integrity": "sha512-fNLRraV/e6j8e3XYOC9xgND4j+U7b1Rq+OygMlLcMg+wI/IpVbF+ubQa3R78EjKB9njT6TQOlcK5rFKBVVtdfg==",
+      "dev": true,
+      "dependencies": {
+        "htmlparser2": "^8.0.1"
+      }
+    },
+    "node_modules/eslint-plugin-import": {
+      "version": "2.27.5",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz",
+      "integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==",
+      "dev": true,
+      "dependencies": {
+        "array-includes": "^3.1.6",
+        "array.prototype.flat": "^1.3.1",
+        "array.prototype.flatmap": "^1.3.1",
+        "debug": "^3.2.7",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.7",
+        "eslint-module-utils": "^2.7.4",
+        "has": "^1.0.3",
+        "is-core-module": "^2.11.0",
+        "is-glob": "^4.0.3",
+        "minimatch": "^3.1.2",
+        "object.values": "^1.1.6",
+        "resolve": "^1.22.1",
+        "semver": "^6.3.0",
+        "tsconfig-paths": "^3.14.1"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/is-core-module": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
+      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
+      "dev": true,
+      "dependencies": {
+        "has": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/json5": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/tsconfig-paths": {
+      "version": "3.14.2",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",
+      "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==",
+      "dev": true,
+      "dependencies": {
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.2",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
+      }
+    },
+    "node_modules/eslint-scope": {
+      "version": "7.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.1.tgz",
+      "integrity": "sha512-CvefSOsDdaYYvxChovdrPo/ZGt8d5lrJWleAc1diXRKhHGiTYEI26cvo8Kle/wGnsizoCJjK73FMg1/IkIwiNA==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-scope/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/eslint-visitor-keys": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/eslint/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/eslint/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/eslint/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/eslint/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/eslint/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/eslint-visitor-keys": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
+      "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint/node_modules/glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/eslint/node_modules/globals": {
+      "version": "13.20.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
+      "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/eslint/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/eslint/node_modules/optionator": {
+      "version": "0.9.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
+      "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
+      "dev": true,
+      "dependencies": {
+        "@aashutoshrathi/word-wrap": "^1.2.3",
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/eslint/node_modules/prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/eslint/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/espree": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^8.9.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.4.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/espree/node_modules/eslint-visitor-keys": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
+      "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/esquery": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/esquery/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esrecurse/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/express": {
+      "version": "4.18.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
+      "dependencies": {
+        "accepts": "~1.3.8",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.20.1",
+        "content-disposition": "0.5.4",
+        "content-type": "~1.0.4",
+        "cookie": "0.5.0",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "finalhandler": "1.2.0",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "merge-descriptors": "1.0.1",
+        "methods": "~1.1.2",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "~2.0.7",
+        "qs": "6.11.0",
+        "range-parser": "~1.2.1",
+        "safe-buffer": "5.2.1",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "type-is": "~1.6.18",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/express/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/express/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/express/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "node_modules/fast-glob": {
+      "version": "3.2.12",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
+      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
+    },
+    "node_modules/fast-xml-parser": {
+      "version": "4.2.5",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.5.tgz",
+      "integrity": "sha512-B9/wizE4WngqQftFPmdaMYlXoJlJOYxGQOanC77fq9k8+Z0v5dDSVh+3glErdIROP//s/jgb7ZuxKfB8nVyo0g==",
+      "funding": [
+        {
+          "type": "paypal",
+          "url": "https://paypal.me/naturalintelligence"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "dependencies": {
+        "strnum": "^1.0.5"
+      },
+      "bin": {
+        "fxparser": "src/cli/cli.js"
+      }
+    },
+    "node_modules/fastq": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
+      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
+      "dev": true,
+      "dependencies": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "node_modules/file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dev": true,
+      "dependencies": {
+        "flat-cache": "^3.0.4"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/file-set": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/file-set/-/file-set-4.0.2.tgz",
+      "integrity": "sha512-fuxEgzk4L8waGXaAkd8cMr73Pm0FxOVkn8hztzUW7BAHhOGH90viQNXbiOsnecCWmfInqU6YmAMwxRMdKETceQ==",
+      "dev": true,
+      "dependencies": {
+        "array-back": "^5.0.0",
+        "glob": "^7.1.6"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/file-set/node_modules/array-back": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/array-back/-/array-back-5.0.0.tgz",
+      "integrity": "sha512-kgVWwJReZWmVuWOQKEOohXKJX+nD02JAZ54D1RRWlv8L0NebauKAaFxACKzB74RTclt1+WNz5KHaLRDAPZbDEw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/finalhandler": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+      "dependencies": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "statuses": "2.0.1",
+        "unpipe": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/finalhandler/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/finalhandler/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/find-replace": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-replace/-/find-replace-3.0.0.tgz",
+      "integrity": "sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ==",
+      "dev": true,
+      "dependencies": {
+        "array-back": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/find-replace/node_modules/array-back": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz",
+      "integrity": "sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "dependencies": {
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/flat": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+      "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+      "bin": {
+        "flat": "cli.js"
+      }
+    },
+    "node_modules/flat-cache": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+      "dev": true,
+      "dependencies": {
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/flatted": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
+      "dev": true
+    },
+    "node_modules/follow-redirects": {
+      "version": "1.15.2",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
+      "engines": {
+        "node": ">=4.0"
+      },
+      "peerDependenciesMeta": {
+        "debug": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/for-each": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.3"
+      }
+    },
+    "node_modules/form-data": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/forwarded": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/fs-extra": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+      "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=6 <7 || >=8"
+      }
+    },
+    "node_modules/fs-minipass": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
+      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
+      "optional": true,
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/fs-minipass/node_modules/minipass": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+      "optional": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/fs-then-native": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fs-then-native/-/fs-then-native-2.0.0.tgz",
+      "integrity": "sha1-GaEk2U2QwiyOBF8ujdbr6jbUjGc=",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/fsu": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/fsu/-/fsu-1.1.1.tgz",
+      "integrity": "sha512-xQVsnjJ/5pQtcKh+KjUoZGzVWn4uNkchxTF6Lwjr4Gf7nQr8fmUfhKJ62zE77+xQg9xnxi5KUps7XGs+VC986A=="
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+    },
+    "node_modules/function.prototype.name": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
+      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.0",
+        "functions-have-names": "^1.2.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/gauge": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
+      "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==",
+      "optional": true,
+      "dependencies": {
+        "aproba": "^1.0.3 || ^2.0.0",
+        "color-support": "^1.1.2",
+        "console-control-strings": "^1.0.0",
+        "has-unicode": "^2.0.1",
+        "object-assign": "^4.1.1",
+        "signal-exit": "^3.0.0",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1",
+        "wide-align": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/get-func-name": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
+      "integrity": "sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
+      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-symbol-description": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
+      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/glob": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/globalthis": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
+      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+      "dev": true,
+      "dependencies": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/globby/node_modules/ignore": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/gopd/node_modules/get-intrinsic": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
+      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/gopd/node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.10",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
+      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
+    },
+    "node_modules/graphemer": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
+      "dev": true
+    },
+    "node_modules/handlebars": {
+      "version": "4.7.7",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz",
+      "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.5",
+        "neo-async": "^2.6.0",
+        "source-map": "^0.6.1",
+        "wordwrap": "^1.0.0"
+      },
+      "bin": {
+        "handlebars": "bin/handlebars"
+      },
+      "engines": {
+        "node": ">=0.4.7"
+      },
+      "optionalDependencies": {
+        "uglify-js": "^3.1.4"
+      }
+    },
+    "node_modules/handlebars/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dependencies": {
+        "function-bind": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/has-bigints": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
+      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
+      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-tostringtag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-unicode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+      "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
+      "optional": true
+    },
+    "node_modules/he": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+      "bin": {
+        "he": "bin/he"
+      }
+    },
+    "node_modules/html-encoding-sniffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
+      "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
+      "dependencies": {
+        "whatwg-encoding": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/htmlparser2": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.1.tgz",
+      "integrity": "sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA==",
+      "dev": true,
+      "funding": [
+        "https://github.com/fb55/htmlparser2?sponsor=1",
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ],
+      "dependencies": {
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.2",
+        "domutils": "^3.0.1",
+        "entities": "^4.3.0"
+      }
+    },
+    "node_modules/http-errors": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+      "dependencies": {
+        "depd": "2.0.0",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/http-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
+      "dependencies": {
+        "@tootallnate/once": "2",
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/https-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ignore": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.1.tgz",
+      "integrity": "sha512-d2qQLzTJ9WxQftPAuEQpSPmKqzxePjzVbpAVv62AQ64NTL+wR4JkrVqR/LqFsFEUsHDAiId52mJteHDFuDkElA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "dev": true,
+      "dependencies": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "node_modules/internal-slot": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
+      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.0",
+        "has": "^1.0.3",
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/ipaddr.js": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/ipv6-normalize": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ipv6-normalize/-/ipv6-normalize-1.0.1.tgz",
+      "integrity": "sha512-Bm6H79i01DjgGTCWjUuCjJ6QDo1HB96PT/xCYuyJUP9WFbVDrLSbG4EZCvOCun2rNswZb0c3e4Jt/ws795esHA=="
+    },
+    "node_modules/is-array-buffer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.1.tgz",
+      "integrity": "sha512-ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.3",
+        "is-typed-array": "^1.1.10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-array-buffer/node_modules/get-intrinsic": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
+      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-array-buffer/node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-bigint": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "dev": true,
+      "dependencies": {
+        "has-bigints": "^1.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-boolean-object": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-callable": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-core-module": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz",
+      "integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==",
+      "dev": true,
+      "dependencies": {
+        "has": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-date-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-negative-zero": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-number-object": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz",
+      "integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-path-inside": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-plain-obj": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
+      "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-potential-custom-element-name": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
+      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ=="
+    },
+    "node_modules/is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-shared-array-buffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz",
+      "integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-typed-array": {
+      "version": "1.1.10",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz",
+      "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==",
+      "dev": true,
+      "dependencies": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-unicode-supported": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-weakref": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
+    "node_modules/jpeg-js": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.4.tgz",
+      "integrity": "sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg=="
+    },
+    "node_modules/js-image-generator": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/js-image-generator/-/js-image-generator-1.0.4.tgz",
+      "integrity": "sha512-ckb7kyVojGAnArouVR+5lBIuwU1fcrn7E/YYSd0FK7oIngAkMmRvHASLro9Zt5SQdWToaI66NybG+OGxPw/HlQ==",
+      "dependencies": {
+        "jpeg-js": "^0.4.2"
+      }
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+    },
+    "node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/js2xmlparser": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-4.0.2.tgz",
+      "integrity": "sha512-6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA==",
+      "dev": true,
+      "dependencies": {
+        "xmlcreate": "^2.0.4"
+      }
+    },
+    "node_modules/jsdoc": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.0.tgz",
+      "integrity": "sha512-tzTgkklbWKrlaQL2+e3NNgLcZu3NaK2vsHRx7tyHQ+H5jcB9Gx0txSd2eJWlMC/xU1+7LQu4s58Ry0RkuaEQVg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/parser": "^7.9.4",
+        "@jsdoc/salty": "^0.2.1",
+        "@types/markdown-it": "^12.2.3",
+        "bluebird": "^3.7.2",
+        "catharsis": "^0.9.0",
+        "escape-string-regexp": "^2.0.0",
+        "js2xmlparser": "^4.0.2",
+        "klaw": "^3.0.0",
+        "markdown-it": "^12.3.2",
+        "markdown-it-anchor": "^8.4.1",
+        "marked": "^4.0.10",
+        "mkdirp": "^1.0.4",
+        "requizzle": "^0.2.3",
+        "strip-json-comments": "^3.1.0",
+        "underscore": "~1.13.2"
+      },
+      "bin": {
+        "jsdoc": "jsdoc.js"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/jsdoc-api": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/jsdoc-api/-/jsdoc-api-8.0.0.tgz",
+      "integrity": "sha512-Rnhor0suB1Ds1abjmFkFfKeD+kSMRN9oHMTMZoJVUrmtCGDwXty+sWMA9sa4xbe4UyxuPjhC7tavZ40mDKK6QQ==",
+      "dev": true,
+      "dependencies": {
+        "array-back": "^6.2.2",
+        "cache-point": "^2.0.0",
+        "collect-all": "^1.0.4",
+        "file-set": "^4.0.2",
+        "fs-then-native": "^2.0.0",
+        "jsdoc": "^4.0.0",
+        "object-to-spawn-args": "^2.0.1",
+        "temp-path": "^1.0.0",
+        "walk-back": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=12.17"
+      }
+    },
+    "node_modules/jsdoc-parse": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/jsdoc-parse/-/jsdoc-parse-6.2.0.tgz",
+      "integrity": "sha512-Afu1fQBEb7QHt6QWX/6eUWvYHJofB90Fjx7FuJYF7mnG9z5BkAIpms1wsnvYLytfmqpEENHs/fax9p8gvMj7dw==",
+      "dev": true,
+      "dependencies": {
+        "array-back": "^6.2.2",
+        "lodash.omit": "^4.5.0",
+        "lodash.pick": "^4.4.0",
+        "reduce-extract": "^1.0.0",
+        "sort-array": "^4.1.5",
+        "test-value": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/jsdoc-to-markdown": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/jsdoc-to-markdown/-/jsdoc-to-markdown-8.0.0.tgz",
+      "integrity": "sha512-2FQvYkg491+FP6s15eFlgSSWs69CvQrpbABGYBtvAvGWy/lWo8IKKToarT283w59rQFrpcjHl3YdhHCa3l7gXg==",
+      "dev": true,
+      "dependencies": {
+        "array-back": "^6.2.2",
+        "command-line-tool": "^0.8.0",
+        "config-master": "^3.1.0",
+        "dmd": "^6.2.0",
+        "jsdoc-api": "^8.0.0",
+        "jsdoc-parse": "^6.2.0",
+        "walk-back": "^5.1.0"
+      },
+      "bin": {
+        "jsdoc2md": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=12.17"
+      }
+    },
+    "node_modules/jsdoc/node_modules/escape-string-regexp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jsdoc/node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "dev": true,
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/jsdom": {
+      "version": "19.0.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-19.0.0.tgz",
+      "integrity": "sha512-RYAyjCbxy/vri/CfnjUWJQQtZ3LKlLnDqj+9XLNnJPgEGeirZs3hllKR20re8LUZ6o1b1X4Jat+Qd26zmP41+A==",
+      "dependencies": {
+        "abab": "^2.0.5",
+        "acorn": "^8.5.0",
+        "acorn-globals": "^6.0.0",
+        "cssom": "^0.5.0",
+        "cssstyle": "^2.3.0",
+        "data-urls": "^3.0.1",
+        "decimal.js": "^10.3.1",
+        "domexception": "^4.0.0",
+        "escodegen": "^2.0.0",
+        "form-data": "^4.0.0",
+        "html-encoding-sniffer": "^3.0.0",
+        "http-proxy-agent": "^5.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "is-potential-custom-element-name": "^1.0.1",
+        "nwsapi": "^2.2.0",
+        "parse5": "6.0.1",
+        "saxes": "^5.0.1",
+        "symbol-tree": "^3.2.4",
+        "tough-cookie": "^4.0.0",
+        "w3c-hr-time": "^1.0.2",
+        "w3c-xmlserializer": "^3.0.0",
+        "webidl-conversions": "^7.0.0",
+        "whatwg-encoding": "^2.0.0",
+        "whatwg-mimetype": "^3.0.0",
+        "whatwg-url": "^10.0.0",
+        "ws": "^8.2.3",
+        "xml-name-validator": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "peerDependencies": {
+        "canvas": "^2.5.0"
+      },
+      "peerDependenciesMeta": {
+        "canvas": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jsdom/node_modules/acorn": {
+      "version": "8.8.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
+      "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/jsdom/node_modules/ws": {
+      "version": "8.9.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.9.0.tgz",
+      "integrity": "sha512-Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg==",
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "dev": true,
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "dev": true
+    },
+    "node_modules/json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="
+    },
+    "node_modules/json5": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "dev": true,
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
+      "dev": true,
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/klaw": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-3.0.0.tgz",
+      "integrity": "sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.9"
+      }
+    },
+    "node_modules/levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
+      "dependencies": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/linkify-it": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
+      "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
+      "dev": true,
+      "dependencies": {
+        "uc.micro": "^1.0.1"
+      }
+    },
+    "node_modules/locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dependencies": {
+        "p-locate": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
+    },
+    "node_modules/lodash-es": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
+      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
+    },
+    "node_modules/lodash.camelcase": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
+      "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=",
+      "dev": true
+    },
+    "node_modules/lodash.isempty": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz",
+      "integrity": "sha512-oKMuF3xEeqDltrGMfDxAPGIVMSSRv8tbRSODbrs4KGsRRLEhrW8N8Rd4DRgB2+621hY8A8XwwrTVhXWpxFvMzg=="
+    },
+    "node_modules/lodash.isfunction": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz",
+      "integrity": "sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw=="
+    },
+    "node_modules/lodash.isobject": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz",
+      "integrity": "sha512-3/Qptq2vr7WeJbB4KHUSKlq8Pl7ASXi3UG6CMbBm8WRtXi8+GHm7mKaU3urfpSEzWe2wCIChs6/sdocUsTKJiA=="
+    },
+    "node_modules/lodash.isstring": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
+      "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw=="
+    },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
+    },
+    "node_modules/lodash.omit": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz",
+      "integrity": "sha1-brGa5aHuHdnfC5aeZs4Lf6MLXmA=",
+      "dev": true
+    },
+    "node_modules/lodash.padend": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.6.1.tgz",
+      "integrity": "sha1-U8y6BH0G4VjTEfRdpiX05J5vFm4=",
+      "dev": true
+    },
+    "node_modules/lodash.pick": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz",
+      "integrity": "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=",
+      "dev": true
+    },
+    "node_modules/log-symbols": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "is-unicode-supported": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/log-symbols/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/log-symbols/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/log-symbols/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/log-symbols/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    },
+    "node_modules/log-symbols/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/log-symbols/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "dependencies": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      },
+      "bin": {
+        "loose-envify": "cli.js"
+      }
+    },
+    "node_modules/loupe": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.6.tgz",
+      "integrity": "sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==",
+      "dependencies": {
+        "get-func-name": "^2.0.0"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "devOptional": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/maildev": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/maildev/-/maildev-2.0.5.tgz",
+      "integrity": "sha512-iwBss8fIQuQ8ycgszp7+T1+SjDobnwzLgjSwMcFoW0uJYNHfwQQeuC4+XL7/BH+uju5PeBtwzODuCJqScbnf6g==",
+      "dependencies": {
+        "addressparser": "1.0.1",
+        "async": "^3.2.3",
+        "commander": "^9.0.0",
+        "compression": "^1.7.4",
+        "cors": "^2.8.5",
+        "dompurify": "^2.3.6",
+        "express": "^4.17.3",
+        "iconv-lite": "0.5.0",
+        "jsdom": "^19.0.0",
+        "mime": "2.4.4",
+        "nodemailer": "^6.7.2",
+        "rimraf": "^3.0.2",
+        "smtp-server": "3.11.0",
+        "socket.io": "4.4.1",
+        "uue": "3.1.2"
+      },
+      "bin": {
+        "maildev": "bin/maildev"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/maildev/node_modules/commander": {
+      "version": "9.4.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-9.4.1.tgz",
+      "integrity": "sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw==",
+      "engines": {
+        "node": "^12.20.0 || >=14"
+      }
+    },
+    "node_modules/maildev/node_modules/iconv-lite": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.0.tgz",
+      "integrity": "sha512-NnEhI9hIEKHOzJ4f697DMz9IQEXr/MMJ5w64vN2/4Ai+wRnvV7SBrL0KLoRlwaKVghOc7LQ5YkPLuX146b6Ydw==",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/maildev/node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/make-dir": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "optional": true,
+      "dependencies": {
+        "semver": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/make-dir/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "optional": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/make-error": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+      "dev": true
+    },
+    "node_modules/markdown-it": {
+      "version": "12.3.2",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz",
+      "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^2.0.1",
+        "entities": "~2.1.0",
+        "linkify-it": "^3.0.1",
+        "mdurl": "^1.0.1",
+        "uc.micro": "^1.0.5"
+      },
+      "bin": {
+        "markdown-it": "bin/markdown-it.js"
+      }
+    },
+    "node_modules/markdown-it-anchor": {
+      "version": "8.6.5",
+      "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.6.5.tgz",
+      "integrity": "sha512-PI1qEHHkTNWT+X6Ip9w+paonfIQ+QZP9sCeMYi47oqhH+EsW8CrJ8J7CzV19QVOj6il8ATGbK2nTECj22ZHGvQ==",
+      "dev": true,
+      "peerDependencies": {
+        "@types/markdown-it": "*",
+        "markdown-it": "*"
+      }
+    },
+    "node_modules/markdown-it/node_modules/entities": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
+      "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/marked": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-4.2.3.tgz",
+      "integrity": "sha512-slWRdJkbTZ+PjkyJnE30Uid64eHwbwa1Q25INCAYfZlK4o6ylagBy/Le9eWntqJFoFT93ikUKMv47GZ4gTwHkw==",
+      "dev": true,
+      "bin": {
+        "marked": "bin/marked.js"
+      },
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/mdurl": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
+      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=",
+      "dev": true
+    },
+    "node_modules/media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/merge-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
+    },
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "dev": true,
+      "dependencies": {
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/mime": {
+      "version": "2.4.4",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
+      "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==",
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/mime-db": {
+      "version": "1.51.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
+      "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.34",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz",
+      "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
+      "dependencies": {
+        "mime-db": "1.51.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mimic-response": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
+      "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
+      "optional": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
+      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/minipass": {
+      "version": "4.2.7",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.7.tgz",
+      "integrity": "sha512-ScVIgqHcXRMyfflqHmEW0bm8z8rb5McHyOY3ewX9JBgZaR77G7nxq9L/mtV96/QbAAwtbCAHVVLzD1kkyfFQEw==",
+      "optional": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minizlib": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
+      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+      "optional": true,
+      "dependencies": {
+        "minipass": "^3.0.0",
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/minizlib/node_modules/minipass": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+      "optional": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "node_modules/mkdirp2": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/mkdirp2/-/mkdirp2-1.0.5.tgz",
+      "integrity": "sha512-xOE9xbICroUDmG1ye2h4bZ8WBie9EGmACaco8K8cx6RlkJJrxGIqjGqztAI+NMhexXBcdGbSEzI6N3EJPevxZw==",
+      "dev": true
+    },
+    "node_modules/mocha": {
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.2.0.tgz",
+      "integrity": "sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg==",
+      "dependencies": {
+        "ansi-colors": "4.1.1",
+        "browser-stdout": "1.3.1",
+        "chokidar": "3.5.3",
+        "debug": "4.3.4",
+        "diff": "5.0.0",
+        "escape-string-regexp": "4.0.0",
+        "find-up": "5.0.0",
+        "glob": "7.2.0",
+        "he": "1.2.0",
+        "js-yaml": "4.1.0",
+        "log-symbols": "4.1.0",
+        "minimatch": "5.0.1",
+        "ms": "2.1.3",
+        "nanoid": "3.3.3",
+        "serialize-javascript": "6.0.0",
+        "strip-json-comments": "3.1.1",
+        "supports-color": "8.1.1",
+        "workerpool": "6.2.1",
+        "yargs": "16.2.0",
+        "yargs-parser": "20.2.4",
+        "yargs-unparser": "2.0.0"
+      },
+      "bin": {
+        "_mocha": "bin/_mocha",
+        "mocha": "bin/mocha.js"
+      },
+      "engines": {
+        "node": ">= 14.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/mochajs"
+      }
+    },
+    "node_modules/mocha/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/mocha/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/mocha/node_modules/debug/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+    },
+    "node_modules/mocha/node_modules/diff": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
+      "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
+    "node_modules/mocha/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/mocha/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/mocha/node_modules/minimatch": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
+      "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/mocha/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+    },
+    "node_modules/mocha/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/mochawesome": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/mochawesome/-/mochawesome-7.1.3.tgz",
+      "integrity": "sha512-Vkb3jR5GZ1cXohMQQ73H3cZz7RoxGjjUo0G5hu0jLaW+0FdUxUwg3Cj29bqQdh0rFcnyV06pWmqmi5eBPnEuNQ==",
+      "dependencies": {
+        "chalk": "^4.1.2",
+        "diff": "^5.0.0",
+        "json-stringify-safe": "^5.0.1",
+        "lodash.isempty": "^4.4.0",
+        "lodash.isfunction": "^3.0.9",
+        "lodash.isobject": "^3.0.2",
+        "lodash.isstring": "^4.0.1",
+        "mochawesome-report-generator": "^6.2.0",
+        "strip-ansi": "^6.0.1",
+        "uuid": "^8.3.2"
+      },
+      "peerDependencies": {
+        "mocha": ">=7"
+      }
+    },
+    "node_modules/mochawesome-merge": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/mochawesome-merge/-/mochawesome-merge-4.3.0.tgz",
+      "integrity": "sha512-1roR6g+VUlfdaRmL8dCiVpKiaUhbPVm1ZQYUM6zHX46mWk+tpsKVZR6ba98k2zc8nlPvYd71yn5gyH970pKBSw==",
+      "dev": true,
+      "dependencies": {
+        "fs-extra": "^7.0.1",
+        "glob": "^7.1.6",
+        "yargs": "^15.3.1"
+      },
+      "bin": {
+        "mochawesome-merge": "bin/mochawesome-merge.js"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/mochawesome-merge/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/mochawesome-merge/node_modules/cliui": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^6.2.0"
+      }
+    },
+    "node_modules/mochawesome-merge/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/mochawesome-merge/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/mochawesome-merge/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/mochawesome-merge/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/mochawesome-merge/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/mochawesome-merge/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/mochawesome-merge/node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/mochawesome-merge/node_modules/yargs": {
+      "version": "15.4.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^6.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^4.1.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^4.2.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^18.1.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/mochawesome-merge/node_modules/yargs-parser": {
+      "version": "18.1.3",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mochawesome-report-generator": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/mochawesome-report-generator/-/mochawesome-report-generator-6.2.0.tgz",
+      "integrity": "sha512-Ghw8JhQFizF0Vjbtp9B0i//+BOkV5OWcQCPpbO0NGOoxV33o+gKDYU0Pr2pGxkIHnqZ+g5mYiXF7GMNgAcDpSg==",
+      "dependencies": {
+        "chalk": "^4.1.2",
+        "dateformat": "^4.5.1",
+        "escape-html": "^1.0.3",
+        "fs-extra": "^10.0.0",
+        "fsu": "^1.1.1",
+        "lodash.isfunction": "^3.0.9",
+        "opener": "^1.5.2",
+        "prop-types": "^15.7.2",
+        "tcomb": "^3.2.17",
+        "tcomb-validation": "^3.3.0",
+        "validator": "^13.6.0",
+        "yargs": "^17.2.1"
+      },
+      "bin": {
+        "marge": "bin/cli.js"
+      }
+    },
+    "node_modules/mochawesome-report-generator/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/mochawesome-report-generator/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/mochawesome-report-generator/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/mochawesome-report-generator/node_modules/cliui": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/mochawesome-report-generator/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/mochawesome-report-generator/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    },
+    "node_modules/mochawesome-report-generator/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
+    "node_modules/mochawesome-report-generator/node_modules/fs-extra": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/mochawesome-report-generator/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/mochawesome-report-generator/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/mochawesome-report-generator/node_modules/jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/mochawesome-report-generator/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/mochawesome-report-generator/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/mochawesome-report-generator/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/mochawesome-report-generator/node_modules/universalify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/mochawesome-report-generator/node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/mochawesome-report-generator/node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/mochawesome-report-generator/node_modules/yargs": {
+      "version": "17.6.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.0.tgz",
+      "integrity": "sha512-8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g==",
+      "dependencies": {
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/mochawesome-report-generator/node_modules/yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/mochawesome/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/mochawesome/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/mochawesome/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/mochawesome/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/mochawesome/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    },
+    "node_modules/mochawesome/node_modules/diff": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
+      "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
+    "node_modules/mochawesome/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/mochawesome/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/mochawesome/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+    },
+    "node_modules/nan": {
+      "version": "2.17.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
+      "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
+      "optional": true
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz",
+      "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==",
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true
+    },
+    "node_modules/natural-compare-lite": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
+      "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
+      "dev": true
+    },
+    "node_modules/negotiator": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/neo-async": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+      "dev": true
+    },
+    "node_modules/node-fetch": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz",
+      "integrity": "sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==",
+      "optional": true,
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/node-fetch/node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
+      "optional": true
+    },
+    "node_modules/node-fetch/node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
+      "optional": true
+    },
+    "node_modules/node-fetch/node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "optional": true,
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
+    "node_modules/nodemailer": {
+      "version": "6.8.0",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.8.0.tgz",
+      "integrity": "sha512-EjYvSmHzekz6VNkNd12aUqAco+bOkRe3Of5jVhltqKhEsjw/y0PYPJfp83+s9Wzh1dspYAkUW/YNQ350NATbSQ==",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/nopt": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
+      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
+      "optional": true,
+      "dependencies": {
+        "abbrev": "1"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/npmlog": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
+      "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
+      "optional": true,
+      "dependencies": {
+        "are-we-there-yet": "^2.0.0",
+        "console-control-strings": "^1.1.0",
+        "gauge": "^3.0.0",
+        "set-blocking": "^2.0.0"
+      }
+    },
+    "node_modules/nwsapi": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.2.tgz",
+      "integrity": "sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw=="
+    },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-get": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/object-get/-/object-get-2.1.1.tgz",
+      "integrity": "sha512-7n4IpLMzGGcLEMiQKsNR7vCe+N5E9LORFrtNUVy4sO3dj9a3HedZCxEL2T7QuLhcHN1NBuBsMOKaOsAYI9IIvg==",
+      "dev": true
+    },
+    "node_modules/object-inspect": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz",
+      "integrity": "sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object-to-spawn-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/object-to-spawn-args/-/object-to-spawn-args-2.0.1.tgz",
+      "integrity": "sha512-6FuKFQ39cOID+BMZ3QaphcC8Y4cw6LXBLyIgPU+OhIYwviJamPAn+4mITapnSBQrejB+NNp+FMskhD8Cq+Ys3w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/object.assign": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "has-symbols": "^1.0.1",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz",
+      "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.entries/node_modules/define-properties": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+      "dev": true,
+      "dependencies": {
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries/node_modules/es-abstract": {
+      "version": "1.20.4",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz",
+      "integrity": "sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "function.prototype.name": "^1.1.5",
+        "get-intrinsic": "^1.1.3",
+        "get-symbol-description": "^1.0.0",
+        "has": "^1.0.3",
+        "has-property-descriptors": "^1.0.0",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.3",
+        "is-callable": "^1.2.7",
+        "is-negative-zero": "^2.0.2",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.2",
+        "is-string": "^1.0.7",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.12.2",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.4",
+        "regexp.prototype.flags": "^1.4.3",
+        "safe-regex-test": "^1.0.0",
+        "string.prototype.trimend": "^1.0.5",
+        "string.prototype.trimstart": "^1.0.5",
+        "unbox-primitive": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries/node_modules/get-intrinsic": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
+      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries/node_modules/has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries/node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries/node_modules/is-callable": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries/node_modules/is-shared-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries/node_modules/object-inspect": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
+      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries/node_modules/object.assign": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
+      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "has-symbols": "^1.0.3",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries/node_modules/string.prototype.trimend": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
+      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries/node_modules/string.prototype.trimstart": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
+      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries/node_modules/unbox-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
+        "which-boxed-primitive": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.values": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
+      "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.values/node_modules/define-properties": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+      "dev": true,
+      "dependencies": {
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.values/node_modules/es-abstract": {
+      "version": "1.21.1",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.1.tgz",
+      "integrity": "sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==",
+      "dev": true,
+      "dependencies": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "es-set-tostringtag": "^2.0.1",
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "function.prototype.name": "^1.1.5",
+        "get-intrinsic": "^1.1.3",
+        "get-symbol-description": "^1.0.0",
+        "globalthis": "^1.0.3",
+        "gopd": "^1.0.1",
+        "has": "^1.0.3",
+        "has-property-descriptors": "^1.0.0",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.4",
+        "is-array-buffer": "^3.0.1",
+        "is-callable": "^1.2.7",
+        "is-negative-zero": "^2.0.2",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.2",
+        "is-string": "^1.0.7",
+        "is-typed-array": "^1.1.10",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.12.2",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.4",
+        "regexp.prototype.flags": "^1.4.3",
+        "safe-regex-test": "^1.0.0",
+        "string.prototype.trimend": "^1.0.6",
+        "string.prototype.trimstart": "^1.0.6",
+        "typed-array-length": "^1.0.4",
+        "unbox-primitive": "^1.0.2",
+        "which-typed-array": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.values/node_modules/get-intrinsic": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
+      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.values/node_modules/has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.values/node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.values/node_modules/internal-slot": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz",
+      "integrity": "sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.3",
+        "has": "^1.0.3",
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.values/node_modules/is-callable": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.values/node_modules/is-shared-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.values/node_modules/object-inspect": {
+      "version": "1.12.3",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
+      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.values/node_modules/object.assign": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
+      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "has-symbols": "^1.0.3",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.values/node_modules/string.prototype.trimend": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
+      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.values/node_modules/string.prototype.trimstart": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
+      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.values/node_modules/unbox-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
+        "which-boxed-primitive": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/on-finished": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/on-headers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
+      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/opener": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
+      "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==",
+      "bin": {
+        "opener": "bin/opener-bin.js"
+      }
+    },
+    "node_modules/optionator": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+      "dependencies": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.6",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "word-wrap": "~1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dependencies": {
+        "p-limit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "dependencies": {
+        "callsites": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parse5": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="
+    },
+    "node_modules/parseurl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
+    },
+    "node_modules/path-to-regexp": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
+    },
+    "node_modules/path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path2d-polyfill": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path2d-polyfill/-/path2d-polyfill-2.0.1.tgz",
+      "integrity": "sha512-ad/3bsalbbWhmBo0D6FZ4RNMwsLsPpL6gnvhuSaU5Vm7b06Kr5ubSltQQ0T7YKsiJQO+g22zJ4dJKNTXIyOXtA==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pathval": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
+      "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/pdfjs-dist": {
+      "version": "3.4.120",
+      "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-3.4.120.tgz",
+      "integrity": "sha512-B1hw9ilLG4m/jNeFA0C2A0PZydjxslP8ylU+I4XM7Bzh/xWETo9EiBV848lh0O0hLut7T6lK1V7cpAXv5BhxWw==",
+      "dependencies": {
+        "path2d-polyfill": "^2.0.1",
+        "web-streams-polyfill": "^3.2.1"
+      },
+      "optionalDependencies": {
+        "canvas": "^2.11.0"
+      }
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/playwright": {
+      "version": "1.36.1",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.36.1.tgz",
+      "integrity": "sha512-2ZqHpD0U0COKR8bqR3W5IkyIAAM0mT9FgGJB9xWCI1qAUkqLxJskA1ueeQOTH2Qfz3+oxdwwf2EzdOX+RkZmmQ==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "playwright-core": "1.36.1"
+      },
+      "bin": {
+        "playwright": "cli.js"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/playwright-core": {
+      "version": "1.36.1",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.36.1.tgz",
+      "integrity": "sha512-7+tmPuMcEW4xeCL9cp9KxmYpQYHKkyjwoXRnoeTowaeNat8PoBMk/HwCYhqkH2fRkshfKEOiVus/IhID2Pg8kg==",
+      "bin": {
+        "playwright-core": "cli.js"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/prop-types": {
+      "version": "15.8.1",
+      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
+      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
+      "dependencies": {
+        "loose-envify": "^1.4.0",
+        "object-assign": "^4.1.1",
+        "react-is": "^16.13.1"
+      }
+    },
+    "node_modules/proxy-addr": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+      "dependencies": {
+        "forwarded": "0.2.0",
+        "ipaddr.js": "1.9.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/psl": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
+      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="
+    },
+    "node_modules/punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/qs": {
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "dependencies": {
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/querystringify": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
+    },
+    "node_modules/queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/range-parser": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/raw-body": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+      "dependencies": {
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/raw-body/node_modules/bytes": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/react-is": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+    },
+    "node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "optional": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/reduce-extract": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/reduce-extract/-/reduce-extract-1.0.0.tgz",
+      "integrity": "sha1-Z/I4W+2mUGG19fQxJmLosIDKFSU=",
+      "dev": true,
+      "dependencies": {
+        "test-value": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/reduce-extract/node_modules/array-back": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/array-back/-/array-back-1.0.4.tgz",
+      "integrity": "sha1-ZEun8JX3/898Q7Xw3DnTwfA8Bjs=",
+      "dev": true,
+      "dependencies": {
+        "typical": "^2.6.0"
+      },
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/reduce-extract/node_modules/test-value": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/test-value/-/test-value-1.1.0.tgz",
+      "integrity": "sha1-oJE29y7AQ9J8iTcHwrFZv6196T8=",
+      "dev": true,
+      "dependencies": {
+        "array-back": "^1.0.2",
+        "typical": "^2.4.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/reduce-flatten": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-1.0.1.tgz",
+      "integrity": "sha512-j5WfFJfc9CoXv/WbwVLHq74i/hdTUpy+iNC534LxczMRP67vJeK3V9JOdnL0N1cIRbn9mYhE2yVjvvKXDxvNXQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/reduce-unique": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/reduce-unique/-/reduce-unique-2.0.1.tgz",
+      "integrity": "sha512-x4jH/8L1eyZGR785WY+ePtyMNhycl1N2XOLxhCbzZFaqF4AXjLzqSxa2UHgJ2ZVR/HHyPOvl1L7xRnW8ye5MdA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/reduce-without": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/reduce-without/-/reduce-without-1.0.1.tgz",
+      "integrity": "sha1-aK0OrRGFXJo31OglbBW7+Hly/Iw=",
+      "dev": true,
+      "dependencies": {
+        "test-value": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/reduce-without/node_modules/array-back": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/array-back/-/array-back-1.0.4.tgz",
+      "integrity": "sha1-ZEun8JX3/898Q7Xw3DnTwfA8Bjs=",
+      "dev": true,
+      "dependencies": {
+        "typical": "^2.6.0"
+      },
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/reduce-without/node_modules/test-value": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/test-value/-/test-value-2.1.0.tgz",
+      "integrity": "sha1-Edpv9nDzRxpztiXKTz/c97t0gpE=",
+      "dev": true,
+      "dependencies": {
+        "array-back": "^1.0.3",
+        "typical": "^2.6.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/regexp.prototype.flags": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
+      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "functions-have-names": "^1.2.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-main-filename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+      "dev": true
+    },
+    "node_modules/requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
+    },
+    "node_modules/requizzle": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.4.tgz",
+      "integrity": "sha512-JRrFk1D4OQ4SqovXOgdav+K8EAhSB/LJZqCz8tbX0KObcdeM15Ss59ozWMBWmmINMagCwmqn4ZNryUGpBsl6Jw==",
+      "dev": true,
+      "dependencies": {
+        "lodash": "^4.17.21"
+      }
+    },
+    "node_modules/resolve": {
+      "version": "1.22.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
+      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+      "dev": true,
+      "dependencies": {
+        "is-core-module": "^2.9.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "dev": true,
+      "engines": {
+        "iojs": ">=1.0.0",
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "devOptional": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "node_modules/safe-regex-test": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
+      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.3",
+        "is-regex": "^1.1.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/safe-regex-test/node_modules/get-intrinsic": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
+      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/safe-regex-test/node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "node_modules/saxes": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
+      "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
+      "dependencies": {
+        "xmlchars": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/semver": {
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "devOptional": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/send": {
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+      "dependencies": {
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "mime": "1.6.0",
+        "ms": "2.1.3",
+        "on-finished": "2.4.1",
+        "range-parser": "~1.2.1",
+        "statuses": "2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/send/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/send/node_modules/debug/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/send/node_modules/mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/send/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+    },
+    "node_modules/serialize-javascript": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
+      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "node_modules/serve-static": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+      "dependencies": {
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.3",
+        "send": "0.18.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
+      "devOptional": true
+    },
+    "node_modules/setprototypeof": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "optional": true
+    },
+    "node_modules/simple-concat": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
+      "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "optional": true
+    },
+    "node_modules/simple-get": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.1.tgz",
+      "integrity": "sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA==",
+      "optional": true,
+      "dependencies": {
+        "decompress-response": "^4.2.0",
+        "once": "^1.3.1",
+        "simple-concat": "^1.0.0"
+      }
+    },
+    "node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/smtp-server": {
+      "version": "3.11.0",
+      "resolved": "https://registry.npmjs.org/smtp-server/-/smtp-server-3.11.0.tgz",
+      "integrity": "sha512-j/W6mEKeMNKuiM9oCAAjm87agPEN1O3IU4cFLT4ZOCyyq3UXN7HiIXF+q7izxJcYSar15B/JaSxcijoPCR8Tag==",
+      "dependencies": {
+        "base32.js": "0.1.0",
+        "ipv6-normalize": "1.0.1",
+        "nodemailer": "6.7.3"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/smtp-server/node_modules/nodemailer": {
+      "version": "6.7.3",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.3.tgz",
+      "integrity": "sha512-KUdDsspqx89sD4UUyUKzdlUOper3hRkDVkrKh/89G+d9WKsU5ox51NWS4tB1XR5dPUdR4SP0E3molyEfOvSa3g==",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/socket.io": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.4.1.tgz",
+      "integrity": "sha512-s04vrBswdQBUmuWJuuNTmXUVJhP0cVky8bBDhdkf8y0Ptsu7fKU2LuLbts9g+pdmAdyMMn8F/9Mf1/wbtUN0fg==",
+      "dependencies": {
+        "accepts": "~1.3.4",
+        "base64id": "~2.0.0",
+        "debug": "~4.3.2",
+        "engine.io": "~6.1.0",
+        "socket.io-adapter": "~2.3.3",
+        "socket.io-parser": "~4.0.4"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/socket.io-adapter": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.3.3.tgz",
+      "integrity": "sha512-Qd/iwn3VskrpNO60BeRyCyr8ZWw9CPZyitW4AQwmRZ8zCiyDiL+znRnWX6tDHXnWn1sJrM1+b6Mn6wEDJJ4aYQ=="
+    },
+    "node_modules/socket.io-parser": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.5.tgz",
+      "integrity": "sha512-sNjbT9dX63nqUFIOv95tTVm6elyIU4RvB1m8dOeZt+IgWwcWklFDOdmGcfo3zSiRsnR/3pJkjY5lfoGqEe4Eig==",
+      "dependencies": {
+        "@types/component-emitter": "^1.2.10",
+        "component-emitter": "~1.3.0",
+        "debug": "~4.3.1"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/sort-array": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/sort-array/-/sort-array-4.1.5.tgz",
+      "integrity": "sha512-Ya4peoS1fgFN42RN1REk2FgdNOeLIEMKFGJvs7VTP3OklF8+kl2SkpVliZ4tk/PurWsrWRsdNdU+tgyOBkB9sA==",
+      "dev": true,
+      "dependencies": {
+        "array-back": "^5.0.0",
+        "typical": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/sort-array/node_modules/array-back": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/array-back/-/array-back-5.0.0.tgz",
+      "integrity": "sha512-kgVWwJReZWmVuWOQKEOohXKJX+nD02JAZ54D1RRWlv8L0NebauKAaFxACKzB74RTclt1+WNz5KHaLRDAPZbDEw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/sort-array/node_modules/typical": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/typical/-/typical-6.0.1.tgz",
+      "integrity": "sha512-+g3NEp7fJLe9DPa1TArHm9QAA7YciZmWnfAqEaFrBihQ7epOv9i99rjtgb6Iz0wh3WuQDjsCTDfgRoGnmHN81A==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "dev": true,
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/source-map-support/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/stream-connect": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/stream-connect/-/stream-connect-1.0.2.tgz",
+      "integrity": "sha1-GLyB8u2zW4tdmoAJIAqYUxRCipc=",
+      "dev": true,
+      "dependencies": {
+        "array-back": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/stream-connect/node_modules/array-back": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/array-back/-/array-back-1.0.4.tgz",
+      "integrity": "sha1-ZEun8JX3/898Q7Xw3DnTwfA8Bjs=",
+      "dev": true,
+      "dependencies": {
+        "typical": "^2.6.0"
+      },
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/stream-via": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/stream-via/-/stream-via-1.0.4.tgz",
+      "integrity": "sha512-DBp0lSvX5G9KGRDTkR/R+a29H+Wk2xItOF+MpZLLNDWbEV9tGPnqLPxHEYjmiz8xGtJHRIqmI+hCjmNzqoA4nQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "optional": true,
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "node_modules/string_decoder/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "optional": true
+    },
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string.prototype.trimend": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
+      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
+      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/strnum": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz",
+      "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA=="
+    },
+    "node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/symbol-tree": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
+      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
+    },
+    "node_modules/table-layout": {
+      "version": "0.4.5",
+      "resolved": "https://registry.npmjs.org/table-layout/-/table-layout-0.4.5.tgz",
+      "integrity": "sha512-zTvf0mcggrGeTe/2jJ6ECkJHAQPIYEwDoqsiqBjI24mvRmQbInK5jq33fyypaCBxX08hMkfmdOqj6haT33EqWw==",
+      "dev": true,
+      "dependencies": {
+        "array-back": "^2.0.0",
+        "deep-extend": "~0.6.0",
+        "lodash.padend": "^4.6.1",
+        "typical": "^2.6.1",
+        "wordwrapjs": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/table-layout/node_modules/array-back": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/array-back/-/array-back-2.0.0.tgz",
+      "integrity": "sha512-eJv4pLLufP3g5kcZry0j6WXpIbzYw9GUB4mVJZno9wfwiBxbizTnHCw3VJb07cBihbFX48Y7oSrW9y+gt4glyw==",
+      "dev": true,
+      "dependencies": {
+        "typical": "^2.6.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/tar": {
+      "version": "6.1.13",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.13.tgz",
+      "integrity": "sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==",
+      "optional": true,
+      "dependencies": {
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "minipass": "^4.0.0",
+        "minizlib": "^2.1.1",
+        "mkdirp": "^1.0.3",
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/tar/node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "optional": true,
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/tcomb": {
+      "version": "3.2.29",
+      "resolved": "https://registry.npmjs.org/tcomb/-/tcomb-3.2.29.tgz",
+      "integrity": "sha512-di2Hd1DB2Zfw6StGv861JoAF5h/uQVu/QJp2g8KVbtfKnoHdBQl5M32YWq6mnSYBQ1vFFrns5B1haWJL7rKaOQ=="
+    },
+    "node_modules/tcomb-validation": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/tcomb-validation/-/tcomb-validation-3.4.1.tgz",
+      "integrity": "sha512-urVVMQOma4RXwiVCa2nM2eqrAomHROHvWPuj6UkDGz/eb5kcy0x6P0dVt6kzpUZtYMNoAqJLWmz1BPtxrtjtrA==",
+      "dependencies": {
+        "tcomb": "^3.0.0"
+      }
+    },
+    "node_modules/temp-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/temp-path/-/temp-path-1.0.0.tgz",
+      "integrity": "sha1-JLFUOXOrRCiW2a02fdnL2/r+kYs=",
+      "dev": true
+    },
+    "node_modules/test-value": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/test-value/-/test-value-3.0.0.tgz",
+      "integrity": "sha512-sVACdAWcZkSU9x7AOmJo5TqE+GyNJknHaHsMrR6ZnhjVlVN9Yx6FjHrsKZ3BjIpPCT68zYesPWkakrNupwfOTQ==",
+      "dev": true,
+      "dependencies": {
+        "array-back": "^2.0.0",
+        "typical": "^2.6.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/test-value/node_modules/array-back": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/array-back/-/array-back-2.0.0.tgz",
+      "integrity": "sha512-eJv4pLLufP3g5kcZry0j6WXpIbzYw9GUB4mVJZno9wfwiBxbizTnHCw3VJb07cBihbFX48Y7oSrW9y+gt4glyw==",
+      "dev": true,
+      "dependencies": {
+        "typical": "^2.6.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+      "dev": true
+    },
+    "node_modules/to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/toidentifier": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/tough-cookie": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz",
+      "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==",
+      "dependencies": {
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.2.0",
+        "url-parse": "^1.5.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tough-cookie/node_modules/universalify": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/tr46": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
+      "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
+      "dependencies": {
+        "punycode": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/ts-mocha": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/ts-mocha/-/ts-mocha-10.0.0.tgz",
+      "integrity": "sha512-VRfgDO+iiuJFlNB18tzOfypJ21xn2xbuZyDvJvqpTbWgkAgD17ONGr8t+Tl8rcBtOBdjXp5e/Rk+d39f7XBHRw==",
+      "dev": true,
+      "dependencies": {
+        "ts-node": "7.0.1"
+      },
+      "bin": {
+        "ts-mocha": "bin/ts-mocha"
+      },
+      "engines": {
+        "node": ">= 6.X.X"
+      },
+      "optionalDependencies": {
+        "tsconfig-paths": "^3.5.0"
+      },
+      "peerDependencies": {
+        "mocha": "^3.X.X || ^4.X.X || ^5.X.X || ^6.X.X || ^7.X.X || ^8.X.X || ^9.X.X || ^10.X.X"
+      }
+    },
+    "node_modules/ts-mocha/node_modules/json5": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/ts-mocha/node_modules/tsconfig-paths": {
+      "version": "3.14.2",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",
+      "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.2",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
+      }
+    },
+    "node_modules/ts-node": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-7.0.1.tgz",
+      "integrity": "sha512-BVwVbPJRspzNh2yfslyT1PSbl5uIk03EZlb493RKHN4qej/D06n1cEhjlOJG69oFsE7OT8XjpTUcYf6pKTLMhw==",
+      "dev": true,
+      "dependencies": {
+        "arrify": "^1.0.0",
+        "buffer-from": "^1.1.0",
+        "diff": "^3.1.0",
+        "make-error": "^1.1.1",
+        "minimist": "^1.2.0",
+        "mkdirp": "^0.5.1",
+        "source-map-support": "^0.5.6",
+        "yn": "^2.0.0"
+      },
+      "bin": {
+        "ts-node": "dist/bin.js"
+      },
+      "engines": {
+        "node": ">=4.2.0"
+      }
+    },
+    "node_modules/tsconfig-paths": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz",
+      "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==",
+      "dev": true,
+      "dependencies": {
+        "json5": "^2.2.2",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
+    "node_modules/tsutils": {
+      "version": "3.21.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.8.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      },
+      "peerDependencies": {
+        "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
+      }
+    },
+    "node_modules/type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
+      "dependencies": {
+        "prelude-ls": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/type-is": {
+      "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+      "dependencies": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/typed-array-length": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
+      "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "is-typed-array": "^1.1.9"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/typescript": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz",
+      "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==",
+      "dev": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
+    "node_modules/typical": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/typical/-/typical-2.6.1.tgz",
+      "integrity": "sha1-XAgOXWYcu+OCWdLnCjxyU+hziB0=",
+      "dev": true
+    },
+    "node_modules/uc.micro": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
+      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
+      "dev": true
+    },
+    "node_modules/uglify-js": {
+      "version": "3.17.4",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz",
+      "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==",
+      "dev": true,
+      "optional": true,
+      "bin": {
+        "uglifyjs": "bin/uglifyjs"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/unbox-primitive": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
+      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "has-bigints": "^1.0.1",
+        "has-symbols": "^1.0.2",
+        "which-boxed-primitive": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/underscore": {
+      "version": "1.13.6",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz",
+      "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==",
+      "dev": true
+    },
+    "node_modules/universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/url-join": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/url-join/-/url-join-5.0.0.tgz",
+      "integrity": "sha512-n2huDr9h9yzd6exQVnH/jU5mr+Pfx08LRXXZhkLLetAMESRj+anQsTAh940iMrIetKAmry9coFuZQ2jY8/p3WA==",
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      }
+    },
+    "node_modules/url-parse": {
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+      "dependencies": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    },
+    "node_modules/url-template": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/url-template/-/url-template-3.1.0.tgz",
+      "integrity": "sha512-vB/eHWttzhN+NZzk9FcQB2h1cSEgb7zDYyvyxPhw02LYw7YqIzO+w1AqkcKvZ51gPH8o4+nyiWve/xuQqMdJZw==",
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "optional": true
+    },
+    "node_modules/utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/uue": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/uue/-/uue-3.1.2.tgz",
+      "integrity": "sha512-axKLXVqwtdI/czrjG0X8hyV1KLgeWx8F4KvSbvVCnS+RUvsQMGRjx0kfuZDXXqj0LYvVJmx3B9kWlKtEdRrJLg==",
+      "dependencies": {
+        "escape-string-regexp": "~1.0.5",
+        "extend": "~3.0.0"
+      }
+    },
+    "node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/validator": {
+      "version": "13.7.0",
+      "resolved": "https://registry.npmjs.org/validator/-/validator-13.7.0.tgz",
+      "integrity": "sha512-nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw==",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/w3c-hr-time": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
+      "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
+      "deprecated": "Use your platform's native performance.now() and performance.timeOrigin.",
+      "dependencies": {
+        "browser-process-hrtime": "^1.0.0"
+      }
+    },
+    "node_modules/w3c-xmlserializer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-3.0.0.tgz",
+      "integrity": "sha512-3WFqGEgSXIyGhOmAFtlicJNMjEps8b1MG31NCA0/vOF9+nKMUW1ckhi9cnNHmf88Rzw5V+dwIwsm2C7X8k9aQg==",
+      "dependencies": {
+        "xml-name-validator": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/walk-back": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/walk-back/-/walk-back-5.1.0.tgz",
+      "integrity": "sha512-Uhxps5yZcVNbLEAnb+xaEEMdgTXl9qAQDzKYejG2AZ7qPwRQ81lozY9ECDbjLPNWm7YsO1IK5rsP1KoQzXAcGA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.17"
+      }
+    },
+    "node_modules/web-streams-polyfill": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz",
+      "integrity": "sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/webidl-conversions": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/whatwg-encoding": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
+      "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
+      "dependencies": {
+        "iconv-lite": "0.6.3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/whatwg-encoding/node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/whatwg-mimetype": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
+      "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/whatwg-url": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-10.0.0.tgz",
+      "integrity": "sha512-CLxxCmdUby142H5FZzn4D8ikO1cmypvXVQktsgosNy4a4BHrDHeciBBGZhb0bNoR5/MltoCatso+vFjjGx8t0w==",
+      "dependencies": {
+        "tr46": "^3.0.0",
+        "webidl-conversions": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "dev": true,
+      "dependencies": {
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-module": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==",
+      "dev": true
+    },
+    "node_modules/which-typed-array": {
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz",
+      "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==",
+      "dev": true,
+      "dependencies": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-tostringtag": "^1.0.0",
+        "is-typed-array": "^1.1.10"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/wide-align": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
+      "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
+      "optional": true,
+      "dependencies": {
+        "string-width": "^1.0.2 || 2 || 3 || 4"
+      }
+    },
+    "node_modules/word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/wordwrap": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
+      "dev": true
+    },
+    "node_modules/wordwrapjs": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-3.0.0.tgz",
+      "integrity": "sha512-mO8XtqyPvykVCsrwj5MlOVWvSnCdT+C+QVbm6blradR7JExAhbkZ7hZ9A+9NUtwzSqrlUo9a67ws0EiILrvRpw==",
+      "dev": true,
+      "dependencies": {
+        "reduce-flatten": "^1.0.1",
+        "typical": "^2.6.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/workerpool": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz",
+      "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw=="
+    },
+    "node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+    },
+    "node_modules/xml-name-validator": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
+      "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/xmlchars": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
+      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="
+    },
+    "node_modules/xmlcreate": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-2.0.4.tgz",
+      "integrity": "sha512-nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg==",
+      "dev": true
+    },
+    "node_modules/xpath-ts": {
+      "version": "1.3.13",
+      "resolved": "https://registry.npmjs.org/xpath-ts/-/xpath-ts-1.3.13.tgz",
+      "integrity": "sha512-eNVXzDWbCV9KEB6fGNQ3qHFGC9PWBH7y2h13vZ+CMPNqOTZ+fgYTG4Sb0p5bVHiAwZrzgE6/tx987003P3dYpA=="
+    },
+    "node_modules/y18n": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+      "dev": true
+    },
+    "node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "devOptional": true
+    },
+    "node_modules/yargs": {
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "dependencies": {
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.0",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "20.2.4",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
+      "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yargs-unparser": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
+      "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
+      "dependencies": {
+        "camelcase": "^6.0.0",
+        "decamelize": "^4.0.0",
+        "flat": "^5.0.2",
+        "is-plain-obj": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yargs-unparser/node_modules/camelcase": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/yargs-unparser/node_modules/decamelize": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
+      "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/yargs/node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yn": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/yn/-/yn-2.0.0.tgz",
+      "integrity": "sha512-uTv8J/wiWTgUTg+9vLTi//leUl5vDQS6uii/emeTb2ssY7vl6QWf2fFbIIGjnhjvbdKlU0ed7QPgY1htTC86jQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    }
+  },
   "dependencies": {
     "@aashutoshrathi/word-wrap": {
       "version": "1.2.6",
@@ -808,7 +9923,8 @@
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "acorn-walk": {
       "version": "7.2.0",
@@ -1657,7 +10773,8 @@
     "chai-string": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/chai-string/-/chai-string-1.5.0.tgz",
-      "integrity": "sha512-sydDC3S3pNAQMYwJrs6dQX0oBQ6KfIPuOZ78n7rocW0eJJlsHPh2t3kwW7xfwYA/1Bf6/arGtSUo16rxR2JFlw=="
+      "integrity": "sha512-sydDC3S3pNAQMYwJrs6dQX0oBQ6KfIPuOZ78n7rocW0eJJlsHPh2t3kwW7xfwYA/1Bf6/arGtSUo16rxR2JFlw==",
+      "requires": {}
     },
     "chalk": {
       "version": "2.4.2",
@@ -2231,7 +11348,8 @@
         "ws": {
           "version": "8.2.3",
           "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz",
-          "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA=="
+          "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==",
+          "requires": {}
         }
       }
     },
@@ -2687,6 +11805,15 @@
             "has": "^1.0.3"
           }
         },
+        "json5": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+          "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
         "minimatch": {
           "version": "3.1.2",
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -2701,6 +11828,18 @@
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
           "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
+        },
+        "tsconfig-paths": {
+          "version": "3.14.2",
+          "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",
+          "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==",
+          "dev": true,
+          "requires": {
+            "@types/json5": "^0.0.29",
+            "json5": "^1.0.2",
+            "minimist": "^1.2.6",
+            "strip-bom": "^3.0.0"
+          }
         }
       }
     },
@@ -3836,7 +12975,8 @@
         "ws": {
           "version": "8.9.0",
           "resolved": "https://registry.npmjs.org/ws/-/ws-8.9.0.tgz",
-          "integrity": "sha512-Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg=="
+          "integrity": "sha512-Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg==",
+          "requires": {}
         }
       }
     },
@@ -3864,13 +13004,10 @@
       "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="
     },
     "json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "requires": {
-        "minimist": "^1.2.0"
-      }
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "dev": true
     },
     "jsonfile": {
       "version": "4.0.0",
@@ -4051,6 +13188,7 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
       "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "devOptional": true,
       "requires": {
         "yallist": "^4.0.0"
       }
@@ -4148,7 +13286,8 @@
       "version": "8.6.5",
       "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.6.5.tgz",
       "integrity": "sha512-PI1qEHHkTNWT+X6Ip9w+paonfIQ+QZP9sCeMYi47oqhH+EsW8CrJ8J7CzV19QVOj6il8ATGbK2nTECj22ZHGvQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "marked": {
       "version": "4.2.3",
@@ -4732,11 +13871,6 @@
         }
       }
     },
-    "module-alias": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/module-alias/-/module-alias-2.2.3.tgz",
-      "integrity": "sha512-23g5BFj4zdQL/b6tor7Ji+QY4pEfNH784BMslY9Qb0UnJWRAt+lQGLYmRaM0KDBwIG23ffEBELhZDP2rhi9f/Q=="
-    },
     "ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -5589,6 +14723,7 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
       "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "devOptional": true,
       "requires": {
         "glob": "^7.1.3"
       }
@@ -5654,6 +14789,7 @@
       "version": "7.3.8",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
       "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "devOptional": true,
       "requires": {
         "lru-cache": "^6.0.0"
       }
@@ -5727,7 +14863,8 @@
     "set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
+      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
+      "devOptional": true
     },
     "setprototypeof": {
       "version": "1.2.0",
@@ -5912,6 +15049,23 @@
       "integrity": "sha512-DBp0lSvX5G9KGRDTkR/R+a29H+Wk2xItOF+MpZLLNDWbEV9tGPnqLPxHEYjmiz8xGtJHRIqmI+hCjmNzqoA4nQ==",
       "dev": true
     },
+    "string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "optional": true,
+      "requires": {
+        "safe-buffer": "~5.2.0"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+          "optional": true
+        }
+      }
+    },
     "string-width": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -5942,23 +15096,6 @@
         "define-properties": "^1.1.3"
       }
     },
-    "string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "optional": true,
-      "requires": {
-        "safe-buffer": "~5.2.0"
-      },
-      "dependencies": {
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-          "optional": true
-        }
-      }
-    },
     "strip-ansi": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
@@ -6148,6 +15285,31 @@
       "requires": {
         "ts-node": "7.0.1",
         "tsconfig-paths": "^3.5.0"
+      },
+      "dependencies": {
+        "json5": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+          "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
+        "tsconfig-paths": {
+          "version": "3.14.2",
+          "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",
+          "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "@types/json5": "^0.0.29",
+            "json5": "^1.0.2",
+            "minimist": "^1.2.6",
+            "strip-bom": "^3.0.0"
+          }
+        }
       }
     },
     "ts-node": {
@@ -6167,13 +15329,12 @@
       }
     },
     "tsconfig-paths": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
-      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz",
+      "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==",
       "dev": true,
       "requires": {
-        "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
+        "json5": "^2.2.2",
         "minimist": "^1.2.6",
         "strip-bom": "^3.0.0"
       }
@@ -6558,7 +15719,8 @@
     "yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "devOptional": true
     },
     "yargs": {
       "version": "16.2.0",
diff --git a/tests/UI/package.json b/tests/UI/package.json
index f61861378bc3c..342255c12fcf1 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -17,8 +17,8 @@
     "check:links": "ts-mocha tools/linkchecker.ts",
     "check:links:fast-fail": "ts-mocha --bail tools/linkchecker.ts",
     "// Specific test": "Script to run a specific test/folder",
-    "test:specific": "ts-mocha --recursive --file utils/setup.ts campaigns/$TEST_PATH",
-    "test:specific:fast-fail": "ts-mocha --bail --recursive --file utils/setup.ts campaigns/$TEST_PATH",
+    "test:specific": "ts-mocha --file utils/setup.ts campaigns/$TEST_PATH",
+    "test:specific:fast-fail": "ts-mocha --bail --file utils/setup.ts campaigns/$TEST_PATH",
     "// CLDR": "Scripts to run CLDR tests",
     "test:cldr": "TEST_PATH='cldr/**/*' npm run test:specific",
     "test:cldr:fast-fail": "TEST_PATH='cldr/' npm run test:specific:fast-fail",
@@ -84,15 +84,7 @@
     "// Regression tests": "Scripts to run regression tests",
     "test:regression": "TEST_PATH='regression/**/*' npm run test:specific",
     "// All tests": "Scripts to run all campaigns",
-    "test:all": "ts-mocha --recursive --file utils/setup.ts campaigns/cldr/* campaigns/functional/* campaigns/sanity/* campaigns/regression/*"
-  },
-  "_moduleAliases": {
-    "@pages": "pages",
-    "@commonTests": "commonTests",
-    "@data": "data",
-    "@utils": "utils",
-    "@tools": "tools",
-    "@webservices": "webservices"
+    "test:all": "ts-mocha --file utils/setup.ts campaigns/cldr/* campaigns/functional/* campaigns/sanity/* campaigns/regression/*"
   },
   "repository": {
     "type": "git",
@@ -123,7 +115,6 @@
     "maildev": "^2.0.5",
     "mocha": "^10.2.0",
     "mochawesome": "^7.1.3",
-    "module-alias": "^2.2.3",
     "pdfjs-dist": "^3.4.120",
     "playwright": "^1.36.1",
     "xpath-ts": "^1.3.13"
@@ -144,6 +135,7 @@
     "jsdoc-to-markdown": "^8.0.0",
     "mochawesome-merge": "^4.3.0",
     "ts-mocha": "^10.0.0",
+    "tsconfig-paths": "^4.2.0",
     "typescript": "^5.1.6"
   }
 }
diff --git a/tests/UI/utils/setup.ts b/tests/UI/utils/setup.ts
index dffacc9bf7cab..5799bd43e404d 100644
--- a/tests/UI/utils/setup.ts
+++ b/tests/UI/utils/setup.ts
@@ -1,4 +1,3 @@
-import 'module-alias/register';
 import helper from '@utils/helpers';
 import files from '@utils/files';
 

From 5a5bbe1c6e227892527bc576002229c0245777d1 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Thu, 20 Jul 2023 18:46:33 +0200
Subject: [PATCH 0595/1030] Add new test to Edit permission

---
 .../06_team/permission/01_editMenu.ts         | 203 ++++++++++++++++++
 .../pages/BO/advancedParameters/team/index.ts |  20 +-
 .../team/permissions/index.ts                 |  94 ++++++++
 3 files changed, 307 insertions(+), 10 deletions(-)
 create mode 100644 tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/permission/01_editMenu.ts

diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/permission/01_editMenu.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/permission/01_editMenu.ts
new file mode 100644
index 0000000000000..b133987e13134
--- /dev/null
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/permission/01_editMenu.ts
@@ -0,0 +1,203 @@
+// Import utils
+import helper from '@utils/helpers';
+import testContext from '@utils/testContext';
+
+// Import commonTests
+import loginCommon from '@commonTests/BO/loginBO';
+
+// Import pages
+import dashboardPage from '@pages/BO/dashboard';
+import employeesPage from '@pages/BO/advancedParameters/team';
+import permissionsPage from '@pages/BO/advancedParameters/team/permissions';
+
+import {expect} from 'chai';
+import type {BrowserContext, Page} from 'playwright';
+
+const baseContext: string = 'functional_BO_advancedParameters_team_permission_editMenu';
+
+describe('BO - Advanced Parameters - Team - Permission : Edit menu', async () => {
+  let browserContext: BrowserContext;
+  let page: Page;
+
+  // before and after functions
+  before(async function () {
+    browserContext = await helper.createBrowserContext(this.browser);
+    page = await helper.newTab(browserContext);
+  });
+
+  after(async () => {
+    await helper.closeBrowserContext(browserContext);
+  });
+
+  describe('Go to \'Logistician\' profile', async () => {
+    it('should login in BO', async function () {
+      await loginCommon.loginBO(this, page);
+    });
+
+    it('should go to \'Advanced Parameters > Team\' page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToAdvancedParamsPage', baseContext);
+
+      await dashboardPage.goToSubMenu(
+        page,
+        dashboardPage.advancedParametersLink,
+        dashboardPage.teamLink,
+      );
+      await employeesPage.closeSfToolBar(page);
+
+      const pageTitle = await employeesPage.getPageTitle(page);
+      await expect(pageTitle).to.contains(employeesPage.pageTitle);
+    });
+
+    it('should go to \'Permissions\' tab', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToPermissionsTab', baseContext);
+
+      const isTabOpened = await employeesPage.goToPermissionsTab(page);
+      await expect(isTabOpened, 'Permissions tab is not opened!').to.be.true;
+    });
+
+    it('should click on \'Logistician\' profile', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToProfileSubTab', baseContext);
+
+      const isSubTabOpened = await permissionsPage.goToProfileSubTab(page, 'logistician');
+      await expect(isSubTabOpened, 'Profile sub-tab is not opened!').to.be.true;
+    });
+  });
+
+  describe('Check all checkboxes for all the menu and check it', async () => {
+    it('should check the checkbox \'ALL\' from the header', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'checkAllCheckbox', baseContext);
+
+      const isPermissionDefined = await permissionsPage.bulkSetPermission(page, 'all');
+      await expect(isPermissionDefined, 'Permission is not updated').to.be.true;
+    });
+
+    [
+      {args: {action: 'view'}},
+      {args: {action: 'add'}},
+      {args: {action: 'edit'}},
+      {args: {action: 'delete'}},
+    ].forEach((test) => {
+      it(`should check that everything in '${test.args.action}' block is checked`, async function () {
+        await testContext.addContextItem(this, 'testIdentifier', `check_${test.args.action}1`, baseContext);
+
+        const isBulkPermissionPerformed = await permissionsPage.isBulkPermissionPerformed(page, test.args.action);
+        await expect(isBulkPermissionPerformed).to.be.true;
+      });
+    });
+  });
+
+  describe('Uncheck all checkboxes for all the menu and check it', async () => {
+    it('should uncheck the checkbox \'ALL\' from the header', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'uncheckAllCheckbox', baseContext);
+
+      const isPermissionDefined = await permissionsPage.bulkSetPermission(page, 'all', false);
+      await expect(isPermissionDefined, 'Permission is not updated').to.be.true;
+    });
+
+    [
+      {args: {action: 'view'}},
+      {args: {action: 'add'}},
+      {args: {action: 'edit'}},
+      {args: {action: 'delete'}},
+    ].forEach((test) => {
+      it(`should check that everything in '${test.args.action}' block is unchecked`, async function () {
+        await testContext.addContextItem(this, 'testIdentifier', `unchecked_${test.args.action}1`, baseContext);
+
+        const isBulkPermissionPerformed = await permissionsPage.isBulkPermissionPerformed(page, test.args.action, false);
+        await expect(isBulkPermissionPerformed).to.be.false;
+      });
+    });
+  });
+
+  describe('Check checkbox by permission and check it', async () => {
+    [
+      {args: {action: 'view'}},
+      {args: {action: 'add'}},
+      {args: {action: 'edit'}},
+      {args: {action: 'delete'}},
+    ].forEach((test, index: number) => {
+      it(`should check '${test.args.action}' checkbox from the header`, async function () {
+        await testContext.addContextItem(this, 'testIdentifier', `checkAllCheckbox_${index}`, baseContext);
+
+        const isPermissionDefined = await permissionsPage.bulkSetPermission(page, test.args.action);
+        await expect(isPermissionDefined, 'Permission is not updated').to.be.true;
+      });
+
+      it(`should check that everything in '${test.args.action}' block is checked`, async function () {
+        await testContext.addContextItem(this, 'testIdentifier', `checkAllCheckboxForBlock${index}`, baseContext);
+
+        const isBulkPermissionPerformed = await permissionsPage.isBulkPermissionPerformed(page, test.args.action);
+        await expect(isBulkPermissionPerformed).to.be.true;
+      });
+    });
+  });
+
+  describe('Refresh the page and check result', async () => {
+    it('should refresh the page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'refreshPage', baseContext);
+
+      await permissionsPage.reloadPage(page);
+
+      const isSubTabOpened = await permissionsPage.goToProfileSubTab(page, 'logistician');
+      await expect(isSubTabOpened, 'Profile sub-tab is not opened!').to.be.true;
+    });
+
+    [
+      {args: {action: 'view'}},
+      {args: {action: 'add'}},
+      {args: {action: 'edit'}},
+      {args: {action: 'delete'}},
+      {args: {action: 'all'}},
+    ].forEach((test, index: number) => {
+      it(`should check that '${test.args.action}' block is checked for all menu`, async function () {
+        await testContext.addContextItem(this, 'testIdentifier', `checkAfterRefreshPage${index}`, baseContext);
+
+        const number = await permissionsPage.getNumberOfCheckBoxUnChecked(page, test.args.action);
+        expect(number).to.eq(1);
+      });
+    });
+  });
+
+  describe('Check all permissions for Orders and check result', async () => {
+    it('should uncheck the checkbox \'ALL\' from the header', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'uncheckAll', baseContext);
+
+      await permissionsPage.bulkSetPermission(page, 'all', false);
+
+      const isPermissionDefined = await permissionsPage.bulkSetPermission(page, 'all', false);
+      await expect(isPermissionDefined, 'Permission is not updated').to.be.true;
+    });
+
+    it('should set the permission \'All\' for \'Orders\'', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'setPermission', baseContext);
+
+      const isPermissionDefined = await permissionsPage.setPermission(page, 'AdminParentOrders', 'all');
+      await expect(isPermissionDefined, 'Permission is not updated').to.be.true;
+    });
+
+    it('should check the number of checkbox checked', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'checkNumberOfCheckbox', baseContext);
+
+      const numberOfCheckBoxes = await permissionsPage.getNumberOfElementInMenu(page);
+
+      const number = await permissionsPage.getNumberOfCheckBoxUnChecked(page, 'all');
+      await expect(numberOfCheckBoxes - number).to.eq(6);
+    });
+
+    [
+      {args: {className: 'SELL'}},
+      {args: {className: 'AdminParentOrders'}},
+      {args: {className: 'AdminCatalog'}},
+      {args: {className: 'AdminParentCustomer'}},
+      {args: {className: 'AdminParentCustomerThreads'}},
+      {args: {className: 'AdminStats'}},
+    ].forEach((test, index: number) => {
+      it(`should check that the menu '${test.args.className}' is checked`, async function () {
+        await testContext.addContextItem(this, 'testIdentifier', `checkMenu${index}`, baseContext);
+
+        const isChecked = await permissionsPage.isMenuChecked(page, test.args.className, 'all');
+        await expect(isChecked).to.be.true;
+      });
+    });
+  });
+});
diff --git a/tests/UI/pages/BO/advancedParameters/team/index.ts b/tests/UI/pages/BO/advancedParameters/team/index.ts
index 659484067d817..eb49b10d66796 100644
--- a/tests/UI/pages/BO/advancedParameters/team/index.ts
+++ b/tests/UI/pages/BO/advancedParameters/team/index.ts
@@ -138,16 +138,6 @@ class Employees extends BOBasePage {
   /*
   Methods
    */
-  /**
-   * Go to Permissions tab
-   * @param page {Page} Browser tab
-   * @returns {Promise<boolean>}
-   */
-  async goToPermissionsTab(page: Page): Promise<boolean> {
-    await this.clickAndWaitForURL(page, this.permissionsTab);
-    return this.elementVisible(page, `${this.permissionsTab}.current`, 1000);
-  }
-
   // Header methods
   /**
    * Go to new Employee page
@@ -168,6 +158,16 @@ class Employees extends BOBasePage {
     await this.clickAndWaitForURL(page, this.rolesTab);
   }
 
+  /**
+   * Go to Permissions tab
+   * @param page {Page} Browser tab
+   * @returns {Promise<boolean>}
+   */
+  async goToPermissionsTab(page: Page): Promise<boolean> {
+    await this.clickAndWaitForURL(page, this.permissionsTab);
+    return this.elementVisible(page, `${this.permissionsTab}.current`, 1000);
+  }
+
   // Columns methods
   /**
    * Get number of elements in grid
diff --git a/tests/UI/pages/BO/advancedParameters/team/permissions/index.ts b/tests/UI/pages/BO/advancedParameters/team/permissions/index.ts
index 6ec8d422ca32a..767e09911ee56 100644
--- a/tests/UI/pages/BO/advancedParameters/team/permissions/index.ts
+++ b/tests/UI/pages/BO/advancedParameters/team/permissions/index.ts
@@ -14,6 +14,16 @@ class Permissions extends BOBasePage {
 
   private readonly profileAccess: (className: string, access: string) => string;
 
+  private readonly menuTable: string;
+
+  private readonly permissionCheckbox: string;
+
+  private readonly menuTableHeaderCheckbox: (permission: string) => string;
+
+  private readonly menuTableRow: (row: number) => string;
+
+  private readonly permissionCheckboxRow: (row: number, access: string) => string;
+
   /**
    * @constructs
    * Setting up texts and selectors to use on permissions page
@@ -30,6 +40,12 @@ class Permissions extends BOBasePage {
     this.profileSubTab = (profileName: string) => `a[id^="profile-"]:text("${profileName}")`;
     this.profileAccess = (className: string, access: string) => `input[data-type="${access}"][data-classname="${
       className}"]:visible`;
+    this.menuTable = '#table_2';
+    this.menuTableHeaderCheckbox = (permission: string) => `#table_2 thead tr th input.${permission}all`;
+    this.menuTableRow = (row: number) => `${this.menuTable} tr:nth-child(${row})`;
+    this.permissionCheckbox = `${this.menuTable} tr td input[data-type='all']`;
+    this.permissionCheckboxRow = (row: number, permission: string) => `${this.menuTable} tr:nth-child(${row})`
+      + ` td input[data-type='${permission}']`;
   }
 
   /*
@@ -64,6 +80,84 @@ class Permissions extends BOBasePage {
 
     return growlTextMessage === this.successfulUpdateMessage;
   }
+
+  /**
+   * Bulk set a specific permission on a specific page
+   * @param page {Page} Browser tab
+   * @param permission {string} Name of permission
+   * @param toCheck {boolean} True if we need to click on checkbox, false if not
+   * @returns {Promise<boolean>}
+   */
+  async bulkSetPermission(page: Page, permission: string, toCheck: boolean = true): Promise<boolean> {
+    await this.closeGrowlMessage(page);
+    if (toCheck && await this.isChecked(page, this.menuTableHeaderCheckbox(permission))) {
+      return true;
+    }
+    await page.click(this.menuTableHeaderCheckbox(permission));
+    const growlTextMessage = await this.getGrowlMessageContent(page, 30000);
+
+    return growlTextMessage === this.successfulUpdateMessage;
+  }
+
+  /**
+   * Get number of menu
+   * @param page {Page} Browser tab
+   * @returns {Promise<number>}
+   */
+  async getNumberOfElementInMenu(page: Page): Promise<number> {
+    return (await page.$$(this.permissionCheckbox)).length;
+  }
+
+  /**
+   * Is bulk permission performed
+   * @param page {Page} Browser tab
+   * @param permission {string} Name of permission
+   * @param isChecked {boolean} True if we need to click on checkbox, false if not
+   * @returns {Promise<boolean>}
+   */
+  async isBulkPermissionPerformed(page: Page, permission: string, isChecked: boolean = true): Promise<boolean> {
+    const menuNumber = await this.getNumberOfElementInMenu(page);
+
+    let i: number = 1;
+    let isVisible = isChecked;
+    while (isVisible === isChecked && i < menuNumber) {
+      isVisible = await this.isChecked(page, this.permissionCheckboxRow(i, permission));
+      i += 1;
+    }
+
+    return isVisible;
+  }
+
+  /**
+   * Get number of checkbox unchecked
+   * @param page {Page} Browser tab
+   * @param permission {string} Name of permission
+   * @returns {Promise<number>}
+   */
+  async getNumberOfCheckBoxUnChecked(page: Page, permission: string): Promise<number> {
+    const menuNumber = await this.getNumberOfElementInMenu(page);
+
+    let checked = 0;
+
+    for (let i = 1; i <= menuNumber; i++) {
+      if (await this.isChecked(page, this.permissionCheckboxRow(i, permission))) {
+        checked += 1;
+      }
+    }
+
+    return menuNumber - checked;
+  }
+
+  /**
+   * Is menu checked
+   * @param page {Page} Browser tab
+   * @param className {string} Name of the className
+   * @param access {string} Access name
+   * @returns {Promise<boolean>}
+   */
+  async isMenuChecked(page: Page, className: string, access: string): Promise<boolean> {
+    return this.isChecked(page, this.profileAccess(className, access));
+  }
 }
 
 export default new Permissions();

From bf1f6d4f98671fa2e8323094b478afcc7660da90 Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Fri, 21 Jul 2023 09:10:28 +0200
Subject: [PATCH 0596/1030] Lazyload product features

---
 classes/Product.php                           |  1 -
 .../Presenter/Product/ProductLazyArray.php    | 29 +++++++++++++++----
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/classes/Product.php b/classes/Product.php
index 9d1941fae56b4..6edb730c199a9 100644
--- a/classes/Product.php
+++ b/classes/Product.php
@@ -5771,7 +5771,6 @@ public static function getProductProperties($id_lang, $row, Context $context = n
         }
 
         $row['id_image'] = Product::defineProductImage($row, $id_lang);
-        $row['features'] = Product::getFrontFeaturesStatic((int) $id_lang, $row['id_product']);
 
         $row['attachments'] = [];
         if (!isset($row['cache_has_attachments']) || $row['cache_has_attachments']) {
diff --git a/src/Adapter/Presenter/Product/ProductLazyArray.php b/src/Adapter/Presenter/Product/ProductLazyArray.php
index bf3b8b0df4101..75773a75cf2f1 100644
--- a/src/Adapter/Presenter/Product/ProductLazyArray.php
+++ b/src/Adapter/Presenter/Product/ProductLazyArray.php
@@ -366,17 +366,36 @@ public function getReferenceToDisplay()
     }
 
     /**
+     * Returns all product features, not grouped yet for performance reasons.
+     *
      * @arrayAccess
      *
-     * @return array|null
+     * @return array
      */
-    public function getGroupedFeatures()
+    public function getFeatures()
     {
-        if ($this->product['features']) {
-            return $this->buildGroupedFeatures($this->product['features']);
+        /*
+         * If features were not loaded yet, we will ask for them if needed - usually on product page.
+         * However, if really hunting performance and you know you will need features in listing for bunch of products,
+         * fetch them with one query (in more performant way) and pass them here when constructing this object.
+         */
+        if (!isset($this->product['features'])) {
+            $this->product['features'] = Product::getFrontFeaturesStatic((int) $this->language->id, $this->product['id_product']);
         }
 
-        return null;
+        return $this->product['features'];
+    }
+
+    /**
+     * Returns all product feature values nicely grouped by feature name.
+     *
+     * @arrayAccess
+     *
+     * @return array
+     */
+    public function getGroupedFeatures()
+    {
+        return $this->buildGroupedFeatures($this->getFeatures());
     }
 
     /**

From f9417bbe9d053a7a1cd08e83733b90c9eb49e099 Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Wed, 5 Jul 2023 18:12:04 +0200
Subject: [PATCH 0597/1030] Update withe list

---
 .../Command/LegacyLinkLinterCommand.php       | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/src/PrestaShopBundle/Command/LegacyLinkLinterCommand.php b/src/PrestaShopBundle/Command/LegacyLinkLinterCommand.php
index c0fe24aebf781..7969cbaac6491 100644
--- a/src/PrestaShopBundle/Command/LegacyLinkLinterCommand.php
+++ b/src/PrestaShopBundle/Command/LegacyLinkLinterCommand.php
@@ -57,6 +57,47 @@ class LegacyLinkLinterCommand extends Command
         'admin_common_sidebar',
         'admin_common_reset_search',
         'admin_common_reset_search_by_filter_id',
+        'admin_product_new',
+        'admin_product_form',
+        'admin_product_virtual_save_action',
+        'admin_product_virtual_remove_file_action',
+        'admin_product_virtual_download_file_action',
+        'admin_product_virtual_remove_action',
+        'admin_product_attachement_add_action',
+        'admin_product_image_upload',
+        'admin_product_image_positions',
+        'admin_product_image_form',
+        'admin_product_image_delete',
+        'admin_get_product_combinations',
+        'admin_product_catalog',
+        'admin_product_catalog_filters',
+        'admin_product_list',
+        'admin_product_bulk_action',
+        'admin_product_unit_action',
+        'admin_product_mass_edit_action',
+        'admin_product_export_action',
+        'admin_security_compromised',
+        'admin_attribute_get_all',
+        'admin_delete_attribute',
+        'admin_delete_all_attributes',
+        'admin_get_form_images_combination',
+        'admin_category_simple_add_form',
+        'admin_get_ajax_categories',
+        'admin_combination_generate_form',
+        'admin_feature_get_feature_values',
+        'admin_specific_price_list',
+        'admin_get_specific_price_update_form',
+        'admin_specific_price_add',
+        'admin_specific_price_update',
+        'admin_delete_specific_price',
+        'admin_supplier_refresh_product_supplier_combination_form',
+        'admin_warehouse_refresh_product_warehouse_combination_form',
+        'admin_products_combinations',
+        'admin_products_combinations_ids',
+        'admin_products_combinations_update_combination_from_listing',
+        'admin_products_combinations_edit_combination',
+        'admin_products_combinations_bulk_combination_form',
+        'admin_products_combinations_bulk_edit_combination',
     ];
 
     public function __construct(LegacyLinkLinter $legacyLinkLinter, AdminRouteProvider $adminRouteProvider)

From 1b70d5a7637fa11fa12a03dbf5b18a625c1353ea Mon Sep 17 00:00:00 2001
From: boherm <boris.hermans@prestashop.com>
Date: Fri, 21 Jul 2023 13:05:49 +0200
Subject: [PATCH 0598/1030] Generate preload.html.twig file with webpack

---
 admin-dev/themes/new-theme/.webpack/common.js | 12 ++++++++++++
 app/config/config.yml                         |  1 +
 2 files changed, 13 insertions(+)

diff --git a/admin-dev/themes/new-theme/.webpack/common.js b/admin-dev/themes/new-theme/.webpack/common.js
index 1fb54fceb5a3c..6abf526745a87 100644
--- a/admin-dev/themes/new-theme/.webpack/common.js
+++ b/admin-dev/themes/new-theme/.webpack/common.js
@@ -424,6 +424,11 @@ module.exports = {
       templateContent: '{{{preloadLinks}}}',
       inject: false,
     }),
+    new HtmlWebpackPlugin({
+      filename: 'preload.html.twig',
+      templateContent: '{{{preloadLinks}}}',
+      inject: false,
+    }),
     new webpack.DefinePlugin({
       __VUE_OPTIONS_API__: true,
       __VUE_PROD_DEVTOOLS__: false,
@@ -435,6 +440,13 @@ module.exports = {
       // eslint-disable-next-line
       replaceCallback: ({indexSource, linksAsString}) => indexSource.replace('{{{preloadLinks}}}', linksAsString.replace(/href="/g, 'href="{$admin_dir}')),
     }),
+    new FontPreloadPlugin({
+      index: 'preload.html.twig',
+      extensions: ['woff2'],
+      filter: /preload/,
+      // eslint-disable-next-line
+      replaceCallback: ({indexSource, linksAsString}) => indexSource.replace('{{{preloadLinks}}}', linksAsString.replace(/href="/g, 'href="{{ admin_dir }}')),
+    }),
     new CssoWebpackPlugin({
       forceMediaMerge: true,
     }),
diff --git a/app/config/config.yml b/app/config/config.yml
index b7d5e3b4f89fe..0bbcf454a39ca 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -86,6 +86,7 @@ twig:
     '%kernel.project_dir%/modules': Modules
     '%mail_themes_dir%': MailThemes
     '%prestashop_views%': PrestaShopCore
+    '%kernel.project_dir%/admin-dev/themes/new-theme': AdminNewTheme
   globals:
     webpack_server: false
     multistore_field_prefix: !php/const PrestaShopBundle\Service\Form\MultistoreCheckboxEnabler::MULTISTORE_FIELD_PREFIX

From d2de1f5fc060c1007d7ad491e05172930f89f679 Mon Sep 17 00:00:00 2001
From: boherm <boris.hermans@prestashop.com>
Date: Fri, 21 Jul 2023 13:06:14 +0200
Subject: [PATCH 0599/1030] Fix legacy controller to avoid reset of js_def var

---
 classes/controller/Controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/controller/Controller.php b/classes/controller/Controller.php
index f5476f572bb83..7b8121cd14166 100644
--- a/classes/controller/Controller.php
+++ b/classes/controller/Controller.php
@@ -644,7 +644,7 @@ protected function smartyOutputContent($templates)
         $this->context->cookie->write();
 
         $js_tag = 'js_def';
-        $this->context->smarty->assign($js_tag, $js_tag);
+        $this->context->smarty->assign($js_tag, \Media::getJsDef());
 
         if (!is_array($templates)) {
             $templates = [$templates];

From d80eb575f54c16adb620ed532aa5eb62d839f559 Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Mon, 22 May 2023 14:29:55 +0200
Subject: [PATCH 0600/1030] Introduce category presenter

---
 .../front/listing/CategoryController.php      |  69 +++++----
 install-dev/data/xml/hook.xml                 |   5 +
 src/Adapter/Image/ImageRetriever.php          |   6 +-
 .../Presenter/Category/CategoryLazyArray.php  | 135 ++++++++++++++++++
 .../Presenter/Category/CategoryPresenter.php  |  89 ++++++++++++
 5 files changed, 266 insertions(+), 38 deletions(-)
 create mode 100644 src/Adapter/Presenter/Category/CategoryLazyArray.php
 create mode 100644 src/Adapter/Presenter/Category/CategoryPresenter.php

diff --git a/controllers/front/listing/CategoryController.php b/controllers/front/listing/CategoryController.php
index 2dde7d13b5b2b..be9834d89204d 100644
--- a/controllers/front/listing/CategoryController.php
+++ b/controllers/front/listing/CategoryController.php
@@ -25,6 +25,7 @@
  */
 use PrestaShop\PrestaShop\Adapter\Category\CategoryProductSearchProvider;
 use PrestaShop\PrestaShop\Adapter\Image\ImageRetriever;
+use PrestaShop\PrestaShop\Adapter\Presenter\Category\CategoryPresenter;
 use PrestaShop\PrestaShop\Core\Product\Search\ProductSearchQuery;
 use PrestaShop\PrestaShop\Core\Product\Search\SortOrder;
 
@@ -44,6 +45,9 @@ class CategoryControllerCore extends ProductListingFrontController
      */
     protected $category;
 
+    /** @var CategoryPresenter */
+    protected $categoryPresenter;
+
     public function canonicalRedirection(string $canonicalURL = '')
     {
         if (Validate::isLoadedObject($this->category)) {
@@ -98,24 +102,11 @@ public function init()
             return;
         }
 
-        $categoryVar = $this->getTemplateVarCategory();
-
-        $filteredCategory = Hook::exec(
-            'filterCategoryContent',
-            ['object' => $categoryVar],
-            $id_module = null,
-            $array_return = false,
-            $check_exceptions = true,
-            $use_push = false,
-            $id_shop = null,
-            $chain = true
-        );
-        if (!empty($filteredCategory['object'])) {
-            $categoryVar = $filteredCategory['object'];
-        }
+        // Initialize presenter, we will use it for all cases
+        $this->categoryPresenter = new CategoryPresenter($this->context->link);
 
         $this->context->smarty->assign([
-            'category' => $categoryVar,
+            'category' => $this->getTemplateVarCategory(),
             'subcategories' => $this->getTemplateVarSubCategories(),
         ]);
     }
@@ -201,37 +192,45 @@ protected function getDefaultProductSearchProvider()
 
     protected function getTemplateVarCategory()
     {
-        $category = $this->objectPresenter->present($this->category);
-        $category['image'] = $this->getImage(
+        $categoryVar = $this->categoryPresenter->present(
             $this->category,
-            $this->category->id_image
+            $this->context->language
+        );
+
+        $filteredCategory = Hook::exec(
+            'filterCategoryContent',
+            ['object' => $categoryVar],
+            $id_module = null,
+            $array_return = false,
+            $check_exceptions = true,
+            $use_push = false,
+            $id_shop = null,
+            $chain = true
         );
+        if (!empty($filteredCategory['object'])) {
+            $categoryVar = $filteredCategory['object'];
+        }
 
-        return $category;
+        return $categoryVar;
     }
 
     protected function getTemplateVarSubCategories()
     {
-        return array_map(function (array $category) {
-            $object = new Category(
-                $category['id_category'],
-                $this->context->language->id
-            );
+        $subcategories = $this->category->getSubCategories($this->context->language->id);
 
-            $category['image'] = $this->getImage(
-                $object,
-                $object->id_image
-            );
-
-            $category['url'] = $this->context->link->getCategoryLink(
-                $category['id_category'],
-                $category['link_rewrite']
+        foreach ($subcategories as &$subcategory) {
+            $subcategory = $this->categoryPresenter->present(
+                $subcategory,
+                $this->context->language
             );
+        }
 
-            return $category;
-        }, $this->category->getSubCategories($this->context->language->id));
+        return $subcategories;
     }
 
+    /**
+     * @deprecated since 9.0.0 and will be removed in 10.0.0
+     */
     protected function getImage(Category $object, int $id_image)
     {
         $retriever = new ImageRetriever(
diff --git a/install-dev/data/xml/hook.xml b/install-dev/data/xml/hook.xml
index 61bbf528cc0fc..bed43db20d2ac 100644
--- a/install-dev/data/xml/hook.xml
+++ b/install-dev/data/xml/hook.xml
@@ -2166,6 +2166,11 @@
       <title>Store Presenter</title>
       <description>This hook is called before a store is presented</description>
     </hook>
+    <hook id="actionPresentCategory">
+      <name>actionPresentCategory</name>
+      <title>Category Presenter</title>
+      <description>This hook is called before a category is presented</description>
+    </hook>
     <hook id="actionAdminAdminPreferencesControllerPostProcessBefore">
       <name>actionAdminAdminPreferencesControllerPostProcessBefore</name>
       <title>On post-process in Admin Preferences</title>
diff --git a/src/Adapter/Image/ImageRetriever.php b/src/Adapter/Image/ImageRetriever.php
index fe17321e6ec1a..2723b63a9d7d4 100644
--- a/src/Adapter/Image/ImageRetriever.php
+++ b/src/Adapter/Image/ImageRetriever.php
@@ -137,7 +137,7 @@ public function getProductImages(array $product, Language $language)
 
     /**
      * @param Product|Store|Category|Manufacturer|Supplier $object
-     * @param int $id_image
+     * @param int|string $id_image Identifier of the image
      *
      * @return array|null
      *
@@ -267,13 +267,13 @@ public function getImage($object, $id_image)
     /**
      * @param string $originalImagePath
      * @param string $imageFolderPath
-     * @param int $idImage
+     * @param int|string $idImage
      * @param array $imageTypeData
      * @param string $imageFormat
      *
      * @return void
      */
-    private function checkOrGenerateImageType(string $originalImagePath, string $imageFolderPath, int $idImage, array $imageTypeData, string $imageFormat)
+    private function checkOrGenerateImageType(string $originalImagePath, string $imageFolderPath, int|string $idImage, array $imageTypeData, string $imageFormat)
     {
         $fileName = sprintf('%s-%s.%s', $idImage, $imageTypeData['name'], $imageFormat);
         $resizedImagePath = implode(DIRECTORY_SEPARATOR, [
diff --git a/src/Adapter/Presenter/Category/CategoryLazyArray.php b/src/Adapter/Presenter/Category/CategoryLazyArray.php
new file mode 100644
index 0000000000000..03a4afab8c854
--- /dev/null
+++ b/src/Adapter/Presenter/Category/CategoryLazyArray.php
@@ -0,0 +1,135 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Adapter\Presenter\Category;
+
+use Category;
+use Language;
+use Link;
+use PrestaShop\PrestaShop\Adapter\Image\ImageRetriever;
+use PrestaShop\PrestaShop\Adapter\Presenter\AbstractLazyArray;
+
+class CategoryLazyArray extends AbstractLazyArray
+{
+    /**
+     * @var ImageRetriever
+     */
+    private $imageRetriever;
+
+    /**
+     * @var Link
+     */
+    private $link;
+
+    /**
+     * @var array
+     */
+    protected $category;
+
+    /**
+     * @var Language
+     */
+    private $language;
+
+    public function __construct(
+        array $category,
+        Language $language,
+        ImageRetriever $imageRetriever,
+        Link $link
+    ) {
+        $this->category = $category;
+        $this->language = $language;
+        $this->imageRetriever = $imageRetriever;
+        $this->link = $link;
+
+        parent::__construct();
+        $this->appendArray($this->category);
+    }
+
+    /**
+     * @arrayAccess
+     *
+     * @return string
+     */
+    public function getUrl()
+    {
+        return $this->link->getCategoryLink(
+            $this->category['id'],
+            $this->category['link_rewrite']
+        );
+    }
+
+    /**
+     * @arrayAccess
+     *
+     * This method returns standardized category image array created from CATEGORYID.jpg, with one exception.
+     * One thumbnail size - CATEGORYID-small_default.jpg is generated from CATEGORYID_thumb.jpg instead.
+     * This must be resolved in the future.
+     *
+     * @return array|null
+     */
+    public function getImage()
+    {
+        /*
+         * Category is a bit different that other objects. It's image ID is defined by a special id_image property.
+         * When constructing Category object model, this value is a numeric ID if image exists or false if it doesn't.
+         * In case of getSubCategories method, this value is a numeric ID if image exists OR a default "not found" image if it doesn't.
+         */
+        if (empty($this->category['id_image'])) {
+            return null;
+        }
+
+        return $this->imageRetriever->getImage(
+            new Category($this->category['id'], $this->language->getId()),
+            $this->category['id_image']
+        );
+    }
+
+    /**
+     * @arrayAccess
+     *
+     * @return array|null
+     */
+    public function getCover()
+    {
+        return $this->getImage();
+    }
+
+    /**
+     * @todo This should return category thumbnail image (miniatures of CATEGORYID_thumb.jpg) instead,
+     * after support in ImageRetriever is implemented.
+     *
+     * @arrayAccess
+     *
+     * @return array|null
+     */
+    public function getThumbnail()
+    {
+        return $this->getImage();
+    }
+}
diff --git a/src/Adapter/Presenter/Category/CategoryPresenter.php b/src/Adapter/Presenter/Category/CategoryPresenter.php
new file mode 100644
index 0000000000000..7846f21532ec4
--- /dev/null
+++ b/src/Adapter/Presenter/Category/CategoryPresenter.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Adapter\Presenter\Category;
+
+use Category;
+use Hook;
+use Language;
+use Link;
+use PrestaShop\PrestaShop\Adapter\Image\ImageRetriever;
+
+class CategoryPresenter
+{
+    /**
+     * @var ImageRetriever
+     */
+    protected $imageRetriever;
+
+    /**
+     * @var Link
+     */
+    protected $link;
+
+    public function __construct(Link $link)
+    {
+        $this->link = $link;
+        $this->imageRetriever = new ImageRetriever($link);
+    }
+
+    /**
+     * @param array|Category $category Category object or an array
+     * @param Language $language
+     *
+     * @return CategoryLazyArray
+     */
+    public function present(array|Category $category, Language $language)
+    {
+        // Convert to array if a Category object was passed
+        if (is_object($category)) {
+            $category = (array) $category;
+        }
+
+        // Normalize IDs
+        if (empty($category['id_category'])) {
+            $category['id_category'] = $category['id'];
+        }
+        if (empty($category['id'])) {
+            $category['id'] = $category['id_category'];
+        }
+
+        $categoryLazyArray = new CategoryLazyArray(
+            $category,
+            $language,
+            $this->imageRetriever,
+            $this->link
+        );
+
+        Hook::exec('actionPresentCategory',
+            ['presentedCategory' => &$categoryLazyArray]
+        );
+
+        return $categoryLazyArray;
+    }
+}

From af9223357fd5a3ffc576e091b2a4ef327917cb14 Mon Sep 17 00:00:00 2001
From: boherm <boris.hermans@prestashop.com>
Date: Fri, 21 Jul 2023 13:06:28 +0200
Subject: [PATCH 0601/1030] Add twig component header

---
 .../Admin/Component/Layout/header.html.twig   | 81 +++++++++++++++++++
 .../views/Admin/Layout/header.html.twig       | 48 +++++++++++
 .../Twig/Component/Header.php                 | 74 +++++++++++++++++
 3 files changed, 203 insertions(+)
 create mode 100644 src/PrestaShopBundle/Resources/views/Admin/Component/Layout/header.html.twig
 create mode 100644 src/PrestaShopBundle/Resources/views/Admin/Layout/header.html.twig
 create mode 100644 src/PrestaShopBundle/Twig/Component/Header.php

diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/header.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/header.html.twig
new file mode 100644
index 0000000000000..e9cd2a742bd61
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/header.html.twig
@@ -0,0 +1,81 @@
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale={{ viewport_scale ? viewport_scale : '1' }}">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="robots" content="NOFOLLOW, NOINDEX">
+
+<link rel="icon" type="image/x-icon" href="{{ img_dir }}favicon.ico" />
+<link rel="apple-touch-icon" href="{{ img_dir }}app_icon.png" />
+
+<title>{% if meta_title %}{{ meta_title }} • {% endif %}{{ shop_name }}</title>
+
+{% if display_header_javascript %}
+  <script type="text/javascript">
+    var help_class_name = '{{ controller_name|e('js') }}';
+    var iso_user = '{{ iso_user|e('js') }}';
+    var lang_is_rtl = '{{ lang_is_rtl|intCast }}';
+    var full_language_code = '{{ full_language_code|e('js') }}';
+    var full_cldr_language_code = '{{ full_cldr_language_code|e('js') }}';
+    var country_iso_code = '{{ country_iso_code|e('js') }}';
+    var _PS_VERSION_ = '{{ ps_version|e('js') }}';
+    var roundMode = {{ round_mode|intCast }};
+    var youEditFieldFor = '';
+    {% if shop_context %}
+      {% if shop_context == constant('\Shop::CONTEXT_ALL') %}
+    youEditFieldFor = '{{ 'This field will be modified for all your shops.'|trans({}, 'Admin.Notifications.Info') }}';
+      {% elseif shop_context == constant('\Shop::CONTEXT_GROUP') %}
+    youEditFieldFor = '{{ 'This field will be modified for all shops in this shop group:'|trans({}, 'Admin.Notifications.Info') }} <b>{{ shop_name|e('js') }}</b>';
+      {% else %}
+    youEditFieldFor = '{{ 'This field will be modified for this shop:'|trans({}, 'Admin.Notifications.Info') }} <b>{{ shop_name|e('js') }}</b>
+      {% endif %}
+    {% endif %}
+    var new_order_msg = '{{ 'A new order has been placed on your store.'|trans({}, 'Admin.Navigation.Header') }}';
+    var order_number_msg = '{{ 'Order number:'|trans({}, 'Admin.Navigation.Header') }} ';
+    var total_msg = '{{ 'Total:'|trans({}, 'Admin.Global') }} ';
+    var from_msg = '{{ 'From:'|trans({}, 'Admin.Global') }} ';
+    var see_order_msg = '{{ 'View this order'|trans({}, 'Admin.Orderscustomers.Feature') }}';
+    var new_customer_msg = '{{ 'A new customer registered on your store.'|trans({}, 'Admin.Navigation.Header') }}';
+    var customer_name_msg = '{{ 'Customer name:'|trans({}, 'Admin.Navigation.Header') }} ';
+    var new_msg = '{{ 'A new message was posted on your store.'|trans({}, 'Admin.Navigation.Header') }}';
+    var see_msg = '{{ 'Read this message'|trans({}, 'Admin.Navigation.Header') }}';
+    var token = '{{ token|e('js') }}';
+    var currentIndex = '{{ currentIndex|e('js') }}';
+    var employee_token = '{{ this.employeeToken|e('js') }}';
+    var choose_language_translate = '{{ 'Choose language:'|trans({}, 'Admin.Actions') }}';
+    var default_language = '{{ default_language|intCast }}';
+    var admin_modules_link = '{{ link.getAdminLink("AdminModulesSf", true, {'route': "admin_module_manage"})|e('js')}}';
+    var admin_notification_get_link = '{{ link.getAdminLink("AdminCommon")|e('js') }}';
+    var admin_notification_push_link = adminNotificationPushLink = '{{ link.getAdminLink("AdminCommon", true, {'route': 'admin_common_notifications_ack'})|e('js') }}';
+    var update_success_msg = '{{ 'Update successful'|trans({}, 'Admin.Notifications.Success') }}';
+    var search_product_msg = '{{ 'Search for a product'|trans({}, 'Admin.Orderscustomers.Feature') }}';
+  </script>
+{% endif %}
+
+{% include "@AdminNewTheme/public/preload.html.twig" ignore missing with { 'admin_dir': '/admin-dev/themes/new-theme/public/' } %}
+
+{% for css_uri, css_media in css_files %}
+  <link href="{{ css_uri|e('html_attr') }}" rel="stylesheet" type="text/css" media="{{ css_media }}"/>
+{% endfor %}
+
+{% if this.jsDef %}
+  <script type="text/javascript">
+    {% for k, def in this.jsDef %}
+    var {{ k }} = {{ def|json_encode|raw }};
+    {% endfor %}
+  </script>
+{% endif %}
+
+{% for js_uri in js_files %}
+  <script type="text/javascript" src="{{ js_uri|e('html_attr') }}"></script>
+{% endfor %}
+
+{% if js_inline %}
+<script type="text/javascript">
+  {% for inline in js_inline %}
+    {{ inline|raw }}
+  {% endfor %}
+</script>
+{% endif %}
+
+{% if displayBackOfficeHeader %}
+  {{ displayBackOfficeHeader|raw }}
+{% endif %}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/header.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/header.html.twig
new file mode 100644
index 0000000000000..389e86e32934d
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/header.html.twig
@@ -0,0 +1,48 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+{{ component('Header', {
+  link: link,
+  viewport_scale: viewport_scale|default(null),
+  img_dir: img_dir,
+  meta_title: meta_title,
+  shop_name: shop_name,
+  display_header_javascript: display_header_javascript|default(false),
+  controller_name: controller_name,
+  iso_user: iso_user,
+  lang_is_rtl: lang_is_rtl,
+  full_language_code: full_language_code,
+  full_cldr_language_code: full_cldr_language_code,
+  country_iso_code: country_iso_code,
+  ps_version: ps_version,
+  round_mode: round_mode,
+  shop_context: shop_context,
+  token: token,
+  currentIndex: currentIndex,
+  default_language: default_language,
+  css_files: css_files,
+  js_files: js_files|default([]),
+  js_inline: js_inline|default([]),
+  displayBackOfficeHeader: displayBackOfficeHeader|default(null)
+}) }}
diff --git a/src/PrestaShopBundle/Twig/Component/Header.php b/src/PrestaShopBundle/Twig/Component/Header.php
new file mode 100644
index 0000000000000..1e24c5225096d
--- /dev/null
+++ b/src/PrestaShopBundle/Twig/Component/Header.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\Twig\Component;
+
+use Link;
+use Media;
+use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
+use Tools;
+
+#[AsTwigComponent(template: '@PrestaShop/Admin/Component/Layout/header.html.twig')]
+class Header
+{
+    public Link $link;
+    public ?string $viewport_scale;
+    public string $img_dir;
+    public string $meta_title;
+    public string $shop_name;
+    public bool $display_header_javascript;
+
+    public string $controller_name;
+
+    public string $iso_user;
+    public string $lang_is_rtl;
+    public string $full_language_code;
+    public string $full_cldr_language_code;
+    public string $country_iso_code;
+    public string $ps_version;
+    public string $round_mode;
+    public ?string $shop_context;
+    public string $token;
+    public string $currentIndex;
+    public string $default_language;
+
+    public array $css_files;
+    public array $js_files;
+    public array $js_inline;
+    public ?string $displayBackOfficeHeader;
+
+    public function getEmployeeToken(): string
+    {
+        return Tools::getAdminToken('AdminEmployees');
+    }
+
+    public function getJsDef(): array
+    {
+        return Media::getJsDef();
+    }
+}

From 7a73acbb757b6d246529737175e00f8fdacd8ce7 Mon Sep 17 00:00:00 2001
From: boherm <boris.hermans@prestashop.com>
Date: Fri, 21 Jul 2023 13:06:44 +0200
Subject: [PATCH 0602/1030] Use twig component header in layout.tpl

---
 .../themes/new-theme/template/layout.tpl      | 28 ++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/admin-dev/themes/new-theme/template/layout.tpl b/admin-dev/themes/new-theme/template/layout.tpl
index 93e665f6d1ba8..ee8e2f142ec6e 100644
--- a/admin-dev/themes/new-theme/template/layout.tpl
+++ b/admin-dev/themes/new-theme/template/layout.tpl
@@ -1,7 +1,33 @@
 <!DOCTYPE html>
 <html lang="{$iso}">
 <head>
-  {$header}
+  {render_template
+      smarty_template="header.tpl"
+      twig_template="@PrestaShop/Admin/Layout/header.html.twig"
+      link=$link
+      viewport_scale=(isset($viewport_scale)) ? $viewport_scale : null
+      img_dir=$img_dir
+      meta_title=$meta_title
+      shop_name=$shop_name
+      display_header_javascript=(isset($display_header_javascript)) ? $display_header_javascript : false
+      controller_name=$controller_name
+      iso_user=$iso_user
+      lang_is_rtl=$lang_is_rtl
+      full_language_code=$full_language_code
+      full_cldr_language_code=$full_cldr_language_code
+      country_iso_code=$country_iso_code
+      ps_version=$smarty.const._PS_VERSION_
+      round_mode=$round_mode
+      shop_context=(isset($shop_context)) ? $shop_context : null
+      token=$token
+      currentIndex=$currentIndex
+      default_language=$default_language
+      css_files=(isset($css_files)) ? $css_files : []
+      js_def=(isset($js_def) && is_array($js_def)) ? $js_def : []
+      js_files=(isset($js_files)) ? $js_files : []
+      js_inline=(isset($js_inline)) ? $js_inline : []
+      displayBackOfficeHeader=(isset($displayBackOfficeHeader)) ? $displayBackOfficeHeader : null
+  }
 </head>
 
 <body

From 5c9aea2cad808d9b0b55e6f6f31195d3db3c8e61 Mon Sep 17 00:00:00 2001
From: boherm <boris.hermans@prestashop.com>
Date: Fri, 21 Jul 2023 13:06:55 +0200
Subject: [PATCH 0603/1030] Temporary fix phpstan

---
 phpstan-tmp-legacy-layout-baseline.neon | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/phpstan-tmp-legacy-layout-baseline.neon b/phpstan-tmp-legacy-layout-baseline.neon
index d9a9541161e05..448534fe12d1a 100644
--- a/phpstan-tmp-legacy-layout-baseline.neon
+++ b/phpstan-tmp-legacy-layout-baseline.neon
@@ -20,6 +20,26 @@ parameters:
 			count: 1
 			path: src/PrestaShopBundle/Twig/Component/EmployeeDropdown.php
 
+		-
+			message: "#^Class Link is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+			count: 1
+			path: src/PrestaShopBundle/Twig/Component/Header.php
+
+		-
+			message: "#^Namespace Link is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+			count: 1
+			path: src/PrestaShopBundle/Twig/Component/Header.php
+
+		-
+			message: "#^Namespace Media is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+			count: 2
+			path: src/PrestaShopBundle/Twig/Component/Header.php
+
+		-
+			message: "#^Namespace Tools is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+			count: 2
+			path: src/PrestaShopBundle/Twig/Component/Header.php
+
 		-
 			message: "#^Class Link is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
 			count: 1

From 20086f108a9de5c10a76df355fa089b79fcd76f8 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Fri, 21 Jul 2023 15:37:18 +0200
Subject: [PATCH 0604/1030] Add new test to edit modules table

---
 .../06_team/permission/01_editMenu.ts         |  20 +--
 .../06_team/permission/02_editModules.ts      | 111 +++++++++++++++++
 .../team/permissions/index.ts                 | 116 +++++++++++++++---
 3 files changed, 221 insertions(+), 26 deletions(-)
 create mode 100644 tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/permission/02_editModules.ts

diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/permission/01_editMenu.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/permission/01_editMenu.ts
index b133987e13134..ca11cc11935f8 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/permission/01_editMenu.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/permission/01_editMenu.ts
@@ -67,7 +67,7 @@ describe('BO - Advanced Parameters - Team - Permission : Edit menu', async () =>
     it('should check the checkbox \'ALL\' from the header', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkAllCheckbox', baseContext);
 
-      const isPermissionDefined = await permissionsPage.bulkSetPermission(page, 'all');
+      const isPermissionDefined = await permissionsPage.setPermissionOnAllPages(page, 'all');
       await expect(isPermissionDefined, 'Permission is not updated').to.be.true;
     });
 
@@ -77,7 +77,7 @@ describe('BO - Advanced Parameters - Team - Permission : Edit menu', async () =>
       {args: {action: 'edit'}},
       {args: {action: 'delete'}},
     ].forEach((test) => {
-      it(`should check that everything in '${test.args.action}' block is checked`, async function () {
+      it(`should check that everything in '${test.args.action}' permission is checked`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `check_${test.args.action}1`, baseContext);
 
         const isBulkPermissionPerformed = await permissionsPage.isBulkPermissionPerformed(page, test.args.action);
@@ -90,7 +90,7 @@ describe('BO - Advanced Parameters - Team - Permission : Edit menu', async () =>
     it('should uncheck the checkbox \'ALL\' from the header', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'uncheckAllCheckbox', baseContext);
 
-      const isPermissionDefined = await permissionsPage.bulkSetPermission(page, 'all', false);
+      const isPermissionDefined = await permissionsPage.setPermissionOnAllPages(page, 'all', false);
       await expect(isPermissionDefined, 'Permission is not updated').to.be.true;
     });
 
@@ -100,7 +100,7 @@ describe('BO - Advanced Parameters - Team - Permission : Edit menu', async () =>
       {args: {action: 'edit'}},
       {args: {action: 'delete'}},
     ].forEach((test) => {
-      it(`should check that everything in '${test.args.action}' block is unchecked`, async function () {
+      it(`should check that everything in '${test.args.action}' permission is unchecked`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `unchecked_${test.args.action}1`, baseContext);
 
         const isBulkPermissionPerformed = await permissionsPage.isBulkPermissionPerformed(page, test.args.action, false);
@@ -119,12 +119,12 @@ describe('BO - Advanced Parameters - Team - Permission : Edit menu', async () =>
       it(`should check '${test.args.action}' checkbox from the header`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `checkAllCheckbox_${index}`, baseContext);
 
-        const isPermissionDefined = await permissionsPage.bulkSetPermission(page, test.args.action);
+        const isPermissionDefined = await permissionsPage.setPermissionOnAllPages(page, test.args.action);
         await expect(isPermissionDefined, 'Permission is not updated').to.be.true;
       });
 
-      it(`should check that everything in '${test.args.action}' block is checked`, async function () {
-        await testContext.addContextItem(this, 'testIdentifier', `checkAllCheckboxForBlock${index}`, baseContext);
+      it(`should check that everything in '${test.args.action}' permission is checked`, async function () {
+        await testContext.addContextItem(this, 'testIdentifier', `checkAllCheckboxForpermission${index}`, baseContext);
 
         const isBulkPermissionPerformed = await permissionsPage.isBulkPermissionPerformed(page, test.args.action);
         await expect(isBulkPermissionPerformed).to.be.true;
@@ -149,7 +149,7 @@ describe('BO - Advanced Parameters - Team - Permission : Edit menu', async () =>
       {args: {action: 'delete'}},
       {args: {action: 'all'}},
     ].forEach((test, index: number) => {
-      it(`should check that '${test.args.action}' block is checked for all menu`, async function () {
+      it(`should check that '${test.args.action}' permission is checked for all menu`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `checkAfterRefreshPage${index}`, baseContext);
 
         const number = await permissionsPage.getNumberOfCheckBoxUnChecked(page, test.args.action);
@@ -162,9 +162,9 @@ describe('BO - Advanced Parameters - Team - Permission : Edit menu', async () =>
     it('should uncheck the checkbox \'ALL\' from the header', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'uncheckAll', baseContext);
 
-      await permissionsPage.bulkSetPermission(page, 'all', false);
+      await permissionsPage.setPermissionOnAllPages(page, 'all', false);
 
-      const isPermissionDefined = await permissionsPage.bulkSetPermission(page, 'all', false);
+      const isPermissionDefined = await permissionsPage.setPermissionOnAllPages(page, 'all', false);
       await expect(isPermissionDefined, 'Permission is not updated').to.be.true;
     });
 
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/permission/02_editModules.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/permission/02_editModules.ts
new file mode 100644
index 0000000000000..7120c55c5e00d
--- /dev/null
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/permission/02_editModules.ts
@@ -0,0 +1,111 @@
+// Import utils
+import helper from '@utils/helpers';
+import testContext from '@utils/testContext';
+
+// Import commonTests
+import loginCommon from '@commonTests/BO/loginBO';
+
+// Import pages
+import dashboardPage from '@pages/BO/dashboard';
+import employeesPage from '@pages/BO/advancedParameters/team';
+import permissionsPage from '@pages/BO/advancedParameters/team/permissions';
+
+import {expect} from 'chai';
+import type {BrowserContext, Page} from 'playwright';
+
+const baseContext: string = 'functional_BO_advancedParameters_team_permission_editModules';
+
+describe('BO - Advanced Parameters - Team - Permission : Edit modules', async () => {
+  let browserContext: BrowserContext;
+  let page: Page;
+
+  // before and after functions
+  before(async function () {
+    browserContext = await helper.createBrowserContext(this.browser);
+    page = await helper.newTab(browserContext);
+  });
+
+  after(async () => {
+    await helper.closeBrowserContext(browserContext);
+  });
+
+  describe('Go to \'Logistician\' profile', async () => {
+    it('should login in BO', async function () {
+      await loginCommon.loginBO(this, page);
+    });
+
+    it('should go to \'Advanced Parameters > Team\' page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToAdvancedParamsPage', baseContext);
+
+      await dashboardPage.goToSubMenu(
+        page,
+        dashboardPage.advancedParametersLink,
+        dashboardPage.teamLink,
+      );
+      await employeesPage.closeSfToolBar(page);
+
+      const pageTitle = await employeesPage.getPageTitle(page);
+      await expect(pageTitle).to.contains(employeesPage.pageTitle);
+    });
+
+    it('should go to \'Permissions\' tab', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToPermissionsTab', baseContext);
+
+      const isTabOpened = await employeesPage.goToPermissionsTab(page);
+      await expect(isTabOpened, 'Permissions tab is not opened!').to.be.true;
+    });
+
+    it('should click on \'Logistician\' profile', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToProfileSubTab', baseContext);
+
+      const isSubTabOpened = await permissionsPage.goToProfileSubTab(page, 'logistician');
+      await expect(isSubTabOpened, 'Profile sub-tab is not opened!').to.be.true;
+    });
+  });
+
+  describe('Check checkbox by permission for all modules and check it', async () => {
+    [
+      {args: {action: 'view'}},
+      {args: {action: 'configure'}},
+      {args: {action: 'uninstall'}},
+    ].forEach((test, index: number) => {
+      it(`should check '${test.args.action}' checkbox from the header`, async function () {
+        await testContext.addContextItem(this, 'testIdentifier', `checkAllCheckbox_${index}`, baseContext);
+
+        const isPermissionDefined = await permissionsPage.setPermissionOnAllModules(page, test.args.action);
+        await expect(isPermissionDefined, 'Permission is not updated').to.be.true;
+      });
+
+      it(`should check that everything in '${test.args.action}' permission is checked`, async function () {
+        await testContext.addContextItem(this, 'testIdentifier', `checkAllCheckboxForBlock${index}`, baseContext);
+
+        const isBulkPermissionPerformed = await permissionsPage.isAllPermissionPerformed(page, test.args.action);
+        await expect(isBulkPermissionPerformed).to.be.true;
+      });
+    });
+  });
+
+  describe('Refresh the page and check result', async () => {
+    it('should refresh the page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'refreshPage', baseContext);
+
+      await permissionsPage.reloadPage(page);
+
+      const isSubTabOpened = await permissionsPage.goToProfileSubTab(page, 'logistician');
+      await expect(isSubTabOpened, 'Profile sub-tab is not opened!').to.be.true;
+    });
+
+    [
+      {args: {action: 'view'}},
+      {args: {action: 'configure'}},
+      {args: {action: 'uninstall'}},
+    ].forEach((test, index: number) => {
+      it(`should check that '${test.args.action}' permission is checked for all menu`, async function () {
+        await testContext.addContextItem(this, 'testIdentifier', `checkAfterRefreshPage${index}`, baseContext);
+
+        const numberOfModulesUnchecked = await permissionsPage.getNumberOfModulesUnChecked(page, test.args.action);
+        await expect(numberOfModulesUnchecked).to.eq(0);
+      });
+    });
+  });
+});
diff --git a/tests/UI/pages/BO/advancedParameters/team/permissions/index.ts b/tests/UI/pages/BO/advancedParameters/team/permissions/index.ts
index 767e09911ee56..09fc1c45182a8 100644
--- a/tests/UI/pages/BO/advancedParameters/team/permissions/index.ts
+++ b/tests/UI/pages/BO/advancedParameters/team/permissions/index.ts
@@ -12,17 +12,25 @@ class Permissions extends BOBasePage {
 
   private readonly profileSubTab: (profileName: string) => string;
 
-  private readonly profileAccess: (className: string, access: string) => string;
+  private readonly menuTableProfileAccess: (className: string, access: string) => string;
 
   private readonly menuTable: string;
 
-  private readonly permissionCheckbox: string;
+  private readonly modulesTable: string;
+
+  private readonly menuTablePermissionCheckboxAll: string;
 
   private readonly menuTableHeaderCheckbox: (permission: string) => string;
 
+  private readonly modulesTableHeaderCheckbox: (permission: string) => string;
+
   private readonly menuTableRow: (row: number) => string;
 
-  private readonly permissionCheckboxRow: (row: number, access: string) => string;
+  private readonly modulesTableRow: (row: number) => string;
+
+  private readonly menuTablePermissionCheckboxRow: (row: number, access: string) => string;
+
+  private readonly modulesTablePermissionCheckboxRow: (row: number, permission: string) => string;
 
   /**
    * @constructs
@@ -38,14 +46,21 @@ class Permissions extends BOBasePage {
     this.growlCloseButton = `${this.growlDiv} .growl-close`;
     this.successfulUpdateMessage = 'Update successful';
     this.profileSubTab = (profileName: string) => `a[id^="profile-"]:text("${profileName}")`;
-    this.profileAccess = (className: string, access: string) => `input[data-type="${access}"][data-classname="${
-      className}"]:visible`;
+    // Selectors for menu table
     this.menuTable = '#table_2';
-    this.menuTableHeaderCheckbox = (permission: string) => `#table_2 thead tr th input.${permission}all`;
+    this.menuTableHeaderCheckbox = (permission: string) => `${this.menuTable} thead tr th input.${permission}all`;
+    this.menuTableProfileAccess = (className: string, access: string) => `${this.menuTable} input[data-type="${access}"]
+      [data-classname="${className}"]:visible`;
+    this.menuTablePermissionCheckboxAll = `${this.menuTable} tr td input[data-type='all']`;
     this.menuTableRow = (row: number) => `${this.menuTable} tr:nth-child(${row})`;
-    this.permissionCheckbox = `${this.menuTable} tr td input[data-type='all']`;
-    this.permissionCheckboxRow = (row: number, permission: string) => `${this.menuTable} tr:nth-child(${row})`
+    this.menuTablePermissionCheckboxRow = (row: number, permission: string) => `${this.menuTable} tr:nth-child(${row})`
       + ` td input[data-type='${permission}']`;
+    // Selectors for modules table
+    this.modulesTable = '#table_module_2';
+    this.modulesTableHeaderCheckbox = (permission: string) => `${this.modulesTable} thead tr th input[data-rel*='${permission}']`;
+    this.modulesTableRow = (row: number) => `${this.modulesTable} tr:nth-child(${row})`;
+    this.modulesTablePermissionCheckboxRow = (row: number, permission: string) => `${this.modulesTable} tr:nth-child(${row})`
+      + ` td input[data-rel*='${permission}']`;
   }
 
   /*
@@ -62,6 +77,7 @@ class Permissions extends BOBasePage {
     return this.elementVisible(page, `${this.profileSubTab(profileName)}.selected.active`, 1000);
   }
 
+  // Methods for menu table
   /**
    * Set a specific permission on a specific page
    * @param page {Page} Browser tab
@@ -71,10 +87,10 @@ class Permissions extends BOBasePage {
    */
   async setPermission(page: Page, className: string, access: string): Promise<boolean> {
     await this.closeGrowlMessage(page);
-    if (await this.isChecked(page, this.profileAccess(className, access))) {
+    if (await this.isChecked(page, this.menuTableProfileAccess(className, access))) {
       return true;
     }
-    await page.click(this.profileAccess(className, access));
+    await page.click(this.menuTableProfileAccess(className, access));
     const growlTextMessage = await this.getGrowlMessageContent(page, 30000);
     await this.closeGrowlMessage(page);
 
@@ -82,13 +98,13 @@ class Permissions extends BOBasePage {
   }
 
   /**
-   * Bulk set a specific permission on a specific page
+   * Bulk set a specific permission on all pages
    * @param page {Page} Browser tab
    * @param permission {string} Name of permission
    * @param toCheck {boolean} True if we need to click on checkbox, false if not
    * @returns {Promise<boolean>}
    */
-  async bulkSetPermission(page: Page, permission: string, toCheck: boolean = true): Promise<boolean> {
+  async setPermissionOnAllPages(page: Page, permission: string, toCheck: boolean = true): Promise<boolean> {
     await this.closeGrowlMessage(page);
     if (toCheck && await this.isChecked(page, this.menuTableHeaderCheckbox(permission))) {
       return true;
@@ -105,7 +121,7 @@ class Permissions extends BOBasePage {
    * @returns {Promise<number>}
    */
   async getNumberOfElementInMenu(page: Page): Promise<number> {
-    return (await page.$$(this.permissionCheckbox)).length;
+    return (await page.$$(this.menuTablePermissionCheckboxAll)).length;
   }
 
   /**
@@ -121,7 +137,7 @@ class Permissions extends BOBasePage {
     let i: number = 1;
     let isVisible = isChecked;
     while (isVisible === isChecked && i < menuNumber) {
-      isVisible = await this.isChecked(page, this.permissionCheckboxRow(i, permission));
+      isVisible = await this.isChecked(page, this.menuTablePermissionCheckboxRow(i, permission));
       i += 1;
     }
 
@@ -140,7 +156,7 @@ class Permissions extends BOBasePage {
     let checked = 0;
 
     for (let i = 1; i <= menuNumber; i++) {
-      if (await this.isChecked(page, this.permissionCheckboxRow(i, permission))) {
+      if (await this.isChecked(page, this.menuTablePermissionCheckboxRow(i, permission))) {
         checked += 1;
       }
     }
@@ -156,7 +172,75 @@ class Permissions extends BOBasePage {
    * @returns {Promise<boolean>}
    */
   async isMenuChecked(page: Page, className: string, access: string): Promise<boolean> {
-    return this.isChecked(page, this.profileAccess(className, access));
+    return this.isChecked(page, this.menuTableProfileAccess(className, access));
+  }
+
+  // Methods for modules table
+  /**
+   * Bulk set a specific permission on all modules
+   * @param page {Page} Browser tab
+   * @param permission {string} Name of permission
+   * @param toCheck {boolean} True if we need to click on checkbox, false if not
+   * @returns {Promise<boolean>}
+   */
+  async setPermissionOnAllModules(page: Page, permission: string, toCheck: boolean = true): Promise<boolean> {
+    await this.closeGrowlMessage(page);
+    if (toCheck && await this.isChecked(page, this.modulesTableHeaderCheckbox(permission))) {
+      return true;
+    }
+    await page.click(this.modulesTableHeaderCheckbox(permission));
+    const growlTextMessage = await this.getGrowlMessageContent(page, 30000);
+
+    return growlTextMessage === this.successfulUpdateMessage;
+  }
+
+  /**
+   * Is bulk permission performed
+   * @param page {Page} Browser tab
+   * @param permission {string} Name of permission
+   * @param isChecked {boolean} True if we need to click on checkbox, false if not
+   * @returns {Promise<boolean>}
+   */
+  async isAllPermissionPerformed(page: Page, permission: string, isChecked: boolean = true): Promise<boolean> {
+    const menuNumber = await this.getNumberOfModules(page);
+
+    let i: number = 1;
+    let isVisible = isChecked;
+    while (isVisible === isChecked && i < menuNumber) {
+      isVisible = await this.isChecked(page, this.modulesTablePermissionCheckboxRow(i, permission));
+      i += 1;
+    }
+
+    return isVisible;
+  }
+
+  /**
+   * Get number of menu
+   * @param page {Page} Browser tab
+   * @returns {Promise<number>}
+   */
+  async getNumberOfModules(page: Page): Promise<number> {
+    return (await page.$$(`${this.modulesTable} body tr`)).length;
+  }
+
+  /**
+   * Get number of checkbox unchecked
+   * @param page {Page} Browser tab
+   * @param permission {string} Name of permission
+   * @returns {Promise<number>}
+   */
+  async getNumberOfModulesUnChecked(page: Page, permission: string): Promise<number> {
+    const modulesNumber = await this.getNumberOfModules(page);
+
+    let checked = 0;
+
+    for (let i = 1; i <= modulesNumber; i++) {
+      if (await this.isChecked(page, this.modulesTablePermissionCheckboxRow(i, permission))) {
+        checked += 1;
+      }
+    }
+
+    return modulesNumber - checked;
   }
 }
 

From 6a21e0364925a099e719f62e9758ea1c7389c429 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Fri, 21 Jul 2023 16:03:03 +0200
Subject: [PATCH 0605/1030] Add some fixes

---
 .../UI/pages/BO/advancedParameters/team/permissions/index.ts  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/UI/pages/BO/advancedParameters/team/permissions/index.ts b/tests/UI/pages/BO/advancedParameters/team/permissions/index.ts
index 09fc1c45182a8..446890de1fbd1 100644
--- a/tests/UI/pages/BO/advancedParameters/team/permissions/index.ts
+++ b/tests/UI/pages/BO/advancedParameters/team/permissions/index.ts
@@ -49,8 +49,8 @@ class Permissions extends BOBasePage {
     // Selectors for menu table
     this.menuTable = '#table_2';
     this.menuTableHeaderCheckbox = (permission: string) => `${this.menuTable} thead tr th input.${permission}all`;
-    this.menuTableProfileAccess = (className: string, access: string) => `${this.menuTable} input[data-type="${access}"]
-      [data-classname="${className}"]:visible`;
+    this.menuTableProfileAccess = (className: string, access: string) => `${this.menuTable} input[data-type="${access}"]`
+      + `[data-classname="${className}"]:visible`;
     this.menuTablePermissionCheckboxAll = `${this.menuTable} tr td input[data-type='all']`;
     this.menuTableRow = (row: number) => `${this.menuTable} tr:nth-child(${row})`;
     this.menuTablePermissionCheckboxRow = (row: number, permission: string) => `${this.menuTable} tr:nth-child(${row})`

From 7ef39322d9316f861affc2c49d76490821240d6c Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Fri, 21 Jul 2023 16:09:02 +0200
Subject: [PATCH 0606/1030] Update composer.lock

---
 composer.lock | 89 +++++++++++----------------------------------------
 1 file changed, 18 insertions(+), 71 deletions(-)

diff --git a/composer.lock b/composer.lock
index 2f0c26637c1c6..2f2b1f91f278d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -345,7 +345,7 @@
             "support": {
                 "irc": "irc://irc.freenode.org/composer",
                 "issues": "https://github.com/composer/ca-bundle/issues",
-                "source": "https://github.com/composer/ca-bundle/tree/1.3.1"
+                "source": "https://github.com/composer/ca-bundle/tree/1.3.4"
             },
             "funding": [
                 {
@@ -2588,12 +2588,12 @@
             },
             "require": {
                 "php": ">=5.3.3",
-                "symfony/yaml": "^2.3 || ^3.0 || ^4.0 || ^5.0"
+                "symfony/yaml": "^2.3 || ^3.0 || ^4.0 || ^5.0 || ^6.0"
             },
             "require-dev": {
                 "composer/composer": "^1.0@dev",
-                "symfony/filesystem": "^2.3 || ^3 || ^4 || ^5",
-                "symfony/phpunit-bridge": "^4.0 || ^5.0"
+                "symfony/filesystem": "^2.3 || ^3 || ^4 || ^5 || ^6.0",
+                "symfony/phpunit-bridge": "^3.4.47 || ^4.4.41 || ^5.4.8 || ^6.0"
             },
             "type": "library",
             "extra": {
@@ -2623,7 +2623,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Incenteev/ParameterHandler/issues",
-                "source": "https://github.com/Incenteev/ParameterHandler/tree/v2.1.4"
+                "source": "https://github.com/Incenteev/ParameterHandler/tree/v2.1.5"
             },
             "time": "2020-03-17T21:10:00+00:00"
         },
@@ -2880,69 +2880,6 @@
             },
             "time": "2017-05-01T15:36:40+00:00"
         },
-        {
-            "name": "laminas/laminas-code",
-            "version": "4.11.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-code.git",
-                "reference": "169123b3ede20a9193480c53de2a8194f8c073ec"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-code/zipball/169123b3ede20a9193480c53de2a8194f8c073ec",
-                "reference": "169123b3ede20a9193480c53de2a8194f8c073ec",
-                "shasum": ""
-            },
-            "require": {
-                "php": "~8.1.0 || ~8.2.0"
-            },
-            "require-dev": {
-                "doctrine/annotations": "^2.0.0",
-                "ext-phar": "*",
-                "laminas/laminas-coding-standard": "^2.3.0",
-                "laminas/laminas-stdlib": "^3.6.1",
-                "phpunit/phpunit": "^10.0.9",
-                "psalm/plugin-phpunit": "^0.18.4",
-                "vimeo/psalm": "^5.7.1"
-            },
-            "suggest": {
-                "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features",
-                "laminas/laminas-stdlib": "Laminas\\Stdlib component"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\Code\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "Extensions to the PHP Reflection API, static code scanning, and code generation",
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "code",
-                "laminas",
-                "laminasframework"
-            ],
-            "support": {
-                "chat": "https://laminas.dev/chat",
-                "docs": "https://docs.laminas.dev/laminas-code/",
-                "forum": "https://discourse.laminas.dev",
-                "issues": "https://github.com/laminas/laminas-code/issues",
-                "rss": "https://github.com/laminas/laminas-code/releases.atom",
-                "source": "https://github.com/laminas/laminas-code"
-            },
-            "funding": [
-                {
-                    "url": "https://funding.communitybridge.org/projects/laminas-project",
-                    "type": "community_bridge"
-                }
-            ],
-            "time": "2023-05-14T12:05:38+00:00"
-        },
         {
             "name": "lcobucci/clock",
             "version": "3.0.0",
@@ -3738,7 +3675,7 @@
             ],
             "support": {
                 "issues": "https://github.com/matthiasmullie/minify/issues",
-                "source": "https://github.com/matthiasmullie/minify/tree/1.3.68"
+                "source": "https://github.com/matthiasmullie/minify/tree/1.3.69"
             },
             "funding": [
                 {
@@ -4630,6 +4567,7 @@
                 "issues": "https://github.com/php-http/message-factory/issues",
                 "source": "https://github.com/php-http/message-factory/tree/master"
             },
+            "abandoned": "psr/http-factory",
             "time": "2015-12-19T14:08:53+00:00"
         },
         {
@@ -5130,9 +5068,15 @@
                 "php": ">=5.4"
             },
             "require-dev": {
-                "prestashop/php-dev-tools": "^3.4"
+                "prestashop/php-dev-tools": "~3.0"
             },
             "type": "prestashop-module",
+            "autoload": {
+                "classmap": [
+                    "dashgoals.php",
+                    "controllers/"
+                ]
+            },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "AFL-3.0"
@@ -5167,6 +5111,9 @@
             "require": {
                 "php": ">=5.4"
             },
+            "require-dev": {
+                "prestashop/php-dev-tools": "^3.4"
+            },
             "type": "prestashop-module",
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -14551,7 +14498,7 @@
             "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles",
             "support": {
                 "issues": "https://github.com/tijsverkoyen/CssToInlineStyles/issues",
-                "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/2.2.4"
+                "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/2.2.5"
             },
             "time": "2021-12-08T09:12:39+00:00"
         },

From 843ffd8d8a6b9df47c0bd311918178778b52e9a5 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Fri, 21 Jul 2023 17:01:23 +0200
Subject: [PATCH 0607/1030] Add some fixes

---
 .../06_team/permission/01_editMenu.ts                     | 4 ++--
 .../pages/BO/advancedParameters/team/permissions/index.ts | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/permission/01_editMenu.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/permission/01_editMenu.ts
index ca11cc11935f8..9b03a5a583939 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/permission/01_editMenu.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/permission/01_editMenu.ts
@@ -152,7 +152,7 @@ describe('BO - Advanced Parameters - Team - Permission : Edit menu', async () =>
       it(`should check that '${test.args.action}' permission is checked for all menu`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `checkAfterRefreshPage${index}`, baseContext);
 
-        const number = await permissionsPage.getNumberOfCheckBoxUnChecked(page, test.args.action);
+        const number = await permissionsPage.getNumberOfPagesUnChecked(page, test.args.action);
         expect(number).to.eq(1);
       });
     });
@@ -180,7 +180,7 @@ describe('BO - Advanced Parameters - Team - Permission : Edit menu', async () =>
 
       const numberOfCheckBoxes = await permissionsPage.getNumberOfElementInMenu(page);
 
-      const number = await permissionsPage.getNumberOfCheckBoxUnChecked(page, 'all');
+      const number = await permissionsPage.getNumberOfPagesUnChecked(page, 'all');
       await expect(numberOfCheckBoxes - number).to.eq(6);
     });
 
diff --git a/tests/UI/pages/BO/advancedParameters/team/permissions/index.ts b/tests/UI/pages/BO/advancedParameters/team/permissions/index.ts
index 446890de1fbd1..e8c56235b5d92 100644
--- a/tests/UI/pages/BO/advancedParameters/team/permissions/index.ts
+++ b/tests/UI/pages/BO/advancedParameters/team/permissions/index.ts
@@ -49,8 +49,8 @@ class Permissions extends BOBasePage {
     // Selectors for menu table
     this.menuTable = '#table_2';
     this.menuTableHeaderCheckbox = (permission: string) => `${this.menuTable} thead tr th input.${permission}all`;
-    this.menuTableProfileAccess = (className: string, access: string) => `${this.menuTable} input[data-type="${access}"]`
-      + `[data-classname="${className}"]:visible`;
+    this.menuTableProfileAccess = (className: string, access: string) => `input[data-type="${access}"][data-classname="${
+      className}"]:visible`;
     this.menuTablePermissionCheckboxAll = `${this.menuTable} tr td input[data-type='all']`;
     this.menuTableRow = (row: number) => `${this.menuTable} tr:nth-child(${row})`;
     this.menuTablePermissionCheckboxRow = (row: number, permission: string) => `${this.menuTable} tr:nth-child(${row})`
@@ -116,7 +116,7 @@ class Permissions extends BOBasePage {
   }
 
   /**
-   * Get number of menu
+   * Get number of pages
    * @param page {Page} Browser tab
    * @returns {Promise<number>}
    */
@@ -150,7 +150,7 @@ class Permissions extends BOBasePage {
    * @param permission {string} Name of permission
    * @returns {Promise<number>}
    */
-  async getNumberOfCheckBoxUnChecked(page: Page, permission: string): Promise<number> {
+  async getNumberOfPagesUnChecked(page: Page, permission: string): Promise<number> {
     const menuNumber = await this.getNumberOfElementInMenu(page);
 
     let checked = 0;

From c639088237eebfa3e8558f4fe24ab5d04d92813f Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Fri, 21 Jul 2023 17:38:59 +0200
Subject: [PATCH 0608/1030] Fix method name

---
 .../14_advancedParameters/06_team/permission/01_editMenu.ts   | 2 +-
 .../UI/pages/BO/advancedParameters/team/permissions/index.ts  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/permission/01_editMenu.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/permission/01_editMenu.ts
index 9b03a5a583939..6955cba279922 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/permission/01_editMenu.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/permission/01_editMenu.ts
@@ -195,7 +195,7 @@ describe('BO - Advanced Parameters - Team - Permission : Edit menu', async () =>
       it(`should check that the menu '${test.args.className}' is checked`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `checkMenu${index}`, baseContext);
 
-        const isChecked = await permissionsPage.isMenuChecked(page, test.args.className, 'all');
+        const isChecked = await permissionsPage.isPageChecked(page, test.args.className, 'all');
         await expect(isChecked).to.be.true;
       });
     });
diff --git a/tests/UI/pages/BO/advancedParameters/team/permissions/index.ts b/tests/UI/pages/BO/advancedParameters/team/permissions/index.ts
index e8c56235b5d92..ead517f35f054 100644
--- a/tests/UI/pages/BO/advancedParameters/team/permissions/index.ts
+++ b/tests/UI/pages/BO/advancedParameters/team/permissions/index.ts
@@ -165,13 +165,13 @@ class Permissions extends BOBasePage {
   }
 
   /**
-   * Is menu checked
+   * Is page checked
    * @param page {Page} Browser tab
    * @param className {string} Name of the className
    * @param access {string} Access name
    * @returns {Promise<boolean>}
    */
-  async isMenuChecked(page: Page, className: string, access: string): Promise<boolean> {
+  async isPageChecked(page: Page, className: string, access: string): Promise<boolean> {
     return this.isChecked(page, this.menuTableProfileAccess(className, access));
   }
 

From a35340b0592e99e2aa4dcafb2a7e78391242d434 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Jul 2023 04:09:38 +0000
Subject: [PATCH 0609/1030] Bump @xmldom/xmldom from 0.8.9 to 0.8.10 in
 /tests/UI

Bumps [@xmldom/xmldom](https://github.com/xmldom/xmldom) from 0.8.9 to 0.8.10.
- [Release notes](https://github.com/xmldom/xmldom/releases)
- [Changelog](https://github.com/xmldom/xmldom/blob/master/CHANGELOG.md)
- [Commits](https://github.com/xmldom/xmldom/compare/0.8.9...0.8.10)

---
updated-dependencies:
- dependency-name: "@xmldom/xmldom"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 14 +++++++-------
 tests/UI/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index cd6b97ea84cd5..9f20837387c1f 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -11,7 +11,7 @@
       "dependencies": {
         "@faker-js/faker": "^8.0.2",
         "@s3pweb/keycloak-admin-client-cjs": "^21.0.1",
-        "@xmldom/xmldom": "^0.8.9",
+        "@xmldom/xmldom": "^0.8.10",
         "chai": "^4.3.7",
         "chai-string": "^1.5.0",
         "csv-writer": "^1.6.0",
@@ -1171,9 +1171,9 @@
       }
     },
     "node_modules/@xmldom/xmldom": {
-      "version": "0.8.9",
-      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.9.tgz",
-      "integrity": "sha512-4VSbbcMoxc4KLjb1gs96SRmi7w4h1SF+fCoiK0XaQX62buCc1G5d0DC5bJ9xJBNPDSVCmIrcl8BiYxzjrqaaJA==",
+      "version": "0.8.10",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz",
+      "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==",
       "engines": {
         "node": ">=10.0.0"
       }
@@ -9873,9 +9873,9 @@
       }
     },
     "@xmldom/xmldom": {
-      "version": "0.8.9",
-      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.9.tgz",
-      "integrity": "sha512-4VSbbcMoxc4KLjb1gs96SRmi7w4h1SF+fCoiK0XaQX62buCc1G5d0DC5bJ9xJBNPDSVCmIrcl8BiYxzjrqaaJA=="
+      "version": "0.8.10",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz",
+      "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw=="
     },
     "abab": {
       "version": "2.0.6",
diff --git a/tests/UI/package.json b/tests/UI/package.json
index 342255c12fcf1..b146414da7076 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -104,7 +104,7 @@
   "dependencies": {
     "@faker-js/faker": "^8.0.2",
     "@s3pweb/keycloak-admin-client-cjs": "^21.0.1",
-    "@xmldom/xmldom": "^0.8.9",
+    "@xmldom/xmldom": "^0.8.10",
     "chai": "^4.3.7",
     "chai-string": "^1.5.0",
     "csv-writer": "^1.6.0",

From cfb5c4e6d0985f8da1693f968a6c3ec0bf69e9b6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Jul 2023 04:10:34 +0000
Subject: [PATCH 0610/1030] Bump fast-xml-parser from 4.2.5 to 4.2.6 in
 /tests/UI

Bumps [fast-xml-parser](https://github.com/NaturalIntelligence/fast-xml-parser) from 4.2.5 to 4.2.6.
- [Release notes](https://github.com/NaturalIntelligence/fast-xml-parser/releases)
- [Changelog](https://github.com/NaturalIntelligence/fast-xml-parser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/NaturalIntelligence/fast-xml-parser/compare/v4.2.5...v4.2.6)

---
updated-dependencies:
- dependency-name: fast-xml-parser
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 14 +++++++-------
 tests/UI/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index cd6b97ea84cd5..64543b1620ef4 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -16,7 +16,7 @@
         "chai-string": "^1.5.0",
         "csv-writer": "^1.6.0",
         "dotenv": "^16.3.1",
-        "fast-xml-parser": "^4.2.5",
+        "fast-xml-parser": "^4.2.6",
         "jpeg-js": "^0.4.4",
         "js-image-generator": "^1.0.4",
         "maildev": "^2.0.5",
@@ -4023,9 +4023,9 @@
       "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
     },
     "node_modules/fast-xml-parser": {
-      "version": "4.2.5",
-      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.5.tgz",
-      "integrity": "sha512-B9/wizE4WngqQftFPmdaMYlXoJlJOYxGQOanC77fq9k8+Z0v5dDSVh+3glErdIROP//s/jgb7ZuxKfB8nVyo0g==",
+      "version": "4.2.6",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.6.tgz",
+      "integrity": "sha512-Xo1qV++h/Y3Ng8dphjahnYe+rGHaaNdsYOBWL9Y9GCPKpNKilJtilvWkLcI9f9X2DoKTLsZsGYAls5+JL5jfLA==",
       "funding": [
         {
           "type": "paypal",
@@ -12035,9 +12035,9 @@
       "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
     },
     "fast-xml-parser": {
-      "version": "4.2.5",
-      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.5.tgz",
-      "integrity": "sha512-B9/wizE4WngqQftFPmdaMYlXoJlJOYxGQOanC77fq9k8+Z0v5dDSVh+3glErdIROP//s/jgb7ZuxKfB8nVyo0g==",
+      "version": "4.2.6",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.6.tgz",
+      "integrity": "sha512-Xo1qV++h/Y3Ng8dphjahnYe+rGHaaNdsYOBWL9Y9GCPKpNKilJtilvWkLcI9f9X2DoKTLsZsGYAls5+JL5jfLA==",
       "requires": {
         "strnum": "^1.0.5"
       }
diff --git a/tests/UI/package.json b/tests/UI/package.json
index 342255c12fcf1..32c5372b609b1 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -109,7 +109,7 @@
     "chai-string": "^1.5.0",
     "csv-writer": "^1.6.0",
     "dotenv": "^16.3.1",
-    "fast-xml-parser": "^4.2.5",
+    "fast-xml-parser": "^4.2.6",
     "jpeg-js": "^0.4.4",
     "js-image-generator": "^1.0.4",
     "maildev": "^2.0.5",

From 7382d31a66f90b5bbd60ed39511d3d2dfe3f09d2 Mon Sep 17 00:00:00 2001
From: lartist <salim-benouamer.ext@prestashop.com>
Date: Mon, 24 Jul 2023 07:05:07 +0200
Subject: [PATCH 0611/1030] Get notifications center independent twig component

---
 .../themes/new-theme/template/layout.tpl      |   6 -
 phpstan-tmp-legacy-layout-baseline.neon       |  25 ++++
 .../Layout/notifications_center.html.twig     |  24 +--
 .../Layout/notifications_center.html.twig     |   9 +-
 .../Twig/Component/NotificationsCenter.php    | 139 +++++++++++++++++-
 5 files changed, 171 insertions(+), 32 deletions(-)

diff --git a/admin-dev/themes/new-theme/template/layout.tpl b/admin-dev/themes/new-theme/template/layout.tpl
index 8a7bebafc5966..a8587d1d1ca6c 100644
--- a/admin-dev/themes/new-theme/template/layout.tpl
+++ b/admin-dev/themes/new-theme/template/layout.tpl
@@ -119,12 +119,6 @@
               {render_template
                 smarty_template="components/layout/notifications_center.tpl"
                 twig_template="@PrestaShop/Admin/Layout/notifications_center.html.twig"
-                show_new_orders=$show_new_orders
-                show_new_customers=$show_new_customers
-                show_new_messages=$show_new_messages
-                no_order_tip=$no_order_tip
-                no_customer_tip=$no_customer_tip
-                no_customer_message_tip=$no_customer_message_tip
               }
           </div>
         {/if}
diff --git a/phpstan-tmp-legacy-layout-baseline.neon b/phpstan-tmp-legacy-layout-baseline.neon
index 7d363f25fa03e..eb129c0a09265 100644
--- a/phpstan-tmp-legacy-layout-baseline.neon
+++ b/phpstan-tmp-legacy-layout-baseline.neon
@@ -25,6 +25,31 @@ parameters:
 			count: 1
 			path: src/PrestaShopBundle/Twig/Component/MobileQuickAccess.php
 
+		-
+			message: "#^Class Link is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+			count: 1
+			path: src/PrestaShopBundle/Twig/Component/NotificationsCenter.php
+
+		-
+			message: "#^Namespace Configuration is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+			count: 4
+			path: src/PrestaShopBundle/Twig/Component/NotificationsCenter.php
+
+		-
+			message: "#^Namespace Context is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+			count: 2
+			path: src/PrestaShopBundle/Twig/Component/NotificationsCenter.php
+
+		-
+			message: "#^Namespace Link is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+			count: 1
+			path: src/PrestaShopBundle/Twig/Component/NotificationsCenter.php
+
+		-
+			message: "#^Namespace Profile is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+			count: 2
+			path: src/PrestaShopBundle/Twig/Component/NotificationsCenter.php
+
 		-
 			message: "#^Class Link is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
 			count: 1
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/notifications_center.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/notifications_center.html.twig
index ecc925014e2e1..d9d60d56a2e15 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/notifications_center.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/notifications_center.html.twig
@@ -31,7 +31,7 @@
     <div class="notifications">
       <ul class="nav nav-tabs" role="tablist">
         {% set active = "active" %}
-        {% if showNewOrders %}
+        {% if this.showNewOrders %}
         <li class="nav-item">
           <a
             class="nav-link {{ active }}"
@@ -47,7 +47,7 @@
         </li>
         {% set active = "" %}
         {% endif %}
-        {% if showNewCustomers %}
+        {% if this.showNewCustomers %}
         <li class="nav-item">
           <a
             class="nav-link {{ active }}"
@@ -63,7 +63,7 @@
         </li>
         {% set active = "" %}
         {% endif %}
-        {% if showNewMessages %}
+        {% if this.showNewMessages %}
         <li class="nav-item">
           <a
             class="nav-link {{ active }}"
@@ -84,31 +84,31 @@
       <!-- Tab panes -->
       <div class="tab-content">
         {% set active = "active" %}
-        {% if showNewOrders %}
+        {% if this.showNewOrders %}
         <div class="tab-pane {{ active }} empty" id="orders-notifications" role="tabpanel">
           <p class="no-notification">
             {{ 'No new order for now :('|trans({}, 'Admin.Navigation.Notification') }}<br>
-            {{ noOrderTip|raw }}
+            {{ this.noOrderTip|raw }}
           </p>
           <div class="notification-elements"></div>
         </div>
         {% set active = "" %}
         {% endif %}
-        {% if showNewCustomers %}
+        {% if this.showNewCustomers %}
         <div class="tab-pane {{ active }} empty" id="customers-notifications" role="tabpanel">
           <p class="no-notification">
             {{ 'No new customer for now :('|trans({}, 'Admin.Navigation.Notification') }}<br>
-            {{ noCustomerTip }}
+            {{ this.noCustomerTip }}
           </p>
           <div class="notification-elements"></div>
         </div>
         {% set active = "" %}
         {% endif %}
-        {% if showNewMessages %}
+        {% if this.showNewMessages %}
         <div class="tab-pane {{ active }} empty" id="messages-notifications" role="tabpanel">
           <p class="no-notification">
             {{ 'No new message for now.'|trans({}, 'Admin.Navigation.Notification') }}<br>
-            {{ noCustomerMessageTip }}
+            {{ this.noCustomerMessageTip }}
           </p>
           <div class="notification-elements"></div>
         </div>
@@ -119,7 +119,7 @@
   </div>
 </div>
 
-{% if showNewOrders %}
+{% if this.showNewOrders %}
 <script type="text/html" id="order-notification-template">
   <a class="notif" href='order_url'>
     #_id_order_ -
@@ -129,7 +129,7 @@
 </script>
 {% endif %}
 
-{% if showNewCustomers %}
+{% if this.showNewCustomers %}
 <script type="text/html" id="customer-notification-template">
   <a class="notif" href='customer_url'>
     #_id_customer_ - <strong>_customer_name_</strong>_company_ - {{ 'registered'|trans({}, 'Admin.Navigation.Notification') }} <strong>_date_add_</strong>
@@ -137,7 +137,7 @@
 </script>
 {% endif %}
 
-{% if showNewMessages %}
+{% if this.showNewMessages %}
 <script type="text/html" id="message-notification-template">
   <a class="notif" href='message_url'>
     <span class="message-notification-status _status_">
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/notifications_center.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/notifications_center.html.twig
index 414808ce7cc5d..c3ddf63bd7579 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Layout/notifications_center.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/notifications_center.html.twig
@@ -22,11 +22,4 @@
  * @copyright Since 2007 PrestaShop SA and Contributors
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  *#}
-{{ component('NotificationsCenter', {
-  showNewOrders: show_new_orders,
-  showNewCustomers: show_new_customers,
-  showNewMessages: show_new_messages,
-  noOrderTip: no_order_tip,
-  noCustomerTip: no_customer_tip,
-  noCustomerMessageTip: no_customer_message_tip,
-}) }}
+{{ component('NotificationsCenter') }}
diff --git a/src/PrestaShopBundle/Twig/Component/NotificationsCenter.php b/src/PrestaShopBundle/Twig/Component/NotificationsCenter.php
index bffd3ed74e1b2..01533546d0ac5 100644
--- a/src/PrestaShopBundle/Twig/Component/NotificationsCenter.php
+++ b/src/PrestaShopBundle/Twig/Component/NotificationsCenter.php
@@ -28,15 +28,142 @@
 
 namespace PrestaShopBundle\Twig\Component;
 
+use Configuration;
+use Context;
+use Link;
+use PrestaShop\PrestaShop\Adapter\LegacyContext;
+use Profile;
+use Symfony\Contracts\Translation\TranslatorInterface;
 use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
 
 #[AsTwigComponent(template: '@PrestaShop/Admin/Component/Layout/notifications_center.html.twig')]
 class NotificationsCenter
 {
-    public bool $showNewOrders;
-    public bool $showNewCustomers;
-    public bool $showNewMessages;
-    public string $noOrderTip;
-    public string $noCustomerTip;
-    public string $noCustomerMessageTip;
+    private ?bool $showNewOrders = null;
+    private ?bool $showNewCustomers = null;
+    private ?bool $showNewMessages = null;
+    private ?string $noOrderTip = null;
+    private ?string $noCustomerTip = null;
+    private ?string $noCustomerMessageTip = null;
+    private readonly Link $link;
+    private array|false|null $accesses = null;
+
+    public function __construct(
+        private readonly TranslatorInterface $translator,
+        LegacyContext $legacyContext
+    ) {
+        $this->link = $legacyContext->getContext()->link;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isShowNewOrders(): bool
+    {
+        if ($this->showNewOrders === null) {
+            $this->showNewOrders = Configuration::get('PS_SHOW_NEW_ORDERS') && ($this->getAccesses()['AdminOrders']['view'] ?? null);
+        }
+
+        return $this->showNewOrders;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isShowNewCustomers(): bool
+    {
+        if ($this->showNewCustomers === null) {
+            $this->showNewCustomers = Configuration::get('PS_SHOW_NEW_CUSTOMERS') && ($this->getAccesses()['AdminCustomers']['view'] ?? null);
+        }
+
+        return $this->showNewCustomers;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isShowNewMessages(): bool
+    {
+        if ($this->showNewMessages === null) {
+            $this->showNewMessages = Configuration::get('PS_SHOW_NEW_MESSAGES') && ($this->getAccesses()['AdminCustomerThreads']['view'] ?? null);
+        }
+
+        return $this->showNewMessages;
+    }
+
+    /**
+     * @return string
+     */
+    public function getNoOrderTip(): string
+    {
+        if ($this->noOrderTip === null) {
+            $this->noOrderTip = $this->getNotificationTip('order');
+        }
+
+        return $this->noOrderTip;
+    }
+
+    /**
+     * @return string
+     */
+    public function getNoCustomerTip(): string
+    {
+        if ($this->noCustomerTip === null) {
+            $this->noCustomerTip = $this->getNotificationTip('customer');
+        }
+
+        return $this->noCustomerTip;
+    }
+
+    /**
+     * @return string
+     */
+    public function getNoCustomerMessageTip(): string
+    {
+        if ($this->noCustomerMessageTip === null) {
+            $this->noCustomerMessageTip = $this->getNotificationTip('customer_message');
+        }
+
+        return $this->noCustomerMessageTip;
+    }
+
+    private function getNotificationTip(string $type): string
+    {
+        $tips = [
+            'order' => [
+                $this->translator->trans(
+                    'Have you checked your [1][2]abandoned carts[/2][/1]?[3]Your next order could be hiding there!',
+                    [
+                        '[1]' => '<strong>',
+                        '[/1]' => '</strong>',
+                        '[2]' => '<a href="' . $this->link->getAdminLink('AdminCarts', true, [], ['action' => 'filterOnlyAbandonedCarts']) . '">',
+                        '[/2]' => '</a>',
+                        '[3]' => '<br>',
+                    ],
+                    'Admin.Navigation.Notification'
+                ),
+            ],
+            'customer' => [
+                $this->translator->trans('Are you active on social media these days?', [], 'Admin.Navigation.Notification'),
+            ],
+            'customer_message' => [
+                $this->translator->trans('Seems like all your customers are happy :)', [], 'Admin.Navigation.Notification'),
+            ],
+        ];
+
+        if (!isset($tips[$type])) {
+            return '';
+        }
+
+        return $tips[$type][array_rand($tips[$type])];
+    }
+
+    private function getAccesses(): array|false
+    {
+        if ($this->accesses === null) {
+            $this->accesses = Profile::getProfileAccesses(Context::getContext()->employee->id_profile, 'class_name');
+        }
+
+        return $this->accesses;
+    }
 }

From 85b553699030b22e3a63f5a194d10597027ddd71 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Mon, 24 Jul 2023 10:24:50 +0200
Subject: [PATCH 0612/1030] Functional Tests : Improved test after partial fix
 for #32265

---
 .../13_checkProductImageFormat.ts             | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/13_checkProductImageFormat.ts b/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/13_checkProductImageFormat.ts
index fdce9d2c7d0c1..c37ed2810e8c4 100644
--- a/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/13_checkProductImageFormat.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/13_checkProductImageFormat.ts
@@ -129,7 +129,7 @@ describe('BO - Design - Image Settings - Check product image format', async () =
     {
       product: productDataPNG,
       extOriginal: 'png',
-      extGenerated: 'jpg',
+      extGenerated: 'png',
     },
     {
       product: productDataJPG,
@@ -139,7 +139,7 @@ describe('BO - Design - Image Settings - Check product image format', async () =
     {
       product: productDataWEBP,
       extOriginal: 'webp',
-      extGenerated: 'webp',
+      extGenerated: 'jpg',
     },
   ].forEach((arg: {product: ProductData, extOriginal: string, extGenerated: string}, index: number) => {
     describe(`Image Generation - Product - Image Format : ${arg.extOriginal.toUpperCase()}`, async () => {
@@ -226,8 +226,7 @@ describe('BO - Design - Image Settings - Check product image format', async () =
         await expect(idProduct).to.be.gt(0);
       });
 
-      // @todo : https://github.com/PrestaShop/PrestaShop/issues/32265
-      it.skip('should check that images are generated', async function () {
+      it('should check that images are generated', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `checkProductImages${arg.extOriginal}`, baseContext);
 
         const pathProductIdSplitted: RegExpMatchArray|null = idProductImage.toString().match(/./g);
@@ -239,13 +238,25 @@ describe('BO - Design - Image Settings - Check product image format', async () =
         const pathProductId: string = pathProductIdSplitted.join('/');
 
         // Check the original file
+        const pathImageOriginal: string = `${files.getRootPath()}/img/p/${pathProductId}/${idProductImage}.jpg`;
+
+        const fileExistsOriginal = await files.doesFileExist(pathImageOriginal);
+        await expect(fileExistsOriginal, `The file ${pathImageOriginal} doesn't exist!`).to.be.true;
+
+        // @todo : https://github.com/PrestaShop/PrestaShop/issues/32265
+        if (arg.extOriginal !== 'webp') {
+          const imageTypeOriginal = await files.getImageType(pathImageOriginal);
+          await expect(imageTypeOriginal).to.be.eq(arg.extOriginal);
+        }
+
+        // Check the Jpg file
         const pathImageJPG: string = `${files.getRootPath()}/img/p/${pathProductId}/${idProductImage}-large_default.jpg`;
 
         const fileExistsJPG = await files.doesFileExist(pathImageJPG);
         await expect(fileExistsJPG, `The file ${pathImageJPG} doesn't exist!`).to.be.true;
 
         const imageTypeJPG = await files.getImageType(pathImageJPG);
-        await expect(imageTypeJPG).to.be.eq(arg.extOriginal);
+        await expect(imageTypeJPG).to.be.eq(arg.extGenerated);
 
         // Check the WebP file
         const pathImageWEBP: string = `${files.getRootPath()}/img/p/${pathProductId}/${idProductImage}-large_default.webp`;

From 2c8e31e635aa1dc39cda87d909845faf920e9c78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@prestashop.com>
Date: Mon, 12 Jun 2023 15:07:26 +0200
Subject: [PATCH 0613/1030] Update
 tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts

Co-authored-by: Progi1984 <progi1984@gmail.com>
---
 src/Core/Security/TokenAuthenticator.php               | 10 ++++++++--
 .../02_externalAuthServer/02_resourceEndpoint.ts       |  1 -
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Core/Security/TokenAuthenticator.php b/src/Core/Security/TokenAuthenticator.php
index 9330c9798d6df..a106164074ddf 100644
--- a/src/Core/Security/TokenAuthenticator.php
+++ b/src/Core/Security/TokenAuthenticator.php
@@ -73,8 +73,14 @@ public function supports(Request $request): bool
     {
         try {
             $authorization = $request->headers->get('Authorization') ?? null;
-            $token = explode(' ', $authorization)[1];
-            (new Parser())->parse($token);
+            if (null === $authorization) {
+                return false;
+            }
+            $explode = explode(' ', $authorization);
+            if (count($explode) >= 2) {
+                $token = $explode[1];
+                (new Parser())->parse($token);
+            }
         } catch (InvalidTokenStructure $e) {
             return false;
         }
diff --git a/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts b/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts
index 93678da52d9d0..269343cd40754 100644
--- a/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts
+++ b/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts
@@ -133,7 +133,6 @@ describe('API : External Auth Server - Resource Endpoint', async () => {
       await expect(api.getResponseHeader(apiResponse, 'WWW-Authenticate')).to.be.eq('Bearer');
     });
 
-    // @todo : https://github.com/PrestaShop/PrestaShop/issues/32768
     it('should request the endpoint /admin-dev/new-api/hook-status/1 with invalid access token', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'requestEndpointWithInvalidAccessToken', baseContext);
 

From 47a6f892250e43f6e99d1732c2ec27e8b165289b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@prestashop.com>
Date: Mon, 24 Jul 2023 11:31:08 +0200
Subject: [PATCH 0614/1030] Added www-authenticate: bearer if the access token
 is invalid

---
 app/config/config.yml                           |  2 --
 src/Core/Security/TokenAuthenticator.php        | 17 +++++++++++++++++
 .../02_resourceEndpoint.ts                      |  3 +--
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/app/config/config.yml b/app/config/config.yml
index b7d5e3b4f89fe..5ac5e0460f172 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -101,5 +101,3 @@ api_platform:
       - '%kernel.project_dir%/src/PrestaShopBundle/ApiPlatform/Resources'
 
   metadata_backward_compatibility_layer: false
-  exception_to_status:
-    Lcobucci\JWT\Token\InvalidTokenStructure: 401
diff --git a/src/Core/Security/TokenAuthenticator.php b/src/Core/Security/TokenAuthenticator.php
index 4d057740dee14..d63acea3c9cd2 100644
--- a/src/Core/Security/TokenAuthenticator.php
+++ b/src/Core/Security/TokenAuthenticator.php
@@ -28,6 +28,9 @@
 
 namespace PrestaShop\PrestaShop\Core\Security;
 
+use Lcobucci\JWT\Encoding\JoseEncoder;
+use Lcobucci\JWT\Token\InvalidTokenStructure;
+use Lcobucci\JWT\Token\Parser;
 use PrestaShop\PrestaShop\Core\Security\OAuth2\ResourceServerInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface;
@@ -69,6 +72,20 @@ public function start(Request $request, AuthenticationException $authException =
 
     public function supports(Request $request): bool
     {
+        try {
+            $authorization = $request->headers->get('Authorization') ?? null;
+            if (null === $authorization) {
+                return false;
+            }
+            $explode = explode(' ', $authorization);
+            if (count($explode) >= 2) {
+                $token = $explode[1];
+                (new Parser(new JoseEncoder()))->parse($token);
+            }
+        } catch (InvalidTokenStructure $e) {
+            return false;
+        }
+
         // Every request to the API should be handled by this Authenticator
         return true;
     }
diff --git a/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts b/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts
index ff35f20b40af6..269343cd40754 100644
--- a/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts
+++ b/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts
@@ -133,8 +133,7 @@ describe('API : External Auth Server - Resource Endpoint', async () => {
       await expect(api.getResponseHeader(apiResponse, 'WWW-Authenticate')).to.be.eq('Bearer');
     });
 
-    // @todo : https://github.com/PrestaShop/PrestaShop/issues/32768
-    it.skip('should request the endpoint /admin-dev/new-api/hook-status/1 with invalid access token', async function () {
+    it('should request the endpoint /admin-dev/new-api/hook-status/1 with invalid access token', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'requestEndpointWithInvalidAccessToken', baseContext);
 
       const apiResponse = await apiContext.get('new-api/hook-status/1', {

From 93a0babf730372065d6e96afb22266b78b279d20 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Mon, 24 Jul 2023 12:42:21 +0200
Subject: [PATCH 0615/1030] Functional Tests : Unskip test after #31572 is
 fixed

---
 .../02_features/01_CRUDFeaturesAndValues.ts          | 11 +++++------
 tests/UI/pages/BO/catalog/features/editFeature.ts    | 12 ++++++------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/01_CRUDFeaturesAndValues.ts b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/01_CRUDFeaturesAndValues.ts
index 4423e64efd407..1dd42eea8872c 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/01_CRUDFeaturesAndValues.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/01_CRUDFeaturesAndValues.ts
@@ -192,9 +192,8 @@ describe('BO - Catalog - Attributes & Features : CRUD features and values', asyn
     });
   });
 
-  // @todo https://github.com/PrestaShop/PrestaShop/issues/31572
   describe('Update feature', async () => {
-    it.skip('should click on \'Back to the list\' button', async function () {
+    it('should click on \'Back to the list\' button', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'backToTheList', baseContext);
 
       await viewFeaturePage.clickOnBackToTheListButton(page);
@@ -203,7 +202,7 @@ describe('BO - Catalog - Attributes & Features : CRUD features and values', asyn
       await expect(pageTitle).to.contains(featuresPage.pageTitle);
     });
 
-    it.skip('should filter list of features by the created feature', async function () {
+    it('should filter list of features by the created feature', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'filterFeature2', baseContext);
 
       await featuresPage.filterTable(page, 'b!name', createFeatureData.name);
@@ -212,18 +211,18 @@ describe('BO - Catalog - Attributes & Features : CRUD features and values', asyn
       await expect(textColumn).to.contains(createFeatureData.name);
     });
 
-    it.skip('should edit the created feature', async function () {
+    it('should edit the created feature', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'editFeature', baseContext);
 
       await featuresPage.clickOnEditFeature(page, 1);
 
       const textResult = await editFeaturePage.editFeature(page, editFeatureData);
-      await expect(textResult).to.contains(editFeaturePage.successfulCreationMessage);
+      await expect(textResult).to.contains(editFeaturePage.successfulUpdateMessage);
     });
   });
 
   describe('Delete value', async () => {
-    it.skip('should view feature', async function () {
+    it('should view feature', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'viewFeature2', baseContext);
 
       await featuresPage.viewFeature(page, 1);
diff --git a/tests/UI/pages/BO/catalog/features/editFeature.ts b/tests/UI/pages/BO/catalog/features/editFeature.ts
index 798ad91aecaa5..10b77a3ed59ca 100644
--- a/tests/UI/pages/BO/catalog/features/editFeature.ts
+++ b/tests/UI/pages/BO/catalog/features/editFeature.ts
@@ -34,11 +34,11 @@ class EditFeature extends BOBasePage {
     this.alertSuccessBlockParagraph = '.alert-success';
 
     // Form selectors
-    this.nameInput = '#feature_name_1';
-    this.urlInput = '#feature_url_name_1';
-    this.metaTitleInput = '#feature_meta_title_1';
-    this.indexableToggle = (toggle: string) => `#feature_layered_indexable_${toggle}`;
-    this.saveButton = '#main-div div.card-footer button.float-right';
+    this.nameInput = '#name_1';
+    this.urlInput = 'input[name=\'url_name_1\']';
+    this.metaTitleInput = 'input[name=\'meta_title_1\']';
+    this.indexableToggle = (toggle: string) => `#indexable_${toggle}`;
+    this.saveButton = '#feature_form_submit_btn';
   }
 
   /**
@@ -56,7 +56,7 @@ class EditFeature extends BOBasePage {
     await this.setValue(page, this.metaTitleInput, featureData.metaTitle);
 
     // Set indexable toggle
-    await this.setChecked(page, this.indexableToggle(featureData.indexable ? '1' : '0'));
+    await this.setChecked(page, this.indexableToggle(featureData.indexable ? 'on' : 'off'));
 
     // Save feature
     await this.clickAndWaitForURL(page, this.saveButton);

From 9a0fce0862cd3f59952f71893e1bfd0f86537f34 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Mon, 24 Jul 2023 12:56:40 +0200
Subject: [PATCH 0616/1030] Functional Tests : Fixed doubles in step
 identifiers

---
 .../02_features/01_CRUDFeaturesAndValues.ts               | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/01_CRUDFeaturesAndValues.ts b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/01_CRUDFeaturesAndValues.ts
index 1dd42eea8872c..58976c7849460 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/01_CRUDFeaturesAndValues.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/01_CRUDFeaturesAndValues.ts
@@ -194,7 +194,7 @@ describe('BO - Catalog - Attributes & Features : CRUD features and values', asyn
 
   describe('Update feature', async () => {
     it('should click on \'Back to the list\' button', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'backToTheList', baseContext);
+      await testContext.addContextItem(this, 'testIdentifier', 'backToTheListForUpdate', baseContext);
 
       await viewFeaturePage.clickOnBackToTheListButton(page);
 
@@ -203,7 +203,7 @@ describe('BO - Catalog - Attributes & Features : CRUD features and values', asyn
     });
 
     it('should filter list of features by the created feature', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'filterFeature2', baseContext);
+      await testContext.addContextItem(this, 'testIdentifier', 'filterFeatureForUpdate', baseContext);
 
       await featuresPage.filterTable(page, 'b!name', createFeatureData.name);
 
@@ -241,7 +241,7 @@ describe('BO - Catalog - Attributes & Features : CRUD features and values', asyn
 
   describe('Delete feature', async () => {
     it('should click on \'Back to the list\' button', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'backToTheList', baseContext);
+      await testContext.addContextItem(this, 'testIdentifier', 'backToTheListForDelete', baseContext);
 
       await viewFeaturePage.clickOnBackToTheListButton(page);
 
@@ -250,7 +250,7 @@ describe('BO - Catalog - Attributes & Features : CRUD features and values', asyn
     });
 
     it('should filter list of features by the created feature', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'filterFeature2', baseContext);
+      await testContext.addContextItem(this, 'testIdentifier', 'filterFeatureForDelete', baseContext);
 
       await featuresPage.filterTable(page, 'b!name', createFeatureData.name);
 

From cca0ee7b9d10cb65d1f7745227b4e01f081bca8c Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Mon, 24 Jul 2023 14:09:36 +0200
Subject: [PATCH 0617/1030] Functional Tests : Bump Hummingbird to 0.1.6

---
 tests/UI/commonTests/FO/hummingbird.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/UI/commonTests/FO/hummingbird.ts b/tests/UI/commonTests/FO/hummingbird.ts
index 91659db17a3d4..2535a06ee269a 100644
--- a/tests/UI/commonTests/FO/hummingbird.ts
+++ b/tests/UI/commonTests/FO/hummingbird.ts
@@ -15,7 +15,7 @@ function installHummingbird(baseContext: string = 'commonTests-installHummingbir
     let browserContext: BrowserContext;
     let page: Page;
 
-    const urlTheme: string = 'https://github.com/PrestaShop/hummingbird/releases/download/v0.1.5/hummingbird.zip';
+    const urlTheme: string = 'https://github.com/PrestaShop/hummingbird/releases/download/v0.1.6/hummingbird.zip';
 
     // before and after functions
     before(async function () {

From 4280cee1f3f1d1ce8c88f2ce7459ec269a5e14c1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Jul 2023 14:47:57 +0000
Subject: [PATCH 0618/1030] Bump maildev from 2.0.5 to 2.1.0 in /tests/UI

Bumps [maildev](https://github.com/maildev/maildev) from 2.0.5 to 2.1.0.
- [Release notes](https://github.com/maildev/maildev/releases)
- [Commits](https://github.com/maildev/maildev/compare/v2.0.5...v2.1.0)

---
updated-dependencies:
- dependency-name: maildev
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 268 +++++++++++++++----------------------
 tests/UI/package.json      |   2 +-
 2 files changed, 110 insertions(+), 160 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index 64543b1620ef4..e30dc4b2c21ad 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -19,7 +19,7 @@
         "fast-xml-parser": "^4.2.6",
         "jpeg-js": "^0.4.4",
         "js-image-generator": "^1.0.4",
-        "maildev": "^2.0.5",
+        "maildev": "^2.1.0",
         "mocha": "^10.2.0",
         "mochawesome": "^7.1.3",
         "pdfjs-dist": "^3.4.120",
@@ -455,6 +455,11 @@
         "@keycloak/keycloak-admin-client": "21.0.1"
       }
     },
+    "node_modules/@socket.io/component-emitter": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz",
+      "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg=="
+    },
     "node_modules/@tootallnate/once": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
@@ -478,20 +483,18 @@
         "@types/chai": "*"
       }
     },
-    "node_modules/@types/component-emitter": {
-      "version": "1.2.11",
-      "resolved": "https://registry.npmjs.org/@types/component-emitter/-/component-emitter-1.2.11.tgz",
-      "integrity": "sha512-SRXjM+tfsSlA9VuG8hGO2nft2p8zjXCK1VcC6N4NXbBbYbSia9kzCChYQajIjzIqOOOuh5Ock6MmV2oux4jDZQ=="
-    },
     "node_modules/@types/cookie": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz",
       "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q=="
     },
     "node_modules/@types/cors": {
-      "version": "2.8.12",
-      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz",
-      "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw=="
+      "version": "2.8.13",
+      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.13.tgz",
+      "integrity": "sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA==",
+      "dependencies": {
+        "@types/node": "*"
+      }
     },
     "node_modules/@types/json-schema": {
       "version": "7.0.12",
@@ -543,9 +546,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "16.11.12",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.12.tgz",
-      "integrity": "sha512-+2Iggwg7PxoO5Kyhvsq9VarmPbIelXP070HMImEpbtGCoyWNINQj4wzjbQCXzdHTRXnqufutJb5KAURZANNBAw=="
+      "version": "20.4.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.4.4.tgz",
+      "integrity": "sha512-CukZhumInROvLq3+b5gLev+vgpsIqC2D0deQr/yS1WnxvmYLlJXZpaQrQiseMY+6xusl79E04UjWoqyr+t1/Ew=="
     },
     "node_modules/@types/semver": {
       "version": "7.5.0",
@@ -2580,11 +2583,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/component-emitter": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
-      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="
-    },
     "node_modules/compressible": {
       "version": "2.0.18",
       "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
@@ -3082,9 +3080,9 @@
       }
     },
     "node_modules/engine.io": {
-      "version": "6.1.3",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.1.3.tgz",
-      "integrity": "sha512-rqs60YwkvWTLLnfazqgZqLa/aKo+9cueVfEi/dZ8PyGyaf8TLOxj++4QMIgeG3Gn0AhrWiFXvghsoY9L9h25GA==",
+      "version": "6.4.2",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.4.2.tgz",
+      "integrity": "sha512-FKn/3oMiJjrOEOeUub2WCox6JhxBXq/Zn3fZOMCBxKnNYtsdKjxhl7yR3fZhM9PV+rdE75SU5SYMc+2PGzo+Tg==",
       "dependencies": {
         "@types/cookie": "^0.4.1",
         "@types/cors": "^2.8.12",
@@ -3095,16 +3093,16 @@
         "cors": "~2.8.5",
         "debug": "~4.3.1",
         "engine.io-parser": "~5.0.3",
-        "ws": "~8.2.3"
+        "ws": "~8.11.0"
       },
       "engines": {
         "node": ">=10.0.0"
       }
     },
     "node_modules/engine.io-parser": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.4.tgz",
-      "integrity": "sha512-+nVFp+5z1E3HcToEnO7ZIj3g+3k9389DvWtvJZz0T6/eOCPIyyxehFcedoYrZQrp0LgQbD9pPXhpMBKMd5QURg==",
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.7.tgz",
+      "integrity": "sha512-P+jDFbvK6lE3n1OL+q9KuzdOFWkkZ/cMV9gol/SbVfpyqfvrfrFTOFJ6fQm2VC3PZHlU3QPhVwmbsCnauHF2MQ==",
       "engines": {
         "node": ">=10.0.0"
       }
@@ -3117,26 +3115,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/engine.io/node_modules/ws": {
-      "version": "8.2.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz",
-      "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==",
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/entities": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/entities/-/entities-4.4.0.tgz",
@@ -5332,26 +5310,6 @@
         "node": ">=0.4.0"
       }
     },
-    "node_modules/jsdom/node_modules/ws": {
-      "version": "8.9.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.9.0.tgz",
-      "integrity": "sha512-Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg==",
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
@@ -5618,9 +5576,9 @@
       }
     },
     "node_modules/maildev": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/maildev/-/maildev-2.0.5.tgz",
-      "integrity": "sha512-iwBss8fIQuQ8ycgszp7+T1+SjDobnwzLgjSwMcFoW0uJYNHfwQQeuC4+XL7/BH+uju5PeBtwzODuCJqScbnf6g==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/maildev/-/maildev-2.1.0.tgz",
+      "integrity": "sha512-lCgcUbKENKui3IXo9Jb3ToD0ia23izb0NRWT+Y9Z7534gS2/t2VScbcZwm3i3BGcNSKs0aYXswX7eH2JYEDkVg==",
       "dependencies": {
         "addressparser": "1.0.1",
         "async": "^3.2.3",
@@ -5635,7 +5593,7 @@
         "nodemailer": "^6.7.2",
         "rimraf": "^3.0.2",
         "smtp-server": "3.11.0",
-        "socket.io": "4.4.1",
+        "socket.io": "4.6.0",
         "uue": "3.1.2"
       },
       "bin": {
@@ -5664,20 +5622,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/maildev/node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/make-dir": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
@@ -7707,7 +7651,6 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
       "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "devOptional": true,
       "dependencies": {
         "glob": "^7.1.3"
       },
@@ -8004,33 +7947,35 @@
       }
     },
     "node_modules/socket.io": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.4.1.tgz",
-      "integrity": "sha512-s04vrBswdQBUmuWJuuNTmXUVJhP0cVky8bBDhdkf8y0Ptsu7fKU2LuLbts9g+pdmAdyMMn8F/9Mf1/wbtUN0fg==",
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.6.0.tgz",
+      "integrity": "sha512-b65bp6INPk/BMMrIgVvX12x3Q+NqlGqSlTuvKQWt0BUJ3Hyy3JangBl7fEoWZTXbOKlCqNPbQ6MbWgok/km28w==",
       "dependencies": {
         "accepts": "~1.3.4",
         "base64id": "~2.0.0",
         "debug": "~4.3.2",
-        "engine.io": "~6.1.0",
-        "socket.io-adapter": "~2.3.3",
-        "socket.io-parser": "~4.0.4"
+        "engine.io": "~6.4.0",
+        "socket.io-adapter": "~2.5.2",
+        "socket.io-parser": "~4.2.1"
       },
       "engines": {
         "node": ">=10.0.0"
       }
     },
     "node_modules/socket.io-adapter": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.3.3.tgz",
-      "integrity": "sha512-Qd/iwn3VskrpNO60BeRyCyr8ZWw9CPZyitW4AQwmRZ8zCiyDiL+znRnWX6tDHXnWn1sJrM1+b6Mn6wEDJJ4aYQ=="
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.2.tgz",
+      "integrity": "sha512-87C3LO/NOMc+eMcpcxUBebGjkpMDkNBS9tf7KJqcDsmL936EChtVva71Dw2q4tQcuVC+hAUy4an2NO/sYXmwRA==",
+      "dependencies": {
+        "ws": "~8.11.0"
+      }
     },
     "node_modules/socket.io-parser": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.5.tgz",
-      "integrity": "sha512-sNjbT9dX63nqUFIOv95tTVm6elyIU4RvB1m8dOeZt+IgWwcWklFDOdmGcfo3zSiRsnR/3pJkjY5lfoGqEe4Eig==",
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz",
+      "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==",
       "dependencies": {
-        "@types/component-emitter": "^1.2.10",
-        "component-emitter": "~1.3.0",
+        "@socket.io/component-emitter": "~3.1.0",
         "debug": "~4.3.1"
       },
       "engines": {
@@ -8992,6 +8937,26 @@
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
     },
+    "node_modules/ws": {
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
+      "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/xml-name-validator": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
@@ -9421,6 +9386,11 @@
         "@keycloak/keycloak-admin-client": "21.0.1"
       }
     },
+    "@socket.io/component-emitter": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz",
+      "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg=="
+    },
     "@tootallnate/once": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
@@ -9441,20 +9411,18 @@
         "@types/chai": "*"
       }
     },
-    "@types/component-emitter": {
-      "version": "1.2.11",
-      "resolved": "https://registry.npmjs.org/@types/component-emitter/-/component-emitter-1.2.11.tgz",
-      "integrity": "sha512-SRXjM+tfsSlA9VuG8hGO2nft2p8zjXCK1VcC6N4NXbBbYbSia9kzCChYQajIjzIqOOOuh5Ock6MmV2oux4jDZQ=="
-    },
     "@types/cookie": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz",
       "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q=="
     },
     "@types/cors": {
-      "version": "2.8.12",
-      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz",
-      "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw=="
+      "version": "2.8.13",
+      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.13.tgz",
+      "integrity": "sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA==",
+      "requires": {
+        "@types/node": "*"
+      }
     },
     "@types/json-schema": {
       "version": "7.0.12",
@@ -9506,9 +9474,9 @@
       }
     },
     "@types/node": {
-      "version": "16.11.12",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.12.tgz",
-      "integrity": "sha512-+2Iggwg7PxoO5Kyhvsq9VarmPbIelXP070HMImEpbtGCoyWNINQj4wzjbQCXzdHTRXnqufutJb5KAURZANNBAw=="
+      "version": "20.4.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.4.4.tgz",
+      "integrity": "sha512-CukZhumInROvLq3+b5gLev+vgpsIqC2D0deQr/yS1WnxvmYLlJXZpaQrQiseMY+6xusl79E04UjWoqyr+t1/Ew=="
     },
     "@types/semver": {
       "version": "7.5.0",
@@ -10941,11 +10909,6 @@
       "integrity": "sha512-jAg09gkdkrDO9EWTdXfv80WWH3yeZl5oT69fGfedBNS9pXUKYInVJ1bJ+/ht2+Moeei48TmSbQDYMc8EOx9G0g==",
       "dev": true
     },
-    "component-emitter": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
-      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="
-    },
     "compressible": {
       "version": "2.0.18",
       "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
@@ -11324,9 +11287,9 @@
       "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
     },
     "engine.io": {
-      "version": "6.1.3",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.1.3.tgz",
-      "integrity": "sha512-rqs60YwkvWTLLnfazqgZqLa/aKo+9cueVfEi/dZ8PyGyaf8TLOxj++4QMIgeG3Gn0AhrWiFXvghsoY9L9h25GA==",
+      "version": "6.4.2",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.4.2.tgz",
+      "integrity": "sha512-FKn/3oMiJjrOEOeUub2WCox6JhxBXq/Zn3fZOMCBxKnNYtsdKjxhl7yR3fZhM9PV+rdE75SU5SYMc+2PGzo+Tg==",
       "requires": {
         "@types/cookie": "^0.4.1",
         "@types/cors": "^2.8.12",
@@ -11337,26 +11300,20 @@
         "cors": "~2.8.5",
         "debug": "~4.3.1",
         "engine.io-parser": "~5.0.3",
-        "ws": "~8.2.3"
+        "ws": "~8.11.0"
       },
       "dependencies": {
         "cookie": {
           "version": "0.4.2",
           "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
           "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA=="
-        },
-        "ws": {
-          "version": "8.2.3",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz",
-          "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==",
-          "requires": {}
         }
       }
     },
     "engine.io-parser": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.4.tgz",
-      "integrity": "sha512-+nVFp+5z1E3HcToEnO7ZIj3g+3k9389DvWtvJZz0T6/eOCPIyyxehFcedoYrZQrp0LgQbD9pPXhpMBKMd5QURg=="
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.7.tgz",
+      "integrity": "sha512-P+jDFbvK6lE3n1OL+q9KuzdOFWkkZ/cMV9gol/SbVfpyqfvrfrFTOFJ6fQm2VC3PZHlU3QPhVwmbsCnauHF2MQ=="
     },
     "entities": {
       "version": "4.4.0",
@@ -12971,12 +12928,6 @@
           "version": "8.8.0",
           "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
           "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w=="
-        },
-        "ws": {
-          "version": "8.9.0",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-8.9.0.tgz",
-          "integrity": "sha512-Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg==",
-          "requires": {}
         }
       }
     },
@@ -13194,9 +13145,9 @@
       }
     },
     "maildev": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/maildev/-/maildev-2.0.5.tgz",
-      "integrity": "sha512-iwBss8fIQuQ8ycgszp7+T1+SjDobnwzLgjSwMcFoW0uJYNHfwQQeuC4+XL7/BH+uju5PeBtwzODuCJqScbnf6g==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/maildev/-/maildev-2.1.0.tgz",
+      "integrity": "sha512-lCgcUbKENKui3IXo9Jb3ToD0ia23izb0NRWT+Y9Z7534gS2/t2VScbcZwm3i3BGcNSKs0aYXswX7eH2JYEDkVg==",
       "requires": {
         "addressparser": "1.0.1",
         "async": "^3.2.3",
@@ -13211,7 +13162,7 @@
         "nodemailer": "^6.7.2",
         "rimraf": "^3.0.2",
         "smtp-server": "3.11.0",
-        "socket.io": "4.4.1",
+        "socket.io": "4.6.0",
         "uue": "3.1.2"
       },
       "dependencies": {
@@ -13227,14 +13178,6 @@
           "requires": {
             "safer-buffer": ">= 2.1.2 < 3"
           }
-        },
-        "rimraf": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-          "requires": {
-            "glob": "^7.1.3"
-          }
         }
       }
     },
@@ -14723,7 +14666,6 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
       "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "devOptional": true,
       "requires": {
         "glob": "^7.1.3"
       }
@@ -14943,30 +14885,32 @@
       }
     },
     "socket.io": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.4.1.tgz",
-      "integrity": "sha512-s04vrBswdQBUmuWJuuNTmXUVJhP0cVky8bBDhdkf8y0Ptsu7fKU2LuLbts9g+pdmAdyMMn8F/9Mf1/wbtUN0fg==",
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.6.0.tgz",
+      "integrity": "sha512-b65bp6INPk/BMMrIgVvX12x3Q+NqlGqSlTuvKQWt0BUJ3Hyy3JangBl7fEoWZTXbOKlCqNPbQ6MbWgok/km28w==",
       "requires": {
         "accepts": "~1.3.4",
         "base64id": "~2.0.0",
         "debug": "~4.3.2",
-        "engine.io": "~6.1.0",
-        "socket.io-adapter": "~2.3.3",
-        "socket.io-parser": "~4.0.4"
+        "engine.io": "~6.4.0",
+        "socket.io-adapter": "~2.5.2",
+        "socket.io-parser": "~4.2.1"
       }
     },
     "socket.io-adapter": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.3.3.tgz",
-      "integrity": "sha512-Qd/iwn3VskrpNO60BeRyCyr8ZWw9CPZyitW4AQwmRZ8zCiyDiL+znRnWX6tDHXnWn1sJrM1+b6Mn6wEDJJ4aYQ=="
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.2.tgz",
+      "integrity": "sha512-87C3LO/NOMc+eMcpcxUBebGjkpMDkNBS9tf7KJqcDsmL936EChtVva71Dw2q4tQcuVC+hAUy4an2NO/sYXmwRA==",
+      "requires": {
+        "ws": "~8.11.0"
+      }
     },
     "socket.io-parser": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.5.tgz",
-      "integrity": "sha512-sNjbT9dX63nqUFIOv95tTVm6elyIU4RvB1m8dOeZt+IgWwcWklFDOdmGcfo3zSiRsnR/3pJkjY5lfoGqEe4Eig==",
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz",
+      "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==",
       "requires": {
-        "@types/component-emitter": "^1.2.10",
-        "component-emitter": "~1.3.0",
+        "@socket.io/component-emitter": "~3.1.0",
         "debug": "~4.3.1"
       }
     },
@@ -15689,6 +15633,12 @@
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
     },
+    "ws": {
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
+      "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
+      "requires": {}
+    },
     "xml-name-validator": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
diff --git a/tests/UI/package.json b/tests/UI/package.json
index 32c5372b609b1..69b27bd338cf3 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -112,7 +112,7 @@
     "fast-xml-parser": "^4.2.6",
     "jpeg-js": "^0.4.4",
     "js-image-generator": "^1.0.4",
-    "maildev": "^2.0.5",
+    "maildev": "^2.1.0",
     "mocha": "^10.2.0",
     "mochawesome": "^7.1.3",
     "pdfjs-dist": "^3.4.120",

From 5d0e9f77ee42afa17fc68d3533a2800720f943b5 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Mon, 24 Jul 2023 17:14:12 +0200
Subject: [PATCH 0619/1030] Fix random error in add new theme test

---
 .../01_themeAndLogo/01_themeAndLogo/01_addNewTheme.ts          | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/08_design/01_themeAndLogo/01_themeAndLogo/01_addNewTheme.ts b/tests/UI/campaigns/functional/BO/08_design/01_themeAndLogo/01_themeAndLogo/01_addNewTheme.ts
index 7d9afb64d38b5..2422b28db00b8 100644
--- a/tests/UI/campaigns/functional/BO/08_design/01_themeAndLogo/01_themeAndLogo/01_addNewTheme.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/01_themeAndLogo/01_themeAndLogo/01_addNewTheme.ts
@@ -115,9 +115,6 @@ describe('BO - Design - Theme & Logo : Add new theme', async () => {
 
       const pageTitle = await themeAndLogoPage.getPageTitle(page);
       await expect(pageTitle).to.contains(themeAndLogoPage.pageTitle);
-
-      const numThemes = await themeAndLogoPage.getNumberOfThemes(page);
-      await expect(numThemes).to.eq(2);
     });
 
     it('should remove the theme Hummingbird', async function () {

From 764cab334e0aabd1c6f47ad44934ee9fef8a8d3d Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Mon, 24 Jul 2023 20:08:15 +0200
Subject: [PATCH 0620/1030] Add some fixes

---
 .../01_themeAndLogo/01_themeAndLogo/01_addNewTheme.ts          | 3 +++
 tests/UI/pages/BO/design/themeAndLogo/themeAndLogo/import.ts   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/UI/campaigns/functional/BO/08_design/01_themeAndLogo/01_themeAndLogo/01_addNewTheme.ts b/tests/UI/campaigns/functional/BO/08_design/01_themeAndLogo/01_themeAndLogo/01_addNewTheme.ts
index 2422b28db00b8..7d9afb64d38b5 100644
--- a/tests/UI/campaigns/functional/BO/08_design/01_themeAndLogo/01_themeAndLogo/01_addNewTheme.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/01_themeAndLogo/01_themeAndLogo/01_addNewTheme.ts
@@ -115,6 +115,9 @@ describe('BO - Design - Theme & Logo : Add new theme', async () => {
 
       const pageTitle = await themeAndLogoPage.getPageTitle(page);
       await expect(pageTitle).to.contains(themeAndLogoPage.pageTitle);
+
+      const numThemes = await themeAndLogoPage.getNumberOfThemes(page);
+      await expect(numThemes).to.eq(2);
     });
 
     it('should remove the theme Hummingbird', async function () {
diff --git a/tests/UI/pages/BO/design/themeAndLogo/themeAndLogo/import.ts b/tests/UI/pages/BO/design/themeAndLogo/themeAndLogo/import.ts
index 356f74da178c8..8bc6874b3c534 100644
--- a/tests/UI/pages/BO/design/themeAndLogo/themeAndLogo/import.ts
+++ b/tests/UI/pages/BO/design/themeAndLogo/themeAndLogo/import.ts
@@ -66,7 +66,7 @@ class ImportTheme extends themeAndLogoBasePage {
    */
   async importFromWeb(page: Page, themeUrl: string): Promise<void> {
     await this.setValue(page, this.inputArchiveURL, themeUrl);
-    await page.click(this.importWebSubmit);
+    await this.clickAndWaitForURL(page, this.importWebSubmit);
   }
 
   /**

From a838d980e730aa13922985fa59050236903aada9 Mon Sep 17 00:00:00 2001
From: lartist <salim-benouamer.ext@prestashop.com>
Date: Fri, 7 Jul 2023 11:13:21 +0200
Subject: [PATCH 0621/1030] Replace shop list smarty template by twig component

---
 .../themes/new-theme/template/layout.tpl      | 10 +++-
 .../Component/Layout/shop_list.html.twig      | 56 +++++++++++++++++++
 .../views/Admin/Layout/shop_list.html.twig    | 31 ++++++++++
 .../Twig/Component/ShopList.php               | 41 ++++++++++++++
 4 files changed, 137 insertions(+), 1 deletion(-)
 create mode 100644 src/PrestaShopBundle/Resources/views/Admin/Component/Layout/shop_list.html.twig
 create mode 100644 src/PrestaShopBundle/Resources/views/Admin/Layout/shop_list.html.twig
 create mode 100644 src/PrestaShopBundle/Twig/Component/ShopList.php

diff --git a/admin-dev/themes/new-theme/template/layout.tpl b/admin-dev/themes/new-theme/template/layout.tpl
index 93e665f6d1ba8..8d36017ca54dc 100644
--- a/admin-dev/themes/new-theme/template/layout.tpl
+++ b/admin-dev/themes/new-theme/template/layout.tpl
@@ -111,7 +111,15 @@
       <div class="header-right">
         {if !isset($hideLegacyStoreContextSelector) || !$hideLegacyStoreContextSelector}
           <div class="component" id="header-shop-list-container">
-            {include file="components/layout/shop_list.tpl"}
+            {render_template
+              smarty_template="components/layout/shop_list.tpl"
+              twig_template="@PrestaShop/Admin/Layout/shop_list.html.twig"
+              base_url=$base_url
+              is_multishop= $is_multishop|default:null
+              shop_list= $shop_list|default:null
+              multishop_context= $multishop_context|default:null
+              current_shop_name= $current_shop_name|default:null
+            }
           </div>
         {/if}
         {if $show_new_orders || $show_new_customers || $show_new_messages}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/shop_list.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/shop_list.html.twig
new file mode 100644
index 0000000000000..0d4e03b35acfc
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/shop_list.html.twig
@@ -0,0 +1,56 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+{% if isMultishop
+and shopList
+and (
+  multishopContext is defined
+  and multishopContext b-and constant('Shop::CONTEXT_GROUP')
+  or multishopContext b-and constant('Shop::CONTEXT_SHOP')
+ or multishopContext b-and constant('Shop::CONTEXT_ALL')
+)%}
+<div id="shop-list" class="shop-list dropdown ps-dropdown stores">
+  <button class="btn btn-link" type="button" data-toggle="dropdown">
+      <span class="selected-item">
+        <i class="material-icons visibility">visibility</i>
+        {% if currentShopName is same as null or currentShopName == '' %}
+          {{ 'All stores'|trans({}, 'Admin.Global') }}
+        {% else %}
+          {{ currentShopName }}
+        {% endif %}
+        <i class="material-icons arrow-down">arrow_drop_down</i>
+      </span>
+  </button>
+  <div class="dropdown-menu dropdown-menu-right ps-dropdown-menu">
+    {{ shopList }}
+  </div>
+</div>
+{% else %}
+<div class="shop-list">
+  <a class="link" id="header_shopname" href="{{ baseUrl|escape('html_attr') }}" target= "_blank">
+    <i class="material-icons">visibility</i>
+    <span>{{ 'View my store'|trans({}, 'Admin.Navigation.Header') }}</span>
+  </a>
+</div>
+{% endif %}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/shop_list.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/shop_list.html.twig
new file mode 100644
index 0000000000000..4b4f49a6d6b3e
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/shop_list.html.twig
@@ -0,0 +1,31 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+{{ component('ShopList', {
+  baseUrl: base_url,
+  isMultishop: is_multishop,
+  shopList: shop_list,
+  multishopContext: multishop_context,
+  currentShopName: current_shop_name
+}) }}
diff --git a/src/PrestaShopBundle/Twig/Component/ShopList.php b/src/PrestaShopBundle/Twig/Component/ShopList.php
new file mode 100644
index 0000000000000..411375113c9f5
--- /dev/null
+++ b/src/PrestaShopBundle/Twig/Component/ShopList.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\Twig\Component;
+
+use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
+
+#[AsTwigComponent(template: '@PrestaShop/Admin/Component/Layout/shop_list.html.twig')]
+class ShopList
+{
+    public string $baseUrl;
+    public ?bool $isMultishop;
+    public ?string $shopList;
+    public ?int $multishopContext;
+    public ?string $currentShopName;
+}

From 3a7e967e20587a6aafd71bc415cca44d33d809b6 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Fri, 30 Jun 2023 09:59:49 +0200
Subject: [PATCH 0622/1030] Enable migrated Title page and Remove
 AdminGendersController

---
 controllers/admin/AdminGendersController.php  | 251 ------------------
 install-dev/data/xml/feature_flag.xml         |   1 -
 .../configure/shop_parameters/titles.yml      |  16 +-
 .../controller/AdminControllerTest.php        |   1 -
 4 files changed, 5 insertions(+), 264 deletions(-)
 delete mode 100644 controllers/admin/AdminGendersController.php

diff --git a/controllers/admin/AdminGendersController.php b/controllers/admin/AdminGendersController.php
deleted file mode 100644
index d8709f3544901..0000000000000
--- a/controllers/admin/AdminGendersController.php
+++ /dev/null
@@ -1,251 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-use PrestaShop\PrestaShop\Core\Domain\Title\ValueObject\Gender as ValueObjectGender;
-
-/**
- * @property Gender $object
- */
-class AdminGendersControllerCore extends AdminController
-{
-    /**
-     * @var int
-     */
-    public $default_image_height;
-
-    /**
-     * @var int
-     */
-    public $default_image_width;
-
-    public function __construct()
-    {
-        $this->bootstrap = true;
-        $this->table = 'gender';
-        $this->className = 'Gender';
-        $this->lang = true;
-        $this->addRowAction('edit');
-        $this->addRowAction('delete');
-
-        parent::__construct();
-
-        if (!Tools::getValue('realedit')) {
-            $this->deleted = false;
-        }
-
-        $this->bulk_actions = [
-            'delete' => [
-                'text' => $this->trans('Delete selected', [], 'Admin.Actions'),
-                'confirm' => $this->trans('Delete selected items?', [], 'Admin.Notifications.Warning'),
-                'icon' => 'icon-trash',
-            ],
-        ];
-
-        $this->default_image_height = 16;
-        $this->default_image_width = 16;
-
-        $this->fieldImageSettings = [
-            'name' => 'image',
-            'dir' => 'genders',
-        ];
-
-        $this->fields_list = [
-            'id_gender' => [
-                'title' => $this->trans('ID', [], 'Admin.Global'),
-                'align' => 'center',
-                'class' => 'fixed-width-xs',
-            ],
-            'name' => [
-                'title' => $this->trans('Social title', [], 'Admin.Shopparameters.Feature'),
-                'filter_key' => 'b!name',
-            ],
-            'type' => [
-                'title' => $this->trans('Gender', [], 'Admin.Global'),
-                'orderby' => false,
-                'type' => 'select',
-                'list' => [
-                    0 => $this->trans('Male', [], 'Admin.Shopparameters.Feature'),
-                    1 => $this->trans('Female', [], 'Admin.Shopparameters.Feature'),
-                    2 => $this->trans('Neutral', [], 'Admin.Shopparameters.Feature'),
-                ],
-                'filter_key' => 'a!type',
-                'callback' => 'displayGenderType',
-                'callback_object' => $this,
-            ],
-            'image' => [
-                'title' => $this->trans('Image', [], 'Admin.Global'),
-                'align' => 'center',
-                'image' => 'genders',
-                'orderby' => false,
-                'search' => false,
-            ],
-        ];
-    }
-
-    public function initPageHeaderToolbar()
-    {
-        if (empty($this->display)) {
-            $this->page_header_toolbar_btn['new_gender'] = [
-                'href' => self::$currentIndex . '&addgender&token=' . $this->token,
-                'desc' => $this->trans('Add new social title', [], 'Admin.Shopparameters.Feature'),
-                'icon' => 'process-icon-new',
-            ];
-        }
-
-        parent::initPageHeaderToolbar();
-    }
-
-    /**
-     * @return string|void
-     *
-     * @throws SmartyException
-     */
-    public function renderForm()
-    {
-        $this->fields_form = [
-            'legend' => [
-                'title' => $this->trans('Social titles', [], 'Admin.Shopparameters.Feature'),
-                'icon' => 'icon-male',
-            ],
-            'input' => [
-                [
-                    'type' => 'text',
-                    'label' => $this->trans('Social title', [], 'Admin.Global'),
-                    'name' => 'name',
-                    'lang' => true,
-                    'col' => 4,
-                    'hint' => $this->trans('Invalid characters:', [], 'Admin.Shopparameters.Help') . ' <>;=#{}',
-                    'required' => true,
-                ],
-                [
-                    'type' => 'radio',
-                    'label' => $this->trans('Gender', [], 'Admin.Global'),
-                    'name' => 'type',
-                    'required' => false,
-                    'class' => 't',
-                    'values' => [
-                        [
-                            'id' => 'type_male',
-                            'value' => ValueObjectGender::TYPE_MALE,
-                            'label' => $this->trans('Male', [], 'Admin.Shopparameters.Feature'),
-                        ],
-                        [
-                            'id' => 'type_female',
-                            'value' => ValueObjectGender::TYPE_FEMALE,
-                            'label' => $this->trans('Female', [], 'Admin.Shopparameters.Feature'),
-                        ],
-                        [
-                            'id' => 'type_neutral',
-                            'value' => ValueObjectGender::TYPE_OTHER,
-                            'label' => $this->trans('Neutral', [], 'Admin.Shopparameters.Feature'),
-                        ],
-                    ],
-                ],
-                [
-                    'type' => 'file',
-                    'label' => $this->trans('Image', [], 'Admin.Global'),
-                    'name' => 'image',
-                    'col' => 6,
-                    'value' => true,
-                ],
-                [
-                    'type' => 'text',
-                    'label' => $this->trans('Image width', [], 'Admin.Shopparameters.Feature'),
-                    'name' => 'img_width',
-                    'col' => 2,
-                    'hint' => $this->trans('Image width in pixels. Enter "0" to use the original size.', [], 'Admin.Shopparameters.Help'),
-                ],
-                [
-                    'type' => 'text',
-                    'label' => $this->trans('Image height', [], 'Admin.Shopparameters.Feature'),
-                    'name' => 'img_height',
-                    'col' => 2,
-                    'hint' => $this->trans('Image height in pixels. Enter "0" to use the original size.', [], 'Admin.Shopparameters.Help'),
-                ],
-            ],
-            'submit' => [
-                'title' => $this->trans('Save', [], 'Admin.Actions'),
-            ],
-        ];
-
-        /** @var Gender|false $obj */
-        $obj = $this->loadObject(true);
-        if (!$obj) {
-            return;
-        }
-
-        $this->fields_value = [
-            'img_width' => $this->default_image_width,
-            'img_height' => $this->default_image_height,
-            'image' => $obj->getImage(),
-        ];
-
-        return parent::renderForm();
-    }
-
-    public function displayGenderType($value, $tr)
-    {
-        return $this->fields_list['type']['list'][$value];
-    }
-
-    protected function postImage($id)
-    {
-        if (isset($this->fieldImageSettings['name'], $this->fieldImageSettings['dir'])) {
-            if (!Validate::isInt(Tools::getValue('img_width')) || !Validate::isInt(Tools::getValue('img_height'))) {
-                $this->errors[] = $this->trans('Width and height must be numeric values.', [], 'Admin.Shopparameters.Notification');
-            } else {
-                if ((int) Tools::getValue('img_width') > 0 && (int) Tools::getValue('img_height') > 0) {
-                    $width = (int) Tools::getValue('img_width');
-                    $height = (int) Tools::getValue('img_height');
-                } else {
-                    $width = null;
-                    $height = null;
-                }
-
-                return $this->uploadImage($id, $this->fieldImageSettings['name'], $this->fieldImageSettings['dir'] . '/', false, $width, $height);
-            }
-        }
-
-        return !count($this->errors);
-    }
-
-    protected function afterImageUpload()
-    {
-        parent::afterImageUpload();
-
-        if (($id_gender = (int) Tools::getValue('id_gender'))
-            && count($_FILES)
-            && file_exists(_PS_GENDERS_DIR_ . $id_gender . '.jpg')) {
-            $current_file = _PS_TMP_IMG_DIR_ . 'gender_mini_' . $id_gender . '_' . $this->context->shop->id . '.jpg';
-
-            if (file_exists($current_file)) {
-                unlink($current_file);
-            }
-        }
-
-        return true;
-    }
-}
diff --git a/install-dev/data/xml/feature_flag.xml b/install-dev/data/xml/feature_flag.xml
index 22287d24c5b31..398d7d785f553 100644
--- a/install-dev/data/xml/feature_flag.xml
+++ b/install-dev/data/xml/feature_flag.xml
@@ -20,7 +20,6 @@
     <feature_flag id="country" name="country" type="env,dotenv,db" label_wording="Countries" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated countries page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
     <feature_flag id="state" name="state" type="env,dotenv,db" label_wording="States" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated states page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
     <feature_flag id="carrier" name="carrier" type="env,dotenv,db" label_wording="Carriers" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated carriers page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
-    <feature_flag id="title" name="title" type="env,dotenv,db" label_wording="Titles" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated titles page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
     <feature_flag id="permission" name="permission" type="env,dotenv,db" label_wording="Permissions" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated permissions page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
     <feature_flag id="tax_rules_group" name="tax_rules_group" type="env,dotenv,db" label_wording="Tax rule groups" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated tax rules page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
     <feature_flag id="customer_threads" name="customer_threads" type="env,dotenv,db" label_wording="Customer threads" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated customer threads page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/configure/shop_parameters/titles.yml b/src/PrestaShopBundle/Resources/config/routing/admin/configure/shop_parameters/titles.yml
index 8b72c9e477c85..bb92b71a3a0c0 100644
--- a/src/PrestaShopBundle/Resources/config/routing/admin/configure/shop_parameters/titles.yml
+++ b/src/PrestaShopBundle/Resources/config/routing/admin/configure/shop_parameters/titles.yml
@@ -2,10 +2,9 @@ admin_title_index:
   path: /
   methods: [ GET ]
   defaults:
-    _controller: 'PrestaShopBundle\Controller\Admin\Configure\ShopParameters\TitleController::indexAction'
+    _controller: PrestaShopBundle\Controller\Admin\Configure\ShopParameters\TitleController::indexAction
     _legacy_controller: AdminGenders
     _legacy_link: AdminGenders
-    _legacy_feature_flag: title
 
 admin_title_search:
   path: /
@@ -16,25 +15,22 @@ admin_title_search:
     redirectRoute: admin_title_index
     _legacy_controller: AdminGenders
     _legacy_link: AdminGenders:submitFiltergenders
-    _legacy_feature_flag: title
 
 admin_title_create:
   path: /new
   methods: [ GET, POST ]
   defaults:
-    _controller: 'PrestaShopBundle\Controller\Admin\Configure\ShopParameters\TitleController::createAction'
+    _controller: PrestaShopBundle\Controller\Admin\Configure\ShopParameters\TitleController::createAction
     _legacy_controller: AdminGenders
     _legacy_link: AdminGenders:addgender
-    _legacy_feature_flag: title
 
 admin_title_edit:
   path: /{titleId}/edit
   methods: [ GET, POST ]
   defaults:
-    _controller: 'PrestaShopBundle\Controller\Admin\Configure\ShopParameters\TitleController::editAction'
+    _controller: PrestaShopBundle\Controller\Admin\Configure\ShopParameters\TitleController::editAction
     _legacy_controller: AdminGenders
     _legacy_link: AdminGenders:updategender
-    _legacy_feature_flag: title
   requirements:
     titleId: \d+
 
@@ -42,10 +38,9 @@ admin_title_delete:
   path: /{titleId}/delete
   methods: [ POST, DELETE ]
   defaults:
-    _controller: 'PrestaShopBundle\Controller\Admin\Configure\ShopParameters\TitleController::deleteAction'
+    _controller: PrestaShopBundle\Controller\Admin\Configure\ShopParameters\TitleController::deleteAction
     _legacy_controller: AdminGenders
     _legacy_link: AdminGenders:deletegender
-    _legacy_feature_flag: title
   requirements:
     titleId: \d+
 
@@ -53,7 +48,6 @@ admin_title_bulk_delete:
   path: /bulk-delete
   methods: [ POST ]
   defaults:
-    _controller: 'PrestaShopBundle\Controller\Admin\Configure\ShopParameters\TitleController::bulkDeleteAction'
+    _controller: PrestaShopBundle\Controller\Admin\Configure\ShopParameters\TitleController::bulkDeleteAction
     _legacy_controller: AdminGenders
     _legacy_link: AdminGenders:submitBulkdeletegender
-    _legacy_feature_flag: title
diff --git a/tests/Integration/Classes/controller/AdminControllerTest.php b/tests/Integration/Classes/controller/AdminControllerTest.php
index 2d4a9d7edaf0a..187a02f0ea3cd 100644
--- a/tests/Integration/Classes/controller/AdminControllerTest.php
+++ b/tests/Integration/Classes/controller/AdminControllerTest.php
@@ -162,7 +162,6 @@ public function getControllersClasses(): array
             ['AdminAttributesGroupsController'],
             ['AdminNotFoundController'],
             ['AdminFeaturesController'],
-            ['AdminGendersController'],
             ['AdminTagsController'],
             ['AdminShopController'],
             ['AdminCartRulesController'],

From 2f4921b184a1c8c05489ddedf79ae85bc77cbf13 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Fri, 30 Jun 2023 14:50:14 +0200
Subject: [PATCH 0623/1030] Titles : Updated UI Tests

---
 .../03_titles/01_filterTitles.ts              |  4 +-
 .../03_titles/02_CRUDTitles.ts                | 12 +--
 .../03_titles/03_bulkDeleteTitles.ts          |  4 +-
 .../customerSettings/titles/add.ts            | 49 ++++++-----
 .../customerSettings/titles/index.ts          | 87 +++++++++----------
 5 files changed, 75 insertions(+), 81 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/03_titles/01_filterTitles.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/03_titles/01_filterTitles.ts
index cb2a4c667fd49..073e929ad664e 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/03_titles/01_filterTitles.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/03_titles/01_filterTitles.ts
@@ -76,12 +76,12 @@ describe('BO _ Shop Parameters - Customer Settings : Filter titles by id, name a
       },
       {
         args: {
-          testIdentifier: 'filterName', filterType: 'input', filterBy: 'b!name', filterValue: Titles.Mrs.name,
+          testIdentifier: 'filterName', filterType: 'input', filterBy: 'name', filterValue: Titles.Mrs.name,
         },
       },
       {
         args: {
-          testIdentifier: 'filterGender', filterType: 'select', filterBy: 'a!type', filterValue: Titles.Mrs.gender,
+          testIdentifier: 'filterGender', filterType: 'select', filterBy: 'type', filterValue: Titles.Mrs.gender,
         },
       },
     ];
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/03_titles/02_CRUDTitles.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/03_titles/02_CRUDTitles.ts
index c7b79a03ee9cc..ea261abffcd39 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/03_titles/02_CRUDTitles.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/03_titles/02_CRUDTitles.ts
@@ -90,7 +90,7 @@ describe('BO - Shop Parameters - Customer Settings : Create, update and delete t
       await titlesPage.goToAddNewTitle(page);
 
       const pageTitle = await addTitlePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addTitlePage.pageTitleCreate);
+      await expect(pageTitle).to.eq(addTitlePage.pageTitleCreate);
     });
 
     it('should create title and check result', async function () {
@@ -109,9 +109,9 @@ describe('BO - Shop Parameters - Customer Settings : Create, update and delete t
       await testContext.addContextItem(this, 'testIdentifier', 'filterForUpdate', baseContext);
 
       await titlesPage.resetFilter(page);
-      await titlesPage.filterTitles(page, 'input', 'b!name', createTitleData.name);
+      await titlesPage.filterTitles(page, 'input', 'name', createTitleData.name);
 
-      const textEmail = await titlesPage.getTextColumn(page, 1, 'b!name');
+      const textEmail = await titlesPage.getTextColumn(page, 1, 'name');
       await expect(textEmail).to.contains(createTitleData.name);
     });
 
@@ -121,7 +121,7 @@ describe('BO - Shop Parameters - Customer Settings : Create, update and delete t
       await titlesPage.gotoEditTitlePage(page, 1);
 
       const pageTitle = await addTitlePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addTitlePage.pageTitleEdit);
+      await expect(pageTitle).to.contains(addTitlePage.pageTitleEdit(createTitleData.name));
     });
 
     it('should update title', async function () {
@@ -140,9 +140,9 @@ describe('BO - Shop Parameters - Customer Settings : Create, update and delete t
       await testContext.addContextItem(this, 'testIdentifier', 'filterForDelete', baseContext);
 
       await titlesPage.resetFilter(page);
-      await titlesPage.filterTitles(page, 'input', 'b!name', editTitleData.name);
+      await titlesPage.filterTitles(page, 'input', 'name', editTitleData.name);
 
-      const textEmail = await titlesPage.getTextColumn(page, 1, 'b!name');
+      const textEmail = await titlesPage.getTextColumn(page, 1, 'name');
       await expect(textEmail).to.contains(editTitleData.name);
     });
 
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/03_titles/03_bulkDeleteTitles.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/03_titles/03_bulkDeleteTitles.ts
index dbfb9ceee5976..355790c43ef9e 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/03_titles/03_bulkDeleteTitles.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/03_titles/03_bulkDeleteTitles.ts
@@ -106,13 +106,13 @@ describe('BO - Shop Parameters - Customer Settings : Bulk delete titles', async
     it('should filter list by title', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'filterForBulkDelete', baseContext);
 
-      await titlesPage.filterTitles(page, 'input', 'b!name', 'todelete');
+      await titlesPage.filterTitles(page, 'input', 'name', 'todelete');
 
       const numberOfTitlesAfterFilter = await titlesPage.getNumberOfElementInGrid(page);
       await expect(numberOfTitlesAfterFilter).to.be.at.most(numberOfTitles);
 
       for (let i = 1; i <= numberOfTitlesAfterFilter; i++) {
-        const textColumn = await titlesPage.getTextColumn(page, i, 'b!name');
+        const textColumn = await titlesPage.getTextColumn(page, i, 'name');
         await expect(textColumn).to.contains('todelete');
       }
     });
diff --git a/tests/UI/pages/BO/shopParameters/customerSettings/titles/add.ts b/tests/UI/pages/BO/shopParameters/customerSettings/titles/add.ts
index 2842e5a364987..023367ddbb732 100644
--- a/tests/UI/pages/BO/shopParameters/customerSettings/titles/add.ts
+++ b/tests/UI/pages/BO/shopParameters/customerSettings/titles/add.ts
@@ -14,13 +14,13 @@ import type {Page} from 'playwright';
 class AddTitle extends BOBasePage {
   public readonly pageTitleCreate: string;
 
-  public readonly pageTitleEdit: string;
+  public readonly pageTitleEdit: (titleName: string) => string;
 
   private readonly genderForm: string;
 
   private readonly nameInput: (idLang: number) => string;
 
-  private readonly genderInput: (type: string) => string;
+  private readonly genderInput: (type: number) => string;
 
   private readonly imageInput: string;
 
@@ -34,7 +34,7 @@ class AddTitle extends BOBasePage {
 
   private readonly dropdownMenu: string;
 
-  private readonly dropdownMenuItemLink: (idLang: number) => string;
+  private readonly dropdownMenuItemLink: (lang: string) => string;
 
   /**
    * @constructs
@@ -43,23 +43,22 @@ class AddTitle extends BOBasePage {
   constructor() {
     super();
 
-    this.pageTitleCreate = 'Titles > Add new •';
-    this.pageTitleEdit = 'Titles > Edit:';
+    this.pageTitleCreate = `Titles • ${global.INSTALL.SHOP_NAME}`;
+    this.pageTitleEdit = (titleName: string) => `Edit: ${titleName} • ${global.INSTALL.SHOP_NAME}`;
 
     // Form selectors
-    this.genderForm = '#gender_form';
-    this.nameInput = (idLang: number) => `#name_${idLang}`;
-    this.genderInput = (type: string) => `#type_${type}`;
-    this.imageInput = '#image-name';
-    this.imageWidthInput = '#img_width';
-    this.imageHeightInput = '#img_height';
-    this.saveButton = '#gender_form_submit_btn';
-    this.alertSuccessBlockParagraph = '.alert-success';
+    this.genderForm = 'form[name="title"]';
+    this.nameInput = (idLang: number) => `#title_name_${idLang}`;
+    this.genderInput = (type: number) => `#title_gender_type_${type}`;
+    this.imageInput = '#title_image';
+    this.imageWidthInput = '#title_img_width';
+    this.imageHeightInput = '#title_img_height';
+    this.saveButton = `${this.genderForm} #save-button`;
 
     // Language selectors
-    this.dropdownButton = `${this.genderForm} button.dropdown-toggle`;
-    this.dropdownMenu = `${this.genderForm} ul.dropdown-menu`;
-    this.dropdownMenuItemLink = (idLang: number) => `${this.dropdownMenu} li:nth-child(${idLang}) a`;
+    this.dropdownButton = `${this.genderForm} button.dropdown-toggle.js-locale-btn`;
+    this.dropdownMenu = `${this.genderForm} div.dropdown-menu`;
+    this.dropdownMenuItemLink = (lang: string) => `${this.dropdownMenu} span.dropdown-item[data-locale="${lang}"]`;
   }
 
   /*
@@ -69,18 +68,18 @@ class AddTitle extends BOBasePage {
   /**
    * Change language in form
    * @param page {Page} Browser tab
-   * @param idLang {number} Id language to select
+   * @param lang {string} Language to select
    * @return {Promise<void>}
    */
-  async changeLanguage(page: Page, idLang: number): Promise<void> {
+  async changeLanguage(page: Page, lang: string): Promise<void> {
     await Promise.all([
       page.click(this.dropdownButton),
-      this.waitForVisibleSelector(page, this.dropdownMenuItemLink(idLang)),
+      this.waitForVisibleSelector(page, this.dropdownMenuItemLink(lang)),
     ]);
 
     await Promise.all([
-      page.click(this.dropdownMenuItemLink(idLang)),
-      this.waitForHiddenSelector(page, this.dropdownMenuItemLink(idLang)),
+      page.click(this.dropdownMenuItemLink(lang)),
+      this.waitForHiddenSelector(page, this.dropdownMenuItemLink(lang)),
     ]);
   }
 
@@ -91,13 +90,15 @@ class AddTitle extends BOBasePage {
    * @return {Promise<string>}
    */
   async createEditTitle(page: Page, titleData: TitleData): Promise<string> {
-    await this.changeLanguage(page, 1);
+    const genders: string[] = ['Male', 'Female', 'Neutral'];
+
+    await this.changeLanguage(page, 'en');
     await this.setValue(page, this.nameInput(1), titleData.name);
 
-    await this.changeLanguage(page, 2);
+    await this.changeLanguage(page, 'fr');
     await this.setValue(page, this.nameInput(2), titleData.frName);
 
-    await page.click(this.genderInput(titleData.gender.toLowerCase()));
+    await page.click(this.genderInput(genders.indexOf(titleData.gender)));
 
     // Upload image
     await this.uploadFile(page, this.imageInput, titleData.imageName);
diff --git a/tests/UI/pages/BO/shopParameters/customerSettings/titles/index.ts b/tests/UI/pages/BO/shopParameters/customerSettings/titles/index.ts
index 14c79e754b3a2..fafdcd9978eb0 100644
--- a/tests/UI/pages/BO/shopParameters/customerSettings/titles/index.ts
+++ b/tests/UI/pages/BO/shopParameters/customerSettings/titles/index.ts
@@ -20,8 +20,14 @@ class Titles extends BOBasePage {
 
   private readonly gridTable: string;
 
+  private readonly gridPanel: string;
+
+  private readonly gridTitle: string;
+
   private readonly filterRow: string;
 
+  private readonly filterSelectAll: string;
+
   private readonly filterColumn: (filterBy: string) => string;
 
   private readonly filterSearchButton: string;
@@ -54,15 +60,9 @@ class Titles extends BOBasePage {
 
   private readonly deleteModalButtonYes: string;
 
-  private readonly bulkActionBlock: string;
-
-  private readonly bulkActionMenuButton: string;
+  private readonly bulkActionsToggleButton: string;
 
-  private readonly bulkActionDropdownMenu: string;
-
-  private readonly selectAllLink: string;
-
-  private readonly bulkDeleteLink: string;
+  private readonly deleteSelectionButton: string;
 
   /**
    * @constructs
@@ -72,11 +72,11 @@ class Titles extends BOBasePage {
     super();
 
     this.pageTitle = 'Titles •';
-
-    this.alertSuccessBlockParagraph = '.alert-success';
+    this.successfulUpdateMessage = 'Update successful';
+    this.successfulMultiDeleteMessage = 'Successful deletion';
 
     // Header selectors
-    this.newTitleLink = 'a[data-role=page-header-desc-gender-link]';
+    this.newTitleLink = '#page-header-desc-configuration-add[title=\'Add new title\']';
 
     // Form selectors
     this.gridForm = '#form-gender';
@@ -84,13 +84,16 @@ class Titles extends BOBasePage {
     this.gridTableNumberOfTitlesSpan = `${this.gridTableHeaderTitle} span.badge`;
 
     // Table selectors
-    this.gridTable = '#table-gender';
+    this.gridTable = '#title_grid';
+    this.gridPanel = '#title_grid_panel';
+    this.gridTitle = `${this.gridPanel} h3.card-header-title`;
 
     // Filter selectors
-    this.filterRow = `${this.gridTable} tr.filter`;
-    this.filterColumn = (filterBy: string) => `${this.filterRow} [name='genderFilter_${filterBy}']`;
-    this.filterSearchButton = '#submitFilterButtongender';
-    this.filterResetButton = 'button[name=\'submitResetgender\']';
+    this.filterRow = `${this.gridTable} tr.column-filters`;
+    this.filterSelectAll = `${this.filterRow} td[data-column-id="title_bulk"] .md-checkbox label`;
+    this.filterColumn = (filterBy: string) => `${this.filterRow} [name='title[${filterBy}]']`;
+    this.filterSearchButton = `${this.filterRow} button[name='title[actions][search]']`;
+    this.filterResetButton = `${this.filterRow} button[name='title[actions][reset]']`;
 
     // Table body selectors
     this.tableBody = `${this.gridTable} tbody`;
@@ -105,20 +108,17 @@ class Titles extends BOBasePage {
 
     // Row actions selectors
     this.tableColumnActions = (row:number) => `${this.tableBodyColumn(row)} .btn-group-action`;
-    this.tableColumnActionsEditLink = (row:number) => `${this.tableColumnActions(row)} a.edit`;
-    this.tableColumnActionsToggleButton = (row:number) => `${this.tableColumnActions(row)} button.dropdown-toggle`;
+    this.tableColumnActionsEditLink = (row:number) => `${this.tableColumnActions(row)} a.grid-edit-row-link`;
+    this.tableColumnActionsToggleButton = (row:number) => `${this.tableColumnActions(row)} a.dropdown-toggle`;
     this.tableColumnActionsDropdownMenu = (row:number) => `${this.tableColumnActions(row)} .dropdown-menu`;
-    this.tableColumnActionsDeleteLink = (row:number) => `${this.tableColumnActionsDropdownMenu(row)} a.delete`;
+    this.tableColumnActionsDeleteLink = (row:number) => `${this.tableColumnActionsDropdownMenu(row)} a.grid-delete-row-link`;
 
     // Confirmation modal
-    this.deleteModalButtonYes = '#popup_ok';
+    this.deleteModalButtonYes = '#title-grid-confirm-modal button.btn-confirm-submit';
 
     // Bulk actions selectors
-    this.bulkActionBlock = 'div.bulk-actions';
-    this.bulkActionMenuButton = '#bulk_action_menu_gender';
-    this.bulkActionDropdownMenu = `${this.bulkActionBlock} ul.dropdown-menu`;
-    this.selectAllLink = `${this.bulkActionDropdownMenu} li:nth-child(1)`;
-    this.bulkDeleteLink = `${this.bulkActionDropdownMenu} li:nth-child(4)`;
+    this.bulkActionsToggleButton = `${this.gridPanel} button.js-bulk-actions-btn`;
+    this.deleteSelectionButton = `${this.gridPanel} #title_grid_bulk_action_delete_selection`;
   }
 
   /* Header methods */
@@ -152,10 +152,8 @@ class Titles extends BOBasePage {
         break;
 
       case 'select':
-        await Promise.all([
-          page.waitForURL((url: URL): boolean => url.toString() !== currentUrl, {waitUntil: 'networkidle'}),
-          this.selectByVisibleText(page, this.filterColumn(filterBy), value),
-        ]);
+        await this.selectByVisibleText(page, this.filterColumn(filterBy), value);
+        await this.clickAndWaitForURL(page, this.filterSearchButton);
         break;
 
       default:
@@ -180,8 +178,8 @@ class Titles extends BOBasePage {
    * @param page {Page} Browser tab
    * @return {Promise<number>}
    */
-  getNumberOfElementInGrid(page: Page): Promise<number> {
-    return this.getNumberFromText(page, this.gridTableNumberOfTitlesSpan);
+  async getNumberOfElementInGrid(page: Page): Promise<number> {
+    return this.getNumberFromText(page, this.gridTitle);
   }
 
   /**
@@ -211,11 +209,11 @@ class Titles extends BOBasePage {
         columnSelector = this.tableColumnId(row);
         break;
 
-      case 'b!name':
+      case 'name':
         columnSelector = this.tableColumnTitle(row);
         break;
 
-      case 'a!type':
+      case 'type':
         columnSelector = this.tableColumnGender(row);
         break;
 
@@ -265,27 +263,22 @@ class Titles extends BOBasePage {
    * @return {Promise<string>}
    */
   async bulkDeleteTitles(page: Page): Promise<string> {
-    // To confirm bulk delete action with dialog
-    await this.dialogListener(page, true);
-
     // Select all rows
-    await Promise.all([
-      page.click(this.bulkActionMenuButton),
-      this.waitForVisibleSelector(page, this.selectAllLink),
-    ]);
+    await page.$eval(this.filterSelectAll, (el: HTMLElement) => el.click());
+    await this.waitForVisibleSelector(page, this.bulkActionsToggleButton);
 
+    // Click on Button Bulk actions
     await Promise.all([
-      page.click(this.selectAllLink),
-      this.waitForHiddenSelector(page, this.selectAllLink),
+      page.click(this.bulkActionsToggleButton),
+      this.waitForVisibleSelector(page, `${this.bulkActionsToggleButton}[aria-expanded='true']`),
     ]);
 
-    // Perform delete
+    // Click on delete and wait for modal
     await Promise.all([
-      page.click(this.bulkActionMenuButton),
-      this.waitForVisibleSelector(page, this.bulkDeleteLink),
+      page.click(this.deleteSelectionButton),
+      this.waitForVisibleSelector(page, this.deleteModalButtonYes),
     ]);
-
-    await this.clickAndWaitForURL(page, this.bulkDeleteLink);
+    await this.clickAndWaitForURL(page, this.deleteModalButtonYes);
 
     // Return successful message
     return this.getAlertSuccessBlockParagraphContent(page);

From b4dba2a7b9807a7a9c0848d85d6660226fd444bd Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Tue, 25 Jul 2023 14:14:21 +0200
Subject: [PATCH 0624/1030] Functional Tests : BO - Advanced Parameter -
 Authorization Server - View detail

---
 .../12_authorizationServer/02_viewDetail.ts   | 137 ++++++++++++++++++
 .../authorizationServer/index.ts              |  19 +++
 .../authorizationServer/view.ts               |  55 +++++++
 3 files changed, 211 insertions(+)
 create mode 100644 tests/UI/campaigns/functional/BO/14_advancedParameters/12_authorizationServer/02_viewDetail.ts
 create mode 100644 tests/UI/pages/BO/advancedParameters/authorizationServer/view.ts

diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/12_authorizationServer/02_viewDetail.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/12_authorizationServer/02_viewDetail.ts
new file mode 100644
index 0000000000000..57810a135c939
--- /dev/null
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/12_authorizationServer/02_viewDetail.ts
@@ -0,0 +1,137 @@
+// Import utils
+import helper from '@utils/helpers';
+import testContext from '@utils/testContext';
+
+// Import commonTests
+import loginCommon from '@commonTests/BO/loginBO';
+import {setFeatureFlag} from '@commonTests/BO/advancedParameters/newFeatures';
+
+// Import pages
+import authorizationServerPage from '@pages/BO/advancedParameters/authorizationServer';
+import addNewAuthorizedAppPage from '@pages/BO/advancedParameters/authorizationServer/add';
+import viewAuthorizedAppPage from '@pages/BO/advancedParameters/authorizationServer/view';
+import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
+import dashboardPage from '@pages/BO/dashboard';
+
+// Import data
+import AuthorizedApplicationData from '@data/faker/authorizedApplication';
+
+import {expect} from 'chai';
+import type {BrowserContext, Page} from 'playwright';
+
+const baseContext: string = 'functional_BO_advancedParameters_authorizationServer_viewDetail';
+
+describe('BO - Advanced Parameter - Authorization Server : View detail', async () => {
+  let browserContext: BrowserContext;
+  let page: Page;
+
+  const application: AuthorizedApplicationData = new AuthorizedApplicationData({
+    appName: 'Application XYZ',
+    description: 'Description ABC',
+  });
+
+  // Pre-condition: Enable experimental feature : Authorization server
+  setFeatureFlag(featureFlagPage.featureFlagAuthorizationServer, true, `${baseContext}_enableAuthorizationServer`);
+
+  // before and after functions
+  before(async function () {
+    browserContext = await helper.createBrowserContext(this.browser);
+    page = await helper.newTab(browserContext);
+  });
+
+  after(async () => {
+    await helper.closeBrowserContext(browserContext);
+  });
+
+  describe('BO - Advanced Parameter - Authorization Server : CRUD', async () => {
+    it('should login in BO', async function () {
+      await loginCommon.loginBO(this, page);
+    });
+
+    describe('Create an application', async () => {
+      it('should go to \'Advanced Parameters > Authorization Server\' page', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'goToAuthorizationServerPage', baseContext);
+
+        await dashboardPage.goToSubMenu(
+          page,
+          dashboardPage.advancedParametersLink,
+          dashboardPage.authorizationServerLink,
+        );
+
+        const pageTitle = await authorizationServerPage.getPageTitle(page);
+        await expect(pageTitle).to.eq(authorizationServerPage.pageTitle);
+      });
+
+      it('should check that no records found', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'checkThatNoRecordFound', baseContext);
+
+        const noRecordsFoundText = await authorizationServerPage.getTextForEmptyTable(page);
+        await expect(noRecordsFoundText).to.contains('warning No records found');
+      });
+
+      it('should go to add New Authorized App page', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'goToNewAuthorizedAppPage', baseContext);
+
+        await authorizationServerPage.goToNewAuthorizedAppPage(page);
+
+        const pageTitle = await addNewAuthorizedAppPage.getPageTitle(page);
+        await expect(pageTitle).to.eq(addNewAuthorizedAppPage.pageTitleCreate);
+      });
+
+      it('should create authorized app', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'createAuthorizedApp', baseContext);
+
+        const textResult = await addNewAuthorizedAppPage.addAuthorizedApplication(page, application);
+        await expect(textResult).to.equal(addNewAuthorizedAppPage.successfulCreationMessage);
+
+        const numElements = await authorizationServerPage.getNumberOfElementInGrid(page);
+        await expect(numElements).to.equal(1);
+      });
+    });
+
+    describe('View the application', async () => {
+      it('should go to the details page', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'goToDetailsPage', baseContext);
+
+        await authorizationServerPage.goToViewAuthorizedAppPage(page, 1);
+
+        const pageTitle = await viewAuthorizedAppPage.getPageTitle(page);
+        await expect(pageTitle).to.eq(viewAuthorizedAppPage.pageTitle(application.appName));
+      });
+      it('should check details', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'checkDetailsInformations', baseContext);
+
+        const appInformation = await viewAuthorizedAppPage.getAppInformation(page);
+        await expect(appInformation.appName).to.eq(application.appName);
+        await expect(appInformation.description).to.eq(application.description);
+      });
+    });
+
+    describe('Delete the application', async () => {
+      it('should go to \'Advanced Parameters > Authorization Server\' page', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'returnToAuthorizationServerPage', baseContext);
+
+        await dashboardPage.goToSubMenu(
+          page,
+          dashboardPage.advancedParametersLink,
+          dashboardPage.authorizationServerLink,
+        );
+
+        const pageTitle = await authorizationServerPage.getPageTitle(page);
+        await expect(pageTitle).to.eq(authorizationServerPage.pageTitle);
+      });
+      it('should delete authorized app', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'deleteAuthorizedApp', baseContext);
+
+        const textResult = await authorizationServerPage.deleteAuthorizationApplication(page, 1);
+        await expect(textResult).to.equal(addNewAuthorizedAppPage.successfulDeleteMessage);
+
+        const numElements = await authorizationServerPage.getNumberOfElementInGrid(page);
+        await expect(numElements).to.equal(0);
+      });
+    });
+  });
+
+  // Post-condition: Disable experimental feature : Authorization server
+  setFeatureFlag(featureFlagPage.featureFlagAuthorizationServer, false, `${baseContext}_disableAuthorizationServer`);
+});
diff --git a/tests/UI/pages/BO/advancedParameters/authorizationServer/index.ts b/tests/UI/pages/BO/advancedParameters/authorizationServer/index.ts
index 11c8291c4ea7c..bbbf24d523f0a 100644
--- a/tests/UI/pages/BO/advancedParameters/authorizationServer/index.ts
+++ b/tests/UI/pages/BO/advancedParameters/authorizationServer/index.ts
@@ -32,6 +32,8 @@ class AuthorizationServer extends BOBasePage {
 
   private readonly gridTableToggleDropDown: (row: number) => string;
 
+  private readonly gridTableViewLink: (row: number) => string;
+
   private readonly gridTableDeleteLink: (row: number) => string;
 
   private readonly gridTableEditLink: (row: number) => string;
@@ -68,6 +70,7 @@ class AuthorizationServer extends BOBasePage {
     this.gridTableColumnAction = (row: number) => this.gridTableColumn(row, 'actions');
     this.gridTableToggleDropDown = (row: number) => `${this.gridTableColumnAction(row)
     } a[data-toggle='dropdown']`;
+    this.gridTableViewLink = (row: number) => `${this.gridTableColumnAction(row)} a.grid-view-row-link`;
     this.gridTableDeleteLink = (row: number) => `${this.gridTableColumnAction(row)} a.grid-delete-row-link`;
     this.gridTableEditLink = (row: number) => `${this.gridTableColumnAction(row)} a.grid-edit-row-link`;
 
@@ -99,6 +102,22 @@ class AuthorizationServer extends BOBasePage {
     await this.clickAndWaitForURL(page, this.gridTableEditLink(row));
   }
 
+  /**
+   * Go to view Authorized App page
+   * @param page {Page} Browser tab
+   * @param row {number} Row on table
+   * @returns {Promise<void>}
+   */
+  async goToViewAuthorizedAppPage(page: Page, row: number): Promise<void> {
+    // Click on dropDown
+    await Promise.all([
+      page.click(this.gridTableToggleDropDown(row)),
+      this.waitForVisibleSelector(page, `${this.gridTableToggleDropDown(row)}[aria-expanded='true']`),
+    ]);
+    // Click on delete
+    return this.clickAndWaitForURL(page, this.gridTableViewLink(row));
+  }
+
   /* Grid methods */
   /**
    * Get text for empty table
diff --git a/tests/UI/pages/BO/advancedParameters/authorizationServer/view.ts b/tests/UI/pages/BO/advancedParameters/authorizationServer/view.ts
new file mode 100644
index 0000000000000..24f55ce3a0210
--- /dev/null
+++ b/tests/UI/pages/BO/advancedParameters/authorizationServer/view.ts
@@ -0,0 +1,55 @@
+// Import pages
+import BOBasePage from '@pages/BO/BObasePage';
+
+// Import data
+import AuthorizedApplicationData from '@data/faker/authorizedApplication';
+
+import type {Page} from 'playwright';
+
+/**
+ * New authorized application page, contains functions that can be used on the page
+ * @class
+ * @extends BOBasePage
+ */
+class ViewAuthorizedApp extends BOBasePage {
+  public readonly pageTitle: (appName: string) => string;
+
+  private readonly appInformationCard: string;
+
+  private readonly appInformationCardAppName: string;
+
+  private readonly appInformationCardDescription: string;
+
+  /**
+   * @constructs
+   * Setting up texts and selectors to use on Performance page
+   */
+  constructor() {
+    super();
+
+    this.pageTitle = (appName: string) => `${appName} • ${global.INSTALL.SHOP_NAME}`;
+
+    // Selectors
+    this.appInformationCard = 'div.view-authorized-application-card div.card-body ';
+    this.appInformationCardAppName = `${this.appInformationCard} div:nth-child(1) div.col-8`;
+    this.appInformationCardDescription = `${this.appInformationCard} div:nth-child(2) div.col-8`;
+  }
+
+  /*
+  Methods
+   */
+
+  /**
+   * Returns application informations
+   * @param page {Page}
+   * @returns Promise<AuthorizedApplicationData>
+   */
+  async getAppInformation(page: Page): Promise<AuthorizedApplicationData> {
+    return new AuthorizedApplicationData({
+      appName: await this.getTextContent(page, this.appInformationCardAppName),
+      description: await this.getTextContent(page, this.appInformationCardDescription),
+    });
+  }
+}
+
+export default new ViewAuthorizedApp();

From 4338f2a1916878a29ae0e5706569b0f1dd2624e8 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Tue, 25 Jul 2023 10:19:43 +0200
Subject: [PATCH 0625/1030] Fix random error in CI

---
 .../06_deleteProductsWithBulkActions.ts       | 30 +++++++++----------
 tests/UI/pages/BO/catalog/productsV2/index.ts | 17 ++++++-----
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/tests/UI/campaigns/sanity/03_productsBO/06_deleteProductsWithBulkActions.ts b/tests/UI/campaigns/sanity/03_productsBO/06_deleteProductsWithBulkActions.ts
index ec0a8d6262200..7d5bdc62e2346 100644
--- a/tests/UI/campaigns/sanity/03_productsBO/06_deleteProductsWithBulkActions.ts
+++ b/tests/UI/campaigns/sanity/03_productsBO/06_deleteProductsWithBulkActions.ts
@@ -67,7 +67,7 @@ describe('BO - Catalog - Products : Delete products with bulk actions', async ()
 
       await productsPage.closeSfToolBar(page);
 
-      const pageTitle: string = await productsPage.getPageTitle(page);
+      const pageTitle = await productsPage.getPageTitle(page);
       await expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
@@ -81,7 +81,7 @@ describe('BO - Catalog - Products : Delete products with bulk actions', async ()
     it('should click on \'New product\' button and check new product modal', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnNewProductButton', baseContext);
 
-      const isModalVisible: boolean = await productsPage.clickOnNewProductButton(page);
+      const isModalVisible = await productsPage.clickOnNewProductButton(page);
       await expect(isModalVisible).to.be.true;
     });
 
@@ -90,7 +90,7 @@ describe('BO - Catalog - Products : Delete products with bulk actions', async ()
 
       await productsPage.selectProductType(page, firstProductData.type);
 
-      const pageTitle: string = await createProductsPage.getPageTitle(page);
+      const pageTitle = await createProductsPage.getPageTitle(page);
       await expect(pageTitle).to.contains(createProductsPage.pageTitle);
     });
 
@@ -99,7 +99,7 @@ describe('BO - Catalog - Products : Delete products with bulk actions', async ()
 
       await productsPage.clickOnAddNewProduct(page);
 
-      const pageTitle: string = await createProductsPage.getPageTitle(page);
+      const pageTitle = await createProductsPage.getPageTitle(page);
       await expect(pageTitle).to.contains(createProductsPage.pageTitle);
     });
 
@@ -108,7 +108,7 @@ describe('BO - Catalog - Products : Delete products with bulk actions', async ()
 
       await createProductsPage.closeSfToolBar(page);
 
-      const createProductMessage: string = await createProductsPage.setProduct(page, firstProductData);
+      const createProductMessage = await createProductsPage.setProduct(page, firstProductData);
       await expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
     });
   });
@@ -117,7 +117,7 @@ describe('BO - Catalog - Products : Delete products with bulk actions', async ()
     it('should click on \'New product\' button and check new product modal', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnNewProductButton2', baseContext);
 
-      const isModalVisible: boolean = await createProductsPage.clickOnNewProductButton(page);
+      const isModalVisible = await createProductsPage.clickOnNewProductButton(page);
       await expect(isModalVisible).to.be.true;
     });
 
@@ -126,7 +126,7 @@ describe('BO - Catalog - Products : Delete products with bulk actions', async ()
 
       await createProductsPage.chooseProductType(page, secondProductData.type);
 
-      const isIframeVisible: boolean = await createProductsPage.isChooseProductIframeVisible(page);
+      const isIframeVisible = await createProductsPage.isChooseProductIframeVisible(page);
       await expect(isIframeVisible).to.be.false;
     });
 
@@ -135,7 +135,7 @@ describe('BO - Catalog - Products : Delete products with bulk actions', async ()
 
       await createProductsPage.closeSfToolBar(page);
 
-      const createProductMessage: string = await createProductsPage.setProduct(page, secondProductData);
+      const createProductMessage = await createProductsPage.setProduct(page, secondProductData);
       await expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
     });
   });
@@ -146,7 +146,7 @@ describe('BO - Catalog - Products : Delete products with bulk actions', async ()
 
       await createProductsPage.goToCatalogPage(page);
 
-      const pageTitle: string = await productsPage.getPageTitle(page);
+      const pageTitle = await productsPage.getPageTitle(page);
       await expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
@@ -155,7 +155,7 @@ describe('BO - Catalog - Products : Delete products with bulk actions', async ()
 
       await productsPage.filterProducts(page, 'product_name', 'toDelete', 'input');
 
-      const numberOfProductsAfterFilter: number = await productsPage.getNumberOfProductsFromList(page);
+      const numberOfProductsAfterFilter = await productsPage.getNumberOfProductsFromList(page);
       await expect(numberOfProductsAfterFilter).to.equal(2);
 
       const textColumn = await productsPage.getTextColumn(page, 'product_name', 1);
@@ -172,28 +172,28 @@ describe('BO - Catalog - Products : Delete products with bulk actions', async ()
     it('should click on bulk actions button', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnBulkDeleteButton', baseContext);
 
-      const textMessage: string = await productsPage.clickOnBulkActionsProducts(page, 'delete');
+      const textMessage = await productsPage.clickOnBulkActionsProducts(page, 'delete');
       await expect(textMessage).to.equal('Deleting 2 products');
     });
 
     it('should bulk delete products', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteProduct', baseContext);
 
-      const textMessage: string = await productsPage.bulkActionsProduct(page, 'delete');
+      const textMessage = await productsPage.bulkActionsProduct(page, 'delete');
       await expect(textMessage).to.equal('Deleting 2 / 2 products');
     });
 
     it('should close progress modal', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'closeProgressModal', baseContext);
 
-      const isModalVisible: boolean = await productsPage.closeBulkActionsProgressModal(page, 'delete');
-      await expect(isModalVisible).to.be.true;
+      const isModalNotVisible = await productsPage.closeBulkActionsProgressModal(page, 'delete');
+      await expect(isModalNotVisible).to.be.true;
     });
 
     it('should reset filter', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilter', baseContext);
 
-      const numberOfProductsAfterReset: number = await productsPage.resetAndGetNumberOfLines(page);
+      const numberOfProductsAfterReset = await productsPage.resetAndGetNumberOfLines(page);
       await expect(numberOfProductsAfterReset).to.equal(numberOfProducts);
     });
   });
diff --git a/tests/UI/pages/BO/catalog/productsV2/index.ts b/tests/UI/pages/BO/catalog/productsV2/index.ts
index 2f24967fc1a8b..b2fc7dcb6c6c1 100644
--- a/tests/UI/pages/BO/catalog/productsV2/index.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/index.ts
@@ -304,7 +304,7 @@ class Products extends BOBasePage {
     await this.waitForVisibleSelector(page, `${this.modalCreateProduct} iframe`);
     await this.waitForHiddenSelector(page, this.modalCreateProductLoader);
 
-    const createProductFrame: Frame|null = await page.frame({url: /sell\/catalog\/products-v2\/create/gmi});
+    const createProductFrame: Frame | null = await page.frame({url: /sell\/catalog\/products-v2\/create/gmi});
     await expect(createProductFrame).to.be.not.null;
 
     return this.getTextContent(createProductFrame!, this.productTypeDescription);
@@ -329,7 +329,7 @@ class Products extends BOBasePage {
     await this.waitForVisibleSelector(page, `${this.modalCreateProduct} iframe`);
     await this.waitForHiddenSelector(page, this.modalCreateProductLoader);
 
-    const createProductFrame: Frame|null = await page.frame({url: /sell\/catalog\/products-v2\/create/gmi});
+    const createProductFrame: Frame | null = await page.frame({url: /sell\/catalog\/products-v2\/create/gmi});
     await expect(createProductFrame).to.be.not.null;
 
     await this.waitForSelectorAndClick(createProductFrame!, this.productType(productType));
@@ -341,7 +341,7 @@ class Products extends BOBasePage {
    * @returns {Promise<void>}
    */
   async clickOnAddNewProduct(page: Page): Promise<void> {
-    const createProductFrame: Frame|null = await page.frame({url: /sell\/catalog\/products-v2\/create/gmi});
+    const createProductFrame: Frame | null = await page.frame({url: /sell\/catalog\/products-v2\/create/gmi});
     await expect(createProductFrame).to.be.not.null;
 
     await this.waitForSelectorAndClick(createProductFrame!, this.addNewProductButton);
@@ -447,7 +447,8 @@ class Products extends BOBasePage {
     const modalBulkActionsProductsProgress = this.modalBulkActionsProductsProgress(
       (action === 'enable' || action === 'disable') ? `${action}_selection` : `bulk_${action}`,
     );
-    await this.clickAndWaitForLoadState(page, modalBulkActionsProductsCloseButton);
+    await this.waitForSelectorAndClick(page, modalBulkActionsProductsCloseButton);
+    await page.waitForURL('**/sell/catalog/products-v2/**');
 
     return this.elementNotVisible(page, modalBulkActionsProductsProgress, 1000);
   }
@@ -663,16 +664,16 @@ class Products extends BOBasePage {
 
     // In case we filter products and there is only one page, link next from pagination does not appear
     if (!found) {
-      return (await page.$$(this.productRow)).length;
+      return this.getNumberOfProductsFromHeader(page);
     }
 
     const footerText = await this.getTextContent(page, this.productsNumberLabel);
-    const resultFooterMatch: RegExpMatchArray|null = footerText.match(/out of ([0-9]+)/);
+    const resultFooterMatch: RegExpMatchArray | null = footerText.match(/out of ([0-9]+)/);
 
     if (resultFooterMatch === null) {
       return 0;
     }
-    const resultExecArray: RegExpExecArray|null = /\d+/g.exec(resultFooterMatch.toString());
+    const resultExecArray: RegExpExecArray | null = /\d+/g.exec(resultFooterMatch.toString());
 
     if (resultExecArray === null) {
       return 0;
@@ -691,7 +692,7 @@ class Products extends BOBasePage {
   async getProductPriceFromList(page: Page, row: number, withTaxes: boolean): Promise<number> {
     const selector = withTaxes ? this.productsListTableColumnPriceATI : this.productsListTableColumnPriceTExc;
     const text = await this.getTextContent(page, selector(row));
-    const resultExecArray: RegExpExecArray|null = /\d+/g.exec(text);
+    const resultExecArray: RegExpExecArray | null = /\d+/g.exec(text);
 
     if (resultExecArray === null) {
       return 0;

From c61190eb47ccc09a9128a48ca0595f2e7fddbb4c Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Tue, 25 Jul 2023 15:55:11 +0200
Subject: [PATCH 0626/1030] Return DTO and allow to filter on properties

---
 .../ApiPlatform/Provider/QueryProvider.php          | 13 ++++++++++---
 src/PrestaShopBundle/ApiPlatform/Resources/Hook.php | 10 +++++++++-
 .../Resources/config/services/bundle/services.yml   |  9 +++++++++
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
index 1678d81095555..ce59fd71ab029 100644
--- a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
+++ b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
@@ -32,11 +32,15 @@
 use ApiPlatform\State\ProviderInterface;
 use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
 use PrestaShopBundle\ApiPlatform\Exception\NoExtraPropertiesFoundException;
+use Symfony\Component\Serializer\Serializer;
 
 class QueryProvider implements ProviderInterface
 {
-    public function __construct(private CommandBusInterface $queryBus)
-    {
+    public function __construct(
+        private readonly CommandBusInterface $queryBus,
+        private readonly Serializer $apiPlatformSerializer
+    ) {
+
     }
 
     public function provide(Operation $operation, array $uriVariables = [], array $context = [])
@@ -49,6 +53,9 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
             throw new NoExtraPropertiesFoundException();
         }
 
-        return $this->queryBus->handle(new $query(...$uriVariables));
+        $queryResult = $this->queryBus->handle(new $query(...$uriVariables));
+        $normalizedQueryResult = $this->apiPlatformSerializer->normalize($queryResult);
+
+        return $this->apiPlatformSerializer->denormalize($normalizedQueryResult, $context['operation']->getClass());
     }
 }
diff --git a/src/PrestaShopBundle/ApiPlatform/Resources/Hook.php b/src/PrestaShopBundle/ApiPlatform/Resources/Hook.php
index 737217f059fe3..dd488013a358c 100644
--- a/src/PrestaShopBundle/ApiPlatform/Resources/Hook.php
+++ b/src/PrestaShopBundle/ApiPlatform/Resources/Hook.php
@@ -38,6 +38,7 @@
 use PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHookStatus;
 use PrestaShopBundle\ApiPlatform\Processor\CommandProcessor;
 use PrestaShopBundle\ApiPlatform\Provider\QueryProvider;
+use Symfony\Component\Serializer\Annotation\Groups;
 
 #[ApiResource(
     operations: [
@@ -65,6 +66,11 @@
                 ],
             ],
             exceptionToStatus: [HookNotFoundException::class => 404],
+            normalizationContext: [
+                'groups' => [
+                    'hook-status:read',
+                ],
+            ],
             provider: QueryProvider::class,
             extraProperties: ['query' => GetHookStatus::class]
         ),
@@ -74,7 +80,7 @@
             extraProperties: ['command' => UpdateHookStatusCommand::class]
         ),
         new Get(
-          uriTemplate: '/hooks/{id}',
+            uriTemplate: '/hooks/{id}',
             requirements: ['id' => '\d+'],
             exceptionToStatus: [HookNotFoundException::class => 404],
             provider: QueryProvider::class,
@@ -85,8 +91,10 @@
 class Hook
 {
     #[ApiProperty(identifier: true)]
+    #[Groups(['hook-status:read'])]
     public int $id;
 
+    #[Groups(['hook-status:read'])]
     public bool $active;
 
     public string $name;
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/services.yml b/src/PrestaShopBundle/Resources/config/services/bundle/services.yml
index 56a48dd30185d..d7138c53227b5 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/services.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/services.yml
@@ -128,3 +128,12 @@ services:
       - '@doctrine.orm.entity_manager'
 
   PrestaShop\PrestaShop\Core\Repository\TransactionManagerInterface: '@PrestaShopBundle\Service\Database\TransactionManager'
+
+  Symfony\Component\Serializer\Serializer $apiPlatformSerializer:
+    class: Symfony\Component\Serializer\Serializer
+    arguments:
+      $normalizers:
+        - '@prestashop.api_platform.property_normalizer'
+
+  prestashop.api_platform.property_normalizer:
+    class: Symfony\Component\Serializer\Normalizer\ObjectNormalizer

From b2016f0abfd0bf0a8c0d830845d040d094523931 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Tue, 25 Jul 2023 16:18:14 +0200
Subject: [PATCH 0627/1030] Functional Tests : Wishlist module - Statistics tab
 settings

---
 .../02_statisticsTabSettings.ts               | 175 ++++++++++++++++++
 tests/UI/data/demo/modules.ts                 |   4 +
 .../pages/BO/modules/blockwishlist/index.ts   |  52 ++++++
 .../BO/modules/blockwishlist/statistics.ts    |  58 ++++++
 tests/UI/pages/FO/FObasePage.ts               |  10 +-
 tests/UI/pages/FO/category/index.ts           |  48 +++++
 6 files changed, 342 insertions(+), 5 deletions(-)
 create mode 100644 tests/UI/campaigns/modules/blockwishlist/02_configuration/02_statisticsTabSettings.ts
 create mode 100644 tests/UI/pages/BO/modules/blockwishlist/index.ts
 create mode 100644 tests/UI/pages/BO/modules/blockwishlist/statistics.ts

diff --git a/tests/UI/campaigns/modules/blockwishlist/02_configuration/02_statisticsTabSettings.ts b/tests/UI/campaigns/modules/blockwishlist/02_configuration/02_statisticsTabSettings.ts
new file mode 100644
index 0000000000000..a2d1f4308c693
--- /dev/null
+++ b/tests/UI/campaigns/modules/blockwishlist/02_configuration/02_statisticsTabSettings.ts
@@ -0,0 +1,175 @@
+// Import utils
+import helper from '@utils/helpers';
+import testContext from '@utils/testContext';
+
+// Import commonTests
+import loginCommon from '@commonTests/BO/loginBO';
+
+// Import pages
+// Import BO pages
+import dashboardPage from '@pages/BO/dashboard';
+import {moduleManager as moduleManagerPage} from '@pages/BO/modules/moduleManager';
+import blockwishlistPage from '@pages/BO/modules/blockwishlist';
+import blockwishlistStatisticsPage from '@pages/BO/modules/blockwishlist/statistics';
+// Import FO pages
+import categoryPage from '@pages/FO/category';
+import {homePage} from '@pages/FO/home';
+import {loginPage as foLoginPage} from '@pages/FO/login';
+
+// Import data
+import Customers from '@data/demo/customers';
+import Modules from '@data/demo/modules';
+
+import {expect} from 'chai';
+import type {BrowserContext, Page} from 'playwright';
+
+const baseContext: string = 'modules_blockwishlist_configuration_statisticsTabSettings';
+
+describe('Wishlist module - Statistics tab settings', async () => {
+  let browserContext: BrowserContext;
+  let page: Page;
+
+  // before and after functions
+  before(async function () {
+    browserContext = await helper.createBrowserContext(this.browser);
+    page = await helper.newTab(browserContext);
+  });
+
+  after(async () => {
+    await helper.closeBrowserContext(browserContext);
+  });
+
+  describe('Check the Back Office', async () => {
+    it('should login in BO', async function () {
+      await loginCommon.loginBO(this, page);
+    });
+
+    it('should go to \'Modules > Module Manager\' page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToModuleManagerPage', baseContext);
+
+      await dashboardPage.goToSubMenu(
+        page,
+        dashboardPage.modulesParentLink,
+        dashboardPage.moduleManagerLink,
+      );
+      await moduleManagerPage.closeSfToolBar(page);
+
+      const pageTitle = await moduleManagerPage.getPageTitle(page);
+      await expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
+    });
+
+    it(`should search the module ${Modules.blockwishlist.name}`, async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'searchModule', baseContext);
+
+      const isModuleVisible = await moduleManagerPage.searchModule(page, Modules.blockwishlist);
+      await expect(isModuleVisible).to.be.true;
+    });
+
+    it(`should go to the configuration page of the module '${Modules.blockwishlist.name}'`, async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToConfigurationPage', baseContext);
+
+      await moduleManagerPage.goToConfigurationPage(page, Modules.blockwishlist.tag);
+
+      const pageTitle = await blockwishlistPage.getPageTitle(page);
+      await expect(pageTitle).to.eq(blockwishlistPage.pageTitle);
+
+      const isConfigurationTabActive = await blockwishlistPage.isTabActive(page, 'Configuration');
+      await expect(isConfigurationTabActive).to.be.true;
+
+      const isStatisticsTabActive = await blockwishlistPage.isTabActive(page, 'Statistics');
+      await expect(isStatisticsTabActive).to.be.false;
+    });
+
+    it('should go on Statistics Tab', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToStatisticsTab', baseContext);
+
+      await blockwishlistPage.goToStatisticsTab(page);
+
+      const pageTitle = await blockwishlistStatisticsPage.getPageTitle(page);
+      await expect(pageTitle).to.eq(blockwishlistStatisticsPage.pageTitle);
+
+      const noRecordsFoundText = await blockwishlistStatisticsPage.getTextForEmptyTable(page);
+      await expect(noRecordsFoundText).to.contains('warning No records found');
+    });
+  });
+  describe('Go to the FO and add to favorites some products', async () => {
+    it('should go to the FO', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToFO', baseContext);
+
+      page = await blockwishlistStatisticsPage.viewMyShop(page);
+      await homePage.changeLanguage(page, 'en');
+
+      const isHomePage = await homePage.isHomePage(page);
+      await expect(isHomePage).to.be.true;
+    });
+
+    it('should go to login page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToLoginPage', baseContext);
+
+      await homePage.goToLoginPage(page);
+
+      const pageTitle = await foLoginPage.getPageTitle(page);
+      await expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
+    });
+
+    it('should sign in with default customer', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'sighInFo', baseContext);
+
+      await foLoginPage.customerLogin(page, Customers.johnDoe);
+
+      const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
+      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+    });
+
+    it('should go to all products page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToAllProducts', baseContext);
+
+      await homePage.goToAllProductsPage(page);
+
+      const isCategoryPageVisible = await categoryPage.isCategoryPage(page);
+      await expect(isCategoryPageVisible).to.be.true;
+    });
+
+    for (let idxProduct: number = 1; idxProduct <= 3; idxProduct++) {
+      // eslint-disable-next-line no-loop-func
+      it(`should add product #${idxProduct} to wishlist`, async function () {
+        await testContext.addContextItem(this, 'testIdentifier', `addToFavorite${idxProduct}`, baseContext);
+
+        const textResult = await categoryPage.addToWishList(page, idxProduct);
+        await expect(textResult).to.be.eq(categoryPage.messageAddedToWishlist);
+
+        const isAddedToWishlist = await categoryPage.isAddedToWishlist(page, idxProduct);
+        await expect(isAddedToWishlist).to.be.true;
+      });
+    }
+
+    it('should logout', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'foLogout', baseContext);
+
+      await categoryPage.logout(page);
+
+      const isCustomerConnected = await homePage.isCustomerConnected(page);
+      await expect(isCustomerConnected).to.be.false;
+    });
+  });
+  describe('Return to BO and check statistics', async () => {
+    it('should go to BO', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToBoBack', baseContext);
+
+      page = await homePage.closePage(browserContext, page, 0);
+
+      const pageTitle = await blockwishlistStatisticsPage.getPageTitle(page);
+      await expect(pageTitle).to.contains(blockwishlistStatisticsPage.pageTitle);
+    });
+    // @todo : https://github.com/PrestaShop/PrestaShop/issues/33374
+    it.skip('should click on the refresh button', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'clickOnRefreshButton', baseContext);
+
+      await blockwishlistStatisticsPage.refreshStatistics(page);
+
+      // Check statistics
+      const pageTitle = await blockwishlistStatisticsPage.getPageTitle(page);
+      await expect(pageTitle).to.contains(blockwishlistStatisticsPage.pageTitle);
+    });
+  });
+});
diff --git a/tests/UI/data/demo/modules.ts b/tests/UI/data/demo/modules.ts
index a653c9cd6c429..e88d1f0d75c72 100644
--- a/tests/UI/data/demo/modules.ts
+++ b/tests/UI/data/demo/modules.ts
@@ -1,6 +1,10 @@
 import ModuleData from '@data/faker/module';
 
 export default {
+  blockwishlist: new ModuleData({
+    tag: 'blockwishlist',
+    name: 'Wishlist',
+  }),
   psCashOnDelivery: new ModuleData({
     tag: 'ps_cashondelivery',
     name: 'Cash on delivery (COD)',
diff --git a/tests/UI/pages/BO/modules/blockwishlist/index.ts b/tests/UI/pages/BO/modules/blockwishlist/index.ts
new file mode 100644
index 0000000000000..20906c1c14b2d
--- /dev/null
+++ b/tests/UI/pages/BO/modules/blockwishlist/index.ts
@@ -0,0 +1,52 @@
+import {ModuleConfiguration} from '@pages/BO/modules/moduleConfiguration';
+
+import type {Page} from 'playwright';
+
+/**
+ * Module configuration page for module : blockwishlist, contains selectors and functions for the page
+ * @class
+ * @extends ModuleConfiguration
+ */
+class Blockwishlist extends ModuleConfiguration {
+  public readonly pageTitle: string;
+
+  private readonly headTabs: string;
+
+  private readonly headTab: string;
+
+  private readonly headTabNamed: (name: string) => string;
+
+  /**
+   * @constructs
+   */
+  constructor() {
+    super();
+
+    this.pageTitle = `Configuration • ${global.INSTALL.SHOP_NAME}`;
+
+    // Selectors
+    this.headTabs = '#head_tabs';
+    this.headTab = `${this.headTabs} .nav-item`;
+    this.headTabNamed = (name: string) => `${this.headTab} #subtab-Wishlist${name}AdminController`;
+  }
+
+  // Methods
+  /**
+   * @param page {Page}
+   * @returns Promise<void>
+   */
+  async goToStatisticsTab(page: Page): Promise<void> {
+    await this.clickAndWaitForURL(page, this.headTabNamed('Statistics'));
+  }
+
+  /**
+   * @param page {Page}
+   * @param name {'Configuration'|'Statistics'}
+   * @returns Promise<boolean>
+   */
+  async isTabActive(page: Page, name: 'Configuration'|'Statistics'): Promise<boolean> {
+    return this.elementVisible(page, `${this.headTabNamed(name)}.active.current`, 1000);
+  }
+}
+
+export default new Blockwishlist();
diff --git a/tests/UI/pages/BO/modules/blockwishlist/statistics.ts b/tests/UI/pages/BO/modules/blockwishlist/statistics.ts
new file mode 100644
index 0000000000000..1dad8a2d534fe
--- /dev/null
+++ b/tests/UI/pages/BO/modules/blockwishlist/statistics.ts
@@ -0,0 +1,58 @@
+import {ModuleConfiguration} from '@pages/BO/modules/moduleConfiguration';
+
+import type {Page} from 'playwright';
+
+/**
+ * Module configuration page for module : blockwishlist, contains selectors and functions for the page
+ * @class
+ * @extends ModuleConfiguration
+ */
+class BlockwishlistStatistics extends ModuleConfiguration {
+  public readonly pageTitle: string;
+
+  private readonly rowTopBar: string;
+
+  private readonly refreshStatsButton: string;
+
+  private readonly gridTable: string;
+
+  private readonly gridTableBody: string;
+
+  private readonly gridTableEmptyRow: string;
+
+  /**
+   * @constructs
+   */
+  constructor() {
+    super();
+
+    this.pageTitle = `Statistics • ${global.INSTALL.SHOP_NAME}`;
+
+    // Selectors
+    this.rowTopBar = '.row.wishlist-stats-topbar';
+    this.refreshStatsButton = `${this.rowTopBar} button.js-refresh`;
+    this.gridTable = '#statistics_all_time_grid_table';
+    this.gridTableBody = `${this.gridTable} tbody`;
+    this.gridTableEmptyRow = `${this.gridTableBody} tr.empty_row`;
+  }
+
+  // Methods
+  /**
+   * @param page {Page}
+   * @returns Promise<string>
+   */
+  async getTextForEmptyTable(page: Page): Promise<string> {
+    return this.getTextContent(page, this.gridTableEmptyRow);
+  }
+
+  /**
+   * @param page {Page}
+   * @returns Promise<void>
+   */
+  async refreshStatistics(page: Page): Promise<void> {
+    await page.click(this.refreshStatsButton);
+    await page.waitForTimeout(2000);
+  }
+}
+
+export default new BlockwishlistStatistics();
diff --git a/tests/UI/pages/FO/FObasePage.ts b/tests/UI/pages/FO/FObasePage.ts
index dd320f32e0495..3fe15adcc4b06 100644
--- a/tests/UI/pages/FO/FObasePage.ts
+++ b/tests/UI/pages/FO/FObasePage.ts
@@ -337,7 +337,7 @@ export default class FOBasePage extends CommonPage {
    * @param page {Page} Browser tab
    * @returns {Promise<boolean>}
    */
-  isLanguageListVisible(page: Page): Promise<boolean> {
+  async isLanguageListVisible(page: Page): Promise<boolean> {
     return this.elementVisible(page, this.languageSelectorExpandIcon, 1000);
   }
 
@@ -346,7 +346,7 @@ export default class FOBasePage extends CommonPage {
    * @param page {Page} Browser tab
    * @returns {Promise<string>}
    */
-  getShopLanguage(page: Page): Promise<string> {
+  async getShopLanguage(page: Page): Promise<string> {
     return this.getAttributeContent(page, 'html[lang]', 'lang');
   }
 
@@ -382,7 +382,7 @@ export default class FOBasePage extends CommonPage {
    * @param page {Page} Browser tab
    * @returns {Promise<string>}
    */
-  getDefaultShopLanguage(page: Page): Promise<string> {
+  async getDefaultShopLanguage(page: Page): Promise<string> {
     return this.getTextContent(page, this.defaultLanguageSpan);
   }
 
@@ -420,7 +420,7 @@ export default class FOBasePage extends CommonPage {
    * @param page {Page} Browser tab
    * @returns {Promise<boolean>}
    */
-  isCurrencyDropdownExist(page: Page): Promise<boolean> {
+  async isCurrencyDropdownExist(page: Page): Promise<boolean> {
     return this.elementVisible(page, this.currencySelectorExpandIcon, 1000);
   }
 
@@ -440,7 +440,7 @@ export default class FOBasePage extends CommonPage {
    * @param page {Page} Browser tab
    * @returns {Promise<string>}
    */
-  getDefaultCurrency(page: Page): Promise<string> {
+  async getDefaultCurrency(page: Page): Promise<string> {
     return this.getTextContent(page, this.defaultCurrencySpan);
   }
 
diff --git a/tests/UI/pages/FO/category/index.ts b/tests/UI/pages/FO/category/index.ts
index 458a922dc835e..f07e1581bc2aa 100644
--- a/tests/UI/pages/FO/category/index.ts
+++ b/tests/UI/pages/FO/category/index.ts
@@ -9,6 +9,8 @@ import type {Page} from 'playwright';
  * @extends FOBasePage
  */
 class Category extends FOBasePage {
+  public readonly messageAddedToWishlist: string;
+
   private readonly bodySelector: string;
 
   private readonly mainSection: string;
@@ -57,6 +59,8 @@ class Category extends FOBasePage {
 
   private readonly productQuickViewLink: (number: number) => string;
 
+  private readonly productAddToWishlist: (number: number) => string;
+
   private readonly quickViewModalDiv: string;
 
   private readonly quickViewModalProductImageCover: string;
@@ -71,6 +75,12 @@ class Category extends FOBasePage {
 
   private readonly searchFiltersDropdown: string;
 
+  private readonly wishlistModal: string;
+
+  private readonly wishlistModalListItem: string;
+
+  private readonly wishlistToast: string;
+
   /**
    * @constructs
    * Setting up texts and selectors to use on category page
@@ -78,6 +88,9 @@ class Category extends FOBasePage {
   constructor() {
     super();
 
+    // Message
+    this.messageAddedToWishlist = 'Product added';
+
     // Selectors
     this.bodySelector = '#category';
     this.mainSection = '#main';
@@ -104,6 +117,7 @@ class Category extends FOBasePage {
     this.productImg = (number: number) => `${this.productArticle(number)} img`;
     this.productDescriptionDiv = (number: number) => `${this.productArticle(number)} div.product-description`;
     this.productQuickViewLink = (number: number) => `${this.productArticle(number)} a.quick-view`;
+    this.productAddToWishlist = (number: number) => `${this.productArticle(number)} button.wishlist-button-add`;
 
     // Pagination selectors
     this.pagesList = '.page-list';
@@ -121,6 +135,11 @@ class Category extends FOBasePage {
     this.searchFiltersCheckbox = `${this.searchFilters} ul[id^="facet"] label.facet-label input[type="checkbox"]`;
     this.searchFiltersRadio = `${this.searchFilters} ul[id^="facet"] label.facet-label input[type="radio"]`;
     this.searchFiltersDropdown = `${this.searchFilters} ul[id^="facet"] .facet-dropdown`;
+
+    // Wishlist
+    this.wishlistModal = '.wishlist-add-to .wishlist-modal.show';
+    this.wishlistModalListItem = `${this.wishlistModal} ul.wishlist-list li.wishlist-list-item:nth-child(1)`;
+    this.wishlistToast = '.wishlist-toast .wishlist-toast-text';
   }
 
   /* Methods */
@@ -390,6 +409,35 @@ class Category extends FOBasePage {
   async isSearchFilterDropdown(page: Page): Promise<boolean> {
     return page.$$eval(this.searchFiltersDropdown, (all) => all.length !== 0);
   }
+
+  /**
+   * Add a product (based on its index) to the first wishlist
+   * @param page {Page}
+   * @param idxProduct {number}
+   * @returns Promise<string>
+   */
+  async addToWishList(page: Page, idxProduct: number): Promise<string> {
+    // Click on the heart
+    await page.click(this.productAddToWishlist(idxProduct));
+    // Wait for the modal
+    await this.elementVisible(page, this.wishlistModal, 2000);
+    // Click on the first wishlist
+    await page.click(this.wishlistModalListItem);
+    // Wait for the toast
+    await this.elementVisible(page, this.wishlistToast, 2000);
+
+    return this.getTextContent(page, this.wishlistToast);
+  }
+
+  /**
+   * Check if a product (based on its index) is added to a wishlist
+   * @param page {Page}
+   * @param idxProduct {number}
+   * @returns Promise<boolean>
+   */
+  async isAddedToWishlist(page: Page, idxProduct: number): Promise<boolean> {
+    return ((await this.getTextContent(page, this.productAddToWishlist(idxProduct))) === 'favorite');
+  }
 }
 
 export default new Category();

From 09638dd19613a1a4275058562e47ba3a92ae733b Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Tue, 25 Jul 2023 17:34:26 +0200
Subject: [PATCH 0628/1030] Fix unit tests

---
 .../ApiPlatform/Provider/QueryProvider.php    |  3 +-
 .../StateProvider/QueryProviderTest.php       | 71 +++++++++++--------
 2 files changed, 44 insertions(+), 30 deletions(-)

diff --git a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
index ce59fd71ab029..43a9acc35d1c4 100644
--- a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
+++ b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
@@ -40,7 +40,6 @@ public function __construct(
         private readonly CommandBusInterface $queryBus,
         private readonly Serializer $apiPlatformSerializer
     ) {
-
     }
 
     public function provide(Operation $operation, array $uriVariables = [], array $context = [])
@@ -56,6 +55,6 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         $queryResult = $this->queryBus->handle(new $query(...$uriVariables));
         $normalizedQueryResult = $this->apiPlatformSerializer->normalize($queryResult);
 
-        return $this->apiPlatformSerializer->denormalize($normalizedQueryResult, $context['operation']->getClass());
+        return $this->apiPlatformSerializer->denormalize($normalizedQueryResult, $operation->getClass());
     }
 }
diff --git a/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php b/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
index 42671d0dc541d..f3eb9ec4b8291 100644
--- a/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
+++ b/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
@@ -29,6 +29,7 @@
 namespace Tests\Unit\PrestaShopBundle\ApiPlatform\StateProvider;
 
 use ApiPlatform\Metadata\Get;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
 use PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHook;
@@ -37,7 +38,10 @@
 use PrestaShop\PrestaShop\Core\Domain\Hook\QueryResult\HookStatus;
 use PrestaShopBundle\ApiPlatform\Exception\NoExtraPropertiesFoundException;
 use PrestaShopBundle\ApiPlatform\Provider\QueryProvider;
+use PrestaShopBundle\ApiPlatform\Resources\Hook;
 use RuntimeException;
+use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
+use Symfony\Component\Serializer\Serializer;
 
 class QueryProviderTest extends TestCase
 {
@@ -46,6 +50,27 @@ class QueryProviderTest extends TestCase
      */
     private $queryBus;
 
+    private Serializer|MockObject $serializer;
+
+    protected function setUp(): void
+    {
+        $this->serializer = new Serializer([new ObjectNormalizer()]);
+        $this->queryBus = $this->createMock(CommandBusInterface::class);
+
+        $this->queryBus
+            ->method('handle')
+            ->willReturnCallback(function ($query) {
+                switch (get_class($query)) {
+                    case GetHookStatus::class:
+                        return $this->createResultBasedOnHookStatusQuery($query);
+                    case GetHook::class:
+                        return $this->createResultBasedOnHookQuery($query);
+                }
+
+                throw new RuntimeException(sprintf('Query type %s was not expected in query bus mock', get_class($query)));
+            });
+    }
+
     private function createResultBasedOnHookStatusQuery(GetHookStatus $query): HookStatus
     {
         if ($query->getId()->getValue() === 1) {
@@ -86,55 +111,45 @@ private function createResultBasedOnHookQuery(GetHook $query): HookQuery
 
     public function testProvideHookStatus(): void
     {
-        $this->queryBus = $this->createMock(CommandBusInterface::class);
-        $this->queryBus
-            ->method('handle')
-            ->with($this->isInstanceOf(GetHookStatus::class))
-            ->willReturnCallback(function ($query) {
-                return $this->createResultBasedOnHookStatusQuery($query);
-            })
-        ;
         $hookStatusProvider = new QueryProvider(
             $this->queryBus,
+            $this->serializer,
         );
         $get = new Get();
-        $get = $get->withExtraProperties(['query' => "PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHookStatus"]);
-        /** @var HookStatus $hookStatus */
+        $get = $get
+            ->withExtraProperties(['query' => "PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHookStatus"])
+            ->withClass(Hook::class);
+        /** @var Hook $hookStatus */
         $hookStatus = $hookStatusProvider->provide($get, ['id' => 1]);
-        self::assertEquals(false, $hookStatus->isActive());
-        /** @var HookStatus $hookStatus */
+        self::assertEquals(false, $hookStatus->active);
+        /** @var Hook $hookStatus */
         $hookStatus = $hookStatusProvider->provide($get, ['id' => 2]);
-        self::assertTrue($hookStatus->isActive());
+        self::assertTrue($hookStatus->active);
     }
 
     public function testProvideHook(): void
     {
-        $this->queryBus = $this->createMock(CommandBusInterface::class);
-        $this->queryBus
-            ->method('handle')
-            ->with($this->isInstanceOf(GetHook::class))
-            ->willReturnCallback(function ($query) {
-                return $this->createResultBasedOnHookQuery($query);
-            })
-        ;
-
         $hookStatusProvider = new QueryProvider(
             $this->queryBus,
+            $this->serializer,
         );
         $get = new Get();
-        $get = $get->withExtraProperties(['query' => 'PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHook']);
-        /** @var HookQuery $hookDto */
+        $get = $get
+            ->withExtraProperties(['query' => 'PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHook'])
+            ->withClass(Hook::class);
+        /** @var Hook $hookDto */
         $hookDto = $hookStatusProvider->provide($get, ['id' => 1]);
-        self::assertEquals(false, $hookDto->isActive());
-        /** @var HookQuery $hookDto */
+        self::assertEquals(false, $hookDto->active);
+        /** @var Hook $hookDto */
         $hookDto = $hookStatusProvider->provide($get, ['id' => 2]);
-        self::assertTrue($hookDto->isActive());
+        self::assertTrue($hookDto->active);
     }
 
     public function testProvideNoQueryThrowsException(): void
     {
         $hookStatusProvider = new QueryProvider(
-            $this->createMock(CommandBusInterface::class),
+            $this->queryBus,
+            $this->serializer,
         );
         $get = new Get();
 

From a2f4fd6e7601d3418a9d2a7a66776dc0be7dd61e Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Wed, 26 Jul 2023 09:19:30 +0200
Subject: [PATCH 0629/1030] Functional Tests: Added spaces between blocks

---
 .../12_authorizationServer/02_viewDetail.ts                     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/12_authorizationServer/02_viewDetail.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/12_authorizationServer/02_viewDetail.ts
index 57810a135c939..3447e8f60da76 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/12_authorizationServer/02_viewDetail.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/12_authorizationServer/02_viewDetail.ts
@@ -98,6 +98,7 @@ describe('BO - Advanced Parameter - Authorization Server : View detail', async (
         const pageTitle = await viewAuthorizedAppPage.getPageTitle(page);
         await expect(pageTitle).to.eq(viewAuthorizedAppPage.pageTitle(application.appName));
       });
+
       it('should check details', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkDetailsInformations', baseContext);
 
@@ -120,6 +121,7 @@ describe('BO - Advanced Parameter - Authorization Server : View detail', async (
         const pageTitle = await authorizationServerPage.getPageTitle(page);
         await expect(pageTitle).to.eq(authorizationServerPage.pageTitle);
       });
+
       it('should delete authorized app', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'deleteAuthorizedApp', baseContext);
 

From 47c09e8467e3ca444bdd6fbd6c8f4e1419d91f97 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Wed, 26 Jul 2023 10:47:57 +0200
Subject: [PATCH 0630/1030] Functional Tests : FO - Consult credit slip list &
 View PDF Credit slip & View order (Add check for email)

---
 .../01_creditSlips/01_consultCreditSlip.ts    | 31 ++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/tests/UI/campaigns/functional/FO/classic/03_userAccount/01_creditSlips/01_consultCreditSlip.ts b/tests/UI/campaigns/functional/FO/classic/03_userAccount/01_creditSlips/01_consultCreditSlip.ts
index 9b39bd0a42a7c..79dcf035c2acc 100644
--- a/tests/UI/campaigns/functional/FO/classic/03_userAccount/01_creditSlips/01_consultCreditSlip.ts
+++ b/tests/UI/campaigns/functional/FO/classic/03_userAccount/01_creditSlips/01_consultCreditSlip.ts
@@ -1,10 +1,12 @@
 // Import utils
 import files from '@utils/files';
 import helper from '@utils/helpers';
+import mailHelper from '@utils/mailHelper';
 import testContext from '@utils/testContext';
 import loginCommon from '@commonTests/BO/loginBO';
 
 // Import commonTests
+import {resetSmtpConfigTest, setupSmtpConfigTest} from '@commonTests/BO/advancedParameters/smtp';
 import {createAddressTest} from '@commonTests/BO/customers/address';
 import {deleteCustomerTest} from '@commonTests/BO/customers/customer';
 import {createAccountTest} from '@commonTests/FO/account';
@@ -31,9 +33,11 @@ import Products from '@data/demo/products';
 import AddressData from '@data/faker/address';
 import CustomerData from '@data/faker/customer';
 import OrderData from '@data/faker/order';
+import type MailDevEmail from '@data/types/maildevEmail';
 
 import {expect} from 'chai';
 import type {BrowserContext, Page} from 'playwright';
+import type MailDev from 'maildev';
 
 const baseContext: string = 'functional_FO_classic_userAccount_creditSlips_consultCreditSlip';
 
@@ -56,6 +60,8 @@ describe('FO - Consult credit slip list & View PDF Credit slip & View order', as
   let creditSlipID: string;
   let dateIssued: string;
   let filePath: string|null;
+  let newMail: MailDevEmail;
+  let mailListener: MailDev;
 
   const customerData: CustomerData = new CustomerData();
   const addressData: AddressData = new AddressData({
@@ -79,16 +85,30 @@ describe('FO - Consult credit slip list & View PDF Credit slip & View order', as
   createAddressTest(addressData, `${baseContext}_preTest_2`);
   // Pre-condition: Create order
   createOrderByCustomerTest(orderData, `${baseContext}_preTest_3`);
+  // Pre-Condition: Setup config SMTP
+  setupSmtpConfigTest(`${baseContext}_preTest_4`);
 
   // before and after functions
   before(async function () {
     browserContext = await helper.createBrowserContext(this.browser);
     page = await helper.newTab(browserContext);
+
+    // Start listening to maildev server
+    mailListener = mailHelper.createMailListener();
+    mailHelper.startListener(mailListener);
+
+    // Handle every new email
+    mailListener.on('new', (email: MailDevEmail) => {
+      newMail = email;
+    });
   });
 
   after(async () => {
     await files.deleteFile(filePath);
     await helper.closeBrowserContext(browserContext);
+
+    // Stop listening to maildev server
+    mailHelper.stopListener(mailListener);
   });
 
   describe('Consult Credit slip list in FO', async () => {
@@ -197,6 +217,13 @@ describe('FO - Consult credit slip list & View PDF Credit slip & View order', as
         await expect(textMessage).to.contains(viewOrderProductsBlockPage.partialRefundValidationMessage);
       });
 
+      it('should check if the mail is in mailbox', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'checkIfMailIsInMailbox', baseContext);
+
+        await expect(newMail.subject).to.eq(`[${global.INSTALL.SHOP_NAME}] New credit slip regarding your order`);
+        await expect(newMail.text).to.contains('A credit slip has been generated in your name for order with the reference');
+      });
+
       it('should check if \'Credit slip\' document is created', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkCreditSlipDocument', baseContext);
 
@@ -369,5 +396,7 @@ describe('FO - Consult credit slip list & View PDF Credit slip & View order', as
   });
 
   // Post-condition: Delete the created customer account
-  deleteCustomerTest(customerData, `${baseContext}_postTest`);
+  deleteCustomerTest(customerData, `${baseContext}_postTest_1`);
+  // Post-Condition: Reset SMTP config
+  resetSmtpConfigTest(`${baseContext}_postTest_2`);
 });

From 3c7461bdbe040f0c08cf24c0e2c38628e2b81506 Mon Sep 17 00:00:00 2001
From: Daniel Hlavacek <daniel.hlavacek@hotmail.cz>
Date: Wed, 26 Jul 2023 10:49:58 +0200
Subject: [PATCH 0631/1030] Do not overwrite legend by empty value

---
 src/Adapter/Image/ImageRetriever.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/Adapter/Image/ImageRetriever.php b/src/Adapter/Image/ImageRetriever.php
index c62c4de719c79..1d8f1f1e10d61 100644
--- a/src/Adapter/Image/ImageRetriever.php
+++ b/src/Adapter/Image/ImageRetriever.php
@@ -74,18 +74,21 @@ public function getAllProductImages(array $product, Language $language)
             $language->id
         );
 
+        // Get all product images that are related to this object
         $images = $productInstance->getImages($language->id);
-
         if (empty($images)) {
             return [];
         }
 
+        // Load all pairs of images assigned to combinations
         $combinationImages = $productInstance->getCombinationImages($language->id);
         if (!$combinationImages) {
             $combinationImages = [];
         }
-        $imageToCombinations = [];
 
+        // And resolve them by id_image
+        // We can't assign them directly because the $images array keys are not id_image
+        $imageToCombinations = [];
         foreach ($combinationImages as $imgs) {
             foreach ($imgs as $img) {
                 $imageToCombinations[$img['id_image']][] = $img['id_product_attribute'];
@@ -96,11 +99,14 @@ public function getAllProductImages(array $product, Language $language)
             $productInstance,
             $imageToCombinations
         ) {
-            $image = array_merge($this->getImage(
-                $productInstance,
-                $image['id_image']
-            ), $image);
+            // Now let's fetch extra information about thumbnail sizes etc. and add this information.
+            // getImage also resolves a proper image legend, if it was missing in $image originally.
+            $image = array_merge( 
+                $image,
+                $this->getImage($productInstance, $image['id_image'])
+            );
 
+            // Assign a list of variants related to the given image
             if (isset($imageToCombinations[$image['id_image']])) {
                 $image['associatedVariants'] = $imageToCombinations[$image['id_image']];
             } else {

From 9436e1c6b2eb668b62fe46ea6d66b88f1527c172 Mon Sep 17 00:00:00 2001
From: Daniel Hlavacek <daniel.hlavacek@hotmail.cz>
Date: Wed, 26 Jul 2023 11:06:40 +0200
Subject: [PATCH 0632/1030] Fix CS

---
 src/Adapter/Image/ImageRetriever.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Adapter/Image/ImageRetriever.php b/src/Adapter/Image/ImageRetriever.php
index 1d8f1f1e10d61..6e5cfd68750d8 100644
--- a/src/Adapter/Image/ImageRetriever.php
+++ b/src/Adapter/Image/ImageRetriever.php
@@ -101,7 +101,7 @@ public function getAllProductImages(array $product, Language $language)
         ) {
             // Now let's fetch extra information about thumbnail sizes etc. and add this information.
             // getImage also resolves a proper image legend, if it was missing in $image originally.
-            $image = array_merge( 
+            $image = array_merge(
                 $image,
                 $this->getImage($productInstance, $image['id_image'])
             );

From fdf944b00941db9447358a06f963365648e7c664 Mon Sep 17 00:00:00 2001
From: Morgan Pichat <morgan.pichat@prestashop.com>
Date: Wed, 26 Jul 2023 10:51:41 +0200
Subject: [PATCH 0633/1030] dependency recovery update

---
 controllers/admin/AdminStoresController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/controllers/admin/AdminStoresController.php b/controllers/admin/AdminStoresController.php
index 814fb70773263..99dadf130f287 100644
--- a/controllers/admin/AdminStoresController.php
+++ b/controllers/admin/AdminStoresController.php
@@ -26,6 +26,7 @@
 
 use PrestaShop\PrestaShop\Adapter\SymfonyContainer;
 use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagStateCheckerInterface;
 use PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration;
 
 /**
@@ -425,7 +426,7 @@ protected function postImage($id)
         * In case of .jpg images, the actual format inside is decided by ImageManager.
         */
         $sfContainer = SymfonyContainer::getInstance();
-        if ($sfContainer->get('prestashop.core.admin.feature_flag.repository')->isEnabled(FeatureFlagSettings::FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT)) {
+        if ($sfContainer->get(FeatureFlagStateCheckerInterface::class)->isEnabled(FeatureFlagSettings::FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT)) {
             $configuredImageFormats = $sfContainer->get(ImageFormatConfiguration::class)->getGenerationFormats();
         } else {
             $configuredImageFormats = ['jpg'];

From ba89f268b899e2bcd496e3704fa9b7dfa9d6168c Mon Sep 17 00:00:00 2001
From: Daniel Hlavacek <daniel.hlavacek@hotmail.cz>
Date: Wed, 26 Jul 2023 12:45:12 +0200
Subject: [PATCH 0634/1030] Add message when duplicating product

---
 .../Grid/Definition/Factory/ProductGridDefinitionFactory.php    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Core/Grid/Definition/Factory/ProductGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/ProductGridDefinitionFactory.php
index 69ab3f124d367..8c9c3a262c594 100644
--- a/src/Core/Grid/Definition/Factory/ProductGridDefinitionFactory.php
+++ b/src/Core/Grid/Definition/Factory/ProductGridDefinitionFactory.php
@@ -372,6 +372,7 @@ protected function getSingleShopRowActions(): RowActionCollection
                 'extra_route_params' => [
                     'shopId' => $shopId,
                 ],
+                'confirm_message' => $this->trans('Remember to properly edit all information after duplicating - including SEO information and friendly URL.', [], 'Admin.Catalog.Notification'),
                 'modal_options' => new ModalOptions([
                     'title' => $this->trans('Duplicate product', [], 'Admin.Actions'),
                     'confirm_button_label' => $duplicateLabel,
@@ -475,6 +476,7 @@ protected function getSingleMultiShopsRowActions(): RowActionCollection
                 'route_param_name' => 'productId',
                 'route_param_field' => 'id_product',
                 'extra_route_params' => $extraRouteParams,
+                'confirm_message' => $this->trans('Remember to properly edit all information after duplicating - including SEO information and friendly URL.', [], 'Admin.Catalog.Notification'),
                 'modal_options' => new ModalOptions([
                     'title' => $this->trans('Duplicate product', [], 'Admin.Actions'),
                     'confirm_button_label' => $duplicateLabel,

From e443ef91ca54ce4bb8b7103c0c2937c130d03546 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Wed, 26 Jul 2023 14:47:03 +0200
Subject: [PATCH 0635/1030] Functional Tests : Hummingbird : FO - Header &
 Footer - Check links in header

---
 .../BO/02_orders/01_orders/11_previewOrder.ts |   2 +-
 .../createOrders/04_selectPreviousCarts.ts    |   2 +-
 .../02_enableDisableTaxBreakdown.ts           |   2 +-
 .../03_enableDisableProductImage.ts           |   2 +-
 .../03_enableDisableProductImage.ts           |   2 +-
 .../01_information/01_withAndWithoutCode.ts   |   2 +-
 .../02_enableDisablePartialUse.ts             |   2 +-
 .../01_information/03_priority.ts             |   2 +-
 .../01_information/04_disableStatus.ts        |   2 +-
 .../02_conditions/01_limitToSingleCustomer.ts |   2 +-
 .../02_conditions/02_invalidDateTime.ts       |   2 +-
 .../02_conditions/03_minimumAmount.ts         |   2 +-
 .../02_conditions/04_checkTotalAvailable.ts   |   2 +-
 .../05_checkTotalAvailableForEachUser.ts      |   2 +-
 .../02_conditions/06_countrySelection.ts      |   2 +-
 .../02_conditions/07_carrierSelection.ts      |   2 +-
 .../08_customerGroupSelection.ts              |   2 +-
 .../02_conditions/10_productSelection.ts      |   2 +-
 .../03_actions/07_applyToSpecificProduct.ts   |   2 +-
 .../01_customers/08_viewCustomer.ts           |   2 +-
 .../01_customerService/01_viewMessage.ts      |   2 +-
 .../01_customerService/02_changeStatus.ts     |   2 +-
 .../01_customerService/03_respondToMessage.ts |   2 +-
 .../01_customerService/04_contactOptions.ts   |   2 +-
 .../01_merchandiseReturnOptions.ts            |   2 +-
 .../03_merchandiseReturns/02_deleteProduct.ts |   2 +-
 .../03_merchandiseReturns/03_updateStatus.ts  |   2 +-
 .../09_shipping/01_carriers/01_CRUDCarrier.ts |   2 +-
 .../01_handling/01_handlingCharges.ts         |   2 +-
 .../02_preferences/01_currencyRestrictions.ts |   2 +-
 .../02_preferences/02_groupRestrictions.ts    |   2 +-
 .../02_preferences/03_countryRestrictions.ts  |   2 +-
 .../02_preferences/04_carrierRestrictions.ts  |   2 +-
 .../general/01_enableFinalSummary.ts          |   2 +-
 .../general/02_enableGuestCheckout.ts         |   2 +-
 .../04_minimumPurchaseTotalRequired.ts        |   2 +-
 .../general/06_termsOfService.ts              |   2 +-
 .../giftOptions/01_giftOptions.ts             |   2 +-
 .../04_quantityDiscountsBasedOn.ts            |   2 +-
 .../02_defaultPackStockManagement.ts          |   2 +-
 .../01_filterDeleteAndBulkActionsEmails.ts    |   2 +-
 .../04_email/03_sortAndPagination.ts          |   2 +-
 .../01_checkLinksInHeader.ts                  |   4 +-
 .../02_checkLinksInFooter.ts                  |   2 +-
 .../classic/03_userAccount/02_CRUDAddress.ts  |   2 +-
 .../01_orderDetails/04_sendMessage.ts         |   2 +-
 .../03_userAccount/04_getGDPRDataInPDF.ts     |   4 +-
 .../03_userAccount/05_getGDPRDataInCSV.ts     |   4 +-
 .../03_userAccount/06_contactUsOnGDPRPage.ts  |   2 +-
 .../05_contactUs/01_checkMailtoLink.ts        |   2 +-
 .../FO/classic/09_productPage/01_quickView.ts |   2 +-
 .../01_quickView/01_addToCart.ts              |   2 +-
 .../FO/classic/09_productPage/02_addToCart.ts |   2 +-
 .../10_cart/02_cart/01_changeQuantity.ts      |   2 +-
 .../10_cart/02_cart/02_deleteProduct.ts       |   2 +-
 .../10_cart/02_cart/03_addPromoCode.ts        |   2 +-
 .../01_personalInformation/02_signIn.ts       |   2 +-
 .../05_passwordReminder.ts                    |   2 +-
 .../FO/classic/11_checkout/01_showDetails.ts  |   2 +-
 .../03_shippingMethods/01_addOrderMessage.ts  |   2 +-
 .../03_shippingMethods/02_selectCarrier.ts    |   2 +-
 .../12_orderConfirmation/05_contactUs.ts      |   3 +-
 .../01_checkLinksInHeader.ts                  | 159 ++++++++++++++++++
 tests/UI/pages/FO/FObasePage.ts               |  12 +-
 tests/UI/pages/FO/cart/index.ts               |   5 +-
 tests/UI/pages/FO/contactUs/index.ts          |   5 +-
 tests/UI/pages/FO/home/index.ts               |  29 +++-
 tests/UI/pages/FO/hummingbird/cart/index.ts   |  20 +++
 .../pages/FO/hummingbird/contactUs/index.ts   |  20 +++
 69 files changed, 308 insertions(+), 73 deletions(-)
 create mode 100644 tests/UI/campaigns/functional/FO/hummingbird/02_headerAndFooter/01_checkLinksInHeader.ts
 create mode 100644 tests/UI/pages/FO/hummingbird/cart/index.ts
 create mode 100644 tests/UI/pages/FO/hummingbird/contactUs/index.ts

diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/11_previewOrder.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/11_previewOrder.ts
index 7d20a0ca7950c..bb17f39a161ff 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/11_previewOrder.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/11_previewOrder.ts
@@ -14,7 +14,7 @@ import orderPageCustomerBlock from '@pages/BO/orders/view/customerBlock';
 import orderPageProductsBlock from '@pages/BO/orders/view/productsBlock';
 import orderPageTabListBlock from '@pages/BO/orders/view/tabListBlock';
 // Import FO pages
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 import orderConfirmationPage from '@pages/FO/checkout/orderConfirmation';
 import {homePage} from '@pages/FO/home';
diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/04_selectPreviousCarts.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/04_selectPreviousCarts.ts
index e3be4d9ab8938..5e11e3ac69201 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/04_selectPreviousCarts.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/04_selectPreviousCarts.ts
@@ -15,7 +15,7 @@ import shoppingCartsPage from '@pages/BO/orders/shoppingCarts';
 import viewShoppingCartPage from '@pages/BO/orders/shoppingCarts/view';
 import orderPageProductsBlock from '@pages/BO/orders/view/productsBlock';
 // Import FO pages
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 import {homePage} from '@pages/FO/home';
 import {loginPage as foLoginPage} from '@pages/FO/login';
diff --git a/tests/UI/campaigns/functional/BO/02_orders/02_invoices/03_invoiceOptions/02_enableDisableTaxBreakdown.ts b/tests/UI/campaigns/functional/BO/02_orders/02_invoices/03_invoiceOptions/02_enableDisableTaxBreakdown.ts
index 6f3f71530a3e2..38f0263b1dff2 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/02_invoices/03_invoiceOptions/02_enableDisableTaxBreakdown.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/02_invoices/03_invoiceOptions/02_enableDisableTaxBreakdown.ts
@@ -24,7 +24,7 @@ import ordersPage from '@pages/BO/orders';
 import invoicesPage from '@pages/BO/orders/invoices';
 import orderPageTabListBlock from '@pages/BO/orders/view/tabListBlock';
 // Import FO pages
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 import orderConfirmationPage from '@pages/FO/checkout/orderConfirmation';
 import foProductPage from '@pages/FO/product';
diff --git a/tests/UI/campaigns/functional/BO/02_orders/02_invoices/03_invoiceOptions/03_enableDisableProductImage.ts b/tests/UI/campaigns/functional/BO/02_orders/02_invoices/03_invoiceOptions/03_enableDisableProductImage.ts
index bf947d936bd1d..3ad3048d9f94e 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/02_invoices/03_invoiceOptions/03_enableDisableProductImage.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/02_invoices/03_invoiceOptions/03_enableDisableProductImage.ts
@@ -13,7 +13,7 @@ import ordersPage from '@pages/BO/orders';
 import invoicesPage from '@pages/BO/orders/invoices';
 import orderPageTabListBlock from '@pages/BO/orders/view/tabListBlock';
 // Import FO pages
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 import orderConfirmationPage from '@pages/FO/checkout/orderConfirmation';
 import {homePage} from '@pages/FO/home';
diff --git a/tests/UI/campaigns/functional/BO/02_orders/04_deliverySlips/02_deliverySlipOptions/03_enableDisableProductImage.ts b/tests/UI/campaigns/functional/BO/02_orders/04_deliverySlips/02_deliverySlipOptions/03_enableDisableProductImage.ts
index ee4da7b06b0f7..e8cc679cd28af 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/04_deliverySlips/02_deliverySlipOptions/03_enableDisableProductImage.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/04_deliverySlips/02_deliverySlipOptions/03_enableDisableProductImage.ts
@@ -7,7 +7,7 @@ import testContext from '@utils/testContext';
 import loginCommon from '@commonTests/BO/loginBO';
 
 // Import FO pages
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 import orderConfirmationPage from '@pages/FO/checkout/orderConfirmation';
 import {homePage} from '@pages/FO/home';
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/01_information/01_withAndWithoutCode.ts b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/01_information/01_withAndWithoutCode.ts
index fe99cf3caf3f9..84818c4df6029 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/01_information/01_withAndWithoutCode.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/01_information/01_withAndWithoutCode.ts
@@ -12,7 +12,7 @@ import cartRulesPage from '@pages/BO/catalog/discounts';
 import addCartRulePage from '@pages/BO/catalog/discounts/add';
 import dashboardPage from '@pages/BO/dashboard';
 // Import FO pages
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import {homePage as foHomePage} from '@pages/FO/home';
 import foProductPage from '@pages/FO/product';
 
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/01_information/02_enableDisablePartialUse.ts b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/01_information/02_enableDisablePartialUse.ts
index 7d06a71072f60..52ccc941e3989 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/01_information/02_enableDisablePartialUse.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/01_information/02_enableDisablePartialUse.ts
@@ -10,7 +10,7 @@ import loginCommon from '@commonTests/BO/loginBO';
 import cartRulesPage from '@pages/BO/catalog/discounts';
 import addCartRulePage from '@pages/BO/catalog/discounts/add';
 import dashboardPage from '@pages/BO/dashboard';
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import {homePage} from '@pages/FO/home';
 import foProductPage from '@pages/FO/product';
 import orderConfirmationPage from '@pages/FO/checkout/orderConfirmation';
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/01_information/03_priority.ts b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/01_information/03_priority.ts
index ecb6e553935fa..4faf514cff5b2 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/01_information/03_priority.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/01_information/03_priority.ts
@@ -12,7 +12,7 @@ import cartRulesPage from '@pages/BO/catalog/discounts';
 import addCartRulePage from '@pages/BO/catalog/discounts/add';
 import dashboardPage from '@pages/BO/dashboard';
 // Import FO pages
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import {homePage as foHomePage} from '@pages/FO/home';
 import foProductPage from '@pages/FO/product';
 
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/01_information/04_disableStatus.ts b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/01_information/04_disableStatus.ts
index 4368a1a628350..491755233314b 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/01_information/04_disableStatus.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/01_information/04_disableStatus.ts
@@ -10,7 +10,7 @@ import loginCommon from '@commonTests/BO/loginBO';
 import cartRulesPage from '@pages/BO/catalog/discounts';
 import addCartRulePage from '@pages/BO/catalog/discounts/add';
 import dashboardPage from '@pages/BO/dashboard';
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import {homePage} from '@pages/FO/home';
 import foProductPage from '@pages/FO/product';
 
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/01_limitToSingleCustomer.ts b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/01_limitToSingleCustomer.ts
index 838e6f22ebc85..36b71be5cbcdd 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/01_limitToSingleCustomer.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/01_limitToSingleCustomer.ts
@@ -17,7 +17,7 @@ import {homePage} from '@pages/FO/home';
 import {loginPage as foLoginPage} from '@pages/FO/login';
 import {myAccountPage} from '@pages/FO/myAccount';
 import foVouchersPage from '@pages/FO/myAccount/vouchers';
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 
 // Import data
 import CartRuleData from '@data/faker/cartRule';
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/02_invalidDateTime.ts b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/02_invalidDateTime.ts
index 76e2f9723d5b4..df534bf58d376 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/02_invalidDateTime.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/02_invalidDateTime.ts
@@ -15,7 +15,7 @@ import addCartRulePage from '@pages/BO/catalog/discounts/add';
 // Import FO pages
 import {homePage} from '@pages/FO/home';
 import {loginPage as foLoginPage} from '@pages/FO/login';
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 
 // Import data
 import CartRuleData from '@data/faker/cartRule';
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/03_minimumAmount.ts b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/03_minimumAmount.ts
index 4ed21a7c4dbac..58da82b301b40 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/03_minimumAmount.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/03_minimumAmount.ts
@@ -15,7 +15,7 @@ import addCartRulePage from '@pages/BO/catalog/discounts/add';
 // Import FO pages
 import {homePage} from '@pages/FO/home';
 import {loginPage as foLoginPage} from '@pages/FO/login';
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 
 // Import data
 import CartRuleData from '@data/faker/cartRule';
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/04_checkTotalAvailable.ts b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/04_checkTotalAvailable.ts
index f53a8296a9558..d331cdd56c469 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/04_checkTotalAvailable.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/04_checkTotalAvailable.ts
@@ -12,7 +12,7 @@ import cartRulesPage from '@pages/BO/catalog/discounts';
 import addCartRulePage from '@pages/BO/catalog/discounts/add';
 import dashboardPage from '@pages/BO/dashboard';
 // Import FO pages
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 import orderConfirmationPage from '@pages/FO/checkout/orderConfirmation';
 import {homePage as foHomePage} from '@pages/FO/home';
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/05_checkTotalAvailableForEachUser.ts b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/05_checkTotalAvailableForEachUser.ts
index 712f5ce604b35..ef108cec291d9 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/05_checkTotalAvailableForEachUser.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/05_checkTotalAvailableForEachUser.ts
@@ -13,7 +13,7 @@ import cartRulesPage from '@pages/BO/catalog/discounts';
 import addCartRulePage from '@pages/BO/catalog/discounts/add';
 import dashboardPage from '@pages/BO/dashboard';
 // Import FO pages
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 import orderConfirmationPage from '@pages/FO/checkout/orderConfirmation';
 import {homePage} from '@pages/FO/home';
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/06_countrySelection.ts b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/06_countrySelection.ts
index 261c07067d087..ba87565809646 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/06_countrySelection.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/06_countrySelection.ts
@@ -14,7 +14,7 @@ import dashboardPage from '@pages/BO/dashboard';
 import zonesPage from '@pages/BO/international/locations';
 import countriesPage from '@pages/BO/international/locations/countries';
 // Import FO pages
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 import {homePage as foHomePage} from '@pages/FO/home';
 import foProductPage from '@pages/FO/product';
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/07_carrierSelection.ts b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/07_carrierSelection.ts
index 6ac3ef599ff0d..da94cba5cd92f 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/07_carrierSelection.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/07_carrierSelection.ts
@@ -12,7 +12,7 @@ import cartRulesPage from '@pages/BO/catalog/discounts';
 import addCartRulePage from '@pages/BO/catalog/discounts/add';
 import dashboardPage from '@pages/BO/dashboard';
 // Import FO pages
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 import {homePage as foHomePage} from '@pages/FO/home';
 import foProductPage from '@pages/FO/product';
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/08_customerGroupSelection.ts b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/08_customerGroupSelection.ts
index 0a2e944a7736d..701cd143f37c2 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/08_customerGroupSelection.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/08_customerGroupSelection.ts
@@ -11,7 +11,7 @@ import cartRulesPage from '@pages/BO/catalog/discounts';
 import addCartRulePage from '@pages/BO/catalog/discounts/add';
 import dashboardPage from '@pages/BO/dashboard';
 // Import FO pages
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import {homePage as foHomePage} from '@pages/FO/home';
 import {loginPage} from '@pages/FO/login';
 import foProductPage from '@pages/FO/product';
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/10_productSelection.ts b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/10_productSelection.ts
index dfb6b0651fb45..d2b3b17a860a4 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/10_productSelection.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/10_productSelection.ts
@@ -13,7 +13,7 @@ import cartRulesPage from '@pages/BO/catalog/discounts';
 import addCartRulePage from '@pages/BO/catalog/discounts/add';
 import dashboardPage from '@pages/BO/dashboard';
 // Import FO pages
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import {homePage} from '@pages/FO/home';
 import {loginPage} from '@pages/FO/login';
 import productPage from '@pages/FO/product';
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/03_actions/07_applyToSpecificProduct.ts b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/03_actions/07_applyToSpecificProduct.ts
index 04aef57357470..0ca0246e4509d 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/03_actions/07_applyToSpecificProduct.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/03_actions/07_applyToSpecificProduct.ts
@@ -13,7 +13,7 @@ import cartRulesPage from '@pages/BO/catalog/discounts';
 import addCartRulePage from '@pages/BO/catalog/discounts/add';
 import dashboardPage from '@pages/BO/dashboard';
 // Import FO pages
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import {homePage} from '@pages/FO/home';
 import {loginPage} from '@pages/FO/login';
 import productPage from '@pages/FO/product';
diff --git a/tests/UI/campaigns/functional/BO/04_customers/01_customers/08_viewCustomer.ts b/tests/UI/campaigns/functional/BO/04_customers/01_customers/08_viewCustomer.ts
index 59b2db33bcdc3..b712851e2d255 100644
--- a/tests/UI/campaigns/functional/BO/04_customers/01_customers/08_viewCustomer.ts
+++ b/tests/UI/campaigns/functional/BO/04_customers/01_customers/08_viewCustomer.ts
@@ -16,7 +16,7 @@ import dashboardPage from '@pages/BO/dashboard';
 import viewCartPage from '@pages/BO/orders/shoppingCarts/view';
 import orderPageCustomerBlock from '@pages/BO/orders/view/customerBlock';
 // Import FO pages
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 import orderConfirmationPage from '@pages/FO/checkout/orderConfirmation';
 import {homePage as foHomePage} from '@pages/FO/home';
diff --git a/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/01_viewMessage.ts b/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/01_viewMessage.ts
index 254835e958977..b444f06f66225 100644
--- a/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/01_viewMessage.ts
+++ b/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/01_viewMessage.ts
@@ -12,7 +12,7 @@ import customerServicePage from '@pages/BO/customerService/customerService';
 import viewPage from '@pages/BO/customerService/customerService/view';
 import dashboardPage from '@pages/BO/dashboard';
 // Import FO pages
-import contactUsPage from '@pages/FO/contactUs';
+import {contactUsPage} from '@pages/FO/contactUs';
 import {homePage} from '@pages/FO/home';
 
 // Import data
diff --git a/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/02_changeStatus.ts b/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/02_changeStatus.ts
index fc942ed8498c7..a01fbb2e1e333 100644
--- a/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/02_changeStatus.ts
+++ b/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/02_changeStatus.ts
@@ -12,7 +12,7 @@ import customerServicePage from '@pages/BO/customerService/customerService';
 import viewPage from '@pages/BO/customerService/customerService/view';
 import dashboardPage from '@pages/BO/dashboard';
 // Import FO pages
-import contactUsPage from '@pages/FO/contactUs';
+import {contactUsPage} from '@pages/FO/contactUs';
 import {homePage} from '@pages/FO/home';
 import {loginPage as foLoginPage} from '@pages/FO/login';
 
diff --git a/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/03_respondToMessage.ts b/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/03_respondToMessage.ts
index 0865916521e7a..6c5fed2851ef0 100644
--- a/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/03_respondToMessage.ts
+++ b/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/03_respondToMessage.ts
@@ -12,7 +12,7 @@ import customerServicePage from '@pages/BO/customerService/customerService';
 import viewPage from '@pages/BO/customerService/customerService/view';
 import dashboardPage from '@pages/BO/dashboard';
 // Import FO pages
-import contactUsPage from '@pages/FO/contactUs';
+import {contactUsPage} from '@pages/FO/contactUs';
 import {homePage} from '@pages/FO/home';
 
 // Import data
diff --git a/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/04_contactOptions.ts b/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/04_contactOptions.ts
index 16e0975aa478f..dd250e9e82fc8 100644
--- a/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/04_contactOptions.ts
+++ b/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/04_contactOptions.ts
@@ -11,7 +11,7 @@ import customerServicePage from '@pages/BO/customerService/customerService';
 import viewPage from '@pages/BO/customerService/customerService/view';
 import dashboardPage from '@pages/BO/dashboard';
 // Import FO pages
-import contactUsPage from '@pages/FO/contactUs';
+import {contactUsPage} from '@pages/FO/contactUs';
 import {homePage} from '@pages/FO/home';
 
 // Import data
diff --git a/tests/UI/campaigns/functional/BO/05_customerService/03_merchandiseReturns/01_merchandiseReturnOptions.ts b/tests/UI/campaigns/functional/BO/05_customerService/03_merchandiseReturns/01_merchandiseReturnOptions.ts
index e938dfbf13193..ec379253e019e 100644
--- a/tests/UI/campaigns/functional/BO/05_customerService/03_merchandiseReturns/01_merchandiseReturnOptions.ts
+++ b/tests/UI/campaigns/functional/BO/05_customerService/03_merchandiseReturns/01_merchandiseReturnOptions.ts
@@ -12,7 +12,7 @@ import dashboardPage from '@pages/BO/dashboard';
 import ordersPage from '@pages/BO/orders';
 import {viewOrderBasePage} from '@pages/BO/orders/view/viewOrderBasePage';
 // Import FO pages
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 import orderConfirmationPage from '@pages/FO/checkout/orderConfirmation';
 import {homePage} from '@pages/FO/home';
diff --git a/tests/UI/campaigns/functional/BO/05_customerService/03_merchandiseReturns/02_deleteProduct.ts b/tests/UI/campaigns/functional/BO/05_customerService/03_merchandiseReturns/02_deleteProduct.ts
index 07777aee170d3..ee5e4a37193d6 100644
--- a/tests/UI/campaigns/functional/BO/05_customerService/03_merchandiseReturns/02_deleteProduct.ts
+++ b/tests/UI/campaigns/functional/BO/05_customerService/03_merchandiseReturns/02_deleteProduct.ts
@@ -13,7 +13,7 @@ import ordersPage from '@pages/BO/orders';
 import {viewOrderBasePage} from '@pages/BO/orders/view/viewOrderBasePage';
 import editMerchandiseReturnsPage from '@pages/BO/customerService/merchandiseReturns/edit';
 // Import FO pages
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 import orderConfirmationPage from '@pages/FO/checkout/orderConfirmation';
 import {homePage} from '@pages/FO/home';
diff --git a/tests/UI/campaigns/functional/BO/05_customerService/03_merchandiseReturns/03_updateStatus.ts b/tests/UI/campaigns/functional/BO/05_customerService/03_merchandiseReturns/03_updateStatus.ts
index 444378218201a..a66a4fb3f13ce 100644
--- a/tests/UI/campaigns/functional/BO/05_customerService/03_merchandiseReturns/03_updateStatus.ts
+++ b/tests/UI/campaigns/functional/BO/05_customerService/03_merchandiseReturns/03_updateStatus.ts
@@ -15,7 +15,7 @@ import ordersPage from '@pages/BO/orders';
 import {viewOrderBasePage} from '@pages/BO/orders/view/viewOrderBasePage';
 import editMerchandiseReturnsPage from '@pages/BO/customerService/merchandiseReturns/edit';
 // Import FO pages
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 import orderConfirmationPage from '@pages/FO/checkout/orderConfirmation';
 import {homePage} from '@pages/FO/home';
diff --git a/tests/UI/campaigns/functional/BO/09_shipping/01_carriers/01_CRUDCarrier.ts b/tests/UI/campaigns/functional/BO/09_shipping/01_carriers/01_CRUDCarrier.ts
index 4d94bdd481040..78a1ede4bd6d7 100644
--- a/tests/UI/campaigns/functional/BO/09_shipping/01_carriers/01_CRUDCarrier.ts
+++ b/tests/UI/campaigns/functional/BO/09_shipping/01_carriers/01_CRUDCarrier.ts
@@ -12,7 +12,7 @@ import dashboardPage from '@pages/BO/dashboard';
 import carriersPage from '@pages/BO/shipping/carriers';
 import addCarrierPage from '@pages/BO/shipping/carriers/add';
 // Import FO pages
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 import {homePage} from '@pages/FO/home';
 import {loginPage as foLoginPage} from '@pages/FO/login';
diff --git a/tests/UI/campaigns/functional/BO/09_shipping/02_preferences/01_handling/01_handlingCharges.ts b/tests/UI/campaigns/functional/BO/09_shipping/02_preferences/01_handling/01_handlingCharges.ts
index cff00535b8cd1..d1c9bedc5ef3b 100644
--- a/tests/UI/campaigns/functional/BO/09_shipping/02_preferences/01_handling/01_handlingCharges.ts
+++ b/tests/UI/campaigns/functional/BO/09_shipping/02_preferences/01_handling/01_handlingCharges.ts
@@ -16,7 +16,7 @@ import customerSettingsPage from '@pages/BO/shopParameters/customerSettings';
 import groupsPage from '@pages/BO/shopParameters/customerSettings/groups';
 import addGroupPage from '@pages/BO/shopParameters/customerSettings/groups/add';
 // Import FO pages
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 import {homePage} from '@pages/FO/home';
 import {loginPage as foLoginPage} from '@pages/FO/login';
diff --git a/tests/UI/campaigns/functional/BO/10_payment/02_preferences/01_currencyRestrictions.ts b/tests/UI/campaigns/functional/BO/10_payment/02_preferences/01_currencyRestrictions.ts
index 29181a002aebc..062665bd8d206 100644
--- a/tests/UI/campaigns/functional/BO/10_payment/02_preferences/01_currencyRestrictions.ts
+++ b/tests/UI/campaigns/functional/BO/10_payment/02_preferences/01_currencyRestrictions.ts
@@ -10,7 +10,7 @@ import loginCommon from '@commonTests/BO/loginBO';
 import dashboardPage from '@pages/BO/dashboard';
 import preferencesPage from '@pages/BO/payment/preferences';
 // Import FO pages
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 import {homePage} from '@pages/FO/home';
 import productPage from '@pages/FO/product';
diff --git a/tests/UI/campaigns/functional/BO/10_payment/02_preferences/02_groupRestrictions.ts b/tests/UI/campaigns/functional/BO/10_payment/02_preferences/02_groupRestrictions.ts
index 0bc22d8cb6514..428df8478a55d 100644
--- a/tests/UI/campaigns/functional/BO/10_payment/02_preferences/02_groupRestrictions.ts
+++ b/tests/UI/campaigns/functional/BO/10_payment/02_preferences/02_groupRestrictions.ts
@@ -12,7 +12,7 @@ import customersPage from '@pages/BO/customers';
 import addCustomerPage from '@pages/BO/customers/add';
 import preferencesPage from '@pages/BO/payment/preferences';
 // Import FO pages
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 import {homePage} from '@pages/FO/home';
 import productPage from '@pages/FO/product';
diff --git a/tests/UI/campaigns/functional/BO/10_payment/02_preferences/03_countryRestrictions.ts b/tests/UI/campaigns/functional/BO/10_payment/02_preferences/03_countryRestrictions.ts
index 029c3ee8674e2..f8d74e0ebf9fd 100644
--- a/tests/UI/campaigns/functional/BO/10_payment/02_preferences/03_countryRestrictions.ts
+++ b/tests/UI/campaigns/functional/BO/10_payment/02_preferences/03_countryRestrictions.ts
@@ -10,7 +10,7 @@ import loginCommon from '@commonTests/BO/loginBO';
 import dashboardPage from '@pages/BO/dashboard';
 import preferencesPage from '@pages/BO/payment/preferences';
 // Import FO pages
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 import {homePage} from '@pages/FO/home';
 import productPage from '@pages/FO/product';
diff --git a/tests/UI/campaigns/functional/BO/10_payment/02_preferences/04_carrierRestrictions.ts b/tests/UI/campaigns/functional/BO/10_payment/02_preferences/04_carrierRestrictions.ts
index fa26f3f80f503..f5662e9d6de17 100644
--- a/tests/UI/campaigns/functional/BO/10_payment/02_preferences/04_carrierRestrictions.ts
+++ b/tests/UI/campaigns/functional/BO/10_payment/02_preferences/04_carrierRestrictions.ts
@@ -10,7 +10,7 @@ import loginCommon from '@commonTests/BO/loginBO';
 import dashboardPage from '@pages/BO/dashboard';
 import preferencesPage from '@pages/BO/payment/preferences';
 // Import FO pages
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 import {homePage} from '@pages/FO/home';
 import {loginPage as foLoginPage} from '@pages/FO/login';
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/general/01_enableFinalSummary.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/general/01_enableFinalSummary.ts
index 6a77a8d5a9891..3ac188ed5a511 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/general/01_enableFinalSummary.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/general/01_enableFinalSummary.ts
@@ -12,7 +12,7 @@ import orderSettingsPage from '@pages/BO/shopParameters/orderSettings';
 // Import FO pages
 import {homePage} from '@pages/FO/home';
 import productPage from '@pages/FO/product';
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 import orderConfirmationPage from '@pages/FO/checkout/orderConfirmation';
 
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/general/02_enableGuestCheckout.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/general/02_enableGuestCheckout.ts
index ea79c06ada25c..3f1948ad8b2df 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/general/02_enableGuestCheckout.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/general/02_enableGuestCheckout.ts
@@ -12,7 +12,7 @@ import orderSettingsPage from '@pages/BO/shopParameters/orderSettings';
 // Import FO pages
 import {homePage} from '@pages/FO/home';
 import productPage from '@pages/FO/product';
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 
 import {expect} from 'chai';
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/general/04_minimumPurchaseTotalRequired.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/general/04_minimumPurchaseTotalRequired.ts
index e7f20d34971b9..377a7ae4d2f41 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/general/04_minimumPurchaseTotalRequired.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/general/04_minimumPurchaseTotalRequired.ts
@@ -12,7 +12,7 @@ import orderSettingsPage from '@pages/BO/shopParameters/orderSettings';
 // Import FO pages
 import {homePage} from '@pages/FO/home';
 import productPage from '@pages/FO/product';
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 
 import {expect} from 'chai';
 import type {BrowserContext, Page} from 'playwright';
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/general/06_termsOfService.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/general/06_termsOfService.ts
index e6ef1abeda148..d20341ba5631c 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/general/06_termsOfService.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/general/06_termsOfService.ts
@@ -12,7 +12,7 @@ import orderSettingsPage from '@pages/BO/shopParameters/orderSettings';
 // Import FO pages
 import productPage from '@pages/FO/product';
 import {homePage} from '@pages/FO/home';
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 
 // Import data
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/giftOptions/01_giftOptions.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/giftOptions/01_giftOptions.ts
index 1e4c6a1ff2375..a509f41dbf33b 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/giftOptions/01_giftOptions.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/giftOptions/01_giftOptions.ts
@@ -15,7 +15,7 @@ import orderPageProductsBlock from '@pages/BO/orders/view/productsBlock';
 // Import FO pages
 import {homePage} from '@pages/FO/home';
 import productPage from '@pages/FO/product';
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 import {loginPage as foLoginPage} from '@pages/FO/login';
 import orderConfirmationPage from '@pages/FO/checkout/orderConfirmation';
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/04_quantityDiscountsBasedOn.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/04_quantityDiscountsBasedOn.ts
index da14e101740f3..2d95a3fb47251 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/04_quantityDiscountsBasedOn.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/04_quantityDiscountsBasedOn.ts
@@ -18,7 +18,7 @@ import productsPage from '@pages/BO/catalog/products';
 import addProductPage from '@pages/BO/catalog/products/add';
 // Import FO pages
 import foProductPage from '@pages/FO/product';
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 
 // Import data
 import ProductData from '@data/faker/product';
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/02_defaultPackStockManagement.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/02_defaultPackStockManagement.ts
index e435299eb898b..06be007c8f203 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/02_defaultPackStockManagement.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/02_defaultPackStockManagement.ts
@@ -19,7 +19,7 @@ import addProductPage from '@pages/BO/catalog/products/add';
 import {homePage as foHomePage} from '@pages/FO/home';
 import foProductPage from '@pages/FO/product';
 import {loginPage as foLoginPage} from '@pages/FO/login';
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 import orderConfirmationPage from '@pages/FO/checkout/orderConfirmation';
 import searchResultsPage from '@pages/FO/searchResults';
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/04_email/01_filterDeleteAndBulkActionsEmails.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/04_email/01_filterDeleteAndBulkActionsEmails.ts
index d345b081f3398..d59529a7e8c3e 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/04_email/01_filterDeleteAndBulkActionsEmails.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/04_email/01_filterDeleteAndBulkActionsEmails.ts
@@ -14,7 +14,7 @@ import emailPage from '@pages/BO/advancedParameters/email';
 // Import FO pages
 import {homePage} from '@pages/FO/home';
 import productPage from '@pages/FO/product';
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 import orderConfirmationPage from '@pages/FO/checkout/orderConfirmation';
 
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/04_email/03_sortAndPagination.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/04_email/03_sortAndPagination.ts
index dce80325d1bd2..96f3686a5f8db 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/04_email/03_sortAndPagination.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/04_email/03_sortAndPagination.ts
@@ -15,7 +15,7 @@ import emailPage from '@pages/BO/advancedParameters/email';
 import {loginPage as foLoginPage} from '@pages/FO/login';
 import {homePage} from '@pages/FO/home';
 import productPage from '@pages/FO/product';
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 import orderConfirmationPage from '@pages/FO/checkout/orderConfirmation';
 
diff --git a/tests/UI/campaigns/functional/FO/classic/02_headerAndFooter/01_checkLinksInHeader.ts b/tests/UI/campaigns/functional/FO/classic/02_headerAndFooter/01_checkLinksInHeader.ts
index 9289adb49b9f0..2d7131b698420 100644
--- a/tests/UI/campaigns/functional/FO/classic/02_headerAndFooter/01_checkLinksInHeader.ts
+++ b/tests/UI/campaigns/functional/FO/classic/02_headerAndFooter/01_checkLinksInHeader.ts
@@ -3,8 +3,8 @@ import helper from '@utils/helpers';
 import testContext from '@utils/testContext';
 
 // Import FO pages
-import cartPage from '@pages/FO/cart';
-import contactUsPage from '@pages/FO/contactUs';
+import {cartPage} from '@pages/FO/cart';
+import {contactUsPage} from '@pages/FO/contactUs';
 import {homePage} from '@pages/FO/home';
 import {loginPage} from '@pages/FO/login';
 import {myAccountPage} from '@pages/FO/myAccount';
diff --git a/tests/UI/campaigns/functional/FO/classic/02_headerAndFooter/02_checkLinksInFooter.ts b/tests/UI/campaigns/functional/FO/classic/02_headerAndFooter/02_checkLinksInFooter.ts
index 203fe5fa62667..d9abdd168030f 100644
--- a/tests/UI/campaigns/functional/FO/classic/02_headerAndFooter/02_checkLinksInFooter.ts
+++ b/tests/UI/campaigns/functional/FO/classic/02_headerAndFooter/02_checkLinksInFooter.ts
@@ -12,7 +12,7 @@ import {createAccountTest} from '@commonTests/FO/account';
 // Import FO pages
 import aboutUsPage from '@pages/FO/aboutUs';
 import bestSalesPage from '@pages/FO/bestSales';
-import contactUsPage from '@pages/FO/contactUs';
+import {contactUsPage} from '@pages/FO/contactUs';
 import deliveryPage from '@pages/FO/delivery';
 import {homePage} from '@pages/FO/home';
 import legalNoticePage from '@pages/FO/legalNotice';
diff --git a/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_CRUDAddress.ts b/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_CRUDAddress.ts
index 198caa0dbfb2f..83c0b0d92e6b9 100644
--- a/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_CRUDAddress.ts
+++ b/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_CRUDAddress.ts
@@ -8,7 +8,7 @@ import {deleteCustomerTest} from '@commonTests/BO/customers/customer';
 import {createAccountTest} from '@commonTests/FO/account';
 
 // Import FO pages
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 import {homePage} from '@pages/FO/home';
 import {loginPage} from '@pages/FO/login';
diff --git a/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_orderDetails/04_sendMessage.ts b/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_orderDetails/04_sendMessage.ts
index 97f75e084413e..d40a08e41808c 100644
--- a/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_orderDetails/04_sendMessage.ts
+++ b/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_orderDetails/04_sendMessage.ts
@@ -11,7 +11,7 @@ import customerServicePage from '@pages/BO/customerService/customerService';
 import dashboardPage from '@pages/BO/dashboard';
 import ordersPage from '@pages/BO/orders';
 // Import FO pages
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 import orderConfirmationPage from '@pages/FO/checkout/orderConfirmation';
 import {homePage as foHomePage} from '@pages/FO/home';
diff --git a/tests/UI/campaigns/functional/FO/classic/03_userAccount/04_getGDPRDataInPDF.ts b/tests/UI/campaigns/functional/FO/classic/03_userAccount/04_getGDPRDataInPDF.ts
index c6371f9450993..d52492c201c54 100644
--- a/tests/UI/campaigns/functional/FO/classic/03_userAccount/04_getGDPRDataInPDF.ts
+++ b/tests/UI/campaigns/functional/FO/classic/03_userAccount/04_getGDPRDataInPDF.ts
@@ -17,10 +17,10 @@ import dashboardPage from '@pages/BO/dashboard';
 import ordersPage from '@pages/BO/orders';
 import shoppingCartsPage from '@pages/BO/orders/shoppingCarts';
 // Import FO pages
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 import orderConfirmationPage from '@pages/FO/checkout/orderConfirmation';
-import contactUsPage from '@pages/FO/contactUs';
+import {contactUsPage} from '@pages/FO/contactUs';
 import {homePage} from '@pages/FO/home';
 import {loginPage} from '@pages/FO/login';
 import {myAccountPage} from '@pages/FO/myAccount';
diff --git a/tests/UI/campaigns/functional/FO/classic/03_userAccount/05_getGDPRDataInCSV.ts b/tests/UI/campaigns/functional/FO/classic/03_userAccount/05_getGDPRDataInCSV.ts
index efb4738e8be8b..5616ab6e368c0 100644
--- a/tests/UI/campaigns/functional/FO/classic/03_userAccount/05_getGDPRDataInCSV.ts
+++ b/tests/UI/campaigns/functional/FO/classic/03_userAccount/05_getGDPRDataInCSV.ts
@@ -9,10 +9,10 @@ import {deleteCustomerTest} from '@commonTests/BO/customers/customer';
 import loginCommon from '@commonTests/BO/loginBO';
 
 // Import FO pages
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 import orderConfirmationPage from '@pages/FO/checkout/orderConfirmation';
-import contactUsPage from '@pages/FO/contactUs';
+import {contactUsPage} from '@pages/FO/contactUs';
 import customersPage from '@pages/BO/customers';
 import viewCustomerPage from '@pages/BO/customers/view';
 import customerServicePage from '@pages/BO/customerService/customerService';
diff --git a/tests/UI/campaigns/functional/FO/classic/03_userAccount/06_contactUsOnGDPRPage.ts b/tests/UI/campaigns/functional/FO/classic/03_userAccount/06_contactUsOnGDPRPage.ts
index bc8a4276941e0..fa91bd0fab9fe 100644
--- a/tests/UI/campaigns/functional/FO/classic/03_userAccount/06_contactUsOnGDPRPage.ts
+++ b/tests/UI/campaigns/functional/FO/classic/03_userAccount/06_contactUsOnGDPRPage.ts
@@ -11,7 +11,7 @@ import loginCommon from '@commonTests/BO/loginBO';
 import customerServicePage from '@pages/BO/customerService/customerService';
 import dashboardPage from '@pages/BO/dashboard';
 // Import FO pages
-import contactUsPage from '@pages/FO/contactUs';
+import {contactUsPage} from '@pages/FO/contactUs';
 import {homePage} from '@pages/FO/home';
 import {loginPage} from '@pages/FO/login';
 import {myAccountPage} from '@pages/FO/myAccount';
diff --git a/tests/UI/campaigns/functional/FO/classic/05_contactUs/01_checkMailtoLink.ts b/tests/UI/campaigns/functional/FO/classic/05_contactUs/01_checkMailtoLink.ts
index a8b8a4e118514..e85f381eb9f88 100644
--- a/tests/UI/campaigns/functional/FO/classic/05_contactUs/01_checkMailtoLink.ts
+++ b/tests/UI/campaigns/functional/FO/classic/05_contactUs/01_checkMailtoLink.ts
@@ -3,7 +3,7 @@ import helper from '@utils/helpers';
 import testContext from '@utils/testContext';
 
 // Import FO pages
-import contactUsPage from '@pages/FO/contactUs';
+import {contactUsPage} from '@pages/FO/contactUs';
 import {homePage} from '@pages/FO/home';
 
 // Import data
diff --git a/tests/UI/campaigns/functional/FO/classic/09_productPage/01_quickView.ts b/tests/UI/campaigns/functional/FO/classic/09_productPage/01_quickView.ts
index d51dbd959cf22..dceba9c9e32fd 100644
--- a/tests/UI/campaigns/functional/FO/classic/09_productPage/01_quickView.ts
+++ b/tests/UI/campaigns/functional/FO/classic/09_productPage/01_quickView.ts
@@ -18,7 +18,7 @@ import boProductsPage from '@pages/BO/catalog/products';
 import boAddProductPage from '@pages/BO/catalog/products/add';
 // FO
 import {homePage} from '@pages/FO/home';
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import productPage from '@pages/FO/product';
 import searchResultsPage from '@pages/FO/searchResults';
 
diff --git a/tests/UI/campaigns/functional/FO/classic/09_productPage/01_quickView/01_addToCart.ts b/tests/UI/campaigns/functional/FO/classic/09_productPage/01_quickView/01_addToCart.ts
index f404a70403641..53d8688709c68 100644
--- a/tests/UI/campaigns/functional/FO/classic/09_productPage/01_quickView/01_addToCart.ts
+++ b/tests/UI/campaigns/functional/FO/classic/09_productPage/01_quickView/01_addToCart.ts
@@ -4,7 +4,7 @@ import testContext from '@utils/testContext';
 
 // Import pages
 import {homePage} from '@pages/FO/home';
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import searchResultsPage from '@pages/FO/searchResults';
 
 // Import data
diff --git a/tests/UI/campaigns/functional/FO/classic/09_productPage/02_addToCart.ts b/tests/UI/campaigns/functional/FO/classic/09_productPage/02_addToCart.ts
index 98a029c8ac44f..39e271a24dc62 100644
--- a/tests/UI/campaigns/functional/FO/classic/09_productPage/02_addToCart.ts
+++ b/tests/UI/campaigns/functional/FO/classic/09_productPage/02_addToCart.ts
@@ -20,7 +20,7 @@ import boAddProductPage from '@pages/BO/catalog/products/add';
 import {homePage} from '@pages/FO/home';
 import searchResultsPage from '@pages/FO/searchResults';
 import productPage from '@pages/FO/product';
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 
 // Import data
 import Products from '@data/demo/products';
diff --git a/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/01_changeQuantity.ts b/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/01_changeQuantity.ts
index efd9643f820a0..89fb474cae625 100644
--- a/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/01_changeQuantity.ts
+++ b/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/01_changeQuantity.ts
@@ -3,7 +3,7 @@ import helper from '@utils/helpers';
 import testContext from '@utils/testContext';
 
 // Import FO pages
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import {homePage} from '@pages/FO/home';
 
 import {expect} from 'chai';
diff --git a/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/02_deleteProduct.ts b/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/02_deleteProduct.ts
index fd9a833c2f952..22b68aa1fc236 100644
--- a/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/02_deleteProduct.ts
+++ b/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/02_deleteProduct.ts
@@ -3,7 +3,7 @@ import helper from '@utils/helpers';
 import testContext from '@utils/testContext';
 
 // Import FO pages
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import {homePage as foHomePage, homePage} from '@pages/FO/home';
 
 import {expect} from 'chai';
diff --git a/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/03_addPromoCode.ts b/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/03_addPromoCode.ts
index 65b1f8f27edf1..e972d51f9bb5f 100644
--- a/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/03_addPromoCode.ts
+++ b/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/03_addPromoCode.ts
@@ -3,7 +3,7 @@ import helper from '@utils/helpers';
 import testContext from '@utils/testContext';
 
 // Import FO pages
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import {homePage} from '@pages/FO/home';
 
 // Import commonTests
diff --git a/tests/UI/campaigns/functional/FO/classic/11_checkout/01_personalInformation/02_signIn.ts b/tests/UI/campaigns/functional/FO/classic/11_checkout/01_personalInformation/02_signIn.ts
index b32d564868415..14de36d9f8213 100644
--- a/tests/UI/campaigns/functional/FO/classic/11_checkout/01_personalInformation/02_signIn.ts
+++ b/tests/UI/campaigns/functional/FO/classic/11_checkout/01_personalInformation/02_signIn.ts
@@ -5,7 +5,7 @@ import helper from '@utils/helpers';
 // Import pages
 import {homePage} from '@pages/FO/home';
 import productPage from '@pages/FO/product';
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 
 // Import data
diff --git a/tests/UI/campaigns/functional/FO/classic/11_checkout/01_personalInformation/05_passwordReminder.ts b/tests/UI/campaigns/functional/FO/classic/11_checkout/01_personalInformation/05_passwordReminder.ts
index 0eaf51377de51..7d5db078fac0d 100644
--- a/tests/UI/campaigns/functional/FO/classic/11_checkout/01_personalInformation/05_passwordReminder.ts
+++ b/tests/UI/campaigns/functional/FO/classic/11_checkout/01_personalInformation/05_passwordReminder.ts
@@ -11,7 +11,7 @@ import {createAccountTest} from '@commonTests/FO/account';
 // Import pages
 import {homePage} from '@pages/FO/home';
 import productPage from '@pages/FO/product';
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 import {passwordReminderPage} from '@pages/FO/passwordReminder';
 import {myAccountPage} from '@pages/FO/myAccount';
diff --git a/tests/UI/campaigns/functional/FO/classic/11_checkout/01_showDetails.ts b/tests/UI/campaigns/functional/FO/classic/11_checkout/01_showDetails.ts
index ad15c83f74e0a..7b0fc6764874c 100644
--- a/tests/UI/campaigns/functional/FO/classic/11_checkout/01_showDetails.ts
+++ b/tests/UI/campaigns/functional/FO/classic/11_checkout/01_showDetails.ts
@@ -3,7 +3,7 @@ import helper from '@utils/helpers';
 import testContext from '@utils/testContext';
 
 // Import FO pages
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import {homePage} from '@pages/FO/home';
 import {loginPage} from '@pages/FO/login';
 import productPage from '@pages/FO/product';
diff --git a/tests/UI/campaigns/functional/FO/classic/11_checkout/03_shippingMethods/01_addOrderMessage.ts b/tests/UI/campaigns/functional/FO/classic/11_checkout/03_shippingMethods/01_addOrderMessage.ts
index 8bcc1a74b2615..551e76a22c64f 100644
--- a/tests/UI/campaigns/functional/FO/classic/11_checkout/03_shippingMethods/01_addOrderMessage.ts
+++ b/tests/UI/campaigns/functional/FO/classic/11_checkout/03_shippingMethods/01_addOrderMessage.ts
@@ -3,7 +3,7 @@ import helper from '@utils/helpers';
 import testContext from '@utils/testContext';
 
 // Import FO pages
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 import {homePage} from '@pages/FO/home';
 import {loginPage} from '@pages/FO/login';
diff --git a/tests/UI/campaigns/functional/FO/classic/11_checkout/03_shippingMethods/02_selectCarrier.ts b/tests/UI/campaigns/functional/FO/classic/11_checkout/03_shippingMethods/02_selectCarrier.ts
index 9a7b3c72f8771..49f41758d2afc 100644
--- a/tests/UI/campaigns/functional/FO/classic/11_checkout/03_shippingMethods/02_selectCarrier.ts
+++ b/tests/UI/campaigns/functional/FO/classic/11_checkout/03_shippingMethods/02_selectCarrier.ts
@@ -7,7 +7,7 @@ import {deleteCustomerTest} from '@commonTests/BO/customers/customer';
 import {createAccountTest} from '@commonTests/FO/account';
 
 // Import FO pages
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 import {homePage} from '@pages/FO/home';
 import productPage from '@pages/FO/product';
diff --git a/tests/UI/campaigns/functional/FO/classic/12_orderConfirmation/05_contactUs.ts b/tests/UI/campaigns/functional/FO/classic/12_orderConfirmation/05_contactUs.ts
index b54e7f74a7051..4f8cfcde087b1 100644
--- a/tests/UI/campaigns/functional/FO/classic/12_orderConfirmation/05_contactUs.ts
+++ b/tests/UI/campaigns/functional/FO/classic/12_orderConfirmation/05_contactUs.ts
@@ -15,10 +15,9 @@ import customerServiceMessageViewPage from '@pages/BO/customerService/customerSe
 import {homePage as foHomePage} from '@pages/FO/home';
 import {loginPage as foLoginPage} from '@pages/FO/login';
 import {myAccountPage} from '@pages/FO/myAccount';
-import cartPage from '@pages/FO/cart';
+import {cartPage, contactUsPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 import orderConfirmationPage from '@pages/FO/checkout/orderConfirmation';
-import contactUsPage from '@pages/FO/contactUs';
 
 // Import data
 import Customers from '@data/demo/customers';
diff --git a/tests/UI/campaigns/functional/FO/hummingbird/02_headerAndFooter/01_checkLinksInHeader.ts b/tests/UI/campaigns/functional/FO/hummingbird/02_headerAndFooter/01_checkLinksInHeader.ts
new file mode 100644
index 0000000000000..8e1cb7de3caae
--- /dev/null
+++ b/tests/UI/campaigns/functional/FO/hummingbird/02_headerAndFooter/01_checkLinksInHeader.ts
@@ -0,0 +1,159 @@
+// Import utils
+import helper from '@utils/helpers';
+import testContext from '@utils/testContext';
+
+// Import commonTests
+import {installHummingbird, uninstallHummingbird} from '@commonTests/FO/hummingbird';
+
+// Import FO pages
+import cartPage from '@pages/FO/hummingbird/cart';
+import contactUsPage from '@pages/FO/hummingbird/contactUs';
+import homePage from '@pages/FO/hummingbird/home';
+import loginPage from '@pages/FO/hummingbird/login';
+import myAccountPage from '@pages/FO/hummingbird/myAccount';
+
+// Import data
+import Customers from '@data/demo/customers';
+
+import {expect} from 'chai';
+import type {BrowserContext, Page} from 'playwright';
+
+const baseContext: string = 'functional_FO_classic_headerAndFooter_checkLinksInHeader';
+
+/*
+Go to FO
+Check header links:
+- Contact us
+- Sign in
+- My account( Customer name)
+- Cart
+- Sign out
+- Logo
+ */
+describe('FO - Header and Footer : Check links in header page', async () => {
+  let browserContext: BrowserContext;
+  let page: Page;
+
+  // Pre-condition : Install Hummingbird
+  installHummingbird(`${baseContext}_preTest_1`);
+
+  describe('Check links in header page', async () => {
+    // before and after functions
+    before(async function () {
+      browserContext = await helper.createBrowserContext(this.browser);
+      page = await helper.newTab(browserContext);
+    });
+
+    after(async () => {
+      await helper.closeBrowserContext(browserContext);
+    });
+
+    it('should go to FO home page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToFO', baseContext);
+
+      await homePage.goToFo(page);
+
+      const isHomePage = await homePage.isHomePage(page);
+      await expect(isHomePage).to.be.true;
+    });
+
+    it('should check \'Contact us\' header link', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'checkContactUsHeaderLink', baseContext);
+
+      // Check Contact us
+      await homePage.clickOnHeaderLink(page, 'Contact us');
+
+      const pageTitle = await contactUsPage.getPageTitle(page);
+      await expect(pageTitle, 'Fail to open FO login page').to.contains(contactUsPage.pageTitle);
+    });
+
+    it('should check \'sign in\' link', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'checkSignInLink', baseContext);
+
+      // Check sign in link
+      await homePage.clickOnHeaderLink(page, 'Sign in');
+
+      const pageTitle = await loginPage.getPageTitle(page);
+      await expect(pageTitle).to.equal(loginPage.pageTitle);
+    });
+
+    it('should sign in by default customer', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'signInFO', baseContext);
+
+      // Sign in
+      await loginPage.customerLogin(page, Customers.johnDoe);
+
+      const isCustomerConnected = await loginPage.isCustomerConnected(page);
+      await expect(isCustomerConnected, 'Customer is not connected!').to.be.true;
+    });
+
+    it('should check my account link', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'checkMyAccountLink', baseContext);
+
+      await loginPage.goToMyAccountPage(page);
+
+      const pageTitle = await myAccountPage.getPageTitle(page);
+      await expect(pageTitle).to.equal(myAccountPage.pageTitle);
+    });
+
+    it('should add a product to cart by quick view', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'addProductToCart', baseContext);
+
+      await loginPage.goToHomePage(page);
+      // Add product to cart by quick view
+      await homePage.addProductToCartByQuickView(page, 1, 3);
+
+      // Close block cart modal
+      const isQuickViewModalClosed = await homePage.closeBlockCartModal(page);
+      await expect(isQuickViewModalClosed).to.be.true;
+    });
+
+    it('should check \'Cart\' link', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'checkShoppingCartLink', baseContext);
+
+      // Check cart link
+      await homePage.clickOnHeaderLink(page, 'Cart');
+
+      const pageTitle = await cartPage.getPageTitle(page);
+      await expect(pageTitle).to.equal(cartPage.pageTitle);
+    });
+
+    it('should go to home page and check the notification number', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'checkNotificationNumber1', baseContext);
+
+      await loginPage.goToHomePage(page);
+
+      const notificationsNumber = await homePage.getCartNotificationsNumber(page);
+      await expect(notificationsNumber, 'Notification number is not equal to 3!').to.be.equal(3);
+    });
+
+    it('should check \'Sign out\' link', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'checkSignOutLink', baseContext);
+
+      // Sign out
+      await homePage.logout(page);
+
+      const isCustomerConnected = await homePage.isCustomerConnected(page);
+      await expect(isCustomerConnected, 'Customer is connected!').to.be.false;
+    });
+
+    it('should check that the cart is empty', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'checkNotificationNumber2', baseContext);
+
+      const notificationsNumber = await homePage.getCartNotificationsNumber(page);
+      await expect(notificationsNumber, 'The cart is not empty!').to.be.equal(0);
+    });
+
+    it('should check \'Logo\' link', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'checkLogoLink', baseContext);
+
+      await homePage.clickOnHeaderLink(page, 'Logo', false);
+
+      const pageTitle = await homePage.getPageTitle(page);
+      await expect(pageTitle).to.equal(homePage.pageTitle);
+    });
+  });
+
+  // Post-condition : Uninstall Hummingbird
+  uninstallHummingbird(`${baseContext}_postTest_1`);
+});
diff --git a/tests/UI/pages/FO/FObasePage.ts b/tests/UI/pages/FO/FObasePage.ts
index 3fe15adcc4b06..00f4bea0a1e26 100644
--- a/tests/UI/pages/FO/FObasePage.ts
+++ b/tests/UI/pages/FO/FObasePage.ts
@@ -127,6 +127,8 @@ export default class FOBasePage extends CommonPage {
 
   protected readonly languageSelector: string;
 
+  private readonly cartProductsCountHummingbird: string;
+
   protected readonly navbarLink: string;
 
   protected theme: string;
@@ -215,6 +217,7 @@ export default class FOBasePage extends CommonPage {
     // Hummingbird
     this.userMenuDropdown = '#userMenuButton';
     this.languageSelector = '#language-selector';
+    this.cartProductsCountHummingbird = '#_desktop_cart .header-block__action-btn span.header-block__badge';
     this.navbarLink = '.navbar-brand';
 
     this.theme = 'classic';
@@ -225,6 +228,7 @@ export default class FOBasePage extends CommonPage {
    * Go to header link
    * @param page {Page} Browser tab
    * @param link {string} Header selector that contain link to click on to
+   * @param hasPageChange {boolean}
    * @returns {Promise<void>}
    */
   async clickOnHeaderLink(page: Page, link: string, hasPageChange: boolean = true): Promise<void> {
@@ -244,7 +248,7 @@ export default class FOBasePage extends CommonPage {
         break;
 
       case 'Logo':
-        selector = this.desktopLogoLink;
+        selector = this.theme === 'hummingbird' ? this.navbarLink : this.desktopLogoLink;
         break;
 
       default:
@@ -481,7 +485,11 @@ export default class FOBasePage extends CommonPage {
    * @returns {Promise<number>}
    */
   async getCartNotificationsNumber(page: Page): Promise<number> {
-    return this.getNumberFromText(page, this.cartProductsCount, 2000);
+    return this.getNumberFromText(
+      page,
+      this.theme === 'hummingbird' ? this.cartProductsCountHummingbird : this.cartProductsCount,
+      2000,
+    );
   }
 
   /**
diff --git a/tests/UI/pages/FO/cart/index.ts b/tests/UI/pages/FO/cart/index.ts
index 76519da96f0f5..842f176124637 100644
--- a/tests/UI/pages/FO/cart/index.ts
+++ b/tests/UI/pages/FO/cart/index.ts
@@ -11,7 +11,7 @@ import type {Page} from 'playwright';
  * @class
  * @extends FOBasePage
  */
-class Cart extends FOBasePage {
+class CartPage extends FOBasePage {
   public readonly pageTitle: string;
 
   public readonly cartRuleAlreadyUsedErrorText: string;
@@ -450,4 +450,5 @@ class Cart extends FOBasePage {
   }
 }
 
-export default new Cart();
+const cartPage = new CartPage();
+export {cartPage, CartPage};
diff --git a/tests/UI/pages/FO/contactUs/index.ts b/tests/UI/pages/FO/contactUs/index.ts
index 863dbaa0551ce..f54026273f7aa 100644
--- a/tests/UI/pages/FO/contactUs/index.ts
+++ b/tests/UI/pages/FO/contactUs/index.ts
@@ -11,7 +11,7 @@ import type {Page} from 'playwright';
  * @class
  * @extends FOBasePage
  */
-class ContactUs extends FOBasePage {
+class ContactUsPage extends FOBasePage {
   public readonly pageTitle: string;
 
   public readonly validationMessage: string;
@@ -139,4 +139,5 @@ class ContactUs extends FOBasePage {
   }
 }
 
-export default new ContactUs();
+const contactUsPage = new ContactUsPage();
+export {contactUsPage, ContactUsPage};
diff --git a/tests/UI/pages/FO/home/index.ts b/tests/UI/pages/FO/home/index.ts
index 963d7ade19be4..45d02d21da3de 100644
--- a/tests/UI/pages/FO/home/index.ts
+++ b/tests/UI/pages/FO/home/index.ts
@@ -139,6 +139,14 @@ class HomePage extends FOBasePage {
 
   public readonly alreadyUsedEmailMessage: string;
 
+  public readonly productHummingbird: (number: number) => string;
+
+  public readonly productImgHummingbird: (number: number) => string;
+
+  public readonly quickviewButtonHummingbird: (number: number) => string;
+
+  public readonly blockCartModalCloseButtonHummingbird: string;
+
   /**
    * @constructs
    * Setting up texts and selectors to use on home page
@@ -222,6 +230,13 @@ class HomePage extends FOBasePage {
     // Newsletter subscription messages
     this.successSubscriptionMessage = 'You have successfully subscribed to this newsletter.';
     this.alreadyUsedEmailMessage = 'This email address is already registered.';
+
+    // Hummingbird
+    this.productHummingbird = (number: number) => `#content .products div:nth-child(${number})`;
+    this.productImgHummingbird = (number: number) => `${this.productHummingbird(number)} img`;
+    this.quickviewButtonHummingbird = (number: number) => `${this.productHummingbird(number)} .product-miniature__quickview `
+      + 'button';
+    this.blockCartModalCloseButtonHummingbird = `${this.blockCartModalDiv} button.btn-close`;
   }
 
   /**
@@ -434,6 +449,14 @@ class HomePage extends FOBasePage {
    * @return {Promise<void>}
    */
   async quickViewProduct(page: Page, id: number): Promise<void> {
+    if (this.theme === 'hummingbird') {
+      await page.hover(this.productImgHummingbird(id));
+      await this.waitForVisibleSelector(page, this.quickviewButtonHummingbird(id));
+      await page.click(this.quickviewButtonHummingbird(id));
+
+      return;
+    }
+
     await page.hover(this.productImg(id));
     let displayed: boolean = false;
 
@@ -678,7 +701,11 @@ class HomePage extends FOBasePage {
    * @returns {Promise<boolean>}
    */
   async closeBlockCartModal(page: Page): Promise<boolean> {
-    await this.waitForSelectorAndClick(page, this.blockCartModalCloseButton);
+    if (this.theme === 'hummingbird') {
+      await this.waitForSelectorAndClick(page, this.blockCartModalCloseButtonHummingbird);
+    } else {
+      await this.waitForSelectorAndClick(page, this.blockCartModalCloseButton);
+    }
 
     return this.elementNotVisible(page, this.blockCartModalDiv, 1000);
   }
diff --git a/tests/UI/pages/FO/hummingbird/cart/index.ts b/tests/UI/pages/FO/hummingbird/cart/index.ts
new file mode 100644
index 0000000000000..6252d82ea74e8
--- /dev/null
+++ b/tests/UI/pages/FO/hummingbird/cart/index.ts
@@ -0,0 +1,20 @@
+// Import FO pages
+import {CartPage} from '@pages/FO/cart/index';
+
+/**
+ * Cart page, contains functions that can be used on the page
+ * @class
+ * @extends FOBasePage
+ */
+class Cart extends CartPage {
+  /**
+   * @constructs
+   */
+  constructor() {
+    super();
+
+    this.theme = 'hummingbird';
+  }
+}
+
+export default new Cart();
diff --git a/tests/UI/pages/FO/hummingbird/contactUs/index.ts b/tests/UI/pages/FO/hummingbird/contactUs/index.ts
new file mode 100644
index 0000000000000..3923c77ae9244
--- /dev/null
+++ b/tests/UI/pages/FO/hummingbird/contactUs/index.ts
@@ -0,0 +1,20 @@
+// Import FO pages
+import {ContactUsPage} from '@pages/FO/contactUs/index';
+
+/**
+ * Contact Us page, contains functions that can be used on the page
+ * @class
+ * @extends FOBasePage
+ */
+class ContactUs extends ContactUsPage {
+  /**
+   * @constructs
+   */
+  constructor() {
+    super();
+
+    this.theme = 'hummingbird';
+  }
+}
+
+export default new ContactUs();

From 0aacdaf94505e09c6d7aed5bfd0d50caf39f95ea Mon Sep 17 00:00:00 2001
From: lartist <salim-benouamer.ext@prestashop.com>
Date: Tue, 18 Jul 2023 05:29:16 +0200
Subject: [PATCH 0636/1030] Add page header toolbar twig component

---
 .../themes/new-theme/template/layout.tpl      |  15 +-
 classes/controller/AdminController.php        |   1 +
 .../Admin/Component/Layout/tool_bar.html.twig | 219 ++++++++++++++++++
 .../views/Admin/Layout/tool_bar.html.twig     |  34 +++
 .../Twig/Component/ToolBar.php                |  44 ++++
 5 files changed, 312 insertions(+), 1 deletion(-)
 create mode 100644 src/PrestaShopBundle/Resources/views/Admin/Component/Layout/tool_bar.html.twig
 create mode 100644 src/PrestaShopBundle/Resources/views/Admin/Layout/tool_bar.html.twig
 create mode 100644 src/PrestaShopBundle/Twig/Component/ToolBar.php

diff --git a/admin-dev/themes/new-theme/template/layout.tpl b/admin-dev/themes/new-theme/template/layout.tpl
index 8a7bebafc5966..133911ed6839d 100644
--- a/admin-dev/themes/new-theme/template/layout.tpl
+++ b/admin-dev/themes/new-theme/template/layout.tpl
@@ -153,7 +153,20 @@
     }
 {/if}
 
-{if isset($page_header_toolbar)}{$page_header_toolbar}{/if}
+{if isset($page_header_toolbar_template)}
+    {render_template
+      smarty_template=$page_header_toolbar_template
+      twig_template="@PrestaShop/Admin/Layout/tool_bar.html.twig"
+      multistore_header=$multistore_header
+      breadcrumbs2=$breadcrumbs2
+      title=$title
+      toolbar_btn=$toolbar_btn
+      table=$table
+      help_link=$help_link
+      enableSidebar=$enableSidebar
+      current_tab_level=$current_tab_level
+    }
+{/if}
 
 <div id="main-div">
     {if $install_dir_exists}
diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index 93a24f6630760..6a36e182cb13d 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -1955,6 +1955,7 @@ public function display()
             $this->context->smarty->assign(
                 [
                     'page_header_toolbar' => $this->context->smarty->fetch($page_header_toolbar),
+                    'page_header_toolbar_template' => $page_header_toolbar,
                 ]
             );
         }
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/tool_bar.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/tool_bar.html.twig
new file mode 100644
index 0000000000000..09474ecd93a4b
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/tool_bar.html.twig
@@ -0,0 +1,219 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+<div class="header-toolbar d-print-none">
+  {{ multistoreHeader }}
+  <div class="container-fluid">
+
+    {% block pageBreadcrumb %}
+      <nav aria-label="Breadcrumb">
+      <ol class="breadcrumb">
+        {% if breadcrumbs2.container.name != '' %}
+          <li class="breadcrumb-item">{{ breadcrumbs2.container.name|escape }}</li>
+        {% endif %}
+
+        {% if breadcrumbs2.tab.name != '' and breadcrumbs2.container.name != breadcrumbs2.tab.name and breadcrumbs2.tab.href != '' %}
+          <li class="breadcrumb-item active">
+            <a href="{{ breadcrumbs2.tab.href|escape }}" aria-current="page">{{ breadcrumbs2.tab.name|escape }}</a>
+          </li>
+        {% endif %}
+      </ol>
+    </nav>
+    {% endblock %}
+
+    {% set persistent_help_btn = help_link is defined and help_link is not same as (false) and toolbarBtn is empty %}
+    <div class="title-row {% if persistent_help_btn %}flex-nowrap flex-md-wrap{% endif %}">
+      {% block pageTitle %}
+        <h1 class="title">
+          {% if title is iterable and title is not empty %}
+            {{ title|last|e }}
+          {% else %}
+            {{ title|e }}
+          {% endif %}
+        </h1>
+      {% endblock %}
+
+      {% block toolbarBox %}
+        <div class="toolbar-icons{% if persistent_help_btn %} toolbar-icons--persistent{% endif %}">
+        <div class="wrapper">
+          {{ renderhook('displayDashboardToolbarTopMenu') }}
+          {% for k, btn in toolbarBtn %}
+          {% if k != 'back' and k != 'modules-list' %}
+          {# TODO: REFACTOR ALL THIS THINGS #}
+          <a
+            class="btn {% if btn.class is defined and btn.class %}{{ btn.class|escape }}{% else %}btn-primary{% endif %}{% if btn.target is defined and btn.target %} _blank{% endif %}{% if btn.disabled is defined and btn.disabled %} disabled auto-pointer-events{% endif %} pointer"{% if btn.href is defined %}
+            id="page-header-desc-{{ table }}-{% if btn.imgclass is defined %}{{ btn.imgclass|escape }}{% else %}{{ k }}{% endif %}"
+            href="{{ btn.href|escape }}"{% endif %}
+          title="{% if btn.help is defined %}{{ btn.help }}{% else %}{{ btn.desc|escape }}{% endif %}"{% if btn.js is defined and btn.js %}
+          onclick="{{ btn.js }}" {% endif %}{% if btn.modal_target is defined and btn.modal_target %}
+          data-target="{{ btn.modal_target }}"
+          data-toggle="modal"{% endif %}{% if btn.help is defined %}
+          data-toggle="pstooltip"
+          data-placement="bottom"{% endif %}
+          {% if btn.data_attributes is defined and btn.data_attributes %}
+            {% for attribute_name, attribute_value in btn.data_attributes %}
+              data-{{ attribute_name }}="{{ attribute_value }}"
+            {% endfor %}
+          {% endif %}
+          >
+          {% if btn.icon is not empty %}<i class="material-icons">{{ btn.icon }}</i>{% endif %}
+          {{ btn.desc|escape }}
+          </a>
+          {% endif %}
+          {% endfor %}
+          {% if toolbarBtn['modules-list'] is defined %}
+          {# TODO: REFACTOR ALL THIS THINGS #}
+          <a
+            class="btn btn-outline-secondary {% if toolbarBtn['modules-list'].target is defined and toolbarBtn['modules-list'].target %} _blank{% endif %}"
+            id="page-header-desc-{{ table }}-{% if toolbarBtn['modules-list'].imgclass is defined %}{{ toolbarBtn['modules-list'].imgclass }}{% else %}modules-list{% endif %}"
+            {% if toolbarBtn['modules-list'].href is defined %}href="{{ toolbarBtn['modules-list'].href }}"{% endif %}
+            title="{{ toolbarBtn['modules-list'].desc }}"
+          {% if toolbarBtn['modules-list'].js is defined and toolbarBtn['modules-list'].js %}onclick="{{ toolbarBtn['modules-list'].js }}"{% endif %}
+          >
+          {{ toolbarBtn['modules-list'].desc }}
+          </a>
+          {% endif %}
+
+          {% if helpLink is defined and helpLink is not same as false %}
+
+          {% if enableSidebar %}
+
+          <a class="toolbar-button btn-sidebar d-inline-block d-md-none" href="#"
+             title="{{ 'Help'|trans({}, 'Admin.Global') }}"
+             data-toggle="sidebar"
+             data-target="#right-sidebar"
+             data-url="{{ helpLink|escape }}"
+             id="product_form_open_help_mobile"
+          >
+            <i class="material-icons">help_outline</i>
+          </a>
+          <a class="btn btn-outline-secondary btn-help btn-sidebar d-none d-md-inline-block" href="#"
+             title="{{ 'Help'|trans({}, 'Admin.Global') }}"
+             data-toggle="sidebar"
+             data-target="#right-sidebar"
+             data-url="{{ helpLink|escape }}"
+             id="product_form_open_help"
+          >
+            {{ 'Help'|trans({}, 'Admin.Global') }}
+          </a>
+          {% else %}
+          <a class="toolbar-button d-inline-block d-md-none" href="{{ helpLink|escape }}" title="{{ 'Help'|trans({}, 'Admin.Global') }}">
+            <i class="material-icons">help_outline</i>
+          </a>
+          <a class="btn btn-outline-secondary btn-help d-none d-md-inline-block" href="{{ helpLink|escape }}" title="{{ 'Help'|trans({}, 'Admin.Global') }}">{{ 'Help'|trans({}, 'Admin.Global') }}
+          </a>
+          {% endif %}
+          {% endif %}
+        </div>
+      </div>
+      {% endblock %}
+    </div>
+  </div>
+
+  {% if headerTabContent is defined and headerTabContent %}
+  <div class="page-head-tabs" id="head_tabs">
+    {% for tabContent in headerTabContent %}
+    {{ tabContent }}
+    {% endfor %}
+  </div>
+  {% endif %}
+
+  {% if currentTabLevel is same as 3 %}
+  <div class="page-head-tabs" id="head_tabs">
+    <ul class="nav nav-pills">
+      {% for level_1 in tabs %}
+      {% for level_2 in level_1.sub_tabs %}
+      {% for level_3 in level_2.sub_tabs %}
+      {% if level_3.current %}
+      {% for level_4 in level_3.sub_tabs %}
+      {% if level_4.active %}
+      <li class="nav-item">
+        <a href="{{ level_4.href }}" id="subtab-{{ level_4.class_name }}" class="nav-link tab {% if level_4.current %}active current{% endif %}" data-submenu="{{ level_4.id_tab }}">
+          {{ level_4.name }}
+          <span class="notification-container">
+                        <span class="notification-counter"></span>
+                      </span>
+        </a>
+      </li>
+      {% endif %}
+      {% endfor %}
+      {% endif %}
+      {% endfor %}
+      {% endfor %}
+      {% endfor %}
+    </ul>
+  </div>
+  {% endif %}
+
+  {% if toolbarBtn is not empty %}
+  <div class="btn-floating">
+    <button class="btn btn-primary collapsed" data-toggle="collapse" data-target=".btn-floating-container" aria-expanded="false">
+      <i class="material-icons">add</i>
+    </button>
+    <div class="btn-floating-container collapse">
+      <div class="btn-floating-menu">
+        {{ renderhook('displayDashboardToolbarTopMenu') }}
+
+        {% for k, btn in toolbarBtn %}
+        {% if k != 'back' and k != 'modules-list'%}
+        <a
+          class="btn btn-floating-item {% if btn.floating_class and btn.floating_class %}{{ btn.floating_class|escape }}{% endif %} {% if btn.target is defined and btn.target %} _blank{% endif %} pointer"{% if btn.href is defined %}
+          id="page-header-desc-floating-{{ table }}-{% if btn.imgclass is defined %}{{ btn.imgclass|escape }}{% else %}{{ k }}{% endif %}"
+          href="{{ btn.href|escape }}"{% endif %}
+        title="{% if btn.help is defined %}{{ btn.help }}{% else %}{{ btn.desc|escape }}{% endif %}"{% if btn.js is defined and btn.js %}
+        onclick="{{ btn.js }}"{% endif %}{% if btn.modal_target is defined and btn.modal_target %}
+        data-target="{{ btn.modal_target }}"
+        data-toggle="modal"{% endif %}{% if btn.help is defined %}
+        data-toggle="pstooltip"
+        data-placement="bottom"{% endif %}
+        >
+        {{ btn.desc|escape }}
+        {% if btn.icon is not empty %}<i class="material-icons">{{ btn.icon }}</i>{% endif %}
+        </a>
+        {% endif %}
+        {% endfor %}
+
+        {% if helpLink is defined and helpLink != false %}
+        {% if enableSidebar %}
+        <a class="btn btn-floating-item btn-help btn-sidebar" href="#"
+           title="{{ 'Help'|trans({}, 'Admin.Global') }}"
+           data-toggle="sidebar"
+           data-target="#right-sidebar"
+           data-url="{{ helpLink|escape }}"
+        >
+          {{ 'Help'|trans({}, 'Admin.Global') }}
+        </a>
+        {% else %}
+        <a class="btn btn-floating-item btn-help" href="{{ helpLink|escape }}" title="{{ 'Help'|trans({}, 'Admin.Global') }}">
+          {{ 'Help'|trans({}, 'Admin.Global') }}
+        </a>
+        {% endif %}
+        {% endif %}
+      </div>
+    </div>
+  </div>
+  {% endif %}
+  {{ renderhook('displayDashboardTop') }}
+</div>
+
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/tool_bar.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/tool_bar.html.twig
new file mode 100644
index 0000000000000..6eb9eedc24c2a
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/tool_bar.html.twig
@@ -0,0 +1,34 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+{{ component('ToolBar', {
+  multistoreHeader: multistore_header,
+  breadcrumbs2: breadcrumbs2,
+  title: title,
+  toolbarBtn: toolbar_btn,
+  table: table,
+  helpLink: help_link,
+  enableSidebar: enableSidebar,
+  currentTabLevel: current_tab_level,
+}) }}
diff --git a/src/PrestaShopBundle/Twig/Component/ToolBar.php b/src/PrestaShopBundle/Twig/Component/ToolBar.php
new file mode 100644
index 0000000000000..57910ea7d4430
--- /dev/null
+++ b/src/PrestaShopBundle/Twig/Component/ToolBar.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\Twig\Component;
+
+use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
+
+#[AsTwigComponent(template: '@PrestaShop/Admin/Component/Layout/tool_bar.html.twig')]
+class ToolBar
+{
+    public string $multistoreHeader;
+    public array $breadcrumbs2;
+    public array $toolbarBtn;
+    public array|string $title;
+    public string $table;
+    public bool|string $helpLink;
+    public bool $enableSidebar;
+    public int $currentTabLevel;
+}

From 5a4aa60e330f4c24c57e03d7413a4a2aab7559dc Mon Sep 17 00:00:00 2001
From: dparis <david.paris@prestashop.com>
Date: Fri, 30 Jun 2023 10:44:36 +0200
Subject: [PATCH 0637/1030] Prestashop API (stores): tests CRUD

---
 .../campaigns/functional/WS/01_storesCRUD.ts  | 1046 +++++++++++++++++
 tests/UI/data/xml/store.ts                    |   89 ++
 .../UI/pages/BO/shopParameters/stores/add.ts  |  136 ++-
 tests/UI/webservices/baseWs.ts                |    2 +-
 tests/UI/webservices/store/storeWS.ts         |   90 ++
 tests/UI/webservices/store/storeXml.ts        |   65 +
 6 files changed, 1418 insertions(+), 10 deletions(-)
 create mode 100644 tests/UI/campaigns/functional/WS/01_storesCRUD.ts
 create mode 100644 tests/UI/data/xml/store.ts
 create mode 100644 tests/UI/webservices/store/storeWS.ts
 create mode 100644 tests/UI/webservices/store/storeXml.ts

diff --git a/tests/UI/campaigns/functional/WS/01_storesCRUD.ts b/tests/UI/campaigns/functional/WS/01_storesCRUD.ts
new file mode 100644
index 0000000000000..66b6e10c33cb0
--- /dev/null
+++ b/tests/UI/campaigns/functional/WS/01_storesCRUD.ts
@@ -0,0 +1,1046 @@
+// Import utils
+import helper from '@utils/helpers';
+import testContext from '@utils/testContext';
+import xml from '@utils/xml';
+
+// Import webservices
+import StoreWS from '@webservices/store/storeWS';
+import storeXml from '@webservices/store/storeXml';
+
+// Import commonTests
+import {addWebserviceKey, removeWebserviceKey, setWebserviceStatus} from '@commonTests/BO/advancedParameters/ws';
+import loginCommon from '@commonTests/BO/loginBO';
+
+// Import BO pages
+import webservicePage from '@pages/BO/advancedParameters/webservice';
+import dashboardPage from '@pages/BO/dashboard';
+import contactPage from '@pages/BO/shopParameters/contact';
+import storesPage from '@pages/BO/shopParameters/stores';
+import addStorePage from '@pages/BO/shopParameters/stores/add';
+
+// Import data
+import {WebservicePermission} from '@data/types/webservice';
+import {getStoreXml, getUpdateStoreXml} from '@data/xml/store';
+
+import {expect} from 'chai';
+import type {
+  APIResponse, APIRequestContext, BrowserContext, Page,
+} from 'playwright';
+
+const baseContext: string = 'functional_WS_storesCRUD';
+
+describe('WS - Stores : CRUD', async () => {
+  let apiContext: APIRequestContext;
+  let browserContext: BrowserContext;
+  let page: Page;
+  let wsKey: string = '';
+  let authorization: string = '';
+
+  const wsKeyDescription: string = 'Webservice Key - Stores';
+  const wsKeyPermissions: WebservicePermission[] = [
+    {
+      resource: 'stores',
+      methods: ['all'],
+    },
+  ];
+  const xmlCreate: string = getStoreXml();
+  const xmlValueHoursLang1 = storeXml.getLangEltTextContent(xmlCreate, 'hours', '1');
+  const hoursArrLang1: string[] = xmlValueHoursLang1.split(',');
+  const xmlValueHoursLang2 = storeXml.getLangEltTextContent(xmlCreate, 'hours', '2');
+  const hoursArrLang2: string[] = xmlValueHoursLang2.split(',');
+  let xmlUpdate: string;
+
+  const week = ['monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday', 'sunday'];
+  // before and after functions
+  before(async function () {
+    browserContext = await helper.createBrowserContext(this.browser);
+    page = await helper.newTab(browserContext);
+
+    apiContext = await helper.createAPIContext(global.FO.URL);
+  });
+
+  after(async () => {
+    await helper.closeBrowserContext(browserContext);
+  });
+
+  // Enable webservice
+  setWebserviceStatus(true, `${baseContext}_preTest_1`);
+
+  // Create a new webservice key
+  addWebserviceKey(wsKeyDescription, wsKeyPermissions, `${baseContext}_preTest_2`);
+
+  describe('Stores : CRUD', () => {
+    let storeNodeID: string = '';
+    describe('Fetch the Webservice Key', () => {
+      it('should login in BO', async function () {
+        await loginCommon.loginBO(this, page);
+      });
+
+      it('should go to \'Advanced Parameters > Webservice\' page', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'goToWebservicePage', baseContext);
+
+        await dashboardPage.goToSubMenu(
+          page,
+          dashboardPage.advancedParametersLink,
+          dashboardPage.webserviceLink,
+        );
+        await webservicePage.closeSfToolBar(page);
+
+        const pageTitle = await webservicePage.getPageTitle(page);
+        await expect(pageTitle).to.contains(webservicePage.pageTitle);
+      });
+
+      it('should filter list by key description', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'filterBeforeDelete', baseContext);
+
+        await webservicePage.resetAndGetNumberOfLines(page);
+        await webservicePage.filterWebserviceTable(
+          page,
+          'input',
+          'description',
+          wsKeyDescription,
+        );
+
+        const description = await webservicePage.getTextColumnFromTable(page, 1, 'description');
+        await expect(description).to.contains(wsKeyDescription);
+
+        wsKey = await webservicePage.getTextColumnFromTable(page, 1, 'key');
+        authorization = `Basic ${Buffer.from(`${wsKey}:`).toString('base64')}`;
+        await expect(wsKey).to.be.not.empty;
+      });
+    });
+
+    describe(`Endpoint : ${StoreWS.endpoint} - Schema : Blank `, () => {
+      let apiResponse: APIResponse;
+      let xmlResponse : string;
+
+      it('should check response status', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestStoreBlankStatus', baseContext);
+
+        apiResponse = await StoreWS.getBlank(
+          apiContext,
+          authorization,
+        );
+        await expect(apiResponse.status()).to.eq(200);
+      });
+
+      it('should check that the blank XML can be parsed', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestBlankValid', baseContext);
+
+        xmlResponse = await apiResponse.text();
+
+        const isValidXML = xml.isValid(xmlResponse);
+        await expect(isValidXML).to.be.true;
+      });
+
+      it('should check response root node', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestStoreBlankRootNode', baseContext);
+
+        expect(storeXml.getRootNodeName(xmlResponse)).to.be.eq('prestashop');
+      });
+
+      it('should check number of node under prestashop', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestBlankChildNode', baseContext);
+
+        const rootNodes = storeXml.getPrestaShopNodes(xmlResponse);
+        expect(rootNodes.length).to.be.eq(1);
+        expect(rootNodes[0].nodeName).to.be.eq('store');
+      });
+
+      it('should check each node name, attributes and has empty values', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestBlankChildNodes', baseContext);
+
+        const nodes = storeXml.getStoreNodes(xmlResponse);
+        expect(nodes.length).to.be.gt(0);
+
+        for (let c: number = 0; c < nodes.length; c++) {
+          const node: Element = nodes[c];
+
+          // Attributes
+          const nodeAttributes: NamedNodeMap = node.attributes;
+          expect(nodeAttributes.length).to.be.eq(0);
+
+          // Empty value
+          const isEmptyNode: boolean = xml.isEmpty(node);
+          await expect(isEmptyNode, `The node ${node.nodeName} is not empty`).to.be.true;
+        }
+      });
+    });
+
+    describe(`Endpoint : ${StoreWS.endpoint} - Schema : Synopsis `, () => {
+      let apiResponse: APIResponse;
+      let xmlResponse : string;
+
+      it('should check response status', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestSynopsisStatus', baseContext);
+
+        apiResponse = await StoreWS.getSynopsis(
+          apiContext,
+          authorization,
+        );
+        await expect(apiResponse.status()).to.eq(200);
+      });
+
+      it('should check that the synopsis XML can be parsed', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestSynopsisValid', baseContext);
+
+        xmlResponse = await apiResponse.text();
+
+        const isValidXML = xml.isValid(xmlResponse);
+        await expect(isValidXML).to.be.true;
+      });
+
+      it('should check response root node', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestSynopsisRootNode', baseContext);
+
+        expect(storeXml.getRootNodeName(xmlResponse)).to.be.eq('prestashop');
+      });
+
+      it('should check number of node under prestashop', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestSynopsisChildNode', baseContext);
+
+        const rootNodes = storeXml.getPrestaShopNodes(xmlResponse);
+        expect(rootNodes.length).to.be.eq(1);
+        expect(rootNodes[0].nodeName).to.be.eq('store');
+      });
+
+      it('should check each node name, attributes and has empty values', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestSynopsisChildNodes', baseContext);
+
+        const nodes = storeXml.getStoreNodes(xmlResponse);
+        expect(nodes.length).to.be.gt(0);
+
+        for (let c: number = 0; c < nodes.length; c++) {
+          const node: Element = nodes[c];
+
+          // Attributes
+          const nodeAttributes: NamedNodeMap = node.attributes;
+          expect(nodeAttributes.length).to.be.gte(1);
+
+          // Attribute : format
+          if (node.nodeName !== 'postcode') {
+            expect(nodeAttributes[nodeAttributes.length - 1].nodeName).to.be.eq('format');
+          }
+
+          // Empty value
+          const isEmptyNode = xml.isEmpty(node);
+          await expect(isEmptyNode, `The node ${node.nodeName} is not empty`).to.be.true;
+        }
+      });
+    });
+
+    describe(`Endpoint : ${StoreWS.endpoint} - Method : GET `, () => {
+      let apiResponse : APIResponse;
+      let xmlResponse : string;
+      let storesNode: Element[];
+
+      it('should check response status', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestGetStatus1', baseContext);
+
+        apiResponse = await StoreWS.getAll(
+          apiContext,
+          authorization,
+        );
+
+        await expect(apiResponse.status()).to.eq(200);
+      });
+
+      it('should check response root node', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestGetRootNode1', baseContext);
+
+        xmlResponse = await apiResponse.text();
+        expect(storeXml.getRootNodeName(xmlResponse)).to.be.eq('prestashop');
+      });
+
+      it('should check number of node under prestashop', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestGetNodeNumber1', baseContext);
+
+        const rootNodes = storeXml.getPrestaShopNodes(xmlResponse);
+        expect(rootNodes.length).to.be.eq(1);
+        expect(rootNodes[0].nodeName).to.be.eq('stores');
+      });
+
+      it('should check number of nodes under stores node', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestGetNumberOfNodes1', baseContext);
+
+        storesNode = storeXml.getAllStores(xmlResponse);
+        expect(storesNode.length).to.gt(0);
+      });
+
+      it('should check each node name, attributes and xlink:href', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestGetCheckAll1', baseContext);
+
+        for (let i: number = 0; i < storesNode.length; i++) {
+          const storeNode: Element = storesNode[i];
+          expect(storeNode.nodeName).to.be.eq('store');
+
+          // Attributes
+          const storeNodeAttributes: NamedNodeMap = storeNode.attributes;
+          expect(storeNodeAttributes.length).to.be.eq(2);
+
+          // Attribute : id
+          expect(storeNodeAttributes[0].nodeName).to.be.eq('id');
+          const storeNodeAttributeId = storeNodeAttributes[0].nodeValue as string;
+          expect(storeNodeAttributeId).to.be.eq(parseInt(storeNodeAttributeId, 10).toString());
+
+          // Attribute : xlink:href
+          expect(storeNodeAttributes[1].nodeName).to.be.eq('xlink:href');
+          expect(storeNodeAttributes[1].nodeValue).to.be.a('string');
+        }
+      });
+    });
+
+    describe(`Endpoint : ${StoreWS.endpoint} - Method : POST `, () => {
+      describe(`Endpoint : ${StoreWS.endpoint} - Method : POST - Add Store `, () => {
+        let apiResponse: APIResponse;
+        let xmlResponse : string;
+
+        it('should check response status', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestPostStatus1', baseContext);
+
+          apiResponse = await StoreWS.add(
+            apiContext,
+            authorization,
+            xmlCreate,
+          );
+
+          await expect(apiResponse.status()).to.eq(201);
+        });
+
+        it('should check response root node', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestPostRootNode1', baseContext);
+
+          xmlResponse = await apiResponse.text();
+          expect(storeXml.getRootNodeName(xmlResponse)).to.be.eq('prestashop');
+        });
+
+        it('should check number of node under prestashop', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestPostNodeNumber1', baseContext);
+
+          const rootNodes = storeXml.getPrestaShopNodes(xmlResponse);
+          expect(rootNodes.length).to.be.eq(1);
+          expect(rootNodes[0].nodeName).to.be.eq('store');
+        });
+
+        it('should check id of the store', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestPostCheckId1', baseContext);
+
+          // Attribute : id
+          storeNodeID = storeXml.getEltTextContent(xmlResponse, 'id');
+          expect(storeNodeID).to.be.eq(parseInt(storeNodeID, 10).toString());
+        });
+      });
+
+      describe(`Endpoint : ${StoreWS.endpoint}/{id} - Method : POST - Check with WS `, () => {
+        let apiResponse: APIResponse;
+        let xmlResponse : string;
+        let storesNodes: Element[];
+
+        it('should check response status', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestGetIDStatus', baseContext);
+
+          apiResponse = await StoreWS.getById(
+            apiContext,
+            authorization,
+            storeNodeID,
+          );
+          await expect(apiResponse.status()).to.eq(200);
+        });
+
+        it('should check response root node', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestGetIDRootNode1', baseContext);
+
+          xmlResponse = await apiResponse.text();
+          expect(storeXml.getRootNodeName(xmlResponse)).to.be.eq('prestashop');
+        });
+
+        it('should check number of node under prestashop', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestGetIDNodeNumber1', baseContext);
+
+          const rootNodes = storeXml.getPrestaShopNodes(xmlResponse);
+          expect(rootNodes.length).to.be.eq(1);
+          expect(rootNodes[0].nodeName).to.be.eq('store');
+        });
+
+        it('should check number of nodes under stores node', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestGetIDNumberOfNodes1', baseContext);
+
+          storesNodes = storeXml.getStoreNodes(xmlResponse);
+          expect(storesNodes.length).to.be.gt(0);
+        });
+
+        it('should check each node id, name ...', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestGetIDCheckAll', baseContext);
+
+          // Check nodes are equal to them done in Create
+          for (let o: number = 0; o < storesNodes.length; o++) {
+            const oNode: Element = storesNodes[o];
+
+            if (oNode.nodeName === 'id') {
+              expect(oNode.textContent).to.be.eq(storeNodeID);
+            } else if (oNode.nodeName === 'name' || oNode.nodeName === 'hours' || oNode.nodeName === 'address1'
+              || oNode.nodeName === 'address2' || oNode.nodeName === 'note') {
+              const objectNodeValueEN = storeXml.getLangEltTextContent(
+                xmlResponse,
+                oNode.nodeName,
+                '1',
+              );
+
+              const createNodeValueEN = storeXml.getLangEltTextContent(
+                xmlCreate,
+                oNode.nodeName,
+                '1',
+              );
+
+              expect(objectNodeValueEN).to.be.eq(createNodeValueEN);
+
+              const objectNodeValueFR = storeXml.getLangEltTextContent(
+                xmlResponse,
+                oNode.nodeName,
+                '2',
+              );
+              const createNodeValueFR = storeXml.getLangEltTextContent(
+                xmlCreate,
+                oNode.nodeName,
+                '2',
+              );
+              expect(objectNodeValueFR).to.be.eq(createNodeValueFR);
+            } else if (oNode.nodeName !== 'date_add' && oNode.nodeName !== 'date_upd') {
+              const objectNodeValue: string = storeXml.getEltTextContent(
+                xmlCreate,
+                oNode.nodeName,
+              );
+              expect(oNode.textContent).to.be.eq(objectNodeValue);
+            }
+          }
+        });
+      });
+
+      describe(`Endpoint : ${StoreWS.endpoint} - Method : POST - Check On BO `, () => {
+        it('should go to \'Shop Parameters > Contact\' page', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'goToLocationsPage', baseContext);
+
+          await dashboardPage.goToSubMenu(
+            page,
+            dashboardPage.shopParametersParentLink,
+            dashboardPage.contactLink,
+          );
+          await contactPage.closeSfToolBar(page);
+
+          const pageTitle = await contactPage.getPageTitle(page);
+          await expect(pageTitle).to.contains(contactPage.pageTitle);
+        });
+
+        it('should go to \'Stores\' page', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'goToStoresPagePost', baseContext);
+
+          await contactPage.goToStoresPage(page);
+
+          const pageTitle = await storesPage.getPageTitle(page);
+          await expect(pageTitle).to.contains(storesPage.pageTitle);
+        });
+
+        it('should filter store by ID', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'filterToUpdateAfterPost', baseContext);
+
+          // Filter
+          await storesPage.resetFilter(page);
+          await storesPage.filterTable(page, 'input', 'id_store', storeNodeID);
+
+          // Check number of stores
+          const numberOfStoresAfterFilter = await storesPage.getNumberOfElementInGrid(page);
+          await expect(numberOfStoresAfterFilter).to.be.eq(1);
+
+          const textColumn = await storesPage.getTextColumn(page, 1, 'id_store');
+          await expect(textColumn).to.contains(storeNodeID);
+        });
+
+        it('should go to edit store page', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'goToEditStorePageAfterPost', baseContext);
+
+          await storesPage.gotoEditStorePage(page, 1);
+
+          const pageTitle = await addStorePage.getPageTitle(page);
+          await expect(pageTitle).to.contains(addStorePage.pageTitleEdit);
+        });
+
+        it('should check store\'s name language 1', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkStoreNameLang1', baseContext);
+
+          const xmlValueName1 = storeXml.getLangEltTextContent(xmlCreate, 'name', '1');
+          const valueName1 = await addStorePage.getInputValue(page, 'name', '1');
+          expect(valueName1).to.be.eq(xmlValueName1);
+        });
+
+        it('should check store\'s name language 2', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkStoreNameLang2', baseContext);
+
+          const xmlValueName2 = storeXml.getLangEltTextContent(xmlCreate, 'name', '2');
+          const valueName2 = await addStorePage.getInputValue(page, 'name', '2');
+          expect(valueName2).to.be.eq(xmlValueName2);
+        });
+
+        it('should check store\'s address 1 language 1', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkStoreAddress1Lang1', baseContext);
+
+          const xmlValueAddress = storeXml.getLangEltTextContent(xmlCreate, 'address1', '1');
+          const valueAddress = await addStorePage.getInputValue(page, 'address1', '1');
+          expect(valueAddress).to.be.eq(xmlValueAddress);
+        });
+
+        it('should check store\'s address 1 language 2', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkStoreAddress1Lang2', baseContext);
+
+          const xmlValueAddress = storeXml.getLangEltTextContent(xmlCreate, 'address1', '2');
+          const valueAddress = await addStorePage.getInputValue(page, 'address1', '2');
+          expect(valueAddress).to.be.eq(xmlValueAddress);
+        });
+
+        it('should check store\'s address 2 language 1', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkStoreAddress2Lang1', baseContext);
+
+          const xmlValueAddress = storeXml.getLangEltTextContent(xmlCreate, 'address2', '1');
+          const valueAddress = await addStorePage.getInputValue(page, 'address2', '1');
+          expect(valueAddress).to.be.eq(xmlValueAddress);
+        });
+
+        it('should check store\'s address 2 language 2', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkStoreAddress2Lang2', baseContext);
+
+          const xmlValueAddress = storeXml.getLangEltTextContent(xmlCreate, 'address2', '2');
+          const valueAddress = await addStorePage.getInputValue(page, 'address2', '2');
+          expect(valueAddress).to.be.eq(xmlValueAddress);
+        });
+
+        it('should check store\'s postcode', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkStorePostcode', baseContext);
+
+          const xmlValuePostcode = storeXml.getEltTextContent(xmlCreate, 'postcode');
+          const valuePostcode = await addStorePage.getInputValue(page, 'postcode');
+          expect(valuePostcode).to.be.eq(xmlValuePostcode);
+        });
+
+        it('should check store\'s city', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkStoreCity', baseContext);
+
+          const xmlValueCity = storeXml.getEltTextContent(xmlCreate, 'city');
+          const valueCity = await addStorePage.getInputValue(page, 'city');
+
+          expect(valueCity).to.be.eq(xmlValueCity);
+        });
+
+        it('should check store\'s country', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkStoreCountry', baseContext);
+
+          const xmlValueIDCountry = storeXml.getEltTextContent(xmlCreate, 'id_country');
+          const valueIDCountry = await addStorePage.getSelectValue(page, 'id_country');
+
+          expect(valueIDCountry).to.be.eq(xmlValueIDCountry);
+        });
+
+        it('should check store\'s state', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkStoreState', baseContext);
+
+          const xmlValueIDState = '';
+          const valueIDState = await addStorePage.getSelectValue(page, 'id_state');
+          expect(valueIDState).to.be.eq(xmlValueIDState);
+        });
+
+        it('should check store\'s latitude', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkStoreLatitude', baseContext);
+
+          const xmlValueLatitude = storeXml.getEltTextContent(xmlCreate, 'latitude');
+          const valueLatitude = await addStorePage.getInputValue(page, 'latitude');
+          expect(valueLatitude).to.be.eq(xmlValueLatitude);
+        });
+
+        it('should check store\'s longitude', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkStoreLongitude', baseContext);
+
+          const xmlValueLongitude = storeXml.getEltTextContent(xmlCreate, 'longitude');
+          const valueLongitude = await addStorePage.getInputValue(page, 'longitude');
+          expect(valueLongitude).to.be.eq(xmlValueLongitude);
+        });
+
+        it('should check store\'s phone', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkStorePhone', baseContext);
+
+          const xmlValuePhone = storeXml.getEltTextContent(xmlCreate, 'phone');
+          const valuePhone = await addStorePage.getInputValue(page, 'phone');
+          expect(valuePhone).to.be.eq(xmlValuePhone);
+        });
+
+        it('should check store\'s fax', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkStoreFax', baseContext);
+
+          const xmlValueFax = storeXml.getEltTextContent(xmlCreate, 'fax');
+          const valueFax = await addStorePage.getInputValue(page, 'fax');
+          expect(valueFax).to.be.eq(xmlValueFax);
+        });
+
+        it('should check store\'s email', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkStoreEmail', baseContext);
+
+          const xmlValueFax = storeXml.getEltTextContent(xmlCreate, 'email');
+          const valueFax = await addStorePage.getInputValue(page, 'email');
+          expect(valueFax).to.be.eq(xmlValueFax);
+        });
+
+        it('should check store is active', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkStoreActive', baseContext);
+
+          const xmlValueActive = storeXml.getEltTextContent(xmlCreate, 'active');
+          const active = await addStorePage.isActive(page, 'on');
+          expect(active).to.be.eq(xmlValueActive !== '0');
+        });
+
+        week.forEach((day, index) => {
+          it(`should check store's ${day} hours language 1`, async function () {
+            await testContext.addContextItem(this, 'testIdentifier', `checkStoreHours${day}Lang1`, baseContext);
+
+            const dayHours = hoursArrLang1[index];
+            let expectedDayHours = '';
+
+            if (index === 0) {
+              expectedDayHours = dayHours.substring(3, dayHours.length - 2);
+            } else if (index === (week.length - 1)) {
+              expectedDayHours = dayHours.substring(2, dayHours.length - 3);
+            } else {
+              expectedDayHours = dayHours.substring(2, dayHours.length - 2);
+            }
+
+            const dayValue = await addStorePage.getInputValue(page, `${day}`, '1');
+            expect(dayValue).to.be.eq(expectedDayHours);
+          });
+
+          it(`should check store's ${day} hours language 2`, async function () {
+            await testContext.addContextItem(this, 'testIdentifier', `checkStoreHours${day}Lang2`, baseContext);
+
+            const dayHours = hoursArrLang2[index];
+            let expectedDayHours = '';
+
+            if (index === 0) {
+              expectedDayHours = dayHours.substring(3, dayHours.length - 2);
+            } else if (index === (week.length - 1)) {
+              expectedDayHours = dayHours.substring(2, dayHours.length - 3);
+            } else {
+              expectedDayHours = dayHours.substring(2, dayHours.length - 2);
+            }
+            const dayValue = await addStorePage.getInputValue(page, `${day}`, '2');
+            expect(dayValue).to.be.eq(expectedDayHours);
+          });
+        });
+
+        it('should go to \'Stores\' page', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'goToStoresPagePostReset', baseContext);
+
+          await contactPage.goToStoresPage(page);
+
+          const pageTitle = await storesPage.getPageTitle(page);
+          await expect(pageTitle).to.contains(storesPage.pageTitle);
+        });
+
+        it('should reset all filters', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirstAfterPost', baseContext);
+
+          const numberOfStores = await storesPage.resetAndGetNumberOfLines(page);
+          await expect(numberOfStores).to.be.above(0);
+        });
+      });
+    });
+
+    describe(`Endpoint : ${StoreWS.endpoint} - Method : PUT `, () => {
+      describe(`Endpoint : ${StoreWS.endpoint} - Method : PUT - Update Store `, () => {
+        let apiResponse: APIResponse;
+        let xmlResponse : string;
+
+        it(`should check response status of ${StoreWS.endpoint}/{id}`, async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestPutStatus1', baseContext);
+          xmlUpdate = getUpdateStoreXml(storeNodeID);
+          apiResponse = await StoreWS.update(
+            apiContext,
+            authorization,
+            storeNodeID,
+            xmlUpdate,
+          );
+
+          await expect(apiResponse.status()).to.eq(200);
+        });
+
+        it('should check response root node', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestPutRootNode1', baseContext);
+
+          xmlResponse = await apiResponse.text();
+          expect(storeXml.getRootNodeName(xmlResponse)).to.be.eq('prestashop');
+        });
+
+        it('should check number of node under prestashop', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestPutNodeNumber1', baseContext);
+
+          const rootNodes = storeXml.getPrestaShopNodes(xmlResponse);
+          expect(rootNodes.length).to.be.eq(1);
+          expect(rootNodes[0].nodeName).to.be.eq('store');
+        });
+
+        it('should check id of the store', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestPutCheckId1', baseContext);
+
+          // Attribute : id
+          storeNodeID = storeXml.getEltTextContent(xmlResponse, 'id');
+          expect(storeNodeID).to.be.eq(parseInt(storeNodeID, 10).toString());
+        });
+      });
+
+      describe(`Endpoint : ${StoreWS.endpoint}/{id} - Method : PUT - Check with WS `, () => {
+        let apiResponse: APIResponse;
+        let xmlResponse : string;
+        let storesNodes: Element[];
+
+        it('should check response status', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestGetPutStatus2', baseContext);
+
+          apiResponse = await StoreWS.getById(
+            apiContext,
+            authorization,
+            storeNodeID,
+          );
+
+          await expect(apiResponse.status()).to.eq(200);
+        });
+
+        it('should check response root node', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestGetPutRootNode2', baseContext);
+
+          xmlResponse = await apiResponse.text();
+          expect(storeXml.getRootNodeName(xmlResponse)).to.be.eq('prestashop');
+        });
+
+        it('should check number of node under prestashop', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestGetPutNodeNumber1', baseContext);
+
+          const rootNodes = storeXml.getPrestaShopNodes(xmlResponse);
+          expect(rootNodes.length).to.be.eq(1);
+          expect(rootNodes[0].nodeName).to.be.eq('store');
+        });
+
+        it('should check number of nodes under stores node', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestGetPutNumberOfNodes1', baseContext);
+
+          storesNodes = storeXml.getStoreNodes(xmlResponse);
+          expect(storesNodes.length).to.be.gt(0);
+        });
+
+        it('should check each node id, name ...', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestEndpointStoresIdMethodGetAfterPut', baseContext);
+
+          // Check nodes are equal to them done in Create
+          for (let o: number = 0; o < storesNodes.length; o++) {
+            const oNode: Element = storesNodes[o];
+
+            if (oNode.nodeName === 'id') {
+              expect(oNode.textContent).to.be.eq(storeNodeID);
+            } else if (oNode.nodeName === 'name' || oNode.nodeName === 'hours' || oNode.nodeName === 'address1'
+              || oNode.nodeName === 'address2' || oNode.nodeName === 'note') {
+              const objectNodeValueEN = storeXml.getLangEltTextContent(
+                xmlResponse,
+                oNode.nodeName,
+                '1',
+              );
+
+              const createNodeValueEN = storeXml.getLangEltTextContent(
+                xmlUpdate,
+                oNode.nodeName,
+                '1',
+              );
+
+              expect(objectNodeValueEN).to.be.eq(createNodeValueEN);
+
+              const objectNodeValueFR = storeXml.getLangEltTextContent(
+                xmlResponse,
+                oNode.nodeName,
+                '2',
+              );
+              const createNodeValueFR = storeXml.getLangEltTextContent(
+                xmlUpdate,
+                oNode.nodeName,
+                '2',
+              );
+              expect(objectNodeValueFR).to.be.eq(createNodeValueFR);
+            } else if (oNode.nodeName !== 'date_add' && oNode.nodeName !== 'date_upd') {
+              const objectNodeValue: string = storeXml.getEltTextContent(
+                xmlUpdate,
+                oNode.nodeName,
+              );
+              expect(oNode.textContent).to.be.eq(objectNodeValue);
+            }
+          }
+        });
+      });
+
+      describe(`Endpoint : ${StoreWS.endpoint} - Method : PUT - Check On BO `, () => {
+        it('should filter store by ID', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'filterToUpdateAfterPost2', baseContext);
+
+          // Filter
+          await storesPage.resetFilter(page);
+          await storesPage.filterTable(page, 'input', 'id_store', storeNodeID);
+
+          // Check number of stores
+          const numberOfStoresAfterFilter = await storesPage.getNumberOfElementInGrid(page);
+          await expect(numberOfStoresAfterFilter).to.be.eq(1);
+
+          const textColumn = await storesPage.getTextColumn(page, 1, 'id_store');
+          await expect(textColumn).to.contains(storeNodeID);
+        });
+
+        it('should go to edit store page', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'goToEditStorePageAfterPost2', baseContext);
+
+          await storesPage.gotoEditStorePage(page, 1);
+
+          const pageTitle = await addStorePage.getPageTitle(page);
+          await expect(pageTitle).to.contains(addStorePage.pageTitleEdit);
+        });
+
+        it('should check store\'s name language 1', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkStoreNameLang12', baseContext);
+
+          const xmlValueName1 = storeXml.getLangEltTextContent(xmlUpdate, 'name', '1');
+          const valueName1 = await addStorePage.getInputValue(page, 'name', '1');
+          expect(valueName1).to.be.eq(xmlValueName1);
+        });
+
+        it('should check store\'s name language 2', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkStoreNameLang22', baseContext);
+
+          const xmlValueName2 = storeXml.getLangEltTextContent(xmlUpdate, 'name', '2');
+          const valueName2 = await addStorePage.getInputValue(page, 'name', '2');
+          expect(valueName2).to.be.eq(xmlValueName2);
+        });
+
+        it('should check store\'s address 1 language 1', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkStoreAddress1Lang12', baseContext);
+
+          const xmlValueAddress = storeXml.getLangEltTextContent(xmlUpdate, 'address1', '1');
+          const valueAddress = await addStorePage.getInputValue(page, 'address1', '1');
+          expect(valueAddress).to.be.eq(xmlValueAddress);
+        });
+
+        it('should check store\'s address 1 language 2', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkStoreAddress1Lang22', baseContext);
+
+          const xmlValueAddress = storeXml.getLangEltTextContent(xmlUpdate, 'address1', '2');
+          const valueAddress = await addStorePage.getInputValue(page, 'address1', '2');
+          expect(valueAddress).to.be.eq(xmlValueAddress);
+        });
+
+        it('should check store\'s address 2 language 1', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkStoreAddress1Lang13', baseContext);
+
+          const xmlValueAddress = storeXml.getLangEltTextContent(xmlUpdate, 'address2', '1');
+          const valueAddress = await addStorePage.getInputValue(page, 'address2', '1');
+          expect(valueAddress).to.be.eq(xmlValueAddress);
+        });
+
+        it('should check store\'s address 2 language 2', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkStoreAddress2Lang22', baseContext);
+
+          const xmlValueAddress = storeXml.getLangEltTextContent(xmlUpdate, 'address2', '2');
+          const valueAddress = await addStorePage.getInputValue(page, 'address2', '2');
+          expect(valueAddress).to.be.eq(xmlValueAddress);
+        });
+
+        it('should check store\'s postcode', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkStorePostcode2', baseContext);
+
+          const xmlValuePostcode = storeXml.getEltTextContent(xmlUpdate, 'postcode');
+          const valuePostcode = await addStorePage.getInputValue(page, 'postcode');
+          expect(valuePostcode).to.be.eq(xmlValuePostcode);
+        });
+
+        it('should check store\'s city', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkStoreCity2', baseContext);
+
+          const xmlValueCity = storeXml.getEltTextContent(xmlUpdate, 'city');
+          const valueCity = await addStorePage.getInputValue(page, 'city');
+          expect(valueCity).to.be.eq(xmlValueCity);
+        });
+
+        it('should check store\'s country', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkStoreCountry2', baseContext);
+
+          const xmlValueIDCountry = storeXml.getEltTextContent(xmlUpdate, 'id_country');
+          const valueIDCountry = await addStorePage.getSelectValue(page, 'id_country');
+          expect(valueIDCountry).to.be.eq(xmlValueIDCountry);
+        });
+
+        it('should check store\'s state', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkStoreState2', baseContext);
+
+          const xmlValueIDState = '';
+          const valueIDState = await addStorePage.getSelectValue(page, 'id_state');
+          expect(valueIDState).to.be.eq(xmlValueIDState);
+        });
+
+        it('should check store\'s latitude', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkStoreLatitude2', baseContext);
+
+          const xmlValueLatitude = storeXml.getEltTextContent(xmlUpdate, 'latitude');
+          const valueLatitude = await addStorePage.getInputValue(page, 'latitude');
+          expect(valueLatitude).to.be.eq(xmlValueLatitude);
+        });
+
+        it('should check store\'s longitude', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkStoreLongitude2', baseContext);
+
+          const xmlValueLongitude = storeXml.getEltTextContent(xmlUpdate, 'longitude');
+          const valueLongitude = await addStorePage.getInputValue(page, 'longitude');
+          expect(valueLongitude).to.be.eq(xmlValueLongitude);
+        });
+
+        it('should check store\'s phone', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkStorePhone2', baseContext);
+
+          const xmlValuePhone = storeXml.getEltTextContent(xmlUpdate, 'phone');
+          const valuePhone = await addStorePage.getInputValue(page, 'phone');
+          expect(valuePhone).to.be.eq(xmlValuePhone);
+        });
+
+        it('should check store\'s fax', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkStoreFax2', baseContext);
+
+          const xmlValueFax = storeXml.getEltTextContent(xmlUpdate, 'fax');
+          const valueFax = await addStorePage.getInputValue(page, 'fax');
+          expect(valueFax).to.be.eq(xmlValueFax);
+        });
+
+        it('should check store\'s email', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkStoreEmail2', baseContext);
+
+          const xmlValueFax = storeXml.getEltTextContent(xmlUpdate, 'email');
+          const valueFax = await addStorePage.getInputValue(page, 'email');
+          expect(valueFax).to.be.eq(xmlValueFax);
+        });
+
+        it('should check store is active', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'checkStoreActive2', baseContext);
+
+          const xmlValueActive = storeXml.getEltTextContent(xmlUpdate, 'active');
+          const active = await addStorePage.isActive(page, 'on');
+          expect(active).to.be.eq((xmlValueActive !== '0'));
+        });
+
+        week.forEach((day, index) => {
+          it(`should check store's ${day} hours language 1`, async function () {
+            await testContext.addContextItem(this, 'testIdentifier', `checkStoreHours${day}Lang1${index}`, baseContext);
+
+            const xmlValueUpdatedHoursLang1 = storeXml.getLangEltTextContent(xmlUpdate, 'hours', '1');
+            const hoursArrUpdatedLang1: string[] = xmlValueUpdatedHoursLang1.split(',');
+            const dayHours = hoursArrUpdatedLang1[index];
+
+            let expectedDayHours = '';
+
+            if (index === 0) {
+              expectedDayHours = dayHours.substring(3, dayHours.length - 2);
+            } else if (index === (week.length - 1)) {
+              expectedDayHours = dayHours.substring(2, dayHours.length - 3);
+            } else {
+              expectedDayHours = dayHours.substring(2, dayHours.length - 2);
+            }
+
+            const dayValue = await addStorePage.getInputValue(page, `${day}`, '1');
+            expect(dayValue).to.be.eq(expectedDayHours);
+          });
+
+          it(`should check store's ${day} hours language 2`, async function () {
+            await testContext.addContextItem(this, 'testIdentifier', `checkStoreHours${day}Lang2${index}`, baseContext);
+
+            const xmlValueUpdatedHoursLang2 = storeXml.getLangEltTextContent(xmlUpdate, 'hours', '2');
+            const hoursArrUpdatedLang2: string[] = xmlValueUpdatedHoursLang2.split(',');
+            const dayHours = hoursArrUpdatedLang2[index];
+
+            let expectedDayHours = '';
+
+            if (index === 0) {
+              expectedDayHours = dayHours.substring(3, dayHours.length - 2);
+            } else if (index === (week.length - 1)) {
+              expectedDayHours = dayHours.substring(2, dayHours.length - 3);
+            } else {
+              expectedDayHours = dayHours.substring(2, dayHours.length - 2);
+            }
+
+            const dayValue = await addStorePage.getInputValue(page, `${day}`, '2');
+            expect(dayValue).to.be.eq(expectedDayHours);
+          });
+        });
+
+        it('should go to \'Stores\' page', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'goToStoresPagePostReset2', baseContext);
+
+          await contactPage.goToStoresPage(page);
+
+          const pageTitle = await storesPage.getPageTitle(page);
+          await expect(pageTitle).to.contains(storesPage.pageTitle);
+        });
+
+        it('should reset all filters', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirstAfterPost2', baseContext);
+
+          const numberOfStores = await storesPage.resetAndGetNumberOfLines(page);
+          await expect(numberOfStores).to.be.above(0);
+        });
+      });
+    });
+
+    describe(`Endpoint : ${StoreWS.endpoint} - Method : DELETE `, () => {
+      it(`should request the endpoint ${StoreWS.endpoint}/{id} with method DELETE`, async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestEndpointStoresMethodDelete', baseContext);
+
+        const apiResponse = await StoreWS.delete(
+          apiContext,
+          authorization,
+          storeNodeID,
+        );
+
+        await expect(apiResponse.status()).to.eq(200);
+      });
+
+      it(`should request the endpoint ${StoreWS.endpoint}/{id} with method GET`, async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestEndpointStoresIdMethodGetAfterDelete', baseContext);
+
+        const apiResponse = await StoreWS.getById(
+          apiContext,
+          authorization,
+          storeNodeID,
+        );
+
+        await expect(apiResponse.status()).to.eq(404);
+      });
+
+      it('should filter store by ID', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'filterToUpdateAfterDelete', baseContext);
+
+        // Filter
+        await storesPage.resetFilter(page);
+        await storesPage.filterTable(page, 'input', 'id_store', storeNodeID);
+
+        // Check number of stores
+        const numberOfStoresAfterFilter = await storesPage.getNumberOfElementInGrid(page);
+        await expect(numberOfStoresAfterFilter).to.be.eq(0);
+      });
+
+      it('should reset all filters', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
+
+        const numberOfStores = await storesPage.resetAndGetNumberOfLines(page);
+        await expect(numberOfStores).to.be.above(0);
+      });
+    });
+  });
+
+  // Remove a new webservice key
+  removeWebserviceKey(wsKeyDescription, `${baseContext}_postTest_1`);
+
+  // Disable webservice
+  setWebserviceStatus(false, `${baseContext}_postTest_2`);
+});
diff --git a/tests/UI/data/xml/store.ts b/tests/UI/data/xml/store.ts
new file mode 100644
index 0000000000000..a761f61cbe6de
--- /dev/null
+++ b/tests/UI/data/xml/store.ts
@@ -0,0 +1,89 @@
+import {faker} from '@faker-js/faker';
+
+/**
+     * Get xml of store to put on Post/Put request
+     * @param idStore {string|null}
+     */
+export function getStoreXml(idStore : string | null = null): string {
+  return ('<?xml version="1.0" encoding="UTF-8"?>'
+        + '<prestashop xmlns:xlink="http://www.w3.org/1999/xlink">'
+        + `<store>${idStore !== null ? (`<id><![CDATA[${idStore}]]></id>`) : ''}`
+        + '<id_country><![CDATA[11]]></id_country>'
+        + '<id_state><![CDATA[291]]></id_state>'
+        + '<hours>'
+        + '<language id="1"><![CDATA[[["4h30AM - 5h30PM"],["5h30AM - 5h30PM"],["6h30AM - 5h30PM"],["7h30AM - 5h30PM"],'
+        + '["8h30AM - 5h30PM"],["9h30AM - 5h30PM"],["10h30AM - 5h30PM"]]]]></language>'
+        + '<language id="2"><![CDATA[[["4h30 - 17h30"],["5h30 - 17h30"],["6h30 - 17h30"],["7h30 - 17h30"],'
+        + '["8h30 - 17h30"],["9h30 - 17h30"],["10h30 - 17h30"]]]]></language>'
+        + '</hours>'
+        + '<postcode><![CDATA[605-0862]]></postcode>'
+        + '<city><![CDATA[Kyoto]]></city>'
+        + '<latitude><![CDATA[35.01160000]]></latitude>'
+        + '<longitude><![CDATA[135.00000000]]></longitude>'
+        + '<phone><![CDATA[+81 75-525-7170]]></phone>'
+        + '<fax><![CDATA[+81 75-525-7777]]></fax>'
+        + '<email><![CDATA[ghibli@prestashop-test.com]]></email>'
+        + '<active><![CDATA[1]]></active>'
+        + '<date_add><![CDATA[2023-06-05 13:50:32]]></date_add>'
+        + '<date_upd><![CDATA[2023-06-05 13:52:01]]></date_upd>'
+        + '<name>'
+        + '<language id="1"><![CDATA[Ghibli Store]]></language>'
+        + '<language id="2"><![CDATA[Magasin Ghibli]]></language>'
+        + '</name>'
+        + '<address1>'
+        + '<language id="1"><![CDATA[2 Chome-218-1 Kiyomizu]]></language>'
+        + '<language id="2"><![CDATA[2 Chome-218-1 Kiyomizu Fr]]></language>'
+        + '</address1>'
+        + '<address2>'
+        + '<language id="1"><![CDATA[Higashiyama Ward]]></language>'
+        + '<language id="2"><![CDATA[Higashiyama Ward Fr]]></language>'
+        + '</address2>'
+        + '<note>'
+        + '<language id="1"><![CDATA[My Neighbor Totoro]]></language>'
+        + '<language id="2"><![CDATA[Mon voisin Totoro]]></language>'
+        + '</note>'
+        + '</store>'
+        + '</prestashop>');
+}
+
+export function getUpdateStoreXml(idStore : string | null = null): string {
+  return ('<?xml version="1.0" encoding="UTF-8"?>'
+        + '<prestashop xmlns:xlink="http://www.w3.org/1999/xlink">'
+        + `<store>${idStore !== null ? (`<id><![CDATA[${idStore}]]></id>`) : ''}`
+        + `<id_country><![CDATA[${faker.number.int({min: 1, max: 5})}]]></id_country>`
+        + '<id_state><![CDATA[291]]></id_state>'
+        + '<hours>'
+        + '<language id="1"><![CDATA[[["8h30AM - 5h30PM"],["8h30AM - 6h30PM"],["8h30AM - 7h30PM"],["8h30AM - 8h30PM"],'
+        + '["8h30AM - 9h30PM"],["8h30AM - 10h30PM"],["8h30AM - 11h30PM"]]]]></language>'
+        + '<language id="2"><![CDATA[[["8h30 - 17h30"],["8h30 - 18h30"],["8h30 - 19h30"],["8h30 - 20h30"],'
+        + '["8h30 - 21h30"],["8h30 - 22h30"],["8h30 - 23h30"]]]]></language>'
+        + '</hours>'
+        + `<postcode><![CDATA[${faker.number.int({min: 10000, max: 99999})}]]></postcode>`
+        + `<city><![CDATA[${faker.location.city()}]]></city>`
+        + `<latitude><![CDATA[${faker.location.latitude(90, -90, 8)}]]></latitude>`
+        + `<longitude><![CDATA[${faker.location.longitude(180, -180, 8)}]]></longitude>`
+        + '<phone><![CDATA[+81 75-525-1234]]></phone>'
+        + '<fax><![CDATA[+81 75-525-5678]]></fax>'
+        + `<email><![CDATA[${faker.internet.email()}]]></email>`
+        + '<active><![CDATA[1]]></active>'
+        + '<date_add><![CDATA[2023-06-05 13:50:32]]></date_add>'
+        + '<date_upd><![CDATA[2023-06-05 13:52:01]]></date_upd>'
+        + '<name>'
+        + '<language id="1"><![CDATA[Ghibli Store]]></language>'
+        + '<language id="2"><![CDATA[Magasin Ghibli]]></language>'
+        + '</name>'
+        + '<address1>'
+        + `<language id="1"><![CDATA[${faker.location.street()}]]></language>`
+        + `<language id="2"><![CDATA[${faker.location.street()}]]></language>`
+        + '</address1>'
+        + '<address2>'
+        + `<language id="1"><![CDATA[${faker.location.street()}]]></language>`
+        + `<language id="2"><![CDATA[${faker.location.street()}]]></language>`
+        + '</address2>'
+        + '<note>'
+        + `<language id="1"><![CDATA[${faker.word.words(5)}]]></language>`
+        + `<language id="2"><![CDATA[${faker.word.words(5)}]]></language>`
+        + '</note>'
+        + '</store>'
+        + '</prestashop>');
+}
diff --git a/tests/UI/pages/BO/shopParameters/stores/add.ts b/tests/UI/pages/BO/shopParameters/stores/add.ts
index 332ad66c8863e..6c41b34da3d07 100644
--- a/tests/UI/pages/BO/shopParameters/stores/add.ts
+++ b/tests/UI/pages/BO/shopParameters/stores/add.ts
@@ -26,6 +26,8 @@ class AddStore extends BOBasePage {
 
   private readonly countrySelect: string;
 
+  private readonly stateSelect: string;
+
   private readonly latitudeInput: string;
 
   private readonly longitudeInput: string;
@@ -42,7 +44,7 @@ class AddStore extends BOBasePage {
 
   private readonly pictureInput: string;
 
-  private readonly hoursInput: (pos: number) => string;
+  private readonly hoursInput: (pos: number, languageId: string) => string;
 
   private readonly saveButton: string;
 
@@ -58,12 +60,13 @@ class AddStore extends BOBasePage {
 
     // Form selectors
     this.storeForm = '#store_form';
-    this.nameInput = '#name_1';
-    this.address1Input = '#address1_1';
-    this.address2Input = '#address2_1';
+    this.nameInput = '#name';
+    this.address1Input = '#address1';
+    this.address2Input = '#address2';
     this.postcodeInput = '#postcode';
     this.cityInput = '#city';
     this.countrySelect = '#id_country';
+    this.stateSelect = '#id_state';
     this.latitudeInput = '#latitude';
     this.longitudeInput = '#longitude';
     this.phoneInput = '#phone';
@@ -72,7 +75,7 @@ class AddStore extends BOBasePage {
     this.noteTextarea = '#note_1';
     this.statusToggle = (toggle: string) => `${this.storeForm} #active_${toggle}`;
     this.pictureInput = `${this.storeForm} #image`;
-    this.hoursInput = (pos: number) => `input[name='hours[${pos}][1]']`;
+    this.hoursInput = (pos: number, languageId: string) => `input[name='hours[${pos}][${languageId}]']`;
     this.saveButton = '#store_form_submit_btn';
     this.alertSuccessBlockParagraph = '.alert-success';
   }
@@ -87,11 +90,11 @@ class AddStore extends BOBasePage {
    */
   async createEditStore(page: Page, storeData: StoreData): Promise<string> {
     // Set name
-    await this.setValue(page, this.nameInput, storeData.name);
+    await this.setValue(page, `${this.nameInput}_1`, storeData.name);
 
     // Set address inputs
-    await this.setValue(page, this.address1Input, storeData.address1);
-    await this.setValue(page, this.address2Input, storeData.address2);
+    await this.setValue(page, `${this.address1Input}_1`, storeData.address1);
+    await this.setValue(page, `${this.address2Input}_1`, storeData.address2);
     await this.setValue(page, this.postcodeInput, storeData.postcode);
     await this.setValue(page, this.cityInput, storeData.city);
     await this.selectByVisibleText(page, this.countrySelect, storeData.country);
@@ -116,7 +119,7 @@ class AddStore extends BOBasePage {
 
     // Set opening hours
     for (let day:number = 1; day <= 7; day++) {
-      await this.setValue(page, this.hoursInput(day), storeData.hours[day - 1]);
+      await this.setValue(page, this.hoursInput(day, '1'), storeData.hours[day - 1]);
     }
 
     // Save store
@@ -125,6 +128,121 @@ class AddStore extends BOBasePage {
     // Return successful message
     return this.getAlertSuccessBlockParagraphContent(page);
   }
+
+  /**
+   *
+   * @param page {Page}
+   * @param inputName {string}
+   * @param languageId {string | undefined}
+   */
+  async getInputValue(page: Page, inputName: string, languageId?: string): Promise<string> {
+    let selector;
+
+    switch (inputName) {
+      case 'name':
+        selector = `${this.nameInput}_${languageId}`;
+        break;
+
+      case 'address1':
+        selector = `${this.address1Input}_${languageId}`;
+        break;
+
+      case 'address2':
+        selector = `${this.address2Input}_${languageId}`;
+        break;
+
+      case 'postcode':
+        selector = this.postcodeInput;
+        break;
+
+      case 'city':
+        selector = this.cityInput;
+        break;
+
+      case 'latitude':
+        selector = this.latitudeInput;
+        break;
+
+      case 'longitude':
+        selector = this.longitudeInput;
+        break;
+
+      case 'phone':
+        selector = this.phoneInput;
+        break;
+
+      case 'fax':
+        selector = this.faxInput;
+        break;
+
+      case 'email':
+        selector = this.emailInput;
+        break;
+
+      case 'monday':
+        selector = this.hoursInput(1, languageId === undefined ? '1' : languageId);
+        break;
+
+      case 'tuesday':
+        selector = this.hoursInput(2, languageId === undefined ? '1' : languageId);
+        break;
+
+      case 'wednesday':
+        selector = this.hoursInput(3, languageId === undefined ? '1' : languageId);
+        break;
+
+      case 'thursday':
+        selector = this.hoursInput(4, languageId === undefined ? '1' : languageId);
+        break;
+
+      case 'friday':
+        selector = this.hoursInput(5, languageId === undefined ? '1' : languageId);
+        break;
+
+      case 'saturday':
+        selector = this.hoursInput(6, languageId === undefined ? '1' : languageId);
+        break;
+
+      case 'sunday':
+        selector = this.hoursInput(7, languageId === undefined ? '1' : languageId);
+        break;
+      default:
+        throw new Error(`Column ${inputName} was not found`);
+    }
+
+    return this.getAttributeContent(page, selector, 'value');
+  }
+
+  /**
+   *
+   * @param page {Page}
+   * @param name {string}
+   */
+  async getSelectValue(page: Page, name: string): Promise<string> {
+    let selector: string;
+
+    switch (name) {
+      case 'id_country':
+        selector = this.countrySelect;
+        break;
+      case 'id_state':
+        selector = this.stateSelect;
+        break;
+      default:
+        throw new Error(`Field ${name} was not found`);
+    }
+
+    return page.$eval(selector, (node: HTMLSelectElement) => node.value);
+  }
+
+  /**
+   *
+   * @param page {Page}
+   * @param toggle {string}
+   */
+  async isActive(page: Page, toggle: string): Promise<boolean> {
+    return this.isChecked(page, this.statusToggle(toggle));
+  }
 }
 
 export default new AddStore();
diff --git a/tests/UI/webservices/baseWs.ts b/tests/UI/webservices/baseWs.ts
index 2c4317c95776d..47b315f56cc3c 100644
--- a/tests/UI/webservices/baseWs.ts
+++ b/tests/UI/webservices/baseWs.ts
@@ -51,7 +51,7 @@ export default class BaseWS {
    * @param url {string}
    * @param authorization {string}
    */
-  protected static getAll(
+  protected static async getAll(
     apiContext: APIRequestContext,
     url: string,
     authorization: string,
diff --git a/tests/UI/webservices/store/storeWS.ts b/tests/UI/webservices/store/storeWS.ts
new file mode 100644
index 0000000000000..017baf67e352f
--- /dev/null
+++ b/tests/UI/webservices/store/storeWS.ts
@@ -0,0 +1,90 @@
+import BaseWS from '@webservices/baseWs';
+import {APIRequestContext, APIResponse} from 'playwright';
+
+export default class StoreWS extends BaseWS {
+  public static endpoint = 'api/stores';
+
+  public static async getBlank(
+    apiContext: APIRequestContext,
+    authorization: string,
+  ): Promise<APIResponse> {
+    return super.getBlank(apiContext, this.endpoint, authorization);
+  }
+
+  public static async getSynopsis(
+    apiContext: APIRequestContext,
+    authorization: string,
+  ): Promise<APIResponse> {
+    return super.getSynopsis(apiContext, this.endpoint, authorization);
+  }
+
+  /**
+   * Get All Stores
+   * @param apiContext {APIRequestContext}
+   * @param authorization {string}
+   */
+  public static async getAll(
+    apiContext: APIRequestContext,
+    authorization: string,
+  ): Promise<APIResponse> {
+    return super.getAll(apiContext, this.endpoint, authorization);
+  }
+
+  /**
+   * Get By id
+   * @param apiContext {APIRequestContext}
+   * @param authorization {string}
+   * @param idStore {string}
+   */
+  public static getById(
+    apiContext: APIRequestContext,
+    authorization: string,
+    idStore: string,
+  ): Promise<APIResponse> {
+    return super.getById(apiContext, this.endpoint, authorization, idStore);
+  }
+
+  /**
+   * Add new Store
+   * @param apiContext {APIRequestContext}
+   * @param authorization {string}
+   * @param data {string} Xml of a new Store
+   */
+  public static add(
+    apiContext: APIRequestContext,
+    authorization: string,
+    data: string,
+  ): Promise<APIResponse> {
+    return super.add(apiContext, this.endpoint, authorization, data);
+  }
+
+  /**
+   * Update a store
+   * @param apiContext {APIRequestContext}
+   * @param authorization {string}
+   * @param idStore {string}
+   * @param data {string} Xml of the new Store
+   */
+  public static update(
+    apiContext: APIRequestContext,
+    authorization: string,
+    idStore: string,
+    data: string,
+  ): Promise<APIResponse> {
+    return super.update(apiContext, this.endpoint, authorization, idStore, data);
+  }
+
+  /**
+   * Delete a store
+   * @param apiContext {APIRequestContext}
+   * @param authorization {string}
+   * @param idStore {string}
+   */
+  public static delete(
+    apiContext: APIRequestContext,
+    authorization: string,
+    idStore: string,
+  ): Promise<APIResponse> {
+    return super.delete(apiContext, this.endpoint, authorization, idStore);
+  }
+}
diff --git a/tests/UI/webservices/store/storeXml.ts b/tests/UI/webservices/store/storeXml.ts
new file mode 100644
index 0000000000000..43a4d18dbdb5d
--- /dev/null
+++ b/tests/UI/webservices/store/storeXml.ts
@@ -0,0 +1,65 @@
+import BaseXml from '@webservices/baseXml';
+import xmlHelper from '@utils/xml';
+
+export default class StoreXml extends BaseXml {
+  private static storesBasicPath = '/prestashop/stores';
+
+  private static storesPath = `${this.storesBasicPath}/*`;
+
+  private static storeBasicPath = '/prestashop/store';
+
+  private static storePath = `${this.storeBasicPath}/*`;
+
+  private static eltPath = (eltName: string) => `${this.storeBasicPath}/${eltName}`;
+
+  private static eltLangPath = (
+    eltName: string,
+    lang: string,
+  ) => `${this.eltPath(eltName)}/language[@id="${lang}"]`;
+
+  /**
+   * Get all stores nodes
+   * @param xml
+   */
+  public static getAllStores(
+    xml: string,
+  ): Element[] {
+    return xmlHelper.getNodes(xml, this.storesPath);
+  }
+
+  /**
+   * Get store nodes
+   * @param xml
+   */
+  public static getStoreNodes(
+    xml: string,
+  ): Element[] {
+    return xmlHelper.getNodes(xml, this.storePath);
+  }
+
+  /**
+   * Get element value
+   * @param xml
+   * @param eltName
+   */
+  public static getEltTextContent(
+    xml: string,
+    eltName: string,
+  ): string {
+    return xmlHelper.getNodeValue(xml, this.eltPath(eltName));
+  }
+
+  /**
+   * Get attribute with language value
+   * @param xml
+   * @param eltName
+   * @param lang
+   */
+  public static getLangEltTextContent(
+    xml: string,
+    eltName: string,
+    lang: string,
+  ): string {
+    return xmlHelper.getNodeValue(xml, this.eltLangPath(eltName, lang));
+  }
+}

From ac702fd4a508386df898294d51d246d4d3d0ae5f Mon Sep 17 00:00:00 2001
From: dparis <david.paris@prestashop.com>
Date: Tue, 25 Jul 2023 16:09:18 +0200
Subject: [PATCH 0638/1030] id_state

---
 tests/UI/campaigns/functional/WS/01_storesCRUD.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/UI/campaigns/functional/WS/01_storesCRUD.ts b/tests/UI/campaigns/functional/WS/01_storesCRUD.ts
index 66b6e10c33cb0..1d89df73418f7 100644
--- a/tests/UI/campaigns/functional/WS/01_storesCRUD.ts
+++ b/tests/UI/campaigns/functional/WS/01_storesCRUD.ts
@@ -541,7 +541,7 @@ describe('WS - Stores : CRUD', async () => {
         it('should check store\'s state', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkStoreState', baseContext);
 
-          const xmlValueIDState = '';
+          const xmlValueIDState  = storeXml.getEltTextContent(xmlCreate, 'id_state');
           const valueIDState = await addStorePage.getSelectValue(page, 'id_state');
           expect(valueIDState).to.be.eq(xmlValueIDState);
         });
@@ -877,7 +877,7 @@ describe('WS - Stores : CRUD', async () => {
         it('should check store\'s state', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkStoreState2', baseContext);
 
-          const xmlValueIDState = '';
+          const xmlValueIDState = storeXml.getEltTextContent(xmlUpdate, 'id_state');
           const valueIDState = await addStorePage.getSelectValue(page, 'id_state');
           expect(valueIDState).to.be.eq(xmlValueIDState);
         });

From 876fc80262e94b1da428394a8001b1985d3f960a Mon Sep 17 00:00:00 2001
From: dparis <david.paris@prestashop.com>
Date: Wed, 26 Jul 2023 11:19:14 +0200
Subject: [PATCH 0639/1030] id_state

---
 tests/UI/data/xml/store.ts | 162 ++++++++++++++++++-------------------
 1 file changed, 81 insertions(+), 81 deletions(-)

diff --git a/tests/UI/data/xml/store.ts b/tests/UI/data/xml/store.ts
index a761f61cbe6de..6ea067a3954f3 100644
--- a/tests/UI/data/xml/store.ts
+++ b/tests/UI/data/xml/store.ts
@@ -1,89 +1,89 @@
 import {faker} from '@faker-js/faker';
 
 /**
-     * Get xml of store to put on Post/Put request
-     * @param idStore {string|null}
-     */
-export function getStoreXml(idStore : string | null = null): string {
+ * Get xml of store to put on Post/Put request
+ * @param idStore {string|null}
+ */
+export function getStoreXml(idStore: string | null = null): string {
   return ('<?xml version="1.0" encoding="UTF-8"?>'
-        + '<prestashop xmlns:xlink="http://www.w3.org/1999/xlink">'
-        + `<store>${idStore !== null ? (`<id><![CDATA[${idStore}]]></id>`) : ''}`
-        + '<id_country><![CDATA[11]]></id_country>'
-        + '<id_state><![CDATA[291]]></id_state>'
-        + '<hours>'
-        + '<language id="1"><![CDATA[[["4h30AM - 5h30PM"],["5h30AM - 5h30PM"],["6h30AM - 5h30PM"],["7h30AM - 5h30PM"],'
-        + '["8h30AM - 5h30PM"],["9h30AM - 5h30PM"],["10h30AM - 5h30PM"]]]]></language>'
-        + '<language id="2"><![CDATA[[["4h30 - 17h30"],["5h30 - 17h30"],["6h30 - 17h30"],["7h30 - 17h30"],'
-        + '["8h30 - 17h30"],["9h30 - 17h30"],["10h30 - 17h30"]]]]></language>'
-        + '</hours>'
-        + '<postcode><![CDATA[605-0862]]></postcode>'
-        + '<city><![CDATA[Kyoto]]></city>'
-        + '<latitude><![CDATA[35.01160000]]></latitude>'
-        + '<longitude><![CDATA[135.00000000]]></longitude>'
-        + '<phone><![CDATA[+81 75-525-7170]]></phone>'
-        + '<fax><![CDATA[+81 75-525-7777]]></fax>'
-        + '<email><![CDATA[ghibli@prestashop-test.com]]></email>'
-        + '<active><![CDATA[1]]></active>'
-        + '<date_add><![CDATA[2023-06-05 13:50:32]]></date_add>'
-        + '<date_upd><![CDATA[2023-06-05 13:52:01]]></date_upd>'
-        + '<name>'
-        + '<language id="1"><![CDATA[Ghibli Store]]></language>'
-        + '<language id="2"><![CDATA[Magasin Ghibli]]></language>'
-        + '</name>'
-        + '<address1>'
-        + '<language id="1"><![CDATA[2 Chome-218-1 Kiyomizu]]></language>'
-        + '<language id="2"><![CDATA[2 Chome-218-1 Kiyomizu Fr]]></language>'
-        + '</address1>'
-        + '<address2>'
-        + '<language id="1"><![CDATA[Higashiyama Ward]]></language>'
-        + '<language id="2"><![CDATA[Higashiyama Ward Fr]]></language>'
-        + '</address2>'
-        + '<note>'
-        + '<language id="1"><![CDATA[My Neighbor Totoro]]></language>'
-        + '<language id="2"><![CDATA[Mon voisin Totoro]]></language>'
-        + '</note>'
-        + '</store>'
-        + '</prestashop>');
+    + '<prestashop xmlns:xlink="http://www.w3.org/1999/xlink">'
+    + `<store>${idStore !== null ? (`<id><![CDATA[${idStore}]]></id>`) : ''}`
+    + '<id_country><![CDATA[11]]></id_country>'
+    + '<id_state><![CDATA[]]></id_state>'
+    + '<hours>'
+    + '<language id="1"><![CDATA[[["4h30AM - 5h30PM"],["5h30AM - 5h30PM"],["6h30AM - 5h30PM"],["7h30AM - 5h30PM"],'
+    + '["8h30AM - 5h30PM"],["9h30AM - 5h30PM"],["10h30AM - 5h30PM"]]]]></language>'
+    + '<language id="2"><![CDATA[[["4h30 - 17h30"],["5h30 - 17h30"],["6h30 - 17h30"],["7h30 - 17h30"],'
+    + '["8h30 - 17h30"],["9h30 - 17h30"],["10h30 - 17h30"]]]]></language>'
+    + '</hours>'
+    + '<postcode><![CDATA[605-0862]]></postcode>'
+    + '<city><![CDATA[Kyoto]]></city>'
+    + '<latitude><![CDATA[35.01160000]]></latitude>'
+    + '<longitude><![CDATA[135.00000000]]></longitude>'
+    + '<phone><![CDATA[+81 75-525-7170]]></phone>'
+    + '<fax><![CDATA[+81 75-525-7777]]></fax>'
+    + '<email><![CDATA[ghibli@prestashop-test.com]]></email>'
+    + '<active><![CDATA[1]]></active>'
+    + '<date_add><![CDATA[2023-06-05 13:50:32]]></date_add>'
+    + '<date_upd><![CDATA[2023-06-05 13:52:01]]></date_upd>'
+    + '<name>'
+    + '<language id="1"><![CDATA[Ghibli Store]]></language>'
+    + '<language id="2"><![CDATA[Magasin Ghibli]]></language>'
+    + '</name>'
+    + '<address1>'
+    + '<language id="1"><![CDATA[2 Chome-218-1 Kiyomizu]]></language>'
+    + '<language id="2"><![CDATA[2 Chome-218-1 Kiyomizu Fr]]></language>'
+    + '</address1>'
+    + '<address2>'
+    + '<language id="1"><![CDATA[Higashiyama Ward]]></language>'
+    + '<language id="2"><![CDATA[Higashiyama Ward Fr]]></language>'
+    + '</address2>'
+    + '<note>'
+    + '<language id="1"><![CDATA[My Neighbor Totoro]]></language>'
+    + '<language id="2"><![CDATA[Mon voisin Totoro]]></language>'
+    + '</note>'
+    + '</store>'
+    + '</prestashop>');
 }
 
-export function getUpdateStoreXml(idStore : string | null = null): string {
+export function getUpdateStoreXml(idStore: string | null = null): string {
   return ('<?xml version="1.0" encoding="UTF-8"?>'
-        + '<prestashop xmlns:xlink="http://www.w3.org/1999/xlink">'
-        + `<store>${idStore !== null ? (`<id><![CDATA[${idStore}]]></id>`) : ''}`
-        + `<id_country><![CDATA[${faker.number.int({min: 1, max: 5})}]]></id_country>`
-        + '<id_state><![CDATA[291]]></id_state>'
-        + '<hours>'
-        + '<language id="1"><![CDATA[[["8h30AM - 5h30PM"],["8h30AM - 6h30PM"],["8h30AM - 7h30PM"],["8h30AM - 8h30PM"],'
-        + '["8h30AM - 9h30PM"],["8h30AM - 10h30PM"],["8h30AM - 11h30PM"]]]]></language>'
-        + '<language id="2"><![CDATA[[["8h30 - 17h30"],["8h30 - 18h30"],["8h30 - 19h30"],["8h30 - 20h30"],'
-        + '["8h30 - 21h30"],["8h30 - 22h30"],["8h30 - 23h30"]]]]></language>'
-        + '</hours>'
-        + `<postcode><![CDATA[${faker.number.int({min: 10000, max: 99999})}]]></postcode>`
-        + `<city><![CDATA[${faker.location.city()}]]></city>`
-        + `<latitude><![CDATA[${faker.location.latitude(90, -90, 8)}]]></latitude>`
-        + `<longitude><![CDATA[${faker.location.longitude(180, -180, 8)}]]></longitude>`
-        + '<phone><![CDATA[+81 75-525-1234]]></phone>'
-        + '<fax><![CDATA[+81 75-525-5678]]></fax>'
-        + `<email><![CDATA[${faker.internet.email()}]]></email>`
-        + '<active><![CDATA[1]]></active>'
-        + '<date_add><![CDATA[2023-06-05 13:50:32]]></date_add>'
-        + '<date_upd><![CDATA[2023-06-05 13:52:01]]></date_upd>'
-        + '<name>'
-        + '<language id="1"><![CDATA[Ghibli Store]]></language>'
-        + '<language id="2"><![CDATA[Magasin Ghibli]]></language>'
-        + '</name>'
-        + '<address1>'
-        + `<language id="1"><![CDATA[${faker.location.street()}]]></language>`
-        + `<language id="2"><![CDATA[${faker.location.street()}]]></language>`
-        + '</address1>'
-        + '<address2>'
-        + `<language id="1"><![CDATA[${faker.location.street()}]]></language>`
-        + `<language id="2"><![CDATA[${faker.location.street()}]]></language>`
-        + '</address2>'
-        + '<note>'
-        + `<language id="1"><![CDATA[${faker.word.words(5)}]]></language>`
-        + `<language id="2"><![CDATA[${faker.word.words(5)}]]></language>`
-        + '</note>'
-        + '</store>'
-        + '</prestashop>');
+    + '<prestashop xmlns:xlink="http://www.w3.org/1999/xlink">'
+    + `<store>${idStore !== null ? (`<id><![CDATA[${idStore}]]></id>`) : ''}`
+    + `<id_country><![CDATA[${faker.number.int({min: 1, max: 5})}]]></id_country>`
+    + '<id_state><![CDATA[]]></id_state>'
+    + '<hours>'
+    + '<language id="1"><![CDATA[[["8h30AM - 5h30PM"],["8h30AM - 6h30PM"],["8h30AM - 7h30PM"],["8h30AM - 8h30PM"],'
+    + '["8h30AM - 9h30PM"],["8h30AM - 10h30PM"],["8h30AM - 11h30PM"]]]]></language>'
+    + '<language id="2"><![CDATA[[["8h30 - 17h30"],["8h30 - 18h30"],["8h30 - 19h30"],["8h30 - 20h30"],'
+    + '["8h30 - 21h30"],["8h30 - 22h30"],["8h30 - 23h30"]]]]></language>'
+    + '</hours>'
+    + `<postcode><![CDATA[${faker.number.int({min: 10000, max: 99999})}]]></postcode>`
+    + `<city><![CDATA[${faker.location.city()}]]></city>`
+    + `<latitude><![CDATA[${faker.location.latitude(90, -90, 8)}]]></latitude>`
+    + `<longitude><![CDATA[${faker.location.longitude(180, -180, 8)}]]></longitude>`
+    + '<phone><![CDATA[+81 75-525-1234]]></phone>'
+    + '<fax><![CDATA[+81 75-525-5678]]></fax>'
+    + `<email><![CDATA[${faker.internet.email()}]]></email>`
+    + '<active><![CDATA[1]]></active>'
+    + '<date_add><![CDATA[2023-06-05 13:50:32]]></date_add>'
+    + '<date_upd><![CDATA[2023-06-05 13:52:01]]></date_upd>'
+    + '<name>'
+    + '<language id="1"><![CDATA[Ghibli Store]]></language>'
+    + '<language id="2"><![CDATA[Magasin Ghibli]]></language>'
+    + '</name>'
+    + '<address1>'
+    + `<language id="1"><![CDATA[${faker.location.street()}]]></language>`
+    + `<language id="2"><![CDATA[${faker.location.street()}]]></language>`
+    + '</address1>'
+    + '<address2>'
+    + `<language id="1"><![CDATA[${faker.location.street()}]]></language>`
+    + `<language id="2"><![CDATA[${faker.location.street()}]]></language>`
+    + '</address2>'
+    + '<note>'
+    + `<language id="1"><![CDATA[${faker.word.words(5)}]]></language>`
+    + `<language id="2"><![CDATA[${faker.word.words(5)}]]></language>`
+    + '</note>'
+    + '</store>'
+    + '</prestashop>');
 }

From 2a1a6c1a860ad409c7a2da6200d43b6bafc37072 Mon Sep 17 00:00:00 2001
From: dparis <david.paris@prestashop.com>
Date: Wed, 26 Jul 2023 11:22:28 +0200
Subject: [PATCH 0640/1030] logitude latitude

---
 tests/UI/data/xml/store.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/UI/data/xml/store.ts b/tests/UI/data/xml/store.ts
index 6ea067a3954f3..2ae4c91ca5e5a 100644
--- a/tests/UI/data/xml/store.ts
+++ b/tests/UI/data/xml/store.ts
@@ -60,8 +60,8 @@ export function getUpdateStoreXml(idStore: string | null = null): string {
     + '</hours>'
     + `<postcode><![CDATA[${faker.number.int({min: 10000, max: 99999})}]]></postcode>`
     + `<city><![CDATA[${faker.location.city()}]]></city>`
-    + `<latitude><![CDATA[${faker.location.latitude(90, -90, 8)}]]></latitude>`
-    + `<longitude><![CDATA[${faker.location.longitude(180, -180, 8)}]]></longitude>`
+    + '<latitude><![CDATA[35.01159999]]></latitude>'
+    + '<longitude><![CDATA[135.76810001]]></longitude>'
     + '<phone><![CDATA[+81 75-525-1234]]></phone>'
     + '<fax><![CDATA[+81 75-525-5678]]></fax>'
     + `<email><![CDATA[${faker.internet.email()}]]></email>`

From 9516fbb4020dc75a67e1da0b8def961b7ae869da Mon Sep 17 00:00:00 2001
From: dparis <david.paris@prestashop.com>
Date: Wed, 26 Jul 2023 14:44:39 +0200
Subject: [PATCH 0641/1030] state failed

---
 .../campaigns/functional/WS/01_storesCRUD.ts  | 20 +++++++++----------
 tests/UI/data/xml/store.ts                    |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/UI/campaigns/functional/WS/01_storesCRUD.ts b/tests/UI/campaigns/functional/WS/01_storesCRUD.ts
index 1d89df73418f7..9bc07b8c73f70 100644
--- a/tests/UI/campaigns/functional/WS/01_storesCRUD.ts
+++ b/tests/UI/campaigns/functional/WS/01_storesCRUD.ts
@@ -377,7 +377,7 @@ describe('WS - Stores : CRUD', async () => {
             const oNode: Element = storesNodes[o];
 
             if (oNode.nodeName === 'id') {
-              expect(oNode.textContent).to.be.eq(storeNodeID);
+              expect(oNode.textContent, `node name: ${oNode.nodeName}`).to.be.eq(storeNodeID);
             } else if (oNode.nodeName === 'name' || oNode.nodeName === 'hours' || oNode.nodeName === 'address1'
               || oNode.nodeName === 'address2' || oNode.nodeName === 'note') {
               const objectNodeValueEN = storeXml.getLangEltTextContent(
@@ -392,7 +392,7 @@ describe('WS - Stores : CRUD', async () => {
                 '1',
               );
 
-              expect(objectNodeValueEN).to.be.eq(createNodeValueEN);
+              expect(objectNodeValueEN, `node name: ${oNode.nodeName}`).to.be.eq(createNodeValueEN);
 
               const objectNodeValueFR = storeXml.getLangEltTextContent(
                 xmlResponse,
@@ -404,13 +404,13 @@ describe('WS - Stores : CRUD', async () => {
                 oNode.nodeName,
                 '2',
               );
-              expect(objectNodeValueFR).to.be.eq(createNodeValueFR);
+              expect(objectNodeValueFR, `node name: ${oNode.nodeName}`).to.be.eq(createNodeValueFR);
             } else if (oNode.nodeName !== 'date_add' && oNode.nodeName !== 'date_upd') {
               const objectNodeValue: string = storeXml.getEltTextContent(
                 xmlCreate,
                 oNode.nodeName,
               );
-              expect(oNode.textContent).to.be.eq(objectNodeValue);
+              expect(oNode.textContent, `node name: ${oNode.nodeName}`).to.be.eq(objectNodeValue);
             }
           }
         });
@@ -541,7 +541,7 @@ describe('WS - Stores : CRUD', async () => {
         it('should check store\'s state', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkStoreState', baseContext);
 
-          const xmlValueIDState  = storeXml.getEltTextContent(xmlCreate, 'id_state');
+          const xmlValueIDState = '';
           const valueIDState = await addStorePage.getSelectValue(page, 'id_state');
           expect(valueIDState).to.be.eq(xmlValueIDState);
         });
@@ -738,7 +738,7 @@ describe('WS - Stores : CRUD', async () => {
             const oNode: Element = storesNodes[o];
 
             if (oNode.nodeName === 'id') {
-              expect(oNode.textContent).to.be.eq(storeNodeID);
+              expect(oNode.textContent, `node name: ${oNode.nodeName}`).to.be.eq(storeNodeID);
             } else if (oNode.nodeName === 'name' || oNode.nodeName === 'hours' || oNode.nodeName === 'address1'
               || oNode.nodeName === 'address2' || oNode.nodeName === 'note') {
               const objectNodeValueEN = storeXml.getLangEltTextContent(
@@ -753,7 +753,7 @@ describe('WS - Stores : CRUD', async () => {
                 '1',
               );
 
-              expect(objectNodeValueEN).to.be.eq(createNodeValueEN);
+              expect(objectNodeValueEN, `node name: ${oNode.nodeName}`).to.be.eq(createNodeValueEN);
 
               const objectNodeValueFR = storeXml.getLangEltTextContent(
                 xmlResponse,
@@ -765,13 +765,13 @@ describe('WS - Stores : CRUD', async () => {
                 oNode.nodeName,
                 '2',
               );
-              expect(objectNodeValueFR).to.be.eq(createNodeValueFR);
+              expect(objectNodeValueFR, `node name: ${oNode.nodeName}`).to.be.eq(createNodeValueFR);
             } else if (oNode.nodeName !== 'date_add' && oNode.nodeName !== 'date_upd') {
               const objectNodeValue: string = storeXml.getEltTextContent(
                 xmlUpdate,
                 oNode.nodeName,
               );
-              expect(oNode.textContent).to.be.eq(objectNodeValue);
+              expect(oNode.textContent, `node name: ${oNode.nodeName}`).to.be.eq(objectNodeValue);
             }
           }
         });
@@ -877,7 +877,7 @@ describe('WS - Stores : CRUD', async () => {
         it('should check store\'s state', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkStoreState2', baseContext);
 
-          const xmlValueIDState = storeXml.getEltTextContent(xmlUpdate, 'id_state');
+          const xmlValueIDState = '';
           const valueIDState = await addStorePage.getSelectValue(page, 'id_state');
           expect(valueIDState).to.be.eq(xmlValueIDState);
         });
diff --git a/tests/UI/data/xml/store.ts b/tests/UI/data/xml/store.ts
index 2ae4c91ca5e5a..a96ce86d2d4ca 100644
--- a/tests/UI/data/xml/store.ts
+++ b/tests/UI/data/xml/store.ts
@@ -9,7 +9,7 @@ export function getStoreXml(idStore: string | null = null): string {
     + '<prestashop xmlns:xlink="http://www.w3.org/1999/xlink">'
     + `<store>${idStore !== null ? (`<id><![CDATA[${idStore}]]></id>`) : ''}`
     + '<id_country><![CDATA[11]]></id_country>'
-    + '<id_state><![CDATA[]]></id_state>'
+    + '<id_state><![CDATA[0]]></id_state>'
     + '<hours>'
     + '<language id="1"><![CDATA[[["4h30AM - 5h30PM"],["5h30AM - 5h30PM"],["6h30AM - 5h30PM"],["7h30AM - 5h30PM"],'
     + '["8h30AM - 5h30PM"],["9h30AM - 5h30PM"],["10h30AM - 5h30PM"]]]]></language>'
@@ -51,7 +51,7 @@ export function getUpdateStoreXml(idStore: string | null = null): string {
     + '<prestashop xmlns:xlink="http://www.w3.org/1999/xlink">'
     + `<store>${idStore !== null ? (`<id><![CDATA[${idStore}]]></id>`) : ''}`
     + `<id_country><![CDATA[${faker.number.int({min: 1, max: 5})}]]></id_country>`
-    + '<id_state><![CDATA[]]></id_state>'
+    + '<id_state><![CDATA[0]]></id_state>'
     + '<hours>'
     + '<language id="1"><![CDATA[[["8h30AM - 5h30PM"],["8h30AM - 6h30PM"],["8h30AM - 7h30PM"],["8h30AM - 8h30PM"],'
     + '["8h30AM - 9h30PM"],["8h30AM - 10h30PM"],["8h30AM - 11h30PM"]]]]></language>'

From ce4a0697840341c74bbf61ff1e267c291029c0ea Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Wed, 26 Jul 2023 15:32:22 +0200
Subject: [PATCH 0642/1030] WS Stores : Check id_state

---
 tests/UI/campaigns/functional/WS/01_storesCRUD.ts | 12 ++++++------
 tests/UI/data/xml/store.ts                        |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/UI/campaigns/functional/WS/01_storesCRUD.ts b/tests/UI/campaigns/functional/WS/01_storesCRUD.ts
index 9bc07b8c73f70..be449a90b601f 100644
--- a/tests/UI/campaigns/functional/WS/01_storesCRUD.ts
+++ b/tests/UI/campaigns/functional/WS/01_storesCRUD.ts
@@ -541,7 +541,7 @@ describe('WS - Stores : CRUD', async () => {
         it('should check store\'s state', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkStoreState', baseContext);
 
-          const xmlValueIDState = '';
+          const xmlValueIDState = storeXml.getEltTextContent(xmlCreate, 'id_state');
           const valueIDState = await addStorePage.getSelectValue(page, 'id_state');
           expect(valueIDState).to.be.eq(xmlValueIDState);
         });
@@ -599,7 +599,7 @@ describe('WS - Stores : CRUD', async () => {
             await testContext.addContextItem(this, 'testIdentifier', `checkStoreHours${day}Lang1`, baseContext);
 
             const dayHours = hoursArrLang1[index];
-            let expectedDayHours = '';
+            let expectedDayHours: string;
 
             if (index === 0) {
               expectedDayHours = dayHours.substring(3, dayHours.length - 2);
@@ -617,7 +617,7 @@ describe('WS - Stores : CRUD', async () => {
             await testContext.addContextItem(this, 'testIdentifier', `checkStoreHours${day}Lang2`, baseContext);
 
             const dayHours = hoursArrLang2[index];
-            let expectedDayHours = '';
+            let expectedDayHours: string;
 
             if (index === 0) {
               expectedDayHours = dayHours.substring(3, dayHours.length - 2);
@@ -877,7 +877,7 @@ describe('WS - Stores : CRUD', async () => {
         it('should check store\'s state', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkStoreState2', baseContext);
 
-          const xmlValueIDState = '';
+          const xmlValueIDState = storeXml.getEltTextContent(xmlUpdate, 'id_state');
           const valueIDState = await addStorePage.getSelectValue(page, 'id_state');
           expect(valueIDState).to.be.eq(xmlValueIDState);
         });
@@ -938,7 +938,7 @@ describe('WS - Stores : CRUD', async () => {
             const hoursArrUpdatedLang1: string[] = xmlValueUpdatedHoursLang1.split(',');
             const dayHours = hoursArrUpdatedLang1[index];
 
-            let expectedDayHours = '';
+            let expectedDayHours: string;
 
             if (index === 0) {
               expectedDayHours = dayHours.substring(3, dayHours.length - 2);
@@ -959,7 +959,7 @@ describe('WS - Stores : CRUD', async () => {
             const hoursArrUpdatedLang2: string[] = xmlValueUpdatedHoursLang2.split(',');
             const dayHours = hoursArrUpdatedLang2[index];
 
-            let expectedDayHours = '';
+            let expectedDayHours : string;
 
             if (index === 0) {
               expectedDayHours = dayHours.substring(3, dayHours.length - 2);
diff --git a/tests/UI/data/xml/store.ts b/tests/UI/data/xml/store.ts
index a96ce86d2d4ca..a191c89ce60c0 100644
--- a/tests/UI/data/xml/store.ts
+++ b/tests/UI/data/xml/store.ts
@@ -9,7 +9,7 @@ export function getStoreXml(idStore: string | null = null): string {
     + '<prestashop xmlns:xlink="http://www.w3.org/1999/xlink">'
     + `<store>${idStore !== null ? (`<id><![CDATA[${idStore}]]></id>`) : ''}`
     + '<id_country><![CDATA[11]]></id_country>'
-    + '<id_state><![CDATA[0]]></id_state>'
+    + '<id_state><![CDATA[291]]></id_state>'
     + '<hours>'
     + '<language id="1"><![CDATA[[["4h30AM - 5h30PM"],["5h30AM - 5h30PM"],["6h30AM - 5h30PM"],["7h30AM - 5h30PM"],'
     + '["8h30AM - 5h30PM"],["9h30AM - 5h30PM"],["10h30AM - 5h30PM"]]]]></language>'
@@ -50,8 +50,8 @@ export function getUpdateStoreXml(idStore: string | null = null): string {
   return ('<?xml version="1.0" encoding="UTF-8"?>'
     + '<prestashop xmlns:xlink="http://www.w3.org/1999/xlink">'
     + `<store>${idStore !== null ? (`<id><![CDATA[${idStore}]]></id>`) : ''}`
-    + `<id_country><![CDATA[${faker.number.int({min: 1, max: 5})}]]></id_country>`
-    + '<id_state><![CDATA[0]]></id_state>'
+    + '<id_country><![CDATA[21]]></id_country>'
+    + '<id_state><![CDATA[14]]></id_state>'
     + '<hours>'
     + '<language id="1"><![CDATA[[["8h30AM - 5h30PM"],["8h30AM - 6h30PM"],["8h30AM - 7h30PM"],["8h30AM - 8h30PM"],'
     + '["8h30AM - 9h30PM"],["8h30AM - 10h30PM"],["8h30AM - 11h30PM"]]]]></language>'

From 1aab334f1e42c8879a42115961ce8aaa0884a02c Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Wed, 26 Jul 2023 11:42:14 +0200
Subject: [PATCH 0643/1030] Test random errors in advanced parameters tests

---
 .../04_email/03_sortAndPagination.ts               | 14 +++++++++++---
 .../UI/pages/BO/advancedParameters/email/index.ts  |  2 +-
 .../BO/advancedParameters/performance/index.ts     |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/04_email/03_sortAndPagination.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/04_email/03_sortAndPagination.ts
index dce80325d1bd2..9a24c8a394566 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/04_email/03_sortAndPagination.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/04_email/03_sortAndPagination.ts
@@ -34,7 +34,7 @@ Pagination
 Sort by Id, Recipient, Template, Language, Subject, Send
 Delete by bulk actions
  */
-describe('BO - Advanced Parameters - E-mail : Sort and pagination emails', async () => {
+describe('BO - Advanced Parameters - E-mail : Test Sort and pagination emails', async () => {
   let browserContext: BrowserContext;
   let page: Page;
 
@@ -254,13 +254,13 @@ describe('BO - Advanced Parameters - E-mail : Sort and pagination emails', async
     {
       args:
         {
-          testIdentifier: 'sortByDateAddDesc', sortBy: 'date_add', sortDirection: 'desc',
+          testIdentifier: 'sortByDateAddDesc', sortBy: 'date_add', sortDirection: 'desc', isDate: true,
         },
     },
     {
       args:
         {
-          testIdentifier: 'sortByDateAddAsc', sortBy: 'date_add', sortDirection: 'asc',
+          testIdentifier: 'sortByDateAddAsc', sortBy: 'date_add', sortDirection: 'asc', isDate: true,
         },
     },
     {
@@ -304,6 +304,14 @@ describe('BO - Advanced Parameters - E-mail : Sort and pagination emails', async
           } else {
             await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
+        } else if (test.args.isDate) {
+          const expectedResult = await basicHelper.sortArrayDate(nonSortedTable);
+
+          if (test.args.sortDirection === 'asc') {
+            await expect(sortedTable).to.deep.equal(expectedResult);
+          } else {
+            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+          }
         } else {
           const expectedResult = await basicHelper.sortArray(nonSortedTable);
 
diff --git a/tests/UI/pages/BO/advancedParameters/email/index.ts b/tests/UI/pages/BO/advancedParameters/email/index.ts
index 4d7e11d1564d4..366e395b94e1b 100644
--- a/tests/UI/pages/BO/advancedParameters/email/index.ts
+++ b/tests/UI/pages/BO/advancedParameters/email/index.ts
@@ -461,7 +461,7 @@ class Email extends BOBasePage {
     let i: number = 0;
     while (await this.elementNotVisible(page, sortColumnDiv, 2000) && i < 2) {
       await page.hover(this.sortColumnDiv(sortBy));
-      await page.click(sortColumnSpanButton);
+      await this.clickAndWaitForURL(page, sortColumnSpanButton);
       i += 1;
     }
 
diff --git a/tests/UI/pages/BO/advancedParameters/performance/index.ts b/tests/UI/pages/BO/advancedParameters/performance/index.ts
index 3fc169ee93671..47d2b9443c626 100644
--- a/tests/UI/pages/BO/advancedParameters/performance/index.ts
+++ b/tests/UI/pages/BO/advancedParameters/performance/index.ts
@@ -60,7 +60,7 @@ class Performance extends BOBasePage {
    */
   async setDebugMode(page: Page, toEnable: boolean): Promise<string> {
     await this.setChecked(page, this.debugModeButton(toEnable ? 1 : 0));
-    await this.waitForSelectorAndClick(page, this.saveDebugModeForm);
+    await this.clickAndWaitForURL(page, this.saveDebugModeForm);
 
     return this.getTextContent(page, this.alertSuccessBlockParagraph);
   }

From 7834b3423c2dcafa98715707d6729005653fb4e5 Mon Sep 17 00:00:00 2001
From: Daniel Hlavacek <daniel.hlavacek@hotmail.cz>
Date: Wed, 26 Jul 2023 17:26:58 +0200
Subject: [PATCH 0644/1030] Prevent checking nonsupported image formats

---
 controllers/admin/AdminImagesController.php | 23 +++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/controllers/admin/AdminImagesController.php b/controllers/admin/AdminImagesController.php
index 8abeea424fae7..1f46076b81aa8 100644
--- a/controllers/admin/AdminImagesController.php
+++ b/controllers/admin/AdminImagesController.php
@@ -103,11 +103,17 @@ public function init()
         $formFields = [];
 
         if ($this->isMultipleImageFormatFeatureEnabled) {
+            /* We will disable few image formats
+             * Base JPG is mandatory, see https://github.com/PrestaShop/PrestaShop/issues/30944
+             * AVIF support depends on platform - PHP version and required libraries available
+             */
             $imageFormatsDisabled = [];
-            $imageFormatsDisabled['jpg'] = true; // jpg is mandatory, see https://github.com/PrestaShop/PrestaShop/issues/30944
-            if (false === $this->canGenerateAvif) {
+            $imageFormatsDisabled['jpg'] = true;
+            if (!$this->canGenerateAvif) {
                 $imageFormatsDisabled['avif'] = true;
             }
+
+            // Load configured formats to see what to check
             $configuredImageFormats = $this->imageFormatConfiguration->getGenerationFormats();
 
             $fields = [
@@ -476,6 +482,19 @@ public function initModal(): void
         ];
     }
 
+    public function beforeUpdateOptions()
+    {
+        // Unset AVIF if not supported, add JPG if missing
+        foreach ($_POST['PS_IMAGE_FORMAT'] as $k => $v) {
+            if ($v == 'avif' && !$this->canGenerateAvif) {
+                unset($_POST['PS_IMAGE_FORMAT'][$k]);
+            }
+        }
+        if (!in_array('jpg', $_POST['PS_IMAGE_FORMAT'])) {
+            $_POST['PS_IMAGE_FORMAT'][] = 'jpg';
+        }
+    }
+
     public function updateOptionPsImageFormat($value): void
     {
         if ($this->access('edit') != '1') {

From 2ee49c83a0b67b4ed9e1a9bbfd035fb21992db3c Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Wed, 26 Jul 2023 17:31:21 +0200
Subject: [PATCH 0645/1030] Fix typo

---
 .../BO/14_advancedParameters/04_email/03_sortAndPagination.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/04_email/03_sortAndPagination.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/04_email/03_sortAndPagination.ts
index 9a24c8a394566..6006f82c756c2 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/04_email/03_sortAndPagination.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/04_email/03_sortAndPagination.ts
@@ -34,7 +34,7 @@ Pagination
 Sort by Id, Recipient, Template, Language, Subject, Send
 Delete by bulk actions
  */
-describe('BO - Advanced Parameters - E-mail : Test Sort and pagination emails', async () => {
+describe('BO - Advanced Parameters - E-mail : Sort and pagination emails', async () => {
   let browserContext: BrowserContext;
   let page: Page;
 

From 6f9afa877d0232f0ed71efd7f04718e29a99d7c5 Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Wed, 5 Jul 2023 14:06:33 +0200
Subject: [PATCH 0646/1030] Add conditions for manufacturer fields

---
 classes/Product.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/classes/Product.php b/classes/Product.php
index 3b059984e42f7..cdf07468d0c95 100644
--- a/classes/Product.php
+++ b/classes/Product.php
@@ -5617,7 +5617,12 @@ public static function getProductProperties($id_lang, $row, Context $context = n
         $row['category'] = Category::getLinkRewrite((int) $row['id_category_default'], (int) $id_lang);
         $row['category_name'] = Db::getInstance()->getValue('SELECT name FROM ' . _DB_PREFIX_ . 'category_lang WHERE id_shop = ' . (int) $context->shop->id . ' AND id_lang = ' . (int) $id_lang . ' AND id_category = ' . (int) $row['id_category_default']);
         $row['link'] = $context->link->getProductLink((int) $row['id_product'], $row['link_rewrite'], $row['category'], $row['ean13']);
-        $row['manufacturer_name'] = !empty((int) $row['id_manufacturer']) ? Manufacturer::getNameById((int) $row['id_manufacturer']) : null;
+
+        if (empty($row['manufacturer_name']) && (isset($row['id_manufacturer']) && !empty((int) $row['id_manufacturer']))) {
+            $row['manufacturer_name'] = Manufacturer::getNameById((int) $row['id_manufacturer']);
+        } else {
+            $row['manufacturer_name'] = null;
+        }
 
         $row['attribute_price'] = 0;
         if ($id_product_attribute) {

From 5833c29ed2ea979f36f46d1b56c9aa00fe4b683f Mon Sep 17 00:00:00 2001
From: Daniel Hlavacek <daniel.hlavacek@hotmail.cz>
Date: Wed, 26 Jul 2023 20:14:16 +0200
Subject: [PATCH 0647/1030] Add mysql column limits

---
 .../Form/Admin/Type/FormattedTextareaType.php                | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/PrestaShopBundle/Form/Admin/Type/FormattedTextareaType.php b/src/PrestaShopBundle/Form/Admin/Type/FormattedTextareaType.php
index 782df42d42771..43cdc36d0d94e 100644
--- a/src/PrestaShopBundle/Form/Admin/Type/FormattedTextareaType.php
+++ b/src/PrestaShopBundle/Form/Admin/Type/FormattedTextareaType.php
@@ -39,9 +39,12 @@
 class FormattedTextareaType extends TranslatorAwareType
 {
     /**
-     * Max size of UTF-8 content in MySQL text column
+     * Max size of UTF-8 content in MySQL text columns
      */
+    public const LIMIT_TINYTEXT_UTF8 = 84;
     public const LIMIT_TEXT_UTF8 = 21844;
+    public const LIMIT_MEDIUMTEXT_UTF8 = 5592414;
+    public const LIMIT_LONGTEXT_UTF8 = 1431655764;
 
     /**
      * {@inheritdoc}

From 321d55228107f072915b9e8859cdd0b693e021f2 Mon Sep 17 00:00:00 2001
From: Daniel Hlavacek <daniel.hlavacek@hotmail.cz>
Date: Wed, 26 Jul 2023 20:14:58 +0200
Subject: [PATCH 0648/1030] Use proper limit for CMS page content

---
 .../Form/Admin/Improve/Design/Pages/CmsPageType.php              | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/PrestaShopBundle/Form/Admin/Improve/Design/Pages/CmsPageType.php b/src/PrestaShopBundle/Form/Admin/Improve/Design/Pages/CmsPageType.php
index c0a174a2595db..afe5b8add6776 100644
--- a/src/PrestaShopBundle/Form/Admin/Improve/Design/Pages/CmsPageType.php
+++ b/src/PrestaShopBundle/Form/Admin/Improve/Design/Pages/CmsPageType.php
@@ -268,6 +268,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'type' => FormattedTextareaType::class,
                 'required' => false,
                 'options' => [
+                    'limit' => FormattedTextareaType::LIMIT_LONGTEXT_UTF8,
                     'constraints' => [
                         new CleanHtml([
                             'message' => $this->trans(

From f8b2e2c0442eea59617dde7a2e2f2588fcadb288 Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Wed, 26 Jul 2023 22:16:24 +0200
Subject: [PATCH 0649/1030] Lazyload attribute_price property

---
 classes/Product.php                           |  5 -----
 .../Presenter/Product/ProductLazyArray.php    | 21 +++++++++++++++++++
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/classes/Product.php b/classes/Product.php
index 6edb730c199a9..bbdc1ef8cbca5 100644
--- a/classes/Product.php
+++ b/classes/Product.php
@@ -5629,11 +5629,6 @@ public static function getProductProperties($id_lang, $row, Context $context = n
         $row['link'] = $context->link->getProductLink((int) $row['id_product'], $row['link_rewrite'], $row['category'], $row['ean13']);
         $row['manufacturer_name'] = !empty((int) $row['id_manufacturer']) ? Manufacturer::getNameById((int) $row['id_manufacturer']) : null;
 
-        $row['attribute_price'] = 0;
-        if ($id_product_attribute) {
-            $row['attribute_price'] = (float) Combination::getPrice($id_product_attribute);
-        }
-
         if (isset($row['quantity_wanted'])) {
             // 'quantity_wanted' may very well be zero even if set
             $quantity = max((int) $row['minimal_quantity'], (int) $row['quantity_wanted']);
diff --git a/src/Adapter/Presenter/Product/ProductLazyArray.php b/src/Adapter/Presenter/Product/ProductLazyArray.php
index 75773a75cf2f1..bdf167d87ba70 100644
--- a/src/Adapter/Presenter/Product/ProductLazyArray.php
+++ b/src/Adapter/Presenter/Product/ProductLazyArray.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\Presenter\Product;
 
+use Combination;
 use Context;
 use DateTime;
 use Language;
@@ -1046,6 +1047,26 @@ public function addQuantityInformation(
         }
     }
 
+    /**
+     * Returns extra price associated with current combination, if provided
+     *
+     * @arrayAccess
+     *
+     * @return float
+     */
+    public function getAttributePrice()
+    {
+        if (!isset($this->product['attribute_price'])) {
+            if (!empty($this->product['id_product_attribute'])) {
+                $this->product['attribute_price'] = (float) Combination::getPrice($this->product['id_product_attribute']);
+            } else {
+                $this->product['attribute_price'] = 0;
+            }
+        }
+
+        return (float) $this->product['attribute_price'];
+    }
+
     /**
      * @param string $key
      *

From dc7ebdfeec6a9df5655061fe2a81869e63399761 Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Wed, 26 Jul 2023 23:28:47 +0200
Subject: [PATCH 0650/1030] Add some comments to Product class

---
 classes/Product.php | 35 +++++++++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/classes/Product.php b/classes/Product.php
index 82b574ee2325b..3f14bef119325 100644
--- a/classes/Product.php
+++ b/classes/Product.php
@@ -1074,9 +1074,9 @@ public static function cleanPositions($id_category, $position = 0)
     /**
      * Get the default attribute for a product.
      *
-     * @param int $id_product Product identifier
-     * @param int $minimum_quantity
-     * @param bool $reset
+     * @param int $id_product Product ID
+     * @param int $minimum_quantity Minimal quantity there should be in stock of the combination
+     * @param bool $reset Force reload new values and not use cache
      *
      * @return int Attributes list
      */
@@ -1086,22 +1086,23 @@ public static function getDefaultAttribute($id_product, $minimum_quantity = 0, $
             return 0;
         }
 
-        if ($reset && isset(static::$_combinations[$id_product])) {
-            unset(static::$_combinations[$id_product]);
-        }
-
-        if (!isset(static::$_combinations[$id_product])) {
+        // If we should start fresh OR we did not want default combination for this product yet, we initialize cache
+        if ($reset || !isset(static::$_combinations[$id_product])) {
             static::$_combinations[$id_product] = [];
         }
+
+        // If we already have a value for this product and minimal quantity, we retrieve it from cache.
         if (isset(static::$_combinations[$id_product][$minimum_quantity])) {
             return static::$_combinations[$id_product][$minimum_quantity];
         }
 
+        // First attempt - check if the product even has some attributes
         $sql = 'SELECT product_attribute_shop.id_product_attribute
                 FROM ' . _DB_PREFIX_ . 'product_attribute pa
                 ' . Shop::addSqlAssociation('product_attribute', 'pa') . '
                 WHERE pa.id_product = ' . (int) $id_product;
 
+        // If none are found, we exit right away
         $result_no_filter = (int) Db::getInstance()->getValue($sql);
         if (!$result_no_filter) {
             static::$_combinations[$id_product][$minimum_quantity] = 0;
@@ -1109,6 +1110,7 @@ public static function getDefaultAttribute($id_product, $minimum_quantity = 0, $
             return 0;
         }
 
+        // Try to check if the default combination matches our minimum_quantity quantity condition, if yes - win
         $sql = 'SELECT product_attribute_shop.id_product_attribute
                 FROM ' . _DB_PREFIX_ . 'product_attribute pa
                 ' . Shop::addSqlAssociation('product_attribute', 'pa') . '
@@ -1118,6 +1120,7 @@ public static function getDefaultAttribute($id_product, $minimum_quantity = 0, $
                 ' AND pa.id_product = ' . (int) $id_product;
         $result = (int) Db::getInstance()->getValue($sql);
 
+        // If not, check if there is ANY combination matching minimum_quantity, if yes - not perfect, but works
         if (!$result) {
             $sql = 'SELECT product_attribute_shop.id_product_attribute
                     FROM ' . _DB_PREFIX_ . 'product_attribute pa
@@ -1129,6 +1132,7 @@ public static function getDefaultAttribute($id_product, $minimum_quantity = 0, $
             $result = (int) Db::getInstance()->getValue($sql);
         }
 
+        // If still nothing, we will return the default combination
         if (!$result) {
             $sql = 'SELECT product_attribute_shop.id_product_attribute
                     FROM ' . _DB_PREFIX_ . 'product_attribute pa
@@ -1139,10 +1143,12 @@ public static function getDefaultAttribute($id_product, $minimum_quantity = 0, $
             $result = (int) Db::getInstance()->getValue($sql);
         }
 
+        // If for some reason (database inconsistency) we still did not find any combination, we use the fallback one
         if (!$result) {
             $result = $result_no_filter;
         }
 
+        // Cache it for next time and return it
         static::$_combinations[$id_product][$minimum_quantity] = $result;
 
         return $result;
@@ -5750,6 +5756,11 @@ public static function getProductProperties($id_lang, $row, Context $context = n
 
         $row['specific_prices'] = $specific_prices;
 
+        /* Get quantity of the base product.
+         * For products without combinations - self explanatory.
+         * For products with combinations - this value is a SUM of quantities of all combinations.
+         * You have 2 black shirts + 2 white shirts = $quantity 4.
+         */
         $row['quantity'] = Product::getQuantity(
             (int) $row['id_product'],
             0,
@@ -5759,6 +5770,7 @@ public static function getProductProperties($id_lang, $row, Context $context = n
 
         $row['quantity_all_versions'] = $row['quantity'];
 
+        // If we have some combination ID specified, we will return more precise stock and date for this combination
         if ($row['id_product_attribute']) {
             $row['quantity'] = Product::getQuantity(
                 (int) $row['id_product'],
@@ -5776,6 +5788,13 @@ public static function getProductProperties($id_lang, $row, Context $context = n
         $row['id_image'] = Product::defineProductImage($row, $id_lang);
         $row['features'] = Product::getFrontFeaturesStatic((int) $id_lang, $row['id_product']);
 
+        /*
+         * Loading of files attached to product. This is using cache_has_attachments property which needs to be managed
+         * every time a file is changed. It can sometimes lead to database inconsistency.
+         *
+         * It would be better to lazy load it in ProductLazyArray so we can just always take the live data
+         * if needed and would not need to take care about cache_has_attachments.
+         */
         $row['attachments'] = [];
         if (!isset($row['cache_has_attachments']) || $row['cache_has_attachments']) {
             $row['attachments'] = Product::getAttachmentsStatic((int) $id_lang, $row['id_product']);

From 25c46cbdb057a17c3087ad6e687aa70155765a93 Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Thu, 27 Jul 2023 00:03:48 +0200
Subject: [PATCH 0651/1030] Hide stores from web if no stores are configured

---
 classes/Store.php                       |  10 ++
 controllers/front/SitemapController.php |  13 ++-
 controllers/front/StoresController.php  | 137 +++---------------------
 3 files changed, 35 insertions(+), 125 deletions(-)

diff --git a/classes/Store.php b/classes/Store.php
index bbdfea6b89374..87d1d6cd5824e 100644
--- a/classes/Store.php
+++ b/classes/Store.php
@@ -202,4 +202,14 @@ public static function storeExists($idStore)
 
         return isset($row['id_store']);
     }
+
+    /**
+     * This method checks if at least one store is configured
+     *
+     * @return bool
+     */
+    public static function atLeastOneStoreExists()
+    {
+        return (bool) Db::getInstance()->getValue('SELECT `id_store` FROM ' . _DB_PREFIX_ . 'store', false);
+    }
 }
diff --git a/controllers/front/SitemapController.php b/controllers/front/SitemapController.php
index 93c6d2596cf34..0f4619af696d6 100644
--- a/controllers/front/SitemapController.php
+++ b/controllers/front/SitemapController.php
@@ -107,11 +107,14 @@ protected function getPagesLinks()
         $cms = CMSCategory::getRecurseCategory($this->context->language->id, 1, 1, 1);
         $links = $this->getCmsTree($cms);
 
-        $links[] = [
-            'id' => 'stores-page',
-            'label' => $this->trans('Our stores', [], 'Shop.Theme.Global'),
-            'url' => $this->context->link->getPageLink('stores'),
-        ];
+        // We hide stores page, if there is no page configured
+        if (Store::atLeastOneStoreExists()) {
+            $links[] = [
+                'id' => 'stores-page',
+                'label' => $this->trans('Our stores', [], 'Shop.Theme.Global'),
+                'url' => $this->context->link->getPageLink('stores'),
+            ];
+        }
 
         $links[] = [
             'id' => 'contact-page',
diff --git a/controllers/front/StoresController.php b/controllers/front/StoresController.php
index 7a4c5dab5458f..7e79823adc800 100644
--- a/controllers/front/StoresController.php
+++ b/controllers/front/StoresController.php
@@ -33,117 +33,6 @@ class StoresControllerCore extends FrontController
     /** @var StorePresenter */
     protected $storePresenter;
 
-    /**
-     * Get formatted string address.
-     *
-     * @param array $store
-     *
-     * @return string
-     */
-    protected function processStoreAddress(array $store)
-    {
-        $ignore_field = [
-            'firstname',
-            'lastname',
-        ];
-
-        $out_datas = [];
-
-        $address_datas = AddressFormat::getOrderedAddressFields($store['id_country'], false, true);
-        $state = (isset($store['id_state'])) ? new State($store['id_state']) : null;
-
-        foreach ($address_datas as $data_line) {
-            $data_fields = explode(' ', $data_line);
-            $addr_out = [];
-
-            $data_fields_mod = false;
-            foreach ($data_fields as $field_item) {
-                $field_item = trim($field_item);
-                if (!in_array($field_item, $ignore_field) && !empty($store[$field_item])) {
-                    $addr_out[] = ($field_item == 'city' && $state && !empty($state->iso_code)) ?
-                        $store[$field_item] . ', ' . $state->iso_code : $store[$field_item];
-                    $data_fields_mod = true;
-                }
-            }
-            if ($data_fields_mod) {
-                $out_datas[] = implode(' ', $addr_out);
-            }
-        }
-
-        $out = implode('<br />', $out_datas);
-
-        return $out;
-    }
-
-    public function getStoresForXml()
-    {
-        $distance_unit = Configuration::get('PS_DISTANCE_UNIT');
-        if (!in_array($distance_unit, ['km', 'mi'])) {
-            $distance_unit = 'km';
-        }
-
-        $distance = (int) Tools::getValue('radius', 100);
-        $multiplicator = ($distance_unit == 'km' ? 6371 : 3959);
-
-        $langId = (int) Tools::getValue('lang', Configuration::get('PS_LANG_DEFAULT'));
-
-        $stores = Db::getInstance()->executeS('
-        SELECT s.*, sl.*, cl.name country, st.iso_code state,
-        (' . (int) $multiplicator . '
-            * acos(
-                cos(radians(' . (float) Tools::getValue('latitude') . '))
-                * cos(radians(latitude))
-                * cos(radians(longitude) - radians(' . (float) Tools::getValue('longitude') . '))
-                + sin(radians(' . (float) Tools::getValue('latitude') . '))
-                * sin(radians(latitude))
-            )
-        ) distance,
-        cl.id_country id_country
-        FROM ' . _DB_PREFIX_ . 'store s
-        LEFT JOIN ' . _DB_PREFIX_ . 'country_lang cl ON (cl.id_country = s.id_country AND cl.id_lang = ' . (int) $langId . ')
-        LEFT JOIN ' . _DB_PREFIX_ . 'store_lang sl ON (sl.id_store = s.id_store AND sl.id_lang = ' . (int) $langId . ')
-        LEFT JOIN ' . _DB_PREFIX_ . 'state st ON (st.id_state = s.id_state)
-        WHERE s.active = 1
-        HAVING distance < ' . (int) $distance . '
-        ORDER BY distance ASC
-        LIMIT 0,20');
-
-        return $stores;
-    }
-
-    /**
-     * Display the Xml for showing the nodes in the google map.
-     */
-    protected function displayAjax()
-    {
-        $stores = $this->getStoresForXml();
-        $parnode = new SimpleXMLElement('<?xml version="1.0" encoding="UTF-8"?><markers></markers>');
-
-        foreach ($stores as $store) {
-            $newnode = $parnode->addChild('marker');
-            $newnode->addAttribute('name', $store['name']);
-            $address = $this->processStoreAddress($store);
-
-            $newnode->addAttribute('addressNoHtml', strip_tags(str_replace('<br />', ' ', $address)));
-            $newnode->addAttribute('address', $address);
-            $newnode->addAttribute('hours', trim($store['hours']));
-            $newnode->addAttribute('phone', $store['phone']);
-            $newnode->addAttribute('fax', $store['fax']);
-            $newnode->addAttribute('note', $store['note']);
-            $newnode->addAttribute('id_store', (string) (int) $store['id_store']);
-            $newnode->addAttribute('has_store_picture', (string) file_exists(_PS_STORE_IMG_DIR_ . (int) $store['id_store'] . '.jpg'));
-            $newnode->addAttribute('lat', (string) (float) $store['latitude']);
-            $newnode->addAttribute('lng', (string) (float) $store['longitude']);
-            if (isset($store['distance'])) {
-                $newnode->addAttribute('distance', (string) (int) $store['distance']);
-            }
-        }
-
-        header('Content-type: text/xml');
-
-        $this->ajaxRender($parnode->asXML());
-    }
-
     /**
      * Initialize stores controller.
      *
@@ -172,15 +61,23 @@ public function initContent()
             $distance_unit = 'km';
         }
 
-        $this->context->smarty->assign([
-            'mediumSize' => Image::getSize(ImageType::getFormattedName('medium')),
-            'searchUrl' => $this->context->link->getPageLink('stores'),
-            'distance_unit' => $distance_unit,
-            'stores' => $this->getTemplateVarStores(),
-        ]);
-
-        parent::initContent();
-        $this->setTemplate('cms/stores');
+        // Load stores and present them
+        $stores = $this->getTemplateVarStores();
+
+        // If no stores are configured, we hide this page
+        if (!empty($stores)) {
+            $this->context->smarty->assign([
+                'mediumSize' => Image::getSize(ImageType::getFormattedName('medium')),
+                'searchUrl' => $this->context->link->getPageLink('stores'),
+                'distance_unit' => $distance_unit,
+                'stores' => $stores,
+            ]);
+            parent::initContent();
+            $this->setTemplate('cms/stores');
+        } else {
+            $this->redirect_after = '404';
+            $this->redirect();
+        }
     }
 
     public function getTemplateVarStores()

From 7d32fab2478ebceb16e3d26886207a0fad3ab7e2 Mon Sep 17 00:00:00 2001
From: lartist <salim-benouamer.ext@prestashop.com>
Date: Thu, 27 Jul 2023 14:41:37 +0200
Subject: [PATCH 0652/1030] Revert php errors twigs component

---
 .../themes/new-theme/template/layout.tpl      |  6 +--
 .../Component/Layout/php_errors.html.twig     | 44 -------------------
 .../views/Admin/Layout/php_errors.html.twig   | 27 ------------
 .../Twig/Component/PHPErrors.php              | 37 ----------------
 4 files changed, 1 insertion(+), 113 deletions(-)
 delete mode 100644 src/PrestaShopBundle/Resources/views/Admin/Component/Layout/php_errors.html.twig
 delete mode 100644 src/PrestaShopBundle/Resources/views/Admin/Layout/php_errors.html.twig
 delete mode 100644 src/PrestaShopBundle/Twig/Component/PHPErrors.php

diff --git a/admin-dev/themes/new-theme/template/layout.tpl b/admin-dev/themes/new-theme/template/layout.tpl
index 133911ed6839d..80b321b5a75d0 100644
--- a/admin-dev/themes/new-theme/template/layout.tpl
+++ b/admin-dev/themes/new-theme/template/layout.tpl
@@ -211,11 +211,7 @@
 {/if}
 
 {if isset($php_errors)}
-    {render_template
-      smarty_template="error.tpl"
-      twig_template="@PrestaShop/Admin/Layout/php_errors.html.twig"
-      php_errors=$php_errors
-    }
+  {include file="error.tpl"}
 {/if}
 
 {if (!isset($lite_display) || (isset($lite_display) && !$lite_display))}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/php_errors.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/php_errors.html.twig
deleted file mode 100644
index 20f8e7b894b2a..0000000000000
--- a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/php_errors.html.twig
+++ /dev/null
@@ -1,44 +0,0 @@
-{#**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- *#}
-{% if phpErrors|length > 0 %}
-<div class="bootstrap">
-  <div id="error-modal" class="modal fade">
-    <div class="modal-dialog">
-      <div class="alert alert-danger clearfix">
-        {% for phpError in phpErrors %}
-          {{ '%1$s on line %2$s in file %3$s'|trans({
-            '%1$s': phpError.type,
-            '%2$s': phpError.errline,
-            '%3$s': phpError.errfile,
-            }, 'Admin.Notifications.Error')
-          }}<br />
-          [{{ phpError.errno }}] {{ phpError.errstr }}<br /><br />
-        {% endfor %}
-        <button type="button" class="btn btn-default float-right" data-dismiss="modal"><i class="icon-remove"></i> {{ 'Close'|trans({}, 'Admin.Actions') }}</button>
-      </div>
-    </div>
-  </div>
-</div>
-{% endif %}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/php_errors.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/php_errors.html.twig
deleted file mode 100644
index 3475f33e68bf5..0000000000000
--- a/src/PrestaShopBundle/Resources/views/Admin/Layout/php_errors.html.twig
+++ /dev/null
@@ -1,27 +0,0 @@
-{#**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- *#}
-{{ component('PHPErrors', {
-  phpErrors: php_errors,
-}) }}
diff --git a/src/PrestaShopBundle/Twig/Component/PHPErrors.php b/src/PrestaShopBundle/Twig/Component/PHPErrors.php
deleted file mode 100644
index e5bf250c3ca2c..0000000000000
--- a/src/PrestaShopBundle/Twig/Component/PHPErrors.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-declare(strict_types=1);
-
-namespace PrestaShopBundle\Twig\Component;
-
-use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
-
-#[AsTwigComponent(template: '@PrestaShop/Admin/Component/Layout/php_errors.html.twig')]
-class PHPErrors
-{
-    public array $phpErrors;
-}

From 802deefb3b5d337041953ce522a8f8e94b029aeb Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Thu, 27 Jul 2023 16:17:46 +0200
Subject: [PATCH 0653/1030] Refacto tests in employee pages

---
 .../01_filterAndQuickEditEmployees.ts         | 117 +++++++++---------
 .../06_team/employees/02_CRUDEmployee.ts      |  11 +-
 .../employees/03_employeesBulkActions.ts      |  71 ++++++++---
 .../pages/BO/advancedParameters/team/index.ts |  17 ++-
 4 files changed, 131 insertions(+), 85 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/employees/01_filterAndQuickEditEmployees.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/employees/01_filterAndQuickEditEmployees.ts
index 98083c85d761e..e282216e017e1 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/employees/01_filterAndQuickEditEmployees.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/employees/01_filterAndQuickEditEmployees.ts
@@ -67,8 +67,8 @@ describe('BO - Advanced Parameters - Team : Filter and quick edit Employees', as
     await expect(numberOfEmployees).to.be.above(0);
   });
 
-  // 1 : Create employee and Filter with all inputs and selects in grid table in BO
-  describe('Create employee then filter the table', async () => {
+  // PRE-TEST : Create employee and Filter with all inputs and selects in grid table in BO
+  describe('PRE-TEST : Create employee', async () => {
     it('should go to add new employee page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'goToNewEmployeePage', baseContext);
 
@@ -87,7 +87,10 @@ describe('BO - Advanced Parameters - Team : Filter and quick edit Employees', as
       const numberOfEmployeesAfterCreation = await employeesPage.getNumberOfElementInGrid(page);
       await expect(numberOfEmployeesAfterCreation).to.be.equal(numberOfEmployees + 1);
     });
+  });
 
+  // 1 : Filter with all inputs and selects in grid table in BO
+  describe('Filter the table', async () => {
     [
       {
         args:
@@ -166,76 +169,76 @@ describe('BO - Advanced Parameters - Team : Filter and quick edit Employees', as
         await expect(numberOfEmployeesAfterCreation).to.be.above(numberOfEmployees);
       });
     });
+  });
 
-    // 2 : Editing Employees from grid table
-    describe('Quick edit Employees', async () => {
-      it('should filter by Email address', async function () {
-        await testContext.addContextItem(this, 'testIdentifier', 'filterForQuickEdit', baseContext);
+  // 3 : Quick edit Employees
+  describe('Quick edit Employee', async () => {
+    it('should filter by Email address', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'filterForQuickEdit', baseContext);
 
-        await employeesPage.filterEmployees(page, 'input', 'email', createEmployeeData.email);
+      await employeesPage.filterEmployees(page, 'input', 'email', createEmployeeData.email);
 
-        const numberOfEmployeesAfterFilter = await employeesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfEmployeesAfterFilter).to.be.at.most(numberOfEmployees);
+      const numberOfEmployeesAfterFilter = await employeesPage.getNumberOfElementInGrid(page);
+      await expect(numberOfEmployeesAfterFilter).to.be.at.most(numberOfEmployees);
 
-        for (let i = 1; i <= numberOfEmployeesAfterFilter; i++) {
-          const textColumn = await employeesPage.getTextColumnFromTable(page, i, 'email');
-          await expect(textColumn).to.contains(createEmployeeData.email);
-        }
-      });
+      for (let i = 1; i <= numberOfEmployeesAfterFilter; i++) {
+        const textColumn = await employeesPage.getTextColumnFromTable(page, i, 'email');
+        await expect(textColumn).to.contains(createEmployeeData.email);
+      }
+    });
 
-      [
-        {args: {status: 'disable', enable: false}},
-        {args: {status: 'enable', enable: true}},
-      ].forEach((employeeStatus) => {
-        it(`should ${employeeStatus.args.status} the employee`, async function () {
-          await testContext.addContextItem(
-            this,
-            'testIdentifier',
-            `${employeeStatus.args.status}Employee`,
-            baseContext,
-          );
-
-          const isActionPerformed = await employeesPage.setStatus(
-            page,
-            1,
-            employeeStatus.args.enable,
-          );
-
-          if (isActionPerformed) {
-            const resultMessage = await employeesPage.getAlertSuccessBlockParagraphContent(page);
-            await expect(resultMessage).to.contains(employeesPage.successfulUpdateStatusMessage);
-          }
+    [
+      {args: {status: 'disable', enable: false}},
+      {args: {status: 'enable', enable: true}},
+    ].forEach((employeeStatus) => {
+      it(`should ${employeeStatus.args.status} the employee from the table`, async function () {
+        await testContext.addContextItem(
+          this,
+          'testIdentifier',
+          `${employeeStatus.args.status}Employee`,
+          baseContext,
+        );
 
-          const currentStatus = await employeesPage.getStatus(page, 1);
-          await expect(currentStatus).to.be.equal(employeeStatus.args.enable);
-        });
+        const isActionPerformed = await employeesPage.setStatus(
+          page,
+          1,
+          employeeStatus.args.enable,
+        );
+
+        if (isActionPerformed) {
+          const resultMessage = await employeesPage.getAlertSuccessBlockParagraphContent(page);
+          await expect(resultMessage).to.contains(employeesPage.successfulUpdateStatusMessage);
+        }
+
+        const currentStatus = await employeesPage.getStatus(page, 1);
+        await expect(currentStatus).to.be.equal(employeeStatus.args.enable);
       });
     });
+  });
 
-    // 3 : Delete employee
-    describe('Delete employee', async () => {
-      it('should filter list by email', async function () {
-        await testContext.addContextItem(this, 'testIdentifier', 'filterForDelete', baseContext);
+  // POST-TEST : Delete employee
+  describe('POST-TEST : Delete employee', async () => {
+    it('should filter list by email', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'filterForDelete', baseContext);
 
-        await employeesPage.filterEmployees(page, 'input', 'email', createEmployeeData.email);
+      await employeesPage.filterEmployees(page, 'input', 'email', createEmployeeData.email);
 
-        const textEmail = await employeesPage.getTextColumnFromTable(page, 1, 'email');
-        await expect(textEmail).to.contains(createEmployeeData.email);
-      });
+      const textEmail = await employeesPage.getTextColumnFromTable(page, 1, 'email');
+      await expect(textEmail).to.contains(createEmployeeData.email);
+    });
 
-      it('should delete employee', async function () {
-        await testContext.addContextItem(this, 'testIdentifier', 'deleteEmployee', baseContext);
+    it('should delete employee', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'deleteEmployee', baseContext);
 
-        const textResult = await employeesPage.deleteEmployee(page, 1);
-        await expect(textResult).to.equal(employeesPage.successfulDeleteMessage);
-      });
+      const textResult = await employeesPage.deleteEmployee(page, 1);
+      await expect(textResult).to.equal(employeesPage.successfulDeleteMessage);
+    });
 
-      it('should reset filter and check the number of employees', async function () {
-        await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDelete', baseContext);
+    it('should reset filter and check the number of employees', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDelete', baseContext);
 
-        const numberOfEmployeesAfterDelete = await employeesPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfEmployeesAfterDelete).to.be.equal(numberOfEmployees);
-      });
+      const numberOfEmployeesAfterDelete = await employeesPage.resetAndGetNumberOfLines(page);
+      await expect(numberOfEmployeesAfterDelete).to.be.equal(numberOfEmployees);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/employees/02_CRUDEmployee.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/employees/02_CRUDEmployee.ts
index 13d81b4b7ced6..d110ee0a00bfc 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/employees/02_CRUDEmployee.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/employees/02_CRUDEmployee.ts
@@ -22,7 +22,7 @@ import type {BrowserContext, Page} from 'playwright';
 const baseContext: string = 'functional_BO_advancedParameters_team_employees_CRUDEmployee';
 
 // Create, Read, Update and Delete Employee in BO
-describe('BO - Advanced Parameters - Team : Create, Read, Update and Delete Employee in BO', async () => {
+describe('BO - Advanced Parameters - Team : CRUD Employee', async () => {
   const createEmployeeData: EmployeeData = new EmployeeData({
     defaultPage: 'Products',
     language: 'English (English)',
@@ -79,8 +79,8 @@ describe('BO - Advanced Parameters - Team : Create, Read, Update and Delete Empl
     await expect(numberOfEmployees).to.be.above(0);
   });
 
-  // 1 : Create employee and go to FO to check sign in is OK
-  describe('Create employee in BO and check Sign in in BO', async () => {
+  // 1 : Create employee and go to BO to check sign in is OK
+  describe('Create employee and check Sign in', async () => {
     it('should go to add new employee page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'goToNewEmployeePage', baseContext);
 
@@ -119,7 +119,7 @@ describe('BO - Advanced Parameters - Team : Create, Read, Update and Delete Empl
   });
 
   // 2 : Update employee and check that employee can't sign in in BO (enabled = false)
-  describe('Update the employee created', async () => {
+  describe('Update employee', async () => {
     it('should login in BO', async function () {
       await loginCommon.loginBO(this, page);
     });
@@ -190,6 +190,7 @@ describe('BO - Advanced Parameters - Team : Create, Read, Update and Delete Empl
         await loginCommon.logoutBO(this, page);
       });
     });
+
     describe('Disable the employee and check it', async () => {
       it('should login in BO', async function () {
         await loginCommon.loginBO(this, page);
@@ -249,7 +250,7 @@ describe('BO - Advanced Parameters - Team : Create, Read, Update and Delete Empl
     });
   });
 
-  // 5 : Delete employee
+  // 3 : Delete employee
   describe('Delete employee', async () => {
     it('should login in BO', async function () {
       await loginCommon.loginBO(this, page);
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/employees/03_employeesBulkActions.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/employees/03_employeesBulkActions.ts
index 4ca20888f48c3..b1cc8569e5685 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/employees/03_employeesBulkActions.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/employees/03_employeesBulkActions.ts
@@ -12,6 +12,7 @@ import addEmployeePage from '@pages/BO/advancedParameters/team/add';
 
 // Import data
 import EmployeeData from '@data/faker/employee';
+import Employees from '@data/demo/employees';
 
 import {expect} from 'chai';
 import type {BrowserContext, Page} from 'playwright';
@@ -70,8 +71,43 @@ describe('BO - Advanced Parameters - Team : Create/Disable/Enable and bulk delet
     await expect(numberOfEmployees).to.be.above(0);
   });
 
-  // 1 : Create employees and Filter with all inputs and selects in grid table in BO
-  describe('Create employees then filter the table', async () => {
+  // 1 : Try to Enable/Disable the default employee with bulk actions
+  describe('Case 1 : Try to enable/disable the default employee with Bulk Actions', async () => {
+    it('should filter by First name', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'filterDefaultEmployee', baseContext);
+
+      await employeesPage.filterEmployees(page, 'input', 'firstname', Employees.DefaultEmployee.firstName);
+
+      const textColumn = await employeesPage.getTextColumnFromTable(page, 1, 'firstname');
+      await expect(textColumn).to.contains(Employees.DefaultEmployee.firstName);
+    });
+
+    const statuses = [
+      {args: {status: 'disable', enable: false}},
+      {args: {status: 'enable', enable: true}},
+    ];
+    statuses.forEach((employeeStatus) => {
+      it(`should try to ${employeeStatus.args.status} default employee and check the error message`, async function () {
+        await testContext.addContextItem(this, 'testIdentifier', `${employeeStatus.args.status}DefaultEmployee`, baseContext);
+
+        const disableTextResult = await employeesPage.bulkSetStatus(page, employeeStatus.args.enable, false);
+        await expect(disableTextResult).to.be.equal(employeesPage.errorDeleteOwnAccountMessage);
+      });
+    });
+  });
+
+  // 2 : Delete employee with bulk actions
+  describe('Case 1 : Try to delete default employee with Bulk Actions', async () => {
+    it('should try to delete default employee and check the error message', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteDefaultEmployee', baseContext);
+
+      const deleteTextResult = await employeesPage.deleteBulkActions(page, false);
+      await expect(deleteTextResult).to.be.equal(employeesPage.errorDeleteOwnAccountMessage);
+    });
+  });
+
+  // 3 : Create employees and Filter with all inputs and selects in grid table in BO
+  describe('Case 2 : Create 2 employees then filter the table', async () => {
     const employeesToCreate: EmployeeData[] = [firstEmployeeData, secondEmployeeData];
 
     employeesToCreate.forEach((employeeToCreate: EmployeeData, index: number) => {
@@ -89,15 +125,12 @@ describe('BO - Advanced Parameters - Team : Create/Disable/Enable and bulk delet
 
         const textResult = await addEmployeePage.createEditEmployee(page, employeeToCreate);
         await expect(textResult).to.equal(employeesPage.successfulCreationMessage);
-
-        const numberOfEmployeesAfterCreation = await employeesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfEmployeesAfterCreation).to.be.equal(numberOfEmployees + index + 1);
       });
     });
   });
 
-  // 2 : Enable/Disable employees created with bulk actions
-  describe('Enable and Disable employees with Bulk Actions', async () => {
+  // 4 : Enable/Disable employees created with bulk actions
+  describe('Case 2 : Enable/Disable the created employees with Bulk Actions', async () => {
     it('should filter by First name', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'filterForBulkEditStatus', baseContext);
 
@@ -135,22 +168,22 @@ describe('BO - Advanced Parameters - Team : Create/Disable/Enable and bulk delet
         }
       });
     });
+  });
 
-    // 3 : Delete employee with bulk actions
-    describe('Delete employees with Bulk Actions', async () => {
-      it('should delete employees with Bulk Actions and check result', async function () {
-        await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteEmployee', baseContext);
+  // 5 : Delete employee with bulk actions
+  describe('Case 2 : Delete employees with Bulk Actions', async () => {
+    it('should delete employees with Bulk Actions and check result', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteEmployee', baseContext);
 
-        const deleteTextResult = await employeesPage.deleteBulkActions(page);
-        await expect(deleteTextResult).to.be.equal(employeesPage.successfulMultiDeleteMessage);
-      });
+      const deleteTextResult = await employeesPage.deleteBulkActions(page);
+      await expect(deleteTextResult).to.be.equal(employeesPage.successfulMultiDeleteMessage);
+    });
 
-      it('should reset all filters', async function () {
-        await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDelete', baseContext);
+    it('should reset all filters', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDelete', baseContext);
 
-        const numberOfEmployeesAfterDelete = await employeesPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfEmployeesAfterDelete).to.be.equal(numberOfEmployees);
-      });
+      const numberOfEmployeesAfterDelete = await employeesPage.resetAndGetNumberOfLines(page);
+      await expect(numberOfEmployeesAfterDelete).to.be.equal(numberOfEmployees);
     });
   });
 });
diff --git a/tests/UI/pages/BO/advancedParameters/team/index.ts b/tests/UI/pages/BO/advancedParameters/team/index.ts
index eb49b10d66796..89a9bb693ffdc 100644
--- a/tests/UI/pages/BO/advancedParameters/team/index.ts
+++ b/tests/UI/pages/BO/advancedParameters/team/index.ts
@@ -138,6 +138,7 @@ class Employees extends BOBasePage {
   /*
   Methods
    */
+
   // Header methods
   /**
    * Go to new Employee page
@@ -331,9 +332,10 @@ class Employees extends BOBasePage {
    * Enable / disable employees by Bulk Actions
    * @param page {Page} Browser tab
    * @param enable {boolean} True if we need to bulk enable status, false if not
+   * @param getValidationMessage {boolean} True if we need to return validation message, false if error message
    * @returns {Promise<string>}
    */
-  async bulkSetStatus(page: Page, enable: boolean = true): Promise<string> {
+  async bulkSetStatus(page: Page, enable: boolean = true, getValidationMessage: boolean = true): Promise<string> {
     // Click on Select All
     await Promise.all([
       page.$eval(this.selectAllRowsLabel, (el: HTMLElement) => el.click()),
@@ -348,15 +350,19 @@ class Employees extends BOBasePage {
     await page.click(enable ? this.bulkActionsEnableButton : this.bulkActionsDisableButton);
     await this.elementNotVisible(page, enable ? this.bulkActionsEnableButton : this.bulkActionsDisableButton, 2000);
 
-    return this.getAlertSuccessBlockParagraphContent(page);
+    if (getValidationMessage) {
+      return this.getAlertSuccessBlockParagraphContent(page);
+    }
+    return this.getAlertDangerBlockParagraphContent(page);
   }
 
   /**
    * Delete all employees with Bulk Actions
    * @param page {Page} Browser tab
+   * @param getValidationMessage {boolean} True if we need to return validation message, false if error message
    * @returns {Promise<string>}
    */
-  async deleteBulkActions(page: Page): Promise<string> {
+  async deleteBulkActions(page: Page, getValidationMessage: boolean = true): Promise<string> {
     // Click on Select All
     await Promise.all([
       page.$eval(this.selectAllRowsLabel, (el: HTMLElement) => el.click()),
@@ -375,7 +381,10 @@ class Employees extends BOBasePage {
     ]);
     await this.confirmDeleteEmployees(page);
 
-    return this.getAlertSuccessBlockParagraphContent(page);
+    if (getValidationMessage) {
+      return this.getAlertSuccessBlockParagraphContent(page);
+    }
+    return this.getAlertDangerBlockParagraphContent(page);
   }
 
   // Sort methods

From 7e2596914133504380e2dab58490543721a7f3e1 Mon Sep 17 00:00:00 2001
From: tleon <thomas.leone@prestashop.com>
Date: Thu, 27 Jul 2023 16:43:46 +0200
Subject: [PATCH 0654/1030] fix(combination): fix select for when multishop is
 not enabled

---
 .../specific-price/form/combination-selector.ts        |  8 +++++++-
 .../product/specific-price/form/customer-selector.ts   | 10 +++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/admin-dev/themes/new-theme/js/pages/product/specific-price/form/combination-selector.ts b/admin-dev/themes/new-theme/js/pages/product/specific-price/form/combination-selector.ts
index b13a0ec70d3ea..d30c8b444c6bb 100644
--- a/admin-dev/themes/new-theme/js/pages/product/specific-price/form/combination-selector.ts
+++ b/admin-dev/themes/new-theme/js/pages/product/specific-price/form/combination-selector.ts
@@ -110,7 +110,13 @@ export default class CombinationSelector {
     };
 
     const shopIdSelect = <HTMLSelectElement> this.container.querySelector(SpecificPriceMap.shopIdSelect);
-    const shopId = Number(shopIdSelect.value) ?? null;
+    let shopId = null;
+
+    // This check is here for when the multishop is not enabled.
+    // The selector shopIdSelect does not exist when multishop is not enabled.
+    if (shopIdSelect !== null) {
+      shopId = Number(shopIdSelect.value);
+    }
 
     if (shopId) {
       routeParams.shopId = shopId;
diff --git a/admin-dev/themes/new-theme/js/pages/product/specific-price/form/customer-selector.ts b/admin-dev/themes/new-theme/js/pages/product/specific-price/form/customer-selector.ts
index 410c031e08481..57a758b26b2f5 100644
--- a/admin-dev/themes/new-theme/js/pages/product/specific-price/form/customer-selector.ts
+++ b/admin-dev/themes/new-theme/js/pages/product/specific-price/form/customer-selector.ts
@@ -31,9 +31,13 @@ export default class CustomerSelector {
   }
 
   private init(): void {
-    const customerSearchInput = this.initCustomerSearchInput();
-    // clear selected customers whenever shop is changed, because customers may differ between shops
-    this.getShopIdSelect().addEventListener('change', () => customerSearchInput.setValues([]));
+    // This check is here for when the multishop is not enabled.
+    // The selector returned by the this.getShopIdSelect does not exist when multishop is not enabled.
+    if (this.getShopIdSelect() !== null) {
+      const customerSearchInput = this.initCustomerSearchInput();
+      // clear selected customers whenever shop is changed, because customers may differ between shops
+      this.getShopIdSelect().addEventListener('change', () => customerSearchInput.setValues([]));
+    }
   }
 
   private initCustomerSearchInput(): EntitySearchInput {

From ec92dfea89d135f3e825e0feedadae0dc2550390 Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Thu, 27 Jul 2023 20:25:31 +0200
Subject: [PATCH 0655/1030] Remove remains of AdminCartsController view

---
 .../controllers/carts/helpers/index.php       |  35 -
 .../controllers/carts/helpers/view/index.php  |  35 -
 .../controllers/carts/helpers/view/view.tpl   | 213 ------
 .../template/controllers/carts/index.php      |  35 -
 controllers/admin/AdminCartsController.php    | 688 ------------------
 5 files changed, 1006 deletions(-)
 delete mode 100644 admin-dev/themes/default/template/controllers/carts/helpers/index.php
 delete mode 100644 admin-dev/themes/default/template/controllers/carts/helpers/view/index.php
 delete mode 100755 admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl
 delete mode 100644 admin-dev/themes/default/template/controllers/carts/index.php

diff --git a/admin-dev/themes/default/template/controllers/carts/helpers/index.php b/admin-dev/themes/default/template/controllers/carts/helpers/index.php
deleted file mode 100644
index b459cc3ae5750..0000000000000
--- a/admin-dev/themes/default/template/controllers/carts/helpers/index.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
-
-header('Cache-Control: no-store, no-cache, must-revalidate');
-header('Cache-Control: post-check=0, pre-check=0', false);
-header('Pragma: no-cache');
-
-header('Location: ../../../../../../../');
-exit;
diff --git a/admin-dev/themes/default/template/controllers/carts/helpers/view/index.php b/admin-dev/themes/default/template/controllers/carts/helpers/view/index.php
deleted file mode 100644
index 3de54df1f73e7..0000000000000
--- a/admin-dev/themes/default/template/controllers/carts/helpers/view/index.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
-
-header('Cache-Control: no-store, no-cache, must-revalidate');
-header('Cache-Control: post-check=0, pre-check=0', false);
-header('Pragma: no-cache');
-
-header('Location: ../../../../../../../../');
-exit;
diff --git a/admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl
deleted file mode 100755
index feb3b3446875d..0000000000000
--- a/admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl
+++ /dev/null
@@ -1,213 +0,0 @@
-{**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- *}
-
-{extends file="helpers/view/view.tpl"}
-
-{block name="override_tpl"}
-<div class="panel">
-	{$kpi}
-</div>
-<div class="row">
-	<div class="col-lg-6">
-		<div class="panel">
-			<h3><i class="icon-user"></i> {l s='Customer information' d='Admin.Orderscustomers.Feature'}</h3>
-			{if $customer->id}
-				<a class="btn btn-default pull-right" href="mailto:{$customer->email}"><i class="icon-envelope"></i> {$customer->email}</a>
-				<h2>
-					{if $customer->id_gender == 1}
-					<i class="icon-male"></i>
-					{elseif $customer->id_gender == 2}
-					<i class="icon-female"></i>
-					{else}
-					<i class="icon-question"></i>
-					{/if}
-					<a href="{$link->getAdminLink('AdminCustomers', true, [], ['id_customer' => $customer->id|intval, 'viewcustomer' => 1])|escape:'html':'UTF-8'}">{$customer->firstname} {$customer->lastname}</a></h2>
-				<div class="form-horizontal">
-					<div class="form-group">
-						<label class="col-lg-3 control-label">{l s='Account registration date:' d='Admin.Orderscustomers.Feature'}</label>
-						<div class="col-lg-3"><p class="form-control-static">{dateFormat date=$customer->date_add}</p></div>
-					</div>
-					<div class="form-group">
-						<label class="col-lg-3 control-label">{l s='Valid orders placed:' d='Admin.Orderscustomers.Feature'}</label>
-						<div class="col-lg-3"><p class="form-control-static">{$customer_stats.nb_orders}</p></div>
-					</div>
-					<div class="form-group">
-						<label class="col-lg-3 control-label">{l s='Total spent since registration:' d='Admin.Orderscustomers.Feature'}</label>
-						<div class="col-lg-3"><p class="form-control-static">{displayWtPriceWithCurrency price=$customer_stats.total_orders currency=$currency}</p></div>
-					</div>
-				</div>
-			{else}
-				<h2>{l s='Guest not registered' d='Admin.Orderscustomers.Feature'}</h2>
-			{/if}
-		</div>
-	</div>
-	<div class="col-lg-6">
-		<div class="panel">
-			<h3><i class="icon-shopping-cart"></i> {l s='Order information' d='Admin.Orderscustomers.Feature'}</h3>
-			{if $order->id}
-				<h2><a href="{$link->getAdminLink('AdminOrders', true, [], ['id_order' => $order->id|intval, 'vieworder' => 1])|escape:'html':'UTF-8'}"> {l s='Order #%d' sprintf=[$order->id|string_format:"%06d"] d='Admin.Orderscustomers.Feature'}</a></h2>
-				{l s='Made on:' d='Admin.Orderscustomers.Feature'} {dateFormat date=$order->date_add}
-			{else}
-				<h2>{l s='No order was created from this cart.' d='Admin.Orderscustomers.Feature'}</h2>
-				{if $customer->id}
-					<a
-            class="btn btn-default"
-            href="{$link->getAdminLink('AdminOrders', true, [], ['id_cart' => $cart->id|intval, 'addorder' => 1])|escape:'html':'UTF-8'}"
-            id="create-order-from-cart"
-          >
-            <i class="icon-shopping-cart"></i> {l s='Create an order from this cart.' d='Admin.Orderscustomers.Feature'}
-          </a>
-				{/if}
-			{/if}
-		</div>
-	</div>
-</div>
-<div class="panel">
-	<h3><i class="icon-archive"></i> {l s='Cart summary' d='Admin.Orderscustomers.Feature'}</h3>
-		<div class="row">
-			<table class="table" id="orderProducts">
-				<thead>
-					<tr>
-						<th class="fixed-width-xs">&nbsp;</th>
-						<th><span class="title_box">{l s='Product' d='Admin.Global'}</span></th>
-						<th class="text-right fixed-width-md"><span class="title_box">{l s='Unit price' d='Admin.Global'}</span></th>
-						<th class="text-center fixed-width-md"><span class="title_box">{l s='Quantity' d='Admin.Global'}</span></th>
-						<th class="text-center fixed-width-sm"><span class="title_box">{l s='Stock' d='Admin.Global'}</span></th>
-						<th class="text-right fixed-width-sm"><span class="title_box">{l s='Total' d='Admin.Global'}</span></th>
-					</tr>
-				</thead>
-				<tbody>
-				{foreach from=$products item='product'}
-					<tr>
-						<td>{$product.image}</td>
-						<td>
-							<a href="{$link->getAdminLink('AdminProducts', true, ['id_product' => $product.id_product, 'updateproduct' => 1])|escape:'html':'UTF-8'}">
-								<span class="productName">{$product.name}</span>{if isset($product.attributes)}<br />{$product.attributes}{/if}<br />
-								{if $product.reference}{l s='Ref:' d='Admin.Orderscustomers.Feature'} {$product.reference}{/if}
-								{if $product.reference && $product.supplier_reference} / {$product.supplier_reference}{/if}
-							</a>
-						</td>
-						<td class="text-right">{displayWtPriceWithCurrency price=$product.product_price currency=$currency}</td>
-						<td class="text-center">{$product.cart_quantity}</td>
-						<td class="text-center">{$product.qty_in_stock}</td>
-						<td class="text-right">{displayWtPriceWithCurrency price=$product.product_total currency=$currency}</td>
-					</tr>
-
-					{if $product['customizedDatas']}
-						{foreach $product['customizedDatas'] as $customizationPerAddress}
-							{foreach $customizationPerAddress as $customization}
-								<tr>
-									<td colspan="2">
-										{foreach from=$customization.datas key='type' item='datas'}
-											{if $type == constant('Product::CUSTOMIZE_FILE')}
-												<ul style="margin: 0; padding: 0; list-style-type: none;">
-													{foreach from=$datas key='index' item='data'}
-														<li style="display: inline; margin: 2px;">
-												    <a href="{$link->getAdminLink('AdminCarts', true, [], ['ajax' => 1, 'action' => 'customizationImage', 'img' => $data.value, 'name' => $order->id|intval|cat:'-file'|cat:$index])}" target="_blank" rel="noopener noreferrer nofollow">
-																<img src="{$pic_dir}{$data.value}_small" alt="" /></a>
-														</li>
-													{/foreach}
-												</ul>
-											{elseif $type == constant('Product::CUSTOMIZE_TEXTFIELD')}
-												<div class="form-horizontal">
-													{foreach from=$datas key='index' item='data'}
-														<div class="form-group">
-															<span class="control-label col-lg-3"><strong>{if $data.name}{$data.name}{else}{l s='Text #' d='Admin.Orderscustomers.Feature'}{$index}{/if}</strong></span>
-															<div class="col-lg-9">
-																<p class="form-control-static">{$data.value}</p>
-															</div>
-														</div>
-													{/foreach}
-												</div>
-											{/if}
-										{/foreach}
-									</td>
-									<td></td>
-									<td></td>
-									<td></td>
-									<td></td>
-								</tr>
-							{/foreach}
-						{/foreach}
-					{/if}
-				{/foreach}
-				<tr>
-					<td colspan="5">{l s='Total cost of products:' d='Admin.Orderscustomers.Feature'}</td>
-					<td class="text-right">{displayWtPriceWithCurrency price=$total_products currency=$currency}</td>
-				</tr>
-				{if $total_discounts != 0}
-				<tr>
-					<td colspan="5">{l s='Total value of vouchers:' d='Admin.Orderscustomers.Feature'}</td>
-					<td class="text-right">{displayWtPriceWithCurrency price=$total_discounts currency=$currency}</td>
-				</tr>
-				{/if}
-				{if $total_wrapping > 0}
-				<tr>
-					<td colspan="5">{l s='Total cost of gift wrapping:' d='Admin.Orderscustomers.Feature'}</td>
-					<td class="text-right">{displayWtPriceWithCurrency price=$total_wrapping currency=$currency}</td>
-				</tr>
-				{/if}
-				{if $cart->getOrderTotal(true, Cart::ONLY_SHIPPING) > 0}
-				<tr>
-					<td colspan="5">{l s='Total shipping costs:' d='Admin.Orderscustomers.Feature'}</td>
-					<td class="text-right">{displayWtPriceWithCurrency price=$total_shipping currency=$currency}</td>
-				</tr>
-				{/if}
-				<tr>
-					<td colspan="5" class=" success"><strong>{l s='Total' d='Admin.Global'}</strong></td>
-					<td class="text-right success"><strong>{displayWtPriceWithCurrency price=$total_price currency=$currency}</strong></td>
-				</tr>
-			</tbody>
-		</table>
-	</div>
-	{if $discounts}
-	<div class="clear">&nbsp;</div>
-	<div class="row">
-		<table class="table">
-			<thead>
-				<tr>
-					<th class="fixed-width-xs"><img src="../img/admin/coupon.gif" alt="{l s='Discounts' d='Admin.Global'}" /></th>
-					<th>{l s='Discount name'}</th>
-					<th class="text-right fixed-width-md">{l s='Value' d='Admin.Global'}</th>
-				</tr>
-			</thead>
-			<tbody>
-			{foreach from=$discounts item='discount'}
-				<tr>
-					<td class="fixed-width-xs">{$discount.id_discount}</td>
-					<td><a href="{$link->getAdminLink('AdminCartRules', true, [], ['id_cart_rule' => $discount.id_discount, 'updatecart_rule' => 1])|escape:'html':'UTF-8'}">{$discount.name}</a></td>
-					<td class="text-right fixed-width-md">{if (float)$discount.value_real == 0 && (int)$discount.free_shipping == 1}{l s='Free shipping' d='Admin.Shipping.Feature'}{else}- {displayWtPriceWithCurrency price=$discount.value_real currency=$currency}{/if}</td>
-				</tr>
-			{/foreach}
-			</tbody>
-		</table>
-	</div>
-	{/if}
-	<div class="clear">&nbsp;</div>
-	<div class="row alert alert-warning">
-		{l s='For this particular customer group, prices are displayed as:' d='Admin.Orderscustomers.Notification'} <b>{if $tax_calculation_method == $smarty.const.PS_TAX_EXC}{l s='Tax excluded' d='Admin.Global'}{else}{l s='Tax included' d='Admin.Global'}{/if}</b>
-	</div>
-</div>
-{/block}
diff --git a/admin-dev/themes/default/template/controllers/carts/index.php b/admin-dev/themes/default/template/controllers/carts/index.php
deleted file mode 100644
index 6c011614e2845..0000000000000
--- a/admin-dev/themes/default/template/controllers/carts/index.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
-
-header('Cache-Control: no-store, no-cache, must-revalidate');
-header('Cache-Control: post-check=0, pre-check=0', false);
-header('Pragma: no-cache');
-
-header('Location: ../../../../../../');
-exit;
diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php
index 6038c5cf171ab..78b70a561fd3f 100644
--- a/controllers/admin/AdminCartsController.php
+++ b/controllers/admin/AdminCartsController.php
@@ -219,700 +219,12 @@ public function renderKpis()
         return $helper->generate();
     }
 
-    /**
-     * @return string|void
-     *
-     * @throws PrestaShopDatabaseException
-     * @throws PrestaShopException
-     * @throws LocalizationException
-     */
-    public function renderView()
-    {
-        if (!($cart = $this->loadObject(true))) {
-            return;
-        }
-        /** @var Cart $cart */
-        $customer = new Customer($cart->id_customer);
-        $currency = new Currency($cart->id_currency);
-        $this->context->cart = $cart;
-        $this->context->currency = $currency;
-        $this->context->customer = $customer;
-        $this->toolbar_title = $this->trans('Cart #%ID%', ['%ID%' => $this->context->cart->id], 'Admin.Orderscustomers.Feature');
-        $products = $cart->getProducts();
-        $summary = $cart->getSummaryDetails();
-
-        /* Display order information */
-        $id_order = (int) Order::getIdByCartId($cart->id);
-        $order = new Order($id_order);
-        if (Validate::isLoadedObject($order)) {
-            $tax_calculation_method = $order->getTaxCalculationMethod();
-            $id_shop = (int) $order->id_shop;
-        } else {
-            $id_shop = (int) $cart->id_shop;
-            $tax_calculation_method = Group::getPriceDisplayMethod(Group::getCurrent()->id);
-        }
-
-        if ($tax_calculation_method == PS_TAX_EXC) {
-            $total_products = $summary['total_products'];
-            $total_discounts = $summary['total_discounts_tax_exc'];
-            $total_wrapping = $summary['total_wrapping_tax_exc'];
-            $total_price = $summary['total_price_without_tax'];
-            $total_shipping = $summary['total_shipping_tax_exc'];
-        } else {
-            $total_products = $summary['total_products_wt'];
-            $total_discounts = $summary['total_discounts'];
-            $total_wrapping = $summary['total_wrapping'];
-            $total_price = $summary['total_price'];
-            $total_shipping = $summary['total_shipping'];
-        }
-        foreach ($products as &$product) {
-            if ($tax_calculation_method == PS_TAX_EXC) {
-                $product['product_price'] = $product['price'];
-                $product['product_total'] = $product['total'];
-            } else {
-                $product['product_price'] = $product['price_wt'];
-                $product['product_total'] = $product['total_wt'];
-            }
-            $image = [];
-            if (isset($product['id_product_attribute']) && (int) $product['id_product_attribute']) {
-                $image = Db::getInstance()->getRow('SELECT id_image FROM ' . _DB_PREFIX_ . 'product_attribute_image WHERE id_product_attribute = ' . (int) $product['id_product_attribute']);
-            }
-            if (!isset($image['id_image'])) {
-                $image = Db::getInstance()->getRow('SELECT id_image FROM ' . _DB_PREFIX_ . 'image WHERE id_product = ' . (int) $product['id_product'] . ' AND cover = 1');
-            }
-
-            $product['qty_in_stock'] = StockAvailable::getQuantityAvailableByProduct($product['id_product'], isset($product['id_product_attribute']) ? $product['id_product_attribute'] : null, (int) $id_shop);
-
-            $image_product = new Image($image['id_image']);
-            $product['image'] = (isset($image['id_image']) ? ImageManager::thumbnail(_PS_IMG_DIR_ . 'p/' . $image_product->getExistingImgPath() . '.jpg', 'product_mini_' . (int) $product['id_product'] . (isset($product['id_product_attribute']) ? '_' . (int) $product['id_product_attribute'] : '') . '.jpg', 45, 'jpg') : '--');
-
-            $customized_datas = Product::getAllCustomizedDatas($this->context->cart->id, null, true, null, (int) $product['id_customization']);
-            $this->context->cart->setProductCustomizedDatas($product, $customized_datas);
-        }
-
-        $helper = new HelperKpi();
-        $helper->id = 'box-kpi-cart';
-        $helper->icon = 'icon-shopping-cart';
-        $helper->color = 'color1';
-        $helper->title = $this->trans('Total cart', [], 'Admin.Orderscustomers.Feature');
-        $helper->subtitle = $this->trans('Cart #%ID%', ['%ID%' => $cart->id], 'Admin.Orderscustomers.Feature');
-        $helper->value = $this->context->getCurrentLocale()->formatPrice($total_price, $currency->iso_code);
-        $kpi = $helper->generate();
-
-        $this->tpl_view_vars = [
-            'kpi' => $kpi,
-            'products' => $products,
-            'discounts' => $cart->getCartRules(),
-            'order' => $order,
-            'cart' => $cart,
-            'currency' => $currency,
-            'customer' => $customer,
-            'customer_stats' => $customer->getStats(),
-            'total_products' => $total_products,
-            'total_discounts' => $total_discounts,
-            'total_wrapping' => $total_wrapping,
-            'total_price' => $total_price,
-            'total_shipping' => $total_shipping,
-            'tax_calculation_method' => $tax_calculation_method,
-        ];
-
-        return parent::renderView();
-    }
-
-    public function ajaxPreProcess()
-    {
-        if ($this->access('edit')) {
-            $id_customer = (int) Tools::getValue('id_customer');
-            $customer = new Customer((int) $id_customer);
-            $this->context->customer = $customer;
-            $id_cart = (int) Tools::getValue('id_cart');
-            if (!$id_cart) {
-                $id_cart = $customer->getLastEmptyCart(false);
-            }
-            $this->context->cart = new Cart((int) $id_cart);
-
-            if (!$this->context->cart->id) {
-                $this->context->cart->recyclable = false;
-                $this->context->cart->gift = false;
-            }
-
-            if (!$this->context->cart->id_customer) {
-                $this->context->cart->id_customer = $id_customer;
-            }
-            if (Validate::isLoadedObject($this->context->cart) && $this->context->cart->OrderExists()) {
-                return;
-            }
-            if (!$this->context->cart->secure_key) {
-                $this->context->cart->secure_key = $this->context->customer->secure_key;
-            }
-            if (!$this->context->cart->id_shop) {
-                $this->context->cart->id_shop = (int) $this->context->shop->id;
-            }
-            if (!$this->context->cart->id_lang) {
-                $this->context->cart->id_lang = (($id_lang = (int) Tools::getValue('id_lang')) ? $id_lang : Configuration::get('PS_LANG_DEFAULT'));
-            }
-            if (!$this->context->cart->id_currency) {
-                $this->context->cart->id_currency = (($id_currency = (int) Tools::getValue('id_currency')) ? $id_currency : Currency::getDefaultCurrencyId());
-            }
-
-            $addresses = $customer->getAddresses((int) $this->context->cart->id_lang);
-            $id_address_delivery = (int) Tools::getValue('id_address_delivery');
-            $id_address_invoice = (int) Tools::getValue('id_address_delivery');
-
-            if (!$this->context->cart->id_address_invoice && isset($addresses[0])) {
-                $this->context->cart->id_address_invoice = (int) $addresses[0]['id_address'];
-            } elseif ($id_address_invoice) {
-                $this->context->cart->id_address_invoice = (int) $id_address_invoice;
-            }
-            if (!$this->context->cart->id_address_delivery && isset($addresses[0])) {
-                $this->context->cart->id_address_delivery = $addresses[0]['id_address'];
-            } elseif ($id_address_delivery) {
-                $this->context->cart->id_address_delivery = (int) $id_address_delivery;
-            }
-            $this->context->cart->setNoMultishipping();
-            $this->context->cart->save();
-            $currency = new Currency((int) $this->context->cart->id_currency);
-            $this->context->currency = $currency;
-        }
-    }
-
-    public function ajaxProcessDeleteProduct()
-    {
-        if ($this->access('edit')) {
-            $errors = [];
-            if ((!$id_product = (int) Tools::getValue('id_product')) || !Validate::isInt($id_product)) {
-                $errors[] = $this->trans('Invalid product', [], 'Admin.Catalog.Notification');
-            }
-            if (($id_product_attribute = (int) Tools::getValue('id_product_attribute')) && !Validate::isInt($id_product_attribute)) {
-                $errors[] = $this->trans('Invalid combination', [], 'Admin.Catalog.Notification');
-            }
-            if (count($errors)) {
-                die(json_encode($errors));
-            }
-            if ($this->context->cart->deleteProduct($id_product, $id_product_attribute, (int) Tools::getValue('id_customization'))) {
-                echo json_encode($this->ajaxReturnVars());
-            }
-        }
-    }
-
-    public function ajaxProcessUpdateCustomizationFields()
-    {
-        $errors = [];
-        if ($this->access('edit')) {
-            $errors = [];
-            if (Tools::getValue('only_display') != 1) {
-                if (!$this->context->cart->id || (!$id_product = (int) Tools::getValue('id_product'))) {
-                    return;
-                }
-                $product = new Product((int) $id_product);
-                if (!$customization_fields = $product->getCustomizationFieldIds()) {
-                    return;
-                }
-                foreach ($customization_fields as $customization_field) {
-                    $field_id = 'customization_' . $id_product . '_' . $customization_field['id_customization_field'];
-                    if ($customization_field['type'] == Product::CUSTOMIZE_TEXTFIELD) {
-                        if (!Tools::getValue($field_id)) {
-                            if ($customization_field['required']) {
-                                $errors[] = $this->trans('Please fill in all the required fields.', [], 'Admin.Notifications.Error');
-                            }
-
-                            continue;
-                        }
-                        if (!Validate::isMessage(Tools::getValue($field_id))) {
-                            $errors[] = $this->trans('Invalid message.', [], 'Admin.Notifications.Error');
-                        }
-                        $this->context->cart->addTextFieldToProduct((int) $product->id, (int) $customization_field['id_customization_field'], Product::CUSTOMIZE_TEXTFIELD, Tools::getValue($field_id));
-                    } elseif ($customization_field['type'] == Product::CUSTOMIZE_FILE) {
-                        if (!isset($_FILES[$field_id]) || !isset($_FILES[$field_id]['tmp_name']) || empty($_FILES[$field_id]['tmp_name'])) {
-                            if ($customization_field['required']) {
-                                $errors[] = $this->trans('Please fill in all the required fields.', [], 'Admin.Notifications.Error');
-                            }
-
-                            continue;
-                        }
-                        if ($error = ImageManager::validateUpload($_FILES[$field_id], (int) Configuration::get('PS_PRODUCT_PICTURE_MAX_SIZE'))) {
-                            $errors[] = $error;
-                        }
-                        if (!($tmp_name = tempnam(_PS_TMP_IMG_DIR_, 'PS')) || !move_uploaded_file($_FILES[$field_id]['tmp_name'], $tmp_name)) {
-                            $errors[] = $this->trans('An error occurred during the image upload process.', [], 'Admin.Catalog.Notification');
-                        }
-                        $file_name = md5(uniqid((string) mt_rand(0, mt_getrandmax()), true));
-                        if (!ImageManager::resize($tmp_name, _PS_UPLOAD_DIR_ . $file_name)) {
-                            continue;
-                        } elseif (!ImageManager::resize($tmp_name, _PS_UPLOAD_DIR_ . $file_name . '_small', (int) Configuration::get('PS_PRODUCT_PICTURE_WIDTH'), (int) Configuration::get('PS_PRODUCT_PICTURE_HEIGHT'))) {
-                            $errors[] = $this->trans('An error occurred during the image upload process.', [], 'Admin.Catalog.Notification');
-                        } else {
-                            $this->context->cart->addPictureToProduct((int) $product->id, (int) $customization_field['id_customization_field'], Product::CUSTOMIZE_FILE, $file_name);
-                        }
-                        unlink($tmp_name);
-                    }
-                }
-            }
-            $this->setMedia(false);
-            $this->initFooter();
-            $this->context->smarty->assign(['customization_errors' => implode('<br />', $errors),
-                'css_files' => $this->css_files, ]);
-
-            return $this->smartyOutputContent('controllers/orders/form_customization_feedback.tpl');
-        }
-    }
-
-    public function ajaxProcessUpdateQty()
-    {
-        if ($this->access('edit')) {
-            $errors = [];
-            if (!$this->context->cart->id) {
-                return;
-            }
-            $qty = Tools::getValue('qty');
-            $id_product = (int) Tools::getValue('id_product');
-            if ($this->context->cart->OrderExists()) {
-                $errors[] = $this->trans('An order has already been placed with this cart.', [], 'Admin.Catalog.Notification');
-            } elseif (!$id_product || !Validate::isLoadedObject($product = new Product((int) $id_product, true, $this->context->language->id))) {
-                $errors[] = $this->trans('Invalid product', [], 'Admin.Catalog.Notification');
-            } elseif (!$qty || $qty == 0) {
-                $errors[] = $this->trans('Invalid quantity', [], 'Admin.Catalog.Notification');
-            }
-
-            // Don't try to use a product if not instanciated before due to errors
-            $id_customization = (int) Tools::getValue('id_customization', 0);
-            $id_product_attribute = Tools::getValue('id_product_attribute');
-            if (isset($product) && $product->id) {
-                if ($id_product_attribute != 0) {
-                    if (!Product::isAvailableWhenOutOfStock($product->out_of_stock) && !ProductAttribute::checkAttributeQty((int) $id_product_attribute, (int) $qty)) {
-                        $errors[] = $this->trans('There are not enough products in stock.', [], 'Admin.Catalog.Notification');
-                    }
-                } elseif (!$product->checkQty((int) $qty)) {
-                    $errors[] = $this->trans('There are not enough products in stock.', [], 'Admin.Catalog.Notification');
-                }
-                if (!$id_customization && !$product->hasAllRequiredCustomizableFields()) {
-                    $errors[] = $this->trans('Please fill in all the required fields.', [], 'Admin.Notifications.Error');
-                }
-                $this->context->cart->save();
-            } else {
-                $errors[] = $this->trans('This product cannot be added to the cart.', [], 'Admin.Catalog.Notification');
-            }
-
-            if (!count($errors)) {
-                if ((int) $qty < 0) {
-                    $qty = str_replace('-', '', $qty);
-                    $operator = 'down';
-                } else {
-                    $operator = 'up';
-                }
-
-                if (!($qty_upd = $this->context->cart->updateQty($qty, $id_product, (int) $id_product_attribute, $id_customization, $operator))) {
-                    $errors[] = $this->trans('You already have the maximum quantity available for this product.', [], 'Admin.Catalog.Notification');
-                } elseif ($qty_upd < 0 && isset($product)) {
-                    $minimal_qty = $id_product_attribute ? ProductAttribute::getAttributeMinimalQty((int) $id_product_attribute) : $product->minimal_quantity;
-                    $errors[] = $this->trans('You must add a minimum quantity of %d', [$minimal_qty], 'Admin.Orderscustomers.Notification');
-                }
-            }
-
-            echo json_encode(array_merge($this->ajaxReturnVars(), ['errors' => $errors]));
-        }
-    }
-
-    public function ajaxProcessUpdateDeliveryOption()
-    {
-        if ($this->access('edit')) {
-            $delivery_option = Tools::getValue('delivery_option');
-            if ($delivery_option !== false) {
-                $this->context->cart->setDeliveryOption([$this->context->cart->id_address_delivery => $delivery_option]);
-            }
-            $recyclable = (int) Tools::getValue('recyclable');
-            if (Validate::isBool($recyclable)) {
-                $this->context->cart->recyclable = $recyclable;
-            }
-            $gift = (int) Tools::getValue('gift');
-            if (Validate::isBool($gift)) {
-                $this->context->cart->gift = $gift;
-            }
-            if (Validate::isMessage(($gift_message = pSQL(Tools::getValue('gift_message'))))) {
-                $this->context->cart->gift_message = $gift_message;
-            }
-            $this->context->cart->save();
-            echo json_encode($this->ajaxReturnVars());
-        }
-    }
-
-    public function ajaxProcessUpdateOrderMessage()
-    {
-        if ($this->access('edit')) {
-            $id_message = false;
-            if ($old_message = Message::getMessageByCartId((int) $this->context->cart->id)) {
-                $id_message = $old_message['id_message'];
-            }
-            $message = new Message((int) $id_message);
-            if ($message_content = Tools::getValue('message')) {
-                if (Validate::isMessage($message_content)) {
-                    $message->message = $message_content;
-                    $message->id_cart = (int) $this->context->cart->id;
-                    $message->id_customer = (int) $this->context->cart->id_customer;
-                    $message->save();
-                }
-            } elseif (Validate::isLoadedObject($message)) {
-                $message->delete();
-            }
-            echo json_encode($this->ajaxReturnVars());
-        }
-    }
-
-    public function ajaxProcessUpdateCurrency()
-    {
-        if ($this->access('edit')) {
-            $currency = new Currency((int) Tools::getValue('id_currency'));
-            if (Validate::isLoadedObject($currency) && !$currency->deleted && $currency->active) {
-                $this->context->cart->id_currency = (int) $currency->id;
-                $this->context->currency = $currency;
-                $this->context->cart->save();
-            }
-            echo json_encode($this->ajaxReturnVars());
-        }
-    }
-
-    public function ajaxProcessUpdateLang()
-    {
-        if ($this->access('edit')) {
-            $lang = new Language((int) Tools::getValue('id_lang'));
-            if (Validate::isLoadedObject($lang) && $lang->active) {
-                $this->context->cart->id_lang = (int) $lang->id;
-                $this->context->cart->save();
-            }
-            echo json_encode($this->ajaxReturnVars());
-        }
-    }
-
-    public function ajaxProcessDuplicateOrder()
-    {
-        if ($this->access('edit')) {
-            $errors = [];
-            if (!$id_order = Tools::getValue('id_order')) {
-                $errors[] = $this->trans('Invalid order', [], 'Admin.Orderscustomers.Notification');
-            }
-            $cart = Cart::getCartByOrderId($id_order);
-            $new_cart = $cart->duplicate();
-            if (!$new_cart || !Validate::isLoadedObject($new_cart['cart'])) {
-                $errors[] = $this->trans('The order cannot be renewed.', [], 'Admin.Orderscustomers.Notification');
-            } elseif (!$new_cart['success']) {
-                $errors[] = $this->trans('The order cannot be renewed.', [], 'Admin.Orderscustomers.Notification');
-            } else {
-                $this->context->cart = $new_cart['cart'];
-                echo json_encode($this->ajaxReturnVars());
-            }
-        }
-    }
-
-    public function ajaxProcessDeleteVoucher()
-    {
-        if ($this->access('edit')) {
-            if ($this->context->cart->removeCartRule((int) Tools::getValue('id_cart_rule'))) {
-                echo json_encode($this->ajaxReturnVars());
-            }
-        }
-    }
-
-    public function ajaxProcessupdateFreeShipping()
-    {
-        if ($this->access('edit')) {
-            if (!$id_cart_rule = CartRule::getIdByCode(CartRule::BO_ORDER_CODE_PREFIX . (int) $this->context->cart->id)) {
-                $cart_rule = new CartRule();
-                $cart_rule->code = CartRule::BO_ORDER_CODE_PREFIX . (int) $this->context->cart->id;
-                $cart_rule->name = [Configuration::get('PS_LANG_DEFAULT') => $this->trans('Free Shipping', [], 'Admin.Orderscustomers.Feature')];
-                $cart_rule->id_customer = (int) $this->context->cart->id_customer;
-                $cart_rule->free_shipping = true;
-                $cart_rule->quantity = 1;
-                $cart_rule->quantity_per_user = 1;
-                $cart_rule->minimum_amount_currency = (int) $this->context->cart->id_currency;
-                $cart_rule->reduction_currency = (int) $this->context->cart->id_currency;
-                $cart_rule->date_from = date('Y-m-d H:i:s', time());
-                $cart_rule->date_to = date('Y-m-d H:i:s', time() + 24 * 36000);
-                $cart_rule->active = true;
-                $cart_rule->add();
-            } else {
-                $cart_rule = new CartRule((int) $id_cart_rule);
-            }
-
-            $this->context->cart->removeCartRule((int) $cart_rule->id);
-            if (Tools::getValue('free_shipping')) {
-                $this->context->cart->addCartRule((int) $cart_rule->id);
-            }
-
-            echo json_encode($this->ajaxReturnVars());
-        }
-    }
-
-    public function ajaxProcessAddVoucher()
-    {
-        if ($this->access('edit')) {
-            $errors = [];
-            $id_cart_rule = Tools::getValue('id_cart_rule');
-            if (!$id_cart_rule) {
-                $errors[] = $this->trans('Invalid voucher.', [], 'Admin.Catalog.Notification');
-            } else {
-                $cart_rule = new CartRule((int) $id_cart_rule);
-                if (!Validate::isLoadedObject($cart_rule)) {
-                    $errors[] = $this->trans('Invalid voucher.', [], 'Admin.Catalog.Notification');
-                } elseif ($err = $cart_rule->checkValidity($this->context)) {
-                    $errors[] = $err;
-                }
-                if (!count($errors)) {
-                    if (!$this->context->cart->addCartRule((int) $cart_rule->id)) {
-                        $errors[] = $this->trans('Can\'t add the voucher.', [], 'Admin.Advparameters.Notification');
-                    }
-                }
-            }
-            echo json_encode(array_merge($this->ajaxReturnVars(), ['errors' => $errors]));
-        }
-    }
-
-    public function ajaxProcessUpdateAddress()
-    {
-        if ($this->access('edit')) {
-            echo json_encode(['addresses' => $this->context->customer->getAddresses((int) $this->context->cart->id_lang)]);
-        }
-    }
-
-    public function ajaxProcessUpdateAddresses()
-    {
-        if ($this->access('edit')) {
-            if (($id_address_delivery = (int) Tools::getValue('id_address_delivery')) &&
-                Validate::isLoadedObject($address_delivery = new Address((int) $id_address_delivery)) &&
-                $address_delivery->id_customer == $this->context->cart->id_customer) {
-                $this->context->cart->id_address_delivery = (int) $address_delivery->id;
-            }
-
-            if (($id_address_invoice = (int) Tools::getValue('id_address_invoice')) &&
-                Validate::isLoadedObject($address_invoice = new Address((int) $id_address_invoice)) &&
-                $address_invoice->id_customer = $this->context->cart->id_customer) {
-                $this->context->cart->id_address_invoice = (int) $address_invoice->id;
-            }
-            $this->context->cart->save();
-
-            echo json_encode($this->ajaxReturnVars());
-        }
-    }
-
-    protected function getCartSummary()
-    {
-        $summary = $this->context->cart->getSummaryDetails(null, true);
-        $currency = Context::getContext()->currency;
-        if (count($summary['products'])) {
-            foreach ($summary['products'] as &$product) {
-                $product['numeric_price'] = $product['price'];
-                $product['numeric_total'] = $product['total'];
-                $product['price'] = str_replace($currency->symbol, '', $this->context->getCurrentLocale()->formatPrice($product['price'], $currency->iso_code));
-                $product['total'] = str_replace($currency->symbol, '', $this->context->getCurrentLocale()->formatPrice($product['total'], $currency->iso_code));
-                $product['image_link'] = $this->context->link->getImageLink($product['link_rewrite'], $product['id_image'], 'small_default');
-                if (!isset($product['attributes_small'])) {
-                    $product['attributes_small'] = '';
-                }
-                $product['customized_datas'] = Product::getAllCustomizedDatas((int) $this->context->cart->id, null, true, null, (int) $product['id_customization']);
-            }
-        }
-        if (count($summary['discounts'])) {
-            foreach ($summary['discounts'] as &$voucher) {
-                $voucher['value_real'] = $this->context->getCurrentLocale()->formatPrice($voucher['value_real'], $currency->iso_code);
-            }
-        }
-
-        if (isset($summary['gift_products']) && count($summary['gift_products'])) {
-            foreach ($summary['gift_products'] as &$product) {
-                $product['image_link'] = $this->context->link->getImageLink($product['link_rewrite'], $product['id_image'], 'small_default');
-                if (!isset($product['attributes_small'])) {
-                    $product['attributes_small'] = '';
-                }
-            }
-        }
-
-        return $summary;
-    }
-
-    protected function getDeliveryOptionList()
-    {
-        $delivery_option_list_formated = [];
-        $delivery_option_list = $this->context->cart->getDeliveryOptionList();
-
-        if (!count($delivery_option_list)) {
-            return [];
-        }
-
-        $id_default_carrier = (int) Configuration::get('PS_CARRIER_DEFAULT');
-        foreach (current($delivery_option_list) as $key => $delivery_option) {
-            $name = '';
-            $first = true;
-            $id_default_carrier_delivery = false;
-            foreach ($delivery_option['carrier_list'] as $carrier) {
-                if (!$first) {
-                    $name .= ', ';
-                } else {
-                    $first = false;
-                }
-
-                $name .= $carrier['instance']->name;
-
-                if ($delivery_option['unique_carrier']) {
-                    $name .= ' - ' . $carrier['instance']->delay[$this->context->employee->id_lang];
-                }
-
-                if (!$id_default_carrier_delivery) {
-                    $id_default_carrier_delivery = (int) $carrier['instance']->id;
-                }
-                if ($carrier['instance']->id == $id_default_carrier) {
-                    $id_default_carrier_delivery = $id_default_carrier;
-                }
-                if (!$this->context->cart->id_carrier) {
-                    $this->context->cart->setDeliveryOption([$this->context->cart->id_address_delivery => (int) $carrier['instance']->id . ',']);
-                    $this->context->cart->save();
-                }
-            }
-            $delivery_option_list_formated[] = ['name' => $name, 'key' => $key];
-        }
-
-        return $delivery_option_list_formated;
-    }
-
-    public function displayAjaxSearchCarts()
-    {
-        $id_customer = (int) Tools::getValue('id_customer');
-        $carts = Cart::getCustomerCarts((int) $id_customer, false);
-        $orders = Order::getCustomerOrders((int) $id_customer);
-
-        if (count($carts)) {
-            foreach ($carts as $key => &$cart) {
-                $cart_obj = new Cart((int) $cart['id_cart']);
-                if ($cart['id_cart'] == $this->context->cart->id) {
-                    unset($carts[$key]);
-
-                    continue;
-                }
-                $currency = new Currency((int) $cart['id_currency']);
-                $cart['total_price'] = $this->context->getCurrentLocale()->formatPrice($cart_obj->getOrderTotal(), $currency->iso_code);
-            }
-        }
-        if (count($orders)) {
-            foreach ($orders as &$order) {
-                $currency = new Currency((int) $order['id_currency']);
-                $order['total_paid_real'] = $this->context->getCurrentLocale()->formatPrice($order['total_paid_real'], $currency->iso_code);
-            }
-        }
-        if ($orders || $carts) {
-            $to_return = array_merge(
-                $this->ajaxReturnVars(),
-                [
-                    'carts' => $carts,
-                    'orders' => $orders,
-                    'found' => true,
-                ]
-            );
-        } else {
-            $to_return = array_merge($this->ajaxReturnVars(), ['found' => false]);
-        }
-
-        echo json_encode($to_return);
-    }
-
-    public function ajaxReturnVars()
-    {
-        $id_cart = (int) $this->context->cart->id;
-        $message_content = '';
-        if ($message = Message::getMessageByCartId((int) $this->context->cart->id)) {
-            $message_content = $message['message'];
-        }
-        $cart_rules = $this->context->cart->getCartRules(CartRule::FILTER_ACTION_SHIPPING);
-
-        $free_shipping = false;
-        if (count($cart_rules)) {
-            foreach ($cart_rules as $cart_rule) {
-                if ($cart_rule['id_cart_rule'] == CartRule::getIdByCode(CartRule::BO_ORDER_CODE_PREFIX . (int) $this->context->cart->id)) {
-                    $free_shipping = true;
-
-                    break;
-                }
-            }
-        }
-
-        $addresses = $this->context->customer->getAddresses((int) $this->context->cart->id_lang);
-
-        foreach ($addresses as &$data) {
-            $address = new Address((int) $data['id_address']);
-            $data['formated_address'] = AddressFormat::generateAddress($address, [], '<br />');
-        }
-
-        return [
-            'summary' => $this->getCartSummary(),
-            'delivery_option_list' => $this->getDeliveryOptionList(),
-            'cart' => $this->context->cart,
-            'currency' => new Currency($this->context->cart->id_currency),
-            'addresses' => $addresses,
-            'id_cart' => $id_cart,
-            'order_message' => $message_content,
-            'link_order' => $this->context->link->getPageLink(
-                'order',
-                false,
-                (int) $this->context->cart->id_lang,
-                'step=3&recover_cart=' . $id_cart . '&token_cart=' . md5(_COOKIE_KEY_ . 'recover_cart_' . $id_cart)
-            ),
-            'free_shipping' => (int) $free_shipping,
-        ];
-    }
-
     public function initToolbar()
     {
         parent::initToolbar();
         unset($this->toolbar_btn['new']);
     }
 
-    /**
-     * Display an image as a download.
-     */
-    public function displayAjaxCustomizationImage()
-    {
-        if (!Tools::isSubmit('img') || !Tools::isSubmit('name')) {
-            return;
-        }
-
-        $img = Tools::getValue('img');
-        $name = Tools::getValue('name');
-        $path = _PS_UPLOAD_DIR_ . $img;
-
-        if (Validate::isMd5($img) && Validate::isGenericName($path)) {
-            header('Content-type: image/jpeg');
-            header('Content-Disposition: attachment; filename="' . $name . '.jpg"');
-            readfile($path);
-        }
-    }
-
-    public function displayAjaxGetSummary()
-    {
-        echo json_encode($this->ajaxReturnVars());
-    }
-
-    public function ajaxProcessUpdateProductPrice()
-    {
-        if ($this->access('edit')) {
-            SpecificPrice::deleteByIdCart((int) $this->context->cart->id, (int) Tools::getValue('id_product'), (int) Tools::getValue('id_product_attribute'));
-            $specific_price = new SpecificPrice();
-            $specific_price->id_cart = (int) $this->context->cart->id;
-            $specific_price->id_shop = 0;
-            $specific_price->id_shop_group = 0;
-            $specific_price->id_currency = 0;
-            $specific_price->id_country = 0;
-            $specific_price->id_group = 0;
-            $specific_price->id_customer = (int) $this->context->customer->id;
-            $specific_price->id_product = (int) Tools::getValue('id_product');
-            $specific_price->id_product_attribute = (int) Tools::getValue('id_product_attribute');
-            $specific_price->price = (float) Tools::getValue('price');
-            $specific_price->from_quantity = 1;
-            $specific_price->reduction = 0;
-            $specific_price->reduction_type = 'amount';
-            $specific_price->from = '0000-00-00 00:00:00';
-            $specific_price->to = '0000-00-00 00:00:00';
-            $specific_price->add();
-            echo json_encode($this->ajaxReturnVars());
-        }
-    }
-
     public static function getOrderTotalUsingTaxCalculationMethod($id_cart)
     {
         $context = Context::getContext();

From 4fdfcbc358f9c30e8dbe17e4ead78416be5e6a5a Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Fri, 28 Jul 2023 09:17:18 +0200
Subject: [PATCH 0656/1030] Functional Tests : Fixed import & baseContext

---
 .../02_carrierOptions/01_defaultCarrier.ts    |  4 +--
 .../02_updateCarriersSortOption.ts            |  4 +--
 .../02_sendMessageWithCustomer.ts             | 12 ++++----
 .../05_contactUs/03_sendMessageAsAnonymous.ts | 30 +++++++++----------
 .../classic/05_contactUs/04_addAttachment.ts  | 18 +++++------
 .../02_addresses/01_CRUDAddress.ts            |  8 ++---
 .../02_useDifferentAddressForInvoice.ts       |  8 ++---
 .../12_orderConfirmation/05_contactUs.ts      |  3 +-
 .../01_checkLinksInHeader.ts                  |  2 +-
 .../01_installation/04_resetModule.ts         |  2 +-
 .../functional/05_CRUDVirtualProduct.ts       |  2 +-
 .../checkout/100PercentDiscount_FO.ts         |  2 +-
 .../currencies/computingPrecision_FO.ts       |  2 +-
 .../sanity/05_cartFO/01_editCheckCart.ts      |  2 +-
 .../sanity/06_checkoutFO/01_orderProduct.ts   |  2 +-
 tests/UI/commonTests/FO/order.ts              |  2 +-
 tests/UI/commonTests/FO/shoppingCart.ts       |  2 +-
 17 files changed, 53 insertions(+), 52 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/09_shipping/02_preferences/02_carrierOptions/01_defaultCarrier.ts b/tests/UI/campaigns/functional/BO/09_shipping/02_preferences/02_carrierOptions/01_defaultCarrier.ts
index b30f43d3e9c67..1533ce93d4a25 100644
--- a/tests/UI/campaigns/functional/BO/09_shipping/02_preferences/02_carrierOptions/01_defaultCarrier.ts
+++ b/tests/UI/campaigns/functional/BO/09_shipping/02_preferences/02_carrierOptions/01_defaultCarrier.ts
@@ -10,7 +10,7 @@ import loginCommon from '@commonTests/BO/loginBO';
 import dashboardPage from '@pages/BO/dashboard';
 import preferencesPage from '@pages/BO/shipping/preferences';
 // Import FO pages
-import foCartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import foCheckoutPage from '@pages/FO/checkout';
 import foProductPage from '@pages/FO/product';
 import {homePage as foHomePage} from '@pages/FO/home';
@@ -98,7 +98,7 @@ describe('BO - Shipping - Preferences : Update default carrier and check it in F
         // Add the product to the cart
         await foProductPage.addProductToTheCart(page);
         // Proceed to checkout the shopping cart
-        await foCartPage.clickOnProceedToCheckout(page);
+        await cartPage.clickOnProceedToCheckout(page);
 
         // Checkout the order
         if (index === 0) {
diff --git a/tests/UI/campaigns/functional/BO/09_shipping/02_preferences/02_carrierOptions/02_updateCarriersSortOption.ts b/tests/UI/campaigns/functional/BO/09_shipping/02_preferences/02_carrierOptions/02_updateCarriersSortOption.ts
index 0b7bbe7ada94f..23e47b1609bd0 100644
--- a/tests/UI/campaigns/functional/BO/09_shipping/02_preferences/02_carrierOptions/02_updateCarriersSortOption.ts
+++ b/tests/UI/campaigns/functional/BO/09_shipping/02_preferences/02_carrierOptions/02_updateCarriersSortOption.ts
@@ -12,7 +12,7 @@ import dashboardPage from '@pages/BO/dashboard';
 import carriersPage from '@pages/BO/shipping/carriers';
 import preferencesPage from '@pages/BO/shipping/preferences';
 // Import FO pages
-import foCartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import foCheckoutPage from '@pages/FO/checkout';
 import {homePage as foHomePage} from '@pages/FO/home';
 import foProductPage from '@pages/FO/product';
@@ -169,7 +169,7 @@ describe('BO - Shipping - Preferences : Update \'sort carriers by\' and \'Order
         // Add the product to the cart
         await foProductPage.addProductToTheCart(page);
         // Proceed to checkout the shopping cart
-        await foCartPage.clickOnProceedToCheckout(page);
+        await cartPage.clickOnProceedToCheckout(page);
         // Checkout the order
         if (index === 0) {
           // Personal information step - Login
diff --git a/tests/UI/campaigns/functional/FO/classic/05_contactUs/02_sendMessageWithCustomer.ts b/tests/UI/campaigns/functional/FO/classic/05_contactUs/02_sendMessageWithCustomer.ts
index 671f77df8c9d3..367b61d34f7d3 100644
--- a/tests/UI/campaigns/functional/FO/classic/05_contactUs/02_sendMessageWithCustomer.ts
+++ b/tests/UI/campaigns/functional/FO/classic/05_contactUs/02_sendMessageWithCustomer.ts
@@ -11,7 +11,7 @@ import loginCommon from '@commonTests/BO/loginBO';
 import dashboardPage from '@pages/BO/dashboard';
 import customerServicePage from '@pages/BO/customerService/customerService';
 // Import FO pages
-import foContactUsPage from '@pages/FO/contactUs';
+import {contactUsPage} from '@pages/FO/contactUs';
 import {homePage as foHomePage} from '@pages/FO/home';
 import {loginPage as foLoginPage} from '@pages/FO/login';
 
@@ -90,17 +90,17 @@ describe('FO - Contact us : Send message from contact us page with customer logg
     // Go to contact us page
     await foLoginPage.goToFooterLink(page, 'Contact us');
 
-    const pageTitle = await foContactUsPage.getPageTitle(page);
-    await expect(pageTitle).to.equal(foContactUsPage.pageTitle);
+    const pageTitle = await contactUsPage.getPageTitle(page);
+    await expect(pageTitle).to.equal(contactUsPage.pageTitle);
   });
 
   it('should send message to customer service', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'sendMessage', baseContext);
 
-    await foContactUsPage.sendMessage(page, contactUsData, `${contactUsData.fileName}.txt`);
+    await contactUsPage.sendMessage(page, contactUsData, `${contactUsData.fileName}.txt`);
 
-    const validationMessage = await foContactUsPage.getAlertSuccess(page);
-    await expect(validationMessage).to.equal(foContactUsPage.validationMessage);
+    const validationMessage = await contactUsPage.getAlertSuccess(page);
+    await expect(validationMessage).to.equal(contactUsPage.validationMessage);
   });
 
   it('should login in BO', async function () {
diff --git a/tests/UI/campaigns/functional/FO/classic/05_contactUs/03_sendMessageAsAnonymous.ts b/tests/UI/campaigns/functional/FO/classic/05_contactUs/03_sendMessageAsAnonymous.ts
index 28fd371414ccb..dba70070cb02b 100644
--- a/tests/UI/campaigns/functional/FO/classic/05_contactUs/03_sendMessageAsAnonymous.ts
+++ b/tests/UI/campaigns/functional/FO/classic/05_contactUs/03_sendMessageAsAnonymous.ts
@@ -11,7 +11,7 @@ import loginCommon from '@commonTests/BO/loginBO';
 import dashboardPage from '@pages/BO/dashboard';
 import customerServicePage from '@pages/BO/customerService/customerService';
 // Import FO pages
-import foContactUsPage from '@pages/FO/contactUs';
+import {contactUsPage} from '@pages/FO/contactUs';
 import {homePage as foHomePage} from '@pages/FO/home';
 import {loginPage as foLoginPage} from '@pages/FO/login';
 
@@ -99,44 +99,44 @@ describe('FO - Contact us : Send message from contact us page with customer not
       // Go to contact us page
       await foLoginPage.goToFooterLink(page, 'Contact us');
 
-      const pageTitle = await foContactUsPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(foContactUsPage.pageTitle);
+      const pageTitle = await contactUsPage.getPageTitle(page);
+      await expect(pageTitle).to.equal(contactUsPage.pageTitle);
     });
 
     it('should check if the email is empty', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkEmptyEmail', baseContext);
 
-      await foContactUsPage.sendMessage(page, contactUsEmptyEmail);
+      await contactUsPage.sendMessage(page, contactUsEmptyEmail);
 
-      const invalidEmailError = await foContactUsPage.getAlertError(page);
-      await expect(invalidEmailError).to.contains(foContactUsPage.invalidEmail);
+      const invalidEmailError = await contactUsPage.getAlertError(page);
+      await expect(invalidEmailError).to.contains(contactUsPage.invalidEmail);
     });
 
     it('should check if the email is invalid', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkInvalidEmail', baseContext);
 
-      await foContactUsPage.sendMessage(page, contactUsInvalidEmail);
+      await contactUsPage.sendMessage(page, contactUsInvalidEmail);
 
-      const invalidEmailError = await foContactUsPage.getAlertError(page);
-      await expect(invalidEmailError).to.contains(foContactUsPage.invalidEmail);
+      const invalidEmailError = await contactUsPage.getAlertError(page);
+      await expect(invalidEmailError).to.contains(contactUsPage.invalidEmail);
     });
 
     it('should check if the content is empty', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkEmptyContent', baseContext);
 
-      await foContactUsPage.sendMessage(page, contactUsEmptyContent);
+      await contactUsPage.sendMessage(page, contactUsEmptyContent);
 
-      const invalidEmailError = await foContactUsPage.getAlertError(page);
-      await expect(invalidEmailError).to.contains(foContactUsPage.invalidContent);
+      const invalidEmailError = await contactUsPage.getAlertError(page);
+      await expect(invalidEmailError).to.contains(contactUsPage.invalidContent);
     });
 
     it('should send message to customer service', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'sendMessage', baseContext);
 
-      await foContactUsPage.sendMessage(page, contactUsData, `${contactUsData.fileName}.txt`);
+      await contactUsPage.sendMessage(page, contactUsData, `${contactUsData.fileName}.txt`);
 
-      const validationMessage = await foContactUsPage.getAlertSuccess(page);
-      await expect(validationMessage).to.equal(foContactUsPage.validationMessage);
+      const validationMessage = await contactUsPage.getAlertSuccess(page);
+      await expect(validationMessage).to.equal(contactUsPage.validationMessage);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/FO/classic/05_contactUs/04_addAttachment.ts b/tests/UI/campaigns/functional/FO/classic/05_contactUs/04_addAttachment.ts
index 46faee76339d0..f6c841ebcd532 100644
--- a/tests/UI/campaigns/functional/FO/classic/05_contactUs/04_addAttachment.ts
+++ b/tests/UI/campaigns/functional/FO/classic/05_contactUs/04_addAttachment.ts
@@ -12,7 +12,7 @@ import dashboardPage from '@pages/BO/dashboard';
 import customerServicePage from '@pages/BO/customerService/customerService';
 import viewPage from '@pages/BO/customerService/customerService/view';
 // Import FO pages
-import foContactUsPage from '@pages/FO/contactUs';
+import {contactUsPage} from '@pages/FO/contactUs';
 import {homePage as foHomePage} from '@pages/FO/home';
 import {loginPage as foLoginPage} from '@pages/FO/login';
 
@@ -96,26 +96,26 @@ describe('FO - Contact us : Add attachment', async () => {
     // Go to contact us page
     await foLoginPage.goToFooterLink(page, 'Contact us');
 
-    const pageTitle = await foContactUsPage.getPageTitle(page);
-    await expect(pageTitle).to.equal(foContactUsPage.pageTitle);
+    const pageTitle = await contactUsPage.getPageTitle(page);
+    await expect(pageTitle).to.equal(contactUsPage.pageTitle);
   });
 
   it('should try to send message with csv file to customer service and check error message', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'sendCSVFile', baseContext);
 
-    await foContactUsPage.sendMessage(page, contactUsData, `${contactUsData.fileName}.csv`);
+    await contactUsPage.sendMessage(page, contactUsData, `${contactUsData.fileName}.csv`);
 
-    const validationMessage = await foContactUsPage.getAlertError(page);
-    await expect(validationMessage).to.equal(foContactUsPage.badFileExtensionErrorMessage);
+    const validationMessage = await contactUsPage.getAlertError(page);
+    await expect(validationMessage).to.equal(contactUsPage.badFileExtensionErrorMessage);
   });
 
   it('should send message with PNG file to customer service and check validation message', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'sendPNGFile', baseContext);
 
-    await foContactUsPage.sendMessage(page, contactUsData, `${contactUsData.fileName}.png`);
+    await contactUsPage.sendMessage(page, contactUsData, `${contactUsData.fileName}.png`);
 
-    const validationMessage = await foContactUsPage.getAlertSuccess(page);
-    await expect(validationMessage).to.equal(foContactUsPage.validationMessage);
+    const validationMessage = await contactUsPage.getAlertSuccess(page);
+    await expect(validationMessage).to.equal(contactUsPage.validationMessage);
   });
 
   it('should login in BO', async function () {
diff --git a/tests/UI/campaigns/functional/FO/classic/11_checkout/02_addresses/01_CRUDAddress.ts b/tests/UI/campaigns/functional/FO/classic/11_checkout/02_addresses/01_CRUDAddress.ts
index 72336de6968bd..34446d8b37cb9 100644
--- a/tests/UI/campaigns/functional/FO/classic/11_checkout/02_addresses/01_CRUDAddress.ts
+++ b/tests/UI/campaigns/functional/FO/classic/11_checkout/02_addresses/01_CRUDAddress.ts
@@ -10,7 +10,7 @@ import {createAccountTest} from '@commonTests/FO/account';
 import {homePage as foHomePage} from '@pages/FO/home';
 import foProductPage from '@pages/FO/product';
 import Products from '@data/demo/products';
-import foCartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 
 // Import data
@@ -98,14 +98,14 @@ describe('FO - Checkout - Addresses : CRUD address', async () => {
 
       await foProductPage.addProductToTheCart(page);
 
-      const pageTitle = await foCartPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(foCartPage.pageTitle);
+      const pageTitle = await cartPage.getPageTitle(page);
+      await expect(pageTitle).to.equal(cartPage.pageTitle);
     });
 
     it('should validate shopping cart and go to checkout page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'goToCheckoutPage', baseContext);
 
-      await foCartPage.clickOnProceedToCheckout(page);
+      await cartPage.clickOnProceedToCheckout(page);
 
       const isCheckoutPage = await checkoutPage.isCheckoutPage(page);
       await expect(isCheckoutPage).to.be.true;
diff --git a/tests/UI/campaigns/functional/FO/classic/11_checkout/02_addresses/02_useDifferentAddressForInvoice.ts b/tests/UI/campaigns/functional/FO/classic/11_checkout/02_addresses/02_useDifferentAddressForInvoice.ts
index 7c78ad0c159b6..5e3738c7e2727 100644
--- a/tests/UI/campaigns/functional/FO/classic/11_checkout/02_addresses/02_useDifferentAddressForInvoice.ts
+++ b/tests/UI/campaigns/functional/FO/classic/11_checkout/02_addresses/02_useDifferentAddressForInvoice.ts
@@ -14,7 +14,7 @@ import orderPageCustomerBlock from '@pages/BO/orders/view/customerBlock';
 // Import FO pages
 import {homePage as foHomePage} from '@pages/FO/home';
 import foProductPage from '@pages/FO/product';
-import foCartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import foCheckoutPage from '@pages/FO/checkout';
 import orderConfirmationPage from '@pages/FO/checkout/orderConfirmation';
 
@@ -91,15 +91,15 @@ describe('FO - Guest checkout: Use different invoice address', async () => {
 
       await foProductPage.addProductToTheCart(page, 1);
 
-      const pageTitle = await foCartPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(foCartPage.pageTitle);
+      const pageTitle = await cartPage.getPageTitle(page);
+      await expect(pageTitle).to.equal(cartPage.pageTitle);
     });
 
     it('should validate shopping cart and go to checkout page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'goToCheckoutPage', baseContext);
 
       // Proceed to checkout the shopping cart
-      await foCartPage.clickOnProceedToCheckout(page);
+      await cartPage.clickOnProceedToCheckout(page);
 
       const isCheckoutPage = await foCheckoutPage.isCheckoutPage(page);
       await expect(isCheckoutPage).to.be.true;
diff --git a/tests/UI/campaigns/functional/FO/classic/12_orderConfirmation/05_contactUs.ts b/tests/UI/campaigns/functional/FO/classic/12_orderConfirmation/05_contactUs.ts
index 4f8cfcde087b1..dc3da625cd896 100644
--- a/tests/UI/campaigns/functional/FO/classic/12_orderConfirmation/05_contactUs.ts
+++ b/tests/UI/campaigns/functional/FO/classic/12_orderConfirmation/05_contactUs.ts
@@ -15,7 +15,8 @@ import customerServiceMessageViewPage from '@pages/BO/customerService/customerSe
 import {homePage as foHomePage} from '@pages/FO/home';
 import {loginPage as foLoginPage} from '@pages/FO/login';
 import {myAccountPage} from '@pages/FO/myAccount';
-import {cartPage, contactUsPage} from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
+import {contactUsPage} from '@pages/FO/contactUs';
 import checkoutPage from '@pages/FO/checkout';
 import orderConfirmationPage from '@pages/FO/checkout/orderConfirmation';
 
diff --git a/tests/UI/campaigns/functional/FO/hummingbird/02_headerAndFooter/01_checkLinksInHeader.ts b/tests/UI/campaigns/functional/FO/hummingbird/02_headerAndFooter/01_checkLinksInHeader.ts
index 8e1cb7de3caae..36cefc8e980ed 100644
--- a/tests/UI/campaigns/functional/FO/hummingbird/02_headerAndFooter/01_checkLinksInHeader.ts
+++ b/tests/UI/campaigns/functional/FO/hummingbird/02_headerAndFooter/01_checkLinksInHeader.ts
@@ -18,7 +18,7 @@ import Customers from '@data/demo/customers';
 import {expect} from 'chai';
 import type {BrowserContext, Page} from 'playwright';
 
-const baseContext: string = 'functional_FO_classic_headerAndFooter_checkLinksInHeader';
+const baseContext: string = 'functional_FO_hummingbird_headerAndFooter_checkLinksInHeader';
 
 /*
 Go to FO
diff --git a/tests/UI/campaigns/modules/ps_cashondelivery/01_installation/04_resetModule.ts b/tests/UI/campaigns/modules/ps_cashondelivery/01_installation/04_resetModule.ts
index 27603188134c6..3c3a193e63067 100644
--- a/tests/UI/campaigns/modules/ps_cashondelivery/01_installation/04_resetModule.ts
+++ b/tests/UI/campaigns/modules/ps_cashondelivery/01_installation/04_resetModule.ts
@@ -10,7 +10,7 @@ import loginCommon from '@commonTests/BO/loginBO';
 import dashboardPage from '@pages/BO/dashboard';
 import {moduleManager as moduleManagerPage} from '@pages/BO/modules/moduleManager';
 // Import FO pages
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 import {homePage} from '@pages/FO/home';
 import {loginPage as foLoginPage} from '@pages/FO/login';
diff --git a/tests/UI/campaigns/productV2/functional/05_CRUDVirtualProduct.ts b/tests/UI/campaigns/productV2/functional/05_CRUDVirtualProduct.ts
index d45b9486d308b..4d802008e5ddb 100644
--- a/tests/UI/campaigns/productV2/functional/05_CRUDVirtualProduct.ts
+++ b/tests/UI/campaigns/productV2/functional/05_CRUDVirtualProduct.ts
@@ -18,7 +18,7 @@ import productsPage from '@pages/BO/catalog/productsV2';
 import ordersPage from '@pages/BO/orders';
 import {homePage} from '@pages/FO/home';
 import foProductPage from '@pages/FO/product';
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 import orderConfirmationPage from '@pages/FO/checkout/orderConfirmation';
 import {myAccountPage} from '@pages/FO/myAccount';
diff --git a/tests/UI/campaigns/regression/checkout/100PercentDiscount_FO.ts b/tests/UI/campaigns/regression/checkout/100PercentDiscount_FO.ts
index 7ed72408dbb3b..0fc89ef6fb8b9 100644
--- a/tests/UI/campaigns/regression/checkout/100PercentDiscount_FO.ts
+++ b/tests/UI/campaigns/regression/checkout/100PercentDiscount_FO.ts
@@ -11,7 +11,7 @@ import addCartRulePage from '@pages/BO/catalog/discounts/add';
 import dashboardPage from '@pages/BO/dashboard';
 import orderSettingsPage from '@pages/BO/shopParameters/orderSettings';
 // Import FO pages
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 import orderConfirmationPage from '@pages/FO/checkout/orderConfirmation';
 import {homePage} from '@pages/FO/home';
diff --git a/tests/UI/campaigns/regression/currencies/computingPrecision_FO.ts b/tests/UI/campaigns/regression/currencies/computingPrecision_FO.ts
index bc7b8b4857d69..39a2c88dedc7d 100644
--- a/tests/UI/campaigns/regression/currencies/computingPrecision_FO.ts
+++ b/tests/UI/campaigns/regression/currencies/computingPrecision_FO.ts
@@ -18,7 +18,7 @@ import addCurrencyPage from '@pages/BO/international/currencies/add';
 import localizationPage from '@pages/BO/international/localization';
 import ordersPage from '@pages/BO/orders';
 // Import FO pages
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 import orderConfirmationPage from '@pages/FO/checkout/orderConfirmation';
 import {homePage} from '@pages/FO/home';
diff --git a/tests/UI/campaigns/sanity/05_cartFO/01_editCheckCart.ts b/tests/UI/campaigns/sanity/05_cartFO/01_editCheckCart.ts
index f573556084802..b7243f30e6683 100644
--- a/tests/UI/campaigns/sanity/05_cartFO/01_editCheckCart.ts
+++ b/tests/UI/campaigns/sanity/05_cartFO/01_editCheckCart.ts
@@ -11,7 +11,7 @@ import {
 // Import BO pages
 import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 // Import FO pages
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import {homePage} from '@pages/FO/home';
 import productPage from '@pages/FO/product';
 
diff --git a/tests/UI/campaigns/sanity/06_checkoutFO/01_orderProduct.ts b/tests/UI/campaigns/sanity/06_checkoutFO/01_orderProduct.ts
index 4b5c5f4b2d0dc..c3c4dea3958d0 100644
--- a/tests/UI/campaigns/sanity/06_checkoutFO/01_orderProduct.ts
+++ b/tests/UI/campaigns/sanity/06_checkoutFO/01_orderProduct.ts
@@ -3,7 +3,7 @@ import testContext from '@utils/testContext';
 import helper from '@utils/helpers';
 
 // Import FO pages
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 import orderConfirmationPage from '@pages/FO/checkout/orderConfirmation';
 import {homePage} from '@pages/FO/home';
diff --git a/tests/UI/commonTests/FO/order.ts b/tests/UI/commonTests/FO/order.ts
index 56682c55cd1ba..8c9759d55717c 100644
--- a/tests/UI/commonTests/FO/order.ts
+++ b/tests/UI/commonTests/FO/order.ts
@@ -3,7 +3,7 @@ import helper from '@utils/helpers';
 import testContext from '@utils/testContext';
 
 // Import FO pages
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import {homePage} from '@pages/FO/home';
 import {loginPage as foLoginPage} from '@pages/FO/login';
 import productPage from '@pages/FO/product';
diff --git a/tests/UI/commonTests/FO/shoppingCart.ts b/tests/UI/commonTests/FO/shoppingCart.ts
index 0dcd7ef705f2f..51662e5f30e50 100644
--- a/tests/UI/commonTests/FO/shoppingCart.ts
+++ b/tests/UI/commonTests/FO/shoppingCart.ts
@@ -3,7 +3,7 @@ import helper from '@utils/helpers';
 import testContext from '@utils/testContext';
 
 // Import FO pages
-import cartPage from '@pages/FO/cart';
+import {cartPage} from '@pages/FO/cart';
 import {homePage} from '@pages/FO/home';
 import {loginPage as foLoginPage} from '@pages/FO/login';
 import productPage from '@pages/FO/product';

From a7f44cf12f1309427b7d9ac88a5d8bb995802d07 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Fri, 14 Apr 2023 11:51:53 +0200
Subject: [PATCH 0657/1030] Remove deprecated services

---
 .../config/services/adapter/admin.yml         |  4 -
 .../config/services/adapter/attachment.yml    |  4 -
 .../services/adapter/attribute_group.yml      |  4 -
 .../config/services/adapter/backup.yml        | 15 ----
 .../config/services/adapter/category.yml      |  4 -
 .../config/services/adapter/common.yml        |  4 -
 .../config/services/adapter/currency.yml      |  4 -
 .../config/services/adapter/data_provider.yml |  5 --
 .../config/services/adapter/image.yml         |  4 -
 .../config/services/adapter/product.yml       | 12 ---
 .../config/services/adapter/services.yml      |  4 -
 .../Resources/config/services/adapter/tax.yml |  4 -
 .../services/adapter/tax_rules_group.yml      |  4 -
 .../config/services/bundle/form/form.yml      | 16 ----
 .../bundle/form/form_data_transformer.yml     | 21 -----
 .../services/bundle/form/form_extension.yml   | 82 -------------------
 .../services/bundle/form/form_factory.yml     |  6 --
 .../config/services/bundle/form/form_type.yml | 34 --------
 .../services/bundle/form/form_validator.yml   |  6 --
 .../config/services/bundle/routing.yml        |  4 -
 .../config/services/bundle/utils.yml          |  4 -
 .../config/services/core/category.yml         |  4 -
 .../config/services/core/domain/country.yml   |  5 --
 .../Resources/config/services/core/grid.yml   |  8 --
 .../Resources/config/services/core/help.yml   |  5 --
 .../Resources/config/services/core/module.yml | 20 -----
 .../config/services/core/product.yml          |  4 -
 .../Resources/config/services/core/util.yml   | 35 --------
 .../config/services/core/util/helper_card.yml |  5 --
 29 files changed, 331 deletions(-)
 delete mode 100644 src/PrestaShopBundle/Resources/config/services/bundle/form/form.yml
 delete mode 100644 src/PrestaShopBundle/Resources/config/services/bundle/form/form_data_transformer.yml
 delete mode 100644 src/PrestaShopBundle/Resources/config/services/bundle/form/form_extension.yml
 delete mode 100644 src/PrestaShopBundle/Resources/config/services/bundle/form/form_factory.yml
 delete mode 100644 src/PrestaShopBundle/Resources/config/services/bundle/form/form_validator.yml

diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/admin.yml b/src/PrestaShopBundle/Resources/config/services/adapter/admin.yml
index 2b80824f01641..3171686212270 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/admin.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/admin.yml
@@ -8,10 +8,6 @@ services:
       - !php/const _PS_MODE_DEV_
     decorates: prestashop.core.admin.page_preference_interface
 
-  prestashop.adapter.admin.page_preference:
-    alias: PrestaShop\PrestaShop\Adapter\Admin\PagePreference
-    deprecated: ~
-
   prestashop.adapter.legacy_db:
     public: true
     class: 'Db'
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/attachment.yml b/src/PrestaShopBundle/Resources/config/services/adapter/attachment.yml
index ac0069d5ba481..6492ec62301f1 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/attachment.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/attachment.yml
@@ -57,10 +57,6 @@ services:
       - '@doctrine.dbal.default_connection'
       - '%database_prefix%'
 
-  prestashop.adapter.attachment.attachment_repository:
-    alias: PrestaShop\PrestaShop\Adapter\Attachment\AttachmentRepository
-    deprecated: ~
-
   prestashop.adapter.attachment.query_handler.get_attachment_information_handler:
     class: PrestaShop\PrestaShop\Adapter\Attachment\QueryHandler\GetAttachmentInformationHandler
     autoconfigure: true
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/attribute_group.yml b/src/PrestaShopBundle/Resources/config/services/adapter/attribute_group.yml
index b1e3089c7fa8c..ab51005669a1e 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/attribute_group.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/attribute_group.yml
@@ -7,10 +7,6 @@ services:
       - "@=service('prestashop.adapter.legacy.context').getContext().language.id"
       - '@PrestaShop\PrestaShop\Core\ConfigurationInterface'
 
-  prestashop.adapter.product.attribute_group.attribute_group_view_data_provider:
-    alias: PrestaShop\PrestaShop\Adapter\AttributeGroup\AttributeGroupViewDataProvider
-    deprecated: ~
-
   PrestaShop\PrestaShop\Adapter\AttributeGroup\CommandHandler\DeleteAttributeGroupHandler:
     autoconfigure: true
 
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/backup.yml b/src/PrestaShopBundle/Resources/config/services/adapter/backup.yml
index be70904bc8a4c..3019101f3df5b 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/backup.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/backup.yml
@@ -12,18 +12,3 @@ services:
   PrestaShop\PrestaShop\Core\Backup\Manager\BackupRemoverInterface:
     class: PrestaShop\PrestaShop\Adapter\Backup\BackupRemover
     public: true
-
-  prestashop.adapter.backup.database_creator:
-    alias: PrestaShop\PrestaShop\Core\Backup\BackupInterface
-    public: true
-    deprecated: ~
-
-  prestashop.adapter.backup.backup_provider:
-    alias: PrestaShop\PrestaShop\Core\Backup\Repository\BackupRepositoryInterface
-    public: true
-    deprecated: ~
-
-  prestashop.adapter.backup.backup_remover:
-    alias: PrestaShop\PrestaShop\Core\Backup\Manager\BackupRemoverInterface
-    public: true
-    deprecated: ~
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/category.yml b/src/PrestaShopBundle/Resources/config/services/adapter/category.yml
index 6f411620774f9..cac71ab8d489f 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/category.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/category.yml
@@ -106,10 +106,6 @@ services:
       - '@doctrine.dbal.default_connection'
       - '%database_prefix%'
 
-  prestashop.adapter.category.repository.category_repository:
-    alias: PrestaShop\PrestaShop\Adapter\Category\Repository\CategoryRepository
-    deprecated: ~
-
   PrestaShop\PrestaShop\Adapter\Category\Repository\CategoryPreviewRepository:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\Category\Repository\CategoryRepository'
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/common.yml b/src/PrestaShopBundle/Resources/config/services/adapter/common.yml
index f912eac496874..6a5c79fb612a2 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/common.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/common.yml
@@ -9,10 +9,6 @@ services:
 
   PrestaShop\PrestaShop\Adapter\Tools: ~
 
-  prestashop.adapter.tools:
-    alias: PrestaShop\PrestaShop\Adapter\Tools
-    deprecated: ~
-
   PrestaShop\PrestaShop\Adapter\LegacyContext:
     arguments:
       - "%mail_themes_uri%"
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/currency.yml b/src/PrestaShopBundle/Resources/config/services/adapter/currency.yml
index 169e382cd7c4d..9065d5d161599 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/currency.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/currency.yml
@@ -101,7 +101,3 @@ services:
       - '@=service("prestashop.core.admin.lang.repository").findAll()'
 
   PrestaShop\PrestaShop\Adapter\Currency\Repository\CurrencyRepository: ~
-
-  prestashop.adapter.currency.repository.currency_repository:
-    alias: PrestaShop\PrestaShop\Adapter\Currency\Repository\CurrencyRepository
-    deprecated: ~
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml b/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml
index 8738befdca794..8c0bf4e8299e0 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml
@@ -82,11 +82,6 @@ services:
     class: PrestaShop\PrestaShop\Adapter\Pack\PackDataProvider
     deprecated: ~
 
-  prestashop.adapter.data_provider.tab:
-    alias: PrestaShop\PrestaShop\Adapter\Tab\TabDataProvider
-    deprecated: ~
-    public: true
-
   PrestaShop\PrestaShop\Adapter\Tab\TabDataProvider:
     class: PrestaShop\PrestaShop\Adapter\Tab\TabDataProvider
     public: false
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/image.yml b/src/PrestaShopBundle/Resources/config/services/adapter/image.yml
index 14271a13119fa..bfc0d4ba9e163 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/image.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/image.yml
@@ -53,10 +53,6 @@ services:
       - '@=service("prestashop.core.configuration.upload_size_configuration").getMaxUploadSizeInBytes()'
       - '@prestashop.adapter.upload_quota.configuration'
 
-  prestashop.adapter.image.image_validator:
-    alias: PrestaShop\PrestaShop\Adapter\Image\ImageValidator
-    deprecated: ~
-
   prestashop.adapter.image.category_image_path_factory:
     class: 'PrestaShop\PrestaShop\Adapter\Image\ImagePathFactory'
     arguments:
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product.yml
index 11937580d5ee6..b3c683d866d23 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/product.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/product.yml
@@ -14,10 +14,6 @@ services:
     public: false
     deprecated: ~
 
-  prestashop.adapter.admin.data_provider.product:
-    alias: PrestaShop\PrestaShop\Adapter\Product\AdminProductDataProvider
-    deprecated: ~
-
   PrestaShop\PrestaShop\Adapter\Product\AdminProductDataUpdater:
     class: PrestaShop\PrestaShop\Adapter\Product\AdminProductDataUpdater
     decorates: prestashop.core.admin.data_updater.product_interface
@@ -27,10 +23,6 @@ services:
       - "@prestashop.static_cache.adapter"
     deprecated: ~
 
-  prestashop.adapter.admin.data_updater.product:
-    alias: PrestaShop\PrestaShop\Adapter\Product\AdminProductDataUpdater
-    deprecated: ~
-
   PrestaShop\PrestaShop\Adapter\Product\AdminProductWrapper:
     arguments:
       - "@translator"
@@ -60,10 +52,6 @@ services:
   PrestaShop\PrestaShop\Adapter\Product\ListParametersUpdater:
     deprecated: ~
 
-  prestashop.adapter.product.list_parameters_updater:
-    alias: PrestaShop\PrestaShop\Adapter\Product\ListParametersUpdater
-    deprecated: ~
-
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\AssignProductToCategoryHandler:
     autowire: true
     autoconfigure: true
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/services.yml b/src/PrestaShopBundle/Resources/config/services/adapter/services.yml
index 5757b327fc17e..18f0d4f8c2071 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/services.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/services.yml
@@ -85,10 +85,6 @@ services:
   PrestaShop\PrestaShop\Adapter\ImageManager:
     arguments: [ '@PrestaShop\PrestaShop\Adapter\LegacyContext' ]
 
-  prestashop.adapter.image_manager:
-    alias: PrestaShop\PrestaShop\Adapter\ImageManager
-    deprecated: ~
-
   prestashop.core.module.updater:
     class: PrestaShop\PrestaShop\Adapter\Module\ModuleDataUpdater
 
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/tax.yml b/src/PrestaShopBundle/Resources/config/services/adapter/tax.yml
index 54d68482b7aa6..4b4a4828c974e 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/tax.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/tax.yml
@@ -9,10 +9,6 @@ services:
     arguments:
       - '@PrestaShop\PrestaShop\Adapter\TaxRulesGroup\Repository\TaxRulesGroupRepository'
 
-  prestashop.adapter.tax.tax_computer:
-    alias: PrestaShop\PrestaShop\Adapter\Tax\TaxComputer
-    deprecated: ~
-
   # Command handlers
   prestashop.adapter.tax.command_handler.delete_tax_handler:
     class: 'PrestaShop\PrestaShop\Adapter\Tax\CommandHandler\DeleteTaxHandler'
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/tax_rules_group.yml b/src/PrestaShopBundle/Resources/config/services/adapter/tax_rules_group.yml
index 52889c07c70a9..88a218eebb042 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/tax_rules_group.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/tax_rules_group.yml
@@ -37,7 +37,3 @@ services:
       - '@PrestaShop\PrestaShop\Adapter\TaxRulesGroup\Validate\TaxRulesGroupValidator'
 
   PrestaShop\PrestaShop\Adapter\TaxRulesGroup\Validate\TaxRulesGroupValidator: ~
-
-  prestashop.adapter.tax_rules_group.repository.tax_rules_group_repository:
-    alias: PrestaShop\PrestaShop\Adapter\TaxRulesGroup\Repository\TaxRulesGroupRepository
-    deprecated: ~
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form.yml
deleted file mode 100644
index a5e6e312167cb..0000000000000
--- a/src/PrestaShopBundle/Resources/config/services/bundle/form/form.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file will be removed in next version, do not add any service here
-services:
-  form.form_cloner:
-    alias: PrestaShopBundle\Form\FormCloner
-    deprecated: ~
-    public: true
-
-  form.form_builder_modifier:
-    alias: PrestaShopBundle\Form\FormBuilderModifier
-    deprecated: ~
-    public: true
-
-  prestashop.multistore_checkbox_enabler:
-    alias: 'PrestaShopBundle\Service\Form\MultistoreCheckboxEnabler'
-    deprecated: ~
-    public: true
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_data_transformer.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_data_transformer.yml
deleted file mode 100644
index 9ac50d022d392..0000000000000
--- a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_data_transformer.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file will be removed in next version, do not add any service here
-services:
-  prestashop.bundle.form.data_transformer.string_array_to_integer_array:
-    alias: 'PrestaShopBundle\Form\DataTransformer\StringArrayToIntegerArrayDataTransformer'
-    deprecated: ~
-    public: true
-
-  prestashop.bundle.form.data_transformer.default_language_to_filled_array:
-    alias: 'PrestaShopBundle\Form\DataTransformer\DefaultLanguageToFilledArrayDataTransformer'
-    deprecated: ~
-    public: true
-
-  prestashop.bundle.form.data_transformer.arabic_to_latin_digit:
-    alias: 'PrestaShopBundle\Form\DataTransformer\ArabicToLatinDigitDataTransformer'
-    deprecated: ~
-    public: true
-
-  prestashop.bundle.form.data_transformer.idn_converter:
-    alias: 'PrestaShopBundle\Form\DataTransformer\IDNConverterDataTransformer'
-    deprecated: ~
-    public: true
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_extension.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_extension.yml
deleted file mode 100644
index cb5d1c481bd60..0000000000000
--- a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_extension.yml
+++ /dev/null
@@ -1,82 +0,0 @@
-# This file will be removed in next version, do not add any service here
-services:
-  form.extension.comma_transformer:
-    alias: 'PrestaShopBundle\Form\Extension\CommaTransformerExtension'
-    deprecated: ~
-    public: true
-  form.type.extension.money:
-    alias: 'PrestaShopBundle\Form\Extension\CustomMoneyTypeExtension'
-    deprecated: ~
-    public: true
-  form.type.extension.resizable_text:
-    alias: 'PrestaShopBundle\Form\Extension\ResizableTextTypeExtension'
-    deprecated: ~
-    public: true
-  form.extension.help_text:
-    alias: 'PrestaShopBundle\Form\Extension\HelpTextExtension'
-    deprecated: ~
-    public: true
-  form.extension.hint_text:
-    alias: 'PrestaShopBundle\Form\Extension\HintTextExtension'
-    deprecated: ~
-    public: true
-  form.extension.default_empty_data:
-    alias: 'PrestaShopBundle\Form\Extension\DefaultEmptyDataExtension'
-    deprecated: ~
-    public: true
-  form.extension.data_list:
-    alias: 'PrestaShopBundle\Form\Extension\DataListExtension'
-    deprecated: ~
-    public: true
-  form.extension.row_attributes:
-    alias: 'PrestaShopBundle\Form\Extension\RowAttributesExtension'
-    deprecated: ~
-    public: true
-  form.extension.external_link:
-    alias: 'PrestaShopBundle\Form\Extension\ExternalLinkExtension'
-    deprecated: ~
-    public: true
-  form.extension.alert:
-    alias: 'PrestaShopBundle\Form\Extension\AlertExtension'
-    deprecated: ~
-    public: true
-  form.extension.label_options:
-    alias: 'PrestaShopBundle\Form\Extension\LabelOptionsExtension'
-    deprecated: ~
-    public: true
-  form.extension.form_theme:
-    alias: 'PrestaShopBundle\Form\Extension\FormThemeExtension'
-    deprecated: ~
-    public: true
-  form.extension.columns_number:
-    alias: 'PrestaShopBundle\Form\Extension\ColumnsNumberExtension'
-    deprecated: ~
-    public: true
-  form.extension.multistore_configuration:
-    alias: 'PrestaShopBundle\Form\Extension\MultistoreConfigurationTypeExtension'
-    deprecated: ~
-    public: true
-  form.extension.unit:
-    alias: 'PrestaShopBundle\Form\Extension\UnitTypeExtension'
-    deprecated: ~
-    public: true
-  form.extension.multistore_dropdown:
-    alias: 'PrestaShopBundle\Form\Extension\MultistoreExtension'
-    deprecated: ~
-    public: true
-  form.extension.downloadable_file:
-    alias: 'PrestaShopBundle\Form\Extension\DownloadFileExtension'
-    deprecated: ~
-    public: true
-  form.extension.alerts_tracking_extension:
-    alias: 'PrestaShopBundle\Form\Extension\AlertsTrackingExtension'
-    deprecated: ~
-    public: true
-  form.extension.modify_all_shops_extension:
-    alias: 'PrestaShopBundle\Form\Extension\ModifyAllShopsExtension'
-    deprecated: ~
-    public: true
-  form.extension.disabling_switch_extension:
-    alias: 'PrestaShopBundle\Form\Extension\DisablingSwitchExtension'
-    deprecated: ~
-    public: true
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_factory.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_factory.yml
deleted file mode 100644
index 6cbab988a7069..0000000000000
--- a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_factory.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file will be removed in next version, do not add any service here
-services:
-  prestashop.bundle.form.admin.improve.design.theme.page_layout_customization_form_factory:
-    alias: 'PrestaShopBundle\Form\Admin\Improve\Design\Theme\PageLayoutCustomizationFormFactory'
-    deprecated: ~
-    public: true
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
index 9e782137a1371..94e6ce4a7d6eb 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
@@ -659,37 +659,3 @@ services:
   PrestaShopBundle\Form\Admin\Type\FeatureChoiceType:
     arguments:
       $featureChoiceProvider: '@PrestaShop\PrestaShop\Adapter\Form\ChoiceProvider\FeaturesChoiceProvider'
-
-  # Deprecated
-  form.type.sell.product.event_listener.categories_listener:
-    alias: 'PrestaShopBundle\Form\Admin\Sell\Product\EventListener\CategoriesListener'
-    public: true
-    deprecated: ~
-  form.type.sell.product.event_listener.feature_value_listener:
-    alias: 'PrestaShopBundle\Form\Admin\Sell\Product\EventListener\FeatureValueListener'
-    public: true
-    deprecated: ~
-  form.event_listener.add_disabling_switch_listener:
-    alias: 'PrestaShopBundle\Form\Admin\Type\EventListener\AddDisablingSwitchListener'
-    public: true
-    deprecated: ~
-  form.type.sell.product.event_listener.product_type_listener:
-    alias: 'PrestaShopBundle\Form\Admin\Sell\Product\EventListener\ProductTypeListener'
-    public: true
-    deprecated: ~
-  form.event_listener.price_reduction:
-    alias: 'PrestaShopBundle\Form\Admin\Type\EventListener\PriceReductionListener'
-    public: true
-    deprecated: ~
-  form.type.sell.product.toolbar_buttons_provider:
-    alias: 'PrestaShopBundle\Form\Toolbar\ToolbarButtonsProviderInterface'
-    public: true
-    deprecated: ~
-  form.type.sell.product.event_listener.redirect_option_listener:
-    alias: 'PrestaShopBundle\Form\Admin\Sell\Product\EventListener\RedirectOptionListener'
-    public: true
-    deprecated: ~
-  form.type.sell.product.event_listener.combination_listener:
-    alias: 'PrestaShopBundle\Form\Admin\Sell\Product\EventListener\CombinationListener'
-    public: true
-    deprecated: ~
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_validator.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_validator.yml
deleted file mode 100644
index 74491a2b9f9e0..0000000000000
--- a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_validator.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file will be removed in next version, do not add any service here
-services:
-  validator.unique.tinymce_max_length_validator:
-    alias: PrestaShopBundle\Form\Validator\Constraints\TinyMceMaxLengthValidator
-    deprecated: ~
-    public: true
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/routing.yml b/src/PrestaShopBundle/Resources/config/services/bundle/routing.yml
index ed455a03983a0..ff69a1f9ce94f 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/routing.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/routing.yml
@@ -16,10 +16,6 @@ services:
     class: 'PrestaShopBundle\Routing\Converter\LegacyParametersConverter'
     public: true
 
-  prestashop.bundle.routing.converter.router_provider:
-    alias: PrestaShopBundle\Routing\Converter\RouterProvider
-    deprecated: ~
-
   PrestaShopBundle\Routing\Converter\RouterProvider:
     autowire: true
 
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/utils.yml b/src/PrestaShopBundle/Resources/config/services/bundle/utils.yml
index bd3f15f940dbd..915e439681bec 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/utils.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/utils.yml
@@ -7,7 +7,3 @@ services:
 
   PrestaShopBundle\Utils\FloatParser:
     autowire: true
-
-  prestashop.utils.float_parser:
-    alias: PrestaShopBundle\Utils\FloatParser
-    deprecated: ~
diff --git a/src/PrestaShopBundle/Resources/config/services/core/category.yml b/src/PrestaShopBundle/Resources/config/services/core/category.yml
index 04e6ce0a49af5..6a8a6327f4314 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/category.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/category.yml
@@ -7,10 +7,6 @@ services:
       - '@PrestaShop\PrestaShop\Adapter\Category\Repository\CategoryRepository'
       - ' > '
 
-  prestashop.core.category.name_builder.category_display_name_builder:
-    alias: PrestaShop\PrestaShop\Core\Category\NameBuilder\CategoryDisplayNameBuilder
-    deprecated: ~
-
   PrestaShop\PrestaShop\Core\Category\Provider\MenuThumbnailAvailableKeyProvider:
     autowire: true
     public: false
diff --git a/src/PrestaShopBundle/Resources/config/services/core/domain/country.yml b/src/PrestaShopBundle/Resources/config/services/core/domain/country.yml
index 31c0f0b8f1420..08aac8dfb829d 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/domain/country.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/domain/country.yml
@@ -5,8 +5,3 @@ services:
 
   PrestaShop\PrestaShop\Core\Domain\Country\ZipCodePatternResolverInterface: '@PrestaShop\PrestaShop\Core\Domain\Country\ZipCodePatternResolver'
   PrestaShop\PrestaShop\Core\Domain\Country\ZipCodePatternResolver:
-
-  prestashop.core.domain.country.zip_code_format_resolver:
-    alias: 'PrestaShop\PrestaShop\Core\Domain\Country\ZipCodePatternResolver'
-    public: true
-    deprecated: ~
diff --git a/src/PrestaShopBundle/Resources/config/services/core/grid.yml b/src/PrestaShopBundle/Resources/config/services/core/grid.yml
index 51eb746f74b3e..14af950d0abfc 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/grid.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/grid.yml
@@ -38,10 +38,6 @@ services:
 
   PrestaShop\PrestaShop\Core\Grid\Position\PositionUpdateFactoryInterface: '@PrestaShop\PrestaShop\Core\Grid\Position\PositionUpdateFactory'
 
-  prestashop.core.grid.position.position_update_factory:
-    alias: 'PrestaShop\PrestaShop\Core\Grid\Position\PositionUpdateFactory'
-    deprecated: ~
-
   prestashop.core.grid.position.update_handler.doctrine_position_update_handler:
     class: 'PrestaShop\PrestaShop\Core\Grid\Position\UpdateHandler\DoctrinePositionUpdateHandler'
     arguments:
@@ -55,9 +51,5 @@ services:
 
   PrestaShop\PrestaShop\Core\Grid\Position\GridPositionUpdaterInterface: '@PrestaShop\PrestaShop\Core\Grid\Position\GridPositionUpdater'
 
-  prestashop.core.grid.position.doctrine_grid_position_updater:
-    alias: PrestaShop\PrestaShop\Core\Grid\Position\GridPositionUpdater
-    deprecated: ~
-
   prestashop.core.grid.query.filter.doctrine_filter_applicator:
     class: 'PrestaShop\PrestaShop\Core\Grid\Query\Filter\DoctrineFilterApplicator'
diff --git a/src/PrestaShopBundle/Resources/config/services/core/help.yml b/src/PrestaShopBundle/Resources/config/services/core/help.yml
index e9bab11993bd6..48f8e385a425c 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/help.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/help.yml
@@ -9,8 +9,3 @@ services:
     autowire: true
     arguments:
       $host: "https://help.prestashop-project.org/"
-
-  prestashop.core.help.documentation:
-    alias: PrestaShop\PrestaShop\Core\Help\Documentation
-    public: true
-    deprecated: ~
diff --git a/src/PrestaShopBundle/Resources/config/services/core/module.yml b/src/PrestaShopBundle/Resources/config/services/core/module.yml
index 679dfc3f3b1ac..eb4b7a058f298 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/module.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/module.yml
@@ -54,23 +54,3 @@ services:
   PrestaShop\PrestaShop\Core\Module\SourceHandler\SourceHandlerFactory:
     arguments:
       - !tagged core.module.source_handler
-
-  prestashop.core.admin.module.repository:
-    alias: PrestaShop\PrestaShop\Core\Module\ModuleRepository
-    public: true
-    deprecated: ~
-
-  prestashop.module.factory.sourcehandler:
-    alias: PrestaShop\PrestaShop\Core\Module\SourceHandler\SourceHandlerFactory
-    public: true
-    deprecated: ~
-
-  prestashop.module.sourcehandler.zip:
-    alias: PrestaShop\PrestaShop\Core\Module\SourceHandler\ZipSourceHandler
-    public: true
-    deprecated: ~
-
-  prestashop.module.manager:
-    alias: PrestaShop\PrestaShop\Core\Module\ModuleManager
-    public: true
-    deprecated: ~
diff --git a/src/PrestaShopBundle/Resources/config/services/core/product.yml b/src/PrestaShopBundle/Resources/config/services/core/product.yml
index 8263590ba57ea..304f8bff077d1 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/product.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/product.yml
@@ -9,10 +9,6 @@ services:
       - '@prestashop.core.admin.data_provider.product_interface'
     deprecated: ~
 
-  prestashop.core.product.csv_exporter:
-    alias: PrestaShop\PrestaShop\Core\Product\ProductCsvExporter
-    deprecated: ~
-
   PrestaShop\PrestaShop\Core\Product\Combination\Generator\CombinationGenerator: ~
   PrestaShop\PrestaShop\Core\Product\Combination\Generator\CombinationGeneratorInterface: '@PrestaShop\PrestaShop\Core\Product\Combination\Generator\CombinationGenerator'
 
diff --git a/src/PrestaShopBundle/Resources/config/services/core/util.yml b/src/PrestaShopBundle/Resources/config/services/core/util.yml
index 9655ad93fb01b..5d8593ab5e96e 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/util.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/util.yml
@@ -32,38 +32,3 @@ services:
   prestashop.core.util.color_brightness_calculator:
     alias: PrestaShop\PrestaShop\Core\Util\ColorBrightnessCalculator
     public: true
-
-  prestashop.core.util.internationalized_domain_name_converter:
-    alias: PrestaShop\PrestaShop\Core\Util\InternationalizedDomainNameConverter
-    public: true
-    deprecated: ~
-
-  prestashop.core.uti.back_url_provider:
-    alias: PrestaShop\PrestaShop\Core\Util\Url\BackUrlProvider
-    public: true
-    deprecated: ~
-
-  prestashop.core.util.arabic_to_latin_digit_converter:
-    alias: PrestaShop\PrestaShop\Core\Util\ArabicToLatinDigitConverter
-    public: true
-    deprecated: ~
-
-  prestashop.core.util.url.url_file_checker:
-    alias: PrestaShop\PrestaShop\Core\Util\Url\UrlFileChecker
-    public: true
-    deprecated: ~
-
-  prestashop.core.util.string.string_validator:
-    alias: PrestaShop\PrestaShop\Core\Util\String\StringValidator
-    public: true
-    deprecated: ~
-
-  prestashop.core.util.string.string_modifier:
-    alias: PrestaShop\PrestaShop\Core\Util\String\StringModifier
-    deprecated: ~
-    public: true
-
-  prestashop.core.util.file_size.size_converter:
-    alias: PrestaShop\PrestaShop\Core\Util\File\FileSizeConverter
-    deprecated: ~
-    public: true
diff --git a/src/PrestaShopBundle/Resources/config/services/core/util/helper_card.yml b/src/PrestaShopBundle/Resources/config/services/core/util/helper_card.yml
index 10233d2cd0a89..e5336cd624fe6 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/util/helper_card.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/util/helper_card.yml
@@ -2,11 +2,6 @@ services:
   _defaults:
     public: false
 
-  prestashop.core.util.helper_card.documentation_link_provider:
-    alias: 'PrestaShop\PrestaShop\Core\Util\HelperCard\DocumentationLinkProvider'
-    public: true
-    deprecated: ~
-
   PrestaShop\PrestaShop\Core\Util\HelperCard\DocumentationLinkProviderInterface:
     alias: 'PrestaShop\PrestaShop\Core\Util\HelperCard\DocumentationLinkProvider'
     public: true

From b212098d6fe787ce3ff9aed64dad605050023a88 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Fri, 12 May 2023 14:51:39 +0200
Subject: [PATCH 0658/1030] Remove deprecated services - Part 2

---
 .../config/services/adapter/product.yml       |  47 --------
 .../config/services/bundle/form/form.yml      |  13 +++
 .../bundle/form/form_data_transformer.yml     |  25 +++++
 .../services/bundle/form/form_extension.yml   | 102 ++++++++++++++++++
 .../services/bundle/form/form_factory.yml     |   7 ++
 .../services/bundle/form/form_validator.yml   |   7 ++
 6 files changed, 154 insertions(+), 47 deletions(-)
 create mode 100644 src/PrestaShopBundle/Resources/config/services/bundle/form/form.yml
 create mode 100644 src/PrestaShopBundle/Resources/config/services/bundle/form/form_data_transformer.yml
 create mode 100644 src/PrestaShopBundle/Resources/config/services/bundle/form/form_extension.yml
 create mode 100644 src/PrestaShopBundle/Resources/config/services/bundle/form/form_factory.yml
 create mode 100644 src/PrestaShopBundle/Resources/config/services/bundle/form/form_validator.yml

diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product.yml
index b3c683d866d23..57b76bfa61ed2 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/product.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/product.yml
@@ -5,53 +5,6 @@ services:
   _defaults:
     public: true
 
-  PrestaShop\PrestaShop\Adapter\Product\AdminProductDataProvider:
-    decorates: prestashop.core.admin.data_provider.product_interface
-    arguments:
-      - "@doctrine.orm.entity_manager"
-      - '@PrestaShop\PrestaShop\Adapter\ImageManager'
-      - "@prestashop.static_cache.adapter"
-    public: false
-    deprecated: ~
-
-  PrestaShop\PrestaShop\Adapter\Product\AdminProductDataUpdater:
-    class: PrestaShop\PrestaShop\Adapter\Product\AdminProductDataUpdater
-    decorates: prestashop.core.admin.data_updater.product_interface
-    public: false
-    arguments:
-      - '@PrestaShop\PrestaShop\Core\Hook\HookDispatcherInterface'
-      - "@prestashop.static_cache.adapter"
-    deprecated: ~
-
-  PrestaShop\PrestaShop\Adapter\Product\AdminProductWrapper:
-    arguments:
-      - "@translator"
-      - "@=service('prestashop.adapter.legacy.context').getContext().employee.getAssociatedShops()"
-      - '@PrestaShop\PrestaShop\Core\Localization\LocaleInterface'
-      - '@PrestaShopBundle\Utils\FloatParser'
-    deprecated: ~
-
-  prestashop.adapter.admin.wrapper.product:
-    alias: PrestaShop\PrestaShop\Adapter\Product\AdminProductWrapper
-    deprecated: ~
-
-  PrestaShop\PrestaShop\Adapter\Attribute\AdminAttributeGeneratorControllerWrapper:
-    deprecated: ~
-
-  prestashop.adapter.admin.controller.attribute_generator:
-    alias: PrestaShop\PrestaShop\Adapter\Attribute\AdminAttributeGeneratorControllerWrapper
-    deprecated: ~
-
-  PrestaShop\PrestaShop\Adapter\Product\FilterCategoriesRequestPurifier:
-    deprecated: ~
-
-  prestashop.adapter.product.filter_categories_request_purifier:
-    alias: PrestaShop\PrestaShop\Adapter\Product\FilterCategoriesRequestPurifier
-    deprecated: ~
-
-  PrestaShop\PrestaShop\Adapter\Product\ListParametersUpdater:
-    deprecated: ~
-
   PrestaShop\PrestaShop\Adapter\Product\CommandHandler\AssignProductToCategoryHandler:
     autowire: true
     autoconfigure: true
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form.yml
new file mode 100644
index 0000000000000..ef7b5e26bda80
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/form/form.yml
@@ -0,0 +1,13 @@
+# This file will be removed in next version, do not add any service here
+services:
+  # Deprecated in 9.0.0
+  form.form_builder_modifier:
+    alias: PrestaShopBundle\Form\FormBuilderModifier
+    deprecated: ~
+    public: true
+
+  # Deprecated in 9.0.0
+  prestashop.multistore_checkbox_enabler:
+    alias: 'PrestaShopBundle\Service\Form\MultistoreCheckboxEnabler'
+    deprecated: ~
+    public: true
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_data_transformer.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_data_transformer.yml
new file mode 100644
index 0000000000000..075334a3a7146
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_data_transformer.yml
@@ -0,0 +1,25 @@
+# This file will be removed in next version, do not add any service here
+services:
+  # Deprecated in 9.0.0
+  prestashop.bundle.form.data_transformer.string_array_to_integer_array:
+    alias: 'PrestaShopBundle\Form\DataTransformer\StringArrayToIntegerArrayDataTransformer'
+    deprecated: ~
+    public: true
+
+  # Deprecated in 9.0.0
+  prestashop.bundle.form.data_transformer.default_language_to_filled_array:
+    alias: 'PrestaShopBundle\Form\DataTransformer\DefaultLanguageToFilledArrayDataTransformer'
+    deprecated: ~
+    public: true
+
+  # Deprecated in 9.0.0
+  prestashop.bundle.form.data_transformer.arabic_to_latin_digit:
+    alias: 'PrestaShopBundle\Form\DataTransformer\ArabicToLatinDigitDataTransformer'
+    deprecated: ~
+    public: true
+
+  # Deprecated in 9.0.0
+  prestashop.bundle.form.data_transformer.idn_converter:
+    alias: 'PrestaShopBundle\Form\DataTransformer\IDNConverterDataTransformer'
+    deprecated: ~
+    public: true
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_extension.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_extension.yml
new file mode 100644
index 0000000000000..a09cdda5a535c
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_extension.yml
@@ -0,0 +1,102 @@
+# This file will be removed in next version, do not add any service here
+services:
+  # Deprecated in 9.0.0
+  form.extension.comma_transformer:
+    alias: 'PrestaShopBundle\Form\Extension\CommaTransformerExtension'
+    deprecated: ~
+    public: true
+  # Deprecated in 9.0.0
+  form.type.extension.money:
+    alias: 'PrestaShopBundle\Form\Extension\CustomMoneyTypeExtension'
+    deprecated: ~
+    public: true
+  # Deprecated in 9.0.0
+  form.type.extension.resizable_text:
+    alias: 'PrestaShopBundle\Form\Extension\ResizableTextTypeExtension'
+    deprecated: ~
+    public: true
+  # Deprecated in 9.0.0
+  form.extension.help_text:
+    alias: 'PrestaShopBundle\Form\Extension\HelpTextExtension'
+    deprecated: ~
+    public: true
+  # Deprecated in 9.0.0
+  form.extension.hint_text:
+    alias: 'PrestaShopBundle\Form\Extension\HintTextExtension'
+    deprecated: ~
+    public: true
+  # Deprecated in 9.0.0
+  form.extension.default_empty_data:
+    alias: 'PrestaShopBundle\Form\Extension\DefaultEmptyDataExtension'
+    deprecated: ~
+    public: true
+  # Deprecated in 9.0.0
+  form.extension.data_list:
+    alias: 'PrestaShopBundle\Form\Extension\DataListExtension'
+    deprecated: ~
+    public: true
+  # Deprecated in 9.0.0
+  form.extension.row_attributes:
+    alias: 'PrestaShopBundle\Form\Extension\RowAttributesExtension'
+    deprecated: ~
+    public: true
+  # Deprecated in 9.0.0
+  form.extension.external_link:
+    alias: 'PrestaShopBundle\Form\Extension\ExternalLinkExtension'
+    deprecated: ~
+    public: true
+  # Deprecated in 9.0.0
+  form.extension.alert:
+    alias: 'PrestaShopBundle\Form\Extension\AlertExtension'
+    deprecated: ~
+    public: true
+  # Deprecated in 9.0.0
+  form.extension.label_options:
+    alias: 'PrestaShopBundle\Form\Extension\LabelOptionsExtension'
+    deprecated: ~
+    public: true
+  # Deprecated in 9.0.0
+  form.extension.form_theme:
+    alias: 'PrestaShopBundle\Form\Extension\FormThemeExtension'
+    deprecated: ~
+    public: true
+  # Deprecated in 9.0.0
+  form.extension.columns_number:
+    alias: 'PrestaShopBundle\Form\Extension\ColumnsNumberExtension'
+    deprecated: ~
+    public: true
+  # Deprecated in 9.0.0
+  form.extension.multistore_configuration:
+    alias: 'PrestaShopBundle\Form\Extension\MultistoreConfigurationTypeExtension'
+    deprecated: ~
+    public: true
+  # Deprecated in 9.0.0
+  form.extension.unit:
+    alias: 'PrestaShopBundle\Form\Extension\UnitTypeExtension'
+    deprecated: ~
+    public: true
+  # Deprecated in 9.0.0
+  form.extension.multistore_dropdown:
+    alias: 'PrestaShopBundle\Form\Extension\MultistoreExtension'
+    deprecated: ~
+    public: true
+  # Deprecated in 9.0.0
+  form.extension.downloadable_file:
+    alias: 'PrestaShopBundle\Form\Extension\DownloadFileExtension'
+    deprecated: ~
+    public: true
+  # Deprecated in 9.0.0
+  form.extension.alerts_tracking_extension:
+    alias: 'PrestaShopBundle\Form\Extension\AlertsTrackingExtension'
+    deprecated: ~
+    public: true
+  # Deprecated in 9.0.0
+  form.extension.modify_all_shops_extension:
+    alias: 'PrestaShopBundle\Form\Extension\ModifyAllShopsExtension'
+    deprecated: ~
+    public: true
+  # Deprecated in 9.0.0
+  form.extension.disabling_switch_extension:
+    alias: 'PrestaShopBundle\Form\Extension\DisablingSwitchExtension'
+    deprecated: ~
+    public: true
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_factory.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_factory.yml
new file mode 100644
index 0000000000000..c2aa04dd8aed3
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_factory.yml
@@ -0,0 +1,7 @@
+# This file will be removed in next version, do not add any service here
+services:
+  # Deprecated in 9.0.0
+  prestashop.bundle.form.admin.improve.design.theme.page_layout_customization_form_factory:
+    alias: 'PrestaShopBundle\Form\Admin\Improve\Design\Theme\PageLayoutCustomizationFormFactory'
+    deprecated: ~
+    public: true
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_validator.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_validator.yml
new file mode 100644
index 0000000000000..19229eb11f022
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_validator.yml
@@ -0,0 +1,7 @@
+# This file will be removed in next version, do not add any service here
+services:
+  # Deprecated in 9.0.0
+  validator.unique.tinymce_max_length_validator:
+    alias: PrestaShopBundle\Form\Validator\Constraints\TinyMceMaxLengthValidator
+    deprecated: ~
+    public: true

From 67077805ae8491f8034650b741352a9a055c5a54 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Fri, 12 May 2023 16:29:49 +0200
Subject: [PATCH 0659/1030] Remove deprecated services - Part 3

---
 .../Resources/config/services/adapter/common.yml         | 5 +++++
 .../Resources/config/services/adapter/module.yml         | 6 +++---
 .../Resources/config/services/adapter/product.yml        | 9 +++++++++
 .../Resources/config/services/adapter/services.yml       | 2 +-
 .../Resources/config/services/bundle/command.yml         | 2 +-
 .../Resources/config/services/bundle/event_listener.yml  | 2 +-
 .../Resources/config/services/bundle/form/form_type.yml  | 2 +-
 .../Resources/config/services/bundle/routing.yml         | 2 +-
 .../Resources/config/services/core/module.yml            | 8 +++++++-
 9 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/common.yml b/src/PrestaShopBundle/Resources/config/services/adapter/common.yml
index 6a5c79fb612a2..cd7a8ad833dc7 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/common.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/common.yml
@@ -9,6 +9,11 @@ services:
 
   PrestaShop\PrestaShop\Adapter\Tools: ~
 
+  # Deprecated in 8.1
+  prestashop.adapter.tools:
+    alias: PrestaShop\PrestaShop\Adapter\Tools
+    deprecated: ~
+
   PrestaShop\PrestaShop\Adapter\LegacyContext:
     arguments:
       - "%mail_themes_uri%"
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/module.yml b/src/PrestaShopBundle/Resources/config/services/adapter/module.yml
index 773a2ecb2b8c0..ae55ff9b142d2 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/module.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/module.yml
@@ -6,14 +6,14 @@ services:
     class: PrestaShop\PrestaShop\Adapter\Module\CommandHandler\BulkToggleModuleStatusHandler
     autoconfigure: true
     arguments:
-      - '@prestashop.module.manager'
+      - '@PrestaShop\PrestaShop\Core\Module\ModuleManager'
       - '@prestashop.adapter.legacy.logger'
       - '@prestashop.core.cache.clearer.cache_clearer_chain'
 
   prestashop.adapter.module.self_configurator:
     class: PrestaShop\PrestaShop\Adapter\Module\Configuration\ModuleSelfConfigurator
     arguments:
-      - "@prestashop.core.admin.module.repository"
+      - '@PrestaShop\PrestaShop\Core\Module\ModuleRepository'
       - "@prestashop.adapter.legacy.configuration"
       - "@doctrine.dbal.default_connection"
       - "@filesystem"
@@ -59,7 +59,7 @@ services:
   prestashop.adapter.module.payment_module_provider:
     class: PrestaShop\PrestaShop\Adapter\Module\PaymentModuleListProvider
     arguments:
-      - '@prestashop.core.admin.module.repository'
+      - '@PrestaShop\PrestaShop\Core\Module\ModuleRepository'
       - '@prestashop.bundle.repository.module'
       - '@=service("prestashop.adapter.legacy.context").getContext().shop.id'
 
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product.yml
index 57b76bfa61ed2..f09d115d89da5 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/product.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/product.yml
@@ -18,6 +18,15 @@ services:
       - '@PrestaShop\PrestaShop\Core\Currency\CurrencyDataProviderInterface'
       - '@PrestaShop\PrestaShop\Adapter\ContextStateManager'
 
+  # Deprecated in 8.1
+  PrestaShop\PrestaShop\Adapter\Product\AdminProductWrapper:
+    arguments:
+      - "@translator"
+      - "@=service('prestashop.adapter.legacy.context').getContext().employee.getAssociatedShops()"
+      - '@PrestaShop\PrestaShop\Core\Localization\LocaleInterface'
+      - '@PrestaShopBundle\Utils\FloatParser'
+    deprecated: ~
+
   PrestaShop\PrestaShop\Adapter\Product\QueryHandler\SearchProductsForAssociationHandler:
     autowire: true
     public: false
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/services.yml b/src/PrestaShopBundle/Resources/config/services/adapter/services.yml
index 18f0d4f8c2071..ced45799db1e6 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/services.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/services.yml
@@ -111,7 +111,7 @@ services:
     arguments:
       - '@prestashop.service.translation'
       - '@=service("PrestaShop\\PrestaShop\\Adapter\\LegacyContext").getContext().link'
-      - '@prestashop.core.admin.module.repository'
+      - '@PrestaShop\PrestaShop\Core\Module\ModuleRepository'
 
   prestashop.adapter.shop.shop_url:
     class: 'PrestaShop\PrestaShop\Adapter\Shop\ShopUrlDataProvider'
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/command.yml b/src/PrestaShopBundle/Resources/config/services/bundle/command.yml
index 7ffeb67d4adf4..2be85d2386206 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/command.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/command.yml
@@ -42,7 +42,7 @@ services:
       - '@translator'
       - '@prestashop.adapter.legacy.context'
       - '@prestashop.adapter.module.self_configurator'
-      - '@prestashop.module.manager'
+      - '@PrestaShop\PrestaShop\Core\Module\ModuleManager'
     tags:
       - 'console.command'
 
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/event_listener.yml b/src/PrestaShopBundle/Resources/config/services/bundle/event_listener.yml
index ff6ec2faf56b7..a4ad6ce312414 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/event_listener.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/event_listener.yml
@@ -69,7 +69,7 @@ services:
       - "@translator"
       - "@session"
       - "@annotation_reader"
-      - "@prestashop.core.admin.module.repository"
+      - '@PrestaShop\PrestaShop\Core\Module\ModuleRepository'
     tags:
       - { name: kernel.event_listener, event: kernel.controller, method: onKernelController }
 
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
index 94e6ce4a7d6eb..75edcbdb468a3 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
@@ -578,7 +578,7 @@ services:
   PrestaShopBundle\Form\Admin\Sell\Product\ExtraModulesType:
     arguments:
       $moduleDataProvider: '@prestashop.adapter.data_provider.module'
-      $moduleRepository: '@prestashop.core.admin.module.repository'
+      $moduleRepository: '@PrestaShop\PrestaShop\Core\Module\ModuleRepository'
 
   PrestaShopBundle\Form\Admin\Sell\Product\FooterType:
     arguments:
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/routing.yml b/src/PrestaShopBundle/Resources/config/services/bundle/routing.yml
index ff69a1f9ce94f..16ce0211e36c1 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/routing.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/routing.yml
@@ -31,7 +31,7 @@ services:
   prestashop.bundle.routing.converter.cache_provider:
     class: 'PrestaShopBundle\Routing\Converter\CacheProvider'
     arguments:
-      - '@prestashop.bundle.routing.converter.router_provider'
+      - '@PrestaShopBundle\Routing\Converter\RouterProvider'
       - '@prestashop.bundle.routing.converter.cache'
       - '@prestashop.bundle.routing.converter.routing_cache_key_generator'
 
diff --git a/src/PrestaShopBundle/Resources/config/services/core/module.yml b/src/PrestaShopBundle/Resources/config/services/core/module.yml
index eb4b7a058f298..aeca451578c5c 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/module.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/module.yml
@@ -24,7 +24,7 @@ services:
   prestashop.core.admin.module.repository.eventsubscriber:
     class: PrestaShop\PrestaShop\Core\Module\EventSubscriber
     arguments:
-      - '@prestashop.core.admin.module.repository'
+      - '@PrestaShop\PrestaShop\Core\Module\ModuleRepository'
       - '@prestashop.adapter.cache.clearer.symfony_cache_clearer'
     tags:
       - { name: kernel.event_subscriber }
@@ -54,3 +54,9 @@ services:
   PrestaShop\PrestaShop\Core\Module\SourceHandler\SourceHandlerFactory:
     arguments:
       - !tagged core.module.source_handler
+
+  # Deprecated in 8.1.0
+  prestashop.module.factory.sourcehandler:
+    alias: PrestaShop\PrestaShop\Core\Module\SourceHandler\SourceHandlerFactory
+    public: true
+    deprecated: ~

From e9a1048d0b949bb82a8341fbf940dfa7c11efeaf Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Fri, 23 Jun 2023 10:08:42 +0200
Subject: [PATCH 0660/1030] Remove deprecated services - Part 4

---
 .../config/services/bundle/form/form_type.yml | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
index 75edcbdb468a3..13773c597bb00 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
@@ -659,3 +659,44 @@ services:
   PrestaShopBundle\Form\Admin\Type\FeatureChoiceType:
     arguments:
       $featureChoiceProvider: '@PrestaShop\PrestaShop\Adapter\Form\ChoiceProvider\FeaturesChoiceProvider'
+
+  # Deprecated in 9.0.0
+  form.type.sell.product.event_listener.categories_listener:
+    alias: 'PrestaShopBundle\Form\Admin\Sell\Product\EventListener\CategoriesListener'
+    public: true
+    deprecated: ~
+  # Deprecated in 9.0.0
+  form.type.sell.product.event_listener.feature_value_listener:
+    alias: 'PrestaShopBundle\Form\Admin\Sell\Product\EventListener\FeatureValueListener'
+    public: true
+    deprecated: ~
+  # Deprecated in 9.0.0
+  form.event_listener.add_disabling_switch_listener:
+    alias: 'PrestaShopBundle\Form\Admin\Type\EventListener\AddDisablingSwitchListener'
+    public: true
+    deprecated: ~
+  # Deprecated in 9.0.0
+  form.type.sell.product.event_listener.product_type_listener:
+    alias: 'PrestaShopBundle\Form\Admin\Sell\Product\EventListener\ProductTypeListener'
+    public: true
+    deprecated: ~
+  # Deprecated in 9.0.0
+  form.event_listener.price_reduction:
+    alias: 'PrestaShopBundle\Form\Admin\Type\EventListener\PriceReductionListener'
+    public: true
+    deprecated: ~
+  # Deprecated in 9.0.0
+  form.type.sell.product.toolbar_buttons_provider:
+    alias: 'PrestaShopBundle\Form\Toolbar\ToolbarButtonsProviderInterface'
+    public: true
+    deprecated: ~
+  # Deprecated in 9.0.0
+  form.type.sell.product.event_listener.redirect_option_listener:
+    alias: 'PrestaShopBundle\Form\Admin\Sell\Product\EventListener\RedirectOptionListener'
+    public: true
+    deprecated: ~
+  # Deprecated in 9.0.0
+  form.type.sell.product.event_listener.combination_listener:
+    alias: 'PrestaShopBundle\Form\Admin\Sell\Product\EventListener\CombinationListener'
+    public: true
+    deprecated: ~

From ca8fb2d40e78f4135f7d786e42dcf8c9e56275fb Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Fri, 23 Jun 2023 10:55:10 +0200
Subject: [PATCH 0661/1030] Remove deprecated services : Fixed Install

---
 src/Core/Addon/Module/ModuleManagerBuilder.php  |  4 ++--
 .../Admin/Improve/ModuleController.php          | 17 ++++++++++-------
 .../Modules/ModuleAbstractController.php        |  3 ++-
 .../Resources/config/services/bundle/twig.yml   |  2 +-
 .../Resources/config/services/core/module.yml   |  2 --
 .../Improve/Design/PositionsControllerTest.php  |  2 +-
 .../Admin/Improve/ModuleControllerTest.php      |  2 +-
 .../Improve/Design/PositionsControllerTest.php  |  5 +++--
 .../Converter/RoutingCacheKeyGeneratorTest.php  |  3 ++-
 9 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/Core/Addon/Module/ModuleManagerBuilder.php b/src/Core/Addon/Module/ModuleManagerBuilder.php
index 6c8140e386482..2af980c26bc11 100644
--- a/src/Core/Addon/Module/ModuleManagerBuilder.php
+++ b/src/Core/Addon/Module/ModuleManagerBuilder.php
@@ -101,7 +101,7 @@ public function build()
         if (null === self::$moduleManager) {
             $sfContainer = SymfonyContainer::getInstance();
             if (null !== $sfContainer) {
-                self::$moduleManager = $sfContainer->get('prestashop.module.manager');
+                self::$moduleManager = $sfContainer->get(ModuleManager::class);
             } else {
                 self::$moduleManager = new ModuleManager(
                     $this->buildRepository(),
@@ -128,7 +128,7 @@ public function buildRepository()
         if (null === self::$modulesRepository) {
             $sfContainer = SymfonyContainer::getInstance();
             if (null !== $sfContainer) {
-                self::$modulesRepository = $sfContainer->get('prestashop.core.admin.module.repository');
+                self::$modulesRepository = $sfContainer->get(ModuleRepository::class);
             } else {
                 self::$modulesRepository = new ModuleRepository(
                     self::$moduleDataProvider,
diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/ModuleController.php b/src/PrestaShopBundle/Controller/Admin/Improve/ModuleController.php
index d2eaba31d6aea..2709d38a135d9 100644
--- a/src/PrestaShopBundle/Controller/Admin/Improve/ModuleController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Improve/ModuleController.php
@@ -33,7 +33,10 @@
 use PrestaShop\PrestaShop\Adapter\Module\Module;
 use PrestaShop\PrestaShop\Adapter\Module\Module as ModuleAdapter;
 use PrestaShop\PrestaShop\Core\Module\ModuleCollection;
+use PrestaShop\PrestaShop\Core\Module\ModuleManager;
+use PrestaShop\PrestaShop\Core\Module\ModuleRepository;
 use PrestaShop\PrestaShop\Core\Module\SourceHandler\SourceHandlerNotFoundException;
+use PrestaShop\PrestaShop\Core\Module\SourceHandler\ZipSourceHandler;
 use PrestaShop\PrestaShop\Core\Security\Permission;
 use PrestaShopBundle\Controller\Admin\Improve\Modules\ModuleAbstractController;
 use PrestaShopBundle\Entity\ModuleHistory;
@@ -65,7 +68,7 @@ class ModuleController extends ModuleAbstractController
     public function manageAction()
     {
         $modulesProvider = $this->get('prestashop.core.admin.data_provider.module_interface');
-        $moduleRepository = $this->get('prestashop.core.admin.module.repository');
+        $moduleRepository = $this->get(ModuleRepository::class);
 
         $installedProducts = $moduleRepository->getList();
 
@@ -118,7 +121,7 @@ public function configureModuleAction($module_name)
         $legacyUrlGenerator = $this->get('prestashop.core.admin.url_generator_legacy');
         $legacyContextProvider = $this->get('prestashop.adapter.legacy.context');
         $legacyContext = $legacyContextProvider->getContext();
-        $moduleRepository = $this->get('prestashop.core.admin.module.repository');
+        $moduleRepository = $this->get(ModuleRepository::class);
         // Get accessed module object
         $moduleAccessed = $moduleRepository->getModule($module_name);
 
@@ -198,8 +201,8 @@ public function moduleAction(Request $request)
 
         $moduleName = $request->get('module_name');
         $source = $request->query->get('source');
-        $moduleManager = $this->get('prestashop.module.manager');
-        $moduleRepository = $this->get('prestashop.core.admin.module.repository');
+        $moduleManager = $this->get(ModuleManager::class);
+        $moduleRepository = $this->get(ModuleRepository::class);
         $modulesProvider = $this->get('prestashop.core.admin.data_provider.module_interface');
         $response = [$moduleName => []];
 
@@ -323,8 +326,8 @@ public function importModuleAction(Request $request)
             return $deniedAccess;
         }
 
-        $moduleManager = $this->get('prestashop.module.manager');
-        $zipSource = $this->get('prestashop.module.sourcehandler.zip');
+        $moduleManager = $this->get(ModuleManager::class);
+        $zipSource = $this->get(ZipSourceHandler::class);
         $serverParams = new ServerParams();
         $moduleName = '';
 
@@ -400,7 +403,7 @@ public function importModuleAction(Request $request)
                     'Admin.Modules.Notification',
                     ['%module%' => $moduleName]
                 );
-                $installationResponse['is_configurable'] = (bool) $this->get('prestashop.core.admin.module.repository')
+                $installationResponse['is_configurable'] = (bool) $this->get(ModuleRepository::class)
                     ->getModule($moduleName)
                     ->attributes
                     ->get('is_configurable');
diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/Modules/ModuleAbstractController.php b/src/PrestaShopBundle/Controller/Admin/Improve/Modules/ModuleAbstractController.php
index cb5af8c0ceb6b..2f89a959d1e41 100644
--- a/src/PrestaShopBundle/Controller/Admin/Improve/Modules/ModuleAbstractController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Improve/Modules/ModuleAbstractController.php
@@ -27,6 +27,7 @@
 namespace PrestaShopBundle\Controller\Admin\Improve\Modules;
 
 use PrestaShop\PrestaShop\Core\Module\ModuleCollection;
+use PrestaShop\PrestaShop\Core\Module\ModuleRepository;
 use PrestaShop\PrestaShop\Core\Module\ModuleRepositoryInterface;
 use PrestaShop\PrestaShop\Core\Security\Permission;
 use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
@@ -61,7 +62,7 @@ final protected function getNotificationPageData(ModuleCollection $moduleCollect
 
     protected function getModuleRepository(): ModuleRepositoryInterface
     {
-        return $this->get('prestashop.core.admin.module.repository');
+        return $this->get(ModuleRepository::class);
     }
 
     /**
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/twig.yml b/src/PrestaShopBundle/Resources/config/services/bundle/twig.yml
index 91f4c846d40a3..71fdc5b1debbf 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/twig.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/twig.yml
@@ -40,7 +40,7 @@ services:
     arguments:
       - "@prestashop.core.hook.dispatcher"
       - "@prestashop.adapter.data_provider.module"
-      - "@=service('prestashop.adapter.legacy.context').getContext().employee?service('prestashop.core.admin.module.repository'):null"
+      - "@=service('prestashop.adapter.legacy.context').getContext().employee?service('PrestaShop\\PrestaShop\\Core\\Module\\ModuleRepository'):null"
 
   PrestaShopBundle\Twig\Extension\GridExtension:
     arguments:
diff --git a/src/PrestaShopBundle/Resources/config/services/core/module.yml b/src/PrestaShopBundle/Resources/config/services/core/module.yml
index aeca451578c5c..1d63711fef2de 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/module.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/module.yml
@@ -11,7 +11,6 @@ services:
       - '@prestashop.adapter.module.payment_module_provider'
 
   PrestaShop\PrestaShop\Core\Module\ModuleRepository:
-    public: false
     lazy: true
     arguments:
       - '@prestashop.adapter.data_provider.module'
@@ -30,7 +29,6 @@ services:
       - { name: kernel.event_subscriber }
 
   PrestaShop\PrestaShop\Core\Module\ModuleManager:
-    public: false
     autowire: true
     arguments:
       $moduleDataProvider: '@prestashop.adapter.data_provider.module'
diff --git a/tests/Integration/PrestaShopBundle/Controller/Admin/Improve/Design/PositionsControllerTest.php b/tests/Integration/PrestaShopBundle/Controller/Admin/Improve/Design/PositionsControllerTest.php
index 26b7e3e60f695..a397da7d0d367 100644
--- a/tests/Integration/PrestaShopBundle/Controller/Admin/Improve/Design/PositionsControllerTest.php
+++ b/tests/Integration/PrestaShopBundle/Controller/Admin/Improve/Design/PositionsControllerTest.php
@@ -70,7 +70,7 @@ protected function setUp(): void
 
         $this->client = self::createClient();
         /** @var ModuleManager */
-        $moduleManager = self::$kernel->getContainer()->get('prestashop.module.manager');
+        $moduleManager = self::$kernel->getContainer()->get(ModuleManager::class);
         if (!$moduleManager->isInstalled('ps_emailsubscription')) {
             $moduleManager->install('ps_emailsubscription');
         }
diff --git a/tests/Integration/PrestaShopBundle/Controller/Admin/Improve/ModuleControllerTest.php b/tests/Integration/PrestaShopBundle/Controller/Admin/Improve/ModuleControllerTest.php
index c66f937b60b40..372368eeb378e 100644
--- a/tests/Integration/PrestaShopBundle/Controller/Admin/Improve/ModuleControllerTest.php
+++ b/tests/Integration/PrestaShopBundle/Controller/Admin/Improve/ModuleControllerTest.php
@@ -84,7 +84,7 @@ protected function setUp(): void
 
         $moduleRepository = $this->createMock(ModuleRepository::class);
         $moduleRepository->method('getList')->willReturn(new ModuleCollection());
-        self::$kernel->getContainer()->set('prestashop.core.admin.module.repository', $moduleRepository);
+        self::$kernel->getContainer()->set(ModuleRepository::class, $moduleRepository);
     }
 
     public function testModuleAction(): void
diff --git a/tests/Integration/PrestaShopBundle/Controller/Api/Improve/Design/PositionsControllerTest.php b/tests/Integration/PrestaShopBundle/Controller/Api/Improve/Design/PositionsControllerTest.php
index 830fb94042c6e..ba29ab575d291 100644
--- a/tests/Integration/PrestaShopBundle/Controller/Api/Improve/Design/PositionsControllerTest.php
+++ b/tests/Integration/PrestaShopBundle/Controller/Api/Improve/Design/PositionsControllerTest.php
@@ -36,6 +36,7 @@
 use Module;
 use PrestaShop\PrestaShop\Adapter\Configuration;
 use PrestaShop\PrestaShop\Core\Module\ModuleManager;
+use PrestaShop\PrestaShop\Core\Module\ModuleRepository;
 use Symfony\Bundle\FrameworkBundle\KernelBrowser;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase as TestCase;
 use Symfony\Component\HttpFoundation\Response;
@@ -101,8 +102,8 @@ protected function setUp(): void
         self::$kernel->getContainer()->set('prestashop.adapter.legacy.configuration', $configurationMock);
 
         /** @var ModuleManager */
-        $moduleManager = self::$kernel->getContainer()->get('prestashop.module.manager');
-        $moduleRepository = self::$kernel->getContainer()->get('prestashop.core.admin.module.repository');
+        $moduleManager = self::$kernel->getContainer()->get(ModuleManager::class);
+        $moduleRepository = self::$kernel->getContainer()->get(ModuleRepository::class);
         // We use modules present in tests/resources/modules to be independent with the external API
         // We install two modules that are not present in the test db to be sure every step of the install performs correctly
         // And both modules have a common hook displayHome
diff --git a/tests/Integration/PrestaShopBundle/Routing/Converter/RoutingCacheKeyGeneratorTest.php b/tests/Integration/PrestaShopBundle/Routing/Converter/RoutingCacheKeyGeneratorTest.php
index dc1cad2b2015c..b3043ae447731 100644
--- a/tests/Integration/PrestaShopBundle/Routing/Converter/RoutingCacheKeyGeneratorTest.php
+++ b/tests/Integration/PrestaShopBundle/Routing/Converter/RoutingCacheKeyGeneratorTest.php
@@ -29,6 +29,7 @@
 namespace Tests\Integration\PrestaShopBundle\Routing\Converter;
 
 use PrestaShop\PrestaShop\Adapter\Module\Module;
+use PrestaShop\PrestaShop\Core\Module\ModuleRepository;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Routing\Route;
 use Tools;
@@ -57,7 +58,7 @@ protected function setUp(): void
             Tools::recurseCopy($dirResources . '/Resources/modules_tests/demo', _PS_MODULE_DIR_ . '/demo');
         }
 
-        $this->module = self::$kernel->getContainer()->get('prestashop.core.admin.module.repository')->getModule('demo');
+        $this->module = self::$kernel->getContainer()->get(ModuleRepository::class)->getModule('demo');
         $this->module->onInstall();
         self::$kernel->getContainer()->get('prestashop.core.cache.clearer.cache_clearer_chain')->clear();
     }

From 8612da9464445650e223bd578204bab31aff652a Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Fri, 23 Jun 2023 11:34:56 +0200
Subject: [PATCH 0662/1030] Remove deprecated services : Replace removed
 services

---
 .../AdvancedParameters/EmployeeController.php |  3 ++-
 .../Sell/Catalog/AttributeController.php      |  3 ++-
 .../config/services/adapter/product.yml       | 27 +++++++++++++++++++
 .../Resources/config/services/bundle/twig.yml |  2 +-
 .../services/core/form/choice_provider.yml    |  4 +--
 .../Resources/config/services/core/module.yml |  1 -
 6 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/EmployeeController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/EmployeeController.php
index fa1fa972b7e12..c0f19b9b61e87 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/EmployeeController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/EmployeeController.php
@@ -28,6 +28,7 @@
 
 use Exception;
 use ImageManager;
+use PrestaShop\PrestaShop\Adapter\Tab\TabDataProvider;
 use PrestaShop\PrestaShop\Core\Domain\Employee\Command\BulkDeleteEmployeeCommand;
 use PrestaShop\PrestaShop\Core\Domain\Employee\Command\BulkUpdateEmployeeStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\Employee\Command\DeleteEmployeeCommand;
@@ -466,7 +467,7 @@ public function changeFormLanguageAction(Request $request)
     public function getAccessibleTabsAction(Request $request)
     {
         $profileId = $request->query->get('profileId');
-        $tabsDataProvider = $this->get('prestashop.adapter.data_provider.tab');
+        $tabsDataProvider = $this->get(TabDataProvider::class);
         $contextEmployeeProvider = $this->get('prestashop.adapter.data_provider.employee');
 
         return $this->json(
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeController.php
index 7e2747118b975..75c44fd77da33 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeController.php
@@ -27,6 +27,7 @@
 namespace PrestaShopBundle\Controller\Admin\Sell\Catalog;
 
 use Exception;
+use PrestaShop\PrestaShop\Adapter\AttributeGroup\AttributeGroupViewDataProvider;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\Command\BulkDeleteAttributeCommand;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\Command\DeleteAttributeCommand;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\Exception\AttributeNotFoundException;
@@ -72,7 +73,7 @@ public function indexAction(Request $request, $attributeGroupId, AttributeFilter
             return $this->redirectToRoute('admin_attribute_groups_index');
         }
 
-        $attributeGroupViewDataProvider = $this->get('prestashop.adapter.product.attribute_group.attribute_group_view_data_provider');
+        $attributeGroupViewDataProvider = $this->get(AttributeGroupViewDataProvider::class);
 
         return $this->render('@PrestaShop/Admin/Sell/Catalog/Attribute/index.html.twig', [
             'attributeGrid' => $this->presentGrid($attributeGrid),
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product.yml
index f09d115d89da5..2e7021bb8727c 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/product.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/product.yml
@@ -19,6 +19,15 @@ services:
       - '@PrestaShop\PrestaShop\Adapter\ContextStateManager'
 
   # Deprecated in 8.1
+  PrestaShop\PrestaShop\Adapter\Product\AdminProductDataProvider:
+    decorates: prestashop.core.admin.data_provider.product_interface
+    arguments:
+      - "@doctrine.orm.entity_manager"
+      - '@PrestaShop\PrestaShop\Adapter\ImageManager'
+      - "@prestashop.static_cache.adapter"
+    public: false
+    deprecated: ~
+
   PrestaShop\PrestaShop\Adapter\Product\AdminProductWrapper:
     arguments:
       - "@translator"
@@ -27,6 +36,24 @@ services:
       - '@PrestaShopBundle\Utils\FloatParser'
     deprecated: ~
 
+  PrestaShop\PrestaShop\Adapter\Attribute\AdminAttributeGeneratorControllerWrapper:
+    deprecated: ~
+
+  PrestaShop\PrestaShop\Adapter\Product\FilterCategoriesRequestPurifier:
+    deprecated: ~
+
+  PrestaShop\PrestaShop\Adapter\Product\ListParametersUpdater:
+    deprecated: ~
+
+  PrestaShop\PrestaShop\Adapter\Product\AdminProductDataUpdater:
+    class: PrestaShop\PrestaShop\Adapter\Product\AdminProductDataUpdater
+    decorates: prestashop.core.admin.data_updater.product_interface
+    public: false
+    arguments:
+      - '@PrestaShop\PrestaShop\Core\Hook\HookDispatcherInterface'
+      - "@prestashop.static_cache.adapter"
+    deprecated: ~
+
   PrestaShop\PrestaShop\Adapter\Product\QueryHandler\SearchProductsForAssociationHandler:
     autowire: true
     public: false
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/twig.yml b/src/PrestaShopBundle/Resources/config/services/bundle/twig.yml
index 71fdc5b1debbf..404f983ba0595 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/twig.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/twig.yml
@@ -40,7 +40,7 @@ services:
     arguments:
       - "@prestashop.core.hook.dispatcher"
       - "@prestashop.adapter.data_provider.module"
-      - "@=service('prestashop.adapter.legacy.context').getContext().employee?service('PrestaShop\\PrestaShop\\Core\\Module\\ModuleRepository'):null"
+      - "@=service('prestashop.adapter.legacy.context').getContext().employee?service('PrestaShop\\\\PrestaShop\\\\Core\\\\Module\\\\ModuleRepository'):null"
 
   PrestaShopBundle\Twig\Extension\GridExtension:
     arguments:
diff --git a/src/PrestaShopBundle/Resources/config/services/core/form/choice_provider.yml b/src/PrestaShopBundle/Resources/config/services/core/form/choice_provider.yml
index 80c951b16d313..e31d411f249bd 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/form/choice_provider.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/form/choice_provider.yml
@@ -63,7 +63,7 @@ services:
 
   PrestaShop\PrestaShop\Core\Form\ChoiceProvider\ModuleByNameChoiceProvider:
     arguments:
-      - '@=service("prestashop.core.admin.module.repository").getInstalledModules()'
+      - '@=service("PrestaShop\\PrestaShop\\Core\\Module\\ModuleRepository").getInstalledModules()'
 
   PrestaShop\PrestaShop\Core\Form\ChoiceProvider\ImportMatchConfigurationChoiceProvider:
     arguments:
@@ -108,7 +108,7 @@ services:
 
   PrestaShop\PrestaShop\Core\Form\ChoiceProvider\TabChoiceProvider:
     arguments:
-      - '@=service("prestashop.adapter.data_provider.tab").getViewableTabsForContextEmployee(service("prestashop.adapter.legacy.context").getLanguage().id)'
+      - '@=service("PrestaShop\\PrestaShop\\Adapter\\Tab\\TabDataProvider").getViewableTabsForContextEmployee(service("prestashop.adapter.legacy.context").getLanguage().id)'
 
   PrestaShop\PrestaShop\Core\Form\ChoiceProvider\ProfileChoiceProvider:
     arguments:
diff --git a/src/PrestaShopBundle/Resources/config/services/core/module.yml b/src/PrestaShopBundle/Resources/config/services/core/module.yml
index 1d63711fef2de..90c3f973ac6b5 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/module.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/module.yml
@@ -37,7 +37,6 @@ services:
 
   PrestaShop\PrestaShop\Core\Module\SourceHandler\ZipSourceHandler:
     autowire: true
-    public: false
     arguments:
       $modulePath: '%modules_dir%'
     tags: [ core.module.source_handler ]

From 8ce73922e589ffe027d5b5622f5542c9ce1ee393 Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Fri, 28 Jul 2023 09:32:50 +0200
Subject: [PATCH 0663/1030] Delete unused file from this PR

---
 .../ApiPlatform/Resources/Customer.php        | 70 -------------------
 1 file changed, 70 deletions(-)
 delete mode 100644 src/PrestaShopBundle/ApiPlatform/Resources/Customer.php

diff --git a/src/PrestaShopBundle/ApiPlatform/Resources/Customer.php b/src/PrestaShopBundle/ApiPlatform/Resources/Customer.php
deleted file mode 100644
index b17421271e639..0000000000000
--- a/src/PrestaShopBundle/ApiPlatform/Resources/Customer.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-declare(strict_types=1);
-
-namespace PrestaShopBundle\ApiPlatform\Resources;
-
-use ApiPlatform\Metadata\ApiProperty;
-use ApiPlatform\Metadata\ApiResource;
-use ApiPlatform\Metadata\Post;
-use PrestaShop\Decimal\DecimalNumber;
-use PrestaShop\PrestaShop\Core\Domain\Customer\Group\Command\AddCustomerGroupCommand;
-use PrestaShopBundle\ApiPlatform\Processor\CommandProcessor;
-
-#[ApiResource(
-    operations: [
-        new Post(
-            uriTemplate: '/customers',
-            provider: CommandProcessor::class,
-            extraProperties: [
-                'command' => AddCustomerGroupCommand::class,
-            ],
-        ),
-    ]
-)]
-class Customer
-{
-    /**
-     * @param string[] $localizedNames
-     * @param int[] $shopIds
-     */
-    public function __construct(
-        #[ApiProperty(
-            example: 'array<string>',
-        )]
-        public array $localizedNames,
-        public DecimalNumber $reductionPercent,
-        public bool $displayPriceTaxExcluded,
-        public bool $showPrice,
-        #[ApiProperty(
-            example: 'array<int>',
-        )]
-        public array $shopIds
-    ) {
-    }
-}

From e0b00901b3f34902c8530e4f0d9af396cbfba77b Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Thu, 27 Jul 2023 13:08:19 +0200
Subject: [PATCH 0664/1030] Style customer threads properly

---
 .../new-theme/scss/components/_timeline.scss  | 220 +++++++++++-------
 .../CustomerThread/Block/timeline.html.twig   |  50 ++--
 2 files changed, 160 insertions(+), 110 deletions(-)

diff --git a/admin-dev/themes/new-theme/scss/components/_timeline.scss b/admin-dev/themes/new-theme/scss/components/_timeline.scss
index 0208ad27af076..0b060f6fb730a 100644
--- a/admin-dev/themes/new-theme/scss/components/_timeline.scss
+++ b/admin-dev/themes/new-theme/scss/components/_timeline.scss
@@ -1,123 +1,163 @@
 .timeline {
   position: relative;
-  display: table;
+  display: flex;
+  flex-direction: column;
   width: 100%;
-  table-layout: fixed;
-  border-spacing: 0;
-  border-collapse: collapse;
+  max-width: 1500px;
+  margin-right: auto;
+  margin-left: auto;
 
   &::before {
     position: absolute;
-    top: 0;
-    bottom: 30px;
+    top: 1.25rem;
+    bottom: 1.25rem;
     left: 50%;
     z-index: 0;
     width: 6px;
     margin-left: -4px;
     content: "";
+    @include border-radius(10rem);
     background-color: #ddd;
   }
 
+  /* Row layout and basic grid settings for desktop */
   .timeline-item {
-    display: table-row;
+    display: grid;
+    grid-template-rows: auto;
+    grid-template-columns: 1fr 4rem 1fr;
+    align-items: start;
+    margin-bottom: 1.25rem;
+  }
+
+  /* Wrappers for content */
+  .timeline-date-wrapper {
+    grid-row: 1 / 2;
+    grid-column: 1;
+  }
+
+  .timeline-icon-wrapper {
+    display: flex;
+    grid-column: 2;
+    justify-content: center;
+  }
 
-    &.alt {
+  .timeline-content-wrapper {
+    position: relative;
+    grid-row: 1 / 2;
+    grid-column: 3;
+  }
+
+  /* Alternative settings for reverted row */
+  .timeline-item.right {
+    .timeline-date-wrapper {
+      grid-column: 3;
+      justify-content: left;
+    }
+
+    .timeline-content-wrapper {
+      grid-column: 1;
       text-align: right;
+    }
 
-      &::before {
-        display: none;
-      }
+    .timeline-date {
+      justify-content: left;
+    }
+  }
+
+  /* Content styling */
+  .timeline-date {
+    display: flex;
+    align-items: center;
+    justify-content: right;
+    margin-top: 0.6rem;
+    margin-bottom: 0.6rem;
+
+    i {
+      margin-right: 0.1rem;
+    }
+  }
 
-      .timeline-panel {
-        margin-right: 42px;
-        margin-left: 0;
+  .timeline-date-day {
+    margin-right: 0.4rem;
+  }
+
+  .timeline-icon {
+    z-index: 1;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 2.5rem;
+    height: 2.5rem;
+    line-height: 2.5rem;
+    background-color: #666;
+    border: 2px solid $white;
+    @include border-radius(2.5rem);
+  }
+
+  .timeline-content {
+    padding: 1.25rem;
+    background-color: $white;
+    border: 1px solid #ddd;
+    @include border-radius(5px);
+  }
+
+  @include media-breakpoint-down(sm) {
+
+    .timeline-item,
+    .timeline-item.right {
+      grid-template-columns: 3.2rem 1fr;
+
+      .timeline-date-wrapper {
+        grid-row: 1;
+        grid-column: 2;
       }
 
-      .timeline-caption {
-        .timeline-panel {
-          .timeline-icon {
-            right: -60px;
-            left: auto;
-          }
-
-          .timeline-date {
-            right: -220px;
-            left: auto;
-            text-align: left;
-          }
-        }
+      .timeline-date {
+        justify-content: left;
       }
-    }
 
-    &::before,
-    &.alt::after {
-      display: block;
-      width: 50%;
-      content: "";
-    }
+      .timeline-icon-wrapper {
+        grid-row: 1 / span 2;
+        grid-column: 1;
+        justify-content: left;
+      }
 
-    .timeline-caption {
-      display: table-cell;
-      width: 50%;
-      vertical-align: top;
-
-      .timeline-panel {
-        position: relative;
-        display: inline-block;
-        padding: 20px;
-        margin-bottom: 20px;
-        margin-left: 42px;
+      .timeline-content-wrapper {
+        grid-row: 2;
+        grid-column: 2;
         text-align: left;
-        background-color: $white;
-        border: 1px solid #ddd;
-        @include border-radius(5px);
-
-        .timeline-icon {
-          position: absolute;
-          top: -2px;
-          left: -62px;
-          width: 40px;
-          height: 40px;
-          line-height: 40px;
-          text-align: center;
-          background-color: #666;
-          border: 2px solid $white;
-          @include border-radius(40px);
-        }
-
-        .timeline-date {
-          position: absolute;
-          top: 10px;
-          left: -270px;
-          width: 200px;
-          text-align: right;
-        }
       }
     }
-  }
 
-  .arrow::after,
-  .arrow::before {
-    position: absolute;
-    display: inline-block;
-    content: "";
-    border-color: transparent;
-    border-style: solid;
+    /* Timeline line shifted to the left */
+    &::before {
+      left: 1.3rem;
+    }
   }
 
-  .arrow-left::before {
-    top: 6px;
-    left: 0;
-    margin-left: -7px;
-    border-width: 7px 7px 7px 0;
-    border-right-color: #d1d4d7;
-  }
+  /* Arrows for desktop cards */
+  @include media-breakpoint-up(md) {
+    .timeline-content::before {
+      position: absolute;
+      top: 0.8rem;
+      display: inline-block;
+      content: "";
+      border-color: transparent;
+      border-style: solid;
+    }
+
+    .timeline-item.left .timeline-content::before {
+      left: 0;
+      margin-left: -7px;
+      border-width: 7px 7px 7px 0;
+      border-right-color: #d1d4d7;
+    }
 
-  .arrow-right::before {
-    top: 6px;
-    right: 0;
-    margin-right: -7px;
-    border-width: 7px 0 7px 7px;
-    border-left-color: #d1d4d7;
+    .timeline-item.right .timeline-content::before {
+      right: 0;
+      margin-right: -7px;
+      border-width: 7px 0 7px 7px;
+      border-left-color: #d1d4d7;
+    }
   }
 }
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Sell/CustomerService/CustomerThread/Block/timeline.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Sell/CustomerService/CustomerThread/Block/timeline.html.twig
index 54ceecc363b36..d8635b6869b41 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Sell/CustomerService/CustomerThread/Block/timeline.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Sell/CustomerService/CustomerThread/Block/timeline.html.twig
@@ -30,31 +30,41 @@
   <div class="card-body">
     <div class="timeline">
       {% for timelineItem in customerThreadView.timeline.timelineItems %}
-        <article class="timeline-item {% if timelineItem.arrow == 'right' %}alt{% endif %}">
-          <div class="timeline-caption">
-            <div class="timeline-panel arrow arrow-{{ timelineItem.arrow }}">
-              <span class="timeline-icon"
-                    {% if timelineItem.color %}style="background-color: {{ timelineItem.color }}"{% endif %}
-              >
-                <i class="material-icons text-white">{{ timelineItem.icon }}</i>
-              </span>
+        {# We are using left-right styling for the timeline #}
+        <div class="timeline-item {% if timelineItem.arrow == 'right' %}right{% else %}left{% endif %}">
 
-              <span class="timeline-date">
-                <i class="material-icons font-16">calendar_today</i>
-                {{ format_date(timelineItem.date) }}
-                <i class="material-icons font-16">access_time</i>
-                {{ timelineItem.date|date('H:i') }}
-              </span>
+          {# Icon #}
+          <div class="timeline-icon-wrapper">
+            <div class="timeline-icon" 
+              {% if timelineItem.color %}
+                style="background-color: {{ timelineItem.color }};"
+              {% endif %}
+            >
+              <i class="material-icons text-white">{{ timelineItem.icon }}</i>
+            </div>
+          </div>
 
-              <span>
-                {{ timelineItem.content|raw|nl2br }}
-              </span>
+          {# Date #} 
+          <div class="timeline-date-wrapper">
+            <div class="timeline-date">
+              <i class="material-icons font-16">calendar_today</i>
+              <span class="timeline-date-day">{{ format_date(timelineItem.date) }}</span>
+              <i class="material-icons font-16">access_time</i>
+              <span>{{ timelineItem.date|date('H:i') }}</span>
+            </div>
+          </div>
 
+          {# Content #}
+          <div class="timeline-content-wrapper">
+            <div class="timeline-content">
+              <div>
+                {{ timelineItem.content|raw|nl2br }}
+              </div>
               {% if timelineItem.relatedOrderId %}
                 <p class="mb-0 mt-2">
                   <a href="{{ getAdminLink('AdminOrders', true, {'vieworder': 1, 'id_order': timelineItem.relatedOrderId}) }}"
-                     class="btn btn-outline-secondary btn-sm"
-                     target="_blank"
+                      class="btn btn-outline-secondary btn-sm"
+                      target="_blank"
                   >
                     {{ 'See more'|trans({}, 'Admin.Actions') }}
                   </a>
@@ -62,7 +72,7 @@
               {% endif %}
             </div>
           </div>
-        </article>
+        </div>
       {% endfor %}
     </div>
   </div>

From 8313ae29c001bc44420488473fec36396b4fc75b Mon Sep 17 00:00:00 2001
From: Daniel Hlavacek <daniel.hlavacek@hotmail.cz>
Date: Fri, 28 Jul 2023 12:48:44 +0200
Subject: [PATCH 0665/1030] Fix CS

---
 controllers/admin/AdminCartsController.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php
index 78b70a561fd3f..78f44ac7af84e 100644
--- a/controllers/admin/AdminCartsController.php
+++ b/controllers/admin/AdminCartsController.php
@@ -24,8 +24,6 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
-use PrestaShop\PrestaShop\Core\Localization\Exception\LocalizationException;
-
 /**
  * @property Cart $object
  */

From 0358d69991a06464c94b639abaa0ec5b416eefa5 Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Fri, 28 Jul 2023 15:56:52 +0200
Subject: [PATCH 0666/1030] Add image helptext

---
 .../Sell/Product/Combination/CombinationImagesChoiceType.php     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Product/Combination/CombinationImagesChoiceType.php b/src/PrestaShopBundle/Form/Admin/Sell/Product/Combination/CombinationImagesChoiceType.php
index 590627c22423a..faae3e458d9c2 100644
--- a/src/PrestaShopBundle/Form/Admin/Sell/Product/Combination/CombinationImagesChoiceType.php
+++ b/src/PrestaShopBundle/Form/Admin/Sell/Product/Combination/CombinationImagesChoiceType.php
@@ -67,6 +67,7 @@ public function configureOptions(OptionsResolver $resolver)
             ->setAllowedTypes('product_id', 'int')
             ->setDefaults([
                 'label' => $this->trans('Images', 'Admin.Global'),
+                'label_subtitle' => $this->trans('You can specify which images should be displayed when customer selects this combination. If you don\'t select any image, all will be displayed. The default image of the combination will be the first one selected from the list.', 'Admin.Catalog.Feature'),
                 'choice_attr' => function (string $choice, string $key): array {
                     return ['data-image-url' => $key];
                 },

From 254716cf2fec804229cfa8bb3b130588bce20146 Mon Sep 17 00:00:00 2001
From: prestonBot <prestonBot@users.noreply.github.com>
Date: Fri, 28 Jul 2023 23:05:54 +0000
Subject: [PATCH 0667/1030] Updated PrestaShop Packages

---
 composer.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/composer.lock b/composer.lock
index aaa1c7b1c7666..28e38c46317cb 100644
--- a/composer.lock
+++ b/composer.lock
@@ -6628,16 +6628,16 @@
         },
         {
             "name": "prestashop/ps_facetedsearch",
-            "version": "v3.12.1",
+            "version": "v3.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PrestaShop/ps_facetedsearch.git",
-                "reference": "25d0a3fb8707632f865a9311dadaf5c0db307215"
+                "reference": "42f30f0999791cf00d6d371d982e6257adb41b24"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PrestaShop/ps_facetedsearch/zipball/25d0a3fb8707632f865a9311dadaf5c0db307215",
-                "reference": "25d0a3fb8707632f865a9311dadaf5c0db307215",
+                "url": "https://api.github.com/repos/PrestaShop/ps_facetedsearch/zipball/42f30f0999791cf00d6d371d982e6257adb41b24",
+                "reference": "42f30f0999791cf00d6d371d982e6257adb41b24",
                 "shasum": ""
             },
             "require": {
@@ -6673,9 +6673,9 @@
             "description": "PrestaShop module ps_facetedsearch",
             "homepage": "https://github.com/PrestaShop/ps_facetedsearch",
             "support": {
-                "source": "https://github.com/PrestaShop/ps_facetedsearch/tree/v3.12.1"
+                "source": "https://github.com/PrestaShop/ps_facetedsearch/tree/v3.13.0"
             },
-            "time": "2023-03-22T16:15:40+00:00"
+            "time": "2023-07-27T17:38:24+00:00"
         },
         {
             "name": "prestashop/ps_faviconnotificationbo",

From 1bf0c59eb4f5f6e71460f9ee6fd246061f2851ca Mon Sep 17 00:00:00 2001
From: Daniel Hlavacek <daniel.hlavacek@hotmail.cz>
Date: Sat, 29 Jul 2023 15:48:00 +0200
Subject: [PATCH 0668/1030] Update bug report

---
 .github/ISSUE_TEMPLATE/1_bug_report.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/1_bug_report.yml b/.github/ISSUE_TEMPLATE/1_bug_report.yml
index b1ee9bad8c2e0..99edcb7f78fe5 100644
--- a/.github/ISSUE_TEMPLATE/1_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/1_bug_report.yml
@@ -5,11 +5,12 @@ body:
   - type: markdown
     attributes:
       value: |
-        Thank you for taking the time to fill out this bug report. Please take the time to provide as much details as possible. Following our [bug report guidelines](https://devdocs.prestashop-project.org/8/contribute/contribute-reporting-issues/#best-practices-for-writing-an-issue) will help maintainers qualify your report faster.
-
-        Reporting bugs with "error 500" or "white page" may not help us reproduce them. This is a universal error that hides what is underneath. Instead, enable debug mode in the Performance section of PrestaShop and try again. You should get a proper error message.
-
-        🇬🇧 Use English, reports in all other languages will be closed.
+         #### Basic information ❗
+         - Provide as much DETAILS as possible - error logs, screenshots, your exact configuration. If no one can reproduce it, no one will fix it.
+         - Follow [bug report guidelines](https://devdocs.prestashop-project.org/8/contribute/contribute-reporting-issues/#best-practices-for-writing-an-issue) to help maintainers qualify your report faster.
+         - DO NOT report bugs with "error 500" or "white page" - this is a universal error and will tell us nothing. Enable debug mode in the Performance section of PrestaShop or manually in `/config/defines.inc.php` and try again. You should get a proper error message.
+         - Use ENGLISH, reports in all other languages will be closed.
+         - If you report problem with upgrade process, open `/admin/autoupgrade/tmp` and attach `log.txt` to the issue. It contains all the information about the upgrade process.
   - type: checkboxes
     attributes:
       label: Prerequisites
@@ -22,7 +23,7 @@ body:
     id: what-happened
     attributes:
       label: Describe the bug and add attachments
-      description: What went wrong? If applicable, add screenshots, error logs or screen recordings to help explain your problem.
+      description: What went wrong? If possible, add screenshots, error logs or screen recordings to help explain your problem.
     validations:
       required: true
   - type: textarea

From 9244a28e8894414e9759600974571c2ea03d1e1f Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Sun, 30 Jul 2023 17:13:15 +0200
Subject: [PATCH 0669/1030] Fix null fixtures

---
 install-dev/fixtures/fashion/data/product.xml | 39 ++++-----
 .../fashion/data/product_attribute.xml        | 81 ++++++++++---------
 2 files changed, 61 insertions(+), 59 deletions(-)

diff --git a/install-dev/fixtures/fashion/data/product.xml b/install-dev/fixtures/fashion/data/product.xml
index aabd6e033c9d9..510ff60dc4042 100644
--- a/install-dev/fixtures/fashion/data/product.xml
+++ b/install-dev/fixtures/fashion/data/product.xml
@@ -43,81 +43,82 @@
     <field name="cache_default_attribute"/>
     <field name="advanced_stock_management"/>
     <field name="product_type"/>
+    <field name="low_stock_threshold"/>
   </fields>
   <entities>
-    <product id="Hummingbird_printed_t-shirt" id_supplier="Fashion_Supplier" id_manufacturer="Studio_Design" id_category_default="Men" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="23.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_1" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="46" advanced_stock_management="0" product_type="combinations">
+    <product id="Hummingbird_printed_t-shirt" id_supplier="Fashion_Supplier" id_manufacturer="Studio_Design" id_category_default="Men" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="23.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_1" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="46" advanced_stock_management="0" low_stock_threshold="0" product_type="combinations">
       <unity/>
       <location/>
     </product>
-    <product id="Hummingbird_printed_sweater" id_supplier="Fashion_Supplier" id_manufacturer="Studio_Design" id_category_default="Women" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="35.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_3" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="404" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="62" advanced_stock_management="0" product_type="combinations">
+    <product id="Hummingbird_printed_sweater" id_supplier="Fashion_Supplier" id_manufacturer="Studio_Design" id_category_default="Women" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="35.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_3" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="404" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="62" advanced_stock_management="0" low_stock_threshold="0" product_type="combinations">
       <unity/>
       <location/>
     </product>
-    <product id="The_best_is_yet_to_come_Framed_poster" id_supplier="Fashion_Supplier" id_manufacturer="Graphic_Corner" id_category_default="Art" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="29.000000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_6" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="70" advanced_stock_management="0" product_type="combinations">
+    <product id="The_best_is_yet_to_come_Framed_poster" id_supplier="Fashion_Supplier" id_manufacturer="Graphic_Corner" id_category_default="Art" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="29.000000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_6" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="70" advanced_stock_management="0" low_stock_threshold="0" product_type="combinations">
       <unity/>
       <location/>
     </product>
-    <product id="The_adventure_begins_Framed_poster" id_supplier="Fashion_Supplier" id_manufacturer="Graphic_Corner" id_category_default="Art" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="29.000000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_5" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="404" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="73" advanced_stock_management="0" product_type="combinations">
+    <product id="The_adventure_begins_Framed_poster" id_supplier="Fashion_Supplier" id_manufacturer="Graphic_Corner" id_category_default="Art" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="29.000000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_5" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="404" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="73" advanced_stock_management="0" low_stock_threshold="0" product_type="combinations">
       <unity/>
       <location/>
     </product>
-    <product id="Today_is_a_good_day_Framed_poster" id_supplier="Fashion_Supplier" id_manufacturer="Graphic_Corner" id_category_default="Art" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="29.000000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_7" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="76" advanced_stock_management="0" product_type="combinations">
+    <product id="Today_is_a_good_day_Framed_poster" id_supplier="Fashion_Supplier" id_manufacturer="Graphic_Corner" id_category_default="Art" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="29.000000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_7" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="76" advanced_stock_management="0" low_stock_threshold="0" product_type="combinations">
       <unity/>
       <location/>
     </product>
-    <product id="Mug_The_best_is_yet_to_come" id_supplier="Accessories_Supplier" id_manufacturer="Studio_Design" id_category_default="Home_Accessories" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="11.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_11" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0" product_type="standard">
+    <product id="Mug_The_best_is_yet_to_come" id_supplier="Accessories_Supplier" id_manufacturer="Studio_Design" id_category_default="Home_Accessories" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="11.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_11" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0" low_stock_threshold="0" product_type="standard">
       <unity/>
       <location/>
     </product>
-    <product id="Mug_The_adventure_begins" id_supplier="Accessories_Supplier" id_manufacturer="Studio_Design" id_category_default="Home_Accessories" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="11.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_12" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0" product_type="standard">
+    <product id="Mug_The_adventure_begins" id_supplier="Accessories_Supplier" id_manufacturer="Studio_Design" id_category_default="Home_Accessories" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="11.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_12" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0" low_stock_threshold="0" product_type="standard">
       <unity/>
       <location/>
     </product>
-    <product id="Mug_Today_is_a_good_day" id_supplier="Accessories_Supplier" id_manufacturer="Studio_Design" id_category_default="Home_Accessories" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="11.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_13" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="404" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0" product_type="standard">
+    <product id="Mug_Today_is_a_good_day" id_supplier="Accessories_Supplier" id_manufacturer="Studio_Design" id_category_default="Home_Accessories" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="11.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_13" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="404" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0" low_stock_threshold="0" product_type="standard">
       <unity/>
       <location/>
     </product>
-    <product id="Mountain_fox_cushion" id_supplier="Accessories_Supplier" id_manufacturer="Studio_Design" id_category_default="Home_Accessories" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="18.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_15" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="79" advanced_stock_management="0" product_type="combinations">
+    <product id="Mountain_fox_cushion" id_supplier="Accessories_Supplier" id_manufacturer="Studio_Design" id_category_default="Home_Accessories" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="18.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_15" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="79" advanced_stock_management="0" low_stock_threshold="0" product_type="combinations">
       <unity/>
       <location/>
     </product>
-    <product id="Brown_bear_cushion" id_supplier="Accessories_Supplier" id_manufacturer="Studio_Design" id_category_default="Home_Accessories" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="18.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_16" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="81" advanced_stock_management="0" product_type="combinations">
+    <product id="Brown_bear_cushion" id_supplier="Accessories_Supplier" id_manufacturer="Studio_Design" id_category_default="Home_Accessories" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="18.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_16" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="81" advanced_stock_management="0" low_stock_threshold="0" product_type="combinations">
       <unity/>
       <location/>
     </product>
-    <product id="Hummingbird_cushion" id_supplier="Accessories_Supplier" id_manufacturer="Studio_Design" id_category_default="Home_Accessories" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="18.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_17" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="83" advanced_stock_management="0" product_type="combinations">
+    <product id="Hummingbird_cushion" id_supplier="Accessories_Supplier" id_manufacturer="Studio_Design" id_category_default="Home_Accessories" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="18.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_17" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="83" advanced_stock_management="0" low_stock_threshold="0" product_type="combinations">
       <unity/>
       <location/>
     </product>
-    <product id="Mountain_fox_-_Vector_graphics" id_supplier="Accessories_Supplier" id_manufacturer="Graphic_Corner" id_category_default="Art" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="9.000000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_18" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="1" cache_default_attribute="0" advanced_stock_management="0" product_type="virtual">
+    <product id="Mountain_fox_-_Vector_graphics" id_supplier="Accessories_Supplier" id_manufacturer="Graphic_Corner" id_category_default="Art" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="9.000000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_18" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="1" cache_default_attribute="0" advanced_stock_management="0" low_stock_threshold="0" product_type="virtual">
       <unity/>
       <location/>
     </product>
-    <product id="Brown_bear_-_Vector_graphics" id_supplier="Accessories_Supplier" id_manufacturer="Graphic_Corner" id_category_default="Art" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="9.000000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_19" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="1" cache_default_attribute="0" advanced_stock_management="0" product_type="virtual">
+    <product id="Brown_bear_-_Vector_graphics" id_supplier="Accessories_Supplier" id_manufacturer="Graphic_Corner" id_category_default="Art" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="9.000000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_19" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="1" cache_default_attribute="0" advanced_stock_management="0" low_stock_threshold="0" product_type="virtual">
       <unity/>
       <location/>
     </product>
-    <product id="Hummingbird_-_Vector_graphics" id_supplier="Accessories_Supplier" id_manufacturer="Graphic_Corner" id_category_default="Art" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="9.000000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_20" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="1" cache_default_attribute="0" advanced_stock_management="0" product_type="virtual">
+    <product id="Hummingbird_-_Vector_graphics" id_supplier="Accessories_Supplier" id_manufacturer="Graphic_Corner" id_category_default="Art" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="9.000000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_20" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="1" cache_default_attribute="0" advanced_stock_management="0" low_stock_threshold="0" product_type="virtual">
       <unity/>
       <location/>
     </product>
-    <product id="Pack_Mug_Framed_poster" id_supplier="Accessories_Supplier" id_manufacturer="" id_category_default="Home_Accessories" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="35.000000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_21" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="1" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0" product_type="pack">
+    <product id="Pack_Mug_Framed_poster" id_supplier="Accessories_Supplier" id_manufacturer="" id_category_default="Home_Accessories" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="35.000000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_21" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="1" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0" low_stock_threshold="0" product_type="pack">
       <unity/>
       <location/>
     </product>
-    <product id="Mountain_fox_notebook" id_supplier="Accessories_Supplier" id_manufacturer="Graphic_Corner" id_category_default="Stationery" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="12.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_8" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="85" advanced_stock_management="0" product_type="combinations">
+    <product id="Mountain_fox_notebook" id_supplier="Accessories_Supplier" id_manufacturer="Graphic_Corner" id_category_default="Stationery" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="12.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_8" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="85" advanced_stock_management="0" low_stock_threshold="0" product_type="combinations">
       <unity/>
       <location/>
     </product>
-    <product id="Brown_bear_notebook" id_supplier="Accessories_Supplier" id_manufacturer="Graphic_Corner" id_category_default="Stationery" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="12.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_9" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="89" advanced_stock_management="0" product_type="combinations">
+    <product id="Brown_bear_notebook" id_supplier="Accessories_Supplier" id_manufacturer="Graphic_Corner" id_category_default="Stationery" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="12.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_9" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="89" advanced_stock_management="0" low_stock_threshold="0" product_type="combinations">
       <unity/>
       <location/>
     </product>
-    <product id="Hummingbird_notebook" id_supplier="Accessories_Supplier" id_manufacturer="Graphic_Corner" id_category_default="Stationery" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="12.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_10" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="93" advanced_stock_management="0" product_type="combinations">
+    <product id="Hummingbird_notebook" id_supplier="Accessories_Supplier" id_manufacturer="Graphic_Corner" id_category_default="Stationery" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="12.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_10" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="0" uploadable_files="0" text_fields="0" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="93" advanced_stock_management="0" low_stock_threshold="0" product_type="combinations">
       <unity/>
       <location/>
     </product>
-    <product id="Customizable_mug" id_supplier="Accessories_Supplier" id_manufacturer="Studio_Design" id_category_default="Home_Accessories" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="13.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_14" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="1" uploadable_files="0" text_fields="1" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0" product_type="standard">
+    <product id="Customizable_mug" id_supplier="Accessories_Supplier" id_manufacturer="Studio_Design" id_category_default="Home_Accessories" on_sale="0" online_only="0" ean13="" upc="" ecotax="0.000000" quantity="0" minimal_quantity="1" id_tax_rules_group="default_tax_rule_group" price="13.900000" wholesale_price="5.490000" unit_price="0.000000" additional_shipping_cost="0.00" reference="demo_14" supplier_reference="" width="0.000000" height="0.000000" depth="0.000000" weight="0.300000" out_of_stock="2" quantity_discount="0" customizable="1" uploadable_files="0" text_fields="1" active="1" redirect_type="301-category" id_type_redirected="0" available_for_order="1" available_date="0000-00-00" condition="new" show_price="1" indexed="1" cache_is_pack="0" cache_has_attachments="0" is_virtual="0" cache_default_attribute="0" advanced_stock_management="0" low_stock_threshold="0" product_type="standard">
       <unity/>
       <location/>
     </product>
diff --git a/install-dev/fixtures/fashion/data/product_attribute.xml b/install-dev/fixtures/fashion/data/product_attribute.xml
index 3a89af4443ac0..f6e33fdd2527f 100644
--- a/install-dev/fixtures/fashion/data/product_attribute.xml
+++ b/install-dev/fixtures/fashion/data/product_attribute.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_product_attribute>
-  <fields class="Combination">
+  <fields class="Combination" low_stock_threshold="0">
     <field name="id_product" relation="product"/>
     <field name="reference"/>
     <field name="supplier_reference"/>
@@ -16,123 +16,124 @@
     <field name="default_on"/>
     <field name="minimal_quantity"/>
     <field name="available_date"/>
+    <field name="low_stock_threshold"/>
   </fields>
   <entities>
-    <product_attribute id="product_attribute_46" id_product="Hummingbird_printed_t-shirt" reference="demo_1" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="1" minimal_quantity="1" available_date="0000-00-00">
+    <product_attribute id="product_attribute_46" id_product="Hummingbird_printed_t-shirt" reference="demo_1" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="1" minimal_quantity="1" available_date="0000-00-00" low_stock_threshold="0">
       <location/>
     </product_attribute>
-    <product_attribute id="product_attribute_47" id_product="Hummingbird_printed_t-shirt" reference="demo_1" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00">
+    <product_attribute id="product_attribute_47" id_product="Hummingbird_printed_t-shirt" reference="demo_1" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00" low_stock_threshold="0">
       <location/>
     </product_attribute>
-    <product_attribute id="product_attribute_48" id_product="Hummingbird_printed_t-shirt" reference="demo_1" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00">
+    <product_attribute id="product_attribute_48" id_product="Hummingbird_printed_t-shirt" reference="demo_1" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00" low_stock_threshold="0">
       <location/>
     </product_attribute>
-    <product_attribute id="product_attribute_49" id_product="Hummingbird_printed_t-shirt" reference="demo_1" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00">
+    <product_attribute id="product_attribute_49" id_product="Hummingbird_printed_t-shirt" reference="demo_1" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00" low_stock_threshold="0">
       <location/>
     </product_attribute>
-    <product_attribute id="product_attribute_50" id_product="Hummingbird_printed_t-shirt" reference="demo_1" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00">
+    <product_attribute id="product_attribute_50" id_product="Hummingbird_printed_t-shirt" reference="demo_1" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00" low_stock_threshold="0">
       <location/>
     </product_attribute>
-    <product_attribute id="product_attribute_51" id_product="Hummingbird_printed_t-shirt" reference="demo_1" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00">
+    <product_attribute id="product_attribute_51" id_product="Hummingbird_printed_t-shirt" reference="demo_1" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00" low_stock_threshold="0">
       <location/>
     </product_attribute>
-    <product_attribute id="product_attribute_52" id_product="Hummingbird_printed_t-shirt" reference="demo_1" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00">
+    <product_attribute id="product_attribute_52" id_product="Hummingbird_printed_t-shirt" reference="demo_1" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00" low_stock_threshold="0">
       <location/>
     </product_attribute>
-    <product_attribute id="product_attribute_53" id_product="Hummingbird_printed_t-shirt" reference="demo_1" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00">
+    <product_attribute id="product_attribute_53" id_product="Hummingbird_printed_t-shirt" reference="demo_1" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00" low_stock_threshold="0">
       <location/>
     </product_attribute>
-    <product_attribute id="product_attribute_62" id_product="Hummingbird_printed_sweater" reference="demo_3" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="1" minimal_quantity="1" available_date="0000-00-00">
+    <product_attribute id="product_attribute_62" id_product="Hummingbird_printed_sweater" reference="demo_3" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="1" minimal_quantity="1" available_date="0000-00-00" low_stock_threshold="0">
       <location/>
     </product_attribute>
-    <product_attribute id="product_attribute_63" id_product="Hummingbird_printed_sweater" reference="demo_3" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00">
+    <product_attribute id="product_attribute_63" id_product="Hummingbird_printed_sweater" reference="demo_3" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00" low_stock_threshold="0">
       <location/>
     </product_attribute>
-    <product_attribute id="product_attribute_64" id_product="Hummingbird_printed_sweater" reference="demo_3" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00">
+    <product_attribute id="product_attribute_64" id_product="Hummingbird_printed_sweater" reference="demo_3" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00" low_stock_threshold="0">
       <location/>
     </product_attribute>
-    <product_attribute id="product_attribute_65" id_product="Hummingbird_printed_sweater" reference="demo_3" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00">
+    <product_attribute id="product_attribute_65" id_product="Hummingbird_printed_sweater" reference="demo_3" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00" low_stock_threshold="0">
       <location/>
     </product_attribute>
-    <product_attribute id="product_attribute_70" id_product="The_best_is_yet_to_come_Framed_poster" reference="demo_6" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="0" weight="0.000000" unit_price_impact="0.000000" default_on="1" minimal_quantity="1" available_date="0000-00-00">
+    <product_attribute id="product_attribute_70" id_product="The_best_is_yet_to_come_Framed_poster" reference="demo_6" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="0" weight="0.000000" unit_price_impact="0.000000" default_on="1" minimal_quantity="1" available_date="0000-00-00" low_stock_threshold="0">
       <location/>
     </product_attribute>
-    <product_attribute id="product_attribute_71" id_product="The_best_is_yet_to_come_Framed_poster" reference="demo_6" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="20.000000" ecotax="0.000000" quantity="0" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00">
+    <product_attribute id="product_attribute_71" id_product="The_best_is_yet_to_come_Framed_poster" reference="demo_6" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="20.000000" ecotax="0.000000" quantity="0" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00" low_stock_threshold="0">
       <location/>
     </product_attribute>
-    <product_attribute id="product_attribute_72" id_product="The_best_is_yet_to_come_Framed_poster" reference="demo_6" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="50.000000" ecotax="0.000000" quantity="0" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00">
+    <product_attribute id="product_attribute_72" id_product="The_best_is_yet_to_come_Framed_poster" reference="demo_6" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="50.000000" ecotax="0.000000" quantity="0" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00" low_stock_threshold="0">
       <location/>
     </product_attribute>
-    <product_attribute id="product_attribute_73" id_product="The_adventure_begins_Framed_poster" reference="demo_5" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="1" minimal_quantity="1" available_date="0000-00-00">
+    <product_attribute id="product_attribute_73" id_product="The_adventure_begins_Framed_poster" reference="demo_5" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="1" minimal_quantity="1" available_date="0000-00-00" low_stock_threshold="0">
       <location/>
     </product_attribute>
-    <product_attribute id="product_attribute_74" id_product="The_adventure_begins_Framed_poster" reference="demo_5" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="20.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00">
+    <product_attribute id="product_attribute_74" id_product="The_adventure_begins_Framed_poster" reference="demo_5" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="20.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00" low_stock_threshold="0">
       <location/>
     </product_attribute>
-    <product_attribute id="product_attribute_75" id_product="The_adventure_begins_Framed_poster" reference="demo_5" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="50.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00">
+    <product_attribute id="product_attribute_75" id_product="The_adventure_begins_Framed_poster" reference="demo_5" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="50.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00" low_stock_threshold="0">
       <location/>
     </product_attribute>
-    <product_attribute id="product_attribute_76" id_product="Today_is_a_good_day_Framed_poster" reference="demo_7" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="1" minimal_quantity="1" available_date="0000-00-00">
+    <product_attribute id="product_attribute_76" id_product="Today_is_a_good_day_Framed_poster" reference="demo_7" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="1" minimal_quantity="1" available_date="0000-00-00" low_stock_threshold="0">
       <location/>
     </product_attribute>
-    <product_attribute id="product_attribute_77" id_product="Today_is_a_good_day_Framed_poster" reference="demo_7" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="20.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00">
+    <product_attribute id="product_attribute_77" id_product="Today_is_a_good_day_Framed_poster" reference="demo_7" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="20.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00" low_stock_threshold="0">
       <location/>
     </product_attribute>
-    <product_attribute id="product_attribute_78" id_product="Today_is_a_good_day_Framed_poster" reference="demo_7" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="50.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00">
+    <product_attribute id="product_attribute_78" id_product="Today_is_a_good_day_Framed_poster" reference="demo_7" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="50.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00" low_stock_threshold="0">
       <location/>
     </product_attribute>
-    <product_attribute id="product_attribute_79" id_product="Mountain_fox_cushion" reference="demo_15" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="0" weight="0.000000" unit_price_impact="0.000000" default_on="1" minimal_quantity="1" available_date="0000-00-00">
+    <product_attribute id="product_attribute_79" id_product="Mountain_fox_cushion" reference="demo_15" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="0" weight="0.000000" unit_price_impact="0.000000" default_on="1" minimal_quantity="1" available_date="0000-00-00" low_stock_threshold="0">
       <location/>
     </product_attribute>
-    <product_attribute id="product_attribute_80" id_product="Mountain_fox_cushion" reference="demo_15" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="0" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00">
+    <product_attribute id="product_attribute_80" id_product="Mountain_fox_cushion" reference="demo_15" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="0" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00" low_stock_threshold="0">
       <location/>
     </product_attribute>
-    <product_attribute id="product_attribute_81" id_product="Brown_bear_cushion" reference="demo_16" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="1" minimal_quantity="1" available_date="0000-00-00">
+    <product_attribute id="product_attribute_81" id_product="Brown_bear_cushion" reference="demo_16" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="1" minimal_quantity="1" available_date="0000-00-00" low_stock_threshold="0">
       <location/>
     </product_attribute>
-    <product_attribute id="product_attribute_82" id_product="Brown_bear_cushion" reference="demo_16" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00">
+    <product_attribute id="product_attribute_82" id_product="Brown_bear_cushion" reference="demo_16" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00" low_stock_threshold="0">
       <location/>
     </product_attribute>
-    <product_attribute id="product_attribute_83" id_product="Hummingbird_cushion" reference="demo_17" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="1" minimal_quantity="1" available_date="0000-00-00">
+    <product_attribute id="product_attribute_83" id_product="Hummingbird_cushion" reference="demo_17" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="1" minimal_quantity="1" available_date="0000-00-00" low_stock_threshold="0">
       <location/>
     </product_attribute>
-    <product_attribute id="product_attribute_84" id_product="Hummingbird_cushion" reference="demo_17" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00">
+    <product_attribute id="product_attribute_84" id_product="Hummingbird_cushion" reference="demo_17" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00" low_stock_threshold="0">
       <location/>
     </product_attribute>
-    <product_attribute id="product_attribute_85" id_product="Mountain_fox_notebook" reference="demo_8" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="1" minimal_quantity="1" available_date="0000-00-00">
+    <product_attribute id="product_attribute_85" id_product="Mountain_fox_notebook" reference="demo_8" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="1" minimal_quantity="1" available_date="0000-00-00" low_stock_threshold="0">
       <location/>
     </product_attribute>
-    <product_attribute id="product_attribute_86" id_product="Mountain_fox_notebook" reference="demo_8" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00">
+    <product_attribute id="product_attribute_86" id_product="Mountain_fox_notebook" reference="demo_8" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00" low_stock_threshold="0">
       <location/>
     </product_attribute>
-    <product_attribute id="product_attribute_87" id_product="Mountain_fox_notebook" reference="demo_8" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00">
+    <product_attribute id="product_attribute_87" id_product="Mountain_fox_notebook" reference="demo_8" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00" low_stock_threshold="0">
       <location/>
     </product_attribute>
-    <product_attribute id="product_attribute_88" id_product="Mountain_fox_notebook" reference="demo_8" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00">
+    <product_attribute id="product_attribute_88" id_product="Mountain_fox_notebook" reference="demo_8" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00" low_stock_threshold="0">
       <location/>
     </product_attribute>
-    <product_attribute id="product_attribute_89" id_product="Brown_bear_notebook" reference="demo_9" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="1" minimal_quantity="1" available_date="0000-00-00">
+    <product_attribute id="product_attribute_89" id_product="Brown_bear_notebook" reference="demo_9" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="1" minimal_quantity="1" available_date="0000-00-00" low_stock_threshold="0">
       <location/>
     </product_attribute>
-    <product_attribute id="product_attribute_90" id_product="Brown_bear_notebook" reference="demo_9" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00">
+    <product_attribute id="product_attribute_90" id_product="Brown_bear_notebook" reference="demo_9" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00" low_stock_threshold="0">
       <location/>
     </product_attribute>
-    <product_attribute id="product_attribute_91" id_product="Brown_bear_notebook" reference="demo_9" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00">
+    <product_attribute id="product_attribute_91" id_product="Brown_bear_notebook" reference="demo_9" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00" low_stock_threshold="0">
       <location/>
     </product_attribute>
-    <product_attribute id="product_attribute_92" id_product="Brown_bear_notebook" reference="demo_9" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00">
+    <product_attribute id="product_attribute_92" id_product="Brown_bear_notebook" reference="demo_9" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00" low_stock_threshold="0">
       <location/>
     </product_attribute>
-    <product_attribute id="product_attribute_93" id_product="Hummingbird_notebook" reference="demo_10" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="1" minimal_quantity="1" available_date="0000-00-00">
+    <product_attribute id="product_attribute_93" id_product="Hummingbird_notebook" reference="demo_10" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="1" minimal_quantity="1" available_date="0000-00-00" low_stock_threshold="0">
       <location/>
     </product_attribute>
-    <product_attribute id="product_attribute_94" id_product="Hummingbird_notebook" reference="demo_10" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00">
+    <product_attribute id="product_attribute_94" id_product="Hummingbird_notebook" reference="demo_10" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00" low_stock_threshold="0">
       <location/>
     </product_attribute>
-    <product_attribute id="product_attribute_95" id_product="Hummingbird_notebook" reference="demo_10" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00">
+    <product_attribute id="product_attribute_95" id_product="Hummingbird_notebook" reference="demo_10" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00" low_stock_threshold="0">
       <location/>
     </product_attribute>
-    <product_attribute id="product_attribute_96" id_product="Hummingbird_notebook" reference="demo_10" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00">
+    <product_attribute id="product_attribute_96" id_product="Hummingbird_notebook" reference="demo_10" supplier_reference="" ean13="" upc="" wholesale_price="0.000000" price="0.000000" ecotax="0.000000" quantity="300" weight="0.000000" unit_price_impact="0.000000" default_on="" minimal_quantity="1" available_date="0000-00-00" low_stock_threshold="0">
       <location/>
     </product_attribute>
   </entities>

From 29e0c03815d2a446e5f2091f3b319bde1b7ac1df Mon Sep 17 00:00:00 2001
From: Daniel Hlavacek <daniel.hlavacek@hotmail.cz>
Date: Sun, 30 Jul 2023 18:39:30 +0200
Subject: [PATCH 0670/1030] Update 1_bug_report.yml

---
 .github/ISSUE_TEMPLATE/1_bug_report.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/1_bug_report.yml b/.github/ISSUE_TEMPLATE/1_bug_report.yml
index 99edcb7f78fe5..bd3f791dab45c 100644
--- a/.github/ISSUE_TEMPLATE/1_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/1_bug_report.yml
@@ -10,7 +10,7 @@ body:
          - Follow [bug report guidelines](https://devdocs.prestashop-project.org/8/contribute/contribute-reporting-issues/#best-practices-for-writing-an-issue) to help maintainers qualify your report faster.
          - DO NOT report bugs with "error 500" or "white page" - this is a universal error and will tell us nothing. Enable debug mode in the Performance section of PrestaShop or manually in `/config/defines.inc.php` and try again. You should get a proper error message.
          - Use ENGLISH, reports in all other languages will be closed.
-         - If you report problem with upgrade process, open `/admin/autoupgrade/tmp` and attach `log.txt` to the issue. It contains all the information about the upgrade process.
+         - If you report problem with upgrade process, open `/admin/autoupgrade/tmp` and attach anonymized `log.txt` to the issue. It contains all the information about the upgrade process.
   - type: checkboxes
     attributes:
       label: Prerequisites

From 4cf09eba153da72d1816d6b53e797cf1ce853e2d Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Sun, 30 Jul 2023 21:04:00 +0200
Subject: [PATCH 0671/1030] Check if external carrier module exists

---
 src/Adapter/Order/QueryHandler/GetOrderForViewingHandler.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Adapter/Order/QueryHandler/GetOrderForViewingHandler.php b/src/Adapter/Order/QueryHandler/GetOrderForViewingHandler.php
index 7ccce7243b32a..ddf697161400d 100644
--- a/src/Adapter/Order/QueryHandler/GetOrderForViewingHandler.php
+++ b/src/Adapter/Order/QueryHandler/GetOrderForViewingHandler.php
@@ -533,7 +533,8 @@ private function getOrderShipping(Order $order): OrderShippingForViewing
 
         if ($carrier->is_module) {
             $module = Module::getInstanceByName($carrier->external_module_name);
-            if (method_exists($module, 'displayInfoByCart')) {
+            // We need to check if this module is still installed and if it implements the method
+            if (Validate::isLoadedObject($module) && method_exists($module, 'displayInfoByCart')) {
                 $carrierModuleInfo = $module->displayInfoByCart($order->id_cart);
             }
         }

From 73f552d1406717b1b7afa22f36f63d8ece90a299 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 31 Jul 2023 04:35:18 +0000
Subject: [PATCH 0672/1030] Bump eslint from 8.45.0 to 8.46.0 in /tests/UI

Bumps [eslint](https://github.com/eslint/eslint) from 8.45.0 to 8.46.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.45.0...v8.46.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 234 ++++++++++---------------------------
 tests/UI/package.json      |   2 +-
 2 files changed, 65 insertions(+), 171 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index a92bfdf8c3bd1..945f287d9ba00 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -34,7 +34,7 @@
         "@typescript-eslint/eslint-plugin": "^5.62.0",
         "@typescript-eslint/parser": "^5.62.0",
         "babel-eslint": "^10.1.0",
-        "eslint": "^8.45.0",
+        "eslint": "^8.46.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-deprecation": "^1.4.1",
         "eslint-plugin-html": "^7.1.0",
@@ -238,18 +238,18 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.4.0.tgz",
-      "integrity": "sha512-A9983Q0LnDGdLPjxyXQ00sbV+K+O+ko2Dr+CZigbHWtX9pNfxlaBkMR8X1CztI73zuEyEBXTVjx7CE+/VSwDiQ==",
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.2.tgz",
+      "integrity": "sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==",
       "dev": true,
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.0.tgz",
-      "integrity": "sha512-Lj7DECXqIVCqnqjjHMPna4vn6GJcMgul/wuS0je9OZ9gsL0zzDpKPVtcG1HaDVc+9y+qgXneTeUMbCqXJNpH1A==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.1.tgz",
+      "integrity": "sha512-9t7ZA7NGGK8ckelF0PQCfcxIUzs1Md5rrO6U/c+FIQNanea5UZC0wqKXH4vHBccmu4ZJgZ2idtPeW7+Q2npOEA==",
       "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
@@ -284,22 +284,10 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/@eslint/js": {
-      "version": "8.44.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.44.0.tgz",
-      "integrity": "sha512-Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw==",
+      "version": "8.46.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.46.0.tgz",
+      "integrity": "sha512-a8TLtmPi8xzPkCbp/OGFUo5yhRkHM2Ko9kOWP4znJr0WAhWyThaw3PnwX4vOTWOAMsV2uRt32PPDcEz63esSaA==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -334,18 +322,6 @@
         "node": ">=10.10.0"
       }
     },
-    "node_modules/@humanwhocodes/config-array/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/@humanwhocodes/module-importer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
@@ -1208,7 +1184,6 @@
       "version": "8.10.0",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
       "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
-      "dev": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -3287,27 +3262,27 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.45.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.45.0.tgz",
-      "integrity": "sha512-pd8KSxiQpdYRfYa9Wufvdoct3ZPQQuVuU5O6scNgMuOMYuxvH0IGaYK0wUFjo4UYYQQCUndlXiMbnxopwvvTiw==",
+      "version": "8.46.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.46.0.tgz",
+      "integrity": "sha512-cIO74PvbW0qU8e0mIvk5IV3ToWdCq5FYG6gWPHHkx6gNdjlbAYvtfHmlCMXxjcoVaIdwy/IAt3+mDkZkfvb2Dg==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.4.0",
-        "@eslint/eslintrc": "^2.1.0",
-        "@eslint/js": "8.44.0",
+        "@eslint-community/regexpp": "^4.6.1",
+        "@eslint/eslintrc": "^2.1.1",
+        "@eslint/js": "^8.46.0",
         "@humanwhocodes/config-array": "^0.11.10",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
-        "ajv": "^6.10.0",
+        "ajv": "^6.12.4",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
         "debug": "^4.3.2",
         "doctrine": "^3.0.0",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.2.0",
-        "eslint-visitor-keys": "^3.4.1",
-        "espree": "^9.6.0",
+        "eslint-scope": "^7.2.2",
+        "eslint-visitor-keys": "^3.4.2",
+        "espree": "^9.6.1",
         "esquery": "^1.4.2",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
@@ -3530,18 +3505,6 @@
         "json5": "lib/cli.js"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/eslint-plugin-import/node_modules/semver": {
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -3564,9 +3527,9 @@
       }
     },
     "node_modules/eslint-scope": {
-      "version": "7.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.1.tgz",
-      "integrity": "sha512-CvefSOsDdaYYvxChovdrPo/ZGt8d5lrJWleAc1diXRKhHGiTYEI26cvo8Kle/wGnsizoCJjK73FMg1/IkIwiNA==",
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
       "dev": true,
       "dependencies": {
         "esrecurse": "^4.3.0",
@@ -3659,9 +3622,9 @@
       }
     },
     "node_modules/eslint/node_modules/eslint-visitor-keys": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
-      "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
+      "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -3719,18 +3682,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/eslint/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/eslint/node_modules/optionator": {
       "version": "0.9.3",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
@@ -3799,9 +3750,9 @@
       }
     },
     "node_modules/espree/node_modules/eslint-visitor-keys": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
-      "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
+      "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -5299,17 +5250,6 @@
         }
       }
     },
-    "node_modules/jsdom/node_modules/acorn": {
-      "version": "8.8.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
-      "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==",
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
@@ -5791,9 +5731,9 @@
       }
     },
     "node_modules/minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -9227,15 +9167,15 @@
       }
     },
     "@eslint-community/regexpp": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.4.0.tgz",
-      "integrity": "sha512-A9983Q0LnDGdLPjxyXQ00sbV+K+O+ko2Dr+CZigbHWtX9pNfxlaBkMR8X1CztI73zuEyEBXTVjx7CE+/VSwDiQ==",
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.2.tgz",
+      "integrity": "sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==",
       "dev": true
     },
     "@eslint/eslintrc": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.0.tgz",
-      "integrity": "sha512-Lj7DECXqIVCqnqjjHMPna4vn6GJcMgul/wuS0je9OZ9gsL0zzDpKPVtcG1HaDVc+9y+qgXneTeUMbCqXJNpH1A==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.1.tgz",
+      "integrity": "sha512-9t7ZA7NGGK8ckelF0PQCfcxIUzs1Md5rrO6U/c+FIQNanea5UZC0wqKXH4vHBccmu4ZJgZ2idtPeW7+Q2npOEA==",
       "dev": true,
       "requires": {
         "ajv": "^6.12.4",
@@ -9257,22 +9197,13 @@
           "requires": {
             "type-fest": "^0.20.2"
           }
-        },
-        "minimatch": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-          "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-          "dev": true,
-          "requires": {
-            "brace-expansion": "^1.1.7"
-          }
         }
       }
     },
     "@eslint/js": {
-      "version": "8.44.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.44.0.tgz",
-      "integrity": "sha512-Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw==",
+      "version": "8.46.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.46.0.tgz",
+      "integrity": "sha512-a8TLtmPi8xzPkCbp/OGFUo5yhRkHM2Ko9kOWP4znJr0WAhWyThaw3PnwX4vOTWOAMsV2uRt32PPDcEz63esSaA==",
       "dev": true
     },
     "@faker-js/faker": {
@@ -9289,17 +9220,6 @@
         "@humanwhocodes/object-schema": "^1.2.1",
         "debug": "^4.1.1",
         "minimatch": "^3.0.5"
-      },
-      "dependencies": {
-        "minimatch": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-          "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-          "dev": true,
-          "requires": {
-            "brace-expansion": "^1.1.7"
-          }
-        }
       }
     },
     "@humanwhocodes/module-importer": {
@@ -9868,8 +9788,7 @@
     "acorn": {
       "version": "8.10.0",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
-      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
-      "dev": true
+      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw=="
     },
     "acorn-globals": {
       "version": "6.0.0",
@@ -11440,27 +11359,27 @@
       }
     },
     "eslint": {
-      "version": "8.45.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.45.0.tgz",
-      "integrity": "sha512-pd8KSxiQpdYRfYa9Wufvdoct3ZPQQuVuU5O6scNgMuOMYuxvH0IGaYK0wUFjo4UYYQQCUndlXiMbnxopwvvTiw==",
+      "version": "8.46.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.46.0.tgz",
+      "integrity": "sha512-cIO74PvbW0qU8e0mIvk5IV3ToWdCq5FYG6gWPHHkx6gNdjlbAYvtfHmlCMXxjcoVaIdwy/IAt3+mDkZkfvb2Dg==",
       "dev": true,
       "requires": {
         "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.4.0",
-        "@eslint/eslintrc": "^2.1.0",
-        "@eslint/js": "8.44.0",
+        "@eslint-community/regexpp": "^4.6.1",
+        "@eslint/eslintrc": "^2.1.1",
+        "@eslint/js": "^8.46.0",
         "@humanwhocodes/config-array": "^0.11.10",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
-        "ajv": "^6.10.0",
+        "ajv": "^6.12.4",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
         "debug": "^4.3.2",
         "doctrine": "^3.0.0",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.2.0",
-        "eslint-visitor-keys": "^3.4.1",
-        "espree": "^9.6.0",
+        "eslint-scope": "^7.2.2",
+        "eslint-visitor-keys": "^3.4.2",
+        "espree": "^9.6.1",
         "esquery": "^1.4.2",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
@@ -11525,9 +11444,9 @@
           "dev": true
         },
         "eslint-visitor-keys": {
-          "version": "3.4.1",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
-          "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
+          "version": "3.4.2",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
+          "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==",
           "dev": true
         },
         "glob-parent": {
@@ -11564,15 +11483,6 @@
             "type-check": "~0.4.0"
           }
         },
-        "minimatch": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-          "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-          "dev": true,
-          "requires": {
-            "brace-expansion": "^1.1.7"
-          }
-        },
         "optionator": {
           "version": "0.9.3",
           "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
@@ -11771,15 +11681,6 @@
             "minimist": "^1.2.0"
           }
         },
-        "minimatch": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-          "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-          "dev": true,
-          "requires": {
-            "brace-expansion": "^1.1.7"
-          }
-        },
         "semver": {
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -11801,9 +11702,9 @@
       }
     },
     "eslint-scope": {
-      "version": "7.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.1.tgz",
-      "integrity": "sha512-CvefSOsDdaYYvxChovdrPo/ZGt8d5lrJWleAc1diXRKhHGiTYEI26cvo8Kle/wGnsizoCJjK73FMg1/IkIwiNA==",
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
       "dev": true,
       "requires": {
         "esrecurse": "^4.3.0",
@@ -11836,9 +11737,9 @@
       },
       "dependencies": {
         "eslint-visitor-keys": {
-          "version": "3.4.1",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
-          "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
+          "version": "3.4.2",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
+          "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==",
           "dev": true
         }
       }
@@ -12922,13 +12823,6 @@
         "whatwg-url": "^10.0.0",
         "ws": "^8.2.3",
         "xml-name-validator": "^4.0.0"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "8.8.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
-          "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w=="
-        }
       }
     },
     "jsesc": {
@@ -13300,9 +13194,9 @@
       "optional": true
     },
     "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "requires": {
         "brace-expansion": "^1.1.7"
       }
diff --git a/tests/UI/package.json b/tests/UI/package.json
index f61295df8611a..88e44a3c0e7ac 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -127,7 +127,7 @@
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
     "babel-eslint": "^10.1.0",
-    "eslint": "^8.45.0",
+    "eslint": "^8.46.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-deprecation": "^1.4.1",
     "eslint-plugin-html": "^7.1.0",

From 214ff339cbcda53db21d3b374b06cb4993984fc1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 31 Jul 2023 04:35:43 +0000
Subject: [PATCH 0673/1030] Bump eslint-plugin-import from 2.27.5 to 2.28.0 in
 /tests/UI

Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.27.5 to 2.28.0.
- [Release notes](https://github.com/import-js/eslint-plugin-import/releases)
- [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md)
- [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.27.5...v2.28.0)

---
updated-dependencies:
- dependency-name: eslint-plugin-import
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 8910 +++++++++++++++---------------------
 tests/UI/package.json      |    2 +-
 2 files changed, 3644 insertions(+), 5268 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index a92bfdf8c3bd1..0a3945f37a8cb 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -38,7 +38,7 @@
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-deprecation": "^1.4.1",
         "eslint-plugin-html": "^7.1.0",
-        "eslint-plugin-import": "^2.27.5",
+        "eslint-plugin-import": "^2.28.0",
         "jsdoc-to-markdown": "^8.0.0",
         "mochawesome-merge": "^4.3.0",
         "ts-mocha": "^10.0.0",
@@ -1379,6 +1379,19 @@
         "node": ">=12.17"
       }
     },
+    "node_modules/array-buffer-byte-length": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
+      "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "is-array-buffer": "^3.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/array-flatten": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
@@ -1403,14 +1416,26 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array-includes/node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+    "node_modules/array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/array.prototype.findlastindex": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.2.tgz",
+      "integrity": "sha512-tb5thFFlUcp7NdNF6/MpDk/1r/4awWG1FIz3YqDf+/zJSTezBb+/5WViH41obXULHVpDzoiCLpJ/ZO9YbJMsdw==",
       "dev": true,
       "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0",
+        "get-intrinsic": "^1.1.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -1419,45 +1444,16 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array-includes/node_modules/es-abstract": {
-      "version": "1.21.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.1.tgz",
-      "integrity": "sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==",
+    "node_modules/array.prototype.flat": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
+      "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
       "dev": true,
       "dependencies": {
-        "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
-        "es-set-tostringtag": "^2.0.1",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.3",
-        "get-symbol-description": "^1.0.0",
-        "globalthis": "^1.0.3",
-        "gopd": "^1.0.1",
-        "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.4",
-        "is-array-buffer": "^3.0.1",
-        "is-callable": "^1.2.7",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.10",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.2",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.4.3",
-        "safe-regex-test": "^1.0.0",
-        "string.prototype.trimend": "^1.0.6",
-        "string.prototype.trimstart": "^1.0.6",
-        "typed-array-length": "^1.0.4",
-        "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.9"
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -1466,34 +1462,17 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array-includes/node_modules/get-intrinsic": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
+    "node_modules/array.prototype.flatmap": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
+      "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
       "dev": true,
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.3"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
       "engines": {
         "node": ">= 0.4"
       },
@@ -1501,25 +1480,19 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array-includes/node_modules/internal-slot": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz",
-      "integrity": "sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==",
+    "node_modules/arraybuffer.prototype.slice": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz",
+      "integrity": "sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==",
       "dev": true,
       "dependencies": {
-        "get-intrinsic": "^1.1.3",
-        "has": "^1.0.3",
-        "side-channel": "^1.0.4"
+        "array-buffer-byte-length": "^1.0.0",
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "get-intrinsic": "^1.2.1",
+        "is-array-buffer": "^3.0.2",
+        "is-shared-array-buffer": "^1.0.2"
       },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/array-includes/node_modules/is-callable": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
-      "dev": true,
       "engines": {
         "node": ">= 0.4"
       },
@@ -1527,38 +1500,38 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array-includes/node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+    "node_modules/arrify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+      "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==",
       "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/array-includes/node_modules/object-inspect": {
-      "version": "1.12.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+    "node_modules/assertion-error": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
+      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
+      "engines": {
+        "node": "*"
       }
     },
-    "node_modules/array-includes/node_modules/object.assign": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+    "node_modules/async": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
+      "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="
+    },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
+    },
+    "node_modules/available-typed-arrays": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
+      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
       "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "has-symbols": "^1.0.3",
-        "object-keys": "^1.1.1"
-      },
       "engines": {
         "node": ">= 0.4"
       },
@@ -1566,642 +1539,513 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array-includes/node_modules/string.prototype.trimend": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
-      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
-      "dev": true,
+    "node_modules/axios": {
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
+      "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "follow-redirects": "^1.14.9",
+        "form-data": "^4.0.0"
       }
     },
-    "node_modules/array-includes/node_modules/string.prototype.trimstart": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
-      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
+    "node_modules/babel-eslint": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.1.0.tgz",
+      "integrity": "sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==",
+      "deprecated": "babel-eslint is now @babel/eslint-parser. This package will no longer receive updates.",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "@babel/code-frame": "^7.0.0",
+        "@babel/parser": "^7.7.0",
+        "@babel/traverse": "^7.7.0",
+        "@babel/types": "^7.7.0",
+        "eslint-visitor-keys": "^1.0.0",
+        "resolve": "^1.12.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">=6"
+      },
+      "peerDependencies": {
+        "eslint": ">= 4.12.1"
       }
     },
-    "node_modules/array-includes/node_modules/unbox-primitive": {
+    "node_modules/balanced-match": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
     },
-    "node_modules/array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "dev": true,
+    "node_modules/base32.js": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/base32.js/-/base32.js-0.1.0.tgz",
+      "integrity": "sha512-n3TkB02ixgBOhTvANakDb4xaMXnYUVkNoRFJjQflcqMQhyEKxEHdj3E6N8t8sUQ0mjH/3/JxzlXuz3ul/J90pQ==",
       "engines": {
-        "node": ">=8"
+        "node": ">=0.12.0"
       }
     },
-    "node_modules/array.prototype.flat": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
-      "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "es-shim-unscopables": "^1.0.0"
-      },
+    "node_modules/base64id": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz",
+      "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==",
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": "^4.5.0 || >= 5.9"
       }
     },
-    "node_modules/array.prototype.flat/node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-      "dev": true,
-      "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
+    "node_modules/binary-extensions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=8"
       }
     },
-    "node_modules/array.prototype.flat/node_modules/es-abstract": {
-      "version": "1.21.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.1.tgz",
-      "integrity": "sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==",
-      "dev": true,
-      "dependencies": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "es-set-tostringtag": "^2.0.1",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.3",
-        "get-symbol-description": "^1.0.0",
-        "globalthis": "^1.0.3",
-        "gopd": "^1.0.1",
-        "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.4",
-        "is-array-buffer": "^3.0.1",
-        "is-callable": "^1.2.7",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.10",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.2",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.4.3",
-        "safe-regex-test": "^1.0.0",
-        "string.prototype.trimend": "^1.0.6",
-        "string.prototype.trimstart": "^1.0.6",
-        "typed-array-length": "^1.0.4",
-        "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.9"
+    "node_modules/bluebird": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+      "dev": true
+    },
+    "node_modules/body-parser": {
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+      "dependencies": {
+        "bytes": "3.1.2",
+        "content-type": "~1.0.4",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "on-finished": "2.4.1",
+        "qs": "6.11.0",
+        "raw-body": "2.5.1",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
       }
     },
-    "node_modules/array.prototype.flat/node_modules/get-intrinsic": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-      "dev": true,
+    "node_modules/body-parser/node_modules/bytes": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/body-parser/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "ms": "2.0.0"
       }
     },
-    "node_modules/array.prototype.flat/node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+    "node_modules/body-parser/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
       }
     },
-    "node_modules/array.prototype.flat/node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
+    "node_modules/braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dependencies": {
+        "fill-range": "^7.0.1"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/array.prototype.flat/node_modules/internal-slot": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz",
-      "integrity": "sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==",
+    "node_modules/browser-process-hrtime": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
+      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="
+    },
+    "node_modules/browser-stdout": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
+      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw=="
+    },
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true
+    },
+    "node_modules/bytes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+      "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/cache-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/cache-point/-/cache-point-2.0.0.tgz",
+      "integrity": "sha512-4gkeHlFpSKgm3vm2gJN5sPqfmijYRFYCQ6tv5cLw0xVmT6r1z1vd4FNnpuOREco3cBs1G709sZ72LdgddKvL5w==",
       "dev": true,
       "dependencies": {
-        "get-intrinsic": "^1.1.3",
-        "has": "^1.0.3",
-        "side-channel": "^1.0.4"
+        "array-back": "^4.0.1",
+        "fs-then-native": "^2.0.0",
+        "mkdirp2": "^1.0.4"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=8"
       }
     },
-    "node_modules/array.prototype.flat/node_modules/is-callable": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+    "node_modules/cache-point/node_modules/array-back": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/array-back/-/array-back-4.0.2.tgz",
+      "integrity": "sha512-NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg==",
       "dev": true,
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=8"
       }
     },
-    "node_modules/array.prototype.flat/node_modules/is-shared-array-buffer": {
+    "node_modules/call-bind": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-      "dev": true,
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
       "dependencies": {
-        "call-bind": "^1.0.2"
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array.prototype.flat/node_modules/object-inspect": {
-      "version": "1.12.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
       "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">=6"
       }
     },
-    "node_modules/array.prototype.flat/node_modules/object.assign": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+    "node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
       "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "has-symbols": "^1.0.3",
-        "object-keys": "^1.1.1"
-      },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=6"
       }
     },
-    "node_modules/array.prototype.flat/node_modules/string.prototype.trimend": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
-      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+    "node_modules/camelize-ts": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/camelize-ts/-/camelize-ts-2.5.0.tgz",
+      "integrity": "sha512-ERaOJadw+ID9MuKGeTOF1kQOb/zZIv6Vkt44kFYZraiAFiZU6E3TwnJebp8jofsW/hDxME/U63lFdNKIkSqijw==",
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       }
     },
-    "node_modules/array.prototype.flat/node_modules/string.prototype.trimstart": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
-      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
-      "dev": true,
+    "node_modules/canvas": {
+      "version": "2.11.2",
+      "resolved": "https://registry.npmjs.org/canvas/-/canvas-2.11.2.tgz",
+      "integrity": "sha512-ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw==",
+      "hasInstallScript": true,
+      "optional": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "@mapbox/node-pre-gyp": "^1.0.0",
+        "nan": "^2.17.0",
+        "simple-get": "^3.0.3"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">=6"
       }
     },
-    "node_modules/array.prototype.flat/node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+    "node_modules/catharsis": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.9.0.tgz",
+      "integrity": "sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
+        "lodash": "^4.17.15"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">= 10"
       }
     },
-    "node_modules/array.prototype.flatmap": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
-      "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "es-shim-unscopables": "^1.0.0"
+    "node_modules/chai": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.7.tgz",
+      "integrity": "sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==",
+      "dependencies": {
+        "assertion-error": "^1.1.0",
+        "check-error": "^1.0.2",
+        "deep-eql": "^4.1.2",
+        "get-func-name": "^2.0.0",
+        "loupe": "^2.3.1",
+        "pathval": "^1.1.1",
+        "type-detect": "^4.0.5"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=4"
       }
     },
-    "node_modules/array.prototype.flatmap/node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+    "node_modules/chai-string": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/chai-string/-/chai-string-1.5.0.tgz",
+      "integrity": "sha512-sydDC3S3pNAQMYwJrs6dQX0oBQ6KfIPuOZ78n7rocW0eJJlsHPh2t3kwW7xfwYA/1Bf6/arGtSUo16rxR2JFlw==",
+      "peerDependencies": {
+        "chai": "^4.1.2"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
       "dev": true,
       "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=4"
       }
     },
-    "node_modules/array.prototype.flatmap/node_modules/es-abstract": {
-      "version": "1.21.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.1.tgz",
-      "integrity": "sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==",
-      "dev": true,
+    "node_modules/check-error": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
+      "integrity": "sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/chokidar": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ],
       "dependencies": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "es-set-tostringtag": "^2.0.1",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.3",
-        "get-symbol-description": "^1.0.0",
-        "globalthis": "^1.0.3",
-        "gopd": "^1.0.1",
-        "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.4",
-        "is-array-buffer": "^3.0.1",
-        "is-callable": "^1.2.7",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.10",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.2",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.4.3",
-        "safe-regex-test": "^1.0.0",
-        "string.prototype.trimend": "^1.0.6",
-        "string.prototype.trimstart": "^1.0.6",
-        "typed-array-length": "^1.0.4",
-        "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.9"
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">= 8.10.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
       }
     },
-    "node_modules/array.prototype.flatmap/node_modules/get-intrinsic": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
+    "node_modules/chownr": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+      "optional": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cliui": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
+      }
+    },
+    "node_modules/collect-all": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/collect-all/-/collect-all-1.0.4.tgz",
+      "integrity": "sha512-RKZhRwJtJEP5FWul+gkSMEnaK6H3AGPTTWOiRimCcs+rc/OmQE3Yhy1Q7A7KsdkG3ZXVdZq68Y6ONSdvkeEcKA==",
       "dev": true,
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.3"
+        "stream-connect": "^1.0.2",
+        "stream-via": "^1.0.4"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/array.prototype.flatmap/node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+    "node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "dependencies": {
+        "color-name": "1.1.3"
       }
     },
-    "node_modules/array.prototype.flatmap/node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+    "node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/color-support": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
+      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
+      "optional": true,
+      "bin": {
+        "color-support": "bin.js"
       }
     },
-    "node_modules/array.prototype.flatmap/node_modules/internal-slot": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz",
-      "integrity": "sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==",
-      "dev": true,
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
       "dependencies": {
-        "get-intrinsic": "^1.1.3",
-        "has": "^1.0.3",
-        "side-channel": "^1.0.4"
+        "delayed-stream": "~1.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/array.prototype.flatmap/node_modules/is-callable": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+    "node_modules/command-line-args": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/command-line-args/-/command-line-args-5.2.1.tgz",
+      "integrity": "sha512-H4UfQhZyakIjC74I9d34fGYDwk3XpSr17QhEd0Q3I9Xq1CETHo4Hcuo87WyWHpAF1aSLjLRf5lD9ZGX2qStUvg==",
       "dev": true,
-      "engines": {
-        "node": ">= 0.4"
+      "dependencies": {
+        "array-back": "^3.1.0",
+        "find-replace": "^3.0.0",
+        "lodash.camelcase": "^4.3.0",
+        "typical": "^4.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">=4.0.0"
       }
     },
-    "node_modules/array.prototype.flatmap/node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+    "node_modules/command-line-args/node_modules/array-back": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz",
+      "integrity": "sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==",
       "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">=6"
       }
     },
-    "node_modules/array.prototype.flatmap/node_modules/object-inspect": {
-      "version": "1.12.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
+    "node_modules/command-line-args/node_modules/typical": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/typical/-/typical-4.0.0.tgz",
+      "integrity": "sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw==",
       "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/array.prototype.flatmap/node_modules/object.assign": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+    "node_modules/command-line-tool": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/command-line-tool/-/command-line-tool-0.8.0.tgz",
+      "integrity": "sha512-Xw18HVx/QzQV3Sc5k1vy3kgtOeGmsKIqwtFFoyjI4bbcpSgnw2CWVULvtakyw4s6fhyAdI6soQQhXc2OzJy62g==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "has-symbols": "^1.0.3",
-        "object-keys": "^1.1.1"
+        "ansi-escape-sequences": "^4.0.0",
+        "array-back": "^2.0.0",
+        "command-line-args": "^5.0.0",
+        "command-line-usage": "^4.1.0",
+        "typical": "^2.6.1"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=4.0.0"
       }
     },
-    "node_modules/array.prototype.flatmap/node_modules/string.prototype.trimend": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
-      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
+    "node_modules/command-line-tool/node_modules/array-back": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/array-back/-/array-back-2.0.0.tgz",
+      "integrity": "sha512-eJv4pLLufP3g5kcZry0j6WXpIbzYw9GUB4mVJZno9wfwiBxbizTnHCw3VJb07cBihbFX48Y7oSrW9y+gt4glyw==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "typical": "^2.6.1"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">=4"
       }
     },
-    "node_modules/array.prototype.flatmap/node_modules/string.prototype.trimstart": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
-      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
+    "node_modules/command-line-usage": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/command-line-usage/-/command-line-usage-4.1.0.tgz",
+      "integrity": "sha512-MxS8Ad995KpdAC0Jopo/ovGIroV/m0KHwzKfXxKag6FHOkGsH8/lv5yjgablcRxCJJC0oJeUMuO/gmaq+Wq46g==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "ansi-escape-sequences": "^4.0.0",
+        "array-back": "^2.0.0",
+        "table-layout": "^0.4.2",
+        "typical": "^2.6.1"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">=4.0.0"
       }
     },
-    "node_modules/array.prototype.flatmap/node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+    "node_modules/command-line-usage/node_modules/array-back": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/array-back/-/array-back-2.0.0.tgz",
+      "integrity": "sha512-eJv4pLLufP3g5kcZry0j6WXpIbzYw9GUB4mVJZno9wfwiBxbizTnHCw3VJb07cBihbFX48Y7oSrW9y+gt4glyw==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
+        "typical": "^2.6.1"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/arrify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-      "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/assertion-error": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
-      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
       "engines": {
-        "node": "*"
+        "node": ">=4"
       }
     },
-    "node_modules/async": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
-      "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="
-    },
-    "node_modules/asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
-    },
-    "node_modules/available-typed-arrays": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
-      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
+    "node_modules/common-sequence": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/common-sequence/-/common-sequence-2.0.2.tgz",
+      "integrity": "sha512-jAg09gkdkrDO9EWTdXfv80WWH3yeZl5oT69fGfedBNS9pXUKYInVJ1bJ+/ht2+Moeei48TmSbQDYMc8EOx9G0g==",
       "dev": true,
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/axios": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
-      "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
-      "dependencies": {
-        "follow-redirects": "^1.14.9",
-        "form-data": "^4.0.0"
+        "node": ">=8"
       }
     },
-    "node_modules/babel-eslint": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.1.0.tgz",
-      "integrity": "sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==",
-      "deprecated": "babel-eslint is now @babel/eslint-parser. This package will no longer receive updates.",
-      "dev": true,
+    "node_modules/compressible": {
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
+      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
       "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/parser": "^7.7.0",
-        "@babel/traverse": "^7.7.0",
-        "@babel/types": "^7.7.0",
-        "eslint-visitor-keys": "^1.0.0",
-        "resolve": "^1.12.0"
-      },
-      "engines": {
-        "node": ">=6"
+        "mime-db": ">= 1.43.0 < 2"
       },
-      "peerDependencies": {
-        "eslint": ">= 4.12.1"
-      }
-    },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
-    },
-    "node_modules/base32.js": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/base32.js/-/base32.js-0.1.0.tgz",
-      "integrity": "sha512-n3TkB02ixgBOhTvANakDb4xaMXnYUVkNoRFJjQflcqMQhyEKxEHdj3E6N8t8sUQ0mjH/3/JxzlXuz3ul/J90pQ==",
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/base64id": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz",
-      "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==",
-      "engines": {
-        "node": "^4.5.0 || >= 5.9"
-      }
-    },
-    "node_modules/binary-extensions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/bluebird": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
-      "dev": true
-    },
-    "node_modules/body-parser": {
-      "version": "1.20.1",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
-      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+    "node_modules/compression": {
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
+      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
       "dependencies": {
-        "bytes": "3.1.2",
-        "content-type": "~1.0.4",
+        "accepts": "~1.3.5",
+        "bytes": "3.0.0",
+        "compressible": "~2.0.16",
         "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "on-finished": "2.4.1",
-        "qs": "6.11.0",
-        "raw-body": "2.5.1",
-        "type-is": "~1.6.18",
-        "unpipe": "1.0.0"
+        "on-headers": "~1.0.2",
+        "safe-buffer": "5.1.2",
+        "vary": "~1.1.2"
       },
       "engines": {
-        "node": ">= 0.8",
-        "npm": "1.2.8000 || >= 1.4.16"
-      }
-    },
-    "node_modules/body-parser/node_modules/bytes": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-      "engines": {
-        "node": ">= 0.8"
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/body-parser/node_modules/debug": {
+    "node_modules/compression/node_modules/debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
@@ -2209,1377 +2053,1219 @@
         "ms": "2.0.0"
       }
     },
-    "node_modules/body-parser/node_modules/ms": {
+    "node_modules/compression/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
-    "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+    },
+    "node_modules/config-master": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/config-master/-/config-master-3.1.0.tgz",
+      "integrity": "sha1-ZnZjWQUFooO/JqSE1oSJ10xUhdo=",
+      "dev": true,
       "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+        "walk-back": "^2.0.1"
       }
     },
-    "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dependencies": {
-        "fill-range": "^7.0.1"
-      },
+    "node_modules/config-master/node_modules/walk-back": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/walk-back/-/walk-back-2.0.1.tgz",
+      "integrity": "sha1-VU4qnYdPrEeoywBr9EwvDEmYoKQ=",
+      "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/browser-process-hrtime": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
-      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="
-    },
-    "node_modules/browser-stdout": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
-      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw=="
-    },
-    "node_modules/buffer-from": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+    "node_modules/confusing-browser-globals": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
+      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
       "dev": true
     },
-    "node_modules/bytes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
-      "engines": {
-        "node": ">= 0.8"
-      }
+    "node_modules/console-control-strings": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
+      "optional": true
     },
-    "node_modules/cache-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/cache-point/-/cache-point-2.0.0.tgz",
-      "integrity": "sha512-4gkeHlFpSKgm3vm2gJN5sPqfmijYRFYCQ6tv5cLw0xVmT6r1z1vd4FNnpuOREco3cBs1G709sZ72LdgddKvL5w==",
-      "dev": true,
+    "node_modules/content-disposition": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
       "dependencies": {
-        "array-back": "^4.0.1",
-        "fs-then-native": "^2.0.0",
-        "mkdirp2": "^1.0.4"
+        "safe-buffer": "5.2.1"
       },
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cache-point/node_modules/array-back": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/array-back/-/array-back-4.0.2.tgz",
-      "integrity": "sha512-NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+    "node_modules/content-disposition/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
     },
-    "node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true,
+    "node_modules/content-type": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
       "engines": {
-        "node": ">=6"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "dev": true,
+    "node_modules/cookie": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
       "engines": {
-        "node": ">=6"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/camelize-ts": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/camelize-ts/-/camelize-ts-2.5.0.tgz",
-      "integrity": "sha512-ERaOJadw+ID9MuKGeTOF1kQOb/zZIv6Vkt44kFYZraiAFiZU6E3TwnJebp8jofsW/hDxME/U63lFdNKIkSqijw==",
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      }
+    "node_modules/cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
     },
-    "node_modules/canvas": {
-      "version": "2.11.2",
-      "resolved": "https://registry.npmjs.org/canvas/-/canvas-2.11.2.tgz",
-      "integrity": "sha512-ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw==",
-      "hasInstallScript": true,
-      "optional": true,
+    "node_modules/cors": {
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
+      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
       "dependencies": {
-        "@mapbox/node-pre-gyp": "^1.0.0",
-        "nan": "^2.17.0",
-        "simple-get": "^3.0.3"
+        "object-assign": "^4",
+        "vary": "^1"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">= 0.10"
       }
     },
-    "node_modules/catharsis": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.9.0.tgz",
-      "integrity": "sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A==",
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
       "dev": true,
       "dependencies": {
-        "lodash": "^4.17.15"
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
       },
       "engines": {
-        "node": ">= 10"
+        "node": ">= 8"
       }
     },
-    "node_modules/chai": {
-      "version": "4.3.7",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.7.tgz",
-      "integrity": "sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==",
+    "node_modules/cssom": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz",
+      "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw=="
+    },
+    "node_modules/cssstyle": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
+      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
       "dependencies": {
-        "assertion-error": "^1.1.0",
-        "check-error": "^1.0.2",
-        "deep-eql": "^4.1.2",
-        "get-func-name": "^2.0.0",
-        "loupe": "^2.3.1",
-        "pathval": "^1.1.1",
-        "type-detect": "^4.0.5"
+        "cssom": "~0.3.6"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
-    "node_modules/chai-string": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/chai-string/-/chai-string-1.5.0.tgz",
-      "integrity": "sha512-sydDC3S3pNAQMYwJrs6dQX0oBQ6KfIPuOZ78n7rocW0eJJlsHPh2t3kwW7xfwYA/1Bf6/arGtSUo16rxR2JFlw==",
-      "peerDependencies": {
-        "chai": "^4.1.2"
+    "node_modules/cssstyle/node_modules/cssom": {
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="
+    },
+    "node_modules/csv-writer": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/csv-writer/-/csv-writer-1.6.0.tgz",
+      "integrity": "sha512-NOx7YDFWEsM/fTRAJjRpPp8t+MKRVvniAg9wQlUKx20MFrPs73WLJhFf5iteqrxNYnsy924K3Iroh3yNHeYd2g=="
+    },
+    "node_modules/data-urls": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz",
+      "integrity": "sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==",
+      "dependencies": {
+        "abab": "^2.0.6",
+        "whatwg-mimetype": "^3.0.0",
+        "whatwg-url": "^11.0.0"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
+    "node_modules/data-urls/node_modules/whatwg-url": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz",
+      "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==",
       "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "tr46": "^3.0.0",
+        "webidl-conversions": "^7.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=12"
       }
     },
-    "node_modules/check-error": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
-      "integrity": "sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==",
+    "node_modules/dateformat": {
+      "version": "4.6.3",
+      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-4.6.3.tgz",
+      "integrity": "sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA==",
       "engines": {
         "node": "*"
       }
     },
-    "node_modules/chokidar": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
-      ],
+    "node_modules/debug": {
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
       "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
+        "ms": "2.1.2"
       },
       "engines": {
-        "node": ">= 8.10.0"
+        "node": ">=6.0"
       },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
-    "node_modules/chownr": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
-      "optional": true,
+    "node_modules/decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+      "dev": true,
       "engines": {
-        "node": ">=10"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/cliui": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+    "node_modules/decimal.js": {
+      "version": "10.4.2",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.2.tgz",
+      "integrity": "sha512-ic1yEvwT6GuvaYwBLLY6/aFFgjZdySKTE8en/fkU3QICTmRtgtSlFn0u0BXN06InZwtfCelR7j8LRiDI/02iGA=="
+    },
+    "node_modules/decompress-response": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
+      "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
+      "optional": true,
       "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^7.0.0"
+        "mimic-response": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/collect-all": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/collect-all/-/collect-all-1.0.4.tgz",
-      "integrity": "sha512-RKZhRwJtJEP5FWul+gkSMEnaK6H3AGPTTWOiRimCcs+rc/OmQE3Yhy1Q7A7KsdkG3ZXVdZq68Y6ONSdvkeEcKA==",
-      "dev": true,
+    "node_modules/deep-eql": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz",
+      "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==",
       "dependencies": {
-        "stream-connect": "^1.0.2",
-        "stream-via": "^1.0.4"
+        "type-detect": "^4.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6"
       }
     },
-    "node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+    "node_modules/deep-extend": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
       "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
+      "engines": {
+        "node": ">=4.0.0"
       }
     },
-    "node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/color-support": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
-      "optional": true,
-      "bin": {
-        "color-support": "bin.js"
-      }
+    "node_modules/deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
     },
-    "node_modules/combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+    "node_modules/define-properties": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
+      "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
+      "dev": true,
       "dependencies": {
-        "delayed-stream": "~1.0.0"
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
+      "optional": true
+    },
+    "node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
       "engines": {
         "node": ">= 0.8"
       }
     },
-    "node_modules/command-line-args": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/command-line-args/-/command-line-args-5.2.1.tgz",
-      "integrity": "sha512-H4UfQhZyakIjC74I9d34fGYDwk3XpSr17QhEd0Q3I9Xq1CETHo4Hcuo87WyWHpAF1aSLjLRf5lD9ZGX2qStUvg==",
-      "dev": true,
-      "dependencies": {
-        "array-back": "^3.1.0",
-        "find-replace": "^3.0.0",
-        "lodash.camelcase": "^4.3.0",
-        "typical": "^4.0.0"
-      },
+    "node_modules/destroy": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
       "engines": {
-        "node": ">=4.0.0"
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
       }
     },
-    "node_modules/command-line-args/node_modules/array-back": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz",
-      "integrity": "sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==",
-      "dev": true,
+    "node_modules/detect-libc": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
+      "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==",
+      "optional": true,
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
       }
     },
-    "node_modules/command-line-args/node_modules/typical": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/typical/-/typical-4.0.0.tgz",
-      "integrity": "sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw==",
+    "node_modules/diff": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
       "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=0.3.1"
       }
     },
-    "node_modules/command-line-tool": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/command-line-tool/-/command-line-tool-0.8.0.tgz",
-      "integrity": "sha512-Xw18HVx/QzQV3Sc5k1vy3kgtOeGmsKIqwtFFoyjI4bbcpSgnw2CWVULvtakyw4s6fhyAdI6soQQhXc2OzJy62g==",
+    "node_modules/dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
       "dev": true,
       "dependencies": {
-        "ansi-escape-sequences": "^4.0.0",
-        "array-back": "^2.0.0",
-        "command-line-args": "^5.0.0",
-        "command-line-usage": "^4.1.0",
-        "typical": "^2.6.1"
+        "path-type": "^4.0.0"
       },
       "engines": {
-        "node": ">=4.0.0"
+        "node": ">=8"
       }
     },
-    "node_modules/command-line-tool/node_modules/array-back": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/array-back/-/array-back-2.0.0.tgz",
-      "integrity": "sha512-eJv4pLLufP3g5kcZry0j6WXpIbzYw9GUB4mVJZno9wfwiBxbizTnHCw3VJb07cBihbFX48Y7oSrW9y+gt4glyw==",
+    "node_modules/dmd": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/dmd/-/dmd-6.2.0.tgz",
+      "integrity": "sha512-uXWxLF1H7TkUAuoHK59/h/ts5cKavm2LnhrIgJWisip4BVzPoXavlwyoprFFn2CzcahKYgvkfaebS6oxzgflkg==",
       "dev": true,
       "dependencies": {
-        "typical": "^2.6.1"
+        "array-back": "^6.2.2",
+        "cache-point": "^2.0.0",
+        "common-sequence": "^2.0.2",
+        "file-set": "^4.0.2",
+        "handlebars": "^4.7.7",
+        "marked": "^4.2.3",
+        "object-get": "^2.1.1",
+        "reduce-flatten": "^3.0.1",
+        "reduce-unique": "^2.0.1",
+        "reduce-without": "^1.0.1",
+        "test-value": "^3.0.0",
+        "walk-back": "^5.1.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=12"
       }
     },
-    "node_modules/command-line-usage": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/command-line-usage/-/command-line-usage-4.1.0.tgz",
-      "integrity": "sha512-MxS8Ad995KpdAC0Jopo/ovGIroV/m0KHwzKfXxKag6FHOkGsH8/lv5yjgablcRxCJJC0oJeUMuO/gmaq+Wq46g==",
+    "node_modules/dmd/node_modules/reduce-flatten": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-3.0.1.tgz",
+      "integrity": "sha512-bYo+97BmUUOzg09XwfkwALt4PQH1M5L0wzKerBt6WLm3Fhdd43mMS89HiT1B9pJIqko/6lWx3OnV4J9f2Kqp5Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
       "dev": true,
       "dependencies": {
-        "ansi-escape-sequences": "^4.0.0",
-        "array-back": "^2.0.0",
-        "table-layout": "^0.4.2",
-        "typical": "^2.6.1"
+        "esutils": "^2.0.2"
       },
       "engines": {
-        "node": ">=4.0.0"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/command-line-usage/node_modules/array-back": {
+    "node_modules/dom-serializer": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/array-back/-/array-back-2.0.0.tgz",
-      "integrity": "sha512-eJv4pLLufP3g5kcZry0j6WXpIbzYw9GUB4mVJZno9wfwiBxbizTnHCw3VJb07cBihbFX48Y7oSrW9y+gt4glyw==",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
+      "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
       "dev": true,
       "dependencies": {
-        "typical": "^2.6.1"
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.2",
+        "entities": "^4.2.0"
       },
-      "engines": {
-        "node": ">=4"
+      "funding": {
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
       }
     },
-    "node_modules/common-sequence": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/common-sequence/-/common-sequence-2.0.2.tgz",
-      "integrity": "sha512-jAg09gkdkrDO9EWTdXfv80WWH3yeZl5oT69fGfedBNS9pXUKYInVJ1bJ+/ht2+Moeei48TmSbQDYMc8EOx9G0g==",
+    "node_modules/domelementtype": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
       "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ]
     },
-    "node_modules/compressible": {
-      "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
-      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
+    "node_modules/domexception": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
+      "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
       "dependencies": {
-        "mime-db": ">= 1.43.0 < 2"
+        "webidl-conversions": "^7.0.0"
       },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=12"
       }
     },
-    "node_modules/compression": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
+    "node_modules/domhandler": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
+      "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
+      "dev": true,
       "dependencies": {
-        "accepts": "~1.3.5",
-        "bytes": "3.0.0",
-        "compressible": "~2.0.16",
-        "debug": "2.6.9",
-        "on-headers": "~1.0.2",
-        "safe-buffer": "5.1.2",
-        "vary": "~1.1.2"
+        "domelementtype": "^2.3.0"
       },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">= 4"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
       }
     },
-    "node_modules/compression/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+    "node_modules/dompurify": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.4.0.tgz",
+      "integrity": "sha512-Be9tbQMZds4a3C6xTmz68NlMfeONA//4dOavl/1rNw50E+/QO0KVpbcU0PcaW0nsQxurXls9ZocqFxk8R2mWEA=="
+    },
+    "node_modules/domutils": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.0.1.tgz",
+      "integrity": "sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==",
+      "dev": true,
       "dependencies": {
-        "ms": "2.0.0"
+        "dom-serializer": "^2.0.0",
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domutils?sponsor=1"
       }
     },
-    "node_modules/compression/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    "node_modules/dotenv": {
+      "version": "16.3.1",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz",
+      "integrity": "sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/motdotla/dotenv?sponsor=1"
+      }
     },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+    "node_modules/ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
     },
-    "node_modules/config-master": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/config-master/-/config-master-3.1.0.tgz",
-      "integrity": "sha1-ZnZjWQUFooO/JqSE1oSJ10xUhdo=",
-      "dev": true,
-      "dependencies": {
-        "walk-back": "^2.0.1"
-      }
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
     },
-    "node_modules/config-master/node_modules/walk-back": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/walk-back/-/walk-back-2.0.1.tgz",
-      "integrity": "sha1-VU4qnYdPrEeoywBr9EwvDEmYoKQ=",
-      "dev": true,
+    "node_modules/encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/confusing-browser-globals": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
-      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
-      "dev": true
-    },
-    "node_modules/console-control-strings": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
-      "optional": true
-    },
-    "node_modules/content-disposition": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
-      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+    "node_modules/engine.io": {
+      "version": "6.4.2",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.4.2.tgz",
+      "integrity": "sha512-FKn/3oMiJjrOEOeUub2WCox6JhxBXq/Zn3fZOMCBxKnNYtsdKjxhl7yR3fZhM9PV+rdE75SU5SYMc+2PGzo+Tg==",
       "dependencies": {
-        "safe-buffer": "5.2.1"
+        "@types/cookie": "^0.4.1",
+        "@types/cors": "^2.8.12",
+        "@types/node": ">=10.0.0",
+        "accepts": "~1.3.4",
+        "base64id": "2.0.0",
+        "cookie": "~0.4.1",
+        "cors": "~2.8.5",
+        "debug": "~4.3.1",
+        "engine.io-parser": "~5.0.3",
+        "ws": "~8.11.0"
       },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=10.0.0"
       }
     },
-    "node_modules/content-disposition/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+    "node_modules/engine.io-parser": {
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.7.tgz",
+      "integrity": "sha512-P+jDFbvK6lE3n1OL+q9KuzdOFWkkZ/cMV9gol/SbVfpyqfvrfrFTOFJ6fQm2VC3PZHlU3QPhVwmbsCnauHF2MQ==",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=10.0.0"
       }
     },
-    "node_modules/cookie": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
+    "node_modules/engine.io/node_modules/cookie": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
+      "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
       "engines": {
         "node": ">= 0.6"
       }
     },
-    "node_modules/cookie-signature": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
-    },
-    "node_modules/cors": {
-      "version": "2.8.5",
-      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
-      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
-      "dependencies": {
-        "object-assign": "^4",
-        "vary": "^1"
-      },
+    "node_modules/entities": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.4.0.tgz",
+      "integrity": "sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==",
+      "dev": true,
       "engines": {
-        "node": ">= 0.10"
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
-    "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+    "node_modules/es-abstract": {
+      "version": "1.22.1",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz",
+      "integrity": "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==",
       "dev": true,
       "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
+        "array-buffer-byte-length": "^1.0.0",
+        "arraybuffer.prototype.slice": "^1.0.1",
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "es-set-tostringtag": "^2.0.1",
+        "es-to-primitive": "^1.2.1",
+        "function.prototype.name": "^1.1.5",
+        "get-intrinsic": "^1.2.1",
+        "get-symbol-description": "^1.0.0",
+        "globalthis": "^1.0.3",
+        "gopd": "^1.0.1",
+        "has": "^1.0.3",
+        "has-property-descriptors": "^1.0.0",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.5",
+        "is-array-buffer": "^3.0.2",
+        "is-callable": "^1.2.7",
+        "is-negative-zero": "^2.0.2",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.2",
+        "is-string": "^1.0.7",
+        "is-typed-array": "^1.1.10",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.12.3",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.4",
+        "regexp.prototype.flags": "^1.5.0",
+        "safe-array-concat": "^1.0.0",
+        "safe-regex-test": "^1.0.0",
+        "string.prototype.trim": "^1.2.7",
+        "string.prototype.trimend": "^1.0.6",
+        "string.prototype.trimstart": "^1.0.6",
+        "typed-array-buffer": "^1.0.0",
+        "typed-array-byte-length": "^1.0.0",
+        "typed-array-byte-offset": "^1.0.0",
+        "typed-array-length": "^1.0.4",
+        "unbox-primitive": "^1.0.2",
+        "which-typed-array": "^1.1.10"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/cssom": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz",
-      "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw=="
-    },
-    "node_modules/cssstyle": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
-      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
+    "node_modules/es-set-tostringtag": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
+      "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==",
+      "dev": true,
       "dependencies": {
-        "cssom": "~0.3.6"
+        "get-intrinsic": "^1.1.3",
+        "has": "^1.0.3",
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/cssstyle/node_modules/cssom": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="
-    },
-    "node_modules/csv-writer": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/csv-writer/-/csv-writer-1.6.0.tgz",
-      "integrity": "sha512-NOx7YDFWEsM/fTRAJjRpPp8t+MKRVvniAg9wQlUKx20MFrPs73WLJhFf5iteqrxNYnsy924K3Iroh3yNHeYd2g=="
-    },
-    "node_modules/data-urls": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz",
-      "integrity": "sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==",
+    "node_modules/es-shim-unscopables": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
+      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+      "dev": true,
       "dependencies": {
-        "abab": "^2.0.6",
-        "whatwg-mimetype": "^3.0.0",
-        "whatwg-url": "^11.0.0"
-      },
-      "engines": {
-        "node": ">=12"
+        "has": "^1.0.3"
       }
     },
-    "node_modules/data-urls/node_modules/whatwg-url": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz",
-      "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==",
+    "node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
       "dependencies": {
-        "tr46": "^3.0.0",
-        "webidl-conversions": "^7.0.0"
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/dateformat": {
-      "version": "4.6.3",
-      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-4.6.3.tgz",
-      "integrity": "sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA==",
+    "node_modules/escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
       "engines": {
-        "node": "*"
+        "node": ">=6"
       }
     },
-    "node_modules/debug": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
-      "dependencies": {
-        "ms": "2.1.2"
+    "node_modules/escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/escodegen": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
+      "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
+      "dependencies": {
+        "esprima": "^4.0.1",
+        "estraverse": "^5.2.0",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
       },
       "engines": {
         "node": ">=6.0"
       },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
+      "optionalDependencies": {
+        "source-map": "~0.6.1"
       }
     },
-    "node_modules/decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
-      "dev": true,
+    "node_modules/escodegen/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=4.0"
       }
     },
-    "node_modules/decimal.js": {
-      "version": "10.4.2",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.2.tgz",
-      "integrity": "sha512-ic1yEvwT6GuvaYwBLLY6/aFFgjZdySKTE8en/fkU3QICTmRtgtSlFn0u0BXN06InZwtfCelR7j8LRiDI/02iGA=="
-    },
-    "node_modules/decompress-response": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
-      "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
+    "node_modules/escodegen/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "optional": true,
-      "dependencies": {
-        "mimic-response": "^2.0.0"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/deep-eql": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz",
-      "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==",
+    "node_modules/eslint": {
+      "version": "8.45.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.45.0.tgz",
+      "integrity": "sha512-pd8KSxiQpdYRfYa9Wufvdoct3ZPQQuVuU5O6scNgMuOMYuxvH0IGaYK0wUFjo4UYYQQCUndlXiMbnxopwvvTiw==",
+      "dev": true,
       "dependencies": {
-        "type-detect": "^4.0.0"
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.4.0",
+        "@eslint/eslintrc": "^2.1.0",
+        "@eslint/js": "8.44.0",
+        "@humanwhocodes/config-array": "^0.11.10",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@nodelib/fs.walk": "^1.2.8",
+        "ajv": "^6.10.0",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.2.0",
+        "eslint-visitor-keys": "^3.4.1",
+        "espree": "^9.6.0",
+        "esquery": "^1.4.2",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "globals": "^13.19.0",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.2.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "is-path-inside": "^3.0.3",
+        "js-yaml": "^4.1.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.3",
+        "strip-ansi": "^6.0.1",
+        "text-table": "^0.2.0"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
       },
       "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/deep-extend": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/deep-is": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
-    },
-    "node_modules/define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+    "node_modules/eslint-config-airbnb-base": {
+      "version": "15.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz",
+      "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==",
       "dev": true,
       "dependencies": {
-        "object-keys": "^1.0.12"
+        "confusing-browser-globals": "^1.0.10",
+        "object.assign": "^4.1.2",
+        "object.entries": "^1.1.5",
+        "semver": "^6.3.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^7.32.0 || ^8.2.0",
+        "eslint-plugin-import": "^2.25.2"
       }
     },
-    "node_modules/delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-      "engines": {
-        "node": ">=0.4.0"
+    "node_modules/eslint-config-airbnb-base/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
       }
     },
-    "node_modules/delegates": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
-      "optional": true
-    },
-    "node_modules/depd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-      "engines": {
-        "node": ">= 0.8"
+    "node_modules/eslint-import-resolver-node": {
+      "version": "0.3.7",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz",
+      "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.7",
+        "is-core-module": "^2.11.0",
+        "resolve": "^1.22.1"
       }
     },
-    "node_modules/destroy": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
-      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
-      "engines": {
-        "node": ">= 0.8",
-        "npm": "1.2.8000 || >= 1.4.16"
+    "node_modules/eslint-import-resolver-node/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
       }
     },
-    "node_modules/detect-libc": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
-      "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==",
-      "optional": true,
+    "node_modules/eslint-module-utils": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz",
+      "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.7"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
+      },
+      "peerDependenciesMeta": {
+        "eslint": {
+          "optional": true
+        }
       }
     },
-    "node_modules/diff": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+    "node_modules/eslint-module-utils/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
-      "engines": {
-        "node": ">=0.3.1"
+      "dependencies": {
+        "ms": "^2.1.1"
       }
     },
-    "node_modules/dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+    "node_modules/eslint-plugin-deprecation": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-deprecation/-/eslint-plugin-deprecation-1.4.1.tgz",
+      "integrity": "sha512-4vxTghWzxsBukPJVQupi6xlTuDc8Pyi1QlRCrFiLgwLPMJQW3cJCNaehJUKQqQFvuue5m4W27e179Y3Qjzeghg==",
       "dev": true,
       "dependencies": {
-        "path-type": "^4.0.0"
+        "@typescript-eslint/utils": "^5.57.0",
+        "tslib": "^2.3.1",
+        "tsutils": "^3.21.0"
       },
-      "engines": {
-        "node": ">=8"
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0",
+        "typescript": "^3.7.5 || ^4.0.0 || ^5.0.0"
       }
     },
-    "node_modules/dmd": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/dmd/-/dmd-6.2.0.tgz",
-      "integrity": "sha512-uXWxLF1H7TkUAuoHK59/h/ts5cKavm2LnhrIgJWisip4BVzPoXavlwyoprFFn2CzcahKYgvkfaebS6oxzgflkg==",
+    "node_modules/eslint-plugin-deprecation/node_modules/tslib": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz",
+      "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==",
+      "dev": true
+    },
+    "node_modules/eslint-plugin-html": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-html/-/eslint-plugin-html-7.1.0.tgz",
+      "integrity": "sha512-fNLRraV/e6j8e3XYOC9xgND4j+U7b1Rq+OygMlLcMg+wI/IpVbF+ubQa3R78EjKB9njT6TQOlcK5rFKBVVtdfg==",
       "dev": true,
       "dependencies": {
-        "array-back": "^6.2.2",
-        "cache-point": "^2.0.0",
-        "common-sequence": "^2.0.2",
-        "file-set": "^4.0.2",
-        "handlebars": "^4.7.7",
-        "marked": "^4.2.3",
-        "object-get": "^2.1.1",
-        "reduce-flatten": "^3.0.1",
-        "reduce-unique": "^2.0.1",
-        "reduce-without": "^1.0.1",
-        "test-value": "^3.0.0",
-        "walk-back": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/dmd/node_modules/reduce-flatten": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-3.0.1.tgz",
-      "integrity": "sha512-bYo+97BmUUOzg09XwfkwALt4PQH1M5L0wzKerBt6WLm3Fhdd43mMS89HiT1B9pJIqko/6lWx3OnV4J9f2Kqp5Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
+        "htmlparser2": "^8.0.1"
       }
     },
-    "node_modules/doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+    "node_modules/eslint-plugin-import": {
+      "version": "2.28.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.0.tgz",
+      "integrity": "sha512-B8s/n+ZluN7sxj9eUf7/pRFERX0r5bnFA2dCaLHy2ZeaQEAz0k+ZZkFWRFHJAqxfxQDx6KLv9LeIki7cFdwW+Q==",
       "dev": true,
       "dependencies": {
-        "esutils": "^2.0.2"
+        "array-includes": "^3.1.6",
+        "array.prototype.findlastindex": "^1.2.2",
+        "array.prototype.flat": "^1.3.1",
+        "array.prototype.flatmap": "^1.3.1",
+        "debug": "^3.2.7",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.7",
+        "eslint-module-utils": "^2.8.0",
+        "has": "^1.0.3",
+        "is-core-module": "^2.12.1",
+        "is-glob": "^4.0.3",
+        "minimatch": "^3.1.2",
+        "object.fromentries": "^2.0.6",
+        "object.groupby": "^1.0.0",
+        "object.values": "^1.1.6",
+        "resolve": "^1.22.3",
+        "semver": "^6.3.1",
+        "tsconfig-paths": "^3.14.2"
       },
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
       }
     },
-    "node_modules/dom-serializer": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
-      "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
+    "node_modules/eslint-plugin-import/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
       "dependencies": {
-        "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.2",
-        "entities": "^4.2.0"
-      },
-      "funding": {
-        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+        "ms": "^2.1.1"
       }
     },
-    "node_modules/domelementtype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+    "node_modules/eslint-plugin-import/node_modules/doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
       "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ]
-    },
-    "node_modules/domexception": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
-      "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
       "dependencies": {
-        "webidl-conversions": "^7.0.0"
+        "esutils": "^2.0.2"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/domhandler": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
-      "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
+    "node_modules/eslint-plugin-import/node_modules/json5": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
       "dev": true,
       "dependencies": {
-        "domelementtype": "^2.3.0"
-      },
-      "engines": {
-        "node": ">= 4"
+        "minimist": "^1.2.0"
       },
-      "funding": {
-        "url": "https://github.com/fb55/domhandler?sponsor=1"
+      "bin": {
+        "json5": "lib/cli.js"
       }
     },
-    "node_modules/dompurify": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.4.0.tgz",
-      "integrity": "sha512-Be9tbQMZds4a3C6xTmz68NlMfeONA//4dOavl/1rNw50E+/QO0KVpbcU0PcaW0nsQxurXls9ZocqFxk8R2mWEA=="
-    },
-    "node_modules/domutils": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.0.1.tgz",
-      "integrity": "sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==",
+    "node_modules/eslint-plugin-import/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
       "dependencies": {
-        "dom-serializer": "^2.0.0",
-        "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.1"
+        "brace-expansion": "^1.1.7"
       },
-      "funding": {
-        "url": "https://github.com/fb55/domutils?sponsor=1"
-      }
-    },
-    "node_modules/dotenv": {
-      "version": "16.3.1",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz",
-      "integrity": "sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==",
       "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/motdotla/dotenv?sponsor=1"
+        "node": "*"
       }
     },
-    "node_modules/ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
-    },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    "node_modules/eslint-plugin-import/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
     },
-    "node_modules/encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
-      "engines": {
-        "node": ">= 0.8"
+    "node_modules/eslint-plugin-import/node_modules/tsconfig-paths": {
+      "version": "3.14.2",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",
+      "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==",
+      "dev": true,
+      "dependencies": {
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.2",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
       }
     },
-    "node_modules/engine.io": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.4.2.tgz",
-      "integrity": "sha512-FKn/3oMiJjrOEOeUub2WCox6JhxBXq/Zn3fZOMCBxKnNYtsdKjxhl7yR3fZhM9PV+rdE75SU5SYMc+2PGzo+Tg==",
+    "node_modules/eslint-scope": {
+      "version": "7.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.1.tgz",
+      "integrity": "sha512-CvefSOsDdaYYvxChovdrPo/ZGt8d5lrJWleAc1diXRKhHGiTYEI26cvo8Kle/wGnsizoCJjK73FMg1/IkIwiNA==",
+      "dev": true,
       "dependencies": {
-        "@types/cookie": "^0.4.1",
-        "@types/cors": "^2.8.12",
-        "@types/node": ">=10.0.0",
-        "accepts": "~1.3.4",
-        "base64id": "2.0.0",
-        "cookie": "~0.4.1",
-        "cors": "~2.8.5",
-        "debug": "~4.3.1",
-        "engine.io-parser": "~5.0.3",
-        "ws": "~8.11.0"
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
       },
       "engines": {
-        "node": ">=10.0.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/engine.io-parser": {
-      "version": "5.0.7",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.7.tgz",
-      "integrity": "sha512-P+jDFbvK6lE3n1OL+q9KuzdOFWkkZ/cMV9gol/SbVfpyqfvrfrFTOFJ6fQm2VC3PZHlU3QPhVwmbsCnauHF2MQ==",
+    "node_modules/eslint-scope/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=4.0"
       }
     },
-    "node_modules/engine.io/node_modules/cookie": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
-      "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
+    "node_modules/eslint-visitor-keys": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+      "dev": true,
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=4"
       }
     },
-    "node_modules/entities": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-4.4.0.tgz",
-      "integrity": "sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==",
+    "node_modules/eslint/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
       "engines": {
-        "node": ">=0.12"
+        "node": ">=8"
       },
       "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/es-abstract": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
-      "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
+    "node_modules/eslint/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.1.1",
-        "get-symbol-description": "^1.0.0",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.2",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.1",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.1",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.1",
-        "object-inspect": "^1.11.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "string.prototype.trimend": "^1.0.4",
-        "string.prototype.trimstart": "^1.0.4",
-        "unbox-primitive": "^1.0.1"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/es-set-tostringtag": {
+    "node_modules/eslint/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
-      "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
-        "get-intrinsic": "^1.1.3",
-        "has": "^1.0.3",
-        "has-tostringtag": "^1.0.0"
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/es-set-tostringtag/node_modules/get-intrinsic": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.3"
+    "node_modules/eslint/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/eslint/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/es-set-tostringtag/node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+    "node_modules/eslint/node_modules/eslint-visitor-keys": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
+      "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
       "dev": true,
       "engines": {
-        "node": ">= 0.4"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/es-shim-unscopables": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+    "node_modules/eslint/node_modules/glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
       "dev": true,
       "dependencies": {
-        "has": "^1.0.3"
+        "is-glob": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=10.13.0"
       }
     },
-    "node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+    "node_modules/eslint/node_modules/globals": {
+      "version": "13.20.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
+      "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
       "dev": true,
       "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
+        "type-fest": "^0.20.2"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=8"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-      "engines": {
-        "node": ">=6"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
-    },
-    "node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+    "node_modules/eslint/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
       "engines": {
-        "node": ">=0.8.0"
+        "node": ">=8"
       }
     },
-    "node_modules/escodegen": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
-      "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
+    "node_modules/eslint/node_modules/levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
       "dependencies": {
-        "esprima": "^4.0.1",
-        "estraverse": "^5.2.0",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1"
-      },
-      "bin": {
-        "escodegen": "bin/escodegen.js",
-        "esgenerate": "bin/esgenerate.js"
-      },
-      "engines": {
-        "node": ">=6.0"
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
       },
-      "optionalDependencies": {
-        "source-map": "~0.6.1"
-      }
-    },
-    "node_modules/escodegen/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/escodegen/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "optional": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/eslint": {
-      "version": "8.45.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.45.0.tgz",
-      "integrity": "sha512-pd8KSxiQpdYRfYa9Wufvdoct3ZPQQuVuU5O6scNgMuOMYuxvH0IGaYK0wUFjo4UYYQQCUndlXiMbnxopwvvTiw==",
+    "node_modules/eslint/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
       "dependencies": {
-        "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.4.0",
-        "@eslint/eslintrc": "^2.1.0",
-        "@eslint/js": "8.44.0",
-        "@humanwhocodes/config-array": "^0.11.10",
-        "@humanwhocodes/module-importer": "^1.0.1",
-        "@nodelib/fs.walk": "^1.2.8",
-        "ajv": "^6.10.0",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.2.0",
-        "eslint-visitor-keys": "^3.4.1",
-        "espree": "^9.6.0",
-        "esquery": "^1.4.2",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "find-up": "^5.0.0",
-        "glob-parent": "^6.0.2",
-        "globals": "^13.19.0",
-        "graphemer": "^1.4.0",
-        "ignore": "^5.2.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "is-path-inside": "^3.0.3",
-        "js-yaml": "^4.1.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.3",
-        "strip-ansi": "^6.0.1",
-        "text-table": "^0.2.0"
-      },
-      "bin": {
-        "eslint": "bin/eslint.js"
+        "brace-expansion": "^1.1.7"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
+        "node": "*"
       }
     },
-    "node_modules/eslint-config-airbnb-base": {
-      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz",
-      "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==",
+    "node_modules/eslint/node_modules/optionator": {
+      "version": "0.9.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
+      "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
       "dev": true,
       "dependencies": {
-        "confusing-browser-globals": "^1.0.10",
-        "object.assign": "^4.1.2",
-        "object.entries": "^1.1.5",
-        "semver": "^6.3.0"
+        "@aashutoshrathi/word-wrap": "^1.2.3",
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "peerDependencies": {
-        "eslint": "^7.32.0 || ^8.2.0",
-        "eslint-plugin-import": "^2.25.2"
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/eslint-config-airbnb-base/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+    "node_modules/eslint/node_modules/prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
       "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
+      "engines": {
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/eslint-import-resolver-node": {
-      "version": "0.3.7",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz",
-      "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==",
+    "node_modules/eslint/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
-        "debug": "^3.2.7",
-        "is-core-module": "^2.11.0",
-        "resolve": "^1.22.1"
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/eslint-import-resolver-node/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+    "node_modules/eslint/node_modules/type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
       "dev": true,
       "dependencies": {
-        "ms": "^2.1.1"
+        "prelude-ls": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/eslint-import-resolver-node/node_modules/is-core-module": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
-      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
+    "node_modules/espree": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
       "dev": true,
       "dependencies": {
-        "has": "^1.0.3"
+        "acorn": "^8.9.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.4.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/eslint-module-utils": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz",
-      "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==",
+    "node_modules/espree/node_modules/eslint-visitor-keys": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
+      "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
       "dev": true,
-      "dependencies": {
-        "debug": "^3.2.7"
-      },
       "engines": {
-        "node": ">=4"
-      },
-      "peerDependenciesMeta": {
-        "eslint": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/eslint-module-utils/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/eslint-plugin-deprecation": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-deprecation/-/eslint-plugin-deprecation-1.4.1.tgz",
-      "integrity": "sha512-4vxTghWzxsBukPJVQupi6xlTuDc8Pyi1QlRCrFiLgwLPMJQW3cJCNaehJUKQqQFvuue5m4W27e179Y3Qjzeghg==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/utils": "^5.57.0",
-        "tslib": "^2.3.1",
-        "tsutils": "^3.21.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
-      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0",
-        "typescript": "^3.7.5 || ^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/eslint-plugin-deprecation/node_modules/tslib": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz",
-      "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==",
-      "dev": true
-    },
-    "node_modules/eslint-plugin-html": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-html/-/eslint-plugin-html-7.1.0.tgz",
-      "integrity": "sha512-fNLRraV/e6j8e3XYOC9xgND4j+U7b1Rq+OygMlLcMg+wI/IpVbF+ubQa3R78EjKB9njT6TQOlcK5rFKBVVtdfg==",
-      "dev": true,
-      "dependencies": {
-        "htmlparser2": "^8.0.1"
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/eslint-plugin-import": {
-      "version": "2.27.5",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz",
-      "integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==",
-      "dev": true,
-      "dependencies": {
-        "array-includes": "^3.1.6",
-        "array.prototype.flat": "^1.3.1",
-        "array.prototype.flatmap": "^1.3.1",
-        "debug": "^3.2.7",
-        "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.7",
-        "eslint-module-utils": "^2.7.4",
-        "has": "^1.0.3",
-        "is-core-module": "^2.11.0",
-        "is-glob": "^4.0.3",
-        "minimatch": "^3.1.2",
-        "object.values": "^1.1.6",
-        "resolve": "^1.22.1",
-        "semver": "^6.3.0",
-        "tsconfig-paths": "^3.14.1"
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
       },
       "engines": {
         "node": ">=4"
-      },
-      "peerDependencies": {
-        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+    "node_modules/esquery": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
       "dev": true,
       "dependencies": {
-        "esutils": "^2.0.2"
+        "estraverse": "^5.1.0"
       },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/is-core-module": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
-      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
-      "dev": true,
-      "dependencies": {
-        "has": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/json5": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
+        "node": ">=0.10"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+    "node_modules/esquery/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
       "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/tsconfig-paths": {
-      "version": "3.14.2",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",
-      "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==",
-      "dev": true,
-      "dependencies": {
-        "@types/json5": "^0.0.29",
-        "json5": "^1.0.2",
-        "minimist": "^1.2.6",
-        "strip-bom": "^3.0.0"
+        "node": ">=4.0"
       }
     },
-    "node_modules/eslint-scope": {
-      "version": "7.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.1.tgz",
-      "integrity": "sha512-CvefSOsDdaYYvxChovdrPo/ZGt8d5lrJWleAc1diXRKhHGiTYEI26cvo8Kle/wGnsizoCJjK73FMg1/IkIwiNA==",
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
       "dev": true,
       "dependencies": {
-        "esrecurse": "^4.3.0",
         "estraverse": "^5.2.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
+        "node": ">=4.0"
       }
     },
-    "node_modules/eslint-scope/node_modules/estraverse": {
+    "node_modules/esrecurse/node_modules/estraverse": {
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
       "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
@@ -3588,551 +3274,601 @@
         "node": ">=4.0"
       }
     },
-    "node_modules/eslint-visitor-keys": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+    "node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
       "dev": true,
       "engines": {
-        "node": ">=4"
+        "node": ">=4.0"
       }
     },
-    "node_modules/eslint/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/eslint/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
+    "node_modules/etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/eslint/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
+    "node_modules/express": {
+      "version": "4.18.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
       "dependencies": {
-        "color-name": "~1.1.4"
+        "accepts": "~1.3.8",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.20.1",
+        "content-disposition": "0.5.4",
+        "content-type": "~1.0.4",
+        "cookie": "0.5.0",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "finalhandler": "1.2.0",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "merge-descriptors": "1.0.1",
+        "methods": "~1.1.2",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "~2.0.7",
+        "qs": "6.11.0",
+        "range-parser": "~1.2.1",
+        "safe-buffer": "5.2.1",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "type-is": "~1.6.18",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">= 0.10.0"
       }
     },
-    "node_modules/eslint/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+    "node_modules/express/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/express/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/express/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
       "dev": true
     },
-    "node_modules/eslint/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+    "node_modules/fast-glob": {
+      "version": "3.2.12",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
+      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
       "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
+      },
       "engines": {
-        "node": ">=10"
+        "node": ">=8.6.0"
+      }
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
+    },
+    "node_modules/fast-xml-parser": {
+      "version": "4.2.6",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.6.tgz",
+      "integrity": "sha512-Xo1qV++h/Y3Ng8dphjahnYe+rGHaaNdsYOBWL9Y9GCPKpNKilJtilvWkLcI9f9X2DoKTLsZsGYAls5+JL5jfLA==",
+      "funding": [
+        {
+          "type": "paypal",
+          "url": "https://paypal.me/naturalintelligence"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "dependencies": {
+        "strnum": "^1.0.5"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "bin": {
+        "fxparser": "src/cli/cli.js"
       }
     },
-    "node_modules/eslint/node_modules/eslint-visitor-keys": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
-      "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
+    "node_modules/fastq": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
+      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
       "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
+      "dependencies": {
+        "reusify": "^1.0.4"
       }
     },
-    "node_modules/eslint/node_modules/glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+    "node_modules/file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
       "dev": true,
       "dependencies": {
-        "is-glob": "^4.0.3"
+        "flat-cache": "^3.0.4"
       },
       "engines": {
-        "node": ">=10.13.0"
+        "node": "^10.12.0 || >=12.0.0"
       }
     },
-    "node_modules/eslint/node_modules/globals": {
-      "version": "13.20.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
-      "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
+    "node_modules/file-set": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/file-set/-/file-set-4.0.2.tgz",
+      "integrity": "sha512-fuxEgzk4L8waGXaAkd8cMr73Pm0FxOVkn8hztzUW7BAHhOGH90viQNXbiOsnecCWmfInqU6YmAMwxRMdKETceQ==",
       "dev": true,
       "dependencies": {
-        "type-fest": "^0.20.2"
+        "array-back": "^5.0.0",
+        "glob": "^7.1.6"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=10"
       }
     },
-    "node_modules/eslint/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/file-set/node_modules/array-back": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/array-back/-/array-back-5.0.0.tgz",
+      "integrity": "sha512-kgVWwJReZWmVuWOQKEOohXKJX+nD02JAZ54D1RRWlv8L0NebauKAaFxACKzB74RTclt1+WNz5KHaLRDAPZbDEw==",
       "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       }
     },
-    "node_modules/eslint/node_modules/levn": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "dev": true,
+    "node_modules/fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
       "dependencies": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
+        "to-regex-range": "^5.0.1"
       },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">=8"
       }
     },
-    "node_modules/eslint/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
+    "node_modules/finalhandler": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
       "dependencies": {
-        "brace-expansion": "^1.1.7"
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "statuses": "2.0.1",
+        "unpipe": "~1.0.0"
       },
       "engines": {
-        "node": "*"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/eslint/node_modules/optionator": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
-      "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
-      "dev": true,
+    "node_modules/finalhandler/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dependencies": {
-        "@aashutoshrathi/word-wrap": "^1.2.3",
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
+        "ms": "2.0.0"
       }
     },
-    "node_modules/eslint/node_modules/prelude-ls": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
+    "node_modules/finalhandler/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
-    "node_modules/eslint/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/find-replace": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-replace/-/find-replace-3.0.0.tgz",
+      "integrity": "sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "array-back": "^3.0.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=4.0.0"
       }
     },
-    "node_modules/eslint/node_modules/type-check": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+    "node_modules/find-replace/node_modules/array-back": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz",
+      "integrity": "sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==",
       "dev": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1"
-      },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">=6"
       }
     },
-    "node_modules/espree": {
-      "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
-      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
-      "dev": true,
+    "node_modules/find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
       "dependencies": {
-        "acorn": "^8.9.0",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.4.1"
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://opencollective.com/eslint"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/espree/node_modules/eslint-visitor-keys": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
-      "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+    "node_modules/flat": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+      "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
       "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=4"
+        "flat": "cli.js"
       }
     },
-    "node_modules/esquery": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
-      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
+    "node_modules/flat-cache": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
       "dev": true,
       "dependencies": {
-        "estraverse": "^5.1.0"
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
       },
       "engines": {
-        "node": ">=0.10"
+        "node": "^10.12.0 || >=12.0.0"
       }
     },
-    "node_modules/esquery/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
+    "node_modules/flatted": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
+      "dev": true
+    },
+    "node_modules/follow-redirects": {
+      "version": "1.15.2",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
       "engines": {
         "node": ">=4.0"
+      },
+      "peerDependenciesMeta": {
+        "debug": {
+          "optional": true
+        }
       }
     },
-    "node_modules/esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+    "node_modules/for-each": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
       "dev": true,
       "dependencies": {
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=4.0"
+        "is-callable": "^1.1.3"
       }
     },
-    "node_modules/esrecurse/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
+    "node_modules/form-data": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
       "engines": {
-        "node": ">=4.0"
+        "node": ">= 6"
       }
     },
-    "node_modules/estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true,
+    "node_modules/forwarded": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
       "engines": {
-        "node": ">=4.0"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+    "node_modules/fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+    "node_modules/fs-extra": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+      "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=6 <7 || >=8"
       }
     },
-    "node_modules/express": {
-      "version": "4.18.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
-      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
+    "node_modules/fs-minipass": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
+      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
+      "optional": true,
       "dependencies": {
-        "accepts": "~1.3.8",
-        "array-flatten": "1.1.1",
-        "body-parser": "1.20.1",
-        "content-disposition": "0.5.4",
-        "content-type": "~1.0.4",
-        "cookie": "0.5.0",
-        "cookie-signature": "1.0.6",
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "finalhandler": "1.2.0",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "merge-descriptors": "1.0.1",
-        "methods": "~1.1.2",
-        "on-finished": "2.4.1",
-        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.7",
-        "qs": "6.11.0",
-        "range-parser": "~1.2.1",
-        "safe-buffer": "5.2.1",
-        "send": "0.18.0",
-        "serve-static": "1.15.0",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "type-is": "~1.6.18",
-        "utils-merge": "1.0.1",
-        "vary": "~1.1.2"
+        "minipass": "^3.0.0"
       },
       "engines": {
-        "node": ">= 0.10.0"
+        "node": ">= 8"
       }
     },
-    "node_modules/express/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+    "node_modules/fs-minipass/node_modules/minipass": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+      "optional": true,
       "dependencies": {
-        "ms": "2.0.0"
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/express/node_modules/ms": {
+    "node_modules/fs-then-native": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-    },
-    "node_modules/express/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
-    },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
-    },
-    "node_modules/fast-glob": {
-      "version": "3.2.12",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
-      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
+      "resolved": "https://registry.npmjs.org/fs-then-native/-/fs-then-native-2.0.0.tgz",
+      "integrity": "sha1-GaEk2U2QwiyOBF8ujdbr6jbUjGc=",
       "dev": true,
-      "dependencies": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
-      },
       "engines": {
-        "node": ">=8.6.0"
+        "node": ">=4.0.0"
       }
     },
-    "node_modules/fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
-    },
-    "node_modules/fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
     },
-    "node_modules/fast-xml-parser": {
-      "version": "4.2.6",
-      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.6.tgz",
-      "integrity": "sha512-Xo1qV++h/Y3Ng8dphjahnYe+rGHaaNdsYOBWL9Y9GCPKpNKilJtilvWkLcI9f9X2DoKTLsZsGYAls5+JL5jfLA==",
-      "funding": [
-        {
-          "type": "paypal",
-          "url": "https://paypal.me/naturalintelligence"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/NaturalIntelligence"
-        }
+    "node_modules/fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
       ],
-      "dependencies": {
-        "strnum": "^1.0.5"
-      },
-      "bin": {
-        "fxparser": "src/cli/cli.js"
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
       }
     },
-    "node_modules/fastq": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
-      "dev": true,
-      "dependencies": {
-        "reusify": "^1.0.4"
-      }
+    "node_modules/fsu": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/fsu/-/fsu-1.1.1.tgz",
+      "integrity": "sha512-xQVsnjJ/5pQtcKh+KjUoZGzVWn4uNkchxTF6Lwjr4Gf7nQr8fmUfhKJ62zE77+xQg9xnxi5KUps7XGs+VC986A=="
     },
-    "node_modules/file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+    "node_modules/function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+    },
+    "node_modules/function.prototype.name": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
+      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
       "dev": true,
       "dependencies": {
-        "flat-cache": "^3.0.4"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.0",
+        "functions-have-names": "^1.2.2"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/file-set": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/file-set/-/file-set-4.0.2.tgz",
-      "integrity": "sha512-fuxEgzk4L8waGXaAkd8cMr73Pm0FxOVkn8hztzUW7BAHhOGH90viQNXbiOsnecCWmfInqU6YmAMwxRMdKETceQ==",
+    "node_modules/functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
       "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/gauge": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
+      "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==",
+      "optional": true,
       "dependencies": {
-        "array-back": "^5.0.0",
-        "glob": "^7.1.6"
+        "aproba": "^1.0.3 || ^2.0.0",
+        "color-support": "^1.1.2",
+        "console-control-strings": "^1.0.0",
+        "has-unicode": "^2.0.1",
+        "object-assign": "^4.1.1",
+        "signal-exit": "^3.0.0",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1",
+        "wide-align": "^1.1.2"
       },
       "engines": {
         "node": ">=10"
       }
     },
-    "node_modules/file-set/node_modules/array-back": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/array-back/-/array-back-5.0.0.tgz",
-      "integrity": "sha512-kgVWwJReZWmVuWOQKEOohXKJX+nD02JAZ54D1RRWlv8L0NebauKAaFxACKzB74RTclt1+WNz5KHaLRDAPZbDEw==",
-      "dev": true,
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
       "engines": {
-        "node": ">=10"
+        "node": "6.* || 8.* || >= 10.*"
       }
     },
-    "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+    "node_modules/get-func-name": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
+      "integrity": "sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
+      "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
       "dependencies": {
-        "to-regex-range": "^5.0.1"
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3"
       },
-      "engines": {
-        "node": ">=8"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/finalhandler": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+    "node_modules/get-symbol-description": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
+      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "dev": true,
       "dependencies": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "2.4.1",
-        "parseurl": "~1.3.3",
-        "statuses": "2.0.1",
-        "unpipe": "~1.0.0"
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/finalhandler/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+    "node_modules/glob": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
       "dependencies": {
-        "ms": "2.0.0"
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/finalhandler/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-    },
-    "node_modules/find-replace": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-replace/-/find-replace-3.0.0.tgz",
-      "integrity": "sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ==",
-      "dev": true,
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "dependencies": {
-        "array-back": "^3.0.1"
+        "is-glob": "^4.0.1"
       },
       "engines": {
-        "node": ">=4.0.0"
+        "node": ">= 6"
       }
     },
-    "node_modules/find-replace/node_modules/array-back": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz",
-      "integrity": "sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==",
+    "node_modules/globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
       "dev": true,
       "engines": {
-        "node": ">=6"
+        "node": ">=4"
       }
     },
-    "node_modules/find-up": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+    "node_modules/globalthis": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
+      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
+      "dev": true,
       "dependencies": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
+        "define-properties": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+      "dev": true,
+      "dependencies": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
       },
       "engines": {
         "node": ">=10"
@@ -4141,490 +3877,138 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/flat": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
-      "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
-      "bin": {
-        "flat": "cli.js"
+    "node_modules/globby/node_modules/ignore": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
       }
     },
-    "node_modules/flat-cache": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+    "node_modules/gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
       "dev": true,
       "dependencies": {
-        "flatted": "^3.1.0",
-        "rimraf": "^3.0.2"
+        "get-intrinsic": "^1.1.3"
       },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/flatted": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
-      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
-      "dev": true
+    "node_modules/graceful-fs": {
+      "version": "4.2.10",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
+      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
     },
-    "node_modules/follow-redirects": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/RubenVerborgh"
-        }
-      ],
-      "engines": {
-        "node": ">=4.0"
-      },
-      "peerDependenciesMeta": {
-        "debug": {
-          "optional": true
-        }
-      }
+    "node_modules/graphemer": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
+      "dev": true
     },
-    "node_modules/for-each": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
-      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+    "node_modules/handlebars": {
+      "version": "4.7.7",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz",
+      "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==",
       "dev": true,
       "dependencies": {
-        "is-callable": "^1.1.3"
-      }
-    },
-    "node_modules/form-data": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
+        "minimist": "^1.2.5",
+        "neo-async": "^2.6.0",
+        "source-map": "^0.6.1",
+        "wordwrap": "^1.0.0"
+      },
+      "bin": {
+        "handlebars": "bin/handlebars"
       },
       "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/forwarded": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
-      "engines": {
-        "node": ">= 0.6"
+        "node": ">=0.4.7"
+      },
+      "optionalDependencies": {
+        "uglify-js": "^3.1.4"
       }
     },
-    "node_modules/fs-extra": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
-      "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
+    "node_modules/handlebars/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
-      },
       "engines": {
-        "node": ">=6 <7 || >=8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/fs-minipass": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
-      "optional": true,
+    "node_modules/has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
       "dependencies": {
-        "minipass": "^3.0.0"
+        "function-bind": "^1.1.1"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">= 0.4.0"
       }
     },
-    "node_modules/fs-minipass/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-      "optional": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+    "node_modules/has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/fs-then-native": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/fs-then-native/-/fs-then-native-2.0.0.tgz",
-      "integrity": "sha1-GaEk2U2QwiyOBF8ujdbr6jbUjGc=",
+    "node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
       "dev": true,
       "engines": {
-        "node": ">=4.0.0"
+        "node": ">=4"
       }
     },
-    "node_modules/fs.realpath": {
+    "node_modules/has-property-descriptors": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
-    },
-    "node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
-    "node_modules/fsu": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/fsu/-/fsu-1.1.1.tgz",
-      "integrity": "sha512-xQVsnjJ/5pQtcKh+KjUoZGzVWn4uNkchxTF6Lwjr4Gf7nQr8fmUfhKJ62zE77+xQg9xnxi5KUps7XGs+VC986A=="
-    },
-    "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
-    },
-    "node_modules/function.prototype.name": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0",
-        "functions-have-names": "^1.2.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "get-intrinsic": "^1.1.1"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/functions-have-names": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
-      "dev": true,
+    "node_modules/has-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
+      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/gauge": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
-      "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==",
-      "optional": true,
-      "dependencies": {
-        "aproba": "^1.0.3 || ^2.0.0",
-        "color-support": "^1.1.2",
-        "console-control-strings": "^1.0.0",
-        "has-unicode": "^2.0.1",
-        "object-assign": "^4.1.1",
-        "signal-exit": "^3.0.0",
-        "string-width": "^4.2.3",
-        "strip-ansi": "^6.0.1",
-        "wide-align": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "engines": {
-        "node": "6.* || 8.* || >= 10.*"
-      }
-    },
-    "node_modules/get-func-name": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
-      "integrity": "sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==",
+    "node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
       "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/get-intrinsic": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
-      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1"
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/get-symbol-description": {
+    "node_modules/has-tostringtag": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/globalthis": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
-      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-      "dev": true,
-      "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/globby/node_modules/ignore": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/gopd/node_modules/get-intrinsic": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/gopd/node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/graceful-fs": {
-      "version": "4.2.10",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
-    },
-    "node_modules/graphemer": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
-      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
-      "dev": true
-    },
-    "node_modules/handlebars": {
-      "version": "4.7.7",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz",
-      "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5",
-        "neo-async": "^2.6.0",
-        "source-map": "^0.6.1",
-        "wordwrap": "^1.0.0"
-      },
-      "bin": {
-        "handlebars": "bin/handlebars"
-      },
-      "engines": {
-        "node": ">=0.4.7"
-      },
-      "optionalDependencies": {
-        "uglify-js": "^3.1.4"
-      }
-    },
-    "node_modules/handlebars/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/has-bigints": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
-      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/has-property-descriptors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.1.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-symbols": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.2"
+        "has-symbols": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4747,1288 +4131,726 @@
         "resolve-from": "^4.0.0"
       },
       "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.19"
-      }
-    },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "node_modules/internal-slot": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
-      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.1.0",
-        "has": "^1.0.3",
-        "side-channel": "^1.0.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/ipaddr.js": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/ipv6-normalize": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ipv6-normalize/-/ipv6-normalize-1.0.1.tgz",
-      "integrity": "sha512-Bm6H79i01DjgGTCWjUuCjJ6QDo1HB96PT/xCYuyJUP9WFbVDrLSbG4EZCvOCun2rNswZb0c3e4Jt/ws795esHA=="
-    },
-    "node_modules/is-array-buffer": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.1.tgz",
-      "integrity": "sha512-ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
-        "is-typed-array": "^1.1.10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-array-buffer/node_modules/get-intrinsic": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-array-buffer/node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-      "dev": true,
-      "dependencies": {
-        "has-bigints": "^1.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "dependencies": {
-        "binary-extensions": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-core-module": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz",
-      "integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==",
-      "dev": true,
-      "dependencies": {
-        "has": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/is-number-object": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz",
-      "integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-plain-obj": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
-      "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-potential-custom-element-name": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
-      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ=="
-    },
-    "node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-shared-array-buffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz",
-      "integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-typed-array": {
-      "version": "1.1.10",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz",
-      "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==",
-      "dev": true,
-      "dependencies": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-unicode-supported": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "dev": true
-    },
-    "node_modules/jpeg-js": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.4.tgz",
-      "integrity": "sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg=="
-    },
-    "node_modules/js-image-generator": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/js-image-generator/-/js-image-generator-1.0.4.tgz",
-      "integrity": "sha512-ckb7kyVojGAnArouVR+5lBIuwU1fcrn7E/YYSd0FK7oIngAkMmRvHASLro9Zt5SQdWToaI66NybG+OGxPw/HlQ==",
-      "dependencies": {
-        "jpeg-js": "^0.4.2"
-      }
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-    },
-    "node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/js2xmlparser": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-4.0.2.tgz",
-      "integrity": "sha512-6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA==",
-      "dev": true,
-      "dependencies": {
-        "xmlcreate": "^2.0.4"
-      }
-    },
-    "node_modules/jsdoc": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.0.tgz",
-      "integrity": "sha512-tzTgkklbWKrlaQL2+e3NNgLcZu3NaK2vsHRx7tyHQ+H5jcB9Gx0txSd2eJWlMC/xU1+7LQu4s58Ry0RkuaEQVg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/parser": "^7.9.4",
-        "@jsdoc/salty": "^0.2.1",
-        "@types/markdown-it": "^12.2.3",
-        "bluebird": "^3.7.2",
-        "catharsis": "^0.9.0",
-        "escape-string-regexp": "^2.0.0",
-        "js2xmlparser": "^4.0.2",
-        "klaw": "^3.0.0",
-        "markdown-it": "^12.3.2",
-        "markdown-it-anchor": "^8.4.1",
-        "marked": "^4.0.10",
-        "mkdirp": "^1.0.4",
-        "requizzle": "^0.2.3",
-        "strip-json-comments": "^3.1.0",
-        "underscore": "~1.13.2"
-      },
-      "bin": {
-        "jsdoc": "jsdoc.js"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/jsdoc-api": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/jsdoc-api/-/jsdoc-api-8.0.0.tgz",
-      "integrity": "sha512-Rnhor0suB1Ds1abjmFkFfKeD+kSMRN9oHMTMZoJVUrmtCGDwXty+sWMA9sa4xbe4UyxuPjhC7tavZ40mDKK6QQ==",
-      "dev": true,
-      "dependencies": {
-        "array-back": "^6.2.2",
-        "cache-point": "^2.0.0",
-        "collect-all": "^1.0.4",
-        "file-set": "^4.0.2",
-        "fs-then-native": "^2.0.0",
-        "jsdoc": "^4.0.0",
-        "object-to-spawn-args": "^2.0.1",
-        "temp-path": "^1.0.0",
-        "walk-back": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=12.17"
-      }
-    },
-    "node_modules/jsdoc-parse": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/jsdoc-parse/-/jsdoc-parse-6.2.0.tgz",
-      "integrity": "sha512-Afu1fQBEb7QHt6QWX/6eUWvYHJofB90Fjx7FuJYF7mnG9z5BkAIpms1wsnvYLytfmqpEENHs/fax9p8gvMj7dw==",
-      "dev": true,
-      "dependencies": {
-        "array-back": "^6.2.2",
-        "lodash.omit": "^4.5.0",
-        "lodash.pick": "^4.4.0",
-        "reduce-extract": "^1.0.0",
-        "sort-array": "^4.1.5",
-        "test-value": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/jsdoc-to-markdown": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/jsdoc-to-markdown/-/jsdoc-to-markdown-8.0.0.tgz",
-      "integrity": "sha512-2FQvYkg491+FP6s15eFlgSSWs69CvQrpbABGYBtvAvGWy/lWo8IKKToarT283w59rQFrpcjHl3YdhHCa3l7gXg==",
-      "dev": true,
-      "dependencies": {
-        "array-back": "^6.2.2",
-        "command-line-tool": "^0.8.0",
-        "config-master": "^3.1.0",
-        "dmd": "^6.2.0",
-        "jsdoc-api": "^8.0.0",
-        "jsdoc-parse": "^6.2.0",
-        "walk-back": "^5.1.0"
-      },
-      "bin": {
-        "jsdoc2md": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=12.17"
-      }
-    },
-    "node_modules/jsdoc/node_modules/escape-string-regexp": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jsdoc/node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "dev": true,
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/jsdom": {
-      "version": "19.0.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-19.0.0.tgz",
-      "integrity": "sha512-RYAyjCbxy/vri/CfnjUWJQQtZ3LKlLnDqj+9XLNnJPgEGeirZs3hllKR20re8LUZ6o1b1X4Jat+Qd26zmP41+A==",
-      "dependencies": {
-        "abab": "^2.0.5",
-        "acorn": "^8.5.0",
-        "acorn-globals": "^6.0.0",
-        "cssom": "^0.5.0",
-        "cssstyle": "^2.3.0",
-        "data-urls": "^3.0.1",
-        "decimal.js": "^10.3.1",
-        "domexception": "^4.0.0",
-        "escodegen": "^2.0.0",
-        "form-data": "^4.0.0",
-        "html-encoding-sniffer": "^3.0.0",
-        "http-proxy-agent": "^5.0.0",
-        "https-proxy-agent": "^5.0.0",
-        "is-potential-custom-element-name": "^1.0.1",
-        "nwsapi": "^2.2.0",
-        "parse5": "6.0.1",
-        "saxes": "^5.0.1",
-        "symbol-tree": "^3.2.4",
-        "tough-cookie": "^4.0.0",
-        "w3c-hr-time": "^1.0.2",
-        "w3c-xmlserializer": "^3.0.0",
-        "webidl-conversions": "^7.0.0",
-        "whatwg-encoding": "^2.0.0",
-        "whatwg-mimetype": "^3.0.0",
-        "whatwg-url": "^10.0.0",
-        "ws": "^8.2.3",
-        "xml-name-validator": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "peerDependencies": {
-        "canvas": "^2.5.0"
-      },
-      "peerDependenciesMeta": {
-        "canvas": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jsdom/node_modules/acorn": {
-      "version": "8.8.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
-      "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==",
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "dev": true,
-      "bin": {
-        "jsesc": "bin/jsesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-      "dev": true
-    },
-    "node_modules/json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="
-    },
-    "node_modules/json5": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-      "dev": true,
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/jsonfile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
-      "dev": true,
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/klaw": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/klaw/-/klaw-3.0.0.tgz",
-      "integrity": "sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.9"
-      }
-    },
-    "node_modules/levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
-      "dependencies": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/linkify-it": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
-      "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
-      "dev": true,
-      "dependencies": {
-        "uc.micro": "^1.0.1"
-      }
-    },
-    "node_modules/locate-path": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-      "dependencies": {
-        "p-locate": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
-    },
-    "node_modules/lodash-es": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
-      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
-    },
-    "node_modules/lodash.camelcase": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
-      "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=",
-      "dev": true
-    },
-    "node_modules/lodash.isempty": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz",
-      "integrity": "sha512-oKMuF3xEeqDltrGMfDxAPGIVMSSRv8tbRSODbrs4KGsRRLEhrW8N8Rd4DRgB2+621hY8A8XwwrTVhXWpxFvMzg=="
-    },
-    "node_modules/lodash.isfunction": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz",
-      "integrity": "sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw=="
-    },
-    "node_modules/lodash.isobject": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz",
-      "integrity": "sha512-3/Qptq2vr7WeJbB4KHUSKlq8Pl7ASXi3UG6CMbBm8WRtXi8+GHm7mKaU3urfpSEzWe2wCIChs6/sdocUsTKJiA=="
-    },
-    "node_modules/lodash.isstring": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
-      "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw=="
-    },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
-    },
-    "node_modules/lodash.omit": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz",
-      "integrity": "sha1-brGa5aHuHdnfC5aeZs4Lf6MLXmA=",
-      "dev": true
-    },
-    "node_modules/lodash.padend": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.6.1.tgz",
-      "integrity": "sha1-U8y6BH0G4VjTEfRdpiX05J5vFm4=",
-      "dev": true
-    },
-    "node_modules/lodash.pick": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz",
-      "integrity": "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=",
-      "dev": true
-    },
-    "node_modules/log-symbols": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
-      "dependencies": {
-        "chalk": "^4.1.0",
-        "is-unicode-supported": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "node": ">=6"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/log-symbols/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true,
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": ">=0.8.19"
       }
     },
-    "node_modules/log-symbols/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "once": "^1.3.0",
+        "wrappy": "1"
       }
     },
-    "node_modules/log-symbols/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "node_modules/internal-slot": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz",
+      "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==",
+      "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "get-intrinsic": "^1.2.0",
+        "has": "^1.0.3",
+        "side-channel": "^1.0.4"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/log-symbols/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/log-symbols/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/ipaddr.js": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.10"
       }
     },
-    "node_modules/log-symbols/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
+    "node_modules/ipv6-normalize": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ipv6-normalize/-/ipv6-normalize-1.0.1.tgz",
+      "integrity": "sha512-Bm6H79i01DjgGTCWjUuCjJ6QDo1HB96PT/xCYuyJUP9WFbVDrLSbG4EZCvOCun2rNswZb0c3e4Jt/ws795esHA=="
     },
-    "node_modules/loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+    "node_modules/is-array-buffer": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
+      "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
+      "dev": true,
       "dependencies": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.0",
+        "is-typed-array": "^1.1.10"
       },
-      "bin": {
-        "loose-envify": "cli.js"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/loupe": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.6.tgz",
-      "integrity": "sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==",
+    "node_modules/is-bigint": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "dev": true,
       "dependencies": {
-        "get-func-name": "^2.0.0"
+        "has-bigints": "^1.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "devOptional": true,
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
       "dependencies": {
-        "yallist": "^4.0.0"
+        "binary-extensions": "^2.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=8"
       }
     },
-    "node_modules/maildev": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/maildev/-/maildev-2.1.0.tgz",
-      "integrity": "sha512-lCgcUbKENKui3IXo9Jb3ToD0ia23izb0NRWT+Y9Z7534gS2/t2VScbcZwm3i3BGcNSKs0aYXswX7eH2JYEDkVg==",
+    "node_modules/is-boolean-object": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "dev": true,
       "dependencies": {
-        "addressparser": "1.0.1",
-        "async": "^3.2.3",
-        "commander": "^9.0.0",
-        "compression": "^1.7.4",
-        "cors": "^2.8.5",
-        "dompurify": "^2.3.6",
-        "express": "^4.17.3",
-        "iconv-lite": "0.5.0",
-        "jsdom": "^19.0.0",
-        "mime": "2.4.4",
-        "nodemailer": "^6.7.2",
-        "rimraf": "^3.0.2",
-        "smtp-server": "3.11.0",
-        "socket.io": "4.6.0",
-        "uue": "3.1.2"
-      },
-      "bin": {
-        "maildev": "bin/maildev"
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/maildev/node_modules/commander": {
-      "version": "9.4.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-9.4.1.tgz",
-      "integrity": "sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw==",
+    "node_modules/is-callable": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+      "dev": true,
       "engines": {
-        "node": "^12.20.0 || >=14"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/maildev/node_modules/iconv-lite": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.0.tgz",
-      "integrity": "sha512-NnEhI9hIEKHOzJ4f697DMz9IQEXr/MMJ5w64vN2/4Ai+wRnvV7SBrL0KLoRlwaKVghOc7LQ5YkPLuX146b6Ydw==",
+    "node_modules/is-core-module": {
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz",
+      "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==",
+      "dev": true,
       "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
+        "has": "^1.0.3"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "optional": true,
+    "node_modules/is-date-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "dev": true,
       "dependencies": {
-        "semver": "^6.0.0"
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/make-dir/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "optional": true,
-      "bin": {
-        "semver": "bin/semver.js"
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/make-error": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
-      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
-      "dev": true
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "node_modules/markdown-it": {
-      "version": "12.3.2",
-      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz",
-      "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
-      "dev": true,
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
       "dependencies": {
-        "argparse": "^2.0.1",
-        "entities": "~2.1.0",
-        "linkify-it": "^3.0.1",
-        "mdurl": "^1.0.1",
-        "uc.micro": "^1.0.5"
+        "is-extglob": "^2.1.1"
       },
-      "bin": {
-        "markdown-it": "bin/markdown-it.js"
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-negative-zero": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/markdown-it-anchor": {
-      "version": "8.6.5",
-      "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.6.5.tgz",
-      "integrity": "sha512-PI1qEHHkTNWT+X6Ip9w+paonfIQ+QZP9sCeMYi47oqhH+EsW8CrJ8J7CzV19QVOj6il8ATGbK2nTECj22ZHGvQ==",
-      "dev": true,
-      "peerDependencies": {
-        "@types/markdown-it": "*",
-        "markdown-it": "*"
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "engines": {
+        "node": ">=0.12.0"
       }
     },
-    "node_modules/markdown-it/node_modules/entities": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
-      "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
+    "node_modules/is-number-object": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
       "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/marked": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-4.2.3.tgz",
-      "integrity": "sha512-slWRdJkbTZ+PjkyJnE30Uid64eHwbwa1Q25INCAYfZlK4o6ylagBy/Le9eWntqJFoFT93ikUKMv47GZ4gTwHkw==",
+    "node_modules/is-path-inside": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
       "dev": true,
-      "bin": {
-        "marked": "bin/marked.js"
-      },
       "engines": {
-        "node": ">= 12"
+        "node": ">=8"
       }
     },
-    "node_modules/mdurl": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=",
-      "dev": true
-    },
-    "node_modules/media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
+    "node_modules/is-plain-obj": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
+      "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=8"
       }
     },
-    "node_modules/merge-descriptors": {
+    "node_modules/is-potential-custom-element-name": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
+      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
+      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ=="
     },
-    "node_modules/merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+    "node_modules/is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
       "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
       "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
-      "engines": {
-        "node": ">= 0.6"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+    "node_modules/is-shared-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
       "dev": true,
       "dependencies": {
-        "braces": "^3.0.2",
-        "picomatch": "^2.3.1"
+        "call-bind": "^1.0.2"
       },
-      "engines": {
-        "node": ">=8.6"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/mime": {
-      "version": "2.4.4",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
-      "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==",
-      "bin": {
-        "mime": "cli.js"
+    "node_modules/is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
-        "node": ">=4.0.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/mime-db": {
-      "version": "1.51.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
-      "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==",
+    "node_modules/is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/mime-types": {
-      "version": "2.1.34",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz",
-      "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
+    "node_modules/is-typed-array": {
+      "version": "1.1.10",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz",
+      "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==",
+      "dev": true,
       "dependencies": {
-        "mime-db": "1.51.0"
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/mimic-response": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
-      "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
-      "optional": true,
+    "node_modules/is-unicode-supported": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+    "node_modules/is-weakref": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "dev": true,
       "dependencies": {
-        "brace-expansion": "^1.1.7"
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
+    "node_modules/jpeg-js": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.4.tgz",
+      "integrity": "sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg=="
+    },
+    "node_modules/js-image-generator": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/js-image-generator/-/js-image-generator-1.0.4.tgz",
+      "integrity": "sha512-ckb7kyVojGAnArouVR+5lBIuwU1fcrn7E/YYSd0FK7oIngAkMmRvHASLro9Zt5SQdWToaI66NybG+OGxPw/HlQ==",
+      "dependencies": {
+        "jpeg-js": "^0.4.2"
+      }
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+    },
+    "node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/js2xmlparser": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-4.0.2.tgz",
+      "integrity": "sha512-6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA==",
+      "dev": true,
+      "dependencies": {
+        "xmlcreate": "^2.0.4"
+      }
+    },
+    "node_modules/jsdoc": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.0.tgz",
+      "integrity": "sha512-tzTgkklbWKrlaQL2+e3NNgLcZu3NaK2vsHRx7tyHQ+H5jcB9Gx0txSd2eJWlMC/xU1+7LQu4s58Ry0RkuaEQVg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/parser": "^7.9.4",
+        "@jsdoc/salty": "^0.2.1",
+        "@types/markdown-it": "^12.2.3",
+        "bluebird": "^3.7.2",
+        "catharsis": "^0.9.0",
+        "escape-string-regexp": "^2.0.0",
+        "js2xmlparser": "^4.0.2",
+        "klaw": "^3.0.0",
+        "markdown-it": "^12.3.2",
+        "markdown-it-anchor": "^8.4.1",
+        "marked": "^4.0.10",
+        "mkdirp": "^1.0.4",
+        "requizzle": "^0.2.3",
+        "strip-json-comments": "^3.1.0",
+        "underscore": "~1.13.2"
+      },
+      "bin": {
+        "jsdoc": "jsdoc.js"
       },
       "engines": {
-        "node": "*"
+        "node": ">=12.0.0"
       }
     },
-    "node_modules/minimist": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
-      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==",
+    "node_modules/jsdoc-api": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/jsdoc-api/-/jsdoc-api-8.0.0.tgz",
+      "integrity": "sha512-Rnhor0suB1Ds1abjmFkFfKeD+kSMRN9oHMTMZoJVUrmtCGDwXty+sWMA9sa4xbe4UyxuPjhC7tavZ40mDKK6QQ==",
       "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/minipass": {
-      "version": "4.2.7",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.7.tgz",
-      "integrity": "sha512-ScVIgqHcXRMyfflqHmEW0bm8z8rb5McHyOY3ewX9JBgZaR77G7nxq9L/mtV96/QbAAwtbCAHVVLzD1kkyfFQEw==",
-      "optional": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minizlib": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
-      "optional": true,
       "dependencies": {
-        "minipass": "^3.0.0",
-        "yallist": "^4.0.0"
+        "array-back": "^6.2.2",
+        "cache-point": "^2.0.0",
+        "collect-all": "^1.0.4",
+        "file-set": "^4.0.2",
+        "fs-then-native": "^2.0.0",
+        "jsdoc": "^4.0.0",
+        "object-to-spawn-args": "^2.0.1",
+        "temp-path": "^1.0.0",
+        "walk-back": "^5.1.0"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">=12.17"
       }
     },
-    "node_modules/minizlib/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-      "optional": true,
+    "node_modules/jsdoc-parse": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/jsdoc-parse/-/jsdoc-parse-6.2.0.tgz",
+      "integrity": "sha512-Afu1fQBEb7QHt6QWX/6eUWvYHJofB90Fjx7FuJYF7mnG9z5BkAIpms1wsnvYLytfmqpEENHs/fax9p8gvMj7dw==",
+      "dev": true,
       "dependencies": {
-        "yallist": "^4.0.0"
+        "array-back": "^6.2.2",
+        "lodash.omit": "^4.5.0",
+        "lodash.pick": "^4.4.0",
+        "reduce-extract": "^1.0.0",
+        "sort-array": "^4.1.5",
+        "test-value": "^3.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       }
     },
-    "node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+    "node_modules/jsdoc-to-markdown": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/jsdoc-to-markdown/-/jsdoc-to-markdown-8.0.0.tgz",
+      "integrity": "sha512-2FQvYkg491+FP6s15eFlgSSWs69CvQrpbABGYBtvAvGWy/lWo8IKKToarT283w59rQFrpcjHl3YdhHCa3l7gXg==",
       "dev": true,
       "dependencies": {
-        "minimist": "^1.2.5"
+        "array-back": "^6.2.2",
+        "command-line-tool": "^0.8.0",
+        "config-master": "^3.1.0",
+        "dmd": "^6.2.0",
+        "jsdoc-api": "^8.0.0",
+        "jsdoc-parse": "^6.2.0",
+        "walk-back": "^5.1.0"
       },
       "bin": {
-        "mkdirp": "bin/cmd.js"
+        "jsdoc2md": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=12.17"
       }
     },
-    "node_modules/mkdirp2": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/mkdirp2/-/mkdirp2-1.0.5.tgz",
-      "integrity": "sha512-xOE9xbICroUDmG1ye2h4bZ8WBie9EGmACaco8K8cx6RlkJJrxGIqjGqztAI+NMhexXBcdGbSEzI6N3EJPevxZw==",
-      "dev": true
+    "node_modules/jsdoc/node_modules/escape-string-regexp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "node_modules/mocha": {
-      "version": "10.2.0",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.2.0.tgz",
-      "integrity": "sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg==",
-      "dependencies": {
-        "ansi-colors": "4.1.1",
-        "browser-stdout": "1.3.1",
-        "chokidar": "3.5.3",
-        "debug": "4.3.4",
-        "diff": "5.0.0",
-        "escape-string-regexp": "4.0.0",
-        "find-up": "5.0.0",
-        "glob": "7.2.0",
-        "he": "1.2.0",
-        "js-yaml": "4.1.0",
-        "log-symbols": "4.1.0",
-        "minimatch": "5.0.1",
-        "ms": "2.1.3",
-        "nanoid": "3.3.3",
-        "serialize-javascript": "6.0.0",
-        "strip-json-comments": "3.1.1",
-        "supports-color": "8.1.1",
-        "workerpool": "6.2.1",
-        "yargs": "16.2.0",
-        "yargs-parser": "20.2.4",
-        "yargs-unparser": "2.0.0"
-      },
+    "node_modules/jsdoc/node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "dev": true,
       "bin": {
-        "_mocha": "bin/_mocha",
-        "mocha": "bin/mocha.js"
+        "mkdirp": "bin/cmd.js"
       },
       "engines": {
-        "node": ">= 14.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mochajs"
-      }
-    },
-    "node_modules/mocha/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
+        "node": ">=10"
       }
     },
-    "node_modules/mocha/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+    "node_modules/jsdom": {
+      "version": "19.0.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-19.0.0.tgz",
+      "integrity": "sha512-RYAyjCbxy/vri/CfnjUWJQQtZ3LKlLnDqj+9XLNnJPgEGeirZs3hllKR20re8LUZ6o1b1X4Jat+Qd26zmP41+A==",
       "dependencies": {
-        "ms": "2.1.2"
+        "abab": "^2.0.5",
+        "acorn": "^8.5.0",
+        "acorn-globals": "^6.0.0",
+        "cssom": "^0.5.0",
+        "cssstyle": "^2.3.0",
+        "data-urls": "^3.0.1",
+        "decimal.js": "^10.3.1",
+        "domexception": "^4.0.0",
+        "escodegen": "^2.0.0",
+        "form-data": "^4.0.0",
+        "html-encoding-sniffer": "^3.0.0",
+        "http-proxy-agent": "^5.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "is-potential-custom-element-name": "^1.0.1",
+        "nwsapi": "^2.2.0",
+        "parse5": "6.0.1",
+        "saxes": "^5.0.1",
+        "symbol-tree": "^3.2.4",
+        "tough-cookie": "^4.0.0",
+        "w3c-hr-time": "^1.0.2",
+        "w3c-xmlserializer": "^3.0.0",
+        "webidl-conversions": "^7.0.0",
+        "whatwg-encoding": "^2.0.0",
+        "whatwg-mimetype": "^3.0.0",
+        "whatwg-url": "^10.0.0",
+        "ws": "^8.2.3",
+        "xml-name-validator": "^4.0.0"
       },
       "engines": {
-        "node": ">=6.0"
+        "node": ">=12"
+      },
+      "peerDependencies": {
+        "canvas": "^2.5.0"
       },
       "peerDependenciesMeta": {
-        "supports-color": {
+        "canvas": {
           "optional": true
         }
       }
     },
-    "node_modules/mocha/node_modules/debug/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "node_modules/mocha/node_modules/diff": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
-      "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
+    "node_modules/jsdom/node_modules/acorn": {
+      "version": "8.8.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
+      "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
       "engines": {
-        "node": ">=0.3.1"
+        "node": ">=0.4.0"
       }
     },
-    "node_modules/mocha/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+    "node_modules/jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "dev": true,
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
       "engines": {
-        "node": ">=10"
+        "node": ">=4"
+      }
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "dev": true
+    },
+    "node_modules/json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="
+    },
+    "node_modules/json5": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "dev": true,
+      "bin": {
+        "json5": "lib/cli.js"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "engines": {
+        "node": ">=6"
       }
     },
-    "node_modules/mocha/node_modules/has-flag": {
+    "node_modules/jsonfile": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
+      "dev": true,
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
       }
     },
-    "node_modules/mocha/node_modules/minimatch": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
-      "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
+    "node_modules/klaw": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-3.0.0.tgz",
+      "integrity": "sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==",
+      "dev": true,
       "dependencies": {
-        "brace-expansion": "^2.0.1"
+        "graceful-fs": "^4.1.9"
+      }
+    },
+    "node_modules/levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
+      "dependencies": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/mocha/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+    "node_modules/linkify-it": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
+      "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
+      "dev": true,
+      "dependencies": {
+        "uc.micro": "^1.0.1"
+      }
     },
-    "node_modules/mocha/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+    "node_modules/locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "p-locate": "^5.0.0"
       },
       "engines": {
         "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/mochawesome": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/mochawesome/-/mochawesome-7.1.3.tgz",
-      "integrity": "sha512-Vkb3jR5GZ1cXohMQQ73H3cZz7RoxGjjUo0G5hu0jLaW+0FdUxUwg3Cj29bqQdh0rFcnyV06pWmqmi5eBPnEuNQ==",
-      "dependencies": {
-        "chalk": "^4.1.2",
-        "diff": "^5.0.0",
-        "json-stringify-safe": "^5.0.1",
-        "lodash.isempty": "^4.4.0",
-        "lodash.isfunction": "^3.0.9",
-        "lodash.isobject": "^3.0.2",
-        "lodash.isstring": "^4.0.1",
-        "mochawesome-report-generator": "^6.2.0",
-        "strip-ansi": "^6.0.1",
-        "uuid": "^8.3.2"
-      },
-      "peerDependencies": {
-        "mocha": ">=7"
-      }
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
     },
-    "node_modules/mochawesome-merge": {
+    "node_modules/lodash-es": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
+      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
+    },
+    "node_modules/lodash.camelcase": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/mochawesome-merge/-/mochawesome-merge-4.3.0.tgz",
-      "integrity": "sha512-1roR6g+VUlfdaRmL8dCiVpKiaUhbPVm1ZQYUM6zHX46mWk+tpsKVZR6ba98k2zc8nlPvYd71yn5gyH970pKBSw==",
-      "dev": true,
+      "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
+      "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=",
+      "dev": true
+    },
+    "node_modules/lodash.isempty": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz",
+      "integrity": "sha512-oKMuF3xEeqDltrGMfDxAPGIVMSSRv8tbRSODbrs4KGsRRLEhrW8N8Rd4DRgB2+621hY8A8XwwrTVhXWpxFvMzg=="
+    },
+    "node_modules/lodash.isfunction": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz",
+      "integrity": "sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw=="
+    },
+    "node_modules/lodash.isobject": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz",
+      "integrity": "sha512-3/Qptq2vr7WeJbB4KHUSKlq8Pl7ASXi3UG6CMbBm8WRtXi8+GHm7mKaU3urfpSEzWe2wCIChs6/sdocUsTKJiA=="
+    },
+    "node_modules/lodash.isstring": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
+      "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw=="
+    },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
+    },
+    "node_modules/lodash.omit": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz",
+      "integrity": "sha1-brGa5aHuHdnfC5aeZs4Lf6MLXmA=",
+      "dev": true
+    },
+    "node_modules/lodash.padend": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.6.1.tgz",
+      "integrity": "sha1-U8y6BH0G4VjTEfRdpiX05J5vFm4=",
+      "dev": true
+    },
+    "node_modules/lodash.pick": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz",
+      "integrity": "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=",
+      "dev": true
+    },
+    "node_modules/log-symbols": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
       "dependencies": {
-        "fs-extra": "^7.0.1",
-        "glob": "^7.1.6",
-        "yargs": "^15.3.1"
-      },
-      "bin": {
-        "mochawesome-merge": "bin/mochawesome-merge.js"
+        "chalk": "^4.1.0",
+        "is-unicode-supported": "^0.1.0"
       },
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/mochawesome-merge/node_modules/ansi-styles": {
+    "node_modules/log-symbols/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -6039,22 +4861,25 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/mochawesome-merge/node_modules/cliui": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-      "dev": true,
+    "node_modules/log-symbols/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^6.2.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/mochawesome-merge/node_modules/color-convert": {
+    "node_modules/log-symbols/node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -6062,350 +4887,515 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/mochawesome-merge/node_modules/color-name": {
+    "node_modules/log-symbols/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
-    "node_modules/mochawesome-merge/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
+    "node_modules/log-symbols/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/log-symbols/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "dependencies": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      },
+      "bin": {
+        "loose-envify": "cli.js"
+      }
+    },
+    "node_modules/loupe": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.6.tgz",
+      "integrity": "sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==",
+      "dependencies": {
+        "get-func-name": "^2.0.0"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "devOptional": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/maildev": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/maildev/-/maildev-2.1.0.tgz",
+      "integrity": "sha512-lCgcUbKENKui3IXo9Jb3ToD0ia23izb0NRWT+Y9Z7534gS2/t2VScbcZwm3i3BGcNSKs0aYXswX7eH2JYEDkVg==",
+      "dependencies": {
+        "addressparser": "1.0.1",
+        "async": "^3.2.3",
+        "commander": "^9.0.0",
+        "compression": "^1.7.4",
+        "cors": "^2.8.5",
+        "dompurify": "^2.3.6",
+        "express": "^4.17.3",
+        "iconv-lite": "0.5.0",
+        "jsdom": "^19.0.0",
+        "mime": "2.4.4",
+        "nodemailer": "^6.7.2",
+        "rimraf": "^3.0.2",
+        "smtp-server": "3.11.0",
+        "socket.io": "4.6.0",
+        "uue": "3.1.2"
+      },
+      "bin": {
+        "maildev": "bin/maildev"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12.0.0"
       }
     },
-    "node_modules/mochawesome-merge/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
+    "node_modules/maildev/node_modules/commander": {
+      "version": "9.4.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-9.4.1.tgz",
+      "integrity": "sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw==",
+      "engines": {
+        "node": "^12.20.0 || >=14"
+      }
+    },
+    "node_modules/maildev/node_modules/iconv-lite": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.0.tgz",
+      "integrity": "sha512-NnEhI9hIEKHOzJ4f697DMz9IQEXr/MMJ5w64vN2/4Ai+wRnvV7SBrL0KLoRlwaKVghOc7LQ5YkPLuX146b6Ydw==",
       "dependencies": {
-        "p-locate": "^4.1.0"
+        "safer-buffer": ">= 2.1.2 < 3"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/mochawesome-merge/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
+    "node_modules/make-dir": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "optional": true,
       "dependencies": {
-        "p-try": "^2.0.0"
+        "semver": "^6.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/mochawesome-merge/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+    "node_modules/make-dir/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "optional": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/make-error": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+      "dev": true
+    },
+    "node_modules/markdown-it": {
+      "version": "12.3.2",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz",
+      "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
       "dev": true,
       "dependencies": {
-        "p-limit": "^2.2.0"
+        "argparse": "^2.0.1",
+        "entities": "~2.1.0",
+        "linkify-it": "^3.0.1",
+        "mdurl": "^1.0.1",
+        "uc.micro": "^1.0.5"
       },
-      "engines": {
-        "node": ">=8"
+      "bin": {
+        "markdown-it": "bin/markdown-it.js"
       }
     },
-    "node_modules/mochawesome-merge/node_modules/wrap-ansi": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+    "node_modules/markdown-it-anchor": {
+      "version": "8.6.5",
+      "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.6.5.tgz",
+      "integrity": "sha512-PI1qEHHkTNWT+X6Ip9w+paonfIQ+QZP9sCeMYi47oqhH+EsW8CrJ8J7CzV19QVOj6il8ATGbK2nTECj22ZHGvQ==",
       "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+      "peerDependencies": {
+        "@types/markdown-it": "*",
+        "markdown-it": "*"
       }
     },
-    "node_modules/mochawesome-merge/node_modules/yargs": {
-      "version": "15.4.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
-      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+    "node_modules/markdown-it/node_modules/entities": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
+      "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
       "dev": true,
-      "dependencies": {
-        "cliui": "^6.0.0",
-        "decamelize": "^1.2.0",
-        "find-up": "^4.1.0",
-        "get-caller-file": "^2.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^4.2.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^18.1.2"
-      },
-      "engines": {
-        "node": ">=8"
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
-    "node_modules/mochawesome-merge/node_modules/yargs-parser": {
-      "version": "18.1.3",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+    "node_modules/marked": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-4.2.3.tgz",
+      "integrity": "sha512-slWRdJkbTZ+PjkyJnE30Uid64eHwbwa1Q25INCAYfZlK4o6ylagBy/Le9eWntqJFoFT93ikUKMv47GZ4gTwHkw==",
       "dev": true,
-      "dependencies": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
+      "bin": {
+        "marked": "bin/marked.js"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">= 12"
       }
     },
-    "node_modules/mochawesome-report-generator": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/mochawesome-report-generator/-/mochawesome-report-generator-6.2.0.tgz",
-      "integrity": "sha512-Ghw8JhQFizF0Vjbtp9B0i//+BOkV5OWcQCPpbO0NGOoxV33o+gKDYU0Pr2pGxkIHnqZ+g5mYiXF7GMNgAcDpSg==",
-      "dependencies": {
-        "chalk": "^4.1.2",
-        "dateformat": "^4.5.1",
-        "escape-html": "^1.0.3",
-        "fs-extra": "^10.0.0",
-        "fsu": "^1.1.1",
-        "lodash.isfunction": "^3.0.9",
-        "opener": "^1.5.2",
-        "prop-types": "^15.7.2",
-        "tcomb": "^3.2.17",
-        "tcomb-validation": "^3.3.0",
-        "validator": "^13.6.0",
-        "yargs": "^17.2.1"
-      },
-      "bin": {
-        "marge": "bin/cli.js"
+    "node_modules/mdurl": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
+      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=",
+      "dev": true
+    },
+    "node_modules/media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
+      "engines": {
+        "node": ">= 0.6"
       }
     },
-    "node_modules/mochawesome-report-generator/node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+    "node_modules/merge-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
+    },
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": ">= 8"
       }
     },
-    "node_modules/mochawesome-report-generator/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
+    "node_modules/methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/mochawesome-report-generator/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/micromatch": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/mime": {
+      "version": "2.4.4",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
+      "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==",
+      "bin": {
+        "mime": "cli.js"
       },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+      "engines": {
+        "node": ">=4.0.0"
       }
     },
-    "node_modules/mochawesome-report-generator/node_modules/cliui": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+    "node_modules/mime-db": {
+      "version": "1.51.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
+      "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.34",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz",
+      "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
       "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.1",
-        "wrap-ansi": "^7.0.0"
+        "mime-db": "1.51.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/mochawesome-report-generator/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
+    "node_modules/mimic-response": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
+      "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
+      "optional": true,
+      "engines": {
+        "node": ">=8"
       },
-      "engines": {
-        "node": ">=7.0.0"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/mochawesome-report-generator/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/mochawesome-report-generator/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-    },
-    "node_modules/mochawesome-report-generator/node_modules/fs-extra": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+    "node_modules/minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
       "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
+        "brace-expansion": "^1.1.7"
       },
       "engines": {
-        "node": ">=12"
+        "node": "*"
       }
     },
-    "node_modules/mochawesome-report-generator/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
+    "node_modules/minimist": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
+      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/mochawesome-report-generator/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+    "node_modules/minipass": {
+      "version": "4.2.7",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.7.tgz",
+      "integrity": "sha512-ScVIgqHcXRMyfflqHmEW0bm8z8rb5McHyOY3ewX9JBgZaR77G7nxq9L/mtV96/QbAAwtbCAHVVLzD1kkyfFQEw==",
+      "optional": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/mochawesome-report-generator/node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+    "node_modules/minizlib": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
+      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+      "optional": true,
       "dependencies": {
-        "universalify": "^2.0.0"
+        "minipass": "^3.0.0",
+        "yallist": "^4.0.0"
       },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
+      "engines": {
+        "node": ">= 8"
       }
     },
-    "node_modules/mochawesome-report-generator/node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+    "node_modules/minizlib/node_modules/minipass": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+      "optional": true,
       "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
+        "yallist": "^4.0.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/mochawesome-report-generator/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+    "node_modules/mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "dev": true,
       "dependencies": {
-        "ansi-regex": "^5.0.1"
+        "minimist": "^1.2.5"
       },
-      "engines": {
-        "node": ">=8"
+      "bin": {
+        "mkdirp": "bin/cmd.js"
       }
     },
-    "node_modules/mochawesome-report-generator/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/mkdirp2": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/mkdirp2/-/mkdirp2-1.0.5.tgz",
+      "integrity": "sha512-xOE9xbICroUDmG1ye2h4bZ8WBie9EGmACaco8K8cx6RlkJJrxGIqjGqztAI+NMhexXBcdGbSEzI6N3EJPevxZw==",
+      "dev": true
+    },
+    "node_modules/mocha": {
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.2.0.tgz",
+      "integrity": "sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg==",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "ansi-colors": "4.1.1",
+        "browser-stdout": "1.3.1",
+        "chokidar": "3.5.3",
+        "debug": "4.3.4",
+        "diff": "5.0.0",
+        "escape-string-regexp": "4.0.0",
+        "find-up": "5.0.0",
+        "glob": "7.2.0",
+        "he": "1.2.0",
+        "js-yaml": "4.1.0",
+        "log-symbols": "4.1.0",
+        "minimatch": "5.0.1",
+        "ms": "2.1.3",
+        "nanoid": "3.3.3",
+        "serialize-javascript": "6.0.0",
+        "strip-json-comments": "3.1.1",
+        "supports-color": "8.1.1",
+        "workerpool": "6.2.1",
+        "yargs": "16.2.0",
+        "yargs-parser": "20.2.4",
+        "yargs-unparser": "2.0.0"
+      },
+      "bin": {
+        "_mocha": "bin/_mocha",
+        "mocha": "bin/mocha.js"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 14.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/mochajs"
       }
     },
-    "node_modules/mochawesome-report-generator/node_modules/universalify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-      "engines": {
-        "node": ">= 10.0.0"
+    "node_modules/mocha/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/mochawesome-report-generator/node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+    "node_modules/mocha/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
+        "ms": "2.1.2"
       },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/mocha/node_modules/debug/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+    },
+    "node_modules/mocha/node_modules/diff": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
+      "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
+    "node_modules/mocha/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
       "engines": {
         "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/mochawesome-report-generator/node_modules/y18n": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+    "node_modules/mocha/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "engines": {
-        "node": ">=10"
+        "node": ">=8"
       }
     },
-    "node_modules/mochawesome-report-generator/node_modules/yargs": {
-      "version": "17.6.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.0.tgz",
-      "integrity": "sha512-8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g==",
+    "node_modules/mocha/node_modules/minimatch": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
+      "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
       "dependencies": {
-        "cliui": "^8.0.1",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.3",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^21.0.0"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=10"
       }
     },
-    "node_modules/mochawesome-report-generator/node_modules/yargs-parser": {
-      "version": "21.1.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+    "node_modules/mocha/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+    },
+    "node_modules/mocha/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/mochawesome": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/mochawesome/-/mochawesome-7.1.3.tgz",
+      "integrity": "sha512-Vkb3jR5GZ1cXohMQQ73H3cZz7RoxGjjUo0G5hu0jLaW+0FdUxUwg3Cj29bqQdh0rFcnyV06pWmqmi5eBPnEuNQ==",
+      "dependencies": {
+        "chalk": "^4.1.2",
+        "diff": "^5.0.0",
+        "json-stringify-safe": "^5.0.1",
+        "lodash.isempty": "^4.4.0",
+        "lodash.isfunction": "^3.0.9",
+        "lodash.isobject": "^3.0.2",
+        "lodash.isstring": "^4.0.1",
+        "mochawesome-report-generator": "^6.2.0",
+        "strip-ansi": "^6.0.1",
+        "uuid": "^8.3.2"
+      },
+      "peerDependencies": {
+        "mocha": ">=7"
       }
     },
-    "node_modules/mochawesome/node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+    "node_modules/mochawesome-merge": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/mochawesome-merge/-/mochawesome-merge-4.3.0.tgz",
+      "integrity": "sha512-1roR6g+VUlfdaRmL8dCiVpKiaUhbPVm1ZQYUM6zHX46mWk+tpsKVZR6ba98k2zc8nlPvYd71yn5gyH970pKBSw==",
+      "dev": true,
+      "dependencies": {
+        "fs-extra": "^7.0.1",
+        "glob": "^7.1.6",
+        "yargs": "^15.3.1"
+      },
+      "bin": {
+        "mochawesome-merge": "bin/mochawesome-merge.js"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">=10.0.0"
       }
     },
-    "node_modules/mochawesome/node_modules/ansi-styles": {
+    "node_modules/mochawesome-merge/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -6416,25 +5406,22 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/mochawesome/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/mochawesome-merge/node_modules/cliui": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+      "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^6.2.0"
       }
     },
-    "node_modules/mochawesome/node_modules/color-convert": {
+    "node_modules/mochawesome-merge/node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -6442,605 +5429,608 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/mochawesome/node_modules/color-name": {
+    "node_modules/mochawesome-merge/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
-    "node_modules/mochawesome/node_modules/diff": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
-      "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
+    "node_modules/mochawesome-merge/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
       "engines": {
-        "node": ">=0.3.1"
+        "node": ">=8"
       }
     },
-    "node_modules/mochawesome/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/mochawesome-merge/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/mochawesome/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+    "node_modules/mochawesome-merge/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
       "dependencies": {
-        "ansi-regex": "^5.0.1"
+        "p-try": "^2.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/mochawesome/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/mochawesome-merge/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "p-limit": "^2.2.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "node_modules/nan": {
-      "version": "2.17.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
-      "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
-      "optional": true
-    },
-    "node_modules/nanoid": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz",
-      "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==",
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
+    "node_modules/mochawesome-merge/node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
       },
       "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+        "node": ">=8"
       }
     },
-    "node_modules/natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-      "dev": true
-    },
-    "node_modules/natural-compare-lite": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
-      "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
-      "dev": true
-    },
-    "node_modules/negotiator": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+    "node_modules/mochawesome-merge/node_modules/yargs": {
+      "version": "15.4.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^6.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^4.1.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^4.2.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^18.1.2"
+      },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=8"
       }
     },
-    "node_modules/neo-async": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-      "dev": true
-    },
-    "node_modules/node-fetch": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz",
-      "integrity": "sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==",
-      "optional": true,
+    "node_modules/mochawesome-merge/node_modules/yargs-parser": {
+      "version": "18.1.3",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+      "dev": true,
       "dependencies": {
-        "whatwg-url": "^5.0.0"
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
       },
       "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
+        "node": ">=6"
       }
     },
-    "node_modules/node-fetch/node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
-      "optional": true
-    },
-    "node_modules/node-fetch/node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
-      "optional": true
-    },
-    "node_modules/node-fetch/node_modules/whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-      "optional": true,
+    "node_modules/mochawesome-report-generator": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/mochawesome-report-generator/-/mochawesome-report-generator-6.2.0.tgz",
+      "integrity": "sha512-Ghw8JhQFizF0Vjbtp9B0i//+BOkV5OWcQCPpbO0NGOoxV33o+gKDYU0Pr2pGxkIHnqZ+g5mYiXF7GMNgAcDpSg==",
       "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
+        "chalk": "^4.1.2",
+        "dateformat": "^4.5.1",
+        "escape-html": "^1.0.3",
+        "fs-extra": "^10.0.0",
+        "fsu": "^1.1.1",
+        "lodash.isfunction": "^3.0.9",
+        "opener": "^1.5.2",
+        "prop-types": "^15.7.2",
+        "tcomb": "^3.2.17",
+        "tcomb-validation": "^3.3.0",
+        "validator": "^13.6.0",
+        "yargs": "^17.2.1"
+      },
+      "bin": {
+        "marge": "bin/cli.js"
       }
     },
-    "node_modules/nodemailer": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.8.0.tgz",
-      "integrity": "sha512-EjYvSmHzekz6VNkNd12aUqAco+bOkRe3Of5jVhltqKhEsjw/y0PYPJfp83+s9Wzh1dspYAkUW/YNQ350NATbSQ==",
+    "node_modules/mochawesome-report-generator/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/mochawesome-report-generator/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/nopt": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
-      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
-      "optional": true,
+    "node_modules/mochawesome-report-generator/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dependencies": {
-        "abbrev": "1"
-      },
-      "bin": {
-        "nopt": "bin/nopt.js"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+    "node_modules/mochawesome-report-generator/node_modules/cliui": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=12"
       }
     },
-    "node_modules/npmlog": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
-      "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
-      "optional": true,
+    "node_modules/mochawesome-report-generator/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dependencies": {
-        "are-we-there-yet": "^2.0.0",
-        "console-control-strings": "^1.1.0",
-        "gauge": "^3.0.0",
-        "set-blocking": "^2.0.0"
-      }
-    },
-    "node_modules/nwsapi": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.2.tgz",
-      "integrity": "sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw=="
-    },
-    "node_modules/object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+        "color-name": "~1.1.4"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/object-get": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/object-get/-/object-get-2.1.1.tgz",
-      "integrity": "sha512-7n4IpLMzGGcLEMiQKsNR7vCe+N5E9LORFrtNUVy4sO3dj9a3HedZCxEL2T7QuLhcHN1NBuBsMOKaOsAYI9IIvg==",
-      "dev": true
+    "node_modules/mochawesome-report-generator/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
-    "node_modules/object-inspect": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz",
-      "integrity": "sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA==",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+    "node_modules/mochawesome-report-generator/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
+    "node_modules/mochawesome-report-generator/node_modules/fs-extra": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true,
+    "node_modules/mochawesome-report-generator/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=8"
       }
     },
-    "node_modules/object-to-spawn-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/object-to-spawn-args/-/object-to-spawn-args-2.0.1.tgz",
-      "integrity": "sha512-6FuKFQ39cOID+BMZ3QaphcC8Y4cw6LXBLyIgPU+OhIYwviJamPAn+4mITapnSBQrejB+NNp+FMskhD8Cq+Ys3w==",
-      "dev": true,
+    "node_modules/mochawesome-report-generator/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
       "engines": {
-        "node": ">=8.0.0"
+        "node": ">=8"
       }
     },
-    "node_modules/object.assign": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
-      "dev": true,
+    "node_modules/mochawesome-report-generator/node_modules/jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
       "dependencies": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "has-symbols": "^1.0.1",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "universalify": "^2.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
       }
     },
-    "node_modules/object.entries": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz",
-      "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==",
-      "dev": true,
+    "node_modules/mochawesome-report-generator/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=8"
       }
     },
-    "node_modules/object.entries/node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-      "dev": true,
+    "node_modules/mochawesome-report-generator/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
+        "ansi-regex": "^5.0.1"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=8"
       }
     },
-    "node_modules/object.entries/node_modules/es-abstract": {
-      "version": "1.20.4",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz",
-      "integrity": "sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==",
-      "dev": true,
+    "node_modules/mochawesome-report-generator/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.3",
-        "get-symbol-description": "^1.0.0",
-        "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.7",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.2",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.4.3",
-        "safe-regex-test": "^1.0.0",
-        "string.prototype.trimend": "^1.0.5",
-        "string.prototype.trimstart": "^1.0.5",
-        "unbox-primitive": "^1.0.2"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=8"
       }
     },
-    "node_modules/object.entries/node_modules/get-intrinsic": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-      "dev": true,
+    "node_modules/mochawesome-report-generator/node_modules/universalify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/mochawesome-report-generator/node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.3"
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/object.entries/node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+    "node_modules/mochawesome-report-generator/node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "engines": {
+        "node": ">=10"
       }
     },
-    "node_modules/object.entries/node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
+    "node_modules/mochawesome-report-generator/node_modules/yargs": {
+      "version": "17.6.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.0.tgz",
+      "integrity": "sha512-8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g==",
+      "dependencies": {
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/mochawesome-report-generator/node_modules/yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=12"
       }
     },
-    "node_modules/object.entries/node_modules/is-callable": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
-      "dev": true,
+    "node_modules/mochawesome/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=8"
       }
     },
-    "node_modules/object.entries/node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-      "dev": true,
+    "node_modules/mochawesome/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dependencies": {
-        "call-bind": "^1.0.2"
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries/node_modules/object-inspect": {
-      "version": "1.12.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/object.entries/node_modules/object.assign": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-      "dev": true,
+    "node_modules/mochawesome/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "has-symbols": "^1.0.3",
-        "object-keys": "^1.1.1"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/object.entries/node_modules/string.prototype.trimend": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
-      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
-      "dev": true,
+    "node_modules/mochawesome/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "color-name": "~1.1.4"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/object.entries/node_modules/string.prototype.trimstart": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
-      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+    "node_modules/mochawesome/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    },
+    "node_modules/mochawesome/node_modules/diff": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
+      "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
+      "engines": {
+        "node": ">=0.3.1"
       }
     },
-    "node_modules/object.entries/node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+    "node_modules/mochawesome/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/object.values": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
-      "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
-      "dev": true,
+    "node_modules/mochawesome/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "ansi-regex": "^5.0.1"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=8"
       }
     },
-    "node_modules/object.values/node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-      "dev": true,
+    "node_modules/mochawesome/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=8"
       }
     },
-    "node_modules/object.values/node_modules/es-abstract": {
-      "version": "1.21.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.1.tgz",
-      "integrity": "sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==",
-      "dev": true,
-      "dependencies": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "es-set-tostringtag": "^2.0.1",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.3",
-        "get-symbol-description": "^1.0.0",
-        "globalthis": "^1.0.3",
-        "gopd": "^1.0.1",
-        "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.4",
-        "is-array-buffer": "^3.0.1",
-        "is-callable": "^1.2.7",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.10",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.2",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.4.3",
-        "safe-regex-test": "^1.0.0",
-        "string.prototype.trimend": "^1.0.6",
-        "string.prototype.trimstart": "^1.0.6",
-        "typed-array-length": "^1.0.4",
-        "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.9"
+    "node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+    },
+    "node_modules/nan": {
+      "version": "2.17.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
+      "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
+      "optional": true
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz",
+      "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==",
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
       }
     },
-    "node_modules/object.values/node_modules/get-intrinsic": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-      "dev": true,
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true
+    },
+    "node_modules/natural-compare-lite": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
+      "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
+      "dev": true
+    },
+    "node_modules/negotiator": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/neo-async": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+      "dev": true
+    },
+    "node_modules/node-fetch": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz",
+      "integrity": "sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==",
+      "optional": true,
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.3"
+        "whatwg-url": "^5.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
       }
     },
-    "node_modules/object.values/node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+    "node_modules/node-fetch/node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
+      "optional": true
+    },
+    "node_modules/node-fetch/node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
+      "optional": true
+    },
+    "node_modules/node-fetch/node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "optional": true,
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
       }
     },
-    "node_modules/object.values/node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
+    "node_modules/nodemailer": {
+      "version": "6.8.0",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.8.0.tgz",
+      "integrity": "sha512-EjYvSmHzekz6VNkNd12aUqAco+bOkRe3Of5jVhltqKhEsjw/y0PYPJfp83+s9Wzh1dspYAkUW/YNQ350NATbSQ==",
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/object.values/node_modules/internal-slot": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz",
-      "integrity": "sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==",
-      "dev": true,
+    "node_modules/nopt": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
+      "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
+      "optional": true,
       "dependencies": {
-        "get-intrinsic": "^1.1.3",
-        "has": "^1.0.3",
-        "side-channel": "^1.0.4"
+        "abbrev": "1"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=6"
       }
     },
-    "node_modules/object.values/node_modules/is-callable": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
-      "dev": true,
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/object.values/node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-      "dev": true,
+    "node_modules/npmlog": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
+      "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
+      "optional": true,
       "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "are-we-there-yet": "^2.0.0",
+        "console-control-strings": "^1.1.0",
+        "gauge": "^3.0.0",
+        "set-blocking": "^2.0.0"
+      }
+    },
+    "node_modules/nwsapi": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.2.tgz",
+      "integrity": "sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw=="
+    },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/object.values/node_modules/object-inspect": {
+    "node_modules/object-get": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/object-get/-/object-get-2.1.1.tgz",
+      "integrity": "sha512-7n4IpLMzGGcLEMiQKsNR7vCe+N5E9LORFrtNUVy4sO3dj9a3HedZCxEL2T7QuLhcHN1NBuBsMOKaOsAYI9IIvg==",
+      "dev": true
+    },
+    "node_modules/object-inspect": {
       "version": "1.12.3",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
       "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
-      "dev": true,
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/object.values/node_modules/object.assign": {
+    "node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object-to-spawn-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/object-to-spawn-args/-/object-to-spawn-args-2.0.1.tgz",
+      "integrity": "sha512-6FuKFQ39cOID+BMZ3QaphcC8Y4cw6LXBLyIgPU+OhIYwviJamPAn+4mITapnSBQrejB+NNp+FMskhD8Cq+Ys3w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/object.assign": {
       "version": "4.1.4",
       "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
       "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
@@ -7058,44 +6048,61 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/object.values/node_modules/string.prototype.trimend": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
-      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
+    "node_modules/object.entries": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz",
+      "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
         "es-abstract": "^1.20.4"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">= 0.4"
       }
     },
-    "node_modules/object.values/node_modules/string.prototype.trimstart": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
-      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
+    "node_modules/object.fromentries": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz",
+      "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
         "es-abstract": "^1.20.4"
       },
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/object.values/node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+    "node_modules/object.groupby": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.0.tgz",
+      "integrity": "sha512-70MWG6NfRH9GnbZOikuhPPYzpUpof9iW2J9E4dW7FXTqPNb6rllE6u39SKwwiNh8lCwX3DDb5OgcKGiEBrTTyw==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.21.2",
+        "get-intrinsic": "^1.2.1"
+      }
+    },
+    "node_modules/object.values": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
+      "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -7567,14 +6574,14 @@
       }
     },
     "node_modules/regexp.prototype.flags": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz",
+      "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "functions-have-names": "^1.2.2"
+        "define-properties": "^1.2.0",
+        "functions-have-names": "^1.2.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7612,12 +6619,12 @@
       }
     },
     "node_modules/resolve": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+      "version": "1.22.3",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.3.tgz",
+      "integrity": "sha512-P8ur/gp/AmbEzjr729bZnLjXK5Z+4P0zhIJgBgzqRih7hL7BOukHGtSTA3ACMY467GRFz3duQsi0bDZdR7DKdw==",
       "dev": true,
       "dependencies": {
-        "is-core-module": "^2.9.0",
+        "is-core-module": "^2.12.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
@@ -7684,6 +6691,24 @@
         "queue-microtask": "^1.2.2"
       }
     },
+    "node_modules/safe-array-concat": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz",
+      "integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.0",
+        "has-symbols": "^1.0.3",
+        "isarray": "^2.0.5"
+      },
+      "engines": {
+        "node": ">=0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
@@ -7703,32 +6728,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/safe-regex-test/node_modules/get-intrinsic": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/safe-regex-test/node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
@@ -8124,27 +7123,46 @@
         "node": ">=8"
       }
     },
+    "node_modules/string.prototype.trim": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz",
+      "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/string.prototype.trimend": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
-      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
+      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/string.prototype.trimstart": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
-      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
+      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -8512,22 +7530,73 @@
       "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
       "dev": true,
       "engines": {
-        "node": ">=10"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/type-is": {
+      "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+      "dependencies": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/typed-array-buffer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz",
+      "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.1",
+        "is-typed-array": "^1.1.10"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/typed-array-byte-length": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz",
+      "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "has-proto": "^1.0.1",
+        "is-typed-array": "^1.1.10"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+    "node_modules/typed-array-byte-offset": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz",
+      "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==",
+      "dev": true,
       "dependencies": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "has-proto": "^1.0.1",
+        "is-typed-array": "^1.1.10"
       },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/typed-array-length": {
@@ -8583,14 +7652,14 @@
       }
     },
     "node_modules/unbox-primitive": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
-      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
       "dev": true,
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "has-bigints": "^1.0.1",
-        "has-symbols": "^1.0.2",
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
         "which-boxed-primitive": "^1.0.2"
       },
       "funding": {
@@ -8826,17 +7895,16 @@
       "dev": true
     },
     "node_modules/which-typed-array": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz",
-      "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==",
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz",
+      "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==",
       "dev": true,
       "dependencies": {
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
         "for-each": "^0.3.3",
         "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.0",
-        "is-typed-array": "^1.1.10"
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -9996,6 +9064,16 @@
       "integrity": "sha512-gUAZ7HPyb4SJczXAMUXMGAvI976JoK3qEx9v1FTmeYuJj0IBiaKttG1ydtGKdkfqWkIkouke7nG8ufGy77+Cvw==",
       "dev": true
     },
+    "array-buffer-byte-length": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
+      "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "is-array-buffer": "^3.0.1"
+      }
+    },
     "array-flatten": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
@@ -10012,160 +9090,6 @@
         "es-abstract": "^1.20.4",
         "get-intrinsic": "^1.1.3",
         "is-string": "^1.0.7"
-      },
-      "dependencies": {
-        "define-properties": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-          "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-          "dev": true,
-          "requires": {
-            "has-property-descriptors": "^1.0.0",
-            "object-keys": "^1.1.1"
-          }
-        },
-        "es-abstract": {
-          "version": "1.21.1",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.1.tgz",
-          "integrity": "sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==",
-          "dev": true,
-          "requires": {
-            "available-typed-arrays": "^1.0.5",
-            "call-bind": "^1.0.2",
-            "es-set-tostringtag": "^2.0.1",
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "function.prototype.name": "^1.1.5",
-            "get-intrinsic": "^1.1.3",
-            "get-symbol-description": "^1.0.0",
-            "globalthis": "^1.0.3",
-            "gopd": "^1.0.1",
-            "has": "^1.0.3",
-            "has-property-descriptors": "^1.0.0",
-            "has-proto": "^1.0.1",
-            "has-symbols": "^1.0.3",
-            "internal-slot": "^1.0.4",
-            "is-array-buffer": "^3.0.1",
-            "is-callable": "^1.2.7",
-            "is-negative-zero": "^2.0.2",
-            "is-regex": "^1.1.4",
-            "is-shared-array-buffer": "^1.0.2",
-            "is-string": "^1.0.7",
-            "is-typed-array": "^1.1.10",
-            "is-weakref": "^1.0.2",
-            "object-inspect": "^1.12.2",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.4",
-            "regexp.prototype.flags": "^1.4.3",
-            "safe-regex-test": "^1.0.0",
-            "string.prototype.trimend": "^1.0.6",
-            "string.prototype.trimstart": "^1.0.6",
-            "typed-array-length": "^1.0.4",
-            "unbox-primitive": "^1.0.2",
-            "which-typed-array": "^1.1.9"
-          }
-        },
-        "get-intrinsic": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-          "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-          "dev": true,
-          "requires": {
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.3"
-          }
-        },
-        "has-bigints": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-          "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-          "dev": true
-        },
-        "has-symbols": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-          "dev": true
-        },
-        "internal-slot": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz",
-          "integrity": "sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==",
-          "dev": true,
-          "requires": {
-            "get-intrinsic": "^1.1.3",
-            "has": "^1.0.3",
-            "side-channel": "^1.0.4"
-          }
-        },
-        "is-callable": {
-          "version": "1.2.7",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-          "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
-          "dev": true
-        },
-        "is-shared-array-buffer": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-          "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2"
-          }
-        },
-        "object-inspect": {
-          "version": "1.12.3",
-          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-          "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
-          "dev": true
-        },
-        "object.assign": {
-          "version": "4.1.4",
-          "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-          "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "has-symbols": "^1.0.3",
-            "object-keys": "^1.1.1"
-          }
-        },
-        "string.prototype.trimend": {
-          "version": "1.0.6",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
-          "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.20.4"
-          }
-        },
-        "string.prototype.trimstart": {
-          "version": "1.0.6",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
-          "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.20.4"
-          }
-        },
-        "unbox-primitive": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-          "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-bigints": "^1.0.2",
-            "has-symbols": "^1.0.3",
-            "which-boxed-primitive": "^1.0.2"
-          }
-        }
       }
     },
     "array-union": {
@@ -10174,6 +9098,19 @@
       "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
       "dev": true
     },
+    "array.prototype.findlastindex": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.2.tgz",
+      "integrity": "sha512-tb5thFFlUcp7NdNF6/MpDk/1r/4awWG1FIz3YqDf+/zJSTezBb+/5WViH41obXULHVpDzoiCLpJ/ZO9YbJMsdw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0",
+        "get-intrinsic": "^1.1.3"
+      }
+    },
     "array.prototype.flat": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
@@ -10184,160 +9121,6 @@
         "define-properties": "^1.1.4",
         "es-abstract": "^1.20.4",
         "es-shim-unscopables": "^1.0.0"
-      },
-      "dependencies": {
-        "define-properties": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-          "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-          "dev": true,
-          "requires": {
-            "has-property-descriptors": "^1.0.0",
-            "object-keys": "^1.1.1"
-          }
-        },
-        "es-abstract": {
-          "version": "1.21.1",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.1.tgz",
-          "integrity": "sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==",
-          "dev": true,
-          "requires": {
-            "available-typed-arrays": "^1.0.5",
-            "call-bind": "^1.0.2",
-            "es-set-tostringtag": "^2.0.1",
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "function.prototype.name": "^1.1.5",
-            "get-intrinsic": "^1.1.3",
-            "get-symbol-description": "^1.0.0",
-            "globalthis": "^1.0.3",
-            "gopd": "^1.0.1",
-            "has": "^1.0.3",
-            "has-property-descriptors": "^1.0.0",
-            "has-proto": "^1.0.1",
-            "has-symbols": "^1.0.3",
-            "internal-slot": "^1.0.4",
-            "is-array-buffer": "^3.0.1",
-            "is-callable": "^1.2.7",
-            "is-negative-zero": "^2.0.2",
-            "is-regex": "^1.1.4",
-            "is-shared-array-buffer": "^1.0.2",
-            "is-string": "^1.0.7",
-            "is-typed-array": "^1.1.10",
-            "is-weakref": "^1.0.2",
-            "object-inspect": "^1.12.2",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.4",
-            "regexp.prototype.flags": "^1.4.3",
-            "safe-regex-test": "^1.0.0",
-            "string.prototype.trimend": "^1.0.6",
-            "string.prototype.trimstart": "^1.0.6",
-            "typed-array-length": "^1.0.4",
-            "unbox-primitive": "^1.0.2",
-            "which-typed-array": "^1.1.9"
-          }
-        },
-        "get-intrinsic": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-          "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-          "dev": true,
-          "requires": {
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.3"
-          }
-        },
-        "has-bigints": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-          "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-          "dev": true
-        },
-        "has-symbols": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-          "dev": true
-        },
-        "internal-slot": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz",
-          "integrity": "sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==",
-          "dev": true,
-          "requires": {
-            "get-intrinsic": "^1.1.3",
-            "has": "^1.0.3",
-            "side-channel": "^1.0.4"
-          }
-        },
-        "is-callable": {
-          "version": "1.2.7",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-          "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
-          "dev": true
-        },
-        "is-shared-array-buffer": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-          "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2"
-          }
-        },
-        "object-inspect": {
-          "version": "1.12.3",
-          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-          "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
-          "dev": true
-        },
-        "object.assign": {
-          "version": "4.1.4",
-          "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-          "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "has-symbols": "^1.0.3",
-            "object-keys": "^1.1.1"
-          }
-        },
-        "string.prototype.trimend": {
-          "version": "1.0.6",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
-          "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.20.4"
-          }
-        },
-        "string.prototype.trimstart": {
-          "version": "1.0.6",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
-          "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.20.4"
-          }
-        },
-        "unbox-primitive": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-          "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-bigints": "^1.0.2",
-            "has-symbols": "^1.0.3",
-            "which-boxed-primitive": "^1.0.2"
-          }
-        }
       }
     },
     "array.prototype.flatmap": {
@@ -10350,160 +9133,20 @@
         "define-properties": "^1.1.4",
         "es-abstract": "^1.20.4",
         "es-shim-unscopables": "^1.0.0"
-      },
-      "dependencies": {
-        "define-properties": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-          "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-          "dev": true,
-          "requires": {
-            "has-property-descriptors": "^1.0.0",
-            "object-keys": "^1.1.1"
-          }
-        },
-        "es-abstract": {
-          "version": "1.21.1",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.1.tgz",
-          "integrity": "sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==",
-          "dev": true,
-          "requires": {
-            "available-typed-arrays": "^1.0.5",
-            "call-bind": "^1.0.2",
-            "es-set-tostringtag": "^2.0.1",
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "function.prototype.name": "^1.1.5",
-            "get-intrinsic": "^1.1.3",
-            "get-symbol-description": "^1.0.0",
-            "globalthis": "^1.0.3",
-            "gopd": "^1.0.1",
-            "has": "^1.0.3",
-            "has-property-descriptors": "^1.0.0",
-            "has-proto": "^1.0.1",
-            "has-symbols": "^1.0.3",
-            "internal-slot": "^1.0.4",
-            "is-array-buffer": "^3.0.1",
-            "is-callable": "^1.2.7",
-            "is-negative-zero": "^2.0.2",
-            "is-regex": "^1.1.4",
-            "is-shared-array-buffer": "^1.0.2",
-            "is-string": "^1.0.7",
-            "is-typed-array": "^1.1.10",
-            "is-weakref": "^1.0.2",
-            "object-inspect": "^1.12.2",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.4",
-            "regexp.prototype.flags": "^1.4.3",
-            "safe-regex-test": "^1.0.0",
-            "string.prototype.trimend": "^1.0.6",
-            "string.prototype.trimstart": "^1.0.6",
-            "typed-array-length": "^1.0.4",
-            "unbox-primitive": "^1.0.2",
-            "which-typed-array": "^1.1.9"
-          }
-        },
-        "get-intrinsic": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-          "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-          "dev": true,
-          "requires": {
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.3"
-          }
-        },
-        "has-bigints": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-          "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-          "dev": true
-        },
-        "has-symbols": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-          "dev": true
-        },
-        "internal-slot": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz",
-          "integrity": "sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==",
-          "dev": true,
-          "requires": {
-            "get-intrinsic": "^1.1.3",
-            "has": "^1.0.3",
-            "side-channel": "^1.0.4"
-          }
-        },
-        "is-callable": {
-          "version": "1.2.7",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-          "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
-          "dev": true
-        },
-        "is-shared-array-buffer": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-          "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2"
-          }
-        },
-        "object-inspect": {
-          "version": "1.12.3",
-          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-          "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
-          "dev": true
-        },
-        "object.assign": {
-          "version": "4.1.4",
-          "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-          "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "has-symbols": "^1.0.3",
-            "object-keys": "^1.1.1"
-          }
-        },
-        "string.prototype.trimend": {
-          "version": "1.0.6",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
-          "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.20.4"
-          }
-        },
-        "string.prototype.trimstart": {
-          "version": "1.0.6",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
-          "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.20.4"
-          }
-        },
-        "unbox-primitive": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-          "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-bigints": "^1.0.2",
-            "has-symbols": "^1.0.3",
-            "which-boxed-primitive": "^1.0.2"
-          }
-        }
+      }
+    },
+    "arraybuffer.prototype.slice": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz",
+      "integrity": "sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==",
+      "dev": true,
+      "requires": {
+        "array-buffer-byte-length": "^1.0.0",
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "get-intrinsic": "^1.2.1",
+        "is-array-buffer": "^3.0.2",
+        "is-shared-array-buffer": "^1.0.2"
       }
     },
     "arrify": {
@@ -11129,12 +9772,13 @@
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
     },
     "define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
+      "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
       "dev": true,
       "requires": {
-        "object-keys": "^1.0.12"
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
       }
     },
     "delayed-stream": {
@@ -11322,31 +9966,50 @@
       "dev": true
     },
     "es-abstract": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
-      "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
+      "version": "1.22.1",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz",
+      "integrity": "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==",
       "dev": true,
       "requires": {
+        "array-buffer-byte-length": "^1.0.0",
+        "arraybuffer.prototype.slice": "^1.0.1",
+        "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
+        "es-set-tostringtag": "^2.0.1",
         "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.1.1",
+        "function.prototype.name": "^1.1.5",
+        "get-intrinsic": "^1.2.1",
         "get-symbol-description": "^1.0.0",
+        "globalthis": "^1.0.3",
+        "gopd": "^1.0.1",
         "has": "^1.0.3",
-        "has-symbols": "^1.0.2",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.1",
+        "has-property-descriptors": "^1.0.0",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.5",
+        "is-array-buffer": "^3.0.2",
+        "is-callable": "^1.2.7",
+        "is-negative-zero": "^2.0.2",
         "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.1",
+        "is-shared-array-buffer": "^1.0.2",
         "is-string": "^1.0.7",
-        "is-weakref": "^1.0.1",
-        "object-inspect": "^1.11.0",
+        "is-typed-array": "^1.1.10",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.12.3",
         "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "string.prototype.trimend": "^1.0.4",
-        "string.prototype.trimstart": "^1.0.4",
-        "unbox-primitive": "^1.0.1"
+        "object.assign": "^4.1.4",
+        "regexp.prototype.flags": "^1.5.0",
+        "safe-array-concat": "^1.0.0",
+        "safe-regex-test": "^1.0.0",
+        "string.prototype.trim": "^1.2.7",
+        "string.prototype.trimend": "^1.0.6",
+        "string.prototype.trimstart": "^1.0.6",
+        "typed-array-buffer": "^1.0.0",
+        "typed-array-byte-length": "^1.0.0",
+        "typed-array-byte-offset": "^1.0.0",
+        "typed-array-length": "^1.0.4",
+        "unbox-primitive": "^1.0.2",
+        "which-typed-array": "^1.1.10"
       }
     },
     "es-set-tostringtag": {
@@ -11358,25 +10021,6 @@
         "get-intrinsic": "^1.1.3",
         "has": "^1.0.3",
         "has-tostringtag": "^1.0.0"
-      },
-      "dependencies": {
-        "get-intrinsic": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-          "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-          "dev": true,
-          "requires": {
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.3"
-          }
-        },
-        "has-symbols": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-          "dev": true
-        }
       }
     },
     "es-shim-unscopables": {
@@ -11652,22 +10296,13 @@
           "requires": {
             "ms": "^2.1.1"
           }
-        },
-        "is-core-module": {
-          "version": "2.11.0",
-          "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
-          "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
-          "dev": true,
-          "requires": {
-            "has": "^1.0.3"
-          }
         }
       }
     },
     "eslint-module-utils": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz",
-      "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz",
+      "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==",
       "dev": true,
       "requires": {
         "debug": "^3.2.7"
@@ -11713,26 +10348,29 @@
       }
     },
     "eslint-plugin-import": {
-      "version": "2.27.5",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz",
-      "integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==",
+      "version": "2.28.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.0.tgz",
+      "integrity": "sha512-B8s/n+ZluN7sxj9eUf7/pRFERX0r5bnFA2dCaLHy2ZeaQEAz0k+ZZkFWRFHJAqxfxQDx6KLv9LeIki7cFdwW+Q==",
       "dev": true,
       "requires": {
         "array-includes": "^3.1.6",
+        "array.prototype.findlastindex": "^1.2.2",
         "array.prototype.flat": "^1.3.1",
         "array.prototype.flatmap": "^1.3.1",
         "debug": "^3.2.7",
         "doctrine": "^2.1.0",
         "eslint-import-resolver-node": "^0.3.7",
-        "eslint-module-utils": "^2.7.4",
+        "eslint-module-utils": "^2.8.0",
         "has": "^1.0.3",
-        "is-core-module": "^2.11.0",
+        "is-core-module": "^2.12.1",
         "is-glob": "^4.0.3",
         "minimatch": "^3.1.2",
+        "object.fromentries": "^2.0.6",
+        "object.groupby": "^1.0.0",
         "object.values": "^1.1.6",
-        "resolve": "^1.22.1",
-        "semver": "^6.3.0",
-        "tsconfig-paths": "^3.14.1"
+        "resolve": "^1.22.3",
+        "semver": "^6.3.1",
+        "tsconfig-paths": "^3.14.2"
       },
       "dependencies": {
         "debug": {
@@ -11747,19 +10385,10 @@
         "doctrine": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2"
-          }
-        },
-        "is-core-module": {
-          "version": "2.11.0",
-          "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
-          "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
+          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
           "dev": true,
           "requires": {
-            "has": "^1.0.3"
+            "esutils": "^2.0.2"
           }
         },
         "json5": {
@@ -11781,9 +10410,9 @@
           }
         },
         "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "version": "6.3.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
           "dev": true
         },
         "tsconfig-paths": {
@@ -12257,13 +10886,14 @@
       "integrity": "sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig=="
     },
     "get-intrinsic": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
-      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
+      "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
       "requires": {
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
-        "has-symbols": "^1.0.1"
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3"
       }
     },
     "get-symbol-description": {
@@ -12341,25 +10971,6 @@
       "dev": true,
       "requires": {
         "get-intrinsic": "^1.1.3"
-      },
-      "dependencies": {
-        "get-intrinsic": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-          "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-          "dev": true,
-          "requires": {
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.3"
-          }
-        },
-        "has-symbols": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-          "dev": true
-        }
       }
     },
     "graceful-fs": {
@@ -12403,9 +11014,9 @@
       }
     },
     "has-bigints": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
-      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
       "dev": true
     },
     "has-flag": {
@@ -12426,13 +11037,12 @@
     "has-proto": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
-      "dev": true
+      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="
     },
     "has-symbols": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
     },
     "has-tostringtag": {
       "version": "1.0.0",
@@ -12550,12 +11160,12 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "internal-slot": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
-      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz",
+      "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==",
       "dev": true,
       "requires": {
-        "get-intrinsic": "^1.1.0",
+        "get-intrinsic": "^1.2.0",
         "has": "^1.0.3",
         "side-channel": "^1.0.4"
       }
@@ -12571,33 +11181,14 @@
       "integrity": "sha512-Bm6H79i01DjgGTCWjUuCjJ6QDo1HB96PT/xCYuyJUP9WFbVDrLSbG4EZCvOCun2rNswZb0c3e4Jt/ws795esHA=="
     },
     "is-array-buffer": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.1.tgz",
-      "integrity": "sha512-ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
+      "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
+        "get-intrinsic": "^1.2.0",
         "is-typed-array": "^1.1.10"
-      },
-      "dependencies": {
-        "get-intrinsic": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-          "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-          "dev": true,
-          "requires": {
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.3"
-          }
-        },
-        "has-symbols": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-          "dev": true
-        }
       }
     },
     "is-bigint": {
@@ -12628,15 +11219,15 @@
       }
     },
     "is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
       "dev": true
     },
     "is-core-module": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz",
-      "integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==",
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz",
+      "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==",
       "dev": true,
       "requires": {
         "has": "^1.0.3"
@@ -12681,9 +11272,9 @@
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
     },
     "is-number-object": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz",
-      "integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
       "dev": true,
       "requires": {
         "has-tostringtag": "^1.0.0"
@@ -12716,10 +11307,13 @@
       }
     },
     "is-shared-array-buffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz",
-      "integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==",
-      "dev": true
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2"
+      }
     },
     "is-string": {
       "version": "1.0.7",
@@ -12766,6 +11360,12 @@
         "call-bind": "^1.0.2"
       }
     },
+    "isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true
+    },
     "isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@@ -13934,9 +12534,9 @@
       "dev": true
     },
     "object-inspect": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz",
-      "integrity": "sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA=="
+      "version": "1.12.3",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
+      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="
     },
     "object-keys": {
       "version": "1.1.1",
@@ -13951,14 +12551,14 @@
       "dev": true
     },
     "object.assign": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
+      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "has-symbols": "^1.0.1",
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "has-symbols": "^1.0.3",
         "object-keys": "^1.1.1"
       }
     },
@@ -13971,140 +12571,29 @@
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
         "es-abstract": "^1.20.4"
-      },
-      "dependencies": {
-        "define-properties": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-          "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-          "dev": true,
-          "requires": {
-            "has-property-descriptors": "^1.0.0",
-            "object-keys": "^1.1.1"
-          }
-        },
-        "es-abstract": {
-          "version": "1.20.4",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz",
-          "integrity": "sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "function.prototype.name": "^1.1.5",
-            "get-intrinsic": "^1.1.3",
-            "get-symbol-description": "^1.0.0",
-            "has": "^1.0.3",
-            "has-property-descriptors": "^1.0.0",
-            "has-symbols": "^1.0.3",
-            "internal-slot": "^1.0.3",
-            "is-callable": "^1.2.7",
-            "is-negative-zero": "^2.0.2",
-            "is-regex": "^1.1.4",
-            "is-shared-array-buffer": "^1.0.2",
-            "is-string": "^1.0.7",
-            "is-weakref": "^1.0.2",
-            "object-inspect": "^1.12.2",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.4",
-            "regexp.prototype.flags": "^1.4.3",
-            "safe-regex-test": "^1.0.0",
-            "string.prototype.trimend": "^1.0.5",
-            "string.prototype.trimstart": "^1.0.5",
-            "unbox-primitive": "^1.0.2"
-          }
-        },
-        "get-intrinsic": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-          "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-          "dev": true,
-          "requires": {
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.3"
-          }
-        },
-        "has-bigints": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-          "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-          "dev": true
-        },
-        "has-symbols": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-          "dev": true
-        },
-        "is-callable": {
-          "version": "1.2.7",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-          "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
-          "dev": true
-        },
-        "is-shared-array-buffer": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-          "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2"
-          }
-        },
-        "object-inspect": {
-          "version": "1.12.2",
-          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-          "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
-          "dev": true
-        },
-        "object.assign": {
-          "version": "4.1.4",
-          "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-          "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "has-symbols": "^1.0.3",
-            "object-keys": "^1.1.1"
-          }
-        },
-        "string.prototype.trimend": {
-          "version": "1.0.6",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
-          "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.20.4"
-          }
-        },
-        "string.prototype.trimstart": {
-          "version": "1.0.6",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
-          "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.20.4"
-          }
-        },
-        "unbox-primitive": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-          "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-bigints": "^1.0.2",
-            "has-symbols": "^1.0.3",
-            "which-boxed-primitive": "^1.0.2"
-          }
-        }
+      }
+    },
+    "object.fromentries": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz",
+      "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      }
+    },
+    "object.groupby": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.0.tgz",
+      "integrity": "sha512-70MWG6NfRH9GnbZOikuhPPYzpUpof9iW2J9E4dW7FXTqPNb6rllE6u39SKwwiNh8lCwX3DDb5OgcKGiEBrTTyw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.21.2",
+        "get-intrinsic": "^1.2.1"
       }
     },
     "object.values": {
@@ -14116,160 +12605,6 @@
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
         "es-abstract": "^1.20.4"
-      },
-      "dependencies": {
-        "define-properties": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-          "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-          "dev": true,
-          "requires": {
-            "has-property-descriptors": "^1.0.0",
-            "object-keys": "^1.1.1"
-          }
-        },
-        "es-abstract": {
-          "version": "1.21.1",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.1.tgz",
-          "integrity": "sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==",
-          "dev": true,
-          "requires": {
-            "available-typed-arrays": "^1.0.5",
-            "call-bind": "^1.0.2",
-            "es-set-tostringtag": "^2.0.1",
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "function.prototype.name": "^1.1.5",
-            "get-intrinsic": "^1.1.3",
-            "get-symbol-description": "^1.0.0",
-            "globalthis": "^1.0.3",
-            "gopd": "^1.0.1",
-            "has": "^1.0.3",
-            "has-property-descriptors": "^1.0.0",
-            "has-proto": "^1.0.1",
-            "has-symbols": "^1.0.3",
-            "internal-slot": "^1.0.4",
-            "is-array-buffer": "^3.0.1",
-            "is-callable": "^1.2.7",
-            "is-negative-zero": "^2.0.2",
-            "is-regex": "^1.1.4",
-            "is-shared-array-buffer": "^1.0.2",
-            "is-string": "^1.0.7",
-            "is-typed-array": "^1.1.10",
-            "is-weakref": "^1.0.2",
-            "object-inspect": "^1.12.2",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.4",
-            "regexp.prototype.flags": "^1.4.3",
-            "safe-regex-test": "^1.0.0",
-            "string.prototype.trimend": "^1.0.6",
-            "string.prototype.trimstart": "^1.0.6",
-            "typed-array-length": "^1.0.4",
-            "unbox-primitive": "^1.0.2",
-            "which-typed-array": "^1.1.9"
-          }
-        },
-        "get-intrinsic": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-          "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-          "dev": true,
-          "requires": {
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.3"
-          }
-        },
-        "has-bigints": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-          "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-          "dev": true
-        },
-        "has-symbols": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-          "dev": true
-        },
-        "internal-slot": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz",
-          "integrity": "sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==",
-          "dev": true,
-          "requires": {
-            "get-intrinsic": "^1.1.3",
-            "has": "^1.0.3",
-            "side-channel": "^1.0.4"
-          }
-        },
-        "is-callable": {
-          "version": "1.2.7",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-          "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
-          "dev": true
-        },
-        "is-shared-array-buffer": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-          "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2"
-          }
-        },
-        "object-inspect": {
-          "version": "1.12.3",
-          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-          "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
-          "dev": true
-        },
-        "object.assign": {
-          "version": "4.1.4",
-          "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-          "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "has-symbols": "^1.0.3",
-            "object-keys": "^1.1.1"
-          }
-        },
-        "string.prototype.trimend": {
-          "version": "1.0.6",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
-          "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.20.4"
-          }
-        },
-        "string.prototype.trimstart": {
-          "version": "1.0.6",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
-          "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.20.4"
-          }
-        },
-        "unbox-primitive": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-          "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-bigints": "^1.0.2",
-            "has-symbols": "^1.0.3",
-            "which-boxed-primitive": "^1.0.2"
-          }
-        }
       }
     },
     "on-finished": {
@@ -14604,14 +12939,14 @@
       }
     },
     "regexp.prototype.flags": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz",
+      "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "functions-have-names": "^1.2.2"
+        "define-properties": "^1.2.0",
+        "functions-have-names": "^1.2.3"
       }
     },
     "require-directory": {
@@ -14640,12 +12975,12 @@
       }
     },
     "resolve": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+      "version": "1.22.3",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.3.tgz",
+      "integrity": "sha512-P8ur/gp/AmbEzjr729bZnLjXK5Z+4P0zhIJgBgzqRih7hL7BOukHGtSTA3ACMY467GRFz3duQsi0bDZdR7DKdw==",
       "dev": true,
       "requires": {
-        "is-core-module": "^2.9.0",
+        "is-core-module": "^2.12.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       }
@@ -14679,6 +13014,18 @@
         "queue-microtask": "^1.2.2"
       }
     },
+    "safe-array-concat": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz",
+      "integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.0",
+        "has-symbols": "^1.0.3",
+        "isarray": "^2.0.5"
+      }
+    },
     "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
@@ -14693,25 +13040,6 @@
         "call-bind": "^1.0.2",
         "get-intrinsic": "^1.1.3",
         "is-regex": "^1.1.4"
-      },
-      "dependencies": {
-        "get-intrinsic": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-          "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-          "dev": true,
-          "requires": {
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.3"
-          }
-        },
-        "has-symbols": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-          "dev": true
-        }
       }
     },
     "safer-buffer": {
@@ -15020,24 +13348,37 @@
         "strip-ansi": "^6.0.1"
       }
     },
+    "string.prototype.trim": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz",
+      "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      }
+    },
     "string.prototype.trimend": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
-      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
+      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
       }
     },
     "string.prototype.trimstart": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
-      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
+      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
       }
     },
     "strip-ansi": {
@@ -15326,6 +13667,42 @@
         "mime-types": "~2.1.24"
       }
     },
+    "typed-array-buffer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz",
+      "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.1",
+        "is-typed-array": "^1.1.10"
+      }
+    },
+    "typed-array-byte-length": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz",
+      "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "has-proto": "^1.0.1",
+        "is-typed-array": "^1.1.10"
+      }
+    },
+    "typed-array-byte-offset": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz",
+      "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==",
+      "dev": true,
+      "requires": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "has-proto": "^1.0.1",
+        "is-typed-array": "^1.1.10"
+      }
+    },
     "typed-array-length": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
@@ -15363,14 +13740,14 @@
       "optional": true
     },
     "unbox-primitive": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
-      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
       "dev": true,
       "requires": {
-        "function-bind": "^1.1.1",
-        "has-bigints": "^1.0.1",
-        "has-symbols": "^1.0.2",
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
         "which-boxed-primitive": "^1.0.2"
       }
     },
@@ -15547,17 +13924,16 @@
       "dev": true
     },
     "which-typed-array": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz",
-      "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==",
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz",
+      "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==",
       "dev": true,
       "requires": {
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
         "for-each": "^0.3.3",
         "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.0",
-        "is-typed-array": "^1.1.10"
+        "has-tostringtag": "^1.0.0"
       }
     },
     "wide-align": {
diff --git a/tests/UI/package.json b/tests/UI/package.json
index f61295df8611a..fdd4c7609ec45 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -131,7 +131,7 @@
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-deprecation": "^1.4.1",
     "eslint-plugin-html": "^7.1.0",
-    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-import": "^2.28.0",
     "jsdoc-to-markdown": "^8.0.0",
     "mochawesome-merge": "^4.3.0",
     "ts-mocha": "^10.0.0",

From cacbe1e9bae216a2f62b0307eaee192369cc784b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 31 Jul 2023 04:36:06 +0000
Subject: [PATCH 0674/1030] Bump fast-xml-parser from 4.2.6 to 4.2.7 in
 /tests/UI

Bumps [fast-xml-parser](https://github.com/NaturalIntelligence/fast-xml-parser) from 4.2.6 to 4.2.7.
- [Release notes](https://github.com/NaturalIntelligence/fast-xml-parser/releases)
- [Changelog](https://github.com/NaturalIntelligence/fast-xml-parser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/NaturalIntelligence/fast-xml-parser/compare/v4.2.6...v4.2.7)

---
updated-dependencies:
- dependency-name: fast-xml-parser
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 14 +++++++-------
 tests/UI/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index a92bfdf8c3bd1..4c58971f742b8 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -16,7 +16,7 @@
         "chai-string": "^1.5.0",
         "csv-writer": "^1.6.0",
         "dotenv": "^16.3.1",
-        "fast-xml-parser": "^4.2.6",
+        "fast-xml-parser": "^4.2.7",
         "jpeg-js": "^0.4.4",
         "js-image-generator": "^1.0.4",
         "maildev": "^2.1.0",
@@ -4001,9 +4001,9 @@
       "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
     },
     "node_modules/fast-xml-parser": {
-      "version": "4.2.6",
-      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.6.tgz",
-      "integrity": "sha512-Xo1qV++h/Y3Ng8dphjahnYe+rGHaaNdsYOBWL9Y9GCPKpNKilJtilvWkLcI9f9X2DoKTLsZsGYAls5+JL5jfLA==",
+      "version": "4.2.7",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.7.tgz",
+      "integrity": "sha512-J8r6BriSLO1uj2miOk1NW0YVm8AGOOu3Si2HQp/cSmo6EA4m3fcwu2WKjJ4RK9wMLBtg69y1kS8baDiQBR41Ig==",
       "funding": [
         {
           "type": "paypal",
@@ -11992,9 +11992,9 @@
       "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
     },
     "fast-xml-parser": {
-      "version": "4.2.6",
-      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.6.tgz",
-      "integrity": "sha512-Xo1qV++h/Y3Ng8dphjahnYe+rGHaaNdsYOBWL9Y9GCPKpNKilJtilvWkLcI9f9X2DoKTLsZsGYAls5+JL5jfLA==",
+      "version": "4.2.7",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.7.tgz",
+      "integrity": "sha512-J8r6BriSLO1uj2miOk1NW0YVm8AGOOu3Si2HQp/cSmo6EA4m3fcwu2WKjJ4RK9wMLBtg69y1kS8baDiQBR41Ig==",
       "requires": {
         "strnum": "^1.0.5"
       }
diff --git a/tests/UI/package.json b/tests/UI/package.json
index f61295df8611a..882d06d37c4a1 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -109,7 +109,7 @@
     "chai-string": "^1.5.0",
     "csv-writer": "^1.6.0",
     "dotenv": "^16.3.1",
-    "fast-xml-parser": "^4.2.6",
+    "fast-xml-parser": "^4.2.7",
     "jpeg-js": "^0.4.4",
     "js-image-generator": "^1.0.4",
     "maildev": "^2.1.0",

From f03e27e4250741f5b6a2c16aafad0d8825ce60d6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 31 Jul 2023 04:36:30 +0000
Subject: [PATCH 0675/1030] Bump playwright from 1.36.1 to 1.36.2 in /tests/UI

Bumps [playwright](https://github.com/Microsoft/playwright) from 1.36.1 to 1.36.2.
- [Release notes](https://github.com/Microsoft/playwright/releases)
- [Commits](https://github.com/Microsoft/playwright/compare/v1.36.1...v1.36.2)

---
updated-dependencies:
- dependency-name: playwright
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 30 +++++++++++++++---------------
 tests/UI/package.json      |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index a92bfdf8c3bd1..8de9fa0f0c0bf 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -23,7 +23,7 @@
         "mocha": "^10.2.0",
         "mochawesome": "^7.1.3",
         "pdfjs-dist": "^3.4.120",
-        "playwright": "^1.36.1",
+        "playwright": "^1.36.2",
         "xpath-ts": "^1.3.13"
       },
       "devDependencies": {
@@ -7299,12 +7299,12 @@
       }
     },
     "node_modules/playwright": {
-      "version": "1.36.1",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.36.1.tgz",
-      "integrity": "sha512-2ZqHpD0U0COKR8bqR3W5IkyIAAM0mT9FgGJB9xWCI1qAUkqLxJskA1ueeQOTH2Qfz3+oxdwwf2EzdOX+RkZmmQ==",
+      "version": "1.36.2",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.36.2.tgz",
+      "integrity": "sha512-4Fmlq3KWsl85Bl4InJw1NC21aeQV0iSZuFvTDcy1F8zVmXmgQRe89GxF8zMSRt/KIS+2tUolak7EXVl9aC+JdA==",
       "hasInstallScript": true,
       "dependencies": {
-        "playwright-core": "1.36.1"
+        "playwright-core": "1.36.2"
       },
       "bin": {
         "playwright": "cli.js"
@@ -7314,9 +7314,9 @@
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.36.1",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.36.1.tgz",
-      "integrity": "sha512-7+tmPuMcEW4xeCL9cp9KxmYpQYHKkyjwoXRnoeTowaeNat8PoBMk/HwCYhqkH2fRkshfKEOiVus/IhID2Pg8kg==",
+      "version": "1.36.2",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.36.2.tgz",
+      "integrity": "sha512-sQYZt31dwkqxOrP7xy2ggDfEzUxM1lodjhsQ3NMMv5uGTRDsLxU0e4xf4wwMkF2gplIxf17QMBCodSFgm6bFVQ==",
       "bin": {
         "playwright-core": "cli.js"
       },
@@ -14411,17 +14411,17 @@
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
     },
     "playwright": {
-      "version": "1.36.1",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.36.1.tgz",
-      "integrity": "sha512-2ZqHpD0U0COKR8bqR3W5IkyIAAM0mT9FgGJB9xWCI1qAUkqLxJskA1ueeQOTH2Qfz3+oxdwwf2EzdOX+RkZmmQ==",
+      "version": "1.36.2",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.36.2.tgz",
+      "integrity": "sha512-4Fmlq3KWsl85Bl4InJw1NC21aeQV0iSZuFvTDcy1F8zVmXmgQRe89GxF8zMSRt/KIS+2tUolak7EXVl9aC+JdA==",
       "requires": {
-        "playwright-core": "1.36.1"
+        "playwright-core": "1.36.2"
       }
     },
     "playwright-core": {
-      "version": "1.36.1",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.36.1.tgz",
-      "integrity": "sha512-7+tmPuMcEW4xeCL9cp9KxmYpQYHKkyjwoXRnoeTowaeNat8PoBMk/HwCYhqkH2fRkshfKEOiVus/IhID2Pg8kg=="
+      "version": "1.36.2",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.36.2.tgz",
+      "integrity": "sha512-sQYZt31dwkqxOrP7xy2ggDfEzUxM1lodjhsQ3NMMv5uGTRDsLxU0e4xf4wwMkF2gplIxf17QMBCodSFgm6bFVQ=="
     },
     "prelude-ls": {
       "version": "1.1.2",
diff --git a/tests/UI/package.json b/tests/UI/package.json
index f61295df8611a..5af7bf53f1497 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -116,7 +116,7 @@
     "mocha": "^10.2.0",
     "mochawesome": "^7.1.3",
     "pdfjs-dist": "^3.4.120",
-    "playwright": "^1.36.1",
+    "playwright": "^1.36.2",
     "xpath-ts": "^1.3.13"
   },
   "devDependencies": {

From 42085db6ecb15ece0455dcc9704e38d4edb53f8e Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Mon, 31 Jul 2023 09:06:13 +0200
Subject: [PATCH 0676/1030] Nightly : 8.1.x - Fix random errors

---
 .../04_email/03_sortAndPagination.ts                 | 12 ++++++++++--
 tests/UI/pages/BO/advancedParameters/email/index.ts  |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/04_email/03_sortAndPagination.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/04_email/03_sortAndPagination.ts
index dce80325d1bd2..6006f82c756c2 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/04_email/03_sortAndPagination.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/04_email/03_sortAndPagination.ts
@@ -254,13 +254,13 @@ describe('BO - Advanced Parameters - E-mail : Sort and pagination emails', async
     {
       args:
         {
-          testIdentifier: 'sortByDateAddDesc', sortBy: 'date_add', sortDirection: 'desc',
+          testIdentifier: 'sortByDateAddDesc', sortBy: 'date_add', sortDirection: 'desc', isDate: true,
         },
     },
     {
       args:
         {
-          testIdentifier: 'sortByDateAddAsc', sortBy: 'date_add', sortDirection: 'asc',
+          testIdentifier: 'sortByDateAddAsc', sortBy: 'date_add', sortDirection: 'asc', isDate: true,
         },
     },
     {
@@ -304,6 +304,14 @@ describe('BO - Advanced Parameters - E-mail : Sort and pagination emails', async
           } else {
             await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
+        } else if (test.args.isDate) {
+          const expectedResult = await basicHelper.sortArrayDate(nonSortedTable);
+
+          if (test.args.sortDirection === 'asc') {
+            await expect(sortedTable).to.deep.equal(expectedResult);
+          } else {
+            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+          }
         } else {
           const expectedResult = await basicHelper.sortArray(nonSortedTable);
 
diff --git a/tests/UI/pages/BO/advancedParameters/email/index.ts b/tests/UI/pages/BO/advancedParameters/email/index.ts
index 4d7e11d1564d4..366e395b94e1b 100644
--- a/tests/UI/pages/BO/advancedParameters/email/index.ts
+++ b/tests/UI/pages/BO/advancedParameters/email/index.ts
@@ -461,7 +461,7 @@ class Email extends BOBasePage {
     let i: number = 0;
     while (await this.elementNotVisible(page, sortColumnDiv, 2000) && i < 2) {
       await page.hover(this.sortColumnDiv(sortBy));
-      await page.click(sortColumnSpanButton);
+      await this.clickAndWaitForURL(page, sortColumnSpanButton);
       i += 1;
     }
 

From dd95202b39fcf0d20bfa39e60116aa986af88569 Mon Sep 17 00:00:00 2001
From: Daniel Hlavacek <daniel.hlavacek@hotmail.cz>
Date: Mon, 31 Jul 2023 10:15:15 +0200
Subject: [PATCH 0677/1030] Apply suggestions from code review

Co-authored-by: Pablo Borowicz <pablo.borowicz@prestashop.com>
---
 .github/ISSUE_TEMPLATE/1_bug_report.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/1_bug_report.yml b/.github/ISSUE_TEMPLATE/1_bug_report.yml
index bd3f791dab45c..c27f98e531690 100644
--- a/.github/ISSUE_TEMPLATE/1_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/1_bug_report.yml
@@ -6,11 +6,11 @@ body:
     attributes:
       value: |
          #### Basic information ❗
-         - Provide as much DETAILS as possible - error logs, screenshots, your exact configuration. If no one can reproduce it, no one will fix it.
-         - Follow [bug report guidelines](https://devdocs.prestashop-project.org/8/contribute/contribute-reporting-issues/#best-practices-for-writing-an-issue) to help maintainers qualify your report faster.
-         - DO NOT report bugs with "error 500" or "white page" - this is a universal error and will tell us nothing. Enable debug mode in the Performance section of PrestaShop or manually in `/config/defines.inc.php` and try again. You should get a proper error message.
-         - Use ENGLISH, reports in all other languages will be closed.
-         - If you report problem with upgrade process, open `/admin/autoupgrade/tmp` and attach anonymized `log.txt` to the issue. It contains all the information about the upgrade process.
+         - **Provide as much detail as possible** - error logs, screenshots, your exact configuration. If the issue cannot be reproduced, it cannot be fixed.
+         - Follow the [bug report guidelines](https://devdocs.prestashop-project.org/8/contribute/contribute-reporting-issues/#best-practices-for-writing-an-issue) to help issue managers qualify your report faster.
+         - Avoid reporting "error 500" or "white page" errors - this is a universal error message that does not provide enough information to qualify the issue. Enable debug mode in the Performance section of PrestaShop or manually in `/config/defines.inc.php` and try again. You should get a proper error message.
+         - **Write in English.** Reports in all other languages will be closed.
+         - If reporting a problem with the upgrade process, open `/admin/autoupgrade/tmp` and attach anonymized `log.txt` to the issue. It contains all the information about the upgrade process.
   - type: checkboxes
     attributes:
       label: Prerequisites

From 14b722e311c94fa9cebffb71583eb8623e3fbf5f Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Mon, 31 Jul 2023 10:22:07 +0200
Subject: [PATCH 0678/1030] Functional Tests : Fixed ESLint errors

---
 tests/UI/data/types/maildev.d.ts | 2 +-
 tests/UI/utils/api.ts            | 2 +-
 tests/UI/utils/files.ts          | 7 ++++---
 tests/UI/utils/globals.ts        | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/tests/UI/data/types/maildev.d.ts b/tests/UI/data/types/maildev.d.ts
index 6a809f43673fc..9aa676540e404 100644
--- a/tests/UI/data/types/maildev.d.ts
+++ b/tests/UI/data/types/maildev.d.ts
@@ -1,6 +1,6 @@
 declare module 'maildev' {
-  import type MailDevEmail from '@data/types/maildevEmail';
   import fs from 'fs';
+  import type MailDevEmail from '@data/types/maildevEmail';
 
   /**
    * Interface for {@link MailDev}.
diff --git a/tests/UI/utils/api.ts b/tests/UI/utils/api.ts
index a045cca0f9032..318d3cd863254 100644
--- a/tests/UI/utils/api.ts
+++ b/tests/UI/utils/api.ts
@@ -1,6 +1,6 @@
-import type {APIResponse} from 'playwright';
 import crypto from 'crypto';
 import {readFileSync} from 'fs';
+import type {APIResponse} from 'playwright';
 
 type HttpHeader = {
   name: string
diff --git a/tests/UI/utils/files.ts b/tests/UI/utils/files.ts
index 4de855e4ac87a..125c72cfe48c8 100644
--- a/tests/UI/utils/files.ts
+++ b/tests/UI/utils/files.ts
@@ -1,12 +1,13 @@
+import fs from 'fs';
+import path from 'path';
+import https from 'https';
+
 import ImportData from '@data/faker/import';
 
 import {createObjectCsvWriter} from 'csv-writer';
-import fs from 'fs';
 import imgGen from 'js-image-generator';
-import path from 'path';
 import {getDocument, OPS, PDFDocumentProxy} from 'pdfjs-dist/legacy/build/pdf.js';
 import {TextItem, TextMarkedContent} from 'pdfjs-dist/types/src/display/api';
-import https from 'https';
 import {RawImageData} from 'jpeg-js';
 
 /**
diff --git a/tests/UI/utils/globals.ts b/tests/UI/utils/globals.ts
index 2b2fdbbb7c475..2715f9153d5f4 100755
--- a/tests/UI/utils/globals.ts
+++ b/tests/UI/utils/globals.ts
@@ -1,5 +1,5 @@
-import {config} from 'dotenv';
 import path from 'path';
+import {config} from 'dotenv';
 
 config();
 

From 3f2b21626084ba57800a6e29f181a6ffa9aaf351 Mon Sep 17 00:00:00 2001
From: boubkerbribri <boubker.bribri@prestashop.com>
Date: Mon, 31 Jul 2023 10:23:12 +0200
Subject: [PATCH 0679/1030] Add jsdoc

---
 tests/UI/pages/BO/shopParameters/stores/add.ts |  6 +++---
 tests/UI/webservices/baseWs.ts                 | 14 +++++++-------
 tests/UI/webservices/store/storeWS.ts          | 10 ++++++++++
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/tests/UI/pages/BO/shopParameters/stores/add.ts b/tests/UI/pages/BO/shopParameters/stores/add.ts
index 6c41b34da3d07..cf60d639401ee 100644
--- a/tests/UI/pages/BO/shopParameters/stores/add.ts
+++ b/tests/UI/pages/BO/shopParameters/stores/add.ts
@@ -130,7 +130,7 @@ class AddStore extends BOBasePage {
   }
 
   /**
-   *
+   * Get Inputs values
    * @param page {Page}
    * @param inputName {string}
    * @param languageId {string | undefined}
@@ -214,7 +214,7 @@ class AddStore extends BOBasePage {
   }
 
   /**
-   *
+   * Get value of a select
    * @param page {Page}
    * @param name {string}
    */
@@ -236,7 +236,7 @@ class AddStore extends BOBasePage {
   }
 
   /**
-   *
+   * Get Toggle value
    * @param page {Page}
    * @param toggle {string}
    */
diff --git a/tests/UI/webservices/baseWs.ts b/tests/UI/webservices/baseWs.ts
index 47b315f56cc3c..8ec4a493ef0c9 100644
--- a/tests/UI/webservices/baseWs.ts
+++ b/tests/UI/webservices/baseWs.ts
@@ -21,7 +21,7 @@ export default class BaseWS {
         display: 'full',
       },
     });
-  };
+  }
 
   /**
    * Returns a blank XML tree of the chosen resource, with the format that is expected for each value and specific indicators
@@ -43,7 +43,7 @@ export default class BaseWS {
         display: 'full',
       },
     });
-  };
+  }
 
   /**
    * Get all element
@@ -61,7 +61,7 @@ export default class BaseWS {
         Authorization: authorization,
       },
     });
-  };
+  }
 
   /**
    * Get element by id
@@ -81,7 +81,7 @@ export default class BaseWS {
         Authorization: authorization,
       },
     });
-  };
+  }
 
   /**
    * Add new element
@@ -102,7 +102,7 @@ export default class BaseWS {
       },
       data,
     });
-  };
+  }
 
   /**
    * Update an element
@@ -125,7 +125,7 @@ export default class BaseWS {
       },
       data,
     });
-  };
+  }
 
   /**
    * Delete an element
@@ -145,5 +145,5 @@ export default class BaseWS {
         Authorization: authorization,
       },
     });
-  };
+  }
 }
diff --git a/tests/UI/webservices/store/storeWS.ts b/tests/UI/webservices/store/storeWS.ts
index 017baf67e352f..50aae9eb89414 100644
--- a/tests/UI/webservices/store/storeWS.ts
+++ b/tests/UI/webservices/store/storeWS.ts
@@ -4,6 +4,11 @@ import {APIRequestContext, APIResponse} from 'playwright';
 export default class StoreWS extends BaseWS {
   public static endpoint = 'api/stores';
 
+  /**
+   * Get Blank
+   * @param apiContext {APIRequestContext}
+   * @param authorization {string}
+   */
   public static async getBlank(
     apiContext: APIRequestContext,
     authorization: string,
@@ -11,6 +16,11 @@ export default class StoreWS extends BaseWS {
     return super.getBlank(apiContext, this.endpoint, authorization);
   }
 
+  /**
+   * Get Synopsis
+   * @param apiContext {APIRequestContext}
+   * @param authorization {string}
+   */
   public static async getSynopsis(
     apiContext: APIRequestContext,
     authorization: string,

From 1742c7dd0d5fe2e588eaa123115b0390fe95fb89 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 31 Jul 2023 09:07:49 +0000
Subject: [PATCH 0680/1030] Bump eslint-plugin-deprecation from 1.4.1 to 1.5.0
 in /tests/UI

Bumps [eslint-plugin-deprecation](https://github.com/gund/eslint-plugin-deprecation) from 1.4.1 to 1.5.0.
- [Release notes](https://github.com/gund/eslint-plugin-deprecation/releases)
- [Changelog](https://github.com/gund/eslint-plugin-deprecation/blob/master/CHANGELOG.md)
- [Commits](https://github.com/gund/eslint-plugin-deprecation/compare/v1.4.1...v1.5.0)

---
updated-dependencies:
- dependency-name: eslint-plugin-deprecation
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 14 +++++++-------
 tests/UI/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index 2b8905c0813a5..ecdce057532a4 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -36,7 +36,7 @@
         "babel-eslint": "^10.1.0",
         "eslint": "^8.46.0",
         "eslint-config-airbnb-base": "^15.0.0",
-        "eslint-plugin-deprecation": "^1.4.1",
+        "eslint-plugin-deprecation": "^1.5.0",
         "eslint-plugin-html": "^7.1.0",
         "eslint-plugin-import": "^2.28.0",
         "jsdoc-to-markdown": "^8.0.0",
@@ -2821,9 +2821,9 @@
       }
     },
     "node_modules/eslint-plugin-deprecation": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-deprecation/-/eslint-plugin-deprecation-1.4.1.tgz",
-      "integrity": "sha512-4vxTghWzxsBukPJVQupi6xlTuDc8Pyi1QlRCrFiLgwLPMJQW3cJCNaehJUKQqQFvuue5m4W27e179Y3Qjzeghg==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-deprecation/-/eslint-plugin-deprecation-1.5.0.tgz",
+      "integrity": "sha512-mRcssI/tLROueBQ6yf4LnnGTijbMsTCPIpbRbPj5R5wGYVCpk1zDmAS0SEkgcUDXOPc22qMNFR24Qw7vSPrlTA==",
       "dev": true,
       "dependencies": {
         "@typescript-eslint/utils": "^5.57.0",
@@ -10230,9 +10230,9 @@
       }
     },
     "eslint-plugin-deprecation": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-deprecation/-/eslint-plugin-deprecation-1.4.1.tgz",
-      "integrity": "sha512-4vxTghWzxsBukPJVQupi6xlTuDc8Pyi1QlRCrFiLgwLPMJQW3cJCNaehJUKQqQFvuue5m4W27e179Y3Qjzeghg==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-deprecation/-/eslint-plugin-deprecation-1.5.0.tgz",
+      "integrity": "sha512-mRcssI/tLROueBQ6yf4LnnGTijbMsTCPIpbRbPj5R5wGYVCpk1zDmAS0SEkgcUDXOPc22qMNFR24Qw7vSPrlTA==",
       "dev": true,
       "requires": {
         "@typescript-eslint/utils": "^5.57.0",
diff --git a/tests/UI/package.json b/tests/UI/package.json
index 19adfc8914da2..92a42f17bacf3 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -129,7 +129,7 @@
     "babel-eslint": "^10.1.0",
     "eslint": "^8.46.0",
     "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-plugin-deprecation": "^1.4.1",
+    "eslint-plugin-deprecation": "^1.5.0",
     "eslint-plugin-html": "^7.1.0",
     "eslint-plugin-import": "^2.28.0",
     "jsdoc-to-markdown": "^8.0.0",

From 7aebc824abb60e8a374d99d7b0558362a06d1844 Mon Sep 17 00:00:00 2001
From: Daniel Hlavacek <daniel.hlavacek@hotmail.cz>
Date: Mon, 31 Jul 2023 11:39:21 +0200
Subject: [PATCH 0681/1030] Update .github/ISSUE_TEMPLATE/1_bug_report.yml

Co-authored-by: Krystian Podemski <kpodemski@users.noreply.github.com>
---
 .github/ISSUE_TEMPLATE/1_bug_report.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/1_bug_report.yml b/.github/ISSUE_TEMPLATE/1_bug_report.yml
index c27f98e531690..f97304f19dafb 100644
--- a/.github/ISSUE_TEMPLATE/1_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/1_bug_report.yml
@@ -10,7 +10,7 @@ body:
          - Follow the [bug report guidelines](https://devdocs.prestashop-project.org/8/contribute/contribute-reporting-issues/#best-practices-for-writing-an-issue) to help issue managers qualify your report faster.
          - Avoid reporting "error 500" or "white page" errors - this is a universal error message that does not provide enough information to qualify the issue. Enable debug mode in the Performance section of PrestaShop or manually in `/config/defines.inc.php` and try again. You should get a proper error message.
          - **Write in English.** Reports in all other languages will be closed.
-         - If reporting a problem with the upgrade process, open `/admin/autoupgrade/tmp` and attach anonymized `log.txt` to the issue. It contains all the information about the upgrade process.
+         - If reporting a problem with the upgrade process, open `/admin/autoupgrade/tmp` and attach the last part of `log.txt` to the issue. It may contain information about the upgrade errors helpful in resolving the issue. Do not upload the entire `log.txt` as it contains sensitive data.
   - type: checkboxes
     attributes:
       label: Prerequisites

From ecff65a72403d97707455b215725ff674125328e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 31 Jul 2023 09:55:29 +0000
Subject: [PATCH 0682/1030] Bump @typescript-eslint/eslint-plugin from 5.62.0
 to 6.2.0 in /tests/UI

Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 5.62.0 to 6.2.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.2.0/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 644 +++++++++++++------------------------
 tests/UI/package.json      |   2 +-
 2 files changed, 230 insertions(+), 416 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index b0f7d999f8bc2..0019661b5bfad 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -31,7 +31,7 @@
         "@types/chai-string": "^1.4.2",
         "@types/mocha": "^10.0.1",
         "@types/mochawesome": "^6.2.1",
-        "@typescript-eslint/eslint-plugin": "^5.62.0",
+        "@typescript-eslint/eslint-plugin": "^6.2.0",
         "@typescript-eslint/parser": "^5.62.0",
         "babel-eslint": "^10.1.0",
         "eslint": "^8.46.0",
@@ -214,9 +214,9 @@
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.2.0.tgz",
-      "integrity": "sha512-gB8T4H4DEfX2IV9zGDJPOBgP1e/DbfCPDTtEqUMckpvzS1OYtva8JdFYBqMwYk7xAQ429WGF/UPqn8uQ//h2vQ==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
+      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
       "dev": true,
       "dependencies": {
         "eslint-visitor-keys": "^3.3.0"
@@ -533,32 +533,34 @@
       "dev": true
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz",
-      "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.2.0.tgz",
+      "integrity": "sha512-rClGrMuyS/3j0ETa1Ui7s6GkLhfZGKZL3ZrChLeAiACBE/tRc1wq8SNZESUuluxhLj9FkUefRs2l6bCIArWBiQ==",
       "dev": true,
       "dependencies": {
-        "@eslint-community/regexpp": "^4.4.0",
-        "@typescript-eslint/scope-manager": "5.62.0",
-        "@typescript-eslint/type-utils": "5.62.0",
-        "@typescript-eslint/utils": "5.62.0",
+        "@eslint-community/regexpp": "^4.5.1",
+        "@typescript-eslint/scope-manager": "6.2.0",
+        "@typescript-eslint/type-utils": "6.2.0",
+        "@typescript-eslint/utils": "6.2.0",
+        "@typescript-eslint/visitor-keys": "6.2.0",
         "debug": "^4.3.4",
         "graphemer": "^1.4.0",
-        "ignore": "^5.2.0",
+        "ignore": "^5.2.4",
+        "natural-compare": "^1.4.0",
         "natural-compare-lite": "^1.4.0",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
+        "semver": "^7.5.4",
+        "ts-api-utils": "^1.0.1"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^16.0.0 || >=18.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^5.0.0",
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+        "@typescript-eslint/parser": "^6.0.0 || ^6.0.0-alpha",
+        "eslint": "^7.0.0 || ^8.0.0"
       },
       "peerDependenciesMeta": {
         "typescript": {
@@ -567,16 +569,16 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
-      "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.2.0.tgz",
+      "integrity": "sha512-1ZMNVgm5nnHURU8ZSJ3snsHzpFeNK84rdZjluEVBGNu7jDymfqceB3kdIZ6A4xCfEFFhRIB6rF8q/JIqJd2R0Q==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.62.0",
-        "@typescript-eslint/visitor-keys": "5.62.0"
+        "@typescript-eslint/types": "6.2.0",
+        "@typescript-eslint/visitor-keys": "6.2.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^16.0.0 || >=18.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -584,12 +586,12 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
-      "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.2.0.tgz",
+      "integrity": "sha512-1nRRaDlp/XYJQLvkQJG5F3uBTno5SHPT7XVcJ5n1/k2WfNI28nJsvLakxwZRNY5spuatEKO7d5nZWsQpkqXwBA==",
       "dev": true,
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^16.0.0 || >=18.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -597,21 +599,21 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
-      "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.2.0.tgz",
+      "integrity": "sha512-Mts6+3HQMSM+LZCglsc2yMIny37IhUgp1Qe8yJUYVyO6rHP7/vN0vajKu3JvHCBIy8TSiKddJ/Zwu80jhnGj1w==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.62.0",
-        "@typescript-eslint/visitor-keys": "5.62.0",
+        "@typescript-eslint/types": "6.2.0",
+        "@typescript-eslint/visitor-keys": "6.2.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
+        "semver": "^7.5.4",
+        "ts-api-utils": "^1.0.1"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^16.0.0 || >=18.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -624,82 +626,51 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz",
-      "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.2.0.tgz",
+      "integrity": "sha512-RCFrC1lXiX1qEZN8LmLrxYRhOkElEsPKTVSNout8DMzf8PeWoQG7Rxz2SadpJa3VSh5oYKGwt7j7X/VRg+Y3OQ==",
       "dev": true,
       "dependencies": {
-        "@eslint-community/eslint-utils": "^4.2.0",
-        "@types/json-schema": "^7.0.9",
-        "@types/semver": "^7.3.12",
-        "@typescript-eslint/scope-manager": "5.62.0",
-        "@typescript-eslint/types": "5.62.0",
-        "@typescript-eslint/typescript-estree": "5.62.0",
-        "eslint-scope": "^5.1.1",
-        "semver": "^7.3.7"
+        "@eslint-community/eslint-utils": "^4.4.0",
+        "@types/json-schema": "^7.0.12",
+        "@types/semver": "^7.5.0",
+        "@typescript-eslint/scope-manager": "6.2.0",
+        "@typescript-eslint/types": "6.2.0",
+        "@typescript-eslint/typescript-estree": "6.2.0",
+        "semver": "^7.5.4"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^16.0.0 || >=18.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+        "eslint": "^7.0.0 || ^8.0.0"
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
-      "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.2.0.tgz",
+      "integrity": "sha512-QbaYUQVKKo9bgCzpjz45llCfwakyoxHetIy8CAvYCtd16Zu1KrpzNHofwF8kGkpPOxZB2o6kz+0nqH8ZkIzuoQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.62.0",
-        "eslint-visitor-keys": "^3.3.0"
+        "@typescript-eslint/types": "6.2.0",
+        "eslint-visitor-keys": "^3.4.1"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^16.0.0 || >=18.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-visitor-keys": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
-      "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
+      "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -809,23 +780,6 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@typescript-eslint/parser/node_modules/eslint-visitor-keys": {
       "version": "3.4.1",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
@@ -856,25 +810,25 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz",
-      "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.2.0.tgz",
+      "integrity": "sha512-DnGZuNU2JN3AYwddYIqrVkYW0uUQdv0AY+kz2M25euVNlujcN2u+rJgfJsBFlUEzBB6OQkUqSZPyuTLf2bP5mw==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "5.62.0",
-        "@typescript-eslint/utils": "5.62.0",
+        "@typescript-eslint/typescript-estree": "6.2.0",
+        "@typescript-eslint/utils": "6.2.0",
         "debug": "^4.3.4",
-        "tsutils": "^3.21.0"
+        "ts-api-utils": "^1.0.1"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^16.0.0 || >=18.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "*"
+        "eslint": "^7.0.0 || ^8.0.0"
       },
       "peerDependenciesMeta": {
         "typescript": {
@@ -883,16 +837,16 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/scope-manager": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
-      "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.2.0.tgz",
+      "integrity": "sha512-1ZMNVgm5nnHURU8ZSJ3snsHzpFeNK84rdZjluEVBGNu7jDymfqceB3kdIZ6A4xCfEFFhRIB6rF8q/JIqJd2R0Q==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.62.0",
-        "@typescript-eslint/visitor-keys": "5.62.0"
+        "@typescript-eslint/types": "6.2.0",
+        "@typescript-eslint/visitor-keys": "6.2.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^16.0.0 || >=18.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -900,12 +854,12 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
-      "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.2.0.tgz",
+      "integrity": "sha512-1nRRaDlp/XYJQLvkQJG5F3uBTno5SHPT7XVcJ5n1/k2WfNI28nJsvLakxwZRNY5spuatEKO7d5nZWsQpkqXwBA==",
       "dev": true,
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^16.0.0 || >=18.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -913,21 +867,21 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
-      "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.2.0.tgz",
+      "integrity": "sha512-Mts6+3HQMSM+LZCglsc2yMIny37IhUgp1Qe8yJUYVyO6rHP7/vN0vajKu3JvHCBIy8TSiKddJ/Zwu80jhnGj1w==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.62.0",
-        "@typescript-eslint/visitor-keys": "5.62.0",
+        "@typescript-eslint/types": "6.2.0",
+        "@typescript-eslint/visitor-keys": "6.2.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
+        "semver": "^7.5.4",
+        "ts-api-utils": "^1.0.1"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^16.0.0 || >=18.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -940,82 +894,51 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz",
-      "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.2.0.tgz",
+      "integrity": "sha512-RCFrC1lXiX1qEZN8LmLrxYRhOkElEsPKTVSNout8DMzf8PeWoQG7Rxz2SadpJa3VSh5oYKGwt7j7X/VRg+Y3OQ==",
       "dev": true,
       "dependencies": {
-        "@eslint-community/eslint-utils": "^4.2.0",
-        "@types/json-schema": "^7.0.9",
-        "@types/semver": "^7.3.12",
-        "@typescript-eslint/scope-manager": "5.62.0",
-        "@typescript-eslint/types": "5.62.0",
-        "@typescript-eslint/typescript-estree": "5.62.0",
-        "eslint-scope": "^5.1.1",
-        "semver": "^7.3.7"
+        "@eslint-community/eslint-utils": "^4.4.0",
+        "@types/json-schema": "^7.0.12",
+        "@types/semver": "^7.5.0",
+        "@typescript-eslint/scope-manager": "6.2.0",
+        "@typescript-eslint/types": "6.2.0",
+        "@typescript-eslint/typescript-estree": "6.2.0",
+        "semver": "^7.5.4"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^16.0.0 || >=18.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+        "eslint": "^7.0.0 || ^8.0.0"
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
-      "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.2.0.tgz",
+      "integrity": "sha512-QbaYUQVKKo9bgCzpjz45llCfwakyoxHetIy8CAvYCtd16Zu1KrpzNHofwF8kGkpPOxZB2o6kz+0nqH8ZkIzuoQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.62.0",
-        "eslint-visitor-keys": "^3.3.0"
+        "@typescript-eslint/types": "6.2.0",
+        "eslint-visitor-keys": "^3.4.1"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^16.0.0 || >=18.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils/node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
     "node_modules/@typescript-eslint/type-utils/node_modules/eslint-visitor-keys": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
-      "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
+      "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -1064,23 +987,6 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@typescript-eslint/utils": {
       "version": "5.60.1",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.60.1.tgz",
@@ -2205,9 +2111,9 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -3828,15 +3734,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/globby/node_modules/ignore": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
     "node_modules/gopd": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
@@ -4064,9 +3961,9 @@
       }
     },
     "node_modules/ignore": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.1.tgz",
-      "integrity": "sha512-d2qQLzTJ9WxQftPAuEQpSPmKqzxePjzVbpAVv62AQ64NTL+wR4JkrVqR/LqFsFEUsHDAiId52mJteHDFuDkElA==",
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
+      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
       "dev": true,
       "engines": {
         "node": ">= 4"
@@ -5216,27 +5113,6 @@
         "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/mocha/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/mocha/node_modules/debug/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
     "node_modules/mocha/node_modules/diff": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
@@ -6685,9 +6561,9 @@
       }
     },
     "node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "devOptional": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -7341,6 +7217,18 @@
         "node": ">=12"
       }
     },
+    "node_modules/ts-api-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.1.tgz",
+      "integrity": "sha512-lC/RGlPmwdrIBFTX59wwNzqh7aR2otPNPR/5brHZm/XKFYKsfqxihXUe9pU3JI+3vGkl+vyCoNNnPhJn3aLK1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=16.13.0"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.2.0"
+      }
+    },
     "node_modules/ts-mocha": {
       "version": "10.0.0",
       "resolved": "https://registry.npmjs.org/ts-mocha/-/ts-mocha-10.0.0.tgz",
@@ -8218,9 +8106,9 @@
       }
     },
     "@eslint-community/eslint-utils": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.2.0.tgz",
-      "integrity": "sha512-gB8T4H4DEfX2IV9zGDJPOBgP1e/DbfCPDTtEqUMckpvzS1OYtva8JdFYBqMwYk7xAQ429WGF/UPqn8uQ//h2vQ==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
+      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
       "dev": true,
       "requires": {
         "eslint-visitor-keys": "^3.3.0"
@@ -8473,103 +8361,85 @@
       "dev": true
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz",
-      "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.2.0.tgz",
+      "integrity": "sha512-rClGrMuyS/3j0ETa1Ui7s6GkLhfZGKZL3ZrChLeAiACBE/tRc1wq8SNZESUuluxhLj9FkUefRs2l6bCIArWBiQ==",
       "dev": true,
       "requires": {
-        "@eslint-community/regexpp": "^4.4.0",
-        "@typescript-eslint/scope-manager": "5.62.0",
-        "@typescript-eslint/type-utils": "5.62.0",
-        "@typescript-eslint/utils": "5.62.0",
+        "@eslint-community/regexpp": "^4.5.1",
+        "@typescript-eslint/scope-manager": "6.2.0",
+        "@typescript-eslint/type-utils": "6.2.0",
+        "@typescript-eslint/utils": "6.2.0",
+        "@typescript-eslint/visitor-keys": "6.2.0",
         "debug": "^4.3.4",
         "graphemer": "^1.4.0",
-        "ignore": "^5.2.0",
+        "ignore": "^5.2.4",
+        "natural-compare": "^1.4.0",
         "natural-compare-lite": "^1.4.0",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
+        "semver": "^7.5.4",
+        "ts-api-utils": "^1.0.1"
       },
       "dependencies": {
         "@typescript-eslint/scope-manager": {
-          "version": "5.62.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
-          "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.2.0.tgz",
+          "integrity": "sha512-1ZMNVgm5nnHURU8ZSJ3snsHzpFeNK84rdZjluEVBGNu7jDymfqceB3kdIZ6A4xCfEFFhRIB6rF8q/JIqJd2R0Q==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "5.62.0",
-            "@typescript-eslint/visitor-keys": "5.62.0"
+            "@typescript-eslint/types": "6.2.0",
+            "@typescript-eslint/visitor-keys": "6.2.0"
           }
         },
         "@typescript-eslint/types": {
-          "version": "5.62.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
-          "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.2.0.tgz",
+          "integrity": "sha512-1nRRaDlp/XYJQLvkQJG5F3uBTno5SHPT7XVcJ5n1/k2WfNI28nJsvLakxwZRNY5spuatEKO7d5nZWsQpkqXwBA==",
           "dev": true
         },
         "@typescript-eslint/typescript-estree": {
-          "version": "5.62.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
-          "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.2.0.tgz",
+          "integrity": "sha512-Mts6+3HQMSM+LZCglsc2yMIny37IhUgp1Qe8yJUYVyO6rHP7/vN0vajKu3JvHCBIy8TSiKddJ/Zwu80jhnGj1w==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "5.62.0",
-            "@typescript-eslint/visitor-keys": "5.62.0",
+            "@typescript-eslint/types": "6.2.0",
+            "@typescript-eslint/visitor-keys": "6.2.0",
             "debug": "^4.3.4",
             "globby": "^11.1.0",
             "is-glob": "^4.0.3",
-            "semver": "^7.3.7",
-            "tsutils": "^3.21.0"
+            "semver": "^7.5.4",
+            "ts-api-utils": "^1.0.1"
           }
         },
         "@typescript-eslint/utils": {
-          "version": "5.62.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz",
-          "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==",
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.2.0.tgz",
+          "integrity": "sha512-RCFrC1lXiX1qEZN8LmLrxYRhOkElEsPKTVSNout8DMzf8PeWoQG7Rxz2SadpJa3VSh5oYKGwt7j7X/VRg+Y3OQ==",
           "dev": true,
           "requires": {
-            "@eslint-community/eslint-utils": "^4.2.0",
-            "@types/json-schema": "^7.0.9",
-            "@types/semver": "^7.3.12",
-            "@typescript-eslint/scope-manager": "5.62.0",
-            "@typescript-eslint/types": "5.62.0",
-            "@typescript-eslint/typescript-estree": "5.62.0",
-            "eslint-scope": "^5.1.1",
-            "semver": "^7.3.7"
+            "@eslint-community/eslint-utils": "^4.4.0",
+            "@types/json-schema": "^7.0.12",
+            "@types/semver": "^7.5.0",
+            "@typescript-eslint/scope-manager": "6.2.0",
+            "@typescript-eslint/types": "6.2.0",
+            "@typescript-eslint/typescript-estree": "6.2.0",
+            "semver": "^7.5.4"
           }
         },
         "@typescript-eslint/visitor-keys": {
-          "version": "5.62.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
-          "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "5.62.0",
-            "eslint-visitor-keys": "^3.3.0"
-          }
-        },
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "eslint-scope": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-          "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.2.0.tgz",
+          "integrity": "sha512-QbaYUQVKKo9bgCzpjz45llCfwakyoxHetIy8CAvYCtd16Zu1KrpzNHofwF8kGkpPOxZB2o6kz+0nqH8ZkIzuoQ==",
           "dev": true,
           "requires": {
-            "esrecurse": "^4.3.0",
-            "estraverse": "^4.1.1"
+            "@typescript-eslint/types": "6.2.0",
+            "eslint-visitor-keys": "^3.4.1"
           }
         },
         "eslint-visitor-keys": {
-          "version": "3.4.1",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
-          "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
+          "version": "3.4.2",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
+          "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==",
           "dev": true
         }
       }
@@ -8627,15 +8497,6 @@
             "eslint-visitor-keys": "^3.3.0"
           }
         },
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
         "eslint-visitor-keys": {
           "version": "3.4.1",
           "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
@@ -8655,97 +8516,77 @@
       }
     },
     "@typescript-eslint/type-utils": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz",
-      "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.2.0.tgz",
+      "integrity": "sha512-DnGZuNU2JN3AYwddYIqrVkYW0uUQdv0AY+kz2M25euVNlujcN2u+rJgfJsBFlUEzBB6OQkUqSZPyuTLf2bP5mw==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/typescript-estree": "5.62.0",
-        "@typescript-eslint/utils": "5.62.0",
+        "@typescript-eslint/typescript-estree": "6.2.0",
+        "@typescript-eslint/utils": "6.2.0",
         "debug": "^4.3.4",
-        "tsutils": "^3.21.0"
+        "ts-api-utils": "^1.0.1"
       },
       "dependencies": {
         "@typescript-eslint/scope-manager": {
-          "version": "5.62.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
-          "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.2.0.tgz",
+          "integrity": "sha512-1ZMNVgm5nnHURU8ZSJ3snsHzpFeNK84rdZjluEVBGNu7jDymfqceB3kdIZ6A4xCfEFFhRIB6rF8q/JIqJd2R0Q==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "5.62.0",
-            "@typescript-eslint/visitor-keys": "5.62.0"
+            "@typescript-eslint/types": "6.2.0",
+            "@typescript-eslint/visitor-keys": "6.2.0"
           }
         },
         "@typescript-eslint/types": {
-          "version": "5.62.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
-          "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.2.0.tgz",
+          "integrity": "sha512-1nRRaDlp/XYJQLvkQJG5F3uBTno5SHPT7XVcJ5n1/k2WfNI28nJsvLakxwZRNY5spuatEKO7d5nZWsQpkqXwBA==",
           "dev": true
         },
         "@typescript-eslint/typescript-estree": {
-          "version": "5.62.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
-          "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.2.0.tgz",
+          "integrity": "sha512-Mts6+3HQMSM+LZCglsc2yMIny37IhUgp1Qe8yJUYVyO6rHP7/vN0vajKu3JvHCBIy8TSiKddJ/Zwu80jhnGj1w==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "5.62.0",
-            "@typescript-eslint/visitor-keys": "5.62.0",
+            "@typescript-eslint/types": "6.2.0",
+            "@typescript-eslint/visitor-keys": "6.2.0",
             "debug": "^4.3.4",
             "globby": "^11.1.0",
             "is-glob": "^4.0.3",
-            "semver": "^7.3.7",
-            "tsutils": "^3.21.0"
+            "semver": "^7.5.4",
+            "ts-api-utils": "^1.0.1"
           }
         },
         "@typescript-eslint/utils": {
-          "version": "5.62.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz",
-          "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==",
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.2.0.tgz",
+          "integrity": "sha512-RCFrC1lXiX1qEZN8LmLrxYRhOkElEsPKTVSNout8DMzf8PeWoQG7Rxz2SadpJa3VSh5oYKGwt7j7X/VRg+Y3OQ==",
           "dev": true,
           "requires": {
-            "@eslint-community/eslint-utils": "^4.2.0",
-            "@types/json-schema": "^7.0.9",
-            "@types/semver": "^7.3.12",
-            "@typescript-eslint/scope-manager": "5.62.0",
-            "@typescript-eslint/types": "5.62.0",
-            "@typescript-eslint/typescript-estree": "5.62.0",
-            "eslint-scope": "^5.1.1",
-            "semver": "^7.3.7"
+            "@eslint-community/eslint-utils": "^4.4.0",
+            "@types/json-schema": "^7.0.12",
+            "@types/semver": "^7.5.0",
+            "@typescript-eslint/scope-manager": "6.2.0",
+            "@typescript-eslint/types": "6.2.0",
+            "@typescript-eslint/typescript-estree": "6.2.0",
+            "semver": "^7.5.4"
           }
         },
         "@typescript-eslint/visitor-keys": {
-          "version": "5.62.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
-          "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "5.62.0",
-            "eslint-visitor-keys": "^3.3.0"
-          }
-        },
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.2.0.tgz",
+          "integrity": "sha512-QbaYUQVKKo9bgCzpjz45llCfwakyoxHetIy8CAvYCtd16Zu1KrpzNHofwF8kGkpPOxZB2o6kz+0nqH8ZkIzuoQ==",
           "dev": true,
           "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "eslint-scope": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-          "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-          "dev": true,
-          "requires": {
-            "esrecurse": "^4.3.0",
-            "estraverse": "^4.1.1"
+            "@typescript-eslint/types": "6.2.0",
+            "eslint-visitor-keys": "^3.4.1"
           }
         },
         "eslint-visitor-keys": {
-          "version": "3.4.1",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
-          "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
+          "version": "3.4.2",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
+          "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==",
           "dev": true
         }
       }
@@ -8769,17 +8610,6 @@
         "is-glob": "^4.0.3",
         "semver": "^7.3.7",
         "tsutils": "^3.21.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        }
       }
     },
     "@typescript-eslint/utils": {
@@ -9644,9 +9474,9 @@
       "integrity": "sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA=="
     },
     "debug": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "requires": {
         "ms": "2.1.2"
       }
@@ -10855,14 +10685,6 @@
         "ignore": "^5.2.0",
         "merge2": "^1.4.1",
         "slash": "^3.0.0"
-      },
-      "dependencies": {
-        "ignore": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-          "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
-          "dev": true
-        }
       }
     },
     "gopd": {
@@ -11025,9 +10847,9 @@
       }
     },
     "ignore": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.1.tgz",
-      "integrity": "sha512-d2qQLzTJ9WxQftPAuEQpSPmKqzxePjzVbpAVv62AQ64NTL+wR4JkrVqR/LqFsFEUsHDAiId52mJteHDFuDkElA==",
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
+      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
       "dev": true
     },
     "import-fresh": {
@@ -11885,21 +11707,6 @@
             "balanced-match": "^1.0.0"
           }
         },
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "requires": {
-            "ms": "2.1.2"
-          },
-          "dependencies": {
-            "ms": {
-              "version": "2.1.2",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-              "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-            }
-          }
-        },
         "diff": {
           "version": "5.0.0",
           "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
@@ -12950,9 +12757,9 @@
       }
     },
     "semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "devOptional": true,
       "requires": {
         "lru-cache": "^6.0.0"
@@ -13456,6 +13263,13 @@
         "punycode": "^2.1.1"
       }
     },
+    "ts-api-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.1.tgz",
+      "integrity": "sha512-lC/RGlPmwdrIBFTX59wwNzqh7aR2otPNPR/5brHZm/XKFYKsfqxihXUe9pU3JI+3vGkl+vyCoNNnPhJn3aLK1A==",
+      "dev": true,
+      "requires": {}
+    },
     "ts-mocha": {
       "version": "10.0.0",
       "resolved": "https://registry.npmjs.org/ts-mocha/-/ts-mocha-10.0.0.tgz",
diff --git a/tests/UI/package.json b/tests/UI/package.json
index 9740e4f1b9eaf..a4a893c41abc1 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -124,7 +124,7 @@
     "@types/chai-string": "^1.4.2",
     "@types/mocha": "^10.0.1",
     "@types/mochawesome": "^6.2.1",
-    "@typescript-eslint/eslint-plugin": "^5.62.0",
+    "@typescript-eslint/eslint-plugin": "^6.2.0",
     "@typescript-eslint/parser": "^5.62.0",
     "babel-eslint": "^10.1.0",
     "eslint": "^8.46.0",

From 04fa24b15f1fcaf4ad6c98df34f71adbc897c609 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Mon, 31 Jul 2023 16:28:09 +0200
Subject: [PATCH 0683/1030] Add new test to import file

---
 .../05_import/02_importFile.ts                | 192 +++++++++---------
 .../BO/advancedParameters/import/index.ts     |  39 +++-
 2 files changed, 139 insertions(+), 92 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/05_import/02_importFile.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/05_import/02_importFile.ts
index a53e852be79bb..6e96cb0717537 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/05_import/02_importFile.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/05_import/02_importFile.ts
@@ -19,89 +19,57 @@ import type {BrowserContext, Page} from 'playwright';
 
 const baseContext: string = 'functional_BO_advancedParameters_import_importFile';
 
-/*
-Pre-condition:
-- Get categories number
-Scenario
-- Import categories csv file
-- Check validation progress message
-- Go to categories page to check number of categories
-Post-Condition:
-- delete imported categories
- */
-describe('BO - Advanced Parameters - Import : Import categories', async () => {
-  // Variable Used to create csv file
-  const fileName: string = 'categories.csv';
-
+describe('BO - Advanced Parameters - Import : Import file', async () => {
   let browserContext: BrowserContext;
   let page: Page;
-  // Variable used in the "check import success" test
-  let numberOfCategories: number = 0;
+  let filePath: string | null;
+  let secondFilePath: string | null;
 
   // before and after functions
   before(async function () {
     browserContext = await helper.createBrowserContext(this.browser);
     page = await helper.newTab(browserContext);
-    // Create csv file with all data
-    await files.createCSVFile('.', fileName, ImportCategories);
   });
 
   after(async () => {
     await helper.closeBrowserContext(browserContext);
-    // delete file
-    await files.deleteFile(fileName);
   });
 
-  // Pre-condition: Get number of categories
-  describe('PRE-TEST: Get number of categories', async () => {
-    it('should login in BO', async function () {
-      await loginCommon.loginBO(this, page);
-    });
-
-    it('should go to \'Catalog > Categories\' page', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'goToCategoriesPage', baseContext);
-
-      await dashboardPage.goToSubMenu(
-        page,
-        dashboardPage.catalogParentLink,
-        dashboardPage.categoriesLink,
-      );
-
-      await categoriesPage.closeSfToolBar(page);
+  it('should login in BO', async function () {
+    await loginCommon.loginBO(this, page);
+  });
 
-      const pageTitle = await categoriesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(categoriesPage.pageTitle);
-    });
+  it('should go to \'Advanced Parameters > Import\' page', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'goToImportPage', baseContext);
 
-    it('should reset all filters and get number of Categories in BO', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'resetFirst', baseContext);
+    await dashboardPage.goToSubMenu(
+      page,
+      dashboardPage.advancedParametersLink,
+      dashboardPage.importLink,
+    );
+    await importPage.closeSfToolBar(page);
 
-      numberOfCategories = await categoriesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCategories).to.be.above(0);
-    });
+    const pageTitle = await importPage.getPageTitle(page);
+    await expect(pageTitle).to.contains(importPage.pageTitle);
   });
 
-  // 1 - Import categories.csv
-  describe('Import file', async () => {
-    it('should go to \'Advanced Parameters > Import\' page', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'goToImportPage', baseContext);
+  describe('Download then import categories simple file', async () => {
+    it('should download \'Sample categories file\' file', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'downloadFile', baseContext);
 
-      await dashboardPage.goToSubMenu(
-        page,
-        dashboardPage.advancedParametersLink,
-        dashboardPage.importLink,
-      );
-      await importPage.closeSfToolBar(page);
+      filePath = await importPage.downloadSampleFile(page, 'categories_import');
 
-      const pageTitle = await importPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(importPage.pageTitle);
+      const doesFileExist = await files.doesFileExist(filePath);
+      await expect(doesFileExist, 'categories_import sample file was not downloaded').to.be.true;
     });
 
-    it(`should upload '${fileName}' file`, async function () {
+    it('should upload the file', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'importFile', baseContext);
 
-      const uploadSuccessText = await importPage.uploadImportFile(page, 'Categories', fileName);
-      await expect(uploadSuccessText).contain(fileName);
+      await files.renameFile(filePath, 'categories.csv');
+
+      const uploadSuccessText = await importPage.uploadImportFile(page, 'Categories', 'categories.csv');
+      await expect(uploadSuccessText).contain('categories.csv');
     });
 
     it('should go to next import file step', async function () {
@@ -135,54 +103,96 @@ describe('BO - Advanced Parameters - Import : Import categories', async () => {
     });
   });
 
-  // 2 - Check number of categories imported
-  describe('Check number of categories', async () => {
-    it('should go to \'Catalog > Categories\' page', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'goToCategoriesPageToCheckImport', baseContext);
+  describe('Check choose from history / FTP then import suppliers simple file', async () => {
+    it('should download \'Sample suppliers file\' file', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'downloadFile', baseContext);
 
-      await dashboardPage.goToSubMenu(
-        page,
-        dashboardPage.catalogParentLink,
-        dashboardPage.categoriesLink,
-      );
+      secondFilePath = await importPage.downloadSampleFile(page, 'suppliers_import');
 
-      await categoriesPage.closeSfToolBar(page);
+      const doesFileExist = await files.doesFileExist(secondFilePath);
+      await expect(doesFileExist, 'categories_suppliers sample file was not downloaded').to.be.true;
+    });
+
+    it('should upload the file', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'importFile', baseContext);
 
-      const pageTitle = await categoriesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(categoriesPage.pageTitle);
+      await files.renameFile(secondFilePath, 'suppliers.csv');
+
+      const uploadSuccessText = await importPage.uploadImportFile(page, 'Suppliers', 'suppliers.csv');
+      await expect(uploadSuccessText).contain('suppliers.csv');
     });
 
-    it('should check number of categories in BO', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'resetSecond', baseContext);
+    it('should click on the downloaded file and check the existence of the button choose from history', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'clickOnDownloadedFile', baseContext);
+
+      await importPage.clickOnDownloadedFile(page);
 
-      const numberOfCategoriesAfterImport = await categoriesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCategoriesAfterImport).to.be.above(numberOfCategories);
+      const isButtonVisible = await importPage.isChooseFromHistoryButtonVisible(page);
+      await expect(isButtonVisible).to.be.true;
     });
-  });
 
-  // Post-condition: Delete imported categories
-  describe('POST-TEST: Delete imported categories', async () => {
-    it('should filter list by Name \'category\'', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'filterCategoriesTable', baseContext);
+    it('should click on \'Choose from history / FTP\'', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'importFile', baseContext);
+
+      const isFilesListTableVisible = await importPage.chooseFromHistoryFTP(page);
+      await expect(isFilesListTableVisible).to.be.true;
+    });
+
+    it('should check the imported files list', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'checkImportedFilesList', baseContext);
+
+      const importedFilesList = await importPage.getImportedFilesList(page);
+      await expect(importedFilesList).to.contains('categories.csv')
+        .and.to.contains('suppliers.csv');
+    });
+
+    it('should delete the first imported file', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'deleteFirstFile', baseContext);
+
+      // Delete file and check that choose from history button is visible
+      const isButtonVisible = await importPage.deleteFile(page);
+      await expect(isButtonVisible).to.be.true;
+    });
+
+    it('should use the second imported file', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'useSecondFile', baseContext);
 
-      await categoriesPage.filterCategories(page, 'input', 'name', 'category');
+      await importPage.chooseFromHistoryFTP(page);
 
-      const textColumn = await categoriesPage.getTextColumnFromTableCategories(page, 1, 'name');
-      await expect(textColumn).to.contains('category');
+      const uploadSuccessText = await importPage.useFile(page, 1);
+      await expect(uploadSuccessText).contain('suppliers.csv');
     });
 
-    it('should delete categories', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'bulkDelete', baseContext);
+    it('should go to next import file step', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'nextStep2', baseContext);
+
+      await importPage.selectFileType(page, 'Suppliers');
 
-      const deleteTextResult = await categoriesPage.deleteCategoriesBulkActions(page);
-      await expect(deleteTextResult).to.be.equal(categoriesPage.successfulMultiDeleteMessage);
+      const panelTitle = await importPage.goToImportNextStep(page);
+      await expect(panelTitle).contain(importPage.importPanelTitle);
     });
 
-    it('should reset all filters', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDelete', baseContext);
+    it('should start import file', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'confirmImport2', baseContext);
+
+      const modalTitle = await importPage.startFileImport(page);
+      await expect(modalTitle).contain(importPage.importModalTitle);
+    });
 
-      const numberOfCategoriesAfterReset = await categoriesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCategoriesAfterReset).to.equal(numberOfCategories);
+    it('should check that the import is completed', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'waitForImport2', baseContext);
+
+      const isCompleted = await importPage.getImportValidationMessage(page);
+      await expect(isCompleted, 'The import is not completed!')
+        .contain('Data imported')
+        .and.contain('Look at your listings to make sure it\'s all there as you wished.');
+    });
+
+    it('should close import progress modal', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'closeImportModal2', baseContext);
+
+      const isModalClosed = await importPage.closeImportModal(page);
+      await expect(isModalClosed).to.be.true;
     });
   });
 });
diff --git a/tests/UI/pages/BO/advancedParameters/import/index.ts b/tests/UI/pages/BO/advancedParameters/import/index.ts
index 93f6ec12a749b..7d6944fad865d 100644
--- a/tests/UI/pages/BO/advancedParameters/import/index.ts
+++ b/tests/UI/pages/BO/advancedParameters/import/index.ts
@@ -80,10 +80,14 @@ class Import extends BOBasePage {
    * @param type {string} Type of the data to import
    * @return {Promise<string|null>}
    */
-  downloadSampleFile(page: Page, type: string): Promise<string|null> {
+  downloadSampleFile(page: Page, type: string): Promise<string | null> {
     return this.clickAndWaitForDownload(page, this.downloadSampleFileLink(type));
   }
 
+  async selectFileType(page: Page, fileType: string): Promise<void> {
+    await this.selectByVisibleText(page, this.fileTypeSelector, fileType);
+  }
+
   /**
    * Select the type of the file and upload the sample file
    * @param page {Page} Browser tab
@@ -95,6 +99,39 @@ class Import extends BOBasePage {
     await this.selectByVisibleText(page, this.fileTypeSelector, fileType);
     await page.setInputFiles(this.fileInputField, filePath);
 
+    await page.waitForTimeout(2000);
+    return this.getAlertSuccessBlockParagraphContent(page);
+  }
+
+  async clickOnDownloadedFile(page: Page): Promise<void> {
+    await this.waitForSelectorAndClick(page, '#main-div div.alert.alert-success.js-import-file-alert button.js-change-import-file-btn');
+  }
+
+  async isChooseFromHistoryButtonVisible(page: Page): Promise<boolean> {
+    return this.elementVisible(page, '#main-div button.js-from-files-history-btn', 2000);
+  }
+
+  async chooseFromHistoryFTP(page: Page): Promise<boolean> {
+    await this.waitForSelectorAndClick(page, '#main-div button.js-from-files-history-btn');
+
+    return this.elementVisible(page, '#fileHistoryTable');
+  }
+
+  async getImportedFilesList(page: Page): Promise<string> {
+    return this.getTextContent(page, '#fileHistoryTable tbody');
+  }
+
+  async deleteFile(page: Page, row: number = 1): Promise<boolean> {
+    await this.waitForSelectorAndClick(page, `#fileHistoryTable tbody tr:nth-child(${row + 1}) td:nth-child(2) button.dropdown-toggle.dropdown-toggle-split`);
+    await this.waitForSelectorAndClick(page, `#fileHistoryTable tbody tr:nth-child(${row + 1}) td:nth-child(2) a:nth-child(3)`);
+
+    return this.isChooseFromHistoryButtonVisible(page);
+  }
+
+  async useFile(page: Page, row: number = 1): Promise<string> {
+    await this.waitForSelectorAndClick(page, `#fileHistoryTable tbody tr:nth-child(${row + 1}) td:nth-child(2) button.js-use-file-btn`);
+    await page.waitForTimeout(2000);
+
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 

From fab544ff8addd4bac88f45c1f8bad1b3eab7221d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 31 Jul 2023 15:04:10 +0000
Subject: [PATCH 0684/1030] Bump league/oauth2-server from 8.5.1 to 8.5.3

Bumps [league/oauth2-server](https://github.com/thephpleague/oauth2-server) from 8.5.1 to 8.5.3.
- [Release notes](https://github.com/thephpleague/oauth2-server/releases)
- [Changelog](https://github.com/thephpleague/oauth2-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/thephpleague/oauth2-server/compare/8.5.1...8.5.3)

---
updated-dependencies:
- dependency-name: league/oauth2-server
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 composer.lock | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/composer.lock b/composer.lock
index 2f2b1f91f278d..93ca5b80d79ae 100644
--- a/composer.lock
+++ b/composer.lock
@@ -619,16 +619,16 @@
         },
         {
             "name": "defuse/php-encryption",
-            "version": "v2.3.1",
+            "version": "v2.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/defuse/php-encryption.git",
-                "reference": "77880488b9954b7884c25555c2a0ea9e7053f9d2"
+                "reference": "f53396c2d34225064647a05ca76c1da9d99e5828"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/defuse/php-encryption/zipball/77880488b9954b7884c25555c2a0ea9e7053f9d2",
-                "reference": "77880488b9954b7884c25555c2a0ea9e7053f9d2",
+                "url": "https://api.github.com/repos/defuse/php-encryption/zipball/f53396c2d34225064647a05ca76c1da9d99e5828",
+                "reference": "f53396c2d34225064647a05ca76c1da9d99e5828",
                 "shasum": ""
             },
             "require": {
@@ -637,7 +637,8 @@
                 "php": ">=5.6.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4|^5|^6|^7|^8|^9"
+                "phpunit/phpunit": "^5|^6|^7|^8|^9|^10",
+                "yoast/phpunit-polyfills": "^2.0.0"
             },
             "bin": [
                 "bin/generate-defuse-key"
@@ -679,9 +680,9 @@
             ],
             "support": {
                 "issues": "https://github.com/defuse/php-encryption/issues",
-                "source": "https://github.com/defuse/php-encryption/tree/v2.3.1"
+                "source": "https://github.com/defuse/php-encryption/tree/v2.4.0"
             },
-            "time": "2021-04-09T23:57:26+00:00"
+            "time": "2023-06-19T06:10:36+00:00"
         },
         {
             "name": "doctrine/annotations",
@@ -3075,35 +3076,34 @@
         },
         {
             "name": "league/oauth2-server",
-            "version": "8.5.1",
+            "version": "8.5.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/oauth2-server.git",
-                "reference": "43cd4d406906c6be5c8de2cee9bd3ad3753544ef"
+                "reference": "eb91b4190e7f6169053ebf8ffa352d47e756b2ce"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/oauth2-server/zipball/43cd4d406906c6be5c8de2cee9bd3ad3753544ef",
-                "reference": "43cd4d406906c6be5c8de2cee9bd3ad3753544ef",
+                "url": "https://api.github.com/repos/thephpleague/oauth2-server/zipball/eb91b4190e7f6169053ebf8ffa352d47e756b2ce",
+                "reference": "eb91b4190e7f6169053ebf8ffa352d47e756b2ce",
                 "shasum": ""
             },
             "require": {
                 "defuse/php-encryption": "^2.3",
-                "ext-json": "*",
                 "ext-openssl": "*",
                 "lcobucci/clock": "^2.2 || ^3.0",
                 "lcobucci/jwt": "^4.3 || ^5.0",
                 "league/event": "^2.2",
                 "league/uri": "^6.7",
                 "php": "^8.0",
-                "psr/http-message": "^1.0.1"
+                "psr/http-message": "^1.0.1 || ^2.0"
             },
             "replace": {
                 "league/oauth2server": "*",
                 "lncd/oauth2": "*"
             },
             "require-dev": {
-                "laminas/laminas-diactoros": "^2.24.0",
+                "laminas/laminas-diactoros": "^3.0.0",
                 "phpstan/phpstan": "^0.12.57",
                 "phpstan/phpstan-phpunit": "^0.12.16",
                 "phpunit/phpunit": "^9.6.6",
@@ -3152,7 +3152,7 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/oauth2-server/issues",
-                "source": "https://github.com/thephpleague/oauth2-server/tree/8.5.1"
+                "source": "https://github.com/thephpleague/oauth2-server/tree/8.5.3"
             },
             "funding": [
                 {
@@ -3160,7 +3160,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-04-04T10:20:16+00:00"
+            "time": "2023-07-05T23:01:32+00:00"
         },
         {
             "name": "league/uri",

From 1f842e80620c91db8ff69d3d59f3a6254f980663 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Mon, 31 Jul 2023 18:10:48 +0200
Subject: [PATCH 0685/1030] Add some fixes

---
 .../05_import/02_importFile.ts                | 33 ++++----
 .../BO/advancedParameters/import/index.ts     | 84 +++++++++++++++++--
 2 files changed, 92 insertions(+), 25 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/05_import/02_importFile.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/05_import/02_importFile.ts
index 6e96cb0717537..685563e0a34ee 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/05_import/02_importFile.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/05_import/02_importFile.ts
@@ -9,10 +9,6 @@ import loginCommon from '@commonTests/BO/loginBO';
 // Import pages
 import dashboardPage from '@pages/BO/dashboard';
 import importPage from '@pages/BO/advancedParameters/import';
-import categoriesPage from '@pages/BO/catalog/categories';
-
-// Import data
-import ImportCategories from '@data/import/categories';
 
 import {expect} from 'chai';
 import type {BrowserContext, Page} from 'playwright';
@@ -24,6 +20,8 @@ describe('BO - Advanced Parameters - Import : Import file', async () => {
   let page: Page;
   let filePath: string | null;
   let secondFilePath: string | null;
+  const firstFile:string = 'alias.csv';
+  const secondFile:string = 'suppliers.csv';
 
   // before and after functions
   before(async function () {
@@ -33,6 +31,9 @@ describe('BO - Advanced Parameters - Import : Import file', async () => {
 
   after(async () => {
     await helper.closeBrowserContext(browserContext);
+    // Delete downloaded csv files
+    await files.deleteFile(firstFile);
+    await files.deleteFile(secondFile);
   });
 
   it('should login in BO', async function () {
@@ -53,23 +54,23 @@ describe('BO - Advanced Parameters - Import : Import file', async () => {
     await expect(pageTitle).to.contains(importPage.pageTitle);
   });
 
-  describe('Download then import categories simple file', async () => {
-    it('should download \'Sample categories file\' file', async function () {
+  describe('Download then import alias simple file', async () => {
+    it('should download \'Sample alias file\' file', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'downloadFile', baseContext);
 
-      filePath = await importPage.downloadSampleFile(page, 'categories_import');
+      filePath = await importPage.downloadSampleFile(page, 'alias_import');
 
       const doesFileExist = await files.doesFileExist(filePath);
-      await expect(doesFileExist, 'categories_import sample file was not downloaded').to.be.true;
+      await expect(doesFileExist, 'alias_import sample file was not downloaded').to.be.true;
     });
 
     it('should upload the file', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'importFile', baseContext);
 
-      await files.renameFile(filePath, 'categories.csv');
+      await files.renameFile(filePath, 'alias.csv');
 
-      const uploadSuccessText = await importPage.uploadImportFile(page, 'Categories', 'categories.csv');
-      await expect(uploadSuccessText).contain('categories.csv');
+      const uploadSuccessText = await importPage.uploadImportFile(page, 'Alias', firstFile);
+      await expect(uploadSuccessText).contain(firstFile);
     });
 
     it('should go to next import file step', async function () {
@@ -110,7 +111,7 @@ describe('BO - Advanced Parameters - Import : Import file', async () => {
       secondFilePath = await importPage.downloadSampleFile(page, 'suppliers_import');
 
       const doesFileExist = await files.doesFileExist(secondFilePath);
-      await expect(doesFileExist, 'categories_suppliers sample file was not downloaded').to.be.true;
+      await expect(doesFileExist, 'suppliers sample file was not downloaded').to.be.true;
     });
 
     it('should upload the file', async function () {
@@ -118,7 +119,7 @@ describe('BO - Advanced Parameters - Import : Import file', async () => {
 
       await files.renameFile(secondFilePath, 'suppliers.csv');
 
-      const uploadSuccessText = await importPage.uploadImportFile(page, 'Suppliers', 'suppliers.csv');
+      const uploadSuccessText = await importPage.uploadImportFile(page, 'Suppliers', secondFile);
       await expect(uploadSuccessText).contain('suppliers.csv');
     });
 
@@ -142,8 +143,8 @@ describe('BO - Advanced Parameters - Import : Import file', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'checkImportedFilesList', baseContext);
 
       const importedFilesList = await importPage.getImportedFilesList(page);
-      await expect(importedFilesList).to.contains('categories.csv')
-        .and.to.contains('suppliers.csv');
+      await expect(importedFilesList).to.contains(firstFile)
+        .and.to.contains(secondFile);
     });
 
     it('should delete the first imported file', async function () {
@@ -160,7 +161,7 @@ describe('BO - Advanced Parameters - Import : Import file', async () => {
       await importPage.chooseFromHistoryFTP(page);
 
       const uploadSuccessText = await importPage.useFile(page, 1);
-      await expect(uploadSuccessText).contain('suppliers.csv');
+      await expect(uploadSuccessText).contain(secondFile);
     });
 
     it('should go to next import file step', async function () {
diff --git a/tests/UI/pages/BO/advancedParameters/import/index.ts b/tests/UI/pages/BO/advancedParameters/import/index.ts
index 7d6944fad865d..297b6f2d3fd36 100644
--- a/tests/UI/pages/BO/advancedParameters/import/index.ts
+++ b/tests/UI/pages/BO/advancedParameters/import/index.ts
@@ -12,6 +12,24 @@ class Import extends BOBasePage {
 
   public readonly importModalTitle: string;
 
+  public readonly importFileChangFileButton: string;
+
+  public readonly chooseFromHistoryButton: string;
+
+  public readonly fileHistoryTable: string;
+
+  public readonly fileHistoryTableBody: string;
+
+  public readonly fileHistoryTableRow: (row: number) => string;
+
+  public readonly fileHistoryTableRowColumn: (row: number, column: number) => string;
+
+  public readonly fileHistoryTableRowDropDownButton: (row: number) => string;
+
+  public readonly fileHistoryTableRowDeleteButton: (row: number) => string;
+
+  public readonly fileHistoryTableRowUseButton: (row: number) => string;
+
   public readonly importPanelTitle: string;
 
   private readonly downloadSampleFileLink: (type: string) => string;
@@ -55,6 +73,16 @@ class Import extends BOBasePage {
 
     // Selectors
     this.alertSuccessBlockParagraph = `${this.alertSuccessBlock} p.alert-text.js-import-file`;
+    this.importFileChangFileButton = 'div.js-import-file-alert button.js-change-import-file-btn';
+    this.chooseFromHistoryButton = '#main-div button.js-from-files-history-btn';
+    this.fileHistoryTable = '#fileHistoryTable';
+    this.fileHistoryTableBody = `${this.fileHistoryTable} tbody`;
+    this.fileHistoryTableRow = (row: number) => `${this.fileHistoryTableBody} tr:nth-child(${row})`;
+    this.fileHistoryTableRowColumn = (row: number, column: number) => `${this.fileHistoryTableRow(row)} td:nth-child(${column})`;
+    this.fileHistoryTableRowDropDownButton = (row: number) => `${this.fileHistoryTableRowColumn(row, 2)}`
+      + ' button.dropdown-toggle-split';
+    this.fileHistoryTableRowDeleteButton = (row: number) => `${this.fileHistoryTableRowColumn(row, 2)} a:nth-child(3)`;
+    this.fileHistoryTableRowUseButton = (row: number) => `${this.fileHistoryTableRowColumn(row, 2)} button.js-use-file-btn`;
     this.downloadSampleFileLink = (type: string) => `#download-sample-${type}-file-link`;
     this.fileInputField = '#file';
     this.nextStepButton = 'button[name=submitImportFile]';
@@ -84,6 +112,12 @@ class Import extends BOBasePage {
     return this.clickAndWaitForDownload(page, this.downloadSampleFileLink(type));
   }
 
+  /**
+   * Select file type
+   * @param page {Page} Browser tab
+   * @param fileType {string}
+   * @return {Promise<void>}
+   */
   async selectFileType(page: Page, fileType: string): Promise<void> {
     await this.selectByVisibleText(page, this.fileTypeSelector, fileType);
   }
@@ -103,34 +137,66 @@ class Import extends BOBasePage {
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
+  /**
+   * Click on downloaded file
+   * @param page {Page} Browser tab
+   * @return {Promise<void>}
+   */
   async clickOnDownloadedFile(page: Page): Promise<void> {
-    await this.waitForSelectorAndClick(page, '#main-div div.alert.alert-success.js-import-file-alert button.js-change-import-file-btn');
+    await this.waitForSelectorAndClick(page, this.importFileChangFileButton);
   }
 
+  /**
+   * Is choose from history button visible
+   * @param page {Page} Browser tab
+   * @return {Promise<boolean>}
+   */
   async isChooseFromHistoryButtonVisible(page: Page): Promise<boolean> {
-    return this.elementVisible(page, '#main-div button.js-from-files-history-btn', 2000);
+    return this.elementVisible(page, this.chooseFromHistoryButton, 2000);
   }
 
+  /**
+   * Choose from history FTP
+   * @param page {Page} Browser tab
+   * @return {Promise<boolean>}
+   */
   async chooseFromHistoryFTP(page: Page): Promise<boolean> {
-    await this.waitForSelectorAndClick(page, '#main-div button.js-from-files-history-btn');
+    await this.waitForSelectorAndClick(page, this.chooseFromHistoryButton);
 
-    return this.elementVisible(page, '#fileHistoryTable');
+    return this.elementVisible(page, this.fileHistoryTable);
   }
 
+  /**
+   * Get imported files list
+   * @param page {Page} Browser tab
+   * @return {Promise<string>}
+   */
   async getImportedFilesList(page: Page): Promise<string> {
-    return this.getTextContent(page, '#fileHistoryTable tbody');
+    return this.getTextContent(page, this.fileHistoryTableBody);
   }
 
+  /**
+   * Delete file
+   * @param page {Page} Browser tab
+   * @param row {number} Row number in the files table
+   * @return {Promise<boolean>}
+   */
   async deleteFile(page: Page, row: number = 1): Promise<boolean> {
-    await this.waitForSelectorAndClick(page, `#fileHistoryTable tbody tr:nth-child(${row + 1}) td:nth-child(2) button.dropdown-toggle.dropdown-toggle-split`);
-    await this.waitForSelectorAndClick(page, `#fileHistoryTable tbody tr:nth-child(${row + 1}) td:nth-child(2) a:nth-child(3)`);
+    await this.waitForSelectorAndClick(page, this.fileHistoryTableRowDropDownButton(row + 1));
+    await this.waitForSelectorAndClick(page, this.fileHistoryTableRowDeleteButton(row + 1));
 
     return this.isChooseFromHistoryButtonVisible(page);
   }
 
+  /**
+   * Use file
+   * @param page {Page} Browser tab
+   * @param row {number} Row number in the files table
+   * @return {Promise<string>}
+   */
   async useFile(page: Page, row: number = 1): Promise<string> {
-    await this.waitForSelectorAndClick(page, `#fileHistoryTable tbody tr:nth-child(${row + 1}) td:nth-child(2) button.js-use-file-btn`);
-    await page.waitForTimeout(2000);
+    await this.waitForSelectorAndClick(page, this.fileHistoryTableRowUseButton(row + 1));
+    await this.waitForVisibleSelector(page, this.importFileChangFileButton);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }

From c5d51b0fed5defd2f1a088e4ca8a2a66e3da1bc3 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Mon, 31 Jul 2023 18:14:48 +0200
Subject: [PATCH 0686/1030] Add some fixes

---
 tests/UI/pages/BO/advancedParameters/import/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/UI/pages/BO/advancedParameters/import/index.ts b/tests/UI/pages/BO/advancedParameters/import/index.ts
index 297b6f2d3fd36..16d9edc32ce16 100644
--- a/tests/UI/pages/BO/advancedParameters/import/index.ts
+++ b/tests/UI/pages/BO/advancedParameters/import/index.ts
@@ -163,7 +163,7 @@ class Import extends BOBasePage {
   async chooseFromHistoryFTP(page: Page): Promise<boolean> {
     await this.waitForSelectorAndClick(page, this.chooseFromHistoryButton);
 
-    return this.elementVisible(page, this.fileHistoryTable);
+    return this.elementVisible(page, this.fileHistoryTable, 2000);
   }
 
   /**

From dcc1144ade9c1a65eb5cd70e5247e39d2dfe4a0d Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Mon, 31 Jul 2023 18:17:38 +0200
Subject: [PATCH 0687/1030] Fix lint errors

---
 .../BO/14_advancedParameters/05_import/02_importFile.ts     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/05_import/02_importFile.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/05_import/02_importFile.ts
index 685563e0a34ee..730583d4dfe2a 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/05_import/02_importFile.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/05_import/02_importFile.ts
@@ -106,7 +106,7 @@ describe('BO - Advanced Parameters - Import : Import file', async () => {
 
   describe('Check choose from history / FTP then import suppliers simple file', async () => {
     it('should download \'Sample suppliers file\' file', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'downloadFile', baseContext);
+      await testContext.addContextItem(this, 'testIdentifier', 'downloadFile2', baseContext);
 
       secondFilePath = await importPage.downloadSampleFile(page, 'suppliers_import');
 
@@ -115,7 +115,7 @@ describe('BO - Advanced Parameters - Import : Import file', async () => {
     });
 
     it('should upload the file', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'importFile', baseContext);
+      await testContext.addContextItem(this, 'testIdentifier', 'importFile2', baseContext);
 
       await files.renameFile(secondFilePath, 'suppliers.csv');
 
@@ -133,7 +133,7 @@ describe('BO - Advanced Parameters - Import : Import file', async () => {
     });
 
     it('should click on \'Choose from history / FTP\'', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'importFile', baseContext);
+      await testContext.addContextItem(this, 'testIdentifier', 'clickOnChooseFromHistory', baseContext);
 
       const isFilesListTableVisible = await importPage.chooseFromHistoryFTP(page);
       await expect(isFilesListTableVisible).to.be.true;

From 3286f2a2e1609a5b1ecfc7fcb479686a82139532 Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Tue, 1 Aug 2023 08:58:43 +0200
Subject: [PATCH 0688/1030] Add multiple attempts to download a language pack

---
 classes/Language.php | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/classes/Language.php b/classes/Language.php
index 1ec48a05ff780..3b344441c82ea 100644
--- a/classes/Language.php
+++ b/classes/Language.php
@@ -1255,13 +1255,21 @@ public static function downloadXLFLanguagePack($locale, &$errors = [], $type = s
             return false;
         }
 
-        $content = Tools::file_get_contents($url, false, null, static::PACK_DOWNLOAD_TIMEOUT);
+        // 3 attempts to download the language pack
+        for ($i = 1; $i <= 3; $i++) {
+            $content = Tools::file_get_contents($url, false, null, static::PACK_DOWNLOAD_TIMEOUT);
 
-        //Check if response is empty or not a valid zip file
-        if (empty($content) || strpos($content, "\x50\x4b\x03\x04") === false) {
-            $errors[] = Context::getContext()->getTranslator()->trans('Language pack unavailable.', [], 'Admin.International.Notification') . ' ' . $url;
+            // If we managed to download the pack successfully and it's a valid zip file, we stop
+            if (!empty($content) && strpos($content, "\x50\x4b\x03\x04") !== false) {
+                break;
+            }
 
-            return false;
+            // If not, we will give it another try, unless we are on our last attempt
+            if ($i == 3) {
+                $errors[] = Context::getContext()->getTranslator()->trans('Language pack unavailable.', [], 'Admin.International.Notification') . ' ' . $url;
+
+                return false;
+            }
         }
 
         return false !== file_put_contents($file, $content);

From 3fd4cbf2ad855c70898d5a6526800d71872d7357 Mon Sep 17 00:00:00 2001
From: Daniel Hlavacek <daniel.hlavacek@hotmail.cz>
Date: Tue, 1 Aug 2023 12:39:53 +0200
Subject: [PATCH 0689/1030] Update Language.php

---
 classes/Language.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/Language.php b/classes/Language.php
index 3b344441c82ea..9aca918cf11a6 100644
--- a/classes/Language.php
+++ b/classes/Language.php
@@ -1256,7 +1256,7 @@ public static function downloadXLFLanguagePack($locale, &$errors = [], $type = s
         }
 
         // 3 attempts to download the language pack
-        for ($i = 1; $i <= 3; $i++) {
+        for ($i = 1; $i <= 3; ++$i) {
             $content = Tools::file_get_contents($url, false, null, static::PACK_DOWNLOAD_TIMEOUT);
 
             // If we managed to download the pack successfully and it's a valid zip file, we stop

From 3836b09d79b4d8fe4ed41c7433a761160be61f71 Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Mon, 24 Jul 2023 18:09:44 +0200
Subject: [PATCH 0690/1030] Make navbar component independent

---
 .../themes/new-theme/template/layout.tpl      |   5 -
 .../Admin/Component/Layout/nav_bar.html.twig  |  14 +-
 .../views/Admin/Layout/nav_bar.html.twig      |   8 +-
 .../Twig/Component/NavBar.php                 | 134 +++++++++++++++++-
 4 files changed, 137 insertions(+), 24 deletions(-)

diff --git a/admin-dev/themes/new-theme/template/layout.tpl b/admin-dev/themes/new-theme/template/layout.tpl
index 2eb903b72590f..090a3633efdf5 100644
--- a/admin-dev/themes/new-theme/template/layout.tpl
+++ b/admin-dev/themes/new-theme/template/layout.tpl
@@ -139,11 +139,6 @@
     {render_template
       smarty_template="components/layout/nav_bar.tpl"
       twig_template="@PrestaShop/Admin/Layout/nav_bar.html.twig"
-      toggle_navigation_url=$toggle_navigation_url
-      default_tab_link=$default_tab_link
-      ps_version=$ps_version
-      collapse_menu=$collapse_menu
-      tabs=$tabs
     }
 {/if}
 
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/nav_bar.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/nav_bar.html.twig
index 6b63d59fad2a0..3c9f6ac73c351 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/nav_bar.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/nav_bar.html.twig
@@ -23,7 +23,7 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  *#}
 <nav class="nav-bar d-none d-print-none d-md-block">
-  <span class="menu-collapse" data-toggle-url="{{ toggleNavigationUrl }}">
+  <span class="menu-collapse" data-toggle-url="{{ this.toggleNavigationUrl }}">
     <i class="material-icons rtl-flip">chevron_left</i>
     <i class="material-icons rtl-flip">chevron_left</i>
   </span>
@@ -31,16 +31,16 @@
   <div class="nav-bar-overflow">
     <div class="logo-container">
       <div class="d-flex align-items-center">
-        <a id="header_logo" class="logo float-left" href="{{ defaultTabLink|escape('html_attr') }}"></a>
-        <span id="shop_version" class="header-version">{{ psVersion }}</span>
+        <a id="header_logo" class="logo float-left" href="{{ this.defaultTabLink|escape('html_attr') }}"></a>
+        <span id="shop_version" class="header-version">{{ this.psVersion }}</span>
       </div>
       <div class="logo-container__close js-mobile-menu">
         <i class="material-icons close-btn">close</i>
       </div>
     </div>
 
-    <ul class="main-menu{% if collapseMenu %} sidebar-closed{% endif %}">
-      {% for level1 in tabs %}
+    <ul class="main-menu{% if this.collapseMenu %} sidebar-closed{% endif %}">
+      {% for level1 in this.tabs %}
         {% if level1.active %}
 
         {% set level1Href = level1.href %}
@@ -78,9 +78,9 @@
         {% endif %}
         {% set levelOneClass = '' %}
 
-        {% if level2.current and not collapseMenu %}
+        {% if level2.current and not this.collapseMenu %}
           {% set levelOneClass = " link-active open ul-open" %}
-        {% elseif level2.current and collapseMenu %}
+        {% elseif level2.current and this.collapseMenu %}
           {% set levelOneClass =" link-active" %}
         {% endif %}
 
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/nav_bar.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/nav_bar.html.twig
index f2e1b3be1d2f6..e777178190853 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Layout/nav_bar.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/nav_bar.html.twig
@@ -22,10 +22,4 @@
  * @copyright Since 2007 PrestaShop SA and Contributors
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  *#}
-{{ component('NavBar', {
-  toggleNavigationUrl: toggle_navigation_url,
-  defaultTabLink: default_tab_link,
-  psVersion: ps_version,
-  collapseMenu: collapse_menu,
-  tabs: tabs,
-}) }}
+{{ component('NavBar') }}
diff --git a/src/PrestaShopBundle/Twig/Component/NavBar.php b/src/PrestaShopBundle/Twig/Component/NavBar.php
index cd49f7c9a6b6c..1f4f1d197473d 100644
--- a/src/PrestaShopBundle/Twig/Component/NavBar.php
+++ b/src/PrestaShopBundle/Twig/Component/NavBar.php
@@ -28,14 +28,138 @@
 
 namespace PrestaShopBundle\Twig\Component;
 
+use Configuration;
+use Context;
+use Dispatcher;
+use Link;
+use PrestaShop\PrestaShop\Adapter\LegacyContext;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\Routing\Exception\RouteNotFoundException;
 use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
+use Tab;
+use Tools;
 
 #[AsTwigComponent(template: '@PrestaShop/Admin/Component/Layout/nav_bar.html.twig')]
 class NavBar
 {
-    public string $toggleNavigationUrl;
-    public string $defaultTabLink;
-    public string $psVersion;
-    public bool $collapseMenu;
-    public array $tabs;
+    private Link $link;
+
+    public function __construct(
+        private readonly LegacyContext $context,
+        private readonly LoggerInterface $logger,
+    ) {
+        $protocol_link = (Tools::usingSecureMode() && Configuration::get('PS_SSL_ENABLED')) ? 'https://' : 'http://';
+        $protocol_content = (Tools::usingSecureMode() && Configuration::get('PS_SSL_ENABLED')) ? 'https://' : 'http://';
+        $this->link = new Link($protocol_link, $protocol_content);
+    }
+
+    public function getToggleNavigationUrl(): string
+    {
+        return $this->link->getAdminLink('AdminEmployees', true, [], [
+            'action' => 'toggleMenu',
+        ]);
+    }
+
+    public function getDefaultTabLink(): string
+    {
+        return $this->link->getAdminLink(Tab::getClassNameById((int) Context::getContext()->employee->default_tab));
+    }
+
+    public function getPsVersion(): string
+    {
+        return _PS_VERSION_;
+    }
+
+    public function isCollapseMenu(): bool
+    {
+        return $this->context->cookie->collapse_menu ?? false;
+    }
+
+    public function getTabs(): array
+    {
+        return $this->buildTabs();
+    }
+
+    private function buildTabs($parentId = 0, $level = 0): array
+    {
+        $tabs = Tab::getTabs(Context::getContext()->language->id, $parentId);
+        $currentId = Tab::getCurrentParentId();
+        $controllerName = Dispatcher::getInstance()->getController();
+
+        $filteredTabs = array_filter($tabs, function ($tab) {
+            return $this->isValidTab($tab);
+        });
+
+        $processedTabs = array_map(function ($tab) use ($currentId, $level, $controllerName) {
+            return $this->processTab($tab, $currentId, $level, $controllerName);
+        }, $filteredTabs);
+
+        return array_values(array_filter($processedTabs));
+    }
+
+    private function isValidTab(array $tab): bool
+    {
+        return Tab::checkTabRights($tab['id_tab'])
+            && $tab['enabled']
+            && !($tab['class_name'] === 'AdminStock' && Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') == 0)
+            && $tab['class_name'] !== 'AdminCarrierWizard';
+    }
+
+    private function processTab(array $tab, int $currentId, int $level, string $controllerName): array
+    {
+        $isCurrentTab = ($currentId === $tab['id_tab']) || ($tab['class_name'] === $controllerName);
+
+        $tab['current'] = $isCurrentTab;
+        if ($isCurrentTab) {
+            $tab['current_level'] = $level;
+        }
+        $tab['img'] = null;
+
+        try {
+            $tab['href'] = $this->link->getTabLink($tab);
+        } catch (RouteNotFoundException $e) {
+            $this->logger->warning(
+                sprintf('Route not found in one of the Tab %s', $tab['route_name'] ?? ''),
+                [
+                    'message' => $e->getMessage(),
+                    'file' => $e->getFile(),
+                    'line' => $e->getLine(),
+                ]
+            );
+            $tab['href'] = '';
+        }
+
+        $tab['sub_tabs'] = array_values($this->buildTabs($tab['id_tab'], $level + 1));
+
+        $subTabHref = $this->getTabLinkFromSubTabs($tab['sub_tabs']);
+
+        if (!empty($subTabHref)) {
+            $tab['href'] = $subTabHref;
+        } elseif ($tab['id_parent'] === 0 && empty($tab['icon'])) {
+            return [];
+        } elseif (empty($tab['icon'])) {
+            $tab['icon'] = 'extension';
+        }
+
+        foreach ($tab['sub_tabs'] as $subTab) {
+            if ($subTab['current']) {
+                $tab['current'] = true;
+                $tab['current_level'] = $subTab['current_level'];
+                break;
+            }
+        }
+
+        return $tab;
+    }
+
+    private function getTabLinkFromSubTabs(array $subtabs)
+    {
+        foreach ($subtabs as $tab) {
+            if ($tab['active'] && $tab['enabled']) {
+                return $tab['href'];
+            }
+        }
+
+        return '';
+    }
 }

From ad9adb0f81640aa99ad107c8fd7ddd0c200c88fd Mon Sep 17 00:00:00 2001
From: Morgan Pichat <morgan.pichat@prestashop.com>
Date: Wed, 26 Jul 2023 10:26:56 +0200
Subject: [PATCH 0691/1030] Update ignoreErrors

---
 phpstan-tmp-legacy-layout-baseline.neon | 35 +++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/phpstan-tmp-legacy-layout-baseline.neon b/phpstan-tmp-legacy-layout-baseline.neon
index eb129c0a09265..512dbd1d5e744 100644
--- a/phpstan-tmp-legacy-layout-baseline.neon
+++ b/phpstan-tmp-legacy-layout-baseline.neon
@@ -69,3 +69,38 @@ parameters:
 			message: "#^Namespace Link is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
 			count: 1
 			path: src/PrestaShopBundle/Twig/Component/SearchForm.php
+
+		-
+			message: "#^Namespace Configuration is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+			count: 4
+			path: src/PrestaShopBundle/Twig/Component/NavBar.php
+
+		-
+			message: "#^Namespace Context is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+			count: 3
+			path: src/PrestaShopBundle/Twig/Component/NavBar.php
+
+		-
+			message: "#^Namespace Dispatcher is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+			count: 2
+			path: src/PrestaShopBundle/Twig/Component/NavBar.php
+
+		-
+			message: "#^Namespace Link is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+			count: 1
+			path: src/PrestaShopBundle/Twig/Component/NavBar.php
+
+		-
+			message: "#^Namespace Tab is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+			count: 5
+			path: src/PrestaShopBundle/Twig/Component/NavBar.php
+
+		-
+			message: "#^Namespace Tools is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+			count: 3
+			path: src/PrestaShopBundle/Twig/Component/NavBar.php
+
+		-
+			message: "#^Class Link is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+			count: 2
+			path: src/PrestaShopBundle/Twig/Component/NavBar.php

From dc50d2b5f3d4da651ce287e03b1aad556c2edd13 Mon Sep 17 00:00:00 2001
From: Morgan Pichat <morgan.pichat@prestashop.com>
Date: Wed, 26 Jul 2023 17:11:49 +0200
Subject: [PATCH 0692/1030] __construct and isCollapseMenu fix

---
 src/PrestaShopBundle/Twig/Component/NavBar.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/PrestaShopBundle/Twig/Component/NavBar.php b/src/PrestaShopBundle/Twig/Component/NavBar.php
index 1f4f1d197473d..346cdf4c6476e 100644
--- a/src/PrestaShopBundle/Twig/Component/NavBar.php
+++ b/src/PrestaShopBundle/Twig/Component/NavBar.php
@@ -48,9 +48,9 @@ public function __construct(
         private readonly LegacyContext $context,
         private readonly LoggerInterface $logger,
     ) {
-        $protocol_link = (Tools::usingSecureMode() && Configuration::get('PS_SSL_ENABLED')) ? 'https://' : 'http://';
-        $protocol_content = (Tools::usingSecureMode() && Configuration::get('PS_SSL_ENABLED')) ? 'https://' : 'http://';
-        $this->link = new Link($protocol_link, $protocol_content);
+        $isSecureMode = Tools::usingSecureMode() && Configuration::get('PS_SSL_ENABLED');
+        $protocol = $isSecureMode ? 'https://' : 'http://';
+        $this->link = new Link($protocol, $protocol);
     }
 
     public function getToggleNavigationUrl(): string
@@ -72,7 +72,13 @@ public function getPsVersion(): string
 
     public function isCollapseMenu(): bool
     {
-        return $this->context->cookie->collapse_menu ?? false;
+        $cookie = $this->context->getContext()->cookie;
+
+        if (isset($cookie->collapse_menu)) {
+            return boolval($cookie->collapse_menu);
+        }
+
+        return false;
     }
 
     public function getTabs(): array

From b0cab23c3548b0304ed0361667541e18aefb74ca Mon Sep 17 00:00:00 2001
From: Morgan Pichat <morgan.pichat@prestashop.com>
Date: Wed, 26 Jul 2023 18:24:41 +0200
Subject: [PATCH 0693/1030] Update context usage

---
 phpstan-tmp-legacy-layout-baseline.neon        | 17 +----------------
 src/PrestaShopBundle/Twig/Component/NavBar.php | 16 ++++------------
 2 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/phpstan-tmp-legacy-layout-baseline.neon b/phpstan-tmp-legacy-layout-baseline.neon
index 512dbd1d5e744..6a8e2e7b59eaf 100644
--- a/phpstan-tmp-legacy-layout-baseline.neon
+++ b/phpstan-tmp-legacy-layout-baseline.neon
@@ -72,12 +72,7 @@ parameters:
 
 		-
 			message: "#^Namespace Configuration is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
-			count: 4
-			path: src/PrestaShopBundle/Twig/Component/NavBar.php
-
-		-
-			message: "#^Namespace Context is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
-			count: 3
+			count: 2
 			path: src/PrestaShopBundle/Twig/Component/NavBar.php
 
 		-
@@ -94,13 +89,3 @@ parameters:
 			message: "#^Namespace Tab is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
 			count: 5
 			path: src/PrestaShopBundle/Twig/Component/NavBar.php
-
-		-
-			message: "#^Namespace Tools is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
-			count: 3
-			path: src/PrestaShopBundle/Twig/Component/NavBar.php
-
-		-
-			message: "#^Class Link is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
-			count: 2
-			path: src/PrestaShopBundle/Twig/Component/NavBar.php
diff --git a/src/PrestaShopBundle/Twig/Component/NavBar.php b/src/PrestaShopBundle/Twig/Component/NavBar.php
index 346cdf4c6476e..d06c6abd50f0f 100644
--- a/src/PrestaShopBundle/Twig/Component/NavBar.php
+++ b/src/PrestaShopBundle/Twig/Component/NavBar.php
@@ -29,40 +29,32 @@
 namespace PrestaShopBundle\Twig\Component;
 
 use Configuration;
-use Context;
 use Dispatcher;
-use Link;
 use PrestaShop\PrestaShop\Adapter\LegacyContext;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Routing\Exception\RouteNotFoundException;
 use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
 use Tab;
-use Tools;
 
 #[AsTwigComponent(template: '@PrestaShop/Admin/Component/Layout/nav_bar.html.twig')]
 class NavBar
 {
-    private Link $link;
-
     public function __construct(
         private readonly LegacyContext $context,
         private readonly LoggerInterface $logger,
     ) {
-        $isSecureMode = Tools::usingSecureMode() && Configuration::get('PS_SSL_ENABLED');
-        $protocol = $isSecureMode ? 'https://' : 'http://';
-        $this->link = new Link($protocol, $protocol);
     }
 
     public function getToggleNavigationUrl(): string
     {
-        return $this->link->getAdminLink('AdminEmployees', true, [], [
+        return $this->context->getAdminLink('AdminEmployees', true, [
             'action' => 'toggleMenu',
         ]);
     }
 
     public function getDefaultTabLink(): string
     {
-        return $this->link->getAdminLink(Tab::getClassNameById((int) Context::getContext()->employee->default_tab));
+        return $this->context->getAdminLink(Tab::getClassNameById((int) $this->context->getContext()->employee->default_tab));
     }
 
     public function getPsVersion(): string
@@ -88,7 +80,7 @@ public function getTabs(): array
 
     private function buildTabs($parentId = 0, $level = 0): array
     {
-        $tabs = Tab::getTabs(Context::getContext()->language->id, $parentId);
+        $tabs = Tab::getTabs($this->context->getContext()->language->id, $parentId);
         $currentId = Tab::getCurrentParentId();
         $controllerName = Dispatcher::getInstance()->getController();
 
@@ -122,7 +114,7 @@ private function processTab(array $tab, int $currentId, int $level, string $cont
         $tab['img'] = null;
 
         try {
-            $tab['href'] = $this->link->getTabLink($tab);
+            $tab['href'] = $this->context->getContext()->link->getTabLink($tab);
         } catch (RouteNotFoundException $e) {
             $this->logger->warning(
                 sprintf('Route not found in one of the Tab %s', $tab['route_name'] ?? ''),

From aaf5e8de52a0772300a19ec4158edfe03fbbb07c Mon Sep 17 00:00:00 2001
From: Morgan Pichat <morgan.pichat@prestashop.com>
Date: Tue, 1 Aug 2023 11:58:41 +0200
Subject: [PATCH 0694/1030] Add caching for tabs, use path() in template,
 update service

---
 .../config/services/adapter/nav_bar.yml       |  8 +++++++
 .../Admin/Component/Layout/nav_bar.html.twig  |  4 ++--
 .../Twig/Component/NavBar.php                 | 22 +++++++++----------
 3 files changed, 21 insertions(+), 13 deletions(-)
 create mode 100644 src/PrestaShopBundle/Resources/config/services/adapter/nav_bar.yml

diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/nav_bar.yml b/src/PrestaShopBundle/Resources/config/services/adapter/nav_bar.yml
new file mode 100644
index 0000000000000..8fad92038643b
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/nav_bar.yml
@@ -0,0 +1,8 @@
+services:
+  _defaults:
+    public: false
+    autowire: true
+    bind:
+      $psVersion: !php/const _PS_VERSION_
+
+  PrestaShopBundle\Twig\Component\NavBar: ~
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/nav_bar.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/nav_bar.html.twig
index 3c9f6ac73c351..929e463dc3d2c 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/nav_bar.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/nav_bar.html.twig
@@ -23,7 +23,7 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  *#}
 <nav class="nav-bar d-none d-print-none d-md-block">
-  <span class="menu-collapse" data-toggle-url="{{ this.toggleNavigationUrl }}">
+  <span class="menu-collapse" data-toggle-url="{{ path('AdminEmployees', ['action' => 'toggleMenu']) }}">
     <i class="material-icons rtl-flip">chevron_left</i>
     <i class="material-icons rtl-flip">chevron_left</i>
   </span>
@@ -31,7 +31,7 @@
   <div class="nav-bar-overflow">
     <div class="logo-container">
       <div class="d-flex align-items-center">
-        <a id="header_logo" class="logo float-left" href="{{ this.defaultTabLink|escape('html_attr') }}"></a>
+        <a id="header_logo" class="logo float-left" href="{{ path(this.defaultTab)|escape('html_attr') }}"></a>
         <span id="shop_version" class="header-version">{{ this.psVersion }}</span>
       </div>
       <div class="logo-container__close js-mobile-menu">
diff --git a/src/PrestaShopBundle/Twig/Component/NavBar.php b/src/PrestaShopBundle/Twig/Component/NavBar.php
index d06c6abd50f0f..4b5fbe49e6c26 100644
--- a/src/PrestaShopBundle/Twig/Component/NavBar.php
+++ b/src/PrestaShopBundle/Twig/Component/NavBar.php
@@ -39,27 +39,23 @@
 #[AsTwigComponent(template: '@PrestaShop/Admin/Component/Layout/nav_bar.html.twig')]
 class NavBar
 {
+    private ?array $tabs = null;
+
     public function __construct(
         private readonly LegacyContext $context,
         private readonly LoggerInterface $logger,
+        private readonly string $psVersion,
     ) {
     }
 
-    public function getToggleNavigationUrl(): string
-    {
-        return $this->context->getAdminLink('AdminEmployees', true, [
-            'action' => 'toggleMenu',
-        ]);
-    }
-
-    public function getDefaultTabLink(): string
+    public function getDefaultTab(): string
     {
-        return $this->context->getAdminLink(Tab::getClassNameById((int) $this->context->getContext()->employee->default_tab));
+        return Tab::getClassNameById((int) $this->context->getContext()->employee->default_tab);
     }
 
     public function getPsVersion(): string
     {
-        return _PS_VERSION_;
+        return $this->psVersion;
     }
 
     public function isCollapseMenu(): bool
@@ -75,7 +71,11 @@ public function isCollapseMenu(): bool
 
     public function getTabs(): array
     {
-        return $this->buildTabs();
+        if (null === $this->tabs) {
+            $this->tabs = $this->buildTabs();
+        }
+
+        return $this->tabs;
     }
 
     private function buildTabs($parentId = 0, $level = 0): array

From 9c3d3b5afec68e5148fe21e1c70d1a13720aed51 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Tue, 1 Aug 2023 16:44:44 +0200
Subject: [PATCH 0695/1030] Add new test to test general options

---
 .../01_administration/01_general.ts           | 91 +++++++++++++++++++
 tests/UI/pages/BO/BObasePage.ts               |  4 +-
 .../administration/index.ts                   | 73 +++++++++++++++
 3 files changed, 166 insertions(+), 2 deletions(-)
 create mode 100644 tests/UI/campaigns/functional/BO/14_advancedParameters/01_administration/01_general.ts
 create mode 100644 tests/UI/pages/BO/advancedParameters/administration/index.ts

diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/01_administration/01_general.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/01_administration/01_general.ts
new file mode 100644
index 0000000000000..e4688e7a21dfb
--- /dev/null
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/01_administration/01_general.ts
@@ -0,0 +1,91 @@
+// Import utils
+import helper from '@utils/helpers';
+import testContext from '@utils/testContext';
+
+// Import commonTests
+import loginCommon from '@commonTests/BO/loginBO';
+
+// Import pages
+import dashboardPage from '@pages/BO/dashboard';
+import administrationPage from '@pages/BO/advancedParameters/administration';
+
+import {expect} from 'chai';
+import type {BrowserContext, Page} from 'playwright';
+
+const baseContext: string = 'functional_BO_advancedParameters_administration_general';
+
+describe('BO - Advanced Parameters - Administration : Check general options', async () => {
+  let browserContext: BrowserContext;
+  let page: Page;
+
+  // before and after functions
+  before(async function () {
+    browserContext = await helper.createBrowserContext(this.browser);
+    page = await helper.newTab(browserContext);
+  });
+
+  after(async () => {
+    await helper.closeBrowserContext(browserContext);
+  });
+
+  it('should login in BO', async function () {
+    await loginCommon.loginBO(this, page);
+  });
+
+  it('should go to \'Advanced Parameters > Administration\' page', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'goToAdministrationPage', baseContext);
+
+    await dashboardPage.goToSubMenu(
+      page,
+      dashboardPage.advancedParametersLink,
+      dashboardPage.administrationLink,
+    );
+
+    const pageTitle = await administrationPage.getPageTitle(page);
+    await expect(pageTitle).to.contains(administrationPage.pageTitle);
+  });
+
+  it('should disable \'Cookie\'s IP address\'', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'disableCookiesIPAddress', baseContext);
+
+    const successMessage = await administrationPage.setCookiesIPAddress(page, false);
+    await expect(successMessage).to.eq(administrationPage.successfulUpdateMessage);
+  });
+
+  it('should check that the \'Cookie\'s IP address\' is disabled', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'checkThatCookieIpAddressEnabled', baseContext);
+
+    const isEnabled = await administrationPage.isCheckCookiesAddressEnabled(page);
+    await expect(isEnabled).to.be.false;
+  });
+
+  it('should enable \'Cookie\'s IP address\'', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'enableCookiesIPAddress', baseContext);
+
+    const successMessage = await administrationPage.setCookiesIPAddress(page, true);
+    await expect(successMessage).to.eq(administrationPage.successfulUpdateMessage);
+  });
+
+  it('should check that the \'Cookie\'s IP address\' is enabled', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'checkThatCookieIpAddressEnabled', baseContext);
+
+    const isEnabled = await administrationPage.isCheckCookiesAddressEnabled(page);
+    await expect(isEnabled).to.be.true;
+  });
+
+  it('should update \'Lifetime of front office cookies\'', async function(){
+    await testContext.addContextItem(this, 'testIdentifier', 'updateLifetimeOfFOCookies', baseContext);
+
+    const successMessage = await administrationPage.setLifetimeFOCookies(page, 500);
+    await expect(successMessage).to.eq(administrationPage.successfulUpdateMessage);
+  });
+
+  it('should update \' Lifetime of back office cookies\'', async function(){
+    await testContext.addContextItem(this, 'testIdentifier', 'updateLifetimeOfFOCookies', baseContext);
+
+    const successMessage = await administrationPage.setLifetimeBOCookies(page, 500);
+    await expect(successMessage).to.eq(administrationPage.successfulUpdateMessage);
+  });
+
+  it('should update \'Cookie SameSite\'', async )
+});
diff --git a/tests/UI/pages/BO/BObasePage.ts b/tests/UI/pages/BO/BObasePage.ts
index 8f6136d62acef..1decc93936c2a 100644
--- a/tests/UI/pages/BO/BObasePage.ts
+++ b/tests/UI/pages/BO/BObasePage.ts
@@ -185,7 +185,7 @@ export default class BOBasePage extends CommonPage {
 
   public readonly performanceLink: string;
 
-  private readonly administrationLink: string;
+  public readonly administrationLink: string;
 
   public readonly emailLink: string;
 
@@ -225,7 +225,7 @@ export default class BOBasePage extends CommonPage {
 
   protected alertBlockCloseButton: string;
 
-  protected readonly alertSuccessBlock: string;
+  protected alertSuccessBlock: string;
 
   private readonly alertDangerBlock: string;
 
diff --git a/tests/UI/pages/BO/advancedParameters/administration/index.ts b/tests/UI/pages/BO/advancedParameters/administration/index.ts
new file mode 100644
index 0000000000000..95bb85ad48fc6
--- /dev/null
+++ b/tests/UI/pages/BO/advancedParameters/administration/index.ts
@@ -0,0 +1,73 @@
+import BOBasePage from '@pages/BO/BObasePage';
+
+import type {Page} from 'playwright';
+
+/**
+ * Administration page, contains functions that can be used on the page
+ * @class
+ * @extends BOBasePage
+ */
+class AdministrationPage extends BOBasePage {
+  public readonly pageTitle: string;
+
+  private readonly cookiesIpAddressRadioButton: (status: string) => string;
+
+  private readonly generalFormSaveButton: string;
+
+  /**
+   * @constructs
+   * Setting up texts and selectors to use on Performance page
+   */
+  constructor() {
+    super();
+
+    this.pageTitle = `Administration • ${global.INSTALL.SHOP_NAME}`;
+    this.successfulUpdateMessage = 'Update successful';
+
+    // Selectors
+    // General form
+    this.cookiesIpAddressRadioButton = (status: string) => `#general_check_ip_address_${status}`;
+    this.generalFormSaveButton = '#configuration_fieldset_general button';
+    this.alertSuccessBlock = 'div.alert.alert-success[role=alert] div.alert-text';
+  }
+
+  /*
+  Methods
+   */
+  /**
+   * Is check cookies enabled
+   * @param page {Page} Browser tab
+   * @return {Promise<boolean>}
+   */
+  async isCheckCookiesAddressEnabled(page: Page): Promise<boolean> {
+    return this.isChecked(page, `${this.cookiesIpAddressRadioButton('1')}`);
+  }
+
+  /**
+   * Set cookies ip address
+   * @param page {Page} Browser tab
+   * @param toEnable {Promise<string>}
+   */
+  async setCookiesIPAddress(page: Page, toEnable: boolean = true): Promise<string> {
+    await this.setChecked(page, this.cookiesIpAddressRadioButton(toEnable ? '1' : '0'));
+    await this.waitForSelectorAndClick(page, this.generalFormSaveButton);
+
+    return this.getAlertSuccessBlockContent(page);
+  }
+
+  async setLifetimeFOCookies(page: Page, value: number): Promise<string> {
+    await this.setValue(page, '#general_front_cookie_lifetime', value);
+    await this.waitForSelectorAndClick(page, this.generalFormSaveButton);
+
+    return this.getAlertSuccessBlockContent(page);
+  }
+
+  async setLifetimeBOCookies(page: Page, value: number): Promise<string> {
+    await this.setValue(page, '#general_back_cookie_lifetime', value);
+    await this.waitForSelectorAndClick(page, this.generalFormSaveButton);
+
+    return this.getAlertSuccessBlockContent(page);
+  }
+}
+
+export default new AdministrationPage();

From ffac4074c6973e9c0e5ade6dd88b9fd915748508 Mon Sep 17 00:00:00 2001
From: Daniel Hlavacek <daniel.hlavacek@hotmail.cz>
Date: Tue, 1 Aug 2023 17:13:34 +0200
Subject: [PATCH 0696/1030] Update .github/ISSUE_TEMPLATE/1_bug_report.yml

Co-authored-by: Pablo Borowicz <pablo.borowicz@prestashop.com>
---
 .github/ISSUE_TEMPLATE/1_bug_report.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/1_bug_report.yml b/.github/ISSUE_TEMPLATE/1_bug_report.yml
index f97304f19dafb..96c40fa8d2092 100644
--- a/.github/ISSUE_TEMPLATE/1_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/1_bug_report.yml
@@ -5,11 +5,11 @@ body:
   - type: markdown
     attributes:
       value: |
-         #### Basic information ❗
-         - **Provide as much detail as possible** - error logs, screenshots, your exact configuration. If the issue cannot be reproduced, it cannot be fixed.
-         - Follow the [bug report guidelines](https://devdocs.prestashop-project.org/8/contribute/contribute-reporting-issues/#best-practices-for-writing-an-issue) to help issue managers qualify your report faster.
-         - Avoid reporting "error 500" or "white page" errors - this is a universal error message that does not provide enough information to qualify the issue. Enable debug mode in the Performance section of PrestaShop or manually in `/config/defines.inc.php` and try again. You should get a proper error message.
+         ### ❗️ Read this before submitting your bug report:
          - **Write in English.** Reports in all other languages will be closed.
+         - **Provide as much detail as possible** - error logs, screenshots, your exact configuration. If the issue cannot be reproduced, it cannot be fixed.
+         - **Follow the [bug report guidelines](https://devdocs.prestashop-project.org/8/contribute/contribute-reporting-issues/#best-practices-for-writing-an-issue).** This will help issue managers qualify your report faster.
+         - **Avoid reporting "error 500" or "white page" errors** - this is a universal error message that does not provide enough information to qualify the issue. Enable debug mode in the Performance section of PrestaShop or manually in `/config/defines.inc.php` and try again. You should get a proper error message.
          - If reporting a problem with the upgrade process, open `/admin/autoupgrade/tmp` and attach the last part of `log.txt` to the issue. It may contain information about the upgrade errors helpful in resolving the issue. Do not upload the entire `log.txt` as it contains sensitive data.
   - type: checkboxes
     attributes:

From eb1812a4ad0addd0a892e4c915b80d127e8005d0 Mon Sep 17 00:00:00 2001
From: boherm <boris.hermans@prestashop.com>
Date: Tue, 18 Jul 2023 18:26:39 +0200
Subject: [PATCH 0697/1030] Make independent Quick Access twig component

---
 .../themes/new-theme/template/layout.tpl      |   4 -
 phpstan-tmp-legacy-layout-baseline.neon       |   7 +-
 .../Repository/QuickAccessRepository.php      |  66 ++++++
 .../QuickAccessRepositoryInterface.php        |  44 ++++
 .../config/services/adapter/quick_access.yml  |  11 +
 .../config/services/bundle/repository.yml     |   8 +-
 .../config/services/core/security.yml         |   2 +-
 .../Component/Layout/quick_access.html.twig   |  51 ++---
 .../views/Admin/Layout/quick_access.html.twig |   7 +-
 .../Twig/Component/QuickAccess.php            | 194 +++++++++++++++++-
 10 files changed, 341 insertions(+), 53 deletions(-)
 create mode 100644 src/Adapter/QuickAccess/Repository/QuickAccessRepository.php
 create mode 100644 src/Core/QuickAccess/QuickAccessRepositoryInterface.php
 create mode 100644 src/PrestaShopBundle/Resources/config/services/adapter/quick_access.yml

diff --git a/admin-dev/themes/new-theme/template/layout.tpl b/admin-dev/themes/new-theme/template/layout.tpl
index 919b382851ea9..85aa9f77723ba 100644
--- a/admin-dev/themes/new-theme/template/layout.tpl
+++ b/admin-dev/themes/new-theme/template/layout.tpl
@@ -25,10 +25,6 @@
         {render_template
           smarty_template="components/layout/quick_access.tpl"
           twig_template="@PrestaShop/Admin/Layout/quick_access.html.twig"
-          quick_access=$quick_access
-          link=$link
-          quick_access_current_link_icon=$quick_access_current_link_icon
-          quick_access_current_link_name=$quick_access_current_link_name
         }
       </div>
       <div class="component component-search" id="header-search-container">
diff --git a/phpstan-tmp-legacy-layout-baseline.neon b/phpstan-tmp-legacy-layout-baseline.neon
index eb129c0a09265..d43f7f488e942 100644
--- a/phpstan-tmp-legacy-layout-baseline.neon
+++ b/phpstan-tmp-legacy-layout-baseline.neon
@@ -51,12 +51,7 @@ parameters:
 			path: src/PrestaShopBundle/Twig/Component/NotificationsCenter.php
 
 		-
-			message: "#^Class Link is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
-			count: 1
-			path: src/PrestaShopBundle/Twig/Component/QuickAccess.php
-
-		-
-			message: "#^Namespace Link is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+			message: "#^Namespace Tools is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
 			count: 1
 			path: src/PrestaShopBundle/Twig/Component/QuickAccess.php
 
diff --git a/src/Adapter/QuickAccess/Repository/QuickAccessRepository.php b/src/Adapter/QuickAccess/Repository/QuickAccessRepository.php
new file mode 100644
index 0000000000000..aea472ae170c5
--- /dev/null
+++ b/src/Adapter/QuickAccess/Repository/QuickAccessRepository.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Adapter\QuickAccess\Repository;
+
+use Doctrine\DBAL\Connection;
+use PrestaShop\PrestaShop\Core\Domain\Language\ValueObject\LanguageId;
+use PrestaShop\PrestaShop\Core\QuickAccess\QuickAccessRepositoryInterface;
+use PrestaShop\PrestaShop\Core\Repository\AbstractObjectModelRepository;
+
+class QuickAccessRepository extends AbstractObjectModelRepository implements QuickAccessRepositoryInterface
+{
+    public function __construct(
+        private Connection $connection,
+        private string $dbPrefix
+    ) {
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function fetchAll(LanguageId $languageId): array
+    {
+        $qb = $this->connection->createQueryBuilder();
+        $qb
+            ->select('q.id_quick_access, q.new_window, q.link, ql.name')
+            ->from($this->dbPrefix . 'quick_access', 'q')
+            ->innerJoin(
+                'q',
+                $this->dbPrefix . 'quick_access_lang',
+                'ql',
+                'q.id_quick_access = ql.id_quick_access'
+            )
+            ->where('ql.id_lang = :languageId')
+            ->addOrderBy('ql.name', 'ASC')
+            ->setParameter('languageId', $languageId->getValue())
+        ;
+
+        return $qb->execute()->fetchAllAssociative();
+    }
+}
diff --git a/src/Core/QuickAccess/QuickAccessRepositoryInterface.php b/src/Core/QuickAccess/QuickAccessRepositoryInterface.php
new file mode 100644
index 0000000000000..003dde1977084
--- /dev/null
+++ b/src/Core/QuickAccess/QuickAccessRepositoryInterface.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\QuickAccess;
+
+use PrestaShop\PrestaShop\Core\Domain\Language\ValueObject\LanguageId;
+
+/**
+ * Define the contract to access Quick Accesses.
+ */
+interface QuickAccessRepositoryInterface
+{
+    /**
+     * Returns the complete list of quick accesses.
+     *
+     * @param LanguageId $languageId
+     *
+     * @return array
+     */
+    public function fetchAll(LanguageId $languageId): array;
+}
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/quick_access.yml b/src/PrestaShopBundle/Resources/config/services/adapter/quick_access.yml
new file mode 100644
index 0000000000000..55b1fd57e46c9
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/quick_access.yml
@@ -0,0 +1,11 @@
+services:
+  _defaults:
+    public: false
+    autowire: true
+    bind:
+      $dbPrefix: '%database_prefix%'
+
+  PrestaShop\PrestaShop\Core\QuickAccess\QuickAccessRepositoryInterface:
+    alias: PrestaShop\PrestaShop\Adapter\QuickAccess\Repository\QuickAccessRepository
+
+  PrestaShop\PrestaShop\Adapter\QuickAccess\Repository\QuickAccessRepository: ~
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/repository.yml b/src/PrestaShopBundle/Resources/config/services/bundle/repository.yml
index 5c185f0815089..58b6537287268 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/repository.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/repository.yml
@@ -2,12 +2,16 @@ services:
   _defaults:
     public: true
 
-  prestashop.core.admin.tab.repository:
-    class: PrestaShopBundle\Entity\Repository\TabRepository
+  PrestaShopBundle\Entity\Repository\TabRepository:
     factory: [ '@doctrine.orm.default_entity_manager', getRepository ]
+    public: false
     arguments:
       - PrestaShopBundle\Entity\Tab
 
+  prestashop.core.admin.tab.repository:
+    alias: PrestaShopBundle\Entity\Repository\TabRepository
+    deprecated: ~
+
   prestashop.core.admin.shop.repository:
     class: 'PrestaShopBundle\Entity\Repository\ShopRepository'
     factory: [ '@doctrine.orm.default_entity_manager', getRepository ]
diff --git a/src/PrestaShopBundle/Resources/config/services/core/security.yml b/src/PrestaShopBundle/Resources/config/services/core/security.yml
index 5b31004b51959..c80f9d776c59e 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/security.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/security.yml
@@ -3,7 +3,7 @@ services:
     public: true
 
   prestashop.core.crypto.hashing:
-    class: 'PrestaShop\PrestaShop\Core\Crypto\Hashing'
+    class: PrestaShop\PrestaShop\Core\Crypto\Hashing
 
   prestashop.core.security.folder_guard.vendor:
     class: 'PrestaShop\PrestaShop\Core\Security\HtaccessFolderGuard'
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/quick_access.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/quick_access.html.twig
index 140c5d6f0fe09..72aebf59d2f60 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/quick_access.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/quick_access.html.twig
@@ -27,54 +27,47 @@
     {{ 'Quick Access'|trans({}, 'Admin.Navigation.Header') }}
   </button>
   <div class="dropdown-menu">
-    {% for quickAccess in quickAccess %}
-      <a class="
-        dropdown-item quick-row-link
+    {% for quickAccess in this.quickAccesses %}
+      <a class="dropdown-item quick-row-link
         {% if quickAccess.class is defined %}{{ quickAccess.class|escape('html_attr') }}{% endif %}
-        {% if link.matchQuickLink(quickAccess.link) %}
-          {% set matchQuickLink = quickAccess.id_quick_access %}
-          active
-        {% endif %}
-      "
+        {% if quickAccess.active %}active{% endif %}"
       href="{{ quickAccess.link|escape('html_attr') }}"
       {% if quickAccess.new_window %} target="_blank"{% endif %}
       data-item="{{ quickAccess.name }}"
       >{{ quickAccess.name|escape('html_attr') }}</a>
     {% endfor %}
     <div class="dropdown-divider"></div>
-    {% if matchQuickLink is defined %}
+    {% if this.currentQuickAccess %}
       <a id="quick-remove-link"
          class="dropdown-item js-quick-link"
          href="#"
          data-method="remove"
-         data-quicklink-id="{{ matchQuickLink }}"
+         data-quicklink-id="{{ this.currentQuickAccess.id_quick_access }}"
          data-rand="{{ random(1, 200) }}"
-         data-icon="{{ quickAccessCurrentLinkIcon }}"
-         data-url="{{ link.getQuickLink(app.request.uri) }}"
-         data-post-link="{{ link.getAdminLink('AdminQuickAccesses') }}"
+         data-url="{{ this.cleanCurrentUrl|escape('html_attr') }}"
+         data-post-link="{{ path('AdminQuickAccesses') }}"
          data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header')|escape('html_attr') }}"
-         data-link="{{ quickAccessCurrentLinkName|u.truncate(32, '...') }}"
+         data-link="{{ this.currentQuickAccess.name|escape('html_attr') }}"
       >
         <i class="material-icons">remove_circle_outline</i>
         {{ 'Remove from Quick Access'|trans({}, 'Admin.Navigation.Header') }}
       </a>
     {% else %}
-    <a id="quick-add-link"
-       class="dropdown-item js-quick-link"
-       href="#"
-       data-rand="{{ random(1, 200) }}"
-       data-icon="{{ quickAccessCurrentLinkIcon }}"
-       data-method="add"
-       data-url="{{ link.getQuickLink(app.request.uri) }}"
-       data-post-link="{{ link.getAdminLink('AdminQuickAccesses') }}"
-       data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header')|escape('html_attr')}}"
-       data-link="{{ quickAccessCurrentLinkName|u.truncate(32, '...') }}"
-    >
-      <i class="material-icons">add_circle</i>
-      {{ 'Add current page to Quick Access'|trans({}, 'Admin.Actions') }}
-    </a>
+      <a id="quick-add-link"
+         class="dropdown-item js-quick-link"
+         href="#"
+         data-rand="{{ random(1, 200) }}"
+         data-method="add"
+         data-url="{{ this.cleanCurrentUrl|escape('html_attr') }}"
+         data-post-link="{{ path('AdminQuickAccesses') }}"
+         data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header')|escape('html_attr')}}"
+         data-link="{{ this.currentUrlTitle|escape('html_attr') }}"
+      >
+        <i class="material-icons">add_circle</i>
+        {{ 'Add current page to Quick Access'|trans({}, 'Admin.Actions') }}
+      </a>
     {% endif %}
-    <a id="quick-manage-link" class="dropdown-item" href="{{ link.getAdminLink('AdminQuickAccesses') }}">
+    <a id="quick-manage-link" class="dropdown-item" href="{{ path('AdminQuickAccesses') }}">
     <i class="material-icons">settings</i>
     {{ 'Manage your quick accesses'|trans({}, 'Admin.Navigation.Header') }}
     </a>
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/quick_access.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/quick_access.html.twig
index 2545af77b877e..e09cebaace954 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Layout/quick_access.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/quick_access.html.twig
@@ -22,9 +22,4 @@
  * @copyright Since 2007 PrestaShop SA and Contributors
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  *#}
-{{ component('QuickAccess', {
-  quickAccess: quick_access,
-  link: link,
-  quickAccessCurrentLinkIcon: quick_access_current_link_icon,
-  quickAccessCurrentLinkName: quick_access_current_link_name
-}) }}
+{{ component('QuickAccess') }}
diff --git a/src/PrestaShopBundle/Twig/Component/QuickAccess.php b/src/PrestaShopBundle/Twig/Component/QuickAccess.php
index 197724e53cbaa..cfbab77e25d02 100644
--- a/src/PrestaShopBundle/Twig/Component/QuickAccess.php
+++ b/src/PrestaShopBundle/Twig/Component/QuickAccess.php
@@ -28,14 +28,198 @@
 
 namespace PrestaShopBundle\Twig\Component;
 
-use Link;
+use PrestaShop\PrestaShop\Adapter\LegacyContext;
+use PrestaShop\PrestaShop\Core\Domain\Language\ValueObject\LanguageId;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagStateCheckerInterface;
+use PrestaShop\PrestaShop\Core\QuickAccess\QuickAccessRepositoryInterface;
+use PrestaShop\PrestaShop\Core\Util\Url\UrlCleaner;
+use PrestaShopBundle\Entity\Repository\TabRepository;
+use PrestaShopBundle\Service\DataProvider\UserProvider;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
 
 #[AsTwigComponent(template: '@PrestaShop/Admin/Component/Layout/quick_access.html.twig')]
 class QuickAccess
 {
-    public array $quickAccess;
-    public Link $link;
-    public string $quickAccessCurrentLinkIcon;
-    public string $quickAccessCurrentLinkName;
+    /**
+     * link to new product creation form
+     */
+    private const NEW_PRODUCT_LINK = 'index.php/sell/catalog/products/new';
+
+    /**
+     * link to new product creation form for product v2
+     */
+    private const NEW_PRODUCT_V2_LINK = 'index.php/sell/catalog/products-v2/create';
+
+    /**
+     * List of Quick Accesses to display
+     */
+    private array|null $quickAccesses = null;
+
+    /**
+     * Current Quick access by current request uri
+     */
+    private array|false|null $currentQuickAccess = null;
+
+    /**
+     * Clean current Url
+     */
+    private ?string $currentUrl = null;
+
+    /**
+     * Current url title
+     */
+    private ?string $currentUrlTitle = null;
+
+    /**
+     * Tokenized Urls cache
+     */
+    private array $tokenizedUrls = [];
+
+    public function __construct(
+        private readonly LegacyContext $context,
+        private readonly QuickAccessRepositoryInterface $quickAccessRepository,
+        private readonly TabRepository $tabRepository,
+        private readonly CsrfTokenManagerInterface $tokenManager,
+        private readonly UserProvider $userProvider,
+        private readonly RequestStack $requestStack,
+        private readonly FeatureFlagStateCheckerInterface $featureFlagStateChecker,
+        private readonly TranslatorInterface $translator,
+    ) {
+    }
+
+    /**
+     * Get quick accesses to display
+     */
+    public function getQuickAccesses(): array
+    {
+        if (null === $this->quickAccesses) {
+            // Get context
+            $context = $this->context->getContext();
+
+            // Get language and employee ids
+            $languageId = new LanguageId($context->employee->id_lang);
+
+            // Retrieve all quick accesses
+            $quickAccesses = $this->quickAccessRepository->fetchAll($languageId);
+
+            // Prepare quick accesses to render the component view properly.
+            foreach ($quickAccesses as $index => &$quick) {
+                // Initialise our Quick Access
+                $quick['class'] = '';
+                $quick['link'] = $context->link->getQuickLink($quick['link']);
+
+                // If this quick access is legacy
+                preg_match('/controller=(.+)(&.+)?$/', $quick['link'], $admin_tab);
+                if (isset($admin_tab[1])) {
+                    if (strpos($admin_tab[1], '&')) {
+                        $admin_tab[1] = substr($admin_tab[1], 0, strpos($admin_tab[1], '&'));
+                    }
+                }
+                // Let's build our url
+                if ($quick['link'] === self::NEW_PRODUCT_LINK || $quick['link'] === self::NEW_PRODUCT_V2_LINK) {
+                    if (!in_array('ROLE_MOD_TAB_ADMINPRODUCTS_CREATE', $this->userProvider->getUser()->getRoles())) {
+                        // if employee has no access, we don't show product creation link,
+                        // because it causes modal-related issues in product v2
+                        unset($quickAccesses[$index]);
+                        continue;
+                    }
+                    // if new product page feature is enabled we create new product v2 modal popup
+                    if ($this->featureFlagStateChecker->isEnabled(FeatureFlagSettings::FEATURE_FLAG_PRODUCT_PAGE_V2)) {
+                        $quick['link'] = self::NEW_PRODUCT_V2_LINK;
+                        $quick['class'] = 'new-product-button';
+                    }
+                }
+
+                // Preparation of the link to display in component view.
+                $quick['link'] = '/' . basename(_PS_ADMIN_DIR_) . '/' . $quick['link'];
+
+                // Verify if we are currently on this page.
+                $quick['active'] = $this->isCurrentPage($quick['link']);
+
+                // Add token if needed
+                $quick['link'] = $this->getTokenizedUrl($quick['link']);
+            }
+            $this->quickAccesses = $quickAccesses;
+        }
+
+        return $this->quickAccesses;
+    }
+
+    /**
+     * Retrieve and prepare quick accesses data for twig view
+     */
+    public function getCurrentQuickAccess(): array|false
+    {
+        if (null === $this->currentQuickAccess) {
+            $this->currentQuickAccess = current(array_filter($this->getQuickAccesses(), fn ($data) => $data['active']));
+        }
+
+        return $this->currentQuickAccess;
+    }
+
+    /**
+     * Get current clean url.
+     */
+    public function getCleanCurrentUrl(): string
+    {
+        if (null === $this->currentUrl) {
+            $this->currentUrl = rtrim(UrlCleaner::cleanUrl($this->requestStack->getMainRequest()->getRequestUri(), ['_token', 'token']), '/');
+        }
+
+        return $this->currentUrl;
+    }
+
+    /**
+     * Get current title
+     */
+    public function getCurrentUrlTitle(): string
+    {
+        if (null === $this->currentUrlTitle) {
+            $class_name = $this->requestStack->getMainRequest()->attributes->get('_legacy_controller');
+            $tab = $this->tabRepository->findOneByClassName($class_name);
+            $this->currentUrlTitle = $tab ? $this->translator->trans($tab->getWording(), [], $tab->getWordingDomain()) : '';
+        }
+
+        return $this->currentUrlTitle;
+    }
+
+    /**
+     * Get url tokenized
+     */
+    private function getTokenizedUrl(string $baseUrl): string
+    {
+        if (!in_array($baseUrl, $this->tokenizedUrls)) {
+            $url = $baseUrl;
+
+            // Define separator and if the url is legacy or symfony.
+            $separator = strpos($url, '?') ? '&' : '?';
+            preg_match('/controller=(\w*)/', $url, $admin_tab);
+
+            // If legacy link
+            if (isset($admin_tab[1]) && !str_contains('token', $url)) {
+                $token = $admin_tab[1] . $this->tabRepository->findOneIdByClassName($admin_tab[1]) . $this->context->getContext()->employee->id;
+                $url .= $separator . 'token=' . \Tools::getAdminToken($token);
+            }
+
+            // If symfony link
+            if (!isset($admin_tab[1]) && !str_contains('_token', $url)) {
+                $url .= $separator . '_token=' . $this->tokenManager->getToken($this->userProvider->getUsername())->getValue();
+            }
+            $this->tokenizedUrls[$baseUrl] = $url;
+        }
+
+        return $this->tokenizedUrls[$baseUrl];
+    }
+
+    /**
+     * Return true if the current page is the quick access url
+     */
+    private function isCurrentPage(string $url): bool
+    {
+        return 0 === strcasecmp($this->getCleanCurrentUrl(), rtrim($url, '/'));
+    }
 }

From e6190f74e033da5e2fba4fc84bf531fa0803cbd0 Mon Sep 17 00:00:00 2001
From: boubkerbribri <boubker.bribri@prestashop.com>
Date: Wed, 2 Aug 2023 09:56:32 +0200
Subject: [PATCH 0698/1030] Bump @typescript-eslint/eslint-parser from 5.62.0
 to 6.2.1 in /tests/UI

---
 tests/UI/package-lock.json                    | 366 +++++++++---------
 tests/UI/package.json                         |   4 +-
 .../team/employeeBasePage.ts                  |   2 +-
 .../themeAndLogo/themeAndLogoBasePage.ts      |   2 +-
 .../localization/localizationBasePage.ts      |   2 +-
 tests/UI/webservices/baseWs.ts                |  14 +-
 6 files changed, 196 insertions(+), 194 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index 0019661b5bfad..a885d8a6d7ca2 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -31,8 +31,8 @@
         "@types/chai-string": "^1.4.2",
         "@types/mocha": "^10.0.1",
         "@types/mochawesome": "^6.2.1",
-        "@typescript-eslint/eslint-plugin": "^6.2.0",
-        "@typescript-eslint/parser": "^5.62.0",
+        "@typescript-eslint/eslint-plugin": "^6.2.1",
+        "@typescript-eslint/parser": "^6.2.1",
         "babel-eslint": "^10.1.0",
         "eslint": "^8.46.0",
         "eslint-config-airbnb-base": "^15.0.0",
@@ -533,16 +533,16 @@
       "dev": true
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.2.0.tgz",
-      "integrity": "sha512-rClGrMuyS/3j0ETa1Ui7s6GkLhfZGKZL3ZrChLeAiACBE/tRc1wq8SNZESUuluxhLj9FkUefRs2l6bCIArWBiQ==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.2.1.tgz",
+      "integrity": "sha512-iZVM/ALid9kO0+I81pnp1xmYiFyqibAHzrqX4q5YvvVEyJqY+e6rfTXSCsc2jUxGNqJqTfFSSij/NFkZBiBzLw==",
       "dev": true,
       "dependencies": {
         "@eslint-community/regexpp": "^4.5.1",
-        "@typescript-eslint/scope-manager": "6.2.0",
-        "@typescript-eslint/type-utils": "6.2.0",
-        "@typescript-eslint/utils": "6.2.0",
-        "@typescript-eslint/visitor-keys": "6.2.0",
+        "@typescript-eslint/scope-manager": "6.2.1",
+        "@typescript-eslint/type-utils": "6.2.1",
+        "@typescript-eslint/utils": "6.2.1",
+        "@typescript-eslint/visitor-keys": "6.2.1",
         "debug": "^4.3.4",
         "graphemer": "^1.4.0",
         "ignore": "^5.2.4",
@@ -569,13 +569,13 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.2.0.tgz",
-      "integrity": "sha512-1ZMNVgm5nnHURU8ZSJ3snsHzpFeNK84rdZjluEVBGNu7jDymfqceB3kdIZ6A4xCfEFFhRIB6rF8q/JIqJd2R0Q==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.2.1.tgz",
+      "integrity": "sha512-UCqBF9WFqv64xNsIEPfBtenbfodPXsJ3nPAr55mGPkQIkiQvgoWNo+astj9ZUfJfVKiYgAZDMnM6dIpsxUMp3Q==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.2.0",
-        "@typescript-eslint/visitor-keys": "6.2.0"
+        "@typescript-eslint/types": "6.2.1",
+        "@typescript-eslint/visitor-keys": "6.2.1"
       },
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -586,9 +586,9 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.2.0.tgz",
-      "integrity": "sha512-1nRRaDlp/XYJQLvkQJG5F3uBTno5SHPT7XVcJ5n1/k2WfNI28nJsvLakxwZRNY5spuatEKO7d5nZWsQpkqXwBA==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.2.1.tgz",
+      "integrity": "sha512-528bGcoelrpw+sETlyM91k51Arl2ajbNT9L4JwoXE2dvRe1yd8Q64E4OL7vHYw31mlnVsf+BeeLyAZUEQtqahQ==",
       "dev": true,
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -599,13 +599,13 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.2.0.tgz",
-      "integrity": "sha512-Mts6+3HQMSM+LZCglsc2yMIny37IhUgp1Qe8yJUYVyO6rHP7/vN0vajKu3JvHCBIy8TSiKddJ/Zwu80jhnGj1w==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.2.1.tgz",
+      "integrity": "sha512-G+UJeQx9AKBHRQBpmvr8T/3K5bJa485eu+4tQBxFq0KoT22+jJyzo1B50JDT9QdC1DEmWQfdKsa8ybiNWYsi0Q==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.2.0",
-        "@typescript-eslint/visitor-keys": "6.2.0",
+        "@typescript-eslint/types": "6.2.1",
+        "@typescript-eslint/visitor-keys": "6.2.1",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -626,17 +626,17 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.2.0.tgz",
-      "integrity": "sha512-RCFrC1lXiX1qEZN8LmLrxYRhOkElEsPKTVSNout8DMzf8PeWoQG7Rxz2SadpJa3VSh5oYKGwt7j7X/VRg+Y3OQ==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.2.1.tgz",
+      "integrity": "sha512-eBIXQeupYmxVB6S7x+B9SdBeB6qIdXKjgQBge2J+Ouv8h9Cxm5dHf/gfAZA6dkMaag+03HdbVInuXMmqFB/lKQ==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "@types/json-schema": "^7.0.12",
         "@types/semver": "^7.5.0",
-        "@typescript-eslint/scope-manager": "6.2.0",
-        "@typescript-eslint/types": "6.2.0",
-        "@typescript-eslint/typescript-estree": "6.2.0",
+        "@typescript-eslint/scope-manager": "6.2.1",
+        "@typescript-eslint/types": "6.2.1",
+        "@typescript-eslint/typescript-estree": "6.2.1",
         "semver": "^7.5.4"
       },
       "engines": {
@@ -651,12 +651,12 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.2.0.tgz",
-      "integrity": "sha512-QbaYUQVKKo9bgCzpjz45llCfwakyoxHetIy8CAvYCtd16Zu1KrpzNHofwF8kGkpPOxZB2o6kz+0nqH8ZkIzuoQ==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.2.1.tgz",
+      "integrity": "sha512-iTN6w3k2JEZ7cyVdZJTVJx2Lv7t6zFA8DCrJEHD2mwfc16AEvvBWVhbFh34XyG2NORCd0viIgQY1+u7kPI0WpA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.2.0",
+        "@typescript-eslint/types": "6.2.1",
         "eslint-visitor-keys": "^3.4.1"
       },
       "engines": {
@@ -680,25 +680,26 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz",
-      "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.2.1.tgz",
+      "integrity": "sha512-Ld+uL1kYFU8e6btqBFpsHkwQ35rw30IWpdQxgOqOh4NfxSDH6uCkah1ks8R/RgQqI5hHPXMaLy9fbFseIe+dIg==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "5.62.0",
-        "@typescript-eslint/types": "5.62.0",
-        "@typescript-eslint/typescript-estree": "5.62.0",
+        "@typescript-eslint/scope-manager": "6.2.1",
+        "@typescript-eslint/types": "6.2.1",
+        "@typescript-eslint/typescript-estree": "6.2.1",
+        "@typescript-eslint/visitor-keys": "6.2.1",
         "debug": "^4.3.4"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^16.0.0 || >=18.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+        "eslint": "^7.0.0 || ^8.0.0"
       },
       "peerDependenciesMeta": {
         "typescript": {
@@ -707,16 +708,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
-      "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.2.1.tgz",
+      "integrity": "sha512-UCqBF9WFqv64xNsIEPfBtenbfodPXsJ3nPAr55mGPkQIkiQvgoWNo+astj9ZUfJfVKiYgAZDMnM6dIpsxUMp3Q==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.62.0",
-        "@typescript-eslint/visitor-keys": "5.62.0"
+        "@typescript-eslint/types": "6.2.1",
+        "@typescript-eslint/visitor-keys": "6.2.1"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^16.0.0 || >=18.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -724,12 +725,12 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
-      "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.2.1.tgz",
+      "integrity": "sha512-528bGcoelrpw+sETlyM91k51Arl2ajbNT9L4JwoXE2dvRe1yd8Q64E4OL7vHYw31mlnVsf+BeeLyAZUEQtqahQ==",
       "dev": true,
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^16.0.0 || >=18.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -737,21 +738,21 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
-      "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.2.1.tgz",
+      "integrity": "sha512-G+UJeQx9AKBHRQBpmvr8T/3K5bJa485eu+4tQBxFq0KoT22+jJyzo1B50JDT9QdC1DEmWQfdKsa8ybiNWYsi0Q==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.62.0",
-        "@typescript-eslint/visitor-keys": "5.62.0",
+        "@typescript-eslint/types": "6.2.1",
+        "@typescript-eslint/visitor-keys": "6.2.1",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
+        "semver": "^7.5.4",
+        "ts-api-utils": "^1.0.1"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^16.0.0 || >=18.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -764,16 +765,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
-      "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.2.1.tgz",
+      "integrity": "sha512-iTN6w3k2JEZ7cyVdZJTVJx2Lv7t6zFA8DCrJEHD2mwfc16AEvvBWVhbFh34XyG2NORCd0viIgQY1+u7kPI0WpA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.62.0",
-        "eslint-visitor-keys": "^3.3.0"
+        "@typescript-eslint/types": "6.2.1",
+        "eslint-visitor-keys": "^3.4.1"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^16.0.0 || >=18.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -781,9 +782,9 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/eslint-visitor-keys": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
-      "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
+      "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -810,13 +811,13 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.2.0.tgz",
-      "integrity": "sha512-DnGZuNU2JN3AYwddYIqrVkYW0uUQdv0AY+kz2M25euVNlujcN2u+rJgfJsBFlUEzBB6OQkUqSZPyuTLf2bP5mw==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.2.1.tgz",
+      "integrity": "sha512-fTfCgomBMIgu2Dh2Or3gMYgoNAnQm3RLtRp+jP7A8fY+LJ2+9PNpi5p6QB5C4RSP+U3cjI0vDlI3mspAkpPVbQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "6.2.0",
-        "@typescript-eslint/utils": "6.2.0",
+        "@typescript-eslint/typescript-estree": "6.2.1",
+        "@typescript-eslint/utils": "6.2.1",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.0.1"
       },
@@ -837,13 +838,13 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/scope-manager": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.2.0.tgz",
-      "integrity": "sha512-1ZMNVgm5nnHURU8ZSJ3snsHzpFeNK84rdZjluEVBGNu7jDymfqceB3kdIZ6A4xCfEFFhRIB6rF8q/JIqJd2R0Q==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.2.1.tgz",
+      "integrity": "sha512-UCqBF9WFqv64xNsIEPfBtenbfodPXsJ3nPAr55mGPkQIkiQvgoWNo+astj9ZUfJfVKiYgAZDMnM6dIpsxUMp3Q==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.2.0",
-        "@typescript-eslint/visitor-keys": "6.2.0"
+        "@typescript-eslint/types": "6.2.1",
+        "@typescript-eslint/visitor-keys": "6.2.1"
       },
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -854,9 +855,9 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.2.0.tgz",
-      "integrity": "sha512-1nRRaDlp/XYJQLvkQJG5F3uBTno5SHPT7XVcJ5n1/k2WfNI28nJsvLakxwZRNY5spuatEKO7d5nZWsQpkqXwBA==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.2.1.tgz",
+      "integrity": "sha512-528bGcoelrpw+sETlyM91k51Arl2ajbNT9L4JwoXE2dvRe1yd8Q64E4OL7vHYw31mlnVsf+BeeLyAZUEQtqahQ==",
       "dev": true,
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -867,13 +868,13 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.2.0.tgz",
-      "integrity": "sha512-Mts6+3HQMSM+LZCglsc2yMIny37IhUgp1Qe8yJUYVyO6rHP7/vN0vajKu3JvHCBIy8TSiKddJ/Zwu80jhnGj1w==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.2.1.tgz",
+      "integrity": "sha512-G+UJeQx9AKBHRQBpmvr8T/3K5bJa485eu+4tQBxFq0KoT22+jJyzo1B50JDT9QdC1DEmWQfdKsa8ybiNWYsi0Q==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.2.0",
-        "@typescript-eslint/visitor-keys": "6.2.0",
+        "@typescript-eslint/types": "6.2.1",
+        "@typescript-eslint/visitor-keys": "6.2.1",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -894,17 +895,17 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.2.0.tgz",
-      "integrity": "sha512-RCFrC1lXiX1qEZN8LmLrxYRhOkElEsPKTVSNout8DMzf8PeWoQG7Rxz2SadpJa3VSh5oYKGwt7j7X/VRg+Y3OQ==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.2.1.tgz",
+      "integrity": "sha512-eBIXQeupYmxVB6S7x+B9SdBeB6qIdXKjgQBge2J+Ouv8h9Cxm5dHf/gfAZA6dkMaag+03HdbVInuXMmqFB/lKQ==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "@types/json-schema": "^7.0.12",
         "@types/semver": "^7.5.0",
-        "@typescript-eslint/scope-manager": "6.2.0",
-        "@typescript-eslint/types": "6.2.0",
-        "@typescript-eslint/typescript-estree": "6.2.0",
+        "@typescript-eslint/scope-manager": "6.2.1",
+        "@typescript-eslint/types": "6.2.1",
+        "@typescript-eslint/typescript-estree": "6.2.1",
         "semver": "^7.5.4"
       },
       "engines": {
@@ -919,12 +920,12 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.2.0.tgz",
-      "integrity": "sha512-QbaYUQVKKo9bgCzpjz45llCfwakyoxHetIy8CAvYCtd16Zu1KrpzNHofwF8kGkpPOxZB2o6kz+0nqH8ZkIzuoQ==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.2.1.tgz",
+      "integrity": "sha512-iTN6w3k2JEZ7cyVdZJTVJx2Lv7t6zFA8DCrJEHD2mwfc16AEvvBWVhbFh34XyG2NORCd0viIgQY1+u7kPI0WpA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.2.0",
+        "@typescript-eslint/types": "6.2.1",
         "eslint-visitor-keys": "^3.4.1"
       },
       "engines": {
@@ -8361,16 +8362,16 @@
       "dev": true
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.2.0.tgz",
-      "integrity": "sha512-rClGrMuyS/3j0ETa1Ui7s6GkLhfZGKZL3ZrChLeAiACBE/tRc1wq8SNZESUuluxhLj9FkUefRs2l6bCIArWBiQ==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.2.1.tgz",
+      "integrity": "sha512-iZVM/ALid9kO0+I81pnp1xmYiFyqibAHzrqX4q5YvvVEyJqY+e6rfTXSCsc2jUxGNqJqTfFSSij/NFkZBiBzLw==",
       "dev": true,
       "requires": {
         "@eslint-community/regexpp": "^4.5.1",
-        "@typescript-eslint/scope-manager": "6.2.0",
-        "@typescript-eslint/type-utils": "6.2.0",
-        "@typescript-eslint/utils": "6.2.0",
-        "@typescript-eslint/visitor-keys": "6.2.0",
+        "@typescript-eslint/scope-manager": "6.2.1",
+        "@typescript-eslint/type-utils": "6.2.1",
+        "@typescript-eslint/utils": "6.2.1",
+        "@typescript-eslint/visitor-keys": "6.2.1",
         "debug": "^4.3.4",
         "graphemer": "^1.4.0",
         "ignore": "^5.2.4",
@@ -8381,29 +8382,29 @@
       },
       "dependencies": {
         "@typescript-eslint/scope-manager": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.2.0.tgz",
-          "integrity": "sha512-1ZMNVgm5nnHURU8ZSJ3snsHzpFeNK84rdZjluEVBGNu7jDymfqceB3kdIZ6A4xCfEFFhRIB6rF8q/JIqJd2R0Q==",
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.2.1.tgz",
+          "integrity": "sha512-UCqBF9WFqv64xNsIEPfBtenbfodPXsJ3nPAr55mGPkQIkiQvgoWNo+astj9ZUfJfVKiYgAZDMnM6dIpsxUMp3Q==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.2.0",
-            "@typescript-eslint/visitor-keys": "6.2.0"
+            "@typescript-eslint/types": "6.2.1",
+            "@typescript-eslint/visitor-keys": "6.2.1"
           }
         },
         "@typescript-eslint/types": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.2.0.tgz",
-          "integrity": "sha512-1nRRaDlp/XYJQLvkQJG5F3uBTno5SHPT7XVcJ5n1/k2WfNI28nJsvLakxwZRNY5spuatEKO7d5nZWsQpkqXwBA==",
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.2.1.tgz",
+          "integrity": "sha512-528bGcoelrpw+sETlyM91k51Arl2ajbNT9L4JwoXE2dvRe1yd8Q64E4OL7vHYw31mlnVsf+BeeLyAZUEQtqahQ==",
           "dev": true
         },
         "@typescript-eslint/typescript-estree": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.2.0.tgz",
-          "integrity": "sha512-Mts6+3HQMSM+LZCglsc2yMIny37IhUgp1Qe8yJUYVyO6rHP7/vN0vajKu3JvHCBIy8TSiKddJ/Zwu80jhnGj1w==",
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.2.1.tgz",
+          "integrity": "sha512-G+UJeQx9AKBHRQBpmvr8T/3K5bJa485eu+4tQBxFq0KoT22+jJyzo1B50JDT9QdC1DEmWQfdKsa8ybiNWYsi0Q==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.2.0",
-            "@typescript-eslint/visitor-keys": "6.2.0",
+            "@typescript-eslint/types": "6.2.1",
+            "@typescript-eslint/visitor-keys": "6.2.1",
             "debug": "^4.3.4",
             "globby": "^11.1.0",
             "is-glob": "^4.0.3",
@@ -8412,27 +8413,27 @@
           }
         },
         "@typescript-eslint/utils": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.2.0.tgz",
-          "integrity": "sha512-RCFrC1lXiX1qEZN8LmLrxYRhOkElEsPKTVSNout8DMzf8PeWoQG7Rxz2SadpJa3VSh5oYKGwt7j7X/VRg+Y3OQ==",
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.2.1.tgz",
+          "integrity": "sha512-eBIXQeupYmxVB6S7x+B9SdBeB6qIdXKjgQBge2J+Ouv8h9Cxm5dHf/gfAZA6dkMaag+03HdbVInuXMmqFB/lKQ==",
           "dev": true,
           "requires": {
             "@eslint-community/eslint-utils": "^4.4.0",
             "@types/json-schema": "^7.0.12",
             "@types/semver": "^7.5.0",
-            "@typescript-eslint/scope-manager": "6.2.0",
-            "@typescript-eslint/types": "6.2.0",
-            "@typescript-eslint/typescript-estree": "6.2.0",
+            "@typescript-eslint/scope-manager": "6.2.1",
+            "@typescript-eslint/types": "6.2.1",
+            "@typescript-eslint/typescript-estree": "6.2.1",
             "semver": "^7.5.4"
           }
         },
         "@typescript-eslint/visitor-keys": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.2.0.tgz",
-          "integrity": "sha512-QbaYUQVKKo9bgCzpjz45llCfwakyoxHetIy8CAvYCtd16Zu1KrpzNHofwF8kGkpPOxZB2o6kz+0nqH8ZkIzuoQ==",
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.2.1.tgz",
+          "integrity": "sha512-iTN6w3k2JEZ7cyVdZJTVJx2Lv7t6zFA8DCrJEHD2mwfc16AEvvBWVhbFh34XyG2NORCd0viIgQY1+u7kPI0WpA==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.2.0",
+            "@typescript-eslint/types": "6.2.1",
             "eslint-visitor-keys": "^3.4.1"
           }
         },
@@ -8445,62 +8446,63 @@
       }
     },
     "@typescript-eslint/parser": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz",
-      "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.2.1.tgz",
+      "integrity": "sha512-Ld+uL1kYFU8e6btqBFpsHkwQ35rw30IWpdQxgOqOh4NfxSDH6uCkah1ks8R/RgQqI5hHPXMaLy9fbFseIe+dIg==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "5.62.0",
-        "@typescript-eslint/types": "5.62.0",
-        "@typescript-eslint/typescript-estree": "5.62.0",
+        "@typescript-eslint/scope-manager": "6.2.1",
+        "@typescript-eslint/types": "6.2.1",
+        "@typescript-eslint/typescript-estree": "6.2.1",
+        "@typescript-eslint/visitor-keys": "6.2.1",
         "debug": "^4.3.4"
       },
       "dependencies": {
         "@typescript-eslint/scope-manager": {
-          "version": "5.62.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
-          "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.2.1.tgz",
+          "integrity": "sha512-UCqBF9WFqv64xNsIEPfBtenbfodPXsJ3nPAr55mGPkQIkiQvgoWNo+astj9ZUfJfVKiYgAZDMnM6dIpsxUMp3Q==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "5.62.0",
-            "@typescript-eslint/visitor-keys": "5.62.0"
+            "@typescript-eslint/types": "6.2.1",
+            "@typescript-eslint/visitor-keys": "6.2.1"
           }
         },
         "@typescript-eslint/types": {
-          "version": "5.62.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
-          "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.2.1.tgz",
+          "integrity": "sha512-528bGcoelrpw+sETlyM91k51Arl2ajbNT9L4JwoXE2dvRe1yd8Q64E4OL7vHYw31mlnVsf+BeeLyAZUEQtqahQ==",
           "dev": true
         },
         "@typescript-eslint/typescript-estree": {
-          "version": "5.62.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
-          "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.2.1.tgz",
+          "integrity": "sha512-G+UJeQx9AKBHRQBpmvr8T/3K5bJa485eu+4tQBxFq0KoT22+jJyzo1B50JDT9QdC1DEmWQfdKsa8ybiNWYsi0Q==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "5.62.0",
-            "@typescript-eslint/visitor-keys": "5.62.0",
+            "@typescript-eslint/types": "6.2.1",
+            "@typescript-eslint/visitor-keys": "6.2.1",
             "debug": "^4.3.4",
             "globby": "^11.1.0",
             "is-glob": "^4.0.3",
-            "semver": "^7.3.7",
-            "tsutils": "^3.21.0"
+            "semver": "^7.5.4",
+            "ts-api-utils": "^1.0.1"
           }
         },
         "@typescript-eslint/visitor-keys": {
-          "version": "5.62.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
-          "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.2.1.tgz",
+          "integrity": "sha512-iTN6w3k2JEZ7cyVdZJTVJx2Lv7t6zFA8DCrJEHD2mwfc16AEvvBWVhbFh34XyG2NORCd0viIgQY1+u7kPI0WpA==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "5.62.0",
-            "eslint-visitor-keys": "^3.3.0"
+            "@typescript-eslint/types": "6.2.1",
+            "eslint-visitor-keys": "^3.4.1"
           }
         },
         "eslint-visitor-keys": {
-          "version": "3.4.1",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
-          "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
+          "version": "3.4.2",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
+          "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==",
           "dev": true
         }
       }
@@ -8516,41 +8518,41 @@
       }
     },
     "@typescript-eslint/type-utils": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.2.0.tgz",
-      "integrity": "sha512-DnGZuNU2JN3AYwddYIqrVkYW0uUQdv0AY+kz2M25euVNlujcN2u+rJgfJsBFlUEzBB6OQkUqSZPyuTLf2bP5mw==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.2.1.tgz",
+      "integrity": "sha512-fTfCgomBMIgu2Dh2Or3gMYgoNAnQm3RLtRp+jP7A8fY+LJ2+9PNpi5p6QB5C4RSP+U3cjI0vDlI3mspAkpPVbQ==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/typescript-estree": "6.2.0",
-        "@typescript-eslint/utils": "6.2.0",
+        "@typescript-eslint/typescript-estree": "6.2.1",
+        "@typescript-eslint/utils": "6.2.1",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.0.1"
       },
       "dependencies": {
         "@typescript-eslint/scope-manager": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.2.0.tgz",
-          "integrity": "sha512-1ZMNVgm5nnHURU8ZSJ3snsHzpFeNK84rdZjluEVBGNu7jDymfqceB3kdIZ6A4xCfEFFhRIB6rF8q/JIqJd2R0Q==",
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.2.1.tgz",
+          "integrity": "sha512-UCqBF9WFqv64xNsIEPfBtenbfodPXsJ3nPAr55mGPkQIkiQvgoWNo+astj9ZUfJfVKiYgAZDMnM6dIpsxUMp3Q==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.2.0",
-            "@typescript-eslint/visitor-keys": "6.2.0"
+            "@typescript-eslint/types": "6.2.1",
+            "@typescript-eslint/visitor-keys": "6.2.1"
           }
         },
         "@typescript-eslint/types": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.2.0.tgz",
-          "integrity": "sha512-1nRRaDlp/XYJQLvkQJG5F3uBTno5SHPT7XVcJ5n1/k2WfNI28nJsvLakxwZRNY5spuatEKO7d5nZWsQpkqXwBA==",
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.2.1.tgz",
+          "integrity": "sha512-528bGcoelrpw+sETlyM91k51Arl2ajbNT9L4JwoXE2dvRe1yd8Q64E4OL7vHYw31mlnVsf+BeeLyAZUEQtqahQ==",
           "dev": true
         },
         "@typescript-eslint/typescript-estree": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.2.0.tgz",
-          "integrity": "sha512-Mts6+3HQMSM+LZCglsc2yMIny37IhUgp1Qe8yJUYVyO6rHP7/vN0vajKu3JvHCBIy8TSiKddJ/Zwu80jhnGj1w==",
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.2.1.tgz",
+          "integrity": "sha512-G+UJeQx9AKBHRQBpmvr8T/3K5bJa485eu+4tQBxFq0KoT22+jJyzo1B50JDT9QdC1DEmWQfdKsa8ybiNWYsi0Q==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.2.0",
-            "@typescript-eslint/visitor-keys": "6.2.0",
+            "@typescript-eslint/types": "6.2.1",
+            "@typescript-eslint/visitor-keys": "6.2.1",
             "debug": "^4.3.4",
             "globby": "^11.1.0",
             "is-glob": "^4.0.3",
@@ -8559,27 +8561,27 @@
           }
         },
         "@typescript-eslint/utils": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.2.0.tgz",
-          "integrity": "sha512-RCFrC1lXiX1qEZN8LmLrxYRhOkElEsPKTVSNout8DMzf8PeWoQG7Rxz2SadpJa3VSh5oYKGwt7j7X/VRg+Y3OQ==",
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.2.1.tgz",
+          "integrity": "sha512-eBIXQeupYmxVB6S7x+B9SdBeB6qIdXKjgQBge2J+Ouv8h9Cxm5dHf/gfAZA6dkMaag+03HdbVInuXMmqFB/lKQ==",
           "dev": true,
           "requires": {
             "@eslint-community/eslint-utils": "^4.4.0",
             "@types/json-schema": "^7.0.12",
             "@types/semver": "^7.5.0",
-            "@typescript-eslint/scope-manager": "6.2.0",
-            "@typescript-eslint/types": "6.2.0",
-            "@typescript-eslint/typescript-estree": "6.2.0",
+            "@typescript-eslint/scope-manager": "6.2.1",
+            "@typescript-eslint/types": "6.2.1",
+            "@typescript-eslint/typescript-estree": "6.2.1",
             "semver": "^7.5.4"
           }
         },
         "@typescript-eslint/visitor-keys": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.2.0.tgz",
-          "integrity": "sha512-QbaYUQVKKo9bgCzpjz45llCfwakyoxHetIy8CAvYCtd16Zu1KrpzNHofwF8kGkpPOxZB2o6kz+0nqH8ZkIzuoQ==",
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.2.1.tgz",
+          "integrity": "sha512-iTN6w3k2JEZ7cyVdZJTVJx2Lv7t6zFA8DCrJEHD2mwfc16AEvvBWVhbFh34XyG2NORCd0viIgQY1+u7kPI0WpA==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.2.0",
+            "@typescript-eslint/types": "6.2.1",
             "eslint-visitor-keys": "^3.4.1"
           }
         },
diff --git a/tests/UI/package.json b/tests/UI/package.json
index a4a893c41abc1..60a13ace7ad85 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -124,8 +124,8 @@
     "@types/chai-string": "^1.4.2",
     "@types/mocha": "^10.0.1",
     "@types/mochawesome": "^6.2.1",
-    "@typescript-eslint/eslint-plugin": "^6.2.0",
-    "@typescript-eslint/parser": "^5.62.0",
+    "@typescript-eslint/eslint-plugin": "^6.2.1",
+    "@typescript-eslint/parser": "^6.2.1",
     "babel-eslint": "^10.1.0",
     "eslint": "^8.46.0",
     "eslint-config-airbnb-base": "^15.0.0",
diff --git a/tests/UI/pages/BO/advancedParameters/team/employeeBasePage.ts b/tests/UI/pages/BO/advancedParameters/team/employeeBasePage.ts
index dc5e079b28793..63becf021d3a5 100644
--- a/tests/UI/pages/BO/advancedParameters/team/employeeBasePage.ts
+++ b/tests/UI/pages/BO/advancedParameters/team/employeeBasePage.ts
@@ -80,4 +80,4 @@ export default class EmployeeBasePage extends BOBasePage {
   async cancel(page: Page): Promise<void> {
     await this.clickAndWaitForURL(page, this.cancelButton);
   }
-};
+}
diff --git a/tests/UI/pages/BO/design/themeAndLogo/themeAndLogo/themeAndLogoBasePage.ts b/tests/UI/pages/BO/design/themeAndLogo/themeAndLogo/themeAndLogoBasePage.ts
index d1cfc0b33eb10..1828111a9beaa 100644
--- a/tests/UI/pages/BO/design/themeAndLogo/themeAndLogo/themeAndLogoBasePage.ts
+++ b/tests/UI/pages/BO/design/themeAndLogo/themeAndLogo/themeAndLogoBasePage.ts
@@ -135,4 +135,4 @@ export default class themeAndLogoBasePage extends BOBasePage {
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
-};
+}
diff --git a/tests/UI/pages/BO/international/localization/localizationBasePage.ts b/tests/UI/pages/BO/international/localization/localizationBasePage.ts
index 1aa1baefb7dfc..f88e3aa70646e 100644
--- a/tests/UI/pages/BO/international/localization/localizationBasePage.ts
+++ b/tests/UI/pages/BO/international/localization/localizationBasePage.ts
@@ -53,4 +53,4 @@ export default class LocalizationBasePage extends BOBasePage {
   async goToSubTabCurrencies(page: Page): Promise<void> {
     await this.clickAndWaitForURL(page, this.currenciesNavItemLink);
   }
-};
+}
diff --git a/tests/UI/webservices/baseWs.ts b/tests/UI/webservices/baseWs.ts
index 2c4317c95776d..2b57263891014 100644
--- a/tests/UI/webservices/baseWs.ts
+++ b/tests/UI/webservices/baseWs.ts
@@ -21,7 +21,7 @@ export default class BaseWS {
         display: 'full',
       },
     });
-  };
+  }
 
   /**
    * Returns a blank XML tree of the chosen resource, with the format that is expected for each value and specific indicators
@@ -43,7 +43,7 @@ export default class BaseWS {
         display: 'full',
       },
     });
-  };
+  }
 
   /**
    * Get all element
@@ -61,7 +61,7 @@ export default class BaseWS {
         Authorization: authorization,
       },
     });
-  };
+  }
 
   /**
    * Get element by id
@@ -81,7 +81,7 @@ export default class BaseWS {
         Authorization: authorization,
       },
     });
-  };
+  }
 
   /**
    * Add new element
@@ -102,7 +102,7 @@ export default class BaseWS {
       },
       data,
     });
-  };
+  }
 
   /**
    * Update an element
@@ -125,7 +125,7 @@ export default class BaseWS {
       },
       data,
     });
-  };
+  }
 
   /**
    * Delete an element
@@ -145,5 +145,5 @@ export default class BaseWS {
         Authorization: authorization,
       },
     });
-  };
+  }
 }

From 69b27da56dde914d8ab391be21cc251f2a41d35e Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Wed, 2 Aug 2023 10:32:55 +0200
Subject: [PATCH 0699/1030] Complete the scenario

---
 .../01_general.ts                             | 47 ++++++++++++---
 .../administration/index.ts                   | 57 +++++++++++++++----
 2 files changed, 87 insertions(+), 17 deletions(-)
 rename tests/UI/campaigns/functional/BO/14_advancedParameters/{01_administration => 03_administration}/01_general.ts (63%)

diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/01_administration/01_general.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/03_administration/01_general.ts
similarity index 63%
rename from tests/UI/campaigns/functional/BO/14_advancedParameters/01_administration/01_general.ts
rename to tests/UI/campaigns/functional/BO/14_advancedParameters/03_administration/01_general.ts
index e4688e7a21dfb..39f4a9dcb332c 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/01_administration/01_general.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/03_administration/01_general.ts
@@ -48,7 +48,9 @@ describe('BO - Advanced Parameters - Administration : Check general options', as
   it('should disable \'Cookie\'s IP address\'', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'disableCookiesIPAddress', baseContext);
 
-    const successMessage = await administrationPage.setCookiesIPAddress(page, false);
+    await administrationPage.setCookiesIPAddress(page, false);
+
+    const successMessage = await administrationPage.saveGeneralForm(page);
     await expect(successMessage).to.eq(administrationPage.successfulUpdateMessage);
   });
 
@@ -62,7 +64,9 @@ describe('BO - Advanced Parameters - Administration : Check general options', as
   it('should enable \'Cookie\'s IP address\'', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'enableCookiesIPAddress', baseContext);
 
-    const successMessage = await administrationPage.setCookiesIPAddress(page, true);
+    await administrationPage.setCookiesIPAddress(page, true);
+
+    const successMessage = await administrationPage.saveGeneralForm(page);
     await expect(successMessage).to.eq(administrationPage.successfulUpdateMessage);
   });
 
@@ -73,19 +77,48 @@ describe('BO - Advanced Parameters - Administration : Check general options', as
     await expect(isEnabled).to.be.true;
   });
 
-  it('should update \'Lifetime of front office cookies\'', async function(){
+  it('should update \'Lifetime of front office cookies\'', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'updateLifetimeOfFOCookies', baseContext);
 
-    const successMessage = await administrationPage.setLifetimeFOCookies(page, 500);
+    await administrationPage.setLifetimeFOCookies(page, 500);
+
+    const successMessage = await administrationPage.saveGeneralForm(page);
     await expect(successMessage).to.eq(administrationPage.successfulUpdateMessage);
   });
 
-  it('should update \' Lifetime of back office cookies\'', async function(){
+  it('should update \' Lifetime of back office cookies\'', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'updateLifetimeOfFOCookies', baseContext);
 
-    const successMessage = await administrationPage.setLifetimeBOCookies(page, 500);
+    await administrationPage.setLifetimeBOCookies(page, 500);
+
+    const successMessage = await administrationPage.saveGeneralForm(page);
+    await expect(successMessage).to.eq(administrationPage.successfulUpdateMessage);
+  });
+
+  it('should update \'Cookie SameSite\' to \'Strict\' value', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'updateCookieSameSite1', baseContext);
+
+    await administrationPage.setCookieSameSite(page, 'Strict');
+
+    const successMessage = await administrationPage.saveGeneralForm(page);
     await expect(successMessage).to.eq(administrationPage.successfulUpdateMessage);
   });
 
-  it('should update \'Cookie SameSite\'', async )
+  it('should update \'Cookie SameSite\' to \'None\' value', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'updateCookieSameSite2', baseContext);
+
+    await administrationPage.setCookieSameSite(page, 'None');
+
+    const successMessage = await administrationPage.saveGeneralForm(page);
+    await expect(successMessage).to.eq(administrationPage.dangerAlertCookieSameSite);
+  });
+
+  it('should update \'Cookie SameSite\' to \'default\' value', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'updateCookieSameSite3', baseContext);
+
+    await administrationPage.setCookieSameSite(page, 'Lax');
+
+    const successMessage = await administrationPage.saveGeneralForm(page);
+    await expect(successMessage).to.eq(administrationPage.successfulUpdateMessage);
+  });
 });
diff --git a/tests/UI/pages/BO/advancedParameters/administration/index.ts b/tests/UI/pages/BO/advancedParameters/administration/index.ts
index 95bb85ad48fc6..810f3f122c113 100644
--- a/tests/UI/pages/BO/advancedParameters/administration/index.ts
+++ b/tests/UI/pages/BO/advancedParameters/administration/index.ts
@@ -10,8 +10,16 @@ import type {Page} from 'playwright';
 class AdministrationPage extends BOBasePage {
   public readonly pageTitle: string;
 
+  public readonly dangerAlertCookieSameSite: string;
+
   private readonly cookiesIpAddressRadioButton: (status: string) => string;
 
+  private readonly lifeTimeFOCookies: string;
+
+  private readonly lifeTimeBOCookies: string;
+
+  private readonly generalCookieSameSite: string;
+
   private readonly generalFormSaveButton: string;
 
   /**
@@ -23,12 +31,16 @@ class AdministrationPage extends BOBasePage {
 
     this.pageTitle = `Administration • ${global.INSTALL.SHOP_NAME}`;
     this.successfulUpdateMessage = 'Update successful';
+    this.dangerAlertCookieSameSite = 'The SameSite=None attribute is only available in secure mode.';
 
     // Selectors
     // General form
     this.cookiesIpAddressRadioButton = (status: string) => `#general_check_ip_address_${status}`;
+    this.lifeTimeFOCookies = '#general_front_cookie_lifetime';
+    this.lifeTimeBOCookies = '#general_back_cookie_lifetime';
+    this.generalCookieSameSite = '#general_cookie_samesite';
     this.generalFormSaveButton = '#configuration_fieldset_general button';
-    this.alertSuccessBlock = 'div.alert.alert-success[role=alert] div.alert-text';
+    this.alertSuccessBlock = 'div.alert[role=alert] div.alert-text';
   }
 
   /*
@@ -47,23 +59,48 @@ class AdministrationPage extends BOBasePage {
    * Set cookies ip address
    * @param page {Page} Browser tab
    * @param toEnable {Promise<string>}
+   * @return {Promise<void>}
    */
-  async setCookiesIPAddress(page: Page, toEnable: boolean = true): Promise<string> {
+  async setCookiesIPAddress(page: Page, toEnable: boolean = true): Promise<void> {
     await this.setChecked(page, this.cookiesIpAddressRadioButton(toEnable ? '1' : '0'));
-    await this.waitForSelectorAndClick(page, this.generalFormSaveButton);
+  }
 
-    return this.getAlertSuccessBlockContent(page);
+  /**
+   * Sel lifeTime FO cookies
+   * @param page {Page} Browser tab
+   * @param value {number} Number to set on lifetime FO cookies
+   * @return {Promise<void>}
+   */
+  async setLifetimeFOCookies(page: Page, value: number): Promise<void> {
+    await this.setValue(page, this.lifeTimeFOCookies, value);
   }
 
-  async setLifetimeFOCookies(page: Page, value: number): Promise<string> {
-    await this.setValue(page, '#general_front_cookie_lifetime', value);
-    await this.waitForSelectorAndClick(page, this.generalFormSaveButton);
+  /**
+   * Sel lifeTime BO cookies
+   * @param page {Page} Browser tab
+   * @param value {number} Number to set on lifetime BO cookies
+   * @return {Promise<void>}
+   */
+  async setLifetimeBOCookies(page: Page, value: number): Promise<void> {
+    await this.setValue(page, this.lifeTimeBOCookies, value);
+  }
 
-    return this.getAlertSuccessBlockContent(page);
+  /**
+   * Select cookie same site
+   * @param page {Page} Browser tab
+   * @param value {sting} Value to set on cookie same site
+   * @return {Promise<void>}
+   */
+  async setCookieSameSite(page: Page, value: string): Promise<void> {
+    await this.selectByVisibleText(page, this.generalCookieSameSite, value);
   }
 
-  async setLifetimeBOCookies(page: Page, value: number): Promise<string> {
-    await this.setValue(page, '#general_back_cookie_lifetime', value);
+  /**
+   * Save general form
+   * @param page {Page} Browser tab
+   * @return {Promise<string>}
+   */
+  async saveGeneralForm(page: Page): Promise<string> {
     await this.waitForSelectorAndClick(page, this.generalFormSaveButton);
 
     return this.getAlertSuccessBlockContent(page);

From 087fe7775c172580352a63110285dbd93a5c2f81 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Wed, 2 Aug 2023 10:35:48 +0200
Subject: [PATCH 0700/1030] Fix double steps identifiers

---
 .../BO/14_advancedParameters/03_administration/01_general.ts  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/03_administration/01_general.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/03_administration/01_general.ts
index 39f4a9dcb332c..2286b6c8aa2d0 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/03_administration/01_general.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/03_administration/01_general.ts
@@ -55,7 +55,7 @@ describe('BO - Advanced Parameters - Administration : Check general options', as
   });
 
   it('should check that the \'Cookie\'s IP address\' is disabled', async function () {
-    await testContext.addContextItem(this, 'testIdentifier', 'checkThatCookieIpAddressEnabled', baseContext);
+    await testContext.addContextItem(this, 'testIdentifier', 'checkThatCookieIpAddressDisabled', baseContext);
 
     const isEnabled = await administrationPage.isCheckCookiesAddressEnabled(page);
     await expect(isEnabled).to.be.false;
@@ -87,7 +87,7 @@ describe('BO - Advanced Parameters - Administration : Check general options', as
   });
 
   it('should update \' Lifetime of back office cookies\'', async function () {
-    await testContext.addContextItem(this, 'testIdentifier', 'updateLifetimeOfFOCookies', baseContext);
+    await testContext.addContextItem(this, 'testIdentifier', 'updateLifetimeOfBOCookies', baseContext);
 
     await administrationPage.setLifetimeBOCookies(page, 500);
 

From 9ae00527f11639d4697fe340ad1d00f3caadb3dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@prestashop.com>
Date: Fri, 28 Jul 2023 08:57:37 +0200
Subject: [PATCH 0701/1030] Update Keycloak module URL in tests

---
 tests/UI/data/demo/modules.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/UI/data/demo/modules.ts b/tests/UI/data/demo/modules.ts
index e88d1f0d75c72..8eaa2a234120b 100644
--- a/tests/UI/data/demo/modules.ts
+++ b/tests/UI/data/demo/modules.ts
@@ -41,6 +41,6 @@ export default {
   keycloak: new ModuleData({
     tag: 'keycloak_connector_demo',
     name: 'Keycloak OAuth2 connector demo',
-    releaseZip: 'https://github.com/PrestaShop/keycloak_connector_demo/releases/download/v1.0.2/keycloak_connector_demo.zip',
+    releaseZip: 'https://github.com/PrestaShop/keycloak_connector_demo/releases/download/v1.0.3/keycloak_connector_demo.zip',
   }),
 };

From 1700a755069d77e48ce20bc4b07ef9e1ef45d5f4 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Fri, 28 Jul 2023 11:15:07 +0200
Subject: [PATCH 0702/1030] Functional Tests : Added console.log

---
 .../02_externalAuthServer/02_resourceEndpoint.ts              | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts b/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts
index 269343cd40754..9042d7b287bf6 100644
--- a/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts
+++ b/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts
@@ -154,6 +154,8 @@ describe('API : External Auth Server - Resource Endpoint', async () => {
           Authorization: `Bearer ${accessTokenExpiredKeycloak}`,
         },
       });
+      console.log((await apiResponse.body()).toString());
+      console.log(apiResponse.headersArray());
 
       await expect(apiResponse.status()).to.eq(401);
       await expect(api.hasResponseHeader(apiResponse, 'WWW-Authenticate')).to.be.true;
@@ -168,6 +170,8 @@ describe('API : External Auth Server - Resource Endpoint', async () => {
           Authorization: `Bearer ${accessTokenKeycloak}`,
         },
       });
+      console.log((await apiResponse.body()).toString());
+      console.log(apiResponse.headersArray());
 
       await expect(apiResponse.status()).to.eq(200);
       await expect(api.hasResponseHeader(apiResponse, 'Content-Type')).to.be.true;

From e96a26e2b2984edc43f5bd5d23f0d38f6b88efbc Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Tue, 1 Aug 2023 17:32:43 +0200
Subject: [PATCH 0703/1030] Functional Tests : Added Keycloak change

---
 tests/UI/utils/keycloakHelper.ts | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/tests/UI/utils/keycloakHelper.ts b/tests/UI/utils/keycloakHelper.ts
index 92b14797d990b..3087a2bd437fa 100644
--- a/tests/UI/utils/keycloakHelper.ts
+++ b/tests/UI/utils/keycloakHelper.ts
@@ -1,6 +1,8 @@
 import {KeycloakAdminClient} from '@s3pweb/keycloak-admin-client-cjs';
 import type ClientRepresentation from '@keycloak/keycloak-admin-client/lib/defs/clientRepresentation.js';
+import type ClientScopeRepresentation from '@keycloak/keycloak-admin-client/lib/defs/clientScopeRepresentation.js';
 
+console.log(global.keycloakConfig.keycloakExternalUrl);
 const kcAdminClient: KeycloakAdminClient = new KeycloakAdminClient({
   baseUrl: global.keycloakConfig.keycloakExternalUrl,
   realmName: 'master',
@@ -50,6 +52,21 @@ export default {
       standardFlowEnabled: true,
       directAccessGrantsEnabled: true,
       serviceAccountsEnabled: true,
+      protocolMappers: [
+        {
+          name: 'nbf',
+          protocol: 'openid-connect',
+          protocolMapper: 'oidc-hardcoded-claim-mapper',
+          config: {
+            'access.token.claim': 'true',
+            'access.tokenResponse.claim': 'false',
+            'claim.name': 'nbf',
+            'claim.value': '0',
+            'id.token.claim': 'true',
+            'userinfo.token.claim': 'true',
+          },
+        },
+      ],
     });
 
     const client: ClientRepresentation|undefined = await kcAdminClient.clients.findOne(idClient);
@@ -57,6 +74,7 @@ export default {
     if (!client) {
       return '';
     }
+
     return client.secret ?? '';
   },
 

From fb5de83270a80f51b5c2de93291cc188cb0568a7 Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Wed, 2 Aug 2023 11:14:16 +0200
Subject: [PATCH 0704/1030] Fix last error in ui tests caused by base64 without
 '=' padding

---
 .../02_resourceEndpoint.ts                    |  4 --
 tests/UI/package-lock.json                    | 40 +++++++++++++++++++
 tests/UI/package.json                         |  2 +
 tests/UI/utils/api.ts                         | 10 +++--
 tests/UI/utils/keycloakHelper.ts              |  2 -
 5 files changed, 49 insertions(+), 9 deletions(-)

diff --git a/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts b/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts
index 9042d7b287bf6..269343cd40754 100644
--- a/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts
+++ b/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts
@@ -154,8 +154,6 @@ describe('API : External Auth Server - Resource Endpoint', async () => {
           Authorization: `Bearer ${accessTokenExpiredKeycloak}`,
         },
       });
-      console.log((await apiResponse.body()).toString());
-      console.log(apiResponse.headersArray());
 
       await expect(apiResponse.status()).to.eq(401);
       await expect(api.hasResponseHeader(apiResponse, 'WWW-Authenticate')).to.be.true;
@@ -170,8 +168,6 @@ describe('API : External Auth Server - Resource Endpoint', async () => {
           Authorization: `Bearer ${accessTokenKeycloak}`,
         },
       });
-      console.log((await apiResponse.body()).toString());
-      console.log(apiResponse.headersArray());
 
       await expect(apiResponse.status()).to.eq(200);
       await expect(api.hasResponseHeader(apiResponse, 'Content-Type')).to.be.true;
diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index a885d8a6d7ca2..f5123e1ca6b8a 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -19,6 +19,7 @@
         "fast-xml-parser": "^4.2.7",
         "jpeg-js": "^0.4.4",
         "js-image-generator": "^1.0.4",
+        "libsodium-wrappers": "^0.7.11",
         "maildev": "^2.1.0",
         "mocha": "^10.2.0",
         "mochawesome": "^7.1.3",
@@ -29,6 +30,7 @@
       "devDependencies": {
         "@types/chai": "^4.3.5",
         "@types/chai-string": "^1.4.2",
+        "@types/libsodium-wrappers": "^0.7.10",
         "@types/mocha": "^10.0.1",
         "@types/mochawesome": "^6.2.1",
         "@typescript-eslint/eslint-plugin": "^6.2.1",
@@ -484,6 +486,12 @@
       "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
       "dev": true
     },
+    "node_modules/@types/libsodium-wrappers": {
+      "version": "0.7.10",
+      "resolved": "https://registry.npmjs.org/@types/libsodium-wrappers/-/libsodium-wrappers-0.7.10.tgz",
+      "integrity": "sha512-BqI9B92u+cM3ccp8mpHf+HzJ8fBlRwdmyd6+fz3p99m3V6ifT5O3zmOMi612PGkpeFeG/G6loxUnzlDNhfjPSA==",
+      "dev": true
+    },
     "node_modules/@types/linkify-it": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.2.tgz",
@@ -4586,6 +4594,19 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/libsodium": {
+      "version": "0.7.11",
+      "resolved": "https://registry.npmjs.org/libsodium/-/libsodium-0.7.11.tgz",
+      "integrity": "sha512-WPfJ7sS53I2s4iM58QxY3Inb83/6mjlYgcmZs7DJsvDlnmVUwNinBCi5vBT43P6bHRy01O4zsMU2CoVR6xJ40A=="
+    },
+    "node_modules/libsodium-wrappers": {
+      "version": "0.7.11",
+      "resolved": "https://registry.npmjs.org/libsodium-wrappers/-/libsodium-wrappers-0.7.11.tgz",
+      "integrity": "sha512-SrcLtXj7BM19vUKtQuyQKiQCRJPgbpauzl3s0rSwD+60wtHqSUuqcoawlMDheCJga85nKOQwxNYQxf/CKAvs6Q==",
+      "dependencies": {
+        "libsodium": "^0.7.11"
+      }
+    },
     "node_modules/linkify-it": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
@@ -8313,6 +8334,12 @@
       "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
       "dev": true
     },
+    "@types/libsodium-wrappers": {
+      "version": "0.7.10",
+      "resolved": "https://registry.npmjs.org/@types/libsodium-wrappers/-/libsodium-wrappers-0.7.10.tgz",
+      "integrity": "sha512-BqI9B92u+cM3ccp8mpHf+HzJ8fBlRwdmyd6+fz3p99m3V6ifT5O3zmOMi612PGkpeFeG/G6loxUnzlDNhfjPSA==",
+      "dev": true
+    },
     "@types/linkify-it": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.2.tgz",
@@ -11305,6 +11332,19 @@
         "type-check": "~0.3.2"
       }
     },
+    "libsodium": {
+      "version": "0.7.11",
+      "resolved": "https://registry.npmjs.org/libsodium/-/libsodium-0.7.11.tgz",
+      "integrity": "sha512-WPfJ7sS53I2s4iM58QxY3Inb83/6mjlYgcmZs7DJsvDlnmVUwNinBCi5vBT43P6bHRy01O4zsMU2CoVR6xJ40A=="
+    },
+    "libsodium-wrappers": {
+      "version": "0.7.11",
+      "resolved": "https://registry.npmjs.org/libsodium-wrappers/-/libsodium-wrappers-0.7.11.tgz",
+      "integrity": "sha512-SrcLtXj7BM19vUKtQuyQKiQCRJPgbpauzl3s0rSwD+60wtHqSUuqcoawlMDheCJga85nKOQwxNYQxf/CKAvs6Q==",
+      "requires": {
+        "libsodium": "^0.7.11"
+      }
+    },
     "linkify-it": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
diff --git a/tests/UI/package.json b/tests/UI/package.json
index 60a13ace7ad85..cc1fd328bc773 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -112,6 +112,7 @@
     "fast-xml-parser": "^4.2.7",
     "jpeg-js": "^0.4.4",
     "js-image-generator": "^1.0.4",
+    "libsodium-wrappers": "^0.7.11",
     "maildev": "^2.1.0",
     "mocha": "^10.2.0",
     "mochawesome": "^7.1.3",
@@ -122,6 +123,7 @@
   "devDependencies": {
     "@types/chai": "^4.3.5",
     "@types/chai-string": "^1.4.2",
+    "@types/libsodium-wrappers": "^0.7.10",
     "@types/mocha": "^10.0.1",
     "@types/mochawesome": "^6.2.1",
     "@typescript-eslint/eslint-plugin": "^6.2.1",
diff --git a/tests/UI/utils/api.ts b/tests/UI/utils/api.ts
index 318d3cd863254..a1a87989908bd 100644
--- a/tests/UI/utils/api.ts
+++ b/tests/UI/utils/api.ts
@@ -1,5 +1,6 @@
 import crypto from 'crypto';
 import {readFileSync} from 'fs';
+import sodium from 'libsodium-wrappers';
 import type {APIResponse} from 'playwright';
 
 type HttpHeader = {
@@ -114,8 +115,8 @@ export default {
     const payloadString: string = JSON.stringify(payload);
 
     // Transform string in base64
-    const headerBase64: string = Buffer.from(headerString, 'base64').toString();
-    const payloadBase64: string = Buffer.from(payloadString, 'base64').toString();
+    const headerBase64: string = sodium.to_base64(headerString, sodium.base64_variants.URLSAFE_NO_PADDING)
+    const payloadBase64: string = sodium.to_base64(payloadString, sodium.base64_variants.URLSAFE_NO_PADDING)
 
     // Sign the header & payload
     const signatureFunction: crypto.Sign = crypto.createSign('RSA-SHA256');
@@ -129,6 +130,9 @@ export default {
     const headerBuffer: Buffer = Buffer.from(headerString);
     const payloadBuffer: Buffer = Buffer.from(payloadString);
 
-    return `${headerBuffer.toString('base64')}.${payloadBuffer.toString('base64')}.${signatureBase64.toString()}`;
+    const headerBufferBase64: string = sodium.to_base64(headerBuffer.toString(), sodium.base64_variants.URLSAFE_NO_PADDING)
+    const payloadBufferBase64: string = sodium.to_base64(payloadBuffer.toString(), sodium.base64_variants.URLSAFE_NO_PADDING)
+
+    return `${headerBufferBase64}.${payloadBufferBase64}.${signatureBase64.toString()}`;
   },
 };
diff --git a/tests/UI/utils/keycloakHelper.ts b/tests/UI/utils/keycloakHelper.ts
index 3087a2bd437fa..59ffa172a9241 100644
--- a/tests/UI/utils/keycloakHelper.ts
+++ b/tests/UI/utils/keycloakHelper.ts
@@ -1,8 +1,6 @@
 import {KeycloakAdminClient} from '@s3pweb/keycloak-admin-client-cjs';
 import type ClientRepresentation from '@keycloak/keycloak-admin-client/lib/defs/clientRepresentation.js';
-import type ClientScopeRepresentation from '@keycloak/keycloak-admin-client/lib/defs/clientScopeRepresentation.js';
 
-console.log(global.keycloakConfig.keycloakExternalUrl);
 const kcAdminClient: KeycloakAdminClient = new KeycloakAdminClient({
   baseUrl: global.keycloakConfig.keycloakExternalUrl,
   realmName: 'master',

From c8a888d07a0b74ce9fdf4a7abc82db673ff41f31 Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Wed, 2 Aug 2023 11:19:38 +0200
Subject: [PATCH 0705/1030] fix js linter

---
 tests/UI/utils/api.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/UI/utils/api.ts b/tests/UI/utils/api.ts
index a1a87989908bd..c9f49f226e545 100644
--- a/tests/UI/utils/api.ts
+++ b/tests/UI/utils/api.ts
@@ -115,8 +115,8 @@ export default {
     const payloadString: string = JSON.stringify(payload);
 
     // Transform string in base64
-    const headerBase64: string = sodium.to_base64(headerString, sodium.base64_variants.URLSAFE_NO_PADDING)
-    const payloadBase64: string = sodium.to_base64(payloadString, sodium.base64_variants.URLSAFE_NO_PADDING)
+    const headerBase64: string = sodium.to_base64(headerString, sodium.base64_variants.URLSAFE_NO_PADDING);
+    const payloadBase64: string = sodium.to_base64(payloadString, sodium.base64_variants.URLSAFE_NO_PADDING);
 
     // Sign the header & payload
     const signatureFunction: crypto.Sign = crypto.createSign('RSA-SHA256');
@@ -130,8 +130,8 @@ export default {
     const headerBuffer: Buffer = Buffer.from(headerString);
     const payloadBuffer: Buffer = Buffer.from(payloadString);
 
-    const headerBufferBase64: string = sodium.to_base64(headerBuffer.toString(), sodium.base64_variants.URLSAFE_NO_PADDING)
-    const payloadBufferBase64: string = sodium.to_base64(payloadBuffer.toString(), sodium.base64_variants.URLSAFE_NO_PADDING)
+    const headerBufferBase64: string = sodium.to_base64(headerBuffer.toString(), sodium.base64_variants.URLSAFE_NO_PADDING);
+    const payloadBufferBase64: string = sodium.to_base64(payloadBuffer.toString(), sodium.base64_variants.URLSAFE_NO_PADDING);
 
     return `${headerBufferBase64}.${payloadBufferBase64}.${signatureBase64.toString()}`;
   },

From 4b1c9f0f44d6a11481fc5188782d95b799bf5d1f Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Thu, 20 Jul 2023 16:34:15 +0200
Subject: [PATCH 0706/1030] Fix old legacy link

---
 .../config/routing/admin/sell/catalog/products_v2/product.yml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products_v2/product.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products_v2/product.yml
index 1c02df32f3c19..29ea8cdae3831 100644
--- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products_v2/product.yml
+++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products_v2/product.yml
@@ -331,7 +331,7 @@ admin_products_bulk_disable_shop_group:
     _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\Product\ProductController::bulkDisableShopGroupAction
     _legacy_controller: AdminProducts
     _legacy_link:
-      - AdminProducts:submitBulkenableSelectionproduct
+      - AdminProducts:submitBulkdisableSelectionproduct
   requirements:
     productId: \d+
     shopGroupId: \d+

From 4d847ffff8dfe5a134f074a5c195de3e79c3f9ce Mon Sep 17 00:00:00 2001
From: PICHAT Morgan <pichat.morgan@gmail.com>
Date: Thu, 20 Jul 2023 16:34:34 +0200
Subject: [PATCH 0707/1030] Update white list

---
 .../Command/LegacyLinkLinterCommand.php       | 28 +++++++++++++++++++
 .../routing/admin/sell/catalog/attribute.yml  | 14 +++++-----
 .../routing/admin/sell/catalog/cart_rule.yml  |  4 +--
 .../routing/admin/sell/catalog/features.yml   |  3 ++
 .../routing/admin/sell/catalog/monitoring.yml |  2 ++
 .../sell/catalog/products_v2/product.yml      |  1 +
 6 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/src/PrestaShopBundle/Command/LegacyLinkLinterCommand.php b/src/PrestaShopBundle/Command/LegacyLinkLinterCommand.php
index 7969cbaac6491..1eb048af045f2 100644
--- a/src/PrestaShopBundle/Command/LegacyLinkLinterCommand.php
+++ b/src/PrestaShopBundle/Command/LegacyLinkLinterCommand.php
@@ -98,6 +98,34 @@ class LegacyLinkLinterCommand extends Command
         'admin_products_combinations_edit_combination',
         'admin_products_combinations_bulk_combination_form',
         'admin_products_combinations_bulk_edit_combination',
+        'admin_products_combinations_delete_combination',
+        'admin_products_combinations_bulk_delete',
+        'admin_products_attribute_groups',
+        'admin_all_attribute_groups',
+        'admin_products_combinations_generate',
+        'admin_products_specific_prices_list',
+        'admin_products_specific_prices_create',
+        'admin_products_specific_prices_edit',
+        'admin_products_specific_prices_delete',
+        'admin_products_light_list',
+        'admin_products_search',
+        'admin_products_reset_grid_search',
+        'admin_products_grid_category_filter',
+        'admin_products_grid_shop_previews',
+        'admin_products_download_virtual_product_file',
+        'admin_products_delete_from_shop_group',
+        'admin_products_delete_from_shop',
+        'admin_products_enable_for_all_shops',
+        'admin_products_enable_for_shop_group',
+        'admin_products_disable_for_all_shops',
+        'admin_products_disable_for_shop_group',
+        'admin_products_search_associations',
+        'admin_products_search_combinations',
+        'admin_products_search_product_combinations',
+        'admin_products_quantity',
+        'admin_categories_get_categories_tree',
+        'admin_catalog_price_rules_list_for_product',
+        'admin_features_horizontal_index',
     ];
 
     public function __construct(LegacyLinkLinter $legacyLinkLinter, AdminRouteProvider $adminRouteProvider)
diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/attribute.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/attribute.yml
index 064707d9c3cab..f2ce9f6af6d36 100644
--- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/attribute.yml
+++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/attribute.yml
@@ -7,7 +7,7 @@ admin_attributes_index:
     _legacy_controller: AdminAttributesGroups
     redirectQueryParamsToKeep:
       - 'attributeGroupId'
-    #  _legacy_link: AdminAttributesGroups:viewattribute_group
+    _legacy_link: AdminAttributesGroups:viewattribute_group
     _legacy_parameters:
       id_attribute_group: attributeGroupId
     requirements:
@@ -19,9 +19,9 @@ admin_attributes_search:
   defaults:
     _controller: PrestaShopBundle\Controller\Admin\CommonController::searchGridAction
     _legacy_controller: AdminAttributesGroups
+    _legacy_link: AdminAttributesGroups:submitFilterattribute_values
     gridDefinitionFactoryServiceId: prestashop.core.grid.definition.factory.attribute
     redirectRoute: admin_attributes_index
-    #  _legacy_link: AdminAttributesGroups:submitFilterattribute_values
     redirectQueryParamsToKeep:
       - 'attributeGroupId'
 
@@ -31,9 +31,9 @@ admin_attributes_create:
   defaults:
     _controller: 'PrestaShopBundle\Controller\Admin\Sell\Catalog\AttributeController::createAction'
     _legacy_controller: AdminAttributesGroups
+    _legacy_link: AdminAttributesGroups:addattribute_group
     redirectQueryParamsToKeep:
       - 'attributeGroupId'
-#  _legacy_link: AdminAttributesGroups:addattribute_group
 
 admin_attributes_edit:
   path: /{attributeId}/edit
@@ -43,7 +43,7 @@ admin_attributes_edit:
     _legacy_controller: AdminAttributesGroups
     redirectQueryParamsToKeep:
       - 'attributeGroupId'
-    #  _legacy_link: AdminAttributesGroups:updateattribute
+    _legacy_link: AdminAttributesGroups:updateattribute
     _legacy_parameters:
       id_attribute_group: attributeGroupId
       id_attribute: attributeId
@@ -58,7 +58,7 @@ admin_attributes_delete:
     _legacy_controller: AdminAttributesGroups
     redirectQueryParamsToKeep:
       - 'attributeGroupId'
-    #  _legacy_link: AdminAttributesGroups:deleteattribute
+    _legacy_link: AdminAttributesGroups:deleteattribute
     _legacy_parameters:
       id_attribute_group: attributeGroupId
       id_attribute: attributeId
@@ -71,7 +71,7 @@ admin_attributes_bulk_delete:
     _legacy_controller: AdminAttributesGroups
     redirectQueryParamsToKeep:
       - 'attributeGroupId'
-    #  _legacy_link: AdminAttributesGroups:bulkdeleteattribute
+    _legacy_link: AdminAttributesGroups:bulkdeleteattribute
     _legacy_parameters:
       id_attribute_group: attributeGroupId
       id_attribute: attributeId
@@ -82,4 +82,4 @@ admin_attributes_update_position:
   defaults:
     _controller: 'PrestaShopBundle\Controller\Admin\Sell\Catalog\AttributeController::updatePositionAction'
     _legacy_controller: AdminAttributesGroups
-#  _legacy_link: AdminAttributesGroups:updateAttributesPositions
+    _legacy_link: AdminAttributesGroups:updateAttributesPositions
diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/cart_rule.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/cart_rule.yml
index dbbeb7fdf0c5b..9f072344c4467 100644
--- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/cart_rule.yml
+++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/cart_rule.yml
@@ -13,8 +13,8 @@ admin_cart_rules_create:
   defaults:
     _controller: 'PrestaShopBundle\Controller\Admin\Sell\Catalog\CartRuleController::createAction'
     _legacy_controller: AdminCartRules
-    # _legacy_link: AdminCartRules:addcartrule
-    # _legacy_feature_flag: cart_rule
+    _legacy_link: AdminCartRules:addcartrule
+    _legacy_feature_flag: cart_rule
 
 admin_cart_rules_search:
   path: /search
diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml
index 4ef6781d588ac..5271c1d5a9ab0 100644
--- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml
+++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml
@@ -21,6 +21,7 @@ admin_features_search:
   defaults:
     _controller: PrestaShopBundle\Controller\Admin\CommonController::searchGridAction
     _legacy_controller: AdminFeatures
+    _legacy_link: AdminTracking:submitFilterfeature
     gridDefinitionFactoryServiceId: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\FeatureGridDefinitionFactory
     redirectRoute: admin_features_index
 
@@ -52,6 +53,7 @@ admin_features_export:
   defaults:
     _controller: 'PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureController::exportAction'
     _legacy_controller: AdminFeatures
+    _legacy_link: AdminThemes:exportfeature
 
 admin_features_update_position:
   path: /update-position
@@ -59,6 +61,7 @@ admin_features_update_position:
   defaults:
     _controller: PrestaShopBundle\Controller\Admin\CommonController::updatePositionAction
     _legacy_controller: AdminFeatures
+    _legacy_link: AdminFeatures:updateFeaturesPositions
     position_definition: prestashop.core.grid.feature.position_definition
     redirect_route: admin_features_index
 
diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/monitoring.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/monitoring.yml
index bb414fef0441f..7e449002f17f1 100644
--- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/monitoring.yml
+++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/monitoring.yml
@@ -12,6 +12,7 @@ admin_monitorings_search:
   defaults:
     _controller: 'PrestaShopBundle\Controller\Admin\Sell\Catalog\MonitoringController::searchAction'
     _legacy_controller: AdminTracking
+    _legacy_link: AdminTracking:submitFiltermonitoring
 
 admin_monitoring_products_bulk_delete:
   path: /delete-bulk
@@ -19,3 +20,4 @@ admin_monitoring_products_bulk_delete:
   defaults:
     _controller: 'PrestaShopBundle\Controller\Admin\Sell\Catalog\MonitoringController::deleteBulkAction'
     _legacy_controller: AdminTracking
+    _legacy_link: AdminTracking:submitBulkdeletemonitoring
diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products_v2/product.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products_v2/product.yml
index 29ea8cdae3831..62613d7e6853f 100644
--- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products_v2/product.yml
+++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products_v2/product.yml
@@ -13,6 +13,7 @@ admin_products_index:
   defaults:
     _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\Product\ProductController::indexAction
     _legacy_controller: AdminProducts
+    _legacy_link: AdminProducts
 
 admin_products_light_list:
   path: /light-list

From 289cc46b156a14a86fbe2aaf8d19ee4179573991 Mon Sep 17 00:00:00 2001
From: Morgan Pichat <morgan.pichat@prestashop.com>
Date: Wed, 2 Aug 2023 17:06:21 +0200
Subject: [PATCH 0708/1030] Update _legacy_link format

---
 .../config/routing/admin/sell/catalog/products_v2/product.yml  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products_v2/product.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products_v2/product.yml
index 62613d7e6853f..8c417497d013b 100644
--- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products_v2/product.yml
+++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products_v2/product.yml
@@ -331,8 +331,7 @@ admin_products_bulk_disable_shop_group:
   defaults:
     _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\Product\ProductController::bulkDisableShopGroupAction
     _legacy_controller: AdminProducts
-    _legacy_link:
-      - AdminProducts:submitBulkdisableSelectionproduct
+    _legacy_link: AdminProducts:submitBulkdisableSelectionproduct
   requirements:
     productId: \d+
     shopGroupId: \d+

From 77e33e5b9e241286c8cef04dbe8e6971c9476fe2 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Thu, 3 Aug 2023 10:19:45 +0200
Subject: [PATCH 0709/1030] Functional Tests : BO - Catalog - Products : CRUD
 virtual product (Add check for email)

---
 .../functional/05_CRUDVirtualProduct.ts       | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/tests/UI/campaigns/productV2/functional/05_CRUDVirtualProduct.ts b/tests/UI/campaigns/productV2/functional/05_CRUDVirtualProduct.ts
index 4d802008e5ddb..32921eeba5583 100644
--- a/tests/UI/campaigns/productV2/functional/05_CRUDVirtualProduct.ts
+++ b/tests/UI/campaigns/productV2/functional/05_CRUDVirtualProduct.ts
@@ -2,9 +2,11 @@
 import helper from '@utils/helpers';
 import basicHelper from '@utils/basicHelper';
 import files from '@utils/files';
+import mailHelper from '@utils/mailHelper';
 import testContext from '@utils/testContext';
 
 // Import common tests
+import {resetSmtpConfigTest, setupSmtpConfigTest} from '@commonTests/BO/advancedParameters/smtp';
 import loginCommon from '@commonTests/BO/loginBO';
 import {
   resetNewProductPageAsDefault, setFeatureFlag,
@@ -30,17 +32,21 @@ import OrderStatuses from '@data/demo/orderStatuses';
 import Customers from '@data/demo/customers';
 import PaymentMethods from '@data/demo/paymentMethods';
 import ProductData from '@data/faker/product';
+import type MailDevEmail from '@data/types/maildevEmail';
 
 import type {BrowserContext, Page} from 'playwright';
 import {expect} from 'chai';
+import type MailDev from 'maildev';
 
 const baseContext: string = 'productV2_functional_CRUDVirtualProduct';
 
 describe('BO - Catalog - Products : CRUD virtual product', async () => {
   let browserContext: BrowserContext;
   let page: Page;
+  let mailListener: MailDev;
 
   // Data to create standard product
+  const mails: MailDevEmail[] = [];
   const newProductData: ProductData = new ProductData({
     type: 'virtual',
     coverImage: 'cover.jpg',
@@ -66,6 +72,8 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
 
   // Pre-condition: Enable new product page
   setFeatureFlag(featureFlagPage.featureFlagProductPageV2, true, `${baseContext}_enableNewProduct`);
+  // Pre-Condition: Setup config SMTP
+  setupSmtpConfigTest(`${baseContext}_preTest_1`);
 
   // before and after functions
   before(async function () {
@@ -78,6 +86,16 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
       await files.generateImage(newProductData.thumbImage);
     }
     await files.generateImage(newProductData.fileName);
+
+    // Start listening to maildev server
+    mailListener = mailHelper.createMailListener();
+    mailHelper.startListener(mailListener);
+
+    // Handle every new email
+    mailListener.on('new', (email: MailDevEmail) => {
+      console.log(email.subject);
+      mails.push(email);
+    });
   });
 
   after(async () => {
@@ -89,6 +107,9 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
       await files.deleteFile(newProductData.thumbImage);
     }
     await files.deleteFile(newProductData.fileName);
+
+    // Stop listening to maildev server
+    mailHelper.stopListener(mailListener);
   });
 
   // 1 - Create product
@@ -320,6 +341,20 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
         const doesFileExist: boolean = await files.doesFileExist(newProductData.fileName, 5000);
         await expect(doesFileExist, 'File is not downloaded!').to.be.true;
       });
+
+      it('should check if the mail is in mailbox', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'checkIfMailIsInMailbox', baseContext);
+
+        // 0 : [Mon Shop] Awaiting bank wire payment
+        // 1 : [Mon Shop] Order confirmation
+        // 2 : [Mon Shop] The virtual product that you bought is available for download
+        // 3 : [Mon Shop] Payment accepted
+        expect(mails.length).to.be.gte(3);
+        expect(mails[2].subject).to.be.equal(
+          `[${global.INSTALL.SHOP_NAME}] The virtual product that you bought is available for download`,
+        );
+        expect(mails[2].text).to.contains('Product(s) to download');
+      });
     });
   });
 
@@ -432,4 +467,6 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
 
   // Post-condition: Reset initial state
   resetNewProductPageAsDefault(`${baseContext}_resetNewProduct`);
+  // Post-Condition: Reset SMTP config
+  resetSmtpConfigTest(`${baseContext}_postTest_1`);
 });

From aec3a729ceaa80e5958acef07894a0a6cebe64ef Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Thu, 3 Aug 2023 10:37:37 +0200
Subject: [PATCH 0710/1030] Nightly : Fixed functional/BO/14*/03*/01*

---
 .../03_administration/01_general.ts           | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/03_administration/01_general.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/03_administration/01_general.ts
index 2286b6c8aa2d0..65c6e1db93880 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/03_administration/01_general.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/03_administration/01_general.ts
@@ -42,7 +42,7 @@ describe('BO - Advanced Parameters - Administration : Check general options', as
     );
 
     const pageTitle = await administrationPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(administrationPage.pageTitle);
+    expect(pageTitle).to.contains(administrationPage.pageTitle);
   });
 
   it('should disable \'Cookie\'s IP address\'', async function () {
@@ -51,7 +51,7 @@ describe('BO - Advanced Parameters - Administration : Check general options', as
     await administrationPage.setCookiesIPAddress(page, false);
 
     const successMessage = await administrationPage.saveGeneralForm(page);
-    await expect(successMessage).to.eq(administrationPage.successfulUpdateMessage);
+    expect(successMessage).to.eq(administrationPage.successfulUpdateMessage);
   });
 
   it('should check that the \'Cookie\'s IP address\' is disabled', async function () {
@@ -67,7 +67,7 @@ describe('BO - Advanced Parameters - Administration : Check general options', as
     await administrationPage.setCookiesIPAddress(page, true);
 
     const successMessage = await administrationPage.saveGeneralForm(page);
-    await expect(successMessage).to.eq(administrationPage.successfulUpdateMessage);
+    expect(successMessage).to.eq(administrationPage.successfulUpdateMessage);
   });
 
   it('should check that the \'Cookie\'s IP address\' is enabled', async function () {
@@ -83,7 +83,7 @@ describe('BO - Advanced Parameters - Administration : Check general options', as
     await administrationPage.setLifetimeFOCookies(page, 500);
 
     const successMessage = await administrationPage.saveGeneralForm(page);
-    await expect(successMessage).to.eq(administrationPage.successfulUpdateMessage);
+    expect(successMessage).to.eq(administrationPage.successfulUpdateMessage);
   });
 
   it('should update \' Lifetime of back office cookies\'', async function () {
@@ -92,7 +92,7 @@ describe('BO - Advanced Parameters - Administration : Check general options', as
     await administrationPage.setLifetimeBOCookies(page, 500);
 
     const successMessage = await administrationPage.saveGeneralForm(page);
-    await expect(successMessage).to.eq(administrationPage.successfulUpdateMessage);
+    expect(successMessage).to.eq(administrationPage.successfulUpdateMessage);
   });
 
   it('should update \'Cookie SameSite\' to \'Strict\' value', async function () {
@@ -101,7 +101,7 @@ describe('BO - Advanced Parameters - Administration : Check general options', as
     await administrationPage.setCookieSameSite(page, 'Strict');
 
     const successMessage = await administrationPage.saveGeneralForm(page);
-    await expect(successMessage).to.eq(administrationPage.successfulUpdateMessage);
+    expect(successMessage).to.eq(administrationPage.successfulUpdateMessage);
   });
 
   it('should update \'Cookie SameSite\' to \'None\' value', async function () {
@@ -109,8 +109,13 @@ describe('BO - Advanced Parameters - Administration : Check general options', as
 
     await administrationPage.setCookieSameSite(page, 'None');
 
-    const successMessage = await administrationPage.saveGeneralForm(page);
-    await expect(successMessage).to.eq(administrationPage.dangerAlertCookieSameSite);
+    const message = await administrationPage.saveGeneralForm(page);
+
+    if (global.INSTALL.ENABLE_SSL) {
+      expect(message).to.eq(administrationPage.successfulUpdateMessage);
+    } else {
+      expect(message).to.eq(administrationPage.dangerAlertCookieSameSite);
+    }
   });
 
   it('should update \'Cookie SameSite\' to \'default\' value', async function () {
@@ -119,6 +124,6 @@ describe('BO - Advanced Parameters - Administration : Check general options', as
     await administrationPage.setCookieSameSite(page, 'Lax');
 
     const successMessage = await administrationPage.saveGeneralForm(page);
-    await expect(successMessage).to.eq(administrationPage.successfulUpdateMessage);
+    expect(successMessage).to.eq(administrationPage.successfulUpdateMessage);
   });
 });

From 9935ec78c2745d6ec0093fa4ac026a1085c4f02d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@prestashop.com>
Date: Thu, 3 Aug 2023 10:43:52 +0200
Subject: [PATCH 0711/1030] Improve Makefile usage

---
 Makefile | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index 390a039b38230..ab9255bb33e7b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,41 +1,48 @@
-install: composer assets
+help: ## Display this help menu
+	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
-composer:
+install: composer assets  ## Install PHP dependencies and build the static assets
+
+composer: ## Install PHP dependencies
 	composer install
 	./bin/console cache:clear --no-warmup
 
-assets:
+assets:  ## Rebuilds all the static assets, running npm install-clean as needed
 	./tools/assets/build.sh
 
-front-core:
+front-core: ## Building core theme assets
 	./tools/assets/build.sh front-core
 
-front-classic:
+front-classic: ## Building classic theme assets
 	./tools/assets/build.sh front-classic
 
-admin-default:
+admin-default: ## Building admin default theme assets
 	./tools/assets/build.sh admin-default
 
-admin-new-theme:
+admin-new-theme: ## Building admin new theme assets
 	./tools/assets/build.sh admin-new-theme
 
-admin: admin-default admin-new-theme
+admin: admin-default admin-new-theme ## Building admin assets
 
-front: front-core front-classic
+front: front-core front-classic ## Building front assets
 
-cs-fixer:
+cs-fixer: ## Run php-cs-fixer
 	./vendor/bin/php-cs-fixer fix
 
-phpstan:
+phpstan: ## Run phpstan analysis
 	./vendor/bin/phpstan analyse -c phpstan.neon.dist
 
-scss-fixer:
+scss-fixer: ## Run scss-fix
 	cd admin-dev/themes/new-theme && npm run scss-fix
 	cd admin-dev/themes/default && npm run scss-fix
 	cd themes/classic/_dev && npm run scss-fix
 
-es-linter:
+es-linter: ## Run lint-fix
 	cd admin-dev/themes/new-theme && npm run lint-fix
 	cd admin-dev/themes/default && npm run lint-fix
 	cd themes/classic/_dev && npm run lint-fix
 	cd themes && npm run lint-fix
+
+.PHONY: help install composer assets front-core front-classic admin-default admin-new-theme admin front cs-fixer phpstan scss-fixer es-linter
+
+.DEFAULT_GOAL := install

From 3e5f376d12261e540e4b377f061a33da180c5fb0 Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Fri, 14 Jul 2023 17:10:45 +0200
Subject: [PATCH 0712/1030] Remove usage of multiaddress delivery

---
 classes/Cart.php                              | 678 +++++-------------
 classes/Context.php                           |   1 -
 classes/Customization.php                     |   2 +
 classes/Product.php                           |  17 +-
 classes/order/OrderReturn.php                 |   2 +-
 controllers/front/CartController.php          |   5 +-
 .../CreateEmptyCustomerCartHandler.php        |   1 -
 src/Adapter/Order/GeneralConfiguration.php    |   4 -
 src/Core/Cart/CartRow.php                     |   2 +-
 .../OrderPreferencesController.php            |   1 -
 .../OrderPreferences/GeneralType.php          |  10 -
 tests/Integration/Utility/CartOld.php         |   4 +-
 .../Resources/modules_tests/override/Cart.php |   9 -
 .../pscsx32412/override/classes/Cart.php      |  10 -
 .../Order/GeneralConfigurationTest.php        |   3 -
 15 files changed, 187 insertions(+), 562 deletions(-)

diff --git a/classes/Cart.php b/classes/Cart.php
index 6a9f7e6f8a5ad..93b3190e25029 100644
--- a/classes/Cart.php
+++ b/classes/Cart.php
@@ -330,18 +330,6 @@ public function updateAddressId($id_address, $id_address_new)
             $this->update();
         }
 
-        $sql = 'UPDATE `' . _DB_PREFIX_ . 'cart_product`
-        SET `id_address_delivery` = ' . (int) $id_address_new . '
-        WHERE  `id_cart` = ' . (int) $this->id . '
-            AND `id_address_delivery` = ' . (int) $id_address;
-        Db::getInstance()->execute($sql);
-
-        $sql = 'UPDATE `' . _DB_PREFIX_ . 'customization`
-            SET `id_address_delivery` = ' . (int) $id_address_new . '
-            WHERE  `id_cart` = ' . (int) $this->id . '
-                AND `id_address_delivery` = ' . (int) $id_address;
-        Db::getInstance()->execute($sql);
-
         Hook::exec('actionUpdateCartAddress', ['cart' => $this, 'oldAddressId' => (int) $id_address, 'newAddressId' => (int) $id_address_new]);
     }
 
@@ -358,18 +346,6 @@ public function updateDeliveryAddressId(int $currentAddressId, int $newAddressId
             $this->update();
         }
 
-        $sql = 'UPDATE `' . _DB_PREFIX_ . 'cart_product`
-        SET `id_address_delivery` = ' . $newAddressId . '
-        WHERE  `id_cart` = ' . (int) $this->id . '
-            AND `id_address_delivery` = ' . $currentAddressId;
-        Db::getInstance()->execute($sql);
-
-        $sql = 'UPDATE `' . _DB_PREFIX_ . 'customization`
-            SET `id_address_delivery` = ' . $newAddressId . '
-            WHERE  `id_cart` = ' . (int) $this->id . '
-                AND `id_address_delivery` = ' . $currentAddressId;
-        Db::getInstance()->execute($sql);
-
         Hook::exec('actionUpdateCartAddress', ['cart' => $this, 'oldAddressId' => $currentAddressId, 'newAddressId' => $newAddressId]);
     }
 
@@ -386,6 +362,7 @@ public function delete()
             return false;
         }
 
+        // Get all file customization fields from customized_data table and delete the physical file
         $uploaded_files = Db::getInstance()->executeS(
             'SELECT cd.`value`
             FROM `' . _DB_PREFIX_ . 'customized_data` cd
@@ -398,6 +375,7 @@ public function delete()
             unlink(_PS_UPLOAD_DIR_ . $must_unlink['value']);
         }
 
+        // Delete all related customized data
         Db::getInstance()->execute(
             'DELETE FROM `' . _DB_PREFIX_ . 'customized_data`
             WHERE `id_customization` IN (
@@ -407,11 +385,13 @@ public function delete()
             )'
         );
 
+        // Delete all customization entries (1 customization can have multiple customized_data)
         Db::getInstance()->execute(
             'DELETE FROM `' . _DB_PREFIX_ . 'customization`
             WHERE `id_cart` = ' . (int) $this->id
         );
 
+        // Delete products, delete cart rules
         if (!Db::getInstance()->execute('DELETE FROM `' . _DB_PREFIX_ . 'cart_cart_rule` WHERE `id_cart` = ' . (int) $this->id)
             || !Db::getInstance()->execute('DELETE FROM `' . _DB_PREFIX_ . 'cart_product` WHERE `id_cart` = ' . (int) $this->id)) {
             return false;
@@ -668,7 +648,7 @@ public function getProducts($refresh = false, $id_product = false, $id_country =
                         product_shop.`available_for_order`, product_shop.`show_price`, product_shop.`price`, product_shop.`active`, product_shop.`unity`, product_shop.`unit_price`,
                         stock.`quantity` AS quantity_available, p.`width`, p.`height`, p.`depth`, stock.`out_of_stock`, p.`weight`,
                         p.`available_date`, p.`date_add`, p.`date_upd`, IFNULL(stock.quantity, 0) as quantity, pl.`link_rewrite`, cl.`link_rewrite` AS category,
-                        CONCAT(LPAD(cp.`id_product`, 10, 0), LPAD(IFNULL(cp.`id_product_attribute`, 0), 10, 0), IFNULL(cp.`id_address_delivery`, 0), IFNULL(cp.`id_customization`, 0)) AS unique_id, cp.id_address_delivery,
+                        CONCAT(LPAD(cp.`id_product`, 10, 0), LPAD(IFNULL(cp.`id_product_attribute`, 0), 10, 0), IFNULL(cp.`id_customization`, 0)) AS unique_id,
                         ps.product_supplier_reference supplier_reference');
 
         // Build FROM
@@ -890,7 +870,7 @@ protected function applyProductCalculations($row, $shopContext, $productQuantity
         if (Configuration::get('PS_TAX_ADDRESS_TYPE') == 'id_address_invoice') {
             $address_id = (int) $this->id_address_invoice;
         } else {
-            $address_id = (int) $row['id_address_delivery'];
+            $address_id = (int) $this->id_address_delivery;
         }
         if (!Address::addressExists($address_id, true)) {
             $address_id = null;
@@ -1398,10 +1378,6 @@ public function getProductQuantity($idProduct, $idProductAttribute = 0, $idCusto
               ' . ($idCustomization !== false ? ' AND cp.`id_customization` = ' . (int) $idCustomization : '') . '
             AND cp.`id_cart` = ' . (int) $this->id;
 
-        if (Configuration::get('PS_ALLOW_MULTISHIPPING') && $this->isMultiAddressDelivery()) {
-            $commonWhere .= ' AND cp.`id_address_delivery` = ' . (int) $idAddressDelivery;
-        }
-
         if ($idCustomization) {
             $commonWhere .= ' AND c.`id_customization` = ' . (int) $idCustomization;
         }
@@ -1429,7 +1405,7 @@ public function getProductQuantity($idProduct, $idProductAttribute = 0, $idCusto
      * @param int|null $id_product_attribute Attribute ID if needed
      * @param int|false $id_customization Customization ID
      * @param string $operator Indicate if quantity must be increased or decreased
-     * @param int $id_address_delivery Delivery Address ID
+     * @param int $id_address_delivery Delivery Address ID - unused
      * @param Shop|null $shop
      * @param bool $auto_add_cart_rule
      * @param bool $skipAvailabilityCheckOutOfStock
@@ -1455,28 +1431,10 @@ public function updateQty(
             $shop = Context::getContext()->shop;
         }
 
-        if (Validate::isLoadedObject(Context::getContext()->customer)) {
-            if ($id_address_delivery == 0 && (int) $this->id_address_delivery) {
-                // The $id_address_delivery is null, use the cart delivery address
-                $id_address_delivery = $this->id_address_delivery;
-            } elseif ($id_address_delivery == 0) {
-                // The $id_address_delivery is null, get the default customer address
-                $id_address_delivery = (int) Address::getFirstCustomerAddressId(
-                    (int) Context::getContext()->customer->id
-                );
-            } elseif (!Customer::customerHasAddress(Context::getContext()->customer->id, $id_address_delivery)) {
-                // The $id_address_delivery must be linked with customer
-                $id_address_delivery = 0;
-            }
-        } else {
-            $id_address_delivery = 0;
-        }
-
         $quantity = (int) $quantity;
         $id_product = (int) $id_product;
         $id_product_attribute = (int) $id_product_attribute;
         $id_customization = (int) $id_customization;
-        $id_address_delivery = (int) $id_address_delivery;
         $product = new Product($id_product, false, (int) Configuration::get('PS_LANG_DEFAULT'), $shop->id);
 
         if ($id_product_attribute) {
@@ -1512,7 +1470,7 @@ public function updateQty(
             'id_customization' => $id_customization,
             'quantity' => $quantity,
             'operator' => $operator,
-            'id_address_delivery' => $id_address_delivery,
+            'id_address_delivery' => (int) $this->id_address_delivery,
             'shop' => $shop,
             'auto_add_cart_rule' => $auto_add_cart_rule,
         ];
@@ -1520,7 +1478,7 @@ public function updateQty(
         Hook::exec('actionCartUpdateQuantityBefore', $data);
 
         if ((int) $quantity <= 0) {
-            return $this->deleteProduct($id_product, $id_product_attribute, (int) $id_customization, (int) $id_address_delivery, $preserveGiftRemoval, $useOrderPrices);
+            return $this->deleteProduct($id_product, $id_product_attribute, (int) $id_customization, 0, $preserveGiftRemoval, $useOrderPrices);
         }
 
         if (!$product->available_for_order
@@ -1536,8 +1494,7 @@ public function updateQty(
         $cartProductQuantity = $this->getProductQuantity(
             $id_product,
             $id_product_attribute,
-            (int) $id_customization,
-            (int) $id_address_delivery
+            (int) $id_customization
         );
 
         /* Update quantity if product already exist */
@@ -1563,7 +1520,7 @@ public function updateQty(
                 if ($cartFirstLevelProductQuantity['quantity'] <= 1
                     || $cartProductQuantity['quantity'] - $quantity <= 0
                 ) {
-                    return $this->deleteProduct((int) $id_product, (int) $id_product_attribute, (int) $id_customization, (int) $id_address_delivery, $preserveGiftRemoval, $useOrderPrices);
+                    return $this->deleteProduct((int) $id_product, (int) $id_product_attribute, (int) $id_customization, 0, $preserveGiftRemoval, $useOrderPrices);
                 }
             } else {
                 return false;
@@ -1575,7 +1532,7 @@ public function updateQty(
                     WHERE `id_product` = ' . (int) $id_product .
                 ' AND `id_customization` = ' . (int) $id_customization .
                 (!empty($id_product_attribute) ? ' AND `id_product_attribute` = ' . (int) $id_product_attribute : '') . '
-                    AND `id_cart` = ' . (int) $this->id . (Configuration::get('PS_ALLOW_MULTISHIPPING') && $this->isMultiAddressDelivery() ? ' AND `id_address_delivery` = ' . (int) $id_address_delivery : '') . '
+                    AND `id_cart` = ' . (int) $this->id . '
                     LIMIT 1'
             );
         } elseif ($operator == 'up') {
@@ -1607,7 +1564,7 @@ public function updateQty(
                 'id_product' => (int) $id_product,
                 'id_product_attribute' => (int) $id_product_attribute,
                 'id_cart' => (int) $this->id,
-                'id_address_delivery' => (int) $id_address_delivery,
+                'id_address_delivery' => 0,
                 'id_shop' => $shop->id,
                 'quantity' => (int) $quantity,
                 'date_add' => date('Y-m-d H:i:s'),
@@ -1617,7 +1574,7 @@ public function updateQty(
             if ((int) $id_customization) {
                 $result_add &= Db::getInstance()->update('customization', [
                     'id_product_attribute' => $id_product_attribute,
-                    'id_address_delivery' => $id_address_delivery,
+                    'id_address_delivery' => 0,
                     'in_cart' => 1,
                 ], '`id_customization` = ' . $id_customization);
             }
@@ -1643,7 +1600,8 @@ public function updateQty(
     }
 
     /**
-     * Add customization item to database.
+     * Add customized data to database. If a customization already exists for the given data, it the given field will be
+     * replaced in the customization.
      *
      * @param int $id_product Product ID
      * @param int $id_product_attribute ProductAttribute ID
@@ -1657,6 +1615,7 @@ public function updateQty(
      */
     public function _addCustomization($id_product, $id_product_attribute, $index, $type, $value, $quantity, $returnId = false)
     {
+        // Check if there already is a customization for this cart, but not added to cart
         $exising_customization = Db::getInstance()->executeS(
             'SELECT cu.`id_customization`, cd.`index`, cd.`value`, cd.`type` FROM `' . _DB_PREFIX_ . 'customization` cu
             LEFT JOIN `' . _DB_PREFIX_ . 'customized_data` cd
@@ -1666,6 +1625,9 @@ public function _addCustomization($id_product, $id_product_attribute, $index, $t
             AND in_cart = 0'
         );
 
+        // If we find some, we check if the field we are adding is already in the customizations
+        // If it is, we will remove it
+        // We will also get the customization ID so we can assign it correctly
         if ($exising_customization) {
             // If the customization field is alreay filled, delete it
             foreach ($exising_customization as $customization) {
@@ -1685,6 +1647,7 @@ public function _addCustomization($id_product, $id_product_attribute, $index, $t
             }
             $id_customization = $exising_customization[0]['id_customization'];
         } else {
+            // Otherwise, insert new customization entry
             Db::getInstance()->execute(
                 'INSERT INTO `' . _DB_PREFIX_ . 'customization` (`id_cart`, `id_product`, `id_product_attribute`)
                 VALUES (' . (int) $this->id . ', ' . (int) $id_product . ', ' . (int) $id_product_attribute . ')'
@@ -1692,6 +1655,7 @@ public function _addCustomization($id_product, $id_product_attribute, $index, $t
             $id_customization = Db::getInstance()->Insert_ID();
         }
 
+        // And finally, insert the customized field
         $query = 'INSERT INTO `' . _DB_PREFIX_ . 'customized_data` (`id_customization`, `type`, `index`, `value`)
             VALUES (' . (int) $id_customization . ', ' . (int) $type . ', ' . (int) $index . ', \'' . pSQL($value) . '\')';
 
@@ -1699,15 +1663,11 @@ public function _addCustomization($id_product, $id_product_attribute, $index, $t
             return false;
         }
 
-        if (true === $returnId) {
-            return (int) $id_customization;
-        }
-
-        return true;
+        return $returnId ? (int) $id_customization : true;
     }
 
     /**
-     * Check if order has already been placed.
+     * Check if order has already been placed for this cart. Usually used to check if we can delete this cart.
      *
      * @return bool Indicates if the Order exists
      */
@@ -1755,7 +1715,7 @@ public function removeCartRule($id_cart_rule, bool $useOrderPrices = false)
      * @param int $id_product Product ID
      * @param int|null $id_product_attribute Attribute ID if needed
      * @param int $id_customization Customization id
-     * @param int $id_address_delivery Delivery Address id
+     * @param int $id_address_delivery Delivery Address id - unused
      * @param bool $preserveGiftsRemoval If true gift are not removed so product is still in cart
      * @param bool $useOrderPrices If true, will use order prices to re-calculate cartRules after the product is deleted
      *
@@ -1778,7 +1738,7 @@ public function deleteProduct(
         }
 
         if ((int) $id_customization) {
-            if (!$this->_deleteCustomization((int) $id_customization, (int) $id_product, (int) $id_product_attribute, (int) $id_address_delivery)) {
+            if (!$this->_deleteCustomization((int) $id_customization)) {
                 return false;
             }
         }
@@ -1817,8 +1777,7 @@ public function deleteProduct(
         WHERE `id_product` = ' . (int) $id_product . '
         AND `id_customization` = ' . (int) $id_customization .
             (null !== $id_product_attribute ? ' AND `id_product_attribute` = ' . (int) $id_product_attribute : '') . '
-        AND `id_cart` = ' . (int) $this->id . '
-        ' . ((int) $id_address_delivery ? 'AND `id_address_delivery` = ' . (int) $id_address_delivery : ''));
+        AND `id_cart` = ' . (int) $this->id);
 
         if ($result) {
             $return = $this->update();
@@ -1864,30 +1823,28 @@ protected function getProductsGifts($id_product, $id_product_attribute)
     }
 
     /**
-     * Delete a Customization from the Cart. If the Customization is a Picture,
+     * Delete a complete customization from the Cart. If the Customization is a Picture,
      * then the Image is also deleted.
      *
      * @param int $id_customization Customization Id
-     * @param int|null $id_product Unused
-     * @param int|null $id_product_attribute Unused
-     * @param int|null $id_address_delivery Unused
      *
      * @return bool Indicates if the Customization was successfully deleted
-     * @todo: Remove unused parameters
      */
-    protected function _deleteCustomization($id_customization, $id_product, $id_product_attribute, $id_address_delivery = 0)
+    protected function _deleteCustomization($id_customization)
     {
         $result = true;
+        // Try to find the given customization
         $customization = Db::getInstance()->getRow('SELECT *
             FROM `' . _DB_PREFIX_ . 'customization`
             WHERE `id_customization` = ' . (int) $id_customization);
 
         if ($customization) {
+            // If found, let's delete all customized fields for the given customization
             $cust_data = Db::getInstance()->getRow('SELECT *
                 FROM `' . _DB_PREFIX_ . 'customized_data`
                 WHERE `id_customization` = ' . (int) $id_customization);
 
-            // Delete customization picture if necessary
+            // Delete customization physical file if necessary
             if (isset($cust_data['type']) && $cust_data['type'] == Product::CUSTOMIZE_FILE) {
                 $result &= file_exists(_PS_UPLOAD_DIR_ . $cust_data['value']) ? @unlink(_PS_UPLOAD_DIR_ . $cust_data['value']) : true;
                 $result &= file_exists(_PS_UPLOAD_DIR_ . $cust_data['value'] . '_small') ? @unlink(_PS_UPLOAD_DIR_ . $cust_data['value'] . '_small') : true;
@@ -1902,6 +1859,7 @@ protected function _deleteCustomization($id_customization, $id_product, $id_prod
                 return false;
             }
 
+            // And finally delete the customization itself
             return Db::getInstance()->execute(
                 'DELETE FROM `' . _DB_PREFIX_ . 'customization`
                 WHERE `id_customization` = ' . (int) $id_customization
@@ -2206,13 +2164,13 @@ protected function countProductLines($products)
     }
 
     /**
-     * @param array $products
+     * @param array $products - not used anymore
      *
      * @return int
      */
-    protected function getDeliveryAddressId($products)
+    protected function getDeliveryAddressId($products = null)
     {
-        return $products[0]['id_address_delivery'] ?? $this->id_address_delivery;
+        return $this->id_address_delivery;
     }
 
     /**
@@ -2257,7 +2215,7 @@ protected function findTaxRulesGroupId($withTaxes, $product, $virtualContext)
         if ($withTaxes) {
             $taxRulesGroupId = Product::getIdTaxRulesGroupByIdProduct((int) $product['id_product'], $virtualContext);
 
-            $addressId = $this->getProductAddressId($product);
+            $addressId = $this->getProductAddressId();
             $address = $this->addressFactory->findOrCreate($addressId, true);
 
             // Refresh cache and execute tax manager factory hook
@@ -2270,17 +2228,17 @@ protected function findTaxRulesGroupId($withTaxes, $product, $virtualContext)
     }
 
     /**
-     * @param array $product
+     * @param array $product - not used anymore
      *
      * @return int|null
      */
-    public function getProductAddressId($product)
+    public function getProductAddressId($product = null)
     {
         $taxAddressType = $this->configuration->get('PS_TAX_ADDRESS_TYPE');
         if ($taxAddressType == 'id_address_invoice') {
             $addressId = (int) $this->id_address_invoice;
         } else {
-            $addressId = (int) $product['id_address_delivery'];
+            $addressId = (int) $this->id_address_delivery;
         }
 
         // Get delivery address of the product from the cart
@@ -2436,27 +2394,20 @@ public function getPackageList($flush = false)
         $product_list = $this->getProducts($flush);
 
         // Step 1 - We assign some basic information (load their carriers) to products and separate them by their stock quantities.
-        $grouped_by_stock = [];
+        $grouped_by_stock = [
+            'in_stock' => [],
+            'out_of_stock' => [],
+        ];
 
         foreach ($product_list as &$product) {
-            // Add cart's delivery address to products that don't have it for some reason
-            if ((int) $product['id_address_delivery'] == 0) {
-                $product['id_address_delivery'] = (int) $this->id_address_delivery;
-            }
-
-            // Initialize our array if it's the first product going to that address
-            if (!isset($grouped_by_stock[$product['id_address_delivery']])) {
-                $grouped_by_stock[$product['id_address_delivery']] = [
-                    'in_stock' => [],
-                    'out_of_stock' => [],
-                ];
-            }
+            // Assign delivery address if missing, for compatibility
+            $product['id_address_delivery'] = (int) $this->id_address_delivery;
 
             // Get product's carriers - the product can have some specific limitations
             $product['carrier_list'] = Carrier::getAvailableCarrierList(
                 new Product($product['id_product']),
                 0,
-                $product['id_address_delivery'],
+                (int) $this->id_address_delivery,
                 null,
                 $this
             );
@@ -2479,42 +2430,35 @@ public function getPackageList($flush = false)
                     $product_bis['cart_quantity'] = $out_stock_part;
                     $product_bis['in_stock'] = 0;
                     $product['cart_quantity'] -= $out_stock_part;
-                    $grouped_by_stock[$product['id_address_delivery']]['out_of_stock'][] = $product_bis;
+                    $grouped_by_stock['out_of_stock'][] = $product_bis;
                 }
             }
 
-            $grouped_by_stock[$product['id_address_delivery']][$stockGroupKey][] = $product;
+            $grouped_by_stock[$stockGroupKey][] = $product;
         }
         unset($product);
         // Now we have them in two groups, those in stock and those not in stock.
 
         // Step 2 - We divide those two groups once more into groups by their carriers.
-        $grouped_by_carriers = [];
-        foreach ($grouped_by_stock as $id_address_delivery => $products_in_stock_list) {
-            // Initialize our array if it's the first product going to that address
-            if (!isset($grouped_by_carriers[$id_address_delivery])) {
-                $grouped_by_carriers[$id_address_delivery] = [
-                    'in_stock' => [],
-                    'out_of_stock' => [],
-                ];
-            }
-
-            foreach ($products_in_stock_list as $key => $product_list) {
-                foreach ($product_list as $product) {
-                    // We construct unique key by combining IDs of their carriers
-                    $package_carriers_key = implode(',', $product['carrier_list']);
-
-                    // Initialize our array if it's the first product with this combination of these carriers
-                    if (!isset($grouped_by_carriers[$id_address_delivery][$key][$package_carriers_key])) {
-                        $grouped_by_carriers[$id_address_delivery][$key][$package_carriers_key] = [
-                            'product_list' => [],
-                            'carrier_list' => $product['carrier_list'],
-                        ];
-                    }
-
-                    // Add this product to this carrier combination group
-                    $grouped_by_carriers[$id_address_delivery][$key][$package_carriers_key]['product_list'][] = $product;
+        $grouped_by_carriers = [
+            'in_stock' => [],
+            'out_of_stock' => [],
+        ];
+        foreach ($grouped_by_stock as $key => $product_list) {
+            foreach ($product_list as $product) {
+                // We construct unique key by combining IDs of their carriers
+                $package_carriers_key = implode(',', $product['carrier_list']);
+
+                // Initialize our array if it's the first product with this combination of these carriers
+                if (!isset($grouped_by_carriers[$key][$package_carriers_key])) {
+                    $grouped_by_carriers[$key][$package_carriers_key] = [
+                        'product_list' => [],
+                        'carrier_list' => $product['carrier_list'],
+                    ];
                 }
+
+                // Add this product to this carrier combination group
+                $grouped_by_carriers[$key][$package_carriers_key]['product_list'][] = $product;
             }
         }
         // Now we have them in two groups, those in stock and those not in stock, then grouped by their common carriers.
@@ -2526,46 +2470,41 @@ public function getPackageList($flush = false)
          * Product B can be sent with carriers A and C
          * Resulting package will be 1 with carrier A
          */
-        $package_list = [];
-        foreach ($grouped_by_carriers as $id_address_delivery => $products_in_stock_list) {
-            // Initialize our array if it's the first product going to that address
-            if (!isset($package_list[$id_address_delivery])) {
-                $package_list[$id_address_delivery] = [
-                    'in_stock' => [],
-                    'out_of_stock' => [],
-                ];
-            }
+        $package_list = [
+            'in_stock' => [],
+            'out_of_stock' => [],
+        ];
 
-            // Count occurance of each carriers to minimize the number of packages
-            $carrier_count = [];
-            foreach ($products_in_stock_list as $key => $products_grouped_by_carriers) {
-                foreach ($products_grouped_by_carriers as $data) {
-                    foreach ($data['carrier_list'] as $id_carrier) {
-                        if (!isset($carrier_count[$id_carrier])) {
-                            $carrier_count[$id_carrier] = 0;
-                        }
-                        ++$carrier_count[$id_carrier];
+        // Count occurance of each carriers to minimize the number of packages
+        $carrier_count = [];
+        foreach ($grouped_by_carriers as $key => $products_grouped_by_carriers) {
+            foreach ($products_grouped_by_carriers as $data) {
+                foreach ($data['carrier_list'] as $id_carrier) {
+                    if (!isset($carrier_count[$id_carrier])) {
+                        $carrier_count[$id_carrier] = 0;
                     }
+                    ++$carrier_count[$id_carrier];
                 }
             }
-            arsort($carrier_count);
-            foreach ($products_in_stock_list as $key => $products_grouped_by_carriers) {
-                foreach ($products_grouped_by_carriers as $data) {
-                    foreach ($carrier_count as $id_carrier => $rate) {
-                        if (array_key_exists($id_carrier, $data['carrier_list'])) {
-                            if (!isset($package_list[$id_address_delivery][$key][$id_carrier])) {
-                                $package_list[$id_address_delivery][$key][$id_carrier] = [
-                                    'carrier_list' => $data['carrier_list'],
-                                    'product_list' => [],
-                                ];
-                            }
-                            $package_list[$id_address_delivery][$key][$id_carrier]['carrier_list'] =
-                                array_intersect($package_list[$id_address_delivery][$key][$id_carrier]['carrier_list'], $data['carrier_list']);
-                            $package_list[$id_address_delivery][$key][$id_carrier]['product_list'] =
-                                array_merge($package_list[$id_address_delivery][$key][$id_carrier]['product_list'], $data['product_list']);
-
-                            break;
+        }
+        arsort($carrier_count);
+
+        foreach ($grouped_by_carriers as $key => $products_grouped_by_carriers) {
+            foreach ($products_grouped_by_carriers as $data) {
+                foreach ($carrier_count as $id_carrier => $rate) {
+                    if (array_key_exists($id_carrier, $data['carrier_list'])) {
+                        if (!isset($package_list[$key][$id_carrier])) {
+                            $package_list[$key][$id_carrier] = [
+                                'carrier_list' => $data['carrier_list'],
+                                'product_list' => [],
+                            ];
                         }
+                        $package_list[$key][$id_carrier]['carrier_list'] =
+                            array_intersect($package_list[$key][$id_carrier]['carrier_list'], $data['carrier_list']);
+                        $package_list[$key][$id_carrier]['product_list'] =
+                            array_merge($package_list[$key][$id_carrier]['product_list'], $data['product_list']);
+
+                        break;
                     }
                 }
             }
@@ -2573,21 +2512,14 @@ public function getPackageList($flush = false)
 
         // Step 4 - Reduce depth of $package_list
         $final_package_list = [];
-        foreach ($package_list as $id_address_delivery => $products_in_stock_list) {
-            // Initialize our array if it's the first product going to that address
-            if (!isset($final_package_list[$id_address_delivery])) {
-                $final_package_list[$id_address_delivery] = [];
-            }
-
-            foreach ($products_in_stock_list as $products_grouped_by_carriers) {
-                foreach ($products_grouped_by_carriers as $data) {
-                    $final_package_list[$id_address_delivery][] = [
-                        'product_list' => $data['product_list'],
-                        'carrier_list' => $data['carrier_list'],
-                        'warehouse_list' => [0 => 0], // For backward compatibility - not used
-                        'id_warehouse' => 0, // For backward compatibility - not used
-                    ];
-                }
+        foreach ($package_list as $products_grouped_by_carriers) {
+            foreach ($products_grouped_by_carriers as $data) {
+                $final_package_list[(int) $this->id_address_delivery][] = [
+                    'product_list' => $data['product_list'],
+                    'carrier_list' => $data['carrier_list'],
+                    'warehouse_list' => [0 => 0], // For backward compatibility - not used
+                    'id_warehouse' => 0, // For backward compatibility - not used
+                ];
             }
         }
 
@@ -3039,47 +2971,36 @@ public static function desintifier($int, $delimiter = ',')
      * Does the Cart use multiple Addresses?
      *
      * @return bool Indicates if the Cart uses multiple Addresses
+     *
+     * @deprecated Since 9.0 and will be removed in 10.0
      */
     public function isMultiAddressDelivery()
     {
-        if (!isset(static::$cacheMultiAddressDelivery[$this->id])) {
-            $sql = new DbQuery();
-            $sql->select('count(distinct id_address_delivery)');
-            $sql->from('cart_product', 'cp');
-            $sql->where('id_cart = ' . (int) $this->id);
-            static::$cacheMultiAddressDelivery[$this->id] = Db::getInstance()->getValue($sql) > 1;
-        }
+        @trigger_error(sprintf(
+            '%s is deprecated since 9.0 and will be removed in 10.0.',
+            __METHOD__
+        ), E_USER_DEPRECATED);
 
-        return static::$cacheMultiAddressDelivery[$this->id];
+        return false;
     }
 
     /**
      * Get all delivery Addresses object for the current Cart.
+     *
+     * @deprecated Since 9.0 and will be removed in 10.0
      */
     public function getAddressCollection()
     {
-        $collection = [];
-        $cache_id = 'Cart::getAddressCollection' . (int) $this->id;
-        if (!Cache::isStored($cache_id)) {
-            $result = Db::getInstance()->executeS(
-                'SELECT DISTINCT `id_address_delivery`
-                FROM `' . _DB_PREFIX_ . 'cart_product`
-                WHERE id_cart = ' . (int) $this->id
-            );
-            Cache::store($cache_id, $result);
-        } else {
-            $result = Cache::retrieve($cache_id);
-        }
-
-        $result[] = ['id_address_delivery' => (int) $this->id_address_delivery];
+        @trigger_error(sprintf(
+            '%s is deprecated since 9.0 and will be removed in 10.0.',
+            __METHOD__
+        ), E_USER_DEPRECATED);
 
-        foreach ($result as $row) {
-            if ((int) $row['id_address_delivery'] != 0) {
-                $collection[(int) $row['id_address_delivery']] = new Address((int) $row['id_address_delivery']);
-            }
+        if ((int) $this->id_address_delivery != 0) {
+            return [(int) $this->id_address_delivery => new Address((int) $this->id_address_delivery)];
         }
 
-        return $collection;
+        return [];
     }
 
     /**
@@ -3377,11 +3298,8 @@ protected function getPackageShippingCostValue(
 
         if (Configuration::get('PS_TAX_ADDRESS_TYPE') == 'id_address_invoice') {
             $address_id = (int) $this->id_address_invoice;
-        } elseif (is_array($product_list) && count($product_list)) {
-            $prod = current($product_list);
-            $address_id = (int) $prod['id_address_delivery'];
         } else {
-            $address_id = null;
+            $address_id = (int) $this->id_address_delivery;
         }
         if (!Address::addressExists($address_id, true)) {
             $address_id = null;
@@ -3416,8 +3334,7 @@ protected function getPackageShippingCostValue(
 
         if (!isset($id_zone)) {
             // Get id zone
-            if (!$this->isMultiAddressDelivery()
-                && isset($this->id_address_delivery) // Be careful, id_address_delivery is not useful one 1.5
+            if (isset($this->id_address_delivery)
                 && $this->id_address_delivery
                 && Customer::customerHasAddress($this->id_customer, $this->id_address_delivery)
             ) {
@@ -3705,12 +3622,15 @@ public function getTotalWeight($products = null)
     }
 
     /**
+     * Calculates and caches total weight for all products in cart with given ID.
+     *
      * @param int $productId
      */
     protected function updateProductWeight($productId)
     {
         $productId = (int) $productId;
 
+        // First, products with combinations
         if (Combination::isFeatureActive()) {
             $weight_product_with_attribute = Db::getInstance()->getValue('
                 SELECT SUM((p.`weight` + pa.`weight`) * cp.`quantity`) as nb
@@ -3724,6 +3644,7 @@ protected function updateProductWeight($productId)
             $weight_product_with_attribute = 0;
         }
 
+        // Then the regular product
         $weight_product_without_attribute = Db::getInstance()->getValue('
             SELECT SUM(p.`weight` * cp.`quantity`) as nb
             FROM `' . _DB_PREFIX_ . 'cart_product` cp
@@ -3731,6 +3652,7 @@ protected function updateProductWeight($productId)
             WHERE (cp.`id_product_attribute` IS NULL OR cp.`id_product_attribute` = 0)
             AND cp.`id_cart` = ' . $productId);
 
+        // Finally, we need to add all customizations, because they can also add some weight
         $weight_cart_customizations = Db::getInstance()->getValue('
             SELECT SUM(cd.`weight` * c.`quantity`) FROM `' . _DB_PREFIX_ . 'customization` c
             LEFT JOIN `' . _DB_PREFIX_ . 'customized_data` cd ON (c.`id_customization` = cd.`id_customization`)
@@ -3837,8 +3759,8 @@ public function getRawSummaryDetails(int $id_lang, bool $refresh = false): array
             'total_price' => $base_total_tax_inc,
             'total_tax' => $total_tax,
             'total_price_without_tax' => $base_total_tax_exc,
-            'is_multi_address_delivery' => $this->isMultiAddressDelivery() || ((int) Tools::getValue('multi-shipping') == 1),
-            'free_ship' => !$total_shipping && !count($this->getDeliveryAddressesWithoutCarriers(true, $errors)),
+            'is_multi_address_delivery' => false,
+            'free_ship' => !$total_shipping,
             'carrier' => new Carrier($this->id_carrier, $id_lang),
         ];
 
@@ -4089,7 +4011,7 @@ public function addPictureToProduct($id_product, $index, $type, $file, $returnCu
     }
 
     /**
-     * Remove a customer's customization.
+     * Deletes a customization field. Only for customizations not added to cart yet.
      *
      * @param int $id_product Product ID
      * @param int $index Customization field identifier as id_customization_field in table customization_field
@@ -4098,6 +4020,7 @@ public function addPictureToProduct($id_product, $index, $type, $file, $returnCu
      */
     public function deleteCustomizationToProduct($id_product, $index)
     {
+        // Try to find a customization for our cart, the given product, customization field that hasn't been added to cart yet
         $cust_data = Db::getInstance()->getRow(
             'SELECT cu.`id_customization`, cd.`index`, cd.`value`, cd.`type` FROM `' . _DB_PREFIX_ . 'customization` cu
             LEFT JOIN `' . _DB_PREFIX_ . 'customized_data` cd
@@ -4120,17 +4043,20 @@ public function deleteCustomizationToProduct($id_product, $index)
             $result = !($result && file_exists(_PS_UPLOAD_DIR_ . $cust_data['value'] . '_small')) || @unlink(_PS_UPLOAD_DIR_ . $cust_data['value'] . '_small');
         }
 
+        // Delete the field that was requested for removal
         $result = $result && Db::getInstance()->execute(
             'DELETE FROM `' . _DB_PREFIX_ . 'customized_data`
             WHERE `id_customization` = ' . (int) $cust_data['id_customization'] . '
             AND `index` = ' . (int) $index
         );
 
+        // And check if there are any more remaining fields for that customization
         $hasRemainingCustomData = Db::getInstance()->getValue(
             'SELECT 1 FROM `' . _DB_PREFIX_ . 'customized_data`
             WHERE `id_customization` = ' . (int) $cust_data['id_customization']
         );
 
+        // If not, we will delete the whole customization, it will create a new one when customer customizes the product again
         if (!$hasRemainingCustomData) {
             $result = $result && Db::getInstance()->execute(
                 'DELETE FROM `' . _DB_PREFIX_ . 'customization`
@@ -4142,11 +4068,11 @@ public function deleteCustomizationToProduct($id_product, $index)
     }
 
     /**
-     * Return custom pictures in this cart for a specified product.
+     * Return customizations in this cart for a specified product.
      *
      * @param int $id_product Product ID
      * @param int|null $type Only return customization of this type, can be Product::CUSTOMIZE_FILE or Product::CUSTOMIZE_TEXTFIELD
-     * @param bool $not_in_cart Only return customizations that are not in the cart already
+     * @param bool $not_in_cart Only return customizations that are not in the cart already.
      *
      * @return array Result from DB
      */
@@ -4156,7 +4082,8 @@ public function getProductCustomization($id_product, $type = null, $not_in_cart
             return [];
         }
 
-        // if cart is not set, return nothing to prevent loading of other users data.
+        // If cart is not set, return nothing to prevent loading of other users data.
+        // There should never be a customization with zero id_cart, but just to be sure.
         if (0 === (int) $this->id) {
             return [];
         }
@@ -4236,8 +4163,6 @@ public function duplicate()
             $product_gift = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('SELECT cr.`gift_product`, cr.`gift_product_attribute` FROM `' . _DB_PREFIX_ . 'cart_rule` cr LEFT JOIN `' . _DB_PREFIX_ . 'order_cart_rule` ocr ON (ocr.`id_order` = ' . (int) $orderId . ') WHERE ocr.`deleted` = 0 AND ocr.`id_cart_rule` = cr.`id_cart_rule`');
         }
 
-        $id_address_delivery = Configuration::get('PS_ALLOW_MULTISHIPPING') ? $cart->id_address_delivery : 0;
-
         // Customized products: duplicate customizations before products so that we get new id_customizations
         $customs = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(
             'SELECT *
@@ -4262,7 +4187,7 @@ public function duplicate()
         foreach ($customs_by_id as $customization_id => $val) {
             Db::getInstance()->execute(
                 'INSERT INTO `' . _DB_PREFIX_ . 'customization` (id_cart, id_product_attribute, id_product, `id_address_delivery`, `in_cart`)
-                VALUES(' . (int) $cart->id . ', ' . (int) $val['id_product_attribute'] . ', ' . (int) $val['id_product'] . ', ' . (int) $id_address_delivery . ', 1)'
+                VALUES(' . (int) $cart->id . ', ' . (int) $val['id_product_attribute'] . ', ' . (int) $val['id_product'] . ', 0, 1)'
             );
             $custom_ids[$customization_id] = Db::getInstance(_PS_USE_SQL_SLAVE_)->Insert_ID();
         }
@@ -4294,12 +4219,6 @@ public function duplicate()
         }
 
         foreach ($products as $product) {
-            if ($id_address_delivery) {
-                if (Customer::customerHasAddress((int) $cart->id_customer, $product['id_address_delivery'])) {
-                    $id_address_delivery = $product['id_address_delivery'];
-                }
-            }
-
             foreach ($product_gift as $gift) {
                 if (isset($gift['gift_product'], $gift['gift_product_attribute']) && (int) $gift['gift_product'] == (int) $product['id_product'] && (int) $gift['gift_product_attribute'] == (int) $product['id_product_attribute']) {
                     $product['quantity'] = (int) $product['quantity'] - 1;
@@ -4314,7 +4233,7 @@ public function duplicate()
                 (int) $product['id_product_attribute'],
                 isset($custom_ids[$id_customization]) ? (int) $custom_ids[$id_customization] : 0,
                 'up',
-                (int) $id_address_delivery,
+                0,
                 new Shop((int) $cart->id_shop),
                 false,
                 false
@@ -4354,7 +4273,7 @@ public function setWsCartRows($values)
             foreach ($values as $value) {
                 $query .= '(' . (int) $this->id . ', ' . (int) $value['id_product'] . ', ' .
                     (isset($value['id_product_attribute']) ? (int) $value['id_product_attribute'] : 'NULL') . ', ' .
-                    (isset($value['id_address_delivery']) ? (int) $value['id_address_delivery'] : 0) . ', ' .
+                    '0, ' .
                     (isset($value['id_customization']) ? (int) $value['id_customization'] : 0) . ', ' .
                     (int) $value['quantity'] . ', NOW(), ' . (int) Context::getContext()->shop->id . '),';
             }
@@ -4374,70 +4293,15 @@ public function setWsCartRows($values)
      * @param int $new_id_address_delivery New delivery Address ID
      *
      * @return bool Whether the delivery Address of the product in the Cart has been successfully updated
+     *
+     * @deprecated Since 9.0 and will be removed in 10.0
      */
     public function setProductAddressDelivery($id_product, $id_product_attribute, $old_id_address_delivery, $new_id_address_delivery)
     {
-        // Check address is linked with the customer
-        if (!Customer::customerHasAddress(Context::getContext()->customer->id, $new_id_address_delivery)) {
-            return false;
-        }
-
-        if ($new_id_address_delivery == $old_id_address_delivery) {
-            return false;
-        }
-
-        // Checking if the product with the old address delivery exists
-        $sql = new DbQuery();
-        $sql->select('count(*)');
-        $sql->from('cart_product', 'cp');
-        $sql->where('id_product = ' . (int) $id_product);
-        $sql->where('id_product_attribute = ' . (int) $id_product_attribute);
-        $sql->where('id_address_delivery = ' . (int) $old_id_address_delivery);
-        $sql->where('id_cart = ' . (int) $this->id);
-        $result = Db::getInstance()->getValue($sql);
-
-        if ($result == 0) {
-            return false;
-        }
-
-        // Checking if there is no others similar products with this new address delivery
-        $sql = new DbQuery();
-        $sql->select('sum(quantity) as qty');
-        $sql->from('cart_product', 'cp');
-        $sql->where('id_product = ' . (int) $id_product);
-        $sql->where('id_product_attribute = ' . (int) $id_product_attribute);
-        $sql->where('id_address_delivery = ' . (int) $new_id_address_delivery);
-        $sql->where('id_cart = ' . (int) $this->id);
-        $result = Db::getInstance()->getValue($sql);
-
-        // Removing similar products with this new address delivery
-        $sql = 'DELETE FROM ' . _DB_PREFIX_ . 'cart_product
-            WHERE id_product = ' . (int) $id_product . '
-            AND id_product_attribute = ' . (int) $id_product_attribute . '
-            AND id_address_delivery = ' . (int) $new_id_address_delivery . '
-            AND id_cart = ' . (int) $this->id . '
-            LIMIT 1';
-        Db::getInstance()->execute($sql);
-
-        // Changing the address
-        $sql = 'UPDATE ' . _DB_PREFIX_ . 'cart_product
-            SET `id_address_delivery` = ' . (int) $new_id_address_delivery . ',
-            `quantity` = `quantity` + ' . (int) $result . '
-            WHERE id_product = ' . (int) $id_product . '
-            AND id_product_attribute = ' . (int) $id_product_attribute . '
-            AND id_address_delivery = ' . (int) $old_id_address_delivery . '
-            AND id_cart = ' . (int) $this->id . '
-            LIMIT 1';
-        Db::getInstance()->execute($sql);
-
-        // Changing the address of the customizations
-        $sql = 'UPDATE ' . _DB_PREFIX_ . 'customization
-            SET `id_address_delivery` = ' . (int) $new_id_address_delivery . '
-            WHERE id_product = ' . (int) $id_product . '
-            AND id_product_attribute = ' . (int) $id_product_attribute . '
-            AND id_address_delivery = ' . (int) $old_id_address_delivery . '
-            AND id_cart = ' . (int) $this->id;
-        Db::getInstance()->execute($sql);
+        @trigger_error(sprintf(
+            '%s is deprecated since 9.0 and will be removed in 10.0.',
+            __METHOD__
+        ), E_USER_DEPRECATED);
 
         return true;
     }
@@ -4467,6 +4331,8 @@ public function setProductCustomizedDatas(&$product, $customized_datas)
      * @param bool $keep_quantity Keep the quantity, do not reset if true
      *
      * @return bool Whether the product has been successfully duplicated
+     *
+     * @deprecated Since 9.0 and will be removed in 10.0, product cannot be in the cart twice.
      */
     public function duplicateProduct(
         $id_product,
@@ -4476,219 +4342,42 @@ public function duplicateProduct(
         $quantity = 1,
         $keep_quantity = false
     ) {
-        // Check address is linked with the customer
-        if (!Customer::customerHasAddress(Context::getContext()->customer->id, $new_id_address_delivery)) {
-            return false;
-        }
-
-        // Checking the product do not exist with the new address
-        $sql = new DbQuery();
-        $sql->select('count(*)');
-        $sql->from('cart_product', 'c');
-        $sql->where('id_product = ' . (int) $id_product);
-        $sql->where('id_product_attribute = ' . (int) $id_product_attribute);
-        $sql->where('id_address_delivery = ' . (int) $new_id_address_delivery);
-        $sql->where('id_cart = ' . (int) $this->id);
-        $result = Db::getInstance()->getValue($sql);
-
-        if ($result > 0) {
-            return false;
-        }
-
-        // Duplicating cart_product line
-        $sql = 'INSERT INTO ' . _DB_PREFIX_ . 'cart_product
-            (`id_cart`, `id_product`, `id_shop`, `id_product_attribute`, `quantity`, `date_add`, `id_address_delivery`)
-            values(
-                ' . (int) $this->id . ',
-                ' . (int) $id_product . ',
-                ' . (int) $this->id_shop . ',
-                ' . (int) $id_product_attribute . ',
-                ' . (int) $quantity . ',
-                NOW(),
-                ' . (int) $new_id_address_delivery . ')';
-
-        Db::getInstance()->execute($sql);
-
-        if (!$keep_quantity) {
-            $sql = new DbQuery();
-            $sql->select('quantity');
-            $sql->from('cart_product', 'c');
-            $sql->where('id_product = ' . (int) $id_product);
-            $sql->where('id_product_attribute = ' . (int) $id_product_attribute);
-            $sql->where('id_address_delivery = ' . (int) $id_address_delivery);
-            $sql->where('id_cart = ' . (int) $this->id);
-            $duplicatedQuantity = Db::getInstance()->getValue($sql);
-
-            if ($duplicatedQuantity > $quantity) {
-                $sql = 'UPDATE ' . _DB_PREFIX_ . 'cart_product
-                    SET `quantity` = `quantity` - ' . (int) $quantity . '
-                    WHERE id_cart = ' . (int) $this->id . '
-                    AND id_product = ' . (int) $id_product . '
-                    AND id_shop = ' . (int) $this->id_shop . '
-                    AND id_product_attribute = ' . (int) $id_product_attribute . '
-                    AND id_address_delivery = ' . (int) $id_address_delivery;
-                Db::getInstance()->execute($sql);
-            }
-        }
-
-        // Checking if there is customizations
-        $sql = new DbQuery();
-        $sql->select('*');
-        $sql->from('customization', 'c');
-        $sql->where('id_product = ' . (int) $id_product);
-        $sql->where('id_product_attribute = ' . (int) $id_product_attribute);
-        $sql->where('id_address_delivery = ' . (int) $id_address_delivery);
-        $sql->where('id_cart = ' . (int) $this->id);
-        $results = Db::getInstance()->executeS($sql);
-
-        foreach ($results as $customization) {
-            // Duplicate customization
-            $sql = 'INSERT INTO ' . _DB_PREFIX_ . 'customization
-                (`id_product_attribute`, `id_address_delivery`, `id_cart`, `id_product`, `quantity`, `in_cart`)
-                VALUES (
-                    ' . (int) $customization['id_product_attribute'] . ',
-                    ' . (int) $new_id_address_delivery . ',
-                    ' . (int) $customization['id_cart'] . ',
-                    ' . (int) $customization['id_product'] . ',
-                    ' . (int) $quantity . ',
-                    ' . (int) $customization['in_cart'] . ')';
-
-            Db::getInstance()->execute($sql);
-
-            // Save last insert ID before doing another query
-            $last_id = (int) Db::getInstance()->Insert_ID();
-
-            // Get data from duplicated customizations
-            $sql = new DbQuery();
-            $sql->select('`type`, `index`, `value`');
-            $sql->from('customized_data');
-            $sql->where('id_customization = ' . $customization['id_customization']);
-            $last_row = Db::getInstance()->getRow($sql);
-
-            // Insert new copied data with new customization ID into customized_data table
-            $last_row['id_customization'] = $last_id;
-            Db::getInstance()->insert('customized_data', $last_row);
-        }
-
-        $customization_count = count($results);
-        if ($customization_count > 0) {
-            $sql = 'UPDATE ' . _DB_PREFIX_ . 'cart_product
-                SET `quantity` = `quantity` + ' . (int) $customization_count * $quantity . '
-                WHERE id_cart = ' . (int) $this->id . '
-                AND id_product = ' . (int) $id_product . '
-                AND id_shop = ' . (int) $this->id_shop . '
-                AND id_product_attribute = ' . (int) $id_product_attribute . '
-                AND id_address_delivery = ' . (int) $new_id_address_delivery;
-            Db::getInstance()->execute($sql);
-        }
+        @trigger_error(sprintf(
+            '%s is deprecated since 9.0 and will be removed in 10.0.',
+            __METHOD__
+        ), E_USER_DEPRECATED);
 
-        return true;
+        return false;
     }
 
     /**
      * Update products cart address delivery with the address delivery of the cart.
+     *
+     * @deprecated Since 9.0 and will be removed in 10.0
      */
     public function setNoMultishipping()
     {
-        $emptyCache = false;
-        if (Configuration::get('PS_ALLOW_MULTISHIPPING')) {
-            // Upgrading quantities
-            $sql = 'SELECT sum(`quantity`) as quantity, id_product, id_product_attribute, count(*) as count
-                    FROM `' . _DB_PREFIX_ . 'cart_product`
-                    WHERE `id_cart` = ' . (int) $this->id . '
-                        AND `id_shop` = ' . (int) $this->id_shop . '
-                    GROUP BY id_product, id_product_attribute
-                    HAVING count > 1';
-
-            foreach (Db::getInstance()->executeS($sql) as $product) {
-                $sql = 'UPDATE `' . _DB_PREFIX_ . 'cart_product`
-                    SET `quantity` = ' . $product['quantity'] . '
-                    WHERE  `id_cart` = ' . (int) $this->id . '
-                        AND `id_shop` = ' . (int) $this->id_shop . '
-                        AND id_product = ' . $product['id_product'] . '
-                        AND id_product_attribute = ' . $product['id_product_attribute'];
-                if (Db::getInstance()->execute($sql)) {
-                    $emptyCache = true;
-                }
-            }
-
-            // Merging multiple lines
-            $sql = 'DELETE cp1
-                FROM `' . _DB_PREFIX_ . 'cart_product` cp1
-                    INNER JOIN `' . _DB_PREFIX_ . 'cart_product` cp2
-                    ON (
-                        (cp1.id_cart = cp2.id_cart)
-                        AND (cp1.id_product = cp2.id_product)
-                        AND (cp1.id_product_attribute = cp2.id_product_attribute)
-                        AND (cp1.id_address_delivery <> cp2.id_address_delivery)
-                        AND (cp1.date_add > cp2.date_add)
-                    )';
-            Db::getInstance()->execute($sql);
-        }
-
-        // Update delivery address for each product line
-        $sql = 'UPDATE `' . _DB_PREFIX_ . 'cart_product`
-        SET `id_address_delivery` = (
-            SELECT `id_address_delivery` FROM `' . _DB_PREFIX_ . 'cart`
-            WHERE `id_cart` = ' . (int) $this->id . ' AND `id_shop` = ' . (int) $this->id_shop . '
-        )
-        WHERE `id_cart` = ' . (int) $this->id . '
-        ' . (Configuration::get('PS_ALLOW_MULTISHIPPING') ? ' AND `id_shop` = ' . (int) $this->id_shop : '');
-
-        $cache_id = 'Cart::setNoMultishipping' . (int) $this->id . '-' . (int) $this->id_shop . ((isset($this->id_address_delivery) && $this->id_address_delivery) ? '-' . (int) $this->id_address_delivery : '');
-        if (!Cache::isStored($cache_id)) {
-            if ($result = (bool) Db::getInstance()->execute($sql)) {
-                $emptyCache = true;
-            }
-            Cache::store($cache_id, $result);
-        }
-
-        if (Customization::isFeatureActive()) {
-            Db::getInstance()->execute('
-            UPDATE `' . _DB_PREFIX_ . 'customization`
-            SET `id_address_delivery` = (
-                SELECT `id_address_delivery` FROM `' . _DB_PREFIX_ . 'cart`
-                WHERE `id_cart` = ' . (int) $this->id . '
-            )
-            WHERE `id_cart` = ' . (int) $this->id);
-        }
+        @trigger_error(sprintf(
+            '%s is deprecated since 9.0 and will be removed in 10.0.',
+            __METHOD__
+        ), E_USER_DEPRECATED);
 
-        if ($emptyCache) {
-            $this->_products = null;
-        }
+        return;
     }
 
     /**
      * Set an address to all products on the cart without address delivery.
+     *
+     * @deprecated Since 9.0 and will be removed in 10.0
      */
     public function autosetProductAddress()
     {
-        $id_address_delivery = 0;
-        // Get the main address of the customer
-        if ((int) $this->id_address_delivery > 0) {
-            $id_address_delivery = (int) $this->id_address_delivery;
-        } else {
-            $id_address_delivery = (int) Address::getFirstCustomerAddressId(Context::getContext()->customer->id);
-        }
-
-        if (!$id_address_delivery) {
-            return;
-        }
-
-        // Update
-        $sql = 'UPDATE `' . _DB_PREFIX_ . 'cart_product`
-            SET `id_address_delivery` = ' . (int) $id_address_delivery . '
-            WHERE `id_cart` = ' . (int) $this->id . '
-                AND (`id_address_delivery` = 0 OR `id_address_delivery` IS NULL)
-                AND `id_shop` = ' . (int) $this->id_shop;
-        Db::getInstance()->execute($sql);
-
-        $sql = 'UPDATE `' . _DB_PREFIX_ . 'customization`
-            SET `id_address_delivery` = ' . (int) $id_address_delivery . '
-            WHERE `id_cart` = ' . (int) $this->id . '
-                AND (`id_address_delivery` = 0 OR `id_address_delivery` IS NULL)';
+        @trigger_error(sprintf(
+            '%s is deprecated since 9.0 and will be removed in 10.0.',
+            __METHOD__
+        ), E_USER_DEPRECATED);
 
-        Db::getInstance()->execute($sql);
+        return;
     }
 
     public function deleteAssociations()
@@ -4842,35 +4531,6 @@ public function checkAllProductsHaveMinimalQuantities()
         return true;
     }
 
-    /**
-     * Get all the IDs of the delivery Addresses without Carriers.
-     *
-     * @param bool $return_collection Returns sa collection
-     * @param array $error Contains an error message if an error occurs
-     *
-     * @return array Array of address id or of address object
-     */
-    public function getDeliveryAddressesWithoutCarriers($return_collection = false, &$error = [])
-    {
-        $addresses_without_carriers = [];
-        foreach ($this->getProducts(false, false, null, false) as $product) {
-            if (!in_array($product['id_address_delivery'], $addresses_without_carriers)
-                && !count(Carrier::getAvailableCarrierList(new Product($product['id_product']), null, $product['id_address_delivery'], null, null, $error))) {
-                $addresses_without_carriers[] = $product['id_address_delivery'];
-            }
-        }
-        if (!$return_collection) {
-            return $addresses_without_carriers;
-        } else {
-            $addresses_instance_without_carriers = [];
-            foreach ($addresses_without_carriers as $id_address) {
-                $addresses_instance_without_carriers[] = new Address($id_address);
-            }
-
-            return $addresses_instance_without_carriers;
-        }
-    }
-
     /**
      * Set flag to split lines of products given away and also manually added to cart.
      */
diff --git a/classes/Context.php b/classes/Context.php
index 6fdd51f7fe730..db1eae31aa229 100644
--- a/classes/Context.php
+++ b/classes/Context.php
@@ -366,7 +366,6 @@ public function updateCustomer(Customer $customer)
         // If previous logic resolved to some cart to be used, save it and put this information to cookie
         if (Validate::isLoadedObject($this->cart)) {
             $this->cart->save();
-            $this->cart->autosetProductAddress();
             $this->cookie->id_cart = (int) $this->cart->id;
         }
 
diff --git a/classes/Customization.php b/classes/Customization.php
index 52a8913b675b4..da5f626959ca6 100644
--- a/classes/Customization.php
+++ b/classes/Customization.php
@@ -173,6 +173,7 @@ public static function getCustomizationPrice($idCustomization)
             return 0;
         }
 
+        // For anyone migrating this - not sure why there is a SUM, when there can be only one line
         return (float) Db::getInstance()->getValue(
             '
             SELECT SUM(`price`) FROM `' . _DB_PREFIX_ . 'customized_data`
@@ -193,6 +194,7 @@ public static function getCustomizationWeight($idCustomization)
             return 0;
         }
 
+        // For anyone migrating this - not sure why there is a SUM, when there can be only one line
         return (float) Db::getInstance()->getValue(
             '
             SELECT SUM(`weight`) FROM `' . _DB_PREFIX_ . 'customized_data`
diff --git a/classes/Product.php b/classes/Product.php
index d01a3b1e3598a..3ecb4bbe888ac 100644
--- a/classes/Product.php
+++ b/classes/Product.php
@@ -6004,6 +6004,9 @@ public static function getAllCustomizedDatas($id_cart, $id_lang = null, $only_in
             return false;
         }
 
+        // Load cart object to get delivery address ID
+        $cart = new Cart((int) $id_cart);
+
         if ($id_customization === 0) {
             // Backward compatibility: check if there are no products in cart with specific `id_customization` before returning false
             $product_customizations = (int) Db::getInstance()->getValue('
@@ -6023,7 +6026,7 @@ public static function getAllCustomizedDatas($id_cart, $id_lang = null, $only_in
         }
 
         if (!$result = Db::getInstance()->executeS('
-            SELECT cd.`id_customization`, c.`id_address_delivery`, c.`id_product`, cfl.`id_customization_field`, c.`id_product_attribute`,
+            SELECT cd.`id_customization`, c.`id_product`, cfl.`id_customization_field`, c.`id_product_attribute`,
                 cd.`type`, cd.`index`, cd.`value`, cd.`id_module`, cfl.`name`
             FROM `' . _DB_PREFIX_ . 'customized_data` cd
             NATURAL JOIN `' . _DB_PREFIX_ . 'customization` c
@@ -6044,11 +6047,11 @@ public static function getAllCustomizedDatas($id_cart, $id_lang = null, $only_in
                 // When a module saves a customization programmatically, it should add its ID in the `id_module` column
                 $row['value'] = Hook::exec('displayCustomization', ['customization' => $row], (int) $row['id_module']);
             }
-            $customized_datas[(int) $row['id_product']][(int) $row['id_product_attribute']][(int) $row['id_address_delivery']][(int) $row['id_customization']]['datas'][(int) $row['type']][] = $row;
+            $customized_datas[(int) $row['id_product']][(int) $row['id_product_attribute']][(int) $cart->id_address_delivery][(int) $row['id_customization']]['datas'][(int) $row['type']][] = $row;
         }
 
         if (!$result = Db::getInstance()->executeS(
-            'SELECT `id_product`, `id_product_attribute`, `id_customization`, `id_address_delivery`, `quantity`, `quantity_refunded`, `quantity_returned`
+            'SELECT `id_product`, `id_product_attribute`, `id_customization`, `quantity`, `quantity_refunded`, `quantity_returned`
             FROM `' . _DB_PREFIX_ . 'customization`
             WHERE `id_cart` = ' . (int) $id_cart .
             ((int) $id_customization ? ' AND `id_customization` = ' . (int) $id_customization : '') .
@@ -6058,10 +6061,10 @@ public static function getAllCustomizedDatas($id_cart, $id_lang = null, $only_in
         }
 
         foreach ($result as $row) {
-            $customized_datas[(int) $row['id_product']][(int) $row['id_product_attribute']][(int) $row['id_address_delivery']][(int) $row['id_customization']]['quantity'] = (int) $row['quantity'];
-            $customized_datas[(int) $row['id_product']][(int) $row['id_product_attribute']][(int) $row['id_address_delivery']][(int) $row['id_customization']]['quantity_refunded'] = (int) $row['quantity_refunded'];
-            $customized_datas[(int) $row['id_product']][(int) $row['id_product_attribute']][(int) $row['id_address_delivery']][(int) $row['id_customization']]['quantity_returned'] = (int) $row['quantity_returned'];
-            $customized_datas[(int) $row['id_product']][(int) $row['id_product_attribute']][(int) $row['id_address_delivery']][(int) $row['id_customization']]['id_customization'] = (int) $row['id_customization'];
+            $customized_datas[(int) $row['id_product']][(int) $row['id_product_attribute']][(int) $cart->id_address_delivery][(int) $row['id_customization']]['quantity'] = (int) $row['quantity'];
+            $customized_datas[(int) $row['id_product']][(int) $row['id_product_attribute']][(int) $cart->id_address_delivery][(int) $row['id_customization']]['quantity_refunded'] = (int) $row['quantity_refunded'];
+            $customized_datas[(int) $row['id_product']][(int) $row['id_product_attribute']][(int) $cart->id_address_delivery][(int) $row['id_customization']]['quantity_returned'] = (int) $row['quantity_returned'];
+            $customized_datas[(int) $row['id_product']][(int) $row['id_product_attribute']][(int) $cart->id_address_delivery][(int) $row['id_customization']]['id_customization'] = (int) $row['id_customization'];
         }
 
         return $customized_datas;
diff --git a/classes/order/OrderReturn.php b/classes/order/OrderReturn.php
index d74167b2988d8..b949b095da431 100644
--- a/classes/order/OrderReturn.php
+++ b/classes/order/OrderReturn.php
@@ -207,7 +207,7 @@ public static function getReturnedCustomizedProducts($id_order)
             $return['product_attribute_id'] = (int) $products[(int) $return['id_order_detail']]['product_attribute_id'];
             $return['name'] = $products[(int) $return['id_order_detail']]['product_name'];
             $return['reference'] = $products[(int) $return['id_order_detail']]['product_reference'];
-            $return['id_address_delivery'] = $products[(int) $return['id_order_detail']]['id_address_delivery'];
+            $return['id_address_delivery'] = (int) $order->id_address_delivery;
         }
 
         return $returns;
diff --git a/controllers/front/CartController.php b/controllers/front/CartController.php
index 73f3a80ab2b45..8a0e3cb0b0260 100644
--- a/controllers/front/CartController.php
+++ b/controllers/front/CartController.php
@@ -339,8 +339,7 @@ protected function processDeleteProductInCart()
         if ($this->context->cart->deleteProduct(
             $this->id_product,
             $this->id_product_attribute,
-            $this->customization_id,
-            $this->id_address_delivery
+            $this->customization_id
         )) {
             Hook::exec('actionObjectProductInCartDeleteAfter', $data);
 
@@ -495,7 +494,7 @@ protected function processChangeProductInCart()
                 $this->id_product_attribute,
                 $this->customization_id,
                 Tools::getValue('op', 'up'),
-                $this->id_address_delivery,
+                0,
                 null,
                 true,
                 true
diff --git a/src/Adapter/Cart/CommandHandler/CreateEmptyCustomerCartHandler.php b/src/Adapter/Cart/CommandHandler/CreateEmptyCustomerCartHandler.php
index c97b268aab0c6..f92a9e9cf5236 100644
--- a/src/Adapter/Cart/CommandHandler/CreateEmptyCustomerCartHandler.php
+++ b/src/Adapter/Cart/CommandHandler/CreateEmptyCustomerCartHandler.php
@@ -85,7 +85,6 @@ private function createEmptyCustomerCart(Customer $customer): Cart
         $cart->id_address_delivery = $addressId;
         $cart->id_address_invoice = $addressId;
 
-        $cart->setNoMultishipping();
         $cart->save();
 
         return $cart;
diff --git a/src/Adapter/Order/GeneralConfiguration.php b/src/Adapter/Order/GeneralConfiguration.php
index 4ad2b361653a1..a87fdfa60a178 100644
--- a/src/Adapter/Order/GeneralConfiguration.php
+++ b/src/Adapter/Order/GeneralConfiguration.php
@@ -43,7 +43,6 @@ class GeneralConfiguration extends AbstractMultistoreConfiguration
         'disable_reordering_option',
         'purchase_minimum_value',
         'recalculate_shipping_cost',
-        'allow_multishipping',
         'allow_delayed_shipping',
         'enable_tos',
         'tos_cms_id',
@@ -63,7 +62,6 @@ public function getConfiguration()
             'disable_reordering_option' => (bool) $this->configuration->get('PS_DISALLOW_HISTORY_REORDERING', false, $shopConstraint),
             'purchase_minimum_value' => (float) $this->configuration->get('PS_PURCHASE_MINIMUM', 0, $shopConstraint),
             'recalculate_shipping_cost' => (bool) $this->configuration->get('PS_ORDER_RECALCULATE_SHIPPING', false, $shopConstraint),
-            'allow_multishipping' => (bool) $this->configuration->get('PS_ALLOW_MULTISHIPPING', false, $shopConstraint),
             'allow_delayed_shipping' => (bool) $this->configuration->get('PS_SHIP_WHEN_AVAILABLE', false, $shopConstraint),
             'enable_tos' => (bool) $this->configuration->get('PS_CONDITIONS', false, $shopConstraint),
             'tos_cms_id' => (int) $this->configuration->get('PS_CONDITIONS_CMS_ID', 0, $shopConstraint),
@@ -84,7 +82,6 @@ public function updateConfiguration(array $configuration)
             $this->updateConfigurationValue('PS_DISALLOW_HISTORY_REORDERING', 'disable_reordering_option', $configuration, $shopConstraint);
             $this->updateConfigurationValue('PS_PURCHASE_MINIMUM', 'purchase_minimum_value', $configuration, $shopConstraint);
             $this->updateConfigurationValue('PS_ORDER_RECALCULATE_SHIPPING', 'recalculate_shipping_cost', $configuration, $shopConstraint);
-            $this->updateConfigurationValue('PS_ALLOW_MULTISHIPPING', 'allow_multishipping', $configuration, $shopConstraint);
             $this->updateConfigurationValue('PS_SHIP_WHEN_AVAILABLE', 'allow_delayed_shipping', $configuration, $shopConstraint);
             $this->updateConfigurationValue('PS_CONDITIONS', 'enable_tos', $configuration, $shopConstraint);
             $this->updateConfigurationValue('PS_CONDITIONS_CMS_ID', 'tos_cms_id', $configuration, $shopConstraint);
@@ -106,7 +103,6 @@ protected function buildResolver(): OptionsResolver
             ->setAllowedTypes('disable_reordering_option', 'bool')
             ->setAllowedTypes('purchase_minimum_value', 'float')
             ->setAllowedTypes('recalculate_shipping_cost', 'bool')
-            ->setAllowedTypes('allow_multishipping', 'bool')
             ->setAllowedTypes('allow_delayed_shipping', 'bool')
             ->setAllowedTypes('enable_tos', 'bool')
             ->setAllowedTypes('tos_cms_id', 'int')
diff --git a/src/Core/Cart/CartRow.php b/src/Core/Cart/CartRow.php
index 08fb390b86f31..a81dbedf871da 100644
--- a/src/Core/Cart/CartRow.php
+++ b/src/Core/Cart/CartRow.php
@@ -303,7 +303,7 @@ protected function getProductPrice(CartCore $cart, $rowData)
         $productId = (int) $rowData['id_product'];
         $quantity = (int) $rowData['cart_quantity'];
 
-        $addressId = $cart->getProductAddressId($rowData);
+        $addressId = $cart->getProductAddressId();
         if (!$addressId) {
             $addressId = $cart->getTaxAddressId();
         }
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/OrderPreferencesController.php b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/OrderPreferencesController.php
index daa9bf7d2f5e8..30794387d3a46 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/OrderPreferencesController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/OrderPreferencesController.php
@@ -58,7 +58,6 @@ public function indexAction(Request $request)
             'help_link' => $this->generateSidebarLink($legacyController),
             'generalForm' => $generalForm->createView(),
             'giftOptionsForm' => $giftOptionsForm->createView(),
-            'isMultishippingEnabled' => $this->getConfiguration()->getBoolean('PS_ALLOW_MULTISHIPPING'),
             'isAtcpShipWrapEnabled' => $this->getConfiguration()->getBoolean('PS_ATCP_SHIPWRAP'),
         ]);
     }
diff --git a/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderPreferences/GeneralType.php b/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderPreferences/GeneralType.php
index 41428d41dab24..31996a17f25da 100644
--- a/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderPreferences/GeneralType.php
+++ b/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderPreferences/GeneralType.php
@@ -78,7 +78,6 @@ public function __construct(
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $configuration = $this->configuration;
-        $isMultishippingEnabled = (bool) $configuration->get('PS_ALLOW_MULTISHIPPING');
         $currencyIsoCode = $this->currencyDataProvider->getDefaultCurrencyIsoCode();
 
         $builder
@@ -115,15 +114,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'multistore_configuration_key' => 'PS_ORDER_RECALCULATE_SHIPPING',
             ]);
 
-        if ($isMultishippingEnabled) {
-            $builder->add('allow_multishipping', SwitchType::class, [
-                'required' => false,
-                'label' => $this->trans('Allow multishipping', 'Admin.Shopparameters.Feature'),
-                'help' => $this->trans('Allow the customer to ship orders to multiple addresses. This option will convert the customer\'s cart into one or more orders.', 'Admin.Shopparameters.Help'),
-                'multistore_configuration_key' => 'PS_ALLOW_MULTISHIPPING',
-            ]);
-        }
-
         $builder
             ->add('allow_delayed_shipping', SwitchType::class, [
                 'required' => false,
diff --git a/tests/Integration/Utility/CartOld.php b/tests/Integration/Utility/CartOld.php
index c3f3040ab661b..1dffe2ae44fad 100644
--- a/tests/Integration/Utility/CartOld.php
+++ b/tests/Integration/Utility/CartOld.php
@@ -174,7 +174,7 @@ public function getOrderTotalV1(
                 $virtual_context->shop = new Shop((int) $product['id_shop']);
             }
 
-            $id_address = $this->getProductAddressId($product);
+            $id_address = $this->getProductAddressId();
 
             // The $null variable below is not used,
             // but it is necessary to pass it to getProductPrice because
@@ -257,7 +257,7 @@ public function getOrderTotalV1(
 
             $package = [
                 'id_carrier' => $id_carrier,
-                'id_address' => $this->getDeliveryAddressId($products),
+                'id_address' => $this->id_address_delivery,
                 'products' => $products,
             ];
 
diff --git a/tests/Resources/modules_tests/override/Cart.php b/tests/Resources/modules_tests/override/Cart.php
index c92a8686c1f3c..70a5e604004a6 100644
--- a/tests/Resources/modules_tests/override/Cart.php
+++ b/tests/Resources/modules_tests/override/Cart.php
@@ -21,15 +21,6 @@ public function updateAddressId($id_address, $id_address_new)
         if ($to_update) {
             $this->update();
         }
-        $sql = 'UPDATE `' . _DB_PREFIX_ . 'cart_product`
-		SET `id_address_delivery` = ' . (int) $id_address_new . '
-		WHERE  `id_cart` = ' . (int) $this->id . '
-			AND `id_address_delivery` = ' . (int) $id_address;
-        Db::getInstance()->execute($sql);
-        $sql = 'UPDATE `' . _DB_PREFIX_ . 'customization`
-			SET `id_address_delivery` = ' . (int) $id_address_new . '
-			WHERE  `id_cart` = ' . (int) $this->id . '
-				AND `id_address_delivery` = ' . (int) $id_address;
         Db::getInstance()->execute($sql);
     }
 
diff --git a/tests/Resources/modules_tests/pscsx32412/override/classes/Cart.php b/tests/Resources/modules_tests/pscsx32412/override/classes/Cart.php
index ab03e3e8542b4..ab0237ec675c7 100644
--- a/tests/Resources/modules_tests/pscsx32412/override/classes/Cart.php
+++ b/tests/Resources/modules_tests/pscsx32412/override/classes/Cart.php
@@ -46,16 +46,6 @@ public function updateAddressId($id_address, $id_address_new)
             $this->update();
         }
 
-        $sql = 'UPDATE `' . _DB_PREFIX_ . 'cart_product`
-		SET `id_address_delivery` = ' . (int) $id_address_new . '
-		WHERE  `id_cart` = ' . (int) $this->id . '
-			AND `id_address_delivery` = ' . (int) $id_address;
-        Db::getInstance()->execute($sql);
-
-        $sql = 'UPDATE `' . _DB_PREFIX_ . 'customization`
-			SET `id_address_delivery` = ' . (int) $id_address_new . '
-			WHERE  `id_cart` = ' . (int) $this->id . '
-				AND `id_address_delivery` = ' . (int) $id_address;
         Db::getInstance()->execute($sql);
     }
 
diff --git a/tests/Unit/Adapter/Order/GeneralConfigurationTest.php b/tests/Unit/Adapter/Order/GeneralConfigurationTest.php
index 19d4f51dc84a8..0f4583db4048a 100644
--- a/tests/Unit/Adapter/Order/GeneralConfigurationTest.php
+++ b/tests/Unit/Adapter/Order/GeneralConfigurationTest.php
@@ -44,7 +44,6 @@ class GeneralConfigurationTest extends AbstractConfigurationTestCase
         'disable_reordering_option' => true,
         'purchase_minimum_value' => 3.0,
         'recalculate_shipping_cost' => true,
-        'allow_multishipping' => true,
         'allow_delayed_shipping' => true,
         'enable_tos' => true,
         'tos_cms_id' => 3,
@@ -77,7 +76,6 @@ public function testGetConfiguration(ShopConstraint $shopConstraint): void
                     ['PS_DISALLOW_HISTORY_REORDERING', false, $shopConstraint, true],
                     ['PS_PURCHASE_MINIMUM', 0, $shopConstraint, 3.0],
                     ['PS_ORDER_RECALCULATE_SHIPPING', false, $shopConstraint, true],
-                    ['PS_ALLOW_MULTISHIPPING', false, $shopConstraint, true],
                     ['PS_SHIP_WHEN_AVAILABLE', false, $shopConstraint, true],
                     ['PS_CONDITIONS', false, $shopConstraint, true],
                     ['PS_CONDITIONS_CMS_ID', 0, $shopConstraint, 3],
@@ -119,7 +117,6 @@ public function provideInvalidConfiguration(): array
             [InvalidOptionsException::class, array_merge(self::VALID_CONFIGURATION, ['disable_reordering_option' => 'wrong_type'])],
             [InvalidOptionsException::class, array_merge(self::VALID_CONFIGURATION, ['purchase_minimum_value' => 'wrong_type'])],
             [InvalidOptionsException::class, array_merge(self::VALID_CONFIGURATION, ['recalculate_shipping_cost' => 'wrong_type'])],
-            [InvalidOptionsException::class, array_merge(self::VALID_CONFIGURATION, ['allow_multishipping' => 'wrong_type'])],
             [InvalidOptionsException::class, array_merge(self::VALID_CONFIGURATION, ['allow_delayed_shipping' => 'wrong_type'])],
             [InvalidOptionsException::class, array_merge(self::VALID_CONFIGURATION, ['enable_tos' => 'wrong_type'])],
             [InvalidOptionsException::class, array_merge(self::VALID_CONFIGURATION, ['tos_cms_id' => 'wrong_type'])],

From 6fc113d9c756546c542153ea06837597f584f67b Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Thu, 3 Aug 2023 14:24:39 +0200
Subject: [PATCH 0713/1030] Functional Tests : Hummingbird - FO - Header and
 Footer : Change language

---
 .../02_headerAndFooter/04_changeLanguage.ts   | 256 ++++++++++++++++++
 tests/UI/pages/FO/FObasePage.ts               |   9 +-
 2 files changed, 264 insertions(+), 1 deletion(-)
 create mode 100644 tests/UI/campaigns/functional/FO/hummingbird/02_headerAndFooter/04_changeLanguage.ts

diff --git a/tests/UI/campaigns/functional/FO/hummingbird/02_headerAndFooter/04_changeLanguage.ts b/tests/UI/campaigns/functional/FO/hummingbird/02_headerAndFooter/04_changeLanguage.ts
new file mode 100644
index 0000000000000..295367855e21d
--- /dev/null
+++ b/tests/UI/campaigns/functional/FO/hummingbird/02_headerAndFooter/04_changeLanguage.ts
@@ -0,0 +1,256 @@
+// Import utils
+import helper from '@utils/helpers';
+import testContext from '@utils/testContext';
+
+// Import commonTests
+import loginCommon from '@commonTests/BO/loginBO';
+import {installHummingbird, uninstallHummingbird} from '@commonTests/FO/hummingbird';
+
+// Import pages
+// Import BO pages
+import dashboardPage from '@pages/BO/dashboard';
+import languagesPage from '@pages/BO/international/languages';
+import localizationPage from '@pages/BO/international/localization';
+// Import FO pages
+import homePage from '@pages/FO/hummingbird/home';
+
+// Import data
+import Languages from '@data/demo/languages';
+
+import {expect} from 'chai';
+import type {BrowserContext, Page} from 'playwright';
+
+const baseContext: string = 'functional_FO_hummingbird_headerAndFooter_changeLanguage';
+
+/*
+Scenario:
+- Disable french language
+- Go to FO and check that there is only one language
+- Enable french language
+- Go to Fo and change language
+ */
+describe('FO - Header and Footer : Change language', async () => {
+  let browserContext: BrowserContext;
+  let page: Page;
+
+  // Pre-condition : Install Hummingbird
+  installHummingbird(`${baseContext}_preTest_1`);
+
+  describe('Change language', async () => {
+    // before and after functions
+    before(async function () {
+      browserContext = await helper.createBrowserContext(this.browser);
+      page = await helper.newTab(browserContext);
+    });
+
+    after(async () => {
+      await helper.closeBrowserContext(browserContext);
+    });
+
+    // 1 - Disable language
+    describe('Disable \'French\' language', async () => {
+      it('should login in BO', async function () {
+        await loginCommon.loginBO(this, page);
+      });
+
+      it('should go to \'International > Localization\' page', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'goToLocalizationPage1', baseContext);
+
+        await dashboardPage.goToSubMenu(
+          page,
+          dashboardPage.internationalParentLink,
+          dashboardPage.localizationLink,
+        );
+        await localizationPage.closeSfToolBar(page);
+
+        const pageTitle = await localizationPage.getPageTitle(page);
+        expect(pageTitle).to.contains(localizationPage.pageTitle);
+      });
+
+      it('should go to \'Languages\' page', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'goToLanguagesPage1', baseContext);
+
+        await localizationPage.goToSubTabLanguages(page);
+
+        const pageTitle = await languagesPage.getPageTitle(page);
+        expect(pageTitle).to.contains(languagesPage.pageTitle);
+      });
+
+      it('should reset all filters', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst1', baseContext);
+
+        const numberOfLanguages = await languagesPage.resetAndGetNumberOfLines(page);
+        expect(numberOfLanguages).to.be.above(0);
+      });
+
+      it('should filter by iso_code \'fr\'', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'filterToQuickEdit1', baseContext);
+
+        // Filter table
+        await languagesPage.filterTable(page, 'input', 'iso_code', Languages.french.isoCode);
+
+        // Check number od languages
+        const numberOfLanguagesAfterFilter = await languagesPage.getNumberOfElementInGrid(page);
+        expect(numberOfLanguagesAfterFilter).to.be.at.least(1);
+
+        const textColumn = await languagesPage.getTextColumnFromTable(page, 1, 'iso_code');
+        expect(textColumn).to.contains(Languages.french.isoCode);
+      });
+
+      it('should disable language', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'disableLanguage', baseContext);
+
+        const isActionPerformed = await languagesPage.setStatus(page, 1, false);
+
+        if (isActionPerformed) {
+          const resultMessage = await languagesPage.getAlertSuccessBlockParagraphContent(page);
+          expect(resultMessage).to.contains(languagesPage.successfulUpdateStatusMessage);
+        }
+        const languageStatus = await languagesPage.getStatus(page, 1);
+        await expect(languageStatus).to.be.false;
+      });
+
+      it('should reset all filters', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'quickEditReset1', baseContext);
+
+        const numberOfLanguages = await languagesPage.resetAndGetNumberOfLines(page);
+        expect(numberOfLanguages).to.be.above(0);
+      });
+    });
+
+    // 2 - Check that languages list is not visible
+    describe('Check that the languages list is not visible', async () => {
+      it('should go to FO home page', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'goToFO1', baseContext);
+
+        await homePage.goToFo(page);
+
+        const isHomePage = await homePage.isHomePage(page);
+        await expect(isHomePage).to.be.true;
+      });
+
+      it('should check that the languages list is not visible', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'checkLanguageListNotVisible', baseContext);
+
+        const isVisible = await homePage.isLanguageListVisible(page);
+        await expect(isVisible, 'Language list is visible!').to.be.false;
+      });
+
+      it('should check that the shop language is \'English\'', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'checkShopLanguage', baseContext);
+
+        const language = await homePage.getShopLanguage(page);
+        expect(language).to.equal('en-US');
+      });
+    });
+
+    // 3 - Enable language
+    describe('Enable \'French\' language', async () => {
+      it('should go to BO', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'openBOPage2', baseContext);
+
+        await homePage.goToBO(page);
+
+        const pageTitle = await dashboardPage.getPageTitle(page);
+        expect(pageTitle).to.contains(dashboardPage.pageTitle);
+      });
+
+      it('should go to \'International > Localization\' page', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'goToLocalizationPage2', baseContext);
+
+        await dashboardPage.goToSubMenu(
+          page,
+          dashboardPage.internationalParentLink,
+          dashboardPage.localizationLink,
+        );
+        await localizationPage.closeSfToolBar(page);
+
+        const pageTitle = await localizationPage.getPageTitle(page);
+        expect(pageTitle).to.contains(localizationPage.pageTitle);
+      });
+
+      it('should go to \'Languages\' page', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'goToLanguagesPage2', baseContext);
+
+        await localizationPage.goToSubTabLanguages(page);
+
+        const pageTitle = await languagesPage.getPageTitle(page);
+        expect(pageTitle).to.contains(languagesPage.pageTitle);
+      });
+
+      it('should filter by iso_code \'fr\'', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'filterToQuickEdit2', baseContext);
+
+        // Filter table
+        await languagesPage.filterTable(page, 'input', 'iso_code', Languages.french.isoCode);
+
+        // Check number od languages
+        const numberOfLanguagesAfterFilter = await languagesPage.getNumberOfElementInGrid(page);
+        expect(numberOfLanguagesAfterFilter).to.be.at.least(1);
+
+        const textColumn = await languagesPage.getTextColumnFromTable(page, 1, 'iso_code');
+        expect(textColumn).to.contains(Languages.french.isoCode);
+      });
+
+      it('should enable language', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'enableLanguage', baseContext);
+
+        const isActionPerformed = await languagesPage.setStatus(page, 1, true);
+
+        if (isActionPerformed) {
+          const resultMessage = await languagesPage.getAlertSuccessBlockParagraphContent(page);
+          expect(resultMessage).to.contains(languagesPage.successfulUpdateStatusMessage);
+        }
+        const languageStatus = await languagesPage.getStatus(page, 1);
+        await expect(languageStatus).to.be.true;
+      });
+
+      it('should reset all filters', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'quickEditReset2', baseContext);
+
+        const numberOfLanguages = await languagesPage.resetAndGetNumberOfLines(page);
+        expect(numberOfLanguages).to.be.above(0);
+      });
+    });
+
+    // 4 - Change language and check it
+    describe('Change language and check it', async () => {
+      it('should go to FO home page', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'goToFO2', baseContext);
+
+        await homePage.goToFo(page);
+
+        const isHomePage = await homePage.isHomePage(page);
+        await expect(isHomePage).to.be.true;
+      });
+
+      it('should check that the languages list is visible', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'checkLanguageListVisible', baseContext);
+
+        const isVisible = await homePage.isLanguageListVisible(page);
+        await expect(isVisible, 'Language list is not visible!').to.be.true;
+      });
+
+      it('should change the shop language to \'French\'', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'ChangeLanguageToFrench', baseContext);
+
+        await homePage.changeLanguage(page, 'fr');
+
+        const language = await homePage.getDefaultShopLanguage(page);
+        expect(language, 'Language is not changed to French!').to.equal('Français');
+      });
+
+      it('should change the shop language to \'English\'', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'ChangeLanguageToEnglish', baseContext);
+
+        await homePage.changeLanguage(page, 'en');
+
+        const language = await homePage.getDefaultShopLanguage(page);
+        expect(language, 'Language is not changed to English!').to.equal('English');
+      });
+    });
+  });
+
+  // Post-condition : Uninstall Hummingbird
+  uninstallHummingbird(`${baseContext}_postTest_1`);
+});
diff --git a/tests/UI/pages/FO/FObasePage.ts b/tests/UI/pages/FO/FObasePage.ts
index 00f4bea0a1e26..5ffb842d56122 100644
--- a/tests/UI/pages/FO/FObasePage.ts
+++ b/tests/UI/pages/FO/FObasePage.ts
@@ -342,6 +342,9 @@ export default class FOBasePage extends CommonPage {
    * @returns {Promise<boolean>}
    */
   async isLanguageListVisible(page: Page): Promise<boolean> {
+    if (this.theme === 'hummingbird') {
+      return this.elementVisible(page, this.languageSelector, 1000);
+    }
     return this.elementVisible(page, this.languageSelectorExpandIcon, 1000);
   }
 
@@ -387,6 +390,11 @@ export default class FOBasePage extends CommonPage {
    * @returns {Promise<string>}
    */
   async getDefaultShopLanguage(page: Page): Promise<string> {
+    if (this.theme === 'hummingbird') {
+      return page
+        .locator(this.languageSelector)
+        .evaluate((el: HTMLSelectElement): string => el.options[el.options.selectedIndex].textContent ?? '');
+    }
     return this.getTextContent(page, this.defaultLanguageSpan);
   }
 
@@ -743,7 +751,6 @@ export default class FOBasePage extends CommonPage {
    * Get the value of an input
    *
    * @param page {Page} Browser tab
-   * @param input {string} ID of the input
    * @returns {Promise<string>}
    */
   async getSearchValue(page: Page): Promise<string> {

From 88c9c39c43e3137d1d63d550029dfeb74dbca7e0 Mon Sep 17 00:00:00 2001
From: Daniel Hlavacek <daniel.hlavacek@hotmail.cz>
Date: Thu, 3 Aug 2023 20:25:26 +0200
Subject: [PATCH 0714/1030] Fix CS

---
 classes/Cart.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/Cart.php b/classes/Cart.php
index 93b3190e25029..a691c74661f4e 100644
--- a/classes/Cart.php
+++ b/classes/Cart.php
@@ -4072,7 +4072,7 @@ public function deleteCustomizationToProduct($id_product, $index)
      *
      * @param int $id_product Product ID
      * @param int|null $type Only return customization of this type, can be Product::CUSTOMIZE_FILE or Product::CUSTOMIZE_TEXTFIELD
-     * @param bool $not_in_cart Only return customizations that are not in the cart already.
+     * @param bool $not_in_cart Only return customizations that are not in the cart already
      *
      * @return array Result from DB
      */

From 5a087d67252a9aa9516c173cbcd6f64690330ab7 Mon Sep 17 00:00:00 2001
From: Daniel Hlavacek <daniel.hlavacek@hotmail.cz>
Date: Thu, 3 Aug 2023 20:28:48 +0200
Subject: [PATCH 0715/1030] Deprecate property

---
 classes/Cart.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/classes/Cart.php b/classes/Cart.php
index a691c74661f4e..5231ed8e076b4 100644
--- a/classes/Cart.php
+++ b/classes/Cart.php
@@ -116,6 +116,10 @@ class CartCore extends ObjectModel
     protected static $cacheNbPackages = [];
     protected static $cachePackageList = [];
     protected static $cacheDeliveryOptionList = [];
+
+    /**
+     * @deprecated Since 9.0 and will be removed in 10.0
+     */
     protected static $cacheMultiAddressDelivery = [];
 
     /**

From ca6344f987408ec45c68f2c00498400691ad9357 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Fri, 4 Aug 2023 11:01:50 +0200
Subject: [PATCH 0716/1030] Functional Tests : Removed console.log

---
 tests/UI/campaigns/productV2/functional/05_CRUDVirtualProduct.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/UI/campaigns/productV2/functional/05_CRUDVirtualProduct.ts b/tests/UI/campaigns/productV2/functional/05_CRUDVirtualProduct.ts
index 32921eeba5583..f2b0b13cdd03c 100644
--- a/tests/UI/campaigns/productV2/functional/05_CRUDVirtualProduct.ts
+++ b/tests/UI/campaigns/productV2/functional/05_CRUDVirtualProduct.ts
@@ -93,7 +93,6 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
 
     // Handle every new email
     mailListener.on('new', (email: MailDevEmail) => {
-      console.log(email.subject);
       mails.push(email);
     });
   });

From 5afd7da9c53bf369f5aa393bd8109e5300a8f4b7 Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Fri, 4 Aug 2023 12:58:24 +0200
Subject: [PATCH 0717/1030] Minor tweaks and comments

---
 classes/Address.php | 28 ++++++++++++++++------------
 classes/Cart.php    |  4 +++-
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/classes/Address.php b/classes/Address.php
index edc8566fe5eb6..de36a5c316f5a 100644
--- a/classes/Address.php
+++ b/classes/Address.php
@@ -219,6 +219,7 @@ public function update($null_values = false)
         }
 
         // Update the cache
+        // This is probably not correct, because it should be true only if the address is NOT flagged as deleted
         static::$addressExists[$this->id] = true;
 
         if (Validate::isUnsignedId($this->id_customer)) {
@@ -242,28 +243,31 @@ public function delete()
             Customer::resetAddressCache($this->id_customer, $this->id);
         }
 
-        if (!$this->isUsed()) {
-            $this->deleteCartAddress();
-
-            // Update the cache
-            if (isset(static::$addressExists[$this->id])) {
-                static::$addressExists[$this->id] = false;
-            }
-
-            return parent::delete();
-        } else {
+        // If the address is used in at least one order, we will not delete it, but only mark it and hide it from backoffice
+        // However, even if this address is used, we should probably unlink it from all NON ORDERED carts
+        if ($this->isUsed()) {
             $this->deleted = true;
 
             return $this->update();
         }
+
+        // Remove this address from all carts
+        $this->deleteCartAddress();
+
+        // Update the static cache
+        if (isset(static::$addressExists[$this->id])) {
+            static::$addressExists[$this->id] = false;
+        }
+
+        return parent::delete();
     }
 
     /**
-     * removes the address from carts using it, to avoid errors on not existing address
+     * Removes the address from carts using it, to avoid errors on not existing address.
      */
     protected function deleteCartAddress()
     {
-        // keep pending carts, but unlink it from current address
+        // Remove references to this address from all carts
         $sql = 'UPDATE ' . _DB_PREFIX_ . 'cart
                     SET id_address_delivery = 0
                     WHERE id_address_delivery = ' . $this->id;
diff --git a/classes/Cart.php b/classes/Cart.php
index 5231ed8e076b4..07e1ca3157e70 100644
--- a/classes/Cart.php
+++ b/classes/Cart.php
@@ -4125,7 +4125,8 @@ public static function getCustomerCarts($id_customer, $with_order = true)
     }
 
     /**
-     * Duplicate this Cart in the database.
+     * Duplicate this Cart in the database. This is mainly used by the "reorder" feature. Customer can go to his my account zone
+     * and quickly create a new cart by using his previous order.
      *
      * @return array|bool Duplicated cart, with success bool
      */
@@ -4140,6 +4141,7 @@ public function duplicate()
         $cart->id_shop = $this->id_shop;
         $cart->id_shop_group = $this->id_shop_group;
 
+        // If the original addresses no longer exist or are deleted, we will treat it like a new cart in this regard
         if (!Customer::customerHasAddress((int) $cart->id_customer, (int) $cart->id_address_delivery)) {
             $cart->id_address_delivery = (int) Address::getFirstCustomerAddressId((int) $cart->id_customer);
         }

From fdaf025d3de7e8a43089ee067f5d5dabd35709dc Mon Sep 17 00:00:00 2001
From: SharakPL <git@sharak.pl>
Date: Mon, 7 Aug 2023 09:58:05 +0200
Subject: [PATCH 0718/1030] order by type and and function

---
 config/smarty.config.inc.php | 65 ++++++++++++++++++------------------
 1 file changed, 33 insertions(+), 32 deletions(-)

diff --git a/config/smarty.config.inc.php b/config/smarty.config.inc.php
index 6fa40c63e7857..6723d88f5a999 100644
--- a/config/smarty.config.inc.php
+++ b/config/smarty.config.inc.php
@@ -81,56 +81,57 @@ function smartyEscape($string, $esc_type = 'html', $char_set = null, $double_enc
     }
 }
 
-smartyRegisterFunction($smarty, 'modifier', 'escape', 'smartyEscape');
-smartyRegisterFunction($smarty, 'modifier', 'truncate', 'smarty_modifier_truncate');
-smartyRegisterFunction($smarty, 'function', 'l', 'smartyTranslate', false);
-smartyRegisterFunction($smarty, 'function', 'hook', 'smartyHook');
-smartyRegisterFunction($smarty, 'modifier', 'json_encode', 'json_encode');
-smartyRegisterFunction($smarty, 'modifier', 'json_decode', 'json_decode');
 smartyRegisterFunction($smarty, 'function', 'dateFormat', array('Tools', 'dateFormat'));
+smartyRegisterFunction($smarty, 'function', 'hook', 'smartyHook');
+smartyRegisterFunction($smarty, 'function', 'l', 'smartyTranslate', false);
+smartyRegisterFunction($smarty, 'function', 'url', array('Link', 'getUrlSmarty'));
+
 smartyRegisterFunction($smarty, 'modifier', 'boolval', array('Tools', 'boolval'));
-smartyRegisterFunction($smarty, 'modifier', 'cleanHtml', 'smartyCleanHtml');
 smartyRegisterFunction($smarty, 'modifier', 'classname', 'smartyClassname');
 smartyRegisterFunction($smarty, 'modifier', 'classnames', 'smartyClassnames');
-smartyRegisterFunction($smarty, 'function', 'url', array('Link', 'getUrlSmarty'));
+smartyRegisterFunction($smarty, 'modifier', 'cleanHtml', 'smartyCleanHtml');
+smartyRegisterFunction($smarty, 'modifier', 'end', 'smarty_endWithoutReference');
+smartyRegisterFunction($smarty, 'modifier', 'escape', 'smartyEscape');
+smartyRegisterFunction($smarty, 'modifier', 'json_decode', 'json_decode');
+smartyRegisterFunction($smarty, 'modifier', 'json_encode', 'json_encode');
+smartyRegisterFunction($smarty, 'modifier', 'truncate', 'smarty_modifier_truncate');
 
 // Native PHP Functions
 smartyRegisterFunction($smarty, 'modifier', 'addcslashes', 'addcslashes');
 smartyRegisterFunction($smarty, 'modifier', 'addslashes', 'addslashes');
-smartyRegisterFunction($smarty, 'modifier', 'date','date');
-smartyRegisterFunction($smarty, 'modifier', 'end', 'smarty_endWithoutReference');
+smartyRegisterFunction($smarty, 'modifier', 'date', 'date');
+smartyRegisterFunction($smarty, 'modifier', 'date', 'date');
+smartyRegisterFunction($smarty, 'modifier', 'explode', 'explode');
+smartyRegisterFunction($smarty, 'modifier', 'floatval', 'floatval');
 smartyRegisterFunction($smarty, 'modifier', 'floatval', 'floatval');
 smartyRegisterFunction($smarty, 'modifier', 'htmlentities', 'htmlentities');
+smartyRegisterFunction($smarty, 'modifier', 'htmlspecialchars', 'htmlspecialchars');
+smartyRegisterFunction($smarty, 'modifier', 'implode', 'implode');
+smartyRegisterFunction($smarty, 'modifier', 'in_array', 'in_array');
+smartyRegisterFunction($smarty, 'modifier', 'in_array', 'in_array');
+smartyRegisterFunction($smarty, 'modifier', 'intval', 'intval');
 smartyRegisterFunction($smarty, 'modifier', 'intval', 'intval');
 smartyRegisterFunction($smarty, 'modifier', 'json_decode', 'json_decode');
 smartyRegisterFunction($smarty, 'modifier', 'json_encode', 'json_encode');
-smartyRegisterFunction($smarty, 'modifier', 'mt_rand','mt_rand');
-smartyRegisterFunction($smarty, 'modifier', 'rand','rand');
-smartyRegisterFunction($smarty, 'modifier', 'strtolower','strtolower');
-smartyRegisterFunction($smarty, 'modifier', 'str_replace','str_replace');
-smartyRegisterFunction($smarty, 'modifier', 'strval','strval');
-smartyRegisterFunction($smarty, 'modifier', 'trim', 'trim');
-smartyRegisterFunction($smarty, 'modifier', 'ucfirst', 'ucfirst');
-smartyRegisterFunction($smarty, 'modifier', 'urlencode','urlencode');
-smartyRegisterFunction($smarty, 'modifier', 'htmlspecialchars','htmlspecialchars');
-smartyRegisterFunction($smarty, 'modifier', 'implode', 'implode');
-smartyRegisterFunction($smarty, 'modifier', 'explode', 'explode');
-smartyRegisterFunction($smarty, 'modifier', 'print_r', 'print_r');
-smartyRegisterFunction($smarty, 'modifier', 'var_dump', 'var_dump');
+smartyRegisterFunction($smarty, 'modifier', 'json_encode', 'json_encode');
 smartyRegisterFunction($smarty, 'modifier', 'lcfirst', 'lcfirst');
+smartyRegisterFunction($smarty, 'modifier', 'md5', 'md5');
+smartyRegisterFunction($smarty, 'modifier', 'mt_rand', 'mt_rand');
+smartyRegisterFunction($smarty, 'modifier', 'mt_rand', 'mt_rand');
 smartyRegisterFunction($smarty, 'modifier', 'nl2br', 'nl2br');
+smartyRegisterFunction($smarty, 'modifier', 'print_r', 'print_r');
+smartyRegisterFunction($smarty, 'modifier', 'rand', 'rand');
 smartyRegisterFunction($smarty, 'modifier', 'sizeof', 'sizeof');
-smartyRegisterFunction($smarty, 'modifier', 'in_array', 'in_array');
+smartyRegisterFunction($smarty, 'modifier', 'str_replace', 'str_replace');
+smartyRegisterFunction($smarty, 'modifier', 'stripslashes', 'stripslashes');
+smartyRegisterFunction($smarty, 'modifier', 'strtolower', 'strtolower');
+smartyRegisterFunction($smarty, 'modifier', 'strval', 'strval');
 smartyRegisterFunction($smarty, 'modifier', 'substr', 'substr');
-smartyRegisterFunction($smarty, 'modifier', 'intval', 'intval');
-smartyRegisterFunction($smarty, 'modifier', 'date', 'date');
 smartyRegisterFunction($smarty, 'modifier', 'trim', 'trim');
-smartyRegisterFunction($smarty, 'modifier', 'json_encode', 'json_encode');
-smartyRegisterFunction($smarty, 'modifier', 'in_array', 'in_array');
-smartyRegisterFunction($smarty, 'modifier', 'stripslashes', 'stripslashes');
-smartyRegisterFunction($smarty, 'modifier', 'mt_rand', 'mt_rand');
-smartyRegisterFunction($smarty, 'modifier', 'md5', 'md5');
-smartyRegisterFunction($smarty, 'modifier', 'floatval', 'floatval');
+smartyRegisterFunction($smarty, 'modifier', 'trim', 'trim');
+smartyRegisterFunction($smarty, 'modifier', 'ucfirst', 'ucfirst');
+smartyRegisterFunction($smarty, 'modifier', 'urlencode', 'urlencode');
+smartyRegisterFunction($smarty, 'modifier', 'var_dump', 'var_dump');
 
 function smarty_modifier_htmlentitiesUTF8($string)
 {

From cdb0e351aeb210f9c3c1640ce7d822013a04bba5 Mon Sep 17 00:00:00 2001
From: SharakPL <git@sharak.pl>
Date: Mon, 7 Aug 2023 10:02:04 +0200
Subject: [PATCH 0719/1030] remove duplications

---
 config/smarty.config.inc.php | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/config/smarty.config.inc.php b/config/smarty.config.inc.php
index 6723d88f5a999..4793cb042fe95 100644
--- a/config/smarty.config.inc.php
+++ b/config/smarty.config.inc.php
@@ -81,6 +81,7 @@ function smartyEscape($string, $esc_type = 'html', $char_set = null, $double_enc
     }
 }
 
+// PrestaShop & Smarty functions
 smartyRegisterFunction($smarty, 'function', 'dateFormat', array('Tools', 'dateFormat'));
 smartyRegisterFunction($smarty, 'function', 'hook', 'smartyHook');
 smartyRegisterFunction($smarty, 'function', 'l', 'smartyTranslate', false);
@@ -92,32 +93,24 @@ function smartyEscape($string, $esc_type = 'html', $char_set = null, $double_enc
 smartyRegisterFunction($smarty, 'modifier', 'cleanHtml', 'smartyCleanHtml');
 smartyRegisterFunction($smarty, 'modifier', 'end', 'smarty_endWithoutReference');
 smartyRegisterFunction($smarty, 'modifier', 'escape', 'smartyEscape');
-smartyRegisterFunction($smarty, 'modifier', 'json_decode', 'json_decode');
-smartyRegisterFunction($smarty, 'modifier', 'json_encode', 'json_encode');
 smartyRegisterFunction($smarty, 'modifier', 'truncate', 'smarty_modifier_truncate');
 
-// Native PHP Functions
+// Native PHP functions
 smartyRegisterFunction($smarty, 'modifier', 'addcslashes', 'addcslashes');
 smartyRegisterFunction($smarty, 'modifier', 'addslashes', 'addslashes');
 smartyRegisterFunction($smarty, 'modifier', 'date', 'date');
-smartyRegisterFunction($smarty, 'modifier', 'date', 'date');
 smartyRegisterFunction($smarty, 'modifier', 'explode', 'explode');
 smartyRegisterFunction($smarty, 'modifier', 'floatval', 'floatval');
-smartyRegisterFunction($smarty, 'modifier', 'floatval', 'floatval');
 smartyRegisterFunction($smarty, 'modifier', 'htmlentities', 'htmlentities');
 smartyRegisterFunction($smarty, 'modifier', 'htmlspecialchars', 'htmlspecialchars');
 smartyRegisterFunction($smarty, 'modifier', 'implode', 'implode');
 smartyRegisterFunction($smarty, 'modifier', 'in_array', 'in_array');
-smartyRegisterFunction($smarty, 'modifier', 'in_array', 'in_array');
-smartyRegisterFunction($smarty, 'modifier', 'intval', 'intval');
 smartyRegisterFunction($smarty, 'modifier', 'intval', 'intval');
 smartyRegisterFunction($smarty, 'modifier', 'json_decode', 'json_decode');
 smartyRegisterFunction($smarty, 'modifier', 'json_encode', 'json_encode');
-smartyRegisterFunction($smarty, 'modifier', 'json_encode', 'json_encode');
 smartyRegisterFunction($smarty, 'modifier', 'lcfirst', 'lcfirst');
 smartyRegisterFunction($smarty, 'modifier', 'md5', 'md5');
 smartyRegisterFunction($smarty, 'modifier', 'mt_rand', 'mt_rand');
-smartyRegisterFunction($smarty, 'modifier', 'mt_rand', 'mt_rand');
 smartyRegisterFunction($smarty, 'modifier', 'nl2br', 'nl2br');
 smartyRegisterFunction($smarty, 'modifier', 'print_r', 'print_r');
 smartyRegisterFunction($smarty, 'modifier', 'rand', 'rand');
@@ -128,7 +121,6 @@ function smartyEscape($string, $esc_type = 'html', $char_set = null, $double_enc
 smartyRegisterFunction($smarty, 'modifier', 'strval', 'strval');
 smartyRegisterFunction($smarty, 'modifier', 'substr', 'substr');
 smartyRegisterFunction($smarty, 'modifier', 'trim', 'trim');
-smartyRegisterFunction($smarty, 'modifier', 'trim', 'trim');
 smartyRegisterFunction($smarty, 'modifier', 'ucfirst', 'ucfirst');
 smartyRegisterFunction($smarty, 'modifier', 'urlencode', 'urlencode');
 smartyRegisterFunction($smarty, 'modifier', 'var_dump', 'var_dump');

From b20a790df021762152cef825ed37b9a41b4e05ea Mon Sep 17 00:00:00 2001
From: SharakPL <git@sharak.pl>
Date: Mon, 7 Aug 2023 10:03:24 +0200
Subject: [PATCH 0720/1030] formatting

---
 config/smarty.config.inc.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/config/smarty.config.inc.php b/config/smarty.config.inc.php
index 4793cb042fe95..bcba3c6c10505 100644
--- a/config/smarty.config.inc.php
+++ b/config/smarty.config.inc.php
@@ -34,19 +34,19 @@
 }
 
 $smarty->setConfigDir([]);
-$smarty->setCompileDir(_PS_CACHE_DIR_.'smarty/compile');
-$smarty->setCacheDir(_PS_CACHE_DIR_.'smarty/cache');
+$smarty->setCompileDir(_PS_CACHE_DIR_ . 'smarty/compile');
+$smarty->setCacheDir(_PS_CACHE_DIR_ . 'smarty/cache');
 $smarty->use_sub_dirs = true;
 $smarty->caching = Smarty::CACHING_OFF;
 
 /* @phpstan-ignore-next-line */
 if (_PS_SMARTY_CACHING_TYPE_ == 'mysql') {
-    include _PS_CLASS_DIR_.'Smarty/SmartyCacheResourceMysql.php';
+    include _PS_CLASS_DIR_ . 'Smarty/SmartyCacheResourceMysql.php';
     $smarty->caching_type = 'mysql';
 }
 $smarty->force_compile = Configuration::get('PS_SMARTY_FORCE_COMPILE') == _PS_SMARTY_FORCE_COMPILE_;
 $smarty->compile_check = (Configuration::get('PS_SMARTY_FORCE_COMPILE') >= _PS_SMARTY_CHECK_COMPILE_) ? Smarty::COMPILECHECK_ON : Smarty::COMPILECHECK_OFF;
-$smarty->debug_tpl = _PS_ALL_THEMES_DIR_.'debug.tpl';
+$smarty->debug_tpl = _PS_ALL_THEMES_DIR_ . 'debug.tpl';
 
 /* Use this constant if you want to load smarty without all PrestaShop functions */
 if (defined('_PS_SMARTY_FAST_LOAD_') && _PS_SMARTY_FAST_LOAD_) {
@@ -54,12 +54,12 @@
 }
 
 if (defined('_PS_ADMIN_DIR_')) {
-    require_once dirname(__FILE__).'/smartyadmin.config.inc.php';
+    require_once dirname(__FILE__) . '/smartyadmin.config.inc.php';
 } else {
-    require_once dirname(__FILE__).'/smartyfront.config.inc.php';
+    require_once dirname(__FILE__) . '/smartyfront.config.inc.php';
 }
 
-require_once SMARTY_PLUGINS_DIR.'modifier.truncate.php';
+require_once SMARTY_PLUGINS_DIR . 'modifier.truncate.php';
 
 // This escape modifier is required for invoice PDF generation
 function smartyEscape($string, $esc_type = 'html', $char_set = null, $double_encode = true)
@@ -209,7 +209,7 @@ function smartyCleanHtml($data)
 function smartyClassname($classname)
 {
     $classname = Tools::replaceAccentedChars(strtolower($classname));
-    $classname = preg_replace(['/[^A-Za-z0-9-_]/', '/-{3,}/', '/-+$/'], ['-', '-', ''] , $classname);
+    $classname = preg_replace(['/[^A-Za-z0-9-_]/', '/-{3,}/', '/-+$/'], ['-', '-', ''], $classname);
     return $classname;
 }
 

From 33c5590b16aeb8941683165e44dee851234d411f Mon Sep 17 00:00:00 2001
From: boherm <boris.hermans@prestashop.com>
Date: Tue, 8 Aug 2023 09:55:43 +0200
Subject: [PATCH 0721/1030] Apply uppercase for ISO codes in dropdown selectors
 and text editors

---
 .../new-theme/js/components/translatable-input.ts      |  2 +-
 .../TwigTemplateForm/prestashop_ui_kit_base.html.twig  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/admin-dev/themes/new-theme/js/components/translatable-input.ts b/admin-dev/themes/new-theme/js/components/translatable-input.ts
index 5678f1b82760b..2fd760ac84ebc 100644
--- a/admin-dev/themes/new-theme/js/components/translatable-input.ts
+++ b/admin-dev/themes/new-theme/js/components/translatable-input.ts
@@ -100,7 +100,7 @@ class TranslatableInput {
     const localeButton = form.find(this.localeButtonSelector);
     const changeLanguageUrl = localeButton.data('change-language-url');
 
-    localeButton.text(this.selectedLocale);
+    localeButton.text(this.selectedLocale.toUpperCase());
     form.find(this.localeInputSelector).addClass('d-none');
     form
       .find(`${this.localeInputSelector}.js-locale-${this.selectedLocale}`)
diff --git a/src/PrestaShopBundle/Resources/views/Admin/TwigTemplateForm/prestashop_ui_kit_base.html.twig b/src/PrestaShopBundle/Resources/views/Admin/TwigTemplateForm/prestashop_ui_kit_base.html.twig
index c0fb24786727a..c2d0236891a28 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/TwigTemplateForm/prestashop_ui_kit_base.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/TwigTemplateForm/prestashop_ui_kit_base.html.twig
@@ -414,7 +414,7 @@
         {% for translationsFields in form %}
           <li class="nav-item">
             <a href="#" data-locale="{{ translationsFields.vars.label }}" class="{% if defaultLocale.id_lang == translationsFields.vars.name %}active{% endif %} nav-link" data-toggle="tab" data-target=".translationsFields-{{ translationsFields.vars.id }}">
-              {{ translationsFields.vars.label|capitalize }}
+              {{ translationsFields.vars.label|upper }}
             </a>
           </li>
         {% endfor %}
@@ -463,7 +463,7 @@
                 aria-expanded="false"
                 id="{{ form.vars.id }}"
         >
-          {{ form.vars.default_locale.iso_code }}
+          {{ form.vars.default_locale.iso_code|upper }}
         </button>
 
         <div class="dropdown-menu dropdown-menu-right locale-dropdown-menu" aria-labelledby="{{ form.vars.id }}">
@@ -501,7 +501,7 @@
                 aria-expanded="false"
                 id="{{ form.vars.id }}"
         >
-          {{ form.vars.default_locale.iso_code }}
+          {{ form.vars.default_locale.iso_code|upper }}
         </button>
 
         <div class="dropdown-menu dropdown-menu-right locale-dropdown-menu" aria-labelledby="{{ form.vars.id }}">
@@ -907,7 +907,7 @@
         {% for translationsFields in form %}
           <li class="nav-item">
             <a href="#" data-locale="{{ translationsFields.vars.label }}" class="{% if default_locale.id_lang == translationsFields.vars.name %}active{% endif %} nav-link" data-toggle="tab" data-target=".translationsFields-{{ translationsFields.vars.id }}">
-              {{ translationsFields.vars.label|capitalize }}
+              {{ translationsFields.vars.label|upper }}
             </a>
           </li>
         {% endfor %}
@@ -949,7 +949,7 @@
                   aria-expanded="false"
                   id="{{ form.vars.id }}_dropdown"
           >
-            {{ form.vars.default_locale.iso_code }}
+            {{ form.vars.default_locale.iso_code|upper }}
           </button>
           <div class="dropdown-menu dropdown-menu-right locale-dropdown-menu" aria-labelledby="{{ form.vars.id }}_dropdown">
             {% for locale in locales %}

From 646216521a9757ef181bb27bef1d4b05f540239e Mon Sep 17 00:00:00 2001
From: boherm <boris.hermans@prestashop.com>
Date: Tue, 8 Aug 2023 09:56:50 +0200
Subject: [PATCH 0722/1030] Add Required label in customisation product field

---
 .../Admin/Sell/Product/Options/CustomizationFieldType.php     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Product/Options/CustomizationFieldType.php b/src/PrestaShopBundle/Form/Admin/Sell/Product/Options/CustomizationFieldType.php
index c055b9a43a973..ea3b9c0b2f5a0 100644
--- a/src/PrestaShopBundle/Form/Admin/Sell/Product/Options/CustomizationFieldType.php
+++ b/src/PrestaShopBundle/Form/Admin/Sell/Product/Options/CustomizationFieldType.php
@@ -81,6 +81,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ])
             ->add('required', SwitchType::class, [
                 'label' => $this->trans('Required', 'Admin.Global'),
+                'choices' => [
+                    $this->trans('Not Required', 'Admin.Global') => false,
+                    $this->trans('Required', 'Admin.Global') => true,
+                ],
                 'default_empty_data' => false,
             ])
             ->add('remove', IconButtonType::class, [

From fb5ef5b4a8c9950dcefb5df192017607633d5614 Mon Sep 17 00:00:00 2001
From: boherm <boris.hermans@prestashop.com>
Date: Tue, 8 Aug 2023 09:57:26 +0200
Subject: [PATCH 0723/1030] Add placeholder and html5 for stock alert input

---
 .../Form/Admin/Sell/Product/Stock/StockOptionsType.php          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Product/Stock/StockOptionsType.php b/src/PrestaShopBundle/Form/Admin/Sell/Product/Stock/StockOptionsType.php
index b2eef5eac6738..858c7b3c2f84b 100644
--- a/src/PrestaShopBundle/Form/Admin/Sell/Product/Stock/StockOptionsType.php
+++ b/src/PrestaShopBundle/Form/Admin/Sell/Product/Stock/StockOptionsType.php
@@ -96,7 +96,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'modify_all_shops' => true,
                 // @todo: need to trigger opening allShopscheckbox on "disabling_switch" change too.
                 'disabling_switch' => true,
+                'html5' => true,
                 'attr' => [
+                    'placeholder' => $this->trans('Enter threshold value', 'Admin.Catalog.Feature'),
                     'class' => 'small-input',
                 ],
             ])

From b54ba1511ce5762393f39197f1ec208b29b0acc0 Mon Sep 17 00:00:00 2001
From: boherm <boris.hermans@prestashop.com>
Date: Tue, 8 Aug 2023 09:58:37 +0200
Subject: [PATCH 0724/1030] Align misaligned link under retail price input

---
 .../Admin/Sell/Product/Pricing/RetailPriceType.php     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Product/Pricing/RetailPriceType.php b/src/PrestaShopBundle/Form/Admin/Sell/Product/Pricing/RetailPriceType.php
index feee800d3ae5c..b103297a8f5e8 100644
--- a/src/PrestaShopBundle/Form/Admin/Sell/Product/Pricing/RetailPriceType.php
+++ b/src/PrestaShopBundle/Form/Admin/Sell/Product/Pricing/RetailPriceType.php
@@ -188,11 +188,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'data-place-holder-with-state' => $taxRateHelpPlaceholderWithState,
                     'data-is-tax-enabled' => $this->isTaxEnabled,
                 ],
-                'external_link' => [
-                    'text' => $this->trans('[1]Manage tax rules[/1]', 'Admin.Catalog.Feature'),
-                    'href' => $this->router->generate('admin_taxes_index'),
-                    'align' => 'right',
-                ],
                 'modify_all_shops' => true,
             ]);
 
@@ -231,6 +226,11 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     new Type(['type' => 'float']),
                     new PositiveOrZero(),
                 ],
+                'external_link' => [
+                    'text' => $this->trans('[1]Manage tax rules[/1]', 'Admin.Catalog.Feature'),
+                    'href' => $this->router->generate('admin_taxes_index'),
+                    'align' => 'right',
+                ],
                 'default_empty_data' => 0.0,
                 'modify_all_shops' => true,
             ]);

From 27f92a870bddf7e567773e2af30a8f877a1307a0 Mon Sep 17 00:00:00 2001
From: boherm <boris.hermans@prestashop.com>
Date: Tue, 8 Aug 2023 09:59:18 +0200
Subject: [PATCH 0725/1030] Use alert_message instead of label_subtitle in new
 specific price modal

---
 .../Form/Admin/Sell/Product/Pricing/SpecificPriceImpactType.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Product/Pricing/SpecificPriceImpactType.php b/src/PrestaShopBundle/Form/Admin/Sell/Product/Pricing/SpecificPriceImpactType.php
index 0bdf2f5ae8b05..aa438dae0857a 100644
--- a/src/PrestaShopBundle/Form/Admin/Sell/Product/Pricing/SpecificPriceImpactType.php
+++ b/src/PrestaShopBundle/Form/Admin/Sell/Product/Pricing/SpecificPriceImpactType.php
@@ -70,7 +70,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder
             ->add('reduction', PriceReductionType::class, [
                 'label' => $this->trans('Apply a discount to the initial price', 'Admin.Catalog.Feature'),
-                'label_subtitle' => $this->trans('For customers meeting the conditions, the initial price will be crossed out and the discount will be highlighted.', 'Admin.Catalog.Feature'),
+                'alert_message' => $this->trans('For customers meeting the conditions, the initial price will be crossed out and the discount will be highlighted.', 'Admin.Catalog.Feature'),
                 'required' => false,
                 'constraints' => [
                     new Reduction([

From 5b77e4dd75af90d82ee3bc096841ec5e8d0272de Mon Sep 17 00:00:00 2001
From: boherm <boris.hermans@prestashop.com>
Date: Tue, 8 Aug 2023 09:59:53 +0200
Subject: [PATCH 0726/1030] Improve product redirect option informations

---
 .../Sell/Product/SEO/RedirectOptionType.php   | 22 ++++++++++++-------
 .../prestashop_ui_kit_base.html.twig          | 18 ++++++++++-----
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Product/SEO/RedirectOptionType.php b/src/PrestaShopBundle/Form/Admin/Sell/Product/SEO/RedirectOptionType.php
index 5d12a1f05fbb7..589c1f1f5eabe 100644
--- a/src/PrestaShopBundle/Form/Admin/Sell/Product/SEO/RedirectOptionType.php
+++ b/src/PrestaShopBundle/Form/Admin/Sell/Product/SEO/RedirectOptionType.php
@@ -191,6 +191,7 @@ public function configureOptions(OptionsResolver $resolver)
                 'row_attr' => [
                     'class' => 'redirect-option-widget',
                 ],
+                'alert_title' => $this->trans('Default behavior is specified in the Shop Parameters > Product settings page.', 'Admin.Catalog.Help'),
                 'alert_message' => $this->getRedirectionAlertMessages(),
             ])
             ->setRequired([
@@ -205,15 +206,20 @@ public function configureOptions(OptionsResolver $resolver)
      */
     private function getRedirectionAlertMessages(): array
     {
+        $formatParameters = [
+            '[1]' => '<strong>',
+            '[/1]' => '</strong>',
+            '[2]' => '<br>',
+        ];
+
         return [
-            $this->trans('Default behavior is specified in the Shop Parameters > Product settings page.', 'Admin.Catalog.Help'),
-            $this->trans('No redirection (200), display product = Do not redirect anywhere, display product as discontinued and return normal 200 response.', 'Admin.Catalog.Help'),
-            $this->trans('No redirection (404), display product = Do not redirect anywhere, display product as discontinued and return 404 "Not Found" response.', 'Admin.Catalog.Help'),
-            $this->trans('No redirection (410), display product = Do not redirect anywhere, display product as discontinued and return 410 "Gone" response.', 'Admin.Catalog.Help'),
-            $this->trans('No redirection (404), display error page = Do not redirect anywhere and display a 404 "Not Found" page.', 'Admin.Catalog.Help'),
-            $this->trans('No redirection (410), display error page = Do not redirect anywhere and display a 410 "Gone" page.', 'Admin.Catalog.Help'),
-            $this->trans('Permanent redirection (301) = Permanently display another product or category instead.', 'Admin.Catalog.Help'),
-            $this->trans('Temporary redirection (302) = Temporarily display another product or category instead.', 'Admin.Catalog.Help'),
+            $this->trans('[1]No redirection (200), display product[/1] [2] Do not redirect anywhere, display product as discontinued and return normal 200 response.', 'Admin.Catalog.Help', $formatParameters),
+            $this->trans('[1]No redirection (404), display product[/1] [2] Do not redirect anywhere, display product as discontinued and return 404 "Not Found" response.', 'Admin.Catalog.Help', $formatParameters),
+            $this->trans('[1]No redirection (410), display product[/1] [2] Do not redirect anywhere, display product as discontinued and return 410 "Gone" response.', 'Admin.Catalog.Help', $formatParameters),
+            $this->trans('[1]No redirection (404), display error page[/1] [2] Do not redirect anywhere and display a 404 "Not Found" page.', 'Admin.Catalog.Help', $formatParameters),
+            $this->trans('[1]No redirection (410), display error page[/1] [2] Do not redirect anywhere and display a 410 "Gone" page.', 'Admin.Catalog.Help', $formatParameters),
+            $this->trans('[1]Permanent redirection (301)[/1] [2] Permanently display another product or category instead.', 'Admin.Catalog.Help', $formatParameters),
+            $this->trans('[1]Temporary redirection (302)[/1] [2] Temporarily display another product or category instead.', 'Admin.Catalog.Help', $formatParameters),
         ];
     }
 }
diff --git a/src/PrestaShopBundle/Resources/views/Admin/TwigTemplateForm/prestashop_ui_kit_base.html.twig b/src/PrestaShopBundle/Resources/views/Admin/TwigTemplateForm/prestashop_ui_kit_base.html.twig
index c2d0236891a28..e1525d2a4c44e 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/TwigTemplateForm/prestashop_ui_kit_base.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/TwigTemplateForm/prestashop_ui_kit_base.html.twig
@@ -1265,11 +1265,19 @@
 
     {% if alert_title is defined %}
       <div class="alert-more collapse" id="expandable_{{form.vars.id}}" style="">
-        {% for message in alert_message %}
-          <p>
-            {{ message|raw }}
-          </p>
-        {% endfor %}
+        {% if alert_message|length > 1 %}
+          <ul class="p-0">
+            {% for message in alert_message %}
+              <li>{{ message|raw }}</li>
+            {% endfor %}
+          </ul>
+        {% else %}
+          {% for message in alert_message %}
+            <p>
+              {{ message|raw }}
+            </p>
+          {% endfor %}
+        {% endif %}
       </div>
       <div class="read-more-container">
          <button type="button" class="read-more btn-link" data-toggle="collapse" data-target="#expandable_{{form.vars.id}}" aria-expanded="true" aria-controls="collapseDanger">

From dea786982484a626f12773b0c1008c95d93ab382 Mon Sep 17 00:00:00 2001
From: Daniel Hlavacek <daniel.hlavacek@hotmail.cz>
Date: Tue, 8 Aug 2023 14:15:00 +0200
Subject: [PATCH 0727/1030] Fix dropExistingForeignKeys

---
 src/PrestaShopBundle/Command/UpdateSchemaCommand.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/PrestaShopBundle/Command/UpdateSchemaCommand.php b/src/PrestaShopBundle/Command/UpdateSchemaCommand.php
index f0b71a6babc4e..11a2da6f160a1 100644
--- a/src/PrestaShopBundle/Command/UpdateSchemaCommand.php
+++ b/src/PrestaShopBundle/Command/UpdateSchemaCommand.php
@@ -122,7 +122,7 @@ public function execute(InputInterface $input, OutputInterface $output)
      */
     public function dropExistingForeignKeys(Connection $connection, OutputInterface $output): int
     {
-        // First drop any existing FK
+        // Get foreign key list in all tables with our prefix
         $query = $connection->executeQuery(
             'SELECT CONSTRAINT_NAME, TABLE_NAME ' .
             'FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS ' .
@@ -132,16 +132,16 @@ public function dropExistingForeignKeys(Connection $connection, OutputInterface
         );
 
         $results = $query->fetchAllAssociative();
-        $nbQueries = 0;
+        $affectedRows = 0;
 
         foreach ($results as $result) {
             $drop = 'ALTER TABLE ' . $result['TABLE_NAME'] . ' DROP FOREIGN KEY ' . $result['CONSTRAINT_NAME'];
             $output->writeln('Executing: ' . $drop);
 
-            $nbQueries += $connection->executeQuery($drop);
+            $affectedRows += $connection->executeQuery($drop)->rowCount();
         }
 
-        return $nbQueries;
+        return $affectedRows;
     }
 
     /**

From 3711c8656ddf9f8b9e18d2091a6655941a7e3ede Mon Sep 17 00:00:00 2001
From: boherm <boris.hermans@prestashop.com>
Date: Tue, 25 Jul 2023 18:38:24 +0200
Subject: [PATCH 0728/1030] Add Reorder positions button type

---
 .../grid/extension/position-extension.ts      | 64 +++++++++++++++++++
 .../Admin/Type/ReorderPositionsButtonType.php | 51 +++++++++++++++
 .../config/services/bundle/form/form_type.yml |  7 ++
 3 files changed, 122 insertions(+)
 create mode 100644 src/PrestaShopBundle/Form/Admin/Type/ReorderPositionsButtonType.php

diff --git a/admin-dev/themes/new-theme/js/components/grid/extension/position-extension.ts b/admin-dev/themes/new-theme/js/components/grid/extension/position-extension.ts
index e21274edd56ee..878c25f5d291b 100644
--- a/admin-dev/themes/new-theme/js/components/grid/extension/position-extension.ts
+++ b/admin-dev/themes/new-theme/js/components/grid/extension/position-extension.ts
@@ -82,6 +82,9 @@ export default class PositionExtension {
             .removeClass('hover');
         },
       );
+
+    this.setReorderButtonLabel();
+    this.getReorderButton().on('click', (event) => this.oncClickReorderButton(event));
   }
 
   /**
@@ -255,4 +258,65 @@ export default class PositionExtension {
 
     return mapping;
   }
+
+  /**
+   * Check if position reorder is active
+   *
+   * @private
+   */
+  private isPositionsReorderActive(): boolean {
+    return this.grid.getContainer()
+      .find('.ps-sortable-column[data-sort-col-name="position"]')
+      .first()
+      .data('sort-is-current');
+  }
+
+  /**
+   * Get reorder button
+   *
+   * @private
+   */
+  private getReorderButton(): JQuery<HTMLElement> {
+    return this.grid
+      .getContainer()
+      .find('.js-btn-reorder-positions')
+      .first();
+  }
+
+  /**
+   * Set reorder button label in function of sortable column state.
+   *
+   * @private
+   */
+  private setReorderButtonLabel(): void {
+    const rearrangeButton = this.getReorderButton();
+    const label = this.isPositionsReorderActive()
+      ? rearrangeButton.data('label-save')
+      : rearrangeButton.data('label-reorder');
+    rearrangeButton.html(label);
+  }
+
+  /**
+   * Onclick reorder button
+   *
+   * @param event
+   * @private
+   */
+  private oncClickReorderButton(event: JQuery.Event): void {
+    event.preventDefault();
+    // If positions are actually being reordered...
+    if (this.isPositionsReorderActive()) {
+      // we need to reset filters and order by of the grid
+      this.grid.getContainer()
+        .find('.ps-sortable-column')
+        .first()
+        .click();
+    } else {
+      // Else, we need to set the position column as the current sort ordering
+      this.grid.getContainer()
+        .find('.ps-sortable-column[data-sort-col-name="position"]')
+        .first()
+        .click();
+    }
+  }
 }
diff --git a/src/PrestaShopBundle/Form/Admin/Type/ReorderPositionsButtonType.php b/src/PrestaShopBundle/Form/Admin/Type/ReorderPositionsButtonType.php
new file mode 100644
index 0000000000000..cc13455b07083
--- /dev/null
+++ b/src/PrestaShopBundle/Form/Admin/Type/ReorderPositionsButtonType.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShopBundle\Form\Admin\Type;
+
+use Symfony\Component\Form\Extension\Core\Type\ButtonType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+/**
+ * Class ReorderPositionsButtonType.
+ */
+class ReorderPositionsButtonType extends TranslatorAwareType
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder->add('position', ButtonType::class, [
+            'label' => $this->trans('Rearrange', 'Admin.Actions'),
+            'attr' => [
+                'class' => 'btn-default js-btn-reorder-positions',
+                'data-label-reorder' => $this->trans('Rearrange', 'Admin.Actions'),
+                'data-label-save' => $this->trans('Done', 'Admin.Actions'),
+            ],
+        ]);
+    }
+}
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
index c8e81c6ea6f81..5854002b741bc 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
@@ -2212,3 +2212,10 @@ services:
     autowire: true
     autoconfigure: true
     public: false
+
+  PrestaShopBundle\Form\Admin\Type\ReorderPositionsButtonType:
+    autowire: true
+    autoconfigure: true
+    public: false
+    arguments:
+      $locales: "@=service('prestashop.adapter.legacy.context').getLanguages()"

From 3e7d1614f28a26203f3ddd27869b6f390ca88161 Mon Sep 17 00:00:00 2001
From: boherm <boris.hermans@prestashop.com>
Date: Tue, 25 Jul 2023 18:39:00 +0200
Subject: [PATCH 0729/1030] Fix positions filters to add reorder button on some
 grids

---
 .../Factory/AttributeGridDefinitionFactory.php       |  9 ++-------
 .../Factory/AttributeGroupGridDefinitionFactory.php  |  9 ++-------
 .../Factory/CarrierGridDefinitionFactory.php         |  6 ++----
 .../Factory/CmsPageCategoryDefinitionFactory.php     |  9 ++-------
 .../Definition/Factory/CmsPageDefinitionFactory.php  |  9 ++-------
 .../Factory/ProductGridDefinitionFactory.php         | 12 ++++--------
 6 files changed, 14 insertions(+), 40 deletions(-)

diff --git a/src/Core/Grid/Definition/Factory/AttributeGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/AttributeGridDefinitionFactory.php
index e2f58a9cfb631..94876eb693b5a 100644
--- a/src/Core/Grid/Definition/Factory/AttributeGridDefinitionFactory.php
+++ b/src/Core/Grid/Definition/Factory/AttributeGridDefinitionFactory.php
@@ -44,6 +44,7 @@
 use PrestaShop\PrestaShop\Core\Grid\Filter\Filter;
 use PrestaShop\PrestaShop\Core\Grid\Filter\FilterCollection;
 use PrestaShop\PrestaShop\Core\Hook\HookDispatcherInterface;
+use PrestaShopBundle\Form\Admin\Type\ReorderPositionsButtonType;
 use PrestaShopBundle\Form\Admin\Type\SearchAndResetType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\HttpFoundation\Request;
@@ -232,13 +233,7 @@ protected function getFilters()
             ])
             ->setAssociatedColumn('value')
             )
-            ->add((new Filter('position', TextType::class))
-            ->setTypeOptions([
-                'required' => false,
-                'attr' => [
-                    'placeholder' => $this->trans('Search position', [], 'Admin.Actions'),
-                ],
-            ])
+            ->add((new Filter('position', ReorderPositionsButtonType::class))
             ->setAssociatedColumn('position')
             )
             ->add((new Filter('actions', SearchAndResetType::class))
diff --git a/src/Core/Grid/Definition/Factory/AttributeGroupGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/AttributeGroupGridDefinitionFactory.php
index 05138fd1ef8c4..7a2736df0a6ad 100644
--- a/src/Core/Grid/Definition/Factory/AttributeGroupGridDefinitionFactory.php
+++ b/src/Core/Grid/Definition/Factory/AttributeGroupGridDefinitionFactory.php
@@ -39,6 +39,7 @@
 use PrestaShop\PrestaShop\Core\Grid\Column\Type\Common\PositionColumn;
 use PrestaShop\PrestaShop\Core\Grid\Filter\Filter;
 use PrestaShop\PrestaShop\Core\Grid\Filter\FilterCollection;
+use PrestaShopBundle\Form\Admin\Type\ReorderPositionsButtonType;
 use PrestaShopBundle\Form\Admin\Type\SearchAndResetType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\HttpFoundation\Request;
@@ -197,13 +198,7 @@ protected function getFilters()
             ])
             ->setAssociatedColumn('name')
             )
-            ->add((new Filter('position', TextType::class))
-            ->setTypeOptions([
-                'required' => false,
-                'attr' => [
-                    'placeholder' => $this->trans('Search position', [], 'Admin.Actions'),
-                ],
-            ])
+            ->add((new Filter('position', ReorderPositionsButtonType::class))
             ->setAssociatedColumn('position')
             )
             ->add((new Filter('actions', SearchAndResetType::class))
diff --git a/src/Core/Grid/Definition/Factory/CarrierGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/CarrierGridDefinitionFactory.php
index a0152540bfdde..774a5d9db2a04 100644
--- a/src/Core/Grid/Definition/Factory/CarrierGridDefinitionFactory.php
+++ b/src/Core/Grid/Definition/Factory/CarrierGridDefinitionFactory.php
@@ -44,6 +44,7 @@
 use PrestaShop\PrestaShop\Core\Grid\Column\Type\Common\ToggleColumn;
 use PrestaShop\PrestaShop\Core\Grid\Filter\Filter;
 use PrestaShop\PrestaShop\Core\Grid\Filter\FilterCollection;
+use PrestaShopBundle\Form\Admin\Type\ReorderPositionsButtonType;
 use PrestaShopBundle\Form\Admin\Type\SearchAndResetType;
 use PrestaShopBundle\Form\Admin\Type\YesAndNoChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
@@ -204,11 +205,8 @@ protected function getFilters()
                     ])
             )
             ->add(
-                (new Filter('position', TextType::class))
+                (new Filter('position', ReorderPositionsButtonType::class))
                     ->setAssociatedColumn('position')
-                    ->setTypeOptions([
-                        'required' => false,
-                    ])
             )
             ->add(
                 (new Filter('actions', SearchAndResetType::class))
diff --git a/src/Core/Grid/Definition/Factory/CmsPageCategoryDefinitionFactory.php b/src/Core/Grid/Definition/Factory/CmsPageCategoryDefinitionFactory.php
index 9dc3bb030d31b..d0a6069fd9924 100644
--- a/src/Core/Grid/Definition/Factory/CmsPageCategoryDefinitionFactory.php
+++ b/src/Core/Grid/Definition/Factory/CmsPageCategoryDefinitionFactory.php
@@ -43,6 +43,7 @@
 use PrestaShop\PrestaShop\Core\Grid\Filter\FilterCollection;
 use PrestaShop\PrestaShop\Core\Hook\HookDispatcherInterface;
 use PrestaShop\PrestaShop\Core\Multistore\MultistoreContextCheckerInterface;
+use PrestaShopBundle\Form\Admin\Type\ReorderPositionsButtonType;
 use PrestaShopBundle\Form\Admin\Type\SearchAndResetType;
 use PrestaShopBundle\Form\Admin\Type\YesAndNoChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
@@ -266,13 +267,7 @@ protected function getFilters()
 
         if ($this->isAllShopContextOrShopFeatureIsNotUsed()) {
             $filterCollection
-                ->add((new Filter('position', TextType::class))
-                ->setTypeOptions([
-                    'required' => false,
-                    'attr' => [
-                        'placeholder' => $this->trans('Position', [], 'Admin.Global'),
-                    ],
-                ])
+                ->add((new Filter('position', ReorderPositionsButtonType::class))
                 ->setAssociatedColumn('position')
                 )
             ;
diff --git a/src/Core/Grid/Definition/Factory/CmsPageDefinitionFactory.php b/src/Core/Grid/Definition/Factory/CmsPageDefinitionFactory.php
index dad9ee51bbfd0..df0107d56b041 100644
--- a/src/Core/Grid/Definition/Factory/CmsPageDefinitionFactory.php
+++ b/src/Core/Grid/Definition/Factory/CmsPageDefinitionFactory.php
@@ -44,6 +44,7 @@
 use PrestaShop\PrestaShop\Core\Grid\Filter\FilterCollection;
 use PrestaShop\PrestaShop\Core\Hook\HookDispatcherInterface;
 use PrestaShop\PrestaShop\Core\Multistore\MultistoreContextCheckerInterface;
+use PrestaShopBundle\Form\Admin\Type\ReorderPositionsButtonType;
 use PrestaShopBundle\Form\Admin\Type\SearchAndResetType;
 use PrestaShopBundle\Form\Admin\Type\YesAndNoChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
@@ -278,13 +279,7 @@ protected function getFilters()
 
         if ($this->isAllShopContextOrShopFeatureIsNotUsed()) {
             $filterCollection
-                ->add((new Filter('position', TextType::class))
-                ->setTypeOptions([
-                    'required' => false,
-                    'attr' => [
-                        'placeholder' => $this->trans('Position', [], 'Admin.Global'),
-                    ],
-                ])
+                ->add((new Filter('position', ReorderPositionsButtonType::class))
                 ->setAssociatedColumn('position')
                 )
             ;
diff --git a/src/Core/Grid/Definition/Factory/ProductGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/ProductGridDefinitionFactory.php
index 2fff6f4990985..b2eff8bfb6874 100644
--- a/src/Core/Grid/Definition/Factory/ProductGridDefinitionFactory.php
+++ b/src/Core/Grid/Definition/Factory/ProductGridDefinitionFactory.php
@@ -57,6 +57,7 @@
 use PrestaShop\PrestaShop\Core\Shop\ShopConstraintContextInterface;
 use PrestaShopBundle\Form\Admin\Type\IntegerMinMaxFilterType;
 use PrestaShopBundle\Form\Admin\Type\NumberMinMaxFilterType;
+use PrestaShopBundle\Form\Admin\Type\ReorderPositionsButtonType;
 use PrestaShopBundle\Form\Admin\Type\SearchAndResetType;
 use PrestaShopBundle\Form\Admin\Type\ShopSelectorType;
 use PrestaShopBundle\Form\Admin\Type\YesAndNoChoiceType;
@@ -576,14 +577,9 @@ protected function getFilters()
                 (new Filter('active', YesAndNoChoiceType::class))
                     ->setAssociatedColumn('active')
             )
-            ->add((new Filter('position', TextType::class))
-            ->setAssociatedColumn('position')
-            ->setTypeOptions([
-                'required' => false,
-                'attr' => [
-                    'placeholder' => $this->trans('Search position', [], 'Admin.Actions'),
-                ],
-            ])
+            ->add(
+                (new Filter('position', ReorderPositionsButtonType::class))
+                    ->setAssociatedColumn('position')
             )
             ->add(
                 (new Filter('actions', SearchAndResetType::class))

From f82a6aa2a1bc09a58acd26a514591d5812f27f1f Mon Sep 17 00:00:00 2001
From: boherm <boris.hermans@prestashop.com>
Date: Tue, 25 Jul 2023 18:57:52 +0200
Subject: [PATCH 0730/1030] Add row_attr support for button row to improve ui

---
 .../Form/Admin/Type/ReorderPositionsButtonType.php             | 1 +
 .../views/Admin/TwigTemplateForm/bootstrap_4_layout.html.twig  | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/PrestaShopBundle/Form/Admin/Type/ReorderPositionsButtonType.php b/src/PrestaShopBundle/Form/Admin/Type/ReorderPositionsButtonType.php
index cc13455b07083..37c3dbd8627d9 100644
--- a/src/PrestaShopBundle/Form/Admin/Type/ReorderPositionsButtonType.php
+++ b/src/PrestaShopBundle/Form/Admin/Type/ReorderPositionsButtonType.php
@@ -41,6 +41,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder->add('position', ButtonType::class, [
             'label' => $this->trans('Rearrange', 'Admin.Actions'),
+            'row_attr' => ['class' => 'mb-0'],
             'attr' => [
                 'class' => 'btn-default js-btn-reorder-positions',
                 'data-label-reorder' => $this->trans('Rearrange', 'Admin.Actions'),
diff --git a/src/PrestaShopBundle/Resources/views/Admin/TwigTemplateForm/bootstrap_4_layout.html.twig b/src/PrestaShopBundle/Resources/views/Admin/TwigTemplateForm/bootstrap_4_layout.html.twig
index ccff10d8f6eea..17414bea5f6e1 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/TwigTemplateForm/bootstrap_4_layout.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/TwigTemplateForm/bootstrap_4_layout.html.twig
@@ -505,7 +505,8 @@
 {%- endblock form_row %}
 
 {% block button_row -%}
-    <div class="form-group">
+  {% set rowClass = "form-group " ~ form.vars.row_attr.class|default('')|trim %}
+    <div class="{{ rowClass }}">
         {{- form_widget(form) -}}
     </div>
 {%- endblock button_row %}

From 6392663e432869fa60c7a33573dd39e5a20d3f6e Mon Sep 17 00:00:00 2001
From: Fabien Papet <fabien.papet@gmail.com>
Date: Fri, 23 Jun 2023 12:59:36 +0200
Subject: [PATCH 0731/1030] Symfony 6 - Fix user deprecations

Signed-off-by: Fabien Papet <fabien.papet@gmail.com>
---
 src/Adapter/Security/Admin.php                     |  2 +-
 .../Resources/config/services/bundle/new_api.yml   |  2 +-
 src/PrestaShopBundle/Security/Admin/Employee.php   |  5 +++++
 .../Security/Admin/EmployeeProvider.php            | 14 ++++++++++++--
 .../OAuth2/Repository/ClientRepository.php         | 10 +++++-----
 .../Security/OAuth2/ResourceServer.php             |  6 +++---
 .../Service/DataProvider/UserProvider.php          |  4 ++--
 ...est.php => InvoiceOptionsConfigurationTest.php} |  0
 .../BulkDeleteCustomersSessionHandlerTest.php      |  2 +-
 .../Security/ValueObject/CustomerSessionIdTest.php |  2 +-
 .../Security/ValueObject/EmployeeSessionIdTest.php |  2 +-
 .../OAuth2/Repository/ClientRepositoryTest.php     | 10 +++++-----
 12 files changed, 37 insertions(+), 22 deletions(-)
 rename tests/Unit/Adapter/Invoice/{InvoicesConfigurationTest.php => InvoiceOptionsConfigurationTest.php} (100%)

diff --git a/src/Adapter/Security/Admin.php b/src/Adapter/Security/Admin.php
index c84ac76d57290..c8f3c6f676cfc 100644
--- a/src/Adapter/Security/Admin.php
+++ b/src/Adapter/Security/Admin.php
@@ -98,7 +98,7 @@ public function onKernelRequest(RequestEvent $event)
 
         //if employee loggdin in legacy context, authenticate him into sf2 security context
         if (isset($this->legacyContext->employee) && $this->legacyContext->employee->isLoggedBack()) {
-            $user = $this->userProvider->loadUserByUsername($this->legacyContext->employee->email);
+            $user = $this->userProvider->loadUserByIdentifier($this->legacyContext->employee->email);
             $token = new UsernamePasswordToken($user, 'admin', $user->getRoles());
             $this->securityTokenStorage->setToken($token);
 
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/new_api.yml b/src/PrestaShopBundle/Resources/config/services/bundle/new_api.yml
index 46b2648140809..fcd7e75897eff 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/new_api.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/new_api.yml
@@ -5,7 +5,7 @@ services:
   PrestaShopBundle\Security\OAuth2\Repository\ClientRepository:
     arguments:
       - '@security.user.provider.concrete.oauth2'
-      - '@security.user_password_encoder.generic'
+      - '@security.user_password_hasher'
 
   PrestaShopBundle\Security\OAuth2\Repository\AccessTokenRepository:
 
diff --git a/src/PrestaShopBundle/Security/Admin/Employee.php b/src/PrestaShopBundle/Security/Admin/Employee.php
index fd8af08e87975..43ce759fcb15a 100644
--- a/src/PrestaShopBundle/Security/Admin/Employee.php
+++ b/src/PrestaShopBundle/Security/Admin/Employee.php
@@ -120,6 +120,11 @@ public function getUsername()
         return $this->username;
     }
 
+    public function getUserIdentifier(): string
+    {
+        return $this->getUsername();
+    }
+
     /**
      * Get the id of the current employee.
      *
diff --git a/src/PrestaShopBundle/Security/Admin/EmployeeProvider.php b/src/PrestaShopBundle/Security/Admin/EmployeeProvider.php
index 47773492dcb1b..705e4bf8b546e 100644
--- a/src/PrestaShopBundle/Security/Admin/EmployeeProvider.php
+++ b/src/PrestaShopBundle/Security/Admin/EmployeeProvider.php
@@ -72,7 +72,7 @@ public function __construct(
      *
      * @throws UserNotFoundException
      */
-    public function loadUserByUsername($username)
+    public function loadUserByIdentifier(string $username): Employee
     {
         $cacheKey = sha1($username);
         $cachedEmployee = $this->cache->getItem("app.employees_{$cacheKey}");
@@ -112,7 +112,7 @@ public function refreshUser(UserInterface $employee)
             throw new UnsupportedUserException(sprintf('Instances of "%s" are not supported.', $employee::class));
         }
 
-        return $this->loadUserByUsername($employee->getUsername());
+        return $this->loadUserByIdentifier($employee->getUserIdentifier());
     }
 
     /**
@@ -126,4 +126,14 @@ public function supportsClass($class)
     {
         return $class === 'PrestaShopBundle\Security\Admin\Employee';
     }
+
+    /**
+     * Needed by the interface but not used.
+     *
+     * @deprecated since 9.0, to be removed when Symfony > 6.à
+     */
+    public function loadUserByUsername(string $username)
+    {
+        return $this->loadUserByIdentifier($username);
+    }
 }
diff --git a/src/PrestaShopBundle/Security/OAuth2/Repository/ClientRepository.php b/src/PrestaShopBundle/Security/OAuth2/Repository/ClientRepository.php
index 7ca977844d257..73973299f1536 100644
--- a/src/PrestaShopBundle/Security/OAuth2/Repository/ClientRepository.php
+++ b/src/PrestaShopBundle/Security/OAuth2/Repository/ClientRepository.php
@@ -30,7 +30,7 @@
 
 use League\OAuth2\Server\Repositories\ClientRepositoryInterface;
 use PrestaShopBundle\Security\OAuth2\Entity\Client;
-use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
+use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
 use Symfony\Component\Security\Core\Exception\UserNotFoundException;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Security\Core\User\UserProviderInterface;
@@ -48,11 +48,11 @@ class ClientRepository implements ClientRepositoryInterface
     private $userProvider;
 
     /**
-     * @var UserPasswordEncoderInterface
+     * @var UserPasswordHasherInterface
      */
     private $passwordEncoder;
 
-    public function __construct(UserProviderInterface $userProvider, UserPasswordEncoderInterface $passwordEncoder)
+    public function __construct(UserProviderInterface $userProvider, UserPasswordHasherInterface $passwordEncoder)
     {
         $this->userProvider = $userProvider;
         $this->passwordEncoder = $passwordEncoder;
@@ -67,7 +67,7 @@ public function getClientEntity($clientIdentifier): ?Client
         }
 
         $client = new Client();
-        $client->setIdentifier($user->getUsername());
+        $client->setIdentifier($user->getUserIdentifier());
 
         return $client;
     }
@@ -85,7 +85,7 @@ public function validateClient($clientIdentifier, $clientSecret, $grantType): bo
     private function getUser($clientIdentifier): ?UserInterface
     {
         try {
-            return $this->userProvider->loadUserByUsername($clientIdentifier);
+            return $this->userProvider->loadUserByIdentifier($clientIdentifier);
         } catch (UserNotFoundException $exception) {
             return null;
         }
diff --git a/src/PrestaShopBundle/Security/OAuth2/ResourceServer.php b/src/PrestaShopBundle/Security/OAuth2/ResourceServer.php
index c712a3cc2cba0..d53b85e7b0da1 100644
--- a/src/PrestaShopBundle/Security/OAuth2/ResourceServer.php
+++ b/src/PrestaShopBundle/Security/OAuth2/ResourceServer.php
@@ -64,7 +64,7 @@ public function isTokenValid(ServerRequestInterface $request): bool
     {
         try {
             $this->leagueResourceServer->validateAuthenticatedRequest($request);
-        } catch (OAuthServerException $e) {
+        } catch (OAuthServerException) {
             return false;
         }
 
@@ -79,7 +79,7 @@ public function getUser(ServerRequestInterface $request): ?UserInterface
         }
 
         try {
-            return $this->userProvider->loadUserByUsername($audience);
+            return $this->userProvider->loadUserByIdentifier($audience);
         } catch (UserNotFoundException $exception) {
             return null;
         }
@@ -89,7 +89,7 @@ private function getAudience(ServerRequestInterface $request): ?string
     {
         try {
             return $this->leagueResourceServer->validateAuthenticatedRequest($request)->getAttribute('oauth_client_id');
-        } catch (OAuthServerException $exception) {
+        } catch (OAuthServerException) {
             return null;
         }
     }
diff --git a/src/PrestaShopBundle/Service/DataProvider/UserProvider.php b/src/PrestaShopBundle/Service/DataProvider/UserProvider.php
index 04a79345db767..f85bc4045ae4d 100644
--- a/src/PrestaShopBundle/Service/DataProvider/UserProvider.php
+++ b/src/PrestaShopBundle/Service/DataProvider/UserProvider.php
@@ -59,7 +59,7 @@ public function getUser(): ?UserInterface
         }
 
         if ($this->legacyContext->getContext()->employee && !empty($this->legacyContext->getContext()->employee->email)) {
-            return $this->userProvider->loadUserByUsername($this->legacyContext->getContext()->employee->email);
+            return $this->userProvider->loadUserByIdentifier($this->legacyContext->getContext()->employee->email);
         }
 
         return null;
@@ -69,7 +69,7 @@ public function getUsername(): string
     {
         $user = $this->getUser();
         if ($user instanceof UserInterface) {
-            return $user->getUsername();
+            return $user->getUserIdentifier();
         }
 
         return self::ANONYMOUS_USER;
diff --git a/tests/Unit/Adapter/Invoice/InvoicesConfigurationTest.php b/tests/Unit/Adapter/Invoice/InvoiceOptionsConfigurationTest.php
similarity index 100%
rename from tests/Unit/Adapter/Invoice/InvoicesConfigurationTest.php
rename to tests/Unit/Adapter/Invoice/InvoiceOptionsConfigurationTest.php
diff --git a/tests/Unit/Adapter/Security/CommandHandler/BulkDeleteCustomersSessionHandlerTest.php b/tests/Unit/Adapter/Security/CommandHandler/BulkDeleteCustomersSessionHandlerTest.php
index c50addec92d35..61b80f7f5dd87 100644
--- a/tests/Unit/Adapter/Security/CommandHandler/BulkDeleteCustomersSessionHandlerTest.php
+++ b/tests/Unit/Adapter/Security/CommandHandler/BulkDeleteCustomersSessionHandlerTest.php
@@ -33,7 +33,7 @@
 use PrestaShop\PrestaShop\Adapter\Session\Repository\CustomerSessionRepository;
 use PrestaShop\PrestaShop\Core\Domain\Security\Command\BulkDeleteCustomerSessionsCommand;
 
-class BulkDeleteCustomerSessionHandlerTest extends TestCase
+class BulkDeleteCustomersSessionHandlerTest extends TestCase
 {
     public function testHandleDeleteShouldBeCalledOnlyOnce(): void
     {
diff --git a/tests/Unit/Core/Domain/Security/ValueObject/CustomerSessionIdTest.php b/tests/Unit/Core/Domain/Security/ValueObject/CustomerSessionIdTest.php
index 1ca00bfac4acc..53f2b4d2cabcb 100644
--- a/tests/Unit/Core/Domain/Security/ValueObject/CustomerSessionIdTest.php
+++ b/tests/Unit/Core/Domain/Security/ValueObject/CustomerSessionIdTest.php
@@ -32,7 +32,7 @@
 use PrestaShop\PrestaShop\Core\Domain\Security\Exception\SessionException;
 use PrestaShop\PrestaShop\Core\Domain\Security\ValueObject\CustomerSessionId;
 
-class CustomerSessionTest extends TestCase
+class CustomerSessionIdTest extends TestCase
 {
     /**
      * @dataProvider createsSessionIdWithValidValuesData
diff --git a/tests/Unit/Core/Domain/Security/ValueObject/EmployeeSessionIdTest.php b/tests/Unit/Core/Domain/Security/ValueObject/EmployeeSessionIdTest.php
index c6c1ff5653fbd..26203cf6019b3 100644
--- a/tests/Unit/Core/Domain/Security/ValueObject/EmployeeSessionIdTest.php
+++ b/tests/Unit/Core/Domain/Security/ValueObject/EmployeeSessionIdTest.php
@@ -32,7 +32,7 @@
 use PrestaShop\PrestaShop\Core\Domain\Security\Exception\SessionException;
 use PrestaShop\PrestaShop\Core\Domain\Security\ValueObject\EmployeeSessionId;
 
-class EmployeeSessionTest extends TestCase
+class EmployeeSessionIdTest extends TestCase
 {
     /**
      * @dataProvider createsSessionIdWithValidValuesData
diff --git a/tests/Unit/PrestaShopBundle/Security/OAuth2/Repository/ClientRepositoryTest.php b/tests/Unit/PrestaShopBundle/Security/OAuth2/Repository/ClientRepositoryTest.php
index b1222bc783dc5..4c0c4ef5fe86d 100644
--- a/tests/Unit/PrestaShopBundle/Security/OAuth2/Repository/ClientRepositoryTest.php
+++ b/tests/Unit/PrestaShopBundle/Security/OAuth2/Repository/ClientRepositoryTest.php
@@ -29,10 +29,10 @@
 use League\OAuth2\Server\Entities\ClientEntityInterface;
 use PHPUnit\Framework\TestCase;
 use PrestaShopBundle\Security\OAuth2\Repository\ClientRepository;
-use Symfony\Component\Security\Core\Encoder\EncoderFactory;
-use Symfony\Component\Security\Core\Encoder\UserPasswordEncoder;
+use Symfony\Component\PasswordHasher\Hasher\PasswordHasherFactory;
+use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasher;
+use Symfony\Component\Security\Core\User\InMemoryUser;
 use Symfony\Component\Security\Core\User\InMemoryUserProvider;
-use Symfony\Component\Security\Core\User\User;
 
 class ClientRepositoryTest extends TestCase
 {
@@ -43,8 +43,8 @@ public function setUp(): void
         $userProvider = new InMemoryUserProvider(['myclientid' => ['password' => 'myclientsecret']]);
         $this->clientRepository = new ClientRepository(
             $userProvider,
-            new UserPasswordEncoder(new EncoderFactory([
-                User::class => ['algorithm' => 'plaintext', 'ignore_case' => false],
+            new UserPasswordHasher(new PasswordHasherFactory([
+                InMemoryUser::class => ['algorithm' => 'plaintext', 'ignore_case' => false],
             ]))
         );
         parent::setUp();

From 0a25ed3561f1247b814cd23872a00e7fa10bc23b Mon Sep 17 00:00:00 2001
From: lartist <salim-benouamer.ext@prestashop.com>
Date: Wed, 2 Aug 2023 06:44:59 +0200
Subject: [PATCH 0732/1030] Employee now implements
 PasswordAuthenticatedUserInterface

---
 src/PrestaShopBundle/Security/Admin/Employee.php     |  5 +++--
 .../Security/OAuth2/Repository/ClientRepository.php  | 12 +++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/PrestaShopBundle/Security/Admin/Employee.php b/src/PrestaShopBundle/Security/Admin/Employee.php
index 43ce759fcb15a..ed5a7a67403a8 100644
--- a/src/PrestaShopBundle/Security/Admin/Employee.php
+++ b/src/PrestaShopBundle/Security/Admin/Employee.php
@@ -27,12 +27,13 @@
 namespace PrestaShopBundle\Security\Admin;
 
 use Symfony\Component\Security\Core\User\EquatableInterface;
+use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
 
 /**
  * Class Employee is used for Symfony security components to authenticate the user.
  */
-class Employee implements UserInterface, EquatableInterface
+class Employee implements UserInterface, EquatableInterface, PasswordAuthenticatedUserInterface
 {
     /**
      * @var int
@@ -95,7 +96,7 @@ public function getRoles()
      *
      * @return string
      */
-    public function getPassword()
+    public function getPassword(): ?string
     {
         return $this->password;
     }
diff --git a/src/PrestaShopBundle/Security/OAuth2/Repository/ClientRepository.php b/src/PrestaShopBundle/Security/OAuth2/Repository/ClientRepository.php
index 73973299f1536..2cf633d5db7be 100644
--- a/src/PrestaShopBundle/Security/OAuth2/Repository/ClientRepository.php
+++ b/src/PrestaShopBundle/Security/OAuth2/Repository/ClientRepository.php
@@ -32,6 +32,7 @@
 use PrestaShopBundle\Security\OAuth2\Entity\Client;
 use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
 use Symfony\Component\Security\Core\Exception\UserNotFoundException;
+use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Security\Core\User\UserProviderInterface;
 
@@ -77,9 +78,18 @@ public function validateClient($clientIdentifier, $clientSecret, $grantType): bo
         if ($grantType !== 'client_credentials' || $clientSecret === null) {
             return false;
         }
+
         $client = $this->getUser($clientIdentifier);
 
-        return $client !== null && $this->passwordEncoder->isPasswordValid($client, $clientSecret);
+        if ($client === null) {
+            return false;
+        }
+
+        if (!$client instanceof PasswordAuthenticatedUserInterface) {
+            throw new \LogicException(sprintf('The class %s should implement %s.', $client::class, PasswordAuthenticatedUserInterface::class));
+        }
+
+        return $this->passwordEncoder->isPasswordValid($client, $clientSecret);
     }
 
     private function getUser($clientIdentifier): ?UserInterface

From 202149737a8dd97b14e3eae24dbb87581a022eb0 Mon Sep 17 00:00:00 2001
From: Jonathan Lelievre <jonathan.lelievre@prestashop.com>
Date: Tue, 8 Aug 2023 16:43:27 +0200
Subject: [PATCH 0733/1030] Use latest version of keycloak module

---
 tests/UI/data/demo/modules.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/UI/data/demo/modules.ts b/tests/UI/data/demo/modules.ts
index 8eaa2a234120b..1b4767ec3fd24 100644
--- a/tests/UI/data/demo/modules.ts
+++ b/tests/UI/data/demo/modules.ts
@@ -41,6 +41,6 @@ export default {
   keycloak: new ModuleData({
     tag: 'keycloak_connector_demo',
     name: 'Keycloak OAuth2 connector demo',
-    releaseZip: 'https://github.com/PrestaShop/keycloak_connector_demo/releases/download/v1.0.3/keycloak_connector_demo.zip',
+    releaseZip: 'https://github.com/PrestaShop/keycloak_connector_demo/releases/download/v1.0.4/keycloak_connector_demo.zip',
   }),
 };

From 50729674d3c758c12274ff973154ebb4178c39b5 Mon Sep 17 00:00:00 2001
From: Jonathan Lelievre <jonathan.lelievre@prestashop.com>
Date: Tue, 8 Aug 2023 17:25:52 +0200
Subject: [PATCH 0734/1030] ESLint for UX tests

---
 .../UI/pages/BO/shopParameters/customerSettings/titles/index.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/UI/pages/BO/shopParameters/customerSettings/titles/index.ts b/tests/UI/pages/BO/shopParameters/customerSettings/titles/index.ts
index fafdcd9978eb0..ebe412a48cb75 100644
--- a/tests/UI/pages/BO/shopParameters/customerSettings/titles/index.ts
+++ b/tests/UI/pages/BO/shopParameters/customerSettings/titles/index.ts
@@ -143,8 +143,6 @@ class Titles extends BOBasePage {
    * @return {Promise<void>}
    */
   async filterTitles(page: Page, filterType: string, filterBy: string, value: string): Promise<void> {
-    const currentUrl: string = page.url();
-
     switch (filterType) {
       case 'input':
         await this.setValue(page, this.filterColumn(filterBy), value);

From 295313dacf33129e8fb5392c79652089b42ea7a8 Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Tue, 27 Jun 2023 17:26:52 +0200
Subject: [PATCH 0735/1030] Add complexe query with optionnal parameters

---
 app/config/config.yml                         |  6 +-
 .../Converters/ConverterInterface.php         |  8 ++
 .../Converters/StringToIntConverter.php       | 11 +++
 .../ApiPlatform/Provider/QueryProvider.php    | 50 ++++++++++-
 .../ApiPlatform/Resources/SearchProduct.php   | 90 +++++++++++++++++++
 5 files changed, 160 insertions(+), 5 deletions(-)
 create mode 100644 src/PrestaShopBundle/ApiPlatform/Converters/ConverterInterface.php
 create mode 100644 src/PrestaShopBundle/ApiPlatform/Converters/StringToIntConverter.php
 create mode 100644 src/PrestaShopBundle/ApiPlatform/Resources/SearchProduct.php

diff --git a/app/config/config.yml b/app/config/config.yml
index ea74c1738d42a..38cde3bdd3a5a 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -100,5 +100,9 @@ api_platform:
   mapping:
     paths:
       - '%kernel.project_dir%/src/PrestaShopBundle/ApiPlatform/Resources'
-
+  swagger:
+    api_keys:
+      JWT:
+        name: Authorization
+        type: header
   metadata_backward_compatibility_layer: false
diff --git a/src/PrestaShopBundle/ApiPlatform/Converters/ConverterInterface.php b/src/PrestaShopBundle/ApiPlatform/Converters/ConverterInterface.php
new file mode 100644
index 0000000000000..25854f8e5b190
--- /dev/null
+++ b/src/PrestaShopBundle/ApiPlatform/Converters/ConverterInterface.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace PrestaShopBundle\ApiPlatform\Converters;
+
+interface ConverterInterface
+{
+    public function convert($value);
+}
diff --git a/src/PrestaShopBundle/ApiPlatform/Converters/StringToIntConverter.php b/src/PrestaShopBundle/ApiPlatform/Converters/StringToIntConverter.php
new file mode 100644
index 0000000000000..f8253411c8c81
--- /dev/null
+++ b/src/PrestaShopBundle/ApiPlatform/Converters/StringToIntConverter.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace PrestaShopBundle\ApiPlatform\Converters;
+
+class StringToIntConverter implements ConverterInterface
+{
+    public function convert($value): int
+    {
+        return (int) $value;
+    }
+}
diff --git a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
index 43a9acc35d1c4..87de5e67153d7 100644
--- a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
+++ b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
@@ -31,6 +31,8 @@
 use ApiPlatform\Metadata\Operation;
 use ApiPlatform\State\ProviderInterface;
 use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\PropertyAccess\PropertyAccess;
 use PrestaShopBundle\ApiPlatform\Exception\NoExtraPropertiesFoundException;
 use Symfony\Component\Serializer\Serializer;
 
@@ -38,21 +40,61 @@ class QueryProvider implements ProviderInterface
 {
     public function __construct(
         private readonly CommandBusInterface $queryBus,
+        private readonly RequestStack $requestStack,
         private readonly Serializer $apiPlatformSerializer
     ) {
     }
 
     public function provide(Operation $operation, array $uriVariables = [], array $context = [])
     {
-        $extraProperties = $operation->getExtraProperties();
-
-        $query = $extraProperties['query'] ?? null;
+        $query = $operation->getExtraProperties()['query'] ?? null;
+        $converters = $operation->getExtraProperties()['paramConverters'] ?? [];
+        $queryParams = $this->requestStack->getCurrentRequest()->query->all();
 
         if (null === $query) {
             throw new NoExtraPropertiesFoundException();
         }
 
-        $queryResult = $this->queryBus->handle(new $query(...$uriVariables));
+        //Convert uri params
+        foreach ($uriVariables as $variable => $value) {
+            if (array_key_exists($variable, $converters)) {
+                $converter = new $converters[$variable]();
+                $uriVariables[$variable] = $converter->convert($value);
+            }
+        }
+
+        //Convert query params
+        foreach ($queryParams as $variable => $value) {
+            if (array_key_exists($variable, $converters)) {
+                $converter = new $converters[$variable]();
+                $queryParams[$variable] = $converter->convert($value);
+            }
+        }
+
+        //Reset param array with orderer array
+        $params = array_values($uriVariables);
+
+        //Add optionnal parameters in construct from query params
+        $reflectionMethod = new \ReflectionMethod($query, '__construct');
+        $constructParameters = $reflectionMethod->getParameters();
+        foreach ($constructParameters as $parameter) {
+            if (array_key_exists($parameter->name, $queryParams)) {
+                $params[$parameter->getPosition()] = $queryParams[$parameter->name];
+                unset($queryParams[$parameter->name]);
+            }
+        }
+
+        $query = new $query(...$params);
+
+        //Try to call setter on additional query params
+        if (count($queryParams)) {
+            $propertyAccessor = PropertyAccess::createPropertyAccessor();
+            foreach ($queryParams as $param => $value) {
+                $propertyAccessor->setValue($query, $param, $value);
+            }
+        }
+
+        $queryResult = $this->queryBus->handle($query);
         $normalizedQueryResult = $this->apiPlatformSerializer->normalize($queryResult);
 
         return $this->apiPlatformSerializer->denormalize($normalizedQueryResult, $operation->getClass());
diff --git a/src/PrestaShopBundle/ApiPlatform/Resources/SearchProduct.php b/src/PrestaShopBundle/ApiPlatform/Resources/SearchProduct.php
new file mode 100644
index 0000000000000..5ee8a7f1ebdfc
--- /dev/null
+++ b/src/PrestaShopBundle/ApiPlatform/Resources/SearchProduct.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\ApiPlatform\Resources;
+
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Get;
+use PrestaShop\PrestaShop\Core\Domain\Product\Query\SearchProducts;
+use PrestaShopBundle\ApiPlatform\Converters\StringToIntConverter;
+use PrestaShopBundle\ApiPlatform\Provider\QueryProvider;
+
+#[ApiResource(
+    operations: [
+        new Get(
+            uriTemplate: '/products/search/{phrase}/{resultsLimit}/{isoCode}',
+            openapiContext: [
+                'parameters' => [
+                    [
+                        'name' => 'phrase',
+                        'in' => 'path',
+                        'required' => true,
+                        'schema' => [
+                            'type' => 'string',
+                        ],
+                    ],
+                    [
+                        'name' => 'resultsLimit',
+                        'in' => 'path',
+                        'required' => true,
+                        'schema' => [
+                            'type' => 'int',
+                        ],
+                    ],
+                    [
+                        'name' => 'isoCode',
+                        'in' => 'path',
+                        'required' => true,
+                        'schema' => [
+                            'type' => 'string',
+                        ],
+                    ],
+                    [
+                        'name' => 'orderId',
+                        'in' => 'query',
+                        'required' => false,
+                        'schema' => [
+                            'type' => 'int',
+                        ],
+                    ],
+                ],
+            ],
+            provider: QueryProvider::class,
+            extraProperties: [
+                'query' => SearchProducts::class,
+                'paramConverters' => [
+                    'resultsLimit' => StringToIntConverter::class,
+                    'orderId' => StringToIntConverter::class,
+                ],
+            ]
+        ),
+    ]
+)]
+class SearchProduct
+{
+}

From d9e3ba561cbe51bf32d171046fcc603a5a7c0dbc Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Wed, 28 Jun 2023 10:51:27 +0200
Subject: [PATCH 0736/1030] Add some tests

---
 .../ApiPlatform/Provider/QueryProvider.php    |   8 +-
 .../StateProvider/QueryProviderTest.php       | 156 ++++++++++--------
 2 files changed, 87 insertions(+), 77 deletions(-)

diff --git a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
index 87de5e67153d7..1b8ff693059d2 100644
--- a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
+++ b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
@@ -47,11 +47,11 @@ public function __construct(
 
     public function provide(Operation $operation, array $uriVariables = [], array $context = [])
     {
-        $query = $operation->getExtraProperties()['query'] ?? null;
+        $queryClass = $operation->getExtraProperties()['query'] ?? null;
         $converters = $operation->getExtraProperties()['paramConverters'] ?? [];
         $queryParams = $this->requestStack->getCurrentRequest()->query->all();
 
-        if (null === $query) {
+        if (null === $queryClass) {
             throw new NoExtraPropertiesFoundException();
         }
 
@@ -75,7 +75,7 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         $params = array_values($uriVariables);
 
         //Add optionnal parameters in construct from query params
-        $reflectionMethod = new \ReflectionMethod($query, '__construct');
+        $reflectionMethod = new \ReflectionMethod($queryClass, '__construct');
         $constructParameters = $reflectionMethod->getParameters();
         foreach ($constructParameters as $parameter) {
             if (array_key_exists($parameter->name, $queryParams)) {
@@ -84,7 +84,7 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
             }
         }
 
-        $query = new $query(...$params);
+        $query = new $queryClass(...$params);
 
         //Try to call setter on additional query params
         if (count($queryParams)) {
diff --git a/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php b/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
index f3eb9ec4b8291..86f35ffa9400f 100644
--- a/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
+++ b/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
@@ -36,10 +36,16 @@
 use PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHookStatus;
 use PrestaShop\PrestaShop\Core\Domain\Hook\QueryResult\Hook as HookQuery;
 use PrestaShop\PrestaShop\Core\Domain\Hook\QueryResult\HookStatus;
+use PrestaShop\PrestaShop\Core\Domain\Product\Query\SearchProducts;
+use PrestaShop\PrestaShop\Core\Domain\Product\QueryResult\FoundProduct;
+use PrestaShopBundle\ApiPlatform\Converters\StringToIntConverter;
 use PrestaShopBundle\ApiPlatform\Exception\NoExtraPropertiesFoundException;
 use PrestaShopBundle\ApiPlatform\Provider\QueryProvider;
 use PrestaShopBundle\ApiPlatform\Resources\Hook;
 use RuntimeException;
+use Symfony\Component\HttpFoundation\InputBag;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
 use Symfony\Component\Serializer\Serializer;
 
@@ -50,110 +56,114 @@ class QueryProviderTest extends TestCase
      */
     private $queryBus;
 
-    private Serializer|MockObject $serializer;
+    /**
+     * @var RequestStack
+     */
+    private $requestStack;
 
-    protected function setUp(): void
+    /**
+     * Set up dependencies for HookStatusProvider
+     */
+    public function setUp(): void
     {
         $this->serializer = new Serializer([new ObjectNormalizer()]);
         $this->queryBus = $this->createMock(CommandBusInterface::class);
-
+        $this->requestStack = $this->createMock(RequestStack::class);
+        $requestMock = $this
+            ->getMockBuilder(Request::class)
+            ->getMock();
+        $requestMock->query = new InputBag();
+        $this->requestStack
+            ->method('getCurrentRequest')
+            ->willReturn($requestMock);
         $this->queryBus
             ->method('handle')
+            ->willReturnCallback(function ($query) {
+                return $this->createHookStatusResultBasedOnQuery($query);
+            })
             ->willReturnCallback(function ($query) {
                 switch (get_class($query)) {
                     case GetHookStatus::class:
-                        return $this->createResultBasedOnHookStatusQuery($query);
-                    case GetHook::class:
-                        return $this->createResultBasedOnHookQuery($query);
+                        return $this->createHookStatusResultBasedOnQuery($query);
+                    case SearchProducts::class:
+                        return $this->createsSearchProductResultBasedOnQuery($query);
                 }
 
                 throw new RuntimeException(sprintf('Query type %s was not expected in query bus mock', get_class($query)));
             });
     }
 
-    private function createResultBasedOnHookStatusQuery(GetHookStatus $query): HookStatus
+    private function createHookStatusResultBasedOnQuery(GetHookStatus $query): HookStatus
     {
-        if ($query->getId()->getValue() === 1) {
-            return new HookStatus($query->getId()->getValue(), false);
+        if ($query->getHookId()->getValue() === 1) {
+            return new HookStatus($query->getHookId()->getValue(), false);
         }
 
-        if ($query->getId()->getValue() === 2) {
-            return new HookStatus($query->getId()->getValue(), true);
+        if ($query->getHookId()->getValue() === 2) {
+            return new HookStatus($query->getHookId()->getValue(), true);
         }
 
-        throw new RuntimeException(sprintf('Hook "%s" was not expected in query bus mock', $query->getId()->getValue()));
-    }
-
-    private function createResultBasedOnHookQuery(GetHook $query): HookQuery
-    {
-        if ($query->getId()->getValue() === 1) {
-            return new HookQuery(
-                $query->getId()->getValue(),
-                false,
-                'testName1',
-                'testTitle1',
-                'testDescription1'
-            );
-        }
-
-        if ($query->getId()->getValue() === 2) {
-            return new HookQuery(
-                $query->getId()->getValue(),
-                true,
-                'testName1',
-                'testTitle1',
-                'testDescription1'
-            );
-        }
-
-        throw new RuntimeException(sprintf('Hook "%s" was not expected in query bus mock', $query->getId()->getValue()));
+        throw new RuntimeException(sprintf('Hook "%s" was not expected in query bus mock', $query->getHookId()->getValue()));
     }
 
     public function testProvideHookStatus(): void
     {
-        $hookStatusProvider = new QueryProvider(
-            $this->queryBus,
-            $this->serializer,
-        );
+        $hookStatusProvider = new QueryProvider($this->queryBus, $this->requestStack);
         $get = new Get();
-        $get = $get
-            ->withExtraProperties(['query' => "PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHookStatus"])
-            ->withClass(Hook::class);
-        /** @var Hook $hookStatus */
-        $hookStatus = $hookStatusProvider->provide($get, ['id' => 1]);
-        self::assertEquals(false, $hookStatus->active);
-        /** @var Hook $hookStatus */
-        $hookStatus = $hookStatusProvider->provide($get, ['id' => 2]);
-        self::assertTrue($hookStatus->active);
+        $get = $get->withExtraProperties(['query' => GetHookStatus::class]);
+        /** @var HookStatus $hookStatus */
+        $hookStatus = $hookStatusProvider->provide($get, ['hookId' => 1]);
+        self::assertEquals(false, $hookStatus->isActive());
+        /** @var HookStatus $hookStatus */
+        $hookStatus = $hookStatusProvider->provide($get, ['hookId' => 2]);
+        self::assertTrue($hookStatus->isActive());
     }
 
-    public function testProvideHook(): void
+    /**
+     * @return FoundProduct[]
+     */
+    public function createsSearchProductResultBasedOnQuery(SearchProducts $query): array
     {
-        $hookStatusProvider = new QueryProvider(
-            $this->queryBus,
-            $this->serializer,
-        );
-        $get = new Get();
-        $get = $get
-            ->withExtraProperties(['query' => 'PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHook'])
-            ->withClass(Hook::class);
-        /** @var Hook $hookDto */
-        $hookDto = $hookStatusProvider->provide($get, ['id' => 1]);
-        self::assertEquals(false, $hookDto->active);
-        /** @var Hook $hookDto */
-        $hookDto = $hookStatusProvider->provide($get, ['id' => 2]);
-        self::assertTrue($hookDto->active);
+        if ($query->getPhrase() === 'mug') {
+            return [
+                new FoundProduct(
+                    1,
+                    'mug',
+                    '10 €',
+                    10,
+                    10,
+                    0,
+                    10,
+                    '',
+                    true
+                )
+            ];
+        }
+
+        if ($query->getOrderId() && ($query->getOrderId()->getValue() === 1)) {
+            return [];
+        }
+
+        throw new RuntimeException(sprintf('SearchProduct "%s" was not expected in query bus mock', $query->getPhrase()));
     }
 
-    public function testProvideNoQueryThrowsException(): void
+    public function testSearchProduct(): void
     {
-        $hookStatusProvider = new QueryProvider(
-            $this->queryBus,
-            $this->serializer,
-        );
+        $searchProductProvider = new QueryProvider($this->queryBus, $this->requestStack);
         $get = new Get();
-
-        $this->expectException(NoExtraPropertiesFoundException::class);
-        $hookStatusProvider->provide($get, ['id' => 1]);
+        $get = $get->withExtraProperties([
+            'query' => SearchProducts::class,
+            'paramConverters' => [
+                'resultsLimit' => StringToIntConverter::class,
+                'orderId' => StringToIntConverter::class,
+            ],
+        ]);
+        $searchProducts = $searchProductProvider->provide($get, ['phrase' => 'mug', 'resultsLimit' => 10, 'isoCode' => 'EUR']);
+        self::assertCount(1, $searchProducts);
+
+        $this->requestStack->getCurrentRequest()->query = new InputBag(['orderId' => 1]);
+        $searchProductProvider = new QueryProvider($this->queryBus, $this->requestStack);
+        $searchProducts = $searchProductProvider->provide($get, ['phrase' => 'search with order id', 'resultsLimit' => 10, 'isoCode' => 'EUR']);
+        self::assertCount(0, $searchProducts);
     }
 }

From feee9a89b0ba16f8390db2cba559c961af47eef3 Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Wed, 28 Jun 2023 10:53:07 +0200
Subject: [PATCH 0737/1030] Add license and strict types

---
 .../Converters/ConverterInterface.php         | 26 +++++++++++++++++++
 .../Converters/StringToIntConverter.php       | 26 +++++++++++++++++++
 .../StateProvider/QueryProviderTest.php       |  2 +-
 3 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/src/PrestaShopBundle/ApiPlatform/Converters/ConverterInterface.php b/src/PrestaShopBundle/ApiPlatform/Converters/ConverterInterface.php
index 25854f8e5b190..1d3c3e84a67ec 100644
--- a/src/PrestaShopBundle/ApiPlatform/Converters/ConverterInterface.php
+++ b/src/PrestaShopBundle/ApiPlatform/Converters/ConverterInterface.php
@@ -1,4 +1,30 @@
 <?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
 
 namespace PrestaShopBundle\ApiPlatform\Converters;
 
diff --git a/src/PrestaShopBundle/ApiPlatform/Converters/StringToIntConverter.php b/src/PrestaShopBundle/ApiPlatform/Converters/StringToIntConverter.php
index f8253411c8c81..6f9896e50ea54 100644
--- a/src/PrestaShopBundle/ApiPlatform/Converters/StringToIntConverter.php
+++ b/src/PrestaShopBundle/ApiPlatform/Converters/StringToIntConverter.php
@@ -1,4 +1,30 @@
 <?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
 
 namespace PrestaShopBundle\ApiPlatform\Converters;
 
diff --git a/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php b/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
index 86f35ffa9400f..82ace5e88c646 100644
--- a/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
+++ b/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
@@ -136,7 +136,7 @@ public function createsSearchProductResultBasedOnQuery(SearchProducts $query): a
                     10,
                     '',
                     true
-                )
+                ),
             ];
         }
 

From bcdca7fc7e3c65f8ad0163e7d1dd23ba317a5f7c Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Thu, 29 Jun 2023 20:00:06 +0200
Subject: [PATCH 0738/1030] Make converters called automatically by reflection

---
 .../Converters/ConverterInterface.php         |   2 +
 .../Converters/StringToIntConverter.php       |   5 +
 .../ApiPlatform/Provider/QueryProvider.php    | 105 ++++++++++++------
 .../ApiPlatform/Resources/SearchProduct.php   |   5 -
 .../config/services/bundle/new_api.yml        |   4 +
 .../config/services/bundle/services.yml       |   3 +
 6 files changed, 86 insertions(+), 38 deletions(-)

diff --git a/src/PrestaShopBundle/ApiPlatform/Converters/ConverterInterface.php b/src/PrestaShopBundle/ApiPlatform/Converters/ConverterInterface.php
index 1d3c3e84a67ec..8f55a8ab06a57 100644
--- a/src/PrestaShopBundle/ApiPlatform/Converters/ConverterInterface.php
+++ b/src/PrestaShopBundle/ApiPlatform/Converters/ConverterInterface.php
@@ -31,4 +31,6 @@
 interface ConverterInterface
 {
     public function convert($value);
+
+    public function supports($type);
 }
diff --git a/src/PrestaShopBundle/ApiPlatform/Converters/StringToIntConverter.php b/src/PrestaShopBundle/ApiPlatform/Converters/StringToIntConverter.php
index 6f9896e50ea54..b289cb3fa0130 100644
--- a/src/PrestaShopBundle/ApiPlatform/Converters/StringToIntConverter.php
+++ b/src/PrestaShopBundle/ApiPlatform/Converters/StringToIntConverter.php
@@ -34,4 +34,9 @@ public function convert($value): int
     {
         return (int) $value;
     }
+
+    public function supports($type): bool
+    {
+        return 'int' === $type;
+    }
 }
diff --git a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
index 1b8ff693059d2..95b2e282c404b 100644
--- a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
+++ b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
@@ -31,6 +31,7 @@
 use ApiPlatform\Metadata\Operation;
 use ApiPlatform\State\ProviderInterface;
 use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
+use PrestaShopBundle\ApiPlatform\Converters\ConverterInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\PropertyAccess\PropertyAccess;
 use PrestaShopBundle\ApiPlatform\Exception\NoExtraPropertiesFoundException;
@@ -40,57 +41,55 @@ class QueryProvider implements ProviderInterface
 {
     public function __construct(
         private readonly CommandBusInterface $queryBus,
-        private readonly RequestStack $requestStack,
-        private readonly Serializer $apiPlatformSerializer
+        private readonly Serializer $apiPlatformSerializer,
+        private readonly iterable $converters,
+        private readonly RequestStack $requestStack
     ) {
     }
 
+    /**
+     * @throws \ReflectionException
+     * @throws \Exception
+     */
     public function provide(Operation $operation, array $uriVariables = [], array $context = [])
     {
         $queryClass = $operation->getExtraProperties()['query'] ?? null;
-        $converters = $operation->getExtraProperties()['paramConverters'] ?? [];
         $queryParams = $this->requestStack->getCurrentRequest()->query->all();
-
-        if (null === $queryClass) {
-            throw new NoExtraPropertiesFoundException();
-        }
-
-        //Convert uri params
-        foreach ($uriVariables as $variable => $value) {
-            if (array_key_exists($variable, $converters)) {
-                $converter = new $converters[$variable]();
-                $uriVariables[$variable] = $converter->convert($value);
-            }
-        }
-
-        //Convert query params
-        foreach ($queryParams as $variable => $value) {
-            if (array_key_exists($variable, $converters)) {
-                $converter = new $converters[$variable]();
-                $queryParams[$variable] = $converter->convert($value);
-            }
-        }
-
-        //Reset param array with orderer array
-        $params = array_values($uriVariables);
+        $uriVariables = array_merge($uriVariables, $queryParams);
 
         //Add optionnal parameters in construct from query params
         $reflectionMethod = new \ReflectionMethod($queryClass, '__construct');
         $constructParameters = $reflectionMethod->getParameters();
+
+        $params = [];
+
         foreach ($constructParameters as $parameter) {
-            if (array_key_exists($parameter->name, $queryParams)) {
-                $params[$parameter->getPosition()] = $queryParams[$parameter->name];
-                unset($queryParams[$parameter->name]);
+            if (!isset($uriVariables[$parameter->name]) && !$parameter->isDefaultValueAvailable()) {
+                throw new \Exception(sprintf('Required parameter %s is not present', $parameter->name));
             }
+
+            $uriValue = $uriVariables[$parameter->name];
+            //Transform parameter type if needed
+            if ($parameter->getType() instanceof \ReflectionNamedType && $parameter->getType()->getName() !== gettype($uriValue)) {
+                $uriValue = $this->findConverter($parameter->getType()->getName())->convert($uriValue);
+            }
+            $params[$parameter->getPosition()] = $uriValue;
+
+            unset($uriVariables[$parameter->name]);
         }
 
         $query = new $queryClass(...$params);
 
         //Try to call setter on additional query params
-        if (count($queryParams)) {
-            $propertyAccessor = PropertyAccess::createPropertyAccessor();
-            foreach ($queryParams as $param => $value) {
-                $propertyAccessor->setValue($query, $param, $value);
+        if (count($uriVariables)) {
+            foreach ($uriVariables as $param => $value) {
+                if ($reflectionMethod = $this->findSetterMethod($param, $queryClass)) {
+                    $methodParameter = $reflectionMethod->getParameters()[0];
+                    if ($methodParameter->getType() instanceof \ReflectionNamedType && $methodParameter->getType()->getName() !== gettype($value)) {
+                        $value = $this->findConverter($methodParameter->getType()->getName())->convert($value);
+                    }
+                    $reflectionMethod->invoke($query, $value);
+                }
             }
         }
 
@@ -99,4 +98,44 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
 
         return $this->apiPlatformSerializer->denormalize($normalizedQueryResult, $operation->getClass());
     }
+
+    /**
+     * @param $type
+     *
+     * @return ConverterInterface
+     *
+     * @throws \Exception
+     */
+    private function findConverter($type): ConverterInterface
+    {
+        foreach ($this->converters as $converter) {
+            if ($converter->supports($type)) {
+                return $converter;
+            }
+        }
+
+        throw new \Exception(sprintf('Converter for type %s not found', $type));
+    }
+
+    /**
+     * @param $propertyName
+     * @param $queryClass
+     *
+     * @return false|\ReflectionMethod
+     */
+    private function findSetterMethod($propertyName, $queryClass): bool|\ReflectionMethod
+    {
+        $reflectionClass = new \ReflectionClass($queryClass);
+
+        foreach ($reflectionClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) {
+            if (str_starts_with($method->getName(), 'set')) {
+                $methodName = lcfirst(substr($method->getName(), 3));
+                if ($methodName === $propertyName) {
+                    return $method;
+                }
+            }
+        }
+
+        return false;
+    }
 }
diff --git a/src/PrestaShopBundle/ApiPlatform/Resources/SearchProduct.php b/src/PrestaShopBundle/ApiPlatform/Resources/SearchProduct.php
index 5ee8a7f1ebdfc..cabf3fc9707b0 100644
--- a/src/PrestaShopBundle/ApiPlatform/Resources/SearchProduct.php
+++ b/src/PrestaShopBundle/ApiPlatform/Resources/SearchProduct.php
@@ -31,7 +31,6 @@
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\Get;
 use PrestaShop\PrestaShop\Core\Domain\Product\Query\SearchProducts;
-use PrestaShopBundle\ApiPlatform\Converters\StringToIntConverter;
 use PrestaShopBundle\ApiPlatform\Provider\QueryProvider;
 
 #[ApiResource(
@@ -77,10 +76,6 @@
             provider: QueryProvider::class,
             extraProperties: [
                 'query' => SearchProducts::class,
-                'paramConverters' => [
-                    'resultsLimit' => StringToIntConverter::class,
-                    'orderId' => StringToIntConverter::class,
-                ],
             ]
         ),
     ]
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/new_api.yml b/src/PrestaShopBundle/Resources/config/services/bundle/new_api.yml
index fcd7e75897eff..9c1ee72e1d0c8 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/new_api.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/new_api.yml
@@ -50,3 +50,7 @@ services:
   PrestaShopBundle\Controller\Api\OAuth2\AccessTokenController:
     autowire: true
     autoconfigure: true
+
+  PrestaShopBundle\ApiPlatform\Converters\:
+    resource: "../../../../ApiPlatform/Converters/*"
+    tags: ['prestashop.api.converters']
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/services.yml b/src/PrestaShopBundle/Resources/config/services/bundle/services.yml
index d7138c53227b5..84e40cd5683a2 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/services.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/services.yml
@@ -108,6 +108,9 @@ services:
     tags: [ 'api_platform.state_provider' ]
     public: false
     autowire: true
+    arguments:
+      - '@prestashop.core.query_bus'
+      - !tagged prestashop.api.converters
 
   PrestaShopBundle\ApiPlatform\Processor\CommandProcessor:
     tags: [ 'api_platform.state_processor' ]

From b76a894ea1d02a6823df5dc7109d9f491152d521 Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Fri, 30 Jun 2023 09:41:22 +0200
Subject: [PATCH 0739/1030] Fix unit tests

---
 .../ApiPlatform/Provider/QueryProvider.php      | 17 +++++++++--------
 .../StateProvider/QueryProviderTest.php         |  6 +++---
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
index 95b2e282c404b..910fb057d6402 100644
--- a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
+++ b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
@@ -57,7 +57,6 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         $queryParams = $this->requestStack->getCurrentRequest()->query->all();
         $uriVariables = array_merge($uriVariables, $queryParams);
 
-        //Add optionnal parameters in construct from query params
         $reflectionMethod = new \ReflectionMethod($queryClass, '__construct');
         $constructParameters = $reflectionMethod->getParameters();
 
@@ -68,14 +67,16 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
                 throw new \Exception(sprintf('Required parameter %s is not present', $parameter->name));
             }
 
-            $uriValue = $uriVariables[$parameter->name];
-            //Transform parameter type if needed
-            if ($parameter->getType() instanceof \ReflectionNamedType && $parameter->getType()->getName() !== gettype($uriValue)) {
-                $uriValue = $this->findConverter($parameter->getType()->getName())->convert($uriValue);
-            }
-            $params[$parameter->getPosition()] = $uriValue;
+            if (isset($uriVariables[$parameter->name])) {
+                $uriValue = $uriVariables[$parameter->name];
+                //Transform parameter type if needed
+                if ($parameter->getType() instanceof \ReflectionNamedType && $parameter->getType()->getName() !== gettype($uriValue)) {
+                    $uriValue = $this->findConverter($parameter->getType()->getName())->convert($uriValue);
+                }
+                $params[$parameter->getPosition()] = $uriValue;
 
-            unset($uriVariables[$parameter->name]);
+                unset($uriVariables[$parameter->name]);
+            }
         }
 
         $query = new $queryClass(...$params);
diff --git a/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php b/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
index 82ace5e88c646..d603035af8eed 100644
--- a/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
+++ b/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
@@ -108,7 +108,7 @@ private function createHookStatusResultBasedOnQuery(GetHookStatus $query): HookS
 
     public function testProvideHookStatus(): void
     {
-        $hookStatusProvider = new QueryProvider($this->queryBus, $this->requestStack);
+        $hookStatusProvider = new QueryProvider($this->queryBus, [new StringToIntConverter()], $this->requestStack);
         $get = new Get();
         $get = $get->withExtraProperties(['query' => GetHookStatus::class]);
         /** @var HookStatus $hookStatus */
@@ -149,7 +149,7 @@ public function createsSearchProductResultBasedOnQuery(SearchProducts $query): a
 
     public function testSearchProduct(): void
     {
-        $searchProductProvider = new QueryProvider($this->queryBus, $this->requestStack);
+        $searchProductProvider = new QueryProvider($this->queryBus, [new StringToIntConverter()], $this->requestStack);
         $get = new Get();
         $get = $get->withExtraProperties([
             'query' => SearchProducts::class,
@@ -162,7 +162,7 @@ public function testSearchProduct(): void
         self::assertCount(1, $searchProducts);
 
         $this->requestStack->getCurrentRequest()->query = new InputBag(['orderId' => 1]);
-        $searchProductProvider = new QueryProvider($this->queryBus, $this->requestStack);
+        $searchProductProvider = new QueryProvider($this->queryBus, [new StringToIntConverter()], $this->requestStack);
         $searchProducts = $searchProductProvider->provide($get, ['phrase' => 'search with order id', 'resultsLimit' => 10, 'isoCode' => 'EUR']);
         self::assertCount(0, $searchProducts);
     }

From db3678691e50f639a3cc6de2713ad5aff4abbce8 Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Fri, 30 Jun 2023 09:59:43 +0200
Subject: [PATCH 0740/1030] Use context instead request stack to get url query
 params

---
 .../ApiPlatform/Provider/QueryProvider.php    |  9 ++++--
 .../config/services/bundle/new_api.yml        |  2 +-
 .../StateProvider/QueryProviderTest.php       | 30 +++----------------
 3 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
index 910fb057d6402..db2815280e963 100644
--- a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
+++ b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
@@ -43,7 +43,6 @@ public function __construct(
         private readonly CommandBusInterface $queryBus,
         private readonly Serializer $apiPlatformSerializer,
         private readonly iterable $converters,
-        private readonly RequestStack $requestStack
     ) {
     }
 
@@ -54,8 +53,12 @@ public function __construct(
     public function provide(Operation $operation, array $uriVariables = [], array $context = [])
     {
         $queryClass = $operation->getExtraProperties()['query'] ?? null;
-        $queryParams = $this->requestStack->getCurrentRequest()->query->all();
-        $uriVariables = array_merge($uriVariables, $queryParams);
+        $filters = $context['filters'] ?? [];
+        $uriVariables = array_merge($uriVariables, $filters);
+
+        if (null === $queryClass) {
+            throw new NoExtraPropertiesFoundException();
+        }
 
         $reflectionMethod = new \ReflectionMethod($queryClass, '__construct');
         $constructParameters = $reflectionMethod->getParameters();
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/new_api.yml b/src/PrestaShopBundle/Resources/config/services/bundle/new_api.yml
index 9c1ee72e1d0c8..974f1a1f70975 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/new_api.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/new_api.yml
@@ -53,4 +53,4 @@ services:
 
   PrestaShopBundle\ApiPlatform\Converters\:
     resource: "../../../../ApiPlatform/Converters/*"
-    tags: ['prestashop.api.converters']
+    tags: [ 'prestashop.api.converters' ]
diff --git a/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php b/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
index d603035af8eed..a385a6d39adbb 100644
--- a/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
+++ b/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
@@ -29,25 +29,18 @@
 namespace Tests\Unit\PrestaShopBundle\ApiPlatform\StateProvider;
 
 use ApiPlatform\Metadata\Get;
-use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
-use PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHook;
 use PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHookStatus;
-use PrestaShop\PrestaShop\Core\Domain\Hook\QueryResult\Hook as HookQuery;
 use PrestaShop\PrestaShop\Core\Domain\Hook\QueryResult\HookStatus;
 use PrestaShop\PrestaShop\Core\Domain\Product\Query\SearchProducts;
 use PrestaShop\PrestaShop\Core\Domain\Product\QueryResult\FoundProduct;
 use PrestaShopBundle\ApiPlatform\Converters\StringToIntConverter;
-use PrestaShopBundle\ApiPlatform\Exception\NoExtraPropertiesFoundException;
 use PrestaShopBundle\ApiPlatform\Provider\QueryProvider;
-use PrestaShopBundle\ApiPlatform\Resources\Hook;
 use RuntimeException;
 use Symfony\Component\HttpFoundation\InputBag;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
-use Symfony\Component\Serializer\Serializer;
 
 class QueryProviderTest extends TestCase
 {
@@ -56,26 +49,12 @@ class QueryProviderTest extends TestCase
      */
     private $queryBus;
 
-    /**
-     * @var RequestStack
-     */
-    private $requestStack;
-
     /**
      * Set up dependencies for HookStatusProvider
      */
     public function setUp(): void
     {
-        $this->serializer = new Serializer([new ObjectNormalizer()]);
         $this->queryBus = $this->createMock(CommandBusInterface::class);
-        $this->requestStack = $this->createMock(RequestStack::class);
-        $requestMock = $this
-            ->getMockBuilder(Request::class)
-            ->getMock();
-        $requestMock->query = new InputBag();
-        $this->requestStack
-            ->method('getCurrentRequest')
-            ->willReturn($requestMock);
         $this->queryBus
             ->method('handle')
             ->willReturnCallback(function ($query) {
@@ -108,7 +87,7 @@ private function createHookStatusResultBasedOnQuery(GetHookStatus $query): HookS
 
     public function testProvideHookStatus(): void
     {
-        $hookStatusProvider = new QueryProvider($this->queryBus, [new StringToIntConverter()], $this->requestStack);
+        $hookStatusProvider = new QueryProvider($this->queryBus, [new StringToIntConverter()]);
         $get = new Get();
         $get = $get->withExtraProperties(['query' => GetHookStatus::class]);
         /** @var HookStatus $hookStatus */
@@ -149,7 +128,7 @@ public function createsSearchProductResultBasedOnQuery(SearchProducts $query): a
 
     public function testSearchProduct(): void
     {
-        $searchProductProvider = new QueryProvider($this->queryBus, [new StringToIntConverter()], $this->requestStack);
+        $searchProductProvider = new QueryProvider($this->queryBus, [new StringToIntConverter()]);
         $get = new Get();
         $get = $get->withExtraProperties([
             'query' => SearchProducts::class,
@@ -161,9 +140,8 @@ public function testSearchProduct(): void
         $searchProducts = $searchProductProvider->provide($get, ['phrase' => 'mug', 'resultsLimit' => 10, 'isoCode' => 'EUR']);
         self::assertCount(1, $searchProducts);
 
-        $this->requestStack->getCurrentRequest()->query = new InputBag(['orderId' => 1]);
-        $searchProductProvider = new QueryProvider($this->queryBus, [new StringToIntConverter()], $this->requestStack);
-        $searchProducts = $searchProductProvider->provide($get, ['phrase' => 'search with order id', 'resultsLimit' => 10, 'isoCode' => 'EUR']);
+        $searchProductProvider = new QueryProvider($this->queryBus, [new StringToIntConverter()]);
+        $searchProducts = $searchProductProvider->provide($get, ['phrase' => 'search with order id', 'resultsLimit' => 10, 'isoCode' => 'EUR'], ['filters' => ['orderId' => 1]]);
         self::assertCount(0, $searchProducts);
     }
 }

From 1666079e0a6b413f2e1700e29b309001a4375507 Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Mon, 10 Jul 2023 09:29:32 +0200
Subject: [PATCH 0741/1030] Try to use Symfony serializer instead of build
 manually construct

---
 .../Converters/ConverterInterface.php         |  4 +--
 .../Converters/StringToIntConverter.php       |  4 +--
 .../ApiPlatform/Provider/QueryProvider.php    | 30 ++++---------------
 .../StateProvider/QueryProviderTest.php       |  6 +---
 4 files changed, 11 insertions(+), 33 deletions(-)

diff --git a/src/PrestaShopBundle/ApiPlatform/Converters/ConverterInterface.php b/src/PrestaShopBundle/ApiPlatform/Converters/ConverterInterface.php
index 8f55a8ab06a57..e3d8ea028b3c7 100644
--- a/src/PrestaShopBundle/ApiPlatform/Converters/ConverterInterface.php
+++ b/src/PrestaShopBundle/ApiPlatform/Converters/ConverterInterface.php
@@ -30,7 +30,7 @@
 
 interface ConverterInterface
 {
-    public function convert($value);
+    public function convert(mixed $value);
 
-    public function supports($type);
+    public function supports(string $type);
 }
diff --git a/src/PrestaShopBundle/ApiPlatform/Converters/StringToIntConverter.php b/src/PrestaShopBundle/ApiPlatform/Converters/StringToIntConverter.php
index b289cb3fa0130..dc2e5a497b019 100644
--- a/src/PrestaShopBundle/ApiPlatform/Converters/StringToIntConverter.php
+++ b/src/PrestaShopBundle/ApiPlatform/Converters/StringToIntConverter.php
@@ -30,12 +30,12 @@
 
 class StringToIntConverter implements ConverterInterface
 {
-    public function convert($value): int
+    public function convert(mixed $value): int
     {
         return (int) $value;
     }
 
-    public function supports($type): bool
+    public function supports(string $type): bool
     {
         return 'int' === $type;
     }
diff --git a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
index db2815280e963..024e7f4777f0e 100644
--- a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
+++ b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
@@ -32,6 +32,9 @@
 use ApiPlatform\State\ProviderInterface;
 use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
 use PrestaShopBundle\ApiPlatform\Converters\ConverterInterface;
+use Symfony\Component\Serializer\Exception\ExceptionInterface;
+use Symfony\Component\Serializer\Normalizer\AbstractObjectNormalizer;
+use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\PropertyAccess\PropertyAccess;
 use PrestaShopBundle\ApiPlatform\Exception\NoExtraPropertiesFoundException;
@@ -41,7 +44,7 @@ class QueryProvider implements ProviderInterface
 {
     public function __construct(
         private readonly CommandBusInterface $queryBus,
-        private readonly Serializer $apiPlatformSerializer,
+        private readonly SerializerInterface $apiPlatformSerializer,
         private readonly iterable $converters,
     ) {
     }
@@ -49,6 +52,7 @@ public function __construct(
     /**
      * @throws \ReflectionException
      * @throws \Exception
+     * @throws ExceptionInterface
      */
     public function provide(Operation $operation, array $uriVariables = [], array $context = [])
     {
@@ -60,29 +64,7 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
             throw new NoExtraPropertiesFoundException();
         }
 
-        $reflectionMethod = new \ReflectionMethod($queryClass, '__construct');
-        $constructParameters = $reflectionMethod->getParameters();
-
-        $params = [];
-
-        foreach ($constructParameters as $parameter) {
-            if (!isset($uriVariables[$parameter->name]) && !$parameter->isDefaultValueAvailable()) {
-                throw new \Exception(sprintf('Required parameter %s is not present', $parameter->name));
-            }
-
-            if (isset($uriVariables[$parameter->name])) {
-                $uriValue = $uriVariables[$parameter->name];
-                //Transform parameter type if needed
-                if ($parameter->getType() instanceof \ReflectionNamedType && $parameter->getType()->getName() !== gettype($uriValue)) {
-                    $uriValue = $this->findConverter($parameter->getType()->getName())->convert($uriValue);
-                }
-                $params[$parameter->getPosition()] = $uriValue;
-
-                unset($uriVariables[$parameter->name]);
-            }
-        }
-
-        $query = new $queryClass(...$params);
+        $query = $this->apiPlatformSerializer->denormalize($uriVariables, $queryClass, null, [AbstractObjectNormalizer::DISABLE_TYPE_ENFORCEMENT => true]);
 
         //Try to call setter on additional query params
         if (count($uriVariables)) {
diff --git a/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php b/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
index a385a6d39adbb..e6037f16a2e36 100644
--- a/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
+++ b/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
@@ -101,7 +101,7 @@ public function testProvideHookStatus(): void
     /**
      * @return FoundProduct[]
      */
-    public function createsSearchProductResultBasedOnQuery(SearchProducts $query): array
+    private function createsSearchProductResultBasedOnQuery(SearchProducts $query): array
     {
         if ($query->getPhrase() === 'mug') {
             return [
@@ -132,10 +132,6 @@ public function testSearchProduct(): void
         $get = new Get();
         $get = $get->withExtraProperties([
             'query' => SearchProducts::class,
-            'paramConverters' => [
-                'resultsLimit' => StringToIntConverter::class,
-                'orderId' => StringToIntConverter::class,
-            ],
         ]);
         $searchProducts = $searchProductProvider->provide($get, ['phrase' => 'mug', 'resultsLimit' => 10, 'isoCode' => 'EUR']);
         self::assertCount(1, $searchProducts);

From 93a9b36328f2a758c71b2193d732b6a63df6482a Mon Sep 17 00:00:00 2001
From: tleon <thomas.leone@prestashop.com>
Date: Mon, 17 Jul 2023 16:47:58 +0200
Subject: [PATCH 0742/1030] chore(provider): use the serializer for
 denormalising the query

---
 .../ApiPlatform/Provider/QueryProvider.php    |  4 +--
 .../ApiPlatform/Resources/SearchProduct.php   |  4 +++
 .../StateProvider/QueryProviderTest.php       | 29 +++++++++++++++----
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
index 024e7f4777f0e..f702b87cb4d0f 100644
--- a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
+++ b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
@@ -45,7 +45,7 @@ class QueryProvider implements ProviderInterface
     public function __construct(
         private readonly CommandBusInterface $queryBus,
         private readonly SerializerInterface $apiPlatformSerializer,
-        private readonly iterable $converters,
+        private readonly iterable $converters
     ) {
     }
 
@@ -64,7 +64,7 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
             throw new NoExtraPropertiesFoundException();
         }
 
-        $query = $this->apiPlatformSerializer->denormalize($uriVariables, $queryClass, null, [AbstractObjectNormalizer::DISABLE_TYPE_ENFORCEMENT => true]);
+        $query = $this->apiPlatformSerializer->denormalize($uriVariables, $queryClass);
 
         //Try to call setter on additional query params
         if (count($uriVariables)) {
diff --git a/src/PrestaShopBundle/ApiPlatform/Resources/SearchProduct.php b/src/PrestaShopBundle/ApiPlatform/Resources/SearchProduct.php
index cabf3fc9707b0..0fd25132ff180 100644
--- a/src/PrestaShopBundle/ApiPlatform/Resources/SearchProduct.php
+++ b/src/PrestaShopBundle/ApiPlatform/Resources/SearchProduct.php
@@ -82,4 +82,8 @@
 )]
 class SearchProduct
 {
+    public string $phrase;
+    public int $resultsLimit;
+    public string $isoCode;
+    public int $orderId;
 }
diff --git a/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php b/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
index e6037f16a2e36..96c1cdc3e16f3 100644
--- a/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
+++ b/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
@@ -29,6 +29,7 @@
 namespace Tests\Unit\PrestaShopBundle\ApiPlatform\StateProvider;
 
 use ApiPlatform\Metadata\Get;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
 use PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHookStatus;
@@ -38,9 +39,7 @@
 use PrestaShopBundle\ApiPlatform\Converters\StringToIntConverter;
 use PrestaShopBundle\ApiPlatform\Provider\QueryProvider;
 use RuntimeException;
-use Symfony\Component\HttpFoundation\InputBag;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\Serializer\Serializer;
 
 class QueryProviderTest extends TestCase
 {
@@ -49,11 +48,14 @@ class QueryProviderTest extends TestCase
      */
     private $queryBus;
 
+    private Serializer|MockObject $serializer;
+
     /**
      * Set up dependencies for HookStatusProvider
      */
     public function setUp(): void
     {
+        $this->serializer = $this->createMock(Serializer::class);
         $this->queryBus = $this->createMock(CommandBusInterface::class);
         $this->queryBus
             ->method('handle')
@@ -87,7 +89,15 @@ private function createHookStatusResultBasedOnQuery(GetHookStatus $query): HookS
 
     public function testProvideHookStatus(): void
     {
-        $hookStatusProvider = new QueryProvider($this->queryBus, [new StringToIntConverter()]);
+        $hookStatusQuery1 = new GetHookStatus(1);
+        $hookStatusQuery2 = new GetHookStatus(2);
+
+        $this->serializer
+            ->expects(static::exactly(2))
+            ->method('denormalize')
+            ->willReturnOnConsecutiveCalls($hookStatusQuery1, $hookStatusQuery2)
+        ;
+        $hookStatusProvider = new QueryProvider($this->queryBus, [new StringToIntConverter()], $this->serializer);
         $get = new Get();
         $get = $get->withExtraProperties(['query' => GetHookStatus::class]);
         /** @var HookStatus $hookStatus */
@@ -128,7 +138,14 @@ private function createsSearchProductResultBasedOnQuery(SearchProducts $query):
 
     public function testSearchProduct(): void
     {
-        $searchProductProvider = new QueryProvider($this->queryBus, [new StringToIntConverter()]);
+        $searchProductsQuery1 = new SearchProducts('mug', 10, 'EUR');
+        $searchProductsQuery2 = new SearchProducts('search with order id', 10, 'EUR', 1);
+        $this->serializer
+            ->expects(static::exactly(2))
+            ->method('denormalize')
+            ->willReturnOnConsecutiveCalls($searchProductsQuery1, $searchProductsQuery2)
+        ;
+        $searchProductProvider = new QueryProvider($this->queryBus, [new StringToIntConverter()], $this->serializer);
         $get = new Get();
         $get = $get->withExtraProperties([
             'query' => SearchProducts::class,
@@ -136,7 +153,7 @@ public function testSearchProduct(): void
         $searchProducts = $searchProductProvider->provide($get, ['phrase' => 'mug', 'resultsLimit' => 10, 'isoCode' => 'EUR']);
         self::assertCount(1, $searchProducts);
 
-        $searchProductProvider = new QueryProvider($this->queryBus, [new StringToIntConverter()]);
+        $searchProductProvider = new QueryProvider($this->queryBus, [new StringToIntConverter()], $this->serializer);
         $searchProducts = $searchProductProvider->provide($get, ['phrase' => 'search with order id', 'resultsLimit' => 10, 'isoCode' => 'EUR'], ['filters' => ['orderId' => 1]]);
         self::assertCount(0, $searchProducts);
     }

From 43455dc4a21d9f80a624958a8a6bbb205fe8f198 Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Fri, 28 Jul 2023 15:57:24 +0200
Subject: [PATCH 0743/1030] Fix service definition

---
 .../ApiPlatform/Provider/QueryProvider.php             | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
index f702b87cb4d0f..da4ade14dd61e 100644
--- a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
+++ b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
@@ -33,19 +33,15 @@
 use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
 use PrestaShopBundle\ApiPlatform\Converters\ConverterInterface;
 use Symfony\Component\Serializer\Exception\ExceptionInterface;
-use Symfony\Component\Serializer\Normalizer\AbstractObjectNormalizer;
-use Symfony\Component\Serializer\SerializerInterface;
-use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\PropertyAccess\PropertyAccess;
-use PrestaShopBundle\ApiPlatform\Exception\NoExtraPropertiesFoundException;
 use Symfony\Component\Serializer\Serializer;
+use PrestaShopBundle\ApiPlatform\Exception\NoExtraPropertiesFoundException;
 
 class QueryProvider implements ProviderInterface
 {
     public function __construct(
         private readonly CommandBusInterface $queryBus,
-        private readonly SerializerInterface $apiPlatformSerializer,
-        private readonly iterable $converters
+        private readonly iterable $converters,
+        private readonly Serializer $apiPlatformSerializer
     ) {
     }
 

From d3ffbf5c8cd47fbbd409c5e722adeb8cac14068f Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Fri, 28 Jul 2023 16:16:16 +0200
Subject: [PATCH 0744/1030] Fix tests

---
 .../ApiPlatform/Provider/QueryProvider.php    |  2 +-
 .../StateProvider/QueryProviderTest.php       | 84 ++++++++++---------
 2 files changed, 46 insertions(+), 40 deletions(-)

diff --git a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
index da4ade14dd61e..16e44fe2def81 100644
--- a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
+++ b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
@@ -32,9 +32,9 @@
 use ApiPlatform\State\ProviderInterface;
 use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
 use PrestaShopBundle\ApiPlatform\Converters\ConverterInterface;
+use PrestaShopBundle\ApiPlatform\Exception\NoExtraPropertiesFoundException;
 use Symfony\Component\Serializer\Exception\ExceptionInterface;
 use Symfony\Component\Serializer\Serializer;
-use PrestaShopBundle\ApiPlatform\Exception\NoExtraPropertiesFoundException;
 
 class QueryProvider implements ProviderInterface
 {
diff --git a/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php b/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
index 96c1cdc3e16f3..6c7ee5afa0ffa 100644
--- a/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
+++ b/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
@@ -37,8 +37,11 @@
 use PrestaShop\PrestaShop\Core\Domain\Product\Query\SearchProducts;
 use PrestaShop\PrestaShop\Core\Domain\Product\QueryResult\FoundProduct;
 use PrestaShopBundle\ApiPlatform\Converters\StringToIntConverter;
+use PrestaShopBundle\ApiPlatform\Exception\NoExtraPropertiesFoundException;
 use PrestaShopBundle\ApiPlatform\Provider\QueryProvider;
+use PrestaShopBundle\ApiPlatform\Resources\Hook;
 use RuntimeException;
+use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
 use Symfony\Component\Serializer\Serializer;
 
 class QueryProviderTest extends TestCase
@@ -55,7 +58,7 @@ class QueryProviderTest extends TestCase
      */
     public function setUp(): void
     {
-        $this->serializer = $this->createMock(Serializer::class);
+        $this->serializer = new Serializer([new ObjectNormalizer()]);
         $this->queryBus = $this->createMock(CommandBusInterface::class);
         $this->queryBus
             ->method('handle')
@@ -76,36 +79,30 @@ public function setUp(): void
 
     private function createHookStatusResultBasedOnQuery(GetHookStatus $query): HookStatus
     {
-        if ($query->getHookId()->getValue() === 1) {
-            return new HookStatus($query->getHookId()->getValue(), false);
+        if ($query->getId()->getValue() === 1) {
+            return new HookStatus($query->getId()->getValue(), false);
         }
 
-        if ($query->getHookId()->getValue() === 2) {
-            return new HookStatus($query->getHookId()->getValue(), true);
+        if ($query->getId()->getValue() === 2) {
+            return new HookStatus($query->getId()->getValue(), true);
         }
 
-        throw new RuntimeException(sprintf('Hook "%s" was not expected in query bus mock', $query->getHookId()->getValue()));
+        throw new RuntimeException(sprintf('Hook "%s" was not expected in query bus mock', $query->getId()->getValue()));
     }
 
     public function testProvideHookStatus(): void
     {
-        $hookStatusQuery1 = new GetHookStatus(1);
-        $hookStatusQuery2 = new GetHookStatus(2);
-
-        $this->serializer
-            ->expects(static::exactly(2))
-            ->method('denormalize')
-            ->willReturnOnConsecutiveCalls($hookStatusQuery1, $hookStatusQuery2)
-        ;
         $hookStatusProvider = new QueryProvider($this->queryBus, [new StringToIntConverter()], $this->serializer);
         $get = new Get();
-        $get = $get->withExtraProperties(['query' => GetHookStatus::class]);
-        /** @var HookStatus $hookStatus */
-        $hookStatus = $hookStatusProvider->provide($get, ['hookId' => 1]);
-        self::assertEquals(false, $hookStatus->isActive());
-        /** @var HookStatus $hookStatus */
-        $hookStatus = $hookStatusProvider->provide($get, ['hookId' => 2]);
-        self::assertTrue($hookStatus->isActive());
+        $get = $get
+            ->withExtraProperties(['query' => "PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHookStatus"])
+            ->withClass(Hook::class);
+        /** @var Hook $hookStatus */
+        $hookStatus = $hookStatusProvider->provide($get, ['id' => 1]);
+        self::assertEquals(false, $hookStatus->active);
+        /** @var Hook $hookStatus */
+        $hookStatus = $hookStatusProvider->provide($get, ['id' => 2]);
+        self::assertTrue($hookStatus->active);
     }
 
     /**
@@ -136,25 +133,34 @@ private function createsSearchProductResultBasedOnQuery(SearchProducts $query):
         throw new RuntimeException(sprintf('SearchProduct "%s" was not expected in query bus mock', $query->getPhrase()));
     }
 
-    public function testSearchProduct(): void
+//    public function testSearchProduct(): void
+//    {
+//        $searchProductsQuery1 = new SearchProducts('mug', 10, 'EUR');
+//        $searchProductsQuery2 = new SearchProducts('search with order id', 10, 'EUR', 1);
+//        $this->serializer
+//            ->expects(static::exactly(2))
+//            ->method('denormalize')
+//            ->willReturnOnConsecutiveCalls($searchProductsQuery1, $searchProductsQuery2)
+//        ;
+//        $searchProductProvider = new QueryProvider($this->queryBus, [new StringToIntConverter()], $this->serializer);
+//        $get = new Get();
+//        $get = $get->withExtraProperties([
+//            'query' => SearchProducts::class,
+//        ]);
+//        $searchProducts = $searchProductProvider->provide($get, ['phrase' => 'mug', 'resultsLimit' => 10, 'isoCode' => 'EUR']);
+//        self::assertCount(1, $searchProducts);
+//
+//        $searchProductProvider = new QueryProvider($this->queryBus, [new StringToIntConverter()], $this->serializer);
+//        $searchProducts = $searchProductProvider->provide($get, ['phrase' => 'search with order id', 'resultsLimit' => 10, 'isoCode' => 'EUR'], ['filters' => ['orderId' => 1]]);
+//        self::assertCount(0, $searchProducts);
+//    }
+
+    public function testProvideNoQueryThrowsException(): void
     {
-        $searchProductsQuery1 = new SearchProducts('mug', 10, 'EUR');
-        $searchProductsQuery2 = new SearchProducts('search with order id', 10, 'EUR', 1);
-        $this->serializer
-            ->expects(static::exactly(2))
-            ->method('denormalize')
-            ->willReturnOnConsecutiveCalls($searchProductsQuery1, $searchProductsQuery2)
-        ;
-        $searchProductProvider = new QueryProvider($this->queryBus, [new StringToIntConverter()], $this->serializer);
+        $hookStatusProvider = new QueryProvider($this->queryBus, [new StringToIntConverter()], $this->serializer);
         $get = new Get();
-        $get = $get->withExtraProperties([
-            'query' => SearchProducts::class,
-        ]);
-        $searchProducts = $searchProductProvider->provide($get, ['phrase' => 'mug', 'resultsLimit' => 10, 'isoCode' => 'EUR']);
-        self::assertCount(1, $searchProducts);
-
-        $searchProductProvider = new QueryProvider($this->queryBus, [new StringToIntConverter()], $this->serializer);
-        $searchProducts = $searchProductProvider->provide($get, ['phrase' => 'search with order id', 'resultsLimit' => 10, 'isoCode' => 'EUR'], ['filters' => ['orderId' => 1]]);
-        self::assertCount(0, $searchProducts);
+
+        $this->expectException(NoExtraPropertiesFoundException::class);
+        $hookStatusProvider->provide($get, ['id' => 1]);
     }
 }

From 0031c1cc0c3b0f590bf0ade1011b2d4894d19550 Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Mon, 31 Jul 2023 16:53:35 +0200
Subject: [PATCH 0745/1030] Fix unit test

---
 .../ApiPlatform/Provider/QueryProvider.php    |  9 ++
 .../StateProvider/QueryProviderTest.php       | 85 +++++++++----------
 2 files changed, 50 insertions(+), 44 deletions(-)

diff --git a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
index 16e44fe2def81..15bbf2b2145ed 100644
--- a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
+++ b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
@@ -76,8 +76,17 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         }
 
         $queryResult = $this->queryBus->handle($query);
+        $isCollectionResult = is_array($queryResult);
         $normalizedQueryResult = $this->apiPlatformSerializer->normalize($queryResult);
 
+        if ($isCollectionResult) {
+            foreach ($normalizedQueryResult as $key => $result) {
+                $normalizedQueryResult[$key] = $this->apiPlatformSerializer->denormalize($result, $operation->getClass());
+            }
+
+            return $normalizedQueryResult;
+        }
+
         return $this->apiPlatformSerializer->denormalize($normalizedQueryResult, $operation->getClass());
     }
 
diff --git a/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php b/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
index 6c7ee5afa0ffa..51a0e9789eb47 100644
--- a/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
+++ b/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
@@ -40,6 +40,7 @@
 use PrestaShopBundle\ApiPlatform\Exception\NoExtraPropertiesFoundException;
 use PrestaShopBundle\ApiPlatform\Provider\QueryProvider;
 use PrestaShopBundle\ApiPlatform\Resources\Hook;
+use PrestaShopBundle\ApiPlatform\Resources\SearchProduct;
 use RuntimeException;
 use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
 use Symfony\Component\Serializer\Serializer;
@@ -51,6 +52,9 @@ class QueryProviderTest extends TestCase
      */
     private $queryBus;
 
+    /**
+     * @var Serializer|MockObject
+     */
     private Serializer|MockObject $serializer;
 
     /**
@@ -77,19 +81,6 @@ public function setUp(): void
             });
     }
 
-    private function createHookStatusResultBasedOnQuery(GetHookStatus $query): HookStatus
-    {
-        if ($query->getId()->getValue() === 1) {
-            return new HookStatus($query->getId()->getValue(), false);
-        }
-
-        if ($query->getId()->getValue() === 2) {
-            return new HookStatus($query->getId()->getValue(), true);
-        }
-
-        throw new RuntimeException(sprintf('Hook "%s" was not expected in query bus mock', $query->getId()->getValue()));
-    }
-
     public function testProvideHookStatus(): void
     {
         $hookStatusProvider = new QueryProvider($this->queryBus, [new StringToIntConverter()], $this->serializer);
@@ -105,6 +96,43 @@ public function testProvideHookStatus(): void
         self::assertTrue($hookStatus->active);
     }
 
+    public function testSearchProduct(): void
+    {
+        $searchProductProvider = new QueryProvider($this->queryBus, [new StringToIntConverter()], $this->serializer);
+        $get = new Get();
+        $get = $get
+            ->withExtraProperties(['query' => SearchProducts::class])
+            ->withClass(SearchProduct::class);
+        $searchProducts = $searchProductProvider->provide($get, ['phrase' => 'mug', 'resultsLimit' => 10, 'isoCode' => 'EUR']);
+        self::assertCount(1, $searchProducts);
+
+        $searchProductProvider = new QueryProvider($this->queryBus, [new StringToIntConverter()], $this->serializer);
+        $searchProducts = $searchProductProvider->provide($get, ['phrase' => 'search with order id', 'resultsLimit' => 10, 'isoCode' => 'EUR'], ['filters' => ['orderId' => 1]]);
+        self::assertCount(0, $searchProducts);
+    }
+
+    public function testProvideNoQueryThrowsException(): void
+    {
+        $hookStatusProvider = new QueryProvider($this->queryBus, [new StringToIntConverter()], $this->serializer);
+        $get = new Get();
+
+        $this->expectException(NoExtraPropertiesFoundException::class);
+        $hookStatusProvider->provide($get, ['id' => 1]);
+    }
+
+    private function createHookStatusResultBasedOnQuery(GetHookStatus $query): HookStatus
+    {
+        if ($query->getId()->getValue() === 1) {
+            return new HookStatus($query->getId()->getValue(), false);
+        }
+
+        if ($query->getId()->getValue() === 2) {
+            return new HookStatus($query->getId()->getValue(), true);
+        }
+
+        throw new RuntimeException(sprintf('Hook "%s" was not expected in query bus mock', $query->getId()->getValue()));
+    }
+
     /**
      * @return FoundProduct[]
      */
@@ -132,35 +160,4 @@ private function createsSearchProductResultBasedOnQuery(SearchProducts $query):
 
         throw new RuntimeException(sprintf('SearchProduct "%s" was not expected in query bus mock', $query->getPhrase()));
     }
-
-//    public function testSearchProduct(): void
-//    {
-//        $searchProductsQuery1 = new SearchProducts('mug', 10, 'EUR');
-//        $searchProductsQuery2 = new SearchProducts('search with order id', 10, 'EUR', 1);
-//        $this->serializer
-//            ->expects(static::exactly(2))
-//            ->method('denormalize')
-//            ->willReturnOnConsecutiveCalls($searchProductsQuery1, $searchProductsQuery2)
-//        ;
-//        $searchProductProvider = new QueryProvider($this->queryBus, [new StringToIntConverter()], $this->serializer);
-//        $get = new Get();
-//        $get = $get->withExtraProperties([
-//            'query' => SearchProducts::class,
-//        ]);
-//        $searchProducts = $searchProductProvider->provide($get, ['phrase' => 'mug', 'resultsLimit' => 10, 'isoCode' => 'EUR']);
-//        self::assertCount(1, $searchProducts);
-//
-//        $searchProductProvider = new QueryProvider($this->queryBus, [new StringToIntConverter()], $this->serializer);
-//        $searchProducts = $searchProductProvider->provide($get, ['phrase' => 'search with order id', 'resultsLimit' => 10, 'isoCode' => 'EUR'], ['filters' => ['orderId' => 1]]);
-//        self::assertCount(0, $searchProducts);
-//    }
-
-    public function testProvideNoQueryThrowsException(): void
-    {
-        $hookStatusProvider = new QueryProvider($this->queryBus, [new StringToIntConverter()], $this->serializer);
-        $get = new Get();
-
-        $this->expectException(NoExtraPropertiesFoundException::class);
-        $hookStatusProvider->provide($get, ['id' => 1]);
-    }
 }

From 33ee8b692d2fda5666d50086e9706c490cc66d81 Mon Sep 17 00:00:00 2001
From: "matthieu.rolland" <matthieu.rolland@prestashop.com>
Date: Thu, 27 Jul 2023 18:12:42 +0200
Subject: [PATCH 0746/1030] make search form twig component independant

---
 .../Admin/Component/Layout/search_form.html.twig |  2 +-
 .../views/Admin/Layout/search_form.html.twig     |  7 +------
 .../Twig/Component/SearchForm.php                | 16 ++++++++++------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/search_form.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/search_form.html.twig
index b54ce34edccf0..2e8d0c194627b 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/search_form.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/search_form.html.twig
@@ -25,7 +25,7 @@
 <form id="header_search"
       class="bo_search_form dropdown-form js-dropdown-form collapsed"
       method="post"
-      action="{{ link.getAdminLink('AdminSearch') }}"
+      action="{{ path('AdminSearch') }}"
       role="search">
   <input type="hidden" name="bo_search_type" id="bo_search_type" class="js-search-type" />
   {% if showClearBtn is defined and showClearBtn %}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/search_form.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/search_form.html.twig
index 383527d049c53..4981ed0d03b7a 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Layout/search_form.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/search_form.html.twig
@@ -22,9 +22,4 @@
  * @copyright Since 2007 PrestaShop SA and Contributors
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  *#}
-{{ component('SearchForm', {
-  boQuery: bo_query,
-  link: link,
-  showClearBtn: show_clear_btn,
-  searchType: search_type
-}) }}
+{{ component('SearchForm') }}
diff --git a/src/PrestaShopBundle/Twig/Component/SearchForm.php b/src/PrestaShopBundle/Twig/Component/SearchForm.php
index 8067192e72d6e..b339f070f91d3 100644
--- a/src/PrestaShopBundle/Twig/Component/SearchForm.php
+++ b/src/PrestaShopBundle/Twig/Component/SearchForm.php
@@ -28,20 +28,24 @@
 
 namespace PrestaShopBundle\Twig\Component;
 
-use Link;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
 
 #[AsTwigComponent(template: '@PrestaShop/Admin/Component/Layout/search_form.html.twig')]
 class SearchForm
 {
     public string $boQuery;
-    public Link $link;
     public bool $showClearBtn;
-    public bool $searchType;
+    public int $searchType;
 
-    public function mount(bool $showClearBtn = null, bool $searchType = null): void
+    public function __construct(private readonly RequestStack $requestStack)
     {
-        $this->showClearBtn = $showClearBtn ?? false;
-        $this->searchType = $searchType ?? false;
+    }
+
+    public function mount(): void
+    {
+        $this->boQuery = $this->requestStack->getCurrentRequest()->query->get('bo_query') ?: "";
+        $this->searchType = (int) $this->requestStack->getCurrentRequest()->query->get('bo_search_type') ?: 0;
+        $this->showClearBtn = !empty($this->boQuery);
     }
 }

From 73df2b410bb1e3ea40b9b269935d4eb6fcb98ec0 Mon Sep 17 00:00:00 2001
From: "matthieu.rolland" <matthieu.rolland@prestashop.com>
Date: Thu, 27 Jul 2023 18:19:42 +0200
Subject: [PATCH 0747/1030] add constants for query param strings

---
 src/PrestaShopBundle/Twig/Component/SearchForm.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/PrestaShopBundle/Twig/Component/SearchForm.php b/src/PrestaShopBundle/Twig/Component/SearchForm.php
index b339f070f91d3..cc82978d0f012 100644
--- a/src/PrestaShopBundle/Twig/Component/SearchForm.php
+++ b/src/PrestaShopBundle/Twig/Component/SearchForm.php
@@ -34,6 +34,9 @@
 #[AsTwigComponent(template: '@PrestaShop/Admin/Component/Layout/search_form.html.twig')]
 class SearchForm
 {
+    private const BO_QUERY_PARAM = 'bo_query';
+    private const BO_SEARCH_TYPE_PARAM = 'bo_search_type';
+
     public string $boQuery;
     public bool $showClearBtn;
     public int $searchType;
@@ -44,8 +47,9 @@ public function __construct(private readonly RequestStack $requestStack)
 
     public function mount(): void
     {
-        $this->boQuery = $this->requestStack->getCurrentRequest()->query->get('bo_query') ?: "";
-        $this->searchType = (int) $this->requestStack->getCurrentRequest()->query->get('bo_search_type') ?: 0;
+        $request = $this->requestStack->getCurrentRequest();
+        $this->boQuery = $request->query->get(self::BO_QUERY_PARAM) ?: '';
+        $this->searchType = (int) $request->query->get(self::BO_SEARCH_TYPE_PARAM) ?: 0;
         $this->showClearBtn = !empty($this->boQuery);
     }
 }

From a30d2ba940dd1a6b915fec7c6a663792119a5efd Mon Sep 17 00:00:00 2001
From: "matthieu.rolland" <matthieu.rolland@prestashop.com>
Date: Tue, 1 Aug 2023 15:07:09 +0200
Subject: [PATCH 0748/1030] update phpstan

---
 src/PrestaShopBundle/Twig/Component/SearchForm.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/PrestaShopBundle/Twig/Component/SearchForm.php b/src/PrestaShopBundle/Twig/Component/SearchForm.php
index cc82978d0f012..1db33ca65d93f 100644
--- a/src/PrestaShopBundle/Twig/Component/SearchForm.php
+++ b/src/PrestaShopBundle/Twig/Component/SearchForm.php
@@ -48,8 +48,8 @@ public function __construct(private readonly RequestStack $requestStack)
     public function mount(): void
     {
         $request = $this->requestStack->getCurrentRequest();
-        $this->boQuery = $request->query->get(self::BO_QUERY_PARAM) ?: '';
-        $this->searchType = (int) $request->query->get(self::BO_SEARCH_TYPE_PARAM) ?: 0;
+        $this->boQuery = $request->query->get(self::BO_QUERY_PARAM, '');
+        $this->searchType = (int) $request->query->get(self::BO_SEARCH_TYPE_PARAM, 0);
         $this->showClearBtn = !empty($this->boQuery);
     }
 }

From 12a73b2fa3ba2aa0865e1d1a6c53ee47c7241a27 Mon Sep 17 00:00:00 2001
From: "matthieu.rolland" <matthieu.rolland@prestashop.com>
Date: Wed, 2 Aug 2023 18:09:44 +0200
Subject: [PATCH 0749/1030] remove useless parameters in layout.tpl's call to
 search form

---
 admin-dev/themes/new-theme/template/layout.tpl | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/admin-dev/themes/new-theme/template/layout.tpl b/admin-dev/themes/new-theme/template/layout.tpl
index 96c22eb6b58ae..231c7fc0f9d57 100644
--- a/admin-dev/themes/new-theme/template/layout.tpl
+++ b/admin-dev/themes/new-theme/template/layout.tpl
@@ -60,10 +60,6 @@
               {render_template
                 smarty_template="components/layout/search_form.tpl"
                 twig_template="@PrestaShop/Admin/Layout/search_form.html.twig"
-                bo_query=$bo_query
-                link=$link
-                show_clear_btn= $show_clear_btn|default:null
-                search_type= $search_type|default:null
               }
             <button class="component-search-cancel d-none">{l|escape s='Cancel' d='Admin.Actions'}</button>
           </div>

From 99284a79260886016ce7430b21fe29fde41d571f Mon Sep 17 00:00:00 2001
From: Daniel Hlavacek <daniel.hlavacek@hotmail.cz>
Date: Wed, 9 Aug 2023 11:12:54 +0200
Subject: [PATCH 0750/1030] Fix modules from distribution api

---
 src/Core/Module/ModuleRepository.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Core/Module/ModuleRepository.php b/src/Core/Module/ModuleRepository.php
index 0e5f582e0610b..84cca945fd8bd 100644
--- a/src/Core/Module/ModuleRepository.php
+++ b/src/Core/Module/ModuleRepository.php
@@ -322,7 +322,7 @@ protected function addModulesFromHook(ModuleCollection $modules): ModuleCollecti
                 }
             }
             if (!$merged) {
-                $modules[] = new Module($externalModule);
+                $modules->add(new Module($externalModule));
             }
         }
 

From 2e7d13f5f6912ef794b036298501686d4dc44aca Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Wed, 9 Aug 2023 09:14:33 +0200
Subject: [PATCH 0751/1030] Use json as return type for API and fix get
 collection found product

---
 app/config/config.yml                         |  5 ++
 .../ApiPlatform/Provider/QueryProvider.php    |  4 +-
 .../{SearchProduct.php => FoundProduct.php}   | 70 ++++++++++++++++---
 .../ApiPlatform/GetHookStatusTest.php         | 14 ++--
 tests/Integration/ApiPlatform/GetHookTest.php |  4 +-
 .../02_resourceEndpoint.ts                    |  2 +-
 .../02_resourceEndpoint.ts                    |  2 +-
 .../StateProvider/QueryProviderTest.php       |  7 +-
 8 files changed, 85 insertions(+), 23 deletions(-)
 rename src/PrestaShopBundle/ApiPlatform/Resources/{SearchProduct.php => FoundProduct.php} (73%)

diff --git a/app/config/config.yml b/app/config/config.yml
index 38cde3bdd3a5a..083edda805e1d 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -97,6 +97,11 @@ api_platform:
   title: PrestaShop API
   version: 1.0.0
   enable_entrypoint: false
+  formats:
+    json:
+      mime_types: [ 'application/json' ]
+    jsonld:
+      mime_types: [ 'application/ld+json' ]
   mapping:
     paths:
       - '%kernel.project_dir%/src/PrestaShopBundle/ApiPlatform/Resources'
diff --git a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
index 15bbf2b2145ed..5ee677709fbc1 100644
--- a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
+++ b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
@@ -28,6 +28,7 @@
 
 namespace PrestaShopBundle\ApiPlatform\Provider;
 
+use ApiPlatform\Metadata\CollectionOperationInterface;
 use ApiPlatform\Metadata\Operation;
 use ApiPlatform\State\ProviderInterface;
 use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
@@ -76,10 +77,9 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         }
 
         $queryResult = $this->queryBus->handle($query);
-        $isCollectionResult = is_array($queryResult);
         $normalizedQueryResult = $this->apiPlatformSerializer->normalize($queryResult);
 
-        if ($isCollectionResult) {
+        if ($operation instanceof CollectionOperationInterface) {
             foreach ($normalizedQueryResult as $key => $result) {
                 $normalizedQueryResult[$key] = $this->apiPlatformSerializer->denormalize($result, $operation->getClass());
             }
diff --git a/src/PrestaShopBundle/ApiPlatform/Resources/SearchProduct.php b/src/PrestaShopBundle/ApiPlatform/Resources/FoundProduct.php
similarity index 73%
rename from src/PrestaShopBundle/ApiPlatform/Resources/SearchProduct.php
rename to src/PrestaShopBundle/ApiPlatform/Resources/FoundProduct.php
index 0fd25132ff180..be035575a96fc 100644
--- a/src/PrestaShopBundle/ApiPlatform/Resources/SearchProduct.php
+++ b/src/PrestaShopBundle/ApiPlatform/Resources/FoundProduct.php
@@ -28,14 +28,17 @@
 
 namespace PrestaShopBundle\ApiPlatform\Resources;
 
+use ApiPlatform\Core\Annotation\ApiProperty;
 use ApiPlatform\Metadata\ApiResource;
-use ApiPlatform\Metadata\Get;
+use ApiPlatform\Metadata\GetCollection;
 use PrestaShop\PrestaShop\Core\Domain\Product\Query\SearchProducts;
+use PrestaShop\PrestaShop\Core\Domain\Product\QueryResult\ProductCombination;
+use PrestaShop\PrestaShop\Core\Domain\Product\QueryResult\ProductCustomizationField;
 use PrestaShopBundle\ApiPlatform\Provider\QueryProvider;
 
 #[ApiResource(
     operations: [
-        new Get(
+        new GetCollection(
             uriTemplate: '/products/search/{phrase}/{resultsLimit}/{isoCode}',
             openapiContext: [
                 'parameters' => [
@@ -78,12 +81,63 @@
                 'query' => SearchProducts::class,
             ]
         ),
-    ]
+    ],
 )]
-class SearchProduct
+class FoundProduct
 {
-    public string $phrase;
-    public int $resultsLimit;
-    public string $isoCode;
-    public int $orderId;
+    /**
+     * @var int
+     */
+    #[ApiProperty(identifier: true)]
+    public $productId;
+
+    /**
+     * @var bool
+     */
+    public $availableOutOfStock;
+
+    /**
+     * @var string
+     */
+    public $name;
+
+    /**
+     * @var float
+     */
+    public $taxRate;
+
+    /**
+     * @var string
+     */
+    public $formattedPrice;
+
+    /**
+     * @var float
+     */
+    public $priceTaxIncl;
+
+    /**
+     * @var float
+     */
+    public $priceTaxExcl;
+
+    /**
+     * @var int
+     */
+    public $stock;
+
+    /**
+     * @var string
+     */
+    public $location;
+
+    /**
+     * @var ProductCombination[]
+     */
+    public $combinations;
+
+    /**
+     * @var ProductCustomizationField[]
+     */
+    public $customizationFields;
 }
diff --git a/tests/Integration/ApiPlatform/GetHookStatusTest.php b/tests/Integration/ApiPlatform/GetHookStatusTest.php
index 807e1f85b60fc..35281b1e36bba 100644
--- a/tests/Integration/ApiPlatform/GetHookStatusTest.php
+++ b/tests/Integration/ApiPlatform/GetHookStatusTest.php
@@ -52,18 +52,18 @@ public function testGetHookStatus(): void
         $activeHook->add();
 
         $bearerToken = $this->getBearerToken();
-        $response = static::createClient()->request('GET', '/new-api/hook-status/' . (int) $inactiveHook->id, ['auth_bearer' => $bearerToken]);
+        $response = static::createClient()->request('GET', '/new-api/hook-status/' . (int) $inactiveHook->id, ['auth_bearer' => $bearerToken, 'headers' => ['accept' => ['application/json']]]);
         self::assertEquals(json_decode($response->getContent())->active, $inactiveHook->active);
         self::assertResponseStatusCodeSame(200);
 
-        $response = static::createClient()->request('GET', '/new-api/hook-status/' . (int) $activeHook->id, ['auth_bearer' => $bearerToken]);
+        $response = static::createClient()->request('GET', '/new-api/hook-status/' . (int) $activeHook->id, ['auth_bearer' => $bearerToken, 'headers' => ['accept' => ['application/json']]]);
         self::assertEquals(json_decode($response->getContent())->active, $activeHook->active);
         self::assertResponseStatusCodeSame(200);
 
-        static::createClient()->request('GET', '/new-api/hook-status/' . 9999, ['auth_bearer' => $bearerToken]);
+        static::createClient()->request('GET', '/new-api/hook-status/' . 9999, ['auth_bearer' => $bearerToken, 'headers' => ['accept' => ['application/json']]]);
         self::assertResponseStatusCodeSame(404);
 
-        static::createClient()->request('GET', '/new-api/hook-status/' . $activeHook->id);
+        static::createClient()->request('GET', '/new-api/hook-status/' . $activeHook->id, ['headers' => ['accept' => ['application/json']]]);
         self::assertResponseStatusCodeSame(401);
 
         $inactiveHook->delete();
@@ -80,11 +80,12 @@ public function testDisableHook(): void
         $bearerToken = $this->getBearerToken();
         static::createClient()->request('PUT', '/new-api/hook-status', [
             'auth_bearer' => $bearerToken,
+            'headers' => ['accept' => ['application/json']],
             'json' => ['id' => (int) $hook->id, 'active' => false],
         ]);
         self::assertResponseStatusCodeSame(200);
 
-        $response = static::createClient()->request('GET', '/new-api/hook-status/' . (int) $hook->id, ['auth_bearer' => $bearerToken]);
+        $response = static::createClient()->request('GET', '/new-api/hook-status/' . (int) $hook->id, ['auth_bearer' => $bearerToken, 'headers' => ['accept' => ['application/json']]]);
         self::assertEquals(json_decode($response->getContent())->active, false);
         self::assertResponseStatusCodeSame(200);
     }
@@ -99,11 +100,12 @@ public function testEnableHook(): void
         $bearerToken = $this->getBearerToken();
         static::createClient()->request('PUT', '/new-api/hook-status', [
             'auth_bearer' => $bearerToken,
+            'headers' => ['accept' => ['application/json']],
             'json' => ['id' => (int) $hook->id, 'active' => true],
         ]);
         self::assertResponseStatusCodeSame(200);
 
-        $response = static::createClient()->request('GET', '/new-api/hook-status/' . (int) $hook->id, ['auth_bearer' => $bearerToken]);
+        $response = static::createClient()->request('GET', '/new-api/hook-status/' . (int) $hook->id, ['auth_bearer' => $bearerToken, 'headers' => ['accept' => ['application/json']]]);
         self::assertEquals(json_decode($response->getContent())->active, true);
         self::assertResponseStatusCodeSame(200);
     }
diff --git a/tests/Integration/ApiPlatform/GetHookTest.php b/tests/Integration/ApiPlatform/GetHookTest.php
index 188c5ccb2e3c0..664c07023e9f4 100644
--- a/tests/Integration/ApiPlatform/GetHookTest.php
+++ b/tests/Integration/ApiPlatform/GetHookTest.php
@@ -49,11 +49,11 @@ public function testGetHook(): void
 
         $bearerToken = $this->getBearerToken();
 
-        $response = static::createClient()->request('GET', '/new-api/hooks/' . (int) $hook->id, ['auth_bearer' => $bearerToken]);
+        $response = static::createClient()->request('GET', '/new-api/hooks/' . (int) $hook->id, ['auth_bearer' => $bearerToken, 'headers' => ['accept' => ['application/json']]]);
         self::assertEquals(json_decode($response->getContent())->active, $hook->active);
         self::assertResponseStatusCodeSame(200);
 
-        static::createClient()->request('GET', '/new-api/hooks/' . 9999, ['auth_bearer' => $bearerToken]);
+        static::createClient()->request('GET', '/new-api/hooks/' . 9999, ['auth_bearer' => $bearerToken, 'headers' => ['accept' => ['application/json']]]);
         self::assertResponseStatusCodeSame(404);
 
         static::createClient()->request('GET', '/new-api/hooks/' . $hook->id);
diff --git a/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/01_internalAuthServer/02_resourceEndpoint.ts b/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/01_internalAuthServer/02_resourceEndpoint.ts
index c8eca1e9cdeb4..1d682459304ef 100644
--- a/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/01_internalAuthServer/02_resourceEndpoint.ts
+++ b/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/01_internalAuthServer/02_resourceEndpoint.ts
@@ -83,7 +83,7 @@ describe('API : Internal Auth Server - Resource Endpoint', async () => {
       });
       await expect(apiResponse.status()).to.eq(200);
       await expect(api.hasResponseHeader(apiResponse, 'Content-Type')).to.be.true;
-      await expect(api.getResponseHeader(apiResponse, 'Content-Type')).to.contains('application/ld+json');
+      await expect(api.getResponseHeader(apiResponse, 'Content-Type')).to.contains('application/json');
 
       const jsonResponse = await apiResponse.json();
       await expect(jsonResponse).to.have.property('id');
diff --git a/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts b/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts
index 269343cd40754..8fc6b8038767d 100644
--- a/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts
+++ b/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts
@@ -171,7 +171,7 @@ describe('API : External Auth Server - Resource Endpoint', async () => {
 
       await expect(apiResponse.status()).to.eq(200);
       await expect(api.hasResponseHeader(apiResponse, 'Content-Type')).to.be.true;
-      await expect(api.getResponseHeader(apiResponse, 'Content-Type')).to.contains('application/ld+json');
+      await expect(api.getResponseHeader(apiResponse, 'Content-Type')).to.contains('application/json');
 
       const jsonResponse = await apiResponse.json();
       await expect(jsonResponse).to.have.property('id');
diff --git a/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php b/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
index 51a0e9789eb47..0e5c264a51acc 100644
--- a/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
+++ b/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
@@ -29,6 +29,7 @@
 namespace Tests\Unit\PrestaShopBundle\ApiPlatform\StateProvider;
 
 use ApiPlatform\Metadata\Get;
+use ApiPlatform\Metadata\GetCollection;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
@@ -39,8 +40,8 @@
 use PrestaShopBundle\ApiPlatform\Converters\StringToIntConverter;
 use PrestaShopBundle\ApiPlatform\Exception\NoExtraPropertiesFoundException;
 use PrestaShopBundle\ApiPlatform\Provider\QueryProvider;
+use PrestaShopBundle\ApiPlatform\Resources\FoundProduct as FoundProductDto;
 use PrestaShopBundle\ApiPlatform\Resources\Hook;
-use PrestaShopBundle\ApiPlatform\Resources\SearchProduct;
 use RuntimeException;
 use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
 use Symfony\Component\Serializer\Serializer;
@@ -99,10 +100,10 @@ public function testProvideHookStatus(): void
     public function testSearchProduct(): void
     {
         $searchProductProvider = new QueryProvider($this->queryBus, [new StringToIntConverter()], $this->serializer);
-        $get = new Get();
+        $get = new GetCollection();
         $get = $get
             ->withExtraProperties(['query' => SearchProducts::class])
-            ->withClass(SearchProduct::class);
+            ->withClass(FoundProductDto::class);
         $searchProducts = $searchProductProvider->provide($get, ['phrase' => 'mug', 'resultsLimit' => 10, 'isoCode' => 'EUR']);
         self::assertCount(1, $searchProducts);
 

From acef358fc71606f38de22f61a540c06958b30eb3 Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Wed, 9 Aug 2023 16:58:03 +0200
Subject: [PATCH 0752/1030] Fixes after Jo's review

---
 .../ApiPlatform/Provider/QueryProvider.php                | 8 ++++----
 .../ApiPlatform/StateProvider/QueryProviderTest.php       | 3 ---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
index 5ee677709fbc1..dc145e16fa52d 100644
--- a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
+++ b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
@@ -55,17 +55,17 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
     {
         $queryClass = $operation->getExtraProperties()['query'] ?? null;
         $filters = $context['filters'] ?? [];
-        $uriVariables = array_merge($uriVariables, $filters);
+        $queryParameters = array_merge($uriVariables, $filters);
 
         if (null === $queryClass) {
             throw new NoExtraPropertiesFoundException();
         }
 
-        $query = $this->apiPlatformSerializer->denormalize($uriVariables, $queryClass);
+        $query = $this->apiPlatformSerializer->denormalize($queryParameters, $queryClass);
 
         //Try to call setter on additional query params
-        if (count($uriVariables)) {
-            foreach ($uriVariables as $param => $value) {
+        if (count($queryParameters)) {
+            foreach ($queryParameters as $param => $value) {
                 if ($reflectionMethod = $this->findSetterMethod($param, $queryClass)) {
                     $methodParameter = $reflectionMethod->getParameters()[0];
                     if ($methodParameter->getType() instanceof \ReflectionNamedType && $methodParameter->getType()->getName() !== gettype($value)) {
diff --git a/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php b/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
index 0e5c264a51acc..64cdf11f2277e 100644
--- a/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
+++ b/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
@@ -67,9 +67,6 @@ public function setUp(): void
         $this->queryBus = $this->createMock(CommandBusInterface::class);
         $this->queryBus
             ->method('handle')
-            ->willReturnCallback(function ($query) {
-                return $this->createHookStatusResultBasedOnQuery($query);
-            })
             ->willReturnCallback(function ($query) {
                 switch (get_class($query)) {
                     case GetHookStatus::class:

From 292e227b21bc5a5e30ed38209f71d071f0ba65cd Mon Sep 17 00:00:00 2001
From: Damien TUPINIER <damien.tupinier@gmail.com>
Date: Wed, 9 Aug 2023 16:58:47 +0200
Subject: [PATCH 0753/1030] Fix load JqueryUI on FrontController : load only
 requested components

---
 classes/controller/FrontController.php | 31 +++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php
index ec6ab3e2b3c66..49491642bec72 100644
--- a/classes/controller/FrontController.php
+++ b/classes/controller/FrontController.php
@@ -1148,13 +1148,32 @@ public function removeJS($js_uri, $check_path = true)
      */
     public function addJqueryUI($component, $theme = 'base', $check_dependencies = true)
     {
-        $css_theme_path = '/js/jquery/ui/themes/' . $theme . '/minified/jquery.ui.theme.min.css';
-        $css_path = '/js/jquery/ui/themes/' . $theme . '/minified/jquery-ui.min.css';
-        $js_path = '/js/jquery/ui/jquery-ui.min.js';
+        // If the component does not start with ui. prefix, we need to add it
+        if (substr($component, 0, 3) !== 'ui.') {
+            $component = 'ui.' . $component;
+        }
+
+        if (!is_array($component)) {
+            $component = [$component];
+        }
 
-        $this->registerStylesheet('jquery-ui-theme', $css_theme_path, ['media' => 'all', 'priority' => 95]);
-        $this->registerStylesheet('jquery-ui', $css_path, ['media' => 'all', 'priority' => 90]);
-        $this->registerJavascript('jquery-ui', $js_path, ['position' => 'bottom', 'priority' => 49]);
+        foreach ($component as $ui) {
+            $ui_path = Media::getJqueryUIPath($ui, $theme, $check_dependencies);
+            foreach ($ui_path['css'] as $uiPathCss => $uiMediaCss) {
+                $this->registerStylesheet(
+                    str_replace(_PS_JS_DIR_ . 'jquery/ui/themes/' . $theme . '/', '', $uiPathCss),
+                    str_replace(_PS_JS_DIR_, '/js/', $uiPathCss),
+                    ['media' => $uiMediaCss, 'priority' => 95]
+                );
+            }
+            foreach ($ui_path['js'] as $uiPathJs) {
+                $this->registerJavascript(
+                    str_replace(_PS_JS_DIR_ . 'jquery/ui/', '', $uiPathJs),
+                    str_replace(_PS_JS_DIR_, '/js/', $uiPathJs),
+                    ['position' => 'bottom', 'priority' => 49]
+                );
+            }
+        }
     }
 
     /**

From b4a03be84dac2917e09b36b322d32d890b0b9cc1 Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Fri, 5 May 2023 09:48:20 +0200
Subject: [PATCH 0754/1030] Remove menu thumbnails

---
 .../CommandHandler/AddCategoryHandler.php     |   9 +-
 .../CommandHandler/AddRootCategoryHandler.php |   8 +-
 ...eleteCategoryMenuThumbnailImageHandler.php | 112 ----------------
 .../CommandHandler/EditCategoryHandler.php    |  19 +--
 .../EditRootCategoryHandler.php               |  21 +--
 .../GetCategoryForEditingHandler.php          |  34 -----
 .../Image/Uploader/CategoryImageUploader.php  |  19 +--
 .../CategoryMenuThumbnailUploader.php         | 125 ------------------
 .../Category/Provider/CategoryImageFinder.php |  61 ---------
 .../MenuThumbnailAvailableKeyProvider.php     |  69 ----------
 .../Category/Command/AddCategoryCommand.php   |  22 ---
 .../Command/AddRootCategoryCommand.php        |  22 ---
 ...eleteCategoryMenuThumbnailImageCommand.php |  72 ----------
 .../Category/Command/EditCategoryCommand.php  |  22 ---
 .../Command/EditRootCategoryCommand.php       |  22 ---
 ...goryMenuThumbnailImageHandlerInterface.php |  40 ------
 .../Exception/CannotDeleteImageException.php  |   1 -
 .../Exception/CategoryConstraintException.php |   5 -
 .../MenuThumbnailsLimitException.php          |  34 -----
 .../Category/QueryResult/EditableCategory.php |  25 ----
 .../Category/ValueObject/MenuThumbnailId.php  |  73 ----------
 .../DataHandler/CategoryFormDataHandler.php   |   8 --
 .../RootCategoryFormDataHandler.php           |   8 --
 .../DataProvider/CategoryFormDataProvider.php |  18 ---
 .../Admin/Sell/Catalog/CategoryController.php |  62 ---------
 .../Catalog/Category/AbstractCategoryType.php |  30 -----
 .../routing/admin/sell/catalog/categories.yml |  13 --
 .../config/services/adapter/category.yml      |   8 --
 .../config/services/adapter/image.yml         |   7 -
 .../config/services/core/category.yml         |   6 +-
 .../services/core/form/form_data_handler.yml  |   4 -
 .../Catalog/Categories/edit_root.html.twig    |   1 -
 .../prestashop_ui_kit_base.html.twig          |  14 +-
 .../Context/Domain/CategoryFeatureContext.php |  58 --------
 .../Category/category_management.feature      |  13 --
 .../11_imageGenerationOnCreation.ts           |   7 -
 .../14_checkCategoryImageFormat.ts            |  30 -----
 tests/UI/data/faker/category.ts               |   5 -
 tests/UI/data/types/category.d.ts             |   1 -
 tests/UI/pages/BO/catalog/categories/add.ts   |   6 -
 .../Provider/CategoryImageFinderTest.php      |  70 ----------
 .../MenuThumbnailAvailableKeyProviderTest.php |  76 -----------
 42 files changed, 12 insertions(+), 1248 deletions(-)
 delete mode 100644 src/Adapter/Category/CommandHandler/DeleteCategoryMenuThumbnailImageHandler.php
 delete mode 100644 src/Adapter/Image/Uploader/CategoryMenuThumbnailUploader.php
 delete mode 100644 src/Core/Category/Provider/CategoryImageFinder.php
 delete mode 100644 src/Core/Category/Provider/MenuThumbnailAvailableKeyProvider.php
 delete mode 100644 src/Core/Domain/Category/Command/DeleteCategoryMenuThumbnailImageCommand.php
 delete mode 100644 src/Core/Domain/Category/CommandHandler/DeleteCategoryMenuThumbnailImageHandlerInterface.php
 delete mode 100644 src/Core/Domain/Category/Exception/MenuThumbnailsLimitException.php
 delete mode 100644 src/Core/Domain/Category/ValueObject/MenuThumbnailId.php
 delete mode 100644 tests/Unit/Core/Category/Provider/CategoryImageFinderTest.php
 delete mode 100644 tests/Unit/Core/Category/Provider/MenuThumbnailAvailableKeyProviderTest.php

diff --git a/src/Adapter/Category/CommandHandler/AddCategoryHandler.php b/src/Adapter/Category/CommandHandler/AddCategoryHandler.php
index 960f4935f4303..d1968d0911f38 100644
--- a/src/Adapter/Category/CommandHandler/AddCategoryHandler.php
+++ b/src/Adapter/Category/CommandHandler/AddCategoryHandler.php
@@ -33,9 +33,7 @@
 use PrestaShop\PrestaShop\Core\Domain\Category\Command\AddCategoryCommand;
 use PrestaShop\PrestaShop\Core\Domain\Category\CommandHandler\AddCategoryHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CannotAddCategoryException;
-use PrestaShop\PrestaShop\Core\Domain\Category\Exception\MenuThumbnailsLimitException;
 use PrestaShop\PrestaShop\Core\Domain\Category\ValueObject\CategoryId;
-use PrestaShop\PrestaShop\Core\Domain\Category\ValueObject\MenuThumbnailId;
 
 /**
  * Adds new category using legacy object model.
@@ -64,9 +62,6 @@ public function __construct(CategoryImageUploader $categoryImageUploader)
      */
     public function handle(AddCategoryCommand $command)
     {
-        if (count($command->getMenuThumbnailImages()) > count(MenuThumbnailId::ALLOWED_ID_VALUES)) {
-            throw new MenuThumbnailsLimitException('Maximum number of menu thumbnails exceeded for new category');
-        }
         $category = $this->createCategoryFromCommand($command);
 
         $categoryId = new CategoryId((int) $category->id);
@@ -74,8 +69,7 @@ public function handle(AddCategoryCommand $command)
         $this->categoryImageUploader->uploadImages(
             $categoryId,
             $command->getCoverImage(),
-            $command->getThumbnailImage(),
-            $command->getMenuThumbnailImages()
+            $command->getThumbnailImage()
         );
 
         return $categoryId;
@@ -87,7 +81,6 @@ public function handle(AddCategoryCommand $command)
      * @return Category
      *
      * @throws CannotAddCategoryException
-     * @throws MenuThumbnailsLimitException
      * @throws \PrestaShopDatabaseException
      * @throws \PrestaShopException
      */
diff --git a/src/Adapter/Category/CommandHandler/AddRootCategoryHandler.php b/src/Adapter/Category/CommandHandler/AddRootCategoryHandler.php
index 5ed1c7dc78165..25ea62dab58ea 100644
--- a/src/Adapter/Category/CommandHandler/AddRootCategoryHandler.php
+++ b/src/Adapter/Category/CommandHandler/AddRootCategoryHandler.php
@@ -35,9 +35,7 @@
 use PrestaShop\PrestaShop\Core\Domain\Category\CommandHandler\AddRootCategoryHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CannotAddCategoryException;
 use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CategoryException;
-use PrestaShop\PrestaShop\Core\Domain\Category\Exception\MenuThumbnailsLimitException;
 use PrestaShop\PrestaShop\Core\Domain\Category\ValueObject\CategoryId;
-use PrestaShop\PrestaShop\Core\Domain\Category\ValueObject\MenuThumbnailId;
 
 /**
  * Class AddRootCategoryHandler.
@@ -79,8 +77,7 @@ public function handle(AddRootCategoryCommand $command)
         $this->categoryImageUploader->uploadImages(
             $categoryId,
             $command->getCoverImage(),
-            $command->getThumbnailImage(),
-            $command->getMenuThumbnailImages()
+            $command->getThumbnailImage()
         );
 
         return $categoryId;
@@ -98,9 +95,6 @@ public function handle(AddRootCategoryCommand $command)
      */
     private function createRootCategoryFromCommand(AddRootCategoryCommand $command)
     {
-        if (count($command->getMenuThumbnailImages()) > count(MenuThumbnailId::ALLOWED_ID_VALUES)) {
-            throw new MenuThumbnailsLimitException('Maximum number of menu thumbnails exceeded for new category');
-        }
         $category = new Category();
         $category->is_root_category = true;
         $category->level_depth = 1;
diff --git a/src/Adapter/Category/CommandHandler/DeleteCategoryMenuThumbnailImageHandler.php b/src/Adapter/Category/CommandHandler/DeleteCategoryMenuThumbnailImageHandler.php
deleted file mode 100644
index 1333d72e15a3b..0000000000000
--- a/src/Adapter/Category/CommandHandler/DeleteCategoryMenuThumbnailImageHandler.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-namespace PrestaShop\PrestaShop\Adapter\Category\CommandHandler;
-
-use Category;
-use PrestaShop\PrestaShop\Core\Cache\Clearer\CacheClearerInterface;
-use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
-use PrestaShop\PrestaShop\Core\ConfigurationInterface;
-use PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryMenuThumbnailImageCommand;
-use PrestaShop\PrestaShop\Core\Domain\Category\CommandHandler\DeleteCategoryMenuThumbnailImageHandlerInterface;
-use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CannotDeleteImageException;
-use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CategoryNotFoundException;
-use Symfony\Component\Filesystem\Exception\IOException;
-use Symfony\Component\Filesystem\Filesystem;
-
-/**
- * Handles command which deletes given category menu thumbnail.
- *
- * @internal
- */
-#[AsCommandHandler]
-final class DeleteCategoryMenuThumbnailImageHandler implements DeleteCategoryMenuThumbnailImageHandlerInterface
-{
-    /**
-     * @var Filesystem
-     */
-    private $filesystem;
-
-    /**
-     * @var ConfigurationInterface
-     */
-    private $configuration;
-
-    /**
-     * @var CacheClearerInterface
-     */
-    private $smartyCacheClearer;
-
-    /**
-     * @param Filesystem $filesystem
-     * @param ConfigurationInterface $configuration
-     * @param CacheClearerInterface $smartyCacheClearer
-     */
-    public function __construct(
-        Filesystem $filesystem,
-        ConfigurationInterface $configuration,
-        CacheClearerInterface $smartyCacheClearer
-    ) {
-        $this->filesystem = $filesystem;
-        $this->configuration = $configuration;
-        $this->smartyCacheClearer = $smartyCacheClearer;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function handle(DeleteCategoryMenuThumbnailImageCommand $command)
-    {
-        $categoryId = $command->getCategoryId();
-        $menuThumbnailId = $command->getMenuThumbnailId();
-
-        $category = new Category($categoryId->getValue());
-
-        if ($category->id !== $categoryId->getValue()) {
-            throw new CategoryNotFoundException(
-                $categoryId,
-                sprintf('Category with id "%d" was not found', $categoryId->getValue())
-            );
-        }
-
-        $thumbnailPath = sprintf(
-            '%s%s-%s_thumb.jpg',
-            $this->configuration->get('_PS_CAT_IMG_DIR_'),
-            $category->id,
-            $menuThumbnailId->getValue()
-        );
-
-        try {
-            if ($this->filesystem->exists($thumbnailPath)) {
-                $this->filesystem->remove($thumbnailPath);
-
-                $this->smartyCacheClearer->clear();
-            }
-        } catch (IOException $e) {
-            throw new CannotDeleteImageException(sprintf('Cannot delete menu thumbnail with id "%s" for category with id "%s".', $menuThumbnailId->getValue(), $categoryId->getValue()), CannotDeleteImageException::MENU_THUMBNAIL_IMAGE, $e);
-        }
-    }
-}
diff --git a/src/Adapter/Category/CommandHandler/EditCategoryHandler.php b/src/Adapter/Category/CommandHandler/EditCategoryHandler.php
index c18b3a337aa43..2ecfe30c08743 100644
--- a/src/Adapter/Category/CommandHandler/EditCategoryHandler.php
+++ b/src/Adapter/Category/CommandHandler/EditCategoryHandler.php
@@ -29,14 +29,12 @@
 use Category;
 use PrestaShop\PrestaShop\Adapter\Domain\AbstractObjectModelHandler;
 use PrestaShop\PrestaShop\Adapter\Image\Uploader\CategoryImageUploader;
-use PrestaShop\PrestaShop\Core\Category\Provider\MenuThumbnailAvailableKeyProvider;
 use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Category\Command\EditCategoryCommand;
 use PrestaShop\PrestaShop\Core\Domain\Category\CommandHandler\EditCategoryHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CannotEditCategoryException;
 use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CannotEditRootCategoryException;
 use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CategoryNotFoundException;
-use PrestaShop\PrestaShop\Core\Domain\Category\Exception\MenuThumbnailsLimitException;
 
 /**
  * Class EditCategoryHandler.
@@ -51,17 +49,10 @@ final class EditCategoryHandler extends AbstractObjectModelHandler implements Ed
      */
     private $categoryImageUploader;
 
-    /**
-     * @var MenuThumbnailAvailableKeyProvider
-     */
-    private $menuThumbnailAvailableKeyProvider;
-
     public function __construct(
-        CategoryImageUploader $categoryImageUploader,
-        MenuThumbnailAvailableKeyProvider $menuThumbnailAvailableKeyProvider
+        CategoryImageUploader $categoryImageUploader
     ) {
         $this->categoryImageUploader = $categoryImageUploader;
-        $this->menuThumbnailAvailableKeyProvider = $menuThumbnailAvailableKeyProvider;
     }
 
     /**
@@ -72,11 +63,6 @@ public function __construct(
      */
     public function handle(EditCategoryCommand $command)
     {
-        $availableKeys = $this->menuThumbnailAvailableKeyProvider->getAvailableKeys($command->getCategoryId()->getValue());
-
-        if (count($command->getMenuThumbnailImages()) > count($availableKeys)) {
-            throw new MenuThumbnailsLimitException('Maximum number of menu thumbnails exceeded for new category');
-        }
         $category = new Category($command->getCategoryId()->getValue());
 
         if (!$category->id) {
@@ -92,8 +78,7 @@ public function handle(EditCategoryCommand $command)
         $this->categoryImageUploader->uploadImages(
             $command->getCategoryId(),
             $command->getCoverImage(),
-            $command->getThumbnailImage(),
-            $command->getMenuThumbnailImages()
+            $command->getThumbnailImage()
         );
     }
 
diff --git a/src/Adapter/Category/CommandHandler/EditRootCategoryHandler.php b/src/Adapter/Category/CommandHandler/EditRootCategoryHandler.php
index 8bc13aa1b8412..beb8b83bc27b6 100644
--- a/src/Adapter/Category/CommandHandler/EditRootCategoryHandler.php
+++ b/src/Adapter/Category/CommandHandler/EditRootCategoryHandler.php
@@ -29,7 +29,6 @@
 use Category;
 use PrestaShop\PrestaShop\Adapter\Domain\AbstractObjectModelHandler;
 use PrestaShop\PrestaShop\Adapter\Image\Uploader\CategoryImageUploader;
-use PrestaShop\PrestaShop\Core\Category\Provider\MenuThumbnailAvailableKeyProvider;
 use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\Category\Command\EditRootCategoryCommand;
 use PrestaShop\PrestaShop\Core\Domain\Category\CommandHandler\EditRootCategoryHandlerInterface;
@@ -37,7 +36,6 @@
 use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CannotEditRootCategoryException;
 use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CategoryException;
 use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CategoryNotFoundException;
-use PrestaShop\PrestaShop\Core\Domain\Category\Exception\MenuThumbnailsLimitException;
 
 /**
  * Class EditRootCategoryHandler.
@@ -50,17 +48,10 @@ final class EditRootCategoryHandler extends AbstractObjectModelHandler implement
      */
     private $categoryImageUploader;
 
-    /**
-     * @var MenuThumbnailAvailableKeyProvider
-     */
-    private $menuThumbnailAvailableKeyProvider;
-
     public function __construct(
-        CategoryImageUploader $categoryImageUploader,
-        MenuThumbnailAvailableKeyProvider $menuThumbnailAvailableKeyProvider
+        CategoryImageUploader $categoryImageUploader
     ) {
         $this->categoryImageUploader = $categoryImageUploader;
-        $this->menuThumbnailAvailableKeyProvider = $menuThumbnailAvailableKeyProvider;
     }
 
     /**
@@ -72,16 +63,9 @@ public function __construct(
      * @throws CannotEditRootCategoryException
      * @throws CategoryException
      * @throws CategoryNotFoundException
-     * @throws MenuThumbnailsLimitException
      */
     public function handle(EditRootCategoryCommand $command)
     {
-        $availableKeys = $this->menuThumbnailAvailableKeyProvider->getAvailableKeys($command->getCategoryId()->getValue());
-
-        if (count($command->getMenuThumbnailImages()) > count($availableKeys)) {
-            throw new MenuThumbnailsLimitException('Maximum number of menu thumbnails exceeded for new category');
-        }
-
         $category = new Category($command->getCategoryId()->getValue());
 
         if (!$category->id) {
@@ -97,8 +81,7 @@ public function handle(EditRootCategoryCommand $command)
         $this->categoryImageUploader->uploadImages(
             $command->getCategoryId(),
             $command->getCoverImage(),
-            $command->getThumbnailImage(),
-            $command->getMenuThumbnailImages()
+            $command->getThumbnailImage()
         );
     }
 
diff --git a/src/Adapter/Category/QueryHandler/GetCategoryForEditingHandler.php b/src/Adapter/Category/QueryHandler/GetCategoryForEditingHandler.php
index f8ba5448d00eb..255587bb00309 100644
--- a/src/Adapter/Category/QueryHandler/GetCategoryForEditingHandler.php
+++ b/src/Adapter/Category/QueryHandler/GetCategoryForEditingHandler.php
@@ -38,7 +38,6 @@
 use PrestaShop\PrestaShop\Core\Domain\Category\QueryHandler\GetCategoryForEditingHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Category\QueryResult\EditableCategory;
 use PrestaShop\PrestaShop\Core\Domain\Category\ValueObject\CategoryId;
-use PrestaShop\PrestaShop\Core\Domain\Category\ValueObject\MenuThumbnailId;
 use PrestaShop\PrestaShop\Core\Image\Parser\ImageTagSourceParserInterface;
 use Shop;
 
@@ -108,7 +107,6 @@ public function handle(GetCategoryForEditing $query)
             (bool) $category->is_root_category,
             $this->getCoverImage($query->getCategoryId()),
             $this->getThumbnailImage($query->getCategoryId()),
-            $this->getMenuThumbnailImages($query->getCategoryId()),
             $subcategories->fetchAll(PDO::FETCH_COLUMN),
             $category->additional_description
         );
@@ -205,36 +203,4 @@ private function getThumbnailImage(CategoryId $categoryId)
 
         return null;
     }
-
-    /**
-     * @param CategoryId $categoryId
-     *
-     * @return array
-     */
-    private function getMenuThumbnailImages(CategoryId $categoryId)
-    {
-        $menuThumbnails = [];
-
-        foreach (MenuThumbnailId::ALLOWED_ID_VALUES as $id) {
-            $thumbnailPath = _PS_CAT_IMG_DIR_ . $categoryId->getValue() . '-' . $id . '_thumb.jpg';
-
-            if (file_exists($thumbnailPath)) {
-                $imageTag = ImageManager::thumbnail(
-                    $thumbnailPath,
-                    'category_' . $categoryId->getValue() . '-' . $id . '_thumb.jpg',
-                    100,
-                    'jpg',
-                    true,
-                    true
-                );
-
-                $menuThumbnails[$id] = [
-                    'path' => $this->imageTagSourceParser->parse($imageTag),
-                    'id' => $id,
-                ];
-            }
-        }
-
-        return $menuThumbnails;
-    }
 }
diff --git a/src/Adapter/Image/Uploader/CategoryImageUploader.php b/src/Adapter/Image/Uploader/CategoryImageUploader.php
index 0621c170cf3a6..92f09ffcbfa10 100644
--- a/src/Adapter/Image/Uploader/CategoryImageUploader.php
+++ b/src/Adapter/Image/Uploader/CategoryImageUploader.php
@@ -45,32 +45,23 @@ class CategoryImageUploader
      */
     private $categoryThumbnailUploader;
 
-    /**
-     * @var ImageUploaderInterface
-     */
-    private $categoryMenuThumbnailUploader;
-
     public function __construct(
         ImageUploaderInterface $categoryCoverUploader,
-        ImageUploaderInterface $categoryThumbnailUploader,
-        ImageUploaderInterface $categoryMenuThumbnailUploader
+        ImageUploaderInterface $categoryThumbnailUploader
     ) {
         $this->categoryCoverUploader = $categoryCoverUploader;
         $this->categoryThumbnailUploader = $categoryThumbnailUploader;
-        $this->categoryMenuThumbnailUploader = $categoryMenuThumbnailUploader;
     }
 
     /**
      * @param CategoryId $categoryId
      * @param UploadedFile|null $coverImage
      * @param UploadedFile|null $thumbnailImage
-     * @param UploadedFile[] $menuThumbnailImages
      */
     public function uploadImages(
         CategoryId $categoryId,
         UploadedFile $coverImage = null,
-        UploadedFile $thumbnailImage = null,
-        array $menuThumbnailImages = []
+        UploadedFile $thumbnailImage = null
     ): void {
         if (null !== $coverImage) {
             $this->categoryCoverUploader->upload($categoryId->getValue(), $coverImage);
@@ -79,11 +70,5 @@ public function uploadImages(
         if (null !== $thumbnailImage) {
             $this->categoryThumbnailUploader->upload($categoryId->getValue(), $thumbnailImage);
         }
-
-        if (!empty($menuThumbnailImages)) {
-            foreach ($menuThumbnailImages as $menuThumbnail) {
-                $this->categoryMenuThumbnailUploader->upload($categoryId->getValue(), $menuThumbnail);
-            }
-        }
     }
 }
diff --git a/src/Adapter/Image/Uploader/CategoryMenuThumbnailUploader.php b/src/Adapter/Image/Uploader/CategoryMenuThumbnailUploader.php
deleted file mode 100644
index c6b5ec2d2a372..0000000000000
--- a/src/Adapter/Image/Uploader/CategoryMenuThumbnailUploader.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-namespace PrestaShop\PrestaShop\Adapter\Image\Uploader;
-
-use HelperImageUploader;
-use ImageManager;
-use PrestaShop\PrestaShop\Core\Cache\Clearer\CacheClearerInterface;
-use PrestaShop\PrestaShop\Core\Category\Provider\MenuThumbnailAvailableKeyProvider;
-use PrestaShop\PrestaShop\Core\Domain\Category\Exception\MenuThumbnailsLimitException;
-use PrestaShop\PrestaShop\Core\Image\Uploader\Exception\ImageUploadException;
-use PrestaShop\PrestaShop\Core\Image\Uploader\Exception\MemoryLimitException;
-use PrestaShop\PrestaShop\Core\Image\Uploader\ImageUploaderInterface;
-use Symfony\Component\HttpFoundation\File\UploadedFile;
-
-/**
- * Class CategoryMenuThumbnailUploader.
- */
-final class CategoryMenuThumbnailUploader extends AbstractImageUploader implements ImageUploaderInterface
-{
-    /**
-     * @var CacheClearerInterface
-     */
-    private $cacheClearer;
-
-    /**
-     * @var MenuThumbnailAvailableKeyProvider
-     */
-    private $menuThumbnailAvailableKeyProvider;
-
-    /**
-     * @param CacheClearerInterface $cacheClearer
-     * @param MenuThumbnailAvailableKeyProvider $menuThumbnailAvailableKeyProvider
-     */
-    public function __construct(
-        CacheClearerInterface $cacheClearer,
-        MenuThumbnailAvailableKeyProvider $menuThumbnailAvailableKeyProvider
-    ) {
-        $this->cacheClearer = $cacheClearer;
-        $this->menuThumbnailAvailableKeyProvider = $menuThumbnailAvailableKeyProvider;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @throws ImageUploadException
-     */
-    public function upload($categoryId, UploadedFile $uploadedImage)
-    {
-        $this->checkImageIsAllowedForUpload($uploadedImage);
-
-        $availableKeys = $this->menuThumbnailAvailableKeyProvider->getAvailableKeys($categoryId);
-
-        // HelperImageUploader::process() expects
-        // uploaded file to be available in $_FILES
-        $_FILES['thumbnail'] = [
-            'error' => [$uploadedImage->getError()],
-            'name' => [$uploadedImage->getClientOriginalName()],
-            'size' => [$uploadedImage->getSize()],
-            'tmp_name' => [$uploadedImage->getPathname()],
-            'type' => [$uploadedImage->getMimeType()],
-        ];
-
-        $helper = new HelperImageUploader('thumbnail');
-        $uploadedFiles = $helper->process();
-
-        if (count($availableKeys) < count($uploadedFiles)) {
-            throw new MenuThumbnailsLimitException(sprintf('Maximum number of menu thumbnails was reached for category "%s"', $categoryId));
-        }
-
-        foreach ($uploadedFiles as &$uploadedFile) {
-            $key = array_shift($availableKeys);
-
-            // Evaluate the memory required to resize the image: if it's too much, you can't resize it.
-            if (isset($uploadedFile['save_path']) && !ImageManager::checkImageMemoryLimit($uploadedFile['save_path'])) {
-                throw new MemoryLimitException(sprintf('Cannot resize menu thumbnail for category with id "%s" due to reached memory limit.', $categoryId));
-            }
-
-            // Copy new image
-            if (!isset($uploadedFile['save_path'])
-                || !ImageManager::resize($uploadedFile['save_path'], _PS_CAT_IMG_DIR_ . $categoryId . '-' . $key . '_thumb.jpg')
-            ) {
-                throw new ImageUploadException('An error occurred while uploading the image.');
-            }
-
-            if (isset($uploadedFile['save_path']) && is_file($uploadedFile['save_path'])) {
-                unlink($uploadedFile['save_path']);
-            }
-
-            // Necessary to prevent hacking
-            if (isset($uploadedFile['save_path'])) {
-                unset($uploadedFile['save_path']);
-            }
-
-            if (isset($uploadedFile['tmp_name'])) {
-                unset($uploadedFile['tmp_name']);
-            }
-        }
-
-        $this->cacheClearer->clear();
-    }
-}
diff --git a/src/Core/Category/Provider/CategoryImageFinder.php b/src/Core/Category/Provider/CategoryImageFinder.php
deleted file mode 100644
index 263c7bb8d9ac3..0000000000000
--- a/src/Core/Category/Provider/CategoryImageFinder.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-declare(strict_types=1);
-
-namespace PrestaShop\PrestaShop\Core\Category\Provider;
-
-use Symfony\Component\Finder\Finder;
-
-/**
- * Finds used thumb images for specific category id
- */
-class CategoryImageFinder extends Finder
-{
-    /**
-     * @var string
-     */
-    private $categoryImgDir;
-
-    /**
-     * @param string $categoryImgDir
-     */
-    public function __construct(string $categoryImgDir)
-    {
-        parent::__construct();
-        $this->categoryImgDir = $categoryImgDir;
-    }
-
-    /**
-     * @param int $categoryId
-     *
-     * @return Finder
-     */
-    public function findMenuThumbnails(int $categoryId): Finder
-    {
-        return $this->files()->name('/^' . $categoryId . '-([0-9])?_thumb.jpg/i')->in($this->categoryImgDir);
-    }
-}
diff --git a/src/Core/Category/Provider/MenuThumbnailAvailableKeyProvider.php b/src/Core/Category/Provider/MenuThumbnailAvailableKeyProvider.php
deleted file mode 100644
index cf6ea8c1fdc62..0000000000000
--- a/src/Core/Category/Provider/MenuThumbnailAvailableKeyProvider.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-declare(strict_types=1);
-
-namespace PrestaShop\PrestaShop\Core\Category\Provider;
-
-use PrestaShop\PrestaShop\Core\Domain\Category\ValueObject\MenuThumbnailId;
-
-/**
- * This class is responsible for providing available category menu thumbnail keys.
- * Category can only have 3 thumbnails (0,1,2).
- * We check if thumbnails with those id's exist, if they do they are no longer available.
- */
-class MenuThumbnailAvailableKeyProvider
-{
-    /**
-     * @var CategoryImageFinder
-     */
-    private $categoryImageFinder;
-
-    public function __construct(CategoryImageFinder $categoryImageFinder)
-    {
-        $this->categoryImageFinder = $categoryImageFinder;
-    }
-
-    /**
-     * @param int $categoryId
-     *
-     * @return array<int, int>
-     */
-    public function getAvailableKeys(int $categoryId): array
-    {
-        $usedKeys = [];
-
-        foreach ($this->categoryImageFinder->findMenuThumbnails($categoryId) as $file) {
-            $matches = [];
-
-            if (preg_match('/^' . $categoryId . '-([0-9])?_thumb.jpg/i', $file->getFilename(), $matches) === 1) {
-                $usedKeys[] = (int) $matches[1];
-            }
-        }
-
-        return array_diff(MenuThumbnailId::ALLOWED_ID_VALUES, $usedKeys);
-    }
-}
diff --git a/src/Core/Domain/Category/Command/AddCategoryCommand.php b/src/Core/Domain/Category/Command/AddCategoryCommand.php
index be0378d57a496..2583e33c7592d 100644
--- a/src/Core/Domain/Category/Command/AddCategoryCommand.php
+++ b/src/Core/Domain/Category/Command/AddCategoryCommand.php
@@ -99,11 +99,6 @@ class AddCategoryCommand
      */
     private $thumbnailImage;
 
-    /**
-     * @var array
-     */
-    private $menuThumbnailImages;
-
     /**
      * @param string[] $localizedNames
      * @param string[] $localizedLinkRewrites
@@ -119,7 +114,6 @@ public function __construct(array $localizedNames, array $localizedLinkRewrites,
             ->setLocalizedLinkRewrites($localizedLinkRewrites)
             ->setIsActive($isActive)
             ->setParentCategoryId($parentCategoryId);
-        $this->menuThumbnailImages = [];
     }
 
     /**
@@ -397,20 +391,4 @@ public function setThumbnailImage(?UploadedFile $thumbnailImage): void
     {
         $this->thumbnailImage = $thumbnailImage;
     }
-
-    /**
-     * @return array
-     */
-    public function getMenuThumbnailImages(): array
-    {
-        return $this->menuThumbnailImages;
-    }
-
-    /**
-     * @param array $menuThumbnailImages
-     */
-    public function setMenuThumbnailImages(array $menuThumbnailImages): void
-    {
-        $this->menuThumbnailImages = $menuThumbnailImages;
-    }
 }
diff --git a/src/Core/Domain/Category/Command/AddRootCategoryCommand.php b/src/Core/Domain/Category/Command/AddRootCategoryCommand.php
index 53c6279257a0b..fa9147247daf3 100644
--- a/src/Core/Domain/Category/Command/AddRootCategoryCommand.php
+++ b/src/Core/Domain/Category/Command/AddRootCategoryCommand.php
@@ -94,11 +94,6 @@ class AddRootCategoryCommand
      */
     private $thumbnailImage;
 
-    /**
-     * @var array
-     */
-    private $menuThumbnailImages;
-
     /**
      * @param string[] $name
      * @param string[] $linkRewrite
@@ -112,7 +107,6 @@ public function __construct(array $name, array $linkRewrite, $isActive)
             ->setLocalizedNames($name)
             ->setLocalizedLinkRewrites($linkRewrite)
             ->setIsActive($isActive);
-        $this->menuThumbnailImages = [];
     }
 
     /**
@@ -364,20 +358,4 @@ public function setThumbnailImage(?UploadedFile $thumbnailImage): void
     {
         $this->thumbnailImage = $thumbnailImage;
     }
-
-    /**
-     * @return array
-     */
-    public function getMenuThumbnailImages(): array
-    {
-        return $this->menuThumbnailImages;
-    }
-
-    /**
-     * @param array $menuThumbnailImages
-     */
-    public function setMenuThumbnailImages(array $menuThumbnailImages): void
-    {
-        $this->menuThumbnailImages = $menuThumbnailImages;
-    }
 }
diff --git a/src/Core/Domain/Category/Command/DeleteCategoryMenuThumbnailImageCommand.php b/src/Core/Domain/Category/Command/DeleteCategoryMenuThumbnailImageCommand.php
deleted file mode 100644
index 4e495e9f0acbf..0000000000000
--- a/src/Core/Domain/Category/Command/DeleteCategoryMenuThumbnailImageCommand.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-namespace PrestaShop\PrestaShop\Core\Domain\Category\Command;
-
-use PrestaShop\PrestaShop\Core\Domain\Category\ValueObject\CategoryId;
-use PrestaShop\PrestaShop\Core\Domain\Category\ValueObject\MenuThumbnailId;
-
-/**
- * Deletes given menu thumbnail for category.
- */
-class DeleteCategoryMenuThumbnailImageCommand
-{
-    /**
-     * @var CategoryId
-     */
-    private $categoryId;
-
-    /**
-     * @var MenuThumbnailId
-     */
-    private $menuThumbnailId;
-
-    /**
-     * @param int $categoryId
-     * @param int $menuThumbnailId
-     */
-    public function __construct($categoryId, $menuThumbnailId)
-    {
-        $this->categoryId = new CategoryId($categoryId);
-        $this->menuThumbnailId = new MenuThumbnailId($menuThumbnailId);
-    }
-
-    /**
-     * @return CategoryId
-     */
-    public function getCategoryId()
-    {
-        return $this->categoryId;
-    }
-
-    /**
-     * @return MenuThumbnailId
-     */
-    public function getMenuThumbnailId()
-    {
-        return $this->menuThumbnailId;
-    }
-}
diff --git a/src/Core/Domain/Category/Command/EditCategoryCommand.php b/src/Core/Domain/Category/Command/EditCategoryCommand.php
index 4409334e8ce14..ae701ae3a7571 100644
--- a/src/Core/Domain/Category/Command/EditCategoryCommand.php
+++ b/src/Core/Domain/Category/Command/EditCategoryCommand.php
@@ -105,18 +105,12 @@ class EditCategoryCommand
      */
     private $thumbnailImage;
 
-    /**
-     * @var array
-     */
-    private $menuThumbnailImages;
-
     /**
      * @param int $categoryId
      */
     public function __construct($categoryId)
     {
         $this->categoryId = new CategoryId($categoryId);
-        $this->menuThumbnailImages = [];
     }
 
     /**
@@ -406,20 +400,4 @@ public function setThumbnailImage(?UploadedFile $thumbnailImage): void
     {
         $this->thumbnailImage = $thumbnailImage;
     }
-
-    /**
-     * @return array
-     */
-    public function getMenuThumbnailImages(): array
-    {
-        return $this->menuThumbnailImages;
-    }
-
-    /**
-     * @param array $menuThumbnailImages
-     */
-    public function setMenuThumbnailImages(array $menuThumbnailImages): void
-    {
-        $this->menuThumbnailImages = $menuThumbnailImages;
-    }
 }
diff --git a/src/Core/Domain/Category/Command/EditRootCategoryCommand.php b/src/Core/Domain/Category/Command/EditRootCategoryCommand.php
index 55d31a36af79a..f76fea48b6d14 100644
--- a/src/Core/Domain/Category/Command/EditRootCategoryCommand.php
+++ b/src/Core/Domain/Category/Command/EditRootCategoryCommand.php
@@ -103,18 +103,12 @@ class EditRootCategoryCommand
      */
     private $thumbnailImage;
 
-    /**
-     * @var array
-     */
-    private $menuThumbnailImages;
-
     /**
      * @param int $categoryId
      */
     public function __construct($categoryId)
     {
         $this->categoryId = new CategoryId($categoryId);
-        $this->menuThumbnailImages = [];
     }
 
     /**
@@ -374,20 +368,4 @@ public function setThumbnailImage(?UploadedFile $thumbnailImage): void
     {
         $this->thumbnailImage = $thumbnailImage;
     }
-
-    /**
-     * @return array
-     */
-    public function getMenuThumbnailImages(): array
-    {
-        return $this->menuThumbnailImages;
-    }
-
-    /**
-     * @param array $menuThumbnailImages
-     */
-    public function setMenuThumbnailImages(array $menuThumbnailImages): void
-    {
-        $this->menuThumbnailImages = $menuThumbnailImages;
-    }
 }
diff --git a/src/Core/Domain/Category/CommandHandler/DeleteCategoryMenuThumbnailImageHandlerInterface.php b/src/Core/Domain/Category/CommandHandler/DeleteCategoryMenuThumbnailImageHandlerInterface.php
deleted file mode 100644
index 6883ef903ef17..0000000000000
--- a/src/Core/Domain/Category/CommandHandler/DeleteCategoryMenuThumbnailImageHandlerInterface.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-namespace PrestaShop\PrestaShop\Core\Domain\Category\CommandHandler;
-
-use PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryMenuThumbnailImageCommand;
-
-/**
- * Defines contract for service that handles category menu thumbnail deleting command.
- */
-interface DeleteCategoryMenuThumbnailImageHandlerInterface
-{
-    /**
-     * @param DeleteCategoryMenuThumbnailImageCommand $command
-     */
-    public function handle(DeleteCategoryMenuThumbnailImageCommand $command);
-}
diff --git a/src/Core/Domain/Category/Exception/CannotDeleteImageException.php b/src/Core/Domain/Category/Exception/CannotDeleteImageException.php
index 7ff0f5d936924..e3355a74b22fe 100644
--- a/src/Core/Domain/Category/Exception/CannotDeleteImageException.php
+++ b/src/Core/Domain/Category/Exception/CannotDeleteImageException.php
@@ -36,5 +36,4 @@ class CannotDeleteImageException extends CategoryException
      */
     public const COVER_IMAGE = 1;
     public const THUMBNAIL_IMAGE = 2;
-    public const MENU_THUMBNAIL_IMAGE = 3;
 }
diff --git a/src/Core/Domain/Category/Exception/CategoryConstraintException.php b/src/Core/Domain/Category/Exception/CategoryConstraintException.php
index 00b681845d700..626e0e2194a4b 100644
--- a/src/Core/Domain/Category/Exception/CategoryConstraintException.php
+++ b/src/Core/Domain/Category/Exception/CategoryConstraintException.php
@@ -56,11 +56,6 @@ class CategoryConstraintException extends CategoryException
      */
     public const INVALID_PARENT_ID = 6;
 
-    /**
-     * Code is used when too many menu thumbnails is being set for category.
-     */
-    public const TOO_MANY_MENU_THUMBNAILS = 8;
-
     /**
      * Code is used when invalid id is supplied.
      */
diff --git a/src/Core/Domain/Category/Exception/MenuThumbnailsLimitException.php b/src/Core/Domain/Category/Exception/MenuThumbnailsLimitException.php
deleted file mode 100644
index 746b18e3dc324..0000000000000
--- a/src/Core/Domain/Category/Exception/MenuThumbnailsLimitException.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-namespace PrestaShop\PrestaShop\Core\Domain\Category\Exception;
-
-/**
- * Class MenuThumbnailsLimitException is thrown when maximum number of thumbnail images is reached.
- */
-class MenuThumbnailsLimitException extends CategoryException
-{
-}
diff --git a/src/Core/Domain/Category/QueryResult/EditableCategory.php b/src/Core/Domain/Category/QueryResult/EditableCategory.php
index 3996976e2e1f4..dd4f4fac1eaf2 100644
--- a/src/Core/Domain/Category/QueryResult/EditableCategory.php
+++ b/src/Core/Domain/Category/QueryResult/EditableCategory.php
@@ -27,7 +27,6 @@
 namespace PrestaShop\PrestaShop\Core\Domain\Category\QueryResult;
 
 use PrestaShop\PrestaShop\Core\Domain\Category\ValueObject\CategoryId;
-use PrestaShop\PrestaShop\Core\Domain\Category\ValueObject\MenuThumbnailId;
 
 /**
  * Stores category data needed for editing.
@@ -99,11 +98,6 @@ class EditableCategory
      */
     private $coverImage;
 
-    /**
-     * @var array
-     */
-    private $menuThumbnailImages;
-
     /**
      * @var bool
      */
@@ -134,7 +128,6 @@ class EditableCategory
      * @param bool $isRootCategory
      * @param mixed $coverImage
      * @param mixed $thumbnailImage
-     * @param array $menuThumbnailImages
      * @param array $subCategories
      * @param string[] $additionalDescription
      */
@@ -153,7 +146,6 @@ public function __construct(
         $isRootCategory,
         $coverImage = null,
         $thumbnailImage = null,
-        array $menuThumbnailImages = [],
         array $subCategories = [],
         array $additionalDescription = []
     ) {
@@ -170,7 +162,6 @@ public function __construct(
         $this->shopAssociationIds = $shopAssociationIds;
         $this->thumbnailImage = $thumbnailImage;
         $this->coverImage = $coverImage;
-        $this->menuThumbnailImages = $menuThumbnailImages;
         $this->isRootCategory = $isRootCategory;
         $this->subCategories = $subCategories;
         $this->additionalDescription = $additionalDescription;
@@ -288,14 +279,6 @@ public function getThumbnailImage()
         return $this->thumbnailImage;
     }
 
-    /**
-     * @return array
-     */
-    public function getMenuThumbnailImages()
-    {
-        return $this->menuThumbnailImages;
-    }
-
     /**
      * @return bool
      */
@@ -304,14 +287,6 @@ public function isRootCategory()
         return $this->isRootCategory;
     }
 
-    /**
-     * @return bool
-     */
-    public function canContainMoreMenuThumbnails()
-    {
-        return count($this->getMenuThumbnailImages()) < count(MenuThumbnailId::ALLOWED_ID_VALUES);
-    }
-
     /**
      * @return array
      */
diff --git a/src/Core/Domain/Category/ValueObject/MenuThumbnailId.php b/src/Core/Domain/Category/ValueObject/MenuThumbnailId.php
deleted file mode 100644
index 1fc28c0d7f37d..0000000000000
--- a/src/Core/Domain/Category/ValueObject/MenuThumbnailId.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-namespace PrestaShop\PrestaShop\Core\Domain\Category\ValueObject;
-
-use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CategoryException;
-
-/**
- * Stores id for category's menu thumbnail image.
- */
-class MenuThumbnailId
-{
-    /**
-     * @var array category is of having maximum of 3 menu thumbnails with defined Ids
-     */
-    public const ALLOWED_ID_VALUES = [0, 1, 2];
-
-    /**
-     * @var int
-     */
-    private $menuThumbnailId;
-
-    /**
-     * @param int $menuThumbnailId
-     */
-    public function __construct($menuThumbnailId)
-    {
-        $this->assertMenuThumbnailIsWithinAllowedValueRange($menuThumbnailId);
-
-        $this->menuThumbnailId = $menuThumbnailId;
-    }
-
-    /**
-     * @return int
-     */
-    public function getValue()
-    {
-        return $this->menuThumbnailId;
-    }
-
-    /**
-     * @param int $menuThumbnailId
-     */
-    private function assertMenuThumbnailIsWithinAllowedValueRange($menuThumbnailId)
-    {
-        if (!is_int($menuThumbnailId) || !in_array($menuThumbnailId, self::ALLOWED_ID_VALUES)) {
-            throw new CategoryException(sprintf('Category menu  thumbnail id "%s" invalid. Available values are: %s', var_export($menuThumbnailId, true), implode(',', self::ALLOWED_ID_VALUES)));
-        }
-    }
-}
diff --git a/src/Core/Form/IdentifiableObject/DataHandler/CategoryFormDataHandler.php b/src/Core/Form/IdentifiableObject/DataHandler/CategoryFormDataHandler.php
index 96a75a09666f8..6afce1a02191d 100644
--- a/src/Core/Form/IdentifiableObject/DataHandler/CategoryFormDataHandler.php
+++ b/src/Core/Form/IdentifiableObject/DataHandler/CategoryFormDataHandler.php
@@ -102,10 +102,6 @@ private function createAddCategoryCommand(array $data): AddCategoryCommand
         $command->setAssociatedGroupIds($data['group_association']);
         $command->setCoverImage($data['cover_image']);
         $command->setThumbnailImage($data['thumbnail_image']);
-
-        if (isset($data['menu_thumbnail_images'])) {
-            $command->setMenuThumbnailImages($data['menu_thumbnail_images']);
-        }
         if (isset($data['shop_association'])) {
             $command->setAssociatedShopIds($data['shop_association']);
         }
@@ -139,10 +135,6 @@ private function createEditCategoryCommand(int $categoryId, array $data): EditCa
 
         $command->setCoverImage($data['cover_image']);
         $command->setThumbnailImage($data['thumbnail_image']);
-
-        if (isset($data['menu_thumbnail_images'])) {
-            $command->setMenuThumbnailImages($data['menu_thumbnail_images']);
-        }
         if (isset($data['shop_association'])) {
             $command->setAssociatedShopIds($data['shop_association']);
         }
diff --git a/src/Core/Form/IdentifiableObject/DataHandler/RootCategoryFormDataHandler.php b/src/Core/Form/IdentifiableObject/DataHandler/RootCategoryFormDataHandler.php
index d7ec500bb16e0..c8f1776aba7ec 100644
--- a/src/Core/Form/IdentifiableObject/DataHandler/RootCategoryFormDataHandler.php
+++ b/src/Core/Form/IdentifiableObject/DataHandler/RootCategoryFormDataHandler.php
@@ -101,10 +101,6 @@ public function createAddRootCategoryCommand(array $data): AddRootCategoryComman
         $command->setAssociatedGroupIds($data['group_association']);
         $command->setCoverImage($data['cover_image']);
         $command->setThumbnailImage($data['thumbnail_image']);
-
-        if (isset($data['menu_thumbnail_images'])) {
-            $command->setMenuThumbnailImages($data['menu_thumbnail_images']);
-        }
         if (isset($data['shop_association'])) {
             $command->setAssociatedShopIds($data['shop_association']);
         }
@@ -135,10 +131,6 @@ private function createEditRootCategoryCommand(int $rootCategoryId, array $data)
 
         $command->setCoverImage($data['cover_image']);
         $command->setThumbnailImage($data['thumbnail_image']);
-
-        if (isset($data['menu_thumbnail_images'])) {
-            $command->setMenuThumbnailImages($data['menu_thumbnail_images']);
-        }
         if (isset($data['shop_association'])) {
             $command->setAssociatedShopIds($data['shop_association']);
         }
diff --git a/src/Core/Form/IdentifiableObject/DataProvider/CategoryFormDataProvider.php b/src/Core/Form/IdentifiableObject/DataProvider/CategoryFormDataProvider.php
index 2272a44f1dff6..81464e016504c 100644
--- a/src/Core/Form/IdentifiableObject/DataProvider/CategoryFormDataProvider.php
+++ b/src/Core/Form/IdentifiableObject/DataProvider/CategoryFormDataProvider.php
@@ -124,22 +124,6 @@ public function getData($categoryId)
                     'size' => $thumbnailImage['size'],
                 ];
         }
-        $menuThumbnailImages = $editableCategory->getMenuThumbnailImages();
-        $menuThumbnailImagesEdited = [];
-        foreach ($menuThumbnailImages as $menuThumbnailImage) {
-            $menuThumbnailImagesEdited[] = [
-                'id' => $menuThumbnailImage['id'],
-                'image_path' => $menuThumbnailImage['path'],
-                'delete_path' => $this->router->generate(
-                    'admin_categories_delete_menu_thumbnail',
-                    [
-                        'categoryId' => $categoryId,
-                        'menuThumbnailId' => $menuThumbnailImage['id'],
-                    ]
-                ),
-            ];
-        }
-        $disableMenuThumbnailsUpload = !$editableCategory->canContainMoreMenuThumbnails();
 
         return [
             'name' => $editableCategory->getName(),
@@ -155,9 +139,7 @@ public function getData($categoryId)
             'shop_association' => $editableCategory->getShopAssociationIds(),
             'cover_image' => $coverImages,
             'thumbnail_image' => $thumbnailImages,
-            'menu_thumbnail_images' => $menuThumbnailImagesEdited,
             'seo_preview' => $categoryUrl,
-            'disabled_menu_thumbnail_upload' => $disableMenuThumbnailsUpload,
         ];
     }
 
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/CategoryController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/CategoryController.php
index 3d071753345e8..2abc11aaef244 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/CategoryController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/CategoryController.php
@@ -35,7 +35,6 @@
 use PrestaShop\PrestaShop\Core\Domain\Category\Command\BulkEnableCategoriesCommand;
 use PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryCommand;
 use PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryCoverImageCommand;
-use PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryMenuThumbnailImageCommand;
 use PrestaShop\PrestaShop\Core\Domain\Category\Command\SetCategoryIsEnabledCommand;
 use PrestaShop\PrestaShop\Core\Domain\Category\Command\UpdateCategoryPositionCommand;
 use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CannotAddCategoryException;
@@ -47,13 +46,11 @@
 use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CategoryConstraintException;
 use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CategoryException;
 use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CategoryNotFoundException;
-use PrestaShop\PrestaShop\Core\Domain\Category\Exception\MenuThumbnailsLimitException;
 use PrestaShop\PrestaShop\Core\Domain\Category\Query\GetCategoriesTree;
 use PrestaShop\PrestaShop\Core\Domain\Category\Query\GetCategoryForEditing;
 use PrestaShop\PrestaShop\Core\Domain\Category\Query\GetCategoryIsEnabled;
 use PrestaShop\PrestaShop\Core\Domain\Category\QueryResult\CategoryForTree;
 use PrestaShop\PrestaShop\Core\Domain\Category\QueryResult\EditableCategory;
-use PrestaShop\PrestaShop\Core\Domain\Category\ValueObject\MenuThumbnailId;
 use PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\Query\GetShowcaseCardIsClosed;
 use PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\ValueObject\ShowcaseCard;
 use PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CategoryGridDefinitionFactory;
@@ -209,7 +206,6 @@ public function createAction(Request $request)
             [
                 'help_link' => $this->generateSidebarLink($request->attributes->get('_legacy_controller')),
                 'enableSidebar' => true,
-                'allowMenuThumbnailsUpload' => true,
                 'categoryForm' => $categoryForm->createView(),
                 'defaultGroups' => $defaultGroups,
                 'layoutTitle' => $this->trans('New category', 'Admin.Navigation.Menu'),
@@ -260,7 +256,6 @@ public function createRootAction(Request $request)
             [
                 'help_link' => $this->generateSidebarLink($request->attributes->get('_legacy_controller')),
                 'enableSidebar' => true,
-                'allowMenuThumbnailsUpload' => true,
                 'rootCategoryForm' => $rootCategoryForm->createView(),
                 'defaultGroups' => $defaultGroups,
                 'layoutTitle' => $this->trans('New category', 'Admin.Navigation.Menu'),
@@ -341,7 +336,6 @@ public function editAction($categoryId, Request $request)
                 'categoryId' => $categoryId,
                 'help_link' => $this->generateSidebarLink($request->attributes->get('_legacy_controller')),
                 'enableSidebar' => true,
-                'allowMenuThumbnailsUpload' => $editableCategory->canContainMoreMenuThumbnails(),
                 'contextLangId' => $this->getContextLangId(),
                 'editCategoryForm' => $categoryForm->createView(),
                 'editableCategory' => $editableCategory,
@@ -420,7 +414,6 @@ public function editRootAction($categoryId, Request $request)
                 'help_link' => $this->generateSidebarLink($request->attributes->get('_legacy_controller')),
                 'enableSidebar' => true,
                 'categoryId' => $categoryId,
-                'maxMenuThumbnails' => count(MenuThumbnailId::ALLOWED_ID_VALUES),
                 'contextLangId' => $this->getContextLangId(),
                 'editRootCategoryForm' => $rootCategoryForm->createView(),
                 'editableCategory' => $editableCategory,
@@ -477,51 +470,6 @@ public function deleteCoverImageAction(Request $request, $categoryId)
         ]);
     }
 
-    /**
-     * Delete given menu thumbnail for category.
-     *
-     * @AdminSecurity(
-     *     "is_granted('update', request.get('_legacy_controller'))",
-     *     message="You do not have permission to edit this.",
-     *     redirectRoute="admin_categories_edit",
-     *     redirectQueryParamsToKeep={"categoryId"}
-     * )
-     *
-     * @param Request $request
-     * @param int $categoryId
-     * @param int $menuThumbnailId
-     *
-     * @return RedirectResponse
-     */
-    public function deleteMenuThumbnailAction(Request $request, $categoryId, $menuThumbnailId)
-    {
-        if (!$this->isCsrfTokenValid('delete-menu-thumbnail', $request->request->get('_csrf_token'))) {
-            return $this->redirectToRoute('admin_security_compromised', [
-                'uri' => $this->generateUrl('admin_categories_edit', [
-                    'categoryId' => $categoryId,
-                ], UrlGeneratorInterface::ABSOLUTE_URL),
-            ]);
-        }
-
-        try {
-            $this->getCommandBus()->handle(new DeleteCategoryMenuThumbnailImageCommand(
-                (int) $categoryId,
-                (int) $menuThumbnailId
-            ));
-
-            $this->addFlash(
-                'success',
-                $this->trans('Image successfully deleted.', 'Admin.Notifications.Success')
-            );
-        } catch (CategoryException $e) {
-            $this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages()));
-        }
-
-        return $this->redirectToRoute('admin_categories_edit', [
-            'categoryId' => $categoryId,
-        ]);
-    }
-
     /**
      * Toggle category status.
      *
@@ -922,11 +870,6 @@ private function getErrorMessages()
             CategoryNotFoundException::class => $this->trans('The object cannot be loaded (or found).', 'Admin.Notifications.Error'),
             CategoryConstraintException::class => [
                 CategoryConstraintException::EMPTY_BULK_DELETE_DATA => $this->trans('You must select at least one element to delete.', 'Admin.Notifications.Error'),
-                CategoryConstraintException::TOO_MANY_MENU_THUMBNAILS => sprintf(
-                    '%s %s',
-                    $this->trans('An error occurred while uploading the image:', 'Admin.Catalog.Notification'),
-                    $this->trans('You cannot upload more files', 'Admin.Notifications.Error')
-                ),
             ],
             CannotDeleteRootCategoryForShopException::class => $this->trans(
                 'You cannot remove this category because one of your shops uses it as a root category.',
@@ -948,11 +891,6 @@ private function getErrorMessages()
                 'An error occurred while updating the status for an object.',
                 'Admin.Notifications.Error'
             ),
-            MenuThumbnailsLimitException::class => sprintf(
-                '%s %s',
-                $this->trans('An error occurred while uploading the image:', 'Admin.Catalog.Notification'),
-                $this->trans('You cannot upload more files', 'Admin.Notifications.Error')
-            ),
             UploadedImageConstraintException::class => sprintf(
                 '%s %s',
                 $this->trans('An error occurred while uploading the image:', 'Admin.Catalog.Notification'),
diff --git a/src/PrestaShopBundle/Form/Admin/Catalog/Category/AbstractCategoryType.php b/src/PrestaShopBundle/Form/Admin/Catalog/Category/AbstractCategoryType.php
index 9258c1ca92969..ccc2694d2e9b8 100644
--- a/src/PrestaShopBundle/Form/Admin/Catalog/Category/AbstractCategoryType.php
+++ b/src/PrestaShopBundle/Form/Admin/Catalog/Category/AbstractCategoryType.php
@@ -32,9 +32,7 @@
 use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\TypedRegex;
 use PrestaShop\PrestaShop\Core\ConstraintValidator\TypedRegexValidator;
 use PrestaShop\PrestaShop\Core\Domain\Category\CategorySettings;
-use PrestaShop\PrestaShop\Core\Domain\Category\QueryResult\EditableCategory;
 use PrestaShop\PrestaShop\Core\Domain\Category\SeoSettings;
-use PrestaShop\PrestaShop\Core\Domain\Category\ValueObject\MenuThumbnailId;
 use PrestaShop\PrestaShop\Core\Feature\FeatureInterface;
 use PrestaShopBundle\Form\Admin\Type\CategorySeoPreviewType;
 use PrestaShopBundle\Form\Admin\Type\FormattedTextareaType;
@@ -47,7 +45,6 @@
 use PrestaShopBundle\Form\Admin\Type\TranslatorAwareType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Validator\Constraints\Length;
 use Symfony\Component\Validator\Constraints\NotBlank;
@@ -191,21 +188,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'can_be_deleted' => false,
                 'show_size' => true,
             ])
-            ->add('menu_thumbnail_images', ImageWithPreviewType::class, [
-                'label' => $this->trans('Menu thumbnails', 'Admin.Catalog.Feature'),
-                'help' => $this->trans('It will display a thumbnail representing the category in the menu, if the theme allows it.', 'Admin.Catalog.Help'),
-                'multiple' => true,
-                'required' => false,
-                'can_be_deleted' => true,
-                'warning_message' => $this->trans(
-                    'You have reached the limit (%limit%) of files to upload, please remove files to continue uploading',
-                    'Admin.Catalog.Notification',
-                    [
-                        '%limit%' => count(MenuThumbnailId::ALLOWED_ID_VALUES),
-                    ]
-                ),
-                'csrf_delete_token_id' => 'delete-menu-thumbnail',
-            ])
             ->add('seo_preview', CategorySeoPreviewType::class,
                 [
                     'label' => $this->trans('SEO preview', 'Admin.Global'),
@@ -352,16 +334,4 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ]);
         }
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function configureOptions(OptionsResolver $resolver)
-    {
-        $resolver
-            ->setDefaults([
-                'disable_menu_thumbnails_upload' => null,
-            ])
-            ->setAllowedTypes('disable_menu_thumbnails_upload', ['bool', 'null']);
-    }
 }
diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/categories.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/categories.yml
index a3ca66e3fb237..ce433f89b5cc2 100644
--- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/categories.yml
+++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/categories.yml
@@ -127,19 +127,6 @@ admin_categories_delete_cover_image:
   requirements:
     categoryId: \d+
 
-admin_categories_delete_menu_thumbnail:
-  path: /{categoryId}/menu-thumbnails/{menuThumbnailId}/delete
-  methods: [ POST ]
-  defaults:
-    _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\CategoryController::deleteMenuThumbnailAction
-    _legacy_controller: AdminCategories
-    _legacy_link: AdminCategories:forceDeleteThumb
-    _legacy_parameters:
-      id_category: categoryId
-  requirements:
-    categoryId: \d+
-    menuThumbnailId: 0|1|2
-
 admin_categories_update_position:
   path: /update-positions
   methods: [ POST ]
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/category.yml b/src/PrestaShopBundle/Resources/config/services/adapter/category.yml
index cac71ab8d489f..cdc99466414fb 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/category.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/category.yml
@@ -85,14 +85,6 @@ services:
       - '@filesystem'
       - '@prestashop.adapter.legacy.configuration'
 
-  prestashop.adapter.category.command_handler.delete_category_menu_thumbnail_image_handler:
-    class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\DeleteCategoryMenuThumbnailImageHandler
-    autoconfigure: true
-    arguments:
-      - '@filesystem'
-      - '@prestashop.adapter.legacy.configuration'
-      - '@prestashop.adapter.cache.clearer.smarty_cache_clearer'
-
   prestashop.adapter.category.command_handler.update_category_position_handler:
     class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\UpdateCategoryPositionHandler
     autoconfigure: true
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/image.yml b/src/PrestaShopBundle/Resources/config/services/adapter/image.yml
index bfc0d4ba9e163..155c257792d3d 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/image.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/image.yml
@@ -8,18 +8,11 @@ services:
   prestashop.adapter.image.uploader.category_thumbnail_image_uploader:
     class: 'PrestaShop\PrestaShop\Adapter\Image\Uploader\CategoryThumbnailImageUploader'
 
-  prestashop.adapter.image.uploader.category_menu_thumbnail_image_uploader:
-    class: 'PrestaShop\PrestaShop\Adapter\Image\Uploader\CategoryMenuThumbnailUploader'
-    arguments:
-      - '@prestashop.adapter.cache.clearer.smarty_cache_clearer'
-      - '@PrestaShop\PrestaShop\Core\Category\Provider\MenuThumbnailAvailableKeyProvider'
-
   PrestaShop\PrestaShop\Adapter\Image\Uploader\CategoryImageUploader:
     autowire: true
     arguments:
       - '@prestashop.adapter.image.uploader.category_cover_image_uploader'
       - '@prestashop.adapter.image.uploader.category_thumbnail_image_uploader'
-      - '@prestashop.adapter.image.uploader.category_menu_thumbnail_image_uploader'
 
   prestashop.adapter.image.uploader.employee_image_uploader:
     class: 'PrestaShop\PrestaShop\Adapter\Image\Uploader\EmployeeImageUploader'
diff --git a/src/PrestaShopBundle/Resources/config/services/core/category.yml b/src/PrestaShopBundle/Resources/config/services/core/category.yml
index 6a8a6327f4314..d150d5baab4f4 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/category.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/category.yml
@@ -7,9 +7,9 @@ services:
       - '@PrestaShop\PrestaShop\Adapter\Category\Repository\CategoryRepository'
       - ' > '
 
-  PrestaShop\PrestaShop\Core\Category\Provider\MenuThumbnailAvailableKeyProvider:
-    autowire: true
-    public: false
+  prestashop.core.category.name_builder.category_display_name_builder:
+    alias: PrestaShop\PrestaShop\Core\Category\NameBuilder\CategoryDisplayNameBuilder
+    deprecated: ~
 
   PrestaShop\PrestaShop\Core\Category\Provider\CategoryImageFinder:
     autowire: true
diff --git a/src/PrestaShopBundle/Resources/config/services/core/form/form_data_handler.yml b/src/PrestaShopBundle/Resources/config/services/core/form/form_data_handler.yml
index d6c1834fb60f7..9e7bc98bdfac8 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/form/form_data_handler.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/form/form_data_handler.yml
@@ -46,8 +46,6 @@ services:
       - '@prestashop.core.command_bus'
       - '@prestashop.adapter.image.uploader.category_cover_image_uploader'
       - '@prestashop.adapter.image.uploader.category_thumbnail_image_uploader'
-      - '@prestashop.adapter.image.uploader.category_menu_thumbnail_image_uploader'
-      - '@PrestaShop\PrestaShop\Core\Category\Provider\MenuThumbnailAvailableKeyProvider'
 
   prestashop.core.form.identifiable_object.data_handler.root_category_form_data_handler:
     class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataHandler\RootCategoryFormDataHandler'
@@ -55,8 +53,6 @@ services:
       - '@prestashop.core.command_bus'
       - '@prestashop.adapter.image.uploader.category_cover_image_uploader'
       - '@prestashop.adapter.image.uploader.category_thumbnail_image_uploader'
-      - '@prestashop.adapter.image.uploader.category_menu_thumbnail_image_uploader'
-      - '@PrestaShop\PrestaShop\Core\Category\Provider\MenuThumbnailAvailableKeyProvider'
 
   prestashop.core.form.identifiable_object.data_handler.contact_form_data_handler:
     class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataHandler\ContactFormDataHandler'
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Categories/edit_root.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Categories/edit_root.html.twig
index 02faef10d7cae..a13f9a72e3389 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Categories/edit_root.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Categories/edit_root.html.twig
@@ -29,7 +29,6 @@
     'categoryForm': editRootCategoryForm,
     'thumbnailImage': editableCategory.thumbnailImage,
     'coverImage': editableCategory.coverImage,
-    'menuThumbnailImages': editableCategory.menuThumbnailImages,
   } %}
 {% endblock %}
 
diff --git a/src/PrestaShopBundle/Resources/views/Admin/TwigTemplateForm/prestashop_ui_kit_base.html.twig b/src/PrestaShopBundle/Resources/views/Admin/TwigTemplateForm/prestashop_ui_kit_base.html.twig
index 4079e6ed60ff7..54336af293dd3 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/TwigTemplateForm/prestashop_ui_kit_base.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/TwigTemplateForm/prestashop_ui_kit_base.html.twig
@@ -1644,17 +1644,5 @@
       {% endfor %}
     </div>
   {% endif %}
-  {% if form.parent.vars.data.disabled_menu_thumbnail_upload is defined and form.parent.vars.data.disabled_menu_thumbnail_upload and warning_message is not null %}
-    <div class="d-none">
-      {{ block('file_widget') }}
-    </div>
-
-    <div class="alert alert-warning" role="alert">
-      <p class="alert-text">
-        {{ warning_message }}
-      </p>
-    </div>
-  {% else %}
-    {{ block('file_widget') }}
-  {% endif %}
+  {{ block('file_widget') }}
 {% endblock image_with_preview_widget %}
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/CategoryFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/CategoryFeatureContext.php
index 64b7c9d04dbff..82a672fcbacd2 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/CategoryFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/CategoryFeatureContext.php
@@ -37,7 +37,6 @@
 use PrestaShop\PrestaShop\Core\Domain\Category\Command\BulkUpdateCategoriesStatusCommand;
 use PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryCommand;
 use PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryCoverImageCommand;
-use PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryMenuThumbnailImageCommand;
 use PrestaShop\PrestaShop\Core\Domain\Category\Command\EditCategoryCommand;
 use PrestaShop\PrestaShop\Core\Domain\Category\Command\EditRootCategoryCommand;
 use PrestaShop\PrestaShop\Core\Domain\Category\Command\SetCategoryIsEnabledCommand;
@@ -60,7 +59,6 @@
 class CategoryFeatureContext extends AbstractDomainFeatureContext
 {
     public const JPG_IMAGE_TYPE = '.jpg';
-    private const MENU_THUMB_SUFFIX = '0_thumb';
 
     private const CATEGORY_POSITION_WAYS_MAP = [
         'up' => 0,
@@ -488,46 +486,6 @@ public function assertCategoryHasThumbnailImage(string $categoryReference)
         Assert::assertNotNull($editableCategory->getThumbnailImage());
     }
 
-    /**
-     * @Given category :categoryReference has menu thumbnail image
-     *
-     * @param string $categoryReference
-     */
-    public function categoryHasMenuThumbnailImage(string $categoryReference)
-    {
-        $editableCategory = $this->getEditableCategory($categoryReference);
-        $menuThumbnailImages = $editableCategory->getMenuThumbnailImages();
-        Assert::assertCount(1, $menuThumbnailImages);
-    }
-
-    /**
-     * @When I delete category :categoryReference menu thumbnail image
-     *
-     * @param string $categoryReference
-     */
-    public function deleteCategoryMenuThumbnailImage(string $categoryReference)
-    {
-        $categoryId = SharedStorage::getStorage()->get($categoryReference);
-        $editableCategory = $this->getEditableCategory($categoryReference);
-
-        $menuThumbnailImages = $editableCategory->getMenuThumbnailImages();
-        $menuThumbnailImageId = $menuThumbnailImages[0]['id'];
-
-        $this->getCommandBus()->handle(new DeleteCategoryMenuThumbnailImageCommand($categoryId, $menuThumbnailImageId));
-    }
-
-    /**
-     * @Then category :categoryReference does not have menu thumbnail image
-     *
-     * @param string $categoryReference
-     */
-    public function categoryDoesNotHaveMenuThumbnailImage(string $categoryReference)
-    {
-        $editableCategory = $this->getEditableCategory($categoryReference);
-        $menuThumbnailImages = $editableCategory->getMenuThumbnailImages();
-        Assert::assertCount(0, $menuThumbnailImages);
-    }
-
     /**
      * @Given /^category "(.*)" is (enabled|disabled)$/
      *
@@ -799,22 +757,6 @@ public function uploadThumbnailImage(string $imageReference, string $fileName, s
         );
     }
 
-    /**
-     * @When I upload menu thumbnail image ":imageReference" named ":fileName" to category ":categoryReference"
-     *
-     * @return string
-     */
-    public function uploadMenuThumbnailImage(string $imageReference, string $fileName, string $categoryReference): string
-    {
-        $categoryId = $this->getSharedStorage()->get($categoryReference);
-
-        return $this->uploadImage(
-            $imageReference,
-            $fileName,
-            $this->psCatImgDir . $categoryId . '-' . self::MENU_THUMB_SUFFIX . self::JPG_IMAGE_TYPE
-        );
-    }
-
     /**
      * @todo: this doesn't actually test the upload,
      *        it only mimics it, so we can later assert EditableCategory and test image deletion.
diff --git a/tests/Integration/Behaviour/Features/Scenario/Category/category_management.feature b/tests/Integration/Behaviour/Features/Scenario/Category/category_management.feature
index 47c49cb2f831e..8204cfc57be78 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Category/category_management.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Category/category_management.feature
@@ -687,19 +687,6 @@ Feature: Category Management
     When I upload thumbnail image "thumb1" named "app_icon.png" to category "category19"
     Then category "category19" should have a thumbnail image
 
-  Scenario: Assert and delete category menu thumbnail images
-    Given I add new category "category20" with following details:
-      | name[en-US]         | not important |
-      | name[fr-FR]         | not important |
-      | active              | true          |
-      | parent category     | home          |
-      | link rewrite[en-US] | not-important |
-      | link rewrite[en-US] | not-important |
-    Then category "category20" does not have menu thumbnail image
-    When I upload menu thumbnail image "menu_thumb1" named "app_icon.png" to category "category20"
-    When I delete category "category20" menu thumbnail image
-    Then category "category20" does not have menu thumbnail image
-
   # enabled seems to be the same as displayed
   Scenario: Update category status
     Given I add new category "category21" with following details:
diff --git a/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/11_imageGenerationOnCreation.ts b/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/11_imageGenerationOnCreation.ts
index 9465c1b78490d..940bc5de05bd4 100644
--- a/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/11_imageGenerationOnCreation.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/11_imageGenerationOnCreation.ts
@@ -47,7 +47,6 @@ describe('BO - Design - Image Settings - Image Generation on creation', async ()
   const categoryData: CategoryData = new CategoryData({
     coverImage: 'cover.jpg',
     thumbnailImage: 'thumb.jpg',
-    metaImage: 'thumb.jpg',
   });
 
   // Pre-condition: Enable Multiple image formats
@@ -63,7 +62,6 @@ describe('BO - Design - Image Settings - Image Generation on creation', async ()
       productData.thumbImage,
       categoryData.coverImage,
       categoryData.thumbnailImage,
-      categoryData.metaImage,
     ].map(async (image: string|null) => {
       if (image) {
         await files.generateImage(image);
@@ -79,7 +77,6 @@ describe('BO - Design - Image Settings - Image Generation on creation', async ()
       productData.thumbImage,
       categoryData.coverImage,
       categoryData.thumbnailImage,
-      categoryData.metaImage,
     ].map(async (image: string|null) => {
       if (image) {
         await files.deleteFile(image);
@@ -321,10 +318,6 @@ describe('BO - Design - Image Settings - Image Generation on creation', async ()
         );
         await expect(fileWebpExists, `File ${idCategory}-${imageTypeName}.webp doesn't exist!`).to.be.true;
       }));
-
-      // Menu Thumbnail
-      const menuThumbnailsExists = await files.doesFileExist(`${files.getRootPath()}/img/c/${idCategory}-0-thumb.jpg`);
-      await expect(menuThumbnailsExists, `File ${idCategory}-0-thumb.jpg doesn't exist!`).to.be.true;
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/14_checkCategoryImageFormat.ts b/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/14_checkCategoryImageFormat.ts
index b9e0d8e957cb8..73dd0dbc23c34 100644
--- a/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/14_checkCategoryImageFormat.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/14_checkCategoryImageFormat.ts
@@ -34,17 +34,14 @@ describe('BO - Design - Image Settings - Check category image format', async ()
   const categoryDataJPG: CategoryData = new CategoryData({
     coverImage: 'coverJPG.jpg',
     thumbnailImage: 'thumbJPG.jpg',
-    metaImage: 'metaJPG.jpg',
   });
   const categoryDataPNG: CategoryData = new CategoryData({
     coverImage: 'coverPNG.png',
     thumbnailImage: 'thumbPNG.png',
-    metaImage: 'metaPNG.png',
   });
   const categoryDataWEBP: CategoryData = new CategoryData({
     coverImage: 'coverWEBP.webp',
     thumbnailImage: 'thumbWEBP.webp',
-    metaImage: 'metaWEBP.webp',
   });
 
   // Pre-condition: Enable Multiple image formats
@@ -58,13 +55,10 @@ describe('BO - Design - Image Settings - Check category image format', async ()
     await Promise.all([
       categoryDataJPG.coverImage,
       categoryDataJPG.thumbnailImage,
-      categoryDataJPG.metaImage,
       categoryDataPNG.coverImage,
       categoryDataPNG.thumbnailImage,
-      categoryDataPNG.metaImage,
       categoryDataWEBP.coverImage,
       categoryDataWEBP.thumbnailImage,
-      categoryDataWEBP.metaImage,
     ].map(async (image: string|null) => {
       if (image) {
         await files.generateImage(image);
@@ -78,13 +72,10 @@ describe('BO - Design - Image Settings - Check category image format', async ()
     await Promise.all([
       categoryDataJPG.coverImage,
       categoryDataJPG.thumbnailImage,
-      categoryDataJPG.metaImage,
       categoryDataPNG.coverImage,
       categoryDataPNG.thumbnailImage,
-      categoryDataPNG.metaImage,
       categoryDataWEBP.coverImage,
       categoryDataWEBP.thumbnailImage,
-      categoryDataWEBP.metaImage,
     ].map(async (image: string|null) => {
       if (image) {
         await files.deleteFile(image);
@@ -256,27 +247,6 @@ describe('BO - Design - Image Settings - Check category image format', async ()
           await expect(imageTypeWEBP).to.be.eq('webp');
           */
 
-          // Check the thumbnail image file
-          const pathImageThumbJPG: string = `${files.getRootPath()}/img/c/${idCategory}-0_thumb.jpg`;
-
-          const fileExistsThumbJPG = await files.doesFileExist(pathImageThumbJPG);
-          await expect(fileExistsThumbJPG, `The file ${pathImageThumbJPG} doesn't exist!`).to.be.true;
-
-          const imageTypeThumbJPG = await files.getImageType(pathImageThumbJPG);
-          await expect(imageTypeThumbJPG).to.be.eq(arg.extOriginal);
-
-          // @todo : https://github.com/PrestaShop/PrestaShop/issues/32404
-          /*
-          // Check the WebP file
-          const pathImageWEBP: string = `${files.getRootPath()}/img/c/${idCategory}-large_default.webp`;
-
-          const fileExistsWEBP = await files.doesFileExist(pathImageWEBP);
-          await expect(fileExistsWEBP, `The file ${pathImageWEBP} doesn't exist!`).to.be.true;
-
-          const imageTypeWEBP = await files.getImageType(pathImageWEBP);
-          await expect(imageTypeWEBP).to.be.eq('webp');
-          */
-
           // Check the Menu image file
           const pathImageMetaJPG: string = `${files.getRootPath()}/img/c/${idCategory}-small_default.jpg`;
 
diff --git a/tests/UI/data/faker/category.ts b/tests/UI/data/faker/category.ts
index 08fac35e80674..02b7a998d8588 100644
--- a/tests/UI/data/faker/category.ts
+++ b/tests/UI/data/faker/category.ts
@@ -29,8 +29,6 @@ export default class CategoryData {
 
   public readonly thumbnailImage: string|null;
 
-  public readonly metaImage: string|null;
-
   /**
    * Constructor for class CategoryData
    * @param categoryToCreate {CategoryCreator} Could be used to force the value of some members
@@ -66,8 +64,5 @@ export default class CategoryData {
 
     /** @type {string|null} Category thumbnail of the category */
     this.thumbnailImage = categoryToCreate.thumbnailImage || null;
-
-    /** @type {string|null} Menu thumbnail of the category */
-    this.metaImage = categoryToCreate.metaImage || null;
   }
 }
diff --git a/tests/UI/data/types/category.d.ts b/tests/UI/data/types/category.d.ts
index 1d5dc1a3be80c..57d2ebdd40a28 100644
--- a/tests/UI/data/types/category.d.ts
+++ b/tests/UI/data/types/category.d.ts
@@ -11,7 +11,6 @@ type CategoryCreator = {
   groupAccess?: GroupData
   coverImage?: string
   thumbnailImage?: string
-  metaImage?: string
 };
 
 type CategoryFilter = {
diff --git a/tests/UI/pages/BO/catalog/categories/add.ts b/tests/UI/pages/BO/catalog/categories/add.ts
index 2341b7473e253..7bbed678a4f6b 100644
--- a/tests/UI/pages/BO/catalog/categories/add.ts
+++ b/tests/UI/pages/BO/catalog/categories/add.ts
@@ -19,8 +19,6 @@ class AddCategory extends BOBasePage {
 
   private readonly categoryThumbnailImage: string;
 
-  private readonly categoryMenuThumbnailImages: string;
-
   private readonly metaTitleInput: string;
 
   private readonly metaDescriptionTextarea: string;
@@ -53,7 +51,6 @@ class AddCategory extends BOBasePage {
     this.descriptionIframe = '#category_description_1_ifr';
     this.categoryCoverImage = '#category_cover_image';
     this.categoryThumbnailImage = '#category_thumbnail_image';
-    this.categoryMenuThumbnailImages = '#category_menu_thumbnail_images';
     this.metaTitleInput = '#category_meta_title_1';
     this.metaDescriptionTextarea = '#category_meta_description_1';
     this.selectAllGroupAccessCheckbox = '.js-choice-table-select-all';
@@ -103,9 +100,6 @@ class AddCategory extends BOBasePage {
     if (categoryData.thumbnailImage) {
       await this.uploadFile(page, this.categoryThumbnailImage, categoryData.thumbnailImage);
     }
-    if (categoryData.metaImage) {
-      await this.uploadFile(page, this.categoryMenuThumbnailImages, categoryData.metaImage);
-    }
     await this.setValue(page, this.metaTitleInput, categoryData.metaTitle);
     await this.setValue(page, this.metaDescriptionTextarea, categoryData.metaDescription);
     await this.selectAllGroups(page);
diff --git a/tests/Unit/Core/Category/Provider/CategoryImageFinderTest.php b/tests/Unit/Core/Category/Provider/CategoryImageFinderTest.php
deleted file mode 100644
index ae54747d25099..0000000000000
--- a/tests/Unit/Core/Category/Provider/CategoryImageFinderTest.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-declare(strict_types=1);
-
-namespace Tests\Unit\Core\Category\Provider;
-
-use PHPUnit\Framework\TestCase;
-use PrestaShop\PrestaShop\Core\Category\Provider\CategoryImageFinder;
-use Symfony\Component\Finder\Finder;
-
-class CategoryImageFinderTest extends TestCase
-{
-    /**
-     * @return void
-     */
-    public function testFindMenuThumbnails(): void
-    {
-        $categoryImageFinder = new CategoryImageFinder(dirname(__DIR__, 4) . '/Unit/Resources/category_menu_thumbnails/');
-        $thumbnails = $categoryImageFinder->findMenuThumbnails(1);
-        $this->findFileName('1-0_thumb.jpg', $thumbnails, true);
-        $this->findFileName('1-1_thumb.jpg', $thumbnails, true);
-        $this->findFileName('3-1_thumb.jpg', $thumbnails, false);
-        $this->findFileName('1-1_thum.jpg', $thumbnails, false);
-    }
-
-    /**
-     * Checks finder results for specific file name
-     *
-     * @param string $name
-     * @param Finder $thumbnails
-     * @param bool $shouldExist
-     *
-     * @return void
-     */
-    private function findFileName(string $name, Finder $thumbnails, bool $shouldExist): void
-    {
-        $hasValue = false;
-        foreach ($thumbnails as $thumbnail) {
-            if ($thumbnail->getFilename() === $name) {
-                $hasValue = true;
-            }
-        }
-
-        self::assertEquals($hasValue, $shouldExist);
-    }
-}
diff --git a/tests/Unit/Core/Category/Provider/MenuThumbnailAvailableKeyProviderTest.php b/tests/Unit/Core/Category/Provider/MenuThumbnailAvailableKeyProviderTest.php
deleted file mode 100644
index 710f268285873..0000000000000
--- a/tests/Unit/Core/Category/Provider/MenuThumbnailAvailableKeyProviderTest.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-declare(strict_types=1);
-
-namespace Tests\Unit\Core\Category\Provider;
-
-use PHPUnit\Framework\TestCase;
-use PrestaShop\PrestaShop\Core\Category\Provider\CategoryImageFinder;
-use PrestaShop\PrestaShop\Core\Category\Provider\MenuThumbnailAvailableKeyProvider;
-use SplFileInfo;
-use Symfony\Component\Finder\Finder;
-
-class MenuThumbnailAvailableKeyProviderTest extends TestCase
-{
-    /**
-     * @return void
-     */
-    public function testGetAvailableKeys(): void
-    {
-        $categoryId = 1;
-        $categoryImageFinder = $this->getMockBuilder(CategoryImageFinder::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $file1 = new SplFileInfo(sprintf('%d-0_thumb.jpg', $categoryId));
-        $file2 = new SplFileInfo(sprintf('%d-1_thumb.jpg', $categoryId));
-
-        $mockFinder = $this->getMockBuilder(Finder::class)
-            ->getMock();
-        $mockFinder->method('getIterator')->willReturn(
-            new \ArrayIterator([
-                $file1,
-                $file2,
-            ])
-        );
-
-        $categoryImageFinder->method('findMenuThumbnails')
-            ->willReturn(
-                $mockFinder
-            );
-
-        $menuThumbnailAvailableKeyProvider = new MenuThumbnailAvailableKeyProvider($categoryImageFinder);
-
-        $result = $menuThumbnailAvailableKeyProvider->getAvailableKeys($categoryId);
-
-        self::assertEquals(
-            [
-                2 => 2,
-            ],
-            $result
-        );
-    }
-}

From 1b8066d7e10bd106efa98941d8aea95749c72e2c Mon Sep 17 00:00:00 2001
From: Jonathan Lelievre <jonathan.lelievre@prestashop.com>
Date: Thu, 1 Jun 2023 19:41:02 +0200
Subject: [PATCH 0755/1030] Update TranslationToolsBundle to version 6

---
 composer.json |  2 +-
 composer.lock | 25 ++++++++++++-------------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/composer.json b/composer.json
index 19529a3b6b050..00db00cd4003b 100644
--- a/composer.json
+++ b/composer.json
@@ -125,7 +125,7 @@
         "prestashop/statssales": "^2",
         "prestashop/statssearch": "^2",
         "prestashop/statsstock": "^2",
-        "prestashop/translationtools-bundle": "^5.0",
+        "prestashop/translationtools-bundle": "^6",
         "sensio/framework-extra-bundle": "^5.1",
         "smarty/smarty": "^4.3.1",
         "soundasleep/html2text": "^2.1.0",
diff --git a/composer.lock b/composer.lock
index a39f34c9328a0..a26a0a418462a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b88c467dd6901d0a85beedf63bc3aae2",
+    "content-hash": "60fdd414e98620e1f4a41b8cf8ff8198",
     "packages": [
         {
             "name": "api-platform/core",
@@ -7667,33 +7667,32 @@
         },
         {
             "name": "prestashop/translationtools-bundle",
-            "version": "v5.0.4",
+            "version": "v6.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PrestaShop/TranslationToolsBundle.git",
-                "reference": "4aaef89ee0b4913157a76559bed52f4f35b2fb70"
+                "reference": "74d39adb54490e54ef9bd2d1dc98a9fad15dba85"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PrestaShop/TranslationToolsBundle/zipball/4aaef89ee0b4913157a76559bed52f4f35b2fb70",
-                "reference": "4aaef89ee0b4913157a76559bed52f4f35b2fb70",
+                "url": "https://api.github.com/repos/PrestaShop/TranslationToolsBundle/zipball/74d39adb54490e54ef9bd2d1dc98a9fad15dba85",
+                "reference": "74d39adb54490e54ef9bd2d1dc98a9fad15dba85",
                 "shasum": ""
             },
             "require": {
                 "nikic/php-parser": "^4",
-                "php": ">=7.2",
+                "php": ">=8.1",
                 "smarty/smarty": "^3.1 || ^4.0",
                 "symfony/twig-bridge": "^3.4 || ^4.4 || ^5.0",
                 "twig/twig": "^1.38 || ^2.7 || ^3.0"
             },
             "require-dev": {
-                "doctrine/common": "^2.10.0",
+                "doctrine/common": "^3",
                 "friendsofphp/php-cs-fixer": "^3.2",
-                "phpunit/phpunit": "^7.5 || ^8.5",
+                "phpunit/phpunit": "~9.5.10",
                 "symfony/framework-bundle": "^3.4 || ^4.4 || ^5.0",
-                "symfony/symfony": "^4",
-                "symfony/translation": "^3.4 || ^4.4 || ^5.0",
-                "symfony/twig-bundle": "^4"
+                "symfony/symfony": "^5.4",
+                "symfony/translation": "^3.4 || ^4.4 || ^5.0"
             },
             "type": "bundle",
             "autoload": {
@@ -7723,9 +7722,9 @@
             ],
             "support": {
                 "issues": "https://github.com/PrestaShop/TranslationToolsBundle/issues",
-                "source": "https://github.com/PrestaShop/TranslationToolsBundle/tree/v5.0.4"
+                "source": "https://github.com/PrestaShop/TranslationToolsBundle/tree/v6.0.0"
             },
-            "time": "2022-09-01T08:33:26+00:00"
+            "time": "2023-05-30T08:46:24+00:00"
         },
         {
             "name": "psr/cache",

From 755b9da6c4812547ee7abd1d11e409240bcd2f42 Mon Sep 17 00:00:00 2001
From: Jonathan Lelievre <jonathan.lelievre@prestashop.com>
Date: Wed, 9 Aug 2023 19:00:07 +0200
Subject: [PATCH 0756/1030] Force string casting to avoid autocasting to int
 for wording only composed of numeric characters

---
 src/Core/Translation/Storage/Extractor/ThemeExtractor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Core/Translation/Storage/Extractor/ThemeExtractor.php b/src/Core/Translation/Storage/Extractor/ThemeExtractor.php
index 2b37b9bcf4b52..5ca6ae39492bd 100644
--- a/src/Core/Translation/Storage/Extractor/ThemeExtractor.php
+++ b/src/Core/Translation/Storage/Extractor/ThemeExtractor.php
@@ -94,7 +94,7 @@ private function normalize(MessageCatalogue $catalogue): MessageCatalogue
         foreach ($catalogue->getMetadata('', '') as $domain => $metadata) {
             $newDomain = $this->normalizeDomain($domain);
             foreach ($metadata as $key => $value) {
-                $newCatalogue->setMetadata($key, $value, $newDomain);
+                $newCatalogue->setMetadata((string) $key, $value, $newDomain);
             }
         }
 

From 29fd5ccfd01e12c5407dda73e8c5312da7e32466 Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Wed, 9 Aug 2023 19:09:49 +0200
Subject: [PATCH 0757/1030] Improve tests

---
 app/config/config.yml                         |  1 +
 .../ApiPlatform/Resources/FoundProduct.php    | 57 ++++---------------
 tests/Integration/ApiPlatform/ApiTestCase.php | 43 ++++++++++++++
 .../ApiPlatform/GetHookStatusTest.php         | 15 ++---
 tests/Integration/ApiPlatform/GetHookTest.php |  5 +-
 .../StateProvider/QueryProviderTest.php       | 52 ++++++++++++++++-
 6 files changed, 114 insertions(+), 59 deletions(-)
 create mode 100644 tests/Integration/ApiPlatform/ApiTestCase.php

diff --git a/app/config/config.yml b/app/config/config.yml
index 083edda805e1d..2f54ef8360001 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -100,6 +100,7 @@ api_platform:
   formats:
     json:
       mime_types: [ 'application/json' ]
+    # Allow this format for other API endpoint than native endpoint (by default we will use json)
     jsonld:
       mime_types: [ 'application/ld+json' ]
   mapping:
diff --git a/src/PrestaShopBundle/ApiPlatform/Resources/FoundProduct.php b/src/PrestaShopBundle/ApiPlatform/Resources/FoundProduct.php
index be035575a96fc..a04c925ac971b 100644
--- a/src/PrestaShopBundle/ApiPlatform/Resources/FoundProduct.php
+++ b/src/PrestaShopBundle/ApiPlatform/Resources/FoundProduct.php
@@ -32,8 +32,6 @@
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\GetCollection;
 use PrestaShop\PrestaShop\Core\Domain\Product\Query\SearchProducts;
-use PrestaShop\PrestaShop\Core\Domain\Product\QueryResult\ProductCombination;
-use PrestaShop\PrestaShop\Core\Domain\Product\QueryResult\ProductCustomizationField;
 use PrestaShopBundle\ApiPlatform\Provider\QueryProvider;
 
 #[ApiResource(
@@ -85,59 +83,26 @@
 )]
 class FoundProduct
 {
-    /**
-     * @var int
-     */
     #[ApiProperty(identifier: true)]
-    public $productId;
+    public int $productId;
 
-    /**
-     * @var bool
-     */
-    public $availableOutOfStock;
+    public bool $availableOutOfStock;
 
-    /**
-     * @var string
-     */
-    public $name;
+    public string $name;
 
-    /**
-     * @var float
-     */
-    public $taxRate;
+    public float $taxRate;
 
-    /**
-     * @var string
-     */
-    public $formattedPrice;
+    public string $formattedPrice;
 
-    /**
-     * @var float
-     */
-    public $priceTaxIncl;
+    public float $priceTaxIncl;
 
-    /**
-     * @var float
-     */
-    public $priceTaxExcl;
+    public float $priceTaxExcl;
 
-    /**
-     * @var int
-     */
-    public $stock;
+    public int $stock;
 
-    /**
-     * @var string
-     */
-    public $location;
+    public string $location;
 
-    /**
-     * @var ProductCombination[]
-     */
-    public $combinations;
+    public array $combinations;
 
-    /**
-     * @var ProductCustomizationField[]
-     */
-    public $customizationFields;
+    public array $customizationFields;
 }
diff --git a/tests/Integration/ApiPlatform/ApiTestCase.php b/tests/Integration/ApiPlatform/ApiTestCase.php
new file mode 100644
index 0000000000000..ea0345b9bf066
--- /dev/null
+++ b/tests/Integration/ApiPlatform/ApiTestCase.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace Tests\Integration\ApiPlatform;
+
+use ApiPlatform\Symfony\Bundle\Test\Client;
+
+abstract class ApiTestCase extends \ApiPlatform\Symfony\Bundle\Test\ApiTestCase
+{
+    protected static function createClient(array $kernelOptions = [], array $defaultOptions = []): Client
+    {
+        if (!isset($defaultOptions['headers']['accept'])) {
+            $defaultOptions['headers']['accept'] = ['application/json'];
+        }
+
+        return parent::createClient($kernelOptions, $defaultOptions);
+    }
+}
diff --git a/tests/Integration/ApiPlatform/GetHookStatusTest.php b/tests/Integration/ApiPlatform/GetHookStatusTest.php
index 35281b1e36bba..8b66f5710df0f 100644
--- a/tests/Integration/ApiPlatform/GetHookStatusTest.php
+++ b/tests/Integration/ApiPlatform/GetHookStatusTest.php
@@ -28,7 +28,6 @@
 
 namespace Tests\Integration\ApiPlatform;
 
-use ApiPlatform\Symfony\Bundle\Test\ApiTestCase;
 use Tests\Resources\DatabaseDump;
 
 class GetHookStatusTest extends ApiTestCase
@@ -52,18 +51,18 @@ public function testGetHookStatus(): void
         $activeHook->add();
 
         $bearerToken = $this->getBearerToken();
-        $response = static::createClient()->request('GET', '/new-api/hook-status/' . (int) $inactiveHook->id, ['auth_bearer' => $bearerToken, 'headers' => ['accept' => ['application/json']]]);
+        $response = static::createClient()->request('GET', '/new-api/hook-status/' . (int) $inactiveHook->id, ['auth_bearer' => $bearerToken]);
         self::assertEquals(json_decode($response->getContent())->active, $inactiveHook->active);
         self::assertResponseStatusCodeSame(200);
 
-        $response = static::createClient()->request('GET', '/new-api/hook-status/' . (int) $activeHook->id, ['auth_bearer' => $bearerToken, 'headers' => ['accept' => ['application/json']]]);
+        $response = static::createClient()->request('GET', '/new-api/hook-status/' . (int) $activeHook->id, ['auth_bearer' => $bearerToken]);
         self::assertEquals(json_decode($response->getContent())->active, $activeHook->active);
         self::assertResponseStatusCodeSame(200);
 
-        static::createClient()->request('GET', '/new-api/hook-status/' . 9999, ['auth_bearer' => $bearerToken, 'headers' => ['accept' => ['application/json']]]);
+        static::createClient()->request('GET', '/new-api/hook-status/' . 9999, ['auth_bearer' => $bearerToken]);
         self::assertResponseStatusCodeSame(404);
 
-        static::createClient()->request('GET', '/new-api/hook-status/' . $activeHook->id, ['headers' => ['accept' => ['application/json']]]);
+        static::createClient()->request('GET', '/new-api/hook-status/' . $activeHook->id);
         self::assertResponseStatusCodeSame(401);
 
         $inactiveHook->delete();
@@ -80,12 +79,11 @@ public function testDisableHook(): void
         $bearerToken = $this->getBearerToken();
         static::createClient()->request('PUT', '/new-api/hook-status', [
             'auth_bearer' => $bearerToken,
-            'headers' => ['accept' => ['application/json']],
             'json' => ['id' => (int) $hook->id, 'active' => false],
         ]);
         self::assertResponseStatusCodeSame(200);
 
-        $response = static::createClient()->request('GET', '/new-api/hook-status/' . (int) $hook->id, ['auth_bearer' => $bearerToken, 'headers' => ['accept' => ['application/json']]]);
+        $response = static::createClient()->request('GET', '/new-api/hook-status/' . (int) $hook->id, ['auth_bearer' => $bearerToken]);
         self::assertEquals(json_decode($response->getContent())->active, false);
         self::assertResponseStatusCodeSame(200);
     }
@@ -100,12 +98,11 @@ public function testEnableHook(): void
         $bearerToken = $this->getBearerToken();
         static::createClient()->request('PUT', '/new-api/hook-status', [
             'auth_bearer' => $bearerToken,
-            'headers' => ['accept' => ['application/json']],
             'json' => ['id' => (int) $hook->id, 'active' => true],
         ]);
         self::assertResponseStatusCodeSame(200);
 
-        $response = static::createClient()->request('GET', '/new-api/hook-status/' . (int) $hook->id, ['auth_bearer' => $bearerToken, 'headers' => ['accept' => ['application/json']]]);
+        $response = static::createClient()->request('GET', '/new-api/hook-status/' . (int) $hook->id, ['auth_bearer' => $bearerToken]);
         self::assertEquals(json_decode($response->getContent())->active, true);
         self::assertResponseStatusCodeSame(200);
     }
diff --git a/tests/Integration/ApiPlatform/GetHookTest.php b/tests/Integration/ApiPlatform/GetHookTest.php
index 664c07023e9f4..ebe8e4652d826 100644
--- a/tests/Integration/ApiPlatform/GetHookTest.php
+++ b/tests/Integration/ApiPlatform/GetHookTest.php
@@ -29,7 +29,6 @@
 
 namespace Tests\Integration\ApiPlatform;
 
-use ApiPlatform\Symfony\Bundle\Test\ApiTestCase;
 use Tests\Resources\DatabaseDump;
 
 class GetHookTest extends ApiTestCase
@@ -49,11 +48,11 @@ public function testGetHook(): void
 
         $bearerToken = $this->getBearerToken();
 
-        $response = static::createClient()->request('GET', '/new-api/hooks/' . (int) $hook->id, ['auth_bearer' => $bearerToken, 'headers' => ['accept' => ['application/json']]]);
+        $response = static::createClient()->request('GET', '/new-api/hooks/' . (int) $hook->id, ['auth_bearer' => $bearerToken]);
         self::assertEquals(json_decode($response->getContent())->active, $hook->active);
         self::assertResponseStatusCodeSame(200);
 
-        static::createClient()->request('GET', '/new-api/hooks/' . 9999, ['auth_bearer' => $bearerToken, 'headers' => ['accept' => ['application/json']]]);
+        static::createClient()->request('GET', '/new-api/hooks/' . 9999, ['auth_bearer' => $bearerToken]);
         self::assertResponseStatusCodeSame(404);
 
         static::createClient()->request('GET', '/new-api/hooks/' . $hook->id);
diff --git a/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php b/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
index 64cdf11f2277e..ca8d04ecabd14 100644
--- a/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
+++ b/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
@@ -33,7 +33,9 @@
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
+use PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHook;
 use PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHookStatus;
+use PrestaShop\PrestaShop\Core\Domain\Hook\QueryResult\Hook as HookQuery;
 use PrestaShop\PrestaShop\Core\Domain\Hook\QueryResult\HookStatus;
 use PrestaShop\PrestaShop\Core\Domain\Product\Query\SearchProducts;
 use PrestaShop\PrestaShop\Core\Domain\Product\QueryResult\FoundProduct;
@@ -73,6 +75,8 @@ public function setUp(): void
                         return $this->createHookStatusResultBasedOnQuery($query);
                     case SearchProducts::class:
                         return $this->createsSearchProductResultBasedOnQuery($query);
+                    case GetHook::class:
+                        return $this->createResultBasedOnHookQuery($query);
                 }
 
                 throw new RuntimeException(sprintf('Query type %s was not expected in query bus mock', get_class($query)));
@@ -84,7 +88,7 @@ public function testProvideHookStatus(): void
         $hookStatusProvider = new QueryProvider($this->queryBus, [new StringToIntConverter()], $this->serializer);
         $get = new Get();
         $get = $get
-            ->withExtraProperties(['query' => "PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHookStatus"])
+            ->withExtraProperties(['query' => GetHookStatus::class])
             ->withClass(Hook::class);
         /** @var Hook $hookStatus */
         $hookStatus = $hookStatusProvider->provide($get, ['id' => 1]);
@@ -94,6 +98,27 @@ public function testProvideHookStatus(): void
         self::assertTrue($hookStatus->active);
     }
 
+    public function testProvideHook(): void
+    {
+        $hookStatusProvider = new QueryProvider($this->queryBus, [new StringToIntConverter()], $this->serializer);
+        $get = new Get();
+        $get = $get
+            ->withExtraProperties(['query' => GetHook::class])
+            ->withClass(Hook::class);
+        /** @var Hook $hook */
+        $hook = $hookStatusProvider->provide($get, ['id' => 1]);
+        self::assertEquals(false, $hook->active);
+        self::assertEquals('testName1', $hook->name);
+        self::assertEquals('testTitle1', $hook->title);
+        self::assertEquals('testDescription1', $hook->description);
+        /** @var Hook $hook */
+        $hook = $hookStatusProvider->provide($get, ['id' => 2]);
+        self::assertTrue($hook->active);
+        self::assertEquals('testName2', $hook->name);
+        self::assertEquals('testTitle2', $hook->title);
+        self::assertEquals('testDescription2', $hook->description);
+    }
+
     public function testSearchProduct(): void
     {
         $searchProductProvider = new QueryProvider($this->queryBus, [new StringToIntConverter()], $this->serializer);
@@ -158,4 +183,29 @@ private function createsSearchProductResultBasedOnQuery(SearchProducts $query):
 
         throw new RuntimeException(sprintf('SearchProduct "%s" was not expected in query bus mock', $query->getPhrase()));
     }
+
+    private function createResultBasedOnHookQuery(GetHook $query): HookQuery
+    {
+        if ($query->getId()->getValue() === 1) {
+            return new HookQuery(
+                $query->getId()->getValue(),
+                false,
+                'testName1',
+                'testTitle1',
+                'testDescription1'
+            );
+        }
+
+        if ($query->getId()->getValue() === 2) {
+            return new HookQuery(
+                $query->getId()->getValue(),
+                true,
+                'testName2',
+                'testTitle2',
+                'testDescription2'
+            );
+        }
+
+        throw new RuntimeException(sprintf('Hook "%s" was not expected in query bus mock', $query->getId()->getValue()));
+    }
 }

From 73b7ff5c3b8f848bd63f7be0a4fa3ebf77589573 Mon Sep 17 00:00:00 2001
From: lartist <salim-benouamer.ext@prestashop.com>
Date: Thu, 10 Aug 2023 15:37:41 +0200
Subject: [PATCH 0758/1030] Fix navbar twig component

---
 .../Resources/config/services/adapter/nav_bar.yml         | 8 --------
 .../Resources/config/services/bundle/twig.yml             | 2 ++
 .../views/Admin/Component/Layout/nav_bar.html.twig        | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)
 delete mode 100644 src/PrestaShopBundle/Resources/config/services/adapter/nav_bar.yml

diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/nav_bar.yml b/src/PrestaShopBundle/Resources/config/services/adapter/nav_bar.yml
deleted file mode 100644
index 8fad92038643b..0000000000000
--- a/src/PrestaShopBundle/Resources/config/services/adapter/nav_bar.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-services:
-  _defaults:
-    public: false
-    autowire: true
-    bind:
-      $psVersion: !php/const _PS_VERSION_
-
-  PrestaShopBundle\Twig\Component\NavBar: ~
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/twig.yml b/src/PrestaShopBundle/Resources/config/services/bundle/twig.yml
index 404f983ba0595..9046098519e83 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/twig.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/twig.yml
@@ -3,6 +3,8 @@ services:
     public: false
     autowire: true
     autoconfigure: true
+    bind:
+      $psVersion: !php/const _PS_VERSION_
 
   Twig\Extension\StringLoaderExtension: ~
 
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/nav_bar.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/nav_bar.html.twig
index 929e463dc3d2c..e2285029b9645 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/nav_bar.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/nav_bar.html.twig
@@ -23,7 +23,7 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  *#}
 <nav class="nav-bar d-none d-print-none d-md-block">
-  <span class="menu-collapse" data-toggle-url="{{ path('AdminEmployees', ['action' => 'toggleMenu']) }}">
+  <span class="menu-collapse" data-toggle-url="{{ path('AdminEmployees', {'action' : 'toggleMenu'}) }}">
     <i class="material-icons rtl-flip">chevron_left</i>
     <i class="material-icons rtl-flip">chevron_left</i>
   </span>

From ae4c09987cec89071bbd8a909a20274dea7425d3 Mon Sep 17 00:00:00 2001
From: boherm <boris.hermans@prestashop.com>
Date: Tue, 8 Aug 2023 10:01:00 +0200
Subject: [PATCH 0759/1030] Improve reset friendly url behavior

---
 .../edit/manager/product-seo-manager.ts       | 30 ++++++++++++++++++-
 .../Product/FormTheme/product_seo.html.twig   |  2 +-
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/admin-dev/themes/new-theme/js/pages/product/edit/manager/product-seo-manager.ts b/admin-dev/themes/new-theme/js/pages/product/edit/manager/product-seo-manager.ts
index 76fa1aea372fc..d8343a68ff650 100644
--- a/admin-dev/themes/new-theme/js/pages/product/edit/manager/product-seo-manager.ts
+++ b/admin-dev/themes/new-theme/js/pages/product/edit/manager/product-seo-manager.ts
@@ -92,6 +92,32 @@ export default class ProductSEOManager {
 
     const resetLinkRewriteBtn = document.querySelector<HTMLButtonElement>(ProductMap.seo.resetLinkRewriteBtn)!;
     resetLinkRewriteBtn.addEventListener('click', () => this.resetLinkRewrite());
+
+    // Disable or enable reset button depending on the name input value at init, on language change and on keyup inputs
+    this.linkRewriteStateRefresh();
+    this.eventEmitter.on('languageSelected', () => this.linkRewriteStateRefresh());
+
+    const linkRewriteInputs = document.querySelectorAll(`${ProductMap.productLocalizedLinkRewriteInput}`);
+
+    if (linkRewriteInputs) {
+      for (let i = 0; i < linkRewriteInputs.length; i += 1) {
+        linkRewriteInputs[i].addEventListener('keyup', () => this.linkRewriteStateRefresh());
+      }
+    }
+  }
+
+  private linkRewriteStateRefresh(): void {
+    const resetLinkRewriteBtn = document.querySelector<HTMLButtonElement>(ProductMap.seo.resetLinkRewriteBtn)!;
+    // eslint-disable-next-line max-len
+    const nameInput = document.querySelector<HTMLInputElement>(`${this.translatableInput.localeInputSelector}:not(.d-none) ${ProductMap.productLocalizedNameInput}`);
+    // eslint-disable-next-line max-len
+    const linkRewriteInput = document.querySelector<HTMLInputElement>(`${this.translatableInput.localeInputSelector}:not(.d-none) ${ProductMap.productLocalizedLinkRewriteInput}`);
+
+    if (!nameInput || !linkRewriteInput || !resetLinkRewriteBtn) {
+      return;
+    }
+
+    resetLinkRewriteBtn.disabled = linkRewriteInput.value === window.str2url(nameInput.value);
   }
 
   private resetLinkRewrite(): void {
@@ -99,8 +125,9 @@ export default class ProductSEOManager {
     const nameInput = document.querySelector<HTMLInputElement>(`${this.translatableInput.localeInputSelector}:not(.d-none) ${ProductMap.productLocalizedNameInput}`);
     // eslint-disable-next-line max-len
     const linkRewriteInput = document.querySelector<HTMLInputElement>(`${this.translatableInput.localeInputSelector}:not(.d-none) ${ProductMap.productLocalizedLinkRewriteInput}`);
+    const resetLinkRewriteBtn = document.querySelector<HTMLButtonElement>(ProductMap.seo.resetLinkRewriteBtn)!;
 
-    if (!nameInput || !linkRewriteInput) {
+    if (!nameInput || !linkRewriteInput || !resetLinkRewriteBtn) {
       console.error('Couldn\'t find product name or link rewrite input');
       return;
     }
@@ -113,5 +140,6 @@ export default class ProductSEOManager {
 
     linkRewriteInput.value = window.str2url(nameValue);
     linkRewriteInput.dispatchEvent(new Event('change', {bubbles: true}));
+    resetLinkRewriteBtn.disabled = true;
   }
 }
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Product/FormTheme/product_seo.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Product/FormTheme/product_seo.html.twig
index a5e3c4bbfa617..cb3c5dec852ef 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Product/FormTheme/product_seo.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Product/FormTheme/product_seo.html.twig
@@ -28,5 +28,5 @@
 
 {% block _product_seo_link_rewrite_widget %}
   {{ form_widget(form) }}
-  <button type="button" class="reset-link-rewrite btn btn-outline-secondary">{{ 'Reset URL'|trans({}, 'Admin.Catalog.Feature') }}</button>
+  <button type="button" class="reset-link-rewrite btn btn-outline-secondary mt-1">{{ 'Reset URL'|trans({}, 'Admin.Catalog.Feature') }}</button>
 {% endblock %}

From d8c99b34a5ee7ae3abf19958e22ed9923f00de9f Mon Sep 17 00:00:00 2001
From: boherm <boris.hermans@prestashop.com>
Date: Tue, 8 Aug 2023 10:01:57 +0200
Subject: [PATCH 0760/1030] Improve display of cost price input in product
 supplier references

---
 .../supplier/product-suppliers-collection.ts      | 15 +++++++++++++++
 .../product/supplier/product-suppliers-map.ts     |  1 +
 .../Sell/Product/Options/ProductSupplierType.php  |  8 +++++---
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/admin-dev/themes/new-theme/js/pages/product/supplier/product-suppliers-collection.ts b/admin-dev/themes/new-theme/js/pages/product/supplier/product-suppliers-collection.ts
index 7e7b0ca448483..3e17c5d97a4d3 100644
--- a/admin-dev/themes/new-theme/js/pages/product/supplier/product-suppliers-collection.ts
+++ b/admin-dev/themes/new-theme/js/pages/product/supplier/product-suppliers-collection.ts
@@ -121,6 +121,14 @@ export default class ProductSuppliersCollection {
     this.$productsTable.on('change', ':input', () => {
       this.memorizeCurrentSuppliers();
     });
+    this.$productsTable.on('change', 'select[name$="[currency_id]"]', (e) => {
+      const symbol = $(e.target).find(':selected')?.attr('symbol');
+      $(e.target)
+        .parents(this.map.productsSupplierRowSelector)
+        .find('.money-type .input-group-prepend .input-group-text')
+        // @ts-ignore
+        .html(symbol);
+    });
   }
 
   private addSupplier(supplier: Supplier): void {
@@ -226,6 +234,13 @@ export default class ProductSuppliersCollection {
       $(rowMap.referenceInput(supplier.supplierId)).val(supplier.reference);
       $(rowMap.priceInput(supplier.supplierId)).val(supplier.price);
       $(rowMap.currencyIdInput(supplier.supplierId)).val(supplier.currencyId);
+
+      // Update currency symbol
+      const symbol = $(rowMap.currencyIdInput(supplier.supplierId)).find(':selected')?.attr('symbol');
+
+      if (symbol) {
+        $(rowMap.currencySymbol(supplier.supplierId)).html(symbol);
+      }
     });
   }
 
diff --git a/admin-dev/themes/new-theme/js/pages/product/supplier/product-suppliers-map.ts b/admin-dev/themes/new-theme/js/pages/product/supplier/product-suppliers-map.ts
index a95b0866096cc..ee1dd02771048 100644
--- a/admin-dev/themes/new-theme/js/pages/product/supplier/product-suppliers-map.ts
+++ b/admin-dev/themes/new-theme/js/pages/product/supplier/product-suppliers-map.ts
@@ -42,6 +42,7 @@ export default (productSuppliersId: string): Record<string, any> => {
       priceInput: (supplierIndex: string): string => productSupplierInputId(supplierIndex, 'price_tax_excluded'),
       currencyIdInput: (supplierIndex: string): string => productSupplierInputId(supplierIndex, 'currency_id'),
       supplierNamePreview: (supplierIndex: string): string => `#product_supplier_row_${supplierIndex} .supplier_name .preview`,
+      currencySymbol: (supplierIndex: string): string => `#product_supplier_row_${supplierIndex} .money-type .input-group-text`,
     },
   };
 };
diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Product/Options/ProductSupplierType.php b/src/PrestaShopBundle/Form/Admin/Sell/Product/Options/ProductSupplierType.php
index cc9fbcc14ec4c..8f1a2226fffcf 100644
--- a/src/PrestaShopBundle/Form/Admin/Sell/Product/Options/ProductSupplierType.php
+++ b/src/PrestaShopBundle/Form/Admin/Sell/Product/Options/ProductSupplierType.php
@@ -33,6 +33,7 @@
 use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\TypedRegex;
 use PrestaShop\PrestaShop\Core\Domain\Currency\ValueObject\CurrencyId;
 use PrestaShop\PrestaShop\Core\Domain\Product\ValueObject\Reference;
+use PrestaShop\PrestaShop\Core\Form\FormChoiceAttributeProviderInterface;
 use PrestaShop\PrestaShop\Core\Form\FormChoiceProviderInterface;
 use PrestaShopBundle\Form\Admin\Type\TranslatorAwareType;
 use PrestaShopBundle\Form\FormCloner;
@@ -52,7 +53,7 @@
 class ProductSupplierType extends TranslatorAwareType
 {
     /**
-     * @var FormChoiceProviderInterface
+     * @var FormChoiceProviderInterface&FormChoiceAttributeProviderInterface
      */
     private $currencyByIdChoiceProvider;
 
@@ -74,13 +75,13 @@ class ProductSupplierType extends TranslatorAwareType
     /**
      * @param TranslatorInterface $translator
      * @param array $locales
-     * @param FormChoiceProviderInterface $currencyByIdChoiceProvider
+     * @param FormChoiceProviderInterface&FormChoiceAttributeProviderInterface $currencyByIdChoiceProvider
      * @param string $defaultCurrencyIsoCode
      */
     public function __construct(
         TranslatorInterface $translator,
         array $locales,
-        FormChoiceProviderInterface $currencyByIdChoiceProvider,
+        $currencyByIdChoiceProvider,
         string $defaultCurrencyIsoCode,
         CurrencyRepository $currencyRepository,
         FormCloner $formCloner
@@ -135,6 +136,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 // placeholder false is important to avoid empty option in select input despite required being false
                 'placeholder' => false,
                 'choices' => $this->currencyByIdChoiceProvider->getChoices(),
+                'choice_attr' => $this->currencyByIdChoiceProvider->getChoicesAttributes(),
             ])
         ;
 

From 9776c1102a5502a52fa43cd884bb8638bdd557ad Mon Sep 17 00:00:00 2001
From: boherm <boris.hermans@prestashop.com>
Date: Tue, 8 Aug 2023 10:02:23 +0200
Subject: [PATCH 0761/1030] Disable tax rules input when taxes are disabled

---
 .../Form/Admin/Sell/Product/Pricing/RetailPriceType.php          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Product/Pricing/RetailPriceType.php b/src/PrestaShopBundle/Form/Admin/Sell/Product/Pricing/RetailPriceType.php
index b103297a8f5e8..b7f4f4f0c065b 100644
--- a/src/PrestaShopBundle/Form/Admin/Sell/Product/Pricing/RetailPriceType.php
+++ b/src/PrestaShopBundle/Form/Admin/Sell/Product/Pricing/RetailPriceType.php
@@ -166,6 +166,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ])
             ->add('tax_rules_group_id', ChoiceType::class, [
                 'choices' => $this->taxRuleGroupChoicesProvider->getChoices(),
+                'disabled' => !$this->isTaxEnabled,
                 'required' => false,
                 // placeholder false is important to avoid empty option in select input despite required being false
                 'placeholder' => false,

From b50bd1059a01cc220e0a3f7d90fd4b6245c683f1 Mon Sep 17 00:00:00 2001
From: boherm <boris.hermans@prestashop.com>
Date: Tue, 8 Aug 2023 10:03:24 +0200
Subject: [PATCH 0762/1030] Improve modal style to display it on center

---
 admin-dev/themes/new-theme/scss/components/_modal.scss      | 6 ++++++
 .../Sell/Catalog/Product/FormTheme/categories.html.twig     | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/admin-dev/themes/new-theme/scss/components/_modal.scss b/admin-dev/themes/new-theme/scss/components/_modal.scss
index fe883bad04c3d..42cf8e489a014 100644
--- a/admin-dev/themes/new-theme/scss/components/_modal.scss
+++ b/admin-dev/themes/new-theme/scss/components/_modal.scss
@@ -26,6 +26,12 @@
 // stylelint-disable-next-line
 $component-name: modal;
 
+.#{$component-name}.show {
+  .#{$component-name}-dialog {
+    margin: 10px auto;
+  }
+}
+
 .#{$component-name}-iframe {
   .#{$component-name}-dialog {
     width: 90%;
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Product/FormTheme/categories.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Product/FormTheme/categories.html.twig
index 2ca48e3d168d3..370e83e4eae68 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Product/FormTheme/categories.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Product/FormTheme/categories.html.twig
@@ -64,7 +64,7 @@
         <div class="spinner m-auto d-block"></div>
       </div>
 
-      <div class="category-tree-footer">
+      <div class="category-tree-footer text-center text-md-left">
         {{ form_widget(form.cancel_btn) }}
         {{ form_widget(form.apply_btn) }}
       </div>

From 5b523d46ae11b366490782166a5a8cc01287b109 Mon Sep 17 00:00:00 2001
From: boherm <boris.hermans@prestashop.com>
Date: Tue, 8 Aug 2023 10:04:05 +0200
Subject: [PATCH 0763/1030] Fix display for add or subtract item input in
 product stock mobile version

---
 .../new-theme/scss/components/_delta_quantity.scss  | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/admin-dev/themes/new-theme/scss/components/_delta_quantity.scss b/admin-dev/themes/new-theme/scss/components/_delta_quantity.scss
index 5bb5e4fc0c1ca..efbfad36812e6 100644
--- a/admin-dev/themes/new-theme/scss/components/_delta_quantity.scss
+++ b/admin-dev/themes/new-theme/scss/components/_delta_quantity.scss
@@ -6,9 +6,13 @@ $component-name: delta-quantity;
   flex-direction: row;
 
   &-quantity {
-    min-width: 120px;
+    min-width: 40px;
     font-weight: $font-weight-semibold;
 
+    @media screen and (min-width: 768px) {
+      min-width: 120px;
+    }
+
     .quantity-update {
       color: $brand-primary;
       visibility: hidden;
@@ -38,7 +42,12 @@ $component-name: delta-quantity;
   }
 
   label {
-    min-width: 240px;
+    min-width: 150px;
+
+    @media screen and (min-width: 768px) {
+      min-width: 240px;
+    }
+
     margin: 0 0.3125rem;
     overflow: hidden;
     line-height: 39px;

From b79ea7a82cd89ce068c146fd5eff61cff1add4d7 Mon Sep 17 00:00:00 2001
From: lartist <salim-benouamer.ext@prestashop.com>
Date: Tue, 8 Aug 2023 10:46:47 +0200
Subject: [PATCH 0764/1030] Replacing MultistoreHeaderController by a twig
 component and using it in ToolBar twig component as embeded component instead

---
 .../themes/new-theme/template/layout.tpl      |   2 +-
 .../admin/AdminLegacyLayoutController.php     |   1 +
 phpstan-tmp-legacy-layout-baseline.neon       |  10 ++
 src/Adapter/LegacyContext.php                 |   2 +-
 .../config/services/adapter/services.yml      |   7 +-
 .../Layout/multistore_header.html.twig        | 132 ++++++++++++++
 .../Admin/Component/Layout/tool_bar.html.twig |   2 +-
 .../views/Admin/Layout/tool_bar.html.twig     |   2 +-
 .../Twig/Component/MultistoreHeader.php       | 167 ++++++++++++++++++
 .../Twig/Component/ToolBar.php                |   2 +-
 10 files changed, 321 insertions(+), 6 deletions(-)
 create mode 100644 src/PrestaShopBundle/Resources/views/Admin/Component/Layout/multistore_header.html.twig
 create mode 100644 src/PrestaShopBundle/Twig/Component/MultistoreHeader.php

diff --git a/admin-dev/themes/new-theme/template/layout.tpl b/admin-dev/themes/new-theme/template/layout.tpl
index 231c7fc0f9d57..cad7fb8af0543 100644
--- a/admin-dev/themes/new-theme/template/layout.tpl
+++ b/admin-dev/themes/new-theme/template/layout.tpl
@@ -172,7 +172,7 @@
     {render_template
       smarty_template=$page_header_toolbar_template
       twig_template="@PrestaShop/Admin/Layout/tool_bar.html.twig"
-      multistore_header=$multistore_header
+      locked_to_all_shop_context=$locked_to_all_shop_context
       breadcrumbs2=$breadcrumbs2
       title=$title
       toolbar_btn=$toolbar_btn
diff --git a/controllers/admin/AdminLegacyLayoutController.php b/controllers/admin/AdminLegacyLayoutController.php
index 487ca1aeee6ac..bdb2cb8b0312d 100644
--- a/controllers/admin/AdminLegacyLayoutController.php
+++ b/controllers/admin/AdminLegacyLayoutController.php
@@ -204,6 +204,7 @@ public function initContent()
             'use_regular_h1_structure' => $this->useRegularH1Structure,
             // legacy context selector is hidden on migrated pages when multistore feature is used
             'hideLegacyStoreContextSelector' => $this->isMultistoreEnabled(),
+            'locked_to_all_shop_context' => $this->lockedToAllShopContext,
         ];
 
         if ($this->helpLink === false || !empty($this->helpLink)) {
diff --git a/phpstan-tmp-legacy-layout-baseline.neon b/phpstan-tmp-legacy-layout-baseline.neon
index 363e275311177..0e5cafe2ba483 100644
--- a/phpstan-tmp-legacy-layout-baseline.neon
+++ b/phpstan-tmp-legacy-layout-baseline.neon
@@ -45,6 +45,16 @@ parameters:
 			count: 1
 			path: src/PrestaShopBundle/Twig/Component/MobileQuickAccess.php
 
+		-
+			message: "#^Class Link is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+			count: 2
+			path: src/PrestaShopBundle/Twig/Component/MultistoreHeader.php
+
+		-
+			message: "#^Namespace Link is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+			count: 1
+			path: src/PrestaShopBundle/Twig/Component/MultistoreHeader.php
+
 		-
 			message: "#^Class Link is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
 			count: 1
diff --git a/src/Adapter/LegacyContext.php b/src/Adapter/LegacyContext.php
index 73a9dfd6662e2..84b771bd0742f 100644
--- a/src/Adapter/LegacyContext.php
+++ b/src/Adapter/LegacyContext.php
@@ -122,7 +122,7 @@ public function getCountryId(): int
      *
      * @param string $controller the controller name
      * @param bool $withToken
-     * @param array<string> $extraParams
+     * @param array $extraParams
      *
      * @return string
      */
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/services.yml b/src/PrestaShopBundle/Resources/config/services/adapter/services.yml
index 192c09bbf9304..f69fb0c4ed789 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/services.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/services.yml
@@ -75,8 +75,13 @@ services:
     class: PrestaShop\PrestaShop\Adapter\Product\PriceFormatter
 
   # Other adapters
+  PrestaShop\PrestaShop\Adapter\Shop\Context:
+    public: false
+
   prestashop.adapter.shop.context:
-    class: PrestaShop\PrestaShop\Adapter\Shop\Context
+    alias: PrestaShop\PrestaShop\Adapter\Shop\Context
+    public: true
+    deprecated: ~
 
   PrestaShop\PrestaShop\Core\Multistore\MultistoreContextCheckerInterface: '@prestashop.adapter.shop.context'
   PrestaShop\PrestaShop\Core\Shop\ShopContextInterface: '@prestashop.adapter.shop.context'
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/multistore_header.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/multistore_header.html.twig
new file mode 100644
index 0000000000000..57e3ce4d14763
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/multistore_header.html.twig
@@ -0,0 +1,132 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+{% block multistore_header %}
+  {% if this.isMultistoreUsed and app.request is not null %}
+    <div
+      id="header-multishop"
+      class="header-multishop{% if this.isAllShopContext %} header-multishop-allshops{% elseif this.currentContextColor is empty %} header-multishop-default{% endif %}{% if this.isTitleDark is same as (true) %} header-multishop-dark{% else %} header-multishop-bright{% endif %}"
+      {% if this.isShopContext %}data-shop-id="{{ this.currentContextId }}"{% elseif this.isGroupContext %}data-group-id="{{ this.currentContextId }}"{% else %}data-all-shops="1"{% endif %}
+      {% if this.colorConfigLink %}data-header-color-notification="{{ "Customize your multistore header, [1]pick a color[/1] for this store context."|trans({'[1]': '<a href="' ~ this.colorConfigLink ~ '">', '[/1]': '</a>'}, 'Admin.Navigation.Header') }}"{% endif %}
+      data-checkbox-notification="{{ "To apply specific settings to a store or a group of stores, select the parameter to modify, make your changes and save."|trans({}, 'Admin.Navigation.Header') ~ ' '}}"
+    >
+      <div class="header-multishop-top-bar"{% if this.currentContextColor is not empty %} style="background-color: {{this.currentContextColor}};"{% endif %}>
+        <div class="header-multishop-center js-header-multishop-open-modal">
+
+          {#
+          This setting avoid to duplicate @PrestaShop/Admin/Multistore/shop_icon.html.twig and
+          @PrestaShop/Admin/Multistore/multi_shops_icon.html.twig and then replace isTitleDark by this.isTitleDark
+          Todo: remove this line when the two templates above are not used anymore except in twig component and replace
+          isTitleDark by this.isTitleDark in these templates
+          #}
+          {% set isTitleDark = this.isTitleDark %}
+
+          {% if this.isShopContext %}
+            {% include '@PrestaShop/Admin/Multistore/shop_icon.html.twig' %}
+          {% else %}
+            {% include '@PrestaShop/Admin/Multistore/multi_shops_icon.html.twig' %}
+          {% endif %}
+
+          <h2 class="header-multishop-title">
+            {% if this.isGroupContext %}{{ "Group"|trans({}, 'Admin.Global') ~ ' '}} {% endif %}{{ this.currentContextName }}
+          </h2>
+
+          <button class="header-multishop-button">
+            <i class="material-icons">expand_more</i>
+          </button>
+        </div>
+      </div>
+
+      {% if this.isShopContext %}
+        <div class="header-multishop-right">
+          {% block multishop_header_right %}
+            <a class="header-multishop-view-action" href="{{ this.link.getBaseLink(this.currentContextId) }}" target="_blank" rel="nofollow">{{ "View my store"|trans({}, 'Admin.Navigation.Header') }} <i class="material-icons">visibility</i></a>
+          {% endblock %}
+        </div>
+      {% endif %}
+
+      <div id="multishop-modal" class="multishop-modal multishop-modal-hidden js-multishop-modal" tabindex="-1" role="dialog" aria-labelledby="multishop-modal" aria-hidden="true">
+        <div class="multishop-modal-dialog js-multishop-modal-dialog" role="document">
+          <div class="multishop-modal-body">
+            {% block search_shops %}
+              {% if lockedToAllShopContext == false %}
+                <div class="multishop-modal-search-container">
+                  <i class="material-icons">search</i>
+                  <input type="text" class="form-control multishop-modal-search js-multishop-modal-search" placeholder="{{ 'Search store name'|trans({}, 'Admin.Navigation.Header') }}" data-no-results="{{ "No results found for"|trans({}, 'Admin.Global') }}" data-searching="{{ "Searching for"|trans({}, 'Admin.Global') }}">
+                </div>
+              {% endif %}
+            {% endblock %}
+
+            <ul class="multishop-modal-group-list js-multishop-scrollbar">
+              {% block all_shops_item %}
+                <li class="multishop-modal-all multishop-modal-item">
+                  {% if this.isAllShopContext %}
+                    <i class="material-icons">check</i>
+                  {% else %}
+                    <span class="multishop-modal-color" style="background-color:#25b9d7;"></span>
+                  {% endif %}
+                  <a class="multishop-modal-all-name" href="{{ multistore_url() }}">
+                    <span>{{ "All stores"|trans({}, 'Admin.Global') }}</span>
+                  </a>
+                </li>
+              {% endblock %}
+              {% for group in this.groupList %}
+                <li class="multishop-modal-group-item multishop-modal-item{% if loop.first %} first-group-item{% endif %}">
+                  {% block shop_group_item %}
+                    <span class="multishop-modal-color-container{% if this.isGroupContext and this.currentContextId == group.id %} multishop-modal-color-check{% endif %}">
+                    <i class="material-icons">check</i>
+                    <a class="multishop-modal-color"{% if group.color is not empty %} style="background-color: {{group.color}};"{% endif %} href="{{ getAdminLink('AdminShopGroup', true, {'id_shop_group' : group.id, 'updateshop_group' : true}) }}" data-toggle="popover" data-trigger="hover" data-placement="top" data-content="{{ "Edit color"|trans({}, 'Admin.Global') }}" data-original-title="" title=""></a>
+                  </span>
+                    <a class="multishop-modal-group-name" href="{{ multistore_group_url(group) }}">{{ "Group"|trans({}, 'Admin.Global') ~ ' ' ~ group.name }}</a>
+                  {% endblock %}
+                </li>
+
+                {% for shop in group.shops %}
+                  <li class="multishop-modal-shop-item multishop-modal-item">
+                    {% block shop_item %}
+                      <div class="multishop-modal-item-left">
+                      <span class="multishop-modal-color-container{% if this.isShopContext and this.currentContextId == shop.id %} multishop-modal-color-check{% endif %}">
+                        <i class="material-icons">check</i>
+                        <a class="multishop-modal-color"{% if shop.color is not empty %} style="background-color: {{shop.color}};"{% endif %} href="{{ getAdminLink('AdminShop', true, {'shop_id' : shop.id, 'updateshop' : true}) }}" data-toggle="popover" data-trigger="hover" data-placement="top" data-content="{{ "Edit color"|trans({}, 'Admin.Global') }}" data-original-title="" title=""></a>
+                      </span>
+                        <a class="multishop-modal-shop-name{% if shop.hasMainUrl() == false %} multishop-modal-no-url"{% else %}" href="{{ multistore_shop_url(shop) }}"{% endif %}>{{ shop.name }}</a>
+                      </div>
+                      {% if shop.hasMainUrl() %}
+                        <a class="multishop-modal-shop-view" href="{{ this.link.getBaseLink(shop.id) }}" target="_blank" rel="noreferrer">{{ "View my store"|trans({}, 'Admin.Navigation.Header') }} <i class="material-icons">visibility</i></a>
+                      {% else %}
+                        <a class="multishop-modal-shop-view" href="{{ getAdminLink('AdminShopUrl', true, {'shop_id' : shop.id, 'addshop_url' : 1}) }}" rel="noreferrer">{{ "Configure URL"|trans({}, 'Admin.Actions') }} <i class="material-icons">visibility</i></a>
+                      {% endif %}
+                    {% endblock %}
+                  </li>
+                {% endfor %}
+              {% endfor %}
+            </ul>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <script src="{{ asset('themes/new-theme/public/multistore_header.bundle.js') }}"></script>
+  {% endif %}
+{% endblock %}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/tool_bar.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/tool_bar.html.twig
index 09474ecd93a4b..b19f5c75686ab 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/tool_bar.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/tool_bar.html.twig
@@ -23,7 +23,7 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  *#}
 <div class="header-toolbar d-print-none">
-  {{ multistoreHeader }}
+  {{ component('MultistoreHeader', {lockedToAllShopContext: lockedToAllShopContext}) }}
   <div class="container-fluid">
 
     {% block pageBreadcrumb %}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/tool_bar.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/tool_bar.html.twig
index 6eb9eedc24c2a..58e6060c76576 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Layout/tool_bar.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/tool_bar.html.twig
@@ -23,7 +23,7 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  *#}
 {{ component('ToolBar', {
-  multistoreHeader: multistore_header,
+  lockedToAllShopContext: locked_to_all_shop_context,
   breadcrumbs2: breadcrumbs2,
   title: title,
   toolbarBtn: toolbar_btn,
diff --git a/src/PrestaShopBundle/Twig/Component/MultistoreHeader.php b/src/PrestaShopBundle/Twig/Component/MultistoreHeader.php
new file mode 100644
index 0000000000000..7c9ec7c9ae4e6
--- /dev/null
+++ b/src/PrestaShopBundle/Twig/Component/MultistoreHeader.php
@@ -0,0 +1,167 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\Twig\Component;
+
+use Doctrine\ORM\EntityManagerInterface;
+use Link;
+use PrestaShop\PrestaShop\Adapter\Feature\MultistoreFeature;
+use PrestaShop\PrestaShop\Adapter\LegacyContext;
+use PrestaShop\PrestaShop\Adapter\Shop\Context;
+use PrestaShop\PrestaShop\Core\Util\ColorBrightnessCalculator;
+use PrestaShopBundle\Entity\Shop;
+use PrestaShopBundle\Entity\ShopGroup;
+use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
+
+#[AsTwigComponent(template: '@PrestaShop/Admin/Component/Layout/multistore_header.html.twig')]
+class MultistoreHeader
+{
+    public bool $lockedToAllShopContext = false;
+    private bool $isMultistoreUsed;
+    private bool $isAllShopContext;
+    private bool $isTitleDark;
+    private bool $isShopContext;
+    private bool $isGroupContext;
+    private ShopGroup $currentContext;
+    private string|false $colorConfigLink;
+    private array $groupList = [];
+    private Link $link;
+
+    public function __construct(
+        private readonly MultistoreFeature $multistoreFeature, //todo removed internal using ?
+        private readonly ColorBrightnessCalculator $colorBrightnessCalculator,
+        private readonly Context $multiStoreContext,
+        private readonly EntityManagerInterface $entityManager,
+        private readonly LegacyContext $legacyContext,
+        private readonly TranslatorInterface $translator,
+    ) {
+    }
+
+    public function mount(): void
+    {
+        $this->isMultistoreUsed = $this->multistoreFeature->isUsed();
+
+        if (!$this->isMultistoreUsed) {
+            return;
+        }
+
+        $isAllShopContext = $this->multiStoreContext->isAllShopContext();
+        $isShopContext = $this->multiStoreContext->isShopContext();
+        $colorConfigLink = false;
+
+        if ($isShopContext) {
+            $currentContext = $this->entityManager->getRepository(Shop::class)->findOneBy(['id' => $this->multiStoreContext->getContextShopID()]);
+            $colorConfigLink = $this->legacyContext->getAdminLink('AdminShop', extraParams: ['shop_id' => $currentContext->getId(), 'updateshop' => true]);
+        } elseif (!$isAllShopContext) {
+            $shopGroupLegacy = $this->multiStoreContext->getContextShopGroup();
+            $currentContext = $this->entityManager->getRepository(ShopGroup::class)->findOneBy(['id' => $shopGroupLegacy->id]);
+            $colorConfigLink = $this->legacyContext->getAdminLink('AdminShopGroup', extraParams: ['id_shop_group' => $currentContext->getId(), 'updateshop_group' => true]);
+        } else {
+            // use ShopGroup object as the container for "all shops" context so that it can be used transparently in twig
+            $currentContext = new ShopGroup();
+            $currentContext->setName($this->translator->trans('All stores', domain: 'Admin.Global'));
+            $currentContext->setColor('');
+        }
+
+        if (!$this->lockedToAllShopContext) {
+            $this->groupList = array_filter(
+                $this->entityManager->getRepository(ShopGroup::class)->findBy(['active' => true]),
+                static fn (ShopGroup $shopGroup) => !$shopGroup->getShops()->isEmpty()
+            );
+        }
+        $this->currentContext = $currentContext;
+        $this->isShopContext = $isShopContext;
+        $this->link = $this->legacyContext->getContext()->link;
+        $this->isTitleDark = empty($currentContext->getColor()) ? true : $this->colorBrightnessCalculator->isBright($currentContext->getColor());
+        $this->isAllShopContext = $isAllShopContext;
+        $this->isGroupContext = $this->multiStoreContext->isGroupShopContext();
+        $this->lockedToAllShopContext = false;
+        $this->colorConfigLink = !$isAllShopContext && empty($currentContext->getColor()) ? $colorConfigLink : false;
+    }
+
+    public function isLockedToAllShopContext(): bool
+    {
+        return $this->lockedToAllShopContext;
+    }
+
+    public function isMultistoreUsed(): bool
+    {
+        return $this->isMultistoreUsed;
+    }
+
+    public function isAllShopContext(): bool
+    {
+        return $this->isAllShopContext;
+    }
+
+    public function getCurrentContextId(): int
+    {
+        return $this->currentContext->getId();
+    }
+
+    public function getCurrentContextName(): string
+    {
+        return $this->currentContext->getName();
+    }
+
+    public function getCurrentContextColor(): string
+    {
+        return $this->currentContext->getColor();
+    }
+
+    public function isTitleDark(): bool
+    {
+        return $this->isTitleDark;
+    }
+
+    public function isShopContext(): bool
+    {
+        return $this->isShopContext;
+    }
+
+    public function isGroupContext(): bool
+    {
+        return $this->isGroupContext;
+    }
+
+    public function getColorConfigLink(): string|false
+    {
+        return $this->colorConfigLink;
+    }
+
+    public function getLink(): Link
+    {
+        return $this->link;
+    }
+
+    public function getGroupList(): array
+    {
+        return $this->groupList;
+    }
+}
diff --git a/src/PrestaShopBundle/Twig/Component/ToolBar.php b/src/PrestaShopBundle/Twig/Component/ToolBar.php
index 57910ea7d4430..4be8064142e2e 100644
--- a/src/PrestaShopBundle/Twig/Component/ToolBar.php
+++ b/src/PrestaShopBundle/Twig/Component/ToolBar.php
@@ -33,7 +33,7 @@
 #[AsTwigComponent(template: '@PrestaShop/Admin/Component/Layout/tool_bar.html.twig')]
 class ToolBar
 {
-    public string $multistoreHeader;
+    public bool $lockedToAllShopContext;
     public array $breadcrumbs2;
     public array $toolbarBtn;
     public array|string $title;

From 2b2f4beaeb5b980478498c04255615f07ba51ee1 Mon Sep 17 00:00:00 2001
From: lartist <salim-benouamer.ext@prestashop.com>
Date: Fri, 11 Aug 2023 10:07:55 +0200
Subject: [PATCH 0765/1030] Renaming files, class, variable and fix
 curentContextType

---
 admin-dev/themes/new-theme/template/layout.tpl            | 2 +-
 .../Admin/Component/Layout/multistore_header.html.twig    | 8 ++++----
 .../Layout/{tool_bar.html.twig => toolbar.html.twig}      | 0
 .../Layout/{tool_bar.html.twig => toolbar.html.twig}      | 2 +-
 src/PrestaShopBundle/Twig/Component/MultistoreHeader.php  | 4 ++--
 .../Twig/Component/{ToolBar.php => Toolbar.php}           | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)
 rename src/PrestaShopBundle/Resources/views/Admin/Component/Layout/{tool_bar.html.twig => toolbar.html.twig} (100%)
 rename src/PrestaShopBundle/Resources/views/Admin/Layout/{tool_bar.html.twig => toolbar.html.twig} (98%)
 rename src/PrestaShopBundle/Twig/Component/{ToolBar.php => Toolbar.php} (97%)

diff --git a/admin-dev/themes/new-theme/template/layout.tpl b/admin-dev/themes/new-theme/template/layout.tpl
index cad7fb8af0543..09d9d0ba25ef3 100644
--- a/admin-dev/themes/new-theme/template/layout.tpl
+++ b/admin-dev/themes/new-theme/template/layout.tpl
@@ -171,7 +171,7 @@
 {if isset($page_header_toolbar_template)}
     {render_template
       smarty_template=$page_header_toolbar_template
-      twig_template="@PrestaShop/Admin/Layout/tool_bar.html.twig"
+      twig_template="@PrestaShop/Admin/Layout/toolbar.html.twig"
       locked_to_all_shop_context=$locked_to_all_shop_context
       breadcrumbs2=$breadcrumbs2
       title=$title
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/multistore_header.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/multistore_header.html.twig
index 57e3ce4d14763..e872d2a6950c9 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/multistore_header.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/multistore_header.html.twig
@@ -27,7 +27,7 @@
     <div
       id="header-multishop"
       class="header-multishop{% if this.isAllShopContext %} header-multishop-allshops{% elseif this.currentContextColor is empty %} header-multishop-default{% endif %}{% if this.isTitleDark is same as (true) %} header-multishop-dark{% else %} header-multishop-bright{% endif %}"
-      {% if this.isShopContext %}data-shop-id="{{ this.currentContextId }}"{% elseif this.isGroupContext %}data-group-id="{{ this.currentContextId }}"{% else %}data-all-shops="1"{% endif %}
+      {% if this.isShopContext %}data-shop-id="{{ this.currentShopContextId }}"{% elseif this.isGroupContext %}data-group-id="{{ this.currentShopContextId }}"{% else %}data-all-shops="1"{% endif %}
       {% if this.colorConfigLink %}data-header-color-notification="{{ "Customize your multistore header, [1]pick a color[/1] for this store context."|trans({'[1]': '<a href="' ~ this.colorConfigLink ~ '">', '[/1]': '</a>'}, 'Admin.Navigation.Header') }}"{% endif %}
       data-checkbox-notification="{{ "To apply specific settings to a store or a group of stores, select the parameter to modify, make your changes and save."|trans({}, 'Admin.Navigation.Header') ~ ' '}}"
     >
@@ -61,7 +61,7 @@
       {% if this.isShopContext %}
         <div class="header-multishop-right">
           {% block multishop_header_right %}
-            <a class="header-multishop-view-action" href="{{ this.link.getBaseLink(this.currentContextId) }}" target="_blank" rel="nofollow">{{ "View my store"|trans({}, 'Admin.Navigation.Header') }} <i class="material-icons">visibility</i></a>
+            <a class="header-multishop-view-action" href="{{ this.link.getBaseLink(this.currentShopContextId) }}" target="_blank" rel="nofollow">{{ "View my store"|trans({}, 'Admin.Navigation.Header') }} <i class="material-icons">visibility</i></a>
           {% endblock %}
         </div>
       {% endif %}
@@ -94,7 +94,7 @@
               {% for group in this.groupList %}
                 <li class="multishop-modal-group-item multishop-modal-item{% if loop.first %} first-group-item{% endif %}">
                   {% block shop_group_item %}
-                    <span class="multishop-modal-color-container{% if this.isGroupContext and this.currentContextId == group.id %} multishop-modal-color-check{% endif %}">
+                    <span class="multishop-modal-color-container{% if this.isGroupContext and this.currentShopContextId == group.id %} multishop-modal-color-check{% endif %}">
                     <i class="material-icons">check</i>
                     <a class="multishop-modal-color"{% if group.color is not empty %} style="background-color: {{group.color}};"{% endif %} href="{{ getAdminLink('AdminShopGroup', true, {'id_shop_group' : group.id, 'updateshop_group' : true}) }}" data-toggle="popover" data-trigger="hover" data-placement="top" data-content="{{ "Edit color"|trans({}, 'Admin.Global') }}" data-original-title="" title=""></a>
                   </span>
@@ -106,7 +106,7 @@
                   <li class="multishop-modal-shop-item multishop-modal-item">
                     {% block shop_item %}
                       <div class="multishop-modal-item-left">
-                      <span class="multishop-modal-color-container{% if this.isShopContext and this.currentContextId == shop.id %} multishop-modal-color-check{% endif %}">
+                      <span class="multishop-modal-color-container{% if this.isShopContext and this.currentShopContextId == shop.id %} multishop-modal-color-check{% endif %}">
                         <i class="material-icons">check</i>
                         <a class="multishop-modal-color"{% if shop.color is not empty %} style="background-color: {{shop.color}};"{% endif %} href="{{ getAdminLink('AdminShop', true, {'shop_id' : shop.id, 'updateshop' : true}) }}" data-toggle="popover" data-trigger="hover" data-placement="top" data-content="{{ "Edit color"|trans({}, 'Admin.Global') }}" data-original-title="" title=""></a>
                       </span>
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/tool_bar.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/toolbar.html.twig
similarity index 100%
rename from src/PrestaShopBundle/Resources/views/Admin/Component/Layout/tool_bar.html.twig
rename to src/PrestaShopBundle/Resources/views/Admin/Component/Layout/toolbar.html.twig
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/tool_bar.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/toolbar.html.twig
similarity index 98%
rename from src/PrestaShopBundle/Resources/views/Admin/Layout/tool_bar.html.twig
rename to src/PrestaShopBundle/Resources/views/Admin/Layout/toolbar.html.twig
index 58e6060c76576..215c09a4af3d5 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Layout/tool_bar.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/toolbar.html.twig
@@ -22,7 +22,7 @@
  * @copyright Since 2007 PrestaShop SA and Contributors
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  *#}
-{{ component('ToolBar', {
+{{ component('Toolbar', {
   lockedToAllShopContext: locked_to_all_shop_context,
   breadcrumbs2: breadcrumbs2,
   title: title,
diff --git a/src/PrestaShopBundle/Twig/Component/MultistoreHeader.php b/src/PrestaShopBundle/Twig/Component/MultistoreHeader.php
index 7c9ec7c9ae4e6..2ecf8217b9fe0 100644
--- a/src/PrestaShopBundle/Twig/Component/MultistoreHeader.php
+++ b/src/PrestaShopBundle/Twig/Component/MultistoreHeader.php
@@ -48,7 +48,7 @@ class MultistoreHeader
     private bool $isTitleDark;
     private bool $isShopContext;
     private bool $isGroupContext;
-    private ShopGroup $currentContext;
+    private ShopGroup|Shop $currentContext;
     private string|false $colorConfigLink;
     private array $groupList = [];
     private Link $link;
@@ -120,7 +120,7 @@ public function isAllShopContext(): bool
         return $this->isAllShopContext;
     }
 
-    public function getCurrentContextId(): int
+    public function getCurrentShopContextId(): int
     {
         return $this->currentContext->getId();
     }
diff --git a/src/PrestaShopBundle/Twig/Component/ToolBar.php b/src/PrestaShopBundle/Twig/Component/Toolbar.php
similarity index 97%
rename from src/PrestaShopBundle/Twig/Component/ToolBar.php
rename to src/PrestaShopBundle/Twig/Component/Toolbar.php
index 4be8064142e2e..74c0c20d217b9 100644
--- a/src/PrestaShopBundle/Twig/Component/ToolBar.php
+++ b/src/PrestaShopBundle/Twig/Component/Toolbar.php
@@ -30,8 +30,8 @@
 
 use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
 
-#[AsTwigComponent(template: '@PrestaShop/Admin/Component/Layout/tool_bar.html.twig')]
-class ToolBar
+#[AsTwigComponent(template: '@PrestaShop/Admin/Component/Layout/toolbar.html.twig')]
+class Toolbar
 {
     public bool $lockedToAllShopContext;
     public array $breadcrumbs2;

From 6e5dd55c92d9dc70207cc29f80923b92f185e274 Mon Sep 17 00:00:00 2001
From: idnovate <info@idnovate.com>
Date: Sat, 12 Aug 2023 13:05:41 +0200
Subject: [PATCH 0766/1030] Update Order.php

---
 classes/order/Order.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/order/Order.php b/classes/order/Order.php
index 25750f23731cf..a1ea4e89ca9d4 100644
--- a/classes/order/Order.php
+++ b/classes/order/Order.php
@@ -2626,7 +2626,7 @@ public function getProductTaxesDetails($limitToOrderDetails = false)
             $discounted_price_tax_excl = $order_detail['unit_price_tax_excl'] - $discount_ratio * $order_discount_tax_excl;
             // specific discount
             if (!empty($product_specific_discounts[$order_detail['product_id']])) {
-                $discounted_price_tax_excl -= $product_specific_discounts[$order_detail['product_id']];
+                $discounted_price_tax_excl -= $product_specific_discounts[$order_detail['product_id']] / $order_detail['product_quantity'];
             }
 
             $quantity = $order_detail['product_quantity'];

From 4d985c1e8553d1af63f5967aa4682f59e1ba7946 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Aug 2023 04:07:01 +0000
Subject: [PATCH 0767/1030] Bump playwright from 1.36.2 to 1.37.0 in /tests/UI

Bumps [playwright](https://github.com/Microsoft/playwright) from 1.36.2 to 1.37.0.
- [Release notes](https://github.com/Microsoft/playwright/releases)
- [Commits](https://github.com/Microsoft/playwright/compare/v1.36.2...v1.37.0)

---
updated-dependencies:
- dependency-name: playwright
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 30 +++++++++++++++---------------
 tests/UI/package.json      |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index f5123e1ca6b8a..e3c82bf5d270b 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -24,7 +24,7 @@
         "mocha": "^10.2.0",
         "mochawesome": "^7.1.3",
         "pdfjs-dist": "^3.4.120",
-        "playwright": "^1.36.2",
+        "playwright": "^1.37.0",
         "xpath-ts": "^1.3.13"
       },
       "devDependencies": {
@@ -6144,12 +6144,12 @@
       }
     },
     "node_modules/playwright": {
-      "version": "1.36.2",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.36.2.tgz",
-      "integrity": "sha512-4Fmlq3KWsl85Bl4InJw1NC21aeQV0iSZuFvTDcy1F8zVmXmgQRe89GxF8zMSRt/KIS+2tUolak7EXVl9aC+JdA==",
+      "version": "1.37.0",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.37.0.tgz",
+      "integrity": "sha512-CrAEFfVioamMwDKmygc/HAkzEAxYAwjD+zod2poTxM7ObivkoDsKHu1ned16fnQV/Tf1kDB8KtsyH8Qd3VzJIg==",
       "hasInstallScript": true,
       "dependencies": {
-        "playwright-core": "1.36.2"
+        "playwright-core": "1.37.0"
       },
       "bin": {
         "playwright": "cli.js"
@@ -6159,9 +6159,9 @@
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.36.2",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.36.2.tgz",
-      "integrity": "sha512-sQYZt31dwkqxOrP7xy2ggDfEzUxM1lodjhsQ3NMMv5uGTRDsLxU0e4xf4wwMkF2gplIxf17QMBCodSFgm6bFVQ==",
+      "version": "1.37.0",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.37.0.tgz",
+      "integrity": "sha512-1c46jhTH/myQw6sesrcuHVtLoSNfJv8Pfy9t3rs6subY7kARv0HRw5PpyfPYPpPtQvBOmgbE6K+qgYUpj81LAA==",
       "bin": {
         "playwright-core": "cli.js"
       },
@@ -12489,17 +12489,17 @@
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
     },
     "playwright": {
-      "version": "1.36.2",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.36.2.tgz",
-      "integrity": "sha512-4Fmlq3KWsl85Bl4InJw1NC21aeQV0iSZuFvTDcy1F8zVmXmgQRe89GxF8zMSRt/KIS+2tUolak7EXVl9aC+JdA==",
+      "version": "1.37.0",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.37.0.tgz",
+      "integrity": "sha512-CrAEFfVioamMwDKmygc/HAkzEAxYAwjD+zod2poTxM7ObivkoDsKHu1ned16fnQV/Tf1kDB8KtsyH8Qd3VzJIg==",
       "requires": {
-        "playwright-core": "1.36.2"
+        "playwright-core": "1.37.0"
       }
     },
     "playwright-core": {
-      "version": "1.36.2",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.36.2.tgz",
-      "integrity": "sha512-sQYZt31dwkqxOrP7xy2ggDfEzUxM1lodjhsQ3NMMv5uGTRDsLxU0e4xf4wwMkF2gplIxf17QMBCodSFgm6bFVQ=="
+      "version": "1.37.0",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.37.0.tgz",
+      "integrity": "sha512-1c46jhTH/myQw6sesrcuHVtLoSNfJv8Pfy9t3rs6subY7kARv0HRw5PpyfPYPpPtQvBOmgbE6K+qgYUpj81LAA=="
     },
     "prelude-ls": {
       "version": "1.1.2",
diff --git a/tests/UI/package.json b/tests/UI/package.json
index cc1fd328bc773..153be301fb081 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -117,7 +117,7 @@
     "mocha": "^10.2.0",
     "mochawesome": "^7.1.3",
     "pdfjs-dist": "^3.4.120",
-    "playwright": "^1.36.2",
+    "playwright": "^1.37.0",
     "xpath-ts": "^1.3.13"
   },
   "devDependencies": {

From 286441446dfbb21747d3a3f4397caa0a3ae0228d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Aug 2023 04:07:28 +0000
Subject: [PATCH 0768/1030] Bump eslint from 8.46.0 to 8.47.0 in /tests/UI

Bumps [eslint](https://github.com/eslint/eslint) from 8.46.0 to 8.47.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.46.0...v8.47.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 86 +++++++++++++++++++-------------------
 tests/UI/package.json      |  2 +-
 2 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index f5123e1ca6b8a..5390a1a51fa8c 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -36,7 +36,7 @@
         "@typescript-eslint/eslint-plugin": "^6.2.1",
         "@typescript-eslint/parser": "^6.2.1",
         "babel-eslint": "^10.1.0",
-        "eslint": "^8.46.0",
+        "eslint": "^8.47.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-deprecation": "^1.5.0",
         "eslint-plugin-html": "^7.1.0",
@@ -249,9 +249,9 @@
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.1.tgz",
-      "integrity": "sha512-9t7ZA7NGGK8ckelF0PQCfcxIUzs1Md5rrO6U/c+FIQNanea5UZC0wqKXH4vHBccmu4ZJgZ2idtPeW7+Q2npOEA==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz",
+      "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==",
       "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
@@ -272,9 +272,9 @@
       }
     },
     "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.20.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
-      "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
+      "version": "13.21.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz",
+      "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==",
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -287,9 +287,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.46.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.46.0.tgz",
-      "integrity": "sha512-a8TLtmPi8xzPkCbp/OGFUo5yhRkHM2Ko9kOWP4znJr0WAhWyThaw3PnwX4vOTWOAMsV2uRt32PPDcEz63esSaA==",
+      "version": "8.47.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.47.0.tgz",
+      "integrity": "sha512-P6omY1zv5MItm93kLM8s2vr1HICJH8v0dvddDhysbIuZ+vcjOHg5Zbkf1mTkcmi2JA9oBG2anOkRnW8WJTS8Og==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -2608,15 +2608,15 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.46.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.46.0.tgz",
-      "integrity": "sha512-cIO74PvbW0qU8e0mIvk5IV3ToWdCq5FYG6gWPHHkx6gNdjlbAYvtfHmlCMXxjcoVaIdwy/IAt3+mDkZkfvb2Dg==",
+      "version": "8.47.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.47.0.tgz",
+      "integrity": "sha512-spUQWrdPt+pRVP1TTJLmfRNJJHHZryFmptzcafwSvHsceV81djHOdnEeDmkdotZyLNjDhrOasNK8nikkoG1O8Q==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.1",
-        "@eslint/js": "^8.46.0",
+        "@eslint/eslintrc": "^2.1.2",
+        "@eslint/js": "^8.47.0",
         "@humanwhocodes/config-array": "^0.11.10",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -2627,7 +2627,7 @@
         "doctrine": "^3.0.0",
         "escape-string-regexp": "^4.0.0",
         "eslint-scope": "^7.2.2",
-        "eslint-visitor-keys": "^3.4.2",
+        "eslint-visitor-keys": "^3.4.3",
         "espree": "^9.6.1",
         "esquery": "^1.4.2",
         "esutils": "^2.0.2",
@@ -2947,9 +2947,9 @@
       }
     },
     "node_modules/eslint/node_modules/eslint-visitor-keys": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
-      "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==",
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -3075,9 +3075,9 @@
       }
     },
     "node_modules/espree/node_modules/eslint-visitor-keys": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
-      "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==",
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -8151,9 +8151,9 @@
       "dev": true
     },
     "@eslint/eslintrc": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.1.tgz",
-      "integrity": "sha512-9t7ZA7NGGK8ckelF0PQCfcxIUzs1Md5rrO6U/c+FIQNanea5UZC0wqKXH4vHBccmu4ZJgZ2idtPeW7+Q2npOEA==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz",
+      "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==",
       "dev": true,
       "requires": {
         "ajv": "^6.12.4",
@@ -8168,9 +8168,9 @@
       },
       "dependencies": {
         "globals": {
-          "version": "13.20.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
-          "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
+          "version": "13.21.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz",
+          "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==",
           "dev": true,
           "requires": {
             "type-fest": "^0.20.2"
@@ -8179,9 +8179,9 @@
       }
     },
     "@eslint/js": {
-      "version": "8.46.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.46.0.tgz",
-      "integrity": "sha512-a8TLtmPi8xzPkCbp/OGFUo5yhRkHM2Ko9kOWP4znJr0WAhWyThaw3PnwX4vOTWOAMsV2uRt32PPDcEz63esSaA==",
+      "version": "8.47.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.47.0.tgz",
+      "integrity": "sha512-P6omY1zv5MItm93kLM8s2vr1HICJH8v0dvddDhysbIuZ+vcjOHg5Zbkf1mTkcmi2JA9oBG2anOkRnW8WJTS8Og==",
       "dev": true
     },
     "@faker-js/faker": {
@@ -9862,15 +9862,15 @@
       }
     },
     "eslint": {
-      "version": "8.46.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.46.0.tgz",
-      "integrity": "sha512-cIO74PvbW0qU8e0mIvk5IV3ToWdCq5FYG6gWPHHkx6gNdjlbAYvtfHmlCMXxjcoVaIdwy/IAt3+mDkZkfvb2Dg==",
+      "version": "8.47.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.47.0.tgz",
+      "integrity": "sha512-spUQWrdPt+pRVP1TTJLmfRNJJHHZryFmptzcafwSvHsceV81djHOdnEeDmkdotZyLNjDhrOasNK8nikkoG1O8Q==",
       "dev": true,
       "requires": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.1",
-        "@eslint/js": "^8.46.0",
+        "@eslint/eslintrc": "^2.1.2",
+        "@eslint/js": "^8.47.0",
         "@humanwhocodes/config-array": "^0.11.10",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -9881,7 +9881,7 @@
         "doctrine": "^3.0.0",
         "escape-string-regexp": "^4.0.0",
         "eslint-scope": "^7.2.2",
-        "eslint-visitor-keys": "^3.4.2",
+        "eslint-visitor-keys": "^3.4.3",
         "espree": "^9.6.1",
         "esquery": "^1.4.2",
         "esutils": "^2.0.2",
@@ -9947,9 +9947,9 @@
           "dev": true
         },
         "eslint-visitor-keys": {
-          "version": "3.4.2",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
-          "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==",
+          "version": "3.4.3",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+          "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
           "dev": true
         },
         "glob-parent": {
@@ -10225,9 +10225,9 @@
       },
       "dependencies": {
         "eslint-visitor-keys": {
-          "version": "3.4.2",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
-          "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==",
+          "version": "3.4.3",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+          "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
           "dev": true
         }
       }
diff --git a/tests/UI/package.json b/tests/UI/package.json
index cc1fd328bc773..e490a162c9b67 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -129,7 +129,7 @@
     "@typescript-eslint/eslint-plugin": "^6.2.1",
     "@typescript-eslint/parser": "^6.2.1",
     "babel-eslint": "^10.1.0",
-    "eslint": "^8.46.0",
+    "eslint": "^8.47.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-deprecation": "^1.5.0",
     "eslint-plugin-html": "^7.1.0",

From 35f7667a3486a5f6dc5aa0ef3137b40d4951084e Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Mon, 14 Aug 2023 08:50:15 +0200
Subject: [PATCH 0769/1030] Fix trans call

---
 .../Admin/TwigTemplateForm/prestashop_ui_kit_base.html.twig     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PrestaShopBundle/Resources/views/Admin/TwigTemplateForm/prestashop_ui_kit_base.html.twig b/src/PrestaShopBundle/Resources/views/Admin/TwigTemplateForm/prestashop_ui_kit_base.html.twig
index 4079e6ed60ff7..49c280f7ce594 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/TwigTemplateForm/prestashop_ui_kit_base.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/TwigTemplateForm/prestashop_ui_kit_base.html.twig
@@ -752,7 +752,7 @@
           data-trigger="hover"
           data-container=".{{ popoverContainer }}"
         >
-          <i class="material-icons form-error-icon">error_outline</i> <u> {{ '%count% errors'|trans(errors|length, {}, 'Admin.Global') }}</u>
+          <i class="material-icons form-error-icon">error_outline</i> <u> {{ '%count% errors'|trans({'%count%': errors|length}, 'Admin.Global') }}</u>
         </span>
       {% endset %}
 

From 27bbd11c731746f51e2398340c567cb703283cb6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Aug 2023 07:54:24 +0000
Subject: [PATCH 0770/1030] Bump @typescript-eslint/parser from 6.2.1 to 6.4.0
 in /tests/UI

Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 6.2.1 to 6.4.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.4.0/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 110 ++++++++++++++++++-------------------
 tests/UI/package.json      |   2 +-
 2 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index 5390a1a51fa8c..0d36c990d86a5 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -34,7 +34,7 @@
         "@types/mocha": "^10.0.1",
         "@types/mochawesome": "^6.2.1",
         "@typescript-eslint/eslint-plugin": "^6.2.1",
-        "@typescript-eslint/parser": "^6.2.1",
+        "@typescript-eslint/parser": "^6.4.0",
         "babel-eslint": "^10.1.0",
         "eslint": "^8.47.0",
         "eslint-config-airbnb-base": "^15.0.0",
@@ -688,15 +688,15 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.2.1.tgz",
-      "integrity": "sha512-Ld+uL1kYFU8e6btqBFpsHkwQ35rw30IWpdQxgOqOh4NfxSDH6uCkah1ks8R/RgQqI5hHPXMaLy9fbFseIe+dIg==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.4.0.tgz",
+      "integrity": "sha512-I1Ah1irl033uxjxO9Xql7+biL3YD7w9IU8zF+xlzD/YxY6a4b7DYA08PXUUCbm2sEljwJF6ERFy2kTGAGcNilg==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "6.2.1",
-        "@typescript-eslint/types": "6.2.1",
-        "@typescript-eslint/typescript-estree": "6.2.1",
-        "@typescript-eslint/visitor-keys": "6.2.1",
+        "@typescript-eslint/scope-manager": "6.4.0",
+        "@typescript-eslint/types": "6.4.0",
+        "@typescript-eslint/typescript-estree": "6.4.0",
+        "@typescript-eslint/visitor-keys": "6.4.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -716,13 +716,13 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.2.1.tgz",
-      "integrity": "sha512-UCqBF9WFqv64xNsIEPfBtenbfodPXsJ3nPAr55mGPkQIkiQvgoWNo+astj9ZUfJfVKiYgAZDMnM6dIpsxUMp3Q==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.4.0.tgz",
+      "integrity": "sha512-TUS7vaKkPWDVvl7GDNHFQMsMruD+zhkd3SdVW0d7b+7Zo+bd/hXJQ8nsiUZMi1jloWo6c9qt3B7Sqo+flC1nig==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.2.1",
-        "@typescript-eslint/visitor-keys": "6.2.1"
+        "@typescript-eslint/types": "6.4.0",
+        "@typescript-eslint/visitor-keys": "6.4.0"
       },
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -733,9 +733,9 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.2.1.tgz",
-      "integrity": "sha512-528bGcoelrpw+sETlyM91k51Arl2ajbNT9L4JwoXE2dvRe1yd8Q64E4OL7vHYw31mlnVsf+BeeLyAZUEQtqahQ==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.0.tgz",
+      "integrity": "sha512-+FV9kVFrS7w78YtzkIsNSoYsnOtrYVnKWSTVXoL1761CsCRv5wpDOINgsXpxD67YCLZtVQekDDyaxfjVWUJmmg==",
       "dev": true,
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -746,13 +746,13 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.2.1.tgz",
-      "integrity": "sha512-G+UJeQx9AKBHRQBpmvr8T/3K5bJa485eu+4tQBxFq0KoT22+jJyzo1B50JDT9QdC1DEmWQfdKsa8ybiNWYsi0Q==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.4.0.tgz",
+      "integrity": "sha512-iDPJArf/K2sxvjOR6skeUCNgHR/tCQXBsa+ee1/clRKr3olZjZ/dSkXPZjG6YkPtnW6p5D1egeEPMCW6Gn4yLA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.2.1",
-        "@typescript-eslint/visitor-keys": "6.2.1",
+        "@typescript-eslint/types": "6.4.0",
+        "@typescript-eslint/visitor-keys": "6.4.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -773,12 +773,12 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.2.1.tgz",
-      "integrity": "sha512-iTN6w3k2JEZ7cyVdZJTVJx2Lv7t6zFA8DCrJEHD2mwfc16AEvvBWVhbFh34XyG2NORCd0viIgQY1+u7kPI0WpA==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.0.tgz",
+      "integrity": "sha512-yJSfyT+uJm+JRDWYRYdCm2i+pmvXJSMtPR9Cq5/XQs4QIgNoLcoRtDdzsLbLsFM/c6um6ohQkg/MLxWvoIndJA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.2.1",
+        "@typescript-eslint/types": "6.4.0",
         "eslint-visitor-keys": "^3.4.1"
       },
       "engines": {
@@ -790,9 +790,9 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/eslint-visitor-keys": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
-      "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==",
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -8473,42 +8473,42 @@
       }
     },
     "@typescript-eslint/parser": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.2.1.tgz",
-      "integrity": "sha512-Ld+uL1kYFU8e6btqBFpsHkwQ35rw30IWpdQxgOqOh4NfxSDH6uCkah1ks8R/RgQqI5hHPXMaLy9fbFseIe+dIg==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.4.0.tgz",
+      "integrity": "sha512-I1Ah1irl033uxjxO9Xql7+biL3YD7w9IU8zF+xlzD/YxY6a4b7DYA08PXUUCbm2sEljwJF6ERFy2kTGAGcNilg==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "6.2.1",
-        "@typescript-eslint/types": "6.2.1",
-        "@typescript-eslint/typescript-estree": "6.2.1",
-        "@typescript-eslint/visitor-keys": "6.2.1",
+        "@typescript-eslint/scope-manager": "6.4.0",
+        "@typescript-eslint/types": "6.4.0",
+        "@typescript-eslint/typescript-estree": "6.4.0",
+        "@typescript-eslint/visitor-keys": "6.4.0",
         "debug": "^4.3.4"
       },
       "dependencies": {
         "@typescript-eslint/scope-manager": {
-          "version": "6.2.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.2.1.tgz",
-          "integrity": "sha512-UCqBF9WFqv64xNsIEPfBtenbfodPXsJ3nPAr55mGPkQIkiQvgoWNo+astj9ZUfJfVKiYgAZDMnM6dIpsxUMp3Q==",
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.4.0.tgz",
+          "integrity": "sha512-TUS7vaKkPWDVvl7GDNHFQMsMruD+zhkd3SdVW0d7b+7Zo+bd/hXJQ8nsiUZMi1jloWo6c9qt3B7Sqo+flC1nig==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.2.1",
-            "@typescript-eslint/visitor-keys": "6.2.1"
+            "@typescript-eslint/types": "6.4.0",
+            "@typescript-eslint/visitor-keys": "6.4.0"
           }
         },
         "@typescript-eslint/types": {
-          "version": "6.2.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.2.1.tgz",
-          "integrity": "sha512-528bGcoelrpw+sETlyM91k51Arl2ajbNT9L4JwoXE2dvRe1yd8Q64E4OL7vHYw31mlnVsf+BeeLyAZUEQtqahQ==",
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.0.tgz",
+          "integrity": "sha512-+FV9kVFrS7w78YtzkIsNSoYsnOtrYVnKWSTVXoL1761CsCRv5wpDOINgsXpxD67YCLZtVQekDDyaxfjVWUJmmg==",
           "dev": true
         },
         "@typescript-eslint/typescript-estree": {
-          "version": "6.2.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.2.1.tgz",
-          "integrity": "sha512-G+UJeQx9AKBHRQBpmvr8T/3K5bJa485eu+4tQBxFq0KoT22+jJyzo1B50JDT9QdC1DEmWQfdKsa8ybiNWYsi0Q==",
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.4.0.tgz",
+          "integrity": "sha512-iDPJArf/K2sxvjOR6skeUCNgHR/tCQXBsa+ee1/clRKr3olZjZ/dSkXPZjG6YkPtnW6p5D1egeEPMCW6Gn4yLA==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.2.1",
-            "@typescript-eslint/visitor-keys": "6.2.1",
+            "@typescript-eslint/types": "6.4.0",
+            "@typescript-eslint/visitor-keys": "6.4.0",
             "debug": "^4.3.4",
             "globby": "^11.1.0",
             "is-glob": "^4.0.3",
@@ -8517,19 +8517,19 @@
           }
         },
         "@typescript-eslint/visitor-keys": {
-          "version": "6.2.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.2.1.tgz",
-          "integrity": "sha512-iTN6w3k2JEZ7cyVdZJTVJx2Lv7t6zFA8DCrJEHD2mwfc16AEvvBWVhbFh34XyG2NORCd0viIgQY1+u7kPI0WpA==",
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.0.tgz",
+          "integrity": "sha512-yJSfyT+uJm+JRDWYRYdCm2i+pmvXJSMtPR9Cq5/XQs4QIgNoLcoRtDdzsLbLsFM/c6um6ohQkg/MLxWvoIndJA==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.2.1",
+            "@typescript-eslint/types": "6.4.0",
             "eslint-visitor-keys": "^3.4.1"
           }
         },
         "eslint-visitor-keys": {
-          "version": "3.4.2",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
-          "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==",
+          "version": "3.4.3",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+          "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
           "dev": true
         }
       }
diff --git a/tests/UI/package.json b/tests/UI/package.json
index e490a162c9b67..e746c7df355c5 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -127,7 +127,7 @@
     "@types/mocha": "^10.0.1",
     "@types/mochawesome": "^6.2.1",
     "@typescript-eslint/eslint-plugin": "^6.2.1",
-    "@typescript-eslint/parser": "^6.2.1",
+    "@typescript-eslint/parser": "^6.4.0",
     "babel-eslint": "^10.1.0",
     "eslint": "^8.47.0",
     "eslint-config-airbnb-base": "^15.0.0",

From 369c348e44a8581466fd51a8c66887c1bdc73b4b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Aug 2023 08:37:40 +0000
Subject: [PATCH 0771/1030] Bump @typescript-eslint/eslint-plugin from 6.2.1 to
 6.4.0 in /tests/UI

Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 6.2.1 to 6.4.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.4.0/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 272 ++++++++++++++++++-------------------
 tests/UI/package.json      |   2 +-
 2 files changed, 130 insertions(+), 144 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index 0d36c990d86a5..591257147eff9 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -33,7 +33,7 @@
         "@types/libsodium-wrappers": "^0.7.10",
         "@types/mocha": "^10.0.1",
         "@types/mochawesome": "^6.2.1",
-        "@typescript-eslint/eslint-plugin": "^6.2.1",
+        "@typescript-eslint/eslint-plugin": "^6.4.0",
         "@typescript-eslint/parser": "^6.4.0",
         "babel-eslint": "^10.1.0",
         "eslint": "^8.47.0",
@@ -541,21 +541,20 @@
       "dev": true
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.2.1.tgz",
-      "integrity": "sha512-iZVM/ALid9kO0+I81pnp1xmYiFyqibAHzrqX4q5YvvVEyJqY+e6rfTXSCsc2jUxGNqJqTfFSSij/NFkZBiBzLw==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.4.0.tgz",
+      "integrity": "sha512-62o2Hmc7Gs3p8SLfbXcipjWAa6qk2wZGChXG2JbBtYpwSRmti/9KHLqfbLs9uDigOexG+3PaQ9G2g3201FWLKg==",
       "dev": true,
       "dependencies": {
         "@eslint-community/regexpp": "^4.5.1",
-        "@typescript-eslint/scope-manager": "6.2.1",
-        "@typescript-eslint/type-utils": "6.2.1",
-        "@typescript-eslint/utils": "6.2.1",
-        "@typescript-eslint/visitor-keys": "6.2.1",
+        "@typescript-eslint/scope-manager": "6.4.0",
+        "@typescript-eslint/type-utils": "6.4.0",
+        "@typescript-eslint/utils": "6.4.0",
+        "@typescript-eslint/visitor-keys": "6.4.0",
         "debug": "^4.3.4",
         "graphemer": "^1.4.0",
         "ignore": "^5.2.4",
         "natural-compare": "^1.4.0",
-        "natural-compare-lite": "^1.4.0",
         "semver": "^7.5.4",
         "ts-api-utils": "^1.0.1"
       },
@@ -577,13 +576,13 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.2.1.tgz",
-      "integrity": "sha512-UCqBF9WFqv64xNsIEPfBtenbfodPXsJ3nPAr55mGPkQIkiQvgoWNo+astj9ZUfJfVKiYgAZDMnM6dIpsxUMp3Q==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.4.0.tgz",
+      "integrity": "sha512-TUS7vaKkPWDVvl7GDNHFQMsMruD+zhkd3SdVW0d7b+7Zo+bd/hXJQ8nsiUZMi1jloWo6c9qt3B7Sqo+flC1nig==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.2.1",
-        "@typescript-eslint/visitor-keys": "6.2.1"
+        "@typescript-eslint/types": "6.4.0",
+        "@typescript-eslint/visitor-keys": "6.4.0"
       },
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -594,9 +593,9 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.2.1.tgz",
-      "integrity": "sha512-528bGcoelrpw+sETlyM91k51Arl2ajbNT9L4JwoXE2dvRe1yd8Q64E4OL7vHYw31mlnVsf+BeeLyAZUEQtqahQ==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.0.tgz",
+      "integrity": "sha512-+FV9kVFrS7w78YtzkIsNSoYsnOtrYVnKWSTVXoL1761CsCRv5wpDOINgsXpxD67YCLZtVQekDDyaxfjVWUJmmg==",
       "dev": true,
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -607,13 +606,13 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.2.1.tgz",
-      "integrity": "sha512-G+UJeQx9AKBHRQBpmvr8T/3K5bJa485eu+4tQBxFq0KoT22+jJyzo1B50JDT9QdC1DEmWQfdKsa8ybiNWYsi0Q==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.4.0.tgz",
+      "integrity": "sha512-iDPJArf/K2sxvjOR6skeUCNgHR/tCQXBsa+ee1/clRKr3olZjZ/dSkXPZjG6YkPtnW6p5D1egeEPMCW6Gn4yLA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.2.1",
-        "@typescript-eslint/visitor-keys": "6.2.1",
+        "@typescript-eslint/types": "6.4.0",
+        "@typescript-eslint/visitor-keys": "6.4.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -634,17 +633,17 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.2.1.tgz",
-      "integrity": "sha512-eBIXQeupYmxVB6S7x+B9SdBeB6qIdXKjgQBge2J+Ouv8h9Cxm5dHf/gfAZA6dkMaag+03HdbVInuXMmqFB/lKQ==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.4.0.tgz",
+      "integrity": "sha512-BvvwryBQpECPGo8PwF/y/q+yacg8Hn/2XS+DqL/oRsOPK+RPt29h5Ui5dqOKHDlbXrAeHUTnyG3wZA0KTDxRZw==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "@types/json-schema": "^7.0.12",
         "@types/semver": "^7.5.0",
-        "@typescript-eslint/scope-manager": "6.2.1",
-        "@typescript-eslint/types": "6.2.1",
-        "@typescript-eslint/typescript-estree": "6.2.1",
+        "@typescript-eslint/scope-manager": "6.4.0",
+        "@typescript-eslint/types": "6.4.0",
+        "@typescript-eslint/typescript-estree": "6.4.0",
         "semver": "^7.5.4"
       },
       "engines": {
@@ -659,12 +658,12 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.2.1.tgz",
-      "integrity": "sha512-iTN6w3k2JEZ7cyVdZJTVJx2Lv7t6zFA8DCrJEHD2mwfc16AEvvBWVhbFh34XyG2NORCd0viIgQY1+u7kPI0WpA==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.0.tgz",
+      "integrity": "sha512-yJSfyT+uJm+JRDWYRYdCm2i+pmvXJSMtPR9Cq5/XQs4QIgNoLcoRtDdzsLbLsFM/c6um6ohQkg/MLxWvoIndJA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.2.1",
+        "@typescript-eslint/types": "6.4.0",
         "eslint-visitor-keys": "^3.4.1"
       },
       "engines": {
@@ -676,9 +675,9 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-visitor-keys": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
-      "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==",
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -819,13 +818,13 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.2.1.tgz",
-      "integrity": "sha512-fTfCgomBMIgu2Dh2Or3gMYgoNAnQm3RLtRp+jP7A8fY+LJ2+9PNpi5p6QB5C4RSP+U3cjI0vDlI3mspAkpPVbQ==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.4.0.tgz",
+      "integrity": "sha512-TvqrUFFyGY0cX3WgDHcdl2/mMCWCDv/0thTtx/ODMY1QhEiyFtv/OlLaNIiYLwRpAxAtOLOY9SUf1H3Q3dlwAg==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "6.2.1",
-        "@typescript-eslint/utils": "6.2.1",
+        "@typescript-eslint/typescript-estree": "6.4.0",
+        "@typescript-eslint/utils": "6.4.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.0.1"
       },
@@ -846,13 +845,13 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/scope-manager": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.2.1.tgz",
-      "integrity": "sha512-UCqBF9WFqv64xNsIEPfBtenbfodPXsJ3nPAr55mGPkQIkiQvgoWNo+astj9ZUfJfVKiYgAZDMnM6dIpsxUMp3Q==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.4.0.tgz",
+      "integrity": "sha512-TUS7vaKkPWDVvl7GDNHFQMsMruD+zhkd3SdVW0d7b+7Zo+bd/hXJQ8nsiUZMi1jloWo6c9qt3B7Sqo+flC1nig==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.2.1",
-        "@typescript-eslint/visitor-keys": "6.2.1"
+        "@typescript-eslint/types": "6.4.0",
+        "@typescript-eslint/visitor-keys": "6.4.0"
       },
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -863,9 +862,9 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.2.1.tgz",
-      "integrity": "sha512-528bGcoelrpw+sETlyM91k51Arl2ajbNT9L4JwoXE2dvRe1yd8Q64E4OL7vHYw31mlnVsf+BeeLyAZUEQtqahQ==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.0.tgz",
+      "integrity": "sha512-+FV9kVFrS7w78YtzkIsNSoYsnOtrYVnKWSTVXoL1761CsCRv5wpDOINgsXpxD67YCLZtVQekDDyaxfjVWUJmmg==",
       "dev": true,
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -876,13 +875,13 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.2.1.tgz",
-      "integrity": "sha512-G+UJeQx9AKBHRQBpmvr8T/3K5bJa485eu+4tQBxFq0KoT22+jJyzo1B50JDT9QdC1DEmWQfdKsa8ybiNWYsi0Q==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.4.0.tgz",
+      "integrity": "sha512-iDPJArf/K2sxvjOR6skeUCNgHR/tCQXBsa+ee1/clRKr3olZjZ/dSkXPZjG6YkPtnW6p5D1egeEPMCW6Gn4yLA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.2.1",
-        "@typescript-eslint/visitor-keys": "6.2.1",
+        "@typescript-eslint/types": "6.4.0",
+        "@typescript-eslint/visitor-keys": "6.4.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -903,17 +902,17 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.2.1.tgz",
-      "integrity": "sha512-eBIXQeupYmxVB6S7x+B9SdBeB6qIdXKjgQBge2J+Ouv8h9Cxm5dHf/gfAZA6dkMaag+03HdbVInuXMmqFB/lKQ==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.4.0.tgz",
+      "integrity": "sha512-BvvwryBQpECPGo8PwF/y/q+yacg8Hn/2XS+DqL/oRsOPK+RPt29h5Ui5dqOKHDlbXrAeHUTnyG3wZA0KTDxRZw==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "@types/json-schema": "^7.0.12",
         "@types/semver": "^7.5.0",
-        "@typescript-eslint/scope-manager": "6.2.1",
-        "@typescript-eslint/types": "6.2.1",
-        "@typescript-eslint/typescript-estree": "6.2.1",
+        "@typescript-eslint/scope-manager": "6.4.0",
+        "@typescript-eslint/types": "6.4.0",
+        "@typescript-eslint/typescript-estree": "6.4.0",
         "semver": "^7.5.4"
       },
       "engines": {
@@ -928,12 +927,12 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.2.1.tgz",
-      "integrity": "sha512-iTN6w3k2JEZ7cyVdZJTVJx2Lv7t6zFA8DCrJEHD2mwfc16AEvvBWVhbFh34XyG2NORCd0viIgQY1+u7kPI0WpA==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.0.tgz",
+      "integrity": "sha512-yJSfyT+uJm+JRDWYRYdCm2i+pmvXJSMtPR9Cq5/XQs4QIgNoLcoRtDdzsLbLsFM/c6um6ohQkg/MLxWvoIndJA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.2.1",
+        "@typescript-eslint/types": "6.4.0",
         "eslint-visitor-keys": "^3.4.1"
       },
       "engines": {
@@ -945,9 +944,9 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/eslint-visitor-keys": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
-      "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==",
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -5718,12 +5717,6 @@
       "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
       "dev": true
     },
-    "node_modules/natural-compare-lite": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
-      "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
-      "dev": true
-    },
     "node_modules/negotiator": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
@@ -8389,49 +8382,48 @@
       "dev": true
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.2.1.tgz",
-      "integrity": "sha512-iZVM/ALid9kO0+I81pnp1xmYiFyqibAHzrqX4q5YvvVEyJqY+e6rfTXSCsc2jUxGNqJqTfFSSij/NFkZBiBzLw==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.4.0.tgz",
+      "integrity": "sha512-62o2Hmc7Gs3p8SLfbXcipjWAa6qk2wZGChXG2JbBtYpwSRmti/9KHLqfbLs9uDigOexG+3PaQ9G2g3201FWLKg==",
       "dev": true,
       "requires": {
         "@eslint-community/regexpp": "^4.5.1",
-        "@typescript-eslint/scope-manager": "6.2.1",
-        "@typescript-eslint/type-utils": "6.2.1",
-        "@typescript-eslint/utils": "6.2.1",
-        "@typescript-eslint/visitor-keys": "6.2.1",
+        "@typescript-eslint/scope-manager": "6.4.0",
+        "@typescript-eslint/type-utils": "6.4.0",
+        "@typescript-eslint/utils": "6.4.0",
+        "@typescript-eslint/visitor-keys": "6.4.0",
         "debug": "^4.3.4",
         "graphemer": "^1.4.0",
         "ignore": "^5.2.4",
         "natural-compare": "^1.4.0",
-        "natural-compare-lite": "^1.4.0",
         "semver": "^7.5.4",
         "ts-api-utils": "^1.0.1"
       },
       "dependencies": {
         "@typescript-eslint/scope-manager": {
-          "version": "6.2.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.2.1.tgz",
-          "integrity": "sha512-UCqBF9WFqv64xNsIEPfBtenbfodPXsJ3nPAr55mGPkQIkiQvgoWNo+astj9ZUfJfVKiYgAZDMnM6dIpsxUMp3Q==",
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.4.0.tgz",
+          "integrity": "sha512-TUS7vaKkPWDVvl7GDNHFQMsMruD+zhkd3SdVW0d7b+7Zo+bd/hXJQ8nsiUZMi1jloWo6c9qt3B7Sqo+flC1nig==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.2.1",
-            "@typescript-eslint/visitor-keys": "6.2.1"
+            "@typescript-eslint/types": "6.4.0",
+            "@typescript-eslint/visitor-keys": "6.4.0"
           }
         },
         "@typescript-eslint/types": {
-          "version": "6.2.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.2.1.tgz",
-          "integrity": "sha512-528bGcoelrpw+sETlyM91k51Arl2ajbNT9L4JwoXE2dvRe1yd8Q64E4OL7vHYw31mlnVsf+BeeLyAZUEQtqahQ==",
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.0.tgz",
+          "integrity": "sha512-+FV9kVFrS7w78YtzkIsNSoYsnOtrYVnKWSTVXoL1761CsCRv5wpDOINgsXpxD67YCLZtVQekDDyaxfjVWUJmmg==",
           "dev": true
         },
         "@typescript-eslint/typescript-estree": {
-          "version": "6.2.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.2.1.tgz",
-          "integrity": "sha512-G+UJeQx9AKBHRQBpmvr8T/3K5bJa485eu+4tQBxFq0KoT22+jJyzo1B50JDT9QdC1DEmWQfdKsa8ybiNWYsi0Q==",
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.4.0.tgz",
+          "integrity": "sha512-iDPJArf/K2sxvjOR6skeUCNgHR/tCQXBsa+ee1/clRKr3olZjZ/dSkXPZjG6YkPtnW6p5D1egeEPMCW6Gn4yLA==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.2.1",
-            "@typescript-eslint/visitor-keys": "6.2.1",
+            "@typescript-eslint/types": "6.4.0",
+            "@typescript-eslint/visitor-keys": "6.4.0",
             "debug": "^4.3.4",
             "globby": "^11.1.0",
             "is-glob": "^4.0.3",
@@ -8440,34 +8432,34 @@
           }
         },
         "@typescript-eslint/utils": {
-          "version": "6.2.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.2.1.tgz",
-          "integrity": "sha512-eBIXQeupYmxVB6S7x+B9SdBeB6qIdXKjgQBge2J+Ouv8h9Cxm5dHf/gfAZA6dkMaag+03HdbVInuXMmqFB/lKQ==",
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.4.0.tgz",
+          "integrity": "sha512-BvvwryBQpECPGo8PwF/y/q+yacg8Hn/2XS+DqL/oRsOPK+RPt29h5Ui5dqOKHDlbXrAeHUTnyG3wZA0KTDxRZw==",
           "dev": true,
           "requires": {
             "@eslint-community/eslint-utils": "^4.4.0",
             "@types/json-schema": "^7.0.12",
             "@types/semver": "^7.5.0",
-            "@typescript-eslint/scope-manager": "6.2.1",
-            "@typescript-eslint/types": "6.2.1",
-            "@typescript-eslint/typescript-estree": "6.2.1",
+            "@typescript-eslint/scope-manager": "6.4.0",
+            "@typescript-eslint/types": "6.4.0",
+            "@typescript-eslint/typescript-estree": "6.4.0",
             "semver": "^7.5.4"
           }
         },
         "@typescript-eslint/visitor-keys": {
-          "version": "6.2.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.2.1.tgz",
-          "integrity": "sha512-iTN6w3k2JEZ7cyVdZJTVJx2Lv7t6zFA8DCrJEHD2mwfc16AEvvBWVhbFh34XyG2NORCd0viIgQY1+u7kPI0WpA==",
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.0.tgz",
+          "integrity": "sha512-yJSfyT+uJm+JRDWYRYdCm2i+pmvXJSMtPR9Cq5/XQs4QIgNoLcoRtDdzsLbLsFM/c6um6ohQkg/MLxWvoIndJA==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.2.1",
+            "@typescript-eslint/types": "6.4.0",
             "eslint-visitor-keys": "^3.4.1"
           }
         },
         "eslint-visitor-keys": {
-          "version": "3.4.2",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
-          "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==",
+          "version": "3.4.3",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+          "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
           "dev": true
         }
       }
@@ -8545,41 +8537,41 @@
       }
     },
     "@typescript-eslint/type-utils": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.2.1.tgz",
-      "integrity": "sha512-fTfCgomBMIgu2Dh2Or3gMYgoNAnQm3RLtRp+jP7A8fY+LJ2+9PNpi5p6QB5C4RSP+U3cjI0vDlI3mspAkpPVbQ==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.4.0.tgz",
+      "integrity": "sha512-TvqrUFFyGY0cX3WgDHcdl2/mMCWCDv/0thTtx/ODMY1QhEiyFtv/OlLaNIiYLwRpAxAtOLOY9SUf1H3Q3dlwAg==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/typescript-estree": "6.2.1",
-        "@typescript-eslint/utils": "6.2.1",
+        "@typescript-eslint/typescript-estree": "6.4.0",
+        "@typescript-eslint/utils": "6.4.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.0.1"
       },
       "dependencies": {
         "@typescript-eslint/scope-manager": {
-          "version": "6.2.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.2.1.tgz",
-          "integrity": "sha512-UCqBF9WFqv64xNsIEPfBtenbfodPXsJ3nPAr55mGPkQIkiQvgoWNo+astj9ZUfJfVKiYgAZDMnM6dIpsxUMp3Q==",
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.4.0.tgz",
+          "integrity": "sha512-TUS7vaKkPWDVvl7GDNHFQMsMruD+zhkd3SdVW0d7b+7Zo+bd/hXJQ8nsiUZMi1jloWo6c9qt3B7Sqo+flC1nig==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.2.1",
-            "@typescript-eslint/visitor-keys": "6.2.1"
+            "@typescript-eslint/types": "6.4.0",
+            "@typescript-eslint/visitor-keys": "6.4.0"
           }
         },
         "@typescript-eslint/types": {
-          "version": "6.2.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.2.1.tgz",
-          "integrity": "sha512-528bGcoelrpw+sETlyM91k51Arl2ajbNT9L4JwoXE2dvRe1yd8Q64E4OL7vHYw31mlnVsf+BeeLyAZUEQtqahQ==",
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.0.tgz",
+          "integrity": "sha512-+FV9kVFrS7w78YtzkIsNSoYsnOtrYVnKWSTVXoL1761CsCRv5wpDOINgsXpxD67YCLZtVQekDDyaxfjVWUJmmg==",
           "dev": true
         },
         "@typescript-eslint/typescript-estree": {
-          "version": "6.2.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.2.1.tgz",
-          "integrity": "sha512-G+UJeQx9AKBHRQBpmvr8T/3K5bJa485eu+4tQBxFq0KoT22+jJyzo1B50JDT9QdC1DEmWQfdKsa8ybiNWYsi0Q==",
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.4.0.tgz",
+          "integrity": "sha512-iDPJArf/K2sxvjOR6skeUCNgHR/tCQXBsa+ee1/clRKr3olZjZ/dSkXPZjG6YkPtnW6p5D1egeEPMCW6Gn4yLA==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.2.1",
-            "@typescript-eslint/visitor-keys": "6.2.1",
+            "@typescript-eslint/types": "6.4.0",
+            "@typescript-eslint/visitor-keys": "6.4.0",
             "debug": "^4.3.4",
             "globby": "^11.1.0",
             "is-glob": "^4.0.3",
@@ -8588,34 +8580,34 @@
           }
         },
         "@typescript-eslint/utils": {
-          "version": "6.2.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.2.1.tgz",
-          "integrity": "sha512-eBIXQeupYmxVB6S7x+B9SdBeB6qIdXKjgQBge2J+Ouv8h9Cxm5dHf/gfAZA6dkMaag+03HdbVInuXMmqFB/lKQ==",
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.4.0.tgz",
+          "integrity": "sha512-BvvwryBQpECPGo8PwF/y/q+yacg8Hn/2XS+DqL/oRsOPK+RPt29h5Ui5dqOKHDlbXrAeHUTnyG3wZA0KTDxRZw==",
           "dev": true,
           "requires": {
             "@eslint-community/eslint-utils": "^4.4.0",
             "@types/json-schema": "^7.0.12",
             "@types/semver": "^7.5.0",
-            "@typescript-eslint/scope-manager": "6.2.1",
-            "@typescript-eslint/types": "6.2.1",
-            "@typescript-eslint/typescript-estree": "6.2.1",
+            "@typescript-eslint/scope-manager": "6.4.0",
+            "@typescript-eslint/types": "6.4.0",
+            "@typescript-eslint/typescript-estree": "6.4.0",
             "semver": "^7.5.4"
           }
         },
         "@typescript-eslint/visitor-keys": {
-          "version": "6.2.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.2.1.tgz",
-          "integrity": "sha512-iTN6w3k2JEZ7cyVdZJTVJx2Lv7t6zFA8DCrJEHD2mwfc16AEvvBWVhbFh34XyG2NORCd0viIgQY1+u7kPI0WpA==",
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.0.tgz",
+          "integrity": "sha512-yJSfyT+uJm+JRDWYRYdCm2i+pmvXJSMtPR9Cq5/XQs4QIgNoLcoRtDdzsLbLsFM/c6um6ohQkg/MLxWvoIndJA==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.2.1",
+            "@typescript-eslint/types": "6.4.0",
             "eslint-visitor-keys": "^3.4.1"
           }
         },
         "eslint-visitor-keys": {
-          "version": "3.4.2",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
-          "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==",
+          "version": "3.4.3",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+          "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
           "dev": true
         }
       }
@@ -12179,12 +12171,6 @@
       "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
       "dev": true
     },
-    "natural-compare-lite": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
-      "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
-      "dev": true
-    },
     "negotiator": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
diff --git a/tests/UI/package.json b/tests/UI/package.json
index e746c7df355c5..9febeb9c3b63d 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -126,7 +126,7 @@
     "@types/libsodium-wrappers": "^0.7.10",
     "@types/mocha": "^10.0.1",
     "@types/mochawesome": "^6.2.1",
-    "@typescript-eslint/eslint-plugin": "^6.2.1",
+    "@typescript-eslint/eslint-plugin": "^6.4.0",
     "@typescript-eslint/parser": "^6.4.0",
     "babel-eslint": "^10.1.0",
     "eslint": "^8.47.0",

From 4cfa4f1ca64b87c98c3e94776d5c1865b81a9e5e Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Wed, 16 Aug 2023 12:05:43 +0200
Subject: [PATCH 0772/1030] Fix bug in uninstall and delete module

---
 .../01_installation/04_uninstallAndDeleteModule.ts            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/UI/campaigns/modules/ps_facetedsearch/01_installation/04_uninstallAndDeleteModule.ts b/tests/UI/campaigns/modules/ps_facetedsearch/01_installation/04_uninstallAndDeleteModule.ts
index c4a971bb07e6b..5de362418c984 100644
--- a/tests/UI/campaigns/modules/ps_facetedsearch/01_installation/04_uninstallAndDeleteModule.ts
+++ b/tests/UI/campaigns/modules/ps_facetedsearch/01_installation/04_uninstallAndDeleteModule.ts
@@ -149,8 +149,8 @@ describe('Faceted search module - Uninstall and delete module', async () => {
     it('should close upload module modal', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'closeModal', baseContext);
 
-      const isModalVisible = await moduleManagerPage.closeUploadModuleModal(page);
-      await expect(isModalVisible).to.be.false;
+      const isModalNotVisible = await moduleManagerPage.closeUploadModuleModal(page);
+      await expect(isModalNotVisible).to.be.true;
     });
 
     it(`should search the module '${Modules.psFacetedSearch.name}'`, async function () {

From a7716374805b522fe5b8308a2f89de6b0df3e58c Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Wed, 16 Aug 2023 12:55:30 +0200
Subject: [PATCH 0773/1030] Add useful email variables

---
 classes/PaymentModule.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php
index 63ef6ea43b9dc..b051412f1086f 100644
--- a/classes/PaymentModule.php
+++ b/classes/PaymentModule.php
@@ -672,10 +672,12 @@ public function validateOrder(
                         '{discounts}' => $cart_rules_list_html,
                         '{discounts_txt}' => $cart_rules_list_txt,
                         '{total_paid}' => Tools::getContextLocale($this->context)->formatPrice($order->total_paid, $this->context->currency->iso_code),
+                        '{total_paid_tax_excl}' => Tools::getContextLocale($this->context)->formatPrice($order->total_paid_tax_excl, $this->context->currency->iso_code),
                         '{total_shipping_tax_excl}' => Tools::getContextLocale($this->context)->formatPrice($order->total_shipping_tax_excl, $this->context->currency->iso_code),
                         '{total_shipping_tax_incl}' => Tools::getContextLocale($this->context)->formatPrice($order->total_shipping_tax_incl, $this->context->currency->iso_code),
                         '{total_tax_paid}' => Tools::getContextLocale($this->context)->formatPrice(($order->total_paid_tax_incl - $order->total_paid_tax_excl), $this->context->currency->iso_code),
                         '{recycled_packaging_label}' => $order->recyclable ? $this->trans('Yes', [], 'Shop.Theme.Global') : $this->trans('No', [], 'Shop.Theme.Global'),
+                        '{message}' => $order->getFirstMessage(),
                     ];
 
                     if (Product::getTaxCalculationMethod() == PS_TAX_EXC) {

From 9afe82910915a208536ece17e578460082303cce Mon Sep 17 00:00:00 2001
From: Kaikina <finalfantasydeadcrisis@hotmail.fr>
Date: Wed, 16 Aug 2023 13:40:06 +0200
Subject: [PATCH 0774/1030] Update Employee.php

Fix id and id_profile type assignation
---
 classes/Employee.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/Employee.php b/classes/Employee.php
index b1931b78e22f4..2a4baf18eeda6 100644
--- a/classes/Employee.php
+++ b/classes/Employee.php
@@ -332,8 +332,8 @@ public function getByEmail($email, $plaintextPassword = null, $activeOnly = true
             return false;
         }
 
-        $this->id = $result['id_employee'];
-        $this->id_profile = $result['id_profile'];
+        $this->id = (int) $result['id_employee'];
+        $this->id_profile = (int) $result['id_profile'];
         foreach ($result as $key => $value) {
             if (property_exists($this, $key)) {
                 $this->{$key} = $value;

From 56143b06bb46dd724a5bbb26a96a5950edd3b2b2 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Thu, 27 Jul 2023 18:54:04 +0200
Subject: [PATCH 0775/1030] Functional Tests : WS - Products - CRUD

---
 .../functional/WS/02_productsCRUD.ts          | 1630 +++++++++++++++++
 .../WS/{01_storesCRUD.ts => 03_storesCRUD.ts} |    0
 tests/UI/data/xml/product.ts                  |  257 +++
 .../catalog/productsV2/add/descriptionTab.ts  |   26 +
 .../BO/catalog/productsV2/add/detailsTab.ts   |   43 +
 .../pages/BO/catalog/productsV2/add/index.ts  |   76 +-
 .../BO/catalog/productsV2/add/optionsTab.ts   |   58 +
 .../BO/catalog/productsV2/add/pricingTab.ts   |   50 +-
 .../pages/BO/catalog/productsV2/add/seoTab.ts |   64 +
 .../BO/catalog/productsV2/add/shippingTab.ts  |   79 +
 .../BO/catalog/productsV2/add/stocksTab.ts    |   39 +
 tests/UI/pages/BO/catalog/productsV2/index.ts |    6 +-
 tests/UI/utils/xml.ts                         |    4 +
 tests/UI/webservices/product/productWs.ts     |  100 +
 tests/UI/webservices/product/productXml.ts    |   65 +
 15 files changed, 2489 insertions(+), 8 deletions(-)
 create mode 100644 tests/UI/campaigns/functional/WS/02_productsCRUD.ts
 rename tests/UI/campaigns/functional/WS/{01_storesCRUD.ts => 03_storesCRUD.ts} (100%)
 create mode 100644 tests/UI/data/xml/product.ts
 create mode 100644 tests/UI/pages/BO/catalog/productsV2/add/optionsTab.ts
 create mode 100644 tests/UI/pages/BO/catalog/productsV2/add/seoTab.ts
 create mode 100644 tests/UI/pages/BO/catalog/productsV2/add/shippingTab.ts
 create mode 100644 tests/UI/webservices/product/productWs.ts
 create mode 100644 tests/UI/webservices/product/productXml.ts

diff --git a/tests/UI/campaigns/functional/WS/02_productsCRUD.ts b/tests/UI/campaigns/functional/WS/02_productsCRUD.ts
new file mode 100644
index 0000000000000..aac281c7ae357
--- /dev/null
+++ b/tests/UI/campaigns/functional/WS/02_productsCRUD.ts
@@ -0,0 +1,1630 @@
+// Import utils
+import helper from '@utils/helpers';
+import testContext from '@utils/testContext';
+import xml from '@utils/xml';
+
+// Import webservices
+import productXml from '@webservices/product/productXml';
+import ProductWS from '@webservices/product/productWs';
+
+// Import commonTests
+import {addWebserviceKey, removeWebserviceKey, setWebserviceStatus} from '@commonTests/BO/advancedParameters/ws';
+import {enableEcoTaxTest, disableEcoTaxTest} from '@commonTests/BO/international/ecoTax';
+import loginCommon from '@commonTests/BO/loginBO';
+
+// Import BO pages
+import webservicePage from '@pages/BO/advancedParameters/webservice';
+import dashboardPage from '@pages/BO/dashboard';
+import productsPage from '@pages/BO/catalog/productsV2';
+import createProductsPage from '@pages/BO/catalog/productsV2/add';
+import descriptionTab from '@pages/BO/catalog/productsV2/add/descriptionTab';
+import detailsTab from '@pages/BO/catalog/productsV2/add/detailsTab';
+import optionsTab from '@pages/BO/catalog/productsV2/add/optionsTab';
+import pricingTab from '@pages/BO/catalog/productsV2/add/pricingTab';
+import seoTab from '@pages/BO/catalog/productsV2/add/seoTab';
+import shippingTab from '@pages/BO/catalog/productsV2/add/shippingTab';
+import stocksTab from '@pages/BO/catalog/productsV2/add/stocksTab';
+
+// Import data
+import {WebservicePermission} from '@data/types/webservice';
+import getProductXml from '@data/xml/product';
+
+import {expect} from 'chai';
+import type {
+  APIResponse, APIRequestContext, BrowserContext, Page,
+} from 'playwright';
+
+const baseContext: string = 'functional_WS_productsCRUD';
+
+describe('WS - Products : CRUD', async () => {
+  let apiContext: APIRequestContext;
+  let browserContext: BrowserContext;
+  let page: Page;
+  let wsKey: string = '';
+  let authorization: string = '';
+
+  const wsKeyDescription: string = 'Webservice Key - Products';
+  const wsKeyPermissions: WebservicePermission[] = [
+    {
+      resource: 'products',
+      methods: ['all'],
+    },
+  ];
+  const xmlCreate: string = getProductXml();
+  let xmlUpdate: string;
+
+  // before and after functions
+  before(async function () {
+    browserContext = await helper.createBrowserContext(this.browser);
+    page = await helper.newTab(browserContext);
+
+    apiContext = await helper.createAPIContext(global.FO.URL);
+  });
+
+  after(async () => {
+    await helper.closeBrowserContext(browserContext);
+  });
+
+  // Enable webservice
+  setWebserviceStatus(true, `${baseContext}_preTest_1`);
+
+  // Create a new webservice key
+  addWebserviceKey(wsKeyDescription, wsKeyPermissions, `${baseContext}_preTest_2`);
+
+  // Enable ecotax
+  enableEcoTaxTest(`${baseContext}_preTest_3`);
+
+  describe('Products : CRUD', () => {
+    let productNodeID: number;
+    describe('Fetch the Webservice Key', () => {
+      it('should login in BO', async function () {
+        await loginCommon.loginBO(this, page);
+      });
+
+      it('should go to \'Advanced Parameters > Webservice\' page', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'goToWebservicePage', baseContext);
+
+        await dashboardPage.goToSubMenu(
+          page,
+          dashboardPage.advancedParametersLink,
+          dashboardPage.webserviceLink,
+        );
+        await webservicePage.closeSfToolBar(page);
+
+        const pageTitle = await webservicePage.getPageTitle(page);
+        await expect(pageTitle).to.contains(webservicePage.pageTitle);
+      });
+
+      it('should filter list by key description', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'filterBeforeDelete', baseContext);
+
+        await webservicePage.resetAndGetNumberOfLines(page);
+        await webservicePage.filterWebserviceTable(
+          page,
+          'input',
+          'description',
+          wsKeyDescription,
+        );
+
+        const description = await webservicePage.getTextColumnFromTable(page, 1, 'description');
+        await expect(description).to.contains(wsKeyDescription);
+
+        wsKey = await webservicePage.getTextColumnFromTable(page, 1, 'key');
+        authorization = `Basic ${Buffer.from(`${wsKey}:`).toString('base64')}`;
+        await expect(wsKey).to.be.not.empty;
+      });
+    });
+
+    describe(`Endpoint : ${ProductWS.endpoint} - Schema : Blank `, () => {
+      let apiResponse: APIResponse;
+      let xmlResponse : string;
+
+      it('should check response status', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestBlankStatus', baseContext);
+
+        apiResponse = await ProductWS.getBlank(
+          apiContext,
+          authorization,
+        );
+        await expect(apiResponse.status()).to.eq(200);
+      });
+
+      it('should check that the blank XML can be parsed', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestBlankValid', baseContext);
+
+        xmlResponse = await apiResponse.text();
+
+        const isValidXML = xml.isValid(xmlResponse);
+        await expect(isValidXML).to.be.true;
+      });
+
+      it('should check response root node', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestBlankRootNode', baseContext);
+
+        expect(productXml.getRootNodeName(xmlResponse)).to.be.eq('prestashop');
+      });
+
+      it('should check number of node under prestashop', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestBlankChildNode', baseContext);
+
+        const rootNodes = productXml.getPrestaShopNodes(xmlResponse);
+        expect(rootNodes.length).to.be.eq(1);
+        expect(rootNodes[0].nodeName).to.be.eq('product');
+      });
+
+      it('should check each node name, attributes and has empty values', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestBlankChildNodes', baseContext);
+
+        const nodes = productXml.getProductNodes(xmlResponse);
+        expect(nodes.length).to.be.gt(0);
+
+        for (let c: number = 0; c < nodes.length; c++) {
+          const node: Element = nodes[c];
+
+          // Attributes
+          const nodeAttributes: NamedNodeMap = node.attributes;
+          expect(nodeAttributes.length).to.be.eq(0);
+
+          // Empty value
+          const isEmptyNode: boolean = xml.isEmpty(node);
+          await expect(isEmptyNode, `The node ${node.nodeName} is not empty`).to.be.true;
+        }
+      });
+    });
+
+    describe(`Endpoint : ${ProductWS.endpoint} - Schema : Synopsis `, () => {
+      let apiResponse: APIResponse;
+      let xmlResponse : string;
+
+      it('should check response status', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestSynopsisStatus', baseContext);
+
+        apiResponse = await ProductWS.getSynopsis(
+          apiContext,
+          authorization,
+        );
+        await expect(apiResponse.status()).to.eq(200);
+      });
+
+      it('should check that the synopsis XML can be parsed', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestSynopsisValid', baseContext);
+
+        xmlResponse = await apiResponse.text();
+
+        const isValidXML = xml.isValid(xmlResponse);
+        await expect(isValidXML).to.be.true;
+      });
+
+      it('should check response root node', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestSynopsisRootNode', baseContext);
+
+        expect(productXml.getRootNodeName(xmlResponse)).to.be.eq('prestashop');
+      });
+
+      it('should check number of node under prestashop', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestSynopsisChildNode', baseContext);
+
+        const rootNodes = productXml.getPrestaShopNodes(xmlResponse);
+        expect(rootNodes.length).to.be.eq(1);
+        expect(rootNodes[0].nodeName).to.be.eq('product');
+      });
+
+      it('should check each node name, attributes and has empty values', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestSynopsisChildNodes', baseContext);
+
+        const nodes = productXml.getProductNodes(xmlResponse);
+        expect(nodes.length).to.be.gt(0);
+
+        for (let c: number = 0; c < nodes.length; c++) {
+          const node: Element = nodes[c];
+
+          // Attributes
+          const nodeAttributes: NamedNodeMap = node.attributes;
+
+          if ([
+            'new',
+            'cache_default_attribute',
+            'id_default_image',
+            'id_default_combination',
+            'position_in_category',
+            'manufacturer_name',
+            'quantity',
+            'type',
+            'unit_price_ratio',
+            'associations',
+          ].includes(node.nodeName)) {
+            expect(nodeAttributes.length).to.be.gte(0);
+          } else {
+            expect(nodeAttributes.length).to.be.gte(1);
+
+            // Attribute : format
+            expect(nodeAttributes[nodeAttributes.length - 1].nodeName).to.be.eq('format');
+          }
+
+          // Empty value
+          const isEmptyNode = xml.isEmpty(node);
+          await expect(isEmptyNode, `The node ${node.nodeName} is not empty`).to.be.true;
+        }
+      });
+    });
+
+    describe(`Endpoint : ${ProductWS.endpoint} - Method : GET `, () => {
+      let apiResponse : APIResponse;
+      let xmlResponse : string;
+      let productsNode: Element[];
+
+      it('should check response status', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestGetStatus1', baseContext);
+
+        apiResponse = await ProductWS.getAll(
+          apiContext,
+          authorization,
+        );
+
+        await expect(apiResponse.status()).to.eq(200);
+      });
+
+      it('should check response root node', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestGetRootNode1', baseContext);
+
+        xmlResponse = await apiResponse.text();
+        expect(productXml.getRootNodeName(xmlResponse)).to.be.eq('prestashop');
+      });
+
+      it('should check number of node under prestashop', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestGetNodeNumber1', baseContext);
+
+        const rootNodes = productXml.getPrestaShopNodes(xmlResponse);
+        expect(rootNodes.length).to.be.eq(1);
+        expect(rootNodes[0].nodeName).to.be.eq('products');
+      });
+
+      it('should check number of nodes under Products node', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestGetNumberOfNodes1', baseContext);
+
+        productsNode = productXml.getAllProducts(xmlResponse);
+        expect(productsNode.length).to.be.gt(0);
+      });
+
+      it('should check each node name, attributes and xlink:href', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestGetCheckAll1', baseContext);
+
+        for (let c: number = 0; c < productsNode.length; c++) {
+          const productNode: Element = productsNode[c];
+          expect(productNode.nodeName).to.be.eq('product');
+
+          // Attributes
+          const productNodeAttributes: NamedNodeMap = productNode.attributes;
+          expect(productNodeAttributes.length).to.be.eq(2);
+
+          // Attribute : id
+          expect(productNodeAttributes[0].nodeName).to.be.eq('id');
+          const productNodeAttributeId = productNodeAttributes[0].nodeValue as string;
+          expect(productNodeAttributeId).to.be.eq(parseInt(productNodeAttributeId, 10).toString());
+
+          // Attribute : xlink:href
+          expect(productNodeAttributes[1].nodeName).to.be.eq('xlink:href');
+          expect(productNodeAttributes[1].nodeValue).to.be.a('string');
+        }
+      });
+    });
+
+    describe(`Endpoint : ${ProductWS.endpoint} - Method : POST `, () => {
+      describe(`Endpoint : ${ProductWS.endpoint} - Method : POST - Add Product `, () => {
+        let apiResponse: APIResponse;
+        let xmlResponse : string;
+
+        it('should check response status', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestPostStatus1', baseContext);
+
+          apiResponse = await ProductWS.add(
+            apiContext,
+            authorization,
+            xmlCreate,
+          );
+          await expect(apiResponse.status()).to.eq(201);
+        });
+
+        it('should check response root node', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestPostRootNode1', baseContext);
+
+          xmlResponse = await apiResponse.text();
+          expect(productXml.getRootNodeName(xmlResponse)).to.be.eq('prestashop');
+        });
+
+        it('should check number of node under prestashop', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestPostNodeNumber1', baseContext);
+
+          const rootNodes = productXml.getPrestaShopNodes(xmlResponse);
+          expect(rootNodes.length).to.be.eq(1);
+          expect(rootNodes[0].nodeName).to.be.eq('product');
+        });
+
+        it('should check id of the country', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestPostCheckId1', baseContext);
+
+          // Attribute : id
+          const xmlID = productXml.getAttributeValue(xmlResponse, 'id');
+          productNodeID = parseInt(xmlID, 10);
+          expect(xmlID).to.be.eq(productNodeID.toString());
+        });
+      });
+
+      describe(`Endpoint : ${ProductWS.endpoint}/{id} - Method : POST - Check with WS `, () => {
+        let apiResponse: APIResponse;
+        let xmlResponse : string;
+        let productsNodes: Element[];
+
+        it('should check response status', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestGetIDStatus', baseContext);
+
+          apiResponse = await ProductWS.getById(
+            apiContext,
+            authorization,
+            productNodeID.toString(),
+          );
+
+          await expect(apiResponse.status()).to.eq(200);
+        });
+
+        it('should check response root node', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestGetIDRootNode1', baseContext);
+
+          xmlResponse = await apiResponse.text();
+          expect(productXml.getRootNodeName(xmlResponse)).to.be.eq('prestashop');
+        });
+
+        it('should check number of node under prestashop', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestGetIDNodeNumber1', baseContext);
+
+          const rootNodes = productXml.getPrestaShopNodes(xmlResponse);
+          expect(rootNodes.length).to.be.eq(1);
+          expect(rootNodes[0].nodeName).to.be.eq('product');
+        });
+
+        it('should check number of nodes under Products node', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestGetIDNumberOfNodes1', baseContext);
+
+          productsNodes = productXml.getProductNodes(xmlResponse);
+          expect(productsNodes.length).to.be.gt(0);
+        });
+
+        it('should check each node id, name ...', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestGetIDCheckAll', baseContext);
+
+          // Check nodes are equal to them done in Create
+          for (let o: number = 0; o < productsNodes.length; o++) {
+            const oNode: Element = productsNodes[o];
+
+            if (['manufacturer_name', 'quantity', 'date_add', 'date_upd'].includes(oNode.nodeName)) {
+              // It can be defined in POST/PUT
+            } else if (oNode.nodeName === 'id') {
+              expect(oNode.textContent).to.be.eq(productNodeID.toString());
+            } else if ([
+              'name',
+              'delivery_in_stock',
+              'delivery_out_stock',
+              'meta_description',
+              'meta_keywords',
+              'meta_title',
+              'link_rewrite',
+              'description',
+              'description_short',
+              'available_now',
+              'available_later',
+            ].includes(oNode.nodeName)) {
+              const objectNodeValueEN = productXml.getAttributeLangValue(
+                xmlResponse,
+                oNode.nodeName,
+                '1',
+              );
+
+              const createNodeValueEN = productXml.getAttributeLangValue(
+                xmlCreate,
+                oNode.nodeName,
+                '1',
+              );
+              expect(objectNodeValueEN).to.be.eq(createNodeValueEN);
+
+              const objectNodeValueFR = productXml.getAttributeLangValue(
+                xmlResponse,
+                oNode.nodeName,
+                '2',
+              );
+              const createNodeValueFR = productXml.getAttributeLangValue(
+                xmlCreate,
+                oNode.nodeName,
+                '2',
+              );
+              expect(objectNodeValueFR).to.be.eq(createNodeValueFR);
+            } else if (oNode.nodeName === 'new') {
+              // @todo : https://github.com/PrestaShop/PrestaShop/issues/33429
+            } else if (oNode.nodeName === 'position_in_category') {
+              // @todo : https://github.com/PrestaShop/PrestaShop/issues/14903
+            } else if (oNode.nodeName === 'associations') {
+              // Don't check all associations at the moment
+            } else {
+              const objectNodeValue: string = productXml.getAttributeValue(
+                xmlCreate,
+                oNode.nodeName,
+              );
+              expect(oNode.textContent).to.be.eq(objectNodeValue);
+            }
+          }
+        });
+      });
+
+      describe(`Endpoint : ${ProductWS.endpoint} - Method : POST - Check On BO `, () => {
+        describe('Product Page : Filter & Edit', () => {
+          it('should go to \'Catalog > Products\' page', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'goToProductsPageAfterPost', baseContext);
+
+            await dashboardPage.goToSubMenu(
+              page,
+              dashboardPage.catalogParentLink,
+              dashboardPage.productsLink,
+            );
+            await productsPage.closeSfToolBar(page);
+
+            const pageTitle = await productsPage.getPageTitle(page);
+            await expect(pageTitle).to.contains(productsPage.pageTitle);
+          });
+
+          it('should filter product by ID', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'filterToUpdateAfterPost', baseContext);
+
+            // Filter
+            await productsPage.resetFilter(page);
+            await productsPage.filterProducts(
+              page,
+              'id_product',
+              {min: productNodeID, max: productNodeID},
+              'input',
+            );
+
+            // Check number of Products
+            const numberOfProductsAfterFilter = await productsPage.getNumberOfProductsFromList(page);
+            await expect(numberOfProductsAfterFilter).to.be.eq(1);
+
+            const textColumn = await productsPage.getTextColumn(page, 'id_product', 1);
+            await expect(textColumn).to.eq(productNodeID);
+          });
+
+          it('should go to edit product page', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'goToEditProductPageAfterPost', baseContext);
+
+            await productsPage.goToProductPage(page, 1);
+
+            const pageTitle: string = await createProductsPage.getPageTitle(page);
+            await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+          });
+        });
+
+        describe('Main Tab', () => {
+          it('should check active', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckProductActive', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlCreate, 'active');
+            const value = (await createProductsPage.getProductStatus(page)) ? '1' : '0';
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check type', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckProductType', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlCreate, 'product_type');
+            const value = (await createProductsPage.getProductType(page));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check name', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckName', baseContext);
+
+            const xmlValueEn = productXml.getAttributeLangValue(xmlCreate, 'name', '1');
+            const valueEn = (await createProductsPage.getProductName(page, 1));
+            expect(valueEn).to.be.eq(xmlValueEn);
+
+            const xmlValueFr = productXml.getAttributeLangValue(xmlCreate, 'name', '2');
+            const valueFr = (await createProductsPage.getProductName(page, 2));
+            expect(valueFr).to.be.eq(xmlValueFr);
+          });
+        });
+
+        describe('Description Tab', () => {
+          it('should check short description', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckShortDescription', baseContext);
+
+            const xmlValueEn = productXml.getAttributeLangValue(xmlCreate, 'description_short', '1');
+            const valueEn = (await descriptionTab.getValue(page, 'summary', '1'));
+            expect(valueEn).to.be.eq(xmlValueEn);
+
+            const xmlValueFr = productXml.getAttributeLangValue(xmlCreate, 'description_short', '2');
+            const valueFr = (await descriptionTab.getValue(page, 'summary', '2'));
+            expect(valueFr).to.be.eq(xmlValueFr);
+          });
+          it('should check description', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckDescription', baseContext);
+
+            const xmlValueEn = productXml.getAttributeLangValue(xmlCreate, 'description', '1');
+            const valueEn = (await descriptionTab.getValue(page, 'description', '1'));
+            expect(valueEn).to.be.eq(xmlValueEn);
+
+            const xmlValueFr = productXml.getAttributeLangValue(xmlCreate, 'description', '2');
+            const valueFr = (await descriptionTab.getValue(page, 'description', '2'));
+            expect(valueFr).to.be.eq(xmlValueFr);
+          });
+          it('should check default category', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckDefaultCategory', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlCreate, 'id_category_default');
+            const value = (await descriptionTab.getValue(page, 'id_category_default', '1'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check manufacturer', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckManufacturer', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlCreate, 'id_manufacturer');
+            const value = (await descriptionTab.getValue(page, 'manufacturer', '1'));
+            expect(value).to.be.eq(xmlValue);
+          });
+        });
+
+        describe('Details Tab', () => {
+          it('should go to details tab', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postGoToDetailsTab', baseContext);
+
+            await createProductsPage.goToTab(page, 'details');
+
+            const isTabActive = await createProductsPage.isTabActive(page, 'details');
+            await expect(isTabActive).to.be.true;
+          });
+          it('should check reference', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckReference', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlCreate, 'reference');
+            const value = (await detailsTab.getValue(page, 'reference'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check MPN', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckMPN', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlCreate, 'mpn');
+            const value = (await detailsTab.getValue(page, 'mpn'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check UPC', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckUPC', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlCreate, 'upc');
+            const value = (await detailsTab.getValue(page, 'upc'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check EAN13', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckEAN13', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlCreate, 'ean13');
+            const value = (await detailsTab.getValue(page, 'ean13'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check ISBN', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckISBN', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlCreate, 'isbn');
+            const value = (await detailsTab.getValue(page, 'isbn'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check "Display condition on product page"', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckShowCondition', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlCreate, 'show_condition');
+            const value = (await detailsTab.getValue(page, 'show_condition'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check condition', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckCondition', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlCreate, 'condition');
+            const value = (await detailsTab.getValue(page, 'condition'));
+            expect(value).to.be.eq(xmlValue);
+          });
+        });
+
+        describe('Stocks Tab', () => {
+          it('should go to Stocks tab', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postGoToStocksTab', baseContext);
+
+            await createProductsPage.goToTab(page, 'stock');
+
+            const isTabActive = await createProductsPage.isTabActive(page, 'stock');
+            await expect(isTabActive).to.be.true;
+          });
+          it('should check Minimum quantity for sale', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckMinimalQuantity', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlCreate, 'minimal_quantity');
+            const value = (await stocksTab.getValue(page, 'minimal_quantity'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          // @todo : https://github.com/PrestaShop/PrestaShop/issues/33455
+          it.skip('should check Receive a low stock alert by email', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckLowStockAlert', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlCreate, 'low_stock_alert');
+            const value = (await stocksTab.getValue(page, 'low_stock_threshold_enabled'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check the low stock alert by email', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckLowStockThreshold', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlCreate, 'low_stock_threshold');
+            const value = (await stocksTab.getValue(page, 'low_stock_threshold'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check Label when in stock', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckLabelAvailableNow', baseContext);
+
+            const xmlValueEn = productXml.getAttributeLangValue(xmlCreate, 'available_now', '1');
+            const valueEn = (await stocksTab.getValue(page, 'available_now', '1'));
+            expect(valueEn).to.be.eq(xmlValueEn);
+
+            const xmlValueFr = productXml.getAttributeLangValue(xmlCreate, 'available_now', '2');
+            const valueFr = (await stocksTab.getValue(page, 'available_now', '2'));
+            expect(valueFr).to.be.eq(xmlValueFr);
+          });
+          it('should check Label when out of stock', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckLabelAvailableLater', baseContext);
+
+            const xmlValueEn = productXml.getAttributeLangValue(xmlCreate, 'available_later', '1');
+            const valueEn = (await stocksTab.getValue(page, 'available_later', '1'));
+            expect(valueEn).to.be.eq(xmlValueEn);
+
+            const xmlValueFr = productXml.getAttributeLangValue(xmlCreate, 'available_later', '2');
+            const valueFr = (await stocksTab.getValue(page, 'available_later', '2'));
+            expect(valueFr).to.be.eq(xmlValueFr);
+          });
+          it('should check Availability date', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckAvailableDate', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlCreate, 'available_date');
+            const value = (await stocksTab.getValue(page, 'available_date'));
+            expect(value).to.be.eq(xmlValue);
+          });
+        });
+
+        describe('Shipping Tab', () => {
+          it('should go to Shipping tab', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postGoToShippingTab', baseContext);
+
+            await createProductsPage.goToTab(page, 'shipping');
+
+            const isTabActive = await createProductsPage.isTabActive(page, 'shipping');
+            await expect(isTabActive).to.be.true;
+          });
+          it('should check Width', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckWidth', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlCreate, 'width');
+            const value = (await shippingTab.getValue(page, 'width'));
+            expect(value).to.be.eq(parseInt(xmlValue, 10).toString());
+          });
+          it('should check Height', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckHeight', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlCreate, 'height');
+            const value = (await shippingTab.getValue(page, 'height'));
+            expect(value).to.be.eq(parseInt(xmlValue, 10).toString());
+          });
+          it('should check Depth', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckDepth', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlCreate, 'depth');
+            const value = (await shippingTab.getValue(page, 'depth'));
+            expect(value).to.be.eq(parseInt(xmlValue, 10).toString());
+          });
+          it('should check Weight', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckWeight', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlCreate, 'weight');
+            const value = (await shippingTab.getValue(page, 'weight'));
+            expect(value).to.be.eq(parseInt(xmlValue, 10).toString());
+          });
+          it('should check Delivery time', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckDeliveryTime', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlCreate, 'additional_delivery_times');
+            const value = (await shippingTab.getValue(page, 'additional_delivery_times'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check Delivery time of in-stock products', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckDeliveryInStock', baseContext);
+
+            const xmlValueEn = productXml.getAttributeLangValue(xmlCreate, 'delivery_in_stock', '1');
+            const valueEn = (await shippingTab.getValue(page, 'delivery_in_stock', '1'));
+            expect(valueEn).to.be.eq(xmlValueEn);
+
+            const xmlValueFr = productXml.getAttributeLangValue(xmlCreate, 'delivery_in_stock', '2');
+            const valueFr = (await shippingTab.getValue(page, 'delivery_in_stock', '2'));
+            expect(valueFr).to.be.eq(xmlValueFr);
+          });
+          it('should check Delivery time of out-of-stock products with allowed orders', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckDeliveryOutStock', baseContext);
+
+            const xmlValueEn = productXml.getAttributeLangValue(xmlCreate, 'delivery_out_stock', '1');
+            const valueEn = (await shippingTab.getValue(page, 'delivery_out_stock', '1'));
+            expect(valueEn).to.be.eq(xmlValueEn);
+
+            const xmlValueFr = productXml.getAttributeLangValue(xmlCreate, 'delivery_out_stock', '2');
+            const valueFr = (await shippingTab.getValue(page, 'delivery_out_stock', '2'));
+            expect(valueFr).to.be.eq(xmlValueFr);
+          });
+          it('should check Additional shipping costs', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckShippingCost', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlCreate, 'additional_shipping_cost');
+            const value = (await shippingTab.getValue(page, 'additional_shipping_cost'));
+            expect(value).to.be.eq(xmlValue);
+          });
+        });
+
+        describe('Pricing Tab', () => {
+          it('should go to Pricing tab', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postGoToPricingTab', baseContext);
+
+            await createProductsPage.goToTab(page, 'pricing');
+
+            const isTabActive = await createProductsPage.isTabActive(page, 'pricing');
+            await expect(isTabActive).to.be.true;
+          });
+          it('should check Retail Price (tax excl.)', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckPrice', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlCreate, 'price');
+            const value = (await pricingTab.getValue(page, 'price'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check Tax Rule', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckTaxRule', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlCreate, 'id_tax_rules_group');
+            const value = (await pricingTab.getValue(page, 'id_tax_rules_group'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check Ecotax', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckEcotax', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlCreate, 'ecotax');
+            const value = (await pricingTab.getValue(page, 'ecotax'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check Cost Price', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckWholesalePrice', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlCreate, 'wholesale_price');
+            const value = (await pricingTab.getValue(page, 'wholesale_price'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check Unit Price', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckUnitPrice', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlCreate, 'unit_price');
+            const value = (await pricingTab.getValue(page, 'unit_price'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check Unity', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckUnity', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlCreate, 'unity');
+            const value = (await pricingTab.getValue(page, 'unity'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check "Display the "On sale!" flag on the product page"', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckOnSale', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlCreate, 'on_sale');
+            const value = (await pricingTab.getValue(page, 'on_sale'));
+            expect(value).to.be.eq(xmlValue);
+          });
+        });
+
+        describe('SEO Tab', () => {
+          it('should go to SEO tab', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postGoToSEOTab', baseContext);
+
+            await createProductsPage.goToTab(page, 'seo');
+
+            const isTabActive = await createProductsPage.isTabActive(page, 'seo');
+            await expect(isTabActive).to.be.true;
+          });
+          it('should check Meta title', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckMetaTitle', baseContext);
+
+            const xmlValueEn = productXml.getAttributeLangValue(xmlCreate, 'meta_title', '1');
+            const valueEn = (await seoTab.getValue(page, 'meta_title', '1'));
+            expect(valueEn).to.be.eq(xmlValueEn);
+
+            const xmlValueFr = productXml.getAttributeLangValue(xmlCreate, 'meta_title', '2');
+            const valueFr = (await seoTab.getValue(page, 'meta_title', '2'));
+            expect(valueFr).to.be.eq(xmlValueFr);
+          });
+          it('should check Meta description', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckMetaDescription', baseContext);
+
+            const xmlValueEn = productXml.getAttributeLangValue(xmlCreate, 'meta_description', '1');
+            const valueEn = (await seoTab.getValue(page, 'meta_description', '1'));
+            expect(valueEn).to.be.eq(xmlValueEn);
+
+            const xmlValueFr = productXml.getAttributeLangValue(xmlCreate, 'meta_description', '2');
+            const valueFr = (await seoTab.getValue(page, 'meta_description', '2'));
+            expect(valueFr).to.be.eq(xmlValueFr);
+          });
+          it('should check Friendly URL', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckLinkRewrite', baseContext);
+
+            const xmlValueEn = productXml.getAttributeLangValue(xmlCreate, 'link_rewrite', '1');
+            const valueEn = (await seoTab.getValue(page, 'link_rewrite', '1'));
+            expect(valueEn).to.be.eq(xmlValueEn);
+
+            const xmlValueFr = productXml.getAttributeLangValue(xmlCreate, 'link_rewrite', '2');
+            const valueFr = (await seoTab.getValue(page, 'link_rewrite', '2'));
+            expect(valueFr).to.be.eq(xmlValueFr);
+          });
+          it('should check Redirection page', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckRedirectType', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlCreate, 'redirect_type');
+            const value = (await seoTab.getValue(page, 'redirect_type', '1'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check Redirection product', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckIdTypeRedirected', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlCreate, 'id_type_redirected');
+            const value = (await seoTab.getValue(page, 'id_type_redirected', '1'));
+            expect(value).to.be.eq(xmlValue);
+          });
+        });
+
+        describe('Options Tab', () => {
+          it('should go to Options tab', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postGoToOptionsTab', baseContext);
+
+            await createProductsPage.goToTab(page, 'options');
+
+            const isTabActive = await createProductsPage.isTabActive(page, 'options');
+            await expect(isTabActive).to.be.true;
+          });
+          it('should check Visibility', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckVisibility', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlCreate, 'visibility');
+            const value = (await optionsTab.getValue(page, 'visibility'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check Available for order', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckAvailableForOrder', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlCreate, 'available_for_order');
+            const value = (await optionsTab.getValue(page, 'available_for_order'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check Show prices', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckShowPrice', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlCreate, 'show_price');
+            const value = (await optionsTab.getValue(page, 'show_price'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check Web only (not sold in your retail store)', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'postCheckOnlineOnly', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlCreate, 'online_only');
+            const value = (await optionsTab.getValue(page, 'online_only'));
+            expect(value).to.be.eq(xmlValue);
+          });
+        });
+
+        describe('Product Page : List & Reset', () => {
+          it('should go to \'Catalog > Products\' page', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'goToProductsPageBeforePut', baseContext);
+
+            await dashboardPage.goToSubMenu(
+              page,
+              dashboardPage.catalogParentLink,
+              dashboardPage.productsLink,
+            );
+            await productsPage.closeSfToolBar(page);
+
+            const pageTitle = await productsPage.getPageTitle(page);
+            await expect(pageTitle).to.contains(productsPage.pageTitle);
+          });
+
+          it('should reset all filters', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirstAfterPost', baseContext);
+
+            const numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
+            await expect(numberOfProducts).to.be.above(0);
+          });
+        });
+      });
+    });
+
+    describe(`Endpoint : ${ProductWS.endpoint} - Method : PUT `, () => {
+      describe(`Endpoint : ${ProductWS.endpoint} - Method : PUT - Update Product `, () => {
+        let apiResponse: APIResponse;
+        let xmlResponse : string;
+
+        it(`should check response status of ${ProductWS.endpoint}/{id}`, async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestPutStatus1', baseContext);
+
+          xmlUpdate = getProductXml(productNodeID.toString());
+          apiResponse = await ProductWS.update(
+            apiContext,
+            authorization,
+            productNodeID.toString(),
+            xmlUpdate,
+          );
+
+          await expect(apiResponse.status()).to.eq(200);
+        });
+
+        it('should check response root node', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestPutRootNode1', baseContext);
+
+          xmlResponse = await apiResponse.text();
+          expect(productXml.getRootNodeName(xmlResponse)).to.be.eq('prestashop');
+        });
+
+        it('should check number of node under prestashop', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestPutNodeNumber1', baseContext);
+
+          const rootNodes = productXml.getPrestaShopNodes(xmlResponse);
+          expect(rootNodes.length).to.be.eq(1);
+          expect(rootNodes[0].nodeName).to.be.eq('product');
+        });
+
+        it('should check id of the product', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestPutCheckId1', baseContext);
+
+          // Attribute : id
+          const xmlID = productXml.getAttributeValue(xmlResponse, 'id');
+          productNodeID = parseInt(xmlID, 10);
+          expect(xmlID).to.be.eq(productNodeID.toString());
+        });
+      });
+
+      describe(`Endpoint : ${ProductWS.endpoint}/{id} - Method : PUT - Check with WS `, () => {
+        let apiResponse: APIResponse;
+        let xmlResponse : string;
+        let productsNodes: Element[];
+
+        it('should check response status', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestGetPutStatus2', baseContext);
+
+          apiResponse = await ProductWS.getById(
+            apiContext,
+            authorization,
+            productNodeID.toString(),
+          );
+          await expect(apiResponse.status()).to.eq(200);
+        });
+
+        it('should check response root node', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestGetPutRootNode2', baseContext);
+
+          xmlResponse = await apiResponse.text();
+          expect(productXml.getRootNodeName(xmlResponse)).to.be.eq('prestashop');
+        });
+
+        it('should check number of node under prestashop', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestGetPutNodeNumber1', baseContext);
+
+          const rootNodes = productXml.getPrestaShopNodes(xmlResponse);
+          expect(rootNodes.length).to.be.eq(1);
+          expect(rootNodes[0].nodeName).to.be.eq('product');
+        });
+
+        it('should check number of nodes under products node', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestGetPutNumberOfNodes1', baseContext);
+
+          productsNodes = productXml.getProductNodes(xmlResponse);
+          expect(productsNodes.length).to.be.gt(0);
+        });
+
+        it('should check each node id, name ...', async function () {
+          await testContext.addContextItem(this, 'testIdentifier', 'requestEndpointProductsIdMethodGetAfterPut', baseContext);
+
+          // Check nodes are equal to them done in Create
+          for (let o: number = 0; o < productsNodes.length; o++) {
+            const oNode: Element = productsNodes[o];
+
+            if (['manufacturer_name', 'quantity', 'date_add', 'date_upd'].includes(oNode.nodeName)) {
+              // It can be defined in POST/PUT
+            } else if (oNode.nodeName === 'id') {
+              expect(oNode.textContent).to.be.eq(productNodeID.toString());
+            } else if ([
+              'name',
+              'delivery_in_stock',
+              'delivery_out_stock',
+              'meta_description',
+              'meta_keywords',
+              'meta_title',
+              'link_rewrite',
+              'description',
+              'description_short',
+              'available_now',
+              'available_later',
+            ].includes(oNode.nodeName)) {
+              const objectNodeValueEN = productXml.getAttributeLangValue(
+                xmlResponse,
+                oNode.nodeName,
+                '1',
+              );
+
+              const updateNodeValueEN = productXml.getAttributeLangValue(
+                xmlUpdate,
+                oNode.nodeName,
+                '1',
+              );
+              expect(objectNodeValueEN).to.be.eq(updateNodeValueEN);
+
+              const objectNodeValueFR = productXml.getAttributeLangValue(
+                xmlResponse,
+                oNode.nodeName,
+                '2',
+              );
+              const updateNodeValueFR = productXml.getAttributeLangValue(
+                xmlUpdate,
+                oNode.nodeName,
+                '2',
+              );
+              expect(objectNodeValueFR).to.be.eq(updateNodeValueFR);
+            } else if (oNode.nodeName === 'new') {
+              // @todo : https://github.com/PrestaShop/PrestaShop/issues/33429
+            } else if (oNode.nodeName === 'position_in_category') {
+              // @todo : https://github.com/PrestaShop/PrestaShop/issues/14903
+            } else if (oNode.nodeName === 'associations') {
+              // Don't check all associations at the moment
+            } else {
+              const objectNodeValue: string = productXml.getAttributeValue(
+                xmlUpdate,
+                oNode.nodeName,
+              );
+              expect(oNode.textContent).to.be.eq(objectNodeValue);
+            }
+          }
+        });
+      });
+
+      describe(`Endpoint : ${ProductWS.endpoint} - Method : PUT - Check On BO `, () => {
+        describe('Product Page : Filter & Edit', () => {
+          it('should filter product by ID', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'filterToUpdateAfterPut', baseContext);
+
+            // Filter
+            await productsPage.filterProducts(
+              page,
+              'id_product',
+              {min: productNodeID, max: productNodeID},
+              'input',
+            );
+
+            // Check number of Products
+            const numberOfProductsAfterFilter = await productsPage.getNumberOfProductsFromList(page);
+            await expect(numberOfProductsAfterFilter).to.be.eq(1);
+
+            const textColumn = await productsPage.getTextColumn(page, 'id_product', 1);
+            await expect(textColumn).to.eq(productNodeID);
+          });
+          it('should go to edit product page', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'goToEditProductPageAfterPut', baseContext);
+
+            await productsPage.goToProductPage(page, 1);
+
+            const pageTitle: string = await createProductsPage.getPageTitle(page);
+            await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+          });
+        });
+
+        describe('Main Tab', () => {
+          it('should check active', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckProductActive', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlUpdate, 'active');
+            const value = (await createProductsPage.getProductStatus(page)) ? '1' : '0';
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check type', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckProductType', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlUpdate, 'product_type');
+            const value = (await createProductsPage.getProductType(page));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check name', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckName', baseContext);
+
+            const xmlValueEn = productXml.getAttributeLangValue(xmlUpdate, 'name', '1');
+            const valueEn = (await createProductsPage.getProductName(page, 1));
+            expect(valueEn).to.be.eq(xmlValueEn);
+
+            const xmlValueFr = productXml.getAttributeLangValue(xmlUpdate, 'name', '2');
+            const valueFr = (await createProductsPage.getProductName(page, 2));
+            expect(valueFr).to.be.eq(xmlValueFr);
+          });
+        });
+
+        describe('Description Tab', () => {
+          it('should check short description', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckShortDescription', baseContext);
+
+            const xmlValueEn = productXml.getAttributeLangValue(xmlUpdate, 'description_short', '1');
+            const valueEn = (await descriptionTab.getValue(page, 'summary', '1'));
+            expect(valueEn).to.be.eq(xmlValueEn);
+
+            const xmlValueFr = productXml.getAttributeLangValue(xmlUpdate, 'description_short', '2');
+            const valueFr = (await descriptionTab.getValue(page, 'summary', '2'));
+            expect(valueFr).to.be.eq(xmlValueFr);
+          });
+          it('should check description', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckDescription', baseContext);
+
+            const xmlValueEn = productXml.getAttributeLangValue(xmlUpdate, 'description', '1');
+            const valueEn = (await descriptionTab.getValue(page, 'description', '1'));
+            expect(valueEn).to.be.eq(xmlValueEn);
+
+            const xmlValueFr = productXml.getAttributeLangValue(xmlUpdate, 'description', '2');
+            const valueFr = (await descriptionTab.getValue(page, 'description', '2'));
+            expect(valueFr).to.be.eq(xmlValueFr);
+          });
+          it('should check default category', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckDefaultCategory', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlUpdate, 'id_category_default');
+            const value = (await descriptionTab.getValue(page, 'id_category_default', '1'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check manufacturer', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckManufacturer', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlUpdate, 'id_manufacturer');
+            const value = (await descriptionTab.getValue(page, 'manufacturer', '1'));
+            expect(value).to.be.eq(xmlValue);
+          });
+        });
+
+        describe('Details Tab', () => {
+          it('should go to details tab', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putGoToDetailsTab', baseContext);
+
+            await createProductsPage.goToTab(page, 'details');
+
+            const isTabActive = await createProductsPage.isTabActive(page, 'details');
+            await expect(isTabActive).to.be.true;
+          });
+          it('should check reference', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckReference', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlUpdate, 'reference');
+            const value = (await detailsTab.getValue(page, 'reference'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check MPN', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckMPN', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlUpdate, 'mpn');
+            const value = (await detailsTab.getValue(page, 'mpn'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check UPC', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckUPC', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlUpdate, 'upc');
+            const value = (await detailsTab.getValue(page, 'upc'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check EAN13', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckEAN13', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlUpdate, 'ean13');
+            const value = (await detailsTab.getValue(page, 'ean13'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check ISBN', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckISBN', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlUpdate, 'isbn');
+            const value = (await detailsTab.getValue(page, 'isbn'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check "Display condition on product page"', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckShowCondition', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlUpdate, 'show_condition');
+            const value = (await detailsTab.getValue(page, 'show_condition'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check condition', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckCondition', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlUpdate, 'condition');
+            const value = (await detailsTab.getValue(page, 'condition'));
+            expect(value).to.be.eq(xmlValue);
+          });
+        });
+
+        describe('Stocks Tab', () => {
+          it('should go to Stocks tab', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putGoToStocksTab', baseContext);
+
+            await createProductsPage.goToTab(page, 'stock');
+
+            const isTabActive = await createProductsPage.isTabActive(page, 'stock');
+            await expect(isTabActive).to.be.true;
+          });
+          it('should check Minimum quantity for sale', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckMinimalQuantity', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlUpdate, 'minimal_quantity');
+            const value = (await stocksTab.getValue(page, 'minimal_quantity'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          // @todo : https://github.com/PrestaShop/PrestaShop/issues/33455
+          it.skip('should check Receive a low stock alert by email', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckLowStockAlert', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlUpdate, 'low_stock_alert');
+            const value = (await stocksTab.getValue(page, 'low_stock_threshold_enabled'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check the low stock alert by email', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckLowStockThreshold', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlUpdate, 'low_stock_threshold');
+            const value = (await stocksTab.getValue(page, 'low_stock_threshold'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check Label when in stock', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckLabelAvailableNow', baseContext);
+
+            const xmlValueEn = productXml.getAttributeLangValue(xmlUpdate, 'available_now', '1');
+            const valueEn = (await stocksTab.getValue(page, 'available_now', '1'));
+            expect(valueEn).to.be.eq(xmlValueEn);
+
+            const xmlValueFr = productXml.getAttributeLangValue(xmlUpdate, 'available_now', '2');
+            const valueFr = (await stocksTab.getValue(page, 'available_now', '2'));
+            expect(valueFr).to.be.eq(xmlValueFr);
+          });
+          it('should check Label when out of stock', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckLabelAvailableLater', baseContext);
+
+            const xmlValueEn = productXml.getAttributeLangValue(xmlUpdate, 'available_later', '1');
+            const valueEn = (await stocksTab.getValue(page, 'available_later', '1'));
+            expect(valueEn).to.be.eq(xmlValueEn);
+
+            const xmlValueFr = productXml.getAttributeLangValue(xmlUpdate, 'available_later', '2');
+            const valueFr = (await stocksTab.getValue(page, 'available_later', '2'));
+            expect(valueFr).to.be.eq(xmlValueFr);
+          });
+          it('should check Availability date', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckAvailableDate', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlUpdate, 'available_date');
+            const value = (await stocksTab.getValue(page, 'available_date'));
+            expect(value).to.be.eq(xmlValue);
+          });
+        });
+
+        describe('Shipping Tab', () => {
+          it('should go to Shipping tab', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putGoToShippingTab', baseContext);
+
+            await createProductsPage.goToTab(page, 'shipping');
+
+            const isTabActive = await createProductsPage.isTabActive(page, 'shipping');
+            await expect(isTabActive).to.be.true;
+          });
+          it('should check Width', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckWidth', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlUpdate, 'width');
+            const value = (await shippingTab.getValue(page, 'width'));
+            expect(value).to.be.eq(parseInt(xmlValue, 10).toString());
+          });
+          it('should check Height', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckHeight', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlUpdate, 'height');
+            const value = (await shippingTab.getValue(page, 'height'));
+            expect(value).to.be.eq(parseInt(xmlValue, 10).toString());
+          });
+          it('should check Depth', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckDepth', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlUpdate, 'depth');
+            const value = (await shippingTab.getValue(page, 'depth'));
+            expect(value).to.be.eq(parseInt(xmlValue, 10).toString());
+          });
+          it('should check Weight', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckWeight', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlUpdate, 'weight');
+            const value = (await shippingTab.getValue(page, 'weight'));
+            expect(value).to.be.eq(parseInt(xmlValue, 10).toString());
+          });
+          it('should check Delivery time', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckDeliveryTime', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlUpdate, 'additional_delivery_times');
+            const value = (await shippingTab.getValue(page, 'additional_delivery_times'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check Delivery time of in-stock products', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckDeliveryInStock', baseContext);
+
+            const xmlValueEn = productXml.getAttributeLangValue(xmlUpdate, 'delivery_in_stock', '1');
+            const valueEn = (await shippingTab.getValue(page, 'delivery_in_stock', '1'));
+            expect(valueEn).to.be.eq(xmlValueEn);
+
+            const xmlValueFr = productXml.getAttributeLangValue(xmlUpdate, 'delivery_in_stock', '2');
+            const valueFr = (await shippingTab.getValue(page, 'delivery_in_stock', '2'));
+            expect(valueFr).to.be.eq(xmlValueFr);
+          });
+          it('should check Delivery time of out-of-stock products with allowed orders', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckDeliveryOutStock', baseContext);
+
+            const xmlValueEn = productXml.getAttributeLangValue(xmlUpdate, 'delivery_out_stock', '1');
+            const valueEn = (await shippingTab.getValue(page, 'delivery_out_stock', '1'));
+            expect(valueEn).to.be.eq(xmlValueEn);
+
+            const xmlValueFr = productXml.getAttributeLangValue(xmlUpdate, 'delivery_out_stock', '2');
+            const valueFr = (await shippingTab.getValue(page, 'delivery_out_stock', '2'));
+            expect(valueFr).to.be.eq(xmlValueFr);
+          });
+          it('should check Additional shipping costs', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckShippingCost', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlUpdate, 'additional_shipping_cost');
+            const value = (await shippingTab.getValue(page, 'additional_shipping_cost'));
+            expect(value).to.be.eq(xmlValue);
+          });
+        });
+
+        describe('Pricing Tab', () => {
+          it('should go to Pricing tab', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putGoToPricingTab', baseContext);
+
+            await createProductsPage.goToTab(page, 'pricing');
+
+            const isTabActive = await createProductsPage.isTabActive(page, 'pricing');
+            await expect(isTabActive).to.be.true;
+          });
+          it('should check Retail Price (tax excl.)', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckPrice', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlUpdate, 'price');
+            const value = (await pricingTab.getValue(page, 'price'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check Tax Rule', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckTaxRule', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlUpdate, 'id_tax_rules_group');
+            const value = (await pricingTab.getValue(page, 'id_tax_rules_group'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check Ecotax', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckEcotax', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlUpdate, 'ecotax');
+            const value = (await pricingTab.getValue(page, 'ecotax'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check Cost Price', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckWholesalePrice', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlUpdate, 'wholesale_price');
+            const value = (await pricingTab.getValue(page, 'wholesale_price'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check Unit Price', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckUnitPrice', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlUpdate, 'unit_price');
+            const value = (await pricingTab.getValue(page, 'unit_price'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check Unity', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckUnity', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlUpdate, 'unity');
+            const value = (await pricingTab.getValue(page, 'unity'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check "Display the "On sale!" flag on the product page"', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckOnSale', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlUpdate, 'on_sale');
+            const value = (await pricingTab.getValue(page, 'on_sale'));
+            expect(value).to.be.eq(xmlValue);
+          });
+        });
+
+        describe('SEO Tab', () => {
+          it('should go to SEO tab', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putGoToSEOTab', baseContext);
+
+            await createProductsPage.goToTab(page, 'seo');
+
+            const isTabActive = await createProductsPage.isTabActive(page, 'seo');
+            await expect(isTabActive).to.be.true;
+          });
+          it('should check Meta title', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckMetaTitle', baseContext);
+
+            const xmlValueEn = productXml.getAttributeLangValue(xmlUpdate, 'meta_title', '1');
+            const valueEn = (await seoTab.getValue(page, 'meta_title', '1'));
+            expect(valueEn).to.be.eq(xmlValueEn);
+
+            const xmlValueFr = productXml.getAttributeLangValue(xmlUpdate, 'meta_title', '2');
+            const valueFr = (await seoTab.getValue(page, 'meta_title', '2'));
+            expect(valueFr).to.be.eq(xmlValueFr);
+          });
+          it('should check Meta description', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckMetaDescription', baseContext);
+
+            const xmlValueEn = productXml.getAttributeLangValue(xmlUpdate, 'meta_description', '1');
+            const valueEn = (await seoTab.getValue(page, 'meta_description', '1'));
+            expect(valueEn).to.be.eq(xmlValueEn);
+
+            const xmlValueFr = productXml.getAttributeLangValue(xmlUpdate, 'meta_description', '2');
+            const valueFr = (await seoTab.getValue(page, 'meta_description', '2'));
+            expect(valueFr).to.be.eq(xmlValueFr);
+          });
+          it('should check Friendly URL', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckLinkRewrite', baseContext);
+
+            const xmlValueEn = productXml.getAttributeLangValue(xmlUpdate, 'link_rewrite', '1');
+            const valueEn = (await seoTab.getValue(page, 'link_rewrite', '1'));
+            expect(valueEn).to.be.eq(xmlValueEn);
+
+            const xmlValueFr = productXml.getAttributeLangValue(xmlUpdate, 'link_rewrite', '2');
+            const valueFr = (await seoTab.getValue(page, 'link_rewrite', '2'));
+            expect(valueFr).to.be.eq(xmlValueFr);
+          });
+          it('should check Redirection page', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckRedirectType', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlUpdate, 'redirect_type');
+            const value = (await seoTab.getValue(page, 'redirect_type', '1'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check Redirection product', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckIdTypeRedirected', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlUpdate, 'id_type_redirected');
+            const value = (await seoTab.getValue(page, 'id_type_redirected', '1'));
+            expect(value).to.be.eq(xmlValue);
+          });
+        });
+
+        describe('Options Tab', () => {
+          it('should go to Options tab', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putGoToOptionsTab', baseContext);
+
+            await createProductsPage.goToTab(page, 'options');
+
+            const isTabActive = await createProductsPage.isTabActive(page, 'options');
+            await expect(isTabActive).to.be.true;
+          });
+          it('should check Visibility', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckVisibility', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlUpdate, 'visibility');
+            const value = (await optionsTab.getValue(page, 'visibility'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check Available for order', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckAvailableForOrder', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlUpdate, 'available_for_order');
+            const value = (await optionsTab.getValue(page, 'available_for_order'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check Show prices', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckShowPrice', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlUpdate, 'show_price');
+            const value = (await optionsTab.getValue(page, 'show_price'));
+            expect(value).to.be.eq(xmlValue);
+          });
+          it('should check Web only (not sold in your retail store)', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'putCheckOnlineOnly', baseContext);
+
+            const xmlValue = productXml.getAttributeValue(xmlUpdate, 'online_only');
+            const value = (await optionsTab.getValue(page, 'online_only'));
+            expect(value).to.be.eq(xmlValue);
+          });
+        });
+
+        describe('Product Page : List & Reset', () => {
+          it('should go to \'Catalog > Products\' page', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'goToProductsPageAfterPut', baseContext);
+
+            await dashboardPage.goToSubMenu(
+              page,
+              dashboardPage.catalogParentLink,
+              dashboardPage.productsLink,
+            );
+            await productsPage.closeSfToolBar(page);
+
+            const pageTitle = await productsPage.getPageTitle(page);
+            await expect(pageTitle).to.contains(productsPage.pageTitle);
+          });
+
+          it('should reset all filters', async function () {
+            await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirstAfterPut', baseContext);
+
+            const numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
+            await expect(numberOfProducts).to.be.above(0);
+          });
+        });
+      });
+    });
+
+    describe(`Endpoint : ${ProductWS.endpoint} - Method : DELETE `, () => {
+      it(`should request the endpoint ${ProductWS.endpoint}/{id} with method DELETE`, async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestEndpointProductsMethodDelete', baseContext);
+
+        const apiResponse = await ProductWS.delete(
+          apiContext,
+          authorization,
+          productNodeID.toString(),
+        );
+
+        await expect(apiResponse.status()).to.eq(200);
+      });
+
+      it(`should request the endpoint ${ProductWS.endpoint}/{id} with method GET`, async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'requestEndpointProductsIdMethodGetAfterDelete', baseContext);
+
+        const apiResponse = await ProductWS.getById(
+          apiContext,
+          authorization,
+          productNodeID.toString(),
+        );
+
+        await expect(apiResponse.status()).to.eq(404);
+      });
+
+      it('should filter product by ID', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'filterToUpdateAfterDelete', baseContext);
+
+        // Filter
+        await productsPage.filterProducts(
+          page,
+          'id_product',
+          {min: productNodeID, max: productNodeID},
+          'input',
+        );
+
+        // Check number of Products
+        const numberOfProductsAfterFilter = await productsPage.getNumberOfProductsFromList(page);
+        await expect(numberOfProductsAfterFilter).to.be.eq(0);
+      });
+
+      it('should reset all filters', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
+
+        const numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
+        await expect(numberOfProducts).to.be.above(0);
+      });
+    });
+  });
+
+  // Remove a new webservice key
+  removeWebserviceKey(wsKeyDescription, `${baseContext}_postTest_1`);
+
+  // Disable webservice
+  setWebserviceStatus(false, `${baseContext}_postTest_2`);
+
+  // Disable ecotax
+  disableEcoTaxTest(`${baseContext}_postTest_3`);
+});
diff --git a/tests/UI/campaigns/functional/WS/01_storesCRUD.ts b/tests/UI/campaigns/functional/WS/03_storesCRUD.ts
similarity index 100%
rename from tests/UI/campaigns/functional/WS/01_storesCRUD.ts
rename to tests/UI/campaigns/functional/WS/03_storesCRUD.ts
diff --git a/tests/UI/data/xml/product.ts b/tests/UI/data/xml/product.ts
new file mode 100644
index 0000000000000..5e682351be15d
--- /dev/null
+++ b/tests/UI/data/xml/product.ts
@@ -0,0 +1,257 @@
+/**
+ * @return string
+ */
+function getProductXmlCreate(): string {
+  return ('<?xml version="1.0" encoding="UTF-8"?>\n'
+    + '<prestashop xmlns:xlink="http://www.w3.org/1999/xlink">\n'
+    + '  <product>\n'
+    + '    <id_manufacturer>1</id_manufacturer>\n'
+    + '    <id_supplier>1</id_supplier>\n'
+    + '    <id_category_default>9</id_category_default>\n'
+    + '    <new>0</new>\n'
+    + '    <cache_default_attribute>0</cache_default_attribute>\n'
+    + '    <id_default_image><![CDATA[]]></id_default_image>\n'
+    + '    <id_default_combination>0</id_default_combination>\n'
+    + '    <id_tax_rules_group>1</id_tax_rules_group>\n'
+    // @todo : https://github.com/PrestaShop/PrestaShop/issues/14903
+    //+ '    <position_in_category>1</position_in_category>\n'
+    + '    <type><![CDATA[simple]]></type>\n'
+    + '    <id_shop_default>1</id_shop_default>\n'
+    + '    <reference><![CDATA[REFERENCE007]]></reference>\n'
+    + '    <supplier_reference>\n'
+    + '        <![CDATA[]]>\n'
+    + '    </supplier_reference>\n'
+    + '    <location>\n'
+    + '        <![CDATA[]]>\n'
+    + '    </location>\n'
+    + '    <width>123.000000</width>\n'
+    + '    <height>456.000000</height>\n'
+    + '    <depth>789.000000</depth>\n'
+    + '    <weight>1234.000000</weight>\n'
+    + '    <quantity_discount>0</quantity_discount>\n'
+    + '    <ean13><![CDATA[9782409038600]]></ean13>\n'
+    + '    <isbn><![CDATA[978-2-409-03860-0]]></isbn>\n'
+    + '    <upc><![CDATA[987654321098]]></upc>\n'
+    + '    <mpn><![CDATA[HSC0424PP]]></mpn>\n'
+    + '    <cache_is_pack><![CDATA[0]]></cache_is_pack>\n'
+    + '    <cache_has_attachments><![CDATA[0]]></cache_has_attachments>\n'
+    + '    <is_virtual><![CDATA[0]]></is_virtual>\n'
+    + '    <state><![CDATA[1]]></state>\n'
+    + '    <additional_delivery_times><![CDATA[1]]></additional_delivery_times>\n'
+    + '    <delivery_in_stock>\n'
+    + '        <language id="1"><![CDATA[Available]]></language>\n'
+    + '        <language id="2"><![CDATA[Disponible]]></language>\n'
+    + '    </delivery_in_stock>\n'
+    + '    <delivery_out_stock>\n'
+    + '        <language id="1"><![CDATA[Out of stock]]></language>\n'
+    + '        <language id="2"><![CDATA[Indisponible]]></language>\n'
+    + '    </delivery_out_stock>\n'
+    + '    <product_type><![CDATA[standard]]></product_type>\n'
+    + '    <on_sale>1</on_sale>\n'
+    + '    <online_only>1</online_only>\n'
+    + '    <ecotax><![CDATA[1.230000]]></ecotax>\n'
+    + '    <minimal_quantity>1</minimal_quantity>\n'
+    + '    <low_stock_threshold>2</low_stock_threshold>\n'
+    + '    <low_stock_alert>0</low_stock_alert>\n'
+    + '    <price><![CDATA[45.670000]]></price>\n'
+    + '    <wholesale_price><![CDATA[89.010000]]></wholesale_price>\n'
+    + '    <unity>Per kg</unity>\n'
+    + '    <unit_price><![CDATA[45.670000]]></unit_price>\n'
+    + '    <unit_price_ratio><![CDATA[1.026932]]></unit_price_ratio>\n'
+    + '    <additional_shipping_cost><![CDATA[2.340000]]></additional_shipping_cost>\n'
+    + '    <customizable><![CDATA[0]]></customizable>\n'
+    + '    <text_fields><![CDATA[0]]></text_fields>\n'
+    + '    <uploadable_files><![CDATA[0]]></uploadable_files>\n'
+    + '    <active><![CDATA[1]]></active>\n'
+    + '    <redirect_type>301-product</redirect_type>\n'
+    + '    <id_type_redirected>6</id_type_redirected>\n'
+    + '    <available_for_order>1</available_for_order>\n'
+    + '    <available_date><![CDATA[2023-02-04]]></available_date>\n'
+    + '    <show_condition><![CDATA[1]]></show_condition>\n'
+    + '    <condition><![CDATA[new]]></condition>\n'
+    + '    <show_price>1</show_price>\n'
+    + '    <indexed>1</indexed>\n'
+    + '    <visibility><![CDATA[both]]></visibility>\n'
+    + '    <advanced_stock_management>0</advanced_stock_management>\n'
+    + '    <pack_stock_type>3</pack_stock_type>\n'
+    + '    <meta_description>\n'
+    + '        <language id="1"><![CDATA[Product Meta Description]]></language>\n'
+    + '        <language id="2"><![CDATA[Meta Description du produit]]></language>\n'
+    + '    </meta_description>\n'
+    + '    <meta_keywords>\n'
+    + '        <language id="1"><![CDATA[Product Meta Keywords]]></language>\n'
+    + '        <language id="2"><![CDATA[Meta Keywords du produit]]></language>\n'
+    + '    </meta_keywords>\n'
+    + '    <meta_title>\n'
+    + '        <language id="1"><![CDATA[Product Meta Title]]></language>\n'
+    + '        <language id="2"><![CDATA[Meta Title du produit]]></language>\n'
+    + '    </meta_title>\n'
+    + '    <link_rewrite>\n'
+    + '        <language id="1"><![CDATA[product-link]]></language>\n'
+    + '        <language id="2"><![CDATA[lien-produit]]></language>\n'
+    + '    </link_rewrite>\n'
+    + '    <name>\n'
+    + '        <language id="1"><![CDATA[Product Name]]></language>\n'
+    + '        <language id="2"><![CDATA[Nom du produit]]></language>\n'
+    + '    </name>\n'
+    + '    <description>\n'
+    + '        <language id="1"><![CDATA[Product Description]]></language>\n'
+    + '        <language id="2"><![CDATA[Description du produit]]></language>\n'
+    + '    </description>\n'
+    + '    <description_short>\n'
+    + '        <language id="1"><![CDATA[Product Short Description]]></language>\n'
+    + '        <language id="2"><![CDATA[Courte Description du produit]]></language>\n'
+    + '    </description_short>\n'
+    + '    <available_now>\n'
+    + '        <language id="1"><![CDATA[Available Now]]></language>\n'
+    + '        <language id="2"><![CDATA[Disponible Maintenant]]></language>\n'
+    + '    </available_now>\n'
+    + '    <available_later>\n'
+    + '        <language id="1"><![CDATA[Available Later]]></language>\n'
+    + '        <language id="2"><![CDATA[Disponible Plus tard]]></language>\n'
+    + '    </available_later>\n'
+    + '    <associations>\n'
+    + '        <categories>\n'
+    + '            <category>\n'
+    + '                <id>9</id>\n'
+    + '            </category>\n'
+    + '        </categories>\n'
+    + '    </associations>\n'
+    + '</product>\n'
+    + '</prestashop>\n');
+}
+
+/**
+ * @param idProduct {string}
+ * @return string
+ */
+function getProductXmlUpdate(idProduct: string): string {
+  return ('<?xml version="1.0" encoding="UTF-8"?>\n'
+    + '<prestashop xmlns:xlink="http://www.w3.org/1999/xlink">\n'
+    + '  <product>\n'
+    + `    <id><![CDATA[${idProduct}]]></id>`
+    + '    <id_manufacturer>2</id_manufacturer>\n'
+    + '    <id_supplier>2</id_supplier>\n'
+    + '    <id_category_default>9</id_category_default>\n'
+    + '    <new>1</new>\n'
+    + '    <cache_default_attribute>0</cache_default_attribute>\n'
+    + '    <id_default_image><![CDATA[]]></id_default_image>\n'
+    + '    <id_default_combination>0</id_default_combination>\n'
+    + '    <id_tax_rules_group>2</id_tax_rules_group>\n'
+    // @todo : https://github.com/PrestaShop/PrestaShop/issues/14903
+    //+ '    <position_in_category>2</position_in_category>\n'
+    + '    <type><![CDATA[simple]]></type>\n'
+    + '    <id_shop_default>1</id_shop_default>\n'
+    + '    <reference><![CDATA[UPDATEREFERENCE007]]></reference>\n'
+    + '    <supplier_reference><![CDATA[]]></supplier_reference>\n'
+    + '    <location><![CDATA[]]></location>\n'
+    + '    <width>456.000000</width>\n'
+    + '    <height>789.000000</height>\n'
+    + '    <depth>123.000000</depth>\n'
+    + '    <weight>4567.000000</weight>\n'
+    + '    <quantity_discount>0</quantity_discount>\n'
+    + '    <ean13><![CDATA[9782409038600]]></ean13>\n'
+    + '    <isbn><![CDATA[978-1-837-63596-2]]></isbn>\n'
+    + '    <upc><![CDATA[987654321098]]></upc>\n'
+    + '    <mpn><![CDATA[ABC1234DE]]></mpn>\n'
+    + '    <cache_is_pack><![CDATA[0]]></cache_is_pack>\n'
+    + '    <cache_has_attachments><![CDATA[0]]></cache_has_attachments>\n'
+    + '    <is_virtual><![CDATA[0]]></is_virtual>\n'
+    + '    <state><![CDATA[1]]></state>\n'
+    + '    <additional_delivery_times><![CDATA[0]]></additional_delivery_times>\n'
+    + '    <delivery_in_stock>\n'
+    + '        <language id="1"><![CDATA[Update Available]]></language>\n'
+    + '        <language id="2"><![CDATA[Update Disponible]]></language>\n'
+    + '    </delivery_in_stock>\n'
+    + '    <delivery_out_stock>\n'
+    + '        <language id="1"><![CDATA[Update Out of stock]]></language>\n'
+    + '        <language id="2"><![CDATA[Update Indisponible]]></language>\n'
+    + '    </delivery_out_stock>\n'
+    + '    <product_type><![CDATA[standard]]></product_type>\n'
+    + '    <on_sale>1</on_sale>\n'
+    + '    <online_only>0</online_only>\n'
+    + '    <ecotax><![CDATA[4.560000]]></ecotax>\n'
+    + '    <minimal_quantity>2</minimal_quantity>\n'
+    + '    <low_stock_threshold>2</low_stock_threshold>\n'
+    + '    <low_stock_alert>1</low_stock_alert>\n'
+    + '    <price><![CDATA[89.010000]]></price>\n'
+    + '    <wholesale_price><![CDATA[234.560000]]></wholesale_price>\n'
+    + '    <unity>Per unit</unity>\n'
+    + '    <unit_price><![CDATA[78.900000]]></unit_price>\n'
+    + '    <unit_price_ratio><![CDATA[1.185931]]></unit_price_ratio>\n'
+    + '    <additional_shipping_cost><![CDATA[5.670000]]></additional_shipping_cost>\n'
+    + '    <customizable><![CDATA[0]]></customizable>\n'
+    + '    <text_fields><![CDATA[0]]></text_fields>\n'
+    + '    <uploadable_files><![CDATA[0]]></uploadable_files>\n'
+    + '    <active><![CDATA[0]]></active>\n'
+    + '    <redirect_type>301-product</redirect_type>\n'
+    + '    <id_type_redirected>12</id_type_redirected>\n'
+    + '    <available_for_order>1</available_for_order>\n'
+    + '    <available_date><![CDATA[2023-03-06]]></available_date>\n'
+    + '    <show_condition><![CDATA[0]]></show_condition>\n'
+    + '    <condition><![CDATA[new]]></condition>\n'
+    + '    <show_price>0</show_price>\n'
+    + '    <indexed>0</indexed>\n'
+    + '    <visibility><![CDATA[both]]></visibility>\n'
+    + '    <advanced_stock_management>0</advanced_stock_management>\n'
+    + '    <date_add><![CDATA[2023-01-02 03:45:06]]></date_add>\n'
+    + '    <date_upd><![CDATA[2023-01-02 03:45:06]]></date_upd>\n'
+    + '    <pack_stock_type>3</pack_stock_type>\n'
+    + '    <meta_description>\n'
+    + '        <language id="1"><![CDATA[Update Product Meta Description]]></language>\n'
+    + '        <language id="2"><![CDATA[Update Meta Description du produit]]></language>\n'
+    + '    </meta_description>\n'
+    + '    <meta_keywords>\n'
+    + '        <language id="1"><![CDATA[Update Product Meta Keywords]]></language>\n'
+    + '        <language id="2"><![CDATA[Update Meta Keywords du produit]]></language>\n'
+    + '    </meta_keywords>\n'
+    + '    <meta_title>\n'
+    + '        <language id="1"><![CDATA[Update Product Meta Title]]></language>\n'
+    + '        <language id="2"><![CDATA[Update Meta Title du produit]]></language>\n'
+    + '    </meta_title>\n'
+    + '    <link_rewrite>\n'
+    + '        <language id="1"><![CDATA[update-product-link]]></language>\n'
+    + '        <language id="2"><![CDATA[update-lien-produit]]></language>\n'
+    + '    </link_rewrite>\n'
+    + '    <name>\n'
+    + '        <language id="1"><![CDATA[Update Product Name]]></language>\n'
+    + '        <language id="2"><![CDATA[Update Nom du produit]]></language>\n'
+    + '    </name>\n'
+    + '    <description>\n'
+    + '        <language id="1"><![CDATA[Update Product Description]]></language>\n'
+    + '        <language id="2"><![CDATA[Update Description du produit]]></language>\n'
+    + '    </description>\n'
+    + '    <description_short>\n'
+    + '        <language id="1"><![CDATA[Update Product Short Description]]></language>\n'
+    + '        <language id="2"><![CDATA[Update Courte Description du produit]]></language>\n'
+    + '    </description_short>\n'
+    + '    <available_now>\n'
+    + '        <language id="1"><![CDATA[Update Available Now]]></language>\n'
+    + '        <language id="2"><![CDATA[Update Disponible Maintenant]]></language>\n'
+    + '    </available_now>\n'
+    + '    <available_later>\n'
+    + '        <language id="1"><![CDATA[Update Available Later]]></language>\n'
+    + '        <language id="2"><![CDATA[Update Disponible Plus tard]]></language>\n'
+    + '    </available_later>\n'
+    + '    <associations>\n'
+    + '        <categories>\n'
+    + '            <category>\n'
+    + '                <id>9</id>\n'
+    + '            </category>\n'
+    + '        </categories>\n'
+    + '    </associations>\n'
+    + '  </product>\n'
+    + '</prestashop>\n');
+}
+
+/**
+ * Get xml of product to put on POST/PUT request
+ * @param idProduct {string|null}
+ */
+export default function getProductXml(idProduct : string | null = null): string {
+  if (idProduct) {
+    return getProductXmlUpdate(idProduct);
+  }
+
+  return getProductXmlCreate();
+}
diff --git a/tests/UI/pages/BO/catalog/productsV2/add/descriptionTab.ts b/tests/UI/pages/BO/catalog/productsV2/add/descriptionTab.ts
index 2ff7cff65714d..9e4c4ff3ce7a0 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/descriptionTab.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/descriptionTab.ts
@@ -25,6 +25,10 @@ class DescriptionTab extends BOBasePage {
 
   private readonly productDescription: string;
 
+  private readonly productDefaultCategory: string;
+
+  private readonly productManufacturer: string;
+
   /**
    * @constructs
    * Setting up texts and selectors to use on description tab
@@ -40,6 +44,8 @@ class DescriptionTab extends BOBasePage {
     this.imagePreviewCover = `${this.productImageDropZoneDiv} div.dz-preview.is-cover`;
     this.productSummary = '#product_description_description_short';
     this.productDescription = '#product_description_description';
+    this.productDefaultCategory = '#product_description_categories_default_category_id';
+    this.productManufacturer = '#product_description_manufacturer';
   }
 
   /*
@@ -117,6 +123,26 @@ class DescriptionTab extends BOBasePage {
   async getProductIDImageCover(page: Page): Promise<number> {
     return parseInt(await page.getAttribute(this.imagePreviewCover, 'data-id') ?? '', 10);
   }
+
+  /**
+   * @param page {Page}
+   * @param inputName {string}
+   * @param languageId {string | undefined}
+   */
+  async getValue(page: Page, inputName: string, languageId?: string): Promise<string> {
+    switch (inputName) {
+      case 'description':
+        return this.getTextContent(page, `${this.productDescription}_${languageId}`, false);
+      case 'id_category_default':
+        return page.$eval(this.productDefaultCategory, (node: HTMLSelectElement) => node.value);
+      case 'manufacturer':
+        return page.$eval(this.productManufacturer, (node: HTMLSelectElement) => node.value);
+      case 'summary':
+        return this.getTextContent(page, `${this.productSummary}_${languageId}`, false);
+      default:
+        throw new Error(`Input ${inputName} was not found`);
+    }
+  }
 }
 
 export default new DescriptionTab();
diff --git a/tests/UI/pages/BO/catalog/productsV2/add/detailsTab.ts b/tests/UI/pages/BO/catalog/productsV2/add/detailsTab.ts
index 60b239b6dbf25..5ca975cec650d 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/detailsTab.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/detailsTab.ts
@@ -13,8 +13,20 @@ import BOBasePage from '@pages/BO/BObasePage';
 class DetailsTab extends BOBasePage {
   private readonly detailsTabLink: string;
 
+  private readonly productEAN13Input: string;
+
+  private readonly productISBNInput: string;
+
+  private readonly productMPNInput: string;
+
   private readonly productReferenceInput: string;
 
+  private readonly productUPCInput: string;
+
+  private readonly productShowCondition: string;
+
+  private readonly productConditionInput: string;
+
   /**
    * @constructs
    * Setting up texts and selectors to use on details tab
@@ -24,7 +36,13 @@ class DetailsTab extends BOBasePage {
 
     // Selectors in details tab
     this.detailsTabLink = '#product_details-tab-nav';
+    this.productEAN13Input = '#product_details_references_ean_13';
+    this.productISBNInput = '#product_details_references_isbn';
+    this.productMPNInput = '#product_details_references_mpn';
     this.productReferenceInput = '#product_details_references_reference';
+    this.productUPCInput = '#product_details_references_upc';
+    this.productShowCondition = '#product_details_show_condition_1';
+    this.productConditionInput = '#product_details_condition';
   }
 
   /*
@@ -41,6 +59,31 @@ class DetailsTab extends BOBasePage {
     await this.waitForSelectorAndClick(page, this.detailsTabLink);
     await this.setValue(page, this.productReferenceInput, productData.reference);
   }
+
+  /**
+   * @param page {Page}
+   * @param inputName {string}
+   */
+  async getValue(page: Page, inputName: string): Promise<string> {
+    switch (inputName) {
+      case 'condition':
+        return page.$eval(this.productConditionInput, (node: HTMLSelectElement) => node.value);
+      case 'mpn':
+        return this.getAttributeContent(page, this.productMPNInput, 'value');
+      case 'reference':
+        return this.getAttributeContent(page, this.productReferenceInput, 'value');
+      case 'upc':
+        return this.getAttributeContent(page, this.productUPCInput, 'value');
+      case 'ean13':
+        return this.getAttributeContent(page, this.productEAN13Input, 'value');
+      case 'isbn':
+        return this.getAttributeContent(page, this.productISBNInput, 'value');
+      case 'show_condition':
+        return (await this.isChecked(page, this.productShowCondition)) ? '1' : '0';
+      default:
+        throw new Error(`Input ${inputName} was not found`);
+    }
+  }
 }
 
 export default new DetailsTab();
diff --git a/tests/UI/pages/BO/catalog/productsV2/add/index.ts b/tests/UI/pages/BO/catalog/productsV2/add/index.ts
index 1f6bbe9f0edbd..f03d048983f87 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/index.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/index.ts
@@ -25,7 +25,9 @@ class CreateProduct extends BOBasePage {
 
   public readonly successfulDuplicateMessage: string;
 
-  private readonly productNameInput: string;
+  private readonly productNameInput: (languageId: number) => string;
+
+  private readonly productTypeLabel: string;
 
   private readonly productActiveSwitchButton: string;
 
@@ -63,6 +65,8 @@ class CreateProduct extends BOBasePage {
 
   private readonly formProductPage: string;
 
+  private readonly tabLink: (tabName: string) => string;
+
   /**
    * @constructs
    * Setting up texts and selectors to use on products V2 page
@@ -75,7 +79,8 @@ class CreateProduct extends BOBasePage {
     this.successfulDuplicateMessage = 'Successful duplication';
 
     // Header selectors
-    this.productNameInput = '#product_header_name_1';
+    this.productNameInput = (languageId: number) => `#product_header_name_${languageId}`;
+    this.productTypeLabel = '.product-type-preview-label';
     this.productActiveSwitchButton = '#product_header_active_1';
     this.productHeaderSummary = '.product-header-summary';
     this.productHeaderTaxExcluded = `${this.productHeaderSummary} div[data-role=price-tax-excluded]`;
@@ -100,6 +105,9 @@ class CreateProduct extends BOBasePage {
 
     // Form
     this.formProductPage = 'form.product-page';
+
+    // Tab
+    this.tabLink = (tabName: string) => `#product_${tabName}-tab-nav`;
   }
 
   /*
@@ -145,7 +153,7 @@ class CreateProduct extends BOBasePage {
    * @returns {Promise<string>}
    */
   async setProduct(page: Page, productData: ProductData): Promise<string> {
-    await this.setValue(page, this.productNameInput, productData.name);
+    await this.setValue(page, this.productNameInput(1), productData.name);
 
     await descriptionTab.setProductDescription(page, productData);
 
@@ -275,6 +283,68 @@ class CreateProduct extends BOBasePage {
   async isChooseProductIframeVisible(page: Page): Promise<boolean> {
     return !(await this.elementNotVisible(page, `${productsPage.modalCreateProduct} iframe`, 1000));
   }
+
+  /**
+   * Go to a tab
+   * @param page {Page} Browser tab
+   * @param tabName {'description'|'details'|'options'|'pricing'|'seo'|'shipping'|'stock'} Name of the tab
+   * @returns {Promise<void>}
+   */
+  async goToTab(page: Page, tabName: 'description'|'details'|'options'|'pricing'|'seo'|'shipping'|'stock') : Promise<void> {
+    await this.waitForSelectorAndClick(page, this.tabLink(tabName));
+    await this.waitForVisibleSelector(page, `${this.tabLink(tabName)} a.active`, 2000);
+  }
+
+  /**
+   * Is Tab active
+   * @param page {Page} Browser tab
+   * @param tabName {'description'|'details'|'options'|'pricing'|'seo'|'shipping'|'stock'} Name of the tab
+   * @returns {Promise<boolean>}
+   */
+  async isTabActive(page: Page, tabName: 'description'|'details'|'options'|'pricing'|'seo'|'shipping'|'stock'): Promise<boolean> {
+    return this.elementVisible(page, `${this.tabLink(tabName)} a.active`, 2000);
+  }
+
+  /**
+   * Return the product type
+   * @param page {Page} Browser tab
+   * @returns {Promise<string>}
+   */
+  async getProductType(page: Page): Promise<string> {
+    const typeLabel = await this.getTextContent(page, this.productTypeLabel);
+
+    switch (typeLabel) {
+      case 'Standard product':
+        return 'standard';
+      case 'Product with combinations':
+        return 'combinations';
+      case 'Pack of products':
+        return 'pack';
+      case 'Virtual product':
+        return 'virtual';
+      default:
+        throw new Error(`Type ${typeLabel} is not defined`);
+    }
+  }
+
+  /**
+   * Return the product name
+   * @param page {Page} Browser tab
+   * @param languageId {number} Language ID
+   * @returns {Promise<string>}
+   */
+  async getProductName(page: Page, languageId: number = 1): Promise<string> {
+    return this.getAttributeContent(page, this.productNameInput(languageId), 'value');
+  }
+
+  /**
+   * Get product status
+   * @param page {Page} Browser tab
+   * @returns {Promise<boolean>}
+   */
+  async getProductStatus(page: Page): Promise<boolean> {
+    return this.isChecked(page, this.productActiveSwitchButton);
+  }
 }
 
 export default new CreateProduct();
diff --git a/tests/UI/pages/BO/catalog/productsV2/add/optionsTab.ts b/tests/UI/pages/BO/catalog/productsV2/add/optionsTab.ts
new file mode 100644
index 0000000000000..efeb6f5db95c3
--- /dev/null
+++ b/tests/UI/pages/BO/catalog/productsV2/add/optionsTab.ts
@@ -0,0 +1,58 @@
+// Import pages
+import BOBasePage from '@pages/BO/BObasePage';
+
+import type {Page} from 'playwright';
+
+/**
+ * Options tab on new product V2 page, contains functions that can be used on the page
+ * @class
+ * @extends BOBasePage
+ */
+class OptionsTab extends BOBasePage {
+  private readonly productVisibilityRadio: string;
+
+  private readonly productAvailableForOrderRadio: string;
+
+  private readonly productShowPricesRadio: string;
+
+  private readonly productOnlineOnlyRadio: string;
+
+  /**
+   * @constructs
+   * Setting up texts and selectors to use on Shipping tab
+   */
+  constructor() {
+    super();
+
+    // Selectors in stocks tab
+    this.productVisibilityRadio = 'input[name="product[options][visibility][visibility]"]';
+    this.productAvailableForOrderRadio = '#product_options_visibility_available_for_order_1';
+    this.productShowPricesRadio = '#product_options_visibility_show_price_1';
+    this.productOnlineOnlyRadio = '#product_options_visibility_online_only_1';
+  }
+
+  /*
+  Methods
+   */
+
+  /**
+   * @param page {Page}
+   * @param inputName {string}
+   */
+  async getValue(page: Page, inputName: string): Promise<string> {
+    switch (inputName) {
+      case 'available_for_order':
+        return (await this.isChecked(page, this.productAvailableForOrderRadio)) ? '1' : '0';
+      case 'online_only':
+        return (await this.isChecked(page, this.productShowPricesRadio)) ? '1' : '0';
+      case 'show_price':
+        return (await this.isChecked(page, this.productShowPricesRadio)) ? '1' : '0';
+      case 'visibility':
+        return this.getAttributeContent(page, `${this.productVisibilityRadio}[checked="checked"]`, 'value');
+      default:
+        throw new Error(`Input ${inputName} was not found`);
+    }
+  }
+}
+
+export default new OptionsTab();
diff --git a/tests/UI/pages/BO/catalog/productsV2/add/pricingTab.ts b/tests/UI/pages/BO/catalog/productsV2/add/pricingTab.ts
index a26638188f270..dcf0c69a32c21 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/pricingTab.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/pricingTab.ts
@@ -16,10 +16,24 @@ class PricingTab extends BOBasePage {
 
   private readonly retailPriceInput: string;
 
+  private readonly taxRuleID: string;
+
+  private readonly taxRuleSelect: string;
+
   private readonly taxRuleSpan: string;
 
   private readonly taxRuleList: string;
 
+  private readonly wholesalePriceInput: string;
+
+  private readonly unitPriceInput: string;
+
+  private readonly unityInput: string;
+
+  private readonly onSaleCheckbox: string;
+
+  private readonly ecotaxInput: string;
+
   /**
    * @constructs
    * Setting up texts and selectors to use on pricing tab
@@ -30,8 +44,15 @@ class PricingTab extends BOBasePage {
     // Selectors in pricing tab
     this.pricingTabLink = '#product_pricing-tab-nav';
     this.retailPriceInput = '#product_pricing_retail_price_price_tax_excluded';
-    this.taxRuleSpan = '#select2-product_pricing_retail_price_tax_rules_group_id-container';
-    this.taxRuleList = 'ul#select2-product_pricing_retail_price_tax_rules_group_id-results';
+    this.taxRuleID = 'product_pricing_retail_price_tax_rules_group_id';
+    this.taxRuleSelect = `#${this.taxRuleID}`;
+    this.taxRuleSpan = `#select2-${this.taxRuleID}-container`;
+    this.taxRuleList = `ul#select2-${this.taxRuleID}-results`;
+    this.wholesalePriceInput = '#product_pricing_wholesale_price';
+    this.unitPriceInput = '#product_pricing_unit_price_price_tax_excluded';
+    this.unityInput = '#product_pricing_unit_price_unity';
+    this.onSaleCheckbox = '#product_pricing_on_sale';
+    this.ecotaxInput = '#product_pricing_retail_price_ecotax_tax_excluded';
   }
 
   /*
@@ -54,6 +75,31 @@ class PricingTab extends BOBasePage {
     ]);
     await page.locator(`li:has-text('${productData.taxRule}')`).click();
   }
+
+  /**
+   * @param page {Page}
+   * @param inputName {string}
+   */
+  async getValue(page: Page, inputName: string): Promise<string> {
+    switch (inputName) {
+      case 'ecotax':
+        return this.getAttributeContent(page, this.ecotaxInput, 'value');
+      case 'id_tax_rules_group':
+        return page.$eval(this.taxRuleSelect, (node: HTMLSelectElement) => node.value);
+      case 'on_sale':
+        return (await this.isChecked(page, this.onSaleCheckbox)) ? '1' : '0';
+      case 'price':
+        return this.getAttributeContent(page, this.retailPriceInput, 'value');
+      case 'unit_price':
+        return this.getAttributeContent(page, this.unitPriceInput, 'value');
+      case 'unity':
+        return this.getAttributeContent(page, this.unityInput, 'value');
+      case 'wholesale_price':
+        return this.getAttributeContent(page, this.wholesalePriceInput, 'value');
+      default:
+        throw new Error(`Input ${inputName} was not found`);
+    }
+  }
 }
 
 export default new PricingTab();
diff --git a/tests/UI/pages/BO/catalog/productsV2/add/seoTab.ts b/tests/UI/pages/BO/catalog/productsV2/add/seoTab.ts
new file mode 100644
index 0000000000000..82183b221e76f
--- /dev/null
+++ b/tests/UI/pages/BO/catalog/productsV2/add/seoTab.ts
@@ -0,0 +1,64 @@
+// Import pages
+import BOBasePage from '@pages/BO/BObasePage';
+
+import type {Page} from 'playwright';
+
+/**
+ * SEO tab on new product V2 page, contains functions that can be used on the page
+ * @class
+ * @extends BOBasePage
+ */
+class SeoTab extends BOBasePage {
+  private readonly productMetaTitleInput: string;
+
+  private readonly productMetaDescriptionInput: string;
+
+  private readonly productLinkRewriteInput: string;
+
+  private readonly productRedirectTypeSelect: string;
+
+  private readonly productRedirectProduct: string;
+
+  /**
+   * @constructs
+   * Setting up texts and selectors to use on Shipping tab
+   */
+  constructor() {
+    super();
+
+    // Selectors in stocks tab
+    this.productMetaTitleInput = '#product_seo_meta_title';
+    this.productMetaDescriptionInput = '#product_seo_meta_description';
+    this.productLinkRewriteInput = '#product_seo_link_rewrite';
+    this.productRedirectTypeSelect = '#product_seo_redirect_option_type';
+    this.productRedirectProduct = '#product_seo_redirect_option_target_0_id';
+  }
+
+  /*
+  Methods
+   */
+
+  /**
+   * @param page {Page}
+   * @param inputName {string}
+   * @param languageId {string | undefined}
+   */
+  async getValue(page: Page, inputName: string, languageId?: string): Promise<string> {
+    switch (inputName) {
+      case 'id_type_redirected':
+        return this.getAttributeContent(page, this.productRedirectProduct, 'value');
+      case 'link_rewrite':
+        return this.getAttributeContent(page, `${this.productLinkRewriteInput}_${languageId}`, 'value');
+      case 'meta_description':
+        return this.getTextContent(page, `${this.productMetaDescriptionInput}_${languageId}`, false);
+      case 'meta_title':
+        return this.getAttributeContent(page, `${this.productMetaTitleInput}_${languageId}`, 'value');
+      case 'redirect_type':
+        return page.$eval(this.productRedirectTypeSelect, (node: HTMLSelectElement) => node.value);
+      default:
+        throw new Error(`Input ${inputName} was not found`);
+    }
+  }
+}
+
+export default new SeoTab();
diff --git a/tests/UI/pages/BO/catalog/productsV2/add/shippingTab.ts b/tests/UI/pages/BO/catalog/productsV2/add/shippingTab.ts
new file mode 100644
index 0000000000000..ebbd5620f2ecb
--- /dev/null
+++ b/tests/UI/pages/BO/catalog/productsV2/add/shippingTab.ts
@@ -0,0 +1,79 @@
+// Import pages
+import BOBasePage from '@pages/BO/BObasePage';
+
+import type {Page} from 'playwright';
+
+/**
+ * Shipping tab on new product V2 page, contains functions that can be used on the page
+ * @class
+ * @extends BOBasePage
+ */
+class ShippingTab extends BOBasePage {
+  private readonly productDimensionsWidthInput: string;
+
+  private readonly productDimensionsHeightInput: string;
+
+  private readonly productDimensionsDepthInput: string;
+
+  private readonly productDimensionsWeightInput: string;
+
+  private readonly productDeliveryInStockInput: string;
+
+  private readonly productDeliveryOutStockInput: string;
+
+  private readonly productAdditionalShippingCostInput: string;
+
+  private readonly productDeliveryTimeInput: string;
+
+  /**
+   * @constructs
+   * Setting up texts and selectors to use on Shipping tab
+   */
+  constructor() {
+    super();
+
+    // Selectors in stocks tab
+    this.productDimensionsWidthInput = '#product_shipping_dimensions_width';
+    this.productDimensionsHeightInput = '#product_shipping_dimensions_height';
+    this.productDimensionsDepthInput = '#product_shipping_dimensions_depth';
+    this.productDimensionsWeightInput = '#product_shipping_dimensions_weight';
+    this.productDeliveryInStockInput = '#product_shipping_delivery_time_notes_in_stock';
+    this.productDeliveryOutStockInput = '#product_shipping_delivery_time_notes_out_of_stock';
+    this.productAdditionalShippingCostInput = '#product_shipping_additional_shipping_cost';
+    this.productDeliveryTimeInput = 'input[name="product[shipping][delivery_time_note_type]"]';
+  }
+
+  /*
+  Methods
+   */
+
+  /**
+   * @param page {Page}
+   * @param inputName {string}
+   * @param languageId {string | undefined}
+   */
+  async getValue(page: Page, inputName: string, languageId?: string): Promise<string> {
+    switch (inputName) {
+      case 'additional_delivery_times':
+        return this.getAttributeContent(page, `${this.productDeliveryTimeInput}[checked="checked"]`, 'value');
+      case 'additional_shipping_cost':
+        return this.getAttributeContent(page, this.productAdditionalShippingCostInput, 'value');
+      case 'delivery_in_stock':
+        return this.getAttributeContent(page, `${this.productDeliveryInStockInput}_${languageId}`, 'value');
+      case 'delivery_out_stock':
+        return this.getAttributeContent(page, `${this.productDeliveryOutStockInput}_${languageId}`, 'value');
+      case 'depth':
+        return this.getAttributeContent(page, this.productDimensionsDepthInput, 'value');
+      case 'height':
+        return this.getAttributeContent(page, this.productDimensionsHeightInput, 'value');
+      case 'weight':
+        return this.getAttributeContent(page, this.productDimensionsWeightInput, 'value');
+      case 'width':
+        return this.getAttributeContent(page, this.productDimensionsWidthInput, 'value');
+      default:
+        throw new Error(`Input ${inputName} was not found`);
+    }
+  }
+}
+
+export default new ShippingTab();
diff --git a/tests/UI/pages/BO/catalog/productsV2/add/stocksTab.ts b/tests/UI/pages/BO/catalog/productsV2/add/stocksTab.ts
index 1b4ba2d6cf7c2..fafd50c30a7e4 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/stocksTab.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/stocksTab.ts
@@ -18,6 +18,16 @@ class StocksTab extends BOBasePage {
 
   private readonly productMinimumQuantityInput: string;
 
+  private readonly productLowStockThresholdCheckbox: string;
+
+  private readonly productLowStockThresholdInput: string;
+
+  private readonly productLabelAvailableNowInput: string;
+
+  private readonly productLabelAvailableLaterInput: string;
+
+  private readonly productAvailableDateInput: string;
+
   /**
    * @constructs
    * Setting up texts and selectors to use on stocks tab
@@ -29,6 +39,11 @@ class StocksTab extends BOBasePage {
     this.stocksTabLink = '#product_stock-tab-nav';
     this.productQuantityInput = '#product_stock_quantities_delta_quantity_delta';
     this.productMinimumQuantityInput = '#product_stock_quantities_minimal_quantity';
+    this.productLowStockThresholdCheckbox = '#product_stock_options_disabling_switch_low_stock_threshold_1';
+    this.productLowStockThresholdInput = '#product_stock_options_low_stock_threshold';
+    this.productLabelAvailableNowInput = '#product_stock_availability_available_now_label';
+    this.productLabelAvailableLaterInput = '#product_stock_availability_available_later_label';
+    this.productAvailableDateInput = '#product_stock_availability_available_date';
   }
 
   /*
@@ -46,6 +61,30 @@ class StocksTab extends BOBasePage {
     await this.setValue(page, this.productQuantityInput, productData.quantity);
     await this.setValue(page, this.productMinimumQuantityInput, productData.minimumQuantity);
   }
+
+  /**
+   * @param page {Page}
+   * @param inputName {string}
+   * @param languageId {string | undefined}
+   */
+  async getValue(page: Page, inputName: string, languageId?: string): Promise<string> {
+    switch (inputName) {
+      case 'available_date':
+        return this.getAttributeContent(page, this.productAvailableDateInput, 'value');
+      case 'available_later':
+        return this.getAttributeContent(page, `${this.productLabelAvailableLaterInput}_${languageId}`, 'value');
+      case 'available_now':
+        return this.getAttributeContent(page, `${this.productLabelAvailableNowInput}_${languageId}`, 'value');
+      case 'low_stock_threshold':
+        return this.getAttributeContent(page, this.productLowStockThresholdInput, 'value');
+      case 'low_stock_threshold_enabled':
+        return (await this.isChecked(page, this.productLowStockThresholdCheckbox)) ? '1' : '0';
+      case 'minimal_quantity':
+        return this.getAttributeContent(page, this.productMinimumQuantityInput, 'value');
+      default:
+        throw new Error(`Input ${inputName} was not found`);
+    }
+  }
 }
 
 export default new StocksTab();
diff --git a/tests/UI/pages/BO/catalog/productsV2/index.ts b/tests/UI/pages/BO/catalog/productsV2/index.ts
index b2fc7dcb6c6c1..9c0d83e283bec 100644
--- a/tests/UI/pages/BO/catalog/productsV2/index.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/index.ts
@@ -315,7 +315,7 @@ class Products extends BOBasePage {
    * @param page {Page} Browser tab
    * @returns {Promise<string>}
    */
-  getAlertDangerBlockContent(page: Page): Promise<string> {
+  async getAlertDangerBlockContent(page: Page): Promise<string> {
     return this.getAlertDangerBlockParagraphContent(page);
   }
 
@@ -361,7 +361,7 @@ class Products extends BOBasePage {
    * @param page {Page} Browser tab
    * @returns {Promise<boolean>}
    */
-  isResetButtonVisible(page: Page): Promise<boolean> {
+  async isResetButtonVisible(page: Page): Promise<boolean> {
     return this.elementVisible(page, this.filterResetButton, 1000);
   }
 
@@ -753,7 +753,7 @@ class Products extends BOBasePage {
    * @param page {Page} Browser tab
    * @returns {Promise<string>}
    */
-  getTextForEmptyTable(page: Page): Promise<string> {
+  async getTextForEmptyTable(page: Page): Promise<string> {
     return this.getTextContent(page, this.productEmptyRow);
   }
 
diff --git a/tests/UI/utils/xml.ts b/tests/UI/utils/xml.ts
index af96c5b96c205..ac54d83db46f6 100644
--- a/tests/UI/utils/xml.ts
+++ b/tests/UI/utils/xml.ts
@@ -81,6 +81,10 @@ export default {
    * @return {boolean}
    */
   isEmpty(element: Element): boolean {
+    if (element.nodeName === '#text') {
+      return true;
+    }
+
     if (element.childNodes.length > 0) {
       for (let o: number = 0; o < element.childNodes.length; o++) {
         if (!this.isEmpty(element.childNodes[o] as Element)) {
diff --git a/tests/UI/webservices/product/productWs.ts b/tests/UI/webservices/product/productWs.ts
new file mode 100644
index 0000000000000..be14a3e0ee9e9
--- /dev/null
+++ b/tests/UI/webservices/product/productWs.ts
@@ -0,0 +1,100 @@
+import BaseWS from '@webservices/baseWs';
+import {APIRequestContext, APIResponse} from 'playwright';
+
+export default class ProductWs extends BaseWS {
+  public static endpoint = 'api/products';
+
+  /**
+   * Get Blank
+   * @param apiContext {APIRequestContext}
+   * @param authorization {string}
+   */
+  public static async getBlank(
+    apiContext: APIRequestContext,
+    authorization: string,
+  ): Promise<APIResponse> {
+    return super.getBlank(apiContext, this.endpoint, authorization);
+  }
+
+  /**
+   * Get Synopsis
+   * @param apiContext {APIRequestContext}
+   * @param authorization {string}
+   */
+  public static async getSynopsis(
+    apiContext: APIRequestContext,
+    authorization: string,
+  ): Promise<APIResponse> {
+    return super.getSynopsis(apiContext, this.endpoint, authorization);
+  }
+
+  /**
+   * Get All Countries
+   * @param apiContext {APIRequestContext}
+   * @param authorization {string}
+   */
+  public static getAll(
+    apiContext: APIRequestContext,
+    authorization: string,
+  ): Promise<APIResponse> {
+    return super.getAll(apiContext, this.endpoint, authorization);
+  }
+
+  /**
+   * Get By id
+   * @param apiContext {APIRequestContext}
+   * @param authorization {string}
+   * @param idProduct {string}
+   */
+  public static getById(
+    apiContext: APIRequestContext,
+    authorization: string,
+    idProduct: string,
+  ): Promise<APIResponse> {
+    return super.getById(apiContext, this.endpoint, authorization, idProduct);
+  }
+
+  /**
+   * Add new Country
+   * @param apiContext {APIRequestContext}
+   * @param authorization {string}
+   * @param data {string} Xml of a new Country
+   */
+  public static add(
+    apiContext: APIRequestContext,
+    authorization: string,
+    data: string,
+  ): Promise<APIResponse> {
+    return super.add(apiContext, this.endpoint, authorization, data);
+  }
+
+  /**
+   * Update a country
+   * @param apiContext {APIRequestContext}
+   * @param authorization {string}
+   * @param idProduct {string}
+   * @param data {string} Xml of the new Country
+   */
+  public static update(
+    apiContext: APIRequestContext,
+    authorization: string,
+    idProduct: string,
+    data: string,
+  ): Promise<APIResponse> {
+    return super.update(apiContext, this.endpoint, authorization, idProduct, data);
+  }
+
+  /**
+   * Delete a country
+   * @param apiContext {APIRequestContext}
+   * @param authorization {string}
+   * @param idProduct {string}
+   */
+  public static delete(
+    apiContext: APIRequestContext,
+    authorization: string,
+    idProduct: string,
+  ): Promise<APIResponse> {
+    return super.delete(apiContext, this.endpoint, authorization, idProduct);
+  }
+}
diff --git a/tests/UI/webservices/product/productXml.ts b/tests/UI/webservices/product/productXml.ts
new file mode 100644
index 0000000000000..b2c77cfaf44d8
--- /dev/null
+++ b/tests/UI/webservices/product/productXml.ts
@@ -0,0 +1,65 @@
+import BaseXml from '@webservices/baseXml';
+import xmlHelper from '@utils/xml';
+
+export default class ProductXml extends BaseXml {
+  private static productsBasicPath = '/prestashop/products';
+
+  private static productsPath = `${this.productsBasicPath}/*`;
+
+  private static productBasicPath = '/prestashop/product';
+
+  private static productPath = `${this.productBasicPath}/*`;
+
+  private static attributePath = (attribute: string) => `${this.productBasicPath}/${attribute}`;
+
+  private static attributeLangPath = (
+    attribute: string,
+    lang: string,
+  ) => `${this.attributePath(attribute)}/language[@id="${lang}"]`;
+
+  /**
+   * Get all products nodes
+   * @param xml
+   */
+  public static getAllProducts(
+    xml: string,
+  ): Element[] {
+    return xmlHelper.getNodes(xml, this.productsPath);
+  }
+
+  /**
+   * Get product nodes
+   * @param xml
+   */
+  public static getProductNodes(
+    xml: string,
+  ): Element[] {
+    return xmlHelper.getNodes(xml, this.productPath);
+  }
+
+  /**
+   * Get attribute value
+   * @param xml
+   * @param attribute
+   */
+  public static getAttributeValue(
+    xml: string,
+    attribute: string,
+  ): string {
+    return xmlHelper.getNodeValue(xml, this.attributePath(attribute));
+  }
+
+  /**
+   * Get attribute with language value
+   * @param xml
+   * @param attribute
+   * @param lang
+   */
+  public static getAttributeLangValue(
+    xml: string,
+    attribute: string,
+    lang: string,
+  ): string {
+    return xmlHelper.getNodeValue(xml, this.attributeLangPath(attribute, lang));
+  }
+}

From 6a0a9a8f3ecd590d158fcdda41645a27dcae479e Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Fri, 4 Aug 2023 12:09:54 +0200
Subject: [PATCH 0776/1030] Functional Tests : Add JSDoc & Removed page.

---
 tests/UI/pages/BO/catalog/productsV2/add/descriptionTab.ts | 5 +++--
 tests/UI/pages/BO/catalog/productsV2/add/optionsTab.ts     | 1 +
 tests/UI/pages/BO/catalog/productsV2/add/pricingTab.ts     | 1 +
 tests/UI/pages/BO/catalog/productsV2/add/seoTab.ts         | 1 +
 tests/UI/pages/BO/catalog/productsV2/add/shippingTab.ts    | 1 +
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/UI/pages/BO/catalog/productsV2/add/descriptionTab.ts b/tests/UI/pages/BO/catalog/productsV2/add/descriptionTab.ts
index 9e4c4ff3ce7a0..261cb35b35f28 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/descriptionTab.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/descriptionTab.ts
@@ -125,6 +125,7 @@ class DescriptionTab extends BOBasePage {
   }
 
   /**
+   * Returns the value of a form element
    * @param page {Page}
    * @param inputName {string}
    * @param languageId {string | undefined}
@@ -134,9 +135,9 @@ class DescriptionTab extends BOBasePage {
       case 'description':
         return this.getTextContent(page, `${this.productDescription}_${languageId}`, false);
       case 'id_category_default':
-        return page.$eval(this.productDefaultCategory, (node: HTMLSelectElement) => node.value);
+        return page.locator(this.productDefaultCategory).evaluate((node: HTMLSelectElement) => node.value);
       case 'manufacturer':
-        return page.$eval(this.productManufacturer, (node: HTMLSelectElement) => node.value);
+        return page.locator(this.productManufacturer).evaluate((node: HTMLSelectElement) => node.value);
       case 'summary':
         return this.getTextContent(page, `${this.productSummary}_${languageId}`, false);
       default:
diff --git a/tests/UI/pages/BO/catalog/productsV2/add/optionsTab.ts b/tests/UI/pages/BO/catalog/productsV2/add/optionsTab.ts
index efeb6f5db95c3..266e9ac4328b7 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/optionsTab.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/optionsTab.ts
@@ -36,6 +36,7 @@ class OptionsTab extends BOBasePage {
    */
 
   /**
+   * Returns the value of a form element
    * @param page {Page}
    * @param inputName {string}
    */
diff --git a/tests/UI/pages/BO/catalog/productsV2/add/pricingTab.ts b/tests/UI/pages/BO/catalog/productsV2/add/pricingTab.ts
index dcf0c69a32c21..700aa6c509835 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/pricingTab.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/pricingTab.ts
@@ -77,6 +77,7 @@ class PricingTab extends BOBasePage {
   }
 
   /**
+   * Returns the value of a form element
    * @param page {Page}
    * @param inputName {string}
    */
diff --git a/tests/UI/pages/BO/catalog/productsV2/add/seoTab.ts b/tests/UI/pages/BO/catalog/productsV2/add/seoTab.ts
index 82183b221e76f..29ef7142742cc 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/seoTab.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/seoTab.ts
@@ -39,6 +39,7 @@ class SeoTab extends BOBasePage {
    */
 
   /**
+   * Returns the value of a form element
    * @param page {Page}
    * @param inputName {string}
    * @param languageId {string | undefined}
diff --git a/tests/UI/pages/BO/catalog/productsV2/add/shippingTab.ts b/tests/UI/pages/BO/catalog/productsV2/add/shippingTab.ts
index ebbd5620f2ecb..87bfa7cfbd14e 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/shippingTab.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/shippingTab.ts
@@ -48,6 +48,7 @@ class ShippingTab extends BOBasePage {
    */
 
   /**
+   * Returns the value of a form element
    * @param page {Page}
    * @param inputName {string}
    * @param languageId {string | undefined}

From d1ba7f4497ec10d2e537d8258f533c5bd2924e96 Mon Sep 17 00:00:00 2001
From: boubkerbribri <boubker.bribri@prestashop.com>
Date: Wed, 16 Aug 2023 14:47:12 +0200
Subject: [PATCH 0777/1030] Add spaces between its and fix lint errors

---
 .../functional/WS/02_productsCRUD.ts          | 459 +++++++++++-------
 1 file changed, 272 insertions(+), 187 deletions(-)

diff --git a/tests/UI/campaigns/functional/WS/02_productsCRUD.ts b/tests/UI/campaigns/functional/WS/02_productsCRUD.ts
index aac281c7ae357..e54ecb513ee5c 100644
--- a/tests/UI/campaigns/functional/WS/02_productsCRUD.ts
+++ b/tests/UI/campaigns/functional/WS/02_productsCRUD.ts
@@ -92,7 +92,7 @@ describe('WS - Products : CRUD', async () => {
         await webservicePage.closeSfToolBar(page);
 
         const pageTitle = await webservicePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(webservicePage.pageTitle);
+        expect(pageTitle).to.contains(webservicePage.pageTitle);
       });
 
       it('should filter list by key description', async function () {
@@ -107,11 +107,11 @@ describe('WS - Products : CRUD', async () => {
         );
 
         const description = await webservicePage.getTextColumnFromTable(page, 1, 'description');
-        await expect(description).to.contains(wsKeyDescription);
+        expect(description).to.contains(wsKeyDescription);
 
         wsKey = await webservicePage.getTextColumnFromTable(page, 1, 'key');
         authorization = `Basic ${Buffer.from(`${wsKey}:`).toString('base64')}`;
-        await expect(wsKey).to.be.not.empty;
+        expect(wsKey).to.not.have.length(0);
       });
     });
 
@@ -126,7 +126,7 @@ describe('WS - Products : CRUD', async () => {
           apiContext,
           authorization,
         );
-        await expect(apiResponse.status()).to.eq(200);
+        expect(apiResponse.status()).to.eq(200);
       });
 
       it('should check that the blank XML can be parsed', async function () {
@@ -135,21 +135,21 @@ describe('WS - Products : CRUD', async () => {
         xmlResponse = await apiResponse.text();
 
         const isValidXML = xml.isValid(xmlResponse);
-        await expect(isValidXML).to.be.true;
+        expect(isValidXML).to.eq(true);
       });
 
       it('should check response root node', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'requestBlankRootNode', baseContext);
 
-        expect(productXml.getRootNodeName(xmlResponse)).to.be.eq('prestashop');
+        expect(productXml.getRootNodeName(xmlResponse)).to.eq('prestashop');
       });
 
       it('should check number of node under prestashop', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'requestBlankChildNode', baseContext);
 
         const rootNodes = productXml.getPrestaShopNodes(xmlResponse);
-        expect(rootNodes.length).to.be.eq(1);
-        expect(rootNodes[0].nodeName).to.be.eq('product');
+        expect(rootNodes.length).to.eq(1);
+        expect(rootNodes[0].nodeName).to.eq('product');
       });
 
       it('should check each node name, attributes and has empty values', async function () {
@@ -163,11 +163,11 @@ describe('WS - Products : CRUD', async () => {
 
           // Attributes
           const nodeAttributes: NamedNodeMap = node.attributes;
-          expect(nodeAttributes.length).to.be.eq(0);
+          expect(nodeAttributes.length).to.eq(0);
 
           // Empty value
           const isEmptyNode: boolean = xml.isEmpty(node);
-          await expect(isEmptyNode, `The node ${node.nodeName} is not empty`).to.be.true;
+          expect(isEmptyNode, `The node ${node.nodeName} is not empty`).to.eq(true);
         }
       });
     });
@@ -183,7 +183,7 @@ describe('WS - Products : CRUD', async () => {
           apiContext,
           authorization,
         );
-        await expect(apiResponse.status()).to.eq(200);
+        expect(apiResponse.status()).to.eq(200);
       });
 
       it('should check that the synopsis XML can be parsed', async function () {
@@ -192,21 +192,21 @@ describe('WS - Products : CRUD', async () => {
         xmlResponse = await apiResponse.text();
 
         const isValidXML = xml.isValid(xmlResponse);
-        await expect(isValidXML).to.be.true;
+        expect(isValidXML).to.eq(true);
       });
 
       it('should check response root node', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'requestSynopsisRootNode', baseContext);
 
-        expect(productXml.getRootNodeName(xmlResponse)).to.be.eq('prestashop');
+        expect(productXml.getRootNodeName(xmlResponse)).to.eq('prestashop');
       });
 
       it('should check number of node under prestashop', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'requestSynopsisChildNode', baseContext);
 
         const rootNodes = productXml.getPrestaShopNodes(xmlResponse);
-        expect(rootNodes.length).to.be.eq(1);
-        expect(rootNodes[0].nodeName).to.be.eq('product');
+        expect(rootNodes.length).to.eq(1);
+        expect(rootNodes[0].nodeName).to.eq('product');
       });
 
       it('should check each node name, attributes and has empty values', async function () {
@@ -238,12 +238,12 @@ describe('WS - Products : CRUD', async () => {
             expect(nodeAttributes.length).to.be.gte(1);
 
             // Attribute : format
-            expect(nodeAttributes[nodeAttributes.length - 1].nodeName).to.be.eq('format');
+            expect(nodeAttributes[nodeAttributes.length - 1].nodeName).to.eq('format');
           }
 
           // Empty value
           const isEmptyNode = xml.isEmpty(node);
-          await expect(isEmptyNode, `The node ${node.nodeName} is not empty`).to.be.true;
+          expect(isEmptyNode, `The node ${node.nodeName} is not empty`).to.eq(true);
         }
       });
     });
@@ -261,22 +261,22 @@ describe('WS - Products : CRUD', async () => {
           authorization,
         );
 
-        await expect(apiResponse.status()).to.eq(200);
+        expect(apiResponse.status()).to.eq(200);
       });
 
       it('should check response root node', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'requestGetRootNode1', baseContext);
 
         xmlResponse = await apiResponse.text();
-        expect(productXml.getRootNodeName(xmlResponse)).to.be.eq('prestashop');
+        expect(productXml.getRootNodeName(xmlResponse)).to.eq('prestashop');
       });
 
       it('should check number of node under prestashop', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'requestGetNodeNumber1', baseContext);
 
         const rootNodes = productXml.getPrestaShopNodes(xmlResponse);
-        expect(rootNodes.length).to.be.eq(1);
-        expect(rootNodes[0].nodeName).to.be.eq('products');
+        expect(rootNodes.length).to.eq(1);
+        expect(rootNodes[0].nodeName).to.eq('products');
       });
 
       it('should check number of nodes under Products node', async function () {
@@ -291,19 +291,19 @@ describe('WS - Products : CRUD', async () => {
 
         for (let c: number = 0; c < productsNode.length; c++) {
           const productNode: Element = productsNode[c];
-          expect(productNode.nodeName).to.be.eq('product');
+          expect(productNode.nodeName).to.eq('product');
 
           // Attributes
           const productNodeAttributes: NamedNodeMap = productNode.attributes;
-          expect(productNodeAttributes.length).to.be.eq(2);
+          expect(productNodeAttributes.length).to.eq(2);
 
           // Attribute : id
-          expect(productNodeAttributes[0].nodeName).to.be.eq('id');
+          expect(productNodeAttributes[0].nodeName).to.eq('id');
           const productNodeAttributeId = productNodeAttributes[0].nodeValue as string;
-          expect(productNodeAttributeId).to.be.eq(parseInt(productNodeAttributeId, 10).toString());
+          expect(productNodeAttributeId).to.eq(parseInt(productNodeAttributeId, 10).toString());
 
           // Attribute : xlink:href
-          expect(productNodeAttributes[1].nodeName).to.be.eq('xlink:href');
+          expect(productNodeAttributes[1].nodeName).to.eq('xlink:href');
           expect(productNodeAttributes[1].nodeValue).to.be.a('string');
         }
       });
@@ -322,22 +322,22 @@ describe('WS - Products : CRUD', async () => {
             authorization,
             xmlCreate,
           );
-          await expect(apiResponse.status()).to.eq(201);
+          expect(apiResponse.status()).to.eq(201);
         });
 
         it('should check response root node', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'requestPostRootNode1', baseContext);
 
           xmlResponse = await apiResponse.text();
-          expect(productXml.getRootNodeName(xmlResponse)).to.be.eq('prestashop');
+          expect(productXml.getRootNodeName(xmlResponse)).to.eq('prestashop');
         });
 
         it('should check number of node under prestashop', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'requestPostNodeNumber1', baseContext);
 
           const rootNodes = productXml.getPrestaShopNodes(xmlResponse);
-          expect(rootNodes.length).to.be.eq(1);
-          expect(rootNodes[0].nodeName).to.be.eq('product');
+          expect(rootNodes.length).to.eq(1);
+          expect(rootNodes[0].nodeName).to.eq('product');
         });
 
         it('should check id of the country', async function () {
@@ -346,7 +346,7 @@ describe('WS - Products : CRUD', async () => {
           // Attribute : id
           const xmlID = productXml.getAttributeValue(xmlResponse, 'id');
           productNodeID = parseInt(xmlID, 10);
-          expect(xmlID).to.be.eq(productNodeID.toString());
+          expect(xmlID).to.eq(productNodeID.toString());
         });
       });
 
@@ -364,22 +364,22 @@ describe('WS - Products : CRUD', async () => {
             productNodeID.toString(),
           );
 
-          await expect(apiResponse.status()).to.eq(200);
+          expect(apiResponse.status()).to.eq(200);
         });
 
         it('should check response root node', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'requestGetIDRootNode1', baseContext);
 
           xmlResponse = await apiResponse.text();
-          expect(productXml.getRootNodeName(xmlResponse)).to.be.eq('prestashop');
+          expect(productXml.getRootNodeName(xmlResponse)).to.eq('prestashop');
         });
 
         it('should check number of node under prestashop', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'requestGetIDNodeNumber1', baseContext);
 
           const rootNodes = productXml.getPrestaShopNodes(xmlResponse);
-          expect(rootNodes.length).to.be.eq(1);
-          expect(rootNodes[0].nodeName).to.be.eq('product');
+          expect(rootNodes.length).to.eq(1);
+          expect(rootNodes[0].nodeName).to.eq('product');
         });
 
         it('should check number of nodes under Products node', async function () {
@@ -399,7 +399,7 @@ describe('WS - Products : CRUD', async () => {
             if (['manufacturer_name', 'quantity', 'date_add', 'date_upd'].includes(oNode.nodeName)) {
               // It can be defined in POST/PUT
             } else if (oNode.nodeName === 'id') {
-              expect(oNode.textContent).to.be.eq(productNodeID.toString());
+              expect(oNode.textContent).to.eq(productNodeID.toString());
             } else if ([
               'name',
               'delivery_in_stock',
@@ -424,7 +424,7 @@ describe('WS - Products : CRUD', async () => {
                 oNode.nodeName,
                 '1',
               );
-              expect(objectNodeValueEN).to.be.eq(createNodeValueEN);
+              expect(objectNodeValueEN).to.eq(createNodeValueEN);
 
               const objectNodeValueFR = productXml.getAttributeLangValue(
                 xmlResponse,
@@ -436,7 +436,7 @@ describe('WS - Products : CRUD', async () => {
                 oNode.nodeName,
                 '2',
               );
-              expect(objectNodeValueFR).to.be.eq(createNodeValueFR);
+              expect(objectNodeValueFR).to.eq(createNodeValueFR);
             } else if (oNode.nodeName === 'new') {
               // @todo : https://github.com/PrestaShop/PrestaShop/issues/33429
             } else if (oNode.nodeName === 'position_in_category') {
@@ -448,7 +448,7 @@ describe('WS - Products : CRUD', async () => {
                 xmlCreate,
                 oNode.nodeName,
               );
-              expect(oNode.textContent).to.be.eq(objectNodeValue);
+              expect(oNode.textContent).to.eq(objectNodeValue);
             }
           }
         });
@@ -467,7 +467,7 @@ describe('WS - Products : CRUD', async () => {
             await productsPage.closeSfToolBar(page);
 
             const pageTitle = await productsPage.getPageTitle(page);
-            await expect(pageTitle).to.contains(productsPage.pageTitle);
+            expect(pageTitle).to.contains(productsPage.pageTitle);
           });
 
           it('should filter product by ID', async function () {
@@ -484,10 +484,10 @@ describe('WS - Products : CRUD', async () => {
 
             // Check number of Products
             const numberOfProductsAfterFilter = await productsPage.getNumberOfProductsFromList(page);
-            await expect(numberOfProductsAfterFilter).to.be.eq(1);
+            expect(numberOfProductsAfterFilter).to.eq(1);
 
             const textColumn = await productsPage.getTextColumn(page, 'id_product', 1);
-            await expect(textColumn).to.eq(productNodeID);
+            expect(textColumn).to.eq(productNodeID);
           });
 
           it('should go to edit product page', async function () {
@@ -496,7 +496,7 @@ describe('WS - Products : CRUD', async () => {
             await productsPage.goToProductPage(page, 1);
 
             const pageTitle: string = await createProductsPage.getPageTitle(page);
-            await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+            expect(pageTitle).to.contains(createProductsPage.pageTitle);
           });
         });
 
@@ -506,25 +506,27 @@ describe('WS - Products : CRUD', async () => {
 
             const xmlValue = productXml.getAttributeValue(xmlCreate, 'active');
             const value = (await createProductsPage.getProductStatus(page)) ? '1' : '0';
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check type', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckProductType', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlCreate, 'product_type');
             const value = (await createProductsPage.getProductType(page));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check name', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckName', baseContext);
 
             const xmlValueEn = productXml.getAttributeLangValue(xmlCreate, 'name', '1');
             const valueEn = (await createProductsPage.getProductName(page, 1));
-            expect(valueEn).to.be.eq(xmlValueEn);
+            expect(valueEn).to.eq(xmlValueEn);
 
             const xmlValueFr = productXml.getAttributeLangValue(xmlCreate, 'name', '2');
             const valueFr = (await createProductsPage.getProductName(page, 2));
-            expect(valueFr).to.be.eq(xmlValueFr);
+            expect(valueFr).to.eq(xmlValueFr);
           });
         });
 
@@ -534,36 +536,39 @@ describe('WS - Products : CRUD', async () => {
 
             const xmlValueEn = productXml.getAttributeLangValue(xmlCreate, 'description_short', '1');
             const valueEn = (await descriptionTab.getValue(page, 'summary', '1'));
-            expect(valueEn).to.be.eq(xmlValueEn);
+            expect(valueEn).to.eq(xmlValueEn);
 
             const xmlValueFr = productXml.getAttributeLangValue(xmlCreate, 'description_short', '2');
             const valueFr = (await descriptionTab.getValue(page, 'summary', '2'));
-            expect(valueFr).to.be.eq(xmlValueFr);
+            expect(valueFr).to.eq(xmlValueFr);
           });
+
           it('should check description', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckDescription', baseContext);
 
             const xmlValueEn = productXml.getAttributeLangValue(xmlCreate, 'description', '1');
             const valueEn = (await descriptionTab.getValue(page, 'description', '1'));
-            expect(valueEn).to.be.eq(xmlValueEn);
+            expect(valueEn).to.eq(xmlValueEn);
 
             const xmlValueFr = productXml.getAttributeLangValue(xmlCreate, 'description', '2');
             const valueFr = (await descriptionTab.getValue(page, 'description', '2'));
-            expect(valueFr).to.be.eq(xmlValueFr);
+            expect(valueFr).to.eq(xmlValueFr);
           });
+
           it('should check default category', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckDefaultCategory', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlCreate, 'id_category_default');
             const value = (await descriptionTab.getValue(page, 'id_category_default', '1'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check manufacturer', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckManufacturer', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlCreate, 'id_manufacturer');
             const value = (await descriptionTab.getValue(page, 'manufacturer', '1'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
         });
 
@@ -574,56 +579,63 @@ describe('WS - Products : CRUD', async () => {
             await createProductsPage.goToTab(page, 'details');
 
             const isTabActive = await createProductsPage.isTabActive(page, 'details');
-            await expect(isTabActive).to.be.true;
+            expect(isTabActive).to.eq(true);
           });
+
           it('should check reference', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckReference', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlCreate, 'reference');
             const value = (await detailsTab.getValue(page, 'reference'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check MPN', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckMPN', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlCreate, 'mpn');
             const value = (await detailsTab.getValue(page, 'mpn'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check UPC', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckUPC', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlCreate, 'upc');
             const value = (await detailsTab.getValue(page, 'upc'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check EAN13', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckEAN13', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlCreate, 'ean13');
             const value = (await detailsTab.getValue(page, 'ean13'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check ISBN', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckISBN', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlCreate, 'isbn');
             const value = (await detailsTab.getValue(page, 'isbn'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check "Display condition on product page"', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckShowCondition', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlCreate, 'show_condition');
             const value = (await detailsTab.getValue(page, 'show_condition'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check condition', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckCondition', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlCreate, 'condition');
             const value = (await detailsTab.getValue(page, 'condition'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
         });
 
@@ -634,58 +646,64 @@ describe('WS - Products : CRUD', async () => {
             await createProductsPage.goToTab(page, 'stock');
 
             const isTabActive = await createProductsPage.isTabActive(page, 'stock');
-            await expect(isTabActive).to.be.true;
+            expect(isTabActive).to.eq(true);
           });
+
           it('should check Minimum quantity for sale', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckMinimalQuantity', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlCreate, 'minimal_quantity');
             const value = (await stocksTab.getValue(page, 'minimal_quantity'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           // @todo : https://github.com/PrestaShop/PrestaShop/issues/33455
           it.skip('should check Receive a low stock alert by email', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckLowStockAlert', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlCreate, 'low_stock_alert');
             const value = (await stocksTab.getValue(page, 'low_stock_threshold_enabled'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check the low stock alert by email', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckLowStockThreshold', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlCreate, 'low_stock_threshold');
             const value = (await stocksTab.getValue(page, 'low_stock_threshold'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check Label when in stock', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckLabelAvailableNow', baseContext);
 
             const xmlValueEn = productXml.getAttributeLangValue(xmlCreate, 'available_now', '1');
             const valueEn = (await stocksTab.getValue(page, 'available_now', '1'));
-            expect(valueEn).to.be.eq(xmlValueEn);
+            expect(valueEn).to.eq(xmlValueEn);
 
             const xmlValueFr = productXml.getAttributeLangValue(xmlCreate, 'available_now', '2');
             const valueFr = (await stocksTab.getValue(page, 'available_now', '2'));
-            expect(valueFr).to.be.eq(xmlValueFr);
+            expect(valueFr).to.eq(xmlValueFr);
           });
+
           it('should check Label when out of stock', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckLabelAvailableLater', baseContext);
 
             const xmlValueEn = productXml.getAttributeLangValue(xmlCreate, 'available_later', '1');
             const valueEn = (await stocksTab.getValue(page, 'available_later', '1'));
-            expect(valueEn).to.be.eq(xmlValueEn);
+            expect(valueEn).to.eq(xmlValueEn);
 
             const xmlValueFr = productXml.getAttributeLangValue(xmlCreate, 'available_later', '2');
             const valueFr = (await stocksTab.getValue(page, 'available_later', '2'));
-            expect(valueFr).to.be.eq(xmlValueFr);
+            expect(valueFr).to.eq(xmlValueFr);
           });
+
           it('should check Availability date', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckAvailableDate', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlCreate, 'available_date');
             const value = (await stocksTab.getValue(page, 'available_date'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
         });
 
@@ -696,71 +714,79 @@ describe('WS - Products : CRUD', async () => {
             await createProductsPage.goToTab(page, 'shipping');
 
             const isTabActive = await createProductsPage.isTabActive(page, 'shipping');
-            await expect(isTabActive).to.be.true;
+            expect(isTabActive).to.eq(true);
           });
+
           it('should check Width', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckWidth', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlCreate, 'width');
             const value = (await shippingTab.getValue(page, 'width'));
-            expect(value).to.be.eq(parseInt(xmlValue, 10).toString());
+            expect(value).to.eq(parseInt(xmlValue, 10).toString());
           });
+
           it('should check Height', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckHeight', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlCreate, 'height');
             const value = (await shippingTab.getValue(page, 'height'));
-            expect(value).to.be.eq(parseInt(xmlValue, 10).toString());
+            expect(value).to.eq(parseInt(xmlValue, 10).toString());
           });
+
           it('should check Depth', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckDepth', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlCreate, 'depth');
             const value = (await shippingTab.getValue(page, 'depth'));
-            expect(value).to.be.eq(parseInt(xmlValue, 10).toString());
+            expect(value).to.eq(parseInt(xmlValue, 10).toString());
           });
+
           it('should check Weight', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckWeight', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlCreate, 'weight');
             const value = (await shippingTab.getValue(page, 'weight'));
-            expect(value).to.be.eq(parseInt(xmlValue, 10).toString());
+            expect(value).to.eq(parseInt(xmlValue, 10).toString());
           });
+
           it('should check Delivery time', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckDeliveryTime', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlCreate, 'additional_delivery_times');
             const value = (await shippingTab.getValue(page, 'additional_delivery_times'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check Delivery time of in-stock products', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckDeliveryInStock', baseContext);
 
             const xmlValueEn = productXml.getAttributeLangValue(xmlCreate, 'delivery_in_stock', '1');
             const valueEn = (await shippingTab.getValue(page, 'delivery_in_stock', '1'));
-            expect(valueEn).to.be.eq(xmlValueEn);
+            expect(valueEn).to.eq(xmlValueEn);
 
             const xmlValueFr = productXml.getAttributeLangValue(xmlCreate, 'delivery_in_stock', '2');
             const valueFr = (await shippingTab.getValue(page, 'delivery_in_stock', '2'));
-            expect(valueFr).to.be.eq(xmlValueFr);
+            expect(valueFr).to.eq(xmlValueFr);
           });
+
           it('should check Delivery time of out-of-stock products with allowed orders', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckDeliveryOutStock', baseContext);
 
             const xmlValueEn = productXml.getAttributeLangValue(xmlCreate, 'delivery_out_stock', '1');
             const valueEn = (await shippingTab.getValue(page, 'delivery_out_stock', '1'));
-            expect(valueEn).to.be.eq(xmlValueEn);
+            expect(valueEn).to.eq(xmlValueEn);
 
             const xmlValueFr = productXml.getAttributeLangValue(xmlCreate, 'delivery_out_stock', '2');
             const valueFr = (await shippingTab.getValue(page, 'delivery_out_stock', '2'));
-            expect(valueFr).to.be.eq(xmlValueFr);
+            expect(valueFr).to.eq(xmlValueFr);
           });
+
           it('should check Additional shipping costs', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckShippingCost', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlCreate, 'additional_shipping_cost');
             const value = (await shippingTab.getValue(page, 'additional_shipping_cost'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
         });
 
@@ -771,56 +797,63 @@ describe('WS - Products : CRUD', async () => {
             await createProductsPage.goToTab(page, 'pricing');
 
             const isTabActive = await createProductsPage.isTabActive(page, 'pricing');
-            await expect(isTabActive).to.be.true;
+            expect(isTabActive).to.eq(true);
           });
+
           it('should check Retail Price (tax excl.)', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckPrice', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlCreate, 'price');
             const value = (await pricingTab.getValue(page, 'price'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check Tax Rule', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckTaxRule', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlCreate, 'id_tax_rules_group');
             const value = (await pricingTab.getValue(page, 'id_tax_rules_group'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check Ecotax', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckEcotax', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlCreate, 'ecotax');
             const value = (await pricingTab.getValue(page, 'ecotax'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check Cost Price', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckWholesalePrice', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlCreate, 'wholesale_price');
             const value = (await pricingTab.getValue(page, 'wholesale_price'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check Unit Price', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckUnitPrice', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlCreate, 'unit_price');
             const value = (await pricingTab.getValue(page, 'unit_price'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check Unity', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckUnity', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlCreate, 'unity');
             const value = (await pricingTab.getValue(page, 'unity'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check "Display the "On sale!" flag on the product page"', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckOnSale', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlCreate, 'on_sale');
             const value = (await pricingTab.getValue(page, 'on_sale'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
         });
 
@@ -831,54 +864,59 @@ describe('WS - Products : CRUD', async () => {
             await createProductsPage.goToTab(page, 'seo');
 
             const isTabActive = await createProductsPage.isTabActive(page, 'seo');
-            await expect(isTabActive).to.be.true;
+            expect(isTabActive).to.eq(true);
           });
+
           it('should check Meta title', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckMetaTitle', baseContext);
 
             const xmlValueEn = productXml.getAttributeLangValue(xmlCreate, 'meta_title', '1');
             const valueEn = (await seoTab.getValue(page, 'meta_title', '1'));
-            expect(valueEn).to.be.eq(xmlValueEn);
+            expect(valueEn).to.eq(xmlValueEn);
 
             const xmlValueFr = productXml.getAttributeLangValue(xmlCreate, 'meta_title', '2');
             const valueFr = (await seoTab.getValue(page, 'meta_title', '2'));
-            expect(valueFr).to.be.eq(xmlValueFr);
+            expect(valueFr).to.eq(xmlValueFr);
           });
+
           it('should check Meta description', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckMetaDescription', baseContext);
 
             const xmlValueEn = productXml.getAttributeLangValue(xmlCreate, 'meta_description', '1');
             const valueEn = (await seoTab.getValue(page, 'meta_description', '1'));
-            expect(valueEn).to.be.eq(xmlValueEn);
+            expect(valueEn).to.eq(xmlValueEn);
 
             const xmlValueFr = productXml.getAttributeLangValue(xmlCreate, 'meta_description', '2');
             const valueFr = (await seoTab.getValue(page, 'meta_description', '2'));
-            expect(valueFr).to.be.eq(xmlValueFr);
+            expect(valueFr).to.eq(xmlValueFr);
           });
+
           it('should check Friendly URL', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckLinkRewrite', baseContext);
 
             const xmlValueEn = productXml.getAttributeLangValue(xmlCreate, 'link_rewrite', '1');
             const valueEn = (await seoTab.getValue(page, 'link_rewrite', '1'));
-            expect(valueEn).to.be.eq(xmlValueEn);
+            expect(valueEn).to.eq(xmlValueEn);
 
             const xmlValueFr = productXml.getAttributeLangValue(xmlCreate, 'link_rewrite', '2');
             const valueFr = (await seoTab.getValue(page, 'link_rewrite', '2'));
-            expect(valueFr).to.be.eq(xmlValueFr);
+            expect(valueFr).to.eq(xmlValueFr);
           });
+
           it('should check Redirection page', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckRedirectType', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlCreate, 'redirect_type');
             const value = (await seoTab.getValue(page, 'redirect_type', '1'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check Redirection product', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckIdTypeRedirected', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlCreate, 'id_type_redirected');
             const value = (await seoTab.getValue(page, 'id_type_redirected', '1'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
         });
 
@@ -889,35 +927,39 @@ describe('WS - Products : CRUD', async () => {
             await createProductsPage.goToTab(page, 'options');
 
             const isTabActive = await createProductsPage.isTabActive(page, 'options');
-            await expect(isTabActive).to.be.true;
+            expect(isTabActive).to.eq(true);
           });
+
           it('should check Visibility', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckVisibility', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlCreate, 'visibility');
             const value = (await optionsTab.getValue(page, 'visibility'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check Available for order', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckAvailableForOrder', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlCreate, 'available_for_order');
             const value = (await optionsTab.getValue(page, 'available_for_order'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check Show prices', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckShowPrice', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlCreate, 'show_price');
             const value = (await optionsTab.getValue(page, 'show_price'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check Web only (not sold in your retail store)', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckOnlineOnly', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlCreate, 'online_only');
             const value = (await optionsTab.getValue(page, 'online_only'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
         });
 
@@ -933,14 +975,14 @@ describe('WS - Products : CRUD', async () => {
             await productsPage.closeSfToolBar(page);
 
             const pageTitle = await productsPage.getPageTitle(page);
-            await expect(pageTitle).to.contains(productsPage.pageTitle);
+            expect(pageTitle).to.contains(productsPage.pageTitle);
           });
 
           it('should reset all filters', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirstAfterPost', baseContext);
 
             const numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
-            await expect(numberOfProducts).to.be.above(0);
+            expect(numberOfProducts).to.be.above(0);
           });
         });
       });
@@ -962,22 +1004,22 @@ describe('WS - Products : CRUD', async () => {
             xmlUpdate,
           );
 
-          await expect(apiResponse.status()).to.eq(200);
+          expect(apiResponse.status()).to.eq(200);
         });
 
         it('should check response root node', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'requestPutRootNode1', baseContext);
 
           xmlResponse = await apiResponse.text();
-          expect(productXml.getRootNodeName(xmlResponse)).to.be.eq('prestashop');
+          expect(productXml.getRootNodeName(xmlResponse)).to.eq('prestashop');
         });
 
         it('should check number of node under prestashop', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'requestPutNodeNumber1', baseContext);
 
           const rootNodes = productXml.getPrestaShopNodes(xmlResponse);
-          expect(rootNodes.length).to.be.eq(1);
-          expect(rootNodes[0].nodeName).to.be.eq('product');
+          expect(rootNodes.length).to.eq(1);
+          expect(rootNodes[0].nodeName).to.eq('product');
         });
 
         it('should check id of the product', async function () {
@@ -986,7 +1028,7 @@ describe('WS - Products : CRUD', async () => {
           // Attribute : id
           const xmlID = productXml.getAttributeValue(xmlResponse, 'id');
           productNodeID = parseInt(xmlID, 10);
-          expect(xmlID).to.be.eq(productNodeID.toString());
+          expect(xmlID).to.eq(productNodeID.toString());
         });
       });
 
@@ -1003,22 +1045,22 @@ describe('WS - Products : CRUD', async () => {
             authorization,
             productNodeID.toString(),
           );
-          await expect(apiResponse.status()).to.eq(200);
+          expect(apiResponse.status()).to.eq(200);
         });
 
         it('should check response root node', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'requestGetPutRootNode2', baseContext);
 
           xmlResponse = await apiResponse.text();
-          expect(productXml.getRootNodeName(xmlResponse)).to.be.eq('prestashop');
+          expect(productXml.getRootNodeName(xmlResponse)).to.eq('prestashop');
         });
 
         it('should check number of node under prestashop', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'requestGetPutNodeNumber1', baseContext);
 
           const rootNodes = productXml.getPrestaShopNodes(xmlResponse);
-          expect(rootNodes.length).to.be.eq(1);
-          expect(rootNodes[0].nodeName).to.be.eq('product');
+          expect(rootNodes.length).to.eq(1);
+          expect(rootNodes[0].nodeName).to.eq('product');
         });
 
         it('should check number of nodes under products node', async function () {
@@ -1038,7 +1080,7 @@ describe('WS - Products : CRUD', async () => {
             if (['manufacturer_name', 'quantity', 'date_add', 'date_upd'].includes(oNode.nodeName)) {
               // It can be defined in POST/PUT
             } else if (oNode.nodeName === 'id') {
-              expect(oNode.textContent).to.be.eq(productNodeID.toString());
+              expect(oNode.textContent).to.eq(productNodeID.toString());
             } else if ([
               'name',
               'delivery_in_stock',
@@ -1063,7 +1105,7 @@ describe('WS - Products : CRUD', async () => {
                 oNode.nodeName,
                 '1',
               );
-              expect(objectNodeValueEN).to.be.eq(updateNodeValueEN);
+              expect(objectNodeValueEN).to.eq(updateNodeValueEN);
 
               const objectNodeValueFR = productXml.getAttributeLangValue(
                 xmlResponse,
@@ -1075,7 +1117,7 @@ describe('WS - Products : CRUD', async () => {
                 oNode.nodeName,
                 '2',
               );
-              expect(objectNodeValueFR).to.be.eq(updateNodeValueFR);
+              expect(objectNodeValueFR).to.eq(updateNodeValueFR);
             } else if (oNode.nodeName === 'new') {
               // @todo : https://github.com/PrestaShop/PrestaShop/issues/33429
             } else if (oNode.nodeName === 'position_in_category') {
@@ -1087,7 +1129,7 @@ describe('WS - Products : CRUD', async () => {
                 xmlUpdate,
                 oNode.nodeName,
               );
-              expect(oNode.textContent).to.be.eq(objectNodeValue);
+              expect(oNode.textContent).to.eq(objectNodeValue);
             }
           }
         });
@@ -1108,18 +1150,19 @@ describe('WS - Products : CRUD', async () => {
 
             // Check number of Products
             const numberOfProductsAfterFilter = await productsPage.getNumberOfProductsFromList(page);
-            await expect(numberOfProductsAfterFilter).to.be.eq(1);
+            expect(numberOfProductsAfterFilter).to.eq(1);
 
             const textColumn = await productsPage.getTextColumn(page, 'id_product', 1);
-            await expect(textColumn).to.eq(productNodeID);
+            expect(textColumn).to.eq(productNodeID);
           });
+
           it('should go to edit product page', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'goToEditProductPageAfterPut', baseContext);
 
             await productsPage.goToProductPage(page, 1);
 
             const pageTitle: string = await createProductsPage.getPageTitle(page);
-            await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+            expect(pageTitle).to.contains(createProductsPage.pageTitle);
           });
         });
 
@@ -1129,25 +1172,27 @@ describe('WS - Products : CRUD', async () => {
 
             const xmlValue = productXml.getAttributeValue(xmlUpdate, 'active');
             const value = (await createProductsPage.getProductStatus(page)) ? '1' : '0';
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check type', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckProductType', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlUpdate, 'product_type');
             const value = (await createProductsPage.getProductType(page));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check name', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckName', baseContext);
 
             const xmlValueEn = productXml.getAttributeLangValue(xmlUpdate, 'name', '1');
             const valueEn = (await createProductsPage.getProductName(page, 1));
-            expect(valueEn).to.be.eq(xmlValueEn);
+            expect(valueEn).to.eq(xmlValueEn);
 
             const xmlValueFr = productXml.getAttributeLangValue(xmlUpdate, 'name', '2');
             const valueFr = (await createProductsPage.getProductName(page, 2));
-            expect(valueFr).to.be.eq(xmlValueFr);
+            expect(valueFr).to.eq(xmlValueFr);
           });
         });
 
@@ -1157,36 +1202,39 @@ describe('WS - Products : CRUD', async () => {
 
             const xmlValueEn = productXml.getAttributeLangValue(xmlUpdate, 'description_short', '1');
             const valueEn = (await descriptionTab.getValue(page, 'summary', '1'));
-            expect(valueEn).to.be.eq(xmlValueEn);
+            expect(valueEn).to.eq(xmlValueEn);
 
             const xmlValueFr = productXml.getAttributeLangValue(xmlUpdate, 'description_short', '2');
             const valueFr = (await descriptionTab.getValue(page, 'summary', '2'));
-            expect(valueFr).to.be.eq(xmlValueFr);
+            expect(valueFr).to.eq(xmlValueFr);
           });
+
           it('should check description', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckDescription', baseContext);
 
             const xmlValueEn = productXml.getAttributeLangValue(xmlUpdate, 'description', '1');
             const valueEn = (await descriptionTab.getValue(page, 'description', '1'));
-            expect(valueEn).to.be.eq(xmlValueEn);
+            expect(valueEn).to.eq(xmlValueEn);
 
             const xmlValueFr = productXml.getAttributeLangValue(xmlUpdate, 'description', '2');
             const valueFr = (await descriptionTab.getValue(page, 'description', '2'));
-            expect(valueFr).to.be.eq(xmlValueFr);
+            expect(valueFr).to.eq(xmlValueFr);
           });
+
           it('should check default category', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckDefaultCategory', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlUpdate, 'id_category_default');
             const value = (await descriptionTab.getValue(page, 'id_category_default', '1'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check manufacturer', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckManufacturer', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlUpdate, 'id_manufacturer');
             const value = (await descriptionTab.getValue(page, 'manufacturer', '1'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
         });
 
@@ -1197,56 +1245,63 @@ describe('WS - Products : CRUD', async () => {
             await createProductsPage.goToTab(page, 'details');
 
             const isTabActive = await createProductsPage.isTabActive(page, 'details');
-            await expect(isTabActive).to.be.true;
+            expect(isTabActive).to.eq(true);
           });
+
           it('should check reference', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckReference', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlUpdate, 'reference');
             const value = (await detailsTab.getValue(page, 'reference'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check MPN', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckMPN', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlUpdate, 'mpn');
             const value = (await detailsTab.getValue(page, 'mpn'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check UPC', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckUPC', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlUpdate, 'upc');
             const value = (await detailsTab.getValue(page, 'upc'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check EAN13', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckEAN13', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlUpdate, 'ean13');
             const value = (await detailsTab.getValue(page, 'ean13'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check ISBN', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckISBN', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlUpdate, 'isbn');
             const value = (await detailsTab.getValue(page, 'isbn'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check "Display condition on product page"', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckShowCondition', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlUpdate, 'show_condition');
             const value = (await detailsTab.getValue(page, 'show_condition'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check condition', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckCondition', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlUpdate, 'condition');
             const value = (await detailsTab.getValue(page, 'condition'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
         });
 
@@ -1257,58 +1312,64 @@ describe('WS - Products : CRUD', async () => {
             await createProductsPage.goToTab(page, 'stock');
 
             const isTabActive = await createProductsPage.isTabActive(page, 'stock');
-            await expect(isTabActive).to.be.true;
+            expect(isTabActive).to.eq(true);
           });
+
           it('should check Minimum quantity for sale', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckMinimalQuantity', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlUpdate, 'minimal_quantity');
             const value = (await stocksTab.getValue(page, 'minimal_quantity'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
           // @todo : https://github.com/PrestaShop/PrestaShop/issues/33455
+
           it.skip('should check Receive a low stock alert by email', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckLowStockAlert', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlUpdate, 'low_stock_alert');
             const value = (await stocksTab.getValue(page, 'low_stock_threshold_enabled'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check the low stock alert by email', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckLowStockThreshold', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlUpdate, 'low_stock_threshold');
             const value = (await stocksTab.getValue(page, 'low_stock_threshold'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check Label when in stock', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckLabelAvailableNow', baseContext);
 
             const xmlValueEn = productXml.getAttributeLangValue(xmlUpdate, 'available_now', '1');
             const valueEn = (await stocksTab.getValue(page, 'available_now', '1'));
-            expect(valueEn).to.be.eq(xmlValueEn);
+            expect(valueEn).to.eq(xmlValueEn);
 
             const xmlValueFr = productXml.getAttributeLangValue(xmlUpdate, 'available_now', '2');
             const valueFr = (await stocksTab.getValue(page, 'available_now', '2'));
-            expect(valueFr).to.be.eq(xmlValueFr);
+            expect(valueFr).to.eq(xmlValueFr);
           });
+
           it('should check Label when out of stock', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckLabelAvailableLater', baseContext);
 
             const xmlValueEn = productXml.getAttributeLangValue(xmlUpdate, 'available_later', '1');
             const valueEn = (await stocksTab.getValue(page, 'available_later', '1'));
-            expect(valueEn).to.be.eq(xmlValueEn);
+            expect(valueEn).to.eq(xmlValueEn);
 
             const xmlValueFr = productXml.getAttributeLangValue(xmlUpdate, 'available_later', '2');
             const valueFr = (await stocksTab.getValue(page, 'available_later', '2'));
-            expect(valueFr).to.be.eq(xmlValueFr);
+            expect(valueFr).to.eq(xmlValueFr);
           });
+
           it('should check Availability date', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckAvailableDate', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlUpdate, 'available_date');
             const value = (await stocksTab.getValue(page, 'available_date'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
         });
 
@@ -1319,71 +1380,79 @@ describe('WS - Products : CRUD', async () => {
             await createProductsPage.goToTab(page, 'shipping');
 
             const isTabActive = await createProductsPage.isTabActive(page, 'shipping');
-            await expect(isTabActive).to.be.true;
+            expect(isTabActive).to.eq(true);
           });
+
           it('should check Width', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckWidth', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlUpdate, 'width');
             const value = (await shippingTab.getValue(page, 'width'));
-            expect(value).to.be.eq(parseInt(xmlValue, 10).toString());
+            expect(value).to.eq(parseInt(xmlValue, 10).toString());
           });
+
           it('should check Height', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckHeight', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlUpdate, 'height');
             const value = (await shippingTab.getValue(page, 'height'));
-            expect(value).to.be.eq(parseInt(xmlValue, 10).toString());
+            expect(value).to.eq(parseInt(xmlValue, 10).toString());
           });
+
           it('should check Depth', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckDepth', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlUpdate, 'depth');
             const value = (await shippingTab.getValue(page, 'depth'));
-            expect(value).to.be.eq(parseInt(xmlValue, 10).toString());
+            expect(value).to.eq(parseInt(xmlValue, 10).toString());
           });
+
           it('should check Weight', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckWeight', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlUpdate, 'weight');
             const value = (await shippingTab.getValue(page, 'weight'));
-            expect(value).to.be.eq(parseInt(xmlValue, 10).toString());
+            expect(value).to.eq(parseInt(xmlValue, 10).toString());
           });
+
           it('should check Delivery time', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckDeliveryTime', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlUpdate, 'additional_delivery_times');
             const value = (await shippingTab.getValue(page, 'additional_delivery_times'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check Delivery time of in-stock products', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckDeliveryInStock', baseContext);
 
             const xmlValueEn = productXml.getAttributeLangValue(xmlUpdate, 'delivery_in_stock', '1');
             const valueEn = (await shippingTab.getValue(page, 'delivery_in_stock', '1'));
-            expect(valueEn).to.be.eq(xmlValueEn);
+            expect(valueEn).to.eq(xmlValueEn);
 
             const xmlValueFr = productXml.getAttributeLangValue(xmlUpdate, 'delivery_in_stock', '2');
             const valueFr = (await shippingTab.getValue(page, 'delivery_in_stock', '2'));
-            expect(valueFr).to.be.eq(xmlValueFr);
+            expect(valueFr).to.eq(xmlValueFr);
           });
+
           it('should check Delivery time of out-of-stock products with allowed orders', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckDeliveryOutStock', baseContext);
 
             const xmlValueEn = productXml.getAttributeLangValue(xmlUpdate, 'delivery_out_stock', '1');
             const valueEn = (await shippingTab.getValue(page, 'delivery_out_stock', '1'));
-            expect(valueEn).to.be.eq(xmlValueEn);
+            expect(valueEn).to.eq(xmlValueEn);
 
             const xmlValueFr = productXml.getAttributeLangValue(xmlUpdate, 'delivery_out_stock', '2');
             const valueFr = (await shippingTab.getValue(page, 'delivery_out_stock', '2'));
-            expect(valueFr).to.be.eq(xmlValueFr);
+            expect(valueFr).to.eq(xmlValueFr);
           });
+
           it('should check Additional shipping costs', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckShippingCost', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlUpdate, 'additional_shipping_cost');
             const value = (await shippingTab.getValue(page, 'additional_shipping_cost'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
         });
 
@@ -1394,56 +1463,63 @@ describe('WS - Products : CRUD', async () => {
             await createProductsPage.goToTab(page, 'pricing');
 
             const isTabActive = await createProductsPage.isTabActive(page, 'pricing');
-            await expect(isTabActive).to.be.true;
+            expect(isTabActive).to.eq(true);
           });
+
           it('should check Retail Price (tax excl.)', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckPrice', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlUpdate, 'price');
             const value = (await pricingTab.getValue(page, 'price'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check Tax Rule', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckTaxRule', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlUpdate, 'id_tax_rules_group');
             const value = (await pricingTab.getValue(page, 'id_tax_rules_group'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check Ecotax', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckEcotax', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlUpdate, 'ecotax');
             const value = (await pricingTab.getValue(page, 'ecotax'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check Cost Price', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckWholesalePrice', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlUpdate, 'wholesale_price');
             const value = (await pricingTab.getValue(page, 'wholesale_price'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check Unit Price', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckUnitPrice', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlUpdate, 'unit_price');
             const value = (await pricingTab.getValue(page, 'unit_price'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check Unity', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckUnity', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlUpdate, 'unity');
             const value = (await pricingTab.getValue(page, 'unity'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check "Display the "On sale!" flag on the product page"', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckOnSale', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlUpdate, 'on_sale');
             const value = (await pricingTab.getValue(page, 'on_sale'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
         });
 
@@ -1454,54 +1530,59 @@ describe('WS - Products : CRUD', async () => {
             await createProductsPage.goToTab(page, 'seo');
 
             const isTabActive = await createProductsPage.isTabActive(page, 'seo');
-            await expect(isTabActive).to.be.true;
+            expect(isTabActive).to.eq(true);
           });
+
           it('should check Meta title', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckMetaTitle', baseContext);
 
             const xmlValueEn = productXml.getAttributeLangValue(xmlUpdate, 'meta_title', '1');
             const valueEn = (await seoTab.getValue(page, 'meta_title', '1'));
-            expect(valueEn).to.be.eq(xmlValueEn);
+            expect(valueEn).to.eq(xmlValueEn);
 
             const xmlValueFr = productXml.getAttributeLangValue(xmlUpdate, 'meta_title', '2');
             const valueFr = (await seoTab.getValue(page, 'meta_title', '2'));
-            expect(valueFr).to.be.eq(xmlValueFr);
+            expect(valueFr).to.eq(xmlValueFr);
           });
+
           it('should check Meta description', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckMetaDescription', baseContext);
 
             const xmlValueEn = productXml.getAttributeLangValue(xmlUpdate, 'meta_description', '1');
             const valueEn = (await seoTab.getValue(page, 'meta_description', '1'));
-            expect(valueEn).to.be.eq(xmlValueEn);
+            expect(valueEn).to.eq(xmlValueEn);
 
             const xmlValueFr = productXml.getAttributeLangValue(xmlUpdate, 'meta_description', '2');
             const valueFr = (await seoTab.getValue(page, 'meta_description', '2'));
-            expect(valueFr).to.be.eq(xmlValueFr);
+            expect(valueFr).to.eq(xmlValueFr);
           });
+
           it('should check Friendly URL', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckLinkRewrite', baseContext);
 
             const xmlValueEn = productXml.getAttributeLangValue(xmlUpdate, 'link_rewrite', '1');
             const valueEn = (await seoTab.getValue(page, 'link_rewrite', '1'));
-            expect(valueEn).to.be.eq(xmlValueEn);
+            expect(valueEn).to.eq(xmlValueEn);
 
             const xmlValueFr = productXml.getAttributeLangValue(xmlUpdate, 'link_rewrite', '2');
             const valueFr = (await seoTab.getValue(page, 'link_rewrite', '2'));
-            expect(valueFr).to.be.eq(xmlValueFr);
+            expect(valueFr).to.eq(xmlValueFr);
           });
+
           it('should check Redirection page', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckRedirectType', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlUpdate, 'redirect_type');
             const value = (await seoTab.getValue(page, 'redirect_type', '1'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check Redirection product', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckIdTypeRedirected', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlUpdate, 'id_type_redirected');
             const value = (await seoTab.getValue(page, 'id_type_redirected', '1'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
         });
 
@@ -1512,35 +1593,39 @@ describe('WS - Products : CRUD', async () => {
             await createProductsPage.goToTab(page, 'options');
 
             const isTabActive = await createProductsPage.isTabActive(page, 'options');
-            await expect(isTabActive).to.be.true;
+            expect(isTabActive).to.eq(true);
           });
+
           it('should check Visibility', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckVisibility', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlUpdate, 'visibility');
             const value = (await optionsTab.getValue(page, 'visibility'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check Available for order', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckAvailableForOrder', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlUpdate, 'available_for_order');
             const value = (await optionsTab.getValue(page, 'available_for_order'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check Show prices', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckShowPrice', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlUpdate, 'show_price');
             const value = (await optionsTab.getValue(page, 'show_price'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
+
           it('should check Web only (not sold in your retail store)', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckOnlineOnly', baseContext);
 
             const xmlValue = productXml.getAttributeValue(xmlUpdate, 'online_only');
             const value = (await optionsTab.getValue(page, 'online_only'));
-            expect(value).to.be.eq(xmlValue);
+            expect(value).to.eq(xmlValue);
           });
         });
 
@@ -1556,14 +1641,14 @@ describe('WS - Products : CRUD', async () => {
             await productsPage.closeSfToolBar(page);
 
             const pageTitle = await productsPage.getPageTitle(page);
-            await expect(pageTitle).to.contains(productsPage.pageTitle);
+            expect(pageTitle).to.contains(productsPage.pageTitle);
           });
 
           it('should reset all filters', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirstAfterPut', baseContext);
 
             const numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
-            await expect(numberOfProducts).to.be.above(0);
+            expect(numberOfProducts).to.be.above(0);
           });
         });
       });
@@ -1579,7 +1664,7 @@ describe('WS - Products : CRUD', async () => {
           productNodeID.toString(),
         );
 
-        await expect(apiResponse.status()).to.eq(200);
+        expect(apiResponse.status()).to.eq(200);
       });
 
       it(`should request the endpoint ${ProductWS.endpoint}/{id} with method GET`, async function () {
@@ -1591,7 +1676,7 @@ describe('WS - Products : CRUD', async () => {
           productNodeID.toString(),
         );
 
-        await expect(apiResponse.status()).to.eq(404);
+        expect(apiResponse.status()).to.eq(404);
       });
 
       it('should filter product by ID', async function () {
@@ -1607,14 +1692,14 @@ describe('WS - Products : CRUD', async () => {
 
         // Check number of Products
         const numberOfProductsAfterFilter = await productsPage.getNumberOfProductsFromList(page);
-        await expect(numberOfProductsAfterFilter).to.be.eq(0);
+        expect(numberOfProductsAfterFilter).to.eq(0);
       });
 
       it('should reset all filters', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
         const numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfProducts).to.be.above(0);
+        expect(numberOfProducts).to.be.above(0);
       });
     });
   });

From 8c56e8a21f4e881e5fb26f757c34f57678a26fab Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Thu, 29 Jun 2023 17:53:44 +0300
Subject: [PATCH 0778/1030]  remove feature_flag and add missing legacy links
 to feature and feature value pages

---
 install-dev/data/xml/feature_flag.xml          |  1 -
 .../routing/admin/sell/catalog/features.yml    | 18 +++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/install-dev/data/xml/feature_flag.xml b/install-dev/data/xml/feature_flag.xml
index 398d7d785f553..19d7efad8a3e3 100644
--- a/install-dev/data/xml/feature_flag.xml
+++ b/install-dev/data/xml/feature_flag.xml
@@ -24,7 +24,6 @@
     <feature_flag id="tax_rules_group" name="tax_rules_group" type="env,dotenv,db" label_wording="Tax rule groups" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated tax rules page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
     <feature_flag id="customer_threads" name="customer_threads" type="env,dotenv,db" label_wording="Customer threads" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated customer threads page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
     <feature_flag id="order_state" name="order_state" type="env,dotenv,db" label_wording="Order states" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated order states page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
-    <feature_flag id="feature" name="feature" type="env,dotenv,db" label_wording="Features" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated features page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
     <feature_flag id="symfony_layout" name="symfony_layout" type="env,query,dotenv,db" label_wording="Symfony layout" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable symfony layout (in opposition to legacy layout)." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
   </entities>
 </entity_feature_flag>
diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml
index 4ef6781d588ac..d2f36006a1b65 100644
--- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml
+++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml
@@ -1,4 +1,3 @@
-# @todo: feature flag can be removed once page is fully migrated
 admin_features_index:
   path: /
   methods: [ GET ]
@@ -6,7 +5,6 @@ admin_features_index:
     _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureController::indexAction
     _legacy_controller: AdminFeatures
     _legacy_link: AdminFeatures
-    _legacy_feature_flag: feature
 
 admin_features_horizontal_index:
   path: /horizontal
@@ -40,7 +38,6 @@ admin_features_edit:
     _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureController::editAction
     _legacy_controller: AdminFeatures
     _legacy_link: AdminFeatures:updatefeature
-    _legacy_feature_flag: feature
     _legacy_parameters:
       id_feature: featureId
   requirements:
@@ -50,7 +47,7 @@ admin_features_export:
   path: /export
   methods: GET
   defaults:
-    _controller: 'PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureController::exportAction'
+    _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureController::exportAction
     _legacy_controller: AdminFeatures
 
 admin_features_update_position:
@@ -86,8 +83,9 @@ admin_feature_values_index:
   defaults:
     _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureValueController::indexAction
     _legacy_controller: AdminFeatures
-    _legacy_link: AdminFeatures
-    _legacy_feature_flag: feature
+    _legacy_link: AdminFeatures:viewfeature
+    _legacy_parameters:
+      id_feature: featureId
   requirements:
     featureId: \d+
 
@@ -100,7 +98,6 @@ admin_feature_values_search:
     redirectRoute: admin_feature_values_index
     _legacy_controller: AdminFeatures
     _legacy_link: AdminFeatures
-    _legacy_feature_flag: feature
     redirectQueryParamsToKeep:
       - 'featureId'
   requirements:
@@ -113,7 +110,8 @@ admin_feature_values_add:
     _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureValueController::createAction
     _legacy_controller: AdminFeatures
     _legacy_link: AdminFeatures:addfeature_value
-    _legacy_feature_flag: feature
+    _legacy_parameters:
+      id_feature: featureId
     redirectQueryParamsToKeep:
       - 'featureId'
 
@@ -124,7 +122,9 @@ admin_feature_values_edit:
     _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureValueController::editAction
     _legacy_controller: AdminFeatures
     _legacy_link: AdminFeatures:updatefeature_value
-    _legacy_feature_flag: feature
+    _legacy_parameters:
+      id_feature: featureId
+      id_feature_value: featureValueId
     redirectQueryParamsToKeep:
       - 'featureId'
 

From 4aaa57f9703dc0c9b6d9fe7175c5d62c1122682d Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Thu, 29 Jun 2023 17:58:28 +0300
Subject: [PATCH 0779/1030]  remove AdminFeaturesController and related legacy
 templates

---
 .../feature_value/helpers/form/form.tpl       |  32 -
 .../feature_value/helpers/form/index.php      |  35 -
 .../feature_value/helpers/index.php           |  35 -
 .../controllers/feature_value/index.php       |  35 -
 .../features/helpers/form/form.tpl            |  32 -
 .../features/helpers/form/index.php           |  35 -
 .../controllers/features/helpers/index.php    |  35 -
 .../template/controllers/features/index.php   |  35 -
 controllers/admin/AdminFeaturesController.php | 661 ------------------
 .../controller/AdminControllerTest.php        |   1 -
 10 files changed, 936 deletions(-)
 delete mode 100644 admin-dev/themes/default/template/controllers/feature_value/helpers/form/form.tpl
 delete mode 100644 admin-dev/themes/default/template/controllers/feature_value/helpers/form/index.php
 delete mode 100644 admin-dev/themes/default/template/controllers/feature_value/helpers/index.php
 delete mode 100644 admin-dev/themes/default/template/controllers/feature_value/index.php
 delete mode 100644 admin-dev/themes/default/template/controllers/features/helpers/form/form.tpl
 delete mode 100644 admin-dev/themes/default/template/controllers/features/helpers/form/index.php
 delete mode 100644 admin-dev/themes/default/template/controllers/features/helpers/index.php
 delete mode 100644 admin-dev/themes/default/template/controllers/features/index.php
 delete mode 100644 controllers/admin/AdminFeaturesController.php

diff --git a/admin-dev/themes/default/template/controllers/feature_value/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/feature_value/helpers/form/form.tpl
deleted file mode 100644
index a302f20a18bd9..0000000000000
--- a/admin-dev/themes/default/template/controllers/feature_value/helpers/form/form.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-{**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- *}
-{extends file="helpers/form/form.tpl"}
-
-{block name="input_row"}
-	{$smarty.block.parent}
-	{if $input.name == 'value'}
-		{hook h="displayFeatureValueForm" id_feature_value=$feature_value->id|intval}
-	{/if}
-{/block}
diff --git a/admin-dev/themes/default/template/controllers/feature_value/helpers/form/index.php b/admin-dev/themes/default/template/controllers/feature_value/helpers/form/index.php
deleted file mode 100644
index 3de54df1f73e7..0000000000000
--- a/admin-dev/themes/default/template/controllers/feature_value/helpers/form/index.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
-
-header('Cache-Control: no-store, no-cache, must-revalidate');
-header('Cache-Control: post-check=0, pre-check=0', false);
-header('Pragma: no-cache');
-
-header('Location: ../../../../../../../../');
-exit;
diff --git a/admin-dev/themes/default/template/controllers/feature_value/helpers/index.php b/admin-dev/themes/default/template/controllers/feature_value/helpers/index.php
deleted file mode 100644
index b459cc3ae5750..0000000000000
--- a/admin-dev/themes/default/template/controllers/feature_value/helpers/index.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
-
-header('Cache-Control: no-store, no-cache, must-revalidate');
-header('Cache-Control: post-check=0, pre-check=0', false);
-header('Pragma: no-cache');
-
-header('Location: ../../../../../../../');
-exit;
diff --git a/admin-dev/themes/default/template/controllers/feature_value/index.php b/admin-dev/themes/default/template/controllers/feature_value/index.php
deleted file mode 100644
index 6c011614e2845..0000000000000
--- a/admin-dev/themes/default/template/controllers/feature_value/index.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
-
-header('Cache-Control: no-store, no-cache, must-revalidate');
-header('Cache-Control: post-check=0, pre-check=0', false);
-header('Pragma: no-cache');
-
-header('Location: ../../../../../../');
-exit;
diff --git a/admin-dev/themes/default/template/controllers/features/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/features/helpers/form/form.tpl
deleted file mode 100644
index f2d63f0ecc9a4..0000000000000
--- a/admin-dev/themes/default/template/controllers/features/helpers/form/form.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-{**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- *}
-{extends file="helpers/form/form.tpl"}
-
-{block name="input_row"}
-	{$smarty.block.parent}
-	{if $input.name == 'name'}
-		{hook h="displayFeatureForm" id_feature=$form_id}
-	{/if}
-{/block}
diff --git a/admin-dev/themes/default/template/controllers/features/helpers/form/index.php b/admin-dev/themes/default/template/controllers/features/helpers/form/index.php
deleted file mode 100644
index 3de54df1f73e7..0000000000000
--- a/admin-dev/themes/default/template/controllers/features/helpers/form/index.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
-
-header('Cache-Control: no-store, no-cache, must-revalidate');
-header('Cache-Control: post-check=0, pre-check=0', false);
-header('Pragma: no-cache');
-
-header('Location: ../../../../../../../../');
-exit;
diff --git a/admin-dev/themes/default/template/controllers/features/helpers/index.php b/admin-dev/themes/default/template/controllers/features/helpers/index.php
deleted file mode 100644
index b459cc3ae5750..0000000000000
--- a/admin-dev/themes/default/template/controllers/features/helpers/index.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
-
-header('Cache-Control: no-store, no-cache, must-revalidate');
-header('Cache-Control: post-check=0, pre-check=0', false);
-header('Pragma: no-cache');
-
-header('Location: ../../../../../../../');
-exit;
diff --git a/admin-dev/themes/default/template/controllers/features/index.php b/admin-dev/themes/default/template/controllers/features/index.php
deleted file mode 100644
index 6c011614e2845..0000000000000
--- a/admin-dev/themes/default/template/controllers/features/index.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
-
-header('Cache-Control: no-store, no-cache, must-revalidate');
-header('Cache-Control: post-check=0, pre-check=0', false);
-header('Pragma: no-cache');
-
-header('Location: ../../../../../../');
-exit;
diff --git a/controllers/admin/AdminFeaturesController.php b/controllers/admin/AdminFeaturesController.php
deleted file mode 100644
index 615a3c5af4d4e..0000000000000
--- a/controllers/admin/AdminFeaturesController.php
+++ /dev/null
@@ -1,661 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-/**
- * @property FeatureValue $object
- */
-class AdminFeaturesControllerCore extends AdminController
-{
-    /** @var bool */
-    public $bootstrap = true;
-    /** @var string */
-    protected $position_identifier = 'id_feature';
-    protected $feature_name;
-
-    public function __construct()
-    {
-        $this->table = 'feature';
-        $this->className = 'Feature';
-        $this->list_id = 'feature';
-        $this->identifier = 'id_feature';
-        $this->lang = true;
-
-        parent::__construct();
-
-        $this->fields_list = [
-            'id_feature' => [
-                'title' => $this->trans('ID', [], 'Admin.Global'),
-                'align' => 'center',
-                'class' => 'fixed-width-xs',
-            ],
-            'name' => [
-                'title' => $this->trans('Name', [], 'Admin.Global'),
-                'width' => 'auto',
-                'filter_key' => 'b!name',
-            ],
-            'value' => [
-                'title' => $this->trans('Values', [], 'Admin.Global'),
-                'orderby' => false,
-                'search' => false,
-                'align' => 'center',
-                'class' => 'fixed-width-xs',
-            ],
-            'position' => [
-                'title' => $this->trans('Position', [], 'Admin.Global'),
-                'filter_key' => 'a!position',
-                'align' => 'center',
-                'class' => 'fixed-width-xs',
-                'position' => 'position',
-            ],
-        ];
-
-        $this->bulk_actions = [
-            'delete' => [
-                'text' => $this->trans('Delete selected', [], 'Admin.Actions'),
-                'icon' => 'icon-trash',
-                'confirm' => $this->trans('Delete selected items?', [], 'Admin.Notifications.Warning'),
-            ],
-        ];
-    }
-
-    /**
-     * AdminController::renderList() override.
-     *
-     * @see AdminController::renderList()
-     */
-    public function renderList()
-    {
-        $this->addRowAction('view');
-        $this->addRowAction('edit');
-        $this->addRowAction('delete');
-
-        return parent::renderList();
-    }
-
-    /**
-     * Change object type to feature value (use when processing a feature value).
-     */
-    protected function setTypeValue()
-    {
-        $this->table = 'feature_value';
-        $this->className = 'FeatureValue';
-        $this->identifier = 'id_feature_value';
-    }
-
-    /**
-     * Change object type to feature (use when processing a feature).
-     */
-    protected function setTypeFeature()
-    {
-        $this->table = 'feature';
-        $this->className = 'Feature';
-        $this->identifier = 'id_feature';
-    }
-
-    /**
-     * @return false|string|void
-     *
-     * @throws PrestaShopDatabaseException
-     * @throws PrestaShopException
-     */
-    public function renderView()
-    {
-        if ($id = (int) Tools::getValue('id_feature')) {
-            $this->setTypeValue();
-            $this->list_id = 'feature_value';
-            $this->lang = true;
-
-            // Action for list
-            $this->addRowAction('edit');
-            $this->addRowAction('delete');
-
-            if (!Validate::isLoadedObject($obj = new Feature((int) $id))) {
-                $this->errors[] = $this->trans('An error occurred while updating the status for an object.', [], 'Admin.Notifications.Error') . ' <b>' . $this->table . '</b> ' . $this->trans('(cannot load object)', [], 'Admin.Notifications.Error');
-
-                return;
-            }
-
-            $this->feature_name = $obj->name;
-            $this->toolbar_title = $this->feature_name[$this->context->employee->id_lang];
-            $this->fields_list = [
-                'id_feature_value' => [
-                    'title' => $this->trans('ID', [], 'Admin.Global'),
-                    'align' => 'center',
-                    'class' => 'fixed-width-xs',
-                ],
-                'value' => [
-                    'title' => $this->trans('Value', [], 'Admin.Global'),
-                ],
-            ];
-
-            $this->_where = sprintf('AND `id_feature` = %d', (int) $id);
-            self::$currentIndex = self::$currentIndex . '&id_feature=' . (int) $id . '&viewfeature';
-            $this->processFilter();
-
-            return parent::renderList();
-        }
-    }
-
-    /**
-     * AdminController::renderForm() override.
-     *
-     * @see AdminController::renderForm()
-     */
-    public function renderForm()
-    {
-        $this->toolbar_title = $this->trans('Add a new feature', [], 'Admin.Catalog.Feature');
-        $this->fields_form = [
-            'legend' => [
-                'title' => $this->trans('Feature', [], 'Admin.Catalog.Feature'),
-                'icon' => 'icon-info-sign',
-            ],
-            'input' => [
-                [
-                    'type' => 'text',
-                    'label' => $this->trans('Name', [], 'Admin.Global'),
-                    'name' => 'name',
-                    'lang' => true,
-                    'size' => 33,
-                    'hint' => $this->trans('Invalid characters:', [], 'Admin.Notifications.Info') . ' <>;=#{}',
-                    'required' => true,
-                ],
-            ],
-        ];
-
-        if (Shop::isFeatureActive()) {
-            $this->fields_form['input'][] = [
-                'type' => 'shop',
-                'label' => $this->trans('Store association', [], 'Admin.Global'),
-                'name' => 'checkBoxShopAsso',
-            ];
-        }
-
-        $this->fields_form['submit'] = [
-            'title' => $this->trans('Save', [], 'Admin.Actions'),
-        ];
-
-        return parent::renderForm();
-    }
-
-    public function initPageHeaderToolbar()
-    {
-        if (Feature::isFeatureActive()) {
-            if (empty($this->display)) {
-                $this->page_header_toolbar_btn['new_feature'] = [
-                    'href' => self::$currentIndex . '&addfeature&token=' . $this->token,
-                    'desc' => $this->trans('Add new feature', [], 'Admin.Catalog.Feature'),
-                    'icon' => 'process-icon-new',
-                ];
-
-                $this->page_header_toolbar_btn['new_feature_value'] = [
-                    'href' => self::$currentIndex . '&addfeature_value&id_feature=' . (int) Tools::getValue('id_feature') . '&token=' . $this->token,
-                    'desc' => $this->trans('Add new feature value', [], 'Admin.Catalog.Help'),
-                    'icon' => 'process-icon-new',
-                ];
-            }
-        }
-
-        if ($this->display == 'view') {
-            $this->page_header_toolbar_btn['new_feature_value'] = [
-                'href' => self::$currentIndex . '&addfeature_value&id_feature=' . (int) Tools::getValue('id_feature') . '&token=' . $this->token,
-                'desc' => $this->trans('Add new feature value', [], 'Admin.Catalog.Help'),
-                'icon' => 'process-icon-new',
-            ];
-        }
-
-        parent::initPageHeaderToolbar();
-    }
-
-    /**
-     * AdminController::initToolbar() override.
-     *
-     * @see AdminController::initToolbar()
-     */
-    public function initToolbar()
-    {
-        switch ($this->display) {
-            case 'editFeatureValue':
-            case 'add':
-            case 'edit':
-                $this->toolbar_btn['save'] = [
-                    'href' => '#',
-                    'desc' => $this->trans('Save', [], 'Admin.Actions'),
-                ];
-
-                if ($this->display == 'editFeatureValue') {
-                    $this->toolbar_btn['save-and-stay'] = [
-                        'short' => 'SaveAndStay',
-                        'href' => '#',
-                        'desc' => $this->trans('Save and add another value', [], 'Admin.Catalog.Help'),
-                        'force_desc' => true,
-                    ];
-                }
-
-                // Default cancel button - like old back link
-                $back = Tools::safeOutput(Tools::getValue('back', ''));
-                if (empty($back)) {
-                    $back = self::$currentIndex . '&token=' . $this->token;
-                }
-
-                $this->toolbar_btn['back'] = [
-                    'href' => $back,
-                    'desc' => $this->trans('Back to the list', [], 'Admin.Catalog.Help'),
-                ];
-
-                break;
-            case 'view':
-                $this->toolbar_btn['newAttributes'] = [
-                    'href' => self::$currentIndex . '&addfeature_value&id_feature=' . (int) Tools::getValue('id_feature') . '&token=' . $this->token,
-                    'desc' => $this->trans('Add new feature values', [], 'Admin.Catalog.Help'),
-                ];
-                $this->toolbar_btn['back'] = [
-                    'href' => self::$currentIndex . '&token=' . $this->token,
-                    'desc' => $this->trans('Back to the list', [], 'Admin.Catalog.Help'),
-                ];
-
-                break;
-            default:
-                parent::initToolbar();
-        }
-    }
-
-    public function initToolbarTitle()
-    {
-        $bread_extended = $this->breadcrumbs;
-
-        switch ($this->display) {
-            case 'edit':
-                $bread_extended[] = $this->trans('Edit New Feature', [], 'Admin.Catalog.Feature');
-                $this->addMetaTitle($bread_extended[count($bread_extended) - 1]);
-
-                break;
-
-            case 'add':
-                $bread_extended[] = $this->trans('Add New Feature', [], 'Admin.Catalog.Feature');
-                $this->addMetaTitle($bread_extended[count($bread_extended) - 1]);
-
-                break;
-
-            case 'view':
-                $bread_extended[] = $this->feature_name[$this->context->employee->id_lang] ?? null;
-                $this->addMetaTitle($bread_extended[count($bread_extended) - 1]);
-
-                break;
-
-            case 'editFeatureValue':
-                if (Tools::getValue('id_feature_value')) {
-                    if (($id = (int) Tools::getValue('id_feature'))) {
-                        if (Validate::isLoadedObject($obj = new Feature((int) $id))) {
-                            $bread_extended[] = '<a href="' . Context::getContext()->link->getAdminLink('AdminFeatures') . '&id_feature=' . $id . '&viewfeature">' . $obj->name[$this->context->employee->id_lang] . '</a>';
-                        }
-
-                        if (Validate::isLoadedObject($obj = new FeatureValue((int) Tools::getValue('id_feature_value')))) {
-                            $bread_extended[] = $this->trans('Edit: %value%', ['%value%' => $obj->value[$this->context->employee->id_lang]], 'Admin.Catalog.Feature');
-                        }
-                    } else {
-                        $bread_extended[] = $this->trans('Edit value', [], 'Admin.Catalog.Feature');
-                    }
-                } else {
-                    $bread_extended[] = $this->trans('Add new value', [], 'Admin.Catalog.Feature');
-                }
-
-                if (count($bread_extended) > 0) {
-                    $this->addMetaTitle($bread_extended[count($bread_extended) - 1]);
-                }
-
-                break;
-        }
-
-        $this->toolbar_title = $bread_extended;
-    }
-
-    /**
-     * AdminController::renderForm() override.
-     *
-     * @see AdminController::renderForm()
-     */
-    public function initFormFeatureValue()
-    {
-        $this->setTypeValue();
-
-        $this->fields_form[0]['form'] = [
-            'legend' => [
-                'title' => $this->trans('Feature value', [], 'Admin.Catalog.Feature'),
-                'icon' => 'icon-info-sign',
-            ],
-            'input' => [
-                [
-                    'type' => 'select',
-                    'label' => $this->trans('Feature', [], 'Admin.Catalog.Feature'),
-                    'name' => 'id_feature',
-                    'options' => [
-                        'query' => Feature::getFeatures($this->context->language->id),
-                        'id' => 'id_feature',
-                        'name' => 'name',
-                    ],
-                    'required' => true,
-                ],
-                [
-                    'type' => 'text',
-                    'label' => $this->trans('Value', [], 'Admin.Global'),
-                    'name' => 'value',
-                    'lang' => true,
-                    'size' => 33,
-                    'hint' => $this->trans('Invalid characters:', [], 'Admin.Notifications.Info') . ' <>;=#{}',
-                    'required' => true,
-                ],
-            ],
-            'submit' => [
-                'title' => $this->trans('Save', [], 'Admin.Actions'),
-            ],
-            'buttons' => [
-                'save-and-stay' => [
-                    'title' => $this->trans('Save then add another value', [], 'Admin.Catalog.Feature'),
-                    'name' => 'submitAdd' . $this->table . 'AndStay',
-                    'type' => 'submit',
-                    'class' => 'btn btn-default pull-right',
-                    'icon' => 'process-icon-save',
-                ],
-            ],
-        ];
-
-        $this->fields_value['id_feature'] = (int) Tools::getValue('id_feature');
-
-        // Create Object FeatureValue
-        $feature_value = new FeatureValue(Tools::getValue('id_feature_value'));
-
-        $this->getlanguages();
-        $helper = new HelperForm();
-        $helper->show_cancel_button = true;
-
-        $back = Tools::safeOutput(Tools::getValue('back', ''));
-        if (empty($back)) {
-            $back = self::$currentIndex . '&token=' . $this->token;
-        }
-        if (!Validate::isCleanHtml($back)) {
-            die(Tools::displayError());
-        }
-
-        $helper->back_url = $back;
-        $helper->currentIndex = self::$currentIndex;
-        $helper->token = $this->token;
-        $helper->table = $this->table;
-        $helper->identifier = $this->identifier;
-        $helper->override_folder = 'feature_value/';
-        $helper->id = $feature_value->id;
-        $helper->toolbar_scroll = false;
-        $helper->tpl_vars = [
-            'feature_value' => $feature_value,
-        ];
-        $helper->languages = $this->_languages;
-        $helper->default_form_language = $this->default_form_language;
-        $helper->allow_employee_form_lang = $this->allow_employee_form_lang;
-        $helper->fields_value = $this->getFieldsValue($feature_value);
-        $helper->toolbar_btn = $this->toolbar_btn;
-        $helper->title = $this->trans('Add a new feature value', [], 'Admin.Catalog.Feature');
-        $this->content .= $helper->generateForm($this->fields_form);
-    }
-
-    /**
-     * AdminController::initContent() override.
-     *
-     * @see AdminController::initContent()
-     */
-    public function initContent()
-    {
-        if (Feature::isFeatureActive()) {
-            if ($this->display == 'edit' || $this->display == 'add') {
-                if (!$this->loadObject(true)) {
-                    return;
-                }
-                $this->content .= $this->renderForm();
-            } elseif ($this->display == 'view') {
-                // Some controllers use the view action without an object
-                if ($this->className) {
-                    $this->loadObject(true);
-                }
-                $this->content .= $this->renderView();
-            } elseif ($this->display == 'editFeatureValue') {
-                $this->object = new FeatureValue((int) Tools::getValue('id_feature_value'));
-                $this->content .= $this->initFormFeatureValue();
-            } elseif ($this->display != 'view' && !$this->ajax) {
-                // If a feature value was saved, we need to reset the values to display the list
-                $this->setTypeFeature();
-                $this->content .= $this->renderList();
-                /* reset all attributes filter */
-                if (!Tools::getValue('submitFilterfeature_value', 0) && !Tools::getIsset('id_feature_value')) {
-                    $this->processResetFilters('feature_value');
-                }
-            }
-        } else {
-            $adminPerformanceUrl = $this->context->link->getAdminLink('AdminPerformance');
-            $url = '<a href="' . $adminPerformanceUrl . '#featuresDetachables">' . $this->trans('Performance', [], 'Admin.Global') . '</a>';
-            $this->displayWarning($this->trans('This feature has been disabled. You can activate it here: %url%.', ['%url%' => $url], 'Admin.Catalog.Notification'));
-        }
-
-        $this->context->smarty->assign([
-            'content' => $this->content,
-        ]);
-    }
-
-    public function initProcess()
-    {
-        // Are we working on feature values?
-        if ((Tools::getValue('id_feature_value') && !Tools::getValue('id_feature'))
-            || Tools::isSubmit('deletefeature_value')
-            || Tools::isSubmit('submitAddfeature_value')
-            || Tools::isSubmit('addfeature_value')
-            || Tools::isSubmit('updatefeature_value')
-            || Tools::isSubmit('submitBulkdeletefeature_value')) {
-            $this->setTypeValue();
-        }
-
-        if (Tools::getIsset('viewfeature')) {
-            $this->list_id = 'feature_value';
-
-            if (isset($_POST['submitReset' . $this->list_id])) {
-                $this->processResetFilters();
-            }
-        } else {
-            $this->list_id = 'feature';
-            $this->_defaultOrderBy = 'position';
-            $this->_defaultOrderWay = 'ASC';
-        }
-
-        parent::initProcess();
-    }
-
-    public function postProcess()
-    {
-        if (!Feature::isFeatureActive()) {
-            return;
-        }
-
-        /* set location with current index */
-        if (Tools::getIsset('id_feature') && Tools::getIsset('viewfeature')) {
-            self::$currentIndex = self::$currentIndex . '&id_feature=' . Tools::getValue('id_feature', 0) . '&viewfeature';
-        }
-
-        if ($this->table == 'feature_value' && ($this->action == 'save' || $this->action == 'delete' || $this->action == 'bulkDelete')) {
-            Hook::exec(
-                'displayFeatureValuePostProcess',
-                ['errors' => &$this->errors]
-            );
-        } // send errors as reference to allow displayFeatureValuePostProcess to stop saving process
-        else {
-            Hook::exec(
-                'displayFeaturePostProcess',
-                ['errors' => &$this->errors]
-            );
-        } // send errors as reference to allow displayFeaturePostProcess to stop saving process
-
-        parent::postProcess();
-
-        if ($this->table == 'feature_value' && ($this->display == 'edit' || $this->display == 'add')) {
-            $this->display = 'editFeatureValue';
-        }
-    }
-
-    /**
-     * Override processAdd to change SaveAndStay button action.
-     *
-     * @see classes/AdminControllerCore::processAdd()
-     */
-    public function processAdd()
-    {
-        $object = parent::processAdd();
-
-        if (Tools::isSubmit('submitAdd' . $this->table . 'AndStay') && !count($this->errors)) {
-            if ($this->table == 'feature_value' && ($this->display == 'edit' || $this->display == 'add')) {
-                $this->redirect_after = self::$currentIndex . '&addfeature_value&id_feature=' . (int) Tools::getValue('id_feature') . '&conf=3&token=' . $this->token;
-            } else {
-                $this->redirect_after = self::$currentIndex . '&' . $this->identifier . '=&conf=3&update' . $this->table . '&token=' . $this->token;
-            }
-        } elseif (Tools::isSubmit('submitAdd' . $this->table . 'AndStay') && count($this->errors)) {
-            $this->display = 'editFeatureValue';
-        }
-
-        return $object;
-    }
-
-    /**
-     * Override processUpdate to change SaveAndStay button action.
-     *
-     * @see classes/AdminControllerCore::processUpdate()
-     */
-    public function processUpdate()
-    {
-        $object = parent::processUpdate();
-
-        if (Tools::isSubmit('submitAdd' . $this->table . 'AndStay') && !count($this->errors)) {
-            $this->redirect_after = self::$currentIndex . '&' . $this->identifier . '=&conf=3&update' . $this->table . '&token=' . $this->token;
-        }
-
-        return $object;
-    }
-
-    /**
-     * Call the right method for creating or updating object.
-     *
-     * @return mixed
-     */
-    public function processSave()
-    {
-        if ($this->table == 'feature') {
-            $id_feature = (int) Tools::getValue('id_feature');
-            // Adding last position to the feature if not exist
-            if ($id_feature <= 0) {
-                $sql = 'SELECT `position`+1
-						FROM `' . _DB_PREFIX_ . 'feature`
-						ORDER BY position DESC';
-                // set the position of the new feature in $_POST for postProcess() method
-                $_POST['position'] = Db::getInstance()->getValue($sql);
-            }
-            // clean \n\r characters
-            foreach ($_POST as $key => $value) {
-                if (preg_match('/^name_/Ui', $key)) {
-                    $_POST[$key] = str_replace('\n', '', str_replace('\r', '', $value));
-                }
-            }
-        }
-
-        return parent::processSave();
-    }
-
-    /**
-     * AdminController::getList() override.
-     *
-     * @see AdminController::getList()
-     *
-     * @param int $id_lang
-     * @param string|null $order_by
-     * @param string|null $order_way
-     * @param int $start
-     * @param int|null $limit
-     * @param int|bool $id_lang_shop
-     *
-     * @throws PrestaShopException
-     */
-    public function getList($id_lang, $order_by = null, $order_way = null, $start = 0, $limit = null, $id_lang_shop = false)
-    {
-        if ($this->table == 'feature_value') {
-            $this->_where .= ' AND (a.custom = 0 OR a.custom IS NULL)';
-        }
-
-        parent::getList($id_lang, $order_by, $order_way, $start, $limit, $id_lang_shop);
-
-        if ($this->table == 'feature') {
-            $nb_items = count($this->_list);
-            for ($i = 0; $i < $nb_items; ++$i) {
-                $item = &$this->_list[$i];
-
-                $query = new DbQuery();
-                $query->select('COUNT(fv.id_feature_value) as count_values');
-                $query->from('feature_value', 'fv');
-                $query->where('fv.id_feature =' . (int) $item['id_feature']);
-                $query->where('(fv.custom=0 OR fv.custom IS NULL)');
-                $res = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($query);
-                $item['value'] = (int) $res;
-                unset($query);
-            }
-        }
-    }
-
-    public function ajaxProcessUpdatePositions()
-    {
-        if ($this->access('edit')) {
-            $way = (bool) Tools::getValue('way');
-            $id_feature = (int) Tools::getValue('id');
-            $positions = Tools::getValue('feature');
-
-            $new_positions = [];
-            foreach ($positions as $v) {
-                if (!empty($v)) {
-                    $new_positions[] = $v;
-                }
-            }
-
-            foreach ($new_positions as $position => $value) {
-                $pos = explode('_', $value);
-
-                if (isset($pos[2]) && (int) $pos[2] === $id_feature) {
-                    $feature = new Feature((int) $pos[2]);
-                    if (Validate::isLoadedObject($feature)) {
-                        if ($feature->updatePosition($way, $position, $id_feature)) {
-                            echo 'ok position ' . (int) $position . ' for feature ' . (int) $pos[1] . '\r\n';
-                        } else {
-                            echo '{"hasError" : true, "errors" : "Can not update feature ' . (int) $id_feature . ' to position ' . (int) $position . ' "}';
-                        }
-                    } else {
-                        echo '{"hasError" : true, "errors" : "This feature (' . (int) $id_feature . ') can t be loaded"}';
-                    }
-
-                    break;
-                }
-            }
-        }
-    }
-}
diff --git a/tests/Integration/Classes/controller/AdminControllerTest.php b/tests/Integration/Classes/controller/AdminControllerTest.php
index 187a02f0ea3cd..b66e3a1372d53 100644
--- a/tests/Integration/Classes/controller/AdminControllerTest.php
+++ b/tests/Integration/Classes/controller/AdminControllerTest.php
@@ -161,7 +161,6 @@ public function getControllersClasses(): array
             ['AdminSuppliersController'],
             ['AdminAttributesGroupsController'],
             ['AdminNotFoundController'],
-            ['AdminFeaturesController'],
             ['AdminTagsController'],
             ['AdminShopController'],
             ['AdminCartRulesController'],

From 27790c981b46f6d75649b9b026d04990385d135f Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Mon, 3 Jul 2023 11:06:00 +0200
Subject: [PATCH 0780/1030] UI Tests : Migrate Feature page (Part 1)

---
 .../02_features/01_CRUDFeaturesAndValues.ts   | 20 ++++++-------
 .../02_features/features/01_filterFeatures.ts |  4 +--
 .../02_sortPaginationAndBulkDelete.ts         |  4 +--
 .../02_features/features/03_changePosition.ts |  8 ++---
 .../values/01_filterFeatureValues.ts          |  4 +--
 .../values/02_sortPaginationAndBulkDelete.ts  |  4 +--
 .../pages/BO/catalog/features/addFeature.ts   | 19 ++++++------
 .../UI/pages/BO/catalog/features/addValue.ts  | 17 +++++------
 tests/UI/pages/BO/catalog/features/index.ts   | 29 ++++++++++---------
 tests/UI/pages/BO/catalog/features/view.ts    |  4 +--
 10 files changed, 57 insertions(+), 56 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/01_CRUDFeaturesAndValues.ts b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/01_CRUDFeaturesAndValues.ts
index 58976c7849460..7021bec43dc7e 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/01_CRUDFeaturesAndValues.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/01_CRUDFeaturesAndValues.ts
@@ -81,7 +81,7 @@ describe('BO - Catalog - Attributes & Features : CRUD features and values', asyn
     await expect(pageTitle).to.contains(attributesPage.pageTitle);
   });
 
-  it('should go to features page', async function () {
+  it('should go to Features page', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'goToFeaturesPage', baseContext);
 
     await attributesPage.goToFeaturesPage(page);
@@ -104,7 +104,7 @@ describe('BO - Catalog - Attributes & Features : CRUD features and values', asyn
       await featuresPage.goToAddFeaturePage(page);
 
       const pageTitle = await addFeaturePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addFeaturePage.createPageTitle);
+      await expect(pageTitle).to.eq(addFeaturePage.createPageTitle);
     });
 
     it('should create feature', async function () {
@@ -119,9 +119,9 @@ describe('BO - Catalog - Attributes & Features : CRUD features and values', asyn
     it('should filter list of features by the created feature', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'filterFeature', baseContext);
 
-      await featuresPage.filterTable(page, 'b!name', createFeatureData.name);
+      await featuresPage.filterTable(page, 'name', createFeatureData.name);
 
-      const textColumn = await featuresPage.getTextColumn(page, 1, 'b!name');
+      const textColumn = await featuresPage.getTextColumn(page, 1, 'name');
       await expect(textColumn).to.contains(createFeatureData.name);
     });
 
@@ -131,7 +131,7 @@ describe('BO - Catalog - Attributes & Features : CRUD features and values', asyn
       await featuresPage.viewFeature(page, 1);
 
       const pageTitle = await viewFeaturePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(`${viewFeaturePage.pageTitle} ${createFeatureData.name}`);
+      await expect(pageTitle).to.contains(`${viewFeaturePage.pageTitle} • ${global.INSTALL.SHOP_NAME}`);
     });
   });
 
@@ -142,7 +142,7 @@ describe('BO - Catalog - Attributes & Features : CRUD features and values', asyn
       await viewFeaturePage.goToAddNewValuePage(page);
 
       const pageTitle = await addValuePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addValuePage.createPageTitle);
+      await expect(pageTitle).to.eq(addValuePage.createPageTitle);
     });
 
     it('should create value', async function () {
@@ -205,9 +205,9 @@ describe('BO - Catalog - Attributes & Features : CRUD features and values', asyn
     it('should filter list of features by the created feature', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'filterFeatureForUpdate', baseContext);
 
-      await featuresPage.filterTable(page, 'b!name', createFeatureData.name);
+      await featuresPage.filterTable(page, 'name', createFeatureData.name);
 
-      const textColumn = await featuresPage.getTextColumn(page, 1, 'b!name');
+      const textColumn = await featuresPage.getTextColumn(page, 1, 'name');
       await expect(textColumn).to.contains(createFeatureData.name);
     });
 
@@ -252,9 +252,9 @@ describe('BO - Catalog - Attributes & Features : CRUD features and values', asyn
     it('should filter list of features by the created feature', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'filterFeatureForDelete', baseContext);
 
-      await featuresPage.filterTable(page, 'b!name', createFeatureData.name);
+      await featuresPage.filterTable(page, 'name', createFeatureData.name);
 
-      const textColumn = await featuresPage.getTextColumn(page, 1, 'b!name');
+      const textColumn = await featuresPage.getTextColumn(page, 1, 'name');
       await expect(textColumn).to.contains(createFeatureData.name);
     });
 
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/01_filterFeatures.ts b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/01_filterFeatures.ts
index ec6cd9cb7a3cf..2d09e8e4ae487 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/01_filterFeatures.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/01_filterFeatures.ts
@@ -77,13 +77,13 @@ describe('BO - Catalog - Attributes & Features : Filter features table', async (
       },
       {
         args: {
-          testIdentifier: 'filterName', filterBy: 'b!name', filterValue: Features.composition.name,
+          testIdentifier: 'filterName', filterBy: 'name', filterValue: Features.composition.name,
         },
       },
       {
         args: {
           testIdentifier: 'filterPosition',
-          filterBy: 'a!position',
+          filterBy: 'position',
           filterValue: Features.composition.position - 1,
         },
       },
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/02_sortPaginationAndBulkDelete.ts b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/02_sortPaginationAndBulkDelete.ts
index d4f1f33d8c6be..428c0177fa6c6 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/02_sortPaginationAndBulkDelete.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/02_sortPaginationAndBulkDelete.ts
@@ -122,12 +122,12 @@ describe('BO - Catalog - Attributes & Features : Sort, pagination and bulk delet
       },
       {
         args: {
-          testIdentifier: 'sortByNameAsc', sortBy: 'b!name', sortDirection: 'up',
+          testIdentifier: 'sortByNameAsc', sortBy: 'name', sortDirection: 'up',
         },
       },
       {
         args: {
-          testIdentifier: 'sortByNameDesc', sortBy: 'b!name', sortDirection: 'down',
+          testIdentifier: 'sortByNameDesc', sortBy: 'name', sortDirection: 'down',
         },
       },
       {
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/03_changePosition.ts b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/03_changePosition.ts
index 9c32c06e09db4..ca5e279a0a946 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/03_changePosition.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/03_changePosition.ts
@@ -84,14 +84,14 @@ describe('BO - Catalog - Attributes & Features : Change feature position', async
     await testContext.addContextItem(this, 'testIdentifier', 'changeFeaturePosition', baseContext);
 
     // Get first row feature name
-    const firstRowFeatureName = await featuresPage.getTextColumn(page, 1, 'b!name');
+    const firstRowFeatureName = await featuresPage.getTextColumn(page, 1, 'name');
 
     // Change position and check successful message
     const textResult = await featuresPage.changePosition(page, 1, 2);
     await expect(textResult, 'Unable to change position').to.contains(featuresPage.successfulUpdateMessage);
 
     // Get second row feature name and check if is equal the first row feature name before changing position
-    const secondRowFeatureName = await featuresPage.getTextColumn(page, 2, 'b!name');
+    const secondRowFeatureName = await featuresPage.getTextColumn(page, 2, 'name');
     await expect(secondRowFeatureName, 'Changing position was done wrongly').to.equal(firstRowFeatureName);
   });
 
@@ -99,14 +99,14 @@ describe('BO - Catalog - Attributes & Features : Change feature position', async
     await testContext.addContextItem(this, 'testIdentifier', 'resetFeaturePosition', baseContext);
 
     // Get third row feature name
-    const secondRowFeatureName = await featuresPage.getTextColumn(page, 2, 'b!name');
+    const secondRowFeatureName = await featuresPage.getTextColumn(page, 2, 'name');
 
     // Change position and check successful message
     const textResult = await featuresPage.changePosition(page, 2, 1);
     await expect(textResult, 'Unable to change position').to.contains(featuresPage.successfulUpdateMessage);
 
     // Get first row feature name and check if is equal the first row feature name before changing position
-    const firstRowFeatureName = await featuresPage.getTextColumn(page, 1, 'b!name');
+    const firstRowFeatureName = await featuresPage.getTextColumn(page, 1, 'name');
     await expect(firstRowFeatureName, 'Changing position was done wrongly').to.equal(secondRowFeatureName);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/values/01_filterFeatureValues.ts b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/values/01_filterFeatureValues.ts
index 11995d4828cc1..2586221f3104e 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/values/01_filterFeatureValues.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/values/01_filterFeatureValues.ts
@@ -66,9 +66,9 @@ describe('BO - Catalog - Attributes & Features : Filter feature values table', a
     await testContext.addContextItem(this, 'testIdentifier', 'filterFeatures', baseContext);
 
     await featuresPage.resetFilter(page);
-    await featuresPage.filterTable(page, 'b!name', Features.composition.name);
+    await featuresPage.filterTable(page, 'name', Features.composition.name);
 
-    const textColumn = await featuresPage.getTextColumn(page, 1, 'b!name');
+    const textColumn = await featuresPage.getTextColumn(page, 1, 'name');
     await expect(textColumn).to.contains(Features.composition.name);
   });
 
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/values/02_sortPaginationAndBulkDelete.ts b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/values/02_sortPaginationAndBulkDelete.ts
index b8f4065b542c7..e1b5681c6370c 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/values/02_sortPaginationAndBulkDelete.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/values/02_sortPaginationAndBulkDelete.ts
@@ -76,9 +76,9 @@ describe('BO - Catalog - Catalog > Attributes & Features : Sort, pagination and
   it('should filter list of features by name \'Composition\'', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'filterToBulkDeleteAttributes', baseContext);
 
-    await featuresPage.filterTable(page, 'b!name', 'Composition');
+    await featuresPage.filterTable(page, 'name', 'Composition');
 
-    const textColumn = await featuresPage.getTextColumn(page, 1, 'b!name');
+    const textColumn = await featuresPage.getTextColumn(page, 1, 'name');
     await expect(textColumn).to.contains('Composition');
   });
 
diff --git a/tests/UI/pages/BO/catalog/features/addFeature.ts b/tests/UI/pages/BO/catalog/features/addFeature.ts
index 727be7ac71daf..14e9c4b7f7e6f 100644
--- a/tests/UI/pages/BO/catalog/features/addFeature.ts
+++ b/tests/UI/pages/BO/catalog/features/addFeature.ts
@@ -12,6 +12,8 @@ import type {Page} from 'playwright';
 class AddFeature extends BOBasePage {
   public readonly createPageTitle: string;
 
+  private readonly featureForm: string;
+
   private readonly nameInput: string;
 
   private readonly urlInput: string;
@@ -29,16 +31,15 @@ class AddFeature extends BOBasePage {
   constructor() {
     super();
 
-    this.createPageTitle = 'Features > Add New Feature •';
-
-    this.alertSuccessBlockParagraph = '.alert-success';
+    this.createPageTitle = `New feature • ${global.INSTALL.SHOP_NAME}`;
 
     // Form selectors
-    this.nameInput = '#name_1';
-    this.urlInput = 'input[name=\'url_name_1\']';
-    this.metaTitleInput = 'input[name=\'meta_title_1\']';
-    this.indexableToggle = (toggle: string) => `#indexable_${toggle}`;
-    this.saveButton = '#feature_form_submit_btn';
+    this.featureForm = 'form[name="feature"]';
+    this.nameInput = `${this.featureForm} #feature_name_1`;
+    this.urlInput = `${this.featureForm} #feature_url_name_1`;
+    this.metaTitleInput = `${this.featureForm} #feature_meta_title_1`;
+    this.indexableToggle = (toggle: string) => `${this.featureForm} #feature_layered_indexable_${toggle}`;
+    this.saveButton = `${this.featureForm} #save-button`;
   }
 
   /**
@@ -56,7 +57,7 @@ class AddFeature extends BOBasePage {
     await this.setValue(page, this.metaTitleInput, featureData.metaTitle);
 
     // Set indexable toggle
-    await this.setChecked(page, this.indexableToggle(featureData.indexable ? 'on' : 'off'));
+    await this.setChecked(page, this.indexableToggle(featureData.indexable ? '1' : '0'));
 
     // Save feature
     await this.clickAndWaitForURL(page, this.saveButton);
diff --git a/tests/UI/pages/BO/catalog/features/addValue.ts b/tests/UI/pages/BO/catalog/features/addValue.ts
index 3f6f542390598..14c0b35ba8289 100644
--- a/tests/UI/pages/BO/catalog/features/addValue.ts
+++ b/tests/UI/pages/BO/catalog/features/addValue.ts
@@ -33,18 +33,16 @@ class AddValue extends BOBasePage {
   constructor() {
     super();
 
-    this.createPageTitle = 'Features > Add New Feature •';
+    this.createPageTitle = `New Feature Value • ${global.INSTALL.SHOP_NAME}`;
     this.editPageTitle = 'Features > Edit New Feature •';
 
-    this.alertSuccessBlockParagraph = '.alert-success';
-
     // Form selectors
-    this.featureSelect = '#id_feature';
-    this.valueInput = '#value_1';
+    this.featureSelect = '#feature_value_feature_id';
+    this.valueInput = '#feature_value_value_1';
     this.urlInput = 'input[name=\'url_name_1\']';
     this.metaTitleInput = 'input[name=\'meta_title_1\']';
-    this.saveButton = '#feature_value_form_submit_btn';
-    this.saveAndStayButton = 'button[name=\'submitAddfeature_valueAndStay\']';
+    this.saveButton = '#save-button';
+    this.saveAndStayButton = 'button[name=\'save-and-add-new\']';
   }
 
   /**
@@ -67,10 +65,9 @@ class AddValue extends BOBasePage {
     // Save value
     if (saveAndStay) {
       await page.click(this.saveAndStayButton);
-      // Return successful message
-      return this.getAlertSuccessBlockContent(page);
+    } else {
+      await this.clickAndWaitForURL(page, this.saveButton);
     }
-    await this.clickAndWaitForURL(page, this.saveButton);
     // Return successful message
     return this.getAlertSuccessBlockParagraphContent(page);
   }
diff --git a/tests/UI/pages/BO/catalog/features/index.ts b/tests/UI/pages/BO/catalog/features/index.ts
index 87beb7d25884d..daf1e57612f0e 100644
--- a/tests/UI/pages/BO/catalog/features/index.ts
+++ b/tests/UI/pages/BO/catalog/features/index.ts
@@ -18,9 +18,11 @@ class Features extends BOBasePage {
 
   private readonly gridForm: string;
 
+  private readonly gridPanel: string;
+
   private readonly gridTableHeaderTitle: string;
 
-  private readonly gridTableNumberOfTitlesSpan: string;
+  private readonly gridHeaderTitle: string;
 
   private readonly gridTable: string;
 
@@ -98,7 +100,7 @@ class Features extends BOBasePage {
     this.pageTitle = 'Features • ';
 
     // Header selectors
-    this.addNewFeatureLink = 'a[data-role=page-header-desc-feature-link]';
+    this.addNewFeatureLink = 'a#page-header-desc-configuration-add_feature[title="Add new feature"]';
 
     // Help card selectors
     this.helpCardLink = '#toolbar-nav a.btn-help';
@@ -106,17 +108,18 @@ class Features extends BOBasePage {
 
     // Form selectors
     this.gridForm = '#form-feature';
+    this.gridPanel = '#feature_grid_panel';
     this.gridTableHeaderTitle = `${this.gridForm} .panel-heading`;
-    this.gridTableNumberOfTitlesSpan = `${this.gridTableHeaderTitle} span.badge`;
+    this.gridHeaderTitle = `${this.gridPanel} h3.card-header-title`;
 
     // Table selectors
-    this.gridTable = '#table-feature';
+    this.gridTable = '#feature_grid';
 
     // Filter selectors
-    this.filterRow = `${this.gridTable} tr.filter`;
-    this.filterColumn = (filterBy: string) => `${this.filterRow} [name='featureFilter_${filterBy}']`;
-    this.filterSearchButton = '#submitFilterButtonfeature';
-    this.filterResetButton = 'button[name=\'submitResetfeature\']';
+    this.filterRow = `${this.gridTable} tr.column-filters`;
+    this.filterColumn = (filterBy: string) => `${this.filterRow} [name='feature[${filterBy}]']`;
+    this.filterSearchButton = `${this.filterRow} button[name="feature[actions][search]"]`;
+    this.filterResetButton = `${this.filterRow} button[name="feature[actions][reset]"]`;
 
     // Table body selectors
     this.tableBody = `${this.gridTable} tbody`;
@@ -132,7 +135,7 @@ class Features extends BOBasePage {
 
     // Row actions selectors
     this.tableColumnActions = (row: number) => `${this.tableBodyColumn(row)} .btn-group-action`;
-    this.tableColumnActionsViewLink = (row: number) => `${this.tableColumnActions(row)} a[title='View']`;
+    this.tableColumnActionsViewLink = (row: number) => `${this.tableColumnActions(row)} a.grid-view-row-link`;
     this.tableColumnActionsDropDownButton = (row: number) => `${this.tableColumnActions(row)} button.dropdown-toggle`;
     this.tableColumnActionsEditLink = (row: number) => `${this.tableColumnActions(row)} li a.edit`;
     this.tableColumnActionsDeleteLink = (row: number) => `${this.tableColumnActions(row)} li a.delete`;
@@ -192,8 +195,8 @@ class Features extends BOBasePage {
    * @param page {Page} Browser tab
    * @return {Promise<number>}
    */
-  getNumberOfElementInGrid(page: Page): Promise<number> {
-    return this.getNumberFromText(page, this.gridTableNumberOfTitlesSpan);
+  async getNumberOfElementInGrid(page: Page): Promise<number> {
+    return this.getNumberFromText(page, this.gridHeaderTitle);
   }
 
   /**
@@ -234,7 +237,7 @@ class Features extends BOBasePage {
         columnSelector = this.tableColumnId(row);
         break;
 
-      case 'b!name':
+      case 'name':
         columnSelector = this.tableColumnName(row);
         break;
 
@@ -242,7 +245,7 @@ class Features extends BOBasePage {
         columnSelector = this.tableColumnValues(row);
         break;
 
-      case 'a!position':
+      case 'position':
         columnSelector = this.tableColumnPosition(row);
         break;
 
diff --git a/tests/UI/pages/BO/catalog/features/view.ts b/tests/UI/pages/BO/catalog/features/view.ts
index 2fe8ad6f270ee..c8597fe5332d8 100644
--- a/tests/UI/pages/BO/catalog/features/view.ts
+++ b/tests/UI/pages/BO/catalog/features/view.ts
@@ -87,10 +87,10 @@ class ViewFeature extends BOBasePage {
   constructor() {
     super();
 
-    this.pageTitle = 'Features >';
+    this.pageTitle = 'Features';
 
     // Header selectors
-    this.addNewValueLink = '#page-header-desc-feature_value-new_feature_value';
+    this.addNewValueLink = 'a#page-header-desc-configuration-add_feature_value[title="Add new feature value"]';
 
     // Form selectors
     this.gridForm = '#form-feature_value';

From 043a0e1a5f826877b620f49b4347e7e07ef2c1ef Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Mon, 3 Jul 2023 12:30:48 +0300
Subject: [PATCH 0781/1030]  add missing button in index page. Redirect back to
 features_index after value creation and change route url

---
 .../Controller/Admin/Sell/Catalog/FeatureController.php   | 5 +++++
 .../Admin/Sell/Catalog/FeatureValueController.php         | 8 +++-----
 .../config/routing/admin/sell/catalog/features.yml        | 6 +-----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureController.php
index 97ea9239ee251..20cf7953e5dfc 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureController.php
@@ -80,6 +80,11 @@ public function indexAction(Request $request, FeatureFilters $filters): Response
                     'desc' => $this->trans('Add new feature', 'Admin.Catalog.Feature'),
                     'icon' => 'add_circle_outline',
                 ],
+                'add_feature_value' => [
+                    'href' => $this->generateUrl('admin_feature_values_add'),
+                    'desc' => $this->trans('Add new feature value', 'Admin.Catalog.Feature'),
+                    'icon' => 'add_circle_outline',
+                ],
             ],
         ]);
     }
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
index 5dc153be1ce0f..3c3c4ee1fa3f0 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
@@ -77,15 +77,15 @@ public function indexAction(Request $request, FeatureValueFilters $filters): Res
     /**
      * @AdminSecurity("is_granted('create', request.get('_legacy_controller'))")
      *
-     * @param int $featureId
      * @param Request $request
      *
      * @return Response
      */
-    public function createAction(int $featureId, Request $request): Response
+    public function createAction(Request $request): Response
     {
         $featureValueFormBuilder = $this->get('prestashop.core.form.identifiable_object.builder.feature_value_form_builder');
         $featureValueFormHandler = $this->get('prestashop.core.form.identifiable_object.handler.feature_value_form_handler');
+        $featureId = $request->query->getInt('featureId');
 
         try {
             $featureValueForm = $featureValueFormBuilder->getForm(['feature_id' => $featureId]);
@@ -101,9 +101,7 @@ public function createAction(int $featureId, Request $request): Response
                     ]);
                 }
 
-                return $this->redirectToRoute('admin_feature_values_index', [
-                    'featureId' => $featureId,
-                ]);
+                return $this->redirectToRoute('admin_features_index');
             }
         } catch (Exception $e) {
             $this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages()));
diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml
index d2f36006a1b65..85fea8f93da19 100644
--- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml
+++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml
@@ -104,16 +104,12 @@ admin_feature_values_search:
     featureId: \d+
 
 admin_feature_values_add:
-  path: /{featureId}/values/new
+  path: /new-value
   methods: [ GET, POST ]
   defaults:
     _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureValueController::createAction
     _legacy_controller: AdminFeatures
     _legacy_link: AdminFeatures:addfeature_value
-    _legacy_parameters:
-      id_feature: featureId
-    redirectQueryParamsToKeep:
-      - 'featureId'
 
 admin_feature_values_edit:
   path: /{featureId}/values/{featureValueId}/edit

From 2949bbfd9dd714a92a14d53d4a2b3ebdc2dc817e Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Mon, 3 Jul 2023 12:47:34 +0300
Subject: [PATCH 0782/1030]  redirect to features_index or feature_values_index
 based on featureId is provided or not

---
 .../Admin/Sell/Catalog/FeatureValueController.php           | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
index 3c3c4ee1fa3f0..51715071720bd 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
@@ -101,6 +101,12 @@ public function createAction(Request $request): Response
                     ]);
                 }
 
+                if ($featureId) {
+                    return $this->redirectToRoute('admin_feature_values_index', [
+                        'featureId' => $featureId,
+                    ]);
+                }
+
                 return $this->redirectToRoute('admin_features_index');
             }
         } catch (Exception $e) {

From adb8bc52454a918ad5a578e50120709f1e011c58 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Mon, 3 Jul 2023 14:55:04 +0200
Subject: [PATCH 0783/1030] UI Tests : Migrate Feature page (Part 2)

---
 .../02_features/01_CRUDFeaturesAndValues.ts   |  6 ++--
 .../UI/pages/BO/catalog/features/addValue.ts  | 10 +++---
 tests/UI/pages/BO/catalog/features/index.ts   |  7 ++--
 tests/UI/pages/BO/catalog/features/view.ts    | 32 +++++++++----------
 4 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/01_CRUDFeaturesAndValues.ts b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/01_CRUDFeaturesAndValues.ts
index 7021bec43dc7e..d56a11e3c1e44 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/01_CRUDFeaturesAndValues.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/01_CRUDFeaturesAndValues.ts
@@ -164,10 +164,8 @@ describe('BO - Catalog - Attributes & Features : CRUD features and values', asyn
     it('should view feature and check number of values after creation', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'viewFeature1', baseContext);
 
-      await featuresPage.viewFeature(page, 1);
-
       const pageTitle = await viewFeaturePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(`${viewFeaturePage.pageTitle} ${createFeatureData.name}`);
+      await expect(pageTitle).to.contains(`${viewFeaturePage.pageTitle} • ${global.INSTALL.SHOP_NAME}`);
 
       const numberOfValuesAfterCreation = await viewFeaturePage.resetAndGetNumberOfLines(page);
       await expect(numberOfValuesAfterCreation).to.equal(numberOfValues + 2);
@@ -181,7 +179,7 @@ describe('BO - Catalog - Attributes & Features : CRUD features and values', asyn
       await viewFeaturePage.goToEditValuePage(page, 2);
 
       const pageTitle = await addValuePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addValuePage.editPageTitle);
+      await expect(pageTitle).to.eq(addValuePage.editPageTitle);
     });
 
     it('should update the second value', async function () {
diff --git a/tests/UI/pages/BO/catalog/features/addValue.ts b/tests/UI/pages/BO/catalog/features/addValue.ts
index 14c0b35ba8289..7f4c4a0ba8250 100644
--- a/tests/UI/pages/BO/catalog/features/addValue.ts
+++ b/tests/UI/pages/BO/catalog/features/addValue.ts
@@ -34,7 +34,7 @@ class AddValue extends BOBasePage {
     super();
 
     this.createPageTitle = `New Feature Value • ${global.INSTALL.SHOP_NAME}`;
-    this.editPageTitle = 'Features > Edit New Feature •';
+    this.editPageTitle = `Feature value • ${global.INSTALL.SHOP_NAME}`;
 
     // Form selectors
     this.featureSelect = '#feature_value_feature_id';
@@ -55,12 +55,14 @@ class AddValue extends BOBasePage {
   // eslint-disable-next-line consistent-return
   async addEditValue(page: Page, valueData: FeatureValueData, saveAndStay: boolean = false): Promise<string | void> {
     // Set group and value
-    await this.selectByVisibleText(page, this.featureSelect, valueData.featureName);
+    if (!(await this.isDisabled(page, this.featureSelect))) {
+      await this.selectByVisibleText(page, this.featureSelect, valueData.featureName);
+    }
     await this.setValue(page, this.valueInput, valueData.value);
 
     // Set Url and meta title
-    await this.setValue(page, this.urlInput, valueData.url);
-    await this.setValue(page, this.metaTitleInput, valueData.metaTitle);
+    //await this.setValue(page, this.urlInput, valueData.url);
+    //await this.setValue(page, this.metaTitleInput, valueData.metaTitle);
 
     // Save value
     if (saveAndStay) {
diff --git a/tests/UI/pages/BO/catalog/features/index.ts b/tests/UI/pages/BO/catalog/features/index.ts
index daf1e57612f0e..7628ff52779a5 100644
--- a/tests/UI/pages/BO/catalog/features/index.ts
+++ b/tests/UI/pages/BO/catalog/features/index.ts
@@ -20,8 +20,6 @@ class Features extends BOBasePage {
 
   private readonly gridPanel: string;
 
-  private readonly gridTableHeaderTitle: string;
-
   private readonly gridHeaderTitle: string;
 
   private readonly gridTable: string;
@@ -107,13 +105,12 @@ class Features extends BOBasePage {
     this.helpContainerBlock = '#help-container';
 
     // Form selectors
-    this.gridForm = '#form-feature';
+    this.gridForm = '#feature_value_filter_form';
     this.gridPanel = '#feature_grid_panel';
-    this.gridTableHeaderTitle = `${this.gridForm} .panel-heading`;
     this.gridHeaderTitle = `${this.gridPanel} h3.card-header-title`;
 
     // Table selectors
-    this.gridTable = '#feature_grid';
+    this.gridTable = '#feature_grid_table';
 
     // Filter selectors
     this.filterRow = `${this.gridTable} tr.column-filters`;
diff --git a/tests/UI/pages/BO/catalog/features/view.ts b/tests/UI/pages/BO/catalog/features/view.ts
index c8597fe5332d8..a3bb8fdb28ec8 100644
--- a/tests/UI/pages/BO/catalog/features/view.ts
+++ b/tests/UI/pages/BO/catalog/features/view.ts
@@ -16,9 +16,9 @@ class ViewFeature extends BOBasePage {
 
   private readonly gridForm: string;
 
-  private readonly gridTableHeaderTitle: string;
+  private readonly gridPanel: string;
 
-  private readonly gridTableNumberOfTitlesSpan: string;
+  private readonly gridHeaderTitle: string;
 
   private readonly gridTable: string;
 
@@ -94,17 +94,17 @@ class ViewFeature extends BOBasePage {
 
     // Form selectors
     this.gridForm = '#form-feature_value';
-    this.gridTableHeaderTitle = `${this.gridForm} .panel-heading`;
-    this.gridTableNumberOfTitlesSpan = `${this.gridTableHeaderTitle} span.badge`;
+    this.gridPanel = '#feature_value_grid_panel';
+    this.gridHeaderTitle = `${this.gridPanel} h3.card-header-title`;
 
     // Table selectors
-    this.gridTable = '#table-feature_value';
+    this.gridTable = '#feature_value_grid_table';
 
     // Filter selectors
-    this.filterRow = `${this.gridTable} tr.filter`;
-    this.filterColumn = (filterBy: string) => `${this.filterRow} [name='feature_valueFilter_${filterBy}']`;
-    this.filterSearchButton = '#submitFilterButtonfeature_value';
-    this.filterResetButton = 'button[name=\'submitResetfeature_value\']';
+    this.filterRow = `${this.gridTable} tr.column-filters`;
+    this.filterColumn = (filterBy: string) => `${this.filterRow} [name='feature_value[${filterBy}]']`;
+    this.filterSearchButton = `${this.filterRow} button[name="feature_value[actions][search]"]`;
+    this.filterResetButton = `${this.filterRow} button[name="feature_value[actions][reset]"]`;
 
     // Table body selectors
     this.tableBody = `${this.gridTable} tbody`;
@@ -118,10 +118,10 @@ class ViewFeature extends BOBasePage {
 
     // Row actions selectors
     this.tableColumnActions = (row: number) => `${this.tableBodyColumn(row)} .btn-group-action`;
-    this.tableColumnActionsEditLink = (row: number) => `${this.tableColumnActions(row)} a.edit`;
-    this.tableColumnActionsToggleButton = (row: number) => `${this.tableColumnActions(row)} button.dropdown-toggle`;
+    this.tableColumnActionsEditLink = (row: number) => `${this.tableColumnActions(row)} a.grid-edit-row-link`;
+    this.tableColumnActionsToggleButton = (row: number) => `${this.tableColumnActions(row)} a.dropdown-toggle`;
     this.tableColumnActionsDropdownMenu = (row: number) => `${this.tableColumnActions(row)} .dropdown-menu`;
-    this.tableColumnActionsDeleteLink = (row: number) => `${this.tableColumnActionsDropdownMenu(row)} a.delete`;
+    this.tableColumnActionsDeleteLink = (row: number) => `${this.tableColumnActionsDropdownMenu(row)} a.grid-delete-row-link`;
 
     // Bulk actions selectors
     this.bulkActionBlock = 'div.bulk-actions';
@@ -143,7 +143,7 @@ class ViewFeature extends BOBasePage {
     this.sortColumnDiv = (column: number) => `${this.tableHead} th:nth-child(${column})`;
 
     // Confirmation modal
-    this.deleteModalButtonYes = '#popup_ok';
+    this.deleteModalButtonYes = '#feature_value-grid-confirm-modal button.btn-confirm-submit';
 
     // Footer selectors
     this.backToListButton = '#desc-feature_value-back';
@@ -190,7 +190,7 @@ class ViewFeature extends BOBasePage {
     await this.waitForSelectorAndClick(page, this.tableColumnActionsDeleteLink(row));
     await this.clickAndWaitForURL(page, this.deleteModalButtonYes);
 
-    return this.getAlertSuccessBlockContent(page);
+    return this.getAlertSuccessBlockParagraphContent(page);
   }
 
   /* Filter methods */
@@ -211,8 +211,8 @@ class ViewFeature extends BOBasePage {
    * @param page {Page} Browser tab
    * @return {Promise<number>}
    */
-  getNumberOfElementInGrid(page: Page): Promise<number> {
-    return this.getNumberFromText(page, this.gridTableNumberOfTitlesSpan);
+  async getNumberOfElementInGrid(page: Page): Promise<number> {
+    return this.getNumberFromText(page, this.gridHeaderTitle);
   }
 
   /**

From fc7481623478609fba82c5b73c536d01658356cd Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Mon, 3 Jul 2023 16:02:27 +0300
Subject: [PATCH 0784/1030]  add back to list button

---
 .../Catalog/Features/FeatureValue/index.html.twig     | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/index.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/index.html.twig
index 4d39fb1ab1d38..102c13aef2838 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/index.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Features/FeatureValue/index.html.twig
@@ -29,7 +29,16 @@
 
 {% block content %}
   {% block feature_values_listing %}
-    {% include '@PrestaShop/Admin/Common/Grid/grid_panel.html.twig' with {'grid': featureValueGrid} %}
+    {% embed '@PrestaShop/Admin/Common/Grid/grid_panel.html.twig' with {'grid': featureValueGrid} %}
+      {% block grid_panel_footer %}
+        <div class="card-footer">
+          <a href="{{ path('admin_features_index') }}" class="btn btn-outline-secondary">
+            <i class="material-icons rtl-flip">arrow_back</i>
+            {{ 'Back to list'|trans({}, 'Admin.Actions') }}
+          </a>
+        </div>
+      {% endblock %}
+    {% endembed %}
   {% endblock %}
 {% endblock %}
 

From d3d145d0dd446813cdc712583c217fa0f7d46a1d Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Mon, 3 Jul 2023 20:47:38 +0200
Subject: [PATCH 0785/1030] UI Tests : Migrate Feature page (Part 3)

---
 tests/UI/pages/BO/catalog/features/editFeature.ts |  2 --
 tests/UI/pages/BO/catalog/features/index.ts       | 12 ++++++------
 tests/UI/pages/BO/catalog/features/view.ts        |  2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/tests/UI/pages/BO/catalog/features/editFeature.ts b/tests/UI/pages/BO/catalog/features/editFeature.ts
index 10b77a3ed59ca..c1048297cce75 100644
--- a/tests/UI/pages/BO/catalog/features/editFeature.ts
+++ b/tests/UI/pages/BO/catalog/features/editFeature.ts
@@ -31,8 +31,6 @@ class EditFeature extends BOBasePage {
 
     this.editPageTitle = 'Edit:';
 
-    this.alertSuccessBlockParagraph = '.alert-success';
-
     // Form selectors
     this.nameInput = '#name_1';
     this.urlInput = 'input[name=\'url_name_1\']';
diff --git a/tests/UI/pages/BO/catalog/features/index.ts b/tests/UI/pages/BO/catalog/features/index.ts
index 7628ff52779a5..01d9490208278 100644
--- a/tests/UI/pages/BO/catalog/features/index.ts
+++ b/tests/UI/pages/BO/catalog/features/index.ts
@@ -133,9 +133,9 @@ class Features extends BOBasePage {
     // Row actions selectors
     this.tableColumnActions = (row: number) => `${this.tableBodyColumn(row)} .btn-group-action`;
     this.tableColumnActionsViewLink = (row: number) => `${this.tableColumnActions(row)} a.grid-view-row-link`;
-    this.tableColumnActionsDropDownButton = (row: number) => `${this.tableColumnActions(row)} button.dropdown-toggle`;
-    this.tableColumnActionsEditLink = (row: number) => `${this.tableColumnActions(row)} li a.edit`;
-    this.tableColumnActionsDeleteLink = (row: number) => `${this.tableColumnActions(row)} li a.delete`;
+    this.tableColumnActionsDropDownButton = (row: number) => `${this.tableColumnActions(row)} a.dropdown-toggle`;
+    this.tableColumnActionsEditLink = (row: number) => `${this.tableColumnActions(row)} a.grid-edit-row-link`;
+    this.tableColumnActionsDeleteLink = (row: number) => `${this.tableColumnActions(row)} a.grid-delete-row-link`;
 
     // Pagination selectors
     this.paginationActiveLabel = `${this.gridForm} ul.pagination.pull-right li.active a`;
@@ -161,7 +161,7 @@ class Features extends BOBasePage {
     this.growlMessageBlock = '#growls .growl-message';
 
     // Confirmation modal
-    this.deleteModalButtonYes = '#popup_ok';
+    this.deleteModalButtonYes = '#feature-grid-confirm-modal button.btn-confirm-submit';
   }
 
   /* Header methods */
@@ -282,11 +282,11 @@ class Features extends BOBasePage {
    */
   async deleteFeature(page: Page, row: number): Promise<string> {
     await this.waitForSelectorAndClick(page, this.tableColumnActionsDropDownButton(row));
-    await this.clickAndWaitForURL(page, this.tableColumnActionsDeleteLink(row));
+    await this.waitForSelectorAndClick(page, this.tableColumnActionsDeleteLink(row));
 
     await this.clickAndWaitForURL(page, this.deleteModalButtonYes);
 
-    return this.getAlertSuccessBlockContent(page);
+    return this.getAlertSuccessBlockParagraphContent(page);
   }
 
   /* Helper card methods */
diff --git a/tests/UI/pages/BO/catalog/features/view.ts b/tests/UI/pages/BO/catalog/features/view.ts
index a3bb8fdb28ec8..d02aa3aca23b6 100644
--- a/tests/UI/pages/BO/catalog/features/view.ts
+++ b/tests/UI/pages/BO/catalog/features/view.ts
@@ -146,7 +146,7 @@ class ViewFeature extends BOBasePage {
     this.deleteModalButtonYes = '#feature_value-grid-confirm-modal button.btn-confirm-submit';
 
     // Footer selectors
-    this.backToListButton = '#desc-feature_value-back';
+    this.backToListButton = `${this.gridPanel} .card-footer a`;
   }
 
   /* Header methods */

From 7f323693cb1da677dd6cd835c32711b563242332 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Tue, 4 Jul 2023 09:16:47 +0200
Subject: [PATCH 0786/1030] UI Tests : Migrate Feature page (Part 4)

---
 .../values/01_filterFeatureValues.ts          |   2 +-
 .../values/02_sortPaginationAndBulkDelete.ts  |  26 ++--
 tests/UI/pages/BO/catalog/features/view.ts    | 134 ++++++++++--------
 3 files changed, 86 insertions(+), 76 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/values/01_filterFeatureValues.ts b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/values/01_filterFeatureValues.ts
index 2586221f3104e..381aa082d1296 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/values/01_filterFeatureValues.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/values/01_filterFeatureValues.ts
@@ -78,7 +78,7 @@ describe('BO - Catalog - Attributes & Features : Filter feature values table', a
     await featuresPage.viewFeature(page, 1);
 
     const pageTitle = await viewFeaturePage.getPageTitle(page);
-    await expect(pageTitle).to.contains(`${viewFeaturePage.pageTitle} ${Features.composition.name}`);
+    await expect(pageTitle).to.contains(`${viewFeaturePage.pageTitle} • ${global.INSTALL.SHOP_NAME}`);
   });
 
   it('should reset all filters and get number of features in BO', async function () {
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/values/02_sortPaginationAndBulkDelete.ts b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/values/02_sortPaginationAndBulkDelete.ts
index e1b5681c6370c..99cbc343d7e37 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/values/02_sortPaginationAndBulkDelete.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/values/02_sortPaginationAndBulkDelete.ts
@@ -88,7 +88,7 @@ describe('BO - Catalog - Catalog > Attributes & Features : Sort, pagination and
     await featuresPage.viewFeature(page, 1);
 
     const pageTitle = await viewFeaturePage.getPageTitle(page);
-    await expect(pageTitle).to.contains(`${viewFeaturePage.pageTitle} Composition`);
+    await expect(pageTitle).to.contains(`${viewFeaturePage.pageTitle} • ${global.INSTALL.SHOP_NAME}`);
 
     numberOfValues = await viewFeaturePage.resetAndGetNumberOfLines(page);
     await expect(numberOfValues).to.be.above(0);
@@ -126,10 +126,8 @@ describe('BO - Catalog - Catalog > Attributes & Features : Sort, pagination and
     it('should view feature \'Composition\' and check number of values after creation', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'viewFeatureComposition2', baseContext);
 
-      await featuresPage.viewFeature(page, 1);
-
       const pageTitle = await viewFeaturePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(`${viewFeaturePage.pageTitle} Composition`);
+      await expect(pageTitle).to.contains(`${viewFeaturePage.pageTitle} • ${global.INSTALL.SHOP_NAME}`);
 
       const numberOfValuesAfterCreation = await viewFeaturePage.resetAndGetNumberOfLines(page);
       await expect(numberOfValuesAfterCreation).to.equal(numberOfValues + 15);
@@ -142,28 +140,28 @@ describe('BO - Catalog - Catalog > Attributes & Features : Sort, pagination and
       await testContext.addContextItem(this, 'testIdentifier', 'changeItemsNumberTo20', baseContext);
 
       const paginationNumber = await viewFeaturePage.selectPaginationLimit(page, 20);
-      expect(paginationNumber).to.equal('1');
+      expect(paginationNumber).to.equal(1);
     });
 
     it('should click on next', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnNext', baseContext);
 
       const paginationNumber = await viewFeaturePage.paginationNext(page);
-      expect(paginationNumber).to.equal('2');
+      expect(paginationNumber).to.equal(2);
     });
 
     it('should click on previous', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnPrevious', baseContext);
 
       const paginationNumber = await viewFeaturePage.paginationPrevious(page);
-      expect(paginationNumber).to.equal('1');
+      expect(paginationNumber).to.equal(1);
     });
 
     it('should change the items number to 50 per page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'changeItemsNumberTo50', baseContext);
 
       const paginationNumber = await viewFeaturePage.selectPaginationLimit(page, 50);
-      expect(paginationNumber).to.equal('1');
+      expect(paginationNumber).to.equal(1);
     });
   });
 
@@ -172,22 +170,22 @@ describe('BO - Catalog - Catalog > Attributes & Features : Sort, pagination and
     const sortTests = [
       {
         args: {
-          testIdentifier: 'sortByIdDesc', sortBy: 'id_feature_value', sortDirection: 'down', isFloat: true,
+          testIdentifier: 'sortByIdDesc', sortBy: 'id_feature_value', sortDirection: 'desc', isFloat: true,
         },
       },
       {
         args: {
-          testIdentifier: 'sortByNameAsc', sortBy: 'value', sortDirection: 'up',
+          testIdentifier: 'sortByNameAsc', sortBy: 'value', sortDirection: 'asc',
         },
       },
       {
         args: {
-          testIdentifier: 'sortByNameDesc', sortBy: 'value', sortDirection: 'down',
+          testIdentifier: 'sortByNameDesc', sortBy: 'value', sortDirection: 'desc',
         },
       },
       {
         args: {
-          testIdentifier: 'sortByIdAsc', sortBy: 'id_feature_value', sortDirection: 'up', isFloat: true,
+          testIdentifier: 'sortByIdAsc', sortBy: 'id_feature_value', sortDirection: 'asc', isFloat: true,
         },
       },
     ];
@@ -208,7 +206,7 @@ describe('BO - Catalog - Catalog > Attributes & Features : Sort, pagination and
 
           const expectedResult: number[] = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
-          if (test.args.sortDirection === 'up') {
+          if (test.args.sortDirection === 'asc') {
             await expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
             await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
@@ -216,7 +214,7 @@ describe('BO - Catalog - Catalog > Attributes & Features : Sort, pagination and
         } else {
           const expectedResult: string[] = await basicHelper.sortArray(nonSortedTable);
 
-          if (test.args.sortDirection === 'up') {
+          if (test.args.sortDirection === 'asc') {
             await expect(sortedTable).to.deep.equal(expectedResult);
           } else {
             await expect(sortedTable).to.deep.equal(expectedResult.reverse());
diff --git a/tests/UI/pages/BO/catalog/features/view.ts b/tests/UI/pages/BO/catalog/features/view.ts
index d02aa3aca23b6..4b2e67ae19507 100644
--- a/tests/UI/pages/BO/catalog/features/view.ts
+++ b/tests/UI/pages/BO/catalog/features/view.ts
@@ -24,6 +24,8 @@ class ViewFeature extends BOBasePage {
 
   private readonly filterRow: string;
 
+  private readonly filterSelectAll: string;
+
   private readonly filterColumn: (filterBy: string) => string;
 
   private readonly filterSearchButton: string;
@@ -52,20 +54,22 @@ class ViewFeature extends BOBasePage {
 
   private readonly tableColumnActionsDeleteLink: (row: number) => string;
 
-  private readonly bulkActionBlock: string;
-
-  private readonly bulkActionMenuButton: string;
+  private readonly bulkActionsToggleButton: string;
 
-  private readonly bulkActionDropdownMenu: string;
+  private readonly bulkActionsDeleteButton: string;
 
-  private readonly selectAllLink: string;
+  private readonly confirmDeleteModal: string;
 
-  private readonly bulkDeleteLink: string;
+  private readonly confirmDeleteButton: string;
 
   private readonly paginationActiveLabel: string;
 
   private readonly paginationDiv: string;
 
+  private readonly paginationSelect: string;
+
+  private readonly paginationLabel: string;
+
   private readonly paginationDropdownButton: string;
 
   private readonly paginationItems: (number: number) => string;
@@ -76,9 +80,9 @@ class ViewFeature extends BOBasePage {
 
   private readonly tableHead: string;
 
-  private readonly sortColumnDiv: (column: number) => string;
+  private readonly sortColumnDiv: (column: string) => string;
 
-  private readonly deleteModalButtonYes: string;
+  private readonly sortColumnSpanButton: (column: string) => string;
 
   /**
    * @constructs
@@ -88,6 +92,7 @@ class ViewFeature extends BOBasePage {
     super();
 
     this.pageTitle = 'Features';
+    this.successfulMultiDeleteMessage = 'Successful deletion';
 
     // Header selectors
     this.addNewValueLink = 'a#page-header-desc-configuration-add_feature_value[title="Add new feature value"]';
@@ -102,6 +107,7 @@ class ViewFeature extends BOBasePage {
 
     // Filter selectors
     this.filterRow = `${this.gridTable} tr.column-filters`;
+    this.filterSelectAll = `${this.filterRow} .grid_bulk_action_select_all`;
     this.filterColumn = (filterBy: string) => `${this.filterRow} [name='feature_value[${filterBy}]']`;
     this.filterSearchButton = `${this.filterRow} button[name="feature_value[actions][search]"]`;
     this.filterResetButton = `${this.filterRow} button[name="feature_value[actions][reset]"]`;
@@ -124,26 +130,25 @@ class ViewFeature extends BOBasePage {
     this.tableColumnActionsDeleteLink = (row: number) => `${this.tableColumnActionsDropdownMenu(row)} a.grid-delete-row-link`;
 
     // Bulk actions selectors
-    this.bulkActionBlock = 'div.bulk-actions';
-    this.bulkActionMenuButton = '#bulk_action_menu_feature_value';
-    this.bulkActionDropdownMenu = `${this.bulkActionBlock} ul.dropdown-menu`;
-    this.selectAllLink = `${this.bulkActionDropdownMenu} li:nth-child(1)`;
-    this.bulkDeleteLink = `${this.bulkActionDropdownMenu} li:nth-child(4)`;
+    this.bulkActionsToggleButton = `${this.gridPanel} button.js-bulk-actions-btn`;
+    this.bulkActionsDeleteButton = '#feature_value_grid_bulk_action_delete_selection';
+    this.confirmDeleteModal = '#feature_value-grid-confirm-modal';
+    this.confirmDeleteButton = `${this.confirmDeleteModal} button.btn-confirm-submit`;
 
     // Pagination selectors
     this.paginationActiveLabel = `${this.gridForm} ul.pagination.pull-right li.active a`;
-    this.paginationDiv = `${this.gridForm} .pagination`;
+    this.paginationDiv = `${this.gridPanel} .pagination-block`;
+    this.paginationSelect = `${this.paginationDiv} #paginator_select_page_limit`;
+    this.paginationLabel = `${this.paginationDiv} .col-form-label`;
     this.paginationDropdownButton = `${this.paginationDiv} .dropdown-toggle`;
     this.paginationItems = (number: number) => `${this.gridForm} .dropdown-menu a[data-items='${number}']`;
-    this.paginationPreviousLink = `${this.gridForm} .icon-angle-left`;
-    this.paginationNextLink = `${this.gridForm} .icon-angle-right`;
+    this.paginationPreviousLink = `${this.paginationDiv} a[data-role="previous-page-link"]`;
+    this.paginationNextLink = `${this.paginationDiv} a[data-role="next-page-link"]`;
 
     // Sort Selectors
     this.tableHead = `${this.gridTable} thead`;
-    this.sortColumnDiv = (column: number) => `${this.tableHead} th:nth-child(${column})`;
-
-    // Confirmation modal
-    this.deleteModalButtonYes = '#feature_value-grid-confirm-modal button.btn-confirm-submit';
+    this.sortColumnDiv = (column: string) => `${this.tableHead} div.ps-sortable-column[data-sort-col-name='${column}']`;
+    this.sortColumnSpanButton = (column: string) => `${this.sortColumnDiv(column)} span.ps-sort`;
 
     // Footer selectors
     this.backToListButton = `${this.gridPanel} .card-footer a`;
@@ -188,7 +193,7 @@ class ViewFeature extends BOBasePage {
   async deleteValue(page: Page, row: number): Promise<string> {
     await this.waitForSelectorAndClick(page, this.tableColumnActionsToggleButton(row));
     await this.waitForSelectorAndClick(page, this.tableColumnActionsDeleteLink(row));
-    await this.clickAndWaitForURL(page, this.deleteModalButtonYes);
+    await this.clickAndWaitForURL(page, this.confirmDeleteButton);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
@@ -271,51 +276,65 @@ class ViewFeature extends BOBasePage {
    * @return {Promise<string>}
    */
   async bulkDeleteValues(page: Page): Promise<string> {
-    // To confirm bulk delete action with dialog
-    await this.dialogListener(page, true);
-
-    // Select all rows
+    // Click on Select All
     await Promise.all([
-      page.click(this.bulkActionMenuButton),
-      this.waitForVisibleSelector(page, this.selectAllLink),
+      page.$eval(this.filterSelectAll, (el: HTMLElement) => el.click()),
+      this.waitForVisibleSelector(page, `${this.bulkActionsToggleButton}:not([disabled])`),
     ]);
 
+    // Click on Button Bulk actions
     await Promise.all([
-      page.click(this.selectAllLink),
-      this.waitForHiddenSelector(page, this.selectAllLink),
+      page.click(this.bulkActionsToggleButton),
+      this.waitForVisibleSelector(page, this.bulkActionsToggleButton),
     ]);
 
-    // Perform delete
+    // Click on delete and wait for modal
     await Promise.all([
-      page.click(this.bulkActionMenuButton),
-      this.waitForVisibleSelector(page, this.bulkDeleteLink),
+      page.click(this.bulkActionsDeleteButton),
+      this.waitForVisibleSelector(page, `${this.confirmDeleteModal}.show`),
     ]);
+    await page.click(this.confirmDeleteButton);
 
-    await this.clickAndWaitForURL(page, this.bulkDeleteLink);
-
-    // Return successful message
-    return this.getAlertSuccessBlockContent(page);
+    return this.getAlertSuccessBlockParagraphContent(page);
   }
 
   /* Pagination methods */
   /**
    * Get pagination label
    * @param page {Page} Browser tab
-   * @return {Promise<string>}
+   * @return {Promise<number>}
    */
-  getPaginationLabel(page: Page): Promise<string> {
-    return this.getTextContent(page, this.paginationActiveLabel);
+  async getPaginationLabel(page: Page): Promise<number> {
+    const found = await this.elementVisible(page, this.paginationNextLink, 1000);
+
+    // In case we filter products and there is only one page, link next from pagination does not appear
+    if (!found) {
+      return (await page.$$(this.tableBodyRows)).length;
+    }
+
+    const footerText = await this.getTextContent(page, this.paginationLabel);
+    const regexMatch: RegExpMatchArray|null = footerText.match(/page ([0-9]+)/);
+
+    if (regexMatch === null) {
+      return 0;
+    }
+    const regexResult: RegExpExecArray|null = /\d+/g.exec(regexMatch.toString());
+
+    if (regexResult === null) {
+      return 0;
+    }
+
+    return parseInt(regexResult.toString(), 10);
   }
 
   /**
    * Select pagination limit
    * @param page {Page} Browser tab
    * @param number {number} Pagination number to select
-   * @returns {Promise<string>}
+   * @returns {Promise<number>}
    */
-  async selectPaginationLimit(page: Page, number: number): Promise<string> {
-    await this.waitForSelectorAndClick(page, this.paginationDropdownButton);
-    await this.clickAndWaitForURL(page, this.paginationItems(number));
+  async selectPaginationLimit(page: Page, number: number): Promise<number> {
+    await this.selectByVisibleText(page, this.paginationSelect, number);
 
     return this.getPaginationLabel(page);
   }
@@ -323,9 +342,9 @@ class ViewFeature extends BOBasePage {
   /**
    * Click on next
    * @param page {Page} Browser tab
-   * @returns {Promise<string>}
+   * @returns {Promise<number>}
    */
-  async paginationNext(page: Page): Promise<string> {
+  async paginationNext(page: Page): Promise<number> {
     await this.clickAndWaitForURL(page, this.paginationNextLink);
 
     return this.getPaginationLabel(page);
@@ -334,9 +353,9 @@ class ViewFeature extends BOBasePage {
   /**
    * Click on previous
    * @param page {Page} Browser tab
-   * @returns {Promise<string>}
+   * @returns {Promise<number>}
    */
-  async paginationPrevious(page: Page): Promise<string> {
+  async paginationPrevious(page: Page): Promise<number> {
     await this.clickAndWaitForURL(page, this.paginationPreviousLink);
 
     return this.getPaginationLabel(page);
@@ -351,23 +370,16 @@ class ViewFeature extends BOBasePage {
    * @return {Promise<void>}
    */
   async sortTable(page: Page, sortBy: string, sortDirection: string): Promise<void> {
-    let columnSelector: string;
+    const sortColumnDiv = `${this.sortColumnDiv(sortBy)}[data-sort-direction='${sortDirection}']`;
+    const sortColumnSpanButton = this.sortColumnSpanButton(sortBy);
 
-    switch (sortBy) {
-      case 'id_feature_value':
-        columnSelector = this.sortColumnDiv(2);
-        break;
-
-      case 'value':
-        columnSelector = this.sortColumnDiv(3);
-        break;
-
-      default:
-        throw new Error(`Column ${sortBy} was not found`);
+    let i: number = 0;
+    while (await this.elementNotVisible(page, sortColumnDiv, 2000) && i < 2) {
+      await page.click(sortColumnSpanButton);
+      i += 1;
     }
 
-    const sortColumnButton = `${columnSelector} i.icon-caret-${sortDirection}`;
-    await this.clickAndWaitForURL(page, sortColumnButton);
+    await this.waitForVisibleSelector(page, sortColumnDiv, 20000);
   }
 
   /**

From 39ea064b752d91b953c3277217c6a9768451109b Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Tue, 4 Jul 2023 10:43:44 +0300
Subject: [PATCH 0787/1030]  fix position number and redirect

---
 src/Core/Grid/Query/FeatureQueryBuilder.php                   | 3 +--
 .../Controller/Admin/Sell/Catalog/FeatureController.php       | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/Core/Grid/Query/FeatureQueryBuilder.php b/src/Core/Grid/Query/FeatureQueryBuilder.php
index 6e2f3b7956ce2..7b1f3cef4bce4 100644
--- a/src/Core/Grid/Query/FeatureQueryBuilder.php
+++ b/src/Core/Grid/Query/FeatureQueryBuilder.php
@@ -77,8 +77,7 @@ public function getSearchQueryBuilder(SearchCriteriaInterface $searchCriteria)
     {
         $qb = $this->getQueryBuilder($searchCriteria);
         $qb
-            ->select('f.id_feature, fl.name')
-            ->addSelect('(f.position +1) AS position')
+            ->select('f.id_feature, fl.name, f.position')
             ->addSelect('COUNT(fv.id_feature_value) AS values_count')
             ->leftJoin(
                 'f',
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureController.php
index 20cf7953e5dfc..1875659ee028c 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureController.php
@@ -170,9 +170,7 @@ public function editAction(int $featureId, Request $request): Response
             if ($handlerResult->isSubmitted() && $handlerResult->isValid()) {
                 $this->addFlash('success', $this->trans('Successful update', 'Admin.Notifications.Success'));
 
-                return $this->redirectToRoute('admin_features_edit', [
-                    'featureId' => $featureId,
-                ]);
+                return $this->redirectToRoute('admin_features_index');
             }
         } catch (Exception $e) {
             $this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages()));

From af4c41c449b18b1df2155058fe6a4aa64c682907 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Tue, 4 Jul 2023 10:37:52 +0200
Subject: [PATCH 0788/1030] UI Tests : Migrate Feature page (Part 5)

---
 .../02_features/features/01_filterFeatures.ts |  9 +-
 .../02_sortPaginationAndBulkDelete.ts         | 33 ++++---
 tests/UI/pages/BO/catalog/features/index.ts   | 90 ++++++++++---------
 tests/UI/pages/BO/catalog/features/view.ts    |  9 --
 4 files changed, 68 insertions(+), 73 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/01_filterFeatures.ts b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/01_filterFeatures.ts
index 2d09e8e4ae487..ee5226af86035 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/01_filterFeatures.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/01_filterFeatures.ts
@@ -84,7 +84,7 @@ describe('BO - Catalog - Attributes & Features : Filter features table', async (
         args: {
           testIdentifier: 'filterPosition',
           filterBy: 'position',
-          filterValue: Features.composition.position - 1,
+          filterValue: Features.composition.position,
         },
       },
     ];
@@ -107,12 +107,7 @@ describe('BO - Catalog - Attributes & Features : Filter features table', async (
           1,
           test.args.filterBy,
         );
-
-        if (typeof test.args.filterValue === 'number') {
-          await expect(textColumn).to.contains(test.args.filterValue + 1);
-        } else {
-          await expect(textColumn).to.contains(test.args.filterValue);
-        }
+        await expect(textColumn).to.contains(test.args.filterValue);
       });
 
       it('should reset all filters', async function () {
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/02_sortPaginationAndBulkDelete.ts b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/02_sortPaginationAndBulkDelete.ts
index 428c0177fa6c6..d534640b90489 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/02_sortPaginationAndBulkDelete.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/02_sortPaginationAndBulkDelete.ts
@@ -37,8 +37,10 @@ describe('BO - Catalog - Attributes & Features : Sort, pagination and bulk delet
   // PRE-condition : Create 19 features
   const creationTests: number[] = new Array(19).fill(0, 0, 19);
   creationTests.forEach((test: number, index: number) => {
-    const createFeatureData: FeatureData = new FeatureData({name: `toDelete${index}`});
-    createFeatureTest(createFeatureData, `${baseContext}_preTest${index}`);
+    if (index > 18) {
+      const createFeatureData: FeatureData = new FeatureData({name: `toDelete${index}`});
+      createFeatureTest(createFeatureData, `${baseContext}_preTest${index}`);
+    }
   });
 
   // before and after functions
@@ -87,28 +89,28 @@ describe('BO - Catalog - Attributes & Features : Sort, pagination and bulk delet
       await testContext.addContextItem(this, 'testIdentifier', 'changeItemsNumberTo20', baseContext);
 
       const paginationNumber = await featuresPage.selectPaginationLimit(page, 20);
-      expect(paginationNumber).to.equal('1');
+      expect(paginationNumber).to.equal(1);
     });
 
     it('should click on next', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnNext', baseContext);
 
       const paginationNumber = await featuresPage.paginationNext(page);
-      expect(paginationNumber).to.equal('2');
+      expect(paginationNumber).to.equal(2);
     });
 
     it('should click on previous', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnPrevious', baseContext);
 
       const paginationNumber = await featuresPage.paginationPrevious(page);
-      expect(paginationNumber).to.equal('1');
+      expect(paginationNumber).to.equal(1);
     });
 
     it('should change the items number to 50 per page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'changeItemsNumberTo50', baseContext);
 
       const paginationNumber = await featuresPage.selectPaginationLimit(page, 50);
-      expect(paginationNumber).to.equal('1');
+      expect(paginationNumber).to.equal(1);
     });
   });
 
@@ -117,32 +119,32 @@ describe('BO - Catalog - Attributes & Features : Sort, pagination and bulk delet
     const sortTests = [
       {
         args: {
-          testIdentifier: 'sortByIdDesc', sortBy: 'id_feature', sortDirection: 'down', isFloat: true,
+          testIdentifier: 'sortByIdDesc', sortBy: 'id_feature', sortDirection: 'desc', isFloat: true,
         },
       },
       {
         args: {
-          testIdentifier: 'sortByNameAsc', sortBy: 'name', sortDirection: 'up',
+          testIdentifier: 'sortByNameAsc', sortBy: 'name', sortDirection: 'asc',
         },
       },
       {
         args: {
-          testIdentifier: 'sortByNameDesc', sortBy: 'name', sortDirection: 'down',
+          testIdentifier: 'sortByNameDesc', sortBy: 'name', sortDirection: 'desc',
         },
       },
       {
         args: {
-          testIdentifier: 'sortByPositionAsc', sortBy: 'a!position', sortDirection: 'up', isFloat: true,
+          testIdentifier: 'sortByPositionAsc', sortBy: 'position', sortDirection: 'asc', isFloat: true,
         },
       },
       {
         args: {
-          testIdentifier: 'sortByPositionDesc', sortBy: 'a!position', sortDirection: 'down', isFloat: true,
+          testIdentifier: 'sortByPositionDesc', sortBy: 'position', sortDirection: 'desc', isFloat: true,
         },
       },
       {
         args: {
-          testIdentifier: 'sortByIdAsc', sortBy: 'id_feature', sortDirection: 'up', isFloat: true,
+          testIdentifier: 'sortByIdAsc', sortBy: 'id_feature', sortDirection: 'asc', isFloat: true,
         },
       },
     ];
@@ -157,13 +159,16 @@ describe('BO - Catalog - Attributes & Features : Sort, pagination and bulk delet
 
         const sortedTable = await featuresPage.getAllRowsColumnContent(page, test.args.sortBy);
 
+        console.log(nonSortedTable);
+        console.log(sortedTable);
+
         if (test.args.isFloat) {
           const nonSortedTableFloat: number[] = nonSortedTable.map((text: string): number => parseFloat(text));
           const sortedTableFloat: number[] = sortedTable.map((text: string): number => parseFloat(text));
 
           const expectedResult = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
-          if (test.args.sortDirection === 'up') {
+          if (test.args.sortDirection === 'asc') {
             await expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
             await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
@@ -171,7 +176,7 @@ describe('BO - Catalog - Attributes & Features : Sort, pagination and bulk delet
         } else {
           const expectedResult = await basicHelper.sortArray(nonSortedTable);
 
-          if (test.args.sortDirection === 'up') {
+          if (test.args.sortDirection === 'asc') {
             await expect(sortedTable).to.deep.equal(expectedResult);
           } else {
             await expect(sortedTable).to.deep.equal(expectedResult.reverse());
diff --git a/tests/UI/pages/BO/catalog/features/index.ts b/tests/UI/pages/BO/catalog/features/index.ts
index 01d9490208278..dfee0e7484724 100644
--- a/tests/UI/pages/BO/catalog/features/index.ts
+++ b/tests/UI/pages/BO/catalog/features/index.ts
@@ -58,13 +58,11 @@ class Features extends BOBasePage {
 
   private readonly tableColumnActionsDeleteLink: (row: number) => string;
 
-  private readonly paginationActiveLabel: string;
-
   private readonly paginationDiv: string;
 
-  private readonly paginationDropdownButton: string;
+  private readonly paginationSelect: string;
 
-  private readonly paginationItems: (number: number) => string;
+  private readonly paginationLabel: string;
 
   private readonly paginationPreviousLink: string;
 
@@ -72,9 +70,9 @@ class Features extends BOBasePage {
 
   private readonly tableHead: string;
 
-  private readonly sortColumnDiv: (column: number) => string;
+  private readonly sortColumnDiv: (column: string) => string;
 
-  private readonly sortColumnSpanButton: (column: number) => string;
+  private readonly sortColumnSpanButton: (column: string) => string;
 
   private readonly bulkActionBlock: string;
 
@@ -138,17 +136,16 @@ class Features extends BOBasePage {
     this.tableColumnActionsDeleteLink = (row: number) => `${this.tableColumnActions(row)} a.grid-delete-row-link`;
 
     // Pagination selectors
-    this.paginationActiveLabel = `${this.gridForm} ul.pagination.pull-right li.active a`;
-    this.paginationDiv = `${this.gridForm} .pagination`;
-    this.paginationDropdownButton = `${this.paginationDiv} .dropdown-toggle`;
-    this.paginationItems = (number: number) => `${this.gridForm} .dropdown-menu a[data-items='${number}']`;
-    this.paginationPreviousLink = `${this.gridForm} .icon-angle-left`;
-    this.paginationNextLink = `${this.gridForm} .icon-angle-right`;
+    this.paginationDiv = `${this.gridPanel} .pagination-block`;
+    this.paginationSelect = `${this.paginationDiv} #paginator_select_page_limit`;
+    this.paginationLabel = `${this.paginationDiv} .col-form-label`;
+    this.paginationPreviousLink = `${this.paginationDiv} a[data-role="previous-page-link"]`;
+    this.paginationNextLink = `${this.paginationDiv} a[data-role="next-page-link"]`;
 
     // Sort Selectors
     this.tableHead = `${this.gridTable} thead`;
-    this.sortColumnDiv = (column: number) => `${this.tableHead} th:nth-child(${column})`;
-    this.sortColumnSpanButton = (column: number) => `${this.sortColumnDiv(column)} span.ps-sort`;
+    this.sortColumnDiv = (column: string) => `${this.tableHead} div.ps-sortable-column[data-sort-col-name='${column}']`;
+    this.sortColumnSpanButton = (column: string) => `${this.sortColumnDiv(column)} span.ps-sort`;
 
     // Bulk actions selectors
     this.bulkActionBlock = 'div.bulk-actions';
@@ -328,21 +325,39 @@ class Features extends BOBasePage {
   /**
    * Get pagination label
    * @param page {Page} Browser tab
-   * @return {Promise<string>}
+   * @return {Promise<number>}
    */
-  getPaginationLabel(page: Page): Promise<string> {
-    return this.getTextContent(page, this.paginationActiveLabel);
+  async getPaginationLabel(page: Page): Promise<number> {
+    const found = await this.elementVisible(page, this.paginationNextLink, 1000);
+
+    // In case we filter products and there is only one page, link next from pagination does not appear
+    if (!found) {
+      return (await page.$$(this.tableBodyRows)).length;
+    }
+
+    const footerText = await this.getTextContent(page, this.paginationLabel);
+    const regexMatch: RegExpMatchArray|null = footerText.match(/page ([0-9]+)/);
+
+    if (regexMatch === null) {
+      return 0;
+    }
+    const regexResult: RegExpExecArray|null = /\d+/g.exec(regexMatch.toString());
+
+    if (regexResult === null) {
+      return 0;
+    }
+
+    return parseInt(regexResult.toString(), 10);
   }
 
   /**
    * Select pagination limit
    * @param page {Page} Browser tab
    * @param number {number} Pagination limit number to select
-   * @returns {Promise<string>}
+   * @returns {Promise<number>}
    */
-  async selectPaginationLimit(page: Page, number: number): Promise<string> {
-    await this.waitForSelectorAndClick(page, this.paginationDropdownButton);
-    await this.clickAndWaitForURL(page, this.paginationItems(number));
+  async selectPaginationLimit(page: Page, number: number): Promise<number> {
+    await this.selectByVisibleText(page, this.paginationSelect, number);
 
     return this.getPaginationLabel(page);
   }
@@ -350,9 +365,9 @@ class Features extends BOBasePage {
   /**
    * Click on next
    * @param page {Page} Browser tab
-   * @returns {Promise<string>}
+   * @returns {Promise<number>}
    */
-  async paginationNext(page: Page): Promise<string> {
+  async paginationNext(page: Page): Promise<number> {
     await this.clickAndWaitForURL(page, this.paginationNextLink);
 
     return this.getPaginationLabel(page);
@@ -361,9 +376,9 @@ class Features extends BOBasePage {
   /**
    * Click on previous
    * @param page {Page} Browser tab
-   * @returns {Promise<string>}
+   * @returns {Promise<number>}
    */
-  async paginationPrevious(page: Page): Promise<string> {
+  async paginationPrevious(page: Page): Promise<number> {
     await this.clickAndWaitForURL(page, this.paginationPreviousLink);
 
     return this.getPaginationLabel(page);
@@ -378,27 +393,16 @@ class Features extends BOBasePage {
    * @return {Promise<void>}
    */
   async sortTable(page: Page, sortBy: string, sortDirection: string): Promise<void> {
-    let columnSelector: string;
-
-    switch (sortBy) {
-      case 'id_feature':
-        columnSelector = this.sortColumnDiv(2);
-        break;
+    const sortColumnDiv = `${this.sortColumnDiv(sortBy)}[data-sort-direction='${sortDirection}']`;
+    const sortColumnSpanButton = this.sortColumnSpanButton(sortBy);
 
-      case 'b!name':
-        columnSelector = this.sortColumnDiv(3);
-        break;
-
-      case 'a!position':
-        columnSelector = this.sortColumnDiv(5);
-        break;
-
-      default:
-        throw new Error(`Column ${sortBy} was not found`);
+    let i: number = 0;
+    while (await this.elementNotVisible(page, sortColumnDiv, 2000) && i < 2) {
+      await page.click(sortColumnSpanButton);
+      i += 1;
     }
 
-    const sortColumnButton = `${columnSelector} i.icon-caret-${sortDirection}`;
-    await this.clickAndWaitForURL(page, sortColumnButton);
+    await this.waitForVisibleSelector(page, sortColumnDiv, 20000);
   }
 
   /**
diff --git a/tests/UI/pages/BO/catalog/features/view.ts b/tests/UI/pages/BO/catalog/features/view.ts
index 4b2e67ae19507..9bdccbfb6f77d 100644
--- a/tests/UI/pages/BO/catalog/features/view.ts
+++ b/tests/UI/pages/BO/catalog/features/view.ts
@@ -62,18 +62,12 @@ class ViewFeature extends BOBasePage {
 
   private readonly confirmDeleteButton: string;
 
-  private readonly paginationActiveLabel: string;
-
   private readonly paginationDiv: string;
 
   private readonly paginationSelect: string;
 
   private readonly paginationLabel: string;
 
-  private readonly paginationDropdownButton: string;
-
-  private readonly paginationItems: (number: number) => string;
-
   private readonly paginationPreviousLink: string;
 
   private readonly paginationNextLink: string;
@@ -136,12 +130,9 @@ class ViewFeature extends BOBasePage {
     this.confirmDeleteButton = `${this.confirmDeleteModal} button.btn-confirm-submit`;
 
     // Pagination selectors
-    this.paginationActiveLabel = `${this.gridForm} ul.pagination.pull-right li.active a`;
     this.paginationDiv = `${this.gridPanel} .pagination-block`;
     this.paginationSelect = `${this.paginationDiv} #paginator_select_page_limit`;
     this.paginationLabel = `${this.paginationDiv} .col-form-label`;
-    this.paginationDropdownButton = `${this.paginationDiv} .dropdown-toggle`;
-    this.paginationItems = (number: number) => `${this.gridForm} .dropdown-menu a[data-items='${number}']`;
     this.paginationPreviousLink = `${this.paginationDiv} a[data-role="previous-page-link"]`;
     this.paginationNextLink = `${this.paginationDiv} a[data-role="next-page-link"]`;
 

From 53d681f64dc94c4a5cf2dbe5b9e1def48cb768e7 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Tue, 4 Jul 2023 17:07:19 +0200
Subject: [PATCH 0789/1030] UI Tests : Migrate Feature page (Part 6)

---
 .../Factory/FeatureGridDefinitionFactory.php  |   1 -
 .../02_sortPaginationAndBulkDelete.ts         |  17 +-
 .../02_features/features/03_changePosition.ts |  17 +-
 tests/UI/commonTests/BO/catalog/features.ts   |   2 +-
 tests/UI/pages/BO/BObasePage.ts               |  11 ++
 tests/UI/pages/BO/catalog/features/index.ts   | 146 ++++++------------
 6 files changed, 81 insertions(+), 113 deletions(-)

diff --git a/src/Core/Grid/Definition/Factory/FeatureGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/FeatureGridDefinitionFactory.php
index e29e1b7046dde..28d745a375cf6 100644
--- a/src/Core/Grid/Definition/Factory/FeatureGridDefinitionFactory.php
+++ b/src/Core/Grid/Definition/Factory/FeatureGridDefinitionFactory.php
@@ -121,7 +121,6 @@ protected function getColumns(): ColumnCollectionInterface
                         'route' => 'admin_feature_values_index',
                         'route_param_name' => 'featureId',
                         'route_param_field' => 'id_feature',
-                        'clickable_row' => true,
                     ])
                      )
                     ->add((new LinkRowAction('edit'))
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/02_sortPaginationAndBulkDelete.ts b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/02_sortPaginationAndBulkDelete.ts
index d534640b90489..2c120595ac91e 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/02_sortPaginationAndBulkDelete.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/02_sortPaginationAndBulkDelete.ts
@@ -33,14 +33,13 @@ describe('BO - Catalog - Attributes & Features : Sort, pagination and bulk delet
   let browserContext: BrowserContext;
   let page: Page;
   let numberOfFeatures: number = 0;
+  let sortColumnName: string = 'id_feature';
 
   // PRE-condition : Create 19 features
   const creationTests: number[] = new Array(19).fill(0, 0, 19);
   creationTests.forEach((test: number, index: number) => {
-    if (index > 18) {
-      const createFeatureData: FeatureData = new FeatureData({name: `toDelete${index}`});
-      createFeatureTest(createFeatureData, `${baseContext}_preTest${index}`);
-    }
+    const createFeatureData: FeatureData = new FeatureData({name: `toDelete${index}`});
+    createFeatureTest(createFeatureData, `${baseContext}_preTest${index}`);
   });
 
   // before and after functions
@@ -153,14 +152,11 @@ describe('BO - Catalog - Attributes & Features : Sort, pagination and bulk delet
       it(`should sort by '${test.args.sortBy}' '${test.args.sortDirection}' and check result`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', test.args.testIdentifier, baseContext);
 
-        const nonSortedTable = await featuresPage.getAllRowsColumnContent(page, test.args.sortBy);
+        const nonSortedTable = await featuresPage.getAllRowsColumnContent(page, test.args.sortBy, sortColumnName);
 
         await featuresPage.sortTable(page, test.args.sortBy, test.args.sortDirection);
 
-        const sortedTable = await featuresPage.getAllRowsColumnContent(page, test.args.sortBy);
-
-        console.log(nonSortedTable);
-        console.log(sortedTable);
+        const sortedTable = await featuresPage.getAllRowsColumnContent(page, test.args.sortBy, test.args.sortBy);
 
         if (test.args.isFloat) {
           const nonSortedTableFloat: number[] = nonSortedTable.map((text: string): number => parseFloat(text));
@@ -182,6 +178,9 @@ describe('BO - Catalog - Attributes & Features : Sort, pagination and bulk delet
             await expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         }
+
+        // Previous Sort Column
+        sortColumnName = test.args.sortBy;
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/03_changePosition.ts b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/03_changePosition.ts
index ca5e279a0a946..a3e8a90bf1611 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/03_changePosition.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/03_changePosition.ts
@@ -66,11 +66,11 @@ describe('BO - Catalog - Attributes & Features : Change feature position', async
   it('should sort by \'position\' \'asc\' And check result', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'sortByPosition', baseContext);
 
-    const nonSortedTable = await featuresPage.getAllRowsColumnContent(page, 'a!position');
+    const nonSortedTable = await featuresPage.getAllRowsColumnContent(page, 'position', 'id_feature');
 
-    await featuresPage.sortTable(page, 'a!position', 'up');
+    await featuresPage.sortTable(page, 'position', 'asc');
 
-    const sortedTable = await featuresPage.getAllRowsColumnContent(page, 'a!position');
+    const sortedTable = await featuresPage.getAllRowsColumnContent(page, 'position', 'position');
 
     const nonSortedTableFloat: number[] = nonSortedTable.map((text: string): number => parseFloat(text));
     const sortedTableFloat: number[] = sortedTable.map((text: string): number => parseFloat(text));
@@ -84,29 +84,32 @@ describe('BO - Catalog - Attributes & Features : Change feature position', async
     await testContext.addContextItem(this, 'testIdentifier', 'changeFeaturePosition', baseContext);
 
     // Get first row feature name
-    const firstRowFeatureName = await featuresPage.getTextColumn(page, 1, 'name');
+    const firstRowFeatureName = await featuresPage.getTextColumn(page, 1, 'name', 'position');
 
     // Change position and check successful message
     const textResult = await featuresPage.changePosition(page, 1, 2);
     await expect(textResult, 'Unable to change position').to.contains(featuresPage.successfulUpdateMessage);
 
     // Get second row feature name and check if is equal the first row feature name before changing position
-    const secondRowFeatureName = await featuresPage.getTextColumn(page, 2, 'name');
+    const secondRowFeatureName = await featuresPage.getTextColumn(page, 2, 'name', 'position');
     await expect(secondRowFeatureName, 'Changing position was done wrongly').to.equal(firstRowFeatureName);
   });
 
   it('should reset second feature position to 1', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFeaturePosition', baseContext);
 
+    // Close alert
+    await featuresPage.closeAlertParagraph(page);
+
     // Get third row feature name
-    const secondRowFeatureName = await featuresPage.getTextColumn(page, 2, 'name');
+    const secondRowFeatureName = await featuresPage.getTextColumn(page, 2, 'name', 'position');
 
     // Change position and check successful message
     const textResult = await featuresPage.changePosition(page, 2, 1);
     await expect(textResult, 'Unable to change position').to.contains(featuresPage.successfulUpdateMessage);
 
     // Get first row feature name and check if is equal the first row feature name before changing position
-    const firstRowFeatureName = await featuresPage.getTextColumn(page, 1, 'name');
+    const firstRowFeatureName = await featuresPage.getTextColumn(page, 1, 'name', 'position');
     await expect(firstRowFeatureName, 'Changing position was done wrongly').to.equal(secondRowFeatureName);
   });
 });
diff --git a/tests/UI/commonTests/BO/catalog/features.ts b/tests/UI/commonTests/BO/catalog/features.ts
index 34ae4056525d8..6cbf498ac89e7 100644
--- a/tests/UI/commonTests/BO/catalog/features.ts
+++ b/tests/UI/commonTests/BO/catalog/features.ts
@@ -137,7 +137,7 @@ function bulkDeleteFeaturesTest(featureName: string, baseContext: string = 'comm
     it(`should filter by feature name '${featureName}'`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'filterToBulkDelete', baseContext);
 
-      await featuresPage.filterTable(page, 'b!name', featureName);
+      await featuresPage.filterTable(page, 'name', featureName);
 
       const numberOfFeaturesAfterFilter = await featuresPage.getNumberOfElementInGrid(page);
       await expect(numberOfFeaturesAfterFilter).to.be.equal(19);
diff --git a/tests/UI/pages/BO/BObasePage.ts b/tests/UI/pages/BO/BObasePage.ts
index 1decc93936c2a..0bcc889142025 100644
--- a/tests/UI/pages/BO/BObasePage.ts
+++ b/tests/UI/pages/BO/BObasePage.ts
@@ -1029,6 +1029,17 @@ export default class BOBasePage extends CommonPage {
     return this.getTextContent(page, this.alertInfoBlockParagraph);
   }
 
+  /**
+   * Close alert
+   * @param page {Page} Browser tab
+   * @return {Promise<string>}
+   */
+  async closeAlertParagraph(page: Page): Promise<void> {
+    if (await this.elementVisible(page, this.alertBlockCloseButton, 1000)) {
+      await this.waitForSelectorAndClick(page, this.alertBlockCloseButton);
+    }
+  }
+
   /**
    * Navigate to BO page without token
    * @param page {Page} Browser tab
diff --git a/tests/UI/pages/BO/catalog/features/index.ts b/tests/UI/pages/BO/catalog/features/index.ts
index dfee0e7484724..4fc900ef57404 100644
--- a/tests/UI/pages/BO/catalog/features/index.ts
+++ b/tests/UI/pages/BO/catalog/features/index.ts
@@ -12,10 +12,6 @@ class Features extends BOBasePage {
 
   private readonly addNewFeatureLink: string;
 
-  private readonly helpCardLink: string;
-
-  private readonly helpContainerBlock: string;
-
   private readonly gridForm: string;
 
   private readonly gridPanel: string;
@@ -26,6 +22,8 @@ class Features extends BOBasePage {
 
   private readonly filterRow: string;
 
+  private readonly filterSelectAll: string;
+
   private readonly filterColumn: (filterBy: string) => string;
 
   private readonly filterSearchButton: string;
@@ -40,13 +38,15 @@ class Features extends BOBasePage {
 
   private readonly tableBodyColumn: (row: number) => string;
 
-  private readonly tableColumnId: (row: number) => string;
+  private readonly tableColumnDrag: (row: number) => string;
+
+  private readonly tableColumnId: (row: number, hasDragColumn: boolean) => string;
 
-  private readonly tableColumnName: (row: number) => string;
+  private readonly tableColumnName: (row: number, hasDragColumn: boolean) => string;
 
-  private readonly tableColumnValues: (row: number) => string;
+  private readonly tableColumnValues: (row: number, hasDragColumn: boolean) => string;
 
-  private readonly tableColumnPosition: (row: number) => string;
+  private readonly tableColumnPosition: (row: number, hasDragColumn: boolean) => string;
 
   private readonly tableColumnActions: (row: number) => string;
 
@@ -74,17 +74,13 @@ class Features extends BOBasePage {
 
   private readonly sortColumnSpanButton: (column: string) => string;
 
-  private readonly bulkActionBlock: string;
+  private readonly bulkActionsToggleButton: string;
 
-  private readonly bulkActionMenuButton: string;
+  private readonly bulkActionsDeleteButton: string;
 
-  private readonly bulkActionDropdownMenu: string;
+  private readonly confirmDeleteModal: string;
 
-  private readonly selectAllLink: string;
-
-  private readonly bulkDeleteLink: string;
-
-  private readonly deleteModalButtonYes: string;
+  private readonly confirmDeleteButton: string;
 
   /**
    * @constructs
@@ -94,14 +90,11 @@ class Features extends BOBasePage {
     super();
 
     this.pageTitle = 'Features • ';
+    this.successfulMultiDeleteMessage = 'Successful deletion';
 
     // Header selectors
     this.addNewFeatureLink = 'a#page-header-desc-configuration-add_feature[title="Add new feature"]';
 
-    // Help card selectors
-    this.helpCardLink = '#toolbar-nav a.btn-help';
-    this.helpContainerBlock = '#help-container';
-
     // Form selectors
     this.gridForm = '#feature_value_filter_form';
     this.gridPanel = '#feature_grid_panel';
@@ -112,6 +105,7 @@ class Features extends BOBasePage {
 
     // Filter selectors
     this.filterRow = `${this.gridTable} tr.column-filters`;
+    this.filterSelectAll = `${this.filterRow} .grid_bulk_action_select_all`;
     this.filterColumn = (filterBy: string) => `${this.filterRow} [name='feature[${filterBy}]']`;
     this.filterSearchButton = `${this.filterRow} button[name="feature[actions][search]"]`;
     this.filterResetButton = `${this.filterRow} button[name="feature[actions][reset]"]`;
@@ -123,10 +117,15 @@ class Features extends BOBasePage {
     this.tableBodyColumn = (row: number) => `${this.tableBodyRow(row)} td`;
 
     // Columns selectors
-    this.tableColumnId = (row: number) => `${this.tableBodyColumn(row)}:nth-child(2)`;
-    this.tableColumnName = (row: number) => `${this.tableBodyColumn(row)}:nth-child(3)`;
-    this.tableColumnValues = (row: number) => `${this.tableBodyColumn(row)}:nth-child(4)`;
-    this.tableColumnPosition = (row: number) => `${this.tableBodyColumn(row)}:nth-child(5)`;
+    this.tableColumnDrag = (row: number) => `${this.tableBodyColumn(row)}.js-drag-handle`;
+    this.tableColumnId = (row: number, hasDragColumn: boolean) => `${
+      this.tableBodyColumn(row)}:nth-child(${hasDragColumn ? 3 : 2})`;
+    this.tableColumnName = (row: number, hasDragColumn: boolean) => `${
+      this.tableBodyColumn(row)}:nth-child(${hasDragColumn ? 4 : 3})`;
+    this.tableColumnValues = (row: number, hasDragColumn: boolean) => `${
+      this.tableBodyColumn(row)}:nth-child(${hasDragColumn ? 5 : 4})`;
+    this.tableColumnPosition = (row: number, hasDragColumn: boolean) => `${
+      this.tableBodyColumn(row)}:nth-child(${hasDragColumn ? 6 : 5})`;
 
     // Row actions selectors
     this.tableColumnActions = (row: number) => `${this.tableBodyColumn(row)} .btn-group-action`;
@@ -148,17 +147,10 @@ class Features extends BOBasePage {
     this.sortColumnSpanButton = (column: string) => `${this.sortColumnDiv(column)} span.ps-sort`;
 
     // Bulk actions selectors
-    this.bulkActionBlock = 'div.bulk-actions';
-    this.bulkActionMenuButton = '#bulk_action_menu_feature';
-    this.bulkActionDropdownMenu = `${this.bulkActionBlock} ul.dropdown-menu`;
-    this.selectAllLink = `${this.bulkActionDropdownMenu} li:nth-child(1)`;
-    this.bulkDeleteLink = `${this.bulkActionDropdownMenu} li:nth-child(4)`;
-
-    // Growl message
-    this.growlMessageBlock = '#growls .growl-message';
-
-    // Confirmation modal
-    this.deleteModalButtonYes = '#feature-grid-confirm-modal button.btn-confirm-submit';
+    this.bulkActionsToggleButton = `${this.gridPanel} button.js-bulk-actions-btn`;
+    this.bulkActionsDeleteButton = '#feature_grid_bulk_action_delete_selection';
+    this.confirmDeleteModal = '#feature-grid-confirm-modal';
+    this.confirmDeleteButton = `${this.confirmDeleteModal} button.btn-confirm-submit`;
   }
 
   /* Header methods */
@@ -221,26 +213,27 @@ class Features extends BOBasePage {
    * @param page {Page} Browser tab
    * @param row {number} Feature row in table
    * @param columnName {string} Column name to get
+   * @param sortColumnName {string} Sorted Column name
    * @return {Promise<string>}
    */
-  async getTextColumn(page: Page, row: number, columnName: string): Promise<string> {
+  async getTextColumn(page: Page, row: number, columnName: string, sortColumnName: string = ''): Promise<string> {
     let columnSelector: string;
 
     switch (columnName) {
       case 'id_feature':
-        columnSelector = this.tableColumnId(row);
+        columnSelector = this.tableColumnId(row, sortColumnName === 'position');
         break;
 
       case 'name':
-        columnSelector = this.tableColumnName(row);
+        columnSelector = this.tableColumnName(row, sortColumnName === 'position');
         break;
 
       case 'values':
-        columnSelector = this.tableColumnValues(row);
+        columnSelector = this.tableColumnValues(row, sortColumnName === 'position');
         break;
 
       case 'position':
-        columnSelector = this.tableColumnPosition(row);
+        columnSelector = this.tableColumnPosition(row, sortColumnName === 'position');
         break;
 
       default:
@@ -281,46 +274,11 @@ class Features extends BOBasePage {
     await this.waitForSelectorAndClick(page, this.tableColumnActionsDropDownButton(row));
     await this.waitForSelectorAndClick(page, this.tableColumnActionsDeleteLink(row));
 
-    await this.clickAndWaitForURL(page, this.deleteModalButtonYes);
+    await this.clickAndWaitForURL(page, this.confirmDeleteButton);
 
     return this.getAlertSuccessBlockParagraphContent(page);
   }
 
-  /* Helper card methods */
-  /**
-   * @override
-   * Open help sidebar
-   * @param page {Page} Browser tab
-   * @returns {Promise<boolean>}
-   */
-  async openHelpSideBar(page: Page): Promise<boolean> {
-    await page.click(this.helpCardLink);
-
-    return this.elementVisible(page, this.helpContainerBlock, 4000);
-  }
-
-  /**
-   * @override
-   * Close help sidebar
-   * @param page {Page} Browser tab
-   * @returns {Promise<boolean>}
-   */
-  async closeHelpSideBar(page: Page): Promise<boolean> {
-    await page.click(this.helpCardLink);
-
-    return this.elementNotVisible(page, this.helpContainerBlock, 2000);
-  }
-
-  /**
-   * @override
-   * Get help card URL
-   * @param page {Page} Browser tab
-   * @returns {Promise<string>}
-   */
-  async getHelpDocumentURL(page: Page): Promise<string> {
-    return this.getAttributeContent(page, this.helpCardLink, 'href');
-  }
-
   /* Pagination methods */
   /**
    * Get pagination label
@@ -409,14 +367,15 @@ class Features extends BOBasePage {
    * Get content from all rows
    * @param page {Page} Browser tab
    * @param columnName {string} Column name to get all content
+   * @param sortColumnName {string} Column name to sort
    * @return {Promise<Array<string>>}
    */
-  async getAllRowsColumnContent(page: Page, columnName: string): Promise<string[]> {
+  async getAllRowsColumnContent(page: Page, columnName: string, sortColumnName: string = ''): Promise<string[]> {
     const rowsNumber = await this.getNumberOfElementInGrid(page);
     const allRowsContentTable: string[] = [];
 
     for (let i: number = 1; i <= rowsNumber; i++) {
-      const rowContent = await this.getTextColumn(page, i, columnName);
+      const rowContent = await this.getTextColumn(page, i, columnName, sortColumnName);
       allRowsContentTable.push(rowContent);
     }
 
@@ -430,29 +389,26 @@ class Features extends BOBasePage {
    * @return {Promise<string>}
    */
   async bulkDeleteFeatures(page: Page): Promise<string> {
-    // To confirm bulk delete action with dialog
-    await this.dialogListener(page, true);
-
-    // Select all rows
+    // Click on Select All
     await Promise.all([
-      page.click(this.bulkActionMenuButton),
-      this.waitForVisibleSelector(page, this.selectAllLink),
+      page.$eval(this.filterSelectAll, (el: HTMLElement) => el.click()),
+      this.waitForVisibleSelector(page, `${this.bulkActionsToggleButton}:not([disabled])`),
     ]);
 
+    // Click on Button Bulk actions
     await Promise.all([
-      page.click(this.selectAllLink),
-      this.waitForHiddenSelector(page, this.selectAllLink),
+      page.click(this.bulkActionsToggleButton),
+      this.waitForVisibleSelector(page, this.bulkActionsToggleButton),
     ]);
 
+    // Click on delete and wait for modal
     await Promise.all([
-      page.click(this.bulkActionMenuButton),
-      this.waitForVisibleSelector(page, this.bulkDeleteLink),
+      page.click(this.bulkActionsDeleteButton),
+      this.waitForVisibleSelector(page, `${this.confirmDeleteModal}.show`),
     ]);
+    await this.clickAndWaitForURL(page, this.confirmDeleteButton);
 
-    await this.clickAndWaitForURL(page, this.bulkDeleteLink);
-
-    // Return successful message
-    return this.getAlertSuccessBlockContent(page);
+    return this.getAlertSuccessBlockParagraphContent(page);
   }
 
   /**
@@ -465,11 +421,11 @@ class Features extends BOBasePage {
   async changePosition(page: Page, actualPosition: number, newPosition: number): Promise<string | null> {
     await this.dragAndDrop(
       page,
-      this.tableColumnPosition(actualPosition),
-      this.tableColumnPosition(newPosition),
+      this.tableColumnDrag(actualPosition),
+      this.tableColumnDrag(newPosition),
     );
 
-    return page.textContent(this.growlMessageBlock);
+    return this.getAlertSuccessBlockParagraphContent(page);
   }
 }
 

From 6ded7a65531834b445b002ee5622226a656c3c6f Mon Sep 17 00:00:00 2001
From: Julius Zukauskas <julius.zukauskas@invertus.eu>
Date: Wed, 5 Jul 2023 12:12:23 +0300
Subject: [PATCH 0790/1030]  add layoutTitle as feature name when viewing
 feature

---
 .../Sell/Catalog/FeatureValueController.php   | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
index 51715071720bd..b20399564f5a8 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
@@ -33,7 +33,10 @@
 use PrestaShop\PrestaShop\Core\Domain\Feature\Command\DeleteFeatureValueCommand;
 use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\BulkFeatureValueException;
 use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\CannotDeleteFeatureValueException;
+use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\FeatureNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\FeatureValueNotFoundException;
+use PrestaShop\PrestaShop\Core\Domain\Feature\Query\GetFeatureForEditing;
+use PrestaShop\PrestaShop\Core\Domain\Feature\QueryResult\EditableFeature;
 use PrestaShop\PrestaShop\Core\Grid\Factory\FeatureValueGridFactory;
 use PrestaShop\PrestaShop\Core\Search\Filters\FeatureValueFilters;
 use PrestaShopBundle\Component\CsvResponse;
@@ -56,14 +59,24 @@ class FeatureValueController extends FrameworkBundleAdminController
     /**
      * @AdminSecurity("is_granted('read', request.get('_legacy_controller'))")
      */
-    public function indexAction(Request $request, FeatureValueFilters $filters): Response
+    public function indexAction(int $featureId, Request $request, FeatureValueFilters $filters): Response
     {
         $featureValueGridFactory = $this->get(FeatureValueGridFactory::class);
 
+        try {
+            /** @var EditableFeature $editableFeature */
+            $editableFeature = $this->getQueryBus()->handle(new GetFeatureForEditing($featureId));
+        } catch (Exception $e) {
+            $this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages()));
+
+            return $this->redirectToRoute('admin_features_index');
+        }
+
         return $this->render('@PrestaShop/Admin/Sell/Catalog/Features/FeatureValue/index.html.twig', [
             'enableSidebar' => true,
             'help_link' => $this->generateSidebarLink($request->attributes->get('_legacy_controller')),
             'featureValueGrid' => $this->presentGrid($featureValueGridFactory->getGrid($filters)),
+            'layoutTitle' => $editableFeature->getName()[$this->getContextLangId()],
             'layoutHeaderToolbarBtn' => [
                 'add_feature_value' => [
                     'href' => $this->generateUrl('admin_feature_values_add', ['featureId' => $filters->getFeatureId()]),
@@ -255,6 +268,10 @@ public function bulkDeleteAction(int $featureId, Request $request): Response
     private function getErrorMessages(): array
     {
         return [
+            FeatureNotFoundException::class => $this->trans(
+                'The object cannot be loaded (or found).',
+                'Admin.Notifications.Error'
+            ),
             FeatureValueNotFoundException::class => $this->trans(
                 'The object cannot be loaded (or found).',
                 'Admin.Notifications.Error'

From 99b092ae44622c4f0f6690682b5ebfa6d2685b26 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Thu, 6 Jul 2023 08:48:37 +0200
Subject: [PATCH 0791/1030] UI Tests : Migrate Feature page (Part 7)

---
 .../02_features/01_CRUDFeaturesAndValues.ts   |  6 +++---
 .../02_features/features/03_changePosition.ts | 19 ++++++++++++++++++-
 .../values/01_filterFeatureValues.ts          |  4 ++--
 .../values/02_sortPaginationAndBulkDelete.ts  |  9 +++++----
 tests/UI/pages/BO/BObasePage.ts               | 11 -----------
 5 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/01_CRUDFeaturesAndValues.ts b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/01_CRUDFeaturesAndValues.ts
index d56a11e3c1e44..681414d846941 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/01_CRUDFeaturesAndValues.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/01_CRUDFeaturesAndValues.ts
@@ -131,7 +131,7 @@ describe('BO - Catalog - Attributes & Features : CRUD features and values', asyn
       await featuresPage.viewFeature(page, 1);
 
       const pageTitle = await viewFeaturePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(`${viewFeaturePage.pageTitle} • ${global.INSTALL.SHOP_NAME}`);
+      await expect(pageTitle).to.contains(`${createFeatureData.name} • ${global.INSTALL.SHOP_NAME}`);
     });
   });
 
@@ -165,7 +165,7 @@ describe('BO - Catalog - Attributes & Features : CRUD features and values', asyn
       await testContext.addContextItem(this, 'testIdentifier', 'viewFeature1', baseContext);
 
       const pageTitle = await viewFeaturePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(`${viewFeaturePage.pageTitle} • ${global.INSTALL.SHOP_NAME}`);
+      await expect(pageTitle).to.contains(`${createFeatureData.name} • ${global.INSTALL.SHOP_NAME}`);
 
       const numberOfValuesAfterCreation = await viewFeaturePage.resetAndGetNumberOfLines(page);
       await expect(numberOfValuesAfterCreation).to.equal(numberOfValues + 2);
@@ -226,7 +226,7 @@ describe('BO - Catalog - Attributes & Features : CRUD features and values', asyn
       await featuresPage.viewFeature(page, 1);
 
       const pageTitle = await viewFeaturePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(`${viewFeaturePage.pageTitle} ${createFeatureData.name}`);
+      await expect(pageTitle).to.contains(`${editFeatureData.name} • ${global.INSTALL.SHOP_NAME}`);
     });
 
     it('should delete the second value', async function () {
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/03_changePosition.ts b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/03_changePosition.ts
index a3e8a90bf1611..b8315f0059ccd 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/03_changePosition.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/03_changePosition.ts
@@ -99,7 +99,7 @@ describe('BO - Catalog - Attributes & Features : Change feature position', async
     await testContext.addContextItem(this, 'testIdentifier', 'resetFeaturePosition', baseContext);
 
     // Close alert
-    await featuresPage.closeAlertParagraph(page);
+    await featuresPage.closeAlertBlock(page);
 
     // Get third row feature name
     const secondRowFeatureName = await featuresPage.getTextColumn(page, 2, 'name', 'position');
@@ -112,4 +112,21 @@ describe('BO - Catalog - Attributes & Features : Change feature position', async
     const firstRowFeatureName = await featuresPage.getTextColumn(page, 1, 'name', 'position');
     await expect(firstRowFeatureName, 'Changing position was done wrongly').to.equal(secondRowFeatureName);
   });
+
+  it('should reset the sort to \'id_feature\'', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'sortByIdFeature', baseContext);
+
+    const nonSortedTable = await featuresPage.getAllRowsColumnContent(page, 'position', 'position');
+
+    await featuresPage.sortTable(page, 'id_feature', 'asc');
+
+    const sortedTable = await featuresPage.getAllRowsColumnContent(page, 'position', 'id_feature');
+
+    const nonSortedTableFloat: number[] = nonSortedTable.map((text: string): number => parseFloat(text));
+    const sortedTableFloat: number[] = sortedTable.map((text: string): number => parseFloat(text));
+
+    const expectedResult: number[] = await basicHelper.sortArrayNumber(nonSortedTableFloat);
+
+    await expect(sortedTableFloat).to.deep.equal(expectedResult);
+  });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/values/01_filterFeatureValues.ts b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/values/01_filterFeatureValues.ts
index 381aa082d1296..d0d194f292934 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/values/01_filterFeatureValues.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/values/01_filterFeatureValues.ts
@@ -68,7 +68,7 @@ describe('BO - Catalog - Attributes & Features : Filter feature values table', a
     await featuresPage.resetFilter(page);
     await featuresPage.filterTable(page, 'name', Features.composition.name);
 
-    const textColumn = await featuresPage.getTextColumn(page, 1, 'name');
+    const textColumn = await featuresPage.getTextColumn(page, 1, 'name', 'id_feature');
     await expect(textColumn).to.contains(Features.composition.name);
   });
 
@@ -78,7 +78,7 @@ describe('BO - Catalog - Attributes & Features : Filter feature values table', a
     await featuresPage.viewFeature(page, 1);
 
     const pageTitle = await viewFeaturePage.getPageTitle(page);
-    await expect(pageTitle).to.contains(`${viewFeaturePage.pageTitle} • ${global.INSTALL.SHOP_NAME}`);
+    await expect(pageTitle).to.contains(`${Features.composition.name} • ${global.INSTALL.SHOP_NAME}`);
   });
 
   it('should reset all filters and get number of features in BO', async function () {
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/values/02_sortPaginationAndBulkDelete.ts b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/values/02_sortPaginationAndBulkDelete.ts
index 99cbc343d7e37..0fed31c2e19df 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/values/02_sortPaginationAndBulkDelete.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/values/02_sortPaginationAndBulkDelete.ts
@@ -14,6 +14,7 @@ import viewFeaturePage from '@pages/BO/catalog/features/view';
 import dashboardPage from '@pages/BO/dashboard';
 
 // Import data
+import Features from '@data/demo/features';
 import FeatureValueData from '@data/faker/featureValue';
 
 import {expect} from 'chai';
@@ -76,9 +77,9 @@ describe('BO - Catalog - Catalog > Attributes & Features : Sort, pagination and
   it('should filter list of features by name \'Composition\'', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'filterToBulkDeleteAttributes', baseContext);
 
-    await featuresPage.filterTable(page, 'name', 'Composition');
+    await featuresPage.filterTable(page, 'name', Features.composition.name);
 
-    const textColumn = await featuresPage.getTextColumn(page, 1, 'name');
+    const textColumn = await featuresPage.getTextColumn(page, 1, 'name', 'id_feature');
     await expect(textColumn).to.contains('Composition');
   });
 
@@ -88,7 +89,7 @@ describe('BO - Catalog - Catalog > Attributes & Features : Sort, pagination and
     await featuresPage.viewFeature(page, 1);
 
     const pageTitle = await viewFeaturePage.getPageTitle(page);
-    await expect(pageTitle).to.contains(`${viewFeaturePage.pageTitle} • ${global.INSTALL.SHOP_NAME}`);
+    await expect(pageTitle).to.contains(`${Features.composition.name} • ${global.INSTALL.SHOP_NAME}`);
 
     numberOfValues = await viewFeaturePage.resetAndGetNumberOfLines(page);
     await expect(numberOfValues).to.be.above(0);
@@ -127,7 +128,7 @@ describe('BO - Catalog - Catalog > Attributes & Features : Sort, pagination and
       await testContext.addContextItem(this, 'testIdentifier', 'viewFeatureComposition2', baseContext);
 
       const pageTitle = await viewFeaturePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(`${viewFeaturePage.pageTitle} • ${global.INSTALL.SHOP_NAME}`);
+      await expect(pageTitle).to.contains(`${Features.composition.name} • ${global.INSTALL.SHOP_NAME}`);
 
       const numberOfValuesAfterCreation = await viewFeaturePage.resetAndGetNumberOfLines(page);
       await expect(numberOfValuesAfterCreation).to.equal(numberOfValues + 15);
diff --git a/tests/UI/pages/BO/BObasePage.ts b/tests/UI/pages/BO/BObasePage.ts
index 0bcc889142025..1decc93936c2a 100644
--- a/tests/UI/pages/BO/BObasePage.ts
+++ b/tests/UI/pages/BO/BObasePage.ts
@@ -1029,17 +1029,6 @@ export default class BOBasePage extends CommonPage {
     return this.getTextContent(page, this.alertInfoBlockParagraph);
   }
 
-  /**
-   * Close alert
-   * @param page {Page} Browser tab
-   * @return {Promise<string>}
-   */
-  async closeAlertParagraph(page: Page): Promise<void> {
-    if (await this.elementVisible(page, this.alertBlockCloseButton, 1000)) {
-      await this.waitForSelectorAndClick(page, this.alertBlockCloseButton);
-    }
-  }
-
   /**
    * Navigate to BO page without token
    * @param page {Page} Browser tab

From 1ded1e6e0c3435aa94bb6623b16ec86a81a16576 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Thu, 6 Jul 2023 16:36:36 +0200
Subject: [PATCH 0792/1030] UI Tests : Migrate Feature page (Part 8)

---
 .../02_features/features/03_changePosition.ts | 172 +++++++++++-------
 1 file changed, 111 insertions(+), 61 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/03_changePosition.ts b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/03_changePosition.ts
index b8315f0059ccd..ff9e620864885 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/03_changePosition.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/03_changePosition.ts
@@ -10,6 +10,10 @@ import loginCommon from '@commonTests/BO/loginBO';
 import attributesPage from '@pages/BO/catalog/attributes';
 import featuresPage from '@pages/BO/catalog/features';
 import dashboardPage from '@pages/BO/dashboard';
+import addFeaturePage from '@pages/BO/catalog/features/addFeature';
+
+// Import data
+import FeatureData from '@data/faker/feature';
 
 import {expect} from 'chai';
 import type {BrowserContext, Page} from 'playwright';
@@ -25,6 +29,7 @@ Reset value position
 describe('BO - Catalog - Attributes & Features : Change feature position', async () => {
   let browserContext: BrowserContext;
   let page: Page;
+  const createFeatureData: FeatureData = new FeatureData({name: 'Texture'});
 
   // before and after functions
   before(async function () {
@@ -36,97 +41,142 @@ describe('BO - Catalog - Attributes & Features : Change feature position', async
     await helper.closeBrowserContext(browserContext);
   });
 
-  it('should login in BO', async function () {
-    await loginCommon.loginBO(this, page);
-  });
+  describe('PRE-TEST: Create new feature', async () => {
+    it('should login in BO', async function () {
+      await loginCommon.loginBO(this, page);
+    });
 
-  it('should go to \'Catalog > Attributes & Features\' page', async function () {
-    await testContext.addContextItem(this, 'testIdentifier', 'goToAttributesPage', baseContext);
+    it('should go to \'Catalog > Attributes & Features\' page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToAttributesPage', baseContext);
 
-    await dashboardPage.goToSubMenu(
-      page,
-      dashboardPage.catalogParentLink,
-      dashboardPage.attributesAndFeaturesLink,
-    );
-    await attributesPage.closeSfToolBar(page);
+      await dashboardPage.goToSubMenu(
+        page,
+        dashboardPage.catalogParentLink,
+        dashboardPage.attributesAndFeaturesLink,
+      );
+      await attributesPage.closeSfToolBar(page);
 
-    const pageTitle = await attributesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(attributesPage.pageTitle);
-  });
+      const pageTitle = await attributesPage.getPageTitle(page);
+      await expect(pageTitle).to.contains(attributesPage.pageTitle);
+    });
+
+    it('should go to Features page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToFeaturesPage', baseContext);
+
+      await attributesPage.goToFeaturesPage(page);
 
-  it('should go to Features page', async function () {
-    await testContext.addContextItem(this, 'testIdentifier', 'goToFeaturesPage', baseContext);
+      const pageTitle = await featuresPage.getPageTitle(page);
+      await expect(pageTitle).to.contains(featuresPage.pageTitle);
+    });
 
-    await attributesPage.goToFeaturesPage(page);
+    it('should go to add new feature page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToAddNewFeaturePage', baseContext);
 
-    const pageTitle = await featuresPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(featuresPage.pageTitle);
+      await featuresPage.goToAddFeaturePage(page);
+
+      const pageTitle = await addFeaturePage.getPageTitle(page);
+      await expect(pageTitle).to.eq(addFeaturePage.createPageTitle);
+    });
+
+    it('should create feature', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'createNewFeature', baseContext);
+
+      const textResult = await addFeaturePage.setFeature(page, createFeatureData);
+      await expect(textResult).to.contains(featuresPage.successfulCreationMessage);
+    });
   });
 
-  it('should sort by \'position\' \'asc\' And check result', async function () {
-    await testContext.addContextItem(this, 'testIdentifier', 'sortByPosition', baseContext);
+  describe('Change position', async () => {
+    it('should sort by \'position\' \'asc\' And check result', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'sortByPosition', baseContext);
 
-    const nonSortedTable = await featuresPage.getAllRowsColumnContent(page, 'position', 'id_feature');
+      const nonSortedTable = await featuresPage.getAllRowsColumnContent(page, 'position', 'id_feature');
 
-    await featuresPage.sortTable(page, 'position', 'asc');
+      await featuresPage.sortTable(page, 'position', 'asc');
 
-    const sortedTable = await featuresPage.getAllRowsColumnContent(page, 'position', 'position');
+      const sortedTable = await featuresPage.getAllRowsColumnContent(page, 'position', 'position');
 
-    const nonSortedTableFloat: number[] = nonSortedTable.map((text: string): number => parseFloat(text));
-    const sortedTableFloat: number[] = sortedTable.map((text: string): number => parseFloat(text));
+      const nonSortedTableFloat: number[] = nonSortedTable.map((text: string): number => parseFloat(text));
+      const sortedTableFloat: number[] = sortedTable.map((text: string): number => parseFloat(text));
 
-    const expectedResult: number[] = await basicHelper.sortArrayNumber(nonSortedTableFloat);
+      const expectedResult: number[] = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
-    await expect(sortedTableFloat).to.deep.equal(expectedResult);
-  });
+      await expect(sortedTableFloat).to.deep.equal(expectedResult);
+    });
 
-  it('should change first feature position to 2', async function () {
-    await testContext.addContextItem(this, 'testIdentifier', 'changeFeaturePosition', baseContext);
+    it('should change first feature position to 2', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'changeFeaturePosition', baseContext);
 
-    // Get first row feature name
-    const firstRowFeatureName = await featuresPage.getTextColumn(page, 1, 'name', 'position');
+      // Get first row feature name
+      const firstRowFeatureName = await featuresPage.getTextColumn(page, 1, 'name', 'position');
 
-    // Change position and check successful message
-    const textResult = await featuresPage.changePosition(page, 1, 2);
-    await expect(textResult, 'Unable to change position').to.contains(featuresPage.successfulUpdateMessage);
+      // Change position and check successful message
+      const textResult = await featuresPage.changePosition(page, 1, 2);
+      await expect(textResult, 'Unable to change position').to.contains(featuresPage.successfulUpdateMessage);
 
-    // Get second row feature name and check if is equal the first row feature name before changing position
-    const secondRowFeatureName = await featuresPage.getTextColumn(page, 2, 'name', 'position');
-    await expect(secondRowFeatureName, 'Changing position was done wrongly').to.equal(firstRowFeatureName);
-  });
+      // Get second row feature name and check if is equal the first row feature name before changing position
+      const secondRowFeatureName = await featuresPage.getTextColumn(page, 2, 'name', 'position');
+      await expect(secondRowFeatureName, 'Changing position was done wrongly').to.equal(firstRowFeatureName);
+    });
+
+    it('should change second feature position to 3', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'resetFeaturePosition', baseContext);
+
+      // Close alert
+      await featuresPage.closeAlertBlock(page);
+
+      // Get third row feature name
+      const secondRowFeatureName = await featuresPage.getTextColumn(page, 2, 'name', 'position');
+
+      // Change position and check successful message
+      const textResult = await featuresPage.changePosition(page, 2, 3);
+      await expect(textResult, 'Unable to change position').to.contains(featuresPage.successfulUpdateMessage);
+
+      // Get first row feature name and check if is equal the first row feature name before changing position
+      const thirdRowFeatureName = await featuresPage.getTextColumn(page, 3, 'name', 'position');
+      await expect(thirdRowFeatureName, 'Changing position was done wrongly').to.equal(secondRowFeatureName);
+    });
+
+    it('should reset the sort to \'id_feature\'', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'sortByIdFeature', baseContext);
+
+      const nonSortedTable = await featuresPage.getAllRowsColumnContent(page, 'id_feature', 'position');
 
-  it('should reset second feature position to 1', async function () {
-    await testContext.addContextItem(this, 'testIdentifier', 'resetFeaturePosition', baseContext);
+      await featuresPage.sortTable(page, 'id_feature', 'asc');
 
-    // Close alert
-    await featuresPage.closeAlertBlock(page);
+      const sortedTable = await featuresPage.getAllRowsColumnContent(page, 'id_feature', 'id_feature');
 
-    // Get third row feature name
-    const secondRowFeatureName = await featuresPage.getTextColumn(page, 2, 'name', 'position');
+      const nonSortedTableFloat: number[] = nonSortedTable.map((text: string): number => parseFloat(text));
+      const sortedTableFloat: number[] = sortedTable.map((text: string): number => parseFloat(text));
 
-    // Change position and check successful message
-    const textResult = await featuresPage.changePosition(page, 2, 1);
-    await expect(textResult, 'Unable to change position').to.contains(featuresPage.successfulUpdateMessage);
+      const expectedResult: number[] = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
-    // Get first row feature name and check if is equal the first row feature name before changing position
-    const firstRowFeatureName = await featuresPage.getTextColumn(page, 1, 'name', 'position');
-    await expect(firstRowFeatureName, 'Changing position was done wrongly').to.equal(secondRowFeatureName);
+      await expect(sortedTableFloat).to.deep.equal(expectedResult);
+    });
   });
 
-  it('should reset the sort to \'id_feature\'', async function () {
-    await testContext.addContextItem(this, 'testIdentifier', 'sortByIdFeature', baseContext);
+  describe('POST-TEST: Delete created feature', async () => {
+    it('should filter list of features by the created feature', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'filterFeature', baseContext);
 
-    const nonSortedTable = await featuresPage.getAllRowsColumnContent(page, 'position', 'position');
+      await featuresPage.filterTable(page, 'name', createFeatureData.name);
 
-    await featuresPage.sortTable(page, 'id_feature', 'asc');
+      const textColumn = await featuresPage.getTextColumn(page, 1, 'name');
+      await expect(textColumn).to.contains(createFeatureData.name);
+    });
 
-    const sortedTable = await featuresPage.getAllRowsColumnContent(page, 'position', 'id_feature');
+    it('should delete the created feature', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'deleteFeature', baseContext);
 
-    const nonSortedTableFloat: number[] = nonSortedTable.map((text: string): number => parseFloat(text));
-    const sortedTableFloat: number[] = sortedTable.map((text: string): number => parseFloat(text));
+      const textResult = await featuresPage.deleteFeature(page, 1);
+      await expect(textResult).to.contains(featuresPage.successfulDeleteMessage);
+    });
 
-    const expectedResult: number[] = await basicHelper.sortArrayNumber(nonSortedTableFloat);
+    it('should reset all filters and get number of features in BO', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'resetFilter', baseContext);
 
-    await expect(sortedTableFloat).to.deep.equal(expectedResult);
+      const numberOfFeatures = await featuresPage.resetAndGetNumberOfLines(page);
+      await expect(numberOfFeatures).to.be.above(0);
+    });
   });
 });

From 280988ad93be1efa53d0ddc2f3e71b15080b1ea7 Mon Sep 17 00:00:00 2001
From: lartist <salim-benouamer.ext@prestashop.com>
Date: Mon, 31 Jul 2023 05:38:33 +0200
Subject: [PATCH 0793/1030] Last feature flage reference removed

---
 .../Resources/config/routing/admin/sell/catalog/features.yml     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml
index 85fea8f93da19..31b9aa5754109 100644
--- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml
+++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml
@@ -29,7 +29,6 @@ admin_features_add:
     _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureController::createAction
     _legacy_controller: AdminFeatures
     _legacy_link: AdminFeatures:addfeature
-    _legacy_feature_flag: feature
 
 admin_features_edit:
   path: /{featureId}/edit

From 5aba6b3930df787fd1600e5d2930478f74d6e4e0 Mon Sep 17 00:00:00 2001
From: Jonathan Lelievre <jonathan.lelievre@prestashop.com>
Date: Fri, 11 Aug 2023 10:46:21 +0200
Subject: [PATCH 0794/1030] Update faceted search to next version

---
 composer.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/composer.lock b/composer.lock
index a26a0a418462a..a7f2333996c0b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -6212,16 +6212,16 @@
         },
         {
             "name": "prestashop/ps_facetedsearch",
-            "version": "v3.13.0",
+            "version": "v3.13.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PrestaShop/ps_facetedsearch.git",
-                "reference": "42f30f0999791cf00d6d371d982e6257adb41b24"
+                "reference": "02ccda6023bcaa6a6e2c5851b9c22be13a983db9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PrestaShop/ps_facetedsearch/zipball/42f30f0999791cf00d6d371d982e6257adb41b24",
-                "reference": "42f30f0999791cf00d6d371d982e6257adb41b24",
+                "url": "https://api.github.com/repos/PrestaShop/ps_facetedsearch/zipball/02ccda6023bcaa6a6e2c5851b9c22be13a983db9",
+                "reference": "02ccda6023bcaa6a6e2c5851b9c22be13a983db9",
                 "shasum": ""
             },
             "require": {
@@ -6257,9 +6257,9 @@
             "description": "PrestaShop module ps_facetedsearch",
             "homepage": "https://github.com/PrestaShop/ps_facetedsearch",
             "support": {
-                "source": "https://github.com/PrestaShop/ps_facetedsearch/tree/v3.13.0"
+                "source": "https://github.com/PrestaShop/ps_facetedsearch/tree/v3.13.1"
             },
-            "time": "2023-07-27T17:38:24+00:00"
+            "time": "2023-08-09T15:47:34+00:00"
         },
         {
             "name": "prestashop/ps_faviconnotificationbo",

From a2dbc3455ba26db3f7821d6f4866b84c5f858cab Mon Sep 17 00:00:00 2001
From: boubkerbribri <boubker.bribri@prestashop.com>
Date: Wed, 16 Aug 2023 17:02:45 +0200
Subject: [PATCH 0795/1030] test: fix CRUD features and values test

---
 .../02_features/01_CRUDFeaturesAndValues.ts   | 11 ++-
 .../pages/BO/catalog/features/editFeature.ts  | 67 -------------------
 2 files changed, 5 insertions(+), 73 deletions(-)
 delete mode 100644 tests/UI/pages/BO/catalog/features/editFeature.ts

diff --git a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/01_CRUDFeaturesAndValues.ts b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/01_CRUDFeaturesAndValues.ts
index 681414d846941..0b2041754fb54 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/01_CRUDFeaturesAndValues.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/01_CRUDFeaturesAndValues.ts
@@ -11,7 +11,6 @@ import attributesPage from '@pages/BO/catalog/attributes';
 import featuresPage from '@pages/BO/catalog/features';
 import addFeaturePage from '@pages/BO/catalog/features/addFeature';
 import viewFeaturePage from '@pages/BO/catalog/features/view';
-import editFeaturePage from '@pages/BO/catalog/features/editFeature';
 import addValuePage from '@pages/BO/catalog/features/addValue';
 
 // Import data
@@ -39,7 +38,7 @@ describe('BO - Catalog - Attributes & Features : CRUD features and values', asyn
   let numberOfFeatures: number = 0;
   const numberOfValues: number = 0;
   const createFeatureData: FeatureData = new FeatureData({name: 'Texture'});
-  const editFeatureData: FeatureData = new FeatureData({name: 'Texture', metaTitle: 'Feature texture'});
+  const editFeatureData: FeatureData = new FeatureData({name: 'TextureEdit', metaTitle: 'Feature texture'});
   const createFeatureValueData: FeatureValueData = new FeatureValueData({
     featureName: createFeatureData.name,
     value: 'Smooth',
@@ -214,8 +213,8 @@ describe('BO - Catalog - Attributes & Features : CRUD features and values', asyn
 
       await featuresPage.clickOnEditFeature(page, 1);
 
-      const textResult = await editFeaturePage.editFeature(page, editFeatureData);
-      await expect(textResult).to.contains(editFeaturePage.successfulUpdateMessage);
+      const textResult = await addFeaturePage.setFeature(page, editFeatureData);
+      await expect(textResult).to.contains(addFeaturePage.successfulUpdateMessage);
     });
   });
 
@@ -250,10 +249,10 @@ describe('BO - Catalog - Attributes & Features : CRUD features and values', asyn
     it('should filter list of features by the created feature', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'filterFeatureForDelete', baseContext);
 
-      await featuresPage.filterTable(page, 'name', createFeatureData.name);
+      await featuresPage.filterTable(page, 'name', editFeatureData.name);
 
       const textColumn = await featuresPage.getTextColumn(page, 1, 'name');
-      await expect(textColumn).to.contains(createFeatureData.name);
+      await expect(textColumn).to.contains(editFeatureData.name);
     });
 
     it('should delete the created feature', async function () {
diff --git a/tests/UI/pages/BO/catalog/features/editFeature.ts b/tests/UI/pages/BO/catalog/features/editFeature.ts
deleted file mode 100644
index c1048297cce75..0000000000000
--- a/tests/UI/pages/BO/catalog/features/editFeature.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import BOBasePage from '@pages/BO/BObasePage';
-
-import type FeatureData from '@data/faker/feature';
-
-import type {Page} from 'playwright';
-
-/**
- * Edit feature page, contains functions that can be used on edit feature page
- * @class
- * @extends BOBasePage
- */
-class EditFeature extends BOBasePage {
-  public readonly editPageTitle: string;
-
-  private readonly nameInput: string;
-
-  private readonly urlInput: string;
-
-  private readonly metaTitleInput: string;
-
-  private readonly indexableToggle: (toggle: string) => string;
-
-  private readonly saveButton: string;
-
-  /**
-   * @constructs
-   * Setting up texts and selectors to use on edit feature page
-   */
-  constructor() {
-    super();
-
-    this.editPageTitle = 'Edit:';
-
-    // Form selectors
-    this.nameInput = '#name_1';
-    this.urlInput = 'input[name=\'url_name_1\']';
-    this.metaTitleInput = 'input[name=\'meta_title_1\']';
-    this.indexableToggle = (toggle: string) => `#indexable_${toggle}`;
-    this.saveButton = '#feature_form_submit_btn';
-  }
-
-  /**
-   * Edit feature and save it
-   * @param page {Page} Browser tab
-   * @param featureData {FeatureData} Values to set on edit feature form inputs
-   * @return {Promise<string>}
-   */
-  async editFeature(page: Page, featureData: FeatureData): Promise<string> {
-    // Set name
-    await this.setValue(page, this.nameInput, featureData.name);
-
-    // Set Url and meta title
-    await this.setValue(page, this.urlInput, featureData.url);
-    await this.setValue(page, this.metaTitleInput, featureData.metaTitle);
-
-    // Set indexable toggle
-    await this.setChecked(page, this.indexableToggle(featureData.indexable ? 'on' : 'off'));
-
-    // Save feature
-    await this.clickAndWaitForURL(page, this.saveButton);
-
-    // Return successful message
-    return this.getAlertSuccessBlockParagraphContent(page);
-  }
-}
-
-export default new EditFeature();

From 98792b29b93ce6809f900dab57de2651249b3e47 Mon Sep 17 00:00:00 2001
From: prestonBot <prestonBot@users.noreply.github.com>
Date: Wed, 16 Aug 2023 23:04:47 +0000
Subject: [PATCH 0796/1030] Updated PrestaShop Packages

---
 composer.lock | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/composer.lock b/composer.lock
index 28e38c46317cb..5859035041342 100644
--- a/composer.lock
+++ b/composer.lock
@@ -5244,20 +5244,20 @@
         },
         {
             "name": "prestashop/blockwishlist",
-            "version": "v3.0.0",
+            "version": "v3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PrestaShop/blockwishlist.git",
-                "reference": "d42091134c5b7060e195fa9d60dda63396c06d64"
+                "reference": "75c39bc12648cba4e09d870479e7857fd06eee79"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PrestaShop/blockwishlist/zipball/d42091134c5b7060e195fa9d60dda63396c06d64",
-                "reference": "d42091134c5b7060e195fa9d60dda63396c06d64",
+                "url": "https://api.github.com/repos/PrestaShop/blockwishlist/zipball/75c39bc12648cba4e09d870479e7857fd06eee79",
+                "reference": "75c39bc12648cba4e09d870479e7857fd06eee79",
                 "shasum": ""
             },
             "require-dev": {
-                "prestashop/php-dev-tools": "~3.0"
+                "prestashop/php-dev-tools": "^4.3"
             },
             "type": "prestashop-module",
             "autoload": {
@@ -5283,9 +5283,9 @@
             "description": "PrestaShop module blockwishlist",
             "homepage": "https://github.com/PrestaShop/blockwishlist",
             "support": {
-                "source": "https://github.com/PrestaShop/blockwishlist/tree/v3.0.0"
+                "source": "https://github.com/PrestaShop/blockwishlist/tree/v3.0.1"
             },
-            "time": "2023-02-23T10:22:22+00:00"
+            "time": "2023-08-11T10:08:33+00:00"
         },
         {
             "name": "prestashop/circuit-breaker",
@@ -6628,16 +6628,16 @@
         },
         {
             "name": "prestashop/ps_facetedsearch",
-            "version": "v3.13.0",
+            "version": "v3.13.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PrestaShop/ps_facetedsearch.git",
-                "reference": "42f30f0999791cf00d6d371d982e6257adb41b24"
+                "reference": "02ccda6023bcaa6a6e2c5851b9c22be13a983db9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PrestaShop/ps_facetedsearch/zipball/42f30f0999791cf00d6d371d982e6257adb41b24",
-                "reference": "42f30f0999791cf00d6d371d982e6257adb41b24",
+                "url": "https://api.github.com/repos/PrestaShop/ps_facetedsearch/zipball/02ccda6023bcaa6a6e2c5851b9c22be13a983db9",
+                "reference": "02ccda6023bcaa6a6e2c5851b9c22be13a983db9",
                 "shasum": ""
             },
             "require": {
@@ -6673,9 +6673,9 @@
             "description": "PrestaShop module ps_facetedsearch",
             "homepage": "https://github.com/PrestaShop/ps_facetedsearch",
             "support": {
-                "source": "https://github.com/PrestaShop/ps_facetedsearch/tree/v3.13.0"
+                "source": "https://github.com/PrestaShop/ps_facetedsearch/tree/v3.13.1"
             },
-            "time": "2023-07-27T17:38:24+00:00"
+            "time": "2023-08-09T15:47:34+00:00"
         },
         {
             "name": "prestashop/ps_faviconnotificationbo",

From c7caf93b6f26275b3c675dfd26a954d230058176 Mon Sep 17 00:00:00 2001
From: matks <mathieu.ferment@prestashop.com>
Date: Thu, 17 Aug 2023 14:23:26 +0200
Subject: [PATCH 0797/1030] Do not attempt to rebuild modules list if missing
 data

---
 admin-dev/themes/new-theme/js/pages/module/controller.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/admin-dev/themes/new-theme/js/pages/module/controller.js b/admin-dev/themes/new-theme/js/pages/module/controller.js
index 374101992f1c3..fe45d38a0496d 100644
--- a/admin-dev/themes/new-theme/js/pages/module/controller.js
+++ b/admin-dev/themes/new-theme/js/pages/module/controller.js
@@ -234,11 +234,17 @@ class AdminModuleController {
     this.updateModuleVisibility();
   }
 
+  /**
+   * Updates the modulesList object
+   *
+   * @param event a DOM element that contains module data such as id, name, version...
+   */
   updateModuleStatus(event) {
     this.modulesList = this.modulesList.map((module) => {
       const moduleElement = $(event);
 
-      if (moduleElement.data('tech-name') === module.techName) {
+      if ((moduleElement.data('tech-name') === module.techName)
+      && (moduleElement.data('version') !== undefined)) {
         const newModule = {
           domObject: moduleElement,
           id: moduleElement.data('id'),

From a67be31a89b54f58d1983b007f55f05ca635b0ab Mon Sep 17 00:00:00 2001
From: Krystian Podemski <podemski.krystian@gmail.com>
Date: Fri, 18 Aug 2023 09:10:47 +0200
Subject: [PATCH 0798/1030] Add WebP to mod_expires

---
 classes/Tools.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/classes/Tools.php b/classes/Tools.php
index f1d45661cc53d..64b9c01b669fd 100644
--- a/classes/Tools.php
+++ b/classes/Tools.php
@@ -2548,6 +2548,8 @@ public static function generateHtaccess($path = null, $rewrite_settings = null,
         if ($cache_control) {
             $cache_control = "<IfModule mod_expires.c>
 	ExpiresActive On
+    AddType image/webp .webp
+    ExpiresByType image/webp \"access plus 1 month\"
 	ExpiresByType image/gif \"access plus 1 month\"
 	ExpiresByType image/jpeg \"access plus 1 month\"
 	ExpiresByType image/png \"access plus 1 month\"

From ae9ace94eab632d8bb04707aa3575567c6b07e89 Mon Sep 17 00:00:00 2001
From: Krystian Podemski <podemski.krystian@gmail.com>
Date: Fri, 18 Aug 2023 09:12:15 +0200
Subject: [PATCH 0799/1030] Add avif

---
 classes/Tools.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/classes/Tools.php b/classes/Tools.php
index 64b9c01b669fd..ab990a4d6e9a4 100644
--- a/classes/Tools.php
+++ b/classes/Tools.php
@@ -2550,6 +2550,7 @@ public static function generateHtaccess($path = null, $rewrite_settings = null,
 	ExpiresActive On
     AddType image/webp .webp
     ExpiresByType image/webp \"access plus 1 month\"
+    ExpiresByType image/avif \"access plus 1 month\"
 	ExpiresByType image/gif \"access plus 1 month\"
 	ExpiresByType image/jpeg \"access plus 1 month\"
 	ExpiresByType image/png \"access plus 1 month\"

From 51fdc606e985bb3f6a2c546e3d12c46f2481f8ae Mon Sep 17 00:00:00 2001
From: Jonathan Lelievre <jonathan.lelievre@prestashop.com>
Date: Fri, 11 Aug 2023 19:22:11 +0200
Subject: [PATCH 0800/1030] Fix missing tabs vairable in Toolbar twig
 component, only occured on third level pages

---
 .../themes/new-theme/template/layout.tpl      |   1 +
 .../Admin/Component/Layout/toolbar.html.twig  | 298 +++++++++---------
 .../views/Admin/Layout/toolbar.html.twig      |   1 +
 .../Twig/Component/Toolbar.php                |   1 +
 4 files changed, 155 insertions(+), 146 deletions(-)

diff --git a/admin-dev/themes/new-theme/template/layout.tpl b/admin-dev/themes/new-theme/template/layout.tpl
index a997ee429e6ec..85afed32f6c66 100644
--- a/admin-dev/themes/new-theme/template/layout.tpl
+++ b/admin-dev/themes/new-theme/template/layout.tpl
@@ -180,6 +180,7 @@
       help_link=$help_link
       enableSidebar=$enableSidebar
       current_tab_level=$current_tab_level
+      tabs=$tabs
     }
 {/if}
 
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/toolbar.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/toolbar.html.twig
index b19f5c75686ab..1f9612ea9a92f 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/toolbar.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/toolbar.html.twig
@@ -28,18 +28,18 @@
 
     {% block pageBreadcrumb %}
       <nav aria-label="Breadcrumb">
-      <ol class="breadcrumb">
-        {% if breadcrumbs2.container.name != '' %}
-          <li class="breadcrumb-item">{{ breadcrumbs2.container.name|escape }}</li>
-        {% endif %}
+        <ol class="breadcrumb">
+          {% if breadcrumbs2.container.name != '' %}
+            <li class="breadcrumb-item">{{ breadcrumbs2.container.name|escape }}</li>
+          {% endif %}
 
-        {% if breadcrumbs2.tab.name != '' and breadcrumbs2.container.name != breadcrumbs2.tab.name and breadcrumbs2.tab.href != '' %}
-          <li class="breadcrumb-item active">
-            <a href="{{ breadcrumbs2.tab.href|escape }}" aria-current="page">{{ breadcrumbs2.tab.name|escape }}</a>
-          </li>
-        {% endif %}
-      </ol>
-    </nav>
+          {% if breadcrumbs2.tab.name != '' and breadcrumbs2.container.name != breadcrumbs2.tab.name and breadcrumbs2.tab.href != '' %}
+            <li class="breadcrumb-item active">
+              <a href="{{ breadcrumbs2.tab.href|escape }}" aria-current="page">{{ breadcrumbs2.tab.name|escape }}</a>
+            </li>
+          {% endif %}
+        </ol>
+      </nav>
     {% endblock %}
 
     {% set persistent_help_btn = help_link is defined and help_link is not same as (false) and toolbarBtn is empty %}
@@ -56,163 +56,169 @@
 
       {% block toolbarBox %}
         <div class="toolbar-icons{% if persistent_help_btn %} toolbar-icons--persistent{% endif %}">
-        <div class="wrapper">
-          {{ renderhook('displayDashboardToolbarTopMenu') }}
-          {% for k, btn in toolbarBtn %}
-          {% if k != 'back' and k != 'modules-list' %}
-          {# TODO: REFACTOR ALL THIS THINGS #}
-          <a
-            class="btn {% if btn.class is defined and btn.class %}{{ btn.class|escape }}{% else %}btn-primary{% endif %}{% if btn.target is defined and btn.target %} _blank{% endif %}{% if btn.disabled is defined and btn.disabled %} disabled auto-pointer-events{% endif %} pointer"{% if btn.href is defined %}
-            id="page-header-desc-{{ table }}-{% if btn.imgclass is defined %}{{ btn.imgclass|escape }}{% else %}{{ k }}{% endif %}"
-            href="{{ btn.href|escape }}"{% endif %}
-          title="{% if btn.help is defined %}{{ btn.help }}{% else %}{{ btn.desc|escape }}{% endif %}"{% if btn.js is defined and btn.js %}
-          onclick="{{ btn.js }}" {% endif %}{% if btn.modal_target is defined and btn.modal_target %}
-          data-target="{{ btn.modal_target }}"
-          data-toggle="modal"{% endif %}{% if btn.help is defined %}
-          data-toggle="pstooltip"
-          data-placement="bottom"{% endif %}
-          {% if btn.data_attributes is defined and btn.data_attributes %}
-            {% for attribute_name, attribute_value in btn.data_attributes %}
-              data-{{ attribute_name }}="{{ attribute_value }}"
+          <div class="wrapper">
+            {{ renderhook('displayDashboardToolbarTopMenu') }}
+            {% for k, btn in toolbarBtn %}
+              {% if k != 'back' and k != 'modules-list' %}
+                {#TODO: REFACTOR ALL THIS THINGS#}
+                <a
+                  class="btn {% if btn.class is defined and btn.class %}{{ btn.class|escape }}{% else %}btn-primary{% endif %}{% if btn.target is defined and btn.target %} _blank{% endif %}{% if btn.disabled is defined and btn.disabled %} disabled auto-pointer-events{% endif %} pointer"{% if btn.href is defined %}
+                  id="page-header-desc-{{ table }}-{% if btn.imgclass is defined %}{{ btn.imgclass|escape }}{% else %}{{ k }}{% endif %}"
+                href="{{ btn.href|escape }}"{% endif %}
+                  title="{% if btn.help is defined %}{{ btn.help }}{% else %}{{ btn.desc|escape }}{% endif %}"{% if btn.js is defined and btn.js %}
+                  onclick="{{ btn.js }}" {% endif %}{% if btn.modal_target is defined and btn.modal_target %}
+                  data-target="{{ btn.modal_target }}"
+                  data-toggle="modal"{% endif %}{% if btn.help is defined %}
+                  data-toggle="pstooltip"
+                  data-placement="bottom"{% endif %}
+                  {% if btn.data_attributes is defined and btn.data_attributes %}
+                    {% for attribute_name, attribute_value in btn.data_attributes %}
+                      data-{{ attribute_name }}="{{ attribute_value }}"
+                    {% endfor %}
+                  {% endif %}
+                >
+                  {% if btn.icon is not empty %}<i class="material-icons">{{ btn.icon }}</i>{% endif %}
+                  {{ btn.desc|escape }}
+                </a>
+              {% endif %}
             {% endfor %}
-          {% endif %}
-          >
-          {% if btn.icon is not empty %}<i class="material-icons">{{ btn.icon }}</i>{% endif %}
-          {{ btn.desc|escape }}
-          </a>
-          {% endif %}
-          {% endfor %}
-          {% if toolbarBtn['modules-list'] is defined %}
-          {# TODO: REFACTOR ALL THIS THINGS #}
-          <a
-            class="btn btn-outline-secondary {% if toolbarBtn['modules-list'].target is defined and toolbarBtn['modules-list'].target %} _blank{% endif %}"
-            id="page-header-desc-{{ table }}-{% if toolbarBtn['modules-list'].imgclass is defined %}{{ toolbarBtn['modules-list'].imgclass }}{% else %}modules-list{% endif %}"
-            {% if toolbarBtn['modules-list'].href is defined %}href="{{ toolbarBtn['modules-list'].href }}"{% endif %}
-            title="{{ toolbarBtn['modules-list'].desc }}"
-          {% if toolbarBtn['modules-list'].js is defined and toolbarBtn['modules-list'].js %}onclick="{{ toolbarBtn['modules-list'].js }}"{% endif %}
-          >
-          {{ toolbarBtn['modules-list'].desc }}
-          </a>
-          {% endif %}
+            {% if toolbarBtn['modules-list'] is defined %}
+              {#TODO: REFACTOR ALL THIS THINGS#}
+              <a
+                class="btn btn-outline-secondary {% if toolbarBtn['modules-list'].target is defined and toolbarBtn['modules-list'].target %} _blank{% endif %}"
+                id="page-header-desc-{{ table }}-{% if toolbarBtn['modules-list'].imgclass is defined %}{{ toolbarBtn['modules-list'].imgclass }}{% else %}modules-list{% endif %}"
+                {% if toolbarBtn['modules-list'].href is defined %}href="{{ toolbarBtn['modules-list'].href }}"{% endif %}
+                title="{{ toolbarBtn['modules-list'].desc }}"
+                {% if toolbarBtn['modules-list'].js is defined and toolbarBtn['modules-list'].js %}onclick="{{ toolbarBtn['modules-list'].js }}"{% endif %}
+              >
+                {{ toolbarBtn['modules-list'].desc }}
+              </a>
+            {% endif %}
 
-          {% if helpLink is defined and helpLink is not same as false %}
+            {% if helpLink is defined and helpLink is not same as false %}
 
-          {% if enableSidebar %}
+              {% if enableSidebar %}
 
-          <a class="toolbar-button btn-sidebar d-inline-block d-md-none" href="#"
-             title="{{ 'Help'|trans({}, 'Admin.Global') }}"
-             data-toggle="sidebar"
-             data-target="#right-sidebar"
-             data-url="{{ helpLink|escape }}"
-             id="product_form_open_help_mobile"
-          >
-            <i class="material-icons">help_outline</i>
-          </a>
-          <a class="btn btn-outline-secondary btn-help btn-sidebar d-none d-md-inline-block" href="#"
-             title="{{ 'Help'|trans({}, 'Admin.Global') }}"
-             data-toggle="sidebar"
-             data-target="#right-sidebar"
-             data-url="{{ helpLink|escape }}"
-             id="product_form_open_help"
-          >
-            {{ 'Help'|trans({}, 'Admin.Global') }}
-          </a>
-          {% else %}
-          <a class="toolbar-button d-inline-block d-md-none" href="{{ helpLink|escape }}" title="{{ 'Help'|trans({}, 'Admin.Global') }}">
-            <i class="material-icons">help_outline</i>
-          </a>
-          <a class="btn btn-outline-secondary btn-help d-none d-md-inline-block" href="{{ helpLink|escape }}" title="{{ 'Help'|trans({}, 'Admin.Global') }}">{{ 'Help'|trans({}, 'Admin.Global') }}
-          </a>
-          {% endif %}
-          {% endif %}
+                <a class="toolbar-button btn-sidebar d-inline-block d-md-none" href="#"
+                   title="{{ 'Help'|trans({}, 'Admin.Global') }}"
+                   data-toggle="sidebar"
+                   data-target="#right-sidebar"
+                   data-url="{{ helpLink|escape }}"
+                   id="product_form_open_help_mobile"
+                >
+                  <i class="material-icons">help_outline</i>
+                </a>
+                <a class="btn btn-outline-secondary btn-help btn-sidebar d-none d-md-inline-block" href="#"
+                   title="{{ 'Help'|trans({}, 'Admin.Global') }}"
+                   data-toggle="sidebar"
+                   data-target="#right-sidebar"
+                   data-url="{{ helpLink|escape }}"
+                   id="product_form_open_help"
+                >
+                  {{ 'Help'|trans({}, 'Admin.Global') }}
+                </a>
+              {% else %}
+                <a class="toolbar-button d-inline-block d-md-none" href="{{ helpLink|escape }}"
+                   title="{{ 'Help'|trans({}, 'Admin.Global') }}">
+                  <i class="material-icons">help_outline</i>
+                </a>
+                <a class="btn btn-outline-secondary btn-help d-none d-md-inline-block" href="{{ helpLink|escape }}"
+                   title="{{ 'Help'|trans({}, 'Admin.Global') }}">{{ 'Help'|trans({}, 'Admin.Global') }}
+                </a>
+              {% endif %}
+            {% endif %}
+          </div>
         </div>
-      </div>
       {% endblock %}
     </div>
   </div>
 
   {% if headerTabContent is defined and headerTabContent %}
-  <div class="page-head-tabs" id="head_tabs">
-    {% for tabContent in headerTabContent %}
-    {{ tabContent }}
-    {% endfor %}
-  </div>
+    <div class="page-head-tabs" id="head_tabs">
+      {% for tabContent in headerTabContent %}
+        {{ tabContent }}
+      {% endfor %}
+    </div>
   {% endif %}
 
   {% if currentTabLevel is same as 3 %}
-  <div class="page-head-tabs" id="head_tabs">
-    <ul class="nav nav-pills">
-      {% for level_1 in tabs %}
-      {% for level_2 in level_1.sub_tabs %}
-      {% for level_3 in level_2.sub_tabs %}
-      {% if level_3.current %}
-      {% for level_4 in level_3.sub_tabs %}
-      {% if level_4.active %}
-      <li class="nav-item">
-        <a href="{{ level_4.href }}" id="subtab-{{ level_4.class_name }}" class="nav-link tab {% if level_4.current %}active current{% endif %}" data-submenu="{{ level_4.id_tab }}">
-          {{ level_4.name }}
-          <span class="notification-container">
+    <div class="page-head-tabs" id="head_tabs">
+      <ul class="nav nav-pills">
+        {% for level_1 in tabs %}
+          {% for level_2 in level_1.sub_tabs %}
+            {% for level_3 in level_2.sub_tabs %}
+              {% if level_3.current %}
+                {% for level_4 in level_3.sub_tabs %}
+                  {% if level_4.active %}
+                    <li class="nav-item">
+                      <a href="{{ level_4.href }}" id="subtab-{{ level_4.class_name }}"
+                         class="nav-link tab {% if level_4.current %}active current{% endif %}"
+                         data-submenu="{{ level_4.id_tab }}">
+                        {{ level_4.name }}
+                        <span class="notification-container">
                         <span class="notification-counter"></span>
                       </span>
-        </a>
-      </li>
-      {% endif %}
-      {% endfor %}
-      {% endif %}
-      {% endfor %}
-      {% endfor %}
-      {% endfor %}
-    </ul>
-  </div>
+                      </a>
+                    </li>
+                  {% endif %}
+                {% endfor %}
+              {% endif %}
+            {% endfor %}
+          {% endfor %}
+        {% endfor %}
+      </ul>
+    </div>
   {% endif %}
 
   {% if toolbarBtn is not empty %}
-  <div class="btn-floating">
-    <button class="btn btn-primary collapsed" data-toggle="collapse" data-target=".btn-floating-container" aria-expanded="false">
-      <i class="material-icons">add</i>
-    </button>
-    <div class="btn-floating-container collapse">
-      <div class="btn-floating-menu">
-        {{ renderhook('displayDashboardToolbarTopMenu') }}
+    <div class="btn-floating">
+      <button class="btn btn-primary collapsed" data-toggle="collapse" data-target=".btn-floating-container"
+              aria-expanded="false">
+        <i class="material-icons">add</i>
+      </button>
+      <div class="btn-floating-container collapse">
+        <div class="btn-floating-menu">
+          {{ renderhook('displayDashboardToolbarTopMenu') }}
 
-        {% for k, btn in toolbarBtn %}
-        {% if k != 'back' and k != 'modules-list'%}
-        <a
-          class="btn btn-floating-item {% if btn.floating_class and btn.floating_class %}{{ btn.floating_class|escape }}{% endif %} {% if btn.target is defined and btn.target %} _blank{% endif %} pointer"{% if btn.href is defined %}
-          id="page-header-desc-floating-{{ table }}-{% if btn.imgclass is defined %}{{ btn.imgclass|escape }}{% else %}{{ k }}{% endif %}"
-          href="{{ btn.href|escape }}"{% endif %}
-        title="{% if btn.help is defined %}{{ btn.help }}{% else %}{{ btn.desc|escape }}{% endif %}"{% if btn.js is defined and btn.js %}
-        onclick="{{ btn.js }}"{% endif %}{% if btn.modal_target is defined and btn.modal_target %}
-        data-target="{{ btn.modal_target }}"
-        data-toggle="modal"{% endif %}{% if btn.help is defined %}
-        data-toggle="pstooltip"
-        data-placement="bottom"{% endif %}
-        >
-        {{ btn.desc|escape }}
-        {% if btn.icon is not empty %}<i class="material-icons">{{ btn.icon }}</i>{% endif %}
-        </a>
-        {% endif %}
-        {% endfor %}
+          {% for k, btn in toolbarBtn %}
+            {% if k != 'back' and k != 'modules-list' %}
+              <a
+                class="btn btn-floating-item {% if btn.floating_class is defined and btn.floating_class %}{{ btn.floating_class|escape }}{% endif %} {% if btn.target is defined and btn.target %} _blank{% endif %} pointer"{% if btn.href is defined %}
+                id="page-header-desc-floating-{{ table }}-{% if btn.imgclass is defined %}{{ btn.imgclass|escape }}{% else %}{{ k }}{% endif %}"
+              href="{{ btn.href|escape }}"{% endif %}
+                title="{% if btn.help is defined %}{{ btn.help }}{% else %}{{ btn.desc|escape }}{% endif %}"{% if btn.js is defined and btn.js %}
+              onclick="{{ btn.js }}"{% endif %}{% if btn.modal_target is defined and btn.modal_target %}
+                data-target="{{ btn.modal_target }}"
+                data-toggle="modal"{% endif %}{% if btn.help is defined %}
+                data-toggle="pstooltip"
+                data-placement="bottom"{% endif %}
+              >
+                {{ btn.desc|escape }}
+                {% if btn.icon is not empty %}<i class="material-icons">{{ btn.icon }}</i>{% endif %}
+              </a>
+            {% endif %}
+          {% endfor %}
 
-        {% if helpLink is defined and helpLink != false %}
-        {% if enableSidebar %}
-        <a class="btn btn-floating-item btn-help btn-sidebar" href="#"
-           title="{{ 'Help'|trans({}, 'Admin.Global') }}"
-           data-toggle="sidebar"
-           data-target="#right-sidebar"
-           data-url="{{ helpLink|escape }}"
-        >
-          {{ 'Help'|trans({}, 'Admin.Global') }}
-        </a>
-        {% else %}
-        <a class="btn btn-floating-item btn-help" href="{{ helpLink|escape }}" title="{{ 'Help'|trans({}, 'Admin.Global') }}">
-          {{ 'Help'|trans({}, 'Admin.Global') }}
-        </a>
-        {% endif %}
-        {% endif %}
+          {% if helpLink is defined and helpLink != false %}
+            {% if enableSidebar %}
+              <a class="btn btn-floating-item btn-help btn-sidebar" href="#"
+                 title="{{ 'Help'|trans({}, 'Admin.Global') }}"
+                 data-toggle="sidebar"
+                 data-target="#right-sidebar"
+                 data-url="{{ helpLink|escape }}"
+              >
+                {{ 'Help'|trans({}, 'Admin.Global') }}
+              </a>
+            {% else %}
+              <a class="btn btn-floating-item btn-help" href="{{ helpLink|escape }}"
+                 title="{{ 'Help'|trans({}, 'Admin.Global') }}">
+                {{ 'Help'|trans({}, 'Admin.Global') }}
+              </a>
+            {% endif %}
+          {% endif %}
+        </div>
       </div>
     </div>
-  </div>
   {% endif %}
   {{ renderhook('displayDashboardTop') }}
 </div>
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/toolbar.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/toolbar.html.twig
index 215c09a4af3d5..57bbed44bed42 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Layout/toolbar.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/toolbar.html.twig
@@ -31,4 +31,5 @@
   helpLink: help_link,
   enableSidebar: enableSidebar,
   currentTabLevel: current_tab_level,
+  tabs: tabs
 }) }}
diff --git a/src/PrestaShopBundle/Twig/Component/Toolbar.php b/src/PrestaShopBundle/Twig/Component/Toolbar.php
index 74c0c20d217b9..aa3e411e72933 100644
--- a/src/PrestaShopBundle/Twig/Component/Toolbar.php
+++ b/src/PrestaShopBundle/Twig/Component/Toolbar.php
@@ -41,4 +41,5 @@ class Toolbar
     public bool|string $helpLink;
     public bool $enableSidebar;
     public int $currentTabLevel;
+    public array $tabs;
 }

From 47d29c2976483740c2f23327b5bf8e58a25936e8 Mon Sep 17 00:00:00 2001
From: Jonathan Lelievre <jonathan.lelievre@prestashop.com>
Date: Fri, 11 Aug 2023 20:33:26 +0200
Subject: [PATCH 0801/1030] Handle copy of legacy notifications into symfony
 session flash bag ONLY in migrated pages for now as it impacted all legacy
 pages

---
 classes/controller/AdminController.php          | 16 ----------------
 .../admin/AdminLegacyLayoutController.php       | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index ed6517185eccb..fd8f4b84ccc96 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -29,15 +29,12 @@
 use PrestaShop\PrestaShop\Core\Action\ActionsBarButtonsCollection;
 use PrestaShop\PrestaShop\Core\Exception\TypeException;
 use PrestaShop\PrestaShop\Core\Feature\TokenInUrls;
-use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
-use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagStateCheckerInterface;
 use PrestaShop\PrestaShop\Core\Localization\Locale;
 use PrestaShop\PrestaShop\Core\Localization\Specification\Number as NumberSpecification;
 use PrestaShop\PrestaShop\Core\Localization\Specification\Price as PriceSpecification;
 use PrestaShop\PrestaShop\Core\Security\Permission;
 use PrestaShop\PrestaShop\Core\Util\ColorBrightnessCalculator;
 use PrestaShop\PrestaShop\Core\Util\Url\UrlCleaner;
-use PrestaShopBundle\Bridge\Helper\AddFlashMessage;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Routing\Exception\RouteNotFoundException;
 
@@ -1935,19 +1932,6 @@ public function display()
                 $this->$type = (array) $this->$type;
             }
 
-            if (
-                SymfonyContainer::getInstance()
-                    ?->get(FeatureFlagStateCheckerInterface::class)
-                    ->isEnabled(FeatureFlagSettings::FEATURE_FLAG_SYMFONY_LAYOUT)
-            ) {
-                /** @var AddFlashMessage $addFlashMessage */
-                $addFlashMessage = SymfonyContainer::getInstance()->get(AddFlashMessage::class);
-                foreach ($this->$type as $message) {
-                    $addFlashMessage->addMessage($type, $message);
-                }
-                $this->$type = [];
-            }
-
             $this->context->smarty->assign($type, $this->json ? json_encode(array_unique($this->$type)) : array_unique($this->$type));
         }
 
diff --git a/controllers/admin/AdminLegacyLayoutController.php b/controllers/admin/AdminLegacyLayoutController.php
index bdb2cb8b0312d..5bb26062825e2 100644
--- a/controllers/admin/AdminLegacyLayoutController.php
+++ b/controllers/admin/AdminLegacyLayoutController.php
@@ -1,4 +1,9 @@
 <?php
+
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagStateCheckerInterface;
+use PrestaShopBundle\Bridge\Helper\AddFlashMessage;
+
 /**
  * Copyright since 2007 PrestaShop SA and Contributors
  * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
@@ -231,5 +236,17 @@ public function display()
         parent::display();
         $this->outPutHtml = ob_get_contents();
         ob_end_clean();
+
+        // We push notifications from the legacy controller but only in migrated page for now (that's why it is done here and ont in AdminController)
+        // and of course only if the Symfony layout is enabled This will mostly be useful when legacy pages are rendered by Symfony layout
+        if ($this->get(FeatureFlagStateCheckerInterface::class)->isEnabled(FeatureFlagSettings::FEATURE_FLAG_SYMFONY_LAYOUT)) {
+            foreach (['errors', 'warnings', 'informations', 'confirmations'] as $type) {
+                /** @var AddFlashMessage $addFlashMessage */
+                $addFlashMessage = $this->get(AddFlashMessage::class);
+                foreach ($this->$type as $message) {
+                    $addFlashMessage->addMessage($type, $message);
+                }
+            }
+        }
     }
 }

From 628f8d4b2b6a7db695f5f338b66cf8937d77af5a Mon Sep 17 00:00:00 2001
From: Jonathan Lelievre <jonathan.lelievre@prestashop.com>
Date: Sat, 12 Aug 2023 03:37:03 +0200
Subject: [PATCH 0802/1030] Fix feature flag save redirection

---
 .../Configure/AdvancedParameters/FeatureFlagController.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/FeatureFlagController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/FeatureFlagController.php
index 8d37778314c47..f162f2c71ea5b 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/FeatureFlagController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/FeatureFlagController.php
@@ -65,7 +65,7 @@ public function indexAction(Request $request): Response
                 $this->flashErrors($errors);
             }
 
-            $this->redirectToRoute('admin_feature_flags_index');
+            return $this->redirectToRoute('admin_feature_flags_index');
         }
 
         $betaFormHandler = $this->get('prestashop.admin.feature_flags.beta_form_handler');
@@ -86,7 +86,7 @@ public function indexAction(Request $request): Response
                 $this->flashErrors($errors);
             }
 
-            $this->redirectToRoute('admin_feature_flags_index');
+            return $this->redirectToRoute('admin_feature_flags_index');
         }
 
         return $this->render('@PrestaShop/Admin/Configure/AdvancedParameters/FeatureFlag/index.html.twig', [

From 897a1fe7892bf700a75580881341f0b27d150fae Mon Sep 17 00:00:00 2001
From: Jonathan Lelievre <jonathan.lelievre@prestashop.com>
Date: Wed, 16 Aug 2023 22:59:39 +0200
Subject: [PATCH 0803/1030] Improve how current tab title is generated for
 quick accesses based on tab ancestors and deduced action

---
 .../Entity/Repository/TabRepository.php       |  70 +++++++
 src/PrestaShopBundle/Entity/Tab.php           |  16 +-
 .../config/services/bundle/routing.yml        |   6 +-
 .../Twig/Component/QuickAccess.php            |  14 +-
 .../Twig/Layout/MenuBuilder.php               | 187 ++++++++++++++++++
 src/PrestaShopBundle/Twig/Layout/MenuLink.php |  40 ++++
 6 files changed, 326 insertions(+), 7 deletions(-)
 create mode 100644 src/PrestaShopBundle/Twig/Layout/MenuBuilder.php
 create mode 100644 src/PrestaShopBundle/Twig/Layout/MenuLink.php

diff --git a/src/PrestaShopBundle/Entity/Repository/TabRepository.php b/src/PrestaShopBundle/Entity/Repository/TabRepository.php
index e30fb0f2fd208..8525956efa0ab 100644
--- a/src/PrestaShopBundle/Entity/Repository/TabRepository.php
+++ b/src/PrestaShopBundle/Entity/Repository/TabRepository.php
@@ -27,10 +27,14 @@
 namespace PrestaShopBundle\Entity\Repository;
 
 use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\Query;
 use PrestaShopBundle\Entity\Tab;
 
 class TabRepository extends EntityRepository
 {
+    /** @var array<string, int> */
+    private $cachedTabIds = [];
+
     /**
      * @param string $moduleName
      *
@@ -113,4 +117,70 @@ public function changeEnabledByModuleName($moduleName, $enabled)
         }
         $this->getEntityManager()->flush();
     }
+
+    /**
+     * @param string $className
+     *
+     * @return int
+     *
+     * @throws \Doctrine\ORM\NoResultException
+     * @throws \Doctrine\ORM\NonUniqueResultException
+     */
+    public function getIdByClassName(string $className): int
+    {
+        if (!isset($this->cachedTabIds[$className])) {
+            $result = $this->createQueryBuilder('t')
+                ->select('t.id, t.className')
+                ->where('t.className = :className')
+                ->andWhere('t.id != 0')
+                ->setParameter('className', $className)
+                ->getQuery()
+                ->getSingleResult(Query::HYDRATE_ARRAY)
+            ;
+
+            $this->cachedTabIds[$result['className']] = (int) $result['id'];
+        }
+
+        return $this->cachedTabIds[$className];
+    }
+
+    /**
+     * @param int $tabId
+     *
+     * @return Tab[] breadcrumb to access the Tab, ordered from closest to oldest ancestor
+     *
+     * @throws \Doctrine\ORM\NoResultException
+     * @throws \Doctrine\ORM\NonUniqueResultException
+     */
+    public function getAncestors(int $tabId): array
+    {
+        return $this->getTabParents($tabId);
+    }
+
+    /**
+     * Recursive method is kept as private.
+     *
+     * @param int $tabId
+     *
+     * @return Tab[]
+     *
+     * @throws \Doctrine\ORM\NoResultException
+     * @throws \Doctrine\ORM\NonUniqueResultException
+     */
+    private function getTabParents(int $tabId): array
+    {
+        /** @var Tab $tab */
+        $tab = $this->findOneBy(['id' => $tabId]);
+
+        if (empty($tab->getIdParent())) {
+            return [];
+        }
+
+        $parent = $this->findOneBy(['id' => $tab->getIdParent()]);
+        if (null === $parent) {
+            return [];
+        }
+
+        return array_merge([$parent], $this->getTabParents($parent->getId()));
+    }
 }
diff --git a/src/PrestaShopBundle/Entity/Tab.php b/src/PrestaShopBundle/Entity/Tab.php
index 4df93d7570858..45994c83a7348 100644
--- a/src/PrestaShopBundle/Entity/Tab.php
+++ b/src/PrestaShopBundle/Entity/Tab.php
@@ -26,6 +26,8 @@
 
 namespace PrestaShopBundle\Entity;
 
+use Doctrine\Common\Collections\Collection;
+use Doctrine\Common\Collections\Selectable;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
@@ -155,11 +157,23 @@ public function getIcon()
         return $this->icon;
     }
 
-    public function getTabLangs()
+    public function getTabLangs(): Collection & Selectable
     {
         return $this->tabLangs;
     }
 
+    public function getTabLangByLanguageId(int $languageId): ?TabLang
+    {
+        /** @var TabLang $tabLang */
+        foreach ($this->getTabLangs() as $tabLang) {
+            if ($tabLang->getLang()->getId() === $languageId) {
+                return $tabLang;
+            }
+        }
+
+        return null;
+    }
+
     /**
      * @return string|null
      */
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/routing.yml b/src/PrestaShopBundle/Resources/config/services/bundle/routing.yml
index 16ce0211e36c1..3f9801b621432 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/routing.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/routing.yml
@@ -12,9 +12,13 @@ services:
       - '@router'
       - '@prestashop.bundle.routing.converter.cache_provider'
 
+  PrestaShopBundle\Routing\Converter\LegacyParametersConverter:
+    public: false
+
   prestashop.bundle.routing.converter.legacy_parameters_converter:
-    class: 'PrestaShopBundle\Routing\Converter\LegacyParametersConverter'
+    alias: 'PrestaShopBundle\Routing\Converter\LegacyParametersConverter'
     public: true
+    deprecated: '%alias_id% service alias is deprecated and will be removed in 10.0.'
 
   PrestaShopBundle\Routing\Converter\RouterProvider:
     autowire: true
diff --git a/src/PrestaShopBundle/Twig/Component/QuickAccess.php b/src/PrestaShopBundle/Twig/Component/QuickAccess.php
index cfbab77e25d02..9a16c9afde063 100644
--- a/src/PrestaShopBundle/Twig/Component/QuickAccess.php
+++ b/src/PrestaShopBundle/Twig/Component/QuickAccess.php
@@ -36,9 +36,9 @@
 use PrestaShop\PrestaShop\Core\Util\Url\UrlCleaner;
 use PrestaShopBundle\Entity\Repository\TabRepository;
 use PrestaShopBundle\Service\DataProvider\UserProvider;
+use PrestaShopBundle\Twig\Layout\MenuBuilder;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
 use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
 
 #[AsTwigComponent(template: '@PrestaShop/Admin/Component/Layout/quick_access.html.twig')]
@@ -87,7 +87,7 @@ public function __construct(
         private readonly UserProvider $userProvider,
         private readonly RequestStack $requestStack,
         private readonly FeatureFlagStateCheckerInterface $featureFlagStateChecker,
-        private readonly TranslatorInterface $translator,
+        private readonly MenuBuilder $menuBuilder
     ) {
     }
 
@@ -179,9 +179,13 @@ public function getCleanCurrentUrl(): string
     public function getCurrentUrlTitle(): string
     {
         if (null === $this->currentUrlTitle) {
-            $class_name = $this->requestStack->getMainRequest()->attributes->get('_legacy_controller');
-            $tab = $this->tabRepository->findOneByClassName($class_name);
-            $this->currentUrlTitle = $tab ? $this->translator->trans($tab->getWording(), [], $tab->getWordingDomain()) : '';
+            $breadcrumbLinks = $this->menuBuilder->getBreadcrumbLinks();
+            if (isset($breadcrumbLinks['tab'])) {
+                $this->currentUrlTitle = $breadcrumbLinks['tab']->name;
+                if (isset($breadcrumbLinks['action'])) {
+                    $this->currentUrlTitle .= ' - ' . $breadcrumbLinks['action']->name;
+                }
+            }
         }
 
         return $this->currentUrlTitle;
diff --git a/src/PrestaShopBundle/Twig/Layout/MenuBuilder.php b/src/PrestaShopBundle/Twig/Layout/MenuBuilder.php
new file mode 100644
index 0000000000000..285bad62714a1
--- /dev/null
+++ b/src/PrestaShopBundle/Twig/Layout/MenuBuilder.php
@@ -0,0 +1,187 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\Twig\Layout;
+
+use PrestaShop\PrestaShop\Adapter\LegacyContext;
+use PrestaShopBundle\Entity\Repository\TabRepository;
+use PrestaShopBundle\Entity\Tab;
+use PrestaShopBundle\Routing\Converter\LegacyParametersConverter;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class MenuBuilder
+{
+    public function __construct(
+        private readonly LegacyContext $context,
+        private readonly RequestStack $requestStack,
+        private readonly TabRepository $tabRepository,
+        private readonly TranslatorInterface $translator,
+        private readonly UrlGeneratorInterface $urlGenerator,
+        private readonly LegacyParametersConverter $legacyParametersConverter
+    ) {
+    }
+
+    public function getCurrentTab(): ?Tab
+    {
+        $className = $this->getLegacyControllerClassName();
+        if (null === $className) {
+            return null;
+        }
+
+        return $this->tabRepository->findOneByClassName($className);
+    }
+
+    /**
+     * @return array<string, MenuLink>
+     */
+    public function getBreadcrumbLinks(): array
+    {
+        $currentTab = $this->getCurrentTab();
+        if (null === $currentTab) {
+            return [];
+        }
+
+        $breadcrumbLinks = [
+            'tab' => $this->convertTabToMenuLink($currentTab),
+        ];
+
+        $tabAncestors = $this->tabRepository->getAncestors($currentTab->getId());
+        if (!empty($tabAncestors)) {
+            $breadcrumbLinks['container'] = $this->convertTabToMenuLink(reset($tabAncestors));
+        }
+
+        $actionLink = $this->getActionLink();
+        if (null !== $actionLink) {
+            $breadcrumbLinks['action'] = $actionLink;
+        }
+
+        return $breadcrumbLinks;
+    }
+
+    private function convertTabToMenuLink(Tab $tab): MenuLink
+    {
+        if (!empty($tab->getRouteName())) {
+            $url = $this->urlGenerator->generate($tab->getRouteName());
+        } else {
+            $url = $this->context->getAdminLink($tab->getClassName());
+        }
+
+        return new MenuLink(
+            name: $this->getBreadcrumbLabel($tab),
+            url: $url,
+            icon: 'icon-' . $tab->getClassName(),
+        );
+    }
+
+    private function getBreadcrumbLabel(Tab $tab): string
+    {
+        if (null !== $tab->getWording() && null !== $tab->getWordingDomain()) {
+            return $this->translator->trans($tab->getWording(), [], $tab->getWordingDomain());
+        }
+
+        $tabLang = $tab->getTabLangByLanguageId($this->getContextLanguageId());
+        if (null !== $tabLang) {
+            return $tabLang->getName();
+        }
+
+        if (!$tab->getTabLangs()->isEmpty()) {
+            return $tab->getTabLangs()->first()->getName();
+        }
+
+        return $tab->getClassName();
+    }
+
+    private function getContextLanguageId(): int
+    {
+        return $this->context->getLanguage()->getId();
+    }
+
+    private function getActionLink(): ?MenuLink
+    {
+        $action = $this->getLegacyAction();
+
+        switch (true) {
+            // In legacy no action is always equivalent to list action, but maybe we should change this into null and consider no action can be identified
+            case null === $action:
+            case $action === '':
+            case str_starts_with($action, 'list'):
+                return new MenuLink(
+                    name: $this->translator->trans('List', [], 'Admin.Actions'),
+                    icon: 'icon-th-list'
+                );
+
+            case str_starts_with($action, 'add'):
+                return new MenuLink(
+                    name: $this->translator->trans('Add', [], 'Admin.Actions'),
+                    icon: 'icon-plus'
+                );
+            case str_starts_with($action, 'edit'):
+            case str_starts_with($action, 'update'):
+                return new MenuLink(
+                    name: $this->translator->trans('Edit', [], 'Admin.Actions'),
+                    icon: 'icon-pencil'
+                );
+
+            case str_starts_with($action, 'details'):
+            case str_starts_with($action, 'view'):
+                return new MenuLink(
+                    name: $this->translator->trans('View details', [], 'Admin.Actions'),
+                    icon: 'icon-zoom-in'
+                );
+            case str_starts_with($action, 'options'):
+                return new MenuLink(
+                    name: $this->translator->trans('Options', [], 'Admin.Actions'),
+                    icon: 'icon-cogs'
+                );
+            case str_starts_with($action, 'generator'):
+                return new MenuLink(
+                    name: $this->translator->trans('Generator', [], 'Admin.Actions'),
+                    icon: 'icon-flask'
+                );
+            default:
+                return null;
+        }
+    }
+
+    private function getLegacyAction(): ?string
+    {
+        $legacyParameters = $this->legacyParametersConverter->getParameters(
+            $this->requestStack->getMainRequest()->attributes->all(),
+            $this->requestStack->getMainRequest()->query->all()
+        );
+
+        return $legacyParameters['action'] ?? null;
+    }
+
+    private function getLegacyControllerClassName(): ?string
+    {
+        return $this->requestStack->getMainRequest()->attributes->get('_legacy_controller');
+    }
+}
diff --git a/src/PrestaShopBundle/Twig/Layout/MenuLink.php b/src/PrestaShopBundle/Twig/Layout/MenuLink.php
new file mode 100644
index 0000000000000..0d14c4fff4692
--- /dev/null
+++ b/src/PrestaShopBundle/Twig/Layout/MenuLink.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\Twig\Layout;
+
+class MenuLink
+{
+    public function __construct(
+        public readonly string $name,
+        public readonly string $url = '',
+        public readonly string $icon = '',
+        public readonly array $attributes = [],
+    ) {
+    }
+}

From 6406fe5cf34fdd2dac6d3f41a3da6db511679d89 Mon Sep 17 00:00:00 2001
From: Jonathan Lelievre <jonathan.lelievre@prestashop.com>
Date: Thu, 17 Aug 2023 12:00:05 +0200
Subject: [PATCH 0804/1030] Fix special raw title in Order view page

---
 .../themes/new-theme/template/layout.tpl      |  1 +
 .../Admin/Component/Layout/toolbar.html.twig  | 20 ++++++++++++-------
 .../views/Admin/Layout/toolbar.html.twig      |  3 ++-
 .../Twig/Component/Toolbar.php                |  1 +
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/admin-dev/themes/new-theme/template/layout.tpl b/admin-dev/themes/new-theme/template/layout.tpl
index 85afed32f6c66..0647380b7ab5f 100644
--- a/admin-dev/themes/new-theme/template/layout.tpl
+++ b/admin-dev/themes/new-theme/template/layout.tpl
@@ -181,6 +181,7 @@
       enableSidebar=$enableSidebar
       current_tab_level=$current_tab_level
       tabs=$tabs
+      use_regular_h1_structure=$use_regular_h1_structure
     }
 {/if}
 
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/toolbar.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/toolbar.html.twig
index 1f9612ea9a92f..d2ef1f6923d08 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/toolbar.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/toolbar.html.twig
@@ -45,13 +45,19 @@
     {% set persistent_help_btn = help_link is defined and help_link is not same as (false) and toolbarBtn is empty %}
     <div class="title-row {% if persistent_help_btn %}flex-nowrap flex-md-wrap{% endif %}">
       {% block pageTitle %}
-        <h1 class="title">
-          {% if title is iterable and title is not empty %}
-            {{ title|last|e }}
-          {% else %}
-            {{ title|e }}
-          {% endif %}
-        </h1>
+        {% if useRegularH1Structure %}
+          <h1 class="title">
+            {% if title is iterable and title is not empty %}
+              {{ title|last|e }}
+            {% else %}
+              {{ title|e }}
+            {% endif %}
+          </h1>
+        {% else %}
+          {% autoescape false %}
+            {{ title }}
+          {% endautoescape %}
+        {% endif %}
       {% endblock %}
 
       {% block toolbarBox %}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/toolbar.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/toolbar.html.twig
index 57bbed44bed42..e908a3fe33d1e 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Layout/toolbar.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/toolbar.html.twig
@@ -31,5 +31,6 @@
   helpLink: help_link,
   enableSidebar: enableSidebar,
   currentTabLevel: current_tab_level,
-  tabs: tabs
+  tabs: tabs,
+  useRegularH1Structure: use_regular_h1_structure
 }) }}
diff --git a/src/PrestaShopBundle/Twig/Component/Toolbar.php b/src/PrestaShopBundle/Twig/Component/Toolbar.php
index aa3e411e72933..f95eb49882b3b 100644
--- a/src/PrestaShopBundle/Twig/Component/Toolbar.php
+++ b/src/PrestaShopBundle/Twig/Component/Toolbar.php
@@ -42,4 +42,5 @@ class Toolbar
     public bool $enableSidebar;
     public int $currentTabLevel;
     public array $tabs;
+    public bool $useRegularH1Structure = true;
 }

From 4a0026354cb7e6ad6e908211b783babe7a086105 Mon Sep 17 00:00:00 2001
From: Jonathan Lelievre <jonathan.lelievre@prestashop.com>
Date: Thu, 17 Aug 2023 16:07:01 +0200
Subject: [PATCH 0805/1030] Fix quick access when no tab is found

---
 src/PrestaShopBundle/Twig/Component/QuickAccess.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/PrestaShopBundle/Twig/Component/QuickAccess.php b/src/PrestaShopBundle/Twig/Component/QuickAccess.php
index 9a16c9afde063..bcb26bbae91b7 100644
--- a/src/PrestaShopBundle/Twig/Component/QuickAccess.php
+++ b/src/PrestaShopBundle/Twig/Component/QuickAccess.php
@@ -185,6 +185,8 @@ public function getCurrentUrlTitle(): string
                 if (isset($breadcrumbLinks['action'])) {
                     $this->currentUrlTitle .= ' - ' . $breadcrumbLinks['action']->name;
                 }
+            } else {
+                $this->currentUrlTitle = '';
             }
         }
 

From 7158ba548da3c60b1f2442a89161504e19f8ff92 Mon Sep 17 00:00:00 2001
From: Pablo Borowicz <pablo.borowicz@prestashop.com>
Date: Fri, 18 Aug 2023 20:55:33 +0200
Subject: [PATCH 0806/1030] Fix error when $theme_name is null

---
 .../admin/AdminTranslationsController.php     | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php
index 4b21bddaff8d6..d4162d6b15dd6 100644
--- a/controllers/admin/AdminTranslationsController.php
+++ b/controllers/admin/AdminTranslationsController.php
@@ -977,6 +977,9 @@ protected function findAndWriteTranslationsIntoFile($file_name, $files, $theme_n
             $array_check_duplicate = [];
         }
 
+        $module_name_lowercase = strtolower($module_name);
+        $theme_name_lowercase = strtolower((string) $theme_name);
+
         foreach ($files as $file) {
             if (preg_match('/^(.*)\.(tpl|php)$/', $file) && Tools::file_exists_cache($dir . $file) && !in_array($file, self::$ignore_folder)) {
                 // Get content for this file
@@ -988,16 +991,19 @@ protected function findAndWriteTranslationsIntoFile($file_name, $files, $theme_n
                 // Parse this content
                 $matches = $this->userParseFile($content, $this->type_selected, $type_file, $module_name);
 
+                unset($content);
+
                 // Write each translation on its module file
-                $template_name = substr(basename($file), 0, -4);
+                $template_name = strtolower(substr(basename($file), 0, -4));
 
                 foreach ($matches as $key) {
+                    $key_md5 = md5($key);
                     if ($theme_name) {
-                        $post_key = md5(strtolower($module_name) . '_' . strtolower($theme_name) . '_' . strtolower($template_name) . '_' . md5($key));
-                        $pattern = '\'<{' . strtolower($module_name) . '}' . strtolower($theme_name) . '>' . strtolower($template_name) . '_' . md5($key) . '\'';
+                        $post_key = md5($module_name_lowercase . '_' . $theme_name_lowercase . '_' . $template_name . '_' . $key_md5);
+                        $pattern = '\'<{' . $module_name_lowercase . '}' . $theme_name_lowercase . '>' . $template_name . '_' . $key_md5 . '\'';
                     } else {
-                        $post_key = md5(strtolower($module_name) . '_' . strtolower($template_name) . '_' . md5($key));
-                        $pattern = '\'<{' . strtolower($module_name) . '}prestashop>' . strtolower($template_name) . '_' . md5($key) . '\'';
+                        $post_key = md5($module_name_lowercase . '_' . $template_name . '_' . $key_md5);
+                        $pattern = '\'<{' . $module_name_lowercase . '}prestashop>' . $template_name . '_' . $key_md5 . '\'';
                     }
 
                     if (array_key_exists($post_key, $_POST) && !in_array($pattern, $array_check_duplicate)) {
@@ -1084,12 +1090,14 @@ protected function findAndFillTranslations($files, $theme_name, $module_name, $d
                 // Parse this content
                 $matches = $this->userParseFile($content, $this->type_selected, $type_file, $module_name);
 
+                unset($content);
+
                 // Write each translation on its module file
                 $template_name = substr(basename($file), 0, -4);
 
                 foreach ($matches as $key) {
                     $md5_key = md5($key);
-                    $module_key = '<{' . Tools::strtolower($module_name) . '}' . strtolower($theme_name) . '>' . Tools::strtolower($template_name) . '_' . $md5_key;
+                    $module_key = '<{' . Tools::strtolower($module_name) . '}' . strtolower((string) $theme_name) . '>' . Tools::strtolower($template_name) . '_' . $md5_key;
                     $default_key = '<{' . Tools::strtolower($module_name) . '}prestashop>' . Tools::strtolower($template_name) . '_' . $md5_key;
                     // to avoid duplicate entry
                     if (!in_array($module_key, $array_check_duplicate)) {

From 4961e913f29510d61848e09a8e63f9e861bc82dc Mon Sep 17 00:00:00 2001
From: Arnaud Dohogne <contact@ad-dev.be>
Date: Sat, 19 Aug 2023 23:20:16 +0200
Subject: [PATCH 0807/1030] fix(webservice): allow preflight requests

---
 webservice/dispatcher.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/webservice/dispatcher.php b/webservice/dispatcher.php
index dfc824088b790..06f93993b866b 100644
--- a/webservice/dispatcher.php
+++ b/webservice/dispatcher.php
@@ -59,6 +59,12 @@
 } elseif (isset($_GET['ws_key'])) {
     $key = $_GET['ws_key'];
 } else {
+    // Check if it is a preflight request before sending the 401 response
+    if ($_SERVER['REQUEST_METHOD'] == 'OPTIONS') {
+        header('Access-Control-Allow-Headers: Authorization, Content-Type');
+        die('200 OK');
+    }
+
     header($_SERVER['SERVER_PROTOCOL'] . ' 401 Unauthorized');
     header('WWW-Authenticate: Basic realm="Welcome to PrestaShop Webservice, please enter the authentication key as the login. No password required."');
     die('401 Unauthorized');

From 43cc0ab8050161445593cc5ea749b82569a7934b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Aug 2023 04:09:44 +0000
Subject: [PATCH 0808/1030] Bump playwright from 1.37.0 to 1.37.1 in /tests/UI

Bumps [playwright](https://github.com/Microsoft/playwright) from 1.37.0 to 1.37.1.
- [Release notes](https://github.com/Microsoft/playwright/releases)
- [Commits](https://github.com/Microsoft/playwright/compare/v1.37.0...v1.37.1)

---
updated-dependencies:
- dependency-name: playwright
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 30 +++++++++++++++---------------
 tests/UI/package.json      |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index c92e9ae073205..5897eb7ded39d 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -24,7 +24,7 @@
         "mocha": "^10.2.0",
         "mochawesome": "^7.1.3",
         "pdfjs-dist": "^3.4.120",
-        "playwright": "^1.37.0",
+        "playwright": "^1.37.1",
         "xpath-ts": "^1.3.13"
       },
       "devDependencies": {
@@ -6137,12 +6137,12 @@
       }
     },
     "node_modules/playwright": {
-      "version": "1.37.0",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.37.0.tgz",
-      "integrity": "sha512-CrAEFfVioamMwDKmygc/HAkzEAxYAwjD+zod2poTxM7ObivkoDsKHu1ned16fnQV/Tf1kDB8KtsyH8Qd3VzJIg==",
+      "version": "1.37.1",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.37.1.tgz",
+      "integrity": "sha512-bgUXRrQKhT48zHdxDYQTpf//0xDfDd5hLeEhjuSw8rXEGoT9YeElpfvs/izonTNY21IQZ7d3s22jLxYaAnubbQ==",
       "hasInstallScript": true,
       "dependencies": {
-        "playwright-core": "1.37.0"
+        "playwright-core": "1.37.1"
       },
       "bin": {
         "playwright": "cli.js"
@@ -6152,9 +6152,9 @@
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.37.0",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.37.0.tgz",
-      "integrity": "sha512-1c46jhTH/myQw6sesrcuHVtLoSNfJv8Pfy9t3rs6subY7kARv0HRw5PpyfPYPpPtQvBOmgbE6K+qgYUpj81LAA==",
+      "version": "1.37.1",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.37.1.tgz",
+      "integrity": "sha512-17EuQxlSIYCmEMwzMqusJ2ztDgJePjrbttaefgdsiqeLWidjYz9BxXaTaZWxH1J95SHGk6tjE+dwgWILJoUZfA==",
       "bin": {
         "playwright-core": "cli.js"
       },
@@ -12475,17 +12475,17 @@
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
     },
     "playwright": {
-      "version": "1.37.0",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.37.0.tgz",
-      "integrity": "sha512-CrAEFfVioamMwDKmygc/HAkzEAxYAwjD+zod2poTxM7ObivkoDsKHu1ned16fnQV/Tf1kDB8KtsyH8Qd3VzJIg==",
+      "version": "1.37.1",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.37.1.tgz",
+      "integrity": "sha512-bgUXRrQKhT48zHdxDYQTpf//0xDfDd5hLeEhjuSw8rXEGoT9YeElpfvs/izonTNY21IQZ7d3s22jLxYaAnubbQ==",
       "requires": {
-        "playwright-core": "1.37.0"
+        "playwright-core": "1.37.1"
       }
     },
     "playwright-core": {
-      "version": "1.37.0",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.37.0.tgz",
-      "integrity": "sha512-1c46jhTH/myQw6sesrcuHVtLoSNfJv8Pfy9t3rs6subY7kARv0HRw5PpyfPYPpPtQvBOmgbE6K+qgYUpj81LAA=="
+      "version": "1.37.1",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.37.1.tgz",
+      "integrity": "sha512-17EuQxlSIYCmEMwzMqusJ2ztDgJePjrbttaefgdsiqeLWidjYz9BxXaTaZWxH1J95SHGk6tjE+dwgWILJoUZfA=="
     },
     "prelude-ls": {
       "version": "1.1.2",
diff --git a/tests/UI/package.json b/tests/UI/package.json
index a13eaf0474811..c40bb4905ef2b 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -117,7 +117,7 @@
     "mocha": "^10.2.0",
     "mochawesome": "^7.1.3",
     "pdfjs-dist": "^3.4.120",
-    "playwright": "^1.37.0",
+    "playwright": "^1.37.1",
     "xpath-ts": "^1.3.13"
   },
   "devDependencies": {

From d941412c666907e79b30ab686abd9d6d30ed47a2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Aug 2023 04:09:48 +0000
Subject: [PATCH 0809/1030] Bump eslint-plugin-import from 2.28.0 to 2.28.1 in
 /tests/UI

Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.28.0 to 2.28.1.
- [Release notes](https://github.com/import-js/eslint-plugin-import/releases)
- [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md)
- [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.28.0...v2.28.1)

---
updated-dependencies:
- dependency-name: eslint-plugin-import
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 32 +++++++++++++++-----------------
 tests/UI/package.json      |  2 +-
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index c92e9ae073205..b8f1a44767c59 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -40,7 +40,7 @@
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-deprecation": "^1.5.0",
         "eslint-plugin-html": "^7.1.0",
-        "eslint-plugin-import": "^2.28.0",
+        "eslint-plugin-import": "^2.28.1",
         "jsdoc-to-markdown": "^8.0.0",
         "mochawesome-merge": "^4.3.0",
         "ts-mocha": "^10.0.0",
@@ -2765,9 +2765,9 @@
       }
     },
     "node_modules/eslint-plugin-import": {
-      "version": "2.28.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.0.tgz",
-      "integrity": "sha512-B8s/n+ZluN7sxj9eUf7/pRFERX0r5bnFA2dCaLHy2ZeaQEAz0k+ZZkFWRFHJAqxfxQDx6KLv9LeIki7cFdwW+Q==",
+      "version": "2.28.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.1.tgz",
+      "integrity": "sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A==",
       "dev": true,
       "dependencies": {
         "array-includes": "^3.1.6",
@@ -2779,13 +2779,12 @@
         "eslint-import-resolver-node": "^0.3.7",
         "eslint-module-utils": "^2.8.0",
         "has": "^1.0.3",
-        "is-core-module": "^2.12.1",
+        "is-core-module": "^2.13.0",
         "is-glob": "^4.0.3",
         "minimatch": "^3.1.2",
         "object.fromentries": "^2.0.6",
         "object.groupby": "^1.0.0",
         "object.values": "^1.1.6",
-        "resolve": "^1.22.3",
         "semver": "^6.3.1",
         "tsconfig-paths": "^3.14.2"
       },
@@ -4109,9 +4108,9 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.12.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz",
-      "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==",
+      "version": "2.13.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz",
+      "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==",
       "dev": true,
       "dependencies": {
         "has": "^1.0.3"
@@ -10109,9 +10108,9 @@
       }
     },
     "eslint-plugin-import": {
-      "version": "2.28.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.0.tgz",
-      "integrity": "sha512-B8s/n+ZluN7sxj9eUf7/pRFERX0r5bnFA2dCaLHy2ZeaQEAz0k+ZZkFWRFHJAqxfxQDx6KLv9LeIki7cFdwW+Q==",
+      "version": "2.28.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.1.tgz",
+      "integrity": "sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A==",
       "dev": true,
       "requires": {
         "array-includes": "^3.1.6",
@@ -10123,13 +10122,12 @@
         "eslint-import-resolver-node": "^0.3.7",
         "eslint-module-utils": "^2.8.0",
         "has": "^1.0.3",
-        "is-core-module": "^2.12.1",
+        "is-core-module": "^2.13.0",
         "is-glob": "^4.0.3",
         "minimatch": "^3.1.2",
         "object.fromentries": "^2.0.6",
         "object.groupby": "^1.0.0",
         "object.values": "^1.1.6",
-        "resolve": "^1.22.3",
         "semver": "^6.3.1",
         "tsconfig-paths": "^3.14.2"
       },
@@ -10969,9 +10967,9 @@
       "dev": true
     },
     "is-core-module": {
-      "version": "2.12.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz",
-      "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==",
+      "version": "2.13.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz",
+      "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==",
       "dev": true,
       "requires": {
         "has": "^1.0.3"
diff --git a/tests/UI/package.json b/tests/UI/package.json
index a13eaf0474811..b7b781058f09d 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -133,7 +133,7 @@
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-deprecation": "^1.5.0",
     "eslint-plugin-html": "^7.1.0",
-    "eslint-plugin-import": "^2.28.0",
+    "eslint-plugin-import": "^2.28.1",
     "jsdoc-to-markdown": "^8.0.0",
     "mochawesome-merge": "^4.3.0",
     "ts-mocha": "^10.0.0",

From 4d6e3bebf14473b11c4691885dcc643c7f7e79cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@prestashop.com>
Date: Thu, 3 Aug 2023 10:03:46 +0200
Subject: [PATCH 0810/1030] Rename new-api into backoffice API

---
 app/config/config.yml                            |  4 ++--
 src/PrestaShopBundle/Api/Api.php                 |  2 +-
 .../ApiPlatform/GetHookStatusTest.php            | 16 ++++++++--------
 tests/Integration/ApiPlatform/GetHookTest.php    |  6 +++---
 .../UI/campaigns/functional/API/01_basicTest.ts  |  8 ++++----
 .../01_internalAuthServer/02_resourceEndpoint.ts | 16 ++++++++--------
 .../02_externalAuthServer/02_resourceEndpoint.ts | 16 ++++++++--------
 7 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/app/config/config.yml b/app/config/config.yml
index 2f54ef8360001..e44fe68f2b0c9 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -94,8 +94,8 @@ twig:
     disabling_switch_prefix: !php/const PrestaShopBundle\Form\Extension\DisablingSwitchExtension::FIELD_PREFIX
 
 api_platform:
-  title: PrestaShop API
-  version: 1.0.0
+  title: Backoffice API
+  version: 0.1.0
   enable_entrypoint: false
   formats:
     json:
diff --git a/src/PrestaShopBundle/Api/Api.php b/src/PrestaShopBundle/Api/Api.php
index 3f36130527b30..83d8c0e499fee 100644
--- a/src/PrestaShopBundle/Api/Api.php
+++ b/src/PrestaShopBundle/Api/Api.php
@@ -33,7 +33,7 @@
  */
 final class Api
 {
-    public const API_BASE_PATH = '/new-api';
+    public const API_BASE_PATH = '/api';
 
     /**
      * This class is not meant to be instantiated as it is used to access encoding constants only.
diff --git a/tests/Integration/ApiPlatform/GetHookStatusTest.php b/tests/Integration/ApiPlatform/GetHookStatusTest.php
index 8b66f5710df0f..66906f79cb90a 100644
--- a/tests/Integration/ApiPlatform/GetHookStatusTest.php
+++ b/tests/Integration/ApiPlatform/GetHookStatusTest.php
@@ -51,18 +51,18 @@ public function testGetHookStatus(): void
         $activeHook->add();
 
         $bearerToken = $this->getBearerToken();
-        $response = static::createClient()->request('GET', '/new-api/hook-status/' . (int) $inactiveHook->id, ['auth_bearer' => $bearerToken]);
+        $response = static::createClient()->request('GET', '/api/hook-status/' . (int) $inactiveHook->id, ['auth_bearer' => $bearerToken]);
         self::assertEquals(json_decode($response->getContent())->active, $inactiveHook->active);
         self::assertResponseStatusCodeSame(200);
 
-        $response = static::createClient()->request('GET', '/new-api/hook-status/' . (int) $activeHook->id, ['auth_bearer' => $bearerToken]);
+        $response = static::createClient()->request('GET', '/api/hook-status/' . (int) $activeHook->id, ['auth_bearer' => $bearerToken]);
         self::assertEquals(json_decode($response->getContent())->active, $activeHook->active);
         self::assertResponseStatusCodeSame(200);
 
-        static::createClient()->request('GET', '/new-api/hook-status/' . 9999, ['auth_bearer' => $bearerToken]);
+        static::createClient()->request('GET', '/api/hook-status/' . 9999, ['auth_bearer' => $bearerToken]);
         self::assertResponseStatusCodeSame(404);
 
-        static::createClient()->request('GET', '/new-api/hook-status/' . $activeHook->id);
+        static::createClient()->request('GET', '/api/hook-status/' . $activeHook->id);
         self::assertResponseStatusCodeSame(401);
 
         $inactiveHook->delete();
@@ -77,13 +77,13 @@ public function testDisableHook(): void
         $hook->add();
 
         $bearerToken = $this->getBearerToken();
-        static::createClient()->request('PUT', '/new-api/hook-status', [
+        static::createClient()->request('PUT', '/api/hook-status', [
             'auth_bearer' => $bearerToken,
             'json' => ['id' => (int) $hook->id, 'active' => false],
         ]);
         self::assertResponseStatusCodeSame(200);
 
-        $response = static::createClient()->request('GET', '/new-api/hook-status/' . (int) $hook->id, ['auth_bearer' => $bearerToken]);
+        $response = static::createClient()->request('GET', '/api/hook-status/' . (int) $hook->id, ['auth_bearer' => $bearerToken]);
         self::assertEquals(json_decode($response->getContent())->active, false);
         self::assertResponseStatusCodeSame(200);
     }
@@ -96,13 +96,13 @@ public function testEnableHook(): void
         $hook->add();
 
         $bearerToken = $this->getBearerToken();
-        static::createClient()->request('PUT', '/new-api/hook-status', [
+        static::createClient()->request('PUT', '/api/hook-status', [
             'auth_bearer' => $bearerToken,
             'json' => ['id' => (int) $hook->id, 'active' => true],
         ]);
         self::assertResponseStatusCodeSame(200);
 
-        $response = static::createClient()->request('GET', '/new-api/hook-status/' . (int) $hook->id, ['auth_bearer' => $bearerToken]);
+        $response = static::createClient()->request('GET', '/api/hook-status/' . (int) $hook->id, ['auth_bearer' => $bearerToken]);
         self::assertEquals(json_decode($response->getContent())->active, true);
         self::assertResponseStatusCodeSame(200);
     }
diff --git a/tests/Integration/ApiPlatform/GetHookTest.php b/tests/Integration/ApiPlatform/GetHookTest.php
index ebe8e4652d826..ed88c3ccf27e1 100644
--- a/tests/Integration/ApiPlatform/GetHookTest.php
+++ b/tests/Integration/ApiPlatform/GetHookTest.php
@@ -48,14 +48,14 @@ public function testGetHook(): void
 
         $bearerToken = $this->getBearerToken();
 
-        $response = static::createClient()->request('GET', '/new-api/hooks/' . (int) $hook->id, ['auth_bearer' => $bearerToken]);
+        $response = static::createClient()->request('GET', '/api/hooks/' . (int) $hook->id, ['auth_bearer' => $bearerToken]);
         self::assertEquals(json_decode($response->getContent())->active, $hook->active);
         self::assertResponseStatusCodeSame(200);
 
-        static::createClient()->request('GET', '/new-api/hooks/' . 9999, ['auth_bearer' => $bearerToken]);
+        static::createClient()->request('GET', '/api/hooks/' . 9999, ['auth_bearer' => $bearerToken]);
         self::assertResponseStatusCodeSame(404);
 
-        static::createClient()->request('GET', '/new-api/hooks/' . $hook->id);
+        static::createClient()->request('GET', '/api/hooks/' . $hook->id);
         self::assertResponseStatusCodeSame(401);
 
         $hook->delete();
diff --git a/tests/UI/campaigns/functional/API/01_basicTest.ts b/tests/UI/campaigns/functional/API/01_basicTest.ts
index b41c63192285b..cf8beb38240bd 100644
--- a/tests/UI/campaigns/functional/API/01_basicTest.ts
+++ b/tests/UI/campaigns/functional/API/01_basicTest.ts
@@ -15,17 +15,17 @@ describe('API : Basic Test', async () => {
   });
 
   describe('Basic Test', async () => {
-    it('should request the endpoint /admin-dev/new-api/', async function () {
+    it('should request the endpoint /admin-dev/api/', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'requestNewApi', baseContext);
 
-      const apiResponse = await apiContext.get('new-api/');
+      const apiResponse = await apiContext.get('api/');
       await expect(apiResponse.status()).to.eq(404);
     });
 
-    it('should request the endpoint /admin-dev/new-api/hook-status', async function () {
+    it('should request the endpoint /admin-dev/api/hook-status', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'requestNewApiHookStatus', baseContext);
 
-      const apiResponse = await apiContext.get('new-api/hook-status');
+      const apiResponse = await apiContext.get('api/hook-status');
       await expect(apiResponse.status()).to.eq(405);
     });
   });
diff --git a/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/01_internalAuthServer/02_resourceEndpoint.ts b/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/01_internalAuthServer/02_resourceEndpoint.ts
index 1d682459304ef..46a03387560de 100644
--- a/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/01_internalAuthServer/02_resourceEndpoint.ts
+++ b/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/01_internalAuthServer/02_resourceEndpoint.ts
@@ -38,19 +38,19 @@ describe('API : Internal Auth Server - Resource Endpoint', async () => {
       accessTokenExpired = api.setAccessTokenAsExpired(accessToken);
     });
 
-    it('should request the endpoint /admin-dev/new-api/hook-status/1 without access token', async function () {
+    it('should request the endpoint /admin-dev/api/hook-status/1 without access token', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'requestEndpointWithoutAccessToken', baseContext);
 
-      const apiResponse = await apiContext.get('new-api/hook-status/1');
+      const apiResponse = await apiContext.get('api/hook-status/1');
       await expect(apiResponse.status()).to.eq(401);
       await expect(api.hasResponseHeader(apiResponse, 'WWW-Authenticate')).to.be.true;
       await expect(api.getResponseHeader(apiResponse, 'WWW-Authenticate')).to.be.eq('Bearer');
     });
 
-    it('should request the endpoint /admin-dev/new-api/hook-status/1 with invalid access token', async function () {
+    it('should request the endpoint /admin-dev/api/hook-status/1 with invalid access token', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'requestEndpointWithInvalidAccessToken', baseContext);
 
-      const apiResponse = await apiContext.get('new-api/hook-status/1', {
+      const apiResponse = await apiContext.get('api/hook-status/1', {
         headers: {
           Authorization: 'Bearer INVALIDTOKEN',
         },
@@ -60,10 +60,10 @@ describe('API : Internal Auth Server - Resource Endpoint', async () => {
       await expect(api.getResponseHeader(apiResponse, 'WWW-Authenticate')).to.be.eq('Bearer');
     });
 
-    it('should request the endpoint /admin-dev/new-api/hook-status/1 with expired access token', async function () {
+    it('should request the endpoint /admin-dev/api/hook-status/1 with expired access token', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'requestEndpointWithExpiredAccessToken', baseContext);
 
-      const apiResponse = await apiContext.get('new-api/hook-status/1', {
+      const apiResponse = await apiContext.get('api/hook-status/1', {
         headers: {
           Authorization: `Bearer ${accessTokenExpired}`,
         },
@@ -73,10 +73,10 @@ describe('API : Internal Auth Server - Resource Endpoint', async () => {
       await expect(api.getResponseHeader(apiResponse, 'WWW-Authenticate')).to.be.eq('Bearer');
     });
 
-    it('should request the endpoint /admin-dev/new-api/hook-status/1 with valid access token', async function () {
+    it('should request the endpoint /admin-dev/api/hook-status/1 with valid access token', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'requestEndpointWithValidAccessToken', baseContext);
 
-      const apiResponse = await apiContext.get('new-api/hook-status/1', {
+      const apiResponse = await apiContext.get('api/hook-status/1', {
         headers: {
           Authorization: `Bearer ${accessToken}`,
         },
diff --git a/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts b/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts
index 8fc6b8038767d..61a84288ec2d5 100644
--- a/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts
+++ b/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts
@@ -124,19 +124,19 @@ describe('API : External Auth Server - Resource Endpoint', async () => {
       await expect(textResult).to.be.eq(keycloakConnectorDemo.successfulUpdateMessage);
     });
 
-    it('should request the endpoint /admin-dev/new-api/hook-status/1 without access token', async function () {
+    it('should request the endpoint /admin-dev/api/hook-status/1 without access token', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'requestEndpointWithoutAccessToken', baseContext);
 
-      const apiResponse = await apiContext.get('new-api/hook-status/1');
+      const apiResponse = await apiContext.get('api/hook-status/1');
       await expect(apiResponse.status()).to.eq(401);
       await expect(api.hasResponseHeader(apiResponse, 'WWW-Authenticate')).to.be.true;
       await expect(api.getResponseHeader(apiResponse, 'WWW-Authenticate')).to.be.eq('Bearer');
     });
 
-    it('should request the endpoint /admin-dev/new-api/hook-status/1 with invalid access token', async function () {
+    it('should request the endpoint /admin-dev/api/hook-status/1 with invalid access token', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'requestEndpointWithInvalidAccessToken', baseContext);
 
-      const apiResponse = await apiContext.get('new-api/hook-status/1', {
+      const apiResponse = await apiContext.get('api/hook-status/1', {
         headers: {
           Authorization: 'Bearer INVALIDTOKEN',
         },
@@ -146,10 +146,10 @@ describe('API : External Auth Server - Resource Endpoint', async () => {
       await expect(api.getResponseHeader(apiResponse, 'WWW-Authenticate')).to.be.eq('Bearer');
     });
 
-    it('should request the endpoint /admin-dev/new-api/hook-status/1 with expired access token', async function () {
+    it('should request the endpoint /admin-dev/api/hook-status/1 with expired access token', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'requestEndpointWithExpiredAccessToken', baseContext);
 
-      const apiResponse = await apiContext.get('new-api/hook-status/1', {
+      const apiResponse = await apiContext.get('api/hook-status/1', {
         headers: {
           Authorization: `Bearer ${accessTokenExpiredKeycloak}`,
         },
@@ -160,10 +160,10 @@ describe('API : External Auth Server - Resource Endpoint', async () => {
       await expect(api.getResponseHeader(apiResponse, 'WWW-Authenticate')).to.be.eq('Bearer');
     });
 
-    it('should request the endpoint /admin-dev/new-api/hook-status/1 with valid access token', async function () {
+    it('should request the endpoint /admin-dev/api/hook-status/1 with valid access token', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'requestEndpointWithValidAccessToken', baseContext);
 
-      const apiResponse = await apiContext.get('new-api/hook-status/1', {
+      const apiResponse = await apiContext.get('api/hook-status/1', {
         headers: {
           Authorization: `Bearer ${accessTokenKeycloak}`,
         },

From e3fd8bb2729a0589fa7f52c2782fde184c46e31a Mon Sep 17 00:00:00 2001
From: Mateus <43613217+MatShir@users.noreply.github.com>
Date: Mon, 21 Aug 2023 14:53:21 +0200
Subject: [PATCH 0811/1030] Update PULL_REQUEST_TEMPLATE.md

---
 .github/PULL_REQUEST_TEMPLATE.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 2edff94d1a418..3065a10a3d75d 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -12,13 +12,13 @@ https://devdocs.prestashop-project.org/8/contribute/contribution-guidelines/pull
 
 | Questions         | Answers
 | ----------------- | -------------------------------------------------------
-| Branch?           | develop / 8.1.x / 8.0.x / 1.7.8.x
+| Branch?           | develop / 8.1.x
 | Description?      | Please be specific when describing the PR. <br> Every detail helps: versions, browser/server configuration, specific module/theme, etc. Feel free to add more information below this table.
 | Type?             | bug fix / improvement / new feature / refacto
 | Category?         | FO / BO / CO / IN / WS / TE / LO / ME / PM
 | BC breaks?        | yes / no
 | Deprecations?     | yes / no
 | How to test?      | Indicate how to verify that this change works as expected.
-| Fixed ticket?     | Fixes #{issue number here}, Fixes #{another issue number here}
+| Fixed issue or discussion?     | Fixes #{issue number here}, Fixes #{another issue number here}, Fixes https://github.com/PrestaShop/PrestaShop/discussions/ {discussion number here}
 | Related PRs       | If theme, autoupgrade or other module change is needed to make this change work, provide a link to related PRs here.
 | Sponsor company   | Your company or customer's name goes here (if applicable).

From 2331ce08d94108f6ff71aaefc476bd914fba3920 Mon Sep 17 00:00:00 2001
From: Maxime <contact@vaisonet.com>
Date: Mon, 21 Aug 2023 17:42:52 +0200
Subject: [PATCH 0812/1030] Add webservice order returns - issue #17753

---
 classes/webservice/WebserviceRequest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/classes/webservice/WebserviceRequest.php b/classes/webservice/WebserviceRequest.php
index 057789e074142..b02ed79efdb31 100644
--- a/classes/webservice/WebserviceRequest.php
+++ b/classes/webservice/WebserviceRequest.php
@@ -312,6 +312,7 @@ public static function getResources()
             'order_invoices' => ['description' => 'The Order invoices', 'class' => 'OrderInvoice'],
             'orders' => ['description' => 'The Customers orders', 'class' => 'Order'],
             'order_payments' => ['description' => 'The Order payments', 'class' => 'OrderPayment'],
+			'order_returns' => ['description' => 'The Customers orders returns', 'class' => 'OrderReturn'],
             'order_states' => ['description' => 'The Order statuses', 'class' => 'OrderState'],
             'order_slip' => ['description' => 'The Order slips', 'class' => 'OrderSlip'],
             'price_ranges' => ['description' => 'Price ranges', 'class' => 'RangePrice'],

From 80b8c0f45ab48fea6058e45248007f74b4bb62fc Mon Sep 17 00:00:00 2001
From: Maxime <contact@vaisonet.com>
Date: Tue, 22 Aug 2023 11:20:03 +0200
Subject: [PATCH 0813/1030] fix identation

---
 classes/webservice/WebserviceRequest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/webservice/WebserviceRequest.php b/classes/webservice/WebserviceRequest.php
index b02ed79efdb31..e40edb1e0b458 100644
--- a/classes/webservice/WebserviceRequest.php
+++ b/classes/webservice/WebserviceRequest.php
@@ -312,7 +312,7 @@ public static function getResources()
             'order_invoices' => ['description' => 'The Order invoices', 'class' => 'OrderInvoice'],
             'orders' => ['description' => 'The Customers orders', 'class' => 'Order'],
             'order_payments' => ['description' => 'The Order payments', 'class' => 'OrderPayment'],
-			'order_returns' => ['description' => 'The Customers orders returns', 'class' => 'OrderReturn'],
+            'order_returns' => ['description' => 'The Customers orders returns', 'class' => 'OrderReturn'],
             'order_states' => ['description' => 'The Order statuses', 'class' => 'OrderState'],
             'order_slip' => ['description' => 'The Order slips', 'class' => 'OrderSlip'],
             'price_ranges' => ['description' => 'Price ranges', 'class' => 'RangePrice'],

From 50c607571a57fa3d92d06af99da67417f0a78a01 Mon Sep 17 00:00:00 2001
From: boubkerbribri <boubker.bribri@prestashop.com>
Date: Tue, 22 Aug 2023 11:34:13 +0200
Subject: [PATCH 0814/1030] nightly: fix erreur on credit slip pagination test

---
 .../02_sortAndPaginationCreditSlips.ts        | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/02_orders/03_creditSlips/02_sortAndPaginationCreditSlips.ts b/tests/UI/campaigns/functional/BO/02_orders/03_creditSlips/02_sortAndPaginationCreditSlips.ts
index 51057ce2ba74a..658496ec9d11e 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/03_creditSlips/02_sortAndPaginationCreditSlips.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/03_creditSlips/02_sortAndPaginationCreditSlips.ts
@@ -92,30 +92,30 @@ describe('BO - Orders - Credit slips : Sort (by ID, Date and OrderID) and Pagina
         await expect(pageTitle).to.contains(ordersPage.pageTitle);
       });
 
-      it('should go to the first order page', async function () {
+      it(`should change the order status to '${OrderStatuses.shipped.name}' and check it`, async function () {
         await testContext.addContextItem(
           this,
           'testIdentifier',
-          `goToCreatedOrderPage${i}`,
+          `updateCreatedOrderStatus${i}`,
           `${baseContext}_preTest_${i}`,
         );
 
-        await ordersPage.goToOrder(page, 1);
-
-        const pageTitle = await orderPageTabListBlock.getPageTitle(page);
-        await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+        const textResult = await ordersPage.setOrderStatus(page, 1, OrderStatuses.shipped);
+        await expect(textResult).to.equal(ordersPage.successfulUpdateMessage);
       });
 
-      it(`should change the order status to '${OrderStatuses.shipped.name}' and check it`, async function () {
+      it('should go to the first order page', async function () {
         await testContext.addContextItem(
           this,
           'testIdentifier',
-          `updateCreatedOrderStatus${i}`,
+          `goToCreatedOrderPage${i}`,
           `${baseContext}_preTest_${i}`,
         );
 
-        const result = await orderPageTabListBlock.modifyOrderStatus(page, OrderStatuses.shipped.name);
-        await expect(result).to.equal(OrderStatuses.shipped.name);
+        await ordersPage.goToOrder(page, 1);
+
+        const pageTitle = await orderPageTabListBlock.getPageTitle(page);
+        await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
       });
 
       it('should add a partial refund', async function () {

From aad7c19e603147579aa125c7df47be52ff7b27db Mon Sep 17 00:00:00 2001
From: Tofandel <adrien.foulon@tukan.hu>
Date: Tue, 22 Aug 2023 12:30:01 +0200
Subject: [PATCH 0815/1030] fix: issue when clearing cache with opcache with
 enable_file_override

---
 src/Core/Cache/Clearer/CacheClearerChain.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Core/Cache/Clearer/CacheClearerChain.php b/src/Core/Cache/Clearer/CacheClearerChain.php
index fbba8a55872da..0210c6cab7695 100644
--- a/src/Core/Cache/Clearer/CacheClearerChain.php
+++ b/src/Core/Cache/Clearer/CacheClearerChain.php
@@ -52,5 +52,9 @@ public function clear()
         foreach ($this->cacheClearers as $cacheClearer) {
             $cacheClearer->clear();
         }
+
+        if (function_exists('opcache_reset')) {
+            opcache_reset();
+        }
     }
 }

From 5c15fe47c2ed46598137fa46feaacfc89c7f3381 Mon Sep 17 00:00:00 2001
From: Morgan Pichat <morgan.pichat@prestashop.com>
Date: Mon, 21 Aug 2023 16:13:54 +0200
Subject: [PATCH 0816/1030] Makes breadcrumbs management independent

---
 .../themes/new-theme/template/layout.tpl      |  1 -
 .../Admin/Component/Layout/toolbar.html.twig  |  8 +++---
 .../views/Admin/Layout/toolbar.html.twig      |  1 -
 .../Twig/Component/Toolbar.php                | 28 ++++++++++++++++++-
 .../Twig/Layout/MenuBuilder.php               | 22 ++++++++++++---
 src/PrestaShopBundle/Twig/Layout/MenuLink.php |  2 +-
 6 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/admin-dev/themes/new-theme/template/layout.tpl b/admin-dev/themes/new-theme/template/layout.tpl
index 0647380b7ab5f..f19d55d8f64ce 100644
--- a/admin-dev/themes/new-theme/template/layout.tpl
+++ b/admin-dev/themes/new-theme/template/layout.tpl
@@ -173,7 +173,6 @@
       smarty_template=$page_header_toolbar_template
       twig_template="@PrestaShop/Admin/Layout/toolbar.html.twig"
       locked_to_all_shop_context=$locked_to_all_shop_context
-      breadcrumbs2=$breadcrumbs2
       title=$title
       toolbar_btn=$toolbar_btn
       table=$table
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/toolbar.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/toolbar.html.twig
index d2ef1f6923d08..74f6574913329 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/toolbar.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/toolbar.html.twig
@@ -29,13 +29,13 @@
     {% block pageBreadcrumb %}
       <nav aria-label="Breadcrumb">
         <ol class="breadcrumb">
-          {% if breadcrumbs2.container.name != '' %}
-            <li class="breadcrumb-item">{{ breadcrumbs2.container.name|escape }}</li>
+          {% if breadcrumbs.container.name != '' %}
+            <li class="breadcrumb-item">{{ breadcrumbs.container.name|escape }}</li>
           {% endif %}
 
-          {% if breadcrumbs2.tab.name != '' and breadcrumbs2.container.name != breadcrumbs2.tab.name and breadcrumbs2.tab.href != '' %}
+          {% if breadcrumbs.tab.name != '' and breadcrumbs.container.name != breadcrumbs.tab.name and breadcrumbs.tab.href != '' %}
             <li class="breadcrumb-item active">
-              <a href="{{ breadcrumbs2.tab.href|escape }}" aria-current="page">{{ breadcrumbs2.tab.name|escape }}</a>
+              <a href="{{ breadcrumbs.tab.href|escape }}" aria-current="page">{{ breadcrumbs.tab.name|escape }}</a>
             </li>
           {% endif %}
         </ol>
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/toolbar.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/toolbar.html.twig
index e908a3fe33d1e..e938e572d46cd 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Layout/toolbar.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/toolbar.html.twig
@@ -24,7 +24,6 @@
  *#}
 {{ component('Toolbar', {
   lockedToAllShopContext: locked_to_all_shop_context,
-  breadcrumbs2: breadcrumbs2,
   title: title,
   toolbarBtn: toolbar_btn,
   table: table,
diff --git a/src/PrestaShopBundle/Twig/Component/Toolbar.php b/src/PrestaShopBundle/Twig/Component/Toolbar.php
index f95eb49882b3b..52f53886ac06e 100644
--- a/src/PrestaShopBundle/Twig/Component/Toolbar.php
+++ b/src/PrestaShopBundle/Twig/Component/Toolbar.php
@@ -28,13 +28,14 @@
 
 namespace PrestaShopBundle\Twig\Component;
 
+use PrestaShop\PrestaShop\Core\Hook\HookDispatcherInterface;
+use PrestaShopBundle\Twig\Layout\MenuBuilder;
 use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
 
 #[AsTwigComponent(template: '@PrestaShop/Admin/Component/Layout/toolbar.html.twig')]
 class Toolbar
 {
     public bool $lockedToAllShopContext;
-    public array $breadcrumbs2;
     public array $toolbarBtn;
     public array|string $title;
     public string $table;
@@ -42,5 +43,30 @@ class Toolbar
     public bool $enableSidebar;
     public int $currentTabLevel;
     public array $tabs;
+    public array $breadcrumbs;
     public bool $useRegularH1Structure = true;
+
+    public function __construct(
+        private readonly HookDispatcherInterface $hookDispatcher,
+        private readonly MenuBuilder $menuBuilder
+    ) {
+    }
+
+    public function mount(): void
+    {
+        $tab = $this->menuBuilder->getCurrentTab();
+        if (null === $tab) {
+            $this->breadcrumbs = [];
+        } else {
+            $tabs = [];
+            $tabs[] = $tab;
+            $ancestorsTab = $this->menuBuilder->getAncestorsTab($tab->getId());
+            if (!empty($ancestorsTab)) {
+                $tabs[] = $ancestorsTab;
+            }
+
+            $this->breadcrumbs = $this->menuBuilder->convertTabsToBreadcrumbLinks($tab, $ancestorsTab);
+            $this->hookDispatcher->dispatchWithParameters('actionAdminBreadcrumbModifier', ['tabs' => $tabs, 'breadcrumb' => &$this->breadcrumbs]);
+        }
+    }
 }
diff --git a/src/PrestaShopBundle/Twig/Layout/MenuBuilder.php b/src/PrestaShopBundle/Twig/Layout/MenuBuilder.php
index 285bad62714a1..f3dc058cfd8ee 100644
--- a/src/PrestaShopBundle/Twig/Layout/MenuBuilder.php
+++ b/src/PrestaShopBundle/Twig/Layout/MenuBuilder.php
@@ -58,6 +58,11 @@ public function getCurrentTab(): ?Tab
         return $this->tabRepository->findOneByClassName($className);
     }
 
+    public function getAncestorsTab(int $currentTabId): array
+    {
+        return $this->tabRepository->getAncestors($currentTabId);
+    }
+
     /**
      * @return array<string, MenuLink>
      */
@@ -68,11 +73,20 @@ public function getBreadcrumbLinks(): array
             return [];
         }
 
+        $tabAncestors = $this->getAncestorsTab($currentTab->getId());
+
+        return $this->convertTabsToBreadcrumbLinks($currentTab, $tabAncestors);
+    }
+
+    /**
+     * @return array<string, MenuLink>
+     */
+    public function convertTabsToBreadcrumbLinks(Tab $currentTab, array $tabAncestors): array
+    {
         $breadcrumbLinks = [
             'tab' => $this->convertTabToMenuLink($currentTab),
         ];
 
-        $tabAncestors = $this->tabRepository->getAncestors($currentTab->getId());
         if (!empty($tabAncestors)) {
             $breadcrumbLinks['container'] = $this->convertTabToMenuLink(reset($tabAncestors));
         }
@@ -88,14 +102,14 @@ public function getBreadcrumbLinks(): array
     private function convertTabToMenuLink(Tab $tab): MenuLink
     {
         if (!empty($tab->getRouteName())) {
-            $url = $this->urlGenerator->generate($tab->getRouteName());
+            $href = $this->urlGenerator->generate($tab->getRouteName());
         } else {
-            $url = $this->context->getAdminLink($tab->getClassName());
+            $href = $this->context->getAdminLink($tab->getClassName());
         }
 
         return new MenuLink(
             name: $this->getBreadcrumbLabel($tab),
-            url: $url,
+            href: $href,
             icon: 'icon-' . $tab->getClassName(),
         );
     }
diff --git a/src/PrestaShopBundle/Twig/Layout/MenuLink.php b/src/PrestaShopBundle/Twig/Layout/MenuLink.php
index 0d14c4fff4692..9189412d7bebe 100644
--- a/src/PrestaShopBundle/Twig/Layout/MenuLink.php
+++ b/src/PrestaShopBundle/Twig/Layout/MenuLink.php
@@ -32,7 +32,7 @@ class MenuLink
 {
     public function __construct(
         public readonly string $name,
-        public readonly string $url = '',
+        public readonly string $href = '',
         public readonly string $icon = '',
         public readonly array $attributes = [],
     ) {

From 72b204a3b6c26d698b868196f9c5666fca521996 Mon Sep 17 00:00:00 2001
From: boherm <boris.hermans@prestashop.com>
Date: Thu, 25 May 2023 17:39:17 +0200
Subject: [PATCH 0817/1030] Load symfony container in front

---
 .env.dist                                     |  1 +
 .gitignore                                    |  4 ++
 admin-dev/index.php                           |  8 +--
 app/AdminKernel.php                           | 29 ++++++++++
 app/AppKernel.php                             | 15 ++++-
 app/FrontKernel.php                           | 29 ++++++++++
 bin/console                                   |  4 +-
 classes/controller/AdminController.php        |  2 +-
 classes/controller/Controller.php             | 14 +++--
 classes/controller/FrontController.php        | 11 +++-
 composer.json                                 |  2 +
 controllers/admin/DummyAdminController.php    |  5 +-
 index.php                                     | 48 +++++++++++++++-
 install-dev/controllers/console/process.php   |  2 +-
 install-dev/init.php                          |  3 +-
 src/Adapter/ContainerBuilder.php              |  2 +
 src/PrestaShopBundle/PrestaShopBundle.php     |  6 ++
 .../Resources/config/services.yml             |  1 +
 .../config/services/front_legacy.yml          | 57 +++++++++++++++++++
 .../Service/Command/AbstractCommand.php       |  5 +-
 .../Features/Context/CommonFeatureContext.php |  3 +-
 .../Features/Context/OrderFeatureContext.php  |  4 +-
 tests/Integration/phpunit-isolated.xml        |  2 +-
 tests/Integration/phpunit.xml                 |  2 +-
 tests/Unit/phpunit.xml                        |  2 +-
 25 files changed, 230 insertions(+), 31 deletions(-)
 create mode 100644 .env.dist
 create mode 100644 app/AdminKernel.php
 create mode 100644 app/FrontKernel.php
 create mode 100644 src/PrestaShopBundle/Resources/config/services/front_legacy.yml

diff --git a/.env.dist b/.env.dist
new file mode 100644
index 0000000000000..31e6ca1b618ea
--- /dev/null
+++ b/.env.dist
@@ -0,0 +1 @@
+PS_CONTAINER_V2_FRONT=false
diff --git a/.gitignore b/.gitignore
index 507cdae348247..9f381fc790847 100644
--- a/.gitignore
+++ b/.gitignore
@@ -137,6 +137,10 @@ themes/*-chunk.js.map
 
 # Config
 
+/.env
+/.env.local
+/.env.local.php
+/.env.*.local
 config/defines_custom.inc.php
 config/settings.inc.php
 config/settings.old.php
diff --git a/admin-dev/index.php b/admin-dev/index.php
index cca457eeb8b21..ffaffbed3dcf9 100644
--- a/admin-dev/index.php
+++ b/admin-dev/index.php
@@ -71,6 +71,7 @@
 if (_PS_MODE_DEV_) {
     Debug::enable();
 }
+require_once __DIR__ . '/../autoload.php';
 
 // Loads .env file from the root of project
 $dotEnvFile = dirname(__FILE__, 2) . '/.env';
@@ -80,18 +81,15 @@
     ->loadEnv($dotEnvFile)
 ;
 
-require_once __DIR__ . '/../app/AppKernel.php';
-
-$kernel = new AppKernel(_PS_ENV_, _PS_MODE_DEV_);
+$kernel = new AdminKernel(_PS_ENV_, _PS_MODE_DEV_);
 // When using the HttpCache, you need to call the method in your front controller instead of relying on the configuration parameter
 //Request::enableHttpMethodParameterOverride();
 $request = Request::createFromGlobals();
 Request::setTrustedProxies([], Request::HEADER_X_FORWARDED_ALL);
 
-$catch = strpos($request->getRequestUri(), Api::API_BASE_PATH) !== false;
+$catch = str_contains($request->getRequestUri(), Api::API_BASE_PATH);
 
 try {
-    require_once __DIR__ . '/../autoload.php';
     $response = $kernel->handle($request, HttpKernelInterface::MAIN_REQUEST, $catch);
     $response->send();
     $kernel->terminate($request, $response);
diff --git a/app/AdminKernel.php b/app/AdminKernel.php
new file mode 100644
index 0000000000000..6373b0df3e1e6
--- /dev/null
+++ b/app/AdminKernel.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+class AdminKernel extends AppKernel
+{
+}
diff --git a/app/AppKernel.php b/app/AppKernel.php
index 3f26811e46524..fe3e14bd89f9f 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -32,7 +32,8 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Kernel;
 
-class AppKernel extends Kernel
+
+abstract class AppKernel extends Kernel
 {
     const VERSION = Version::VERSION;
     const MAJOR_VERSION_STRING = Version::MAJOR_VERSION_STRING;
@@ -62,7 +63,7 @@ public function registerBundles()
             new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
             new ApiPlatform\Symfony\Bundle\ApiPlatformBundle(),
             // PrestaShop Core bundle
-            new PrestaShopBundle\PrestaShopBundle(),
+            new PrestaShopBundle\PrestaShopBundle($this),
             // PrestaShop Translation parser
             new TranslationToolsBundle(),
             new FOS\JsRoutingBundle\FOSJsRoutingBundle(),
@@ -329,4 +330,14 @@ protected function unlockCacheStream($lockStream): void
             unlink($clearCacheLockPath);
         }
     }
+
+    /**
+     * Get App type of current Kernel based on kernel class name. (admin or front)
+     *
+     * @return string
+     */
+     public function getAppType(): string
+     {
+         return $this instanceof \AdminKernel ? 'admin' : 'front';
+     }
 }
diff --git a/app/FrontKernel.php b/app/FrontKernel.php
new file mode 100644
index 0000000000000..62463dbe48568
--- /dev/null
+++ b/app/FrontKernel.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+class FrontKernel extends AppKernel
+{
+}
diff --git a/bin/console b/bin/console
index b70f3edaff0c5..fd49818f76998 100755
--- a/bin/console
+++ b/bin/console
@@ -23,6 +23,8 @@ if ($debug) {
     Debug::enable();
 }
 
+require_once __DIR__ . '/../app/AdminKernel.php';
+
 // Loads .env file from the root of project
 $dotEnvFile = dirname(__FILE__, 2) . '/.env';
   (new Dotenv())
@@ -31,6 +33,6 @@ $dotEnvFile = dirname(__FILE__, 2) . '/.env';
       ->loadEnv($dotEnvFile)
 ;
 
-$kernel = new AppKernel($env, $debug);
+$kernel = new AdminKernel($env, $debug);
 $application = new Application($kernel);
 $application->run($input);
diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index ed6517185eccb..6b91811d2c974 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -4261,7 +4261,7 @@ public function getTabSlug()
     /**
      * @return ContainerInterface
      */
-    protected function buildContainer()
+    protected function buildContainer(): ContainerInterface
     {
         return SymfonyContainer::getInstance();
     }
diff --git a/classes/controller/Controller.php b/classes/controller/Controller.php
index 7b8121cd14166..50a3ddc82bd16 100644
--- a/classes/controller/Controller.php
+++ b/classes/controller/Controller.php
@@ -24,8 +24,9 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
+use PrestaShop\PrestaShop\Adapter\SymfonyContainer;
 use PrestaShopBundle\Translation\TranslatorComponent;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * @TODO Move undeclared variables and methods to this (base) class: $errors, $layout, checkLiveEditAccess, etc.
@@ -155,7 +156,7 @@ abstract class ControllerCore
     /**
      * Dependency container.
      *
-     * @var ContainerBuilder
+     * @var ContainerInterface
      */
     protected $container;
 
@@ -781,9 +782,12 @@ protected function ajaxRender($value = null, $controller = null, $method = null)
     /**
      * Construct the dependency container.
      *
-     * @return ContainerBuilder
+     * @return ContainerInterface
      */
-    abstract protected function buildContainer();
+    protected function buildContainer(): ContainerInterface
+    {
+        return SymfonyContainer::getInstance();
+    }
 
     /**
      * Gets a service from the service container.
@@ -816,7 +820,7 @@ public function getParameter($parameterId)
     /**
      * Gets the dependency container.
      *
-     * @return ContainerBuilder|null
+     * @return ContainerInterface|null
      */
     public function getContainer()
     {
diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php
index b2d0861142272..2208159e3f5d3 100644
--- a/classes/controller/FrontController.php
+++ b/classes/controller/FrontController.php
@@ -30,7 +30,9 @@
 use PrestaShop\PrestaShop\Adapter\Image\ImageRetriever;
 use PrestaShop\PrestaShop\Adapter\Presenter\Cart\CartPresenter;
 use PrestaShop\PrestaShop\Adapter\Presenter\Object\ObjectPresenter;
+use PrestaShop\PrestaShop\Adapter\SymfonyContainer;
 use PrestaShop\PrestaShop\Core\Security\PasswordPolicyConfiguration;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\HttpFoundation\IpUtils;
 
@@ -2076,9 +2078,14 @@ public function getAssetUriFromLegacyDeprecatedMethod($legacy_uri)
     /**
      * {@inheritdoc}
      */
-    protected function buildContainer()
+    protected function buildContainer(): ContainerInterface
     {
-        return ContainerBuilder::getContainer('front', _PS_MODE_DEV_);
+        /* @phpstan-ignore-next-line */
+        if (FRONT_LEGACY_CONTEXT) {
+            return ContainerBuilder::getContainer('front', _PS_MODE_DEV_);
+        }
+
+        return SymfonyContainer::getInstance();
     }
 
     /**
diff --git a/composer.json b/composer.json
index 00db00cd4003b..81f89ffc73217 100644
--- a/composer.json
+++ b/composer.json
@@ -237,6 +237,8 @@
         },
         "classmap": [
             "app/AppKernel.php",
+            "app/AdminKernel.php",
+            "app/FrontKernel.php",
             "app/AppCache.php"
         ]
     },
diff --git a/controllers/admin/DummyAdminController.php b/controllers/admin/DummyAdminController.php
index 9b841a857001f..6ea1b1a2a7d28 100644
--- a/controllers/admin/DummyAdminController.php
+++ b/controllers/admin/DummyAdminController.php
@@ -92,10 +92,7 @@ protected function redirect()
         return '';
     }
 
-    /**
-     * @return ContainerInterface|null
-     */
-    protected function buildContainer()
+    protected function buildContainer(): ContainerInterface
     {
         return SymfonyContainer::getInstance();
     }
diff --git a/index.php b/index.php
index b08bc1ba7d79e..ffb597b79ca99 100644
--- a/index.php
+++ b/index.php
@@ -24,5 +24,51 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
-require dirname(__FILE__).'/config/config.inc.php';
+use Symfony\Component\Dotenv\Dotenv;
+use Symfony\Component\ErrorHandler\Debug;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+
+// Set front dir constant to use after
+if (!defined('_PS_FRONT_DIR_')) {
+    define('_PS_FRONT_DIR_', dirname(__FILE__));
+}
+
+// Include some configurations & composer autoload
+require_once _PS_FRONT_DIR_ . '/config/config.inc.php';
+require_once _PS_FRONT_DIR_ . '/vendor/autoload.php';
+
+// Load .env file from the root of project if present
+(new Dotenv(false))->loadEnv(_PS_FRONT_DIR_ . '/.env');
+
+// If we want to use new container access in front (Warning: Experimental feature from now!)
+if (isset($_ENV['PS_CONTAINER_V2_FRONT']) && filter_var($_ENV['PS_CONTAINER_V2_FRONT'], \FILTER_VALIDATE_BOOL)) {
+    define('_PS_CONTAINER_V2_FRONT_', true);
+
+    // Activate Symfony's debug if we need it
+    if (_PS_MODE_DEV_) {
+        Debug::enable();
+    }
+
+    // Starting Kernel
+    $kernel = new FrontKernel(_PS_ENV_, _PS_MODE_DEV_);
+    $request = Request::createFromGlobals();
+
+    // Try to handle request
+    try {
+        $response = $kernel->handle($request, HttpKernelInterface::MASTER_REQUEST, false);
+        $response->send();
+        define('FRONT_LEGACY_CONTEXT', false);
+        $kernel->terminate($request, $response);
+    } catch (NotFoundHttpException|Exception $exception) {
+        // correct Apache charset (except if it's too late)
+        if (!headers_sent()) {
+            header('Content-Type: text/html; charset=utf-8');
+        }
+    }
+}
+
+// Prepare and trigger LEGACY front dispatcher
+define('FRONT_LEGACY_CONTEXT', true);
 Dispatcher::getInstance()->dispatch();
diff --git a/install-dev/controllers/console/process.php b/install-dev/controllers/console/process.php
index 755f215bded91..df9116a37949e 100644
--- a/install-dev/controllers/console/process.php
+++ b/install-dev/controllers/console/process.php
@@ -363,7 +363,7 @@ private function initKernel()
         require_once _PS_CORE_DIR_ . '/config/bootstrap.php';
 
         global $kernel;
-        $kernel = new AppKernel(_PS_ENV_, _PS_MODE_DEV_);
+        $kernel = new AdminKernel(_PS_ENV_, _PS_MODE_DEV_);
         $kernel->boot();
     }
 
diff --git a/install-dev/init.php b/install-dev/init.php
index 7322645b5a341..25612a95cf082 100644
--- a/install-dev/init.php
+++ b/install-dev/init.php
@@ -91,10 +91,11 @@
 
 if (file_exists(_PS_CORE_DIR_ . '/app/config/parameters.php')) {
     require_once _PS_CORE_DIR_ . '/config/bootstrap.php';
+    require_once _PS_CORE_DIR_ . '/app/AdminKernel.php';
 
     global $kernel;
     try {
-        $kernel = new AppKernel(_PS_ENV_, _PS_MODE_DEV_);
+        $kernel = new AdminKernel(_PS_ENV_, _PS_MODE_DEV_);
         $kernel->boot();
     } catch (DBALException $e) {
         /*
diff --git a/src/Adapter/ContainerBuilder.php b/src/Adapter/ContainerBuilder.php
index 35e97ab46bbd5..b57a2f62e0b6b 100644
--- a/src/Adapter/ContainerBuilder.php
+++ b/src/Adapter/ContainerBuilder.php
@@ -50,6 +50,8 @@
 
 /**
  * Build the Container for PrestaShop Legacy.
+ *
+ * @deprecated since 9.0. Please use SymfonyContainer instead.
  */
 class ContainerBuilder
 {
diff --git a/src/PrestaShopBundle/PrestaShopBundle.php b/src/PrestaShopBundle/PrestaShopBundle.php
index 254e67f9a2043..70d74c405c7a3 100644
--- a/src/PrestaShopBundle/PrestaShopBundle.php
+++ b/src/PrestaShopBundle/PrestaShopBundle.php
@@ -57,6 +57,10 @@ class PrestaShopBundle extends Bundle
      */
     public const LOAD_MODULE_SERVICES_PASS_PRIORITY = 200;
 
+    public function __construct(private \AppKernel $kernel)
+    {
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -72,6 +76,8 @@ public function build(ContainerBuilder $container)
     {
         $container->addCompilerPass(new DynamicRolePass());
         $container->addCompilerPass(new PopulateTranslationProvidersPass());
+        $container->addCompilerPass(new LoadServicesFromModulesPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, self::LOAD_MODULE_SERVICES_PASS_PRIORITY);
+        $container->addCompilerPass(new LoadServicesFromModulesPass($this->kernel->getAppType()), PassConfig::TYPE_BEFORE_OPTIMIZATION, self::LOAD_MODULE_SERVICES_PASS_PRIORITY);
         $container->addCompilerPass(new RemoveXmlCompiledContainerPass(), PassConfig::TYPE_AFTER_REMOVING);
         $container->addCompilerPass(new RouterPass(), PassConfig::TYPE_AFTER_REMOVING);
         $container->addCompilerPass(new OverrideTranslatorServiceCompilerPass());
diff --git a/src/PrestaShopBundle/Resources/config/services.yml b/src/PrestaShopBundle/Resources/config/services.yml
index 2dd1a2a0dfea4..93acdc58941c2 100644
--- a/src/PrestaShopBundle/Resources/config/services.yml
+++ b/src/PrestaShopBundle/Resources/config/services.yml
@@ -7,3 +7,4 @@ imports:
   - { resource: services/adapter/*.yml }
   - { resource: services/legacy.yml }
   - { resource: services/alias.yml }
+  - { resource: services/front_legacy.yml }
diff --git a/src/PrestaShopBundle/Resources/config/services/front_legacy.yml b/src/PrestaShopBundle/Resources/config/services/front_legacy.yml
new file mode 100644
index 0000000000000..cdaf5db3250d5
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/config/services/front_legacy.yml
@@ -0,0 +1,57 @@
+services:
+  _defaults:
+    public: true
+
+  prestashop.core.filter.front_end_object.main:
+    class: PrestaShop\PrestaShop\Core\Filter\FrontEndObject\MainFilter
+    autoconfigure: true
+    arguments:
+      - cart: '@prestashop.core.filter.front_end_object.cart'
+        customer: '@prestashop.core.filter.front_end_object.customer'
+        shop: '@prestashop.core.filter.front_end_object.shop'
+        configuration: '@prestashop.core.filter.front_end_object.configuration'
+
+  prestashop.core.filter.front_end_object.product:
+    class: PrestaShop\PrestaShop\Core\Filter\FrontEndObject\ProductFilter
+
+  prestashop.core.filter.front_end_object.cart:
+    class: PrestaShop\PrestaShop\Core\Filter\FrontEndObject\CartFilter
+    arguments:
+      - '@prestashop.core.filter.front_end_object.product_collection'
+
+  prestashop.core.filter.front_end_object.search_result_product:
+    class: PrestaShop\PrestaShop\Core\Filter\FrontEndObject\SearchResultProductFilter
+
+  prestashop.core.filter.front_end_object.customer:
+    class: PrestaShop\PrestaShop\Core\Filter\FrontEndObject\CustomerFilter
+
+  prestashop.core.filter.front_end_object.shop:
+    class: PrestaShop\PrestaShop\Core\Filter\FrontEndObject\ShopFilter
+
+  prestashop.core.filter.front_end_object.configuration:
+    class: PrestaShop\PrestaShop\Core\Filter\FrontEndObject\ConfigurationFilter
+
+  prestashop.core.filter.front_end_object.product_collection:
+    class: PrestaShop\PrestaShop\Core\Filter\CollectionFilter
+    calls:
+      - method: queue
+        arguments:
+          - [ '@prestashop.core.filter.front_end_object.product' ]
+
+  prestashop.core.filter.front_end_object.search_result_product_collection:
+    class: PrestaShop\PrestaShop\Core\Filter\CollectionFilter
+    calls:
+      - method: queue
+        arguments:
+          - [ '@prestashop.core.filter.front_end_object.search_result_product' ]
+
+  prestashop.adapter.module.repository.module_repository:
+    class: 'PrestaShop\PrestaShop\Adapter\Module\Repository\ModuleRepository'
+    arguments:
+      - !php/const _PS_ROOT_DIR_
+      - !php/const _PS_MODULE_DIR_
+
+  prestashop.translation.translator_language_loader:
+    class: PrestaShopBundle\Translation\TranslatorLanguageLoader
+    arguments:
+      - '@prestashop.adapter.module.repository.module_repository'
diff --git a/src/PrestaShopBundle/Service/Command/AbstractCommand.php b/src/PrestaShopBundle/Service/Command/AbstractCommand.php
index b61242cb5855c..f6dfd5190c8dd 100644
--- a/src/PrestaShopBundle/Service/Command/AbstractCommand.php
+++ b/src/PrestaShopBundle/Service/Command/AbstractCommand.php
@@ -26,6 +26,7 @@
 
 namespace PrestaShopBundle\Service\Command;
 
+use AdminKernel;
 use AppKernel;
 use Exception;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
@@ -53,8 +54,8 @@ public function __construct(AppKernel $kernel = null)
             global $kernel;
 
             if (null === $kernel) {
-                require_once _PS_ROOT_DIR_ . '/app/AppKernel.php';
-                $kernel = new AppKernel(_PS_ENV_, _PS_MODE_DEV_);
+                require_once _PS_ROOT_DIR_ . '/app/AdminKernel.php';
+                $kernel = new AdminKernel(_PS_ENV_, _PS_MODE_DEV_);
             }
         }
 
diff --git a/tests/Integration/Behaviour/Features/Context/CommonFeatureContext.php b/tests/Integration/Behaviour/Features/Context/CommonFeatureContext.php
index bc858ded64dc2..8773620aca0e7 100644
--- a/tests/Integration/Behaviour/Features/Context/CommonFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/CommonFeatureContext.php
@@ -29,6 +29,7 @@
 use Access;
 use Address;
 use AddressFormat;
+use AdminKernel;
 use Alias;
 use AppKernel;
 use Attachment;
@@ -163,7 +164,7 @@ public static function prepare(BeforeSuiteScope $scope)
     {
         require_once __DIR__ . '/../../bootstrap.php';
 
-        self::$kernel = new AppKernel('test', true);
+        self::$kernel = new AdminKernel('test', true);
         self::$kernel->boot();
 
         global $kernel;
diff --git a/tests/Integration/Behaviour/Features/Context/OrderFeatureContext.php b/tests/Integration/Behaviour/Features/Context/OrderFeatureContext.php
index 1bbf894b45a68..9bac65933acc4 100644
--- a/tests/Integration/Behaviour/Features/Context/OrderFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/OrderFeatureContext.php
@@ -26,7 +26,7 @@
 
 namespace Tests\Integration\Behaviour\Features\Context;
 
-use AppKernel;
+use AdminKernel;
 use Behat\Gherkin\Node\TableNode;
 use Configuration;
 use Exception;
@@ -64,7 +64,7 @@ public function validateCartWithPaymentModule($paymentModuleName)
         // need to boot kernel for usage in $paymentModule->validateOrder()
         global $kernel;
         $previousKernel = $kernel;
-        $kernel = new AppKernel('test', true);
+        $kernel = new AdminKernel('test', true);
         $kernel->boot();
 
         // need to update secret_key in order to get payment working
diff --git a/tests/Integration/phpunit-isolated.xml b/tests/Integration/phpunit-isolated.xml
index 65a55f5a1787e..8c08ca895d39f 100644
--- a/tests/Integration/phpunit-isolated.xml
+++ b/tests/Integration/phpunit-isolated.xml
@@ -3,7 +3,7 @@
     convertDeprecationsToExceptions="false"
     processIsolation="true">
   <php>
-    <env name="KERNEL_CLASS" value="AppKernel" />
+    <env name="KERNEL_CLASS" value="AdminKernel" />
     <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak"/>
   </php>
   <testsuites>
diff --git a/tests/Integration/phpunit.xml b/tests/Integration/phpunit.xml
index ba857eb34c93c..561186465015e 100644
--- a/tests/Integration/phpunit.xml
+++ b/tests/Integration/phpunit.xml
@@ -3,7 +3,7 @@
     convertDeprecationsToExceptions="false"
     processIsolation="false">
   <php>
-    <env name="KERNEL_CLASS" value="AppKernel" />
+    <env name="KERNEL_CLASS" value="AdminKernel" />
     <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak"/>
   </php>
   <testsuites>
diff --git a/tests/Unit/phpunit.xml b/tests/Unit/phpunit.xml
index 3df9a81005e6d..66f1f580e99b9 100644
--- a/tests/Unit/phpunit.xml
+++ b/tests/Unit/phpunit.xml
@@ -2,7 +2,7 @@
     bootstrap="bootstrap.php"
     backupGlobals="true">
   <php>
-    <server name="KERNEL_CLASS" value="AppKernel" />
+    <server name="KERNEL_CLASS" value="AdminKernel" />
   </php>
   <testsuites>
     <testsuite name="Unit">

From 1369ab70c62206ea3b4a6cdf36ae338cc553b040 Mon Sep 17 00:00:00 2001
From: boherm <boris.hermans@prestashop.com>
Date: Tue, 11 Jul 2023 17:25:28 +0200
Subject: [PATCH 0818/1030] Add PS_FF_FRONT_CONTAINER_V2 feature flag

---
 .env                                           | 3 +++
 classes/lang/KeysReference/FeatureFlagLang.php | 3 +++
 index.php                                      | 4 +---
 install-dev/data/xml/feature_flag.xml          | 1 +
 src/Core/FeatureFlag/FeatureFlagSettings.php   | 1 +
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.env b/.env
index 84ea89d821216..d868a08c56379 100644
--- a/.env
+++ b/.env
@@ -1,2 +1,5 @@
 # You can specify here some variables to use in PrestaShop application
 # -> enable a feature flag: PS_FF_{FEATURE_FLAG_NAME}=true
+
+# Enable new Symfony based front container
+PS_FF_FRONT_CONTAINER_V2=false
diff --git a/classes/lang/KeysReference/FeatureFlagLang.php b/classes/lang/KeysReference/FeatureFlagLang.php
index 930a253af6550..87b6e0ec49cc3 100644
--- a/classes/lang/KeysReference/FeatureFlagLang.php
+++ b/classes/lang/KeysReference/FeatureFlagLang.php
@@ -97,3 +97,6 @@
 
 trans('Symfony layout', 'Admin.Advparameters.Feature');
 trans('Enable / Disable symfony layout (in opposition to legacy layout).', 'Admin.Advparameters.Help');
+
+trans('New front container', 'Admin.Advparameters.Feature');
+trans('Enable / Disable the new front container.', 'Admin.Advparameters.Help');
diff --git a/index.php b/index.php
index ffb597b79ca99..48c25857d02e4 100644
--- a/index.php
+++ b/index.php
@@ -43,9 +43,7 @@
 (new Dotenv(false))->loadEnv(_PS_FRONT_DIR_ . '/.env');
 
 // If we want to use new container access in front (Warning: Experimental feature from now!)
-if (isset($_ENV['PS_CONTAINER_V2_FRONT']) && filter_var($_ENV['PS_CONTAINER_V2_FRONT'], \FILTER_VALIDATE_BOOL)) {
-    define('_PS_CONTAINER_V2_FRONT_', true);
-
+if (isset($_ENV['PS_FF_FRONT_CONTAINER_V2']) && filter_var($_ENV['PS_FF_FRONT_CONTAINER_V2'], \FILTER_VALIDATE_BOOL)) {
     // Activate Symfony's debug if we need it
     if (_PS_MODE_DEV_) {
         Debug::enable();
diff --git a/install-dev/data/xml/feature_flag.xml b/install-dev/data/xml/feature_flag.xml
index 398d7d785f553..123f5c4ac8bea 100644
--- a/install-dev/data/xml/feature_flag.xml
+++ b/install-dev/data/xml/feature_flag.xml
@@ -26,5 +26,6 @@
     <feature_flag id="order_state" name="order_state" type="env,dotenv,db" label_wording="Order states" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated order states page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
     <feature_flag id="feature" name="feature" type="env,dotenv,db" label_wording="Features" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated features page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
     <feature_flag id="symfony_layout" name="symfony_layout" type="env,query,dotenv,db" label_wording="Symfony layout" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable symfony layout (in opposition to legacy layout)." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
+    <feature_flag id="front_container_v2" name="front_container_v2" type="env,dotenv,db" label_wording="New front container" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the new front container." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
   </entities>
 </entity_feature_flag>
diff --git a/src/Core/FeatureFlag/FeatureFlagSettings.php b/src/Core/FeatureFlag/FeatureFlagSettings.php
index fe91bb923f18f..f322b817493e1 100644
--- a/src/Core/FeatureFlag/FeatureFlagSettings.php
+++ b/src/Core/FeatureFlag/FeatureFlagSettings.php
@@ -63,4 +63,5 @@ class FeatureFlagSettings
     public const FEATURE_FLAG_AUTHORIZATION_SERVER = 'authorization_server';
     public const FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT = 'multiple_image_format';
     public const FEATURE_FLAG_SYMFONY_LAYOUT = 'symfony_layout';
+    public const FEATURE_FLAG_FRONT_CONTAINER_V2 = 'front_container_v2';
 }

From 8407991080f9eab7d3500d47c704c0764e05ee3a Mon Sep 17 00:00:00 2001
From: Morgan Pichat <morgan.pichat@prestashop.com>
Date: Mon, 21 Aug 2023 16:13:54 +0200
Subject: [PATCH 0819/1030] Makes breadcrumbs management independent

---
 src/PrestaShopBundle/Twig/Component/Toolbar.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PrestaShopBundle/Twig/Component/Toolbar.php b/src/PrestaShopBundle/Twig/Component/Toolbar.php
index 52f53886ac06e..aebd5eaa0ebd9 100644
--- a/src/PrestaShopBundle/Twig/Component/Toolbar.php
+++ b/src/PrestaShopBundle/Twig/Component/Toolbar.php
@@ -61,7 +61,7 @@ public function mount(): void
             $tabs = [];
             $tabs[] = $tab;
             $ancestorsTab = $this->menuBuilder->getAncestorsTab($tab->getId());
-            if (!empty($ancestorsTab)) {
+            if (!empty($tabAncestors)) {
                 $tabs[] = $ancestorsTab;
             }
 

From d178af6facae8df5012676facbb254b30333b016 Mon Sep 17 00:00:00 2001
From: Morgan Pichat <morgan.pichat@prestashop.com>
Date: Tue, 22 Aug 2023 16:26:26 +0200
Subject: [PATCH 0820/1030] Makes currentTabLevel management independent

---
 admin-dev/themes/new-theme/template/layout.tpl               | 1 -
 .../Resources/views/Admin/Layout/toolbar.html.twig           | 1 -
 src/PrestaShopBundle/Twig/Component/Toolbar.php              | 5 +++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/admin-dev/themes/new-theme/template/layout.tpl b/admin-dev/themes/new-theme/template/layout.tpl
index f19d55d8f64ce..98f8daf9aa002 100644
--- a/admin-dev/themes/new-theme/template/layout.tpl
+++ b/admin-dev/themes/new-theme/template/layout.tpl
@@ -178,7 +178,6 @@
       table=$table
       help_link=$help_link
       enableSidebar=$enableSidebar
-      current_tab_level=$current_tab_level
       tabs=$tabs
       use_regular_h1_structure=$use_regular_h1_structure
     }
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/toolbar.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/toolbar.html.twig
index e938e572d46cd..17a0670206b4c 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Layout/toolbar.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/toolbar.html.twig
@@ -29,7 +29,6 @@
   table: table,
   helpLink: help_link,
   enableSidebar: enableSidebar,
-  currentTabLevel: current_tab_level,
   tabs: tabs,
   useRegularH1Structure: use_regular_h1_structure
 }) }}
diff --git a/src/PrestaShopBundle/Twig/Component/Toolbar.php b/src/PrestaShopBundle/Twig/Component/Toolbar.php
index aebd5eaa0ebd9..d2ae6187570e7 100644
--- a/src/PrestaShopBundle/Twig/Component/Toolbar.php
+++ b/src/PrestaShopBundle/Twig/Component/Toolbar.php
@@ -41,7 +41,7 @@ class Toolbar
     public string $table;
     public bool|string $helpLink;
     public bool $enableSidebar;
-    public int $currentTabLevel;
+    public int $currentTabLevel = 0;
     public array $tabs;
     public array $breadcrumbs;
     public bool $useRegularH1Structure = true;
@@ -61,8 +61,9 @@ public function mount(): void
             $tabs = [];
             $tabs[] = $tab;
             $ancestorsTab = $this->menuBuilder->getAncestorsTab($tab->getId());
-            if (!empty($tabAncestors)) {
+            if (!empty($ancestorsTab)) {
                 $tabs[] = $ancestorsTab;
+                $this->currentTabLevel = count($ancestorsTab);
             }
 
             $this->breadcrumbs = $this->menuBuilder->convertTabsToBreadcrumbLinks($tab, $ancestorsTab);

From 691482038aa72af9c44b5e96f31fdca01b5f4818 Mon Sep 17 00:00:00 2001
From: Jonathan Lelievre <jonathan.lelievre@prestashop.com>
Date: Wed, 23 Aug 2023 19:13:38 +0200
Subject: [PATCH 0821/1030] Add request matcher to filter better the firewall
 impact and ignore legacy APIs, the token API must be public though

---
 app/config/security_dev.yml                   |  5 ++
 app/config/security_test.yml                  |  5 ++
 .../Security/OAuth2/ApiRequestMatcher.php     | 52 +++++++++++++++++++
 .../config/services/core/security.yml         |  3 ++
 4 files changed, 65 insertions(+)
 create mode 100644 src/Core/Security/OAuth2/ApiRequestMatcher.php

diff --git a/app/config/security_dev.yml b/app/config/security_dev.yml
index 69e2e5ce8f735..e8d53f1b1228b 100644
--- a/app/config/security_dev.yml
+++ b/app/config/security_dev.yml
@@ -23,6 +23,10 @@ security:
       pattern: ^/(_(profiler|wdt)|css|images|js)/
       security: false
 
+    api_token:
+      pattern: ^/api/oauth2/token
+      security: false
+
     api:
       pattern: '^(%api_base_path%)(?!/docs)'
       stateless: true
@@ -30,6 +34,7 @@ security:
       guard:
         authenticator:
           - PrestaShop\PrestaShop\Core\Security\TokenAuthenticator
+      request_matcher: PrestaShop\PrestaShop\Core\Security\OAuth2\ApiRequestMatcher
 
     main:
       anonymous: ~
diff --git a/app/config/security_test.yml b/app/config/security_test.yml
index d4bb50d87b279..2fa2611561337 100644
--- a/app/config/security_test.yml
+++ b/app/config/security_test.yml
@@ -24,6 +24,10 @@ security:
       pattern: ^/(_(profiler|wdt)|css|images|js)/
       security: false
 
+    api_token:
+      pattern: ^/api/oauth2/token
+      security: false
+
     api:
       pattern: '^%api_base_path%'
       stateless: true
@@ -31,6 +35,7 @@ security:
       guard:
         authenticator:
           - PrestaShop\PrestaShop\Core\Security\TokenAuthenticator
+      request_matcher: PrestaShop\PrestaShop\Core\Security\OAuth2\ApiRequestMatcher
 
     main:
       anonymous: ~
diff --git a/src/Core/Security/OAuth2/ApiRequestMatcher.php b/src/Core/Security/OAuth2/ApiRequestMatcher.php
new file mode 100644
index 0000000000000..6fb31334b4162
--- /dev/null
+++ b/src/Core/Security/OAuth2/ApiRequestMatcher.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Security\OAuth2;
+
+use ApiPlatform\Action\PlaceholderAction;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestMatcherInterface;
+
+/**
+ * Additional checker for api firewall, the pattern /api is too wide and matches
+ * with existing legacy APIs so we add a more detailed condition that the URI pattern
+ * matches AND it's an API handled by ApiPlatform.
+ *
+ * The legacy APIs should be moved/modified to use another prefix, then this matcher
+ * can be removed as it will be overkill.
+ */
+class ApiRequestMatcher implements RequestMatcherInterface
+{
+    public function matches(Request $request)
+    {
+        return in_array(
+            $request->attributes->get('_controller'),
+            [PlaceholderAction::class, 'api_platform.action.placeholder']
+        );
+    }
+}
diff --git a/src/PrestaShopBundle/Resources/config/services/core/security.yml b/src/PrestaShopBundle/Resources/config/services/core/security.yml
index c80f9d776c59e..34bc512ebfa0a 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/security.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/security.yml
@@ -22,3 +22,6 @@ services:
     arguments:
       - '@PrestaShop\PrestaShop\Core\OAuth2\OAuth2Interface'
       - '@Symfony\Bridge\PsrHttpMessage\Factory\PsrHttpFactory'
+
+  PrestaShop\PrestaShop\Core\Security\OAuth2\ApiRequestMatcher:
+    public: false

From 0b2e1d1214161a09de536bdeb93cc8119e474266 Mon Sep 17 00:00:00 2001
From: boubkerbribri <boubker.bribri@prestashop.com>
Date: Thu, 24 Aug 2023 10:14:50 +0200
Subject: [PATCH 0822/1030] tests(ui): delete filter by position on pages and
 categories

---
 .../categories/01_filterAndQuickEditCategories.ts        | 9 ---------
 .../04_pages/pages/01_filterAndQuickEditPages.ts         | 9 ---------
 2 files changed, 18 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/08_design/04_pages/categories/01_filterAndQuickEditCategories.ts b/tests/UI/campaigns/functional/BO/08_design/04_pages/categories/01_filterAndQuickEditCategories.ts
index d4c9841063fed..d1737a083e92e 100644
--- a/tests/UI/campaigns/functional/BO/08_design/04_pages/categories/01_filterAndQuickEditCategories.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/04_pages/categories/01_filterAndQuickEditCategories.ts
@@ -128,15 +128,6 @@ describe('BO - Design - Pages : Filter and quick edit categories table', async (
             filterValue: secondCategoryData.description,
           },
       },
-      {
-        args:
-          {
-            testIdentifier: 'filterPosition',
-            filterType: 'input',
-            filterBy: 'position',
-            filterValue: '5',
-          },
-      },
       {
         args:
           {
diff --git a/tests/UI/campaigns/functional/BO/08_design/04_pages/pages/01_filterAndQuickEditPages.ts b/tests/UI/campaigns/functional/BO/08_design/04_pages/pages/01_filterAndQuickEditPages.ts
index efa71c38949ce..e232272b72337 100644
--- a/tests/UI/campaigns/functional/BO/08_design/04_pages/pages/01_filterAndQuickEditPages.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/04_pages/pages/01_filterAndQuickEditPages.ts
@@ -93,15 +93,6 @@ describe('BO - Design - Pages : Filter and quick edit pages table', async () =>
             filterValue: CMSPages.termsAndCondition.title,
           },
       },
-      {
-        args:
-          {
-            testIdentifier: 'filterByPosition',
-            filterType: 'input',
-            filterBy: 'position',
-            filterValue: CMSPages.securePayment.position.toString(),
-          },
-      },
       {
         args:
           {

From bc4509c6d814132a383827a012a06f6f25ea1ea8 Mon Sep 17 00:00:00 2001
From: Morgan Pichat <morgan.pichat@prestashop.com>
Date: Wed, 23 Aug 2023 17:45:29 +0200
Subject: [PATCH 0823/1030] Make tabs management independent

---
 .../themes/new-theme/template/layout.tpl      |  1 -
 .../Admin/Component/Layout/toolbar.html.twig  | 36 ++++++---------
 .../views/Admin/Layout/toolbar.html.twig      |  1 -
 .../Twig/Component/Toolbar.php                |  6 ++-
 .../Twig/Layout/MenuBuilder.php               | 46 ++++++++++++++++---
 5 files changed, 58 insertions(+), 32 deletions(-)

diff --git a/admin-dev/themes/new-theme/template/layout.tpl b/admin-dev/themes/new-theme/template/layout.tpl
index 98f8daf9aa002..b6026fc6d2df9 100644
--- a/admin-dev/themes/new-theme/template/layout.tpl
+++ b/admin-dev/themes/new-theme/template/layout.tpl
@@ -178,7 +178,6 @@
       table=$table
       help_link=$help_link
       enableSidebar=$enableSidebar
-      tabs=$tabs
       use_regular_h1_structure=$use_regular_h1_structure
     }
 {/if}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/toolbar.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/toolbar.html.twig
index 74f6574913329..f5fccb8ed0e96 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/toolbar.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/toolbar.html.twig
@@ -147,30 +147,22 @@
     </div>
   {% endif %}
 
-  {% if currentTabLevel is same as 3 %}
+  {% if currentTabLevel >= 3 %}
     <div class="page-head-tabs" id="head_tabs">
       <ul class="nav nav-pills">
-        {% for level_1 in tabs %}
-          {% for level_2 in level_1.sub_tabs %}
-            {% for level_3 in level_2.sub_tabs %}
-              {% if level_3.current %}
-                {% for level_4 in level_3.sub_tabs %}
-                  {% if level_4.active %}
-                    <li class="nav-item">
-                      <a href="{{ level_4.href }}" id="subtab-{{ level_4.class_name }}"
-                         class="nav-link tab {% if level_4.current %}active current{% endif %}"
-                         data-submenu="{{ level_4.id_tab }}">
-                        {{ level_4.name }}
-                        <span class="notification-container">
-                        <span class="notification-counter"></span>
-                      </span>
-                      </a>
-                    </li>
-                  {% endif %}
-                {% endfor %}
-              {% endif %}
-            {% endfor %}
-          {% endfor %}
+        {% for tab in navigationTabs %}
+          {% if tab.attributes.active %}
+            <li class="nav-item">
+              <a href="{{ tab.href }}" id="subtab-{{ tab.attributes.class_name }}"
+                 class="nav-link tab {% if tab.attributes.current %}active current{% endif %}"
+                 data-submenu="{{ tab.attributes.id_tab }}">
+                {{ tab.name }}
+                <span class="notification-container">
+                <span class="notification-counter"></span>
+              </span>
+              </a>
+            </li>
+          {% endif %}
         {% endfor %}
       </ul>
     </div>
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/toolbar.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/toolbar.html.twig
index 17a0670206b4c..81623fcb636ad 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Layout/toolbar.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/toolbar.html.twig
@@ -29,6 +29,5 @@
   table: table,
   helpLink: help_link,
   enableSidebar: enableSidebar,
-  tabs: tabs,
   useRegularH1Structure: use_regular_h1_structure
 }) }}
diff --git a/src/PrestaShopBundle/Twig/Component/Toolbar.php b/src/PrestaShopBundle/Twig/Component/Toolbar.php
index d2ae6187570e7..3781a0a027398 100644
--- a/src/PrestaShopBundle/Twig/Component/Toolbar.php
+++ b/src/PrestaShopBundle/Twig/Component/Toolbar.php
@@ -42,7 +42,7 @@ class Toolbar
     public bool|string $helpLink;
     public bool $enableSidebar;
     public int $currentTabLevel = 0;
-    public array $tabs;
+    public array $navigationTabs = [];
     public array $breadcrumbs;
     public bool $useRegularH1Structure = true;
 
@@ -64,6 +64,10 @@ public function mount(): void
             if (!empty($ancestorsTab)) {
                 $tabs[] = $ancestorsTab;
                 $this->currentTabLevel = count($ancestorsTab);
+
+                if ($this->currentTabLevel >= 3) {
+                    $this->navigationTabs = $this->menuBuilder->buildNavigationTabs($tab);
+                }
             }
 
             $this->breadcrumbs = $this->menuBuilder->convertTabsToBreadcrumbLinks($tab, $ancestorsTab);
diff --git a/src/PrestaShopBundle/Twig/Layout/MenuBuilder.php b/src/PrestaShopBundle/Twig/Layout/MenuBuilder.php
index f3dc058cfd8ee..e6f1aa3cfbe65 100644
--- a/src/PrestaShopBundle/Twig/Layout/MenuBuilder.php
+++ b/src/PrestaShopBundle/Twig/Layout/MenuBuilder.php
@@ -101,19 +101,40 @@ public function convertTabsToBreadcrumbLinks(Tab $currentTab, array $tabAncestor
 
     private function convertTabToMenuLink(Tab $tab): MenuLink
     {
-        if (!empty($tab->getRouteName())) {
-            $href = $this->urlGenerator->generate($tab->getRouteName());
-        } else {
-            $href = $this->context->getAdminLink($tab->getClassName());
-        }
-
         return new MenuLink(
             name: $this->getBreadcrumbLabel($tab),
-            href: $href,
+            href: $this->getLinkFromTab($tab),
             icon: 'icon-' . $tab->getClassName(),
         );
     }
 
+    /**
+     * @return array<int, MenuLink>
+     */
+    public function buildNavigationTabs(Tab $tab): array
+    {
+        $currentLevelTabs = $this->tabRepository->findByParentId($tab->getIdParent());
+        $navigationTabs = [];
+
+        /* @var $currentLevelTab Tab */
+        foreach ($currentLevelTabs as $currentLevelTab) {
+            $tabLang = $currentLevelTab->getTabLangByLanguageId($this->getContextLanguageId());
+            $menuLink = new MenuLink(
+                name: $tabLang ? $tabLang->getName() : $currentLevelTab->getWording(),
+                href: $this->getLinkFromTab($currentLevelTab),
+                attributes: [
+                    'id_tab' => $currentLevelTab->getId(),
+                    'class_name' => $currentLevelTab->getClassName(),
+                    'current' => $currentLevelTab->getId() == $tab->getId(),
+                    'active' => $currentLevelTab->getActive(),
+                ]
+            );
+            $navigationTabs[] = $menuLink;
+        }
+
+        return $navigationTabs;
+    }
+
     private function getBreadcrumbLabel(Tab $tab): string
     {
         if (null !== $tab->getWording() && null !== $tab->getWordingDomain()) {
@@ -198,4 +219,15 @@ private function getLegacyControllerClassName(): ?string
     {
         return $this->requestStack->getMainRequest()->attributes->get('_legacy_controller');
     }
+
+    private function getLinkFromTab(Tab $tab): string
+    {
+        if (!empty($tab->getRouteName())) {
+            $href = $this->urlGenerator->generate($tab->getRouteName());
+        } else {
+            $href = $this->context->getAdminLink($tab->getClassName());
+        }
+
+        return $href;
+    }
 }

From 21c2d6996c788237473fa306fb7de00ae7f73954 Mon Sep 17 00:00:00 2001
From: maxime-profileo <maxime.morel@profileo.com>
Date: Fri, 25 Aug 2023 10:46:57 +0400
Subject: [PATCH 0824/1030] Add htaccess to fix 33722

---
 templates/.htaccess | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 templates/.htaccess

diff --git a/templates/.htaccess b/templates/.htaccess
new file mode 100644
index 0000000000000..3de9e4008bd96
--- /dev/null
+++ b/templates/.htaccess
@@ -0,0 +1,10 @@
+# Apache 2.2
+<IfModule !mod_authz_core.c>
+    Order deny,allow
+    Deny from all
+</IfModule>
+
+# Apache 2.4
+<IfModule mod_authz_core.c>
+    Require all denied
+</IfModule>

From b90db3fb270a15a2a5461dd42bc3ce27a444e1d8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Aug 2023 04:35:35 +0000
Subject: [PATCH 0825/1030] Bump eslint from 8.47.0 to 8.48.0 in /tests/UI

Bumps [eslint](https://github.com/eslint/eslint) from 8.47.0 to 8.48.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.47.0...v8.48.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 30 +++++++++++++++---------------
 tests/UI/package.json      |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index 1eff280e0fa19..8710956f7df3b 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -36,7 +36,7 @@
         "@typescript-eslint/eslint-plugin": "^6.4.0",
         "@typescript-eslint/parser": "^6.4.0",
         "babel-eslint": "^10.1.0",
-        "eslint": "^8.47.0",
+        "eslint": "^8.48.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-deprecation": "^1.5.0",
         "eslint-plugin-html": "^7.1.0",
@@ -287,9 +287,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.47.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.47.0.tgz",
-      "integrity": "sha512-P6omY1zv5MItm93kLM8s2vr1HICJH8v0dvddDhysbIuZ+vcjOHg5Zbkf1mTkcmi2JA9oBG2anOkRnW8WJTS8Og==",
+      "version": "8.48.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.48.0.tgz",
+      "integrity": "sha512-ZSjtmelB7IJfWD2Fvb7+Z+ChTIKWq6kjda95fLcQKNS5aheVHn4IkfgRQE3sIIzTcSLwLcLZUD9UBt+V7+h+Pw==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -2607,15 +2607,15 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.47.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.47.0.tgz",
-      "integrity": "sha512-spUQWrdPt+pRVP1TTJLmfRNJJHHZryFmptzcafwSvHsceV81djHOdnEeDmkdotZyLNjDhrOasNK8nikkoG1O8Q==",
+      "version": "8.48.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.48.0.tgz",
+      "integrity": "sha512-sb6DLeIuRXxeM1YljSe1KEx9/YYeZFQWcV8Rq9HfigmdDEugjLEVEa1ozDjL6YDjBpQHPJxJzze+alxi4T3OLg==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.2",
-        "@eslint/js": "^8.47.0",
+        "@eslint/js": "8.48.0",
         "@humanwhocodes/config-array": "^0.11.10",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -8171,9 +8171,9 @@
       }
     },
     "@eslint/js": {
-      "version": "8.47.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.47.0.tgz",
-      "integrity": "sha512-P6omY1zv5MItm93kLM8s2vr1HICJH8v0dvddDhysbIuZ+vcjOHg5Zbkf1mTkcmi2JA9oBG2anOkRnW8WJTS8Og==",
+      "version": "8.48.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.48.0.tgz",
+      "integrity": "sha512-ZSjtmelB7IJfWD2Fvb7+Z+ChTIKWq6kjda95fLcQKNS5aheVHn4IkfgRQE3sIIzTcSLwLcLZUD9UBt+V7+h+Pw==",
       "dev": true
     },
     "@faker-js/faker": {
@@ -9853,15 +9853,15 @@
       }
     },
     "eslint": {
-      "version": "8.47.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.47.0.tgz",
-      "integrity": "sha512-spUQWrdPt+pRVP1TTJLmfRNJJHHZryFmptzcafwSvHsceV81djHOdnEeDmkdotZyLNjDhrOasNK8nikkoG1O8Q==",
+      "version": "8.48.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.48.0.tgz",
+      "integrity": "sha512-sb6DLeIuRXxeM1YljSe1KEx9/YYeZFQWcV8Rq9HfigmdDEugjLEVEa1ozDjL6YDjBpQHPJxJzze+alxi4T3OLg==",
       "dev": true,
       "requires": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.2",
-        "@eslint/js": "^8.47.0",
+        "@eslint/js": "8.48.0",
         "@humanwhocodes/config-array": "^0.11.10",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
diff --git a/tests/UI/package.json b/tests/UI/package.json
index 62fbd15601a94..506287e15e213 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -129,7 +129,7 @@
     "@typescript-eslint/eslint-plugin": "^6.4.0",
     "@typescript-eslint/parser": "^6.4.0",
     "babel-eslint": "^10.1.0",
-    "eslint": "^8.47.0",
+    "eslint": "^8.48.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-deprecation": "^1.5.0",
     "eslint-plugin-html": "^7.1.0",

From 64101519a7de84b80f520343f3d486f8192c1445 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Aug 2023 04:35:44 +0000
Subject: [PATCH 0826/1030] Bump chai from 4.3.7 to 4.3.8 in /tests/UI

Bumps [chai](https://github.com/chaijs/chai) from 4.3.7 to 4.3.8.
- [Release notes](https://github.com/chaijs/chai/releases)
- [Changelog](https://github.com/chaijs/chai/blob/4.x.x/History.md)
- [Commits](https://github.com/chaijs/chai/compare/v4.3.7...v4.3.8)

---
updated-dependencies:
- dependency-name: chai
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 14 +++++++-------
 tests/UI/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index 1eff280e0fa19..23e3dbbfe580f 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -12,7 +12,7 @@
         "@faker-js/faker": "^8.0.2",
         "@s3pweb/keycloak-admin-client-cjs": "^21.0.1",
         "@xmldom/xmldom": "^0.8.10",
-        "chai": "^4.3.7",
+        "chai": "^4.3.8",
         "chai-string": "^1.5.0",
         "csv-writer": "^1.6.0",
         "dotenv": "^16.3.1",
@@ -1670,9 +1670,9 @@
       }
     },
     "node_modules/chai": {
-      "version": "4.3.7",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.7.tgz",
-      "integrity": "sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==",
+      "version": "4.3.8",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.8.tgz",
+      "integrity": "sha512-vX4YvVVtxlfSZ2VecZgFUTU5qPCYsobVI2O9FmwEXBhDigYGQA6jRXCycIs1yJnnWbZ6/+a2zNIF5DfVCcJBFQ==",
       "dependencies": {
         "assertion-error": "^1.1.0",
         "check-error": "^1.0.2",
@@ -9137,9 +9137,9 @@
       }
     },
     "chai": {
-      "version": "4.3.7",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.7.tgz",
-      "integrity": "sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==",
+      "version": "4.3.8",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.8.tgz",
+      "integrity": "sha512-vX4YvVVtxlfSZ2VecZgFUTU5qPCYsobVI2O9FmwEXBhDigYGQA6jRXCycIs1yJnnWbZ6/+a2zNIF5DfVCcJBFQ==",
       "requires": {
         "assertion-error": "^1.1.0",
         "check-error": "^1.0.2",
diff --git a/tests/UI/package.json b/tests/UI/package.json
index 62fbd15601a94..8e7028c45e1ca 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -105,7 +105,7 @@
     "@faker-js/faker": "^8.0.2",
     "@s3pweb/keycloak-admin-client-cjs": "^21.0.1",
     "@xmldom/xmldom": "^0.8.10",
-    "chai": "^4.3.7",
+    "chai": "^4.3.8",
     "chai-string": "^1.5.0",
     "csv-writer": "^1.6.0",
     "dotenv": "^16.3.1",

From d3616438606f6cb337a69a45122328c79e6e9125 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Aug 2023 08:13:22 +0000
Subject: [PATCH 0827/1030] Bump typescript from 5.1.6 to 5.2.2 in /tests/UI

Bumps [typescript](https://github.com/Microsoft/TypeScript) from 5.1.6 to 5.2.2.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v5.1.6...v5.2.2)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 14 +++++++-------
 tests/UI/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index 8710956f7df3b..8b6d38fddb6e0 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -45,7 +45,7 @@
         "mochawesome-merge": "^4.3.0",
         "ts-mocha": "^10.0.0",
         "tsconfig-paths": "^4.2.0",
-        "typescript": "^5.1.6"
+        "typescript": "^5.2.2"
       }
     },
     "node_modules/@aashutoshrathi/word-wrap": {
@@ -7456,9 +7456,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz",
-      "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==",
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz",
+      "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
@@ -13449,9 +13449,9 @@
       }
     },
     "typescript": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz",
-      "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==",
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz",
+      "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==",
       "dev": true
     },
     "typical": {
diff --git a/tests/UI/package.json b/tests/UI/package.json
index 506287e15e213..f038107803967 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -138,6 +138,6 @@
     "mochawesome-merge": "^4.3.0",
     "ts-mocha": "^10.0.0",
     "tsconfig-paths": "^4.2.0",
-    "typescript": "^5.1.6"
+    "typescript": "^5.2.2"
   }
 }

From 365c4bf220032769333188181651b21ffaf22848 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Aug 2023 08:13:24 +0000
Subject: [PATCH 0828/1030] Bump @typescript-eslint/parser from 6.4.0 to 6.4.1
 in /tests/UI

Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 6.4.0 to 6.4.1.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.4.1/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 98 +++++++++++++++++++-------------------
 tests/UI/package.json      |  2 +-
 2 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index 8710956f7df3b..cf889212bf674 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -34,7 +34,7 @@
         "@types/mocha": "^10.0.1",
         "@types/mochawesome": "^6.2.1",
         "@typescript-eslint/eslint-plugin": "^6.4.0",
-        "@typescript-eslint/parser": "^6.4.0",
+        "@typescript-eslint/parser": "^6.4.1",
         "babel-eslint": "^10.1.0",
         "eslint": "^8.48.0",
         "eslint-config-airbnb-base": "^15.0.0",
@@ -687,15 +687,15 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.4.0.tgz",
-      "integrity": "sha512-I1Ah1irl033uxjxO9Xql7+biL3YD7w9IU8zF+xlzD/YxY6a4b7DYA08PXUUCbm2sEljwJF6ERFy2kTGAGcNilg==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.4.1.tgz",
+      "integrity": "sha512-610G6KHymg9V7EqOaNBMtD1GgpAmGROsmfHJPXNLCU9bfIuLrkdOygltK784F6Crboyd5tBFayPB7Sf0McrQwg==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "6.4.0",
-        "@typescript-eslint/types": "6.4.0",
-        "@typescript-eslint/typescript-estree": "6.4.0",
-        "@typescript-eslint/visitor-keys": "6.4.0",
+        "@typescript-eslint/scope-manager": "6.4.1",
+        "@typescript-eslint/types": "6.4.1",
+        "@typescript-eslint/typescript-estree": "6.4.1",
+        "@typescript-eslint/visitor-keys": "6.4.1",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -715,13 +715,13 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.4.0.tgz",
-      "integrity": "sha512-TUS7vaKkPWDVvl7GDNHFQMsMruD+zhkd3SdVW0d7b+7Zo+bd/hXJQ8nsiUZMi1jloWo6c9qt3B7Sqo+flC1nig==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.4.1.tgz",
+      "integrity": "sha512-p/OavqOQfm4/Hdrr7kvacOSFjwQ2rrDVJRPxt/o0TOWdFnjJptnjnZ+sYDR7fi4OimvIuKp+2LCkc+rt9fIW+A==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.4.0",
-        "@typescript-eslint/visitor-keys": "6.4.0"
+        "@typescript-eslint/types": "6.4.1",
+        "@typescript-eslint/visitor-keys": "6.4.1"
       },
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -732,9 +732,9 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.0.tgz",
-      "integrity": "sha512-+FV9kVFrS7w78YtzkIsNSoYsnOtrYVnKWSTVXoL1761CsCRv5wpDOINgsXpxD67YCLZtVQekDDyaxfjVWUJmmg==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.1.tgz",
+      "integrity": "sha512-zAAopbNuYu++ijY1GV2ylCsQsi3B8QvfPHVqhGdDcbx/NK5lkqMnCGU53amAjccSpk+LfeONxwzUhDzArSfZJg==",
       "dev": true,
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -745,13 +745,13 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.4.0.tgz",
-      "integrity": "sha512-iDPJArf/K2sxvjOR6skeUCNgHR/tCQXBsa+ee1/clRKr3olZjZ/dSkXPZjG6YkPtnW6p5D1egeEPMCW6Gn4yLA==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.4.1.tgz",
+      "integrity": "sha512-xF6Y7SatVE/OyV93h1xGgfOkHr2iXuo8ip0gbfzaKeGGuKiAnzS+HtVhSPx8Www243bwlW8IF7X0/B62SzFftg==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.4.0",
-        "@typescript-eslint/visitor-keys": "6.4.0",
+        "@typescript-eslint/types": "6.4.1",
+        "@typescript-eslint/visitor-keys": "6.4.1",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -772,12 +772,12 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.0.tgz",
-      "integrity": "sha512-yJSfyT+uJm+JRDWYRYdCm2i+pmvXJSMtPR9Cq5/XQs4QIgNoLcoRtDdzsLbLsFM/c6um6ohQkg/MLxWvoIndJA==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.1.tgz",
+      "integrity": "sha512-y/TyRJsbZPkJIZQXrHfdnxVnxyKegnpEvnRGNam7s3TRR2ykGefEWOhaef00/UUN3IZxizS7BTO3svd3lCOJRQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.4.0",
+        "@typescript-eslint/types": "6.4.1",
         "eslint-visitor-keys": "^3.4.1"
       },
       "engines": {
@@ -8464,42 +8464,42 @@
       }
     },
     "@typescript-eslint/parser": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.4.0.tgz",
-      "integrity": "sha512-I1Ah1irl033uxjxO9Xql7+biL3YD7w9IU8zF+xlzD/YxY6a4b7DYA08PXUUCbm2sEljwJF6ERFy2kTGAGcNilg==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.4.1.tgz",
+      "integrity": "sha512-610G6KHymg9V7EqOaNBMtD1GgpAmGROsmfHJPXNLCU9bfIuLrkdOygltK784F6Crboyd5tBFayPB7Sf0McrQwg==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "6.4.0",
-        "@typescript-eslint/types": "6.4.0",
-        "@typescript-eslint/typescript-estree": "6.4.0",
-        "@typescript-eslint/visitor-keys": "6.4.0",
+        "@typescript-eslint/scope-manager": "6.4.1",
+        "@typescript-eslint/types": "6.4.1",
+        "@typescript-eslint/typescript-estree": "6.4.1",
+        "@typescript-eslint/visitor-keys": "6.4.1",
         "debug": "^4.3.4"
       },
       "dependencies": {
         "@typescript-eslint/scope-manager": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.4.0.tgz",
-          "integrity": "sha512-TUS7vaKkPWDVvl7GDNHFQMsMruD+zhkd3SdVW0d7b+7Zo+bd/hXJQ8nsiUZMi1jloWo6c9qt3B7Sqo+flC1nig==",
+          "version": "6.4.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.4.1.tgz",
+          "integrity": "sha512-p/OavqOQfm4/Hdrr7kvacOSFjwQ2rrDVJRPxt/o0TOWdFnjJptnjnZ+sYDR7fi4OimvIuKp+2LCkc+rt9fIW+A==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.4.0",
-            "@typescript-eslint/visitor-keys": "6.4.0"
+            "@typescript-eslint/types": "6.4.1",
+            "@typescript-eslint/visitor-keys": "6.4.1"
           }
         },
         "@typescript-eslint/types": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.0.tgz",
-          "integrity": "sha512-+FV9kVFrS7w78YtzkIsNSoYsnOtrYVnKWSTVXoL1761CsCRv5wpDOINgsXpxD67YCLZtVQekDDyaxfjVWUJmmg==",
+          "version": "6.4.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.1.tgz",
+          "integrity": "sha512-zAAopbNuYu++ijY1GV2ylCsQsi3B8QvfPHVqhGdDcbx/NK5lkqMnCGU53amAjccSpk+LfeONxwzUhDzArSfZJg==",
           "dev": true
         },
         "@typescript-eslint/typescript-estree": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.4.0.tgz",
-          "integrity": "sha512-iDPJArf/K2sxvjOR6skeUCNgHR/tCQXBsa+ee1/clRKr3olZjZ/dSkXPZjG6YkPtnW6p5D1egeEPMCW6Gn4yLA==",
+          "version": "6.4.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.4.1.tgz",
+          "integrity": "sha512-xF6Y7SatVE/OyV93h1xGgfOkHr2iXuo8ip0gbfzaKeGGuKiAnzS+HtVhSPx8Www243bwlW8IF7X0/B62SzFftg==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.4.0",
-            "@typescript-eslint/visitor-keys": "6.4.0",
+            "@typescript-eslint/types": "6.4.1",
+            "@typescript-eslint/visitor-keys": "6.4.1",
             "debug": "^4.3.4",
             "globby": "^11.1.0",
             "is-glob": "^4.0.3",
@@ -8508,12 +8508,12 @@
           }
         },
         "@typescript-eslint/visitor-keys": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.0.tgz",
-          "integrity": "sha512-yJSfyT+uJm+JRDWYRYdCm2i+pmvXJSMtPR9Cq5/XQs4QIgNoLcoRtDdzsLbLsFM/c6um6ohQkg/MLxWvoIndJA==",
+          "version": "6.4.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.1.tgz",
+          "integrity": "sha512-y/TyRJsbZPkJIZQXrHfdnxVnxyKegnpEvnRGNam7s3TRR2ykGefEWOhaef00/UUN3IZxizS7BTO3svd3lCOJRQ==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.4.0",
+            "@typescript-eslint/types": "6.4.1",
             "eslint-visitor-keys": "^3.4.1"
           }
         },
diff --git a/tests/UI/package.json b/tests/UI/package.json
index 506287e15e213..3326193de538e 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -127,7 +127,7 @@
     "@types/mocha": "^10.0.1",
     "@types/mochawesome": "^6.2.1",
     "@typescript-eslint/eslint-plugin": "^6.4.0",
-    "@typescript-eslint/parser": "^6.4.0",
+    "@typescript-eslint/parser": "^6.4.1",
     "babel-eslint": "^10.1.0",
     "eslint": "^8.48.0",
     "eslint-config-airbnb-base": "^15.0.0",

From aa1c126b39f472caa8f6326a09390589be9ee4ba Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Tue, 1 Aug 2023 12:36:06 +0200
Subject: [PATCH 0829/1030] Functional Tests : BO - Catalog - Products : Header

---
 .../Product/Blocks/header-details.html.twig   |   4 +-
 .../productV2/functional/01_filterProducts.ts |  10 -
 .../functional/02_CRUDStandardProduct.ts      |  11 -
 .../03_CRUDProductWithCombinations.ts         |  11 -
 .../functional/04_CRUDPackOfProducts.ts       |  11 -
 .../functional/05_CRUDVirtualProduct.ts       |   8 -
 ...icateProduct.ts => 06_duplicateProduct.ts} |  11 -
 ...ulkActions.ts => 07_productBulkActions.ts} |  11 -
 .../productV2/functional/08_header.ts         | 341 ++++++++++++++++++
 .../03_productsBO/02_CRUDStandardProduct.ts   |   7 +-
 tests/UI/data/demo/products.ts                |   1 +
 tests/UI/data/types/product.d.ts              |   5 +
 tests/UI/pages/BO/BObasePage.ts               |   2 +-
 .../catalog/productsV2/add/descriptionTab.ts  |  91 ++++-
 .../BO/catalog/productsV2/add/detailsTab.ts   |  40 ++
 .../pages/BO/catalog/productsV2/add/index.ts  | 184 +++++++++-
 .../BO/catalog/productsV2/add/pricingTab.ts   |  24 +-
 .../BO/catalog/productsV2/add/stocksTab.ts    |  12 +-
 tests/UI/pages/commonPage.ts                  |  17 +-
 19 files changed, 699 insertions(+), 102 deletions(-)
 rename tests/UI/campaigns/productV2/functional/{07_duplicateProduct.ts => 06_duplicateProduct.ts} (93%)
 rename tests/UI/campaigns/productV2/functional/{06_productBulkActions.ts => 07_productBulkActions.ts} (95%)
 create mode 100644 tests/UI/campaigns/productV2/functional/08_header.ts

diff --git a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Product/Blocks/header-details.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Product/Blocks/header-details.html.twig
index 34994edb7a83a..ba332666187e4 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Product/Blocks/header-details.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Product/Blocks/header-details.html.twig
@@ -113,9 +113,9 @@
 {% block header_references %}
   {% set referencesForm = productForm.details.references %}
   <div class="product-header-references">
-    {% for child in referencesForm.children %}
+    {% for keyChild, child in referencesForm.children %}
       {% if child.vars.value is not empty %}
-        <div class="product-reference">
+        <div class="product-reference" data-reference-type="{{ keyChild }}">
           <label>{{ child.vars.label }}</label>
           <span>{{ child.vars.value }}</span>
         </div>
diff --git a/tests/UI/campaigns/productV2/functional/01_filterProducts.ts b/tests/UI/campaigns/productV2/functional/01_filterProducts.ts
index 87dc8e6a04100..02f8f0e4f6643 100644
--- a/tests/UI/campaigns/productV2/functional/01_filterProducts.ts
+++ b/tests/UI/campaigns/productV2/functional/01_filterProducts.ts
@@ -7,10 +7,6 @@ import testContext from '@utils/testContext';
 
 // Import common tests
 import loginCommon from '@commonTests/BO/loginBO';
-import {
-  resetNewProductPageAsDefault,
-  setFeatureFlag,
-} from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
 import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
@@ -29,9 +25,6 @@ describe('BO - Catalog - Products : Filter in Products Page', async () => {
   let page: Page;
   let numberOfProducts: number = 0;
 
-  // Pre-condition: Enable new product page
-  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, true, `${baseContext}_enableNewProduct`);
-
   // before and after functions
   before(async function () {
     browserContext = await helper.createBrowserContext(this.browser);
@@ -304,7 +297,4 @@ describe('BO - Catalog - Products : Filter in Products Page', async () => {
       await expect(isVisible).to.be.false;
     });
   });
-
-  // Post-condition: Reset initial state
-  resetNewProductPageAsDefault(`${baseContext}_resetNewProduct`);
 });
diff --git a/tests/UI/campaigns/productV2/functional/02_CRUDStandardProduct.ts b/tests/UI/campaigns/productV2/functional/02_CRUDStandardProduct.ts
index 0fe3aabbbfcf3..4eac8cc63a8da 100644
--- a/tests/UI/campaigns/productV2/functional/02_CRUDStandardProduct.ts
+++ b/tests/UI/campaigns/productV2/functional/02_CRUDStandardProduct.ts
@@ -6,13 +6,8 @@ import basicHelper from '@utils/basicHelper';
 
 // Import common tests
 import loginCommon from '@commonTests/BO/loginBO';
-import {
-  resetNewProductPageAsDefault,
-  setFeatureFlag,
-} from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
-import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import createProductsPage from '@pages/BO/catalog/productsV2/add';
 import productsPage from '@pages/BO/catalog/productsV2';
@@ -50,9 +45,6 @@ describe('BO - Catalog - Products : CRUD standard product', async () => {
     status: true,
   });
 
-  // Pre-condition: Enable new product page
-  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, true, `${baseContext}_enableNewProduct`);
-
   // before and after functions
   before(async function () {
     browserContext = await helper.createBrowserContext(this.browser);
@@ -271,7 +263,4 @@ describe('BO - Catalog - Products : CRUD standard product', async () => {
       await expect(createProductMessage).to.equal(productsPage.successfulDeleteMessage);
     });
   });
-
-  // Post-condition: Reset initial state
-  resetNewProductPageAsDefault(`${baseContext}_resetNewProduct`);
 });
diff --git a/tests/UI/campaigns/productV2/functional/03_CRUDProductWithCombinations.ts b/tests/UI/campaigns/productV2/functional/03_CRUDProductWithCombinations.ts
index 1d1ecbf16514b..eff0573c0efab 100644
--- a/tests/UI/campaigns/productV2/functional/03_CRUDProductWithCombinations.ts
+++ b/tests/UI/campaigns/productV2/functional/03_CRUDProductWithCombinations.ts
@@ -7,13 +7,8 @@ import basicHelper from '@utils/basicHelper';
 
 // Import common tests
 import loginCommon from '@commonTests/BO/loginBO';
-import {
-  resetNewProductPageAsDefault,
-  setFeatureFlag,
-} from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
-import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import productsPage from '@pages/BO/catalog/productsV2';
 import createProductsPage from '@pages/BO/catalog/productsV2/add';
@@ -138,9 +133,6 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
     ],
   });
 
-  // Pre-condition: Enable new product page
-  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, true, `${baseContext}_enableNewProduct`);
-
   // before and after functions
   before(async function () {
     browserContext = await helper.createBrowserContext(this.browser);
@@ -687,7 +679,4 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       await expect(createProductMessage).to.equal(productsPage.successfulDeleteMessage);
     });
   });
-
-  // Post-condition: Reset initial state
-  resetNewProductPageAsDefault(`${baseContext}_resetNewProduct`);
 });
diff --git a/tests/UI/campaigns/productV2/functional/04_CRUDPackOfProducts.ts b/tests/UI/campaigns/productV2/functional/04_CRUDPackOfProducts.ts
index 208d683fef463..f8adc99db9cc5 100644
--- a/tests/UI/campaigns/productV2/functional/04_CRUDPackOfProducts.ts
+++ b/tests/UI/campaigns/productV2/functional/04_CRUDPackOfProducts.ts
@@ -7,13 +7,8 @@ import basicHelper from '@utils/basicHelper';
 
 // Import common tests
 import loginCommon from '@commonTests/BO/loginBO';
-import {
-  resetNewProductPageAsDefault,
-  setFeatureFlag,
-} from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
-import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import createProductsPage from '@pages/BO/catalog/productsV2/add';
 import productsPage from '@pages/BO/catalog/productsV2';
@@ -83,9 +78,6 @@ describe('BO - Catalog - Products : CRUD pack of products', async () => {
     status: true,
   });
 
-  // Pre-condition: Enable new product page
-  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, true, `${baseContext}_enableNewProduct`);
-
   // before and after functions
   before(async function () {
     browserContext = await helper.createBrowserContext(this.browser);
@@ -508,7 +500,4 @@ describe('BO - Catalog - Products : CRUD pack of products', async () => {
       await expect(createProductMessage).to.equal(productsPage.successfulDeleteMessage);
     });
   });
-
-  // Post-condition: Reset initial state
-  resetNewProductPageAsDefault(`${baseContext}_resetNewProduct`);
 });
diff --git a/tests/UI/campaigns/productV2/functional/05_CRUDVirtualProduct.ts b/tests/UI/campaigns/productV2/functional/05_CRUDVirtualProduct.ts
index f2b0b13cdd03c..a2ea37f82f887 100644
--- a/tests/UI/campaigns/productV2/functional/05_CRUDVirtualProduct.ts
+++ b/tests/UI/campaigns/productV2/functional/05_CRUDVirtualProduct.ts
@@ -8,12 +8,8 @@ import testContext from '@utils/testContext';
 // Import common tests
 import {resetSmtpConfigTest, setupSmtpConfigTest} from '@commonTests/BO/advancedParameters/smtp';
 import loginCommon from '@commonTests/BO/loginBO';
-import {
-  resetNewProductPageAsDefault, setFeatureFlag,
-} from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
-import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import createProductsPage from '@pages/BO/catalog/productsV2/add';
 import productsPage from '@pages/BO/catalog/productsV2';
@@ -70,8 +66,6 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
     status: true,
   });
 
-  // Pre-condition: Enable new product page
-  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, true, `${baseContext}_enableNewProduct`);
   // Pre-Condition: Setup config SMTP
   setupSmtpConfigTest(`${baseContext}_preTest_1`);
 
@@ -464,8 +458,6 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
     });
   });
 
-  // Post-condition: Reset initial state
-  resetNewProductPageAsDefault(`${baseContext}_resetNewProduct`);
   // Post-Condition: Reset SMTP config
   resetSmtpConfigTest(`${baseContext}_postTest_1`);
 });
diff --git a/tests/UI/campaigns/productV2/functional/07_duplicateProduct.ts b/tests/UI/campaigns/productV2/functional/06_duplicateProduct.ts
similarity index 93%
rename from tests/UI/campaigns/productV2/functional/07_duplicateProduct.ts
rename to tests/UI/campaigns/productV2/functional/06_duplicateProduct.ts
index c8947bc072b96..4dcc90e4c8d96 100644
--- a/tests/UI/campaigns/productV2/functional/07_duplicateProduct.ts
+++ b/tests/UI/campaigns/productV2/functional/06_duplicateProduct.ts
@@ -4,13 +4,8 @@ import testContext from '@utils/testContext';
 
 // Import common tests
 import loginCommon from '@commonTests/BO/loginBO';
-import {
-  resetNewProductPageAsDefault,
-  setFeatureFlag,
-} from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
-import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import productsPage from '@pages/BO/catalog/productsV2';
 import createProductsPage from '@pages/BO/catalog/productsV2/add';
@@ -28,9 +23,6 @@ describe('BO - Catalog - Products : Duplicate product', async () => {
   let page: Page;
   let numberOfProducts: number = 0;
 
-  // Pre-condition: Enable new product page
-  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, true, `${baseContext}_enableNewProduct`);
-
   // before and after functions
   before(async function () {
     browserContext = await helper.createBrowserContext(this.browser);
@@ -162,7 +154,4 @@ describe('BO - Catalog - Products : Duplicate product', async () => {
       await expect(numberOfProductsAfterReset).to.equal(numberOfProducts);
     });
   });
-
-  // Post-condition: Reset initial state
-  resetNewProductPageAsDefault(`${baseContext}_resetNewProduct`);
 });
diff --git a/tests/UI/campaigns/productV2/functional/06_productBulkActions.ts b/tests/UI/campaigns/productV2/functional/07_productBulkActions.ts
similarity index 95%
rename from tests/UI/campaigns/productV2/functional/06_productBulkActions.ts
rename to tests/UI/campaigns/productV2/functional/07_productBulkActions.ts
index 40e6a43be2592..727125f0a1323 100644
--- a/tests/UI/campaigns/productV2/functional/06_productBulkActions.ts
+++ b/tests/UI/campaigns/productV2/functional/07_productBulkActions.ts
@@ -4,13 +4,8 @@ import testContext from '@utils/testContext';
 
 // Import common tests
 import loginCommon from '@commonTests/BO/loginBO';
-import {
-  resetNewProductPageAsDefault,
-  setFeatureFlag,
-} from '@commonTests/BO/advancedParameters/newFeatures';
 
 // Import pages
-import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import productsPage from '@pages/BO/catalog/productsV2';
 import createProductsPage from '@pages/BO/catalog/productsV2/add';
@@ -42,9 +37,6 @@ describe('BO - Catalog - Products : Enable, disable, duplicate and Delete produc
     status: true,
   });
 
-  // Pre-condition: Enable new product page
-  setFeatureFlag(featureFlagPage.featureFlagProductPageV2, true, `${baseContext}_enableNewProduct`);
-
   // before and after functions
   before(async function () {
     browserContext = await helper.createBrowserContext(this.browser);
@@ -237,7 +229,4 @@ describe('BO - Catalog - Products : Enable, disable, duplicate and Delete produc
       }
     });
   });
-
-  // Post-condition: Reset initial state
-  resetNewProductPageAsDefault(`${baseContext}_resetNewProduct`);
 });
diff --git a/tests/UI/campaigns/productV2/functional/08_header.ts b/tests/UI/campaigns/productV2/functional/08_header.ts
new file mode 100644
index 0000000000000..11873e710645b
--- /dev/null
+++ b/tests/UI/campaigns/productV2/functional/08_header.ts
@@ -0,0 +1,341 @@
+// Import utils
+import files from '@utils/files';
+import helper from '@utils/helpers';
+import testContext from '@utils/testContext';
+
+// Import common tests
+import loginCommon from '@commonTests/BO/loginBO';
+
+// Import pages
+import dashboardPage from '@pages/BO/dashboard';
+import productsPage from '@pages/BO/catalog/productsV2';
+import createProductsPage from '@pages/BO/catalog/productsV2/add';
+import descriptionTab from '@pages/BO/catalog/productsV2/add/descriptionTab';
+import detailsTab from '@pages/BO/catalog/productsV2/add/detailsTab';
+import pricingTab from '@pages/BO/catalog/productsV2/add/pricingTab';
+import stocksTab from '@pages/BO/catalog/productsV2/add/stocksTab';
+
+// Import data
+import ProductData from '@data/faker/product';
+import {ProductHeaderSummary} from '@data/types/product';
+
+import type {BrowserContext, Page} from 'playwright';
+import {expect} from 'chai';
+import {faker} from '@faker-js/faker';
+
+const baseContext: string = 'productV2_functional_header';
+
+describe('BO - Catalog - Products : Header', async () => {
+  let browserContext: BrowserContext;
+  let page: Page;
+  let numberOfProducts: number = 0;
+  let productHeaderSummaryInitial: ProductHeaderSummary;
+
+  const newProductData: ProductData = new ProductData({
+    type: 'standard',
+    coverImage: 'cover.jpg',
+    taxRule: 'FR Taux standard (20%)',
+    tax: 20,
+    retailPrice: 12,
+    quantity: 100,
+    minimumQuantity: 2,
+    status: true,
+  });
+  const productNameEn: string = faker.commerce.productName();
+  const productNameFr: string = faker.commerce.productName();
+  const productRetailPriceTaxIncluded: number = 140;
+  const productRetailPriceTaxExcluded: number = (140 / (100 + newProductData.tax)) * 100;
+  const productQuantity = newProductData.quantity;
+  const productCoverImage: string = 'productCoverImage.png';
+  const productMPN: string = 'HSC0424PP';
+  const productUPC: string = '987654321098';
+  const productEAN13: string = '9782409038600';
+  const productISBN: string = '978-2-409-03860-0';
+
+  // before and after functions
+  before(async function () {
+    browserContext = await helper.createBrowserContext(this.browser);
+    page = await helper.newTab(browserContext);
+
+    await files.generateImage(productCoverImage);
+    if (newProductData.coverImage) {
+      await files.generateImage(newProductData.coverImage);
+    }
+  });
+
+  after(async () => {
+    await helper.closeBrowserContext(browserContext);
+
+    await files.deleteFile(productCoverImage);
+    if (newProductData.coverImage) {
+      await files.deleteFile(newProductData.coverImage);
+    }
+  });
+
+  it('should login in BO', async function () {
+    await loginCommon.loginBO(this, page);
+  });
+
+  it('should go to \'Catalog > Products\' page', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'goToProductsPage', baseContext);
+
+    await dashboardPage.goToSubMenu(
+      page,
+      dashboardPage.catalogParentLink,
+      dashboardPage.productsLink,
+    );
+
+    await productsPage.closeSfToolBar(page);
+
+    const pageTitle = await productsPage.getPageTitle(page);
+    expect(pageTitle).to.contains(productsPage.pageTitle);
+  });
+
+  it('should click on \'New product\' button and check new product modal', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'clickOnNewProductButton', baseContext);
+
+    const isModalVisible = await productsPage.clickOnNewProductButton(page);
+    await expect(isModalVisible).to.be.true;
+  });
+
+  it('should check the standard product description', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'checkStandardProductDescription', baseContext);
+
+    const productTypeDescription = await productsPage.getProductDescription(page);
+    expect(productTypeDescription).to.contains(productsPage.standardProductDescription);
+  });
+
+  it('should choose \'Standard product\'', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'chooseStandardProduct', baseContext);
+
+    await productsPage.selectProductType(page, newProductData.type);
+
+    const pageTitle = await createProductsPage.getPageTitle(page);
+    expect(pageTitle).to.contains(createProductsPage.pageTitle);
+  });
+
+  it('should go to new product page', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'goToNewProductPage', baseContext);
+
+    await productsPage.clickOnAddNewProduct(page);
+
+    const pageTitle = await createProductsPage.getPageTitle(page);
+    expect(pageTitle).to.contains(createProductsPage.pageTitle);
+  });
+
+  it('should create standard product', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'createStandardProduct', baseContext);
+
+    await createProductsPage.closeSfToolBar(page);
+
+    const createProductMessage = await createProductsPage.setProduct(page, newProductData);
+    expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+  });
+
+  it('should click on \'Go to catalog\' button', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'goToCatalogPage', baseContext);
+
+    await createProductsPage.goToCatalogPage(page);
+
+    const pageTitle = await productsPage.getPageTitle(page);
+    expect(pageTitle).to.contains(productsPage.pageTitle);
+  });
+
+  it('should reset filter and get number of products', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'getNumberOfProduct', baseContext);
+
+    numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
+    expect(numberOfProducts).to.be.above(0);
+  });
+
+  it(`should filter list by '${newProductData.name}' and check result`, async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'filterListByName', baseContext);
+
+    await productsPage.filterProducts(page, 'product_name', newProductData.name, 'input');
+
+    const numberOfProductsAfterFilter: number = await productsPage.getNumberOfProductsFromList(page);
+    expect(numberOfProductsAfterFilter).to.equal(1);
+
+    const textColumn = await productsPage.getTextColumn(page, 'product_name', 1);
+    expect(textColumn).to.eq(newProductData.name);
+  });
+
+  it('should go to the first product page', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'goToEditPage', baseContext);
+
+    await productsPage.goToProductPage(page, 1);
+
+    const pageTitle: string = await createProductsPage.getPageTitle(page);
+    expect(pageTitle).to.contains(createProductsPage.pageTitle);
+
+    productHeaderSummaryInitial = await createProductsPage.getProductHeaderSummary(page);
+  });
+
+  it('should edit the product name (in English)', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'editProductNameEn', baseContext);
+
+    await createProductsPage.setProductName(page, productNameEn, 'en');
+
+    const message = await createProductsPage.saveProduct(page);
+    expect(message).to.eq(createProductsPage.successfulUpdateMessage);
+  });
+
+  it('should edit the product name (in French)', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'editProductNameFr', baseContext);
+
+    await createProductsPage.setProductName(page, productNameFr, 'fr');
+
+    const message = await createProductsPage.saveProduct(page);
+    expect(message).to.eq(createProductsPage.successfulUpdateMessage);
+  });
+
+  it('should go to the Pricing tab', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'goToPricingTab', baseContext);
+
+    await createProductsPage.goToTab(page, 'pricing');
+
+    const isTabActive = await createProductsPage.isTabActive(page, 'pricing');
+    await expect(isTabActive).to.be.true;
+  });
+
+  it('should edit the retail price', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'editProductNameFr', baseContext);
+
+    await pricingTab.setRetailPrice(page, false, productRetailPriceTaxIncluded);
+
+    const message = await createProductsPage.saveProduct(page);
+    expect(message).to.eq(createProductsPage.successfulUpdateMessage);
+
+    const productHeaderSummary = await createProductsPage.getProductHeaderSummary(page);
+    expect(productHeaderSummary.priceTaxExc).to.equals(`€${productRetailPriceTaxExcluded.toFixed(2)} tax excl.`);
+    expect(productHeaderSummary.priceTaxIncl).to.equals(
+      `€${productRetailPriceTaxIncluded.toFixed(2)} tax incl. (tax rule: ${newProductData.tax}%)`,
+    );
+  });
+
+  it('should go to the Stocks tab', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'goToStocksTab', baseContext);
+
+    await createProductsPage.goToTab(page, 'stock');
+
+    const isTabActive = await createProductsPage.isTabActive(page, 'stock');
+    await expect(isTabActive).to.be.true;
+  });
+
+  it('should add items to stock', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'addItemsToStock', baseContext);
+
+    await stocksTab.setQuantityDelta(page, 10);
+
+    const message = await createProductsPage.saveProduct(page);
+    expect(message).to.eq(createProductsPage.successfulUpdateMessage);
+
+    const productHeaderSummary = await createProductsPage.getProductHeaderSummary(page);
+    expect(productHeaderSummary.quantity).to.equal(`${productQuantity + 10} in stock`);
+  });
+
+  it('should subtract items to stock', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'subtractItemsToStock', baseContext);
+
+    await stocksTab.setQuantityDelta(page, -75);
+
+    const message = await createProductsPage.saveProduct(page);
+    expect(message).to.eq(createProductsPage.successfulUpdateMessage);
+
+    const productHeaderSummary = await createProductsPage.getProductHeaderSummary(page);
+    expect(productHeaderSummary.quantity).to.equal(`${productQuantity + 10 - 75} in stock`);
+  });
+
+  it('should go to the Description tab', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'goToDescriptionTab', baseContext);
+
+    await createProductsPage.goToTab(page, 'description');
+
+    const isTabActive = await createProductsPage.isTabActive(page, 'description');
+    await expect(isTabActive).to.be.true;
+  });
+
+  it('should add image', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'addImage', baseContext);
+
+    await descriptionTab.addProductImages(page, [productCoverImage]);
+
+    const numOfImages = await descriptionTab.getNumberOfImages(page);
+    expect(numOfImages).to.eq(2);
+  });
+
+  it('should set image information', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'setImageInformation', baseContext);
+
+    const message = await descriptionTab.setProductImageInformation(page, 2, true, 'Caption EN', 'Caption FR');
+    expect(message).to.be.eq(descriptionTab.settingUpdatedMessage);
+  });
+
+  it('should check image has changed', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'checkImageHasChanged', baseContext);
+
+    await descriptionTab.reloadPage(page);
+    const productHeaderSummary = await createProductsPage.getProductHeaderSummary(page);
+
+    expect(productHeaderSummary.imageUrl).to.be.not.eq(productHeaderSummaryInitial.imageUrl);
+  });
+
+  it('should change product type', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'changeProductType', baseContext);
+
+    const message = await createProductsPage.changeProductType(page, 'virtual');
+    expect(message).to.be.eq(createProductsPage.successfulUpdateMessage);
+  });
+
+  it('should check product type has changed', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'checkTypeHasChanged', baseContext);
+
+    const productType = await createProductsPage.getProductType(page);
+    expect(productType).to.be.eq('virtual');
+
+    // FYI : stock is the ID for the "Virtual product" tab
+    const isTabVisible = await createProductsPage.isTabVisible(page, 'stock');
+    await expect(isTabVisible).to.be.true;
+  });
+
+  it('should go to the Details tab', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'goToDetailsTab', baseContext);
+
+    await createProductsPage.goToTab(page, 'details');
+
+    const isTabActive = await createProductsPage.isTabActive(page, 'details');
+    await expect(isTabActive).to.be.true;
+  });
+
+  it('should set references', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'setReferences', baseContext);
+
+    await detailsTab.setMPN(page, productMPN);
+    await detailsTab.setUPC(page, productUPC);
+    await detailsTab.setEAN13(page, productEAN13);
+    await detailsTab.setISBN(page, productISBN);
+
+    const message = await createProductsPage.saveProduct(page);
+    expect(message).to.eq(createProductsPage.successfulUpdateMessage);
+  });
+
+  it('should check references', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'checkReferences', baseContext);
+
+    const productHeaderSummary = await createProductsPage.getProductHeaderSummary(page);
+
+    expect(productHeaderSummary.mpn).to.be.eq(productMPN);
+    expect(productHeaderSummary.upc).to.be.eq(productUPC);
+    expect(productHeaderSummary.ean_13).to.be.eq(productEAN13);
+    expect(productHeaderSummary.isbn).to.be.eq(productISBN);
+  });
+
+  it('should set offline', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'setOffline', baseContext);
+
+    await createProductsPage.setProductStatus(page, false);
+
+    const message = await createProductsPage.saveProduct(page);
+    expect(message).to.eq(createProductsPage.successfulUpdateMessage);
+  });
+});
diff --git a/tests/UI/campaigns/sanity/03_productsBO/02_CRUDStandardProduct.ts b/tests/UI/campaigns/sanity/03_productsBO/02_CRUDStandardProduct.ts
index c0b134fa00e7b..ec7a982191c4b 100644
--- a/tests/UI/campaigns/sanity/03_productsBO/02_CRUDStandardProduct.ts
+++ b/tests/UI/campaigns/sanity/03_productsBO/02_CRUDStandardProduct.ts
@@ -6,11 +6,12 @@ import testContext from '@utils/testContext';
 // Import common tests
 import loginCommon from '@commonTests/BO/loginBO';
 
-// Import FO pages
-import foProductPage from '@pages/FO/product';
-import dashboardPage from '@pages/BO/dashboard';
+// Import BO pages
 import productsPage from '@pages/BO/catalog/productsV2';
 import createProductsPage from '@pages/BO/catalog/productsV2/add';
+import dashboardPage from '@pages/BO/dashboard';
+// Import FO pages
+import foProductPage from '@pages/FO/product';
 
 // Import data
 import ProductData from '@data/faker/product';
diff --git a/tests/UI/data/demo/products.ts b/tests/UI/data/demo/products.ts
index fc33984adad5b..199f0dd4820b6 100644
--- a/tests/UI/data/demo/products.ts
+++ b/tests/UI/data/demo/products.ts
@@ -123,6 +123,7 @@ export default {
     summary: 'White Ceramic Mug, 325ml.',
     price: 11.90,
     finalPrice: 14.28,
+    tax: 20,
     quantity: 300,
     status: true,
   }),
diff --git a/tests/UI/data/types/product.d.ts b/tests/UI/data/types/product.d.ts
index 367070f6fcf19..3090e2c8e8782 100644
--- a/tests/UI/data/types/product.d.ts
+++ b/tests/UI/data/types/product.d.ts
@@ -122,10 +122,15 @@ type ProductFilterMinMax = {
 }
 
 type ProductHeaderSummary = {
+  imageUrl: string
   reference: string
   quantity: string
   priceTaxIncl: string
   priceTaxExc: string
+  mpn: string
+  upc: string
+  ean_13: string
+  isbn: string
 };
 
 type ProductInformations = {
diff --git a/tests/UI/pages/BO/BObasePage.ts b/tests/UI/pages/BO/BObasePage.ts
index 1decc93936c2a..0f77d91dcfbc4 100644
--- a/tests/UI/pages/BO/BObasePage.ts
+++ b/tests/UI/pages/BO/BObasePage.ts
@@ -943,7 +943,7 @@ export default class BOBasePage extends CommonPage {
    * @param timeout {number} Timeout to wait for the selector
    * @return {Promise<string|null>}
    */
-  getGrowlMessageContent(page: Page, timeout: number = 10000): Promise<string | null> {
+  async getGrowlMessageContent(page: Page, timeout: number = 10000): Promise<string | null> {
     return page.textContent(this.growlMessageBlock, {timeout});
   }
 
diff --git a/tests/UI/pages/BO/catalog/productsV2/add/descriptionTab.ts b/tests/UI/pages/BO/catalog/productsV2/add/descriptionTab.ts
index 261cb35b35f28..471bed88840b4 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/descriptionTab.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/descriptionTab.ts
@@ -11,20 +11,40 @@ import BOBasePage from '@pages/BO/BObasePage';
  * @extends BOBasePage
  */
 class DescriptionTab extends BOBasePage {
+  public readonly settingUpdatedMessage: string;
+
   private readonly descriptionTabLink: string;
 
   private readonly productImageDropZoneDiv: string;
 
-  private readonly openFileManagerDiv: string;
-
   private readonly imagePreviewBlock: string;
 
   private readonly imagePreviewCover: string;
 
+  private readonly productImage: string;
+
+  private readonly productImageDropZoneWindow: string;
+
+  private readonly productImageDropZoneCover: string;
+
+  private readonly productImageDropZoneBtnLang: string;
+
+  private readonly productImageDropZoneDropdown: string;
+
+  private readonly productImageDropZoneDropdownItem: (locale: string) => string;
+
+  private readonly productImageDropZoneCaption: string;
+
+  private readonly productImageDropZoneBtnSubmit: string;
+
   private readonly productSummary: string;
 
+  private readonly productSummaryTabLocale: (locale: string) => string;
+
   private readonly productDescription: string;
 
+  private readonly productDescriptionTabLocale: (locale: string) => string;
+
   private readonly productDefaultCategory: string;
 
   private readonly productManufacturer: string;
@@ -36,14 +56,27 @@ class DescriptionTab extends BOBasePage {
   constructor() {
     super();
 
+    // Message
+    this.settingUpdatedMessage = 'Settings updated';
+
     // Selectors in description tab
     this.descriptionTabLink = '#product_description-tab-nav';
     this.productImageDropZoneDiv = '#product-images-dropzone';
-    this.openFileManagerDiv = `${this.productImageDropZoneDiv} div.dz-default.openfilemanager.dz-clickable`;
     this.imagePreviewBlock = `${this.productImageDropZoneDiv} div.dz-preview.openfilemanager`;
     this.imagePreviewCover = `${this.productImageDropZoneDiv} div.dz-preview.is-cover`;
+    this.productImage = `${this.productImageDropZoneDiv} div.dz-preview.dz-image-preview.dz-complete`;
+    this.productImageDropZoneWindow = '#product-images-container .dropzone-window';
+    this.productImageDropZoneCover = `${this.productImageDropZoneWindow} #is-cover-checkbox`;
+    this.productImageDropZoneBtnLang = `${this.productImageDropZoneWindow} #product_dropzone_lang`;
+    this.productImageDropZoneDropdown = `${this.productImageDropZoneWindow} .locale-dropdown-menu.show`;
+    this.productImageDropZoneDropdownItem = (locale: string) => `${this.productImageDropZoneDropdown} span`
+      + `[data-locale="${locale}"]`;
+    this.productImageDropZoneCaption = `${this.productImageDropZoneWindow} #caption-textarea`;
+    this.productImageDropZoneBtnSubmit = `${this.productImageDropZoneWindow} button.save-image-settings`;
     this.productSummary = '#product_description_description_short';
+    this.productSummaryTabLocale = (locale: string) => `${this.productSummary} a[data-locale="${locale}"]`;
     this.productDescription = '#product_description_description';
+    this.productDescriptionTabLocale = (locale: string) => `${this.productDescription} a[data-locale="${locale}"]`;
     this.productDefaultCategory = '#product_description_categories_default_category_id';
     this.productManufacturer = '#product_description_manufacturer';
   }
@@ -58,7 +91,7 @@ class DescriptionTab extends BOBasePage {
    * @returns {Promise<number>}
    */
   async getNumberOfImages(page: Page): Promise<number> {
-    return (await page.$$(this.imagePreviewBlock)).length;
+    return page.locator(this.productImage).count();
   }
 
   /**
@@ -74,14 +107,57 @@ class DescriptionTab extends BOBasePage {
       const numberOfImages = await this.getNumberOfImages(page);
       await this.uploadOnFileChooser(
         page,
-        numberOfImages === 0 ? this.productImageDropZoneDiv : this.openFileManagerDiv,
+        numberOfImages === 0 ? this.productImageDropZoneDiv : this.imagePreviewBlock,
         filteredImagePaths,
       );
 
       await this.waitForVisibleSelector(page, this.imagePreviewBlock);
+      await this.waitForVisibleLocator(page.locator(this.productImage).nth(numberOfImages + filteredImagePaths.length - 1));
     }
   }
 
+  /**
+   * Set Product Image Information
+   * @param page {Page} Browser tab
+   * @param numImage {number} Number of the image
+   * @param useAsCoverImage {boolean|undefined} Use as cover image
+   * @param captionEn {string|undefined} Caption in English
+   * @param captionFr {string|undefined} Caption in French
+   * @returns {Promise<string|null>}
+   */
+  async setProductImageInformation(
+    page: Page,
+    numImage: number,
+    useAsCoverImage: boolean|undefined,
+    captionEn: string|undefined,
+    captionFr: string|undefined,
+  ): Promise<string|null> {
+    // Select the image
+    await page.locator(this.productImage).nth(numImage - 1).click();
+
+    if (useAsCoverImage) {
+      await this.setCheckedWithIcon(page, this.productImageDropZoneCover, useAsCoverImage);
+    }
+    if (captionEn) {
+      await page.click(this.productImageDropZoneBtnLang);
+      await this.elementVisible(page, this.productImageDropZoneDropdown);
+
+      await page.click(this.productImageDropZoneDropdownItem('en'));
+      await this.setValue(page, this.productImageDropZoneCaption, captionEn);
+    }
+    if (captionFr) {
+      await page.click(this.productImageDropZoneBtnLang);
+      await this.elementVisible(page, this.productImageDropZoneDropdown);
+
+      await page.click(this.productImageDropZoneDropdownItem('fr'));
+      await this.setValue(page, this.productImageDropZoneCaption, captionFr);
+    }
+
+    await page.click(this.productImageDropZoneBtnSubmit);
+
+    return this.getGrowlMessageContent(page);
+  }
+
   /**
    * Set value on tinyMce textarea
    * @param page {Page} Browser tab
@@ -111,7 +187,12 @@ class DescriptionTab extends BOBasePage {
 
     await this.addProductImages(page, [productData.coverImage, productData.thumbImage]);
 
+    await page.click(this.productSummaryTabLocale('en'));
+    await this.elementVisible(page, `${this.productSummaryTabLocale('en')}.active`);
     await this.setValueOnTinymceInput(page, this.productSummary, productData.summary);
+
+    await page.click(this.productDescriptionTabLocale('en'));
+    await this.elementVisible(page, `${this.productDescriptionTabLocale('en')}.active`);
     await this.setValueOnTinymceInput(page, this.productDescription, productData.description);
   }
 
diff --git a/tests/UI/pages/BO/catalog/productsV2/add/detailsTab.ts b/tests/UI/pages/BO/catalog/productsV2/add/detailsTab.ts
index 5ca975cec650d..562009f06a919 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/detailsTab.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/detailsTab.ts
@@ -60,6 +60,46 @@ class DetailsTab extends BOBasePage {
     await this.setValue(page, this.productReferenceInput, productData.reference);
   }
 
+  /**
+   * Set value for EAN 13
+   * @param page {Page} Browser tab
+   * @param value {string} Value
+   * @returns {Promise<void>}
+   */
+  async setEAN13(page: Page, value: string): Promise<void> {
+    await this.setValue(page, this.productEAN13Input, value);
+  }
+
+  /**
+   * Set value for setISBN
+   * @param page {Page} Browser tab
+   * @param value {string} Value
+   * @returns {Promise<void>}
+   */
+  async setISBN(page: Page, value: string): Promise<void> {
+    await this.setValue(page, this.productISBNInput, value);
+  }
+
+  /**
+   * Set value for MPN
+   * @param page {Page} Browser tab
+   * @param value {string} Value
+   * @returns {Promise<void>}
+   */
+  async setMPN(page: Page, value: string): Promise<void> {
+    await this.setValue(page, this.productMPNInput, value);
+  }
+
+  /**
+   * Set value for UPC
+   * @param page {Page} Browser tab
+   * @param value {string} Value
+   * @returns {Promise<void>}
+   */
+  async setUPC(page: Page, value: string): Promise<void> {
+    await this.setValue(page, this.productUPCInput, value);
+  }
+
   /**
    * @param page {Page}
    * @param inputName {string}
diff --git a/tests/UI/pages/BO/catalog/productsV2/add/index.ts b/tests/UI/pages/BO/catalog/productsV2/add/index.ts
index f03d048983f87..2388192e18c56 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/index.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/index.ts
@@ -25,11 +25,25 @@ class CreateProduct extends BOBasePage {
 
   public readonly successfulDuplicateMessage: string;
 
-  private readonly productNameInput: (languageId: number) => string;
+  private readonly productImageUrl: string;
+
+  private readonly productName: string;
+
+  private readonly productNameInput: (locale: string) => string;
+
+  private readonly productNameLanguageButton: string;
+
+  private readonly productNameLanguageDropdown: string;
+
+  private readonly productNameLanguageDropdownItem: (locale: string) => string;
 
   private readonly productTypeLabel: string;
 
-  private readonly productActiveSwitchButton: string;
+  private readonly productTypePreview: string;
+
+  private readonly productTypePreviewLabel: string;
+
+  private readonly productActiveSwitchButton: (status: number) => string;
 
   private readonly productHeaderSummary: string;
 
@@ -39,7 +53,9 @@ class CreateProduct extends BOBasePage {
 
   private readonly productHeaderQuantity: string;
 
-  private readonly productHeaderReference: string;
+  private readonly productHeaderReferences: string;
+
+  private readonly productHeaderReference: (type: string) => string;
 
   private readonly footerProductDropDown: string;
 
@@ -67,6 +83,16 @@ class CreateProduct extends BOBasePage {
 
   private readonly tabLink: (tabName: string) => string;
 
+  private readonly modalSwitchType: string;
+
+  private readonly modalSwitchTypeBtnChoice: (productType: string) => string;
+
+  private readonly modalSwitchTypeBtnSubmit: string;
+
+  private readonly modalConfirmType: string;
+
+  private readonly modalConfirmTypeBtnSubmit: string;
+
   /**
    * @constructs
    * Setting up texts and selectors to use on products V2 page
@@ -79,14 +105,24 @@ class CreateProduct extends BOBasePage {
     this.successfulDuplicateMessage = 'Successful duplication';
 
     // Header selectors
-    this.productNameInput = (languageId: number) => `#product_header_name_${languageId}`;
+    this.productImageUrl = '#product_header_cover_thumbnail';
+    this.productName = '#product_header_name';
+    this.productNameInput = (locale: string) => `${this.productName} div.js-locale-${locale} input`;
+    this.productNameLanguageButton = `${this.productName}_dropdown`;
+    this.productNameLanguageDropdown = `${this.productName} .dropdown .dropdown-menu`;
+    this.productNameLanguageDropdownItem = (locale: string) => `${this.productNameLanguageDropdown} span`
+      + `[data-locale="${locale}"]`;
+    this.productTypePreview = '.product-type-preview';
+    this.productTypePreviewLabel = `${this.productTypePreview}-label`;
     this.productTypeLabel = '.product-type-preview-label';
     this.productActiveSwitchButton = '#product_header_active_1';
     this.productHeaderSummary = '.product-header-summary';
     this.productHeaderTaxExcluded = `${this.productHeaderSummary} div[data-role=price-tax-excluded]`;
     this.productHeaderTaxIncluded = `${this.productHeaderSummary} div[data-role=price-tax-included]`;
     this.productHeaderQuantity = `${this.productHeaderSummary} div[data-role=quantity]`;
-    this.productHeaderReference = '.product-header-references';
+    this.productHeaderReferences = '.product-header-references';
+    this.productHeaderReference = (type: string) => `${this.productHeaderReferences} .product-reference`
+      + `[data-reference-type="${type}"] span`;
 
     // Footer selectors
     this.footerProductDropDown = '#product_footer_actions_dropdown';
@@ -108,11 +144,59 @@ class CreateProduct extends BOBasePage {
 
     // Tab
     this.tabLink = (tabName: string) => `#product_${tabName}-tab-nav`;
+
+    // Modal : Switch Product Type
+    this.modalSwitchType = '#switch-product-type-modal';
+    this.modalSwitchTypeBtnChoice = (productType: string) => `${this.modalSwitchType} button.product-type-choice`
+        + `[data-value="${productType}"]`;
+    this.modalSwitchTypeBtnSubmit = `${this.modalSwitchType} .modal-footer button.btn-confirm-submit`;
+    this.modalConfirmType = '#modal-confirm-product-type';
+    this.modalConfirmTypeBtnSubmit = `${this.modalConfirmType} .modal-footer button.btn-confirm-submit`;
   }
 
   /*
   Methods
    */
+  /**
+   * Go to a tab
+   * @param page {Page} Browser tab
+   * @param tabName {'description'|'details'|'options'|'pricing'|'seo'|'shipping'|'stock'} Name of the tab
+   * @returns {Promise<void>}
+   */
+  async goToTab(
+    page: Page,
+    tabName: 'description' | 'details' | 'options' | 'pricing' | 'seo' | 'shipping' | 'stock',
+  ): Promise<void> {
+    await this.waitForSelectorAndClick(page, this.tabLink(tabName));
+    await this.waitForVisibleSelector(page, `${this.tabLink(tabName)} a.active`, 2000);
+  }
+
+  /**
+   * Is Tab active
+   * @param page {Page} Browser tab
+   * @param tabName {'description'|'details'|'options'|'pricing'|'seo'|'shipping'|'stock'} Name of the tab
+   * @returns {Promise<boolean>}
+   */
+  async isTabActive(
+    page: Page,
+    tabName: 'description' | 'details' | 'options' | 'pricing' | 'seo' | 'shipping' | 'stock',
+  ): Promise<boolean> {
+    return this.elementVisible(page, `${this.tabLink(tabName)} a.active`, 2000);
+  }
+
+  /**
+   * Is Tab visible
+   * @param page {Page} Browser tab
+   * @param tabName {'description'|'details'|'options'|'pricing'|'seo'|'shipping'|'stock'} Name of the tab
+   * @returns {Promise<boolean>}
+   */
+  async isTabVisible(
+    page: Page,
+    tabName: 'description' | 'details' | 'options' | 'pricing' | 'seo' | 'shipping' | 'stock',
+  ): Promise<boolean> {
+    return this.elementVisible(page, `${this.tabLink(tabName)} a`, 2000);
+  }
+
   /**
    * Get product header summary
    * @param page {Page} Browser tab
@@ -120,10 +204,23 @@ class CreateProduct extends BOBasePage {
    */
   async getProductHeaderSummary(page: Page): Promise<ProductHeaderSummary> {
     return {
+      imageUrl: await this.getAttributeContent(page, this.productImageUrl, 'value'),
       priceTaxExc: await this.getTextContent(page, this.productHeaderTaxExcluded),
       priceTaxIncl: await this.getTextContent(page, this.productHeaderTaxIncluded),
       quantity: await this.getTextContent(page, this.productHeaderQuantity, false),
-      reference: await this.getTextContent(page, this.productHeaderReference),
+      reference: await this.getTextContent(page, this.productHeaderReference('reference'), false),
+      mpn: (await page.locator(this.productHeaderReference('mpn')).count())
+        ? await this.getTextContent(page, this.productHeaderReference('mpn'), false)
+        : '',
+      upc: (await page.locator(this.productHeaderReference('upc')).count())
+        ? await this.getTextContent(page, this.productHeaderReference('upc'), false)
+        : '',
+      ean_13: (await page.locator(this.productHeaderReference('ean_13')).count())
+        ? await this.getTextContent(page, this.productHeaderReference('ean_13'), false)
+        : '',
+      isbn: (await page.locator(this.productHeaderReference('isbn')).count())
+        ? await this.getTextContent(page, this.productHeaderReference('isbn'), false)
+        : '',
     };
   }
 
@@ -137,13 +234,25 @@ class CreateProduct extends BOBasePage {
   }
 
   /**
-   * Set product status
+   * Return the product type
    * @param page {Page} Browser tab
-   * @param status {boolean} The product status
-   * @returns {Promise<void>}
+   * @returns {Promise<string>}
    */
-  async setProductStatus(page: Page, status: boolean): Promise<void> {
-    await this.setChecked(page, this.productActiveSwitchButton, status);
+  async getProductType(page: Page): Promise<string> {
+    const typeLabel = await this.getTextContent(page, this.productTypePreviewLabel);
+
+    switch (typeLabel) {
+      case 'Standard product':
+        return 'standard';
+      case 'Product with combinations':
+        return 'combinations';
+      case 'Pack of products':
+        return 'pack';
+      case 'Virtual product':
+        return 'virtual';
+      default:
+        throw new Error(`Type ${typeLabel} is not defined`);
+    }
   }
 
   /**
@@ -153,7 +262,8 @@ class CreateProduct extends BOBasePage {
    * @returns {Promise<string>}
    */
   async setProduct(page: Page, productData: ProductData): Promise<string> {
-    await this.setValue(page, this.productNameInput(1), productData.name);
+    await this.setProductName(page, productData.name, 'en');
+    await this.setProductName(page, productData.nameFR, 'fr');
 
     await descriptionTab.setProductDescription(page, productData);
 
@@ -176,6 +286,35 @@ class CreateProduct extends BOBasePage {
     return this.saveProduct(page);
   }
 
+  /**
+   * Set product status
+   * @param page {Page} Browser tab
+   * @param status {boolean} The product status
+   * @returns {Promise<void>}
+   */
+  async setProductStatus(page: Page, status: boolean): Promise<void> {
+    await this.setChecked(page, this.productActiveSwitchButton(status ? 1 : 0), true);
+  }
+
+  /**
+   * Set product name
+   * @param page {Page} Browser tab
+   * @param name {string} Name of the product
+   * @param locale {string} Locale
+   * @returns {Promise<void>}
+   */
+  async setProductName(page: Page, name: string, locale: string = 'en'): Promise<void> {
+    console.log(this.productNameLanguageButton);
+    console.log(await this.elementVisible(page, this.productNameLanguageButton));
+    await this.waitForSelectorAndClick(page, this.productNameLanguageButton);
+    console.log(this.productNameLanguageDropdownItem(locale));
+    console.log(await this.elementVisible(page, this.productNameLanguageDropdownItem(locale)));
+    await this.waitForSelectorAndClick(page, this.productNameLanguageDropdownItem(locale));
+    console.log(this.productNameInput(locale));
+    console.log(await this.elementVisible(page, this.productNameInput(locale)));
+    await this.setValue(page, this.productNameInput(locale), name);
+  }
+
   /**
    * Save product
    * @param page {Page} Browser tab
@@ -275,6 +414,27 @@ class CreateProduct extends BOBasePage {
     await page.waitForURL((url: URL): boolean => url.toString() !== currentUrl, {waitUntil: 'networkidle'});
   }
 
+  /**
+   * Change product type
+   * @param page {Page} Browser tab
+   * @param productType {string} Data to choose in product type
+   * @returns {Promise<string>}
+   */
+  async changeProductType(page: Page, productType: string): Promise<string> {
+    // Click on the type label
+    await page.click(this.productTypePreview);
+    // Modal "Change the product type"
+    await this.elementVisible(page, this.modalSwitchType, 2000);
+    await this.waitForSelectorAndClick(page, this.modalSwitchTypeBtnChoice(productType));
+    await this.waitForSelectorAndClick(page, this.modalSwitchTypeBtnSubmit);
+    // Modal "Are you sure you want to change the product type?"
+    await this.elementVisible(page, this.modalConfirmType, 2000);
+    await this.elementVisible(page, this.modalConfirmTypeBtnSubmit, 2000);
+    await this.waitForSelectorAndClick(page!, this.modalConfirmTypeBtnSubmit);
+
+    return this.getAlertSuccessBlockParagraphContent(page);
+  }
+
   /**
    * Is choose product iframe visible
    * @param page {Page} Browser tab
diff --git a/tests/UI/pages/BO/catalog/productsV2/add/pricingTab.ts b/tests/UI/pages/BO/catalog/productsV2/add/pricingTab.ts
index 700aa6c509835..d46e8398ed095 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/pricingTab.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/pricingTab.ts
@@ -14,7 +14,9 @@ import type {Page} from 'playwright';
 class PricingTab extends BOBasePage {
   private readonly pricingTabLink: string;
 
-  private readonly retailPriceInput: string;
+  private readonly retailPriceInputTaxExcl: string;
+
+  private readonly retailPriceInputTaxIncl: string;
 
   private readonly taxRuleID: string;
 
@@ -43,7 +45,8 @@ class PricingTab extends BOBasePage {
 
     // Selectors in pricing tab
     this.pricingTabLink = '#product_pricing-tab-nav';
-    this.retailPriceInput = '#product_pricing_retail_price_price_tax_excluded';
+    this.retailPriceInputTaxExcl = '#product_pricing_retail_price_price_tax_excluded';
+    this.retailPriceInputTaxIncl = '#product_pricing_retail_price_price_tax_included';
     this.taxRuleID = 'product_pricing_retail_price_tax_rules_group_id';
     this.taxRuleSelect = `#${this.taxRuleID}`;
     this.taxRuleSpan = `#select2-${this.taxRuleID}-container`;
@@ -67,7 +70,7 @@ class PricingTab extends BOBasePage {
    */
   async setProductPricing(page: Page, productData: ProductData): Promise<void> {
     await this.waitForSelectorAndClick(page, this.pricingTabLink);
-    await this.setValue(page, this.retailPriceInput, productData.price);
+    await this.setRetailPrice(page, true, productData.price);
     // Select tax rule by ID
     await Promise.all([
       this.waitForSelectorAndClick(page, this.taxRuleSpan),
@@ -76,6 +79,21 @@ class PricingTab extends BOBasePage {
     await page.locator(`li:has-text('${productData.taxRule}')`).click();
   }
 
+  /**
+   * Set retail price
+   * @param page {Page} Browser tab
+   * @param isTaxExcluded {boolean} is Tax Excluded
+   * @param price {number} Retail price
+   * @returns {Promise<void>}
+   */
+  async setRetailPrice(page: Page, isTaxExcluded: boolean, price: number): Promise<void> {
+    await this.setValue(
+      page,
+      isTaxExcluded ? this.retailPriceInputTaxExcl : this.retailPriceInputTaxIncl,
+      price,
+    );
+  }
+
   /**
    * Returns the value of a form element
    * @param page {Page}
diff --git a/tests/UI/pages/BO/catalog/productsV2/add/stocksTab.ts b/tests/UI/pages/BO/catalog/productsV2/add/stocksTab.ts
index fafd50c30a7e4..e856d3dd4e65e 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/stocksTab.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/stocksTab.ts
@@ -58,10 +58,20 @@ class StocksTab extends BOBasePage {
    */
   async setProductStock(page:Page, productData: ProductData): Promise<void> {
     await this.waitForSelectorAndClick(page, this.stocksTabLink);
-    await this.setValue(page, this.productQuantityInput, productData.quantity);
+    await this.setQuantityDelta(page, productData.quantity);
     await this.setValue(page, this.productMinimumQuantityInput, productData.minimumQuantity);
   }
 
+  /**
+   * Set quantity delta
+   * @param page {Page} Browser tab
+   * @param quantity {number} Quantity delta
+   * @returns {Promise<void>}
+   */
+  async setQuantityDelta(page: Page, quantity: number): Promise<void> {
+    await this.setValue(page, this.productQuantityInput, quantity);
+  }
+
   /**
    * @param page {Page}
    * @param inputName {string}
diff --git a/tests/UI/pages/commonPage.ts b/tests/UI/pages/commonPage.ts
index 6d48fd36c06d6..44020aa64dde0 100755
--- a/tests/UI/pages/commonPage.ts
+++ b/tests/UI/pages/commonPage.ts
@@ -2,7 +2,7 @@
 import type {PageWaitForSelectorOptionsState, WaitForNavigationWaitUntil} from '@data/types/playwright';
 
 import type {
-  BrowserContext, ElementHandle, JSHandle, FileChooser, Frame, Page,
+  BrowserContext, ElementHandle, JSHandle, FileChooser, Frame, Page, Locator,
 } from 'playwright';
 
 /**
@@ -106,6 +106,19 @@ export default class CommonPage {
     await this.waitForSelector(page, selector, 'attached', timeout);
   }
 
+  /**
+   * Wait for locator to be visible
+   * @param locator {Locator}
+   * @param timeout {number} Time to wait on milliseconds before throwing an error
+   * @return {Promise<void>}
+   */
+  async waitForVisibleLocator(locator: Locator, timeout: number = 10000): Promise<void> {
+    await locator.waitFor({
+      state: 'visible',
+      timeout,
+    });
+  }
+
   /**
    * Get Text from element
    * @param page {Page} Browser tab
@@ -154,7 +167,7 @@ export default class CommonPage {
   /**
    * Is element not visible
    * @param page {Page} Browser tab
-   * @param selector, element to check
+   * @param selector {string} Element to check
    * @param timeout {number} Time to wait on milliseconds before throwing an error
    * @returns {Promise<boolean>} True if not visible, false if visible
    */

From fdcab99d9048b689f2a2d3c341d151733ef953ce Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Thu, 3 Aug 2023 12:02:51 +0200
Subject: [PATCH 0830/1030] Functional Tests : BO - Catalog - Products : Header
 (Use locator)

---
 .../BO/catalog/productsV2/add/descriptionTab.ts    | 14 +++++++-------
 tests/UI/pages/BO/catalog/productsV2/add/index.ts  |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/UI/pages/BO/catalog/productsV2/add/descriptionTab.ts b/tests/UI/pages/BO/catalog/productsV2/add/descriptionTab.ts
index 471bed88840b4..46f735838c8cd 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/descriptionTab.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/descriptionTab.ts
@@ -139,21 +139,21 @@ class DescriptionTab extends BOBasePage {
       await this.setCheckedWithIcon(page, this.productImageDropZoneCover, useAsCoverImage);
     }
     if (captionEn) {
-      await page.click(this.productImageDropZoneBtnLang);
+      await page.locator(this.productImageDropZoneBtnLang).click();
       await this.elementVisible(page, this.productImageDropZoneDropdown);
 
-      await page.click(this.productImageDropZoneDropdownItem('en'));
+      await page.locator(this.productImageDropZoneDropdownItem('en')).click();
       await this.setValue(page, this.productImageDropZoneCaption, captionEn);
     }
     if (captionFr) {
-      await page.click(this.productImageDropZoneBtnLang);
+      await page.locator(this.productImageDropZoneBtnLang).click();
       await this.elementVisible(page, this.productImageDropZoneDropdown);
 
-      await page.click(this.productImageDropZoneDropdownItem('fr'));
+      await page.locator(this.productImageDropZoneDropdownItem('fr')).click();
       await this.setValue(page, this.productImageDropZoneCaption, captionFr);
     }
 
-    await page.click(this.productImageDropZoneBtnSubmit);
+    await page.locator(this.productImageDropZoneBtnSubmit).click();
 
     return this.getGrowlMessageContent(page);
   }
@@ -187,11 +187,11 @@ class DescriptionTab extends BOBasePage {
 
     await this.addProductImages(page, [productData.coverImage, productData.thumbImage]);
 
-    await page.click(this.productSummaryTabLocale('en'));
+    await page.locator(this.productSummaryTabLocale('en')).click();
     await this.elementVisible(page, `${this.productSummaryTabLocale('en')}.active`);
     await this.setValueOnTinymceInput(page, this.productSummary, productData.summary);
 
-    await page.click(this.productDescriptionTabLocale('en'));
+    await page.locator(this.productDescriptionTabLocale('en')).click();
     await this.elementVisible(page, `${this.productDescriptionTabLocale('en')}.active`);
     await this.setValueOnTinymceInput(page, this.productDescription, productData.description);
   }
diff --git a/tests/UI/pages/BO/catalog/productsV2/add/index.ts b/tests/UI/pages/BO/catalog/productsV2/add/index.ts
index 2388192e18c56..12817eba6baed 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/index.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/index.ts
@@ -422,7 +422,7 @@ class CreateProduct extends BOBasePage {
    */
   async changeProductType(page: Page, productType: string): Promise<string> {
     // Click on the type label
-    await page.click(this.productTypePreview);
+    await page.locator(this.productTypePreview).click();
     // Modal "Change the product type"
     await this.elementVisible(page, this.modalSwitchType, 2000);
     await this.waitForSelectorAndClick(page, this.modalSwitchTypeBtnChoice(productType));

From eee8d5a4d965fb8cab1f41dd22ad9ed1e7b8c988 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Thu, 3 Aug 2023 12:07:55 +0200
Subject: [PATCH 0831/1030] Functional Tests : BO - Catalog - Products : Header
 (Removed unused import)

---
 tests/UI/campaigns/productV2/functional/01_filterProducts.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/UI/campaigns/productV2/functional/01_filterProducts.ts b/tests/UI/campaigns/productV2/functional/01_filterProducts.ts
index 02f8f0e4f6643..90136db2a7363 100644
--- a/tests/UI/campaigns/productV2/functional/01_filterProducts.ts
+++ b/tests/UI/campaigns/productV2/functional/01_filterProducts.ts
@@ -9,7 +9,6 @@ import testContext from '@utils/testContext';
 import loginCommon from '@commonTests/BO/loginBO';
 
 // Import pages
-import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
 import dashboardPage from '@pages/BO/dashboard';
 import productsPage from '@pages/BO/catalog/productsV2';
 

From f1ccb7bb9bc9c9aeea4dc59eb34f5c5d6da670f1 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Thu, 3 Aug 2023 12:24:14 +0200
Subject: [PATCH 0832/1030] Functional Tests : BO - Catalog - Products : Header
 (Fixed sanity)

---
 .../UI/pages/BO/catalog/productsV2/add/index.ts  | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/tests/UI/pages/BO/catalog/productsV2/add/index.ts b/tests/UI/pages/BO/catalog/productsV2/add/index.ts
index 12817eba6baed..2064f4a2f6652 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/index.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/index.ts
@@ -262,11 +262,14 @@ class CreateProduct extends BOBasePage {
    * @returns {Promise<string>}
    */
   async setProduct(page: Page, productData: ProductData): Promise<string> {
+    // Set status
+    await this.setProductStatus(page, productData.status);
+    // Set description
+    await descriptionTab.setProductDescription(page, productData);
+    // Set name
     await this.setProductName(page, productData.name, 'en');
     await this.setProductName(page, productData.nameFR, 'fr');
 
-    await descriptionTab.setProductDescription(page, productData);
-
     await detailsTab.setProductDetails(page, productData);
 
     if (productData.type === 'virtual') {
@@ -281,8 +284,6 @@ class CreateProduct extends BOBasePage {
 
     await pricingTab.setProductPricing(page, productData);
 
-    await this.setProductStatus(page, productData.status);
-
     return this.saveProduct(page);
   }
 
@@ -304,14 +305,9 @@ class CreateProduct extends BOBasePage {
    * @returns {Promise<void>}
    */
   async setProductName(page: Page, name: string, locale: string = 'en'): Promise<void> {
-    console.log(this.productNameLanguageButton);
-    console.log(await this.elementVisible(page, this.productNameLanguageButton));
     await this.waitForSelectorAndClick(page, this.productNameLanguageButton);
-    console.log(this.productNameLanguageDropdownItem(locale));
-    console.log(await this.elementVisible(page, this.productNameLanguageDropdownItem(locale)));
     await this.waitForSelectorAndClick(page, this.productNameLanguageDropdownItem(locale));
-    console.log(this.productNameInput(locale));
-    console.log(await this.elementVisible(page, this.productNameInput(locale)));
+    await page.$eval(this.productNameLanguageDropdownItem(locale), (el: HTMLElement) => el.click());
     await this.setValue(page, this.productNameInput(locale), name);
   }
 

From ea88df73d7b67dd109368738df08c807fb6f7383 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Thu, 3 Aug 2023 12:38:59 +0200
Subject: [PATCH 0833/1030] Functional Tests : BO - Catalog - Products : Header
 (Remove page.)

---
 tests/UI/pages/BO/catalog/productsV2/add/index.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/UI/pages/BO/catalog/productsV2/add/index.ts b/tests/UI/pages/BO/catalog/productsV2/add/index.ts
index 2064f4a2f6652..5711ddcd4c6db 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/index.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/index.ts
@@ -307,7 +307,10 @@ class CreateProduct extends BOBasePage {
   async setProductName(page: Page, name: string, locale: string = 'en'): Promise<void> {
     await this.waitForSelectorAndClick(page, this.productNameLanguageButton);
     await this.waitForSelectorAndClick(page, this.productNameLanguageDropdownItem(locale));
-    await page.$eval(this.productNameLanguageDropdownItem(locale), (el: HTMLElement) => el.click());
+    await page.evaluate(
+      (selector: string) => (document.querySelector(selector) as HTMLElement).click(),
+      this.productNameLanguageDropdownItem(locale),
+    );
     await this.setValue(page, this.productNameInput(locale), name);
   }
 

From 5123704c259858890eb2412ffe0731c779b0e728 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Wed, 2 Aug 2023 16:39:15 +0200
Subject: [PATCH 0834/1030] Functional Tests : Faceted search module - Edit
 template - Product stock filter

---
 .../14_editTemplateProductStockFilter.ts      | 180 ++++++++++++++++++
 .../15_editTemplateProductBrandFilter.ts      |   6 +-
 .../modules/psFacetedSearch/filterTemplate.ts |   3 +
 tests/UI/pages/FO/category/index.ts           |  31 +--
 4 files changed, 205 insertions(+), 15 deletions(-)
 create mode 100644 tests/UI/campaigns/modules/ps_facetedsearch/02_configuration/14_editTemplateProductStockFilter.ts

diff --git a/tests/UI/campaigns/modules/ps_facetedsearch/02_configuration/14_editTemplateProductStockFilter.ts b/tests/UI/campaigns/modules/ps_facetedsearch/02_configuration/14_editTemplateProductStockFilter.ts
new file mode 100644
index 0000000000000..c36f347eed52d
--- /dev/null
+++ b/tests/UI/campaigns/modules/ps_facetedsearch/02_configuration/14_editTemplateProductStockFilter.ts
@@ -0,0 +1,180 @@
+// Import utils
+import files from '@utils/files';
+import helper from '@utils/helpers';
+import testContext from '@utils/testContext';
+
+// Import commonTests
+import loginCommon from '@commonTests/BO/loginBO';
+
+// Import pages
+// Import BO pages
+import dashboardPage from '@pages/BO/dashboard';
+import {moduleManager as moduleManagerPage} from '@pages/BO/modules/moduleManager';
+import psFacetedSearch from '@pages/BO/modules/psFacetedSearch';
+import psFacetedSearchFilterTemplate from '@pages/BO/modules/psFacetedSearch/filterTemplate';
+// Import FO pages
+import categoryPageFO from '@pages/FO/category';
+import {homePage} from '@pages/FO/home';
+
+// Import data
+import Modules from '@data/demo/modules';
+
+import {expect} from 'chai';
+import type {BrowserContext, Page} from 'playwright';
+
+const baseContext: string = 'modules_ps_facetedsearch_configuration_editTemplateProductStockFilter';
+
+describe('Faceted search module - Edit template - Product stock filter', async () => {
+  let browserContext: BrowserContext;
+  let page: Page;
+
+  // before and after functions
+  before(async function () {
+    browserContext = await helper.createBrowserContext(this.browser);
+    page = await helper.newTab(browserContext);
+  });
+
+  after(async () => {
+    await helper.closeBrowserContext(browserContext);
+    await files.deleteFile('module.zip');
+  });
+
+  it('should login in BO', async function () {
+    await loginCommon.loginBO(this, page);
+  });
+
+  it('should go to \'Modules > Module Manager\' page', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'goToModuleManagerPage', baseContext);
+
+    await dashboardPage.goToSubMenu(
+      page,
+      dashboardPage.modulesParentLink,
+      dashboardPage.moduleManagerLink,
+    );
+    await moduleManagerPage.closeSfToolBar(page);
+
+    const pageTitle = await moduleManagerPage.getPageTitle(page);
+    await expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
+  });
+
+  it(`should search the module ${Modules.psFacetedSearch.name}`, async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'searchModule', baseContext);
+
+    const isModuleVisible = await moduleManagerPage.searchModule(page, Modules.psFacetedSearch);
+    await expect(isModuleVisible).to.be.true;
+  });
+
+  it(`should go to the configuration page of the module '${Modules.psFacetedSearch.name}'`, async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'goToConfigurationPage', baseContext);
+
+    await moduleManagerPage.goToConfigurationPage(page, Modules.psFacetedSearch.tag);
+
+    const pageTitle = await psFacetedSearch.getPageSubtitle(page);
+    await expect(pageTitle).to.eq(psFacetedSearch.pageSubTitle);
+  });
+
+  [
+    {
+      filterStatus: false,
+      filterType: '',
+      expectedHasSearchFilters: false,
+      expectedIsSearchFilterRadio: false,
+      expectedIsSearchFilterDropdown: false,
+      expectedIsSearchFilterCheckbox: false,
+    },
+    {
+      filterStatus: true,
+      filterType: 'radio',
+      expectedHasSearchFilters: true,
+      expectedIsSearchFilterRadio: true,
+      expectedIsSearchFilterDropdown: false,
+      expectedIsSearchFilterCheckbox: false,
+    },
+    {
+      filterStatus: true,
+      filterType: 'dropdown',
+      expectedHasSearchFilters: true,
+      expectedIsSearchFilterRadio: false,
+      expectedIsSearchFilterDropdown: true,
+      expectedIsSearchFilterCheckbox: false,
+    },
+    {
+      filterStatus: true,
+      filterType: 'checkbox',
+      expectedHasSearchFilters: true,
+      expectedIsSearchFilterRadio: false,
+      expectedIsSearchFilterDropdown: false,
+      expectedIsSearchFilterCheckbox: true,
+    },
+  ].forEach((test: {
+    filterStatus: boolean,
+    filterType: string,
+    expectedHasSearchFilters: boolean,
+    expectedIsSearchFilterRadio: boolean,
+    expectedIsSearchFilterDropdown: boolean,
+    expectedIsSearchFilterCheckbox: boolean,
+  }, index: number) => {
+    it('should edit the filter template', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', `editFilterTemplate_${index}`, baseContext);
+
+      await psFacetedSearch.editFilterTemplate(page, 1);
+
+      const pageTitle = await psFacetedSearchFilterTemplate.getPanelTitle(page);
+      await expect(pageTitle).to.eq(psFacetedSearchFilterTemplate.title);
+    });
+
+    it(
+      `should ${test.filterStatus ? 'enable' : 'disable'} the filter "Product stock filter" `
+      + `${test.filterType ? `with filter mode "${test.filterType}"` : ''}`,
+      async function () {
+        await testContext.addContextItem(this, 'testIdentifier', `setProductStockFilter_${index}`, baseContext);
+
+        const textResult = await psFacetedSearchFilterTemplate.setFilterForm(
+          page,
+          'Product stock filter',
+          test.filterStatus,
+          test.filterType,
+        );
+        await expect(textResult).to.match(/× Your filter "[-A-Za-z0-9\s]+" was updated successfully./);
+      });
+
+    it('should view my shop', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', `viewMyShop_${index}`, baseContext);
+
+      page = await psFacetedSearch.viewMyShop(page);
+
+      const isHomePage = await homePage.isHomePage(page);
+      await expect(isHomePage).to.be.true;
+    });
+
+    it('should check the "All products" page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', `goToAllProductsPage_${index}`, baseContext);
+
+      await homePage.goToAllProductsBlockPage(page, 1);
+
+      const isCategoryPageVisible = await categoryPageFO.isCategoryPage(page);
+      await expect(isCategoryPageVisible).to.be.true;
+
+      const hasSearchFilters = await categoryPageFO.hasSearchFilters(page);
+      await expect(hasSearchFilters).to.be.eq(test.expectedHasSearchFilters);
+
+      const isSearchFilterRadio = await categoryPageFO.isSearchFilterRadio(page, 'availability');
+      await expect(isSearchFilterRadio).to.be.eq(test.expectedIsSearchFilterRadio);
+
+      const isSearchFilterDropdown = await categoryPageFO.isSearchFilterDropdown(page, 'availability');
+      await expect(isSearchFilterDropdown).to.be.eq(test.expectedIsSearchFilterDropdown);
+
+      const isSearchFiltersCheckbox = await categoryPageFO.isSearchFiltersCheckbox(page, 'availability');
+      await expect(isSearchFiltersCheckbox).to.be.eq(test.expectedIsSearchFilterCheckbox);
+    });
+
+    it('should close the page and return to the backOffice', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', `closePageFo_${index}`, baseContext);
+
+      page = await categoryPageFO.closePage(browserContext, page, 0);
+
+      const pageTitle = await psFacetedSearch.getPageSubtitle(page);
+      await expect(pageTitle).to.eq(psFacetedSearch.pageSubTitle);
+    });
+  });
+});
diff --git a/tests/UI/campaigns/modules/ps_facetedsearch/02_configuration/15_editTemplateProductBrandFilter.ts b/tests/UI/campaigns/modules/ps_facetedsearch/02_configuration/15_editTemplateProductBrandFilter.ts
index 3a181999c0df8..828f0e5612855 100644
--- a/tests/UI/campaigns/modules/ps_facetedsearch/02_configuration/15_editTemplateProductBrandFilter.ts
+++ b/tests/UI/campaigns/modules/ps_facetedsearch/02_configuration/15_editTemplateProductBrandFilter.ts
@@ -158,13 +158,13 @@ describe('Faceted search module - Edit template - Product brand filter', async (
       const hasSearchFilters = await categoryPageFO.hasSearchFilters(page);
       await expect(hasSearchFilters).to.be.eq(test.expectedHasSearchFilters);
 
-      const isSearchFilterRadio = await categoryPageFO.isSearchFilterRadio(page);
+      const isSearchFilterRadio = await categoryPageFO.isSearchFilterRadio(page, 'manufacturer');
       await expect(isSearchFilterRadio).to.be.eq(test.expectedIsSearchFilterRadio);
 
-      const isSearchFilterDropdown = await categoryPageFO.isSearchFilterDropdown(page);
+      const isSearchFilterDropdown = await categoryPageFO.isSearchFilterDropdown(page, 'manufacturer');
       await expect(isSearchFilterDropdown).to.be.eq(test.expectedIsSearchFilterDropdown);
 
-      const isSearchFiltersCheckbox = await categoryPageFO.isSearchFiltersCheckbox(page);
+      const isSearchFiltersCheckbox = await categoryPageFO.isSearchFiltersCheckbox(page, 'manufacturer');
       await expect(isSearchFiltersCheckbox).to.be.eq(test.expectedIsSearchFilterCheckbox);
     });
 
diff --git a/tests/UI/pages/BO/modules/psFacetedSearch/filterTemplate.ts b/tests/UI/pages/BO/modules/psFacetedSearch/filterTemplate.ts
index 1cdabb56d7092..80b46e020b8a2 100644
--- a/tests/UI/pages/BO/modules/psFacetedSearch/filterTemplate.ts
+++ b/tests/UI/pages/BO/modules/psFacetedSearch/filterTemplate.ts
@@ -54,6 +54,9 @@ class PsFacetedSearchFilterTemplate extends ModuleConfiguration {
       case 'Product brand filter':
         selectorStatus = 'layered_selection_manufacturer';
         break;
+      case 'Product stock filter':
+        selectorStatus = 'layered_selection_stock';
+        break;
       default:
         throw new Error(`The filter "${filterName}" has no defined selector.`);
     }
diff --git a/tests/UI/pages/FO/category/index.ts b/tests/UI/pages/FO/category/index.ts
index f07e1581bc2aa..64ebd16dcd4a3 100644
--- a/tests/UI/pages/FO/category/index.ts
+++ b/tests/UI/pages/FO/category/index.ts
@@ -69,11 +69,13 @@ class Category extends FOBasePage {
 
   private readonly searchFilters: string;
 
-  private readonly searchFiltersCheckbox: string;
+  private readonly searchFilter: (facetType: string) => string;
 
-  private readonly searchFiltersRadio: string;
+  private readonly searchFiltersCheckbox: (facetType: string) => string;
 
-  private readonly searchFiltersDropdown: string;
+  private readonly searchFiltersRadio: (facetType: string) => string;
+
+  private readonly searchFiltersDropdown: (facetType: string) => string;
 
   private readonly wishlistModal: string;
 
@@ -132,9 +134,11 @@ class Category extends FOBasePage {
 
     // Filter
     this.searchFilters = '#search_filters';
-    this.searchFiltersCheckbox = `${this.searchFilters} ul[id^="facet"] label.facet-label input[type="checkbox"]`;
-    this.searchFiltersRadio = `${this.searchFilters} ul[id^="facet"] label.facet-label input[type="radio"]`;
-    this.searchFiltersDropdown = `${this.searchFilters} ul[id^="facet"] .facet-dropdown`;
+    this.searchFilter = (facetType: string) => `${this.searchFilters} section[data-type="${facetType}] ul[id^="facet"]`;
+    this.searchFiltersCheckbox = (facetType: string) => `${this.searchFilter(facetType)} label.facet-label `
+      + 'input[type="checkbox"]';
+    this.searchFiltersRadio = (facetType: string) => `${this.searchFilter(facetType)} label.facet-label input[type="radio"]`;
+    this.searchFiltersDropdown = (facetType: string) => `${this.searchFilter(facetType)} .facet-dropdown`;
 
     // Wishlist
     this.wishlistModal = '.wishlist-add-to .wishlist-modal.show';
@@ -386,28 +390,31 @@ class Category extends FOBasePage {
   /**
    * Return if search filters use checkbox button
    * @param page {Page} Browser tab
+   * @param facetType {string} Facet type
    * @return {Promise<boolean>}
    */
-  async isSearchFiltersCheckbox(page: Page): Promise<boolean> {
-    return page.$$eval(this.searchFiltersCheckbox, (all) => all.length !== 0);
+  async isSearchFiltersCheckbox(page: Page, facetType: string): Promise<boolean> {
+    return page.$$eval(this.searchFiltersCheckbox(facetType), (all) => all.length !== 0);
   }
 
   /**
    * Return if search filters use radio button
    * @param page {Page} Browser tab
+   * @param facetType {string} Facet type
    * @return {Promise<boolean>}
    */
-  async isSearchFilterRadio(page: Page): Promise<boolean> {
-    return page.$$eval(this.searchFiltersRadio, (all) => all.length !== 0);
+  async isSearchFilterRadio(page: Page, facetType: string): Promise<boolean> {
+    return page.$$eval(this.searchFiltersRadio(facetType), (all) => all.length !== 0);
   }
 
   /**
    * Return if search filters use radio button
    * @param page {Page} Browser tab
+   * @param facetType {string} Facet type
    * @return {Promise<boolean>}
    */
-  async isSearchFilterDropdown(page: Page): Promise<boolean> {
-    return page.$$eval(this.searchFiltersDropdown, (all) => all.length !== 0);
+  async isSearchFilterDropdown(page: Page, facetType: string): Promise<boolean> {
+    return page.$$eval(this.searchFiltersDropdown(facetType), (all) => all.length !== 0);
   }
 
   /**

From 06e2f376d6275c2f519f5423b6189782f12c9ea9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Aug 2023 09:14:15 +0000
Subject: [PATCH 0835/1030] Bump @typescript-eslint/eslint-plugin from 6.4.0 to
 6.4.1 in /tests/UI

Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 6.4.0 to 6.4.1.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.4.1/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 234 ++++++++++++++++++-------------------
 tests/UI/package.json      |   2 +-
 2 files changed, 118 insertions(+), 118 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index 94f67092ffa2c..1cdd5356d6d51 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -33,7 +33,7 @@
         "@types/libsodium-wrappers": "^0.7.10",
         "@types/mocha": "^10.0.1",
         "@types/mochawesome": "^6.2.1",
-        "@typescript-eslint/eslint-plugin": "^6.4.0",
+        "@typescript-eslint/eslint-plugin": "^6.4.1",
         "@typescript-eslint/parser": "^6.4.1",
         "babel-eslint": "^10.1.0",
         "eslint": "^8.48.0",
@@ -541,16 +541,16 @@
       "dev": true
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.4.0.tgz",
-      "integrity": "sha512-62o2Hmc7Gs3p8SLfbXcipjWAa6qk2wZGChXG2JbBtYpwSRmti/9KHLqfbLs9uDigOexG+3PaQ9G2g3201FWLKg==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.4.1.tgz",
+      "integrity": "sha512-3F5PtBzUW0dYlq77Lcqo13fv+58KDwUib3BddilE8ajPJT+faGgxmI9Sw+I8ZS22BYwoir9ZhNXcLi+S+I2bkw==",
       "dev": true,
       "dependencies": {
         "@eslint-community/regexpp": "^4.5.1",
-        "@typescript-eslint/scope-manager": "6.4.0",
-        "@typescript-eslint/type-utils": "6.4.0",
-        "@typescript-eslint/utils": "6.4.0",
-        "@typescript-eslint/visitor-keys": "6.4.0",
+        "@typescript-eslint/scope-manager": "6.4.1",
+        "@typescript-eslint/type-utils": "6.4.1",
+        "@typescript-eslint/utils": "6.4.1",
+        "@typescript-eslint/visitor-keys": "6.4.1",
         "debug": "^4.3.4",
         "graphemer": "^1.4.0",
         "ignore": "^5.2.4",
@@ -576,13 +576,13 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.4.0.tgz",
-      "integrity": "sha512-TUS7vaKkPWDVvl7GDNHFQMsMruD+zhkd3SdVW0d7b+7Zo+bd/hXJQ8nsiUZMi1jloWo6c9qt3B7Sqo+flC1nig==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.4.1.tgz",
+      "integrity": "sha512-p/OavqOQfm4/Hdrr7kvacOSFjwQ2rrDVJRPxt/o0TOWdFnjJptnjnZ+sYDR7fi4OimvIuKp+2LCkc+rt9fIW+A==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.4.0",
-        "@typescript-eslint/visitor-keys": "6.4.0"
+        "@typescript-eslint/types": "6.4.1",
+        "@typescript-eslint/visitor-keys": "6.4.1"
       },
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -593,9 +593,9 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.0.tgz",
-      "integrity": "sha512-+FV9kVFrS7w78YtzkIsNSoYsnOtrYVnKWSTVXoL1761CsCRv5wpDOINgsXpxD67YCLZtVQekDDyaxfjVWUJmmg==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.1.tgz",
+      "integrity": "sha512-zAAopbNuYu++ijY1GV2ylCsQsi3B8QvfPHVqhGdDcbx/NK5lkqMnCGU53amAjccSpk+LfeONxwzUhDzArSfZJg==",
       "dev": true,
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -606,13 +606,13 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.4.0.tgz",
-      "integrity": "sha512-iDPJArf/K2sxvjOR6skeUCNgHR/tCQXBsa+ee1/clRKr3olZjZ/dSkXPZjG6YkPtnW6p5D1egeEPMCW6Gn4yLA==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.4.1.tgz",
+      "integrity": "sha512-xF6Y7SatVE/OyV93h1xGgfOkHr2iXuo8ip0gbfzaKeGGuKiAnzS+HtVhSPx8Www243bwlW8IF7X0/B62SzFftg==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.4.0",
-        "@typescript-eslint/visitor-keys": "6.4.0",
+        "@typescript-eslint/types": "6.4.1",
+        "@typescript-eslint/visitor-keys": "6.4.1",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -633,17 +633,17 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.4.0.tgz",
-      "integrity": "sha512-BvvwryBQpECPGo8PwF/y/q+yacg8Hn/2XS+DqL/oRsOPK+RPt29h5Ui5dqOKHDlbXrAeHUTnyG3wZA0KTDxRZw==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.4.1.tgz",
+      "integrity": "sha512-F/6r2RieNeorU0zhqZNv89s9bDZSovv3bZQpUNOmmQK1L80/cV4KEu95YUJWi75u5PhboFoKUJBnZ4FQcoqhDw==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "@types/json-schema": "^7.0.12",
         "@types/semver": "^7.5.0",
-        "@typescript-eslint/scope-manager": "6.4.0",
-        "@typescript-eslint/types": "6.4.0",
-        "@typescript-eslint/typescript-estree": "6.4.0",
+        "@typescript-eslint/scope-manager": "6.4.1",
+        "@typescript-eslint/types": "6.4.1",
+        "@typescript-eslint/typescript-estree": "6.4.1",
         "semver": "^7.5.4"
       },
       "engines": {
@@ -658,12 +658,12 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.0.tgz",
-      "integrity": "sha512-yJSfyT+uJm+JRDWYRYdCm2i+pmvXJSMtPR9Cq5/XQs4QIgNoLcoRtDdzsLbLsFM/c6um6ohQkg/MLxWvoIndJA==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.1.tgz",
+      "integrity": "sha512-y/TyRJsbZPkJIZQXrHfdnxVnxyKegnpEvnRGNam7s3TRR2ykGefEWOhaef00/UUN3IZxizS7BTO3svd3lCOJRQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.4.0",
+        "@typescript-eslint/types": "6.4.1",
         "eslint-visitor-keys": "^3.4.1"
       },
       "engines": {
@@ -818,13 +818,13 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.4.0.tgz",
-      "integrity": "sha512-TvqrUFFyGY0cX3WgDHcdl2/mMCWCDv/0thTtx/ODMY1QhEiyFtv/OlLaNIiYLwRpAxAtOLOY9SUf1H3Q3dlwAg==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.4.1.tgz",
+      "integrity": "sha512-7ON8M8NXh73SGZ5XvIqWHjgX2f+vvaOarNliGhjrJnv1vdjG0LVIz+ToYfPirOoBi56jxAKLfsLm40+RvxVVXA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "6.4.0",
-        "@typescript-eslint/utils": "6.4.0",
+        "@typescript-eslint/typescript-estree": "6.4.1",
+        "@typescript-eslint/utils": "6.4.1",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.0.1"
       },
@@ -845,13 +845,13 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/scope-manager": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.4.0.tgz",
-      "integrity": "sha512-TUS7vaKkPWDVvl7GDNHFQMsMruD+zhkd3SdVW0d7b+7Zo+bd/hXJQ8nsiUZMi1jloWo6c9qt3B7Sqo+flC1nig==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.4.1.tgz",
+      "integrity": "sha512-p/OavqOQfm4/Hdrr7kvacOSFjwQ2rrDVJRPxt/o0TOWdFnjJptnjnZ+sYDR7fi4OimvIuKp+2LCkc+rt9fIW+A==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.4.0",
-        "@typescript-eslint/visitor-keys": "6.4.0"
+        "@typescript-eslint/types": "6.4.1",
+        "@typescript-eslint/visitor-keys": "6.4.1"
       },
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -862,9 +862,9 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.0.tgz",
-      "integrity": "sha512-+FV9kVFrS7w78YtzkIsNSoYsnOtrYVnKWSTVXoL1761CsCRv5wpDOINgsXpxD67YCLZtVQekDDyaxfjVWUJmmg==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.1.tgz",
+      "integrity": "sha512-zAAopbNuYu++ijY1GV2ylCsQsi3B8QvfPHVqhGdDcbx/NK5lkqMnCGU53amAjccSpk+LfeONxwzUhDzArSfZJg==",
       "dev": true,
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -875,13 +875,13 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.4.0.tgz",
-      "integrity": "sha512-iDPJArf/K2sxvjOR6skeUCNgHR/tCQXBsa+ee1/clRKr3olZjZ/dSkXPZjG6YkPtnW6p5D1egeEPMCW6Gn4yLA==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.4.1.tgz",
+      "integrity": "sha512-xF6Y7SatVE/OyV93h1xGgfOkHr2iXuo8ip0gbfzaKeGGuKiAnzS+HtVhSPx8Www243bwlW8IF7X0/B62SzFftg==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.4.0",
-        "@typescript-eslint/visitor-keys": "6.4.0",
+        "@typescript-eslint/types": "6.4.1",
+        "@typescript-eslint/visitor-keys": "6.4.1",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -902,17 +902,17 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.4.0.tgz",
-      "integrity": "sha512-BvvwryBQpECPGo8PwF/y/q+yacg8Hn/2XS+DqL/oRsOPK+RPt29h5Ui5dqOKHDlbXrAeHUTnyG3wZA0KTDxRZw==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.4.1.tgz",
+      "integrity": "sha512-F/6r2RieNeorU0zhqZNv89s9bDZSovv3bZQpUNOmmQK1L80/cV4KEu95YUJWi75u5PhboFoKUJBnZ4FQcoqhDw==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "@types/json-schema": "^7.0.12",
         "@types/semver": "^7.5.0",
-        "@typescript-eslint/scope-manager": "6.4.0",
-        "@typescript-eslint/types": "6.4.0",
-        "@typescript-eslint/typescript-estree": "6.4.0",
+        "@typescript-eslint/scope-manager": "6.4.1",
+        "@typescript-eslint/types": "6.4.1",
+        "@typescript-eslint/typescript-estree": "6.4.1",
         "semver": "^7.5.4"
       },
       "engines": {
@@ -927,12 +927,12 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.0.tgz",
-      "integrity": "sha512-yJSfyT+uJm+JRDWYRYdCm2i+pmvXJSMtPR9Cq5/XQs4QIgNoLcoRtDdzsLbLsFM/c6um6ohQkg/MLxWvoIndJA==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.1.tgz",
+      "integrity": "sha512-y/TyRJsbZPkJIZQXrHfdnxVnxyKegnpEvnRGNam7s3TRR2ykGefEWOhaef00/UUN3IZxizS7BTO3svd3lCOJRQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.4.0",
+        "@typescript-eslint/types": "6.4.1",
         "eslint-visitor-keys": "^3.4.1"
       },
       "engines": {
@@ -8381,16 +8381,16 @@
       "dev": true
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.4.0.tgz",
-      "integrity": "sha512-62o2Hmc7Gs3p8SLfbXcipjWAa6qk2wZGChXG2JbBtYpwSRmti/9KHLqfbLs9uDigOexG+3PaQ9G2g3201FWLKg==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.4.1.tgz",
+      "integrity": "sha512-3F5PtBzUW0dYlq77Lcqo13fv+58KDwUib3BddilE8ajPJT+faGgxmI9Sw+I8ZS22BYwoir9ZhNXcLi+S+I2bkw==",
       "dev": true,
       "requires": {
         "@eslint-community/regexpp": "^4.5.1",
-        "@typescript-eslint/scope-manager": "6.4.0",
-        "@typescript-eslint/type-utils": "6.4.0",
-        "@typescript-eslint/utils": "6.4.0",
-        "@typescript-eslint/visitor-keys": "6.4.0",
+        "@typescript-eslint/scope-manager": "6.4.1",
+        "@typescript-eslint/type-utils": "6.4.1",
+        "@typescript-eslint/utils": "6.4.1",
+        "@typescript-eslint/visitor-keys": "6.4.1",
         "debug": "^4.3.4",
         "graphemer": "^1.4.0",
         "ignore": "^5.2.4",
@@ -8400,29 +8400,29 @@
       },
       "dependencies": {
         "@typescript-eslint/scope-manager": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.4.0.tgz",
-          "integrity": "sha512-TUS7vaKkPWDVvl7GDNHFQMsMruD+zhkd3SdVW0d7b+7Zo+bd/hXJQ8nsiUZMi1jloWo6c9qt3B7Sqo+flC1nig==",
+          "version": "6.4.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.4.1.tgz",
+          "integrity": "sha512-p/OavqOQfm4/Hdrr7kvacOSFjwQ2rrDVJRPxt/o0TOWdFnjJptnjnZ+sYDR7fi4OimvIuKp+2LCkc+rt9fIW+A==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.4.0",
-            "@typescript-eslint/visitor-keys": "6.4.0"
+            "@typescript-eslint/types": "6.4.1",
+            "@typescript-eslint/visitor-keys": "6.4.1"
           }
         },
         "@typescript-eslint/types": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.0.tgz",
-          "integrity": "sha512-+FV9kVFrS7w78YtzkIsNSoYsnOtrYVnKWSTVXoL1761CsCRv5wpDOINgsXpxD67YCLZtVQekDDyaxfjVWUJmmg==",
+          "version": "6.4.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.1.tgz",
+          "integrity": "sha512-zAAopbNuYu++ijY1GV2ylCsQsi3B8QvfPHVqhGdDcbx/NK5lkqMnCGU53amAjccSpk+LfeONxwzUhDzArSfZJg==",
           "dev": true
         },
         "@typescript-eslint/typescript-estree": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.4.0.tgz",
-          "integrity": "sha512-iDPJArf/K2sxvjOR6skeUCNgHR/tCQXBsa+ee1/clRKr3olZjZ/dSkXPZjG6YkPtnW6p5D1egeEPMCW6Gn4yLA==",
+          "version": "6.4.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.4.1.tgz",
+          "integrity": "sha512-xF6Y7SatVE/OyV93h1xGgfOkHr2iXuo8ip0gbfzaKeGGuKiAnzS+HtVhSPx8Www243bwlW8IF7X0/B62SzFftg==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.4.0",
-            "@typescript-eslint/visitor-keys": "6.4.0",
+            "@typescript-eslint/types": "6.4.1",
+            "@typescript-eslint/visitor-keys": "6.4.1",
             "debug": "^4.3.4",
             "globby": "^11.1.0",
             "is-glob": "^4.0.3",
@@ -8431,27 +8431,27 @@
           }
         },
         "@typescript-eslint/utils": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.4.0.tgz",
-          "integrity": "sha512-BvvwryBQpECPGo8PwF/y/q+yacg8Hn/2XS+DqL/oRsOPK+RPt29h5Ui5dqOKHDlbXrAeHUTnyG3wZA0KTDxRZw==",
+          "version": "6.4.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.4.1.tgz",
+          "integrity": "sha512-F/6r2RieNeorU0zhqZNv89s9bDZSovv3bZQpUNOmmQK1L80/cV4KEu95YUJWi75u5PhboFoKUJBnZ4FQcoqhDw==",
           "dev": true,
           "requires": {
             "@eslint-community/eslint-utils": "^4.4.0",
             "@types/json-schema": "^7.0.12",
             "@types/semver": "^7.5.0",
-            "@typescript-eslint/scope-manager": "6.4.0",
-            "@typescript-eslint/types": "6.4.0",
-            "@typescript-eslint/typescript-estree": "6.4.0",
+            "@typescript-eslint/scope-manager": "6.4.1",
+            "@typescript-eslint/types": "6.4.1",
+            "@typescript-eslint/typescript-estree": "6.4.1",
             "semver": "^7.5.4"
           }
         },
         "@typescript-eslint/visitor-keys": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.0.tgz",
-          "integrity": "sha512-yJSfyT+uJm+JRDWYRYdCm2i+pmvXJSMtPR9Cq5/XQs4QIgNoLcoRtDdzsLbLsFM/c6um6ohQkg/MLxWvoIndJA==",
+          "version": "6.4.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.1.tgz",
+          "integrity": "sha512-y/TyRJsbZPkJIZQXrHfdnxVnxyKegnpEvnRGNam7s3TRR2ykGefEWOhaef00/UUN3IZxizS7BTO3svd3lCOJRQ==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.4.0",
+            "@typescript-eslint/types": "6.4.1",
             "eslint-visitor-keys": "^3.4.1"
           }
         },
@@ -8536,41 +8536,41 @@
       }
     },
     "@typescript-eslint/type-utils": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.4.0.tgz",
-      "integrity": "sha512-TvqrUFFyGY0cX3WgDHcdl2/mMCWCDv/0thTtx/ODMY1QhEiyFtv/OlLaNIiYLwRpAxAtOLOY9SUf1H3Q3dlwAg==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.4.1.tgz",
+      "integrity": "sha512-7ON8M8NXh73SGZ5XvIqWHjgX2f+vvaOarNliGhjrJnv1vdjG0LVIz+ToYfPirOoBi56jxAKLfsLm40+RvxVVXA==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/typescript-estree": "6.4.0",
-        "@typescript-eslint/utils": "6.4.0",
+        "@typescript-eslint/typescript-estree": "6.4.1",
+        "@typescript-eslint/utils": "6.4.1",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.0.1"
       },
       "dependencies": {
         "@typescript-eslint/scope-manager": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.4.0.tgz",
-          "integrity": "sha512-TUS7vaKkPWDVvl7GDNHFQMsMruD+zhkd3SdVW0d7b+7Zo+bd/hXJQ8nsiUZMi1jloWo6c9qt3B7Sqo+flC1nig==",
+          "version": "6.4.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.4.1.tgz",
+          "integrity": "sha512-p/OavqOQfm4/Hdrr7kvacOSFjwQ2rrDVJRPxt/o0TOWdFnjJptnjnZ+sYDR7fi4OimvIuKp+2LCkc+rt9fIW+A==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.4.0",
-            "@typescript-eslint/visitor-keys": "6.4.0"
+            "@typescript-eslint/types": "6.4.1",
+            "@typescript-eslint/visitor-keys": "6.4.1"
           }
         },
         "@typescript-eslint/types": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.0.tgz",
-          "integrity": "sha512-+FV9kVFrS7w78YtzkIsNSoYsnOtrYVnKWSTVXoL1761CsCRv5wpDOINgsXpxD67YCLZtVQekDDyaxfjVWUJmmg==",
+          "version": "6.4.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.1.tgz",
+          "integrity": "sha512-zAAopbNuYu++ijY1GV2ylCsQsi3B8QvfPHVqhGdDcbx/NK5lkqMnCGU53amAjccSpk+LfeONxwzUhDzArSfZJg==",
           "dev": true
         },
         "@typescript-eslint/typescript-estree": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.4.0.tgz",
-          "integrity": "sha512-iDPJArf/K2sxvjOR6skeUCNgHR/tCQXBsa+ee1/clRKr3olZjZ/dSkXPZjG6YkPtnW6p5D1egeEPMCW6Gn4yLA==",
+          "version": "6.4.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.4.1.tgz",
+          "integrity": "sha512-xF6Y7SatVE/OyV93h1xGgfOkHr2iXuo8ip0gbfzaKeGGuKiAnzS+HtVhSPx8Www243bwlW8IF7X0/B62SzFftg==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.4.0",
-            "@typescript-eslint/visitor-keys": "6.4.0",
+            "@typescript-eslint/types": "6.4.1",
+            "@typescript-eslint/visitor-keys": "6.4.1",
             "debug": "^4.3.4",
             "globby": "^11.1.0",
             "is-glob": "^4.0.3",
@@ -8579,27 +8579,27 @@
           }
         },
         "@typescript-eslint/utils": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.4.0.tgz",
-          "integrity": "sha512-BvvwryBQpECPGo8PwF/y/q+yacg8Hn/2XS+DqL/oRsOPK+RPt29h5Ui5dqOKHDlbXrAeHUTnyG3wZA0KTDxRZw==",
+          "version": "6.4.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.4.1.tgz",
+          "integrity": "sha512-F/6r2RieNeorU0zhqZNv89s9bDZSovv3bZQpUNOmmQK1L80/cV4KEu95YUJWi75u5PhboFoKUJBnZ4FQcoqhDw==",
           "dev": true,
           "requires": {
             "@eslint-community/eslint-utils": "^4.4.0",
             "@types/json-schema": "^7.0.12",
             "@types/semver": "^7.5.0",
-            "@typescript-eslint/scope-manager": "6.4.0",
-            "@typescript-eslint/types": "6.4.0",
-            "@typescript-eslint/typescript-estree": "6.4.0",
+            "@typescript-eslint/scope-manager": "6.4.1",
+            "@typescript-eslint/types": "6.4.1",
+            "@typescript-eslint/typescript-estree": "6.4.1",
             "semver": "^7.5.4"
           }
         },
         "@typescript-eslint/visitor-keys": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.0.tgz",
-          "integrity": "sha512-yJSfyT+uJm+JRDWYRYdCm2i+pmvXJSMtPR9Cq5/XQs4QIgNoLcoRtDdzsLbLsFM/c6um6ohQkg/MLxWvoIndJA==",
+          "version": "6.4.1",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.1.tgz",
+          "integrity": "sha512-y/TyRJsbZPkJIZQXrHfdnxVnxyKegnpEvnRGNam7s3TRR2ykGefEWOhaef00/UUN3IZxizS7BTO3svd3lCOJRQ==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.4.0",
+            "@typescript-eslint/types": "6.4.1",
             "eslint-visitor-keys": "^3.4.1"
           }
         },
diff --git a/tests/UI/package.json b/tests/UI/package.json
index 19676ef554c19..910b3abeb1d58 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -126,7 +126,7 @@
     "@types/libsodium-wrappers": "^0.7.10",
     "@types/mocha": "^10.0.1",
     "@types/mochawesome": "^6.2.1",
-    "@typescript-eslint/eslint-plugin": "^6.4.0",
+    "@typescript-eslint/eslint-plugin": "^6.4.1",
     "@typescript-eslint/parser": "^6.4.1",
     "babel-eslint": "^10.1.0",
     "eslint": "^8.48.0",

From f83fa0a7a4cce832400f759f46062ab963fad302 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Mon, 28 Aug 2023 11:16:38 +0200
Subject: [PATCH 0836/1030] Functional Tests : BO - Catalog - Products : Header
 (Fixed Check TS)

---
 .../functional/WS/02_productsCRUD.ts          |  8 +--
 .../pages/BO/catalog/productsV2/add/index.ts  | 53 ++-----------------
 .../BO/catalog/productsV2/add/pricingTab.ts   |  2 +-
 3 files changed, 10 insertions(+), 53 deletions(-)

diff --git a/tests/UI/campaigns/functional/WS/02_productsCRUD.ts b/tests/UI/campaigns/functional/WS/02_productsCRUD.ts
index e54ecb513ee5c..4ebec0254441b 100644
--- a/tests/UI/campaigns/functional/WS/02_productsCRUD.ts
+++ b/tests/UI/campaigns/functional/WS/02_productsCRUD.ts
@@ -521,11 +521,11 @@ describe('WS - Products : CRUD', async () => {
             await testContext.addContextItem(this, 'testIdentifier', 'postCheckName', baseContext);
 
             const xmlValueEn = productXml.getAttributeLangValue(xmlCreate, 'name', '1');
-            const valueEn = (await createProductsPage.getProductName(page, 1));
+            const valueEn = (await createProductsPage.getProductName(page, 'en'));
             expect(valueEn).to.eq(xmlValueEn);
 
             const xmlValueFr = productXml.getAttributeLangValue(xmlCreate, 'name', '2');
-            const valueFr = (await createProductsPage.getProductName(page, 2));
+            const valueFr = (await createProductsPage.getProductName(page, 'fr'));
             expect(valueFr).to.eq(xmlValueFr);
           });
         });
@@ -1187,11 +1187,11 @@ describe('WS - Products : CRUD', async () => {
             await testContext.addContextItem(this, 'testIdentifier', 'putCheckName', baseContext);
 
             const xmlValueEn = productXml.getAttributeLangValue(xmlUpdate, 'name', '1');
-            const valueEn = (await createProductsPage.getProductName(page, 1));
+            const valueEn = (await createProductsPage.getProductName(page, 'en'));
             expect(valueEn).to.eq(xmlValueEn);
 
             const xmlValueFr = productXml.getAttributeLangValue(xmlUpdate, 'name', '2');
-            const valueFr = (await createProductsPage.getProductName(page, 2));
+            const valueFr = (await createProductsPage.getProductName(page, 'fr'));
             expect(valueFr).to.eq(xmlValueFr);
           });
         });
diff --git a/tests/UI/pages/BO/catalog/productsV2/add/index.ts b/tests/UI/pages/BO/catalog/productsV2/add/index.ts
index 5711ddcd4c6db..60abf0585f963 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/index.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/index.ts
@@ -115,7 +115,7 @@ class CreateProduct extends BOBasePage {
     this.productTypePreview = '.product-type-preview';
     this.productTypePreviewLabel = `${this.productTypePreview}-label`;
     this.productTypeLabel = '.product-type-preview-label';
-    this.productActiveSwitchButton = '#product_header_active_1';
+    this.productActiveSwitchButton = (status: number) => `#product_header_active_${status}`;
     this.productHeaderSummary = '.product-header-summary';
     this.productHeaderTaxExcluded = `${this.productHeaderSummary} div[data-role=price-tax-excluded]`;
     this.productHeaderTaxIncluded = `${this.productHeaderSummary} div[data-role=price-tax-included]`;
@@ -443,57 +443,14 @@ class CreateProduct extends BOBasePage {
     return !(await this.elementNotVisible(page, `${productsPage.modalCreateProduct} iframe`, 1000));
   }
 
-  /**
-   * Go to a tab
-   * @param page {Page} Browser tab
-   * @param tabName {'description'|'details'|'options'|'pricing'|'seo'|'shipping'|'stock'} Name of the tab
-   * @returns {Promise<void>}
-   */
-  async goToTab(page: Page, tabName: 'description'|'details'|'options'|'pricing'|'seo'|'shipping'|'stock') : Promise<void> {
-    await this.waitForSelectorAndClick(page, this.tabLink(tabName));
-    await this.waitForVisibleSelector(page, `${this.tabLink(tabName)} a.active`, 2000);
-  }
-
-  /**
-   * Is Tab active
-   * @param page {Page} Browser tab
-   * @param tabName {'description'|'details'|'options'|'pricing'|'seo'|'shipping'|'stock'} Name of the tab
-   * @returns {Promise<boolean>}
-   */
-  async isTabActive(page: Page, tabName: 'description'|'details'|'options'|'pricing'|'seo'|'shipping'|'stock'): Promise<boolean> {
-    return this.elementVisible(page, `${this.tabLink(tabName)} a.active`, 2000);
-  }
-
-  /**
-   * Return the product type
-   * @param page {Page} Browser tab
-   * @returns {Promise<string>}
-   */
-  async getProductType(page: Page): Promise<string> {
-    const typeLabel = await this.getTextContent(page, this.productTypeLabel);
-
-    switch (typeLabel) {
-      case 'Standard product':
-        return 'standard';
-      case 'Product with combinations':
-        return 'combinations';
-      case 'Pack of products':
-        return 'pack';
-      case 'Virtual product':
-        return 'virtual';
-      default:
-        throw new Error(`Type ${typeLabel} is not defined`);
-    }
-  }
-
   /**
    * Return the product name
    * @param page {Page} Browser tab
-   * @param languageId {number} Language ID
+   * @param locale {string} Locale
    * @returns {Promise<string>}
    */
-  async getProductName(page: Page, languageId: number = 1): Promise<string> {
-    return this.getAttributeContent(page, this.productNameInput(languageId), 'value');
+  async getProductName(page: Page, locale: string = 'en'): Promise<string> {
+    return this.getAttributeContent(page, this.productNameInput(locale), 'value');
   }
 
   /**
@@ -502,7 +459,7 @@ class CreateProduct extends BOBasePage {
    * @returns {Promise<boolean>}
    */
   async getProductStatus(page: Page): Promise<boolean> {
-    return this.isChecked(page, this.productActiveSwitchButton);
+    return this.isChecked(page, this.productActiveSwitchButton(1));
   }
 }
 
diff --git a/tests/UI/pages/BO/catalog/productsV2/add/pricingTab.ts b/tests/UI/pages/BO/catalog/productsV2/add/pricingTab.ts
index d46e8398ed095..79471fa538dd4 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/pricingTab.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/pricingTab.ts
@@ -108,7 +108,7 @@ class PricingTab extends BOBasePage {
       case 'on_sale':
         return (await this.isChecked(page, this.onSaleCheckbox)) ? '1' : '0';
       case 'price':
-        return this.getAttributeContent(page, this.retailPriceInput, 'value');
+        return this.getAttributeContent(page, this.retailPriceInputTaxExcl, 'value');
       case 'unit_price':
         return this.getAttributeContent(page, this.unitPriceInput, 'value');
       case 'unity':

From 7679f8bb077a3610eaf3005152c55cd238eabca0 Mon Sep 17 00:00:00 2001
From: tleon <thomas.leone@prestashop.com>
Date: Mon, 24 Jul 2023 09:22:10 +0200
Subject: [PATCH 0837/1030]  feat(api): add endpoint with complexe custom type

---
 .../ApiPlatform/Resources/CustomerGroup.php   | 78 +++++++++++++++++++
 .../ApiPlatform/PostCustomerTest.php          | 77 ++++++++++++++++++
 2 files changed, 155 insertions(+)
 create mode 100644 src/PrestaShopBundle/ApiPlatform/Resources/CustomerGroup.php
 create mode 100644 tests/Integration/ApiPlatform/PostCustomerTest.php

diff --git a/src/PrestaShopBundle/ApiPlatform/Resources/CustomerGroup.php b/src/PrestaShopBundle/ApiPlatform/Resources/CustomerGroup.php
new file mode 100644
index 0000000000000..0bfb099200ba4
--- /dev/null
+++ b/src/PrestaShopBundle/ApiPlatform/Resources/CustomerGroup.php
@@ -0,0 +1,78 @@
+<?php
+
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\ApiPlatform\Resources;
+
+use ApiPlatform\Metadata\ApiProperty;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Post;
+use PrestaShop\Decimal\DecimalNumber;
+use PrestaShop\PrestaShop\Core\Domain\Customer\Group\Command\AddCustomerGroupCommand;
+use PrestaShopBundle\ApiPlatform\Processor\CommandProcessor;
+
+#[ApiResource(
+    operations: [
+        new Post(
+            uriTemplate: '/customers/group',
+            provider: CommandProcessor::class,
+            extraProperties: [
+                'command' => AddCustomerGroupCommand::class,
+            ],
+        ),
+    ]
+)]
+class CustomerGroup
+{
+    /**
+     * @param string[] $localizedNames
+     * @param int[] $shopIds
+     */
+    public function __construct(
+        #[ApiProperty(
+            example: 'array<string>',
+        )]
+        public array $localizedNames,
+        #[ApiProperty(
+            openapiContext: [
+                'example' => [
+                    'exponent' => 'int',
+                    'number' => 'string',
+                ],
+            ],
+        )]
+        public DecimalNumber $reductionPercent,
+        public bool $displayPriceTaxExcluded,
+        public bool $showPrice,
+        #[ApiProperty(
+            example: 'array<int>',
+        )]
+        public array $shopIds
+    ) {
+    }
+}
diff --git a/tests/Integration/ApiPlatform/PostCustomerTest.php b/tests/Integration/ApiPlatform/PostCustomerTest.php
new file mode 100644
index 0000000000000..dbe1b427a143c
--- /dev/null
+++ b/tests/Integration/ApiPlatform/PostCustomerTest.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace Tests\Integration\ApiPlatform;
+
+use ApiPlatform\Symfony\Bundle\Test\ApiTestCase;
+use Tests\Resources\DatabaseDump;
+
+class PostCustomerTest extends ApiTestCase
+{
+    public static function setUpBeforeClass(): void
+    {
+        parent::setUpBeforeClass();
+        DatabaseDump::restoreTables(['group']);
+    }
+
+    public function testAddCustomerGroup(): void
+    {
+        $bearerToken = $this->getBearerToken();
+        static::createClient()->request('POST', '/new-api/customers/group', [
+            'auth_bearer' => $bearerToken,
+            'json' => [
+                'localizedNames' => [
+                    'test1',
+                    'test2',
+                ],
+                'reductionPercent' => [
+                    'number' => '10',
+                    'exponent' => 1,
+                ],
+                'displayPriceTaxExcluded' => true,
+                'showPrice' => true,
+                'shopIds' => [1],
+            ],
+        ]);
+        self::assertResponseStatusCodeSame(201);
+    }
+
+    private function getBearerToken(): string
+    {
+        $parameters = ['parameters' => [
+            'client_id' => 'my_client_id',
+            'client_secret' => 'prestashop',
+            'grant_type' => 'client_credentials',
+        ]];
+        $options = ['extra' => $parameters];
+        $response = static::createClient()->request('POST', '/api/oauth2/token', $options);
+
+        return json_decode($response->getContent())->access_token;
+    }
+}

From 8c850052b716b9cfee92636f4fc8acaa3633f227 Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Fri, 11 Aug 2023 17:38:16 +0200
Subject: [PATCH 0838/1030] Use serializer in CommandProcessor

---
 .../Processor/CommandProcessor.php            | 39 ++++++++++++-------
 .../ApiPlatform/Provider/QueryProvider.php    | 12 ++++--
 .../ApiPlatform/Resources/CustomerGroup.php   | 39 +++++--------------
 .../ApiPlatform/PostCustomerTest.php          |  1 -
 4 files changed, 43 insertions(+), 48 deletions(-)

diff --git a/src/PrestaShopBundle/ApiPlatform/Processor/CommandProcessor.php b/src/PrestaShopBundle/ApiPlatform/Processor/CommandProcessor.php
index 83bc9b2039a3d..a50cd99e758e8 100644
--- a/src/PrestaShopBundle/ApiPlatform/Processor/CommandProcessor.php
+++ b/src/PrestaShopBundle/ApiPlatform/Processor/CommandProcessor.php
@@ -31,32 +31,41 @@
 use ApiPlatform\Metadata\Operation;
 use ApiPlatform\State\ProcessorInterface;
 use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
+use PrestaShopBundle\ApiPlatform\Exception\NoExtraPropertiesFoundException;
+use Symfony\Component\Serializer\Serializer;
 
 class CommandProcessor implements ProcessorInterface
 {
-    /**
-     * @var CommandBusInterface
-     */
-    private $commandBus;
-
     /**
      * @param CommandBusInterface $commandBus
+     * @param Serializer $apiPlatformSerializer
      */
-    public function __construct(CommandBusInterface $commandBus)
-    {
-        $this->commandBus = $commandBus;
+    public function __construct(
+        private readonly CommandBusInterface $commandBus,
+        private readonly Serializer $apiPlatformSerializer
+    ) {
     }
 
+    /**
+     * @param $data
+     * @param Operation $operation
+     * @param array $uriVariables
+     * @param array $context
+     *
+     * @return void
+     *
+     * @throws NoExtraPropertiesFoundException
+     * @throws \Symfony\Component\Serializer\Exception\ExceptionInterface
+     */
     public function process($data, Operation $operation, array $uriVariables = [], array $context = [])
     {
-        $command = $operation->getExtraProperties()['command'];
-        $reflectionMethod = new \ReflectionMethod($command, '__construct');
-        $constructParameters = $reflectionMethod->getParameters();
-        $parameters = [];
-        foreach ($constructParameters as $parameter) {
-            $parameters[] = $data->{$parameter->name};
+        $commandClass = $operation->getExtraProperties()['command'] ?? null;
+
+        if (null === $commandClass) {
+            throw new NoExtraPropertiesFoundException('Extra property "command" is not found');
         }
 
-        $this->commandBus->handle(new $command(...array_values($parameters)));
+        $command = $this->apiPlatformSerializer->denormalize($data, $commandClass);
+        $this->commandBus->handle($command);
     }
 }
diff --git a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
index dc145e16fa52d..218bc557da137 100644
--- a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
+++ b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
@@ -47,9 +47,15 @@ public function __construct(
     }
 
     /**
-     * @throws \ReflectionException
-     * @throws \Exception
+     * @param Operation $operation
+     * @param array $uriVariables
+     * @param array $context
+     *
+     * @return \ApiPlatform\State\Pagination\PartialPaginatorInterface|array|\ArrayObject|bool|float|int|mixed|string|null
+     *
      * @throws ExceptionInterface
+     * @throws NoExtraPropertiesFoundException
+     * @throws \ReflectionException
      */
     public function provide(Operation $operation, array $uriVariables = [], array $context = [])
     {
@@ -58,7 +64,7 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         $queryParameters = array_merge($uriVariables, $filters);
 
         if (null === $queryClass) {
-            throw new NoExtraPropertiesFoundException();
+            throw new NoExtraPropertiesFoundException('Extra property "query" is not found');
         }
 
         $query = $this->apiPlatformSerializer->denormalize($queryParameters, $queryClass);
diff --git a/src/PrestaShopBundle/ApiPlatform/Resources/CustomerGroup.php b/src/PrestaShopBundle/ApiPlatform/Resources/CustomerGroup.php
index 0bfb099200ba4..5423f27c64aa4 100644
--- a/src/PrestaShopBundle/ApiPlatform/Resources/CustomerGroup.php
+++ b/src/PrestaShopBundle/ApiPlatform/Resources/CustomerGroup.php
@@ -29,10 +29,8 @@
 
 namespace PrestaShopBundle\ApiPlatform\Resources;
 
-use ApiPlatform\Metadata\ApiProperty;
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\Post;
-use PrestaShop\Decimal\DecimalNumber;
 use PrestaShop\PrestaShop\Core\Domain\Customer\Group\Command\AddCustomerGroupCommand;
 use PrestaShopBundle\ApiPlatform\Processor\CommandProcessor;
 
@@ -40,7 +38,7 @@
     operations: [
         new Post(
             uriTemplate: '/customers/group',
-            provider: CommandProcessor::class,
+            processor: CommandProcessor::class,
             extraProperties: [
                 'command' => AddCustomerGroupCommand::class,
             ],
@@ -49,30 +47,13 @@
 )]
 class CustomerGroup
 {
-    /**
-     * @param string[] $localizedNames
-     * @param int[] $shopIds
-     */
-    public function __construct(
-        #[ApiProperty(
-            example: 'array<string>',
-        )]
-        public array $localizedNames,
-        #[ApiProperty(
-            openapiContext: [
-                'example' => [
-                    'exponent' => 'int',
-                    'number' => 'string',
-                ],
-            ],
-        )]
-        public DecimalNumber $reductionPercent,
-        public bool $displayPriceTaxExcluded,
-        public bool $showPrice,
-        #[ApiProperty(
-            example: 'array<int>',
-        )]
-        public array $shopIds
-    ) {
-    }
+    public array $localizedNames;
+
+    public array $reductionPercent;
+
+    public bool $displayPriceTaxExcluded;
+
+    public bool $showPrice;
+
+    public array $shopIds;
 }
diff --git a/tests/Integration/ApiPlatform/PostCustomerTest.php b/tests/Integration/ApiPlatform/PostCustomerTest.php
index dbe1b427a143c..8169744d7f12c 100644
--- a/tests/Integration/ApiPlatform/PostCustomerTest.php
+++ b/tests/Integration/ApiPlatform/PostCustomerTest.php
@@ -29,7 +29,6 @@
 
 namespace Tests\Integration\ApiPlatform;
 
-use ApiPlatform\Symfony\Bundle\Test\ApiTestCase;
 use Tests\Resources\DatabaseDump;
 
 class PostCustomerTest extends ApiTestCase

From acaaa0aa009e955a31a968419f88438482c75a3c Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Mon, 21 Aug 2023 16:56:25 +0200
Subject: [PATCH 0839/1030] Some adjustments after review

---
 .../Processor/CommandProcessor.php            |  5 +++--
 .../ApiPlatform/Provider/QueryProvider.php    | 19 +++++++++++--------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/PrestaShopBundle/ApiPlatform/Processor/CommandProcessor.php b/src/PrestaShopBundle/ApiPlatform/Processor/CommandProcessor.php
index a50cd99e758e8..f28a42e1bf18c 100644
--- a/src/PrestaShopBundle/ApiPlatform/Processor/CommandProcessor.php
+++ b/src/PrestaShopBundle/ApiPlatform/Processor/CommandProcessor.php
@@ -32,6 +32,7 @@
 use ApiPlatform\State\ProcessorInterface;
 use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
 use PrestaShopBundle\ApiPlatform\Exception\NoExtraPropertiesFoundException;
+use Symfony\Component\Serializer\Exception\ExceptionInterface;
 use Symfony\Component\Serializer\Serializer;
 
 class CommandProcessor implements ProcessorInterface
@@ -55,14 +56,14 @@ public function __construct(
      * @return void
      *
      * @throws NoExtraPropertiesFoundException
-     * @throws \Symfony\Component\Serializer\Exception\ExceptionInterface
+     * @throws ExceptionInterface
      */
     public function process($data, Operation $operation, array $uriVariables = [], array $context = [])
     {
         $commandClass = $operation->getExtraProperties()['command'] ?? null;
 
         if (null === $commandClass) {
-            throw new NoExtraPropertiesFoundException('Extra property "command" is not found');
+            throw new NoExtraPropertiesFoundException('Extra property "command" not found');
         }
 
         $command = $this->apiPlatformSerializer->denormalize($data, $commandClass);
diff --git a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
index 218bc557da137..652aea071178c 100644
--- a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
+++ b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
@@ -31,9 +31,12 @@
 use ApiPlatform\Metadata\CollectionOperationInterface;
 use ApiPlatform\Metadata\Operation;
 use ApiPlatform\State\ProviderInterface;
+use Exception;
 use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
 use PrestaShopBundle\ApiPlatform\Converters\ConverterInterface;
 use PrestaShopBundle\ApiPlatform\Exception\NoExtraPropertiesFoundException;
+use ReflectionException;
+use ReflectionMethod;
 use Symfony\Component\Serializer\Exception\ExceptionInterface;
 use Symfony\Component\Serializer\Serializer;
 
@@ -51,11 +54,11 @@ public function __construct(
      * @param array $uriVariables
      * @param array $context
      *
-     * @return \ApiPlatform\State\Pagination\PartialPaginatorInterface|array|\ArrayObject|bool|float|int|mixed|string|null
+     * @return mixed
      *
      * @throws ExceptionInterface
      * @throws NoExtraPropertiesFoundException
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
     public function provide(Operation $operation, array $uriVariables = [], array $context = [])
     {
@@ -64,7 +67,7 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         $queryParameters = array_merge($uriVariables, $filters);
 
         if (null === $queryClass) {
-            throw new NoExtraPropertiesFoundException('Extra property "query" is not found');
+            throw new NoExtraPropertiesFoundException('Extra property "query" not found');
         }
 
         $query = $this->apiPlatformSerializer->denormalize($queryParameters, $queryClass);
@@ -101,7 +104,7 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
      *
      * @return ConverterInterface
      *
-     * @throws \Exception
+     * @throws Exception
      */
     private function findConverter($type): ConverterInterface
     {
@@ -111,20 +114,20 @@ private function findConverter($type): ConverterInterface
             }
         }
 
-        throw new \Exception(sprintf('Converter for type %s not found', $type));
+        throw new Exception(sprintf('Converter for type %s not found', $type));
     }
 
     /**
      * @param $propertyName
      * @param $queryClass
      *
-     * @return false|\ReflectionMethod
+     * @return false|ReflectionMethod
      */
-    private function findSetterMethod($propertyName, $queryClass): bool|\ReflectionMethod
+    private function findSetterMethod($propertyName, $queryClass): bool|ReflectionMethod
     {
         $reflectionClass = new \ReflectionClass($queryClass);
 
-        foreach ($reflectionClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) {
+        foreach ($reflectionClass->getMethods(ReflectionMethod::IS_PUBLIC) as $method) {
             if (str_starts_with($method->getName(), 'set')) {
                 $methodName = lcfirst(substr($method->getName(), 3));
                 if ($methodName === $propertyName) {

From b1cd2b2719099e6dbb050e26ee6624a20c81e336 Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Fri, 25 Aug 2023 11:25:05 +0200
Subject: [PATCH 0840/1030] Refacto and allow usage of complex constructor
 types

---
 .../DecimalNumberDenormalizer.php}            |  15 ++-
 .../ObjectDenormalizer.php}                   |   9 +-
 .../Processor/CommandProcessor.php            |   8 +-
 .../ApiPlatform/Provider/QueryProvider.php    |  69 ++--------
 .../ApiPlatform/Resources/CustomerGroup.php   |   2 +-
 .../ApiPlatform/Serializer.php                | 122 ++++++++++++++++++
 .../config/services/bundle/new_api.yml        |   6 +-
 .../config/services/bundle/services.yml       |  11 +-
 .../ApiPlatform/PostCustomerTest.php          |   5 +-
 .../StateProvider/QueryProviderTest.php       |  17 +--
 10 files changed, 166 insertions(+), 98 deletions(-)
 rename src/PrestaShopBundle/ApiPlatform/{Converters/StringToIntConverter.php => Denormalizers/DecimalNumberDenormalizer.php} (69%)
 rename src/PrestaShopBundle/ApiPlatform/{Converters/ConverterInterface.php => Denormalizers/ObjectDenormalizer.php} (86%)
 create mode 100644 src/PrestaShopBundle/ApiPlatform/Serializer.php

diff --git a/src/PrestaShopBundle/ApiPlatform/Converters/StringToIntConverter.php b/src/PrestaShopBundle/ApiPlatform/Denormalizers/DecimalNumberDenormalizer.php
similarity index 69%
rename from src/PrestaShopBundle/ApiPlatform/Converters/StringToIntConverter.php
rename to src/PrestaShopBundle/ApiPlatform/Denormalizers/DecimalNumberDenormalizer.php
index dc2e5a497b019..b15f6a2a93a2a 100644
--- a/src/PrestaShopBundle/ApiPlatform/Converters/StringToIntConverter.php
+++ b/src/PrestaShopBundle/ApiPlatform/Denormalizers/DecimalNumberDenormalizer.php
@@ -26,17 +26,20 @@
 
 declare(strict_types=1);
 
-namespace PrestaShopBundle\ApiPlatform\Converters;
+namespace PrestaShopBundle\ApiPlatform\Denormalizers;
 
-class StringToIntConverter implements ConverterInterface
+use PrestaShop\Decimal\DecimalNumber;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+
+class DecimalNumberDenormalizer implements DenormalizerInterface
 {
-    public function convert(mixed $value): int
+    public function denormalize($data, string $type, string $format = null, array $context = [])
     {
-        return (int) $value;
+        return new DecimalNumber((string) $data);
     }
 
-    public function supports(string $type): bool
+    public function supportsDenormalization($data, string $type, string $format = null)
     {
-        return 'int' === $type;
+        return DecimalNumber::class === $type;
     }
 }
diff --git a/src/PrestaShopBundle/ApiPlatform/Converters/ConverterInterface.php b/src/PrestaShopBundle/ApiPlatform/Denormalizers/ObjectDenormalizer.php
similarity index 86%
rename from src/PrestaShopBundle/ApiPlatform/Converters/ConverterInterface.php
rename to src/PrestaShopBundle/ApiPlatform/Denormalizers/ObjectDenormalizer.php
index e3d8ea028b3c7..87a7203d180fd 100644
--- a/src/PrestaShopBundle/ApiPlatform/Converters/ConverterInterface.php
+++ b/src/PrestaShopBundle/ApiPlatform/Denormalizers/ObjectDenormalizer.php
@@ -26,11 +26,10 @@
 
 declare(strict_types=1);
 
-namespace PrestaShopBundle\ApiPlatform\Converters;
+namespace PrestaShopBundle\ApiPlatform\Denormalizers;
 
-interface ConverterInterface
-{
-    public function convert(mixed $value);
+use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
 
-    public function supports(string $type);
+class ObjectDenormalizer extends ObjectNormalizer
+{
 }
diff --git a/src/PrestaShopBundle/ApiPlatform/Processor/CommandProcessor.php b/src/PrestaShopBundle/ApiPlatform/Processor/CommandProcessor.php
index f28a42e1bf18c..54df73fb9d4e6 100644
--- a/src/PrestaShopBundle/ApiPlatform/Processor/CommandProcessor.php
+++ b/src/PrestaShopBundle/ApiPlatform/Processor/CommandProcessor.php
@@ -32,8 +32,9 @@
 use ApiPlatform\State\ProcessorInterface;
 use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
 use PrestaShopBundle\ApiPlatform\Exception\NoExtraPropertiesFoundException;
+use PrestaShopBundle\ApiPlatform\Serializer;
+use ReflectionException;
 use Symfony\Component\Serializer\Exception\ExceptionInterface;
-use Symfony\Component\Serializer\Serializer;
 
 class CommandProcessor implements ProcessorInterface
 {
@@ -43,7 +44,7 @@ class CommandProcessor implements ProcessorInterface
      */
     public function __construct(
         private readonly CommandBusInterface $commandBus,
-        private readonly Serializer $apiPlatformSerializer
+        private readonly Serializer $apiPlatformSerializer,
     ) {
     }
 
@@ -56,7 +57,7 @@ public function __construct(
      * @return void
      *
      * @throws NoExtraPropertiesFoundException
-     * @throws ExceptionInterface
+     * @throws ExceptionInterface|ReflectionException
      */
     public function process($data, Operation $operation, array $uriVariables = [], array $context = [])
     {
@@ -67,6 +68,7 @@ public function process($data, Operation $operation, array $uriVariables = [], a
         }
 
         $command = $this->apiPlatformSerializer->denormalize($data, $commandClass);
+
         $this->commandBus->handle($command);
     }
 }
diff --git a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
index 652aea071178c..d5d5f8d2884a9 100644
--- a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
+++ b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
@@ -31,21 +31,21 @@
 use ApiPlatform\Metadata\CollectionOperationInterface;
 use ApiPlatform\Metadata\Operation;
 use ApiPlatform\State\ProviderInterface;
-use Exception;
 use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
-use PrestaShopBundle\ApiPlatform\Converters\ConverterInterface;
 use PrestaShopBundle\ApiPlatform\Exception\NoExtraPropertiesFoundException;
+use PrestaShopBundle\ApiPlatform\Serializer;
 use ReflectionException;
-use ReflectionMethod;
 use Symfony\Component\Serializer\Exception\ExceptionInterface;
-use Symfony\Component\Serializer\Serializer;
 
 class QueryProvider implements ProviderInterface
 {
+    /**
+     * @param CommandBusInterface $queryBus
+     * @param Serializer $apiPlatformSerializer
+     */
     public function __construct(
         private readonly CommandBusInterface $queryBus,
-        private readonly iterable $converters,
-        private readonly Serializer $apiPlatformSerializer
+        private readonly Serializer $apiPlatformSerializer,
     ) {
     }
 
@@ -60,7 +60,7 @@ public function __construct(
      * @throws NoExtraPropertiesFoundException
      * @throws ReflectionException
      */
-    public function provide(Operation $operation, array $uriVariables = [], array $context = [])
+    public function provide(Operation $operation, array $uriVariables = [], array $context = []): mixed
     {
         $queryClass = $operation->getExtraProperties()['query'] ?? null;
         $filters = $context['filters'] ?? [];
@@ -72,20 +72,9 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
 
         $query = $this->apiPlatformSerializer->denormalize($queryParameters, $queryClass);
 
-        //Try to call setter on additional query params
-        if (count($queryParameters)) {
-            foreach ($queryParameters as $param => $value) {
-                if ($reflectionMethod = $this->findSetterMethod($param, $queryClass)) {
-                    $methodParameter = $reflectionMethod->getParameters()[0];
-                    if ($methodParameter->getType() instanceof \ReflectionNamedType && $methodParameter->getType()->getName() !== gettype($value)) {
-                        $value = $this->findConverter($methodParameter->getType()->getName())->convert($value);
-                    }
-                    $reflectionMethod->invoke($query, $value);
-                }
-            }
-        }
-
         $queryResult = $this->queryBus->handle($query);
+
+        //Handle return type
         $normalizedQueryResult = $this->apiPlatformSerializer->normalize($queryResult);
 
         if ($operation instanceof CollectionOperationInterface) {
@@ -98,44 +87,4 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
 
         return $this->apiPlatformSerializer->denormalize($normalizedQueryResult, $operation->getClass());
     }
-
-    /**
-     * @param $type
-     *
-     * @return ConverterInterface
-     *
-     * @throws Exception
-     */
-    private function findConverter($type): ConverterInterface
-    {
-        foreach ($this->converters as $converter) {
-            if ($converter->supports($type)) {
-                return $converter;
-            }
-        }
-
-        throw new Exception(sprintf('Converter for type %s not found', $type));
-    }
-
-    /**
-     * @param $propertyName
-     * @param $queryClass
-     *
-     * @return false|ReflectionMethod
-     */
-    private function findSetterMethod($propertyName, $queryClass): bool|ReflectionMethod
-    {
-        $reflectionClass = new \ReflectionClass($queryClass);
-
-        foreach ($reflectionClass->getMethods(ReflectionMethod::IS_PUBLIC) as $method) {
-            if (str_starts_with($method->getName(), 'set')) {
-                $methodName = lcfirst(substr($method->getName(), 3));
-                if ($methodName === $propertyName) {
-                    return $method;
-                }
-            }
-        }
-
-        return false;
-    }
 }
diff --git a/src/PrestaShopBundle/ApiPlatform/Resources/CustomerGroup.php b/src/PrestaShopBundle/ApiPlatform/Resources/CustomerGroup.php
index 5423f27c64aa4..4ec420ddde876 100644
--- a/src/PrestaShopBundle/ApiPlatform/Resources/CustomerGroup.php
+++ b/src/PrestaShopBundle/ApiPlatform/Resources/CustomerGroup.php
@@ -49,7 +49,7 @@ class CustomerGroup
 {
     public array $localizedNames;
 
-    public array $reductionPercent;
+    public float $reductionPercent;
 
     public bool $displayPriceTaxExcluded;
 
diff --git a/src/PrestaShopBundle/ApiPlatform/Serializer.php b/src/PrestaShopBundle/ApiPlatform/Serializer.php
new file mode 100644
index 0000000000000..ec66c344152b0
--- /dev/null
+++ b/src/PrestaShopBundle/ApiPlatform/Serializer.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+declare(strict_types=1);
+
+namespace PrestaShopBundle\ApiPlatform;
+
+use ReflectionException;
+use ReflectionMethod;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+use Symfony\Component\Serializer\Serializer as SymfonySerializer;
+use Traversable;
+
+class Serializer implements NormalizerInterface, DenormalizerInterface
+{
+    private SymfonySerializer $serializer;
+
+    /**
+     * @param Traversable $normalizers
+     */
+    public function __construct(Traversable $normalizers)
+    {
+        $this->serializer = new SymfonySerializer(iterator_to_array($normalizers));
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @throws ReflectionException
+     */
+    public function denormalize($data, string $type, string $format = null, array $context = []): mixed
+    {
+        $action = $this->serializer->denormalize($data, $type, $format, $context);
+
+        //Try to call setters
+        foreach ($data as $param => $value) {
+            $parameters = [];
+            if ($reflectionMethod = $this->findSetterMethod($param, $type)) {
+                $methodParameters = $reflectionMethod->getParameters();
+                foreach ($methodParameters as $methodParameter) {
+                    $requestValue = is_array($value) ? $value[$methodParameter->getName()] : $value;
+                    if ($methodParameter->getType() instanceof \ReflectionNamedType && $methodParameter->getType()->getName() !== gettype($requestValue)) {
+                        $parameters[] = $this->serializer->denormalize($requestValue, $methodParameter->getType()->getName());
+                    }
+                }
+
+                $reflectionMethod->invoke($action, ...$parameters);
+            }
+        }
+
+        return $action;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function normalize($object, string $format = null, array $context = [])
+    {
+        return $this->serializer->normalize($object, $format, $context);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function supportsNormalization($data, string $format = null): bool
+    {
+        return $this->serializer->supportsNormalization($data, $format);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function supportsDenormalization($data, string $type, string $format = null): bool
+    {
+        return $this->serializer->supportsDenormalization($data, $type, $format);
+    }
+
+    /**
+     * @param $propertyName
+     * @param $queryClass
+     *
+     * @return false|ReflectionMethod
+     */
+    private function findSetterMethod($propertyName, $queryClass): bool|ReflectionMethod
+    {
+        $reflectionClass = new \ReflectionClass($queryClass);
+
+        foreach ($reflectionClass->getMethods(ReflectionMethod::IS_PUBLIC) as $method) {
+            if (str_starts_with($method->getName(), 'set')) {
+                $methodName = lcfirst(substr($method->getName(), 3));
+                if ($methodName === $propertyName) {
+                    return $method;
+                }
+            }
+        }
+
+        return false;
+    }
+}
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/new_api.yml b/src/PrestaShopBundle/Resources/config/services/bundle/new_api.yml
index 974f1a1f70975..67d73c268ac8f 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/new_api.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/new_api.yml
@@ -51,6 +51,6 @@ services:
     autowire: true
     autoconfigure: true
 
-  PrestaShopBundle\ApiPlatform\Converters\:
-    resource: "../../../../ApiPlatform/Converters/*"
-    tags: [ 'prestashop.api.converters' ]
+  PrestaShopBundle\ApiPlatform\Denormalizers\:
+    resource: "../../../../ApiPlatform/Denormalizers/*"
+    tags: [ 'prestashop.api.denormalizers' ]
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/services.yml b/src/PrestaShopBundle/Resources/config/services/bundle/services.yml
index 84e40cd5683a2..6dce13c1461a4 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/services.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/services.yml
@@ -110,7 +110,6 @@ services:
     autowire: true
     arguments:
       - '@prestashop.core.query_bus'
-      - !tagged prestashop.api.converters
 
   PrestaShopBundle\ApiPlatform\Processor\CommandProcessor:
     tags: [ 'api_platform.state_processor' ]
@@ -132,11 +131,7 @@ services:
 
   PrestaShop\PrestaShop\Core\Repository\TransactionManagerInterface: '@PrestaShopBundle\Service\Database\TransactionManager'
 
-  Symfony\Component\Serializer\Serializer $apiPlatformSerializer:
-    class: Symfony\Component\Serializer\Serializer
+  PrestaShopBundle\ApiPlatform\Serializer $apiPlatformSerializer:
+    class: PrestaShopBundle\ApiPlatform\Serializer
     arguments:
-      $normalizers:
-        - '@prestashop.api_platform.property_normalizer'
-
-  prestashop.api_platform.property_normalizer:
-    class: Symfony\Component\Serializer\Normalizer\ObjectNormalizer
+      [ !tagged prestashop.api.denormalizers ]
diff --git a/tests/Integration/ApiPlatform/PostCustomerTest.php b/tests/Integration/ApiPlatform/PostCustomerTest.php
index 8169744d7f12c..0c53c57ad3a7a 100644
--- a/tests/Integration/ApiPlatform/PostCustomerTest.php
+++ b/tests/Integration/ApiPlatform/PostCustomerTest.php
@@ -49,10 +49,7 @@ public function testAddCustomerGroup(): void
                     'test1',
                     'test2',
                 ],
-                'reductionPercent' => [
-                    'number' => '10',
-                    'exponent' => 1,
-                ],
+                'reductionPercent' => 10,
                 'displayPriceTaxExcluded' => true,
                 'showPrice' => true,
                 'shopIds' => [1],
diff --git a/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php b/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
index ca8d04ecabd14..091d3e06d4192 100644
--- a/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
+++ b/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
@@ -39,14 +39,14 @@
 use PrestaShop\PrestaShop\Core\Domain\Hook\QueryResult\HookStatus;
 use PrestaShop\PrestaShop\Core\Domain\Product\Query\SearchProducts;
 use PrestaShop\PrestaShop\Core\Domain\Product\QueryResult\FoundProduct;
-use PrestaShopBundle\ApiPlatform\Converters\StringToIntConverter;
+use PrestaShopBundle\ApiPlatform\Denormalizers\DecimalNumberDenormalizer;
 use PrestaShopBundle\ApiPlatform\Exception\NoExtraPropertiesFoundException;
 use PrestaShopBundle\ApiPlatform\Provider\QueryProvider;
 use PrestaShopBundle\ApiPlatform\Resources\FoundProduct as FoundProductDto;
 use PrestaShopBundle\ApiPlatform\Resources\Hook;
+use PrestaShopBundle\ApiPlatform\Serializer;
 use RuntimeException;
 use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
-use Symfony\Component\Serializer\Serializer;
 
 class QueryProviderTest extends TestCase
 {
@@ -65,7 +65,8 @@ class QueryProviderTest extends TestCase
      */
     public function setUp(): void
     {
-        $this->serializer = new Serializer([new ObjectNormalizer()]);
+        $denormalizers = new \ArrayIterator([new DecimalNumberDenormalizer(), new ObjectNormalizer()]);
+        $this->serializer = new Serializer($denormalizers);
         $this->queryBus = $this->createMock(CommandBusInterface::class);
         $this->queryBus
             ->method('handle')
@@ -85,7 +86,7 @@ public function setUp(): void
 
     public function testProvideHookStatus(): void
     {
-        $hookStatusProvider = new QueryProvider($this->queryBus, [new StringToIntConverter()], $this->serializer);
+        $hookStatusProvider = new QueryProvider($this->queryBus, $this->serializer);
         $get = new Get();
         $get = $get
             ->withExtraProperties(['query' => GetHookStatus::class])
@@ -100,7 +101,7 @@ public function testProvideHookStatus(): void
 
     public function testProvideHook(): void
     {
-        $hookStatusProvider = new QueryProvider($this->queryBus, [new StringToIntConverter()], $this->serializer);
+        $hookStatusProvider = new QueryProvider($this->queryBus, $this->serializer);
         $get = new Get();
         $get = $get
             ->withExtraProperties(['query' => GetHook::class])
@@ -121,7 +122,7 @@ public function testProvideHook(): void
 
     public function testSearchProduct(): void
     {
-        $searchProductProvider = new QueryProvider($this->queryBus, [new StringToIntConverter()], $this->serializer);
+        $searchProductProvider = new QueryProvider($this->queryBus, $this->serializer);
         $get = new GetCollection();
         $get = $get
             ->withExtraProperties(['query' => SearchProducts::class])
@@ -129,14 +130,14 @@ public function testSearchProduct(): void
         $searchProducts = $searchProductProvider->provide($get, ['phrase' => 'mug', 'resultsLimit' => 10, 'isoCode' => 'EUR']);
         self::assertCount(1, $searchProducts);
 
-        $searchProductProvider = new QueryProvider($this->queryBus, [new StringToIntConverter()], $this->serializer);
+        $searchProductProvider = new QueryProvider($this->queryBus, $this->serializer);
         $searchProducts = $searchProductProvider->provide($get, ['phrase' => 'search with order id', 'resultsLimit' => 10, 'isoCode' => 'EUR'], ['filters' => ['orderId' => 1]]);
         self::assertCount(0, $searchProducts);
     }
 
     public function testProvideNoQueryThrowsException(): void
     {
-        $hookStatusProvider = new QueryProvider($this->queryBus, [new StringToIntConverter()], $this->serializer);
+        $hookStatusProvider = new QueryProvider($this->queryBus, $this->serializer);
         $get = new Get();
 
         $this->expectException(NoExtraPropertiesFoundException::class);

From bd094c1403f791c6f6ddcef22a941e662b5612e1 Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime-flasquin.ext@prestashop.com>
Date: Fri, 25 Aug 2023 18:40:04 +0200
Subject: [PATCH 0841/1030] Update
 tests/Integration/ApiPlatform/PostCustomerTest.php

Co-authored-by: Mathieu Ferment <mathieu.ferment@prestashop.com>
---
 tests/Integration/ApiPlatform/PostCustomerTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Integration/ApiPlatform/PostCustomerTest.php b/tests/Integration/ApiPlatform/PostCustomerTest.php
index 0c53c57ad3a7a..b6c4a7c939d5a 100644
--- a/tests/Integration/ApiPlatform/PostCustomerTest.php
+++ b/tests/Integration/ApiPlatform/PostCustomerTest.php
@@ -49,7 +49,7 @@ public function testAddCustomerGroup(): void
                     'test1',
                     'test2',
                 ],
-                'reductionPercent' => 10,
+                'reductionPercent' => 10.3,
                 'displayPriceTaxExcluded' => true,
                 'showPrice' => true,
                 'shopIds' => [1],

From 523fd64b21ee514b1922b17e1c3d404c7cc5cfd1 Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Mon, 28 Aug 2023 12:03:50 +0200
Subject: [PATCH 0842/1030] Fix tests url changes after rebase

---
 tests/Integration/ApiPlatform/PostCustomerTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Integration/ApiPlatform/PostCustomerTest.php b/tests/Integration/ApiPlatform/PostCustomerTest.php
index b6c4a7c939d5a..e4b946e008cd5 100644
--- a/tests/Integration/ApiPlatform/PostCustomerTest.php
+++ b/tests/Integration/ApiPlatform/PostCustomerTest.php
@@ -42,7 +42,7 @@ public static function setUpBeforeClass(): void
     public function testAddCustomerGroup(): void
     {
         $bearerToken = $this->getBearerToken();
-        static::createClient()->request('POST', '/new-api/customers/group', [
+        static::createClient()->request('POST', '/api/customers/group', [
             'auth_bearer' => $bearerToken,
             'json' => [
                 'localizedNames' => [

From eae73fcb181c715585c736ff6d9117e16dbe465f Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Mon, 28 Aug 2023 12:37:00 +0200
Subject: [PATCH 0843/1030] Functional Tests : Faceted search module - Edit
 template - Product stock filter (Fixed selector)

---
 tests/UI/pages/FO/category/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/UI/pages/FO/category/index.ts b/tests/UI/pages/FO/category/index.ts
index 64ebd16dcd4a3..4df0c5866d9ce 100644
--- a/tests/UI/pages/FO/category/index.ts
+++ b/tests/UI/pages/FO/category/index.ts
@@ -134,7 +134,7 @@ class Category extends FOBasePage {
 
     // Filter
     this.searchFilters = '#search_filters';
-    this.searchFilter = (facetType: string) => `${this.searchFilters} section[data-type="${facetType}] ul[id^="facet"]`;
+    this.searchFilter = (facetType: string) => `${this.searchFilters} section[data-type="${facetType}"] ul[id^="facet"]`;
     this.searchFiltersCheckbox = (facetType: string) => `${this.searchFilter(facetType)} label.facet-label `
       + 'input[type="checkbox"]';
     this.searchFiltersRadio = (facetType: string) => `${this.searchFilter(facetType)} label.facet-label input[type="radio"]`;

From 414f38f487c83c608598da7e9d3ffd8b17f2087e Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Mon, 28 Aug 2023 13:22:37 +0200
Subject: [PATCH 0844/1030] Functional Tests : Faceted search module - Edit
 template - Product stock filter (Search filters are displayed)

---
 .../02_configuration/14_editTemplateProductStockFilter.ts       | 2 +-
 .../02_configuration/15_editTemplateProductBrandFilter.ts       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/UI/campaigns/modules/ps_facetedsearch/02_configuration/14_editTemplateProductStockFilter.ts b/tests/UI/campaigns/modules/ps_facetedsearch/02_configuration/14_editTemplateProductStockFilter.ts
index c36f347eed52d..38d7c61fab3d5 100644
--- a/tests/UI/campaigns/modules/ps_facetedsearch/02_configuration/14_editTemplateProductStockFilter.ts
+++ b/tests/UI/campaigns/modules/ps_facetedsearch/02_configuration/14_editTemplateProductStockFilter.ts
@@ -77,7 +77,7 @@ describe('Faceted search module - Edit template - Product stock filter', async (
     {
       filterStatus: false,
       filterType: '',
-      expectedHasSearchFilters: false,
+      expectedHasSearchFilters: true,
       expectedIsSearchFilterRadio: false,
       expectedIsSearchFilterDropdown: false,
       expectedIsSearchFilterCheckbox: false,
diff --git a/tests/UI/campaigns/modules/ps_facetedsearch/02_configuration/15_editTemplateProductBrandFilter.ts b/tests/UI/campaigns/modules/ps_facetedsearch/02_configuration/15_editTemplateProductBrandFilter.ts
index 828f0e5612855..aa7294579651f 100644
--- a/tests/UI/campaigns/modules/ps_facetedsearch/02_configuration/15_editTemplateProductBrandFilter.ts
+++ b/tests/UI/campaigns/modules/ps_facetedsearch/02_configuration/15_editTemplateProductBrandFilter.ts
@@ -77,7 +77,7 @@ describe('Faceted search module - Edit template - Product brand filter', async (
     {
       filterStatus: false,
       filterType: '',
-      expectedHasSearchFilters: false,
+      expectedHasSearchFilters: true,
       expectedIsSearchFilterRadio: false,
       expectedIsSearchFilterDropdown: false,
       expectedIsSearchFilterCheckbox: false,

From 4258e877f8ad9508e69d318f1b75fec60d98072d Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Mon, 28 Aug 2023 16:45:32 +0200
Subject: [PATCH 0845/1030] Functional Tests : BO - Catalog - Products : Footer

---
 .../productV2/functional/09_footer.ts         | 97 +++++++++++++++++++
 1 file changed, 97 insertions(+)
 create mode 100644 tests/UI/campaigns/productV2/functional/09_footer.ts

diff --git a/tests/UI/campaigns/productV2/functional/09_footer.ts b/tests/UI/campaigns/productV2/functional/09_footer.ts
new file mode 100644
index 0000000000000..0f4d04ae36923
--- /dev/null
+++ b/tests/UI/campaigns/productV2/functional/09_footer.ts
@@ -0,0 +1,97 @@
+// Import utils
+import helper from '@utils/helpers';
+import testContext from '@utils/testContext';
+
+// Import common tests
+import loginCommon from '@commonTests/BO/loginBO';
+
+// Import pages
+import dashboardPage from '@pages/BO/dashboard';
+import productsPage from '@pages/BO/catalog/productsV2';
+import createProductsPage from '@pages/BO/catalog/productsV2/add';
+
+// Import data
+import Products from '@data/demo/products';
+
+import type {BrowserContext, Page} from 'playwright';
+import {expect} from 'chai';
+
+const baseContext: string = 'productV2_functional_footer';
+
+describe('BO - Catalog - Products : Footer', async () => {
+  let browserContext: BrowserContext;
+  let page: Page;
+
+  // before and after functions
+  before(async function () {
+    browserContext = await helper.createBrowserContext(this.browser);
+    page = await helper.newTab(browserContext);
+  });
+
+  after(async () => {
+    await helper.closeBrowserContext(browserContext);
+  });
+
+  it('should login in BO', async function () {
+    await loginCommon.loginBO(this, page);
+  });
+
+  it('should go to \'Catalog > Products\' page', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'goToProductsPage', baseContext);
+
+    await dashboardPage.goToSubMenu(
+      page,
+      dashboardPage.catalogParentLink,
+      dashboardPage.productsLink,
+    );
+    await productsPage.closeSfToolBar(page);
+
+    const pageTitle = await productsPage.getPageTitle(page);
+    expect(pageTitle).to.contains(productsPage.pageTitle);
+  });
+
+  it(`should filter a product named "${Products.demo_12.name}"`, async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'filterProduct', baseContext);
+
+    await productsPage.filterProducts(page, 'product_name', Products.demo_12.name, 'input');
+
+    const numberOfProductsAfterFilter = await productsPage.getNumberOfProductsFromList(page);
+    expect(numberOfProductsAfterFilter).to.equal(1);
+
+    const textColumn = await productsPage.getTextColumn(page, 'product_name', 1);
+    expect(textColumn).to.equal(Products.demo_12.name);
+  });
+
+  it('should edit the product', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'goToEditPage', baseContext);
+
+    await productsPage.goToProductPage(page, 1);
+
+    const pageTitle: string = await createProductsPage.getPageTitle(page);
+    expect(pageTitle).to.contains(createProductsPage.pageTitle);
+  });
+
+  it('should duplicate the product', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'duplicateProduct', baseContext);
+
+    const textMessage = await createProductsPage.duplicateProduct(page);
+    expect(textMessage).to.equal(createProductsPage.successfulDuplicateMessage);
+  });
+
+  it('should check the duplicated product', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'checkDuplicatedProduct', baseContext);
+
+    const nameEN = await createProductsPage.getProductName(page, 'en');
+    expect(nameEN).to.equal(`copy of ${Products.demo_12.name}`);
+
+    const nameFR = await createProductsPage.getProductName(page, 'fr');
+    expect(nameFR).to.equal(`copie de ${Products.demo_12.name}`);
+  });
+
+  it('should delete the duplicated product', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'deleteDuplicatedProduct', baseContext);
+
+    const textMessage = await createProductsPage.deleteProduct(page);
+    expect(textMessage).to.equal(createProductsPage.successfulDeleteMessage);
+  });
+});

From 87bd1dcb279258111704522979d0211257e8dcbc Mon Sep 17 00:00:00 2001
From: Ibrahima SOW <ibrahima.sow@prestashop.com>
Date: Mon, 28 Aug 2023 11:49:34 +0000
Subject: [PATCH 0846/1030] Introduce alternative search panels same page links

---
 .../controllers/search/helpers/view/view.tpl        |  2 +-
 controllers/admin/AdminSearchController.php         |  1 +
 src/Core/Search/SearchPanel.php                     | 13 ++++++++++++-
 src/Core/Search/SearchPanelInterface.php            |  2 ++
 .../Controllers/AdminSearchControllerCoreTest.php   |  2 ++
 5 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/search/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/search/helpers/view/view.tpl
index 6bca9f03f123a..57f24c2ddf5e8 100644
--- a/admin-dev/themes/default/template/controllers/search/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/search/helpers/view/view.tpl
@@ -155,7 +155,7 @@ $(function() {
         <div class="col-lg-{if $searchPanels|@count <= 2}6{else}4{/if}">
             <div class="panel">
                 <h3>{$searchPanel.title}</h3>
-                <a href="{$searchPanel.link}" class="btn btn-default _blank">{$searchPanel.button_label}</a>
+                <a href="{$searchPanel.link}" class="btn btn-default{if !isset($searchPanel.same_page) || true !== $searchPanel.same_page} _blank{/if}">{$searchPanel.button_label}</a>
             </div>
         </div>
     {/foreach}
diff --git a/controllers/admin/AdminSearchController.php b/controllers/admin/AdminSearchController.php
index b836b5bfc3735..9356b50d2af6f 100644
--- a/controllers/admin/AdminSearchController.php
+++ b/controllers/admin/AdminSearchController.php
@@ -527,6 +527,7 @@ protected function getSearchPanels(string $searchedExpression): void
                 'title' => $searchPanel->getTitle(),
                 'button_label' => $searchPanel->getButtonLabel(),
                 'link' => $searchPanel->getLink(),
+                'same_page' => $searchPanel->isOnSamePage(),
             ];
         }
     }
diff --git a/src/Core/Search/SearchPanel.php b/src/Core/Search/SearchPanel.php
index 506bc5d10aa6d..2bda6a0480a33 100644
--- a/src/Core/Search/SearchPanel.php
+++ b/src/Core/Search/SearchPanel.php
@@ -49,17 +49,23 @@ class SearchPanel implements SearchPanelInterface
      * @var array
      */
     protected $queryParams;
+    /**
+     * @var bool|null
+     */
+    private $isOnSamePage;
 
     public function __construct(
         string $title,
         string $buttonLabel,
         string $link,
-        array $queryParams
+        array $queryParams,
+        ?bool $isOnSamePage = false
     ) {
         $this->title = $title;
         $this->buttonLabel = $buttonLabel;
         $this->link = $link;
         $this->queryParams = $queryParams;
+        $this->isOnSamePage = $isOnSamePage;
     }
 
     public function getTitle(): string
@@ -76,4 +82,9 @@ public function getLink(): string
     {
         return sprintf('%s?%s', $this->link, http_build_query($this->queryParams));
     }
+
+    public function isOnSamePage(): bool
+    {
+        return $this->isOnSamePage;
+    }
 }
diff --git a/src/Core/Search/SearchPanelInterface.php b/src/Core/Search/SearchPanelInterface.php
index 7e6f34e269169..08fcf8a5a2f4c 100644
--- a/src/Core/Search/SearchPanelInterface.php
+++ b/src/Core/Search/SearchPanelInterface.php
@@ -33,4 +33,6 @@ public function getTitle(): string;
     public function getButtonLabel(): string;
 
     public function getLink(): string;
+
+    public function isOnSamePage(): bool;
 }
diff --git a/tests/Integration/Controllers/AdminSearchControllerCoreTest.php b/tests/Integration/Controllers/AdminSearchControllerCoreTest.php
index f9e092348c447..26a8a617ce5a8 100644
--- a/tests/Integration/Controllers/AdminSearchControllerCoreTest.php
+++ b/tests/Integration/Controllers/AdminSearchControllerCoreTest.php
@@ -72,6 +72,7 @@ public function dataProviderSearch(): array
                             'title' => 'Search docs.prestashop-project.org',
                             'button_label' => 'Go to the documentation',
                             'link' => 'https://docs.prestashop-project.org/welcome/?q=',
+                            'same_page' => false,
                         ],
                     ],
                 ],
@@ -94,6 +95,7 @@ public function dataProviderSearch(): array
                             'title' => 'Search docs.prestashop-project.org',
                             'button_label' => 'Go to the documentation',
                             'link' => 'https://docs.prestashop-project.org/welcome/?q=orders',
+                            'same_page' => false,
                         ],
                     ],
                 ],

From 8624538de7edcb28709e4d53c48319e74c2f039a Mon Sep 17 00:00:00 2001
From: Ibrahima SOW <ibrahima.sow@prestashop.com>
Date: Tue, 29 Aug 2023 11:49:18 +0000
Subject: [PATCH 0847/1030] Add open_in_icon after target _blank links

---
 .../themes/default/scss/partials/_content.scss     | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/admin-dev/themes/default/scss/partials/_content.scss b/admin-dev/themes/default/scss/partials/_content.scss
index d7b292cf3abc8..2bc096ec955cc 100644
--- a/admin-dev/themes/default/scss/partials/_content.scss
+++ b/admin-dev/themes/default/scss/partials/_content.scss
@@ -383,3 +383,17 @@ body.display-modal {
     }
   }
 }
+
+div[data-role="search-panels"] {
+  .panel {
+    a[target="_blank"]::after {
+      position: relative;
+      top: 2px;
+      left: 10px;
+      font-family: "Material Icons", sans-serif;
+      color: #bbcdd2;
+      content: "\e89e";
+      opacity: 0.7;
+    }
+  }
+}

From ee83e0b76eea311c56bb0a0de519109a9a436916 Mon Sep 17 00:00:00 2001
From: Clotaire <52157233+clotairer@users.noreply.github.com>
Date: Tue, 29 Aug 2023 14:23:03 +0200
Subject: [PATCH 0848/1030] fix PDO prepare for  CVE-2023-39524

---
 .../Product/Repository/ProductRepository.php  | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/Adapter/Product/Repository/ProductRepository.php b/src/Adapter/Product/Repository/ProductRepository.php
index 1098ffc30835e..bf3e196280cad 100644
--- a/src/Adapter/Product/Repository/ProductRepository.php
+++ b/src/Adapter/Product/Repository/ProductRepository.php
@@ -889,26 +889,27 @@ protected function getSearchQueryBuilder(
             ->addGroupBy('p.id_product')
         ;
 
-        $dbSearchPhrase = sprintf('"%%%s%%"', pSQL($searchPhrase));
         $qb->where($qb->expr()->or(
-            $qb->expr()->like('pl.name', $dbSearchPhrase),
+            $qb->expr()->like('pl.name', ':dbSearchPhrase'),
 
             // Product references
-            $qb->expr()->like('p.isbn', $dbSearchPhrase),
-            $qb->expr()->like('p.upc', $dbSearchPhrase),
-            $qb->expr()->like('p.mpn', $dbSearchPhrase),
-            $qb->expr()->like('p.reference', $dbSearchPhrase),
-            $qb->expr()->like('p.ean13', $dbSearchPhrase),
-            $qb->expr()->like('p.supplier_reference', $dbSearchPhrase),
+            $qb->expr()->like('p.isbn', ':dbSearchPhrase'),
+            $qb->expr()->like('p.upc', ':dbSearchPhrase'),
+            $qb->expr()->like('p.mpn', ':dbSearchPhrase'),
+            $qb->expr()->like('p.reference', ':dbSearchPhrase'),
+            $qb->expr()->like('p.ean13', ':dbSearchPhrase'),
+            $qb->expr()->like('p.supplier_reference', ':dbSearchPhrase'),
 
             // Combination attributes
-            $qb->expr()->like('pa.isbn', $dbSearchPhrase),
-            $qb->expr()->like('pa.upc', $dbSearchPhrase),
-            $qb->expr()->like('pa.mpn', $dbSearchPhrase),
-            $qb->expr()->like('pa.reference', $dbSearchPhrase),
-            $qb->expr()->like('pa.ean13', $dbSearchPhrase),
-            $qb->expr()->like('pa.supplier_reference', $dbSearchPhrase)
+            $qb->expr()->like('pa.isbn', ':dbSearchPhrase'),
+            $qb->expr()->like('pa.upc', ':dbSearchPhrase'),
+            $qb->expr()->like('pa.mpn', ':dbSearchPhrase'),
+            $qb->expr()->like('pa.reference', ':dbSearchPhrase'),
+            $qb->expr()->like('pa.ean13', ':dbSearchPhrase'),
+            $qb->expr()->like('pa.supplier_reference', ':dbSearchPhrase')
         ));
+        $dbSearchPhrase = sprintf('%%%s%%', $searchPhrase);
+        $qb->setParameter(':dbSearchPhrase', $dbSearchPhrase);
 
         if (!empty($filters)) {
             foreach ($filters as $type => $filter) {

From e3e890afddcd7e6f3ffeb39519c45c41f971ec2c Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Tue, 29 Aug 2023 09:01:20 +0200
Subject: [PATCH 0849/1030] Nightly : Fixed
 campaigns/modules/ps_facetedsearch/02*/*

---
 .../14_editTemplateProductStockFilter.ts      | 24 +++++++++----------
 .../15_editTemplateProductBrandFilter.ts      | 24 +++++++++----------
 tests/UI/data/demo/modules.ts                 |  2 +-
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/tests/UI/campaigns/modules/ps_facetedsearch/02_configuration/14_editTemplateProductStockFilter.ts b/tests/UI/campaigns/modules/ps_facetedsearch/02_configuration/14_editTemplateProductStockFilter.ts
index 38d7c61fab3d5..44f98ddc6857c 100644
--- a/tests/UI/campaigns/modules/ps_facetedsearch/02_configuration/14_editTemplateProductStockFilter.ts
+++ b/tests/UI/campaigns/modules/ps_facetedsearch/02_configuration/14_editTemplateProductStockFilter.ts
@@ -54,14 +54,14 @@ describe('Faceted search module - Edit template - Product stock filter', async (
     await moduleManagerPage.closeSfToolBar(page);
 
     const pageTitle = await moduleManagerPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
+    expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
   });
 
   it(`should search the module ${Modules.psFacetedSearch.name}`, async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'searchModule', baseContext);
 
     const isModuleVisible = await moduleManagerPage.searchModule(page, Modules.psFacetedSearch);
-    await expect(isModuleVisible).to.be.true;
+    expect(isModuleVisible).to.be.eq(true);
   });
 
   it(`should go to the configuration page of the module '${Modules.psFacetedSearch.name}'`, async function () {
@@ -70,7 +70,7 @@ describe('Faceted search module - Edit template - Product stock filter', async (
     await moduleManagerPage.goToConfigurationPage(page, Modules.psFacetedSearch.tag);
 
     const pageTitle = await psFacetedSearch.getPageSubtitle(page);
-    await expect(pageTitle).to.eq(psFacetedSearch.pageSubTitle);
+    expect(pageTitle).to.eq(psFacetedSearch.pageSubTitle);
   });
 
   [
@@ -120,7 +120,7 @@ describe('Faceted search module - Edit template - Product stock filter', async (
       await psFacetedSearch.editFilterTemplate(page, 1);
 
       const pageTitle = await psFacetedSearchFilterTemplate.getPanelTitle(page);
-      await expect(pageTitle).to.eq(psFacetedSearchFilterTemplate.title);
+      expect(pageTitle).to.eq(psFacetedSearchFilterTemplate.title);
     });
 
     it(
@@ -135,7 +135,7 @@ describe('Faceted search module - Edit template - Product stock filter', async (
           test.filterStatus,
           test.filterType,
         );
-        await expect(textResult).to.match(/× Your filter "[-A-Za-z0-9\s]+" was updated successfully./);
+        expect(textResult).to.match(/× Your filter "[-A-Za-z0-9\s]+" was updated successfully./);
       });
 
     it('should view my shop', async function () {
@@ -144,7 +144,7 @@ describe('Faceted search module - Edit template - Product stock filter', async (
       page = await psFacetedSearch.viewMyShop(page);
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage).to.be.true;
+      expect(isHomePage).to.be.eq(true);
     });
 
     it('should check the "All products" page', async function () {
@@ -153,19 +153,19 @@ describe('Faceted search module - Edit template - Product stock filter', async (
       await homePage.goToAllProductsBlockPage(page, 1);
 
       const isCategoryPageVisible = await categoryPageFO.isCategoryPage(page);
-      await expect(isCategoryPageVisible).to.be.true;
+      expect(isCategoryPageVisible).to.be.eq(true);
 
       const hasSearchFilters = await categoryPageFO.hasSearchFilters(page);
-      await expect(hasSearchFilters).to.be.eq(test.expectedHasSearchFilters);
+      expect(hasSearchFilters).to.be.eq(test.expectedHasSearchFilters);
 
       const isSearchFilterRadio = await categoryPageFO.isSearchFilterRadio(page, 'availability');
-      await expect(isSearchFilterRadio).to.be.eq(test.expectedIsSearchFilterRadio);
+      expect(isSearchFilterRadio).to.be.eq(test.expectedIsSearchFilterRadio);
 
       const isSearchFilterDropdown = await categoryPageFO.isSearchFilterDropdown(page, 'availability');
-      await expect(isSearchFilterDropdown).to.be.eq(test.expectedIsSearchFilterDropdown);
+      expect(isSearchFilterDropdown).to.be.eq(test.expectedIsSearchFilterDropdown);
 
       const isSearchFiltersCheckbox = await categoryPageFO.isSearchFiltersCheckbox(page, 'availability');
-      await expect(isSearchFiltersCheckbox).to.be.eq(test.expectedIsSearchFilterCheckbox);
+      expect(isSearchFiltersCheckbox).to.be.eq(test.expectedIsSearchFilterCheckbox);
     });
 
     it('should close the page and return to the backOffice', async function () {
@@ -174,7 +174,7 @@ describe('Faceted search module - Edit template - Product stock filter', async (
       page = await categoryPageFO.closePage(browserContext, page, 0);
 
       const pageTitle = await psFacetedSearch.getPageSubtitle(page);
-      await expect(pageTitle).to.eq(psFacetedSearch.pageSubTitle);
+      expect(pageTitle).to.eq(psFacetedSearch.pageSubTitle);
     });
   });
 });
diff --git a/tests/UI/campaigns/modules/ps_facetedsearch/02_configuration/15_editTemplateProductBrandFilter.ts b/tests/UI/campaigns/modules/ps_facetedsearch/02_configuration/15_editTemplateProductBrandFilter.ts
index aa7294579651f..388729572554d 100644
--- a/tests/UI/campaigns/modules/ps_facetedsearch/02_configuration/15_editTemplateProductBrandFilter.ts
+++ b/tests/UI/campaigns/modules/ps_facetedsearch/02_configuration/15_editTemplateProductBrandFilter.ts
@@ -54,14 +54,14 @@ describe('Faceted search module - Edit template - Product brand filter', async (
     await moduleManagerPage.closeSfToolBar(page);
 
     const pageTitle = await moduleManagerPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
+    expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
   });
 
   it(`should search the module ${Modules.psFacetedSearch.name}`, async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'searchModule', baseContext);
 
     const isModuleVisible = await moduleManagerPage.searchModule(page, Modules.psFacetedSearch);
-    await expect(isModuleVisible).to.be.true;
+    expect(isModuleVisible).to.be.eq(true);
   });
 
   it(`should go to the configuration page of the module '${Modules.psFacetedSearch.name}'`, async function () {
@@ -70,7 +70,7 @@ describe('Faceted search module - Edit template - Product brand filter', async (
     await moduleManagerPage.goToConfigurationPage(page, Modules.psFacetedSearch.tag);
 
     const pageTitle = await psFacetedSearch.getPageSubtitle(page);
-    await expect(pageTitle).to.eq(psFacetedSearch.pageSubTitle);
+    expect(pageTitle).to.eq(psFacetedSearch.pageSubTitle);
   });
 
   [
@@ -120,7 +120,7 @@ describe('Faceted search module - Edit template - Product brand filter', async (
       await psFacetedSearch.editFilterTemplate(page, 1);
 
       const pageTitle = await psFacetedSearchFilterTemplate.getPanelTitle(page);
-      await expect(pageTitle).to.eq(psFacetedSearchFilterTemplate.title);
+      expect(pageTitle).to.eq(psFacetedSearchFilterTemplate.title);
     });
 
     it(
@@ -135,7 +135,7 @@ describe('Faceted search module - Edit template - Product brand filter', async (
           test.filterStatus,
           test.filterType,
         );
-        await expect(textResult).to.match(/× Your filter "[-A-Za-z0-9\s]+" was updated successfully./);
+        expect(textResult).to.match(/× Your filter "[-A-Za-z0-9\s]+" was updated successfully./);
       });
 
     it('should view my shop', async function () {
@@ -144,7 +144,7 @@ describe('Faceted search module - Edit template - Product brand filter', async (
       page = await psFacetedSearch.viewMyShop(page);
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage).to.be.true;
+      expect(isHomePage).to.be.eq(true);
     });
 
     it('should check the "All products" page', async function () {
@@ -153,19 +153,19 @@ describe('Faceted search module - Edit template - Product brand filter', async (
       await homePage.goToAllProductsBlockPage(page, 1);
 
       const isCategoryPageVisible = await categoryPageFO.isCategoryPage(page);
-      await expect(isCategoryPageVisible).to.be.true;
+      expect(isCategoryPageVisible).to.be.eq(true);
 
       const hasSearchFilters = await categoryPageFO.hasSearchFilters(page);
-      await expect(hasSearchFilters).to.be.eq(test.expectedHasSearchFilters);
+      expect(hasSearchFilters).to.be.eq(test.expectedHasSearchFilters);
 
       const isSearchFilterRadio = await categoryPageFO.isSearchFilterRadio(page, 'manufacturer');
-      await expect(isSearchFilterRadio).to.be.eq(test.expectedIsSearchFilterRadio);
+      expect(isSearchFilterRadio).to.be.eq(test.expectedIsSearchFilterRadio);
 
       const isSearchFilterDropdown = await categoryPageFO.isSearchFilterDropdown(page, 'manufacturer');
-      await expect(isSearchFilterDropdown).to.be.eq(test.expectedIsSearchFilterDropdown);
+      expect(isSearchFilterDropdown).to.be.eq(test.expectedIsSearchFilterDropdown);
 
       const isSearchFiltersCheckbox = await categoryPageFO.isSearchFiltersCheckbox(page, 'manufacturer');
-      await expect(isSearchFiltersCheckbox).to.be.eq(test.expectedIsSearchFilterCheckbox);
+      expect(isSearchFiltersCheckbox).to.be.eq(test.expectedIsSearchFilterCheckbox);
     });
 
     it('should close the page and return to the backOffice', async function () {
@@ -174,7 +174,7 @@ describe('Faceted search module - Edit template - Product brand filter', async (
       page = await categoryPageFO.closePage(browserContext, page, 0);
 
       const pageTitle = await psFacetedSearch.getPageSubtitle(page);
-      await expect(pageTitle).to.eq(psFacetedSearch.pageSubTitle);
+      expect(pageTitle).to.eq(psFacetedSearch.pageSubTitle);
     });
   });
 });
diff --git a/tests/UI/data/demo/modules.ts b/tests/UI/data/demo/modules.ts
index 1b4767ec3fd24..58faa03b0a58a 100644
--- a/tests/UI/data/demo/modules.ts
+++ b/tests/UI/data/demo/modules.ts
@@ -20,7 +20,7 @@ export default {
   psFacetedSearch: new ModuleData({
     tag: 'ps_facetedsearch',
     name: 'Faceted search',
-    releaseZip: 'https://github.com/PrestaShop/ps_facetedsearch/releases/download/v3.12.1/ps_facetedsearch.zip',
+    releaseZip: 'https://github.com/PrestaShop/ps_facetedsearch/releases/download/v3.13.1/ps_facetedsearch.zip',
   }),
   contactForm: new ModuleData({
     tag: 'contactform',

From 0445f306e8183b3b1ed95e8fcd45d5c9f15732b4 Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Tue, 29 Aug 2023 15:54:26 +0200
Subject: [PATCH 0850/1030] Fixes after review

---
 .../{Serializer.php => DomainSerializer.php}  |  8 +-
 .../DecimalNumberDenormalizer.php             | 12 ++-
 .../ObjectDenormalizer.php                    | 19 ++++-
 .../Processor/CommandProcessor.php            |  6 +-
 .../ApiPlatform/Provider/QueryProvider.php    |  6 +-
 .../config/services/bundle/new_api.yml        |  4 +-
 .../config/services/bundle/services.yml       |  4 +-
 .../ApiPlatform/PostCustomerTest.php          |  7 +-
 .../ApiPlatform/DomainSerializerTest.php      | 78 +++++++++++++++++++
 .../StateProvider/QueryProviderTest.php       | 14 ++--
 10 files changed, 132 insertions(+), 26 deletions(-)
 rename src/PrestaShopBundle/ApiPlatform/{Serializer.php => DomainSerializer.php} (95%)
 rename src/PrestaShopBundle/ApiPlatform/{Denormalizers => Normalizer}/DecimalNumberDenormalizer.php (87%)
 rename src/PrestaShopBundle/ApiPlatform/{Denormalizers => Normalizer}/ObjectDenormalizer.php (67%)
 create mode 100644 tests/Unit/PrestaShopBundle/ApiPlatform/DomainSerializerTest.php

diff --git a/src/PrestaShopBundle/ApiPlatform/Serializer.php b/src/PrestaShopBundle/ApiPlatform/DomainSerializer.php
similarity index 95%
rename from src/PrestaShopBundle/ApiPlatform/Serializer.php
rename to src/PrestaShopBundle/ApiPlatform/DomainSerializer.php
index ec66c344152b0..e3a2cf8e50730 100644
--- a/src/PrestaShopBundle/ApiPlatform/Serializer.php
+++ b/src/PrestaShopBundle/ApiPlatform/DomainSerializer.php
@@ -34,16 +34,16 @@
 use Symfony\Component\Serializer\Serializer as SymfonySerializer;
 use Traversable;
 
-class Serializer implements NormalizerInterface, DenormalizerInterface
+class DomainSerializer implements NormalizerInterface, DenormalizerInterface
 {
     private SymfonySerializer $serializer;
 
     /**
-     * @param Traversable $normalizers
+     * @param Traversable $denormalizers
      */
-    public function __construct(Traversable $normalizers)
+    public function __construct(Traversable $denormalizers)
     {
-        $this->serializer = new SymfonySerializer(iterator_to_array($normalizers));
+        $this->serializer = new SymfonySerializer(iterator_to_array($denormalizers));
     }
 
     /**
diff --git a/src/PrestaShopBundle/ApiPlatform/Denormalizers/DecimalNumberDenormalizer.php b/src/PrestaShopBundle/ApiPlatform/Normalizer/DecimalNumberDenormalizer.php
similarity index 87%
rename from src/PrestaShopBundle/ApiPlatform/Denormalizers/DecimalNumberDenormalizer.php
rename to src/PrestaShopBundle/ApiPlatform/Normalizer/DecimalNumberDenormalizer.php
index b15f6a2a93a2a..b5cf7362836e3 100644
--- a/src/PrestaShopBundle/ApiPlatform/Denormalizers/DecimalNumberDenormalizer.php
+++ b/src/PrestaShopBundle/ApiPlatform/Normalizer/DecimalNumberDenormalizer.php
@@ -26,7 +26,7 @@
 
 declare(strict_types=1);
 
-namespace PrestaShopBundle\ApiPlatform\Denormalizers;
+namespace PrestaShopBundle\ApiPlatform\Normalizer;
 
 use PrestaShop\Decimal\DecimalNumber;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
@@ -42,4 +42,14 @@ public function supportsDenormalization($data, string $type, string $format = nu
     {
         return DecimalNumber::class === $type;
     }
+
+    /**
+     * Set higher priority than ObjectDenormalizer.
+     *
+     * @return int
+     */
+    public static function getDefaultPriority(): int
+    {
+        return 10;
+    }
 }
diff --git a/src/PrestaShopBundle/ApiPlatform/Denormalizers/ObjectDenormalizer.php b/src/PrestaShopBundle/ApiPlatform/Normalizer/ObjectDenormalizer.php
similarity index 67%
rename from src/PrestaShopBundle/ApiPlatform/Denormalizers/ObjectDenormalizer.php
rename to src/PrestaShopBundle/ApiPlatform/Normalizer/ObjectDenormalizer.php
index 87a7203d180fd..95dcdf86ecaad 100644
--- a/src/PrestaShopBundle/ApiPlatform/Denormalizers/ObjectDenormalizer.php
+++ b/src/PrestaShopBundle/ApiPlatform/Normalizer/ObjectDenormalizer.php
@@ -26,10 +26,23 @@
 
 declare(strict_types=1);
 
-namespace PrestaShopBundle\ApiPlatform\Denormalizers;
+namespace PrestaShopBundle\ApiPlatform\Normalizer;
 
-use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
+use Symfony\Component\Serializer\Normalizer\ObjectNormalizer as SfObjectNormalizer;
 
-class ObjectDenormalizer extends ObjectNormalizer
+/**
+ * Used to be automatic injected in PrestaShopBundle/ApiPlatform/DomainSerializer::normalizers with
+ * prestashop.api.denormalizers tagged services.
+ */
+class ObjectDenormalizer extends SfObjectNormalizer
 {
+    /**
+     * ObjectDenormalizer must be the last denormalizer as a fallback.
+     *
+     * @return int
+     */
+    public static function getDefaultPriority(): int
+    {
+        return 1;
+    }
 }
diff --git a/src/PrestaShopBundle/ApiPlatform/Processor/CommandProcessor.php b/src/PrestaShopBundle/ApiPlatform/Processor/CommandProcessor.php
index 54df73fb9d4e6..87048ea8acd56 100644
--- a/src/PrestaShopBundle/ApiPlatform/Processor/CommandProcessor.php
+++ b/src/PrestaShopBundle/ApiPlatform/Processor/CommandProcessor.php
@@ -31,8 +31,8 @@
 use ApiPlatform\Metadata\Operation;
 use ApiPlatform\State\ProcessorInterface;
 use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
+use PrestaShopBundle\ApiPlatform\DomainSerializer;
 use PrestaShopBundle\ApiPlatform\Exception\NoExtraPropertiesFoundException;
-use PrestaShopBundle\ApiPlatform\Serializer;
 use ReflectionException;
 use Symfony\Component\Serializer\Exception\ExceptionInterface;
 
@@ -40,11 +40,11 @@ class CommandProcessor implements ProcessorInterface
 {
     /**
      * @param CommandBusInterface $commandBus
-     * @param Serializer $apiPlatformSerializer
+     * @param DomainSerializer $apiPlatformSerializer
      */
     public function __construct(
         private readonly CommandBusInterface $commandBus,
-        private readonly Serializer $apiPlatformSerializer,
+        private readonly DomainSerializer $apiPlatformSerializer,
     ) {
     }
 
diff --git a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
index d5d5f8d2884a9..62a82714bd6cd 100644
--- a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
+++ b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
@@ -32,8 +32,8 @@
 use ApiPlatform\Metadata\Operation;
 use ApiPlatform\State\ProviderInterface;
 use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
+use PrestaShopBundle\ApiPlatform\DomainSerializer;
 use PrestaShopBundle\ApiPlatform\Exception\NoExtraPropertiesFoundException;
-use PrestaShopBundle\ApiPlatform\Serializer;
 use ReflectionException;
 use Symfony\Component\Serializer\Exception\ExceptionInterface;
 
@@ -41,11 +41,11 @@ class QueryProvider implements ProviderInterface
 {
     /**
      * @param CommandBusInterface $queryBus
-     * @param Serializer $apiPlatformSerializer
+     * @param DomainSerializer $apiPlatformSerializer
      */
     public function __construct(
         private readonly CommandBusInterface $queryBus,
-        private readonly Serializer $apiPlatformSerializer,
+        private readonly DomainSerializer $apiPlatformSerializer,
     ) {
     }
 
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/new_api.yml b/src/PrestaShopBundle/Resources/config/services/bundle/new_api.yml
index 67d73c268ac8f..73e66b6d5a060 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/new_api.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/new_api.yml
@@ -51,6 +51,6 @@ services:
     autowire: true
     autoconfigure: true
 
-  PrestaShopBundle\ApiPlatform\Denormalizers\:
-    resource: "../../../../ApiPlatform/Denormalizers/*"
+  PrestaShopBundle\ApiPlatform\Normalizer\:
+    resource: "../../../../ApiPlatform/Normalizer/*"
     tags: [ 'prestashop.api.denormalizers' ]
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/services.yml b/src/PrestaShopBundle/Resources/config/services/bundle/services.yml
index 6dce13c1461a4..f66c099583e2c 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/services.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/services.yml
@@ -131,7 +131,7 @@ services:
 
   PrestaShop\PrestaShop\Core\Repository\TransactionManagerInterface: '@PrestaShopBundle\Service\Database\TransactionManager'
 
-  PrestaShopBundle\ApiPlatform\Serializer $apiPlatformSerializer:
-    class: PrestaShopBundle\ApiPlatform\Serializer
+  PrestaShopBundle\ApiPlatform\DomainSerializer $apiPlatformSerializer:
+    class: PrestaShopBundle\ApiPlatform\DomainSerializer
     arguments:
       [ !tagged prestashop.api.denormalizers ]
diff --git a/tests/Integration/ApiPlatform/PostCustomerTest.php b/tests/Integration/ApiPlatform/PostCustomerTest.php
index e4b946e008cd5..8c01f2c07d7f0 100644
--- a/tests/Integration/ApiPlatform/PostCustomerTest.php
+++ b/tests/Integration/ApiPlatform/PostCustomerTest.php
@@ -29,6 +29,8 @@
 
 namespace Tests\Integration\ApiPlatform;
 
+use Context;
+use Group;
 use Tests\Resources\DatabaseDump;
 
 class PostCustomerTest extends ApiTestCase
@@ -36,12 +38,14 @@ class PostCustomerTest extends ApiTestCase
     public static function setUpBeforeClass(): void
     {
         parent::setUpBeforeClass();
-        DatabaseDump::restoreTables(['group']);
+        DatabaseDump::restoreTables(['group', 'group_lang', 'group_reduction', 'group_shop', 'category_group']);
     }
 
     public function testAddCustomerGroup(): void
     {
         $bearerToken = $this->getBearerToken();
+
+        $numberOfGroups = count(Group::getGroups(Context::getContext()->language->id));
         static::createClient()->request('POST', '/api/customers/group', [
             'auth_bearer' => $bearerToken,
             'json' => [
@@ -56,6 +60,7 @@ public function testAddCustomerGroup(): void
             ],
         ]);
         self::assertResponseStatusCodeSame(201);
+        self::assertCount($numberOfGroups + 1, Group::getGroups(Context::getContext()->language->id));
     }
 
     private function getBearerToken(): string
diff --git a/tests/Unit/PrestaShopBundle/ApiPlatform/DomainSerializerTest.php b/tests/Unit/PrestaShopBundle/ApiPlatform/DomainSerializerTest.php
new file mode 100644
index 0000000000000..e12802ad3851a
--- /dev/null
+++ b/tests/Unit/PrestaShopBundle/ApiPlatform/DomainSerializerTest.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace Tests\Unit\PrestaShopBundle\ApiPlatform;
+
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use PrestaShop\PrestaShop\Core\Domain\Customer\Group\Command\AddCustomerGroupCommand;
+use PrestaShopBundle\ApiPlatform\DomainSerializer;
+use PrestaShopBundle\ApiPlatform\Normalizer\DecimalNumberDenormalizer;
+use PrestaShopBundle\ApiPlatform\Normalizer\ObjectDenormalizer;
+
+class DomainSerializerTest extends TestCase
+{
+    /**
+     * @var DomainSerializer|MockObject
+     */
+    private DomainSerializer|MockObject $serializer;
+
+    /**
+     * Set up dependencies for HookStatusProvider
+     */
+    public function setUp(): void
+    {
+        $denormalizers = new \ArrayIterator([new DecimalNumberDenormalizer(), new ObjectDenormalizer()]);
+        $this->serializer = new DomainSerializer($denormalizers);
+    }
+
+    /**
+     * @dataProvider getExpectedDenormalizedData
+     */
+    public function testDenormalize(array $arrayToDenormalize, $denormalizedClass): void
+    {
+        self::assertInstanceOf($denormalizedClass, $this->serializer->denormalize($arrayToDenormalize, $denormalizedClass));
+    }
+
+    public function getExpectedDenormalizedData()
+    {
+        yield [
+            [
+                'localizedNames' => [
+                    'test1',
+                    'test2',
+                ],
+                'reductionPercent' => 10.3,
+                'displayPriceTaxExcluded' => true,
+                'showPrice' => true,
+                'shopIds' => [1],
+            ],
+            AddCustomerGroupCommand::class,
+        ];
+    }
+}
diff --git a/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php b/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
index 091d3e06d4192..ee68bd8d375dd 100644
--- a/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
+++ b/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
@@ -39,14 +39,14 @@
 use PrestaShop\PrestaShop\Core\Domain\Hook\QueryResult\HookStatus;
 use PrestaShop\PrestaShop\Core\Domain\Product\Query\SearchProducts;
 use PrestaShop\PrestaShop\Core\Domain\Product\QueryResult\FoundProduct;
-use PrestaShopBundle\ApiPlatform\Denormalizers\DecimalNumberDenormalizer;
+use PrestaShopBundle\ApiPlatform\DomainSerializer;
 use PrestaShopBundle\ApiPlatform\Exception\NoExtraPropertiesFoundException;
+use PrestaShopBundle\ApiPlatform\Normalizer\DecimalNumberDenormalizer;
+use PrestaShopBundle\ApiPlatform\Normalizer\ObjectDenormalizer;
 use PrestaShopBundle\ApiPlatform\Provider\QueryProvider;
 use PrestaShopBundle\ApiPlatform\Resources\FoundProduct as FoundProductDto;
 use PrestaShopBundle\ApiPlatform\Resources\Hook;
-use PrestaShopBundle\ApiPlatform\Serializer;
 use RuntimeException;
-use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
 
 class QueryProviderTest extends TestCase
 {
@@ -56,17 +56,17 @@ class QueryProviderTest extends TestCase
     private $queryBus;
 
     /**
-     * @var Serializer|MockObject
+     * @var DomainSerializer|MockObject
      */
-    private Serializer|MockObject $serializer;
+    private DomainSerializer|MockObject $serializer;
 
     /**
      * Set up dependencies for HookStatusProvider
      */
     public function setUp(): void
     {
-        $denormalizers = new \ArrayIterator([new DecimalNumberDenormalizer(), new ObjectNormalizer()]);
-        $this->serializer = new Serializer($denormalizers);
+        $denormalizers = new \ArrayIterator([new DecimalNumberDenormalizer(), new ObjectDenormalizer()]);
+        $this->serializer = new DomainSerializer($denormalizers);
         $this->queryBus = $this->createMock(CommandBusInterface::class);
         $this->queryBus
             ->method('handle')

From 2a0726036d1c9dd205151aae283879b098ef93f5 Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Tue, 29 Aug 2023 17:35:13 +0200
Subject: [PATCH 0851/1030] Fix test to check whole object instead of just the
 class

---
 .../Normalizer/ObjectDenormalizer.php         |  2 +-
 .../Processor/CommandProcessor.php            |  5 ++--
 .../ApiPlatform/PostCustomerTest.php          |  6 +++++
 .../ApiPlatform/DomainSerializerTest.php      | 25 +++++++++++++------
 .../StateProvider/QueryProviderTest.php       |  5 ++--
 5 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/src/PrestaShopBundle/ApiPlatform/Normalizer/ObjectDenormalizer.php b/src/PrestaShopBundle/ApiPlatform/Normalizer/ObjectDenormalizer.php
index 95dcdf86ecaad..915b99adbf5fb 100644
--- a/src/PrestaShopBundle/ApiPlatform/Normalizer/ObjectDenormalizer.php
+++ b/src/PrestaShopBundle/ApiPlatform/Normalizer/ObjectDenormalizer.php
@@ -43,6 +43,6 @@ class ObjectDenormalizer extends SfObjectNormalizer
      */
     public static function getDefaultPriority(): int
     {
-        return 1;
+        return -1;
     }
 }
diff --git a/src/PrestaShopBundle/ApiPlatform/Processor/CommandProcessor.php b/src/PrestaShopBundle/ApiPlatform/Processor/CommandProcessor.php
index 87048ea8acd56..37de8b546abb6 100644
--- a/src/PrestaShopBundle/ApiPlatform/Processor/CommandProcessor.php
+++ b/src/PrestaShopBundle/ApiPlatform/Processor/CommandProcessor.php
@@ -62,12 +62,13 @@ public function __construct(
     public function process($data, Operation $operation, array $uriVariables = [], array $context = [])
     {
         $commandClass = $operation->getExtraProperties()['command'] ?? null;
+        $commandParameters = array_merge($this->apiPlatformSerializer->normalize($data), $uriVariables);
 
-        if (null === $commandClass) {
+        if (null === $commandClass || !class_exists($commandClass)) {
             throw new NoExtraPropertiesFoundException('Extra property "command" not found');
         }
 
-        $command = $this->apiPlatformSerializer->denormalize($data, $commandClass);
+        $command = $this->apiPlatformSerializer->denormalize($commandParameters, $commandClass);
 
         $this->commandBus->handle($command);
     }
diff --git a/tests/Integration/ApiPlatform/PostCustomerTest.php b/tests/Integration/ApiPlatform/PostCustomerTest.php
index 8c01f2c07d7f0..24c35a231fdef 100644
--- a/tests/Integration/ApiPlatform/PostCustomerTest.php
+++ b/tests/Integration/ApiPlatform/PostCustomerTest.php
@@ -41,6 +41,12 @@ public static function setUpBeforeClass(): void
         DatabaseDump::restoreTables(['group', 'group_lang', 'group_reduction', 'group_shop', 'category_group']);
     }
 
+    public static function tearDownAfterClass(): void
+    {
+        parent::tearDownAfterClass();
+        DatabaseDump::restoreTables(['group', 'group_lang', 'group_reduction', 'group_shop', 'category_group']);
+    }
+
     public function testAddCustomerGroup(): void
     {
         $bearerToken = $this->getBearerToken();
diff --git a/tests/Unit/PrestaShopBundle/ApiPlatform/DomainSerializerTest.php b/tests/Unit/PrestaShopBundle/ApiPlatform/DomainSerializerTest.php
index e12802ad3851a..01acdc974ed21 100644
--- a/tests/Unit/PrestaShopBundle/ApiPlatform/DomainSerializerTest.php
+++ b/tests/Unit/PrestaShopBundle/ApiPlatform/DomainSerializerTest.php
@@ -28,8 +28,8 @@
 
 namespace Tests\Unit\PrestaShopBundle\ApiPlatform;
 
-use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use PrestaShop\Decimal\DecimalNumber;
 use PrestaShop\PrestaShop\Core\Domain\Customer\Group\Command\AddCustomerGroupCommand;
 use PrestaShopBundle\ApiPlatform\DomainSerializer;
 use PrestaShopBundle\ApiPlatform\Normalizer\DecimalNumberDenormalizer;
@@ -38,9 +38,9 @@
 class DomainSerializerTest extends TestCase
 {
     /**
-     * @var DomainSerializer|MockObject
+     * @var DomainSerializer
      */
-    private DomainSerializer|MockObject $serializer;
+    private DomainSerializer $serializer;
 
     /**
      * Set up dependencies for HookStatusProvider
@@ -54,9 +54,9 @@ public function setUp(): void
     /**
      * @dataProvider getExpectedDenormalizedData
      */
-    public function testDenormalize(array $arrayToDenormalize, $denormalizedClass): void
+    public function testDenormalize(array $arrayToDenormalize, $denormalizedObject): void
     {
-        self::assertInstanceOf($denormalizedClass, $this->serializer->denormalize($arrayToDenormalize, $denormalizedClass));
+        self::assertEquals($denormalizedObject, $this->serializer->denormalize($arrayToDenormalize, get_class($denormalizedObject)));
     }
 
     public function getExpectedDenormalizedData()
@@ -64,15 +64,24 @@ public function getExpectedDenormalizedData()
         yield [
             [
                 'localizedNames' => [
-                    'test1',
-                    'test2',
+                    1 => 'test1',
+                    2 => 'test2',
                 ],
                 'reductionPercent' => 10.3,
                 'displayPriceTaxExcluded' => true,
                 'showPrice' => true,
                 'shopIds' => [1],
             ],
-            AddCustomerGroupCommand::class,
+            new AddCustomerGroupCommand(
+                [
+                    1 => 'test1',
+                    2 => 'test2',
+                ],
+                new DecimalNumber('10.3'),
+                true,
+                true,
+                [1]
+            ),
         ];
     }
 }
diff --git a/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php b/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
index ee68bd8d375dd..e4f50c8822f0b 100644
--- a/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
+++ b/tests/Unit/PrestaShopBundle/ApiPlatform/StateProvider/QueryProviderTest.php
@@ -30,7 +30,6 @@
 
 use ApiPlatform\Metadata\Get;
 use ApiPlatform\Metadata\GetCollection;
-use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
 use PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHook;
@@ -56,9 +55,9 @@ class QueryProviderTest extends TestCase
     private $queryBus;
 
     /**
-     * @var DomainSerializer|MockObject
+     * @var DomainSerializer
      */
-    private DomainSerializer|MockObject $serializer;
+    private DomainSerializer $serializer;
 
     /**
      * Set up dependencies for HookStatusProvider

From eb93e833245ae67c52611b920de31a83ec8e2ee6 Mon Sep 17 00:00:00 2001
From: Jonathan Lelievre <jonathan.lelievre@prestashop.com>
Date: Tue, 29 Aug 2023 18:11:16 +0200
Subject: [PATCH 0852/1030] Handle configuration PS_PRODUCT_ACTIVATION_DEFAULT
 in new product page, but only once on creation

---
 .../js/pages/product/create/create-product-modal.ts      | 8 +++++++-
 .../Admin/Sell/Catalog/Product/ProductController.php     | 9 +++++++++
 .../Form/Admin/Sell/Product/EditProductFormType.php      | 3 +++
 .../Form/Admin/Sell/Product/HeaderType.php               | 2 ++
 .../views/Admin/Sell/Catalog/Product/edit.html.twig      | 5 ++++-
 5 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/admin-dev/themes/new-theme/js/pages/product/create/create-product-modal.ts b/admin-dev/themes/new-theme/js/pages/product/create/create-product-modal.ts
index 564a952c26456..83311be3683c7 100644
--- a/admin-dev/themes/new-theme/js/pages/product/create/create-product-modal.ts
+++ b/admin-dev/themes/new-theme/js/pages/product/create/create-product-modal.ts
@@ -73,7 +73,13 @@ export default class CreateProductModal {
           }
 
           if (dataAttributes.productId) {
-            const editUrl = this.router.generate('admin_products_edit', {productId: dataAttributes.productId});
+            // The parameter forceDefaultActive must be passed down in the redirect URL or it will be ignored, it was passed via data attributes
+            // for this purpose only
+            const editUrl = this.router.generate('admin_products_edit', {
+              productId: dataAttributes.productId,
+              forceDefaultActive: dataAttributes.forceDefaultActive ? 1 : 0,
+            });
+
             // Keep showing loading until the page is refreshed
             iframeModal.showLoading();
             window.location.href = editUrl;
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/Product/ProductController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/Product/ProductController.php
index 63c30bd62c06a..74449f19dfe68 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/Product/ProductController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/Product/ProductController.php
@@ -403,6 +403,11 @@ public function createAction(Request $request): Response
                     $redirectParams['setShopContext'] = 's-' . $createdData['shop_id'];
                 }
 
+                // When this configuration is enabled we pre-fill the online status in the redirected form
+                if ((bool) $this->getConfiguration()->get('PS_PRODUCT_ACTIVATION_DEFAULT')) {
+                    $redirectParams['forceDefaultActive'] = 1;
+                }
+
                 return $this->redirectToRoute('admin_products_edit', $redirectParams);
             }
         } catch (Exception $e) {
@@ -440,10 +445,14 @@ public function editAction(Request $request, int $productId): Response
             return $this->renderIncompatibleContext($productId);
         }
 
+        // When query parameter is present we force the initial value in the form, but only in GET method, or you could never manually set false in the form on submit
+        $forceDefaultActive = $request->query->getBoolean('forceDefaultActive') && $request->isMethod(Request::METHOD_GET);
+
         try {
             $productForm = $this->getEditProductFormBuilder()->getFormFor($productId, [], [
                 'product_id' => $productId,
                 'shop_id' => (int) $this->getContextShopId(),
+                'force_default_active' => $forceDefaultActive,
                 // @todo: patch/partial update doesn't work good for now (especially multiple empty values) so we use POST for now
                 // 'method' => Request::METHOD_PATCH,
                 'method' => Request::METHOD_POST,
diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Product/EditProductFormType.php b/src/PrestaShopBundle/Form/Admin/Sell/Product/EditProductFormType.php
index b613f8563d4a2..b67ffc0d6c296 100644
--- a/src/PrestaShopBundle/Form/Admin/Sell/Product/EditProductFormType.php
+++ b/src/PrestaShopBundle/Form/Admin/Sell/Product/EditProductFormType.php
@@ -90,6 +90,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder
             ->add('header', HeaderType::class, [
                 'active' => $options['active'],
+                'force_default_active' => $options['force_default_active'],
                 'product_id' => $productId,
             ])
             ->add('description', DescriptionType::class, [
@@ -138,6 +139,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
             'product_type' => $options['product_type'],
             'product_id' => $options['product_id'],
             'shop_id' => $options['shop_id'],
+            'force_default_active' => $options['force_default_active'] ? 1 : 0,
         ];
 
         $view->vars = array_replace($view->vars, $formVars);
@@ -155,6 +157,7 @@ public function configureOptions(OptionsResolver $resolver)
             ->setDefaults([
                 'virtual_product_file_id' => null,
                 'active' => false,
+                'force_default_active' => false,
                 'allow_extra_fields' => true,
                 'form_theme' => '@PrestaShop/Admin/Sell/Catalog/Product/FormTheme/product.html.twig',
                 'use_default_themes' => false,
diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Product/HeaderType.php b/src/PrestaShopBundle/Form/Admin/Sell/Product/HeaderType.php
index b4d06f778afb3..909e3f84ed141 100644
--- a/src/PrestaShopBundle/Form/Admin/Sell/Product/HeaderType.php
+++ b/src/PrestaShopBundle/Form/Admin/Sell/Product/HeaderType.php
@@ -141,6 +141,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     $this->trans('Online', 'Admin.Global') => true,
                 ],
                 'modify_all_shops' => true,
+                'default_empty_data' => $options['force_default_active'],
             ])
             ->add('mobile_toolbar', ButtonCollectionType::class, [
                 'buttons' => $this->toolbarButtonsProvider->getToolbarButtonsOptions(['productId' => $options['product_id']]),
@@ -163,6 +164,7 @@ public function configureOptions(OptionsResolver $resolver)
         $resolver
             ->setDefaults([
                 'active' => false,
+                'force_default_active' => false,
                 'required' => false,
                 'label' => false,
                 'form_theme' => '@PrestaShop/Admin/Sell/Catalog/Product/FormTheme/header.html.twig',
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Product/edit.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Product/edit.html.twig
index 98e528d740147..94171e99e3bc9 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Product/edit.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Product/edit.html.twig
@@ -38,6 +38,8 @@
   {% set productType = productForm.vars.product_type %}
   {% set productId = productForm.vars.product_id %}
   {% set shopId = productForm.vars.shop_id %}
+  {# Passed via data attribute only so that the iframe modal can replicate it in its redirection url #}
+  {% set forceDefaultActive = productForm.vars.force_default_active %}
 
   <div class="header-toolbar d-print-none">
     {{ multistoreProductHeader(productId) }}
@@ -48,7 +50,8 @@
     'novalidate': 'novalidate',
     'data-product-id': productId,
     'data-shop-id': shopId,
-    'data-product-type': productType
+    'data-product-type': productType,
+    'data-force-default-active': forceDefaultActive
   }}) }}
 
   {# Header form child is rendered separately because it's not one of the tabs so it needs to be rendered before #}

From d201a449dbaa0fd3d411aac505b0462ad9623fb9 Mon Sep 17 00:00:00 2001
From: PululuK <pululuandre@hotmail.com>
Date: Tue, 29 Aug 2023 23:23:43 +0200
Subject: [PATCH 0853/1030] add TypeaheadProductCollectionType css component

---
 .../_typeahead_product_collection_type.scss   | 41 +++++++++++++++++++
 .../scss/pages/product/product_page.scss      | 41 +------------------
 admin-dev/themes/new-theme/scss/theme.scss    |  1 +
 .../Sell/Product/SEO/RedirectOptionType.php   |  2 +-
 .../ProductPage/Forms/form_seo.html.twig      |  2 +-
 .../ProductPage/Panels/essentials.html.twig   |  2 +-
 6 files changed, 46 insertions(+), 43 deletions(-)
 create mode 100644 admin-dev/themes/new-theme/scss/components/_typeahead_product_collection_type.scss

diff --git a/admin-dev/themes/new-theme/scss/components/_typeahead_product_collection_type.scss b/admin-dev/themes/new-theme/scss/components/_typeahead_product_collection_type.scss
new file mode 100644
index 0000000000000..b9a6f77031bc2
--- /dev/null
+++ b/admin-dev/themes/new-theme/scss/components/_typeahead_product_collection_type.scss
@@ -0,0 +1,41 @@
+.typeahead-product-collection-type {
+  .typeahead-list {
+    li {
+      @extend .p-1;
+      @extend .mt-1;
+      @extend .d-flex;
+      @extend .align-items-center;
+      border: 1px solid $gray-light;
+
+      // thumbnail
+      > .media-left {
+        img {
+          max-width: 50px;
+          max-height: 50px;
+        }
+      }
+
+      // text
+      > .media-body {
+        .label {
+          @extend .mx-1;
+        }
+
+        // delete button
+        i.delete {
+          float: right;
+          color: $medium-gray;
+          cursor: pointer;
+        }
+      }
+    }
+  }
+
+  .autocomplete-search {
+    .search-suggestion {
+      img {
+        width: 50px;
+      }
+    }
+  }
+}
diff --git a/admin-dev/themes/new-theme/scss/pages/product/product_page.scss b/admin-dev/themes/new-theme/scss/pages/product/product_page.scss
index 824f03e919235..cedad4ead1dfd 100644
--- a/admin-dev/themes/new-theme/scss/pages/product/product_page.scss
+++ b/admin-dev/themes/new-theme/scss/pages/product/product_page.scss
@@ -2214,46 +2214,7 @@ $product-page-padding-bottom: 80px !default;
 #related-product,
 #id-product-redirected,
 .redirect-option-widget {
-  // list of added related products
-  .typeahead-list {
-    li {
-      @extend .p-1;
-      @extend .mt-1;
-      @extend .d-flex;
-      @extend .align-items-center;
-      border: 1px solid $gray-light;
-
-      // thumbnail
-      > .media-left {
-        img {
-          max-width: 50px;
-          max-height: 50px;
-        }
-      }
-
-      // text
-      > .media-body {
-        .label {
-          @extend .mx-1;
-        }
-
-        // delete button
-        i.delete {
-          float: right;
-          color: $medium-gray;
-          cursor: pointer;
-        }
-      }
-    }
-  }
-
-  .autocomplete-search {
-    .search-suggestion {
-      img {
-        width: 50px;
-      }
-    }
-  }
+  @import "../../components/typeahead_product_collection_type";
 }
 
 @media only screen and (min-width: 320px) and (max-width: 1450px) {
diff --git a/admin-dev/themes/new-theme/scss/theme.scss b/admin-dev/themes/new-theme/scss/theme.scss
index 1d6bb854ef9a1..5f7ee486ca8e6 100644
--- a/admin-dev/themes/new-theme/scss/theme.scss
+++ b/admin-dev/themes/new-theme/scss/theme.scss
@@ -70,6 +70,7 @@
 @import "components/toggable_field";
 @import "components/translatable_input";
 @import "components/unavailable-feature";
+@import "components/typeahead_product_collection_type";
 
 // Pages specifics SCSS files
 @import "pages/invoices";
diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Product/SEO/RedirectOptionType.php b/src/PrestaShopBundle/Form/Admin/Sell/Product/SEO/RedirectOptionType.php
index 5d12a1f05fbb7..6172a39aefc90 100644
--- a/src/PrestaShopBundle/Form/Admin/Sell/Product/SEO/RedirectOptionType.php
+++ b/src/PrestaShopBundle/Form/Admin/Sell/Product/SEO/RedirectOptionType.php
@@ -189,7 +189,7 @@ public function configureOptions(OptionsResolver $resolver)
                 'label_help_box' => $this->trans('When your product is disabled, choose to which page you’d like to redirect the customers visiting its page by typing the product or category name.', 'Admin.Catalog.Help'),
                 'columns_number' => 2,
                 'row_attr' => [
-                    'class' => 'redirect-option-widget',
+                    'class' => 'redirect-option-widget typeahead-product-collection-type',
                 ],
                 'alert_message' => $this->getRedirectionAlertMessages(),
             ])
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/Forms/form_seo.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/Forms/form_seo.html.twig
index 1624e68e5383f..6abb4009175ff 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/Forms/form_seo.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/Forms/form_seo.html.twig
@@ -111,7 +111,7 @@
     </fieldset>
   </div>
 
-  <div class="col-md-5" id="id-product-redirected">
+  <div class="col-md-5 typeahead-product-collection-type" id="id-product-redirected">
     <fieldset class="form-group">
       <label class="form-control-label">{{ seoForm.id_type_redirected.vars.label }}</label>
       {{ form_errors(seoForm.id_type_redirected) }}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/Panels/essentials.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/Panels/essentials.html.twig
index faf80e6f70a5e..8c5abff6c0988 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/Panels/essentials.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/Panels/essentials.html.twig
@@ -133,7 +133,7 @@
           {{ include('@Product/ProductPage/Forms/form_manufacturer.html.twig', { 'form': formManufacturer }) }}
         </div>
 
-        <div id="related-product" class="mb-3">
+        <div id="related-product" class="mb-3 typeahead-product-collection-type">
           {{ include('@Product/ProductPage/Forms/form_related_products.html.twig', { 'form': formRelatedProducts }) }}
         </div>
 

From b02ac761bc1b491690aa7960cca9d04777fff205 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Wed, 30 Aug 2023 10:55:40 +0200
Subject: [PATCH 0854/1030] Nightly : Fixed URL in @todo

---
 .../01_internalAuthServer/01_authorizationEndpoint.ts           | 1 +
 .../01_internalAuthServer/02_resourceEndpoint.ts                | 2 +-
 .../02_externalAuthServer/01_authorizationEndpoint.ts           | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/01_internalAuthServer/01_authorizationEndpoint.ts b/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/01_internalAuthServer/01_authorizationEndpoint.ts
index 3efb50b07da7a..ee5bec7330ee8 100644
--- a/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/01_internalAuthServer/01_authorizationEndpoint.ts
+++ b/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/01_internalAuthServer/01_authorizationEndpoint.ts
@@ -70,6 +70,7 @@ describe('API : Internal Auth Server - Authorization Endpoint', async () => {
     it('should request the endpoint /admin-dev/api/oauth2/token with method POST with valid data', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'requestAuthWithMethodPOSTValidData', baseContext);
 
+      // @todo : https://github.com/PrestaShop/PrestaShop/issues/33710
       const apiResponse = await apiContext.post('api/oauth2/token', {
         form: {
           client_id: 'my_client_id',
diff --git a/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/01_internalAuthServer/02_resourceEndpoint.ts b/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/01_internalAuthServer/02_resourceEndpoint.ts
index 46a03387560de..daa28092bff0d 100644
--- a/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/01_internalAuthServer/02_resourceEndpoint.ts
+++ b/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/01_internalAuthServer/02_resourceEndpoint.ts
@@ -20,7 +20,7 @@ describe('API : Internal Auth Server - Resource Endpoint', async () => {
     it('should request the authorization endpoint and fetch valid token', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'requestAuthorizationEndpoint', baseContext);
 
-      // @todo : https://github.com/PrestaShop/PrestaShop/issues/29813
+      // @todo : https://github.com/PrestaShop/PrestaShop/issues/33710
       const apiResponse = await apiContext.post('api/oauth2/token', {
         form: {
           client_id: 'my_client_id',
diff --git a/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/01_authorizationEndpoint.ts b/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/01_authorizationEndpoint.ts
index 4714ab9e8d35a..56f72279000d7 100644
--- a/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/01_authorizationEndpoint.ts
+++ b/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/01_authorizationEndpoint.ts
@@ -98,6 +98,7 @@ describe('API : External Auth Server - Authorization Endpoint', async () => {
     it('should request the endpoint /admin-dev/api/oauth2/token with method POST with valid data', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'requestAuthWithMethodPOSTValidData', baseContext);
 
+      // @todo : https://github.com/PrestaShop/PrestaShop/issues/33710
       const apiResponse = await apiContextBO.post('api/oauth2/token', {
         form: {
           client_id: 'my_client_id',

From 93d417d8e0cee394f4eb3d4d0234032d74f85b6e Mon Sep 17 00:00:00 2001
From: Morgan Pichat <morgan.pichat@prestashop.com>
Date: Mon, 28 Aug 2023 14:25:31 +0200
Subject: [PATCH 0855/1030] Fix admin_attributes_create legacy route

---
 .../routing/admin/sell/catalog/attribute.yml  | 19 ++++++++++---------
 .../admin/sell/catalog/attribute_group.yml    |  2 --
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/attribute.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/attribute.yml
index f2ce9f6af6d36..def5d62f8018c 100644
--- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/attribute.yml
+++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/attribute.yml
@@ -8,6 +8,7 @@ admin_attributes_index:
     redirectQueryParamsToKeep:
       - 'attributeGroupId'
     _legacy_link: AdminAttributesGroups:viewattribute_group
+    _legacy_feature_flag: attribute_group
     _legacy_parameters:
       id_attribute_group: attributeGroupId
     requirements:
@@ -19,7 +20,8 @@ admin_attributes_search:
   defaults:
     _controller: PrestaShopBundle\Controller\Admin\CommonController::searchGridAction
     _legacy_controller: AdminAttributesGroups
-    _legacy_link: AdminAttributesGroups:submitFilterattribute_values
+    _legacy_link: AdminAttributesGroups:submitFilterattribute
+    _legacy_feature_flag: attribute_group
     gridDefinitionFactoryServiceId: prestashop.core.grid.definition.factory.attribute
     redirectRoute: admin_attributes_index
     redirectQueryParamsToKeep:
@@ -31,7 +33,8 @@ admin_attributes_create:
   defaults:
     _controller: 'PrestaShopBundle\Controller\Admin\Sell\Catalog\AttributeController::createAction'
     _legacy_controller: AdminAttributesGroups
-    _legacy_link: AdminAttributesGroups:addattribute_group
+    _legacy_link: AdminAttributesGroups:addattribute
+    _legacy_feature_flag: attribute_group
     redirectQueryParamsToKeep:
       - 'attributeGroupId'
 
@@ -44,9 +47,9 @@ admin_attributes_edit:
     redirectQueryParamsToKeep:
       - 'attributeGroupId'
     _legacy_link: AdminAttributesGroups:updateattribute
+    _legacy_feature_flag: attribute_group
     _legacy_parameters:
       id_attribute_group: attributeGroupId
-      id_attribute: attributeId
   requirements:
     attributeId: \d+
 
@@ -59,6 +62,7 @@ admin_attributes_delete:
     redirectQueryParamsToKeep:
       - 'attributeGroupId'
     _legacy_link: AdminAttributesGroups:deleteattribute
+    _legacy_feature_flag: attribute_group
     _legacy_parameters:
       id_attribute_group: attributeGroupId
       id_attribute: attributeId
@@ -68,13 +72,11 @@ admin_attributes_bulk_delete:
   methods: POST
   defaults:
     _controller: 'PrestaShopBundle\Controller\Admin\Sell\Catalog\AttributeController::bulkDeleteAction'
-    _legacy_controller: AdminAttributesGroups
     redirectQueryParamsToKeep:
       - 'attributeGroupId'
-    _legacy_link: AdminAttributesGroups:bulkdeleteattribute
-    _legacy_parameters:
-      id_attribute_group: attributeGroupId
-      id_attribute: attributeId
+    _legacy_link: AdminAttributesGroups:submitBulkdeleteattribute
+    _legacy_controller: AdminAttributesGroups
+    _legacy_feature_flag: attribute_group
 
 admin_attributes_update_position:
   path: /update-position
@@ -82,4 +84,3 @@ admin_attributes_update_position:
   defaults:
     _controller: 'PrestaShopBundle\Controller\Admin\Sell\Catalog\AttributeController::updatePositionAction'
     _legacy_controller: AdminAttributesGroups
-    _legacy_link: AdminAttributesGroups:updateAttributesPositions
diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/attribute_group.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/attribute_group.yml
index aef6cfc7ec38b..b689a8b123a96 100644
--- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/attribute_group.yml
+++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/attribute_group.yml
@@ -92,5 +92,3 @@ admin_attribute_groups_update_position:
   defaults:
     _controller: 'PrestaShopBundle\Controller\Admin\Sell\Catalog\AttributeGroupController::updatePositionAction'
     _legacy_controller: AdminAttributesGroups
-    _legacy_link: AdminAttributesGroups:updateGroupsPositions
-    _legacy_feature_flag: attribute_group

From 269cc7b3a8d9508dcb177353b0e4c00e5e63fa89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Gross?=
 <48470278+gross-nvs@users.noreply.github.com>
Date: Wed, 30 Aug 2023 14:07:06 +0200
Subject: [PATCH 0856/1030] Update classname regex to allow FQDN

---
 classes/Validate.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/Validate.php b/classes/Validate.php
index 8feb706aaabee..712f6fe18a993 100644
--- a/classes/Validate.php
+++ b/classes/Validate.php
@@ -39,7 +39,7 @@
 class ValidateCore
 {
     public const ORDER_BY_REGEXP = '/^(?:(`?)[\w!_-]+\1\.)?(?:(`?)[\w!_-]+\2)$/';
-    public const OBJECT_CLASS_NAME_REGEXP = '/^[a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*$/';
+    public const OBJECT_CLASS_NAME_REGEXP = '/^[a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*(\\\\[a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*)*$/';
     /**
      * Maximal 32 bits value: (2^32)-1
      *

From ef95b01fee1c3a57d86f6db6c054a7c9aac6e58b Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Wed, 30 Aug 2023 15:55:21 +0200
Subject: [PATCH 0857/1030] Handle advanced setters in command

---
 .../Converters/StringToDateTimeImmutable.php  | 42 +++++++++++++++
 .../ApiPlatform/Resources/CartRule.php        | 51 +++++++++++++++++++
 .../config/services/bundle/services.yml       |  1 +
 3 files changed, 94 insertions(+)
 create mode 100644 src/PrestaShopBundle/ApiPlatform/Converters/StringToDateTimeImmutable.php
 create mode 100644 src/PrestaShopBundle/ApiPlatform/Resources/CartRule.php

diff --git a/src/PrestaShopBundle/ApiPlatform/Converters/StringToDateTimeImmutable.php b/src/PrestaShopBundle/ApiPlatform/Converters/StringToDateTimeImmutable.php
new file mode 100644
index 0000000000000..37dc04cd93b98
--- /dev/null
+++ b/src/PrestaShopBundle/ApiPlatform/Converters/StringToDateTimeImmutable.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\ApiPlatform\Converters;
+
+class StringToDateTimeImmutable implements ConverterInterface
+{
+    public function convert(mixed $value): \DateTimeInterface
+    {
+        return new \DateTimeImmutable($value);
+    }
+
+    public function supports(string $type): bool
+    {
+        return 'DateTimeImmutable' === $type;
+    }
+}
diff --git a/src/PrestaShopBundle/ApiPlatform/Resources/CartRule.php b/src/PrestaShopBundle/ApiPlatform/Resources/CartRule.php
new file mode 100644
index 0000000000000..d96a2d6880f3a
--- /dev/null
+++ b/src/PrestaShopBundle/ApiPlatform/Resources/CartRule.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\ApiPlatform\Resources;
+
+use ApiPlatform\Core\Annotation\ApiProperty;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Put;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\EditCartRuleCommand;
+use PrestaShopBundle\ApiPlatform\Processor\CommandProcessor;
+
+#[ApiResource(
+    operations: [
+        new Put(
+            uriTemplate: '/cartrule',
+            processor: CommandProcessor::class,
+            extraProperties: ['command' => EditCartRuleCommand::class]
+        ),
+    ],
+)]
+class CartRule
+{
+    public int $cartRuleId;
+
+    public array $validityDateRange;
+}
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/services.yml b/src/PrestaShopBundle/Resources/config/services/bundle/services.yml
index f66c099583e2c..10f27a218c063 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/services.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/services.yml
@@ -117,6 +117,7 @@ services:
     autowire: true
     arguments:
       - '@prestashop.core.command_bus'
+      - !tagged prestashop.api.converters
 
   PrestaShopBundle\Security\Admin\SessionRenewer:
     arguments:

From ef5d974228af2a8b036aa01ae9f6a81ae40ed8ac Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Wed, 30 Aug 2023 20:24:32 +0200
Subject: [PATCH 0858/1030] Handle advanced setter and add example test for
 edit cart rule command with api

---
 .../ApiPlatform/DomainSerializer.php          | 16 +++++-
 .../DateTimeImmutableDenormalizer.php         | 55 +++++++++++++++++++
 .../Processor/CommandProcessor.php            |  1 -
 .../ApiPlatform/Resources/CartRule.php        | 29 +++++++++-
 .../config/services/bundle/services.yml       |  1 -
 .../ApiPlatform/DomainSerializerTest.php      | 42 +++++++++++++-
 6 files changed, 137 insertions(+), 7 deletions(-)
 create mode 100644 src/PrestaShopBundle/ApiPlatform/Normalizer/DateTimeImmutableDenormalizer.php

diff --git a/src/PrestaShopBundle/ApiPlatform/DomainSerializer.php b/src/PrestaShopBundle/ApiPlatform/DomainSerializer.php
index e3a2cf8e50730..afd85adf7fcec 100644
--- a/src/PrestaShopBundle/ApiPlatform/DomainSerializer.php
+++ b/src/PrestaShopBundle/ApiPlatform/DomainSerializer.php
@@ -53,7 +53,17 @@ public function __construct(Traversable $denormalizers)
      */
     public function denormalize($data, string $type, string $format = null, array $context = []): mixed
     {
-        $action = $this->serializer->denormalize($data, $type, $format, $context);
+        $reflectionClass = new \ReflectionClass($type);
+        $constructParameters = $reflectionClass->getConstructor()->getParameters();
+        $dataConstruct = [];
+        foreach ($constructParameters as $constructParameter) {
+            if (isset($data[$constructParameter->getName()])) {
+                $dataConstruct[$constructParameter->getName()] = $data[$constructParameter->getName()];
+                unset($data[$constructParameter->getName()]);
+            }
+        }
+
+        $action = $this->serializer->denormalize($dataConstruct, $type, $format, $context);
 
         //Try to call setters
         foreach ($data as $param => $value) {
@@ -61,9 +71,11 @@ public function denormalize($data, string $type, string $format = null, array $c
             if ($reflectionMethod = $this->findSetterMethod($param, $type)) {
                 $methodParameters = $reflectionMethod->getParameters();
                 foreach ($methodParameters as $methodParameter) {
-                    $requestValue = is_array($value) ? $value[$methodParameter->getName()] : $value;
+                    $requestValue = is_array($value) && isset($value[$methodParameter->getName()]) ? $value[$methodParameter->getName()] : $value;
                     if ($methodParameter->getType() instanceof \ReflectionNamedType && $methodParameter->getType()->getName() !== gettype($requestValue)) {
                         $parameters[] = $this->serializer->denormalize($requestValue, $methodParameter->getType()->getName());
+                    } else {
+                        $parameters[] = $requestValue;
                     }
                 }
 
diff --git a/src/PrestaShopBundle/ApiPlatform/Normalizer/DateTimeImmutableDenormalizer.php b/src/PrestaShopBundle/ApiPlatform/Normalizer/DateTimeImmutableDenormalizer.php
new file mode 100644
index 0000000000000..2fd9bac6ecbd4
--- /dev/null
+++ b/src/PrestaShopBundle/ApiPlatform/Normalizer/DateTimeImmutableDenormalizer.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\ApiPlatform\Normalizer;
+
+use PrestaShop\Decimal\DecimalNumber;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+
+class DateTimeImmutableDenormalizer implements DenormalizerInterface
+{
+    public function denormalize($data, string $type, string $format = null, array $context = [])
+    {
+        return new \DateTimeImmutable($data);
+    }
+
+    public function supportsDenormalization($data, string $type, string $format = null)
+    {
+        return \DateTimeImmutable::class === $type;
+    }
+
+    /**
+     * Set higher priority than ObjectDenormalizer.
+     *
+     * @return int
+     */
+    public static function getDefaultPriority(): int
+    {
+        return 10;
+    }
+}
diff --git a/src/PrestaShopBundle/ApiPlatform/Processor/CommandProcessor.php b/src/PrestaShopBundle/ApiPlatform/Processor/CommandProcessor.php
index 37de8b546abb6..2b56df10e7055 100644
--- a/src/PrestaShopBundle/ApiPlatform/Processor/CommandProcessor.php
+++ b/src/PrestaShopBundle/ApiPlatform/Processor/CommandProcessor.php
@@ -69,7 +69,6 @@ public function process($data, Operation $operation, array $uriVariables = [], a
         }
 
         $command = $this->apiPlatformSerializer->denormalize($commandParameters, $commandClass);
-
         $this->commandBus->handle($command);
     }
 }
diff --git a/src/PrestaShopBundle/ApiPlatform/Resources/CartRule.php b/src/PrestaShopBundle/ApiPlatform/Resources/CartRule.php
index d96a2d6880f3a..3949caeb8dbbe 100644
--- a/src/PrestaShopBundle/ApiPlatform/Resources/CartRule.php
+++ b/src/PrestaShopBundle/ApiPlatform/Resources/CartRule.php
@@ -28,7 +28,6 @@
 
 namespace PrestaShopBundle\ApiPlatform\Resources;
 
-use ApiPlatform\Core\Annotation\ApiProperty;
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\Put;
 use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\EditCartRuleCommand;
@@ -37,7 +36,7 @@
 #[ApiResource(
     operations: [
         new Put(
-            uriTemplate: '/cartrule',
+            uriTemplate: '/cartRule',
             processor: CommandProcessor::class,
             extraProperties: ['command' => EditCartRuleCommand::class]
         ),
@@ -47,5 +46,31 @@ class CartRule
 {
     public int $cartRuleId;
 
+    public string $description;
+
+    public string $code;
+
+    public array $minimumAmount;
+
+    public bool $minimumAmountShippingIncluded;
+
+    public int $customerId;
+
+    public array $localizedNames;
+
+    public bool $highlightInCart;
+
+    public bool $allowPartialUse;
+
+    public int $priority;
+
+    public bool $active;
+
     public array $validityDateRange;
+
+    public int $totalQuantity;
+
+    public int $quantityPerUser;
+
+    public array $cartRuleAction;
 }
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/services.yml b/src/PrestaShopBundle/Resources/config/services/bundle/services.yml
index 10f27a218c063..f66c099583e2c 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/services.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/services.yml
@@ -117,7 +117,6 @@ services:
     autowire: true
     arguments:
       - '@prestashop.core.command_bus'
-      - !tagged prestashop.api.converters
 
   PrestaShopBundle\Security\Admin\SessionRenewer:
     arguments:
diff --git a/tests/Unit/PrestaShopBundle/ApiPlatform/DomainSerializerTest.php b/tests/Unit/PrestaShopBundle/ApiPlatform/DomainSerializerTest.php
index 01acdc974ed21..2d9d07ac70e6b 100644
--- a/tests/Unit/PrestaShopBundle/ApiPlatform/DomainSerializerTest.php
+++ b/tests/Unit/PrestaShopBundle/ApiPlatform/DomainSerializerTest.php
@@ -30,8 +30,11 @@
 
 use PHPUnit\Framework\TestCase;
 use PrestaShop\Decimal\DecimalNumber;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\EditCartRuleCommand;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\CartRuleAction;
 use PrestaShop\PrestaShop\Core\Domain\Customer\Group\Command\AddCustomerGroupCommand;
 use PrestaShopBundle\ApiPlatform\DomainSerializer;
+use PrestaShopBundle\ApiPlatform\Normalizer\DateTimeImmutableDenormalizer;
 use PrestaShopBundle\ApiPlatform\Normalizer\DecimalNumberDenormalizer;
 use PrestaShopBundle\ApiPlatform\Normalizer\ObjectDenormalizer;
 
@@ -47,7 +50,7 @@ class DomainSerializerTest extends TestCase
      */
     public function setUp(): void
     {
-        $denormalizers = new \ArrayIterator([new DecimalNumberDenormalizer(), new ObjectDenormalizer()]);
+        $denormalizers = new \ArrayIterator([new DateTimeImmutableDenormalizer(), new DecimalNumberDenormalizer(), new ObjectDenormalizer()]);
         $this->serializer = new DomainSerializer($denormalizers);
     }
 
@@ -83,5 +86,42 @@ public function getExpectedDenormalizedData()
                 [1]
             ),
         ];
+
+        $editCartRuleCommand = new EditCartRuleCommand(1);
+        $editCartRuleCommand->setDescription('test description');
+        $editCartRuleCommand->setCode('test code');
+        $editCartRuleCommand->setMinimumAmount('10', 1, true, true);
+        $editCartRuleCommand->setCustomerId(1);
+        $editCartRuleCommand->setLocalizedNames([1 => 'test1', 2 => 'test2']);
+        $editCartRuleCommand->setHighlightInCart(true);
+        $editCartRuleCommand->setAllowPartialUse(true);
+        $editCartRuleCommand->setPriority(1);
+        $editCartRuleCommand->setActive(true);
+        $editCartRuleCommand->setValidityDateRange(new \DateTimeImmutable('2023-08-23'), new \DateTimeImmutable('2023-08-25'));
+        $editCartRuleCommand->setTotalQuantity(100);
+        $editCartRuleCommand->setQuantityPerUser(1);
+        $editCartRuleCommand->setCartRuleAction(new CartRuleAction(true));
+        yield [
+            [
+                'cartRuleId' => 1,
+                'description' => 'test description',
+                'code' => 'test code',
+                'minimumAmount' => ['minimumAmount' => '10', 'currencyId' => 1, 'taxIncluded' => true, 'shippingIncluded' => true],
+                'customerId' => 1,
+                'localizedNames' => [
+                    1 => 'test1',
+                    2 => 'test2',
+                ],
+                'highlightInCart' => true,
+                'allowPartialUse' => true,
+                'priority' => 1,
+                'active' => true,
+                'validityDateRange' => ['validFrom' => '2023-08-23', 'validTo' => '2023-08-25'],
+                'totalQuantity' => 100,
+                'quantityPerUser' => 1,
+                'cartRuleAction' => ['freeShipping' => true],
+            ],
+            $editCartRuleCommand,
+        ];
     }
 }

From c1aea91c1103b6efca152097d76dc12c3b2a1fa5 Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Wed, 30 Aug 2023 20:25:59 +0200
Subject: [PATCH 0859/1030] Disable unused converter

---
 .../Converters/StringToDateTimeImmutable.php  | 42 -------------------
 .../Processor/CommandProcessor.php            |  1 +
 2 files changed, 1 insertion(+), 42 deletions(-)
 delete mode 100644 src/PrestaShopBundle/ApiPlatform/Converters/StringToDateTimeImmutable.php

diff --git a/src/PrestaShopBundle/ApiPlatform/Converters/StringToDateTimeImmutable.php b/src/PrestaShopBundle/ApiPlatform/Converters/StringToDateTimeImmutable.php
deleted file mode 100644
index 37dc04cd93b98..0000000000000
--- a/src/PrestaShopBundle/ApiPlatform/Converters/StringToDateTimeImmutable.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-declare(strict_types=1);
-
-namespace PrestaShopBundle\ApiPlatform\Converters;
-
-class StringToDateTimeImmutable implements ConverterInterface
-{
-    public function convert(mixed $value): \DateTimeInterface
-    {
-        return new \DateTimeImmutable($value);
-    }
-
-    public function supports(string $type): bool
-    {
-        return 'DateTimeImmutable' === $type;
-    }
-}
diff --git a/src/PrestaShopBundle/ApiPlatform/Processor/CommandProcessor.php b/src/PrestaShopBundle/ApiPlatform/Processor/CommandProcessor.php
index 2b56df10e7055..37de8b546abb6 100644
--- a/src/PrestaShopBundle/ApiPlatform/Processor/CommandProcessor.php
+++ b/src/PrestaShopBundle/ApiPlatform/Processor/CommandProcessor.php
@@ -69,6 +69,7 @@ public function process($data, Operation $operation, array $uriVariables = [], a
         }
 
         $command = $this->apiPlatformSerializer->denormalize($commandParameters, $commandClass);
+
         $this->commandBus->handle($command);
     }
 }

From f3d88cecb17c0c11609e430baab74ee17ac0169a Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Wed, 30 Aug 2023 20:39:48 +0200
Subject: [PATCH 0860/1030] fix ci

---
 .../ApiPlatform/DomainSerializer.php             | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/PrestaShopBundle/ApiPlatform/DomainSerializer.php b/src/PrestaShopBundle/ApiPlatform/DomainSerializer.php
index afd85adf7fcec..d7ce9aca89895 100644
--- a/src/PrestaShopBundle/ApiPlatform/DomainSerializer.php
+++ b/src/PrestaShopBundle/ApiPlatform/DomainSerializer.php
@@ -53,13 +53,17 @@ public function __construct(Traversable $denormalizers)
      */
     public function denormalize($data, string $type, string $format = null, array $context = []): mixed
     {
-        $reflectionClass = new \ReflectionClass($type);
-        $constructParameters = $reflectionClass->getConstructor()->getParameters();
         $dataConstruct = [];
-        foreach ($constructParameters as $constructParameter) {
-            if (isset($data[$constructParameter->getName()])) {
-                $dataConstruct[$constructParameter->getName()] = $data[$constructParameter->getName()];
-                unset($data[$constructParameter->getName()]);
+
+        $reflectionClass = new \ReflectionClass($type);
+        if($reflectionClass->getConstructor()) {
+            $constructParameters = $reflectionClass->getConstructor()->getParameters();
+
+            foreach ($constructParameters as $constructParameter) {
+                if (isset($data[$constructParameter->getName()])) {
+                    $dataConstruct[$constructParameter->getName()] = $data[$constructParameter->getName()];
+                    unset($data[$constructParameter->getName()]);
+                }
             }
         }
 

From 16cb30d2569bb48f12bf65fe10f0871cbd473d72 Mon Sep 17 00:00:00 2001
From: Jonathan Lelievre <jonathan.lelievre@prestashop.com>
Date: Wed, 30 Aug 2023 21:35:58 +0200
Subject: [PATCH 0861/1030] Handle friendly url automatic update in new product
 page, for offline products only

---
 .../edit/manager/product-seo-manager.ts       | 45 ++++++++++++++++---
 .../ProductPreferences/GeneralType.php        |  2 +-
 .../Sell/Product/EditProductFormType.php      |  1 +
 .../Form/Admin/Sell/Product/SEO/SEOType.php   | 19 +++++++-
 .../config/services/bundle/form/form_type.yml |  1 +
 .../Product/FormTheme/product_seo.html.twig   |  9 +++-
 6 files changed, 68 insertions(+), 9 deletions(-)

diff --git a/admin-dev/themes/new-theme/js/pages/product/edit/manager/product-seo-manager.ts b/admin-dev/themes/new-theme/js/pages/product/edit/manager/product-seo-manager.ts
index d8343a68ff650..09b0d92ad1e99 100644
--- a/admin-dev/themes/new-theme/js/pages/product/edit/manager/product-seo-manager.ts
+++ b/admin-dev/themes/new-theme/js/pages/product/edit/manager/product-seo-manager.ts
@@ -90,18 +90,27 @@ export default class ProductSEOManager {
       },
     });
 
+    // On reset button click we regenerate the friendly url for currently selected locale
     const resetLinkRewriteBtn = document.querySelector<HTMLButtonElement>(ProductMap.seo.resetLinkRewriteBtn)!;
     resetLinkRewriteBtn.addEventListener('click', () => this.resetLinkRewrite());
 
-    // Disable or enable reset button depending on the name input value at init, on language change and on keyup inputs
+    // Disable or enable reset button depending on the name input value at init, on language change and on keyup inputs (on name and url inputs)
     this.linkRewriteStateRefresh();
     this.eventEmitter.on('languageSelected', () => this.linkRewriteStateRefresh());
+    this.initCallbackOnInputChange(ProductMap.productLocalizedNameInput, () => this.linkRewriteStateRefresh());
+    this.initCallbackOnInputChange(ProductMap.productLocalizedLinkRewriteInput, () => this.linkRewriteStateRefresh());
 
-    const linkRewriteInputs = document.querySelectorAll(`${ProductMap.productLocalizedLinkRewriteInput}`);
+    if (resetLinkRewriteBtn.dataset.automaticChange === '1') {
+      this.initCallbackOnInputChange(ProductMap.productLocalizedNameInput, () => this.resetAllLinkRewrites());
+    }
+  }
+
+  private initCallbackOnInputChange(inputSelector: string, callback: EventListenerOrEventListenerObject): void {
+    const inputs = document.querySelectorAll(inputSelector);
 
-    if (linkRewriteInputs) {
-      for (let i = 0; i < linkRewriteInputs.length; i += 1) {
-        linkRewriteInputs[i].addEventListener('keyup', () => this.linkRewriteStateRefresh());
+    if (inputs) {
+      for (let i = 0; i < inputs.length; i += 1) {
+        inputs[i].addEventListener('keyup', callback);
       }
     }
   }
@@ -138,8 +147,32 @@ export default class ProductSEOManager {
       return;
     }
 
+    this.updateUrlInput(linkRewriteInput, nameValue);
+    resetLinkRewriteBtn.disabled = true;
+  }
+
+  private updateUrlInput(linkRewriteInput: HTMLInputElement, nameValue: string): void {
+    // eslint-disable-next-line no-param-reassign
     linkRewriteInput.value = window.str2url(nameValue);
     linkRewriteInput.dispatchEvent(new Event('change', {bubbles: true}));
-    resetLinkRewriteBtn.disabled = true;
+  }
+
+  private resetAllLinkRewrites(): void {
+    const nameInputs = document.querySelectorAll<HTMLInputElement>(ProductMap.productLocalizedNameInput);
+    nameInputs.forEach((nameInput: HTMLInputElement) => {
+      nameInput.parentElement?.classList?.forEach((parentClass:string) => {
+        // Search for class mapping js-locale-en, js-locale-fr, ...
+        if (parentClass.match(/^js-locale-[a-zA-Z]{2}$/)) {
+          const linkRewriteSelector = `.${parentClass} ${ProductMap.productLocalizedLinkRewriteInput}`;
+          const linkRewriteInput = document.querySelector<HTMLInputElement>(linkRewriteSelector);
+
+          if (linkRewriteInput) {
+            this.updateUrlInput(linkRewriteInput, nameInput.value);
+          }
+        }
+      });
+    });
+
+    this.linkRewriteStateRefresh();
   }
 }
diff --git a/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/ProductPreferences/GeneralType.php b/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/ProductPreferences/GeneralType.php
index 63cf6f6a4bc9b..96d462216e1af 100644
--- a/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/ProductPreferences/GeneralType.php
+++ b/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/ProductPreferences/GeneralType.php
@@ -135,7 +135,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'Admin.Shopparameters.Feature'
                 ),
                 'help' => $this->trans(
-                    'When active, friendly URL will be updated on every save.',
+                    'When enabled, friendly URL will be updated on every name change for offline products only.',
                     'Admin.Shopparameters.Help'
                 ),
                 'required' => false,
diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Product/EditProductFormType.php b/src/PrestaShopBundle/Form/Admin/Sell/Product/EditProductFormType.php
index b67ffc0d6c296..c7758b6e3be67 100644
--- a/src/PrestaShopBundle/Form/Admin/Sell/Product/EditProductFormType.php
+++ b/src/PrestaShopBundle/Form/Admin/Sell/Product/EditProductFormType.php
@@ -112,6 +112,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ])
             ->add('seo', SEOType::class, [
                 'product_id' => $productId,
+                'active' => $options['active'],
             ])
             ->add('options', OptionsType::class)
             ->add('extra_modules', ExtraModulesType::class, [
diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Product/SEO/SEOType.php b/src/PrestaShopBundle/Form/Admin/Sell/Product/SEO/SEOType.php
index b5930261c992f..4f3bd4322e30f 100644
--- a/src/PrestaShopBundle/Form/Admin/Sell/Product/SEO/SEOType.php
+++ b/src/PrestaShopBundle/Form/Admin/Sell/Product/SEO/SEOType.php
@@ -29,6 +29,7 @@
 namespace PrestaShopBundle\Form\Admin\Sell\Product\SEO;
 
 use PrestaShop\PrestaShop\Adapter\LegacyContext;
+use PrestaShop\PrestaShop\Core\ConfigurationInterface;
 use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\TypedRegex;
 use PrestaShop\PrestaShop\Core\ConstraintValidator\TypedRegexValidator;
 use PrestaShop\PrestaShop\Core\Domain\Product\ProductSettings;
@@ -64,6 +65,11 @@ class SEOType extends TranslatorAwareType
      */
     private $legacyContext;
 
+    /**
+     * @var ConfigurationInterface
+     */
+    private $configuration;
+
     /**
      * @param TranslatorInterface $translator
      * @param array $locales
@@ -78,13 +84,15 @@ public function __construct(
         RouterInterface $router,
         bool $friendlyUrlEnabled,
         bool $forceFriendlyUrl,
-        LegacyContext $legacyContext
+        LegacyContext $legacyContext,
+        ConfigurationInterface $configuration
     ) {
         parent::__construct($translator, $locales);
         $this->router = $router;
         $this->friendlyUrlEnabled = $friendlyUrlEnabled;
         $this->forceFriendlyUrl = $forceFriendlyUrl;
         $this->legacyContext = $legacyContext;
+        $this->configuration = $configuration;
     }
 
     /**
@@ -92,6 +100,12 @@ public function __construct(
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
+        // Automatic update is only enabled when product is offline and the configuration is enabled
+        $automaticUrlUpdate = false;
+        if (!$options['active'] && (bool) $this->configuration->get('PS_FORCE_FRIENDLY_PRODUCT')) {
+            $automaticUrlUpdate = true;
+        }
+
         $builder
             ->add('serp', SerpType::class)
             ->add('meta_title', TranslatableType::class, [
@@ -169,6 +183,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     ],
                     'attr' => [
                         'class' => 'serp-watched-url',
+                        'data-automatic-update' => (int) $automaticUrlUpdate,
                     ],
                 ],
                 'modify_all_shops' => true,
@@ -259,11 +274,13 @@ public function configureOptions(OptionsResolver $resolver)
                 'label_subtitle' => $this->trans('Improve your ranking and how your product page will appear in search engines results.', 'Admin.Catalog.Feature'),
                 'required' => false,
                 'form_theme' => '@PrestaShop/Admin/Sell/Catalog/Product/FormTheme/product_seo.html.twig',
+                'active' => false,
             ])
             ->setRequired([
                 'product_id',
             ])
             ->setAllowedTypes('product_id', 'int')
+            ->setAllowedTypes('active', ['bool'])
         ;
     }
 }
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
index 5854002b741bc..0ceee0c690df0 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
@@ -1734,6 +1734,7 @@ services:
       - "@=service('prestashop.adapter.legacy.configuration').getBoolean('PS_REWRITING_SETTINGS')"
       - "@=service('prestashop.adapter.legacy.configuration').getBoolean('PS_FORCE_FRIENDLY_PRODUCT')"
       - '@prestashop.adapter.legacy.context'
+      - '@PrestaShop\PrestaShop\Core\ConfigurationInterface'
     tags:
       - { name: form.type }
 
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Product/FormTheme/product_seo.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Product/FormTheme/product_seo.html.twig
index cb3c5dec852ef..f4dc6c0923bf4 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Product/FormTheme/product_seo.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/Product/FormTheme/product_seo.html.twig
@@ -28,5 +28,12 @@
 
 {% block _product_seo_link_rewrite_widget %}
   {{ form_widget(form) }}
-  <button type="button" class="reset-link-rewrite btn btn-outline-secondary mt-1">{{ 'Reset URL'|trans({}, 'Admin.Catalog.Feature') }}</button>
+  {% set firstChildAttr = form.children|first.vars.attr %}
+  <button
+    type="button"
+    class="reset-link-rewrite btn btn-outline-secondary mt-1"
+    data-automatic-change="{{ firstChildAttr['data-automatic-update']|default(0) }}"
+  >
+    {{ 'Generate URL from name'|trans({}, 'Admin.Catalog.Feature') }}
+  </button>
 {% endblock %}

From 788e70ba551479defc08095bfbdb214089293d9d Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Thu, 31 Aug 2023 10:18:35 +0200
Subject: [PATCH 0862/1030] Functional Tests : Moved tests from
 `campaigns/functional/BO/13_shopParameters/05_contact/*`

---
 .../05_contact/{ => 01_contacts}/01_filterContacts.ts           | 2 +-
 .../05_contact/{ => 01_contacts}/02_CRUDContact.ts              | 2 +-
 .../05_contact/{ => 01_contacts}/03_contactBulkActions.ts       | 2 +-
 .../{04_sortContacts.ts => 01_contacts/04_sortAndPagination.ts} | 2 +-
 .../{stores => 02_stores}/01_filterAndQuickEditStores.ts        | 0
 .../05_contact/{stores => 02_stores}/02_CRUDStores.ts           | 0
 .../05_contact/{stores => 02_stores}/03_bulkActionsStores.ts    | 0
 .../05_contactDetails.ts => 02_stores/04_contactDetails.ts}     | 0
 .../05_sortAndPagination.ts}                                    | 0
 9 files changed, 4 insertions(+), 4 deletions(-)
 rename tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/{ => 01_contacts}/01_filterContacts.ts (99%)
 rename tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/{ => 01_contacts}/02_CRUDContact.ts (99%)
 rename tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/{ => 01_contacts}/03_contactBulkActions.ts (99%)
 rename tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/{04_sortContacts.ts => 01_contacts/04_sortAndPagination.ts} (99%)
 rename tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/{stores => 02_stores}/01_filterAndQuickEditStores.ts (100%)
 rename tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/{stores => 02_stores}/02_CRUDStores.ts (100%)
 rename tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/{stores => 02_stores}/03_bulkActionsStores.ts (100%)
 rename tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/{stores/05_contactDetails.ts => 02_stores/04_contactDetails.ts} (100%)
 rename tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/{stores/04_sortAndPagination.ts => 02_stores/05_sortAndPagination.ts} (100%)

diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/01_filterContacts.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/01_contacts/01_filterContacts.ts
similarity index 99%
rename from tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/01_filterContacts.ts
rename to tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/01_contacts/01_filterContacts.ts
index 13643abccb5c1..141fc5c5df59f 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/01_filterContacts.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/01_contacts/01_filterContacts.ts
@@ -16,7 +16,7 @@ import Contacts from '@data/demo/contacts';
 
 import type {BrowserContext, Page} from 'playwright';
 
-const baseContext: string = 'functional_BO_shopParameters_contact_filterContacts';
+const baseContext: string = 'functional_BO_shopParameters_contact_contacts_filterContacts';
 
 // Filter Contacts
 describe('BO - Shop Parameters - Contact : Filter Contacts table', async () => {
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/02_CRUDContact.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/01_contacts/02_CRUDContact.ts
similarity index 99%
rename from tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/02_CRUDContact.ts
rename to tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/01_contacts/02_CRUDContact.ts
index 2ea0b9776f339..7df038c5dd5f1 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/02_CRUDContact.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/01_contacts/02_CRUDContact.ts
@@ -16,7 +16,7 @@ import ContactData from '@data/faker/contact';
 import {expect} from 'chai';
 import type {BrowserContext, Page} from 'playwright';
 
-const baseContext: string = 'functional_BO_shopParameters_contact_CRUDContact';
+const baseContext: string = 'functional_BO_shopParameters_contact_contacts_CRUDContact';
 
 // Create, Update and Delete contact in BO
 describe('BO - Shop Parameters - Contact : Create, Update and Delete contact in BO', async () => {
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/03_contactBulkActions.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/01_contacts/03_contactBulkActions.ts
similarity index 99%
rename from tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/03_contactBulkActions.ts
rename to tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/01_contacts/03_contactBulkActions.ts
index 1cf299c9e0540..6f2e4b53b4555 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/03_contactBulkActions.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/01_contacts/03_contactBulkActions.ts
@@ -16,7 +16,7 @@ import ContactData from '@data/faker/contact';
 import {expect} from 'chai';
 import type {BrowserContext, Page} from 'playwright';
 
-const baseContext: string = 'functional_BO_shopParameters_contact_contactBulkActions';
+const baseContext: string = 'functional_BO_shopParameters_contact_contacts_contactBulkActions';
 
 // Create contacts then delete with Bulk actions
 describe('BO - Shop Parameters - Contact : Bulk delete contacts', async () => {
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/04_sortContacts.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/01_contacts/04_sortAndPagination.ts
similarity index 99%
rename from tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/04_sortContacts.ts
rename to tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/01_contacts/04_sortAndPagination.ts
index f1c402c31d1bb..71e6a2af5ecd1 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/04_sortContacts.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/01_contacts/04_sortAndPagination.ts
@@ -13,7 +13,7 @@ import contactsPage from '@pages/BO/shopParameters/contact';
 import {expect} from 'chai';
 import type {BrowserContext, Page} from 'playwright';
 
-const baseContext: string = 'functional_BO_shopParameters_contact_sortContacts';
+const baseContext: string = 'functional_BO_shopParameters_contact_contacts_sortAndPagination';
 
 // Sort contacts by id, name, email and description
 describe('BO - Shop Parameters - Contact : Sort Contacts list', async () => {
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/stores/01_filterAndQuickEditStores.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/02_stores/01_filterAndQuickEditStores.ts
similarity index 100%
rename from tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/stores/01_filterAndQuickEditStores.ts
rename to tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/02_stores/01_filterAndQuickEditStores.ts
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/stores/02_CRUDStores.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/02_stores/02_CRUDStores.ts
similarity index 100%
rename from tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/stores/02_CRUDStores.ts
rename to tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/02_stores/02_CRUDStores.ts
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/stores/03_bulkActionsStores.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/02_stores/03_bulkActionsStores.ts
similarity index 100%
rename from tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/stores/03_bulkActionsStores.ts
rename to tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/02_stores/03_bulkActionsStores.ts
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/stores/05_contactDetails.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/02_stores/04_contactDetails.ts
similarity index 100%
rename from tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/stores/05_contactDetails.ts
rename to tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/02_stores/04_contactDetails.ts
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/stores/04_sortAndPagination.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/02_stores/05_sortAndPagination.ts
similarity index 100%
rename from tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/stores/04_sortAndPagination.ts
rename to tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/02_stores/05_sortAndPagination.ts

From 4de6ceab83392ac118ce5584c7f414db83c405ed Mon Sep 17 00:00:00 2001
From: Daniel Hlavacek <daniel.hlavacek@hotmail.cz>
Date: Thu, 31 Aug 2023 12:04:57 +0200
Subject: [PATCH 0863/1030] Add missing wording and domains

---
 install-dev/data/xml/tab.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/install-dev/data/xml/tab.xml b/install-dev/data/xml/tab.xml
index e3db904dfac8b..7c577972c3b97 100644
--- a/install-dev/data/xml/tab.xml
+++ b/install-dev/data/xml/tab.xml
@@ -631,6 +631,8 @@
                 </tab>
                 <tab id="Security" id_parent="Advanced_Parameters" active="1" enabled="1">
                     <class_name>AdminParentSecurity</class_name>
+                    <wording>Security</wording>
+                    <wording_domain>Admin.Navigation.Menu</wording_domain>
                 </tab>
                     <tab id="Security_1" id_parent="Security" active="1" enabled="1" route_name="admin_security">
                         <class_name>AdminSecurity</class_name>
@@ -639,10 +641,13 @@
                     </tab>
                     <tab id="EmployeeSessions" id_parent="Security" active="1" enabled="1" route_name="admin_security_sessions_employee_list">
                         <class_name>AdminSecuritySessionEmployee</class_name>
+                        <wording>Employee Sessions</wording>
+                        <wording_domain>Admin.Navigation.Menu</wording_domain>
                     </tab>
                     <tab id="CustomerSessions" id_parent="Security" active="1" enabled="1" route_name="admin_security_sessions_customer_list">
-
                         <class_name>AdminSecuritySessionCustomer</class_name>
+                        <wording>Customer Sessions</wording>
+                        <wording_domain>Admin.Navigation.Menu</wording_domain>
                     </tab>
 
       <!--QUICK ACCESS-->

From 3821b82711e74137556214b5a1458f81a639b27b Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Thu, 31 Aug 2023 11:47:53 +0200
Subject: [PATCH 0864/1030] Add fallback to set public properties

---
 src/PrestaShopBundle/ApiPlatform/DomainSerializer.php     | 8 +++++---
 .../Normalizer/DateTimeImmutableDenormalizer.php          | 1 -
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/PrestaShopBundle/ApiPlatform/DomainSerializer.php b/src/PrestaShopBundle/ApiPlatform/DomainSerializer.php
index d7ce9aca89895..1e442dbb4ad4e 100644
--- a/src/PrestaShopBundle/ApiPlatform/DomainSerializer.php
+++ b/src/PrestaShopBundle/ApiPlatform/DomainSerializer.php
@@ -29,6 +29,7 @@
 
 use ReflectionException;
 use ReflectionMethod;
+use Symfony\Component\PropertyAccess\PropertyAccess;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\Serializer\Serializer as SymfonySerializer;
@@ -54,11 +55,9 @@ public function __construct(Traversable $denormalizers)
     public function denormalize($data, string $type, string $format = null, array $context = []): mixed
     {
         $dataConstruct = [];
-
         $reflectionClass = new \ReflectionClass($type);
-        if($reflectionClass->getConstructor()) {
+        if ($reflectionClass->getConstructor()) {
             $constructParameters = $reflectionClass->getConstructor()->getParameters();
-
             foreach ($constructParameters as $constructParameter) {
                 if (isset($data[$constructParameter->getName()])) {
                     $dataConstruct[$constructParameter->getName()] = $data[$constructParameter->getName()];
@@ -69,6 +68,7 @@ public function denormalize($data, string $type, string $format = null, array $c
 
         $action = $this->serializer->denormalize($dataConstruct, $type, $format, $context);
 
+        $propertyAccessor = PropertyAccess::createPropertyAccessor();
         //Try to call setters
         foreach ($data as $param => $value) {
             $parameters = [];
@@ -84,6 +84,8 @@ public function denormalize($data, string $type, string $format = null, array $c
                 }
 
                 $reflectionMethod->invoke($action, ...$parameters);
+            } elseif ($propertyAccessor->isWritable($action, $param)) {
+                $propertyAccessor->setValue($action, $param, $value);
             }
         }
 
diff --git a/src/PrestaShopBundle/ApiPlatform/Normalizer/DateTimeImmutableDenormalizer.php b/src/PrestaShopBundle/ApiPlatform/Normalizer/DateTimeImmutableDenormalizer.php
index 2fd9bac6ecbd4..ddd95c03eaf05 100644
--- a/src/PrestaShopBundle/ApiPlatform/Normalizer/DateTimeImmutableDenormalizer.php
+++ b/src/PrestaShopBundle/ApiPlatform/Normalizer/DateTimeImmutableDenormalizer.php
@@ -28,7 +28,6 @@
 
 namespace PrestaShopBundle\ApiPlatform\Normalizer;
 
-use PrestaShop\Decimal\DecimalNumber;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 
 class DateTimeImmutableDenormalizer implements DenormalizerInterface

From c815c30d67f50a043669dc4994a06495a44e1131 Mon Sep 17 00:00:00 2001
From: Maxime Flasquin <maxime.flasquin@gmail.com>
Date: Thu, 31 Aug 2023 12:38:46 +0200
Subject: [PATCH 0865/1030] Add todo comment to do not forget complex
 cartRuleAction with all parameters

---
 .../Unit/PrestaShopBundle/ApiPlatform/DomainSerializerTest.php  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/Unit/PrestaShopBundle/ApiPlatform/DomainSerializerTest.php b/tests/Unit/PrestaShopBundle/ApiPlatform/DomainSerializerTest.php
index 2d9d07ac70e6b..628e28798273c 100644
--- a/tests/Unit/PrestaShopBundle/ApiPlatform/DomainSerializerTest.php
+++ b/tests/Unit/PrestaShopBundle/ApiPlatform/DomainSerializerTest.php
@@ -120,6 +120,8 @@ public function getExpectedDenormalizedData()
                 'totalQuantity' => 100,
                 'quantityPerUser' => 1,
                 'cartRuleAction' => ['freeShipping' => true],
+                //TODO: handle cartRuleAction with complex discount handle by business rules
+                // 'cartRuleAction' => ['freeShipping' => true, 'giftProduct' => ['productId': 1], 'discount' => ['amountDiscount' => ['amount' => 10]]]...
             ],
             $editCartRuleCommand,
         ];

From 30daaedf335ade7bc7685578acaad3e7641fc221 Mon Sep 17 00:00:00 2001
From: maxime-profileo <maxime.morel@profileo.com>
Date: Fri, 25 Aug 2023 10:46:57 +0400
Subject: [PATCH 0866/1030] Add htaccess to fix 33722

---
 templates/.htaccess | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 templates/.htaccess

diff --git a/templates/.htaccess b/templates/.htaccess
new file mode 100644
index 0000000000000..3de9e4008bd96
--- /dev/null
+++ b/templates/.htaccess
@@ -0,0 +1,10 @@
+# Apache 2.2
+<IfModule !mod_authz_core.c>
+    Order deny,allow
+    Deny from all
+</IfModule>
+
+# Apache 2.4
+<IfModule mod_authz_core.c>
+    Require all denied
+</IfModule>

From bc02114b3ab848eee893bd3f43873c124f14b06c Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Fri, 1 Sep 2023 11:04:15 +0200
Subject: [PATCH 0867/1030] Nightly : Fixed
 `campaigns/productV2/functional/01_filterProducts.ts`

---
 .../campaigns/productV2/functional/01_filterProducts.ts  | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/tests/UI/campaigns/productV2/functional/01_filterProducts.ts b/tests/UI/campaigns/productV2/functional/01_filterProducts.ts
index 87dc8e6a04100..0c9ba1e275961 100644
--- a/tests/UI/campaigns/productV2/functional/01_filterProducts.ts
+++ b/tests/UI/campaigns/productV2/functional/01_filterProducts.ts
@@ -265,15 +265,6 @@ describe('BO - Catalog - Products : Filter in Products Page', async () => {
       await expect(isVisible).to.be.true;
     });
 
-    it('should filter list by \'Position\' and check result', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'filterByPosition', baseContext);
-
-      await productsPage.filterProducts(page, 'position', '1', 'input');
-
-      const position = await productsPage.getTextColumn(page, 'position');
-      await expect(position).to.equal(1);
-    });
-
     it('should reset filter', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterByPosition', baseContext);
 

From ac9de49477b827f00db12a24dfec1ba2a154a7ba Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Fri, 1 Sep 2023 13:49:47 +0200
Subject: [PATCH 0868/1030] CI : TypeScript Check

---
 .github/workflows/ui_tests_code_checks.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/ui_tests_code_checks.yml b/.github/workflows/ui_tests_code_checks.yml
index a5bc3fd11bc33..d4e4ce042836b 100644
--- a/.github/workflows/ui_tests_code_checks.yml
+++ b/.github/workflows/ui_tests_code_checks.yml
@@ -64,9 +64,6 @@ jobs:
         with:
           node-version: ${{ env.NODE_VERSION }}
 
-      - name: Setup NPM
-        run: npm install -g npm@${{ env.NPM_VERSION }}
-
       - name: Install dependencies in UI tests directory
         run: npm install
 

From d75751d696dbce2ecefa9a8425ab272b2fa273f4 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Fri, 1 Sep 2023 11:20:36 +0200
Subject: [PATCH 0869/1030] Nightly : Fixed
 `campaigns/productV2/functional/01_filterProducts.ts`

---
 .../campaigns/productV2/functional/01_filterProducts.ts  | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/tests/UI/campaigns/productV2/functional/01_filterProducts.ts b/tests/UI/campaigns/productV2/functional/01_filterProducts.ts
index 90136db2a7363..7912cc962069f 100644
--- a/tests/UI/campaigns/productV2/functional/01_filterProducts.ts
+++ b/tests/UI/campaigns/productV2/functional/01_filterProducts.ts
@@ -257,15 +257,6 @@ describe('BO - Catalog - Products : Filter in Products Page', async () => {
       await expect(isVisible).to.be.true;
     });
 
-    it('should filter list by \'Position\' and check result', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'filterByPosition', baseContext);
-
-      await productsPage.filterProducts(page, 'position', '1', 'input');
-
-      const position = await productsPage.getTextColumn(page, 'position');
-      await expect(position).to.equal(1);
-    });
-
     it('should reset filter', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterByPosition', baseContext);
 

From f800bcf603300bce5e38582c713f489db03936d2 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Fri, 1 Sep 2023 14:28:37 +0200
Subject: [PATCH 0870/1030] Nightly : Fixed
 `campaigns/productV2/functional/09_footer.ts`

---
 tests/UI/campaigns/productV2/functional/09_footer.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/UI/campaigns/productV2/functional/09_footer.ts b/tests/UI/campaigns/productV2/functional/09_footer.ts
index 0f4d04ae36923..bff6bb6ebd238 100644
--- a/tests/UI/campaigns/productV2/functional/09_footer.ts
+++ b/tests/UI/campaigns/productV2/functional/09_footer.ts
@@ -53,6 +53,7 @@ describe('BO - Catalog - Products : Footer', async () => {
   it(`should filter a product named "${Products.demo_12.name}"`, async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'filterProduct', baseContext);
 
+    await productsPage.resetFilter(page);
     await productsPage.filterProducts(page, 'product_name', Products.demo_12.name, 'input');
 
     const numberOfProductsAfterFilter = await productsPage.getNumberOfProductsFromList(page);

From 102ce75f5dc195e137cfc8fbca9585ba7bceccfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@prestashop.com>
Date: Fri, 1 Sep 2023 15:17:13 +0200
Subject: [PATCH 0871/1030] Update PULL_REQUEST_TEMPLATE.md

---
 .github/PULL_REQUEST_TEMPLATE.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 662b6f3f12812..05144e343af4b 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -15,7 +15,8 @@ https://devdocs.prestashop-project.org/8/contribute/contribution-guidelines/#pul
 | Category?         | FO / BO / CO / IN / WS / TE / LO / ME / PM
 | BC breaks?        | yes / no
 | Deprecations?     | yes / no
-| How to test?      | Indicate how to verify that this change works as expected.
+| How to test?      | Indicate how to verify that this change works as expected. 
+| UI Tests          | Please run these tests (see https://github.com/PrestaShop/ga.tests.ui.pr/) and paste here the link to the run.
 | Fixed ticket?     | Fixes #{issue number here}, Fixes #{another issue number here}
 | Related PRs       | If theme, autoupgrade or other module change is needed to make this change work, provide a link to related PRs here.
 | Sponsor company   | Your company or customer's name goes here (if applicable).

From 9ac6e18f29840a9b34c58894e197cf92f9d114a0 Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Fri, 1 Sep 2023 15:39:04 +0200
Subject: [PATCH 0872/1030] Fix uninstalling modules with deleted hooks.

---
 classes/Hook.php          | 47 ++++++++++++++++++++++++++++++++-------
 classes/module/Module.php |  9 +++++---
 2 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/classes/Hook.php b/classes/Hook.php
index 727622d298b6d..ed7f4685dabac 100644
--- a/classes/Hook.php
+++ b/classes/Hook.php
@@ -637,21 +637,52 @@ public static function registerHook($module_instance, $hook_name, $shop_list = n
         return $return;
     }
 
-    public static function unregisterHook($module_instance, $hook_name, $shop_list = null)
+    /**
+     * Unhooks a module from given hook
+     *
+     * @param ModuleCore $module_instance The module to unhook
+     * @param int|string $hook_identifier Hook ID or hook name to unhook the module from
+     * @param int[]|null $shop_list List of shop ids
+     *
+     * @return bool
+     */
+    public static function unregisterHook($module_instance, $hook_identifier, $shop_list = null)
     {
-        if (is_numeric($hook_name)) {
-            // $hook_name passed it the id_hook
-            $hook_id = $hook_name;
-            $hook_name = Hook::getNameById((int) $hook_id);
+        if (is_numeric($hook_identifier)) {
+            // If we received hook ID as an integer directly, we try to find it's name
+            $hook_id = $hook_identifier;
+
+            /*
+             * Try to load hook name. The hook could be deleted, but we don't care, we can still do the job.
+             * Try/catch block is here because getNameById throws an exception when the hook is not found.
+             * It would be better if this method returned false in future versions.
+             */
+            try {
+                $hook_name = Hook::getNameById((int) $hook_identifier);
+            } catch (Exception $e) {
+            }
+
+            if (empty($hook_name)) {
+                $hook_name = '';
+            }
         } else {
-            $hook_id = Hook::getIdByName($hook_name, false);
+            // If we received hook name as a string, we try to find it's ID
+            $hook_id = Hook::getIdByName($hook_identifier, false);
+            $hook_name = $hook_identifier;
         }
 
-        if (!$hook_id) {
+        // Hook id is critical, we can't unhook anything if we don't know the ID
+        if (empty($hook_id)) {
             return false;
         }
 
-        Hook::exec('actionModuleUnRegisterHookBefore', ['object' => $module_instance, 'hook_name' => $hook_name]);
+        Hook::exec(
+            'actionModuleUnRegisterHookBefore',
+            [
+                'object' => $module_instance,
+                'hook_name' => $hook_name,
+            ]
+        );
 
         // Unregister module on hook by id
         $sql = 'DELETE FROM `' . _DB_PREFIX_ . 'hook_module`
diff --git a/classes/module/Module.php b/classes/module/Module.php
index 88462bfa40dc3..f9a7dc7ad6756 100755
--- a/classes/module/Module.php
+++ b/classes/module/Module.php
@@ -731,7 +731,7 @@ public static function getUpgradeStatus($module_name)
     }
 
     /**
-     * Delete module from datable.
+     * Uninstalls the module from database.
      *
      * @return bool result
      */
@@ -739,14 +739,14 @@ public function uninstall()
     {
         Hook::exec('actionModuleUninstallBefore', ['object' => $this]);
 
-        // Check module installation id validation
+        // Check if module instance is valid
         if (!Validate::isUnsignedId($this->id)) {
             $this->_errors[] = Context::getContext()->getTranslator()->trans('The module is not installed.', [], 'Admin.Modules.Notification');
 
             return false;
         }
 
-        // Uninstall overrides
+        // Uninstall all overrides this module may have used
         if (!$this->uninstallOverrides()) {
             return false;
         }
@@ -755,10 +755,13 @@ public function uninstall()
         $sql = 'SELECT DISTINCT(`id_hook`) FROM `' . _DB_PREFIX_ . 'hook_module` WHERE `id_module` = ' . (int) $this->id;
         $result = Db::getInstance()->executeS($sql);
         foreach ($result as $row) {
+            // Unhook this module from each of the hooks
             $this->unregisterHook((int) $row['id_hook']);
+            // Remove all hook conditions that may have been configured - don't confuse it with error exception. :-)
             $this->unregisterExceptions((int) $row['id_hook']);
         }
 
+        // Remove all configured meta data (titles, URLs etc.) for this module's front controllers
         foreach ($this->controllers as $controller) {
             $page_name = 'module-' . $this->name . '-' . $controller;
             $meta = Db::getInstance()->getValue('SELECT id_meta FROM `' . _DB_PREFIX_ . 'meta` WHERE page="' . pSQL($page_name) . '"');

From 48835b4bcfdb8276c673edc127d01f5bba7cff49 Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Fri, 1 Sep 2023 17:24:49 +0200
Subject: [PATCH 0873/1030] Minor tweaks

---
 classes/Hook.php | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/classes/Hook.php b/classes/Hook.php
index ed7f4685dabac..15afd921d6758 100644
--- a/classes/Hook.php
+++ b/classes/Hook.php
@@ -655,13 +655,14 @@ public static function unregisterHook($module_instance, $hook_identifier, $shop_
             /*
              * Try to load hook name. The hook could be deleted, but we don't care, we can still do the job.
              * Try/catch block is here because getNameById throws an exception when the hook is not found.
-             * It would be better if this method returned false in future versions.
+             * It would be better if getNameById returned false in future versions.
              */
             try {
                 $hook_name = Hook::getNameById((int) $hook_identifier);
-            } catch (Exception $e) {
+            } catch (PrestaShopObjectNotFoundException $e) {
             }
 
+            // If getting the name failed or we got some malformed hook name
             if (empty($hook_name)) {
                 $hook_name = '';
             }
@@ -676,13 +677,15 @@ public static function unregisterHook($module_instance, $hook_identifier, $shop_
             return false;
         }
 
-        Hook::exec(
-            'actionModuleUnRegisterHookBefore',
-            [
-                'object' => $module_instance,
-                'hook_name' => $hook_name,
-            ]
-        );
+        if (!empty($hook_name)) {
+            Hook::exec(
+                'actionModuleUnRegisterHookBefore',
+                [
+                    'object' => $module_instance,
+                    'hook_name' => $hook_name,
+                ]
+            );
+        }
 
         // Unregister module on hook by id
         $sql = 'DELETE FROM `' . _DB_PREFIX_ . 'hook_module`
@@ -693,13 +696,15 @@ public static function unregisterHook($module_instance, $hook_identifier, $shop_
         // Clean modules position
         $module_instance->cleanPositions($hook_id, $shop_list);
 
-        Hook::exec(
-            'actionModuleUnRegisterHookAfter',
-            [
-                'object' => $module_instance,
-                'hook_name' => $hook_name,
-            ]
-        );
+        if (!empty($hook_name)) {
+            Hook::exec(
+                'actionModuleUnRegisterHookAfter',
+                [
+                    'object' => $module_instance,
+                    'hook_name' => $hook_name,
+                ]
+            );
+        }
 
         return $result;
     }

From a6524a08f78b6f5848624a8774fe77ff45e71d65 Mon Sep 17 00:00:00 2001
From: Daniel Hlavacek <daniel.hlavacek@hotmail.cz>
Date: Fri, 1 Sep 2023 19:01:27 +0200
Subject: [PATCH 0874/1030] Update classes/Hook.php

Co-authored-by: PululuK <pululuandre@hotmail.com>
---
 classes/Hook.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/Hook.php b/classes/Hook.php
index 15afd921d6758..015b120101207 100644
--- a/classes/Hook.php
+++ b/classes/Hook.php
@@ -648,7 +648,7 @@ public static function registerHook($module_instance, $hook_name, $shop_list = n
      */
     public static function unregisterHook($module_instance, $hook_identifier, $shop_list = null)
     {
-        if (is_numeric($hook_identifier)) {
+        if (Validate::isUnsignedInt($hook_identifier)) {
             // If we received hook ID as an integer directly, we try to find it's name
             $hook_id = $hook_identifier;
 

From c9b0d4f3e39e56fe276667be69afc1c13016a4bf Mon Sep 17 00:00:00 2001
From: prestonBot <prestonBot@users.noreply.github.com>
Date: Sat, 2 Sep 2023 23:06:42 +0000
Subject: [PATCH 0875/1030] Updated PrestaShop Packages

---
 composer.lock | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/composer.lock b/composer.lock
index 5859035041342..2416086cae6d1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -6547,16 +6547,16 @@
         },
         {
             "name": "prestashop/ps_emailalerts",
-            "version": "v2.4.1",
+            "version": "v2.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PrestaShop/ps_emailalerts.git",
-                "reference": "3145d0c9beef7576bf056b22ac63a125e0c063ac"
+                "reference": "fa6011032236e48c8cdbc7ba64dd340d737d75ef"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PrestaShop/ps_emailalerts/zipball/3145d0c9beef7576bf056b22ac63a125e0c063ac",
-                "reference": "3145d0c9beef7576bf056b22ac63a125e0c063ac",
+                "url": "https://api.github.com/repos/PrestaShop/ps_emailalerts/zipball/fa6011032236e48c8cdbc7ba64dd340d737d75ef",
+                "reference": "fa6011032236e48c8cdbc7ba64dd340d737d75ef",
                 "shasum": ""
             },
             "require": {
@@ -6579,9 +6579,9 @@
             "description": "PrestaShop module ps_emailalerts",
             "homepage": "https://github.com/PrestaShop/ps_emailalerts",
             "support": {
-                "source": "https://github.com/PrestaShop/ps_emailalerts/tree/v2.4.1"
+                "source": "https://github.com/PrestaShop/ps_emailalerts/tree/v2.4.2"
             },
-            "time": "2023-03-22T16:42:26+00:00"
+            "time": "2023-09-02T00:56:29+00:00"
         },
         {
             "name": "prestashop/ps_emailsubscription",
@@ -13599,5 +13599,5 @@
     "platform-overrides": {
         "php": "7.2.5"
     },
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.6.0"
 }

From c19f79cb30c82ab285b8568f35048ac4b0643abc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Sep 2023 04:34:23 +0000
Subject: [PATCH 0876/1030] Bump @typescript-eslint/parser from 6.4.1 to 6.5.0
 in /tests/UI

Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 6.4.1 to 6.5.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.5.0/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 98 +++++++++++++++++++-------------------
 tests/UI/package.json      |  2 +-
 2 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index 1cdd5356d6d51..821278ead308b 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -34,7 +34,7 @@
         "@types/mocha": "^10.0.1",
         "@types/mochawesome": "^6.2.1",
         "@typescript-eslint/eslint-plugin": "^6.4.1",
-        "@typescript-eslint/parser": "^6.4.1",
+        "@typescript-eslint/parser": "^6.5.0",
         "babel-eslint": "^10.1.0",
         "eslint": "^8.48.0",
         "eslint-config-airbnb-base": "^15.0.0",
@@ -687,15 +687,15 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.4.1.tgz",
-      "integrity": "sha512-610G6KHymg9V7EqOaNBMtD1GgpAmGROsmfHJPXNLCU9bfIuLrkdOygltK784F6Crboyd5tBFayPB7Sf0McrQwg==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.5.0.tgz",
+      "integrity": "sha512-LMAVtR5GN8nY0G0BadkG0XIe4AcNMeyEy3DyhKGAh9k4pLSMBO7rF29JvDBpZGCmp5Pgz5RLHP6eCpSYZJQDuQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "6.4.1",
-        "@typescript-eslint/types": "6.4.1",
-        "@typescript-eslint/typescript-estree": "6.4.1",
-        "@typescript-eslint/visitor-keys": "6.4.1",
+        "@typescript-eslint/scope-manager": "6.5.0",
+        "@typescript-eslint/types": "6.5.0",
+        "@typescript-eslint/typescript-estree": "6.5.0",
+        "@typescript-eslint/visitor-keys": "6.5.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -715,13 +715,13 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.4.1.tgz",
-      "integrity": "sha512-p/OavqOQfm4/Hdrr7kvacOSFjwQ2rrDVJRPxt/o0TOWdFnjJptnjnZ+sYDR7fi4OimvIuKp+2LCkc+rt9fIW+A==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.5.0.tgz",
+      "integrity": "sha512-A8hZ7OlxURricpycp5kdPTH3XnjG85UpJS6Fn4VzeoH4T388gQJ/PGP4ole5NfKt4WDVhmLaQ/dBLNDC4Xl/Kw==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.4.1",
-        "@typescript-eslint/visitor-keys": "6.4.1"
+        "@typescript-eslint/types": "6.5.0",
+        "@typescript-eslint/visitor-keys": "6.5.0"
       },
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -732,9 +732,9 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.1.tgz",
-      "integrity": "sha512-zAAopbNuYu++ijY1GV2ylCsQsi3B8QvfPHVqhGdDcbx/NK5lkqMnCGU53amAjccSpk+LfeONxwzUhDzArSfZJg==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.5.0.tgz",
+      "integrity": "sha512-eqLLOEF5/lU8jW3Bw+8auf4lZSbbljHR2saKnYqON12G/WsJrGeeDHWuQePoEf9ro22+JkbPfWQwKEC5WwLQ3w==",
       "dev": true,
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -745,13 +745,13 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.4.1.tgz",
-      "integrity": "sha512-xF6Y7SatVE/OyV93h1xGgfOkHr2iXuo8ip0gbfzaKeGGuKiAnzS+HtVhSPx8Www243bwlW8IF7X0/B62SzFftg==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.5.0.tgz",
+      "integrity": "sha512-q0rGwSe9e5Kk/XzliB9h2LBc9tmXX25G0833r7kffbl5437FPWb2tbpIV9wAATebC/018pGa9fwPDuvGN+LxWQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.4.1",
-        "@typescript-eslint/visitor-keys": "6.4.1",
+        "@typescript-eslint/types": "6.5.0",
+        "@typescript-eslint/visitor-keys": "6.5.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -772,12 +772,12 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.1.tgz",
-      "integrity": "sha512-y/TyRJsbZPkJIZQXrHfdnxVnxyKegnpEvnRGNam7s3TRR2ykGefEWOhaef00/UUN3IZxizS7BTO3svd3lCOJRQ==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.5.0.tgz",
+      "integrity": "sha512-yCB/2wkbv3hPsh02ZS8dFQnij9VVQXJMN/gbQsaaY+zxALkZnxa/wagvLEFsAWMPv7d7lxQmNsIzGU1w/T/WyA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.4.1",
+        "@typescript-eslint/types": "6.5.0",
         "eslint-visitor-keys": "^3.4.1"
       },
       "engines": {
@@ -8464,42 +8464,42 @@
       }
     },
     "@typescript-eslint/parser": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.4.1.tgz",
-      "integrity": "sha512-610G6KHymg9V7EqOaNBMtD1GgpAmGROsmfHJPXNLCU9bfIuLrkdOygltK784F6Crboyd5tBFayPB7Sf0McrQwg==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.5.0.tgz",
+      "integrity": "sha512-LMAVtR5GN8nY0G0BadkG0XIe4AcNMeyEy3DyhKGAh9k4pLSMBO7rF29JvDBpZGCmp5Pgz5RLHP6eCpSYZJQDuQ==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "6.4.1",
-        "@typescript-eslint/types": "6.4.1",
-        "@typescript-eslint/typescript-estree": "6.4.1",
-        "@typescript-eslint/visitor-keys": "6.4.1",
+        "@typescript-eslint/scope-manager": "6.5.0",
+        "@typescript-eslint/types": "6.5.0",
+        "@typescript-eslint/typescript-estree": "6.5.0",
+        "@typescript-eslint/visitor-keys": "6.5.0",
         "debug": "^4.3.4"
       },
       "dependencies": {
         "@typescript-eslint/scope-manager": {
-          "version": "6.4.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.4.1.tgz",
-          "integrity": "sha512-p/OavqOQfm4/Hdrr7kvacOSFjwQ2rrDVJRPxt/o0TOWdFnjJptnjnZ+sYDR7fi4OimvIuKp+2LCkc+rt9fIW+A==",
+          "version": "6.5.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.5.0.tgz",
+          "integrity": "sha512-A8hZ7OlxURricpycp5kdPTH3XnjG85UpJS6Fn4VzeoH4T388gQJ/PGP4ole5NfKt4WDVhmLaQ/dBLNDC4Xl/Kw==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.4.1",
-            "@typescript-eslint/visitor-keys": "6.4.1"
+            "@typescript-eslint/types": "6.5.0",
+            "@typescript-eslint/visitor-keys": "6.5.0"
           }
         },
         "@typescript-eslint/types": {
-          "version": "6.4.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.1.tgz",
-          "integrity": "sha512-zAAopbNuYu++ijY1GV2ylCsQsi3B8QvfPHVqhGdDcbx/NK5lkqMnCGU53amAjccSpk+LfeONxwzUhDzArSfZJg==",
+          "version": "6.5.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.5.0.tgz",
+          "integrity": "sha512-eqLLOEF5/lU8jW3Bw+8auf4lZSbbljHR2saKnYqON12G/WsJrGeeDHWuQePoEf9ro22+JkbPfWQwKEC5WwLQ3w==",
           "dev": true
         },
         "@typescript-eslint/typescript-estree": {
-          "version": "6.4.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.4.1.tgz",
-          "integrity": "sha512-xF6Y7SatVE/OyV93h1xGgfOkHr2iXuo8ip0gbfzaKeGGuKiAnzS+HtVhSPx8Www243bwlW8IF7X0/B62SzFftg==",
+          "version": "6.5.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.5.0.tgz",
+          "integrity": "sha512-q0rGwSe9e5Kk/XzliB9h2LBc9tmXX25G0833r7kffbl5437FPWb2tbpIV9wAATebC/018pGa9fwPDuvGN+LxWQ==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.4.1",
-            "@typescript-eslint/visitor-keys": "6.4.1",
+            "@typescript-eslint/types": "6.5.0",
+            "@typescript-eslint/visitor-keys": "6.5.0",
             "debug": "^4.3.4",
             "globby": "^11.1.0",
             "is-glob": "^4.0.3",
@@ -8508,12 +8508,12 @@
           }
         },
         "@typescript-eslint/visitor-keys": {
-          "version": "6.4.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.1.tgz",
-          "integrity": "sha512-y/TyRJsbZPkJIZQXrHfdnxVnxyKegnpEvnRGNam7s3TRR2ykGefEWOhaef00/UUN3IZxizS7BTO3svd3lCOJRQ==",
+          "version": "6.5.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.5.0.tgz",
+          "integrity": "sha512-yCB/2wkbv3hPsh02ZS8dFQnij9VVQXJMN/gbQsaaY+zxALkZnxa/wagvLEFsAWMPv7d7lxQmNsIzGU1w/T/WyA==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.4.1",
+            "@typescript-eslint/types": "6.5.0",
             "eslint-visitor-keys": "^3.4.1"
           }
         },
diff --git a/tests/UI/package.json b/tests/UI/package.json
index 910b3abeb1d58..e0830d759e6d2 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -127,7 +127,7 @@
     "@types/mocha": "^10.0.1",
     "@types/mochawesome": "^6.2.1",
     "@typescript-eslint/eslint-plugin": "^6.4.1",
-    "@typescript-eslint/parser": "^6.4.1",
+    "@typescript-eslint/parser": "^6.5.0",
     "babel-eslint": "^10.1.0",
     "eslint": "^8.48.0",
     "eslint-config-airbnb-base": "^15.0.0",

From 03658bbd7c6024feb428d378802474261f6a9554 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Sep 2023 07:41:42 +0000
Subject: [PATCH 0877/1030] Bump @typescript-eslint/eslint-plugin from 6.4.1 to
 6.5.0 in /tests/UI

Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 6.4.1 to 6.5.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.5.0/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 234 ++++++++++++++++++-------------------
 tests/UI/package.json      |   2 +-
 2 files changed, 118 insertions(+), 118 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index 821278ead308b..70074dec553cd 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -33,7 +33,7 @@
         "@types/libsodium-wrappers": "^0.7.10",
         "@types/mocha": "^10.0.1",
         "@types/mochawesome": "^6.2.1",
-        "@typescript-eslint/eslint-plugin": "^6.4.1",
+        "@typescript-eslint/eslint-plugin": "^6.5.0",
         "@typescript-eslint/parser": "^6.5.0",
         "babel-eslint": "^10.1.0",
         "eslint": "^8.48.0",
@@ -541,16 +541,16 @@
       "dev": true
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.4.1.tgz",
-      "integrity": "sha512-3F5PtBzUW0dYlq77Lcqo13fv+58KDwUib3BddilE8ajPJT+faGgxmI9Sw+I8ZS22BYwoir9ZhNXcLi+S+I2bkw==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.5.0.tgz",
+      "integrity": "sha512-2pktILyjvMaScU6iK3925uvGU87E+N9rh372uGZgiMYwafaw9SXq86U04XPq3UH6tzRvNgBsub6x2DacHc33lw==",
       "dev": true,
       "dependencies": {
         "@eslint-community/regexpp": "^4.5.1",
-        "@typescript-eslint/scope-manager": "6.4.1",
-        "@typescript-eslint/type-utils": "6.4.1",
-        "@typescript-eslint/utils": "6.4.1",
-        "@typescript-eslint/visitor-keys": "6.4.1",
+        "@typescript-eslint/scope-manager": "6.5.0",
+        "@typescript-eslint/type-utils": "6.5.0",
+        "@typescript-eslint/utils": "6.5.0",
+        "@typescript-eslint/visitor-keys": "6.5.0",
         "debug": "^4.3.4",
         "graphemer": "^1.4.0",
         "ignore": "^5.2.4",
@@ -576,13 +576,13 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.4.1.tgz",
-      "integrity": "sha512-p/OavqOQfm4/Hdrr7kvacOSFjwQ2rrDVJRPxt/o0TOWdFnjJptnjnZ+sYDR7fi4OimvIuKp+2LCkc+rt9fIW+A==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.5.0.tgz",
+      "integrity": "sha512-A8hZ7OlxURricpycp5kdPTH3XnjG85UpJS6Fn4VzeoH4T388gQJ/PGP4ole5NfKt4WDVhmLaQ/dBLNDC4Xl/Kw==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.4.1",
-        "@typescript-eslint/visitor-keys": "6.4.1"
+        "@typescript-eslint/types": "6.5.0",
+        "@typescript-eslint/visitor-keys": "6.5.0"
       },
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -593,9 +593,9 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.1.tgz",
-      "integrity": "sha512-zAAopbNuYu++ijY1GV2ylCsQsi3B8QvfPHVqhGdDcbx/NK5lkqMnCGU53amAjccSpk+LfeONxwzUhDzArSfZJg==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.5.0.tgz",
+      "integrity": "sha512-eqLLOEF5/lU8jW3Bw+8auf4lZSbbljHR2saKnYqON12G/WsJrGeeDHWuQePoEf9ro22+JkbPfWQwKEC5WwLQ3w==",
       "dev": true,
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -606,13 +606,13 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.4.1.tgz",
-      "integrity": "sha512-xF6Y7SatVE/OyV93h1xGgfOkHr2iXuo8ip0gbfzaKeGGuKiAnzS+HtVhSPx8Www243bwlW8IF7X0/B62SzFftg==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.5.0.tgz",
+      "integrity": "sha512-q0rGwSe9e5Kk/XzliB9h2LBc9tmXX25G0833r7kffbl5437FPWb2tbpIV9wAATebC/018pGa9fwPDuvGN+LxWQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.4.1",
-        "@typescript-eslint/visitor-keys": "6.4.1",
+        "@typescript-eslint/types": "6.5.0",
+        "@typescript-eslint/visitor-keys": "6.5.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -633,17 +633,17 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.4.1.tgz",
-      "integrity": "sha512-F/6r2RieNeorU0zhqZNv89s9bDZSovv3bZQpUNOmmQK1L80/cV4KEu95YUJWi75u5PhboFoKUJBnZ4FQcoqhDw==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.5.0.tgz",
+      "integrity": "sha512-9nqtjkNykFzeVtt9Pj6lyR9WEdd8npPhhIPM992FWVkZuS6tmxHfGVnlUcjpUP2hv8r4w35nT33mlxd+Be1ACQ==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "@types/json-schema": "^7.0.12",
         "@types/semver": "^7.5.0",
-        "@typescript-eslint/scope-manager": "6.4.1",
-        "@typescript-eslint/types": "6.4.1",
-        "@typescript-eslint/typescript-estree": "6.4.1",
+        "@typescript-eslint/scope-manager": "6.5.0",
+        "@typescript-eslint/types": "6.5.0",
+        "@typescript-eslint/typescript-estree": "6.5.0",
         "semver": "^7.5.4"
       },
       "engines": {
@@ -658,12 +658,12 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.1.tgz",
-      "integrity": "sha512-y/TyRJsbZPkJIZQXrHfdnxVnxyKegnpEvnRGNam7s3TRR2ykGefEWOhaef00/UUN3IZxizS7BTO3svd3lCOJRQ==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.5.0.tgz",
+      "integrity": "sha512-yCB/2wkbv3hPsh02ZS8dFQnij9VVQXJMN/gbQsaaY+zxALkZnxa/wagvLEFsAWMPv7d7lxQmNsIzGU1w/T/WyA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.4.1",
+        "@typescript-eslint/types": "6.5.0",
         "eslint-visitor-keys": "^3.4.1"
       },
       "engines": {
@@ -818,13 +818,13 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.4.1.tgz",
-      "integrity": "sha512-7ON8M8NXh73SGZ5XvIqWHjgX2f+vvaOarNliGhjrJnv1vdjG0LVIz+ToYfPirOoBi56jxAKLfsLm40+RvxVVXA==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.5.0.tgz",
+      "integrity": "sha512-f7OcZOkRivtujIBQ4yrJNIuwyCQO1OjocVqntl9dgSIZAdKqicj3xFDqDOzHDlGCZX990LqhLQXWRnQvsapq8A==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "6.4.1",
-        "@typescript-eslint/utils": "6.4.1",
+        "@typescript-eslint/typescript-estree": "6.5.0",
+        "@typescript-eslint/utils": "6.5.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.0.1"
       },
@@ -845,13 +845,13 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/scope-manager": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.4.1.tgz",
-      "integrity": "sha512-p/OavqOQfm4/Hdrr7kvacOSFjwQ2rrDVJRPxt/o0TOWdFnjJptnjnZ+sYDR7fi4OimvIuKp+2LCkc+rt9fIW+A==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.5.0.tgz",
+      "integrity": "sha512-A8hZ7OlxURricpycp5kdPTH3XnjG85UpJS6Fn4VzeoH4T388gQJ/PGP4ole5NfKt4WDVhmLaQ/dBLNDC4Xl/Kw==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.4.1",
-        "@typescript-eslint/visitor-keys": "6.4.1"
+        "@typescript-eslint/types": "6.5.0",
+        "@typescript-eslint/visitor-keys": "6.5.0"
       },
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -862,9 +862,9 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.1.tgz",
-      "integrity": "sha512-zAAopbNuYu++ijY1GV2ylCsQsi3B8QvfPHVqhGdDcbx/NK5lkqMnCGU53amAjccSpk+LfeONxwzUhDzArSfZJg==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.5.0.tgz",
+      "integrity": "sha512-eqLLOEF5/lU8jW3Bw+8auf4lZSbbljHR2saKnYqON12G/WsJrGeeDHWuQePoEf9ro22+JkbPfWQwKEC5WwLQ3w==",
       "dev": true,
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -875,13 +875,13 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.4.1.tgz",
-      "integrity": "sha512-xF6Y7SatVE/OyV93h1xGgfOkHr2iXuo8ip0gbfzaKeGGuKiAnzS+HtVhSPx8Www243bwlW8IF7X0/B62SzFftg==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.5.0.tgz",
+      "integrity": "sha512-q0rGwSe9e5Kk/XzliB9h2LBc9tmXX25G0833r7kffbl5437FPWb2tbpIV9wAATebC/018pGa9fwPDuvGN+LxWQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.4.1",
-        "@typescript-eslint/visitor-keys": "6.4.1",
+        "@typescript-eslint/types": "6.5.0",
+        "@typescript-eslint/visitor-keys": "6.5.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -902,17 +902,17 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.4.1.tgz",
-      "integrity": "sha512-F/6r2RieNeorU0zhqZNv89s9bDZSovv3bZQpUNOmmQK1L80/cV4KEu95YUJWi75u5PhboFoKUJBnZ4FQcoqhDw==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.5.0.tgz",
+      "integrity": "sha512-9nqtjkNykFzeVtt9Pj6lyR9WEdd8npPhhIPM992FWVkZuS6tmxHfGVnlUcjpUP2hv8r4w35nT33mlxd+Be1ACQ==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "@types/json-schema": "^7.0.12",
         "@types/semver": "^7.5.0",
-        "@typescript-eslint/scope-manager": "6.4.1",
-        "@typescript-eslint/types": "6.4.1",
-        "@typescript-eslint/typescript-estree": "6.4.1",
+        "@typescript-eslint/scope-manager": "6.5.0",
+        "@typescript-eslint/types": "6.5.0",
+        "@typescript-eslint/typescript-estree": "6.5.0",
         "semver": "^7.5.4"
       },
       "engines": {
@@ -927,12 +927,12 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.1.tgz",
-      "integrity": "sha512-y/TyRJsbZPkJIZQXrHfdnxVnxyKegnpEvnRGNam7s3TRR2ykGefEWOhaef00/UUN3IZxizS7BTO3svd3lCOJRQ==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.5.0.tgz",
+      "integrity": "sha512-yCB/2wkbv3hPsh02ZS8dFQnij9VVQXJMN/gbQsaaY+zxALkZnxa/wagvLEFsAWMPv7d7lxQmNsIzGU1w/T/WyA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.4.1",
+        "@typescript-eslint/types": "6.5.0",
         "eslint-visitor-keys": "^3.4.1"
       },
       "engines": {
@@ -8381,16 +8381,16 @@
       "dev": true
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.4.1.tgz",
-      "integrity": "sha512-3F5PtBzUW0dYlq77Lcqo13fv+58KDwUib3BddilE8ajPJT+faGgxmI9Sw+I8ZS22BYwoir9ZhNXcLi+S+I2bkw==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.5.0.tgz",
+      "integrity": "sha512-2pktILyjvMaScU6iK3925uvGU87E+N9rh372uGZgiMYwafaw9SXq86U04XPq3UH6tzRvNgBsub6x2DacHc33lw==",
       "dev": true,
       "requires": {
         "@eslint-community/regexpp": "^4.5.1",
-        "@typescript-eslint/scope-manager": "6.4.1",
-        "@typescript-eslint/type-utils": "6.4.1",
-        "@typescript-eslint/utils": "6.4.1",
-        "@typescript-eslint/visitor-keys": "6.4.1",
+        "@typescript-eslint/scope-manager": "6.5.0",
+        "@typescript-eslint/type-utils": "6.5.0",
+        "@typescript-eslint/utils": "6.5.0",
+        "@typescript-eslint/visitor-keys": "6.5.0",
         "debug": "^4.3.4",
         "graphemer": "^1.4.0",
         "ignore": "^5.2.4",
@@ -8400,29 +8400,29 @@
       },
       "dependencies": {
         "@typescript-eslint/scope-manager": {
-          "version": "6.4.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.4.1.tgz",
-          "integrity": "sha512-p/OavqOQfm4/Hdrr7kvacOSFjwQ2rrDVJRPxt/o0TOWdFnjJptnjnZ+sYDR7fi4OimvIuKp+2LCkc+rt9fIW+A==",
+          "version": "6.5.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.5.0.tgz",
+          "integrity": "sha512-A8hZ7OlxURricpycp5kdPTH3XnjG85UpJS6Fn4VzeoH4T388gQJ/PGP4ole5NfKt4WDVhmLaQ/dBLNDC4Xl/Kw==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.4.1",
-            "@typescript-eslint/visitor-keys": "6.4.1"
+            "@typescript-eslint/types": "6.5.0",
+            "@typescript-eslint/visitor-keys": "6.5.0"
           }
         },
         "@typescript-eslint/types": {
-          "version": "6.4.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.1.tgz",
-          "integrity": "sha512-zAAopbNuYu++ijY1GV2ylCsQsi3B8QvfPHVqhGdDcbx/NK5lkqMnCGU53amAjccSpk+LfeONxwzUhDzArSfZJg==",
+          "version": "6.5.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.5.0.tgz",
+          "integrity": "sha512-eqLLOEF5/lU8jW3Bw+8auf4lZSbbljHR2saKnYqON12G/WsJrGeeDHWuQePoEf9ro22+JkbPfWQwKEC5WwLQ3w==",
           "dev": true
         },
         "@typescript-eslint/typescript-estree": {
-          "version": "6.4.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.4.1.tgz",
-          "integrity": "sha512-xF6Y7SatVE/OyV93h1xGgfOkHr2iXuo8ip0gbfzaKeGGuKiAnzS+HtVhSPx8Www243bwlW8IF7X0/B62SzFftg==",
+          "version": "6.5.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.5.0.tgz",
+          "integrity": "sha512-q0rGwSe9e5Kk/XzliB9h2LBc9tmXX25G0833r7kffbl5437FPWb2tbpIV9wAATebC/018pGa9fwPDuvGN+LxWQ==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.4.1",
-            "@typescript-eslint/visitor-keys": "6.4.1",
+            "@typescript-eslint/types": "6.5.0",
+            "@typescript-eslint/visitor-keys": "6.5.0",
             "debug": "^4.3.4",
             "globby": "^11.1.0",
             "is-glob": "^4.0.3",
@@ -8431,27 +8431,27 @@
           }
         },
         "@typescript-eslint/utils": {
-          "version": "6.4.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.4.1.tgz",
-          "integrity": "sha512-F/6r2RieNeorU0zhqZNv89s9bDZSovv3bZQpUNOmmQK1L80/cV4KEu95YUJWi75u5PhboFoKUJBnZ4FQcoqhDw==",
+          "version": "6.5.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.5.0.tgz",
+          "integrity": "sha512-9nqtjkNykFzeVtt9Pj6lyR9WEdd8npPhhIPM992FWVkZuS6tmxHfGVnlUcjpUP2hv8r4w35nT33mlxd+Be1ACQ==",
           "dev": true,
           "requires": {
             "@eslint-community/eslint-utils": "^4.4.0",
             "@types/json-schema": "^7.0.12",
             "@types/semver": "^7.5.0",
-            "@typescript-eslint/scope-manager": "6.4.1",
-            "@typescript-eslint/types": "6.4.1",
-            "@typescript-eslint/typescript-estree": "6.4.1",
+            "@typescript-eslint/scope-manager": "6.5.0",
+            "@typescript-eslint/types": "6.5.0",
+            "@typescript-eslint/typescript-estree": "6.5.0",
             "semver": "^7.5.4"
           }
         },
         "@typescript-eslint/visitor-keys": {
-          "version": "6.4.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.1.tgz",
-          "integrity": "sha512-y/TyRJsbZPkJIZQXrHfdnxVnxyKegnpEvnRGNam7s3TRR2ykGefEWOhaef00/UUN3IZxizS7BTO3svd3lCOJRQ==",
+          "version": "6.5.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.5.0.tgz",
+          "integrity": "sha512-yCB/2wkbv3hPsh02ZS8dFQnij9VVQXJMN/gbQsaaY+zxALkZnxa/wagvLEFsAWMPv7d7lxQmNsIzGU1w/T/WyA==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.4.1",
+            "@typescript-eslint/types": "6.5.0",
             "eslint-visitor-keys": "^3.4.1"
           }
         },
@@ -8536,41 +8536,41 @@
       }
     },
     "@typescript-eslint/type-utils": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.4.1.tgz",
-      "integrity": "sha512-7ON8M8NXh73SGZ5XvIqWHjgX2f+vvaOarNliGhjrJnv1vdjG0LVIz+ToYfPirOoBi56jxAKLfsLm40+RvxVVXA==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.5.0.tgz",
+      "integrity": "sha512-f7OcZOkRivtujIBQ4yrJNIuwyCQO1OjocVqntl9dgSIZAdKqicj3xFDqDOzHDlGCZX990LqhLQXWRnQvsapq8A==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/typescript-estree": "6.4.1",
-        "@typescript-eslint/utils": "6.4.1",
+        "@typescript-eslint/typescript-estree": "6.5.0",
+        "@typescript-eslint/utils": "6.5.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.0.1"
       },
       "dependencies": {
         "@typescript-eslint/scope-manager": {
-          "version": "6.4.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.4.1.tgz",
-          "integrity": "sha512-p/OavqOQfm4/Hdrr7kvacOSFjwQ2rrDVJRPxt/o0TOWdFnjJptnjnZ+sYDR7fi4OimvIuKp+2LCkc+rt9fIW+A==",
+          "version": "6.5.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.5.0.tgz",
+          "integrity": "sha512-A8hZ7OlxURricpycp5kdPTH3XnjG85UpJS6Fn4VzeoH4T388gQJ/PGP4ole5NfKt4WDVhmLaQ/dBLNDC4Xl/Kw==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.4.1",
-            "@typescript-eslint/visitor-keys": "6.4.1"
+            "@typescript-eslint/types": "6.5.0",
+            "@typescript-eslint/visitor-keys": "6.5.0"
           }
         },
         "@typescript-eslint/types": {
-          "version": "6.4.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.1.tgz",
-          "integrity": "sha512-zAAopbNuYu++ijY1GV2ylCsQsi3B8QvfPHVqhGdDcbx/NK5lkqMnCGU53amAjccSpk+LfeONxwzUhDzArSfZJg==",
+          "version": "6.5.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.5.0.tgz",
+          "integrity": "sha512-eqLLOEF5/lU8jW3Bw+8auf4lZSbbljHR2saKnYqON12G/WsJrGeeDHWuQePoEf9ro22+JkbPfWQwKEC5WwLQ3w==",
           "dev": true
         },
         "@typescript-eslint/typescript-estree": {
-          "version": "6.4.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.4.1.tgz",
-          "integrity": "sha512-xF6Y7SatVE/OyV93h1xGgfOkHr2iXuo8ip0gbfzaKeGGuKiAnzS+HtVhSPx8Www243bwlW8IF7X0/B62SzFftg==",
+          "version": "6.5.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.5.0.tgz",
+          "integrity": "sha512-q0rGwSe9e5Kk/XzliB9h2LBc9tmXX25G0833r7kffbl5437FPWb2tbpIV9wAATebC/018pGa9fwPDuvGN+LxWQ==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.4.1",
-            "@typescript-eslint/visitor-keys": "6.4.1",
+            "@typescript-eslint/types": "6.5.0",
+            "@typescript-eslint/visitor-keys": "6.5.0",
             "debug": "^4.3.4",
             "globby": "^11.1.0",
             "is-glob": "^4.0.3",
@@ -8579,27 +8579,27 @@
           }
         },
         "@typescript-eslint/utils": {
-          "version": "6.4.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.4.1.tgz",
-          "integrity": "sha512-F/6r2RieNeorU0zhqZNv89s9bDZSovv3bZQpUNOmmQK1L80/cV4KEu95YUJWi75u5PhboFoKUJBnZ4FQcoqhDw==",
+          "version": "6.5.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.5.0.tgz",
+          "integrity": "sha512-9nqtjkNykFzeVtt9Pj6lyR9WEdd8npPhhIPM992FWVkZuS6tmxHfGVnlUcjpUP2hv8r4w35nT33mlxd+Be1ACQ==",
           "dev": true,
           "requires": {
             "@eslint-community/eslint-utils": "^4.4.0",
             "@types/json-schema": "^7.0.12",
             "@types/semver": "^7.5.0",
-            "@typescript-eslint/scope-manager": "6.4.1",
-            "@typescript-eslint/types": "6.4.1",
-            "@typescript-eslint/typescript-estree": "6.4.1",
+            "@typescript-eslint/scope-manager": "6.5.0",
+            "@typescript-eslint/types": "6.5.0",
+            "@typescript-eslint/typescript-estree": "6.5.0",
             "semver": "^7.5.4"
           }
         },
         "@typescript-eslint/visitor-keys": {
-          "version": "6.4.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.1.tgz",
-          "integrity": "sha512-y/TyRJsbZPkJIZQXrHfdnxVnxyKegnpEvnRGNam7s3TRR2ykGefEWOhaef00/UUN3IZxizS7BTO3svd3lCOJRQ==",
+          "version": "6.5.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.5.0.tgz",
+          "integrity": "sha512-yCB/2wkbv3hPsh02ZS8dFQnij9VVQXJMN/gbQsaaY+zxALkZnxa/wagvLEFsAWMPv7d7lxQmNsIzGU1w/T/WyA==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.4.1",
+            "@typescript-eslint/types": "6.5.0",
             "eslint-visitor-keys": "^3.4.1"
           }
         },
diff --git a/tests/UI/package.json b/tests/UI/package.json
index e0830d759e6d2..15ec9c60a109d 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -126,7 +126,7 @@
     "@types/libsodium-wrappers": "^0.7.10",
     "@types/mocha": "^10.0.1",
     "@types/mochawesome": "^6.2.1",
-    "@typescript-eslint/eslint-plugin": "^6.4.1",
+    "@typescript-eslint/eslint-plugin": "^6.5.0",
     "@typescript-eslint/parser": "^6.5.0",
     "babel-eslint": "^10.1.0",
     "eslint": "^8.48.0",

From 088d9d62b6609349fac3796a3b5d7ce6bb721dcb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Sep 2023 08:36:36 +0000
Subject: [PATCH 0878/1030] Bump @types/libsodium-wrappers from 0.7.10 to
 0.7.11 in /tests/UI

Bumps [@types/libsodium-wrappers](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/libsodium-wrappers) from 0.7.10 to 0.7.11.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/libsodium-wrappers)

---
updated-dependencies:
- dependency-name: "@types/libsodium-wrappers"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 14 +++++++-------
 tests/UI/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index 70074dec553cd..73c650ea75478 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -30,7 +30,7 @@
       "devDependencies": {
         "@types/chai": "^4.3.5",
         "@types/chai-string": "^1.4.2",
-        "@types/libsodium-wrappers": "^0.7.10",
+        "@types/libsodium-wrappers": "^0.7.11",
         "@types/mocha": "^10.0.1",
         "@types/mochawesome": "^6.2.1",
         "@typescript-eslint/eslint-plugin": "^6.5.0",
@@ -487,9 +487,9 @@
       "dev": true
     },
     "node_modules/@types/libsodium-wrappers": {
-      "version": "0.7.10",
-      "resolved": "https://registry.npmjs.org/@types/libsodium-wrappers/-/libsodium-wrappers-0.7.10.tgz",
-      "integrity": "sha512-BqI9B92u+cM3ccp8mpHf+HzJ8fBlRwdmyd6+fz3p99m3V6ifT5O3zmOMi612PGkpeFeG/G6loxUnzlDNhfjPSA==",
+      "version": "0.7.11",
+      "resolved": "https://registry.npmjs.org/@types/libsodium-wrappers/-/libsodium-wrappers-0.7.11.tgz",
+      "integrity": "sha512-8avZYJny690B6lFZQEDz4PEdCgC8D8qmGE/mhJBzCwzZvsqne61tCRbtJOhxsjYMItEZd3k4SoR4xKKLnI9Ztg==",
       "dev": true
     },
     "node_modules/@types/linkify-it": {
@@ -8327,9 +8327,9 @@
       "dev": true
     },
     "@types/libsodium-wrappers": {
-      "version": "0.7.10",
-      "resolved": "https://registry.npmjs.org/@types/libsodium-wrappers/-/libsodium-wrappers-0.7.10.tgz",
-      "integrity": "sha512-BqI9B92u+cM3ccp8mpHf+HzJ8fBlRwdmyd6+fz3p99m3V6ifT5O3zmOMi612PGkpeFeG/G6loxUnzlDNhfjPSA==",
+      "version": "0.7.11",
+      "resolved": "https://registry.npmjs.org/@types/libsodium-wrappers/-/libsodium-wrappers-0.7.11.tgz",
+      "integrity": "sha512-8avZYJny690B6lFZQEDz4PEdCgC8D8qmGE/mhJBzCwzZvsqne61tCRbtJOhxsjYMItEZd3k4SoR4xKKLnI9Ztg==",
       "dev": true
     },
     "@types/linkify-it": {
diff --git a/tests/UI/package.json b/tests/UI/package.json
index 15ec9c60a109d..0740a2f3e534d 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -123,7 +123,7 @@
   "devDependencies": {
     "@types/chai": "^4.3.5",
     "@types/chai-string": "^1.4.2",
-    "@types/libsodium-wrappers": "^0.7.10",
+    "@types/libsodium-wrappers": "^0.7.11",
     "@types/mocha": "^10.0.1",
     "@types/mochawesome": "^6.2.1",
     "@typescript-eslint/eslint-plugin": "^6.5.0",

From a980ed014c442717d6ecaa864087c537fbb3ef35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@prestashop.com>
Date: Mon, 4 Sep 2023 13:09:41 +0200
Subject: [PATCH 0879/1030] Update PULL_REQUEST_TEMPLATE.md

---
 .github/PULL_REQUEST_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 05144e343af4b..acd1f50bffcf5 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -16,7 +16,7 @@ https://devdocs.prestashop-project.org/8/contribute/contribution-guidelines/#pul
 | BC breaks?        | yes / no
 | Deprecations?     | yes / no
 | How to test?      | Indicate how to verify that this change works as expected. 
-| UI Tests          | Please run these tests (see https://github.com/PrestaShop/ga.tests.ui.pr/) and paste here the link to the run.
+| UI Tests          | Please run UI tests and paste here the link to the run. [Read this page to know how to use this tool.]([link](https://www.prestashop-project.org/maintainers-guide/summary-github-lifecycle/#testing-the-pull-request))
 | Fixed ticket?     | Fixes #{issue number here}, Fixes #{another issue number here}
 | Related PRs       | If theme, autoupgrade or other module change is needed to make this change work, provide a link to related PRs here.
 | Sponsor company   | Your company or customer's name goes here (if applicable).

From 492fb89da8446ed69a510196c9ee06fb74088195 Mon Sep 17 00:00:00 2001
From: boherm <boris.hermans@prestashop.com>
Date: Mon, 4 Sep 2023 15:47:27 +0200
Subject: [PATCH 0880/1030] Make MobileQuickAccess twig component independent

---
 .../themes/new-theme/template/layout.tpl      |  4 --
 .../Layout/mobile_quick_access.html.twig      | 72 +++++++++----------
 .../Layout/mobile_quick_access.html.twig      |  7 +-
 .../Twig/Component/MobileQuickAccess.php      |  7 +-
 4 files changed, 37 insertions(+), 53 deletions(-)

diff --git a/admin-dev/themes/new-theme/template/layout.tpl b/admin-dev/themes/new-theme/template/layout.tpl
index b6026fc6d2df9..e3cfee7d90e43 100644
--- a/admin-dev/themes/new-theme/template/layout.tpl
+++ b/admin-dev/themes/new-theme/template/layout.tpl
@@ -66,10 +66,6 @@
             {render_template
               smarty_template="components/layout/mobile_quickaccess.tpl"
               twig_template="@PrestaShop/Admin/Layout/mobile_quick_access.html.twig"
-              quick_access=$quick_access
-              link=$link
-              quick_access_current_link_icon=$quick_access_current_link_icon
-              quick_access_current_link_name=$quick_access_current_link_name
             }
         </div>
 
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/mobile_quick_access.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/mobile_quick_access.html.twig
index 7698e86f0c8a2..16e25c30262b3 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/mobile_quick_access.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/mobile_quick_access.html.twig
@@ -24,49 +24,47 @@
  *#}
 <div class="component-search-quickaccess d-none">
   <p class="component-search-title">{{ 'Quick Access'|trans({}, 'Admin.Navigation.Header') }}</p>
-  {% for quick in quickAccess %}
-    <a class="dropdown-item quick-row-link{% if link.matchQuickLink(quick.link) %}{% set matchQuickLink = quick.id_quick_access %} active{% endif %}"
-      href="{{ quick.link|escape('html_attr') }}"
-      {% if quick.new_window %} target="_blank"{% endif %}
-      data-item="{{ quick.name }}"
+  {% for quickAccess in this.quickAccesses %}
+    <a class="dropdown-item quick-row-link{% if quickAccess.active %} active{% endif %}"
+      href="{{ quickAccess.link|escape('html_attr') }}"
+      {% if quickAccess.new_window %} target="_blank"{% endif %}
+      data-item="{{ quickAccess.name }}"
       >
-      {{ quick.name }}
+      {{ quickAccess.name|escape('html_attr') }}
   </a>
   {% endfor %}
   <div class="dropdown-divider"></div>
-  {% if matchQuickLink is defined %}
-  <a id="quick-remove-link"
-     class="dropdown-item js-quick-link"
-     href="#"
-     data-method="remove"
-     data-quicklink-id="{{ matchQuickLink }}"
-     data-rand="{{ random(1, 200) }}"
-     data-icon="{{ quickAccessCurrentLinkIcon }}"
-     data-url="{{ link.getQuickLink(app.request.uri) }}"
-     data-post-link="{{ link.getAdminLink('AdminQuickAccesses') }}"
-     data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header')|escape('html_attr')}}"
-     data-link="{{ quickAccessCurrentLinkName|u.truncate(32, '...') }}"
-  >
-    <i class="material-icons">remove_circle_outline</i>
-    {{ 'Remove from Quick Access'|trans({}, 'Admin.Navigation.Header') }}
-  </a>
+  {% if this.currentQuickAccess %}
+    <a id="quick-remove-link"
+       class="dropdown-item js-quick-link"
+       href="#"
+       data-method="remove"
+       data-quicklink-id="{{ this.currentQuickAccess.id_quick_access }}"
+       data-rand="{{ random(1, 200) }}"
+       data-url="{{ this.cleanCurrentUrl|escape('html_attr') }}"
+       data-post-link="{{ path('AdminQuickAccesses') }}"
+       data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header')|escape('html_attr') }}"
+       data-link="{{ this.currentQuickAccess.name|escape('html_attr') }}"
+    >
+      <i class="material-icons">remove_circle_outline</i>
+      {{ 'Remove from Quick Access'|trans({}, 'Admin.Navigation.Header') }}
+    </a>
   {% else %}
-  <a id="quick-add-link"
-     class="dropdown-item js-quick-link"
-     href="#"
-     data-rand="{{ random(1, 200) }}"
-     data-icon="{{ quickAccessCurrentLinkIcon }}"
-     data-method="add"
-     data-url="{{ link.getQuickLink(app.request.uri) }}"
-     data-post-link="{{ link.getAdminLink('AdminQuickAccesses') }}"
-     data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header')|escape('html_attr')}}"
-     data-link="{{ quickAccessCurrentLinkName|u.truncate(32, '...') }}"
-  >
-    <i class="material-icons">add_circle</i>
-    {{ 'Add current page to Quick Access'|trans({}, 'Admin.Actions') }}
-  </a>
+    <a id="quick-add-link"
+       class="dropdown-item js-quick-link"
+       href="#"
+       data-rand="{{ random(1, 200) }}"
+       data-method="add"
+       data-url="{{ this.cleanCurrentUrl|escape('html_attr') }}"
+       data-post-link="{{ path('AdminQuickAccesses') }}"
+       data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header')|escape('html_attr')}}"
+       data-link="{{ this.currentUrlTitle|escape('html_attr') }}"
+    >
+      <i class="material-icons">add_circle</i>
+      {{ 'Add current page to Quick Access'|trans({}, 'Admin.Actions') }}
+    </a>
   {% endif %}
-  <a id="quick-manage-link" class="dropdown-item" href="{{ link.getAdminLink('AdminQuickAccesses') }}">
+  <a id="quick-manage-link" class="dropdown-item" href="{{ path('AdminQuickAccesses') }}">
   <i class="material-icons">settings</i>
     {{ 'Manage your quick accesses'|trans({}, 'Admin.Navigation.Header') }}
   </a>
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/mobile_quick_access.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/mobile_quick_access.html.twig
index e1df44308bb01..8b32e7f18555a 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Layout/mobile_quick_access.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/mobile_quick_access.html.twig
@@ -22,9 +22,4 @@
  * @copyright Since 2007 PrestaShop SA and Contributors
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  *#}
-{{ component('MobileQuickAccess', {
-  quickAccess: quick_access,
-  link: link,
-  quickAccessCurrentLinkIcon: quick_access_current_link_icon,
-  quickAccessCurrentLinkName: quick_access_current_link_name
-}) }}
+{{ component('MobileQuickAccess') }}
diff --git a/src/PrestaShopBundle/Twig/Component/MobileQuickAccess.php b/src/PrestaShopBundle/Twig/Component/MobileQuickAccess.php
index 414d88da10e1f..f9f84a01c085e 100644
--- a/src/PrestaShopBundle/Twig/Component/MobileQuickAccess.php
+++ b/src/PrestaShopBundle/Twig/Component/MobileQuickAccess.php
@@ -28,14 +28,9 @@
 
 namespace PrestaShopBundle\Twig\Component;
 
-use Link;
 use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
 
 #[AsTwigComponent(template: '@PrestaShop/Admin/Component/Layout/mobile_quick_access.html.twig')]
-class MobileQuickAccess
+class MobileQuickAccess extends QuickAccess
 {
-    public array $quickAccess;
-    public Link $link;
-    public string $quickAccessCurrentLinkIcon;
-    public string $quickAccessCurrentLinkName;
 }

From f347375b87ad2d4ea159eebf2dca80791f0fc77c Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Tue, 5 Sep 2023 16:13:50 +0200
Subject: [PATCH 0881/1030] Comment routes, allow adding new ones

---
 classes/Dispatcher.php | 111 +++++++++++++++++++++++++++++++++--------
 1 file changed, 91 insertions(+), 20 deletions(-)

diff --git a/classes/Dispatcher.php b/classes/Dispatcher.php
index 4db294ae89bda..83ce41000cc69 100644
--- a/classes/Dispatcher.php
+++ b/classes/Dispatcher.php
@@ -576,13 +576,31 @@ private function buildRequestUri($requestUri, $isMultiLanguageActivated, Shop $s
      */
     protected function loadRoutes($id_shop = null)
     {
+        // Initialize shop context if not provided
         $context = Context::getContext();
-
         if (isset($context->shop) && $id_shop === null) {
             $id_shop = (int) $context->shop->id;
         }
 
-        // Load custom routes from modules
+        // Initialize language list we will be building our routes in
+        $language_ids = Language::getIDs();
+        if (isset($context->language) && !in_array($context->language->id, $language_ids)) {
+            $language_ids[] = (int) $context->language->id;
+        }
+
+        /*
+         * Step 1 - We have some default hardcoded routes initialized in $this->default_routes, these will
+         * be used as a base.
+         */
+
+        /*
+         * Step 2 - Module routes
+         * 
+         * Loads custom routes from modules for given shop. Beware that these routes are not multilanguage,
+         * passed routes will be the same for each language of the shop.
+         * 
+         * Module routes can overwrite those set in $this->default_routes, if their name matches.
+         */
         $modules_routes = Hook::exec('moduleRoutes', ['id_shop' => $id_shop], null, true, false);
         if (is_array($modules_routes) && count($modules_routes)) {
             foreach ($modules_routes as $module_route) {
@@ -603,13 +621,13 @@ protected function loadRoutes($id_shop = null)
             }
         }
 
-        $language_ids = Language::getIDs();
-
-        if (isset($context->language) && !in_array($context->language->id, $language_ids)) {
-            $language_ids[] = (int) $context->language->id;
-        }
-
-        // Set default routes
+        /*
+         * Step 3 - Initialize default routes into $this->routes that will get used.
+         * 
+         * This takes each default route we have until now and calls computeRoute upon each route.
+         * This enriches the route by a final regex and strips not needed keywords. Then, we add it
+         * to route list of each language.
+         */
         foreach ($this->default_routes as $id => $route) {
             $route = $this->computeRoute(
                 $route['rule'],
@@ -618,14 +636,15 @@ protected function loadRoutes($id_shop = null)
                 isset($route['params']) ? $route['params'] : []
             );
             foreach ($language_ids as $id_lang) {
-                // the default routes are the same, whatever the language
                 $this->routes[$id_shop][$id_lang][$id] = $route;
             }
         }
 
-        // Load the custom routes prior the defaults to avoid infinite loops
         if ($this->use_routes) {
-            // Load routes from meta table
+            /*
+             * Step 4 - Load multilanguage routes from meta table. These are static routes for pages like /bestsellers that configurable
+             * in SEO & URL section in the backoffice and don't use any parameters or keywords.
+             */
             $sql = 'SELECT m.page, ml.url_rewrite, ml.id_lang
 					FROM `' . _DB_PREFIX_ . 'meta` m
 					LEFT JOIN `' . _DB_PREFIX_ . 'meta_lang` ml ON (m.id_meta = ml.id_meta' . Shop::addSqlRestrictionOnLang('ml', (int) $id_shop) . ')
@@ -646,7 +665,8 @@ protected function loadRoutes($id_shop = null)
                 }
             }
 
-            // Set default empty route if no empty route (that's weird I know)
+            // Set default empty route if no empty route (that's weird I know).
+            // Should probably be set as default value in the constructor in 9.0.0.
             if (!$this->empty_route) {
                 $this->empty_route = [
                     'routeID' => 'index',
@@ -655,13 +675,16 @@ protected function loadRoutes($id_shop = null)
                 ];
             }
 
-            // Load custom routes
+            /*
+             * Step 5 - Custom routes set in ps_configurations. Those are configured product, category,
+             * cms etc. rules that you can configure in SEO & URL section in the backoffice.
+             * 
+             * Beware that these routes are not multilanguage, they will be the same for each language of the shop.
+             * It probably would not be difficult to make them multilanguage, if route was stored in configuration
+             * for each language.
+             */
             foreach ($this->default_routes as $route_id => $route_data) {
                 if ($custom_route = Configuration::get('PS_ROUTE_' . $route_id, null, null, $id_shop)) {
-                    if (isset($context->language) && !in_array($context->language->id, $language_ids)) {
-                        $language_ids[] = (int) $context->language->id;
-                    }
-
                     $route = $this->computeRoute(
                         $custom_route,
                         $route_data['controller'],
@@ -669,12 +692,18 @@ protected function loadRoutes($id_shop = null)
                         isset($route_data['params']) ? $route_data['params'] : []
                     );
                     foreach ($language_ids as $id_lang) {
-                        // those routes are the same, whatever the language
                         $this->routes[$id_shop][$id_lang][$route_id] = $route;
                     }
                 }
             }
         }
+
+        /*
+         * Step 6 - Allow modules to modify routes in any way or add their own multilanguage routes.
+         *
+         * Use getRoutes, addRoute, deleteRoute methods for this purpose.
+         */
+        Hook::exec('actionAfterLoadRoutes', ['dispatcher' => $this]);
     }
 
     /**
@@ -747,7 +776,9 @@ public function computeRoute($rule, $controller, array $keywords = [], array $pa
     }
 
     /**
-     * @param string $route_id Name of the route (need to be uniq,a second route with same name will override the first)
+     * Adds a new route to the list of routes. If it already exists, it will override the first one. 
+     *
+     * @param string $route_id Name of the route
      * @param string $rule Url rule
      * @param string $controller Controller to call if request uri match the rule
      * @param int $id_lang
@@ -786,6 +817,46 @@ public function addRoute(
         $this->routes[$id_shop][$id_lang][$route_id] = $route;
     }
 
+    /**
+     * Returns a list of processed routes.
+     *
+     * @return array List of routes
+     */
+    public function getRoutes() {
+        return $this->routes;
+    }
+
+    /**
+     * Removes a route from a list of calculated routes.
+     *
+     * @param string $route_id Name of the route
+     * @param int $id_lang
+     * @param int $id_shop
+     */
+    public function removeRoute(
+        $route_id,
+        $id_lang = null,
+        $id_shop = null
+    ) {
+        $context = Context::getContext();
+
+        if (isset($context->language) && $id_lang === null) {
+            $id_lang = (int) $context->language->id;
+        }
+
+        if (isset($context->shop) && $id_shop === null) {
+            $id_shop = (int) $context->shop->id;
+        }
+
+        if (!isset($this->routes[$id_shop][$id_lang][$route_id])) {
+            return false;
+        }
+
+        unset($this->routes[$id_shop][$id_lang][$route_id]);
+
+        return true;
+    }
+
     /**
      * Check if a route exists.
      *

From 5b4434b68b8dbaaf667e6ca726038e2a5692da06 Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Tue, 5 Sep 2023 20:06:01 +0200
Subject: [PATCH 0882/1030] Fix cs

---
 classes/Dispatcher.php | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/classes/Dispatcher.php b/classes/Dispatcher.php
index 83ce41000cc69..036a4a0f598fc 100644
--- a/classes/Dispatcher.php
+++ b/classes/Dispatcher.php
@@ -595,10 +595,10 @@ protected function loadRoutes($id_shop = null)
 
         /*
          * Step 2 - Module routes
-         * 
+         *
          * Loads custom routes from modules for given shop. Beware that these routes are not multilanguage,
          * passed routes will be the same for each language of the shop.
-         * 
+         *
          * Module routes can overwrite those set in $this->default_routes, if their name matches.
          */
         $modules_routes = Hook::exec('moduleRoutes', ['id_shop' => $id_shop], null, true, false);
@@ -623,7 +623,7 @@ protected function loadRoutes($id_shop = null)
 
         /*
          * Step 3 - Initialize default routes into $this->routes that will get used.
-         * 
+         *
          * This takes each default route we have until now and calls computeRoute upon each route.
          * This enriches the route by a final regex and strips not needed keywords. Then, we add it
          * to route list of each language.
@@ -678,7 +678,7 @@ protected function loadRoutes($id_shop = null)
             /*
              * Step 5 - Custom routes set in ps_configurations. Those are configured product, category,
              * cms etc. rules that you can configure in SEO & URL section in the backoffice.
-             * 
+             *
              * Beware that these routes are not multilanguage, they will be the same for each language of the shop.
              * It probably would not be difficult to make them multilanguage, if route was stored in configuration
              * for each language.
@@ -776,7 +776,7 @@ public function computeRoute($rule, $controller, array $keywords = [], array $pa
     }
 
     /**
-     * Adds a new route to the list of routes. If it already exists, it will override the first one. 
+     * Adds a new route to the list of routes. If it already exists, it will override the existing one.
      *
      * @param string $route_id Name of the route
      * @param string $rule Url rule
@@ -818,26 +818,24 @@ public function addRoute(
     }
 
     /**
-     * Returns a list of processed routes.
+     * Returns a list of processed routes getting used.
      *
      * @return array List of routes
      */
-    public function getRoutes() {
+    public function getRoutes()
+    {
         return $this->routes;
     }
 
     /**
-     * Removes a route from a list of calculated routes.
+     * Removes a route from a list of processed routes.
      *
      * @param string $route_id Name of the route
      * @param int $id_lang
      * @param int $id_shop
      */
-    public function removeRoute(
-        $route_id,
-        $id_lang = null,
-        $id_shop = null
-    ) {
+    public function removeRoute($route_id, $id_lang = null, $id_shop = null)
+    {
         $context = Context::getContext();
 
         if (isset($context->language) && $id_lang === null) {
@@ -848,13 +846,9 @@ public function removeRoute(
             $id_shop = (int) $context->shop->id;
         }
 
-        if (!isset($this->routes[$id_shop][$id_lang][$route_id])) {
-            return false;
+        if (isset($this->routes[$id_shop][$id_lang][$route_id])) {
+            unset($this->routes[$id_shop][$id_lang][$route_id]);
         }
-
-        unset($this->routes[$id_shop][$id_lang][$route_id]);
-
-        return true;
     }
 
     /**

From 7ee318a418578285205196d318067b63c23bd1ab Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Tue, 5 Sep 2023 20:12:38 +0200
Subject: [PATCH 0883/1030] Remove typo in comment

---
 classes/Dispatcher.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/Dispatcher.php b/classes/Dispatcher.php
index 036a4a0f598fc..1de2dc6e3aba5 100644
--- a/classes/Dispatcher.php
+++ b/classes/Dispatcher.php
@@ -701,7 +701,7 @@ protected function loadRoutes($id_shop = null)
         /*
          * Step 6 - Allow modules to modify routes in any way or add their own multilanguage routes.
          *
-         * Use getRoutes, addRoute, deleteRoute methods for this purpose.
+         * Use getRoutes, addRoute, removeRoute methods for this purpose.
          */
         Hook::exec('actionAfterLoadRoutes', ['dispatcher' => $this]);
     }

From 9800d78f731399c738aa93ad0348dc14a9a1f714 Mon Sep 17 00:00:00 2001
From: Jonathan Lelievre <jonathan.lelievre@prestashop.com>
Date: Wed, 6 Sep 2023 14:20:09 +0200
Subject: [PATCH 0884/1030] Add order by for attribute by position

---
 src/Adapter/Attribute/Repository/AttributeRepository.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Adapter/Attribute/Repository/AttributeRepository.php b/src/Adapter/Attribute/Repository/AttributeRepository.php
index d863ca4e8dab7..1931f35d8ae56 100644
--- a/src/Adapter/Attribute/Repository/AttributeRepository.php
+++ b/src/Adapter/Attribute/Repository/AttributeRepository.php
@@ -121,6 +121,7 @@ public function getGroupedAttributes(ShopConstraint $shopConstraint, array $attr
             )
             ->andWhere($qb->expr()->in('a.id_attribute_group', ':attributeGroupIds'))
             ->setParameter('attributeGroupIds', $attributeGroupIdValues, Connection::PARAM_INT_ARRAY)
+            ->addOrderBy('a.position', 'ASC')
         ;
 
         if (!empty($attributeIds)) {

From bfe0727f0a80e8fd64b7d3ac0516399973bdbc7a Mon Sep 17 00:00:00 2001
From: Jonathan Lelievre <jonathan.lelievre@prestashop.com>
Date: Wed, 6 Sep 2023 14:52:44 +0200
Subject: [PATCH 0885/1030] Add test about attribute value position order

---
 .../Context/AttributeFeatureContext.php       | 22 +++++++++++++++++++
 .../Attribute/list_attribute_groups.feature   |  7 ++++++
 2 files changed, 29 insertions(+)

diff --git a/tests/Integration/Behaviour/Features/Context/AttributeFeatureContext.php b/tests/Integration/Behaviour/Features/Context/AttributeFeatureContext.php
index 0c0b0c3ab9411..c8c3725e1565c 100644
--- a/tests/Integration/Behaviour/Features/Context/AttributeFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/AttributeFeatureContext.php
@@ -91,6 +91,28 @@ public function associateAttributeWithShops(string $attributeReference, string $
         $attribute->associateTo($this->referencesToIds($shopReferences));
     }
 
+    /**
+     * @Given /^I switch positions of attributes "(.+)" and "(.+)"$/
+     *
+     * @param string $attributeReference
+     * @param string $secondAttributeReference
+     *
+     * @return void
+     */
+    public function switchAttributePosition(string $attributeReference, string $secondAttributeReference): void
+    {
+        $attributeId = $this->getSharedStorage()->get($attributeReference);
+        $secondAttributeId = $this->getSharedStorage()->get($secondAttributeReference);
+        $attribute = new ProductAttribute($attributeId);
+        $secondAttribute = new ProductAttribute($secondAttributeId);
+
+        $position = (int) $attribute->position;
+        $attribute->position = $secondAttribute->position;
+        $secondAttribute->position = $position;
+        $attribute->save();
+        $secondAttribute->save();
+    }
+
     /**
      * @Given attribute ":attributeReference" is not associated to shops ":shopReferences"
      *
diff --git a/tests/Integration/Behaviour/Features/Scenario/Attribute/list_attribute_groups.feature b/tests/Integration/Behaviour/Features/Scenario/Attribute/list_attribute_groups.feature
index 9bcaf9045374d..d039b7acc550b 100644
--- a/tests/Integration/Behaviour/Features/Scenario/Attribute/list_attribute_groups.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/Attribute/list_attribute_groups.feature
@@ -61,3 +61,10 @@ Feature: Attribute Group
       | Yellow      | #F1C40F | 11       | yellow    |
       | Brown       | #964B00 | 12       | brown     |
       | Pink        | #FCCACD | 13       | pink      |
+    When I switch positions of attributes "s" and "xl"
+    Then the attribute group "size" should have the following attributes:
+      | name[en-US] | color | position | reference |
+      | XL          |       | 0        | xl        |
+      | M           |       | 1        | m         |
+      | L           |       | 2        | l         |
+      | S           |       | 3        | s         |

From 45d1e4a426be44af37488be5fe5945a07314ad76 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Thu, 7 Sep 2023 12:16:27 +0200
Subject: [PATCH 0886/1030] Nightly: Fixed
 `campaigns/productV2/functional/03_CRUDProductWithCombinations.ts`

---
 .../pages/BO/catalog/productsV2/add/index.ts  | 31 +++++++++++++++++--
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/tests/UI/pages/BO/catalog/productsV2/add/index.ts b/tests/UI/pages/BO/catalog/productsV2/add/index.ts
index ccc7a344eea04..624d0329dae85 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/index.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/index.ts
@@ -29,6 +29,8 @@ class CreateProduct extends BOBasePage {
 
   private readonly productActiveSwitchButton: string;
 
+  private readonly productActiveSwitchButtonToggleInput: string;
+
   private readonly productHeaderSummary: string;
 
   private readonly productHeaderTaxExcluded: string;
@@ -76,7 +78,8 @@ class CreateProduct extends BOBasePage {
 
     // Header selectors
     this.productNameInput = '#product_header_name_1';
-    this.productActiveSwitchButton = '#product_header_active_1';
+    this.productActiveSwitchButton = '#product_header_active.ps-switch';
+    this.productActiveSwitchButtonToggleInput = `${this.productActiveSwitchButton} input`;
     this.productHeaderSummary = '.product-header-summary';
     this.productHeaderTaxExcluded = `${this.productHeaderSummary} div[data-role=price-tax-excluded]`;
     this.productHeaderTaxIncluded = `${this.productHeaderSummary} div[data-role=price-tax-included]`;
@@ -134,8 +137,30 @@ class CreateProduct extends BOBasePage {
    * @param status {boolean} The product status
    * @returns {Promise<void>}
    */
-  async setProductStatus(page: Page, status: boolean): Promise<void> {
-    await this.setChecked(page, this.productActiveSwitchButton, status);
+  async setProductStatus(page: Page, status: boolean): Promise<boolean> {
+    if (await this.getProductStatus(page) !== status) {
+      await this.clickAndWaitForLoadState(page, this.productActiveSwitchButton);
+      return true;
+    }
+
+    return false;
+  }
+
+  /**
+   * Get product status
+   * @param page {Page} Browser tab
+   * @returns {Promise<void>}
+   */
+  async getProductStatus(page: Page): Promise<boolean> {
+    // Get value of the check input
+    const inputValue = await this.getAttributeContent(
+      page,
+      `${this.productActiveSwitchButtonToggleInput}:checked`,
+      'value',
+    );
+
+    // Return status=false if value='0' and true otherwise
+    return (inputValue !== '0');
   }
 
   /**

From 8cad22aafc7b75725da282843f1866748f49fb1c Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Thu, 7 Sep 2023 14:33:48 +0200
Subject: [PATCH 0887/1030] Allow modules to provide language link params in
 correct languages

---
 classes/Link.php              | 7 ++++++-
 install-dev/data/xml/hook.xml | 5 +++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/classes/Link.php b/classes/Link.php
index e8bbae06934e8..5dd55302b1cef 100644
--- a/classes/Link.php
+++ b/classes/Link.php
@@ -1180,7 +1180,7 @@ public function getCatImageLink($name, $idCategory, $type = null, string $extens
     }
 
     /**
-     * Create link after language change, for the change language block.
+     * Retrieves a link for the current page in different language.
      *
      * @param int $idLang Language ID
      * @param Context|null $context the context if needed
@@ -1223,6 +1223,11 @@ public function getLanguageLink($idLang, Context $context = null)
         } elseif (isset($params['fc']) && $params['fc'] == 'module') {
             $module = Validate::isModuleName(Tools::getValue('module')) ? Tools::getValue('module') : '';
             if (!empty($module)) {
+                // Let modules provide correct $params to build the URL if they need to (rewrites in correct language).
+                Hook::exec(
+                    'actionLanguageLinkParameters',
+                    ['linkParams' => &$params, 'linkIdLang' => (int) $idLang]
+                );
                 unset($params['fc'], $params['module']);
 
                 return $this->getModuleLink($module, $controller, $params, null, (int) $idLang);
diff --git a/install-dev/data/xml/hook.xml b/install-dev/data/xml/hook.xml
index e0c0e89ac7960..11bedee9b5272 100644
--- a/install-dev/data/xml/hook.xml
+++ b/install-dev/data/xml/hook.xml
@@ -4504,5 +4504,10 @@
       <title>Modify back office breadcrumb</title>
       <description>This hook allows modifying back office breadcrumb</description>
     </hook>
+    <hook id="actionLanguageLinkParameters">
+      <name>actionLanguageLinkParameters</name>
+      <title>Add parameters to language link</title>
+      <description>Allows modules to provide proper parameters for links in other languages.</description>
+    </hook>
   </entities>
 </entity_hook>

From aa8de58dd8db5261dd0699904bcbd6aba113f05c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@prestashop.com>
Date: Thu, 7 Sep 2023 21:40:00 +0200
Subject: [PATCH 0888/1030] Change URL page

---
 .github/PULL_REQUEST_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index acd1f50bffcf5..def929d7c71be 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -16,7 +16,7 @@ https://devdocs.prestashop-project.org/8/contribute/contribution-guidelines/#pul
 | BC breaks?        | yes / no
 | Deprecations?     | yes / no
 | How to test?      | Indicate how to verify that this change works as expected. 
-| UI Tests          | Please run UI tests and paste here the link to the run. [Read this page to know how to use this tool.]([link](https://www.prestashop-project.org/maintainers-guide/summary-github-lifecycle/#testing-the-pull-request))
+| UI Tests          | Please run UI tests and paste here the link to the run. [Read this page to know why and how to use this tool.](https://devdocs.prestashop-project.org/8/contribute/contribution-guidelines/ui-tests/). 
 | Fixed ticket?     | Fixes #{issue number here}, Fixes #{another issue number here}
 | Related PRs       | If theme, autoupgrade or other module change is needed to make this change work, provide a link to related PRs here.
 | Sponsor company   | Your company or customer's name goes here (if applicable).

From 686f7d744bab35bbe3d002adbef4e256aa1abe28 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Fri, 4 Feb 2022 15:43:49 +0100
Subject: [PATCH 0889/1030] Finish the migration of Order Statuses

---
 .../statuses/helpers/form/form.tpl            | 117 ---
 .../statuses/helpers/form/index.php           |  35 -
 .../controllers/statuses/helpers/index.php    |  35 -
 .../template/controllers/statuses/index.php   |  35 -
 .../new-theme/js/pages/order-states/index.ts  |   6 +
 .../new-theme/scss/pages/_order_states.scss   |   8 +
 controllers/admin/AdminStatusesController.php | 771 ------------------
 .../CommandHandler/AddOrderStateHandler.php   |   4 +-
 .../BulkDeleteOrderReturnStateCommand.php     |   2 +-
 .../Command/BulkDeleteOrderStateCommand.php   |   2 +-
 ...OrderReturnStatesGridDefinitionFactory.php |   3 +-
 .../OrderStatesGridDefinitionFactory.php      |   3 +-
 .../OrderReturnStateType.php                  |   2 +-
 .../OrderStates/OrderStateType.php            |   5 +-
 .../shop_parameters/order_states.yml          |   2 -
 .../controller/AdminControllerTest.php        |   1 -
 .../FrameworkBundleAdminControllerTest.php    |   4 +
 17 files changed, 30 insertions(+), 1005 deletions(-)
 delete mode 100644 admin-dev/themes/default/template/controllers/statuses/helpers/form/form.tpl
 delete mode 100644 admin-dev/themes/default/template/controllers/statuses/helpers/form/index.php
 delete mode 100644 admin-dev/themes/default/template/controllers/statuses/helpers/index.php
 delete mode 100644 admin-dev/themes/default/template/controllers/statuses/index.php
 delete mode 100644 controllers/admin/AdminStatusesController.php

diff --git a/admin-dev/themes/default/template/controllers/statuses/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/statuses/helpers/form/form.tpl
deleted file mode 100644
index 552766a650ff5..0000000000000
--- a/admin-dev/themes/default/template/controllers/statuses/helpers/form/form.tpl
+++ /dev/null
@@ -1,117 +0,0 @@
-{**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- *}
-{extends file="helpers/form/form.tpl"}
-
-{block name="label"}
-	{if $input.type == "select_template"}
-		<div id="tpl" style="display:{if isset($fields_value.send_email) && $fields_value.send_email}block{else}none{/if}">
-	{/if}
-	{$smarty.block.parent}
-{/block}
-
-{block name="input"}
-	{if $input.type == "select_template"}
-	<div class="col-lg-9">
-		<div class="row">
-		{foreach $languages as $language}
-			{assign var='value_text' value=$fields_value[$input.name][$language.id_lang]}
-			<div class="translatable-field lang-{$language.id_lang}" {if $language.id_lang != $defaultFormLanguage}style="display:none"{/if}>
-				<div class="col-lg-8">
-					<select name="{$input.name}_{$language.id_lang}"
-							id="{$input.name}_select_{$language.id_lang}"
-							{if isset($input.multiple)}multiple="multiple" {/if}
-							{if isset($input.size)}size="{$input.size}"{/if}
-							{if isset($input.onchange)}onchange="{$input.onchange}"{/if}>
-						{if isset($input.options.query[$language.iso_code]) && $input.options.query[$language.iso_code]}
-							{foreach $input.options.query[$language.iso_code] AS $option}
-								<option value="{$option[$input.options.id]}"
-									{if isset($input.multiple)}
-										{foreach $fields_value[$input.name] as $field_value}
-											{if $field_value == $option[$input.options.id]}selected="selected"{/if}
-										{/foreach}
-									{else}
-										{if isset($fields_value[$input.name][$language.id_lang]) && ($fields_value[$input.name][$language.id_lang] == $option[$input.options.id])}selected="selected"{/if}
-									{/if}
-									data-preview="{$option[$input.options.folder]}"
-								>{$option[$input.options.name]|escape:'html':'UTF-8'}</option>
-							{/foreach}
-						{/if}
-					</select>
-				</div>
-				<div class="col-lg-4">
-					<button type="button" class="btn btn-default dropdown-toggle" tabindex="-1" data-toggle="dropdown">
-						{$language.iso_code}
-						<span class="caret"></span>
-					</button>
-					<ul class="dropdown-menu">
-						{foreach from=$languages item=language_flag}
-						<li>
-							<a href="javascript:hideOtherLanguage({$language_flag.id_lang});" tabindex="-1">{$language_flag.name}</a>
-						</li>
-						{/foreach}
-					</ul>
-					<button type="button" class="btn btn-default" onclick="viewTemplates('#template_select_{$language.id_lang}', '{$language.iso_code}/', '.html');">
-						<i class="icon-eye-open"></i>
-						{l s='Preview' d='Admin.Actions'}
-					</button>
-				</div>
-			</div>
-		{/foreach}
-			{if isset($input.hint)}
-			<div class="clearfix">&nbsp;</div>
-			<div class="col-lg-9">
-				<div class="alert alert-info">
-				{if is_array($input.hint)}
-					{foreach from=$input.hint item=hint}
-						{$hint}<br/>
-					{/foreach}
-				{else}
-					{$input.hint}
-				{/if}
-				</div>
-			</div>
-		{/if}
-		</div>
-	</div>
-
-	{else}
-		{$smarty.block.parent}
-	{/if}
-{/block}
-
-{block name="field"}
-	{$smarty.block.parent}
-	{if $input.type == "select_template"}
-		</div>
-	{/if}
-{/block}
-
-{block name="script"}
-	$(function() {
-		$('#send_email_on').on('click', function() {
-			$('#tpl').slideToggle();
-		});
-	});
-{/block}
diff --git a/admin-dev/themes/default/template/controllers/statuses/helpers/form/index.php b/admin-dev/themes/default/template/controllers/statuses/helpers/form/index.php
deleted file mode 100644
index 3de54df1f73e7..0000000000000
--- a/admin-dev/themes/default/template/controllers/statuses/helpers/form/index.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
-
-header('Cache-Control: no-store, no-cache, must-revalidate');
-header('Cache-Control: post-check=0, pre-check=0', false);
-header('Pragma: no-cache');
-
-header('Location: ../../../../../../../../');
-exit;
diff --git a/admin-dev/themes/default/template/controllers/statuses/helpers/index.php b/admin-dev/themes/default/template/controllers/statuses/helpers/index.php
deleted file mode 100644
index b459cc3ae5750..0000000000000
--- a/admin-dev/themes/default/template/controllers/statuses/helpers/index.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
-
-header('Cache-Control: no-store, no-cache, must-revalidate');
-header('Cache-Control: post-check=0, pre-check=0', false);
-header('Pragma: no-cache');
-
-header('Location: ../../../../../../../');
-exit;
diff --git a/admin-dev/themes/default/template/controllers/statuses/index.php b/admin-dev/themes/default/template/controllers/statuses/index.php
deleted file mode 100644
index 6c011614e2845..0000000000000
--- a/admin-dev/themes/default/template/controllers/statuses/index.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
-
-header('Cache-Control: no-store, no-cache, must-revalidate');
-header('Cache-Control: post-check=0, pre-check=0', false);
-header('Pragma: no-cache');
-
-header('Location: ../../../../../../');
-exit;
diff --git a/admin-dev/themes/new-theme/js/pages/order-states/index.ts b/admin-dev/themes/new-theme/js/pages/order-states/index.ts
index 8a403d543d75f..2ffdf47668fbb 100644
--- a/admin-dev/themes/new-theme/js/pages/order-states/index.ts
+++ b/admin-dev/themes/new-theme/js/pages/order-states/index.ts
@@ -32,6 +32,8 @@ import ColumnTogglingExtension from '@components/grid/extension/column-toggling-
 import SubmitBulkActionExtension from '@components/grid/extension/submit-bulk-action-extension';
 import BulkActionCheckboxExtension from '@components/grid/extension/bulk-action-checkbox-extension';
 import SubmitRowActionExtension from '@components/grid/extension/action/row/submit-row-action-extension';
+import SubmitGridExtension from '@components/grid/extension/submit-grid-action-extension';
+import FiltersSubmitButtonEnablerExtension from '@components/grid/extension/filters-submit-button-enabler-extension';
 
 const {$} = window;
 
@@ -39,10 +41,12 @@ $(() => {
   const orderStatesGrid = new Grid('order_states');
 
   orderStatesGrid.addExtension(new FiltersResetExtension());
+  orderStatesGrid.addExtension(new FiltersSubmitButtonEnablerExtension());
   orderStatesGrid.addExtension(new SortingExtension());
   orderStatesGrid.addExtension(new ExportToSqlManagerExtension());
   orderStatesGrid.addExtension(new ReloadListActionExtension());
   orderStatesGrid.addExtension(new BulkActionCheckboxExtension());
+  orderStatesGrid.addExtension(new SubmitGridExtension());
   orderStatesGrid.addExtension(new SubmitBulkActionExtension());
   orderStatesGrid.addExtension(new SubmitRowActionExtension());
   orderStatesGrid.addExtension(new ColumnTogglingExtension());
@@ -50,10 +54,12 @@ $(() => {
   const orderReturnStatusesGrid = new Grid('order_return_states');
 
   orderReturnStatusesGrid.addExtension(new FiltersResetExtension());
+  orderReturnStatusesGrid.addExtension(new FiltersSubmitButtonEnablerExtension());
   orderReturnStatusesGrid.addExtension(new SortingExtension());
   orderReturnStatusesGrid.addExtension(new ExportToSqlManagerExtension());
   orderReturnStatusesGrid.addExtension(new ReloadListActionExtension());
   orderReturnStatusesGrid.addExtension(new BulkActionCheckboxExtension());
+  orderReturnStatusesGrid.addExtension(new SubmitGridExtension());
   orderReturnStatusesGrid.addExtension(new SubmitBulkActionExtension());
   orderReturnStatusesGrid.addExtension(new SubmitRowActionExtension());
 });
diff --git a/admin-dev/themes/new-theme/scss/pages/_order_states.scss b/admin-dev/themes/new-theme/scss/pages/_order_states.scss
index 3e8195a72876b..657688de36701 100644
--- a/admin-dev/themes/new-theme/scss/pages/_order_states.scss
+++ b/admin-dev/themes/new-theme/scss/pages/_order_states.scss
@@ -7,4 +7,12 @@ table#order_return_states_grid_table {
       }
     }
   }
+
+  tbody {
+    .color-type.column-name {
+      .badge {
+        font-size: inherit;
+      }
+    }
+  }
 }
diff --git a/controllers/admin/AdminStatusesController.php b/controllers/admin/AdminStatusesController.php
deleted file mode 100644
index 53bdf8d2389a6..0000000000000
--- a/controllers/admin/AdminStatusesController.php
+++ /dev/null
@@ -1,771 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-/**
- * @property OrderState $object
- */
-class AdminStatusesControllerCore extends AdminController
-{
-    public function __construct()
-    {
-        $this->bootstrap = true;
-        $this->table = 'order_state';
-        $this->className = 'OrderState';
-        $this->lang = true;
-        $this->deleted = true;
-        $this->colorOnBackground = false;
-        $this->multishop_context = Shop::CONTEXT_ALL;
-        $this->imageType = 'gif';
-        $this->fieldImageSettings = [
-            'name' => 'icon',
-            'dir' => 'os',
-        ];
-
-        parent::__construct();
-
-        $this->bulk_actions = ['delete' => ['text' => $this->trans('Delete selected', [], 'Admin.Actions'), 'confirm' => $this->trans('Delete selected items?', [], 'Admin.Notifications.Warning')]];
-    }
-
-    public function init()
-    {
-        if (Tools::isSubmit('addorder_return_state')) {
-            $this->display = 'add';
-        }
-        if (Tools::isSubmit('updateorder_return_state')) {
-            $this->display = 'edit';
-        }
-
-        return parent::init();
-    }
-
-    /**
-     * init all variables to render the order status list.
-     */
-    protected function initOrderStatusList(): void
-    {
-        $this->table = 'order_state';
-        $this->className = 'OrderState';
-        $this->_defaultOrderBy = $this->identifier = 'id_order_state';
-        $this->list_id = 'order_state';
-        $this->deleted = true;
-        $this->_orderBy = null;
-        $this->fields_list = [
-            'id_order_state' => [
-                'title' => $this->trans('ID', [], 'Admin.Global'),
-                'align' => 'text-center',
-                'class' => 'fixed-width-xs',
-            ],
-            'name' => [
-                'title' => $this->trans('Name', [], 'Admin.Global'),
-                'width' => 'auto',
-                'color' => 'color',
-            ],
-            'logo' => [
-                'title' => $this->trans('Icon', [], 'Admin.Shopparameters.Feature'),
-                'align' => 'text-center',
-                'image' => 'os',
-                'orderby' => false,
-                'search' => false,
-                'class' => 'fixed-width-xs',
-            ],
-            'send_email' => [
-                'title' => $this->trans('Send email to customer', [], 'Admin.Shopparameters.Feature'),
-                'align' => 'text-center',
-                'active' => 'sendEmail',
-                'type' => 'bool',
-                'ajax' => true,
-                'orderby' => false,
-                'class' => 'fixed-width-sm',
-            ],
-            'delivery' => [
-                'title' => $this->trans('Delivery', [], 'Admin.Global'),
-                'align' => 'text-center',
-                'active' => 'delivery',
-                'type' => 'bool',
-                'ajax' => true,
-                'orderby' => false,
-                'class' => 'fixed-width-sm',
-            ],
-            'invoice' => [
-                'title' => $this->trans('Invoice', [], 'Admin.Global'),
-                'align' => 'text-center',
-                'active' => 'invoice',
-                'type' => 'bool',
-                'ajax' => true,
-                'orderby' => false,
-                'class' => 'fixed-width-sm',
-            ],
-            'template' => [
-                'title' => $this->trans('Email template', [], 'Admin.Shopparameters.Feature'),
-            ],
-        ];
-    }
-
-    /**
-     * Init all variables to render the order status list.
-     *
-     * @deprecated Use `initOrderStatusList`
-     */
-    protected function initOrderStatutsList()
-    {
-        $this->initOrderStatusList();
-    }
-
-    /**
-     * init all variables to render the order return list.
-     */
-    protected function initOrdersReturnsList()
-    {
-        $this->table = 'order_return_state';
-        $this->className = 'OrderReturnState';
-        $this->_defaultOrderBy = $this->identifier = 'id_order_return_state';
-        $this->list_id = 'order_return_state';
-        $this->deleted = false;
-        $this->_orderBy = null;
-
-        $this->fields_list = [
-            'id_order_return_state' => [
-                'title' => $this->trans('ID', [], 'Admin.Global'),
-                'align' => 'center',
-                'class' => 'fixed-width-xs',
-            ],
-            'name' => [
-                'title' => $this->trans('Name', [], 'Admin.Global'),
-                'align' => 'left',
-                'width' => 'auto',
-                'color' => 'color',
-            ],
-        ];
-    }
-
-    protected function initOrderReturnsForm()
-    {
-        $id_order_return_state = (int) Tools::getValue('id_order_return_state');
-
-        // Create Object OrderReturnState
-        $order_return_state = new OrderReturnState($id_order_return_state);
-
-        //init field form variable for order return form
-        $this->fields_form = [];
-
-        //$this->initToolbar();
-        $this->getlanguages();
-        $helper = new HelperForm();
-        $helper->currentIndex = self::$currentIndex;
-        $helper->token = $this->token;
-        $helper->table = 'order_return_state';
-        $helper->identifier = 'id_order_return_state';
-        $helper->id = $order_return_state->id;
-        $helper->toolbar_scroll = false;
-        $helper->languages = $this->_languages;
-        $helper->default_form_language = $this->default_form_language;
-        $helper->allow_employee_form_lang = $this->allow_employee_form_lang;
-
-        if ($order_return_state->id) {
-            $helper->fields_value = [
-                'name' => $this->getFieldValue($order_return_state, 'name'),
-                'color' => $this->getFieldValue($order_return_state, 'color'),
-            ];
-        } else {
-            $helper->fields_value = [
-                'name' => $this->getFieldValue($order_return_state, 'name'),
-                'color' => '#ffffff',
-            ];
-        }
-
-        $helper->toolbar_btn = $this->toolbar_btn;
-        $helper->title = $this->trans('Edit return status', [], 'Admin.Shopparameters.Feature');
-
-        return $helper;
-    }
-
-    public function initPageHeaderToolbar()
-    {
-        if (empty($this->display)) {
-            $this->page_header_toolbar_btn['new_order_state'] = [
-                'href' => self::$currentIndex . '&addorder_state&token=' . $this->token,
-                'desc' => $this->trans('Add new order status', [], 'Admin.Shopparameters.Feature'),
-                'icon' => 'process-icon-new',
-            ];
-            $this->page_header_toolbar_btn['new_order_return_state'] = [
-                'href' => self::$currentIndex . '&addorder_return_state&token=' . $this->token,
-                'desc' => $this->trans('Add new order return status', [], 'Admin.Shopparameters.Feature'),
-                'icon' => 'process-icon-new',
-            ];
-        }
-
-        parent::initPageHeaderToolbar();
-    }
-
-    /**
-     * Function used to render the list to display for this controller.
-     */
-    public function renderList()
-    {
-        //init and render the first list
-        $this->addRowAction('edit');
-        $this->addRowAction('delete');
-        $this->addRowActionSkipList('delete', $this->getUnremovableStatuses());
-        $this->bulk_actions = [
-            'delete' => [
-                'text' => $this->trans('Delete selected', [], 'Admin.Actions'),
-                'confirm' => $this->trans('Delete selected items?', [], 'Admin.Notifications.Warning'),
-                'icon' => 'icon-trash',
-            ],
-        ];
-        $this->initOrderStatusList();
-        $lists = parent::renderList();
-
-        //init and render the second list
-        $this->list_skip_actions = [];
-        $this->_filter = false;
-        $this->addRowActionSkipList('delete', [1, 2, 3, 4, 5]);
-        $this->initOrdersReturnsList();
-        $this->checkFilterForOrdersReturnsList();
-
-        // call postProcess() to take care of actions and filters
-        $this->postProcess();
-        $this->toolbar_title = $this->trans('Return statuses', [], 'Admin.Shopparameters.Feature');
-
-        parent::initToolbar();
-        $lists .= parent::renderList();
-
-        return $lists;
-    }
-
-    protected function getUnremovableStatuses()
-    {
-        return array_map(function ($row) {
-            return (int) $row['id_order_state'];
-        }, Db::getInstance()->executeS('SELECT id_order_state FROM ' . _DB_PREFIX_ . 'order_state WHERE unremovable = 1'));
-    }
-
-    protected function checkFilterForOrdersReturnsList()
-    {
-        // test if a filter is applied for this list
-        if (Tools::isSubmit('submitFilter' . $this->table) || $this->context->cookie->{'submitFilter' . $this->table} !== false) {
-            $this->filter = true;
-        }
-
-        // test if a filter reset request is required for this list
-        if (isset($_POST['submitReset' . $this->table])) {
-            $this->action = 'reset_filters';
-        } else {
-            $this->action = '';
-        }
-    }
-
-    public function renderForm()
-    {
-        $this->fields_form = [
-            'tinymce' => true,
-            'legend' => [
-                'title' => $this->trans('Order status', [], 'Admin.Shopparameters.Feature'),
-                'icon' => 'icon-time',
-            ],
-            'input' => [
-                [
-                    'type' => 'text',
-                    'label' => $this->trans('Status name', [], 'Admin.Shopparameters.Feature'),
-                    'name' => 'name',
-                    'lang' => true,
-                    'required' => true,
-                    'hint' => [
-                        $this->trans('Order status (e.g. \'Pending\').', [], 'Admin.Shopparameters.Help'),
-                        $this->trans('Invalid characters: numbers and', [], 'Admin.Shopparameters.Help') . ' !<>,;?=+()@#"{}_$%:',
-                    ],
-                ],
-                [
-                    'type' => 'file',
-                    'label' => $this->trans('Icon', [], 'Admin.Shopparameters.Feature'),
-                    'name' => 'icon',
-                    'hint' => $this->trans('Upload an icon from your computer (File type: .gif, suggested size: 16x16).', [], 'Admin.Shopparameters.Help'),
-                ],
-                [
-                    'type' => 'color',
-                    'label' => $this->trans('Color', [], 'Admin.Shopparameters.Feature'),
-                    'name' => 'color',
-                    'hint' => $this->trans('Status will be highlighted in this color. HTML colors only.', [], 'Admin.Shopparameters.Help') . ' "lightblue", "#CC6600")',
-                ],
-                [
-                    'type' => 'checkbox',
-                    'name' => 'logable',
-                    'values' => [
-                        'query' => [
-                            ['id' => 'on', 'name' => $this->trans('Consider the associated order as validated.', [], 'Admin.Shopparameters.Feature'), 'val' => '1'],
-                        ],
-                        'id' => 'id',
-                        'name' => 'name',
-                    ],
-                ],
-                [
-                    'type' => 'checkbox',
-                    'name' => 'invoice',
-                    'values' => [
-                        'query' => [
-                            ['id' => 'on', 'name' => $this->trans('Allow a customer to download and view PDF versions of their invoices.', [], 'Admin.Shopparameters.Feature'), 'val' => '1'],
-                        ],
-                        'id' => 'id',
-                        'name' => 'name',
-                    ],
-                ],
-                [
-                    'type' => 'checkbox',
-                    'name' => 'hidden',
-                    'values' => [
-                        'query' => [
-                            ['id' => 'on', 'name' => $this->trans('Hide this status in all customer orders.', [], 'Admin.Shopparameters.Feature'), 'val' => '1'],
-                        ],
-                        'id' => 'id',
-                        'name' => 'name',
-                    ],
-                ],
-                [
-                    'type' => 'checkbox',
-                    'name' => 'send_email',
-                    'values' => [
-                        'query' => [
-                            ['id' => 'on', 'name' => $this->trans('Send an email to the customer when their order status has changed.', [], 'Admin.Shopparameters.Feature'), 'val' => '1'],
-                        ],
-                        'id' => 'id',
-                        'name' => 'name',
-                    ],
-                ],
-                [
-                    'type' => 'checkbox',
-                    'name' => 'pdf_invoice',
-                    'values' => [
-                        'query' => [
-                            ['id' => 'on',  'name' => $this->trans('Attach invoice PDF to email.', [], 'Admin.Shopparameters.Feature'), 'val' => '1'],
-                        ],
-                        'id' => 'id',
-                        'name' => 'name',
-                    ],
-                ],
-                [
-                    'type' => 'checkbox',
-                    'name' => 'pdf_delivery',
-                    'values' => [
-                        'query' => [
-                            ['id' => 'on',  'name' => $this->trans('Attach delivery slip PDF to email.', [], 'Admin.Shopparameters.Feature'), 'val' => '1'],
-                        ],
-                        'id' => 'id',
-                        'name' => 'name',
-                    ],
-                ],
-                [
-                    'type' => 'checkbox',
-                    'name' => 'shipped',
-                    'values' => [
-                        'query' => [
-                            ['id' => 'on',  'name' => $this->trans('Set the order as shipped.', [], 'Admin.Shopparameters.Feature'), 'val' => '1'],
-                        ],
-                        'id' => 'id',
-                        'name' => 'name',
-                    ],
-                ],
-                [
-                    'type' => 'checkbox',
-                    'name' => 'paid',
-                    'values' => [
-                        'query' => [
-                            ['id' => 'on', 'name' => $this->trans('Set the order as paid.', [], 'Admin.Shopparameters.Feature'), 'val' => '1'],
-                        ],
-                        'id' => 'id',
-                        'name' => 'name',
-                    ],
-                ],
-                [
-                    'type' => 'checkbox',
-                    'name' => 'delivery',
-                    'values' => [
-                        'query' => [
-                            ['id' => 'on', 'name' => $this->trans('Show delivery PDF.', [], 'Admin.Shopparameters.Feature'), 'val' => '1'],
-                        ],
-                        'id' => 'id',
-                        'name' => 'name',
-                    ],
-                ],
-                [
-                    'type' => 'select_template',
-                    'label' => $this->trans('Template', [], 'Admin.Shopparameters.Feature'),
-                    'name' => 'template',
-                    'lang' => true,
-                    'options' => [
-                        'query' => $this->getTemplates(),
-                        'id' => 'id',
-                        'name' => 'name',
-                        'folder' => 'folder',
-                    ],
-                    'hint' => [
-                        $this->trans('Only letters, numbers and underscores ("_") are allowed.', [], 'Admin.Shopparameters.Help'),
-                        $this->trans('Email template for both .html and .txt.', [], 'Admin.Shopparameters.Help'),
-                    ],
-                ],
-            ],
-            'submit' => [
-                'title' => $this->trans('Save', [], 'Admin.Actions'),
-            ],
-        ];
-
-        if (Tools::isSubmit('updateorder_state') || Tools::isSubmit('addorder_state')) {
-            return $this->renderOrderStatusForm();
-        } elseif (Tools::isSubmit('updateorder_return_state') || Tools::isSubmit('addorder_return_state')) {
-            return $this->renderOrderReturnsForm();
-        } else {
-            return parent::renderForm();
-        }
-    }
-
-    protected function renderOrderStatusForm()
-    {
-        if (!($obj = $this->loadObject(true))) {
-            return;
-        }
-
-        $this->fields_value = [
-            'logable_on' => $this->getFieldValue($obj, 'logable'),
-            'invoice_on' => $this->getFieldValue($obj, 'invoice'),
-            'hidden_on' => $this->getFieldValue($obj, 'hidden'),
-            'send_email_on' => $this->getFieldValue($obj, 'send_email'),
-            'shipped_on' => $this->getFieldValue($obj, 'shipped'),
-            'paid_on' => $this->getFieldValue($obj, 'paid'),
-            'delivery_on' => $this->getFieldValue($obj, 'delivery'),
-            'pdf_delivery_on' => $this->getFieldValue($obj, 'pdf_delivery'),
-            'pdf_invoice_on' => $this->getFieldValue($obj, 'pdf_invoice'),
-        ];
-
-        if ($this->getFieldValue($obj, 'color') !== false) {
-            $this->fields_value['color'] = $this->getFieldValue($obj, 'color');
-        } else {
-            $this->fields_value['color'] = '#ffffff';
-        }
-
-        return parent::renderForm();
-    }
-
-    protected function renderOrderReturnsForm()
-    {
-        $helper = $this->initOrderReturnsForm();
-        $helper->show_cancel_button = true;
-
-        $back = Tools::safeOutput(Tools::getValue('back', ''));
-        if (empty($back)) {
-            $back = self::$currentIndex . '&token=' . $this->token;
-        }
-        if (!Validate::isCleanHtml($back)) {
-            die(Tools::displayError());
-        }
-
-        $helper->back_url = $back;
-
-        $this->fields_form[0]['form'] = [
-            'tinymce' => true,
-            'legend' => [
-                'title' => $this->trans('Return status', [], 'Admin.Shopparameters.Feature'),
-                'icon' => 'icon-time',
-            ],
-            'input' => [
-                [
-                    'type' => 'text',
-                    'label' => $this->trans('Status name', [], 'Admin.Shopparameters.Feature'),
-                    'name' => 'name',
-                    'lang' => true,
-                    'required' => true,
-                    'hint' => [
-                        $this->trans('Order\'s return status name.', [], 'Admin.Shopparameters.Help'),
-                        $this->trans('Invalid characters: numbers and', [], 'Admin.Shopparameters.Help') . ' !<>,;?=+()@#"�{}_$%:',
-                    ],
-                ],
-                [
-                    'type' => 'color',
-                    'label' => $this->trans('Color', [], 'Admin.Shopparameters.Feature'),
-                    'name' => 'color',
-                    'hint' => $this->trans('Status will be highlighted in this color. HTML colors only.', [], 'Admin.Shopparameters.Help') . ' "lightblue", "#CC6600")',
-                ],
-            ],
-            'submit' => [
-                'title' => $this->trans('Save', [], 'Admin.Actions'),
-            ],
-        ];
-
-        return $helper->generateForm($this->fields_form);
-    }
-
-    protected function getTemplates()
-    {
-        $default_path = '../mails/';
-        // Mail templates can also be found in the theme folder
-        $theme_path = '../themes/' . $this->context->shop->theme->getName() . '/mails/';
-
-        $array = [];
-        foreach (Language::getLanguages(false) as $language) {
-            $iso_code = $language['iso_code'];
-
-            // If there is no folder for the given iso_code in /mails or in /themes/[theme_name]/mails, we bypass this language
-            if (!@filemtime(_PS_ADMIN_DIR_ . '/' . $default_path . $iso_code) && !@filemtime(_PS_ADMIN_DIR_ . '/' . $theme_path . $iso_code)) {
-                continue;
-            }
-
-            $theme_templates_dir = _PS_ADMIN_DIR_ . '/' . $theme_path . $iso_code;
-            $theme_templates = is_dir($theme_templates_dir) ? scandir($theme_templates_dir, SCANDIR_SORT_NONE) : [];
-            // We merge all available emails in one array
-            $templates = array_unique(array_merge(scandir(_PS_ADMIN_DIR_ . '/' . $default_path . $iso_code, SCANDIR_SORT_NONE), $theme_templates));
-            foreach ($templates as $key => $template) {
-                if (!strncmp(strrev($template), 'lmth.', 5)) {
-                    $search_result = array_search($template, $theme_templates);
-                    $array[$iso_code][] = [
-                        'id' => substr($template, 0, -5),
-                        'name' => substr($template, 0, -5),
-                        'folder' => ((!empty($search_result) ? $theme_path : $default_path)),
-                    ];
-                }
-            }
-        }
-
-        return $array;
-    }
-
-    public function postProcess()
-    {
-        if (Tools::isSubmit($this->table . 'Orderby') || Tools::isSubmit($this->table . 'Orderway')) {
-            $this->filter = true;
-        }
-
-        if (Tools::isSubmit('submitAddorder_return_state')) {
-            if (!$this->access('add')) {
-                return;
-            }
-
-            $id_order_return_state = Tools::getValue('id_order_return_state');
-
-            // Create Object OrderReturnState
-            $order_return_state = new OrderReturnState((int) $id_order_return_state);
-
-            $order_return_state->color = Tools::getValue('color');
-            $order_return_state->name = [];
-            foreach (Language::getIDs(false) as $id_lang) {
-                $order_return_state->name[$id_lang] = Tools::getValue('name_' . $id_lang);
-            }
-
-            // Update object
-            if (!$order_return_state->save()) {
-                $this->errors[] = $this->trans('An error has occurred: Can\'t save the current order\'s return status.', [], 'Admin.Orderscustomers.Notification');
-            } else {
-                Tools::redirectAdmin(self::$currentIndex . '&conf=4&token=' . $this->token);
-            }
-        }
-
-        if (Tools::isSubmit('submitBulkdeleteorder_return_state')) {
-            if (!$this->access('delete')) {
-                return;
-            }
-
-            $this->className = 'OrderReturnState';
-            $this->table = 'order_return_state';
-            $this->boxes = Tools::getValue('order_return_stateBox');
-            $this->deleted = false;
-            parent::processBulkDelete();
-        }
-
-        if (Tools::isSubmit('deleteorder_return_state')) {
-            if (!$this->access('delete')) {
-                return;
-            }
-
-            $id_order_return_state = Tools::getValue('id_order_return_state');
-
-            // Create Object OrderReturnState
-            $order_return_state = new OrderReturnState((int) $id_order_return_state);
-
-            if (!$order_return_state->delete()) {
-                $this->errors[] = $this->trans('An error has occurred: Can\'t delete the current order\'s return status.', [], 'Admin.Orderscustomers.Notification');
-            } else {
-                Tools::redirectAdmin(self::$currentIndex . '&conf=1&token=' . $this->token);
-            }
-        }
-
-        if (Tools::isSubmit('submitAdd' . $this->table)) {
-            if (!$this->access('add')) {
-                return;
-            }
-
-            $langIds = Language::getIDs(false);
-            $langDefault = (int) Configuration::get('PS_LANG_DEFAULT');
-            foreach ($langIds as $id_lang) {
-                $name = (string) Tools::getValue('name_' . $id_lang);
-                if (empty($name)) {
-                    $name = (string) Tools::getValue('name_' . $langDefault);
-                }
-
-                $exists = OrderState::existsLocalizedNameInDatabase(
-                    $name,
-                    (int) $id_lang,
-                    Tools::getIsset('id_order_state') ? (int) Tools::getValue('id_order_state') : null
-                );
-                if ($exists) {
-                    $this->errors[] = $this->trans('This name already exists.', [], 'Admin.Design.Notification');
-                    break;
-                }
-            }
-
-            $this->deleted = false; // Disabling saving historisation
-            $_POST['invoice'] = (int) Tools::getValue('invoice_on');
-            $_POST['logable'] = (int) Tools::getValue('logable_on');
-            $_POST['send_email'] = (int) Tools::getValue('send_email_on');
-            $_POST['hidden'] = (int) Tools::getValue('hidden_on');
-            $_POST['shipped'] = (int) Tools::getValue('shipped_on');
-            $_POST['paid'] = (int) Tools::getValue('paid_on');
-            $_POST['delivery'] = (int) Tools::getValue('delivery_on');
-            $_POST['pdf_delivery'] = (int) Tools::getValue('pdf_delivery_on');
-            $_POST['pdf_invoice'] = (int) Tools::getValue('pdf_invoice_on');
-            if (!$_POST['send_email']) {
-                foreach ($langIds as $id_lang) {
-                    $_POST['template_' . $id_lang] = '';
-                }
-            }
-
-            return parent::postProcess();
-        } elseif (Tools::isSubmit('delete' . $this->table)) {
-            if (!$this->access('delete')) {
-                return;
-            }
-
-            $order_state = new OrderState(Tools::getValue('id_order_state'), $this->context->language->id);
-            if (!$order_state->isRemovable()) {
-                $this->errors[] = $this->trans('For security reasons, you cannot delete default order statuses.', [], 'Admin.Shopparameters.Notification');
-            } else {
-                return parent::postProcess();
-            }
-        } elseif (Tools::isSubmit('submitBulkdelete' . $this->table)) {
-            if (!$this->access('delete')) {
-                return;
-            }
-
-            foreach (Tools::getValue($this->table . 'Box', []) as $selection) {
-                $order_state = new OrderState((int) $selection, $this->context->language->id);
-                if (!$order_state->isRemovable()) {
-                    $this->errors[] = $this->trans('For security reasons, you cannot delete default order statuses.', [], 'Admin.Shopparameters.Notification');
-
-                    break;
-                }
-            }
-
-            if (!count($this->errors)) {
-                return parent::postProcess();
-            }
-        } else {
-            return parent::postProcess();
-        }
-    }
-
-    protected function filterToField($key, $filter)
-    {
-        if ($this->table == 'order_state') {
-            $this->initOrderStatusList();
-        } elseif ($this->table == 'order_return_state') {
-            $this->initOrdersReturnsList();
-        }
-
-        return parent::filterToField($key, $filter);
-    }
-
-    protected function afterImageUpload()
-    {
-        parent::afterImageUpload();
-
-        if (($id_order_state = (int) Tools::getValue('id_order_state'))
-            && count($_FILES)
-            && file_exists(_PS_ORDER_STATE_IMG_DIR_ . $id_order_state . '.gif')) {
-            $current_file = _PS_TMP_IMG_DIR_ . 'order_state_mini_' . $id_order_state . '_' . $this->context->shop->id . '.gif';
-
-            if (file_exists($current_file)) {
-                unlink($current_file);
-            }
-        }
-
-        return true;
-    }
-
-    public function ajaxProcessSendEmailOrderState()
-    {
-        if ($this->access('edit') != '1') {
-            echo json_encode(['success' => 0, 'text' => $this->trans('You do not have permission to edit this.', [], 'Admin.Notifications.Error')]);
-
-            return;
-        }
-
-        $id_order_state = (int) Tools::getValue('id_order_state');
-
-        $sql = 'UPDATE ' . _DB_PREFIX_ . 'order_state SET `send_email`= NOT `send_email` WHERE id_order_state=' . $id_order_state;
-        $result = Db::getInstance()->execute($sql);
-
-        if ($result) {
-            echo json_encode(['success' => 1, 'text' => $this->trans('The status has been updated successfully.', [], 'Admin.Notifications.Success')]);
-        } else {
-            echo json_encode(['success' => 0, 'text' => $this->trans('An error occurred while updating the status.', [], 'Admin.Notifications.Error')]);
-        }
-    }
-
-    public function ajaxProcessDeliveryOrderState()
-    {
-        if ($this->access('edit') != '1') {
-            echo json_encode(['success' => 0, 'text' => $this->trans('You do not have permission to edit this.', [], 'Admin.Notifications.Error')]);
-
-            return;
-        }
-
-        $id_order_state = (int) Tools::getValue('id_order_state');
-
-        $sql = 'UPDATE ' . _DB_PREFIX_ . 'order_state SET `delivery`= NOT `delivery` WHERE id_order_state=' . $id_order_state;
-        $result = Db::getInstance()->execute($sql);
-
-        if ($result) {
-            echo json_encode(['success' => 1, 'text' => $this->trans('The status has been updated successfully.', [], 'Admin.Notifications.Success')]);
-        } else {
-            echo json_encode(['success' => 0, 'text' => $this->trans('An error occurred while updating the status.', [], 'Admin.Notifications.Error')]);
-        }
-    }
-
-    public function ajaxProcessInvoiceOrderState()
-    {
-        if ($this->access('edit') != '1') {
-            echo json_encode(['success' => 0, 'text' => $this->trans('You do not have permission to edit this.', [], 'Admin.Notifications.Error')]);
-
-            return;
-        }
-        $id_order_state = (int) Tools::getValue('id_order_state');
-
-        $sql = 'UPDATE ' . _DB_PREFIX_ . 'order_state SET `invoice`= NOT `invoice` WHERE id_order_state=' . $id_order_state;
-        $result = Db::getInstance()->execute($sql);
-
-        if ($result) {
-            echo json_encode(['success' => 1, 'text' => $this->trans('The status has been updated successfully.', [], 'Admin.Notifications.Success')]);
-        } else {
-            echo json_encode(['success' => 0, 'text' => $this->trans('An error occurred while updating the status.', [], 'Admin.Notifications.Error')]);
-        }
-    }
-}
diff --git a/src/Adapter/OrderState/CommandHandler/AddOrderStateHandler.php b/src/Adapter/OrderState/CommandHandler/AddOrderStateHandler.php
index 5529d464f47f3..aa10fb256a0ab 100644
--- a/src/Adapter/OrderState/CommandHandler/AddOrderStateHandler.php
+++ b/src/Adapter/OrderState/CommandHandler/AddOrderStateHandler.php
@@ -91,6 +91,8 @@ private function fillOrderStateWithCommandData(OrderState $orderState, AddOrderS
         $orderState->shipped = $command->isShipped();
         $orderState->paid = $command->isPaid();
         $orderState->delivery = $command->isDelivery();
-        $orderState->template = $command->getLocalizedTemplates();
+        if ($command->isSendEmailEnabled()) {
+            $orderState->template = $command->getLocalizedTemplates();
+        }
     }
 }
diff --git a/src/Core/Domain/OrderReturnState/Command/BulkDeleteOrderReturnStateCommand.php b/src/Core/Domain/OrderReturnState/Command/BulkDeleteOrderReturnStateCommand.php
index df53b46b72a8f..65b05e934af2d 100644
--- a/src/Core/Domain/OrderReturnState/Command/BulkDeleteOrderReturnStateCommand.php
+++ b/src/Core/Domain/OrderReturnState/Command/BulkDeleteOrderReturnStateCommand.php
@@ -38,7 +38,7 @@ class BulkDeleteOrderReturnStateCommand
     /**
      * @var OrderReturnStateId[]
      */
-    private $orderReturnStateIds;
+    private $orderReturnStateIds = [];
 
     /**
      * @param int[] $orderReturnStateIds
diff --git a/src/Core/Domain/OrderState/Command/BulkDeleteOrderStateCommand.php b/src/Core/Domain/OrderState/Command/BulkDeleteOrderStateCommand.php
index 15f63a566a9d7..c0c172d43d144 100644
--- a/src/Core/Domain/OrderState/Command/BulkDeleteOrderStateCommand.php
+++ b/src/Core/Domain/OrderState/Command/BulkDeleteOrderStateCommand.php
@@ -39,7 +39,7 @@ class BulkDeleteOrderStateCommand
     /**
      * @var OrderStateId[]
      */
-    private $orderStateIds;
+    private $orderStateIds = [];
 
     /**
      * @param int[] $orderStateIds
diff --git a/src/Core/Grid/Definition/Factory/OrderReturnStatesGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/OrderReturnStatesGridDefinitionFactory.php
index 85a4b0ba1921b..352a233a54185 100644
--- a/src/Core/Grid/Definition/Factory/OrderReturnStatesGridDefinitionFactory.php
+++ b/src/Core/Grid/Definition/Factory/OrderReturnStatesGridDefinitionFactory.php
@@ -43,7 +43,6 @@
 use PrestaShop\PrestaShop\Core\Grid\Filter\FilterCollection;
 use PrestaShop\PrestaShop\Core\Hook\HookDispatcherInterface;
 use PrestaShopBundle\Form\Admin\Type\SearchAndResetType;
-use Symfony\Component\Form\Extension\Core\Type\NumberType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -154,7 +153,7 @@ protected function getFilters()
     {
         return (new FilterCollection())
             ->add(
-                (new Filter('id_order_return_state', NumberType::class))
+                (new Filter('id_order_return_state', TextType::class))
                     ->setTypeOptions([
                         'attr' => [
                             'placeholder' => $this->trans('Search ID', [], 'Admin.Actions'),
diff --git a/src/Core/Grid/Definition/Factory/OrderStatesGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/OrderStatesGridDefinitionFactory.php
index af67068fab3f8..c4cb1c0b57554 100644
--- a/src/Core/Grid/Definition/Factory/OrderStatesGridDefinitionFactory.php
+++ b/src/Core/Grid/Definition/Factory/OrderStatesGridDefinitionFactory.php
@@ -45,7 +45,6 @@
 use PrestaShop\PrestaShop\Core\Hook\HookDispatcherInterface;
 use PrestaShopBundle\Form\Admin\Type\SearchAndResetType;
 use PrestaShopBundle\Form\Admin\Type\YesAndNoChoiceType;
-use Symfony\Component\Form\Extension\Core\Type\NumberType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -193,7 +192,7 @@ protected function getFilters()
     {
         return (new FilterCollection())
             ->add(
-                (new Filter('id_order_state', NumberType::class))
+                (new Filter('id_order_state', TextType::class))
                     ->setTypeOptions([
                         'attr' => [
                             'placeholder' => $this->trans('Search ID', [], 'Admin.Actions'),
diff --git a/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderReturnStates/OrderReturnStateType.php b/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderReturnStates/OrderReturnStateType.php
index 5d3de90bbc147..00bf8943a43ad 100644
--- a/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderReturnStates/OrderReturnStateType.php
+++ b/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderReturnStates/OrderReturnStateType.php
@@ -64,7 +64,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'options' => [
                     'constraints' => [
                         new TypedRegex([
-                            'type' => 'generic_name',
+                            'type' => TypedRegex::TYPE_GENERIC_NAME,
                         ]),
                     ],
                 ],
diff --git a/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderStates/OrderStateType.php b/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderStates/OrderStateType.php
index ba3225bfd763b..bc35213bc92ff 100644
--- a/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderStates/OrderStateType.php
+++ b/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderStates/OrderStateType.php
@@ -127,9 +127,12 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     new DefaultLanguage(),
                 ],
                 'options' => [
+                    'attr' => [
+                        'autocomplete' => 'off',
+                    ],
                     'constraints' => [
                         new TypedRegex([
-                            'type' => 'generic_name',
+                            'type' => TypedRegex::TYPE_GENERIC_NAME,
                         ]),
                     ],
                 ],
diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/configure/shop_parameters/order_states.yml b/src/PrestaShopBundle/Resources/config/routing/admin/configure/shop_parameters/order_states.yml
index a4834cb1ff66c..e44d0aef47b05 100644
--- a/src/PrestaShopBundle/Resources/config/routing/admin/configure/shop_parameters/order_states.yml
+++ b/src/PrestaShopBundle/Resources/config/routing/admin/configure/shop_parameters/order_states.yml
@@ -5,7 +5,6 @@ admin_order_states:
     _controller: PrestaShopBundle\Controller\Admin\Configure\ShopParameters\OrderStateController::indexAction
     _legacy_controller: AdminStatuses
     _legacy_link: AdminStatuses
-    _legacy_feature_flag: order_state
 
 admin_order_states_filter:
   path: /
@@ -16,7 +15,6 @@ admin_order_states_filter:
     gridDefinitionFactoryServiceId: prestashop.core.grid.definition.factory.order_states
     redirectRoute: admin_order_states
     _legacy_link: AdminStatuses:submitFilterstate
-    _legacy_feature_flag: order_state
 
 admin_order_states_create:
   path: /new
diff --git a/tests/Integration/Classes/controller/AdminControllerTest.php b/tests/Integration/Classes/controller/AdminControllerTest.php
index b66e3a1372d53..f2b86a02637b2 100644
--- a/tests/Integration/Classes/controller/AdminControllerTest.php
+++ b/tests/Integration/Classes/controller/AdminControllerTest.php
@@ -152,7 +152,6 @@ public function getControllersClasses(): array
     {
         return [
             ['AdminCarriersController'],
-            ['AdminStatusesController'],
             ['AdminLoginController'],
             ['AdminQuickAccessesController'],
             ['AdminCustomerThreadsController'],
diff --git a/tests/Integration/PrestaShopBundle/Controller/Admin/FrameworkBundleAdminControllerTest.php b/tests/Integration/PrestaShopBundle/Controller/Admin/FrameworkBundleAdminControllerTest.php
index 2594a5dbc849b..0a370cba58cb3 100644
--- a/tests/Integration/PrestaShopBundle/Controller/Admin/FrameworkBundleAdminControllerTest.php
+++ b/tests/Integration/PrestaShopBundle/Controller/Admin/FrameworkBundleAdminControllerTest.php
@@ -300,8 +300,12 @@ public function getDataProvider(): array
             'admin_order_messages_create' => ['Add new', 'admin_order_messages_create'],
             'admin_order_messages_index' => ['Order messages', 'admin_order_messages_index'],
             'admin_order_preferences' => ['Order Preferences', 'admin_order_preferences'],
+            'admin_order_return_states_create' => ['Add new', 'admin_order_states'],
+            'admin_order_states' => ['Order States', 'admin_order_states'],
+            'admin_order_states_create' => ['Add new', 'admin_order_states'],
             'admin_orders_create' => ['Add new', 'admin_orders_create'],
             'admin_orders_index' => ['Orders', 'admin_orders_index'],
+            'admin_outstanding_index' => ['Outstanding', 'admin_outstanding_index'],
             'admin_payment_methods' => ['Payment Methods', 'admin_payment_methods'],
             'admin_payment_preferences' => ['Payment preferences', 'admin_payment_preferences'],
             'admin_performance' => ['Performance', 'admin_performance'],

From ff0bde99f3576648c3a73c02305538a875e286a7 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Mon, 16 May 2022 10:25:06 +0200
Subject: [PATCH 0890/1030] Status Grid : Disable/Enable Select All if needed &
 Change width of first column

---
 .../extension/bulk-action-checkbox-extension.ts  | 16 ++++++++++++++++
 .../new-theme/scss/pages/_order_states.scss      |  8 --------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/admin-dev/themes/new-theme/js/components/grid/extension/bulk-action-checkbox-extension.ts b/admin-dev/themes/new-theme/js/components/grid/extension/bulk-action-checkbox-extension.ts
index 0fa5b3e5d5cca..4ff5244246806 100644
--- a/admin-dev/themes/new-theme/js/components/grid/extension/bulk-action-checkbox-extension.ts
+++ b/admin-dev/themes/new-theme/js/components/grid/extension/bulk-action-checkbox-extension.ts
@@ -38,10 +38,26 @@ export default class BulkActionCheckboxExtension {
    * @param {Grid} grid
    */
   extend(grid: Grid): void {
+    this.handleBulkActionCheckboxStatus(grid);
     this.handleBulkActionCheckboxSelect(grid);
     this.handleBulkActionSelectAllCheckbox(grid);
   }
 
+  /**
+   * Disable/Enable "Select all" button in the grid
+   *
+   * @param {Grid} grid
+   *
+   * @private
+   */
+  private handleBulkActionCheckboxStatus(grid: Grid) {
+    const gridBulkActionSelectAll = grid.getContainer().find(GridMap.bulks.actionSelectAll);
+    gridBulkActionSelectAll.prop(
+      'disabled',
+      grid.getContainer().find(GridMap.bulks.bulkActionCheckbox).length === 0,
+    );
+  }
+
   /**
    * Handles "Select all" button in the grid
    *
diff --git a/admin-dev/themes/new-theme/scss/pages/_order_states.scss b/admin-dev/themes/new-theme/scss/pages/_order_states.scss
index 657688de36701..b49761f96792d 100644
--- a/admin-dev/themes/new-theme/scss/pages/_order_states.scss
+++ b/admin-dev/themes/new-theme/scss/pages/_order_states.scss
@@ -1,13 +1,5 @@
 table#order_states_grid_table,
 table#order_return_states_grid_table {
-  thead {
-    tr.column-headers {
-      th:first-child {
-        width: 130px;
-      }
-    }
-  }
-
   tbody {
     .color-type.column-name {
       .badge {

From b39e9a725947694b5ab03c4927203efee9805a80 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Tue, 17 May 2022 10:47:54 +0200
Subject: [PATCH 0891/1030] Fixes the constraint of length for a new Order
 Return Status

---
 .../OrderReturnStateSettings.php              | 37 +++++++++++++++++++
 .../OrderReturnStateType.php                  | 12 ++++++
 2 files changed, 49 insertions(+)
 create mode 100644 src/Core/Domain/OrderReturnState/OrderReturnStateSettings.php

diff --git a/src/Core/Domain/OrderReturnState/OrderReturnStateSettings.php b/src/Core/Domain/OrderReturnState/OrderReturnStateSettings.php
new file mode 100644
index 0000000000000..845fdccfe49c5
--- /dev/null
+++ b/src/Core/Domain/OrderReturnState/OrderReturnStateSettings.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\OrderReturnState;
+
+class OrderReturnStateSettings
+{
+    /**
+     * Profile name max length as defined in the ObjectModel
+     */
+    public const NAME_MAX_LENGTH = 32;
+}
diff --git a/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderReturnStates/OrderReturnStateType.php b/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderReturnStates/OrderReturnStateType.php
index 00bf8943a43ad..bab7612a8ec1c 100644
--- a/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderReturnStates/OrderReturnStateType.php
+++ b/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderReturnStates/OrderReturnStateType.php
@@ -29,12 +29,14 @@
 
 use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\DefaultLanguage;
 use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\TypedRegex;
+use PrestaShop\PrestaShop\Core\Domain\OrderReturnState\OrderReturnStateSettings;
 use PrestaShopBundle\Form\Admin\Type\ColorPickerType;
 use PrestaShopBundle\Form\Admin\Type\TranslatableType;
 use PrestaShopBundle\Form\Admin\Type\TranslatorAwareType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Validator\Constraints\Length;
 
 /**
  * Type is used to created form for order return state add/edit actions
@@ -66,6 +68,16 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                         new TypedRegex([
                             'type' => TypedRegex::TYPE_GENERIC_NAME,
                         ]),
+                        new Length([
+                            'max' => OrderReturnStateSettings::NAME_MAX_LENGTH,
+                            'maxMessage' => $this->trans(
+                                'This field cannot be longer than %limit% characters',
+                                'Admin.Notifications.Error',
+                                [
+                                    '%limit%' => OrderReturnStateSettings::NAME_MAX_LENGTH,
+                                ]
+                            ),
+                        ]),
                     ],
                 ],
             ])

From 8f0d3c82774a73108f181d61da9006d1692f722f Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Tue, 17 May 2022 10:48:17 +0200
Subject: [PATCH 0892/1030] Fixes the size of the first column in Grid

---
 admin-dev/themes/new-theme/scss/components/_grid.scss | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/admin-dev/themes/new-theme/scss/components/_grid.scss b/admin-dev/themes/new-theme/scss/components/_grid.scss
index 61b9055368c74..01bdd96f775d1 100644
--- a/admin-dev/themes/new-theme/scss/components/_grid.scss
+++ b/admin-dev/themes/new-theme/scss/components/_grid.scss
@@ -319,10 +319,6 @@ table {
 
       td[data-column-id^="id_"] {
         max-width: 8rem;
-
-        input {
-          max-width: 6rem;
-        }
       }
 
       td[data-column-id^="price_tax_excluded"] {

From 9b26b6b30d2a8e167a50edd0f2c56287886843e9 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Tue, 17 May 2022 10:49:25 +0200
Subject: [PATCH 0893/1030] Fixes edit of Order Status with template & hasEmail
 options

---
 .../CommandHandler/EditOrderStateHandler.php  |  8 +++---
 .../Domain/OrderStateFeatureContext.php       | 10 +++++++
 .../Scenario/OrderState/order_state.feature   | 26 +++++++++++++++++++
 3 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/src/Adapter/OrderState/CommandHandler/EditOrderStateHandler.php b/src/Adapter/OrderState/CommandHandler/EditOrderStateHandler.php
index 5083a50a4a910..4f94c8dfb052c 100644
--- a/src/Adapter/OrderState/CommandHandler/EditOrderStateHandler.php
+++ b/src/Adapter/OrderState/CommandHandler/EditOrderStateHandler.php
@@ -127,6 +127,10 @@ private function updateOrderStateWithCommandData(OrderState $orderState, EditOrd
 
         if (null !== $command->isSendEmailEnabled()) {
             $orderState->send_email = $command->isSendEmailEnabled();
+
+            if ($orderState->send_email && null !== $command->getTemplate()) {
+                $orderState->template = $command->getTemplate();
+            }
         }
 
         if (null !== $command->isPdfInvoice()) {
@@ -148,9 +152,5 @@ private function updateOrderStateWithCommandData(OrderState $orderState, EditOrd
         if (null !== $command->isDelivery()) {
             $orderState->delivery = $command->isDelivery();
         }
-
-        if (null !== $command->getTemplate()) {
-            $orderState->template = $command->getTemplate();
-        }
     }
 }
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/OrderStateFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/OrderStateFeatureContext.php
index 8ff1b4e1e2f79..72ea189fac66a 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/OrderStateFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/OrderStateFeatureContext.php
@@ -137,6 +137,11 @@ public function updateOrderState(string $orderStateReference, TableNode $table):
         if (isset($data['isDelivery'])) {
             $editableOrderState->setDelivery((bool) $data['isDelivery']);
         }
+        if (isset($data['template'])) {
+            $editableOrderState->setTemplate([
+                $this->defaultLangId => $data['template'],
+            ]);
+        }
 
         try {
             $this->getCommandBus()->handle($editableOrderState);
@@ -196,10 +201,15 @@ public function checkOrderStateDetails(string $orderStateReference, TableNode $t
         $data = $table->getRowsHash();
 
         $localizedNames = $editableOrderState->getLocalizedNames();
+        $localizedTemplates = $editableOrderState->getLocalizedTemplates();
         Assert::assertIsArray($localizedNames);
         Assert::assertArrayHasKey($this->defaultLangId, $localizedNames);
         Assert::assertEquals($data['name'], $localizedNames[$this->defaultLangId]);
         Assert::assertEquals($data['color'], $editableOrderState->getColor());
+        Assert::assertEquals((bool) $data['hasSendMail'], $editableOrderState->isSendEmailEnabled());
+        Assert::assertIsArray($localizedTemplates);
+        Assert::assertArrayHasKey($this->defaultLangId, $localizedTemplates);
+        Assert::assertEquals($data['template'], $localizedTemplates[$this->defaultLangId]);
     }
 
     /**
diff --git a/tests/Integration/Behaviour/Features/Scenario/OrderState/order_state.feature b/tests/Integration/Behaviour/Features/Scenario/OrderState/order_state.feature
index 101f01d1fcd03..ead054bed3dd6 100644
--- a/tests/Integration/Behaviour/Features/Scenario/OrderState/order_state.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/OrderState/order_state.feature
@@ -46,6 +46,8 @@ Feature: OrderState
     And the order state "order_state_3rd" should have the following details:
       | name            | The 3rd Order State |
       | color           | #CDEF12             |
+      | hasSendMail     | 0                   |
+      | template        |                     |
     ## Reset
     When I delete the order state "order_state_3rd"
     And the order state "order_state_3rd" should be deleted
@@ -56,6 +58,30 @@ Feature: OrderState
     And the order state "order_state_1st" should have the following details:
       | name            | The 1st Order State |
       | color           | #345678             |
+      | hasSendMail     | 0                   |
+      | template        |                     |
+
+  Scenario: Edit order state (with Send Email disabled)
+    When I update the order state "order_state_1st" with the following details:
+      | color           | #345678             |
+      | hasSendMail     | 0                   |
+      | template        | account             |
+    And the order state "order_state_1st" should have the following details:
+      | name            | The 1st Order State |
+      | color           | #345678             |
+      | hasSendMail     | 0                   |
+      | template        |                     |
+
+  Scenario: Edit order state (with Send Email enabled)
+    When I update the order state "order_state_1st" with the following details:
+      | color           | #345678             |
+      | hasSendMail     | 1                   |
+      | template        | account             |
+    And the order state "order_state_1st" should have the following details:
+      | name            | The 1st Order State |
+      | color           | #345678             |
+      | hasSendMail     | 1                   |
+      | template        | account             |
 
   Scenario: Delete order state
     When I delete the order state "order_state_1st"

From 26779ac66fec478b76c3b9aa4c18fc4fabbf8a94 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Tue, 17 May 2022 10:49:41 +0200
Subject: [PATCH 0894/1030] Fixed preview email in MultiShop

---
 src/Adapter/MailTemplate/MailPreviewVariablesBuilder.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Adapter/MailTemplate/MailPreviewVariablesBuilder.php b/src/Adapter/MailTemplate/MailPreviewVariablesBuilder.php
index 876074f1b6d31..a923240dde24b 100644
--- a/src/Adapter/MailTemplate/MailPreviewVariablesBuilder.php
+++ b/src/Adapter/MailTemplate/MailPreviewVariablesBuilder.php
@@ -170,6 +170,9 @@ protected function trans($id, $parameters = [], $domain = null, $local = null)
     private function buildOrderVariables(LayoutInterface $mailLayout)
     {
         $orders = Order::getOrdersWithInformations(1);
+        if (!isset($orders[0]['id_order'])) {
+            return [];
+        }
         $order = new Order($orders[0]['id_order']);
 
         if (self::ORDER_CONFIRMATION == $mailLayout->getName()) {

From 6beee70548693f1bc106988f6da827c470f30610 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Wed, 20 Jul 2022 09:31:19 +0200
Subject: [PATCH 0895/1030] Fixes max length of the OrderState in Form

---
 .../Domain/OrderState/OrderStateSettings.php  | 37 +++++++++++++++++++
 .../OrderStates/OrderStateType.php            | 13 +++++++
 2 files changed, 50 insertions(+)
 create mode 100644 src/Core/Domain/OrderState/OrderStateSettings.php

diff --git a/src/Core/Domain/OrderState/OrderStateSettings.php b/src/Core/Domain/OrderState/OrderStateSettings.php
new file mode 100644
index 0000000000000..6bfbe4810c06d
--- /dev/null
+++ b/src/Core/Domain/OrderState/OrderStateSettings.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\OrderState;
+
+class OrderStateSettings
+{
+    /**
+     * Order state name max length as defined in the ObjectModel
+     */
+    public const NAME_MAX_LENGTH = 64;
+}
diff --git a/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderStates/OrderStateType.php b/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderStates/OrderStateType.php
index bc35213bc92ff..f3c8fddcac6a4 100644
--- a/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderStates/OrderStateType.php
+++ b/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderStates/OrderStateType.php
@@ -30,6 +30,7 @@
 use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\DefaultLanguage;
 use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\TypedRegex;
 use PrestaShop\PrestaShop\Core\Domain\Configuration\ShopConfigurationInterface;
+use PrestaShop\PrestaShop\Core\Domain\OrderState\OrderStateSettings;
 use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
 use PrestaShop\PrestaShop\Core\MailTemplate\Layout\Layout;
 use PrestaShop\PrestaShop\Core\MailTemplate\ThemeCatalogInterface;
@@ -43,6 +44,7 @@
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use Symfony\Component\Validator\Constraints\Length;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
@@ -129,11 +131,22 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'options' => [
                     'attr' => [
                         'autocomplete' => 'off',
+                        'maxlength' => OrderStateSettings::NAME_MAX_LENGTH,
                     ],
                     'constraints' => [
                         new TypedRegex([
                             'type' => TypedRegex::TYPE_GENERIC_NAME,
                         ]),
+                        new Length([
+                            'max' => OrderStateSettings::NAME_MAX_LENGTH,
+                            'maxMessage' => $this->trans(
+                                'This field cannot be longer than %limit% characters',
+                                'Admin.Notifications.Error',
+                                [
+                                    '%limit%' => OrderStateSettings::NAME_MAX_LENGTH,
+                                ]
+                            ),
+                        ]),
                     ],
                 ],
             ])

From 3bbca5b7709e85f265270817380ff9eaf6f43592 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Tue, 30 Aug 2022 21:13:01 +0200
Subject: [PATCH 0896/1030] Colorpicker : Fixed the color of input

---
 admin-dev/themes/new-theme/js/app/utils/colorpicker.js   | 6 ++++++
 .../themes/new-theme/scss/components/_colorpicker.scss   | 9 +++++++++
 2 files changed, 15 insertions(+)

diff --git a/admin-dev/themes/new-theme/js/app/utils/colorpicker.js b/admin-dev/themes/new-theme/js/app/utils/colorpicker.js
index 85750f5c008d2..23df24ea7d990 100644
--- a/admin-dev/themes/new-theme/js/app/utils/colorpicker.js
+++ b/admin-dev/themes/new-theme/js/app/utils/colorpicker.js
@@ -32,6 +32,12 @@ const {$} = window;
 const init = function initDatePickers() {
   $('.colorpicker input[type="text"]').each((i, picker) => {
     $(picker).colorpicker();
+    $(picker).on('colorpickerCreate', () => {
+      $(picker).css('background-color', $(picker).val());
+    });
+    $(picker).on('colorpickerChange', (event) => {
+      $(picker).css('background-color', event.color.toString());
+    });
   });
 };
 
diff --git a/admin-dev/themes/new-theme/scss/components/_colorpicker.scss b/admin-dev/themes/new-theme/scss/components/_colorpicker.scss
index 951dfe353d3a2..73474c6230a6e 100644
--- a/admin-dev/themes/new-theme/scss/components/_colorpicker.scss
+++ b/admin-dev/themes/new-theme/scss/components/_colorpicker.scss
@@ -6,4 +6,13 @@
   &::after {
     border: none;
   }
+
+  .form-control {
+    &,
+    &:focus-visible,
+    &:focus {
+      color: transparent;
+      text-shadow: none;
+    }
+  }
 }

From a5a248efcd81958dd660924cf361b48655a46c90 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Thu, 2 Feb 2023 09:40:08 +0100
Subject: [PATCH 0897/1030] Functional Tests : Fixed UI Tests

---
 .../OrderReturnStates/Blocks/form.html.twig   |   2 +-
 .../OrderStates/Blocks/form.html.twig         |   2 +-
 .../01_CRUDOrderReturnStatus.ts               |   2 +-
 .../02_filterSortAndPagination.ts             |  28 +--
 .../statuses/02_filterSortAndPagination.ts    |  28 +--
 .../02_statuses/statuses/03_quickEdit.ts      |   5 +-
 tests/UI/data/faker/orderReturnStatus.ts      |   6 +-
 tests/UI/data/faker/orderStatus.ts            |   6 +-
 .../orderSettings/statuses/add.ts             |  58 +++---
 .../orderSettings/statuses/index.ts           | 172 +++++++++---------
 .../statuses/returnStatus/add.ts              |  14 +-
 tests/UI/pages/commonPage.ts                  |  22 ++-
 12 files changed, 183 insertions(+), 162 deletions(-)

diff --git a/src/PrestaShopBundle/Resources/views/Admin/Configure/ShopParameters/OrderReturnStates/Blocks/form.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Configure/ShopParameters/OrderReturnStates/Blocks/form.html.twig
index afb3fc5d9000b..7a2678e697b89 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Configure/ShopParameters/OrderReturnStates/Blocks/form.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Configure/ShopParameters/OrderReturnStates/Blocks/form.html.twig
@@ -43,7 +43,7 @@
           <a href="{{ pathWithBackUrl('admin_order_states') }}" class="btn btn-outline-secondary">
           {{ 'Cancel'|trans({}, 'Admin.Actions') }}
         </a>
-        <button class="btn btn-primary float-right">
+        <button class="btn btn-primary float-right" id="save-button">
           {{ 'Save'|trans({}, 'Admin.Actions') }}
         </button>
       </div>
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Configure/ShopParameters/OrderStates/Blocks/form.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Configure/ShopParameters/OrderStates/Blocks/form.html.twig
index 6b2d777159148..86920d580e095 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Configure/ShopParameters/OrderStates/Blocks/form.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Configure/ShopParameters/OrderStates/Blocks/form.html.twig
@@ -45,7 +45,7 @@
           <a href="{{ pathWithBackUrl('admin_order_states') }}" class="btn btn-outline-secondary">
           {{ 'Cancel'|trans({}, 'Admin.Actions') }}
         </a>
-        <button class="btn btn-primary float-right">
+        <button class="btn btn-primary float-right"id="save-button">
           {{ 'Save'|trans({}, 'Admin.Actions') }}
         </button>
       </div>
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/returnStatuses/01_CRUDOrderReturnStatus.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/returnStatuses/01_CRUDOrderReturnStatus.ts
index 7738f95451120..2f5df7d25ab8d 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/returnStatuses/01_CRUDOrderReturnStatus.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/returnStatuses/01_CRUDOrderReturnStatus.ts
@@ -94,7 +94,7 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Create, update '
       await testContext.addContextItem(this, 'testIdentifier', 'createOrderStatus', baseContext);
 
       const textResult = await addOrderReturnStatusPage.setOrderReturnStatus(page, createOrderReturnStatusData);
-      await expect(textResult).to.contains(statusesPage.successfulUpdateMessage);
+      await expect(textResult).to.contains(statusesPage.successfulCreationMessage);
 
       const numberOfLinesAfterCreation = await statusesPage.getNumberOfElementInGrid(page, tableName);
       await expect(numberOfLinesAfterCreation).to.be.equal(numberOfOrderReturnStatuses + 1);
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/returnStatuses/02_filterSortAndPagination.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/returnStatuses/02_filterSortAndPagination.ts
index fccdb36432056..e496a05a26770 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/returnStatuses/02_filterSortAndPagination.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/returnStatuses/02_filterSortAndPagination.ts
@@ -146,27 +146,27 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Filter, sort and '
         args: {
           testIdentifier: 'sortByIdDesc',
           sortBy: 'id_order_return_state',
-          columnID: 1,
-          sortDirection: 'down',
+          columnID: 2,
+          sortDirection: 'desc',
           isFloat: true,
         },
       },
       {
         args: {
-          testIdentifier: 'sortByNameAsc', sortBy: 'name', columnID: 2, sortDirection: 'up',
+          testIdentifier: 'sortByNameAsc', sortBy: 'name', columnID: 3, sortDirection: 'asc',
         },
       },
       {
         args: {
-          testIdentifier: 'sortByNameDesc', sortBy: 'name', columnID: 2, sortDirection: 'down',
+          testIdentifier: 'sortByNameDesc', sortBy: 'name', columnID: 3, sortDirection: 'desc',
         },
       },
       {
         args: {
           testIdentifier: 'sortByIdAsc',
           sortBy: 'id_order_return_state',
-          columnID: 1,
-          sortDirection: 'up',
+          columnID: 2,
+          sortDirection: 'asc',
           isFloat: true,
         },
       },
@@ -196,7 +196,7 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Filter, sort and '
 
           const expectedResult = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
-          if (test.args.sortDirection === 'up') {
+          if (test.args.sortDirection === 'asc') {
             await expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
             await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
@@ -204,7 +204,7 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Filter, sort and '
         } else {
           const expectedResult = await basicHelper.sortArray(nonSortedTable);
 
-          if (test.args.sortDirection === 'up') {
+          if (test.args.sortDirection === 'asc') {
             await expect(sortedTable).to.deep.equal(expectedResult);
           } else {
             await expect(sortedTable).to.deep.equal(expectedResult.reverse());
@@ -234,7 +234,7 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Filter, sort and '
         await testContext.addContextItem(this, 'testIdentifier', `createOrderReturnStatus${index}`, baseContext);
 
         const textResult = await addOrderReturnStatusPage.setOrderReturnStatus(page, orderReturnStatusData);
-        await expect(textResult).to.contains(statusesPage.successfulUpdateMessage);
+        await expect(textResult).to.contains(statusesPage.successfulCreationMessage);
 
         const numberOfLinesAfterCreation = await statusesPage.getNumberOfElementInGrid(page, tableName);
         await expect(numberOfLinesAfterCreation).to.be.equal(numberOfOrderReturnStatuses + index + 1);
@@ -248,28 +248,28 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Filter, sort and '
       await testContext.addContextItem(this, 'testIdentifier', 'changeItemNumberTo20', baseContext);
 
       const paginationNumber = await statusesPage.selectPaginationLimit(page, tableName, 20);
-      expect(paginationNumber).to.equal('1');
+      expect(paginationNumber).to.contains('(page 1 / 2)');
     });
 
     it('should click on next', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnNext', baseContext);
 
       const paginationNumber = await statusesPage.paginationNext(page, tableName);
-      expect(paginationNumber).to.equal('2');
+      expect(paginationNumber).to.contains('(page 2 / 2)');
     });
 
     it('should click on previous', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnPrevious', baseContext);
 
       const paginationNumber = await statusesPage.paginationPrevious(page, tableName);
-      expect(paginationNumber).to.equal('1');
+      expect(paginationNumber).to.contains('(page 1 / 2)');
     });
 
     it('should change the items number to 50 per page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'changeItemNumberTo50', baseContext);
 
       const paginationNumber = await statusesPage.selectPaginationLimit(page, tableName, 50);
-      expect(paginationNumber).to.equal('1');
+      expect(paginationNumber).to.contains('(page 1 / 1)');
     });
   });
 
@@ -291,7 +291,7 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Filter, sort and '
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteStatus', baseContext);
 
       const deleteTextResult = await statusesPage.bulkDeleteOrderStatuses(page, tableName);
-      await expect(deleteTextResult).to.be.contains(statusesPage.successfulMultiDeleteMessage);
+      await expect(deleteTextResult).to.be.contains(statusesPage.successfulDeleteMessage);
     });
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterDelete', baseContext);
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/statuses/02_filterSortAndPagination.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/statuses/02_filterSortAndPagination.ts
index 2e8efe2d5bfc2..6f4831fbb0037 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/statuses/02_filterSortAndPagination.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/statuses/02_filterSortAndPagination.ts
@@ -166,7 +166,7 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Filter, sort and pa
 
         for (let row = 1; row <= numberOfLinesAfterFilter; row++) {
           if (test.args.filterTypeOf === 'boolean') {
-            const columnStatus = await statusesPage.getStatus(page, row, test.args.filterBy);
+            const columnStatus = await statusesPage.getStatus(page, tableName, row, test.args.filterBy);
             await expect(columnStatus).to.equal(test.args.filterValue === '1');
           } else {
             const textColumn = await statusesPage.getTextColumn(
@@ -194,32 +194,32 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Filter, sort and pa
     const sortTests = [
       {
         args: {
-          testIdentifier: 'sortByIdDesc', sortBy: 'id_order_state', columnID: 1, sortDirection: 'down', isFloat: true,
+          testIdentifier: 'sortByIdDesc', sortBy: 'id_order_state', columnID: 2, sortDirection: 'desc', isFloat: true,
         },
       },
       {
         args: {
-          testIdentifier: 'sortByNameAsc', sortBy: 'name', columnID: 2, sortDirection: 'up',
+          testIdentifier: 'sortByNameAsc', sortBy: 'name', columnID: 3, sortDirection: 'asc',
         },
       },
       {
         args: {
-          testIdentifier: 'sortByNameDesc', sortBy: 'name', columnID: 2, sortDirection: 'down',
+          testIdentifier: 'sortByNameDesc', sortBy: 'name', columnID: 3, sortDirection: 'desc',
         },
       },
       {
         args: {
-          testIdentifier: 'sortByTemplateAsc', sortBy: 'template', columnID: 7, sortDirection: 'up',
+          testIdentifier: 'sortByTemplateAsc', sortBy: 'template', columnID: 7, sortDirection: 'asc',
         },
       },
       {
         args: {
-          testIdentifier: 'sortByTemplateDesc', sortBy: 'template', columnID: 7, sortDirection: 'down',
+          testIdentifier: 'sortByTemplateDesc', sortBy: 'template', columnID: 7, sortDirection: 'desc',
         },
       },
       {
         args: {
-          testIdentifier: 'sortByIdAsc', sortBy: 'id_order_state', columnID: 1, sortDirection: 'up', isFloat: true,
+          testIdentifier: 'sortByIdAsc', sortBy: 'id_order_state', columnID: 2, sortDirection: 'asc', isFloat: true,
         },
       },
     ];
@@ -248,7 +248,7 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Filter, sort and pa
 
           const expectedResult = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
-          if (test.args.sortDirection === 'up') {
+          if (test.args.sortDirection === 'asc') {
             await expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
             await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
@@ -256,7 +256,7 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Filter, sort and pa
         } else {
           const expectedResult = await basicHelper.sortArray(nonSortedTable);
 
-          if (test.args.sortDirection === 'up') {
+          if (test.args.sortDirection === 'asc') {
             await expect(sortedTable).to.deep.equal(expectedResult);
           } else {
             await expect(sortedTable).to.deep.equal(expectedResult.reverse());
@@ -304,28 +304,28 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Filter, sort and pa
       await testContext.addContextItem(this, 'testIdentifier', 'changeItemNumberTo20', baseContext);
 
       const paginationNumber = await statusesPage.selectPaginationLimit(page, tableName, 20);
-      expect(paginationNumber).to.equal('1');
+      expect(paginationNumber).to.contains('(page 1 / 2)');
     });
 
     it('should click on next', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnNext', baseContext);
 
       const paginationNumber = await statusesPage.paginationNext(page, tableName);
-      expect(paginationNumber).to.equal('2');
+      expect(paginationNumber).to.contains('(page 2 / 2)');
     });
 
     it('should click on previous', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnPrevious', baseContext);
 
       const paginationNumber = await statusesPage.paginationPrevious(page, tableName);
-      expect(paginationNumber).to.equal('1');
+      expect(paginationNumber).to.contains('(page 1 / 2)');
     });
 
     it('should change the items number to 50 per page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'changeItemNumberTo50', baseContext);
 
       const paginationNumber = await statusesPage.selectPaginationLimit(page, tableName, 50);
-      expect(paginationNumber).to.equal('1');
+      expect(paginationNumber).to.contains('(page 1 / 1)');
     });
   });
 
@@ -354,7 +354,7 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Filter, sort and pa
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteStatus', baseContext);
 
       const deleteTextResult = await statusesPage.bulkDeleteOrderStatuses(page, tableName);
-      await expect(deleteTextResult).to.be.contains(statusesPage.successfulMultiDeleteMessage);
+      await expect(deleteTextResult).to.be.contains(statusesPage.successfulDeleteMessage);
     });
 
     it('should reset all filters', async function () {
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/statuses/03_quickEdit.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/statuses/03_quickEdit.ts
index 3e0747930bb77..5c1c9b9565926 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/statuses/03_quickEdit.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/statuses/03_quickEdit.ts
@@ -122,17 +122,18 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Quick edit order st
 
       const isActionPerformed = await statusesPage.setStatus(
         page,
+        tableName,
         1,
         orderStatus.args.columnName,
         orderStatus.args.enable,
       );
 
       if (isActionPerformed) {
-        const resultMessage = await statusesPage.getGrowlMessageContent(page);
+        const resultMessage = await statusesPage.getAlertSuccessBlockParagraphContent(page);
         await expect(resultMessage).to.contains(statusesPage.successfulUpdateStatusMessage);
       }
 
-      const currentStatus = await statusesPage.getStatus(page, 1, orderStatus.args.columnName);
+      const currentStatus = await statusesPage.getStatus(page, tableName, 1, orderStatus.args.columnName);
       await expect(currentStatus).to.be.equal(orderStatus.args.enable);
     });
   });
diff --git a/tests/UI/data/faker/orderReturnStatus.ts b/tests/UI/data/faker/orderReturnStatus.ts
index b36585fdb4508..db3adf237ba24 100644
--- a/tests/UI/data/faker/orderReturnStatus.ts
+++ b/tests/UI/data/faker/orderReturnStatus.ts
@@ -21,8 +21,10 @@ export default class OrderReturnStatusData {
     /** @type {number} ID of the status */
     this.id = orderReturnStatusToCreate.id || 0;
 
-    /** @type {string} Name of the status */
-    this.name = orderReturnStatusToCreate.name || `order_return_status_${faker.lorem.word()}`;
+    /** @type {string} Name of the status (Max 32 characters) */
+    this.name = (orderReturnStatusToCreate.name || `order_return_status_${faker.lorem.word({
+      length: {min: 1, max: 12},
+    })}`).substring(0, 32);
 
     /** @type {string} Hexadecimal value for the status  */
     this.color = orderReturnStatusToCreate.color || faker.internet.color();
diff --git a/tests/UI/data/faker/orderStatus.ts b/tests/UI/data/faker/orderStatus.ts
index 6e788ee48d047..ee1b7f7942e20 100644
--- a/tests/UI/data/faker/orderStatus.ts
+++ b/tests/UI/data/faker/orderStatus.ts
@@ -41,8 +41,10 @@ export default class OrderStatusData {
     /** @type {number} Name of the status */
     this.id = orderStatusToCreate.id || 0;
 
-    /** @type {string} Name of the status */
-    this.name = orderStatusToCreate.name || `order_status_${faker.lorem.word()}`;
+    /** @type {string} Name of the status (Max 32 characters) */
+    this.name = (orderStatusToCreate.name || `order_status_${faker.lorem.word({
+      length: {min: 1, max: 19},
+    })}`).substring(0, 32);
 
     /** @type {string} Hexadecimal value for the status color */
     this.color = orderStatusToCreate.color || faker.internet.color();
diff --git a/tests/UI/pages/BO/shopParameters/orderSettings/statuses/add.ts b/tests/UI/pages/BO/shopParameters/orderSettings/statuses/add.ts
index 2f976aa464646..d7e1fc56363c6 100644
--- a/tests/UI/pages/BO/shopParameters/orderSettings/statuses/add.ts
+++ b/tests/UI/pages/BO/shopParameters/orderSettings/statuses/add.ts
@@ -16,8 +16,6 @@ class AddOrderStatus extends BOBasePage {
 
   private readonly nameInput: string;
 
-  private readonly iconInput: string;
-
   private readonly colorInput: string;
 
   private readonly logableOnCheckbox: string;
@@ -47,23 +45,22 @@ class AddOrderStatus extends BOBasePage {
   constructor() {
     super();
 
-    this.pageTitleCreate = 'Statuses > Add new •';
-    this.pageTitleEdit = 'Statuses > Edit:';
+    this.pageTitleCreate = 'Add new order status •';
+    this.pageTitleEdit = 'Edit:';
 
     // Form selectors
-    this.nameInput = '#name_1';
-    this.iconInput = '#icon';
-    this.colorInput = '#color_0';
-    this.logableOnCheckbox = '#logable_on';
-    this.invoiceOnCheckbox = '#invoice_on';
-    this.hiddenOnCheckbox = '#hidden_on';
-    this.sendEmailOnCheckbox = '#send_email_on';
-    this.pdfInvoiceOnCheckbox = '#pdf_invoice_on';
-    this.pdfDeliveryOnCheckbox = '#pdf_delivery_on';
-    this.shippedOnCheckbox = '#shipped_on';
-    this.paidOnCheckbox = '#paid_on';
-    this.deliveryOnCheckbox = '#delivery_on';
-    this.saveButton = '#order_state_form_submit_btn';
+    this.nameInput = '#order_state_name_1';
+    this.colorInput = '#order_state_color';
+    this.logableOnCheckbox = '#order_state_loggable';
+    this.invoiceOnCheckbox = '#order_state_invoice';
+    this.hiddenOnCheckbox = '#order_state_hidden';
+    this.sendEmailOnCheckbox = '#order_state_send_email';
+    this.pdfInvoiceOnCheckbox = '#order_state_pdf_invoice';
+    this.pdfDeliveryOnCheckbox = '#order_state_pdf_delivery';
+    this.shippedOnCheckbox = '#order_state_shipped';
+    this.paidOnCheckbox = '#order_state_paid';
+    this.deliveryOnCheckbox = '#order_state_delivery';
+    this.saveButton = '#save-button';
   }
 
   /* Methods */
@@ -77,27 +74,24 @@ class AddOrderStatus extends BOBasePage {
   async setOrderStatus(page: Page, orderStatusData: OrderStatusData): Promise<string> {
     await this.setValue(page, this.nameInput, orderStatusData.name);
 
-    // Set icon for order status
-    await this.uploadFile(page, this.iconInput, `${orderStatusData.name}.jpg`);
-
     // Set color
-    await this.setValue(page, this.colorInput, orderStatusData.color);
-
-    await this.setChecked(page, this.logableOnCheckbox, orderStatusData.logableOn);
-    await this.setChecked(page, this.invoiceOnCheckbox, orderStatusData.invoiceOn);
-    await this.setChecked(page, this.hiddenOnCheckbox, orderStatusData.hiddenOn);
-    await this.setChecked(page, this.sendEmailOnCheckbox, orderStatusData.sendEmailOn);
-    await this.setChecked(page, this.pdfInvoiceOnCheckbox, orderStatusData.pdfInvoiceOn);
-    await this.setChecked(page, this.pdfDeliveryOnCheckbox, orderStatusData.pdfDeliveryOn);
-    await this.setChecked(page, this.shippedOnCheckbox, orderStatusData.shippedOn);
-    await this.setChecked(page, this.paidOnCheckbox, orderStatusData.paidOn);
-    await this.setChecked(page, this.deliveryOnCheckbox, orderStatusData.deliveryOn);
+    await this.setColorValue(page, this.colorInput, orderStatusData.color);
+
+    await this.setHiddenCheckboxValue(page, this.logableOnCheckbox, orderStatusData.logableOn);
+    await this.setHiddenCheckboxValue(page, this.invoiceOnCheckbox, orderStatusData.invoiceOn);
+    await this.setHiddenCheckboxValue(page, this.hiddenOnCheckbox, orderStatusData.hiddenOn);
+    await this.setHiddenCheckboxValue(page, this.sendEmailOnCheckbox, orderStatusData.sendEmailOn);
+    await this.setHiddenCheckboxValue(page, this.pdfInvoiceOnCheckbox, orderStatusData.pdfInvoiceOn);
+    await this.setHiddenCheckboxValue(page, this.pdfDeliveryOnCheckbox, orderStatusData.pdfDeliveryOn);
+    await this.setHiddenCheckboxValue(page, this.shippedOnCheckbox, orderStatusData.shippedOn);
+    await this.setHiddenCheckboxValue(page, this.paidOnCheckbox, orderStatusData.paidOn);
+    await this.setHiddenCheckboxValue(page, this.deliveryOnCheckbox, orderStatusData.deliveryOn);
 
     // Save order status
     await this.clickAndWaitForURL(page, this.saveButton);
 
     // Return successful message
-    return this.getAlertSuccessBlockContent(page);
+    return this.getAlertSuccessBlockParagraphContent(page);
   }
 }
 
diff --git a/tests/UI/pages/BO/shopParameters/orderSettings/statuses/index.ts b/tests/UI/pages/BO/shopParameters/orderSettings/statuses/index.ts
index 82969e0f6682f..1d6717c69087b 100644
--- a/tests/UI/pages/BO/shopParameters/orderSettings/statuses/index.ts
+++ b/tests/UI/pages/BO/shopParameters/orderSettings/statuses/index.ts
@@ -16,6 +16,8 @@ class Statuses extends BOBasePage {
 
   private readonly newOrderReturnStatusLink: string;
 
+  private readonly gridPanel: (tableName: string) => string;
+
   private readonly gridForm: (tableName: string) => string;
 
   private readonly gridTableHeaderTitle: (tableName: string) => string;
@@ -52,39 +54,33 @@ class Statuses extends BOBasePage {
 
   private readonly tableColumnActionsDeleteLink: (tableName: string, row: number) => string;
 
-  private readonly tableColumnValidIcon: (row: number, column: string) => string;
+  private readonly tableColumnActionsStatus: (tableName: string, row: number, column: string) => string;
 
-  private readonly tableColumnNotValidIcon: (row: number, column: string) => string;
+  private readonly tableColumnActionsStatusToggleInput: (tableName: string, row: number, column: string) => string;
 
-  private readonly deleteModalButtonYes: string;
+  private readonly confirmDeleteModal: (tableName: string) => string;
 
-  private readonly paginationActiveLabel: (tableName: string) => string;
+  private readonly confirmDeleteButton: (tableName: string) => string;
 
-  private readonly paginationDiv: (tableName: string) => string;
+  private readonly paginationLimitSelect: (tableName: string) => string;
 
-  private readonly paginationDropdownButton: (tableName: string) => string;
+  private readonly paginationLabel: (tableName: string) => string;
 
-  private readonly paginationItems: (tableName: string, number: number) => string;
+  private readonly paginationNextLink: (tableName: string) => string;
 
   private readonly paginationPreviousLink: (tableName: string) => string;
 
-  private readonly paginationNextLink: (tableName: string) => string;
-
   private readonly tableHead: (tableName: string) => string;
 
   private readonly sortColumnDiv: (tableName: string, column: number) => string;
 
   private readonly sortColumnSpanButton: (tableName: string, column: number) => string;
 
-  private readonly bulkActionBlock: string;
-
-  private readonly bulkActionMenuButton: (tableName: string) => string;
-
-  private readonly bulkActionDropdownMenu: string;
+  private readonly deleteSelectionButton: (tableName: string) => string;
 
-  private readonly selectAllLink: string;
+  private readonly selectAllLabel: (tableName: string) => string;
 
-  private readonly bulkDeleteLink: string;
+  private readonly bulkActionsToggleButton: (tableName: string) => string;
 
   /**
    * @constructs
@@ -94,26 +90,27 @@ class Statuses extends BOBasePage {
     super();
 
     this.pageTitle = 'Statuses •';
-    this.successfulUpdateStatusMessage = 'The status has been updated successfully.';
+    this.successfulUpdateStatusMessage = 'The status has been successfully updated.';
 
     // Header selectors
-    this.newOrderStatusLink = '#page-header-desc-order_return_state-new_order_state';
-    this.newOrderReturnStatusLink = '#page-header-desc-order_return_state-new_order_return_state';
+    this.newOrderStatusLink = '#page-header-desc-configuration-add[title=\'Add new order status\']';
+    this.newOrderReturnStatusLink = '#page-header-desc-configuration-add_return_state[title=\'Add new order return status\']';
 
     // Form selectors
-    this.gridForm = (tableName: string) => `#form-${tableName}_state`;
+    this.gridPanel = (tableName: string) => `#${tableName}_states_grid_panel`;
+    this.gridForm = (tableName: string) => `#${tableName}_states_filter_form`;
     this.gridTableHeaderTitle = (tableName: string) => `${this.gridForm(tableName)} .panel-heading`;
-    this.gridTableNumberOfTitlesSpan = (tableName: string) => `${this.gridTableHeaderTitle(tableName)} span.badge`;
+    this.gridTableNumberOfTitlesSpan = (tableName: string) => `${this.gridPanel(tableName)} h3.card-header-title`;
 
     // Table selectors
-    this.gridTable = (tableName: string) => `#table-${tableName}_state`;
+    this.gridTable = (tableName: string) => `#${tableName}_states_grid_table`;
 
     // Filter selectors
-    this.filterRow = (tableName: string) => `${this.gridTable(tableName)} tr.filter`;
-    this.filterColumn = (tableName: string, filterBy: string) => `${this.filterRow(tableName)}
-    [name='${tableName}_stateFilter_${filterBy}']`;
-    this.filterSearchButton = (tableName: string) => `#submitFilterButton${tableName}_state`;
-    this.filterResetButton = (tableName: string) => `button[name='submitReset${tableName}_state']`;
+    this.filterRow = (tableName: string) => `${this.gridTable(tableName)} tr.column-filters`;
+    this.filterColumn = (tableName: string, filterBy: string) => `${this.filterRow(tableName)} `
+      + `#${tableName}_states_${filterBy}`;
+    this.filterSearchButton = (tableName: string) => `${this.gridTable(tableName)} .grid-search-button`;
+    this.filterResetButton = (tableName: string) => `${this.gridTable(tableName)} .grid-reset-button`;
 
     // Table body selectors
     this.tableBody = (tableName: string) => `${this.gridTable(tableName)} tbody`;
@@ -129,32 +126,30 @@ class Statuses extends BOBasePage {
     this.tableColumnActions = (tableName: string, row: number) => `${this.tableBodyColumns(tableName, row)}`
       + ' .btn-group-action';
     this.tableColumnActionsEditLink = (tableName: string, row: number) => `${this.tableColumnActions(tableName, row)}`
-      + ' a.edit';
+      + ' a.grid-edit-row-link';
     this.tableColumnActionsToggleButton = (tableName: string, row: number) => `${this.tableColumnActions(tableName, row)}`
       + ' button.dropdown-toggle';
     this.tableColumnActionsDropdownMenu = (tableName: string, row: number) => `${this.tableColumnActions(tableName, row)}`
-      + ' .dropdown-menu';
-    this.tableColumnActionsDeleteLink = (tableName: string, row: number) => `${this.tableColumnActionsDropdownMenu(
-      tableName, row)} a.delete`;
-    this.tableColumnValidIcon = (row: number, column: string) => `${this.tableColumn('order', row, column)
-    } a.action-enabled`;
-    this.tableColumnNotValidIcon = (row: number, column: string) => `${this.tableColumn('order', row, column)
-    } a.action-disabled`;
+      + ' a[data-toggle=\'dropdown\']';
+    this.tableColumnActionsDeleteLink = (tableName: string, row: number) => `${this.tableColumnActions(
+      tableName, row)} a.grid-delete-row-link`;
+    this.tableColumnActionsStatus = (tableName: string, row: number, column: string) => `${
+      this.tableColumn(tableName, row, column)} .ps-switch`;
+    this.tableColumnActionsStatusToggleInput = (tableName: string, row: number, column: string) => `${
+      this.tableColumnActionsStatus(tableName, row, column)} input`;
 
     // Confirmation modal
-    this.deleteModalButtonYes = '#popup_ok';
+    this.confirmDeleteModal = (tableName: string) => `#${tableName}_states-grid-confirm-modal`;
+    this.confirmDeleteButton = (tableName: string) => `${this.confirmDeleteModal(tableName)} button.btn-confirm-submit`;
 
     // Growl message
     this.growlMessageBlock = '.growl-message';
 
     // Pagination selectors
-    this.paginationActiveLabel = (tableName: string) => `${this.gridForm(tableName)} ul.pagination.pull-right li.active a`;
-    this.paginationDiv = (tableName: string) => `${this.gridForm(tableName)} .pagination`;
-    this.paginationDropdownButton = (tableName: string) => `${this.paginationDiv(tableName)} .dropdown-toggle`;
-    this.paginationItems = (tableName: string, number: number) => `${this.gridForm(tableName)}
-    .dropdown-menu a[data-items='${number}']`;
-    this.paginationPreviousLink = (tableName: string) => `${this.gridForm(tableName)} .icon-angle-left`;
-    this.paginationNextLink = (tableName: string) => `${this.gridForm(tableName)} .icon-angle-right`;
+    this.paginationLimitSelect = (tableName: string) => `${this.gridPanel(tableName)} #paginator_select_page_limit`;
+    this.paginationLabel = (tableName: string) => `${this.gridPanel(tableName)} .col-form-label`;
+    this.paginationNextLink = (tableName: string) => `${this.gridPanel(tableName)} [data-role=next-page-link]`;
+    this.paginationPreviousLink = (tableName: string) => `${this.gridPanel(tableName)} [data-role='previous-page-link']`;
 
     // Sort Selectors
     this.tableHead = (tableName: string) => `${this.gridTable(tableName)} thead`;
@@ -162,11 +157,10 @@ class Statuses extends BOBasePage {
     this.sortColumnSpanButton = (tableName: string, column: number) => `${this.sortColumnDiv(tableName, column)} span.ps-sort`;
 
     // Bulk actions selectors
-    this.bulkActionBlock = 'div.bulk-actions';
-    this.bulkActionMenuButton = (tableName: string) => `#bulk_action_menu_${tableName}_state`;
-    this.bulkActionDropdownMenu = `${this.bulkActionBlock} ul.dropdown-menu`;
-    this.selectAllLink = `${this.bulkActionDropdownMenu} li:nth-child(1)`;
-    this.bulkDeleteLink = `${this.bulkActionDropdownMenu} li:nth-child(4)`;
+    this.deleteSelectionButton = (tableName: string) => `${this.gridPanel(tableName)} #${
+      tableName}_states_grid_bulk_action_delete_selection`;
+    this.selectAllLabel = (tableName: string) => `${this.gridPanel(tableName)} tr.column-filters .grid_bulk_action_select_all`;
+    this.bulkActionsToggleButton = (tableName: string) => `${this.gridPanel(tableName)} button.js-bulk-actions-btn`;
   }
 
   /* Header methods */
@@ -194,7 +188,7 @@ class Statuses extends BOBasePage {
   /**
    * Get Number of element in grid of statuses/return statuses table
    * @param page {Page} Browser tab
-   * @param tableName {string} Table name to get number of elements
+   * @param tableName {string} Table name
    * @return {Promise<number>}
    */
   getNumberOfElementInGrid(page: Page, tableName: string): Promise<number> {
@@ -204,7 +198,7 @@ class Statuses extends BOBasePage {
   /**
    * Reset all filters
    * @param page {Page} Browser tab
-   * @param tableName {string} Table name to reset filter
+   * @param tableName {string} Table name to reset and get number of lines
    * @return {Promise<void>}
    */
   async resetFilter(page: Page, tableName: string): Promise<void> {
@@ -287,15 +281,19 @@ class Statuses extends BOBasePage {
    * @return {Promise<string>}
    */
   async deleteOrderStatus(page: Page, tableName: string, row: number): Promise<string> {
+    // Add listener to dialog to accept deletion
+    await this.dialogListener(page, true);
+    // Click on dropDown
     await Promise.all([
-      page.click(this.tableColumnActionsToggleButton(tableName, row)),
-      this.waitForVisibleSelector(page, this.tableColumnActionsDeleteLink(tableName, row)),
+      page.click(this.tableColumnActionsDropdownMenu(tableName, row)),
+      this.waitForVisibleSelector(page, `${this.tableColumnActionsDropdownMenu(tableName, row)}[aria-expanded='true']`),
     ]);
 
+    // Click on delete and wait for modal
     await page.click(this.tableColumnActionsDeleteLink(tableName, row));
-
+    await this.waitForVisibleSelector(page, `${this.confirmDeleteModal(tableName)}.show`);
     // Confirm delete action
-    await this.clickAndWaitForURL(page, this.deleteModalButtonYes);
+    await this.clickAndWaitForURL(page, this.confirmDeleteButton(tableName));
 
     // Get successful message
     return this.getAlertSuccessBlockContent(page);
@@ -309,7 +307,7 @@ class Statuses extends BOBasePage {
    * @return {Promise<string>}
    */
   getPaginationLabel(page: Page, tableName: string): Promise<string> {
-    return this.getTextContent(page, this.paginationActiveLabel(tableName));
+    return this.getTextContent(page, this.paginationLabel(tableName));
   }
 
   /**
@@ -320,8 +318,7 @@ class Statuses extends BOBasePage {
    * @returns {Promise<string>}
    */
   async selectPaginationLimit(page: Page, tableName: string, number: number): Promise<string> {
-    await this.waitForSelectorAndClick(page, this.paginationDropdownButton(tableName));
-    await page.click(this.paginationItems(tableName, number));
+    await this.selectByVisibleText(page, this.paginationLimitSelect(tableName), number.toString());
 
     return this.getPaginationLabel(page, tableName);
   }
@@ -380,9 +377,15 @@ class Statuses extends BOBasePage {
    * @return {Promise<void>}
    */
   async sortTable(page: Page, tableName: string, sortBy: string, columnID: number, sortDirection: string): Promise<void> {
-    const sortColumnButton: string = `${this.sortColumnDiv(tableName, columnID)} i.icon-caret-${sortDirection}`;
+    const sortColumnDiv = `${this.sortColumnDiv(tableName, columnID)} [data-sort-direction='${sortDirection}']`;
 
-    await this.clickAndWaitForURL(page, sortColumnButton);
+    let i: number = 0;
+    while (await this.elementNotVisible(page, sortColumnDiv, 2000) && i < 2) {
+      await this.clickAndWaitForLoadState(page, this.sortColumnSpanButton(tableName, columnID));
+      i += 1;
+    }
+
+    await this.waitForVisibleSelector(page, sortColumnDiv, 20000);
   }
 
   /* Bulk actions methods */
@@ -393,11 +396,10 @@ class Statuses extends BOBasePage {
    * @return {Promise<void>}
    */
   async bulkSelectRows(page: Page, tableName: string): Promise<void> {
-    await page.click(this.bulkActionMenuButton(tableName));
-
+    // Click on Select All
     await Promise.all([
-      page.click(this.selectAllLink),
-      this.waitForHiddenSelector(page, this.selectAllLink),
+      page.$eval(this.selectAllLabel(tableName), (el: HTMLElement) => el.click()),
+      this.waitForVisibleSelector(page, `${this.bulkActionsToggleButton(tableName)}:not([disabled])`),
     ]);
   }
 
@@ -408,49 +410,55 @@ class Statuses extends BOBasePage {
    * @returns {Promise<string>}
    */
   async bulkDeleteOrderStatuses(page: Page, tableName: string): Promise<string> {
-    await this.dialogListener(page, true);
     // Select all rows
     await this.bulkSelectRows(page, tableName);
 
     // Click on Button Bulk actions
-    await page.click(this.bulkActionMenuButton(tableName));
+    await Promise.all([
+      page.click(this.bulkActionsToggleButton(tableName)),
+      this.waitForVisibleSelector(page, `${this.bulkActionsToggleButton(tableName)}[aria-expanded='true']`),
+    ]);
+    // Click on delete and wait for modal
+    await Promise.all([
+      page.click(this.deleteSelectionButton(tableName)),
+      this.waitForVisibleSelector(page, `${this.confirmDeleteModal(tableName)}.show`),
+    ]);
+    await this.clickAndWaitForURL(page, this.confirmDeleteButton(tableName));
 
-    // Click on delete
-    await this.clickAndWaitForURL(page, this.bulkDeleteLink);
-    return this.getAlertSuccessBlockContent(page);
+    return this.getAlertSuccessBlockParagraphContent(page);
   }
 
   /**
    * Get Value of column Displayed
    * @param page {Page} Browser tab
+   * @param tableName {string} Table name to sort
    * @param row {number} Row on table
    * @param columnName {string} Column name to get status
    * @returns {Promise<boolean>}
    */
-  getStatus(page: Page, row: number, columnName: string): Promise<boolean> {
-    return this.elementVisible(page, this.tableColumnValidIcon(row, columnName), 100);
+  async getStatus(page: Page, tableName: string, row: number, columnName: string): Promise<boolean> {
+    const inputValue = await this.getAttributeContent(
+      page,
+      `${this.tableColumnActionsStatusToggleInput(tableName, row, columnName)}:checked`,
+      'value',
+    );
+
+    // Return status=false if value='0' and true otherwise
+    return (inputValue !== '0');
   }
 
   /**
    * Quick edit toggle column value
    * @param page {Page} Browser tab
+   * @param tableName {string} Table name to sort
    * @param row {number} Row on table
    * @param columnName {string} column name on table
    * @param valueWanted {boolean} True if we need to enable status
    * @returns {Promise<boolean>} return true if action is done, false otherwise
    */
-  async setStatus(page: Page, row: number, columnName: string, valueWanted: boolean = true): Promise<boolean> {
-    const columnSelector = this.tableColumn('order', row, columnName);
-
-    await this.waitForVisibleSelector(page, columnSelector, 2000);
-
-    if (await this.getStatus(page, row, columnName) !== valueWanted) {
-      await page.click(columnSelector);
-      await this.waitForVisibleSelector(
-        page,
-        (valueWanted ? this.tableColumnValidIcon(row, columnName) : this.tableColumnNotValidIcon(row, columnName)),
-      );
-
+  async setStatus(page: Page, tableName: string, row: number, columnName: string, valueWanted: boolean = true): Promise<boolean> {
+    if (await this.getStatus(page, tableName, row, columnName) !== valueWanted) {
+      await this.clickAndWaitForNavigation(page, this.tableColumnActionsStatus(tableName, row, columnName));
       return true;
     }
 
diff --git a/tests/UI/pages/BO/shopParameters/orderSettings/statuses/returnStatus/add.ts b/tests/UI/pages/BO/shopParameters/orderSettings/statuses/returnStatus/add.ts
index 82a570d057a79..286f6c9dac659 100644
--- a/tests/UI/pages/BO/shopParameters/orderSettings/statuses/returnStatus/add.ts
+++ b/tests/UI/pages/BO/shopParameters/orderSettings/statuses/returnStatus/add.ts
@@ -29,13 +29,13 @@ class AddOrderReturnStatus extends BOBasePage {
   constructor() {
     super();
 
-    this.pageTitleCreate = 'Statuses > Add new •';
-    this.pageTitleEdit = 'Statuses > Edit •';
+    this.pageTitleCreate = 'Return statuses •';
+    this.pageTitleEdit = 'Edit:';
 
     // Form selectors
-    this.nameInput = '#name_1';
-    this.colorInput = '#color_0';
-    this.saveButton = '#order_return_state_form_submit_btn';
+    this.nameInput = '#order_return_state_name_1';
+    this.colorInput = '#order_return_state_color';
+    this.saveButton = '#save-button';
   }
 
   /* Methods */
@@ -50,13 +50,13 @@ class AddOrderReturnStatus extends BOBasePage {
     await this.setValue(page, this.nameInput, orderReturnStatusData.name);
 
     // Set color
-    await this.setValue(page, this.colorInput, orderReturnStatusData.color);
+    await this.setColorValue(page, this.colorInput, orderReturnStatusData.color);
 
     // Save order return status
     await this.clickAndWaitForURL(page, this.saveButton);
 
     // Return successful message
-    return this.getAlertSuccessBlockContent(page);
+    return this.getAlertSuccessBlockParagraphContent(page);
   }
 }
 
diff --git a/tests/UI/pages/commonPage.ts b/tests/UI/pages/commonPage.ts
index 44020aa64dde0..3c4a815455b35 100755
--- a/tests/UI/pages/commonPage.ts
+++ b/tests/UI/pages/commonPage.ts
@@ -235,6 +235,20 @@ export default class CommonPage {
     }
   }
 
+  /**
+   * Delete the existing text from input then set a value
+   * @param page {Page} Browser tab
+   * @param selector {string} String to locate the input to set its value
+   * @param value {string} Value to set on the input
+   * @return {Promise<void>}
+   */
+  async setColorValue(page: Page, selector: string, value: string): Promise<void> {
+    await this.clearInput(page, selector);
+
+    // eslint-disable-next-line no-param-reassign
+    await page.$eval(selector, (el: HTMLInputElement, value: string) => { el.value = value; }, value);
+  }
+
   /**
    * Delete text from input
    * @param page {Frame|Page} Browser tab
@@ -243,8 +257,8 @@ export default class CommonPage {
    */
   async clearInput(page: Frame|Page, selector: string): Promise<void> {
     await this.waitForVisibleSelector(page, selector);
-    // eslint-disable-next-line no-return-assign,no-param-reassign
-    await page.$eval(selector, (el: HTMLInputElement) => el.value = '');
+    // eslint-disable-next-line no-param-reassign
+    await page.$eval(selector, (el: HTMLInputElement) => { el.value = ''; });
   }
 
   /**
@@ -525,12 +539,12 @@ export default class CommonPage {
    * @returns {Promise<string|null>}
    */
   async clickAndWaitForDownload(page: Page, selector: string, targetBlank: boolean = false): Promise<string | null> {
-    /* eslint-disable no-return-assign, no-param-reassign */
+    /* eslint-disable no-param-reassign */
     // Delete the target because a new tab is opened when downloading the file
     if (targetBlank) {
       await page.$eval(selector, (el: HTMLLinkElement) => el.setAttribute('target', ''));
     }
-    /* eslint-enable no-return-assign, no-param-reassign */
+    /* eslint-enable no-param-reassign */
 
     const [download] = await Promise.all([
       page.waitForEvent('download'),

From 5d588aa397275d3a846cb288064e4addb7e1531e Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Mon, 13 Feb 2023 16:07:31 +0100
Subject: [PATCH 0898/1030] Order State : Use settings in legacy Objects

---
 classes/order/OrderReturnState.php                           | 5 ++++-
 classes/order/OrderState.php                                 | 5 ++++-
 .../Domain/OrderReturnState/OrderReturnStateSettings.php     | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/classes/order/OrderReturnState.php b/classes/order/OrderReturnState.php
index cdbd4c16ec9ef..db76b91e56881 100644
--- a/classes/order/OrderReturnState.php
+++ b/classes/order/OrderReturnState.php
@@ -1,4 +1,7 @@
 <?php
+
+use PrestaShop\PrestaShop\Core\Domain\OrderReturnState\OrderReturnStateSettings;
+
 /**
  * Copyright since 2007 PrestaShop SA and Contributors
  * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
@@ -42,7 +45,7 @@ class OrderReturnStateCore extends ObjectModel
             'color' => ['type' => self::TYPE_STRING, 'validate' => 'isColor'],
 
             /* Lang fields */
-            'name' => ['type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'required' => true, 'size' => 64],
+            'name' => ['type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'required' => true, 'size' => OrderReturnStateSettings::NAME_MAX_LENGTH],
         ],
     ];
 
diff --git a/classes/order/OrderState.php b/classes/order/OrderState.php
index 6c7096ca01098..611a1bb92113c 100644
--- a/classes/order/OrderState.php
+++ b/classes/order/OrderState.php
@@ -1,4 +1,7 @@
 <?php
+
+use PrestaShop\PrestaShop\Core\Domain\OrderState\OrderStateSettings;
+
 /**
  * Copyright since 2007 PrestaShop SA and Contributors
  * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
@@ -91,7 +94,7 @@ class OrderStateCore extends ObjectModel
             'deleted' => ['type' => self::TYPE_BOOL, 'validate' => 'isBool'],
 
             /* Lang fields */
-            'name' => ['type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'required' => true, 'size' => 64],
+            'name' => ['type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'required' => true, 'size' => OrderStateSettings::NAME_MAX_LENGTH],
             'template' => ['type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isTplName', 'size' => 64],
         ],
     ];
diff --git a/src/Core/Domain/OrderReturnState/OrderReturnStateSettings.php b/src/Core/Domain/OrderReturnState/OrderReturnStateSettings.php
index 845fdccfe49c5..490f7b8be9676 100644
--- a/src/Core/Domain/OrderReturnState/OrderReturnStateSettings.php
+++ b/src/Core/Domain/OrderReturnState/OrderReturnStateSettings.php
@@ -31,7 +31,7 @@
 class OrderReturnStateSettings
 {
     /**
-     * Profile name max length as defined in the ObjectModel
+     * Order Return State name max length as defined in the ObjectModel
      */
-    public const NAME_MAX_LENGTH = 32;
+    public const NAME_MAX_LENGTH = 64;
 }

From 189a93253b7c44b1574573f55f63befaaa2fd6e5 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Fri, 28 Jul 2023 14:00:25 +0200
Subject: [PATCH 0899/1030] Functional Tests : Fixed
 functional/BO/13*/02*/02*/returnStatuses/01*

---
 .../02_statuses/returnStatuses/01_CRUDOrderReturnStatus.ts  | 4 ++--
 .../pages/BO/shopParameters/orderSettings/statuses/index.ts | 6 +++---
 .../orderSettings/statuses/returnStatus/add.ts              | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/returnStatuses/01_CRUDOrderReturnStatus.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/returnStatuses/01_CRUDOrderReturnStatus.ts
index 2f5df7d25ab8d..87e054f8b86e6 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/returnStatuses/01_CRUDOrderReturnStatus.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/returnStatuses/01_CRUDOrderReturnStatus.ts
@@ -87,7 +87,7 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Create, update '
       await statusesPage.goToNewOrderReturnStatusPage(page);
 
       const pageTitle = await addOrderReturnStatusPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addOrderReturnStatusPage.pageTitleCreate);
+      await expect(pageTitle).to.eq(addOrderReturnStatusPage.pageTitleCreate);
     });
 
     it('should create order return status and check result', async function () {
@@ -125,7 +125,7 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Create, update '
       await statusesPage.goToEditPage(page, tableName, 1);
 
       const pageTitle = await addOrderReturnStatusPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addOrderReturnStatusPage.pageTitleEdit);
+      await expect(pageTitle).to.contains(addOrderReturnStatusPage.pageTitleEdit(createOrderReturnStatusData.name));
     });
 
     it('should update order return status', async function () {
diff --git a/tests/UI/pages/BO/shopParameters/orderSettings/statuses/index.ts b/tests/UI/pages/BO/shopParameters/orderSettings/statuses/index.ts
index 1d6717c69087b..d4c00e8902aff 100644
--- a/tests/UI/pages/BO/shopParameters/orderSettings/statuses/index.ts
+++ b/tests/UI/pages/BO/shopParameters/orderSettings/statuses/index.ts
@@ -94,7 +94,7 @@ class Statuses extends BOBasePage {
 
     // Header selectors
     this.newOrderStatusLink = '#page-header-desc-configuration-add[title=\'Add new order status\']';
-    this.newOrderReturnStatusLink = '#page-header-desc-configuration-add_return_state[title=\'Add new order return status\']';
+    this.newOrderReturnStatusLink = '#page-header-desc-configuration-add_return_state[title=\'Add new return status\']';
 
     // Form selectors
     this.gridPanel = (tableName: string) => `#${tableName}_states_grid_panel`;
@@ -296,7 +296,7 @@ class Statuses extends BOBasePage {
     await this.clickAndWaitForURL(page, this.confirmDeleteButton(tableName));
 
     // Get successful message
-    return this.getAlertSuccessBlockContent(page);
+    return this.getAlertSuccessBlockParagraphContent(page);
   }
 
   /* Pagination methods */
@@ -458,7 +458,7 @@ class Statuses extends BOBasePage {
    */
   async setStatus(page: Page, tableName: string, row: number, columnName: string, valueWanted: boolean = true): Promise<boolean> {
     if (await this.getStatus(page, tableName, row, columnName) !== valueWanted) {
-      await this.clickAndWaitForNavigation(page, this.tableColumnActionsStatus(tableName, row, columnName));
+      await this.clickAndWaitForLoadState(page, this.tableColumnActionsStatus(tableName, row, columnName));
       return true;
     }
 
diff --git a/tests/UI/pages/BO/shopParameters/orderSettings/statuses/returnStatus/add.ts b/tests/UI/pages/BO/shopParameters/orderSettings/statuses/returnStatus/add.ts
index 286f6c9dac659..aa2d427f9217a 100644
--- a/tests/UI/pages/BO/shopParameters/orderSettings/statuses/returnStatus/add.ts
+++ b/tests/UI/pages/BO/shopParameters/orderSettings/statuses/returnStatus/add.ts
@@ -14,7 +14,7 @@ import {Page} from 'playwright';
 class AddOrderReturnStatus extends BOBasePage {
   public readonly pageTitleCreate: string;
 
-  public readonly pageTitleEdit: string;
+  public readonly pageTitleEdit: (name: string) => string;
 
   private readonly nameInput: string;
 
@@ -29,8 +29,8 @@ class AddOrderReturnStatus extends BOBasePage {
   constructor() {
     super();
 
-    this.pageTitleCreate = 'Return statuses •';
-    this.pageTitleEdit = 'Edit:';
+    this.pageTitleCreate = `New return status • ${global.INSTALL.SHOP_NAME}`;
+    this.pageTitleEdit = (name: string) => `Editing return status ${name} • ${global.INSTALL.SHOP_NAME}`;
 
     // Form selectors
     this.nameInput = '#order_return_state_name_1';

From d66b65a3e1cf0ec6fb999f9eaa0a10c06b21ed59 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Fri, 28 Jul 2023 14:53:23 +0200
Subject: [PATCH 0900/1030] Functional Tests : Fixed
 functional/BO/13*/02*/02*/statuses/01*

---
 .../02_statuses/statuses/01_CRUDOrderStatus.ts              | 2 +-
 .../pages/BO/shopParameters/orderSettings/statuses/add.ts   | 6 +++---
 .../pages/BO/shopParameters/orderSettings/statuses/index.ts | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/statuses/01_CRUDOrderStatus.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/statuses/01_CRUDOrderStatus.ts
index c67d9391fd692..0b4902c314037 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/statuses/01_CRUDOrderStatus.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/statuses/01_CRUDOrderStatus.ts
@@ -193,7 +193,7 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Create, read, updat
       await statusesPage.goToEditPage(page, tableName, 1);
 
       const pageTitle = await addOrderStatusPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addOrderStatusPage.pageTitleEdit);
+      await expect(pageTitle).to.contains(addOrderStatusPage.pageTitleEdit(createOrderStatusData.name));
     });
 
     it('should update order status', async function () {
diff --git a/tests/UI/pages/BO/shopParameters/orderSettings/statuses/add.ts b/tests/UI/pages/BO/shopParameters/orderSettings/statuses/add.ts
index d7e1fc56363c6..154a62a41bee0 100644
--- a/tests/UI/pages/BO/shopParameters/orderSettings/statuses/add.ts
+++ b/tests/UI/pages/BO/shopParameters/orderSettings/statuses/add.ts
@@ -12,7 +12,7 @@ import type {Page} from 'playwright';
 class AddOrderStatus extends BOBasePage {
   public readonly pageTitleCreate: string;
 
-  public readonly pageTitleEdit: string;
+  public readonly pageTitleEdit: (name: string) => string;
 
   private readonly nameInput: string;
 
@@ -45,8 +45,8 @@ class AddOrderStatus extends BOBasePage {
   constructor() {
     super();
 
-    this.pageTitleCreate = 'Add new order status •';
-    this.pageTitleEdit = 'Edit:';
+    this.pageTitleCreate = `New order status • ${global.INSTALL.SHOP_NAME}`;
+    this.pageTitleEdit = (name: string) => `Editing order status ${name} • ${global.INSTALL.SHOP_NAME}`;
 
     // Form selectors
     this.nameInput = '#order_state_name_1';
diff --git a/tests/UI/pages/BO/shopParameters/orderSettings/statuses/index.ts b/tests/UI/pages/BO/shopParameters/orderSettings/statuses/index.ts
index d4c00e8902aff..b4c5856285bc9 100644
--- a/tests/UI/pages/BO/shopParameters/orderSettings/statuses/index.ts
+++ b/tests/UI/pages/BO/shopParameters/orderSettings/statuses/index.ts
@@ -239,6 +239,7 @@ class Statuses extends BOBasePage {
 
       case 'select':
         await this.selectByVisibleText(page, this.filterColumn(tableName, filterBy), value === '1' ? 'Yes' : 'No');
+        await page.click(this.filterSearchButton(tableName));
         break;
 
       default:

From 1ec6d77bb1a06480b8edbf5d68244be4c5f9e121 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Fri, 28 Jul 2023 15:15:32 +0200
Subject: [PATCH 0901/1030] Removed feature flag

---
 install-dev/data/xml/feature_flag.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/install-dev/data/xml/feature_flag.xml b/install-dev/data/xml/feature_flag.xml
index 4cf7cdcbc59c4..50624bd0f29ae 100644
--- a/install-dev/data/xml/feature_flag.xml
+++ b/install-dev/data/xml/feature_flag.xml
@@ -23,7 +23,6 @@
     <feature_flag id="permission" name="permission" type="env,dotenv,db" label_wording="Permissions" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated permissions page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
     <feature_flag id="tax_rules_group" name="tax_rules_group" type="env,dotenv,db" label_wording="Tax rule groups" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated tax rules page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
     <feature_flag id="customer_threads" name="customer_threads" type="env,dotenv,db" label_wording="Customer threads" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated customer threads page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
-    <feature_flag id="order_state" name="order_state" type="env,dotenv,db" label_wording="Order states" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the migrated order states page." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
     <feature_flag id="symfony_layout" name="symfony_layout" type="env,query,dotenv,db" label_wording="Symfony layout" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable symfony layout (in opposition to legacy layout)." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
     <feature_flag id="front_container_v2" name="front_container_v2" type="env,dotenv,db" label_wording="New front container" label_domain="Admin.Advparameters.Feature" description_wording="Enable / Disable the new front container." description_domain="Admin.Advparameters.Help" state="0" stability="beta" />
   </entities>

From f3a835766929e4f63f4185ea36cdd9f4839975e7 Mon Sep 17 00:00:00 2001
From: Morgan Pichat <morgan.pichat@prestashop.com>
Date: Thu, 31 Aug 2023 21:20:48 +0200
Subject: [PATCH 0902/1030] Add PsVersion

---
 admin-dev/themes/new-theme/template/layout.tpl        |  1 -
 .../views/Admin/Component/Layout/header.html.twig     |  2 +-
 .../Resources/views/Admin/Layout/header.html.twig     |  1 -
 src/PrestaShopBundle/Twig/Component/Header.php        | 11 ++++++++++-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/admin-dev/themes/new-theme/template/layout.tpl b/admin-dev/themes/new-theme/template/layout.tpl
index e3cfee7d90e43..123a0ab2d9c43 100644
--- a/admin-dev/themes/new-theme/template/layout.tpl
+++ b/admin-dev/themes/new-theme/template/layout.tpl
@@ -16,7 +16,6 @@
       full_language_code=$full_language_code
       full_cldr_language_code=$full_cldr_language_code
       country_iso_code=$country_iso_code
-      ps_version=$smarty.const._PS_VERSION_
       round_mode=$round_mode
       shop_context=(isset($shop_context)) ? $shop_context : null
       token=$token
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/header.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/header.html.twig
index e9cd2a742bd61..d6e365fe97ffc 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/header.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/header.html.twig
@@ -16,7 +16,7 @@
     var full_language_code = '{{ full_language_code|e('js') }}';
     var full_cldr_language_code = '{{ full_cldr_language_code|e('js') }}';
     var country_iso_code = '{{ country_iso_code|e('js') }}';
-    var _PS_VERSION_ = '{{ ps_version|e('js') }}';
+    var _PS_VERSION_ = '{{ this.psVersion|e('js') }}';
     var roundMode = {{ round_mode|intCast }};
     var youEditFieldFor = '';
     {% if shop_context %}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/header.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/header.html.twig
index 389e86e32934d..6048464431611 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Layout/header.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/header.html.twig
@@ -35,7 +35,6 @@
   full_language_code: full_language_code,
   full_cldr_language_code: full_cldr_language_code,
   country_iso_code: country_iso_code,
-  ps_version: ps_version,
   round_mode: round_mode,
   shop_context: shop_context,
   token: token,
diff --git a/src/PrestaShopBundle/Twig/Component/Header.php b/src/PrestaShopBundle/Twig/Component/Header.php
index 1e24c5225096d..a0b09ffe584ad 100644
--- a/src/PrestaShopBundle/Twig/Component/Header.php
+++ b/src/PrestaShopBundle/Twig/Component/Header.php
@@ -50,7 +50,6 @@ class Header
     public string $full_language_code;
     public string $full_cldr_language_code;
     public string $country_iso_code;
-    public string $ps_version;
     public string $round_mode;
     public ?string $shop_context;
     public string $token;
@@ -62,6 +61,11 @@ class Header
     public array $js_inline;
     public ?string $displayBackOfficeHeader;
 
+    public function __construct(
+        private readonly string $psVersion,
+    ) {
+    }
+
     public function getEmployeeToken(): string
     {
         return Tools::getAdminToken('AdminEmployees');
@@ -71,4 +75,9 @@ public function getJsDef(): array
     {
         return Media::getJsDef();
     }
+
+    public function getPsVersion(): string
+    {
+        return $this->psVersion;
+    }
 }

From 2ddec69a1de8204df7e6f559265d086116098875 Mon Sep 17 00:00:00 2001
From: Morgan Pichat <morgan.pichat@prestashop.com>
Date: Thu, 31 Aug 2023 22:51:15 +0200
Subject: [PATCH 0903/1030] Add isoUser, langIsRtl, countryIsoCode

---
 .../themes/new-theme/template/layout.tpl      |  3 ---
 .../Admin/Component/Layout/header.html.twig   |  6 ++---
 .../views/Admin/Layout/header.html.twig       |  3 ---
 .../Twig/Component/Header.php                 | 22 ++++++++++++++-----
 4 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/admin-dev/themes/new-theme/template/layout.tpl b/admin-dev/themes/new-theme/template/layout.tpl
index 123a0ab2d9c43..6d56048a5cd0f 100644
--- a/admin-dev/themes/new-theme/template/layout.tpl
+++ b/admin-dev/themes/new-theme/template/layout.tpl
@@ -11,11 +11,8 @@
       shop_name=$shop_name
       display_header_javascript=(isset($display_header_javascript)) ? $display_header_javascript : false
       controller_name=$controller_name
-      iso_user=$iso_user
-      lang_is_rtl=$lang_is_rtl
       full_language_code=$full_language_code
       full_cldr_language_code=$full_cldr_language_code
-      country_iso_code=$country_iso_code
       round_mode=$round_mode
       shop_context=(isset($shop_context)) ? $shop_context : null
       token=$token
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/header.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/header.html.twig
index d6e365fe97ffc..beb59aca7f6ac 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/header.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/header.html.twig
@@ -11,11 +11,11 @@
 {% if display_header_javascript %}
   <script type="text/javascript">
     var help_class_name = '{{ controller_name|e('js') }}';
-    var iso_user = '{{ iso_user|e('js') }}';
-    var lang_is_rtl = '{{ lang_is_rtl|intCast }}';
+    var iso_user = '{{ this.isoUser|e('js') }}';
+    var lang_is_rtl = '{{ this.langIsRtl|intCast }}';
     var full_language_code = '{{ full_language_code|e('js') }}';
     var full_cldr_language_code = '{{ full_cldr_language_code|e('js') }}';
-    var country_iso_code = '{{ country_iso_code|e('js') }}';
+    var country_iso_code = '{{ this.countryIsoCode|e('js') }}';
     var _PS_VERSION_ = '{{ this.psVersion|e('js') }}';
     var roundMode = {{ round_mode|intCast }};
     var youEditFieldFor = '';
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/header.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/header.html.twig
index 6048464431611..8094bae9d55ab 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Layout/header.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/header.html.twig
@@ -30,11 +30,8 @@
   shop_name: shop_name,
   display_header_javascript: display_header_javascript|default(false),
   controller_name: controller_name,
-  iso_user: iso_user,
-  lang_is_rtl: lang_is_rtl,
   full_language_code: full_language_code,
   full_cldr_language_code: full_cldr_language_code,
-  country_iso_code: country_iso_code,
   round_mode: round_mode,
   shop_context: shop_context,
   token: token,
diff --git a/src/PrestaShopBundle/Twig/Component/Header.php b/src/PrestaShopBundle/Twig/Component/Header.php
index a0b09ffe584ad..1db44aa2b75fa 100644
--- a/src/PrestaShopBundle/Twig/Component/Header.php
+++ b/src/PrestaShopBundle/Twig/Component/Header.php
@@ -30,6 +30,7 @@
 
 use Link;
 use Media;
+use PrestaShop\PrestaShop\Adapter\LegacyContext;
 use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
 use Tools;
 
@@ -42,14 +43,9 @@ class Header
     public string $meta_title;
     public string $shop_name;
     public bool $display_header_javascript;
-
     public string $controller_name;
-
-    public string $iso_user;
-    public string $lang_is_rtl;
     public string $full_language_code;
     public string $full_cldr_language_code;
-    public string $country_iso_code;
     public string $round_mode;
     public ?string $shop_context;
     public string $token;
@@ -62,6 +58,7 @@ class Header
     public ?string $displayBackOfficeHeader;
 
     public function __construct(
+        private readonly LegacyContext $context,
         private readonly string $psVersion,
     ) {
     }
@@ -80,4 +77,19 @@ public function getPsVersion(): string
     {
         return $this->psVersion;
     }
+
+    public function getIsoUser(): string
+    {
+        return $this->context->getLanguage()->getIsoCode();
+    }
+
+    public function getCountryIsoCode(): string
+    {
+        return $this->context->getContext()->country->iso_code;
+    }
+
+    public function getLangIsRtl(): bool
+    {
+        return (bool) $this->context->getLanguage()->isRTL();
+    }
 }

From 0453ae34a513f4f2d3f94e9529a35998b2834ae3 Mon Sep 17 00:00:00 2001
From: Morgan Pichat <morgan.pichat@prestashop.com>
Date: Fri, 1 Sep 2023 11:14:54 +0200
Subject: [PATCH 0904/1030] Add controllerName, shopName, imgDir

---
 .../themes/new-theme/template/layout.tpl      |  3 ---
 .../Admin/Component/Layout/header.html.twig   | 12 +++++------
 .../views/Admin/Layout/header.html.twig       |  3 ---
 .../Twig/Component/Header.php                 | 20 ++++++++++++++++---
 4 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/admin-dev/themes/new-theme/template/layout.tpl b/admin-dev/themes/new-theme/template/layout.tpl
index 6d56048a5cd0f..acf5094f300b1 100644
--- a/admin-dev/themes/new-theme/template/layout.tpl
+++ b/admin-dev/themes/new-theme/template/layout.tpl
@@ -6,11 +6,8 @@
       twig_template="@PrestaShop/Admin/Layout/header.html.twig"
       link=$link
       viewport_scale=(isset($viewport_scale)) ? $viewport_scale : null
-      img_dir=$img_dir
       meta_title=$meta_title
-      shop_name=$shop_name
       display_header_javascript=(isset($display_header_javascript)) ? $display_header_javascript : false
-      controller_name=$controller_name
       full_language_code=$full_language_code
       full_cldr_language_code=$full_cldr_language_code
       round_mode=$round_mode
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/header.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/header.html.twig
index beb59aca7f6ac..03c4c956b1716 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/header.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/header.html.twig
@@ -3,14 +3,14 @@
 <meta name="apple-mobile-web-app-capable" content="yes">
 <meta name="robots" content="NOFOLLOW, NOINDEX">
 
-<link rel="icon" type="image/x-icon" href="{{ img_dir }}favicon.ico" />
-<link rel="apple-touch-icon" href="{{ img_dir }}app_icon.png" />
+<link rel="icon" type="image/x-icon" href="{{ this.imgDir }}favicon.ico" />
+<link rel="apple-touch-icon" href="{{ this.imgDir }}app_icon.png" />
 
-<title>{% if meta_title %}{{ meta_title }} • {% endif %}{{ shop_name }}</title>
+<title>{% if meta_title %}{{ meta_title }} • {% endif %}{{ this.shopName }}</title>
 
 {% if display_header_javascript %}
   <script type="text/javascript">
-    var help_class_name = '{{ controller_name|e('js') }}';
+    var help_class_name = '{{ this.controllerName|e('js') }}';
     var iso_user = '{{ this.isoUser|e('js') }}';
     var lang_is_rtl = '{{ this.langIsRtl|intCast }}';
     var full_language_code = '{{ full_language_code|e('js') }}';
@@ -23,9 +23,9 @@
       {% if shop_context == constant('\Shop::CONTEXT_ALL') %}
     youEditFieldFor = '{{ 'This field will be modified for all your shops.'|trans({}, 'Admin.Notifications.Info') }}';
       {% elseif shop_context == constant('\Shop::CONTEXT_GROUP') %}
-    youEditFieldFor = '{{ 'This field will be modified for all shops in this shop group:'|trans({}, 'Admin.Notifications.Info') }} <b>{{ shop_name|e('js') }}</b>';
+    youEditFieldFor = '{{ 'This field will be modified for all shops in this shop group:'|trans({}, 'Admin.Notifications.Info') }} <b>{{ this.shopName|e('js') }}</b>';
       {% else %}
-    youEditFieldFor = '{{ 'This field will be modified for this shop:'|trans({}, 'Admin.Notifications.Info') }} <b>{{ shop_name|e('js') }}</b>
+    youEditFieldFor = '{{ 'This field will be modified for this shop:'|trans({}, 'Admin.Notifications.Info') }} <b>{{ this.shopName|e('js') }}</b>
       {% endif %}
     {% endif %}
     var new_order_msg = '{{ 'A new order has been placed on your store.'|trans({}, 'Admin.Navigation.Header') }}';
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/header.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/header.html.twig
index 8094bae9d55ab..8a77621640d73 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Layout/header.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/header.html.twig
@@ -25,11 +25,8 @@
 {{ component('Header', {
   link: link,
   viewport_scale: viewport_scale|default(null),
-  img_dir: img_dir,
   meta_title: meta_title,
-  shop_name: shop_name,
   display_header_javascript: display_header_javascript|default(false),
-  controller_name: controller_name,
   full_language_code: full_language_code,
   full_cldr_language_code: full_cldr_language_code,
   round_mode: round_mode,
diff --git a/src/PrestaShopBundle/Twig/Component/Header.php b/src/PrestaShopBundle/Twig/Component/Header.php
index 1db44aa2b75fa..60b9a7de67c12 100644
--- a/src/PrestaShopBundle/Twig/Component/Header.php
+++ b/src/PrestaShopBundle/Twig/Component/Header.php
@@ -30,6 +30,7 @@
 
 use Link;
 use Media;
+use PrestaShop\PrestaShop\Adapter\Configuration;
 use PrestaShop\PrestaShop\Adapter\LegacyContext;
 use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
 use Tools;
@@ -39,11 +40,8 @@ class Header
 {
     public Link $link;
     public ?string $viewport_scale;
-    public string $img_dir;
     public string $meta_title;
-    public string $shop_name;
     public bool $display_header_javascript;
-    public string $controller_name;
     public string $full_language_code;
     public string $full_cldr_language_code;
     public string $round_mode;
@@ -59,6 +57,7 @@ class Header
 
     public function __construct(
         private readonly LegacyContext $context,
+        private readonly Configuration $configuration,
         private readonly string $psVersion,
     ) {
     }
@@ -92,4 +91,19 @@ public function getLangIsRtl(): bool
     {
         return (bool) $this->context->getLanguage()->isRTL();
     }
+
+    public function getShopName(): string
+    {
+        return $this->configuration->get('PS_SHOP_NAME');
+    }
+
+    public function getControllerName(): string
+    {
+        return htmlentities(Tools::getValue('controller'));
+    }
+
+    public function getImgDir(): string
+    {
+        return _PS_IMG_;
+    }
 }

From 7a16e988932601c6a889741778616e573627b685 Mon Sep 17 00:00:00 2001
From: Morgan Pichat <morgan.pichat@prestashop.com>
Date: Fri, 1 Sep 2023 14:14:15 +0200
Subject: [PATCH 0905/1030] Add displayHeaderJavascript, fullLanguageCode,
 fullCldrLanguageCode

---
 admin-dev/themes/new-theme/template/layout.tpl |  3 ---
 .../Admin/Component/Layout/header.html.twig    |  6 +++---
 .../views/Admin/Layout/header.html.twig        |  3 ---
 src/PrestaShopBundle/Twig/Component/Header.php | 18 +++++++++++++++---
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/admin-dev/themes/new-theme/template/layout.tpl b/admin-dev/themes/new-theme/template/layout.tpl
index acf5094f300b1..97dad575b6c76 100644
--- a/admin-dev/themes/new-theme/template/layout.tpl
+++ b/admin-dev/themes/new-theme/template/layout.tpl
@@ -7,9 +7,6 @@
       link=$link
       viewport_scale=(isset($viewport_scale)) ? $viewport_scale : null
       meta_title=$meta_title
-      display_header_javascript=(isset($display_header_javascript)) ? $display_header_javascript : false
-      full_language_code=$full_language_code
-      full_cldr_language_code=$full_cldr_language_code
       round_mode=$round_mode
       shop_context=(isset($shop_context)) ? $shop_context : null
       token=$token
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/header.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/header.html.twig
index 03c4c956b1716..6463c51ad1072 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/header.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/header.html.twig
@@ -8,13 +8,13 @@
 
 <title>{% if meta_title %}{{ meta_title }} • {% endif %}{{ this.shopName }}</title>
 
-{% if display_header_javascript %}
+{% if this.displayHeaderJavascript %}
   <script type="text/javascript">
     var help_class_name = '{{ this.controllerName|e('js') }}';
     var iso_user = '{{ this.isoUser|e('js') }}';
     var lang_is_rtl = '{{ this.langIsRtl|intCast }}';
-    var full_language_code = '{{ full_language_code|e('js') }}';
-    var full_cldr_language_code = '{{ full_cldr_language_code|e('js') }}';
+    var full_language_code = '{{ this.fullLanguageCode|e('js') }}';
+    var full_cldr_language_code = '{{ this.fullCldrLanguageCode|e('js') }}';
     var country_iso_code = '{{ this.countryIsoCode|e('js') }}';
     var _PS_VERSION_ = '{{ this.psVersion|e('js') }}';
     var roundMode = {{ round_mode|intCast }};
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/header.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/header.html.twig
index 8a77621640d73..aa8b032a37584 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Layout/header.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/header.html.twig
@@ -26,9 +26,6 @@
   link: link,
   viewport_scale: viewport_scale|default(null),
   meta_title: meta_title,
-  display_header_javascript: display_header_javascript|default(false),
-  full_language_code: full_language_code,
-  full_cldr_language_code: full_cldr_language_code,
   round_mode: round_mode,
   shop_context: shop_context,
   token: token,
diff --git a/src/PrestaShopBundle/Twig/Component/Header.php b/src/PrestaShopBundle/Twig/Component/Header.php
index 60b9a7de67c12..792e4ed79efa1 100644
--- a/src/PrestaShopBundle/Twig/Component/Header.php
+++ b/src/PrestaShopBundle/Twig/Component/Header.php
@@ -41,9 +41,6 @@ class Header
     public Link $link;
     public ?string $viewport_scale;
     public string $meta_title;
-    public bool $display_header_javascript;
-    public string $full_language_code;
-    public string $full_cldr_language_code;
     public string $round_mode;
     public ?string $shop_context;
     public string $token;
@@ -106,4 +103,19 @@ public function getImgDir(): string
     {
         return _PS_IMG_;
     }
+
+    public function getDisplayHeaderJavascript(): bool
+    {
+        return (bool) Tools::getValue('liteDisplaying');
+    }
+
+    public function getFullLanguageCode(): string
+    {
+        return $this->context->getLanguage()->getLanguageCode();
+    }
+
+    public function getFullCldrLanguageCode(): string
+    {
+        return $this->context->getContext()->getCurrentLocale()->getCode();
+    }
 }

From d95a3a74e5b35e6f2922f4220fcf695d74276407 Mon Sep 17 00:00:00 2001
From: Morgan Pichat <morgan.pichat@prestashop.com>
Date: Fri, 1 Sep 2023 15:18:07 +0200
Subject: [PATCH 0906/1030] Add some fields

---
 .../themes/new-theme/template/layout.tpl      |  7 +--
 .../Admin/Component/Layout/header.html.twig   | 18 ++++----
 .../views/Admin/Layout/header.html.twig       |  7 +--
 .../Twig/Component/Header.php                 | 43 +++++++++++++------
 4 files changed, 42 insertions(+), 33 deletions(-)

diff --git a/admin-dev/themes/new-theme/template/layout.tpl b/admin-dev/themes/new-theme/template/layout.tpl
index 97dad575b6c76..2ece5c52aab60 100644
--- a/admin-dev/themes/new-theme/template/layout.tpl
+++ b/admin-dev/themes/new-theme/template/layout.tpl
@@ -4,14 +4,9 @@
   {render_template
       smarty_template="header.tpl"
       twig_template="@PrestaShop/Admin/Layout/header.html.twig"
-      link=$link
-      viewport_scale=(isset($viewport_scale)) ? $viewport_scale : null
+      display_header_javascript=(isset($display_header_javascript)) ? $display_header_javascript : false
       meta_title=$meta_title
-      round_mode=$round_mode
       shop_context=(isset($shop_context)) ? $shop_context : null
-      token=$token
-      currentIndex=$currentIndex
-      default_language=$default_language
       css_files=(isset($css_files)) ? $css_files : []
       js_def=(isset($js_def) && is_array($js_def)) ? $js_def : []
       js_files=(isset($js_files)) ? $js_files : []
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/header.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/header.html.twig
index 6463c51ad1072..ac8f7f14f4145 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/header.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/header.html.twig
@@ -1,5 +1,5 @@
 <meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale={{ viewport_scale ? viewport_scale : '1' }}">
+<meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="apple-mobile-web-app-capable" content="yes">
 <meta name="robots" content="NOFOLLOW, NOINDEX">
 
@@ -8,7 +8,7 @@
 
 <title>{% if meta_title %}{{ meta_title }} • {% endif %}{{ this.shopName }}</title>
 
-{% if this.displayHeaderJavascript %}
+{% if display_header_javascript %}
   <script type="text/javascript">
     var help_class_name = '{{ this.controllerName|e('js') }}';
     var iso_user = '{{ this.isoUser|e('js') }}';
@@ -17,7 +17,7 @@
     var full_cldr_language_code = '{{ this.fullCldrLanguageCode|e('js') }}';
     var country_iso_code = '{{ this.countryIsoCode|e('js') }}';
     var _PS_VERSION_ = '{{ this.psVersion|e('js') }}';
-    var roundMode = {{ round_mode|intCast }};
+    var roundMode = {{ this.roundMode|intCast }};
     var youEditFieldFor = '';
     {% if shop_context %}
       {% if shop_context == constant('\Shop::CONTEXT_ALL') %}
@@ -37,14 +37,14 @@
     var customer_name_msg = '{{ 'Customer name:'|trans({}, 'Admin.Navigation.Header') }} ';
     var new_msg = '{{ 'A new message was posted on your store.'|trans({}, 'Admin.Navigation.Header') }}';
     var see_msg = '{{ 'Read this message'|trans({}, 'Admin.Navigation.Header') }}';
-    var token = '{{ token|e('js') }}';
-    var currentIndex = '{{ currentIndex|e('js') }}';
+    var token = '{{ this.token|e('js') }}';
+    var currentIndex = '{{ this.currentIndex|e('js') }}';
     var employee_token = '{{ this.employeeToken|e('js') }}';
     var choose_language_translate = '{{ 'Choose language:'|trans({}, 'Admin.Actions') }}';
-    var default_language = '{{ default_language|intCast }}';
-    var admin_modules_link = '{{ link.getAdminLink("AdminModulesSf", true, {'route': "admin_module_manage"})|e('js')}}';
-    var admin_notification_get_link = '{{ link.getAdminLink("AdminCommon")|e('js') }}';
-    var admin_notification_push_link = adminNotificationPushLink = '{{ link.getAdminLink("AdminCommon", true, {'route': 'admin_common_notifications_ack'})|e('js') }}';
+    var default_language = '{{ this.defaultLanguage|intCast }}';
+    var admin_modules_link = '{{ this.link.getAdminLink("AdminModulesSf", true, {'route': "admin_module_manage"})|e('js')}}';
+    var admin_notification_get_link = '{{ this.link.getAdminLink("AdminCommon")|e('js') }}';
+    var admin_notification_push_link = adminNotificationPushLink = '{{ this.link.getAdminLink("AdminCommon", true, {'route': 'admin_common_notifications_ack'})|e('js') }}';
     var update_success_msg = '{{ 'Update successful'|trans({}, 'Admin.Notifications.Success') }}';
     var search_product_msg = '{{ 'Search for a product'|trans({}, 'Admin.Orderscustomers.Feature') }}';
   </script>
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/header.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/header.html.twig
index aa8b032a37584..48f6ec52670a3 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Layout/header.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/header.html.twig
@@ -23,14 +23,9 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  *#}
 {{ component('Header', {
-  link: link,
-  viewport_scale: viewport_scale|default(null),
+  display_header_javascript: display_header_javascript|default(false),
   meta_title: meta_title,
-  round_mode: round_mode,
   shop_context: shop_context,
-  token: token,
-  currentIndex: currentIndex,
-  default_language: default_language,
   css_files: css_files,
   js_files: js_files|default([]),
   js_inline: js_inline|default([]),
diff --git a/src/PrestaShopBundle/Twig/Component/Header.php b/src/PrestaShopBundle/Twig/Component/Header.php
index 792e4ed79efa1..0fff3bf9ef300 100644
--- a/src/PrestaShopBundle/Twig/Component/Header.php
+++ b/src/PrestaShopBundle/Twig/Component/Header.php
@@ -32,27 +32,23 @@
 use Media;
 use PrestaShop\PrestaShop\Adapter\Configuration;
 use PrestaShop\PrestaShop\Adapter\LegacyContext;
+use PrestaShopBundle\Entity\Repository\TabRepository;
 use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
 use Tools;
 
 #[AsTwigComponent(template: '@PrestaShop/Admin/Component/Layout/header.html.twig')]
 class Header
 {
-    public Link $link;
-    public ?string $viewport_scale;
     public string $meta_title;
-    public string $round_mode;
     public ?string $shop_context;
-    public string $token;
-    public string $currentIndex;
-    public string $default_language;
-
+    public bool $display_header_javascript;
     public array $css_files;
     public array $js_files;
     public array $js_inline;
     public ?string $displayBackOfficeHeader;
 
     public function __construct(
+        private readonly TabRepository $tabRepository,
         private readonly LegacyContext $context,
         private readonly Configuration $configuration,
         private readonly string $psVersion,
@@ -104,11 +100,6 @@ public function getImgDir(): string
         return _PS_IMG_;
     }
 
-    public function getDisplayHeaderJavascript(): bool
-    {
-        return (bool) Tools::getValue('liteDisplaying');
-    }
-
     public function getFullLanguageCode(): string
     {
         return $this->context->getLanguage()->getLanguageCode();
@@ -118,4 +109,32 @@ public function getFullCldrLanguageCode(): string
     {
         return $this->context->getContext()->getCurrentLocale()->getCode();
     }
+
+    public function getRoundMode(): string
+    {
+        return $this->configuration->get('PS_PRICE_ROUND_MODE');
+    }
+
+    public function getToken(): string
+    {
+        $controllerName = $this->getControllerName();
+        $tabId = $this->tabRepository->getIdByClassName($controllerName);
+
+        return Tools::getAdminToken($controllerName . $tabId . (int) $this->context->getContext()->employee->id);
+    }
+
+    public function getDefaultLanguage(): string
+    {
+        return $this->configuration->get('PS_LANG_DEFAULT');
+    }
+
+    public function getLink(): ?Link
+    {
+        return $this->context->getContext()->link;
+    }
+
+    public function getCurrentIndex(): string
+    {
+        return $this->context->getContext()->controller::$currentIndex;
+    }
 }

From 56dd002e43187afcaf2ce643234413316f3f7149 Mon Sep 17 00:00:00 2001
From: Morgan Pichat <morgan.pichat@prestashop.com>
Date: Fri, 1 Sep 2023 17:18:21 +0200
Subject: [PATCH 0907/1030] Update phpStan

---
 phpstan-tmp-legacy-layout-baseline.neon | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/phpstan-tmp-legacy-layout-baseline.neon b/phpstan-tmp-legacy-layout-baseline.neon
index 0e5cafe2ba483..01a918da36ed9 100644
--- a/phpstan-tmp-legacy-layout-baseline.neon
+++ b/phpstan-tmp-legacy-layout-baseline.neon
@@ -32,7 +32,12 @@ parameters:
 
 		-
 			message: "#^Namespace Tools is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
-			count: 2
+			count: 4
+			path: src/PrestaShopBundle/Twig/Component/Header.php
+
+		-
+			message: "#^Using _PS_IMG_ is forbidden, Use dependency injection instead$#"
+			count: 1
 			path: src/PrestaShopBundle/Twig/Component/Header.php
 
 		-

From 9023c31ba24e6f5a755531915215a3155a540dd6 Mon Sep 17 00:00:00 2001
From: Morgan Pichat <morgan.pichat@prestashop.com>
Date: Mon, 4 Sep 2023 14:49:32 +0200
Subject: [PATCH 0908/1030] Fix keycloak module configuration error

---
 .../Entity/Repository/TabRepository.php       | 29 ++++++++++---------
 .../Admin/Component/Layout/toolbar.html.twig  |  4 +--
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/PrestaShopBundle/Entity/Repository/TabRepository.php b/src/PrestaShopBundle/Entity/Repository/TabRepository.php
index 8525956efa0ab..92bc5e74d2c1d 100644
--- a/src/PrestaShopBundle/Entity/Repository/TabRepository.php
+++ b/src/PrestaShopBundle/Entity/Repository/TabRepository.php
@@ -121,24 +121,27 @@ public function changeEnabledByModuleName($moduleName, $enabled)
     /**
      * @param string $className
      *
-     * @return int
+     * @return ?int
      *
-     * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
-    public function getIdByClassName(string $className): int
+    public function getIdByClassName(string $className): ?int
     {
         if (!isset($this->cachedTabIds[$className])) {
-            $result = $this->createQueryBuilder('t')
-                ->select('t.id, t.className')
-                ->where('t.className = :className')
-                ->andWhere('t.id != 0')
-                ->setParameter('className', $className)
-                ->getQuery()
-                ->getSingleResult(Query::HYDRATE_ARRAY)
-            ;
-
-            $this->cachedTabIds[$result['className']] = (int) $result['id'];
+            try {
+                $result = $this->createQueryBuilder('t')
+                    ->select('t.id, t.className')
+                    ->where('t.className = :className')
+                    ->andWhere('t.id != 0')
+                    ->setParameter('className', $className)
+                    ->getQuery()
+                    ->getSingleResult(Query::HYDRATE_ARRAY)
+                ;
+
+                $this->cachedTabIds[$result['className']] = (int) $result['id'];
+            } catch (\Doctrine\ORM\NoResultException) {
+                return null;
+            }
         }
 
         return $this->cachedTabIds[$className];
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/toolbar.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/toolbar.html.twig
index f5fccb8ed0e96..1c52abc6ab55b 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/toolbar.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/toolbar.html.twig
@@ -29,11 +29,11 @@
     {% block pageBreadcrumb %}
       <nav aria-label="Breadcrumb">
         <ol class="breadcrumb">
-          {% if breadcrumbs.container.name != '' %}
+          {% if breadcrumbs.container is defined and breadcrumbs.container.name != '' %}
             <li class="breadcrumb-item">{{ breadcrumbs.container.name|escape }}</li>
           {% endif %}
 
-          {% if breadcrumbs.tab.name != '' and breadcrumbs.container.name != breadcrumbs.tab.name and breadcrumbs.tab.href != '' %}
+          {% if  breadcrumbs.tab is defined and breadcrumbs.tab.name != '' and breadcrumbs.container.name != breadcrumbs.tab.name and breadcrumbs.tab.href != '' %}
             <li class="breadcrumb-item active">
               <a href="{{ breadcrumbs.tab.href|escape }}" aria-current="page">{{ breadcrumbs.tab.name|escape }}</a>
             </li>

From 045f718032c5a26cc58bc0f1f279136c8ec30c13 Mon Sep 17 00:00:00 2001
From: Morgan Pichat <morgan.pichat@prestashop.com>
Date: Mon, 4 Sep 2023 17:23:27 +0200
Subject: [PATCH 0909/1030] Rework PathExtension and use it in header component

---
 phpstan-tmp-legacy-layout-baseline.neon       | 15 --------------
 .../Admin/Component/Layout/header.html.twig   |  8 ++++----
 .../Twig/Component/Header.php                 | 20 ++++++++-----------
 .../Twig/Extension/PathExtension.php          | 17 ++++++++++++++++
 .../Twig/Layout/MenuBuilder.php               |  2 +-
 5 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/phpstan-tmp-legacy-layout-baseline.neon b/phpstan-tmp-legacy-layout-baseline.neon
index 01a918da36ed9..7c43d526d2c74 100644
--- a/phpstan-tmp-legacy-layout-baseline.neon
+++ b/phpstan-tmp-legacy-layout-baseline.neon
@@ -15,16 +15,6 @@ parameters:
 			count: 1
 			path: src/PrestaShopBundle/Twig/Component/EmployeeDropdown.php
 
-		-
-			message: "#^Class Link is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
-			count: 1
-			path: src/PrestaShopBundle/Twig/Component/Header.php
-
-		-
-			message: "#^Namespace Link is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
-			count: 1
-			path: src/PrestaShopBundle/Twig/Component/Header.php
-
 		-
 			message: "#^Namespace Media is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
 			count: 2
@@ -32,11 +22,6 @@ parameters:
 
 		-
 			message: "#^Namespace Tools is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
-			count: 4
-			path: src/PrestaShopBundle/Twig/Component/Header.php
-
-		-
-			message: "#^Using _PS_IMG_ is forbidden, Use dependency injection instead$#"
 			count: 1
 			path: src/PrestaShopBundle/Twig/Component/Header.php
 
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/header.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/header.html.twig
index ac8f7f14f4145..e210bc453c3f8 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/header.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/header.html.twig
@@ -37,14 +37,14 @@
     var customer_name_msg = '{{ 'Customer name:'|trans({}, 'Admin.Navigation.Header') }} ';
     var new_msg = '{{ 'A new message was posted on your store.'|trans({}, 'Admin.Navigation.Header') }}';
     var see_msg = '{{ 'Read this message'|trans({}, 'Admin.Navigation.Header') }}';
-    var token = '{{ this.token|e('js') }}';
+    var token = '{{ this.legacyToken|e('js') }}';
     var currentIndex = '{{ this.currentIndex|e('js') }}';
     var employee_token = '{{ this.employeeToken|e('js') }}';
     var choose_language_translate = '{{ 'Choose language:'|trans({}, 'Admin.Actions') }}';
     var default_language = '{{ this.defaultLanguage|intCast }}';
-    var admin_modules_link = '{{ this.link.getAdminLink("AdminModulesSf", true, {'route': "admin_module_manage"})|e('js')}}';
-    var admin_notification_get_link = '{{ this.link.getAdminLink("AdminCommon")|e('js') }}';
-    var admin_notification_push_link = adminNotificationPushLink = '{{ this.link.getAdminLink("AdminCommon", true, {'route': 'admin_common_notifications_ack'})|e('js') }}';
+    var admin_modules_link = '{{ legacy_path("AdminModulesSf", {'route': "admin_module_manage"})|e('js')}}';
+    var admin_notification_get_link = '{{ legacy_path("AdminCommon")|e('js') }}';
+    var admin_notification_push_link = adminNotificationPushLink = '{{ legacy_path("AdminCommon", {'route': 'admin_common_notifications_ack'})|e('js') }}';
     var update_success_msg = '{{ 'Update successful'|trans({}, 'Admin.Notifications.Success') }}';
     var search_product_msg = '{{ 'Search for a product'|trans({}, 'Admin.Orderscustomers.Feature') }}';
   </script>
diff --git a/src/PrestaShopBundle/Twig/Component/Header.php b/src/PrestaShopBundle/Twig/Component/Header.php
index 0fff3bf9ef300..95a0d7b9d7230 100644
--- a/src/PrestaShopBundle/Twig/Component/Header.php
+++ b/src/PrestaShopBundle/Twig/Component/Header.php
@@ -28,11 +28,11 @@
 
 namespace PrestaShopBundle\Twig\Component;
 
-use Link;
 use Media;
 use PrestaShop\PrestaShop\Adapter\Configuration;
 use PrestaShop\PrestaShop\Adapter\LegacyContext;
 use PrestaShopBundle\Entity\Repository\TabRepository;
+use PrestaShopBundle\Twig\Layout\MenuBuilder;
 use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
 use Tools;
 
@@ -51,6 +51,7 @@ public function __construct(
         private readonly TabRepository $tabRepository,
         private readonly LegacyContext $context,
         private readonly Configuration $configuration,
+        private readonly MenuBuilder $menuBuilder,
         private readonly string $psVersion,
     ) {
     }
@@ -92,12 +93,12 @@ public function getShopName(): string
 
     public function getControllerName(): string
     {
-        return htmlentities(Tools::getValue('controller'));
+        return htmlentities($this->menuBuilder->getLegacyControllerClassName());
     }
 
     public function getImgDir(): string
     {
-        return _PS_IMG_;
+        return $this->context->getRootUrl() . 'img/';
     }
 
     public function getFullLanguageCode(): string
@@ -110,14 +111,14 @@ public function getFullCldrLanguageCode(): string
         return $this->context->getContext()->getCurrentLocale()->getCode();
     }
 
-    public function getRoundMode(): string
+    public function getRoundMode(): int
     {
-        return $this->configuration->get('PS_PRICE_ROUND_MODE');
+        return (int) $this->configuration->get('PS_PRICE_ROUND_MODE');
     }
 
-    public function getToken(): string
+    public function getLegacyToken(): string
     {
-        $controllerName = $this->getControllerName();
+        $controllerName = $this->menuBuilder->getLegacyControllerClassName();
         $tabId = $this->tabRepository->getIdByClassName($controllerName);
 
         return Tools::getAdminToken($controllerName . $tabId . (int) $this->context->getContext()->employee->id);
@@ -128,11 +129,6 @@ public function getDefaultLanguage(): string
         return $this->configuration->get('PS_LANG_DEFAULT');
     }
 
-    public function getLink(): ?Link
-    {
-        return $this->context->getContext()->link;
-    }
-
     public function getCurrentIndex(): string
     {
         return $this->context->getContext()->controller::$currentIndex;
diff --git a/src/PrestaShopBundle/Twig/Extension/PathExtension.php b/src/PrestaShopBundle/Twig/Extension/PathExtension.php
index a54afecd5c518..3d0263d859c57 100644
--- a/src/PrestaShopBundle/Twig/Extension/PathExtension.php
+++ b/src/PrestaShopBundle/Twig/Extension/PathExtension.php
@@ -53,6 +53,10 @@ public function getFunctions(): array
                 'path',
                 [$this, 'getPath']
             ),
+            new TwigFunction(
+                'legacy_path',
+                [$this, 'getLegacyPath']
+            ),
         ];
     }
 
@@ -79,4 +83,17 @@ public function getPath(string $routeName, array $parameters = [], bool $relativ
 
         return $url;
     }
+
+    /**
+     * Get path for legacy link.
+     *
+     * @param string $controllerName
+     * @param array $parameters
+     *
+     * @return string
+     */
+    public function getLegacyPath(string $controllerName, array $parameters = []): string
+    {
+        return $this->context->getAdminLink($controllerName, extraParams: $parameters);
+    }
 }
diff --git a/src/PrestaShopBundle/Twig/Layout/MenuBuilder.php b/src/PrestaShopBundle/Twig/Layout/MenuBuilder.php
index e6f1aa3cfbe65..7fc6553860fde 100644
--- a/src/PrestaShopBundle/Twig/Layout/MenuBuilder.php
+++ b/src/PrestaShopBundle/Twig/Layout/MenuBuilder.php
@@ -215,7 +215,7 @@ private function getLegacyAction(): ?string
         return $legacyParameters['action'] ?? null;
     }
 
-    private function getLegacyControllerClassName(): ?string
+    public function getLegacyControllerClassName(): ?string
     {
         return $this->requestStack->getMainRequest()->attributes->get('_legacy_controller');
     }

From fe14b25b573cb356f2c6948a9006e9e3f88828ca Mon Sep 17 00:00:00 2001
From: Morgan Pichat <morgan.pichat@prestashop.com>
Date: Mon, 4 Sep 2023 18:31:25 +0200
Subject: [PATCH 0910/1030] Revert TabRepository and toolbar changes

---
 .../Entity/Repository/TabRepository.php       | 29 +++++++++----------
 .../Admin/Component/Layout/toolbar.html.twig  |  4 +--
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/PrestaShopBundle/Entity/Repository/TabRepository.php b/src/PrestaShopBundle/Entity/Repository/TabRepository.php
index 92bc5e74d2c1d..8525956efa0ab 100644
--- a/src/PrestaShopBundle/Entity/Repository/TabRepository.php
+++ b/src/PrestaShopBundle/Entity/Repository/TabRepository.php
@@ -121,27 +121,24 @@ public function changeEnabledByModuleName($moduleName, $enabled)
     /**
      * @param string $className
      *
-     * @return ?int
+     * @return int
      *
+     * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
-    public function getIdByClassName(string $className): ?int
+    public function getIdByClassName(string $className): int
     {
         if (!isset($this->cachedTabIds[$className])) {
-            try {
-                $result = $this->createQueryBuilder('t')
-                    ->select('t.id, t.className')
-                    ->where('t.className = :className')
-                    ->andWhere('t.id != 0')
-                    ->setParameter('className', $className)
-                    ->getQuery()
-                    ->getSingleResult(Query::HYDRATE_ARRAY)
-                ;
-
-                $this->cachedTabIds[$result['className']] = (int) $result['id'];
-            } catch (\Doctrine\ORM\NoResultException) {
-                return null;
-            }
+            $result = $this->createQueryBuilder('t')
+                ->select('t.id, t.className')
+                ->where('t.className = :className')
+                ->andWhere('t.id != 0')
+                ->setParameter('className', $className)
+                ->getQuery()
+                ->getSingleResult(Query::HYDRATE_ARRAY)
+            ;
+
+            $this->cachedTabIds[$result['className']] = (int) $result['id'];
         }
 
         return $this->cachedTabIds[$className];
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/toolbar.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/toolbar.html.twig
index 1c52abc6ab55b..f5fccb8ed0e96 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/toolbar.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/toolbar.html.twig
@@ -29,11 +29,11 @@
     {% block pageBreadcrumb %}
       <nav aria-label="Breadcrumb">
         <ol class="breadcrumb">
-          {% if breadcrumbs.container is defined and breadcrumbs.container.name != '' %}
+          {% if breadcrumbs.container.name != '' %}
             <li class="breadcrumb-item">{{ breadcrumbs.container.name|escape }}</li>
           {% endif %}
 
-          {% if  breadcrumbs.tab is defined and breadcrumbs.tab.name != '' and breadcrumbs.container.name != breadcrumbs.tab.name and breadcrumbs.tab.href != '' %}
+          {% if breadcrumbs.tab.name != '' and breadcrumbs.container.name != breadcrumbs.tab.name and breadcrumbs.tab.href != '' %}
             <li class="breadcrumb-item active">
               <a href="{{ breadcrumbs.tab.href|escape }}" aria-current="page">{{ breadcrumbs.tab.name|escape }}</a>
             </li>

From 1863c5be986e5ae573aefd4ddd545a672d48e693 Mon Sep 17 00:00:00 2001
From: Morgan Pichat <morgan.pichat@prestashop.com>
Date: Wed, 6 Sep 2023 10:20:49 +0200
Subject: [PATCH 0911/1030] Remove path in PathExtension

---
 .../Layout/employee_dropdown.html.twig        |  2 +-
 .../Admin/Component/Layout/nav_bar.html.twig  |  4 +--
 .../Component/Layout/quick_access.html.twig   |  6 ++--
 .../Component/Layout/search_form.html.twig    |  2 +-
 .../Twig/Extension/PathExtension.php          | 31 -------------------
 5 files changed, 7 insertions(+), 38 deletions(-)

diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/employee_dropdown.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/employee_dropdown.html.twig
index 6e4f1f901e139..0a81cf3cc0073 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/employee_dropdown.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/employee_dropdown.html.twig
@@ -61,7 +61,7 @@
         {% endif %}
       {% endfor %}
 
-      <a class="dropdown-item employee-link text-center" id="header_logout" href="{{ path('AdminLogin', {'logout' : 1})|escape('html_attr') }}">
+      <a class="dropdown-item employee-link text-center" id="header_logout" href="{{ legacy_path('AdminLogin', {'logout' : 1})|escape('html_attr') }}">
         <i class="material-icons d-lg-none">power_settings_new</i>
         <span>
           {{ 'Sign out'|trans({}, 'Admin.Navigation.Header') }}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/nav_bar.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/nav_bar.html.twig
index e2285029b9645..08d64b0630f3f 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/nav_bar.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/nav_bar.html.twig
@@ -23,7 +23,7 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  *#}
 <nav class="nav-bar d-none d-print-none d-md-block">
-  <span class="menu-collapse" data-toggle-url="{{ path('AdminEmployees', {'action' : 'toggleMenu'}) }}">
+  <span class="menu-collapse" data-toggle-url="{{ legacy_path('AdminEmployees', {'action' : 'toggleMenu'}) }}">
     <i class="material-icons rtl-flip">chevron_left</i>
     <i class="material-icons rtl-flip">chevron_left</i>
   </span>
@@ -31,7 +31,7 @@
   <div class="nav-bar-overflow">
     <div class="logo-container">
       <div class="d-flex align-items-center">
-        <a id="header_logo" class="logo float-left" href="{{ path(this.defaultTab)|escape('html_attr') }}"></a>
+        <a id="header_logo" class="logo float-left" href="{{ legacy_path(this.defaultTab)|escape('html_attr') }}"></a>
         <span id="shop_version" class="header-version">{{ this.psVersion }}</span>
       </div>
       <div class="logo-container__close js-mobile-menu">
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/quick_access.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/quick_access.html.twig
index 72aebf59d2f60..f8396062af8e4 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/quick_access.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/quick_access.html.twig
@@ -45,7 +45,7 @@
          data-quicklink-id="{{ this.currentQuickAccess.id_quick_access }}"
          data-rand="{{ random(1, 200) }}"
          data-url="{{ this.cleanCurrentUrl|escape('html_attr') }}"
-         data-post-link="{{ path('AdminQuickAccesses') }}"
+         data-post-link="{{ legacy_path('AdminQuickAccesses') }}"
          data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header')|escape('html_attr') }}"
          data-link="{{ this.currentQuickAccess.name|escape('html_attr') }}"
       >
@@ -59,7 +59,7 @@
          data-rand="{{ random(1, 200) }}"
          data-method="add"
          data-url="{{ this.cleanCurrentUrl|escape('html_attr') }}"
-         data-post-link="{{ path('AdminQuickAccesses') }}"
+         data-post-link="{{ legacy_path('AdminQuickAccesses') }}"
          data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header')|escape('html_attr')}}"
          data-link="{{ this.currentUrlTitle|escape('html_attr') }}"
       >
@@ -67,7 +67,7 @@
         {{ 'Add current page to Quick Access'|trans({}, 'Admin.Actions') }}
       </a>
     {% endif %}
-    <a id="quick-manage-link" class="dropdown-item" href="{{ path('AdminQuickAccesses') }}">
+    <a id="quick-manage-link" class="dropdown-item" href="{{ legacy_path('AdminQuickAccesses') }}">
     <i class="material-icons">settings</i>
     {{ 'Manage your quick accesses'|trans({}, 'Admin.Navigation.Header') }}
     </a>
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/search_form.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/search_form.html.twig
index 2e8d0c194627b..75b7b907967fb 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/search_form.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/search_form.html.twig
@@ -25,7 +25,7 @@
 <form id="header_search"
       class="bo_search_form dropdown-form js-dropdown-form collapsed"
       method="post"
-      action="{{ path('AdminSearch') }}"
+      action="{{ legacy_path('AdminSearch') }}"
       role="search">
   <input type="hidden" name="bo_search_type" id="bo_search_type" class="js-search-type" />
   {% if showClearBtn is defined and showClearBtn %}
diff --git a/src/PrestaShopBundle/Twig/Extension/PathExtension.php b/src/PrestaShopBundle/Twig/Extension/PathExtension.php
index 3d0263d859c57..c2fdd7241d745 100644
--- a/src/PrestaShopBundle/Twig/Extension/PathExtension.php
+++ b/src/PrestaShopBundle/Twig/Extension/PathExtension.php
@@ -27,8 +27,6 @@
 namespace PrestaShopBundle\Twig\Extension;
 
 use PrestaShop\PrestaShop\Adapter\LegacyContext;
-use Symfony\Component\Routing\Exception\RouteNotFoundException;
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
 
@@ -38,7 +36,6 @@
 class PathExtension extends AbstractExtension
 {
     public function __construct(
-        private readonly UrlGeneratorInterface $urlGenerator,
         private readonly LegacyContext $context
     ) {
     }
@@ -49,10 +46,6 @@ public function __construct(
     public function getFunctions(): array
     {
         return [
-            new TwigFunction(
-                'path',
-                [$this, 'getPath']
-            ),
             new TwigFunction(
                 'legacy_path',
                 [$this, 'getLegacyPath']
@@ -60,30 +53,6 @@ public function getFunctions(): array
         ];
     }
 
-    /**
-     * Get path for legacy or symfony link.
-     *
-     * @param string $routeName
-     * @param array $parameters
-     * @param bool $relative (only for symfony links)
-     *
-     * @return string
-     */
-    public function getPath(string $routeName, array $parameters = [], bool $relative = false): string
-    {
-        try {
-            $url = $this->urlGenerator->generate(
-                $routeName,
-                $parameters,
-                $relative ? UrlGeneratorInterface::RELATIVE_PATH : UrlGeneratorInterface::ABSOLUTE_PATH
-            );
-        } catch (RouteNotFoundException $ex) {
-            $url = $this->context->getAdminLink(controller: $routeName, extraParams: $parameters);
-        }
-
-        return $url;
-    }
-
     /**
      * Get path for legacy link.
      *

From b7620c1445e9c6333d948c47ce220bc942cec84d Mon Sep 17 00:00:00 2001
From: Morgan Pichat <morgan.pichat@prestashop.com>
Date: Wed, 6 Sep 2023 17:28:16 +0200
Subject: [PATCH 0912/1030] improve some variable

---
 .../Entity/Repository/TabRepository.php       |  5 +++
 .../Admin/Component/Layout/header.html.twig   | 17 ++-----
 .../Twig/Component/Header.php                 | 45 ++++++++++++++++---
 .../Twig/Layout/MenuBuilder.php               |  9 +++-
 4 files changed, 55 insertions(+), 21 deletions(-)

diff --git a/src/PrestaShopBundle/Entity/Repository/TabRepository.php b/src/PrestaShopBundle/Entity/Repository/TabRepository.php
index 8525956efa0ab..88493b459e9f6 100644
--- a/src/PrestaShopBundle/Entity/Repository/TabRepository.php
+++ b/src/PrestaShopBundle/Entity/Repository/TabRepository.php
@@ -65,6 +65,11 @@ public function findOneByClassName($className)
         return $this->findOneBy(['className' => $className]);
     }
 
+    public function findOneByRouteName(string $routeName): ?Tab
+    {
+        return $this->findOneBy(['route_name' => $routeName]);
+    }
+
     /**
      * @param string $className
      *
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/header.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/header.html.twig
index e210bc453c3f8..144c95ab5bc81 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/header.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/header.html.twig
@@ -18,16 +18,7 @@
     var country_iso_code = '{{ this.countryIsoCode|e('js') }}';
     var _PS_VERSION_ = '{{ this.psVersion|e('js') }}';
     var roundMode = {{ this.roundMode|intCast }};
-    var youEditFieldFor = '';
-    {% if shop_context %}
-      {% if shop_context == constant('\Shop::CONTEXT_ALL') %}
-    youEditFieldFor = '{{ 'This field will be modified for all your shops.'|trans({}, 'Admin.Notifications.Info') }}';
-      {% elseif shop_context == constant('\Shop::CONTEXT_GROUP') %}
-    youEditFieldFor = '{{ 'This field will be modified for all shops in this shop group:'|trans({}, 'Admin.Notifications.Info') }} <b>{{ this.shopName|e('js') }}</b>';
-      {% else %}
-    youEditFieldFor = '{{ 'This field will be modified for this shop:'|trans({}, 'Admin.Notifications.Info') }} <b>{{ this.shopName|e('js') }}</b>
-      {% endif %}
-    {% endif %}
+    var youEditFieldFor = '{{ this.editForLabel|e('js') }}';
     var new_order_msg = '{{ 'A new order has been placed on your store.'|trans({}, 'Admin.Navigation.Header') }}';
     var order_number_msg = '{{ 'Order number:'|trans({}, 'Admin.Navigation.Header') }} ';
     var total_msg = '{{ 'Total:'|trans({}, 'Admin.Global') }} ';
@@ -42,9 +33,9 @@
     var employee_token = '{{ this.employeeToken|e('js') }}';
     var choose_language_translate = '{{ 'Choose language:'|trans({}, 'Admin.Actions') }}';
     var default_language = '{{ this.defaultLanguage|intCast }}';
-    var admin_modules_link = '{{ legacy_path("AdminModulesSf", {'route': "admin_module_manage"})|e('js')}}';
-    var admin_notification_get_link = '{{ legacy_path("AdminCommon")|e('js') }}';
-    var admin_notification_push_link = adminNotificationPushLink = '{{ legacy_path("AdminCommon", {'route': 'admin_common_notifications_ack'})|e('js') }}';
+    var admin_modules_link = '{{ path('admin_module_manage')|e('js')}}';
+    var admin_notification_get_link = '{{ path('admin_common_notifications')|e('js') }}';
+    var admin_notification_push_link = adminNotificationPushLink = '{{ path('admin_common_notifications_ack')|e('js') }}';
     var update_success_msg = '{{ 'Update successful'|trans({}, 'Admin.Notifications.Success') }}';
     var search_product_msg = '{{ 'Search for a product'|trans({}, 'Admin.Orderscustomers.Feature') }}';
   </script>
diff --git a/src/PrestaShopBundle/Twig/Component/Header.php b/src/PrestaShopBundle/Twig/Component/Header.php
index 95a0d7b9d7230..7c08087ece079 100644
--- a/src/PrestaShopBundle/Twig/Component/Header.php
+++ b/src/PrestaShopBundle/Twig/Component/Header.php
@@ -28,11 +28,14 @@
 
 namespace PrestaShopBundle\Twig\Component;
 
+use Doctrine\ORM\NoResultException;
 use Media;
 use PrestaShop\PrestaShop\Adapter\Configuration;
 use PrestaShop\PrestaShop\Adapter\LegacyContext;
 use PrestaShopBundle\Entity\Repository\TabRepository;
+use PrestaShopBundle\Translation\TranslatorInterface;
 use PrestaShopBundle\Twig\Layout\MenuBuilder;
+use Shop;
 use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
 use Tools;
 
@@ -53,6 +56,7 @@ public function __construct(
         private readonly Configuration $configuration,
         private readonly MenuBuilder $menuBuilder,
         private readonly string $psVersion,
+        private readonly TranslatorInterface $translator,
     ) {
     }
 
@@ -93,12 +97,12 @@ public function getShopName(): string
 
     public function getControllerName(): string
     {
-        return htmlentities($this->menuBuilder->getLegacyControllerClassName());
+        return $this->menuBuilder->getLegacyControllerClassName();
     }
 
     public function getImgDir(): string
     {
-        return $this->context->getRootUrl() . 'img/';
+        return $this->context->getContext()->shop->getBaseURI() . 'img/';
     }
 
     public function getFullLanguageCode(): string
@@ -119,18 +123,45 @@ public function getRoundMode(): int
     public function getLegacyToken(): string
     {
         $controllerName = $this->menuBuilder->getLegacyControllerClassName();
-        $tabId = $this->tabRepository->getIdByClassName($controllerName);
 
-        return Tools::getAdminToken($controllerName . $tabId . (int) $this->context->getContext()->employee->id);
+        $tabId = '';
+        if (!empty($controllerName)) {
+            try {
+                $tabId = $this->tabRepository->getIdByClassName($controllerName);
+            } catch (NoResultException) {
+            }
+        }
+
+        $employeeId = '';
+        if ($this->context->getContext()->employee) {
+            $employeeId = (int) $this->context->getContext()->employee->id;
+        }
+
+        return Tools::getAdminToken($controllerName . $tabId . $employeeId);
     }
 
-    public function getDefaultLanguage(): string
+    public function getDefaultLanguage(): int
     {
-        return $this->configuration->get('PS_LANG_DEFAULT');
+        return (int) $this->configuration->get('PS_LANG_DEFAULT');
     }
 
     public function getCurrentIndex(): string
     {
-        return $this->context->getContext()->controller::$currentIndex;
+        $controllerName = $this->menuBuilder->getLegacyControllerClassName();
+
+        return 'index.php' . (!empty($controllerName) ? '?controller=' . $controllerName : '');
+    }
+
+    public function getEditForLabel(): string
+    {
+        if (Shop::getContext() === Shop::CONTEXT_SHOP) {
+            return $this->translator->trans('This field will be modified for this shop:', [], 'Admin.Notifications.Info')
+                . sprintf('<b>%s</b>', $this->getShopName());
+        } elseif (Shop::getContext() === Shop::CONTEXT_GROUP) {
+            return $this->translator->trans('This field will be modified for all shops in this shop group:', [], 'Admin.Notifications.Info')
+                . sprintf('<b>%s</b>', $this->getShopName());
+        }
+
+        return $this->translator->trans('This field will be modified for all your shops.', [], 'Admin.Notifications.Info');
     }
 }
diff --git a/src/PrestaShopBundle/Twig/Layout/MenuBuilder.php b/src/PrestaShopBundle/Twig/Layout/MenuBuilder.php
index 7fc6553860fde..578532f279c55 100644
--- a/src/PrestaShopBundle/Twig/Layout/MenuBuilder.php
+++ b/src/PrestaShopBundle/Twig/Layout/MenuBuilder.php
@@ -217,7 +217,14 @@ private function getLegacyAction(): ?string
 
     public function getLegacyControllerClassName(): ?string
     {
-        return $this->requestStack->getMainRequest()->attributes->get('_legacy_controller');
+        $request = $this->requestStack->getMainRequest();
+        if ($request->attributes->has('_legacy_controller')) {
+            return $request->attributes->get('_legacy_controller');
+        } elseif ($request->query->has('controller')) {
+            return $request->query->get('controller');
+        }
+
+        return null;
     }
 
     private function getLinkFromTab(Tab $tab): string

From 4cbf5bcd43a4749bee8353bef63177b8ba86520d Mon Sep 17 00:00:00 2001
From: Morgan Pichat <morgan.pichat@prestashop.com>
Date: Wed, 6 Sep 2023 18:28:01 +0200
Subject: [PATCH 0913/1030] Fix breadcrumbs

---
 .../Entity/Repository/TabRepository.php       |  2 +-
 .../Admin/Component/Layout/toolbar.html.twig  | 26 ++++++++++---------
 .../Twig/Component/Header.php                 |  4 +--
 .../Twig/Layout/MenuBuilder.php               | 26 ++++++++++++++++---
 4 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/src/PrestaShopBundle/Entity/Repository/TabRepository.php b/src/PrestaShopBundle/Entity/Repository/TabRepository.php
index 88493b459e9f6..72d7b9f0a2370 100644
--- a/src/PrestaShopBundle/Entity/Repository/TabRepository.php
+++ b/src/PrestaShopBundle/Entity/Repository/TabRepository.php
@@ -67,7 +67,7 @@ public function findOneByClassName($className)
 
     public function findOneByRouteName(string $routeName): ?Tab
     {
-        return $this->findOneBy(['route_name' => $routeName]);
+        return $this->findOneBy(['routeName' => $routeName]);
     }
 
     /**
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/toolbar.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/toolbar.html.twig
index f5fccb8ed0e96..59b56a1656ebc 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/toolbar.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/toolbar.html.twig
@@ -27,19 +27,21 @@
   <div class="container-fluid">
 
     {% block pageBreadcrumb %}
-      <nav aria-label="Breadcrumb">
-        <ol class="breadcrumb">
-          {% if breadcrumbs.container.name != '' %}
-            <li class="breadcrumb-item">{{ breadcrumbs.container.name|escape }}</li>
-          {% endif %}
+      {% if breadcrumbs.container is defined or breadcrumbs.tab is defined %}
+        <nav aria-label="Breadcrumb">
+          <ol class="breadcrumb">
+            {% if breadcrumbs.container is defined and breadcrumbs.container.name != '' %}
+              <li class="breadcrumb-item">{{ breadcrumbs.container.name|escape }}</li>
+            {% endif %}
 
-          {% if breadcrumbs.tab.name != '' and breadcrumbs.container.name != breadcrumbs.tab.name and breadcrumbs.tab.href != '' %}
-            <li class="breadcrumb-item active">
-              <a href="{{ breadcrumbs.tab.href|escape }}" aria-current="page">{{ breadcrumbs.tab.name|escape }}</a>
-            </li>
-          {% endif %}
-        </ol>
-      </nav>
+            {% if breadcrumbs.container is defined and breadcrumbs.tab is defined and breadcrumbs.tab.name != '' and breadcrumbs.container.name != breadcrumbs.tab.name and breadcrumbs.tab.href != '' %}
+              <li class="breadcrumb-item active">
+                <a href="{{ breadcrumbs.tab.href|escape }}" aria-current="page">{{ breadcrumbs.tab.name|escape }}</a>
+              </li>
+            {% endif %}
+          </ol>
+        </nav>
+      {% endif %}
     {% endblock %}
 
     {% set persistent_help_btn = help_link is defined and help_link is not same as (false) and toolbarBtn is empty %}
diff --git a/src/PrestaShopBundle/Twig/Component/Header.php b/src/PrestaShopBundle/Twig/Component/Header.php
index 7c08087ece079..65ee70b38df2f 100644
--- a/src/PrestaShopBundle/Twig/Component/Header.php
+++ b/src/PrestaShopBundle/Twig/Component/Header.php
@@ -33,9 +33,9 @@
 use PrestaShop\PrestaShop\Adapter\Configuration;
 use PrestaShop\PrestaShop\Adapter\LegacyContext;
 use PrestaShopBundle\Entity\Repository\TabRepository;
-use PrestaShopBundle\Translation\TranslatorInterface;
 use PrestaShopBundle\Twig\Layout\MenuBuilder;
 use Shop;
+use Symfony\Contracts\Translation\TranslatorInterface;
 use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
 use Tools;
 
@@ -97,7 +97,7 @@ public function getShopName(): string
 
     public function getControllerName(): string
     {
-        return $this->menuBuilder->getLegacyControllerClassName();
+        return $this->menuBuilder->getLegacyControllerClassName() ?: '';
     }
 
     public function getImgDir(): string
diff --git a/src/PrestaShopBundle/Twig/Layout/MenuBuilder.php b/src/PrestaShopBundle/Twig/Layout/MenuBuilder.php
index 578532f279c55..d611234bf4d5a 100644
--- a/src/PrestaShopBundle/Twig/Layout/MenuBuilder.php
+++ b/src/PrestaShopBundle/Twig/Layout/MenuBuilder.php
@@ -50,12 +50,20 @@ public function __construct(
 
     public function getCurrentTab(): ?Tab
     {
-        $className = $this->getLegacyControllerClassName();
-        if (null === $className) {
-            return null;
+        $tab = null;
+        $routeName = $this->getRouteName();
+        if (!empty($routeName)) {
+            $tab = $this->tabRepository->findOneByRouteName($routeName);
         }
 
-        return $this->tabRepository->findOneByClassName($className);
+        if (!$tab) {
+            $className = $this->getLegacyControllerClassName();
+            if (!empty($className)) {
+                $tab = $this->tabRepository->findOneByClassName($className);
+            }
+        }
+
+        return $tab;
     }
 
     public function getAncestorsTab(int $currentTabId): array
@@ -227,6 +235,16 @@ public function getLegacyControllerClassName(): ?string
         return null;
     }
 
+    private function getRouteName(): ?string
+    {
+        $request = $this->requestStack->getMainRequest();
+        if ($request->attributes->has('_route')) {
+            return $request->attributes->get('_route');
+        }
+
+        return null;
+    }
+
     private function getLinkFromTab(Tab $tab): string
     {
         if (!empty($tab->getRouteName())) {

From fa3af42702c868f5a0e16cab29fe178ef6fb2980 Mon Sep 17 00:00:00 2001
From: Morgan Pichat <morgan.pichat@prestashop.com>
Date: Thu, 7 Sep 2023 11:12:14 +0200
Subject: [PATCH 0914/1030] Rename "Header" to "Head", add last fields

---
 .../themes/new-theme/template/layout.tpl      | 10 +--
 phpstan-tmp-legacy-layout-baseline.neon       | 16 ++++-
 .../Admin/Component/Layout/head.html.twig     | 60 ++++++++++++++++
 .../Admin/Component/Layout/header.html.twig   | 72 -------------------
 .../{header.html.twig => head.html.twig}      |  9 +--
 .../Twig/Component/{Header.php => Head.php}   | 41 ++++++++---
 6 files changed, 108 insertions(+), 100 deletions(-)
 create mode 100644 src/PrestaShopBundle/Resources/views/Admin/Component/Layout/head.html.twig
 delete mode 100644 src/PrestaShopBundle/Resources/views/Admin/Component/Layout/header.html.twig
 rename src/PrestaShopBundle/Resources/views/Admin/Layout/{header.html.twig => head.html.twig} (82%)
 rename src/PrestaShopBundle/Twig/Component/{Header.php => Head.php} (86%)

diff --git a/admin-dev/themes/new-theme/template/layout.tpl b/admin-dev/themes/new-theme/template/layout.tpl
index 2ece5c52aab60..5e3403be9efc1 100644
--- a/admin-dev/themes/new-theme/template/layout.tpl
+++ b/admin-dev/themes/new-theme/template/layout.tpl
@@ -3,15 +3,7 @@
 <head>
   {render_template
       smarty_template="header.tpl"
-      twig_template="@PrestaShop/Admin/Layout/header.html.twig"
-      display_header_javascript=(isset($display_header_javascript)) ? $display_header_javascript : false
-      meta_title=$meta_title
-      shop_context=(isset($shop_context)) ? $shop_context : null
-      css_files=(isset($css_files)) ? $css_files : []
-      js_def=(isset($js_def) && is_array($js_def)) ? $js_def : []
-      js_files=(isset($js_files)) ? $js_files : []
-      js_inline=(isset($js_inline)) ? $js_inline : []
-      displayBackOfficeHeader=(isset($displayBackOfficeHeader)) ? $displayBackOfficeHeader : null
+      twig_template="@PrestaShop/Admin/Layout/head.html.twig"
   }
 </head>
 
diff --git a/phpstan-tmp-legacy-layout-baseline.neon b/phpstan-tmp-legacy-layout-baseline.neon
index 7c43d526d2c74..92e568f5da443 100644
--- a/phpstan-tmp-legacy-layout-baseline.neon
+++ b/phpstan-tmp-legacy-layout-baseline.neon
@@ -18,12 +18,22 @@ parameters:
 		-
 			message: "#^Namespace Media is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
 			count: 2
-			path: src/PrestaShopBundle/Twig/Component/Header.php
+			path: src/PrestaShopBundle/Twig/Component/Head.php
 
 		-
 			message: "#^Namespace Tools is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
-			count: 1
-			path: src/PrestaShopBundle/Twig/Component/Header.php
+			count: 3
+			path: src/PrestaShopBundle/Twig/Component/Head.php
+
+		-
+			message: "#^Namespace Shop is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+			count: 3
+			path: src/PrestaShopBundle/Twig/Component/Head.php
+
+		-
+			message: "#^Class Shop is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+			count: 2
+			path: src/PrestaShopBundle/Twig/Component/Head.php
 
 		-
 			message: "#^Class Link is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/head.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/head.html.twig
new file mode 100644
index 0000000000000..31aecbf46867f
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/head.html.twig
@@ -0,0 +1,60 @@
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="robots" content="NOFOLLOW, NOINDEX">
+
+<link rel="icon" type="image/x-icon" href="{{ this.imgDir }}favicon.ico" />
+<link rel="apple-touch-icon" href="{{ this.imgDir }}app_icon.png" />
+
+<title>{% if this.metaTitle %}{{ this.metaTitle }} • {% endif %}{{ this.shopName }}</title>
+
+<script type="text/javascript">
+  var help_class_name = '{{ this.controllerName|e('js') }}';
+  var iso_user = '{{ this.isoUser|e('js') }}';
+  var lang_is_rtl = '{{ this.langIsRtl|intCast }}';
+  var full_language_code = '{{ this.fullLanguageCode|e('js') }}';
+  var full_cldr_language_code = '{{ this.fullCldrLanguageCode|e('js') }}';
+  var country_iso_code = '{{ this.countryIsoCode|e('js') }}';
+  var _PS_VERSION_ = '{{ this.psVersion|e('js') }}';
+  var roundMode = {{ this.roundMode|intCast }};
+  var youEditFieldFor = '{{ this.editForLabel|e('js') }}';
+  var new_order_msg = '{{ 'A new order has been placed on your store.'|trans({}, 'Admin.Navigation.Header') }}';
+  var order_number_msg = '{{ 'Order number:'|trans({}, 'Admin.Navigation.Header') }} ';
+  var total_msg = '{{ 'Total:'|trans({}, 'Admin.Global') }} ';
+  var from_msg = '{{ 'From:'|trans({}, 'Admin.Global') }} ';
+  var see_order_msg = '{{ 'View this order'|trans({}, 'Admin.Orderscustomers.Feature') }}';
+  var new_customer_msg = '{{ 'A new customer registered on your store.'|trans({}, 'Admin.Navigation.Header') }}';
+  var customer_name_msg = '{{ 'Customer name:'|trans({}, 'Admin.Navigation.Header') }} ';
+  var new_msg = '{{ 'A new message was posted on your store.'|trans({}, 'Admin.Navigation.Header') }}';
+  var see_msg = '{{ 'Read this message'|trans({}, 'Admin.Navigation.Header') }}';
+  var token = '{{ this.legacyToken|e('js') }}';
+  var currentIndex = '{{ this.currentIndex|e('js') }}';
+  var employee_token = '{{ this.employeeToken|e('js') }}';
+  var choose_language_translate = '{{ 'Choose language:'|trans({}, 'Admin.Actions') }}';
+  var default_language = '{{ this.defaultLanguage|intCast }}';
+  var admin_modules_link = '{{ path('admin_module_manage')|e('js')}}';
+  var admin_notification_get_link = '{{ path('admin_common_notifications')|e('js') }}';
+  var admin_notification_push_link = adminNotificationPushLink = '{{ path('admin_common_notifications_ack')|e('js') }}';
+  var update_success_msg = '{{ 'Update successful'|trans({}, 'Admin.Notifications.Success') }}';
+  var search_product_msg = '{{ 'Search for a product'|trans({}, 'Admin.Orderscustomers.Feature') }}';
+</script>
+
+{% include "@AdminNewTheme/public/preload.html.twig" ignore missing with { 'admin_dir': '/admin-dev/themes/new-theme/public/' } %}
+
+{% for css_uri, css_media in this.cssFiles %}
+  <link href="{{ css_uri|e('html_attr') }}" rel="stylesheet" type="text/css" media="{{ css_media }}"/>
+{% endfor %}
+
+{% if this.jsDef %}
+  <script type="text/javascript">
+    {% for k, def in this.jsDef %}
+    var {{ k }} = {{ def|json_encode|raw }};
+    {% endfor %}
+  </script>
+{% endif %}
+
+{% for js_uri in  this.jsFiles %}
+  <script type="text/javascript" src="{{ js_uri|e('html_attr') }}"></script>
+{% endfor %}
+
+{{ renderhook('displayBackOfficeHeader') }}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/header.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/header.html.twig
deleted file mode 100644
index 144c95ab5bc81..0000000000000
--- a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/header.html.twig
+++ /dev/null
@@ -1,72 +0,0 @@
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<meta name="apple-mobile-web-app-capable" content="yes">
-<meta name="robots" content="NOFOLLOW, NOINDEX">
-
-<link rel="icon" type="image/x-icon" href="{{ this.imgDir }}favicon.ico" />
-<link rel="apple-touch-icon" href="{{ this.imgDir }}app_icon.png" />
-
-<title>{% if meta_title %}{{ meta_title }} • {% endif %}{{ this.shopName }}</title>
-
-{% if display_header_javascript %}
-  <script type="text/javascript">
-    var help_class_name = '{{ this.controllerName|e('js') }}';
-    var iso_user = '{{ this.isoUser|e('js') }}';
-    var lang_is_rtl = '{{ this.langIsRtl|intCast }}';
-    var full_language_code = '{{ this.fullLanguageCode|e('js') }}';
-    var full_cldr_language_code = '{{ this.fullCldrLanguageCode|e('js') }}';
-    var country_iso_code = '{{ this.countryIsoCode|e('js') }}';
-    var _PS_VERSION_ = '{{ this.psVersion|e('js') }}';
-    var roundMode = {{ this.roundMode|intCast }};
-    var youEditFieldFor = '{{ this.editForLabel|e('js') }}';
-    var new_order_msg = '{{ 'A new order has been placed on your store.'|trans({}, 'Admin.Navigation.Header') }}';
-    var order_number_msg = '{{ 'Order number:'|trans({}, 'Admin.Navigation.Header') }} ';
-    var total_msg = '{{ 'Total:'|trans({}, 'Admin.Global') }} ';
-    var from_msg = '{{ 'From:'|trans({}, 'Admin.Global') }} ';
-    var see_order_msg = '{{ 'View this order'|trans({}, 'Admin.Orderscustomers.Feature') }}';
-    var new_customer_msg = '{{ 'A new customer registered on your store.'|trans({}, 'Admin.Navigation.Header') }}';
-    var customer_name_msg = '{{ 'Customer name:'|trans({}, 'Admin.Navigation.Header') }} ';
-    var new_msg = '{{ 'A new message was posted on your store.'|trans({}, 'Admin.Navigation.Header') }}';
-    var see_msg = '{{ 'Read this message'|trans({}, 'Admin.Navigation.Header') }}';
-    var token = '{{ this.legacyToken|e('js') }}';
-    var currentIndex = '{{ this.currentIndex|e('js') }}';
-    var employee_token = '{{ this.employeeToken|e('js') }}';
-    var choose_language_translate = '{{ 'Choose language:'|trans({}, 'Admin.Actions') }}';
-    var default_language = '{{ this.defaultLanguage|intCast }}';
-    var admin_modules_link = '{{ path('admin_module_manage')|e('js')}}';
-    var admin_notification_get_link = '{{ path('admin_common_notifications')|e('js') }}';
-    var admin_notification_push_link = adminNotificationPushLink = '{{ path('admin_common_notifications_ack')|e('js') }}';
-    var update_success_msg = '{{ 'Update successful'|trans({}, 'Admin.Notifications.Success') }}';
-    var search_product_msg = '{{ 'Search for a product'|trans({}, 'Admin.Orderscustomers.Feature') }}';
-  </script>
-{% endif %}
-
-{% include "@AdminNewTheme/public/preload.html.twig" ignore missing with { 'admin_dir': '/admin-dev/themes/new-theme/public/' } %}
-
-{% for css_uri, css_media in css_files %}
-  <link href="{{ css_uri|e('html_attr') }}" rel="stylesheet" type="text/css" media="{{ css_media }}"/>
-{% endfor %}
-
-{% if this.jsDef %}
-  <script type="text/javascript">
-    {% for k, def in this.jsDef %}
-    var {{ k }} = {{ def|json_encode|raw }};
-    {% endfor %}
-  </script>
-{% endif %}
-
-{% for js_uri in js_files %}
-  <script type="text/javascript" src="{{ js_uri|e('html_attr') }}"></script>
-{% endfor %}
-
-{% if js_inline %}
-<script type="text/javascript">
-  {% for inline in js_inline %}
-    {{ inline|raw }}
-  {% endfor %}
-</script>
-{% endif %}
-
-{% if displayBackOfficeHeader %}
-  {{ displayBackOfficeHeader|raw }}
-{% endif %}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/header.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/head.html.twig
similarity index 82%
rename from src/PrestaShopBundle/Resources/views/Admin/Layout/header.html.twig
rename to src/PrestaShopBundle/Resources/views/Admin/Layout/head.html.twig
index 48f6ec52670a3..ec1e279336b0b 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Layout/header.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/head.html.twig
@@ -22,12 +22,7 @@
  * @copyright Since 2007 PrestaShop SA and Contributors
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  *#}
-{{ component('Header', {
+{{ component('Head', {
   display_header_javascript: display_header_javascript|default(false),
-  meta_title: meta_title,
-  shop_context: shop_context,
-  css_files: css_files,
-  js_files: js_files|default([]),
-  js_inline: js_inline|default([]),
-  displayBackOfficeHeader: displayBackOfficeHeader|default(null)
+  layoutTitle: layoutTitle|default,
 }) }}
diff --git a/src/PrestaShopBundle/Twig/Component/Header.php b/src/PrestaShopBundle/Twig/Component/Head.php
similarity index 86%
rename from src/PrestaShopBundle/Twig/Component/Header.php
rename to src/PrestaShopBundle/Twig/Component/Head.php
index 65ee70b38df2f..7f4887b3aa260 100644
--- a/src/PrestaShopBundle/Twig/Component/Header.php
+++ b/src/PrestaShopBundle/Twig/Component/Head.php
@@ -39,16 +39,10 @@
 use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
 use Tools;
 
-#[AsTwigComponent(template: '@PrestaShop/Admin/Component/Layout/header.html.twig')]
-class Header
+#[AsTwigComponent(template: '@PrestaShop/Admin/Component/Layout/head.html.twig')]
+class Head
 {
-    public string $meta_title;
-    public ?string $shop_context;
-    public bool $display_header_javascript;
-    public array $css_files;
-    public array $js_files;
-    public array $js_inline;
-    public ?string $displayBackOfficeHeader;
+    private string $metaTitle;
 
     public function __construct(
         private readonly TabRepository $tabRepository,
@@ -60,6 +54,20 @@ public function __construct(
     ) {
     }
 
+    public function mount(string $layoutTitle): void
+    {
+        if (empty($layoutTitle)) {
+            $breadcrumbs = $this->menuBuilder->getBreadcrumbLinks();
+            if (empty($breadcrumbs)) {
+                $this->metaTitle = '';
+            } else {
+                $this->metaTitle = $breadcrumbs['tab']->name;
+            }
+        } else {
+            $this->metaTitle = $layoutTitle;
+        }
+    }
+
     public function getEmployeeToken(): string
     {
         return Tools::getAdminToken('AdminEmployees');
@@ -164,4 +172,19 @@ public function getEditForLabel(): string
 
         return $this->translator->trans('This field will be modified for all your shops.', [], 'Admin.Notifications.Info');
     }
+
+    public function getCssFiles(): array
+    {
+        return $this->context->getContext()->controller->css_files;
+    }
+
+    public function getJsFiles(): array
+    {
+        return $this->context->getContext()->controller->js_files;
+    }
+
+    public function getMetaTitle(): string
+    {
+        return $this->metaTitle;
+    }
 }

From 658f841e2de81fde51ff2533ac7c6f46471cef4f Mon Sep 17 00:00:00 2001
From: Morgan Pichat <morgan.pichat@prestashop.com>
Date: Thu, 7 Sep 2023 16:43:32 +0200
Subject: [PATCH 0915/1030] Add missing meta_title

---
 admin-dev/themes/new-theme/template/layout.tpl                  | 1 +
 .../Resources/views/Admin/Layout/head.html.twig                 | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/admin-dev/themes/new-theme/template/layout.tpl b/admin-dev/themes/new-theme/template/layout.tpl
index 5e3403be9efc1..563b1ab02f905 100644
--- a/admin-dev/themes/new-theme/template/layout.tpl
+++ b/admin-dev/themes/new-theme/template/layout.tpl
@@ -4,6 +4,7 @@
   {render_template
       smarty_template="header.tpl"
       twig_template="@PrestaShop/Admin/Layout/head.html.twig"
+      meta_title=$meta_title
   }
 </head>
 
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/head.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/head.html.twig
index ec1e279336b0b..90a4e019c649d 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Layout/head.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/head.html.twig
@@ -24,5 +24,5 @@
  *#}
 {{ component('Head', {
   display_header_javascript: display_header_javascript|default(false),
-  layoutTitle: layoutTitle|default,
+  layoutTitle: meta_title|default,
 }) }}

From 4db225a3145ae1a662d3dbcb46b211c9f4739e77 Mon Sep 17 00:00:00 2001
From: Morgan Pichat <morgan.pichat@prestashop.com>
Date: Fri, 8 Sep 2023 11:14:17 +0200
Subject: [PATCH 0916/1030] Fix mobile_quick_access path

---
 .../Admin/Component/Layout/mobile_quick_access.html.twig    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/mobile_quick_access.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/mobile_quick_access.html.twig
index 16e25c30262b3..f3a7eb9f74a8d 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/mobile_quick_access.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/mobile_quick_access.html.twig
@@ -42,7 +42,7 @@
        data-quicklink-id="{{ this.currentQuickAccess.id_quick_access }}"
        data-rand="{{ random(1, 200) }}"
        data-url="{{ this.cleanCurrentUrl|escape('html_attr') }}"
-       data-post-link="{{ path('AdminQuickAccesses') }}"
+       data-post-link="{{ legacy_path('AdminQuickAccesses') }}"
        data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header')|escape('html_attr') }}"
        data-link="{{ this.currentQuickAccess.name|escape('html_attr') }}"
     >
@@ -56,7 +56,7 @@
        data-rand="{{ random(1, 200) }}"
        data-method="add"
        data-url="{{ this.cleanCurrentUrl|escape('html_attr') }}"
-       data-post-link="{{ path('AdminQuickAccesses') }}"
+       data-post-link="{{ legacy_path('AdminQuickAccesses') }}"
        data-prompt-text="{{ 'Please name this shortcut:'|trans({}, 'Admin.Navigation.Header')|escape('html_attr')}}"
        data-link="{{ this.currentUrlTitle|escape('html_attr') }}"
     >
@@ -64,7 +64,7 @@
       {{ 'Add current page to Quick Access'|trans({}, 'Admin.Actions') }}
     </a>
   {% endif %}
-  <a id="quick-manage-link" class="dropdown-item" href="{{ path('AdminQuickAccesses') }}">
+  <a id="quick-manage-link" class="dropdown-item" href="{{ legacy_path('AdminQuickAccesses') }}">
   <i class="material-icons">settings</i>
     {{ 'Manage your quick accesses'|trans({}, 'Admin.Navigation.Header') }}
   </a>

From dcd875518caeabb5b14e20f469af94365147c6d1 Mon Sep 17 00:00:00 2001
From: Jonathan Lelievre <jonathan.lelievre@prestashop.com>
Date: Tue, 11 Jul 2023 21:32:40 +0200
Subject: [PATCH 0917/1030] Introduce split Cookie context

---
 src/Core/Context/CookieContext.php            |  90 ++++++++++++++
 src/Core/Context/CookieContextBuilder.php     | 117 ++++++++++++++++++
 .../Context/Admin/CookieContextListener.php   |  65 ++++++++++
 3 files changed, 272 insertions(+)
 create mode 100644 src/Core/Context/CookieContext.php
 create mode 100644 src/Core/Context/CookieContextBuilder.php
 create mode 100644 src/PrestaShopBundle/EventListener/Context/Admin/CookieContextListener.php

diff --git a/src/Core/Context/CookieContext.php b/src/Core/Context/CookieContext.php
new file mode 100644
index 0000000000000..1d831d3264a89
--- /dev/null
+++ b/src/Core/Context/CookieContext.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Context;
+
+use Cookie;
+use Shop;
+
+class CookieContext
+{
+    private int $shopContext = Shop::CONTEXT_ALL;
+    private int $shopId;
+    private int $shopGroupId;
+
+    public function __construct(
+        private readonly Cookie $cookie
+    ) {
+    }
+
+    public function getShopContext(): int
+    {
+        $this->extractShopContext();
+
+        return $this->shopContext;
+    }
+
+    public function getShopId(): int
+    {
+        $this->extractShopContext();
+
+        return $this->shopId;
+    }
+
+    public function getShopGroupId(): int
+    {
+        $this->extractShopContext();
+
+        return $this->shopGroupId;
+    }
+
+    public function getEmployeeId(): int
+    {
+        return $this->cookie->id_employee ? (int) $this->cookie->id_employee : 0;
+    }
+
+    private function extractShopContext(): void
+    {
+        if (!$this->cookie->shopContext) {
+            return;
+        }
+
+        $splitShopContext = explode('-', $this->cookie->shopContext);
+        if (count($splitShopContext) == 2) {
+            $splitShopType = $splitShopContext[0];
+            $splitShopValue = (int) $splitShopContext[1];
+            if ($splitShopType == 'g') {
+                $this->shopContext = Shop::CONTEXT_GROUP;
+                $this->shopGroupId = $splitShopValue;
+            } else {
+                $this->shopContext = Shop::CONTEXT_SHOP;
+                $this->shopId = $splitShopValue;
+            }
+        }
+    }
+}
diff --git a/src/Core/Context/CookieContextBuilder.php b/src/Core/Context/CookieContextBuilder.php
new file mode 100644
index 0000000000000..4eb8187c60621
--- /dev/null
+++ b/src/Core/Context/CookieContextBuilder.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Context;
+
+use Context;
+use Cookie;
+use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
+
+class CookieContextBuilder
+{
+    private ?int $cookieLifetime = null;
+
+    private ?string $cookieName = null;
+
+    private string $cookiePath = '';
+
+    private bool $forceSsl = false;
+
+    private ?CookieContext $cookieContext = null;
+
+    public function build(): CookieContext
+    {
+        // CookieContext is built only once, for performance issue but also because the replacement of the Context->cookie should only be done once
+        if ($this->cookieContext) {
+            return $this->cookieContext;
+        }
+
+        if (null === $this->cookieLifetime) {
+            throw new InvalidArgumentException(sprintf(
+                'Cannot build cookie context as no cookieLifetime has been defined you need to call %s::setCookieLifetime to define it before building the cookie context',
+                self::class
+            ));
+        }
+
+        if (null === $this->cookieName) {
+            throw new InvalidArgumentException(sprintf(
+                'Cannot build cookie context as no cookieName has been defined you need to call %s::setCookieName to define it before building the cookie context',
+                self::class
+            ));
+        }
+
+        // The build is in charge of creating the cookie properly, it will in time be the only building it (and later we probably will refacto it not to rely on
+        // this legacy cookie), but in the meantime we still need live with the legacy context and keeping two instances of the cookie is problematic because they
+        // wouldn't be synced and some values would be overwritten between one another. Esepecially since the cookie automatically writes itself via __destruct at
+        // the end of the process. That's the reason why we need to disable the writing of the Context's cookie (if present) and replace it by our own
+        if (Context::getContext()->cookie) {
+            Context::getContext()->cookie->disallowWriting();
+            unset(Context::getContext()->cookie);
+        }
+
+        $cookie = new Cookie($this->cookieName, $this->cookiePath, $this->cookieLifetime, null, false, $this->forceSsl);
+        Context::getContext()->cookie = $cookie;
+
+        $this->cookieContext = new CookieContext($cookie);
+
+        return $this->cookieContext;
+    }
+
+    public function setCookieLifetime(int $cookieLifetime): self
+    {
+        $this->cookieLifetime = $cookieLifetime;
+
+        return $this;
+    }
+
+    /**
+     * @param string|null $cookieName
+     *
+     * @return static
+     */
+    public function setCookieName(?string $cookieName): self
+    {
+        $this->cookieName = $cookieName;
+
+        return $this;
+    }
+
+    public function setCookiePath(string $cookiePath): self
+    {
+        $this->cookiePath = $cookiePath;
+
+        return $this;
+    }
+
+    public function setForceSsl(bool $forceSsl): self
+    {
+        $this->forceSsl = $forceSsl;
+
+        return $this;
+    }
+}
diff --git a/src/PrestaShopBundle/EventListener/Context/Admin/CookieContextListener.php b/src/PrestaShopBundle/EventListener/Context/Admin/CookieContextListener.php
new file mode 100644
index 0000000000000..234cdb8693c18
--- /dev/null
+++ b/src/PrestaShopBundle/EventListener/Context/Admin/CookieContextListener.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\EventListener\Context\Admin;
+
+use PrestaShop\PrestaShop\Core\Context\CookieContextBuilder;
+use PrestaShop\PrestaShop\Core\Domain\Configuration\ShopConfigurationInterface;
+use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopConstraint;
+use Symfony\Component\HttpKernel\Event\RequestEvent;
+
+class CookieContextListener
+{
+    public function __construct(
+        private readonly CookieContextBuilder $shopCookieBuilder,
+        private readonly ShopConfigurationInterface $configuration
+    ) {
+    }
+
+    public function onKernelRequest(RequestEvent $event): void
+    {
+        if (!$event->isMainRequest()) {
+            return;
+        }
+
+        $allShopsConstraint = ShopConstraint::allShops();
+        $adminCookieLifetime = $this->configuration->get('PS_COOKIE_LIFETIME_BO', null, $allShopsConstraint);
+        if ($adminCookieLifetime > 0) {
+            $adminCookieLifetime = time() + (max($adminCookieLifetime, 1) * 3600);
+        }
+        $forceSsl = (bool) $this->configuration->get('PS_SSL_ENABLED', null, $allShopsConstraint)
+            && (bool) $this->configuration->get('PS_SSL_ENABLED_EVERYWHERE', null, $allShopsConstraint);
+
+        $this->shopCookieBuilder
+            ->setCookieName('psAdmin')
+            ->setCookieLifetime($adminCookieLifetime)
+            ->setForceSsl($forceSsl)
+            ->setCookiePath('')
+        ;
+    }
+}

From 9fdbf3cab642933e30da33a359b472dd7cfb7b69 Mon Sep 17 00:00:00 2001
From: Jonathan Lelievre <jonathan.lelievre@prestashop.com>
Date: Tue, 11 Jul 2023 21:33:14 +0200
Subject: [PATCH 0918/1030] Introduce split Employee context

---
 src/Core/Context/EmployeeContext.php          | 66 +++++++++++++++++++
 src/Core/Context/EmployeeContextBuilder.php   | 50 ++++++++++++++
 .../Context/Admin/EmployeeContextListener.php | 53 +++++++++++++++
 3 files changed, 169 insertions(+)
 create mode 100644 src/Core/Context/EmployeeContext.php
 create mode 100644 src/Core/Context/EmployeeContextBuilder.php
 create mode 100644 src/PrestaShopBundle/EventListener/Context/Admin/EmployeeContextListener.php

diff --git a/src/Core/Context/EmployeeContext.php b/src/Core/Context/EmployeeContext.php
new file mode 100644
index 0000000000000..919f3488aa5b3
--- /dev/null
+++ b/src/Core/Context/EmployeeContext.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Context;
+
+use Employee;
+
+class EmployeeContext
+{
+    public function __construct(
+        private readonly ?Employee $employee
+    ) {
+    }
+
+    public function hasAuthorizationOnShopGroup(int $shopGroupId): bool
+    {
+        if (!$this->employee) {
+            return false;
+        }
+
+        return $this->employee->hasAuthOnShopGroup($shopGroupId);
+    }
+
+    public function hasAuthorizationOnShop(int $shopId): bool
+    {
+        if (!$this->employee) {
+            return false;
+        }
+
+        return $this->employee->hasAuthOnShop($shopId);
+    }
+
+    public function getDefaultShopId(): int
+    {
+        if (!$this->employee) {
+            return 0;
+        }
+
+        return $this->employee->getDefaultShopID();
+    }
+}
diff --git a/src/Core/Context/EmployeeContextBuilder.php b/src/Core/Context/EmployeeContextBuilder.php
new file mode 100644
index 0000000000000..a0a0b03127d37
--- /dev/null
+++ b/src/Core/Context/EmployeeContextBuilder.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Context;
+
+use Employee;
+
+class EmployeeContextBuilder
+{
+    private ?int $employeeId = null;
+
+    public function build(): EmployeeContext
+    {
+        return new EmployeeContext(
+            $this->employeeId ? new Employee($this->employeeId) : null
+        );
+    }
+
+    public function setEmployeeId(?int $employeeId): self
+    {
+        $this->employeeId = $employeeId;
+
+        return $this;
+    }
+}
diff --git a/src/PrestaShopBundle/EventListener/Context/Admin/EmployeeContextListener.php b/src/PrestaShopBundle/EventListener/Context/Admin/EmployeeContextListener.php
new file mode 100644
index 0000000000000..ff6cf4c060985
--- /dev/null
+++ b/src/PrestaShopBundle/EventListener/Context/Admin/EmployeeContextListener.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\EventListener\Context\Admin;
+
+use PrestaShop\PrestaShop\Core\Context\CookieContext;
+use PrestaShop\PrestaShop\Core\Context\EmployeeContextBuilder;
+use Symfony\Component\HttpKernel\Event\RequestEvent;
+
+class EmployeeContextListener
+{
+    public function __construct(
+        private readonly EmployeeContextBuilder $employeeContextBuilder,
+        private readonly CookieContext $cookieContext
+    ) {
+    }
+
+    public function onKernelRequest(RequestEvent $event): void
+    {
+        if (!$event->isMainRequest()) {
+            return;
+        }
+
+        if ($this->cookieContext->getEmployeeId()) {
+            $this->employeeContextBuilder->setEmployeeId($this->cookieContext->getEmployeeId());
+        }
+    }
+}

From 9d47e8a4804702cf336e60c79021665121c1a5cc Mon Sep 17 00:00:00 2001
From: Jonathan Lelievre <jonathan.lelievre@prestashop.com>
Date: Tue, 11 Jul 2023 21:33:34 +0200
Subject: [PATCH 0919/1030] Introduce split Shop context

---
 src/Core/Context/ShopContext.php              |  51 +++++++++
 src/Core/Context/ShopContextBuilder.php       | 107 ++++++++++++++++++
 .../Context/Admin/ShopContextListener.php     |  95 ++++++++++++++++
 3 files changed, 253 insertions(+)
 create mode 100644 src/Core/Context/ShopContext.php
 create mode 100644 src/Core/Context/ShopContextBuilder.php
 create mode 100644 src/PrestaShopBundle/EventListener/Context/Admin/ShopContextListener.php

diff --git a/src/Core/Context/ShopContext.php b/src/Core/Context/ShopContext.php
new file mode 100644
index 0000000000000..b86ad450fe48b
--- /dev/null
+++ b/src/Core/Context/ShopContext.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Context;
+
+use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopConstraint;
+use Shop;
+
+class ShopContext
+{
+    public function __construct(
+        private readonly ShopConstraint $shopConstraint,
+        private readonly Shop $shop
+    ) {
+    }
+
+    public function getShopConstraint(): ShopConstraint
+    {
+        return $this->shopConstraint;
+    }
+
+    public function getShop(): Shop
+    {
+        return $this->shop;
+    }
+}
diff --git a/src/Core/Context/ShopContextBuilder.php b/src/Core/Context/ShopContextBuilder.php
new file mode 100644
index 0000000000000..d1b87a7d3faba
--- /dev/null
+++ b/src/Core/Context/ShopContextBuilder.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Context;
+
+use PrestaShop\PrestaShop\Adapter\Shop\Repository\ShopRepository;
+use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopConstraint;
+use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopId;
+use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
+use Shop;
+
+class ShopContextBuilder
+{
+    private ?int $shopContext = null;
+    private ?int $shopGroupId = null;
+    private ?int $shopId = null;
+
+    public function __construct(
+        private readonly ShopRepository $shopRepository
+    ) {
+    }
+
+    public function build(): ShopContext
+    {
+        if (null === $this->shopContext) {
+            throw new InvalidArgumentException(sprintf(
+                'Cannot build shop context as no shopContext has been define you need to call %s::setShopContext to define it before building the shop context',
+                self::class
+            ));
+        }
+
+        if (null === $this->shopId) {
+            throw new InvalidArgumentException(sprintf(
+                'Cannot build shop context as no shopId has been define you need to call %s::setShopId to define it before building the shop context',
+                self::class
+            ));
+        }
+
+        if ($this->shopContext === Shop::CONTEXT_SHOP) {
+            $shopConstraint = ShopConstraint::shop($this->shopId);
+        } elseif ($this->shopContext === Shop::CONTEXT_GROUP) {
+            $shopConstraint = ShopConstraint::shopGroup($this->shopGroupId);
+        } else {
+            $shopConstraint = ShopConstraint::allShops();
+        }
+
+        return new ShopContext(
+            $shopConstraint,
+            $this->shopRepository->get(new ShopId($this->shopId))
+        );
+    }
+
+    public function setShopId(int $shopId): self
+    {
+        $this->shopId = $shopId;
+
+        return $this;
+    }
+
+    public function setAllShopsContext(): self
+    {
+        $this->shopContext = Shop::CONTEXT_ALL;
+
+        return $this;
+    }
+
+    public function setShopContext(int $shopId): self
+    {
+        $this->shopId = $shopId;
+        $this->shopContext = Shop::CONTEXT_SHOP;
+
+        return $this;
+    }
+
+    public function setShopGroupContext(int $shopGroupId): self
+    {
+        $this->shopContext = Shop::CONTEXT_GROUP;
+        $this->shopGroupId = $shopGroupId;
+
+        return $this;
+    }
+}
diff --git a/src/PrestaShopBundle/EventListener/Context/Admin/ShopContextListener.php b/src/PrestaShopBundle/EventListener/Context/Admin/ShopContextListener.php
new file mode 100644
index 0000000000000..be4353f587670
--- /dev/null
+++ b/src/PrestaShopBundle/EventListener/Context/Admin/ShopContextListener.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\EventListener\Context\Admin;
+
+use PrestaShop\PrestaShop\Core\Context\CookieContext;
+use PrestaShop\PrestaShop\Core\Context\EmployeeContext;
+use PrestaShop\PrestaShop\Core\Context\ShopContextBuilder;
+use PrestaShop\PrestaShop\Core\Domain\Configuration\ShopConfigurationInterface;
+use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopConstraint;
+use Shop;
+use Symfony\Component\HttpKernel\Event\RequestEvent;
+
+class ShopContextListener
+{
+    public function __construct(
+        private readonly ShopContextBuilder $shopContextBuilder,
+        private readonly CookieContext $cookieContext,
+        private readonly EmployeeContext $employeeContext,
+        private readonly ShopConfigurationInterface $configuration
+    ) {
+    }
+
+    public function onKernelRequest(RequestEvent $event): void
+    {
+        // Once container will be both in FO and BO we'll need to check here that we're in a BO context
+        // either that or the listener itself should be configured in a way so that it only is used in BO context
+        // because in FO we don't handle shop context the same way (there can be only one shop and no shop context
+        // switching is possible)
+        if (!$event->isMainRequest()) {
+            return;
+        }
+
+        $shopContext = Shop::CONTEXT_ALL;
+        $shopId = null;
+        $shopGroupId = null;
+
+        if ($this->cookieContext->getShopContext() === Shop::CONTEXT_GROUP) {
+            if ($this->employeeContext->hasAuthorizationOnShopGroup($this->cookieContext->getShopGroupId())) {
+                $shopContext = Shop::CONTEXT_GROUP;
+                $shopGroupId = $this->cookieContext->getShopGroupId();
+            } else {
+                $shopContext = Shop::CONTEXT_SHOP;
+                $shopId = $this->employeeContext->getDefaultShopId();
+            }
+        } elseif ($this->cookieContext->getShopContext() === Shop::CONTEXT_SHOP) {
+            $shopContext = Shop::CONTEXT_SHOP;
+            if ($this->employeeContext->hasAuthorizationOnShop($this->cookieContext->getShopId())) {
+                $shopId = $this->cookieContext->getShopId();
+            } else {
+                $shopId = $this->employeeContext->getDefaultShopId();
+            }
+        }
+
+        // Set the shop context with appropriate value
+        if ($shopContext === Shop::CONTEXT_SHOP) {
+            $this->shopContextBuilder->setShopContext($shopId);
+        } elseif ($shopContext === Shop::CONTEXT_GROUP) {
+            $this->shopContextBuilder->setShopGroupContext($shopGroupId);
+        } else {
+            $this->shopContextBuilder->setAllShopsContext();
+        }
+
+        // In all cases a shop must be set for the context even if it's the default one
+        if (!$shopId) {
+            $shopId = (int) $this->configuration->get('PS_SHOP_DEFAULT', null, ShopConstraint::allShops());
+        }
+        $this->shopContextBuilder->setShopId($shopId);
+    }
+}

From 7c3a714a105bb03b666b470c87c43cf20670ac60 Mon Sep 17 00:00:00 2001
From: Jonathan Lelievre <jonathan.lelievre@prestashop.com>
Date: Tue, 11 Jul 2023 21:33:54 +0200
Subject: [PATCH 0920/1030] Configure split contexts service and listeners

---
 .../config/services/bundle/context.yml        | 18 +++++++++++++++++
 .../config/services/core/context.yml          | 20 +++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 src/PrestaShopBundle/Resources/config/services/bundle/context.yml
 create mode 100644 src/PrestaShopBundle/Resources/config/services/core/context.yml

diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/context.yml b/src/PrestaShopBundle/Resources/config/services/bundle/context.yml
new file mode 100644
index 0000000000000..b6c143650c238
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/context.yml
@@ -0,0 +1,18 @@
+services:
+  _defaults:
+    public: false
+    autowire: true
+    autoconfigure: true
+
+  # Many other contexts depend on the cookie, so it should be initialized first
+  PrestaShopBundle\EventListener\Context\Admin\CookieContextListener:
+    tags:
+      - { name: kernel.event_listener, method: onKernelRequest, priority: 1000 }
+
+  PrestaShopBundle\EventListener\Context\Admin\EmployeeContextListener:
+    tags:
+      - { name: kernel.event_listener, method: onKernelRequest, priority: 900 }
+
+  PrestaShopBundle\EventListener\Context\Admin\ShopContextListener:
+    tags:
+      - { name: kernel.event_listener, method: onKernelRequest, priority: 800 }
diff --git a/src/PrestaShopBundle/Resources/config/services/core/context.yml b/src/PrestaShopBundle/Resources/config/services/core/context.yml
new file mode 100644
index 0000000000000..1f8a92af7ba06
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/config/services/core/context.yml
@@ -0,0 +1,20 @@
+services:
+  _defaults:
+    public: false
+    autowire: true
+    autoconfigure: true
+
+  PrestaShop\PrestaShop\Core\Context\CookieContextBuilder: ~
+  PrestaShop\PrestaShop\Core\Context\CookieContext:
+    lazy: true
+    factory: [ '@PrestaShop\PrestaShop\Core\Context\CookieContextBuilder', 'build' ]
+
+  PrestaShop\PrestaShop\Core\Context\EmployeeContextBuilder: ~
+  PrestaShop\PrestaShop\Core\Context\EmployeeContext:
+    lazy: true
+    factory: [ '@PrestaShop\PrestaShop\Core\Context\EmployeeContextBuilder', 'build' ]
+
+  PrestaShop\PrestaShop\Core\Context\ShopContextBuilder: ~
+  PrestaShop\PrestaShop\Core\Context\ShopContext:
+    lazy: true
+    factory: [ '@PrestaShop\PrestaShop\Core\Context\ShopContextBuilder', 'build' ]

From 284fe41a046b20bb376b705d9ba0b204c0fe6302 Mon Sep 17 00:00:00 2001
From: Jonathan Lelievre <jonathan.lelievre@prestashop.com>
Date: Mon, 4 Sep 2023 18:21:11 +0200
Subject: [PATCH 0921/1030] Use model shop interface in ShopContext

---
 classes/shop/Shop.php                         |  62 ++++++++++-
 src/Core/Context/ShopContext.php              |   6 +-
 src/Core/Context/ShopContextBuilder.php       |  55 ++++-----
 src/Core/Model/Shop.php                       | 105 ++++++++++++++++++
 src/Core/Model/ShopInterface.php              |  57 ++++++++++
 .../Context/Admin/ShopContextListener.php     |   8 +-
 6 files changed, 252 insertions(+), 41 deletions(-)
 create mode 100644 src/Core/Model/Shop.php
 create mode 100644 src/Core/Model/ShopInterface.php

diff --git a/classes/shop/Shop.php b/classes/shop/Shop.php
index cd30a9aa9b60f..2ad36df17b999 100644
--- a/classes/shop/Shop.php
+++ b/classes/shop/Shop.php
@@ -26,11 +26,12 @@
 
 use PrestaShop\PrestaShop\Core\Addon\Theme\Theme;
 use PrestaShop\PrestaShop\Core\Addon\Theme\ThemeManagerBuilder;
+use PrestaShop\PrestaShop\Core\Model\ShopInterface;
 
 /**
  * @since 1.5.0
  */
-class ShopCore extends ObjectModel
+class ShopCore extends ObjectModel implements ShopInterface
 {
     /** @var int ID of shop group */
     public $id_shop_group;
@@ -1364,4 +1365,63 @@ private static function findShopByHost($host)
 
         return $result;
     }
+
+    /*
+     * Interface methods
+     */
+
+    public function getId(): int
+    {
+        return (int) $this->id;
+    }
+
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    public function getShopGroupId(): int
+    {
+        return (int) $this->id_shop_group;
+    }
+
+    public function getCategoryId(): int
+    {
+        return (int) $this->id_category;
+    }
+
+    public function getThemeName(): string
+    {
+        return $this->theme_name;
+    }
+
+    public function getColor(): string
+    {
+        return $this->color;
+    }
+
+    public function isActive(): bool
+    {
+        return (bool) $this->active;
+    }
+
+    public function getPhysicalUri(): string
+    {
+        return $this->physical_uri;
+    }
+
+    public function getVirtualUri(): string
+    {
+        return $this->virtual_uri;
+    }
+
+    public function getDomain(): string
+    {
+        return $this->domain;
+    }
+
+    public function getDomainSSL(): string
+    {
+        return $this->domain_ssl;
+    }
 }
diff --git a/src/Core/Context/ShopContext.php b/src/Core/Context/ShopContext.php
index b86ad450fe48b..3c889bbf85fb1 100644
--- a/src/Core/Context/ShopContext.php
+++ b/src/Core/Context/ShopContext.php
@@ -29,13 +29,13 @@
 namespace PrestaShop\PrestaShop\Core\Context;
 
 use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopConstraint;
-use Shop;
+use PrestaShop\PrestaShop\Core\Model\ShopInterface;
 
 class ShopContext
 {
     public function __construct(
         private readonly ShopConstraint $shopConstraint,
-        private readonly Shop $shop
+        private readonly ShopInterface $shop
     ) {
     }
 
@@ -44,7 +44,7 @@ public function getShopConstraint(): ShopConstraint
         return $this->shopConstraint;
     }
 
-    public function getShop(): Shop
+    public function getShop(): ShopInterface
     {
         return $this->shop;
     }
diff --git a/src/Core/Context/ShopContextBuilder.php b/src/Core/Context/ShopContextBuilder.php
index d1b87a7d3faba..dcfc0d3a7b0b9 100644
--- a/src/Core/Context/ShopContextBuilder.php
+++ b/src/Core/Context/ShopContextBuilder.php
@@ -32,12 +32,11 @@
 use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopConstraint;
 use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopId;
 use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
-use Shop;
+use PrestaShop\PrestaShop\Core\Model\Shop;
 
 class ShopContextBuilder
 {
-    private ?int $shopContext = null;
-    private ?int $shopGroupId = null;
+    private ?ShopConstraint $shopConstraint = null;
     private ?int $shopId = null;
 
     public function __construct(
@@ -47,31 +46,37 @@ public function __construct(
 
     public function build(): ShopContext
     {
-        if (null === $this->shopContext) {
+        if (null === $this->shopConstraint) {
             throw new InvalidArgumentException(sprintf(
-                'Cannot build shop context as no shopContext has been define you need to call %s::setShopContext to define it before building the shop context',
+                'Cannot build shop context as no shopConstraint has been defined you need to call %s::setShopConstraint to define it before building the shop context',
                 self::class
             ));
         }
 
         if (null === $this->shopId) {
             throw new InvalidArgumentException(sprintf(
-                'Cannot build shop context as no shopId has been define you need to call %s::setShopId to define it before building the shop context',
+                'Cannot build shop context as no shopId has been defined you need to call %s::setShopId to define it before building the shop context',
                 self::class
             ));
         }
 
-        if ($this->shopContext === Shop::CONTEXT_SHOP) {
-            $shopConstraint = ShopConstraint::shop($this->shopId);
-        } elseif ($this->shopContext === Shop::CONTEXT_GROUP) {
-            $shopConstraint = ShopConstraint::shopGroup($this->shopGroupId);
-        } else {
-            $shopConstraint = ShopConstraint::allShops();
-        }
+        $shop = $this->shopRepository->get(new ShopId($this->shopId));
 
         return new ShopContext(
-            $shopConstraint,
-            $this->shopRepository->get(new ShopId($this->shopId))
+            $this->shopConstraint,
+            new Shop(
+                id: $shop->getId(),
+                name: $shop->getName(),
+                shopGroupId: $shop->getShopGroupId(),
+                categoryId: $shop->getCategoryId(),
+                themeName: $shop->getThemeName(),
+                color: $shop->getColor(),
+                physicalUri: $shop->getPhysicalUri(),
+                virtualUri: $shop->getVirtualUri(),
+                domain: $shop->getDomain(),
+                domainSSL: $shop->getDomainSSL(),
+                active: $shop->isActive()
+            )
         );
     }
 
@@ -82,25 +87,9 @@ public function setShopId(int $shopId): self
         return $this;
     }
 
-    public function setAllShopsContext(): self
-    {
-        $this->shopContext = Shop::CONTEXT_ALL;
-
-        return $this;
-    }
-
-    public function setShopContext(int $shopId): self
-    {
-        $this->shopId = $shopId;
-        $this->shopContext = Shop::CONTEXT_SHOP;
-
-        return $this;
-    }
-
-    public function setShopGroupContext(int $shopGroupId): self
+    public function setShopConstraint(ShopConstraint $shopConstraint): self
     {
-        $this->shopContext = Shop::CONTEXT_GROUP;
-        $this->shopGroupId = $shopGroupId;
+        $this->shopConstraint = $shopConstraint;
 
         return $this;
     }
diff --git a/src/Core/Model/Shop.php b/src/Core/Model/Shop.php
new file mode 100644
index 0000000000000..018d5c6370834
--- /dev/null
+++ b/src/Core/Model/Shop.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Model;
+
+/**
+ * Basic DTO class that implements ShopInterface
+ */
+class Shop implements ShopInterface
+{
+    public function __construct(
+        protected int $id,
+        protected string $name,
+        protected int $shopGroupId,
+        protected int $categoryId,
+        protected string $themeName,
+        protected string $color,
+        protected string $physicalUri,
+        protected string $virtualUri,
+        protected string $domain,
+        protected string $domainSSL,
+        protected bool $active,
+    ) {
+    }
+
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    public function getShopGroupId(): int
+    {
+        return $this->shopGroupId;
+    }
+
+    public function getCategoryId(): int
+    {
+        return $this->categoryId;
+    }
+
+    public function getThemeName(): string
+    {
+        return $this->themeName;
+    }
+
+    public function getColor(): string
+    {
+        return $this->color;
+    }
+
+    public function isActive(): bool
+    {
+        return $this->active;
+    }
+
+    public function getPhysicalUri(): string
+    {
+        return $this->physicalUri;
+    }
+
+    public function getVirtualUri(): string
+    {
+        return $this->virtualUri;
+    }
+
+    public function getDomain(): string
+    {
+        return $this->domain;
+    }
+
+    public function getDomainSSL(): string
+    {
+        return $this->domainSSL;
+    }
+}
diff --git a/src/Core/Model/ShopInterface.php b/src/Core/Model/ShopInterface.php
new file mode 100644
index 0000000000000..195bee7d1cee2
--- /dev/null
+++ b/src/Core/Model/ShopInterface.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Model;
+
+/**
+ * @experimental Depends on ADR https://github.com/PrestaShop/ADR/pull/33
+ */
+interface ShopInterface
+{
+    public function getId(): int;
+
+    public function getName(): string;
+
+    public function getShopGroupId(): int;
+
+    public function getCategoryId(): int;
+
+    public function getThemeName(): string;
+
+    public function getColor(): string;
+
+    public function isActive(): bool;
+
+    public function getPhysicalUri(): string;
+
+    public function getVirtualUri(): string;
+
+    public function getDomain(): string;
+
+    public function getDomainSSL(): string;
+}
diff --git a/src/PrestaShopBundle/EventListener/Context/Admin/ShopContextListener.php b/src/PrestaShopBundle/EventListener/Context/Admin/ShopContextListener.php
index be4353f587670..0cd707077eeff 100644
--- a/src/PrestaShopBundle/EventListener/Context/Admin/ShopContextListener.php
+++ b/src/PrestaShopBundle/EventListener/Context/Admin/ShopContextListener.php
@@ -79,15 +79,15 @@ public function onKernelRequest(RequestEvent $event): void
 
         // Set the shop context with appropriate value
         if ($shopContext === Shop::CONTEXT_SHOP) {
-            $this->shopContextBuilder->setShopContext($shopId);
+            $this->shopContextBuilder->setShopConstraint(ShopConstraint::shop($shopId));
         } elseif ($shopContext === Shop::CONTEXT_GROUP) {
-            $this->shopContextBuilder->setShopGroupContext($shopGroupId);
+            $this->shopContextBuilder->setShopConstraint(ShopConstraint::shopGroup($shopGroupId));
         } else {
-            $this->shopContextBuilder->setAllShopsContext();
+            $this->shopContextBuilder->setShopConstraint(ShopConstraint::allShops());
         }
 
         // In all cases a shop must be set for the context even if it's the default one
-        if (!$shopId) {
+        if (empty($shopId)) {
             $shopId = (int) $this->configuration->get('PS_SHOP_DEFAULT', null, ShopConstraint::allShops());
         }
         $this->shopContextBuilder->setShopId($shopId);

From bf2cc56a825d795979f54afb0e65e3d25b200ea5 Mon Sep 17 00:00:00 2001
From: Jonathan Lelievre <jonathan.lelievre@prestashop.com>
Date: Mon, 4 Sep 2023 19:03:50 +0200
Subject: [PATCH 0922/1030] Use model employee interface in EmployeeContext

---
 classes/Employee.php                        |  67 ++++++++++++-
 src/Core/Context/EmployeeContext.php        |  22 +++-
 src/Core/Context/EmployeeContextBuilder.php |  25 ++++-
 src/Core/Model/Employee.php                 | 105 ++++++++++++++++++++
 src/Core/Model/EmployeeInterface.php        |  54 ++++++++++
 5 files changed, 262 insertions(+), 11 deletions(-)
 create mode 100644 src/Core/Model/Employee.php
 create mode 100644 src/Core/Model/EmployeeInterface.php

diff --git a/classes/Employee.php b/classes/Employee.php
index 2a4baf18eeda6..9a7be30c5b0dd 100644
--- a/classes/Employee.php
+++ b/classes/Employee.php
@@ -27,12 +27,13 @@
 use PrestaShop\PrestaShop\Adapter\ServiceLocator;
 use PrestaShop\PrestaShop\Adapter\SymfonyContainer;
 use PrestaShop\PrestaShop\Core\Crypto\Hashing;
+use PrestaShop\PrestaShop\Core\Model\EmployeeInterface;
 use PrestaShopBundle\Security\Admin\SessionRenewer;
 
 /**
  * Class EmployeeCore.
  */
-class EmployeeCore extends ObjectModel
+class EmployeeCore extends ObjectModel implements EmployeeInterface
 {
     /** @var int|null Employee ID */
     public $id;
@@ -561,7 +562,7 @@ public function hasAuthOnShopGroup($idShopGroup)
      *
      * @since 1.5.0
      */
-    public function getDefaultShopID()
+    public function getDefaultShopID(): int
     {
         if ($this->isSuperAdmin() || in_array(Configuration::get('PS_SHOP_DEFAULT'), $this->associated_shops)) {
             return (int) Configuration::get('PS_SHOP_DEFAULT');
@@ -761,4 +762,66 @@ public function getDefaultTabClassName()
 
         return null;
     }
+
+    /*
+     * Interface functions
+     */
+    public function getId(): int
+    {
+        return (int) $this->id;
+    }
+
+    public function getProfileId(): int
+    {
+        return (int) $this->id_profile;
+    }
+
+    public function getLanguageId(): int
+    {
+        return (int) $this->id_lang;
+    }
+
+    public function getFirstName(): string
+    {
+        return $this->firstname;
+    }
+
+    public function getLastName(): string
+    {
+        return $this->lastname;
+    }
+
+    public function getEmail(): string
+    {
+        return $this->email;
+    }
+
+    public function getPassword(): string
+    {
+        return $this->passwd;
+    }
+
+    public function getDefaultTabId(): int
+    {
+        return (int) $this->default_tab;
+    }
+
+    public function getAssociatedShopIds(): array
+    {
+        return $this->associated_shops;
+    }
+
+    public function getAssociatedShopGroupIds(): array
+    {
+        $associatedShopGroupIds = [];
+        foreach ($this->associated_shops as $shopId) {
+            /** @var int $groupFromShop */
+            $groupFromShop = Shop::getGroupFromShop($shopId, true);
+            if (!empty($groupFromShop) && !in_array($groupFromShop, $associatedShopGroupIds)) {
+                $associatedShopGroupIds[] = (int) $groupFromShop;
+            }
+        }
+
+        return $this->associated_shops;
+    }
 }
diff --git a/src/Core/Context/EmployeeContext.php b/src/Core/Context/EmployeeContext.php
index 919f3488aa5b3..812d04bf4213f 100644
--- a/src/Core/Context/EmployeeContext.php
+++ b/src/Core/Context/EmployeeContext.php
@@ -28,22 +28,29 @@
 
 namespace PrestaShop\PrestaShop\Core\Context;
 
-use Employee;
+use PrestaShop\PrestaShop\Core\Model\EmployeeInterface;
 
 class EmployeeContext
 {
+    public const SUPER_ADMIN_PROFILE_ID = 1;
+
     public function __construct(
-        private readonly ?Employee $employee
+        private readonly ?EmployeeInterface $employee
     ) {
     }
 
+    public function getEmployee(): ?EmployeeInterface
+    {
+        return $this->employee;
+    }
+
     public function hasAuthorizationOnShopGroup(int $shopGroupId): bool
     {
         if (!$this->employee) {
             return false;
         }
 
-        return $this->employee->hasAuthOnShopGroup($shopGroupId);
+        return $this->isSuperAdmin() || in_array($shopGroupId, $this->employee->getAssociatedShopGroupIds());
     }
 
     public function hasAuthorizationOnShop(int $shopId): bool
@@ -52,7 +59,7 @@ public function hasAuthorizationOnShop(int $shopId): bool
             return false;
         }
 
-        return $this->employee->hasAuthOnShop($shopId);
+        return $this->isSuperAdmin() || in_array($shopId, $this->employee->getAssociatedShopIds());
     }
 
     public function getDefaultShopId(): int
@@ -61,6 +68,11 @@ public function getDefaultShopId(): int
             return 0;
         }
 
-        return $this->employee->getDefaultShopID();
+        return $this->employee->getDefaultShopId();
+    }
+
+    public function isSuperAdmin(): bool
+    {
+        return $this->employee && $this->employee->getProfileId() === self::SUPER_ADMIN_PROFILE_ID;
     }
 }
diff --git a/src/Core/Context/EmployeeContextBuilder.php b/src/Core/Context/EmployeeContextBuilder.php
index a0a0b03127d37..a95d02717fc7f 100644
--- a/src/Core/Context/EmployeeContextBuilder.php
+++ b/src/Core/Context/EmployeeContextBuilder.php
@@ -28,7 +28,8 @@
 
 namespace PrestaShop\PrestaShop\Core\Context;
 
-use Employee;
+use Employee as LegacyEmployee;
+use PrestaShop\PrestaShop\Core\Model\Employee;
 
 class EmployeeContextBuilder
 {
@@ -36,9 +37,25 @@ class EmployeeContextBuilder
 
     public function build(): EmployeeContext
     {
-        return new EmployeeContext(
-            $this->employeeId ? new Employee($this->employeeId) : null
-        );
+        $employee = null;
+        if ($this->employeeId) {
+            $legacyEmployee = new LegacyEmployee($this->employeeId);
+            $employee = new Employee(
+                id: $legacyEmployee->getId(),
+                profileId: $legacyEmployee->getProfileId(),
+                languageId: $legacyEmployee->getLanguageId(),
+                firstName: $legacyEmployee->getFirstName(),
+                lastName: $legacyEmployee->getLastName(),
+                email: $legacyEmployee->getEmail(),
+                password: $legacyEmployee->getPassword(),
+                defaultTabId: $legacyEmployee->getDefaultTabId(),
+                defaultShopId: $legacyEmployee->getDefaultShopId(),
+                associatedShopIds: $legacyEmployee->getAssociatedShopIds(),
+                associatedShopGroupIds: $legacyEmployee->getAssociatedShopGroupIds()
+            );
+        }
+
+        return new EmployeeContext($employee);
     }
 
     public function setEmployeeId(?int $employeeId): self
diff --git a/src/Core/Model/Employee.php b/src/Core/Model/Employee.php
new file mode 100644
index 0000000000000..2f76a2dceb362
--- /dev/null
+++ b/src/Core/Model/Employee.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Model;
+
+/**
+ * Basic DTO class that implements EmployeeInterface
+ */
+class Employee implements EmployeeInterface
+{
+    public function __construct(
+        protected int $id,
+        protected int $profileId,
+        protected int $languageId,
+        protected string $firstName,
+        protected string $lastName,
+        protected string $email,
+        protected string $password,
+        protected int $defaultTabId,
+        protected int $defaultShopId,
+        protected array $associatedShopIds,
+        protected array $associatedShopGroupIds,
+    ) {
+    }
+
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    public function getProfileId(): int
+    {
+        return $this->profileId;
+    }
+
+    public function getLanguageId(): int
+    {
+        return $this->languageId;
+    }
+
+    public function getFirstName(): string
+    {
+        return $this->firstName;
+    }
+
+    public function getLastName(): string
+    {
+        return $this->lastName;
+    }
+
+    public function getEmail(): string
+    {
+        return $this->email;
+    }
+
+    public function getPassword(): string
+    {
+        return $this->password;
+    }
+
+    public function getDefaultTabId(): int
+    {
+        return $this->defaultTabId;
+    }
+
+    public function getAssociatedShopIds(): array
+    {
+        return $this->associatedShopIds;
+    }
+
+    public function getDefaultShopId(): int
+    {
+        return $this->defaultShopId;
+    }
+
+    public function getAssociatedShopGroupIds(): array
+    {
+        return $this->associatedShopGroupIds;
+    }
+}
diff --git a/src/Core/Model/EmployeeInterface.php b/src/Core/Model/EmployeeInterface.php
new file mode 100644
index 0000000000000..044c38ba86014
--- /dev/null
+++ b/src/Core/Model/EmployeeInterface.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Model;
+
+interface EmployeeInterface
+{
+    public function getId(): int;
+
+    public function getProfileId(): int;
+
+    public function getLanguageId(): int;
+
+    public function getFirstName(): string;
+
+    public function getLastName(): string;
+
+    public function getEmail(): string;
+
+    public function getPassword(): string;
+
+    public function getDefaultTabId(): int;
+
+    public function getDefaultShopId(): int;
+
+    public function getAssociatedShopIds(): array;
+
+    public function getAssociatedShopGroupIds(): array;
+}

From 9d2391bb7c11e62eab908e36aa7e94b43e6ec535 Mon Sep 17 00:00:00 2001
From: Jonathan Lelievre <jonathan.lelievre@prestashop.com>
Date: Mon, 4 Sep 2023 19:32:58 +0200
Subject: [PATCH 0923/1030] Refacto cookie context based on ShopConstraint to
 reduce dependency on legacy Shop class

---
 src/Core/Context/CookieContext.php            | 62 ++++++-------------
 .../Context/Admin/ShopContextListener.php     | 44 +++++--------
 2 files changed, 36 insertions(+), 70 deletions(-)

diff --git a/src/Core/Context/CookieContext.php b/src/Core/Context/CookieContext.php
index 1d831d3264a89..7605d03d5ce99 100644
--- a/src/Core/Context/CookieContext.php
+++ b/src/Core/Context/CookieContext.php
@@ -29,62 +29,40 @@
 namespace PrestaShop\PrestaShop\Core\Context;
 
 use Cookie;
-use Shop;
+use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopConstraint;
 
 class CookieContext
 {
-    private int $shopContext = Shop::CONTEXT_ALL;
-    private int $shopId;
-    private int $shopGroupId;
+    private ShopConstraint $shopConstraint;
 
     public function __construct(
         private readonly Cookie $cookie
     ) {
+        if (!$this->cookie->shopContext) {
+            $this->shopConstraint = ShopConstraint::allShops();
+        } else {
+            $splitShopContext = explode('-', $this->cookie->shopContext);
+            if (count($splitShopContext) == 2) {
+                $splitShopType = $splitShopContext[0];
+                $splitShopValue = (int) $splitShopContext[1];
+                if ($splitShopType == 'g') {
+                    $this->shopConstraint = ShopConstraint::shopGroup($splitShopValue);
+                } else {
+                    $this->shopConstraint = ShopConstraint::shop($splitShopValue);
+                }
+            } else {
+                $this->shopConstraint = ShopConstraint::allShops();
+            }
+        }
     }
 
-    public function getShopContext(): int
-    {
-        $this->extractShopContext();
-
-        return $this->shopContext;
-    }
-
-    public function getShopId(): int
-    {
-        $this->extractShopContext();
-
-        return $this->shopId;
-    }
-
-    public function getShopGroupId(): int
+    public function getShopConstraint(): ShopConstraint
     {
-        $this->extractShopContext();
-
-        return $this->shopGroupId;
+        return $this->shopConstraint;
     }
 
     public function getEmployeeId(): int
     {
         return $this->cookie->id_employee ? (int) $this->cookie->id_employee : 0;
     }
-
-    private function extractShopContext(): void
-    {
-        if (!$this->cookie->shopContext) {
-            return;
-        }
-
-        $splitShopContext = explode('-', $this->cookie->shopContext);
-        if (count($splitShopContext) == 2) {
-            $splitShopType = $splitShopContext[0];
-            $splitShopValue = (int) $splitShopContext[1];
-            if ($splitShopType == 'g') {
-                $this->shopContext = Shop::CONTEXT_GROUP;
-                $this->shopGroupId = $splitShopValue;
-            } else {
-                $this->shopContext = Shop::CONTEXT_SHOP;
-                $this->shopId = $splitShopValue;
-            }
-        }
-    }
 }
diff --git a/src/PrestaShopBundle/EventListener/Context/Admin/ShopContextListener.php b/src/PrestaShopBundle/EventListener/Context/Admin/ShopContextListener.php
index 0cd707077eeff..c944796945152 100644
--- a/src/PrestaShopBundle/EventListener/Context/Admin/ShopContextListener.php
+++ b/src/PrestaShopBundle/EventListener/Context/Admin/ShopContextListener.php
@@ -33,7 +33,6 @@
 use PrestaShop\PrestaShop\Core\Context\ShopContextBuilder;
 use PrestaShop\PrestaShop\Core\Domain\Configuration\ShopConfigurationInterface;
 use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopConstraint;
-use Shop;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
 
 class ShopContextListener
@@ -56,40 +55,29 @@ public function onKernelRequest(RequestEvent $event): void
             return;
         }
 
-        $shopContext = Shop::CONTEXT_ALL;
-        $shopId = null;
-        $shopGroupId = null;
-
-        if ($this->cookieContext->getShopContext() === Shop::CONTEXT_GROUP) {
-            if ($this->employeeContext->hasAuthorizationOnShopGroup($this->cookieContext->getShopGroupId())) {
-                $shopContext = Shop::CONTEXT_GROUP;
-                $shopGroupId = $this->cookieContext->getShopGroupId();
+        $shopConstraint = ShopConstraint::allShops();
+        if ($this->cookieContext->getShopConstraint()->getShopGroupId()) {
+            // Check if the employee has permission on selected group if not fallback on single shop context with employee's default shop
+            if ($this->employeeContext->hasAuthorizationOnShopGroup($this->cookieContext->getShopConstraint()->getShopGroupId()->getValue())) {
+                $shopConstraint = $this->cookieContext->getShopConstraint();
             } else {
-                $shopContext = Shop::CONTEXT_SHOP;
-                $shopId = $this->employeeContext->getDefaultShopId();
+                $shopConstraint = ShopConstraint::shop($this->employeeContext->getDefaultShopId());
             }
-        } elseif ($this->cookieContext->getShopContext() === Shop::CONTEXT_SHOP) {
-            $shopContext = Shop::CONTEXT_SHOP;
-            if ($this->employeeContext->hasAuthorizationOnShop($this->cookieContext->getShopId())) {
-                $shopId = $this->cookieContext->getShopId();
+        } elseif ($this->cookieContext->getShopConstraint()->getShopId()) {
+            // Check if employee has authorization on selected shop if not fallback on single shop context with employee's default shop
+            if ($this->employeeContext->hasAuthorizationOnShop($this->cookieContext->getShopConstraint()->getShopId()->getValue())) {
+                $shopConstraint = $this->cookieContext->getShopConstraint();
             } else {
-                $shopId = $this->employeeContext->getDefaultShopId();
+                $shopConstraint = ShopConstraint::shop($this->employeeContext->getDefaultShopId());
             }
         }
-
-        // Set the shop context with appropriate value
-        if ($shopContext === Shop::CONTEXT_SHOP) {
-            $this->shopContextBuilder->setShopConstraint(ShopConstraint::shop($shopId));
-        } elseif ($shopContext === Shop::CONTEXT_GROUP) {
-            $this->shopContextBuilder->setShopConstraint(ShopConstraint::shopGroup($shopGroupId));
-        } else {
-            $this->shopContextBuilder->setShopConstraint(ShopConstraint::allShops());
-        }
+        $this->shopContextBuilder->setShopConstraint($shopConstraint);
 
         // In all cases a shop must be set for the context even if it's the default one
-        if (empty($shopId)) {
-            $shopId = (int) $this->configuration->get('PS_SHOP_DEFAULT', null, ShopConstraint::allShops());
+        if (!$shopConstraint->getShopId()) {
+            $this->shopContextBuilder->setShopId((int) $this->configuration->get('PS_SHOP_DEFAULT', null, ShopConstraint::allShops()));
+        } else {
+            $this->shopContextBuilder->setShopId($shopConstraint->getShopId()->getValue());
         }
-        $this->shopContextBuilder->setShopId($shopId);
     }
 }

From 7c20a0986e29c7681188087db2d4eed38da82da7 Mon Sep 17 00:00:00 2001
From: Jonathan Lelievre <jonathan.lelievre@prestashop.com>
Date: Mon, 4 Sep 2023 20:19:07 +0200
Subject: [PATCH 0924/1030] Remove CookieContext now the listeners get the
 cookie value from legacy context

---
 src/Core/Context/CookieContext.php            |  68 ----------
 src/Core/Context/CookieContextBuilder.php     | 117 ------------------
 .../Context/Admin/CookieContextListener.php   |  65 ----------
 .../Context/Admin/EmployeeContextListener.php |   8 +-
 .../Context/Admin/ShopContextListener.php     |  47 +++++--
 .../config/services/bundle/context.yml        |   9 +-
 6 files changed, 42 insertions(+), 272 deletions(-)
 delete mode 100644 src/Core/Context/CookieContext.php
 delete mode 100644 src/Core/Context/CookieContextBuilder.php
 delete mode 100644 src/PrestaShopBundle/EventListener/Context/Admin/CookieContextListener.php

diff --git a/src/Core/Context/CookieContext.php b/src/Core/Context/CookieContext.php
deleted file mode 100644
index 7605d03d5ce99..0000000000000
--- a/src/Core/Context/CookieContext.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-declare(strict_types=1);
-
-namespace PrestaShop\PrestaShop\Core\Context;
-
-use Cookie;
-use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopConstraint;
-
-class CookieContext
-{
-    private ShopConstraint $shopConstraint;
-
-    public function __construct(
-        private readonly Cookie $cookie
-    ) {
-        if (!$this->cookie->shopContext) {
-            $this->shopConstraint = ShopConstraint::allShops();
-        } else {
-            $splitShopContext = explode('-', $this->cookie->shopContext);
-            if (count($splitShopContext) == 2) {
-                $splitShopType = $splitShopContext[0];
-                $splitShopValue = (int) $splitShopContext[1];
-                if ($splitShopType == 'g') {
-                    $this->shopConstraint = ShopConstraint::shopGroup($splitShopValue);
-                } else {
-                    $this->shopConstraint = ShopConstraint::shop($splitShopValue);
-                }
-            } else {
-                $this->shopConstraint = ShopConstraint::allShops();
-            }
-        }
-    }
-
-    public function getShopConstraint(): ShopConstraint
-    {
-        return $this->shopConstraint;
-    }
-
-    public function getEmployeeId(): int
-    {
-        return $this->cookie->id_employee ? (int) $this->cookie->id_employee : 0;
-    }
-}
diff --git a/src/Core/Context/CookieContextBuilder.php b/src/Core/Context/CookieContextBuilder.php
deleted file mode 100644
index 4eb8187c60621..0000000000000
--- a/src/Core/Context/CookieContextBuilder.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-declare(strict_types=1);
-
-namespace PrestaShop\PrestaShop\Core\Context;
-
-use Context;
-use Cookie;
-use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
-
-class CookieContextBuilder
-{
-    private ?int $cookieLifetime = null;
-
-    private ?string $cookieName = null;
-
-    private string $cookiePath = '';
-
-    private bool $forceSsl = false;
-
-    private ?CookieContext $cookieContext = null;
-
-    public function build(): CookieContext
-    {
-        // CookieContext is built only once, for performance issue but also because the replacement of the Context->cookie should only be done once
-        if ($this->cookieContext) {
-            return $this->cookieContext;
-        }
-
-        if (null === $this->cookieLifetime) {
-            throw new InvalidArgumentException(sprintf(
-                'Cannot build cookie context as no cookieLifetime has been defined you need to call %s::setCookieLifetime to define it before building the cookie context',
-                self::class
-            ));
-        }
-
-        if (null === $this->cookieName) {
-            throw new InvalidArgumentException(sprintf(
-                'Cannot build cookie context as no cookieName has been defined you need to call %s::setCookieName to define it before building the cookie context',
-                self::class
-            ));
-        }
-
-        // The build is in charge of creating the cookie properly, it will in time be the only building it (and later we probably will refacto it not to rely on
-        // this legacy cookie), but in the meantime we still need live with the legacy context and keeping two instances of the cookie is problematic because they
-        // wouldn't be synced and some values would be overwritten between one another. Esepecially since the cookie automatically writes itself via __destruct at
-        // the end of the process. That's the reason why we need to disable the writing of the Context's cookie (if present) and replace it by our own
-        if (Context::getContext()->cookie) {
-            Context::getContext()->cookie->disallowWriting();
-            unset(Context::getContext()->cookie);
-        }
-
-        $cookie = new Cookie($this->cookieName, $this->cookiePath, $this->cookieLifetime, null, false, $this->forceSsl);
-        Context::getContext()->cookie = $cookie;
-
-        $this->cookieContext = new CookieContext($cookie);
-
-        return $this->cookieContext;
-    }
-
-    public function setCookieLifetime(int $cookieLifetime): self
-    {
-        $this->cookieLifetime = $cookieLifetime;
-
-        return $this;
-    }
-
-    /**
-     * @param string|null $cookieName
-     *
-     * @return static
-     */
-    public function setCookieName(?string $cookieName): self
-    {
-        $this->cookieName = $cookieName;
-
-        return $this;
-    }
-
-    public function setCookiePath(string $cookiePath): self
-    {
-        $this->cookiePath = $cookiePath;
-
-        return $this;
-    }
-
-    public function setForceSsl(bool $forceSsl): self
-    {
-        $this->forceSsl = $forceSsl;
-
-        return $this;
-    }
-}
diff --git a/src/PrestaShopBundle/EventListener/Context/Admin/CookieContextListener.php b/src/PrestaShopBundle/EventListener/Context/Admin/CookieContextListener.php
deleted file mode 100644
index 234cdb8693c18..0000000000000
--- a/src/PrestaShopBundle/EventListener/Context/Admin/CookieContextListener.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-declare(strict_types=1);
-
-namespace PrestaShopBundle\EventListener\Context\Admin;
-
-use PrestaShop\PrestaShop\Core\Context\CookieContextBuilder;
-use PrestaShop\PrestaShop\Core\Domain\Configuration\ShopConfigurationInterface;
-use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopConstraint;
-use Symfony\Component\HttpKernel\Event\RequestEvent;
-
-class CookieContextListener
-{
-    public function __construct(
-        private readonly CookieContextBuilder $shopCookieBuilder,
-        private readonly ShopConfigurationInterface $configuration
-    ) {
-    }
-
-    public function onKernelRequest(RequestEvent $event): void
-    {
-        if (!$event->isMainRequest()) {
-            return;
-        }
-
-        $allShopsConstraint = ShopConstraint::allShops();
-        $adminCookieLifetime = $this->configuration->get('PS_COOKIE_LIFETIME_BO', null, $allShopsConstraint);
-        if ($adminCookieLifetime > 0) {
-            $adminCookieLifetime = time() + (max($adminCookieLifetime, 1) * 3600);
-        }
-        $forceSsl = (bool) $this->configuration->get('PS_SSL_ENABLED', null, $allShopsConstraint)
-            && (bool) $this->configuration->get('PS_SSL_ENABLED_EVERYWHERE', null, $allShopsConstraint);
-
-        $this->shopCookieBuilder
-            ->setCookieName('psAdmin')
-            ->setCookieLifetime($adminCookieLifetime)
-            ->setForceSsl($forceSsl)
-            ->setCookiePath('')
-        ;
-    }
-}
diff --git a/src/PrestaShopBundle/EventListener/Context/Admin/EmployeeContextListener.php b/src/PrestaShopBundle/EventListener/Context/Admin/EmployeeContextListener.php
index ff6cf4c060985..e9d0cbdbb7a98 100644
--- a/src/PrestaShopBundle/EventListener/Context/Admin/EmployeeContextListener.php
+++ b/src/PrestaShopBundle/EventListener/Context/Admin/EmployeeContextListener.php
@@ -28,7 +28,7 @@
 
 namespace PrestaShopBundle\EventListener\Context\Admin;
 
-use PrestaShop\PrestaShop\Core\Context\CookieContext;
+use PrestaShop\PrestaShop\Adapter\LegacyContext;
 use PrestaShop\PrestaShop\Core\Context\EmployeeContextBuilder;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
 
@@ -36,7 +36,7 @@ class EmployeeContextListener
 {
     public function __construct(
         private readonly EmployeeContextBuilder $employeeContextBuilder,
-        private readonly CookieContext $cookieContext
+        private readonly LegacyContext $legacyContext
     ) {
     }
 
@@ -46,8 +46,8 @@ public function onKernelRequest(RequestEvent $event): void
             return;
         }
 
-        if ($this->cookieContext->getEmployeeId()) {
-            $this->employeeContextBuilder->setEmployeeId($this->cookieContext->getEmployeeId());
+        if (!empty($this->legacyContext->getContext()->cookie->id_employee)) {
+            $this->employeeContextBuilder->setEmployeeId((int) $this->legacyContext->getContext()->cookie->id_employee);
         }
     }
 }
diff --git a/src/PrestaShopBundle/EventListener/Context/Admin/ShopContextListener.php b/src/PrestaShopBundle/EventListener/Context/Admin/ShopContextListener.php
index c944796945152..642d98188a259 100644
--- a/src/PrestaShopBundle/EventListener/Context/Admin/ShopContextListener.php
+++ b/src/PrestaShopBundle/EventListener/Context/Admin/ShopContextListener.php
@@ -28,7 +28,7 @@
 
 namespace PrestaShopBundle\EventListener\Context\Admin;
 
-use PrestaShop\PrestaShop\Core\Context\CookieContext;
+use PrestaShop\PrestaShop\Adapter\LegacyContext;
 use PrestaShop\PrestaShop\Core\Context\EmployeeContext;
 use PrestaShop\PrestaShop\Core\Context\ShopContextBuilder;
 use PrestaShop\PrestaShop\Core\Domain\Configuration\ShopConfigurationInterface;
@@ -39,9 +39,9 @@ class ShopContextListener
 {
     public function __construct(
         private readonly ShopContextBuilder $shopContextBuilder,
-        private readonly CookieContext $cookieContext,
         private readonly EmployeeContext $employeeContext,
-        private readonly ShopConfigurationInterface $configuration
+        private readonly ShopConfigurationInterface $configuration,
+        private readonly LegacyContext $legacyContext
     ) {
     }
 
@@ -56,18 +56,19 @@ public function onKernelRequest(RequestEvent $event): void
         }
 
         $shopConstraint = ShopConstraint::allShops();
-        if ($this->cookieContext->getShopConstraint()->getShopGroupId()) {
+        $cookieShopConstraint = $this->getShopConstraintFromCookie();
+        if ($cookieShopConstraint && $cookieShopConstraint->getShopGroupId()) {
             // Check if the employee has permission on selected group if not fallback on single shop context with employee's default shop
-            if ($this->employeeContext->hasAuthorizationOnShopGroup($this->cookieContext->getShopConstraint()->getShopGroupId()->getValue())) {
-                $shopConstraint = $this->cookieContext->getShopConstraint();
-            } else {
+            if ($this->employeeContext->hasAuthorizationOnShopGroup($cookieShopConstraint->getShopGroupId()->getValue())) {
+                $shopConstraint = $cookieShopConstraint;
+            } elseif (!empty($this->employeeContext->getDefaultShopId())) {
                 $shopConstraint = ShopConstraint::shop($this->employeeContext->getDefaultShopId());
             }
-        } elseif ($this->cookieContext->getShopConstraint()->getShopId()) {
+        } elseif ($cookieShopConstraint && $cookieShopConstraint->getShopId()) {
             // Check if employee has authorization on selected shop if not fallback on single shop context with employee's default shop
-            if ($this->employeeContext->hasAuthorizationOnShop($this->cookieContext->getShopConstraint()->getShopId()->getValue())) {
-                $shopConstraint = $this->cookieContext->getShopConstraint();
-            } else {
+            if ($this->employeeContext->hasAuthorizationOnShop($cookieShopConstraint->getShopId()->getValue())) {
+                $shopConstraint = $cookieShopConstraint;
+            } elseif (!empty($this->employeeContext->getDefaultShopId())) {
                 $shopConstraint = ShopConstraint::shop($this->employeeContext->getDefaultShopId());
             }
         }
@@ -80,4 +81,28 @@ public function onKernelRequest(RequestEvent $event): void
             $this->shopContextBuilder->setShopId($shopConstraint->getShopId()->getValue());
         }
     }
+
+    private function getShopConstraintFromCookie(): ?ShopConstraint
+    {
+        if (empty($this->legacyContext->getContext()->cookie->shopContext)) {
+            return null;
+        }
+
+        $splitShopContext = explode('-', $this->legacyContext->getContext()->cookie->shopContext);
+        if (count($splitShopContext) == 2) {
+            $splitShopType = $splitShopContext[0];
+            $splitShopValue = (int) $splitShopContext[1];
+            if (empty($splitShopValue)) {
+                return null;
+            }
+
+            if ($splitShopType == 'g') {
+                return ShopConstraint::shopGroup($splitShopValue);
+            } else {
+                return ShopConstraint::shop($splitShopValue);
+            }
+        }
+
+        return null;
+    }
 }
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/context.yml b/src/PrestaShopBundle/Resources/config/services/bundle/context.yml
index b6c143650c238..27c6bde54dd89 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/context.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/context.yml
@@ -4,15 +4,10 @@ services:
     autowire: true
     autoconfigure: true
 
-  # Many other contexts depend on the cookie, so it should be initialized first
-  PrestaShopBundle\EventListener\Context\Admin\CookieContextListener:
-    tags:
-      - { name: kernel.event_listener, method: onKernelRequest, priority: 1000 }
-
   PrestaShopBundle\EventListener\Context\Admin\EmployeeContextListener:
     tags:
-      - { name: kernel.event_listener, method: onKernelRequest, priority: 900 }
+      - { name: kernel.event_listener, method: onKernelRequest }
 
   PrestaShopBundle\EventListener\Context\Admin\ShopContextListener:
     tags:
-      - { name: kernel.event_listener, method: onKernelRequest, priority: 800 }
+      - { name: kernel.event_listener, method: onKernelRequest }

From cf2d860ed4773b88b06e649ddd04d1f40f7793ce Mon Sep 17 00:00:00 2001
From: Jonathan Lelievre <jonathan.lelievre@prestashop.com>
Date: Thu, 7 Sep 2023 18:14:46 +0200
Subject: [PATCH 0925/1030] Add unit tests for EmployeeContext

---
 .../Unit/Core/Context/EmployeeContextTest.php | 169 ++++++++++++++++++
 1 file changed, 169 insertions(+)
 create mode 100644 tests/Unit/Core/Context/EmployeeContextTest.php

diff --git a/tests/Unit/Core/Context/EmployeeContextTest.php b/tests/Unit/Core/Context/EmployeeContextTest.php
new file mode 100644
index 0000000000000..f1bd8840b3265
--- /dev/null
+++ b/tests/Unit/Core/Context/EmployeeContextTest.php
@@ -0,0 +1,169 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace Core\Context;
+
+use PHPUnit\Framework\TestCase;
+use PrestaShop\PrestaShop\Core\Context\EmployeeContext;
+use PrestaShop\PrestaShop\Core\Model\EmployeeInterface;
+
+class EmployeeContextTest extends TestCase
+{
+    public function testIsSuperAdmin(): void
+    {
+        $employeeMock = $this->createMock(EmployeeInterface::class);
+        $employeeMock
+            ->method('getProfileId')
+            ->willReturn(EmployeeContext::SUPER_ADMIN_PROFILE_ID)
+        ;
+        $employeeContext = new EmployeeContext($employeeMock);
+        $this->assertTrue($employeeContext->isSuperAdmin());
+    }
+
+    public function testIsNotSuperAdmin(): void
+    {
+        $employeeMock = $this->createMock(EmployeeInterface::class);
+        $employeeMock
+            ->method('getProfileId')
+            ->willReturn(EmployeeContext::SUPER_ADMIN_PROFILE_ID + 1)
+        ;
+        $employeeContext = new EmployeeContext($employeeMock);
+        $this->assertFalse($employeeContext->isSuperAdmin());
+    }
+
+    public function testGetDefaultShopId(): void
+    {
+        $employeeMock = $this->createMock(EmployeeInterface::class);
+        $employeeMock
+            ->method('getDefaultShopId')
+            ->willReturn(42)
+        ;
+        $employeeContext = new EmployeeContext($employeeMock);
+        $this->assertEquals(42, $employeeContext->getDefaultShopId());
+    }
+
+    /**
+     * @dataProvider provideShops
+     */
+    public function testHasAuthorizationOnShop(bool $isSuperAdmin, array $shopIds, int $testedShopId, bool $expectedAuthorization): void
+    {
+        $employeeMock = $this->createMock(EmployeeInterface::class);
+        $employeeMock
+            ->method('getProfileId')
+            ->willReturn($isSuperAdmin ? EmployeeContext::SUPER_ADMIN_PROFILE_ID : 42)
+        ;
+        $employeeMock
+            ->method('getAssociatedShopIds')
+            ->willReturn($shopIds)
+        ;
+        $employeeContext = new EmployeeContext($employeeMock);
+
+        $this->assertEquals($expectedAuthorization, $employeeContext->hasAuthorizationOnShop($testedShopId));
+    }
+
+    public function provideShops(): iterable
+    {
+        yield 'super admin with no shops is autorized' => [
+            true,
+            [],
+            42,
+            true,
+        ];
+
+        yield 'super admin with matching shop is authorized' => [
+            true,
+            [42, 51],
+            42,
+            true,
+        ];
+
+        yield 'not super admin with matching shop is authorized' => [
+            false,
+            [42],
+            42,
+            true,
+        ];
+
+        yield 'not super admin with no matching shop is not authorized' => [
+            false,
+            [51],
+            42,
+            false,
+        ];
+    }
+
+    /**
+     * @dataProvider provideShopGroups
+     */
+    public function testHasAuthorizationOnShopGroup(bool $isSuperAdmin, array $groupIds, int $testedGroupId, bool $expectedAuthorization): void
+    {
+        $employeeMock = $this->createMock(EmployeeInterface::class);
+        $employeeMock
+            ->method('getProfileId')
+            ->willReturn($isSuperAdmin ? EmployeeContext::SUPER_ADMIN_PROFILE_ID : 42)
+        ;
+        $employeeMock
+            ->method('getAssociatedShopGroupIds')
+            ->willReturn($groupIds)
+        ;
+        $employeeContext = new EmployeeContext($employeeMock);
+
+        $this->assertEquals($expectedAuthorization, $employeeContext->hasAuthorizationOnShopGroup($testedGroupId));
+    }
+
+    public function provideShopGroups(): iterable
+    {
+        yield 'super admin with no groups is autorized' => [
+            true,
+            [],
+            42,
+            true,
+        ];
+
+        yield 'super admin with matching group is authorized' => [
+            true,
+            [42, 51],
+            42,
+            true,
+        ];
+
+        yield 'not super admin with matching group is authorized' => [
+            false,
+            [42],
+            42,
+            true,
+        ];
+
+        yield 'not super admin with no matching group is not authorized' => [
+            false,
+            [51],
+            42,
+            false,
+        ];
+    }
+}

From 7079ee4311d0a9cf362d2d2bf48ae2b50949874f Mon Sep 17 00:00:00 2001
From: Jonathan Lelievre <jonathan.lelievre@prestashop.com>
Date: Fri, 8 Sep 2023 12:02:34 +0200
Subject: [PATCH 0926/1030] Add imageUrl to employee interface and integrate it
 in doprdown component

---
 classes/Employee.php                          |  5 +++++
 src/Core/Context/EmployeeContextBuilder.php   |  1 +
 src/Core/Model/Employee.php                   |  6 ++++++
 src/Core/Model/EmployeeInterface.php          |  2 ++
 .../Layout/employee_dropdown.html.twig        |  4 ++--
 .../Twig/Component/EmployeeDropdown.php       | 19 ++++++++-----------
 6 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/classes/Employee.php b/classes/Employee.php
index 9a7be30c5b0dd..6fbb25011135e 100644
--- a/classes/Employee.php
+++ b/classes/Employee.php
@@ -824,4 +824,9 @@ public function getAssociatedShopGroupIds(): array
 
         return $this->associated_shops;
     }
+
+    public function getImageUrl(): string
+    {
+        return $this->getImage();
+    }
 }
diff --git a/src/Core/Context/EmployeeContextBuilder.php b/src/Core/Context/EmployeeContextBuilder.php
index a95d02717fc7f..6248f25a6a4ed 100644
--- a/src/Core/Context/EmployeeContextBuilder.php
+++ b/src/Core/Context/EmployeeContextBuilder.php
@@ -48,6 +48,7 @@ public function build(): EmployeeContext
                 lastName: $legacyEmployee->getLastName(),
                 email: $legacyEmployee->getEmail(),
                 password: $legacyEmployee->getPassword(),
+                imageUrl: $legacyEmployee->getImageUrl(),
                 defaultTabId: $legacyEmployee->getDefaultTabId(),
                 defaultShopId: $legacyEmployee->getDefaultShopId(),
                 associatedShopIds: $legacyEmployee->getAssociatedShopIds(),
diff --git a/src/Core/Model/Employee.php b/src/Core/Model/Employee.php
index 2f76a2dceb362..7823648d5faa2 100644
--- a/src/Core/Model/Employee.php
+++ b/src/Core/Model/Employee.php
@@ -41,6 +41,7 @@ public function __construct(
         protected string $lastName,
         protected string $email,
         protected string $password,
+        protected string $imageUrl,
         protected int $defaultTabId,
         protected int $defaultShopId,
         protected array $associatedShopIds,
@@ -83,6 +84,11 @@ public function getPassword(): string
         return $this->password;
     }
 
+    public function getImageUrl(): string
+    {
+        return $this->imageUrl;
+    }
+
     public function getDefaultTabId(): int
     {
         return $this->defaultTabId;
diff --git a/src/Core/Model/EmployeeInterface.php b/src/Core/Model/EmployeeInterface.php
index 044c38ba86014..417a179ad815c 100644
--- a/src/Core/Model/EmployeeInterface.php
+++ b/src/Core/Model/EmployeeInterface.php
@@ -44,6 +44,8 @@ public function getEmail(): string;
 
     public function getPassword(): string;
 
+    public function getImageUrl(): string;
+
     public function getDefaultTabId(): int;
 
     public function getDefaultShopId(): int;
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/employee_dropdown.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/employee_dropdown.html.twig
index 6e4f1f901e139..fce1c04c56c64 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/employee_dropdown.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/employee_dropdown.html.twig
@@ -31,10 +31,10 @@
       <div class="employee-wrapper-avatar">
         <div class="employee-top">
           <span class="employee-avatar">
-            <img class="avatar rounded-circle" src="{{ this.employee.getImage }}" alt="{{ this.employee.firstname }}" />
+            <img class="avatar rounded-circle" src="{{ this.employee.imageUrl }}" alt="{{ this.employee.firstName }}" />
           </span>
           <span class="employee_profile">
-            {{ 'Welcome back %name%'|trans({'%name%': this.employee.firstname}, 'Admin.Navigation.Header') }}
+            {{ 'Welcome back %name%'|trans({'%name%': this.employee.firstName}, 'Admin.Navigation.Header') }}
           </span>
         </div>
 
diff --git a/src/PrestaShopBundle/Twig/Component/EmployeeDropdown.php b/src/PrestaShopBundle/Twig/Component/EmployeeDropdown.php
index fafd4d6831a5e..acc1c893ebd18 100644
--- a/src/PrestaShopBundle/Twig/Component/EmployeeDropdown.php
+++ b/src/PrestaShopBundle/Twig/Component/EmployeeDropdown.php
@@ -28,29 +28,26 @@
 
 namespace PrestaShopBundle\Twig\Component;
 
-use Context;
-use Employee;
 use PrestaShop\PrestaShop\Core\Action\ActionsBarButtonsCollection;
+use PrestaShop\PrestaShop\Core\Context\EmployeeContext;
 use PrestaShop\PrestaShop\Core\Hook\HookDispatcherInterface;
+use PrestaShop\PrestaShop\Core\Model\EmployeeInterface;
 use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
 
 #[AsTwigComponent(template: '@PrestaShop/Admin/Component/Layout/employee_dropdown.html.twig')]
 class EmployeeDropdown
 {
-    private ?Employee $employee = null;
     public ?ActionsBarButtonsCollection $displayBackOfficeEmployeeMenu = null;
 
-    public function __construct(private HookDispatcherInterface $hookDispatcher)
-    {
+    public function __construct(
+        private readonly HookDispatcherInterface $hookDispatcher,
+        private readonly EmployeeContext $employeeContext
+    ) {
     }
 
-    public function getEmployee()
+    public function getEmployee(): ?EmployeeInterface
     {
-        if ($this->employee === null) {
-            $this->employee = Context::getContext()->employee;
-        }
-
-        return $this->employee;
+        return $this->employeeContext->getEmployee();
     }
 
     public function getDisplayBackOfficeEmployeeMenu()

From 6482a08771d74e88e1379ff046da81803ae66a7f Mon Sep 17 00:00:00 2001
From: Jonathan Lelievre <jonathan.lelievre@prestashop.com>
Date: Fri, 8 Sep 2023 12:47:48 +0200
Subject: [PATCH 0927/1030] Integrate SHopCOntext into multistore component and
 clean a little

---
 .../Layout/multistore_header.html.twig        | 35 ++++-----
 .../Twig/Component/MultistoreHeader.php       | 77 ++++++++-----------
 2 files changed, 44 insertions(+), 68 deletions(-)

diff --git a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/multistore_header.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/multistore_header.html.twig
index e872d2a6950c9..25e88db100897 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/multistore_header.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Component/Layout/multistore_header.html.twig
@@ -26,30 +26,21 @@
   {% if this.isMultistoreUsed and app.request is not null %}
     <div
       id="header-multishop"
-      class="header-multishop{% if this.isAllShopContext %} header-multishop-allshops{% elseif this.currentContextColor is empty %} header-multishop-default{% endif %}{% if this.isTitleDark is same as (true) %} header-multishop-dark{% else %} header-multishop-bright{% endif %}"
-      {% if this.isShopContext %}data-shop-id="{{ this.currentShopContextId }}"{% elseif this.isGroupContext %}data-group-id="{{ this.currentShopContextId }}"{% else %}data-all-shops="1"{% endif %}
-      {% if this.colorConfigLink %}data-header-color-notification="{{ "Customize your multistore header, [1]pick a color[/1] for this store context."|trans({'[1]': '<a href="' ~ this.colorConfigLink ~ '">', '[/1]': '</a>'}, 'Admin.Navigation.Header') }}"{% endif %}
+      class="header-multishop{% if this.isAllShopContext %} header-multishop-allshops{% elseif this.contextColor is empty %} header-multishop-default{% endif %}{% if this.isTitleDark %} header-multishop-dark{% else %} header-multishop-bright{% endif %}"
+      {% if this.contextShopId %}data-shop-id="{{ this.contextShopId }}"{% elseif this.contextShopGroupId %}data-group-id="{{ this.contextShopGroupId }}"{% else %}data-all-shops="1"{% endif %}
+      {% if this.colorConfigLink is not empty %}data-header-color-notification="{{ "Customize your multistore header, [1]pick a color[/1] for this store context."|trans({'[1]': '<a href="' ~ this.colorConfigLink ~ '">', '[/1]': '</a>'}, 'Admin.Navigation.Header') }}"{% endif %}
       data-checkbox-notification="{{ "To apply specific settings to a store or a group of stores, select the parameter to modify, make your changes and save."|trans({}, 'Admin.Navigation.Header') ~ ' '}}"
     >
-      <div class="header-multishop-top-bar"{% if this.currentContextColor is not empty %} style="background-color: {{this.currentContextColor}};"{% endif %}>
+      <div class="header-multishop-top-bar"{% if this.contextColor is not empty %} style="background-color: {{this.contextColor}};"{% endif %}>
         <div class="header-multishop-center js-header-multishop-open-modal">
-
-          {#
-          This setting avoid to duplicate @PrestaShop/Admin/Multistore/shop_icon.html.twig and
-          @PrestaShop/Admin/Multistore/multi_shops_icon.html.twig and then replace isTitleDark by this.isTitleDark
-          Todo: remove this line when the two templates above are not used anymore except in twig component and replace
-          isTitleDark by this.isTitleDark in these templates
-          #}
-          {% set isTitleDark = this.isTitleDark %}
-
-          {% if this.isShopContext %}
-            {% include '@PrestaShop/Admin/Multistore/shop_icon.html.twig' %}
+          {% if this.contextShopId %}
+            {% include '@PrestaShop/Admin/Multistore/shop_icon.html.twig' with { isTitleDark: this.isTitleDark } %}
           {% else %}
-            {% include '@PrestaShop/Admin/Multistore/multi_shops_icon.html.twig' %}
+            {% include '@PrestaShop/Admin/Multistore/multi_shops_icon.html.twig' with { isTitleDark: this.isTitleDark } %}
           {% endif %}
 
           <h2 class="header-multishop-title">
-            {% if this.isGroupContext %}{{ "Group"|trans({}, 'Admin.Global') ~ ' '}} {% endif %}{{ this.currentContextName }}
+            {% if this.contextShopGroupId %}{{ "Group"|trans({}, 'Admin.Global') ~ ' '}} {% endif %}{{ this.contextName }}
           </h2>
 
           <button class="header-multishop-button">
@@ -58,10 +49,10 @@
         </div>
       </div>
 
-      {% if this.isShopContext %}
+      {% if this.contextShopId %}
         <div class="header-multishop-right">
           {% block multishop_header_right %}
-            <a class="header-multishop-view-action" href="{{ this.link.getBaseLink(this.currentShopContextId) }}" target="_blank" rel="nofollow">{{ "View my store"|trans({}, 'Admin.Navigation.Header') }} <i class="material-icons">visibility</i></a>
+            <a class="header-multishop-view-action" href="{{ this.link.getBaseLink(this.contextShopId) }}" target="_blank" rel="nofollow">{{ "View my store"|trans({}, 'Admin.Navigation.Header') }} <i class="material-icons">visibility</i></a>
           {% endblock %}
         </div>
       {% endif %}
@@ -70,7 +61,7 @@
         <div class="multishop-modal-dialog js-multishop-modal-dialog" role="document">
           <div class="multishop-modal-body">
             {% block search_shops %}
-              {% if lockedToAllShopContext == false %}
+              {% if this.isLockedToAllShopContext == false %}
                 <div class="multishop-modal-search-container">
                   <i class="material-icons">search</i>
                   <input type="text" class="form-control multishop-modal-search js-multishop-modal-search" placeholder="{{ 'Search store name'|trans({}, 'Admin.Navigation.Header') }}" data-no-results="{{ "No results found for"|trans({}, 'Admin.Global') }}" data-searching="{{ "Searching for"|trans({}, 'Admin.Global') }}">
@@ -94,7 +85,7 @@
               {% for group in this.groupList %}
                 <li class="multishop-modal-group-item multishop-modal-item{% if loop.first %} first-group-item{% endif %}">
                   {% block shop_group_item %}
-                    <span class="multishop-modal-color-container{% if this.isGroupContext and this.currentShopContextId == group.id %} multishop-modal-color-check{% endif %}">
+                    <span class="multishop-modal-color-container{% if this.contextShopGroupId and this.contextShopGroupId == group.id %} multishop-modal-color-check{% endif %}">
                     <i class="material-icons">check</i>
                     <a class="multishop-modal-color"{% if group.color is not empty %} style="background-color: {{group.color}};"{% endif %} href="{{ getAdminLink('AdminShopGroup', true, {'id_shop_group' : group.id, 'updateshop_group' : true}) }}" data-toggle="popover" data-trigger="hover" data-placement="top" data-content="{{ "Edit color"|trans({}, 'Admin.Global') }}" data-original-title="" title=""></a>
                   </span>
@@ -106,7 +97,7 @@
                   <li class="multishop-modal-shop-item multishop-modal-item">
                     {% block shop_item %}
                       <div class="multishop-modal-item-left">
-                      <span class="multishop-modal-color-container{% if this.isShopContext and this.currentShopContextId == shop.id %} multishop-modal-color-check{% endif %}">
+                      <span class="multishop-modal-color-container{% if this.contextShopId and this.contextShopId == shop.id %} multishop-modal-color-check{% endif %}">
                         <i class="material-icons">check</i>
                         <a class="multishop-modal-color"{% if shop.color is not empty %} style="background-color: {{shop.color}};"{% endif %} href="{{ getAdminLink('AdminShop', true, {'shop_id' : shop.id, 'updateshop' : true}) }}" data-toggle="popover" data-trigger="hover" data-placement="top" data-content="{{ "Edit color"|trans({}, 'Admin.Global') }}" data-original-title="" title=""></a>
                       </span>
diff --git a/src/PrestaShopBundle/Twig/Component/MultistoreHeader.php b/src/PrestaShopBundle/Twig/Component/MultistoreHeader.php
index 2ecf8217b9fe0..fbd07c6171b85 100644
--- a/src/PrestaShopBundle/Twig/Component/MultistoreHeader.php
+++ b/src/PrestaShopBundle/Twig/Component/MultistoreHeader.php
@@ -32,7 +32,7 @@
 use Link;
 use PrestaShop\PrestaShop\Adapter\Feature\MultistoreFeature;
 use PrestaShop\PrestaShop\Adapter\LegacyContext;
-use PrestaShop\PrestaShop\Adapter\Shop\Context;
+use PrestaShop\PrestaShop\Core\Context\ShopContext;
 use PrestaShop\PrestaShop\Core\Util\ColorBrightnessCalculator;
 use PrestaShopBundle\Entity\Shop;
 use PrestaShopBundle\Entity\ShopGroup;
@@ -44,22 +44,18 @@ class MultistoreHeader
 {
     public bool $lockedToAllShopContext = false;
     private bool $isMultistoreUsed;
-    private bool $isAllShopContext;
-    private bool $isTitleDark;
-    private bool $isShopContext;
-    private bool $isGroupContext;
-    private ShopGroup|Shop $currentContext;
-    private string|false $colorConfigLink;
+    private string $contextColor = '';
+    private string $contextName = '';
     private array $groupList = [];
     private Link $link;
 
     public function __construct(
         private readonly MultistoreFeature $multistoreFeature, //todo removed internal using ?
         private readonly ColorBrightnessCalculator $colorBrightnessCalculator,
-        private readonly Context $multiStoreContext,
         private readonly EntityManagerInterface $entityManager,
         private readonly LegacyContext $legacyContext,
         private readonly TranslatorInterface $translator,
+        private readonly ShopContext $shopContext
     ) {
     }
 
@@ -71,22 +67,16 @@ public function mount(): void
             return;
         }
 
-        $isAllShopContext = $this->multiStoreContext->isAllShopContext();
-        $isShopContext = $this->multiStoreContext->isShopContext();
-        $colorConfigLink = false;
-
-        if ($isShopContext) {
-            $currentContext = $this->entityManager->getRepository(Shop::class)->findOneBy(['id' => $this->multiStoreContext->getContextShopID()]);
-            $colorConfigLink = $this->legacyContext->getAdminLink('AdminShop', extraParams: ['shop_id' => $currentContext->getId(), 'updateshop' => true]);
-        } elseif (!$isAllShopContext) {
-            $shopGroupLegacy = $this->multiStoreContext->getContextShopGroup();
-            $currentContext = $this->entityManager->getRepository(ShopGroup::class)->findOneBy(['id' => $shopGroupLegacy->id]);
-            $colorConfigLink = $this->legacyContext->getAdminLink('AdminShopGroup', extraParams: ['id_shop_group' => $currentContext->getId(), 'updateshop_group' => true]);
+        if ($this->shopContext->getShopConstraint()->getShopId()) {
+            $shop = $this->entityManager->getRepository(Shop::class)->findOneBy(['id' => $this->shopContext->getShopConstraint()->getShopId()->getValue()]);
+            $this->contextColor = $shop->getColor();
+            $this->contextName = $shop->getName();
+        } elseif ($this->shopContext->getShopConstraint()->getShopGroupId()) {
+            $shopGroup = $this->entityManager->getRepository(ShopGroup::class)->findOneBy(['id' => $this->shopContext->getShopConstraint()->getShopGroupId()->getValue()]);
+            $this->contextColor = $shopGroup->getColor();
+            $this->contextName = $shopGroup->getName();
         } else {
-            // use ShopGroup object as the container for "all shops" context so that it can be used transparently in twig
-            $currentContext = new ShopGroup();
-            $currentContext->setName($this->translator->trans('All stores', domain: 'Admin.Global'));
-            $currentContext->setColor('');
+            $this->contextName = $this->translator->trans('All stores', domain: 'Admin.Global');
         }
 
         if (!$this->lockedToAllShopContext) {
@@ -95,14 +85,8 @@ public function mount(): void
                 static fn (ShopGroup $shopGroup) => !$shopGroup->getShops()->isEmpty()
             );
         }
-        $this->currentContext = $currentContext;
-        $this->isShopContext = $isShopContext;
         $this->link = $this->legacyContext->getContext()->link;
-        $this->isTitleDark = empty($currentContext->getColor()) ? true : $this->colorBrightnessCalculator->isBright($currentContext->getColor());
-        $this->isAllShopContext = $isAllShopContext;
-        $this->isGroupContext = $this->multiStoreContext->isGroupShopContext();
         $this->lockedToAllShopContext = false;
-        $this->colorConfigLink = !$isAllShopContext && empty($currentContext->getColor()) ? $colorConfigLink : false;
     }
 
     public function isLockedToAllShopContext(): bool
@@ -117,42 +101,43 @@ public function isMultistoreUsed(): bool
 
     public function isAllShopContext(): bool
     {
-        return $this->isAllShopContext;
+        return $this->shopContext->getShopConstraint()->forAllShops();
     }
 
-    public function getCurrentShopContextId(): int
+    public function getContextShopId(): ?int
     {
-        return $this->currentContext->getId();
+        return $this->shopContext->getShopConstraint()->getShopId()?->getValue();
     }
 
-    public function getCurrentContextName(): string
+    public function getContextShopGroupId(): ?int
     {
-        return $this->currentContext->getName();
+        return $this->shopContext->getShopConstraint()->getShopGroupId()?->getValue();
     }
 
-    public function getCurrentContextColor(): string
+    public function getContextName(): string
     {
-        return $this->currentContext->getColor();
+        return $this->contextName;
     }
 
-    public function isTitleDark(): bool
+    public function getContextColor(): string
     {
-        return $this->isTitleDark;
+        return $this->contextColor;
     }
 
-    public function isShopContext(): bool
+    public function isTitleDark(): bool
     {
-        return $this->isShopContext;
+        return empty($this->contextColor) || $this->colorBrightnessCalculator->isBright($this->contextColor);
     }
 
-    public function isGroupContext(): bool
+    public function getColorConfigLink(): string
     {
-        return $this->isGroupContext;
-    }
+        if ($this->shopContext->getShopConstraint()->getShopId()) {
+            $this->legacyContext->getAdminLink('AdminShop', extraParams: ['shop_id' => $this->shopContext->getShopConstraint()->getShopId()->getValue(), 'updateshop' => true]);
+        } elseif ($this->shopContext->getShopConstraint()->getShopGroupId()) {
+            return $this->legacyContext->getAdminLink('AdminShopGroup', extraParams: ['id_shop_group' => $this->shopContext->getShopConstraint()->getShopGroupId()->getValue(), 'updateshop_group' => true]);
+        }
 
-    public function getColorConfigLink(): string|false
-    {
-        return $this->colorConfigLink;
+        return '';
     }
 
     public function getLink(): Link

From a52e570083d92de8b165c9acb2cb813b27324c25 Mon Sep 17 00:00:00 2001
From: Jonathan Lelievre <jonathan.lelievre@prestashop.com>
Date: Fri, 8 Sep 2023 13:05:58 +0200
Subject: [PATCH 0928/1030] Update PHPStan baseline

---
 phpstan-baseline.neon | 125 ++++++++++--------------------------------
 1 file changed, 30 insertions(+), 95 deletions(-)

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 6e354260e2f95..7885a9f0afce8 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -1,20 +1,5 @@
 parameters:
 	ignoreErrors:
-		-
-			message: "#^Class Product is forbidden, No legacy calls inside the prestashop bundle. Please create an interface and an adapter if you need to\\.$#"
-			count: 1
-			path: src/Core/Stock/StockManager.php
-
-		-
-			message: "#^Namespace Product is forbidden, No legacy calls inside the prestashop bundle. Please create an interface and an adapter if you need to\\.$#"
-			count: 1
-			path: src/PrestaShopBundle/Entity/Repository/StockRepository.php
-
-		-
-			message: "#^Class Product is forbidden, No legacy calls inside the prestashop bundle. Please create an interface and an adapter if you need to\\.$#"
-			count: 1
-			path: src/PrestaShopBundle/Entity/Repository/StockRepository.php
-
 		-
 			message: "#^Namespace Context is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
 			count: 7
@@ -190,6 +175,16 @@ parameters:
 			count: 7
 			path: src/Core/Category/NameBuilder/CategoryDisplayNameBuilder.php
 
+		-
+			message: "#^Class Employee is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+			count: 1
+			path: src/Core/Context/EmployeeContextBuilder.php
+
+		-
+			message: "#^Namespace Employee is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+			count: 1
+			path: src/Core/Context/EmployeeContextBuilder.php
+
 		-
 			message: "#^Using _COOKIE_KEY_ is forbidden, Use dependency injection instead$#"
 			count: 3
@@ -512,7 +507,7 @@ parameters:
 
 		-
 			message: "#^Namespace Tools is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
-			count: 6
+			count: 4
 			path: src/Core/Domain/CustomerService/QueryHandler/GetCustomerThreadForViewingHandler.php
 
 		-
@@ -787,7 +782,7 @@ parameters:
 
 		-
 			message: "#^Class PrestaShopException is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
-			count: 8
+			count: 7
 			path: src/Core/Shop/LogoUploader.php
 
 		-
@@ -807,7 +802,7 @@ parameters:
 
 		-
 			message: "#^Namespace ImageManager is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
-			count: 9
+			count: 8
 			path: src/Core/Shop/LogoUploader.php
 
 		-
@@ -840,6 +835,11 @@ parameters:
 			count: 11
 			path: src/Core/Stock/StockManager.php
 
+		-
+			message: "#^Class Product is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+			count: 1
+			path: src/Core/Stock/StockManager.php
+
 		-
 			message: "#^Namespace Access is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
 			count: 2
@@ -910,11 +910,6 @@ parameters:
 			count: 4
 			path: src/PrestaShopBundle/Bridge/AdminController/ControllerConfigurationFactory.php
 
-		-
-			message: "#^Namespace Tab is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
-			count: 1
-			path: src/PrestaShopBundle/Bridge/AdminController/FrameworkBridgeControllerTrait.php
-
 		-
 			message: "#^Class Context is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
 			count: 1
@@ -1127,7 +1122,7 @@ parameters:
 
 		-
 			message: "#^Namespace Tools is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
-			count: 5
+			count: 4
 			path: src/PrestaShopBundle/Bridge/Smarty/HeaderConfigurator.php
 
 		-
@@ -1295,11 +1290,6 @@ parameters:
 			count: 1
 			path: src/PrestaShopBundle/Controller/Admin/Improve/Design/PositionsController.php
 
-		-
-			message: "#^Namespace Context is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
-			count: 2
-			path: src/PrestaShopBundle/Controller/Admin/Improve/International/CountryController.php
-
 		-
 			message: "#^Namespace Db is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
 			count: 2
@@ -1390,26 +1380,6 @@ parameters:
 			count: 1
 			path: src/PrestaShopBundle/Controller/Admin/Sell/Catalog/CategoryController.php
 
-		-
-			message: "#^Class Feature is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
-			count: 1
-			path: src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureController.php
-
-		-
-			message: "#^Namespace Feature is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
-			count: 1
-			path: src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureController.php
-
-		-
-			message: "#^Namespace Tab is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
-			count: 1
-			path: src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureController.php
-
-		-
-			message: "#^Namespace Tools is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
-			count: 2
-			path: src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureController.php
-
 		-
 			message: "#^Class Language is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
 			count: 1
@@ -1515,6 +1485,16 @@ parameters:
 			count: 1
 			path: src/PrestaShopBundle/Entity/Repository/StockManagementRepository.php
 
+		-
+			message: "#^Class Product is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+			count: 1
+			path: src/PrestaShopBundle/Entity/Repository/StockRepository.php
+
+		-
+			message: "#^Namespace Product is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+			count: 1
+			path: src/PrestaShopBundle/Entity/Repository/StockRepository.php
+
 		-
 			message: "#^Namespace Shop is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
 			count: 1
@@ -1530,11 +1510,6 @@ parameters:
 			count: 2
 			path: src/PrestaShopBundle/EventListener/LegacyParametersListener.php
 
-		-
-			message: "#^Namespace Employee is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
-			count: 1
-			path: src/PrestaShopBundle/EventListener/TokenizedUrlsListener.php
-
 		-
 			message: "#^Namespace Tools is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
 			count: 2
@@ -1555,31 +1530,6 @@ parameters:
 			count: 1
 			path: src/PrestaShopBundle/EventListener/UserLocaleListener.php
 
-		-
-			message: "#^Class Cookie is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
-			count: 1
-			path: src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Administration/GeneralDataProvider.php
-
-		-
-			message: "#^Namespace Cookie is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
-			count: 1
-			path: src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Administration/GeneralDataProvider.php
-
-		-
-			message: "#^Class Cookie is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
-			count: 1
-			path: src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Administration/GeneralType.php
-
-		-
-			message: "#^Namespace Cookie is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
-			count: 1
-			path: src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Administration/GeneralType.php
-
-		-
-			message: "#^Namespace PrestaShopException is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
-			count: 1
-			path: src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/TrafficSeo/Meta/MetaSettingsFormDataProvider.php
-
 		-
 			message: "#^Namespace PrestaShopException is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
 			count: 1
@@ -1695,19 +1645,9 @@ parameters:
 			count: 1
 			path: src/PrestaShopBundle/Form/Admin/Type/LogSeverityChoiceType.php
 
-		-
-			message: "#^Class Currency is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
-			count: 1
-			path: src/PrestaShopBundle/Form/Admin/Type/PriceReductionType.php
-
-		-
-			message: "#^Namespace Currency is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
-			count: 1
-			path: src/PrestaShopBundle/Form/Admin/Type/PriceReductionType.php
-
 		-
 			message: "#^Class Product is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
-			count: 17
+			count: 16
 			path: src/PrestaShopBundle/Model/Product/AdminModelAdapter.php
 
 		-
@@ -1720,11 +1660,6 @@ parameters:
 			count: 2
 			path: src/PrestaShopBundle/Model/Product/AdminModelAdapter.php
 
-		-
-			message: "#^Namespace Configuration is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
-			count: 2
-			path: src/PrestaShopBundle/Model/Product/AdminModelAdapter.php
-
 		-
 			message: "#^Namespace Product is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
 			count: 1

From 64776e1b92ef105579fba244ca6985a311ca98bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@prestashop.com>
Date: Fri, 8 Sep 2023 11:05:14 +0200
Subject: [PATCH 0929/1030] Replace help text by tooltip in delivery slips page

---
 .../Form/Admin/Sell/Order/Delivery/SlipOptionsType.php      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Order/Delivery/SlipOptionsType.php b/src/PrestaShopBundle/Form/Admin/Sell/Order/Delivery/SlipOptionsType.php
index 5f623ab910e53..c02dc6364f82c 100644
--- a/src/PrestaShopBundle/Form/Admin/Sell/Order/Delivery/SlipOptionsType.php
+++ b/src/PrestaShopBundle/Form/Admin/Sell/Order/Delivery/SlipOptionsType.php
@@ -50,7 +50,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 [
                     'type' => TextType::class,
                     'label' => $this->trans('Delivery prefix', 'Admin.Orderscustomers.Feature'),
-                    'help' => $this->trans('Prefix used for delivery slips.', 'Admin.Orderscustomers.Help'),
+                    'label_help_box' => $this->trans('Prefix used for delivery slips.', 'Admin.Orderscustomers.Help'),
                 ]
             )
             ->add(
@@ -58,7 +58,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 NumberType::class,
                 [
                     'label' => $this->trans('Delivery number', 'Admin.Orderscustomers.Feature'),
-                    'help' => $this->trans(
+                    'label_help_box' => $this->trans(
                         'The next delivery slip will begin with this number and then increase with each additional slip.',
                         'Admin.Orderscustomers.Help'
                     ),
@@ -69,7 +69,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 SwitchType::class,
                 [
                     'label' => $this->trans('Enable product image', 'Admin.Orderscustomers.Feature'),
-                    'help' => $this->trans(
+                    'label_help_box' => $this->trans(
                         'Add an image before the product name on delivery slips.',
                         'Admin.Orderscustomers.Help'
                     ),

From aa31ffe8f909644d31527303fd11195338e22b5d Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Fri, 8 Sep 2023 17:30:47 +0200
Subject: [PATCH 0930/1030] Fix URL sanitization and duplicate language ID

---
 classes/Dispatcher.php                 | 14 +++++++++++---
 classes/controller/FrontController.php | 17 ++++++++++++-----
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/classes/Dispatcher.php b/classes/Dispatcher.php
index 1de2dc6e3aba5..f6b07653a03c0 100644
--- a/classes/Dispatcher.php
+++ b/classes/Dispatcher.php
@@ -1023,14 +1023,22 @@ public function createUrl(
                 }
             }
 
+            // Add controller to parameters if not present
             if (!empty($route['controller'])) {
                 $query_params['controller'] = $route['controller'];
             }
-            $query = http_build_query(array_merge($add_params, $query_params), '', '&');
+
+            // Build final parameters, add language if needed
+            $urlParams = array_merge($add_params, $query_params);
+
+            // If multilanguage is activated, we add proper language ID, overwriting
+            // the previous one if it was provided
             if ($this->multilang_activated) {
-                $query .= (!empty($query) ? '&' : '') . 'id_lang=' . (int) $id_lang;
+                $urlParams['id_lang'] = (int) $id_lang;
             }
-            $url = 'index.php?' . $query;
+
+            // Build the final URL
+            $url = 'index.php?' . http_build_query($urlParams, '', '&');
         }
 
         return $url . $anchor;
diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php
index e4d7b2d62bc24..3acfc4acabc1e 100644
--- a/classes/controller/FrontController.php
+++ b/classes/controller/FrontController.php
@@ -2137,18 +2137,24 @@ protected function getAlternativeLangsUrl()
     protected function sanitizeUrl(string $url): string
     {
         $params = [];
-        $url_details = parse_url($url);
 
+        // Extract all parts of the URL
+        $url_details = parse_url($url);
         if (!empty($url_details['query'])) {
             parse_str($url_details['query'], $query);
             $params = $this->sanitizeQueryOutput($query);
         }
 
-        $excluded_key = ['isolang', 'id_lang', 'controller', 'fc', 'id_product', 'id_category', 'id_manufacturer', 'id_supplier', 'id_cms'];
-        $excluded_key = array_merge($excluded_key, $this->redirectionExtraExcludedKeys);
-        foreach ($_GET as $key => $value) {
+        // Build a list of parameters we won't be sanitizing
+        $excludedKeys = array_merge(
+            ['isolang', 'id_lang', 'controller', 'fc', 'id_product', 'id_category', 'id_manufacturer', 'id_supplier', 'id_cms'],
+            $this->redirectionExtraExcludedKeys
+        );
+
+        // Go through each parameter we got from dispatcher and sanizize it
+        foreach ($params as $key => $value) {
             if (
-                in_array($key, $excluded_key)
+                in_array($key, $excludedKeys)
                 || !Validate::isUrl($key)
                 || !$this->validateInputAsUrl($value)
             ) {
@@ -2158,6 +2164,7 @@ protected function sanitizeUrl(string $url): string
             $params[Tools::safeOutput($key)] = is_array($value) ? array_walk_recursive($value, 'Tools::safeOutput') : Tools::safeOutput($value);
         }
 
+        // Build back the query
         $str_params = http_build_query($params, '', '&');
         $sanitizedUrl = preg_replace('/^([^?]*)?.*$/', '$1', $url) . (!empty($str_params) ? '?' . $str_params : '');
 

From c3810b55014400485b1beff362c96609848989c9 Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Sun, 10 Sep 2023 14:38:54 +0200
Subject: [PATCH 0931/1030] Fix adding and deleting languages

---
 classes/Language.php | 107 ++++++++++++++++++++++++++++---------------
 1 file changed, 69 insertions(+), 38 deletions(-)

diff --git a/classes/Language.php b/classes/Language.php
index 9aca918cf11a6..cebf5e854f544 100644
--- a/classes/Language.php
+++ b/classes/Language.php
@@ -503,7 +503,6 @@ public function loadUpdateSQL()
     {
         $tables = Db::getInstance()->executeS('SHOW TABLES LIKE \'' . str_replace('_', '\\_', _DB_PREFIX_) . '%\_lang\' ');
         $langTables = [];
-
         foreach ($tables as $table) {
             foreach ($table as $t) {
                 $langTables[] = $t;
@@ -528,8 +527,8 @@ public function loadUpdateSQL()
     }
 
     /**
-     * duplicate translated rows from xxx_lang tables
-     * from the shop default language.
+     * Creates new entries in _lang tables using the data from default language.
+     * If data already exist in that language, they won't be overwritten.
      *
      * @param string $tableName
      * @param int $shopDefaultLangId
@@ -541,52 +540,66 @@ public function loadUpdateSQL()
      */
     private function duplicateRowsFromDefaultShopLang($tableName, $shopDefaultLangId, $shopId)
     {
-        preg_match('#^' . preg_quote(_DB_PREFIX_) . '(.+)_lang$#i', $tableName, $m);
-        $identifier = 'id_' . $m[1];
-
-        $fields = [];
-        // We will check if the table contains a column "id_shop"
-        // If yes, we will add "id_shop" as a WHERE condition in queries copying data from default language
-        $shop_field_exists = $primary_key_exists = false;
+        // We load all columns from the table
         $columns = Db::getInstance()->executeS('SHOW COLUMNS FROM `' . $tableName . '`');
+
+        // We check if the table contains a column "id_shop".
+        // If yes, we will add "id_shop" as a WHERE condition in queries copying data from default language.
+        $idShopColumnExists = false;
+        $idLangColumnExists = false;
+
+        // We extract the column names from the table
+        $columnNames = [];
         foreach ($columns as $column) {
-            $fields[] = '`' . $column['Field'] . '`';
+            // Build field to our list
+            $columnNames[] = $column['Field'];
+
+            // Save info that we will need to use id_shop
             if ($column['Field'] == 'id_shop') {
-                $shop_field_exists = true;
+                $idShopColumnExists = true;
             }
-            if ($column['Field'] == $identifier) {
-                $primary_key_exists = true;
+
+            // Check if the table actually has id_lang column, so we don't crash for some custom tables
+            if ($column['Field'] == 'id_lang') {
+                $idLangColumnExists = true;
             }
         }
-        $fields = implode(',', $fields);
 
-        if (!$primary_key_exists) {
+        // If the table does not contain id_lang, nothing to do here
+        if ($idLangColumnExists === false) {
             return true;
         }
 
-        $sql = 'INSERT IGNORE INTO `' . $tableName . '` (' . $fields . ') (SELECT ';
+        // Format insert fields, they are just normal column names without any prefix.
+        $insertFields = [];
+        foreach ($columnNames as $columnName) {
+            $insertFields[] = '`' . $columnName . '`';
+        }
 
-        // For each column, copy data from default language
-        reset($columns);
-        $selectQueries = [];
-        foreach ($columns as $column) {
-            if ($identifier != $column['Field'] && $column['Field'] != 'id_lang') {
-                $selectQueries[] = '(
-							SELECT `' . bqSQL($column['Field']) . '`
-							FROM `' . bqSQL($tableName) . '` tl
-							WHERE tl.`id_lang` = ' . (int) $shopDefaultLangId . '
-							' . ($shop_field_exists ? ' AND tl.`id_shop` = ' . (int) $shopId : '') . '
-							AND tl.`' . bqSQL($identifier) . '` = `' . bqSQL(str_replace('_lang', '', $tableName)) . '`.`' . bqSQL($identifier) . '`
-						)';
+        /*
+         * Now let's format select fields. We will prefix every column with our table prefix, with one exception.
+         *
+         * For language field, we will use the unique language ID from lang table we cross join. Otherwise we would
+         * be inserting the ID of default language for every row.
+         */
+        $selectFields = [];
+        foreach ($columnNames as $columnName) {
+            if ($columnName == 'id_lang') {
+                $selectFields[] = 'l.`id_lang`';
             } else {
-                $selectQueries[] = '`' . bqSQL($column['Field']) . '`';
+                $selectFields[] = 'tl.`' . $columnName . '`';
             }
         }
-        $sql .= implode(',', $selectQueries);
-        $sql .= ' FROM `' . _DB_PREFIX_ . 'lang` CROSS JOIN `' . bqSQL(str_replace('_lang', '', $tableName)) . '` ';
 
-        // prevent insert with where initial data exists
-        $sql .= ' WHERE `' . bqSQL($identifier) . '` IN (SELECT `' . bqSQL($identifier) . '` FROM `' . bqSQL($tableName) . '`) )';
+        // Format the SQL query and run it
+        // Entries which already exist are ignored, only new ones are added.
+        $sql = '
+        INSERT IGNORE INTO `' . $tableName . '` (' . implode(', ', $insertFields) . ')
+        SELECT ' . implode(', ', $selectFields) . '
+        FROM `' . $tableName . '` tl
+        CROSS JOIN `' . _DB_PREFIX_ . 'lang` l
+        WHERE tl.id_lang = ' . (int) $shopDefaultLangId .
+        ($idShopColumnExists ? ' AND tl.`id_shop` = ' . (int) $shopId : '');
 
         return Db::getInstance()->execute($sql);
     }
@@ -601,16 +614,34 @@ public function delete()
                 $this->iso_code = Language::getIsoById($this->id);
             }
 
-            // Database translations deletion
+            // Now let's delete all entries in _lang tables for given languages
             $result = Db::getInstance()->executeS('SHOW TABLES FROM `' . _DB_NAME_ . '`');
+
+            // A key we will be searching for, database returns it in this weird format
             $tableNameKey = 'Tables_in_' . _DB_NAME_;
 
             foreach ($result as $row) {
-                if (isset($row[$tableNameKey]) && !empty($row[$tableNameKey]) && preg_match('/_lang$/', $row[$tableNameKey])) {
-                    if (!Db::getInstance()->execute('DELETE FROM `' . $row[$tableNameKey] . '` WHERE `id_lang` = ' . (int) $this->id)) {
-                        return false;
+                // If we received empty table name for some reason or the language name does not end with _lang
+                if (empty($row[$tableNameKey]) || !preg_match('/_lang$/', $row[$tableNameKey])) {
+                    continue;
+                }
+
+                // We check if this table contains id_lang column
+                $columns = Db::getInstance()->executeS('SHOW COLUMNS FROM `' . $row[$tableNameKey] . '`');
+                $idLangColumnExists = false;
+                foreach ($columns as $column) {
+                    if ($column['Field'] == 'id_lang') {
+                        $idLangColumnExists = true;
                     }
                 }
+
+                // If it doesn't, nothing to delete
+                if ($idLangColumnExists === false) {
+                    continue;
+                }
+
+                // Delete all entries for this language ID
+                Db::getInstance()->execute('DELETE FROM `' . $row[$tableNameKey] . '` WHERE `id_lang` = ' . (int) $this->id);
             }
 
             // Delete tags

From fcccd5962e328a4e3dbb4c87f350837e935cf58b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Sep 2023 04:41:26 +0000
Subject: [PATCH 0932/1030] Bump @types/chai-string from 1.4.2 to 1.4.3 in
 /tests/UI

Bumps [@types/chai-string](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/chai-string) from 1.4.2 to 1.4.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/chai-string)

---
updated-dependencies:
- dependency-name: "@types/chai-string"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 14 +++++++-------
 tests/UI/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index 73c650ea75478..ab7da49c4ffcb 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -29,7 +29,7 @@
       },
       "devDependencies": {
         "@types/chai": "^4.3.5",
-        "@types/chai-string": "^1.4.2",
+        "@types/chai-string": "^1.4.3",
         "@types/libsodium-wrappers": "^0.7.11",
         "@types/mocha": "^10.0.1",
         "@types/mochawesome": "^6.2.1",
@@ -453,9 +453,9 @@
       "dev": true
     },
     "node_modules/@types/chai-string": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/@types/chai-string/-/chai-string-1.4.2.tgz",
-      "integrity": "sha512-ld/1hV5qcPRGuwlPdvRfvM3Ka/iofOk2pH4VkasK4b1JJP1LjNmWWn0LsISf6RRzyhVOvs93rb9tM09e+UuF8Q==",
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/@types/chai-string/-/chai-string-1.4.3.tgz",
+      "integrity": "sha512-bLp5xMQ7Ml0fWa05IPpLjIznTkNbuBE3GtRTzKrp0d10IavlBFcu9vXP2liWaXta79unO693q3kuRxD7g2YYGw==",
       "dev": true,
       "dependencies": {
         "@types/chai": "*"
@@ -8293,9 +8293,9 @@
       "dev": true
     },
     "@types/chai-string": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/@types/chai-string/-/chai-string-1.4.2.tgz",
-      "integrity": "sha512-ld/1hV5qcPRGuwlPdvRfvM3Ka/iofOk2pH4VkasK4b1JJP1LjNmWWn0LsISf6RRzyhVOvs93rb9tM09e+UuF8Q==",
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/@types/chai-string/-/chai-string-1.4.3.tgz",
+      "integrity": "sha512-bLp5xMQ7Ml0fWa05IPpLjIznTkNbuBE3GtRTzKrp0d10IavlBFcu9vXP2liWaXta79unO693q3kuRxD7g2YYGw==",
       "dev": true,
       "requires": {
         "@types/chai": "*"
diff --git a/tests/UI/package.json b/tests/UI/package.json
index 0740a2f3e534d..5ee1370516741 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -122,7 +122,7 @@
   },
   "devDependencies": {
     "@types/chai": "^4.3.5",
-    "@types/chai-string": "^1.4.2",
+    "@types/chai-string": "^1.4.3",
     "@types/libsodium-wrappers": "^0.7.11",
     "@types/mocha": "^10.0.1",
     "@types/mochawesome": "^6.2.1",

From 335776cf007544a6195e559d789245d7a2dcf6b1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Sep 2023 04:42:05 +0000
Subject: [PATCH 0933/1030] Bump @typescript-eslint/parser from 6.5.0 to 6.6.0
 in /tests/UI

Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 6.5.0 to 6.6.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.6.0/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 98 +++++++++++++++++++-------------------
 tests/UI/package.json      |  2 +-
 2 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index 73c650ea75478..13bf48b83f1bb 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -34,7 +34,7 @@
         "@types/mocha": "^10.0.1",
         "@types/mochawesome": "^6.2.1",
         "@typescript-eslint/eslint-plugin": "^6.5.0",
-        "@typescript-eslint/parser": "^6.5.0",
+        "@typescript-eslint/parser": "^6.6.0",
         "babel-eslint": "^10.1.0",
         "eslint": "^8.48.0",
         "eslint-config-airbnb-base": "^15.0.0",
@@ -687,15 +687,15 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.5.0.tgz",
-      "integrity": "sha512-LMAVtR5GN8nY0G0BadkG0XIe4AcNMeyEy3DyhKGAh9k4pLSMBO7rF29JvDBpZGCmp5Pgz5RLHP6eCpSYZJQDuQ==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.6.0.tgz",
+      "integrity": "sha512-setq5aJgUwtzGrhW177/i+DMLqBaJbdwGj2CPIVFFLE0NCliy5ujIdLHd2D1ysmlmsjdL2GWW+hR85neEfc12w==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "6.5.0",
-        "@typescript-eslint/types": "6.5.0",
-        "@typescript-eslint/typescript-estree": "6.5.0",
-        "@typescript-eslint/visitor-keys": "6.5.0",
+        "@typescript-eslint/scope-manager": "6.6.0",
+        "@typescript-eslint/types": "6.6.0",
+        "@typescript-eslint/typescript-estree": "6.6.0",
+        "@typescript-eslint/visitor-keys": "6.6.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -715,13 +715,13 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.5.0.tgz",
-      "integrity": "sha512-A8hZ7OlxURricpycp5kdPTH3XnjG85UpJS6Fn4VzeoH4T388gQJ/PGP4ole5NfKt4WDVhmLaQ/dBLNDC4Xl/Kw==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.6.0.tgz",
+      "integrity": "sha512-pT08u5W/GT4KjPUmEtc2kSYvrH8x89cVzkA0Sy2aaOUIw6YxOIjA8ilwLr/1fLjOedX1QAuBpG9XggWqIIfERw==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.5.0",
-        "@typescript-eslint/visitor-keys": "6.5.0"
+        "@typescript-eslint/types": "6.6.0",
+        "@typescript-eslint/visitor-keys": "6.6.0"
       },
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -732,9 +732,9 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.5.0.tgz",
-      "integrity": "sha512-eqLLOEF5/lU8jW3Bw+8auf4lZSbbljHR2saKnYqON12G/WsJrGeeDHWuQePoEf9ro22+JkbPfWQwKEC5WwLQ3w==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.6.0.tgz",
+      "integrity": "sha512-CB6QpJQ6BAHlJXdwUmiaXDBmTqIE2bzGTDLADgvqtHWuhfNP3rAOK7kAgRMAET5rDRr9Utt+qAzRBdu3AhR3sg==",
       "dev": true,
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -745,13 +745,13 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.5.0.tgz",
-      "integrity": "sha512-q0rGwSe9e5Kk/XzliB9h2LBc9tmXX25G0833r7kffbl5437FPWb2tbpIV9wAATebC/018pGa9fwPDuvGN+LxWQ==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.6.0.tgz",
+      "integrity": "sha512-hMcTQ6Al8MP2E6JKBAaSxSVw5bDhdmbCEhGW/V8QXkb9oNsFkA4SBuOMYVPxD3jbtQ4R/vSODBsr76R6fP3tbA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.5.0",
-        "@typescript-eslint/visitor-keys": "6.5.0",
+        "@typescript-eslint/types": "6.6.0",
+        "@typescript-eslint/visitor-keys": "6.6.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -772,12 +772,12 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.5.0.tgz",
-      "integrity": "sha512-yCB/2wkbv3hPsh02ZS8dFQnij9VVQXJMN/gbQsaaY+zxALkZnxa/wagvLEFsAWMPv7d7lxQmNsIzGU1w/T/WyA==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.6.0.tgz",
+      "integrity": "sha512-L61uJT26cMOfFQ+lMZKoJNbAEckLe539VhTxiGHrWl5XSKQgA0RTBZJW2HFPy5T0ZvPVSD93QsrTKDkfNwJGyQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.5.0",
+        "@typescript-eslint/types": "6.6.0",
         "eslint-visitor-keys": "^3.4.1"
       },
       "engines": {
@@ -8464,42 +8464,42 @@
       }
     },
     "@typescript-eslint/parser": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.5.0.tgz",
-      "integrity": "sha512-LMAVtR5GN8nY0G0BadkG0XIe4AcNMeyEy3DyhKGAh9k4pLSMBO7rF29JvDBpZGCmp5Pgz5RLHP6eCpSYZJQDuQ==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.6.0.tgz",
+      "integrity": "sha512-setq5aJgUwtzGrhW177/i+DMLqBaJbdwGj2CPIVFFLE0NCliy5ujIdLHd2D1ysmlmsjdL2GWW+hR85neEfc12w==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "6.5.0",
-        "@typescript-eslint/types": "6.5.0",
-        "@typescript-eslint/typescript-estree": "6.5.0",
-        "@typescript-eslint/visitor-keys": "6.5.0",
+        "@typescript-eslint/scope-manager": "6.6.0",
+        "@typescript-eslint/types": "6.6.0",
+        "@typescript-eslint/typescript-estree": "6.6.0",
+        "@typescript-eslint/visitor-keys": "6.6.0",
         "debug": "^4.3.4"
       },
       "dependencies": {
         "@typescript-eslint/scope-manager": {
-          "version": "6.5.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.5.0.tgz",
-          "integrity": "sha512-A8hZ7OlxURricpycp5kdPTH3XnjG85UpJS6Fn4VzeoH4T388gQJ/PGP4ole5NfKt4WDVhmLaQ/dBLNDC4Xl/Kw==",
+          "version": "6.6.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.6.0.tgz",
+          "integrity": "sha512-pT08u5W/GT4KjPUmEtc2kSYvrH8x89cVzkA0Sy2aaOUIw6YxOIjA8ilwLr/1fLjOedX1QAuBpG9XggWqIIfERw==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.5.0",
-            "@typescript-eslint/visitor-keys": "6.5.0"
+            "@typescript-eslint/types": "6.6.0",
+            "@typescript-eslint/visitor-keys": "6.6.0"
           }
         },
         "@typescript-eslint/types": {
-          "version": "6.5.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.5.0.tgz",
-          "integrity": "sha512-eqLLOEF5/lU8jW3Bw+8auf4lZSbbljHR2saKnYqON12G/WsJrGeeDHWuQePoEf9ro22+JkbPfWQwKEC5WwLQ3w==",
+          "version": "6.6.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.6.0.tgz",
+          "integrity": "sha512-CB6QpJQ6BAHlJXdwUmiaXDBmTqIE2bzGTDLADgvqtHWuhfNP3rAOK7kAgRMAET5rDRr9Utt+qAzRBdu3AhR3sg==",
           "dev": true
         },
         "@typescript-eslint/typescript-estree": {
-          "version": "6.5.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.5.0.tgz",
-          "integrity": "sha512-q0rGwSe9e5Kk/XzliB9h2LBc9tmXX25G0833r7kffbl5437FPWb2tbpIV9wAATebC/018pGa9fwPDuvGN+LxWQ==",
+          "version": "6.6.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.6.0.tgz",
+          "integrity": "sha512-hMcTQ6Al8MP2E6JKBAaSxSVw5bDhdmbCEhGW/V8QXkb9oNsFkA4SBuOMYVPxD3jbtQ4R/vSODBsr76R6fP3tbA==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.5.0",
-            "@typescript-eslint/visitor-keys": "6.5.0",
+            "@typescript-eslint/types": "6.6.0",
+            "@typescript-eslint/visitor-keys": "6.6.0",
             "debug": "^4.3.4",
             "globby": "^11.1.0",
             "is-glob": "^4.0.3",
@@ -8508,12 +8508,12 @@
           }
         },
         "@typescript-eslint/visitor-keys": {
-          "version": "6.5.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.5.0.tgz",
-          "integrity": "sha512-yCB/2wkbv3hPsh02ZS8dFQnij9VVQXJMN/gbQsaaY+zxALkZnxa/wagvLEFsAWMPv7d7lxQmNsIzGU1w/T/WyA==",
+          "version": "6.6.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.6.0.tgz",
+          "integrity": "sha512-L61uJT26cMOfFQ+lMZKoJNbAEckLe539VhTxiGHrWl5XSKQgA0RTBZJW2HFPy5T0ZvPVSD93QsrTKDkfNwJGyQ==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.5.0",
+            "@typescript-eslint/types": "6.6.0",
             "eslint-visitor-keys": "^3.4.1"
           }
         },
diff --git a/tests/UI/package.json b/tests/UI/package.json
index 0740a2f3e534d..ca59799f6947b 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -127,7 +127,7 @@
     "@types/mocha": "^10.0.1",
     "@types/mochawesome": "^6.2.1",
     "@typescript-eslint/eslint-plugin": "^6.5.0",
-    "@typescript-eslint/parser": "^6.5.0",
+    "@typescript-eslint/parser": "^6.6.0",
     "babel-eslint": "^10.1.0",
     "eslint": "^8.48.0",
     "eslint-config-airbnb-base": "^15.0.0",

From 4effd8132e6696f4c6e7487748c9af9c8ce7ddd6 Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Fri, 8 Sep 2023 14:23:05 +0200
Subject: [PATCH 0934/1030] Comment hooks with special calls

---
 classes/Cart.php                              |  1 +
 classes/Dispatcher.php                        |  2 +
 classes/Hook.php                              | 58 ++++++++++++-------
 classes/Mail.php                              |  7 +++
 classes/Product.php                           |  2 +-
 classes/checkout/CheckoutDeliveryStep.php     |  1 +
 .../checkout/ConditionsToApproveFinder.php    |  2 +
 classes/checkout/DeliveryOptionsFinder.php    |  1 +
 classes/controller/AdminController.php        |  5 ++
 classes/controller/FrontController.php        |  1 +
 .../ProductListingFrontController.php         |  1 +
 classes/form/CustomerAddressFormatter.php     |  1 +
 classes/form/CustomerForm.php                 |  2 +
 classes/form/CustomerFormatter.php            |  1 +
 classes/order/OrderHistory.php                |  4 ++
 classes/shop/Shop.php                         |  1 +
 classes/webservice/WebserviceRequest.php      |  3 +
 .../admin/AdminDashboardController.php        |  2 +
 controllers/admin/AdminSearchController.php   |  1 +
 controllers/admin/AdminStatsTabController.php |  1 +
 controllers/front/CartController.php          |  1 +
 controllers/front/CmsController.php           | 26 +++++----
 .../front/OrderConfirmationController.php     |  1 +
 controllers/front/ProductController.php       |  1 +
 controllers/front/SitemapController.php       |  8 +--
 .../front/listing/CategoryController.php      | 13 +++--
 .../front/listing/ManufacturerController.php  | 26 +++++----
 .../front/listing/SupplierController.php      | 26 +++++----
 .../CancelOrderProductHandler.php             |  1 +
 .../IssuePartialRefundHandler.php             |  1 +
 .../IssueReturnProductHandler.php             |  1 +
 .../IssueStandardRefundHandler.php            |  1 +
 .../UpdateOrderShippingDetailsHandler.php     |  1 +
 src/Adapter/Order/Refund/OrderSlipCreator.php |  2 +
 .../Presenter/Object/ObjectPresenter.php      |  1 +
 src/Core/Module/ModuleRepository.php          |  1 +
 36 files changed, 136 insertions(+), 72 deletions(-)

diff --git a/classes/Cart.php b/classes/Cart.php
index 56430e6c95bbc..4a855bbf0fa5d 100644
--- a/classes/Cart.php
+++ b/classes/Cart.php
@@ -4038,6 +4038,7 @@ public function getRawSummaryDetails(int $id_lang, bool $refresh = false): array
             'carrier' => new Carrier($this->id_carrier, $id_lang),
         ];
 
+        // An array [module_name => module_output] will be returned
         $hook = Hook::exec('actionCartSummary', $summary, null, true);
         if (is_array($hook)) {
             $summary = array_merge($summary, (array) array_shift($hook));
diff --git a/classes/Dispatcher.php b/classes/Dispatcher.php
index 1de2dc6e3aba5..96237d67bd940 100644
--- a/classes/Dispatcher.php
+++ b/classes/Dispatcher.php
@@ -600,6 +600,8 @@ protected function loadRoutes($id_shop = null)
          * passed routes will be the same for each language of the shop.
          *
          * Module routes can overwrite those set in $this->default_routes, if their name matches.
+         * An array [module_name => module_output] will be returned
+         * Hook call is ignoring exceptions set in the backoffice
          */
         $modules_routes = Hook::exec('moduleRoutes', ['id_shop' => $id_shop], null, true, false);
         if (is_array($modules_routes) && count($modules_routes)) {
diff --git a/classes/Hook.php b/classes/Hook.php
index 015b120101207..4ef3e1700d1f0 100644
--- a/classes/Hook.php
+++ b/classes/Hook.php
@@ -783,11 +783,11 @@ public static function disableHooksForModule(int $moduleId): void
      * @param string $hook_name Hook Name
      * @param array $hook_args Parameters for the functions
      * @param string|int|null $id_module Execute hook for this module only
-     * @param bool $array_return If specified, module output will be set by name in an array
-     * @param bool $check_exceptions Check permission exceptions
-     * @param bool $use_push Force change to be refreshed on Dashboard widgets
+     * @param bool $array_return If specified, the result will be provided in an array [module_name => module_output]
+     * @param bool $check_exceptions Check if this function should respect hook controller exceptions configured in backoffice
+     * @param bool $use_push Force change to be refreshed on Dashboard widgets (unused)
      * @param int|null $id_shop If specified, hook will be execute the shop with this ID
-     * @param bool $chain If specified, hook will chain the return of hook module
+     * @param bool $chain If specified, each module on this hook will receive the result of the previous one
      *
      * @throws PrestaShopException
      *
@@ -807,10 +807,12 @@ public static function exec(
             Tools::displayParameterAsDeprecated('use_push');
         }
 
+        // If we are in the installation phase OR the hook is disabled, it won't be executed
         if (defined('PS_INSTALLATION_IN_PROGRESS') || !self::getHookStatusByName($hook_name)) {
             return $array_return ? [] : null;
         }
 
+        // Get hook registry to collect debug information
         $hookRegistry = self::getHookRegistry();
         $isRegistryEnabled = null !== $hookRegistry;
 
@@ -824,6 +826,7 @@ public static function exec(
             $array_return = false;
         }
 
+        // Check if we should execute non native modules
         static $disable_non_native_modules = null;
         if ($disable_non_native_modules === null) {
             $disable_non_native_modules = (bool) Configuration::get('PS_DISABLE_NON_NATIVE_MODULE');
@@ -834,8 +837,8 @@ public static function exec(
             throw new PrestaShopException('Invalid id_module or hook_name');
         }
 
-        // If no modules associated to hook_name or recompatible hook name, we stop the function
-
+        // We retrieve a list of modules to be executed for the given hook.
+        // If no modules associated to hook_name or recompatible hook name, we stop the function.
         if (!$module_list = Hook::getHookModuleExecList($hook_name)) {
             if ($isRegistryEnabled) {
                 $hookRegistry->collect();
@@ -856,6 +859,7 @@ public static function exec(
         // Store list of executed hooks on this page
         Hook::$executed_hooks[$id_hook] = $hook_name;
 
+        // Enrich our arguments with some extra data we send along with it
         $context = Context::getContext();
         if (!isset($hook_args['cookie']) || !$hook_args['cookie']) {
             $hook_args['cookie'] = $context->cookie;
@@ -868,6 +872,8 @@ public static function exec(
         $altern = 0;
         $output = ($array_return) ? [] : '';
 
+        // If non native modules are disabled, we must get the list of native ones
+        // that came bundled with the store.
         if ($disable_non_native_modules && !isset(Hook::$native_module)) {
             Hook::$native_module = Module::getNativeModuleList();
         }
@@ -885,22 +891,26 @@ public static function exec(
         }
 
         foreach ($module_list as $key => $hookRegistration) {
-            // Check errors
+            // If the caller provided a specific module ID for which ONLY this hook
+            // should be executed, we check if it matches.
             if ($id_module && $id_module != $hookRegistration['id_module']) {
                 continue;
             }
 
+            // If non native modules are disabled and this module is not a native one.
             if ((bool) $disable_non_native_modules && Hook::$native_module && count(Hook::$native_module) && !in_array($hookRegistration['module'], Hook::$native_module)) {
                 continue;
             }
 
             $registeredHookId = $hookRegistration['id_hook'];
             if ($registeredHookId === $id_hook) {
-                // the module is registered to the canonical hook name
+                // The module is registered to the canonical (proper) hook name
                 $registeredHookName = $hook_name;
             } else {
-                // the module is registered to an alias
+                // The module is registered to an alias
                 $registeredHookName = static::getNameById($hookRegistration['id_hook']);
+
+                // We throw an error - aliases are deprecated.
                 trigger_error(
                     sprintf(
                         'The hook "%s" is deprecated, please use "%s" instead in module "%s".',
@@ -912,8 +922,10 @@ public static function exec(
                 );
             }
 
-            // Check permissions
+            // Check conditions to execute the module
             if ($check_exceptions) {
+                // First, we check controller exceptions configured in backoffice when setting up the hook
+                // The merchant can exclude certain hooks from certain controllers
                 $exceptions = Module::getExceptionsStatic($hookRegistration['id_module'], $hookRegistration['id_hook']);
 
                 $controller_obj = Context::getContext()->controller;
@@ -925,27 +937,32 @@ public static function exec(
                         : $controller_obj->php_self;
                 }
 
-                //check if current controller is a module controller
+                // Check if current controller is a module controller and prefix it's name if needed
+                // to standardized format
                 if (isset($controller_obj->module) && Validate::isLoadedObject($controller_obj->module)) {
                     $controller = 'module-' . $controller_obj->module->name . '-' . $controller;
                 }
 
+                // If our controller is on the list of exceptions, nothing to do here
                 if (in_array($controller, $exceptions)) {
                     continue;
                 }
 
-                //Backward compatibility of controller names
+                // Backward compatibility of controller names
                 $matching_name = [
                     'authentication' => 'auth',
                 ];
                 if (isset($matching_name[$controller]) && in_array($matching_name[$controller], $exceptions)) {
                     continue;
                 }
+
+                // If we are in the backoffice, we check if the current employee has view rights for this module
                 if (Validate::isLoadedObject($context->employee) && !Module::getPermissionStatic($hookRegistration['id_module'], 'view', $context->employee)) {
                     continue;
                 }
             }
 
+            // We check if this module is valid
             if (!($moduleInstance = Module::getInstanceByName($hookRegistration['module']))) {
                 continue;
             }
@@ -965,13 +982,12 @@ public static function exec(
 
                 if ($array_return) {
                     $output[$moduleInstance->name] = $display;
+                } elseif (true === $chain) {
+                    $output = $display;
                 } else {
-                    if (true === $chain) {
-                        $output = $display;
-                    } else {
-                        $output .= $display;
-                    }
+                    $output .= $display;
                 }
+
                 if ($isRegistryEnabled) {
                     $hookRegistry->hookedByCallback($moduleInstance, $hook_args);
                 }
@@ -985,12 +1001,10 @@ public static function exec(
 
                     if ($array_return) {
                         $output[$moduleInstance->name] = $display;
+                    } elseif (true === $chain) {
+                        $output = $display;
                     } else {
-                        if (true === $chain) {
-                            $output = $display;
-                        } else {
-                            $output .= $display;
-                        }
+                        $output .= $display;
                     }
                 }
 
diff --git a/classes/Mail.php b/classes/Mail.php
index 42c8c0b491c0f..57d1005ca9fc9 100644
--- a/classes/Mail.php
+++ b/classes/Mail.php
@@ -151,6 +151,7 @@ public static function send(
             $idShop = Context::getContext()->shop->id;
         }
 
+        // An array [module_name => module_output] will be returned
         $hookBeforeEmailResult = Hook::exec(
             'actionEmailSendBefore',
             [
@@ -462,6 +463,8 @@ function ($carry, $item) {
 
             $templateHtml = '';
             $templateTxt = '';
+
+            // An array [module_name => module_output] will be returned (no effect)
             Hook::exec(
                 'actionEmailAddBeforeContent',
                 [
@@ -481,6 +484,8 @@ function ($carry, $item) {
                     'utf-8'
                 )
             );
+
+            // An array [module_name => module_output] will be returned (no effect)
             Hook::exec(
                 'actionEmailAddAfterContent',
                 [
@@ -577,6 +582,8 @@ function ($carry, $item) {
             $templateVars['{color}'] = Tools::safeOutput(Configuration::get('PS_MAIL_COLOR', null, null, $idShop));
             // Get extra template_vars
             $extraTemplateVars = [];
+
+            // An array [module_name => module_output] will be returned (no effect)
             Hook::exec(
                 'actionGetExtraMailTemplateVars',
                 [
diff --git a/classes/Product.php b/classes/Product.php
index c5fc649a21b99..dbfd3cf88941f 100644
--- a/classes/Product.php
+++ b/classes/Product.php
@@ -6114,7 +6114,7 @@ public static function getAllCustomizedDatas($id_cart, $id_lang = null, $only_in
 
         foreach ($result as $row) {
             if ((int) $row['id_module'] && (int) $row['type'] == Product::CUSTOMIZE_TEXTFIELD) {
-                // Hook displayCustomization: Call only the module in question
+                // Hook called only for the module concerned
                 // When a module saves a customization programmatically, it should add its ID in the `id_module` column
                 $row['value'] = Hook::exec('displayCustomization', ['customization' => $row], (int) $row['id_module']);
             }
diff --git a/classes/checkout/CheckoutDeliveryStep.php b/classes/checkout/CheckoutDeliveryStep.php
index e00149391d36d..e4d80915d3ee7 100644
--- a/classes/checkout/CheckoutDeliveryStep.php
+++ b/classes/checkout/CheckoutDeliveryStep.php
@@ -200,6 +200,7 @@ protected function isModuleComplete($requestParams)
         }
 
         $isComplete = true;
+        // Hook called only for the module concerned
         Hook::exec(
             'actionValidateStepComplete',
             [
diff --git a/classes/checkout/ConditionsToApproveFinder.php b/classes/checkout/ConditionsToApproveFinder.php
index 0349983d33a28..1edf024833c02 100644
--- a/classes/checkout/ConditionsToApproveFinder.php
+++ b/classes/checkout/ConditionsToApproveFinder.php
@@ -61,6 +61,8 @@ private function getDefaultTermsAndConditions()
     private function getConditionsToApprove()
     {
         $allConditions = [];
+
+        // An array [module_name => module_output] will be returned
         $hookedConditions = Hook::exec('termsAndConditions', [], null, true);
         if (!is_array($hookedConditions)) {
             $hookedConditions = [];
diff --git a/classes/checkout/DeliveryOptionsFinder.php b/classes/checkout/DeliveryOptionsFinder.php
index 26fd271a796af..ddab5f9db7e64 100644
--- a/classes/checkout/DeliveryOptionsFinder.php
+++ b/classes/checkout/DeliveryOptionsFinder.php
@@ -125,6 +125,7 @@ public function getDeliveryOptions()
                             $carrier['extraContent'] = '';
                             if ($carrier['is_module']) {
                                 if ($moduleId = Module::getModuleIdByName($carrier['external_module_name'])) {
+                                    // Hook called only for the module concerned
                                     $carrier['extraContent'] = Hook::exec('displayCarrierExtraContent', ['carrier' => $carrier], $moduleId);
                                 }
                             }
diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index 6beedad8ab4fa..c1dee87580281 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -673,6 +673,7 @@ public function initBreadcrumbs($tab_id = null, $tabs = null)
                 break;
         }
 
+        // An array [module_name => module_output] will be returned (no effect)
         Hook::exec('actionAdminBreadcrumbModifier', ['tabs' => $tabs, 'breadcrumb' => &$breadcrumbs2], null, true);
 
         $this->context->smarty->assign([
@@ -1998,6 +1999,8 @@ public function initHeader()
 
         // Fetch Employee Menu
         $menuLinksCollections = new ActionsBarButtonsCollection();
+
+        // An array [module_name => module_output] will be returned (no effect)
         Hook::exec(
             'displayBackOfficeEmployeeMenu',
             [
@@ -2022,6 +2025,8 @@ public function initHeader()
         }
 
         $tabs = $this->getTabs();
+
+        // An array [module_name => module_output] will be returned (no effect)
         Hook::exec('actionAdminMenuTabsModifier', ['tabs' => &$tabs], null, true);
 
         $currentTabLevel = 0;
diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php
index e4d7b2d62bc24..a64603ab55c80 100644
--- a/classes/controller/FrontController.php
+++ b/classes/controller/FrontController.php
@@ -517,6 +517,7 @@ protected function assignGeneralPurposeVariables()
             'debug' => _PS_MODE_DEV_,
         ];
 
+        // An array [module_name => module_output] will be returned
         $modulesVariables = Hook::exec(
             'actionFrontControllerSetVariables',
             [
diff --git a/classes/controller/ProductListingFrontController.php b/classes/controller/ProductListingFrontController.php
index b8a4397fd3a40..d0b372f9faa70 100644
--- a/classes/controller/ProductListingFrontController.php
+++ b/classes/controller/ProductListingFrontController.php
@@ -267,6 +267,7 @@ protected function renderActiveFilters(ProductSearchResult $result)
      */
     private function getProductSearchProviderFromModules($query)
     {
+        // An array [module_name => module_output] will be returned
         $providers = Hook::exec(
             'productSearchProvider',
             ['query' => $query],
diff --git a/classes/form/CustomerAddressFormatter.php b/classes/form/CustomerAddressFormatter.php
index f08ca4ff82990..a01f0db13845d 100644
--- a/classes/form/CustomerAddressFormatter.php
+++ b/classes/form/CustomerAddressFormatter.php
@@ -147,6 +147,7 @@ public function getFormat()
         }
 
         //To add the extra fields in address form
+        // An array [module_name => module_output] will be returned
         $additionalAddressFormFields = Hook::exec('additionalCustomerAddressFields', ['fields' => &$format], null, true);
         if (is_array($additionalAddressFormFields)) {
             foreach ($additionalAddressFormFields as $moduleName => $additionnalFormFields) {
diff --git a/classes/form/CustomerForm.php b/classes/form/CustomerForm.php
index e5f37761b18fa..554ffd427a106 100644
--- a/classes/form/CustomerForm.php
+++ b/classes/form/CustomerForm.php
@@ -315,6 +315,8 @@ private function validateByModules()
         foreach ($formFieldsAssociated as $moduleName => $formFields) {
             if ($moduleId = Module::getModuleIdByName($moduleName)) {
                 // ToDo : replace Hook::exec with HookFinder, because we expect a specific class here
+                // Hook called only for the module concerned
+                // An array [module_name => module_output] will be returned
                 $validatedCustomerFormFields = Hook::exec('validateCustomerFormFields', ['fields' => $formFields], $moduleId, true);
 
                 if (!is_array($validatedCustomerFormFields)) {
diff --git a/classes/form/CustomerFormatter.php b/classes/form/CustomerFormatter.php
index eca4f35b26985..316cb5dee35af 100644
--- a/classes/form/CustomerFormatter.php
+++ b/classes/form/CustomerFormatter.php
@@ -231,6 +231,7 @@ public function getFormat()
         }
 
         // ToDo, replace the hook exec with HookFinder when the associated PR will be merged
+        // An array [module_name => module_output] will be returned
         $additionalCustomerFormFields = Hook::exec('additionalCustomerFormFields', ['fields' => &$format], null, true);
 
         if (is_array($additionalCustomerFormFields)) {
diff --git a/classes/order/OrderHistory.php b/classes/order/OrderHistory.php
index 05139b68d3cf2..7e1a722dfcc6d 100644
--- a/classes/order/OrderHistory.php
+++ b/classes/order/OrderHistory.php
@@ -101,10 +101,12 @@ public function changeIdOrderState($new_order_state, $id_order, $use_existing_pa
 
         // executes hook
         if (in_array($new_os->id, [Configuration::get('PS_OS_PAYMENT'), Configuration::get('PS_OS_WS_PAYMENT')])) {
+            // Hook called only for the shop concerned
             Hook::exec('actionPaymentConfirmation', ['id_order' => (int) $order->id], null, false, true, false, $order->id_shop);
         }
 
         // executes hook
+        // Hook called only for the shop concerned
         Hook::exec('actionOrderStatusUpdate', [
             'newOrderStatus' => $new_os,
             'oldOrderStatus' => $old_os,
@@ -415,6 +417,7 @@ public function changeIdOrderState($new_order_state, $id_order, $use_existing_pa
         }
 
         // executes hook
+        // Hook called only for the shop concerned
         Hook::exec('actionOrderStatusPostUpdate', [
             'newOrderStatus' => $new_os,
             'oldOrderStatus' => $old_os,
@@ -569,6 +572,7 @@ public function add($autodate = true, $null_values = false)
         $order->current_state = $this->id_order_state;
         $order->update();
 
+        // Hook called only for the shop concerned
         Hook::exec('actionOrderHistoryAddAfter', ['order_history' => $this], null, false, true, false, $order->id_shop);
 
         return true;
diff --git a/classes/shop/Shop.php b/classes/shop/Shop.php
index cd30a9aa9b60f..3a0a1dc3d18e3 100644
--- a/classes/shop/Shop.php
+++ b/classes/shop/Shop.php
@@ -1279,6 +1279,7 @@ public function copyShopData($old_id, $tables_import = false, $deleted = false)
         if (is_array($modules_list) && count($modules_list) > 0) {
             foreach ($modules_list as $m) {
                 if (!$tables_import || isset($tables_import['Module' . ucfirst($m['module'])])) {
+                    // Hook called only for the module concerned
                     Hook::exec('actionShopDataDuplication', [
                         'old_id_shop' => (int) $old_id,
                         'new_id_shop' => (int) $this->id,
diff --git a/classes/webservice/WebserviceRequest.php b/classes/webservice/WebserviceRequest.php
index 78596249e089a..c87befc866b97 100644
--- a/classes/webservice/WebserviceRequest.php
+++ b/classes/webservice/WebserviceRequest.php
@@ -353,6 +353,9 @@ public static function getResources()
             'product_customization_fields' => ['description' => 'Customization Field', 'class' => 'CustomizationField'],
             'customizations' => ['description' => 'Customization values', 'class' => 'Customization'],
         ];
+
+        // An array [module_name => module_output] will be returned
+        // Hook call is ignoring exceptions set in the backoffice
         $extra_resources = Hook::exec('addWebserviceResources', ['resources' => $resources], null, true, false);
         if (is_countable($extra_resources) && count($extra_resources)) {
             foreach ($extra_resources as $new_resources) {
diff --git a/controllers/admin/AdminDashboardController.php b/controllers/admin/AdminDashboardController.php
index 5fb0b20d67b55..3a125543c6059 100644
--- a/controllers/admin/AdminDashboardController.php
+++ b/controllers/admin/AdminDashboardController.php
@@ -405,6 +405,8 @@ public function ajaxProcessRefreshDashboard()
             'extra' => (int) Tools::getValue('extra'),
         ];
 
+        // Hook called only for the module concerned
+        // An array [module_name => module_output] will be returned
         die(json_encode(Hook::exec('dashboardData', $params, $id_module, true)));
     }
 
diff --git a/controllers/admin/AdminSearchController.php b/controllers/admin/AdminSearchController.php
index 9356b50d2af6f..d66fe7a770540 100644
--- a/controllers/admin/AdminSearchController.php
+++ b/controllers/admin/AdminSearchController.php
@@ -502,6 +502,7 @@ protected function getSearchPanels(string $searchedExpression): void
         );
 
         // Get additional search panels from hooks
+        // An array [module_name => module_output] will be returned
         $alternativeSearchPanelsFromModules = Hook::exec(
             'actionGetAlternativeSearchPanels',
             [
diff --git a/controllers/admin/AdminStatsTabController.php b/controllers/admin/AdminStatsTabController.php
index 0fd7031884f97..4c4b7e7694045 100644
--- a/controllers/admin/AdminStatsTabController.php
+++ b/controllers/admin/AdminStatsTabController.php
@@ -202,6 +202,7 @@ public function displayStats()
             }
 
             if ($module_instance && $module_instance->active) {
+                // Hook called only for the module concerned
                 $hook = Hook::exec('displayAdminStatsModules', [], $module_instance->id);
             }
         }
diff --git a/controllers/front/CartController.php b/controllers/front/CartController.php
index ac26bada775c2..69262e1f00cf8 100644
--- a/controllers/front/CartController.php
+++ b/controllers/front/CartController.php
@@ -332,6 +332,7 @@ protected function processDeleteProductInCart()
             'id_address_delivery' => (int) $this->id_address_delivery,
         ];
 
+        // An array [module_name => module_output] will be returned (no effect)
         Hook::exec('actionObjectProductInCartDeleteBefore', $data, null, true);
 
         if ($this->context->cart->deleteProduct(
diff --git a/controllers/front/CmsController.php b/controllers/front/CmsController.php
index b014c3b8abe49..8f86ca855428b 100644
--- a/controllers/front/CmsController.php
+++ b/controllers/front/CmsController.php
@@ -106,15 +106,16 @@ public function initContent()
         if ($this->assignCase == self::CMS_CASE_PAGE) {
             $cmsVar = $this->objectPresenter->present($this->cms);
 
+            // Chained hook call - if multiple modules are hooked here, they will receive the result of the previous one as a parameter
             $filteredCmsContent = Hook::exec(
                 'filterCmsContent',
                 ['object' => $cmsVar],
-                $id_module = null,
-                $array_return = false,
-                $check_exceptions = true,
-                $use_push = false,
-                $id_shop = null,
-                $chain = true
+                null,
+                false,
+                true,
+                false,
+                null,
+                true
             );
             if (!empty($filteredCmsContent['object'])) {
                 $cmsVar = $filteredCmsContent['object'];
@@ -135,15 +136,16 @@ public function initContent()
         } elseif ($this->assignCase == self::CMS_CASE_CATEGORY) {
             $cmsCategoryVar = $this->getTemplateVarCategoryCms();
 
+            // Chained hook call - if multiple modules are hooked here, they will receive the result of the previous one as a parameter
             $filteredCmsCategoryContent = Hook::exec(
                 'filterCmsCategoryContent',
                 ['object' => $cmsCategoryVar],
-                $id_module = null,
-                $array_return = false,
-                $check_exceptions = true,
-                $use_push = false,
-                $id_shop = null,
-                $chain = true
+                null,
+                false,
+                true,
+                false,
+                null,
+                true
             );
             if (!empty($filteredCmsCategoryContent['object'])) {
                 $cmsCategoryVar = $filteredCmsCategoryContent['object'];
diff --git a/controllers/front/OrderConfirmationController.php b/controllers/front/OrderConfirmationController.php
index 80fd07b96612b..00dbaea31b770 100644
--- a/controllers/front/OrderConfirmationController.php
+++ b/controllers/front/OrderConfirmationController.php
@@ -238,6 +238,7 @@ public function displayPaymentReturn($order)
             return false;
         }
 
+        // Hook called only for the module concerned
         return Hook::exec('displayPaymentReturn', ['order' => $order], $this->id_module);
     }
 
diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php
index 353084f9affaf..1d51827e48d68 100644
--- a/controllers/front/ProductController.php
+++ b/controllers/front/ProductController.php
@@ -420,6 +420,7 @@ public function initContent()
 
             $product_for_template = $this->getTemplateVarProduct();
 
+            // Chained hook call - if multiple modules are hooked here, they will receive the result of the previous one as a parameter
             $filteredProduct = Hook::exec(
                 'filterProductContent',
                 ['object' => $product_for_template],
diff --git a/controllers/front/SitemapController.php b/controllers/front/SitemapController.php
index 93c6d2596cf34..08cf7f98831a9 100644
--- a/controllers/front/SitemapController.php
+++ b/controllers/front/SitemapController.php
@@ -60,13 +60,7 @@ public function initContent()
          */
         Hook::exec(
             'actionModifyFrontendSitemap',
-            ['urls' => &$sitemapUrls],
-            null,
-            false,
-            true,
-            false,
-            null,
-            true
+            ['urls' => &$sitemapUrls]
         );
 
         /*
diff --git a/controllers/front/listing/CategoryController.php b/controllers/front/listing/CategoryController.php
index c5f1275ccde3c..07f6ab0bf9b3d 100644
--- a/controllers/front/listing/CategoryController.php
+++ b/controllers/front/listing/CategoryController.php
@@ -98,15 +98,16 @@ public function init()
 
         $categoryVar = $this->getTemplateVarCategory();
 
+        // Chained hook call - if multiple modules are hooked here, they will receive the result of the previous one as a parameter
         $filteredCategory = Hook::exec(
             'filterCategoryContent',
             ['object' => $categoryVar],
-            $id_module = null,
-            $array_return = false,
-            $check_exceptions = true,
-            $use_push = false,
-            $id_shop = null,
-            $chain = true
+            null,
+            false,
+            true,
+            false,
+            null,
+            true
         );
         if (!empty($filteredCategory['object'])) {
             $categoryVar = $filteredCategory['object'];
diff --git a/controllers/front/listing/ManufacturerController.php b/controllers/front/listing/ManufacturerController.php
index 8204d4f4aab85..a189a377d2676 100644
--- a/controllers/front/listing/ManufacturerController.php
+++ b/controllers/front/listing/ManufacturerController.php
@@ -147,15 +147,16 @@ protected function assignManufacturer()
     {
         $manufacturerVar = $this->objectPresenter->present($this->manufacturer);
 
+        // Chained hook call - if multiple modules are hooked here, they will receive the result of the previous one as a parameter
         $filteredManufacturer = Hook::exec(
             'filterManufacturerContent',
             ['filtered_content' => $manufacturerVar['description']],
-            $id_module = null,
-            $array_return = false,
-            $check_exceptions = true,
-            $use_push = false,
-            $id_shop = null,
-            $chain = true
+            null,
+            false,
+            true,
+            false,
+            null,
+            true
         );
         if (!empty($filteredManufacturer)) {
             $manufacturerVar['description'] = $filteredManufacturer;
@@ -175,15 +176,16 @@ protected function assignAll()
 
         if (!empty($manufacturersVar)) {
             foreach ($manufacturersVar as $k => $manufacturer) {
+                // Chained hook call - if multiple modules are hooked here, they will receive the result of the previous one as a parameter
                 $filteredManufacturer = Hook::exec(
                     'filterManufacturerContent',
                     ['filtered_content' => $manufacturer['text']],
-                    $id_module = null,
-                    $array_return = false,
-                    $check_exceptions = true,
-                    $use_push = false,
-                    $id_shop = null,
-                    $chain = true
+                    null,
+                    false,
+                    true,
+                    false,
+                    null,
+                    true
                 );
                 if (!empty($filteredManufacturer)) {
                     $manufacturersVar[$k]['text'] = $filteredManufacturer;
diff --git a/controllers/front/listing/SupplierController.php b/controllers/front/listing/SupplierController.php
index 0e4b66dc9c8d3..a125be500becf 100644
--- a/controllers/front/listing/SupplierController.php
+++ b/controllers/front/listing/SupplierController.php
@@ -147,15 +147,16 @@ protected function assignSupplier()
     {
         $supplierVar = $this->objectPresenter->present($this->supplier);
 
+        // Chained hook call - if multiple modules are hooked here, they will receive the result of the previous one as a parameter
         $filteredSupplier = Hook::exec(
             'filterSupplierContent',
             ['object' => $supplierVar],
-            $id_module = null,
-            $array_return = false,
-            $check_exceptions = true,
-            $use_push = false,
-            $id_shop = null,
-            $chain = true
+            null,
+            false,
+            true,
+            false,
+            null,
+            true
         );
         if (!empty($filteredSupplier['object'])) {
             $supplierVar = $filteredSupplier['object'];
@@ -175,15 +176,16 @@ protected function assignAll()
 
         if (!empty($suppliersVar)) {
             foreach ($suppliersVar as $k => $supplier) {
+                // Chained hook call - if multiple modules are hooked here, they will receive the result of the previous one as a parameter
                 $filteredSupplier = Hook::exec(
                     'filterSupplierContent',
                     ['object' => $supplier],
-                    $id_module = null,
-                    $array_return = false,
-                    $check_exceptions = true,
-                    $use_push = false,
-                    $id_shop = null,
-                    $chain = true
+                    null,
+                    false,
+                    true,
+                    false,
+                    null,
+                    true
                 );
                 if (!empty($filteredSupplier['object'])) {
                     $suppliersVar[$k] = $filteredSupplier['object'];
diff --git a/src/Adapter/Order/CommandHandler/CancelOrderProductHandler.php b/src/Adapter/Order/CommandHandler/CancelOrderProductHandler.php
index 32e7939d20e45..922af92451c8d 100644
--- a/src/Adapter/Order/CommandHandler/CancelOrderProductHandler.php
+++ b/src/Adapter/Order/CommandHandler/CancelOrderProductHandler.php
@@ -241,6 +241,7 @@ private function cancelProducts(Order $order, array $orderDetails)
                 $newQuantity = max((int) $orderDetail->product_quantity - (int) $qty_cancel_product, 0);
                 $orderInvoice = $orderDetail->id_order_invoice != 0 ? new OrderInvoice($orderDetail->id_order_invoice) : null;
                 $this->orderProductQuantityUpdater->update($order, $orderDetail, $newQuantity, $orderInvoice);
+                // Hook called only for the shop concerned
                 Hook::exec('actionProductCancel', ['order' => $order, 'id_order_detail' => (int) $orderDetail->id_order_detail, 'cancel_quantity' => $qty_cancel_product, 'action' => CancellationActionType::CANCEL_PRODUCT], null, false, true, false, $order->id_shop);
             }
         }
diff --git a/src/Adapter/Order/CommandHandler/IssuePartialRefundHandler.php b/src/Adapter/Order/CommandHandler/IssuePartialRefundHandler.php
index d5c4f013beec7..a5674c448e480 100644
--- a/src/Adapter/Order/CommandHandler/IssuePartialRefundHandler.php
+++ b/src/Adapter/Order/CommandHandler/IssuePartialRefundHandler.php
@@ -146,6 +146,7 @@ private function issuePartialRefund(IssuePartialRefundCommand $command, Order $o
             if ($shouldReinjectProducts) {
                 $this->reinjectQuantity($orderDetail, $productRefund['quantity']);
             }
+            // Hook called only for the shop concerned
             Hook::exec('actionProductCancel', ['order' => $order, 'id_order_detail' => (int) $orderDetailId, 'cancel_quantity' => $productRefund['quantity'], 'cancel_amount' => $productRefund['amount'], 'action' => CancellationActionType::PARTIAL_REFUND], null, false, true, false, $order->id_shop);
         }
 
diff --git a/src/Adapter/Order/CommandHandler/IssueReturnProductHandler.php b/src/Adapter/Order/CommandHandler/IssueReturnProductHandler.php
index b2cd8e6ea6f36..dc6788a815464 100644
--- a/src/Adapter/Order/CommandHandler/IssueReturnProductHandler.php
+++ b/src/Adapter/Order/CommandHandler/IssueReturnProductHandler.php
@@ -147,6 +147,7 @@ private function issueReturn(IssueReturnProductCommand $command, Order $order):
             if ($command->restockRefundedProducts()) {
                 $this->reinjectQuantity($orderDetail, $productRefund['quantity']);
             }
+            // Hook called only for the shop concerned
             Hook::exec('actionProductCancel', ['order' => $order, 'id_order_detail' => (int) $orderDetailId, 'cancel_quantity' => $productRefund['quantity'], 'action' => CancellationActionType::RETURN_PRODUCT], null, false, true, false, $order->id_shop);
         }
 
diff --git a/src/Adapter/Order/CommandHandler/IssueStandardRefundHandler.php b/src/Adapter/Order/CommandHandler/IssueStandardRefundHandler.php
index 0cbe8b99f5851..50c231d31a04f 100644
--- a/src/Adapter/Order/CommandHandler/IssueStandardRefundHandler.php
+++ b/src/Adapter/Order/CommandHandler/IssueStandardRefundHandler.php
@@ -156,6 +156,7 @@ private function issueStandardRefund(IssueStandardRefundCommand $command, Order
             $orderDetail = $orderRefundSummary->getOrderDetailById($orderDetailId);
             // For standard refund the order is necessarily NOT delivered yet, so reinjection is automatic
             $this->reinjectQuantity($orderDetail, $productRefund['quantity']);
+            // Hook called only for the shop concerned
             Hook::exec('actionProductCancel', ['order' => $order, 'id_order_detail' => (int) $orderDetailId, 'cancel_quantity' => $productRefund['quantity'], 'action' => CancellationActionType::STANDARD_REFUND], null, false, true, false, $order->id_shop);
         }
 
diff --git a/src/Adapter/Order/CommandHandler/UpdateOrderShippingDetailsHandler.php b/src/Adapter/Order/CommandHandler/UpdateOrderShippingDetailsHandler.php
index f89ebde47d834..a428edac54e9c 100644
--- a/src/Adapter/Order/CommandHandler/UpdateOrderShippingDetailsHandler.php
+++ b/src/Adapter/Order/CommandHandler/UpdateOrderShippingDetailsHandler.php
@@ -122,6 +122,7 @@ public function handle(UpdateOrderShippingDetailsCommand $command)
                 $customer = new Customer((int) $order->id_customer);
                 $carrier = new Carrier((int) $order->id_carrier, (int) $order->getAssociatedLanguage()->getId());
 
+                // Hook called only for the shop concerned
                 Hook::exec('actionAdminOrdersTrackingNumberUpdate', [
                     'order' => $order,
                     'customer' => $customer,
diff --git a/src/Adapter/Order/Refund/OrderSlipCreator.php b/src/Adapter/Order/Refund/OrderSlipCreator.php
index da8367a6cada5..acd1954351be8 100644
--- a/src/Adapter/Order/Refund/OrderSlipCreator.php
+++ b/src/Adapter/Order/Refund/OrderSlipCreator.php
@@ -104,6 +104,8 @@ public function create(
             }
 
             $fullQuantityList = array_map(function ($orderDetail) { return $orderDetail['quantity']; }, $orderRefundSummary->getProductRefunds());
+
+            // Hook called only for the shop concerned
             Hook::exec('actionOrderSlipAdd', [
                 'order' => $order,
                 'productList' => $orderRefundSummary->getProductRefunds(),
diff --git a/src/Adapter/Presenter/Object/ObjectPresenter.php b/src/Adapter/Presenter/Object/ObjectPresenter.php
index cce2bb329032c..a17536b177b5f 100644
--- a/src/Adapter/Presenter/Object/ObjectPresenter.php
+++ b/src/Adapter/Presenter/Object/ObjectPresenter.php
@@ -70,6 +70,7 @@ public function present($object)
     private function filterHtmlContent($type, &$presentedObject, $htmlFields)
     {
         if (!empty($htmlFields) && is_array($htmlFields)) {
+            // Chained hook call - if multiple modules are hooked here, they will receive the result of the previous one as a parameter
             $filteredHtml = Hook::exec(
                 'filterHtmlContent',
                 [
diff --git a/src/Core/Module/ModuleRepository.php b/src/Core/Module/ModuleRepository.php
index 84cca945fd8bd..41b881668fd6f 100644
--- a/src/Core/Module/ModuleRepository.php
+++ b/src/Core/Module/ModuleRepository.php
@@ -287,6 +287,7 @@ private function getModuleDatabaseAttributes(string $moduleName): array
     private function getModulesFromHook()
     {
         if ($this->modulesFromHook === null) {
+            // An array [module_name => module_output] will be returned
             $modulesFromHook = $this->hookManager->exec('actionListModules', [], null, true);
             $modulesFromHook = array_values($modulesFromHook ?? []);
 

From 145ffc2b54dc98215e659278590f46a0ab85ef05 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Mon, 11 Sep 2023 12:07:54 +0200
Subject: [PATCH 0935/1030] Add new test description tab

---
 .../productV2/functional/10_descriptionTab.ts | 96 +++++++++++++++++++
 1 file changed, 96 insertions(+)
 create mode 100644 tests/UI/campaigns/productV2/functional/10_descriptionTab.ts

diff --git a/tests/UI/campaigns/productV2/functional/10_descriptionTab.ts b/tests/UI/campaigns/productV2/functional/10_descriptionTab.ts
new file mode 100644
index 0000000000000..394fdcc8227f6
--- /dev/null
+++ b/tests/UI/campaigns/productV2/functional/10_descriptionTab.ts
@@ -0,0 +1,96 @@
+// Import utils
+import helper from '@utils/helpers';
+import testContext from '@utils/testContext';
+
+// Import common tests
+import loginCommon from '@commonTests/BO/loginBO';
+
+// Import pages
+import dashboardPage from '@pages/BO/dashboard';
+import productsPage from '@pages/BO/catalog/productsV2';
+import createProductsPage from '@pages/BO/catalog/productsV2/add';
+
+// Import data
+import ProductFaker from '@data/faker/product';
+
+import type {BrowserContext, Page} from 'playwright';
+import {expect} from 'chai';
+
+const baseContext: string = 'productV2_functional_descriptionTab';
+
+describe('BO - Catalog - Products : Description tab', async () => {
+  let browserContext: BrowserContext;
+  let page: Page;
+  let numberOfProducts: number = 0;
+
+  // Data to create product
+  const productData: ProductFaker = new ProductFaker({
+    name: 'hello word',
+    type: 'standard',
+    status: true,
+  });
+
+  // before and after functions
+  before(async function () {
+    browserContext = await helper.createBrowserContext(this.browser);
+    page = await helper.newTab(browserContext);
+  });
+
+  after(async () => {
+    await helper.closeBrowserContext(browserContext);
+  });
+
+  describe('Create product', async () => {
+    it('should login in BO', async function () {
+      await loginCommon.loginBO(this, page);
+    });
+
+    it('should go to \'Catalog > Products\' page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToProductsPage', baseContext);
+
+      await dashboardPage.goToSubMenu(
+        page,
+        dashboardPage.catalogParentLink,
+        dashboardPage.productsLink,
+      );
+
+      await productsPage.closeSfToolBar(page);
+
+      const pageTitle = await productsPage.getPageTitle(page);
+      await expect(pageTitle).to.contains(productsPage.pageTitle);
+    });
+
+    it('should reset filter and get number of products', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'getNumberOfProduct', baseContext);
+
+      numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
+      await expect(numberOfProducts).to.be.above(0);
+    });
+
+    it('should click on \'New product\' button and check new product modal', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'clickOnNewProductButton', baseContext);
+
+      const isModalVisible = await productsPage.clickOnNewProductButton(page);
+      await expect(isModalVisible).to.be.true;
+    });
+
+    it('should choose \'Standard product\'', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'chooseStandardProduct', baseContext);
+
+      await productsPage.selectProductType(page, productData.type);
+
+      const pageTitle = await createProductsPage.getPageTitle(page);
+      await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+    });
+
+    it('should go to new product page and set product name', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'createStandardProduct', baseContext);
+
+      await productsPage.clickOnAddNewProduct(page);
+      await createProductsPage.setProductName(page, productData.name);
+
+      const createProductMessage = await createProductsPage.saveProduct(page);
+      await expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+    });
+  });
+});

From e0787ebb8342b4f5bfd94f2c685ac8c1958055ce Mon Sep 17 00:00:00 2001
From: Jonathan Lelievre <jonathan.lelievre@prestashop.com>
Date: Mon, 11 Sep 2023 12:34:09 +0200
Subject: [PATCH 0936/1030] Add PHPdoc to reference the ADRs

---
 src/Core/Context/EmployeeContext.php                  |  3 +++
 src/Core/Context/EmployeeContextBuilder.php           |  3 +++
 src/Core/Context/ShopContext.php                      |  3 +++
 src/Core/Context/ShopContextBuilder.php               |  3 +++
 src/Core/Model/Employee.php                           |  2 ++
 src/Core/Model/EmployeeInterface.php                  |  3 +++
 src/Core/Model/Shop.php                               |  2 ++
 .../Context/Admin/EmployeeContextListener.php         |  3 +++
 .../Context/Admin/ShopContextListener.php             | 11 +++++++++++
 9 files changed, 33 insertions(+)

diff --git a/src/Core/Context/EmployeeContext.php b/src/Core/Context/EmployeeContext.php
index 812d04bf4213f..cb0db477d4f1b 100644
--- a/src/Core/Context/EmployeeContext.php
+++ b/src/Core/Context/EmployeeContext.php
@@ -30,6 +30,9 @@
 
 use PrestaShop\PrestaShop\Core\Model\EmployeeInterface;
 
+/**
+ * @experimental Depends on ADR https://github.com/PrestaShop/ADR/pull/36
+ */
 class EmployeeContext
 {
     public const SUPER_ADMIN_PROFILE_ID = 1;
diff --git a/src/Core/Context/EmployeeContextBuilder.php b/src/Core/Context/EmployeeContextBuilder.php
index 6248f25a6a4ed..c3e4216d3bf0a 100644
--- a/src/Core/Context/EmployeeContextBuilder.php
+++ b/src/Core/Context/EmployeeContextBuilder.php
@@ -31,6 +31,9 @@
 use Employee as LegacyEmployee;
 use PrestaShop\PrestaShop\Core\Model\Employee;
 
+/**
+ * @experimental Depends on ADR https://github.com/PrestaShop/ADR/pull/36
+ */
 class EmployeeContextBuilder
 {
     private ?int $employeeId = null;
diff --git a/src/Core/Context/ShopContext.php b/src/Core/Context/ShopContext.php
index 3c889bbf85fb1..176cc9c38bd56 100644
--- a/src/Core/Context/ShopContext.php
+++ b/src/Core/Context/ShopContext.php
@@ -31,6 +31,9 @@
 use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopConstraint;
 use PrestaShop\PrestaShop\Core\Model\ShopInterface;
 
+/**
+ * @experimental Depends on ADR https://github.com/PrestaShop/ADR/pull/36
+ */
 class ShopContext
 {
     public function __construct(
diff --git a/src/Core/Context/ShopContextBuilder.php b/src/Core/Context/ShopContextBuilder.php
index dcfc0d3a7b0b9..7e3635efc43b3 100644
--- a/src/Core/Context/ShopContextBuilder.php
+++ b/src/Core/Context/ShopContextBuilder.php
@@ -34,6 +34,9 @@
 use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
 use PrestaShop\PrestaShop\Core\Model\Shop;
 
+/**
+ * @experimental Depends on ADR https://github.com/PrestaShop/ADR/pull/36
+ */
 class ShopContextBuilder
 {
     private ?ShopConstraint $shopConstraint = null;
diff --git a/src/Core/Model/Employee.php b/src/Core/Model/Employee.php
index 7823648d5faa2..54e7375acdea6 100644
--- a/src/Core/Model/Employee.php
+++ b/src/Core/Model/Employee.php
@@ -30,6 +30,8 @@
 
 /**
  * Basic DTO class that implements EmployeeInterface
+ *
+ * @experimental Depends on ADR https://github.com/PrestaShop/ADR/pull/33
  */
 class Employee implements EmployeeInterface
 {
diff --git a/src/Core/Model/EmployeeInterface.php b/src/Core/Model/EmployeeInterface.php
index 417a179ad815c..489aa6ab0cad9 100644
--- a/src/Core/Model/EmployeeInterface.php
+++ b/src/Core/Model/EmployeeInterface.php
@@ -28,6 +28,9 @@
 
 namespace PrestaShop\PrestaShop\Core\Model;
 
+/**
+ * @experimental Depends on ADR https://github.com/PrestaShop/ADR/pull/33
+ */
 interface EmployeeInterface
 {
     public function getId(): int;
diff --git a/src/Core/Model/Shop.php b/src/Core/Model/Shop.php
index 018d5c6370834..18e1638d097c7 100644
--- a/src/Core/Model/Shop.php
+++ b/src/Core/Model/Shop.php
@@ -30,6 +30,8 @@
 
 /**
  * Basic DTO class that implements ShopInterface
+ *
+ * @experimental Depends on ADR https://github.com/PrestaShop/ADR/pull/33
  */
 class Shop implements ShopInterface
 {
diff --git a/src/PrestaShopBundle/EventListener/Context/Admin/EmployeeContextListener.php b/src/PrestaShopBundle/EventListener/Context/Admin/EmployeeContextListener.php
index e9d0cbdbb7a98..c3c28c6183af3 100644
--- a/src/PrestaShopBundle/EventListener/Context/Admin/EmployeeContextListener.php
+++ b/src/PrestaShopBundle/EventListener/Context/Admin/EmployeeContextListener.php
@@ -32,6 +32,9 @@
 use PrestaShop\PrestaShop\Core\Context\EmployeeContextBuilder;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
 
+/**
+ * @experimental Depends on ADR https://github.com/PrestaShop/ADR/pull/36
+ */
 class EmployeeContextListener
 {
     public function __construct(
diff --git a/src/PrestaShopBundle/EventListener/Context/Admin/ShopContextListener.php b/src/PrestaShopBundle/EventListener/Context/Admin/ShopContextListener.php
index 642d98188a259..c1ce733230bf7 100644
--- a/src/PrestaShopBundle/EventListener/Context/Admin/ShopContextListener.php
+++ b/src/PrestaShopBundle/EventListener/Context/Admin/ShopContextListener.php
@@ -35,6 +35,9 @@
 use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopConstraint;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
 
+/**
+ * @experimental Depends on ADR https://github.com/PrestaShop/ADR/pull/36
+ */
 class ShopContextListener
 {
     public function __construct(
@@ -82,6 +85,14 @@ public function onKernelRequest(RequestEvent $event): void
         }
     }
 
+    /**
+     * Get shop context from the legacy cookie, the value of Cookie::shopContext looks like this:
+     *  s-1 -> Single shop with shop ID 1
+     *  g-2 -> Shop group with shop group ID 2
+     *  empty/other values: All Shops
+     *
+     * @return ShopConstraint|null
+     */
     private function getShopConstraintFromCookie(): ?ShopConstraint
     {
         if (empty($this->legacyContext->getContext()->cookie->shopContext)) {

From 3bf0e536c8ed88337082212578c551ceec98d7cd Mon Sep 17 00:00:00 2001
From: Hlavtox <daniel.hlavacek@hotmail.cz>
Date: Sun, 10 Sep 2023 14:38:54 +0200
Subject: [PATCH 0937/1030] Use softDelete method

---
 classes/Address.php           | 4 +---
 classes/Currency.php          | 4 +---
 classes/tax/Tax.php           | 4 +---
 classes/tax/TaxRulesGroup.php | 4 +---
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/classes/Address.php b/classes/Address.php
index 9cfe4fa467ce9..6a5f424d8170c 100644
--- a/classes/Address.php
+++ b/classes/Address.php
@@ -251,9 +251,7 @@ public function delete()
 
             return parent::delete();
         } else {
-            $this->deleted = true;
-
-            return $this->update();
+            return $this->softDelete();
         }
     }
 
diff --git a/classes/Currency.php b/classes/Currency.php
index 13d5d47a029dc..c402769168cf0 100644
--- a/classes/Currency.php
+++ b/classes/Currency.php
@@ -480,12 +480,10 @@ public function delete()
             Configuration::updateValue('PS_CURRENCY_DEFAULT', $result['id_currency']);
         }
 
-        $this->deleted = true;
-
         // Remove currency restrictions
         $res = Db::getInstance()->delete('module_currency', 'id_currency = ' . (int) $this->id);
 
-        return $res && $this->update();
+        return $res && $this->softDelete();
     }
 
     /**
diff --git a/classes/tax/Tax.php b/classes/tax/Tax.php
index 42dd110330d96..eadf2fee7af24 100644
--- a/classes/tax/Tax.php
+++ b/classes/tax/Tax.php
@@ -81,9 +81,7 @@ public function delete()
      */
     public function historize()
     {
-        $this->deleted = true;
-
-        return parent::update();
+        return $this->softDelete();
     }
 
     public function update($null_values = false)
diff --git a/classes/tax/TaxRulesGroup.php b/classes/tax/TaxRulesGroup.php
index ad2373db6594c..78baf15a0a7c0 100644
--- a/classes/tax/TaxRulesGroup.php
+++ b/classes/tax/TaxRulesGroup.php
@@ -93,9 +93,7 @@ public function update($null_values = false)
      */
     public function historize(TaxRulesGroup $tax_rules_group)
     {
-        $this->deleted = true;
-
-        return parent::update() &&
+        return $this->softDelete() &&
         Db::getInstance()->execute('
 		INSERT INTO ' . _DB_PREFIX_ . 'tax_rule
 		(id_tax_rules_group, id_country, id_state, zipcode_from, zipcode_to, id_tax, behavior, description)

From 80939ee197dacd0878785ee9b5f7d0615d723f5f Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Mon, 11 Sep 2023 15:31:02 +0200
Subject: [PATCH 0938/1030] Fix typeScript check

---
 tests/UI/pages/BO/catalog/productsV2/add/index.ts | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/tests/UI/pages/BO/catalog/productsV2/add/index.ts b/tests/UI/pages/BO/catalog/productsV2/add/index.ts
index 652c55f536c6b..2ab2822e80e9e 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/index.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/index.ts
@@ -43,7 +43,7 @@ class CreateProduct extends BOBasePage {
 
   private readonly productTypePreviewLabel: string;
 
-  private readonly productActiveSwitchButton: (status: number) => string;
+  private readonly productActiveSwitchButton: string;
 
   private readonly productActiveSwitchButtonToggleInput: string;
 
@@ -119,7 +119,6 @@ class CreateProduct extends BOBasePage {
     this.productTypePreview = '.product-type-preview';
     this.productTypePreviewLabel = `${this.productTypePreview}-label`;
     this.productTypeLabel = '.product-type-preview-label';
-    this.productActiveSwitchButton = (status: number) => `#product_header_active_${status}`;
     this.productHeaderSummary = '.product-header-summary';
     this.productHeaderTaxExcluded = `${this.productHeaderSummary} div[data-role=price-tax-excluded]`;
     this.productHeaderTaxIncluded = `${this.productHeaderSummary} div[data-role=price-tax-included]`;
@@ -478,15 +477,6 @@ class CreateProduct extends BOBasePage {
   async getProductName(page: Page, locale: string = 'en'): Promise<string> {
     return this.getAttributeContent(page, this.productNameInput(locale), 'value');
   }
-
-  /**
-   * Get product status
-   * @param page {Page} Browser tab
-   * @returns {Promise<boolean>}
-   */
-  async getProductStatus(page: Page): Promise<boolean> {
-    return this.isChecked(page, this.productActiveSwitchButton(1));
-  }
 }
 
 export default new CreateProduct();

From e36afbf3631fdeda5e9ee6e8fd6e37f93dc46fd5 Mon Sep 17 00:00:00 2001
From: Morgan Pichat <morgan.pichat@prestashop.com>
Date: Mon, 11 Sep 2023 16:33:55 +0200
Subject: [PATCH 0939/1030] Add condition for initCarrierSelector

---
 admin-dev/themes/new-theme/js/pages/product/edit/index.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/admin-dev/themes/new-theme/js/pages/product/edit/index.ts b/admin-dev/themes/new-theme/js/pages/product/edit/index.ts
index 1f1b165c39c26..d18b076acfc15 100644
--- a/admin-dev/themes/new-theme/js/pages/product/edit/index.ts
+++ b/admin-dev/themes/new-theme/js/pages/product/edit/index.ts
@@ -121,7 +121,10 @@ $(() => {
   // From here we init component specific to edition
   initDropzone(ProductMap.dropzoneImagesContainer);
   initImagesShopAssociation(ProductMap.manageShopImagesButtonContainer, shopId);
-  initCarrierSelector(ProductMap.shipping.carrierSelectorContainer, eventEmitter);
+
+  if (productType !== ProductConst.PRODUCT_TYPE.VIRTUAL) {
+    initCarrierSelector(ProductMap.shipping.carrierSelectorContainer, eventEmitter);
+  }
 
   new FeatureValuesManager(eventEmitter);
   new CustomizationsManager();

From b93d40b9bf251445d403cdc3fb4baceb9fdb89d5 Mon Sep 17 00:00:00 2001
From: jevgenijvisockij <jevgenij.visockij@gmail.com>
Date: Wed, 28 Jun 2023 09:40:34 +0300
Subject: [PATCH 0940/1030] creating attribute type

---
 admin-dev/themes/default/package-lock.json    | 11599 +------------
 .../js/pages/attribute-group/index.ts         |     9 +
 admin-dev/themes/new-theme/package-lock.json  | 14466 +---------------
 .../AddAttributeGroupHandler.php              |    70 +
 .../EditAttributeGroupHandler.php             |    70 +
 .../GetAttributeGroupForEditingHandler.php    |    85 +
 .../Command/AddAttributeGroupCommand.php      |   120 +
 .../Command/EditAttributeGroupCommand.php     |   135 +
 .../AddAttributeGroupHandlerInterface.php     |    43 +
 .../EditAttributeGroupHandlerInterface.php    |    41 +
 .../AttributeGroupConstraintException.php     |    12 +
 .../Exception/AttributeGroupException.php     |     4 +-
 .../CannotAddAttributeGroupException.php      |    33 +
 .../CannotUpdateAttributeGroupException.php   |    33 +
 .../InvalidAttributeGroupIdException.php      |    33 +
 .../Query/GetAttributeGroupForEditing.php     |    58 +
 ...tributeGroupForEditingHandlerInterface.php |    43 +
 .../QueryResult/EditableAttributeGroup.php    |   123 +
 .../ValueObject/AttributeGroupId.php          |    40 +-
 .../AttributeGroupFormDataHandler.php         |    86 +
 .../AttributeGroupFormDataProvider.php        |    70 +
 .../Sell/Catalog/AttributeController.php      |    32 +
 .../Sell/Catalog/AttributeGroupController.php |    90 +-
 .../Admin/Sell/Catalog/AttributeGroupType.php |   134 +
 .../Form/Admin/Sell/Catalog/AttributeType.php |    84 +
 .../admin/sell/catalog/attribute_group.yml    |     2 +-
 .../services/adapter/attribute_group.yml      |    23 +
 .../config/services/bundle/form/form_type.yml |     9 +
 .../services/core/form/form_builder.yml       |    15 +
 .../services/core/form/form_data_handler.yml  |     3 +
 .../services/core/form/form_data_provider.yml |     5 +
 .../services/core/form/form_handler.yml       |     6 +
 .../AttributeGroup/Blocks/form.html.twig      |    53 +
 .../Blocks/form_javascripts.html.twig         |    28 +
 .../Catalog/AttributeGroup/create.html.twig   |    40 +
 .../Catalog/AttributeGroup/edit.html.twig     |    40 +
 themes/package-lock.json                      |  5306 +-----
 37 files changed, 1791 insertions(+), 31252 deletions(-)
 create mode 100644 src/Adapter/AttributeGroup/CommandHandler/AddAttributeGroupHandler.php
 create mode 100644 src/Adapter/AttributeGroup/CommandHandler/EditAttributeGroupHandler.php
 create mode 100644 src/Adapter/AttributeGroup/QueryHandler/GetAttributeGroupForEditingHandler.php
 create mode 100644 src/Core/Domain/AttributeGroup/Command/AddAttributeGroupCommand.php
 create mode 100644 src/Core/Domain/AttributeGroup/Command/EditAttributeGroupCommand.php
 create mode 100644 src/Core/Domain/AttributeGroup/CommandHandler/AddAttributeGroupHandlerInterface.php
 create mode 100644 src/Core/Domain/AttributeGroup/CommandHandler/EditAttributeGroupHandlerInterface.php
 create mode 100644 src/Core/Domain/AttributeGroup/Exception/CannotAddAttributeGroupException.php
 create mode 100644 src/Core/Domain/AttributeGroup/Exception/CannotUpdateAttributeGroupException.php
 create mode 100644 src/Core/Domain/AttributeGroup/Exception/InvalidAttributeGroupIdException.php
 create mode 100644 src/Core/Domain/AttributeGroup/Query/GetAttributeGroupForEditing.php
 create mode 100644 src/Core/Domain/AttributeGroup/QueryHandler/GetAttributeGroupForEditingHandlerInterface.php
 create mode 100644 src/Core/Domain/AttributeGroup/QueryResult/EditableAttributeGroup.php
 create mode 100644 src/Core/Form/IdentifiableObject/DataHandler/AttributeGroupFormDataHandler.php
 create mode 100644 src/Core/Form/IdentifiableObject/DataProvider/AttributeGroupFormDataProvider.php
 create mode 100644 src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeGroupType.php
 create mode 100644 src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeType.php
 create mode 100644 src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/Blocks/form.html.twig
 create mode 100644 src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/Blocks/form_javascripts.html.twig
 create mode 100644 src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/create.html.twig
 create mode 100644 src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/edit.html.twig

diff --git a/admin-dev/themes/default/package-lock.json b/admin-dev/themes/default/package-lock.json
index abbc3faabfb0c..50b5e2dddaae3 100644
--- a/admin-dev/themes/default/package-lock.json
+++ b/admin-dev/themes/default/package-lock.json
@@ -1,11520 +1,8 @@
 {
   "name": "default",
   "version": "1.7.5",
-  "lockfileVersion": 2,
+  "lockfileVersion": 1,
   "requires": true,
-  "packages": {
-    "": {
-      "name": "default",
-      "version": "1.7.5",
-      "license": "OSL-3.0",
-      "dependencies": {
-        "@openfonts/ubuntu-condensed_latin": "^1.44.2",
-        "open-sans-fonts": "^1.6.2",
-        "perfect-scrollbar": "^1.4.0",
-        "prestakit": "^1.2.5",
-        "vazirmatn": "32.102.0"
-      },
-      "devDependencies": {
-        "@babel/core": "^7.0.0-rc.1",
-        "@babel/preset-env": "^7.0.0-rc.1",
-        "babel-eslint": "^10.1.0",
-        "babel-loader": "^8.0.2",
-        "bourbon": "^4.3.4",
-        "clean-webpack-plugin": "^2.0.2",
-        "css-loader": "^6.7.1",
-        "csso-webpack-plugin": "^2.0.0-beta.3",
-        "eslint": "^8.18.0",
-        "eslint-config-airbnb-base": "^15.0.0",
-        "eslint-import-resolver-webpack": "^0.12.1",
-        "eslint-plugin-html": "^6.0.0",
-        "eslint-plugin-import": "^2.20.0",
-        "html-webpack-plugin": "^5.5.0",
-        "material-design-icons-iconfont": "^6.7.0",
-        "mini-css-extract-plugin": "^1.6.1",
-        "path": "^0.12.7",
-        "postcss": "^8.4.4",
-        "postcss-cssnext": "^3.1.0",
-        "postcss-loader": "^5.3.0",
-        "sass-embedded": "^1.55.0",
-        "sass-loader": "^13.0.2",
-        "style-loader": "^1.1.3",
-        "stylelint": "^14.5.3",
-        "stylelint-config-prestashop": "^1.0.5",
-        "terser-webpack-plugin": "^5.2.5",
-        "webpack": "^5.53.0",
-        "webpack-cli": "^4.7.0",
-        "webpack-font-preload-plugin": "^1.5.0",
-        "webpack-license-plugin": "^4.2.1",
-        "webpack-remove-empty-scripts": "^0.7.3"
-      }
-    },
-    "node_modules/@ampproject/remapping": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.1.2.tgz",
-      "integrity": "sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/code-frame": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-      "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/compat-data": {
-      "version": "7.17.7",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.7.tgz",
-      "integrity": "sha512-p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/core": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.9.tgz",
-      "integrity": "sha512-5ug+SfZCpDAkVp9SFIZAzlW18rlzsOcJGaetCjkySnrXXDUw9AR8cDUm1iByTmdWM6yxX6/zycaV76w3YTF2gw==",
-      "dev": true,
-      "dependencies": {
-        "@ampproject/remapping": "^2.1.0",
-        "@babel/code-frame": "^7.16.7",
-        "@babel/generator": "^7.17.9",
-        "@babel/helper-compilation-targets": "^7.17.7",
-        "@babel/helper-module-transforms": "^7.17.7",
-        "@babel/helpers": "^7.17.9",
-        "@babel/parser": "^7.17.9",
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.17.9",
-        "@babel/types": "^7.17.0",
-        "convert-source-map": "^1.7.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.1",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/babel"
-      }
-    },
-    "node_modules/@babel/generator": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.9.tgz",
-      "integrity": "sha512-rAdDousTwxbIxbz5I7GEQ3lUip+xVCXooZNbsydCWs3xA7ZsYOv+CFRdzGxRX78BmQHu9B1Eso59AOZQOJDEdQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.17.0",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
-      "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz",
-      "integrity": "sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-explode-assignable-expression": "^7.16.7",
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.17.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz",
-      "integrity": "sha512-UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.17.7",
-        "@babel/helper-validator-option": "^7.16.7",
-        "browserslist": "^4.17.5",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.9.tgz",
-      "integrity": "sha512-kUjip3gruz6AJKOq5i3nC6CoCEEF/oHH3cp6tOZhB+IyyyPyW0g1Gfsxn3mkk6S08pIA2y8GQh609v9G/5sHVQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-function-name": "^7.17.9",
-        "@babel/helper-member-expression-to-functions": "^7.17.7",
-        "@babel/helper-optimise-call-expression": "^7.16.7",
-        "@babel/helper-replace-supers": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.17.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz",
-      "integrity": "sha512-awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "regexpu-core": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz",
-      "integrity": "sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-compilation-targets": "^7.13.0",
-        "@babel/helper-module-imports": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/traverse": "^7.13.0",
-        "debug": "^4.1.1",
-        "lodash.debounce": "^4.0.8",
-        "resolve": "^1.14.2",
-        "semver": "^6.1.2"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.4.0-0"
-      }
-    },
-    "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz",
-      "integrity": "sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-explode-assignable-expression": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz",
-      "integrity": "sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-function-name": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
-      "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.16.7",
-        "@babel/types": "^7.17.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
-      "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.17.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz",
-      "integrity": "sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.17.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-module-imports": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
-      "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms": {
-      "version": "7.17.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz",
-      "integrity": "sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-module-imports": "^7.16.7",
-        "@babel/helper-simple-access": "^7.17.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.17.3",
-        "@babel/types": "^7.17.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz",
-      "integrity": "sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz",
-      "integrity": "sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz",
-      "integrity": "sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-wrap-function": "^7.16.8",
-        "@babel/types": "^7.16.8"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-replace-supers": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz",
-      "integrity": "sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-member-expression-to-functions": "^7.16.7",
-        "@babel/helper-optimise-call-expression": "^7.16.7",
-        "@babel/traverse": "^7.16.7",
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-simple-access": {
-      "version": "7.17.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz",
-      "integrity": "sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.17.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz",
-      "integrity": "sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.16.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
-      "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-option": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
-      "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-wrap-function": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz",
-      "integrity": "sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-function-name": "^7.16.7",
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.16.8",
-        "@babel/types": "^7.16.8"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helpers": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.9.tgz",
-      "integrity": "sha512-cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.17.9",
-        "@babel/types": "^7.17.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",
-      "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/parser": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.9.tgz",
-      "integrity": "sha512-vqUSBLP8dQHFPdPi9bc5GK9vRkYHJ49fsZdtoJ8EQ8ibpwk5rPKfvNIwChB0KVXcIjcepEBBd2VHC5r9Gy8ueg==",
-      "dev": true,
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz",
-      "integrity": "sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz",
-      "integrity": "sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
-        "@babel/plugin-proposal-optional-chaining": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.13.0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz",
-      "integrity": "sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-remap-async-to-generator": "^7.16.8",
-        "@babel/plugin-syntax-async-generators": "^7.8.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-class-properties": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz",
-      "integrity": "sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-class-static-block": {
-      "version": "7.17.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.17.6.tgz",
-      "integrity": "sha512-X/tididvL2zbs7jZCeeRJ8167U/+Ac135AM6jCAx6gYXDUviZV5Ku9UDvWS2NCuWlFjIRXklYhwo6HhAC7ETnA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.17.6",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.12.0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-dynamic-import": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz",
-      "integrity": "sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-export-namespace-from": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz",
-      "integrity": "sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-json-strings": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz",
-      "integrity": "sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-json-strings": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-logical-assignment-operators": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz",
-      "integrity": "sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz",
-      "integrity": "sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-numeric-separator": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz",
-      "integrity": "sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.17.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.17.3.tgz",
-      "integrity": "sha512-yuL5iQA/TbZn+RGAfxQXfi7CNLmKi1f8zInn4IgobuCWcAb7i+zj4TYzQ9l8cEzVyJ89PDGuqxK1xZpUDISesw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.17.0",
-        "@babel/helper-compilation-targets": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz",
-      "integrity": "sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-optional-chaining": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz",
-      "integrity": "sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-private-methods": {
-      "version": "7.16.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz",
-      "integrity": "sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.16.10",
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-private-property-in-object": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz",
-      "integrity": "sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-create-class-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz",
-      "integrity": "sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-async-generators": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-class-properties": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-class-static-block": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
-      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-dynamic-import": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
-      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-export-namespace-from": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
-      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-json-strings": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-numeric-separator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-object-rest-spread": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-optional-chaining": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-private-property-in-object": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
-      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-top-level-await": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
-      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz",
-      "integrity": "sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz",
-      "integrity": "sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-imports": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-remap-async-to-generator": "^7.16.8"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz",
-      "integrity": "sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz",
-      "integrity": "sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz",
-      "integrity": "sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-function-name": "^7.16.7",
-        "@babel/helper-optimise-call-expression": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-replace-supers": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "globals": "^11.1.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz",
-      "integrity": "sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.17.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.7.tgz",
-      "integrity": "sha512-XVh0r5yq9sLR4vZ6eVZe8FKfIcSgaTBxVBRSYokRj2qksf6QerYnTxz9/GTuKTH/n/HwLP7t6gtlybHetJ/6hQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz",
-      "integrity": "sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz",
-      "integrity": "sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz",
-      "integrity": "sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz",
-      "integrity": "sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz",
-      "integrity": "sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-compilation-targets": "^7.16.7",
-        "@babel/helper-function-name": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz",
-      "integrity": "sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz",
-      "integrity": "sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz",
-      "integrity": "sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-transforms": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.9.tgz",
-      "integrity": "sha512-2TBFd/r2I6VlYn0YRTz2JdazS+FoUuQ2rIFHoAxtyP/0G3D82SBLaRq9rnUkpqlLg03Byfl/+M32mpxjO6KaPw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-transforms": "^7.17.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-simple-access": "^7.17.7",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.17.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.17.8.tgz",
-      "integrity": "sha512-39reIkMTUVagzgA5x88zDYXPCMT6lcaRKs1+S9K6NKBPErbgO/w/kP8GlNQTC87b412ZTlmNgr3k2JrWgHH+Bw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-hoist-variables": "^7.16.7",
-        "@babel/helper-module-transforms": "^7.17.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz",
-      "integrity": "sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-transforms": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz",
-      "integrity": "sha512-j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz",
-      "integrity": "sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz",
-      "integrity": "sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-replace-supers": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz",
-      "integrity": "sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz",
-      "integrity": "sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.17.9.tgz",
-      "integrity": "sha512-Lc2TfbxR1HOyn/c6b4Y/b6NHoTb67n/IoWLxTu4kC7h4KQnWlhCq2S8Tx0t2SVvv5Uu87Hs+6JEJ5kt2tYGylQ==",
-      "dev": true,
-      "dependencies": {
-        "regenerator-transform": "^0.15.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz",
-      "integrity": "sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz",
-      "integrity": "sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz",
-      "integrity": "sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz",
-      "integrity": "sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz",
-      "integrity": "sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz",
-      "integrity": "sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz",
-      "integrity": "sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz",
-      "integrity": "sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/preset-env": {
-      "version": "7.16.11",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.11.tgz",
-      "integrity": "sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.16.8",
-        "@babel/helper-compilation-targets": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-validator-option": "^7.16.7",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.16.7",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.16.7",
-        "@babel/plugin-proposal-async-generator-functions": "^7.16.8",
-        "@babel/plugin-proposal-class-properties": "^7.16.7",
-        "@babel/plugin-proposal-class-static-block": "^7.16.7",
-        "@babel/plugin-proposal-dynamic-import": "^7.16.7",
-        "@babel/plugin-proposal-export-namespace-from": "^7.16.7",
-        "@babel/plugin-proposal-json-strings": "^7.16.7",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.16.7",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7",
-        "@babel/plugin-proposal-numeric-separator": "^7.16.7",
-        "@babel/plugin-proposal-object-rest-spread": "^7.16.7",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.16.7",
-        "@babel/plugin-proposal-optional-chaining": "^7.16.7",
-        "@babel/plugin-proposal-private-methods": "^7.16.11",
-        "@babel/plugin-proposal-private-property-in-object": "^7.16.7",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.16.7",
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-class-properties": "^7.12.13",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
-        "@babel/plugin-syntax-top-level-await": "^7.14.5",
-        "@babel/plugin-transform-arrow-functions": "^7.16.7",
-        "@babel/plugin-transform-async-to-generator": "^7.16.8",
-        "@babel/plugin-transform-block-scoped-functions": "^7.16.7",
-        "@babel/plugin-transform-block-scoping": "^7.16.7",
-        "@babel/plugin-transform-classes": "^7.16.7",
-        "@babel/plugin-transform-computed-properties": "^7.16.7",
-        "@babel/plugin-transform-destructuring": "^7.16.7",
-        "@babel/plugin-transform-dotall-regex": "^7.16.7",
-        "@babel/plugin-transform-duplicate-keys": "^7.16.7",
-        "@babel/plugin-transform-exponentiation-operator": "^7.16.7",
-        "@babel/plugin-transform-for-of": "^7.16.7",
-        "@babel/plugin-transform-function-name": "^7.16.7",
-        "@babel/plugin-transform-literals": "^7.16.7",
-        "@babel/plugin-transform-member-expression-literals": "^7.16.7",
-        "@babel/plugin-transform-modules-amd": "^7.16.7",
-        "@babel/plugin-transform-modules-commonjs": "^7.16.8",
-        "@babel/plugin-transform-modules-systemjs": "^7.16.7",
-        "@babel/plugin-transform-modules-umd": "^7.16.7",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.16.8",
-        "@babel/plugin-transform-new-target": "^7.16.7",
-        "@babel/plugin-transform-object-super": "^7.16.7",
-        "@babel/plugin-transform-parameters": "^7.16.7",
-        "@babel/plugin-transform-property-literals": "^7.16.7",
-        "@babel/plugin-transform-regenerator": "^7.16.7",
-        "@babel/plugin-transform-reserved-words": "^7.16.7",
-        "@babel/plugin-transform-shorthand-properties": "^7.16.7",
-        "@babel/plugin-transform-spread": "^7.16.7",
-        "@babel/plugin-transform-sticky-regex": "^7.16.7",
-        "@babel/plugin-transform-template-literals": "^7.16.7",
-        "@babel/plugin-transform-typeof-symbol": "^7.16.7",
-        "@babel/plugin-transform-unicode-escapes": "^7.16.7",
-        "@babel/plugin-transform-unicode-regex": "^7.16.7",
-        "@babel/preset-modules": "^0.1.5",
-        "@babel/types": "^7.16.8",
-        "babel-plugin-polyfill-corejs2": "^0.3.0",
-        "babel-plugin-polyfill-corejs3": "^0.5.0",
-        "babel-plugin-polyfill-regenerator": "^0.3.0",
-        "core-js-compat": "^3.20.2",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/preset-modules": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
-      "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
-        "@babel/plugin-transform-dotall-regex": "^7.4.4",
-        "@babel/types": "^7.4.4",
-        "esutils": "^2.0.2"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/runtime": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.9.tgz",
-      "integrity": "sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==",
-      "dev": true,
-      "dependencies": {
-        "regenerator-runtime": "^0.13.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/runtime/node_modules/regenerator-runtime": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
-      "dev": true
-    },
-    "node_modules/@babel/template": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-      "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/parser": "^7.16.7",
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/traverse": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.9.tgz",
-      "integrity": "sha512-PQO8sDIJ8SIwipTPiR71kJQCKQYB5NGImbOviK8K+kg5xkNSYXLBupuX9QhatFowrsvo9Hj8WgArg3W7ijNAQw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/generator": "^7.17.9",
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-function-name": "^7.17.9",
-        "@babel/helper-hoist-variables": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "@babel/parser": "^7.17.9",
-        "@babel/types": "^7.17.0",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/types": {
-      "version": "7.17.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz",
-      "integrity": "sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "to-fast-properties": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@discoveryjs/json-ext": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
-      "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/@eslint/eslintrc": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz",
-      "integrity": "sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^9.4.0",
-        "globals": "^13.15.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
-        "strip-json-comments": "^3.1.1"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.18.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.18.0.tgz",
-      "integrity": "sha512-/mR4KI8Ps2spmoc0Ulu9L7agOF0du1CZNQ3dke8yItYlyKNmGrkONemBbd6V8UTc1Wgcqn21t3WYB7dbRmh6/A==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.7",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.7.tgz",
-      "integrity": "sha512-kBbPWzN8oVMLb0hOUYXhmxggL/1cJE6ydvjDIGi9EnAGUyA7cLVKQg+d/Dsm+KZwx2czGHrCmMVLiyg8s5JPKw==",
-      "dev": true,
-      "dependencies": {
-        "@humanwhocodes/object-schema": "^1.2.1",
-        "debug": "^4.1.1",
-        "minimatch": "^3.0.5"
-      },
-      "engines": {
-        "node": ">=10.10.0"
-      }
-    },
-    "node_modules/@humanwhocodes/module-importer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
-      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.22"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/nzakas"
-      }
-    },
-    "node_modules/@humanwhocodes/object-schema": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
-      "dev": true
-    },
-    "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz",
-      "integrity": "sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.11",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz",
-      "integrity": "sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg==",
-      "dev": true
-    },
-    "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz",
-      "integrity": "sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/resolve-uri": "^3.0.3",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
-      }
-    },
-    "node_modules/@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@nodelib/fs.walk": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@openfonts/ubuntu-condensed_latin": {
-      "version": "1.44.2",
-      "resolved": "https://registry.npmjs.org/@openfonts/ubuntu-condensed_latin/-/ubuntu-condensed_latin-1.44.2.tgz",
-      "integrity": "sha512-OWBvYVl/HbYQcKNlIAg7VFMvTpKobHf5FVDIOlBp16MMTBApQVelvWYueZ41jLhrTDproTI1LjZiZBYrUz5h4g=="
-    },
-    "node_modules/@tootallnate/once": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
-      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@types/eslint": {
-      "version": "8.4.1",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.1.tgz",
-      "integrity": "sha512-GE44+DNEyxxh2Kc6ro/VkIj+9ma0pO0bwv9+uHSyBrikYOHr8zYcdPvnBOp1aw8s+CjRvuSx7CyWqRrNFQ59mA==",
-      "dev": true,
-      "dependencies": {
-        "@types/estree": "*",
-        "@types/json-schema": "*"
-      }
-    },
-    "node_modules/@types/eslint-scope": {
-      "version": "3.7.3",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz",
-      "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==",
-      "dev": true,
-      "dependencies": {
-        "@types/eslint": "*",
-        "@types/estree": "*"
-      }
-    },
-    "node_modules/@types/estree": {
-      "version": "0.0.51",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
-      "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==",
-      "dev": true
-    },
-    "node_modules/@types/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
-      "dev": true,
-      "dependencies": {
-        "@types/minimatch": "*",
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/html-minifier-terser": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
-      "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==",
-      "dev": true
-    },
-    "node_modules/@types/json-schema": {
-      "version": "7.0.11",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
-      "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
-      "dev": true
-    },
-    "node_modules/@types/json5": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
-      "dev": true
-    },
-    "node_modules/@types/minimatch": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
-      "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==",
-      "dev": true
-    },
-    "node_modules/@types/minimist": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz",
-      "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==",
-      "dev": true
-    },
-    "node_modules/@types/node": {
-      "version": "17.0.25",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.25.tgz",
-      "integrity": "sha512-wANk6fBrUwdpY4isjWrKTufkrXdu1D2YHCot2fD/DfWxF5sMrVSA+KN7ydckvaTCh0HiqX9IVl0L5/ZoXg5M7w==",
-      "dev": true
-    },
-    "node_modules/@types/normalize-package-data": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
-      "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
-      "dev": true
-    },
-    "node_modules/@types/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
-      "dev": true
-    },
-    "node_modules/@types/webpack": {
-      "version": "5.28.0",
-      "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-5.28.0.tgz",
-      "integrity": "sha512-8cP0CzcxUiFuA9xGJkfeVpqmWTk9nx6CWwamRGCj95ph1SmlRRk9KlCZ6avhCbZd4L68LvYT6l1kpdEnQXrF8w==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "tapable": "^2.2.0",
-        "webpack": "^5"
-      }
-    },
-    "node_modules/@webassemblyjs/ast": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
-      "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/helper-numbers": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1"
-      }
-    },
-    "node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
-      "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
-      "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
-      "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-numbers": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
-      "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/floating-point-hex-parser": "1.11.1",
-        "@webassemblyjs/helper-api-error": "1.11.1",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
-      "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
-      "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-buffer": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/wasm-gen": "1.11.1"
-      }
-    },
-    "node_modules/@webassemblyjs/ieee754": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
-      "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==",
-      "dev": true,
-      "dependencies": {
-        "@xtuc/ieee754": "^1.2.0"
-      }
-    },
-    "node_modules/@webassemblyjs/leb128": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
-      "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==",
-      "dev": true,
-      "dependencies": {
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@webassemblyjs/utf8": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
-      "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
-      "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-buffer": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/helper-wasm-section": "1.11.1",
-        "@webassemblyjs/wasm-gen": "1.11.1",
-        "@webassemblyjs/wasm-opt": "1.11.1",
-        "@webassemblyjs/wasm-parser": "1.11.1",
-        "@webassemblyjs/wast-printer": "1.11.1"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
-      "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/ieee754": "1.11.1",
-        "@webassemblyjs/leb128": "1.11.1",
-        "@webassemblyjs/utf8": "1.11.1"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
-      "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-buffer": "1.11.1",
-        "@webassemblyjs/wasm-gen": "1.11.1",
-        "@webassemblyjs/wasm-parser": "1.11.1"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
-      "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-api-error": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/ieee754": "1.11.1",
-        "@webassemblyjs/leb128": "1.11.1",
-        "@webassemblyjs/utf8": "1.11.1"
-      }
-    },
-    "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
-      "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@webpack-cli/configtest": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.1.1.tgz",
-      "integrity": "sha512-1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg==",
-      "dev": true,
-      "peerDependencies": {
-        "webpack": "4.x.x || 5.x.x",
-        "webpack-cli": "4.x.x"
-      }
-    },
-    "node_modules/@webpack-cli/info": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.4.1.tgz",
-      "integrity": "sha512-PKVGmazEq3oAo46Q63tpMr4HipI3OPfP7LiNOEJg963RMgT0rqheag28NCML0o3GIzA3DmxP1ZIAv9oTX1CUIA==",
-      "dev": true,
-      "dependencies": {
-        "envinfo": "^7.7.3"
-      },
-      "peerDependencies": {
-        "webpack-cli": "4.x.x"
-      }
-    },
-    "node_modules/@webpack-cli/serve": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.6.1.tgz",
-      "integrity": "sha512-gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw==",
-      "dev": true,
-      "peerDependencies": {
-        "webpack-cli": "4.x.x"
-      },
-      "peerDependenciesMeta": {
-        "webpack-dev-server": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@xtuc/ieee754": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-      "dev": true
-    },
-    "node_modules/@xtuc/long": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-      "dev": true
-    },
-    "node_modules/abab": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
-      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
-      "dev": true
-    },
-    "node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-globals": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
-      "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^7.1.1",
-        "acorn-walk": "^7.1.1"
-      }
-    },
-    "node_modules/acorn-jsx": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true,
-      "peerDependencies": {
-        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      }
-    },
-    "node_modules/acorn-walk": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
-      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-      "dev": true,
-      "dependencies": {
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6.0.0"
-      }
-    },
-    "node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
-    "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/ansis": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/ansis/-/ansis-1.3.4.tgz",
-      "integrity": "sha512-BDXljGSG4gZXmWK64bQzXkI509i5fe8aAa9+eL29e3swaWUqxvxk/XlONjw9AUrNCpQWNdy++0GX7HAhWeR9BQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.13"
-      },
-      "funding": {
-        "type": "patreon",
-        "url": "https://patreon.com/biodiscus"
-      }
-    },
-    "node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
-    },
-    "node_modules/array-differ": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz",
-      "integrity": "sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/array-find": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-find/-/array-find-1.0.0.tgz",
-      "integrity": "sha1-bI4obRHtdoMn+OYuzuhzU8o+eLg=",
-      "dev": true
-    },
-    "node_modules/array-includes": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.4.tgz",
-      "integrity": "sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1",
-        "get-intrinsic": "^1.1.1",
-        "is-string": "^1.0.7"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-union": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-      "dev": true,
-      "dependencies": {
-        "array-uniq": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-uniq": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array.prototype.flat": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
-      "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.2",
-        "es-shim-unscopables": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/arrify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/asn1.js": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
-      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "safer-buffer": "^2.1.0"
-      }
-    },
-    "node_modules/asn1.js/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/assert": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
-      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
-      "dev": true,
-      "dependencies": {
-        "object-assign": "^4.1.1",
-        "util": "0.10.3"
-      }
-    },
-    "node_modules/assert/node_modules/inherits": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-      "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
-      "dev": true
-    },
-    "node_modules/assert/node_modules/util": {
-      "version": "0.10.3",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
-      "dev": true,
-      "dependencies": {
-        "inherits": "2.0.1"
-      }
-    },
-    "node_modules/asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-      "dev": true
-    },
-    "node_modules/autoprefixer": {
-      "version": "7.2.6",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.2.6.tgz",
-      "integrity": "sha512-Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^2.11.3",
-        "caniuse-lite": "^1.0.30000805",
-        "normalize-range": "^0.1.2",
-        "num2fraction": "^1.2.2",
-        "postcss": "^6.0.17",
-        "postcss-value-parser": "^3.2.3"
-      },
-      "bin": {
-        "autoprefixer-info": "bin/autoprefixer-info"
-      }
-    },
-    "node_modules/autoprefixer/node_modules/browserslist": {
-      "version": "2.11.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz",
-      "integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==",
-      "deprecated": "Browserslist 2 could fail on reading Browserslist >3.0 config used in other tools.",
-      "dev": true,
-      "dependencies": {
-        "caniuse-lite": "^1.0.30000792",
-        "electron-to-chromium": "^1.3.30"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      }
-    },
-    "node_modules/autoprefixer/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/autoprefixer/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/babel-eslint": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.1.0.tgz",
-      "integrity": "sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==",
-      "deprecated": "babel-eslint is now @babel/eslint-parser. This package will no longer receive updates.",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/parser": "^7.7.0",
-        "@babel/traverse": "^7.7.0",
-        "@babel/types": "^7.7.0",
-        "eslint-visitor-keys": "^1.0.0",
-        "resolve": "^1.12.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "peerDependencies": {
-        "eslint": ">= 4.12.1"
-      }
-    },
-    "node_modules/babel-loader": {
-      "version": "8.2.4",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.4.tgz",
-      "integrity": "sha512-8dytA3gcvPPPv4Grjhnt8b5IIiTcq/zeXOPk4iTYI0SVXcsmuGg7JtBRDp8S9X+gJfhQ8ektjXZlDu1Bb33U8A==",
-      "dev": true,
-      "dependencies": {
-        "find-cache-dir": "^3.3.1",
-        "loader-utils": "^2.0.0",
-        "make-dir": "^3.1.0",
-        "schema-utils": "^2.6.5"
-      },
-      "engines": {
-        "node": ">= 8.9"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0",
-        "webpack": ">=2"
-      }
-    },
-    "node_modules/babel-plugin-dynamic-import-node": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
-      "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
-      "dev": true,
-      "dependencies": {
-        "object.assign": "^4.1.0"
-      }
-    },
-    "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz",
-      "integrity": "sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.13.11",
-        "@babel/helper-define-polyfill-provider": "^0.3.1",
-        "semver": "^6.1.1"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz",
-      "integrity": "sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.3.1",
-        "core-js-compat": "^3.21.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz",
-      "integrity": "sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.3.1"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/babel-runtime": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-      "dev": true,
-      "dependencies": {
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.11.0"
-      }
-    },
-    "node_modules/babel-runtime/node_modules/core-js": {
-      "version": "2.6.12",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
-      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
-      "dev": true,
-      "hasInstallScript": true
-    },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
-    },
-    "node_modules/base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/big.js": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/bn.js": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
-      "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==",
-      "dev": true
-    },
-    "node_modules/boolbase": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
-      "dev": true
-    },
-    "node_modules/bootstrap": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz",
-      "integrity": "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/twbs"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/bootstrap"
-        }
-      ],
-      "peerDependencies": {
-        "jquery": "1.9.1 - 3",
-        "popper.js": "^1.16.1"
-      }
-    },
-    "node_modules/bourbon": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/bourbon/-/bourbon-4.3.4.tgz",
-      "integrity": "sha1-TaOAAp6SwMj5dkx3lFGhNLEefMM=",
-      "dev": true
-    },
-    "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dev": true,
-      "dependencies": {
-        "fill-range": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/brorand": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
-      "dev": true
-    },
-    "node_modules/browser-process-hrtime": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
-      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
-      "dev": true
-    },
-    "node_modules/browserify-aes": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-      "dev": true,
-      "dependencies": {
-        "buffer-xor": "^1.0.3",
-        "cipher-base": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.3",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/browserify-cipher": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
-      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
-      "dev": true,
-      "dependencies": {
-        "browserify-aes": "^1.0.4",
-        "browserify-des": "^1.0.0",
-        "evp_bytestokey": "^1.0.0"
-      }
-    },
-    "node_modules/browserify-des": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
-      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
-      "dev": true,
-      "dependencies": {
-        "cipher-base": "^1.0.1",
-        "des.js": "^1.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "node_modules/browserify-rsa": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
-      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^5.0.0",
-        "randombytes": "^2.0.1"
-      }
-    },
-    "node_modules/browserify-sign": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
-      "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^5.1.1",
-        "browserify-rsa": "^4.0.1",
-        "create-hash": "^1.2.0",
-        "create-hmac": "^1.1.7",
-        "elliptic": "^6.5.3",
-        "inherits": "^2.0.4",
-        "parse-asn1": "^5.1.5",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
-      }
-    },
-    "node_modules/browserify-sign/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/browserify-sign/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/browserify-zlib": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
-      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
-      "dev": true,
-      "dependencies": {
-        "pako": "~1.0.5"
-      }
-    },
-    "node_modules/browserslist": {
-      "version": "4.20.2",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.2.tgz",
-      "integrity": "sha512-CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        }
-      ],
-      "dependencies": {
-        "caniuse-lite": "^1.0.30001317",
-        "electron-to-chromium": "^1.4.84",
-        "escalade": "^3.1.1",
-        "node-releases": "^2.0.2",
-        "picocolors": "^1.0.0"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      },
-      "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-      }
-    },
-    "node_modules/buffer": {
-      "version": "4.9.2",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
-      "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
-      "dev": true,
-      "dependencies": {
-        "base64-js": "^1.0.2",
-        "ieee754": "^1.1.4",
-        "isarray": "^1.0.0"
-      }
-    },
-    "node_modules/buffer-builder": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/buffer-builder/-/buffer-builder-0.2.0.tgz",
-      "integrity": "sha512-7VPMEPuYznPSoR21NE1zvd2Xna6c/CloiZCfcMXR1Jny6PjX0N4Nsa38zcBFo/FMK+BlA+FLKbJCQ0i2yxp+Xg==",
-      "dev": true
-    },
-    "node_modules/buffer-from": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-      "dev": true
-    },
-    "node_modules/buffer-xor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
-      "dev": true
-    },
-    "node_modules/builtin-status-codes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
-      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
-      "dev": true
-    },
-    "node_modules/call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/camel-case": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
-      "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
-      "dev": true,
-      "dependencies": {
-        "pascal-case": "^3.1.2",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/camelcase-keys": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
-      "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^5.3.1",
-        "map-obj": "^4.0.0",
-        "quick-lru": "^4.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/caniuse-lite": {
-      "version": "1.0.30001332",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001332.tgz",
-      "integrity": "sha512-10T30NYOEQtN6C11YGg411yebhvpnC6Z102+B95eAsN0oB6KUs01ivE8u+G6FMIRtIrVlYXhL+LUwQ3/hXwDWw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
-        }
-      ]
-    },
-    "node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/chrome-trace-event": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
-      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
-    "node_modules/cipher-base": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/clean-css": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.0.tgz",
-      "integrity": "sha512-YYuuxv4H/iNb1Z/5IbMRoxgrzjWGhOEFfd+groZ5dMCVkpENiMZmwspdrzBo9286JjM1gZJPAyL7ZIdzuvu2AQ==",
-      "dev": true,
-      "dependencies": {
-        "source-map": "~0.6.0"
-      },
-      "engines": {
-        "node": ">= 10.0"
-      }
-    },
-    "node_modules/clean-css/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/clean-webpack-plugin": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-2.0.2.tgz",
-      "integrity": "sha512-pi1111o4OBd9qvacbgs+NRqClfVPKVIc66B4d8kx6Ho/L+i9entQ/NpK600CsTYTPu3kWvKwwyKarsYMvC2xeA==",
-      "dev": true,
-      "dependencies": {
-        "del": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "webpack": "*"
-      }
-    },
-    "node_modules/clone": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/clone-deep": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
-      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
-      "dev": true,
-      "dependencies": {
-        "is-plain-object": "^2.0.4",
-        "kind-of": "^6.0.2",
-        "shallow-clone": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/clone-regexp": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz",
-      "integrity": "sha512-beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q==",
-      "dev": true,
-      "dependencies": {
-        "is-regexp": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/color": {
-      "version": "0.11.4",
-      "resolved": "https://registry.npmjs.org/color/-/color-0.11.4.tgz",
-      "integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=",
-      "dev": true,
-      "dependencies": {
-        "clone": "^1.0.2",
-        "color-convert": "^1.3.0",
-        "color-string": "^0.3.0"
-      }
-    },
-    "node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/color-string": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz",
-      "integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=",
-      "dev": true,
-      "dependencies": {
-        "color-name": "^1.0.0"
-      }
-    },
-    "node_modules/colord": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.2.tgz",
-      "integrity": "sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ==",
-      "dev": true
-    },
-    "node_modules/colorette": {
-      "version": "2.0.16",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz",
-      "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==",
-      "dev": true
-    },
-    "node_modules/combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dev": true,
-      "dependencies": {
-        "delayed-stream": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/commander": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
-      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
-      "dev": true,
-      "engines": {
-        "node": ">= 12"
-      }
-    },
-    "node_modules/commondir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
-      "dev": true
-    },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
-    },
-    "node_modules/confusing-browser-globals": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
-      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
-      "dev": true
-    },
-    "node_modules/console-browserify": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
-      "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
-      "dev": true
-    },
-    "node_modules/constants-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
-      "dev": true
-    },
-    "node_modules/convert-source-map": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
-      "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "~5.1.1"
-      }
-    },
-    "node_modules/core-js": {
-      "version": "3.22.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.22.0.tgz",
-      "integrity": "sha512-8h9jBweRjMiY+ORO7bdWSeWfHhLPO7whobj7Z2Bl0IDo00C228EdGgH7FE4jGumbEjzcFfkfW8bXgdkEDhnwHQ==",
-      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
-      "dev": true,
-      "hasInstallScript": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
-    "node_modules/core-js-compat": {
-      "version": "3.22.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.22.0.tgz",
-      "integrity": "sha512-WwA7xbfRGrk8BGaaHlakauVXrlYmAIkk8PNGb1FDQS+Rbrewc3pgFfwJFRw6psmJVAll7Px9UHRYE16oRQnwAQ==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.20.2",
-        "semver": "7.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
-    "node_modules/core-js-compat/node_modules/semver": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
-      "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/core-util-is": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
-      "dev": true
-    },
-    "node_modules/cosmiconfig": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
-      "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/parse-json": "^4.0.0",
-        "import-fresh": "^3.2.1",
-        "parse-json": "^5.0.0",
-        "path-type": "^4.0.0",
-        "yaml": "^1.10.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/create-ecdh": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
-      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "elliptic": "^6.5.3"
-      }
-    },
-    "node_modules/create-ecdh/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/create-hash": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-      "dev": true,
-      "dependencies": {
-        "cipher-base": "^1.0.1",
-        "inherits": "^2.0.1",
-        "md5.js": "^1.3.4",
-        "ripemd160": "^2.0.1",
-        "sha.js": "^2.4.0"
-      }
-    },
-    "node_modules/create-hmac": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-      "dev": true,
-      "dependencies": {
-        "cipher-base": "^1.0.3",
-        "create-hash": "^1.1.0",
-        "inherits": "^2.0.1",
-        "ripemd160": "^2.0.0",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      }
-    },
-    "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dev": true,
-      "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/cross-spawn/node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/crypto-browserify": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
-      "dev": true,
-      "dependencies": {
-        "browserify-cipher": "^1.0.0",
-        "browserify-sign": "^4.0.0",
-        "create-ecdh": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.0",
-        "diffie-hellman": "^5.0.0",
-        "inherits": "^2.0.1",
-        "pbkdf2": "^3.0.3",
-        "public-encrypt": "^4.0.0",
-        "randombytes": "^2.0.0",
-        "randomfill": "^1.0.3"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/css-color-function": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/css-color-function/-/css-color-function-1.3.3.tgz",
-      "integrity": "sha1-jtJMLAIFBzM5+voAS8jBQfzLKC4=",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "0.1.0",
-        "color": "^0.11.0",
-        "debug": "^3.1.0",
-        "rgb": "~0.1.0"
-      }
-    },
-    "node_modules/css-color-function/node_modules/balanced-match": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.1.0.tgz",
-      "integrity": "sha1-tQS9BYabOSWd0MXvw12EMXbczEo=",
-      "dev": true
-    },
-    "node_modules/css-color-function/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/css-functions-list": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.0.1.tgz",
-      "integrity": "sha512-PriDuifDt4u4rkDgnqRCLnjfMatufLmWNfQnGCq34xZwpY3oabwhB9SqRBmuvWUgndbemCFlKqg+nO7C2q0SBw==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.22"
-      }
-    },
-    "node_modules/css-loader": {
-      "version": "6.7.2",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.7.2.tgz",
-      "integrity": "sha512-oqGbbVcBJkm8QwmnNzrFrWTnudnRZC+1eXikLJl0n4ljcfotgRifpg2a1lKy8jTrc4/d9A/ap1GFq1jDKG7J+Q==",
-      "dev": true,
-      "dependencies": {
-        "icss-utils": "^5.1.0",
-        "postcss": "^8.4.18",
-        "postcss-modules-extract-imports": "^3.0.0",
-        "postcss-modules-local-by-default": "^4.0.0",
-        "postcss-modules-scope": "^3.0.0",
-        "postcss-modules-values": "^4.0.0",
-        "postcss-value-parser": "^4.2.0",
-        "semver": "^7.3.8"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/css-loader/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/css-loader/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/css-rule-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/css-rule-stream/-/css-rule-stream-1.1.0.tgz",
-      "integrity": "sha1-N4bnGYmD2WWibjGVfgkHjLt3BaI=",
-      "dev": true,
-      "dependencies": {
-        "css-tokenize": "^1.0.1",
-        "duplexer2": "0.0.2",
-        "ldjson-stream": "^1.2.1",
-        "through2": "^0.6.3"
-      },
-      "bin": {
-        "css-rule-stream": "index.js"
-      }
-    },
-    "node_modules/css-rule-stream/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-      "dev": true
-    },
-    "node_modules/css-rule-stream/node_modules/readable-stream": {
-      "version": "1.0.34",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-      "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/css-rule-stream/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-      "dev": true
-    },
-    "node_modules/css-rule-stream/node_modules/through2": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-      "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": ">=1.0.33-1 <1.1.0-0",
-        "xtend": ">=4.0.0 <4.1.0-0"
-      }
-    },
-    "node_modules/css-select": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
-      "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
-      "dev": true,
-      "dependencies": {
-        "boolbase": "^1.0.0",
-        "css-what": "^6.0.1",
-        "domhandler": "^4.3.1",
-        "domutils": "^2.8.0",
-        "nth-check": "^2.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
-      }
-    },
-    "node_modules/css-tokenize": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/css-tokenize/-/css-tokenize-1.0.1.tgz",
-      "integrity": "sha1-RiXLHtohwUOFi3+B1oA8HSb8FL4=",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "readable-stream": "^1.0.33"
-      }
-    },
-    "node_modules/css-tokenize/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-      "dev": true
-    },
-    "node_modules/css-tokenize/node_modules/readable-stream": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/css-tokenize/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-      "dev": true
-    },
-    "node_modules/css-tree": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
-      "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
-      "dev": true,
-      "dependencies": {
-        "mdn-data": "2.0.14",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/css-tree/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/css-unit-converter": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/css-unit-converter/-/css-unit-converter-1.1.2.tgz",
-      "integrity": "sha512-IiJwMC8rdZE0+xiEZHeru6YoONC4rfPMqGm2W85jMIbkFvv5nFTwJVFHam2eFrN6txmoUYFAFXiv8ICVeTO0MA==",
-      "dev": true
-    },
-    "node_modules/css-what": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
-      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
-      }
-    },
-    "node_modules/cssesc": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-      "dev": true,
-      "bin": {
-        "cssesc": "bin/cssesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/csso": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
-      "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
-      "dev": true,
-      "dependencies": {
-        "css-tree": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/csso-webpack-plugin": {
-      "version": "2.0.0-beta.3",
-      "resolved": "https://registry.npmjs.org/csso-webpack-plugin/-/csso-webpack-plugin-2.0.0-beta.3.tgz",
-      "integrity": "sha512-FnhgS7W1BwOduZagTLg9UjT2kvM9aiSpInm4xIDZHLuXl6/6vbOA1+DIIcbGKSjE0dWIVuDKEv1to86mN6KZ4w==",
-      "dev": true,
-      "dependencies": {
-        "@types/webpack": ">=4.0",
-        "core-js": "^3.10.1",
-        "csso": "^4.0.2",
-        "source-map": "^0.7.3",
-        "webpack-sources": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/csso-webpack-plugin/node_modules/source-map": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/cssom": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz",
-      "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==",
-      "dev": true
-    },
-    "node_modules/cssstyle": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
-      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
-      "dev": true,
-      "dependencies": {
-        "cssom": "~0.3.6"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cssstyle/node_modules/cssom": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
-      "dev": true
-    },
-    "node_modules/data-urls": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.1.tgz",
-      "integrity": "sha512-Ds554NeT5Gennfoo9KN50Vh6tpgtvYEwraYjejXnyTpu1C7oXKxdFk75REooENHE8ndTVOJuv+BEs4/J/xcozw==",
-      "dev": true,
-      "dependencies": {
-        "abab": "^2.0.3",
-        "whatwg-mimetype": "^3.0.0",
-        "whatwg-url": "^10.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/decamelize-keys": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
-      "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
-      "dev": true,
-      "dependencies": {
-        "decamelize": "^1.1.0",
-        "map-obj": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/decamelize-keys/node_modules/map-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/decimal.js": {
-      "version": "10.3.1",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz",
-      "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==",
-      "dev": true
-    },
-    "node_modules/deep-is": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
-    },
-    "node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-      "dev": true,
-      "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/del": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
-      "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/glob": "^7.1.1",
-        "globby": "^6.1.0",
-        "is-path-cwd": "^2.0.0",
-        "is-path-in-cwd": "^2.0.0",
-        "p-map": "^2.0.0",
-        "pify": "^4.0.1",
-        "rimraf": "^2.6.3"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/des.js": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
-      "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "node_modules/diffie-hellman": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "miller-rabin": "^4.0.0",
-        "randombytes": "^2.0.0"
-      }
-    },
-    "node_modules/diffie-hellman/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dev": true,
-      "dependencies": {
-        "path-type": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/doiuse": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/doiuse/-/doiuse-4.4.1.tgz",
-      "integrity": "sha512-TUpr1/YNg20IB09tZmwGCTsTQoxj8jUld/hUZprZMj8vj0VpAJySXEWCr8WMvqvgzk0/kG/FxeSMGKode4UjPg==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.16.1",
-        "caniuse-lite": "^1.0.30001179",
-        "css-rule-stream": "^1.1.0",
-        "duplexer2": "0.0.2",
-        "ldjson-stream": "^1.2.1",
-        "multimatch": "^5.0.0",
-        "postcss": "^8.2.4",
-        "source-map": "^0.7.3",
-        "through2": "^4.0.2",
-        "yargs": "^16.2.0"
-      },
-      "bin": {
-        "doiuse": "cli.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/doiuse/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/doiuse/node_modules/cliui": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^7.0.0"
-      }
-    },
-    "node_modules/doiuse/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/doiuse/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/doiuse/node_modules/source-map": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/doiuse/node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/doiuse/node_modules/y18n": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/doiuse/node_modules/yargs": {
-      "version": "16.2.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-      "dev": true,
-      "dependencies": {
-        "cliui": "^7.0.2",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.0",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^20.2.2"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/dom-converter": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
-      "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
-      "dev": true,
-      "dependencies": {
-        "utila": "~0.4"
-      }
-    },
-    "node_modules/dom-serializer": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
-      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.2.0",
-        "entities": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
-      }
-    },
-    "node_modules/dom-serializer/node_modules/entities": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
-    "node_modules/domain-browser": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
-      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4",
-        "npm": ">=1.2"
-      }
-    },
-    "node_modules/domelementtype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ]
-    },
-    "node_modules/domexception": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
-      "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
-      "dev": true,
-      "dependencies": {
-        "webidl-conversions": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/domhandler": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
-      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "^2.2.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domhandler?sponsor=1"
-      }
-    },
-    "node_modules/domutils": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-      "dev": true,
-      "dependencies": {
-        "dom-serializer": "^1.0.1",
-        "domelementtype": "^2.2.0",
-        "domhandler": "^4.2.0"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domutils?sponsor=1"
-      }
-    },
-    "node_modules/dot-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
-      "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
-      "dev": true,
-      "dependencies": {
-        "no-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/duplexer2": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-      "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "~1.1.9"
-      }
-    },
-    "node_modules/duplexer2/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-      "dev": true
-    },
-    "node_modules/duplexer2/node_modules/readable-stream": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/duplexer2/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-      "dev": true
-    },
-    "node_modules/electron-to-chromium": {
-      "version": "1.4.113",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.113.tgz",
-      "integrity": "sha512-s30WKxp27F3bBH6fA07FYL2Xm/FYnYrKpMjHr3XVCTUb9anAyZn/BeZfPWgTZGAbJeT4NxNwISSbLcYZvggPMA==",
-      "dev": true
-    },
-    "node_modules/elliptic": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
-      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.11.9",
-        "brorand": "^1.1.0",
-        "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.1",
-        "inherits": "^2.0.4",
-        "minimalistic-assert": "^1.0.1",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "node_modules/elliptic/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/emojis-list": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/enhanced-resolve": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz",
-      "integrity": "sha1-TW5omzcl+GCQknzMhs2fFjW4ni4=",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "memory-fs": "^0.2.0",
-        "tapable": "^0.1.8"
-      },
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/enhanced-resolve/node_modules/tapable": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",
-      "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/entities": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz",
-      "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
-    "node_modules/envinfo": {
-      "version": "7.8.1",
-      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz",
-      "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==",
-      "dev": true,
-      "bin": {
-        "envinfo": "dist/cli.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dev": true,
-      "dependencies": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "node_modules/es-abstract": {
-      "version": "1.19.5",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.5.tgz",
-      "integrity": "sha512-Aa2G2+Rd3b6kxEUKTF4TaW67czBLyAv3z7VOhYRU50YBx+bbsYZ9xQP4lMNazePuFlybXI0V4MruPos7qUo5fA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.1.1",
-        "get-symbol-description": "^1.0.0",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "string.prototype.trimend": "^1.0.4",
-        "string.prototype.trimstart": "^1.0.4",
-        "unbox-primitive": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/es-module-lexer": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
-      "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
-      "dev": true
-    },
-    "node_modules/es-shim-unscopables": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
-      "dev": true,
-      "dependencies": {
-        "has": "^1.0.3"
-      }
-    },
-    "node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/escodegen": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
-      "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
-      "dev": true,
-      "dependencies": {
-        "esprima": "^4.0.1",
-        "estraverse": "^5.2.0",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1"
-      },
-      "bin": {
-        "escodegen": "bin/escodegen.js",
-        "esgenerate": "bin/esgenerate.js"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "optionalDependencies": {
-        "source-map": "~0.6.1"
-      }
-    },
-    "node_modules/escodegen/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/escodegen/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/eslint": {
-      "version": "8.28.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.28.0.tgz",
-      "integrity": "sha512-S27Di+EVyMxcHiwDrFzk8dJYAaD+/5SoWKxL1ri/71CRHsnJnRDPNt2Kzj24+MT9FDupf4aqqyqPrvI8MvQ4VQ==",
-      "dev": true,
-      "dependencies": {
-        "@eslint/eslintrc": "^1.3.3",
-        "@humanwhocodes/config-array": "^0.11.6",
-        "@humanwhocodes/module-importer": "^1.0.1",
-        "@nodelib/fs.walk": "^1.2.8",
-        "ajv": "^6.10.0",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.1.1",
-        "eslint-utils": "^3.0.0",
-        "eslint-visitor-keys": "^3.3.0",
-        "espree": "^9.4.0",
-        "esquery": "^1.4.0",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "find-up": "^5.0.0",
-        "glob-parent": "^6.0.2",
-        "globals": "^13.15.0",
-        "grapheme-splitter": "^1.0.4",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "is-path-inside": "^3.0.3",
-        "js-sdsl": "^4.1.4",
-        "js-yaml": "^4.1.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
-        "regexpp": "^3.2.0",
-        "strip-ansi": "^6.0.1",
-        "strip-json-comments": "^3.1.0",
-        "text-table": "^0.2.0"
-      },
-      "bin": {
-        "eslint": "bin/eslint.js"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint-config-airbnb-base": {
-      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz",
-      "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==",
-      "dev": true,
-      "dependencies": {
-        "confusing-browser-globals": "^1.0.10",
-        "object.assign": "^4.1.2",
-        "object.entries": "^1.1.5",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "peerDependencies": {
-        "eslint": "^7.32.0 || ^8.2.0",
-        "eslint-plugin-import": "^2.25.2"
-      }
-    },
-    "node_modules/eslint-import-resolver-node": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
-      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^3.2.7",
-        "resolve": "^1.20.0"
-      }
-    },
-    "node_modules/eslint-import-resolver-node/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/eslint-import-resolver-webpack": {
-      "version": "0.12.2",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.12.2.tgz",
-      "integrity": "sha512-7Jnm4YAoNNkvqPaZkKdIHsKGmv8/uNnYC5QsXkiSodvX4XEEfH2AKOna98FK52fCDXm3q4HzuX+7pRMKkJ64EQ==",
-      "dev": true,
-      "dependencies": {
-        "array-find": "^1.0.0",
-        "debug": "^2.6.9",
-        "enhanced-resolve": "^0.9.1",
-        "find-root": "^1.1.0",
-        "has": "^1.0.3",
-        "interpret": "^1.2.0",
-        "lodash": "^4.17.15",
-        "node-libs-browser": "^1.0.0 || ^2.0.0",
-        "resolve": "^1.13.1",
-        "semver": "^5.7.1"
-      },
-      "peerDependencies": {
-        "eslint-plugin-import": ">=1.4.0",
-        "webpack": ">=1.11.0"
-      }
-    },
-    "node_modules/eslint-import-resolver-webpack/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/eslint-import-resolver-webpack/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "node_modules/eslint-import-resolver-webpack/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/eslint-module-utils": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz",
-      "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^3.2.7",
-        "find-up": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-module-utils/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/eslint-plugin-html": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-html/-/eslint-plugin-html-6.2.0.tgz",
-      "integrity": "sha512-vi3NW0E8AJombTvt8beMwkL1R/fdRWl4QSNRNMhVQKWm36/X0KF0unGNAY4mqUF06mnwVWZcIcerrCnfn9025g==",
-      "dev": true,
-      "dependencies": {
-        "htmlparser2": "^7.1.2"
-      }
-    },
-    "node_modules/eslint-plugin-import": {
-      "version": "2.26.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
-      "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
-      "dev": true,
-      "dependencies": {
-        "array-includes": "^3.1.4",
-        "array.prototype.flat": "^1.2.5",
-        "debug": "^2.6.9",
-        "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.6",
-        "eslint-module-utils": "^2.7.3",
-        "has": "^1.0.3",
-        "is-core-module": "^2.8.1",
-        "is-glob": "^4.0.3",
-        "minimatch": "^3.1.2",
-        "object.values": "^1.1.5",
-        "resolve": "^1.22.0",
-        "tsconfig-paths": "^3.14.1"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/eslint-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-      "dev": true,
-      "dependencies": {
-        "eslint-visitor-keys": "^2.0.0"
-      },
-      "engines": {
-        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      },
-      "peerDependencies": {
-        "eslint": ">=5"
-      }
-    },
-    "node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/eslint-visitor-keys": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/eslint/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/eslint/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/eslint/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/eslint-scope": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/eslint/node_modules/find-up": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.3"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/eslint/node_modules/globals": {
-      "version": "13.18.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.18.0.tgz",
-      "integrity": "sha512-/mR4KI8Ps2spmoc0Ulu9L7agOF0du1CZNQ3dke8yItYlyKNmGrkONemBbd6V8UTc1Wgcqn21t3WYB7dbRmh6/A==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/levn": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/eslint/node_modules/locate-path": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/optionator": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-      "dev": true,
-      "dependencies": {
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0",
-        "word-wrap": "^1.2.3"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/eslint/node_modules/p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "dev": true,
-      "dependencies": {
-        "yocto-queue": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/p-locate": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/prelude-ls": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/eslint/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/type-check": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/espree": {
-      "version": "9.4.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz",
-      "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^8.8.0",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.3.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/espree/node_modules/acorn": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
-      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/espree/node_modules/eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/esquery": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/esquery/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esrecurse/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/events": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.x"
-      }
-    },
-    "node_modules/evp_bytestokey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-      "dev": true,
-      "dependencies": {
-        "md5.js": "^1.3.4",
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "node_modules/execa": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-      "dev": true,
-      "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.0",
-        "human-signals": "^2.1.0",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.1",
-        "onetime": "^5.1.2",
-        "signal-exit": "^3.0.3",
-        "strip-final-newline": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
-      }
-    },
-    "node_modules/execall": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/execall/-/execall-2.0.0.tgz",
-      "integrity": "sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow==",
-      "dev": true,
-      "dependencies": {
-        "clone-regexp": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
-    },
-    "node_modules/fast-glob": {
-      "version": "3.2.11",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
-      "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
-      },
-      "engines": {
-        "node": ">=8.6.0"
-      }
-    },
-    "node_modules/fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
-    },
-    "node_modules/fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-      "dev": true
-    },
-    "node_modules/fastest-levenshtein": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
-      "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==",
-      "dev": true
-    },
-    "node_modules/fastq": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
-      "dev": true,
-      "dependencies": {
-        "reusify": "^1.0.4"
-      }
-    },
-    "node_modules/file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-      "dev": true,
-      "dependencies": {
-        "flat-cache": "^3.0.4"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dev": true,
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/find-cache-dir": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
-      "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
-      "dev": true,
-      "dependencies": {
-        "commondir": "^1.0.1",
-        "make-dir": "^3.0.2",
-        "pkg-dir": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
-      }
-    },
-    "node_modules/find-root": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
-      "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==",
-      "dev": true
-    },
-    "node_modules/find-up": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-      "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/flat-cache": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-      "dev": true,
-      "dependencies": {
-        "flatted": "^3.1.0",
-        "rimraf": "^3.0.2"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/flat-cache/node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/flatted": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
-      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
-      "dev": true
-    },
-    "node_modules/flatten": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.3.tgz",
-      "integrity": "sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==",
-      "deprecated": "flatten is deprecated in favor of utility frameworks such as lodash.",
-      "dev": true
-    },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
-    },
-    "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
-    },
-    "node_modules/gensync": {
-      "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "dev": true,
-      "engines": {
-        "node": "6.* || 8.* || >= 10.*"
-      }
-    },
-    "node_modules/get-intrinsic": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
-      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/get-npm-tarball-url": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/get-npm-tarball-url/-/get-npm-tarball-url-2.0.3.tgz",
-      "integrity": "sha512-R/PW6RqyaBQNWYaSyfrh54/qtcnOp22FHCCiRhSSZj0FP3KQWCsxxt0DzIdVTbwTqe9CtQfvl/FPD4UIPt4pqw==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.17"
-      }
-    },
-    "node_modules/get-stream": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/get-symbol-description": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-      "dev": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/glob-to-regexp": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
-      "dev": true
-    },
-    "node_modules/global-modules": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
-      "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
-      "dev": true,
-      "dependencies": {
-        "global-prefix": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/global-prefix": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
-      "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
-      "dev": true,
-      "dependencies": {
-        "ini": "^1.3.5",
-        "kind-of": "^6.0.2",
-        "which": "^1.3.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/globby": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-      "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
-      "dev": true,
-      "dependencies": {
-        "array-union": "^1.0.1",
-        "glob": "^7.0.3",
-        "object-assign": "^4.0.1",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/globby/node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/globjoin": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
-      "integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=",
-      "dev": true
-    },
-    "node_modules/google-protobuf": {
-      "version": "3.21.0",
-      "resolved": "https://registry.npmjs.org/google-protobuf/-/google-protobuf-3.21.0.tgz",
-      "integrity": "sha512-byR7MBTK4tZ5PZEb+u5ZTzpt4SfrTxv5682MjPlHN16XeqgZE2/8HOIWeiXe8JKnT9OVbtBGhbq8mtvkK8cd5g==",
-      "dev": true
-    },
-    "node_modules/graceful-fs": {
-      "version": "4.2.10",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-      "dev": true
-    },
-    "node_modules/grapheme-splitter": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
-      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
-      "dev": true
-    },
-    "node_modules/hard-rejection": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
-      "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/has-bigints": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
-      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/has-property-descriptors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.1.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/hash-base": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
-      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/hash-base/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/hash-base/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/hash.js": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "minimalistic-assert": "^1.0.1"
-      }
-    },
-    "node_modules/he": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-      "dev": true,
-      "bin": {
-        "he": "bin/he"
-      }
-    },
-    "node_modules/hmac-drbg": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
-      "dev": true,
-      "dependencies": {
-        "hash.js": "^1.0.3",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "node_modules/hosted-git-info": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
-      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/html-encoding-sniffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
-      "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
-      "dev": true,
-      "dependencies": {
-        "whatwg-encoding": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/html-minifier-terser": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
-      "integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==",
-      "dev": true,
-      "dependencies": {
-        "camel-case": "^4.1.2",
-        "clean-css": "^5.2.2",
-        "commander": "^8.3.0",
-        "he": "^1.2.0",
-        "param-case": "^3.0.4",
-        "relateurl": "^0.2.7",
-        "terser": "^5.10.0"
-      },
-      "bin": {
-        "html-minifier-terser": "cli.js"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/html-tags": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.2.0.tgz",
-      "integrity": "sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/html-webpack-plugin": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz",
-      "integrity": "sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw==",
-      "dev": true,
-      "dependencies": {
-        "@types/html-minifier-terser": "^6.0.0",
-        "html-minifier-terser": "^6.0.2",
-        "lodash": "^4.17.21",
-        "pretty-error": "^4.0.0",
-        "tapable": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/html-webpack-plugin"
-      },
-      "peerDependencies": {
-        "webpack": "^5.20.0"
-      }
-    },
-    "node_modules/htmlparser2": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz",
-      "integrity": "sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==",
-      "dev": true,
-      "funding": [
-        "https://github.com/fb55/htmlparser2?sponsor=1",
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ],
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.2.2",
-        "domutils": "^2.8.0",
-        "entities": "^3.0.1"
-      }
-    },
-    "node_modules/http-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
-      "dev": true,
-      "dependencies": {
-        "@tootallnate/once": "2",
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/https-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
-      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
-      "dev": true
-    },
-    "node_modules/https-proxy-agent": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
-      "dev": true,
-      "dependencies": {
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/human-signals": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.17.0"
-      }
-    },
-    "node_modules/iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dev": true,
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/icss-utils": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
-      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
-      "dev": true,
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/ignore": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/immutable": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.1.0.tgz",
-      "integrity": "sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==",
-      "dev": true
-    },
-    "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
-      "dependencies": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/import-lazy": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
-      "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/import-local": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
-      "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
-      "dev": true,
-      "dependencies": {
-        "pkg-dir": "^4.2.0",
-        "resolve-cwd": "^3.0.0"
-      },
-      "bin": {
-        "import-local-fixture": "fixtures/cli.js"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.19"
-      }
-    },
-    "node_modules/indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/indexes-of": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
-      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
-      "dev": true
-    },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "node_modules/ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-      "dev": true
-    },
-    "node_modules/internal-slot": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
-      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.1.0",
-        "has": "^1.0.3",
-        "side-channel": "^1.0.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/interpret": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
-      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-      "dev": true
-    },
-    "node_modules/is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-      "dev": true,
-      "dependencies": {
-        "has-bigints": "^1.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-core-module": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz",
-      "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==",
-      "dev": true,
-      "dependencies": {
-        "has": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/is-number-object": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-path-cwd": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
-      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is-path-in-cwd": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
-      "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
-      "dev": true,
-      "dependencies": {
-        "is-path-inside": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is-path-inside": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
-      "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
-      "dev": true,
-      "dependencies": {
-        "path-is-inside": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is-plain-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-potential-custom-element-name": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
-      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
-      "dev": true
-    },
-    "node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-regexp": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-2.1.0.tgz",
-      "integrity": "sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-stream": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-      "dev": true
-    },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
-    },
-    "node_modules/isnumeric": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/isnumeric/-/isnumeric-0.2.0.tgz",
-      "integrity": "sha1-ojR7o2DeGeM9D/1ZD933dVy/LmQ=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.x"
-      }
-    },
-    "node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/jest-worker": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
-      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      }
-    },
-    "node_modules/jest-worker/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-worker/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
-      }
-    },
-    "node_modules/jquery": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.1.tgz",
-      "integrity": "sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw==",
-      "peer": true
-    },
-    "node_modules/jquery.growl": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/jquery.growl/-/jquery.growl-1.3.5.tgz",
-      "integrity": "sha512-pK1RD8x3pXm1hEQ6KH0cu4QqzvI7R0EsUd5oneT5pavZ0cHwx/TV4qIdKeVfCWM0DVPyzI2GfXD6FwdDbRx1kw=="
-    },
-    "node_modules/js-sdsl": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz",
-      "integrity": "sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==",
-      "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/js-sdsl"
-      }
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
-    },
-    "node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/jsdom": {
-      "version": "19.0.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-19.0.0.tgz",
-      "integrity": "sha512-RYAyjCbxy/vri/CfnjUWJQQtZ3LKlLnDqj+9XLNnJPgEGeirZs3hllKR20re8LUZ6o1b1X4Jat+Qd26zmP41+A==",
-      "dev": true,
-      "dependencies": {
-        "abab": "^2.0.5",
-        "acorn": "^8.5.0",
-        "acorn-globals": "^6.0.0",
-        "cssom": "^0.5.0",
-        "cssstyle": "^2.3.0",
-        "data-urls": "^3.0.1",
-        "decimal.js": "^10.3.1",
-        "domexception": "^4.0.0",
-        "escodegen": "^2.0.0",
-        "form-data": "^4.0.0",
-        "html-encoding-sniffer": "^3.0.0",
-        "http-proxy-agent": "^5.0.0",
-        "https-proxy-agent": "^5.0.0",
-        "is-potential-custom-element-name": "^1.0.1",
-        "nwsapi": "^2.2.0",
-        "parse5": "6.0.1",
-        "saxes": "^5.0.1",
-        "symbol-tree": "^3.2.4",
-        "tough-cookie": "^4.0.0",
-        "w3c-hr-time": "^1.0.2",
-        "w3c-xmlserializer": "^3.0.0",
-        "webidl-conversions": "^7.0.0",
-        "whatwg-encoding": "^2.0.0",
-        "whatwg-mimetype": "^3.0.0",
-        "whatwg-url": "^10.0.0",
-        "ws": "^8.2.3",
-        "xml-name-validator": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "peerDependencies": {
-        "canvas": "^2.5.0"
-      },
-      "peerDependenciesMeta": {
-        "canvas": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jsdom/node_modules/acorn": {
-      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
-      "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/jsdom/node_modules/form-data": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-      "dev": true,
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/jsdom/node_modules/punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/jsdom/node_modules/tough-cookie": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
-      "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
-      "dev": true,
-      "dependencies": {
-        "psl": "^1.1.33",
-        "punycode": "^2.1.1",
-        "universalify": "^0.1.2"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "dev": true,
-      "bin": {
-        "jsesc": "bin/jsesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/json-parse-better-errors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-      "dev": true
-    },
-    "node_modules/json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true
-    },
-    "node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-      "dev": true
-    },
-    "node_modules/json5": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
-      "dev": true,
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/klona": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz",
-      "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/known-css-properties": {
-      "version": "0.24.0",
-      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.24.0.tgz",
-      "integrity": "sha512-RTSoaUAfLvpR357vWzAz/50Q/BmHfmE6ETSWfutT0AJiw10e6CmcdYRQJlLRd95B53D0Y2aD1jSxD3V3ySF+PA==",
-      "dev": true
-    },
-    "node_modules/ldjson-stream": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ldjson-stream/-/ldjson-stream-1.2.1.tgz",
-      "integrity": "sha1-kb7O2lrE7SsX5kn7d356v6AYnCs=",
-      "dev": true,
-      "dependencies": {
-        "split2": "^0.2.1",
-        "through2": "^0.6.1"
-      }
-    },
-    "node_modules/ldjson-stream/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-      "dev": true
-    },
-    "node_modules/ldjson-stream/node_modules/readable-stream": {
-      "version": "1.0.34",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-      "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/ldjson-stream/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-      "dev": true
-    },
-    "node_modules/ldjson-stream/node_modules/through2": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-      "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": ">=1.0.33-1 <1.1.0-0",
-        "xtend": ">=4.0.0 <4.1.0-0"
-      }
-    },
-    "node_modules/levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/lines-and-columns": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-      "dev": true
-    },
-    "node_modules/loader-runner": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
-      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.11.5"
-      }
-    },
-    "node_modules/loader-utils": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
-      "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
-      },
-      "engines": {
-        "node": ">=8.9.0"
-      }
-    },
-    "node_modules/locate-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^2.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
-    },
-    "node_modules/lodash._reinterpolate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
-      "dev": true
-    },
-    "node_modules/lodash.debounce": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
-      "dev": true
-    },
-    "node_modules/lodash.memoize": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-      "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
-      "dev": true
-    },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
-    },
-    "node_modules/lodash.template": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
-      "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==",
-      "dev": true,
-      "dependencies": {
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.templatesettings": "^4.0.0"
-      }
-    },
-    "node_modules/lodash.templatesettings": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz",
-      "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==",
-      "dev": true,
-      "dependencies": {
-        "lodash._reinterpolate": "^3.0.0"
-      }
-    },
-    "node_modules/lodash.truncate": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
-      "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
-      "dev": true
-    },
-    "node_modules/lodash.uniq": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
-      "dev": true
-    },
-    "node_modules/lower-case": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
-      "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "dev": true,
-      "dependencies": {
-        "semver": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/map-obj": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
-      "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/material-design-icons-iconfont": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/material-design-icons-iconfont/-/material-design-icons-iconfont-6.7.0.tgz",
-      "integrity": "sha512-lSj71DgVv20kO0kGbs42icDzbRot61gEDBLQACzkUuznRQBUYmbxzEkGU6dNBb5fRWHMaScYlAXX96HQ4/cJWA=="
-    },
-    "node_modules/math-expression-evaluator": {
-      "version": "1.3.14",
-      "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.3.14.tgz",
-      "integrity": "sha512-M6AMrvq9bO8uL42KvQHPA2/SbAobA0R7gviUmPrcTcGfdwpaLitz4q2Euzx2lP9Oy88vxK3HOrsISgSwKsYS4A==",
-      "dev": true
-    },
-    "node_modules/mathml-tag-names": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz",
-      "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/md5.js": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
-      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
-      "dev": true,
-      "dependencies": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "node_modules/mdn-data": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
-      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
-      "dev": true
-    },
-    "node_modules/memory-fs": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz",
-      "integrity": "sha512-+y4mDxU4rvXXu5UDSGCGNiesFmwCHuefGMoPCO1WYucNYj7DsLqrFaa2fXVI0H+NNiPTwwzKwspn9yTZqUGqng==",
-      "dev": true
-    },
-    "node_modules/meow": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
-      "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/minimist": "^1.2.0",
-        "camelcase-keys": "^6.2.2",
-        "decamelize": "^1.2.0",
-        "decamelize-keys": "^1.1.0",
-        "hard-rejection": "^2.1.0",
-        "minimist-options": "4.1.0",
-        "normalize-package-data": "^3.0.0",
-        "read-pkg-up": "^7.0.1",
-        "redent": "^3.0.0",
-        "trim-newlines": "^3.0.0",
-        "type-fest": "^0.18.0",
-        "yargs-parser": "^20.2.3"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/meow/node_modules/type-fest": {
-      "version": "0.18.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
-      "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true
-    },
-    "node_modules/merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-      "dev": true,
-      "dependencies": {
-        "braces": "^3.0.2",
-        "picomatch": "^2.3.1"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/miller-rabin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.0.0",
-        "brorand": "^1.0.1"
-      },
-      "bin": {
-        "miller-rabin": "bin/miller-rabin"
-      }
-    },
-    "node_modules/miller-rabin/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dev": true,
-      "dependencies": {
-        "mime-db": "1.52.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/min-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
-      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/mini-css-extract-plugin": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.2.tgz",
-      "integrity": "sha512-WhDvO3SjGm40oV5y26GjMJYjd2UMqrLAGKy5YS2/3QKJy2F7jgynuHTir/tgUUOiNQu5saXHdc8reo7YuhhT4Q==",
-      "dev": true,
-      "dependencies": {
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0",
-        "webpack-sources": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.4.0 || ^5.0.0"
-      }
-    },
-    "node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-      "dev": true
-    },
-    "node_modules/minimalistic-crypto-utils": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
-      "dev": true
-    },
-    "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/minimist": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
-      "dev": true
-    },
-    "node_modules/minimist-options": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
-      "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
-      "dev": true,
-      "dependencies": {
-        "arrify": "^1.0.1",
-        "is-plain-obj": "^1.1.0",
-        "kind-of": "^6.0.3"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/multimatch": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-5.0.0.tgz",
-      "integrity": "sha512-ypMKuglUrZUD99Tk2bUQ+xNQj43lPEfAeX2o9cTteAmShXy2VHDJpuwu1o0xqoKCt9jLVAvwyFKdLTPXKAfJyA==",
-      "dev": true,
-      "dependencies": {
-        "@types/minimatch": "^3.0.3",
-        "array-differ": "^3.0.0",
-        "array-union": "^2.1.0",
-        "arrify": "^2.0.1",
-        "minimatch": "^3.0.4"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/multimatch/node_modules/array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/multimatch/node_modules/arrify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
-      "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/nanoid": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
-      "dev": true,
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
-    "node_modules/natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-      "dev": true
-    },
-    "node_modules/needle": {
-      "version": "2.9.1",
-      "resolved": "https://registry.npmjs.org/needle/-/needle-2.9.1.tgz",
-      "integrity": "sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^3.2.6",
-        "iconv-lite": "^0.4.4",
-        "sax": "^1.2.4"
-      },
-      "bin": {
-        "needle": "bin/needle"
-      },
-      "engines": {
-        "node": ">= 4.4.x"
-      }
-    },
-    "node_modules/needle/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/neo-async": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-      "dev": true
-    },
-    "node_modules/no-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
-      "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
-      "dev": true,
-      "dependencies": {
-        "lower-case": "^2.0.2",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/node-libs-browser": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
-      "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
-      "dev": true,
-      "dependencies": {
-        "assert": "^1.1.1",
-        "browserify-zlib": "^0.2.0",
-        "buffer": "^4.3.0",
-        "console-browserify": "^1.1.0",
-        "constants-browserify": "^1.0.0",
-        "crypto-browserify": "^3.11.0",
-        "domain-browser": "^1.1.1",
-        "events": "^3.0.0",
-        "https-browserify": "^1.0.0",
-        "os-browserify": "^0.3.0",
-        "path-browserify": "0.0.1",
-        "process": "^0.11.10",
-        "punycode": "^1.2.4",
-        "querystring-es3": "^0.2.0",
-        "readable-stream": "^2.3.3",
-        "stream-browserify": "^2.0.1",
-        "stream-http": "^2.7.2",
-        "string_decoder": "^1.0.0",
-        "timers-browserify": "^2.0.4",
-        "tty-browserify": "0.0.0",
-        "url": "^0.11.0",
-        "util": "^0.11.0",
-        "vm-browserify": "^1.0.1"
-      }
-    },
-    "node_modules/node-releases": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.3.tgz",
-      "integrity": "sha512-maHFz6OLqYxz+VQyCAtA3PTX4UP/53pa05fyDNc9CwjvJ0yEh6+xBwKsgCxMNhS8taUKBFYxfuiaD9U/55iFaw==",
-      "dev": true
-    },
-    "node_modules/normalize-package-data": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
-      "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
-      "dev": true,
-      "dependencies": {
-        "hosted-git-info": "^4.0.1",
-        "is-core-module": "^2.5.0",
-        "semver": "^7.3.4",
-        "validate-npm-package-license": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/normalize-package-data/node_modules/semver": {
-      "version": "7.3.7",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/normalize-range": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/normalize-selector": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz",
-      "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=",
-      "dev": true
-    },
-    "node_modules/npm-run-path": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-      "dev": true,
-      "dependencies": {
-        "path-key": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/nth-check": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz",
-      "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==",
-      "dev": true,
-      "dependencies": {
-        "boolbase": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/nth-check?sponsor=1"
-      }
-    },
-    "node_modules/num2fraction": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
-      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
-      "dev": true
-    },
-    "node_modules/nwsapi": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
-      "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
-      "dev": true
-    },
-    "node_modules/object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-inspect": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.assign": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "has-symbols": "^1.0.1",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
-      "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.values": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
-      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
-    "node_modules/onecolor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/onecolor/-/onecolor-3.1.0.tgz",
-      "integrity": "sha512-YZSypViXzu3ul5LMu/m6XjJ9ol8qAy9S2VjHl5E6UlhUH1KGKWabyEJifn0Jjpw23bYDzC2ucKMPGiH5kfwSGQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.8"
-      }
-    },
-    "node_modules/onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "dev": true,
-      "dependencies": {
-        "mimic-fn": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/open-sans-fonts": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/open-sans-fonts/-/open-sans-fonts-1.6.2.tgz",
-      "integrity": "sha512-vsJ6/Mm0TdUKQJqxfkXJy+0K2X0QeRuTmxQq9YE1ycziw6CbDPolDsHhQ6+ImoV/7OTh8K8ZTGklY1Z5nUAwug==",
-      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info."
-    },
-    "node_modules/optionator": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-      "dev": true,
-      "dependencies": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.6",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "word-wrap": "~1.2.3"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/os-browserify": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
-      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
-      "dev": true
-    },
-    "node_modules/p-limit": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/p-locate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/p-map": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
-      "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/p-try": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/pako": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
-      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
-      "dev": true
-    },
-    "node_modules/param-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
-      "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
-      "dev": true,
-      "dependencies": {
-        "dot-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
-      "dependencies": {
-        "callsites": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/parse-asn1": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
-      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
-      "dev": true,
-      "dependencies": {
-        "asn1.js": "^5.2.0",
-        "browserify-aes": "^1.0.0",
-        "evp_bytestokey": "^1.0.0",
-        "pbkdf2": "^3.0.3",
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "node_modules/parse-json": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "error-ex": "^1.3.1",
-        "json-parse-even-better-errors": "^2.3.0",
-        "lines-and-columns": "^1.1.6"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/parse5": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
-      "dev": true
-    },
-    "node_modules/pascal-case": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
-      "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
-      "dev": true,
-      "dependencies": {
-        "no-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/path": {
-      "version": "0.12.7",
-      "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz",
-      "integrity": "sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=",
-      "dev": true,
-      "dependencies": {
-        "process": "^0.11.1",
-        "util": "^0.10.3"
-      }
-    },
-    "node_modules/path-browserify": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
-      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
-      "dev": true
-    },
-    "node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-is-inside": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
-      "dev": true
-    },
-    "node_modules/path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
-    },
-    "node_modules/path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/path/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-      "dev": true
-    },
-    "node_modules/path/node_modules/util": {
-      "version": "0.10.4",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
-      "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "2.0.3"
-      }
-    },
-    "node_modules/pbkdf2": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
-      "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
-      "dev": true,
-      "dependencies": {
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4",
-        "ripemd160": "^2.0.1",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      },
-      "engines": {
-        "node": ">=0.12"
-      }
-    },
-    "node_modules/perfect-scrollbar": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/perfect-scrollbar/-/perfect-scrollbar-1.5.5.tgz",
-      "integrity": "sha512-dzalfutyP3e/FOpdlhVryN4AJ5XDVauVWxybSkLZmakFE2sS3y3pc4JnSprw8tGmHvkaG5Edr5T7LBTZ+WWU2g=="
-    },
-    "node_modules/picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-      "dev": true
-    },
-    "node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/pify": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-      "dev": true,
-      "dependencies": {
-        "pinkie": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pixrem": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pixrem/-/pixrem-4.0.1.tgz",
-      "integrity": "sha1-LaSh3m7EQjxfw3lOkwuB1EkOxoY=",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^2.0.0",
-        "postcss": "^6.0.0",
-        "reduce-css-calc": "^1.2.7"
-      },
-      "engines": {
-        "node": ">=0.10.0",
-        "npm": ">=1.2.10"
-      }
-    },
-    "node_modules/pixrem/node_modules/browserslist": {
-      "version": "2.11.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz",
-      "integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==",
-      "deprecated": "Browserslist 2 could fail on reading Browserslist >3.0 config used in other tools.",
-      "dev": true,
-      "dependencies": {
-        "caniuse-lite": "^1.0.30000792",
-        "electron-to-chromium": "^1.3.30"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      }
-    },
-    "node_modules/pixrem/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/pixrem/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pleeease-filters": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/pleeease-filters/-/pleeease-filters-4.0.0.tgz",
-      "integrity": "sha1-ZjKy+wVkjSdY2GU4T7zteeHMrsc=",
-      "dev": true,
-      "dependencies": {
-        "onecolor": "^3.0.4",
-        "postcss": "^6.0.1"
-      }
-    },
-    "node_modules/pleeease-filters/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/pleeease-filters/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/popper.js": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
-      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
-      "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1",
-      "peer": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/popperjs"
-      }
-    },
-    "node_modules/postcss": {
-      "version": "8.4.19",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.19.tgz",
-      "integrity": "sha512-h+pbPsyhlYj6N2ozBmHhHrs9DzGmbaarbLvWipMRO7RLS+v4onj26MPFXA5OBYFxyqYhUJK456SwDcY9H2/zsA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
-        }
-      ],
-      "dependencies": {
-        "nanoid": "^3.3.4",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      }
-    },
-    "node_modules/postcss-apply": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/postcss-apply/-/postcss-apply-0.8.0.tgz",
-      "integrity": "sha1-FOVEu7XLbxweBIhXll15rgZrE0M=",
-      "dev": true,
-      "dependencies": {
-        "babel-runtime": "^6.23.0",
-        "balanced-match": "^0.4.2",
-        "postcss": "^6.0.0"
-      }
-    },
-    "node_modules/postcss-apply/node_modules/balanced-match": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-      "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
-      "dev": true
-    },
-    "node_modules/postcss-apply/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-apply/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-attribute-case-insensitive": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-2.0.0.tgz",
-      "integrity": "sha1-lNxCLI+QmX8WvTOjZUu77AhJY7Q=",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^6.0.0",
-        "postcss-selector-parser": "^2.2.3"
-      }
-    },
-    "node_modules/postcss-attribute-case-insensitive/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-attribute-case-insensitive/node_modules/postcss-selector-parser": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz",
-      "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=",
-      "dev": true,
-      "dependencies": {
-        "flatten": "^1.0.2",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
-      }
-    },
-    "node_modules/postcss-attribute-case-insensitive/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-color-function": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-color-function/-/postcss-color-function-4.1.0.tgz",
-      "integrity": "sha512-2/fuv6mP5Lt03XbRpVfMdGC8lRP1sykme+H1bR4ARyOmSMB8LPSjcL6EAI1iX6dqUF+jNEvKIVVXhan1w/oFDQ==",
-      "dev": true,
-      "dependencies": {
-        "css-color-function": "~1.3.3",
-        "postcss": "^6.0.23",
-        "postcss-message-helpers": "^2.0.0",
-        "postcss-value-parser": "^3.3.1"
-      }
-    },
-    "node_modules/postcss-color-function/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-color-function/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-color-gray": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-color-gray/-/postcss-color-gray-4.1.0.tgz",
-      "integrity": "sha512-L4iLKQLdqChz6ZOgGb6dRxkBNw78JFYcJmBz1orHpZoeLtuhDDGegRtX9gSyfoCIM7rWZ3VNOyiqqvk83BEN+w==",
-      "dev": true,
-      "dependencies": {
-        "color": "^2.0.1",
-        "postcss": "^6.0.14",
-        "postcss-message-helpers": "^2.0.0",
-        "reduce-function-call": "^1.0.2"
-      }
-    },
-    "node_modules/postcss-color-gray/node_modules/color": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color/-/color-2.0.1.tgz",
-      "integrity": "sha512-ubUCVVKfT7r2w2D3qtHakj8mbmKms+tThR8gI8zEYCbUBl8/voqFGt3kgBqGwXAopgXybnkuOq+qMYCRrp4cXw==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.1",
-        "color-string": "^1.5.2"
-      }
-    },
-    "node_modules/postcss-color-gray/node_modules/color-string": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.0.tgz",
-      "integrity": "sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "^1.0.0",
-        "simple-swizzle": "^0.2.2"
-      }
-    },
-    "node_modules/postcss-color-gray/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-color-gray/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-color-hex-alpha": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-3.0.0.tgz",
-      "integrity": "sha1-HlPmyKyyN5Vej9CLfs2xuLgwn5U=",
-      "dev": true,
-      "dependencies": {
-        "color": "^1.0.3",
-        "postcss": "^6.0.1",
-        "postcss-message-helpers": "^2.0.0"
-      }
-    },
-    "node_modules/postcss-color-hex-alpha/node_modules/color": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/color/-/color-1.0.3.tgz",
-      "integrity": "sha1-5I6DLYXxTvaU+0aIEcLVz+cptV0=",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.8.2",
-        "color-string": "^1.4.0"
-      }
-    },
-    "node_modules/postcss-color-hex-alpha/node_modules/color-string": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.0.tgz",
-      "integrity": "sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "^1.0.0",
-        "simple-swizzle": "^0.2.2"
-      }
-    },
-    "node_modules/postcss-color-hex-alpha/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-color-hex-alpha/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-color-hsl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-color-hsl/-/postcss-color-hsl-2.0.0.tgz",
-      "integrity": "sha1-EnA2ZvoxBDDj8wpFTawThjF9WEQ=",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^6.0.1",
-        "postcss-value-parser": "^3.3.0",
-        "units-css": "^0.4.0"
-      }
-    },
-    "node_modules/postcss-color-hsl/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-color-hsl/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-color-hwb": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-color-hwb/-/postcss-color-hwb-3.0.0.tgz",
-      "integrity": "sha1-NAKxnvTYSXVAwftQcr6YY8qVVx4=",
-      "dev": true,
-      "dependencies": {
-        "color": "^1.0.3",
-        "postcss": "^6.0.1",
-        "postcss-message-helpers": "^2.0.0",
-        "reduce-function-call": "^1.0.2"
-      }
-    },
-    "node_modules/postcss-color-hwb/node_modules/color": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/color/-/color-1.0.3.tgz",
-      "integrity": "sha1-5I6DLYXxTvaU+0aIEcLVz+cptV0=",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.8.2",
-        "color-string": "^1.4.0"
-      }
-    },
-    "node_modules/postcss-color-hwb/node_modules/color-string": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.0.tgz",
-      "integrity": "sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "^1.0.0",
-        "simple-swizzle": "^0.2.2"
-      }
-    },
-    "node_modules/postcss-color-hwb/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-color-hwb/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-color-rebeccapurple": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-3.1.0.tgz",
-      "integrity": "sha512-212hJUk9uSsbwO5ECqVjmh/iLsmiVL1xy9ce9TVf+X3cK/ZlUIlaMdoxje/YpsL9cmUH3I7io+/G2LyWx5rg1g==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^6.0.22",
-        "postcss-values-parser": "^1.5.0"
-      }
-    },
-    "node_modules/postcss-color-rebeccapurple/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-color-rebeccapurple/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-color-rgb": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-color-rgb/-/postcss-color-rgb-2.0.0.tgz",
-      "integrity": "sha1-FFOcinExSUtILg3RzCZf9lFLUmM=",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^6.0.1",
-        "postcss-value-parser": "^3.3.0"
-      }
-    },
-    "node_modules/postcss-color-rgb/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-color-rgb/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-color-rgba-fallback": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-color-rgba-fallback/-/postcss-color-rgba-fallback-3.0.0.tgz",
-      "integrity": "sha1-N9XJNToHoJJwkSqCYGu0Kg1wLAQ=",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^6.0.6",
-        "postcss-value-parser": "^3.3.0",
-        "rgb-hex": "^2.1.0"
-      }
-    },
-    "node_modules/postcss-color-rgba-fallback/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-color-rgba-fallback/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-cssnext": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-cssnext/-/postcss-cssnext-3.1.1.tgz",
-      "integrity": "sha512-u9e0CYE7zudnr/LK+FL02cwli8cQEwwmzzN3JVeOEZiDs0q8IDfGdI6C9FCkHtIKEEjY3AATW3dqCCvqDK+Sfg==",
-      "deprecated": "'postcss-cssnext' has been deprecated in favor of 'postcss-preset-env'. Read more at https://moox.io/blog/deprecating-cssnext/",
-      "dev": true,
-      "dependencies": {
-        "autoprefixer": "^7.1.1",
-        "caniuse-api": "^2.0.0",
-        "chalk": "^2.0.1",
-        "pixrem": "^4.0.0",
-        "pleeease-filters": "^4.0.0",
-        "postcss": "^6.0.5",
-        "postcss-apply": "^0.8.0",
-        "postcss-attribute-case-insensitive": "^2.0.0",
-        "postcss-calc": "^6.0.0",
-        "postcss-color-function": "^4.0.0",
-        "postcss-color-gray": "^4.0.0",
-        "postcss-color-hex-alpha": "^3.0.0",
-        "postcss-color-hsl": "^2.0.0",
-        "postcss-color-hwb": "^3.0.0",
-        "postcss-color-rebeccapurple": "^3.0.0",
-        "postcss-color-rgb": "^2.0.0",
-        "postcss-color-rgba-fallback": "^3.0.0",
-        "postcss-custom-media": "^6.0.0",
-        "postcss-custom-properties": "^6.1.0",
-        "postcss-custom-selectors": "^4.0.1",
-        "postcss-font-family-system-ui": "^3.0.0",
-        "postcss-font-variant": "^3.0.0",
-        "postcss-image-set-polyfill": "^0.3.5",
-        "postcss-initial": "^2.0.0",
-        "postcss-media-minmax": "^3.0.0",
-        "postcss-nesting": "^4.0.1",
-        "postcss-pseudo-class-any-link": "^4.0.0",
-        "postcss-pseudoelements": "^5.0.0",
-        "postcss-replace-overflow-wrap": "^2.0.0",
-        "postcss-selector-matches": "^3.0.1",
-        "postcss-selector-not": "^3.0.1"
-      },
-      "peerDependencies": {
-        "caniuse-lite": "^1.0.30000697"
-      }
-    },
-    "node_modules/postcss-cssnext/node_modules/browserslist": {
-      "version": "2.11.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz",
-      "integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==",
-      "deprecated": "Browserslist 2 could fail on reading Browserslist >3.0 config used in other tools.",
-      "dev": true,
-      "dependencies": {
-        "caniuse-lite": "^1.0.30000792",
-        "electron-to-chromium": "^1.3.30"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      }
-    },
-    "node_modules/postcss-cssnext/node_modules/caniuse-api": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-2.0.0.tgz",
-      "integrity": "sha1-sd21pZZrFvSNxJmERNS7xsfZ2DQ=",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^2.0.0",
-        "caniuse-lite": "^1.0.0",
-        "lodash.memoize": "^4.1.2",
-        "lodash.uniq": "^4.5.0"
-      }
-    },
-    "node_modules/postcss-cssnext/node_modules/picocolors": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-      "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-      "dev": true
-    },
-    "node_modules/postcss-cssnext/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-cssnext/node_modules/postcss-calc": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-6.0.2.tgz",
-      "integrity": "sha512-fiznXjEN5T42Qm7qqMCVJXS3roaj9r4xsSi+meaBVe7CJBl8t/QLOXu02Z2E6oWAMWIvCuF6JrvzFekmVEbOKA==",
-      "dev": true,
-      "dependencies": {
-        "css-unit-converter": "^1.1.1",
-        "postcss": "^7.0.2",
-        "postcss-selector-parser": "^2.2.2",
-        "reduce-css-calc": "^2.0.0"
-      }
-    },
-    "node_modules/postcss-cssnext/node_modules/postcss-calc/node_modules/postcss": {
-      "version": "7.0.39",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-      "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-      "dev": true,
-      "dependencies": {
-        "picocolors": "^0.2.1",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
-      }
-    },
-    "node_modules/postcss-cssnext/node_modules/postcss-selector-parser": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz",
-      "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=",
-      "dev": true,
-      "dependencies": {
-        "flatten": "^1.0.2",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
-      }
-    },
-    "node_modules/postcss-cssnext/node_modules/reduce-css-calc": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-2.1.8.tgz",
-      "integrity": "sha512-8liAVezDmUcH+tdzoEGrhfbGcP7nOV4NkGE3a74+qqvE7nt9i4sKLGBuZNOnpI4WiGksiNPklZxva80061QiPg==",
-      "dev": true,
-      "dependencies": {
-        "css-unit-converter": "^1.1.1",
-        "postcss-value-parser": "^3.3.0"
-      }
-    },
-    "node_modules/postcss-cssnext/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-custom-media": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-6.0.0.tgz",
-      "integrity": "sha1-vlMnhBEOyylQRPtTlaGABushpzc=",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^6.0.1"
-      }
-    },
-    "node_modules/postcss-custom-media/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-custom-media/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-custom-properties": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-6.3.1.tgz",
-      "integrity": "sha512-zoiwn4sCiUFbr4KcgcNZLFkR6gVQom647L+z1p/KBVHZ1OYwT87apnS42atJtx6XlX2yI7N5fjXbFixShQO2QQ==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "postcss": "^6.0.18"
-      }
-    },
-    "node_modules/postcss-custom-properties/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-custom-properties/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-custom-selectors": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-4.0.1.tgz",
-      "integrity": "sha1-eBOC+UxS5yfvXKR3bqKt9JphE4I=",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^6.0.1",
-        "postcss-selector-matches": "^3.0.0"
-      }
-    },
-    "node_modules/postcss-custom-selectors/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-custom-selectors/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-font-family-system-ui": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-font-family-system-ui/-/postcss-font-family-system-ui-3.0.0.tgz",
-      "integrity": "sha512-58G/hTxMSSKlIRpcPUjlyo6hV2MEzvcVO2m4L/T7Bb2fJTG4DYYfQjQeRvuimKQh1V1sOzCIz99g+H2aFNtlQw==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^6.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-font-family-system-ui/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-font-family-system-ui/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-font-variant": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-3.0.0.tgz",
-      "integrity": "sha1-CMzIj2BQuoLtjvLMdsDGprQfGD4=",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^6.0.1"
-      }
-    },
-    "node_modules/postcss-font-variant/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-font-variant/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-image-set-polyfill": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/postcss-image-set-polyfill/-/postcss-image-set-polyfill-0.3.5.tgz",
-      "integrity": "sha1-Dxk0E3AM8fgr05Bm7wFtZaShgYE=",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^6.0.1",
-        "postcss-media-query-parser": "^0.2.3"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-image-set-polyfill/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-image-set-polyfill/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-initial": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-2.0.0.tgz",
-      "integrity": "sha1-cnFfczbgu3k1HZnuZcSiU6hEG6Q=",
-      "dev": true,
-      "dependencies": {
-        "lodash.template": "^4.2.4",
-        "postcss": "^6.0.1"
-      }
-    },
-    "node_modules/postcss-initial/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-initial/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-loader": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-5.3.0.tgz",
-      "integrity": "sha512-/+Z1RAmssdiSLgIZwnJHwBMnlABPgF7giYzTN2NOfr9D21IJZ4mQC1R2miwp80zno9M4zMD/umGI8cR+2EL5zw==",
-      "dev": true,
-      "dependencies": {
-        "cosmiconfig": "^7.0.0",
-        "klona": "^2.0.4",
-        "semver": "^7.3.4"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "postcss": "^7.0.0 || ^8.0.1",
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/postcss-loader/node_modules/semver": {
-      "version": "7.3.7",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/postcss-media-minmax": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-3.0.0.tgz",
-      "integrity": "sha1-Z1JWA3pD70C8Twdgv9BtTcadSNI=",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^6.0.1"
-      }
-    },
-    "node_modules/postcss-media-minmax/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-media-minmax/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-media-query-parser": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
-      "integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=",
-      "dev": true
-    },
-    "node_modules/postcss-message-helpers": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz",
-      "integrity": "sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4=",
-      "dev": true
-    },
-    "node_modules/postcss-modules-extract-imports": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
-      "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
-      "dev": true,
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-modules-local-by-default": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz",
-      "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==",
-      "dev": true,
-      "dependencies": {
-        "icss-utils": "^5.0.0",
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.1.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-modules-local-by-default/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/postcss-modules-scope": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
-      "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
-      "dev": true,
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.4"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-modules-values": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
-      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
-      "dev": true,
-      "dependencies": {
-        "icss-utils": "^5.0.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-nesting": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-4.2.1.tgz",
-      "integrity": "sha512-IkyWXICwagCnlaviRexi7qOdwPw3+xVVjgFfGsxmztvRVaNxAlrypOIKqDE5mxY+BVxnId1rnUKBRQoNE2VDaA==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^6.0.11"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-nesting/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-nesting/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-pseudo-class-any-link": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-4.0.0.tgz",
-      "integrity": "sha1-kVKgYT00UHIFE+iJKFS65C0O5o4=",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^6.0.1",
-        "postcss-selector-parser": "^2.2.3"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-pseudo-class-any-link/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-pseudo-class-any-link/node_modules/postcss-selector-parser": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz",
-      "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=",
-      "dev": true,
-      "dependencies": {
-        "flatten": "^1.0.2",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
-      }
-    },
-    "node_modules/postcss-pseudo-class-any-link/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-pseudoelements": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-pseudoelements/-/postcss-pseudoelements-5.0.0.tgz",
-      "integrity": "sha1-7vGU6NUkZFylIKlJ6V5RjoEkAss=",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^6.0.0"
-      }
-    },
-    "node_modules/postcss-pseudoelements/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-pseudoelements/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-replace-overflow-wrap": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-2.0.0.tgz",
-      "integrity": "sha1-eU22+qVPjbEAhUOSqTr0V2i04ls=",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^6.0.1"
-      }
-    },
-    "node_modules/postcss-replace-overflow-wrap/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-replace-overflow-wrap/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-resolve-nested-selector": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz",
-      "integrity": "sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=",
-      "dev": true
-    },
-    "node_modules/postcss-safe-parser": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz",
-      "integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
-      },
-      "peerDependencies": {
-        "postcss": "^8.3.3"
-      }
-    },
-    "node_modules/postcss-selector-matches": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-selector-matches/-/postcss-selector-matches-3.0.1.tgz",
-      "integrity": "sha1-5WNAEeE5UIgYYbvdWMLQER/8lqs=",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^0.4.2",
-        "postcss": "^6.0.1"
-      }
-    },
-    "node_modules/postcss-selector-matches/node_modules/balanced-match": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-      "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
-      "dev": true
-    },
-    "node_modules/postcss-selector-matches/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-selector-matches/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-selector-not": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-3.0.1.tgz",
-      "integrity": "sha1-Lk2y8JZTNsAefOx9tsYN/3ZzNdk=",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^0.4.2",
-        "postcss": "^6.0.1"
-      }
-    },
-    "node_modules/postcss-selector-not/node_modules/balanced-match": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-      "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
-      "dev": true
-    },
-    "node_modules/postcss-selector-not/node_modules/postcss": {
-      "version": "6.0.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "source-map": "^0.6.1",
-        "supports-color": "^5.4.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/postcss-selector-not/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-selector-parser": {
-      "version": "6.0.10",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
-      "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
-      "dev": true,
-      "dependencies": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss-sorting": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-7.0.1.tgz",
-      "integrity": "sha512-iLBFYz6VRYyLJEJsBJ8M3TCqNcckVzz4wFounSc5Oez35ogE/X+aoC5fFu103Ot7NyvjU3/xqIXn93Gp3kJk4g==",
-      "dev": true,
-      "peerDependencies": {
-        "postcss": "^8.3.9"
-      }
-    },
-    "node_modules/postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
-    "node_modules/postcss-values-parser": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/postcss-values-parser/-/postcss-values-parser-1.5.0.tgz",
-      "integrity": "sha512-3M3p+2gMp0AH3da530TlX8kiO1nxdTnc3C6vr8dMxRLIlh8UYkz0/wcwptSXjhtx2Fr0TySI7a+BHDQ8NL7LaQ==",
-      "dev": true,
-      "dependencies": {
-        "flatten": "^1.0.2",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/prestakit": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/prestakit/-/prestakit-1.2.5.tgz",
-      "integrity": "sha512-dLa1+teIRLLVtjk0F2pQL2Ya+HTGQUuJ6P6k+HZWJbT+1cwQkN7VAUiH7XGLHVSJchrI+hnarR43tI2B5XZDUA==",
-      "dependencies": {
-        "bootstrap": "^4.4.1",
-        "jquery.growl": "^1.3.5",
-        "material-design-icons-iconfont": "^6.1.0",
-        "open-sans-fonts": "^1.6.2",
-        "select2": "^4.0.5",
-        "select2-bootstrap-theme": "0.1.0-beta.10"
-      }
-    },
-    "node_modules/pretty-error": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz",
-      "integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==",
-      "dev": true,
-      "dependencies": {
-        "lodash": "^4.17.20",
-        "renderkid": "^3.0.0"
-      }
-    },
-    "node_modules/process": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6.0"
-      }
-    },
-    "node_modules/process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-      "dev": true
-    },
-    "node_modules/psl": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
-      "dev": true
-    },
-    "node_modules/public-encrypt": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
-      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "parse-asn1": "^5.0.0",
-        "randombytes": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "node_modules/public-encrypt/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/punycode": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-      "dev": true
-    },
-    "node_modules/querystring": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
-      "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
-    "node_modules/querystring-es3": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
-    "node_modules/queue-microtask": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/quick-lru": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
-      "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/randombytes": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "node_modules/randomfill": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-      "dev": true,
-      "dependencies": {
-        "randombytes": "^2.0.5",
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "node_modules/read-pkg": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
-      "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
-      "dev": true,
-      "dependencies": {
-        "@types/normalize-package-data": "^2.4.0",
-        "normalize-package-data": "^2.5.0",
-        "parse-json": "^5.0.0",
-        "type-fest": "^0.6.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg-up": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
-      "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^4.1.0",
-        "read-pkg": "^5.2.0",
-        "type-fest": "^0.8.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg/node_modules/hosted-git-info": {
-      "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-      "dev": true
-    },
-    "node_modules/read-pkg/node_modules/normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-      "dev": true,
-      "dependencies": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
-      }
-    },
-    "node_modules/read-pkg/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/read-pkg/node_modules/type-fest": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-      "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/readable-stream/node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "node_modules/rechoir": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz",
-      "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==",
-      "dev": true,
-      "dependencies": {
-        "resolve": "^1.9.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/redent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
-      "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
-      "dev": true,
-      "dependencies": {
-        "indent-string": "^4.0.0",
-        "strip-indent": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/reduce-css-calc": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz",
-      "integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^0.4.2",
-        "math-expression-evaluator": "^1.2.14",
-        "reduce-function-call": "^1.0.1"
-      }
-    },
-    "node_modules/reduce-css-calc/node_modules/balanced-match": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-      "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
-      "dev": true
-    },
-    "node_modules/reduce-function-call": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.3.tgz",
-      "integrity": "sha512-Hl/tuV2VDgWgCSEeWMLwxLZqX7OK59eU1guxXsRKTAyeYimivsKdtcV4fu3r710tpG5GmDKDhQ0HSZLExnNmyQ==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/regenerate": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
-      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
-      "dev": true
-    },
-    "node_modules/regenerate-unicode-properties": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz",
-      "integrity": "sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==",
-      "dev": true,
-      "dependencies": {
-        "regenerate": "^1.4.2"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/regenerator-runtime": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
-      "dev": true
-    },
-    "node_modules/regenerator-transform": {
-      "version": "0.15.0",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz",
-      "integrity": "sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.8.4"
-      }
-    },
-    "node_modules/regexpp": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      }
-    },
-    "node_modules/regexpu-core": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.0.1.tgz",
-      "integrity": "sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw==",
-      "dev": true,
-      "dependencies": {
-        "regenerate": "^1.4.2",
-        "regenerate-unicode-properties": "^10.0.1",
-        "regjsgen": "^0.6.0",
-        "regjsparser": "^0.8.2",
-        "unicode-match-property-ecmascript": "^2.0.0",
-        "unicode-match-property-value-ecmascript": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/regjsgen": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.6.0.tgz",
-      "integrity": "sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA==",
-      "dev": true
-    },
-    "node_modules/regjsparser": {
-      "version": "0.8.4",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.8.4.tgz",
-      "integrity": "sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==",
-      "dev": true,
-      "dependencies": {
-        "jsesc": "~0.5.0"
-      },
-      "bin": {
-        "regjsparser": "bin/parser"
-      }
-    },
-    "node_modules/regjsparser/node_modules/jsesc": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-      "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
-      "dev": true,
-      "bin": {
-        "jsesc": "bin/jsesc"
-      }
-    },
-    "node_modules/relateurl": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
-      "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/renderkid": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz",
-      "integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==",
-      "dev": true,
-      "dependencies": {
-        "css-select": "^4.1.3",
-        "dom-converter": "^0.2.0",
-        "htmlparser2": "^6.1.0",
-        "lodash": "^4.17.21",
-        "strip-ansi": "^6.0.1"
-      }
-    },
-    "node_modules/renderkid/node_modules/entities": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
-    "node_modules/renderkid/node_modules/htmlparser2": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
-      "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
-      "dev": true,
-      "funding": [
-        "https://github.com/fb55/htmlparser2?sponsor=1",
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ],
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.0.0",
-        "domutils": "^2.5.2",
-        "entities": "^2.0.0"
-      }
-    },
-    "node_modules/require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/require-from-string": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/resolve": {
-      "version": "1.22.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
-      "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
-      "dev": true,
-      "dependencies": {
-        "is-core-module": "^2.8.1",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/resolve-cwd": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
-      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
-      "dev": true,
-      "dependencies": {
-        "resolve-from": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/resolve-cwd/node_modules/resolve-from": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-      "dev": true,
-      "engines": {
-        "iojs": ">=1.0.0",
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/rgb": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/rgb/-/rgb-0.1.0.tgz",
-      "integrity": "sha1-vieykej+/+rBvZlylyG/pA/AN7U=",
-      "dev": true,
-      "bin": {
-        "rgb": "bin/rgb"
-      }
-    },
-    "node_modules/rgb-hex": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/rgb-hex/-/rgb-hex-2.1.0.tgz",
-      "integrity": "sha1-x3PF/iJoolV42SU5qCp6XOU77aY=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/ripemd160": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-      "dev": true,
-      "dependencies": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
-      }
-    },
-    "node_modules/run-parallel": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "queue-microtask": "^1.2.2"
-      }
-    },
-    "node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
-    },
-    "node_modules/safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
-    },
-    "node_modules/sass-embedded": {
-      "version": "1.55.0",
-      "resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.55.0.tgz",
-      "integrity": "sha512-6AkKEyRjxz37iNwOdTOW94I33j5mxcih9Z604q1w0M1dOTKaZgtyNI67O0zb4akwZ9dVZ2VSJBXqY8/1TZRBIw==",
-      "dev": true,
-      "dependencies": {
-        "buffer-builder": "^0.2.0",
-        "google-protobuf": "^3.11.4",
-        "immutable": "^4.0.0",
-        "rxjs": "^7.4.0",
-        "supports-color": "^8.1.1"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      },
-      "optionalDependencies": {
-        "sass-embedded-darwin-arm64": "1.55.0",
-        "sass-embedded-darwin-x64": "1.55.0",
-        "sass-embedded-linux-arm": "1.55.0",
-        "sass-embedded-linux-arm64": "1.55.0",
-        "sass-embedded-linux-ia32": "1.55.0",
-        "sass-embedded-linux-x64": "1.55.0",
-        "sass-embedded-win32-ia32": "1.55.0",
-        "sass-embedded-win32-x64": "1.55.0"
-      }
-    },
-    "node_modules/sass-embedded-darwin-arm64": {
-      "version": "1.55.0",
-      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-arm64/-/sass-embedded-darwin-arm64-1.55.0.tgz",
-      "integrity": "sha512-cQ43gYDFo4xWSqG01ZmOhTyTgk/RYK7s1a4R+7VSQPhYTsd4VofAmTNw0MkLR3RzR53ziGgawA6uT/WHTm+yjg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/sass-embedded-darwin-x64": {
-      "version": "1.55.0",
-      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-x64/-/sass-embedded-darwin-x64-1.55.0.tgz",
-      "integrity": "sha512-ra8z++EBey01pkiwCwjWyMbf6G5xm2Uj0dUJzzsS1MI6Fw6XaesrWmYico5pnawm3rOYtKlMxkd2Y6b1Jwxy8A==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/sass-embedded-linux-arm": {
-      "version": "1.55.0",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm/-/sass-embedded-linux-arm-1.55.0.tgz",
-      "integrity": "sha512-UIW7CaRLjHMWm64jH23n5eji/RAv8XIJ2qpFh0Ds8EJeDZmRA+qyIFHcQ805fZ22u6o0mkxq0kE4+j1XmmbBeg==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/sass-embedded-linux-arm64": {
-      "version": "1.55.0",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm64/-/sass-embedded-linux-arm64-1.55.0.tgz",
-      "integrity": "sha512-P4zL4PnujdiSkek/g0RJjyNZcYEqSm6WFr0sSIrxe3byhGg56mWr4WJdxUNwFZ6sxyy2s0PFSjSKGmBtgEfIpw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/sass-embedded-linux-ia32": {
-      "version": "1.55.0",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-ia32/-/sass-embedded-linux-ia32-1.55.0.tgz",
-      "integrity": "sha512-9XJyAl4w5KBjR4LAXckfQKqPv9UYPmOv2HFRBwhHD1k4Dc8gZbfTCzK5wl49z5Z4z1GPvqV9ucIZceXzgJ5e6Q==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/sass-embedded-linux-x64": {
-      "version": "1.55.0",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-x64/-/sass-embedded-linux-x64-1.55.0.tgz",
-      "integrity": "sha512-vd4/4/L7gZcVyxq03/MY/+rcpGgOI0ihOUpwRJLj+9CmUxvhxCSTF51/QO5CW7Z5oJSYEABA/RYlj8NPm4ZejA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/sass-embedded-win32-ia32": {
-      "version": "1.55.0",
-      "resolved": "https://registry.npmjs.org/sass-embedded-win32-ia32/-/sass-embedded-win32-ia32-1.55.0.tgz",
-      "integrity": "sha512-4HxK0byJ3iIn5OECIeNVz9GcGBuQcQT6kTvI+3QSHzuKsqgQrlXOPJ3772zKD6PVwZJNFZJFf3o9w8V2VSHbTQ==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/sass-embedded-win32-x64": {
-      "version": "1.55.0",
-      "resolved": "https://registry.npmjs.org/sass-embedded-win32-x64/-/sass-embedded-win32-x64-1.55.0.tgz",
-      "integrity": "sha512-LWUp5YpJy0/Q+5AOVcw919jktw+OnPiM4f4j5K6MJAiaodJwrSTqRGwMa2wOWyAUpjIdka8Ygm6j+2h5HNgSNQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/sass-embedded/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/sass-embedded/node_modules/rxjs": {
-      "version": "7.5.7",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.7.tgz",
-      "integrity": "sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/sass-embedded/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
-      }
-    },
-    "node_modules/sass-loader": {
-      "version": "13.0.2",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.0.2.tgz",
-      "integrity": "sha512-BbiqbVmbfJaWVeOOAu2o7DhYWtcNmTfvroVgFXa6k2hHheMxNAeDHLNoDy/Q5aoaVlz0LH+MbMktKwm9vN/j8Q==",
-      "dev": true,
-      "dependencies": {
-        "klona": "^2.0.4",
-        "neo-async": "^2.6.2"
-      },
-      "engines": {
-        "node": ">= 14.15.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "fibers": ">= 3.1.0",
-        "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0",
-        "sass": "^1.3.0",
-        "sass-embedded": "*",
-        "webpack": "^5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "fibers": {
-          "optional": true
-        },
-        "node-sass": {
-          "optional": true
-        },
-        "sass": {
-          "optional": true
-        },
-        "sass-embedded": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-      "dev": true
-    },
-    "node_modules/saxes": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
-      "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
-      "dev": true,
-      "dependencies": {
-        "xmlchars": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/schema-utils": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
-      "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.5",
-        "ajv": "^6.12.4",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 8.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/select2": {
-      "version": "4.0.13",
-      "resolved": "https://registry.npmjs.org/select2/-/select2-4.0.13.tgz",
-      "integrity": "sha512-1JeB87s6oN/TDxQQYCvS5EFoQyvV6eYMZZ0AeA4tdFDYWN3BAGZ8npr17UBFddU0lgAt3H0yjX3X6/ekOj1yjw=="
-    },
-    "node_modules/select2-bootstrap-theme": {
-      "version": "0.1.0-beta.10",
-      "resolved": "https://registry.npmjs.org/select2-bootstrap-theme/-/select2-bootstrap-theme-0.1.0-beta.10.tgz",
-      "integrity": "sha512-gc9Y9yNjkGRqeFmI/pAKyL4maMKH9VKAn62E+uF/hxz8FTmfuKH0sDEGhFhk3f8Jp+emtsDdK1c1nb6S51BV0Q=="
-    },
-    "node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/setimmediate": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
-      "dev": true
-    },
-    "node_modules/sha.js": {
-      "version": "2.4.11",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      },
-      "bin": {
-        "sha.js": "bin.js"
-      }
-    },
-    "node_modules/shallow-clone": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
-      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dev": true,
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "dev": true
-    },
-    "node_modules/simple-swizzle": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
-      "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
-      "dev": true,
-      "dependencies": {
-        "is-arrayish": "^0.3.1"
-      }
-    },
-    "node_modules/simple-swizzle/node_modules/is-arrayish": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
-      "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
-      "dev": true
-    },
-    "node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/source-list-map": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
-      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
-      "dev": true
-    },
-    "node_modules/source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-js": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-support": {
-      "version": "0.5.21",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-      "dev": true,
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      }
-    },
-    "node_modules/source-map-support/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/spdx-correct": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
-      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
-      "dev": true,
-      "dependencies": {
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-exceptions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
-      "dev": true
-    },
-    "node_modules/spdx-expression-parse": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
-      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
-      "dev": true,
-      "dependencies": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-expression-validate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/spdx-expression-validate/-/spdx-expression-validate-2.0.0.tgz",
-      "integrity": "sha512-b3wydZLM+Tc6CFvaRDBOF9d76oGIHNCLYFeHbftFXUWjnfZWganmDmvtM5sm1cRwJc/VDBMLyGGrsLFd1vOxbg==",
-      "dev": true,
-      "dependencies": {
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-license-ids": {
-      "version": "3.0.11",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz",
-      "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==",
-      "dev": true
-    },
-    "node_modules/specificity": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/specificity/-/specificity-0.4.1.tgz",
-      "integrity": "sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==",
-      "dev": true,
-      "bin": {
-        "specificity": "bin/specificity"
-      }
-    },
-    "node_modules/split2": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/split2/-/split2-0.2.1.tgz",
-      "integrity": "sha1-At2smtwD7Au3jBKC7Aecpuha6QA=",
-      "dev": true,
-      "dependencies": {
-        "through2": "~0.6.1"
-      }
-    },
-    "node_modules/split2/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-      "dev": true
-    },
-    "node_modules/split2/node_modules/readable-stream": {
-      "version": "1.0.34",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-      "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/split2/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-      "dev": true
-    },
-    "node_modules/split2/node_modules/through2": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-      "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": ">=1.0.33-1 <1.1.0-0",
-        "xtend": ">=4.0.0 <4.1.0-0"
-      }
-    },
-    "node_modules/stream-browserify": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
-      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "~2.0.1",
-        "readable-stream": "^2.0.2"
-      }
-    },
-    "node_modules/stream-http": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
-      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
-      "dev": true,
-      "dependencies": {
-        "builtin-status-codes": "^3.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.3.6",
-        "to-arraybuffer": "^1.0.0",
-        "xtend": "^4.0.0"
-      }
-    },
-    "node_modules/string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
-    "node_modules/string_decoder/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/string.prototype.trimend": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
-      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimstart": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
-      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/strip-final-newline": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/strip-indent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
-      "dev": true,
-      "dependencies": {
-        "min-indent": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/style-loader": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.3.0.tgz",
-      "integrity": "sha512-V7TCORko8rs9rIqkSrlMfkqA63DfoGBBJmK1kKGCcSi+BWb4cqz0SRsnp4l6rU5iwOEd0/2ePv68SV22VXon4Q==",
-      "dev": true,
-      "dependencies": {
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^2.7.0"
-      },
-      "engines": {
-        "node": ">= 8.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/style-search": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
-      "integrity": "sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI=",
-      "dev": true
-    },
-    "node_modules/stylelint": {
-      "version": "14.7.1",
-      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.7.1.tgz",
-      "integrity": "sha512-rUOWm67hrzGXXyO/cInENEejF4urh1dLgOb9cr/3XLDb/t/A+rXQp3p6+no8o8QCKTgBUdhVUq/bXMgE988PJw==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^2.0.0",
-        "colord": "^2.9.2",
-        "cosmiconfig": "^7.0.1",
-        "css-functions-list": "^3.0.1",
-        "debug": "^4.3.4",
-        "execall": "^2.0.0",
-        "fast-glob": "^3.2.11",
-        "fastest-levenshtein": "^1.0.12",
-        "file-entry-cache": "^6.0.1",
-        "get-stdin": "^8.0.0",
-        "global-modules": "^2.0.0",
-        "globby": "^11.1.0",
-        "globjoin": "^0.1.4",
-        "html-tags": "^3.2.0",
-        "ignore": "^5.2.0",
-        "import-lazy": "^4.0.0",
-        "imurmurhash": "^0.1.4",
-        "is-plain-object": "^5.0.0",
-        "known-css-properties": "^0.24.0",
-        "mathml-tag-names": "^2.1.3",
-        "meow": "^9.0.0",
-        "micromatch": "^4.0.5",
-        "normalize-path": "^3.0.0",
-        "normalize-selector": "^0.2.0",
-        "picocolors": "^1.0.0",
-        "postcss": "^8.4.12",
-        "postcss-media-query-parser": "^0.2.3",
-        "postcss-resolve-nested-selector": "^0.1.1",
-        "postcss-safe-parser": "^6.0.0",
-        "postcss-selector-parser": "^6.0.10",
-        "postcss-value-parser": "^4.2.0",
-        "resolve-from": "^5.0.0",
-        "specificity": "^0.4.1",
-        "string-width": "^4.2.3",
-        "strip-ansi": "^6.0.1",
-        "style-search": "^0.1.0",
-        "supports-hyperlinks": "^2.2.0",
-        "svg-tags": "^1.0.0",
-        "table": "^6.8.0",
-        "v8-compile-cache": "^2.3.0",
-        "write-file-atomic": "^4.0.1"
-      },
-      "bin": {
-        "stylelint": "bin/stylelint.js"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/stylelint"
-      }
-    },
-    "node_modules/stylelint-config-prestashop": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/stylelint-config-prestashop/-/stylelint-config-prestashop-1.0.7.tgz",
-      "integrity": "sha512-Ac2D15Jsk/zOmHJ4mu5g29bLQFkOmuSKGE/n8Scjs6YAOL/7QRhq26hXzlZ21+VMFi2bqKdjzqmYKbhgUHGpCA==",
-      "dev": true,
-      "dependencies": {
-        "stylelint-config-twbs-bootstrap": "^3.0.1",
-        "stylelint-no-unsupported-browser-features": "^5.0.1"
-      }
-    },
-    "node_modules/stylelint-config-prestashop/node_modules/postcss-scss": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.3.tgz",
-      "integrity": "sha512-j4KxzWovfdHsyxwl1BxkUal/O4uirvHgdzMKS1aWJBAV0qh2qj5qAZqpeBfVUYGWv+4iK9Az7SPyZ4fyNju1uA==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
-      },
-      "peerDependencies": {
-        "postcss": "^8.3.3"
-      }
-    },
-    "node_modules/stylelint-config-prestashop/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/stylelint-config-prestashop/node_modules/stylelint-config-recess-order": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-recess-order/-/stylelint-config-recess-order-3.0.0.tgz",
-      "integrity": "sha512-uNXrlDz570Q7HJlrq8mNjgfO/xlKIh2hKVKEFMTG1/ih/6tDLcTbuvO1Zoo2dnQay990OAkWLDpTDOorB+hmBw==",
-      "dev": true,
-      "dependencies": {
-        "stylelint-order": "5.x"
-      },
-      "peerDependencies": {
-        "stylelint": ">=14"
-      }
-    },
-    "node_modules/stylelint-config-prestashop/node_modules/stylelint-config-recommended": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-6.0.0.tgz",
-      "integrity": "sha512-ZorSSdyMcxWpROYUvLEMm0vSZud2uB7tX1hzBZwvVY9SV/uly4AvvJPPhCcymZL3fcQhEQG5AELmrxWqtmzacw==",
-      "dev": true,
-      "peerDependencies": {
-        "stylelint": "^14.0.0"
-      }
-    },
-    "node_modules/stylelint-config-prestashop/node_modules/stylelint-config-recommended-scss": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-5.0.2.tgz",
-      "integrity": "sha512-b14BSZjcwW0hqbzm9b0S/ScN2+3CO3O4vcMNOw2KGf8lfVSwJ4p5TbNEXKwKl1+0FMtgRXZj6DqVUe/7nGnuBg==",
-      "dev": true,
-      "dependencies": {
-        "postcss-scss": "^4.0.2",
-        "stylelint-config-recommended": "^6.0.0",
-        "stylelint-scss": "^4.0.0"
-      },
-      "peerDependencies": {
-        "stylelint": "^14.0.0"
-      }
-    },
-    "node_modules/stylelint-config-prestashop/node_modules/stylelint-config-standard": {
-      "version": "24.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-24.0.0.tgz",
-      "integrity": "sha512-+RtU7fbNT+VlNbdXJvnjc3USNPZRiRVp/d2DxOF/vBDDTi0kH5RX2Ny6errdtZJH3boO+bmqIYEllEmok4jiuw==",
-      "dev": true,
-      "dependencies": {
-        "stylelint-config-recommended": "^6.0.0"
-      },
-      "peerDependencies": {
-        "stylelint": "^14.0.0"
-      }
-    },
-    "node_modules/stylelint-config-prestashop/node_modules/stylelint-config-standard-scss": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-standard-scss/-/stylelint-config-standard-scss-3.0.0.tgz",
-      "integrity": "sha512-zt3ZbzIbllN1iCmc94e4pDxqpkzeR6CJo5DDXzltshuXr+82B8ylHyMMARNnUYrZH80B7wgY7UkKTYCFM0UUyw==",
-      "dev": true,
-      "dependencies": {
-        "stylelint-config-recommended-scss": "^5.0.2",
-        "stylelint-config-standard": "^24.0.0"
-      },
-      "peerDependencies": {
-        "stylelint": "^14.0.0"
-      }
-    },
-    "node_modules/stylelint-config-prestashop/node_modules/stylelint-config-twbs-bootstrap": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/stylelint-config-twbs-bootstrap/-/stylelint-config-twbs-bootstrap-3.0.1.tgz",
-      "integrity": "sha512-XvFWKO0aveUy/RziVa5osYaOXAX6CePt8YypnRwKdrMtZWkgP85xnrkYBEpS2fmKl2WN79NCdSQFLU/UFoP7hw==",
-      "dev": true,
-      "dependencies": {
-        "stylelint-config-recess-order": "^3.0.0",
-        "stylelint-config-standard": "^24.0.0",
-        "stylelint-config-standard-scss": "^3.0.0",
-        "stylelint-scss": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "peerDependencies": {
-        "stylelint": "^14.1.0"
-      }
-    },
-    "node_modules/stylelint-config-prestashop/node_modules/stylelint-order": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-5.0.0.tgz",
-      "integrity": "sha512-OWQ7pmicXufDw5BlRqzdz3fkGKJPgLyDwD1rFY3AIEfIH/LQY38Vu/85v8/up0I+VPiuGRwbc2Hg3zLAsJaiyw==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^8.3.11",
-        "postcss-sorting": "^7.0.1"
-      },
-      "peerDependencies": {
-        "stylelint": "^14.0.0"
-      }
-    },
-    "node_modules/stylelint-config-prestashop/node_modules/stylelint-scss": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-4.2.0.tgz",
-      "integrity": "sha512-HHHMVKJJ5RM9pPIbgJ/XA67h9H0407G68Rm69H4fzFbFkyDMcTV1Byep3qdze5+fJ3c0U7mJrbj6S0Fg072uZA==",
-      "dev": true,
-      "dependencies": {
-        "lodash": "^4.17.21",
-        "postcss-media-query-parser": "^0.2.3",
-        "postcss-resolve-nested-selector": "^0.1.1",
-        "postcss-selector-parser": "^6.0.6",
-        "postcss-value-parser": "^4.1.0"
-      },
-      "peerDependencies": {
-        "stylelint": "^14.5.1"
-      }
-    },
-    "node_modules/stylelint-no-unsupported-browser-features": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/stylelint-no-unsupported-browser-features/-/stylelint-no-unsupported-browser-features-5.0.3.tgz",
-      "integrity": "sha512-FqfbOTk5UEkHsAKOkPH6SvajsfO9YuoWvKxd34tCRBZug9ZNeaPn141nyWkd+ncc8S1gVmO2+O6qVAMj9bvWww==",
-      "dev": true,
-      "dependencies": {
-        "doiuse": "^4.4.1",
-        "lodash": "^4.17.15",
-        "postcss": "^8.3.6"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "peerDependencies": {
-        "stylelint": ">=13.0.0"
-      }
-    },
-    "node_modules/stylelint/node_modules/ajv": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-      "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/stylelint/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/stylelint/node_modules/array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/stylelint/node_modules/astral-regex": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/stylelint/node_modules/balanced-match": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz",
-      "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==",
-      "dev": true
-    },
-    "node_modules/stylelint/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/stylelint/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/stylelint/node_modules/get-stdin": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
-      "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/stylelint/node_modules/globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-      "dev": true,
-      "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/stylelint/node_modules/is-plain-object": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
-      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/stylelint/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true
-    },
-    "node_modules/stylelint/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/stylelint/node_modules/resolve-from": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/stylelint/node_modules/slice-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
-      }
-    },
-    "node_modules/stylelint/node_modules/table": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
-      "integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^8.0.1",
-        "lodash.truncate": "^4.4.2",
-        "slice-ansi": "^4.0.0",
-        "string-width": "^4.2.3",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/supports-hyperlinks": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
-      "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0",
-        "supports-color": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/supports-hyperlinks/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/supports-hyperlinks/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/svg-tags": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
-      "integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=",
-      "dev": true
-    },
-    "node_modules/symbol-tree": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
-      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
-      "dev": true
-    },
-    "node_modules/tapable": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/terser": {
-      "version": "5.12.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.12.1.tgz",
-      "integrity": "sha512-NXbs+7nisos5E+yXwAD+y7zrcTkMqb0dEJxIGtSKPdCBzopf7ni4odPul2aechpV7EXNvOudYOX2bb5tln1jbQ==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^8.5.0",
-        "commander": "^2.20.0",
-        "source-map": "~0.7.2",
-        "source-map-support": "~0.5.20"
-      },
-      "bin": {
-        "terser": "bin/terser"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/terser-webpack-plugin": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz",
-      "integrity": "sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g==",
-      "dev": true,
-      "dependencies": {
-        "jest-worker": "^27.4.5",
-        "schema-utils": "^3.1.1",
-        "serialize-javascript": "^6.0.0",
-        "source-map": "^0.6.1",
-        "terser": "^5.7.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.1.0"
-      },
-      "peerDependenciesMeta": {
-        "@swc/core": {
-          "optional": true
-        },
-        "esbuild": {
-          "optional": true
-        },
-        "uglify-js": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/serialize-javascript": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
-      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
-      "dev": true,
-      "dependencies": {
-        "randombytes": "^2.1.0"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/terser/node_modules/acorn": {
-      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
-      "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/terser/node_modules/commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true
-    },
-    "node_modules/terser/node_modules/source-map": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-      "dev": true
-    },
-    "node_modules/through2": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz",
-      "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "3"
-      }
-    },
-    "node_modules/through2/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/timers-browserify": {
-      "version": "2.0.12",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
-      "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
-      "dev": true,
-      "dependencies": {
-        "setimmediate": "^1.0.4"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
-    "node_modules/to-arraybuffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
-      "dev": true
-    },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/tr46": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
-      "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
-      "dev": true,
-      "dependencies": {
-        "punycode": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/tr46/node_modules/punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/trim-newlines": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
-      "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/tsconfig-paths": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
-      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
-        "minimist": "^1.2.6",
-        "strip-bom": "^3.0.0"
-      }
-    },
-    "node_modules/tsconfig-paths/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/tslib": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
-      "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
-      "dev": true
-    },
-    "node_modules/tty-browserify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
-      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
-      "dev": true
-    },
-    "node_modules/type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/unbox-primitive": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
-      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "has-bigints": "^1.0.1",
-        "has-symbols": "^1.0.2",
-        "which-boxed-primitive": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/unicode-canonical-property-names-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/unicode-match-property-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
-      "dev": true,
-      "dependencies": {
-        "unicode-canonical-property-names-ecmascript": "^2.0.0",
-        "unicode-property-aliases-ecmascript": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/unicode-match-property-value-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/unicode-property-aliases-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/uniq": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
-      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
-      "dev": true
-    },
-    "node_modules/units-css": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/units-css/-/units-css-0.4.0.tgz",
-      "integrity": "sha1-1iKGU6UZg9fBb/KPi53Dsf/tOgc=",
-      "dev": true,
-      "dependencies": {
-        "isnumeric": "^0.2.0",
-        "viewport-dimensions": "^0.2.0"
-      }
-    },
-    "node_modules/universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
-    "node_modules/uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
-      "dependencies": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "node_modules/uri-js/node_modules/punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/url": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
-      "dev": true,
-      "dependencies": {
-        "punycode": "1.3.2",
-        "querystring": "0.2.0"
-      }
-    },
-    "node_modules/url/node_modules/punycode": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-      "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
-      "dev": true
-    },
-    "node_modules/util": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
-      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "2.0.3"
-      }
-    },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
-    },
-    "node_modules/util/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-      "dev": true
-    },
-    "node_modules/utila": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
-      "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=",
-      "dev": true
-    },
-    "node_modules/v8-compile-cache": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
-      "dev": true
-    },
-    "node_modules/validate-npm-package-license": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-      "dev": true,
-      "dependencies": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
-    "node_modules/vazirmatn": {
-      "version": "32.102.0",
-      "resolved": "https://registry.npmjs.org/vazirmatn/-/vazirmatn-32.102.0.tgz",
-      "integrity": "sha512-Fkvs0Hp5x9zjHTuwog3KEcARhMLxjXd3o3MyD/vBywxYt2LG+4THEHpu6AW8ojfHJAutrxFnDTPB/5hvkX80ww=="
-    },
-    "node_modules/viewport-dimensions": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/viewport-dimensions/-/viewport-dimensions-0.2.0.tgz",
-      "integrity": "sha1-3nQHR9tTh/0XJfUXXpG6x2r982w=",
-      "dev": true
-    },
-    "node_modules/vm-browserify": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
-      "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
-      "dev": true
-    },
-    "node_modules/w3c-hr-time": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
-      "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
-      "dev": true,
-      "dependencies": {
-        "browser-process-hrtime": "^1.0.0"
-      }
-    },
-    "node_modules/w3c-xmlserializer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-3.0.0.tgz",
-      "integrity": "sha512-3WFqGEgSXIyGhOmAFtlicJNMjEps8b1MG31NCA0/vOF9+nKMUW1ckhi9cnNHmf88Rzw5V+dwIwsm2C7X8k9aQg==",
-      "dev": true,
-      "dependencies": {
-        "xml-name-validator": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/watchpack": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz",
-      "integrity": "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==",
-      "dev": true,
-      "dependencies": {
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.1.2"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/webidl-conversions": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
-      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/webpack": {
-      "version": "5.72.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.72.0.tgz",
-      "integrity": "sha512-qmSmbspI0Qo5ld49htys8GY9XhS9CGqFoHTsOVAnjBdg0Zn79y135R+k4IR4rKK6+eKaabMhJwiVB7xw0SJu5w==",
-      "dev": true,
-      "dependencies": {
-        "@types/eslint-scope": "^3.7.3",
-        "@types/estree": "^0.0.51",
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/wasm-edit": "1.11.1",
-        "@webassemblyjs/wasm-parser": "1.11.1",
-        "acorn": "^8.4.1",
-        "acorn-import-assertions": "^1.7.6",
-        "browserslist": "^4.14.5",
-        "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.9.2",
-        "es-module-lexer": "^0.9.0",
-        "eslint-scope": "5.1.1",
-        "events": "^3.2.0",
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.2.9",
-        "json-parse-better-errors": "^1.0.2",
-        "loader-runner": "^4.2.0",
-        "mime-types": "^2.1.27",
-        "neo-async": "^2.6.2",
-        "schema-utils": "^3.1.0",
-        "tapable": "^2.1.1",
-        "terser-webpack-plugin": "^5.1.3",
-        "watchpack": "^2.3.1",
-        "webpack-sources": "^3.2.3"
-      },
-      "bin": {
-        "webpack": "bin/webpack.js"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependenciesMeta": {
-        "webpack-cli": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/webpack-cli": {
-      "version": "4.9.2",
-      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.9.2.tgz",
-      "integrity": "sha512-m3/AACnBBzK/kMTcxWHcZFPrw/eQuY4Df1TxvIWfWM2x7mRqBQCqKEd96oCUa9jkapLBaFfRce33eGDb4Pr7YQ==",
-      "dev": true,
-      "dependencies": {
-        "@discoveryjs/json-ext": "^0.5.0",
-        "@webpack-cli/configtest": "^1.1.1",
-        "@webpack-cli/info": "^1.4.1",
-        "@webpack-cli/serve": "^1.6.1",
-        "colorette": "^2.0.14",
-        "commander": "^7.0.0",
-        "execa": "^5.0.0",
-        "fastest-levenshtein": "^1.0.12",
-        "import-local": "^3.0.2",
-        "interpret": "^2.2.0",
-        "rechoir": "^0.7.0",
-        "webpack-merge": "^5.7.3"
-      },
-      "bin": {
-        "webpack-cli": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "peerDependencies": {
-        "webpack": "4.x.x || 5.x.x"
-      },
-      "peerDependenciesMeta": {
-        "@webpack-cli/generators": {
-          "optional": true
-        },
-        "@webpack-cli/migrate": {
-          "optional": true
-        },
-        "webpack-bundle-analyzer": {
-          "optional": true
-        },
-        "webpack-dev-server": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/webpack-cli/node_modules/commander": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/webpack-cli/node_modules/interpret": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz",
-      "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/webpack-font-preload-plugin": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/webpack-font-preload-plugin/-/webpack-font-preload-plugin-1.5.0.tgz",
-      "integrity": "sha512-/Nh6MNa7/rbu3ZcqSR1SxB+G5XaITu7U2yZO5INTsVRpVlMLQmHQZCoDt4PP+iFyBdvBCDbA0CImRXHarQ0wpQ==",
-      "dev": true,
-      "dependencies": {
-        "jsdom": "^19.0.0",
-        "webpack-sources": "^3.2.2"
-      },
-      "engines": {
-        "node": ">= 10.17.0"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/webpack-font-preload-plugin/node_modules/webpack-sources": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/webpack-license-plugin": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/webpack-license-plugin/-/webpack-license-plugin-4.2.2.tgz",
-      "integrity": "sha512-OfIdm659IKurEInKlBN6Sfzrh+MNKIWkChKKg+aDCoPf3Ok1OSXBDd2RKSbuUAtxjmdW2j6LUVZWnRYRnVdOxA==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^5.0.1",
-        "get-npm-tarball-url": "^2.0.1",
-        "lodash": "^4.17.20",
-        "needle": "^2.2.4",
-        "spdx-expression-validate": "^2.0.0",
-        "webpack-sources": "^3.2.1"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "webpack": ">=4.0.0 < 6.0.0"
-      }
-    },
-    "node_modules/webpack-license-plugin/node_modules/chalk": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz",
-      "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==",
-      "dev": true,
-      "engines": {
-        "node": "^12.17.0 || ^14.13 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/webpack-license-plugin/node_modules/webpack-sources": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/webpack-merge": {
-      "version": "5.8.0",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz",
-      "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==",
-      "dev": true,
-      "dependencies": {
-        "clone-deep": "^4.0.1",
-        "wildcard": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/webpack-remove-empty-scripts": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/webpack-remove-empty-scripts/-/webpack-remove-empty-scripts-0.7.3.tgz",
-      "integrity": "sha512-yipqb25A0qtH7X9vKt6yihwyYkTtSlRiDdBb2QsyrkqGM3hpfAcfOO1lYDef9HQUNm3s8ojmorbNg32XXX6FYg==",
-      "dev": true,
-      "dependencies": {
-        "ansis": "^1.3.4"
-      },
-      "engines": {
-        "node": ">=12.14"
-      },
-      "funding": {
-        "type": "patreon",
-        "url": "https://patreon.com/biodiscus"
-      },
-      "peerDependencies": {
-        "webpack": ">=5.32.0"
-      }
-    },
-    "node_modules/webpack-sources": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
-      "dev": true,
-      "dependencies": {
-        "source-list-map": "^2.0.0",
-        "source-map": "~0.6.1"
-      }
-    },
-    "node_modules/webpack-sources/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/acorn": {
-      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
-      "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/webpack/node_modules/acorn-import-assertions": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
-      "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
-      "dev": true,
-      "peerDependencies": {
-        "acorn": "^8"
-      }
-    },
-    "node_modules/webpack/node_modules/enhanced-resolve": {
-      "version": "5.9.3",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.3.tgz",
-      "integrity": "sha512-Bq9VSor+kjvW3f9/MiiR4eE3XYgOl7/rS8lnSxbRbF3kS0B2r+Y9w5krBWxZgDxASVZbdYrn5wT4j/Wb0J9qow==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.2.4",
-        "tapable": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/webpack/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/webpack/node_modules/webpack-sources": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/whatwg-encoding": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
-      "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
-      "dev": true,
-      "dependencies": {
-        "iconv-lite": "0.6.3"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/whatwg-encoding/node_modules/iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "dev": true,
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/whatwg-mimetype": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
-      "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/whatwg-url": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-10.0.0.tgz",
-      "integrity": "sha512-CLxxCmdUby142H5FZzn4D8ikO1cmypvXVQktsgosNy4a4BHrDHeciBBGZhb0bNoR5/MltoCatso+vFjjGx8t0w==",
-      "dev": true,
-      "dependencies": {
-        "tr46": "^3.0.0",
-        "webidl-conversions": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
-      }
-    },
-    "node_modules/which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-      "dev": true,
-      "dependencies": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/wildcard": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
-      "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==",
-      "dev": true
-    },
-    "node_modules/word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
-    },
-    "node_modules/write-file-atomic": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.1.tgz",
-      "integrity": "sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==",
-      "dev": true,
-      "dependencies": {
-        "imurmurhash": "^0.1.4",
-        "signal-exit": "^3.0.7"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16"
-      }
-    },
-    "node_modules/ws": {
-      "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
-      "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/xml-name-validator": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
-      "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/xmlchars": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
-      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
-      "dev": true
-    },
-    "node_modules/xtend": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4"
-      }
-    },
-    "node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/yaml": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/yargs-parser": {
-      "version": "20.2.9",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    }
-  },
   "dependencies": {
     "@ampproject/remapping": {
       "version": "2.1.2",
@@ -12965,8 +1453,7 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.1.1.tgz",
       "integrity": "sha512-1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "@webpack-cli/info": {
       "version": "1.4.1",
@@ -12981,8 +1468,7 @@
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.6.1.tgz",
       "integrity": "sha512-gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "@xtuc/ieee754": {
       "version": "1.2.0",
@@ -13022,8 +1508,7 @@
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "acorn-walk": {
       "version": "7.2.0",
@@ -13056,8 +1541,7 @@
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
       "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "ansi-regex": {
       "version": "5.0.1",
@@ -13356,8 +1840,7 @@
     "bootstrap": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz",
-      "integrity": "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==",
-      "requires": {}
+      "integrity": "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ=="
     },
     "bourbon": {
       "version": "4.3.4",
@@ -15697,8 +4180,7 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
       "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "ieee754": {
       "version": "1.2.1",
@@ -16047,12 +4529,6 @@
         }
       }
     },
-    "jquery": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.1.tgz",
-      "integrity": "sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw==",
-      "peer": true
-    },
     "jquery.growl": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/jquery.growl/-/jquery.growl-1.3.5.tgz",
@@ -17221,12 +5697,6 @@
         }
       }
     },
-    "popper.js": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
-      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
-      "peer": true
-    },
     "postcss": {
       "version": "8.4.19",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.19.tgz",
@@ -18012,8 +6482,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
       "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "postcss-modules-local-by-default": {
       "version": "4.0.0",
@@ -18186,8 +6655,7 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz",
       "integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "postcss-selector-matches": {
       "version": "3.0.1",
@@ -18273,8 +6741,7 @@
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-7.0.1.tgz",
       "integrity": "sha512-iLBFYz6VRYyLJEJsBJ8M3TCqNcckVzz4wFounSc5Oez35ogE/X+aoC5fFu103Ot7NyvjU3/xqIXn93Gp3kJk4g==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "postcss-value-parser": {
       "version": "3.3.1",
@@ -19198,23 +7665,6 @@
         "xtend": "^4.0.0"
       }
     },
-    "string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.2.0"
-      },
-      "dependencies": {
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-          "dev": true
-        }
-      }
-    },
     "string-width": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -19246,6 +7696,23 @@
         "define-properties": "^1.1.3"
       }
     },
+    "string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.2.0"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+          "dev": true
+        }
+      }
+    },
     "strip-ansi": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
@@ -19485,8 +7952,7 @@
           "version": "4.0.3",
           "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.3.tgz",
           "integrity": "sha512-j4KxzWovfdHsyxwl1BxkUal/O4uirvHgdzMKS1aWJBAV0qh2qj5qAZqpeBfVUYGWv+4iK9Az7SPyZ4fyNju1uA==",
-          "dev": true,
-          "requires": {}
+          "dev": true
         },
         "postcss-value-parser": {
           "version": "4.2.0",
@@ -19507,8 +7973,7 @@
           "version": "6.0.0",
           "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-6.0.0.tgz",
           "integrity": "sha512-ZorSSdyMcxWpROYUvLEMm0vSZud2uB7tX1hzBZwvVY9SV/uly4AvvJPPhCcymZL3fcQhEQG5AELmrxWqtmzacw==",
-          "dev": true,
-          "requires": {}
+          "dev": true
         },
         "stylelint-config-recommended-scss": {
           "version": "5.0.2",
@@ -20087,8 +8552,7 @@
           "version": "1.8.0",
           "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
           "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
-          "dev": true,
-          "requires": {}
+          "dev": true
         },
         "enhanced-resolve": {
           "version": "5.9.3",
@@ -20326,8 +8790,7 @@
       "version": "8.5.0",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
       "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "xml-name-validator": {
       "version": "4.0.0",
diff --git a/admin-dev/themes/new-theme/js/pages/attribute-group/index.ts b/admin-dev/themes/new-theme/js/pages/attribute-group/index.ts
index 885066a154cc6..76c5317f4e461 100644
--- a/admin-dev/themes/new-theme/js/pages/attribute-group/index.ts
+++ b/admin-dev/themes/new-theme/js/pages/attribute-group/index.ts
@@ -53,4 +53,13 @@ $(() => {
 
   const showcaseCard = new ShowcaseCard('attributesShowcaseCard');
   showcaseCard.addExtension(new ShowcaseCardCloseExtension());
+
+  window.prestashop.component.initComponents(
+    [
+      'TranslatableInput',
+      'TranslatableField',
+    ],
+  );
+
+  new window.prestashop.component.ChoiceTree('#attribute_group_shop_association').enableAutoCheckChildren();
 });
diff --git a/admin-dev/themes/new-theme/package-lock.json b/admin-dev/themes/new-theme/package-lock.json
index 67e8d2903b8c8..62585aa06f38d 100644
--- a/admin-dev/themes/new-theme/package-lock.json
+++ b/admin-dev/themes/new-theme/package-lock.json
@@ -1,14275 +1,8 @@
 {
   "name": "new-theme",
   "version": "1.0.0",
-  "lockfileVersion": 2,
+  "lockfileVersion": 1,
   "requires": true,
-  "packages": {
-    "": {
-      "name": "new-theme",
-      "version": "1.0.0",
-      "license": "OSL-3.0",
-      "dependencies": {
-        "bignumber.js": "^9.0.1",
-        "bootstrap-colorpicker": "^3.2.0",
-        "bootstrap-tokenfield": "^0.12.0",
-        "bourbon": "^4.2.6",
-        "dropzone": "^5.9.3",
-        "eonasdan-bootstrap-datetimepicker": "^4.17.47",
-        "events": "^3.0.0",
-        "fos-routing": "0.0.6",
-        "jets": "0.11.0",
-        "jquery-serializejson": "^3.2.0",
-        "jquery-ui-dist": "^1.12.1",
-        "jwerty": "^0.3.2",
-        "lodash": "^4.17.21",
-        "lodash.escaperegexp": "^4.1.2",
-        "magnific-popup": "^1.1.0",
-        "moment": "^2.24.0",
-        "perfect-scrollbar": "^1.5.0",
-        "photoswipe": "^4.1.3",
-        "postcss": "^8.4.4",
-        "prestakit": "^1.2.6",
-        "punycode": "^2.1.1",
-        "resize-observer-polyfill": "^1.5.1",
-        "sprintf-js": "^1.1.2",
-        "tablednd": "^1.0.3",
-        "terser-webpack-plugin": "^5.2.5",
-        "typeahead.js": "^0.11.1",
-        "url-polyfill": "^1.1.7",
-        "vazirmatn": "32.102.0",
-        "vue": "^3.2.33",
-        "vue-i18n": "^9.1.10",
-        "vue-resource": "^1.5.1",
-        "vue-router": "^4.0.15",
-        "vuex": "^4.0.2",
-        "zxcvbn": "^4.4.2"
-      },
-      "devDependencies": {
-        "@babel/core": "^7.15.7",
-        "@babel/eslint-parser": "^7.18.9",
-        "@types/bootstrap": "^4.5.0",
-        "@types/dropzone": "^5.7.4",
-        "@types/jquery": "^3.5.5",
-        "@types/jquery.growl": "^1.3.4",
-        "@types/lodash": "^4.14.170",
-        "@types/photoswipe": "^4.1.2",
-        "@types/sprintf-js": "^1.1.2",
-        "@types/typeahead.js": "^0.11.0",
-        "@types/zxcvbn": "^4.4.1",
-        "@typescript-eslint/eslint-plugin": "^5.33.1",
-        "@typescript-eslint/parser": "^5.33.1",
-        "@vue/compiler-sfc": "^3.2.33",
-        "@vue/eslint-config-typescript": "^11.0.0",
-        "@vue/runtime-dom": "^3.2.33",
-        "bootstrap": "~4.4.1",
-        "chai": "^4.2.0",
-        "clean-webpack-plugin": "^4.0.0",
-        "copy-webpack-plugin": "^11.0.0",
-        "core-js": "^3.18.0",
-        "css-loader": "^6.7.2",
-        "csso-webpack-plugin": "^2.0.0-beta.3",
-        "esbuild-loader": "^2.15.1",
-        "eslint": "^8.22.0",
-        "eslint-config-airbnb-base": "^15.0.0",
-        "eslint-import-resolver-webpack": "^0.12.1",
-        "eslint-plugin-html": "^6.0.0",
-        "eslint-plugin-import": "^2.20.0",
-        "eslint-plugin-vue": "^9.3.0",
-        "expose-loader": "^4.0.0",
-        "file-loader": "^5.0",
-        "fork-ts-checker-webpack-plugin": "^7.2.11",
-        "hot-accept-webpack-plugin": "^2.0.0-beta.7",
-        "html-webpack-plugin": "^5.5.0",
-        "imports-loader": "^4.0.1",
-        "mini-css-extract-plugin": "^2.6.1",
-        "mocha": "^6",
-        "path": "^0.12.7",
-        "postcss-loader": "^7.0.1",
-        "postcss-preset-env": "^7.8.2",
-        "sass-embedded": "^1.55.0",
-        "sass-loader": "^13.0.2",
-        "style-loader": "^3.3.1",
-        "stylelint": "^14.1.0",
-        "stylelint-config-prestashop": "^1.0.5",
-        "ts-loader": "^9.3.0",
-        "ts-node": "^10.7.0",
-        "tsconfig-paths": "^3.9.0",
-        "typescript": "^4.6.4",
-        "uglify-save-license": "^0.4.1",
-        "vue-eslint-parser": "^9.0.3",
-        "vue-loader": "^17.0.0",
-        "vue-style-loader": "^4.1.3",
-        "webpack": "^5.75.0",
-        "webpack-cli": "^5.0.1",
-        "webpack-dev-server": "^4.3.0",
-        "webpack-font-preload-plugin": "^1.5.0",
-        "webpack-license-plugin": "^4.2.1",
-        "webpack-remove-empty-scripts": "^0.7.1"
-      }
-    },
-    "node_modules/@ampproject/remapping": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
-      "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/gen-mapping": "^0.1.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/code-frame": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
-      "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/compat-data": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.5.tgz",
-      "integrity": "sha512-KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/core": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.7.tgz",
-      "integrity": "sha512-t1ZjCluspe5DW24bn2Rr1CDb2v9rn/hROtg9a2tmd0+QYf4bsloYfLQzjG4qHPNMhWtKdGC33R5AxGR2Af2cBw==",
-      "dev": true,
-      "dependencies": {
-        "@ampproject/remapping": "^2.1.0",
-        "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.20.7",
-        "@babel/helper-compilation-targets": "^7.20.7",
-        "@babel/helper-module-transforms": "^7.20.7",
-        "@babel/helpers": "^7.20.7",
-        "@babel/parser": "^7.20.7",
-        "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.20.7",
-        "@babel/types": "^7.20.7",
-        "convert-source-map": "^1.7.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.1",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/babel"
-      }
-    },
-    "node_modules/@babel/eslint-parser": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.19.1.tgz",
-      "integrity": "sha512-AqNf2QWt1rtu2/1rLswy6CDP7H9Oh3mMhk177Y67Rg8d7RD9WfOLLv8CGn6tisFvS2htm86yIe1yLF6I1UDaGQ==",
-      "dev": true,
-      "dependencies": {
-        "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
-        "eslint-visitor-keys": "^2.1.0",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || >=14.0.0"
-      },
-      "peerDependencies": {
-        "@babel/core": ">=7.11.0",
-        "eslint": "^7.5.0 || ^8.0.0"
-      }
-    },
-    "node_modules/@babel/generator": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.7.tgz",
-      "integrity": "sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.20.7",
-        "@jridgewell/gen-mapping": "^0.3.2",
-        "jsesc": "^2.5.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
-      "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/set-array": "^1.0.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz",
-      "integrity": "sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.20.5",
-        "@babel/helper-validator-option": "^7.18.6",
-        "browserslist": "^4.21.3",
-        "lru-cache": "^5.1.1",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
-      "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-function-name": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
-      "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.18.10",
-        "@babel/types": "^7.19.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
-      "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-module-imports": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
-      "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.7.tgz",
-      "integrity": "sha512-FNdu7r67fqMUSVuQpFQGE6BPdhJIhitoxhGzDbAXNcA07uoVG37fOiMk3OSV8rEICuyG6t8LGkd9EE64qIEoIA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-simple-access": "^7.20.2",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/helper-validator-identifier": "^7.19.1",
-        "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.20.7",
-        "@babel/types": "^7.20.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-simple-access": {
-      "version": "7.20.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz",
-      "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.20.2"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
-      "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-string-parser": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz",
-      "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
-      "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-option": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz",
-      "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helpers": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.7.tgz",
-      "integrity": "sha512-PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.20.7",
-        "@babel/types": "^7.20.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
-      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.18.6",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/parser": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.7.tgz",
-      "integrity": "sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==",
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/template": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz",
-      "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.18.6",
-        "@babel/parser": "^7.20.7",
-        "@babel/types": "^7.20.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/traverse": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.7.tgz",
-      "integrity": "sha512-xueOL5+ZKX2dJbg8z8o4f4uTRTqGDRjilva9D1hiRlayJbTY8jBRL+Ph67IeRTIE439/VifHk+Z4g0SwRtQE0A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.20.7",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.19.0",
-        "@babel/helper-hoist-variables": "^7.18.6",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/parser": "^7.20.7",
-        "@babel/types": "^7.20.7",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/types": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.7.tgz",
-      "integrity": "sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-string-parser": "^7.19.4",
-        "@babel/helper-validator-identifier": "^7.19.1",
-        "to-fast-properties": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@cspotcode/source-map-support": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
-      "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/trace-mapping": "0.3.9"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.9",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
-      "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/resolve-uri": "^3.0.3",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
-      }
-    },
-    "node_modules/@csstools/postcss-cascade-layers": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-1.1.1.tgz",
-      "integrity": "sha512-+KdYrpKC5TgomQr2DlZF4lDEpHcoxnj5IGddYYfBWJAKfj1JtuHUIqMa+E1pJJ+z3kvDViWMqyqPlG4Ja7amQA==",
-      "dev": true,
-      "dependencies": {
-        "@csstools/selector-specificity": "^2.0.2",
-        "postcss-selector-parser": "^6.0.10"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/@csstools/postcss-color-function": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-color-function/-/postcss-color-function-1.1.1.tgz",
-      "integrity": "sha512-Bc0f62WmHdtRDjf5f3e2STwRAl89N2CLb+9iAwzrv4L2hncrbDwnQD9PCq0gtAt7pOI2leIV08HIBUd4jxD8cw==",
-      "dev": true,
-      "dependencies": {
-        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/@csstools/postcss-font-format-keywords": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-1.0.1.tgz",
-      "integrity": "sha512-ZgrlzuUAjXIOc2JueK0X5sZDjCtgimVp/O5CEqTcs5ShWBa6smhWYbS0x5cVc/+rycTDbjjzoP0KTDnUneZGOg==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/@csstools/postcss-hwb-function": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-hwb-function/-/postcss-hwb-function-1.0.2.tgz",
-      "integrity": "sha512-YHdEru4o3Rsbjmu6vHy4UKOXZD+Rn2zmkAmLRfPet6+Jz4Ojw8cbWxe1n42VaXQhD3CQUXXTooIy8OkVbUcL+w==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/@csstools/postcss-ic-unit": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-ic-unit/-/postcss-ic-unit-1.0.1.tgz",
-      "integrity": "sha512-Ot1rcwRAaRHNKC9tAqoqNZhjdYBzKk1POgWfhN4uCOE47ebGcLRqXjKkApVDpjifL6u2/55ekkpnFcp+s/OZUw==",
-      "dev": true,
-      "dependencies": {
-        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/@csstools/postcss-is-pseudo-class": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.7.tgz",
-      "integrity": "sha512-7JPeVVZHd+jxYdULl87lvjgvWldYu+Bc62s9vD/ED6/QTGjy0jy0US/f6BG53sVMTBJ1lzKZFpYmofBN9eaRiA==",
-      "dev": true,
-      "dependencies": {
-        "@csstools/selector-specificity": "^2.0.0",
-        "postcss-selector-parser": "^6.0.10"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/@csstools/postcss-nested-calc": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-nested-calc/-/postcss-nested-calc-1.0.0.tgz",
-      "integrity": "sha512-JCsQsw1wjYwv1bJmgjKSoZNvf7R6+wuHDAbi5f/7MbFhl2d/+v+TvBTU4BJH3G1X1H87dHl0mh6TfYogbT/dJQ==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/@csstools/postcss-normalize-display-values": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-1.0.1.tgz",
-      "integrity": "sha512-jcOanIbv55OFKQ3sYeFD/T0Ti7AMXc9nM1hZWu8m/2722gOTxFg7xYu4RDLJLeZmPUVQlGzo4jhzvTUq3x4ZUw==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/@csstools/postcss-oklab-function": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.1.1.tgz",
-      "integrity": "sha512-nJpJgsdA3dA9y5pgyb/UfEzE7W5Ka7u0CX0/HIMVBNWzWemdcTH3XwANECU6anWv/ao4vVNLTMxhiPNZsTK6iA==",
-      "dev": true,
-      "dependencies": {
-        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/@csstools/postcss-progressive-custom-properties": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-1.3.0.tgz",
-      "integrity": "sha512-ASA9W1aIy5ygskZYuWams4BzafD12ULvSypmaLJT2jvQ8G0M3I8PRQhC0h7mG0Z3LI05+agZjqSR9+K9yaQQjA==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.3"
-      }
-    },
-    "node_modules/@csstools/postcss-stepped-value-functions": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-1.0.1.tgz",
-      "integrity": "sha512-dz0LNoo3ijpTOQqEJLY8nyaapl6umbmDcgj4AD0lgVQ572b2eqA1iGZYTTWhrcrHztWDDRAX2DGYyw2VBjvCvQ==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/@csstools/postcss-text-decoration-shorthand": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-1.0.0.tgz",
-      "integrity": "sha512-c1XwKJ2eMIWrzQenN0XbcfzckOLLJiczqy+YvfGmzoVXd7pT9FfObiSEfzs84bpE/VqfpEuAZ9tCRbZkZxxbdw==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/@csstools/postcss-trigonometric-functions": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-1.0.2.tgz",
-      "integrity": "sha512-woKaLO///4bb+zZC2s80l+7cm07M7268MsyG3M0ActXXEFi6SuhvriQYcb58iiKGbjwwIU7n45iRLEHypB47Og==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/@csstools/postcss-unset-value": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.2.tgz",
-      "integrity": "sha512-c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g==",
-      "dev": true,
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/@csstools/selector-specificity": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz",
-      "integrity": "sha512-IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg==",
-      "dev": true,
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2",
-        "postcss-selector-parser": "^6.0.10"
-      }
-    },
-    "node_modules/@discoveryjs/json-ext": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
-      "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/@esbuild/android-arm": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.15.18.tgz",
-      "integrity": "sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.18.tgz",
-      "integrity": "sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@eslint/eslintrc": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.0.tgz",
-      "integrity": "sha512-7yfvXy6MWLgWSFsLhz5yH3iQ52St8cdUY6FoGieKkRDVxuxmrNuUetIuu6cmjNWwniUHiWXjxCr5tTXDrbYS5A==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^9.4.0",
-        "globals": "^13.19.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
-        "strip-json-comments": "^3.1.1"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.19.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz",
-      "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@eslint/eslintrc/node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.8",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
-      "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==",
-      "dev": true,
-      "dependencies": {
-        "@humanwhocodes/object-schema": "^1.2.1",
-        "debug": "^4.1.1",
-        "minimatch": "^3.0.5"
-      },
-      "engines": {
-        "node": ">=10.10.0"
-      }
-    },
-    "node_modules/@humanwhocodes/module-importer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
-      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.22"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/nzakas"
-      }
-    },
-    "node_modules/@humanwhocodes/object-schema": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
-      "dev": true
-    },
-    "node_modules/@intlify/core-base": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.2.2.tgz",
-      "integrity": "sha512-JjUpQtNfn+joMbrXvpR4hTF8iJQ2sEFzzK3KIESOx+f+uwIjgw20igOyaIdhfsVVBCds8ZM64MoeNSx+PHQMkA==",
-      "dependencies": {
-        "@intlify/devtools-if": "9.2.2",
-        "@intlify/message-compiler": "9.2.2",
-        "@intlify/shared": "9.2.2",
-        "@intlify/vue-devtools": "9.2.2"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/@intlify/devtools-if": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/@intlify/devtools-if/-/devtools-if-9.2.2.tgz",
-      "integrity": "sha512-4ttr/FNO29w+kBbU7HZ/U0Lzuh2cRDhP8UlWOtV9ERcjHzuyXVZmjyleESK6eVP60tGC9QtQW9yZE+JeRhDHkg==",
-      "dependencies": {
-        "@intlify/shared": "9.2.2"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/@intlify/message-compiler": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.2.2.tgz",
-      "integrity": "sha512-IUrQW7byAKN2fMBe8z6sK6riG1pue95e5jfokn8hA5Q3Bqy4MBJ5lJAofUsawQJYHeoPJ7svMDyBaVJ4d0GTtA==",
-      "dependencies": {
-        "@intlify/shared": "9.2.2",
-        "source-map": "0.6.1"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/@intlify/shared": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.2.2.tgz",
-      "integrity": "sha512-wRwTpsslgZS5HNyM7uDQYZtxnbI12aGiBZURX3BTR9RFIKKRWpllTsgzHWvj3HKm3Y2Sh5LPC1r0PDCKEhVn9Q==",
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/@intlify/vue-devtools": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/@intlify/vue-devtools/-/vue-devtools-9.2.2.tgz",
-      "integrity": "sha512-+dUyqyCHWHb/UcvY1MlIpO87munedm3Gn6E9WWYdWrMuYLcoIoOEVDWSS8xSwtlPU+kA+MEQTP6Q1iI/ocusJg==",
-      "dependencies": {
-        "@intlify/core-base": "9.2.2",
-        "@intlify/shared": "9.2.2"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
-      "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/set-array": "^1.0.0",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
-      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/set-array": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/source-map": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz",
-      "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==",
-      "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      }
-    },
-    "node_modules/@jridgewell/source-map/node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
-      "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
-      "dependencies": {
-        "@jridgewell/set-array": "^1.0.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.14",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
-    },
-    "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.17",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz",
-      "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==",
-      "dependencies": {
-        "@jridgewell/resolve-uri": "3.1.0",
-        "@jridgewell/sourcemap-codec": "1.4.14"
-      }
-    },
-    "node_modules/@leichtgewicht/ip-codec": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz",
-      "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==",
-      "dev": true
-    },
-    "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": {
-      "version": "5.1.1-v1",
-      "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
-      "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==",
-      "dev": true,
-      "dependencies": {
-        "eslint-scope": "5.1.1"
-      }
-    },
-    "node_modules/@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@nodelib/fs.walk": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@sindresorhus/is": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",
-      "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/is?sponsor=1"
-      }
-    },
-    "node_modules/@szmarczak/http-timer": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
-      "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",
-      "dependencies": {
-        "defer-to-connect": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@tootallnate/once": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
-      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@tsconfig/node10": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz",
-      "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==",
-      "dev": true
-    },
-    "node_modules/@tsconfig/node12": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
-      "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
-      "dev": true
-    },
-    "node_modules/@tsconfig/node14": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
-      "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
-      "dev": true
-    },
-    "node_modules/@tsconfig/node16": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.3.tgz",
-      "integrity": "sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==",
-      "dev": true
-    },
-    "node_modules/@ttskch/select2-bootstrap4-theme": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/@ttskch/select2-bootstrap4-theme/-/select2-bootstrap4-theme-1.5.2.tgz",
-      "integrity": "sha512-gAj8qNy/VYwQDBkACm0USM66kxFai8flX83ayRXPNhzZckEgSqIBB9sM74SCM3ssgeX+ZVy4BifTnLis+KpIyg=="
-    },
-    "node_modules/@types/body-parser": {
-      "version": "1.19.2",
-      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz",
-      "integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==",
-      "dev": true,
-      "dependencies": {
-        "@types/connect": "*",
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/bonjour": {
-      "version": "3.5.10",
-      "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz",
-      "integrity": "sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/bootstrap": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/@types/bootstrap/-/bootstrap-4.6.2.tgz",
-      "integrity": "sha512-HbqVAre9VMZF8KBw1UpmBkw0xt4rjrAxMO/JWqFfJZGbVi09t8BVccvB/VxDlygVvvu0BZkAU8ocfNc7/jlFsA==",
-      "dev": true,
-      "dependencies": {
-        "@types/jquery": "*",
-        "popper.js": "^1.14.1"
-      }
-    },
-    "node_modules/@types/cacheable-request": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz",
-      "integrity": "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==",
-      "dependencies": {
-        "@types/http-cache-semantics": "*",
-        "@types/keyv": "^3.1.4",
-        "@types/node": "*",
-        "@types/responselike": "^1.0.0"
-      }
-    },
-    "node_modules/@types/connect": {
-      "version": "3.4.35",
-      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz",
-      "integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/connect-history-api-fallback": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz",
-      "integrity": "sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==",
-      "dev": true,
-      "dependencies": {
-        "@types/express-serve-static-core": "*",
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/dropzone": {
-      "version": "5.7.4",
-      "resolved": "https://registry.npmjs.org/@types/dropzone/-/dropzone-5.7.4.tgz",
-      "integrity": "sha512-9kLJ2YAmVRWYrHvDoa95pQzHF0HUMKcznsS7FM1Mht5Yieec+HMB6Ybfm+ocvLjvFCvgyYGFTp4nzNFxhZmo3g==",
-      "dev": true,
-      "dependencies": {
-        "@types/jquery": "*"
-      }
-    },
-    "node_modules/@types/eslint": {
-      "version": "8.4.10",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.10.tgz",
-      "integrity": "sha512-Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw==",
-      "dependencies": {
-        "@types/estree": "*",
-        "@types/json-schema": "*"
-      }
-    },
-    "node_modules/@types/eslint-scope": {
-      "version": "3.7.4",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
-      "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
-      "dependencies": {
-        "@types/eslint": "*",
-        "@types/estree": "*"
-      }
-    },
-    "node_modules/@types/estree": {
-      "version": "0.0.51",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
-      "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ=="
-    },
-    "node_modules/@types/express": {
-      "version": "4.17.15",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.15.tgz",
-      "integrity": "sha512-Yv0k4bXGOH+8a+7bELd2PqHQsuiANB+A8a4gnQrkRWzrkKlb6KHaVvyXhqs04sVW/OWlbPyYxRgYlIXLfrufMQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/body-parser": "*",
-        "@types/express-serve-static-core": "^4.17.31",
-        "@types/qs": "*",
-        "@types/serve-static": "*"
-      }
-    },
-    "node_modules/@types/express-serve-static-core": {
-      "version": "4.17.31",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz",
-      "integrity": "sha512-DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "@types/qs": "*",
-        "@types/range-parser": "*"
-      }
-    },
-    "node_modules/@types/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
-      "dev": true,
-      "dependencies": {
-        "@types/minimatch": "*",
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/html-minifier-terser": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
-      "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==",
-      "dev": true
-    },
-    "node_modules/@types/http-cache-semantics": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
-      "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ=="
-    },
-    "node_modules/@types/http-proxy": {
-      "version": "1.17.9",
-      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.9.tgz",
-      "integrity": "sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/jquery": {
-      "version": "3.5.14",
-      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.14.tgz",
-      "integrity": "sha512-X1gtMRMbziVQkErhTQmSe2jFwwENA/Zr+PprCkF63vFq+Yt5PZ4AlKqgmeNlwgn7dhsXEK888eIW2520EpC+xg==",
-      "dev": true,
-      "dependencies": {
-        "@types/sizzle": "*"
-      }
-    },
-    "node_modules/@types/jquery.growl": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/@types/jquery.growl/-/jquery.growl-1.3.5.tgz",
-      "integrity": "sha512-gOC04gG44DiRjudmPycoZXZ+BCJ/+YT7YptUjjpZuhkvVdRPz9vlyVACmP3e58U2u1bvKAMIxznYTbknLV6Lfg==",
-      "dev": true,
-      "dependencies": {
-        "@types/jquery": "*"
-      }
-    },
-    "node_modules/@types/json-schema": {
-      "version": "7.0.11",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
-      "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ=="
-    },
-    "node_modules/@types/json5": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
-      "dev": true
-    },
-    "node_modules/@types/keyv": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz",
-      "integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==",
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/lodash": {
-      "version": "4.14.191",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.191.tgz",
-      "integrity": "sha512-BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ==",
-      "dev": true
-    },
-    "node_modules/@types/mime": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz",
-      "integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==",
-      "dev": true
-    },
-    "node_modules/@types/minimatch": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",
-      "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==",
-      "dev": true
-    },
-    "node_modules/@types/minimist": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz",
-      "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==",
-      "dev": true
-    },
-    "node_modules/@types/node": {
-      "version": "18.11.17",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.17.tgz",
-      "integrity": "sha512-HJSUJmni4BeDHhfzn6nF0sVmd1SMezP7/4F0Lq+aXzmp2xm9O7WXrUtHW/CHlYVtZUbByEvWidHqRtcJXGF2Ng=="
-    },
-    "node_modules/@types/normalize-package-data": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
-      "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
-      "dev": true
-    },
-    "node_modules/@types/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
-      "dev": true
-    },
-    "node_modules/@types/photoswipe": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/@types/photoswipe/-/photoswipe-4.1.2.tgz",
-      "integrity": "sha512-HA9TtCAQKToldgxRiyJ1DbsElg/cQV/SQ8COVjqIqghjy60Zxfh78E1WiFotthquqkS86nz13Za9wEbToe0svQ==",
-      "dev": true
-    },
-    "node_modules/@types/qs": {
-      "version": "6.9.7",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
-      "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==",
-      "dev": true
-    },
-    "node_modules/@types/range-parser": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz",
-      "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==",
-      "dev": true
-    },
-    "node_modules/@types/responselike": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
-      "integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==",
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/retry": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
-      "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==",
-      "dev": true
-    },
-    "node_modules/@types/semver": {
-      "version": "7.3.13",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz",
-      "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==",
-      "dev": true
-    },
-    "node_modules/@types/serve-index": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==",
-      "dev": true,
-      "dependencies": {
-        "@types/express": "*"
-      }
-    },
-    "node_modules/@types/serve-static": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.0.tgz",
-      "integrity": "sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==",
-      "dev": true,
-      "dependencies": {
-        "@types/mime": "*",
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/sizzle": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz",
-      "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==",
-      "dev": true
-    },
-    "node_modules/@types/sockjs": {
-      "version": "0.3.33",
-      "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz",
-      "integrity": "sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/sprintf-js": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@types/sprintf-js/-/sprintf-js-1.1.2.tgz",
-      "integrity": "sha512-hkgzYF+qnIl8uTO8rmUSVSfQ8BIfMXC4yJAF4n8BE758YsKBZvFC4NumnAegj7KmylP0liEZNpb9RRGFMbFejA==",
-      "dev": true
-    },
-    "node_modules/@types/typeahead.js": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/@types/typeahead.js/-/typeahead.js-0.11.1.tgz",
-      "integrity": "sha512-brFWKbilAIFqX0eY47xERqeQKTkWTzuOYV5QfJtuOWWcKFBkM/LQrYH1jUUHUEkf9IpYdefsQB2WclH8dhgLDw==",
-      "dev": true,
-      "dependencies": {
-        "@types/jquery": "*"
-      }
-    },
-    "node_modules/@types/webpack": {
-      "version": "5.28.0",
-      "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-5.28.0.tgz",
-      "integrity": "sha512-8cP0CzcxUiFuA9xGJkfeVpqmWTk9nx6CWwamRGCj95ph1SmlRRk9KlCZ6avhCbZd4L68LvYT6l1kpdEnQXrF8w==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "tapable": "^2.2.0",
-        "webpack": "^5"
-      }
-    },
-    "node_modules/@types/ws": {
-      "version": "8.5.3",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz",
-      "integrity": "sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/zxcvbn": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/@types/zxcvbn/-/zxcvbn-4.4.1.tgz",
-      "integrity": "sha512-3NoqvZC2W5gAC5DZbTpCeJ251vGQmgcWIHQJGq2J240HY6ErQ9aWKkwfoKJlHLx+A83WPNTZ9+3cd2ILxbvr1w==",
-      "dev": true
-    },
-    "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "5.47.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.47.0.tgz",
-      "integrity": "sha512-AHZtlXAMGkDmyLuLZsRpH3p4G/1iARIwc/T0vIem2YB+xW6pZaXYXzCBnZSF/5fdM97R9QqZWZ+h3iW10XgevQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/scope-manager": "5.47.0",
-        "@typescript-eslint/type-utils": "5.47.0",
-        "@typescript-eslint/utils": "5.47.0",
-        "debug": "^4.3.4",
-        "ignore": "^5.2.0",
-        "natural-compare-lite": "^1.4.0",
-        "regexpp": "^3.2.0",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "@typescript-eslint/parser": "^5.0.0",
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/@typescript-eslint/parser": {
-      "version": "5.47.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.47.0.tgz",
-      "integrity": "sha512-udPU4ckK+R1JWCGdQC4Qa27NtBg7w020ffHqGyAK8pAgOVuNw7YaKXGChk+udh+iiGIJf6/E/0xhVXyPAbsczw==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/scope-manager": "5.47.0",
-        "@typescript-eslint/types": "5.47.0",
-        "@typescript-eslint/typescript-estree": "5.47.0",
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/scope-manager": {
-      "version": "5.47.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.47.0.tgz",
-      "integrity": "sha512-dvJab4bFf7JVvjPuh3sfBUWsiD73aiftKBpWSfi3sUkysDQ4W8x+ZcFpNp7Kgv0weldhpmMOZBjx1wKN8uWvAw==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "5.47.0",
-        "@typescript-eslint/visitor-keys": "5.47.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils": {
-      "version": "5.47.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.47.0.tgz",
-      "integrity": "sha512-1J+DFFrYoDUXQE1b7QjrNGARZE6uVhBqIvdaXTe5IN+NmEyD68qXR1qX1g2u4voA+nCaelQyG8w30SAOihhEYg==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/typescript-estree": "5.47.0",
-        "@typescript-eslint/utils": "5.47.0",
-        "debug": "^4.3.4",
-        "tsutils": "^3.21.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "*"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/types": {
-      "version": "5.47.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.47.0.tgz",
-      "integrity": "sha512-eslFG0Qy8wpGzDdYKu58CEr3WLkjwC5Usa6XbuV89ce/yN5RITLe1O8e+WFEuxnfftHiJImkkOBADj58ahRxSg==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "5.47.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.47.0.tgz",
-      "integrity": "sha512-LxfKCG4bsRGq60Sqqu+34QT5qT2TEAHvSCCJ321uBWywgE2dS0LKcu5u+3sMGo+Vy9UmLOhdTw5JHzePV/1y4Q==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "5.47.0",
-        "@typescript-eslint/visitor-keys": "5.47.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/@typescript-eslint/utils": {
-      "version": "5.47.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.47.0.tgz",
-      "integrity": "sha512-U9xcc0N7xINrCdGVPwABjbAKqx4GK67xuMV87toI+HUqgXj26m6RBp9UshEXcTrgCkdGYFzgKLt8kxu49RilDw==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "@types/semver": "^7.3.12",
-        "@typescript-eslint/scope-manager": "5.47.0",
-        "@typescript-eslint/types": "5.47.0",
-        "@typescript-eslint/typescript-estree": "5.47.0",
-        "eslint-scope": "^5.1.1",
-        "eslint-utils": "^3.0.0",
-        "semver": "^7.3.7"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/utils/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@typescript-eslint/utils/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@typescript-eslint/utils/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.47.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.47.0.tgz",
-      "integrity": "sha512-ByPi5iMa6QqDXe/GmT/hR6MZtVPi0SqMQPDx15FczCBXJo/7M8T88xReOALAfpBLm+zxpPfmhuEvPb577JRAEg==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "5.47.0",
-        "eslint-visitor-keys": "^3.3.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/@vue/compiler-core": {
-      "version": "3.2.45",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.45.tgz",
-      "integrity": "sha512-rcMj7H+PYe5wBV3iYeUgbCglC+pbpN8hBLTJvRiK2eKQiWqu+fG9F+8sW99JdL4LQi7Re178UOxn09puSXvn4A==",
-      "dependencies": {
-        "@babel/parser": "^7.16.4",
-        "@vue/shared": "3.2.45",
-        "estree-walker": "^2.0.2",
-        "source-map": "^0.6.1"
-      }
-    },
-    "node_modules/@vue/compiler-dom": {
-      "version": "3.2.45",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.45.tgz",
-      "integrity": "sha512-tyYeUEuKqqZO137WrZkpwfPCdiiIeXYCcJ8L4gWz9vqaxzIQRccTSwSWZ/Axx5YR2z+LvpUbmPNXxuBU45lyRw==",
-      "dependencies": {
-        "@vue/compiler-core": "3.2.45",
-        "@vue/shared": "3.2.45"
-      }
-    },
-    "node_modules/@vue/compiler-sfc": {
-      "version": "3.2.45",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.45.tgz",
-      "integrity": "sha512-1jXDuWah1ggsnSAOGsec8cFjT/K6TMZ0sPL3o3d84Ft2AYZi2jWJgRMjw4iaK0rBfA89L5gw427H4n1RZQBu6Q==",
-      "dependencies": {
-        "@babel/parser": "^7.16.4",
-        "@vue/compiler-core": "3.2.45",
-        "@vue/compiler-dom": "3.2.45",
-        "@vue/compiler-ssr": "3.2.45",
-        "@vue/reactivity-transform": "3.2.45",
-        "@vue/shared": "3.2.45",
-        "estree-walker": "^2.0.2",
-        "magic-string": "^0.25.7",
-        "postcss": "^8.1.10",
-        "source-map": "^0.6.1"
-      }
-    },
-    "node_modules/@vue/compiler-ssr": {
-      "version": "3.2.45",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.45.tgz",
-      "integrity": "sha512-6BRaggEGqhWht3lt24CrIbQSRD5O07MTmd+LjAn5fJj568+R9eUD2F7wMQJjX859seSlrYog7sUtrZSd7feqrQ==",
-      "dependencies": {
-        "@vue/compiler-dom": "3.2.45",
-        "@vue/shared": "3.2.45"
-      }
-    },
-    "node_modules/@vue/devtools-api": {
-      "version": "6.4.5",
-      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.4.5.tgz",
-      "integrity": "sha512-JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ=="
-    },
-    "node_modules/@vue/eslint-config-typescript": {
-      "version": "11.0.2",
-      "resolved": "https://registry.npmjs.org/@vue/eslint-config-typescript/-/eslint-config-typescript-11.0.2.tgz",
-      "integrity": "sha512-EiKud1NqlWmSapBFkeSrE994qpKx7/27uCGnhdqzllYDpQZroyX/O6bwjEpeuyKamvLbsGdO6PMR2faIf+zFnw==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/eslint-plugin": "^5.0.0",
-        "@typescript-eslint/parser": "^5.0.0",
-        "vue-eslint-parser": "^9.0.0"
-      },
-      "engines": {
-        "node": "^14.17.0 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "eslint": "^6.2.0 || ^7.0.0 || ^8.0.0",
-        "eslint-plugin-vue": "^9.0.0",
-        "typescript": "*"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@vue/reactivity": {
-      "version": "3.2.45",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.45.tgz",
-      "integrity": "sha512-PRvhCcQcyEVohW0P8iQ7HDcIOXRjZfAsOds3N99X/Dzewy8TVhTCT4uXpAHfoKjVTJRA0O0K+6QNkDIZAxNi3A==",
-      "dependencies": {
-        "@vue/shared": "3.2.45"
-      }
-    },
-    "node_modules/@vue/reactivity-transform": {
-      "version": "3.2.45",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.45.tgz",
-      "integrity": "sha512-BHVmzYAvM7vcU5WmuYqXpwaBHjsS8T63jlKGWVtHxAHIoMIlmaMyurUSEs1Zcg46M4AYT5MtB1U274/2aNzjJQ==",
-      "dependencies": {
-        "@babel/parser": "^7.16.4",
-        "@vue/compiler-core": "3.2.45",
-        "@vue/shared": "3.2.45",
-        "estree-walker": "^2.0.2",
-        "magic-string": "^0.25.7"
-      }
-    },
-    "node_modules/@vue/runtime-core": {
-      "version": "3.2.45",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.45.tgz",
-      "integrity": "sha512-gzJiTA3f74cgARptqzYswmoQx0fIA+gGYBfokYVhF8YSXjWTUA2SngRzZRku2HbGbjzB6LBYSbKGIaK8IW+s0A==",
-      "dependencies": {
-        "@vue/reactivity": "3.2.45",
-        "@vue/shared": "3.2.45"
-      }
-    },
-    "node_modules/@vue/runtime-dom": {
-      "version": "3.2.45",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.45.tgz",
-      "integrity": "sha512-cy88YpfP5Ue2bDBbj75Cb4bIEZUMM/mAkDMfqDTpUYVgTf/kuQ2VQ8LebuZ8k6EudgH8pYhsGWHlY0lcxlvTwA==",
-      "dependencies": {
-        "@vue/runtime-core": "3.2.45",
-        "@vue/shared": "3.2.45",
-        "csstype": "^2.6.8"
-      }
-    },
-    "node_modules/@vue/server-renderer": {
-      "version": "3.2.45",
-      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.45.tgz",
-      "integrity": "sha512-ebiMq7q24WBU1D6uhPK//2OTR1iRIyxjF5iVq/1a5I1SDMDyDu4Ts6fJaMnjrvD3MqnaiFkKQj+LKAgz5WIK3g==",
-      "dependencies": {
-        "@vue/compiler-ssr": "3.2.45",
-        "@vue/shared": "3.2.45"
-      },
-      "peerDependencies": {
-        "vue": "3.2.45"
-      }
-    },
-    "node_modules/@vue/shared": {
-      "version": "3.2.45",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.45.tgz",
-      "integrity": "sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg=="
-    },
-    "node_modules/@webassemblyjs/ast": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
-      "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
-      "dependencies": {
-        "@webassemblyjs/helper-numbers": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1"
-      }
-    },
-    "node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
-      "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ=="
-    },
-    "node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
-      "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg=="
-    },
-    "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
-      "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA=="
-    },
-    "node_modules/@webassemblyjs/helper-numbers": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
-      "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==",
-      "dependencies": {
-        "@webassemblyjs/floating-point-hex-parser": "1.11.1",
-        "@webassemblyjs/helper-api-error": "1.11.1",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
-      "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q=="
-    },
-    "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
-      "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-buffer": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/wasm-gen": "1.11.1"
-      }
-    },
-    "node_modules/@webassemblyjs/ieee754": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
-      "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==",
-      "dependencies": {
-        "@xtuc/ieee754": "^1.2.0"
-      }
-    },
-    "node_modules/@webassemblyjs/leb128": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
-      "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==",
-      "dependencies": {
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@webassemblyjs/utf8": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
-      "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ=="
-    },
-    "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
-      "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-buffer": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/helper-wasm-section": "1.11.1",
-        "@webassemblyjs/wasm-gen": "1.11.1",
-        "@webassemblyjs/wasm-opt": "1.11.1",
-        "@webassemblyjs/wasm-parser": "1.11.1",
-        "@webassemblyjs/wast-printer": "1.11.1"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
-      "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/ieee754": "1.11.1",
-        "@webassemblyjs/leb128": "1.11.1",
-        "@webassemblyjs/utf8": "1.11.1"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
-      "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-buffer": "1.11.1",
-        "@webassemblyjs/wasm-gen": "1.11.1",
-        "@webassemblyjs/wasm-parser": "1.11.1"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
-      "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-api-error": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/ieee754": "1.11.1",
-        "@webassemblyjs/leb128": "1.11.1",
-        "@webassemblyjs/utf8": "1.11.1"
-      }
-    },
-    "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
-      "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@webpack-cli/configtest": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.0.1.tgz",
-      "integrity": "sha512-njsdJXJSiS2iNbQVS0eT8A/KPnmyH4pv1APj2K0d1wrZcBLw+yppxOy4CGqa0OxDJkzfL/XELDhD8rocnIwB5A==",
-      "dev": true,
-      "engines": {
-        "node": ">=14.15.0"
-      },
-      "peerDependencies": {
-        "webpack": "5.x.x",
-        "webpack-cli": "5.x.x"
-      }
-    },
-    "node_modules/@webpack-cli/info": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-2.0.1.tgz",
-      "integrity": "sha512-fE1UEWTwsAxRhrJNikE7v4EotYflkEhBL7EbajfkPlf6E37/2QshOy/D48Mw8G5XMFlQtS6YV42vtbG9zBpIQA==",
-      "dev": true,
-      "engines": {
-        "node": ">=14.15.0"
-      },
-      "peerDependencies": {
-        "webpack": "5.x.x",
-        "webpack-cli": "5.x.x"
-      }
-    },
-    "node_modules/@webpack-cli/serve": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-2.0.1.tgz",
-      "integrity": "sha512-0G7tNyS+yW8TdgHwZKlDWYXFA6OJQnoLCQvYKkQP0Q2X205PSQ6RNUj0M+1OB/9gRQaUZ/ccYfaxd0nhaWKfjw==",
-      "dev": true,
-      "engines": {
-        "node": ">=14.15.0"
-      },
-      "peerDependencies": {
-        "webpack": "5.x.x",
-        "webpack-cli": "5.x.x"
-      },
-      "peerDependenciesMeta": {
-        "webpack-dev-server": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@xtuc/ieee754": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="
-    },
-    "node_modules/@xtuc/long": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
-    },
-    "node_modules/abab": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
-      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
-      "dev": true
-    },
-    "node_modules/accepts": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
-      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
-      "dev": true,
-      "dependencies": {
-        "mime-types": "~2.1.34",
-        "negotiator": "0.6.3"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/acorn": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
-      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-globals": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
-      "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^7.1.1",
-        "acorn-walk": "^7.1.1"
-      }
-    },
-    "node_modules/acorn-globals/node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-globals/node_modules/acorn-walk": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
-      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-import-assertions": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
-      "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
-      "peerDependencies": {
-        "acorn": "^8"
-      }
-    },
-    "node_modules/acorn-jsx": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true,
-      "peerDependencies": {
-        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      }
-    },
-    "node_modules/acorn-walk": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-      "dev": true,
-      "dependencies": {
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6.0.0"
-      }
-    },
-    "node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/ajv-formats": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
-      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "ajv": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/ajv-formats/node_modules/ajv": {
-      "version": "8.11.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.2.tgz",
-      "integrity": "sha512-E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/ajv-formats/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true
-    },
-    "node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
-    "node_modules/ansi-colors": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz",
-      "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/ansi-html-community": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
-      "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
-      "dev": true,
-      "engines": [
-        "node >= 0.8.0"
-      ],
-      "bin": {
-        "ansi-html": "bin/ansi-html"
-      }
-    },
-    "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/ansis": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/ansis/-/ansis-1.5.5.tgz",
-      "integrity": "sha512-DNctovTacxs/NfZpGo6bIGWgLd2oZsDO7RJbiYX6Ttj40LPZM1XKv9WtesH13ieOEm1GajjD+Vik2n9YnSTPdA==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.13"
-      },
-      "funding": {
-        "type": "patreon",
-        "url": "https://patreon.com/biodiscus"
-      }
-    },
-    "node_modules/anymatch": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
-      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
-      "dev": true,
-      "dependencies": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/arg": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
-      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
-      "dev": true
-    },
-    "node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
-    },
-    "node_modules/array-differ": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz",
-      "integrity": "sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/array-find": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-find/-/array-find-1.0.0.tgz",
-      "integrity": "sha512-kO/vVCacW9mnpn3WPWbTVlEnOabK2L7LWi2HViURtCM46y1zb6I8UMjx4LgbiqadTgHnLInUronwn3ampNTJtQ==",
-      "dev": true
-    },
-    "node_modules/array-flatten": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
-      "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
-      "dev": true
-    },
-    "node_modules/array-includes": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
-      "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "get-intrinsic": "^1.1.3",
-        "is-string": "^1.0.7"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/array-uniq": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array.prototype.flat": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
-      "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "es-shim-unscopables": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.reduce": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz",
-      "integrity": "sha512-kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "es-array-method-boxes-properly": "^1.0.0",
-        "is-string": "^1.0.7"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/arrify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-      "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/asn1.js": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
-      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "safer-buffer": "^2.1.0"
-      }
-    },
-    "node_modules/asn1.js/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/assert": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
-      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
-      "dev": true,
-      "dependencies": {
-        "object-assign": "^4.1.1",
-        "util": "0.10.3"
-      }
-    },
-    "node_modules/assert/node_modules/inherits": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-      "integrity": "sha512-8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA==",
-      "dev": true
-    },
-    "node_modules/assert/node_modules/util": {
-      "version": "0.10.3",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-      "integrity": "sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "2.0.1"
-      }
-    },
-    "node_modules/assertion-error": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
-      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/astral-regex": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-      "dev": true
-    },
-    "node_modules/autoprefixer": {
-      "version": "10.4.13",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz",
-      "integrity": "sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/autoprefixer"
-        }
-      ],
-      "dependencies": {
-        "browserslist": "^4.21.4",
-        "caniuse-lite": "^1.0.30001426",
-        "fraction.js": "^4.2.0",
-        "normalize-range": "^0.1.2",
-        "picocolors": "^1.0.0",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "bin": {
-        "autoprefixer": "bin/autoprefixer"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
-    },
-    "node_modules/base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/batch": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-      "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
-      "dev": true
-    },
-    "node_modules/big.js": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/bignumber.js": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.1.tgz",
-      "integrity": "sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig==",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/binary-extensions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/bn.js": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
-      "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==",
-      "dev": true
-    },
-    "node_modules/body-parser": {
-      "version": "1.20.1",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
-      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
-      "dev": true,
-      "dependencies": {
-        "bytes": "3.1.2",
-        "content-type": "~1.0.4",
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "on-finished": "2.4.1",
-        "qs": "6.11.0",
-        "raw-body": "2.5.1",
-        "type-is": "~1.6.18",
-        "unpipe": "1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8",
-        "npm": "1.2.8000 || >= 1.4.16"
-      }
-    },
-    "node_modules/body-parser/node_modules/bytes": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/body-parser/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/body-parser/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/bonjour-service": {
-      "version": "1.0.14",
-      "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.0.14.tgz",
-      "integrity": "sha512-HIMbgLnk1Vqvs6B4Wq5ep7mxvj9sGz5d1JJyDNSGNIdA/w2MCz6GTjWTdjqOJV1bEPj+6IkxDvWNFKEBxNt4kQ==",
-      "dev": true,
-      "dependencies": {
-        "array-flatten": "^2.1.2",
-        "dns-equal": "^1.0.0",
-        "fast-deep-equal": "^3.1.3",
-        "multicast-dns": "^7.2.5"
-      }
-    },
-    "node_modules/boolbase": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
-      "dev": true
-    },
-    "node_modules/bootstrap": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.4.1.tgz",
-      "integrity": "sha512-tbx5cHubwE6e2ZG7nqM3g/FZ5PQEDMWmMGNrCUBVRPHXTJaH7CBDdsLeu3eCh3B1tzAxTnAbtmrzvWEvT2NNEA==",
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/bootstrap"
-      },
-      "peerDependencies": {
-        "jquery": "1.9.1 - 3",
-        "popper.js": "^1.16.0"
-      }
-    },
-    "node_modules/bootstrap-colorpicker": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/bootstrap-colorpicker/-/bootstrap-colorpicker-3.4.0.tgz",
-      "integrity": "sha512-7vA0hvLrat3ptobEKlT9+6amzBUJcDAoh6hJRQY/AD+5dVZYXXf1ivRfrTwmuwiVLJo9rZwM8YB4lYzp6agzqg==",
-      "dependencies": {
-        "bootstrap": ">=4.0",
-        "jquery": ">=2.2",
-        "popper.js": ">=1.10"
-      }
-    },
-    "node_modules/bootstrap-tokenfield": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/bootstrap-tokenfield/-/bootstrap-tokenfield-0.12.0.tgz",
-      "integrity": "sha512-OgLQEQ1V3s69wgvjpWvPESNTv1RUZKtwpRQd3o5AQYdan47iUAL7ajSMjXMlSxWywrLTntF1l84aE7N1DvUlVw==",
-      "dependencies": {
-        "jquery": "^2.1.0"
-      }
-    },
-    "node_modules/bootstrap-tokenfield/node_modules/jquery": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz",
-      "integrity": "sha512-lBHj60ezci2u1v2FqnZIraShGgEXq35qCzMv4lITyHGppTnA13rwR0MgwyNJh9TnDs3aXUvd1xjAotfraMHX/Q=="
-    },
-    "node_modules/bourbon": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/bourbon/-/bourbon-4.3.4.tgz",
-      "integrity": "sha512-XY2nuWcgS5ODGVFHgE/SsjFb18ke1dPtxu32vDm2tue8v4RflmU0mp0jpdIvvyjEtYEv6oiSpQL2PRUsEqde4w=="
-    },
-    "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dev": true,
-      "dependencies": {
-        "fill-range": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/brorand": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-      "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==",
-      "dev": true
-    },
-    "node_modules/browser-process-hrtime": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
-      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
-      "dev": true
-    },
-    "node_modules/browser-stdout": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
-      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
-      "dev": true
-    },
-    "node_modules/browserify-aes": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-      "dev": true,
-      "dependencies": {
-        "buffer-xor": "^1.0.3",
-        "cipher-base": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.3",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/browserify-cipher": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
-      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
-      "dev": true,
-      "dependencies": {
-        "browserify-aes": "^1.0.4",
-        "browserify-des": "^1.0.0",
-        "evp_bytestokey": "^1.0.0"
-      }
-    },
-    "node_modules/browserify-des": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
-      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
-      "dev": true,
-      "dependencies": {
-        "cipher-base": "^1.0.1",
-        "des.js": "^1.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "node_modules/browserify-rsa": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
-      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^5.0.0",
-        "randombytes": "^2.0.1"
-      }
-    },
-    "node_modules/browserify-sign": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
-      "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^5.1.1",
-        "browserify-rsa": "^4.0.1",
-        "create-hash": "^1.2.0",
-        "create-hmac": "^1.1.7",
-        "elliptic": "^6.5.3",
-        "inherits": "^2.0.4",
-        "parse-asn1": "^5.1.5",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
-      }
-    },
-    "node_modules/browserify-sign/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/browserify-zlib": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
-      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
-      "dev": true,
-      "dependencies": {
-        "pako": "~1.0.5"
-      }
-    },
-    "node_modules/browserslist": {
-      "version": "4.21.4",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
-      "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        }
-      ],
-      "dependencies": {
-        "caniuse-lite": "^1.0.30001400",
-        "electron-to-chromium": "^1.4.251",
-        "node-releases": "^2.0.6",
-        "update-browserslist-db": "^1.0.9"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      },
-      "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-      }
-    },
-    "node_modules/buffer": {
-      "version": "4.9.2",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
-      "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
-      "dev": true,
-      "dependencies": {
-        "base64-js": "^1.0.2",
-        "ieee754": "^1.1.4",
-        "isarray": "^1.0.0"
-      }
-    },
-    "node_modules/buffer-builder": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/buffer-builder/-/buffer-builder-0.2.0.tgz",
-      "integrity": "sha512-7VPMEPuYznPSoR21NE1zvd2Xna6c/CloiZCfcMXR1Jny6PjX0N4Nsa38zcBFo/FMK+BlA+FLKbJCQ0i2yxp+Xg==",
-      "dev": true
-    },
-    "node_modules/buffer-from": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
-    },
-    "node_modules/buffer-xor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-      "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==",
-      "dev": true
-    },
-    "node_modules/builtin-status-codes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
-      "integrity": "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==",
-      "dev": true
-    },
-    "node_modules/bytes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/cacheable-lookup": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
-      "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==",
-      "engines": {
-        "node": ">=10.6.0"
-      }
-    },
-    "node_modules/cacheable-request": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz",
-      "integrity": "sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==",
-      "dependencies": {
-        "clone-response": "^1.0.2",
-        "get-stream": "^5.1.0",
-        "http-cache-semantics": "^4.0.0",
-        "keyv": "^4.0.0",
-        "lowercase-keys": "^2.0.0",
-        "normalize-url": "^6.0.1",
-        "responselike": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/camel-case": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
-      "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
-      "dev": true,
-      "dependencies": {
-        "pascal-case": "^3.1.2",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/camelcase-keys": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
-      "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^5.3.1",
-        "map-obj": "^4.0.0",
-        "quick-lru": "^4.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/caniuse-lite": {
-      "version": "1.0.30001441",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001441.tgz",
-      "integrity": "sha512-OyxRR4Vof59I3yGWXws6i908EtGbMzVUi3ganaZQHmydk1iwDhRnvaPG2WaR0KcqrDFKrxVZHULT396LEPhXfg==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
-        }
-      ]
-    },
-    "node_modules/chai": {
-      "version": "4.3.7",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.7.tgz",
-      "integrity": "sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==",
-      "dev": true,
-      "dependencies": {
-        "assertion-error": "^1.1.0",
-        "check-error": "^1.0.2",
-        "deep-eql": "^4.1.2",
-        "get-func-name": "^2.0.0",
-        "loupe": "^2.3.1",
-        "pathval": "^1.1.1",
-        "type-detect": "^4.0.5"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/check-error": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
-      "integrity": "sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/chokidar": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
-      ],
-      "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/chokidar/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/chrome-trace-event": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
-      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
-    "node_modules/cipher-base": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/clean-css": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.1.tgz",
-      "integrity": "sha512-lCr8OHhiWCTw4v8POJovCoh4T7I9U11yVsPjMWWnnMmp9ZowCxyad1Pathle/9HjaDp+fdQKjO9fQydE6RHTZg==",
-      "dev": true,
-      "dependencies": {
-        "source-map": "~0.6.0"
-      },
-      "engines": {
-        "node": ">= 10.0"
-      }
-    },
-    "node_modules/clean-webpack-plugin": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-4.0.0.tgz",
-      "integrity": "sha512-WuWE1nyTNAyW5T7oNyys2EN0cfP2fdRxhxnIQWiAp0bMabPdHhoGxM8A6YL2GhqwgrPnnaemVE7nv5XJ2Fhh2w==",
-      "dev": true,
-      "dependencies": {
-        "del": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "webpack": ">=4.0.0 <6.0.0"
-      }
-    },
-    "node_modules/cliui": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^3.1.0",
-        "strip-ansi": "^5.2.0",
-        "wrap-ansi": "^5.1.0"
-      }
-    },
-    "node_modules/cliui/node_modules/ansi-regex": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/cliui/node_modules/emoji-regex": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-      "dev": true
-    },
-    "node_modules/cliui/node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/cliui/node_modules/string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/cliui/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/clone-deep": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
-      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
-      "dev": true,
-      "dependencies": {
-        "is-plain-object": "^2.0.4",
-        "kind-of": "^6.0.2",
-        "shallow-clone": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/clone-deep/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/clone-response": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
-      "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",
-      "dependencies": {
-        "mimic-response": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true
-    },
-    "node_modules/colord": {
-      "version": "2.9.3",
-      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
-      "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==",
-      "dev": true
-    },
-    "node_modules/colorette": {
-      "version": "2.0.19",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz",
-      "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==",
-      "dev": true
-    },
-    "node_modules/combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dev": true,
-      "dependencies": {
-        "delayed-stream": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/commander": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
-      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
-      "dev": true,
-      "engines": {
-        "node": ">= 12"
-      }
-    },
-    "node_modules/compressible": {
-      "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
-      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
-      "dev": true,
-      "dependencies": {
-        "mime-db": ">= 1.43.0 < 2"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/compression": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
-      "dev": true,
-      "dependencies": {
-        "accepts": "~1.3.5",
-        "bytes": "3.0.0",
-        "compressible": "~2.0.16",
-        "debug": "2.6.9",
-        "on-headers": "~1.0.2",
-        "safe-buffer": "5.1.2",
-        "vary": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/compression/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/compression/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/compression/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
-    },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true
-    },
-    "node_modules/confusing-browser-globals": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
-      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
-      "dev": true
-    },
-    "node_modules/connect-history-api-fallback": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
-      "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/console-browserify": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
-      "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
-      "dev": true
-    },
-    "node_modules/constants-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-      "integrity": "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==",
-      "dev": true
-    },
-    "node_modules/content-disposition": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
-      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "5.2.1"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/convert-source-map": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
-      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
-      "dev": true
-    },
-    "node_modules/cookie": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/cookie-signature": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
-      "dev": true
-    },
-    "node_modules/copy-webpack-plugin": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz",
-      "integrity": "sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==",
-      "dev": true,
-      "dependencies": {
-        "fast-glob": "^3.2.11",
-        "glob-parent": "^6.0.1",
-        "globby": "^13.1.1",
-        "normalize-path": "^3.0.0",
-        "schema-utils": "^4.0.0",
-        "serialize-javascript": "^6.0.0"
-      },
-      "engines": {
-        "node": ">= 14.15.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.1.0"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/globby": {
-      "version": "13.1.3",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-13.1.3.tgz",
-      "integrity": "sha512-8krCNHXvlCgHDpegPzleMq07yMYTO2sXKASmZmquEYWEmCx6J5UTRbp5RwMJkTJGtcQ44YpiUYUiN0b9mzy8Bw==",
-      "dev": true,
-      "dependencies": {
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.11",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^4.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/slash": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
-      "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/core-js": {
-      "version": "3.26.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.26.1.tgz",
-      "integrity": "sha512-21491RRQVzUn0GGM9Z1Jrpr6PNPxPi+Za8OM9q4tksTSnlbXXGKK1nXNg/QvwFYettXvSX6zWKCtHHfjN4puyA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
-    "node_modules/core-util-is": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
-      "dev": true
-    },
-    "node_modules/cosmiconfig": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
-      "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
-      "dev": true,
-      "dependencies": {
-        "@types/parse-json": "^4.0.0",
-        "import-fresh": "^3.2.1",
-        "parse-json": "^5.0.0",
-        "path-type": "^4.0.0",
-        "yaml": "^1.10.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/create-ecdh": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
-      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "elliptic": "^6.5.3"
-      }
-    },
-    "node_modules/create-ecdh/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/create-hash": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-      "dev": true,
-      "dependencies": {
-        "cipher-base": "^1.0.1",
-        "inherits": "^2.0.1",
-        "md5.js": "^1.3.4",
-        "ripemd160": "^2.0.1",
-        "sha.js": "^2.4.0"
-      }
-    },
-    "node_modules/create-hmac": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-      "dev": true,
-      "dependencies": {
-        "cipher-base": "^1.0.3",
-        "create-hash": "^1.1.0",
-        "inherits": "^2.0.1",
-        "ripemd160": "^2.0.0",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      }
-    },
-    "node_modules/create-require": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
-      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
-      "dev": true
-    },
-    "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dev": true,
-      "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/crypto-browserify": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
-      "dev": true,
-      "dependencies": {
-        "browserify-cipher": "^1.0.0",
-        "browserify-sign": "^4.0.0",
-        "create-ecdh": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.0",
-        "diffie-hellman": "^5.0.0",
-        "inherits": "^2.0.1",
-        "pbkdf2": "^3.0.3",
-        "public-encrypt": "^4.0.0",
-        "randombytes": "^2.0.0",
-        "randomfill": "^1.0.3"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/css-blank-pseudo": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-3.0.3.tgz",
-      "integrity": "sha512-VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ==",
-      "dev": true,
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.9"
-      },
-      "bin": {
-        "css-blank-pseudo": "dist/cli.cjs"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
-      }
-    },
-    "node_modules/css-functions-list": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.1.0.tgz",
-      "integrity": "sha512-/9lCvYZaUbBGvYUgYGFJ4dcYiyqdhSjG7IPVluoV8A1ILjkF7ilmhp1OGUz8n+nmBcu0RNrQAzgD8B6FJbrt2w==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.22"
-      }
-    },
-    "node_modules/css-has-pseudo": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-3.0.4.tgz",
-      "integrity": "sha512-Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw==",
-      "dev": true,
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.9"
-      },
-      "bin": {
-        "css-has-pseudo": "dist/cli.cjs"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
-      }
-    },
-    "node_modules/css-loader": {
-      "version": "6.7.3",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.7.3.tgz",
-      "integrity": "sha512-qhOH1KlBMnZP8FzRO6YCH9UHXQhVMcEGLyNdb7Hv2cpcmJbW0YrddO+tG1ab5nT41KpHIYGsbeHqxB9xPu1pKQ==",
-      "dev": true,
-      "dependencies": {
-        "icss-utils": "^5.1.0",
-        "postcss": "^8.4.19",
-        "postcss-modules-extract-imports": "^3.0.0",
-        "postcss-modules-local-by-default": "^4.0.0",
-        "postcss-modules-scope": "^3.0.0",
-        "postcss-modules-values": "^4.0.0",
-        "postcss-value-parser": "^4.2.0",
-        "semver": "^7.3.8"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/css-loader/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/css-loader/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/css-loader/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/css-prefers-color-scheme": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz",
-      "integrity": "sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==",
-      "dev": true,
-      "bin": {
-        "css-prefers-color-scheme": "dist/cli.cjs"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
-      }
-    },
-    "node_modules/css-rule-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/css-rule-stream/-/css-rule-stream-1.1.0.tgz",
-      "integrity": "sha512-qiio/Zkr8I19jh/XuzEkK8OKDQRTrEYaRyIHy4Bwh/tPUe0w8GcQs7r6x24Yc9lT+FbnZFYULxEIXCmaymguUQ==",
-      "dev": true,
-      "dependencies": {
-        "css-tokenize": "^1.0.1",
-        "duplexer2": "0.0.2",
-        "ldjson-stream": "^1.2.1",
-        "through2": "^0.6.3"
-      },
-      "bin": {
-        "css-rule-stream": "index.js"
-      }
-    },
-    "node_modules/css-rule-stream/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-      "dev": true
-    },
-    "node_modules/css-rule-stream/node_modules/readable-stream": {
-      "version": "1.0.34",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-      "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/css-rule-stream/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
-      "dev": true
-    },
-    "node_modules/css-rule-stream/node_modules/through2": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-      "integrity": "sha512-RkK/CCESdTKQZHdmKICijdKKsCRVHs5KsLZ6pACAmF/1GPUQhonHSXWNERctxEp7RmvjdNbZTL5z9V7nSCXKcg==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": ">=1.0.33-1 <1.1.0-0",
-        "xtend": ">=4.0.0 <4.1.0-0"
-      }
-    },
-    "node_modules/css-select": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
-      "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
-      "dev": true,
-      "dependencies": {
-        "boolbase": "^1.0.0",
-        "css-what": "^6.0.1",
-        "domhandler": "^4.3.1",
-        "domutils": "^2.8.0",
-        "nth-check": "^2.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
-      }
-    },
-    "node_modules/css-tokenize": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/css-tokenize/-/css-tokenize-1.0.1.tgz",
-      "integrity": "sha512-gLmmbJdwH9HLY4bcA17lnZ8GgPwEXRbvxBJGHnkiB6gLhRpTzjkjtMIvz7YORGW/Ptv2oMk8b5g+u7mRD6Dd7A==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "readable-stream": "^1.0.33"
-      }
-    },
-    "node_modules/css-tokenize/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-      "dev": true
-    },
-    "node_modules/css-tokenize/node_modules/readable-stream": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/css-tokenize/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
-      "dev": true
-    },
-    "node_modules/css-tree": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
-      "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
-      "dev": true,
-      "dependencies": {
-        "mdn-data": "2.0.14",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/css-what": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
-      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
-      }
-    },
-    "node_modules/cssdb": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-7.2.0.tgz",
-      "integrity": "sha512-JYlIsE7eKHSi0UNuCyo96YuIDFqvhGgHw4Ck6lsN+DP0Tp8M64UTDT2trGbkMDqnCoEjks7CkS0XcjU0rkvBdg==",
-      "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      }
-    },
-    "node_modules/cssesc": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-      "dev": true,
-      "bin": {
-        "cssesc": "bin/cssesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/csso": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
-      "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
-      "dev": true,
-      "dependencies": {
-        "css-tree": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/csso-webpack-plugin": {
-      "version": "2.0.0-beta.3",
-      "resolved": "https://registry.npmjs.org/csso-webpack-plugin/-/csso-webpack-plugin-2.0.0-beta.3.tgz",
-      "integrity": "sha512-FnhgS7W1BwOduZagTLg9UjT2kvM9aiSpInm4xIDZHLuXl6/6vbOA1+DIIcbGKSjE0dWIVuDKEv1to86mN6KZ4w==",
-      "dev": true,
-      "dependencies": {
-        "@types/webpack": ">=4.0",
-        "core-js": "^3.10.1",
-        "csso": "^4.0.2",
-        "source-map": "^0.7.3",
-        "webpack-sources": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/csso-webpack-plugin/node_modules/source-map": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/cssom": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz",
-      "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==",
-      "dev": true
-    },
-    "node_modules/cssstyle": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
-      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
-      "dev": true,
-      "dependencies": {
-        "cssom": "~0.3.6"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cssstyle/node_modules/cssom": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
-      "dev": true
-    },
-    "node_modules/csstype": {
-      "version": "2.6.21",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.21.tgz",
-      "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w=="
-    },
-    "node_modules/data-urls": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz",
-      "integrity": "sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==",
-      "dev": true,
-      "dependencies": {
-        "abab": "^2.0.6",
-        "whatwg-mimetype": "^3.0.0",
-        "whatwg-url": "^11.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/data-urls/node_modules/whatwg-url": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz",
-      "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==",
-      "dev": true,
-      "dependencies": {
-        "tr46": "^3.0.0",
-        "webidl-conversions": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/decamelize-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz",
-      "integrity": "sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==",
-      "dev": true,
-      "dependencies": {
-        "decamelize": "^1.1.0",
-        "map-obj": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/decamelize-keys/node_modules/map-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-      "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/decimal.js": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
-      "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==",
-      "dev": true
-    },
-    "node_modules/decompress-response": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
-      "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
-      "dependencies": {
-        "mimic-response": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/decompress-response/node_modules/mimic-response": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
-      "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/deep-eql": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz",
-      "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==",
-      "dev": true,
-      "dependencies": {
-        "type-detect": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/deep-is": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
-    },
-    "node_modules/deepmerge": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/default-gateway": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
-      "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
-      "dev": true,
-      "dependencies": {
-        "execa": "^5.0.0"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/defer-to-connect": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
-      "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/define-lazy-prop": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
-      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-      "dev": true,
-      "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/del": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
-      "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/glob": "^7.1.1",
-        "globby": "^6.1.0",
-        "is-path-cwd": "^2.0.0",
-        "is-path-in-cwd": "^2.0.0",
-        "p-map": "^2.0.0",
-        "pify": "^4.0.1",
-        "rimraf": "^2.6.3"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/del/node_modules/array-union": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-      "integrity": "sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==",
-      "dev": true,
-      "dependencies": {
-        "array-uniq": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/del/node_modules/globby": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-      "integrity": "sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==",
-      "dev": true,
-      "dependencies": {
-        "array-union": "^1.0.1",
-        "glob": "^7.0.3",
-        "object-assign": "^4.0.1",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/del/node_modules/globby/node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/depd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/des.js": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
-      "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "node_modules/destroy": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
-      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8",
-        "npm": "1.2.8000 || >= 1.4.16"
-      }
-    },
-    "node_modules/detect-node": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
-      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
-      "dev": true
-    },
-    "node_modules/diff": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.3.1"
-      }
-    },
-    "node_modules/diffie-hellman": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "miller-rabin": "^4.0.0",
-        "randombytes": "^2.0.0"
-      }
-    },
-    "node_modules/diffie-hellman/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dev": true,
-      "dependencies": {
-        "path-type": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/dns-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
-      "integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==",
-      "dev": true
-    },
-    "node_modules/dns-packet": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.4.0.tgz",
-      "integrity": "sha512-EgqGeaBB8hLiHLZtp/IbaDQTL8pZ0+IvwzSHA6d7VyMDM+B9hgddEMa9xjK5oYnw0ci0JQ6g2XCD7/f6cafU6g==",
-      "dev": true,
-      "dependencies": {
-        "@leichtgewicht/ip-codec": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/doiuse": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/doiuse/-/doiuse-4.4.1.tgz",
-      "integrity": "sha512-TUpr1/YNg20IB09tZmwGCTsTQoxj8jUld/hUZprZMj8vj0VpAJySXEWCr8WMvqvgzk0/kG/FxeSMGKode4UjPg==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.16.1",
-        "caniuse-lite": "^1.0.30001179",
-        "css-rule-stream": "^1.1.0",
-        "duplexer2": "0.0.2",
-        "ldjson-stream": "^1.2.1",
-        "multimatch": "^5.0.0",
-        "postcss": "^8.2.4",
-        "source-map": "^0.7.3",
-        "through2": "^4.0.2",
-        "yargs": "^16.2.0"
-      },
-      "bin": {
-        "doiuse": "cli.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/doiuse/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/doiuse/node_modules/cliui": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^7.0.0"
-      }
-    },
-    "node_modules/doiuse/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/doiuse/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/doiuse/node_modules/source-map": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/doiuse/node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/doiuse/node_modules/y18n": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/doiuse/node_modules/yargs": {
-      "version": "16.2.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-      "dev": true,
-      "dependencies": {
-        "cliui": "^7.0.2",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.0",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^20.2.2"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/doiuse/node_modules/yargs-parser": {
-      "version": "20.2.9",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/dom-converter": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
-      "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
-      "dev": true,
-      "dependencies": {
-        "utila": "~0.4"
-      }
-    },
-    "node_modules/dom-serializer": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
-      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.2.0",
-        "entities": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
-      }
-    },
-    "node_modules/dom-serializer/node_modules/entities": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
-    "node_modules/domain-browser": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
-      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4",
-        "npm": ">=1.2"
-      }
-    },
-    "node_modules/domelementtype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ]
-    },
-    "node_modules/domexception": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
-      "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
-      "dev": true,
-      "dependencies": {
-        "webidl-conversions": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/domhandler": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
-      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "^2.2.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domhandler?sponsor=1"
-      }
-    },
-    "node_modules/domutils": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-      "dev": true,
-      "dependencies": {
-        "dom-serializer": "^1.0.1",
-        "domelementtype": "^2.2.0",
-        "domhandler": "^4.2.0"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domutils?sponsor=1"
-      }
-    },
-    "node_modules/dot-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
-      "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
-      "dev": true,
-      "dependencies": {
-        "no-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/dropzone": {
-      "version": "5.9.3",
-      "resolved": "https://registry.npmjs.org/dropzone/-/dropzone-5.9.3.tgz",
-      "integrity": "sha512-Azk8kD/2/nJIuVPK+zQ9sjKMRIpRvNyqn9XwbBHNq+iNuSccbJS6hwm1Woy0pMST0erSo0u4j+KJaodndDk4vA=="
-    },
-    "node_modules/duplexer2": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-      "integrity": "sha512-+AWBwjGadtksxjOQSFDhPNQbed7icNXApT4+2BNpsXzcCBiInq2H9XW0O8sfHFaPmnQRs7cg/P0fAr2IWQSW0g==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "~1.1.9"
-      }
-    },
-    "node_modules/duplexer2/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-      "dev": true
-    },
-    "node_modules/duplexer2/node_modules/readable-stream": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/duplexer2/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
-      "dev": true
-    },
-    "node_modules/ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
-      "dev": true
-    },
-    "node_modules/electron-to-chromium": {
-      "version": "1.4.284",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz",
-      "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA=="
-    },
-    "node_modules/elliptic": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
-      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.11.9",
-        "brorand": "^1.1.0",
-        "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.1",
-        "inherits": "^2.0.4",
-        "minimalistic-assert": "^1.0.1",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "node_modules/elliptic/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/emojis-list": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dependencies": {
-        "once": "^1.4.0"
-      }
-    },
-    "node_modules/enhanced-resolve": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz",
-      "integrity": "sha512-kxpoMgrdtkXZ5h0SeraBS1iRntpTpQ3R8ussdb38+UAFnMGX5DDyJXePm+OCHOcoXvHDw7mc2erbJBpDnl7TPw==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "memory-fs": "^0.2.0",
-        "tapable": "^0.1.8"
-      },
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/enhanced-resolve/node_modules/tapable": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",
-      "integrity": "sha512-jX8Et4hHg57mug1/079yitEKWGB3LCwoxByLsNim89LABq8NqgiX+6iYVOsq0vX8uJHkU+DZ5fnq95f800bEsQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/entities": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz",
-      "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
-    "node_modules/envinfo": {
-      "version": "7.8.1",
-      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz",
-      "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==",
-      "dev": true,
-      "bin": {
-        "envinfo": "dist/cli.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eonasdan-bootstrap-datetimepicker": {
-      "version": "4.17.49",
-      "resolved": "https://registry.npmjs.org/eonasdan-bootstrap-datetimepicker/-/eonasdan-bootstrap-datetimepicker-4.17.49.tgz",
-      "integrity": "sha512-7KZeDpkj+A6AtPR3XjX8gAnRPUkPSfW0OmMANG1dkUOPMtLSzbyoCjDIdEcfRtQPU5X0D9Gob7wWKn0h4QWy7A==",
-      "dependencies": {
-        "bootstrap": "^3.3",
-        "jquery": "^3.5.1",
-        "moment": "^2.10",
-        "moment-timezone": "^0.4.0"
-      },
-      "peerDependencies": {
-        "bootstrap": "^3.3",
-        "jquery": "^1.8.3 || ^2.0 || ^3.0",
-        "moment": "^2.10",
-        "moment-timezone": "^0.4.0 || ^0.5.0"
-      }
-    },
-    "node_modules/eonasdan-bootstrap-datetimepicker/node_modules/bootstrap": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.4.1.tgz",
-      "integrity": "sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dev": true,
-      "dependencies": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "node_modules/es-abstract": {
-      "version": "1.20.5",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.5.tgz",
-      "integrity": "sha512-7h8MM2EQhsCA7pU/Nv78qOXFpD8Rhqd12gYiSJVkrH9+e8VuA8JlPJK/hQjjlLv6pJvx/z1iRFKzYb0XT/RuAQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.3",
-        "get-symbol-description": "^1.0.0",
-        "gopd": "^1.0.1",
-        "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.7",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.2",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.4.3",
-        "safe-regex-test": "^1.0.0",
-        "string.prototype.trimend": "^1.0.6",
-        "string.prototype.trimstart": "^1.0.6",
-        "unbox-primitive": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/es-array-method-boxes-properly": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz",
-      "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==",
-      "dev": true
-    },
-    "node_modules/es-module-lexer": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
-      "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ=="
-    },
-    "node_modules/es-shim-unscopables": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
-      "dev": true,
-      "dependencies": {
-        "has": "^1.0.3"
-      }
-    },
-    "node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/esbuild": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.15.18.tgz",
-      "integrity": "sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q==",
-      "dev": true,
-      "hasInstallScript": true,
-      "bin": {
-        "esbuild": "bin/esbuild"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "optionalDependencies": {
-        "@esbuild/android-arm": "0.15.18",
-        "@esbuild/linux-loong64": "0.15.18",
-        "esbuild-android-64": "0.15.18",
-        "esbuild-android-arm64": "0.15.18",
-        "esbuild-darwin-64": "0.15.18",
-        "esbuild-darwin-arm64": "0.15.18",
-        "esbuild-freebsd-64": "0.15.18",
-        "esbuild-freebsd-arm64": "0.15.18",
-        "esbuild-linux-32": "0.15.18",
-        "esbuild-linux-64": "0.15.18",
-        "esbuild-linux-arm": "0.15.18",
-        "esbuild-linux-arm64": "0.15.18",
-        "esbuild-linux-mips64le": "0.15.18",
-        "esbuild-linux-ppc64le": "0.15.18",
-        "esbuild-linux-riscv64": "0.15.18",
-        "esbuild-linux-s390x": "0.15.18",
-        "esbuild-netbsd-64": "0.15.18",
-        "esbuild-openbsd-64": "0.15.18",
-        "esbuild-sunos-64": "0.15.18",
-        "esbuild-windows-32": "0.15.18",
-        "esbuild-windows-64": "0.15.18",
-        "esbuild-windows-arm64": "0.15.18"
-      }
-    },
-    "node_modules/esbuild-android-64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.15.18.tgz",
-      "integrity": "sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-android-arm64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.15.18.tgz",
-      "integrity": "sha512-G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-darwin-64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.15.18.tgz",
-      "integrity": "sha512-2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-darwin-arm64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.18.tgz",
-      "integrity": "sha512-tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-freebsd-64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.18.tgz",
-      "integrity": "sha512-TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-freebsd-arm64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.18.tgz",
-      "integrity": "sha512-R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-32": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.15.18.tgz",
-      "integrity": "sha512-lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.18.tgz",
-      "integrity": "sha512-hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-arm": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.15.18.tgz",
-      "integrity": "sha512-UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-arm64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.18.tgz",
-      "integrity": "sha512-54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-mips64le": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.18.tgz",
-      "integrity": "sha512-Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ==",
-      "cpu": [
-        "mips64el"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-ppc64le": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.18.tgz",
-      "integrity": "sha512-b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-riscv64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.18.tgz",
-      "integrity": "sha512-ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-s390x": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.18.tgz",
-      "integrity": "sha512-VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-loader": {
-      "version": "2.20.0",
-      "resolved": "https://registry.npmjs.org/esbuild-loader/-/esbuild-loader-2.20.0.tgz",
-      "integrity": "sha512-dr+j8O4w5RvqZ7I4PPB4EIyVTd679EBQnMm+JBB7av+vu05Zpje2IpK5N3ld1VWa+WxrInIbNFAg093+E1aRsA==",
-      "dev": true,
-      "dependencies": {
-        "esbuild": "^0.15.6",
-        "joycon": "^3.0.1",
-        "json5": "^2.2.0",
-        "loader-utils": "^2.0.0",
-        "tapable": "^2.2.0",
-        "webpack-sources": "^2.2.0"
-      },
-      "funding": {
-        "url": "https://github.com/privatenumber/esbuild-loader?sponsor=1"
-      },
-      "peerDependencies": {
-        "webpack": "^4.40.0 || ^5.0.0"
-      }
-    },
-    "node_modules/esbuild-loader/node_modules/webpack-sources": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz",
-      "integrity": "sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==",
-      "dev": true,
-      "dependencies": {
-        "source-list-map": "^2.0.1",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/esbuild-netbsd-64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.18.tgz",
-      "integrity": "sha512-98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-openbsd-64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.18.tgz",
-      "integrity": "sha512-yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-sunos-64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.15.18.tgz",
-      "integrity": "sha512-On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-windows-32": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.15.18.tgz",
-      "integrity": "sha512-o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-windows-64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.18.tgz",
-      "integrity": "sha512-qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-windows-arm64": {
-      "version": "0.15.18",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.18.tgz",
-      "integrity": "sha512-q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
-      "dev": true
-    },
-    "node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/escodegen": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
-      "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
-      "dev": true,
-      "dependencies": {
-        "esprima": "^4.0.1",
-        "estraverse": "^5.2.0",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1"
-      },
-      "bin": {
-        "escodegen": "bin/escodegen.js",
-        "esgenerate": "bin/esgenerate.js"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "optionalDependencies": {
-        "source-map": "~0.6.1"
-      }
-    },
-    "node_modules/escodegen/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/escodegen/node_modules/levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/escodegen/node_modules/optionator": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-      "dev": true,
-      "dependencies": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.6",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "word-wrap": "~1.2.3"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/escodegen/node_modules/prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/escodegen/node_modules/type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/eslint": {
-      "version": "8.30.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.30.0.tgz",
-      "integrity": "sha512-MGADB39QqYuzEGov+F/qb18r4i7DohCDOfatHaxI2iGlPuC65bwG2gxgO+7DkyL38dRFaRH7RaRAgU6JKL9rMQ==",
-      "dev": true,
-      "dependencies": {
-        "@eslint/eslintrc": "^1.4.0",
-        "@humanwhocodes/config-array": "^0.11.8",
-        "@humanwhocodes/module-importer": "^1.0.1",
-        "@nodelib/fs.walk": "^1.2.8",
-        "ajv": "^6.10.0",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.1.1",
-        "eslint-utils": "^3.0.0",
-        "eslint-visitor-keys": "^3.3.0",
-        "espree": "^9.4.0",
-        "esquery": "^1.4.0",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "find-up": "^5.0.0",
-        "glob-parent": "^6.0.2",
-        "globals": "^13.19.0",
-        "grapheme-splitter": "^1.0.4",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "is-path-inside": "^3.0.3",
-        "js-sdsl": "^4.1.4",
-        "js-yaml": "^4.1.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
-        "regexpp": "^3.2.0",
-        "strip-ansi": "^6.0.1",
-        "strip-json-comments": "^3.1.0",
-        "text-table": "^0.2.0"
-      },
-      "bin": {
-        "eslint": "bin/eslint.js"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint-config-airbnb-base": {
-      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz",
-      "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==",
-      "dev": true,
-      "dependencies": {
-        "confusing-browser-globals": "^1.0.10",
-        "object.assign": "^4.1.2",
-        "object.entries": "^1.1.5",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "peerDependencies": {
-        "eslint": "^7.32.0 || ^8.2.0",
-        "eslint-plugin-import": "^2.25.2"
-      }
-    },
-    "node_modules/eslint-import-resolver-node": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
-      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^3.2.7",
-        "resolve": "^1.20.0"
-      }
-    },
-    "node_modules/eslint-import-resolver-node/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/eslint-import-resolver-webpack": {
-      "version": "0.12.2",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.12.2.tgz",
-      "integrity": "sha512-7Jnm4YAoNNkvqPaZkKdIHsKGmv8/uNnYC5QsXkiSodvX4XEEfH2AKOna98FK52fCDXm3q4HzuX+7pRMKkJ64EQ==",
-      "dev": true,
-      "dependencies": {
-        "array-find": "^1.0.0",
-        "debug": "^2.6.9",
-        "enhanced-resolve": "^0.9.1",
-        "find-root": "^1.1.0",
-        "has": "^1.0.3",
-        "interpret": "^1.2.0",
-        "lodash": "^4.17.15",
-        "node-libs-browser": "^1.0.0 || ^2.0.0",
-        "resolve": "^1.13.1",
-        "semver": "^5.7.1"
-      },
-      "peerDependencies": {
-        "eslint-plugin-import": ">=1.4.0",
-        "webpack": ">=1.11.0"
-      }
-    },
-    "node_modules/eslint-import-resolver-webpack/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/eslint-import-resolver-webpack/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/eslint-import-resolver-webpack/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/eslint-module-utils": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz",
-      "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^3.2.7"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependenciesMeta": {
-        "eslint": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/eslint-module-utils/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/eslint-plugin-html": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-html/-/eslint-plugin-html-6.2.0.tgz",
-      "integrity": "sha512-vi3NW0E8AJombTvt8beMwkL1R/fdRWl4QSNRNMhVQKWm36/X0KF0unGNAY4mqUF06mnwVWZcIcerrCnfn9025g==",
-      "dev": true,
-      "dependencies": {
-        "htmlparser2": "^7.1.2"
-      }
-    },
-    "node_modules/eslint-plugin-import": {
-      "version": "2.26.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
-      "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
-      "dev": true,
-      "dependencies": {
-        "array-includes": "^3.1.4",
-        "array.prototype.flat": "^1.2.5",
-        "debug": "^2.6.9",
-        "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.6",
-        "eslint-module-utils": "^2.7.3",
-        "has": "^1.0.3",
-        "is-core-module": "^2.8.1",
-        "is-glob": "^4.0.3",
-        "minimatch": "^3.1.2",
-        "object.values": "^1.1.5",
-        "resolve": "^1.22.0",
-        "tsconfig-paths": "^3.14.1"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/eslint-plugin-vue": {
-      "version": "9.8.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.8.0.tgz",
-      "integrity": "sha512-E/AXwcTzunyzM83C2QqDHxepMzvI2y6x+mmeYHbVDQlKFqmKYvRrhaVixEeeG27uI44p9oKDFiyCRw4XxgtfHA==",
-      "dev": true,
-      "dependencies": {
-        "eslint-utils": "^3.0.0",
-        "natural-compare": "^1.4.0",
-        "nth-check": "^2.0.1",
-        "postcss-selector-parser": "^6.0.9",
-        "semver": "^7.3.5",
-        "vue-eslint-parser": "^9.0.1",
-        "xml-name-validator": "^4.0.0"
-      },
-      "engines": {
-        "node": "^14.17.0 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "eslint": "^6.2.0 || ^7.0.0 || ^8.0.0"
-      }
-    },
-    "node_modules/eslint-plugin-vue/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/eslint-plugin-vue/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/eslint-plugin-vue/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/eslint-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-      "dev": true,
-      "dependencies": {
-        "eslint-visitor-keys": "^2.0.0"
-      },
-      "engines": {
-        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      },
-      "peerDependencies": {
-        "eslint": ">=5"
-      }
-    },
-    "node_modules/eslint-visitor-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/eslint/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/eslint/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/eslint/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/eslint/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/eslint-scope": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/eslint/node_modules/globals": {
-      "version": "13.19.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz",
-      "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/espree": {
-      "version": "9.4.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz",
-      "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^8.8.0",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.3.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/espree/node_modules/eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/esquery": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/esquery/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dependencies": {
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esrecurse/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/estree-walker": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
-      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
-    },
-    "node_modules/esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/eventemitter3": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
-      "dev": true
-    },
-    "node_modules/events": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-      "engines": {
-        "node": ">=0.8.x"
-      }
-    },
-    "node_modules/evp_bytestokey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-      "dev": true,
-      "dependencies": {
-        "md5.js": "^1.3.4",
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "node_modules/execa": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-      "dev": true,
-      "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.0",
-        "human-signals": "^2.1.0",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.1",
-        "onetime": "^5.1.2",
-        "signal-exit": "^3.0.3",
-        "strip-final-newline": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
-      }
-    },
-    "node_modules/execa/node_modules/get-stream": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/expose-loader": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/expose-loader/-/expose-loader-4.0.0.tgz",
-      "integrity": "sha512-kUEvHyf6MPR2ubZCL9aziP9Br5wxMvq1cghTpYhM6MW52NPq+7hXixw2EqQuI1SvGb1fDjc2ehJOg6645wR6ww==",
-      "dev": true,
-      "engines": {
-        "node": ">= 14.15.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/express": {
-      "version": "4.18.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
-      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
-      "dev": true,
-      "dependencies": {
-        "accepts": "~1.3.8",
-        "array-flatten": "1.1.1",
-        "body-parser": "1.20.1",
-        "content-disposition": "0.5.4",
-        "content-type": "~1.0.4",
-        "cookie": "0.5.0",
-        "cookie-signature": "1.0.6",
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "finalhandler": "1.2.0",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "merge-descriptors": "1.0.1",
-        "methods": "~1.1.2",
-        "on-finished": "2.4.1",
-        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.7",
-        "qs": "6.11.0",
-        "range-parser": "~1.2.1",
-        "safe-buffer": "5.2.1",
-        "send": "0.18.0",
-        "serve-static": "1.15.0",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "type-is": "~1.6.18",
-        "utils-merge": "1.0.1",
-        "vary": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
-    "node_modules/express/node_modules/array-flatten": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
-      "dev": true
-    },
-    "node_modules/express/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/express/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
-    },
-    "node_modules/fast-glob": {
-      "version": "3.2.12",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
-      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
-      },
-      "engines": {
-        "node": ">=8.6.0"
-      }
-    },
-    "node_modules/fast-glob/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
-    },
-    "node_modules/fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-      "dev": true
-    },
-    "node_modules/fastest-levenshtein": {
-      "version": "1.0.16",
-      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
-      "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4.9.1"
-      }
-    },
-    "node_modules/fastq": {
-      "version": "1.14.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.14.0.tgz",
-      "integrity": "sha512-eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg==",
-      "dev": true,
-      "dependencies": {
-        "reusify": "^1.0.4"
-      }
-    },
-    "node_modules/faye-websocket": {
-      "version": "0.11.4",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
-      "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
-      "dev": true,
-      "dependencies": {
-        "websocket-driver": ">=0.5.1"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-      "dev": true,
-      "dependencies": {
-        "flat-cache": "^3.0.4"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/file-loader": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-5.1.0.tgz",
-      "integrity": "sha512-u/VkLGskw3Ue59nyOwUwXI/6nuBCo7KBkniB/l7ICwr/7cPNGsL1WCXUp3GB0qgOOKU1TiP49bv4DZF/LJqprg==",
-      "dev": true,
-      "dependencies": {
-        "loader-utils": "^1.4.0",
-        "schema-utils": "^2.5.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/file-loader/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/file-loader/node_modules/loader-utils": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
-      "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/file-loader/node_modules/schema-utils": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
-      "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.5",
-        "ajv": "^6.12.4",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 8.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dev": true,
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/finalhandler": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
-      "dev": true,
-      "dependencies": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "2.4.1",
-        "parseurl": "~1.3.3",
-        "statuses": "2.0.1",
-        "unpipe": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/finalhandler/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/finalhandler/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/find-root": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
-      "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==",
-      "dev": true
-    },
-    "node_modules/find-up": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/flat": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.1.tgz",
-      "integrity": "sha512-FmTtBsHskrU6FJ2VxCnsDb84wu9zhmO3cUX2kGFb5tuwhfXxGciiT0oRY+cck35QmG+NmGh5eLz6lLCpWTqwpA==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "~2.0.3"
-      },
-      "bin": {
-        "flat": "cli.js"
-      }
-    },
-    "node_modules/flat-cache": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-      "dev": true,
-      "dependencies": {
-        "flatted": "^3.1.0",
-        "rimraf": "^3.0.2"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/flat-cache/node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/flatted": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
-      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
-      "dev": true
-    },
-    "node_modules/follow-redirects": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/RubenVerborgh"
-        }
-      ],
-      "engines": {
-        "node": ">=4.0"
-      },
-      "peerDependenciesMeta": {
-        "debug": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin": {
-      "version": "7.2.14",
-      "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-7.2.14.tgz",
-      "integrity": "sha512-Tg2feh/n8k486KX0EbXVUfJj3j0xnnbKYTJw0fnIb2QdV0+lblOYZSal5ed9hARoWVwKeOC7sYE2EakSRLo5ZA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.16.7",
-        "chalk": "^4.1.2",
-        "chokidar": "^3.5.3",
-        "cosmiconfig": "^7.0.1",
-        "deepmerge": "^4.2.2",
-        "fs-extra": "^10.0.0",
-        "memfs": "^3.4.1",
-        "minimatch": "^3.0.4",
-        "node-abort-controller": "^3.0.1",
-        "schema-utils": "^3.1.1",
-        "semver": "^7.3.5",
-        "tapable": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=12.13.0",
-        "yarn": ">=1.0.0"
-      },
-      "peerDependencies": {
-        "typescript": ">3.6.0",
-        "vue-template-compiler": "*",
-        "webpack": "^5.11.0"
-      },
-      "peerDependenciesMeta": {
-        "vue-template-compiler": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/form-data": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-      "dev": true,
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/forwarded": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/fos-routing": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/fos-routing/-/fos-routing-0.0.6.tgz",
-      "integrity": "sha512-+eeaFADJSbxdBI7l/hqZGZlvYmxFudOhiv+GHypQHvzbkr05pBYrm7AON80uuQp+3kBDiaRSh8Ln34Y1rHYzYw=="
-    },
-    "node_modules/fraction.js": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
-      "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "type": "patreon",
-        "url": "https://www.patreon.com/infusion"
-      }
-    },
-    "node_modules/fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/fs-extra": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/fs-monkey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz",
-      "integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==",
-      "dev": true
-    },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true
-    },
-    "node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
-    "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
-    },
-    "node_modules/function.prototype.name": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0",
-        "functions-have-names": "^1.2.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/functions-have-names": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/gensync": {
-      "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "dev": true,
-      "engines": {
-        "node": "6.* || 8.* || >= 10.*"
-      }
-    },
-    "node_modules/get-func-name": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
-      "integrity": "sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/get-intrinsic": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/get-npm-tarball-url": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/get-npm-tarball-url/-/get-npm-tarball-url-2.0.3.tgz",
-      "integrity": "sha512-R/PW6RqyaBQNWYaSyfrh54/qtcnOp22FHCCiRhSSZj0FP3KQWCsxxt0DzIdVTbwTqe9CtQfvl/FPD4UIPt4pqw==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.17"
-      }
-    },
-    "node_modules/get-stream": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-      "dependencies": {
-        "pump": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/get-symbol-description": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/glob": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-      "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
-      "dev": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.3"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/glob-to-regexp": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="
-    },
-    "node_modules/global-modules": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
-      "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
-      "dev": true,
-      "dependencies": {
-        "global-prefix": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/global-prefix": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
-      "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
-      "dev": true,
-      "dependencies": {
-        "ini": "^1.3.5",
-        "kind-of": "^6.0.2",
-        "which": "^1.3.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/global-prefix/node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
-      }
-    },
-    "node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-      "dev": true,
-      "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/globjoin": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
-      "integrity": "sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==",
-      "dev": true
-    },
-    "node_modules/google-protobuf": {
-      "version": "3.21.2",
-      "resolved": "https://registry.npmjs.org/google-protobuf/-/google-protobuf-3.21.2.tgz",
-      "integrity": "sha512-3MSOYFO5U9mPGikIYCzK0SaThypfGgS6bHqrUGXG3DPHCrb+txNqeEcns1W0lkGfk0rCyNXm7xB9rMxnCiZOoA==",
-      "dev": true
-    },
-    "node_modules/gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/got": {
-      "version": "11.8.6",
-      "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz",
-      "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==",
-      "dependencies": {
-        "@sindresorhus/is": "^4.0.0",
-        "@szmarczak/http-timer": "^4.0.5",
-        "@types/cacheable-request": "^6.0.1",
-        "@types/responselike": "^1.0.0",
-        "cacheable-lookup": "^5.0.3",
-        "cacheable-request": "^7.0.2",
-        "decompress-response": "^6.0.0",
-        "http2-wrapper": "^1.0.0-beta.5.2",
-        "lowercase-keys": "^2.0.0",
-        "p-cancelable": "^2.0.0",
-        "responselike": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10.19.0"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/got?sponsor=1"
-      }
-    },
-    "node_modules/graceful-fs": {
-      "version": "4.2.10",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
-    },
-    "node_modules/grapheme-splitter": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
-      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
-      "dev": true
-    },
-    "node_modules/growl": {
-      "version": "1.10.5",
-      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
-      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.x"
-      }
-    },
-    "node_modules/handle-thing": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
-      "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
-      "dev": true
-    },
-    "node_modules/hard-rejection": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
-      "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/has-property-descriptors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.1.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/hash-base": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
-      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/hash-base/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/hash-sum": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz",
-      "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==",
-      "dev": true
-    },
-    "node_modules/hash.js": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "minimalistic-assert": "^1.0.1"
-      }
-    },
-    "node_modules/he": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-      "dev": true,
-      "bin": {
-        "he": "bin/he"
-      }
-    },
-    "node_modules/hmac-drbg": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-      "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==",
-      "dev": true,
-      "dependencies": {
-        "hash.js": "^1.0.3",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "node_modules/hosted-git-info": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
-      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/hosted-git-info/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/hosted-git-info/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/hot-accept-webpack-plugin": {
-      "version": "2.0.0-beta.7",
-      "resolved": "https://registry.npmjs.org/hot-accept-webpack-plugin/-/hot-accept-webpack-plugin-2.0.0-beta.7.tgz",
-      "integrity": "sha512-3uRVxSf558Mb05zkQuqlEtroe6M50qb+k36+2xYOrxq/uQwpk0joGzzGvm62rW/SOyQq0p9pxS2+7kUiVJrcLw==",
-      "dev": true,
-      "dependencies": {
-        "modify-source-webpack-plugin": "2.0.0-beta.7"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/hpack.js": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
-      "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "obuf": "^1.0.0",
-        "readable-stream": "^2.0.1",
-        "wbuf": "^1.1.0"
-      }
-    },
-    "node_modules/html-encoding-sniffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
-      "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
-      "dev": true,
-      "dependencies": {
-        "whatwg-encoding": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/html-entities": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz",
-      "integrity": "sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==",
-      "dev": true
-    },
-    "node_modules/html-minifier-terser": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
-      "integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==",
-      "dev": true,
-      "dependencies": {
-        "camel-case": "^4.1.2",
-        "clean-css": "^5.2.2",
-        "commander": "^8.3.0",
-        "he": "^1.2.0",
-        "param-case": "^3.0.4",
-        "relateurl": "^0.2.7",
-        "terser": "^5.10.0"
-      },
-      "bin": {
-        "html-minifier-terser": "cli.js"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/html-tags": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.2.0.tgz",
-      "integrity": "sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/html-webpack-plugin": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz",
-      "integrity": "sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw==",
-      "dev": true,
-      "dependencies": {
-        "@types/html-minifier-terser": "^6.0.0",
-        "html-minifier-terser": "^6.0.2",
-        "lodash": "^4.17.21",
-        "pretty-error": "^4.0.0",
-        "tapable": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/html-webpack-plugin"
-      },
-      "peerDependencies": {
-        "webpack": "^5.20.0"
-      }
-    },
-    "node_modules/htmlparser2": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz",
-      "integrity": "sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==",
-      "dev": true,
-      "funding": [
-        "https://github.com/fb55/htmlparser2?sponsor=1",
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ],
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.2.2",
-        "domutils": "^2.8.0",
-        "entities": "^3.0.1"
-      }
-    },
-    "node_modules/http-cache-semantics": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
-      "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="
-    },
-    "node_modules/http-deceiver": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
-      "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==",
-      "dev": true
-    },
-    "node_modules/http-errors": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
-      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
-      "dev": true,
-      "dependencies": {
-        "depd": "2.0.0",
-        "inherits": "2.0.4",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "toidentifier": "1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/http-parser-js": {
-      "version": "0.5.8",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
-      "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==",
-      "dev": true
-    },
-    "node_modules/http-proxy": {
-      "version": "1.18.1",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
-      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
-      "dev": true,
-      "dependencies": {
-        "eventemitter3": "^4.0.0",
-        "follow-redirects": "^1.0.0",
-        "requires-port": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/http-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
-      "dev": true,
-      "dependencies": {
-        "@tootallnate/once": "2",
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/http-proxy-middleware": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
-      "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
-      "dev": true,
-      "dependencies": {
-        "@types/http-proxy": "^1.17.8",
-        "http-proxy": "^1.18.1",
-        "is-glob": "^4.0.1",
-        "is-plain-obj": "^3.0.0",
-        "micromatch": "^4.0.2"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "@types/express": "^4.17.13"
-      },
-      "peerDependenciesMeta": {
-        "@types/express": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/http-proxy-middleware/node_modules/is-plain-obj": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
-      "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/http2-wrapper": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz",
-      "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==",
-      "dependencies": {
-        "quick-lru": "^5.1.1",
-        "resolve-alpn": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=10.19.0"
-      }
-    },
-    "node_modules/http2-wrapper/node_modules/quick-lru": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
-      "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/https-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
-      "integrity": "sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==",
-      "dev": true
-    },
-    "node_modules/https-proxy-agent": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
-      "dev": true,
-      "dependencies": {
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/human-signals": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.17.0"
-      }
-    },
-    "node_modules/iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dev": true,
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/icss-utils": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
-      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
-      "dev": true,
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/ignore": {
-      "version": "5.2.4",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
-      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/immutable": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.1.0.tgz",
-      "integrity": "sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==",
-      "dev": true
-    },
-    "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
-      "dependencies": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/import-lazy": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
-      "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/import-local": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
-      "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
-      "dev": true,
-      "dependencies": {
-        "pkg-dir": "^4.2.0",
-        "resolve-cwd": "^3.0.0"
-      },
-      "bin": {
-        "import-local-fixture": "fixtures/cli.js"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/imports-loader": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/imports-loader/-/imports-loader-4.0.1.tgz",
-      "integrity": "sha512-ZiY+1xH5fqAJ1Qu1CFv+zw54rvPCC92DdYRDe0IIUboOhbJPLfOPbF/paA2iipelvMwjQUKWydcFOJ7f1+ZFcA==",
-      "dev": true,
-      "dependencies": {
-        "source-map": "^0.6.1",
-        "strip-comments": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 14.15.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.19"
-      }
-    },
-    "node_modules/indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "node_modules/ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-      "dev": true
-    },
-    "node_modules/internal-slot": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz",
-      "integrity": "sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.1.3",
-        "has": "^1.0.3",
-        "side-channel": "^1.0.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/interpret": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
-      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/ipaddr.js": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz",
-      "integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
-      "dev": true
-    },
-    "node_modules/is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-      "dev": true,
-      "dependencies": {
-        "has-bigints": "^1.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "dev": true,
-      "dependencies": {
-        "binary-extensions": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-buffer": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
-      "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/is-callable": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-core-module": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
-      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
-      "dev": true,
-      "dependencies": {
-        "has": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-docker": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
-      "dev": true,
-      "bin": {
-        "is-docker": "cli.js"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/is-number-object": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-path-cwd": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
-      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is-path-in-cwd": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
-      "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
-      "dev": true,
-      "dependencies": {
-        "is-path-inside": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is-path-in-cwd/node_modules/is-path-inside": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
-      "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
-      "dev": true,
-      "dependencies": {
-        "path-is-inside": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-plain-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-plain-object": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
-      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-potential-custom-element-name": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
-      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
-      "dev": true
-    },
-    "node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-stream": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-wsl": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-      "dev": true,
-      "dependencies": {
-        "is-docker": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-      "dev": true
-    },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "dev": true
-    },
-    "node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/jest-worker": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
-      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
-      "dependencies": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      }
-    },
-    "node_modules/jest-worker/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-worker/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
-      }
-    },
-    "node_modules/jets": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/jets/-/jets-0.11.0.tgz",
-      "integrity": "sha512-WGRZAkICV8la9FirezCLFkN0vr/VQDn6l5C0TeTaip8hY3YVz4EJW3tb8FASHLBCnFechGsssYAxkzTmRKXcLg=="
-    },
-    "node_modules/joycon": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/joycon/-/joycon-3.1.1.tgz",
-      "integrity": "sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/jquery": {
-      "version": "3.6.3",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.3.tgz",
-      "integrity": "sha512-bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg=="
-    },
-    "node_modules/jquery-serializejson": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/jquery-serializejson/-/jquery-serializejson-3.2.1.tgz",
-      "integrity": "sha512-89UxVNC4ac9XC5tWPz3DjSTYFcT5z6JYsxGVw+qHhD61FzjbEzXJHjpdLnezWujjqtIECi/URQ6KdPmDE9imGA=="
-    },
-    "node_modules/jquery-ui-dist": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/jquery-ui-dist/-/jquery-ui-dist-1.13.2.tgz",
-      "integrity": "sha512-oVDRd1NLtTbBwpRKAYdIRgpWVDzeBhfy7Gu0RmY6JEaZtmBq6kDn1pm5SgDiAotrnDS+RoTRXO6xvcNTxA9tOA==",
-      "dependencies": {
-        "jquery": ">=1.8.0 <4.0.0"
-      }
-    },
-    "node_modules/jquery.growl": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/jquery.growl/-/jquery.growl-1.3.5.tgz",
-      "integrity": "sha512-pK1RD8x3pXm1hEQ6KH0cu4QqzvI7R0EsUd5oneT5pavZ0cHwx/TV4qIdKeVfCWM0DVPyzI2GfXD6FwdDbRx1kw=="
-    },
-    "node_modules/js-sdsl": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz",
-      "integrity": "sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==",
-      "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/js-sdsl"
-      }
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
-    },
-    "node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/jsdom": {
-      "version": "19.0.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-19.0.0.tgz",
-      "integrity": "sha512-RYAyjCbxy/vri/CfnjUWJQQtZ3LKlLnDqj+9XLNnJPgEGeirZs3hllKR20re8LUZ6o1b1X4Jat+Qd26zmP41+A==",
-      "dev": true,
-      "dependencies": {
-        "abab": "^2.0.5",
-        "acorn": "^8.5.0",
-        "acorn-globals": "^6.0.0",
-        "cssom": "^0.5.0",
-        "cssstyle": "^2.3.0",
-        "data-urls": "^3.0.1",
-        "decimal.js": "^10.3.1",
-        "domexception": "^4.0.0",
-        "escodegen": "^2.0.0",
-        "form-data": "^4.0.0",
-        "html-encoding-sniffer": "^3.0.0",
-        "http-proxy-agent": "^5.0.0",
-        "https-proxy-agent": "^5.0.0",
-        "is-potential-custom-element-name": "^1.0.1",
-        "nwsapi": "^2.2.0",
-        "parse5": "6.0.1",
-        "saxes": "^5.0.1",
-        "symbol-tree": "^3.2.4",
-        "tough-cookie": "^4.0.0",
-        "w3c-hr-time": "^1.0.2",
-        "w3c-xmlserializer": "^3.0.0",
-        "webidl-conversions": "^7.0.0",
-        "whatwg-encoding": "^2.0.0",
-        "whatwg-mimetype": "^3.0.0",
-        "whatwg-url": "^10.0.0",
-        "ws": "^8.2.3",
-        "xml-name-validator": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "peerDependencies": {
-        "canvas": "^2.5.0"
-      },
-      "peerDependenciesMeta": {
-        "canvas": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "dev": true,
-      "bin": {
-        "jsesc": "bin/jsesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/json-buffer": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="
-    },
-    "node_modules/json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
-    },
-    "node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-    },
-    "node_modules/json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-      "dev": true
-    },
-    "node_modules/json5": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.2.tgz",
-      "integrity": "sha512-46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ==",
-      "dev": true,
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "dev": true,
-      "dependencies": {
-        "universalify": "^2.0.0"
-      },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/jwerty": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/jwerty/-/jwerty-0.3.2.tgz",
-      "integrity": "sha512-cMFyML8AJ5Q8oh6MYx0/6W99B4XH0y9G5IANjTF+gqv7iLSlkjmWBhpkq3XYKgFiDrsmrm2NGs1lK7SduX3DyA=="
-    },
-    "node_modules/keyv": {
-      "version": "4.5.2",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.2.tgz",
-      "integrity": "sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==",
-      "dependencies": {
-        "json-buffer": "3.0.1"
-      }
-    },
-    "node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/klona": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz",
-      "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/known-css-properties": {
-      "version": "0.26.0",
-      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.26.0.tgz",
-      "integrity": "sha512-5FZRzrZzNTBruuurWpvZnvP9pum+fe0HcK8z/ooo+U+Hmp4vtbyp1/QDsqmufirXy4egGzbaH/y2uCZf+6W5Kg==",
-      "dev": true
-    },
-    "node_modules/ldjson-stream": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ldjson-stream/-/ldjson-stream-1.2.1.tgz",
-      "integrity": "sha512-xw/nNEXafuPSLu8NjjG3+atVVw+8U1APZAQylmwQn19Hgw6rC7QjHvP6MupnHWCrzSm9m0xs5QWkCLuRvBPjgQ==",
-      "dev": true,
-      "dependencies": {
-        "split2": "^0.2.1",
-        "through2": "^0.6.1"
-      }
-    },
-    "node_modules/ldjson-stream/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-      "dev": true
-    },
-    "node_modules/ldjson-stream/node_modules/readable-stream": {
-      "version": "1.0.34",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-      "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/ldjson-stream/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
-      "dev": true
-    },
-    "node_modules/ldjson-stream/node_modules/through2": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-      "integrity": "sha512-RkK/CCESdTKQZHdmKICijdKKsCRVHs5KsLZ6pACAmF/1GPUQhonHSXWNERctxEp7RmvjdNbZTL5z9V7nSCXKcg==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": ">=1.0.33-1 <1.1.0-0",
-        "xtend": ">=4.0.0 <4.1.0-0"
-      }
-    },
-    "node_modules/levn": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/lines-and-columns": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-      "dev": true
-    },
-    "node_modules/loader-runner": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
-      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
-      "engines": {
-        "node": ">=6.11.5"
-      }
-    },
-    "node_modules/loader-utils": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
-      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
-      },
-      "engines": {
-        "node": ">=8.9.0"
-      }
-    },
-    "node_modules/locate-path": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-    },
-    "node_modules/lodash.escaperegexp": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz",
-      "integrity": "sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw=="
-    },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
-    },
-    "node_modules/lodash.truncate": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
-      "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==",
-      "dev": true
-    },
-    "node_modules/log-symbols": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
-      "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/loupe": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.6.tgz",
-      "integrity": "sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==",
-      "dev": true,
-      "dependencies": {
-        "get-func-name": "^2.0.0"
-      }
-    },
-    "node_modules/lower-case": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
-      "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/lowercase-keys": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^3.0.2"
-      }
-    },
-    "node_modules/magic-string": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
-      "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
-      "dependencies": {
-        "sourcemap-codec": "^1.4.8"
-      }
-    },
-    "node_modules/magnific-popup": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/magnific-popup/-/magnific-popup-1.1.0.tgz",
-      "integrity": "sha512-ghSa/1TKsOUL6ZlHfcfFCoB9Wms2nqaDdBEPh6QX9jFYQyMkUu7ciU1mrxedWWq4NM2m1C/llhHKLt6GKRYOzg==",
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/make-error": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
-      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
-      "dev": true
-    },
-    "node_modules/map-obj": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
-      "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/material-design-icons-iconfont": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/material-design-icons-iconfont/-/material-design-icons-iconfont-6.7.0.tgz",
-      "integrity": "sha512-lSj71DgVv20kO0kGbs42icDzbRot61gEDBLQACzkUuznRQBUYmbxzEkGU6dNBb5fRWHMaScYlAXX96HQ4/cJWA=="
-    },
-    "node_modules/mathml-tag-names": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz",
-      "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/md5.js": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
-      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
-      "dev": true,
-      "dependencies": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "node_modules/mdn-data": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
-      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
-      "dev": true
-    },
-    "node_modules/media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/memfs": {
-      "version": "3.4.12",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.12.tgz",
-      "integrity": "sha512-BcjuQn6vfqP+k100e0E9m61Hyqa//Brp+I3f0OBmN0ATHlFA8vx3Lt8z57R3u2bPqe3WGDBC+nF72fTH7isyEw==",
-      "dev": true,
-      "dependencies": {
-        "fs-monkey": "^1.0.3"
-      },
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
-    "node_modules/memory-fs": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz",
-      "integrity": "sha512-+y4mDxU4rvXXu5UDSGCGNiesFmwCHuefGMoPCO1WYucNYj7DsLqrFaa2fXVI0H+NNiPTwwzKwspn9yTZqUGqng==",
-      "dev": true
-    },
-    "node_modules/meow": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
-      "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/minimist": "^1.2.0",
-        "camelcase-keys": "^6.2.2",
-        "decamelize": "^1.2.0",
-        "decamelize-keys": "^1.1.0",
-        "hard-rejection": "^2.1.0",
-        "minimist-options": "4.1.0",
-        "normalize-package-data": "^3.0.0",
-        "read-pkg-up": "^7.0.1",
-        "redent": "^3.0.0",
-        "trim-newlines": "^3.0.0",
-        "type-fest": "^0.18.0",
-        "yargs-parser": "^20.2.3"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/meow/node_modules/yargs-parser": {
-      "version": "20.2.9",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
-      "dev": true
-    },
-    "node_modules/merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
-    },
-    "node_modules/merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-      "dev": true,
-      "dependencies": {
-        "braces": "^3.0.2",
-        "picomatch": "^2.3.1"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/miller-rabin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.0.0",
-        "brorand": "^1.0.1"
-      },
-      "bin": {
-        "miller-rabin": "bin/miller-rabin"
-      }
-    },
-    "node_modules/miller-rabin/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-      "dev": true,
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dependencies": {
-        "mime-db": "1.52.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/mimic-response": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/min-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
-      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/mini-css-extract-plugin": {
-      "version": "2.7.2",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.2.tgz",
-      "integrity": "sha512-EdlUizq13o0Pd+uCp+WO/JpkLvHRVGt97RqfeGhXqAcorYo1ypJSpkV+WDT0vY/kmh/p7wRdJNJtuyK540PXDw==",
-      "dev": true,
-      "dependencies": {
-        "schema-utils": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-      "dev": true
-    },
-    "node_modules/minimalistic-crypto-utils": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-      "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==",
-      "dev": true
-    },
-    "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/minimist": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
-      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/minimist-options": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
-      "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
-      "dev": true,
-      "dependencies": {
-        "arrify": "^1.0.1",
-        "is-plain-obj": "^1.1.0",
-        "kind-of": "^6.0.3"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/mkdirp": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz",
-      "integrity": "sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==",
-      "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/mocha": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-6.2.3.tgz",
-      "integrity": "sha512-0R/3FvjIGH3eEuG17ccFPk117XL2rWxatr81a57D+r/x2uTYZRbdZ4oVidEUMh2W2TJDa7MdAb12Lm2/qrKajg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-colors": "3.2.3",
-        "browser-stdout": "1.3.1",
-        "debug": "3.2.6",
-        "diff": "3.5.0",
-        "escape-string-regexp": "1.0.5",
-        "find-up": "3.0.0",
-        "glob": "7.1.3",
-        "growl": "1.10.5",
-        "he": "1.2.0",
-        "js-yaml": "3.13.1",
-        "log-symbols": "2.2.0",
-        "minimatch": "3.0.4",
-        "mkdirp": "0.5.4",
-        "ms": "2.1.1",
-        "node-environment-flags": "1.0.5",
-        "object.assign": "4.1.0",
-        "strip-json-comments": "2.0.1",
-        "supports-color": "6.0.0",
-        "which": "1.3.1",
-        "wide-align": "1.1.3",
-        "yargs": "13.3.2",
-        "yargs-parser": "13.1.2",
-        "yargs-unparser": "1.6.0"
-      },
-      "bin": {
-        "_mocha": "bin/_mocha",
-        "mocha": "bin/mocha"
-      },
-      "engines": {
-        "node": ">= 6.0.0"
-      }
-    },
-    "node_modules/mocha/node_modules/argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "node_modules/mocha/node_modules/debug": {
-      "version": "3.2.6",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-      "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/mocha/node_modules/find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/mocha/node_modules/js-yaml": {
-      "version": "3.13.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
-      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/mocha/node_modules/locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/mocha/node_modules/minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/mocha/node_modules/ms": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-      "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-      "dev": true
-    },
-    "node_modules/mocha/node_modules/object.assign": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
-      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.2",
-        "function-bind": "^1.1.1",
-        "has-symbols": "^1.0.0",
-        "object-keys": "^1.0.11"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/mocha/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/mocha/node_modules/p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/mocha/node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/mocha/node_modules/sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
-      "dev": true
-    },
-    "node_modules/mocha/node_modules/strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/mocha/node_modules/supports-color": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz",
-      "integrity": "sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/mocha/node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
-      }
-    },
-    "node_modules/modify-source-webpack-plugin": {
-      "version": "2.0.0-beta.7",
-      "resolved": "https://registry.npmjs.org/modify-source-webpack-plugin/-/modify-source-webpack-plugin-2.0.0-beta.7.tgz",
-      "integrity": "sha512-P7CKlGAF+HlinKS5xsIP5wuYwqcpV5eQMpwJYy5yocLAdv2RN5A24orv0Q1DXkbcw5Pd2pCUB4Fo1x9EqfiNeg==",
-      "dev": true,
-      "dependencies": {
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/modify-source-webpack-plugin/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/moment": {
-      "version": "2.29.4",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
-      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/moment-timezone": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.4.1.tgz",
-      "integrity": "sha512-5cNPVUwaVJDCe9JM8m/qz17f9SkaI8rpnRUyDJi2K5HAd6EwhuQ3n5nLclZkNC/qJnomKgQH2TIu70Gy2dxFKA==",
-      "dependencies": {
-        "moment": ">= 2.6.0"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/multicast-dns": {
-      "version": "7.2.5",
-      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
-      "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
-      "dev": true,
-      "dependencies": {
-        "dns-packet": "^5.2.2",
-        "thunky": "^1.0.2"
-      },
-      "bin": {
-        "multicast-dns": "cli.js"
-      }
-    },
-    "node_modules/multimatch": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-5.0.0.tgz",
-      "integrity": "sha512-ypMKuglUrZUD99Tk2bUQ+xNQj43lPEfAeX2o9cTteAmShXy2VHDJpuwu1o0xqoKCt9jLVAvwyFKdLTPXKAfJyA==",
-      "dev": true,
-      "dependencies": {
-        "@types/minimatch": "^3.0.3",
-        "array-differ": "^3.0.0",
-        "array-union": "^2.1.0",
-        "arrify": "^2.0.1",
-        "minimatch": "^3.0.4"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/multimatch/node_modules/@types/minimatch": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
-      "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==",
-      "dev": true
-    },
-    "node_modules/multimatch/node_modules/arrify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
-      "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/nanoid": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
-    "node_modules/natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-      "dev": true
-    },
-    "node_modules/natural-compare-lite": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
-      "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
-      "dev": true
-    },
-    "node_modules/needle": {
-      "version": "2.9.1",
-      "resolved": "https://registry.npmjs.org/needle/-/needle-2.9.1.tgz",
-      "integrity": "sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^3.2.6",
-        "iconv-lite": "^0.4.4",
-        "sax": "^1.2.4"
-      },
-      "bin": {
-        "needle": "bin/needle"
-      },
-      "engines": {
-        "node": ">= 4.4.x"
-      }
-    },
-    "node_modules/needle/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/negotiator": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/neo-async": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
-    },
-    "node_modules/no-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
-      "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
-      "dev": true,
-      "dependencies": {
-        "lower-case": "^2.0.2",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/node-abort-controller": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.0.1.tgz",
-      "integrity": "sha512-/ujIVxthRs+7q6hsdjHMaj8hRG9NuWmwrz+JdRwZ14jdFoKSkm+vDsCbF9PLpnSqjaWQJuTmVtcWHNLr+vrOFw==",
-      "dev": true
-    },
-    "node_modules/node-environment-flags": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.5.tgz",
-      "integrity": "sha512-VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ==",
-      "dev": true,
-      "dependencies": {
-        "object.getownpropertydescriptors": "^2.0.3",
-        "semver": "^5.7.0"
-      }
-    },
-    "node_modules/node-environment-flags/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/node-forge": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
-      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6.13.0"
-      }
-    },
-    "node_modules/node-libs-browser": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
-      "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
-      "dev": true,
-      "dependencies": {
-        "assert": "^1.1.1",
-        "browserify-zlib": "^0.2.0",
-        "buffer": "^4.3.0",
-        "console-browserify": "^1.1.0",
-        "constants-browserify": "^1.0.0",
-        "crypto-browserify": "^3.11.0",
-        "domain-browser": "^1.1.1",
-        "events": "^3.0.0",
-        "https-browserify": "^1.0.0",
-        "os-browserify": "^0.3.0",
-        "path-browserify": "0.0.1",
-        "process": "^0.11.10",
-        "punycode": "^1.2.4",
-        "querystring-es3": "^0.2.0",
-        "readable-stream": "^2.3.3",
-        "stream-browserify": "^2.0.1",
-        "stream-http": "^2.7.2",
-        "string_decoder": "^1.0.0",
-        "timers-browserify": "^2.0.4",
-        "tty-browserify": "0.0.0",
-        "url": "^0.11.0",
-        "util": "^0.11.0",
-        "vm-browserify": "^1.0.1"
-      }
-    },
-    "node_modules/node-libs-browser/node_modules/punycode": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
-      "dev": true
-    },
-    "node_modules/node-releases": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.8.tgz",
-      "integrity": "sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A=="
-    },
-    "node_modules/normalize-package-data": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
-      "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
-      "dev": true,
-      "dependencies": {
-        "hosted-git-info": "^4.0.1",
-        "is-core-module": "^2.5.0",
-        "semver": "^7.3.4",
-        "validate-npm-package-license": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/normalize-package-data/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/normalize-package-data/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/normalize-package-data/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/normalize-range": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-      "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/normalize-url": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
-      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/npm-run-path": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-      "dev": true,
-      "dependencies": {
-        "path-key": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/nth-check": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
-      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
-      "dev": true,
-      "dependencies": {
-        "boolbase": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/nth-check?sponsor=1"
-      }
-    },
-    "node_modules/nwsapi": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.2.tgz",
-      "integrity": "sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==",
-      "dev": true
-    },
-    "node_modules/object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-inspect": {
-      "version": "1.12.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.assign": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "has-symbols": "^1.0.3",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz",
-      "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.getownpropertydescriptors": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.5.tgz",
-      "integrity": "sha512-yDNzckpM6ntyQiGTik1fKV1DcVDRS+w8bvpWNCBanvH5LfRX9O8WTHqQzG4RZwRAM4I0oU7TV11Lj5v0g20ibw==",
-      "dev": true,
-      "dependencies": {
-        "array.prototype.reduce": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
-      "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/obuf": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
-      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
-      "dev": true
-    },
-    "node_modules/on-finished": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
-      "dev": true,
-      "dependencies": {
-        "ee-first": "1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/on-headers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
-    "node_modules/onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "dev": true,
-      "dependencies": {
-        "mimic-fn": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/open": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz",
-      "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==",
-      "dev": true,
-      "dependencies": {
-        "define-lazy-prop": "^2.0.0",
-        "is-docker": "^2.1.1",
-        "is-wsl": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/open-sans-fonts": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/open-sans-fonts/-/open-sans-fonts-1.6.2.tgz",
-      "integrity": "sha512-vsJ6/Mm0TdUKQJqxfkXJy+0K2X0QeRuTmxQq9YE1ycziw6CbDPolDsHhQ6+ImoV/7OTh8K8ZTGklY1Z5nUAwug==",
-      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info."
-    },
-    "node_modules/optionator": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-      "dev": true,
-      "dependencies": {
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0",
-        "word-wrap": "^1.2.3"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/os-browserify": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
-      "integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==",
-      "dev": true
-    },
-    "node_modules/p-cancelable": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
-      "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "dev": true,
-      "dependencies": {
-        "yocto-queue": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-locate": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-map": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
-      "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/p-retry": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz",
-      "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/retry": "0.12.0",
-        "retry": "^0.13.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pako": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
-      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
-      "dev": true
-    },
-    "node_modules/param-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
-      "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
-      "dev": true,
-      "dependencies": {
-        "dot-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
-      "dependencies": {
-        "callsites": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/parse-asn1": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
-      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
-      "dev": true,
-      "dependencies": {
-        "asn1.js": "^5.2.0",
-        "browserify-aes": "^1.0.0",
-        "evp_bytestokey": "^1.0.0",
-        "pbkdf2": "^3.0.3",
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "node_modules/parse-json": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "error-ex": "^1.3.1",
-        "json-parse-even-better-errors": "^2.3.0",
-        "lines-and-columns": "^1.1.6"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/parse5": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
-      "dev": true
-    },
-    "node_modules/parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/pascal-case": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
-      "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
-      "dev": true,
-      "dependencies": {
-        "no-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/path": {
-      "version": "0.12.7",
-      "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz",
-      "integrity": "sha512-aXXC6s+1w7otVF9UletFkFcDsJeO7lSZBPUQhtb5O0xJe8LtYhj/GxldoL09bBj9+ZmE2hNoHqQSFMN5fikh4Q==",
-      "dev": true,
-      "dependencies": {
-        "process": "^0.11.1",
-        "util": "^0.10.3"
-      }
-    },
-    "node_modules/path-browserify": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
-      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
-      "dev": true
-    },
-    "node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-is-inside": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-      "integrity": "sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==",
-      "dev": true
-    },
-    "node_modules/path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
-    },
-    "node_modules/path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==",
-      "dev": true
-    },
-    "node_modules/path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/path/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
-      "dev": true
-    },
-    "node_modules/path/node_modules/util": {
-      "version": "0.10.4",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
-      "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "2.0.3"
-      }
-    },
-    "node_modules/pathval": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
-      "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/pbkdf2": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
-      "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
-      "dev": true,
-      "dependencies": {
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4",
-        "ripemd160": "^2.0.1",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      },
-      "engines": {
-        "node": ">=0.12"
-      }
-    },
-    "node_modules/perfect-scrollbar": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/perfect-scrollbar/-/perfect-scrollbar-1.5.5.tgz",
-      "integrity": "sha512-dzalfutyP3e/FOpdlhVryN4AJ5XDVauVWxybSkLZmakFE2sS3y3pc4JnSprw8tGmHvkaG5Edr5T7LBTZ+WWU2g=="
-    },
-    "node_modules/photoswipe": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/photoswipe/-/photoswipe-4.1.3.tgz",
-      "integrity": "sha512-89Z43IRUyw7ycTolo+AaiDn3W1EEIfox54hERmm9bI12IB9cvRfHSHez3XhAyU8XW2EAFrC+2sKMhh7SJwn0bA==",
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
-    },
-    "node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/pify": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==",
-      "dev": true,
-      "dependencies": {
-        "pinkie": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/popper.js": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
-      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
-      "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/popperjs"
-      }
-    },
-    "node_modules/postcss": {
-      "version": "8.4.20",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.20.tgz",
-      "integrity": "sha512-6Q04AXR1212bXr5fh03u8aAwbLxAQNGQ/Q1LNa0VfOI06ZAlhPHtQvE4OIdpj4kLThXilalPnmDSOD65DcHt+g==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
-        }
-      ],
-      "dependencies": {
-        "nanoid": "^3.3.4",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      }
-    },
-    "node_modules/postcss-attribute-case-insensitive": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.2.tgz",
-      "integrity": "sha512-XIidXV8fDr0kKt28vqki84fRK8VW8eTuIa4PChv2MqKuT6C9UjmSKzen6KaWhWEoYvwxFCa7n/tC1SZ3tyq4SQ==",
-      "dev": true,
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.10"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-clamp": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-clamp/-/postcss-clamp-4.1.0.tgz",
-      "integrity": "sha512-ry4b1Llo/9zz+PKC+030KUnPITTJAHeOwjfAyyB60eT0AorGLdzp52s31OsPRHRf8NchkgFoG2y6fCfn1IV1Ow==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": ">=7.6.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4.6"
-      }
-    },
-    "node_modules/postcss-color-functional-notation": {
-      "version": "4.2.4",
-      "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.4.tgz",
-      "integrity": "sha512-2yrTAUZUab9s6CpxkxC4rVgFEVaR6/2Pipvi6qcgvnYiVqZcbDHEoBDhrXzyb7Efh2CCfHQNtcqWcIruDTIUeg==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-color-hex-alpha": {
-      "version": "8.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.4.tgz",
-      "integrity": "sha512-nLo2DCRC9eE4w2JmuKgVA3fGL3d01kGq752pVALF68qpGLmx2Qrk91QTKkdUqqp45T1K1XV8IhQpcu1hoAQflQ==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
-      }
-    },
-    "node_modules/postcss-color-rebeccapurple": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.1.1.tgz",
-      "integrity": "sha512-pGxkuVEInwLHgkNxUc4sdg4g3py7zUeCQ9sMfwyHAT+Ezk8a4OaaVZ8lIY5+oNqA/BXXgLyXv0+5wHP68R79hg==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-custom-media": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-8.0.2.tgz",
-      "integrity": "sha512-7yi25vDAoHAkbhAzX9dHx2yc6ntS4jQvejrNcC+csQJAXjj15e7VcWfMgLqBNAbOvqi5uIa9huOVwdHbf+sKqg==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.3"
-      }
-    },
-    "node_modules/postcss-custom-properties": {
-      "version": "12.1.11",
-      "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.11.tgz",
-      "integrity": "sha512-0IDJYhgU8xDv1KY6+VgUwuQkVtmYzRwu+dMjnmdMafXYv86SWqfxkc7qdDvWS38vsjaEtv8e0vGOUQrAiMBLpQ==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-custom-selectors": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-6.0.3.tgz",
-      "integrity": "sha512-fgVkmyiWDwmD3JbpCmB45SvvlCD6z9CG6Ie6Iere22W5aHea6oWa7EM2bpnv2Fj3I94L3VbtvX9KqwSi5aFzSg==",
-      "dev": true,
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.4"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.3"
-      }
-    },
-    "node_modules/postcss-dir-pseudo-class": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.5.tgz",
-      "integrity": "sha512-eqn4m70P031PF7ZQIvSgy9RSJ5uI2171O/OO/zcRNYpJbvaeKFUlar1aJ7rmgiQtbm0FSPsRewjpdS0Oew7MPA==",
-      "dev": true,
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.10"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-double-position-gradients": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.2.tgz",
-      "integrity": "sha512-GX+FuE/uBR6eskOK+4vkXgT6pDkexLokPaz/AbJna9s5Kzp/yl488pKPjhy0obB475ovfT1Wv8ho7U/cHNaRgQ==",
-      "dev": true,
-      "dependencies": {
-        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-env-function": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-4.0.6.tgz",
-      "integrity": "sha512-kpA6FsLra+NqcFnL81TnsU+Z7orGtDTxcOhl6pwXeEq1yFPpRMkCDpHhrz8CFQDr/Wfm0jLiNQ1OsGGPjlqPwA==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
-      }
-    },
-    "node_modules/postcss-focus-visible": {
-      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-6.0.4.tgz",
-      "integrity": "sha512-QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw==",
-      "dev": true,
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.9"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
-      }
-    },
-    "node_modules/postcss-focus-within": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-5.0.4.tgz",
-      "integrity": "sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ==",
-      "dev": true,
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.9"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
-      }
-    },
-    "node_modules/postcss-font-variant": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz",
-      "integrity": "sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==",
-      "dev": true,
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-gap-properties": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.5.tgz",
-      "integrity": "sha512-IuE6gKSdoUNcvkGIqdtjtcMtZIFyXZhmFd5RUlg97iVEvp1BZKV5ngsAjCjrVy+14uhGBQl9tzmi1Qwq4kqVOg==",
-      "dev": true,
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-image-set-function": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-4.0.7.tgz",
-      "integrity": "sha512-9T2r9rsvYzm5ndsBE8WgtrMlIT7VbtTfE7b3BQnudUqnBcBo7L758oc+o+pdj/dUV0l5wjwSdjeOH2DZtfv8qw==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-initial": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-4.0.1.tgz",
-      "integrity": "sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==",
-      "dev": true,
-      "peerDependencies": {
-        "postcss": "^8.0.0"
-      }
-    },
-    "node_modules/postcss-lab-function": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-4.2.1.tgz",
-      "integrity": "sha512-xuXll4isR03CrQsmxyz92LJB2xX9n+pZJ5jE9JgcnmsCammLyKdlzrBin+25dy6wIjfhJpKBAN80gsTlCgRk2w==",
-      "dev": true,
-      "dependencies": {
-        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-loader": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.0.2.tgz",
-      "integrity": "sha512-fUJzV/QH7NXUAqV8dWJ9Lg4aTkDCezpTS5HgJ2DvqznexTbSTxgi/dTECvTZ15BwKTtk8G/bqI/QTu2HPd3ZCg==",
-      "dev": true,
-      "dependencies": {
-        "cosmiconfig": "^7.0.0",
-        "klona": "^2.0.5",
-        "semver": "^7.3.8"
-      },
-      "engines": {
-        "node": ">= 14.15.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "postcss": "^7.0.0 || ^8.0.1",
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/postcss-loader/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/postcss-loader/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/postcss-loader/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/postcss-logical": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-5.0.4.tgz",
-      "integrity": "sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==",
-      "dev": true,
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
-      }
-    },
-    "node_modules/postcss-media-minmax": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz",
-      "integrity": "sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-media-query-parser": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
-      "integrity": "sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==",
-      "dev": true
-    },
-    "node_modules/postcss-modules-extract-imports": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
-      "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
-      "dev": true,
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-modules-local-by-default": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz",
-      "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==",
-      "dev": true,
-      "dependencies": {
-        "icss-utils": "^5.0.0",
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.1.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-modules-scope": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
-      "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
-      "dev": true,
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.4"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-modules-values": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
-      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
-      "dev": true,
-      "dependencies": {
-        "icss-utils": "^5.0.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-nesting": {
-      "version": "10.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.2.0.tgz",
-      "integrity": "sha512-EwMkYchxiDiKUhlJGzWsD9b2zvq/r2SSubcRrgP+jujMXFzqvANLt16lJANC+5uZ6hjI7lpRmI6O8JIl+8l1KA==",
-      "dev": true,
-      "dependencies": {
-        "@csstools/selector-specificity": "^2.0.0",
-        "postcss-selector-parser": "^6.0.10"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-opacity-percentage": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/postcss-opacity-percentage/-/postcss-opacity-percentage-1.1.3.tgz",
-      "integrity": "sha512-An6Ba4pHBiDtyVpSLymUUERMo2cU7s+Obz6BTrS+gxkbnSBNKSuD0AVUc+CpBMrpVPKKfoVz0WQCX+Tnst0i4A==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "kofi",
-          "url": "https://ko-fi.com/mrcgrtz"
-        },
-        {
-          "type": "liberapay",
-          "url": "https://liberapay.com/mrcgrtz"
-        }
-      ],
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-overflow-shorthand": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.4.tgz",
-      "integrity": "sha512-otYl/ylHK8Y9bcBnPLo3foYFLL6a6Ak+3EQBPOTR7luMYCOsiVTUk1iLvNf6tVPNGXcoL9Hoz37kpfriRIFb4A==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-page-break": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-3.0.4.tgz",
-      "integrity": "sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==",
-      "dev": true,
-      "peerDependencies": {
-        "postcss": "^8"
-      }
-    },
-    "node_modules/postcss-place": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-place/-/postcss-place-7.0.5.tgz",
-      "integrity": "sha512-wR8igaZROA6Z4pv0d+bvVrvGY4GVHihBCBQieXFY3kuSuMyOmEnnfFzHl/tQuqHZkfkIVBEbDvYcFfHmpSet9g==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-preset-env": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.8.3.tgz",
-      "integrity": "sha512-T1LgRm5uEVFSEF83vHZJV2z19lHg4yJuZ6gXZZkqVsqv63nlr6zabMH3l4Pc01FQCyfWVrh2GaUeCVy9Po+Aag==",
-      "dev": true,
-      "dependencies": {
-        "@csstools/postcss-cascade-layers": "^1.1.1",
-        "@csstools/postcss-color-function": "^1.1.1",
-        "@csstools/postcss-font-format-keywords": "^1.0.1",
-        "@csstools/postcss-hwb-function": "^1.0.2",
-        "@csstools/postcss-ic-unit": "^1.0.1",
-        "@csstools/postcss-is-pseudo-class": "^2.0.7",
-        "@csstools/postcss-nested-calc": "^1.0.0",
-        "@csstools/postcss-normalize-display-values": "^1.0.1",
-        "@csstools/postcss-oklab-function": "^1.1.1",
-        "@csstools/postcss-progressive-custom-properties": "^1.3.0",
-        "@csstools/postcss-stepped-value-functions": "^1.0.1",
-        "@csstools/postcss-text-decoration-shorthand": "^1.0.0",
-        "@csstools/postcss-trigonometric-functions": "^1.0.2",
-        "@csstools/postcss-unset-value": "^1.0.2",
-        "autoprefixer": "^10.4.13",
-        "browserslist": "^4.21.4",
-        "css-blank-pseudo": "^3.0.3",
-        "css-has-pseudo": "^3.0.4",
-        "css-prefers-color-scheme": "^6.0.3",
-        "cssdb": "^7.1.0",
-        "postcss-attribute-case-insensitive": "^5.0.2",
-        "postcss-clamp": "^4.1.0",
-        "postcss-color-functional-notation": "^4.2.4",
-        "postcss-color-hex-alpha": "^8.0.4",
-        "postcss-color-rebeccapurple": "^7.1.1",
-        "postcss-custom-media": "^8.0.2",
-        "postcss-custom-properties": "^12.1.10",
-        "postcss-custom-selectors": "^6.0.3",
-        "postcss-dir-pseudo-class": "^6.0.5",
-        "postcss-double-position-gradients": "^3.1.2",
-        "postcss-env-function": "^4.0.6",
-        "postcss-focus-visible": "^6.0.4",
-        "postcss-focus-within": "^5.0.4",
-        "postcss-font-variant": "^5.0.0",
-        "postcss-gap-properties": "^3.0.5",
-        "postcss-image-set-function": "^4.0.7",
-        "postcss-initial": "^4.0.1",
-        "postcss-lab-function": "^4.2.1",
-        "postcss-logical": "^5.0.4",
-        "postcss-media-minmax": "^5.0.0",
-        "postcss-nesting": "^10.2.0",
-        "postcss-opacity-percentage": "^1.1.2",
-        "postcss-overflow-shorthand": "^3.0.4",
-        "postcss-page-break": "^3.0.4",
-        "postcss-place": "^7.0.5",
-        "postcss-pseudo-class-any-link": "^7.1.6",
-        "postcss-replace-overflow-wrap": "^4.0.0",
-        "postcss-selector-not": "^6.0.1",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-pseudo-class-any-link": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.6.tgz",
-      "integrity": "sha512-9sCtZkO6f/5ML9WcTLcIyV1yz9D1rf0tWc+ulKcvV30s0iZKS/ONyETvoWsr6vnrmW+X+KmuK3gV/w5EWnT37w==",
-      "dev": true,
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.10"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-replace-overflow-wrap": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz",
-      "integrity": "sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==",
-      "dev": true,
-      "peerDependencies": {
-        "postcss": "^8.0.3"
-      }
-    },
-    "node_modules/postcss-resolve-nested-selector": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz",
-      "integrity": "sha512-HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw==",
-      "dev": true
-    },
-    "node_modules/postcss-safe-parser": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz",
-      "integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
-      },
-      "peerDependencies": {
-        "postcss": "^8.3.3"
-      }
-    },
-    "node_modules/postcss-scss": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.6.tgz",
-      "integrity": "sha512-rLDPhJY4z/i4nVFZ27j9GqLxj1pwxE80eAzUNRMXtcpipFYIeowerzBgG3yJhMtObGEXidtIgbUpQ3eLDsf5OQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss-scss"
-        }
-      ],
-      "engines": {
-        "node": ">=12.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4.19"
-      }
-    },
-    "node_modules/postcss-selector-not": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-6.0.1.tgz",
-      "integrity": "sha512-1i9affjAe9xu/y9uqWH+tD4r6/hDaXJruk8xn2x1vzxC2U3J3LKO3zJW4CyxlNhA56pADJ/djpEwpH1RClI2rQ==",
-      "dev": true,
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.10"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-selector-parser": {
-      "version": "6.0.11",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz",
-      "integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==",
-      "dev": true,
-      "dependencies": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss-sorting": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-7.0.1.tgz",
-      "integrity": "sha512-iLBFYz6VRYyLJEJsBJ8M3TCqNcckVzz4wFounSc5Oez35ogE/X+aoC5fFu103Ot7NyvjU3/xqIXn93Gp3kJk4g==",
-      "dev": true,
-      "peerDependencies": {
-        "postcss": "^8.3.9"
-      }
-    },
-    "node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/prelude-ls": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/prestakit": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/prestakit/-/prestakit-1.2.6.tgz",
-      "integrity": "sha512-eE6sLXoFyrP1f28ZfU2cRE3ZynZQl9aCvxy8bUTcQH8cidg7PGrNw7w2dFvXmPCvxsTOPy0pAV0SrL+c9U4muQ==",
-      "dependencies": {
-        "@ttskch/select2-bootstrap4-theme": "^1.5.2",
-        "bootstrap": "^4.4.1",
-        "jquery.growl": "^1.3.5",
-        "material-design-icons-iconfont": "^6.7.0",
-        "open-sans-fonts": "^1.6.2",
-        "select2": "^4.0.5"
-      }
-    },
-    "node_modules/pretty-error": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz",
-      "integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==",
-      "dev": true,
-      "dependencies": {
-        "lodash": "^4.17.20",
-        "renderkid": "^3.0.0"
-      }
-    },
-    "node_modules/process": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6.0"
-      }
-    },
-    "node_modules/process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-      "dev": true
-    },
-    "node_modules/proxy-addr": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
-      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
-      "dev": true,
-      "dependencies": {
-        "forwarded": "0.2.0",
-        "ipaddr.js": "1.9.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/proxy-addr/node_modules/ipaddr.js": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/psl": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
-      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
-      "dev": true
-    },
-    "node_modules/public-encrypt": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
-      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "parse-asn1": "^5.0.0",
-        "randombytes": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "node_modules/public-encrypt/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "node_modules/punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/qs": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
-      "dev": true,
-      "dependencies": {
-        "side-channel": "^1.0.4"
-      },
-      "engines": {
-        "node": ">=0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/querystring": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==",
-      "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
-    "node_modules/querystring-es3": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-      "integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
-    "node_modules/querystringify": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
-      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
-      "dev": true
-    },
-    "node_modules/queue-microtask": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/quick-lru": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
-      "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/randombytes": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dependencies": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "node_modules/randomfill": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-      "dev": true,
-      "dependencies": {
-        "randombytes": "^2.0.5",
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "node_modules/range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/raw-body": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
-      "dev": true,
-      "dependencies": {
-        "bytes": "3.1.2",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/raw-body/node_modules/bytes": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/read-pkg": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
-      "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
-      "dev": true,
-      "dependencies": {
-        "@types/normalize-package-data": "^2.4.0",
-        "normalize-package-data": "^2.5.0",
-        "parse-json": "^5.0.0",
-        "type-fest": "^0.6.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg-up": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
-      "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^4.1.0",
-        "read-pkg": "^5.2.0",
-        "type-fest": "^0.8.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg/node_modules/hosted-git-info": {
-      "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-      "dev": true
-    },
-    "node_modules/read-pkg/node_modules/normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-      "dev": true,
-      "dependencies": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
-      }
-    },
-    "node_modules/read-pkg/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/read-pkg/node_modules/type-fest": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-      "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/readable-stream/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
-    },
-    "node_modules/readable-stream/node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "node_modules/readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "dev": true,
-      "dependencies": {
-        "picomatch": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      }
-    },
-    "node_modules/rechoir": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz",
-      "integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==",
-      "dev": true,
-      "dependencies": {
-        "resolve": "^1.20.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      }
-    },
-    "node_modules/redent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
-      "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
-      "dev": true,
-      "dependencies": {
-        "indent-string": "^4.0.0",
-        "strip-indent": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/regexp.prototype.flags": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "functions-have-names": "^1.2.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/regexpp": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      }
-    },
-    "node_modules/relateurl": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
-      "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/renderkid": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz",
-      "integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==",
-      "dev": true,
-      "dependencies": {
-        "css-select": "^4.1.3",
-        "dom-converter": "^0.2.0",
-        "htmlparser2": "^6.1.0",
-        "lodash": "^4.17.21",
-        "strip-ansi": "^6.0.1"
-      }
-    },
-    "node_modules/renderkid/node_modules/entities": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
-    "node_modules/renderkid/node_modules/htmlparser2": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
-      "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
-      "dev": true,
-      "funding": [
-        "https://github.com/fb55/htmlparser2?sponsor=1",
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ],
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.0.0",
-        "domutils": "^2.5.2",
-        "entities": "^2.0.0"
-      }
-    },
-    "node_modules/require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/require-from-string": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/require-main-filename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-      "dev": true
-    },
-    "node_modules/requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
-      "dev": true
-    },
-    "node_modules/resize-observer-polyfill": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
-      "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
-    },
-    "node_modules/resolve": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
-      "dev": true,
-      "dependencies": {
-        "is-core-module": "^2.9.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/resolve-alpn": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
-      "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g=="
-    },
-    "node_modules/resolve-cwd": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
-      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
-      "dev": true,
-      "dependencies": {
-        "resolve-from": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/resolve-cwd/node_modules/resolve-from": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/responselike": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",
-      "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==",
-      "dependencies": {
-        "lowercase-keys": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/retry": {
-      "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
-      "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-      "dev": true,
-      "engines": {
-        "iojs": ">=1.0.0",
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/ripemd160": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-      "dev": true,
-      "dependencies": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
-      }
-    },
-    "node_modules/run-parallel": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "queue-microtask": "^1.2.2"
-      }
-    },
-    "node_modules/rxjs": {
-      "version": "7.8.0",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.0.tgz",
-      "integrity": "sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/safe-regex-test": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
-      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
-        "is-regex": "^1.1.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
-    },
-    "node_modules/sass-embedded": {
-      "version": "1.57.1",
-      "resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.57.1.tgz",
-      "integrity": "sha512-O0s796x76bRSJIdmJ4lrK+zJLtF3XeP+0tbJzR4NAPSDnWqHLk2boUYSdfx4DnF4x9rGmcVlMWFE8UvnLMNCmw==",
-      "dev": true,
-      "dependencies": {
-        "buffer-builder": "^0.2.0",
-        "google-protobuf": "^3.11.4",
-        "immutable": "^4.0.0",
-        "rxjs": "^7.4.0",
-        "supports-color": "^8.1.1"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      },
-      "optionalDependencies": {
-        "sass-embedded-darwin-arm64": "1.57.1",
-        "sass-embedded-darwin-x64": "1.57.1",
-        "sass-embedded-linux-arm": "1.57.1",
-        "sass-embedded-linux-arm64": "1.57.1",
-        "sass-embedded-linux-ia32": "1.57.1",
-        "sass-embedded-linux-x64": "1.57.1",
-        "sass-embedded-win32-ia32": "1.57.1",
-        "sass-embedded-win32-x64": "1.57.1"
-      }
-    },
-    "node_modules/sass-embedded-darwin-arm64": {
-      "version": "1.57.1",
-      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-arm64/-/sass-embedded-darwin-arm64-1.57.1.tgz",
-      "integrity": "sha512-YSfrLZkM2HdXETQdSznv2DN2GdkmBNWLAlHfDWe0toSEIB2C2YGuoqHYZtl6PBYqu8k8FH4TDyct8VzoIa+rMw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/sass-embedded-darwin-x64": {
-      "version": "1.57.1",
-      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-x64/-/sass-embedded-darwin-x64-1.57.1.tgz",
-      "integrity": "sha512-xq2Au8CRLHQ+MqH2p8gQn9rYGtfQ8voCWMRz7klYmmh5kXHFjefG3opPPB8mJeSc3SIqE35SQxQEIhUbsxozpg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/sass-embedded-linux-arm": {
-      "version": "1.57.1",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm/-/sass-embedded-linux-arm-1.57.1.tgz",
-      "integrity": "sha512-s+roBIgiQSg8124JmYmiSw4THWRvkF2BOclBZCb+OFLa8ZTak2WZdGs0PhqkMmZypxQ7cewh9ts+sOWN24yIrw==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/sass-embedded-linux-arm64": {
-      "version": "1.57.1",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm64/-/sass-embedded-linux-arm64-1.57.1.tgz",
-      "integrity": "sha512-R0GqVqf0xEhQ5nDbj7vqmKw+/1kqiURNBl0pD4uv4inBed2YKg+7agn7Y5XE5GUWbgOz7ubjL2kt4Glr7K7xeA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/sass-embedded-linux-ia32": {
-      "version": "1.57.1",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-ia32/-/sass-embedded-linux-ia32-1.57.1.tgz",
-      "integrity": "sha512-gKqMpfcjrW4S1m+cuRn88oUkr/HMv48CqyCHnfGCsrkTpIft33a1ZKW2jWm09rwmR0g/G6yGstoQO0iHWJWxuQ==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/sass-embedded-linux-x64": {
-      "version": "1.57.1",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-x64/-/sass-embedded-linux-x64-1.57.1.tgz",
-      "integrity": "sha512-AI6CrcuLWP22RXhVrZUN2JfdQ7YdFR30dA4twYwp/Q4hUfj85dJrVD5ORi8G04haMWPOQiFV6pBcMgzpiY2Bog==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/sass-embedded-win32-ia32": {
-      "version": "1.57.1",
-      "resolved": "https://registry.npmjs.org/sass-embedded-win32-ia32/-/sass-embedded-win32-ia32-1.57.1.tgz",
-      "integrity": "sha512-s7EhJLG9AnJNBga3I+W0rk6y/1n/i0XD34rvqR3yJgBhNKkI5rVCxFN7FAcGR50vQQbCO1MrUCmuVvld+2qvyQ==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/sass-embedded-win32-x64": {
-      "version": "1.57.1",
-      "resolved": "https://registry.npmjs.org/sass-embedded-win32-x64/-/sass-embedded-win32-x64-1.57.1.tgz",
-      "integrity": "sha512-b/Kgz7ADPTlPITk8e47Zf3eiuXlTGhi/eWsAoesUmkjR7jayvFNLHPhThgiRAxkzT6UlWI3Dzr+E3OBqUjegEg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/sass-embedded/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/sass-embedded/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
-      }
-    },
-    "node_modules/sass-loader": {
-      "version": "13.2.0",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.2.0.tgz",
-      "integrity": "sha512-JWEp48djQA4nbZxmgC02/Wh0eroSUutulROUusYJO9P9zltRbNN80JCBHqRGzjd4cmZCa/r88xgfkjGD0TXsHg==",
-      "dev": true,
-      "dependencies": {
-        "klona": "^2.0.4",
-        "neo-async": "^2.6.2"
-      },
-      "engines": {
-        "node": ">= 14.15.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "fibers": ">= 3.1.0",
-        "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0",
-        "sass": "^1.3.0",
-        "sass-embedded": "*",
-        "webpack": "^5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "fibers": {
-          "optional": true
-        },
-        "node-sass": {
-          "optional": true
-        },
-        "sass": {
-          "optional": true
-        },
-        "sass-embedded": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-      "dev": true
-    },
-    "node_modules/saxes": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
-      "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
-      "dev": true,
-      "dependencies": {
-        "xmlchars": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/schema-utils": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-      "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "ajv": "^8.8.0",
-        "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.0.0"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/schema-utils/node_modules/ajv": {
-      "version": "8.11.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.2.tgz",
-      "integrity": "sha512-E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/schema-utils/node_modules/ajv-keywords": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3"
-      },
-      "peerDependencies": {
-        "ajv": "^8.8.2"
-      }
-    },
-    "node_modules/schema-utils/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true
-    },
-    "node_modules/select-hose": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
-      "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==",
-      "dev": true
-    },
-    "node_modules/select2": {
-      "version": "4.0.13",
-      "resolved": "https://registry.npmjs.org/select2/-/select2-4.0.13.tgz",
-      "integrity": "sha512-1JeB87s6oN/TDxQQYCvS5EFoQyvV6eYMZZ0AeA4tdFDYWN3BAGZ8npr17UBFddU0lgAt3H0yjX3X6/ekOj1yjw=="
-    },
-    "node_modules/selfsigned": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz",
-      "integrity": "sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==",
-      "dev": true,
-      "dependencies": {
-        "node-forge": "^1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/send": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
-      "dev": true,
-      "dependencies": {
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "mime": "1.6.0",
-        "ms": "2.1.3",
-        "on-finished": "2.4.1",
-        "range-parser": "~1.2.1",
-        "statuses": "2.0.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/send/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/send/node_modules/debug/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/send/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-      "dev": true
-    },
-    "node_modules/serialize-javascript": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
-      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
-      "dependencies": {
-        "randombytes": "^2.1.0"
-      }
-    },
-    "node_modules/serve-index": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
-      "dev": true,
-      "dependencies": {
-        "accepts": "~1.3.4",
-        "batch": "0.6.1",
-        "debug": "2.6.9",
-        "escape-html": "~1.0.3",
-        "http-errors": "~1.6.2",
-        "mime-types": "~2.1.17",
-        "parseurl": "~1.3.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/serve-index/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/serve-index/node_modules/depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/serve-index/node_modules/http-errors": {
-      "version": "1.6.3",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-      "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
-      "dev": true,
-      "dependencies": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.0",
-        "statuses": ">= 1.4.0 < 2"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/serve-index/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
-      "dev": true
-    },
-    "node_modules/serve-index/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/serve-index/node_modules/setprototypeof": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-      "dev": true
-    },
-    "node_modules/serve-index/node_modules/statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/serve-static": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
-      "dev": true,
-      "dependencies": {
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "parseurl": "~1.3.3",
-        "send": "0.18.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
-      "dev": true
-    },
-    "node_modules/setimmediate": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-      "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==",
-      "dev": true
-    },
-    "node_modules/setprototypeof": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
-      "dev": true
-    },
-    "node_modules/sha.js": {
-      "version": "2.4.11",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      },
-      "bin": {
-        "sha.js": "bin.js"
-      }
-    },
-    "node_modules/shallow-clone": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
-      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dev": true,
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "dev": true
-    },
-    "node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/slice-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
-      }
-    },
-    "node_modules/slice-ansi/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/slice-ansi/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/slice-ansi/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/sockjs": {
-      "version": "0.3.24",
-      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
-      "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
-      "dev": true,
-      "dependencies": {
-        "faye-websocket": "^0.11.3",
-        "uuid": "^8.3.2",
-        "websocket-driver": "^0.7.4"
-      }
-    },
-    "node_modules/source-list-map": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
-      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
-      "dev": true
-    },
-    "node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-js": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-support": {
-      "version": "0.5.21",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      }
-    },
-    "node_modules/sourcemap-codec": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
-      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
-      "deprecated": "Please use @jridgewell/sourcemap-codec instead"
-    },
-    "node_modules/spdx-correct": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
-      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
-      "dev": true,
-      "dependencies": {
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-exceptions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
-      "dev": true
-    },
-    "node_modules/spdx-expression-parse": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
-      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
-      "dev": true,
-      "dependencies": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-expression-validate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/spdx-expression-validate/-/spdx-expression-validate-2.0.0.tgz",
-      "integrity": "sha512-b3wydZLM+Tc6CFvaRDBOF9d76oGIHNCLYFeHbftFXUWjnfZWganmDmvtM5sm1cRwJc/VDBMLyGGrsLFd1vOxbg==",
-      "dev": true,
-      "dependencies": {
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-license-ids": {
-      "version": "3.0.12",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz",
-      "integrity": "sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==",
-      "dev": true
-    },
-    "node_modules/spdy": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
-      "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.1.0",
-        "handle-thing": "^2.0.0",
-        "http-deceiver": "^1.2.7",
-        "select-hose": "^2.0.0",
-        "spdy-transport": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/spdy-transport": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
-      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.1.0",
-        "detect-node": "^2.0.4",
-        "hpack.js": "^2.1.6",
-        "obuf": "^1.1.2",
-        "readable-stream": "^3.0.6",
-        "wbuf": "^1.7.3"
-      }
-    },
-    "node_modules/spdy-transport/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/split2": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/split2/-/split2-0.2.1.tgz",
-      "integrity": "sha512-D/oTExYAkC9nWleOCTOyNmAuzfAT/6rHGBA9LIK7FVnGo13CSvrKCUzKenwH6U1s2znY9MqH6v0UQTEDa3vJmg==",
-      "dev": true,
-      "dependencies": {
-        "through2": "~0.6.1"
-      }
-    },
-    "node_modules/split2/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-      "dev": true
-    },
-    "node_modules/split2/node_modules/readable-stream": {
-      "version": "1.0.34",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-      "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/split2/node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
-      "dev": true
-    },
-    "node_modules/split2/node_modules/through2": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-      "integrity": "sha512-RkK/CCESdTKQZHdmKICijdKKsCRVHs5KsLZ6pACAmF/1GPUQhonHSXWNERctxEp7RmvjdNbZTL5z9V7nSCXKcg==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": ">=1.0.33-1 <1.1.0-0",
-        "xtend": ">=4.0.0 <4.1.0-0"
-      }
-    },
-    "node_modules/sprintf-js": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
-      "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="
-    },
-    "node_modules/statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/stream-browserify": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
-      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "~2.0.1",
-        "readable-stream": "^2.0.2"
-      }
-    },
-    "node_modules/stream-http": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
-      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
-      "dev": true,
-      "dependencies": {
-        "builtin-status-codes": "^3.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.3.6",
-        "to-arraybuffer": "^1.0.0",
-        "xtend": "^4.0.0"
-      }
-    },
-    "node_modules/string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
-    "node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/string.prototype.trimend": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
-      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimstart": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
-      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/strip-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-comments/-/strip-comments-2.0.1.tgz",
-      "integrity": "sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/strip-final-newline": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/strip-indent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
-      "dev": true,
-      "dependencies": {
-        "min-indent": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/style-loader": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.1.tgz",
-      "integrity": "sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/style-search": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
-      "integrity": "sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg==",
-      "dev": true
-    },
-    "node_modules/stylelint": {
-      "version": "14.16.0",
-      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.16.0.tgz",
-      "integrity": "sha512-X6uTi9DcxjzLV8ZUAjit1vsRtSwcls0nl07c9rqOPzvpA8IvTX/xWEkBRowS0ffevRrqkHa/ThDEu86u73FQDg==",
-      "dev": true,
-      "dependencies": {
-        "@csstools/selector-specificity": "^2.0.2",
-        "balanced-match": "^2.0.0",
-        "colord": "^2.9.3",
-        "cosmiconfig": "^7.1.0",
-        "css-functions-list": "^3.1.0",
-        "debug": "^4.3.4",
-        "fast-glob": "^3.2.12",
-        "fastest-levenshtein": "^1.0.16",
-        "file-entry-cache": "^6.0.1",
-        "global-modules": "^2.0.0",
-        "globby": "^11.1.0",
-        "globjoin": "^0.1.4",
-        "html-tags": "^3.2.0",
-        "ignore": "^5.2.1",
-        "import-lazy": "^4.0.0",
-        "imurmurhash": "^0.1.4",
-        "is-plain-object": "^5.0.0",
-        "known-css-properties": "^0.26.0",
-        "mathml-tag-names": "^2.1.3",
-        "meow": "^9.0.0",
-        "micromatch": "^4.0.5",
-        "normalize-path": "^3.0.0",
-        "picocolors": "^1.0.0",
-        "postcss": "^8.4.19",
-        "postcss-media-query-parser": "^0.2.3",
-        "postcss-resolve-nested-selector": "^0.1.1",
-        "postcss-safe-parser": "^6.0.0",
-        "postcss-selector-parser": "^6.0.11",
-        "postcss-value-parser": "^4.2.0",
-        "resolve-from": "^5.0.0",
-        "string-width": "^4.2.3",
-        "strip-ansi": "^6.0.1",
-        "style-search": "^0.1.0",
-        "supports-hyperlinks": "^2.3.0",
-        "svg-tags": "^1.0.0",
-        "table": "^6.8.1",
-        "v8-compile-cache": "^2.3.0",
-        "write-file-atomic": "^4.0.2"
-      },
-      "bin": {
-        "stylelint": "bin/stylelint.js"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/stylelint"
-      }
-    },
-    "node_modules/stylelint-config-prestashop": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/stylelint-config-prestashop/-/stylelint-config-prestashop-1.0.7.tgz",
-      "integrity": "sha512-Ac2D15Jsk/zOmHJ4mu5g29bLQFkOmuSKGE/n8Scjs6YAOL/7QRhq26hXzlZ21+VMFi2bqKdjzqmYKbhgUHGpCA==",
-      "dev": true,
-      "dependencies": {
-        "stylelint-config-twbs-bootstrap": "^3.0.1",
-        "stylelint-no-unsupported-browser-features": "^5.0.1"
-      }
-    },
-    "node_modules/stylelint-config-recess-order": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-recess-order/-/stylelint-config-recess-order-3.1.0.tgz",
-      "integrity": "sha512-LXR6zD5O9cS1a9gbLbuKvWLs7qmHj4xm5MQ5KhhwZPMhtQP9da3F6Jsp/NAUdsAwDQEnT1ShU16YVdgN6p4a/w==",
-      "dev": true,
-      "dependencies": {
-        "stylelint-order": "5.x"
-      },
-      "peerDependencies": {
-        "stylelint": ">=14"
-      }
-    },
-    "node_modules/stylelint-config-recommended": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-7.0.0.tgz",
-      "integrity": "sha512-yGn84Bf/q41J4luis1AZ95gj0EQwRX8lWmGmBwkwBNSkpGSpl66XcPTulxGa/Z91aPoNGuIGBmFkcM1MejMo9Q==",
-      "dev": true,
-      "peerDependencies": {
-        "stylelint": "^14.4.0"
-      }
-    },
-    "node_modules/stylelint-config-recommended-scss": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-5.0.2.tgz",
-      "integrity": "sha512-b14BSZjcwW0hqbzm9b0S/ScN2+3CO3O4vcMNOw2KGf8lfVSwJ4p5TbNEXKwKl1+0FMtgRXZj6DqVUe/7nGnuBg==",
-      "dev": true,
-      "dependencies": {
-        "postcss-scss": "^4.0.2",
-        "stylelint-config-recommended": "^6.0.0",
-        "stylelint-scss": "^4.0.0"
-      },
-      "peerDependencies": {
-        "stylelint": "^14.0.0"
-      }
-    },
-    "node_modules/stylelint-config-recommended-scss/node_modules/stylelint-config-recommended": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-6.0.0.tgz",
-      "integrity": "sha512-ZorSSdyMcxWpROYUvLEMm0vSZud2uB7tX1hzBZwvVY9SV/uly4AvvJPPhCcymZL3fcQhEQG5AELmrxWqtmzacw==",
-      "dev": true,
-      "peerDependencies": {
-        "stylelint": "^14.0.0"
-      }
-    },
-    "node_modules/stylelint-config-standard": {
-      "version": "25.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-25.0.0.tgz",
-      "integrity": "sha512-21HnP3VSpaT1wFjFvv9VjvOGDtAviv47uTp3uFmzcN+3Lt+RYRv6oAplLaV51Kf792JSxJ6svCJh/G18E9VnCA==",
-      "dev": true,
-      "dependencies": {
-        "stylelint-config-recommended": "^7.0.0"
-      },
-      "peerDependencies": {
-        "stylelint": "^14.4.0"
-      }
-    },
-    "node_modules/stylelint-config-standard-scss": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-standard-scss/-/stylelint-config-standard-scss-3.0.0.tgz",
-      "integrity": "sha512-zt3ZbzIbllN1iCmc94e4pDxqpkzeR6CJo5DDXzltshuXr+82B8ylHyMMARNnUYrZH80B7wgY7UkKTYCFM0UUyw==",
-      "dev": true,
-      "dependencies": {
-        "stylelint-config-recommended-scss": "^5.0.2",
-        "stylelint-config-standard": "^24.0.0"
-      },
-      "peerDependencies": {
-        "stylelint": "^14.0.0"
-      }
-    },
-    "node_modules/stylelint-config-standard-scss/node_modules/stylelint-config-recommended": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-6.0.0.tgz",
-      "integrity": "sha512-ZorSSdyMcxWpROYUvLEMm0vSZud2uB7tX1hzBZwvVY9SV/uly4AvvJPPhCcymZL3fcQhEQG5AELmrxWqtmzacw==",
-      "dev": true,
-      "peerDependencies": {
-        "stylelint": "^14.0.0"
-      }
-    },
-    "node_modules/stylelint-config-standard-scss/node_modules/stylelint-config-standard": {
-      "version": "24.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-24.0.0.tgz",
-      "integrity": "sha512-+RtU7fbNT+VlNbdXJvnjc3USNPZRiRVp/d2DxOF/vBDDTi0kH5RX2Ny6errdtZJH3boO+bmqIYEllEmok4jiuw==",
-      "dev": true,
-      "dependencies": {
-        "stylelint-config-recommended": "^6.0.0"
-      },
-      "peerDependencies": {
-        "stylelint": "^14.0.0"
-      }
-    },
-    "node_modules/stylelint-config-twbs-bootstrap": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/stylelint-config-twbs-bootstrap/-/stylelint-config-twbs-bootstrap-3.2.1.tgz",
-      "integrity": "sha512-lfVEx+tW2SHMTYoifXIdB086FgQdQarQGt1vDqkEiuGYEtKeGjf41hovotEijw4t1RSyWuhkfxF8GzUZajTXjQ==",
-      "dev": true,
-      "dependencies": {
-        "stylelint-config-recess-order": "^3.0.0",
-        "stylelint-config-standard": "^25.0.0",
-        "stylelint-config-standard-scss": "^3.0.0",
-        "stylelint-scss": "^4.2.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "peerDependencies": {
-        "stylelint": "^14.4.0"
-      }
-    },
-    "node_modules/stylelint-no-unsupported-browser-features": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/stylelint-no-unsupported-browser-features/-/stylelint-no-unsupported-browser-features-5.0.4.tgz",
-      "integrity": "sha512-05DeIsWv262DXTSWhbQURDOxno9Tsu81sNnOpG1gD39WT+NNsEjhR2BQvwvNpZ/J/lS8vHxjhHULU2OGKSswvA==",
-      "dev": true,
-      "dependencies": {
-        "doiuse": "^4.4.1",
-        "lodash": "^4.17.15",
-        "postcss": "^8.4.16"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "peerDependencies": {
-        "stylelint": ">=13.0.0"
-      }
-    },
-    "node_modules/stylelint-order": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-5.0.0.tgz",
-      "integrity": "sha512-OWQ7pmicXufDw5BlRqzdz3fkGKJPgLyDwD1rFY3AIEfIH/LQY38Vu/85v8/up0I+VPiuGRwbc2Hg3zLAsJaiyw==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^8.3.11",
-        "postcss-sorting": "^7.0.1"
-      },
-      "peerDependencies": {
-        "stylelint": "^14.0.0"
-      }
-    },
-    "node_modules/stylelint-scss": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-4.3.0.tgz",
-      "integrity": "sha512-GvSaKCA3tipzZHoz+nNO7S02ZqOsdBzMiCx9poSmLlb3tdJlGddEX/8QzCOD8O7GQan9bjsvLMsO5xiw6IhhIQ==",
-      "dev": true,
-      "dependencies": {
-        "lodash": "^4.17.21",
-        "postcss-media-query-parser": "^0.2.3",
-        "postcss-resolve-nested-selector": "^0.1.1",
-        "postcss-selector-parser": "^6.0.6",
-        "postcss-value-parser": "^4.1.0"
-      },
-      "peerDependencies": {
-        "stylelint": "^14.5.1"
-      }
-    },
-    "node_modules/stylelint/node_modules/balanced-match": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz",
-      "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==",
-      "dev": true
-    },
-    "node_modules/stylelint/node_modules/resolve-from": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/supports-hyperlinks": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz",
-      "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0",
-        "supports-color": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/supports-hyperlinks/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/supports-hyperlinks/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/svg-tags": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
-      "integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==",
-      "dev": true
-    },
-    "node_modules/symbol-tree": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
-      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
-      "dev": true
-    },
-    "node_modules/table": {
-      "version": "6.8.1",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.8.1.tgz",
-      "integrity": "sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^8.0.1",
-        "lodash.truncate": "^4.4.2",
-        "slice-ansi": "^4.0.0",
-        "string-width": "^4.2.3",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/table/node_modules/ajv": {
-      "version": "8.11.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.2.tgz",
-      "integrity": "sha512-E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/table/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true
-    },
-    "node_modules/tablednd": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/tablednd/-/tablednd-1.0.5.tgz",
-      "integrity": "sha512-iC230jusaekjzzAy0jigZLbzb7jKKnW9xiNiZ4W17p7y8AvBYf5KunyrIE3HwL1FhL2VEeogZtjP5VeBeIW4xg=="
-    },
-    "node_modules/tapable": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/terser": {
-      "version": "5.16.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.1.tgz",
-      "integrity": "sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw==",
-      "dependencies": {
-        "@jridgewell/source-map": "^0.3.2",
-        "acorn": "^8.5.0",
-        "commander": "^2.20.0",
-        "source-map-support": "~0.5.20"
-      },
-      "bin": {
-        "terser": "bin/terser"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/terser-webpack-plugin": {
-      "version": "5.3.6",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz",
-      "integrity": "sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==",
-      "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.14",
-        "jest-worker": "^27.4.5",
-        "schema-utils": "^3.1.1",
-        "serialize-javascript": "^6.0.0",
-        "terser": "^5.14.1"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.1.0"
-      },
-      "peerDependenciesMeta": {
-        "@swc/core": {
-          "optional": true
-        },
-        "esbuild": {
-          "optional": true
-        },
-        "uglify-js": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/terser/node_modules/commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
-    },
-    "node_modules/text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-      "dev": true
-    },
-    "node_modules/through2": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz",
-      "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==",
-      "dev": true,
-      "dependencies": {
-        "readable-stream": "3"
-      }
-    },
-    "node_modules/through2/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/thunky": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
-      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
-      "dev": true
-    },
-    "node_modules/timers-browserify": {
-      "version": "2.0.12",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
-      "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
-      "dev": true,
-      "dependencies": {
-        "setimmediate": "^1.0.4"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
-    "node_modules/to-arraybuffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-      "integrity": "sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA==",
-      "dev": true
-    },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/toidentifier": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/tough-cookie": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz",
-      "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==",
-      "dev": true,
-      "dependencies": {
-        "psl": "^1.1.33",
-        "punycode": "^2.1.1",
-        "universalify": "^0.2.0",
-        "url-parse": "^1.5.3"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/tough-cookie/node_modules/universalify": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
-      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
-    "node_modules/tr46": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
-      "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
-      "dev": true,
-      "dependencies": {
-        "punycode": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/trim-newlines": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
-      "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ts-loader": {
-      "version": "9.4.2",
-      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.4.2.tgz",
-      "integrity": "sha512-OmlC4WVmFv5I0PpaxYb+qGeGOdm5giHU7HwDDUjw59emP2UYMHy9fFSDcYgSNoH8sXcj4hGCSEhlDZ9ULeDraA==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.1.0",
-        "enhanced-resolve": "^5.0.0",
-        "micromatch": "^4.0.0",
-        "semver": "^7.3.4"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "typescript": "*",
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/ts-loader/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/ts-loader/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/ts-loader/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/ts-loader/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/ts-loader/node_modules/enhanced-resolve": {
-      "version": "5.12.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz",
-      "integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.2.4",
-        "tapable": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/ts-loader/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ts-loader/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/ts-loader/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/ts-loader/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ts-loader/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/ts-node": {
-      "version": "10.9.1",
-      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz",
-      "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==",
-      "dev": true,
-      "dependencies": {
-        "@cspotcode/source-map-support": "^0.8.0",
-        "@tsconfig/node10": "^1.0.7",
-        "@tsconfig/node12": "^1.0.7",
-        "@tsconfig/node14": "^1.0.0",
-        "@tsconfig/node16": "^1.0.2",
-        "acorn": "^8.4.1",
-        "acorn-walk": "^8.1.1",
-        "arg": "^4.1.0",
-        "create-require": "^1.1.0",
-        "diff": "^4.0.1",
-        "make-error": "^1.1.1",
-        "v8-compile-cache-lib": "^3.0.1",
-        "yn": "3.1.1"
-      },
-      "bin": {
-        "ts-node": "dist/bin.js",
-        "ts-node-cwd": "dist/bin-cwd.js",
-        "ts-node-esm": "dist/bin-esm.js",
-        "ts-node-script": "dist/bin-script.js",
-        "ts-node-transpile-only": "dist/bin-transpile.js",
-        "ts-script": "dist/bin-script-deprecated.js"
-      },
-      "peerDependencies": {
-        "@swc/core": ">=1.2.50",
-        "@swc/wasm": ">=1.2.50",
-        "@types/node": "*",
-        "typescript": ">=2.7"
-      },
-      "peerDependenciesMeta": {
-        "@swc/core": {
-          "optional": true
-        },
-        "@swc/wasm": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/ts-node/node_modules/diff": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.3.1"
-      }
-    },
-    "node_modules/tsconfig-paths": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
-      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
-        "minimist": "^1.2.6",
-        "strip-bom": "^3.0.0"
-      }
-    },
-    "node_modules/tsconfig-paths/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/tslib": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz",
-      "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==",
-      "dev": true
-    },
-    "node_modules/tsutils": {
-      "version": "3.21.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
-      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^1.8.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      },
-      "peerDependencies": {
-        "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
-      }
-    },
-    "node_modules/tsutils/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
-    },
-    "node_modules/tty-browserify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
-      "integrity": "sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw==",
-      "dev": true
-    },
-    "node_modules/type-check": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/type-detect": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/type-fest": {
-      "version": "0.18.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
-      "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-      "dev": true,
-      "dependencies": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/typeahead.js": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/typeahead.js/-/typeahead.js-0.11.1.tgz",
-      "integrity": "sha512-yGaLzGjVHyryZdNfrWz2NHXUwEO7hrlVmGMGCo5+6mH3nEEhcQ0Te3mK3G60uRnxfERu8twOWSU4WmwScbwhMg==",
-      "dependencies": {
-        "jquery": ">=1.7"
-      }
-    },
-    "node_modules/typescript": {
-      "version": "4.9.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz",
-      "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==",
-      "dev": true,
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=4.2.0"
-      }
-    },
-    "node_modules/uglify-save-license": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/uglify-save-license/-/uglify-save-license-0.4.1.tgz",
-      "integrity": "sha512-ErJczQkCvQKoEk7xxIfJTGp2JHtbKr8lEPtTgeJqm3PVCdF930Ba7x+wwtj3dZKwVu7lDy2nTOwncm3qCD+RMw==",
-      "dev": true
-    },
-    "node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/universalify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
-    "node_modules/unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/update-browserslist-db": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
-      "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        }
-      ],
-      "dependencies": {
-        "escalade": "^3.1.1",
-        "picocolors": "^1.0.0"
-      },
-      "bin": {
-        "browserslist-lint": "cli.js"
-      },
-      "peerDependencies": {
-        "browserslist": ">= 4.21.0"
-      }
-    },
-    "node_modules/uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dependencies": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "node_modules/url": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-      "integrity": "sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==",
-      "dev": true,
-      "dependencies": {
-        "punycode": "1.3.2",
-        "querystring": "0.2.0"
-      }
-    },
-    "node_modules/url-parse": {
-      "version": "1.5.10",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
-      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
-      "dev": true,
-      "dependencies": {
-        "querystringify": "^2.1.1",
-        "requires-port": "^1.0.0"
-      }
-    },
-    "node_modules/url-polyfill": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/url-polyfill/-/url-polyfill-1.1.12.tgz",
-      "integrity": "sha512-mYFmBHCapZjtcNHW0MDq9967t+z4Dmg5CJ0KqysK3+ZbyoNOWQHksGCTWwDhxGXllkWlOc10Xfko6v4a3ucM6A=="
-    },
-    "node_modules/url/node_modules/punycode": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-      "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==",
-      "dev": true
-    },
-    "node_modules/util": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
-      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "2.0.3"
-      }
-    },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-      "dev": true
-    },
-    "node_modules/util/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
-      "dev": true
-    },
-    "node_modules/utila": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
-      "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==",
-      "dev": true
-    },
-    "node_modules/utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "dev": true,
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
-    "node_modules/v8-compile-cache": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
-      "dev": true
-    },
-    "node_modules/v8-compile-cache-lib": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
-      "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
-      "dev": true
-    },
-    "node_modules/validate-npm-package-license": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-      "dev": true,
-      "dependencies": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
-    "node_modules/vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/vazirmatn": {
-      "version": "32.102.0",
-      "resolved": "https://registry.npmjs.org/vazirmatn/-/vazirmatn-32.102.0.tgz",
-      "integrity": "sha512-Fkvs0Hp5x9zjHTuwog3KEcARhMLxjXd3o3MyD/vBywxYt2LG+4THEHpu6AW8ojfHJAutrxFnDTPB/5hvkX80ww=="
-    },
-    "node_modules/vm-browserify": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
-      "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
-      "dev": true
-    },
-    "node_modules/vue": {
-      "version": "3.2.45",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-3.2.45.tgz",
-      "integrity": "sha512-9Nx/Mg2b2xWlXykmCwiTUCWHbWIj53bnkizBxKai1g61f2Xit700A1ljowpTIM11e3uipOeiPcSqnmBg6gyiaA==",
-      "dependencies": {
-        "@vue/compiler-dom": "3.2.45",
-        "@vue/compiler-sfc": "3.2.45",
-        "@vue/runtime-dom": "3.2.45",
-        "@vue/server-renderer": "3.2.45",
-        "@vue/shared": "3.2.45"
-      }
-    },
-    "node_modules/vue-eslint-parser": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.1.0.tgz",
-      "integrity": "sha512-NGn/iQy8/Wb7RrRa4aRkokyCZfOUWk19OP5HP6JEozQFX5AoS/t+Z0ZN7FY4LlmWc4FNI922V7cvX28zctN8dQ==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.3.4",
-        "eslint-scope": "^7.1.1",
-        "eslint-visitor-keys": "^3.3.0",
-        "espree": "^9.3.1",
-        "esquery": "^1.4.0",
-        "lodash": "^4.17.21",
-        "semver": "^7.3.6"
-      },
-      "engines": {
-        "node": "^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      },
-      "peerDependencies": {
-        "eslint": ">=6.0.0"
-      }
-    },
-    "node_modules/vue-eslint-parser/node_modules/eslint-scope": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/vue-eslint-parser/node_modules/eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/vue-eslint-parser/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/vue-eslint-parser/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/vue-eslint-parser/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/vue-eslint-parser/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/vue-i18n": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.2.2.tgz",
-      "integrity": "sha512-yswpwtj89rTBhegUAv9Mu37LNznyu3NpyLQmozF3i1hYOhwpG8RjcjIFIIfnu+2MDZJGSZPXaKWvnQA71Yv9TQ==",
-      "dependencies": {
-        "@intlify/core-base": "9.2.2",
-        "@intlify/shared": "9.2.2",
-        "@intlify/vue-devtools": "9.2.2",
-        "@vue/devtools-api": "^6.2.1"
-      },
-      "engines": {
-        "node": ">= 14"
-      },
-      "peerDependencies": {
-        "vue": "^3.0.0"
-      }
-    },
-    "node_modules/vue-loader": {
-      "version": "17.0.1",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-17.0.1.tgz",
-      "integrity": "sha512-/OOyugJnImKCkAKrAvdsWMuwoCqGxWT5USLsjohzWbMgOwpA5wQmzQiLMzZd7DjhIfunzAGIApTOgIylz/kwcg==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.1.0",
-        "hash-sum": "^2.0.0",
-        "loader-utils": "^2.0.0"
-      },
-      "peerDependencies": {
-        "webpack": "^4.1.0 || ^5.0.0-0"
-      },
-      "peerDependenciesMeta": {
-        "@vue/compiler-sfc": {
-          "optional": true
-        },
-        "vue": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/vue-loader/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/vue-loader/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/vue-loader/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/vue-loader/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/vue-loader/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/vue-loader/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/vue-resource": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/vue-resource/-/vue-resource-1.5.3.tgz",
-      "integrity": "sha512-REhTuEuYSpwmEH/VN4fgDQVC/VXxDK/xsguuiDPnINxOwy1s0CSu//p++osTUkiAXi6d/vptwBpb0AcBIDsXzw==",
-      "dependencies": {
-        "got": ">=8.0 <12.0"
-      }
-    },
-    "node_modules/vue-router": {
-      "version": "4.1.6",
-      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.1.6.tgz",
-      "integrity": "sha512-DYWYwsG6xNPmLq/FmZn8Ip+qrhFEzA14EI12MsMgVxvHFDYvlr4NXpVF5hrRH1wVcDP8fGi5F4rxuJSl8/r+EQ==",
-      "dependencies": {
-        "@vue/devtools-api": "^6.4.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/posva"
-      },
-      "peerDependencies": {
-        "vue": "^3.2.0"
-      }
-    },
-    "node_modules/vue-style-loader": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz",
-      "integrity": "sha512-sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg==",
-      "dev": true,
-      "dependencies": {
-        "hash-sum": "^1.0.2",
-        "loader-utils": "^1.0.2"
-      }
-    },
-    "node_modules/vue-style-loader/node_modules/hash-sum": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
-      "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
-      "dev": true
-    },
-    "node_modules/vue-style-loader/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/vue-style-loader/node_modules/loader-utils": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
-      "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/vuex": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/vuex/-/vuex-4.1.0.tgz",
-      "integrity": "sha512-hmV6UerDrPcgbSy9ORAtNXDr9M4wlNP4pEFKye4ujJF8oqgFFuxDCdOLS3eNoRTtq5O3hoBDh9Doj1bQMYHRbQ==",
-      "dependencies": {
-        "@vue/devtools-api": "^6.0.0-beta.11"
-      },
-      "peerDependencies": {
-        "vue": "^3.2.0"
-      }
-    },
-    "node_modules/w3c-hr-time": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
-      "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
-      "deprecated": "Use your platform's native performance.now() and performance.timeOrigin.",
-      "dev": true,
-      "dependencies": {
-        "browser-process-hrtime": "^1.0.0"
-      }
-    },
-    "node_modules/w3c-xmlserializer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-3.0.0.tgz",
-      "integrity": "sha512-3WFqGEgSXIyGhOmAFtlicJNMjEps8b1MG31NCA0/vOF9+nKMUW1ckhi9cnNHmf88Rzw5V+dwIwsm2C7X8k9aQg==",
-      "dev": true,
-      "dependencies": {
-        "xml-name-validator": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/watchpack": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
-      "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
-      "dependencies": {
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.1.2"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/wbuf": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
-      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
-      "dev": true,
-      "dependencies": {
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "node_modules/webidl-conversions": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
-      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/webpack": {
-      "version": "5.75.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz",
-      "integrity": "sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==",
-      "dependencies": {
-        "@types/eslint-scope": "^3.7.3",
-        "@types/estree": "^0.0.51",
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/wasm-edit": "1.11.1",
-        "@webassemblyjs/wasm-parser": "1.11.1",
-        "acorn": "^8.7.1",
-        "acorn-import-assertions": "^1.7.6",
-        "browserslist": "^4.14.5",
-        "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.10.0",
-        "es-module-lexer": "^0.9.0",
-        "eslint-scope": "5.1.1",
-        "events": "^3.2.0",
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.2.9",
-        "json-parse-even-better-errors": "^2.3.1",
-        "loader-runner": "^4.2.0",
-        "mime-types": "^2.1.27",
-        "neo-async": "^2.6.2",
-        "schema-utils": "^3.1.0",
-        "tapable": "^2.1.1",
-        "terser-webpack-plugin": "^5.1.3",
-        "watchpack": "^2.4.0",
-        "webpack-sources": "^3.2.3"
-      },
-      "bin": {
-        "webpack": "bin/webpack.js"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependenciesMeta": {
-        "webpack-cli": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/webpack-cli": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.0.1.tgz",
-      "integrity": "sha512-S3KVAyfwUqr0Mo/ur3NzIp6jnerNpo7GUO6so51mxLi1spqsA17YcMXy0WOIJtBSnj748lthxC6XLbNKh/ZC+A==",
-      "dev": true,
-      "dependencies": {
-        "@discoveryjs/json-ext": "^0.5.0",
-        "@webpack-cli/configtest": "^2.0.1",
-        "@webpack-cli/info": "^2.0.1",
-        "@webpack-cli/serve": "^2.0.1",
-        "colorette": "^2.0.14",
-        "commander": "^9.4.1",
-        "cross-spawn": "^7.0.3",
-        "envinfo": "^7.7.3",
-        "fastest-levenshtein": "^1.0.12",
-        "import-local": "^3.0.2",
-        "interpret": "^3.1.1",
-        "rechoir": "^0.8.0",
-        "webpack-merge": "^5.7.3"
-      },
-      "bin": {
-        "webpack-cli": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=14.15.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "5.x.x"
-      },
-      "peerDependenciesMeta": {
-        "@webpack-cli/generators": {
-          "optional": true
-        },
-        "webpack-bundle-analyzer": {
-          "optional": true
-        },
-        "webpack-dev-server": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/webpack-cli/node_modules/commander": {
-      "version": "9.4.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-9.4.1.tgz",
-      "integrity": "sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw==",
-      "dev": true,
-      "engines": {
-        "node": "^12.20.0 || >=14"
-      }
-    },
-    "node_modules/webpack-cli/node_modules/interpret": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz",
-      "integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/webpack-dev-middleware": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz",
-      "integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==",
-      "dev": true,
-      "dependencies": {
-        "colorette": "^2.0.10",
-        "memfs": "^3.4.3",
-        "mime-types": "^2.1.31",
-        "range-parser": "^1.2.1",
-        "schema-utils": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/webpack-dev-server": {
-      "version": "4.11.1",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.11.1.tgz",
-      "integrity": "sha512-lILVz9tAUy1zGFwieuaQtYiadImb5M3d+H+L1zDYalYoDl0cksAB1UNyuE5MMWJrG6zR1tXkCP2fitl7yoUJiw==",
-      "dev": true,
-      "dependencies": {
-        "@types/bonjour": "^3.5.9",
-        "@types/connect-history-api-fallback": "^1.3.5",
-        "@types/express": "^4.17.13",
-        "@types/serve-index": "^1.9.1",
-        "@types/serve-static": "^1.13.10",
-        "@types/sockjs": "^0.3.33",
-        "@types/ws": "^8.5.1",
-        "ansi-html-community": "^0.0.8",
-        "bonjour-service": "^1.0.11",
-        "chokidar": "^3.5.3",
-        "colorette": "^2.0.10",
-        "compression": "^1.7.4",
-        "connect-history-api-fallback": "^2.0.0",
-        "default-gateway": "^6.0.3",
-        "express": "^4.17.3",
-        "graceful-fs": "^4.2.6",
-        "html-entities": "^2.3.2",
-        "http-proxy-middleware": "^2.0.3",
-        "ipaddr.js": "^2.0.1",
-        "open": "^8.0.9",
-        "p-retry": "^4.5.0",
-        "rimraf": "^3.0.2",
-        "schema-utils": "^4.0.0",
-        "selfsigned": "^2.1.1",
-        "serve-index": "^1.9.1",
-        "sockjs": "^0.3.24",
-        "spdy": "^4.0.2",
-        "webpack-dev-middleware": "^5.3.1",
-        "ws": "^8.4.2"
-      },
-      "bin": {
-        "webpack-dev-server": "bin/webpack-dev-server.js"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.37.0 || ^5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "webpack-cli": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/webpack-font-preload-plugin": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/webpack-font-preload-plugin/-/webpack-font-preload-plugin-1.5.0.tgz",
-      "integrity": "sha512-/Nh6MNa7/rbu3ZcqSR1SxB+G5XaITu7U2yZO5INTsVRpVlMLQmHQZCoDt4PP+iFyBdvBCDbA0CImRXHarQ0wpQ==",
-      "dev": true,
-      "dependencies": {
-        "jsdom": "^19.0.0",
-        "webpack-sources": "^3.2.2"
-      },
-      "engines": {
-        "node": ">= 10.17.0"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/webpack-font-preload-plugin/node_modules/webpack-sources": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/webpack-license-plugin": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/webpack-license-plugin/-/webpack-license-plugin-4.2.2.tgz",
-      "integrity": "sha512-OfIdm659IKurEInKlBN6Sfzrh+MNKIWkChKKg+aDCoPf3Ok1OSXBDd2RKSbuUAtxjmdW2j6LUVZWnRYRnVdOxA==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^5.0.1",
-        "get-npm-tarball-url": "^2.0.1",
-        "lodash": "^4.17.20",
-        "needle": "^2.2.4",
-        "spdx-expression-validate": "^2.0.0",
-        "webpack-sources": "^3.2.1"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "webpack": ">=4.0.0 < 6.0.0"
-      }
-    },
-    "node_modules/webpack-license-plugin/node_modules/chalk": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.2.0.tgz",
-      "integrity": "sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.17.0 || ^14.13 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/webpack-license-plugin/node_modules/webpack-sources": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/webpack-merge": {
-      "version": "5.8.0",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz",
-      "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==",
-      "dev": true,
-      "dependencies": {
-        "clone-deep": "^4.0.1",
-        "wildcard": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/webpack-remove-empty-scripts": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/webpack-remove-empty-scripts/-/webpack-remove-empty-scripts-0.7.3.tgz",
-      "integrity": "sha512-yipqb25A0qtH7X9vKt6yihwyYkTtSlRiDdBb2QsyrkqGM3hpfAcfOO1lYDef9HQUNm3s8ojmorbNg32XXX6FYg==",
-      "dev": true,
-      "dependencies": {
-        "ansis": "^1.3.4"
-      },
-      "engines": {
-        "node": ">=12.14"
-      },
-      "funding": {
-        "type": "patreon",
-        "url": "https://patreon.com/biodiscus"
-      },
-      "peerDependencies": {
-        "webpack": ">=5.32.0"
-      }
-    },
-    "node_modules/webpack-sources": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
-      "dev": true,
-      "dependencies": {
-        "source-list-map": "^2.0.0",
-        "source-map": "~0.6.1"
-      }
-    },
-    "node_modules/webpack/node_modules/enhanced-resolve": {
-      "version": "5.12.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz",
-      "integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==",
-      "dependencies": {
-        "graceful-fs": "^4.2.4",
-        "tapable": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/webpack/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/webpack/node_modules/webpack-sources": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/websocket-driver": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
-      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
-      "dev": true,
-      "dependencies": {
-        "http-parser-js": ">=0.5.1",
-        "safe-buffer": ">=5.1.0",
-        "websocket-extensions": ">=0.1.1"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/websocket-extensions": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
-      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/whatwg-encoding": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
-      "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
-      "dev": true,
-      "dependencies": {
-        "iconv-lite": "0.6.3"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/whatwg-encoding/node_modules/iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "dev": true,
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/whatwg-mimetype": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
-      "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/whatwg-url": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-10.0.0.tgz",
-      "integrity": "sha512-CLxxCmdUby142H5FZzn4D8ikO1cmypvXVQktsgosNy4a4BHrDHeciBBGZhb0bNoR5/MltoCatso+vFjjGx8t0w==",
-      "dev": true,
-      "dependencies": {
-        "tr46": "^3.0.0",
-        "webidl-conversions": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-      "dev": true,
-      "dependencies": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/which-module": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==",
-      "dev": true
-    },
-    "node_modules/wide-align": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^1.0.2 || 2"
-      }
-    },
-    "node_modules/wide-align/node_modules/ansi-regex": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-      "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/wide-align/node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/wide-align/node_modules/string-width": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-      "dev": true,
-      "dependencies": {
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/wide-align/node_modules/strip-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-      "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/wildcard": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
-      "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==",
-      "dev": true
-    },
-    "node_modules/word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/wrap-ansi": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.0",
-        "string-width": "^3.0.0",
-        "strip-ansi": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/ansi-regex": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/emoji-regex": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-      "dev": true
-    },
-    "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
-    },
-    "node_modules/write-file-atomic": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
-      "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
-      "dev": true,
-      "dependencies": {
-        "imurmurhash": "^0.1.4",
-        "signal-exit": "^3.0.7"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
-      }
-    },
-    "node_modules/ws": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
-      "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/xml-name-validator": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
-      "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/xmlchars": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
-      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
-      "dev": true
-    },
-    "node_modules/xtend": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4"
-      }
-    },
-    "node_modules/y18n": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
-      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
-      "dev": true
-    },
-    "node_modules/yallist": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-      "dev": true
-    },
-    "node_modules/yaml": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/yargs": {
-      "version": "13.3.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
-      "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
-      "dev": true,
-      "dependencies": {
-        "cliui": "^5.0.0",
-        "find-up": "^3.0.0",
-        "get-caller-file": "^2.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^3.0.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^13.1.2"
-      }
-    },
-    "node_modules/yargs-parser": {
-      "version": "13.1.2",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      }
-    },
-    "node_modules/yargs-unparser": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz",
-      "integrity": "sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==",
-      "dev": true,
-      "dependencies": {
-        "flat": "^4.1.0",
-        "lodash": "^4.17.15",
-        "yargs": "^13.3.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yargs/node_modules/ansi-regex": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yargs/node_modules/emoji-regex": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-      "dev": true
-    },
-    "node_modules/yargs/node_modules/find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yargs/node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/yargs/node_modules/locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yargs/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/yargs/node_modules/p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yargs/node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/yargs/node_modules/string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yargs/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yn": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
-      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/zxcvbn": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/zxcvbn/-/zxcvbn-4.4.2.tgz",
-      "integrity": "sha512-Bq0B+ixT/DMyG8kgX2xWcI5jUvCwqrMxSFam7m0lAf78nf04hv6lNCsyLYdyYTrCVMqNDY/206K7eExYCeSyUQ=="
-    }
-  },
   "dependencies": {
     "@ampproject/remapping": {
       "version": "2.2.0",
@@ -14667,15 +400,13 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.2.tgz",
       "integrity": "sha512-c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "@csstools/selector-specificity": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz",
       "integrity": "sha512-IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "@discoveryjs/json-ext": {
       "version": "0.5.7",
@@ -15012,6 +743,7 @@
       "version": "8.4.10",
       "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.10.tgz",
       "integrity": "sha512-Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw==",
+      "dev": true,
       "requires": {
         "@types/estree": "*",
         "@types/json-schema": "*"
@@ -15021,6 +753,7 @@
       "version": "3.7.4",
       "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
       "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
+      "dev": true,
       "requires": {
         "@types/eslint": "*",
         "@types/estree": "*"
@@ -15029,7 +762,8 @@
     "@types/estree": {
       "version": "0.0.51",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
-      "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ=="
+      "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==",
+      "dev": true
     },
     "@types/express": {
       "version": "4.17.15",
@@ -15578,6 +1312,7 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
       "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
+      "dev": true,
       "requires": {
         "@webassemblyjs/helper-numbers": "1.11.1",
         "@webassemblyjs/helper-wasm-bytecode": "1.11.1"
@@ -15586,22 +1321,26 @@
     "@webassemblyjs/floating-point-hex-parser": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
-      "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ=="
+      "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==",
+      "dev": true
     },
     "@webassemblyjs/helper-api-error": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
-      "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg=="
+      "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==",
+      "dev": true
     },
     "@webassemblyjs/helper-buffer": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
-      "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA=="
+      "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==",
+      "dev": true
     },
     "@webassemblyjs/helper-numbers": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
       "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==",
+      "dev": true,
       "requires": {
         "@webassemblyjs/floating-point-hex-parser": "1.11.1",
         "@webassemblyjs/helper-api-error": "1.11.1",
@@ -15611,12 +1350,14 @@
     "@webassemblyjs/helper-wasm-bytecode": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
-      "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q=="
+      "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==",
+      "dev": true
     },
     "@webassemblyjs/helper-wasm-section": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
       "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==",
+      "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/helper-buffer": "1.11.1",
@@ -15628,6 +1369,7 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
       "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==",
+      "dev": true,
       "requires": {
         "@xtuc/ieee754": "^1.2.0"
       }
@@ -15636,6 +1378,7 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
       "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==",
+      "dev": true,
       "requires": {
         "@xtuc/long": "4.2.2"
       }
@@ -15643,12 +1386,14 @@
     "@webassemblyjs/utf8": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
-      "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ=="
+      "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==",
+      "dev": true
     },
     "@webassemblyjs/wasm-edit": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
       "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==",
+      "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/helper-buffer": "1.11.1",
@@ -15664,6 +1409,7 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
       "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==",
+      "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
@@ -15676,6 +1422,7 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
       "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==",
+      "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/helper-buffer": "1.11.1",
@@ -15687,6 +1434,7 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
       "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==",
+      "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/helper-api-error": "1.11.1",
@@ -15700,6 +1448,7 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
       "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==",
+      "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
         "@xtuc/long": "4.2.2"
@@ -15709,32 +1458,31 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.0.1.tgz",
       "integrity": "sha512-njsdJXJSiS2iNbQVS0eT8A/KPnmyH4pv1APj2K0d1wrZcBLw+yppxOy4CGqa0OxDJkzfL/XELDhD8rocnIwB5A==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "@webpack-cli/info": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-2.0.1.tgz",
       "integrity": "sha512-fE1UEWTwsAxRhrJNikE7v4EotYflkEhBL7EbajfkPlf6E37/2QshOy/D48Mw8G5XMFlQtS6YV42vtbG9zBpIQA==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "@webpack-cli/serve": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-2.0.1.tgz",
       "integrity": "sha512-0G7tNyS+yW8TdgHwZKlDWYXFA6OJQnoLCQvYKkQP0Q2X205PSQ6RNUj0M+1OB/9gRQaUZ/ccYfaxd0nhaWKfjw==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "@xtuc/ieee754": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+      "dev": true
     },
     "@xtuc/long": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+      "dev": true
     },
     "abab": {
       "version": "2.0.6",
@@ -15785,14 +1533,13 @@
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
       "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
-      "requires": {}
+      "dev": true
     },
     "acorn-jsx": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "acorn-walk": {
       "version": "8.2.0",
@@ -15852,8 +1599,7 @@
     "ajv-keywords": {
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "requires": {}
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="
     },
     "ansi-colors": {
       "version": "3.2.3",
@@ -16168,8 +1914,7 @@
     "bootstrap": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.4.1.tgz",
-      "integrity": "sha512-tbx5cHubwE6e2ZG7nqM3g/FZ5PQEDMWmMGNrCUBVRPHXTJaH7CBDdsLeu3eCh3B1tzAxTnAbtmrzvWEvT2NNEA==",
-      "requires": {}
+      "integrity": "sha512-tbx5cHubwE6e2ZG7nqM3g/FZ5PQEDMWmMGNrCUBVRPHXTJaH7CBDdsLeu3eCh3B1tzAxTnAbtmrzvWEvT2NNEA=="
     },
     "bootstrap-colorpicker": {
       "version": "3.4.0",
@@ -16328,6 +2073,7 @@
       "version": "4.21.4",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
       "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
+      "dev": true,
       "requires": {
         "caniuse-lite": "^1.0.30001400",
         "electron-to-chromium": "^1.4.251",
@@ -16440,7 +2186,8 @@
     "caniuse-lite": {
       "version": "1.0.30001441",
       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001441.tgz",
-      "integrity": "sha512-OyxRR4Vof59I3yGWXws6i908EtGbMzVUi3ganaZQHmydk1iwDhRnvaPG2WaR0KcqrDFKrxVZHULT396LEPhXfg=="
+      "integrity": "sha512-OyxRR4Vof59I3yGWXws6i908EtGbMzVUi3ganaZQHmydk1iwDhRnvaPG2WaR0KcqrDFKrxVZHULT396LEPhXfg==",
+      "dev": true
     },
     "chai": {
       "version": "4.3.7",
@@ -16504,7 +2251,8 @@
     "chrome-trace-event": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
-      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg=="
+      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
+      "dev": true
     },
     "cipher-base": {
       "version": "1.0.4",
@@ -16978,8 +2726,7 @@
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz",
       "integrity": "sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "css-rule-stream": {
       "version": "1.1.0",
@@ -17658,7 +3405,8 @@
     "electron-to-chromium": {
       "version": "1.4.284",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz",
-      "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA=="
+      "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==",
+      "dev": true
     },
     "elliptic": {
       "version": "6.5.4",
@@ -17809,7 +3557,8 @@
     "es-module-lexer": {
       "version": "0.9.3",
       "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
-      "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ=="
+      "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
+      "dev": true
     },
     "es-shim-unscopables": {
       "version": "1.0.0",
@@ -18030,7 +3779,8 @@
     "escalade": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true
     },
     "escape-html": {
       "version": "1.0.3",
@@ -18440,6 +4190,7 @@
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
       "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
       "requires": {
         "esrecurse": "^4.3.0",
         "estraverse": "^4.1.1"
@@ -18506,6 +4257,7 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
       "requires": {
         "estraverse": "^5.2.0"
       },
@@ -18513,14 +4265,16 @@
         "estraverse": {
           "version": "5.3.0",
           "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
+          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+          "dev": true
         }
       }
     },
     "estraverse": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true
     },
     "estree-walker": {
       "version": "2.0.2",
@@ -18589,8 +4343,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/expose-loader/-/expose-loader-4.0.0.tgz",
       "integrity": "sha512-kUEvHyf6MPR2ubZCL9aziP9Br5wxMvq1cghTpYhM6MW52NPq+7hXixw2EqQuI1SvGb1fDjc2ehJOg6645wR6ww==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "express": {
       "version": "4.18.2",
@@ -19142,7 +4895,8 @@
     "glob-to-regexp": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
+      "dev": true
     },
     "global-modules": {
       "version": "2.0.0",
@@ -19237,7 +4991,8 @@
     "graceful-fs": {
       "version": "4.2.10",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
+      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
+      "dev": true
     },
     "grapheme-splitter": {
       "version": "1.0.4",
@@ -19597,8 +5352,7 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
       "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "ieee754": {
       "version": "1.2.1",
@@ -20081,7 +5835,8 @@
     "json-parse-even-better-errors": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true
     },
     "json-schema-traverse": {
       "version": "0.4.1",
@@ -20206,7 +5961,8 @@
     "loader-runner": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
-      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg=="
+      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
+      "dev": true
     },
     "loader-utils": {
       "version": "2.0.4",
@@ -20453,12 +6209,14 @@
     "mime-db": {
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "dev": true
     },
     "mime-types": {
       "version": "2.1.35",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "dev": true,
       "requires": {
         "mime-db": "1.52.0"
       }
@@ -20824,7 +6582,8 @@
     "neo-async": {
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+      "dev": true
     },
     "no-case": {
       "version": "3.0.4",
@@ -20908,7 +6667,8 @@
     "node-releases": {
       "version": "2.0.8",
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.8.tgz",
-      "integrity": "sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A=="
+      "integrity": "sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A==",
+      "dev": true
     },
     "normalize-package-data": {
       "version": "3.0.3",
@@ -21565,15 +7325,13 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz",
       "integrity": "sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "postcss-gap-properties": {
       "version": "3.0.5",
       "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.5.tgz",
       "integrity": "sha512-IuE6gKSdoUNcvkGIqdtjtcMtZIFyXZhmFd5RUlg97iVEvp1BZKV5ngsAjCjrVy+14uhGBQl9tzmi1Qwq4kqVOg==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "postcss-image-set-function": {
       "version": "4.0.7",
@@ -21588,8 +7346,7 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-4.0.1.tgz",
       "integrity": "sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "postcss-lab-function": {
       "version": "4.2.1",
@@ -21642,15 +7399,13 @@
       "version": "5.0.4",
       "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-5.0.4.tgz",
       "integrity": "sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "postcss-media-minmax": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz",
       "integrity": "sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "postcss-media-query-parser": {
       "version": "0.2.3",
@@ -21662,8 +7417,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
       "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "postcss-modules-local-by-default": {
       "version": "4.0.0",
@@ -21708,8 +7462,7 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/postcss-opacity-percentage/-/postcss-opacity-percentage-1.1.3.tgz",
       "integrity": "sha512-An6Ba4pHBiDtyVpSLymUUERMo2cU7s+Obz6BTrS+gxkbnSBNKSuD0AVUc+CpBMrpVPKKfoVz0WQCX+Tnst0i4A==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "postcss-overflow-shorthand": {
       "version": "3.0.4",
@@ -21724,8 +7477,7 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-3.0.4.tgz",
       "integrity": "sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "postcss-place": {
       "version": "7.0.5",
@@ -21806,8 +7558,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz",
       "integrity": "sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "postcss-resolve-nested-selector": {
       "version": "0.1.1",
@@ -21819,15 +7570,13 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz",
       "integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "postcss-scss": {
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.6.tgz",
       "integrity": "sha512-rLDPhJY4z/i4nVFZ27j9GqLxj1pwxE80eAzUNRMXtcpipFYIeowerzBgG3yJhMtObGEXidtIgbUpQ3eLDsf5OQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "postcss-selector-not": {
       "version": "6.0.1",
@@ -21852,8 +7601,7 @@
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-7.0.1.tgz",
       "integrity": "sha512-iLBFYz6VRYyLJEJsBJ8M3TCqNcckVzz4wFounSc5Oez35ogE/X+aoC5fFu103Ot7NyvjU3/xqIXn93Gp3kJk4g==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "postcss-value-parser": {
       "version": "4.2.0",
@@ -23041,15 +8789,6 @@
         "xtend": "^4.0.0"
       }
     },
-    "string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
     "string-width": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -23083,6 +8822,15 @@
         "es-abstract": "^1.20.4"
       }
     },
+    "string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
     "strip-ansi": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
@@ -23129,8 +8877,7 @@
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.1.tgz",
       "integrity": "sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "style-search": {
       "version": "0.1.0",
@@ -23221,8 +8968,7 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-7.0.0.tgz",
       "integrity": "sha512-yGn84Bf/q41J4luis1AZ95gj0EQwRX8lWmGmBwkwBNSkpGSpl66XcPTulxGa/Z91aPoNGuIGBmFkcM1MejMo9Q==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "stylelint-config-recommended-scss": {
       "version": "5.0.2",
@@ -23239,8 +8985,7 @@
           "version": "6.0.0",
           "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-6.0.0.tgz",
           "integrity": "sha512-ZorSSdyMcxWpROYUvLEMm0vSZud2uB7tX1hzBZwvVY9SV/uly4AvvJPPhCcymZL3fcQhEQG5AELmrxWqtmzacw==",
-          "dev": true,
-          "requires": {}
+          "dev": true
         }
       }
     },
@@ -23267,8 +9012,7 @@
           "version": "6.0.0",
           "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-6.0.0.tgz",
           "integrity": "sha512-ZorSSdyMcxWpROYUvLEMm0vSZud2uB7tX1hzBZwvVY9SV/uly4AvvJPPhCcymZL3fcQhEQG5AELmrxWqtmzacw==",
-          "dev": true,
-          "requires": {}
+          "dev": true
         },
         "stylelint-config-standard": {
           "version": "24.0.0",
@@ -23422,7 +9166,8 @@
     "tapable": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="
+      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+      "dev": true
     },
     "terser": {
       "version": "5.16.1",
@@ -23828,6 +9573,7 @@
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
       "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
+      "dev": true,
       "requires": {
         "escalade": "^3.1.1",
         "picocolors": "^1.0.0"
@@ -24186,6 +9932,7 @@
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
       "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
+      "dev": true,
       "requires": {
         "glob-to-regexp": "^0.4.1",
         "graceful-fs": "^4.1.2"
@@ -24210,6 +9957,7 @@
       "version": "5.75.0",
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz",
       "integrity": "sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==",
+      "dev": true,
       "requires": {
         "@types/eslint-scope": "^3.7.3",
         "@types/estree": "^0.0.51",
@@ -24241,6 +9989,7 @@
           "version": "5.12.0",
           "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz",
           "integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==",
+          "dev": true,
           "requires": {
             "graceful-fs": "^4.2.4",
             "tapable": "^2.2.0"
@@ -24250,6 +9999,7 @@
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
           "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+          "dev": true,
           "requires": {
             "@types/json-schema": "^7.0.8",
             "ajv": "^6.12.5",
@@ -24259,7 +10009,8 @@
         "webpack-sources": {
           "version": "3.2.3",
           "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-          "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w=="
+          "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+          "dev": true
         }
       }
     },
@@ -24639,8 +10390,7 @@
       "version": "8.11.0",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
       "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "xml-name-validator": {
       "version": "4.0.0",
diff --git a/src/Adapter/AttributeGroup/CommandHandler/AddAttributeGroupHandler.php b/src/Adapter/AttributeGroup/CommandHandler/AddAttributeGroupHandler.php
new file mode 100644
index 0000000000000..9887f8c09ebbf
--- /dev/null
+++ b/src/Adapter/AttributeGroup/CommandHandler/AddAttributeGroupHandler.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Adapter\AttributeGroup\CommandHandler;
+
+use PrestaShop\PrestaShop\Adapter\Domain\AbstractObjectModelHandler;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\AddAttributeGroupCommand;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\CommandHandler\AddAttributeGroupHandlerInterface;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupConstraintException;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\CannotAddAttributeGroupException;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupId;
+
+/**
+ * Handles adding of attribute groups using legacy logic.
+ */
+final class AddAttributeGroupHandler extends AbstractObjectModelHandler implements AddAttributeGroupHandlerInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function handle(AddAttributeGroupCommand $command): AttributeGroupId
+    {
+        $attributeGroup = new \AttributeGroup();
+
+        $attributeGroup->name = $command->getLocalizedNames();
+        $attributeGroup->public_name = $command->getLocalizedPublicNames();
+        $attributeGroup->group_type = $command->getType();
+
+        if (false === $attributeGroup->validateFields(false)) {
+            throw new AttributeGroupConstraintException('Invalid attribute data');
+        }
+
+        if (false === $attributeGroup->validateFieldsLang(false)) {
+            throw new AttributeGroupConstraintException('Invalid attribute group data', AttributeGroupConstraintException::INVALID_NAME);
+        }
+
+        if (false === $attributeGroup->add()) {
+            throw new CannotAddAttributeGroupException('Unable to create new attribute group');
+        }
+
+        $this->associateWithShops($attributeGroup, $command->getShopAssociation());
+
+        return new AttributeGroupId((int) $attributeGroup->id);
+    }
+}
diff --git a/src/Adapter/AttributeGroup/CommandHandler/EditAttributeGroupHandler.php b/src/Adapter/AttributeGroup/CommandHandler/EditAttributeGroupHandler.php
new file mode 100644
index 0000000000000..a41875a666e25
--- /dev/null
+++ b/src/Adapter/AttributeGroup/CommandHandler/EditAttributeGroupHandler.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Adapter\AttributeGroup\CommandHandler;
+
+use PrestaShop\PrestaShop\Adapter\Domain\AbstractObjectModelHandler;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\EditAttributeGroupCommand;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\CommandHandler\EditAttributeGroupHandlerInterface;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupConstraintException;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\CannotUpdateAttributeGroupException;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupId;
+
+/**
+ * Handles editing of attribute groups using legacy logic.
+ */
+final class EditAttributeGroupHandler extends AbstractObjectModelHandler implements EditAttributeGroupHandlerInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function handle(EditAttributeGroupCommand $command): AttributeGroupId
+    {
+        $attributeGroup = new \AttributeGroup($command->getAttributeGroupId()->getValue());
+
+        $attributeGroup->name = $command->getLocalizedNames();
+        $attributeGroup->public_name = $command->getLocalizedPublicNames();
+        $attributeGroup->group_type = $command->getType();
+
+        if (false === $attributeGroup->validateFields(false)) {
+            throw new AttributeGroupConstraintException('Invalid attribute data');
+        }
+
+        if (false === $attributeGroup->validateFieldsLang(false)) {
+            throw new AttributeGroupConstraintException('Invalid attribute group data', AttributeGroupConstraintException::INVALID_NAME);
+        }
+
+        if (false === $attributeGroup->update()) {
+            throw new CannotUpdateAttributeGroupException('Unable to update attribute group');
+        }
+
+        $this->associateWithShops($attributeGroup, $command->getShopAssociation());
+
+        return new AttributeGroupId((int) $attributeGroup->id);
+    }
+}
diff --git a/src/Adapter/AttributeGroup/QueryHandler/GetAttributeGroupForEditingHandler.php b/src/Adapter/AttributeGroup/QueryHandler/GetAttributeGroupForEditingHandler.php
new file mode 100644
index 0000000000000..d5e6f91c53afa
--- /dev/null
+++ b/src/Adapter/AttributeGroup/QueryHandler/GetAttributeGroupForEditingHandler.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Adapter\AttributeGroup\QueryHandler;
+
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupException;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Query\GetAttributeGroupForEditing;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\QueryHandler\GetAttributeGroupForEditingHandlerInterface;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\QueryResult\EditableAttributeGroup;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupId;
+use PrestaShop\PrestaShop\Core\Domain\Product\AttributeGroup\Exception\AttributeGroupNotFoundException;
+use PrestaShopException;
+
+/**
+ * Handles query which gets attribute group for editing
+ */
+final class GetAttributeGroupForEditingHandler implements GetAttributeGroupForEditingHandlerInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function handle(GetAttributeGroupForEditing $query): EditableAttributeGroup
+    {
+        $attributeGroupId = $query->getAttributeGroupId();
+        $attributeGroup = $this->getAttributeGroup($attributeGroupId);
+
+        return new EditableAttributeGroup(
+            $attributeGroupId,
+            $attributeGroup->name,
+            $attributeGroup->public_name,
+            $attributeGroup->group_type,
+            $attributeGroup->getAssociatedShops()
+        );
+    }
+
+    /**
+     * Gets legacy Attribute group
+     *
+     * @param AttributeGroupId $attributeGroupId
+     *
+     * @return \AttributeGroup
+     *
+     * @throws AttributeGroupException
+     * @throws AttributeGroupNotFoundException
+     */
+    protected function getAttributeGroup(AttributeGroupId $attributeGroupId): \AttributeGroup
+    {
+        try {
+            $attributeGroup = new \AttributeGroup($attributeGroupId->getValue());
+        } catch (PrestaShopException $e) {
+            throw new AttributeGroupException('Failed to create new attribute group', 0, $e);
+        }
+
+        if ($attributeGroup->id !== $attributeGroupId->getValue()) {
+            throw new AttributeGroupNotFoundException(sprintf('Attribute group with id "%s" was not found.', $attributeGroupId->getValue()));
+        }
+
+        return $attributeGroup;
+    }
+}
diff --git a/src/Core/Domain/AttributeGroup/Command/AddAttributeGroupCommand.php b/src/Core/Domain/AttributeGroup/Command/AddAttributeGroupCommand.php
new file mode 100644
index 0000000000000..169453a8b3036
--- /dev/null
+++ b/src/Core/Domain/AttributeGroup/Command/AddAttributeGroupCommand.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command;
+
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupConstraintException;
+
+/**
+ * Adds new attribute group
+ */
+class AddAttributeGroupCommand
+{
+    /**
+     * @var string[]
+     */
+    private $localizedNames;
+
+    /**
+     * @var int[]
+     */
+    private $shopAssociation;
+
+    /**
+     * @var array
+     */
+    private $localizedPublicNames;
+
+    /**
+     * @var string
+     */
+    private $type;
+
+    /**
+     * @param string[] $localizedNames
+     * @param int[] $shopAssociation
+     *
+     * @throws AttributeGroupConstraintException
+     */
+    public function __construct(array $localizedNames, array $localizedPublicNames, string $type, array $shopAssociation = [])
+    {
+        $this->assertNamesAreValid($localizedNames);
+        $this->assertNamesAreValid($localizedPublicNames);
+
+        $this->localizedNames = $localizedNames;
+        $this->localizedPublicNames = $localizedPublicNames;
+        $this->type = $type;
+        $this->shopAssociation = $shopAssociation;
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getLocalizedNames(): array
+    {
+        return $this->localizedNames;
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getLocalizedPublicNames(): array
+    {
+        return $this->localizedPublicNames;
+    }
+
+    /**
+     * @return string
+     */
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    /**
+     * @return int[]
+     */
+    public function getShopAssociation(): array
+    {
+        return $this->shopAssociation;
+    }
+
+    /**
+     * Asserts that attribute group's names are valid.
+     *
+     * @param string[] $names
+     *
+     * @throws AttributeGroupConstraintException
+     */
+    private function assertNamesAreValid(array $names): void
+    {
+        if (empty($names)) {
+            throw new AttributeGroupConstraintException('Attribute name cannot be empty', AttributeGroupConstraintException::EMPTY_NAME);
+        }
+    }
+}
diff --git a/src/Core/Domain/AttributeGroup/Command/EditAttributeGroupCommand.php b/src/Core/Domain/AttributeGroup/Command/EditAttributeGroupCommand.php
new file mode 100644
index 0000000000000..a57cb9d401a26
--- /dev/null
+++ b/src/Core/Domain/AttributeGroup/Command/EditAttributeGroupCommand.php
@@ -0,0 +1,135 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command;
+
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupConstraintException;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupId;
+
+/**
+ * Edits existing attribute group
+ */
+class EditAttributeGroupCommand
+{
+    /**
+     * @var AttributeGroupId
+     */
+    private $attributeGroupId;
+
+    /**
+     * @var string[]
+     */
+    private $localizedNames;
+
+    /**
+     * @var int[]
+     */
+    private $shopAssociation;
+
+    /**
+     * @var array
+     */
+    private $localizedPublicNames;
+
+    /**
+     * @var string
+     */
+    private $type;
+
+    /**
+     * @param string[] $localizedNames
+     * @param int[] $shopAssociation
+     *
+     * @throws AttributeGroupConstraintException
+     */
+    public function __construct(int $attributeGroupId, array $localizedNames, array $localizedPublicNames, string $type, array $shopAssociation = [])
+    {
+        $this->attributeGroupId = new AttributeGroupId($attributeGroupId);
+        $this->assertNamesAreValid($localizedNames);
+        $this->assertNamesAreValid($localizedPublicNames);
+
+        $this->localizedNames = $localizedNames;
+        $this->localizedPublicNames = $localizedPublicNames;
+        $this->type = $type;
+        $this->shopAssociation = $shopAssociation;
+    }
+
+    /**
+     * @return AttributeGroupId
+     */
+    public function getAttributeGroupId(): AttributeGroupId
+    {
+        return $this->attributeGroupId;
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getLocalizedNames(): array
+    {
+        return $this->localizedNames;
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getLocalizedPublicNames(): array
+    {
+        return $this->localizedPublicNames;
+    }
+
+    /**
+     * @return string
+     */
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    /**
+     * @return int[]
+     */
+    public function getShopAssociation(): array
+    {
+        return $this->shopAssociation;
+    }
+
+    /**
+     * Asserts that attribute group's names are valid.
+     *
+     * @param string[] $names
+     *
+     * @throws AttributeGroupConstraintException
+     */
+    private function assertNamesAreValid(array $names): void
+    {
+        if (empty($names)) {
+            throw new AttributeGroupConstraintException('Attribute name cannot be empty', AttributeGroupConstraintException::EMPTY_NAME);
+        }
+    }
+}
diff --git a/src/Core/Domain/AttributeGroup/CommandHandler/AddAttributeGroupHandlerInterface.php b/src/Core/Domain/AttributeGroup/CommandHandler/AddAttributeGroupHandlerInterface.php
new file mode 100644
index 0000000000000..c453eb415c852
--- /dev/null
+++ b/src/Core/Domain/AttributeGroup/CommandHandler/AddAttributeGroupHandlerInterface.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Domain\AttributeGroup\CommandHandler;
+
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\AddAttributeGroupCommand;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupId;
+
+/**
+ * Describes add attribute group command handler
+ */
+interface AddAttributeGroupHandlerInterface
+{
+    /**
+     * @param AddAttributeGroupCommand $command
+     *
+     * @return void id of the created attribute group
+     */
+    public function handle(AddAttributeGroupCommand $command): AttributeGroupId;
+}
diff --git a/src/Core/Domain/AttributeGroup/CommandHandler/EditAttributeGroupHandlerInterface.php b/src/Core/Domain/AttributeGroup/CommandHandler/EditAttributeGroupHandlerInterface.php
new file mode 100644
index 0000000000000..e4f15ba4a55f9
--- /dev/null
+++ b/src/Core/Domain/AttributeGroup/CommandHandler/EditAttributeGroupHandlerInterface.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Domain\AttributeGroup\CommandHandler;
+
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\EditAttributeGroupCommand;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupId;
+
+/**
+ * Describes a service that handles attribute group edit command.
+ */
+interface EditAttributeGroupHandlerInterface
+{
+    /**
+     * @param EditAttributeGroupCommand $command
+     */
+    public function handle(EditAttributeGroupCommand $command): AttributeGroupId;
+}
diff --git a/src/Core/Domain/AttributeGroup/Exception/AttributeGroupConstraintException.php b/src/Core/Domain/AttributeGroup/Exception/AttributeGroupConstraintException.php
index c8bd80e8e3839..1d4e0d1b2104c 100644
--- a/src/Core/Domain/AttributeGroup/Exception/AttributeGroupConstraintException.php
+++ b/src/Core/Domain/AttributeGroup/Exception/AttributeGroupConstraintException.php
@@ -24,6 +24,8 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
+declare(strict_types=1);
+
 namespace PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception;
 
 /**
@@ -35,4 +37,14 @@ class AttributeGroupConstraintException extends AttributeGroupException
      * When attribute group Id contains invalid values
      */
     public const INVALID_ID = 10;
+
+    /**
+     * Code is used when feature does not have name.
+     */
+    public const EMPTY_NAME = 1;
+
+    /**
+     * Used when feature name is invalid.
+     */
+    public const INVALID_NAME = 2;
 }
diff --git a/src/Core/Domain/AttributeGroup/Exception/AttributeGroupException.php b/src/Core/Domain/AttributeGroup/Exception/AttributeGroupException.php
index 635752c67ad82..210b6926334f5 100644
--- a/src/Core/Domain/AttributeGroup/Exception/AttributeGroupException.php
+++ b/src/Core/Domain/AttributeGroup/Exception/AttributeGroupException.php
@@ -24,12 +24,14 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
+declare(strict_types=1);
+
 namespace PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception;
 
 use PrestaShop\PrestaShop\Core\Domain\Exception\DomainException;
 
 /**
- * Base exception for attribute group subdomain
+ * Thrown in Attribute Group context.
  */
 class AttributeGroupException extends DomainException
 {
diff --git a/src/Core/Domain/AttributeGroup/Exception/CannotAddAttributeGroupException.php b/src/Core/Domain/AttributeGroup/Exception/CannotAddAttributeGroupException.php
new file mode 100644
index 0000000000000..fe06806dfb30d
--- /dev/null
+++ b/src/Core/Domain/AttributeGroup/Exception/CannotAddAttributeGroupException.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception;
+
+class CannotAddAttributeGroupException extends AttributeGroupException
+{
+}
diff --git a/src/Core/Domain/AttributeGroup/Exception/CannotUpdateAttributeGroupException.php b/src/Core/Domain/AttributeGroup/Exception/CannotUpdateAttributeGroupException.php
new file mode 100644
index 0000000000000..d47071a8c20f1
--- /dev/null
+++ b/src/Core/Domain/AttributeGroup/Exception/CannotUpdateAttributeGroupException.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception;
+
+class CannotUpdateAttributeGroupException extends AttributeGroupException
+{
+}
diff --git a/src/Core/Domain/AttributeGroup/Exception/InvalidAttributeGroupIdException.php b/src/Core/Domain/AttributeGroup/Exception/InvalidAttributeGroupIdException.php
new file mode 100644
index 0000000000000..02080ea80a22d
--- /dev/null
+++ b/src/Core/Domain/AttributeGroup/Exception/InvalidAttributeGroupIdException.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception;
+
+class InvalidAttributeGroupIdException extends AttributeGroupException
+{
+}
diff --git a/src/Core/Domain/AttributeGroup/Query/GetAttributeGroupForEditing.php b/src/Core/Domain/AttributeGroup/Query/GetAttributeGroupForEditing.php
new file mode 100644
index 0000000000000..82b67e4c95c10
--- /dev/null
+++ b/src/Core/Domain/AttributeGroup/Query/GetAttributeGroupForEditing.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Query;
+
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupId;
+
+/**
+ * Retrieves attribute group data for editing
+ */
+class GetAttributeGroupForEditing
+{
+    /**
+     * @var AttributeGroupId
+     */
+    private $attributeGroupId;
+
+    /**
+     * @param int $attributeGroupId
+     */
+    public function __construct(int $attributeGroupId)
+    {
+        $this->attributeGroupId = new AttributeGroupId($attributeGroupId);
+    }
+
+    /**
+     * @return AttributeGroupId
+     */
+    public function getAttributeGroupId(): AttributeGroupId
+    {
+        return $this->attributeGroupId;
+    }
+}
diff --git a/src/Core/Domain/AttributeGroup/QueryHandler/GetAttributeGroupForEditingHandlerInterface.php b/src/Core/Domain/AttributeGroup/QueryHandler/GetAttributeGroupForEditingHandlerInterface.php
new file mode 100644
index 0000000000000..eec79ac62ff34
--- /dev/null
+++ b/src/Core/Domain/AttributeGroup/QueryHandler/GetAttributeGroupForEditingHandlerInterface.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Domain\AttributeGroup\QueryHandler;
+
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Query\GetAttributeGroupForEditing;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\QueryResult\EditableAttributeGroup;
+
+/**
+ * Describes attribute group for editing handler.
+ */
+interface GetAttributeGroupForEditingHandlerInterface
+{
+    /**
+     * @param GetAttributeGroupForEditing $query
+     *
+     * @return EditableAttributeGroup
+     */
+    public function handle(GetAttributeGroupForEditing $query): EditableAttributeGroup;
+}
diff --git a/src/Core/Domain/AttributeGroup/QueryResult/EditableAttributeGroup.php b/src/Core/Domain/AttributeGroup/QueryResult/EditableAttributeGroup.php
new file mode 100644
index 0000000000000..829b13d734e94
--- /dev/null
+++ b/src/Core/Domain/AttributeGroup/QueryResult/EditableAttributeGroup.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\AttributeGroup\QueryResult;
+
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupId;
+
+/**
+ * Stores attribute groups data that's needed for editing.
+ */
+class EditableAttributeGroup
+{
+    /**
+     * @var AttributeGroupId
+     */
+    private $attributeGroupId;
+
+    /**
+     * @var string[]
+     */
+    private $name;
+
+    /**
+     * @var int[]
+     */
+    private $shopAssociationIds;
+
+    /**
+     * @var array
+     */
+    private $publicName;
+
+    /**
+     * @var string
+     */
+    private $type;
+
+    /**
+     * @param AttributeGroupId $attributeGroupId
+     * @param string[] $name
+     * @param array $publicName
+     * @param string $type
+     * @param int[] $shopAssociationIds
+     */
+    public function __construct(
+        AttributeGroupId $attributeGroupId,
+        array $name,
+        array $publicName,
+        string $type,
+        array $shopAssociationIds
+    ) {
+        $this->attributeGroupId = $attributeGroupId;
+        $this->name = $name;
+        $this->shopAssociationIds = $shopAssociationIds;
+        $this->publicName = $publicName;
+        $this->type = $type;
+    }
+
+    /**
+     * @return AttributeGroupId
+     */
+    public function getAttributeGroupId(): AttributeGroupId
+    {
+        return $this->attributeGroupId;
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getName(): array
+    {
+        return $this->name;
+    }
+
+    /**
+     * @return int[]
+     */
+    public function getShopAssociationIds(): array
+    {
+        return $this->shopAssociationIds;
+    }
+
+    /**
+     * @return array
+     */
+    public function getPublicName(): array
+    {
+        return $this->publicName;
+    }
+
+    /**
+     * @return string
+     */
+    public function getType(): string
+    {
+        return $this->type;
+    }
+}
diff --git a/src/Core/Domain/AttributeGroup/ValueObject/AttributeGroupId.php b/src/Core/Domain/AttributeGroup/ValueObject/AttributeGroupId.php
index 797176b3aff63..f4a6a0b8d7210 100644
--- a/src/Core/Domain/AttributeGroup/ValueObject/AttributeGroupId.php
+++ b/src/Core/Domain/AttributeGroup/ValueObject/AttributeGroupId.php
@@ -24,14 +24,16 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
+declare(strict_types=1);
+
 namespace PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject;
 
-use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupConstraintException;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\InvalidAttributeGroupIdException;
 
 /**
- * Provides attribute group identification data
+ * Defines Attribute group ID with its constraints.
  */
-final class AttributeGroupId
+class AttributeGroupId
 {
     /**
      * @var int
@@ -40,45 +42,31 @@ final class AttributeGroupId
 
     /**
      * @param int $attributeGroupId
-     *
-     * @throws AttributeGroupConstraintException
      */
-    public function __construct($attributeGroupId)
+    public function __construct(int $attributeGroupId)
     {
-        $this->assertIsIntegerGreaterThanZero($attributeGroupId);
-        $this->attributeGroupId = $attributeGroupId;
-    }
+        $this->assertIntegerIsGreaterThanZero($attributeGroupId);
 
-    /**
-     * @deprecated
-     * @see getValue()
-     *
-     * @return int
-     */
-    public function getAttributeGroupId()
-    {
-        return $this->attributeGroupId;
+        $this->attributeGroupId = $attributeGroupId;
     }
 
     /**
      * @return int
      */
-    public function getValue()
+    public function getValue(): int
     {
         return $this->attributeGroupId;
     }
 
     /**
-     * Validates that the value is integer and is greater than zero
-     *
-     * @param int $value
+     * @param int $attributeGroupId
      *
-     * @throws AttributeGroupConstraintException
+     * @throws InvalidAttributeGroupIdException
      */
-    private function assertIsIntegerGreaterThanZero($value)
+    private function assertIntegerIsGreaterThanZero(int $attributeGroupId): void
     {
-        if (!is_int($value) || 0 >= $value) {
-            throw new AttributeGroupConstraintException(sprintf('Invalid attribute group id "%s".', var_export($value, true)), AttributeGroupConstraintException::INVALID_ID);
+        if (0 > $attributeGroupId) {
+            throw new InvalidAttributeGroupIdException(sprintf('Invalid attributeGroup id %s supplied. Attribute group id must be positive integer.', $attributeGroupId));
         }
     }
 }
diff --git a/src/Core/Form/IdentifiableObject/DataHandler/AttributeGroupFormDataHandler.php b/src/Core/Form/IdentifiableObject/DataHandler/AttributeGroupFormDataHandler.php
new file mode 100644
index 0000000000000..f69eea1cae143
--- /dev/null
+++ b/src/Core/Form/IdentifiableObject/DataHandler/AttributeGroupFormDataHandler.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataHandler;
+
+use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\AddAttributeGroupCommand;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\EditAttributeGroupCommand;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupId;
+
+/**
+ * Handles data of submitted Attribute Group form.
+ */
+final class AttributeGroupFormDataHandler implements FormDataHandlerInterface
+{
+    /**
+     * @var CommandBusInterface
+     */
+    private $commandBus;
+
+    /**
+     * @param CommandBusInterface $commandBus
+     */
+    public function __construct(CommandBusInterface $commandBus)
+    {
+        $this->commandBus = $commandBus;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function create(array $data)
+    {
+        /** @var AttributeGroupId $attributeGroupId */
+        $attributeGroupId = $this->commandBus->handle(new AddAttributeGroupCommand(
+            $data['name'],
+            $data['public_name'],
+            $data['group_type'],
+            $data['shop_association'] ?? []
+        ));
+
+        return $attributeGroupId->getValue();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function update($id, array $data)
+    {
+        /** @var AttributeGroupId $attributeGroupId */
+        $attributeGroupId = $this->commandBus->handle(new EditAttributeGroupCommand(
+            (int) $id,
+            $data['name'],
+            $data['public_name'],
+            $data['group_type'],
+            $data['shop_association'] ?? []
+        ));
+
+        return $attributeGroupId->getValue();
+    }
+}
diff --git a/src/Core/Form/IdentifiableObject/DataProvider/AttributeGroupFormDataProvider.php b/src/Core/Form/IdentifiableObject/DataProvider/AttributeGroupFormDataProvider.php
new file mode 100644
index 0000000000000..2d78d4007554e
--- /dev/null
+++ b/src/Core/Form/IdentifiableObject/DataProvider/AttributeGroupFormDataProvider.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataProvider;
+
+use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Query\GetAttributeGroupForEditing;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\QueryResult\EditableAttributeGroup;
+
+class AttributeGroupFormDataProvider implements FormDataProviderInterface
+{
+    /**
+     * @var CommandBusInterface
+     */
+    private $queryBus;
+
+    /**
+     * @param CommandBusInterface $queryBus
+     */
+    public function __construct(
+        CommandBusInterface $queryBus
+    ) {
+        $this->queryBus = $queryBus;
+    }
+
+    public function getData($id)
+    {
+        /** @var EditableAttributeGroup $editableAttributeGroup */
+        $editableAttributeGroup = $this->queryBus->handle(new GetAttributeGroupForEditing((int) $id));
+
+        return [
+            'name' => $editableAttributeGroup->getName(),
+            'public_name' => $editableAttributeGroup->getPublicName(),
+            'group_type' => $editableAttributeGroup->getType(),
+            'shop_association' => $editableAttributeGroup->getShopAssociationIds(),
+        ];
+    }
+
+    public function getDefaultData()
+    {
+        return [
+
+        ];
+    }
+}
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeController.php
index 75c44fd77da33..a8353c04f605d 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeController.php
@@ -140,6 +140,38 @@ public function updatePositionAction(Request $request, int $attributeGroupId)
      */
     public function createAction(int $attributeGroupId)
     {
+        $categoryFormBuilder = $this->get('prestashop.core.form.identifiable_object.builder.category_form_builder');
+        $categoryFormHandler = $this->get('prestashop.core.form.identifiable_object.handler.category_form_handler');
+
+        $categoryForm = $categoryFormBuilder->getForm(['id_parent' => $parentId]);
+        $categoryForm->handleRequest($request);
+
+        try {
+            $handlerResult = $categoryFormHandler->handle($categoryForm);
+
+            if (null !== $handlerResult->getIdentifiableObjectId()) {
+                $this->addFlash('success', $this->trans('Successful creation', 'Admin.Notifications.Success'));
+
+                return $this->redirectToRoute('admin_categories_index', [
+                    'categoryId' => $categoryForm->getData()['id_parent'],
+                ]);
+            }
+        } catch (Exception $e) {
+            $this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages()));
+        }
+
+        $defaultGroups = $this->get('prestashop.adapter.group.provider.default_groups_provider')->getGroups();
+
+        return $this->render(
+            '@PrestaShop/Admin/Sell/Catalog/Categories/create.html.twig',
+            [
+                'allowMenuThumbnailsUpload' => true,
+                'categoryForm' => $categoryForm->createView(),
+                'defaultGroups' => $defaultGroups,
+                'categoryUrl' => null,
+            ]
+        );
+
         // @todo: implement in another pr
         return $this->redirectToRoute('admin_attributes_index', [
             'attributeGroupId' => $attributeGroupId,
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php
index d77c05baae32e..5bc278c692c17 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php
@@ -27,6 +27,10 @@
 namespace PrestaShopBundle\Controller\Admin\Sell\Catalog;
 
 use Exception;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupConstraintException;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\CannotAddAttributeGroupException;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\CannotUpdateAttributeGroupException;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Query\GetAttributeGroupForEditing;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\BulkDeleteAttributeGroupCommand;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\DeleteAttributeGroupCommand;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupNotFoundException;
@@ -80,12 +84,36 @@ public function indexAction(Request $request, AttributeGroupFilters $attributeGr
      *     message="You do not have permission to create this."
      * )
      *
-     * @return RedirectResponse
+     * @param Request $request
+     *
+     * @return Response
      */
-    public function createAction()
+    public function createAction(Request $request): Response
     {
-        //@todo: implement in antoher pr
-        return $this->redirectToRoute('admin_attribute_groups_index');
+        $attributeGroupFormBuilder = $this->get('PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\AttributeGroupFormBuilder');
+        $attributeFormHandler = $this->get('PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Handler\AttributeGroupFormHandler');
+
+        $attributeGroupForm = $attributeGroupFormBuilder->getForm();
+        $attributeGroupForm->handleRequest($request);
+
+        try {
+            $handlerResult = $attributeFormHandler->handle($attributeGroupForm);
+
+            if (null !== $handlerResult->getIdentifiableObjectId()) {
+                $this->addFlash('success', $this->trans('Successful creation', 'Admin.Notifications.Success'));
+
+                return $this->redirectToRoute('admin_attribute_groups_index');
+            }
+        } catch (Exception $e) {
+            $this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages()));
+        }
+
+        return $this->render(
+            '@PrestaShop/Admin/Sell/Catalog/AttributeGroup/create.html.twig',
+            [
+                'attributeGroupForm' => $attributeGroupForm->createView(),
+            ]
+        );
     }
 
     /**
@@ -98,10 +126,37 @@ public function createAction()
      *
      * @return RedirectResponse
      */
-    public function editAction(int $attributeGroupId)
+    public function editAction(Request $request, int $attributeGroupId): Response
     {
-        //@todo: implement in antoher pr
-        return $this->redirectToRoute('admin_attribute_groups_index');
+        $editableAttributeGroup = $this->getQueryBus()->handle(new GetAttributeGroupForEditing($attributeGroupId));
+        $attributeGroupFormBuilder = $this->get('PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\AttributeGroupFormBuilder');
+        $attributeFormHandler = $this->get('PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Handler\AttributeGroupFormHandler');
+
+        $attributeGroupForm = $attributeGroupFormBuilder->getFormFor($attributeGroupId);
+        $attributeGroupForm->handleRequest($request);
+
+        try {
+            $handlerResult = $attributeFormHandler->handleFor($attributeGroupId, $attributeGroupForm);
+
+            if (null !== $handlerResult->getIdentifiableObjectId()) {
+                $this->addFlash('success', $this->trans('Successful update', 'Admin.Notifications.Success'));
+
+                return $this->redirectToRoute('admin_attribute_groups_index');
+            }
+        } catch (Exception $e) {
+            $this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages()));
+        }
+
+        $contextLangId = $this->getConfiguration()->get('PS_LANG_DEFAULT');
+
+        return $this->render(
+            '@PrestaShop/Admin/Sell/Catalog/AttributeGroup/edit.html.twig',
+            [
+                'attributeGroupForm' => $attributeGroupForm->createView(),
+                'attributeGroupId' => $attributeGroupId,
+                'attributeGroupName' => $editableAttributeGroup->getName()[$contextLangId],
+            ]
+        );
     }
 
     /**
@@ -238,6 +293,27 @@ private function getErrorMessages()
                 'The object cannot be loaded (or found).',
                 'Admin.Notifications.Error'
             ),
+            AttributeGroupConstraintException::class => [
+                AttributeGroupConstraintException::EMPTY_NAME => $this->trans(
+                    'The field %field_name% is required at least in your default language.',
+                    'Admin.Notifications.Error',
+                    ['%field_name%' => $this->trans('Name', 'Admin.Global')]
+                ),
+                AttributeGroupConstraintException::INVALID_NAME => $this->trans(
+                    'The %s field is invalid.',
+                    'Admin.Notifications.Error',
+                    [sprintf('"%s"', $this->trans('Name', 'Admin.Global'))]
+                ),
+            ],
+
+            CannotAddAttributeGroupException::class => $this->trans(
+                'An error occurred while creating the attribute group.',
+                'Admin.Catalog.Notification'
+            ),
+            CannotUpdateAttributeGroupException::class => $this->trans(
+                'The error occoured while updating the attribute group.',
+                'Admin.Catalog.Notification'
+            ),
             DeleteAttributeGroupException::class => [
                 DeleteAttributeGroupException::FAILED_DELETE => $this->trans(
                     'An error occurred while deleting the object.',
diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeGroupType.php b/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeGroupType.php
new file mode 100644
index 0000000000000..5a59adf7c99f5
--- /dev/null
+++ b/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeGroupType.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\Form\Admin\Sell\Catalog;
+
+use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\TypedRegex;
+use PrestaShop\PrestaShop\Core\ConstraintValidator\TypedRegexValidator;
+use PrestaShopBundle\Form\Admin\Type\ShopChoiceTreeType;
+use PrestaShopBundle\Form\Admin\Type\TranslatableType;
+use PrestaShopBundle\Form\Admin\Type\TranslatorAwareType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Validator\Constraints\NotBlank;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+/**
+ * Form type for attribute add/edit
+ */
+class AttributeGroupType extends TranslatorAwareType
+{
+    /**
+     * @var bool
+     */
+    private $isMultistoreEnabled;
+
+    /**
+     * @param TranslatorInterface $translator
+     * @param array $locales
+     * @param bool $isMultistoreEnabled
+     */
+    public function __construct(
+        TranslatorInterface $translator,
+        array $locales,
+        bool $isMultistoreEnabled
+    ) {
+        parent::__construct($translator, $locales);
+
+        $this->isMultistoreEnabled = $isMultistoreEnabled;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $attributeTypes = [
+            $this->trans('Drop-down list', 'Admin.Global') => 'select',
+            $this->trans('Radio buttons', 'Admin.Global') => 'radio',
+            $this->trans('Color or texture', 'Admin.Catalog.Feature') => 'color',
+        ];
+
+        $builder->add('name', TranslatableType::class, [
+            'type' => TextType::class,
+            'label' => $this->trans('Name', 'Admin.Global'),
+            'options' => [
+                'constraints' => [
+                    new TypedRegex([
+                        'type' => TypedRegex::TYPE_CATALOG_NAME,
+                    ]),
+                ],
+            ],
+            'help' => $this->trans('Your internal name for this attribute.', 'Admin.Catalog.Help')
+                . '&nbsp;' . $this->trans('Invalid characters:', 'Admin.Notifications.Info')
+                . ' ' . TypedRegexValidator::CATALOG_CHARS,
+        ])
+            ->add('public_name', TranslatableType::class, [
+                'type' => TextType::class,
+                'label' => $this->trans('Public name', 'Admin.Catalog.Feature'),
+                'options' => [
+                    'constraints' => [
+                        new TypedRegex([
+                            'type' => TypedRegex::TYPE_CATALOG_NAME,
+                        ]),
+                    ],
+                ],
+                'help' => $this->trans('Your internal name for this attribute.', 'Admin.Catalog.Help')
+                    . '&nbsp;' . $this->trans('Invalid characters:', 'Admin.Notifications.Info')
+                    . ' ' . TypedRegexValidator::CATALOG_CHARS,
+            ])
+            ->add('group_type', ChoiceType::class, [
+                'label' => $this->trans('Attribute type', 'Admin.Catalog.Feature'),
+                'help' => $this->trans('The way the attribute\'s values will be presented to the customers in the product\'s page.', 'Admin.Catalog.Help'),
+                'choices' => $attributeTypes,
+            ]);
+
+        if ($this->isMultistoreEnabled) {
+            $builder->add('shop_association', ShopChoiceTreeType::class, [
+                'label' => $this->trans('Shop association', 'Admin.Global'),
+                'required' => false,
+                'constraints' => [
+                    new NotBlank([
+                        'message' => $this->trans(
+                            'This field cannot be empty.', 'Admin.Notifications.Error'
+                        ),
+                    ]),
+                ],
+            ]);
+        }
+    }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setDefaults([
+            'requiredFields' => [],
+        ]);
+    }
+}
diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeType.php b/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeType.php
new file mode 100644
index 0000000000000..66178034de4e3
--- /dev/null
+++ b/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeType.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShopBundle\Form\Admin\Sell\Address;
+
+use PrestaShopBundle\Form\Admin\Type\TranslatorAwareType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+/**
+ * Form type for attribute add/edit
+ */
+class AttributeType extends TranslatorAwareType
+{
+    private $attributeTypes;
+
+    /**
+     * AttributeType constructor
+     *
+     * @param TranslatorInterface $translator
+     * @param array $locales
+     */
+    public function __construct(
+        TranslatorInterface $translator,
+        array $locales,
+        array $attributeTypes
+    ) {
+        parent::__construct($translator, $locales);
+        $this->attributeTypes = $attributeTypes;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder->add('name', TextType::class, [
+            'label' => $this->trans('Name', 'Admin.Global'),
+            'help' => $this->trans('Your internal name for this attribute.', 'Admin.Catalog.Help') . '&nbsp;' . $this->trans('Invalid characters:', 'Admin.Notifications.Info') . ' <>;=#{}',
+            ])
+            ->add('public_name', TextType::class, [
+                'label' => $this->trans('Name', 'Admin.Catalog.Feature'),
+                'help' => $this->trans('The public name for this attribute, displayed to the customers.', 'Admin.Catalog.Help') . '&nbsp;' . $this->trans('Invalid characters:', 'Admin.Notifications.Info') . ' <>;=#{}',
+            ])
+            ->add('attribute_type', ChoiceType::class, [
+                'label' => $this->trans('Attribute type', 'Admin.Catalog.Feature'),
+                'help' => $this->trans('The way the attribute\'s values will be presented to the customers in the product\'s page.', 'Admin.Catalog.Help'),
+                'choices' => $this->attributeTypes,
+            ]);
+    }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setDefaults([
+            'requiredFields' => [],
+        ]);
+    }
+}
diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/attribute_group.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/attribute_group.yml
index b689a8b123a96..4689c4325177d 100644
--- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/attribute_group.yml
+++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/attribute_group.yml
@@ -24,7 +24,7 @@ admin_attribute_groups_create:
   methods: [ GET, POST ]
   defaults:
     # todo: implement create
-    _controller: 'PrestaShopBundle\Controller\Admin\Sell\Catalog\AttributeGroupController::indexAction'
+    _controller: 'PrestaShopBundle\Controller\Admin\Sell\Catalog\AttributeGroupController::createAction'
     _legacy_controller: AdminAttributesGroups
     _legacy_link: AdminAttributeGroups:addattribute_group
     _legacy_feature_flag: attribute_group
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/attribute_group.yml b/src/PrestaShopBundle/Resources/config/services/adapter/attribute_group.yml
index ab51005669a1e..63717a1942a52 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/attribute_group.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/attribute_group.yml
@@ -2,6 +2,29 @@ services:
   _defaults:
     public: true
 
+  PrestaShop\PrestaShop\Adapter\AttributeGroup\CommandHandler\AddAttributeGroupHandler:
+    autowire: true
+    tags:
+      - name: tactician.handler
+        command: PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\AddAttributeGroupCommand
+
+  PrestaShop\PrestaShop\Adapter\AttributeGroup\CommandHandler\EditAttributeGroupHandler:
+    autowire: true
+    tags:
+      - name: tactician.handler
+        command: PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\EditAttributeGroupCommand
+
+  PrestaShop\PrestaShop\Adapter\AttributeGroup\QueryHandler\GetAttributeGroupForEditingHandler:
+    autowire: true
+    tags:
+      - name: tactician.handler
+        command: PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Query\GetAttributeGroupForEditing
+
+  PrestaShop\PrestaShop\Adapter\Product\AttributeGroup\AttributeGroupViewDataProvider:
+    arguments:
+      - "@=service('prestashop.adapter.legacy.context').getContext().language.id"
+      - '@PrestaShop\PrestaShop\Core\ConfigurationInterface'
+
   PrestaShop\PrestaShop\Adapter\AttributeGroup\AttributeGroupViewDataProvider:
     arguments:
       - "@=service('prestashop.adapter.legacy.context').getContext().language.id"
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
index 148234ec4c302..c1d603d0a6715 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
@@ -432,6 +432,15 @@ services:
 
   PrestaShopBundle\Form\Admin\Sell\Catalog\FeatureType: ~
   PrestaShopBundle\Form\Admin\Sell\Catalog\FeatureValueType: ~
+  PrestaShopBundle\Form\Admin\Sell\Catalog\AttributeGroupType:
+    autowire: true
+    public: true
+    arguments:
+      - '@=service("prestashop.adapter.multistore_feature").isActive()'
+    parent: 'form.type.translatable.aware'
+    tags:
+      - { name: form.type }
+
   PrestaShopBundle\Form\Admin\Sell\Order\ChangeOrderCurrencyType:
     arguments:
       $currencyChoiceProvider: '@PrestaShop\PrestaShop\Core\Form\ChoiceProvider\CurrencyByIdChoiceProvider'
diff --git a/src/PrestaShopBundle/Resources/config/services/core/form/form_builder.yml b/src/PrestaShopBundle/Resources/config/services/core/form/form_builder.yml
index 9dabf017d2ed5..74d75a158e05d 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/form/form_builder.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/form/form_builder.yml
@@ -58,6 +58,13 @@ services:
       - 'PrestaShopBundle\Form\Admin\Catalog\Category\CategoryType'
       - '@prestashop.core.form.identifiable_object.data_provider.category_form_data_provider'
 
+  prestashop.core.form.identifiable_object.builder.attribute_form_builder:
+    class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\FormBuilder'
+    factory: [ '@prestashop.core.form.builder.form_builder_factory', 'create' ]
+    arguments:
+      - 'PrestaShopBundle\Form\Admin\Catalog\Category\CategoryType'
+      - '@prestashop.core.form.identifiable_object.data_provider.category_form_data_provider'
+
   prestashop.core.form.identifiable_object.builder.root_category_form_builder:
     class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\FormBuilder'
     factory: [ '@prestashop.core.form.builder.form_builder_factory', 'create' ]
@@ -142,6 +149,14 @@ services:
       - 'PrestaShopBundle\Form\Admin\Sell\Catalog\FeatureValueType'
       - '@PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataProvider\FeatureValueFormDataProvider'
 
+  PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\AttributeGroupFormBuilder:
+    autowire: true
+    class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\FormBuilder'
+    factory: [ '@prestashop.core.form.builder.form_builder_factory', 'create' ]
+    arguments:
+      - 'PrestaShopBundle\Form\Admin\Sell\Catalog\AttributeGroupType'
+      - '@PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataProvider\AttributeGroupFormDataProvider'
+
   prestashop.core.form.identifiable_object.builder.order_message_form_builder:
     class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\FormBuilder'
     factory: [ '@prestashop.core.form.builder.form_builder_factory', 'create' ]
diff --git a/src/PrestaShopBundle/Resources/config/services/core/form/form_data_handler.yml b/src/PrestaShopBundle/Resources/config/services/core/form/form_data_handler.yml
index 9e7bc98bdfac8..e6e44e14ed871 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/form/form_data_handler.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/form/form_data_handler.yml
@@ -111,6 +111,9 @@ services:
       - '@prestashop.core.command_bus'
       - '@prestashop.adapter.image.uploader.supplier_image_uploader'
 
+  PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataHandler\AttributeGroupFormDataHandler:
+    autowire: true
+
   PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataHandler\FeatureFormDataHandler:
     autowire: true
     public: false
diff --git a/src/PrestaShopBundle/Resources/config/services/core/form/form_data_provider.yml b/src/PrestaShopBundle/Resources/config/services/core/form/form_data_provider.yml
index 54a84ad449797..69ca6dc8e848b 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/form/form_data_provider.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/form/form_data_provider.yml
@@ -110,6 +110,11 @@ services:
       - '@=service("prestashop.adapter.shop.context").getShops(true, true)'
       - '@=service("prestashop.adapter.legacy.context").getContext().country.id'
 
+  PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataProvider\AttributeGroupFormDataProvider:
+    autowire: true
+    arguments:
+      - '@prestashop.core.query_bus'
+
   prestashop.core.form.identifiable_object.data_provider.feature_form_data_provider:
     class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataProvider\FeatureFormDataProvider'
     arguments:
diff --git a/src/PrestaShopBundle/Resources/config/services/core/form/form_handler.yml b/src/PrestaShopBundle/Resources/config/services/core/form/form_handler.yml
index f9ef50203a6f8..c982fe3cd3619 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/form/form_handler.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/form/form_handler.yml
@@ -124,6 +124,12 @@ services:
     arguments:
       - '@PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataHandler\FeatureValueFormDataHandler'
 
+  PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Handler\AttributeGroupFormHandler:
+    class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Handler\FormHandler'
+    factory: [ '@prestashop.core.form.identifiable_object.handler.form_handler_factory', 'create' ]
+    arguments:
+      - '@PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataHandler\AttributeGroupFormDataHandler'
+
   prestashop.core.form.identifiable_object.handler.order_message_form_handler:
     class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Handler\FormHandler'
     factory: [ '@prestashop.core.form.identifiable_object.handler.form_handler_factory', 'create' ]
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/Blocks/form.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/Blocks/form.html.twig
new file mode 100644
index 0000000000000..afbda83f2a338
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/Blocks/form.html.twig
@@ -0,0 +1,53 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+
+{% form_theme attributeGroupForm '@PrestaShop/Admin/TwigTemplateForm/prestashop_ui_kit.html.twig' %}
+
+{% block attribute_group_form_block %}
+  {{ form_start(attributeGroupForm) }}
+
+  <div class="card">
+    <h3 class="card-header">
+      {{ 'Attribute Group'|trans({}, 'Admin.Catalog.Attribute') }}
+    </h3>
+
+    <div class="card-body">
+      <div class="form-wrapper">
+        {{ form_widget(attributeGroupForm) }}
+      </div>
+    </div>
+
+    <div class="card-footer">
+      <a href="{{ path('admin_attribute_groups_index') }}" class="btn btn-outline-secondary">
+        {{ 'Cancel'|trans({}, 'Admin.Actions') }}
+      </a>
+      <button class="btn btn-primary float-right">
+        {{ 'Save'|trans({}, 'Admin.Actions') }}
+      </button>
+    </div>
+  </div>
+
+  {{ form_end(attributeGroupForm) }}
+{% endblock %}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/Blocks/form_javascripts.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/Blocks/form_javascripts.html.twig
new file mode 100644
index 0000000000000..6c1cb650da186
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/Blocks/form_javascripts.html.twig
@@ -0,0 +1,28 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+
+{% block feature_javascript_block %}
+  <script src="{{ asset('themes/new-theme/public/attribute_group.bundle.js') }}"></script>
+{% endblock %}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/create.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/create.html.twig
new file mode 100644
index 0000000000000..8baae839ae22b
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/create.html.twig
@@ -0,0 +1,40 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+
+{% set layoutTitle = 'Add a new attribute group'|trans({}, 'Admin.Catalog.attribute') %}
+
+{% extends '@PrestaShop/Admin/layout.html.twig' %}
+
+{% block content %}
+    {% include '@PrestaShop/Admin/Sell/Catalog/AttributeGroup/Blocks/form.html.twig' with {
+      attributeId: null,
+      attributeForm: attributeGroupForm
+    } %}
+{% endblock %}
+
+{% block javascripts %}
+  {{ parent() }}
+  {% include '@PrestaShop/Admin/Sell/Catalog/AttributeGroup/Blocks/form_javascripts.html.twig' %}
+{% endblock %}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/edit.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/edit.html.twig
new file mode 100644
index 0000000000000..82f67a02fec69
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/edit.html.twig
@@ -0,0 +1,40 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+
+{% set layoutTitle = 'Edit: %name%'|trans({'%name%': attributeGroupName}, 'Admin.Actions') %}
+
+{% extends '@PrestaShop/Admin/layout.html.twig' %}
+
+{% block content %}
+  {% include '@PrestaShop/Admin/Sell/Catalog/AttributeGroup/Blocks/form.html.twig' with {
+    attributeId: attributeGroupId,
+    attributeForm: attributeGroupForm
+  } %}
+{% endblock %}
+
+{% block javascripts %}
+  {{ parent() }}
+  {% include '@PrestaShop/Admin/Sell/Catalog/Attribute/Blocks/form_javascripts.html.twig' %}
+{% endblock %}
diff --git a/themes/package-lock.json b/themes/package-lock.json
index 2367cbb438c64..93bd52ca101b1 100644
--- a/themes/package-lock.json
+++ b/themes/package-lock.json
@@ -1,5279 +1,8 @@
 {
   "name": "prestashop-core-theme-js",
   "version": "1.7.5",
-  "lockfileVersion": 2,
+  "lockfileVersion": 1,
   "requires": true,
-  "packages": {
-    "": {
-      "name": "prestashop-core-theme-js",
-      "version": "1.7.5",
-      "license": "OSL-3.0",
-      "dependencies": {
-        "@prestashop-core/jquery.live-polyfill": "^1.1.2",
-        "jquery": "^3.5.1",
-        "jquery-migrate": "^3.1.0",
-        "jquery.browser": "^0.1.0",
-        "punycode": "^2.1.1",
-        "zxcvbn": "^4.4.2"
-      },
-      "devDependencies": {
-        "babel-eslint": "^10.0.3",
-        "esbuild-loader": "^2.15.1",
-        "eslint": "^6.8.0",
-        "eslint-config-airbnb-base": "^14.0.0",
-        "eslint-import-resolver-webpack": "^0.12.1",
-        "eslint-plugin-html": "^6.0.0",
-        "eslint-plugin-import": "^2.20.0",
-        "mini-css-extract-plugin": "^2.6.1",
-        "path": "^0.12.7",
-        "webpack": "^5.37.1",
-        "webpack-cli": "^4.7.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
-      "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
-      "dev": true
-    },
-    "node_modules/@discoveryjs/json-ext": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz",
-      "integrity": "sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/@prestashop-core/jquery.live-polyfill": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@prestashop-core/jquery.live-polyfill/-/jquery.live-polyfill-1.1.2.tgz",
-      "integrity": "sha512-nBq6BmiGi2N+FY+aO6SVRDN8In7K5OQaK13VlVCtwYgpKfC7Rs87rFMwSujDMkswSvca6XEcgoWP1jPYyjcUqA==",
-      "dependencies": {
-        "jquery": ">=1.9"
-      }
-    },
-    "node_modules/@types/color-name": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
-      "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
-      "dev": true
-    },
-    "node_modules/@types/eslint": {
-      "version": "7.2.10",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.10.tgz",
-      "integrity": "sha512-kUEPnMKrqbtpCq/KTaGFFKAcz6Ethm2EjCoKIDaCmfRBWLbFuTcOJfTlorwbnboXBzahqWLgUp1BQeKHiJzPUQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/estree": "*",
-        "@types/json-schema": "*"
-      }
-    },
-    "node_modules/@types/eslint-scope": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.0.tgz",
-      "integrity": "sha512-O/ql2+rrCUe2W2rs7wMR+GqPRcgB6UiqN5RhrR5xruFlY7l9YLMn0ZkDzjoHLeiFkR8MCQZVudUuuvQ2BLC9Qw==",
-      "dev": true,
-      "dependencies": {
-        "@types/eslint": "*",
-        "@types/estree": "*"
-      }
-    },
-    "node_modules/@types/estree": {
-      "version": "0.0.47",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.47.tgz",
-      "integrity": "sha512-c5ciR06jK8u9BstrmJyO97m+klJrrhCf9u3rLu3DEAJBirxRqSCvDQoYKmxuYwQI5SZChAWu+tq9oVlGRuzPAg==",
-      "dev": true
-    },
-    "node_modules/@types/json-schema": {
-      "version": "7.0.11",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
-      "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
-      "dev": true
-    },
-    "node_modules/@types/json5": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
-      "dev": true
-    },
-    "node_modules/@types/node": {
-      "version": "15.3.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.3.0.tgz",
-      "integrity": "sha512-8/bnjSZD86ZfpBsDlCIkNXIvm+h6wi9g7IqL+kmFkQ+Wvu3JrasgLElfiPgoo8V8vVfnEi0QVS12gbl94h9YsQ==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/ast": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.0.tgz",
-      "integrity": "sha512-kX2W49LWsbthrmIRMbQZuQDhGtjyqXfEmmHyEi4XWnSZtPmxY0+3anPIzsnRb45VH/J55zlOfWvZuY47aJZTJg==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/helper-numbers": "1.11.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.0"
-      }
-    },
-    "node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.0.tgz",
-      "integrity": "sha512-Q/aVYs/VnPDVYvsCBL/gSgwmfjeCb4LW8+TMrO3cSzJImgv8lxxEPM2JA5jMrivE7LSz3V+PFqtMbls3m1exDA==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.0.tgz",
-      "integrity": "sha512-baT/va95eXiXb2QflSx95QGT5ClzWpGaa8L7JnJbgzoYeaA27FCvuBXU758l+KXWRndEmUXjP0Q5fibhavIn8w==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.0.tgz",
-      "integrity": "sha512-u9HPBEl4DS+vA8qLQdEQ6N/eJQ7gT7aNvMIo8AAWvAl/xMrcOSiI2M0MAnMCy3jIFke7bEee/JwdX1nUpCtdyA==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-numbers": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.0.tgz",
-      "integrity": "sha512-DhRQKelIj01s5IgdsOJMKLppI+4zpmcMQ3XboFPLwCpSNH6Hqo1ritgHgD0nqHeSYqofA6aBN/NmXuGjM1jEfQ==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/floating-point-hex-parser": "1.11.0",
-        "@webassemblyjs/helper-api-error": "1.11.0",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.0.tgz",
-      "integrity": "sha512-MbmhvxXExm542tWREgSFnOVo07fDpsBJg3sIl6fSp9xuu75eGz5lz31q7wTLffwL3Za7XNRCMZy210+tnsUSEA==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.0.tgz",
-      "integrity": "sha512-3Eb88hcbfY/FCukrg6i3EH8H2UsD7x8Vy47iVJrP967A9JGqgBVL9aH71SETPx1JrGsOUVLo0c7vMCN22ytJew==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.0",
-        "@webassemblyjs/helper-buffer": "1.11.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.0",
-        "@webassemblyjs/wasm-gen": "1.11.0"
-      }
-    },
-    "node_modules/@webassemblyjs/ieee754": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.0.tgz",
-      "integrity": "sha512-KXzOqpcYQwAfeQ6WbF6HXo+0udBNmw0iXDmEK5sFlmQdmND+tr773Ti8/5T/M6Tl/413ArSJErATd8In3B+WBA==",
-      "dev": true,
-      "dependencies": {
-        "@xtuc/ieee754": "^1.2.0"
-      }
-    },
-    "node_modules/@webassemblyjs/leb128": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.0.tgz",
-      "integrity": "sha512-aqbsHa1mSQAbeeNcl38un6qVY++hh8OpCOzxhixSYgbRfNWcxJNJQwe2rezK9XEcssJbbWIkblaJRwGMS9zp+g==",
-      "dev": true,
-      "dependencies": {
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@webassemblyjs/utf8": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.0.tgz",
-      "integrity": "sha512-A/lclGxH6SpSLSyFowMzO/+aDEPU4hvEiooCMXQPcQFPPJaYcPQNKGOCLUySJsYJ4trbpr+Fs08n4jelkVTGVw==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.0.tgz",
-      "integrity": "sha512-JHQ0damXy0G6J9ucyKVXO2j08JVJ2ntkdJlq1UTiUrIgfGMmA7Ik5VdC/L8hBK46kVJgujkBIoMtT8yVr+yVOQ==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.0",
-        "@webassemblyjs/helper-buffer": "1.11.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.0",
-        "@webassemblyjs/helper-wasm-section": "1.11.0",
-        "@webassemblyjs/wasm-gen": "1.11.0",
-        "@webassemblyjs/wasm-opt": "1.11.0",
-        "@webassemblyjs/wasm-parser": "1.11.0",
-        "@webassemblyjs/wast-printer": "1.11.0"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.0.tgz",
-      "integrity": "sha512-BEUv1aj0WptCZ9kIS30th5ILASUnAPEvE3tVMTrItnZRT9tXCLW2LEXT8ezLw59rqPP9klh9LPmpU+WmRQmCPQ==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.0",
-        "@webassemblyjs/ieee754": "1.11.0",
-        "@webassemblyjs/leb128": "1.11.0",
-        "@webassemblyjs/utf8": "1.11.0"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.0.tgz",
-      "integrity": "sha512-tHUSP5F4ywyh3hZ0+fDQuWxKx3mJiPeFufg+9gwTpYp324mPCQgnuVKwzLTZVqj0duRDovnPaZqDwoyhIO8kYg==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.0",
-        "@webassemblyjs/helper-buffer": "1.11.0",
-        "@webassemblyjs/wasm-gen": "1.11.0",
-        "@webassemblyjs/wasm-parser": "1.11.0"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.0.tgz",
-      "integrity": "sha512-6L285Sgu9gphrcpDXINvm0M9BskznnzJTE7gYkjDbxET28shDqp27wpruyx3C2S/dvEwiigBwLA1cz7lNUi0kw==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.0",
-        "@webassemblyjs/helper-api-error": "1.11.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.0",
-        "@webassemblyjs/ieee754": "1.11.0",
-        "@webassemblyjs/leb128": "1.11.0",
-        "@webassemblyjs/utf8": "1.11.0"
-      }
-    },
-    "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.0.tgz",
-      "integrity": "sha512-Fg5OX46pRdTgB7rKIUojkh9vXaVN6sGYCnEiJN1GYkb0RPwShZXp6KTDqmoMdQPKhcroOXh3fEzmkWmCYaKYhQ==",
-      "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.0",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@webpack-cli/configtest": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.3.tgz",
-      "integrity": "sha512-WQs0ep98FXX2XBAfQpRbY0Ma6ADw8JR6xoIkaIiJIzClGOMqVRvPCWqndTxf28DgFopWan0EKtHtg/5W1h0Zkw==",
-      "dev": true,
-      "peerDependencies": {
-        "webpack": "4.x.x || 5.x.x",
-        "webpack-cli": "4.x.x"
-      }
-    },
-    "node_modules/@webpack-cli/info": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.2.4.tgz",
-      "integrity": "sha512-ogE2T4+pLhTTPS/8MM3IjHn0IYplKM4HbVNMCWA9N4NrdPzunwenpCsqKEXyejMfRu6K8mhauIPYf8ZxWG5O6g==",
-      "dev": true,
-      "dependencies": {
-        "envinfo": "^7.7.3"
-      },
-      "peerDependencies": {
-        "webpack-cli": "4.x.x"
-      }
-    },
-    "node_modules/@webpack-cli/serve": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.4.0.tgz",
-      "integrity": "sha512-xgT/HqJ+uLWGX+Mzufusl3cgjAcnqYYskaB7o0vRcwOEfuu6hMzSILQpnIzFMGsTaeaX4Nnekl+6fadLbl1/Vg==",
-      "dev": true,
-      "peerDependencies": {
-        "webpack-cli": "4.x.x"
-      },
-      "peerDependenciesMeta": {
-        "webpack-dev-server": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@xtuc/ieee754": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-      "dev": true
-    },
-    "node_modules/@xtuc/long": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-      "dev": true
-    },
-    "node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-jsx": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz",
-      "integrity": "sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==",
-      "dev": true,
-      "peerDependencies": {
-        "acorn": "^6.0.0 || ^7.0.0"
-      }
-    },
-    "node_modules/ajv": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-      "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/ajv-formats": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
-      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "ajv": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/ajv-keywords": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3"
-      },
-      "peerDependencies": {
-        "ajv": "^8.8.2"
-      }
-    },
-    "node_modules/ajv/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true
-    },
-    "node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "node_modules/array-find": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-find/-/array-find-1.0.0.tgz",
-      "integrity": "sha1-bI4obRHtdoMn+OYuzuhzU8o+eLg=",
-      "dev": true
-    },
-    "node_modules/array-includes": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.1.tgz",
-      "integrity": "sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0",
-        "is-string": "^1.0.5"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/es-abstract": {
-      "version": "1.17.6",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
-      "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
-      "dev": true,
-      "dependencies": {
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1",
-        "is-callable": "^1.2.0",
-        "is-regex": "^1.1.0",
-        "object-inspect": "^1.7.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.0",
-        "string.prototype.trimend": "^1.0.1",
-        "string.prototype.trimstart": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/is-callable": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
-      "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/is-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
-      "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/is-symbol": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
-      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/array.prototype.flat": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz",
-      "integrity": "sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flat/node_modules/es-abstract": {
-      "version": "1.17.6",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
-      "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
-      "dev": true,
-      "dependencies": {
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1",
-        "is-callable": "^1.2.0",
-        "is-regex": "^1.1.0",
-        "object-inspect": "^1.7.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.0",
-        "string.prototype.trimend": "^1.0.1",
-        "string.prototype.trimstart": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flat/node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flat/node_modules/is-callable": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
-      "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flat/node_modules/is-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
-      "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flat/node_modules/is-symbol": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
-      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flat/node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/asn1.js": {
-      "version": "4.10.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
-      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "node_modules/assert": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
-      "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
-      "dev": true,
-      "dependencies": {
-        "util": "0.10.3"
-      }
-    },
-    "node_modules/assert/node_modules/inherits": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-      "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
-      "dev": true
-    },
-    "node_modules/assert/node_modules/util": {
-      "version": "0.10.3",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
-      "dev": true,
-      "dependencies": {
-        "inherits": "2.0.1"
-      }
-    },
-    "node_modules/astral-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
-      "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/babel-eslint": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.1.0.tgz",
-      "integrity": "sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==",
-      "deprecated": "babel-eslint is now @babel/eslint-parser. This package will no longer receive updates.",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/parser": "^7.7.0",
-        "@babel/traverse": "^7.7.0",
-        "@babel/types": "^7.7.0",
-        "eslint-visitor-keys": "^1.0.0",
-        "resolve": "^1.12.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "peerDependencies": {
-        "eslint": ">= 4.12.1"
-      }
-    },
-    "node_modules/babel-eslint/node_modules/@babel/code-frame": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-      "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.10.4"
-      }
-    },
-    "node_modules/babel-eslint/node_modules/@babel/generator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.4.tgz",
-      "integrity": "sha512-toLIHUIAgcQygFZRAQcsLQV3CBuX6yOIru1kJk/qqqvcRmZrYe6WavZTSG+bB8MxhnL9YPf+pKQfuiP161q7ng==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.10.4",
-        "jsesc": "^2.5.1",
-        "lodash": "^4.17.13",
-        "source-map": "^0.5.0"
-      }
-    },
-    "node_modules/babel-eslint/node_modules/@babel/helper-function-name": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
-      "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-get-function-arity": "^7.10.4",
-        "@babel/template": "^7.10.4",
-        "@babel/types": "^7.10.4"
-      }
-    },
-    "node_modules/babel-eslint/node_modules/@babel/helper-get-function-arity": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
-      "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.10.4"
-      }
-    },
-    "node_modules/babel-eslint/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.4.tgz",
-      "integrity": "sha512-pySBTeoUff56fL5CBU2hWm9TesA4r/rOkI9DyJLvvgz09MB9YtfIYe3iBriVaYNaPe+Alua0vBIOVOLs2buWhg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.10.4"
-      }
-    },
-    "node_modules/babel-eslint/node_modules/@babel/highlight": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-      "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.10.4",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "node_modules/babel-eslint/node_modules/@babel/parser": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.4.tgz",
-      "integrity": "sha512-8jHII4hf+YVDsskTF6WuMB3X4Eh+PsUkC2ljq22so5rHvH+T8BzyL94VOdyFLNR8tBSVXOTbNHOKpR4TfRxVtA==",
-      "dev": true,
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/babel-eslint/node_modules/@babel/template": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-      "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/parser": "^7.10.4",
-        "@babel/types": "^7.10.4"
-      }
-    },
-    "node_modules/babel-eslint/node_modules/@babel/traverse": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.4.tgz",
-      "integrity": "sha512-aSy7p5THgSYm4YyxNGz6jZpXf+Ok40QF3aA2LyIONkDHpAcJzDUqlCKXv6peqYUs2gmic849C/t2HKw2a2K20Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/generator": "^7.10.4",
-        "@babel/helper-function-name": "^7.10.4",
-        "@babel/helper-split-export-declaration": "^7.10.4",
-        "@babel/parser": "^7.10.4",
-        "@babel/types": "^7.10.4",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.13"
-      }
-    },
-    "node_modules/babel-eslint/node_modules/@babel/types": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.4.tgz",
-      "integrity": "sha512-UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.10.4",
-        "lodash": "^4.17.13",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
-    "node_modules/babel-eslint/node_modules/debug": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/babel-eslint/node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
-    },
-    "node_modules/babel-eslint/node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
-    },
-    "node_modules/babel-eslint/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/babel-eslint/node_modules/resolve": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
-      "dev": true,
-      "dependencies": {
-        "path-parse": "^1.0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-      "dev": true
-    },
-    "node_modules/base64-js": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
-      "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==",
-      "dev": true
-    },
-    "node_modules/bn.js": {
-      "version": "4.11.8",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
-      "dev": true
-    },
-    "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/brorand": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
-      "dev": true
-    },
-    "node_modules/browserify-aes": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-      "dev": true,
-      "dependencies": {
-        "buffer-xor": "^1.0.3",
-        "cipher-base": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.3",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/browserify-cipher": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
-      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
-      "dev": true,
-      "dependencies": {
-        "browserify-aes": "^1.0.4",
-        "browserify-des": "^1.0.0",
-        "evp_bytestokey": "^1.0.0"
-      }
-    },
-    "node_modules/browserify-des": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
-      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
-      "dev": true,
-      "dependencies": {
-        "cipher-base": "^1.0.1",
-        "des.js": "^1.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "node_modules/browserify-rsa": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
-      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "randombytes": "^2.0.1"
-      }
-    },
-    "node_modules/browserify-sign": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
-      "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.1.1",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.2",
-        "elliptic": "^6.0.0",
-        "inherits": "^2.0.1",
-        "parse-asn1": "^5.0.0"
-      }
-    },
-    "node_modules/browserify-zlib": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
-      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
-      "dev": true,
-      "dependencies": {
-        "pako": "~1.0.5"
-      }
-    },
-    "node_modules/buffer": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
-      "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
-      "deprecated": "This version of 'buffer' is out-of-date. You must update to v4.9.2 or newer",
-      "dev": true,
-      "dependencies": {
-        "base64-js": "^1.0.2",
-        "ieee754": "^1.1.4",
-        "isarray": "^1.0.0"
-      }
-    },
-    "node_modules/buffer-from": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
-      "dev": true
-    },
-    "node_modules/buffer-xor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
-      "dev": true
-    },
-    "node_modules/builtin-status-codes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
-      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
-      "dev": true
-    },
-    "node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/chalk": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
-      "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/chrome-trace-event": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
-      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
-    "node_modules/cipher-base": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/clone-deep": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
-      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
-      "dev": true,
-      "dependencies": {
-        "is-plain-object": "^2.0.4",
-        "kind-of": "^6.0.2",
-        "shallow-clone": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/color-convert": {
-      "version": "1.9.2",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.2.tgz",
-      "integrity": "sha512-3NUJZdhMhcdPn8vJ9v2UQJoH0qqoGUkYTgFEPZaPjEtwmmKUfNV46zZmgB2M5M4DCEQHMaCfWHCxiBflLm04Tg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.1"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.1.tgz",
-      "integrity": "sha1-SxQVMEz1ACjqgWQ2Q72C6gWANok=",
-      "dev": true
-    },
-    "node_modules/colorette": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
-      "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
-      "dev": true
-    },
-    "node_modules/commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true
-    },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
-    },
-    "node_modules/confusing-browser-globals": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.9.tgz",
-      "integrity": "sha512-KbS1Y0jMtyPgIxjO7ZzMAuUpAKMt1SzCL9fsrKsX6b0zJPTaT0SiSPmewwVZg9UAO83HVIlEhZF84LIjZ0lmAw==",
-      "dev": true
-    },
-    "node_modules/console-browserify": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
-      "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
-      "dev": true,
-      "dependencies": {
-        "date-now": "^0.1.4"
-      }
-    },
-    "node_modules/constants-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
-      "dev": true
-    },
-    "node_modules/contains-path": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz",
-      "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-      "dev": true
-    },
-    "node_modules/create-ecdh": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
-      "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "elliptic": "^6.0.0"
-      }
-    },
-    "node_modules/create-hash": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-      "dev": true,
-      "dependencies": {
-        "cipher-base": "^1.0.1",
-        "inherits": "^2.0.1",
-        "md5.js": "^1.3.4",
-        "ripemd160": "^2.0.1",
-        "sha.js": "^2.4.0"
-      }
-    },
-    "node_modules/create-hmac": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-      "dev": true,
-      "dependencies": {
-        "cipher-base": "^1.0.3",
-        "create-hash": "^1.1.0",
-        "inherits": "^2.0.1",
-        "ripemd160": "^2.0.0",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      }
-    },
-    "node_modules/cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-      "dev": true,
-      "dependencies": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
-      },
-      "engines": {
-        "node": ">=4.8"
-      }
-    },
-    "node_modules/crypto-browserify": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
-      "dev": true,
-      "dependencies": {
-        "browserify-cipher": "^1.0.0",
-        "browserify-sign": "^4.0.0",
-        "create-ecdh": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.0",
-        "diffie-hellman": "^5.0.0",
-        "inherits": "^2.0.1",
-        "pbkdf2": "^3.0.3",
-        "public-encrypt": "^4.0.0",
-        "randombytes": "^2.0.0",
-        "randomfill": "^1.0.3"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/date-now": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
-      "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=",
-      "dev": true
-    },
-    "node_modules/deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
-      "dev": true
-    },
-    "node_modules/define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-      "dev": true,
-      "dependencies": {
-        "object-keys": "^1.0.12"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/des.js": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
-      "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "node_modules/diffie-hellman": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "miller-rabin": "^4.0.0",
-        "randombytes": "^2.0.0"
-      }
-    },
-    "node_modules/doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/dom-serializer": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
-      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "entities": "^2.0.0"
-      }
-    },
-    "node_modules/domain-browser": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
-      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4",
-        "npm": ">=1.2"
-      }
-    },
-    "node_modules/domelementtype": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz",
-      "integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==",
-      "dev": true
-    },
-    "node_modules/domhandler": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-3.0.0.tgz",
-      "integrity": "sha512-eKLdI5v9m67kbXQbJSNn1zjh0SDzvzWVWtX+qEI3eMjZw8daH9k8rlj1FZY9memPwjiskQFbe7vHVVJIAqoEhw==",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/domutils": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.1.0.tgz",
-      "integrity": "sha512-CD9M0Dm1iaHfQ1R/TI+z3/JWp/pgub0j4jIQKH89ARR4ATAV2nbaOQS5XxU9maJP5jHaPdDDQSEHuE2UmpUTKg==",
-      "dev": true,
-      "dependencies": {
-        "dom-serializer": "^0.2.1",
-        "domelementtype": "^2.0.1",
-        "domhandler": "^3.0.0"
-      }
-    },
-    "node_modules/elliptic": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
-      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.11.9",
-        "brorand": "^1.1.0",
-        "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.1",
-        "inherits": "^2.0.4",
-        "minimalistic-assert": "^1.0.1",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "node_modules/elliptic/node_modules/bn.js": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
-      "dev": true
-    },
-    "node_modules/elliptic/node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/enhanced-resolve": {
-      "version": "5.8.2",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz",
-      "integrity": "sha512-F27oB3WuHDzvR2DOGNTaYy0D5o0cnrv8TeI482VM4kYgQd/FT9lUQwuNsJ0oOHtBUq7eiW5ytqzp7nBFknL+GA==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.2.4",
-        "tapable": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/enhanced-resolve/node_modules/graceful-fs": {
-      "version": "4.2.6",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
-      "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==",
-      "dev": true
-    },
-    "node_modules/entities": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz",
-      "integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==",
-      "dev": true
-    },
-    "node_modules/envinfo": {
-      "version": "7.8.1",
-      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz",
-      "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==",
-      "dev": true,
-      "bin": {
-        "envinfo": "dist/cli.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dev": true,
-      "dependencies": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "node_modules/es-module-lexer": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.4.1.tgz",
-      "integrity": "sha512-ooYciCUtfw6/d2w56UVeqHPcoCFAiJdz5XOkYpv/Txl1HMUozpXjz/2RIQgqwKdXNDPSF1W7mJCFse3G+HDyAA==",
-      "dev": true
-    },
-    "node_modules/esbuild": {
-      "version": "0.12.29",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.12.29.tgz",
-      "integrity": "sha512-w/XuoBCSwepyiZtIRsKsetiLDUVGPVw1E/R3VTFSecIy8UR7Cq3SOtwKHJMFoVqqVG36aGkzh4e8BvpO1Fdc7g==",
-      "dev": true,
-      "hasInstallScript": true,
-      "bin": {
-        "esbuild": "bin/esbuild"
-      }
-    },
-    "node_modules/esbuild-loader": {
-      "version": "2.15.1",
-      "resolved": "https://registry.npmjs.org/esbuild-loader/-/esbuild-loader-2.15.1.tgz",
-      "integrity": "sha512-JRBL6uTeWplMbylNBt9gxLKMjD8wKnqGq786QV/cm/nPBSNA9/kC7/vNwCXTDPfYqHoWsjyfH7ub9ekN0kdAYQ==",
-      "dev": true,
-      "dependencies": {
-        "esbuild": "^0.12.21",
-        "joycon": "^3.0.1",
-        "json5": "^2.2.0",
-        "loader-utils": "^2.0.0",
-        "tapable": "^2.2.0",
-        "type-fest": "^1.4.0",
-        "webpack-sources": "^2.2.0"
-      },
-      "funding": {
-        "url": "https://github.com/privatenumber/esbuild-loader?sponsor=1"
-      },
-      "peerDependencies": {
-        "webpack": "^4.40.0 || ^5.0.0"
-      }
-    },
-    "node_modules/esbuild-loader/node_modules/big.js": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/esbuild-loader/node_modules/emojis-list": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/esbuild-loader/node_modules/json5": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-      "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/esbuild-loader/node_modules/loader-utils": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-      "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
-      },
-      "engines": {
-        "node": ">=8.9.0"
-      }
-    },
-    "node_modules/esbuild-loader/node_modules/source-list-map": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
-      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
-      "dev": true
-    },
-    "node_modules/esbuild-loader/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/esbuild-loader/node_modules/type-fest": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz",
-      "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/esbuild-loader/node_modules/webpack-sources": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz",
-      "integrity": "sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==",
-      "dev": true,
-      "dependencies": {
-        "source-list-map": "^2.0.1",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/eslint": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz",
-      "integrity": "sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "ajv": "^6.10.0",
-        "chalk": "^2.1.0",
-        "cross-spawn": "^6.0.5",
-        "debug": "^4.0.1",
-        "doctrine": "^3.0.0",
-        "eslint-scope": "^5.0.0",
-        "eslint-utils": "^1.4.3",
-        "eslint-visitor-keys": "^1.1.0",
-        "espree": "^6.1.2",
-        "esquery": "^1.0.1",
-        "esutils": "^2.0.2",
-        "file-entry-cache": "^5.0.1",
-        "functional-red-black-tree": "^1.0.1",
-        "glob-parent": "^5.0.0",
-        "globals": "^12.1.0",
-        "ignore": "^4.0.6",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "inquirer": "^7.0.0",
-        "is-glob": "^4.0.0",
-        "js-yaml": "^3.13.1",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.3.0",
-        "lodash": "^4.17.14",
-        "minimatch": "^3.0.4",
-        "mkdirp": "^0.5.1",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.8.3",
-        "progress": "^2.0.0",
-        "regexpp": "^2.0.1",
-        "semver": "^6.1.2",
-        "strip-ansi": "^5.2.0",
-        "strip-json-comments": "^3.0.1",
-        "table": "^5.2.3",
-        "text-table": "^0.2.0",
-        "v8-compile-cache": "^2.0.3"
-      },
-      "bin": {
-        "eslint": "bin/eslint.js"
-      },
-      "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint-config-airbnb-base": {
-      "version": "14.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.2.0.tgz",
-      "integrity": "sha512-Snswd5oC6nJaevs3nZoLSTvGJBvzTfnBqOIArkf3cbyTyq9UD79wOk8s+RiL6bhca0p/eRO6veczhf6A/7Jy8Q==",
-      "dev": true,
-      "dependencies": {
-        "confusing-browser-globals": "^1.0.9",
-        "object.assign": "^4.1.0",
-        "object.entries": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 6"
-      },
-      "peerDependencies": {
-        "eslint": "^5.16.0 || ^6.8.0 || ^7.2.0",
-        "eslint-plugin-import": "^2.21.2"
-      }
-    },
-    "node_modules/eslint-import-resolver-node": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz",
-      "integrity": "sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^2.6.9",
-        "resolve": "^1.13.1"
-      }
-    },
-    "node_modules/eslint-import-resolver-node/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/eslint-import-resolver-node/node_modules/resolve": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
-      "dev": true,
-      "dependencies": {
-        "path-parse": "^1.0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-import-resolver-webpack": {
-      "version": "0.12.2",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.12.2.tgz",
-      "integrity": "sha512-7Jnm4YAoNNkvqPaZkKdIHsKGmv8/uNnYC5QsXkiSodvX4XEEfH2AKOna98FK52fCDXm3q4HzuX+7pRMKkJ64EQ==",
-      "dev": true,
-      "dependencies": {
-        "array-find": "^1.0.0",
-        "debug": "^2.6.9",
-        "enhanced-resolve": "^0.9.1",
-        "find-root": "^1.1.0",
-        "has": "^1.0.3",
-        "interpret": "^1.2.0",
-        "lodash": "^4.17.15",
-        "node-libs-browser": "^1.0.0 || ^2.0.0",
-        "resolve": "^1.13.1",
-        "semver": "^5.7.1"
-      },
-      "peerDependencies": {
-        "eslint-plugin-import": ">=1.4.0",
-        "webpack": ">=1.11.0"
-      }
-    },
-    "node_modules/eslint-import-resolver-webpack/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/eslint-import-resolver-webpack/node_modules/enhanced-resolve": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz",
-      "integrity": "sha1-TW5omzcl+GCQknzMhs2fFjW4ni4=",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "memory-fs": "^0.2.0",
-        "tapable": "^0.1.8"
-      },
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/eslint-import-resolver-webpack/node_modules/interpret": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
-      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/eslint-import-resolver-webpack/node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
-    },
-    "node_modules/eslint-import-resolver-webpack/node_modules/memory-fs": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz",
-      "integrity": "sha1-8rslNovBIeORwlIN6Slpyu4KApA=",
-      "dev": true
-    },
-    "node_modules/eslint-import-resolver-webpack/node_modules/resolve": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
-      "dev": true,
-      "dependencies": {
-        "path-parse": "^1.0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-import-resolver-webpack/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/eslint-import-resolver-webpack/node_modules/tapable": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",
-      "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/eslint-module-utils": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz",
-      "integrity": "sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^2.6.9",
-        "pkg-dir": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-module-utils/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/eslint-plugin-html": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-html/-/eslint-plugin-html-6.0.2.tgz",
-      "integrity": "sha512-Ik/z32UteKLo8GEfwNqVKcJ/WOz/be4h8N5mbMmxxnZ+9aL9XczOXQFz/bGu+nAGVoRg8CflldxJhONFpqlrxw==",
-      "dev": true,
-      "dependencies": {
-        "htmlparser2": "^4.1.0"
-      }
-    },
-    "node_modules/eslint-plugin-import": {
-      "version": "2.22.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.0.tgz",
-      "integrity": "sha512-66Fpf1Ln6aIS5Gr/55ts19eUuoDhAbZgnr6UxK5hbDx6l/QgQgx61AePq+BV4PP2uXQFClgMVzep5zZ94qqsxg==",
-      "dev": true,
-      "dependencies": {
-        "array-includes": "^3.1.1",
-        "array.prototype.flat": "^1.2.3",
-        "contains-path": "^0.1.0",
-        "debug": "^2.6.9",
-        "doctrine": "1.5.0",
-        "eslint-import-resolver-node": "^0.3.3",
-        "eslint-module-utils": "^2.6.0",
-        "has": "^1.0.3",
-        "minimatch": "^3.0.4",
-        "object.values": "^1.1.1",
-        "read-pkg-up": "^2.0.0",
-        "resolve": "^1.17.0",
-        "tsconfig-paths": "^3.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/doctrine": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
-      "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2",
-        "isarray": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/resolve": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
-      "dev": true,
-      "dependencies": {
-        "path-parse": "^1.0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/eslint-scope/node_modules/esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/eslint-scope/node_modules/esrecurse/node_modules/estraverse": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/eslint-utils": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
-      "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
-      "dev": true,
-      "dependencies": {
-        "eslint-visitor-keys": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/eslint-visitor-keys": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint/node_modules/@babel/code-frame": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-      "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.10.4"
-      }
-    },
-    "node_modules/eslint/node_modules/@babel/highlight": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-      "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.10.4",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/ajv": {
-      "version": "6.12.3",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/eslint/node_modules/ansi-escapes": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
-      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.11.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/ansi-escapes/node_modules/type-fest": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-      "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/ansi-styles": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-      "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-      "dev": true,
-      "dependencies": {
-        "@types/color-name": "^1.1.1",
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/eslint/node_modules/chardet": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
-      "dev": true
-    },
-    "node_modules/eslint/node_modules/cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-      "dev": true,
-      "dependencies": {
-        "restore-cursor": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/cli-width": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
-      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/eslint/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/eslint/node_modules/debug": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/eslint/node_modules/eslint-scope": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.0.tgz",
-      "integrity": "sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.1.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/external-editor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
-      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
-      "dev": true,
-      "dependencies": {
-        "chardet": "^0.7.0",
-        "iconv-lite": "^0.4.24",
-        "tmp": "^0.0.33"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint/node_modules/figures": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-      "dev": true,
-      "dependencies": {
-        "escape-string-regexp": "^1.0.5"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/glob-parent": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
-      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/eslint/node_modules/glob-parent/node_modules/is-glob": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/eslint/node_modules/globals": {
-      "version": "12.4.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
-      "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.8.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dev": true,
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/eslint/node_modules/inquirer": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.0.tgz",
-      "integrity": "sha512-K+LZp6L/6eE5swqIcVXrxl21aGDU4S50gKH0/d96OMQnSBCyGyZl/oZhbkVmdp5sBoINHd4xZvFSARh2dk6DWA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^3.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^3.0.0",
-        "lodash": "^4.17.15",
-        "mute-stream": "0.0.8",
-        "run-async": "^2.4.0",
-        "rxjs": "^6.6.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "through": "^2.3.6"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/inquirer/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/eslint/node_modules/inquirer/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
-    },
-    "node_modules/eslint/node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
-    },
-    "node_modules/eslint/node_modules/mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/eslint/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/eslint/node_modules/mute-stream": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
-      "dev": true
-    },
-    "node_modules/eslint/node_modules/onetime": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz",
-      "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==",
-      "dev": true,
-      "dependencies": {
-        "mimic-fn": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/eslint/node_modules/restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-      "dev": true,
-      "dependencies": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/run-async": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
-      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/eslint/node_modules/rxjs": {
-      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.0.tgz",
-      "integrity": "sha512-3HMA8z/Oz61DUHe+SdOiQyzIf4tOx5oQHmMir7IZEu6TMqCLHT4LRcmNaUS0NwOz8VLvmmBduMsoaUvMaIiqzg==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^1.9.0"
-      },
-      "engines": {
-        "npm": ">=2.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/eslint/node_modules/string-width": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/string-width/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/eslint/node_modules/strip-ansi/node_modules/ansi-regex": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/eslint/node_modules/supports-color": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-      "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/v8-compile-cache": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz",
-      "integrity": "sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==",
-      "dev": true
-    },
-    "node_modules/espree": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz",
-      "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^7.1.1",
-        "acorn-jsx": "^5.2.0",
-        "eslint-visitor-keys": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/esquery": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz",
-      "integrity": "sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/esquery/node_modules/estraverse": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.1.0.tgz",
-      "integrity": "sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esrecurse": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
-      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/estraverse": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/esutils": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
-      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/events": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.x"
-      }
-    },
-    "node_modules/evp_bytestokey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-      "dev": true,
-      "dependencies": {
-        "md5.js": "^1.3.4",
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "node_modules/execa": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz",
-      "integrity": "sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ==",
-      "dev": true,
-      "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.0",
-        "human-signals": "^2.1.0",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.1",
-        "onetime": "^5.1.2",
-        "signal-exit": "^3.0.3",
-        "strip-final-newline": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
-      }
-    },
-    "node_modules/execa/node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dev": true,
-      "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/execa/node_modules/path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/execa/node_modules/shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dev": true,
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/execa/node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/execa/node_modules/signal-exit": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
-      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
-      "dev": true
-    },
-    "node_modules/execa/node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
-    },
-    "node_modules/fast-json-stable-stringify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
-      "dev": true
-    },
-    "node_modules/fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-      "dev": true
-    },
-    "node_modules/fastest-levenshtein": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
-      "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==",
-      "dev": true
-    },
-    "node_modules/file-entry-cache": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
-      "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
-      "dev": true,
-      "dependencies": {
-        "flat-cache": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/find-root": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
-      "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==",
-      "dev": true
-    },
-    "node_modules/find-up": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/flat-cache": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
-      "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
-      "dev": true,
-      "dependencies": {
-        "flatted": "^2.0.0",
-        "rimraf": "2.6.3",
-        "write": "1.0.3"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/flat-cache/node_modules/glob": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-      "dev": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/flat-cache/node_modules/rimraf": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
-    "node_modules/flatted": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz",
-      "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==",
-      "dev": true
-    },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
-    },
-    "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
-    },
-    "node_modules/functional-red-black-tree": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-      "dev": true
-    },
-    "node_modules/get-stream": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/glob-to-regexp": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
-      "dev": true
-    },
-    "node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/graceful-fs": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/has-symbols": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
-      "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/hash-base": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
-      "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/hash.js": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "minimalistic-assert": "^1.0.1"
-      }
-    },
-    "node_modules/hmac-drbg": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
-      "dev": true,
-      "dependencies": {
-        "hash.js": "^1.0.3",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "node_modules/hosted-git-info": {
-      "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-      "dev": true
-    },
-    "node_modules/htmlparser2": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-4.1.0.tgz",
-      "integrity": "sha512-4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q==",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^3.0.0",
-        "domutils": "^2.0.0",
-        "entities": "^2.0.0"
-      }
-    },
-    "node_modules/https-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
-      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
-      "dev": true
-    },
-    "node_modules/human-signals": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.17.0"
-      }
-    },
-    "node_modules/ieee754": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz",
-      "integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==",
-      "dev": true
-    },
-    "node_modules/ignore": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/import-fresh": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
-      "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==",
-      "dev": true,
-      "dependencies": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/import-fresh/node_modules/resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/import-local": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
-      "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==",
-      "dev": true,
-      "dependencies": {
-        "pkg-dir": "^4.2.0",
-        "resolve-cwd": "^3.0.0"
-      },
-      "bin": {
-        "import-local-fixture": "fixtures/cli.js"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/import-local/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/import-local/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/import-local/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/import-local/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/import-local/node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/import-local/node_modules/pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.19"
-      }
-    },
-    "node_modules/indexof": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
-      "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
-      "dev": true
-    },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-      "dev": true
-    },
-    "node_modules/interpret": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz",
-      "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-      "dev": true
-    },
-    "node_modules/is-core-module": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz",
-      "integrity": "sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==",
-      "dev": true,
-      "dependencies": {
-        "has": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-date-object": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
-      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/is-glob": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz",
-      "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
-      "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-string": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz",
-      "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-      "dev": true
-    },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
-    },
-    "node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/jest-worker": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
-      "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^7.0.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      }
-    },
-    "node_modules/jest-worker/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-worker/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/joycon": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/joycon/-/joycon-3.0.1.tgz",
-      "integrity": "sha512-SJcJNBg32dGgxhPtM0wQqxqV0ax9k/9TaUskGDSJkSFSQOEWWvQ3zzWdGQRIUry2j1zA5+ReH13t0Mf3StuVZA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/jquery": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
-      "integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg=="
-    },
-    "node_modules/jquery-migrate": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/jquery-migrate/-/jquery-migrate-3.1.0.tgz",
-      "integrity": "sha512-u/MtE1ST2pCr3rCyouJG2xMiw/k3OzLNeRKprjKTeHUezCGr0DyEgeXFdqFLmQfxfR5EsVu+mGo/sCcYdiYcIQ==",
-      "peerDependencies": {
-        "jquery": ">=3 <4"
-      }
-    },
-    "node_modules/jquery.browser": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/jquery.browser/-/jquery.browser-0.1.0.tgz",
-      "integrity": "sha1-nHKmCV/SgUtER26o9xZne3Kmors=",
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/js-yaml": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
-      "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/jsesc": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.1.tgz",
-      "integrity": "sha1-5CGiqOINawgZ3yiQj3glJrlt0f4=",
-      "dev": true,
-      "bin": {
-        "jsesc": "bin/jsesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/json-parse-better-errors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-      "dev": true
-    },
-    "node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-      "dev": true
-    },
-    "node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/load-json-file": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
-      "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
-        "strip-bom": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/load-json-file/node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/loader-runner": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz",
-      "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.11.5"
-      }
-    },
-    "node_modules/locate-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^2.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/locate-path/node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/md5.js": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz",
-      "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=",
-      "dev": true,
-      "dependencies": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
-      }
-    },
-    "node_modules/merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true
-    },
-    "node_modules/miller-rabin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.0.0",
-        "brorand": "^1.0.1"
-      },
-      "bin": {
-        "miller-rabin": "bin/miller-rabin"
-      }
-    },
-    "node_modules/mime-db": {
-      "version": "1.47.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz",
-      "integrity": "sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mime-types": {
-      "version": "2.1.30",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.30.tgz",
-      "integrity": "sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg==",
-      "dev": true,
-      "dependencies": {
-        "mime-db": "1.47.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/mini-css-extract-plugin": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.6.1.tgz",
-      "integrity": "sha512-wd+SD57/K6DiV7jIR34P+s3uckTRuQvx0tKPcvjFlrEylk6P4mQ2KSWk1hblj1Kxaqok7LogKOieygXqBczNlg==",
-      "dev": true,
-      "dependencies": {
-        "schema-utils": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-      "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "ajv": "^8.8.0",
-        "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.0.0"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-      "dev": true
-    },
-    "node_modules/minimalistic-crypto-utils": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
-      "dev": true
-    },
-    "node_modules/minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-      "dev": true
-    },
-    "node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "node_modules/natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-      "dev": true
-    },
-    "node_modules/neo-async": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-      "dev": true
-    },
-    "node_modules/nice-try": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.4.tgz",
-      "integrity": "sha512-2NpiFHqC87y/zFke0fC0spBXL3bBsoh/p5H1EFhshxjCR5+0g2d6BiXbUFz9v1sAcxsk2htp2eQnNIci2dIYcA==",
-      "dev": true
-    },
-    "node_modules/node-libs-browser": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz",
-      "integrity": "sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==",
-      "dev": true,
-      "dependencies": {
-        "assert": "^1.1.1",
-        "browserify-zlib": "^0.2.0",
-        "buffer": "^4.3.0",
-        "console-browserify": "^1.1.0",
-        "constants-browserify": "^1.0.0",
-        "crypto-browserify": "^3.11.0",
-        "domain-browser": "^1.1.1",
-        "events": "^1.0.0",
-        "https-browserify": "^1.0.0",
-        "os-browserify": "^0.3.0",
-        "path-browserify": "0.0.0",
-        "process": "^0.11.10",
-        "punycode": "^1.2.4",
-        "querystring-es3": "^0.2.0",
-        "readable-stream": "^2.3.3",
-        "stream-browserify": "^2.0.1",
-        "stream-http": "^2.7.2",
-        "string_decoder": "^1.0.0",
-        "timers-browserify": "^2.0.4",
-        "tty-browserify": "0.0.0",
-        "url": "^0.11.0",
-        "util": "^0.10.3",
-        "vm-browserify": "0.0.4"
-      }
-    },
-    "node_modules/node-libs-browser/node_modules/events": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
-      "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
-    "node_modules/node-libs-browser/node_modules/punycode": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-      "dev": true
-    },
-    "node_modules/node-releases": {
-      "version": "1.1.72",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.72.tgz",
-      "integrity": "sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==",
-      "dev": true
-    },
-    "node_modules/normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-      "dev": true,
-      "dependencies": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
-      }
-    },
-    "node_modules/normalize-package-data/node_modules/resolve": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
-      "dev": true,
-      "dependencies": {
-        "path-parse": "^1.0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/npm-run-path": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-      "dev": true,
-      "dependencies": {
-        "path-key": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/npm-run-path/node_modules/path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/object-inspect": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz",
-      "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object-keys": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz",
-      "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.assign": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
-      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.2",
-        "function-bind": "^1.1.1",
-        "has-symbols": "^1.0.0",
-        "object-keys": "^1.0.11"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.entries": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.2.tgz",
-      "integrity": "sha512-BQdB9qKmb/HyNdMNWVr7O3+z5MUIx3aiegEIJqjMBbBf0YT9RRxTJSim4mzFqtyr7PDAHigq0N9dO0m0tRakQA==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5",
-        "has": "^1.0.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.entries/node_modules/es-abstract": {
-      "version": "1.17.6",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
-      "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
-      "dev": true,
-      "dependencies": {
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1",
-        "is-callable": "^1.2.0",
-        "is-regex": "^1.1.0",
-        "object-inspect": "^1.7.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.0",
-        "string.prototype.trimend": "^1.0.1",
-        "string.prototype.trimstart": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries/node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries/node_modules/is-callable": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
-      "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries/node_modules/is-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
-      "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries/node_modules/is-symbol": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
-      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries/node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.values": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz",
-      "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/es-abstract": {
-      "version": "1.17.6",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
-      "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
-      "dev": true,
-      "dependencies": {
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1",
-        "is-callable": "^1.2.0",
-        "is-regex": "^1.1.0",
-        "object-inspect": "^1.7.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.0",
-        "string.prototype.trimend": "^1.0.1",
-        "string.prototype.trimstart": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/is-callable": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
-      "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/is-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
-      "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/is-symbol": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
-      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
-    "node_modules/onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "dev": true,
-      "dependencies": {
-        "mimic-fn": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/optionator": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-      "dev": true,
-      "dependencies": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.6",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "word-wrap": "~1.2.3"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/os-browserify": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
-      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
-      "dev": true
-    },
-    "node_modules/os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/p-limit": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/p-locate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/p-try": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/pako": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz",
-      "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==",
-      "dev": true
-    },
-    "node_modules/parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
-      "dependencies": {
-        "callsites": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/parse-asn1": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz",
-      "integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==",
-      "dev": true,
-      "dependencies": {
-        "asn1.js": "^4.0.0",
-        "browserify-aes": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.0",
-        "pbkdf2": "^3.0.3"
-      }
-    },
-    "node_modules/parse-json": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-      "dev": true,
-      "dependencies": {
-        "error-ex": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path": {
-      "version": "0.12.7",
-      "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz",
-      "integrity": "sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=",
-      "dev": true,
-      "dependencies": {
-        "process": "^0.11.1",
-        "util": "^0.10.3"
-      }
-    },
-    "node_modules/path-browserify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
-      "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
-      "dev": true
-    },
-    "node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/path-parse": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
-      "dev": true
-    },
-    "node_modules/path-type": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
-      "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
-      "dev": true,
-      "dependencies": {
-        "pify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/path-type/node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pbkdf2": {
-      "version": "3.0.16",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.16.tgz",
-      "integrity": "sha512-y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA==",
-      "dev": true,
-      "dependencies": {
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4",
-        "ripemd160": "^2.0.1",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      },
-      "engines": {
-        "node": ">=0.12"
-      }
-    },
-    "node_modules/pkg-dir": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
-      "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/process": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6.0"
-      }
-    },
-    "node_modules/process-nextick-args": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
-      "dev": true
-    },
-    "node_modules/progress": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/public-encrypt": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz",
-      "integrity": "sha512-4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==",
-      "dev": true,
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "parse-asn1": "^5.0.0",
-        "randombytes": "^2.0.1"
-      }
-    },
-    "node_modules/punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/querystring": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
-      "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
-    "node_modules/querystring-es3": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
-    "node_modules/randombytes": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz",
-      "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "node_modules/randomfill": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-      "dev": true,
-      "dependencies": {
-        "randombytes": "^2.0.5",
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "node_modules/read-pkg": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
-      "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
-      "dev": true,
-      "dependencies": {
-        "load-json-file": "^2.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/read-pkg-up": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-      "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^2.0.0",
-        "read-pkg": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/readable-stream": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/rechoir": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz",
-      "integrity": "sha512-ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q==",
-      "dev": true,
-      "dependencies": {
-        "resolve": "^1.9.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/rechoir/node_modules/resolve": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
-      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
-      "dev": true,
-      "dependencies": {
-        "is-core-module": "^2.2.0",
-        "path-parse": "^1.0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/regexpp": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
-      "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.5.0"
-      }
-    },
-    "node_modules/require-from-string": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/resolve-cwd": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
-      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
-      "dev": true,
-      "dependencies": {
-        "resolve-from": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/resolve-from": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ripemd160": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-      "dev": true,
-      "dependencies": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
-      }
-    },
-    "node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
-    },
-    "node_modules/safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
-    },
-    "node_modules/schema-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
-      "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.6",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/schema-utils/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/schema-utils/node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
-    "node_modules/semver": {
-      "version": "5.5.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.1.tgz",
-      "integrity": "sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/serialize-javascript": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
-      "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
-      "dev": true,
-      "dependencies": {
-        "randombytes": "^2.1.0"
-      }
-    },
-    "node_modules/serialize-javascript/node_modules/randombytes": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "node_modules/setimmediate": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
-      "dev": true
-    },
-    "node_modules/sha.js": {
-      "version": "2.4.11",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      },
-      "bin": {
-        "sha.js": "bin.js"
-      }
-    },
-    "node_modules/shallow-clone": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
-      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-      "dev": true,
-      "dependencies": {
-        "shebang-regex": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/signal-exit": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
-      "dev": true
-    },
-    "node_modules/slice-ansi": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
-      "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.0",
-        "astral-regex": "^1.0.0",
-        "is-fullwidth-code-point": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/spdx-correct": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
-      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
-      "dev": true,
-      "dependencies": {
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-exceptions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
-      "dev": true
-    },
-    "node_modules/spdx-expression-parse": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
-      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
-      "dev": true,
-      "dependencies": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-license-ids": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
-      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
-      "dev": true
-    },
-    "node_modules/sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-      "dev": true
-    },
-    "node_modules/stream-browserify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
-      "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
-      "dev": true,
-      "dependencies": {
-        "inherits": "~2.0.1",
-        "readable-stream": "^2.0.2"
-      }
-    },
-    "node_modules/stream-http": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
-      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
-      "dev": true,
-      "dependencies": {
-        "builtin-status-codes": "^3.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.3.6",
-        "to-arraybuffer": "^1.0.0",
-        "xtend": "^4.0.0"
-      }
-    },
-    "node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "node_modules/string.prototype.trimend": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
-      "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimend/node_modules/es-abstract": {
-      "version": "1.17.6",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
-      "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
-      "dev": true,
-      "dependencies": {
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1",
-        "is-callable": "^1.2.0",
-        "is-regex": "^1.1.0",
-        "object-inspect": "^1.7.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.0",
-        "string.prototype.trimend": "^1.0.1",
-        "string.prototype.trimstart": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimend/node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimend/node_modules/is-callable": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
-      "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimend/node_modules/is-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
-      "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimend/node_modules/is-symbol": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
-      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimend/node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/string.prototype.trimstart": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
-      "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimstart/node_modules/es-abstract": {
-      "version": "1.17.6",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
-      "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
-      "dev": true,
-      "dependencies": {
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1",
-        "is-callable": "^1.2.0",
-        "is-regex": "^1.1.0",
-        "object-inspect": "^1.7.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.0",
-        "string.prototype.trimend": "^1.0.1",
-        "string.prototype.trimstart": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimstart/node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimstart/node_modules/is-callable": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
-      "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimstart/node_modules/is-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
-      "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimstart/node_modules/is-symbol": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
-      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimstart/node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/strip-final-newline": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/strip-json-comments": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.0.tgz",
-      "integrity": "sha512-e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/table": {
-      "version": "5.4.6",
-      "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
-      "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.10.2",
-        "lodash": "^4.17.14",
-        "slice-ansi": "^2.1.0",
-        "string-width": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/table/node_modules/ajv": {
-      "version": "6.12.3",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/table/node_modules/ansi-regex": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/table/node_modules/emoji-regex": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-      "dev": true
-    },
-    "node_modules/table/node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
-    },
-    "node_modules/table/node_modules/string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/table/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/tapable": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.0.tgz",
-      "integrity": "sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/terser": {
-      "version": "5.7.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.7.0.tgz",
-      "integrity": "sha512-HP5/9hp2UaZt5fYkuhNBR8YyRcT8juw8+uFbAme53iN9hblvKnLUTKkmwJG6ocWpIKf8UK4DoeWG4ty0J6S6/g==",
-      "dev": true,
-      "dependencies": {
-        "commander": "^2.20.0",
-        "source-map": "~0.7.2",
-        "source-map-support": "~0.5.19"
-      },
-      "bin": {
-        "terser": "bin/terser"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/terser-webpack-plugin": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.1.2.tgz",
-      "integrity": "sha512-6QhDaAiVHIQr5Ab3XUWZyDmrIPCHMiqJVljMF91YKyqwKkL5QHnYMkrMBy96v9Z7ev1hGhSEw1HQZc2p/s5Z8Q==",
-      "dev": true,
-      "dependencies": {
-        "jest-worker": "^26.6.2",
-        "p-limit": "^3.1.0",
-        "schema-utils": "^3.0.0",
-        "serialize-javascript": "^5.0.1",
-        "source-map": "^0.6.1",
-        "terser": "^5.7.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.1.0"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "dev": true,
-      "dependencies": {
-        "yocto-queue": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/terser/node_modules/source-map": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/terser/node_modules/source-map-support": {
-      "version": "0.5.19",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
-      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
-      "dev": true,
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      }
-    },
-    "node_modules/terser/node_modules/source-map-support/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-      "dev": true
-    },
-    "node_modules/through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-      "dev": true
-    },
-    "node_modules/timers-browserify": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz",
-      "integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
-      "dev": true,
-      "dependencies": {
-        "setimmediate": "^1.0.4"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
-    "node_modules/tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-      "dev": true,
-      "dependencies": {
-        "os-tmpdir": "~1.0.2"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
-    "node_modules/to-arraybuffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
-      "dev": true
-    },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/tsconfig-paths": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz",
-      "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==",
-      "dev": true,
-      "dependencies": {
-        "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
-        "minimist": "^1.2.0",
-        "strip-bom": "^3.0.0"
-      }
-    },
-    "node_modules/tsconfig-paths/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/tslib": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
-      "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==",
-      "dev": true
-    },
-    "node_modules/tty-browserify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
-      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
-      "dev": true
-    },
-    "node_modules/type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/uri-js": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
-      "dev": true,
-      "dependencies": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "node_modules/url": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
-      "dev": true,
-      "dependencies": {
-        "punycode": "1.3.2",
-        "querystring": "0.2.0"
-      }
-    },
-    "node_modules/url/node_modules/punycode": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-      "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
-      "dev": true
-    },
-    "node_modules/util": {
-      "version": "0.10.4",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
-      "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "2.0.3"
-      }
-    },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
-    },
-    "node_modules/v8-compile-cache": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
-      "dev": true
-    },
-    "node_modules/validate-npm-package-license": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-      "dev": true,
-      "dependencies": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
-    "node_modules/vm-browserify": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
-      "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
-      "dev": true,
-      "dependencies": {
-        "indexof": "0.0.1"
-      }
-    },
-    "node_modules/watchpack": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.1.1.tgz",
-      "integrity": "sha512-Oo7LXCmc1eE1AjyuSBmtC3+Wy4HcV8PxWh2kP6fOl8yTlNS7r0K9l1ao2lrrUza7V39Y3D/BbJgY8VeSlc5JKw==",
-      "dev": true,
-      "dependencies": {
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.1.2"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/webpack": {
-      "version": "5.37.1",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.37.1.tgz",
-      "integrity": "sha512-btZjGy/hSjCAAVHw+cKG+L0M+rstlyxbO2C+BOTaQ5/XAnxkDrP5sVbqWhXgo4pL3X2dcOib6rqCP20Zr9PLow==",
-      "dev": true,
-      "dependencies": {
-        "@types/eslint-scope": "^3.7.0",
-        "@types/estree": "^0.0.47",
-        "@webassemblyjs/ast": "1.11.0",
-        "@webassemblyjs/wasm-edit": "1.11.0",
-        "@webassemblyjs/wasm-parser": "1.11.0",
-        "acorn": "^8.2.1",
-        "browserslist": "^4.14.5",
-        "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.8.0",
-        "es-module-lexer": "^0.4.0",
-        "eslint-scope": "^5.1.1",
-        "events": "^3.2.0",
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.2.4",
-        "json-parse-better-errors": "^1.0.2",
-        "loader-runner": "^4.2.0",
-        "mime-types": "^2.1.27",
-        "neo-async": "^2.6.2",
-        "schema-utils": "^3.0.0",
-        "tapable": "^2.1.1",
-        "terser-webpack-plugin": "^5.1.1",
-        "watchpack": "^2.0.0",
-        "webpack-sources": "^2.1.1"
-      },
-      "bin": {
-        "webpack": "bin/webpack.js"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependenciesMeta": {
-        "webpack-cli": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/webpack-cli": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.7.0.tgz",
-      "integrity": "sha512-7bKr9182/sGfjFm+xdZSwgQuFjgEcy0iCTIBxRUeteJ2Kr8/Wz0qNJX+jw60LU36jApt4nmMkep6+W5AKhok6g==",
-      "dev": true,
-      "dependencies": {
-        "@discoveryjs/json-ext": "^0.5.0",
-        "@webpack-cli/configtest": "^1.0.3",
-        "@webpack-cli/info": "^1.2.4",
-        "@webpack-cli/serve": "^1.4.0",
-        "colorette": "^1.2.1",
-        "commander": "^7.0.0",
-        "execa": "^5.0.0",
-        "fastest-levenshtein": "^1.0.12",
-        "import-local": "^3.0.2",
-        "interpret": "^2.2.0",
-        "rechoir": "^0.7.0",
-        "v8-compile-cache": "^2.2.0",
-        "webpack-merge": "^5.7.3"
-      },
-      "bin": {
-        "webpack-cli": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "peerDependencies": {
-        "webpack": "4.x.x || 5.x.x"
-      },
-      "peerDependenciesMeta": {
-        "@webpack-cli/generators": {
-          "optional": true
-        },
-        "@webpack-cli/migrate": {
-          "optional": true
-        },
-        "webpack-bundle-analyzer": {
-          "optional": true
-        },
-        "webpack-dev-server": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/webpack-cli/node_modules/commander": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/webpack-merge": {
-      "version": "5.7.3",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.7.3.tgz",
-      "integrity": "sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA==",
-      "dev": true,
-      "dependencies": {
-        "clone-deep": "^4.0.1",
-        "wildcard": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/webpack/node_modules/acorn": {
-      "version": "8.7.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
-      "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/webpack/node_modules/browserslist": {
-      "version": "4.16.6",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
-      "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
-      "dev": true,
-      "dependencies": {
-        "caniuse-lite": "^1.0.30001219",
-        "colorette": "^1.2.2",
-        "electron-to-chromium": "^1.3.723",
-        "escalade": "^3.1.1",
-        "node-releases": "^1.1.71"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      },
-      "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/browserslist"
-      }
-    },
-    "node_modules/webpack/node_modules/caniuse-lite": {
-      "version": "1.0.30001228",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz",
-      "integrity": "sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A==",
-      "dev": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/browserslist"
-      }
-    },
-    "node_modules/webpack/node_modules/electron-to-chromium": {
-      "version": "1.3.732",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.732.tgz",
-      "integrity": "sha512-qKD5Pbq+QMk4nea4lMuncUMhpEiQwaJyCW7MrvissnRcBDENhVfDmAqQYRQ3X525oTzhar9Zh1cK0L2d1UKYcw==",
-      "dev": true
-    },
-    "node_modules/webpack/node_modules/graceful-fs": {
-      "version": "4.2.6",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
-      "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==",
-      "dev": true
-    },
-    "node_modules/webpack/node_modules/source-list-map": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
-      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
-      "dev": true
-    },
-    "node_modules/webpack/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack/node_modules/webpack-sources": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.2.0.tgz",
-      "integrity": "sha512-bQsA24JLwcnWGArOKUxYKhX3Mz/nK1Xf6hxullKERyktjNMC4x8koOeaDNTA2fEJ09BdWLbM/iTW0ithREUP0w==",
-      "dev": true,
-      "dependencies": {
-        "source-list-map": "^2.0.1",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
-      }
-    },
-    "node_modules/wildcard": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
-      "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==",
-      "dev": true
-    },
-    "node_modules/word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
-    },
-    "node_modules/write": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
-      "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
-      "dev": true,
-      "dependencies": {
-        "mkdirp": "^0.5.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/xtend": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4"
-      }
-    },
-    "node_modules/yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/zxcvbn": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/zxcvbn/-/zxcvbn-4.4.2.tgz",
-      "integrity": "sha1-KOwXzwl0PtyrBW3dixsGJizHPDA="
-    }
-  },
   "dependencies": {
     "@babel/helper-validator-identifier": {
       "version": "7.10.4",
@@ -5495,8 +224,7 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.3.tgz",
       "integrity": "sha512-WQs0ep98FXX2XBAfQpRbY0Ma6ADw8JR6xoIkaIiJIzClGOMqVRvPCWqndTxf28DgFopWan0EKtHtg/5W1h0Zkw==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "@webpack-cli/info": {
       "version": "1.2.4",
@@ -5511,8 +239,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.4.0.tgz",
       "integrity": "sha512-xgT/HqJ+uLWGX+Mzufusl3cgjAcnqYYskaB7o0vRcwOEfuu6hMzSILQpnIzFMGsTaeaX4Nnekl+6fadLbl1/Vg==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "@xtuc/ieee754": {
       "version": "1.2.0",
@@ -5536,8 +263,7 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz",
       "integrity": "sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "ajv": {
       "version": "8.11.0",
@@ -7778,8 +2504,7 @@
     "jquery-migrate": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/jquery-migrate/-/jquery-migrate-3.1.0.tgz",
-      "integrity": "sha512-u/MtE1ST2pCr3rCyouJG2xMiw/k3OzLNeRKprjKTeHUezCGr0DyEgeXFdqFLmQfxfR5EsVu+mGo/sCcYdiYcIQ==",
-      "requires": {}
+      "integrity": "sha512-u/MtE1ST2pCr3rCyouJG2xMiw/k3OzLNeRKprjKTeHUezCGr0DyEgeXFdqFLmQfxfR5EsVu+mGo/sCcYdiYcIQ=="
     },
     "jquery.browser": {
       "version": "0.1.0",
@@ -8662,8 +3387,7 @@
           "version": "3.5.2",
           "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
           "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-          "dev": true,
-          "requires": {}
+          "dev": true
         }
       }
     },
@@ -8817,15 +3541,6 @@
         "xtend": "^4.0.0"
       }
     },
-    "string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
     "string.prototype.trimend": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
@@ -8970,6 +3685,15 @@
         }
       }
     },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
     "strip-bom": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",

From a5cf1c05dff62a0120389c10510b71ff1b098f96 Mon Sep 17 00:00:00 2001
From: jevgenijvisockij <jevgenij.visockij@gmail.com>
Date: Thu, 23 Feb 2023 09:27:55 +0200
Subject: [PATCH 0941/1030] Reverting package-lock.json

---
 themes/package-lock.json | 5306 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 5291 insertions(+), 15 deletions(-)

diff --git a/themes/package-lock.json b/themes/package-lock.json
index 93bd52ca101b1..2367cbb438c64 100644
--- a/themes/package-lock.json
+++ b/themes/package-lock.json
@@ -1,8 +1,5279 @@
 {
   "name": "prestashop-core-theme-js",
   "version": "1.7.5",
-  "lockfileVersion": 1,
+  "lockfileVersion": 2,
   "requires": true,
+  "packages": {
+    "": {
+      "name": "prestashop-core-theme-js",
+      "version": "1.7.5",
+      "license": "OSL-3.0",
+      "dependencies": {
+        "@prestashop-core/jquery.live-polyfill": "^1.1.2",
+        "jquery": "^3.5.1",
+        "jquery-migrate": "^3.1.0",
+        "jquery.browser": "^0.1.0",
+        "punycode": "^2.1.1",
+        "zxcvbn": "^4.4.2"
+      },
+      "devDependencies": {
+        "babel-eslint": "^10.0.3",
+        "esbuild-loader": "^2.15.1",
+        "eslint": "^6.8.0",
+        "eslint-config-airbnb-base": "^14.0.0",
+        "eslint-import-resolver-webpack": "^0.12.1",
+        "eslint-plugin-html": "^6.0.0",
+        "eslint-plugin-import": "^2.20.0",
+        "mini-css-extract-plugin": "^2.6.1",
+        "path": "^0.12.7",
+        "webpack": "^5.37.1",
+        "webpack-cli": "^4.7.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+      "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
+      "dev": true
+    },
+    "node_modules/@discoveryjs/json-ext": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz",
+      "integrity": "sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/@prestashop-core/jquery.live-polyfill": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@prestashop-core/jquery.live-polyfill/-/jquery.live-polyfill-1.1.2.tgz",
+      "integrity": "sha512-nBq6BmiGi2N+FY+aO6SVRDN8In7K5OQaK13VlVCtwYgpKfC7Rs87rFMwSujDMkswSvca6XEcgoWP1jPYyjcUqA==",
+      "dependencies": {
+        "jquery": ">=1.9"
+      }
+    },
+    "node_modules/@types/color-name": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
+      "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
+      "dev": true
+    },
+    "node_modules/@types/eslint": {
+      "version": "7.2.10",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.10.tgz",
+      "integrity": "sha512-kUEPnMKrqbtpCq/KTaGFFKAcz6Ethm2EjCoKIDaCmfRBWLbFuTcOJfTlorwbnboXBzahqWLgUp1BQeKHiJzPUQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/estree": "*",
+        "@types/json-schema": "*"
+      }
+    },
+    "node_modules/@types/eslint-scope": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.0.tgz",
+      "integrity": "sha512-O/ql2+rrCUe2W2rs7wMR+GqPRcgB6UiqN5RhrR5xruFlY7l9YLMn0ZkDzjoHLeiFkR8MCQZVudUuuvQ2BLC9Qw==",
+      "dev": true,
+      "dependencies": {
+        "@types/eslint": "*",
+        "@types/estree": "*"
+      }
+    },
+    "node_modules/@types/estree": {
+      "version": "0.0.47",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.47.tgz",
+      "integrity": "sha512-c5ciR06jK8u9BstrmJyO97m+klJrrhCf9u3rLu3DEAJBirxRqSCvDQoYKmxuYwQI5SZChAWu+tq9oVlGRuzPAg==",
+      "dev": true
+    },
+    "node_modules/@types/json-schema": {
+      "version": "7.0.11",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
+      "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
+      "dev": true
+    },
+    "node_modules/@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
+      "dev": true
+    },
+    "node_modules/@types/node": {
+      "version": "15.3.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.3.0.tgz",
+      "integrity": "sha512-8/bnjSZD86ZfpBsDlCIkNXIvm+h6wi9g7IqL+kmFkQ+Wvu3JrasgLElfiPgoo8V8vVfnEi0QVS12gbl94h9YsQ==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/ast": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.0.tgz",
+      "integrity": "sha512-kX2W49LWsbthrmIRMbQZuQDhGtjyqXfEmmHyEi4XWnSZtPmxY0+3anPIzsnRb45VH/J55zlOfWvZuY47aJZTJg==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/helper-numbers": "1.11.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.0"
+      }
+    },
+    "node_modules/@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.0.tgz",
+      "integrity": "sha512-Q/aVYs/VnPDVYvsCBL/gSgwmfjeCb4LW8+TMrO3cSzJImgv8lxxEPM2JA5jMrivE7LSz3V+PFqtMbls3m1exDA==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/helper-api-error": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.0.tgz",
+      "integrity": "sha512-baT/va95eXiXb2QflSx95QGT5ClzWpGaa8L7JnJbgzoYeaA27FCvuBXU758l+KXWRndEmUXjP0Q5fibhavIn8w==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/helper-buffer": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.0.tgz",
+      "integrity": "sha512-u9HPBEl4DS+vA8qLQdEQ6N/eJQ7gT7aNvMIo8AAWvAl/xMrcOSiI2M0MAnMCy3jIFke7bEee/JwdX1nUpCtdyA==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/helper-numbers": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.0.tgz",
+      "integrity": "sha512-DhRQKelIj01s5IgdsOJMKLppI+4zpmcMQ3XboFPLwCpSNH6Hqo1ritgHgD0nqHeSYqofA6aBN/NmXuGjM1jEfQ==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/floating-point-hex-parser": "1.11.0",
+        "@webassemblyjs/helper-api-error": "1.11.0",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.0.tgz",
+      "integrity": "sha512-MbmhvxXExm542tWREgSFnOVo07fDpsBJg3sIl6fSp9xuu75eGz5lz31q7wTLffwL3Za7XNRCMZy210+tnsUSEA==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/helper-wasm-section": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.0.tgz",
+      "integrity": "sha512-3Eb88hcbfY/FCukrg6i3EH8H2UsD7x8Vy47iVJrP967A9JGqgBVL9aH71SETPx1JrGsOUVLo0c7vMCN22ytJew==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.0",
+        "@webassemblyjs/helper-buffer": "1.11.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.0",
+        "@webassemblyjs/wasm-gen": "1.11.0"
+      }
+    },
+    "node_modules/@webassemblyjs/ieee754": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.0.tgz",
+      "integrity": "sha512-KXzOqpcYQwAfeQ6WbF6HXo+0udBNmw0iXDmEK5sFlmQdmND+tr773Ti8/5T/M6Tl/413ArSJErATd8In3B+WBA==",
+      "dev": true,
+      "dependencies": {
+        "@xtuc/ieee754": "^1.2.0"
+      }
+    },
+    "node_modules/@webassemblyjs/leb128": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.0.tgz",
+      "integrity": "sha512-aqbsHa1mSQAbeeNcl38un6qVY++hh8OpCOzxhixSYgbRfNWcxJNJQwe2rezK9XEcssJbbWIkblaJRwGMS9zp+g==",
+      "dev": true,
+      "dependencies": {
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/utf8": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.0.tgz",
+      "integrity": "sha512-A/lclGxH6SpSLSyFowMzO/+aDEPU4hvEiooCMXQPcQFPPJaYcPQNKGOCLUySJsYJ4trbpr+Fs08n4jelkVTGVw==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/wasm-edit": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.0.tgz",
+      "integrity": "sha512-JHQ0damXy0G6J9ucyKVXO2j08JVJ2ntkdJlq1UTiUrIgfGMmA7Ik5VdC/L8hBK46kVJgujkBIoMtT8yVr+yVOQ==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.0",
+        "@webassemblyjs/helper-buffer": "1.11.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.0",
+        "@webassemblyjs/helper-wasm-section": "1.11.0",
+        "@webassemblyjs/wasm-gen": "1.11.0",
+        "@webassemblyjs/wasm-opt": "1.11.0",
+        "@webassemblyjs/wasm-parser": "1.11.0",
+        "@webassemblyjs/wast-printer": "1.11.0"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-gen": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.0.tgz",
+      "integrity": "sha512-BEUv1aj0WptCZ9kIS30th5ILASUnAPEvE3tVMTrItnZRT9tXCLW2LEXT8ezLw59rqPP9klh9LPmpU+WmRQmCPQ==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.0",
+        "@webassemblyjs/ieee754": "1.11.0",
+        "@webassemblyjs/leb128": "1.11.0",
+        "@webassemblyjs/utf8": "1.11.0"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-opt": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.0.tgz",
+      "integrity": "sha512-tHUSP5F4ywyh3hZ0+fDQuWxKx3mJiPeFufg+9gwTpYp324mPCQgnuVKwzLTZVqj0duRDovnPaZqDwoyhIO8kYg==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.0",
+        "@webassemblyjs/helper-buffer": "1.11.0",
+        "@webassemblyjs/wasm-gen": "1.11.0",
+        "@webassemblyjs/wasm-parser": "1.11.0"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-parser": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.0.tgz",
+      "integrity": "sha512-6L285Sgu9gphrcpDXINvm0M9BskznnzJTE7gYkjDbxET28shDqp27wpruyx3C2S/dvEwiigBwLA1cz7lNUi0kw==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.0",
+        "@webassemblyjs/helper-api-error": "1.11.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.0",
+        "@webassemblyjs/ieee754": "1.11.0",
+        "@webassemblyjs/leb128": "1.11.0",
+        "@webassemblyjs/utf8": "1.11.0"
+      }
+    },
+    "node_modules/@webassemblyjs/wast-printer": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.0.tgz",
+      "integrity": "sha512-Fg5OX46pRdTgB7rKIUojkh9vXaVN6sGYCnEiJN1GYkb0RPwShZXp6KTDqmoMdQPKhcroOXh3fEzmkWmCYaKYhQ==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.0",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webpack-cli/configtest": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.3.tgz",
+      "integrity": "sha512-WQs0ep98FXX2XBAfQpRbY0Ma6ADw8JR6xoIkaIiJIzClGOMqVRvPCWqndTxf28DgFopWan0EKtHtg/5W1h0Zkw==",
+      "dev": true,
+      "peerDependencies": {
+        "webpack": "4.x.x || 5.x.x",
+        "webpack-cli": "4.x.x"
+      }
+    },
+    "node_modules/@webpack-cli/info": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.2.4.tgz",
+      "integrity": "sha512-ogE2T4+pLhTTPS/8MM3IjHn0IYplKM4HbVNMCWA9N4NrdPzunwenpCsqKEXyejMfRu6K8mhauIPYf8ZxWG5O6g==",
+      "dev": true,
+      "dependencies": {
+        "envinfo": "^7.7.3"
+      },
+      "peerDependencies": {
+        "webpack-cli": "4.x.x"
+      }
+    },
+    "node_modules/@webpack-cli/serve": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.4.0.tgz",
+      "integrity": "sha512-xgT/HqJ+uLWGX+Mzufusl3cgjAcnqYYskaB7o0vRcwOEfuu6hMzSILQpnIzFMGsTaeaX4Nnekl+6fadLbl1/Vg==",
+      "dev": true,
+      "peerDependencies": {
+        "webpack-cli": "4.x.x"
+      },
+      "peerDependenciesMeta": {
+        "webpack-dev-server": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@xtuc/ieee754": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+      "dev": true
+    },
+    "node_modules/@xtuc/long": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+      "dev": true
+    },
+    "node_modules/acorn": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-jsx": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz",
+      "integrity": "sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==",
+      "dev": true,
+      "peerDependencies": {
+        "acorn": "^6.0.0 || ^7.0.0"
+      }
+    },
+    "node_modules/ajv": {
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
+      "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ajv-formats": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
+      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ajv": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/ajv-keywords": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3"
+      },
+      "peerDependencies": {
+        "ajv": "^8.8.2"
+      }
+    },
+    "node_modules/ajv/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
+    },
+    "node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/array-find": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-find/-/array-find-1.0.0.tgz",
+      "integrity": "sha1-bI4obRHtdoMn+OYuzuhzU8o+eLg=",
+      "dev": true
+    },
+    "node_modules/array-includes": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.1.tgz",
+      "integrity": "sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0",
+        "is-string": "^1.0.5"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/es-abstract": {
+      "version": "1.17.6",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
+      "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
+      "dev": true,
+      "dependencies": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.0",
+        "is-regex": "^1.1.0",
+        "object-inspect": "^1.7.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.0",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/is-callable": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
+      "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/is-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
+      "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/is-symbol": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
+      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-includes/node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/array.prototype.flat": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz",
+      "integrity": "sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flat/node_modules/es-abstract": {
+      "version": "1.17.6",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
+      "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
+      "dev": true,
+      "dependencies": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.0",
+        "is-regex": "^1.1.0",
+        "object-inspect": "^1.7.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.0",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flat/node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flat/node_modules/is-callable": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
+      "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flat/node_modules/is-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
+      "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flat/node_modules/is-symbol": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
+      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flat/node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/asn1.js": {
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
+      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "node_modules/assert": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
+      "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
+      "dev": true,
+      "dependencies": {
+        "util": "0.10.3"
+      }
+    },
+    "node_modules/assert/node_modules/inherits": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+      "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+      "dev": true
+    },
+    "node_modules/assert/node_modules/util": {
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+      "dev": true,
+      "dependencies": {
+        "inherits": "2.0.1"
+      }
+    },
+    "node_modules/astral-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
+      "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/babel-eslint": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.1.0.tgz",
+      "integrity": "sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==",
+      "deprecated": "babel-eslint is now @babel/eslint-parser. This package will no longer receive updates.",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "@babel/parser": "^7.7.0",
+        "@babel/traverse": "^7.7.0",
+        "@babel/types": "^7.7.0",
+        "eslint-visitor-keys": "^1.0.0",
+        "resolve": "^1.12.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "peerDependencies": {
+        "eslint": ">= 4.12.1"
+      }
+    },
+    "node_modules/babel-eslint/node_modules/@babel/code-frame": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+      "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/highlight": "^7.10.4"
+      }
+    },
+    "node_modules/babel-eslint/node_modules/@babel/generator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.4.tgz",
+      "integrity": "sha512-toLIHUIAgcQygFZRAQcsLQV3CBuX6yOIru1kJk/qqqvcRmZrYe6WavZTSG+bB8MxhnL9YPf+pKQfuiP161q7ng==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.10.4",
+        "jsesc": "^2.5.1",
+        "lodash": "^4.17.13",
+        "source-map": "^0.5.0"
+      }
+    },
+    "node_modules/babel-eslint/node_modules/@babel/helper-function-name": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
+      "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-get-function-arity": "^7.10.4",
+        "@babel/template": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/babel-eslint/node_modules/@babel/helper-get-function-arity": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
+      "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/babel-eslint/node_modules/@babel/helper-split-export-declaration": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.4.tgz",
+      "integrity": "sha512-pySBTeoUff56fL5CBU2hWm9TesA4r/rOkI9DyJLvvgz09MB9YtfIYe3iBriVaYNaPe+Alua0vBIOVOLs2buWhg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/babel-eslint/node_modules/@babel/highlight": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
+      "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.10.4",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      }
+    },
+    "node_modules/babel-eslint/node_modules/@babel/parser": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.4.tgz",
+      "integrity": "sha512-8jHII4hf+YVDsskTF6WuMB3X4Eh+PsUkC2ljq22so5rHvH+T8BzyL94VOdyFLNR8tBSVXOTbNHOKpR4TfRxVtA==",
+      "dev": true,
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/babel-eslint/node_modules/@babel/template": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+      "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.10.4",
+        "@babel/parser": "^7.10.4",
+        "@babel/types": "^7.10.4"
+      }
+    },
+    "node_modules/babel-eslint/node_modules/@babel/traverse": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.4.tgz",
+      "integrity": "sha512-aSy7p5THgSYm4YyxNGz6jZpXf+Ok40QF3aA2LyIONkDHpAcJzDUqlCKXv6peqYUs2gmic849C/t2HKw2a2K20Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.10.4",
+        "@babel/generator": "^7.10.4",
+        "@babel/helper-function-name": "^7.10.4",
+        "@babel/helper-split-export-declaration": "^7.10.4",
+        "@babel/parser": "^7.10.4",
+        "@babel/types": "^7.10.4",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0",
+        "lodash": "^4.17.13"
+      }
+    },
+    "node_modules/babel-eslint/node_modules/@babel/types": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.4.tgz",
+      "integrity": "sha512-UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.10.4",
+        "lodash": "^4.17.13",
+        "to-fast-properties": "^2.0.0"
+      }
+    },
+    "node_modules/babel-eslint/node_modules/debug": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/babel-eslint/node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "node_modules/babel-eslint/node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
+    },
+    "node_modules/babel-eslint/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/babel-eslint/node_modules/resolve": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+      "dev": true,
+      "dependencies": {
+        "path-parse": "^1.0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "dev": true
+    },
+    "node_modules/base64-js": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
+      "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==",
+      "dev": true
+    },
+    "node_modules/bn.js": {
+      "version": "4.11.8",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
+      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
+      "dev": true
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/brorand": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
+      "dev": true
+    },
+    "node_modules/browserify-aes": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+      "dev": true,
+      "dependencies": {
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/browserify-cipher": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+      "dev": true,
+      "dependencies": {
+        "browserify-aes": "^1.0.4",
+        "browserify-des": "^1.0.0",
+        "evp_bytestokey": "^1.0.0"
+      }
+    },
+    "node_modules/browserify-des": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+      "dev": true,
+      "dependencies": {
+        "cipher-base": "^1.0.1",
+        "des.js": "^1.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/browserify-rsa": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "randombytes": "^2.0.1"
+      }
+    },
+    "node_modules/browserify-sign": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
+      "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.1.1",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.2",
+        "elliptic": "^6.0.0",
+        "inherits": "^2.0.1",
+        "parse-asn1": "^5.0.0"
+      }
+    },
+    "node_modules/browserify-zlib": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+      "dev": true,
+      "dependencies": {
+        "pako": "~1.0.5"
+      }
+    },
+    "node_modules/buffer": {
+      "version": "4.9.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
+      "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
+      "deprecated": "This version of 'buffer' is out-of-date. You must update to v4.9.2 or newer",
+      "dev": true,
+      "dependencies": {
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4",
+        "isarray": "^1.0.0"
+      }
+    },
+    "node_modules/buffer-from": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
+      "dev": true
+    },
+    "node_modules/buffer-xor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
+      "dev": true
+    },
+    "node_modules/builtin-status-codes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
+      "dev": true
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+      "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/chrome-trace-event": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
+      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
+    "node_modules/cipher-base": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/clone-deep": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.4",
+        "kind-of": "^6.0.2",
+        "shallow-clone": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "1.9.2",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.2.tgz",
+      "integrity": "sha512-3NUJZdhMhcdPn8vJ9v2UQJoH0qqoGUkYTgFEPZaPjEtwmmKUfNV46zZmgB2M5M4DCEQHMaCfWHCxiBflLm04Tg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.1"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.1.tgz",
+      "integrity": "sha1-SxQVMEz1ACjqgWQ2Q72C6gWANok=",
+      "dev": true
+    },
+    "node_modules/colorette": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
+      "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
+      "dev": true
+    },
+    "node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "node_modules/confusing-browser-globals": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.9.tgz",
+      "integrity": "sha512-KbS1Y0jMtyPgIxjO7ZzMAuUpAKMt1SzCL9fsrKsX6b0zJPTaT0SiSPmewwVZg9UAO83HVIlEhZF84LIjZ0lmAw==",
+      "dev": true
+    },
+    "node_modules/console-browserify": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
+      "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
+      "dev": true,
+      "dependencies": {
+        "date-now": "^0.1.4"
+      }
+    },
+    "node_modules/constants-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
+      "dev": true
+    },
+    "node_modules/contains-path": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz",
+      "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "dev": true
+    },
+    "node_modules/create-ecdh": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
+      "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "elliptic": "^6.0.0"
+      }
+    },
+    "node_modules/create-hash": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "dev": true,
+      "dependencies": {
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
+      }
+    },
+    "node_modules/create-hmac": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+      "dev": true,
+      "dependencies": {
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "node_modules/cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "dev": true,
+      "dependencies": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      },
+      "engines": {
+        "node": ">=4.8"
+      }
+    },
+    "node_modules/crypto-browserify": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+      "dev": true,
+      "dependencies": {
+        "browserify-cipher": "^1.0.0",
+        "browserify-sign": "^4.0.0",
+        "create-ecdh": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.0",
+        "diffie-hellman": "^5.0.0",
+        "inherits": "^2.0.1",
+        "pbkdf2": "^3.0.3",
+        "public-encrypt": "^4.0.0",
+        "randombytes": "^2.0.0",
+        "randomfill": "^1.0.3"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/date-now": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
+      "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=",
+      "dev": true
+    },
+    "node_modules/deep-is": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+      "dev": true
+    },
+    "node_modules/define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "dev": true,
+      "dependencies": {
+        "object-keys": "^1.0.12"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/des.js": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
+      "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "node_modules/diffie-hellman": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "miller-rabin": "^4.0.0",
+        "randombytes": "^2.0.0"
+      }
+    },
+    "node_modules/doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/dom-serializer": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
+      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "entities": "^2.0.0"
+      }
+    },
+    "node_modules/domain-browser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
+      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4",
+        "npm": ">=1.2"
+      }
+    },
+    "node_modules/domelementtype": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz",
+      "integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==",
+      "dev": true
+    },
+    "node_modules/domhandler": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-3.0.0.tgz",
+      "integrity": "sha512-eKLdI5v9m67kbXQbJSNn1zjh0SDzvzWVWtX+qEI3eMjZw8daH9k8rlj1FZY9memPwjiskQFbe7vHVVJIAqoEhw==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/domutils": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.1.0.tgz",
+      "integrity": "sha512-CD9M0Dm1iaHfQ1R/TI+z3/JWp/pgub0j4jIQKH89ARR4ATAV2nbaOQS5XxU9maJP5jHaPdDDQSEHuE2UmpUTKg==",
+      "dev": true,
+      "dependencies": {
+        "dom-serializer": "^0.2.1",
+        "domelementtype": "^2.0.1",
+        "domhandler": "^3.0.0"
+      }
+    },
+    "node_modules/elliptic": {
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "brorand": "^1.1.0",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.1",
+        "inherits": "^2.0.4",
+        "minimalistic-assert": "^1.0.1",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "node_modules/elliptic/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
+    "node_modules/elliptic/node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/enhanced-resolve": {
+      "version": "5.8.2",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz",
+      "integrity": "sha512-F27oB3WuHDzvR2DOGNTaYy0D5o0cnrv8TeI482VM4kYgQd/FT9lUQwuNsJ0oOHtBUq7eiW5ytqzp7nBFknL+GA==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.4",
+        "tapable": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/enhanced-resolve/node_modules/graceful-fs": {
+      "version": "4.2.6",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
+      "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==",
+      "dev": true
+    },
+    "node_modules/entities": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz",
+      "integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==",
+      "dev": true
+    },
+    "node_modules/envinfo": {
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz",
+      "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==",
+      "dev": true,
+      "bin": {
+        "envinfo": "dist/cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "node_modules/es-module-lexer": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.4.1.tgz",
+      "integrity": "sha512-ooYciCUtfw6/d2w56UVeqHPcoCFAiJdz5XOkYpv/Txl1HMUozpXjz/2RIQgqwKdXNDPSF1W7mJCFse3G+HDyAA==",
+      "dev": true
+    },
+    "node_modules/esbuild": {
+      "version": "0.12.29",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.12.29.tgz",
+      "integrity": "sha512-w/XuoBCSwepyiZtIRsKsetiLDUVGPVw1E/R3VTFSecIy8UR7Cq3SOtwKHJMFoVqqVG36aGkzh4e8BvpO1Fdc7g==",
+      "dev": true,
+      "hasInstallScript": true,
+      "bin": {
+        "esbuild": "bin/esbuild"
+      }
+    },
+    "node_modules/esbuild-loader": {
+      "version": "2.15.1",
+      "resolved": "https://registry.npmjs.org/esbuild-loader/-/esbuild-loader-2.15.1.tgz",
+      "integrity": "sha512-JRBL6uTeWplMbylNBt9gxLKMjD8wKnqGq786QV/cm/nPBSNA9/kC7/vNwCXTDPfYqHoWsjyfH7ub9ekN0kdAYQ==",
+      "dev": true,
+      "dependencies": {
+        "esbuild": "^0.12.21",
+        "joycon": "^3.0.1",
+        "json5": "^2.2.0",
+        "loader-utils": "^2.0.0",
+        "tapable": "^2.2.0",
+        "type-fest": "^1.4.0",
+        "webpack-sources": "^2.2.0"
+      },
+      "funding": {
+        "url": "https://github.com/privatenumber/esbuild-loader?sponsor=1"
+      },
+      "peerDependencies": {
+        "webpack": "^4.40.0 || ^5.0.0"
+      }
+    },
+    "node_modules/esbuild-loader/node_modules/big.js": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/esbuild-loader/node_modules/emojis-list": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/esbuild-loader/node_modules/json5": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+      "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/esbuild-loader/node_modules/loader-utils": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+      "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=8.9.0"
+      }
+    },
+    "node_modules/esbuild-loader/node_modules/source-list-map": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
+      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
+      "dev": true
+    },
+    "node_modules/esbuild-loader/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/esbuild-loader/node_modules/type-fest": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz",
+      "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/esbuild-loader/node_modules/webpack-sources": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz",
+      "integrity": "sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==",
+      "dev": true,
+      "dependencies": {
+        "source-list-map": "^2.0.1",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/eslint": {
+      "version": "6.8.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz",
+      "integrity": "sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "ajv": "^6.10.0",
+        "chalk": "^2.1.0",
+        "cross-spawn": "^6.0.5",
+        "debug": "^4.0.1",
+        "doctrine": "^3.0.0",
+        "eslint-scope": "^5.0.0",
+        "eslint-utils": "^1.4.3",
+        "eslint-visitor-keys": "^1.1.0",
+        "espree": "^6.1.2",
+        "esquery": "^1.0.1",
+        "esutils": "^2.0.2",
+        "file-entry-cache": "^5.0.1",
+        "functional-red-black-tree": "^1.0.1",
+        "glob-parent": "^5.0.0",
+        "globals": "^12.1.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "inquirer": "^7.0.0",
+        "is-glob": "^4.0.0",
+        "js-yaml": "^3.13.1",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.3.0",
+        "lodash": "^4.17.14",
+        "minimatch": "^3.0.4",
+        "mkdirp": "^0.5.1",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.8.3",
+        "progress": "^2.0.0",
+        "regexpp": "^2.0.1",
+        "semver": "^6.1.2",
+        "strip-ansi": "^5.2.0",
+        "strip-json-comments": "^3.0.1",
+        "table": "^5.2.3",
+        "text-table": "^0.2.0",
+        "v8-compile-cache": "^2.0.3"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-config-airbnb-base": {
+      "version": "14.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.2.0.tgz",
+      "integrity": "sha512-Snswd5oC6nJaevs3nZoLSTvGJBvzTfnBqOIArkf3cbyTyq9UD79wOk8s+RiL6bhca0p/eRO6veczhf6A/7Jy8Q==",
+      "dev": true,
+      "dependencies": {
+        "confusing-browser-globals": "^1.0.9",
+        "object.assign": "^4.1.0",
+        "object.entries": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 6"
+      },
+      "peerDependencies": {
+        "eslint": "^5.16.0 || ^6.8.0 || ^7.2.0",
+        "eslint-plugin-import": "^2.21.2"
+      }
+    },
+    "node_modules/eslint-import-resolver-node": {
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz",
+      "integrity": "sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^2.6.9",
+        "resolve": "^1.13.1"
+      }
+    },
+    "node_modules/eslint-import-resolver-node/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/eslint-import-resolver-node/node_modules/resolve": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+      "dev": true,
+      "dependencies": {
+        "path-parse": "^1.0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/eslint-import-resolver-webpack": {
+      "version": "0.12.2",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.12.2.tgz",
+      "integrity": "sha512-7Jnm4YAoNNkvqPaZkKdIHsKGmv8/uNnYC5QsXkiSodvX4XEEfH2AKOna98FK52fCDXm3q4HzuX+7pRMKkJ64EQ==",
+      "dev": true,
+      "dependencies": {
+        "array-find": "^1.0.0",
+        "debug": "^2.6.9",
+        "enhanced-resolve": "^0.9.1",
+        "find-root": "^1.1.0",
+        "has": "^1.0.3",
+        "interpret": "^1.2.0",
+        "lodash": "^4.17.15",
+        "node-libs-browser": "^1.0.0 || ^2.0.0",
+        "resolve": "^1.13.1",
+        "semver": "^5.7.1"
+      },
+      "peerDependencies": {
+        "eslint-plugin-import": ">=1.4.0",
+        "webpack": ">=1.11.0"
+      }
+    },
+    "node_modules/eslint-import-resolver-webpack/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/eslint-import-resolver-webpack/node_modules/enhanced-resolve": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz",
+      "integrity": "sha1-TW5omzcl+GCQknzMhs2fFjW4ni4=",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "memory-fs": "^0.2.0",
+        "tapable": "^0.1.8"
+      },
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/eslint-import-resolver-webpack/node_modules/interpret": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
+      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/eslint-import-resolver-webpack/node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
+    },
+    "node_modules/eslint-import-resolver-webpack/node_modules/memory-fs": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz",
+      "integrity": "sha1-8rslNovBIeORwlIN6Slpyu4KApA=",
+      "dev": true
+    },
+    "node_modules/eslint-import-resolver-webpack/node_modules/resolve": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+      "dev": true,
+      "dependencies": {
+        "path-parse": "^1.0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/eslint-import-resolver-webpack/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/eslint-import-resolver-webpack/node_modules/tapable": {
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",
+      "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/eslint-module-utils": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz",
+      "integrity": "sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^2.6.9",
+        "pkg-dir": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/eslint-module-utils/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-html": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-html/-/eslint-plugin-html-6.0.2.tgz",
+      "integrity": "sha512-Ik/z32UteKLo8GEfwNqVKcJ/WOz/be4h8N5mbMmxxnZ+9aL9XczOXQFz/bGu+nAGVoRg8CflldxJhONFpqlrxw==",
+      "dev": true,
+      "dependencies": {
+        "htmlparser2": "^4.1.0"
+      }
+    },
+    "node_modules/eslint-plugin-import": {
+      "version": "2.22.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.0.tgz",
+      "integrity": "sha512-66Fpf1Ln6aIS5Gr/55ts19eUuoDhAbZgnr6UxK5hbDx6l/QgQgx61AePq+BV4PP2uXQFClgMVzep5zZ94qqsxg==",
+      "dev": true,
+      "dependencies": {
+        "array-includes": "^3.1.1",
+        "array.prototype.flat": "^1.2.3",
+        "contains-path": "^0.1.0",
+        "debug": "^2.6.9",
+        "doctrine": "1.5.0",
+        "eslint-import-resolver-node": "^0.3.3",
+        "eslint-module-utils": "^2.6.0",
+        "has": "^1.0.3",
+        "minimatch": "^3.0.4",
+        "object.values": "^1.1.1",
+        "read-pkg-up": "^2.0.0",
+        "resolve": "^1.17.0",
+        "tsconfig-paths": "^3.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/doctrine": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
+      "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2",
+        "isarray": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/resolve": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+      "dev": true,
+      "dependencies": {
+        "path-parse": "^1.0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/eslint-scope/node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/eslint-scope/node_modules/esrecurse/node_modules/estraverse": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/eslint-utils": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
+      "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/eslint-visitor-keys": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/eslint/node_modules/@babel/code-frame": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+      "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/highlight": "^7.10.4"
+      }
+    },
+    "node_modules/eslint/node_modules/@babel/highlight": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
+      "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.10.4",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      }
+    },
+    "node_modules/eslint/node_modules/ajv": {
+      "version": "6.12.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/eslint/node_modules/ansi-escapes": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
+      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.11.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/ansi-escapes/node_modules/type-fest": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
+      "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/ansi-regex": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/ansi-styles": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+      "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+      "dev": true,
+      "dependencies": {
+        "@types/color-name": "^1.1.1",
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/eslint/node_modules/chardet": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
+      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
+      "dev": true
+    },
+    "node_modules/eslint/node_modules/cli-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+      "dev": true,
+      "dependencies": {
+        "restore-cursor": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/cli-width": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
+      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/eslint/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/eslint/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/eslint/node_modules/debug": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint/node_modules/eslint-scope": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.0.tgz",
+      "integrity": "sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/eslint/node_modules/external-editor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
+      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
+      "dev": true,
+      "dependencies": {
+        "chardet": "^0.7.0",
+        "iconv-lite": "^0.4.24",
+        "tmp": "^0.0.33"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/eslint/node_modules/figures": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+      "dev": true,
+      "dependencies": {
+        "escape-string-regexp": "^1.0.5"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/glob-parent": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/eslint/node_modules/glob-parent/node_modules/is-glob": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eslint/node_modules/globals": {
+      "version": "12.4.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
+      "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.8.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dev": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eslint/node_modules/inquirer": {
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.0.tgz",
+      "integrity": "sha512-K+LZp6L/6eE5swqIcVXrxl21aGDU4S50gKH0/d96OMQnSBCyGyZl/oZhbkVmdp5sBoINHd4xZvFSARh2dk6DWA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.1.0",
+        "cli-cursor": "^3.1.0",
+        "cli-width": "^3.0.0",
+        "external-editor": "^3.0.3",
+        "figures": "^3.0.0",
+        "lodash": "^4.17.15",
+        "mute-stream": "0.0.8",
+        "run-async": "^2.4.0",
+        "rxjs": "^6.6.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "through": "^2.3.6"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/eslint/node_modules/inquirer/node_modules/chalk": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/eslint/node_modules/inquirer/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "node_modules/eslint/node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
+    },
+    "node_modules/eslint/node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/eslint/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/eslint/node_modules/mute-stream": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
+      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
+      "dev": true
+    },
+    "node_modules/eslint/node_modules/onetime": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz",
+      "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==",
+      "dev": true,
+      "dependencies": {
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/eslint/node_modules/restore-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "dev": true,
+      "dependencies": {
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/run-async": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
+      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/eslint/node_modules/rxjs": {
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.0.tgz",
+      "integrity": "sha512-3HMA8z/Oz61DUHe+SdOiQyzIf4tOx5oQHmMir7IZEu6TMqCLHT4LRcmNaUS0NwOz8VLvmmBduMsoaUvMaIiqzg==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
+    "node_modules/eslint/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/eslint/node_modules/string-width": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/string-width/node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/eslint/node_modules/strip-ansi/node_modules/ansi-regex": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/eslint/node_modules/supports-color": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+      "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/v8-compile-cache": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz",
+      "integrity": "sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==",
+      "dev": true
+    },
+    "node_modules/espree": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz",
+      "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^7.1.1",
+        "acorn-jsx": "^5.2.0",
+        "eslint-visitor-keys": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/esquery": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz",
+      "integrity": "sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/esquery/node_modules/estraverse": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.1.0.tgz",
+      "integrity": "sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esrecurse": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
+      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/esutils": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/events": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.x"
+      }
+    },
+    "node_modules/evp_bytestokey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "dev": true,
+      "dependencies": {
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/execa": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz",
+      "integrity": "sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
+        "strip-final-newline": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/execa/node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/execa/node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/execa/node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/execa/node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/execa/node_modules/signal-exit": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
+      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
+      "dev": true
+    },
+    "node_modules/execa/node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
+      "dev": true
+    },
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "dev": true
+    },
+    "node_modules/fastest-levenshtein": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
+      "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==",
+      "dev": true
+    },
+    "node_modules/file-entry-cache": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
+      "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
+      "dev": true,
+      "dependencies": {
+        "flat-cache": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/find-root": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
+      "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==",
+      "dev": true
+    },
+    "node_modules/find-up": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/flat-cache": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
+      "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
+      "dev": true,
+      "dependencies": {
+        "flatted": "^2.0.0",
+        "rimraf": "2.6.3",
+        "write": "1.0.3"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/flat-cache/node_modules/glob": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/flat-cache/node_modules/rimraf": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/flatted": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz",
+      "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==",
+      "dev": true
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "node_modules/functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+      "dev": true
+    },
+    "node_modules/get-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/glob-to-regexp": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
+      "dev": true
+    },
+    "node_modules/globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
+      "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/hash-base": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
+      "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/hash.js": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
+      }
+    },
+    "node_modules/hmac-drbg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+      "dev": true,
+      "dependencies": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "node_modules/hosted-git-info": {
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+      "dev": true
+    },
+    "node_modules/htmlparser2": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-4.1.0.tgz",
+      "integrity": "sha512-4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^3.0.0",
+        "domutils": "^2.0.0",
+        "entities": "^2.0.0"
+      }
+    },
+    "node_modules/https-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
+      "dev": true
+    },
+    "node_modules/human-signals": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.17.0"
+      }
+    },
+    "node_modules/ieee754": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz",
+      "integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==",
+      "dev": true
+    },
+    "node_modules/ignore": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/import-fresh": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
+      "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==",
+      "dev": true,
+      "dependencies": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/import-fresh/node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/import-local": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
+      "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==",
+      "dev": true,
+      "dependencies": {
+        "pkg-dir": "^4.2.0",
+        "resolve-cwd": "^3.0.0"
+      },
+      "bin": {
+        "import-local-fixture": "fixtures/cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/import-local/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/import-local/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/import-local/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/import-local/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/import-local/node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/import-local/node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/indexof": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
+      "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
+      "dev": true
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "dev": true
+    },
+    "node_modules/interpret": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz",
+      "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+      "dev": true
+    },
+    "node_modules/is-core-module": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz",
+      "integrity": "sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==",
+      "dev": true,
+      "dependencies": {
+        "has": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-date-object": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
+      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz",
+      "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
+      "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-string": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz",
+      "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
+    "node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/jest-worker": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
+      "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/jest-worker/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-worker/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/joycon": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/joycon/-/joycon-3.0.1.tgz",
+      "integrity": "sha512-SJcJNBg32dGgxhPtM0wQqxqV0ax9k/9TaUskGDSJkSFSQOEWWvQ3zzWdGQRIUry2j1zA5+ReH13t0Mf3StuVZA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/jquery": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
+      "integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg=="
+    },
+    "node_modules/jquery-migrate": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/jquery-migrate/-/jquery-migrate-3.1.0.tgz",
+      "integrity": "sha512-u/MtE1ST2pCr3rCyouJG2xMiw/k3OzLNeRKprjKTeHUezCGr0DyEgeXFdqFLmQfxfR5EsVu+mGo/sCcYdiYcIQ==",
+      "peerDependencies": {
+        "jquery": ">=3 <4"
+      }
+    },
+    "node_modules/jquery.browser": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/jquery.browser/-/jquery.browser-0.1.0.tgz",
+      "integrity": "sha1-nHKmCV/SgUtER26o9xZne3Kmors=",
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/js-yaml": {
+      "version": "3.14.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
+      "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/jsesc": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.1.tgz",
+      "integrity": "sha1-5CGiqOINawgZ3yiQj3glJrlt0f4=",
+      "dev": true,
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+      "dev": true
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+      "dev": true
+    },
+    "node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/load-json-file": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+      "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "strip-bom": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/load-json-file/node_modules/pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/loader-runner": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz",
+      "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.11.5"
+      }
+    },
+    "node_modules/locate-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^2.0.0",
+        "path-exists": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/locate-path/node_modules/path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/md5.js": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz",
+      "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=",
+      "dev": true,
+      "dependencies": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true
+    },
+    "node_modules/miller-rabin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
+      },
+      "bin": {
+        "miller-rabin": "bin/miller-rabin"
+      }
+    },
+    "node_modules/mime-db": {
+      "version": "1.47.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz",
+      "integrity": "sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.30",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.30.tgz",
+      "integrity": "sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg==",
+      "dev": true,
+      "dependencies": {
+        "mime-db": "1.47.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mini-css-extract-plugin": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.6.1.tgz",
+      "integrity": "sha512-wd+SD57/K6DiV7jIR34P+s3uckTRuQvx0tKPcvjFlrEylk6P4mQ2KSWk1hblj1Kxaqok7LogKOieygXqBczNlg==",
+      "dev": true,
+      "dependencies": {
+        "schema-utils": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
+      "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.9",
+        "ajv": "^8.8.0",
+        "ajv-formats": "^2.1.1",
+        "ajv-keywords": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+      "dev": true
+    },
+    "node_modules/minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
+      "dev": true
+    },
+    "node_modules/minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "dev": true
+    },
+    "node_modules/mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+      "dev": true
+    },
+    "node_modules/neo-async": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+      "dev": true
+    },
+    "node_modules/nice-try": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.4.tgz",
+      "integrity": "sha512-2NpiFHqC87y/zFke0fC0spBXL3bBsoh/p5H1EFhshxjCR5+0g2d6BiXbUFz9v1sAcxsk2htp2eQnNIci2dIYcA==",
+      "dev": true
+    },
+    "node_modules/node-libs-browser": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz",
+      "integrity": "sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==",
+      "dev": true,
+      "dependencies": {
+        "assert": "^1.1.1",
+        "browserify-zlib": "^0.2.0",
+        "buffer": "^4.3.0",
+        "console-browserify": "^1.1.0",
+        "constants-browserify": "^1.0.0",
+        "crypto-browserify": "^3.11.0",
+        "domain-browser": "^1.1.1",
+        "events": "^1.0.0",
+        "https-browserify": "^1.0.0",
+        "os-browserify": "^0.3.0",
+        "path-browserify": "0.0.0",
+        "process": "^0.11.10",
+        "punycode": "^1.2.4",
+        "querystring-es3": "^0.2.0",
+        "readable-stream": "^2.3.3",
+        "stream-browserify": "^2.0.1",
+        "stream-http": "^2.7.2",
+        "string_decoder": "^1.0.0",
+        "timers-browserify": "^2.0.4",
+        "tty-browserify": "0.0.0",
+        "url": "^0.11.0",
+        "util": "^0.10.3",
+        "vm-browserify": "0.0.4"
+      }
+    },
+    "node_modules/node-libs-browser/node_modules/events": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
+      "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.x"
+      }
+    },
+    "node_modules/node-libs-browser/node_modules/punycode": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+      "dev": true
+    },
+    "node_modules/node-releases": {
+      "version": "1.1.72",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.72.tgz",
+      "integrity": "sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==",
+      "dev": true
+    },
+    "node_modules/normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dev": true,
+      "dependencies": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      }
+    },
+    "node_modules/normalize-package-data/node_modules/resolve": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+      "dev": true,
+      "dependencies": {
+        "path-parse": "^1.0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/npm-run-path": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/npm-run-path/node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz",
+      "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-keys": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz",
+      "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.assign": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
+      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.2",
+        "function-bind": "^1.1.1",
+        "has-symbols": "^1.0.0",
+        "object-keys": "^1.0.11"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.entries": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.2.tgz",
+      "integrity": "sha512-BQdB9qKmb/HyNdMNWVr7O3+z5MUIx3aiegEIJqjMBbBf0YT9RRxTJSim4mzFqtyr7PDAHigq0N9dO0m0tRakQA==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5",
+        "has": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.entries/node_modules/es-abstract": {
+      "version": "1.17.6",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
+      "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
+      "dev": true,
+      "dependencies": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.0",
+        "is-regex": "^1.1.0",
+        "object-inspect": "^1.7.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.0",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries/node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries/node_modules/is-callable": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
+      "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries/node_modules/is-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
+      "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries/node_modules/is-symbol": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
+      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries/node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.values": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz",
+      "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.values/node_modules/es-abstract": {
+      "version": "1.17.6",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
+      "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
+      "dev": true,
+      "dependencies": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.0",
+        "is-regex": "^1.1.0",
+        "object-inspect": "^1.7.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.0",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.values/node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.values/node_modules/is-callable": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
+      "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.values/node_modules/is-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
+      "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.values/node_modules/is-symbol": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
+      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.values/node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dev": true,
+      "dependencies": {
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/optionator": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+      "dev": true,
+      "dependencies": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.6",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "word-wrap": "~1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/os-browserify": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
+      "dev": true
+    },
+    "node_modules/os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-try": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/pako": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz",
+      "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==",
+      "dev": true
+    },
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "dependencies": {
+        "callsites": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parse-asn1": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz",
+      "integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==",
+      "dev": true,
+      "dependencies": {
+        "asn1.js": "^4.0.0",
+        "browserify-aes": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.0",
+        "pbkdf2": "^3.0.3"
+      }
+    },
+    "node_modules/parse-json": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+      "dev": true,
+      "dependencies": {
+        "error-ex": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path": {
+      "version": "0.12.7",
+      "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz",
+      "integrity": "sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=",
+      "dev": true,
+      "dependencies": {
+        "process": "^0.11.1",
+        "util": "^0.10.3"
+      }
+    },
+    "node_modules/path-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
+      "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
+      "dev": true
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+      "dev": true
+    },
+    "node_modules/path-type": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
+      "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+      "dev": true,
+      "dependencies": {
+        "pify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/path-type/node_modules/pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pbkdf2": {
+      "version": "3.0.16",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.16.tgz",
+      "integrity": "sha512-y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA==",
+      "dev": true,
+      "dependencies": {
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      },
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
+    "node_modules/pkg-dir": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
+      "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
+    "node_modules/process-nextick-args": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
+      "dev": true
+    },
+    "node_modules/progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/public-encrypt": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz",
+      "integrity": "sha512-4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "parse-asn1": "^5.0.0",
+        "randombytes": "^2.0.1"
+      }
+    },
+    "node_modules/punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/querystring": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
+      "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.x"
+      }
+    },
+    "node_modules/querystring-es3": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.x"
+      }
+    },
+    "node_modules/randombytes": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz",
+      "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/randomfill": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+      "dev": true,
+      "dependencies": {
+        "randombytes": "^2.0.5",
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/read-pkg": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
+      "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+      "dev": true,
+      "dependencies": {
+        "load-json-file": "^2.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/read-pkg-up": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+      "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^2.0.0",
+        "read-pkg": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/readable-stream": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/rechoir": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz",
+      "integrity": "sha512-ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q==",
+      "dev": true,
+      "dependencies": {
+        "resolve": "^1.9.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/rechoir/node_modules/resolve": {
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
+      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+      "dev": true,
+      "dependencies": {
+        "is-core-module": "^2.2.0",
+        "path-parse": "^1.0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/regexpp": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
+      "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.5.0"
+      }
+    },
+    "node_modules/require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/resolve-cwd": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+      "dev": true,
+      "dependencies": {
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ripemd160": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "dev": true,
+      "dependencies": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
+    },
+    "node_modules/schema-utils": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
+      "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.6",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/schema-utils/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/schema-utils/node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/semver": {
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.1.tgz",
+      "integrity": "sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/serialize-javascript": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
+      "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
+      "dev": true,
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "node_modules/serialize-javascript/node_modules/randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
+      "dev": true
+    },
+    "node_modules/sha.js": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      },
+      "bin": {
+        "sha.js": "bin.js"
+      }
+    },
+    "node_modules/shallow-clone": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+      "dev": true
+    },
+    "node_modules/slice-ansi": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
+      "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.0",
+        "astral-regex": "^1.0.0",
+        "is-fullwidth-code-point": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/spdx-correct": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
+      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+      "dev": true,
+      "dependencies": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-exceptions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
+      "dev": true
+    },
+    "node_modules/spdx-expression-parse": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "dev": true,
+      "dependencies": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-license-ids": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
+      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
+      "dev": true
+    },
+    "node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "dev": true
+    },
+    "node_modules/stream-browserify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
+      "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
+      "dev": true,
+      "dependencies": {
+        "inherits": "~2.0.1",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "node_modules/stream-http": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
+      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+      "dev": true,
+      "dependencies": {
+        "builtin-status-codes": "^3.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.3.6",
+        "to-arraybuffer": "^1.0.0",
+        "xtend": "^4.0.0"
+      }
+    },
+    "node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/string.prototype.trimend": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
+      "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimend/node_modules/es-abstract": {
+      "version": "1.17.6",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
+      "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
+      "dev": true,
+      "dependencies": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.0",
+        "is-regex": "^1.1.0",
+        "object-inspect": "^1.7.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.0",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimend/node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimend/node_modules/is-callable": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
+      "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimend/node_modules/is-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
+      "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimend/node_modules/is-symbol": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
+      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimend/node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/string.prototype.trimstart": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
+      "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart/node_modules/es-abstract": {
+      "version": "1.17.6",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
+      "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
+      "dev": true,
+      "dependencies": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.0",
+        "is-regex": "^1.1.0",
+        "object-inspect": "^1.7.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.0",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart/node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart/node_modules/is-callable": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
+      "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart/node_modules/is-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
+      "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart/node_modules/is-symbol": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
+      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart/node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/strip-final-newline": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.0.tgz",
+      "integrity": "sha512-e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/table": {
+      "version": "5.4.6",
+      "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
+      "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.10.2",
+        "lodash": "^4.17.14",
+        "slice-ansi": "^2.1.0",
+        "string-width": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/table/node_modules/ajv": {
+      "version": "6.12.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/table/node_modules/ansi-regex": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/table/node_modules/emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "dev": true
+    },
+    "node_modules/table/node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
+    },
+    "node_modules/table/node_modules/string-width": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^7.0.1",
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/table/node_modules/strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tapable": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.0.tgz",
+      "integrity": "sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/terser": {
+      "version": "5.7.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.7.0.tgz",
+      "integrity": "sha512-HP5/9hp2UaZt5fYkuhNBR8YyRcT8juw8+uFbAme53iN9hblvKnLUTKkmwJG6ocWpIKf8UK4DoeWG4ty0J6S6/g==",
+      "dev": true,
+      "dependencies": {
+        "commander": "^2.20.0",
+        "source-map": "~0.7.2",
+        "source-map-support": "~0.5.19"
+      },
+      "bin": {
+        "terser": "bin/terser"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/terser-webpack-plugin": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.1.2.tgz",
+      "integrity": "sha512-6QhDaAiVHIQr5Ab3XUWZyDmrIPCHMiqJVljMF91YKyqwKkL5QHnYMkrMBy96v9Z7ev1hGhSEw1HQZc2p/s5Z8Q==",
+      "dev": true,
+      "dependencies": {
+        "jest-worker": "^26.6.2",
+        "p-limit": "^3.1.0",
+        "schema-utils": "^3.0.0",
+        "serialize-javascript": "^5.0.1",
+        "source-map": "^0.6.1",
+        "terser": "^5.7.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.1.0"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/terser/node_modules/source-map": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/terser/node_modules/source-map-support": {
+      "version": "0.5.19",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
+      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+      "dev": true,
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/terser/node_modules/source-map-support/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+      "dev": true
+    },
+    "node_modules/through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+      "dev": true
+    },
+    "node_modules/timers-browserify": {
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz",
+      "integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
+      "dev": true,
+      "dependencies": {
+        "setimmediate": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
+    "node_modules/tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "dev": true,
+      "dependencies": {
+        "os-tmpdir": "~1.0.2"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
+    "node_modules/to-arraybuffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
+      "dev": true
+    },
+    "node_modules/to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/tsconfig-paths": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz",
+      "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==",
+      "dev": true,
+      "dependencies": {
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.1",
+        "minimist": "^1.2.0",
+        "strip-bom": "^3.0.0"
+      }
+    },
+    "node_modules/tsconfig-paths/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/tslib": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
+      "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==",
+      "dev": true
+    },
+    "node_modules/tty-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
+      "dev": true
+    },
+    "node_modules/type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/uri-js": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
+      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+      "dev": true,
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/url": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+      "dev": true,
+      "dependencies": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      }
+    },
+    "node_modules/url/node_modules/punycode": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+      "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+      "dev": true
+    },
+    "node_modules/util": {
+      "version": "0.10.4",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
+      "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "2.0.3"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
+    },
+    "node_modules/v8-compile-cache": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+      "dev": true
+    },
+    "node_modules/validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
+      "dependencies": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "node_modules/vm-browserify": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
+      "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
+      "dev": true,
+      "dependencies": {
+        "indexof": "0.0.1"
+      }
+    },
+    "node_modules/watchpack": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.1.1.tgz",
+      "integrity": "sha512-Oo7LXCmc1eE1AjyuSBmtC3+Wy4HcV8PxWh2kP6fOl8yTlNS7r0K9l1ao2lrrUza7V39Y3D/BbJgY8VeSlc5JKw==",
+      "dev": true,
+      "dependencies": {
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.1.2"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/webpack": {
+      "version": "5.37.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.37.1.tgz",
+      "integrity": "sha512-btZjGy/hSjCAAVHw+cKG+L0M+rstlyxbO2C+BOTaQ5/XAnxkDrP5sVbqWhXgo4pL3X2dcOib6rqCP20Zr9PLow==",
+      "dev": true,
+      "dependencies": {
+        "@types/eslint-scope": "^3.7.0",
+        "@types/estree": "^0.0.47",
+        "@webassemblyjs/ast": "1.11.0",
+        "@webassemblyjs/wasm-edit": "1.11.0",
+        "@webassemblyjs/wasm-parser": "1.11.0",
+        "acorn": "^8.2.1",
+        "browserslist": "^4.14.5",
+        "chrome-trace-event": "^1.0.2",
+        "enhanced-resolve": "^5.8.0",
+        "es-module-lexer": "^0.4.0",
+        "eslint-scope": "^5.1.1",
+        "events": "^3.2.0",
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.2.4",
+        "json-parse-better-errors": "^1.0.2",
+        "loader-runner": "^4.2.0",
+        "mime-types": "^2.1.27",
+        "neo-async": "^2.6.2",
+        "schema-utils": "^3.0.0",
+        "tapable": "^2.1.1",
+        "terser-webpack-plugin": "^5.1.1",
+        "watchpack": "^2.0.0",
+        "webpack-sources": "^2.1.1"
+      },
+      "bin": {
+        "webpack": "bin/webpack.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependenciesMeta": {
+        "webpack-cli": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-cli": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.7.0.tgz",
+      "integrity": "sha512-7bKr9182/sGfjFm+xdZSwgQuFjgEcy0iCTIBxRUeteJ2Kr8/Wz0qNJX+jw60LU36jApt4nmMkep6+W5AKhok6g==",
+      "dev": true,
+      "dependencies": {
+        "@discoveryjs/json-ext": "^0.5.0",
+        "@webpack-cli/configtest": "^1.0.3",
+        "@webpack-cli/info": "^1.2.4",
+        "@webpack-cli/serve": "^1.4.0",
+        "colorette": "^1.2.1",
+        "commander": "^7.0.0",
+        "execa": "^5.0.0",
+        "fastest-levenshtein": "^1.0.12",
+        "import-local": "^3.0.2",
+        "interpret": "^2.2.0",
+        "rechoir": "^0.7.0",
+        "v8-compile-cache": "^2.2.0",
+        "webpack-merge": "^5.7.3"
+      },
+      "bin": {
+        "webpack-cli": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "peerDependencies": {
+        "webpack": "4.x.x || 5.x.x"
+      },
+      "peerDependenciesMeta": {
+        "@webpack-cli/generators": {
+          "optional": true
+        },
+        "@webpack-cli/migrate": {
+          "optional": true
+        },
+        "webpack-bundle-analyzer": {
+          "optional": true
+        },
+        "webpack-dev-server": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-cli/node_modules/commander": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/webpack-merge": {
+      "version": "5.7.3",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.7.3.tgz",
+      "integrity": "sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA==",
+      "dev": true,
+      "dependencies": {
+        "clone-deep": "^4.0.1",
+        "wildcard": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/webpack/node_modules/acorn": {
+      "version": "8.7.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
+      "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/webpack/node_modules/browserslist": {
+      "version": "4.16.6",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
+      "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
+      "dev": true,
+      "dependencies": {
+        "caniuse-lite": "^1.0.30001219",
+        "colorette": "^1.2.2",
+        "electron-to-chromium": "^1.3.723",
+        "escalade": "^3.1.1",
+        "node-releases": "^1.1.71"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      },
+      "engines": {
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/browserslist"
+      }
+    },
+    "node_modules/webpack/node_modules/caniuse-lite": {
+      "version": "1.0.30001228",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz",
+      "integrity": "sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A==",
+      "dev": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/browserslist"
+      }
+    },
+    "node_modules/webpack/node_modules/electron-to-chromium": {
+      "version": "1.3.732",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.732.tgz",
+      "integrity": "sha512-qKD5Pbq+QMk4nea4lMuncUMhpEiQwaJyCW7MrvissnRcBDENhVfDmAqQYRQ3X525oTzhar9Zh1cK0L2d1UKYcw==",
+      "dev": true
+    },
+    "node_modules/webpack/node_modules/graceful-fs": {
+      "version": "4.2.6",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
+      "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==",
+      "dev": true
+    },
+    "node_modules/webpack/node_modules/source-list-map": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
+      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
+      "dev": true
+    },
+    "node_modules/webpack/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack/node_modules/webpack-sources": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.2.0.tgz",
+      "integrity": "sha512-bQsA24JLwcnWGArOKUxYKhX3Mz/nK1Xf6hxullKERyktjNMC4x8koOeaDNTA2fEJ09BdWLbM/iTW0ithREUP0w==",
+      "dev": true,
+      "dependencies": {
+        "source-list-map": "^2.0.1",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/wildcard": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
+      "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==",
+      "dev": true
+    },
+    "node_modules/word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "node_modules/write": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
+      "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
+      "dev": true,
+      "dependencies": {
+        "mkdirp": "^0.5.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/xtend": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/zxcvbn": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/zxcvbn/-/zxcvbn-4.4.2.tgz",
+      "integrity": "sha1-KOwXzwl0PtyrBW3dixsGJizHPDA="
+    }
+  },
   "dependencies": {
     "@babel/helper-validator-identifier": {
       "version": "7.10.4",
@@ -224,7 +5495,8 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.3.tgz",
       "integrity": "sha512-WQs0ep98FXX2XBAfQpRbY0Ma6ADw8JR6xoIkaIiJIzClGOMqVRvPCWqndTxf28DgFopWan0EKtHtg/5W1h0Zkw==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "@webpack-cli/info": {
       "version": "1.2.4",
@@ -239,7 +5511,8 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.4.0.tgz",
       "integrity": "sha512-xgT/HqJ+uLWGX+Mzufusl3cgjAcnqYYskaB7o0vRcwOEfuu6hMzSILQpnIzFMGsTaeaX4Nnekl+6fadLbl1/Vg==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "@xtuc/ieee754": {
       "version": "1.2.0",
@@ -263,7 +5536,8 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz",
       "integrity": "sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "ajv": {
       "version": "8.11.0",
@@ -2504,7 +7778,8 @@
     "jquery-migrate": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/jquery-migrate/-/jquery-migrate-3.1.0.tgz",
-      "integrity": "sha512-u/MtE1ST2pCr3rCyouJG2xMiw/k3OzLNeRKprjKTeHUezCGr0DyEgeXFdqFLmQfxfR5EsVu+mGo/sCcYdiYcIQ=="
+      "integrity": "sha512-u/MtE1ST2pCr3rCyouJG2xMiw/k3OzLNeRKprjKTeHUezCGr0DyEgeXFdqFLmQfxfR5EsVu+mGo/sCcYdiYcIQ==",
+      "requires": {}
     },
     "jquery.browser": {
       "version": "0.1.0",
@@ -3387,7 +8662,8 @@
           "version": "3.5.2",
           "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
           "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-          "dev": true
+          "dev": true,
+          "requires": {}
         }
       }
     },
@@ -3541,6 +8817,15 @@
         "xtend": "^4.0.0"
       }
     },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
     "string.prototype.trimend": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
@@ -3685,15 +8970,6 @@
         }
       }
     },
-    "string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
     "strip-bom": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",

From 07f6d2efd4b3c0594fbf32d61ebef2064a7aefa0 Mon Sep 17 00:00:00 2001
From: jevgenijvisockij <jevgenij.visockij@gmail.com>
Date: Thu, 23 Feb 2023 09:43:17 +0200
Subject: [PATCH 0942/1030] Reverting package-lock.json

---
 admin-dev/themes/default/package-lock.json   | 11599 ++++++++++++-
 admin-dev/themes/new-theme/package-lock.json | 14466 ++++++++++++++++-
 2 files changed, 25926 insertions(+), 139 deletions(-)

diff --git a/admin-dev/themes/default/package-lock.json b/admin-dev/themes/default/package-lock.json
index 50b5e2dddaae3..abbc3faabfb0c 100644
--- a/admin-dev/themes/default/package-lock.json
+++ b/admin-dev/themes/default/package-lock.json
@@ -1,8 +1,11520 @@
 {
   "name": "default",
   "version": "1.7.5",
-  "lockfileVersion": 1,
+  "lockfileVersion": 2,
   "requires": true,
+  "packages": {
+    "": {
+      "name": "default",
+      "version": "1.7.5",
+      "license": "OSL-3.0",
+      "dependencies": {
+        "@openfonts/ubuntu-condensed_latin": "^1.44.2",
+        "open-sans-fonts": "^1.6.2",
+        "perfect-scrollbar": "^1.4.0",
+        "prestakit": "^1.2.5",
+        "vazirmatn": "32.102.0"
+      },
+      "devDependencies": {
+        "@babel/core": "^7.0.0-rc.1",
+        "@babel/preset-env": "^7.0.0-rc.1",
+        "babel-eslint": "^10.1.0",
+        "babel-loader": "^8.0.2",
+        "bourbon": "^4.3.4",
+        "clean-webpack-plugin": "^2.0.2",
+        "css-loader": "^6.7.1",
+        "csso-webpack-plugin": "^2.0.0-beta.3",
+        "eslint": "^8.18.0",
+        "eslint-config-airbnb-base": "^15.0.0",
+        "eslint-import-resolver-webpack": "^0.12.1",
+        "eslint-plugin-html": "^6.0.0",
+        "eslint-plugin-import": "^2.20.0",
+        "html-webpack-plugin": "^5.5.0",
+        "material-design-icons-iconfont": "^6.7.0",
+        "mini-css-extract-plugin": "^1.6.1",
+        "path": "^0.12.7",
+        "postcss": "^8.4.4",
+        "postcss-cssnext": "^3.1.0",
+        "postcss-loader": "^5.3.0",
+        "sass-embedded": "^1.55.0",
+        "sass-loader": "^13.0.2",
+        "style-loader": "^1.1.3",
+        "stylelint": "^14.5.3",
+        "stylelint-config-prestashop": "^1.0.5",
+        "terser-webpack-plugin": "^5.2.5",
+        "webpack": "^5.53.0",
+        "webpack-cli": "^4.7.0",
+        "webpack-font-preload-plugin": "^1.5.0",
+        "webpack-license-plugin": "^4.2.1",
+        "webpack-remove-empty-scripts": "^0.7.3"
+      }
+    },
+    "node_modules/@ampproject/remapping": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.1.2.tgz",
+      "integrity": "sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.0"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/code-frame": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
+      "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/highlight": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/compat-data": {
+      "version": "7.17.7",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.7.tgz",
+      "integrity": "sha512-p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/core": {
+      "version": "7.17.9",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.9.tgz",
+      "integrity": "sha512-5ug+SfZCpDAkVp9SFIZAzlW18rlzsOcJGaetCjkySnrXXDUw9AR8cDUm1iByTmdWM6yxX6/zycaV76w3YTF2gw==",
+      "dev": true,
+      "dependencies": {
+        "@ampproject/remapping": "^2.1.0",
+        "@babel/code-frame": "^7.16.7",
+        "@babel/generator": "^7.17.9",
+        "@babel/helper-compilation-targets": "^7.17.7",
+        "@babel/helper-module-transforms": "^7.17.7",
+        "@babel/helpers": "^7.17.9",
+        "@babel/parser": "^7.17.9",
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.17.9",
+        "@babel/types": "^7.17.0",
+        "convert-source-map": "^1.7.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.1",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/babel"
+      }
+    },
+    "node_modules/@babel/generator": {
+      "version": "7.17.9",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.9.tgz",
+      "integrity": "sha512-rAdDousTwxbIxbz5I7GEQ3lUip+xVCXooZNbsydCWs3xA7ZsYOv+CFRdzGxRX78BmQHu9B1Eso59AOZQOJDEdQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.17.0",
+        "jsesc": "^2.5.1",
+        "source-map": "^0.5.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-annotate-as-pure": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
+      "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz",
+      "integrity": "sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-explode-assignable-expression": "^7.16.7",
+        "@babel/types": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-compilation-targets": {
+      "version": "7.17.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz",
+      "integrity": "sha512-UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w==",
+      "dev": true,
+      "dependencies": {
+        "@babel/compat-data": "^7.17.7",
+        "@babel/helper-validator-option": "^7.16.7",
+        "browserslist": "^4.17.5",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-create-class-features-plugin": {
+      "version": "7.17.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.9.tgz",
+      "integrity": "sha512-kUjip3gruz6AJKOq5i3nC6CoCEEF/oHH3cp6tOZhB+IyyyPyW0g1Gfsxn3mkk6S08pIA2y8GQh609v9G/5sHVQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-function-name": "^7.17.9",
+        "@babel/helper-member-expression-to-functions": "^7.17.7",
+        "@babel/helper-optimise-call-expression": "^7.16.7",
+        "@babel/helper-replace-supers": "^7.16.7",
+        "@babel/helper-split-export-declaration": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-create-regexp-features-plugin": {
+      "version": "7.17.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz",
+      "integrity": "sha512-awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "regexpu-core": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-define-polyfill-provider": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz",
+      "integrity": "sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-compilation-targets": "^7.13.0",
+        "@babel/helper-module-imports": "^7.12.13",
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/traverse": "^7.13.0",
+        "debug": "^4.1.1",
+        "lodash.debounce": "^4.0.8",
+        "resolve": "^1.14.2",
+        "semver": "^6.1.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0-0"
+      }
+    },
+    "node_modules/@babel/helper-environment-visitor": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz",
+      "integrity": "sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-explode-assignable-expression": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz",
+      "integrity": "sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-function-name": {
+      "version": "7.17.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
+      "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/template": "^7.16.7",
+        "@babel/types": "^7.17.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-hoist-variables": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
+      "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-member-expression-to-functions": {
+      "version": "7.17.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz",
+      "integrity": "sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.17.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-imports": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
+      "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-transforms": {
+      "version": "7.17.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz",
+      "integrity": "sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-module-imports": "^7.16.7",
+        "@babel/helper-simple-access": "^7.17.7",
+        "@babel/helper-split-export-declaration": "^7.16.7",
+        "@babel/helper-validator-identifier": "^7.16.7",
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.17.3",
+        "@babel/types": "^7.17.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-optimise-call-expression": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz",
+      "integrity": "sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-plugin-utils": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz",
+      "integrity": "sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-remap-async-to-generator": {
+      "version": "7.16.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz",
+      "integrity": "sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-wrap-function": "^7.16.8",
+        "@babel/types": "^7.16.8"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-replace-supers": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz",
+      "integrity": "sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-member-expression-to-functions": "^7.16.7",
+        "@babel/helper-optimise-call-expression": "^7.16.7",
+        "@babel/traverse": "^7.16.7",
+        "@babel/types": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-simple-access": {
+      "version": "7.17.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz",
+      "integrity": "sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.17.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz",
+      "integrity": "sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.16.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-split-export-declaration": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
+      "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
+      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-option": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
+      "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-wrap-function": {
+      "version": "7.16.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz",
+      "integrity": "sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-function-name": "^7.16.7",
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.16.8",
+        "@babel/types": "^7.16.8"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helpers": {
+      "version": "7.17.9",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.9.tgz",
+      "integrity": "sha512-cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.17.9",
+        "@babel/types": "^7.17.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight": {
+      "version": "7.17.9",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",
+      "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.16.7",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/parser": {
+      "version": "7.17.9",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.9.tgz",
+      "integrity": "sha512-vqUSBLP8dQHFPdPi9bc5GK9vRkYHJ49fsZdtoJ8EQ8ibpwk5rPKfvNIwChB0KVXcIjcepEBBd2VHC5r9Gy8ueg==",
+      "dev": true,
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz",
+      "integrity": "sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz",
+      "integrity": "sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
+        "@babel/plugin-proposal-optional-chaining": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.13.0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-async-generator-functions": {
+      "version": "7.16.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz",
+      "integrity": "sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-remap-async-to-generator": "^7.16.8",
+        "@babel/plugin-syntax-async-generators": "^7.8.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-class-properties": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz",
+      "integrity": "sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-class-static-block": {
+      "version": "7.17.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.17.6.tgz",
+      "integrity": "sha512-X/tididvL2zbs7jZCeeRJ8167U/+Ac135AM6jCAx6gYXDUviZV5Ku9UDvWS2NCuWlFjIRXklYhwo6HhAC7ETnA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.17.6",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.12.0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-dynamic-import": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz",
+      "integrity": "sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-export-namespace-from": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz",
+      "integrity": "sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-json-strings": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz",
+      "integrity": "sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-json-strings": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-logical-assignment-operators": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz",
+      "integrity": "sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz",
+      "integrity": "sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-numeric-separator": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz",
+      "integrity": "sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-object-rest-spread": {
+      "version": "7.17.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.17.3.tgz",
+      "integrity": "sha512-yuL5iQA/TbZn+RGAfxQXfi7CNLmKi1f8zInn4IgobuCWcAb7i+zj4TYzQ9l8cEzVyJ89PDGuqxK1xZpUDISesw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/compat-data": "^7.17.0",
+        "@babel/helper-compilation-targets": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-transform-parameters": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-optional-catch-binding": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz",
+      "integrity": "sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-optional-chaining": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz",
+      "integrity": "sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-private-methods": {
+      "version": "7.16.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz",
+      "integrity": "sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.16.10",
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-private-property-in-object": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz",
+      "integrity": "sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-create-class-features-plugin": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-unicode-property-regex": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz",
+      "integrity": "sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-async-generators": {
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-class-properties": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.12.13"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-class-static-block": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
+      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-dynamic-import": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
+      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-export-namespace-from": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
+      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.3"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-json-strings": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-numeric-separator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-object-rest-spread": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-optional-chaining": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-private-property-in-object": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
+      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-top-level-await": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-arrow-functions": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz",
+      "integrity": "sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-async-to-generator": {
+      "version": "7.16.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz",
+      "integrity": "sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-remap-async-to-generator": "^7.16.8"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-block-scoped-functions": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz",
+      "integrity": "sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-block-scoping": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz",
+      "integrity": "sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-classes": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz",
+      "integrity": "sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-function-name": "^7.16.7",
+        "@babel/helper-optimise-call-expression": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-replace-supers": "^7.16.7",
+        "@babel/helper-split-export-declaration": "^7.16.7",
+        "globals": "^11.1.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-computed-properties": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz",
+      "integrity": "sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-destructuring": {
+      "version": "7.17.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.7.tgz",
+      "integrity": "sha512-XVh0r5yq9sLR4vZ6eVZe8FKfIcSgaTBxVBRSYokRj2qksf6QerYnTxz9/GTuKTH/n/HwLP7t6gtlybHetJ/6hQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-dotall-regex": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz",
+      "integrity": "sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-duplicate-keys": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz",
+      "integrity": "sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-exponentiation-operator": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz",
+      "integrity": "sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-for-of": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz",
+      "integrity": "sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-function-name": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz",
+      "integrity": "sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-compilation-targets": "^7.16.7",
+        "@babel/helper-function-name": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-literals": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz",
+      "integrity": "sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-member-expression-literals": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz",
+      "integrity": "sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-amd": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz",
+      "integrity": "sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-module-transforms": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-commonjs": {
+      "version": "7.17.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.9.tgz",
+      "integrity": "sha512-2TBFd/r2I6VlYn0YRTz2JdazS+FoUuQ2rIFHoAxtyP/0G3D82SBLaRq9rnUkpqlLg03Byfl/+M32mpxjO6KaPw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-module-transforms": "^7.17.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-simple-access": "^7.17.7",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-systemjs": {
+      "version": "7.17.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.17.8.tgz",
+      "integrity": "sha512-39reIkMTUVagzgA5x88zDYXPCMT6lcaRKs1+S9K6NKBPErbgO/w/kP8GlNQTC87b412ZTlmNgr3k2JrWgHH+Bw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-hoist-variables": "^7.16.7",
+        "@babel/helper-module-transforms": "^7.17.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-validator-identifier": "^7.16.7",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-umd": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz",
+      "integrity": "sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-module-transforms": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
+      "version": "7.16.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz",
+      "integrity": "sha512-j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-new-target": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz",
+      "integrity": "sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-object-super": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz",
+      "integrity": "sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-replace-supers": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-parameters": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz",
+      "integrity": "sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-property-literals": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz",
+      "integrity": "sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-regenerator": {
+      "version": "7.17.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.17.9.tgz",
+      "integrity": "sha512-Lc2TfbxR1HOyn/c6b4Y/b6NHoTb67n/IoWLxTu4kC7h4KQnWlhCq2S8Tx0t2SVvv5Uu87Hs+6JEJ5kt2tYGylQ==",
+      "dev": true,
+      "dependencies": {
+        "regenerator-transform": "^0.15.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-reserved-words": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz",
+      "integrity": "sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-shorthand-properties": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz",
+      "integrity": "sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-spread": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz",
+      "integrity": "sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-sticky-regex": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz",
+      "integrity": "sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-template-literals": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz",
+      "integrity": "sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-typeof-symbol": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz",
+      "integrity": "sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-unicode-escapes": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz",
+      "integrity": "sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-unicode-regex": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz",
+      "integrity": "sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/preset-env": {
+      "version": "7.16.11",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.11.tgz",
+      "integrity": "sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/compat-data": "^7.16.8",
+        "@babel/helper-compilation-targets": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-validator-option": "^7.16.7",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.16.7",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.16.7",
+        "@babel/plugin-proposal-async-generator-functions": "^7.16.8",
+        "@babel/plugin-proposal-class-properties": "^7.16.7",
+        "@babel/plugin-proposal-class-static-block": "^7.16.7",
+        "@babel/plugin-proposal-dynamic-import": "^7.16.7",
+        "@babel/plugin-proposal-export-namespace-from": "^7.16.7",
+        "@babel/plugin-proposal-json-strings": "^7.16.7",
+        "@babel/plugin-proposal-logical-assignment-operators": "^7.16.7",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7",
+        "@babel/plugin-proposal-numeric-separator": "^7.16.7",
+        "@babel/plugin-proposal-object-rest-spread": "^7.16.7",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.16.7",
+        "@babel/plugin-proposal-optional-chaining": "^7.16.7",
+        "@babel/plugin-proposal-private-methods": "^7.16.11",
+        "@babel/plugin-proposal-private-property-in-object": "^7.16.7",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.16.7",
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-class-properties": "^7.12.13",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+        "@babel/plugin-syntax-top-level-await": "^7.14.5",
+        "@babel/plugin-transform-arrow-functions": "^7.16.7",
+        "@babel/plugin-transform-async-to-generator": "^7.16.8",
+        "@babel/plugin-transform-block-scoped-functions": "^7.16.7",
+        "@babel/plugin-transform-block-scoping": "^7.16.7",
+        "@babel/plugin-transform-classes": "^7.16.7",
+        "@babel/plugin-transform-computed-properties": "^7.16.7",
+        "@babel/plugin-transform-destructuring": "^7.16.7",
+        "@babel/plugin-transform-dotall-regex": "^7.16.7",
+        "@babel/plugin-transform-duplicate-keys": "^7.16.7",
+        "@babel/plugin-transform-exponentiation-operator": "^7.16.7",
+        "@babel/plugin-transform-for-of": "^7.16.7",
+        "@babel/plugin-transform-function-name": "^7.16.7",
+        "@babel/plugin-transform-literals": "^7.16.7",
+        "@babel/plugin-transform-member-expression-literals": "^7.16.7",
+        "@babel/plugin-transform-modules-amd": "^7.16.7",
+        "@babel/plugin-transform-modules-commonjs": "^7.16.8",
+        "@babel/plugin-transform-modules-systemjs": "^7.16.7",
+        "@babel/plugin-transform-modules-umd": "^7.16.7",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.16.8",
+        "@babel/plugin-transform-new-target": "^7.16.7",
+        "@babel/plugin-transform-object-super": "^7.16.7",
+        "@babel/plugin-transform-parameters": "^7.16.7",
+        "@babel/plugin-transform-property-literals": "^7.16.7",
+        "@babel/plugin-transform-regenerator": "^7.16.7",
+        "@babel/plugin-transform-reserved-words": "^7.16.7",
+        "@babel/plugin-transform-shorthand-properties": "^7.16.7",
+        "@babel/plugin-transform-spread": "^7.16.7",
+        "@babel/plugin-transform-sticky-regex": "^7.16.7",
+        "@babel/plugin-transform-template-literals": "^7.16.7",
+        "@babel/plugin-transform-typeof-symbol": "^7.16.7",
+        "@babel/plugin-transform-unicode-escapes": "^7.16.7",
+        "@babel/plugin-transform-unicode-regex": "^7.16.7",
+        "@babel/preset-modules": "^0.1.5",
+        "@babel/types": "^7.16.8",
+        "babel-plugin-polyfill-corejs2": "^0.3.0",
+        "babel-plugin-polyfill-corejs3": "^0.5.0",
+        "babel-plugin-polyfill-regenerator": "^0.3.0",
+        "core-js-compat": "^3.20.2",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/preset-modules": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
+      "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
+        "@babel/plugin-transform-dotall-regex": "^7.4.4",
+        "@babel/types": "^7.4.4",
+        "esutils": "^2.0.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/runtime": {
+      "version": "7.17.9",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.9.tgz",
+      "integrity": "sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==",
+      "dev": true,
+      "dependencies": {
+        "regenerator-runtime": "^0.13.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/runtime/node_modules/regenerator-runtime": {
+      "version": "0.13.9",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
+      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
+      "dev": true
+    },
+    "node_modules/@babel/template": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
+      "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.16.7",
+        "@babel/parser": "^7.16.7",
+        "@babel/types": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/traverse": {
+      "version": "7.17.9",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.9.tgz",
+      "integrity": "sha512-PQO8sDIJ8SIwipTPiR71kJQCKQYB5NGImbOviK8K+kg5xkNSYXLBupuX9QhatFowrsvo9Hj8WgArg3W7ijNAQw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.16.7",
+        "@babel/generator": "^7.17.9",
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-function-name": "^7.17.9",
+        "@babel/helper-hoist-variables": "^7.16.7",
+        "@babel/helper-split-export-declaration": "^7.16.7",
+        "@babel/parser": "^7.17.9",
+        "@babel/types": "^7.17.0",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/types": {
+      "version": "7.17.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz",
+      "integrity": "sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.16.7",
+        "to-fast-properties": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@discoveryjs/json-ext": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
+      "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/@eslint/eslintrc": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz",
+      "integrity": "sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.4.0",
+        "globals": "^13.15.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/globals": {
+      "version": "13.18.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.18.0.tgz",
+      "integrity": "sha512-/mR4KI8Ps2spmoc0Ulu9L7agOF0du1CZNQ3dke8yItYlyKNmGrkONemBbd6V8UTc1Wgcqn21t3WYB7dbRmh6/A==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@humanwhocodes/config-array": {
+      "version": "0.11.7",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.7.tgz",
+      "integrity": "sha512-kBbPWzN8oVMLb0hOUYXhmxggL/1cJE6ydvjDIGi9EnAGUyA7cLVKQg+d/Dsm+KZwx2czGHrCmMVLiyg8s5JPKw==",
+      "dev": true,
+      "dependencies": {
+        "@humanwhocodes/object-schema": "^1.2.1",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.5"
+      },
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
+    "node_modules/@humanwhocodes/module-importer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.22"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
+    },
+    "node_modules/@humanwhocodes/object-schema": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+      "dev": true
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz",
+      "integrity": "sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.4.11",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz",
+      "integrity": "sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg==",
+      "dev": true
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz",
+      "integrity": "sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.0.3",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
+      }
+    },
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@openfonts/ubuntu-condensed_latin": {
+      "version": "1.44.2",
+      "resolved": "https://registry.npmjs.org/@openfonts/ubuntu-condensed_latin/-/ubuntu-condensed_latin-1.44.2.tgz",
+      "integrity": "sha512-OWBvYVl/HbYQcKNlIAg7VFMvTpKobHf5FVDIOlBp16MMTBApQVelvWYueZ41jLhrTDproTI1LjZiZBYrUz5h4g=="
+    },
+    "node_modules/@tootallnate/once": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
+      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@types/eslint": {
+      "version": "8.4.1",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.1.tgz",
+      "integrity": "sha512-GE44+DNEyxxh2Kc6ro/VkIj+9ma0pO0bwv9+uHSyBrikYOHr8zYcdPvnBOp1aw8s+CjRvuSx7CyWqRrNFQ59mA==",
+      "dev": true,
+      "dependencies": {
+        "@types/estree": "*",
+        "@types/json-schema": "*"
+      }
+    },
+    "node_modules/@types/eslint-scope": {
+      "version": "3.7.3",
+      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz",
+      "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==",
+      "dev": true,
+      "dependencies": {
+        "@types/eslint": "*",
+        "@types/estree": "*"
+      }
+    },
+    "node_modules/@types/estree": {
+      "version": "0.0.51",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
+      "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==",
+      "dev": true
+    },
+    "node_modules/@types/glob": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
+      "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
+      "dev": true,
+      "dependencies": {
+        "@types/minimatch": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/html-minifier-terser": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
+      "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==",
+      "dev": true
+    },
+    "node_modules/@types/json-schema": {
+      "version": "7.0.11",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
+      "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
+      "dev": true
+    },
+    "node_modules/@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
+      "dev": true
+    },
+    "node_modules/@types/minimatch": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
+      "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==",
+      "dev": true
+    },
+    "node_modules/@types/minimist": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz",
+      "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==",
+      "dev": true
+    },
+    "node_modules/@types/node": {
+      "version": "17.0.25",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.25.tgz",
+      "integrity": "sha512-wANk6fBrUwdpY4isjWrKTufkrXdu1D2YHCot2fD/DfWxF5sMrVSA+KN7ydckvaTCh0HiqX9IVl0L5/ZoXg5M7w==",
+      "dev": true
+    },
+    "node_modules/@types/normalize-package-data": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
+      "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
+      "dev": true
+    },
+    "node_modules/@types/parse-json": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
+      "dev": true
+    },
+    "node_modules/@types/webpack": {
+      "version": "5.28.0",
+      "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-5.28.0.tgz",
+      "integrity": "sha512-8cP0CzcxUiFuA9xGJkfeVpqmWTk9nx6CWwamRGCj95ph1SmlRRk9KlCZ6avhCbZd4L68LvYT6l1kpdEnQXrF8w==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "tapable": "^2.2.0",
+        "webpack": "^5"
+      }
+    },
+    "node_modules/@webassemblyjs/ast": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
+      "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/helper-numbers": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1"
+      }
+    },
+    "node_modules/@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
+      "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/helper-api-error": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
+      "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/helper-buffer": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
+      "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/helper-numbers": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
+      "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/floating-point-hex-parser": "1.11.1",
+        "@webassemblyjs/helper-api-error": "1.11.1",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
+      "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/helper-wasm-section": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
+      "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-buffer": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
+        "@webassemblyjs/wasm-gen": "1.11.1"
+      }
+    },
+    "node_modules/@webassemblyjs/ieee754": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
+      "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==",
+      "dev": true,
+      "dependencies": {
+        "@xtuc/ieee754": "^1.2.0"
+      }
+    },
+    "node_modules/@webassemblyjs/leb128": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
+      "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==",
+      "dev": true,
+      "dependencies": {
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/utf8": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
+      "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==",
+      "dev": true
+    },
+    "node_modules/@webassemblyjs/wasm-edit": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
+      "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-buffer": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
+        "@webassemblyjs/helper-wasm-section": "1.11.1",
+        "@webassemblyjs/wasm-gen": "1.11.1",
+        "@webassemblyjs/wasm-opt": "1.11.1",
+        "@webassemblyjs/wasm-parser": "1.11.1",
+        "@webassemblyjs/wast-printer": "1.11.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-gen": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
+      "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
+        "@webassemblyjs/ieee754": "1.11.1",
+        "@webassemblyjs/leb128": "1.11.1",
+        "@webassemblyjs/utf8": "1.11.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-opt": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
+      "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-buffer": "1.11.1",
+        "@webassemblyjs/wasm-gen": "1.11.1",
+        "@webassemblyjs/wasm-parser": "1.11.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-parser": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
+      "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-api-error": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
+        "@webassemblyjs/ieee754": "1.11.1",
+        "@webassemblyjs/leb128": "1.11.1",
+        "@webassemblyjs/utf8": "1.11.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wast-printer": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
+      "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==",
+      "dev": true,
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webpack-cli/configtest": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.1.1.tgz",
+      "integrity": "sha512-1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg==",
+      "dev": true,
+      "peerDependencies": {
+        "webpack": "4.x.x || 5.x.x",
+        "webpack-cli": "4.x.x"
+      }
+    },
+    "node_modules/@webpack-cli/info": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.4.1.tgz",
+      "integrity": "sha512-PKVGmazEq3oAo46Q63tpMr4HipI3OPfP7LiNOEJg963RMgT0rqheag28NCML0o3GIzA3DmxP1ZIAv9oTX1CUIA==",
+      "dev": true,
+      "dependencies": {
+        "envinfo": "^7.7.3"
+      },
+      "peerDependencies": {
+        "webpack-cli": "4.x.x"
+      }
+    },
+    "node_modules/@webpack-cli/serve": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.6.1.tgz",
+      "integrity": "sha512-gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw==",
+      "dev": true,
+      "peerDependencies": {
+        "webpack-cli": "4.x.x"
+      },
+      "peerDependenciesMeta": {
+        "webpack-dev-server": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@xtuc/ieee754": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+      "dev": true
+    },
+    "node_modules/@xtuc/long": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+      "dev": true
+    },
+    "node_modules/abab": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
+      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
+      "dev": true
+    },
+    "node_modules/acorn": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-globals": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
+      "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^7.1.1",
+        "acorn-walk": "^7.1.1"
+      }
+    },
+    "node_modules/acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true,
+      "peerDependencies": {
+        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/acorn-walk": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
+      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true,
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ansis": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/ansis/-/ansis-1.3.4.tgz",
+      "integrity": "sha512-BDXljGSG4gZXmWK64bQzXkI509i5fe8aAa9+eL29e3swaWUqxvxk/XlONjw9AUrNCpQWNdy++0GX7HAhWeR9BQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.13"
+      },
+      "funding": {
+        "type": "patreon",
+        "url": "https://patreon.com/biodiscus"
+      }
+    },
+    "node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "node_modules/array-differ": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz",
+      "integrity": "sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/array-find": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-find/-/array-find-1.0.0.tgz",
+      "integrity": "sha1-bI4obRHtdoMn+OYuzuhzU8o+eLg=",
+      "dev": true
+    },
+    "node_modules/array-includes": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.4.tgz",
+      "integrity": "sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1",
+        "get-intrinsic": "^1.1.1",
+        "is-string": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-union": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+      "dev": true,
+      "dependencies": {
+        "array-uniq": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array.prototype.flat": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
+      "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.2",
+        "es-shim-unscopables": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/arrify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/asn1.js": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
+      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
+    "node_modules/asn1.js/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
+    "node_modules/assert": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
+      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
+      "dev": true,
+      "dependencies": {
+        "object-assign": "^4.1.1",
+        "util": "0.10.3"
+      }
+    },
+    "node_modules/assert/node_modules/inherits": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+      "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+      "dev": true
+    },
+    "node_modules/assert/node_modules/util": {
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+      "dev": true,
+      "dependencies": {
+        "inherits": "2.0.1"
+      }
+    },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "dev": true
+    },
+    "node_modules/autoprefixer": {
+      "version": "7.2.6",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.2.6.tgz",
+      "integrity": "sha512-Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^2.11.3",
+        "caniuse-lite": "^1.0.30000805",
+        "normalize-range": "^0.1.2",
+        "num2fraction": "^1.2.2",
+        "postcss": "^6.0.17",
+        "postcss-value-parser": "^3.2.3"
+      },
+      "bin": {
+        "autoprefixer-info": "bin/autoprefixer-info"
+      }
+    },
+    "node_modules/autoprefixer/node_modules/browserslist": {
+      "version": "2.11.3",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz",
+      "integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==",
+      "deprecated": "Browserslist 2 could fail on reading Browserslist >3.0 config used in other tools.",
+      "dev": true,
+      "dependencies": {
+        "caniuse-lite": "^1.0.30000792",
+        "electron-to-chromium": "^1.3.30"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      }
+    },
+    "node_modules/autoprefixer/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/autoprefixer/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/babel-eslint": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.1.0.tgz",
+      "integrity": "sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==",
+      "deprecated": "babel-eslint is now @babel/eslint-parser. This package will no longer receive updates.",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "@babel/parser": "^7.7.0",
+        "@babel/traverse": "^7.7.0",
+        "@babel/types": "^7.7.0",
+        "eslint-visitor-keys": "^1.0.0",
+        "resolve": "^1.12.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "peerDependencies": {
+        "eslint": ">= 4.12.1"
+      }
+    },
+    "node_modules/babel-loader": {
+      "version": "8.2.4",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.4.tgz",
+      "integrity": "sha512-8dytA3gcvPPPv4Grjhnt8b5IIiTcq/zeXOPk4iTYI0SVXcsmuGg7JtBRDp8S9X+gJfhQ8ektjXZlDu1Bb33U8A==",
+      "dev": true,
+      "dependencies": {
+        "find-cache-dir": "^3.3.1",
+        "loader-utils": "^2.0.0",
+        "make-dir": "^3.1.0",
+        "schema-utils": "^2.6.5"
+      },
+      "engines": {
+        "node": ">= 8.9"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0",
+        "webpack": ">=2"
+      }
+    },
+    "node_modules/babel-plugin-dynamic-import-node": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
+      "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
+      "dev": true,
+      "dependencies": {
+        "object.assign": "^4.1.0"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-corejs2": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz",
+      "integrity": "sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==",
+      "dev": true,
+      "dependencies": {
+        "@babel/compat-data": "^7.13.11",
+        "@babel/helper-define-polyfill-provider": "^0.3.1",
+        "semver": "^6.1.1"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-corejs3": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz",
+      "integrity": "sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-define-polyfill-provider": "^0.3.1",
+        "core-js-compat": "^3.21.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-regenerator": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz",
+      "integrity": "sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-define-polyfill-provider": "^0.3.1"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/babel-runtime": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+      "dev": true,
+      "dependencies": {
+        "core-js": "^2.4.0",
+        "regenerator-runtime": "^0.11.0"
+      }
+    },
+    "node_modules/babel-runtime/node_modules/core-js": {
+      "version": "2.6.12",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
+      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
+      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
+      "dev": true,
+      "hasInstallScript": true
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "node_modules/base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/big.js": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/bn.js": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
+      "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==",
+      "dev": true
+    },
+    "node_modules/boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
+      "dev": true
+    },
+    "node_modules/bootstrap": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz",
+      "integrity": "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/twbs"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/bootstrap"
+        }
+      ],
+      "peerDependencies": {
+        "jquery": "1.9.1 - 3",
+        "popper.js": "^1.16.1"
+      }
+    },
+    "node_modules/bourbon": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/bourbon/-/bourbon-4.3.4.tgz",
+      "integrity": "sha1-TaOAAp6SwMj5dkx3lFGhNLEefMM=",
+      "dev": true
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "dependencies": {
+        "fill-range": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/brorand": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
+      "dev": true
+    },
+    "node_modules/browser-process-hrtime": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
+      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
+      "dev": true
+    },
+    "node_modules/browserify-aes": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+      "dev": true,
+      "dependencies": {
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/browserify-cipher": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+      "dev": true,
+      "dependencies": {
+        "browserify-aes": "^1.0.4",
+        "browserify-des": "^1.0.0",
+        "evp_bytestokey": "^1.0.0"
+      }
+    },
+    "node_modules/browserify-des": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+      "dev": true,
+      "dependencies": {
+        "cipher-base": "^1.0.1",
+        "des.js": "^1.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/browserify-rsa": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
+      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^5.0.0",
+        "randombytes": "^2.0.1"
+      }
+    },
+    "node_modules/browserify-sign": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
+      "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^5.1.1",
+        "browserify-rsa": "^4.0.1",
+        "create-hash": "^1.2.0",
+        "create-hmac": "^1.1.7",
+        "elliptic": "^6.5.3",
+        "inherits": "^2.0.4",
+        "parse-asn1": "^5.1.5",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      }
+    },
+    "node_modules/browserify-sign/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/browserify-sign/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/browserify-zlib": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+      "dev": true,
+      "dependencies": {
+        "pako": "~1.0.5"
+      }
+    },
+    "node_modules/browserslist": {
+      "version": "4.20.2",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.2.tgz",
+      "integrity": "sha512-CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        }
+      ],
+      "dependencies": {
+        "caniuse-lite": "^1.0.30001317",
+        "electron-to-chromium": "^1.4.84",
+        "escalade": "^3.1.1",
+        "node-releases": "^2.0.2",
+        "picocolors": "^1.0.0"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      },
+      "engines": {
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      }
+    },
+    "node_modules/buffer": {
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
+      "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
+      "dev": true,
+      "dependencies": {
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4",
+        "isarray": "^1.0.0"
+      }
+    },
+    "node_modules/buffer-builder": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/buffer-builder/-/buffer-builder-0.2.0.tgz",
+      "integrity": "sha512-7VPMEPuYznPSoR21NE1zvd2Xna6c/CloiZCfcMXR1Jny6PjX0N4Nsa38zcBFo/FMK+BlA+FLKbJCQ0i2yxp+Xg==",
+      "dev": true
+    },
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true
+    },
+    "node_modules/buffer-xor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
+      "dev": true
+    },
+    "node_modules/builtin-status-codes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
+      "dev": true
+    },
+    "node_modules/call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/camel-case": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
+      "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
+      "dev": true,
+      "dependencies": {
+        "pascal-case": "^3.1.2",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/camelcase-keys": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
+      "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^5.3.1",
+        "map-obj": "^4.0.0",
+        "quick-lru": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001332",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001332.tgz",
+      "integrity": "sha512-10T30NYOEQtN6C11YGg411yebhvpnC6Z102+B95eAsN0oB6KUs01ivE8u+G6FMIRtIrVlYXhL+LUwQ3/hXwDWw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        }
+      ]
+    },
+    "node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/chrome-trace-event": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
+      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
+    "node_modules/cipher-base": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/clean-css": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.0.tgz",
+      "integrity": "sha512-YYuuxv4H/iNb1Z/5IbMRoxgrzjWGhOEFfd+groZ5dMCVkpENiMZmwspdrzBo9286JjM1gZJPAyL7ZIdzuvu2AQ==",
+      "dev": true,
+      "dependencies": {
+        "source-map": "~0.6.0"
+      },
+      "engines": {
+        "node": ">= 10.0"
+      }
+    },
+    "node_modules/clean-css/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/clean-webpack-plugin": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-2.0.2.tgz",
+      "integrity": "sha512-pi1111o4OBd9qvacbgs+NRqClfVPKVIc66B4d8kx6Ho/L+i9entQ/NpK600CsTYTPu3kWvKwwyKarsYMvC2xeA==",
+      "dev": true,
+      "dependencies": {
+        "del": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "webpack": "*"
+      }
+    },
+    "node_modules/clone": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/clone-deep": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.4",
+        "kind-of": "^6.0.2",
+        "shallow-clone": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/clone-regexp": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz",
+      "integrity": "sha512-beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q==",
+      "dev": true,
+      "dependencies": {
+        "is-regexp": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/color": {
+      "version": "0.11.4",
+      "resolved": "https://registry.npmjs.org/color/-/color-0.11.4.tgz",
+      "integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=",
+      "dev": true,
+      "dependencies": {
+        "clone": "^1.0.2",
+        "color-convert": "^1.3.0",
+        "color-string": "^0.3.0"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/color-string": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz",
+      "integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=",
+      "dev": true,
+      "dependencies": {
+        "color-name": "^1.0.0"
+      }
+    },
+    "node_modules/colord": {
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.2.tgz",
+      "integrity": "sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ==",
+      "dev": true
+    },
+    "node_modules/colorette": {
+      "version": "2.0.16",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz",
+      "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==",
+      "dev": true
+    },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dev": true,
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/commander": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
+      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
+      "dev": true,
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+      "dev": true
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "node_modules/confusing-browser-globals": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
+      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
+      "dev": true
+    },
+    "node_modules/console-browserify": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
+      "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
+      "dev": true
+    },
+    "node_modules/constants-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
+      "dev": true
+    },
+    "node_modules/convert-source-map": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
+      "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.1"
+      }
+    },
+    "node_modules/core-js": {
+      "version": "3.22.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.22.0.tgz",
+      "integrity": "sha512-8h9jBweRjMiY+ORO7bdWSeWfHhLPO7whobj7Z2Bl0IDo00C228EdGgH7FE4jGumbEjzcFfkfW8bXgdkEDhnwHQ==",
+      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
+      "dev": true,
+      "hasInstallScript": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/core-js-compat": {
+      "version": "3.22.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.22.0.tgz",
+      "integrity": "sha512-WwA7xbfRGrk8BGaaHlakauVXrlYmAIkk8PNGb1FDQS+Rbrewc3pgFfwJFRw6psmJVAll7Px9UHRYE16oRQnwAQ==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^4.20.2",
+        "semver": "7.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/core-js-compat/node_modules/semver": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
+      "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/core-util-is": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+      "dev": true
+    },
+    "node_modules/cosmiconfig": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
+      "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/parse-json": "^4.0.0",
+        "import-fresh": "^3.2.1",
+        "parse-json": "^5.0.0",
+        "path-type": "^4.0.0",
+        "yaml": "^1.10.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/create-ecdh": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
+      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "elliptic": "^6.5.3"
+      }
+    },
+    "node_modules/create-ecdh/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
+    "node_modules/create-hash": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "dev": true,
+      "dependencies": {
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
+      }
+    },
+    "node_modules/create-hmac": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+      "dev": true,
+      "dependencies": {
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/cross-spawn/node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/crypto-browserify": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+      "dev": true,
+      "dependencies": {
+        "browserify-cipher": "^1.0.0",
+        "browserify-sign": "^4.0.0",
+        "create-ecdh": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.0",
+        "diffie-hellman": "^5.0.0",
+        "inherits": "^2.0.1",
+        "pbkdf2": "^3.0.3",
+        "public-encrypt": "^4.0.0",
+        "randombytes": "^2.0.0",
+        "randomfill": "^1.0.3"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/css-color-function": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/css-color-function/-/css-color-function-1.3.3.tgz",
+      "integrity": "sha1-jtJMLAIFBzM5+voAS8jBQfzLKC4=",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "0.1.0",
+        "color": "^0.11.0",
+        "debug": "^3.1.0",
+        "rgb": "~0.1.0"
+      }
+    },
+    "node_modules/css-color-function/node_modules/balanced-match": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.1.0.tgz",
+      "integrity": "sha1-tQS9BYabOSWd0MXvw12EMXbczEo=",
+      "dev": true
+    },
+    "node_modules/css-color-function/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/css-functions-list": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.0.1.tgz",
+      "integrity": "sha512-PriDuifDt4u4rkDgnqRCLnjfMatufLmWNfQnGCq34xZwpY3oabwhB9SqRBmuvWUgndbemCFlKqg+nO7C2q0SBw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.22"
+      }
+    },
+    "node_modules/css-loader": {
+      "version": "6.7.2",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.7.2.tgz",
+      "integrity": "sha512-oqGbbVcBJkm8QwmnNzrFrWTnudnRZC+1eXikLJl0n4ljcfotgRifpg2a1lKy8jTrc4/d9A/ap1GFq1jDKG7J+Q==",
+      "dev": true,
+      "dependencies": {
+        "icss-utils": "^5.1.0",
+        "postcss": "^8.4.18",
+        "postcss-modules-extract-imports": "^3.0.0",
+        "postcss-modules-local-by-default": "^4.0.0",
+        "postcss-modules-scope": "^3.0.0",
+        "postcss-modules-values": "^4.0.0",
+        "postcss-value-parser": "^4.2.0",
+        "semver": "^7.3.8"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/css-loader/node_modules/postcss-value-parser": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+      "dev": true
+    },
+    "node_modules/css-loader/node_modules/semver": {
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/css-rule-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/css-rule-stream/-/css-rule-stream-1.1.0.tgz",
+      "integrity": "sha1-N4bnGYmD2WWibjGVfgkHjLt3BaI=",
+      "dev": true,
+      "dependencies": {
+        "css-tokenize": "^1.0.1",
+        "duplexer2": "0.0.2",
+        "ldjson-stream": "^1.2.1",
+        "through2": "^0.6.3"
+      },
+      "bin": {
+        "css-rule-stream": "index.js"
+      }
+    },
+    "node_modules/css-rule-stream/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+      "dev": true
+    },
+    "node_modules/css-rule-stream/node_modules/readable-stream": {
+      "version": "1.0.34",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+      "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/css-rule-stream/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+      "dev": true
+    },
+    "node_modules/css-rule-stream/node_modules/through2": {
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+      "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": ">=1.0.33-1 <1.1.0-0",
+        "xtend": ">=4.0.0 <4.1.0-0"
+      }
+    },
+    "node_modules/css-select": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
+      "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
+      "dev": true,
+      "dependencies": {
+        "boolbase": "^1.0.0",
+        "css-what": "^6.0.1",
+        "domhandler": "^4.3.1",
+        "domutils": "^2.8.0",
+        "nth-check": "^2.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/css-tokenize": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/css-tokenize/-/css-tokenize-1.0.1.tgz",
+      "integrity": "sha1-RiXLHtohwUOFi3+B1oA8HSb8FL4=",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "readable-stream": "^1.0.33"
+      }
+    },
+    "node_modules/css-tokenize/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+      "dev": true
+    },
+    "node_modules/css-tokenize/node_modules/readable-stream": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/css-tokenize/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+      "dev": true
+    },
+    "node_modules/css-tree": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
+      "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
+      "dev": true,
+      "dependencies": {
+        "mdn-data": "2.0.14",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/css-tree/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/css-unit-converter": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/css-unit-converter/-/css-unit-converter-1.1.2.tgz",
+      "integrity": "sha512-IiJwMC8rdZE0+xiEZHeru6YoONC4rfPMqGm2W85jMIbkFvv5nFTwJVFHam2eFrN6txmoUYFAFXiv8ICVeTO0MA==",
+      "dev": true
+    },
+    "node_modules/css-what": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
+      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/cssesc": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+      "dev": true,
+      "bin": {
+        "cssesc": "bin/cssesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/csso": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
+      "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
+      "dev": true,
+      "dependencies": {
+        "css-tree": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/csso-webpack-plugin": {
+      "version": "2.0.0-beta.3",
+      "resolved": "https://registry.npmjs.org/csso-webpack-plugin/-/csso-webpack-plugin-2.0.0-beta.3.tgz",
+      "integrity": "sha512-FnhgS7W1BwOduZagTLg9UjT2kvM9aiSpInm4xIDZHLuXl6/6vbOA1+DIIcbGKSjE0dWIVuDKEv1to86mN6KZ4w==",
+      "dev": true,
+      "dependencies": {
+        "@types/webpack": ">=4.0",
+        "core-js": "^3.10.1",
+        "csso": "^4.0.2",
+        "source-map": "^0.7.3",
+        "webpack-sources": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/csso-webpack-plugin/node_modules/source-map": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/cssom": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz",
+      "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==",
+      "dev": true
+    },
+    "node_modules/cssstyle": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
+      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
+      "dev": true,
+      "dependencies": {
+        "cssom": "~0.3.6"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cssstyle/node_modules/cssom": {
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
+      "dev": true
+    },
+    "node_modules/data-urls": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.1.tgz",
+      "integrity": "sha512-Ds554NeT5Gennfoo9KN50Vh6tpgtvYEwraYjejXnyTpu1C7oXKxdFk75REooENHE8ndTVOJuv+BEs4/J/xcozw==",
+      "dev": true,
+      "dependencies": {
+        "abab": "^2.0.3",
+        "whatwg-mimetype": "^3.0.0",
+        "whatwg-url": "^10.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/decamelize-keys": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
+      "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
+      "dev": true,
+      "dependencies": {
+        "decamelize": "^1.1.0",
+        "map-obj": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/decamelize-keys/node_modules/map-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/decimal.js": {
+      "version": "10.3.1",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz",
+      "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==",
+      "dev": true
+    },
+    "node_modules/deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true
+    },
+    "node_modules/define-properties": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+      "dev": true,
+      "dependencies": {
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/del": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
+      "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/glob": "^7.1.1",
+        "globby": "^6.1.0",
+        "is-path-cwd": "^2.0.0",
+        "is-path-in-cwd": "^2.0.0",
+        "p-map": "^2.0.0",
+        "pify": "^4.0.1",
+        "rimraf": "^2.6.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/des.js": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
+      "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "node_modules/diffie-hellman": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "miller-rabin": "^4.0.0",
+        "randombytes": "^2.0.0"
+      }
+    },
+    "node_modules/diffie-hellman/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
+    "node_modules/dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+      "dev": true,
+      "dependencies": {
+        "path-type": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/doiuse": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/doiuse/-/doiuse-4.4.1.tgz",
+      "integrity": "sha512-TUpr1/YNg20IB09tZmwGCTsTQoxj8jUld/hUZprZMj8vj0VpAJySXEWCr8WMvqvgzk0/kG/FxeSMGKode4UjPg==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^4.16.1",
+        "caniuse-lite": "^1.0.30001179",
+        "css-rule-stream": "^1.1.0",
+        "duplexer2": "0.0.2",
+        "ldjson-stream": "^1.2.1",
+        "multimatch": "^5.0.0",
+        "postcss": "^8.2.4",
+        "source-map": "^0.7.3",
+        "through2": "^4.0.2",
+        "yargs": "^16.2.0"
+      },
+      "bin": {
+        "doiuse": "cli.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/doiuse/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/doiuse/node_modules/cliui": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
+      }
+    },
+    "node_modules/doiuse/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/doiuse/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/doiuse/node_modules/source-map": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/doiuse/node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/doiuse/node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/doiuse/node_modules/yargs": {
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.0",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/dom-converter": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
+      "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
+      "dev": true,
+      "dependencies": {
+        "utila": "~0.4"
+      }
+    },
+    "node_modules/dom-serializer": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
+      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.2.0",
+        "entities": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+      }
+    },
+    "node_modules/dom-serializer/node_modules/entities": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/domain-browser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
+      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4",
+        "npm": ">=1.2"
+      }
+    },
+    "node_modules/domelementtype": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ]
+    },
+    "node_modules/domexception": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
+      "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
+      "dev": true,
+      "dependencies": {
+        "webidl-conversions": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/domhandler": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
+      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.2.0"
+      },
+      "engines": {
+        "node": ">= 4"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
+      }
+    },
+    "node_modules/domutils": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+      "dev": true,
+      "dependencies": {
+        "dom-serializer": "^1.0.1",
+        "domelementtype": "^2.2.0",
+        "domhandler": "^4.2.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domutils?sponsor=1"
+      }
+    },
+    "node_modules/dot-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
+      "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
+      "dev": true,
+      "dependencies": {
+        "no-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/duplexer2": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+      "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~1.1.9"
+      }
+    },
+    "node_modules/duplexer2/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+      "dev": true
+    },
+    "node_modules/duplexer2/node_modules/readable-stream": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/duplexer2/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+      "dev": true
+    },
+    "node_modules/electron-to-chromium": {
+      "version": "1.4.113",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.113.tgz",
+      "integrity": "sha512-s30WKxp27F3bBH6fA07FYL2Xm/FYnYrKpMjHr3XVCTUb9anAyZn/BeZfPWgTZGAbJeT4NxNwISSbLcYZvggPMA==",
+      "dev": true
+    },
+    "node_modules/elliptic": {
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "brorand": "^1.1.0",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.1",
+        "inherits": "^2.0.4",
+        "minimalistic-assert": "^1.0.1",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "node_modules/elliptic/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/emojis-list": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/enhanced-resolve": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz",
+      "integrity": "sha1-TW5omzcl+GCQknzMhs2fFjW4ni4=",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "memory-fs": "^0.2.0",
+        "tapable": "^0.1.8"
+      },
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/enhanced-resolve/node_modules/tapable": {
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",
+      "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/entities": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz",
+      "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/envinfo": {
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz",
+      "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==",
+      "dev": true,
+      "bin": {
+        "envinfo": "dist/cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "node_modules/es-abstract": {
+      "version": "1.19.5",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.5.tgz",
+      "integrity": "sha512-Aa2G2+Rd3b6kxEUKTF4TaW67czBLyAv3z7VOhYRU50YBx+bbsYZ9xQP4lMNazePuFlybXI0V4MruPos7qUo5fA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.1.1",
+        "get-symbol-description": "^1.0.0",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.3",
+        "is-callable": "^1.2.4",
+        "is-negative-zero": "^2.0.2",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.2",
+        "is-string": "^1.0.7",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.12.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.2",
+        "string.prototype.trimend": "^1.0.4",
+        "string.prototype.trimstart": "^1.0.4",
+        "unbox-primitive": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es-module-lexer": {
+      "version": "0.9.3",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
+      "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
+      "dev": true
+    },
+    "node_modules/es-shim-unscopables": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
+      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+      "dev": true,
+      "dependencies": {
+        "has": "^1.0.3"
+      }
+    },
+    "node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/escodegen": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
+      "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
+      "dev": true,
+      "dependencies": {
+        "esprima": "^4.0.1",
+        "estraverse": "^5.2.0",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.6.1"
+      }
+    },
+    "node_modules/escodegen/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/escodegen/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eslint": {
+      "version": "8.28.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.28.0.tgz",
+      "integrity": "sha512-S27Di+EVyMxcHiwDrFzk8dJYAaD+/5SoWKxL1ri/71CRHsnJnRDPNt2Kzj24+MT9FDupf4aqqyqPrvI8MvQ4VQ==",
+      "dev": true,
+      "dependencies": {
+        "@eslint/eslintrc": "^1.3.3",
+        "@humanwhocodes/config-array": "^0.11.6",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@nodelib/fs.walk": "^1.2.8",
+        "ajv": "^6.10.0",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.1.1",
+        "eslint-utils": "^3.0.0",
+        "eslint-visitor-keys": "^3.3.0",
+        "espree": "^9.4.0",
+        "esquery": "^1.4.0",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "globals": "^13.15.0",
+        "grapheme-splitter": "^1.0.4",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "is-path-inside": "^3.0.3",
+        "js-sdsl": "^4.1.4",
+        "js-yaml": "^4.1.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.1",
+        "regexpp": "^3.2.0",
+        "strip-ansi": "^6.0.1",
+        "strip-json-comments": "^3.1.0",
+        "text-table": "^0.2.0"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-config-airbnb-base": {
+      "version": "15.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz",
+      "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==",
+      "dev": true,
+      "dependencies": {
+        "confusing-browser-globals": "^1.0.10",
+        "object.assign": "^4.1.2",
+        "object.entries": "^1.1.5",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^7.32.0 || ^8.2.0",
+        "eslint-plugin-import": "^2.25.2"
+      }
+    },
+    "node_modules/eslint-import-resolver-node": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
+      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.7",
+        "resolve": "^1.20.0"
+      }
+    },
+    "node_modules/eslint-import-resolver-node/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-import-resolver-webpack": {
+      "version": "0.12.2",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.12.2.tgz",
+      "integrity": "sha512-7Jnm4YAoNNkvqPaZkKdIHsKGmv8/uNnYC5QsXkiSodvX4XEEfH2AKOna98FK52fCDXm3q4HzuX+7pRMKkJ64EQ==",
+      "dev": true,
+      "dependencies": {
+        "array-find": "^1.0.0",
+        "debug": "^2.6.9",
+        "enhanced-resolve": "^0.9.1",
+        "find-root": "^1.1.0",
+        "has": "^1.0.3",
+        "interpret": "^1.2.0",
+        "lodash": "^4.17.15",
+        "node-libs-browser": "^1.0.0 || ^2.0.0",
+        "resolve": "^1.13.1",
+        "semver": "^5.7.1"
+      },
+      "peerDependencies": {
+        "eslint-plugin-import": ">=1.4.0",
+        "webpack": ">=1.11.0"
+      }
+    },
+    "node_modules/eslint-import-resolver-webpack/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/eslint-import-resolver-webpack/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "node_modules/eslint-import-resolver-webpack/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/eslint-module-utils": {
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz",
+      "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.7",
+        "find-up": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/eslint-module-utils/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-plugin-html": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-html/-/eslint-plugin-html-6.2.0.tgz",
+      "integrity": "sha512-vi3NW0E8AJombTvt8beMwkL1R/fdRWl4QSNRNMhVQKWm36/X0KF0unGNAY4mqUF06mnwVWZcIcerrCnfn9025g==",
+      "dev": true,
+      "dependencies": {
+        "htmlparser2": "^7.1.2"
+      }
+    },
+    "node_modules/eslint-plugin-import": {
+      "version": "2.26.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
+      "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
+      "dev": true,
+      "dependencies": {
+        "array-includes": "^3.1.4",
+        "array.prototype.flat": "^1.2.5",
+        "debug": "^2.6.9",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.6",
+        "eslint-module-utils": "^2.7.3",
+        "has": "^1.0.3",
+        "is-core-module": "^2.8.1",
+        "is-glob": "^4.0.3",
+        "minimatch": "^3.1.2",
+        "object.values": "^1.1.5",
+        "resolve": "^1.22.0",
+        "tsconfig-paths": "^3.14.1"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/eslint-utils": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "engines": {
+        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      },
+      "peerDependencies": {
+        "eslint": ">=5"
+      }
+    },
+    "node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/eslint-visitor-keys": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/eslint/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/eslint/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/eslint/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/eslint/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/eslint/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/eslint-scope": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
+      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/eslint/node_modules/eslint-visitor-keys": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/eslint/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/eslint/node_modules/find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/eslint/node_modules/globals": {
+      "version": "13.18.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.18.0.tgz",
+      "integrity": "sha512-/mR4KI8Ps2spmoc0Ulu9L7agOF0du1CZNQ3dke8yItYlyKNmGrkONemBbd6V8UTc1Wgcqn21t3WYB7dbRmh6/A==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/is-path-inside": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/eslint/node_modules/locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/optionator": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "dev": true,
+      "dependencies": {
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/eslint/node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/eslint/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/espree": {
+      "version": "9.4.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz",
+      "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^8.8.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/espree/node_modules/acorn": {
+      "version": "8.8.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
+      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/espree/node_modules/eslint-visitor-keys": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/esquery": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/esquery/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esrecurse/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/events": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.x"
+      }
+    },
+    "node_modules/evp_bytestokey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "dev": true,
+      "dependencies": {
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/execa": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
+        "strip-final-newline": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/execall": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/execall/-/execall-2.0.0.tgz",
+      "integrity": "sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow==",
+      "dev": true,
+      "dependencies": {
+        "clone-regexp": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "node_modules/fast-glob": {
+      "version": "3.2.11",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
+      "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "dev": true
+    },
+    "node_modules/fastest-levenshtein": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
+      "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==",
+      "dev": true
+    },
+    "node_modules/fastq": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
+      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
+      "dev": true,
+      "dependencies": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "node_modules/file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dev": true,
+      "dependencies": {
+        "flat-cache": "^3.0.4"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/find-cache-dir": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
+      "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
+      "dev": true,
+      "dependencies": {
+        "commondir": "^1.0.1",
+        "make-dir": "^3.0.2",
+        "pkg-dir": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
+      }
+    },
+    "node_modules/find-root": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
+      "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==",
+      "dev": true
+    },
+    "node_modules/find-up": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+      "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/flat-cache": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+      "dev": true,
+      "dependencies": {
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/flat-cache/node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/flatted": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
+      "dev": true
+    },
+    "node_modules/flatten": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.3.tgz",
+      "integrity": "sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==",
+      "deprecated": "flatten is deprecated in favor of utility frameworks such as lodash.",
+      "dev": true
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "node_modules/gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true,
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
+      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-npm-tarball-url": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/get-npm-tarball-url/-/get-npm-tarball-url-2.0.3.tgz",
+      "integrity": "sha512-R/PW6RqyaBQNWYaSyfrh54/qtcnOp22FHCCiRhSSZj0FP3KQWCsxxt0DzIdVTbwTqe9CtQfvl/FPD4UIPt4pqw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.17"
+      }
+    },
+    "node_modules/get-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/get-symbol-description": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
+      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/glob": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/glob-to-regexp": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
+      "dev": true
+    },
+    "node_modules/global-modules": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
+      "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
+      "dev": true,
+      "dependencies": {
+        "global-prefix": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/global-prefix": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
+      "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
+      "dev": true,
+      "dependencies": {
+        "ini": "^1.3.5",
+        "kind-of": "^6.0.2",
+        "which": "^1.3.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/globby": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+      "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+      "dev": true,
+      "dependencies": {
+        "array-union": "^1.0.1",
+        "glob": "^7.0.3",
+        "object-assign": "^4.0.1",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/globby/node_modules/pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/globjoin": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
+      "integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=",
+      "dev": true
+    },
+    "node_modules/google-protobuf": {
+      "version": "3.21.0",
+      "resolved": "https://registry.npmjs.org/google-protobuf/-/google-protobuf-3.21.0.tgz",
+      "integrity": "sha512-byR7MBTK4tZ5PZEb+u5ZTzpt4SfrTxv5682MjPlHN16XeqgZE2/8HOIWeiXe8JKnT9OVbtBGhbq8mtvkK8cd5g==",
+      "dev": true
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.10",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
+      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
+      "dev": true
+    },
+    "node_modules/grapheme-splitter": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
+      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
+      "dev": true
+    },
+    "node_modules/hard-rejection": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
+      "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/has-bigints": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
+      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-tostringtag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/hash-base": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
+      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/hash-base/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/hash-base/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/hash.js": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
+      }
+    },
+    "node_modules/he": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+      "dev": true,
+      "bin": {
+        "he": "bin/he"
+      }
+    },
+    "node_modules/hmac-drbg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+      "dev": true,
+      "dependencies": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "node_modules/hosted-git-info": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
+      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/html-encoding-sniffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
+      "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
+      "dev": true,
+      "dependencies": {
+        "whatwg-encoding": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/html-minifier-terser": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
+      "integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==",
+      "dev": true,
+      "dependencies": {
+        "camel-case": "^4.1.2",
+        "clean-css": "^5.2.2",
+        "commander": "^8.3.0",
+        "he": "^1.2.0",
+        "param-case": "^3.0.4",
+        "relateurl": "^0.2.7",
+        "terser": "^5.10.0"
+      },
+      "bin": {
+        "html-minifier-terser": "cli.js"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/html-tags": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.2.0.tgz",
+      "integrity": "sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/html-webpack-plugin": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz",
+      "integrity": "sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw==",
+      "dev": true,
+      "dependencies": {
+        "@types/html-minifier-terser": "^6.0.0",
+        "html-minifier-terser": "^6.0.2",
+        "lodash": "^4.17.21",
+        "pretty-error": "^4.0.0",
+        "tapable": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/html-webpack-plugin"
+      },
+      "peerDependencies": {
+        "webpack": "^5.20.0"
+      }
+    },
+    "node_modules/htmlparser2": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz",
+      "integrity": "sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==",
+      "dev": true,
+      "funding": [
+        "https://github.com/fb55/htmlparser2?sponsor=1",
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ],
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.2.2",
+        "domutils": "^2.8.0",
+        "entities": "^3.0.1"
+      }
+    },
+    "node_modules/http-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
+      "dev": true,
+      "dependencies": {
+        "@tootallnate/once": "2",
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/https-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
+      "dev": true
+    },
+    "node_modules/https-proxy-agent": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/human-signals": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.17.0"
+      }
+    },
+    "node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dev": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/icss-utils": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
+      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
+      "dev": true,
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/ignore": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/immutable": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.1.0.tgz",
+      "integrity": "sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==",
+      "dev": true
+    },
+    "node_modules/import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "dev": true,
+      "dependencies": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/import-lazy": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
+      "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/import-local": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
+      "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
+      "dev": true,
+      "dependencies": {
+        "pkg-dir": "^4.2.0",
+        "resolve-cwd": "^3.0.0"
+      },
+      "bin": {
+        "import-local-fixture": "fixtures/cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/indent-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/indexes-of": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
+      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
+      "dev": true
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "node_modules/ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+      "dev": true
+    },
+    "node_modules/internal-slot": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
+      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.0",
+        "has": "^1.0.3",
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/interpret": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
+      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+      "dev": true
+    },
+    "node_modules/is-bigint": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "dev": true,
+      "dependencies": {
+        "has-bigints": "^1.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-boolean-object": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-callable": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-core-module": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz",
+      "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==",
+      "dev": true,
+      "dependencies": {
+        "has": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-date-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-negative-zero": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-number-object": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-path-cwd": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
+      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-path-in-cwd": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
+      "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
+      "dev": true,
+      "dependencies": {
+        "is-path-inside": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-path-inside": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
+      "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
+      "dev": true,
+      "dependencies": {
+        "path-is-inside": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-potential-custom-element-name": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
+      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
+      "dev": true
+    },
+    "node_modules/is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-regexp": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-2.1.0.tgz",
+      "integrity": "sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-shared-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-weakref": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
+    "node_modules/isnumeric": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/isnumeric/-/isnumeric-0.2.0.tgz",
+      "integrity": "sha1-ojR7o2DeGeM9D/1ZD933dVy/LmQ=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.x"
+      }
+    },
+    "node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/jest-worker": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
+      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/jest-worker/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-worker/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/jquery": {
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.1.tgz",
+      "integrity": "sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw==",
+      "peer": true
+    },
+    "node_modules/jquery.growl": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/jquery.growl/-/jquery.growl-1.3.5.tgz",
+      "integrity": "sha512-pK1RD8x3pXm1hEQ6KH0cu4QqzvI7R0EsUd5oneT5pavZ0cHwx/TV4qIdKeVfCWM0DVPyzI2GfXD6FwdDbRx1kw=="
+    },
+    "node_modules/js-sdsl": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz",
+      "integrity": "sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==",
+      "dev": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/js-sdsl"
+      }
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/jsdom": {
+      "version": "19.0.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-19.0.0.tgz",
+      "integrity": "sha512-RYAyjCbxy/vri/CfnjUWJQQtZ3LKlLnDqj+9XLNnJPgEGeirZs3hllKR20re8LUZ6o1b1X4Jat+Qd26zmP41+A==",
+      "dev": true,
+      "dependencies": {
+        "abab": "^2.0.5",
+        "acorn": "^8.5.0",
+        "acorn-globals": "^6.0.0",
+        "cssom": "^0.5.0",
+        "cssstyle": "^2.3.0",
+        "data-urls": "^3.0.1",
+        "decimal.js": "^10.3.1",
+        "domexception": "^4.0.0",
+        "escodegen": "^2.0.0",
+        "form-data": "^4.0.0",
+        "html-encoding-sniffer": "^3.0.0",
+        "http-proxy-agent": "^5.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "is-potential-custom-element-name": "^1.0.1",
+        "nwsapi": "^2.2.0",
+        "parse5": "6.0.1",
+        "saxes": "^5.0.1",
+        "symbol-tree": "^3.2.4",
+        "tough-cookie": "^4.0.0",
+        "w3c-hr-time": "^1.0.2",
+        "w3c-xmlserializer": "^3.0.0",
+        "webidl-conversions": "^7.0.0",
+        "whatwg-encoding": "^2.0.0",
+        "whatwg-mimetype": "^3.0.0",
+        "whatwg-url": "^10.0.0",
+        "ws": "^8.2.3",
+        "xml-name-validator": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "peerDependencies": {
+        "canvas": "^2.5.0"
+      },
+      "peerDependenciesMeta": {
+        "canvas": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jsdom/node_modules/acorn": {
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
+      "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/jsdom/node_modules/form-data": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "dev": true,
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/jsdom/node_modules/punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/jsdom/node_modules/tough-cookie": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
+      "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
+      "dev": true,
+      "dependencies": {
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.1.2"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "dev": true,
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+      "dev": true
+    },
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+      "dev": true
+    },
+    "node_modules/json5": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
+      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
+      "dev": true,
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/klona": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz",
+      "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/known-css-properties": {
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.24.0.tgz",
+      "integrity": "sha512-RTSoaUAfLvpR357vWzAz/50Q/BmHfmE6ETSWfutT0AJiw10e6CmcdYRQJlLRd95B53D0Y2aD1jSxD3V3ySF+PA==",
+      "dev": true
+    },
+    "node_modules/ldjson-stream": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ldjson-stream/-/ldjson-stream-1.2.1.tgz",
+      "integrity": "sha1-kb7O2lrE7SsX5kn7d356v6AYnCs=",
+      "dev": true,
+      "dependencies": {
+        "split2": "^0.2.1",
+        "through2": "^0.6.1"
+      }
+    },
+    "node_modules/ldjson-stream/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+      "dev": true
+    },
+    "node_modules/ldjson-stream/node_modules/readable-stream": {
+      "version": "1.0.34",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+      "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/ldjson-stream/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+      "dev": true
+    },
+    "node_modules/ldjson-stream/node_modules/through2": {
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+      "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": ">=1.0.33-1 <1.1.0-0",
+        "xtend": ">=4.0.0 <4.1.0-0"
+      }
+    },
+    "node_modules/levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+      "dev": true
+    },
+    "node_modules/loader-runner": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
+      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.11.5"
+      }
+    },
+    "node_modules/loader-utils": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
+      "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=8.9.0"
+      }
+    },
+    "node_modules/locate-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^2.0.0",
+        "path-exists": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
+    },
+    "node_modules/lodash._reinterpolate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
+      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
+      "dev": true
+    },
+    "node_modules/lodash.debounce": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
+      "dev": true
+    },
+    "node_modules/lodash.memoize": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+      "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
+      "dev": true
+    },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
+    },
+    "node_modules/lodash.template": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
+      "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==",
+      "dev": true,
+      "dependencies": {
+        "lodash._reinterpolate": "^3.0.0",
+        "lodash.templatesettings": "^4.0.0"
+      }
+    },
+    "node_modules/lodash.templatesettings": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz",
+      "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==",
+      "dev": true,
+      "dependencies": {
+        "lodash._reinterpolate": "^3.0.0"
+      }
+    },
+    "node_modules/lodash.truncate": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
+      "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
+      "dev": true
+    },
+    "node_modules/lodash.uniq": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
+      "dev": true
+    },
+    "node_modules/lower-case": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
+      "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/make-dir": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "dev": true,
+      "dependencies": {
+        "semver": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/map-obj": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
+      "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/material-design-icons-iconfont": {
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/material-design-icons-iconfont/-/material-design-icons-iconfont-6.7.0.tgz",
+      "integrity": "sha512-lSj71DgVv20kO0kGbs42icDzbRot61gEDBLQACzkUuznRQBUYmbxzEkGU6dNBb5fRWHMaScYlAXX96HQ4/cJWA=="
+    },
+    "node_modules/math-expression-evaluator": {
+      "version": "1.3.14",
+      "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.3.14.tgz",
+      "integrity": "sha512-M6AMrvq9bO8uL42KvQHPA2/SbAobA0R7gviUmPrcTcGfdwpaLitz4q2Euzx2lP9Oy88vxK3HOrsISgSwKsYS4A==",
+      "dev": true
+    },
+    "node_modules/mathml-tag-names": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz",
+      "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/md5.js": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+      "dev": true,
+      "dependencies": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/mdn-data": {
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
+      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
+      "dev": true
+    },
+    "node_modules/memory-fs": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz",
+      "integrity": "sha512-+y4mDxU4rvXXu5UDSGCGNiesFmwCHuefGMoPCO1WYucNYj7DsLqrFaa2fXVI0H+NNiPTwwzKwspn9yTZqUGqng==",
+      "dev": true
+    },
+    "node_modules/meow": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
+      "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/minimist": "^1.2.0",
+        "camelcase-keys": "^6.2.2",
+        "decamelize": "^1.2.0",
+        "decamelize-keys": "^1.1.0",
+        "hard-rejection": "^2.1.0",
+        "minimist-options": "4.1.0",
+        "normalize-package-data": "^3.0.0",
+        "read-pkg-up": "^7.0.1",
+        "redent": "^3.0.0",
+        "trim-newlines": "^3.0.0",
+        "type-fest": "^0.18.0",
+        "yargs-parser": "^20.2.3"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/meow/node_modules/type-fest": {
+      "version": "0.18.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
+      "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true
+    },
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "dev": true,
+      "dependencies": {
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/miller-rabin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
+      },
+      "bin": {
+        "miller-rabin": "bin/miller-rabin"
+      }
+    },
+    "node_modules/miller-rabin/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
+    "node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "dev": true,
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/min-indent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
+      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/mini-css-extract-plugin": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.2.tgz",
+      "integrity": "sha512-WhDvO3SjGm40oV5y26GjMJYjd2UMqrLAGKy5YS2/3QKJy2F7jgynuHTir/tgUUOiNQu5saXHdc8reo7YuhhT4Q==",
+      "dev": true,
+      "dependencies": {
+        "loader-utils": "^2.0.0",
+        "schema-utils": "^3.0.0",
+        "webpack-sources": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.4.0 || ^5.0.0"
+      }
+    },
+    "node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+      "dev": true
+    },
+    "node_modules/minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
+      "dev": true
+    },
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
+      "dev": true
+    },
+    "node_modules/minimist-options": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
+      "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
+      "dev": true,
+      "dependencies": {
+        "arrify": "^1.0.1",
+        "is-plain-obj": "^1.1.0",
+        "kind-of": "^6.0.3"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/multimatch": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-5.0.0.tgz",
+      "integrity": "sha512-ypMKuglUrZUD99Tk2bUQ+xNQj43lPEfAeX2o9cTteAmShXy2VHDJpuwu1o0xqoKCt9jLVAvwyFKdLTPXKAfJyA==",
+      "dev": true,
+      "dependencies": {
+        "@types/minimatch": "^3.0.3",
+        "array-differ": "^3.0.0",
+        "array-union": "^2.1.0",
+        "arrify": "^2.0.1",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/multimatch/node_modules/array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/multimatch/node_modules/arrify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
+      "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
+      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
+      "dev": true,
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+      "dev": true
+    },
+    "node_modules/needle": {
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/needle/-/needle-2.9.1.tgz",
+      "integrity": "sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.6",
+        "iconv-lite": "^0.4.4",
+        "sax": "^1.2.4"
+      },
+      "bin": {
+        "needle": "bin/needle"
+      },
+      "engines": {
+        "node": ">= 4.4.x"
+      }
+    },
+    "node_modules/needle/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/neo-async": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+      "dev": true
+    },
+    "node_modules/no-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
+      "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
+      "dev": true,
+      "dependencies": {
+        "lower-case": "^2.0.2",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/node-libs-browser": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
+      "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
+      "dev": true,
+      "dependencies": {
+        "assert": "^1.1.1",
+        "browserify-zlib": "^0.2.0",
+        "buffer": "^4.3.0",
+        "console-browserify": "^1.1.0",
+        "constants-browserify": "^1.0.0",
+        "crypto-browserify": "^3.11.0",
+        "domain-browser": "^1.1.1",
+        "events": "^3.0.0",
+        "https-browserify": "^1.0.0",
+        "os-browserify": "^0.3.0",
+        "path-browserify": "0.0.1",
+        "process": "^0.11.10",
+        "punycode": "^1.2.4",
+        "querystring-es3": "^0.2.0",
+        "readable-stream": "^2.3.3",
+        "stream-browserify": "^2.0.1",
+        "stream-http": "^2.7.2",
+        "string_decoder": "^1.0.0",
+        "timers-browserify": "^2.0.4",
+        "tty-browserify": "0.0.0",
+        "url": "^0.11.0",
+        "util": "^0.11.0",
+        "vm-browserify": "^1.0.1"
+      }
+    },
+    "node_modules/node-releases": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.3.tgz",
+      "integrity": "sha512-maHFz6OLqYxz+VQyCAtA3PTX4UP/53pa05fyDNc9CwjvJ0yEh6+xBwKsgCxMNhS8taUKBFYxfuiaD9U/55iFaw==",
+      "dev": true
+    },
+    "node_modules/normalize-package-data": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
+      "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
+      "dev": true,
+      "dependencies": {
+        "hosted-git-info": "^4.0.1",
+        "is-core-module": "^2.5.0",
+        "semver": "^7.3.4",
+        "validate-npm-package-license": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/normalize-package-data/node_modules/semver": {
+      "version": "7.3.7",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/normalize-range": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/normalize-selector": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz",
+      "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=",
+      "dev": true
+    },
+    "node_modules/npm-run-path": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/nth-check": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz",
+      "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==",
+      "dev": true,
+      "dependencies": {
+        "boolbase": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/nth-check?sponsor=1"
+      }
+    },
+    "node_modules/num2fraction": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
+      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
+      "dev": true
+    },
+    "node_modules/nwsapi": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
+      "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
+      "dev": true
+    },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
+      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.assign": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "has-symbols": "^1.0.1",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
+      "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.values": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
+      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/onecolor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/onecolor/-/onecolor-3.1.0.tgz",
+      "integrity": "sha512-YZSypViXzu3ul5LMu/m6XjJ9ol8qAy9S2VjHl5E6UlhUH1KGKWabyEJifn0Jjpw23bYDzC2ucKMPGiH5kfwSGQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.8"
+      }
+    },
+    "node_modules/onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dev": true,
+      "dependencies": {
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/open-sans-fonts": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/open-sans-fonts/-/open-sans-fonts-1.6.2.tgz",
+      "integrity": "sha512-vsJ6/Mm0TdUKQJqxfkXJy+0K2X0QeRuTmxQq9YE1ycziw6CbDPolDsHhQ6+ImoV/7OTh8K8ZTGklY1Z5nUAwug==",
+      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info."
+    },
+    "node_modules/optionator": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+      "dev": true,
+      "dependencies": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.6",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "word-wrap": "~1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/os-browserify": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
+      "dev": true
+    },
+    "node_modules/p-limit": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-map": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
+      "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/p-try": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/pako": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
+      "dev": true
+    },
+    "node_modules/param-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
+      "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
+      "dev": true,
+      "dependencies": {
+        "dot-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "dependencies": {
+        "callsites": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parse-asn1": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
+      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
+      "dev": true,
+      "dependencies": {
+        "asn1.js": "^5.2.0",
+        "browserify-aes": "^1.0.0",
+        "evp_bytestokey": "^1.0.0",
+        "pbkdf2": "^3.0.3",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/parse5": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+      "dev": true
+    },
+    "node_modules/pascal-case": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
+      "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
+      "dev": true,
+      "dependencies": {
+        "no-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/path": {
+      "version": "0.12.7",
+      "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz",
+      "integrity": "sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=",
+      "dev": true,
+      "dependencies": {
+        "process": "^0.11.1",
+        "util": "^0.10.3"
+      }
+    },
+    "node_modules/path-browserify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
+      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
+      "dev": true
+    },
+    "node_modules/path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
+      "dev": true
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
+    },
+    "node_modules/path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "dev": true
+    },
+    "node_modules/path/node_modules/util": {
+      "version": "0.10.4",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
+      "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "2.0.3"
+      }
+    },
+    "node_modules/pbkdf2": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
+      "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
+      "dev": true,
+      "dependencies": {
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      },
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
+    "node_modules/perfect-scrollbar": {
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/perfect-scrollbar/-/perfect-scrollbar-1.5.5.tgz",
+      "integrity": "sha512-dzalfutyP3e/FOpdlhVryN4AJ5XDVauVWxybSkLZmakFE2sS3y3pc4JnSprw8tGmHvkaG5Edr5T7LBTZ+WWU2g=="
+    },
+    "node_modules/picocolors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+      "dev": true
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "dev": true,
+      "dependencies": {
+        "pinkie": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pixrem": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pixrem/-/pixrem-4.0.1.tgz",
+      "integrity": "sha1-LaSh3m7EQjxfw3lOkwuB1EkOxoY=",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^2.0.0",
+        "postcss": "^6.0.0",
+        "reduce-css-calc": "^1.2.7"
+      },
+      "engines": {
+        "node": ">=0.10.0",
+        "npm": ">=1.2.10"
+      }
+    },
+    "node_modules/pixrem/node_modules/browserslist": {
+      "version": "2.11.3",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz",
+      "integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==",
+      "deprecated": "Browserslist 2 could fail on reading Browserslist >3.0 config used in other tools.",
+      "dev": true,
+      "dependencies": {
+        "caniuse-lite": "^1.0.30000792",
+        "electron-to-chromium": "^1.3.30"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      }
+    },
+    "node_modules/pixrem/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/pixrem/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pleeease-filters": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/pleeease-filters/-/pleeease-filters-4.0.0.tgz",
+      "integrity": "sha1-ZjKy+wVkjSdY2GU4T7zteeHMrsc=",
+      "dev": true,
+      "dependencies": {
+        "onecolor": "^3.0.4",
+        "postcss": "^6.0.1"
+      }
+    },
+    "node_modules/pleeease-filters/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/pleeease-filters/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/popper.js": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
+      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
+      "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1",
+      "peer": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/popperjs"
+      }
+    },
+    "node_modules/postcss": {
+      "version": "8.4.19",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.19.tgz",
+      "integrity": "sha512-h+pbPsyhlYj6N2ozBmHhHrs9DzGmbaarbLvWipMRO7RLS+v4onj26MPFXA5OBYFxyqYhUJK456SwDcY9H2/zsA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        }
+      ],
+      "dependencies": {
+        "nanoid": "^3.3.4",
+        "picocolors": "^1.0.0",
+        "source-map-js": "^1.0.2"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      }
+    },
+    "node_modules/postcss-apply": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/postcss-apply/-/postcss-apply-0.8.0.tgz",
+      "integrity": "sha1-FOVEu7XLbxweBIhXll15rgZrE0M=",
+      "dev": true,
+      "dependencies": {
+        "babel-runtime": "^6.23.0",
+        "balanced-match": "^0.4.2",
+        "postcss": "^6.0.0"
+      }
+    },
+    "node_modules/postcss-apply/node_modules/balanced-match": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
+      "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
+      "dev": true
+    },
+    "node_modules/postcss-apply/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-apply/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-attribute-case-insensitive": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-2.0.0.tgz",
+      "integrity": "sha1-lNxCLI+QmX8WvTOjZUu77AhJY7Q=",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^6.0.0",
+        "postcss-selector-parser": "^2.2.3"
+      }
+    },
+    "node_modules/postcss-attribute-case-insensitive/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-attribute-case-insensitive/node_modules/postcss-selector-parser": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz",
+      "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=",
+      "dev": true,
+      "dependencies": {
+        "flatten": "^1.0.2",
+        "indexes-of": "^1.0.1",
+        "uniq": "^1.0.1"
+      }
+    },
+    "node_modules/postcss-attribute-case-insensitive/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-color-function": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-color-function/-/postcss-color-function-4.1.0.tgz",
+      "integrity": "sha512-2/fuv6mP5Lt03XbRpVfMdGC8lRP1sykme+H1bR4ARyOmSMB8LPSjcL6EAI1iX6dqUF+jNEvKIVVXhan1w/oFDQ==",
+      "dev": true,
+      "dependencies": {
+        "css-color-function": "~1.3.3",
+        "postcss": "^6.0.23",
+        "postcss-message-helpers": "^2.0.0",
+        "postcss-value-parser": "^3.3.1"
+      }
+    },
+    "node_modules/postcss-color-function/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-color-function/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-color-gray": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-color-gray/-/postcss-color-gray-4.1.0.tgz",
+      "integrity": "sha512-L4iLKQLdqChz6ZOgGb6dRxkBNw78JFYcJmBz1orHpZoeLtuhDDGegRtX9gSyfoCIM7rWZ3VNOyiqqvk83BEN+w==",
+      "dev": true,
+      "dependencies": {
+        "color": "^2.0.1",
+        "postcss": "^6.0.14",
+        "postcss-message-helpers": "^2.0.0",
+        "reduce-function-call": "^1.0.2"
+      }
+    },
+    "node_modules/postcss-color-gray/node_modules/color": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color/-/color-2.0.1.tgz",
+      "integrity": "sha512-ubUCVVKfT7r2w2D3qtHakj8mbmKms+tThR8gI8zEYCbUBl8/voqFGt3kgBqGwXAopgXybnkuOq+qMYCRrp4cXw==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.1",
+        "color-string": "^1.5.2"
+      }
+    },
+    "node_modules/postcss-color-gray/node_modules/color-string": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.0.tgz",
+      "integrity": "sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "^1.0.0",
+        "simple-swizzle": "^0.2.2"
+      }
+    },
+    "node_modules/postcss-color-gray/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-color-gray/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-color-hex-alpha": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-3.0.0.tgz",
+      "integrity": "sha1-HlPmyKyyN5Vej9CLfs2xuLgwn5U=",
+      "dev": true,
+      "dependencies": {
+        "color": "^1.0.3",
+        "postcss": "^6.0.1",
+        "postcss-message-helpers": "^2.0.0"
+      }
+    },
+    "node_modules/postcss-color-hex-alpha/node_modules/color": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/color/-/color-1.0.3.tgz",
+      "integrity": "sha1-5I6DLYXxTvaU+0aIEcLVz+cptV0=",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.8.2",
+        "color-string": "^1.4.0"
+      }
+    },
+    "node_modules/postcss-color-hex-alpha/node_modules/color-string": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.0.tgz",
+      "integrity": "sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "^1.0.0",
+        "simple-swizzle": "^0.2.2"
+      }
+    },
+    "node_modules/postcss-color-hex-alpha/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-color-hex-alpha/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-color-hsl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-color-hsl/-/postcss-color-hsl-2.0.0.tgz",
+      "integrity": "sha1-EnA2ZvoxBDDj8wpFTawThjF9WEQ=",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^6.0.1",
+        "postcss-value-parser": "^3.3.0",
+        "units-css": "^0.4.0"
+      }
+    },
+    "node_modules/postcss-color-hsl/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-color-hsl/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-color-hwb": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-color-hwb/-/postcss-color-hwb-3.0.0.tgz",
+      "integrity": "sha1-NAKxnvTYSXVAwftQcr6YY8qVVx4=",
+      "dev": true,
+      "dependencies": {
+        "color": "^1.0.3",
+        "postcss": "^6.0.1",
+        "postcss-message-helpers": "^2.0.0",
+        "reduce-function-call": "^1.0.2"
+      }
+    },
+    "node_modules/postcss-color-hwb/node_modules/color": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/color/-/color-1.0.3.tgz",
+      "integrity": "sha1-5I6DLYXxTvaU+0aIEcLVz+cptV0=",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.8.2",
+        "color-string": "^1.4.0"
+      }
+    },
+    "node_modules/postcss-color-hwb/node_modules/color-string": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.0.tgz",
+      "integrity": "sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "^1.0.0",
+        "simple-swizzle": "^0.2.2"
+      }
+    },
+    "node_modules/postcss-color-hwb/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-color-hwb/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-color-rebeccapurple": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-3.1.0.tgz",
+      "integrity": "sha512-212hJUk9uSsbwO5ECqVjmh/iLsmiVL1xy9ce9TVf+X3cK/ZlUIlaMdoxje/YpsL9cmUH3I7io+/G2LyWx5rg1g==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^6.0.22",
+        "postcss-values-parser": "^1.5.0"
+      }
+    },
+    "node_modules/postcss-color-rebeccapurple/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-color-rebeccapurple/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-color-rgb": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-color-rgb/-/postcss-color-rgb-2.0.0.tgz",
+      "integrity": "sha1-FFOcinExSUtILg3RzCZf9lFLUmM=",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^6.0.1",
+        "postcss-value-parser": "^3.3.0"
+      }
+    },
+    "node_modules/postcss-color-rgb/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-color-rgb/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-color-rgba-fallback": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-color-rgba-fallback/-/postcss-color-rgba-fallback-3.0.0.tgz",
+      "integrity": "sha1-N9XJNToHoJJwkSqCYGu0Kg1wLAQ=",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^6.0.6",
+        "postcss-value-parser": "^3.3.0",
+        "rgb-hex": "^2.1.0"
+      }
+    },
+    "node_modules/postcss-color-rgba-fallback/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-color-rgba-fallback/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-cssnext": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-cssnext/-/postcss-cssnext-3.1.1.tgz",
+      "integrity": "sha512-u9e0CYE7zudnr/LK+FL02cwli8cQEwwmzzN3JVeOEZiDs0q8IDfGdI6C9FCkHtIKEEjY3AATW3dqCCvqDK+Sfg==",
+      "deprecated": "'postcss-cssnext' has been deprecated in favor of 'postcss-preset-env'. Read more at https://moox.io/blog/deprecating-cssnext/",
+      "dev": true,
+      "dependencies": {
+        "autoprefixer": "^7.1.1",
+        "caniuse-api": "^2.0.0",
+        "chalk": "^2.0.1",
+        "pixrem": "^4.0.0",
+        "pleeease-filters": "^4.0.0",
+        "postcss": "^6.0.5",
+        "postcss-apply": "^0.8.0",
+        "postcss-attribute-case-insensitive": "^2.0.0",
+        "postcss-calc": "^6.0.0",
+        "postcss-color-function": "^4.0.0",
+        "postcss-color-gray": "^4.0.0",
+        "postcss-color-hex-alpha": "^3.0.0",
+        "postcss-color-hsl": "^2.0.0",
+        "postcss-color-hwb": "^3.0.0",
+        "postcss-color-rebeccapurple": "^3.0.0",
+        "postcss-color-rgb": "^2.0.0",
+        "postcss-color-rgba-fallback": "^3.0.0",
+        "postcss-custom-media": "^6.0.0",
+        "postcss-custom-properties": "^6.1.0",
+        "postcss-custom-selectors": "^4.0.1",
+        "postcss-font-family-system-ui": "^3.0.0",
+        "postcss-font-variant": "^3.0.0",
+        "postcss-image-set-polyfill": "^0.3.5",
+        "postcss-initial": "^2.0.0",
+        "postcss-media-minmax": "^3.0.0",
+        "postcss-nesting": "^4.0.1",
+        "postcss-pseudo-class-any-link": "^4.0.0",
+        "postcss-pseudoelements": "^5.0.0",
+        "postcss-replace-overflow-wrap": "^2.0.0",
+        "postcss-selector-matches": "^3.0.1",
+        "postcss-selector-not": "^3.0.1"
+      },
+      "peerDependencies": {
+        "caniuse-lite": "^1.0.30000697"
+      }
+    },
+    "node_modules/postcss-cssnext/node_modules/browserslist": {
+      "version": "2.11.3",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz",
+      "integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==",
+      "deprecated": "Browserslist 2 could fail on reading Browserslist >3.0 config used in other tools.",
+      "dev": true,
+      "dependencies": {
+        "caniuse-lite": "^1.0.30000792",
+        "electron-to-chromium": "^1.3.30"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      }
+    },
+    "node_modules/postcss-cssnext/node_modules/caniuse-api": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-2.0.0.tgz",
+      "integrity": "sha1-sd21pZZrFvSNxJmERNS7xsfZ2DQ=",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^2.0.0",
+        "caniuse-lite": "^1.0.0",
+        "lodash.memoize": "^4.1.2",
+        "lodash.uniq": "^4.5.0"
+      }
+    },
+    "node_modules/postcss-cssnext/node_modules/picocolors": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+      "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+      "dev": true
+    },
+    "node_modules/postcss-cssnext/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-cssnext/node_modules/postcss-calc": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-6.0.2.tgz",
+      "integrity": "sha512-fiznXjEN5T42Qm7qqMCVJXS3roaj9r4xsSi+meaBVe7CJBl8t/QLOXu02Z2E6oWAMWIvCuF6JrvzFekmVEbOKA==",
+      "dev": true,
+      "dependencies": {
+        "css-unit-converter": "^1.1.1",
+        "postcss": "^7.0.2",
+        "postcss-selector-parser": "^2.2.2",
+        "reduce-css-calc": "^2.0.0"
+      }
+    },
+    "node_modules/postcss-cssnext/node_modules/postcss-calc/node_modules/postcss": {
+      "version": "7.0.39",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+      "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
+      "dev": true,
+      "dependencies": {
+        "picocolors": "^0.2.1",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      }
+    },
+    "node_modules/postcss-cssnext/node_modules/postcss-selector-parser": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz",
+      "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=",
+      "dev": true,
+      "dependencies": {
+        "flatten": "^1.0.2",
+        "indexes-of": "^1.0.1",
+        "uniq": "^1.0.1"
+      }
+    },
+    "node_modules/postcss-cssnext/node_modules/reduce-css-calc": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-2.1.8.tgz",
+      "integrity": "sha512-8liAVezDmUcH+tdzoEGrhfbGcP7nOV4NkGE3a74+qqvE7nt9i4sKLGBuZNOnpI4WiGksiNPklZxva80061QiPg==",
+      "dev": true,
+      "dependencies": {
+        "css-unit-converter": "^1.1.1",
+        "postcss-value-parser": "^3.3.0"
+      }
+    },
+    "node_modules/postcss-cssnext/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-custom-media": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-6.0.0.tgz",
+      "integrity": "sha1-vlMnhBEOyylQRPtTlaGABushpzc=",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^6.0.1"
+      }
+    },
+    "node_modules/postcss-custom-media/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-custom-media/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-custom-properties": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-6.3.1.tgz",
+      "integrity": "sha512-zoiwn4sCiUFbr4KcgcNZLFkR6gVQom647L+z1p/KBVHZ1OYwT87apnS42atJtx6XlX2yI7N5fjXbFixShQO2QQ==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "postcss": "^6.0.18"
+      }
+    },
+    "node_modules/postcss-custom-properties/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-custom-properties/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-custom-selectors": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-4.0.1.tgz",
+      "integrity": "sha1-eBOC+UxS5yfvXKR3bqKt9JphE4I=",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^6.0.1",
+        "postcss-selector-matches": "^3.0.0"
+      }
+    },
+    "node_modules/postcss-custom-selectors/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-custom-selectors/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-font-family-system-ui": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-font-family-system-ui/-/postcss-font-family-system-ui-3.0.0.tgz",
+      "integrity": "sha512-58G/hTxMSSKlIRpcPUjlyo6hV2MEzvcVO2m4L/T7Bb2fJTG4DYYfQjQeRvuimKQh1V1sOzCIz99g+H2aFNtlQw==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^6.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-font-family-system-ui/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-font-family-system-ui/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-font-variant": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-3.0.0.tgz",
+      "integrity": "sha1-CMzIj2BQuoLtjvLMdsDGprQfGD4=",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^6.0.1"
+      }
+    },
+    "node_modules/postcss-font-variant/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-font-variant/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-image-set-polyfill": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/postcss-image-set-polyfill/-/postcss-image-set-polyfill-0.3.5.tgz",
+      "integrity": "sha1-Dxk0E3AM8fgr05Bm7wFtZaShgYE=",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^6.0.1",
+        "postcss-media-query-parser": "^0.2.3"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-image-set-polyfill/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-image-set-polyfill/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-initial": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-2.0.0.tgz",
+      "integrity": "sha1-cnFfczbgu3k1HZnuZcSiU6hEG6Q=",
+      "dev": true,
+      "dependencies": {
+        "lodash.template": "^4.2.4",
+        "postcss": "^6.0.1"
+      }
+    },
+    "node_modules/postcss-initial/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-initial/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-loader": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-5.3.0.tgz",
+      "integrity": "sha512-/+Z1RAmssdiSLgIZwnJHwBMnlABPgF7giYzTN2NOfr9D21IJZ4mQC1R2miwp80zno9M4zMD/umGI8cR+2EL5zw==",
+      "dev": true,
+      "dependencies": {
+        "cosmiconfig": "^7.0.0",
+        "klona": "^2.0.4",
+        "semver": "^7.3.4"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "postcss": "^7.0.0 || ^8.0.1",
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/postcss-loader/node_modules/semver": {
+      "version": "7.3.7",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/postcss-media-minmax": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-3.0.0.tgz",
+      "integrity": "sha1-Z1JWA3pD70C8Twdgv9BtTcadSNI=",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^6.0.1"
+      }
+    },
+    "node_modules/postcss-media-minmax/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-media-minmax/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-media-query-parser": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
+      "integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=",
+      "dev": true
+    },
+    "node_modules/postcss-message-helpers": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz",
+      "integrity": "sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4=",
+      "dev": true
+    },
+    "node_modules/postcss-modules-extract-imports": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
+      "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
+      "dev": true,
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz",
+      "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==",
+      "dev": true,
+      "dependencies": {
+        "icss-utils": "^5.0.0",
+        "postcss-selector-parser": "^6.0.2",
+        "postcss-value-parser": "^4.1.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default/node_modules/postcss-value-parser": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+      "dev": true
+    },
+    "node_modules/postcss-modules-scope": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
+      "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
+      "dev": true,
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.4"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-modules-values": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
+      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
+      "dev": true,
+      "dependencies": {
+        "icss-utils": "^5.0.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-nesting": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-4.2.1.tgz",
+      "integrity": "sha512-IkyWXICwagCnlaviRexi7qOdwPw3+xVVjgFfGsxmztvRVaNxAlrypOIKqDE5mxY+BVxnId1rnUKBRQoNE2VDaA==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^6.0.11"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-nesting/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-nesting/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-pseudo-class-any-link": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-4.0.0.tgz",
+      "integrity": "sha1-kVKgYT00UHIFE+iJKFS65C0O5o4=",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^6.0.1",
+        "postcss-selector-parser": "^2.2.3"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-pseudo-class-any-link/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-pseudo-class-any-link/node_modules/postcss-selector-parser": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz",
+      "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=",
+      "dev": true,
+      "dependencies": {
+        "flatten": "^1.0.2",
+        "indexes-of": "^1.0.1",
+        "uniq": "^1.0.1"
+      }
+    },
+    "node_modules/postcss-pseudo-class-any-link/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-pseudoelements": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-pseudoelements/-/postcss-pseudoelements-5.0.0.tgz",
+      "integrity": "sha1-7vGU6NUkZFylIKlJ6V5RjoEkAss=",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^6.0.0"
+      }
+    },
+    "node_modules/postcss-pseudoelements/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-pseudoelements/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-replace-overflow-wrap": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-2.0.0.tgz",
+      "integrity": "sha1-eU22+qVPjbEAhUOSqTr0V2i04ls=",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^6.0.1"
+      }
+    },
+    "node_modules/postcss-replace-overflow-wrap/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-replace-overflow-wrap/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-resolve-nested-selector": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz",
+      "integrity": "sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=",
+      "dev": true
+    },
+    "node_modules/postcss-safe-parser": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz",
+      "integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      },
+      "peerDependencies": {
+        "postcss": "^8.3.3"
+      }
+    },
+    "node_modules/postcss-selector-matches": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-selector-matches/-/postcss-selector-matches-3.0.1.tgz",
+      "integrity": "sha1-5WNAEeE5UIgYYbvdWMLQER/8lqs=",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^0.4.2",
+        "postcss": "^6.0.1"
+      }
+    },
+    "node_modules/postcss-selector-matches/node_modules/balanced-match": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
+      "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
+      "dev": true
+    },
+    "node_modules/postcss-selector-matches/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-selector-matches/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-selector-not": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-3.0.1.tgz",
+      "integrity": "sha1-Lk2y8JZTNsAefOx9tsYN/3ZzNdk=",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^0.4.2",
+        "postcss": "^6.0.1"
+      }
+    },
+    "node_modules/postcss-selector-not/node_modules/balanced-match": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
+      "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
+      "dev": true
+    },
+    "node_modules/postcss-selector-not/node_modules/postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/postcss-selector-not/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-selector-parser": {
+      "version": "6.0.10",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
+      "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
+      "dev": true,
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-sorting": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-7.0.1.tgz",
+      "integrity": "sha512-iLBFYz6VRYyLJEJsBJ8M3TCqNcckVzz4wFounSc5Oez35ogE/X+aoC5fFu103Ot7NyvjU3/xqIXn93Gp3kJk4g==",
+      "dev": true,
+      "peerDependencies": {
+        "postcss": "^8.3.9"
+      }
+    },
+    "node_modules/postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "node_modules/postcss-values-parser": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/postcss-values-parser/-/postcss-values-parser-1.5.0.tgz",
+      "integrity": "sha512-3M3p+2gMp0AH3da530TlX8kiO1nxdTnc3C6vr8dMxRLIlh8UYkz0/wcwptSXjhtx2Fr0TySI7a+BHDQ8NL7LaQ==",
+      "dev": true,
+      "dependencies": {
+        "flatten": "^1.0.2",
+        "indexes-of": "^1.0.1",
+        "uniq": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/prestakit": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/prestakit/-/prestakit-1.2.5.tgz",
+      "integrity": "sha512-dLa1+teIRLLVtjk0F2pQL2Ya+HTGQUuJ6P6k+HZWJbT+1cwQkN7VAUiH7XGLHVSJchrI+hnarR43tI2B5XZDUA==",
+      "dependencies": {
+        "bootstrap": "^4.4.1",
+        "jquery.growl": "^1.3.5",
+        "material-design-icons-iconfont": "^6.1.0",
+        "open-sans-fonts": "^1.6.2",
+        "select2": "^4.0.5",
+        "select2-bootstrap-theme": "0.1.0-beta.10"
+      }
+    },
+    "node_modules/pretty-error": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz",
+      "integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==",
+      "dev": true,
+      "dependencies": {
+        "lodash": "^4.17.20",
+        "renderkid": "^3.0.0"
+      }
+    },
+    "node_modules/process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
+    "node_modules/process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "dev": true
+    },
+    "node_modules/psl": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
+      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
+      "dev": true
+    },
+    "node_modules/public-encrypt": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "parse-asn1": "^5.0.0",
+        "randombytes": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/public-encrypt/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
+    "node_modules/punycode": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+      "dev": true
+    },
+    "node_modules/querystring": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
+      "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.x"
+      }
+    },
+    "node_modules/querystring-es3": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.x"
+      }
+    },
+    "node_modules/queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/quick-lru": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
+      "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/randomfill": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+      "dev": true,
+      "dependencies": {
+        "randombytes": "^2.0.5",
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/read-pkg": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
+      "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
+      "dev": true,
+      "dependencies": {
+        "@types/normalize-package-data": "^2.4.0",
+        "normalize-package-data": "^2.5.0",
+        "parse-json": "^5.0.0",
+        "type-fest": "^0.6.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/read-pkg-up": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
+      "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^4.1.0",
+        "read-pkg": "^5.2.0",
+        "type-fest": "^0.8.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/type-fest": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/read-pkg/node_modules/hosted-git-info": {
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+      "dev": true
+    },
+    "node_modules/read-pkg/node_modules/normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dev": true,
+      "dependencies": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      }
+    },
+    "node_modules/read-pkg/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/read-pkg/node_modules/type-fest": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
+      "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/readable-stream/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/rechoir": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz",
+      "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==",
+      "dev": true,
+      "dependencies": {
+        "resolve": "^1.9.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/redent": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
+      "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
+      "dev": true,
+      "dependencies": {
+        "indent-string": "^4.0.0",
+        "strip-indent": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/reduce-css-calc": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz",
+      "integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^0.4.2",
+        "math-expression-evaluator": "^1.2.14",
+        "reduce-function-call": "^1.0.1"
+      }
+    },
+    "node_modules/reduce-css-calc/node_modules/balanced-match": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
+      "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
+      "dev": true
+    },
+    "node_modules/reduce-function-call": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.3.tgz",
+      "integrity": "sha512-Hl/tuV2VDgWgCSEeWMLwxLZqX7OK59eU1guxXsRKTAyeYimivsKdtcV4fu3r710tpG5GmDKDhQ0HSZLExnNmyQ==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/regenerate": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
+      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
+      "dev": true
+    },
+    "node_modules/regenerate-unicode-properties": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz",
+      "integrity": "sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==",
+      "dev": true,
+      "dependencies": {
+        "regenerate": "^1.4.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/regenerator-runtime": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
+      "dev": true
+    },
+    "node_modules/regenerator-transform": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz",
+      "integrity": "sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.8.4"
+      }
+    },
+    "node_modules/regexpp": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      }
+    },
+    "node_modules/regexpu-core": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.0.1.tgz",
+      "integrity": "sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw==",
+      "dev": true,
+      "dependencies": {
+        "regenerate": "^1.4.2",
+        "regenerate-unicode-properties": "^10.0.1",
+        "regjsgen": "^0.6.0",
+        "regjsparser": "^0.8.2",
+        "unicode-match-property-ecmascript": "^2.0.0",
+        "unicode-match-property-value-ecmascript": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/regjsgen": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.6.0.tgz",
+      "integrity": "sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA==",
+      "dev": true
+    },
+    "node_modules/regjsparser": {
+      "version": "0.8.4",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.8.4.tgz",
+      "integrity": "sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==",
+      "dev": true,
+      "dependencies": {
+        "jsesc": "~0.5.0"
+      },
+      "bin": {
+        "regjsparser": "bin/parser"
+      }
+    },
+    "node_modules/regjsparser/node_modules/jsesc": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+      "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+      "dev": true,
+      "bin": {
+        "jsesc": "bin/jsesc"
+      }
+    },
+    "node_modules/relateurl": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
+      "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/renderkid": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz",
+      "integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==",
+      "dev": true,
+      "dependencies": {
+        "css-select": "^4.1.3",
+        "dom-converter": "^0.2.0",
+        "htmlparser2": "^6.1.0",
+        "lodash": "^4.17.21",
+        "strip-ansi": "^6.0.1"
+      }
+    },
+    "node_modules/renderkid/node_modules/entities": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/renderkid/node_modules/htmlparser2": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
+      "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
+      "dev": true,
+      "funding": [
+        "https://github.com/fb55/htmlparser2?sponsor=1",
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ],
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.0.0",
+        "domutils": "^2.5.2",
+        "entities": "^2.0.0"
+      }
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/resolve": {
+      "version": "1.22.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
+      "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
+      "dev": true,
+      "dependencies": {
+        "is-core-module": "^2.8.1",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/resolve-cwd": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+      "dev": true,
+      "dependencies": {
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve-cwd/node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "dev": true,
+      "engines": {
+        "iojs": ">=1.0.0",
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/rgb": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/rgb/-/rgb-0.1.0.tgz",
+      "integrity": "sha1-vieykej+/+rBvZlylyG/pA/AN7U=",
+      "dev": true,
+      "bin": {
+        "rgb": "bin/rgb"
+      }
+    },
+    "node_modules/rgb-hex": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/rgb-hex/-/rgb-hex-2.1.0.tgz",
+      "integrity": "sha1-x3PF/iJoolV42SU5qCp6XOU77aY=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/ripemd160": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "dev": true,
+      "dependencies": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
+    "node_modules/run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
+    },
+    "node_modules/sass-embedded": {
+      "version": "1.55.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.55.0.tgz",
+      "integrity": "sha512-6AkKEyRjxz37iNwOdTOW94I33j5mxcih9Z604q1w0M1dOTKaZgtyNI67O0zb4akwZ9dVZ2VSJBXqY8/1TZRBIw==",
+      "dev": true,
+      "dependencies": {
+        "buffer-builder": "^0.2.0",
+        "google-protobuf": "^3.11.4",
+        "immutable": "^4.0.0",
+        "rxjs": "^7.4.0",
+        "supports-color": "^8.1.1"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "optionalDependencies": {
+        "sass-embedded-darwin-arm64": "1.55.0",
+        "sass-embedded-darwin-x64": "1.55.0",
+        "sass-embedded-linux-arm": "1.55.0",
+        "sass-embedded-linux-arm64": "1.55.0",
+        "sass-embedded-linux-ia32": "1.55.0",
+        "sass-embedded-linux-x64": "1.55.0",
+        "sass-embedded-win32-ia32": "1.55.0",
+        "sass-embedded-win32-x64": "1.55.0"
+      }
+    },
+    "node_modules/sass-embedded-darwin-arm64": {
+      "version": "1.55.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-arm64/-/sass-embedded-darwin-arm64-1.55.0.tgz",
+      "integrity": "sha512-cQ43gYDFo4xWSqG01ZmOhTyTgk/RYK7s1a4R+7VSQPhYTsd4VofAmTNw0MkLR3RzR53ziGgawA6uT/WHTm+yjg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-darwin-x64": {
+      "version": "1.55.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-x64/-/sass-embedded-darwin-x64-1.55.0.tgz",
+      "integrity": "sha512-ra8z++EBey01pkiwCwjWyMbf6G5xm2Uj0dUJzzsS1MI6Fw6XaesrWmYico5pnawm3rOYtKlMxkd2Y6b1Jwxy8A==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-linux-arm": {
+      "version": "1.55.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm/-/sass-embedded-linux-arm-1.55.0.tgz",
+      "integrity": "sha512-UIW7CaRLjHMWm64jH23n5eji/RAv8XIJ2qpFh0Ds8EJeDZmRA+qyIFHcQ805fZ22u6o0mkxq0kE4+j1XmmbBeg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-linux-arm64": {
+      "version": "1.55.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm64/-/sass-embedded-linux-arm64-1.55.0.tgz",
+      "integrity": "sha512-P4zL4PnujdiSkek/g0RJjyNZcYEqSm6WFr0sSIrxe3byhGg56mWr4WJdxUNwFZ6sxyy2s0PFSjSKGmBtgEfIpw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-linux-ia32": {
+      "version": "1.55.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-ia32/-/sass-embedded-linux-ia32-1.55.0.tgz",
+      "integrity": "sha512-9XJyAl4w5KBjR4LAXckfQKqPv9UYPmOv2HFRBwhHD1k4Dc8gZbfTCzK5wl49z5Z4z1GPvqV9ucIZceXzgJ5e6Q==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-linux-x64": {
+      "version": "1.55.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-x64/-/sass-embedded-linux-x64-1.55.0.tgz",
+      "integrity": "sha512-vd4/4/L7gZcVyxq03/MY/+rcpGgOI0ihOUpwRJLj+9CmUxvhxCSTF51/QO5CW7Z5oJSYEABA/RYlj8NPm4ZejA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-win32-ia32": {
+      "version": "1.55.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-win32-ia32/-/sass-embedded-win32-ia32-1.55.0.tgz",
+      "integrity": "sha512-4HxK0byJ3iIn5OECIeNVz9GcGBuQcQT6kTvI+3QSHzuKsqgQrlXOPJ3772zKD6PVwZJNFZJFf3o9w8V2VSHbTQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-win32-x64": {
+      "version": "1.55.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-win32-x64/-/sass-embedded-win32-x64-1.55.0.tgz",
+      "integrity": "sha512-LWUp5YpJy0/Q+5AOVcw919jktw+OnPiM4f4j5K6MJAiaodJwrSTqRGwMa2wOWyAUpjIdka8Ygm6j+2h5HNgSNQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/sass-embedded/node_modules/rxjs": {
+      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.7.tgz",
+      "integrity": "sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
+    "node_modules/sass-embedded/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/sass-loader": {
+      "version": "13.0.2",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.0.2.tgz",
+      "integrity": "sha512-BbiqbVmbfJaWVeOOAu2o7DhYWtcNmTfvroVgFXa6k2hHheMxNAeDHLNoDy/Q5aoaVlz0LH+MbMktKwm9vN/j8Q==",
+      "dev": true,
+      "dependencies": {
+        "klona": "^2.0.4",
+        "neo-async": "^2.6.2"
+      },
+      "engines": {
+        "node": ">= 14.15.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "fibers": ">= 3.1.0",
+        "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0",
+        "sass": "^1.3.0",
+        "sass-embedded": "*",
+        "webpack": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "fibers": {
+          "optional": true
+        },
+        "node-sass": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "sass-embedded": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+      "dev": true
+    },
+    "node_modules/saxes": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
+      "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
+      "dev": true,
+      "dependencies": {
+        "xmlchars": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/schema-utils": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
+      "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.5",
+        "ajv": "^6.12.4",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 8.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/select2": {
+      "version": "4.0.13",
+      "resolved": "https://registry.npmjs.org/select2/-/select2-4.0.13.tgz",
+      "integrity": "sha512-1JeB87s6oN/TDxQQYCvS5EFoQyvV6eYMZZ0AeA4tdFDYWN3BAGZ8npr17UBFddU0lgAt3H0yjX3X6/ekOj1yjw=="
+    },
+    "node_modules/select2-bootstrap-theme": {
+      "version": "0.1.0-beta.10",
+      "resolved": "https://registry.npmjs.org/select2-bootstrap-theme/-/select2-bootstrap-theme-0.1.0-beta.10.tgz",
+      "integrity": "sha512-gc9Y9yNjkGRqeFmI/pAKyL4maMKH9VKAn62E+uF/hxz8FTmfuKH0sDEGhFhk3f8Jp+emtsDdK1c1nb6S51BV0Q=="
+    },
+    "node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
+      "dev": true
+    },
+    "node_modules/sha.js": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      },
+      "bin": {
+        "sha.js": "bin.js"
+      }
+    },
+    "node_modules/shallow-clone": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true
+    },
+    "node_modules/simple-swizzle": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
+      "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
+      "dev": true,
+      "dependencies": {
+        "is-arrayish": "^0.3.1"
+      }
+    },
+    "node_modules/simple-swizzle/node_modules/is-arrayish": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
+      "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
+      "dev": true
+    },
+    "node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/source-list-map": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
+      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
+      "dev": true
+    },
+    "node_modules/source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-js": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "dev": true,
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/source-map-support/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/spdx-correct": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
+      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+      "dev": true,
+      "dependencies": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-exceptions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
+      "dev": true
+    },
+    "node_modules/spdx-expression-parse": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "dev": true,
+      "dependencies": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-expression-validate": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-expression-validate/-/spdx-expression-validate-2.0.0.tgz",
+      "integrity": "sha512-b3wydZLM+Tc6CFvaRDBOF9d76oGIHNCLYFeHbftFXUWjnfZWganmDmvtM5sm1cRwJc/VDBMLyGGrsLFd1vOxbg==",
+      "dev": true,
+      "dependencies": {
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-license-ids": {
+      "version": "3.0.11",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz",
+      "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==",
+      "dev": true
+    },
+    "node_modules/specificity": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/specificity/-/specificity-0.4.1.tgz",
+      "integrity": "sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==",
+      "dev": true,
+      "bin": {
+        "specificity": "bin/specificity"
+      }
+    },
+    "node_modules/split2": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-0.2.1.tgz",
+      "integrity": "sha1-At2smtwD7Au3jBKC7Aecpuha6QA=",
+      "dev": true,
+      "dependencies": {
+        "through2": "~0.6.1"
+      }
+    },
+    "node_modules/split2/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+      "dev": true
+    },
+    "node_modules/split2/node_modules/readable-stream": {
+      "version": "1.0.34",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+      "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/split2/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+      "dev": true
+    },
+    "node_modules/split2/node_modules/through2": {
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+      "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": ">=1.0.33-1 <1.1.0-0",
+        "xtend": ">=4.0.0 <4.1.0-0"
+      }
+    },
+    "node_modules/stream-browserify": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
+      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "~2.0.1",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "node_modules/stream-http": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
+      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+      "dev": true,
+      "dependencies": {
+        "builtin-status-codes": "^3.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.3.6",
+        "to-arraybuffer": "^1.0.0",
+        "xtend": "^4.0.0"
+      }
+    },
+    "node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "node_modules/string_decoder/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string.prototype.trimend": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
+      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
+      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/strip-final-newline": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/strip-indent": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
+      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+      "dev": true,
+      "dependencies": {
+        "min-indent": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/style-loader": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.3.0.tgz",
+      "integrity": "sha512-V7TCORko8rs9rIqkSrlMfkqA63DfoGBBJmK1kKGCcSi+BWb4cqz0SRsnp4l6rU5iwOEd0/2ePv68SV22VXon4Q==",
+      "dev": true,
+      "dependencies": {
+        "loader-utils": "^2.0.0",
+        "schema-utils": "^2.7.0"
+      },
+      "engines": {
+        "node": ">= 8.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/style-search": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
+      "integrity": "sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI=",
+      "dev": true
+    },
+    "node_modules/stylelint": {
+      "version": "14.7.1",
+      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.7.1.tgz",
+      "integrity": "sha512-rUOWm67hrzGXXyO/cInENEejF4urh1dLgOb9cr/3XLDb/t/A+rXQp3p6+no8o8QCKTgBUdhVUq/bXMgE988PJw==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^2.0.0",
+        "colord": "^2.9.2",
+        "cosmiconfig": "^7.0.1",
+        "css-functions-list": "^3.0.1",
+        "debug": "^4.3.4",
+        "execall": "^2.0.0",
+        "fast-glob": "^3.2.11",
+        "fastest-levenshtein": "^1.0.12",
+        "file-entry-cache": "^6.0.1",
+        "get-stdin": "^8.0.0",
+        "global-modules": "^2.0.0",
+        "globby": "^11.1.0",
+        "globjoin": "^0.1.4",
+        "html-tags": "^3.2.0",
+        "ignore": "^5.2.0",
+        "import-lazy": "^4.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-plain-object": "^5.0.0",
+        "known-css-properties": "^0.24.0",
+        "mathml-tag-names": "^2.1.3",
+        "meow": "^9.0.0",
+        "micromatch": "^4.0.5",
+        "normalize-path": "^3.0.0",
+        "normalize-selector": "^0.2.0",
+        "picocolors": "^1.0.0",
+        "postcss": "^8.4.12",
+        "postcss-media-query-parser": "^0.2.3",
+        "postcss-resolve-nested-selector": "^0.1.1",
+        "postcss-safe-parser": "^6.0.0",
+        "postcss-selector-parser": "^6.0.10",
+        "postcss-value-parser": "^4.2.0",
+        "resolve-from": "^5.0.0",
+        "specificity": "^0.4.1",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1",
+        "style-search": "^0.1.0",
+        "supports-hyperlinks": "^2.2.0",
+        "svg-tags": "^1.0.0",
+        "table": "^6.8.0",
+        "v8-compile-cache": "^2.3.0",
+        "write-file-atomic": "^4.0.1"
+      },
+      "bin": {
+        "stylelint": "bin/stylelint.js"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/stylelint"
+      }
+    },
+    "node_modules/stylelint-config-prestashop": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/stylelint-config-prestashop/-/stylelint-config-prestashop-1.0.7.tgz",
+      "integrity": "sha512-Ac2D15Jsk/zOmHJ4mu5g29bLQFkOmuSKGE/n8Scjs6YAOL/7QRhq26hXzlZ21+VMFi2bqKdjzqmYKbhgUHGpCA==",
+      "dev": true,
+      "dependencies": {
+        "stylelint-config-twbs-bootstrap": "^3.0.1",
+        "stylelint-no-unsupported-browser-features": "^5.0.1"
+      }
+    },
+    "node_modules/stylelint-config-prestashop/node_modules/postcss-scss": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.3.tgz",
+      "integrity": "sha512-j4KxzWovfdHsyxwl1BxkUal/O4uirvHgdzMKS1aWJBAV0qh2qj5qAZqpeBfVUYGWv+4iK9Az7SPyZ4fyNju1uA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      },
+      "peerDependencies": {
+        "postcss": "^8.3.3"
+      }
+    },
+    "node_modules/stylelint-config-prestashop/node_modules/postcss-value-parser": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+      "dev": true
+    },
+    "node_modules/stylelint-config-prestashop/node_modules/stylelint-config-recess-order": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-recess-order/-/stylelint-config-recess-order-3.0.0.tgz",
+      "integrity": "sha512-uNXrlDz570Q7HJlrq8mNjgfO/xlKIh2hKVKEFMTG1/ih/6tDLcTbuvO1Zoo2dnQay990OAkWLDpTDOorB+hmBw==",
+      "dev": true,
+      "dependencies": {
+        "stylelint-order": "5.x"
+      },
+      "peerDependencies": {
+        "stylelint": ">=14"
+      }
+    },
+    "node_modules/stylelint-config-prestashop/node_modules/stylelint-config-recommended": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-6.0.0.tgz",
+      "integrity": "sha512-ZorSSdyMcxWpROYUvLEMm0vSZud2uB7tX1hzBZwvVY9SV/uly4AvvJPPhCcymZL3fcQhEQG5AELmrxWqtmzacw==",
+      "dev": true,
+      "peerDependencies": {
+        "stylelint": "^14.0.0"
+      }
+    },
+    "node_modules/stylelint-config-prestashop/node_modules/stylelint-config-recommended-scss": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-5.0.2.tgz",
+      "integrity": "sha512-b14BSZjcwW0hqbzm9b0S/ScN2+3CO3O4vcMNOw2KGf8lfVSwJ4p5TbNEXKwKl1+0FMtgRXZj6DqVUe/7nGnuBg==",
+      "dev": true,
+      "dependencies": {
+        "postcss-scss": "^4.0.2",
+        "stylelint-config-recommended": "^6.0.0",
+        "stylelint-scss": "^4.0.0"
+      },
+      "peerDependencies": {
+        "stylelint": "^14.0.0"
+      }
+    },
+    "node_modules/stylelint-config-prestashop/node_modules/stylelint-config-standard": {
+      "version": "24.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-24.0.0.tgz",
+      "integrity": "sha512-+RtU7fbNT+VlNbdXJvnjc3USNPZRiRVp/d2DxOF/vBDDTi0kH5RX2Ny6errdtZJH3boO+bmqIYEllEmok4jiuw==",
+      "dev": true,
+      "dependencies": {
+        "stylelint-config-recommended": "^6.0.0"
+      },
+      "peerDependencies": {
+        "stylelint": "^14.0.0"
+      }
+    },
+    "node_modules/stylelint-config-prestashop/node_modules/stylelint-config-standard-scss": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-standard-scss/-/stylelint-config-standard-scss-3.0.0.tgz",
+      "integrity": "sha512-zt3ZbzIbllN1iCmc94e4pDxqpkzeR6CJo5DDXzltshuXr+82B8ylHyMMARNnUYrZH80B7wgY7UkKTYCFM0UUyw==",
+      "dev": true,
+      "dependencies": {
+        "stylelint-config-recommended-scss": "^5.0.2",
+        "stylelint-config-standard": "^24.0.0"
+      },
+      "peerDependencies": {
+        "stylelint": "^14.0.0"
+      }
+    },
+    "node_modules/stylelint-config-prestashop/node_modules/stylelint-config-twbs-bootstrap": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/stylelint-config-twbs-bootstrap/-/stylelint-config-twbs-bootstrap-3.0.1.tgz",
+      "integrity": "sha512-XvFWKO0aveUy/RziVa5osYaOXAX6CePt8YypnRwKdrMtZWkgP85xnrkYBEpS2fmKl2WN79NCdSQFLU/UFoP7hw==",
+      "dev": true,
+      "dependencies": {
+        "stylelint-config-recess-order": "^3.0.0",
+        "stylelint-config-standard": "^24.0.0",
+        "stylelint-config-standard-scss": "^3.0.0",
+        "stylelint-scss": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "peerDependencies": {
+        "stylelint": "^14.1.0"
+      }
+    },
+    "node_modules/stylelint-config-prestashop/node_modules/stylelint-order": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-5.0.0.tgz",
+      "integrity": "sha512-OWQ7pmicXufDw5BlRqzdz3fkGKJPgLyDwD1rFY3AIEfIH/LQY38Vu/85v8/up0I+VPiuGRwbc2Hg3zLAsJaiyw==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^8.3.11",
+        "postcss-sorting": "^7.0.1"
+      },
+      "peerDependencies": {
+        "stylelint": "^14.0.0"
+      }
+    },
+    "node_modules/stylelint-config-prestashop/node_modules/stylelint-scss": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-4.2.0.tgz",
+      "integrity": "sha512-HHHMVKJJ5RM9pPIbgJ/XA67h9H0407G68Rm69H4fzFbFkyDMcTV1Byep3qdze5+fJ3c0U7mJrbj6S0Fg072uZA==",
+      "dev": true,
+      "dependencies": {
+        "lodash": "^4.17.21",
+        "postcss-media-query-parser": "^0.2.3",
+        "postcss-resolve-nested-selector": "^0.1.1",
+        "postcss-selector-parser": "^6.0.6",
+        "postcss-value-parser": "^4.1.0"
+      },
+      "peerDependencies": {
+        "stylelint": "^14.5.1"
+      }
+    },
+    "node_modules/stylelint-no-unsupported-browser-features": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/stylelint-no-unsupported-browser-features/-/stylelint-no-unsupported-browser-features-5.0.3.tgz",
+      "integrity": "sha512-FqfbOTk5UEkHsAKOkPH6SvajsfO9YuoWvKxd34tCRBZug9ZNeaPn141nyWkd+ncc8S1gVmO2+O6qVAMj9bvWww==",
+      "dev": true,
+      "dependencies": {
+        "doiuse": "^4.4.1",
+        "lodash": "^4.17.15",
+        "postcss": "^8.3.6"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "peerDependencies": {
+        "stylelint": ">=13.0.0"
+      }
+    },
+    "node_modules/stylelint/node_modules/ajv": {
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
+      "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/stylelint/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/stylelint/node_modules/array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/stylelint/node_modules/astral-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/stylelint/node_modules/balanced-match": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz",
+      "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==",
+      "dev": true
+    },
+    "node_modules/stylelint/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/stylelint/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/stylelint/node_modules/get-stdin": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
+      "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/stylelint/node_modules/globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+      "dev": true,
+      "dependencies": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/stylelint/node_modules/is-plain-object": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/stylelint/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
+    },
+    "node_modules/stylelint/node_modules/postcss-value-parser": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+      "dev": true
+    },
+    "node_modules/stylelint/node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/stylelint/node_modules/slice-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+      }
+    },
+    "node_modules/stylelint/node_modules/table": {
+      "version": "6.8.0",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
+      "integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^8.0.1",
+        "lodash.truncate": "^4.4.2",
+        "slice-ansi": "^4.0.0",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/supports-hyperlinks": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
+      "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0",
+        "supports-color": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-hyperlinks/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-hyperlinks/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/svg-tags": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
+      "integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=",
+      "dev": true
+    },
+    "node_modules/symbol-tree": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
+      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
+      "dev": true
+    },
+    "node_modules/tapable": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
+      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/terser": {
+      "version": "5.12.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.12.1.tgz",
+      "integrity": "sha512-NXbs+7nisos5E+yXwAD+y7zrcTkMqb0dEJxIGtSKPdCBzopf7ni4odPul2aechpV7EXNvOudYOX2bb5tln1jbQ==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^8.5.0",
+        "commander": "^2.20.0",
+        "source-map": "~0.7.2",
+        "source-map-support": "~0.5.20"
+      },
+      "bin": {
+        "terser": "bin/terser"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/terser-webpack-plugin": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz",
+      "integrity": "sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g==",
+      "dev": true,
+      "dependencies": {
+        "jest-worker": "^27.4.5",
+        "schema-utils": "^3.1.1",
+        "serialize-javascript": "^6.0.0",
+        "source-map": "^0.6.1",
+        "terser": "^5.7.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.1.0"
+      },
+      "peerDependenciesMeta": {
+        "@swc/core": {
+          "optional": true
+        },
+        "esbuild": {
+          "optional": true
+        },
+        "uglify-js": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/serialize-javascript": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
+      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
+      "dev": true,
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/terser/node_modules/acorn": {
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
+      "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/terser/node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
+    },
+    "node_modules/terser/node_modules/source-map": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+      "dev": true
+    },
+    "node_modules/through2": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz",
+      "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "3"
+      }
+    },
+    "node_modules/through2/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/timers-browserify": {
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
+      "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
+      "dev": true,
+      "dependencies": {
+        "setimmediate": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
+    "node_modules/to-arraybuffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
+      "dev": true
+    },
+    "node_modules/to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/tr46": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
+      "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
+      "dev": true,
+      "dependencies": {
+        "punycode": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/tr46/node_modules/punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/trim-newlines": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
+      "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/tsconfig-paths": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
+      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.1",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
+      }
+    },
+    "node_modules/tsconfig-paths/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/tslib": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+      "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
+      "dev": true
+    },
+    "node_modules/tty-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
+      "dev": true
+    },
+    "node_modules/type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/unbox-primitive": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
+      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "has-bigints": "^1.0.1",
+        "has-symbols": "^1.0.2",
+        "which-boxed-primitive": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/unicode-canonical-property-names-ecmascript": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unicode-match-property-ecmascript": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
+      "dev": true,
+      "dependencies": {
+        "unicode-canonical-property-names-ecmascript": "^2.0.0",
+        "unicode-property-aliases-ecmascript": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unicode-match-property-value-ecmascript": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unicode-property-aliases-ecmascript": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/uniq": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
+      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
+      "dev": true
+    },
+    "node_modules/units-css": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/units-css/-/units-css-0.4.0.tgz",
+      "integrity": "sha1-1iKGU6UZg9fBb/KPi53Dsf/tOgc=",
+      "dev": true,
+      "dependencies": {
+        "isnumeric": "^0.2.0",
+        "viewport-dimensions": "^0.2.0"
+      }
+    },
+    "node_modules/universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/uri-js/node_modules/punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/url": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+      "dev": true,
+      "dependencies": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      }
+    },
+    "node_modules/url/node_modules/punycode": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+      "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+      "dev": true
+    },
+    "node_modules/util": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "2.0.3"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
+    },
+    "node_modules/util/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "dev": true
+    },
+    "node_modules/utila": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
+      "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=",
+      "dev": true
+    },
+    "node_modules/v8-compile-cache": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+      "dev": true
+    },
+    "node_modules/validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
+      "dependencies": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "node_modules/vazirmatn": {
+      "version": "32.102.0",
+      "resolved": "https://registry.npmjs.org/vazirmatn/-/vazirmatn-32.102.0.tgz",
+      "integrity": "sha512-Fkvs0Hp5x9zjHTuwog3KEcARhMLxjXd3o3MyD/vBywxYt2LG+4THEHpu6AW8ojfHJAutrxFnDTPB/5hvkX80ww=="
+    },
+    "node_modules/viewport-dimensions": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/viewport-dimensions/-/viewport-dimensions-0.2.0.tgz",
+      "integrity": "sha1-3nQHR9tTh/0XJfUXXpG6x2r982w=",
+      "dev": true
+    },
+    "node_modules/vm-browserify": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
+      "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
+      "dev": true
+    },
+    "node_modules/w3c-hr-time": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
+      "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
+      "dev": true,
+      "dependencies": {
+        "browser-process-hrtime": "^1.0.0"
+      }
+    },
+    "node_modules/w3c-xmlserializer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-3.0.0.tgz",
+      "integrity": "sha512-3WFqGEgSXIyGhOmAFtlicJNMjEps8b1MG31NCA0/vOF9+nKMUW1ckhi9cnNHmf88Rzw5V+dwIwsm2C7X8k9aQg==",
+      "dev": true,
+      "dependencies": {
+        "xml-name-validator": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/watchpack": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz",
+      "integrity": "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==",
+      "dev": true,
+      "dependencies": {
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.1.2"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/webidl-conversions": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/webpack": {
+      "version": "5.72.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.72.0.tgz",
+      "integrity": "sha512-qmSmbspI0Qo5ld49htys8GY9XhS9CGqFoHTsOVAnjBdg0Zn79y135R+k4IR4rKK6+eKaabMhJwiVB7xw0SJu5w==",
+      "dev": true,
+      "dependencies": {
+        "@types/eslint-scope": "^3.7.3",
+        "@types/estree": "^0.0.51",
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/wasm-edit": "1.11.1",
+        "@webassemblyjs/wasm-parser": "1.11.1",
+        "acorn": "^8.4.1",
+        "acorn-import-assertions": "^1.7.6",
+        "browserslist": "^4.14.5",
+        "chrome-trace-event": "^1.0.2",
+        "enhanced-resolve": "^5.9.2",
+        "es-module-lexer": "^0.9.0",
+        "eslint-scope": "5.1.1",
+        "events": "^3.2.0",
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.2.9",
+        "json-parse-better-errors": "^1.0.2",
+        "loader-runner": "^4.2.0",
+        "mime-types": "^2.1.27",
+        "neo-async": "^2.6.2",
+        "schema-utils": "^3.1.0",
+        "tapable": "^2.1.1",
+        "terser-webpack-plugin": "^5.1.3",
+        "watchpack": "^2.3.1",
+        "webpack-sources": "^3.2.3"
+      },
+      "bin": {
+        "webpack": "bin/webpack.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependenciesMeta": {
+        "webpack-cli": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-cli": {
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.9.2.tgz",
+      "integrity": "sha512-m3/AACnBBzK/kMTcxWHcZFPrw/eQuY4Df1TxvIWfWM2x7mRqBQCqKEd96oCUa9jkapLBaFfRce33eGDb4Pr7YQ==",
+      "dev": true,
+      "dependencies": {
+        "@discoveryjs/json-ext": "^0.5.0",
+        "@webpack-cli/configtest": "^1.1.1",
+        "@webpack-cli/info": "^1.4.1",
+        "@webpack-cli/serve": "^1.6.1",
+        "colorette": "^2.0.14",
+        "commander": "^7.0.0",
+        "execa": "^5.0.0",
+        "fastest-levenshtein": "^1.0.12",
+        "import-local": "^3.0.2",
+        "interpret": "^2.2.0",
+        "rechoir": "^0.7.0",
+        "webpack-merge": "^5.7.3"
+      },
+      "bin": {
+        "webpack-cli": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "peerDependencies": {
+        "webpack": "4.x.x || 5.x.x"
+      },
+      "peerDependenciesMeta": {
+        "@webpack-cli/generators": {
+          "optional": true
+        },
+        "@webpack-cli/migrate": {
+          "optional": true
+        },
+        "webpack-bundle-analyzer": {
+          "optional": true
+        },
+        "webpack-dev-server": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-cli/node_modules/commander": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/webpack-cli/node_modules/interpret": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz",
+      "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/webpack-font-preload-plugin": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/webpack-font-preload-plugin/-/webpack-font-preload-plugin-1.5.0.tgz",
+      "integrity": "sha512-/Nh6MNa7/rbu3ZcqSR1SxB+G5XaITu7U2yZO5INTsVRpVlMLQmHQZCoDt4PP+iFyBdvBCDbA0CImRXHarQ0wpQ==",
+      "dev": true,
+      "dependencies": {
+        "jsdom": "^19.0.0",
+        "webpack-sources": "^3.2.2"
+      },
+      "engines": {
+        "node": ">= 10.17.0"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/webpack-font-preload-plugin/node_modules/webpack-sources": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/webpack-license-plugin": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/webpack-license-plugin/-/webpack-license-plugin-4.2.2.tgz",
+      "integrity": "sha512-OfIdm659IKurEInKlBN6Sfzrh+MNKIWkChKKg+aDCoPf3Ok1OSXBDd2RKSbuUAtxjmdW2j6LUVZWnRYRnVdOxA==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^5.0.1",
+        "get-npm-tarball-url": "^2.0.1",
+        "lodash": "^4.17.20",
+        "needle": "^2.2.4",
+        "spdx-expression-validate": "^2.0.0",
+        "webpack-sources": "^3.2.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "webpack": ">=4.0.0 < 6.0.0"
+      }
+    },
+    "node_modules/webpack-license-plugin/node_modules/chalk": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz",
+      "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==",
+      "dev": true,
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/webpack-license-plugin/node_modules/webpack-sources": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/webpack-merge": {
+      "version": "5.8.0",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz",
+      "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==",
+      "dev": true,
+      "dependencies": {
+        "clone-deep": "^4.0.1",
+        "wildcard": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/webpack-remove-empty-scripts": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/webpack-remove-empty-scripts/-/webpack-remove-empty-scripts-0.7.3.tgz",
+      "integrity": "sha512-yipqb25A0qtH7X9vKt6yihwyYkTtSlRiDdBb2QsyrkqGM3hpfAcfOO1lYDef9HQUNm3s8ojmorbNg32XXX6FYg==",
+      "dev": true,
+      "dependencies": {
+        "ansis": "^1.3.4"
+      },
+      "engines": {
+        "node": ">=12.14"
+      },
+      "funding": {
+        "type": "patreon",
+        "url": "https://patreon.com/biodiscus"
+      },
+      "peerDependencies": {
+        "webpack": ">=5.32.0"
+      }
+    },
+    "node_modules/webpack-sources": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+      "dev": true,
+      "dependencies": {
+        "source-list-map": "^2.0.0",
+        "source-map": "~0.6.1"
+      }
+    },
+    "node_modules/webpack-sources/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack/node_modules/acorn": {
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
+      "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/webpack/node_modules/acorn-import-assertions": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
+      "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
+      "dev": true,
+      "peerDependencies": {
+        "acorn": "^8"
+      }
+    },
+    "node_modules/webpack/node_modules/enhanced-resolve": {
+      "version": "5.9.3",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.3.tgz",
+      "integrity": "sha512-Bq9VSor+kjvW3f9/MiiR4eE3XYgOl7/rS8lnSxbRbF3kS0B2r+Y9w5krBWxZgDxASVZbdYrn5wT4j/Wb0J9qow==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.4",
+        "tapable": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/webpack/node_modules/schema-utils": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/webpack/node_modules/webpack-sources": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/whatwg-encoding": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
+      "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
+      "dev": true,
+      "dependencies": {
+        "iconv-lite": "0.6.3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/whatwg-encoding/node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "dev": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/whatwg-mimetype": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
+      "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/whatwg-url": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-10.0.0.tgz",
+      "integrity": "sha512-CLxxCmdUby142H5FZzn4D8ikO1cmypvXVQktsgosNy4a4BHrDHeciBBGZhb0bNoR5/MltoCatso+vFjjGx8t0w==",
+      "dev": true,
+      "dependencies": {
+        "tr46": "^3.0.0",
+        "webidl-conversions": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "dev": true,
+      "dependencies": {
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/wildcard": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
+      "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==",
+      "dev": true
+    },
+    "node_modules/word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "node_modules/write-file-atomic": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.1.tgz",
+      "integrity": "sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==",
+      "dev": true,
+      "dependencies": {
+        "imurmurhash": "^0.1.4",
+        "signal-exit": "^3.0.7"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16"
+      }
+    },
+    "node_modules/ws": {
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
+      "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/xml-name-validator": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
+      "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/xmlchars": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
+      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
+      "dev": true
+    },
+    "node_modules/xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
+    "node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/yaml": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "20.2.9",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    }
+  },
   "dependencies": {
     "@ampproject/remapping": {
       "version": "2.1.2",
@@ -1453,7 +12965,8 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.1.1.tgz",
       "integrity": "sha512-1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "@webpack-cli/info": {
       "version": "1.4.1",
@@ -1468,7 +12981,8 @@
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.6.1.tgz",
       "integrity": "sha512-gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "@xtuc/ieee754": {
       "version": "1.2.0",
@@ -1508,7 +13022,8 @@
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "acorn-walk": {
       "version": "7.2.0",
@@ -1541,7 +13056,8 @@
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
       "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "ansi-regex": {
       "version": "5.0.1",
@@ -1840,7 +13356,8 @@
     "bootstrap": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz",
-      "integrity": "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ=="
+      "integrity": "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==",
+      "requires": {}
     },
     "bourbon": {
       "version": "4.3.4",
@@ -4180,7 +15697,8 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
       "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "ieee754": {
       "version": "1.2.1",
@@ -4529,6 +16047,12 @@
         }
       }
     },
+    "jquery": {
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.1.tgz",
+      "integrity": "sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw==",
+      "peer": true
+    },
     "jquery.growl": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/jquery.growl/-/jquery.growl-1.3.5.tgz",
@@ -5697,6 +17221,12 @@
         }
       }
     },
+    "popper.js": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
+      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
+      "peer": true
+    },
     "postcss": {
       "version": "8.4.19",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.19.tgz",
@@ -6482,7 +18012,8 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
       "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-modules-local-by-default": {
       "version": "4.0.0",
@@ -6655,7 +18186,8 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz",
       "integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-selector-matches": {
       "version": "3.0.1",
@@ -6741,7 +18273,8 @@
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-7.0.1.tgz",
       "integrity": "sha512-iLBFYz6VRYyLJEJsBJ8M3TCqNcckVzz4wFounSc5Oez35ogE/X+aoC5fFu103Ot7NyvjU3/xqIXn93Gp3kJk4g==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-value-parser": {
       "version": "3.3.1",
@@ -7665,6 +19198,23 @@
         "xtend": "^4.0.0"
       }
     },
+    "string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.2.0"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+          "dev": true
+        }
+      }
+    },
     "string-width": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -7696,23 +19246,6 @@
         "define-properties": "^1.1.3"
       }
     },
-    "string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.2.0"
-      },
-      "dependencies": {
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-          "dev": true
-        }
-      }
-    },
     "strip-ansi": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
@@ -7952,7 +19485,8 @@
           "version": "4.0.3",
           "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.3.tgz",
           "integrity": "sha512-j4KxzWovfdHsyxwl1BxkUal/O4uirvHgdzMKS1aWJBAV0qh2qj5qAZqpeBfVUYGWv+4iK9Az7SPyZ4fyNju1uA==",
-          "dev": true
+          "dev": true,
+          "requires": {}
         },
         "postcss-value-parser": {
           "version": "4.2.0",
@@ -7973,7 +19507,8 @@
           "version": "6.0.0",
           "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-6.0.0.tgz",
           "integrity": "sha512-ZorSSdyMcxWpROYUvLEMm0vSZud2uB7tX1hzBZwvVY9SV/uly4AvvJPPhCcymZL3fcQhEQG5AELmrxWqtmzacw==",
-          "dev": true
+          "dev": true,
+          "requires": {}
         },
         "stylelint-config-recommended-scss": {
           "version": "5.0.2",
@@ -8552,7 +20087,8 @@
           "version": "1.8.0",
           "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
           "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
-          "dev": true
+          "dev": true,
+          "requires": {}
         },
         "enhanced-resolve": {
           "version": "5.9.3",
@@ -8790,7 +20326,8 @@
       "version": "8.5.0",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
       "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "xml-name-validator": {
       "version": "4.0.0",
diff --git a/admin-dev/themes/new-theme/package-lock.json b/admin-dev/themes/new-theme/package-lock.json
index 62585aa06f38d..67e8d2903b8c8 100644
--- a/admin-dev/themes/new-theme/package-lock.json
+++ b/admin-dev/themes/new-theme/package-lock.json
@@ -1,8 +1,14275 @@
 {
   "name": "new-theme",
   "version": "1.0.0",
-  "lockfileVersion": 1,
+  "lockfileVersion": 2,
   "requires": true,
+  "packages": {
+    "": {
+      "name": "new-theme",
+      "version": "1.0.0",
+      "license": "OSL-3.0",
+      "dependencies": {
+        "bignumber.js": "^9.0.1",
+        "bootstrap-colorpicker": "^3.2.0",
+        "bootstrap-tokenfield": "^0.12.0",
+        "bourbon": "^4.2.6",
+        "dropzone": "^5.9.3",
+        "eonasdan-bootstrap-datetimepicker": "^4.17.47",
+        "events": "^3.0.0",
+        "fos-routing": "0.0.6",
+        "jets": "0.11.0",
+        "jquery-serializejson": "^3.2.0",
+        "jquery-ui-dist": "^1.12.1",
+        "jwerty": "^0.3.2",
+        "lodash": "^4.17.21",
+        "lodash.escaperegexp": "^4.1.2",
+        "magnific-popup": "^1.1.0",
+        "moment": "^2.24.0",
+        "perfect-scrollbar": "^1.5.0",
+        "photoswipe": "^4.1.3",
+        "postcss": "^8.4.4",
+        "prestakit": "^1.2.6",
+        "punycode": "^2.1.1",
+        "resize-observer-polyfill": "^1.5.1",
+        "sprintf-js": "^1.1.2",
+        "tablednd": "^1.0.3",
+        "terser-webpack-plugin": "^5.2.5",
+        "typeahead.js": "^0.11.1",
+        "url-polyfill": "^1.1.7",
+        "vazirmatn": "32.102.0",
+        "vue": "^3.2.33",
+        "vue-i18n": "^9.1.10",
+        "vue-resource": "^1.5.1",
+        "vue-router": "^4.0.15",
+        "vuex": "^4.0.2",
+        "zxcvbn": "^4.4.2"
+      },
+      "devDependencies": {
+        "@babel/core": "^7.15.7",
+        "@babel/eslint-parser": "^7.18.9",
+        "@types/bootstrap": "^4.5.0",
+        "@types/dropzone": "^5.7.4",
+        "@types/jquery": "^3.5.5",
+        "@types/jquery.growl": "^1.3.4",
+        "@types/lodash": "^4.14.170",
+        "@types/photoswipe": "^4.1.2",
+        "@types/sprintf-js": "^1.1.2",
+        "@types/typeahead.js": "^0.11.0",
+        "@types/zxcvbn": "^4.4.1",
+        "@typescript-eslint/eslint-plugin": "^5.33.1",
+        "@typescript-eslint/parser": "^5.33.1",
+        "@vue/compiler-sfc": "^3.2.33",
+        "@vue/eslint-config-typescript": "^11.0.0",
+        "@vue/runtime-dom": "^3.2.33",
+        "bootstrap": "~4.4.1",
+        "chai": "^4.2.0",
+        "clean-webpack-plugin": "^4.0.0",
+        "copy-webpack-plugin": "^11.0.0",
+        "core-js": "^3.18.0",
+        "css-loader": "^6.7.2",
+        "csso-webpack-plugin": "^2.0.0-beta.3",
+        "esbuild-loader": "^2.15.1",
+        "eslint": "^8.22.0",
+        "eslint-config-airbnb-base": "^15.0.0",
+        "eslint-import-resolver-webpack": "^0.12.1",
+        "eslint-plugin-html": "^6.0.0",
+        "eslint-plugin-import": "^2.20.0",
+        "eslint-plugin-vue": "^9.3.0",
+        "expose-loader": "^4.0.0",
+        "file-loader": "^5.0",
+        "fork-ts-checker-webpack-plugin": "^7.2.11",
+        "hot-accept-webpack-plugin": "^2.0.0-beta.7",
+        "html-webpack-plugin": "^5.5.0",
+        "imports-loader": "^4.0.1",
+        "mini-css-extract-plugin": "^2.6.1",
+        "mocha": "^6",
+        "path": "^0.12.7",
+        "postcss-loader": "^7.0.1",
+        "postcss-preset-env": "^7.8.2",
+        "sass-embedded": "^1.55.0",
+        "sass-loader": "^13.0.2",
+        "style-loader": "^3.3.1",
+        "stylelint": "^14.1.0",
+        "stylelint-config-prestashop": "^1.0.5",
+        "ts-loader": "^9.3.0",
+        "ts-node": "^10.7.0",
+        "tsconfig-paths": "^3.9.0",
+        "typescript": "^4.6.4",
+        "uglify-save-license": "^0.4.1",
+        "vue-eslint-parser": "^9.0.3",
+        "vue-loader": "^17.0.0",
+        "vue-style-loader": "^4.1.3",
+        "webpack": "^5.75.0",
+        "webpack-cli": "^5.0.1",
+        "webpack-dev-server": "^4.3.0",
+        "webpack-font-preload-plugin": "^1.5.0",
+        "webpack-license-plugin": "^4.2.1",
+        "webpack-remove-empty-scripts": "^0.7.1"
+      }
+    },
+    "node_modules/@ampproject/remapping": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
+      "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.1.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/code-frame": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
+      "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/highlight": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/compat-data": {
+      "version": "7.20.5",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.5.tgz",
+      "integrity": "sha512-KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/core": {
+      "version": "7.20.7",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.7.tgz",
+      "integrity": "sha512-t1ZjCluspe5DW24bn2Rr1CDb2v9rn/hROtg9a2tmd0+QYf4bsloYfLQzjG4qHPNMhWtKdGC33R5AxGR2Af2cBw==",
+      "dev": true,
+      "dependencies": {
+        "@ampproject/remapping": "^2.1.0",
+        "@babel/code-frame": "^7.18.6",
+        "@babel/generator": "^7.20.7",
+        "@babel/helper-compilation-targets": "^7.20.7",
+        "@babel/helper-module-transforms": "^7.20.7",
+        "@babel/helpers": "^7.20.7",
+        "@babel/parser": "^7.20.7",
+        "@babel/template": "^7.20.7",
+        "@babel/traverse": "^7.20.7",
+        "@babel/types": "^7.20.7",
+        "convert-source-map": "^1.7.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.1",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/babel"
+      }
+    },
+    "node_modules/@babel/eslint-parser": {
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.19.1.tgz",
+      "integrity": "sha512-AqNf2QWt1rtu2/1rLswy6CDP7H9Oh3mMhk177Y67Rg8d7RD9WfOLLv8CGn6tisFvS2htm86yIe1yLF6I1UDaGQ==",
+      "dev": true,
+      "dependencies": {
+        "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
+        "eslint-visitor-keys": "^2.1.0",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || >=14.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": ">=7.11.0",
+        "eslint": "^7.5.0 || ^8.0.0"
+      }
+    },
+    "node_modules/@babel/generator": {
+      "version": "7.20.7",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.7.tgz",
+      "integrity": "sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.20.7",
+        "@jridgewell/gen-mapping": "^0.3.2",
+        "jsesc": "^2.5.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+      "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/helper-compilation-targets": {
+      "version": "7.20.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz",
+      "integrity": "sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/compat-data": "^7.20.5",
+        "@babel/helper-validator-option": "^7.18.6",
+        "browserslist": "^4.21.3",
+        "lru-cache": "^5.1.1",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-environment-visitor": {
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
+      "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-function-name": {
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
+      "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
+      "dev": true,
+      "dependencies": {
+        "@babel/template": "^7.18.10",
+        "@babel/types": "^7.19.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-hoist-variables": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
+      "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-imports": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
+      "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-transforms": {
+      "version": "7.20.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.7.tgz",
+      "integrity": "sha512-FNdu7r67fqMUSVuQpFQGE6BPdhJIhitoxhGzDbAXNcA07uoVG37fOiMk3OSV8rEICuyG6t8LGkd9EE64qIEoIA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-module-imports": "^7.18.6",
+        "@babel/helper-simple-access": "^7.20.2",
+        "@babel/helper-split-export-declaration": "^7.18.6",
+        "@babel/helper-validator-identifier": "^7.19.1",
+        "@babel/template": "^7.20.7",
+        "@babel/traverse": "^7.20.7",
+        "@babel/types": "^7.20.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-simple-access": {
+      "version": "7.20.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz",
+      "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.20.2"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-split-export-declaration": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
+      "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.19.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz",
+      "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+      "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-option": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz",
+      "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helpers": {
+      "version": "7.20.7",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.7.tgz",
+      "integrity": "sha512-PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/template": "^7.20.7",
+        "@babel/traverse": "^7.20.7",
+        "@babel/types": "^7.20.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
+      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.18.6",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/parser": {
+      "version": "7.20.7",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.7.tgz",
+      "integrity": "sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==",
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/template": {
+      "version": "7.20.7",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz",
+      "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.18.6",
+        "@babel/parser": "^7.20.7",
+        "@babel/types": "^7.20.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/traverse": {
+      "version": "7.20.7",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.7.tgz",
+      "integrity": "sha512-xueOL5+ZKX2dJbg8z8o4f4uTRTqGDRjilva9D1hiRlayJbTY8jBRL+Ph67IeRTIE439/VifHk+Z4g0SwRtQE0A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.18.6",
+        "@babel/generator": "^7.20.7",
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-function-name": "^7.19.0",
+        "@babel/helper-hoist-variables": "^7.18.6",
+        "@babel/helper-split-export-declaration": "^7.18.6",
+        "@babel/parser": "^7.20.7",
+        "@babel/types": "^7.20.7",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/types": {
+      "version": "7.20.7",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.7.tgz",
+      "integrity": "sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-string-parser": "^7.19.4",
+        "@babel/helper-validator-identifier": "^7.19.1",
+        "to-fast-properties": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@cspotcode/source-map-support": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
+      "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/trace-mapping": "0.3.9"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
+      "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.0.3",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
+      }
+    },
+    "node_modules/@csstools/postcss-cascade-layers": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-1.1.1.tgz",
+      "integrity": "sha512-+KdYrpKC5TgomQr2DlZF4lDEpHcoxnj5IGddYYfBWJAKfj1JtuHUIqMa+E1pJJ+z3kvDViWMqyqPlG4Ja7amQA==",
+      "dev": true,
+      "dependencies": {
+        "@csstools/selector-specificity": "^2.0.2",
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-color-function": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-color-function/-/postcss-color-function-1.1.1.tgz",
+      "integrity": "sha512-Bc0f62WmHdtRDjf5f3e2STwRAl89N2CLb+9iAwzrv4L2hncrbDwnQD9PCq0gtAt7pOI2leIV08HIBUd4jxD8cw==",
+      "dev": true,
+      "dependencies": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-font-format-keywords": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-1.0.1.tgz",
+      "integrity": "sha512-ZgrlzuUAjXIOc2JueK0X5sZDjCtgimVp/O5CEqTcs5ShWBa6smhWYbS0x5cVc/+rycTDbjjzoP0KTDnUneZGOg==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-hwb-function": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-hwb-function/-/postcss-hwb-function-1.0.2.tgz",
+      "integrity": "sha512-YHdEru4o3Rsbjmu6vHy4UKOXZD+Rn2zmkAmLRfPet6+Jz4Ojw8cbWxe1n42VaXQhD3CQUXXTooIy8OkVbUcL+w==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-ic-unit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-ic-unit/-/postcss-ic-unit-1.0.1.tgz",
+      "integrity": "sha512-Ot1rcwRAaRHNKC9tAqoqNZhjdYBzKk1POgWfhN4uCOE47ebGcLRqXjKkApVDpjifL6u2/55ekkpnFcp+s/OZUw==",
+      "dev": true,
+      "dependencies": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-is-pseudo-class": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.7.tgz",
+      "integrity": "sha512-7JPeVVZHd+jxYdULl87lvjgvWldYu+Bc62s9vD/ED6/QTGjy0jy0US/f6BG53sVMTBJ1lzKZFpYmofBN9eaRiA==",
+      "dev": true,
+      "dependencies": {
+        "@csstools/selector-specificity": "^2.0.0",
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-nested-calc": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-nested-calc/-/postcss-nested-calc-1.0.0.tgz",
+      "integrity": "sha512-JCsQsw1wjYwv1bJmgjKSoZNvf7R6+wuHDAbi5f/7MbFhl2d/+v+TvBTU4BJH3G1X1H87dHl0mh6TfYogbT/dJQ==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-normalize-display-values": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-1.0.1.tgz",
+      "integrity": "sha512-jcOanIbv55OFKQ3sYeFD/T0Ti7AMXc9nM1hZWu8m/2722gOTxFg7xYu4RDLJLeZmPUVQlGzo4jhzvTUq3x4ZUw==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-oklab-function": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.1.1.tgz",
+      "integrity": "sha512-nJpJgsdA3dA9y5pgyb/UfEzE7W5Ka7u0CX0/HIMVBNWzWemdcTH3XwANECU6anWv/ao4vVNLTMxhiPNZsTK6iA==",
+      "dev": true,
+      "dependencies": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-progressive-custom-properties": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-1.3.0.tgz",
+      "integrity": "sha512-ASA9W1aIy5ygskZYuWams4BzafD12ULvSypmaLJT2jvQ8G0M3I8PRQhC0h7mG0Z3LI05+agZjqSR9+K9yaQQjA==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.3"
+      }
+    },
+    "node_modules/@csstools/postcss-stepped-value-functions": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-1.0.1.tgz",
+      "integrity": "sha512-dz0LNoo3ijpTOQqEJLY8nyaapl6umbmDcgj4AD0lgVQ572b2eqA1iGZYTTWhrcrHztWDDRAX2DGYyw2VBjvCvQ==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-text-decoration-shorthand": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-1.0.0.tgz",
+      "integrity": "sha512-c1XwKJ2eMIWrzQenN0XbcfzckOLLJiczqy+YvfGmzoVXd7pT9FfObiSEfzs84bpE/VqfpEuAZ9tCRbZkZxxbdw==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-trigonometric-functions": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-1.0.2.tgz",
+      "integrity": "sha512-woKaLO///4bb+zZC2s80l+7cm07M7268MsyG3M0ActXXEFi6SuhvriQYcb58iiKGbjwwIU7n45iRLEHypB47Og==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/postcss-unset-value": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.2.tgz",
+      "integrity": "sha512-c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g==",
+      "dev": true,
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/@csstools/selector-specificity": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz",
+      "integrity": "sha512-IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg==",
+      "dev": true,
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2",
+        "postcss-selector-parser": "^6.0.10"
+      }
+    },
+    "node_modules/@discoveryjs/json-ext": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
+      "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.15.18.tgz",
+      "integrity": "sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.18.tgz",
+      "integrity": "sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@eslint/eslintrc": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.0.tgz",
+      "integrity": "sha512-7yfvXy6MWLgWSFsLhz5yH3iQ52St8cdUY6FoGieKkRDVxuxmrNuUetIuu6cmjNWwniUHiWXjxCr5tTXDrbYS5A==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.4.0",
+        "globals": "^13.19.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/globals": {
+      "version": "13.19.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz",
+      "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@humanwhocodes/config-array": {
+      "version": "0.11.8",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
+      "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==",
+      "dev": true,
+      "dependencies": {
+        "@humanwhocodes/object-schema": "^1.2.1",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.5"
+      },
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
+    "node_modules/@humanwhocodes/module-importer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.22"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
+    },
+    "node_modules/@humanwhocodes/object-schema": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+      "dev": true
+    },
+    "node_modules/@intlify/core-base": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.2.2.tgz",
+      "integrity": "sha512-JjUpQtNfn+joMbrXvpR4hTF8iJQ2sEFzzK3KIESOx+f+uwIjgw20igOyaIdhfsVVBCds8ZM64MoeNSx+PHQMkA==",
+      "dependencies": {
+        "@intlify/devtools-if": "9.2.2",
+        "@intlify/message-compiler": "9.2.2",
+        "@intlify/shared": "9.2.2",
+        "@intlify/vue-devtools": "9.2.2"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@intlify/devtools-if": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/@intlify/devtools-if/-/devtools-if-9.2.2.tgz",
+      "integrity": "sha512-4ttr/FNO29w+kBbU7HZ/U0Lzuh2cRDhP8UlWOtV9ERcjHzuyXVZmjyleESK6eVP60tGC9QtQW9yZE+JeRhDHkg==",
+      "dependencies": {
+        "@intlify/shared": "9.2.2"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@intlify/message-compiler": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.2.2.tgz",
+      "integrity": "sha512-IUrQW7byAKN2fMBe8z6sK6riG1pue95e5jfokn8hA5Q3Bqy4MBJ5lJAofUsawQJYHeoPJ7svMDyBaVJ4d0GTtA==",
+      "dependencies": {
+        "@intlify/shared": "9.2.2",
+        "source-map": "0.6.1"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@intlify/shared": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.2.2.tgz",
+      "integrity": "sha512-wRwTpsslgZS5HNyM7uDQYZtxnbI12aGiBZURX3BTR9RFIKKRWpllTsgzHWvj3HKm3Y2Sh5LPC1r0PDCKEhVn9Q==",
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@intlify/vue-devtools": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/@intlify/vue-devtools/-/vue-devtools-9.2.2.tgz",
+      "integrity": "sha512-+dUyqyCHWHb/UcvY1MlIpO87munedm3Gn6E9WWYdWrMuYLcoIoOEVDWSS8xSwtlPU+kA+MEQTP6Q1iI/ocusJg==",
+      "dependencies": {
+        "@intlify/core-base": "9.2.2",
+        "@intlify/shared": "9.2.2"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
+      "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/set-array": "^1.0.0",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
+      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/source-map": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz",
+      "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==",
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      }
+    },
+    "node_modules/@jridgewell/source-map/node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+      "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+      "dependencies": {
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.4.14",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
+      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.17",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz",
+      "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==",
+      "dependencies": {
+        "@jridgewell/resolve-uri": "3.1.0",
+        "@jridgewell/sourcemap-codec": "1.4.14"
+      }
+    },
+    "node_modules/@leichtgewicht/ip-codec": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz",
+      "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==",
+      "dev": true
+    },
+    "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": {
+      "version": "5.1.1-v1",
+      "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
+      "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==",
+      "dev": true,
+      "dependencies": {
+        "eslint-scope": "5.1.1"
+      }
+    },
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@sindresorhus/is": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",
+      "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/is?sponsor=1"
+      }
+    },
+    "node_modules/@szmarczak/http-timer": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
+      "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",
+      "dependencies": {
+        "defer-to-connect": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@tootallnate/once": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
+      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tsconfig/node10": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz",
+      "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==",
+      "dev": true
+    },
+    "node_modules/@tsconfig/node12": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
+      "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
+      "dev": true
+    },
+    "node_modules/@tsconfig/node14": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
+      "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
+      "dev": true
+    },
+    "node_modules/@tsconfig/node16": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.3.tgz",
+      "integrity": "sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==",
+      "dev": true
+    },
+    "node_modules/@ttskch/select2-bootstrap4-theme": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/@ttskch/select2-bootstrap4-theme/-/select2-bootstrap4-theme-1.5.2.tgz",
+      "integrity": "sha512-gAj8qNy/VYwQDBkACm0USM66kxFai8flX83ayRXPNhzZckEgSqIBB9sM74SCM3ssgeX+ZVy4BifTnLis+KpIyg=="
+    },
+    "node_modules/@types/body-parser": {
+      "version": "1.19.2",
+      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz",
+      "integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==",
+      "dev": true,
+      "dependencies": {
+        "@types/connect": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/bonjour": {
+      "version": "3.5.10",
+      "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz",
+      "integrity": "sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/bootstrap": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/@types/bootstrap/-/bootstrap-4.6.2.tgz",
+      "integrity": "sha512-HbqVAre9VMZF8KBw1UpmBkw0xt4rjrAxMO/JWqFfJZGbVi09t8BVccvB/VxDlygVvvu0BZkAU8ocfNc7/jlFsA==",
+      "dev": true,
+      "dependencies": {
+        "@types/jquery": "*",
+        "popper.js": "^1.14.1"
+      }
+    },
+    "node_modules/@types/cacheable-request": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz",
+      "integrity": "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==",
+      "dependencies": {
+        "@types/http-cache-semantics": "*",
+        "@types/keyv": "^3.1.4",
+        "@types/node": "*",
+        "@types/responselike": "^1.0.0"
+      }
+    },
+    "node_modules/@types/connect": {
+      "version": "3.4.35",
+      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz",
+      "integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/connect-history-api-fallback": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz",
+      "integrity": "sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==",
+      "dev": true,
+      "dependencies": {
+        "@types/express-serve-static-core": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/dropzone": {
+      "version": "5.7.4",
+      "resolved": "https://registry.npmjs.org/@types/dropzone/-/dropzone-5.7.4.tgz",
+      "integrity": "sha512-9kLJ2YAmVRWYrHvDoa95pQzHF0HUMKcznsS7FM1Mht5Yieec+HMB6Ybfm+ocvLjvFCvgyYGFTp4nzNFxhZmo3g==",
+      "dev": true,
+      "dependencies": {
+        "@types/jquery": "*"
+      }
+    },
+    "node_modules/@types/eslint": {
+      "version": "8.4.10",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.10.tgz",
+      "integrity": "sha512-Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw==",
+      "dependencies": {
+        "@types/estree": "*",
+        "@types/json-schema": "*"
+      }
+    },
+    "node_modules/@types/eslint-scope": {
+      "version": "3.7.4",
+      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
+      "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
+      "dependencies": {
+        "@types/eslint": "*",
+        "@types/estree": "*"
+      }
+    },
+    "node_modules/@types/estree": {
+      "version": "0.0.51",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
+      "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ=="
+    },
+    "node_modules/@types/express": {
+      "version": "4.17.15",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.15.tgz",
+      "integrity": "sha512-Yv0k4bXGOH+8a+7bELd2PqHQsuiANB+A8a4gnQrkRWzrkKlb6KHaVvyXhqs04sVW/OWlbPyYxRgYlIXLfrufMQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/body-parser": "*",
+        "@types/express-serve-static-core": "^4.17.31",
+        "@types/qs": "*",
+        "@types/serve-static": "*"
+      }
+    },
+    "node_modules/@types/express-serve-static-core": {
+      "version": "4.17.31",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz",
+      "integrity": "sha512-DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "@types/qs": "*",
+        "@types/range-parser": "*"
+      }
+    },
+    "node_modules/@types/glob": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
+      "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
+      "dev": true,
+      "dependencies": {
+        "@types/minimatch": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/html-minifier-terser": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
+      "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==",
+      "dev": true
+    },
+    "node_modules/@types/http-cache-semantics": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
+      "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ=="
+    },
+    "node_modules/@types/http-proxy": {
+      "version": "1.17.9",
+      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.9.tgz",
+      "integrity": "sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/jquery": {
+      "version": "3.5.14",
+      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.14.tgz",
+      "integrity": "sha512-X1gtMRMbziVQkErhTQmSe2jFwwENA/Zr+PprCkF63vFq+Yt5PZ4AlKqgmeNlwgn7dhsXEK888eIW2520EpC+xg==",
+      "dev": true,
+      "dependencies": {
+        "@types/sizzle": "*"
+      }
+    },
+    "node_modules/@types/jquery.growl": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/@types/jquery.growl/-/jquery.growl-1.3.5.tgz",
+      "integrity": "sha512-gOC04gG44DiRjudmPycoZXZ+BCJ/+YT7YptUjjpZuhkvVdRPz9vlyVACmP3e58U2u1bvKAMIxznYTbknLV6Lfg==",
+      "dev": true,
+      "dependencies": {
+        "@types/jquery": "*"
+      }
+    },
+    "node_modules/@types/json-schema": {
+      "version": "7.0.11",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
+      "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ=="
+    },
+    "node_modules/@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
+      "dev": true
+    },
+    "node_modules/@types/keyv": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz",
+      "integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/lodash": {
+      "version": "4.14.191",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.191.tgz",
+      "integrity": "sha512-BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ==",
+      "dev": true
+    },
+    "node_modules/@types/mime": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz",
+      "integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==",
+      "dev": true
+    },
+    "node_modules/@types/minimatch": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",
+      "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==",
+      "dev": true
+    },
+    "node_modules/@types/minimist": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz",
+      "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==",
+      "dev": true
+    },
+    "node_modules/@types/node": {
+      "version": "18.11.17",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.17.tgz",
+      "integrity": "sha512-HJSUJmni4BeDHhfzn6nF0sVmd1SMezP7/4F0Lq+aXzmp2xm9O7WXrUtHW/CHlYVtZUbByEvWidHqRtcJXGF2Ng=="
+    },
+    "node_modules/@types/normalize-package-data": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
+      "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
+      "dev": true
+    },
+    "node_modules/@types/parse-json": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
+      "dev": true
+    },
+    "node_modules/@types/photoswipe": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/@types/photoswipe/-/photoswipe-4.1.2.tgz",
+      "integrity": "sha512-HA9TtCAQKToldgxRiyJ1DbsElg/cQV/SQ8COVjqIqghjy60Zxfh78E1WiFotthquqkS86nz13Za9wEbToe0svQ==",
+      "dev": true
+    },
+    "node_modules/@types/qs": {
+      "version": "6.9.7",
+      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
+      "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==",
+      "dev": true
+    },
+    "node_modules/@types/range-parser": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz",
+      "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==",
+      "dev": true
+    },
+    "node_modules/@types/responselike": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
+      "integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/retry": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==",
+      "dev": true
+    },
+    "node_modules/@types/semver": {
+      "version": "7.3.13",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz",
+      "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==",
+      "dev": true
+    },
+    "node_modules/@types/serve-index": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz",
+      "integrity": "sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==",
+      "dev": true,
+      "dependencies": {
+        "@types/express": "*"
+      }
+    },
+    "node_modules/@types/serve-static": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==",
+      "dev": true,
+      "dependencies": {
+        "@types/mime": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/sizzle": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz",
+      "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==",
+      "dev": true
+    },
+    "node_modules/@types/sockjs": {
+      "version": "0.3.33",
+      "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz",
+      "integrity": "sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/sprintf-js": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@types/sprintf-js/-/sprintf-js-1.1.2.tgz",
+      "integrity": "sha512-hkgzYF+qnIl8uTO8rmUSVSfQ8BIfMXC4yJAF4n8BE758YsKBZvFC4NumnAegj7KmylP0liEZNpb9RRGFMbFejA==",
+      "dev": true
+    },
+    "node_modules/@types/typeahead.js": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/@types/typeahead.js/-/typeahead.js-0.11.1.tgz",
+      "integrity": "sha512-brFWKbilAIFqX0eY47xERqeQKTkWTzuOYV5QfJtuOWWcKFBkM/LQrYH1jUUHUEkf9IpYdefsQB2WclH8dhgLDw==",
+      "dev": true,
+      "dependencies": {
+        "@types/jquery": "*"
+      }
+    },
+    "node_modules/@types/webpack": {
+      "version": "5.28.0",
+      "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-5.28.0.tgz",
+      "integrity": "sha512-8cP0CzcxUiFuA9xGJkfeVpqmWTk9nx6CWwamRGCj95ph1SmlRRk9KlCZ6avhCbZd4L68LvYT6l1kpdEnQXrF8w==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "tapable": "^2.2.0",
+        "webpack": "^5"
+      }
+    },
+    "node_modules/@types/ws": {
+      "version": "8.5.3",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz",
+      "integrity": "sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/zxcvbn": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/@types/zxcvbn/-/zxcvbn-4.4.1.tgz",
+      "integrity": "sha512-3NoqvZC2W5gAC5DZbTpCeJ251vGQmgcWIHQJGq2J240HY6ErQ9aWKkwfoKJlHLx+A83WPNTZ9+3cd2ILxbvr1w==",
+      "dev": true
+    },
+    "node_modules/@typescript-eslint/eslint-plugin": {
+      "version": "5.47.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.47.0.tgz",
+      "integrity": "sha512-AHZtlXAMGkDmyLuLZsRpH3p4G/1iARIwc/T0vIem2YB+xW6pZaXYXzCBnZSF/5fdM97R9QqZWZ+h3iW10XgevQ==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/scope-manager": "5.47.0",
+        "@typescript-eslint/type-utils": "5.47.0",
+        "@typescript-eslint/utils": "5.47.0",
+        "debug": "^4.3.4",
+        "ignore": "^5.2.0",
+        "natural-compare-lite": "^1.4.0",
+        "regexpp": "^3.2.0",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/parser": "^5.0.0",
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": {
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/@typescript-eslint/parser": {
+      "version": "5.47.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.47.0.tgz",
+      "integrity": "sha512-udPU4ckK+R1JWCGdQC4Qa27NtBg7w020ffHqGyAK8pAgOVuNw7YaKXGChk+udh+iiGIJf6/E/0xhVXyPAbsczw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/scope-manager": "5.47.0",
+        "@typescript-eslint/types": "5.47.0",
+        "@typescript-eslint/typescript-estree": "5.47.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/scope-manager": {
+      "version": "5.47.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.47.0.tgz",
+      "integrity": "sha512-dvJab4bFf7JVvjPuh3sfBUWsiD73aiftKBpWSfi3sUkysDQ4W8x+ZcFpNp7Kgv0weldhpmMOZBjx1wKN8uWvAw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.47.0",
+        "@typescript-eslint/visitor-keys": "5.47.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils": {
+      "version": "5.47.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.47.0.tgz",
+      "integrity": "sha512-1J+DFFrYoDUXQE1b7QjrNGARZE6uVhBqIvdaXTe5IN+NmEyD68qXR1qX1g2u4voA+nCaelQyG8w30SAOihhEYg==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/typescript-estree": "5.47.0",
+        "@typescript-eslint/utils": "5.47.0",
+        "debug": "^4.3.4",
+        "tsutils": "^3.21.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "*"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/types": {
+      "version": "5.47.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.47.0.tgz",
+      "integrity": "sha512-eslFG0Qy8wpGzDdYKu58CEr3WLkjwC5Usa6XbuV89ce/yN5RITLe1O8e+WFEuxnfftHiJImkkOBADj58ahRxSg==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree": {
+      "version": "5.47.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.47.0.tgz",
+      "integrity": "sha512-LxfKCG4bsRGq60Sqqu+34QT5qT2TEAHvSCCJ321uBWywgE2dS0LKcu5u+3sMGo+Vy9UmLOhdTw5JHzePV/1y4Q==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.47.0",
+        "@typescript-eslint/visitor-keys": "5.47.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/@typescript-eslint/utils": {
+      "version": "5.47.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.47.0.tgz",
+      "integrity": "sha512-U9xcc0N7xINrCdGVPwABjbAKqx4GK67xuMV87toI+HUqgXj26m6RBp9UshEXcTrgCkdGYFzgKLt8kxu49RilDw==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.9",
+        "@types/semver": "^7.3.12",
+        "@typescript-eslint/scope-manager": "5.47.0",
+        "@typescript-eslint/types": "5.47.0",
+        "@typescript-eslint/typescript-estree": "5.47.0",
+        "eslint-scope": "^5.1.1",
+        "eslint-utils": "^3.0.0",
+        "semver": "^7.3.7"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/utils/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@typescript-eslint/utils/node_modules/semver": {
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@typescript-eslint/utils/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/@typescript-eslint/visitor-keys": {
+      "version": "5.47.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.47.0.tgz",
+      "integrity": "sha512-ByPi5iMa6QqDXe/GmT/hR6MZtVPi0SqMQPDx15FczCBXJo/7M8T88xReOALAfpBLm+zxpPfmhuEvPb577JRAEg==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.47.0",
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/@vue/compiler-core": {
+      "version": "3.2.45",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.45.tgz",
+      "integrity": "sha512-rcMj7H+PYe5wBV3iYeUgbCglC+pbpN8hBLTJvRiK2eKQiWqu+fG9F+8sW99JdL4LQi7Re178UOxn09puSXvn4A==",
+      "dependencies": {
+        "@babel/parser": "^7.16.4",
+        "@vue/shared": "3.2.45",
+        "estree-walker": "^2.0.2",
+        "source-map": "^0.6.1"
+      }
+    },
+    "node_modules/@vue/compiler-dom": {
+      "version": "3.2.45",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.45.tgz",
+      "integrity": "sha512-tyYeUEuKqqZO137WrZkpwfPCdiiIeXYCcJ8L4gWz9vqaxzIQRccTSwSWZ/Axx5YR2z+LvpUbmPNXxuBU45lyRw==",
+      "dependencies": {
+        "@vue/compiler-core": "3.2.45",
+        "@vue/shared": "3.2.45"
+      }
+    },
+    "node_modules/@vue/compiler-sfc": {
+      "version": "3.2.45",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.45.tgz",
+      "integrity": "sha512-1jXDuWah1ggsnSAOGsec8cFjT/K6TMZ0sPL3o3d84Ft2AYZi2jWJgRMjw4iaK0rBfA89L5gw427H4n1RZQBu6Q==",
+      "dependencies": {
+        "@babel/parser": "^7.16.4",
+        "@vue/compiler-core": "3.2.45",
+        "@vue/compiler-dom": "3.2.45",
+        "@vue/compiler-ssr": "3.2.45",
+        "@vue/reactivity-transform": "3.2.45",
+        "@vue/shared": "3.2.45",
+        "estree-walker": "^2.0.2",
+        "magic-string": "^0.25.7",
+        "postcss": "^8.1.10",
+        "source-map": "^0.6.1"
+      }
+    },
+    "node_modules/@vue/compiler-ssr": {
+      "version": "3.2.45",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.45.tgz",
+      "integrity": "sha512-6BRaggEGqhWht3lt24CrIbQSRD5O07MTmd+LjAn5fJj568+R9eUD2F7wMQJjX859seSlrYog7sUtrZSd7feqrQ==",
+      "dependencies": {
+        "@vue/compiler-dom": "3.2.45",
+        "@vue/shared": "3.2.45"
+      }
+    },
+    "node_modules/@vue/devtools-api": {
+      "version": "6.4.5",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.4.5.tgz",
+      "integrity": "sha512-JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ=="
+    },
+    "node_modules/@vue/eslint-config-typescript": {
+      "version": "11.0.2",
+      "resolved": "https://registry.npmjs.org/@vue/eslint-config-typescript/-/eslint-config-typescript-11.0.2.tgz",
+      "integrity": "sha512-EiKud1NqlWmSapBFkeSrE994qpKx7/27uCGnhdqzllYDpQZroyX/O6bwjEpeuyKamvLbsGdO6PMR2faIf+zFnw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/eslint-plugin": "^5.0.0",
+        "@typescript-eslint/parser": "^5.0.0",
+        "vue-eslint-parser": "^9.0.0"
+      },
+      "engines": {
+        "node": "^14.17.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^6.2.0 || ^7.0.0 || ^8.0.0",
+        "eslint-plugin-vue": "^9.0.0",
+        "typescript": "*"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@vue/reactivity": {
+      "version": "3.2.45",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.45.tgz",
+      "integrity": "sha512-PRvhCcQcyEVohW0P8iQ7HDcIOXRjZfAsOds3N99X/Dzewy8TVhTCT4uXpAHfoKjVTJRA0O0K+6QNkDIZAxNi3A==",
+      "dependencies": {
+        "@vue/shared": "3.2.45"
+      }
+    },
+    "node_modules/@vue/reactivity-transform": {
+      "version": "3.2.45",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.45.tgz",
+      "integrity": "sha512-BHVmzYAvM7vcU5WmuYqXpwaBHjsS8T63jlKGWVtHxAHIoMIlmaMyurUSEs1Zcg46M4AYT5MtB1U274/2aNzjJQ==",
+      "dependencies": {
+        "@babel/parser": "^7.16.4",
+        "@vue/compiler-core": "3.2.45",
+        "@vue/shared": "3.2.45",
+        "estree-walker": "^2.0.2",
+        "magic-string": "^0.25.7"
+      }
+    },
+    "node_modules/@vue/runtime-core": {
+      "version": "3.2.45",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.45.tgz",
+      "integrity": "sha512-gzJiTA3f74cgARptqzYswmoQx0fIA+gGYBfokYVhF8YSXjWTUA2SngRzZRku2HbGbjzB6LBYSbKGIaK8IW+s0A==",
+      "dependencies": {
+        "@vue/reactivity": "3.2.45",
+        "@vue/shared": "3.2.45"
+      }
+    },
+    "node_modules/@vue/runtime-dom": {
+      "version": "3.2.45",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.45.tgz",
+      "integrity": "sha512-cy88YpfP5Ue2bDBbj75Cb4bIEZUMM/mAkDMfqDTpUYVgTf/kuQ2VQ8LebuZ8k6EudgH8pYhsGWHlY0lcxlvTwA==",
+      "dependencies": {
+        "@vue/runtime-core": "3.2.45",
+        "@vue/shared": "3.2.45",
+        "csstype": "^2.6.8"
+      }
+    },
+    "node_modules/@vue/server-renderer": {
+      "version": "3.2.45",
+      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.45.tgz",
+      "integrity": "sha512-ebiMq7q24WBU1D6uhPK//2OTR1iRIyxjF5iVq/1a5I1SDMDyDu4Ts6fJaMnjrvD3MqnaiFkKQj+LKAgz5WIK3g==",
+      "dependencies": {
+        "@vue/compiler-ssr": "3.2.45",
+        "@vue/shared": "3.2.45"
+      },
+      "peerDependencies": {
+        "vue": "3.2.45"
+      }
+    },
+    "node_modules/@vue/shared": {
+      "version": "3.2.45",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.45.tgz",
+      "integrity": "sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg=="
+    },
+    "node_modules/@webassemblyjs/ast": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
+      "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
+      "dependencies": {
+        "@webassemblyjs/helper-numbers": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1"
+      }
+    },
+    "node_modules/@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
+      "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ=="
+    },
+    "node_modules/@webassemblyjs/helper-api-error": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
+      "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg=="
+    },
+    "node_modules/@webassemblyjs/helper-buffer": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
+      "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA=="
+    },
+    "node_modules/@webassemblyjs/helper-numbers": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
+      "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==",
+      "dependencies": {
+        "@webassemblyjs/floating-point-hex-parser": "1.11.1",
+        "@webassemblyjs/helper-api-error": "1.11.1",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
+      "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q=="
+    },
+    "node_modules/@webassemblyjs/helper-wasm-section": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
+      "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-buffer": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
+        "@webassemblyjs/wasm-gen": "1.11.1"
+      }
+    },
+    "node_modules/@webassemblyjs/ieee754": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
+      "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==",
+      "dependencies": {
+        "@xtuc/ieee754": "^1.2.0"
+      }
+    },
+    "node_modules/@webassemblyjs/leb128": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
+      "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==",
+      "dependencies": {
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webassemblyjs/utf8": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
+      "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ=="
+    },
+    "node_modules/@webassemblyjs/wasm-edit": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
+      "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-buffer": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
+        "@webassemblyjs/helper-wasm-section": "1.11.1",
+        "@webassemblyjs/wasm-gen": "1.11.1",
+        "@webassemblyjs/wasm-opt": "1.11.1",
+        "@webassemblyjs/wasm-parser": "1.11.1",
+        "@webassemblyjs/wast-printer": "1.11.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-gen": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
+      "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
+        "@webassemblyjs/ieee754": "1.11.1",
+        "@webassemblyjs/leb128": "1.11.1",
+        "@webassemblyjs/utf8": "1.11.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-opt": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
+      "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-buffer": "1.11.1",
+        "@webassemblyjs/wasm-gen": "1.11.1",
+        "@webassemblyjs/wasm-parser": "1.11.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wasm-parser": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
+      "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-api-error": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
+        "@webassemblyjs/ieee754": "1.11.1",
+        "@webassemblyjs/leb128": "1.11.1",
+        "@webassemblyjs/utf8": "1.11.1"
+      }
+    },
+    "node_modules/@webassemblyjs/wast-printer": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
+      "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.1",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "node_modules/@webpack-cli/configtest": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.0.1.tgz",
+      "integrity": "sha512-njsdJXJSiS2iNbQVS0eT8A/KPnmyH4pv1APj2K0d1wrZcBLw+yppxOy4CGqa0OxDJkzfL/XELDhD8rocnIwB5A==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.15.0"
+      },
+      "peerDependencies": {
+        "webpack": "5.x.x",
+        "webpack-cli": "5.x.x"
+      }
+    },
+    "node_modules/@webpack-cli/info": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-2.0.1.tgz",
+      "integrity": "sha512-fE1UEWTwsAxRhrJNikE7v4EotYflkEhBL7EbajfkPlf6E37/2QshOy/D48Mw8G5XMFlQtS6YV42vtbG9zBpIQA==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.15.0"
+      },
+      "peerDependencies": {
+        "webpack": "5.x.x",
+        "webpack-cli": "5.x.x"
+      }
+    },
+    "node_modules/@webpack-cli/serve": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-2.0.1.tgz",
+      "integrity": "sha512-0G7tNyS+yW8TdgHwZKlDWYXFA6OJQnoLCQvYKkQP0Q2X205PSQ6RNUj0M+1OB/9gRQaUZ/ccYfaxd0nhaWKfjw==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.15.0"
+      },
+      "peerDependencies": {
+        "webpack": "5.x.x",
+        "webpack-cli": "5.x.x"
+      },
+      "peerDependenciesMeta": {
+        "webpack-dev-server": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@xtuc/ieee754": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="
+    },
+    "node_modules/@xtuc/long": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
+    },
+    "node_modules/abab": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
+      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
+      "dev": true
+    },
+    "node_modules/accepts": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+      "dev": true,
+      "dependencies": {
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/acorn": {
+      "version": "8.8.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
+      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-globals": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
+      "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^7.1.1",
+        "acorn-walk": "^7.1.1"
+      }
+    },
+    "node_modules/acorn-globals/node_modules/acorn": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-globals/node_modules/acorn-walk": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
+      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-import-assertions": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
+      "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
+      "peerDependencies": {
+        "acorn": "^8"
+      }
+    },
+    "node_modules/acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true,
+      "peerDependencies": {
+        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/acorn-walk": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
+      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ajv-formats": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
+      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ajv": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/ajv-formats/node_modules/ajv": {
+      "version": "8.11.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.2.tgz",
+      "integrity": "sha512-E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ajv-formats/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
+    },
+    "node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
+    "node_modules/ansi-colors": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz",
+      "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ansi-html-community": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
+      "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
+      "dev": true,
+      "engines": [
+        "node >= 0.8.0"
+      ],
+      "bin": {
+        "ansi-html": "bin/ansi-html"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ansis": {
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/ansis/-/ansis-1.5.5.tgz",
+      "integrity": "sha512-DNctovTacxs/NfZpGo6bIGWgLd2oZsDO7RJbiYX6Ttj40LPZM1XKv9WtesH13ieOEm1GajjD+Vik2n9YnSTPdA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.13"
+      },
+      "funding": {
+        "type": "patreon",
+        "url": "https://patreon.com/biodiscus"
+      }
+    },
+    "node_modules/anymatch": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "dev": true,
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/arg": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
+      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
+      "dev": true
+    },
+    "node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "node_modules/array-differ": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz",
+      "integrity": "sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/array-find": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-find/-/array-find-1.0.0.tgz",
+      "integrity": "sha512-kO/vVCacW9mnpn3WPWbTVlEnOabK2L7LWi2HViURtCM46y1zb6I8UMjx4LgbiqadTgHnLInUronwn3ampNTJtQ==",
+      "dev": true
+    },
+    "node_modules/array-flatten": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
+      "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
+      "dev": true
+    },
+    "node_modules/array-includes": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
+      "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "get-intrinsic": "^1.1.3",
+        "is-string": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array.prototype.flat": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
+      "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.reduce": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz",
+      "integrity": "sha512-kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-array-method-boxes-properly": "^1.0.0",
+        "is-string": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/arrify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+      "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/asn1.js": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
+      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
+    "node_modules/asn1.js/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
+    "node_modules/assert": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
+      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
+      "dev": true,
+      "dependencies": {
+        "object-assign": "^4.1.1",
+        "util": "0.10.3"
+      }
+    },
+    "node_modules/assert/node_modules/inherits": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+      "integrity": "sha512-8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA==",
+      "dev": true
+    },
+    "node_modules/assert/node_modules/util": {
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+      "integrity": "sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "2.0.1"
+      }
+    },
+    "node_modules/assertion-error": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
+      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/astral-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "dev": true
+    },
+    "node_modules/autoprefixer": {
+      "version": "10.4.13",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz",
+      "integrity": "sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/autoprefixer"
+        }
+      ],
+      "dependencies": {
+        "browserslist": "^4.21.4",
+        "caniuse-lite": "^1.0.30001426",
+        "fraction.js": "^4.2.0",
+        "normalize-range": "^0.1.2",
+        "picocolors": "^1.0.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "bin": {
+        "autoprefixer": "bin/autoprefixer"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "node_modules/base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/batch": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
+      "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
+      "dev": true
+    },
+    "node_modules/big.js": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/bignumber.js": {
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.1.tgz",
+      "integrity": "sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig==",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/binary-extensions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/bn.js": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
+      "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==",
+      "dev": true
+    },
+    "node_modules/body-parser": {
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+      "dev": true,
+      "dependencies": {
+        "bytes": "3.1.2",
+        "content-type": "~1.0.4",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "on-finished": "2.4.1",
+        "qs": "6.11.0",
+        "raw-body": "2.5.1",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
+    },
+    "node_modules/body-parser/node_modules/bytes": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/body-parser/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/body-parser/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/bonjour-service": {
+      "version": "1.0.14",
+      "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.0.14.tgz",
+      "integrity": "sha512-HIMbgLnk1Vqvs6B4Wq5ep7mxvj9sGz5d1JJyDNSGNIdA/w2MCz6GTjWTdjqOJV1bEPj+6IkxDvWNFKEBxNt4kQ==",
+      "dev": true,
+      "dependencies": {
+        "array-flatten": "^2.1.2",
+        "dns-equal": "^1.0.0",
+        "fast-deep-equal": "^3.1.3",
+        "multicast-dns": "^7.2.5"
+      }
+    },
+    "node_modules/boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
+      "dev": true
+    },
+    "node_modules/bootstrap": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.4.1.tgz",
+      "integrity": "sha512-tbx5cHubwE6e2ZG7nqM3g/FZ5PQEDMWmMGNrCUBVRPHXTJaH7CBDdsLeu3eCh3B1tzAxTnAbtmrzvWEvT2NNEA==",
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/bootstrap"
+      },
+      "peerDependencies": {
+        "jquery": "1.9.1 - 3",
+        "popper.js": "^1.16.0"
+      }
+    },
+    "node_modules/bootstrap-colorpicker": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/bootstrap-colorpicker/-/bootstrap-colorpicker-3.4.0.tgz",
+      "integrity": "sha512-7vA0hvLrat3ptobEKlT9+6amzBUJcDAoh6hJRQY/AD+5dVZYXXf1ivRfrTwmuwiVLJo9rZwM8YB4lYzp6agzqg==",
+      "dependencies": {
+        "bootstrap": ">=4.0",
+        "jquery": ">=2.2",
+        "popper.js": ">=1.10"
+      }
+    },
+    "node_modules/bootstrap-tokenfield": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/bootstrap-tokenfield/-/bootstrap-tokenfield-0.12.0.tgz",
+      "integrity": "sha512-OgLQEQ1V3s69wgvjpWvPESNTv1RUZKtwpRQd3o5AQYdan47iUAL7ajSMjXMlSxWywrLTntF1l84aE7N1DvUlVw==",
+      "dependencies": {
+        "jquery": "^2.1.0"
+      }
+    },
+    "node_modules/bootstrap-tokenfield/node_modules/jquery": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz",
+      "integrity": "sha512-lBHj60ezci2u1v2FqnZIraShGgEXq35qCzMv4lITyHGppTnA13rwR0MgwyNJh9TnDs3aXUvd1xjAotfraMHX/Q=="
+    },
+    "node_modules/bourbon": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/bourbon/-/bourbon-4.3.4.tgz",
+      "integrity": "sha512-XY2nuWcgS5ODGVFHgE/SsjFb18ke1dPtxu32vDm2tue8v4RflmU0mp0jpdIvvyjEtYEv6oiSpQL2PRUsEqde4w=="
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "dependencies": {
+        "fill-range": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/brorand": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+      "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==",
+      "dev": true
+    },
+    "node_modules/browser-process-hrtime": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
+      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
+      "dev": true
+    },
+    "node_modules/browser-stdout": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
+      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
+      "dev": true
+    },
+    "node_modules/browserify-aes": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+      "dev": true,
+      "dependencies": {
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/browserify-cipher": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+      "dev": true,
+      "dependencies": {
+        "browserify-aes": "^1.0.4",
+        "browserify-des": "^1.0.0",
+        "evp_bytestokey": "^1.0.0"
+      }
+    },
+    "node_modules/browserify-des": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+      "dev": true,
+      "dependencies": {
+        "cipher-base": "^1.0.1",
+        "des.js": "^1.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/browserify-rsa": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
+      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^5.0.0",
+        "randombytes": "^2.0.1"
+      }
+    },
+    "node_modules/browserify-sign": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
+      "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^5.1.1",
+        "browserify-rsa": "^4.0.1",
+        "create-hash": "^1.2.0",
+        "create-hmac": "^1.1.7",
+        "elliptic": "^6.5.3",
+        "inherits": "^2.0.4",
+        "parse-asn1": "^5.1.5",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      }
+    },
+    "node_modules/browserify-sign/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/browserify-zlib": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+      "dev": true,
+      "dependencies": {
+        "pako": "~1.0.5"
+      }
+    },
+    "node_modules/browserslist": {
+      "version": "4.21.4",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
+      "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        }
+      ],
+      "dependencies": {
+        "caniuse-lite": "^1.0.30001400",
+        "electron-to-chromium": "^1.4.251",
+        "node-releases": "^2.0.6",
+        "update-browserslist-db": "^1.0.9"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      },
+      "engines": {
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      }
+    },
+    "node_modules/buffer": {
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
+      "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
+      "dev": true,
+      "dependencies": {
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4",
+        "isarray": "^1.0.0"
+      }
+    },
+    "node_modules/buffer-builder": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/buffer-builder/-/buffer-builder-0.2.0.tgz",
+      "integrity": "sha512-7VPMEPuYznPSoR21NE1zvd2Xna6c/CloiZCfcMXR1Jny6PjX0N4Nsa38zcBFo/FMK+BlA+FLKbJCQ0i2yxp+Xg==",
+      "dev": true
+    },
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
+    },
+    "node_modules/buffer-xor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==",
+      "dev": true
+    },
+    "node_modules/builtin-status-codes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+      "integrity": "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==",
+      "dev": true
+    },
+    "node_modules/bytes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+      "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/cacheable-lookup": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
+      "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==",
+      "engines": {
+        "node": ">=10.6.0"
+      }
+    },
+    "node_modules/cacheable-request": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz",
+      "integrity": "sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==",
+      "dependencies": {
+        "clone-response": "^1.0.2",
+        "get-stream": "^5.1.0",
+        "http-cache-semantics": "^4.0.0",
+        "keyv": "^4.0.0",
+        "lowercase-keys": "^2.0.0",
+        "normalize-url": "^6.0.1",
+        "responselike": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/camel-case": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
+      "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
+      "dev": true,
+      "dependencies": {
+        "pascal-case": "^3.1.2",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/camelcase-keys": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
+      "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^5.3.1",
+        "map-obj": "^4.0.0",
+        "quick-lru": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001441",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001441.tgz",
+      "integrity": "sha512-OyxRR4Vof59I3yGWXws6i908EtGbMzVUi3ganaZQHmydk1iwDhRnvaPG2WaR0KcqrDFKrxVZHULT396LEPhXfg==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        }
+      ]
+    },
+    "node_modules/chai": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.7.tgz",
+      "integrity": "sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==",
+      "dev": true,
+      "dependencies": {
+        "assertion-error": "^1.1.0",
+        "check-error": "^1.0.2",
+        "deep-eql": "^4.1.2",
+        "get-func-name": "^2.0.0",
+        "loupe": "^2.3.1",
+        "pathval": "^1.1.1",
+        "type-detect": "^4.0.5"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/check-error": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
+      "integrity": "sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/chokidar": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ],
+      "dependencies": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/chokidar/node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/chrome-trace-event": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
+      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
+    "node_modules/cipher-base": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/clean-css": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.1.tgz",
+      "integrity": "sha512-lCr8OHhiWCTw4v8POJovCoh4T7I9U11yVsPjMWWnnMmp9ZowCxyad1Pathle/9HjaDp+fdQKjO9fQydE6RHTZg==",
+      "dev": true,
+      "dependencies": {
+        "source-map": "~0.6.0"
+      },
+      "engines": {
+        "node": ">= 10.0"
+      }
+    },
+    "node_modules/clean-webpack-plugin": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-4.0.0.tgz",
+      "integrity": "sha512-WuWE1nyTNAyW5T7oNyys2EN0cfP2fdRxhxnIQWiAp0bMabPdHhoGxM8A6YL2GhqwgrPnnaemVE7nv5XJ2Fhh2w==",
+      "dev": true,
+      "dependencies": {
+        "del": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "webpack": ">=4.0.0 <6.0.0"
+      }
+    },
+    "node_modules/cliui": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^3.1.0",
+        "strip-ansi": "^5.2.0",
+        "wrap-ansi": "^5.1.0"
+      }
+    },
+    "node_modules/cliui/node_modules/ansi-regex": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/cliui/node_modules/emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "dev": true
+    },
+    "node_modules/cliui/node_modules/is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/cliui/node_modules/string-width": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^7.0.1",
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/cliui/node_modules/strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/clone-deep": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.4",
+        "kind-of": "^6.0.2",
+        "shallow-clone": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/clone-deep/node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/clone-response": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
+      "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",
+      "dependencies": {
+        "mimic-response": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true
+    },
+    "node_modules/colord": {
+      "version": "2.9.3",
+      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
+      "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==",
+      "dev": true
+    },
+    "node_modules/colorette": {
+      "version": "2.0.19",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz",
+      "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==",
+      "dev": true
+    },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dev": true,
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/commander": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
+      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
+      "dev": true,
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/compressible": {
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
+      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
+      "dev": true,
+      "dependencies": {
+        "mime-db": ">= 1.43.0 < 2"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/compression": {
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
+      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
+      "dev": true,
+      "dependencies": {
+        "accepts": "~1.3.5",
+        "bytes": "3.0.0",
+        "compressible": "~2.0.16",
+        "debug": "2.6.9",
+        "on-headers": "~1.0.2",
+        "safe-buffer": "5.1.2",
+        "vary": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/compression/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/compression/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/compression/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true
+    },
+    "node_modules/confusing-browser-globals": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
+      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
+      "dev": true
+    },
+    "node_modules/connect-history-api-fallback": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
+      "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/console-browserify": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
+      "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
+      "dev": true
+    },
+    "node_modules/constants-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+      "integrity": "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==",
+      "dev": true
+    },
+    "node_modules/content-disposition": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "5.2.1"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/content-type": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/convert-source-map": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+      "dev": true
+    },
+    "node_modules/cookie": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
+      "dev": true
+    },
+    "node_modules/copy-webpack-plugin": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz",
+      "integrity": "sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==",
+      "dev": true,
+      "dependencies": {
+        "fast-glob": "^3.2.11",
+        "glob-parent": "^6.0.1",
+        "globby": "^13.1.1",
+        "normalize-path": "^3.0.0",
+        "schema-utils": "^4.0.0",
+        "serialize-javascript": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 14.15.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.1.0"
+      }
+    },
+    "node_modules/copy-webpack-plugin/node_modules/globby": {
+      "version": "13.1.3",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-13.1.3.tgz",
+      "integrity": "sha512-8krCNHXvlCgHDpegPzleMq07yMYTO2sXKASmZmquEYWEmCx6J5UTRbp5RwMJkTJGtcQ44YpiUYUiN0b9mzy8Bw==",
+      "dev": true,
+      "dependencies": {
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.11",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^4.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/copy-webpack-plugin/node_modules/slash": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
+      "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/core-js": {
+      "version": "3.26.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.26.1.tgz",
+      "integrity": "sha512-21491RRQVzUn0GGM9Z1Jrpr6PNPxPi+Za8OM9q4tksTSnlbXXGKK1nXNg/QvwFYettXvSX6zWKCtHHfjN4puyA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/core-util-is": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+      "dev": true
+    },
+    "node_modules/cosmiconfig": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
+      "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
+      "dev": true,
+      "dependencies": {
+        "@types/parse-json": "^4.0.0",
+        "import-fresh": "^3.2.1",
+        "parse-json": "^5.0.0",
+        "path-type": "^4.0.0",
+        "yaml": "^1.10.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/create-ecdh": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
+      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "elliptic": "^6.5.3"
+      }
+    },
+    "node_modules/create-ecdh/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
+    "node_modules/create-hash": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "dev": true,
+      "dependencies": {
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
+      }
+    },
+    "node_modules/create-hmac": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+      "dev": true,
+      "dependencies": {
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "node_modules/create-require": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
+      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
+      "dev": true
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/crypto-browserify": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+      "dev": true,
+      "dependencies": {
+        "browserify-cipher": "^1.0.0",
+        "browserify-sign": "^4.0.0",
+        "create-ecdh": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.0",
+        "diffie-hellman": "^5.0.0",
+        "inherits": "^2.0.1",
+        "pbkdf2": "^3.0.3",
+        "public-encrypt": "^4.0.0",
+        "randombytes": "^2.0.0",
+        "randomfill": "^1.0.3"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/css-blank-pseudo": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-3.0.3.tgz",
+      "integrity": "sha512-VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ==",
+      "dev": true,
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.9"
+      },
+      "bin": {
+        "css-blank-pseudo": "dist/cli.cjs"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/css-functions-list": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.1.0.tgz",
+      "integrity": "sha512-/9lCvYZaUbBGvYUgYGFJ4dcYiyqdhSjG7IPVluoV8A1ILjkF7ilmhp1OGUz8n+nmBcu0RNrQAzgD8B6FJbrt2w==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.22"
+      }
+    },
+    "node_modules/css-has-pseudo": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-3.0.4.tgz",
+      "integrity": "sha512-Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw==",
+      "dev": true,
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.9"
+      },
+      "bin": {
+        "css-has-pseudo": "dist/cli.cjs"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/css-loader": {
+      "version": "6.7.3",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.7.3.tgz",
+      "integrity": "sha512-qhOH1KlBMnZP8FzRO6YCH9UHXQhVMcEGLyNdb7Hv2cpcmJbW0YrddO+tG1ab5nT41KpHIYGsbeHqxB9xPu1pKQ==",
+      "dev": true,
+      "dependencies": {
+        "icss-utils": "^5.1.0",
+        "postcss": "^8.4.19",
+        "postcss-modules-extract-imports": "^3.0.0",
+        "postcss-modules-local-by-default": "^4.0.0",
+        "postcss-modules-scope": "^3.0.0",
+        "postcss-modules-values": "^4.0.0",
+        "postcss-value-parser": "^4.2.0",
+        "semver": "^7.3.8"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/css-loader/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/css-loader/node_modules/semver": {
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/css-loader/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/css-prefers-color-scheme": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz",
+      "integrity": "sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==",
+      "dev": true,
+      "bin": {
+        "css-prefers-color-scheme": "dist/cli.cjs"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/css-rule-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/css-rule-stream/-/css-rule-stream-1.1.0.tgz",
+      "integrity": "sha512-qiio/Zkr8I19jh/XuzEkK8OKDQRTrEYaRyIHy4Bwh/tPUe0w8GcQs7r6x24Yc9lT+FbnZFYULxEIXCmaymguUQ==",
+      "dev": true,
+      "dependencies": {
+        "css-tokenize": "^1.0.1",
+        "duplexer2": "0.0.2",
+        "ldjson-stream": "^1.2.1",
+        "through2": "^0.6.3"
+      },
+      "bin": {
+        "css-rule-stream": "index.js"
+      }
+    },
+    "node_modules/css-rule-stream/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+      "dev": true
+    },
+    "node_modules/css-rule-stream/node_modules/readable-stream": {
+      "version": "1.0.34",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+      "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/css-rule-stream/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+      "dev": true
+    },
+    "node_modules/css-rule-stream/node_modules/through2": {
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+      "integrity": "sha512-RkK/CCESdTKQZHdmKICijdKKsCRVHs5KsLZ6pACAmF/1GPUQhonHSXWNERctxEp7RmvjdNbZTL5z9V7nSCXKcg==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": ">=1.0.33-1 <1.1.0-0",
+        "xtend": ">=4.0.0 <4.1.0-0"
+      }
+    },
+    "node_modules/css-select": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
+      "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
+      "dev": true,
+      "dependencies": {
+        "boolbase": "^1.0.0",
+        "css-what": "^6.0.1",
+        "domhandler": "^4.3.1",
+        "domutils": "^2.8.0",
+        "nth-check": "^2.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/css-tokenize": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/css-tokenize/-/css-tokenize-1.0.1.tgz",
+      "integrity": "sha512-gLmmbJdwH9HLY4bcA17lnZ8GgPwEXRbvxBJGHnkiB6gLhRpTzjkjtMIvz7YORGW/Ptv2oMk8b5g+u7mRD6Dd7A==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "readable-stream": "^1.0.33"
+      }
+    },
+    "node_modules/css-tokenize/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+      "dev": true
+    },
+    "node_modules/css-tokenize/node_modules/readable-stream": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+      "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/css-tokenize/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+      "dev": true
+    },
+    "node_modules/css-tree": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
+      "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
+      "dev": true,
+      "dependencies": {
+        "mdn-data": "2.0.14",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/css-what": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
+      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/cssdb": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-7.2.0.tgz",
+      "integrity": "sha512-JYlIsE7eKHSi0UNuCyo96YuIDFqvhGgHw4Ck6lsN+DP0Tp8M64UTDT2trGbkMDqnCoEjks7CkS0XcjU0rkvBdg==",
+      "dev": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      }
+    },
+    "node_modules/cssesc": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+      "dev": true,
+      "bin": {
+        "cssesc": "bin/cssesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/csso": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
+      "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
+      "dev": true,
+      "dependencies": {
+        "css-tree": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/csso-webpack-plugin": {
+      "version": "2.0.0-beta.3",
+      "resolved": "https://registry.npmjs.org/csso-webpack-plugin/-/csso-webpack-plugin-2.0.0-beta.3.tgz",
+      "integrity": "sha512-FnhgS7W1BwOduZagTLg9UjT2kvM9aiSpInm4xIDZHLuXl6/6vbOA1+DIIcbGKSjE0dWIVuDKEv1to86mN6KZ4w==",
+      "dev": true,
+      "dependencies": {
+        "@types/webpack": ">=4.0",
+        "core-js": "^3.10.1",
+        "csso": "^4.0.2",
+        "source-map": "^0.7.3",
+        "webpack-sources": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/csso-webpack-plugin/node_modules/source-map": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
+      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/cssom": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz",
+      "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==",
+      "dev": true
+    },
+    "node_modules/cssstyle": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
+      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
+      "dev": true,
+      "dependencies": {
+        "cssom": "~0.3.6"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cssstyle/node_modules/cssom": {
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
+      "dev": true
+    },
+    "node_modules/csstype": {
+      "version": "2.6.21",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.21.tgz",
+      "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w=="
+    },
+    "node_modules/data-urls": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz",
+      "integrity": "sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==",
+      "dev": true,
+      "dependencies": {
+        "abab": "^2.0.6",
+        "whatwg-mimetype": "^3.0.0",
+        "whatwg-url": "^11.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/data-urls/node_modules/whatwg-url": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz",
+      "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==",
+      "dev": true,
+      "dependencies": {
+        "tr46": "^3.0.0",
+        "webidl-conversions": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/decamelize-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz",
+      "integrity": "sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==",
+      "dev": true,
+      "dependencies": {
+        "decamelize": "^1.1.0",
+        "map-obj": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/decamelize-keys/node_modules/map-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+      "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/decimal.js": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
+      "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==",
+      "dev": true
+    },
+    "node_modules/decompress-response": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
+      "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
+      "dependencies": {
+        "mimic-response": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/decompress-response/node_modules/mimic-response": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
+      "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/deep-eql": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz",
+      "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==",
+      "dev": true,
+      "dependencies": {
+        "type-detect": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true
+    },
+    "node_modules/deepmerge": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
+      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/default-gateway": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
+      "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
+      "dev": true,
+      "dependencies": {
+        "execa": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/defer-to-connect": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
+      "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/define-lazy-prop": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
+      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/define-properties": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+      "dev": true,
+      "dependencies": {
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/del": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
+      "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/glob": "^7.1.1",
+        "globby": "^6.1.0",
+        "is-path-cwd": "^2.0.0",
+        "is-path-in-cwd": "^2.0.0",
+        "p-map": "^2.0.0",
+        "pify": "^4.0.1",
+        "rimraf": "^2.6.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/del/node_modules/array-union": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+      "integrity": "sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==",
+      "dev": true,
+      "dependencies": {
+        "array-uniq": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/del/node_modules/globby": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+      "integrity": "sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==",
+      "dev": true,
+      "dependencies": {
+        "array-union": "^1.0.1",
+        "glob": "^7.0.3",
+        "object-assign": "^4.0.1",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/del/node_modules/globby/node_modules/pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/des.js": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
+      "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "node_modules/destroy": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
+    },
+    "node_modules/detect-node": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
+      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
+      "dev": true
+    },
+    "node_modules/diff": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
+    "node_modules/diffie-hellman": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "miller-rabin": "^4.0.0",
+        "randombytes": "^2.0.0"
+      }
+    },
+    "node_modules/diffie-hellman/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
+    "node_modules/dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+      "dev": true,
+      "dependencies": {
+        "path-type": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/dns-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
+      "integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==",
+      "dev": true
+    },
+    "node_modules/dns-packet": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.4.0.tgz",
+      "integrity": "sha512-EgqGeaBB8hLiHLZtp/IbaDQTL8pZ0+IvwzSHA6d7VyMDM+B9hgddEMa9xjK5oYnw0ci0JQ6g2XCD7/f6cafU6g==",
+      "dev": true,
+      "dependencies": {
+        "@leichtgewicht/ip-codec": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/doiuse": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/doiuse/-/doiuse-4.4.1.tgz",
+      "integrity": "sha512-TUpr1/YNg20IB09tZmwGCTsTQoxj8jUld/hUZprZMj8vj0VpAJySXEWCr8WMvqvgzk0/kG/FxeSMGKode4UjPg==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^4.16.1",
+        "caniuse-lite": "^1.0.30001179",
+        "css-rule-stream": "^1.1.0",
+        "duplexer2": "0.0.2",
+        "ldjson-stream": "^1.2.1",
+        "multimatch": "^5.0.0",
+        "postcss": "^8.2.4",
+        "source-map": "^0.7.3",
+        "through2": "^4.0.2",
+        "yargs": "^16.2.0"
+      },
+      "bin": {
+        "doiuse": "cli.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/doiuse/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/doiuse/node_modules/cliui": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
+      }
+    },
+    "node_modules/doiuse/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/doiuse/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/doiuse/node_modules/source-map": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
+      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/doiuse/node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/doiuse/node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/doiuse/node_modules/yargs": {
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.0",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/doiuse/node_modules/yargs-parser": {
+      "version": "20.2.9",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/dom-converter": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
+      "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
+      "dev": true,
+      "dependencies": {
+        "utila": "~0.4"
+      }
+    },
+    "node_modules/dom-serializer": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
+      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.2.0",
+        "entities": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+      }
+    },
+    "node_modules/dom-serializer/node_modules/entities": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/domain-browser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
+      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4",
+        "npm": ">=1.2"
+      }
+    },
+    "node_modules/domelementtype": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ]
+    },
+    "node_modules/domexception": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
+      "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
+      "dev": true,
+      "dependencies": {
+        "webidl-conversions": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/domhandler": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
+      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.2.0"
+      },
+      "engines": {
+        "node": ">= 4"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
+      }
+    },
+    "node_modules/domutils": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+      "dev": true,
+      "dependencies": {
+        "dom-serializer": "^1.0.1",
+        "domelementtype": "^2.2.0",
+        "domhandler": "^4.2.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domutils?sponsor=1"
+      }
+    },
+    "node_modules/dot-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
+      "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
+      "dev": true,
+      "dependencies": {
+        "no-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/dropzone": {
+      "version": "5.9.3",
+      "resolved": "https://registry.npmjs.org/dropzone/-/dropzone-5.9.3.tgz",
+      "integrity": "sha512-Azk8kD/2/nJIuVPK+zQ9sjKMRIpRvNyqn9XwbBHNq+iNuSccbJS6hwm1Woy0pMST0erSo0u4j+KJaodndDk4vA=="
+    },
+    "node_modules/duplexer2": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+      "integrity": "sha512-+AWBwjGadtksxjOQSFDhPNQbed7icNXApT4+2BNpsXzcCBiInq2H9XW0O8sfHFaPmnQRs7cg/P0fAr2IWQSW0g==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "~1.1.9"
+      }
+    },
+    "node_modules/duplexer2/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+      "dev": true
+    },
+    "node_modules/duplexer2/node_modules/readable-stream": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+      "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/duplexer2/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+      "dev": true
+    },
+    "node_modules/ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
+      "dev": true
+    },
+    "node_modules/electron-to-chromium": {
+      "version": "1.4.284",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz",
+      "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA=="
+    },
+    "node_modules/elliptic": {
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "brorand": "^1.1.0",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.1",
+        "inherits": "^2.0.4",
+        "minimalistic-assert": "^1.0.1",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "node_modules/elliptic/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/emojis-list": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "dependencies": {
+        "once": "^1.4.0"
+      }
+    },
+    "node_modules/enhanced-resolve": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz",
+      "integrity": "sha512-kxpoMgrdtkXZ5h0SeraBS1iRntpTpQ3R8ussdb38+UAFnMGX5DDyJXePm+OCHOcoXvHDw7mc2erbJBpDnl7TPw==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "memory-fs": "^0.2.0",
+        "tapable": "^0.1.8"
+      },
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/enhanced-resolve/node_modules/tapable": {
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",
+      "integrity": "sha512-jX8Et4hHg57mug1/079yitEKWGB3LCwoxByLsNim89LABq8NqgiX+6iYVOsq0vX8uJHkU+DZ5fnq95f800bEsQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/entities": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz",
+      "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/envinfo": {
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz",
+      "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==",
+      "dev": true,
+      "bin": {
+        "envinfo": "dist/cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/eonasdan-bootstrap-datetimepicker": {
+      "version": "4.17.49",
+      "resolved": "https://registry.npmjs.org/eonasdan-bootstrap-datetimepicker/-/eonasdan-bootstrap-datetimepicker-4.17.49.tgz",
+      "integrity": "sha512-7KZeDpkj+A6AtPR3XjX8gAnRPUkPSfW0OmMANG1dkUOPMtLSzbyoCjDIdEcfRtQPU5X0D9Gob7wWKn0h4QWy7A==",
+      "dependencies": {
+        "bootstrap": "^3.3",
+        "jquery": "^3.5.1",
+        "moment": "^2.10",
+        "moment-timezone": "^0.4.0"
+      },
+      "peerDependencies": {
+        "bootstrap": "^3.3",
+        "jquery": "^1.8.3 || ^2.0 || ^3.0",
+        "moment": "^2.10",
+        "moment-timezone": "^0.4.0 || ^0.5.0"
+      }
+    },
+    "node_modules/eonasdan-bootstrap-datetimepicker/node_modules/bootstrap": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.4.1.tgz",
+      "integrity": "sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "node_modules/es-abstract": {
+      "version": "1.20.5",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.5.tgz",
+      "integrity": "sha512-7h8MM2EQhsCA7pU/Nv78qOXFpD8Rhqd12gYiSJVkrH9+e8VuA8JlPJK/hQjjlLv6pJvx/z1iRFKzYb0XT/RuAQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "function.prototype.name": "^1.1.5",
+        "get-intrinsic": "^1.1.3",
+        "get-symbol-description": "^1.0.0",
+        "gopd": "^1.0.1",
+        "has": "^1.0.3",
+        "has-property-descriptors": "^1.0.0",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.3",
+        "is-callable": "^1.2.7",
+        "is-negative-zero": "^2.0.2",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.2",
+        "is-string": "^1.0.7",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.12.2",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.4",
+        "regexp.prototype.flags": "^1.4.3",
+        "safe-regex-test": "^1.0.0",
+        "string.prototype.trimend": "^1.0.6",
+        "string.prototype.trimstart": "^1.0.6",
+        "unbox-primitive": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es-array-method-boxes-properly": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz",
+      "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==",
+      "dev": true
+    },
+    "node_modules/es-module-lexer": {
+      "version": "0.9.3",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
+      "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ=="
+    },
+    "node_modules/es-shim-unscopables": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
+      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+      "dev": true,
+      "dependencies": {
+        "has": "^1.0.3"
+      }
+    },
+    "node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/esbuild": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.15.18.tgz",
+      "integrity": "sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q==",
+      "dev": true,
+      "hasInstallScript": true,
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "optionalDependencies": {
+        "@esbuild/android-arm": "0.15.18",
+        "@esbuild/linux-loong64": "0.15.18",
+        "esbuild-android-64": "0.15.18",
+        "esbuild-android-arm64": "0.15.18",
+        "esbuild-darwin-64": "0.15.18",
+        "esbuild-darwin-arm64": "0.15.18",
+        "esbuild-freebsd-64": "0.15.18",
+        "esbuild-freebsd-arm64": "0.15.18",
+        "esbuild-linux-32": "0.15.18",
+        "esbuild-linux-64": "0.15.18",
+        "esbuild-linux-arm": "0.15.18",
+        "esbuild-linux-arm64": "0.15.18",
+        "esbuild-linux-mips64le": "0.15.18",
+        "esbuild-linux-ppc64le": "0.15.18",
+        "esbuild-linux-riscv64": "0.15.18",
+        "esbuild-linux-s390x": "0.15.18",
+        "esbuild-netbsd-64": "0.15.18",
+        "esbuild-openbsd-64": "0.15.18",
+        "esbuild-sunos-64": "0.15.18",
+        "esbuild-windows-32": "0.15.18",
+        "esbuild-windows-64": "0.15.18",
+        "esbuild-windows-arm64": "0.15.18"
+      }
+    },
+    "node_modules/esbuild-android-64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.15.18.tgz",
+      "integrity": "sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-android-arm64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.15.18.tgz",
+      "integrity": "sha512-G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-darwin-64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.15.18.tgz",
+      "integrity": "sha512-2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-darwin-arm64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.18.tgz",
+      "integrity": "sha512-tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-freebsd-64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.18.tgz",
+      "integrity": "sha512-TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-freebsd-arm64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.18.tgz",
+      "integrity": "sha512-R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-linux-32": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.15.18.tgz",
+      "integrity": "sha512-lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-linux-64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.18.tgz",
+      "integrity": "sha512-hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-linux-arm": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.15.18.tgz",
+      "integrity": "sha512-UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-linux-arm64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.18.tgz",
+      "integrity": "sha512-54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-linux-mips64le": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.18.tgz",
+      "integrity": "sha512-Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-linux-ppc64le": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.18.tgz",
+      "integrity": "sha512-b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-linux-riscv64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.18.tgz",
+      "integrity": "sha512-ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-linux-s390x": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.18.tgz",
+      "integrity": "sha512-VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-loader": {
+      "version": "2.20.0",
+      "resolved": "https://registry.npmjs.org/esbuild-loader/-/esbuild-loader-2.20.0.tgz",
+      "integrity": "sha512-dr+j8O4w5RvqZ7I4PPB4EIyVTd679EBQnMm+JBB7av+vu05Zpje2IpK5N3ld1VWa+WxrInIbNFAg093+E1aRsA==",
+      "dev": true,
+      "dependencies": {
+        "esbuild": "^0.15.6",
+        "joycon": "^3.0.1",
+        "json5": "^2.2.0",
+        "loader-utils": "^2.0.0",
+        "tapable": "^2.2.0",
+        "webpack-sources": "^2.2.0"
+      },
+      "funding": {
+        "url": "https://github.com/privatenumber/esbuild-loader?sponsor=1"
+      },
+      "peerDependencies": {
+        "webpack": "^4.40.0 || ^5.0.0"
+      }
+    },
+    "node_modules/esbuild-loader/node_modules/webpack-sources": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz",
+      "integrity": "sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==",
+      "dev": true,
+      "dependencies": {
+        "source-list-map": "^2.0.1",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/esbuild-netbsd-64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.18.tgz",
+      "integrity": "sha512-98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-openbsd-64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.18.tgz",
+      "integrity": "sha512-yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-sunos-64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.15.18.tgz",
+      "integrity": "sha512-On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-windows-32": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.15.18.tgz",
+      "integrity": "sha512-o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-windows-64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.18.tgz",
+      "integrity": "sha512-qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-windows-arm64": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.18.tgz",
+      "integrity": "sha512-q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
+      "dev": true
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/escodegen": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
+      "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
+      "dev": true,
+      "dependencies": {
+        "esprima": "^4.0.1",
+        "estraverse": "^5.2.0",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.6.1"
+      }
+    },
+    "node_modules/escodegen/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/escodegen/node_modules/levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/escodegen/node_modules/optionator": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+      "dev": true,
+      "dependencies": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.6",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "word-wrap": "~1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/escodegen/node_modules/prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/escodegen/node_modules/type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/eslint": {
+      "version": "8.30.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.30.0.tgz",
+      "integrity": "sha512-MGADB39QqYuzEGov+F/qb18r4i7DohCDOfatHaxI2iGlPuC65bwG2gxgO+7DkyL38dRFaRH7RaRAgU6JKL9rMQ==",
+      "dev": true,
+      "dependencies": {
+        "@eslint/eslintrc": "^1.4.0",
+        "@humanwhocodes/config-array": "^0.11.8",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@nodelib/fs.walk": "^1.2.8",
+        "ajv": "^6.10.0",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.1.1",
+        "eslint-utils": "^3.0.0",
+        "eslint-visitor-keys": "^3.3.0",
+        "espree": "^9.4.0",
+        "esquery": "^1.4.0",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "globals": "^13.19.0",
+        "grapheme-splitter": "^1.0.4",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "is-path-inside": "^3.0.3",
+        "js-sdsl": "^4.1.4",
+        "js-yaml": "^4.1.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.1",
+        "regexpp": "^3.2.0",
+        "strip-ansi": "^6.0.1",
+        "strip-json-comments": "^3.1.0",
+        "text-table": "^0.2.0"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-config-airbnb-base": {
+      "version": "15.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz",
+      "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==",
+      "dev": true,
+      "dependencies": {
+        "confusing-browser-globals": "^1.0.10",
+        "object.assign": "^4.1.2",
+        "object.entries": "^1.1.5",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^7.32.0 || ^8.2.0",
+        "eslint-plugin-import": "^2.25.2"
+      }
+    },
+    "node_modules/eslint-import-resolver-node": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
+      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.7",
+        "resolve": "^1.20.0"
+      }
+    },
+    "node_modules/eslint-import-resolver-node/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-import-resolver-webpack": {
+      "version": "0.12.2",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.12.2.tgz",
+      "integrity": "sha512-7Jnm4YAoNNkvqPaZkKdIHsKGmv8/uNnYC5QsXkiSodvX4XEEfH2AKOna98FK52fCDXm3q4HzuX+7pRMKkJ64EQ==",
+      "dev": true,
+      "dependencies": {
+        "array-find": "^1.0.0",
+        "debug": "^2.6.9",
+        "enhanced-resolve": "^0.9.1",
+        "find-root": "^1.1.0",
+        "has": "^1.0.3",
+        "interpret": "^1.2.0",
+        "lodash": "^4.17.15",
+        "node-libs-browser": "^1.0.0 || ^2.0.0",
+        "resolve": "^1.13.1",
+        "semver": "^5.7.1"
+      },
+      "peerDependencies": {
+        "eslint-plugin-import": ">=1.4.0",
+        "webpack": ">=1.11.0"
+      }
+    },
+    "node_modules/eslint-import-resolver-webpack/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/eslint-import-resolver-webpack/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/eslint-import-resolver-webpack/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/eslint-module-utils": {
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz",
+      "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.7"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependenciesMeta": {
+        "eslint": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-module-utils/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-plugin-html": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-html/-/eslint-plugin-html-6.2.0.tgz",
+      "integrity": "sha512-vi3NW0E8AJombTvt8beMwkL1R/fdRWl4QSNRNMhVQKWm36/X0KF0unGNAY4mqUF06mnwVWZcIcerrCnfn9025g==",
+      "dev": true,
+      "dependencies": {
+        "htmlparser2": "^7.1.2"
+      }
+    },
+    "node_modules/eslint-plugin-import": {
+      "version": "2.26.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
+      "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
+      "dev": true,
+      "dependencies": {
+        "array-includes": "^3.1.4",
+        "array.prototype.flat": "^1.2.5",
+        "debug": "^2.6.9",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.6",
+        "eslint-module-utils": "^2.7.3",
+        "has": "^1.0.3",
+        "is-core-module": "^2.8.1",
+        "is-glob": "^4.0.3",
+        "minimatch": "^3.1.2",
+        "object.values": "^1.1.5",
+        "resolve": "^1.22.0",
+        "tsconfig-paths": "^3.14.1"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/eslint-plugin-vue": {
+      "version": "9.8.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.8.0.tgz",
+      "integrity": "sha512-E/AXwcTzunyzM83C2QqDHxepMzvI2y6x+mmeYHbVDQlKFqmKYvRrhaVixEeeG27uI44p9oKDFiyCRw4XxgtfHA==",
+      "dev": true,
+      "dependencies": {
+        "eslint-utils": "^3.0.0",
+        "natural-compare": "^1.4.0",
+        "nth-check": "^2.0.1",
+        "postcss-selector-parser": "^6.0.9",
+        "semver": "^7.3.5",
+        "vue-eslint-parser": "^9.0.1",
+        "xml-name-validator": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.17.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^6.2.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-vue/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/eslint-plugin-vue/node_modules/semver": {
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/eslint-plugin-vue/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/eslint-utils": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "engines": {
+        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      },
+      "peerDependencies": {
+        "eslint": ">=5"
+      }
+    },
+    "node_modules/eslint-visitor-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/eslint/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/eslint/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/eslint/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/eslint/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/eslint/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/eslint-scope": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
+      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/eslint/node_modules/eslint-visitor-keys": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/eslint/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/eslint/node_modules/globals": {
+      "version": "13.19.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz",
+      "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/espree": {
+      "version": "9.4.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz",
+      "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^8.8.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/espree/node_modules/eslint-visitor-keys": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true,
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/esquery": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/esquery/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dependencies": {
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esrecurse/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estree-walker": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
+    },
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/eventemitter3": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
+      "dev": true
+    },
+    "node_modules/events": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+      "engines": {
+        "node": ">=0.8.x"
+      }
+    },
+    "node_modules/evp_bytestokey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "dev": true,
+      "dependencies": {
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/execa": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
+        "strip-final-newline": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/execa/node_modules/get-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/expose-loader": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/expose-loader/-/expose-loader-4.0.0.tgz",
+      "integrity": "sha512-kUEvHyf6MPR2ubZCL9aziP9Br5wxMvq1cghTpYhM6MW52NPq+7hXixw2EqQuI1SvGb1fDjc2ehJOg6645wR6ww==",
+      "dev": true,
+      "engines": {
+        "node": ">= 14.15.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/express": {
+      "version": "4.18.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
+      "dev": true,
+      "dependencies": {
+        "accepts": "~1.3.8",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.20.1",
+        "content-disposition": "0.5.4",
+        "content-type": "~1.0.4",
+        "cookie": "0.5.0",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "finalhandler": "1.2.0",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "merge-descriptors": "1.0.1",
+        "methods": "~1.1.2",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "~2.0.7",
+        "qs": "6.11.0",
+        "range-parser": "~1.2.1",
+        "safe-buffer": "5.2.1",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "type-is": "~1.6.18",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/express/node_modules/array-flatten": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
+      "dev": true
+    },
+    "node_modules/express/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/express/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+    },
+    "node_modules/fast-glob": {
+      "version": "3.2.12",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
+      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
+    "node_modules/fast-glob/node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
+    },
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "dev": true
+    },
+    "node_modules/fastest-levenshtein": {
+      "version": "1.0.16",
+      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
+      "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.9.1"
+      }
+    },
+    "node_modules/fastq": {
+      "version": "1.14.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.14.0.tgz",
+      "integrity": "sha512-eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg==",
+      "dev": true,
+      "dependencies": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "node_modules/faye-websocket": {
+      "version": "0.11.4",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
+      "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
+      "dev": true,
+      "dependencies": {
+        "websocket-driver": ">=0.5.1"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dev": true,
+      "dependencies": {
+        "flat-cache": "^3.0.4"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/file-loader": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-5.1.0.tgz",
+      "integrity": "sha512-u/VkLGskw3Ue59nyOwUwXI/6nuBCo7KBkniB/l7ICwr/7cPNGsL1WCXUp3GB0qgOOKU1TiP49bv4DZF/LJqprg==",
+      "dev": true,
+      "dependencies": {
+        "loader-utils": "^1.4.0",
+        "schema-utils": "^2.5.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/file-loader/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/file-loader/node_modules/loader-utils": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+      "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/file-loader/node_modules/schema-utils": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
+      "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.5",
+        "ajv": "^6.12.4",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 8.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/finalhandler": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+      "dev": true,
+      "dependencies": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "statuses": "2.0.1",
+        "unpipe": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/finalhandler/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/finalhandler/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/find-root": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
+      "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==",
+      "dev": true
+    },
+    "node_modules/find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/flat": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.1.tgz",
+      "integrity": "sha512-FmTtBsHskrU6FJ2VxCnsDb84wu9zhmO3cUX2kGFb5tuwhfXxGciiT0oRY+cck35QmG+NmGh5eLz6lLCpWTqwpA==",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "~2.0.3"
+      },
+      "bin": {
+        "flat": "cli.js"
+      }
+    },
+    "node_modules/flat-cache": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+      "dev": true,
+      "dependencies": {
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/flat-cache/node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/flatted": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
+      "dev": true
+    },
+    "node_modules/follow-redirects": {
+      "version": "1.15.2",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
+      "engines": {
+        "node": ">=4.0"
+      },
+      "peerDependenciesMeta": {
+        "debug": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin": {
+      "version": "7.2.14",
+      "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-7.2.14.tgz",
+      "integrity": "sha512-Tg2feh/n8k486KX0EbXVUfJj3j0xnnbKYTJw0fnIb2QdV0+lblOYZSal5ed9hARoWVwKeOC7sYE2EakSRLo5ZA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.16.7",
+        "chalk": "^4.1.2",
+        "chokidar": "^3.5.3",
+        "cosmiconfig": "^7.0.1",
+        "deepmerge": "^4.2.2",
+        "fs-extra": "^10.0.0",
+        "memfs": "^3.4.1",
+        "minimatch": "^3.0.4",
+        "node-abort-controller": "^3.0.1",
+        "schema-utils": "^3.1.1",
+        "semver": "^7.3.5",
+        "tapable": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=12.13.0",
+        "yarn": ">=1.0.0"
+      },
+      "peerDependencies": {
+        "typescript": ">3.6.0",
+        "vue-template-compiler": "*",
+        "webpack": "^5.11.0"
+      },
+      "peerDependenciesMeta": {
+        "vue-template-compiler": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/schema-utils": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/semver": {
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/form-data": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "dev": true,
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/forwarded": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/fos-routing": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/fos-routing/-/fos-routing-0.0.6.tgz",
+      "integrity": "sha512-+eeaFADJSbxdBI7l/hqZGZlvYmxFudOhiv+GHypQHvzbkr05pBYrm7AON80uuQp+3kBDiaRSh8Ln34Y1rHYzYw=="
+    },
+    "node_modules/fraction.js": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
+      "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "type": "patreon",
+        "url": "https://www.patreon.com/infusion"
+      }
+    },
+    "node_modules/fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/fs-extra": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/fs-monkey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz",
+      "integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==",
+      "dev": true
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "node_modules/function.prototype.name": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
+      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.0",
+        "functions-have-names": "^1.2.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true,
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/get-func-name": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
+      "integrity": "sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
+      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-npm-tarball-url": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/get-npm-tarball-url/-/get-npm-tarball-url-2.0.3.tgz",
+      "integrity": "sha512-R/PW6RqyaBQNWYaSyfrh54/qtcnOp22FHCCiRhSSZj0FP3KQWCsxxt0DzIdVTbwTqe9CtQfvl/FPD4UIPt4pqw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.17"
+      }
+    },
+    "node_modules/get-stream": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/get-symbol-description": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
+      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/glob": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
+      "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/glob-to-regexp": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="
+    },
+    "node_modules/global-modules": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
+      "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
+      "dev": true,
+      "dependencies": {
+        "global-prefix": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/global-prefix": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
+      "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
+      "dev": true,
+      "dependencies": {
+        "ini": "^1.3.5",
+        "kind-of": "^6.0.2",
+        "which": "^1.3.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/global-prefix/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+      "dev": true,
+      "dependencies": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/globjoin": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
+      "integrity": "sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==",
+      "dev": true
+    },
+    "node_modules/google-protobuf": {
+      "version": "3.21.2",
+      "resolved": "https://registry.npmjs.org/google-protobuf/-/google-protobuf-3.21.2.tgz",
+      "integrity": "sha512-3MSOYFO5U9mPGikIYCzK0SaThypfGgS6bHqrUGXG3DPHCrb+txNqeEcns1W0lkGfk0rCyNXm7xB9rMxnCiZOoA==",
+      "dev": true
+    },
+    "node_modules/gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/got": {
+      "version": "11.8.6",
+      "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz",
+      "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==",
+      "dependencies": {
+        "@sindresorhus/is": "^4.0.0",
+        "@szmarczak/http-timer": "^4.0.5",
+        "@types/cacheable-request": "^6.0.1",
+        "@types/responselike": "^1.0.0",
+        "cacheable-lookup": "^5.0.3",
+        "cacheable-request": "^7.0.2",
+        "decompress-response": "^6.0.0",
+        "http2-wrapper": "^1.0.0-beta.5.2",
+        "lowercase-keys": "^2.0.0",
+        "p-cancelable": "^2.0.0",
+        "responselike": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10.19.0"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/got?sponsor=1"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.10",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
+      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
+    },
+    "node_modules/grapheme-splitter": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
+      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
+      "dev": true
+    },
+    "node_modules/growl": {
+      "version": "1.10.5",
+      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
+      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.x"
+      }
+    },
+    "node_modules/handle-thing": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
+      "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
+      "dev": true
+    },
+    "node_modules/hard-rejection": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
+      "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-tostringtag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/hash-base": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
+      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/hash-base/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/hash-sum": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz",
+      "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==",
+      "dev": true
+    },
+    "node_modules/hash.js": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
+      }
+    },
+    "node_modules/he": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+      "dev": true,
+      "bin": {
+        "he": "bin/he"
+      }
+    },
+    "node_modules/hmac-drbg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==",
+      "dev": true,
+      "dependencies": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "node_modules/hosted-git-info": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
+      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/hosted-git-info/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/hosted-git-info/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/hot-accept-webpack-plugin": {
+      "version": "2.0.0-beta.7",
+      "resolved": "https://registry.npmjs.org/hot-accept-webpack-plugin/-/hot-accept-webpack-plugin-2.0.0-beta.7.tgz",
+      "integrity": "sha512-3uRVxSf558Mb05zkQuqlEtroe6M50qb+k36+2xYOrxq/uQwpk0joGzzGvm62rW/SOyQq0p9pxS2+7kUiVJrcLw==",
+      "dev": true,
+      "dependencies": {
+        "modify-source-webpack-plugin": "2.0.0-beta.7"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/hpack.js": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
+      "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "obuf": "^1.0.0",
+        "readable-stream": "^2.0.1",
+        "wbuf": "^1.1.0"
+      }
+    },
+    "node_modules/html-encoding-sniffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
+      "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
+      "dev": true,
+      "dependencies": {
+        "whatwg-encoding": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/html-entities": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz",
+      "integrity": "sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==",
+      "dev": true
+    },
+    "node_modules/html-minifier-terser": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
+      "integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==",
+      "dev": true,
+      "dependencies": {
+        "camel-case": "^4.1.2",
+        "clean-css": "^5.2.2",
+        "commander": "^8.3.0",
+        "he": "^1.2.0",
+        "param-case": "^3.0.4",
+        "relateurl": "^0.2.7",
+        "terser": "^5.10.0"
+      },
+      "bin": {
+        "html-minifier-terser": "cli.js"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/html-tags": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.2.0.tgz",
+      "integrity": "sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/html-webpack-plugin": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz",
+      "integrity": "sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw==",
+      "dev": true,
+      "dependencies": {
+        "@types/html-minifier-terser": "^6.0.0",
+        "html-minifier-terser": "^6.0.2",
+        "lodash": "^4.17.21",
+        "pretty-error": "^4.0.0",
+        "tapable": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/html-webpack-plugin"
+      },
+      "peerDependencies": {
+        "webpack": "^5.20.0"
+      }
+    },
+    "node_modules/htmlparser2": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz",
+      "integrity": "sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==",
+      "dev": true,
+      "funding": [
+        "https://github.com/fb55/htmlparser2?sponsor=1",
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ],
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.2.2",
+        "domutils": "^2.8.0",
+        "entities": "^3.0.1"
+      }
+    },
+    "node_modules/http-cache-semantics": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
+      "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="
+    },
+    "node_modules/http-deceiver": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
+      "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==",
+      "dev": true
+    },
+    "node_modules/http-errors": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+      "dev": true,
+      "dependencies": {
+        "depd": "2.0.0",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/http-parser-js": {
+      "version": "0.5.8",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
+      "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==",
+      "dev": true
+    },
+    "node_modules/http-proxy": {
+      "version": "1.18.1",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
+      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
+      "dev": true,
+      "dependencies": {
+        "eventemitter3": "^4.0.0",
+        "follow-redirects": "^1.0.0",
+        "requires-port": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/http-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
+      "dev": true,
+      "dependencies": {
+        "@tootallnate/once": "2",
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/http-proxy-middleware": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
+      "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
+      "dev": true,
+      "dependencies": {
+        "@types/http-proxy": "^1.17.8",
+        "http-proxy": "^1.18.1",
+        "is-glob": "^4.0.1",
+        "is-plain-obj": "^3.0.0",
+        "micromatch": "^4.0.2"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "@types/express": "^4.17.13"
+      },
+      "peerDependenciesMeta": {
+        "@types/express": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/http-proxy-middleware/node_modules/is-plain-obj": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
+      "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/http2-wrapper": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz",
+      "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==",
+      "dependencies": {
+        "quick-lru": "^5.1.1",
+        "resolve-alpn": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=10.19.0"
+      }
+    },
+    "node_modules/http2-wrapper/node_modules/quick-lru": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
+      "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/https-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+      "integrity": "sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==",
+      "dev": true
+    },
+    "node_modules/https-proxy-agent": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/human-signals": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.17.0"
+      }
+    },
+    "node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dev": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/icss-utils": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
+      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
+      "dev": true,
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/ignore": {
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
+      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/immutable": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.1.0.tgz",
+      "integrity": "sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==",
+      "dev": true
+    },
+    "node_modules/import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "dev": true,
+      "dependencies": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/import-lazy": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
+      "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/import-local": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
+      "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
+      "dev": true,
+      "dependencies": {
+        "pkg-dir": "^4.2.0",
+        "resolve-cwd": "^3.0.0"
+      },
+      "bin": {
+        "import-local-fixture": "fixtures/cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/imports-loader": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/imports-loader/-/imports-loader-4.0.1.tgz",
+      "integrity": "sha512-ZiY+1xH5fqAJ1Qu1CFv+zw54rvPCC92DdYRDe0IIUboOhbJPLfOPbF/paA2iipelvMwjQUKWydcFOJ7f1+ZFcA==",
+      "dev": true,
+      "dependencies": {
+        "source-map": "^0.6.1",
+        "strip-comments": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 14.15.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/indent-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "node_modules/ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+      "dev": true
+    },
+    "node_modules/internal-slot": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz",
+      "integrity": "sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.3",
+        "has": "^1.0.3",
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/interpret": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
+      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/ipaddr.js": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz",
+      "integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "dev": true
+    },
+    "node_modules/is-bigint": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "dev": true,
+      "dependencies": {
+        "has-bigints": "^1.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-boolean-object": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-buffer": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
+      "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/is-callable": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-core-module": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
+      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
+      "dev": true,
+      "dependencies": {
+        "has": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-date-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-docker": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "dev": true,
+      "bin": {
+        "is-docker": "cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-negative-zero": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-number-object": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-path-cwd": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
+      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-path-in-cwd": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
+      "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
+      "dev": true,
+      "dependencies": {
+        "is-path-inside": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-path-in-cwd/node_modules/is-path-inside": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
+      "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
+      "dev": true,
+      "dependencies": {
+        "path-is-inside": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-path-inside": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-plain-object": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-potential-custom-element-name": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
+      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
+      "dev": true
+    },
+    "node_modules/is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-shared-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-weakref": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-wsl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "dev": true,
+      "dependencies": {
+        "is-docker": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+      "dev": true
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
+    "node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/jest-worker": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
+      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/jest-worker/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-worker/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/jets": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/jets/-/jets-0.11.0.tgz",
+      "integrity": "sha512-WGRZAkICV8la9FirezCLFkN0vr/VQDn6l5C0TeTaip8hY3YVz4EJW3tb8FASHLBCnFechGsssYAxkzTmRKXcLg=="
+    },
+    "node_modules/joycon": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/joycon/-/joycon-3.1.1.tgz",
+      "integrity": "sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/jquery": {
+      "version": "3.6.3",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.3.tgz",
+      "integrity": "sha512-bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg=="
+    },
+    "node_modules/jquery-serializejson": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/jquery-serializejson/-/jquery-serializejson-3.2.1.tgz",
+      "integrity": "sha512-89UxVNC4ac9XC5tWPz3DjSTYFcT5z6JYsxGVw+qHhD61FzjbEzXJHjpdLnezWujjqtIECi/URQ6KdPmDE9imGA=="
+    },
+    "node_modules/jquery-ui-dist": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/jquery-ui-dist/-/jquery-ui-dist-1.13.2.tgz",
+      "integrity": "sha512-oVDRd1NLtTbBwpRKAYdIRgpWVDzeBhfy7Gu0RmY6JEaZtmBq6kDn1pm5SgDiAotrnDS+RoTRXO6xvcNTxA9tOA==",
+      "dependencies": {
+        "jquery": ">=1.8.0 <4.0.0"
+      }
+    },
+    "node_modules/jquery.growl": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/jquery.growl/-/jquery.growl-1.3.5.tgz",
+      "integrity": "sha512-pK1RD8x3pXm1hEQ6KH0cu4QqzvI7R0EsUd5oneT5pavZ0cHwx/TV4qIdKeVfCWM0DVPyzI2GfXD6FwdDbRx1kw=="
+    },
+    "node_modules/js-sdsl": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz",
+      "integrity": "sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==",
+      "dev": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/js-sdsl"
+      }
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/jsdom": {
+      "version": "19.0.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-19.0.0.tgz",
+      "integrity": "sha512-RYAyjCbxy/vri/CfnjUWJQQtZ3LKlLnDqj+9XLNnJPgEGeirZs3hllKR20re8LUZ6o1b1X4Jat+Qd26zmP41+A==",
+      "dev": true,
+      "dependencies": {
+        "abab": "^2.0.5",
+        "acorn": "^8.5.0",
+        "acorn-globals": "^6.0.0",
+        "cssom": "^0.5.0",
+        "cssstyle": "^2.3.0",
+        "data-urls": "^3.0.1",
+        "decimal.js": "^10.3.1",
+        "domexception": "^4.0.0",
+        "escodegen": "^2.0.0",
+        "form-data": "^4.0.0",
+        "html-encoding-sniffer": "^3.0.0",
+        "http-proxy-agent": "^5.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "is-potential-custom-element-name": "^1.0.1",
+        "nwsapi": "^2.2.0",
+        "parse5": "6.0.1",
+        "saxes": "^5.0.1",
+        "symbol-tree": "^3.2.4",
+        "tough-cookie": "^4.0.0",
+        "w3c-hr-time": "^1.0.2",
+        "w3c-xmlserializer": "^3.0.0",
+        "webidl-conversions": "^7.0.0",
+        "whatwg-encoding": "^2.0.0",
+        "whatwg-mimetype": "^3.0.0",
+        "whatwg-url": "^10.0.0",
+        "ws": "^8.2.3",
+        "xml-name-validator": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "peerDependencies": {
+        "canvas": "^2.5.0"
+      },
+      "peerDependenciesMeta": {
+        "canvas": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "dev": true,
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/json-buffer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="
+    },
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+    },
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "dev": true
+    },
+    "node_modules/json5": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.2.tgz",
+      "integrity": "sha512-46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ==",
+      "dev": true,
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "dev": true,
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/jwerty": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/jwerty/-/jwerty-0.3.2.tgz",
+      "integrity": "sha512-cMFyML8AJ5Q8oh6MYx0/6W99B4XH0y9G5IANjTF+gqv7iLSlkjmWBhpkq3XYKgFiDrsmrm2NGs1lK7SduX3DyA=="
+    },
+    "node_modules/keyv": {
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.2.tgz",
+      "integrity": "sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==",
+      "dependencies": {
+        "json-buffer": "3.0.1"
+      }
+    },
+    "node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/klona": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz",
+      "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/known-css-properties": {
+      "version": "0.26.0",
+      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.26.0.tgz",
+      "integrity": "sha512-5FZRzrZzNTBruuurWpvZnvP9pum+fe0HcK8z/ooo+U+Hmp4vtbyp1/QDsqmufirXy4egGzbaH/y2uCZf+6W5Kg==",
+      "dev": true
+    },
+    "node_modules/ldjson-stream": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ldjson-stream/-/ldjson-stream-1.2.1.tgz",
+      "integrity": "sha512-xw/nNEXafuPSLu8NjjG3+atVVw+8U1APZAQylmwQn19Hgw6rC7QjHvP6MupnHWCrzSm9m0xs5QWkCLuRvBPjgQ==",
+      "dev": true,
+      "dependencies": {
+        "split2": "^0.2.1",
+        "through2": "^0.6.1"
+      }
+    },
+    "node_modules/ldjson-stream/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+      "dev": true
+    },
+    "node_modules/ldjson-stream/node_modules/readable-stream": {
+      "version": "1.0.34",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+      "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/ldjson-stream/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+      "dev": true
+    },
+    "node_modules/ldjson-stream/node_modules/through2": {
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+      "integrity": "sha512-RkK/CCESdTKQZHdmKICijdKKsCRVHs5KsLZ6pACAmF/1GPUQhonHSXWNERctxEp7RmvjdNbZTL5z9V7nSCXKcg==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": ">=1.0.33-1 <1.1.0-0",
+        "xtend": ">=4.0.0 <4.1.0-0"
+      }
+    },
+    "node_modules/levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+      "dev": true
+    },
+    "node_modules/loader-runner": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
+      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
+      "engines": {
+        "node": ">=6.11.5"
+      }
+    },
+    "node_modules/loader-utils": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=8.9.0"
+      }
+    },
+    "node_modules/locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+    },
+    "node_modules/lodash.escaperegexp": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz",
+      "integrity": "sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw=="
+    },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
+    },
+    "node_modules/lodash.truncate": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
+      "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==",
+      "dev": true
+    },
+    "node_modules/log-symbols": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
+      "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/loupe": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.6.tgz",
+      "integrity": "sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==",
+      "dev": true,
+      "dependencies": {
+        "get-func-name": "^2.0.0"
+      }
+    },
+    "node_modules/lower-case": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
+      "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/lowercase-keys": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
+      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "node_modules/magic-string": {
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
+      "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
+      "dependencies": {
+        "sourcemap-codec": "^1.4.8"
+      }
+    },
+    "node_modules/magnific-popup": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/magnific-popup/-/magnific-popup-1.1.0.tgz",
+      "integrity": "sha512-ghSa/1TKsOUL6ZlHfcfFCoB9Wms2nqaDdBEPh6QX9jFYQyMkUu7ciU1mrxedWWq4NM2m1C/llhHKLt6GKRYOzg==",
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/make-error": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+      "dev": true
+    },
+    "node_modules/map-obj": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
+      "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/material-design-icons-iconfont": {
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/material-design-icons-iconfont/-/material-design-icons-iconfont-6.7.0.tgz",
+      "integrity": "sha512-lSj71DgVv20kO0kGbs42icDzbRot61gEDBLQACzkUuznRQBUYmbxzEkGU6dNBb5fRWHMaScYlAXX96HQ4/cJWA=="
+    },
+    "node_modules/mathml-tag-names": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz",
+      "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/md5.js": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+      "dev": true,
+      "dependencies": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/mdn-data": {
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
+      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
+      "dev": true
+    },
+    "node_modules/media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/memfs": {
+      "version": "3.4.12",
+      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.12.tgz",
+      "integrity": "sha512-BcjuQn6vfqP+k100e0E9m61Hyqa//Brp+I3f0OBmN0ATHlFA8vx3Lt8z57R3u2bPqe3WGDBC+nF72fTH7isyEw==",
+      "dev": true,
+      "dependencies": {
+        "fs-monkey": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/memory-fs": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz",
+      "integrity": "sha512-+y4mDxU4rvXXu5UDSGCGNiesFmwCHuefGMoPCO1WYucNYj7DsLqrFaa2fXVI0H+NNiPTwwzKwspn9yTZqUGqng==",
+      "dev": true
+    },
+    "node_modules/meow": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
+      "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/minimist": "^1.2.0",
+        "camelcase-keys": "^6.2.2",
+        "decamelize": "^1.2.0",
+        "decamelize-keys": "^1.1.0",
+        "hard-rejection": "^2.1.0",
+        "minimist-options": "4.1.0",
+        "normalize-package-data": "^3.0.0",
+        "read-pkg-up": "^7.0.1",
+        "redent": "^3.0.0",
+        "trim-newlines": "^3.0.0",
+        "type-fest": "^0.18.0",
+        "yargs-parser": "^20.2.3"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/meow/node_modules/yargs-parser": {
+      "version": "20.2.9",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/merge-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
+      "dev": true
+    },
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
+    },
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "dev": true,
+      "dependencies": {
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/miller-rabin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
+      },
+      "bin": {
+        "miller-rabin": "bin/miller-rabin"
+      }
+    },
+    "node_modules/miller-rabin/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
+    "node_modules/mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "dev": true,
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mimic-response": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
+      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/min-indent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
+      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/mini-css-extract-plugin": {
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.2.tgz",
+      "integrity": "sha512-EdlUizq13o0Pd+uCp+WO/JpkLvHRVGt97RqfeGhXqAcorYo1ypJSpkV+WDT0vY/kmh/p7wRdJNJtuyK540PXDw==",
+      "dev": true,
+      "dependencies": {
+        "schema-utils": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+      "dev": true
+    },
+    "node_modules/minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==",
+      "dev": true
+    },
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
+      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/minimist-options": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
+      "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
+      "dev": true,
+      "dependencies": {
+        "arrify": "^1.0.1",
+        "is-plain-obj": "^1.1.0",
+        "kind-of": "^6.0.3"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/mkdirp": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz",
+      "integrity": "sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==",
+      "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "node_modules/mocha": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-6.2.3.tgz",
+      "integrity": "sha512-0R/3FvjIGH3eEuG17ccFPk117XL2rWxatr81a57D+r/x2uTYZRbdZ4oVidEUMh2W2TJDa7MdAb12Lm2/qrKajg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "3.2.3",
+        "browser-stdout": "1.3.1",
+        "debug": "3.2.6",
+        "diff": "3.5.0",
+        "escape-string-regexp": "1.0.5",
+        "find-up": "3.0.0",
+        "glob": "7.1.3",
+        "growl": "1.10.5",
+        "he": "1.2.0",
+        "js-yaml": "3.13.1",
+        "log-symbols": "2.2.0",
+        "minimatch": "3.0.4",
+        "mkdirp": "0.5.4",
+        "ms": "2.1.1",
+        "node-environment-flags": "1.0.5",
+        "object.assign": "4.1.0",
+        "strip-json-comments": "2.0.1",
+        "supports-color": "6.0.0",
+        "which": "1.3.1",
+        "wide-align": "1.1.3",
+        "yargs": "13.3.2",
+        "yargs-parser": "13.1.2",
+        "yargs-unparser": "1.6.0"
+      },
+      "bin": {
+        "_mocha": "bin/_mocha",
+        "mocha": "bin/mocha"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/mocha/node_modules/argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/mocha/node_modules/debug": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+      "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/mocha/node_modules/find-up": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mocha/node_modules/js-yaml": {
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/mocha/node_modules/locate-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^3.0.0",
+        "path-exists": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mocha/node_modules/minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/mocha/node_modules/ms": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+      "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+      "dev": true
+    },
+    "node_modules/mocha/node_modules/object.assign": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
+      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.2",
+        "function-bind": "^1.1.1",
+        "has-symbols": "^1.0.0",
+        "object-keys": "^1.0.11"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/mocha/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/mocha/node_modules/p-locate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mocha/node_modules/path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/mocha/node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+      "dev": true
+    },
+    "node_modules/mocha/node_modules/strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mocha/node_modules/supports-color": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz",
+      "integrity": "sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mocha/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/modify-source-webpack-plugin": {
+      "version": "2.0.0-beta.7",
+      "resolved": "https://registry.npmjs.org/modify-source-webpack-plugin/-/modify-source-webpack-plugin-2.0.0-beta.7.tgz",
+      "integrity": "sha512-P7CKlGAF+HlinKS5xsIP5wuYwqcpV5eQMpwJYy5yocLAdv2RN5A24orv0Q1DXkbcw5Pd2pCUB4Fo1x9EqfiNeg==",
+      "dev": true,
+      "dependencies": {
+        "loader-utils": "^2.0.0",
+        "schema-utils": "^3.0.0"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/modify-source-webpack-plugin/node_modules/schema-utils": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/moment": {
+      "version": "2.29.4",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
+      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/moment-timezone": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.4.1.tgz",
+      "integrity": "sha512-5cNPVUwaVJDCe9JM8m/qz17f9SkaI8rpnRUyDJi2K5HAd6EwhuQ3n5nLclZkNC/qJnomKgQH2TIu70Gy2dxFKA==",
+      "dependencies": {
+        "moment": ">= 2.6.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/multicast-dns": {
+      "version": "7.2.5",
+      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
+      "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
+      "dev": true,
+      "dependencies": {
+        "dns-packet": "^5.2.2",
+        "thunky": "^1.0.2"
+      },
+      "bin": {
+        "multicast-dns": "cli.js"
+      }
+    },
+    "node_modules/multimatch": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-5.0.0.tgz",
+      "integrity": "sha512-ypMKuglUrZUD99Tk2bUQ+xNQj43lPEfAeX2o9cTteAmShXy2VHDJpuwu1o0xqoKCt9jLVAvwyFKdLTPXKAfJyA==",
+      "dev": true,
+      "dependencies": {
+        "@types/minimatch": "^3.0.3",
+        "array-differ": "^3.0.0",
+        "array-union": "^2.1.0",
+        "arrify": "^2.0.1",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/multimatch/node_modules/@types/minimatch": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
+      "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==",
+      "dev": true
+    },
+    "node_modules/multimatch/node_modules/arrify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
+      "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
+      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true
+    },
+    "node_modules/natural-compare-lite": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
+      "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
+      "dev": true
+    },
+    "node_modules/needle": {
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/needle/-/needle-2.9.1.tgz",
+      "integrity": "sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.6",
+        "iconv-lite": "^0.4.4",
+        "sax": "^1.2.4"
+      },
+      "bin": {
+        "needle": "bin/needle"
+      },
+      "engines": {
+        "node": ">= 4.4.x"
+      }
+    },
+    "node_modules/needle/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/negotiator": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/neo-async": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
+    },
+    "node_modules/no-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
+      "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
+      "dev": true,
+      "dependencies": {
+        "lower-case": "^2.0.2",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/node-abort-controller": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.0.1.tgz",
+      "integrity": "sha512-/ujIVxthRs+7q6hsdjHMaj8hRG9NuWmwrz+JdRwZ14jdFoKSkm+vDsCbF9PLpnSqjaWQJuTmVtcWHNLr+vrOFw==",
+      "dev": true
+    },
+    "node_modules/node-environment-flags": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.5.tgz",
+      "integrity": "sha512-VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ==",
+      "dev": true,
+      "dependencies": {
+        "object.getownpropertydescriptors": "^2.0.3",
+        "semver": "^5.7.0"
+      }
+    },
+    "node_modules/node-environment-flags/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/node-forge": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
+      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6.13.0"
+      }
+    },
+    "node_modules/node-libs-browser": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
+      "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
+      "dev": true,
+      "dependencies": {
+        "assert": "^1.1.1",
+        "browserify-zlib": "^0.2.0",
+        "buffer": "^4.3.0",
+        "console-browserify": "^1.1.0",
+        "constants-browserify": "^1.0.0",
+        "crypto-browserify": "^3.11.0",
+        "domain-browser": "^1.1.1",
+        "events": "^3.0.0",
+        "https-browserify": "^1.0.0",
+        "os-browserify": "^0.3.0",
+        "path-browserify": "0.0.1",
+        "process": "^0.11.10",
+        "punycode": "^1.2.4",
+        "querystring-es3": "^0.2.0",
+        "readable-stream": "^2.3.3",
+        "stream-browserify": "^2.0.1",
+        "stream-http": "^2.7.2",
+        "string_decoder": "^1.0.0",
+        "timers-browserify": "^2.0.4",
+        "tty-browserify": "0.0.0",
+        "url": "^0.11.0",
+        "util": "^0.11.0",
+        "vm-browserify": "^1.0.1"
+      }
+    },
+    "node_modules/node-libs-browser/node_modules/punycode": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+      "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
+      "dev": true
+    },
+    "node_modules/node-releases": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.8.tgz",
+      "integrity": "sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A=="
+    },
+    "node_modules/normalize-package-data": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
+      "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
+      "dev": true,
+      "dependencies": {
+        "hosted-git-info": "^4.0.1",
+        "is-core-module": "^2.5.0",
+        "semver": "^7.3.4",
+        "validate-npm-package-license": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/normalize-package-data/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/normalize-package-data/node_modules/semver": {
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/normalize-package-data/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/normalize-range": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+      "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/normalize-url": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
+      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/npm-run-path": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/nth-check": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
+      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
+      "dev": true,
+      "dependencies": {
+        "boolbase": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/nth-check?sponsor=1"
+      }
+    },
+    "node_modules/nwsapi": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.2.tgz",
+      "integrity": "sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==",
+      "dev": true
+    },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
+      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.assign": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
+      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "has-symbols": "^1.0.3",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz",
+      "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.getownpropertydescriptors": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.5.tgz",
+      "integrity": "sha512-yDNzckpM6ntyQiGTik1fKV1DcVDRS+w8bvpWNCBanvH5LfRX9O8WTHqQzG4RZwRAM4I0oU7TV11Lj5v0g20ibw==",
+      "dev": true,
+      "dependencies": {
+        "array.prototype.reduce": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.values": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
+      "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/obuf": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
+      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
+      "dev": true
+    },
+    "node_modules/on-finished": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+      "dev": true,
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/on-headers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
+      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dev": true,
+      "dependencies": {
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/open": {
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz",
+      "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==",
+      "dev": true,
+      "dependencies": {
+        "define-lazy-prop": "^2.0.0",
+        "is-docker": "^2.1.1",
+        "is-wsl": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/open-sans-fonts": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/open-sans-fonts/-/open-sans-fonts-1.6.2.tgz",
+      "integrity": "sha512-vsJ6/Mm0TdUKQJqxfkXJy+0K2X0QeRuTmxQq9YE1ycziw6CbDPolDsHhQ6+ImoV/7OTh8K8ZTGklY1Z5nUAwug==",
+      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info."
+    },
+    "node_modules/optionator": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "dev": true,
+      "dependencies": {
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/os-browserify": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+      "integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==",
+      "dev": true
+    },
+    "node_modules/p-cancelable": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
+      "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-map": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
+      "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/p-retry": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz",
+      "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/retry": "0.12.0",
+        "retry": "^0.13.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pako": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
+      "dev": true
+    },
+    "node_modules/param-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
+      "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
+      "dev": true,
+      "dependencies": {
+        "dot-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "dependencies": {
+        "callsites": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parse-asn1": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
+      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
+      "dev": true,
+      "dependencies": {
+        "asn1.js": "^5.2.0",
+        "browserify-aes": "^1.0.0",
+        "evp_bytestokey": "^1.0.0",
+        "pbkdf2": "^3.0.3",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/parse5": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+      "dev": true
+    },
+    "node_modules/parseurl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/pascal-case": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
+      "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
+      "dev": true,
+      "dependencies": {
+        "no-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/path": {
+      "version": "0.12.7",
+      "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz",
+      "integrity": "sha512-aXXC6s+1w7otVF9UletFkFcDsJeO7lSZBPUQhtb5O0xJe8LtYhj/GxldoL09bBj9+ZmE2hNoHqQSFMN5fikh4Q==",
+      "dev": true,
+      "dependencies": {
+        "process": "^0.11.1",
+        "util": "^0.10.3"
+      }
+    },
+    "node_modules/path-browserify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
+      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
+      "dev": true
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==",
+      "dev": true
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
+    },
+    "node_modules/path-to-regexp": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==",
+      "dev": true
+    },
+    "node_modules/path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
+      "dev": true
+    },
+    "node_modules/path/node_modules/util": {
+      "version": "0.10.4",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
+      "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "2.0.3"
+      }
+    },
+    "node_modules/pathval": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
+      "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/pbkdf2": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
+      "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
+      "dev": true,
+      "dependencies": {
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      },
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
+    "node_modules/perfect-scrollbar": {
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/perfect-scrollbar/-/perfect-scrollbar-1.5.5.tgz",
+      "integrity": "sha512-dzalfutyP3e/FOpdlhVryN4AJ5XDVauVWxybSkLZmakFE2sS3y3pc4JnSprw8tGmHvkaG5Edr5T7LBTZ+WWU2g=="
+    },
+    "node_modules/photoswipe": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/photoswipe/-/photoswipe-4.1.3.tgz",
+      "integrity": "sha512-89Z43IRUyw7ycTolo+AaiDn3W1EEIfox54hERmm9bI12IB9cvRfHSHez3XhAyU8XW2EAFrC+2sKMhh7SJwn0bA==",
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/picocolors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==",
+      "dev": true,
+      "dependencies": {
+        "pinkie": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/popper.js": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
+      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
+      "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/popperjs"
+      }
+    },
+    "node_modules/postcss": {
+      "version": "8.4.20",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.20.tgz",
+      "integrity": "sha512-6Q04AXR1212bXr5fh03u8aAwbLxAQNGQ/Q1LNa0VfOI06ZAlhPHtQvE4OIdpj4kLThXilalPnmDSOD65DcHt+g==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        }
+      ],
+      "dependencies": {
+        "nanoid": "^3.3.4",
+        "picocolors": "^1.0.0",
+        "source-map-js": "^1.0.2"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      }
+    },
+    "node_modules/postcss-attribute-case-insensitive": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.2.tgz",
+      "integrity": "sha512-XIidXV8fDr0kKt28vqki84fRK8VW8eTuIa4PChv2MqKuT6C9UjmSKzen6KaWhWEoYvwxFCa7n/tC1SZ3tyq4SQ==",
+      "dev": true,
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-clamp": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-clamp/-/postcss-clamp-4.1.0.tgz",
+      "integrity": "sha512-ry4b1Llo/9zz+PKC+030KUnPITTJAHeOwjfAyyB60eT0AorGLdzp52s31OsPRHRf8NchkgFoG2y6fCfn1IV1Ow==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=7.6.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.6"
+      }
+    },
+    "node_modules/postcss-color-functional-notation": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.4.tgz",
+      "integrity": "sha512-2yrTAUZUab9s6CpxkxC4rVgFEVaR6/2Pipvi6qcgvnYiVqZcbDHEoBDhrXzyb7Efh2CCfHQNtcqWcIruDTIUeg==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-color-hex-alpha": {
+      "version": "8.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.4.tgz",
+      "integrity": "sha512-nLo2DCRC9eE4w2JmuKgVA3fGL3d01kGq752pVALF68qpGLmx2Qrk91QTKkdUqqp45T1K1XV8IhQpcu1hoAQflQ==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-color-rebeccapurple": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.1.1.tgz",
+      "integrity": "sha512-pGxkuVEInwLHgkNxUc4sdg4g3py7zUeCQ9sMfwyHAT+Ezk8a4OaaVZ8lIY5+oNqA/BXXgLyXv0+5wHP68R79hg==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-custom-media": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-8.0.2.tgz",
+      "integrity": "sha512-7yi25vDAoHAkbhAzX9dHx2yc6ntS4jQvejrNcC+csQJAXjj15e7VcWfMgLqBNAbOvqi5uIa9huOVwdHbf+sKqg==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.3"
+      }
+    },
+    "node_modules/postcss-custom-properties": {
+      "version": "12.1.11",
+      "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.11.tgz",
+      "integrity": "sha512-0IDJYhgU8xDv1KY6+VgUwuQkVtmYzRwu+dMjnmdMafXYv86SWqfxkc7qdDvWS38vsjaEtv8e0vGOUQrAiMBLpQ==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-custom-selectors": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-6.0.3.tgz",
+      "integrity": "sha512-fgVkmyiWDwmD3JbpCmB45SvvlCD6z9CG6Ie6Iere22W5aHea6oWa7EM2bpnv2Fj3I94L3VbtvX9KqwSi5aFzSg==",
+      "dev": true,
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.4"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.3"
+      }
+    },
+    "node_modules/postcss-dir-pseudo-class": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.5.tgz",
+      "integrity": "sha512-eqn4m70P031PF7ZQIvSgy9RSJ5uI2171O/OO/zcRNYpJbvaeKFUlar1aJ7rmgiQtbm0FSPsRewjpdS0Oew7MPA==",
+      "dev": true,
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-double-position-gradients": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.2.tgz",
+      "integrity": "sha512-GX+FuE/uBR6eskOK+4vkXgT6pDkexLokPaz/AbJna9s5Kzp/yl488pKPjhy0obB475ovfT1Wv8ho7U/cHNaRgQ==",
+      "dev": true,
+      "dependencies": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-env-function": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-4.0.6.tgz",
+      "integrity": "sha512-kpA6FsLra+NqcFnL81TnsU+Z7orGtDTxcOhl6pwXeEq1yFPpRMkCDpHhrz8CFQDr/Wfm0jLiNQ1OsGGPjlqPwA==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-focus-visible": {
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-6.0.4.tgz",
+      "integrity": "sha512-QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw==",
+      "dev": true,
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.9"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-focus-within": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-5.0.4.tgz",
+      "integrity": "sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ==",
+      "dev": true,
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.9"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-font-variant": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz",
+      "integrity": "sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==",
+      "dev": true,
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-gap-properties": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.5.tgz",
+      "integrity": "sha512-IuE6gKSdoUNcvkGIqdtjtcMtZIFyXZhmFd5RUlg97iVEvp1BZKV5ngsAjCjrVy+14uhGBQl9tzmi1Qwq4kqVOg==",
+      "dev": true,
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-image-set-function": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-4.0.7.tgz",
+      "integrity": "sha512-9T2r9rsvYzm5ndsBE8WgtrMlIT7VbtTfE7b3BQnudUqnBcBo7L758oc+o+pdj/dUV0l5wjwSdjeOH2DZtfv8qw==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-initial": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-4.0.1.tgz",
+      "integrity": "sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==",
+      "dev": true,
+      "peerDependencies": {
+        "postcss": "^8.0.0"
+      }
+    },
+    "node_modules/postcss-lab-function": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-4.2.1.tgz",
+      "integrity": "sha512-xuXll4isR03CrQsmxyz92LJB2xX9n+pZJ5jE9JgcnmsCammLyKdlzrBin+25dy6wIjfhJpKBAN80gsTlCgRk2w==",
+      "dev": true,
+      "dependencies": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-loader": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.0.2.tgz",
+      "integrity": "sha512-fUJzV/QH7NXUAqV8dWJ9Lg4aTkDCezpTS5HgJ2DvqznexTbSTxgi/dTECvTZ15BwKTtk8G/bqI/QTu2HPd3ZCg==",
+      "dev": true,
+      "dependencies": {
+        "cosmiconfig": "^7.0.0",
+        "klona": "^2.0.5",
+        "semver": "^7.3.8"
+      },
+      "engines": {
+        "node": ">= 14.15.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "postcss": "^7.0.0 || ^8.0.1",
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/postcss-loader/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/postcss-loader/node_modules/semver": {
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/postcss-loader/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/postcss-logical": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-5.0.4.tgz",
+      "integrity": "sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==",
+      "dev": true,
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4"
+      }
+    },
+    "node_modules/postcss-media-minmax": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz",
+      "integrity": "sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-media-query-parser": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
+      "integrity": "sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==",
+      "dev": true
+    },
+    "node_modules/postcss-modules-extract-imports": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
+      "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
+      "dev": true,
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-modules-local-by-default": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz",
+      "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==",
+      "dev": true,
+      "dependencies": {
+        "icss-utils": "^5.0.0",
+        "postcss-selector-parser": "^6.0.2",
+        "postcss-value-parser": "^4.1.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-modules-scope": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
+      "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
+      "dev": true,
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.4"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-modules-values": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
+      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
+      "dev": true,
+      "dependencies": {
+        "icss-utils": "^5.0.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-nesting": {
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.2.0.tgz",
+      "integrity": "sha512-EwMkYchxiDiKUhlJGzWsD9b2zvq/r2SSubcRrgP+jujMXFzqvANLt16lJANC+5uZ6hjI7lpRmI6O8JIl+8l1KA==",
+      "dev": true,
+      "dependencies": {
+        "@csstools/selector-specificity": "^2.0.0",
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-opacity-percentage": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/postcss-opacity-percentage/-/postcss-opacity-percentage-1.1.3.tgz",
+      "integrity": "sha512-An6Ba4pHBiDtyVpSLymUUERMo2cU7s+Obz6BTrS+gxkbnSBNKSuD0AVUc+CpBMrpVPKKfoVz0WQCX+Tnst0i4A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "kofi",
+          "url": "https://ko-fi.com/mrcgrtz"
+        },
+        {
+          "type": "liberapay",
+          "url": "https://liberapay.com/mrcgrtz"
+        }
+      ],
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-overflow-shorthand": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.4.tgz",
+      "integrity": "sha512-otYl/ylHK8Y9bcBnPLo3foYFLL6a6Ak+3EQBPOTR7luMYCOsiVTUk1iLvNf6tVPNGXcoL9Hoz37kpfriRIFb4A==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-page-break": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-3.0.4.tgz",
+      "integrity": "sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==",
+      "dev": true,
+      "peerDependencies": {
+        "postcss": "^8"
+      }
+    },
+    "node_modules/postcss-place": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-place/-/postcss-place-7.0.5.tgz",
+      "integrity": "sha512-wR8igaZROA6Z4pv0d+bvVrvGY4GVHihBCBQieXFY3kuSuMyOmEnnfFzHl/tQuqHZkfkIVBEbDvYcFfHmpSet9g==",
+      "dev": true,
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-preset-env": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.8.3.tgz",
+      "integrity": "sha512-T1LgRm5uEVFSEF83vHZJV2z19lHg4yJuZ6gXZZkqVsqv63nlr6zabMH3l4Pc01FQCyfWVrh2GaUeCVy9Po+Aag==",
+      "dev": true,
+      "dependencies": {
+        "@csstools/postcss-cascade-layers": "^1.1.1",
+        "@csstools/postcss-color-function": "^1.1.1",
+        "@csstools/postcss-font-format-keywords": "^1.0.1",
+        "@csstools/postcss-hwb-function": "^1.0.2",
+        "@csstools/postcss-ic-unit": "^1.0.1",
+        "@csstools/postcss-is-pseudo-class": "^2.0.7",
+        "@csstools/postcss-nested-calc": "^1.0.0",
+        "@csstools/postcss-normalize-display-values": "^1.0.1",
+        "@csstools/postcss-oklab-function": "^1.1.1",
+        "@csstools/postcss-progressive-custom-properties": "^1.3.0",
+        "@csstools/postcss-stepped-value-functions": "^1.0.1",
+        "@csstools/postcss-text-decoration-shorthand": "^1.0.0",
+        "@csstools/postcss-trigonometric-functions": "^1.0.2",
+        "@csstools/postcss-unset-value": "^1.0.2",
+        "autoprefixer": "^10.4.13",
+        "browserslist": "^4.21.4",
+        "css-blank-pseudo": "^3.0.3",
+        "css-has-pseudo": "^3.0.4",
+        "css-prefers-color-scheme": "^6.0.3",
+        "cssdb": "^7.1.0",
+        "postcss-attribute-case-insensitive": "^5.0.2",
+        "postcss-clamp": "^4.1.0",
+        "postcss-color-functional-notation": "^4.2.4",
+        "postcss-color-hex-alpha": "^8.0.4",
+        "postcss-color-rebeccapurple": "^7.1.1",
+        "postcss-custom-media": "^8.0.2",
+        "postcss-custom-properties": "^12.1.10",
+        "postcss-custom-selectors": "^6.0.3",
+        "postcss-dir-pseudo-class": "^6.0.5",
+        "postcss-double-position-gradients": "^3.1.2",
+        "postcss-env-function": "^4.0.6",
+        "postcss-focus-visible": "^6.0.4",
+        "postcss-focus-within": "^5.0.4",
+        "postcss-font-variant": "^5.0.0",
+        "postcss-gap-properties": "^3.0.5",
+        "postcss-image-set-function": "^4.0.7",
+        "postcss-initial": "^4.0.1",
+        "postcss-lab-function": "^4.2.1",
+        "postcss-logical": "^5.0.4",
+        "postcss-media-minmax": "^5.0.0",
+        "postcss-nesting": "^10.2.0",
+        "postcss-opacity-percentage": "^1.1.2",
+        "postcss-overflow-shorthand": "^3.0.4",
+        "postcss-page-break": "^3.0.4",
+        "postcss-place": "^7.0.5",
+        "postcss-pseudo-class-any-link": "^7.1.6",
+        "postcss-replace-overflow-wrap": "^4.0.0",
+        "postcss-selector-not": "^6.0.1",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-pseudo-class-any-link": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.6.tgz",
+      "integrity": "sha512-9sCtZkO6f/5ML9WcTLcIyV1yz9D1rf0tWc+ulKcvV30s0iZKS/ONyETvoWsr6vnrmW+X+KmuK3gV/w5EWnT37w==",
+      "dev": true,
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-replace-overflow-wrap": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz",
+      "integrity": "sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==",
+      "dev": true,
+      "peerDependencies": {
+        "postcss": "^8.0.3"
+      }
+    },
+    "node_modules/postcss-resolve-nested-selector": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz",
+      "integrity": "sha512-HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw==",
+      "dev": true
+    },
+    "node_modules/postcss-safe-parser": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz",
+      "integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      },
+      "peerDependencies": {
+        "postcss": "^8.3.3"
+      }
+    },
+    "node_modules/postcss-scss": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.6.tgz",
+      "integrity": "sha512-rLDPhJY4z/i4nVFZ27j9GqLxj1pwxE80eAzUNRMXtcpipFYIeowerzBgG3yJhMtObGEXidtIgbUpQ3eLDsf5OQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss-scss"
+        }
+      ],
+      "engines": {
+        "node": ">=12.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.19"
+      }
+    },
+    "node_modules/postcss-selector-not": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-6.0.1.tgz",
+      "integrity": "sha512-1i9affjAe9xu/y9uqWH+tD4r6/hDaXJruk8xn2x1vzxC2U3J3LKO3zJW4CyxlNhA56pADJ/djpEwpH1RClI2rQ==",
+      "dev": true,
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "engines": {
+        "node": "^12 || ^14 || >=16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2"
+      }
+    },
+    "node_modules/postcss-selector-parser": {
+      "version": "6.0.11",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz",
+      "integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==",
+      "dev": true,
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-sorting": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-7.0.1.tgz",
+      "integrity": "sha512-iLBFYz6VRYyLJEJsBJ8M3TCqNcckVzz4wFounSc5Oez35ogE/X+aoC5fFu103Ot7NyvjU3/xqIXn93Gp3kJk4g==",
+      "dev": true,
+      "peerDependencies": {
+        "postcss": "^8.3.9"
+      }
+    },
+    "node_modules/postcss-value-parser": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+      "dev": true
+    },
+    "node_modules/prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/prestakit": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/prestakit/-/prestakit-1.2.6.tgz",
+      "integrity": "sha512-eE6sLXoFyrP1f28ZfU2cRE3ZynZQl9aCvxy8bUTcQH8cidg7PGrNw7w2dFvXmPCvxsTOPy0pAV0SrL+c9U4muQ==",
+      "dependencies": {
+        "@ttskch/select2-bootstrap4-theme": "^1.5.2",
+        "bootstrap": "^4.4.1",
+        "jquery.growl": "^1.3.5",
+        "material-design-icons-iconfont": "^6.7.0",
+        "open-sans-fonts": "^1.6.2",
+        "select2": "^4.0.5"
+      }
+    },
+    "node_modules/pretty-error": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz",
+      "integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==",
+      "dev": true,
+      "dependencies": {
+        "lodash": "^4.17.20",
+        "renderkid": "^3.0.0"
+      }
+    },
+    "node_modules/process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
+    "node_modules/process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "dev": true
+    },
+    "node_modules/proxy-addr": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+      "dev": true,
+      "dependencies": {
+        "forwarded": "0.2.0",
+        "ipaddr.js": "1.9.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/proxy-addr/node_modules/ipaddr.js": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/psl": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
+      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
+      "dev": true
+    },
+    "node_modules/public-encrypt": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+      "dev": true,
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "parse-asn1": "^5.0.0",
+        "randombytes": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/public-encrypt/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+      "dev": true
+    },
+    "node_modules/pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "node_modules/punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/qs": {
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "dev": true,
+      "dependencies": {
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/querystring": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+      "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==",
+      "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.x"
+      }
+    },
+    "node_modules/querystring-es3": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+      "integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.x"
+      }
+    },
+    "node_modules/querystringify": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
+      "dev": true
+    },
+    "node_modules/queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/quick-lru": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
+      "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/randomfill": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+      "dev": true,
+      "dependencies": {
+        "randombytes": "^2.0.5",
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/range-parser": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/raw-body": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+      "dev": true,
+      "dependencies": {
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/raw-body/node_modules/bytes": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/read-pkg": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
+      "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
+      "dev": true,
+      "dependencies": {
+        "@types/normalize-package-data": "^2.4.0",
+        "normalize-package-data": "^2.5.0",
+        "parse-json": "^5.0.0",
+        "type-fest": "^0.6.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/read-pkg-up": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
+      "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^4.1.0",
+        "read-pkg": "^5.2.0",
+        "type-fest": "^0.8.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/type-fest": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/read-pkg/node_modules/hosted-git-info": {
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+      "dev": true
+    },
+    "node_modules/read-pkg/node_modules/normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dev": true,
+      "dependencies": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      }
+    },
+    "node_modules/read-pkg/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/read-pkg/node_modules/type-fest": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
+      "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/readable-stream/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "node_modules/readable-stream/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/rechoir": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz",
+      "integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==",
+      "dev": true,
+      "dependencies": {
+        "resolve": "^1.20.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/redent": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
+      "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
+      "dev": true,
+      "dependencies": {
+        "indent-string": "^4.0.0",
+        "strip-indent": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/regexp.prototype.flags": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
+      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "functions-have-names": "^1.2.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/regexpp": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      }
+    },
+    "node_modules/relateurl": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
+      "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/renderkid": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz",
+      "integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==",
+      "dev": true,
+      "dependencies": {
+        "css-select": "^4.1.3",
+        "dom-converter": "^0.2.0",
+        "htmlparser2": "^6.1.0",
+        "lodash": "^4.17.21",
+        "strip-ansi": "^6.0.1"
+      }
+    },
+    "node_modules/renderkid/node_modules/entities": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/renderkid/node_modules/htmlparser2": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
+      "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
+      "dev": true,
+      "funding": [
+        "https://github.com/fb55/htmlparser2?sponsor=1",
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ],
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.0.0",
+        "domutils": "^2.5.2",
+        "entities": "^2.0.0"
+      }
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-main-filename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+      "dev": true
+    },
+    "node_modules/requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+      "dev": true
+    },
+    "node_modules/resize-observer-polyfill": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
+      "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
+    },
+    "node_modules/resolve": {
+      "version": "1.22.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
+      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+      "dev": true,
+      "dependencies": {
+        "is-core-module": "^2.9.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/resolve-alpn": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
+      "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g=="
+    },
+    "node_modules/resolve-cwd": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+      "dev": true,
+      "dependencies": {
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve-cwd/node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/responselike": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",
+      "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==",
+      "dependencies": {
+        "lowercase-keys": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/retry": {
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
+      "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "dev": true,
+      "engines": {
+        "iojs": ">=1.0.0",
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/ripemd160": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "dev": true,
+      "dependencies": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
+    "node_modules/run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
+    "node_modules/rxjs": {
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.0.tgz",
+      "integrity": "sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/safe-regex-test": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
+      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.3",
+        "is-regex": "^1.1.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
+    },
+    "node_modules/sass-embedded": {
+      "version": "1.57.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.57.1.tgz",
+      "integrity": "sha512-O0s796x76bRSJIdmJ4lrK+zJLtF3XeP+0tbJzR4NAPSDnWqHLk2boUYSdfx4DnF4x9rGmcVlMWFE8UvnLMNCmw==",
+      "dev": true,
+      "dependencies": {
+        "buffer-builder": "^0.2.0",
+        "google-protobuf": "^3.11.4",
+        "immutable": "^4.0.0",
+        "rxjs": "^7.4.0",
+        "supports-color": "^8.1.1"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "optionalDependencies": {
+        "sass-embedded-darwin-arm64": "1.57.1",
+        "sass-embedded-darwin-x64": "1.57.1",
+        "sass-embedded-linux-arm": "1.57.1",
+        "sass-embedded-linux-arm64": "1.57.1",
+        "sass-embedded-linux-ia32": "1.57.1",
+        "sass-embedded-linux-x64": "1.57.1",
+        "sass-embedded-win32-ia32": "1.57.1",
+        "sass-embedded-win32-x64": "1.57.1"
+      }
+    },
+    "node_modules/sass-embedded-darwin-arm64": {
+      "version": "1.57.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-arm64/-/sass-embedded-darwin-arm64-1.57.1.tgz",
+      "integrity": "sha512-YSfrLZkM2HdXETQdSznv2DN2GdkmBNWLAlHfDWe0toSEIB2C2YGuoqHYZtl6PBYqu8k8FH4TDyct8VzoIa+rMw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-darwin-x64": {
+      "version": "1.57.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-x64/-/sass-embedded-darwin-x64-1.57.1.tgz",
+      "integrity": "sha512-xq2Au8CRLHQ+MqH2p8gQn9rYGtfQ8voCWMRz7klYmmh5kXHFjefG3opPPB8mJeSc3SIqE35SQxQEIhUbsxozpg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-linux-arm": {
+      "version": "1.57.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm/-/sass-embedded-linux-arm-1.57.1.tgz",
+      "integrity": "sha512-s+roBIgiQSg8124JmYmiSw4THWRvkF2BOclBZCb+OFLa8ZTak2WZdGs0PhqkMmZypxQ7cewh9ts+sOWN24yIrw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-linux-arm64": {
+      "version": "1.57.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm64/-/sass-embedded-linux-arm64-1.57.1.tgz",
+      "integrity": "sha512-R0GqVqf0xEhQ5nDbj7vqmKw+/1kqiURNBl0pD4uv4inBed2YKg+7agn7Y5XE5GUWbgOz7ubjL2kt4Glr7K7xeA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-linux-ia32": {
+      "version": "1.57.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-ia32/-/sass-embedded-linux-ia32-1.57.1.tgz",
+      "integrity": "sha512-gKqMpfcjrW4S1m+cuRn88oUkr/HMv48CqyCHnfGCsrkTpIft33a1ZKW2jWm09rwmR0g/G6yGstoQO0iHWJWxuQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-linux-x64": {
+      "version": "1.57.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-x64/-/sass-embedded-linux-x64-1.57.1.tgz",
+      "integrity": "sha512-AI6CrcuLWP22RXhVrZUN2JfdQ7YdFR30dA4twYwp/Q4hUfj85dJrVD5ORi8G04haMWPOQiFV6pBcMgzpiY2Bog==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-win32-ia32": {
+      "version": "1.57.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-win32-ia32/-/sass-embedded-win32-ia32-1.57.1.tgz",
+      "integrity": "sha512-s7EhJLG9AnJNBga3I+W0rk6y/1n/i0XD34rvqR3yJgBhNKkI5rVCxFN7FAcGR50vQQbCO1MrUCmuVvld+2qvyQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded-win32-x64": {
+      "version": "1.57.1",
+      "resolved": "https://registry.npmjs.org/sass-embedded-win32-x64/-/sass-embedded-win32-x64-1.57.1.tgz",
+      "integrity": "sha512-b/Kgz7ADPTlPITk8e47Zf3eiuXlTGhi/eWsAoesUmkjR7jayvFNLHPhThgiRAxkzT6UlWI3Dzr+E3OBqUjegEg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/sass-embedded/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/sass-embedded/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/sass-loader": {
+      "version": "13.2.0",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.2.0.tgz",
+      "integrity": "sha512-JWEp48djQA4nbZxmgC02/Wh0eroSUutulROUusYJO9P9zltRbNN80JCBHqRGzjd4cmZCa/r88xgfkjGD0TXsHg==",
+      "dev": true,
+      "dependencies": {
+        "klona": "^2.0.4",
+        "neo-async": "^2.6.2"
+      },
+      "engines": {
+        "node": ">= 14.15.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "fibers": ">= 3.1.0",
+        "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0",
+        "sass": "^1.3.0",
+        "sass-embedded": "*",
+        "webpack": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "fibers": {
+          "optional": true
+        },
+        "node-sass": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "sass-embedded": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+      "dev": true
+    },
+    "node_modules/saxes": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
+      "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
+      "dev": true,
+      "dependencies": {
+        "xmlchars": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/schema-utils": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
+      "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.9",
+        "ajv": "^8.8.0",
+        "ajv-formats": "^2.1.1",
+        "ajv-keywords": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/schema-utils/node_modules/ajv": {
+      "version": "8.11.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.2.tgz",
+      "integrity": "sha512-E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/schema-utils/node_modules/ajv-keywords": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3"
+      },
+      "peerDependencies": {
+        "ajv": "^8.8.2"
+      }
+    },
+    "node_modules/schema-utils/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
+    },
+    "node_modules/select-hose": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
+      "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==",
+      "dev": true
+    },
+    "node_modules/select2": {
+      "version": "4.0.13",
+      "resolved": "https://registry.npmjs.org/select2/-/select2-4.0.13.tgz",
+      "integrity": "sha512-1JeB87s6oN/TDxQQYCvS5EFoQyvV6eYMZZ0AeA4tdFDYWN3BAGZ8npr17UBFddU0lgAt3H0yjX3X6/ekOj1yjw=="
+    },
+    "node_modules/selfsigned": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz",
+      "integrity": "sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==",
+      "dev": true,
+      "dependencies": {
+        "node-forge": "^1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/send": {
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+      "dev": true,
+      "dependencies": {
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "mime": "1.6.0",
+        "ms": "2.1.3",
+        "on-finished": "2.4.1",
+        "range-parser": "~1.2.1",
+        "statuses": "2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/send/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/send/node_modules/debug/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/send/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true
+    },
+    "node_modules/serialize-javascript": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
+      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "node_modules/serve-index": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
+      "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
+      "dev": true,
+      "dependencies": {
+        "accepts": "~1.3.4",
+        "batch": "0.6.1",
+        "debug": "2.6.9",
+        "escape-html": "~1.0.3",
+        "http-errors": "~1.6.2",
+        "mime-types": "~2.1.17",
+        "parseurl": "~1.3.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/serve-index/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/serve-index/node_modules/depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/serve-index/node_modules/http-errors": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+      "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
+      "dev": true,
+      "dependencies": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.0",
+        "statuses": ">= 1.4.0 < 2"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/serve-index/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
+      "dev": true
+    },
+    "node_modules/serve-index/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/serve-index/node_modules/setprototypeof": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+      "dev": true
+    },
+    "node_modules/serve-index/node_modules/statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/serve-static": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+      "dev": true,
+      "dependencies": {
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.3",
+        "send": "0.18.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
+      "dev": true
+    },
+    "node_modules/setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==",
+      "dev": true
+    },
+    "node_modules/setprototypeof": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
+      "dev": true
+    },
+    "node_modules/sha.js": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      },
+      "bin": {
+        "sha.js": "bin.js"
+      }
+    },
+    "node_modules/shallow-clone": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true
+    },
+    "node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/slice-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+      }
+    },
+    "node_modules/slice-ansi/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/slice-ansi/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/slice-ansi/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/sockjs": {
+      "version": "0.3.24",
+      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
+      "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
+      "dev": true,
+      "dependencies": {
+        "faye-websocket": "^0.11.3",
+        "uuid": "^8.3.2",
+        "websocket-driver": "^0.7.4"
+      }
+    },
+    "node_modules/source-list-map": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
+      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
+      "dev": true
+    },
+    "node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-js": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/sourcemap-codec": {
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
+      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
+      "deprecated": "Please use @jridgewell/sourcemap-codec instead"
+    },
+    "node_modules/spdx-correct": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
+      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+      "dev": true,
+      "dependencies": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-exceptions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
+      "dev": true
+    },
+    "node_modules/spdx-expression-parse": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "dev": true,
+      "dependencies": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-expression-validate": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-expression-validate/-/spdx-expression-validate-2.0.0.tgz",
+      "integrity": "sha512-b3wydZLM+Tc6CFvaRDBOF9d76oGIHNCLYFeHbftFXUWjnfZWganmDmvtM5sm1cRwJc/VDBMLyGGrsLFd1vOxbg==",
+      "dev": true,
+      "dependencies": {
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-license-ids": {
+      "version": "3.0.12",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz",
+      "integrity": "sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==",
+      "dev": true
+    },
+    "node_modules/spdy": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
+      "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.0",
+        "handle-thing": "^2.0.0",
+        "http-deceiver": "^1.2.7",
+        "select-hose": "^2.0.0",
+        "spdy-transport": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/spdy-transport": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
+      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.0",
+        "detect-node": "^2.0.4",
+        "hpack.js": "^2.1.6",
+        "obuf": "^1.1.2",
+        "readable-stream": "^3.0.6",
+        "wbuf": "^1.7.3"
+      }
+    },
+    "node_modules/spdy-transport/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/split2": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-0.2.1.tgz",
+      "integrity": "sha512-D/oTExYAkC9nWleOCTOyNmAuzfAT/6rHGBA9LIK7FVnGo13CSvrKCUzKenwH6U1s2znY9MqH6v0UQTEDa3vJmg==",
+      "dev": true,
+      "dependencies": {
+        "through2": "~0.6.1"
+      }
+    },
+    "node_modules/split2/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+      "dev": true
+    },
+    "node_modules/split2/node_modules/readable-stream": {
+      "version": "1.0.34",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+      "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/split2/node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+      "dev": true
+    },
+    "node_modules/split2/node_modules/through2": {
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+      "integrity": "sha512-RkK/CCESdTKQZHdmKICijdKKsCRVHs5KsLZ6pACAmF/1GPUQhonHSXWNERctxEp7RmvjdNbZTL5z9V7nSCXKcg==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": ">=1.0.33-1 <1.1.0-0",
+        "xtend": ">=4.0.0 <4.1.0-0"
+      }
+    },
+    "node_modules/sprintf-js": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
+      "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="
+    },
+    "node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/stream-browserify": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
+      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "~2.0.1",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "node_modules/stream-http": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
+      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+      "dev": true,
+      "dependencies": {
+        "builtin-status-codes": "^3.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.3.6",
+        "to-arraybuffer": "^1.0.0",
+        "xtend": "^4.0.0"
+      }
+    },
+    "node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string.prototype.trimend": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
+      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
+      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/strip-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-comments/-/strip-comments-2.0.1.tgz",
+      "integrity": "sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/strip-final-newline": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/strip-indent": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
+      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+      "dev": true,
+      "dependencies": {
+        "min-indent": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/style-loader": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.1.tgz",
+      "integrity": "sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/style-search": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
+      "integrity": "sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg==",
+      "dev": true
+    },
+    "node_modules/stylelint": {
+      "version": "14.16.0",
+      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.16.0.tgz",
+      "integrity": "sha512-X6uTi9DcxjzLV8ZUAjit1vsRtSwcls0nl07c9rqOPzvpA8IvTX/xWEkBRowS0ffevRrqkHa/ThDEu86u73FQDg==",
+      "dev": true,
+      "dependencies": {
+        "@csstools/selector-specificity": "^2.0.2",
+        "balanced-match": "^2.0.0",
+        "colord": "^2.9.3",
+        "cosmiconfig": "^7.1.0",
+        "css-functions-list": "^3.1.0",
+        "debug": "^4.3.4",
+        "fast-glob": "^3.2.12",
+        "fastest-levenshtein": "^1.0.16",
+        "file-entry-cache": "^6.0.1",
+        "global-modules": "^2.0.0",
+        "globby": "^11.1.0",
+        "globjoin": "^0.1.4",
+        "html-tags": "^3.2.0",
+        "ignore": "^5.2.1",
+        "import-lazy": "^4.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-plain-object": "^5.0.0",
+        "known-css-properties": "^0.26.0",
+        "mathml-tag-names": "^2.1.3",
+        "meow": "^9.0.0",
+        "micromatch": "^4.0.5",
+        "normalize-path": "^3.0.0",
+        "picocolors": "^1.0.0",
+        "postcss": "^8.4.19",
+        "postcss-media-query-parser": "^0.2.3",
+        "postcss-resolve-nested-selector": "^0.1.1",
+        "postcss-safe-parser": "^6.0.0",
+        "postcss-selector-parser": "^6.0.11",
+        "postcss-value-parser": "^4.2.0",
+        "resolve-from": "^5.0.0",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1",
+        "style-search": "^0.1.0",
+        "supports-hyperlinks": "^2.3.0",
+        "svg-tags": "^1.0.0",
+        "table": "^6.8.1",
+        "v8-compile-cache": "^2.3.0",
+        "write-file-atomic": "^4.0.2"
+      },
+      "bin": {
+        "stylelint": "bin/stylelint.js"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/stylelint"
+      }
+    },
+    "node_modules/stylelint-config-prestashop": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/stylelint-config-prestashop/-/stylelint-config-prestashop-1.0.7.tgz",
+      "integrity": "sha512-Ac2D15Jsk/zOmHJ4mu5g29bLQFkOmuSKGE/n8Scjs6YAOL/7QRhq26hXzlZ21+VMFi2bqKdjzqmYKbhgUHGpCA==",
+      "dev": true,
+      "dependencies": {
+        "stylelint-config-twbs-bootstrap": "^3.0.1",
+        "stylelint-no-unsupported-browser-features": "^5.0.1"
+      }
+    },
+    "node_modules/stylelint-config-recess-order": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-recess-order/-/stylelint-config-recess-order-3.1.0.tgz",
+      "integrity": "sha512-LXR6zD5O9cS1a9gbLbuKvWLs7qmHj4xm5MQ5KhhwZPMhtQP9da3F6Jsp/NAUdsAwDQEnT1ShU16YVdgN6p4a/w==",
+      "dev": true,
+      "dependencies": {
+        "stylelint-order": "5.x"
+      },
+      "peerDependencies": {
+        "stylelint": ">=14"
+      }
+    },
+    "node_modules/stylelint-config-recommended": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-7.0.0.tgz",
+      "integrity": "sha512-yGn84Bf/q41J4luis1AZ95gj0EQwRX8lWmGmBwkwBNSkpGSpl66XcPTulxGa/Z91aPoNGuIGBmFkcM1MejMo9Q==",
+      "dev": true,
+      "peerDependencies": {
+        "stylelint": "^14.4.0"
+      }
+    },
+    "node_modules/stylelint-config-recommended-scss": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-5.0.2.tgz",
+      "integrity": "sha512-b14BSZjcwW0hqbzm9b0S/ScN2+3CO3O4vcMNOw2KGf8lfVSwJ4p5TbNEXKwKl1+0FMtgRXZj6DqVUe/7nGnuBg==",
+      "dev": true,
+      "dependencies": {
+        "postcss-scss": "^4.0.2",
+        "stylelint-config-recommended": "^6.0.0",
+        "stylelint-scss": "^4.0.0"
+      },
+      "peerDependencies": {
+        "stylelint": "^14.0.0"
+      }
+    },
+    "node_modules/stylelint-config-recommended-scss/node_modules/stylelint-config-recommended": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-6.0.0.tgz",
+      "integrity": "sha512-ZorSSdyMcxWpROYUvLEMm0vSZud2uB7tX1hzBZwvVY9SV/uly4AvvJPPhCcymZL3fcQhEQG5AELmrxWqtmzacw==",
+      "dev": true,
+      "peerDependencies": {
+        "stylelint": "^14.0.0"
+      }
+    },
+    "node_modules/stylelint-config-standard": {
+      "version": "25.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-25.0.0.tgz",
+      "integrity": "sha512-21HnP3VSpaT1wFjFvv9VjvOGDtAviv47uTp3uFmzcN+3Lt+RYRv6oAplLaV51Kf792JSxJ6svCJh/G18E9VnCA==",
+      "dev": true,
+      "dependencies": {
+        "stylelint-config-recommended": "^7.0.0"
+      },
+      "peerDependencies": {
+        "stylelint": "^14.4.0"
+      }
+    },
+    "node_modules/stylelint-config-standard-scss": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-standard-scss/-/stylelint-config-standard-scss-3.0.0.tgz",
+      "integrity": "sha512-zt3ZbzIbllN1iCmc94e4pDxqpkzeR6CJo5DDXzltshuXr+82B8ylHyMMARNnUYrZH80B7wgY7UkKTYCFM0UUyw==",
+      "dev": true,
+      "dependencies": {
+        "stylelint-config-recommended-scss": "^5.0.2",
+        "stylelint-config-standard": "^24.0.0"
+      },
+      "peerDependencies": {
+        "stylelint": "^14.0.0"
+      }
+    },
+    "node_modules/stylelint-config-standard-scss/node_modules/stylelint-config-recommended": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-6.0.0.tgz",
+      "integrity": "sha512-ZorSSdyMcxWpROYUvLEMm0vSZud2uB7tX1hzBZwvVY9SV/uly4AvvJPPhCcymZL3fcQhEQG5AELmrxWqtmzacw==",
+      "dev": true,
+      "peerDependencies": {
+        "stylelint": "^14.0.0"
+      }
+    },
+    "node_modules/stylelint-config-standard-scss/node_modules/stylelint-config-standard": {
+      "version": "24.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-24.0.0.tgz",
+      "integrity": "sha512-+RtU7fbNT+VlNbdXJvnjc3USNPZRiRVp/d2DxOF/vBDDTi0kH5RX2Ny6errdtZJH3boO+bmqIYEllEmok4jiuw==",
+      "dev": true,
+      "dependencies": {
+        "stylelint-config-recommended": "^6.0.0"
+      },
+      "peerDependencies": {
+        "stylelint": "^14.0.0"
+      }
+    },
+    "node_modules/stylelint-config-twbs-bootstrap": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/stylelint-config-twbs-bootstrap/-/stylelint-config-twbs-bootstrap-3.2.1.tgz",
+      "integrity": "sha512-lfVEx+tW2SHMTYoifXIdB086FgQdQarQGt1vDqkEiuGYEtKeGjf41hovotEijw4t1RSyWuhkfxF8GzUZajTXjQ==",
+      "dev": true,
+      "dependencies": {
+        "stylelint-config-recess-order": "^3.0.0",
+        "stylelint-config-standard": "^25.0.0",
+        "stylelint-config-standard-scss": "^3.0.0",
+        "stylelint-scss": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "peerDependencies": {
+        "stylelint": "^14.4.0"
+      }
+    },
+    "node_modules/stylelint-no-unsupported-browser-features": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/stylelint-no-unsupported-browser-features/-/stylelint-no-unsupported-browser-features-5.0.4.tgz",
+      "integrity": "sha512-05DeIsWv262DXTSWhbQURDOxno9Tsu81sNnOpG1gD39WT+NNsEjhR2BQvwvNpZ/J/lS8vHxjhHULU2OGKSswvA==",
+      "dev": true,
+      "dependencies": {
+        "doiuse": "^4.4.1",
+        "lodash": "^4.17.15",
+        "postcss": "^8.4.16"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "peerDependencies": {
+        "stylelint": ">=13.0.0"
+      }
+    },
+    "node_modules/stylelint-order": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-5.0.0.tgz",
+      "integrity": "sha512-OWQ7pmicXufDw5BlRqzdz3fkGKJPgLyDwD1rFY3AIEfIH/LQY38Vu/85v8/up0I+VPiuGRwbc2Hg3zLAsJaiyw==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^8.3.11",
+        "postcss-sorting": "^7.0.1"
+      },
+      "peerDependencies": {
+        "stylelint": "^14.0.0"
+      }
+    },
+    "node_modules/stylelint-scss": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-4.3.0.tgz",
+      "integrity": "sha512-GvSaKCA3tipzZHoz+nNO7S02ZqOsdBzMiCx9poSmLlb3tdJlGddEX/8QzCOD8O7GQan9bjsvLMsO5xiw6IhhIQ==",
+      "dev": true,
+      "dependencies": {
+        "lodash": "^4.17.21",
+        "postcss-media-query-parser": "^0.2.3",
+        "postcss-resolve-nested-selector": "^0.1.1",
+        "postcss-selector-parser": "^6.0.6",
+        "postcss-value-parser": "^4.1.0"
+      },
+      "peerDependencies": {
+        "stylelint": "^14.5.1"
+      }
+    },
+    "node_modules/stylelint/node_modules/balanced-match": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz",
+      "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==",
+      "dev": true
+    },
+    "node_modules/stylelint/node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/supports-hyperlinks": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz",
+      "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0",
+        "supports-color": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-hyperlinks/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-hyperlinks/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/svg-tags": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
+      "integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==",
+      "dev": true
+    },
+    "node_modules/symbol-tree": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
+      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
+      "dev": true
+    },
+    "node_modules/table": {
+      "version": "6.8.1",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.8.1.tgz",
+      "integrity": "sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^8.0.1",
+        "lodash.truncate": "^4.4.2",
+        "slice-ansi": "^4.0.0",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/table/node_modules/ajv": {
+      "version": "8.11.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.2.tgz",
+      "integrity": "sha512-E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/table/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
+    },
+    "node_modules/tablednd": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/tablednd/-/tablednd-1.0.5.tgz",
+      "integrity": "sha512-iC230jusaekjzzAy0jigZLbzb7jKKnW9xiNiZ4W17p7y8AvBYf5KunyrIE3HwL1FhL2VEeogZtjP5VeBeIW4xg=="
+    },
+    "node_modules/tapable": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
+      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/terser": {
+      "version": "5.16.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.1.tgz",
+      "integrity": "sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw==",
+      "dependencies": {
+        "@jridgewell/source-map": "^0.3.2",
+        "acorn": "^8.5.0",
+        "commander": "^2.20.0",
+        "source-map-support": "~0.5.20"
+      },
+      "bin": {
+        "terser": "bin/terser"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/terser-webpack-plugin": {
+      "version": "5.3.6",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz",
+      "integrity": "sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.14",
+        "jest-worker": "^27.4.5",
+        "schema-utils": "^3.1.1",
+        "serialize-javascript": "^6.0.0",
+        "terser": "^5.14.1"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.1.0"
+      },
+      "peerDependenciesMeta": {
+        "@swc/core": {
+          "optional": true
+        },
+        "esbuild": {
+          "optional": true
+        },
+        "uglify-js": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/terser/node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+    },
+    "node_modules/text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+      "dev": true
+    },
+    "node_modules/through2": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz",
+      "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "3"
+      }
+    },
+    "node_modules/through2/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/thunky": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
+      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
+      "dev": true
+    },
+    "node_modules/timers-browserify": {
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
+      "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
+      "dev": true,
+      "dependencies": {
+        "setimmediate": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
+    "node_modules/to-arraybuffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+      "integrity": "sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA==",
+      "dev": true
+    },
+    "node_modules/to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/toidentifier": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/tough-cookie": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz",
+      "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==",
+      "dev": true,
+      "dependencies": {
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.2.0",
+        "url-parse": "^1.5.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tough-cookie/node_modules/universalify": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/tr46": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
+      "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
+      "dev": true,
+      "dependencies": {
+        "punycode": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/trim-newlines": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
+      "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ts-loader": {
+      "version": "9.4.2",
+      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.4.2.tgz",
+      "integrity": "sha512-OmlC4WVmFv5I0PpaxYb+qGeGOdm5giHU7HwDDUjw59emP2UYMHy9fFSDcYgSNoH8sXcj4hGCSEhlDZ9ULeDraA==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "enhanced-resolve": "^5.0.0",
+        "micromatch": "^4.0.0",
+        "semver": "^7.3.4"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "typescript": "*",
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/ts-loader/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/ts-loader/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/ts-loader/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/ts-loader/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/ts-loader/node_modules/enhanced-resolve": {
+      "version": "5.12.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz",
+      "integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.4",
+        "tapable": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/ts-loader/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ts-loader/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ts-loader/node_modules/semver": {
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ts-loader/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ts-loader/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/ts-node": {
+      "version": "10.9.1",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz",
+      "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==",
+      "dev": true,
+      "dependencies": {
+        "@cspotcode/source-map-support": "^0.8.0",
+        "@tsconfig/node10": "^1.0.7",
+        "@tsconfig/node12": "^1.0.7",
+        "@tsconfig/node14": "^1.0.0",
+        "@tsconfig/node16": "^1.0.2",
+        "acorn": "^8.4.1",
+        "acorn-walk": "^8.1.1",
+        "arg": "^4.1.0",
+        "create-require": "^1.1.0",
+        "diff": "^4.0.1",
+        "make-error": "^1.1.1",
+        "v8-compile-cache-lib": "^3.0.1",
+        "yn": "3.1.1"
+      },
+      "bin": {
+        "ts-node": "dist/bin.js",
+        "ts-node-cwd": "dist/bin-cwd.js",
+        "ts-node-esm": "dist/bin-esm.js",
+        "ts-node-script": "dist/bin-script.js",
+        "ts-node-transpile-only": "dist/bin-transpile.js",
+        "ts-script": "dist/bin-script-deprecated.js"
+      },
+      "peerDependencies": {
+        "@swc/core": ">=1.2.50",
+        "@swc/wasm": ">=1.2.50",
+        "@types/node": "*",
+        "typescript": ">=2.7"
+      },
+      "peerDependenciesMeta": {
+        "@swc/core": {
+          "optional": true
+        },
+        "@swc/wasm": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/ts-node/node_modules/diff": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
+    "node_modules/tsconfig-paths": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
+      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.1",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
+      }
+    },
+    "node_modules/tsconfig-paths/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/tslib": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz",
+      "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==",
+      "dev": true
+    },
+    "node_modules/tsutils": {
+      "version": "3.21.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.8.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      },
+      "peerDependencies": {
+        "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
+      }
+    },
+    "node_modules/tsutils/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
+    "node_modules/tty-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+      "integrity": "sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw==",
+      "dev": true
+    },
+    "node_modules/type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "0.18.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
+      "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/type-is": {
+      "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+      "dev": true,
+      "dependencies": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/typeahead.js": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/typeahead.js/-/typeahead.js-0.11.1.tgz",
+      "integrity": "sha512-yGaLzGjVHyryZdNfrWz2NHXUwEO7hrlVmGMGCo5+6mH3nEEhcQ0Te3mK3G60uRnxfERu8twOWSU4WmwScbwhMg==",
+      "dependencies": {
+        "jquery": ">=1.7"
+      }
+    },
+    "node_modules/typescript": {
+      "version": "4.9.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz",
+      "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==",
+      "dev": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=4.2.0"
+      }
+    },
+    "node_modules/uglify-save-license": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/uglify-save-license/-/uglify-save-license-0.4.1.tgz",
+      "integrity": "sha512-ErJczQkCvQKoEk7xxIfJTGp2JHtbKr8lEPtTgeJqm3PVCdF930Ba7x+wwtj3dZKwVu7lDy2nTOwncm3qCD+RMw==",
+      "dev": true
+    },
+    "node_modules/unbox-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
+        "which-boxed-primitive": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/universalify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/update-browserslist-db": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
+      "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        }
+      ],
+      "dependencies": {
+        "escalade": "^3.1.1",
+        "picocolors": "^1.0.0"
+      },
+      "bin": {
+        "browserslist-lint": "cli.js"
+      },
+      "peerDependencies": {
+        "browserslist": ">= 4.21.0"
+      }
+    },
+    "node_modules/uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/url": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+      "integrity": "sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==",
+      "dev": true,
+      "dependencies": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      }
+    },
+    "node_modules/url-parse": {
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+      "dev": true,
+      "dependencies": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    },
+    "node_modules/url-polyfill": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/url-polyfill/-/url-polyfill-1.1.12.tgz",
+      "integrity": "sha512-mYFmBHCapZjtcNHW0MDq9967t+z4Dmg5CJ0KqysK3+ZbyoNOWQHksGCTWwDhxGXllkWlOc10Xfko6v4a3ucM6A=="
+    },
+    "node_modules/url/node_modules/punycode": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+      "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==",
+      "dev": true
+    },
+    "node_modules/util": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "2.0.3"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "dev": true
+    },
+    "node_modules/util/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
+      "dev": true
+    },
+    "node_modules/utila": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
+      "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==",
+      "dev": true
+    },
+    "node_modules/utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "dev": true,
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/v8-compile-cache": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+      "dev": true
+    },
+    "node_modules/v8-compile-cache-lib": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
+      "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
+      "dev": true
+    },
+    "node_modules/validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
+      "dependencies": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "node_modules/vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/vazirmatn": {
+      "version": "32.102.0",
+      "resolved": "https://registry.npmjs.org/vazirmatn/-/vazirmatn-32.102.0.tgz",
+      "integrity": "sha512-Fkvs0Hp5x9zjHTuwog3KEcARhMLxjXd3o3MyD/vBywxYt2LG+4THEHpu6AW8ojfHJAutrxFnDTPB/5hvkX80ww=="
+    },
+    "node_modules/vm-browserify": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
+      "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
+      "dev": true
+    },
+    "node_modules/vue": {
+      "version": "3.2.45",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-3.2.45.tgz",
+      "integrity": "sha512-9Nx/Mg2b2xWlXykmCwiTUCWHbWIj53bnkizBxKai1g61f2Xit700A1ljowpTIM11e3uipOeiPcSqnmBg6gyiaA==",
+      "dependencies": {
+        "@vue/compiler-dom": "3.2.45",
+        "@vue/compiler-sfc": "3.2.45",
+        "@vue/runtime-dom": "3.2.45",
+        "@vue/server-renderer": "3.2.45",
+        "@vue/shared": "3.2.45"
+      }
+    },
+    "node_modules/vue-eslint-parser": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.1.0.tgz",
+      "integrity": "sha512-NGn/iQy8/Wb7RrRa4aRkokyCZfOUWk19OP5HP6JEozQFX5AoS/t+Z0ZN7FY4LlmWc4FNI922V7cvX28zctN8dQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.3.4",
+        "eslint-scope": "^7.1.1",
+        "eslint-visitor-keys": "^3.3.0",
+        "espree": "^9.3.1",
+        "esquery": "^1.4.0",
+        "lodash": "^4.17.21",
+        "semver": "^7.3.6"
+      },
+      "engines": {
+        "node": "^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      },
+      "peerDependencies": {
+        "eslint": ">=6.0.0"
+      }
+    },
+    "node_modules/vue-eslint-parser/node_modules/eslint-scope": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
+      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/vue-eslint-parser/node_modules/eslint-visitor-keys": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/vue-eslint-parser/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/vue-eslint-parser/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/vue-eslint-parser/node_modules/semver": {
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/vue-eslint-parser/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/vue-i18n": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.2.2.tgz",
+      "integrity": "sha512-yswpwtj89rTBhegUAv9Mu37LNznyu3NpyLQmozF3i1hYOhwpG8RjcjIFIIfnu+2MDZJGSZPXaKWvnQA71Yv9TQ==",
+      "dependencies": {
+        "@intlify/core-base": "9.2.2",
+        "@intlify/shared": "9.2.2",
+        "@intlify/vue-devtools": "9.2.2",
+        "@vue/devtools-api": "^6.2.1"
+      },
+      "engines": {
+        "node": ">= 14"
+      },
+      "peerDependencies": {
+        "vue": "^3.0.0"
+      }
+    },
+    "node_modules/vue-loader": {
+      "version": "17.0.1",
+      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-17.0.1.tgz",
+      "integrity": "sha512-/OOyugJnImKCkAKrAvdsWMuwoCqGxWT5USLsjohzWbMgOwpA5wQmzQiLMzZd7DjhIfunzAGIApTOgIylz/kwcg==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "hash-sum": "^2.0.0",
+        "loader-utils": "^2.0.0"
+      },
+      "peerDependencies": {
+        "webpack": "^4.1.0 || ^5.0.0-0"
+      },
+      "peerDependenciesMeta": {
+        "@vue/compiler-sfc": {
+          "optional": true
+        },
+        "vue": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/vue-loader/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/vue-loader/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/vue-loader/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/vue-loader/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/vue-loader/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/vue-loader/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/vue-resource": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/vue-resource/-/vue-resource-1.5.3.tgz",
+      "integrity": "sha512-REhTuEuYSpwmEH/VN4fgDQVC/VXxDK/xsguuiDPnINxOwy1s0CSu//p++osTUkiAXi6d/vptwBpb0AcBIDsXzw==",
+      "dependencies": {
+        "got": ">=8.0 <12.0"
+      }
+    },
+    "node_modules/vue-router": {
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.1.6.tgz",
+      "integrity": "sha512-DYWYwsG6xNPmLq/FmZn8Ip+qrhFEzA14EI12MsMgVxvHFDYvlr4NXpVF5hrRH1wVcDP8fGi5F4rxuJSl8/r+EQ==",
+      "dependencies": {
+        "@vue/devtools-api": "^6.4.5"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/posva"
+      },
+      "peerDependencies": {
+        "vue": "^3.2.0"
+      }
+    },
+    "node_modules/vue-style-loader": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz",
+      "integrity": "sha512-sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg==",
+      "dev": true,
+      "dependencies": {
+        "hash-sum": "^1.0.2",
+        "loader-utils": "^1.0.2"
+      }
+    },
+    "node_modules/vue-style-loader/node_modules/hash-sum": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
+      "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
+      "dev": true
+    },
+    "node_modules/vue-style-loader/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/vue-style-loader/node_modules/loader-utils": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+      "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/vuex": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/vuex/-/vuex-4.1.0.tgz",
+      "integrity": "sha512-hmV6UerDrPcgbSy9ORAtNXDr9M4wlNP4pEFKye4ujJF8oqgFFuxDCdOLS3eNoRTtq5O3hoBDh9Doj1bQMYHRbQ==",
+      "dependencies": {
+        "@vue/devtools-api": "^6.0.0-beta.11"
+      },
+      "peerDependencies": {
+        "vue": "^3.2.0"
+      }
+    },
+    "node_modules/w3c-hr-time": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
+      "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
+      "deprecated": "Use your platform's native performance.now() and performance.timeOrigin.",
+      "dev": true,
+      "dependencies": {
+        "browser-process-hrtime": "^1.0.0"
+      }
+    },
+    "node_modules/w3c-xmlserializer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-3.0.0.tgz",
+      "integrity": "sha512-3WFqGEgSXIyGhOmAFtlicJNMjEps8b1MG31NCA0/vOF9+nKMUW1ckhi9cnNHmf88Rzw5V+dwIwsm2C7X8k9aQg==",
+      "dev": true,
+      "dependencies": {
+        "xml-name-validator": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/watchpack": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
+      "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
+      "dependencies": {
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.1.2"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/wbuf": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
+      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
+      "dev": true,
+      "dependencies": {
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "node_modules/webidl-conversions": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/webpack": {
+      "version": "5.75.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz",
+      "integrity": "sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==",
+      "dependencies": {
+        "@types/eslint-scope": "^3.7.3",
+        "@types/estree": "^0.0.51",
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/wasm-edit": "1.11.1",
+        "@webassemblyjs/wasm-parser": "1.11.1",
+        "acorn": "^8.7.1",
+        "acorn-import-assertions": "^1.7.6",
+        "browserslist": "^4.14.5",
+        "chrome-trace-event": "^1.0.2",
+        "enhanced-resolve": "^5.10.0",
+        "es-module-lexer": "^0.9.0",
+        "eslint-scope": "5.1.1",
+        "events": "^3.2.0",
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.2.9",
+        "json-parse-even-better-errors": "^2.3.1",
+        "loader-runner": "^4.2.0",
+        "mime-types": "^2.1.27",
+        "neo-async": "^2.6.2",
+        "schema-utils": "^3.1.0",
+        "tapable": "^2.1.1",
+        "terser-webpack-plugin": "^5.1.3",
+        "watchpack": "^2.4.0",
+        "webpack-sources": "^3.2.3"
+      },
+      "bin": {
+        "webpack": "bin/webpack.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependenciesMeta": {
+        "webpack-cli": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-cli": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.0.1.tgz",
+      "integrity": "sha512-S3KVAyfwUqr0Mo/ur3NzIp6jnerNpo7GUO6so51mxLi1spqsA17YcMXy0WOIJtBSnj748lthxC6XLbNKh/ZC+A==",
+      "dev": true,
+      "dependencies": {
+        "@discoveryjs/json-ext": "^0.5.0",
+        "@webpack-cli/configtest": "^2.0.1",
+        "@webpack-cli/info": "^2.0.1",
+        "@webpack-cli/serve": "^2.0.1",
+        "colorette": "^2.0.14",
+        "commander": "^9.4.1",
+        "cross-spawn": "^7.0.3",
+        "envinfo": "^7.7.3",
+        "fastest-levenshtein": "^1.0.12",
+        "import-local": "^3.0.2",
+        "interpret": "^3.1.1",
+        "rechoir": "^0.8.0",
+        "webpack-merge": "^5.7.3"
+      },
+      "bin": {
+        "webpack-cli": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=14.15.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "5.x.x"
+      },
+      "peerDependenciesMeta": {
+        "@webpack-cli/generators": {
+          "optional": true
+        },
+        "webpack-bundle-analyzer": {
+          "optional": true
+        },
+        "webpack-dev-server": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-cli/node_modules/commander": {
+      "version": "9.4.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-9.4.1.tgz",
+      "integrity": "sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw==",
+      "dev": true,
+      "engines": {
+        "node": "^12.20.0 || >=14"
+      }
+    },
+    "node_modules/webpack-cli/node_modules/interpret": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz",
+      "integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/webpack-dev-middleware": {
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz",
+      "integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==",
+      "dev": true,
+      "dependencies": {
+        "colorette": "^2.0.10",
+        "memfs": "^3.4.3",
+        "mime-types": "^2.1.31",
+        "range-parser": "^1.2.1",
+        "schema-utils": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/webpack-dev-server": {
+      "version": "4.11.1",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.11.1.tgz",
+      "integrity": "sha512-lILVz9tAUy1zGFwieuaQtYiadImb5M3d+H+L1zDYalYoDl0cksAB1UNyuE5MMWJrG6zR1tXkCP2fitl7yoUJiw==",
+      "dev": true,
+      "dependencies": {
+        "@types/bonjour": "^3.5.9",
+        "@types/connect-history-api-fallback": "^1.3.5",
+        "@types/express": "^4.17.13",
+        "@types/serve-index": "^1.9.1",
+        "@types/serve-static": "^1.13.10",
+        "@types/sockjs": "^0.3.33",
+        "@types/ws": "^8.5.1",
+        "ansi-html-community": "^0.0.8",
+        "bonjour-service": "^1.0.11",
+        "chokidar": "^3.5.3",
+        "colorette": "^2.0.10",
+        "compression": "^1.7.4",
+        "connect-history-api-fallback": "^2.0.0",
+        "default-gateway": "^6.0.3",
+        "express": "^4.17.3",
+        "graceful-fs": "^4.2.6",
+        "html-entities": "^2.3.2",
+        "http-proxy-middleware": "^2.0.3",
+        "ipaddr.js": "^2.0.1",
+        "open": "^8.0.9",
+        "p-retry": "^4.5.0",
+        "rimraf": "^3.0.2",
+        "schema-utils": "^4.0.0",
+        "selfsigned": "^2.1.1",
+        "serve-index": "^1.9.1",
+        "sockjs": "^0.3.24",
+        "spdy": "^4.0.2",
+        "webpack-dev-middleware": "^5.3.1",
+        "ws": "^8.4.2"
+      },
+      "bin": {
+        "webpack-dev-server": "bin/webpack-dev-server.js"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.37.0 || ^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "webpack-cli": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/webpack-font-preload-plugin": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/webpack-font-preload-plugin/-/webpack-font-preload-plugin-1.5.0.tgz",
+      "integrity": "sha512-/Nh6MNa7/rbu3ZcqSR1SxB+G5XaITu7U2yZO5INTsVRpVlMLQmHQZCoDt4PP+iFyBdvBCDbA0CImRXHarQ0wpQ==",
+      "dev": true,
+      "dependencies": {
+        "jsdom": "^19.0.0",
+        "webpack-sources": "^3.2.2"
+      },
+      "engines": {
+        "node": ">= 10.17.0"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/webpack-font-preload-plugin/node_modules/webpack-sources": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/webpack-license-plugin": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/webpack-license-plugin/-/webpack-license-plugin-4.2.2.tgz",
+      "integrity": "sha512-OfIdm659IKurEInKlBN6Sfzrh+MNKIWkChKKg+aDCoPf3Ok1OSXBDd2RKSbuUAtxjmdW2j6LUVZWnRYRnVdOxA==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^5.0.1",
+        "get-npm-tarball-url": "^2.0.1",
+        "lodash": "^4.17.20",
+        "needle": "^2.2.4",
+        "spdx-expression-validate": "^2.0.0",
+        "webpack-sources": "^3.2.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "webpack": ">=4.0.0 < 6.0.0"
+      }
+    },
+    "node_modules/webpack-license-plugin/node_modules/chalk": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.2.0.tgz",
+      "integrity": "sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/webpack-license-plugin/node_modules/webpack-sources": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/webpack-merge": {
+      "version": "5.8.0",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz",
+      "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==",
+      "dev": true,
+      "dependencies": {
+        "clone-deep": "^4.0.1",
+        "wildcard": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/webpack-remove-empty-scripts": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/webpack-remove-empty-scripts/-/webpack-remove-empty-scripts-0.7.3.tgz",
+      "integrity": "sha512-yipqb25A0qtH7X9vKt6yihwyYkTtSlRiDdBb2QsyrkqGM3hpfAcfOO1lYDef9HQUNm3s8ojmorbNg32XXX6FYg==",
+      "dev": true,
+      "dependencies": {
+        "ansis": "^1.3.4"
+      },
+      "engines": {
+        "node": ">=12.14"
+      },
+      "funding": {
+        "type": "patreon",
+        "url": "https://patreon.com/biodiscus"
+      },
+      "peerDependencies": {
+        "webpack": ">=5.32.0"
+      }
+    },
+    "node_modules/webpack-sources": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+      "dev": true,
+      "dependencies": {
+        "source-list-map": "^2.0.0",
+        "source-map": "~0.6.1"
+      }
+    },
+    "node_modules/webpack/node_modules/enhanced-resolve": {
+      "version": "5.12.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz",
+      "integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==",
+      "dependencies": {
+        "graceful-fs": "^4.2.4",
+        "tapable": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/webpack/node_modules/schema-utils": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
+    "node_modules/webpack/node_modules/webpack-sources": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/websocket-driver": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
+      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
+      "dev": true,
+      "dependencies": {
+        "http-parser-js": ">=0.5.1",
+        "safe-buffer": ">=5.1.0",
+        "websocket-extensions": ">=0.1.1"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/websocket-extensions": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
+      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/whatwg-encoding": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
+      "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
+      "dev": true,
+      "dependencies": {
+        "iconv-lite": "0.6.3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/whatwg-encoding/node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "dev": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/whatwg-mimetype": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
+      "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/whatwg-url": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-10.0.0.tgz",
+      "integrity": "sha512-CLxxCmdUby142H5FZzn4D8ikO1cmypvXVQktsgosNy4a4BHrDHeciBBGZhb0bNoR5/MltoCatso+vFjjGx8t0w==",
+      "dev": true,
+      "dependencies": {
+        "tr46": "^3.0.0",
+        "webidl-conversions": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "dev": true,
+      "dependencies": {
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-module": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==",
+      "dev": true
+    },
+    "node_modules/wide-align": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^1.0.2 || 2"
+      }
+    },
+    "node_modules/wide-align/node_modules/ansi-regex": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
+      "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/wide-align/node_modules/is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/wide-align/node_modules/string-width": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "dev": true,
+      "dependencies": {
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/wide-align/node_modules/strip-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+      "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/wildcard": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
+      "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==",
+      "dev": true
+    },
+    "node_modules/word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/wrap-ansi": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.0",
+        "string-width": "^3.0.0",
+        "strip-ansi": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-regex": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "dev": true
+    },
+    "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/string-width": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^7.0.1",
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+    },
+    "node_modules/write-file-atomic": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+      "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
+      "dev": true,
+      "dependencies": {
+        "imurmurhash": "^0.1.4",
+        "signal-exit": "^3.0.7"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/ws": {
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
+      "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/xml-name-validator": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
+      "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/xmlchars": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
+      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
+      "dev": true
+    },
+    "node_modules/xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
+    "node_modules/y18n": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+      "dev": true
+    },
+    "node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true
+    },
+    "node_modules/yaml": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/yargs": {
+      "version": "13.3.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+      "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^5.0.0",
+        "find-up": "^3.0.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^3.0.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^13.1.2"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "13.1.2",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      }
+    },
+    "node_modules/yargs-unparser": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz",
+      "integrity": "sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==",
+      "dev": true,
+      "dependencies": {
+        "flat": "^4.1.0",
+        "lodash": "^4.17.15",
+        "yargs": "^13.3.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/yargs/node_modules/ansi-regex": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/yargs/node_modules/emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "dev": true
+    },
+    "node_modules/yargs/node_modules/find-up": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/yargs/node_modules/is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/yargs/node_modules/locate-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^3.0.0",
+        "path-exists": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/yargs/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/yargs/node_modules/p-locate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/yargs/node_modules/path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/yargs/node_modules/string-width": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^7.0.1",
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/yargs/node_modules/strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/yn": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
+      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/zxcvbn": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/zxcvbn/-/zxcvbn-4.4.2.tgz",
+      "integrity": "sha512-Bq0B+ixT/DMyG8kgX2xWcI5jUvCwqrMxSFam7m0lAf78nf04hv6lNCsyLYdyYTrCVMqNDY/206K7eExYCeSyUQ=="
+    }
+  },
   "dependencies": {
     "@ampproject/remapping": {
       "version": "2.2.0",
@@ -400,13 +14667,15 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.2.tgz",
       "integrity": "sha512-c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "@csstools/selector-specificity": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz",
       "integrity": "sha512-IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "@discoveryjs/json-ext": {
       "version": "0.5.7",
@@ -743,7 +15012,6 @@
       "version": "8.4.10",
       "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.10.tgz",
       "integrity": "sha512-Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw==",
-      "dev": true,
       "requires": {
         "@types/estree": "*",
         "@types/json-schema": "*"
@@ -753,7 +15021,6 @@
       "version": "3.7.4",
       "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
       "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
-      "dev": true,
       "requires": {
         "@types/eslint": "*",
         "@types/estree": "*"
@@ -762,8 +15029,7 @@
     "@types/estree": {
       "version": "0.0.51",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
-      "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==",
-      "dev": true
+      "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ=="
     },
     "@types/express": {
       "version": "4.17.15",
@@ -1312,7 +15578,6 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
       "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
-      "dev": true,
       "requires": {
         "@webassemblyjs/helper-numbers": "1.11.1",
         "@webassemblyjs/helper-wasm-bytecode": "1.11.1"
@@ -1321,26 +15586,22 @@
     "@webassemblyjs/floating-point-hex-parser": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
-      "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==",
-      "dev": true
+      "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ=="
     },
     "@webassemblyjs/helper-api-error": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
-      "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==",
-      "dev": true
+      "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg=="
     },
     "@webassemblyjs/helper-buffer": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
-      "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==",
-      "dev": true
+      "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA=="
     },
     "@webassemblyjs/helper-numbers": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
       "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==",
-      "dev": true,
       "requires": {
         "@webassemblyjs/floating-point-hex-parser": "1.11.1",
         "@webassemblyjs/helper-api-error": "1.11.1",
@@ -1350,14 +15611,12 @@
     "@webassemblyjs/helper-wasm-bytecode": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
-      "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==",
-      "dev": true
+      "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q=="
     },
     "@webassemblyjs/helper-wasm-section": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
       "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==",
-      "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/helper-buffer": "1.11.1",
@@ -1369,7 +15628,6 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
       "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==",
-      "dev": true,
       "requires": {
         "@xtuc/ieee754": "^1.2.0"
       }
@@ -1378,7 +15636,6 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
       "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==",
-      "dev": true,
       "requires": {
         "@xtuc/long": "4.2.2"
       }
@@ -1386,14 +15643,12 @@
     "@webassemblyjs/utf8": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
-      "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==",
-      "dev": true
+      "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ=="
     },
     "@webassemblyjs/wasm-edit": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
       "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==",
-      "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/helper-buffer": "1.11.1",
@@ -1409,7 +15664,6 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
       "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==",
-      "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
@@ -1422,7 +15676,6 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
       "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==",
-      "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/helper-buffer": "1.11.1",
@@ -1434,7 +15687,6 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
       "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==",
-      "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/helper-api-error": "1.11.1",
@@ -1448,7 +15700,6 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
       "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==",
-      "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
         "@xtuc/long": "4.2.2"
@@ -1458,31 +15709,32 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.0.1.tgz",
       "integrity": "sha512-njsdJXJSiS2iNbQVS0eT8A/KPnmyH4pv1APj2K0d1wrZcBLw+yppxOy4CGqa0OxDJkzfL/XELDhD8rocnIwB5A==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "@webpack-cli/info": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-2.0.1.tgz",
       "integrity": "sha512-fE1UEWTwsAxRhrJNikE7v4EotYflkEhBL7EbajfkPlf6E37/2QshOy/D48Mw8G5XMFlQtS6YV42vtbG9zBpIQA==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "@webpack-cli/serve": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-2.0.1.tgz",
       "integrity": "sha512-0G7tNyS+yW8TdgHwZKlDWYXFA6OJQnoLCQvYKkQP0Q2X205PSQ6RNUj0M+1OB/9gRQaUZ/ccYfaxd0nhaWKfjw==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "@xtuc/ieee754": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-      "dev": true
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="
     },
     "@xtuc/long": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-      "dev": true
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
     },
     "abab": {
       "version": "2.0.6",
@@ -1533,13 +15785,14 @@
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
       "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
-      "dev": true
+      "requires": {}
     },
     "acorn-jsx": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "acorn-walk": {
       "version": "8.2.0",
@@ -1599,7 +15852,8 @@
     "ajv-keywords": {
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "requires": {}
     },
     "ansi-colors": {
       "version": "3.2.3",
@@ -1914,7 +16168,8 @@
     "bootstrap": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.4.1.tgz",
-      "integrity": "sha512-tbx5cHubwE6e2ZG7nqM3g/FZ5PQEDMWmMGNrCUBVRPHXTJaH7CBDdsLeu3eCh3B1tzAxTnAbtmrzvWEvT2NNEA=="
+      "integrity": "sha512-tbx5cHubwE6e2ZG7nqM3g/FZ5PQEDMWmMGNrCUBVRPHXTJaH7CBDdsLeu3eCh3B1tzAxTnAbtmrzvWEvT2NNEA==",
+      "requires": {}
     },
     "bootstrap-colorpicker": {
       "version": "3.4.0",
@@ -2073,7 +16328,6 @@
       "version": "4.21.4",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
       "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
-      "dev": true,
       "requires": {
         "caniuse-lite": "^1.0.30001400",
         "electron-to-chromium": "^1.4.251",
@@ -2186,8 +16440,7 @@
     "caniuse-lite": {
       "version": "1.0.30001441",
       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001441.tgz",
-      "integrity": "sha512-OyxRR4Vof59I3yGWXws6i908EtGbMzVUi3ganaZQHmydk1iwDhRnvaPG2WaR0KcqrDFKrxVZHULT396LEPhXfg==",
-      "dev": true
+      "integrity": "sha512-OyxRR4Vof59I3yGWXws6i908EtGbMzVUi3ganaZQHmydk1iwDhRnvaPG2WaR0KcqrDFKrxVZHULT396LEPhXfg=="
     },
     "chai": {
       "version": "4.3.7",
@@ -2251,8 +16504,7 @@
     "chrome-trace-event": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
-      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
-      "dev": true
+      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg=="
     },
     "cipher-base": {
       "version": "1.0.4",
@@ -2726,7 +16978,8 @@
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz",
       "integrity": "sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "css-rule-stream": {
       "version": "1.1.0",
@@ -3405,8 +17658,7 @@
     "electron-to-chromium": {
       "version": "1.4.284",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz",
-      "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==",
-      "dev": true
+      "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA=="
     },
     "elliptic": {
       "version": "6.5.4",
@@ -3557,8 +17809,7 @@
     "es-module-lexer": {
       "version": "0.9.3",
       "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
-      "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
-      "dev": true
+      "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ=="
     },
     "es-shim-unscopables": {
       "version": "1.0.0",
@@ -3779,8 +18030,7 @@
     "escalade": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-      "dev": true
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
     },
     "escape-html": {
       "version": "1.0.3",
@@ -4190,7 +18440,6 @@
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
       "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
       "requires": {
         "esrecurse": "^4.3.0",
         "estraverse": "^4.1.1"
@@ -4257,7 +18506,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
       "requires": {
         "estraverse": "^5.2.0"
       },
@@ -4265,16 +18513,14 @@
         "estraverse": {
           "version": "5.3.0",
           "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-          "dev": true
+          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
         }
       }
     },
     "estraverse": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
     },
     "estree-walker": {
       "version": "2.0.2",
@@ -4343,7 +18589,8 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/expose-loader/-/expose-loader-4.0.0.tgz",
       "integrity": "sha512-kUEvHyf6MPR2ubZCL9aziP9Br5wxMvq1cghTpYhM6MW52NPq+7hXixw2EqQuI1SvGb1fDjc2ehJOg6645wR6ww==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "express": {
       "version": "4.18.2",
@@ -4895,8 +19142,7 @@
     "glob-to-regexp": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
-      "dev": true
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="
     },
     "global-modules": {
       "version": "2.0.0",
@@ -4991,8 +19237,7 @@
     "graceful-fs": {
       "version": "4.2.10",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-      "dev": true
+      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
     },
     "grapheme-splitter": {
       "version": "1.0.4",
@@ -5352,7 +19597,8 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
       "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "ieee754": {
       "version": "1.2.1",
@@ -5835,8 +20081,7 @@
     "json-parse-even-better-errors": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
     },
     "json-schema-traverse": {
       "version": "0.4.1",
@@ -5961,8 +20206,7 @@
     "loader-runner": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
-      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
-      "dev": true
+      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg=="
     },
     "loader-utils": {
       "version": "2.0.4",
@@ -6209,14 +20453,12 @@
     "mime-db": {
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "dev": true
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
     },
     "mime-types": {
       "version": "2.1.35",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dev": true,
       "requires": {
         "mime-db": "1.52.0"
       }
@@ -6582,8 +20824,7 @@
     "neo-async": {
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-      "dev": true
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
     },
     "no-case": {
       "version": "3.0.4",
@@ -6667,8 +20908,7 @@
     "node-releases": {
       "version": "2.0.8",
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.8.tgz",
-      "integrity": "sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A==",
-      "dev": true
+      "integrity": "sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A=="
     },
     "normalize-package-data": {
       "version": "3.0.3",
@@ -7325,13 +21565,15 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz",
       "integrity": "sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-gap-properties": {
       "version": "3.0.5",
       "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.5.tgz",
       "integrity": "sha512-IuE6gKSdoUNcvkGIqdtjtcMtZIFyXZhmFd5RUlg97iVEvp1BZKV5ngsAjCjrVy+14uhGBQl9tzmi1Qwq4kqVOg==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-image-set-function": {
       "version": "4.0.7",
@@ -7346,7 +21588,8 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-4.0.1.tgz",
       "integrity": "sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-lab-function": {
       "version": "4.2.1",
@@ -7399,13 +21642,15 @@
       "version": "5.0.4",
       "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-5.0.4.tgz",
       "integrity": "sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-media-minmax": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz",
       "integrity": "sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-media-query-parser": {
       "version": "0.2.3",
@@ -7417,7 +21662,8 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
       "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-modules-local-by-default": {
       "version": "4.0.0",
@@ -7462,7 +21708,8 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/postcss-opacity-percentage/-/postcss-opacity-percentage-1.1.3.tgz",
       "integrity": "sha512-An6Ba4pHBiDtyVpSLymUUERMo2cU7s+Obz6BTrS+gxkbnSBNKSuD0AVUc+CpBMrpVPKKfoVz0WQCX+Tnst0i4A==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-overflow-shorthand": {
       "version": "3.0.4",
@@ -7477,7 +21724,8 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-3.0.4.tgz",
       "integrity": "sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-place": {
       "version": "7.0.5",
@@ -7558,7 +21806,8 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz",
       "integrity": "sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-resolve-nested-selector": {
       "version": "0.1.1",
@@ -7570,13 +21819,15 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz",
       "integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-scss": {
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.6.tgz",
       "integrity": "sha512-rLDPhJY4z/i4nVFZ27j9GqLxj1pwxE80eAzUNRMXtcpipFYIeowerzBgG3yJhMtObGEXidtIgbUpQ3eLDsf5OQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-selector-not": {
       "version": "6.0.1",
@@ -7601,7 +21852,8 @@
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-7.0.1.tgz",
       "integrity": "sha512-iLBFYz6VRYyLJEJsBJ8M3TCqNcckVzz4wFounSc5Oez35ogE/X+aoC5fFu103Ot7NyvjU3/xqIXn93Gp3kJk4g==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-value-parser": {
       "version": "4.2.0",
@@ -8789,6 +23041,15 @@
         "xtend": "^4.0.0"
       }
     },
+    "string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
     "string-width": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -8822,15 +23083,6 @@
         "es-abstract": "^1.20.4"
       }
     },
-    "string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
     "strip-ansi": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
@@ -8877,7 +23129,8 @@
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.1.tgz",
       "integrity": "sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "style-search": {
       "version": "0.1.0",
@@ -8968,7 +23221,8 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-7.0.0.tgz",
       "integrity": "sha512-yGn84Bf/q41J4luis1AZ95gj0EQwRX8lWmGmBwkwBNSkpGSpl66XcPTulxGa/Z91aPoNGuIGBmFkcM1MejMo9Q==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "stylelint-config-recommended-scss": {
       "version": "5.0.2",
@@ -8985,7 +23239,8 @@
           "version": "6.0.0",
           "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-6.0.0.tgz",
           "integrity": "sha512-ZorSSdyMcxWpROYUvLEMm0vSZud2uB7tX1hzBZwvVY9SV/uly4AvvJPPhCcymZL3fcQhEQG5AELmrxWqtmzacw==",
-          "dev": true
+          "dev": true,
+          "requires": {}
         }
       }
     },
@@ -9012,7 +23267,8 @@
           "version": "6.0.0",
           "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-6.0.0.tgz",
           "integrity": "sha512-ZorSSdyMcxWpROYUvLEMm0vSZud2uB7tX1hzBZwvVY9SV/uly4AvvJPPhCcymZL3fcQhEQG5AELmrxWqtmzacw==",
-          "dev": true
+          "dev": true,
+          "requires": {}
         },
         "stylelint-config-standard": {
           "version": "24.0.0",
@@ -9166,8 +23422,7 @@
     "tapable": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
-      "dev": true
+      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="
     },
     "terser": {
       "version": "5.16.1",
@@ -9573,7 +23828,6 @@
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
       "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
-      "dev": true,
       "requires": {
         "escalade": "^3.1.1",
         "picocolors": "^1.0.0"
@@ -9932,7 +24186,6 @@
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
       "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
-      "dev": true,
       "requires": {
         "glob-to-regexp": "^0.4.1",
         "graceful-fs": "^4.1.2"
@@ -9957,7 +24210,6 @@
       "version": "5.75.0",
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz",
       "integrity": "sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==",
-      "dev": true,
       "requires": {
         "@types/eslint-scope": "^3.7.3",
         "@types/estree": "^0.0.51",
@@ -9989,7 +24241,6 @@
           "version": "5.12.0",
           "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz",
           "integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==",
-          "dev": true,
           "requires": {
             "graceful-fs": "^4.2.4",
             "tapable": "^2.2.0"
@@ -9999,7 +24250,6 @@
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
           "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-          "dev": true,
           "requires": {
             "@types/json-schema": "^7.0.8",
             "ajv": "^6.12.5",
@@ -10009,8 +24259,7 @@
         "webpack-sources": {
           "version": "3.2.3",
           "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-          "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
-          "dev": true
+          "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w=="
         }
       }
     },
@@ -10390,7 +24639,8 @@
       "version": "8.11.0",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
       "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "xml-name-validator": {
       "version": "4.0.0",

From 6884659a07e0c48e3baa764fb2f69ddb58dd825c Mon Sep 17 00:00:00 2001
From: jevgenijvisockij <jevgenij.visockij@gmail.com>
Date: Thu, 13 Apr 2023 15:24:09 +0300
Subject: [PATCH 0943/1030]  Adding behat tests

---
 .../Domain/AttributeGroupFeatureContext.php   | 144 +++++++++++++++++-
 .../attribute_group_management.feature        |  32 ++++
 tests/Integration/Behaviour/behat.yml         |   9 ++
 3 files changed, 184 insertions(+), 1 deletion(-)
 create mode 100644 tests/Integration/Behaviour/Features/Scenario/AttributeGroup/attribute_group_management.feature

diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
index 0d18a72a9a816..b1d847a8eb466 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
@@ -30,15 +30,113 @@
 
 use Behat\Gherkin\Node\TableNode;
 use PHPUnit\Framework\Assert;
-use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Query\GetAttributeGroupList;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\AddAttributeGroupCommand;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\EditAttributeGroupCommand;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Query\GetAttributeGroupForEditing;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupId;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\QueryResult\AttributeGroup;
 use PrestaShop\PrestaShop\Core\Domain\Product\AttributeGroup\Query\GetProductAttributeGroups;
 use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopConstraint;
 use RuntimeException;
+use Tests\Integration\Behaviour\Features\Context\CommonFeatureContext;
+use Tests\Integration\Behaviour\Features\Context\SharedStorage;
+use Tests\Integration\Behaviour\Features\Context\Util\NoExceptionAlthoughExpectedException;
 use Tests\Integration\Behaviour\Features\Context\Util\PrimitiveUtils;
 
 class AttributeGroupFeatureContext extends AbstractDomainFeatureContext
 {
+    /**
+     * @var int default language id from configs
+     */
+    private $defaultLangId;
+
+    /**
+     * @var int default shop id from configs
+     */
+    private $defaultShopId;
+
+    public function __construct()
+    {
+        $configuration = CommonFeatureContext::getContainer()->get('prestashop.adapter.legacy.configuration');
+        $this->defaultLangId = $configuration->get('PS_LANG_DEFAULT');
+        $this->defaultShopId = $configuration->get('PS_SHOP_DEFAULT');
+    }
+
+    /**
+     * @When I create attribute group :reference with specified properties:
+     */
+    public function createAttributeGroup(string $reference, TableNode $node): void
+    {
+        $properties = $node->getRowsHash();
+        $attributeGroupId = $this->createAttributeGroupUsingCommand($properties['name'], $properties['public_name'], $properties['type']);
+
+        $this->getSharedStorage()->set($reference, $attributeGroupId->getValue());
+    }
+
+    /**
+     * @When I edit attribute group :reference with specified properties:
+     */
+    public function editAttributeGroup(string $reference, TableNode $node): void
+    {
+        $attributeGroupId = SharedStorage::getStorage()->get($reference);
+
+        $properties = $node->getRowsHash();
+        $this->editAttributeGroupUsingCommand($attributeGroupId, $properties['name'], $properties['public_name'], $properties['type']);
+    }
+
+    /**
+     * @When I delete attribute group :reference
+     */
+    public function deleteManufacturer(string $reference): void
+    {
+        $attributeGroupId = SharedStorage::getStorage()->get($reference);
+
+        $this->getCommandBus()->handle(new DeleteAttributeGroupCommand($attributeGroupId));
+    }
+
+    /**
+     * @Then attribute group :reference should be deleted
+     */
+    public function assertAttributeGroupIsDeleted(string $reference): void
+    {
+        $attributeGroupId = SharedStorage::getStorage()->get($reference);
+
+        try {
+            $this->getQueryBus()->handle(new GetAttributeGroupForEditing($attributeGroupId));
+
+            throw new NoExceptionAlthoughExpectedException(sprintf('Attribute group %s exists, but it was expected to be deleted', $reference));
+        } catch (AttributeGroupNotFoundException $e) {
+            SharedStorage::getStorage()->clear($reference);
+        }
+    }
+
+
+    /**
+     * @Then attribute group :reference :field should be :value
+     */
+    public function assertFieldValue(string $reference, string $field, string $value): void
+    {
+        $attributeGroupId = SharedStorage::getStorage()->get($reference);
+        $attributeGroup = new \AttributeGroup($attributeGroupId);
+
+        if ($attributeGroup->$field !== $value) {
+            throw new RuntimeException(sprintf('Attribute group "%s" has "%s" %s, but "%s" was expected.', $reference, $attributeGroup->$field, $field, $value));
+        }
+    }
+
+    /**
+     * @Then attribute group :reference :field in default language should be :value
+     */
+    public function assertFieldWithLangValue(string $reference, string $field, string $value): void
+    {
+        $attributeGroupId = SharedStorage::getStorage()->get($reference);
+        $attributeGroup = new \AttributeGroup($attributeGroupId);
+
+        if ($attributeGroup->$field[$this->defaultLangId] !== $value) {
+            throw new RuntimeException(sprintf('Attribute group "%s" has "%s" %s, but "%s" was expected.', $reference, $attributeGroup->$field[$this->defaultLangId], $field, $value));
+        }
+    }
+
     /**
      * @Given there is a list of following attribute groups:
      *
@@ -421,4 +519,48 @@ private function performAttributesInGroupAssertion(?TableNode $tableNode, array
             Assert::assertEquals($expectedId, $attribute->getAttributeId());
         }
     }
+
+    /**
+     * @param string $nameInDefaultLanguage
+     * @param string $publicNameInDefaultLanguage
+     * @param string $type
+     * @return AttributeGroupId
+     * @throws \PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupConstraintException
+     */
+    private function createAttributeGroupUsingCommand(string $nameInDefaultLanguage, string $publicNameInDefaultLanguage, string $type): AttributeGroupId
+    {
+        $command = new AddAttributeGroupCommand(
+            [$this->defaultLangId => $nameInDefaultLanguage],
+            [$this->defaultLangId => $publicNameInDefaultLanguage],
+            $type,
+            [$this->defaultShopId]
+        );
+
+        return $this->getCommandBus()->handle($command);
+    }
+
+    /**
+     * @param string $nameInDefaultLanguage
+     * @param string $publicNameInDefaultLanguage
+     * @param string $type
+     * @return AttributeGroupId
+     * @throws \PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupConstraintException
+     */
+    private function editAttributeGroupUsingCommand(
+        int $attributeGroupId,
+        string $nameInDefaultLanguage,
+        string $publicNameInDefaultLanguage,
+        string $type
+    ): AttributeGroupId
+    {
+        $command = new EditAttributeGroupCommand(
+            $attributeGroupId,
+            [$this->defaultLangId => $nameInDefaultLanguage],
+            [$this->defaultLangId => $publicNameInDefaultLanguage],
+            $type,
+            [$this->defaultShopId]
+        );
+
+        return $this->getCommandBus()->handle($command);
+    }
 }
diff --git a/tests/Integration/Behaviour/Features/Scenario/AttributeGroup/attribute_group_management.feature b/tests/Integration/Behaviour/Features/Scenario/AttributeGroup/attribute_group_management.feature
new file mode 100644
index 0000000000000..616dbf85fb39e
--- /dev/null
+++ b/tests/Integration/Behaviour/Features/Scenario/AttributeGroup/attribute_group_management.feature
@@ -0,0 +1,32 @@
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s attribute_group
+@restore-all-tables-before-feature
+@feature-management
+Feature: Attribute group management
+  PrestaShop allows BO users to manage product attribute groups
+  As a BO user
+  I must be able to create, edit and delete product features
+
+  Background:
+    Given shop "shop1" with name "test_shop" exists
+
+  Scenario: Adding new attribute group
+    When I create attribute group "attributeGroup1" with specified properties:
+      | name        | Color        |
+      | public_name | Public color |
+      | type        | radio        |
+    Then attribute group "attributeGroup1" "name" in default language should be "Color"
+    And attribute group "attributeGroup1" "public_name" in default language should be "Public color"
+    And attribute group "attributeGroup1" "group_type" should be "radio"
+
+  Scenario: Editing attribute group
+    When I edit attribute group "attributeGroup1" with specified properties:
+      | name        | Colour        |
+      | public_name | Public colour |
+      | type        | color         |
+    Then attribute group "attributeGroup1" "name" in default language should be "Colour"
+    And attribute group "attributeGroup1" "public_name" in default language should be "Public colour"
+    And attribute group "attributeGroup1" "group_type" should be "color"
+
+  Scenario: Deleting attribute group
+    When I delete attribute group "attributeGroup1"
+    Then attribute group "attributeGroup1" should be deleted
diff --git a/tests/Integration/Behaviour/behat.yml b/tests/Integration/Behaviour/behat.yml
index 1808974f40321..67f2f75440b1f 100644
--- a/tests/Integration/Behaviour/behat.yml
+++ b/tests/Integration/Behaviour/behat.yml
@@ -326,6 +326,15 @@ default:
                 - Tests\Integration\Behaviour\Features\Context\LanguageFeatureContext
                 - Tests\Integration\Behaviour\Features\Context\ShopFeatureContext
                 - Tests\Integration\Behaviour\Features\Transform\LocalizedArrayTransformContext
+        attribute_group:
+          paths:
+            - "%paths.base%/Features/Scenario/AttributeGroup"
+          contexts:
+            - Tests\Integration\Behaviour\Features\Context\CommonFeatureContext
+            - Tests\Integration\Behaviour\Features\Context\Domain\AttributeGroupFeatureContext
+            - Tests\Integration\Behaviour\Features\Context\LanguageFeatureContext
+            - Tests\Integration\Behaviour\Features\Context\ShopFeatureContext
+            - Tests\Integration\Behaviour\Features\Transform\LocalizedArrayTransformContext
         order_message:
             paths:
                 - "%paths.base%/Features/Scenario/OrderMessage"

From fff3f770bc96062c3bf9efa3fb15a40b760e646f Mon Sep 17 00:00:00 2001
From: jevgenijvisockij <jevgenij.visockij@gmail.com>
Date: Fri, 24 Feb 2023 09:28:54 +0200
Subject: [PATCH 0944/1030] Removed unneeded AttributeType.php

---
 .../AttributeGroup/AttributeGroupSettings.php | 38 +++++++++
 .../AttributeGroupFormDataProvider.php        |  3 +-
 .../Admin/Sell/Catalog/AttributeGroupType.php |  7 +-
 .../Form/Admin/Sell/Catalog/AttributeType.php | 84 -------------------
 .../Domain/AttributeGroupFeatureContext.php   | 12 ++-
 5 files changed, 52 insertions(+), 92 deletions(-)
 create mode 100644 src/Core/AttributeGroup/AttributeGroupSettings.php
 delete mode 100644 src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeType.php

diff --git a/src/Core/AttributeGroup/AttributeGroupSettings.php b/src/Core/AttributeGroup/AttributeGroupSettings.php
new file mode 100644
index 0000000000000..6dcfa49594a71
--- /dev/null
+++ b/src/Core/AttributeGroup/AttributeGroupSettings.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\AttributeGroup;
+
+class AttributeGroupSettings
+{
+    public const ATTRIBUTE_GROUP_TYPE_SELECT = 'select';
+
+    public const ATTRIBUTE_GROUP_TYPE_RADIO = 'radio';
+
+    public const ATTRIBUTE_GROUP_TYPE_COLOR = 'color';
+}
diff --git a/src/Core/Form/IdentifiableObject/DataProvider/AttributeGroupFormDataProvider.php b/src/Core/Form/IdentifiableObject/DataProvider/AttributeGroupFormDataProvider.php
index 2d78d4007554e..322be37e7f545 100644
--- a/src/Core/Form/IdentifiableObject/DataProvider/AttributeGroupFormDataProvider.php
+++ b/src/Core/Form/IdentifiableObject/DataProvider/AttributeGroupFormDataProvider.php
@@ -28,6 +28,7 @@
 
 namespace PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataProvider;
 
+use PrestaShop\PrestaShop\Core\AttributeGroup\AttributeGroupSettings;
 use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Query\GetAttributeGroupForEditing;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\QueryResult\EditableAttributeGroup;
@@ -64,7 +65,7 @@ public function getData($id)
     public function getDefaultData()
     {
         return [
-
+            'group_type' => AttributeGroupSettings::ATTRIBUTE_GROUP_TYPE_SELECT
         ];
     }
 }
diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeGroupType.php b/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeGroupType.php
index 5a59adf7c99f5..9955e7df67ef5 100644
--- a/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeGroupType.php
+++ b/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeGroupType.php
@@ -28,6 +28,7 @@
 
 namespace PrestaShopBundle\Form\Admin\Sell\Catalog;
 
+use PrestaShop\PrestaShop\Core\AttributeGroup\AttributeGroupSettings;
 use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\TypedRegex;
 use PrestaShop\PrestaShop\Core\ConstraintValidator\TypedRegexValidator;
 use PrestaShopBundle\Form\Admin\Type\ShopChoiceTreeType;
@@ -71,9 +72,9 @@ public function __construct(
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $attributeTypes = [
-            $this->trans('Drop-down list', 'Admin.Global') => 'select',
-            $this->trans('Radio buttons', 'Admin.Global') => 'radio',
-            $this->trans('Color or texture', 'Admin.Catalog.Feature') => 'color',
+            $this->trans('Drop-down list', 'Admin.Global') => AttributeGroupSettings::ATTRIBUTE_GROUP_TYPE_SELECT,
+            $this->trans('Radio buttons', 'Admin.Global') => AttributeGroupSettings::ATTRIBUTE_GROUP_TYPE_RADIO,
+            $this->trans('Color or texture', 'Admin.Catalog.Feature') => AttributeGroupSettings::ATTRIBUTE_GROUP_TYPE_COLOR,
         ];
 
         $builder->add('name', TranslatableType::class, [
diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeType.php b/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeType.php
deleted file mode 100644
index 66178034de4e3..0000000000000
--- a/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeType.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-namespace PrestaShopBundle\Form\Admin\Sell\Address;
-
-use PrestaShopBundle\Form\Admin\Type\TranslatorAwareType;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Contracts\Translation\TranslatorInterface;
-
-/**
- * Form type for attribute add/edit
- */
-class AttributeType extends TranslatorAwareType
-{
-    private $attributeTypes;
-
-    /**
-     * AttributeType constructor
-     *
-     * @param TranslatorInterface $translator
-     * @param array $locales
-     */
-    public function __construct(
-        TranslatorInterface $translator,
-        array $locales,
-        array $attributeTypes
-    ) {
-        parent::__construct($translator, $locales);
-        $this->attributeTypes = $attributeTypes;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function buildForm(FormBuilderInterface $builder, array $options)
-    {
-        $builder->add('name', TextType::class, [
-            'label' => $this->trans('Name', 'Admin.Global'),
-            'help' => $this->trans('Your internal name for this attribute.', 'Admin.Catalog.Help') . '&nbsp;' . $this->trans('Invalid characters:', 'Admin.Notifications.Info') . ' <>;=#{}',
-            ])
-            ->add('public_name', TextType::class, [
-                'label' => $this->trans('Name', 'Admin.Catalog.Feature'),
-                'help' => $this->trans('The public name for this attribute, displayed to the customers.', 'Admin.Catalog.Help') . '&nbsp;' . $this->trans('Invalid characters:', 'Admin.Notifications.Info') . ' <>;=#{}',
-            ])
-            ->add('attribute_type', ChoiceType::class, [
-                'label' => $this->trans('Attribute type', 'Admin.Catalog.Feature'),
-                'help' => $this->trans('The way the attribute\'s values will be presented to the customers in the product\'s page.', 'Admin.Catalog.Help'),
-                'choices' => $this->attributeTypes,
-            ]);
-    }
-
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefaults([
-            'requiredFields' => [],
-        ]);
-    }
-}
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
index b1d847a8eb466..97bf015ee66fd 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
@@ -32,6 +32,7 @@
 use PHPUnit\Framework\Assert;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\AddAttributeGroupCommand;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\EditAttributeGroupCommand;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupConstraintException;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Query\GetAttributeGroupForEditing;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupId;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\QueryResult\AttributeGroup;
@@ -110,7 +111,6 @@ public function assertAttributeGroupIsDeleted(string $reference): void
         }
     }
 
-
     /**
      * @Then attribute group :reference :field should be :value
      */
@@ -524,7 +524,9 @@ private function performAttributesInGroupAssertion(?TableNode $tableNode, array
      * @param string $nameInDefaultLanguage
      * @param string $publicNameInDefaultLanguage
      * @param string $type
+     *
      * @return AttributeGroupId
+     *
      * @throws \PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupConstraintException
      */
     private function createAttributeGroupUsingCommand(string $nameInDefaultLanguage, string $publicNameInDefaultLanguage, string $type): AttributeGroupId
@@ -540,19 +542,21 @@ private function createAttributeGroupUsingCommand(string $nameInDefaultLanguage,
     }
 
     /**
+     * @param int $attributeGroupId
      * @param string $nameInDefaultLanguage
      * @param string $publicNameInDefaultLanguage
      * @param string $type
+     *
      * @return AttributeGroupId
-     * @throws \PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupConstraintException
+     *
+     * @throws AttributeGroupConstraintException
      */
     private function editAttributeGroupUsingCommand(
         int $attributeGroupId,
         string $nameInDefaultLanguage,
         string $publicNameInDefaultLanguage,
         string $type
-    ): AttributeGroupId
-    {
+    ): AttributeGroupId {
         $command = new EditAttributeGroupCommand(
             $attributeGroupId,
             [$this->defaultLangId => $nameInDefaultLanguage],

From a4cff1838ac8de7b54eba947ba09772e2840ef62 Mon Sep 17 00:00:00 2001
From: jevgenijvisockij <jevgenij.visockij@gmail.com>
Date: Fri, 24 Feb 2023 09:31:33 +0200
Subject: [PATCH 0945/1030] Fixed form type

---
 .../Resources/config/services/bundle/form/form_type.yml         | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
index c1d603d0a6715..8769c72e2296f 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
@@ -433,11 +433,9 @@ services:
   PrestaShopBundle\Form\Admin\Sell\Catalog\FeatureType: ~
   PrestaShopBundle\Form\Admin\Sell\Catalog\FeatureValueType: ~
   PrestaShopBundle\Form\Admin\Sell\Catalog\AttributeGroupType:
-    autowire: true
     public: true
     arguments:
       - '@=service("prestashop.adapter.multistore_feature").isActive()'
-    parent: 'form.type.translatable.aware'
     tags:
       - { name: form.type }
 

From ddad35232e7ad7dbe5f771bb07b1bbb548d2cf00 Mon Sep 17 00:00:00 2001
From: jevgenijvisockij <jevgenij.visockij@gmail.com>
Date: Fri, 24 Feb 2023 09:37:45 +0200
Subject: [PATCH 0946/1030] PHP stan fixes

---
 .../AddAttributeGroupHandlerInterface.php     |  2 +-
 .../Sell/Catalog/AttributeController.php      | 32 -------------------
 .../Sell/Catalog/AttributeGroupController.php |  2 +-
 3 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/src/Core/Domain/AttributeGroup/CommandHandler/AddAttributeGroupHandlerInterface.php b/src/Core/Domain/AttributeGroup/CommandHandler/AddAttributeGroupHandlerInterface.php
index c453eb415c852..03ad7b7125b70 100644
--- a/src/Core/Domain/AttributeGroup/CommandHandler/AddAttributeGroupHandlerInterface.php
+++ b/src/Core/Domain/AttributeGroup/CommandHandler/AddAttributeGroupHandlerInterface.php
@@ -37,7 +37,7 @@ interface AddAttributeGroupHandlerInterface
     /**
      * @param AddAttributeGroupCommand $command
      *
-     * @return void id of the created attribute group
+     * @return AttributeGroupId
      */
     public function handle(AddAttributeGroupCommand $command): AttributeGroupId;
 }
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeController.php
index a8353c04f605d..75c44fd77da33 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeController.php
@@ -140,38 +140,6 @@ public function updatePositionAction(Request $request, int $attributeGroupId)
      */
     public function createAction(int $attributeGroupId)
     {
-        $categoryFormBuilder = $this->get('prestashop.core.form.identifiable_object.builder.category_form_builder');
-        $categoryFormHandler = $this->get('prestashop.core.form.identifiable_object.handler.category_form_handler');
-
-        $categoryForm = $categoryFormBuilder->getForm(['id_parent' => $parentId]);
-        $categoryForm->handleRequest($request);
-
-        try {
-            $handlerResult = $categoryFormHandler->handle($categoryForm);
-
-            if (null !== $handlerResult->getIdentifiableObjectId()) {
-                $this->addFlash('success', $this->trans('Successful creation', 'Admin.Notifications.Success'));
-
-                return $this->redirectToRoute('admin_categories_index', [
-                    'categoryId' => $categoryForm->getData()['id_parent'],
-                ]);
-            }
-        } catch (Exception $e) {
-            $this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages()));
-        }
-
-        $defaultGroups = $this->get('prestashop.adapter.group.provider.default_groups_provider')->getGroups();
-
-        return $this->render(
-            '@PrestaShop/Admin/Sell/Catalog/Categories/create.html.twig',
-            [
-                'allowMenuThumbnailsUpload' => true,
-                'categoryForm' => $categoryForm->createView(),
-                'defaultGroups' => $defaultGroups,
-                'categoryUrl' => null,
-            ]
-        );
-
         // @todo: implement in another pr
         return $this->redirectToRoute('admin_attributes_index', [
             'attributeGroupId' => $attributeGroupId,
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php
index 5bc278c692c17..347a75b13f891 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php
@@ -124,7 +124,7 @@ public function createAction(Request $request): Response
      *
      * @param int $attributeGroupId
      *
-     * @return RedirectResponse
+     * @return Response
      */
     public function editAction(Request $request, int $attributeGroupId): Response
     {

From d82bfa23e5a6c8ac61c21380d273052683cb91b0 Mon Sep 17 00:00:00 2001
From: jevgenijvisockij <jevgenij.visockij@gmail.com>
Date: Fri, 24 Feb 2023 09:50:44 +0200
Subject: [PATCH 0947/1030] Fixed template

---
 .../Resources/config/services/bundle/form/form_type.yml         | 2 +-
 .../views/Admin/Sell/Catalog/AttributeGroup/edit.html.twig      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
index 8769c72e2296f..b0a616b413922 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
@@ -435,7 +435,7 @@ services:
   PrestaShopBundle\Form\Admin\Sell\Catalog\AttributeGroupType:
     public: true
     arguments:
-      - '@=service("prestashop.adapter.multistore_feature").isActive()'
+      $isMultistoreEnabled: '@=service("prestashop.adapter.multistore_feature").isActive()'
     tags:
       - { name: form.type }
 
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/edit.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/edit.html.twig
index 82f67a02fec69..fd4cde056aa90 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/edit.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/edit.html.twig
@@ -36,5 +36,5 @@
 
 {% block javascripts %}
   {{ parent() }}
-  {% include '@PrestaShop/Admin/Sell/Catalog/Attribute/Blocks/form_javascripts.html.twig' %}
+  {% include '@PrestaShop/Admin/Sell/Catalog/AttributeGroup/Blocks/form_javascripts.html.twig' %}
 {% endblock %}

From 52abd991f213f1b7f9af01e5dc8e86661cd802fd Mon Sep 17 00:00:00 2001
From: jevgenijvisockij <jevgenij.visockij@gmail.com>
Date: Thu, 13 Apr 2023 15:24:41 +0300
Subject: [PATCH 0948/1030] CS fixer fix

---
 .../DataProvider/AttributeGroupFormDataProvider.php            | 2 +-
 .../Features/Context/Domain/AttributeGroupFeatureContext.php   | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Core/Form/IdentifiableObject/DataProvider/AttributeGroupFormDataProvider.php b/src/Core/Form/IdentifiableObject/DataProvider/AttributeGroupFormDataProvider.php
index 322be37e7f545..9eaa68bd711cc 100644
--- a/src/Core/Form/IdentifiableObject/DataProvider/AttributeGroupFormDataProvider.php
+++ b/src/Core/Form/IdentifiableObject/DataProvider/AttributeGroupFormDataProvider.php
@@ -65,7 +65,7 @@ public function getData($id)
     public function getDefaultData()
     {
         return [
-            'group_type' => AttributeGroupSettings::ATTRIBUTE_GROUP_TYPE_SELECT
+            'group_type' => AttributeGroupSettings::ATTRIBUTE_GROUP_TYPE_SELECT,
         ];
     }
 }
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
index 97bf015ee66fd..a9632cc4579c1 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
@@ -36,6 +36,9 @@
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Query\GetAttributeGroupForEditing;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupId;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\QueryResult\AttributeGroup;
+use PrestaShop\PrestaShop\Core\Domain\Product\AttributeGroup\Command\DeleteAttributeGroupCommand;
+use PrestaShop\PrestaShop\Core\Domain\Product\AttributeGroup\Exception\AttributeGroupNotFoundException;
+use PrestaShop\PrestaShop\Core\Domain\Product\AttributeGroup\Query\GetAttributeGroupList;
 use PrestaShop\PrestaShop\Core\Domain\Product\AttributeGroup\Query\GetProductAttributeGroups;
 use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopConstraint;
 use RuntimeException;

From 7bf4547d710d4bab6dddc17d254b00704eb5472a Mon Sep 17 00:00:00 2001
From: jevgenijvisockij <jevgenij.visockij@gmail.com>
Date: Thu, 13 Apr 2023 15:25:26 +0300
Subject: [PATCH 0949/1030] Added attribute group type for validation

---
 .../AddAttributeGroupHandler.php              |  2 +-
 .../EditAttributeGroupHandler.php             |  2 +-
 .../Command/AddAttributeGroupCommand.php      | 11 ++-
 .../Command/EditAttributeGroupCommand.php     |  9 +-
 .../InvalidAttributeGroupTypeException.php}   |  9 +-
 .../ValueObject/AttributeGroupType.php        | 86 +++++++++++++++++++
 .../AttributeGroupFormDataHandler.php         |  5 +-
 .../AttributeGroupFormDataProvider.php        |  4 +-
 .../Admin/Sell/Catalog/AttributeGroupType.php |  8 +-
 .../Domain/AttributeGroupFeatureContext.php   | 10 ++-
 10 files changed, 117 insertions(+), 29 deletions(-)
 rename src/Core/{AttributeGroup/AttributeGroupSettings.php => Domain/AttributeGroup/Exception/InvalidAttributeGroupTypeException.php} (81%)
 create mode 100644 src/Core/Domain/AttributeGroup/ValueObject/AttributeGroupType.php

diff --git a/src/Adapter/AttributeGroup/CommandHandler/AddAttributeGroupHandler.php b/src/Adapter/AttributeGroup/CommandHandler/AddAttributeGroupHandler.php
index 9887f8c09ebbf..05a89e00bc613 100644
--- a/src/Adapter/AttributeGroup/CommandHandler/AddAttributeGroupHandler.php
+++ b/src/Adapter/AttributeGroup/CommandHandler/AddAttributeGroupHandler.php
@@ -49,7 +49,7 @@ public function handle(AddAttributeGroupCommand $command): AttributeGroupId
 
         $attributeGroup->name = $command->getLocalizedNames();
         $attributeGroup->public_name = $command->getLocalizedPublicNames();
-        $attributeGroup->group_type = $command->getType();
+        $attributeGroup->group_type = $command->getType()->getValue();
 
         if (false === $attributeGroup->validateFields(false)) {
             throw new AttributeGroupConstraintException('Invalid attribute data');
diff --git a/src/Adapter/AttributeGroup/CommandHandler/EditAttributeGroupHandler.php b/src/Adapter/AttributeGroup/CommandHandler/EditAttributeGroupHandler.php
index a41875a666e25..f69b0f0ea3fd0 100644
--- a/src/Adapter/AttributeGroup/CommandHandler/EditAttributeGroupHandler.php
+++ b/src/Adapter/AttributeGroup/CommandHandler/EditAttributeGroupHandler.php
@@ -49,7 +49,7 @@ public function handle(EditAttributeGroupCommand $command): AttributeGroupId
 
         $attributeGroup->name = $command->getLocalizedNames();
         $attributeGroup->public_name = $command->getLocalizedPublicNames();
-        $attributeGroup->group_type = $command->getType();
+        $attributeGroup->group_type = $command->getType()->getValue();
 
         if (false === $attributeGroup->validateFields(false)) {
             throw new AttributeGroupConstraintException('Invalid attribute data');
diff --git a/src/Core/Domain/AttributeGroup/Command/AddAttributeGroupCommand.php b/src/Core/Domain/AttributeGroup/Command/AddAttributeGroupCommand.php
index 169453a8b3036..19f82ce97e3e2 100644
--- a/src/Core/Domain/AttributeGroup/Command/AddAttributeGroupCommand.php
+++ b/src/Core/Domain/AttributeGroup/Command/AddAttributeGroupCommand.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command;
 
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupConstraintException;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupType;
 
 /**
  * Adds new attribute group
@@ -51,17 +52,19 @@ class AddAttributeGroupCommand
     private $localizedPublicNames;
 
     /**
-     * @var string
+     * @var AttributeGroupType
      */
     private $type;
 
     /**
      * @param string[] $localizedNames
+     * @param array $localizedPublicNames
+     * @param AttributeGroupType $type
      * @param int[] $shopAssociation
      *
      * @throws AttributeGroupConstraintException
      */
-    public function __construct(array $localizedNames, array $localizedPublicNames, string $type, array $shopAssociation = [])
+    public function __construct(array $localizedNames, array $localizedPublicNames, AttributeGroupType $type, array $shopAssociation = [])
     {
         $this->assertNamesAreValid($localizedNames);
         $this->assertNamesAreValid($localizedPublicNames);
@@ -89,9 +92,9 @@ public function getLocalizedPublicNames(): array
     }
 
     /**
-     * @return string
+     * @return AttributeGroupType
      */
-    public function getType(): string
+    public function getType(): AttributeGroupType
     {
         return $this->type;
     }
diff --git a/src/Core/Domain/AttributeGroup/Command/EditAttributeGroupCommand.php b/src/Core/Domain/AttributeGroup/Command/EditAttributeGroupCommand.php
index a57cb9d401a26..9fd959e5cc611 100644
--- a/src/Core/Domain/AttributeGroup/Command/EditAttributeGroupCommand.php
+++ b/src/Core/Domain/AttributeGroup/Command/EditAttributeGroupCommand.php
@@ -30,6 +30,7 @@
 
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupConstraintException;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupId;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupType;
 
 /**
  * Edits existing attribute group
@@ -57,7 +58,7 @@ class EditAttributeGroupCommand
     private $localizedPublicNames;
 
     /**
-     * @var string
+     * @var AttributeGroupType
      */
     private $type;
 
@@ -67,7 +68,7 @@ class EditAttributeGroupCommand
      *
      * @throws AttributeGroupConstraintException
      */
-    public function __construct(int $attributeGroupId, array $localizedNames, array $localizedPublicNames, string $type, array $shopAssociation = [])
+    public function __construct(int $attributeGroupId, array $localizedNames, array $localizedPublicNames, AttributeGroupType $type, array $shopAssociation = [])
     {
         $this->attributeGroupId = new AttributeGroupId($attributeGroupId);
         $this->assertNamesAreValid($localizedNames);
@@ -104,9 +105,9 @@ public function getLocalizedPublicNames(): array
     }
 
     /**
-     * @return string
+     * @return AttributeGroupType
      */
-    public function getType(): string
+    public function getType(): AttributeGroupType
     {
         return $this->type;
     }
diff --git a/src/Core/AttributeGroup/AttributeGroupSettings.php b/src/Core/Domain/AttributeGroup/Exception/InvalidAttributeGroupTypeException.php
similarity index 81%
rename from src/Core/AttributeGroup/AttributeGroupSettings.php
rename to src/Core/Domain/AttributeGroup/Exception/InvalidAttributeGroupTypeException.php
index 6dcfa49594a71..f6128c234dc23 100644
--- a/src/Core/AttributeGroup/AttributeGroupSettings.php
+++ b/src/Core/Domain/AttributeGroup/Exception/InvalidAttributeGroupTypeException.php
@@ -26,13 +26,8 @@
 
 declare(strict_types=1);
 
-namespace PrestaShop\PrestaShop\Core\AttributeGroup;
+namespace PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception;
 
-class AttributeGroupSettings
+class InvalidAttributeGroupTypeException extends AttributeGroupException
 {
-    public const ATTRIBUTE_GROUP_TYPE_SELECT = 'select';
-
-    public const ATTRIBUTE_GROUP_TYPE_RADIO = 'radio';
-
-    public const ATTRIBUTE_GROUP_TYPE_COLOR = 'color';
 }
diff --git a/src/Core/Domain/AttributeGroup/ValueObject/AttributeGroupType.php b/src/Core/Domain/AttributeGroup/ValueObject/AttributeGroupType.php
new file mode 100644
index 0000000000000..d7b12246a56a6
--- /dev/null
+++ b/src/Core/Domain/AttributeGroup/ValueObject/AttributeGroupType.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject;
+
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\InvalidAttributeGroupTypeException;
+
+/**
+ * Defines Attribute group type with its constraints.
+ */
+class AttributeGroupType
+{
+    public const ATTRIBUTE_GROUP_TYPE_SELECT = 'select';
+    public const ATTRIBUTE_GROUP_TYPE_RADIO = 'radio';
+    public const ATTRIBUTE_GROUP_TYPE_COLOR = 'color';
+
+    /**
+     * @var string
+     */
+    private $type;
+
+    /**
+     * @param string $type
+     *
+     * @throws InvalidAttributeGroupTypeException
+     */
+    public function __construct(string $type)
+    {
+        $this->assertTypeExists($type);
+
+        $this->type = $type;
+    }
+
+    /**
+     * @return string
+     */
+    public function getValue(): string
+    {
+        return $this->type;
+    }
+
+    /**
+     * @param string $type
+     *
+     * @return void
+     *
+     * @throws InvalidAttributeGroupTypeException
+     */
+    private function assertTypeExists(string $type): void
+    {
+        $types = [static::ATTRIBUTE_GROUP_TYPE_COLOR, static::ATTRIBUTE_GROUP_TYPE_SELECT, static::ATTRIBUTE_GROUP_TYPE_RADIO];
+        if (!in_array($type, $types)){
+            throw new InvalidAttributeGroupTypeException(
+                sprintf(
+                    'Invalid attributeGroup type %s supplied.',
+                    $type
+                )
+            );
+        }
+    }
+}
diff --git a/src/Core/Form/IdentifiableObject/DataHandler/AttributeGroupFormDataHandler.php b/src/Core/Form/IdentifiableObject/DataHandler/AttributeGroupFormDataHandler.php
index f69eea1cae143..2cfb6389d0ac1 100644
--- a/src/Core/Form/IdentifiableObject/DataHandler/AttributeGroupFormDataHandler.php
+++ b/src/Core/Form/IdentifiableObject/DataHandler/AttributeGroupFormDataHandler.php
@@ -32,6 +32,7 @@
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\AddAttributeGroupCommand;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\EditAttributeGroupCommand;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupId;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupType;
 
 /**
  * Handles data of submitted Attribute Group form.
@@ -60,7 +61,7 @@ public function create(array $data)
         $attributeGroupId = $this->commandBus->handle(new AddAttributeGroupCommand(
             $data['name'],
             $data['public_name'],
-            $data['group_type'],
+            (new AttributeGroupType($data['group_type'])),
             $data['shop_association'] ?? []
         ));
 
@@ -77,7 +78,7 @@ public function update($id, array $data)
             (int) $id,
             $data['name'],
             $data['public_name'],
-            $data['group_type'],
+            (new AttributeGroupType($data['group_type'])),
             $data['shop_association'] ?? []
         ));
 
diff --git a/src/Core/Form/IdentifiableObject/DataProvider/AttributeGroupFormDataProvider.php b/src/Core/Form/IdentifiableObject/DataProvider/AttributeGroupFormDataProvider.php
index 9eaa68bd711cc..cd1e15c8eecfa 100644
--- a/src/Core/Form/IdentifiableObject/DataProvider/AttributeGroupFormDataProvider.php
+++ b/src/Core/Form/IdentifiableObject/DataProvider/AttributeGroupFormDataProvider.php
@@ -28,10 +28,10 @@
 
 namespace PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataProvider;
 
-use PrestaShop\PrestaShop\Core\AttributeGroup\AttributeGroupSettings;
 use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Query\GetAttributeGroupForEditing;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\QueryResult\EditableAttributeGroup;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupType;
 
 class AttributeGroupFormDataProvider implements FormDataProviderInterface
 {
@@ -65,7 +65,7 @@ public function getData($id)
     public function getDefaultData()
     {
         return [
-            'group_type' => AttributeGroupSettings::ATTRIBUTE_GROUP_TYPE_SELECT,
+            'group_type' => AttributeGroupType::ATTRIBUTE_GROUP_TYPE_SELECT,
         ];
     }
 }
diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeGroupType.php b/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeGroupType.php
index 9955e7df67ef5..22eec2748f608 100644
--- a/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeGroupType.php
+++ b/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeGroupType.php
@@ -28,7 +28,6 @@
 
 namespace PrestaShopBundle\Form\Admin\Sell\Catalog;
 
-use PrestaShop\PrestaShop\Core\AttributeGroup\AttributeGroupSettings;
 use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\TypedRegex;
 use PrestaShop\PrestaShop\Core\ConstraintValidator\TypedRegexValidator;
 use PrestaShopBundle\Form\Admin\Type\ShopChoiceTreeType;
@@ -40,6 +39,7 @@
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Validator\Constraints\NotBlank;
 use Symfony\Contracts\Translation\TranslatorInterface;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupType as GroupType;
 
 /**
  * Form type for attribute add/edit
@@ -72,9 +72,9 @@ public function __construct(
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $attributeTypes = [
-            $this->trans('Drop-down list', 'Admin.Global') => AttributeGroupSettings::ATTRIBUTE_GROUP_TYPE_SELECT,
-            $this->trans('Radio buttons', 'Admin.Global') => AttributeGroupSettings::ATTRIBUTE_GROUP_TYPE_RADIO,
-            $this->trans('Color or texture', 'Admin.Catalog.Feature') => AttributeGroupSettings::ATTRIBUTE_GROUP_TYPE_COLOR,
+            $this->trans('Drop-down list', 'Admin.Global') => GroupType::ATTRIBUTE_GROUP_TYPE_SELECT,
+            $this->trans('Radio buttons', 'Admin.Global') => GroupType::ATTRIBUTE_GROUP_TYPE_RADIO,
+            $this->trans('Color or texture', 'Admin.Catalog.Feature') => GroupType::ATTRIBUTE_GROUP_TYPE_COLOR,
         ];
 
         $builder->add('name', TranslatableType::class, [
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
index a9632cc4579c1..274b1f2af0f32 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
@@ -33,9 +33,11 @@
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\AddAttributeGroupCommand;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\EditAttributeGroupCommand;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupConstraintException;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\InvalidAttributeGroupTypeException;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Query\GetAttributeGroupForEditing;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupId;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\QueryResult\AttributeGroup;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupType;
 use PrestaShop\PrestaShop\Core\Domain\Product\AttributeGroup\Command\DeleteAttributeGroupCommand;
 use PrestaShop\PrestaShop\Core\Domain\Product\AttributeGroup\Exception\AttributeGroupNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Product\AttributeGroup\Query\GetAttributeGroupList;
@@ -530,14 +532,14 @@ private function performAttributesInGroupAssertion(?TableNode $tableNode, array
      *
      * @return AttributeGroupId
      *
-     * @throws \PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupConstraintException
+     * @throws AttributeGroupConstraintException|InvalidAttributeGroupTypeException
      */
     private function createAttributeGroupUsingCommand(string $nameInDefaultLanguage, string $publicNameInDefaultLanguage, string $type): AttributeGroupId
     {
         $command = new AddAttributeGroupCommand(
             [$this->defaultLangId => $nameInDefaultLanguage],
             [$this->defaultLangId => $publicNameInDefaultLanguage],
-            $type,
+            (new AttributeGroupType($type)),
             [$this->defaultShopId]
         );
 
@@ -552,7 +554,7 @@ private function createAttributeGroupUsingCommand(string $nameInDefaultLanguage,
      *
      * @return AttributeGroupId
      *
-     * @throws AttributeGroupConstraintException
+     * @throws AttributeGroupConstraintException|InvalidAttributeGroupTypeException
      */
     private function editAttributeGroupUsingCommand(
         int $attributeGroupId,
@@ -564,7 +566,7 @@ private function editAttributeGroupUsingCommand(
             $attributeGroupId,
             [$this->defaultLangId => $nameInDefaultLanguage],
             [$this->defaultLangId => $publicNameInDefaultLanguage],
-            $type,
+            (new AttributeGroupType($type)),
             [$this->defaultShopId]
         );
 

From eb4caecb5a18e8a1df927d325cf2eb0f713b6a0d Mon Sep 17 00:00:00 2001
From: jevgenijvisockij <jevgenij.visockij@gmail.com>
Date: Thu, 13 Apr 2023 15:27:44 +0300
Subject: [PATCH 0950/1030] Changed to use repository in handlers

---
 .../AddAttributeGroupHandler.php              | 27 ++++----
 .../EditAttributeGroupHandler.php             | 30 ++++-----
 .../GetAttributeGroupForEditingHandler.php    | 42 ++++---------
 .../Repository/AttributeGroupRepository.php   | 62 ++++++++++++++++++-
 .../Validate/AttributeGroupValidator.php      | 51 +++++++++++++++
 .../EditAttributeGroupHandlerInterface.php    |  2 +-
 .../AttributeGroupFormDataHandler.php         |  4 +-
 .../services/adapter/attribute_group.yml      |  3 +
 8 files changed, 155 insertions(+), 66 deletions(-)
 create mode 100644 src/Adapter/AttributeGroup/Validate/AttributeGroupValidator.php

diff --git a/src/Adapter/AttributeGroup/CommandHandler/AddAttributeGroupHandler.php b/src/Adapter/AttributeGroup/CommandHandler/AddAttributeGroupHandler.php
index 05a89e00bc613..7739d4aeb5e3f 100644
--- a/src/Adapter/AttributeGroup/CommandHandler/AddAttributeGroupHandler.php
+++ b/src/Adapter/AttributeGroup/CommandHandler/AddAttributeGroupHandler.php
@@ -28,11 +28,10 @@
 
 namespace PrestaShop\PrestaShop\Adapter\AttributeGroup\CommandHandler;
 
+use PrestaShop\PrestaShop\Adapter\AttributeGroup\Repository\AttributeGroupRepository;
 use PrestaShop\PrestaShop\Adapter\Domain\AbstractObjectModelHandler;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\AddAttributeGroupCommand;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\CommandHandler\AddAttributeGroupHandlerInterface;
-use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupConstraintException;
-use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\CannotAddAttributeGroupException;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupId;
 
 /**
@@ -40,6 +39,16 @@
  */
 final class AddAttributeGroupHandler extends AbstractObjectModelHandler implements AddAttributeGroupHandlerInterface
 {
+    /**
+     * @var AttributeGroupRepository
+     */
+    private $attributeGroupRepository;
+
+    public function __construct(AttributeGroupRepository $attributeGroupRepository)
+    {
+        $this->attributeGroupRepository = $attributeGroupRepository;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -51,20 +60,10 @@ public function handle(AddAttributeGroupCommand $command): AttributeGroupId
         $attributeGroup->public_name = $command->getLocalizedPublicNames();
         $attributeGroup->group_type = $command->getType()->getValue();
 
-        if (false === $attributeGroup->validateFields(false)) {
-            throw new AttributeGroupConstraintException('Invalid attribute data');
-        }
-
-        if (false === $attributeGroup->validateFieldsLang(false)) {
-            throw new AttributeGroupConstraintException('Invalid attribute group data', AttributeGroupConstraintException::INVALID_NAME);
-        }
-
-        if (false === $attributeGroup->add()) {
-            throw new CannotAddAttributeGroupException('Unable to create new attribute group');
-        }
+        $id = $this->attributeGroupRepository->add($attributeGroup);
 
         $this->associateWithShops($attributeGroup, $command->getShopAssociation());
 
-        return new AttributeGroupId((int) $attributeGroup->id);
+        return $id;
     }
 }
diff --git a/src/Adapter/AttributeGroup/CommandHandler/EditAttributeGroupHandler.php b/src/Adapter/AttributeGroup/CommandHandler/EditAttributeGroupHandler.php
index f69b0f0ea3fd0..86fa502f041e5 100644
--- a/src/Adapter/AttributeGroup/CommandHandler/EditAttributeGroupHandler.php
+++ b/src/Adapter/AttributeGroup/CommandHandler/EditAttributeGroupHandler.php
@@ -28,22 +28,30 @@
 
 namespace PrestaShop\PrestaShop\Adapter\AttributeGroup\CommandHandler;
 
+use PrestaShop\PrestaShop\Adapter\AttributeGroup\Repository\AttributeGroupRepository;
 use PrestaShop\PrestaShop\Adapter\Domain\AbstractObjectModelHandler;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\EditAttributeGroupCommand;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\CommandHandler\EditAttributeGroupHandlerInterface;
-use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupConstraintException;
-use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\CannotUpdateAttributeGroupException;
-use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupId;
 
 /**
  * Handles editing of attribute groups using legacy logic.
  */
 final class EditAttributeGroupHandler extends AbstractObjectModelHandler implements EditAttributeGroupHandlerInterface
 {
+    /**
+     * @var AttributeGroupRepository
+     */
+    private $attributeGroupRepository;
+
+    public function __construct(AttributeGroupRepository $attributeGroupRepository)
+    {
+        $this->attributeGroupRepository = $attributeGroupRepository;
+    }
+
     /**
      * {@inheritdoc}
      */
-    public function handle(EditAttributeGroupCommand $command): AttributeGroupId
+    public function handle(EditAttributeGroupCommand $command): void
     {
         $attributeGroup = new \AttributeGroup($command->getAttributeGroupId()->getValue());
 
@@ -51,20 +59,8 @@ public function handle(EditAttributeGroupCommand $command): AttributeGroupId
         $attributeGroup->public_name = $command->getLocalizedPublicNames();
         $attributeGroup->group_type = $command->getType()->getValue();
 
-        if (false === $attributeGroup->validateFields(false)) {
-            throw new AttributeGroupConstraintException('Invalid attribute data');
-        }
-
-        if (false === $attributeGroup->validateFieldsLang(false)) {
-            throw new AttributeGroupConstraintException('Invalid attribute group data', AttributeGroupConstraintException::INVALID_NAME);
-        }
-
-        if (false === $attributeGroup->update()) {
-            throw new CannotUpdateAttributeGroupException('Unable to update attribute group');
-        }
+        $this->attributeGroupRepository->update($attributeGroup);
 
         $this->associateWithShops($attributeGroup, $command->getShopAssociation());
-
-        return new AttributeGroupId((int) $attributeGroup->id);
     }
 }
diff --git a/src/Adapter/AttributeGroup/QueryHandler/GetAttributeGroupForEditingHandler.php b/src/Adapter/AttributeGroup/QueryHandler/GetAttributeGroupForEditingHandler.php
index d5e6f91c53afa..4dbe1d2fd10ea 100644
--- a/src/Adapter/AttributeGroup/QueryHandler/GetAttributeGroupForEditingHandler.php
+++ b/src/Adapter/AttributeGroup/QueryHandler/GetAttributeGroupForEditingHandler.php
@@ -28,26 +28,33 @@
 
 namespace PrestaShop\PrestaShop\Adapter\AttributeGroup\QueryHandler;
 
-use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupException;
+use PrestaShop\PrestaShop\Adapter\AttributeGroup\Repository\AttributeGroupRepository;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Query\GetAttributeGroupForEditing;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\QueryHandler\GetAttributeGroupForEditingHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\QueryResult\EditableAttributeGroup;
-use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupId;
-use PrestaShop\PrestaShop\Core\Domain\Product\AttributeGroup\Exception\AttributeGroupNotFoundException;
-use PrestaShopException;
 
 /**
  * Handles query which gets attribute group for editing
  */
 final class GetAttributeGroupForEditingHandler implements GetAttributeGroupForEditingHandlerInterface
 {
+    /**
+     * @var AttributeGroupRepository
+     */
+    private $attributeGroupRepository;
+
+    public function __construct(AttributeGroupRepository $attributeGroupRepository)
+    {
+        $this->attributeGroupRepository = $attributeGroupRepository;
+    }
+
     /**
      * {@inheritdoc}
      */
     public function handle(GetAttributeGroupForEditing $query): EditableAttributeGroup
     {
         $attributeGroupId = $query->getAttributeGroupId();
-        $attributeGroup = $this->getAttributeGroup($attributeGroupId);
+        $attributeGroup = $this->attributeGroupRepository->get($attributeGroupId);
 
         return new EditableAttributeGroup(
             $attributeGroupId,
@@ -57,29 +64,4 @@ public function handle(GetAttributeGroupForEditing $query): EditableAttributeGro
             $attributeGroup->getAssociatedShops()
         );
     }
-
-    /**
-     * Gets legacy Attribute group
-     *
-     * @param AttributeGroupId $attributeGroupId
-     *
-     * @return \AttributeGroup
-     *
-     * @throws AttributeGroupException
-     * @throws AttributeGroupNotFoundException
-     */
-    protected function getAttributeGroup(AttributeGroupId $attributeGroupId): \AttributeGroup
-    {
-        try {
-            $attributeGroup = new \AttributeGroup($attributeGroupId->getValue());
-        } catch (PrestaShopException $e) {
-            throw new AttributeGroupException('Failed to create new attribute group', 0, $e);
-        }
-
-        if ($attributeGroup->id !== $attributeGroupId->getValue()) {
-            throw new AttributeGroupNotFoundException(sprintf('Attribute group with id "%s" was not found.', $attributeGroupId->getValue()));
-        }
-
-        return $attributeGroup;
-    }
 }
diff --git a/src/Adapter/AttributeGroup/Repository/AttributeGroupRepository.php b/src/Adapter/AttributeGroup/Repository/AttributeGroupRepository.php
index 51290c8a0f8f2..379d2713d6cf6 100644
--- a/src/Adapter/AttributeGroup/Repository/AttributeGroupRepository.php
+++ b/src/Adapter/AttributeGroup/Repository/AttributeGroupRepository.php
@@ -29,11 +29,14 @@
 
 use AttributeGroup;
 use Doctrine\DBAL\Connection;
+use PrestaShop\PrestaShop\Adapter\AttributeGroup\Validate\AttributeGroupValidator;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\CannotAddAttributeGroupException;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupId;
 use PrestaShop\PrestaShop\Core\Domain\Shop\Exception\InvalidShopConstraintException;
 use PrestaShop\PrestaShop\Core\Domain\Shop\Exception\ShopAssociationNotFound;
 use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopConstraint;
 use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopId;
+use PrestaShop\PrestaShop\Core\Exception\CoreException;
 use PrestaShop\PrestaShop\Core\Repository\AbstractMultiShopObjectModelRepository;
 
 class AttributeGroupRepository extends AbstractMultiShopObjectModelRepository
@@ -48,12 +51,69 @@ class AttributeGroupRepository extends AbstractMultiShopObjectModelRepository
      */
     private $dbPrefix;
 
+    /**
+     * @var AttributeGroupValidator
+     */
+    private $validator;
+
     public function __construct(
         Connection $connection,
-        string $dbPrefix
+        string $dbPrefix,
+        AttributeGroupValidator $validator
     ) {
         $this->connection = $connection;
         $this->dbPrefix = $dbPrefix;
+        $this->validator = $validator;
+    }
+
+    /**
+     * @param AttributeGroupId $attributeGroupId
+     *
+     * @return AttributeGroup
+     *
+     * @throws AttributeGroupNotFoundException
+     * @throws CoreException
+     */
+    public function get(AttributeGroupId $attributeGroupId): AttributeGroup
+    {
+        /** @var AttributeGroup $attributeGroup */
+        $attributeGroup = $this->getObjectModel(
+            $attributeGroupId->getValue(),
+            AttributeGroup::class,
+            AttributeGroupNotFoundException::class
+        );
+
+        return $attributeGroup;
+    }
+
+    /**
+     * @param AttributeGroup $attributeGroup
+     * @param int $errorCode
+     *
+     * @return AttributeGroupId
+     *
+     * @throws CoreException
+     */
+    public function add(AttributeGroup $attributeGroup, int $errorCode = 0): AttributeGroupId
+    {
+        $this->validator->validate($attributeGroup);
+        $id = $this->addObjectModel($attributeGroup, CannotAddAttributeGroupException::class, $errorCode);
+
+        return new AttributeGroupId($id);
+    }
+
+    /**
+     * @param AttributeGroup $attributeGroup
+     * @param int $errorCode
+     *
+     * @return void
+     *
+     * @throws CoreException
+     */
+    public function update(AttributeGroup $attributeGroup, int $errorCode = 0): void
+    {
+        $this->validator->validate($attributeGroup);
+        $this->updateObjectModel($attributeGroup, CannotAddAttributeGroupException::class, $errorCode);
     }
 
     /**
diff --git a/src/Adapter/AttributeGroup/Validate/AttributeGroupValidator.php b/src/Adapter/AttributeGroup/Validate/AttributeGroupValidator.php
new file mode 100644
index 0000000000000..ab20125b73e03
--- /dev/null
+++ b/src/Adapter/AttributeGroup/Validate/AttributeGroupValidator.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Adapter\AttributeGroup\Validate;
+
+use PrestaShop\PrestaShop\Adapter\AbstractObjectModelValidator;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupConstraintException;
+use AttributeGroup;
+use PrestaShop\PrestaShop\Core\Exception\CoreException;
+
+/**
+ * Validates Attribute Group properties using legacy object model
+ */
+class AttributeGroupValidator extends AbstractObjectModelValidator
+{
+    /**
+     * @param AttributeGroup $attributeGroup
+     *
+     * @throws CoreException
+     */
+    public function validate(AttributeGroup $attributeGroup): void
+    {
+        $this->validateObjectModelLocalizedProperty($attributeGroup, 'name', AttributeGroupConstraintException::class, AttributeGroupConstraintException::INVALID_NAME);
+        $this->validateObjectModelLocalizedProperty($attributeGroup, 'public_name', AttributeGroupConstraintException::class, AttributeGroupConstraintException::INVALID_NAME);
+    }
+}
diff --git a/src/Core/Domain/AttributeGroup/CommandHandler/EditAttributeGroupHandlerInterface.php b/src/Core/Domain/AttributeGroup/CommandHandler/EditAttributeGroupHandlerInterface.php
index e4f15ba4a55f9..658dace826067 100644
--- a/src/Core/Domain/AttributeGroup/CommandHandler/EditAttributeGroupHandlerInterface.php
+++ b/src/Core/Domain/AttributeGroup/CommandHandler/EditAttributeGroupHandlerInterface.php
@@ -37,5 +37,5 @@ interface EditAttributeGroupHandlerInterface
     /**
      * @param EditAttributeGroupCommand $command
      */
-    public function handle(EditAttributeGroupCommand $command): AttributeGroupId;
+    public function handle(EditAttributeGroupCommand $command): void;
 }
diff --git a/src/Core/Form/IdentifiableObject/DataHandler/AttributeGroupFormDataHandler.php b/src/Core/Form/IdentifiableObject/DataHandler/AttributeGroupFormDataHandler.php
index 2cfb6389d0ac1..0ac99e79eeee9 100644
--- a/src/Core/Form/IdentifiableObject/DataHandler/AttributeGroupFormDataHandler.php
+++ b/src/Core/Form/IdentifiableObject/DataHandler/AttributeGroupFormDataHandler.php
@@ -74,14 +74,12 @@ public function create(array $data)
     public function update($id, array $data)
     {
         /** @var AttributeGroupId $attributeGroupId */
-        $attributeGroupId = $this->commandBus->handle(new EditAttributeGroupCommand(
+        $this->commandBus->handle(new EditAttributeGroupCommand(
             (int) $id,
             $data['name'],
             $data['public_name'],
             (new AttributeGroupType($data['group_type'])),
             $data['shop_association'] ?? []
         ));
-
-        return $attributeGroupId->getValue();
     }
 }
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/attribute_group.yml b/src/PrestaShopBundle/Resources/config/services/adapter/attribute_group.yml
index 63717a1942a52..9aefda7ea1931 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/attribute_group.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/attribute_group.yml
@@ -48,6 +48,9 @@ services:
     autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\AttributeGroup\Repository\AttributeGroupRepository:
+    autowire: true
     arguments:
       - '@doctrine.dbal.default_connection'
       - '%database_prefix%'
+
+  PrestaShop\PrestaShop\Adapter\AttributeGroup\Validate\AttributeGroupValidator:

From cd1ba1df83e9e3beaba3b24e3dc99ee6920bc44a Mon Sep 17 00:00:00 2001
From: jevgenijvisockij <jevgenij.visockij@gmail.com>
Date: Fri, 10 Mar 2023 13:17:31 +0200
Subject: [PATCH 0951/1030] Moved layout title to controller, changed
 EditAttributeGroupCommand.php __construct to multiline

---
 .../AttributeGroup/Command/EditAttributeGroupCommand.php | 9 +++++++--
 .../Admin/Sell/Catalog/AttributeGroupController.php      | 7 ++++++-
 .../Admin/Sell/Catalog/AttributeGroup/create.html.twig   | 2 --
 .../Admin/Sell/Catalog/AttributeGroup/edit.html.twig     | 2 --
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/Core/Domain/AttributeGroup/Command/EditAttributeGroupCommand.php b/src/Core/Domain/AttributeGroup/Command/EditAttributeGroupCommand.php
index 9fd959e5cc611..2285cf3b2ac28 100644
--- a/src/Core/Domain/AttributeGroup/Command/EditAttributeGroupCommand.php
+++ b/src/Core/Domain/AttributeGroup/Command/EditAttributeGroupCommand.php
@@ -68,8 +68,13 @@ class EditAttributeGroupCommand
      *
      * @throws AttributeGroupConstraintException
      */
-    public function __construct(int $attributeGroupId, array $localizedNames, array $localizedPublicNames, AttributeGroupType $type, array $shopAssociation = [])
-    {
+    public function __construct(
+        int $attributeGroupId,
+        array $localizedNames,
+        array $localizedPublicNames,
+        AttributeGroupType $type,
+        array $shopAssociation = []
+    ) {
         $this->attributeGroupId = new AttributeGroupId($attributeGroupId);
         $this->assertNamesAreValid($localizedNames);
         $this->assertNamesAreValid($localizedPublicNames);
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php
index 347a75b13f891..0621cfcd8109b 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php
@@ -111,6 +111,7 @@ public function createAction(Request $request): Response
         return $this->render(
             '@PrestaShop/Admin/Sell/Catalog/AttributeGroup/create.html.twig',
             [
+                'layoutTitle' => $this->trans('New attribute group', 'Admin.Navigation.Menu'),
                 'attributeGroupForm' => $attributeGroupForm->createView(),
             ]
         );
@@ -152,9 +153,13 @@ public function editAction(Request $request, int $attributeGroupId): Response
         return $this->render(
             '@PrestaShop/Admin/Sell/Catalog/AttributeGroup/edit.html.twig',
             [
+                'layoutTitle' => $this->trans(
+                    'Editing attribute group %name%',
+                    'Admin.Navigation.Menu',
+                    ['%name%' => $editableAttributeGroup->getName()[$contextLangId]]
+                ),
                 'attributeGroupForm' => $attributeGroupForm->createView(),
                 'attributeGroupId' => $attributeGroupId,
-                'attributeGroupName' => $editableAttributeGroup->getName()[$contextLangId],
             ]
         );
     }
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/create.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/create.html.twig
index 8baae839ae22b..edeb48aadf789 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/create.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/create.html.twig
@@ -23,8 +23,6 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  *#}
 
-{% set layoutTitle = 'Add a new attribute group'|trans({}, 'Admin.Catalog.attribute') %}
-
 {% extends '@PrestaShop/Admin/layout.html.twig' %}
 
 {% block content %}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/edit.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/edit.html.twig
index fd4cde056aa90..90851d40e894b 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/edit.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/edit.html.twig
@@ -23,8 +23,6 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  *#}
 
-{% set layoutTitle = 'Edit: %name%'|trans({'%name%': attributeGroupName}, 'Admin.Actions') %}
-
 {% extends '@PrestaShop/Admin/layout.html.twig' %}
 
 {% block content %}

From 5c2cfe2482140924bf248fa34607fa8859381f46 Mon Sep 17 00:00:00 2001
From: JevgenijVisockij <47781757+JevgenijVisockij@users.noreply.github.com>
Date: Fri, 10 Mar 2023 13:18:38 +0200
Subject: [PATCH 0952/1030] Update
 src/Core/Domain/AttributeGroup/ValueObject/AttributeGroupId.php

Co-authored-by: Jonathan Lelievre <jo.lelievre@gmail.com>
---
 src/Core/Domain/AttributeGroup/ValueObject/AttributeGroupId.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Core/Domain/AttributeGroup/ValueObject/AttributeGroupId.php b/src/Core/Domain/AttributeGroup/ValueObject/AttributeGroupId.php
index f4a6a0b8d7210..df5cd490b6f39 100644
--- a/src/Core/Domain/AttributeGroup/ValueObject/AttributeGroupId.php
+++ b/src/Core/Domain/AttributeGroup/ValueObject/AttributeGroupId.php
@@ -66,7 +66,7 @@ public function getValue(): int
     private function assertIntegerIsGreaterThanZero(int $attributeGroupId): void
     {
         if (0 > $attributeGroupId) {
-            throw new InvalidAttributeGroupIdException(sprintf('Invalid attributeGroup id %s supplied. Attribute group id must be positive integer.', $attributeGroupId));
+            throw new AttributeGroupConstraintException(sprintf('Invalid attributeGroup id %s supplied. Attribute group id must be positive integer.', $attributeGroupId), AttributeGroupConstraintException::INVALID_ID);
         }
     }
 }

From fc869cee2a07b07e6cd47e2e02232b8609c4ac9d Mon Sep 17 00:00:00 2001
From: jevgenijvisockij <jevgenij.visockij@gmail.com>
Date: Fri, 10 Mar 2023 13:21:18 +0200
Subject: [PATCH 0953/1030] Snaller changes from code review

---
 .../DataProvider/AttributeGroupFormDataProvider.php         | 6 ++++++
 .../Resources/config/services/bundle/form/form_type.yml     | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Core/Form/IdentifiableObject/DataProvider/AttributeGroupFormDataProvider.php b/src/Core/Form/IdentifiableObject/DataProvider/AttributeGroupFormDataProvider.php
index cd1e15c8eecfa..ebe435a821d7a 100644
--- a/src/Core/Form/IdentifiableObject/DataProvider/AttributeGroupFormDataProvider.php
+++ b/src/Core/Form/IdentifiableObject/DataProvider/AttributeGroupFormDataProvider.php
@@ -49,6 +49,9 @@ public function __construct(
         $this->queryBus = $queryBus;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function getData($id)
     {
         /** @var EditableAttributeGroup $editableAttributeGroup */
@@ -62,6 +65,9 @@ public function getData($id)
         ];
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function getDefaultData()
     {
         return [
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
index b0a616b413922..79d6498f4c689 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
@@ -433,7 +433,6 @@ services:
   PrestaShopBundle\Form\Admin\Sell\Catalog\FeatureType: ~
   PrestaShopBundle\Form\Admin\Sell\Catalog\FeatureValueType: ~
   PrestaShopBundle\Form\Admin\Sell\Catalog\AttributeGroupType:
-    public: true
     arguments:
       $isMultistoreEnabled: '@=service("prestashop.adapter.multistore_feature").isActive()'
     tags:

From f227cc8ab43f4a8e0d16b60ff056e759fe20ce7c Mon Sep 17 00:00:00 2001
From: JevgenijVisockij <47781757+JevgenijVisockij@users.noreply.github.com>
Date: Fri, 10 Mar 2023 15:16:25 +0200
Subject: [PATCH 0954/1030] Update
 src/PrestaShopBundle/Resources/config/services/core/form/form_data_provider.yml
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adding public false to service

Co-authored-by: Julius Žukauskas <31609858+zuk3975@users.noreply.github.com>
---
 .../Resources/config/services/core/form/form_data_provider.yml   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/PrestaShopBundle/Resources/config/services/core/form/form_data_provider.yml b/src/PrestaShopBundle/Resources/config/services/core/form/form_data_provider.yml
index 69ca6dc8e848b..3018a40177071 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/form/form_data_provider.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/form/form_data_provider.yml
@@ -112,6 +112,7 @@ services:
 
   PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataProvider\AttributeGroupFormDataProvider:
     autowire: true
+    public: false
     arguments:
       - '@prestashop.core.query_bus'
 

From 56fd36c5b29a0b9c3bfc4955ded60d5f275db363 Mon Sep 17 00:00:00 2001
From: jevgenijvisockij <jevgenij.visockij@gmail.com>
Date: Thu, 13 Apr 2023 15:28:34 +0300
Subject: [PATCH 0955/1030] Removed InvalidAttributeGroupIdException.php
 replacing iwth constraint exception and new param, smaller code review fixes

---
 .../Command/AddAttributeGroupCommand.php      | 16 ++++++---
 .../Command/EditAttributeGroupCommand.php     | 17 +++++++---
 .../AttributeGroupConstraintException.php     | 17 ++++++----
 .../InvalidAttributeGroupIdException.php      | 33 -------------------
 .../QueryResult/EditableAttributeGroup.php    | 12 +++----
 .../ValueObject/AttributeGroupId.php          |  9 +++--
 .../AttributeGroupFormDataProvider.php        |  2 +-
 7 files changed, 48 insertions(+), 58 deletions(-)
 delete mode 100644 src/Core/Domain/AttributeGroup/Exception/InvalidAttributeGroupIdException.php

diff --git a/src/Core/Domain/AttributeGroup/Command/AddAttributeGroupCommand.php b/src/Core/Domain/AttributeGroup/Command/AddAttributeGroupCommand.php
index 19f82ce97e3e2..c5dbc1d808d1a 100644
--- a/src/Core/Domain/AttributeGroup/Command/AddAttributeGroupCommand.php
+++ b/src/Core/Domain/AttributeGroup/Command/AddAttributeGroupCommand.php
@@ -66,8 +66,16 @@ class AddAttributeGroupCommand
      */
     public function __construct(array $localizedNames, array $localizedPublicNames, AttributeGroupType $type, array $shopAssociation = [])
     {
-        $this->assertNamesAreValid($localizedNames);
-        $this->assertNamesAreValid($localizedPublicNames);
+        $this->assertNamesAreValid(
+            $localizedNames,
+            'Attribute name cannot be empty',
+            AttributeGroupConstraintException::EMPTY_NAME
+        );
+        $this->assertNamesAreValid(
+            $localizedPublicNames,
+            'Attribute public name cannot be empty',
+            AttributeGroupConstraintException::EMPTY_PUBLIC_NAME
+        );
 
         $this->localizedNames = $localizedNames;
         $this->localizedPublicNames = $localizedPublicNames;
@@ -114,10 +122,10 @@ public function getShopAssociation(): array
      *
      * @throws AttributeGroupConstraintException
      */
-    private function assertNamesAreValid(array $names): void
+    private function assertNamesAreValid(array $names, string $message, int $errorCode): void
     {
         if (empty($names)) {
-            throw new AttributeGroupConstraintException('Attribute name cannot be empty', AttributeGroupConstraintException::EMPTY_NAME);
+            throw new AttributeGroupConstraintException($message, $errorCode);
         }
     }
 }
diff --git a/src/Core/Domain/AttributeGroup/Command/EditAttributeGroupCommand.php b/src/Core/Domain/AttributeGroup/Command/EditAttributeGroupCommand.php
index 2285cf3b2ac28..bf620c9b79690 100644
--- a/src/Core/Domain/AttributeGroup/Command/EditAttributeGroupCommand.php
+++ b/src/Core/Domain/AttributeGroup/Command/EditAttributeGroupCommand.php
@@ -76,9 +76,16 @@ public function __construct(
         array $shopAssociation = []
     ) {
         $this->attributeGroupId = new AttributeGroupId($attributeGroupId);
-        $this->assertNamesAreValid($localizedNames);
-        $this->assertNamesAreValid($localizedPublicNames);
-
+        $this->assertNamesAreValid(
+            $localizedNames,
+            'Attribute name cannot be empty',
+            AttributeGroupConstraintException::EMPTY_NAME
+        );
+        $this->assertNamesAreValid(
+            $localizedPublicNames,
+            'Attribute public name cannot be empty',
+            AttributeGroupConstraintException::EMPTY_PUBLIC_NAME
+        );
         $this->localizedNames = $localizedNames;
         $this->localizedPublicNames = $localizedPublicNames;
         $this->type = $type;
@@ -132,10 +139,10 @@ public function getShopAssociation(): array
      *
      * @throws AttributeGroupConstraintException
      */
-    private function assertNamesAreValid(array $names): void
+    private function assertNamesAreValid(array $names, string $message, int $errorCode): void
     {
         if (empty($names)) {
-            throw new AttributeGroupConstraintException('Attribute name cannot be empty', AttributeGroupConstraintException::EMPTY_NAME);
+            throw new AttributeGroupConstraintException($message, $errorCode);
         }
     }
 }
diff --git a/src/Core/Domain/AttributeGroup/Exception/AttributeGroupConstraintException.php b/src/Core/Domain/AttributeGroup/Exception/AttributeGroupConstraintException.php
index 1d4e0d1b2104c..d9ffd33454f59 100644
--- a/src/Core/Domain/AttributeGroup/Exception/AttributeGroupConstraintException.php
+++ b/src/Core/Domain/AttributeGroup/Exception/AttributeGroupConstraintException.php
@@ -34,17 +34,22 @@
 class AttributeGroupConstraintException extends AttributeGroupException
 {
     /**
-     * When attribute group Id contains invalid values
+     * Code is used when attribute group does not have name.
      */
-    public const INVALID_ID = 10;
+    public const EMPTY_NAME = 1;
 
     /**
-     * Code is used when feature does not have name.
+     * Code is used when attribute group does not have public name.
      */
-    public const EMPTY_NAME = 1;
+    public const EMPTY_PUBLIC_NAME = 2;
+
+    /**
+     * Used when attribute group name is invalid.
+     */
+    public const INVALID_NAME = 3;
 
     /**
-     * Used when feature name is invalid.
+     * Used when attribute group id is invalid
      */
-    public const INVALID_NAME = 2;
+    public const INVALID_ID = 4;
 }
diff --git a/src/Core/Domain/AttributeGroup/Exception/InvalidAttributeGroupIdException.php b/src/Core/Domain/AttributeGroup/Exception/InvalidAttributeGroupIdException.php
deleted file mode 100644
index 02080ea80a22d..0000000000000
--- a/src/Core/Domain/AttributeGroup/Exception/InvalidAttributeGroupIdException.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-declare(strict_types=1);
-
-namespace PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception;
-
-class InvalidAttributeGroupIdException extends AttributeGroupException
-{
-}
diff --git a/src/Core/Domain/AttributeGroup/QueryResult/EditableAttributeGroup.php b/src/Core/Domain/AttributeGroup/QueryResult/EditableAttributeGroup.php
index 829b13d734e94..f4a2d78881668 100644
--- a/src/Core/Domain/AttributeGroup/QueryResult/EditableAttributeGroup.php
+++ b/src/Core/Domain/AttributeGroup/QueryResult/EditableAttributeGroup.php
@@ -48,7 +48,7 @@ class EditableAttributeGroup
     /**
      * @var int[]
      */
-    private $shopAssociationIds;
+    private $associatedShopIds;
 
     /**
      * @var array
@@ -65,18 +65,18 @@ class EditableAttributeGroup
      * @param string[] $name
      * @param array $publicName
      * @param string $type
-     * @param int[] $shopAssociationIds
+     * @param int[] $associatedShopIds
      */
     public function __construct(
         AttributeGroupId $attributeGroupId,
         array $name,
         array $publicName,
         string $type,
-        array $shopAssociationIds
+        array $associatedShopIds
     ) {
         $this->attributeGroupId = $attributeGroupId;
         $this->name = $name;
-        $this->shopAssociationIds = $shopAssociationIds;
+        $this->associatedShopIds = $associatedShopIds;
         $this->publicName = $publicName;
         $this->type = $type;
     }
@@ -100,9 +100,9 @@ public function getName(): array
     /**
      * @return int[]
      */
-    public function getShopAssociationIds(): array
+    public function getAssociatedShopIds(): array
     {
-        return $this->shopAssociationIds;
+        return $this->associatedShopIds;
     }
 
     /**
diff --git a/src/Core/Domain/AttributeGroup/ValueObject/AttributeGroupId.php b/src/Core/Domain/AttributeGroup/ValueObject/AttributeGroupId.php
index df5cd490b6f39..ddacb3c8b2efe 100644
--- a/src/Core/Domain/AttributeGroup/ValueObject/AttributeGroupId.php
+++ b/src/Core/Domain/AttributeGroup/ValueObject/AttributeGroupId.php
@@ -28,7 +28,7 @@
 
 namespace PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject;
 
-use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\InvalidAttributeGroupIdException;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupConstraintException;
 
 /**
  * Defines Attribute group ID with its constraints.
@@ -61,12 +61,15 @@ public function getValue(): int
     /**
      * @param int $attributeGroupId
      *
-     * @throws InvalidAttributeGroupIdException
+     * @throws AttributeGroupConstraintException
      */
     private function assertIntegerIsGreaterThanZero(int $attributeGroupId): void
     {
         if (0 > $attributeGroupId) {
-            throw new AttributeGroupConstraintException(sprintf('Invalid attributeGroup id %s supplied. Attribute group id must be positive integer.', $attributeGroupId), AttributeGroupConstraintException::INVALID_ID);
+            throw new AttributeGroupConstraintException(
+                sprintf('Invalid attributeGroup id %s supplied. Attribute group id must be positive integer.', $attributeGroupId),
+                AttributeGroupConstraintException::INVALID_ID
+            );
         }
     }
 }
diff --git a/src/Core/Form/IdentifiableObject/DataProvider/AttributeGroupFormDataProvider.php b/src/Core/Form/IdentifiableObject/DataProvider/AttributeGroupFormDataProvider.php
index ebe435a821d7a..c5707fc010d32 100644
--- a/src/Core/Form/IdentifiableObject/DataProvider/AttributeGroupFormDataProvider.php
+++ b/src/Core/Form/IdentifiableObject/DataProvider/AttributeGroupFormDataProvider.php
@@ -61,7 +61,7 @@ public function getData($id)
             'name' => $editableAttributeGroup->getName(),
             'public_name' => $editableAttributeGroup->getPublicName(),
             'group_type' => $editableAttributeGroup->getType(),
-            'shop_association' => $editableAttributeGroup->getShopAssociationIds(),
+            'shop_association' => $editableAttributeGroup->getAssociatedShopIds(),
         ];
     }
 

From ff04f69343bf95e92028c469926090b42bb0c9d2 Mon Sep 17 00:00:00 2001
From: jevgenijvisockij <jevgenij.visockij@gmail.com>
Date: Fri, 10 Mar 2023 16:48:44 +0200
Subject: [PATCH 0956/1030] Changed attribute group to not use
 GetEditableAttribute group CQRS and use form  data instead

---
 .../Admin/Sell/Catalog/AttributeGroupController.php        | 5 +----
 .../config/routing/admin/sell/catalog/attribute_group.yml  | 2 --
 .../Resources/config/services/core/form/form_builder.yml   | 7 -------
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php
index 0621cfcd8109b..af85f1995b251 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php
@@ -129,7 +129,6 @@ public function createAction(Request $request): Response
      */
     public function editAction(Request $request, int $attributeGroupId): Response
     {
-        $editableAttributeGroup = $this->getQueryBus()->handle(new GetAttributeGroupForEditing($attributeGroupId));
         $attributeGroupFormBuilder = $this->get('PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\AttributeGroupFormBuilder');
         $attributeFormHandler = $this->get('PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Handler\AttributeGroupFormHandler');
 
@@ -148,15 +147,13 @@ public function editAction(Request $request, int $attributeGroupId): Response
             $this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages()));
         }
 
-        $contextLangId = $this->getConfiguration()->get('PS_LANG_DEFAULT');
-
         return $this->render(
             '@PrestaShop/Admin/Sell/Catalog/AttributeGroup/edit.html.twig',
             [
                 'layoutTitle' => $this->trans(
                     'Editing attribute group %name%',
                     'Admin.Navigation.Menu',
-                    ['%name%' => $editableAttributeGroup->getName()[$contextLangId]]
+                    ['%name%' => $attributeGroupForm->getData()['name'][$this->getContextLangId()]]
                 ),
                 'attributeGroupForm' => $attributeGroupForm->createView(),
                 'attributeGroupId' => $attributeGroupId,
diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/attribute_group.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/attribute_group.yml
index 4689c4325177d..8834471c9ed62 100644
--- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/attribute_group.yml
+++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/attribute_group.yml
@@ -1,4 +1,3 @@
-# @todo: uncomment legacy links after page migration
 admin_attribute_groups_index:
   path: /
   methods: GET
@@ -23,7 +22,6 @@ admin_attribute_groups_create:
   path: /new
   methods: [ GET, POST ]
   defaults:
-    # todo: implement create
     _controller: 'PrestaShopBundle\Controller\Admin\Sell\Catalog\AttributeGroupController::createAction'
     _legacy_controller: AdminAttributesGroups
     _legacy_link: AdminAttributeGroups:addattribute_group
diff --git a/src/PrestaShopBundle/Resources/config/services/core/form/form_builder.yml b/src/PrestaShopBundle/Resources/config/services/core/form/form_builder.yml
index 74d75a158e05d..01978722c1018 100644
--- a/src/PrestaShopBundle/Resources/config/services/core/form/form_builder.yml
+++ b/src/PrestaShopBundle/Resources/config/services/core/form/form_builder.yml
@@ -58,13 +58,6 @@ services:
       - 'PrestaShopBundle\Form\Admin\Catalog\Category\CategoryType'
       - '@prestashop.core.form.identifiable_object.data_provider.category_form_data_provider'
 
-  prestashop.core.form.identifiable_object.builder.attribute_form_builder:
-    class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\FormBuilder'
-    factory: [ '@prestashop.core.form.builder.form_builder_factory', 'create' ]
-    arguments:
-      - 'PrestaShopBundle\Form\Admin\Catalog\Category\CategoryType'
-      - '@prestashop.core.form.identifiable_object.data_provider.category_form_data_provider'
-
   prestashop.core.form.identifiable_object.builder.root_category_form_builder:
     class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\FormBuilder'
     factory: [ '@prestashop.core.form.builder.form_builder_factory', 'create' ]

From 95764b43dfff875f2ec7e34c2fcc195068670c40 Mon Sep 17 00:00:00 2001
From: JevgenijVisockij <47781757+JevgenijVisockij@users.noreply.github.com>
Date: Fri, 10 Mar 2023 16:51:12 +0200
Subject: [PATCH 0957/1030] Apply suggestions from code review

Smalled code review changes

Co-authored-by: Jonathan Lelievre <jo.lelievre@gmail.com>
---
 .../Form/Admin/Sell/Catalog/AttributeGroupType.php           | 5 +++--
 .../Features/Context/Domain/AttributeGroupFeatureContext.php | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeGroupType.php b/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeGroupType.php
index 22eec2748f608..92d8a597199f9 100644
--- a/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeGroupType.php
+++ b/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeGroupType.php
@@ -77,7 +77,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $this->trans('Color or texture', 'Admin.Catalog.Feature') => GroupType::ATTRIBUTE_GROUP_TYPE_COLOR,
         ];
 
-        $builder->add('name', TranslatableType::class, [
+        $builder
+            ->add('name', TranslatableType::class, [
             'type' => TextType::class,
             'label' => $this->trans('Name', 'Admin.Global'),
             'options' => [
@@ -90,7 +91,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'help' => $this->trans('Your internal name for this attribute.', 'Admin.Catalog.Help')
                 . '&nbsp;' . $this->trans('Invalid characters:', 'Admin.Notifications.Info')
                 . ' ' . TypedRegexValidator::CATALOG_CHARS,
-        ])
+            ])
             ->add('public_name', TranslatableType::class, [
                 'type' => TextType::class,
                 'label' => $this->trans('Public name', 'Admin.Catalog.Feature'),
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
index 274b1f2af0f32..5e593267b3270 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
@@ -84,7 +84,7 @@ public function createAttributeGroup(string $reference, TableNode $node): void
      */
     public function editAttributeGroup(string $reference, TableNode $node): void
     {
-        $attributeGroupId = SharedStorage::getStorage()->get($reference);
+        $attributeGroupId = $this->referenceToId($reference);
 
         $properties = $node->getRowsHash();
         $this->editAttributeGroupUsingCommand($attributeGroupId, $properties['name'], $properties['public_name'], $properties['type']);

From 210b72b069b1fa27eecaee7ab8c0e1e144d7c210 Mon Sep 17 00:00:00 2001
From: JevgenijVisockij <47781757+JevgenijVisockij@users.noreply.github.com>
Date: Fri, 10 Mar 2023 16:54:26 +0200
Subject: [PATCH 0958/1030] Update
 tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php

Removing default shop ids

Co-authored-by: Jonathan Lelievre <jo.lelievre@gmail.com>
---
 .../Context/Domain/AttributeGroupFeatureContext.php         | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
index 5e593267b3270..0c6377f20db7e 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
@@ -61,12 +61,6 @@ class AttributeGroupFeatureContext extends AbstractDomainFeatureContext
      */
     private $defaultShopId;
 
-    public function __construct()
-    {
-        $configuration = CommonFeatureContext::getContainer()->get('prestashop.adapter.legacy.configuration');
-        $this->defaultLangId = $configuration->get('PS_LANG_DEFAULT');
-        $this->defaultShopId = $configuration->get('PS_SHOP_DEFAULT');
-    }
 
     /**
      * @When I create attribute group :reference with specified properties:

From 5c81b80d6b8dd69baf5847b244ebde5ee917bc8e Mon Sep 17 00:00:00 2001
From: jevgenijvisockij <jevgenij.visockij@gmail.com>
Date: Fri, 10 Mar 2023 17:49:03 +0200
Subject: [PATCH 0959/1030] Refactored behat tests to use multilantg

---
 .../Domain/AttributeGroupFeatureContext.php   | 86 ++++++++++++-------
 .../attribute_group_management.feature        | 41 ++++++---
 2 files changed, 80 insertions(+), 47 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
index 0c6377f20db7e..22f6fc4a168da 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
@@ -30,11 +30,13 @@
 
 use Behat\Gherkin\Node\TableNode;
 use PHPUnit\Framework\Assert;
+use PrestaShop\PrestaShop\Core\Domain\Attachment\Query\GetAttachmentInformation;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\AddAttributeGroupCommand;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\EditAttributeGroupCommand;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupConstraintException;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\InvalidAttributeGroupTypeException;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Query\GetAttributeGroupForEditing;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\QueryResult\EditableAttributeGroup;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupId;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\QueryResult\AttributeGroup;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupType;
@@ -44,31 +46,20 @@
 use PrestaShop\PrestaShop\Core\Domain\Product\AttributeGroup\Query\GetProductAttributeGroups;
 use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopConstraint;
 use RuntimeException;
-use Tests\Integration\Behaviour\Features\Context\CommonFeatureContext;
 use Tests\Integration\Behaviour\Features\Context\SharedStorage;
 use Tests\Integration\Behaviour\Features\Context\Util\NoExceptionAlthoughExpectedException;
 use Tests\Integration\Behaviour\Features\Context\Util\PrimitiveUtils;
 
 class AttributeGroupFeatureContext extends AbstractDomainFeatureContext
 {
-    /**
-     * @var int default language id from configs
-     */
-    private $defaultLangId;
-
-    /**
-     * @var int default shop id from configs
-     */
-    private $defaultShopId;
-
-
     /**
      * @When I create attribute group :reference with specified properties:
      */
     public function createAttributeGroup(string $reference, TableNode $node): void
     {
-        $properties = $node->getRowsHash();
-        $attributeGroupId = $this->createAttributeGroupUsingCommand($properties['name'], $properties['public_name'], $properties['type']);
+        $data = $this->localizeByRows($node);
+
+        $attributeGroupId = $this->createAttributeGroupUsingCommand($data['name'], $data['public_name'], $data['type']);
 
         $this->getSharedStorage()->set($reference, $attributeGroupId->getValue());
     }
@@ -79,9 +70,9 @@ public function createAttributeGroup(string $reference, TableNode $node): void
     public function editAttributeGroup(string $reference, TableNode $node): void
     {
         $attributeGroupId = $this->referenceToId($reference);
+        $data = $this->localizeByRows($node);
 
-        $properties = $node->getRowsHash();
-        $this->editAttributeGroupUsingCommand($attributeGroupId, $properties['name'], $properties['public_name'], $properties['type']);
+        $this->editAttributeGroupUsingCommand($attributeGroupId, $data['name'], $data['public_name'], $data['type']);
     }
 
     /**
@@ -89,7 +80,7 @@ public function editAttributeGroup(string $reference, TableNode $node): void
      */
     public function deleteManufacturer(string $reference): void
     {
-        $attributeGroupId = SharedStorage::getStorage()->get($reference);
+        $attributeGroupId = $this->referenceToId($reference);
 
         $this->getCommandBus()->handle(new DeleteAttributeGroupCommand($attributeGroupId));
     }
@@ -99,14 +90,14 @@ public function deleteManufacturer(string $reference): void
      */
     public function assertAttributeGroupIsDeleted(string $reference): void
     {
-        $attributeGroupId = SharedStorage::getStorage()->get($reference);
+        $attributeGroupId = $this->referenceToId($reference);
 
         try {
             $this->getQueryBus()->handle(new GetAttributeGroupForEditing($attributeGroupId));
 
             throw new NoExceptionAlthoughExpectedException(sprintf('Attribute group %s exists, but it was expected to be deleted', $reference));
         } catch (AttributeGroupNotFoundException $e) {
-            SharedStorage::getStorage()->clear($reference);
+            $this->getSharedStorage()->clear($reference);
         }
     }
 
@@ -128,14 +119,31 @@ public function assertFieldValue(string $reference, string $field, string $value
      */
     public function assertFieldWithLangValue(string $reference, string $field, string $value): void
     {
-        $attributeGroupId = SharedStorage::getStorage()->get($reference);
+        $attributeGroupId = $this->referenceToId($reference);
         $attributeGroup = new \AttributeGroup($attributeGroupId);
 
-        if ($attributeGroup->$field[$this->defaultLangId] !== $value) {
-            throw new RuntimeException(sprintf('Attribute group "%s" has "%s" %s, but "%s" was expected.', $reference, $attributeGroup->$field[$this->defaultLangId], $field, $value));
+
+        if ($attributeGroup->$field[$this->getDefaultLangId()] !== $value) {
+            throw new RuntimeException(sprintf('Attribute group "%s" has "%s" %s, but "%s" was expected.', $reference, $attributeGroup->$field[$this->getDefaultLangId()], $field, $value));
         }
     }
 
+    /**
+     * @Then attribute group :reference should have the following properties:
+     *
+     * @param string $reference
+     * @param TableNode $tableNode
+     */
+    public function assertAttributeGroupProperties(string $reference, TableNode $tableNode): void
+    {
+        $attributeGroup = $this->getAttributeGroup($reference);
+        $data = $this->localizeByRows($tableNode);
+
+        Assert::assertEquals($data['name'], $attributeGroup->getName());
+        Assert::assertEquals($data['public_name'], $attributeGroup->getPublicName());
+        Assert::assertEquals($data['type'], $attributeGroup->getType());
+    }
+
     /**
      * @Given there is a list of following attribute groups:
      *
@@ -528,13 +536,13 @@ private function performAttributesInGroupAssertion(?TableNode $tableNode, array
      *
      * @throws AttributeGroupConstraintException|InvalidAttributeGroupTypeException
      */
-    private function createAttributeGroupUsingCommand(string $nameInDefaultLanguage, string $publicNameInDefaultLanguage, string $type): AttributeGroupId
+    private function createAttributeGroupUsingCommand(array $localizedNames, array $localizedPublicNames, string $type): AttributeGroupId
     {
         $command = new AddAttributeGroupCommand(
-            [$this->defaultLangId => $nameInDefaultLanguage],
-            [$this->defaultLangId => $publicNameInDefaultLanguage],
+            $localizedNames,
+            $localizedPublicNames,
             (new AttributeGroupType($type)),
-            [$this->defaultShopId]
+            [$this->getDefaultShopId()]
         );
 
         return $this->getCommandBus()->handle($command);
@@ -552,18 +560,30 @@ private function createAttributeGroupUsingCommand(string $nameInDefaultLanguage,
      */
     private function editAttributeGroupUsingCommand(
         int $attributeGroupId,
-        string $nameInDefaultLanguage,
-        string $publicNameInDefaultLanguage,
+        array $localizedNames,
+        array $localizedPublicNames,
         string $type
-    ): AttributeGroupId {
+    ): void {
         $command = new EditAttributeGroupCommand(
             $attributeGroupId,
-            [$this->defaultLangId => $nameInDefaultLanguage],
-            [$this->defaultLangId => $publicNameInDefaultLanguage],
+            $localizedNames,
+            $localizedPublicNames,
             (new AttributeGroupType($type)),
-            [$this->defaultShopId]
+            [$this->getDefaultShopId()]
         );
 
-        return $this->getCommandBus()->handle($command);
+        $this->getCommandBus()->handle($command);
+    }
+
+    /**
+     * @param string $reference
+     *
+     * @return EditableAttributeGroup
+     */
+    private function getAttributeGroup(string $reference): EditableAttributeGroup
+    {
+        $id = $this->referenceToId($reference);
+
+        return $this->getCommandBus()->handle(new GetAttributeGroupForEditing($id));
     }
 }
diff --git a/tests/Integration/Behaviour/Features/Scenario/AttributeGroup/attribute_group_management.feature b/tests/Integration/Behaviour/Features/Scenario/AttributeGroup/attribute_group_management.feature
index 616dbf85fb39e..f89703286423e 100644
--- a/tests/Integration/Behaviour/Features/Scenario/AttributeGroup/attribute_group_management.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/AttributeGroup/attribute_group_management.feature
@@ -1,6 +1,6 @@
-# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s attribute_group
+# ./vendor/bin/behat -c tests/Integration/Behaviour/behat.yml -s attribute group
 @restore-all-tables-before-feature
-@feature-management
+@attribute-group-management
 Feature: Attribute group management
   PrestaShop allows BO users to manage product attribute groups
   As a BO user
@@ -8,24 +8,37 @@ Feature: Attribute group management
 
   Background:
     Given shop "shop1" with name "test_shop" exists
+    Given language "language1" with locale "en-US" exists
+    And language with iso code "en" is the default one
+    And language "language2" with locale "fr-FR" exists
 
   Scenario: Adding new attribute group
     When I create attribute group "attributeGroup1" with specified properties:
-      | name        | Color        |
-      | public_name | Public color |
-      | type        | radio        |
-    Then attribute group "attributeGroup1" "name" in default language should be "Color"
-    And attribute group "attributeGroup1" "public_name" in default language should be "Public color"
-    And attribute group "attributeGroup1" "group_type" should be "radio"
+      | name[en-US]        | Color          |
+      | name[fr-FR]        | Couleur        |
+      | public_name[en-US] | Public Color   |
+      | public_name[fr-FR] | Public couleur |
+      | type               | radio          |
+    Then attribute group "attributeGroup1" should have the following properties:
+      | name[en-US]        | Color          |
+      | name[fr-FR]        | Couleur        |
+      | public_name[en-US] | Public Color   |
+      | public_name[fr-FR] | Public couleur |
+      | type               | radio          |
 
   Scenario: Editing attribute group
     When I edit attribute group "attributeGroup1" with specified properties:
-      | name        | Colour        |
-      | public_name | Public colour |
-      | type        | color         |
-    Then attribute group "attributeGroup1" "name" in default language should be "Colour"
-    And attribute group "attributeGroup1" "public_name" in default language should be "Public colour"
-    And attribute group "attributeGroup1" "group_type" should be "color"
+      | name[en-US]        | Coulor         |
+      | name[fr-FR]        | Couleur        |
+      | public_name[en-US] | Public Colour  |
+      | public_name[fr-FR] | Public couleur |
+      | type               | color          |
+    Then attribute group "attributeGroup1" should have the following properties:
+      | name[en-US]        | Coulor         |
+      | name[fr-FR]        | Couleur        |
+      | public_name[en-US] | Public Colour  |
+      | public_name[fr-FR] | Public couleur |
+      | type               | color          |
 
   Scenario: Deleting attribute group
     When I delete attribute group "attributeGroup1"

From f50a59f5b19440379beb3dd8e80fcf3b4eee2fca Mon Sep 17 00:00:00 2001
From: jevgenijvisockij <jevgenij.visockij@gmail.com>
Date: Thu, 13 Apr 2023 15:29:13 +0300
Subject: [PATCH 0960/1030] Refactored attribute group js to use 2 separate
 files

---
 admin-dev/themes/new-theme/.webpack/common.js |  1 +
 .../js/pages/attribute-group/form/index.ts    | 38 +++++++++++++++++++
 .../js/pages/attribute-group/index.ts         |  9 -----
 .../Repository/AttributeGroupRepository.php   |  1 +
 .../Validate/AttributeGroupValidator.php      |  2 +-
 .../EditAttributeGroupHandlerInterface.php    |  1 -
 .../ValueObject/AttributeGroupType.php        |  2 +-
 .../AttributeGroupFormDataHandler.php         |  2 +-
 .../Sell/Catalog/AttributeGroupController.php |  1 -
 .../Admin/Sell/Catalog/AttributeGroupType.php | 24 ++++++------
 .../Blocks/form_javascripts.html.twig         |  2 +-
 .../Domain/AttributeGroupFeatureContext.php   |  2 -
 12 files changed, 56 insertions(+), 29 deletions(-)
 create mode 100644 admin-dev/themes/new-theme/js/pages/attribute-group/form/index.ts

diff --git a/admin-dev/themes/new-theme/.webpack/common.js b/admin-dev/themes/new-theme/.webpack/common.js
index 6abf526745a87..080c126d39822 100644
--- a/admin-dev/themes/new-theme/.webpack/common.js
+++ b/admin-dev/themes/new-theme/.webpack/common.js
@@ -44,6 +44,7 @@ module.exports = {
     attachment: './js/pages/attachment',
     attribute: './js/pages/attribute',
     attribute_group: './js/pages/attribute-group',
+    attribute_group_form: './js/pages/attribute-group/form',
     authorization_server: './js/pages/authorization-server',
     backup: './js/pages/backup',
     carrier: './js/pages/carrier',
diff --git a/admin-dev/themes/new-theme/js/pages/attribute-group/form/index.ts b/admin-dev/themes/new-theme/js/pages/attribute-group/form/index.ts
new file mode 100644
index 0000000000000..e082b443aabc6
--- /dev/null
+++ b/admin-dev/themes/new-theme/js/pages/attribute-group/form/index.ts
@@ -0,0 +1,38 @@
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+// @ts-ignore
+const {$} = window;
+
+$(() => {
+  window.prestashop.component.initComponents(
+    [
+      'TranslatableInput',
+      'TranslatableField',
+    ],
+  );
+
+  new window.prestashop.component.ChoiceTree('#attribute_group_shop_association').enableAutoCheckChildren();
+});
diff --git a/admin-dev/themes/new-theme/js/pages/attribute-group/index.ts b/admin-dev/themes/new-theme/js/pages/attribute-group/index.ts
index 76c5317f4e461..885066a154cc6 100644
--- a/admin-dev/themes/new-theme/js/pages/attribute-group/index.ts
+++ b/admin-dev/themes/new-theme/js/pages/attribute-group/index.ts
@@ -53,13 +53,4 @@ $(() => {
 
   const showcaseCard = new ShowcaseCard('attributesShowcaseCard');
   showcaseCard.addExtension(new ShowcaseCardCloseExtension());
-
-  window.prestashop.component.initComponents(
-    [
-      'TranslatableInput',
-      'TranslatableField',
-    ],
-  );
-
-  new window.prestashop.component.ChoiceTree('#attribute_group_shop_association').enableAutoCheckChildren();
 });
diff --git a/src/Adapter/AttributeGroup/Repository/AttributeGroupRepository.php b/src/Adapter/AttributeGroup/Repository/AttributeGroupRepository.php
index 379d2713d6cf6..23baecf0f2dfd 100644
--- a/src/Adapter/AttributeGroup/Repository/AttributeGroupRepository.php
+++ b/src/Adapter/AttributeGroup/Repository/AttributeGroupRepository.php
@@ -32,6 +32,7 @@
 use PrestaShop\PrestaShop\Adapter\AttributeGroup\Validate\AttributeGroupValidator;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\CannotAddAttributeGroupException;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupId;
+use PrestaShop\PrestaShop\Core\Domain\Product\AttributeGroup\Exception\AttributeGroupNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Shop\Exception\InvalidShopConstraintException;
 use PrestaShop\PrestaShop\Core\Domain\Shop\Exception\ShopAssociationNotFound;
 use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopConstraint;
diff --git a/src/Adapter/AttributeGroup/Validate/AttributeGroupValidator.php b/src/Adapter/AttributeGroup/Validate/AttributeGroupValidator.php
index ab20125b73e03..5e0fdea7fdf89 100644
--- a/src/Adapter/AttributeGroup/Validate/AttributeGroupValidator.php
+++ b/src/Adapter/AttributeGroup/Validate/AttributeGroupValidator.php
@@ -28,9 +28,9 @@
 
 namespace PrestaShop\PrestaShop\Adapter\AttributeGroup\Validate;
 
+use AttributeGroup;
 use PrestaShop\PrestaShop\Adapter\AbstractObjectModelValidator;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupConstraintException;
-use AttributeGroup;
 use PrestaShop\PrestaShop\Core\Exception\CoreException;
 
 /**
diff --git a/src/Core/Domain/AttributeGroup/CommandHandler/EditAttributeGroupHandlerInterface.php b/src/Core/Domain/AttributeGroup/CommandHandler/EditAttributeGroupHandlerInterface.php
index 658dace826067..9f8baea9d077c 100644
--- a/src/Core/Domain/AttributeGroup/CommandHandler/EditAttributeGroupHandlerInterface.php
+++ b/src/Core/Domain/AttributeGroup/CommandHandler/EditAttributeGroupHandlerInterface.php
@@ -27,7 +27,6 @@
 namespace PrestaShop\PrestaShop\Core\Domain\AttributeGroup\CommandHandler;
 
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\EditAttributeGroupCommand;
-use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupId;
 
 /**
  * Describes a service that handles attribute group edit command.
diff --git a/src/Core/Domain/AttributeGroup/ValueObject/AttributeGroupType.php b/src/Core/Domain/AttributeGroup/ValueObject/AttributeGroupType.php
index d7b12246a56a6..fc6833c80928c 100644
--- a/src/Core/Domain/AttributeGroup/ValueObject/AttributeGroupType.php
+++ b/src/Core/Domain/AttributeGroup/ValueObject/AttributeGroupType.php
@@ -74,7 +74,7 @@ public function getValue(): string
     private function assertTypeExists(string $type): void
     {
         $types = [static::ATTRIBUTE_GROUP_TYPE_COLOR, static::ATTRIBUTE_GROUP_TYPE_SELECT, static::ATTRIBUTE_GROUP_TYPE_RADIO];
-        if (!in_array($type, $types)){
+        if (!in_array($type, $types)) {
             throw new InvalidAttributeGroupTypeException(
                 sprintf(
                     'Invalid attributeGroup type %s supplied.',
diff --git a/src/Core/Form/IdentifiableObject/DataHandler/AttributeGroupFormDataHandler.php b/src/Core/Form/IdentifiableObject/DataHandler/AttributeGroupFormDataHandler.php
index 0ac99e79eeee9..57b32efd9fd10 100644
--- a/src/Core/Form/IdentifiableObject/DataHandler/AttributeGroupFormDataHandler.php
+++ b/src/Core/Form/IdentifiableObject/DataHandler/AttributeGroupFormDataHandler.php
@@ -73,7 +73,7 @@ public function create(array $data)
      */
     public function update($id, array $data)
     {
-        /** @var AttributeGroupId $attributeGroupId */
+        /* @var AttributeGroupId $attributeGroupId */
         $this->commandBus->handle(new EditAttributeGroupCommand(
             (int) $id,
             $data['name'],
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php
index af85f1995b251..9387f3e75391b 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php
@@ -30,7 +30,6 @@
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupConstraintException;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\CannotAddAttributeGroupException;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\CannotUpdateAttributeGroupException;
-use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Query\GetAttributeGroupForEditing;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\BulkDeleteAttributeGroupCommand;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\DeleteAttributeGroupCommand;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupNotFoundException;
diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeGroupType.php b/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeGroupType.php
index 92d8a597199f9..73f57c3c88387 100644
--- a/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeGroupType.php
+++ b/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeGroupType.php
@@ -30,6 +30,7 @@
 
 use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\TypedRegex;
 use PrestaShop\PrestaShop\Core\ConstraintValidator\TypedRegexValidator;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupType as GroupType;
 use PrestaShopBundle\Form\Admin\Type\ShopChoiceTreeType;
 use PrestaShopBundle\Form\Admin\Type\TranslatableType;
 use PrestaShopBundle\Form\Admin\Type\TranslatorAwareType;
@@ -39,7 +40,6 @@
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Validator\Constraints\NotBlank;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupType as GroupType;
 
 /**
  * Form type for attribute add/edit
@@ -79,18 +79,18 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
         $builder
             ->add('name', TranslatableType::class, [
-            'type' => TextType::class,
-            'label' => $this->trans('Name', 'Admin.Global'),
-            'options' => [
-                'constraints' => [
-                    new TypedRegex([
-                        'type' => TypedRegex::TYPE_CATALOG_NAME,
-                    ]),
+                'type' => TextType::class,
+                'label' => $this->trans('Name', 'Admin.Global'),
+                'options' => [
+                    'constraints' => [
+                        new TypedRegex([
+                            'type' => TypedRegex::TYPE_CATALOG_NAME,
+                        ]),
+                    ],
                 ],
-            ],
-            'help' => $this->trans('Your internal name for this attribute.', 'Admin.Catalog.Help')
-                . '&nbsp;' . $this->trans('Invalid characters:', 'Admin.Notifications.Info')
-                . ' ' . TypedRegexValidator::CATALOG_CHARS,
+                'help' => $this->trans('Your internal name for this attribute.', 'Admin.Catalog.Help')
+                    . '&nbsp;' . $this->trans('Invalid characters:', 'Admin.Notifications.Info')
+                    . ' ' . TypedRegexValidator::CATALOG_CHARS,
             ])
             ->add('public_name', TranslatableType::class, [
                 'type' => TextType::class,
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/Blocks/form_javascripts.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/Blocks/form_javascripts.html.twig
index 6c1cb650da186..98cece9edeb91 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/Blocks/form_javascripts.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/Blocks/form_javascripts.html.twig
@@ -24,5 +24,5 @@
  *#}
 
 {% block feature_javascript_block %}
-  <script src="{{ asset('themes/new-theme/public/attribute_group.bundle.js') }}"></script>
+  <script src="{{ asset('themes/new-theme/public/attribute_group_form.bundle.js') }}"></script>
 {% endblock %}
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
index 22f6fc4a168da..008995cfd5dae 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
@@ -30,7 +30,6 @@
 
 use Behat\Gherkin\Node\TableNode;
 use PHPUnit\Framework\Assert;
-use PrestaShop\PrestaShop\Core\Domain\Attachment\Query\GetAttachmentInformation;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\AddAttributeGroupCommand;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\EditAttributeGroupCommand;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupConstraintException;
@@ -122,7 +121,6 @@ public function assertFieldWithLangValue(string $reference, string $field, strin
         $attributeGroupId = $this->referenceToId($reference);
         $attributeGroup = new \AttributeGroup($attributeGroupId);
 
-
         if ($attributeGroup->$field[$this->getDefaultLangId()] !== $value) {
             throw new RuntimeException(sprintf('Attribute group "%s" has "%s" %s, but "%s" was expected.', $reference, $attributeGroup->$field[$this->getDefaultLangId()], $field, $value));
         }

From c874ba6b12cf3925bb644a40c6c3b7e70f314400 Mon Sep 17 00:00:00 2001
From: JevgenijVisockij <47781757+JevgenijVisockij@users.noreply.github.com>
Date: Thu, 13 Apr 2023 15:53:45 +0300
Subject: [PATCH 0961/1030] Apply suggestions from code review

Wording changes

Co-authored-by: l-delin <113511191+l-delin@users.noreply.github.com>
---
 .../Domain/AttributeGroup/ValueObject/AttributeGroupId.php  | 2 +-
 .../Admin/Sell/Catalog/AttributeGroupController.php         | 6 +++---
 .../Admin/Sell/Catalog/AttributeGroup/Blocks/form.html.twig | 2 +-
 .../Context/Domain/AttributeGroupFeatureContext.php         | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Core/Domain/AttributeGroup/ValueObject/AttributeGroupId.php b/src/Core/Domain/AttributeGroup/ValueObject/AttributeGroupId.php
index ddacb3c8b2efe..6ecbc6f33e1ed 100644
--- a/src/Core/Domain/AttributeGroup/ValueObject/AttributeGroupId.php
+++ b/src/Core/Domain/AttributeGroup/ValueObject/AttributeGroupId.php
@@ -67,7 +67,7 @@ private function assertIntegerIsGreaterThanZero(int $attributeGroupId): void
     {
         if (0 > $attributeGroupId) {
             throw new AttributeGroupConstraintException(
-                sprintf('Invalid attributeGroup id %s supplied. Attribute group id must be positive integer.', $attributeGroupId),
+                sprintf('Invalid attributeGroup id %s supplied. Attribute ID must be a positive integer.', $attributeGroupId),
                 AttributeGroupConstraintException::INVALID_ID
             );
         }
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php
index 9387f3e75391b..a5ad9d7368e5e 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php
@@ -110,7 +110,7 @@ public function createAction(Request $request): Response
         return $this->render(
             '@PrestaShop/Admin/Sell/Catalog/AttributeGroup/create.html.twig',
             [
-                'layoutTitle' => $this->trans('New attribute group', 'Admin.Navigation.Menu'),
+                'layoutTitle' => $this->trans('New attribute', 'Admin.Navigation.Menu'),
                 'attributeGroupForm' => $attributeGroupForm->createView(),
             ]
         );
@@ -150,7 +150,7 @@ public function editAction(Request $request, int $attributeGroupId): Response
             '@PrestaShop/Admin/Sell/Catalog/AttributeGroup/edit.html.twig',
             [
                 'layoutTitle' => $this->trans(
-                    'Editing attribute group %name%',
+                    'Editing attribute %name%',
                     'Admin.Navigation.Menu',
                     ['%name%' => $attributeGroupForm->getData()['name'][$this->getContextLangId()]]
                 ),
@@ -308,7 +308,7 @@ private function getErrorMessages()
             ],
 
             CannotAddAttributeGroupException::class => $this->trans(
-                'An error occurred while creating the attribute group.',
+                'An error occurred while creating the attribute.',
                 'Admin.Catalog.Notification'
             ),
             CannotUpdateAttributeGroupException::class => $this->trans(
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/Blocks/form.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/Blocks/form.html.twig
index afbda83f2a338..416dea47234f0 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/Blocks/form.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/Blocks/form.html.twig
@@ -30,7 +30,7 @@
 
   <div class="card">
     <h3 class="card-header">
-      {{ 'Attribute Group'|trans({}, 'Admin.Catalog.Attribute') }}
+      {{ 'Attribute'|trans({}, 'Admin.Catalog.Attribute') }}
     </h3>
 
     <div class="card-body">
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
index 008995cfd5dae..825e981387e1a 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
@@ -94,7 +94,7 @@ public function assertAttributeGroupIsDeleted(string $reference): void
         try {
             $this->getQueryBus()->handle(new GetAttributeGroupForEditing($attributeGroupId));
 
-            throw new NoExceptionAlthoughExpectedException(sprintf('Attribute group %s exists, but it was expected to be deleted', $reference));
+            throw new NoExceptionAlthoughExpectedException(sprintf('Attribute %s exists, but it was expected to be deleted', $reference));
         } catch (AttributeGroupNotFoundException $e) {
             $this->getSharedStorage()->clear($reference);
         }
@@ -109,7 +109,7 @@ public function assertFieldValue(string $reference, string $field, string $value
         $attributeGroup = new \AttributeGroup($attributeGroupId);
 
         if ($attributeGroup->$field !== $value) {
-            throw new RuntimeException(sprintf('Attribute group "%s" has "%s" %s, but "%s" was expected.', $reference, $attributeGroup->$field, $field, $value));
+            throw new RuntimeException(sprintf('Attribute "%s" has "%s" %s, but "%s" was expected.', $reference, $attributeGroup->$field, $field, $value));
         }
     }
 
@@ -122,7 +122,7 @@ public function assertFieldWithLangValue(string $reference, string $field, strin
         $attributeGroup = new \AttributeGroup($attributeGroupId);
 
         if ($attributeGroup->$field[$this->getDefaultLangId()] !== $value) {
-            throw new RuntimeException(sprintf('Attribute group "%s" has "%s" %s, but "%s" was expected.', $reference, $attributeGroup->$field[$this->getDefaultLangId()], $field, $value));
+            throw new RuntimeException(sprintf('Attribute "%s" has "%s" %s, but "%s" was expected.', $reference, $attributeGroup->$field[$this->getDefaultLangId()], $field, $value));
         }
     }
 

From 6638569a1e11a7e508bc6d57e6aec4d87852c81c Mon Sep 17 00:00:00 2001
From: jevgenijvisockij <jevgenij.visockij@gmail.com>
Date: Thu, 13 Apr 2023 16:15:42 +0300
Subject: [PATCH 0962/1030] Removed unneeded exception and smaller fixes

---
 .../Repository/AttributeGroupRepository.php   |  2 +-
 .../CannotUpdateAttributeGroupException.php   | 33 -------------------
 .../Sell/Catalog/AttributeGroupController.php |  9 ++---
 .../Domain/AttributeGroupFeatureContext.php   |  8 ++---
 4 files changed, 7 insertions(+), 45 deletions(-)
 delete mode 100644 src/Core/Domain/AttributeGroup/Exception/CannotUpdateAttributeGroupException.php

diff --git a/src/Adapter/AttributeGroup/Repository/AttributeGroupRepository.php b/src/Adapter/AttributeGroup/Repository/AttributeGroupRepository.php
index 23baecf0f2dfd..3cbb7ed140c7f 100644
--- a/src/Adapter/AttributeGroup/Repository/AttributeGroupRepository.php
+++ b/src/Adapter/AttributeGroup/Repository/AttributeGroupRepository.php
@@ -32,7 +32,7 @@
 use PrestaShop\PrestaShop\Adapter\AttributeGroup\Validate\AttributeGroupValidator;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\CannotAddAttributeGroupException;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupId;
-use PrestaShop\PrestaShop\Core\Domain\Product\AttributeGroup\Exception\AttributeGroupNotFoundException;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Shop\Exception\InvalidShopConstraintException;
 use PrestaShop\PrestaShop\Core\Domain\Shop\Exception\ShopAssociationNotFound;
 use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopConstraint;
diff --git a/src/Core/Domain/AttributeGroup/Exception/CannotUpdateAttributeGroupException.php b/src/Core/Domain/AttributeGroup/Exception/CannotUpdateAttributeGroupException.php
deleted file mode 100644
index d47071a8c20f1..0000000000000
--- a/src/Core/Domain/AttributeGroup/Exception/CannotUpdateAttributeGroupException.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-declare(strict_types=1);
-
-namespace PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception;
-
-class CannotUpdateAttributeGroupException extends AttributeGroupException
-{
-}
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php
index a5ad9d7368e5e..053639de4bd2d 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php
@@ -27,12 +27,11 @@
 namespace PrestaShopBundle\Controller\Admin\Sell\Catalog;
 
 use Exception;
-use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupConstraintException;
-use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\CannotAddAttributeGroupException;
-use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\CannotUpdateAttributeGroupException;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\BulkDeleteAttributeGroupCommand;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\DeleteAttributeGroupCommand;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupConstraintException;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupNotFoundException;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\CannotAddAttributeGroupException;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\DeleteAttributeGroupException;
 use PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\Query\GetShowcaseCardIsClosed;
 use PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\ValueObject\ShowcaseCard;
@@ -311,10 +310,6 @@ private function getErrorMessages()
                 'An error occurred while creating the attribute.',
                 'Admin.Catalog.Notification'
             ),
-            CannotUpdateAttributeGroupException::class => $this->trans(
-                'The error occoured while updating the attribute group.',
-                'Admin.Catalog.Notification'
-            ),
             DeleteAttributeGroupException::class => [
                 DeleteAttributeGroupException::FAILED_DELETE => $this->trans(
                     'An error occurred while deleting the object.',
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
index 825e981387e1a..70b2bf9912d99 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
@@ -35,13 +35,13 @@
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupConstraintException;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\InvalidAttributeGroupTypeException;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Query\GetAttributeGroupForEditing;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\QueryResult\AttributeGroup;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\QueryResult\EditableAttributeGroup;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupId;
-use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\QueryResult\AttributeGroup;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupType;
-use PrestaShop\PrestaShop\Core\Domain\Product\AttributeGroup\Command\DeleteAttributeGroupCommand;
-use PrestaShop\PrestaShop\Core\Domain\Product\AttributeGroup\Exception\AttributeGroupNotFoundException;
-use PrestaShop\PrestaShop\Core\Domain\Product\AttributeGroup\Query\GetAttributeGroupList;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\DeleteAttributeGroupCommand;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupNotFoundException;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Query\GetAttributeGroupList;
 use PrestaShop\PrestaShop\Core\Domain\Product\AttributeGroup\Query\GetProductAttributeGroups;
 use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopConstraint;
 use RuntimeException;

From f5ae785d3da8053f2439ce2d2e755682bb9418d2 Mon Sep 17 00:00:00 2001
From: JevgenijVisockij <47781757+JevgenijVisockij@users.noreply.github.com>
Date: Thu, 13 Apr 2023 17:20:03 +0300
Subject: [PATCH 0963/1030] Apply suggestions from code review

Changing exception messages back to attributes

Co-authored-by: l-delin <113511191+l-delin@users.noreply.github.com>
---
 .../Domain/AttributeGroup/ValueObject/AttributeGroupId.php  | 2 +-
 .../Context/Domain/AttributeGroupFeatureContext.php         | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Core/Domain/AttributeGroup/ValueObject/AttributeGroupId.php b/src/Core/Domain/AttributeGroup/ValueObject/AttributeGroupId.php
index 6ecbc6f33e1ed..d0ff147692fcd 100644
--- a/src/Core/Domain/AttributeGroup/ValueObject/AttributeGroupId.php
+++ b/src/Core/Domain/AttributeGroup/ValueObject/AttributeGroupId.php
@@ -67,7 +67,7 @@ private function assertIntegerIsGreaterThanZero(int $attributeGroupId): void
     {
         if (0 > $attributeGroupId) {
             throw new AttributeGroupConstraintException(
-                sprintf('Invalid attributeGroup id %s supplied. Attribute ID must be a positive integer.', $attributeGroupId),
+                sprintf('Invalid attributeGroup id %s supplied. Attribute group ID must be a positive integer.', $attributeGroupId),
                 AttributeGroupConstraintException::INVALID_ID
             );
         }
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
index 70b2bf9912d99..4a46826be7aef 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
@@ -94,7 +94,7 @@ public function assertAttributeGroupIsDeleted(string $reference): void
         try {
             $this->getQueryBus()->handle(new GetAttributeGroupForEditing($attributeGroupId));
 
-            throw new NoExceptionAlthoughExpectedException(sprintf('Attribute %s exists, but it was expected to be deleted', $reference));
+            throw new NoExceptionAlthoughExpectedException(sprintf('Attribute group %s exists, but it was expected to be deleted', $reference));
         } catch (AttributeGroupNotFoundException $e) {
             $this->getSharedStorage()->clear($reference);
         }
@@ -109,7 +109,7 @@ public function assertFieldValue(string $reference, string $field, string $value
         $attributeGroup = new \AttributeGroup($attributeGroupId);
 
         if ($attributeGroup->$field !== $value) {
-            throw new RuntimeException(sprintf('Attribute "%s" has "%s" %s, but "%s" was expected.', $reference, $attributeGroup->$field, $field, $value));
+            throw new RuntimeException(sprintf('Attribute group "%s" has "%s" %s, but "%s" was expected.', $reference, $attributeGroup->$field, $field, $value));
         }
     }
 
@@ -122,7 +122,7 @@ public function assertFieldWithLangValue(string $reference, string $field, strin
         $attributeGroup = new \AttributeGroup($attributeGroupId);
 
         if ($attributeGroup->$field[$this->getDefaultLangId()] !== $value) {
-            throw new RuntimeException(sprintf('Attribute "%s" has "%s" %s, but "%s" was expected.', $reference, $attributeGroup->$field[$this->getDefaultLangId()], $field, $value));
+            throw new RuntimeException(sprintf('Attribute group "%s" has "%s" %s, but "%s" was expected.', $reference, $attributeGroup->$field[$this->getDefaultLangId()], $field, $value));
         }
     }
 

From b7573f1a04f61a901d8d9795b1a1522326689f91 Mon Sep 17 00:00:00 2001
From: jevgenijvisockij <jevgenij.visockij@gmail.com>
Date: Thu, 13 Apr 2023 17:42:32 +0300
Subject: [PATCH 0964/1030] Cleaned up attribute group exceptions

---
 .../AttributeGroupConstraintException.php       | 17 ++++++++---------
 .../Exception/AttributeGroupException.php       |  4 +---
 .../CannotAddAttributeGroupException.php        |  2 --
 .../InvalidAttributeGroupTypeException.php      |  2 --
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/Core/Domain/AttributeGroup/Exception/AttributeGroupConstraintException.php b/src/Core/Domain/AttributeGroup/Exception/AttributeGroupConstraintException.php
index d9ffd33454f59..7d6c7c6b51da6 100644
--- a/src/Core/Domain/AttributeGroup/Exception/AttributeGroupConstraintException.php
+++ b/src/Core/Domain/AttributeGroup/Exception/AttributeGroupConstraintException.php
@@ -24,8 +24,6 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
-declare(strict_types=1);
-
 namespace PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception;
 
 /**
@@ -33,23 +31,24 @@
  */
 class AttributeGroupConstraintException extends AttributeGroupException
 {
+    /**
+     * Used when attribute group id is invalid
+     */
+    public const INVALID_ID = 10;
+
     /**
      * Code is used when attribute group does not have name.
      */
-    public const EMPTY_NAME = 1;
+    public const EMPTY_NAME = 20;
 
     /**
      * Code is used when attribute group does not have public name.
      */
-    public const EMPTY_PUBLIC_NAME = 2;
+    public const EMPTY_PUBLIC_NAME = 30;
 
     /**
      * Used when attribute group name is invalid.
      */
-    public const INVALID_NAME = 3;
+    public const INVALID_NAME = 40;
 
-    /**
-     * Used when attribute group id is invalid
-     */
-    public const INVALID_ID = 4;
 }
diff --git a/src/Core/Domain/AttributeGroup/Exception/AttributeGroupException.php b/src/Core/Domain/AttributeGroup/Exception/AttributeGroupException.php
index 210b6926334f5..635752c67ad82 100644
--- a/src/Core/Domain/AttributeGroup/Exception/AttributeGroupException.php
+++ b/src/Core/Domain/AttributeGroup/Exception/AttributeGroupException.php
@@ -24,14 +24,12 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
-declare(strict_types=1);
-
 namespace PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception;
 
 use PrestaShop\PrestaShop\Core\Domain\Exception\DomainException;
 
 /**
- * Thrown in Attribute Group context.
+ * Base exception for attribute group subdomain
  */
 class AttributeGroupException extends DomainException
 {
diff --git a/src/Core/Domain/AttributeGroup/Exception/CannotAddAttributeGroupException.php b/src/Core/Domain/AttributeGroup/Exception/CannotAddAttributeGroupException.php
index fe06806dfb30d..f8a6c6300d636 100644
--- a/src/Core/Domain/AttributeGroup/Exception/CannotAddAttributeGroupException.php
+++ b/src/Core/Domain/AttributeGroup/Exception/CannotAddAttributeGroupException.php
@@ -24,8 +24,6 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
-declare(strict_types=1);
-
 namespace PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception;
 
 class CannotAddAttributeGroupException extends AttributeGroupException
diff --git a/src/Core/Domain/AttributeGroup/Exception/InvalidAttributeGroupTypeException.php b/src/Core/Domain/AttributeGroup/Exception/InvalidAttributeGroupTypeException.php
index f6128c234dc23..f3648d1795f6f 100644
--- a/src/Core/Domain/AttributeGroup/Exception/InvalidAttributeGroupTypeException.php
+++ b/src/Core/Domain/AttributeGroup/Exception/InvalidAttributeGroupTypeException.php
@@ -24,8 +24,6 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
-declare(strict_types=1);
-
 namespace PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception;
 
 class InvalidAttributeGroupTypeException extends AttributeGroupException

From d66495808dd7d63a0eeef2eb999cc6a98fa233eb Mon Sep 17 00:00:00 2001
From: jevgenijvisockij <jevgenij.visockij@gmail.com>
Date: Thu, 13 Apr 2023 17:43:57 +0300
Subject: [PATCH 0965/1030] Cleaned up attribute group exceptions

---
 .../Exception/AttributeGroupConstraintException.php             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Core/Domain/AttributeGroup/Exception/AttributeGroupConstraintException.php b/src/Core/Domain/AttributeGroup/Exception/AttributeGroupConstraintException.php
index 7d6c7c6b51da6..0ff6f72178283 100644
--- a/src/Core/Domain/AttributeGroup/Exception/AttributeGroupConstraintException.php
+++ b/src/Core/Domain/AttributeGroup/Exception/AttributeGroupConstraintException.php
@@ -27,7 +27,7 @@
 namespace PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception;
 
 /**
- * Is thrown when attribute group constraints are violated
+ * When attribute group Id contains invalid values
  */
 class AttributeGroupConstraintException extends AttributeGroupException
 {

From bff267904a687947c053204cbc847bac75d9ef31 Mon Sep 17 00:00:00 2001
From: jevgenijvisockij <jevgenij.visockij@gmail.com>
Date: Mon, 17 Apr 2023 10:34:52 +0300
Subject: [PATCH 0966/1030] CS fixer fix

---
 .../AttributeGroup/Repository/AttributeGroupRepository.php  | 2 +-
 .../Exception/AttributeGroupConstraintException.php         | 1 -
 .../Context/Domain/AttributeGroupFeatureContext.php         | 6 +++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/Adapter/AttributeGroup/Repository/AttributeGroupRepository.php b/src/Adapter/AttributeGroup/Repository/AttributeGroupRepository.php
index 3cbb7ed140c7f..f0fb82ccc0556 100644
--- a/src/Adapter/AttributeGroup/Repository/AttributeGroupRepository.php
+++ b/src/Adapter/AttributeGroup/Repository/AttributeGroupRepository.php
@@ -30,9 +30,9 @@
 use AttributeGroup;
 use Doctrine\DBAL\Connection;
 use PrestaShop\PrestaShop\Adapter\AttributeGroup\Validate\AttributeGroupValidator;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\CannotAddAttributeGroupException;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupId;
-use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\Shop\Exception\InvalidShopConstraintException;
 use PrestaShop\PrestaShop\Core\Domain\Shop\Exception\ShopAssociationNotFound;
 use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopConstraint;
diff --git a/src/Core/Domain/AttributeGroup/Exception/AttributeGroupConstraintException.php b/src/Core/Domain/AttributeGroup/Exception/AttributeGroupConstraintException.php
index 0ff6f72178283..dced969c2f23c 100644
--- a/src/Core/Domain/AttributeGroup/Exception/AttributeGroupConstraintException.php
+++ b/src/Core/Domain/AttributeGroup/Exception/AttributeGroupConstraintException.php
@@ -50,5 +50,4 @@ class AttributeGroupConstraintException extends AttributeGroupException
      * Used when attribute group name is invalid.
      */
     public const INVALID_NAME = 40;
-
 }
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
index 4a46826be7aef..53a39a99501d9 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
@@ -31,17 +31,17 @@
 use Behat\Gherkin\Node\TableNode;
 use PHPUnit\Framework\Assert;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\AddAttributeGroupCommand;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\DeleteAttributeGroupCommand;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\EditAttributeGroupCommand;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupConstraintException;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupNotFoundException;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\InvalidAttributeGroupTypeException;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Query\GetAttributeGroupForEditing;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Query\GetAttributeGroupList;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\QueryResult\AttributeGroup;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\QueryResult\EditableAttributeGroup;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupId;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupType;
-use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\DeleteAttributeGroupCommand;
-use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupNotFoundException;
-use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Query\GetAttributeGroupList;
 use PrestaShop\PrestaShop\Core\Domain\Product\AttributeGroup\Query\GetProductAttributeGroups;
 use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopConstraint;
 use RuntimeException;

From c1af84ca6585a7b8c2790584532d609a3c2f1bae Mon Sep 17 00:00:00 2001
From: jevgenijvisockij <jevgenij.visockij@gmail.com>
Date: Tue, 18 Apr 2023 14:39:59 +0300
Subject: [PATCH 0967/1030] Updated phpdoc for AttributeGroupFeatureContext.php

---
 .../Context/Domain/AttributeGroupFeatureContext.php        | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
index 53a39a99501d9..e17ad63004129 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
@@ -526,13 +526,14 @@ private function performAttributesInGroupAssertion(?TableNode $tableNode, array
     }
 
     /**
-     * @param string $nameInDefaultLanguage
-     * @param string $publicNameInDefaultLanguage
+     * @param array $localizedNames
+     * @param array $localizedPublicNames
      * @param string $type
      *
      * @return AttributeGroupId
      *
-     * @throws AttributeGroupConstraintException|InvalidAttributeGroupTypeException
+     * @throws AttributeGroupConstraintException
+     * @throws InvalidAttributeGroupTypeException
      */
     private function createAttributeGroupUsingCommand(array $localizedNames, array $localizedPublicNames, string $type): AttributeGroupId
     {

From 594c6cca1da5ea0a3208d49621f5054d1fbcd096 Mon Sep 17 00:00:00 2001
From: JevgenijVisockij <47781757+JevgenijVisockij@users.noreply.github.com>
Date: Wed, 19 Apr 2023 09:52:37 +0300
Subject: [PATCH 0968/1030] Update
 tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Updated array definition in docs

Co-authored-by: Julius Žukauskas <31609858+zuk3975@users.noreply.github.com>
---
 .../Features/Context/Domain/AttributeGroupFeatureContext.php  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
index e17ad63004129..0d170941dd1cb 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
@@ -526,8 +526,8 @@ private function performAttributesInGroupAssertion(?TableNode $tableNode, array
     }
 
     /**
-     * @param array $localizedNames
-     * @param array $localizedPublicNames
+     * @param array<int, string> $localizedNames
+     * @param array<int, string> $localizedPublicNames
      * @param string $type
      *
      * @return AttributeGroupId

From b85cdbb22881d588f100114084a6c9c3fd436d50 Mon Sep 17 00:00:00 2001
From: jevgenijvisockij <jevgenij.visockij@gmail.com>
Date: Wed, 19 Apr 2023 09:53:31 +0300
Subject: [PATCH 0969/1030] PHP stan fix

---
 .../Context/Domain/AttributeGroupFeatureContext.php      | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
index 0d170941dd1cb..8085ccc090b55 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
@@ -549,13 +549,14 @@ private function createAttributeGroupUsingCommand(array $localizedNames, array $
 
     /**
      * @param int $attributeGroupId
-     * @param string $nameInDefaultLanguage
-     * @param string $publicNameInDefaultLanguage
+     * @param array<int, string> $localizedNames
+     * @param array<int, string> $localizedPublicNames
      * @param string $type
      *
-     * @return AttributeGroupId
+     * @return void
      *
-     * @throws AttributeGroupConstraintException|InvalidAttributeGroupTypeException
+     * @throws AttributeGroupConstraintException
+     * @throws InvalidAttributeGroupTypeException
      */
     private function editAttributeGroupUsingCommand(
         int $attributeGroupId,

From 840a17bb96911ced1c6a1ac1871679583eb9f8de Mon Sep 17 00:00:00 2001
From: JevgenijVisockij <47781757+JevgenijVisockij@users.noreply.github.com>
Date: Wed, 26 Apr 2023 18:03:58 +0300
Subject: [PATCH 0970/1030] Apply suggestions from code review

Code review changes

Co-authored-by: Jonathan Lelievre <jo.lelievre@gmail.com>
---
 .../CommandHandler/EditAttributeGroupHandler.php             | 2 +-
 .../QueryHandler/GetAttributeGroupForEditingHandler.php      | 5 ++---
 .../AttributeGroup/Repository/AttributeGroupRepository.php   | 2 +-
 .../Domain/AttributeGroup/ValueObject/AttributeGroupId.php   | 2 +-
 .../Admin/Sell/Catalog/AttributeGroupController.php          | 4 ++--
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/Adapter/AttributeGroup/CommandHandler/EditAttributeGroupHandler.php b/src/Adapter/AttributeGroup/CommandHandler/EditAttributeGroupHandler.php
index 86fa502f041e5..b9d4df2484351 100644
--- a/src/Adapter/AttributeGroup/CommandHandler/EditAttributeGroupHandler.php
+++ b/src/Adapter/AttributeGroup/CommandHandler/EditAttributeGroupHandler.php
@@ -53,7 +53,7 @@ public function __construct(AttributeGroupRepository $attributeGroupRepository)
      */
     public function handle(EditAttributeGroupCommand $command): void
     {
-        $attributeGroup = new \AttributeGroup($command->getAttributeGroupId()->getValue());
+        $attributeGroup = $this->attributeGroupRepository->get($command->getAttributeGroupId()->getValue());
 
         $attributeGroup->name = $command->getLocalizedNames();
         $attributeGroup->public_name = $command->getLocalizedPublicNames();
diff --git a/src/Adapter/AttributeGroup/QueryHandler/GetAttributeGroupForEditingHandler.php b/src/Adapter/AttributeGroup/QueryHandler/GetAttributeGroupForEditingHandler.php
index 4dbe1d2fd10ea..6ee62da5be6e6 100644
--- a/src/Adapter/AttributeGroup/QueryHandler/GetAttributeGroupForEditingHandler.php
+++ b/src/Adapter/AttributeGroup/QueryHandler/GetAttributeGroupForEditingHandler.php
@@ -53,11 +53,10 @@ public function __construct(AttributeGroupRepository $attributeGroupRepository)
      */
     public function handle(GetAttributeGroupForEditing $query): EditableAttributeGroup
     {
-        $attributeGroupId = $query->getAttributeGroupId();
-        $attributeGroup = $this->attributeGroupRepository->get($attributeGroupId);
+        $attributeGroup = $this->attributeGroupRepository->get($query->getAttributeGroupId());
 
         return new EditableAttributeGroup(
-            $attributeGroupId,
+            $query->getAttributeGroupId(),
             $attributeGroup->name,
             $attributeGroup->public_name,
             $attributeGroup->group_type,
diff --git a/src/Adapter/AttributeGroup/Repository/AttributeGroupRepository.php b/src/Adapter/AttributeGroup/Repository/AttributeGroupRepository.php
index f0fb82ccc0556..03a604b16c6b6 100644
--- a/src/Adapter/AttributeGroup/Repository/AttributeGroupRepository.php
+++ b/src/Adapter/AttributeGroup/Repository/AttributeGroupRepository.php
@@ -98,7 +98,7 @@ public function get(AttributeGroupId $attributeGroupId): AttributeGroup
     public function add(AttributeGroup $attributeGroup, int $errorCode = 0): AttributeGroupId
     {
         $this->validator->validate($attributeGroup);
-        $id = $this->addObjectModel($attributeGroup, CannotAddAttributeGroupException::class, $errorCode);
+        $id = $this->addObjectModel($attributeGroup, CannotAddAttributeGroupException::class);
 
         return new AttributeGroupId($id);
     }
diff --git a/src/Core/Domain/AttributeGroup/ValueObject/AttributeGroupId.php b/src/Core/Domain/AttributeGroup/ValueObject/AttributeGroupId.php
index d0ff147692fcd..8db6d561fcd12 100644
--- a/src/Core/Domain/AttributeGroup/ValueObject/AttributeGroupId.php
+++ b/src/Core/Domain/AttributeGroup/ValueObject/AttributeGroupId.php
@@ -65,7 +65,7 @@ public function getValue(): int
      */
     private function assertIntegerIsGreaterThanZero(int $attributeGroupId): void
     {
-        if (0 > $attributeGroupId) {
+        if (0 >= $attributeGroupId) {
             throw new AttributeGroupConstraintException(
                 sprintf('Invalid attributeGroup id %s supplied. Attribute group ID must be a positive integer.', $attributeGroupId),
                 AttributeGroupConstraintException::INVALID_ID
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php
index 053639de4bd2d..b75391e9ee099 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php
@@ -88,8 +88,8 @@ public function indexAction(Request $request, AttributeGroupFilters $attributeGr
      */
     public function createAction(Request $request): Response
     {
-        $attributeGroupFormBuilder = $this->get('PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\AttributeGroupFormBuilder');
-        $attributeFormHandler = $this->get('PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Handler\AttributeGroupFormHandler');
+        $attributeGroupFormBuilder = $this->get(AttributeGroupFormBuilder::class);
+        $attributeFormHandler = $this->get(AttributeGroupFormHandler::class);
 
         $attributeGroupForm = $attributeGroupFormBuilder->getForm();
         $attributeGroupForm->handleRequest($request);

From 7fa4f83f05bdb301f91c87a1d75fb860d74b5902 Mon Sep 17 00:00:00 2001
From: jevgenijvisockij <jevgenij.visockij@gmail.com>
Date: Tue, 2 May 2023 09:10:47 +0300
Subject: [PATCH 0971/1030] Code review fixes

---
 .../CommandHandler/AddAttributeGroupHandler.php      |  3 ++-
 .../Form/Admin/Sell/Catalog/AttributeGroupType.php   | 12 +++++-------
 .../config/services/adapter/attribute_group.yml      |  5 -----
 .../Sell/Catalog/AttributeGroup/create.html.twig     |  1 -
 .../Admin/Sell/Catalog/AttributeGroup/edit.html.twig |  1 -
 5 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/Adapter/AttributeGroup/CommandHandler/AddAttributeGroupHandler.php b/src/Adapter/AttributeGroup/CommandHandler/AddAttributeGroupHandler.php
index 7739d4aeb5e3f..d3070460d7acb 100644
--- a/src/Adapter/AttributeGroup/CommandHandler/AddAttributeGroupHandler.php
+++ b/src/Adapter/AttributeGroup/CommandHandler/AddAttributeGroupHandler.php
@@ -28,6 +28,7 @@
 
 namespace PrestaShop\PrestaShop\Adapter\AttributeGroup\CommandHandler;
 
+use AttributeGroup;
 use PrestaShop\PrestaShop\Adapter\AttributeGroup\Repository\AttributeGroupRepository;
 use PrestaShop\PrestaShop\Adapter\Domain\AbstractObjectModelHandler;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\AddAttributeGroupCommand;
@@ -54,7 +55,7 @@ public function __construct(AttributeGroupRepository $attributeGroupRepository)
      */
     public function handle(AddAttributeGroupCommand $command): AttributeGroupId
     {
-        $attributeGroup = new \AttributeGroup();
+        $attributeGroup = new AttributeGroup();
 
         $attributeGroup->name = $command->getLocalizedNames();
         $attributeGroup->public_name = $command->getLocalizedPublicNames();
diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeGroupType.php b/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeGroupType.php
index 73f57c3c88387..7c4b12c59f98a 100644
--- a/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeGroupType.php
+++ b/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeGroupType.php
@@ -71,12 +71,6 @@ public function __construct(
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $attributeTypes = [
-            $this->trans('Drop-down list', 'Admin.Global') => GroupType::ATTRIBUTE_GROUP_TYPE_SELECT,
-            $this->trans('Radio buttons', 'Admin.Global') => GroupType::ATTRIBUTE_GROUP_TYPE_RADIO,
-            $this->trans('Color or texture', 'Admin.Catalog.Feature') => GroupType::ATTRIBUTE_GROUP_TYPE_COLOR,
-        ];
-
         $builder
             ->add('name', TranslatableType::class, [
                 'type' => TextType::class,
@@ -109,7 +103,11 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add('group_type', ChoiceType::class, [
                 'label' => $this->trans('Attribute type', 'Admin.Catalog.Feature'),
                 'help' => $this->trans('The way the attribute\'s values will be presented to the customers in the product\'s page.', 'Admin.Catalog.Help'),
-                'choices' => $attributeTypes,
+                'choices' => [
+                    $this->trans('Drop-down list', 'Admin.Global') => GroupType::ATTRIBUTE_GROUP_TYPE_SELECT,
+                    $this->trans('Radio buttons', 'Admin.Global') => GroupType::ATTRIBUTE_GROUP_TYPE_RADIO,
+                    $this->trans('Color or texture', 'Admin.Catalog.Feature') => GroupType::ATTRIBUTE_GROUP_TYPE_COLOR,
+                ],
             ]);
 
         if ($this->isMultistoreEnabled) {
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/attribute_group.yml b/src/PrestaShopBundle/Resources/config/services/adapter/attribute_group.yml
index 9aefda7ea1931..6d54daa3b7f72 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/attribute_group.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/attribute_group.yml
@@ -20,11 +20,6 @@ services:
       - name: tactician.handler
         command: PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Query\GetAttributeGroupForEditing
 
-  PrestaShop\PrestaShop\Adapter\Product\AttributeGroup\AttributeGroupViewDataProvider:
-    arguments:
-      - "@=service('prestashop.adapter.legacy.context').getContext().language.id"
-      - '@PrestaShop\PrestaShop\Core\ConfigurationInterface'
-
   PrestaShop\PrestaShop\Adapter\AttributeGroup\AttributeGroupViewDataProvider:
     arguments:
       - "@=service('prestashop.adapter.legacy.context').getContext().language.id"
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/create.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/create.html.twig
index edeb48aadf789..ff4c51f3c71e6 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/create.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/create.html.twig
@@ -27,7 +27,6 @@
 
 {% block content %}
     {% include '@PrestaShop/Admin/Sell/Catalog/AttributeGroup/Blocks/form.html.twig' with {
-      attributeId: null,
       attributeForm: attributeGroupForm
     } %}
 {% endblock %}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/edit.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/edit.html.twig
index 90851d40e894b..a2d556c1cf36f 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/edit.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Sell/Catalog/AttributeGroup/edit.html.twig
@@ -27,7 +27,6 @@
 
 {% block content %}
   {% include '@PrestaShop/Admin/Sell/Catalog/AttributeGroup/Blocks/form.html.twig' with {
-    attributeId: attributeGroupId,
     attributeForm: attributeGroupForm
   } %}
 {% endblock %}

From 46f6e780042d8e329ef59756803244119b11069d Mon Sep 17 00:00:00 2001
From: JevgenijVisockij <47781757+JevgenijVisockij@users.noreply.github.com>
Date: Tue, 2 May 2023 09:13:44 +0300
Subject: [PATCH 0972/1030] Apply suggestions from code review

Co-authored-by: Jonathan Lelievre <jo.lelievre@gmail.com>
---
 .../AttributeGroup/Command/AddAttributeGroupCommand.php       | 4 ++--
 .../AttributeGroup/Command/EditAttributeGroupCommand.php      | 2 +-
 .../AttributeGroup/QueryResult/EditableAttributeGroup.php     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Core/Domain/AttributeGroup/Command/AddAttributeGroupCommand.php b/src/Core/Domain/AttributeGroup/Command/AddAttributeGroupCommand.php
index c5dbc1d808d1a..0f4ee40f0d47b 100644
--- a/src/Core/Domain/AttributeGroup/Command/AddAttributeGroupCommand.php
+++ b/src/Core/Domain/AttributeGroup/Command/AddAttributeGroupCommand.php
@@ -64,7 +64,7 @@ class AddAttributeGroupCommand
      *
      * @throws AttributeGroupConstraintException
      */
-    public function __construct(array $localizedNames, array $localizedPublicNames, AttributeGroupType $type, array $shopAssociation = [])
+    public function __construct(array $localizedNames, array $localizedPublicNames, string $type, array $shopAssociation)
     {
         $this->assertNamesAreValid(
             $localizedNames,
@@ -79,7 +79,7 @@ public function __construct(array $localizedNames, array $localizedPublicNames,
 
         $this->localizedNames = $localizedNames;
         $this->localizedPublicNames = $localizedPublicNames;
-        $this->type = $type;
+        $this->type = new AttributeGroupType ($type);
         $this->shopAssociation = $shopAssociation;
     }
 
diff --git a/src/Core/Domain/AttributeGroup/Command/EditAttributeGroupCommand.php b/src/Core/Domain/AttributeGroup/Command/EditAttributeGroupCommand.php
index bf620c9b79690..25bd5b94ed517 100644
--- a/src/Core/Domain/AttributeGroup/Command/EditAttributeGroupCommand.php
+++ b/src/Core/Domain/AttributeGroup/Command/EditAttributeGroupCommand.php
@@ -73,7 +73,7 @@ public function __construct(
         array $localizedNames,
         array $localizedPublicNames,
         AttributeGroupType $type,
-        array $shopAssociation = []
+        array $shopAssociation = null
     ) {
         $this->attributeGroupId = new AttributeGroupId($attributeGroupId);
         $this->assertNamesAreValid(
diff --git a/src/Core/Domain/AttributeGroup/QueryResult/EditableAttributeGroup.php b/src/Core/Domain/AttributeGroup/QueryResult/EditableAttributeGroup.php
index f4a2d78881668..5712d0d245eaa 100644
--- a/src/Core/Domain/AttributeGroup/QueryResult/EditableAttributeGroup.php
+++ b/src/Core/Domain/AttributeGroup/QueryResult/EditableAttributeGroup.php
@@ -68,7 +68,7 @@ class EditableAttributeGroup
      * @param int[] $associatedShopIds
      */
     public function __construct(
-        AttributeGroupId $attributeGroupId,
+        int $attributeGroupId,
         array $name,
         array $publicName,
         string $type,

From d38a779dbad06a6c9ab55acad0b084acc009f3fe Mon Sep 17 00:00:00 2001
From: jevgenijvisockij <jevgenij.visockij@gmail.com>
Date: Tue, 2 May 2023 10:17:08 +0300
Subject: [PATCH 0973/1030] Code review fixes

---
 .../form/attribute-group-form-map.ts          | 31 +++++++++++++++++++
 .../js/pages/attribute-group/form/index.ts    |  5 +--
 .../Repository/AttributeGroupRepository.php   |  3 +-
 .../Command/AddAttributeGroupCommand.php      |  6 ++--
 .../Command/EditAttributeGroupCommand.php     | 11 +++++--
 .../QueryResult/EditableAttributeGroup.php    |  2 +-
 .../Sell/Catalog/AttributeGroupController.php |  9 ++++--
 .../Domain/AttributeGroupFeatureContext.php   | 26 ----------------
 8 files changed, 54 insertions(+), 39 deletions(-)
 create mode 100644 admin-dev/themes/new-theme/js/pages/attribute-group/form/attribute-group-form-map.ts

diff --git a/admin-dev/themes/new-theme/js/pages/attribute-group/form/attribute-group-form-map.ts b/admin-dev/themes/new-theme/js/pages/attribute-group/form/attribute-group-form-map.ts
new file mode 100644
index 0000000000000..d01e19912d1db
--- /dev/null
+++ b/admin-dev/themes/new-theme/js/pages/attribute-group/form/attribute-group-form-map.ts
@@ -0,0 +1,31 @@
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+/**
+ * Defines all selectors that are used in customers address add/edit form.
+ */
+export default {
+  attributeGroupShopAssociationInput: '#attribute_group_shop_association',
+};
diff --git a/admin-dev/themes/new-theme/js/pages/attribute-group/form/index.ts b/admin-dev/themes/new-theme/js/pages/attribute-group/form/index.ts
index e082b443aabc6..cc33062c5bc3c 100644
--- a/admin-dev/themes/new-theme/js/pages/attribute-group/form/index.ts
+++ b/admin-dev/themes/new-theme/js/pages/attribute-group/form/index.ts
@@ -23,7 +23,8 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
-// @ts-ignore
+import AttributeGroupFormMap from '@pages/attribute-group/form/attribute-group-form-map';
+
 const {$} = window;
 
 $(() => {
@@ -34,5 +35,5 @@ $(() => {
     ],
   );
 
-  new window.prestashop.component.ChoiceTree('#attribute_group_shop_association').enableAutoCheckChildren();
+  new window.prestashop.component.ChoiceTree(AttributeGroupFormMap.attributeGroupShopAssociationInput).enableAutoCheckChildren();
 });
diff --git a/src/Adapter/AttributeGroup/Repository/AttributeGroupRepository.php b/src/Adapter/AttributeGroup/Repository/AttributeGroupRepository.php
index 03a604b16c6b6..9edef6bf003ea 100644
--- a/src/Adapter/AttributeGroup/Repository/AttributeGroupRepository.php
+++ b/src/Adapter/AttributeGroup/Repository/AttributeGroupRepository.php
@@ -89,13 +89,12 @@ public function get(AttributeGroupId $attributeGroupId): AttributeGroup
 
     /**
      * @param AttributeGroup $attributeGroup
-     * @param int $errorCode
      *
      * @return AttributeGroupId
      *
      * @throws CoreException
      */
-    public function add(AttributeGroup $attributeGroup, int $errorCode = 0): AttributeGroupId
+    public function add(AttributeGroup $attributeGroup): AttributeGroupId
     {
         $this->validator->validate($attributeGroup);
         $id = $this->addObjectModel($attributeGroup, CannotAddAttributeGroupException::class);
diff --git a/src/Core/Domain/AttributeGroup/Command/AddAttributeGroupCommand.php b/src/Core/Domain/AttributeGroup/Command/AddAttributeGroupCommand.php
index 0f4ee40f0d47b..089029d7caddc 100644
--- a/src/Core/Domain/AttributeGroup/Command/AddAttributeGroupCommand.php
+++ b/src/Core/Domain/AttributeGroup/Command/AddAttributeGroupCommand.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command;
 
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupConstraintException;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\InvalidAttributeGroupTypeException;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupType;
 
 /**
@@ -59,10 +60,11 @@ class AddAttributeGroupCommand
     /**
      * @param string[] $localizedNames
      * @param array $localizedPublicNames
-     * @param AttributeGroupType $type
+     * @param string $type
      * @param int[] $shopAssociation
      *
      * @throws AttributeGroupConstraintException
+     * @throws InvalidAttributeGroupTypeException
      */
     public function __construct(array $localizedNames, array $localizedPublicNames, string $type, array $shopAssociation)
     {
@@ -79,7 +81,7 @@ public function __construct(array $localizedNames, array $localizedPublicNames,
 
         $this->localizedNames = $localizedNames;
         $this->localizedPublicNames = $localizedPublicNames;
-        $this->type = new AttributeGroupType ($type);
+        $this->type = new AttributeGroupType($type);
         $this->shopAssociation = $shopAssociation;
     }
 
diff --git a/src/Core/Domain/AttributeGroup/Command/EditAttributeGroupCommand.php b/src/Core/Domain/AttributeGroup/Command/EditAttributeGroupCommand.php
index 25bd5b94ed517..3d8315eed4c9d 100644
--- a/src/Core/Domain/AttributeGroup/Command/EditAttributeGroupCommand.php
+++ b/src/Core/Domain/AttributeGroup/Command/EditAttributeGroupCommand.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command;
 
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupConstraintException;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\InvalidAttributeGroupTypeException;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupId;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupType;
 
@@ -63,17 +64,21 @@ class EditAttributeGroupCommand
     private $type;
 
     /**
+     * @param int $attributeGroupId
      * @param string[] $localizedNames
+     * @param array $localizedPublicNames
+     * @param string $type
      * @param int[] $shopAssociation
      *
      * @throws AttributeGroupConstraintException
+     * @throws InvalidAttributeGroupTypeException
      */
     public function __construct(
         int $attributeGroupId,
         array $localizedNames,
         array $localizedPublicNames,
-        AttributeGroupType $type,
-        array $shopAssociation = null
+        string $type,
+        array $shopAssociation
     ) {
         $this->attributeGroupId = new AttributeGroupId($attributeGroupId);
         $this->assertNamesAreValid(
@@ -88,7 +93,7 @@ public function __construct(
         );
         $this->localizedNames = $localizedNames;
         $this->localizedPublicNames = $localizedPublicNames;
-        $this->type = $type;
+        $this->type = new AttributeGroupType($type);
         $this->shopAssociation = $shopAssociation;
     }
 
diff --git a/src/Core/Domain/AttributeGroup/QueryResult/EditableAttributeGroup.php b/src/Core/Domain/AttributeGroup/QueryResult/EditableAttributeGroup.php
index 5712d0d245eaa..74ef535e7dea0 100644
--- a/src/Core/Domain/AttributeGroup/QueryResult/EditableAttributeGroup.php
+++ b/src/Core/Domain/AttributeGroup/QueryResult/EditableAttributeGroup.php
@@ -61,7 +61,7 @@ class EditableAttributeGroup
     private $type;
 
     /**
-     * @param AttributeGroupId $attributeGroupId
+     * @param int $attributeGroupId
      * @param string[] $name
      * @param array $publicName
      * @param string $type
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php
index b75391e9ee099..7e96bf1869d55 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php
@@ -88,8 +88,8 @@ public function indexAction(Request $request, AttributeGroupFilters $attributeGr
      */
     public function createAction(Request $request): Response
     {
-        $attributeGroupFormBuilder = $this->get(AttributeGroupFormBuilder::class);
-        $attributeFormHandler = $this->get(AttributeGroupFormHandler::class);
+        $attributeGroupFormBuilder = $this->get('PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\AttributeGroupFormBuilder');
+        $attributeFormHandler = $this->get('PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Handler\AttributeGroupFormHandler');
 
         $attributeGroupForm = $attributeGroupFormBuilder->getForm();
         $attributeGroupForm->handleRequest($request);
@@ -145,13 +145,16 @@ public function editAction(Request $request, int $attributeGroupId): Response
             $this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages()));
         }
 
+        $formData = $attributeGroupForm->getData();
+        $attributeGroupName = $formData['name'][$this->getContextLangId()] ?? reset($formData['name']);
+
         return $this->render(
             '@PrestaShop/Admin/Sell/Catalog/AttributeGroup/edit.html.twig',
             [
                 'layoutTitle' => $this->trans(
                     'Editing attribute %name%',
                     'Admin.Navigation.Menu',
-                    ['%name%' => $attributeGroupForm->getData()['name'][$this->getContextLangId()]]
+                    ['%name%' => $attributeGroupName]
                 ),
                 'attributeGroupForm' => $attributeGroupForm->createView(),
                 'attributeGroupId' => $attributeGroupId,
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
index 8085ccc090b55..1eb60f6a5a604 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
@@ -100,32 +100,6 @@ public function assertAttributeGroupIsDeleted(string $reference): void
         }
     }
 
-    /**
-     * @Then attribute group :reference :field should be :value
-     */
-    public function assertFieldValue(string $reference, string $field, string $value): void
-    {
-        $attributeGroupId = SharedStorage::getStorage()->get($reference);
-        $attributeGroup = new \AttributeGroup($attributeGroupId);
-
-        if ($attributeGroup->$field !== $value) {
-            throw new RuntimeException(sprintf('Attribute group "%s" has "%s" %s, but "%s" was expected.', $reference, $attributeGroup->$field, $field, $value));
-        }
-    }
-
-    /**
-     * @Then attribute group :reference :field in default language should be :value
-     */
-    public function assertFieldWithLangValue(string $reference, string $field, string $value): void
-    {
-        $attributeGroupId = $this->referenceToId($reference);
-        $attributeGroup = new \AttributeGroup($attributeGroupId);
-
-        if ($attributeGroup->$field[$this->getDefaultLangId()] !== $value) {
-            throw new RuntimeException(sprintf('Attribute group "%s" has "%s" %s, but "%s" was expected.', $reference, $attributeGroup->$field[$this->getDefaultLangId()], $field, $value));
-        }
-    }
-
     /**
      * @Then attribute group :reference should have the following properties:
      *

From c174a8162c2e910e15f4eea909724871e4e18ac0 Mon Sep 17 00:00:00 2001
From: jevgenijvisockij <jevgenij.visockij@gmail.com>
Date: Tue, 2 May 2023 10:24:15 +0300
Subject: [PATCH 0974/1030] Fixed not working update and add commands

---
 .../DataHandler/AttributeGroupFormDataHandler.php           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Core/Form/IdentifiableObject/DataHandler/AttributeGroupFormDataHandler.php b/src/Core/Form/IdentifiableObject/DataHandler/AttributeGroupFormDataHandler.php
index 57b32efd9fd10..38455a3151feb 100644
--- a/src/Core/Form/IdentifiableObject/DataHandler/AttributeGroupFormDataHandler.php
+++ b/src/Core/Form/IdentifiableObject/DataHandler/AttributeGroupFormDataHandler.php
@@ -61,8 +61,8 @@ public function create(array $data)
         $attributeGroupId = $this->commandBus->handle(new AddAttributeGroupCommand(
             $data['name'],
             $data['public_name'],
-            (new AttributeGroupType($data['group_type'])),
-            $data['shop_association'] ?? []
+            $data['group_type'],
+            $data['shop_association']
         ));
 
         return $attributeGroupId->getValue();
@@ -78,7 +78,7 @@ public function update($id, array $data)
             (int) $id,
             $data['name'],
             $data['public_name'],
-            (new AttributeGroupType($data['group_type'])),
+            $data['group_type'],
             $data['shop_association'] ?? []
         ));
     }

From efb45886987d62dbaf8938ecbe06fcf3336e7804 Mon Sep 17 00:00:00 2001
From: jevgenijvisockij <jevgenij.visockij@gmail.com>
Date: Tue, 2 May 2023 10:36:37 +0300
Subject: [PATCH 0975/1030] CS fixer fix

---
 .../Features/Context/Domain/AttributeGroupFeatureContext.php     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
index 1eb60f6a5a604..bc18249a8ca42 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
@@ -45,7 +45,6 @@
 use PrestaShop\PrestaShop\Core\Domain\Product\AttributeGroup\Query\GetProductAttributeGroups;
 use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopConstraint;
 use RuntimeException;
-use Tests\Integration\Behaviour\Features\Context\SharedStorage;
 use Tests\Integration\Behaviour\Features\Context\Util\NoExceptionAlthoughExpectedException;
 use Tests\Integration\Behaviour\Features\Context\Util\PrimitiveUtils;
 

From a36be2eecdcf0f2df9542a54595f9a451ec5ea54 Mon Sep 17 00:00:00 2001
From: jevgenijvisockij <jevgenij.visockij@gmail.com>
Date: Tue, 2 May 2023 10:56:21 +0300
Subject: [PATCH 0976/1030] CS Fixer fixes

---
 .../CommandHandler/EditAttributeGroupHandler.php              | 2 +-
 .../QueryHandler/GetAttributeGroupForEditingHandler.php       | 2 +-
 .../AttributeGroup/QueryResult/EditableAttributeGroup.php     | 2 +-
 .../DataHandler/AttributeGroupFormDataHandler.php             | 1 -
 .../Features/Context/Domain/AttributeGroupFeatureContext.php  | 4 ++--
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/Adapter/AttributeGroup/CommandHandler/EditAttributeGroupHandler.php b/src/Adapter/AttributeGroup/CommandHandler/EditAttributeGroupHandler.php
index b9d4df2484351..9a52a05b2d7a1 100644
--- a/src/Adapter/AttributeGroup/CommandHandler/EditAttributeGroupHandler.php
+++ b/src/Adapter/AttributeGroup/CommandHandler/EditAttributeGroupHandler.php
@@ -53,7 +53,7 @@ public function __construct(AttributeGroupRepository $attributeGroupRepository)
      */
     public function handle(EditAttributeGroupCommand $command): void
     {
-        $attributeGroup = $this->attributeGroupRepository->get($command->getAttributeGroupId()->getValue());
+        $attributeGroup = $this->attributeGroupRepository->get($command->getAttributeGroupId());
 
         $attributeGroup->name = $command->getLocalizedNames();
         $attributeGroup->public_name = $command->getLocalizedPublicNames();
diff --git a/src/Adapter/AttributeGroup/QueryHandler/GetAttributeGroupForEditingHandler.php b/src/Adapter/AttributeGroup/QueryHandler/GetAttributeGroupForEditingHandler.php
index 6ee62da5be6e6..f9a0a3bbf0129 100644
--- a/src/Adapter/AttributeGroup/QueryHandler/GetAttributeGroupForEditingHandler.php
+++ b/src/Adapter/AttributeGroup/QueryHandler/GetAttributeGroupForEditingHandler.php
@@ -56,7 +56,7 @@ public function handle(GetAttributeGroupForEditing $query): EditableAttributeGro
         $attributeGroup = $this->attributeGroupRepository->get($query->getAttributeGroupId());
 
         return new EditableAttributeGroup(
-            $query->getAttributeGroupId(),
+            $query->getAttributeGroupId()->getValue(),
             $attributeGroup->name,
             $attributeGroup->public_name,
             $attributeGroup->group_type,
diff --git a/src/Core/Domain/AttributeGroup/QueryResult/EditableAttributeGroup.php b/src/Core/Domain/AttributeGroup/QueryResult/EditableAttributeGroup.php
index 74ef535e7dea0..446d287a3114d 100644
--- a/src/Core/Domain/AttributeGroup/QueryResult/EditableAttributeGroup.php
+++ b/src/Core/Domain/AttributeGroup/QueryResult/EditableAttributeGroup.php
@@ -74,7 +74,7 @@ public function __construct(
         string $type,
         array $associatedShopIds
     ) {
-        $this->attributeGroupId = $attributeGroupId;
+        $this->attributeGroupId = new AttributeGroupId($attributeGroupId);
         $this->name = $name;
         $this->associatedShopIds = $associatedShopIds;
         $this->publicName = $publicName;
diff --git a/src/Core/Form/IdentifiableObject/DataHandler/AttributeGroupFormDataHandler.php b/src/Core/Form/IdentifiableObject/DataHandler/AttributeGroupFormDataHandler.php
index 38455a3151feb..59b1eb9b6fa26 100644
--- a/src/Core/Form/IdentifiableObject/DataHandler/AttributeGroupFormDataHandler.php
+++ b/src/Core/Form/IdentifiableObject/DataHandler/AttributeGroupFormDataHandler.php
@@ -32,7 +32,6 @@
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\AddAttributeGroupCommand;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\EditAttributeGroupCommand;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupId;
-use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupType;
 
 /**
  * Handles data of submitted Attribute Group form.
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
index bc18249a8ca42..7791515c34010 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
@@ -513,7 +513,7 @@ private function createAttributeGroupUsingCommand(array $localizedNames, array $
         $command = new AddAttributeGroupCommand(
             $localizedNames,
             $localizedPublicNames,
-            (new AttributeGroupType($type)),
+            $type,
             [$this->getDefaultShopId()]
         );
 
@@ -541,7 +541,7 @@ private function editAttributeGroupUsingCommand(
             $attributeGroupId,
             $localizedNames,
             $localizedPublicNames,
-            (new AttributeGroupType($type)),
+            $type,
             [$this->getDefaultShopId()]
         );
 

From 8cdf3b6a60159a26db514d2c0c6b113d9b7f0bf3 Mon Sep 17 00:00:00 2001
From: jevgenijvisockij <jevgenij.visockij@gmail.com>
Date: Tue, 2 May 2023 17:07:00 +0300
Subject: [PATCH 0977/1030] Fixed multistore not working properly

---
 .../DataHandler/AttributeGroupFormDataHandler.php          | 2 +-
 .../Form/Admin/Sell/Catalog/AttributeGroupType.php         | 7 ++-----
 .../Context/Domain/AttributeGroupFeatureContext.php        | 1 -
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/Core/Form/IdentifiableObject/DataHandler/AttributeGroupFormDataHandler.php b/src/Core/Form/IdentifiableObject/DataHandler/AttributeGroupFormDataHandler.php
index 59b1eb9b6fa26..133773b12dff6 100644
--- a/src/Core/Form/IdentifiableObject/DataHandler/AttributeGroupFormDataHandler.php
+++ b/src/Core/Form/IdentifiableObject/DataHandler/AttributeGroupFormDataHandler.php
@@ -78,7 +78,7 @@ public function update($id, array $data)
             $data['name'],
             $data['public_name'],
             $data['group_type'],
-            $data['shop_association'] ?? []
+            $data['shop_association']
         ));
     }
 }
diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeGroupType.php b/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeGroupType.php
index 7c4b12c59f98a..5c903cf63b832 100644
--- a/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeGroupType.php
+++ b/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeGroupType.php
@@ -108,10 +108,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     $this->trans('Radio buttons', 'Admin.Global') => GroupType::ATTRIBUTE_GROUP_TYPE_RADIO,
                     $this->trans('Color or texture', 'Admin.Catalog.Feature') => GroupType::ATTRIBUTE_GROUP_TYPE_COLOR,
                 ],
-            ]);
-
-        if ($this->isMultistoreEnabled) {
-            $builder->add('shop_association', ShopChoiceTreeType::class, [
+            ])->add('shop_association', ShopChoiceTreeType::class, [
                 'label' => $this->trans('Shop association', 'Admin.Global'),
                 'required' => false,
                 'constraints' => [
@@ -122,7 +119,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     ]),
                 ],
             ]);
-        }
+
     }
 
     public function configureOptions(OptionsResolver $resolver): void
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
index 7791515c34010..38f8842241861 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
@@ -41,7 +41,6 @@
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\QueryResult\AttributeGroup;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\QueryResult\EditableAttributeGroup;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupId;
-use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupType;
 use PrestaShop\PrestaShop\Core\Domain\Product\AttributeGroup\Query\GetProductAttributeGroups;
 use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopConstraint;
 use RuntimeException;

From 2fc82fb1bf51515d3bc6ee2bae72489902609048 Mon Sep 17 00:00:00 2001
From: jevgenijvisockij <jevgenij.visockij@gmail.com>
Date: Wed, 3 May 2023 15:58:22 +0300
Subject: [PATCH 0978/1030] Cs fixer fix

---
 .../Form/Admin/Sell/Catalog/AttributeGroupType.php   | 12 +-----------
 .../config/services/bundle/form/form_type.yml        |  2 --
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeGroupType.php b/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeGroupType.php
index 5c903cf63b832..4a10f9e2488ea 100644
--- a/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeGroupType.php
+++ b/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeGroupType.php
@@ -46,24 +46,15 @@
  */
 class AttributeGroupType extends TranslatorAwareType
 {
-    /**
-     * @var bool
-     */
-    private $isMultistoreEnabled;
-
     /**
      * @param TranslatorInterface $translator
      * @param array $locales
-     * @param bool $isMultistoreEnabled
      */
     public function __construct(
         TranslatorInterface $translator,
-        array $locales,
-        bool $isMultistoreEnabled
+        array $locales
     ) {
         parent::__construct($translator, $locales);
-
-        $this->isMultistoreEnabled = $isMultistoreEnabled;
     }
 
     /**
@@ -119,7 +110,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     ]),
                 ],
             ]);
-
     }
 
     public function configureOptions(OptionsResolver $resolver): void
diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
index 79d6498f4c689..e186c0f5ff0cd 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
@@ -433,8 +433,6 @@ services:
   PrestaShopBundle\Form\Admin\Sell\Catalog\FeatureType: ~
   PrestaShopBundle\Form\Admin\Sell\Catalog\FeatureValueType: ~
   PrestaShopBundle\Form\Admin\Sell\Catalog\AttributeGroupType:
-    arguments:
-      $isMultistoreEnabled: '@=service("prestashop.adapter.multistore_feature").isActive()'
     tags:
       - { name: form.type }
 

From bd3f85c9f3da015af6cb747028b9f13d42d2f134 Mon Sep 17 00:00:00 2001
From: jevgenijvisockij <jevgenij.visockij@gmail.com>
Date: Wed, 10 May 2023 18:02:33 +0300
Subject: [PATCH 0979/1030] Fixed some typos

---
 .../Features/Context/Domain/AttributeGroupFeatureContext.php    | 2 +-
 .../Scenario/AttributeGroup/attribute_group_management.feature  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
index 38f8842241861..d09ecb09eba5b 100644
--- a/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
+++ b/tests/Integration/Behaviour/Features/Context/Domain/AttributeGroupFeatureContext.php
@@ -75,7 +75,7 @@ public function editAttributeGroup(string $reference, TableNode $node): void
     /**
      * @When I delete attribute group :reference
      */
-    public function deleteManufacturer(string $reference): void
+    public function deleteAttributeGroup(string $reference): void
     {
         $attributeGroupId = $this->referenceToId($reference);
 
diff --git a/tests/Integration/Behaviour/Features/Scenario/AttributeGroup/attribute_group_management.feature b/tests/Integration/Behaviour/Features/Scenario/AttributeGroup/attribute_group_management.feature
index f89703286423e..fb0b532cfbc58 100644
--- a/tests/Integration/Behaviour/Features/Scenario/AttributeGroup/attribute_group_management.feature
+++ b/tests/Integration/Behaviour/Features/Scenario/AttributeGroup/attribute_group_management.feature
@@ -4,7 +4,7 @@
 Feature: Attribute group management
   PrestaShop allows BO users to manage product attribute groups
   As a BO user
-  I must be able to create, edit and delete product features
+  I must be able to create, edit and delete attribute groups
 
   Background:
     Given shop "shop1" with name "test_shop" exists

From 7a743e1b96d4569b359217dca3a6a137e7ca1372 Mon Sep 17 00:00:00 2001
From: Daniel Hlavacek <daniel.hlavacek@hotmail.cz>
Date: Tue, 12 Sep 2023 09:40:39 +0200
Subject: [PATCH 0980/1030] Update classes/controller/FrontController.php

Co-authored-by: Mathieu Ferment <mathieu.ferment@prestashop.com>
---
 classes/controller/FrontController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php
index 3acfc4acabc1e..55ef95c58348a 100644
--- a/classes/controller/FrontController.php
+++ b/classes/controller/FrontController.php
@@ -2151,7 +2151,7 @@ protected function sanitizeUrl(string $url): string
             $this->redirectionExtraExcludedKeys
         );
 
-        // Go through each parameter we got from dispatcher and sanizize it
+        // Go through each parameter we got from dispatcher and sanitize it
         foreach ($params as $key => $value) {
             if (
                 in_array($key, $excludedKeys)

From 929cf9cbf1f40fd0d6756b3545af40403fe018e0 Mon Sep 17 00:00:00 2001
From: prestonBot <prestonBot@users.noreply.github.com>
Date: Tue, 12 Sep 2023 23:05:02 +0000
Subject: [PATCH 0981/1030] Updated PrestaShop Packages

---
 composer.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/composer.lock b/composer.lock
index 350b77baba765..8d1612349a604 100644
--- a/composer.lock
+++ b/composer.lock
@@ -6483,16 +6483,16 @@
         },
         {
             "name": "prestashop/ps_linklist",
-            "version": "v6.0.3",
+            "version": "v6.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PrestaShop/ps_linklist.git",
-                "reference": "2bf726d44e1e009b794c04068083fda4f2707440"
+                "reference": "f4048a33e3cfc06a76e68d40cb77425103f0124e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PrestaShop/ps_linklist/zipball/2bf726d44e1e009b794c04068083fda4f2707440",
-                "reference": "2bf726d44e1e009b794c04068083fda4f2707440",
+                "url": "https://api.github.com/repos/PrestaShop/ps_linklist/zipball/f4048a33e3cfc06a76e68d40cb77425103f0124e",
+                "reference": "f4048a33e3cfc06a76e68d40cb77425103f0124e",
                 "shasum": ""
             },
             "require": {
@@ -6524,9 +6524,9 @@
             "description": "PrestaShop - Link list",
             "homepage": "https://github.com/PrestaShop/ps_linklist",
             "support": {
-                "source": "https://github.com/PrestaShop/ps_linklist/tree/v6.0.3"
+                "source": "https://github.com/PrestaShop/ps_linklist/tree/v6.0.4"
             },
-            "time": "2023-06-23T07:48:32+00:00"
+            "time": "2023-09-05T12:44:43+00:00"
         },
         {
             "name": "prestashop/ps_mainmenu",

From b0cdbbdf508a01a25a0e9d53aa1afe9b7d46d73f Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Wed, 13 Sep 2023 09:45:29 +0200
Subject: [PATCH 0982/1030] Add new test description tab - part 2

---
 .../productV2/functional/08_header.ts         |  2 +-
 .../productV2/functional/10_descriptionTab.ts | 95 ++++++++++++++++++-
 .../catalog/productsV2/add/descriptionTab.ts  | 60 +++++++++++-
 3 files changed, 147 insertions(+), 10 deletions(-)

diff --git a/tests/UI/campaigns/productV2/functional/08_header.ts b/tests/UI/campaigns/productV2/functional/08_header.ts
index 11873e710645b..ef351965326a7 100644
--- a/tests/UI/campaigns/productV2/functional/08_header.ts
+++ b/tests/UI/campaigns/productV2/functional/08_header.ts
@@ -165,7 +165,7 @@ describe('BO - Catalog - Products : Header', async () => {
 
     await productsPage.goToProductPage(page, 1);
 
-    const pageTitle: string = await createProductsPage.getPageTitle(page);
+    const pageTitle = await createProductsPage.getPageTitle(page);
     expect(pageTitle).to.contains(createProductsPage.pageTitle);
 
     productHeaderSummaryInitial = await createProductsPage.getProductHeaderSummary(page);
diff --git a/tests/UI/campaigns/productV2/functional/10_descriptionTab.ts b/tests/UI/campaigns/productV2/functional/10_descriptionTab.ts
index 394fdcc8227f6..474f459738253 100644
--- a/tests/UI/campaigns/productV2/functional/10_descriptionTab.ts
+++ b/tests/UI/campaigns/productV2/functional/10_descriptionTab.ts
@@ -1,6 +1,7 @@
 // Import utils
 import helper from '@utils/helpers';
 import testContext from '@utils/testContext';
+import files from '@utils/files';
 
 // Import common tests
 import loginCommon from '@commonTests/BO/loginBO';
@@ -9,6 +10,7 @@ import loginCommon from '@commonTests/BO/loginBO';
 import dashboardPage from '@pages/BO/dashboard';
 import productsPage from '@pages/BO/catalog/productsV2';
 import createProductsPage from '@pages/BO/catalog/productsV2/add';
+import descriptionTab from '@pages/BO/catalog/productsV2/add/descriptionTab';
 
 // Import data
 import ProductFaker from '@data/faker/product';
@@ -22,11 +24,14 @@ describe('BO - Catalog - Products : Description tab', async () => {
   let browserContext: BrowserContext;
   let page: Page;
   let numberOfProducts: number = 0;
+  const productCoverImage: string = 'productCoverImage.png';
+  const replaceProductCoverImage: string = 'productReplaceCoverImage.png';
 
   // Data to create product
   const productData: ProductFaker = new ProductFaker({
-    name: 'hello word',
     type: 'standard',
+    name: 'hello word',
+    coverImage: 'cover.jpg',
     status: true,
   });
 
@@ -34,10 +39,20 @@ describe('BO - Catalog - Products : Description tab', async () => {
   before(async function () {
     browserContext = await helper.createBrowserContext(this.browser);
     page = await helper.newTab(browserContext);
+    await files.generateImage(productCoverImage);
+    await files.generateImage(replaceProductCoverImage);
+    if (productData.coverImage) {
+      await files.generateImage(productData.coverImage);
+    }
   });
 
   after(async () => {
     await helper.closeBrowserContext(browserContext);
+    await files.deleteFile(productCoverImage);
+    await files.deleteFile(replaceProductCoverImage);
+    if (productData.coverImage) {
+      await files.deleteFile(productData.coverImage);
+    }
   });
 
   describe('Create product', async () => {
@@ -57,14 +72,14 @@ describe('BO - Catalog - Products : Description tab', async () => {
       await productsPage.closeSfToolBar(page);
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should reset filter and get number of products', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'getNumberOfProduct', baseContext);
 
       numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProducts).to.be.above(0);
+      expect(numberOfProducts).to.be.above(0);
     });
 
     it('should click on \'New product\' button and check new product modal', async function () {
@@ -80,7 +95,7 @@ describe('BO - Catalog - Products : Description tab', async () => {
       await productsPage.selectProductType(page, productData.type);
 
       const pageTitle = await createProductsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
     });
 
     it('should go to new product page and set product name', async function () {
@@ -89,8 +104,78 @@ describe('BO - Catalog - Products : Description tab', async () => {
       await productsPage.clickOnAddNewProduct(page);
       await createProductsPage.setProductName(page, productData.name);
 
+      await createProductsPage.setProductStatus(page, productData.status);
+
+      const createProductMessage = await createProductsPage.saveProduct(page);
+      expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+    });
+
+    it('should add 3 images', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'addImage', baseContext);
+
+      await descriptionTab.addProductImages(page, [productData.coverImage, productCoverImage, replaceProductCoverImage]);
+
+      const numOfImages = await descriptionTab.getNumberOfImages(page);
+      expect(numOfImages).to.eq(3);
+    });
+
+    it('should set image information', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'setImageInformation', baseContext);
+
+      const message = await descriptionTab.setProductImageInformation(page, 2, true, 'Caption EN', 'Caption FR');
+      expect(message).to.be.eq(descriptionTab.settingUpdatedMessage);
+    });
+
+    it('should click on the magnifying glass', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'zoomImage', baseContext);
+
+      const isImageZoomed = await descriptionTab.clickOnMagnifyingGlass(page);
+      await expect(isImageZoomed).to.be.true;
+    });
+
+    it('should close the image zoom', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'closeZoom', baseContext);
+
+      const isZoomClosed = await descriptionTab.closeImageZoom(page);
+      await expect(isZoomClosed).to.be.true;
+    });
+
+    it('should replace image selection', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'replaceImageSelection', baseContext);
+
+      const message = await descriptionTab.replaceImageSelection(page, replaceProductCoverImage);
+      expect(message).to.be.eq(descriptionTab.settingUpdatedMessage);
+    });
+
+    it('should delete the image', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'deleteImage', baseContext);
+
+      const message = await descriptionTab.deleteImage(page);
+      expect(message).to.be.eq(descriptionTab.successfulMultiDeleteMessage);
+    });
+
+    it('should select the first image and click on select all products', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'selectProduct', baseContext);
+
+      await descriptionTab.setProductImageInformation(page, 1, undefined, undefined, undefined, true, false);
+    });
+
+    it('should set product description and summary', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'setProductDescription', baseContext);
+
+      await descriptionTab.setProductDescription(page, productData);
+
       const createProductMessage = await createProductsPage.saveProduct(page);
-      await expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+      expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+    });
+
+    it('should add category', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'addCategory', baseContext);
+
+      await descriptionTab.addNewCategory(page, '');
+
+      const selectedCategories = await descriptionTab.getSelectedCategories(page);
+      expect(selectedCategories).to.eq('Home x Clothes x Men x');
     });
   });
 });
diff --git a/tests/UI/pages/BO/catalog/productsV2/add/descriptionTab.ts b/tests/UI/pages/BO/catalog/productsV2/add/descriptionTab.ts
index 46f735838c8cd..899e9f9e8a3cb 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/descriptionTab.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/descriptionTab.ts
@@ -123,18 +123,26 @@ class DescriptionTab extends BOBasePage {
    * @param useAsCoverImage {boolean|undefined} Use as cover image
    * @param captionEn {string|undefined} Caption in English
    * @param captionFr {string|undefined} Caption in French
+   * @param selectAll {boolean|undefined} Select all
+   * @param toSave {boolean} True if we need to save
    * @returns {Promise<string|null>}
    */
   async setProductImageInformation(
     page: Page,
     numImage: number,
-    useAsCoverImage: boolean|undefined,
-    captionEn: string|undefined,
-    captionFr: string|undefined,
-  ): Promise<string|null> {
+    useAsCoverImage: boolean | undefined,
+    captionEn: string | undefined,
+    captionFr: string | undefined,
+    selectAll: boolean | undefined = undefined,
+    toSave: boolean = true,
+  ): Promise<string | null> {
     // Select the image
     await page.locator(this.productImage).nth(numImage - 1).click();
 
+    if (selectAll) {
+      await page.locator('#product-images-container div.dropzone-window p.dropzone-window-select').click();
+    }
+
     if (useAsCoverImage) {
       await this.setCheckedWithIcon(page, this.productImageDropZoneCover, useAsCoverImage);
     }
@@ -153,11 +161,41 @@ class DescriptionTab extends BOBasePage {
       await this.setValue(page, this.productImageDropZoneCaption, captionFr);
     }
 
+    if (toSave) {
+      await page.locator(this.productImageDropZoneBtnSubmit).click();
+
+      return this.getGrowlMessageContent(page);
+    }
+    await page.locator('#product-images-container div.dropzone-window div.dropzone-window-header-right i[data-original-title="Close window"]').click();
+  }
+
+  async clickOnMagnifyingGlass(page: Page): Promise<boolean> {
+    await page.locator('#product-images-container div.dropzone-window-header.row div.dropzone-window-header-right i[data-original-title="Zoom on selection"]').click();
+
+    return this.elementVisible(page, '#product-images-container div.pswp--open.pswp--visible', 1000);
+  }
+
+  async closeImageZoom(page: Page): Promise<boolean> {
+    await page.locator('#product-images-container button.pswp__button--close').click();
+
+    return this.elementNotVisible(page, '#product-images-container div.pswp--open.pswp--visible', 1000);
+  }
+
+  async replaceImageSelection(page: Page, image: string): Promise<string> {
+    await this.uploadOnFileChooser(page, '#product-images-container div.dropzone-window-header.row div.dropzone-window-header-right i[data-original-title="Replace selection"]', [image]);
     await page.locator(this.productImageDropZoneBtnSubmit).click();
 
     return this.getGrowlMessageContent(page);
   }
 
+  async deleteImage(page: Page): Promise<string> {
+    await this.closeGrowlMessage(page);
+    await page.locator('#product-images-container div.dropzone-window-header.row div.dropzone-window-header-right i[data-original-title="Delete selection"]').click();
+    await page.locator('#product-images-container footer button.btn.btn-primary').click();
+
+    return this.getGrowlMessageContent(page);
+  }
+
   /**
    * Set value on tinyMce textarea
    * @param page {Page} Browser tab
@@ -225,6 +263,20 @@ class DescriptionTab extends BOBasePage {
         throw new Error(`Input ${inputName} was not found`);
     }
   }
+
+  async addNewCategory(page: Page, categoryData): Promise<string> {
+    await page.locator('#product_description_categories_add_categories_btn').click();
+    await this.waitForVisibleSelector(page, '#categories-modal');
+    await page.locator('#category_tree_selector_category_tree > li > ul > li:nth-child(1) > div > div > div').click();
+    await page.locator('#category_tree_selector_category_tree > li > ul > li:nth-child(1).category-tree-element.more div.category-tree-inputs').click();
+    await page.locator('#category_tree_selector_category_tree > li > ul > li.category-tree-element.less > ul > li:nth-child(1)').click();
+
+    await page.locator('#category_tree_selector_apply_btn').click();
+  }
+
+  async getSelectedCategories(page: Page): Promise<string> {
+    return this.getTextContent(page, '#product_description_categories_product_categories');
+  }
 }
 
 export default new DescriptionTab();

From b701629c694d124bc72adf4952acfd46e9594610 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Wed, 13 Sep 2023 10:07:05 +0200
Subject: [PATCH 0983/1030] Fix errors in the nightly

---
 .../productV2/functional/03_CRUDProductWithCombinations.ts      | 2 +-
 .../sanity/03_productsBO/03_CRUDProductWithCombinations.ts      | 2 +-
 tests/UI/pages/FO/myAccount/returnDetails.ts                    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/UI/campaigns/productV2/functional/03_CRUDProductWithCombinations.ts b/tests/UI/campaigns/productV2/functional/03_CRUDProductWithCombinations.ts
index eff0573c0efab..22c7c34b0962a 100644
--- a/tests/UI/campaigns/productV2/functional/03_CRUDProductWithCombinations.ts
+++ b/tests/UI/campaigns/productV2/functional/03_CRUDProductWithCombinations.ts
@@ -50,7 +50,7 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       },
       {
         name: 'color',
-        values: ['Grey', 'Taupe', 'Beige', 'White', 'Red', 'Black', 'Orange', 'Green', 'Yellow', 'Brown'],
+        values: ['Gray', 'Taupe', 'Beige', 'White', 'Red', 'Black', 'Orange', 'Green', 'Yellow', 'Brown'],
       },
     ],
     status: false,
diff --git a/tests/UI/campaigns/sanity/03_productsBO/03_CRUDProductWithCombinations.ts b/tests/UI/campaigns/sanity/03_productsBO/03_CRUDProductWithCombinations.ts
index ea83491623a6b..205892fbf7959 100644
--- a/tests/UI/campaigns/sanity/03_productsBO/03_CRUDProductWithCombinations.ts
+++ b/tests/UI/campaigns/sanity/03_productsBO/03_CRUDProductWithCombinations.ts
@@ -44,7 +44,7 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
     attributes: [
       {
         name: 'color',
-        values: ['Grey', 'Taupe', 'Red'],
+        values: ['Gray', 'Taupe', 'Red'],
       },
       {
         name: 'size',
diff --git a/tests/UI/pages/FO/myAccount/returnDetails.ts b/tests/UI/pages/FO/myAccount/returnDetails.ts
index d8096905954a0..3df0a105146b0 100644
--- a/tests/UI/pages/FO/myAccount/returnDetails.ts
+++ b/tests/UI/pages/FO/myAccount/returnDetails.ts
@@ -27,7 +27,7 @@ class ReturnDetails extends FOBasePage {
   constructor() {
     super();
 
-    this.pageTitle = 'Return Details';
+    this.pageTitle = 'Return details';
     this.errorMessage = 'You must wait for confirmation before returning any merchandise.';
     this.orderReturnCardBlock = 'We have logged your return request. Your package must be returned to us within 14 days'
       + ' of receiving your order. The current status of your merchandise return is:';

From 850edde63b298455fc67cdcbb7c426a49835496f Mon Sep 17 00:00:00 2001
From: Ibrahima SOW <ibrahima.sow@prestashop.com>
Date: Mon, 28 Aug 2023 11:15:40 +0000
Subject: [PATCH 0984/1030] Introduce employee menu same page links

---
 admin-dev/themes/default/template/header.tpl                    | 2 +-
 .../new-theme/template/components/layout/employee_dropdown.tpl  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin-dev/themes/default/template/header.tpl b/admin-dev/themes/default/template/header.tpl
index 2a69a1ef52138..a0e300c7985f6 100644
--- a/admin-dev/themes/default/template/header.tpl
+++ b/admin-dev/themes/default/template/header.tpl
@@ -392,7 +392,7 @@
             {foreach from=$displayBackOfficeEmployeeMenu item=$menuItem}
               {assign var=menuItemProperties value=$menuItem->getProperties()}
               <li class="{$menuItem->getClass()}">
-                <a class="dropdown-item" href="{$menuItemProperties.link}" target="_blank" rel="noopener noreferrer nofollow">
+                <a class="dropdown-item" href="{$menuItemProperties.link}" {if !isset($menuItemProperties.samePage) || true !== $menuItemProperties.samePage} target="_blank"{/if} rel="noopener noreferrer nofollow">
                   {if isset($menuItemProperties.icon)}<i class="material-icons">{$menuItemProperties.icon}</i> {/if}{$menuItem->getContent()}
                 </a>
               </li>
diff --git a/admin-dev/themes/new-theme/template/components/layout/employee_dropdown.tpl b/admin-dev/themes/new-theme/template/components/layout/employee_dropdown.tpl
index c622ac6b88010..bd7615a1b5be7 100644
--- a/admin-dev/themes/new-theme/template/components/layout/employee_dropdown.tpl
+++ b/admin-dev/themes/new-theme/template/components/layout/employee_dropdown.tpl
@@ -44,7 +44,7 @@
 
     {foreach from=$displayBackOfficeEmployeeMenu item=$menuItem}
       {assign var=menuItemProperties value=$menuItem->getProperties()}
-        <a class="dropdown-item {$menuItem->getClass()}" href="{$menuItemProperties.link}" target="_blank" rel="noopener noreferrer nofollow">
+        <a class="dropdown-item {$menuItem->getClass()}" href="{$menuItemProperties.link}" {if !isset($menuItemProperties.samePage) || true !== $menuItemProperties.samePage} target="_blank"{/if} rel="noopener noreferrer nofollow">
             {if isset($menuItemProperties.icon)}<i class="material-icons">{$menuItemProperties.icon}</i> {/if}{$menuItem->getContent()}
         </a>
         {if $menuItem@last}

From 5e32967a6eebd87de279c2a71a5504e57bc061a9 Mon Sep 17 00:00:00 2001
From: Ibrahima SOW <ibrahima.sow@prestashop.com>
Date: Tue, 29 Aug 2023 11:33:42 +0000
Subject: [PATCH 0985/1030] Add open_in_new icon after target _blank links

---
 admin-dev/themes/default/scss/partials/_header.scss | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/admin-dev/themes/default/scss/partials/_header.scss b/admin-dev/themes/default/scss/partials/_header.scss
index e4c137cb61ce9..a4857dc9d6a6a 100644
--- a/admin-dev/themes/default/scss/partials/_header.scss
+++ b/admin-dev/themes/default/scss/partials/_header.scss
@@ -410,6 +410,15 @@ $search-border-color: #bbcdd2;
           }
 
           a {
+            &[target="_blank"]::after {
+              position: relative;
+              top: 2px;
+              font-family: "Material Icons", sans-serif;
+              color: #bbcdd2;
+              content: "\e89e";
+              opacity: 0.7;
+            }
+
             .material-icons {
               padding: 0;
               margin-right: 5px;

From 4fc7e1a7cea46481d05a5f706d75357d30ee782f Mon Sep 17 00:00:00 2001
From: Ibrahima SOW <ibrahima.sow@prestashop.com>
Date: Wed, 13 Sep 2023 12:19:32 +0000
Subject: [PATCH 0986/1030] Fix employee menu item color for new-theme

---
 .../new-theme/scss/components/layout/_main_header.scss       | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/admin-dev/themes/new-theme/scss/components/layout/_main_header.scss b/admin-dev/themes/new-theme/scss/components/layout/_main_header.scss
index 9577cf16ee7ef..d92e68c6de931 100644
--- a/admin-dev/themes/new-theme/scss/components/layout/_main_header.scss
+++ b/admin-dev/themes/new-theme/scss/components/layout/_main_header.scss
@@ -746,6 +746,11 @@ $header-text-color: #4e6167 !default;
     a {
       &.dropdown-item {
         margin: 10px 0;
+
+        &:hover {
+          color: #fff;
+          background-color: #25b9d7;
+        }
       }
 
       &.admin-link {

From f1070cc992192938417e383bff4a1b437da94656 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Wed, 13 Sep 2023 10:52:06 +0200
Subject: [PATCH 0987/1030] Functional Tests : BO - Customers - Filter and
 Quick Edit

---
 .../01_filterAndQuickEditCustomers.ts         | 41 +++++++++----------
 tests/UI/data/demo/customers.ts               |  3 +-
 tests/UI/data/demo/socialTitles.ts            | 10 +++++
 3 files changed, 31 insertions(+), 23 deletions(-)
 create mode 100644 tests/UI/data/demo/socialTitles.ts

diff --git a/tests/UI/campaigns/functional/BO/04_customers/01_customers/01_filterAndQuickEditCustomers.ts b/tests/UI/campaigns/functional/BO/04_customers/01_customers/01_filterAndQuickEditCustomers.ts
index 4f0e6f940f768..76917cd68e95a 100644
--- a/tests/UI/campaigns/functional/BO/04_customers/01_customers/01_filterAndQuickEditCustomers.ts
+++ b/tests/UI/campaigns/functional/BO/04_customers/01_customers/01_filterAndQuickEditCustomers.ts
@@ -54,19 +54,19 @@ describe('BO - Customers - Customers : Filter and quick edit Customers table', a
     await customersPage.closeSfToolBar(page);
 
     const pageTitle = await customersPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(customersPage.pageTitle);
+    expect(pageTitle).to.contains(customersPage.pageTitle);
   });
 
   it('should reset all filters and get number of customers in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFirst', baseContext);
 
     numberOfCustomers = await customersPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfCustomers).to.be.above(0);
+    expect(numberOfCustomers).to.be.above(0);
   });
 
   // 1 : Filter Customers with all inputs and selects in grid table
   describe('Filter customers table', async () => {
-    const tests = [
+    [
       {
         args:
           {
@@ -139,9 +139,7 @@ describe('BO - Customers - Customers : Filter and quick edit Customers table', a
             filterValue: '0',
           },
       },
-    ];
-
-    tests.forEach((test) => {
+    ].forEach((test) => {
       it(`should filter by ${test.args.filterBy} '${test.args.filterValue}'`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}`, baseContext);
 
@@ -160,26 +158,25 @@ describe('BO - Customers - Customers : Filter and quick edit Customers table', a
           );
         }
         const numberOfCustomersAfterFilter = await customersPage.getNumberOfElementInGrid(page);
-
-        await expect(numberOfCustomersAfterFilter).to.be.at.most(numberOfCustomers);
+        expect(numberOfCustomersAfterFilter).to.be.at.most(numberOfCustomers);
 
         for (let i = 1; i <= numberOfCustomersAfterFilter; i++) {
           switch (test.args.filterBy) {
             case 'active': {
               const customerStatus = await customersPage.getCustomerStatus(page, i);
-              await expect(customerStatus).to.equal(test.args.filterValue === '1');
+              expect(customerStatus).to.equals(test.args.filterValue === '1');
               break;
             }
 
             case 'newsletter': {
               const newsletterStatus = await customersPage.getNewsletterStatus(page, i);
-              await expect(newsletterStatus).to.equal(test.args.filterValue === '1');
+              expect(newsletterStatus).to.equals(test.args.filterValue === '1');
               break;
             }
 
             case 'optin': {
               const partnerOffersStatus = await customersPage.getPartnerOffersStatus(page, i);
-              await expect(partnerOffersStatus).to.equal(test.args.filterValue === '1');
+              expect(partnerOffersStatus).to.equals(test.args.filterValue === '1');
               break;
             }
 
@@ -189,7 +186,7 @@ describe('BO - Customers - Customers : Filter and quick edit Customers table', a
                 i,
                 test.args.filterBy,
               );
-              await expect(textColumn).to.contains(test.args.filterValue);
+              expect(textColumn).to.contains(test.args.filterValue);
               break;
             }
           }
@@ -200,7 +197,7 @@ describe('BO - Customers - Customers : Filter and quick edit Customers table', a
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}Reset`, baseContext);
 
         const numberOfCustomersAfterReset = await customersPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfCustomersAfterReset).to.equal(numberOfCustomers);
+        expect(numberOfCustomersAfterReset).to.equals(numberOfCustomers);
       });
     });
 
@@ -214,7 +211,7 @@ describe('BO - Customers - Customers : Filter and quick edit Customers table', a
 
       for (let i = 1; i <= numberOfCustomersAfterFilter; i++) {
         const textColumn = await customersPage.getTextColumnFromTableCustomers(page, i, 'date_add');
-        await expect(textColumn).to.contains(today);
+        expect(textColumn).to.contains(today);
       }
     });
 
@@ -222,7 +219,7 @@ describe('BO - Customers - Customers : Filter and quick edit Customers table', a
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilter', baseContext);
 
       const numberOfCustomersAfterReset = await customersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCustomersAfterReset).to.equal(numberOfCustomers);
+      expect(numberOfCustomersAfterReset).to.equal(numberOfCustomers);
     });
   });
 
@@ -239,7 +236,7 @@ describe('BO - Customers - Customers : Filter and quick edit Customers table', a
       );
 
       const numberOfCustomersAfterFilter = await customersPage.getNumberOfElementInGrid(page);
-      await expect(numberOfCustomersAfterFilter).to.be.at.above(0);
+      expect(numberOfCustomersAfterFilter).to.be.at.above(0);
     });
 
     describe('Quick edit customer status', async () => {
@@ -253,11 +250,11 @@ describe('BO - Customers - Customers : Filter and quick edit Customers table', a
           const resultMessage = await customersPage.setCustomerStatus(page, 1, test.args.value);
 
           if (resultMessage) {
-            await expect(resultMessage).to.contains(customersPage.successfulUpdateStatusMessage);
+            expect(resultMessage).to.contains(customersPage.successfulUpdateStatusMessage);
           }
 
           const customerStatus = await customersPage.getCustomerStatus(page, 1);
-          await expect(customerStatus).to.be.equal(test.args.value);
+          expect(customerStatus).to.equals(test.args.value);
         });
       });
     });
@@ -273,11 +270,11 @@ describe('BO - Customers - Customers : Filter and quick edit Customers table', a
           const resultMessage = await customersPage.setNewsletterStatus(page, 1, test.args.value);
 
           if (resultMessage) {
-            await expect(resultMessage).to.contains(customersPage.successfulUpdateStatusMessage);
+            expect(resultMessage).to.contains(customersPage.successfulUpdateStatusMessage);
           }
 
           const customerStatus = await customersPage.getNewsletterStatus(page, 1);
-          await expect(customerStatus).to.be.equal(test.args.value);
+          expect(customerStatus).to.equals(test.args.value);
         });
       });
     });
@@ -293,11 +290,11 @@ describe('BO - Customers - Customers : Filter and quick edit Customers table', a
           const resultMessage = await customersPage.setPartnerOffersStatus(page, 1, test.args.value);
 
           if (resultMessage) {
-            await expect(resultMessage).to.contains(customersPage.successfulUpdateStatusMessage);
+            expect(resultMessage).to.contains(customersPage.successfulUpdateStatusMessage);
           }
 
           const customerStatus = await customersPage.getPartnerOffersStatus(page, 1);
-          await expect(customerStatus).to.be.equal(test.args.value);
+          expect(customerStatus).to.be.equal(test.args.value);
         });
       });
     });
diff --git a/tests/UI/data/demo/customers.ts b/tests/UI/data/demo/customers.ts
index b3f70311b6fef..bb71e92fa79d7 100644
--- a/tests/UI/data/demo/customers.ts
+++ b/tests/UI/data/demo/customers.ts
@@ -1,9 +1,10 @@
+import SocialTitles from '@data/demo/socialTitles';
 import CustomerData from '@data/faker/customer';
 
 export default {
   johnDoe: new CustomerData({
     id: 2,
-    socialTitle: 'Mr.',
+    socialTitle: SocialTitles.Mr.name,
     firstName: 'John',
     lastName: 'DOE',
     birthDate: new Date('1970-01-15'),
diff --git a/tests/UI/data/demo/socialTitles.ts b/tests/UI/data/demo/socialTitles.ts
new file mode 100644
index 0000000000000..250c485cb7913
--- /dev/null
+++ b/tests/UI/data/demo/socialTitles.ts
@@ -0,0 +1,10 @@
+export default {
+  Mr: {
+    id: 1,
+    name: 'Mr.',
+  },
+  Mrs: {
+    id: 2,
+    name: 'Mrs',
+  },
+};

From 446c6ea0f07ed80fca9587bb86adc68891b911f4 Mon Sep 17 00:00:00 2001
From: Ibrahima SOW <ibrahima.sow@prestashop.com>
Date: Wed, 13 Sep 2023 13:05:03 +0000
Subject: [PATCH 0988/1030] Change property name from same_page to
 is_external_link

---
 .../template/controllers/search/helpers/view/view.tpl  |  2 +-
 admin-dev/themes/default/template/header.tpl           |  2 +-
 .../template/components/layout/employee_dropdown.tpl   |  2 +-
 controllers/admin/AdminSearchController.php            |  2 +-
 src/Core/Search/SearchPanel.php                        | 10 +++++-----
 src/Core/Search/SearchPanelInterface.php               |  2 +-
 .../Controllers/AdminSearchControllerCoreTest.php      |  4 ++--
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/search/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/search/helpers/view/view.tpl
index 57f24c2ddf5e8..b78e726089712 100644
--- a/admin-dev/themes/default/template/controllers/search/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/search/helpers/view/view.tpl
@@ -155,7 +155,7 @@ $(function() {
         <div class="col-lg-{if $searchPanels|@count <= 2}6{else}4{/if}">
             <div class="panel">
                 <h3>{$searchPanel.title}</h3>
-                <a href="{$searchPanel.link}" class="btn btn-default{if !isset($searchPanel.same_page) || true !== $searchPanel.same_page} _blank{/if}">{$searchPanel.button_label}</a>
+                <a href="{$searchPanel.link}" class="btn btn-default{if !isset($searchPanel.is_external_link) || true === $searchPanel.is_external_link} _blank{/if}">{$searchPanel.button_label}</a>
             </div>
         </div>
     {/foreach}
diff --git a/admin-dev/themes/default/template/header.tpl b/admin-dev/themes/default/template/header.tpl
index a0e300c7985f6..619fa9c0247c5 100644
--- a/admin-dev/themes/default/template/header.tpl
+++ b/admin-dev/themes/default/template/header.tpl
@@ -392,7 +392,7 @@
             {foreach from=$displayBackOfficeEmployeeMenu item=$menuItem}
               {assign var=menuItemProperties value=$menuItem->getProperties()}
               <li class="{$menuItem->getClass()}">
-                <a class="dropdown-item" href="{$menuItemProperties.link}" {if !isset($menuItemProperties.samePage) || true !== $menuItemProperties.samePage} target="_blank"{/if} rel="noopener noreferrer nofollow">
+                <a class="dropdown-item" href="{$menuItemProperties.link}" {if !isset($menuItemProperties.isExternalLink) || true === $menuItemProperties.isExternalLink} target="_blank"{/if} rel="noopener noreferrer nofollow">
                   {if isset($menuItemProperties.icon)}<i class="material-icons">{$menuItemProperties.icon}</i> {/if}{$menuItem->getContent()}
                 </a>
               </li>
diff --git a/admin-dev/themes/new-theme/template/components/layout/employee_dropdown.tpl b/admin-dev/themes/new-theme/template/components/layout/employee_dropdown.tpl
index bd7615a1b5be7..0d3a735fe33e0 100644
--- a/admin-dev/themes/new-theme/template/components/layout/employee_dropdown.tpl
+++ b/admin-dev/themes/new-theme/template/components/layout/employee_dropdown.tpl
@@ -44,7 +44,7 @@
 
     {foreach from=$displayBackOfficeEmployeeMenu item=$menuItem}
       {assign var=menuItemProperties value=$menuItem->getProperties()}
-        <a class="dropdown-item {$menuItem->getClass()}" href="{$menuItemProperties.link}" {if !isset($menuItemProperties.samePage) || true !== $menuItemProperties.samePage} target="_blank"{/if} rel="noopener noreferrer nofollow">
+        <a class="dropdown-item {$menuItem->getClass()}" href="{$menuItemProperties.link}" {if !isset($menuItemProperties.isExternalLink) || true === $menuItemProperties.isExternalLink} target="_blank"{/if} rel="noopener noreferrer nofollow">
             {if isset($menuItemProperties.icon)}<i class="material-icons">{$menuItemProperties.icon}</i> {/if}{$menuItem->getContent()}
         </a>
         {if $menuItem@last}
diff --git a/controllers/admin/AdminSearchController.php b/controllers/admin/AdminSearchController.php
index d66fe7a770540..39b857f2144d5 100644
--- a/controllers/admin/AdminSearchController.php
+++ b/controllers/admin/AdminSearchController.php
@@ -528,7 +528,7 @@ protected function getSearchPanels(string $searchedExpression): void
                 'title' => $searchPanel->getTitle(),
                 'button_label' => $searchPanel->getButtonLabel(),
                 'link' => $searchPanel->getLink(),
-                'same_page' => $searchPanel->isOnSamePage(),
+                'is_external_link' => $searchPanel->isExternalLink(),
             ];
         }
     }
diff --git a/src/Core/Search/SearchPanel.php b/src/Core/Search/SearchPanel.php
index 2bda6a0480a33..9cb68615e0eff 100644
--- a/src/Core/Search/SearchPanel.php
+++ b/src/Core/Search/SearchPanel.php
@@ -52,20 +52,20 @@ class SearchPanel implements SearchPanelInterface
     /**
      * @var bool|null
      */
-    private $isOnSamePage;
+    private $isExternalLink;
 
     public function __construct(
         string $title,
         string $buttonLabel,
         string $link,
         array $queryParams,
-        ?bool $isOnSamePage = false
+        ?bool $isExternalLink = false
     ) {
         $this->title = $title;
         $this->buttonLabel = $buttonLabel;
         $this->link = $link;
         $this->queryParams = $queryParams;
-        $this->isOnSamePage = $isOnSamePage;
+        $this->isExternalLink = $isExternalLink;
     }
 
     public function getTitle(): string
@@ -83,8 +83,8 @@ public function getLink(): string
         return sprintf('%s?%s', $this->link, http_build_query($this->queryParams));
     }
 
-    public function isOnSamePage(): bool
+    public function isExternalLink(): bool
     {
-        return $this->isOnSamePage;
+        return $this->isExternalLink;
     }
 }
diff --git a/src/Core/Search/SearchPanelInterface.php b/src/Core/Search/SearchPanelInterface.php
index 08fcf8a5a2f4c..3c4bcb27d995b 100644
--- a/src/Core/Search/SearchPanelInterface.php
+++ b/src/Core/Search/SearchPanelInterface.php
@@ -34,5 +34,5 @@ public function getButtonLabel(): string;
 
     public function getLink(): string;
 
-    public function isOnSamePage(): bool;
+    public function isExternalLink(): bool;
 }
diff --git a/tests/Integration/Controllers/AdminSearchControllerCoreTest.php b/tests/Integration/Controllers/AdminSearchControllerCoreTest.php
index 26a8a617ce5a8..4c622d4709974 100644
--- a/tests/Integration/Controllers/AdminSearchControllerCoreTest.php
+++ b/tests/Integration/Controllers/AdminSearchControllerCoreTest.php
@@ -72,7 +72,7 @@ public function dataProviderSearch(): array
                             'title' => 'Search docs.prestashop-project.org',
                             'button_label' => 'Go to the documentation',
                             'link' => 'https://docs.prestashop-project.org/welcome/?q=',
-                            'same_page' => false,
+                            'is_external_link' => false,
                         ],
                     ],
                 ],
@@ -95,7 +95,7 @@ public function dataProviderSearch(): array
                             'title' => 'Search docs.prestashop-project.org',
                             'button_label' => 'Go to the documentation',
                             'link' => 'https://docs.prestashop-project.org/welcome/?q=orders',
-                            'same_page' => false,
+                            'is_external_link' => false,
                         ],
                     ],
                 ],

From 8bb5cb07d344f5553fade28dfafd81c078e01258 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Wed, 13 Sep 2023 15:29:10 +0200
Subject: [PATCH 0989/1030] Functional Tests : Added email check to `BO -
 Advanced Parameters - Import : Import file`

---
 .../05_import/02_importFile.ts                | 266 ++++++++++--------
 1 file changed, 153 insertions(+), 113 deletions(-)

diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/05_import/02_importFile.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/05_import/02_importFile.ts
index 730583d4dfe2a..f607cd679ac17 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/05_import/02_importFile.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/05_import/02_importFile.ts
@@ -1,16 +1,22 @@
 // Import utils
 import files from '@utils/files';
 import helper from '@utils/helpers';
+import mailHelper from '@utils/mailHelper';
 import testContext from '@utils/testContext';
 
 // Import commonTests
+import {setupSmtpConfigTest, resetSmtpConfigTest} from '@commonTests/BO/advancedParameters/smtp';
 import loginCommon from '@commonTests/BO/loginBO';
 
 // Import pages
 import dashboardPage from '@pages/BO/dashboard';
 import importPage from '@pages/BO/advancedParameters/import';
 
+// Import data
+import type MailDevEmail from '@data/types/maildevEmail';
+
 import {expect} from 'chai';
+import type MailDev from 'maildev';
 import type {BrowserContext, Page} from 'playwright';
 
 const baseContext: string = 'functional_BO_advancedParameters_import_importFile';
@@ -20,13 +26,27 @@ describe('BO - Advanced Parameters - Import : Import file', async () => {
   let page: Page;
   let filePath: string | null;
   let secondFilePath: string | null;
+  let newMail: MailDevEmail;
+  let mailListener: MailDev;
   const firstFile:string = 'alias.csv';
   const secondFile:string = 'suppliers.csv';
 
+  // Pre-Condition : Setup config SMTP
+  setupSmtpConfigTest(baseContext);
+
   // before and after functions
   before(async function () {
     browserContext = await helper.createBrowserContext(this.browser);
     page = await helper.newTab(browserContext);
+
+    // Start listening to maildev server
+    mailListener = mailHelper.createMailListener();
+    mailHelper.startListener(mailListener);
+
+    // Handle every new email
+    mailListener.on('new', (email: MailDevEmail) => {
+      newMail = email;
+    });
   });
 
   after(async () => {
@@ -34,166 +54,186 @@ describe('BO - Advanced Parameters - Import : Import file', async () => {
     // Delete downloaded csv files
     await files.deleteFile(firstFile);
     await files.deleteFile(secondFile);
-  });
 
-  it('should login in BO', async function () {
-    await loginCommon.loginBO(this, page);
+    // Stop listening to maildev server
+    mailHelper.stopListener(mailListener);
   });
 
-  it('should go to \'Advanced Parameters > Import\' page', async function () {
-    await testContext.addContextItem(this, 'testIdentifier', 'goToImportPage', baseContext);
+  describe('Import : Import file', async () => {
+    it('should login in BO', async function () {
+      await loginCommon.loginBO(this, page);
+    });
 
-    await dashboardPage.goToSubMenu(
-      page,
-      dashboardPage.advancedParametersLink,
-      dashboardPage.importLink,
-    );
-    await importPage.closeSfToolBar(page);
+    it('should go to \'Advanced Parameters > Import\' page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToImportPage', baseContext);
 
-    const pageTitle = await importPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(importPage.pageTitle);
-  });
+      await dashboardPage.goToSubMenu(
+        page,
+        dashboardPage.advancedParametersLink,
+        dashboardPage.importLink,
+      );
+      await importPage.closeSfToolBar(page);
 
-  describe('Download then import alias simple file', async () => {
-    it('should download \'Sample alias file\' file', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'downloadFile', baseContext);
+      const pageTitle = await importPage.getPageTitle(page);
+      expect(pageTitle).to.contains(importPage.pageTitle);
+    });
 
-      filePath = await importPage.downloadSampleFile(page, 'alias_import');
+    describe('Download then import alias simple file', async () => {
+      it('should download \'Sample alias file\' file', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'downloadFile', baseContext);
 
-      const doesFileExist = await files.doesFileExist(filePath);
-      await expect(doesFileExist, 'alias_import sample file was not downloaded').to.be.true;
-    });
+        filePath = await importPage.downloadSampleFile(page, 'alias_import');
 
-    it('should upload the file', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'importFile', baseContext);
+        const doesFileExist = await files.doesFileExist(filePath);
+        expect(doesFileExist, 'alias_import sample file was not downloaded').to.be.eq(true);
+      });
 
-      await files.renameFile(filePath, 'alias.csv');
+      it('should upload the file', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'importFile', baseContext);
 
-      const uploadSuccessText = await importPage.uploadImportFile(page, 'Alias', firstFile);
-      await expect(uploadSuccessText).contain(firstFile);
-    });
+        await files.renameFile(filePath, 'alias.csv');
 
-    it('should go to next import file step', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'nextStep', baseContext);
+        const uploadSuccessText = await importPage.uploadImportFile(page, 'Alias', firstFile);
+        expect(uploadSuccessText).to.contains(firstFile);
+      });
 
-      const panelTitle = await importPage.goToImportNextStep(page);
-      await expect(panelTitle).contain(importPage.importPanelTitle);
-    });
+      it('should go to next import file step', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'nextStep', baseContext);
 
-    it('should start import file', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'confirmImport', baseContext);
+        const panelTitle = await importPage.goToImportNextStep(page);
+        expect(panelTitle).to.contains(importPage.importPanelTitle);
+      });
 
-      const modalTitle = await importPage.startFileImport(page);
-      await expect(modalTitle).contain(importPage.importModalTitle);
-    });
+      it('should start import file', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'confirmImport', baseContext);
 
-    it('should check that the import is completed', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'waitForImport', baseContext);
+        const modalTitle = await importPage.startFileImport(page);
+        expect(modalTitle).to.contains(importPage.importModalTitle);
+      });
 
-      const isCompleted = await importPage.getImportValidationMessage(page);
-      await expect(isCompleted, 'The import is not completed!')
-        .contain('Data imported')
-        .and.contain('Look at your listings to make sure it\'s all there as you wished.');
-    });
+      it('should check that the import is completed', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'waitForImport', baseContext);
 
-    it('should close import progress modal', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'closeImportModal', baseContext);
+        const isCompleted = await importPage.getImportValidationMessage(page);
+        expect(isCompleted, 'The import is not completed!')
+          .to.contains('Data imported')
+          .and.to.contains('Look at your listings to make sure it\'s all there as you wished.');
+      });
 
-      const isModalClosed = await importPage.closeImportModal(page);
-      await expect(isModalClosed).to.be.true;
-    });
-  });
+      it('should close import progress modal', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'closeImportModal', baseContext);
 
-  describe('Check choose from history / FTP then import suppliers simple file', async () => {
-    it('should download \'Sample suppliers file\' file', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'downloadFile2', baseContext);
+        const isModalClosed = await importPage.closeImportModal(page);
+        expect(isModalClosed).to.be.eq(true);
+      });
 
-      secondFilePath = await importPage.downloadSampleFile(page, 'suppliers_import');
+      it('should check if reset password mail is in mailbox', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'checkIfImportMailFileIsInMailbox', baseContext);
 
-      const doesFileExist = await files.doesFileExist(secondFilePath);
-      await expect(doesFileExist, 'suppliers sample file was not downloaded').to.be.true;
+        expect(newMail.subject).to.contains(`[${global.INSTALL.SHOP_NAME}] Import complete`);
+      });
     });
 
-    it('should upload the file', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'importFile2', baseContext);
+    describe('Check choose from history / FTP then import suppliers simple file', async () => {
+      it('should download \'Sample suppliers file\' file', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'downloadFile2', baseContext);
 
-      await files.renameFile(secondFilePath, 'suppliers.csv');
+        secondFilePath = await importPage.downloadSampleFile(page, 'suppliers_import');
 
-      const uploadSuccessText = await importPage.uploadImportFile(page, 'Suppliers', secondFile);
-      await expect(uploadSuccessText).contain('suppliers.csv');
-    });
+        const doesFileExist = await files.doesFileExist(secondFilePath);
+        expect(doesFileExist, 'suppliers sample file was not downloaded').to.be.eq(true);
+      });
 
-    it('should click on the downloaded file and check the existence of the button choose from history', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'clickOnDownloadedFile', baseContext);
+      it('should upload the file', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'importFile2', baseContext);
 
-      await importPage.clickOnDownloadedFile(page);
+        await files.renameFile(secondFilePath, 'suppliers.csv');
 
-      const isButtonVisible = await importPage.isChooseFromHistoryButtonVisible(page);
-      await expect(isButtonVisible).to.be.true;
-    });
+        const uploadSuccessText = await importPage.uploadImportFile(page, 'Suppliers', secondFile);
+        expect(uploadSuccessText).contain('suppliers.csv');
+      });
 
-    it('should click on \'Choose from history / FTP\'', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'clickOnChooseFromHistory', baseContext);
+      it('should click on the downloaded file and check the existence of the button choose from history', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'clickOnDownloadedFile', baseContext);
 
-      const isFilesListTableVisible = await importPage.chooseFromHistoryFTP(page);
-      await expect(isFilesListTableVisible).to.be.true;
-    });
+        await importPage.clickOnDownloadedFile(page);
 
-    it('should check the imported files list', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'checkImportedFilesList', baseContext);
+        const isButtonVisible = await importPage.isChooseFromHistoryButtonVisible(page);
+        expect(isButtonVisible).to.be.eq(true);
+      });
 
-      const importedFilesList = await importPage.getImportedFilesList(page);
-      await expect(importedFilesList).to.contains(firstFile)
-        .and.to.contains(secondFile);
-    });
+      it('should click on \'Choose from history / FTP\'', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'clickOnChooseFromHistory', baseContext);
 
-    it('should delete the first imported file', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'deleteFirstFile', baseContext);
+        const isFilesListTableVisible = await importPage.chooseFromHistoryFTP(page);
+        expect(isFilesListTableVisible).to.be.eq(true);
+      });
 
-      // Delete file and check that choose from history button is visible
-      const isButtonVisible = await importPage.deleteFile(page);
-      await expect(isButtonVisible).to.be.true;
-    });
+      it('should check the imported files list', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'checkImportedFilesList', baseContext);
 
-    it('should use the second imported file', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'useSecondFile', baseContext);
+        const importedFilesList = await importPage.getImportedFilesList(page);
+        expect(importedFilesList).to.contains(firstFile)
+          .and.to.contains(secondFile);
+      });
 
-      await importPage.chooseFromHistoryFTP(page);
+      it('should delete the first imported file', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'deleteFirstFile', baseContext);
 
-      const uploadSuccessText = await importPage.useFile(page, 1);
-      await expect(uploadSuccessText).contain(secondFile);
-    });
+        // Delete file and check that choose from history button is visible
+        const isButtonVisible = await importPage.deleteFile(page);
+        expect(isButtonVisible).to.be.eq(true);
+      });
 
-    it('should go to next import file step', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'nextStep2', baseContext);
+      it('should use the second imported file', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'useSecondFile', baseContext);
 
-      await importPage.selectFileType(page, 'Suppliers');
+        await importPage.chooseFromHistoryFTP(page);
 
-      const panelTitle = await importPage.goToImportNextStep(page);
-      await expect(panelTitle).contain(importPage.importPanelTitle);
-    });
+        const uploadSuccessText = await importPage.useFile(page, 1);
+        expect(uploadSuccessText).to.contains(secondFile);
+      });
 
-    it('should start import file', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'confirmImport2', baseContext);
+      it('should go to next import file step', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'nextStep2', baseContext);
 
-      const modalTitle = await importPage.startFileImport(page);
-      await expect(modalTitle).contain(importPage.importModalTitle);
-    });
+        await importPage.selectFileType(page, 'Suppliers');
 
-    it('should check that the import is completed', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'waitForImport2', baseContext);
+        const panelTitle = await importPage.goToImportNextStep(page);
+        expect(panelTitle).to.contains(importPage.importPanelTitle);
+      });
 
-      const isCompleted = await importPage.getImportValidationMessage(page);
-      await expect(isCompleted, 'The import is not completed!')
-        .contain('Data imported')
-        .and.contain('Look at your listings to make sure it\'s all there as you wished.');
-    });
+      it('should start import file', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'confirmImport2', baseContext);
+
+        const modalTitle = await importPage.startFileImport(page);
+        expect(modalTitle).to.contains(importPage.importModalTitle);
+      });
+
+      it('should check that the import is completed', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'waitForImport2', baseContext);
+
+        const isCompleted = await importPage.getImportValidationMessage(page);
+        expect(isCompleted, 'The import is not completed!')
+          .to.contains('Data imported')
+          .and.to.contains('Look at your listings to make sure it\'s all there as you wished.');
+      });
 
-    it('should close import progress modal', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'closeImportModal2', baseContext);
+      it('should close import progress modal', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'closeImportModal2', baseContext);
 
-      const isModalClosed = await importPage.closeImportModal(page);
-      await expect(isModalClosed).to.be.true;
+        const isModalClosed = await importPage.closeImportModal(page);
+        expect(isModalClosed).to.be.eq(true);
+      });
+
+      it('should check if reset password mail is in mailbox', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'checkIfImportFTPFileIsInMailbox', baseContext);
+
+        expect(newMail.subject).to.contains(`[${global.INSTALL.SHOP_NAME}] Import complete`);
+      });
     });
   });
+
+  // Post-Condition : Reset SMTP config
+  resetSmtpConfigTest(baseContext);
 });

From 15f9d80ca7577bac526297ce3403eef4b34c982d Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Wed, 13 Sep 2023 16:28:01 +0200
Subject: [PATCH 0990/1030] Functional Tests : Hummingbird : FO - Header and
 Footer : Change currency

---
 .../BO/02_orders/01_orders/11_previewOrder.ts |   2 +-
 .../02_conditions/10_productSelection.ts      |   2 +-
 .../03_actions/07_applyToSpecificProduct.ts   |   2 +-
 .../03_separatorOfAttributeAnchor.ts          |   2 +-
 .../02_defaultPackStockManagement.ts          |   2 +-
 .../03_displayUnavailableProductAttributes.ts |   2 +-
 .../04_displayRemainingQuantities.ts          |   2 +-
 .../05_allowOrderingOutOfStock.ts             |   2 +-
 .../03_productsStock/07_labelOutOfStock.ts    |   2 +-
 ..._enableDeliveryTimeOfOutOfStockProducts.ts |   2 +-
 .../01_editSearchSettings/03_fuzzySearch.ts   |   2 +-
 .../02_headerAndFooter/03_changeCurrency.ts   |   2 +-
 .../FO/classic/07_search/02_searchProduct.ts  |   2 +-
 .../FO/classic/07_search/03_searchNoResult.ts |   2 +-
 .../03_navigationAndDisplay/01_displayTags.ts |   2 +-
 .../03_quickViewProducts.ts                   |   2 +-
 .../FO/classic/09_productPage/01_quickView.ts |   2 +-
 .../01_quickView/01_addToCart.ts              |   2 +-
 .../FO/classic/09_productPage/02_addToCart.ts |   2 +-
 .../02_headerAndFooter/03_changeCurrency.ts   | 193 ++++++++++++++++++
 .../currencies/computingPrecision_FO.ts       |   2 +-
 tests/UI/commonTests/FO/order.ts              |   2 +-
 tests/UI/commonTests/FO/shoppingCart.ts       |   2 +-
 tests/UI/pages/FO/FObasePage.ts               |  29 ++-
 .../FO/hummingbird/searchResults/index.ts     |  23 +++
 tests/UI/pages/FO/searchResults/index.ts      |   9 +-
 26 files changed, 270 insertions(+), 28 deletions(-)
 create mode 100644 tests/UI/campaigns/functional/FO/hummingbird/02_headerAndFooter/03_changeCurrency.ts
 create mode 100644 tests/UI/pages/FO/hummingbird/searchResults/index.ts

diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/11_previewOrder.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/11_previewOrder.ts
index bb17f39a161ff..b1c82fe057973 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/11_previewOrder.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/11_previewOrder.ts
@@ -19,7 +19,7 @@ import checkoutPage from '@pages/FO/checkout';
 import orderConfirmationPage from '@pages/FO/checkout/orderConfirmation';
 import {homePage} from '@pages/FO/home';
 import productPage from '@pages/FO/product';
-import searchResultsPage from '@pages/FO/searchResults';
+import {searchResultsPage} from '@pages/FO/searchResults';
 
 // Import data
 import Carriers from '@data/demo/carriers';
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/10_productSelection.ts b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/10_productSelection.ts
index d2b3b17a860a4..640cadd128ebd 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/10_productSelection.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/10_productSelection.ts
@@ -17,7 +17,7 @@ import {cartPage} from '@pages/FO/cart';
 import {homePage} from '@pages/FO/home';
 import {loginPage} from '@pages/FO/login';
 import productPage from '@pages/FO/product';
-import searchResultsPage from '@pages/FO/searchResults';
+import {searchResultsPage} from '@pages/FO/searchResults';
 
 // Import data
 import Customers from '@data/demo/customers';
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/03_actions/07_applyToSpecificProduct.ts b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/03_actions/07_applyToSpecificProduct.ts
index 0ca0246e4509d..15e26d8b14322 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/03_actions/07_applyToSpecificProduct.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/03_actions/07_applyToSpecificProduct.ts
@@ -17,7 +17,7 @@ import {cartPage} from '@pages/FO/cart';
 import {homePage} from '@pages/FO/home';
 import {loginPage} from '@pages/FO/login';
 import productPage from '@pages/FO/product';
-import searchResultsPage from '@pages/FO/searchResults';
+import {searchResultsPage} from '@pages/FO/searchResults';
 
 // Import data
 import Customers from '@data/demo/customers';
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/02_productPage/03_separatorOfAttributeAnchor.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/02_productPage/03_separatorOfAttributeAnchor.ts
index c6e10a7fbdeb3..889341a88f21d 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/02_productPage/03_separatorOfAttributeAnchor.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/02_productPage/03_separatorOfAttributeAnchor.ts
@@ -12,7 +12,7 @@ import productSettingsPage from '@pages/BO/shopParameters/productSettings';
 // Import FO pages
 import {homePage} from '@pages/FO/home';
 import productPage from '@pages/FO/product';
-import searchResultsPage from '@pages/FO/searchResults';
+import {searchResultsPage} from '@pages/FO/searchResults';
 
 // Import data
 import Products from '@data/demo/products';
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/02_defaultPackStockManagement.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/02_defaultPackStockManagement.ts
index 06be007c8f203..c042d8c9aa415 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/02_defaultPackStockManagement.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/02_defaultPackStockManagement.ts
@@ -22,7 +22,7 @@ import {loginPage as foLoginPage} from '@pages/FO/login';
 import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 import orderConfirmationPage from '@pages/FO/checkout/orderConfirmation';
-import searchResultsPage from '@pages/FO/searchResults';
+import {searchResultsPage} from '@pages/FO/searchResults';
 
 // Import data
 import Customers from '@data/demo/customers';
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/03_displayUnavailableProductAttributes.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/03_displayUnavailableProductAttributes.ts
index a7963bdb5b8d2..e0604ccd1ff9a 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/03_displayUnavailableProductAttributes.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/03_displayUnavailableProductAttributes.ts
@@ -19,7 +19,7 @@ import addProductPage from '@pages/BO/catalog/products/add';
 // Import FO pages
 import productPage from '@pages/FO/product';
 import {homePage} from '@pages/FO/home';
-import searchResultsPage from '@pages/FO/searchResults';
+import {searchResultsPage} from '@pages/FO/searchResults';
 
 // Import data
 import ProductData from '@data/faker/product';
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/04_displayRemainingQuantities.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/04_displayRemainingQuantities.ts
index 49d1cfdcaab22..100527629a655 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/04_displayRemainingQuantities.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/04_displayRemainingQuantities.ts
@@ -19,7 +19,7 @@ import addProductPage from '@pages/BO/catalog/products/add';
 // Import FO pages
 import {homePage} from '@pages/FO/home';
 import productPage from '@pages/FO/product';
-import searchResultsPage from '@pages/FO/searchResults';
+import {searchResultsPage} from '@pages/FO/searchResults';
 
 // Import data
 import ProductData from '@data/faker/product';
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/05_allowOrderingOutOfStock.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/05_allowOrderingOutOfStock.ts
index 31e3eb472bb14..5974d1492dce7 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/05_allowOrderingOutOfStock.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/05_allowOrderingOutOfStock.ts
@@ -19,7 +19,7 @@ import addProductPage from '@pages/BO/catalog/products/add';
 // Import FO pages
 import productPage from '@pages/FO/product';
 import {homePage} from '@pages/FO/home';
-import searchResultsPage from '@pages/FO/searchResults';
+import {searchResultsPage} from '@pages/FO/searchResults';
 
 // Import data
 import ProductData from '@data/faker/product';
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/07_labelOutOfStock.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/07_labelOutOfStock.ts
index 04a631a532662..7187b7d022b51 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/07_labelOutOfStock.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/07_labelOutOfStock.ts
@@ -19,7 +19,7 @@ import addProductPage from '@pages/BO/catalog/products/add';
 // Import FO pages
 import productPage from '@pages/FO/product';
 import {homePage} from '@pages/FO/home';
-import searchResultsPage from '@pages/FO/searchResults';
+import {searchResultsPage} from '@pages/FO/searchResults';
 
 // Import data
 import ProductData from '@data/faker/product';
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/09_enableDeliveryTimeOfOutOfStockProducts.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/09_enableDeliveryTimeOfOutOfStockProducts.ts
index 5afe602540291..46d6ee66c32a4 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/09_enableDeliveryTimeOfOutOfStockProducts.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/09_enableDeliveryTimeOfOutOfStockProducts.ts
@@ -19,7 +19,7 @@ import addProductPage from '@pages/BO/catalog/products/add';
 // Import FO pages
 import foProductPage from '@pages/FO/product';
 import {homePage as foHomePage} from '@pages/FO/home';
-import searchResultsPage from '@pages/FO/searchResults';
+import {searchResultsPage} from '@pages/FO/searchResults';
 
 // Import data
 import ProductData from '@data/faker/product';
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/07_search/01_search/01_editSearchSettings/03_fuzzySearch.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/07_search/01_search/01_editSearchSettings/03_fuzzySearch.ts
index c3f256577a7d7..6aa57f07a5d78 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/07_search/01_search/01_editSearchSettings/03_fuzzySearch.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/07_search/01_search/01_editSearchSettings/03_fuzzySearch.ts
@@ -11,7 +11,7 @@ import dashboardPage from '@pages/BO/dashboard';
 import searchPage from '@pages/BO/shopParameters/search';
 // Import FO pages
 import {homePage} from '@pages/FO/home';
-import searchResultsPage from '@pages/FO/searchResults';
+import {searchResultsPage} from '@pages/FO/searchResults';
 
 import {expect} from 'chai';
 import type {BrowserContext, Page} from 'playwright';
diff --git a/tests/UI/campaigns/functional/FO/classic/02_headerAndFooter/03_changeCurrency.ts b/tests/UI/campaigns/functional/FO/classic/02_headerAndFooter/03_changeCurrency.ts
index c8c59a879f44e..2ee1109996251 100644
--- a/tests/UI/campaigns/functional/FO/classic/02_headerAndFooter/03_changeCurrency.ts
+++ b/tests/UI/campaigns/functional/FO/classic/02_headerAndFooter/03_changeCurrency.ts
@@ -14,7 +14,7 @@ import currenciesPage from '@pages/BO/international/currencies';
 import localizationPage from '@pages/BO/international/localization';
 // Import FO pages
 import {homePage} from '@pages/FO/home';
-import searchResultsPage from '@pages/FO/searchResults';
+import {searchResultsPage} from '@pages/FO/searchResults';
 
 // Import data
 import Currencies from '@data/demo/currencies';
diff --git a/tests/UI/campaigns/functional/FO/classic/07_search/02_searchProduct.ts b/tests/UI/campaigns/functional/FO/classic/07_search/02_searchProduct.ts
index bae2393a868aa..a612b7972d4fd 100644
--- a/tests/UI/campaigns/functional/FO/classic/07_search/02_searchProduct.ts
+++ b/tests/UI/campaigns/functional/FO/classic/07_search/02_searchProduct.ts
@@ -5,7 +5,7 @@ import testContext from '@utils/testContext';
 // Import FO pages
 import {homePage} from '@pages/FO/home';
 import productPage from '@pages/FO/product';
-import searchResultsPage from '@pages/FO/searchResults';
+import {searchResultsPage} from '@pages/FO/searchResults';
 
 // Import data
 import Products from '@data/demo/products';
diff --git a/tests/UI/campaigns/functional/FO/classic/07_search/03_searchNoResult.ts b/tests/UI/campaigns/functional/FO/classic/07_search/03_searchNoResult.ts
index e91d5cccb6907..afe297e20b274 100644
--- a/tests/UI/campaigns/functional/FO/classic/07_search/03_searchNoResult.ts
+++ b/tests/UI/campaigns/functional/FO/classic/07_search/03_searchNoResult.ts
@@ -4,7 +4,7 @@ import testContext from '@utils/testContext';
 
 // Import pages
 import {homePage} from '@pages/FO/home';
-import searchResultsPage from '@pages/FO/searchResults';
+import {searchResultsPage} from '@pages/FO/searchResults';
 
 import {expect} from 'chai';
 import type {BrowserContext, Page} from 'playwright';
diff --git a/tests/UI/campaigns/functional/FO/classic/08_menuAndNavigation/03_navigationAndDisplay/01_displayTags.ts b/tests/UI/campaigns/functional/FO/classic/08_menuAndNavigation/03_navigationAndDisplay/01_displayTags.ts
index 886b3611146dc..48cb098c2e0cb 100644
--- a/tests/UI/campaigns/functional/FO/classic/08_menuAndNavigation/03_navigationAndDisplay/01_displayTags.ts
+++ b/tests/UI/campaigns/functional/FO/classic/08_menuAndNavigation/03_navigationAndDisplay/01_displayTags.ts
@@ -12,7 +12,7 @@ import dashboardPage from '@pages/BO/dashboard';
 import productsPage from '@pages/BO/catalog/products';
 import {homePage} from '@pages/FO/home';
 import featureFlagPage from '@pages/BO/advancedParameters/featureFlag';
-import searchResultsPage from '@pages/FO/searchResults';
+import {searchResultsPage} from '@pages/FO/searchResults';
 import productPage from '@pages/FO/product';
 import productSettingsPage from '@pages/BO/shopParameters/productSettings';
 import addProductPage from '@pages/BO/catalog/products/add';
diff --git a/tests/UI/campaigns/functional/FO/classic/08_menuAndNavigation/03_navigationAndDisplay/03_quickViewProducts.ts b/tests/UI/campaigns/functional/FO/classic/08_menuAndNavigation/03_navigationAndDisplay/03_quickViewProducts.ts
index 929a46dcca74d..9beac7e8974d7 100644
--- a/tests/UI/campaigns/functional/FO/classic/08_menuAndNavigation/03_navigationAndDisplay/03_quickViewProducts.ts
+++ b/tests/UI/campaigns/functional/FO/classic/08_menuAndNavigation/03_navigationAndDisplay/03_quickViewProducts.ts
@@ -4,7 +4,7 @@ import testContext from '@utils/testContext';
 
 // Import pages
 import {homePage} from '@pages/FO/home';
-import searchResultsPage from '@pages/FO/searchResults';
+import {searchResultsPage} from '@pages/FO/searchResults';
 
 // Import data
 import Products from '@data/demo/products';
diff --git a/tests/UI/campaigns/functional/FO/classic/09_productPage/01_quickView.ts b/tests/UI/campaigns/functional/FO/classic/09_productPage/01_quickView.ts
index dceba9c9e32fd..d0e7ac7b49a51 100644
--- a/tests/UI/campaigns/functional/FO/classic/09_productPage/01_quickView.ts
+++ b/tests/UI/campaigns/functional/FO/classic/09_productPage/01_quickView.ts
@@ -20,7 +20,7 @@ import boAddProductPage from '@pages/BO/catalog/products/add';
 import {homePage} from '@pages/FO/home';
 import {cartPage} from '@pages/FO/cart';
 import productPage from '@pages/FO/product';
-import searchResultsPage from '@pages/FO/searchResults';
+import {searchResultsPage} from '@pages/FO/searchResults';
 
 // Import data
 import Products from '@data/demo/products';
diff --git a/tests/UI/campaigns/functional/FO/classic/09_productPage/01_quickView/01_addToCart.ts b/tests/UI/campaigns/functional/FO/classic/09_productPage/01_quickView/01_addToCart.ts
index 53d8688709c68..fe7a17baeda13 100644
--- a/tests/UI/campaigns/functional/FO/classic/09_productPage/01_quickView/01_addToCart.ts
+++ b/tests/UI/campaigns/functional/FO/classic/09_productPage/01_quickView/01_addToCart.ts
@@ -5,7 +5,7 @@ import testContext from '@utils/testContext';
 // Import pages
 import {homePage} from '@pages/FO/home';
 import {cartPage} from '@pages/FO/cart';
-import searchResultsPage from '@pages/FO/searchResults';
+import {searchResultsPage} from '@pages/FO/searchResults';
 
 // Import data
 import Products from '@data/demo/products';
diff --git a/tests/UI/campaigns/functional/FO/classic/09_productPage/02_addToCart.ts b/tests/UI/campaigns/functional/FO/classic/09_productPage/02_addToCart.ts
index 39e271a24dc62..3274417097727 100644
--- a/tests/UI/campaigns/functional/FO/classic/09_productPage/02_addToCart.ts
+++ b/tests/UI/campaigns/functional/FO/classic/09_productPage/02_addToCart.ts
@@ -18,7 +18,7 @@ import boProductsPage from '@pages/BO/catalog/products';
 import boAddProductPage from '@pages/BO/catalog/products/add';
 // FO
 import {homePage} from '@pages/FO/home';
-import searchResultsPage from '@pages/FO/searchResults';
+import {searchResultsPage} from '@pages/FO/searchResults';
 import productPage from '@pages/FO/product';
 import {cartPage} from '@pages/FO/cart';
 
diff --git a/tests/UI/campaigns/functional/FO/hummingbird/02_headerAndFooter/03_changeCurrency.ts b/tests/UI/campaigns/functional/FO/hummingbird/02_headerAndFooter/03_changeCurrency.ts
new file mode 100644
index 0000000000000..dafd2c802582c
--- /dev/null
+++ b/tests/UI/campaigns/functional/FO/hummingbird/02_headerAndFooter/03_changeCurrency.ts
@@ -0,0 +1,193 @@
+// Import utils
+import files from '@utils/files';
+import helper from '@utils/helpers';
+import testContext from '@utils/testContext';
+
+// Import commonTests
+import {installHummingbird, uninstallHummingbird} from '@commonTests/FO/hummingbird';
+import {createCurrencyTest, deleteCurrencyTest} from '@commonTests/BO/international/currency';
+import loginCommon from '@commonTests/BO/loginBO';
+
+// Import pages
+// Import BO pages
+import dashboardPage from '@pages/BO/dashboard';
+import currenciesPage from '@pages/BO/international/currencies';
+import localizationPage from '@pages/BO/international/localization';
+// Import FO pages
+import homePage from '@pages/FO/hummingbird/home';
+import searchResultsPage from '@pages/FO/hummingbird/searchResults';
+
+// Import data
+import Currencies from '@data/demo/currencies';
+import Products from '@data/demo/products';
+
+import {expect} from 'chai';
+import type {BrowserContext, Page} from 'playwright';
+
+const baseContext: string = 'functional_FO_hummingbird_headerAndFooter_changeCurrency';
+
+/*
+Pre-condition: Check the block currencies is not displayed in header of FO
+Pre-condition: Create a new currency
+Scenario:
+ - Go to FO and check that the currencies list is not visible in the header
+ - Create new currency
+ - Go to FO and switch to the new currency
+ - Check that the price of the product is changed
+ - Switch back to the original currency and check the price of the first product
+Post-condition:
+- Delete the created currency
+*/
+
+describe('FO - Header and Footer : Change currency', async () => {
+  let browserContext: BrowserContext;
+  let page: Page;
+  let filePath: string;
+  let exchangeRateValue: number = 0;
+
+  // Pre-condition : Install Hummingbird
+  installHummingbird(`${baseContext}_preTest_1`);
+
+  describe('Check links in header page', async () => {
+    before(async function () {
+      browserContext = await helper.createBrowserContext(this.browser);
+      page = await helper.newTab(browserContext);
+    });
+
+    after(async () => {
+      await files.deleteFile(filePath);
+      await helper.closeBrowserContext(browserContext);
+    });
+
+    // Pre-condition: Check the block currencies is not displayed in header of FO
+    describe('PRE-TEST: Check that the block currencies is not displayed in header of FO', async () => {
+      it('should go to FO home page', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'goToFO', baseContext);
+
+        await homePage.goToFo(page);
+
+        const isHomePage = await homePage.isHomePage(page);
+        expect(isHomePage).to.be.eq(true);
+      });
+
+      it('should check that the currencies block is not visible', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'checkCurrenciesLink', baseContext);
+
+        const isVisible = await homePage.isCurrencyVisible(page);
+        expect(isVisible).to.be.eq(false);
+      });
+    });
+
+    // Pre-condition: Create currency
+    createCurrencyTest(Currencies.mad, `${baseContext}_preTest_2`);
+
+    describe('Filter by iso code of currency and get the exchange rate value ', async () => {
+      it('should login in BO', async function () {
+        await loginCommon.loginBO(this, page);
+      });
+
+      it('should go to \'International > Localization\' page', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'goToLocalizationPage', baseContext);
+
+        await dashboardPage.goToSubMenu(
+          page,
+          dashboardPage.internationalParentLink,
+          dashboardPage.localizationLink,
+        );
+        await localizationPage.closeSfToolBar(page);
+
+        const pageTitle = await localizationPage.getPageTitle(page);
+        expect(pageTitle).to.contains(localizationPage.pageTitle);
+      });
+
+      it('should go to \'Currencies\' page', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'goToCurrenciesPage', baseContext);
+
+        await localizationPage.goToSubTabCurrencies(page);
+
+        const pageTitle = await currenciesPage.getPageTitle(page);
+        expect(pageTitle).to.contains(currenciesPage.pageTitle);
+      });
+
+      it(`should get the currency exchange rate value '${Currencies.mad.isoCode}'`, async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'getExchangeRate', baseContext);
+
+        // Filter
+        await currenciesPage.filterTable(page, 'input', 'iso_code', Currencies.mad.isoCode);
+
+        // Check exchange rate
+        exchangeRateValue = await currenciesPage.getExchangeRateValue(page, 1);
+        expect(exchangeRateValue).to.be.above(0);
+      });
+    });
+
+    describe('Switch to another currency and check the product price', async () => {
+      it('should go to FO home page', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'goToFO2', baseContext);
+
+        await homePage.goToFo(page);
+
+        const isHomePage = await homePage.isHomePage(page);
+        expect(isHomePage).to.be.eq(true);
+      });
+
+      it('should change FO currency', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'changeFoCurrency', baseContext);
+
+        // Check currency
+        await homePage.changeCurrency(page, Currencies.mad.isoCode, Currencies.mad.symbol);
+
+        const shopCurrency = await homePage.getDefaultCurrency(page);
+        expect(shopCurrency).to.contains(Currencies.mad.isoCode);
+      });
+
+      it('should search product', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'searchProduct', baseContext);
+
+        await homePage.searchProduct(page, Products.demo_11.name);
+
+        const pageTitle = await searchResultsPage.getPageTitle(page);
+        expect(pageTitle).to.equal(searchResultsPage.pageTitle);
+      });
+
+      it('should check the product price', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'checkProductPrice', baseContext);
+
+        const newExchangeRateValue = (exchangeRateValue * Products.demo_11.finalPrice).toFixed(Currencies.mad.decimals);
+
+        const productPrice = await searchResultsPage.getProductPrice(page);
+        expect(productPrice).to.contains(`${Currencies.mad.symbol}${newExchangeRateValue}`);
+      });
+
+      it('should switch back to the default currency', async function () {
+        await testContext.addContextItem(
+          this,
+          'testIdentifier',
+          'switchBackDefaultFoCurrency',
+          baseContext,
+        );
+
+        // Check currency
+        await homePage.changeCurrency(page, Currencies.euro.isoCode, Currencies.euro.symbol);
+
+        const shopCurrency = await homePage.getDefaultCurrency(page);
+        expect(shopCurrency).to.contains(Currencies.euro.isoCode);
+      });
+
+      it('should check the product price', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', 'checkProductPrice2', baseContext);
+
+        const exchangeRate = Math.round(Currencies.euro.exchangeRate * Products.demo_11.finalPrice);
+
+        const productPrice = await searchResultsPage.getProductPrice(page);
+        expect(productPrice).to.contains(`${Currencies.euro.symbol}${exchangeRate}`);
+      });
+    });
+  });
+
+  // Post-condition - Delete currency
+  deleteCurrencyTest(Currencies.mad, `${baseContext}_postTest_1`);
+
+  // Post-condition : Uninstall Hummingbird
+  uninstallHummingbird(`${baseContext}_postTest_2`);
+});
diff --git a/tests/UI/campaigns/regression/currencies/computingPrecision_FO.ts b/tests/UI/campaigns/regression/currencies/computingPrecision_FO.ts
index 39a2c88dedc7d..bdd6fdf4d13a6 100644
--- a/tests/UI/campaigns/regression/currencies/computingPrecision_FO.ts
+++ b/tests/UI/campaigns/regression/currencies/computingPrecision_FO.ts
@@ -24,7 +24,7 @@ import orderConfirmationPage from '@pages/FO/checkout/orderConfirmation';
 import {homePage} from '@pages/FO/home';
 import {loginPage as foLoginPage} from '@pages/FO/login';
 import productPage from '@pages/FO/product';
-import searchResultsPage from '@pages/FO/searchResults';
+import {searchResultsPage} from '@pages/FO/searchResults';
 
 // Import data
 import Currencies from '@data/demo/currencies';
diff --git a/tests/UI/commonTests/FO/order.ts b/tests/UI/commonTests/FO/order.ts
index 8c9759d55717c..09bcce5e363de 100644
--- a/tests/UI/commonTests/FO/order.ts
+++ b/tests/UI/commonTests/FO/order.ts
@@ -7,7 +7,7 @@ import {cartPage} from '@pages/FO/cart';
 import {homePage} from '@pages/FO/home';
 import {loginPage as foLoginPage} from '@pages/FO/login';
 import productPage from '@pages/FO/product';
-import searchResultsPage from '@pages/FO/searchResults';
+import {searchResultsPage} from '@pages/FO/searchResults';
 import orderConfirmationPage from '@pages/FO/checkout/orderConfirmation';
 import checkoutPage from '@pages/FO/checkout';
 
diff --git a/tests/UI/commonTests/FO/shoppingCart.ts b/tests/UI/commonTests/FO/shoppingCart.ts
index 51662e5f30e50..f8ba736420d1a 100644
--- a/tests/UI/commonTests/FO/shoppingCart.ts
+++ b/tests/UI/commonTests/FO/shoppingCart.ts
@@ -7,7 +7,7 @@ import {cartPage} from '@pages/FO/cart';
 import {homePage} from '@pages/FO/home';
 import {loginPage as foLoginPage} from '@pages/FO/login';
 import productPage from '@pages/FO/product';
-import searchResultsPage from '@pages/FO/searchResults';
+import {searchResultsPage} from '@pages/FO/searchResults';
 
 import OrderData from '@data/faker/order';
 
diff --git a/tests/UI/pages/FO/FObasePage.ts b/tests/UI/pages/FO/FObasePage.ts
index 5ffb842d56122..4de108da9f70f 100644
--- a/tests/UI/pages/FO/FObasePage.ts
+++ b/tests/UI/pages/FO/FObasePage.ts
@@ -125,12 +125,16 @@ export default class FOBasePage extends CommonPage {
 
   protected readonly userMenuDropdown: string;
 
+  protected readonly currencySelector: string;
+
   protected readonly languageSelector: string;
 
   private readonly cartProductsCountHummingbird: string;
 
   protected readonly navbarLink: string;
 
+  protected readonly hSearchInput: string;
+
   protected theme: string;
 
   /**
@@ -216,9 +220,11 @@ export default class FOBasePage extends CommonPage {
 
     // Hummingbird
     this.userMenuDropdown = '#userMenuButton';
+    this.currencySelector = '#currency-selector';
     this.languageSelector = '#language-selector';
     this.cartProductsCountHummingbird = '#_desktop_cart .header-block__action-btn span.header-block__badge';
     this.navbarLink = '.navbar-brand';
+    this.hSearchInput = '#search_widget .js-search-input';
 
     this.theme = 'classic';
   }
@@ -417,9 +423,23 @@ export default class FOBasePage extends CommonPage {
    * @return {Promise<void>}
    */
   async changeCurrency(page: Page, isoCode: string = 'EUR', symbol: string = '€'): Promise<void> {
+    const currency = isoCode === symbol ? isoCode : `${isoCode} ${symbol}`;
+
+    if (this.theme === 'hummingbird') {
+      const langOptions = await page.$$(`${this.currencySelector} option`);
+
+      // eslint-disable-next-line no-restricted-syntax
+      for (const [keyOption, langOption] of Object.entries(langOptions)) {
+        if ((await langOption.textContent()) === currency) {
+          await page.selectOption(this.currencySelector, {index: parseInt(keyOption, 10)});
+          return;
+        }
+      }
+
+      return;
+    }
     // If isoCode and symbol are the same, only isoCode id displayed in FO
     const currentUrl: string = page.url();
-    const currency = isoCode === symbol ? isoCode : `${isoCode} ${symbol}`;
 
     await Promise.all([
       this.selectByVisibleText(page, this.currencySelect, currency, true),
@@ -453,6 +473,11 @@ export default class FOBasePage extends CommonPage {
    * @returns {Promise<string>}
    */
   async getDefaultCurrency(page: Page): Promise<string> {
+    if (this.theme === 'hummingbird') {
+      return page
+        .locator(this.currencySelector)
+        .evaluate((el: HTMLSelectElement): string => el.options[el.options.selectedIndex].textContent ?? '');
+    }
     return this.getTextContent(page, this.defaultCurrencySpan);
   }
 
@@ -571,7 +596,7 @@ export default class FOBasePage extends CommonPage {
   async searchProduct(page: Page, productName: string): Promise<void > {
     const currentUrl: string = page.url();
 
-    await this.setValue(page, this.searchInput, productName);
+    await this.setValue(page, this.theme === 'hummingbird' ? this.hSearchInput : this.searchInput, productName);
     await page.keyboard.press('Enter');
     await page.waitForURL((url: URL): boolean => url.toString() !== currentUrl, {waitUntil: 'networkidle'});
   }
diff --git a/tests/UI/pages/FO/hummingbird/searchResults/index.ts b/tests/UI/pages/FO/hummingbird/searchResults/index.ts
new file mode 100644
index 0000000000000..7dab7900e282b
--- /dev/null
+++ b/tests/UI/pages/FO/hummingbird/searchResults/index.ts
@@ -0,0 +1,23 @@
+// Import FO pages
+import {SearchResultsPage} from '@pages/FO/searchResults';
+
+/**
+ * Password Reminder page, contains functions that can be used on the page
+ * @class
+ * @extends FOBasePage
+ */
+class SearchResults extends SearchResultsPage {
+  /**
+   * @constructs
+   * Setting up texts and selectors to use on my account page
+   */
+  constructor() {
+    super();
+
+    this.theme = 'hummingbird';
+
+    this.productPrice = '#js-product-list div.card span.product-miniature__price';
+  }
+}
+
+export default new SearchResults();
diff --git a/tests/UI/pages/FO/searchResults/index.ts b/tests/UI/pages/FO/searchResults/index.ts
index 2a0fbedae7e4f..e4955d4db6ec5 100644
--- a/tests/UI/pages/FO/searchResults/index.ts
+++ b/tests/UI/pages/FO/searchResults/index.ts
@@ -7,7 +7,7 @@ import type {Page} from 'playwright';
  * @class
  * @extends FOBasePage
  */
-class SearchResults extends FOBasePage {
+class SearchResultsPage extends FOBasePage {
   public readonly pageTitle: string;
 
   private readonly productListTopDiv: string;
@@ -22,7 +22,7 @@ class SearchResults extends FOBasePage {
 
   private readonly productQuickViewLink: (number: number) => string;
 
-  private readonly productPrice: string;
+  protected productPrice: string;
 
   private readonly productNoMatches: string;
 
@@ -147,9 +147,10 @@ class SearchResults extends FOBasePage {
    * @param page {Page} Browser tab
    * @returns {Promise<string>}
    */
-  getProductPrice(page: Page): Promise<string> {
+  async getProductPrice(page: Page): Promise<string> {
     return this.getTextContent(page, this.productPrice);
   }
 }
 
-export default new SearchResults();
+const searchResultsPage = new SearchResultsPage();
+export {searchResultsPage, SearchResultsPage};

From 314414441126dc86e67f79f4d4768c4d20648b44 Mon Sep 17 00:00:00 2001
From: Ibrahima SOW <sowbiba@hotmail.com>
Date: Wed, 13 Sep 2023 14:34:27 +0000
Subject: [PATCH 0991/1030] Update
 tests/Integration/Controllers/AdminSearchControllerCoreTest.php

Co-authored-by: Jonathan Lelievre <jo.lelievre@gmail.com>
---
 tests/Integration/Controllers/AdminSearchControllerCoreTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Integration/Controllers/AdminSearchControllerCoreTest.php b/tests/Integration/Controllers/AdminSearchControllerCoreTest.php
index 4c622d4709974..868a40d5f456f 100644
--- a/tests/Integration/Controllers/AdminSearchControllerCoreTest.php
+++ b/tests/Integration/Controllers/AdminSearchControllerCoreTest.php
@@ -72,7 +72,7 @@ public function dataProviderSearch(): array
                             'title' => 'Search docs.prestashop-project.org',
                             'button_label' => 'Go to the documentation',
                             'link' => 'https://docs.prestashop-project.org/welcome/?q=',
-                            'is_external_link' => false,
+                            'is_external_link' => true,
                         ],
                     ],
                 ],

From 32af48fb5f02ea0c7eafde66fe27c2152527b754 Mon Sep 17 00:00:00 2001
From: Ibrahima SOW <sowbiba@hotmail.com>
Date: Wed, 13 Sep 2023 14:34:54 +0000
Subject: [PATCH 0992/1030] Update
 tests/Integration/Controllers/AdminSearchControllerCoreTest.php

Co-authored-by: Jonathan Lelievre <jo.lelievre@gmail.com>
---
 tests/Integration/Controllers/AdminSearchControllerCoreTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Integration/Controllers/AdminSearchControllerCoreTest.php b/tests/Integration/Controllers/AdminSearchControllerCoreTest.php
index 868a40d5f456f..e972ecf11bd4d 100644
--- a/tests/Integration/Controllers/AdminSearchControllerCoreTest.php
+++ b/tests/Integration/Controllers/AdminSearchControllerCoreTest.php
@@ -95,7 +95,7 @@ public function dataProviderSearch(): array
                             'title' => 'Search docs.prestashop-project.org',
                             'button_label' => 'Go to the documentation',
                             'link' => 'https://docs.prestashop-project.org/welcome/?q=orders',
-                            'is_external_link' => false,
+                            'is_external_link' => true,
                         ],
                     ],
                 ],

From ad460df96a4a7a88d2d6e557205b832e9fbbce41 Mon Sep 17 00:00:00 2001
From: Ibrahima SOW <sowbiba@hotmail.com>
Date: Wed, 13 Sep 2023 14:35:08 +0000
Subject: [PATCH 0993/1030] Update src/Core/Search/SearchPanel.php

Co-authored-by: Jonathan Lelievre <jo.lelievre@gmail.com>
---
 src/Core/Search/SearchPanel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Core/Search/SearchPanel.php b/src/Core/Search/SearchPanel.php
index 9cb68615e0eff..0aeaaf223e497 100644
--- a/src/Core/Search/SearchPanel.php
+++ b/src/Core/Search/SearchPanel.php
@@ -59,7 +59,7 @@ public function __construct(
         string $buttonLabel,
         string $link,
         array $queryParams,
-        ?bool $isExternalLink = false
+        ?bool $isExternalLink = true
     ) {
         $this->title = $title;
         $this->buttonLabel = $buttonLabel;

From c69a8b35696f93b0b945afd006bef2dbbc9690d2 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Wed, 13 Sep 2023 18:40:10 +0200
Subject: [PATCH 0994/1030] Add new test product description - part 3

---
 .../productV2/functional/10_descriptionTab.ts |  58 +++++-
 .../catalog/productsV2/add/descriptionTab.ts  | 190 ++++++++++++++++--
 2 files changed, 229 insertions(+), 19 deletions(-)

diff --git a/tests/UI/campaigns/productV2/functional/10_descriptionTab.ts b/tests/UI/campaigns/productV2/functional/10_descriptionTab.ts
index 474f459738253..3457e896f9043 100644
--- a/tests/UI/campaigns/productV2/functional/10_descriptionTab.ts
+++ b/tests/UI/campaigns/productV2/functional/10_descriptionTab.ts
@@ -172,10 +172,66 @@ describe('BO - Catalog - Products : Description tab', async () => {
     it('should add category', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'addCategory', baseContext);
 
-      await descriptionTab.addNewCategory(page, '');
+      await descriptionTab.addNewCategory(page, ['Clothes', 'Men']);
+
+      const createProductMessage = await createProductsPage.saveProduct(page);
+      expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
 
       const selectedCategories = await descriptionTab.getSelectedCategories(page);
       expect(selectedCategories).to.eq('Home x Clothes x Men x');
     });
+
+    it('should check that we can delete the 2 categories', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'checkDeleteIcon', baseContext);
+
+      let isDeleteIconVisible = await descriptionTab.isDeleteCategoryIconVisible(page, 0);
+      await expect(isDeleteIconVisible).to.be.false;
+
+      isDeleteIconVisible = await descriptionTab.isDeleteCategoryIconVisible(page, 1);
+      await expect(isDeleteIconVisible).to.be.true;
+
+      isDeleteIconVisible = await descriptionTab.isDeleteCategoryIconVisible(page, 2);
+      await expect(isDeleteIconVisible).to.be.true;
+    });
+
+    it('should choose default category', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'chooseDefaultCategory', baseContext);
+
+      await descriptionTab.chooseDefaultCategory(page, 2);
+
+      const createProductMessage = await createProductsPage.saveProduct(page);
+      expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+    });
+
+    it('should check that we can delete the first and the last category', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'checkDeleteIcon2', baseContext);
+
+      let isDeleteIconVisible = await descriptionTab.isDeleteCategoryIconVisible(page, 0);
+      await expect(isDeleteIconVisible).to.be.true;
+
+      isDeleteIconVisible = await descriptionTab.isDeleteCategoryIconVisible(page, 1);
+      await expect(isDeleteIconVisible).to.be.false;
+
+      isDeleteIconVisible = await descriptionTab.isDeleteCategoryIconVisible(page, 2);
+      await expect(isDeleteIconVisible).to.be.true;
+    });
+
+    it('should choose brand', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'chooseBrand', baseContext);
+
+      await descriptionTab.chooseBrand(page, 2);
+
+      const createProductMessage = await createProductsPage.saveProduct(page);
+      expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+    });
+
+    it('should add related product', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'addRelatedProduct', baseContext);
+
+      await descriptionTab.addRelatedProduct(page, 't-shirt');
+
+      const createProductMessage = await createProductsPage.saveProduct(page);
+      expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+    });
   });
 });
diff --git a/tests/UI/pages/BO/catalog/productsV2/add/descriptionTab.ts b/tests/UI/pages/BO/catalog/productsV2/add/descriptionTab.ts
index 899e9f9e8a3cb..10881e5fa4418 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/descriptionTab.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/descriptionTab.ts
@@ -23,6 +23,8 @@ class DescriptionTab extends BOBasePage {
 
   private readonly productImage: string;
 
+  private readonly productImageContainer: string;
+
   private readonly productImageDropZoneWindow: string;
 
   private readonly productImageDropZoneCover: string;
@@ -37,6 +39,22 @@ class DescriptionTab extends BOBasePage {
 
   private readonly productImageDropZoneBtnSubmit: string;
 
+  private readonly productImageDropZoneSelectAllLink: string;
+
+  private readonly productImageDropZoneCloseButton: string;
+
+  private readonly productImageDropZoneZoomIcon: string;
+
+  private readonly productImageDropZoneZoomImage: string;
+
+  private readonly productImageDropZoneCloseZoom: string;
+
+  private readonly productImageDropZoneReplaceImageSelection: string;
+
+  private readonly productImageDropZoneDeleteImageSelection: string;
+
+  private readonly applyDeleteImageButton: string;
+
   private readonly productSummary: string;
 
   private readonly productSummaryTabLocale: (locale: string) => string;
@@ -47,8 +65,28 @@ class DescriptionTab extends BOBasePage {
 
   private readonly productDefaultCategory: string;
 
+  private readonly addCategoryButton: string;
+
+  private readonly addCategoryInput: string;
+
+  private readonly applyCategoryButton: string;
+
+  private readonly categoriesList: string;
+
+  private readonly defaultCategorySelectButton: string;
+
+  private readonly defaultCategoryList: (categoryRow: number) => string;
+
+  private readonly deleteCategoryIcon: (categoryRow: number) => string;
+
   private readonly productManufacturer: string;
 
+  private readonly productManufacturerSelectButton: string;
+
+  private readonly relatedProductSelectButton: string;
+
+  private readonly productManufacturerList: (brandRow: number) => string;
+
   /**
    * @constructs
    * Setting up texts and selectors to use on description tab
@@ -61,11 +99,13 @@ class DescriptionTab extends BOBasePage {
 
     // Selectors in description tab
     this.descriptionTabLink = '#product_description-tab-nav';
+    // Image selectors
     this.productImageDropZoneDiv = '#product-images-dropzone';
     this.imagePreviewBlock = `${this.productImageDropZoneDiv} div.dz-preview.openfilemanager`;
     this.imagePreviewCover = `${this.productImageDropZoneDiv} div.dz-preview.is-cover`;
     this.productImage = `${this.productImageDropZoneDiv} div.dz-preview.dz-image-preview.dz-complete`;
-    this.productImageDropZoneWindow = '#product-images-container .dropzone-window';
+    this.productImageContainer = '#product-images-container';
+    this.productImageDropZoneWindow = `${this.productImageContainer} .dropzone-window`;
     this.productImageDropZoneCover = `${this.productImageDropZoneWindow} #is-cover-checkbox`;
     this.productImageDropZoneBtnLang = `${this.productImageDropZoneWindow} #product_dropzone_lang`;
     this.productImageDropZoneDropdown = `${this.productImageDropZoneWindow} .locale-dropdown-menu.show`;
@@ -73,12 +113,41 @@ class DescriptionTab extends BOBasePage {
       + `[data-locale="${locale}"]`;
     this.productImageDropZoneCaption = `${this.productImageDropZoneWindow} #caption-textarea`;
     this.productImageDropZoneBtnSubmit = `${this.productImageDropZoneWindow} button.save-image-settings`;
+    this.productImageDropZoneSelectAllLink = `${this.productImageDropZoneWindow} p.dropzone-window-select`;
+    this.productImageDropZoneCloseButton = `${this.productImageDropZoneWindow} div.dropzone-window-header-right`
+      + ' i[data-original-title="Close window"]';
+    this.productImageDropZoneZoomIcon = `${this.productImageDropZoneWindow} div.dropzone-window-header-right`
+      + ' i[data-original-title="Zoom on selection"]';
+    this.productImageDropZoneZoomImage = `${this.productImageContainer} div.pswp--open.pswp--visible`;
+    this.productImageDropZoneCloseZoom = `${this.productImageContainer} button.pswp__button--close`;
+    this.productImageDropZoneReplaceImageSelection = `${this.productImageContainer} div.dropzone-window-header-right`
+      + ' i[data-original-title="Replace selection"]';
+    this.productImageDropZoneDeleteImageSelection = `${this.productImageContainer} div.dropzone-window-header-right`
+      + ' i[data-original-title="Delete selection"]';
+    this.applyDeleteImageButton = `${this.productImageContainer} footer button.btn-primary`;
+    // Description & summary selectors
     this.productSummary = '#product_description_description_short';
     this.productSummaryTabLocale = (locale: string) => `${this.productSummary} a[data-locale="${locale}"]`;
     this.productDescription = '#product_description_description';
     this.productDescriptionTabLocale = (locale: string) => `${this.productDescription} a[data-locale="${locale}"]`;
+    // Categories selectors
     this.productDefaultCategory = '#product_description_categories_default_category_id';
+    this.addCategoryButton = '#product_description_categories_add_categories_btn';
+    this.addCategoryInput = '#ps-select-product-category';
+    this.applyCategoryButton = '#category_tree_selector_apply_btn';
+    this.categoriesList = '#product_description_categories_product_categories';
+    this.defaultCategorySelectButton = '#select2-product_description_categories_default_category_id-container';
+    this.defaultCategoryList = (categoryRow: number) => '#select2-product_description_categories_default_category_id-results'
+      + ` li:nth-child(${categoryRow})`;
+    this.deleteCategoryIcon = (categoryRow: number) => `#product_description_categories_product_categories_${categoryRow}_name`
+      + ' + a.pstaggerClosingCross:not(.d-none)';
+    // Brand selectors
     this.productManufacturer = '#product_description_manufacturer';
+    this.productManufacturerSelectButton = '#select2-product_description_manufacturer-container';
+    this.productManufacturerList = (BrandRow: number) => '#select2-product_description_manufacturer-results'
+      + ` li:nth-child(${BrandRow})`;
+    // Related product selectors
+    this.relatedProductSelectButton = '#product_description_related_products_search_input';
   }
 
   /*
@@ -140,7 +209,7 @@ class DescriptionTab extends BOBasePage {
     await page.locator(this.productImage).nth(numImage - 1).click();
 
     if (selectAll) {
-      await page.locator('#product-images-container div.dropzone-window p.dropzone-window-select').click();
+      await page.locator(this.productImageDropZoneSelectAllLink).click();
     }
 
     if (useAsCoverImage) {
@@ -166,32 +235,54 @@ class DescriptionTab extends BOBasePage {
 
       return this.getGrowlMessageContent(page);
     }
-    await page.locator('#product-images-container div.dropzone-window div.dropzone-window-header-right i[data-original-title="Close window"]').click();
+    await page.locator(this.productImageDropZoneCloseButton).click();
+    return null;
   }
 
+  /**
+   * Click on magnifying glass
+   * @param page {Page} Browser tab
+   * @returns {Promise<boolean>}
+   */
   async clickOnMagnifyingGlass(page: Page): Promise<boolean> {
-    await page.locator('#product-images-container div.dropzone-window-header.row div.dropzone-window-header-right i[data-original-title="Zoom on selection"]').click();
+    await page.locator(this.productImageDropZoneZoomIcon).click();
 
-    return this.elementVisible(page, '#product-images-container div.pswp--open.pswp--visible', 1000);
+    return this.elementVisible(page, this.productImageDropZoneZoomImage, 1000);
   }
 
+  /**
+   * Close image zoom
+   * @param page {Page} Browser tab
+   * @returns {Promise<boolean>}
+   */
   async closeImageZoom(page: Page): Promise<boolean> {
-    await page.locator('#product-images-container button.pswp__button--close').click();
+    await page.locator(this.productImageDropZoneCloseZoom).click();
 
-    return this.elementNotVisible(page, '#product-images-container div.pswp--open.pswp--visible', 1000);
+    return this.elementNotVisible(page, this.productImageDropZoneZoomImage, 1000);
   }
 
+  /**
+   * Replace image selection
+   * @param page {Page} Browser tab
+   * @param image {string} Browser tab
+   * @returns {Promise<string>}
+   */
   async replaceImageSelection(page: Page, image: string): Promise<string> {
-    await this.uploadOnFileChooser(page, '#product-images-container div.dropzone-window-header.row div.dropzone-window-header-right i[data-original-title="Replace selection"]', [image]);
+    await this.uploadOnFileChooser(page, this.productImageDropZoneReplaceImageSelection, [image]);
     await page.locator(this.productImageDropZoneBtnSubmit).click();
 
     return this.getGrowlMessageContent(page);
   }
 
+  /**
+   * delete image
+   * @param page {Page} Browser tab
+   * @returns {Promise<string>}
+   */
   async deleteImage(page: Page): Promise<string> {
     await this.closeGrowlMessage(page);
-    await page.locator('#product-images-container div.dropzone-window-header.row div.dropzone-window-header-right i[data-original-title="Delete selection"]').click();
-    await page.locator('#product-images-container footer button.btn.btn-primary').click();
+    await page.locator(this.productImageDropZoneDeleteImageSelection).click();
+    await page.locator(this.applyDeleteImageButton).click();
 
     return this.getGrowlMessageContent(page);
   }
@@ -264,18 +355,81 @@ class DescriptionTab extends BOBasePage {
     }
   }
 
-  async addNewCategory(page: Page, categoryData): Promise<string> {
-    await page.locator('#product_description_categories_add_categories_btn').click();
-    await this.waitForVisibleSelector(page, '#categories-modal');
-    await page.locator('#category_tree_selector_category_tree > li > ul > li:nth-child(1) > div > div > div').click();
-    await page.locator('#category_tree_selector_category_tree > li > ul > li:nth-child(1).category-tree-element.more div.category-tree-inputs').click();
-    await page.locator('#category_tree_selector_category_tree > li > ul > li.category-tree-element.less > ul > li:nth-child(1)').click();
+  /**
+   * Add new category
+   * @param page {Page} Browser tab
+   * @param categories {string[]} Browser tab
+   * @returns {Promise<string>}
+   */
+  async addNewCategory(page: Page, categories: string[]): Promise<string> {
+    await page.locator(this.addCategoryButton).click();
+    await this.waitForVisibleSelector(page, this.addCategoryInput);
+    for (let i: number = 0; i < categories.length; i++) {
+      await page.type(this.addCategoryInput, categories[i]);
+      await page.keyboard.press('ArrowDown');
+      await page.keyboard.press('Enter');
+      await page.waitForTimeout(1000);
+    }
 
-    await page.locator('#category_tree_selector_apply_btn').click();
+    await this.waitForSelectorAndClick(page, this.applyCategoryButton);
   }
 
+  /**
+   * Get selected categories
+   * @param page {Page} Browser tab
+   * @returns {Promise<string>}
+   */
   async getSelectedCategories(page: Page): Promise<string> {
-    return this.getTextContent(page, '#product_description_categories_product_categories');
+    return this.getTextContent(page, this.categoriesList);
+  }
+
+  /**
+   * Get selected categories
+   * @param page {Page} Browser tab
+   * @param categoryRow {number} Category row
+   * @returns {Promise<void>}
+   */
+  async chooseDefaultCategory(page: Page, categoryRow: number): Promise<void> {
+    await page.locator(this.defaultCategorySelectButton).click();
+    await page.locator(this.defaultCategoryList(categoryRow)).click();
+  }
+
+  /**
+   * Is delete category icon visible
+   * @param page {Page} Browser tab
+   * @param categoryRow {number} Category row
+   * @returns {Promise<number>}
+   */
+  async isDeleteCategoryIconVisible(page: Page, categoryRow: number): Promise<boolean> {
+    const isDeleteIconVisible = await page.evaluate(
+      (selector: string) => document.querySelector(selector),
+      this.deleteCategoryIcon(categoryRow),
+    );
+
+    return isDeleteIconVisible !== null;
+  }
+
+  /**
+   * Is delete category icon visible
+   * @param page {Page} Browser tab
+   * @param brandRow {number} Brand row
+   * @returns {Promise<void>}
+   */
+  async chooseBrand(page: Page, brandRow: number): Promise<void> {
+    await page.locator(this.productManufacturerSelectButton).click();
+    await page.locator(this.productManufacturerList(brandRow)).click();
+  }
+
+  /**
+   * Add related product
+   * @param page {Page} Browser tab
+   * @param productName {string} Product name
+   * @returns {Promise<void>}
+   */
+  async addRelatedProduct(page: Page, productName: string): Promise<void> {
+    await page.type(this.relatedProductSelectButton, productName);
+    await page.keyboard.press('ArrowDown');
+    await page.keyboard.press('Enter');
   }
 }
 

From d6be6ab483fd4fdb91c95a5142acfe2c26be16c9 Mon Sep 17 00:00:00 2001
From: Matthieu Rolland <matthieurolland@macbook-pro-de-matthieu.home>
Date: Mon, 21 Aug 2023 16:43:51 +0200
Subject: [PATCH 0995/1030] Fix last issues + implement export

---
 .../AddAttributeGroupHandler.php              |  2 ++
 .../EditAttributeGroupHandler.php             |  2 ++
 .../GetAttributeGroupForEditingHandler.php    |  2 ++
 .../AttributeGroupGridDefinitionFactory.php   |  8 +++++
 .../Sell/Catalog/AttributeGroupController.php | 34 ++++++++++++++++---
 .../services/adapter/attribute_group.yml      | 12 ++-----
 6 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/src/Adapter/AttributeGroup/CommandHandler/AddAttributeGroupHandler.php b/src/Adapter/AttributeGroup/CommandHandler/AddAttributeGroupHandler.php
index d3070460d7acb..d6145a9eb4e44 100644
--- a/src/Adapter/AttributeGroup/CommandHandler/AddAttributeGroupHandler.php
+++ b/src/Adapter/AttributeGroup/CommandHandler/AddAttributeGroupHandler.php
@@ -31,6 +31,7 @@
 use AttributeGroup;
 use PrestaShop\PrestaShop\Adapter\AttributeGroup\Repository\AttributeGroupRepository;
 use PrestaShop\PrestaShop\Adapter\Domain\AbstractObjectModelHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\AddAttributeGroupCommand;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\CommandHandler\AddAttributeGroupHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupId;
@@ -38,6 +39,7 @@
 /**
  * Handles adding of attribute groups using legacy logic.
  */
+#[AsCommandHandler]
 final class AddAttributeGroupHandler extends AbstractObjectModelHandler implements AddAttributeGroupHandlerInterface
 {
     /**
diff --git a/src/Adapter/AttributeGroup/CommandHandler/EditAttributeGroupHandler.php b/src/Adapter/AttributeGroup/CommandHandler/EditAttributeGroupHandler.php
index 9a52a05b2d7a1..459d21909fa7b 100644
--- a/src/Adapter/AttributeGroup/CommandHandler/EditAttributeGroupHandler.php
+++ b/src/Adapter/AttributeGroup/CommandHandler/EditAttributeGroupHandler.php
@@ -30,12 +30,14 @@
 
 use PrestaShop\PrestaShop\Adapter\AttributeGroup\Repository\AttributeGroupRepository;
 use PrestaShop\PrestaShop\Adapter\Domain\AbstractObjectModelHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\EditAttributeGroupCommand;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\CommandHandler\EditAttributeGroupHandlerInterface;
 
 /**
  * Handles editing of attribute groups using legacy logic.
  */
+#[AsCommandHandler]
 final class EditAttributeGroupHandler extends AbstractObjectModelHandler implements EditAttributeGroupHandlerInterface
 {
     /**
diff --git a/src/Adapter/AttributeGroup/QueryHandler/GetAttributeGroupForEditingHandler.php b/src/Adapter/AttributeGroup/QueryHandler/GetAttributeGroupForEditingHandler.php
index f9a0a3bbf0129..92567f8104a0f 100644
--- a/src/Adapter/AttributeGroup/QueryHandler/GetAttributeGroupForEditingHandler.php
+++ b/src/Adapter/AttributeGroup/QueryHandler/GetAttributeGroupForEditingHandler.php
@@ -29,6 +29,7 @@
 namespace PrestaShop\PrestaShop\Adapter\AttributeGroup\QueryHandler;
 
 use PrestaShop\PrestaShop\Adapter\AttributeGroup\Repository\AttributeGroupRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Query\GetAttributeGroupForEditing;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\QueryHandler\GetAttributeGroupForEditingHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\QueryResult\EditableAttributeGroup;
@@ -36,6 +37,7 @@
 /**
  * Handles query which gets attribute group for editing
  */
+#[AsQueryHandler]
 final class GetAttributeGroupForEditingHandler implements GetAttributeGroupForEditingHandlerInterface
 {
     /**
diff --git a/src/Core/Grid/Definition/Factory/AttributeGroupGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/AttributeGroupGridDefinitionFactory.php
index 7a2736df0a6ad..f27d9f1e511e2 100644
--- a/src/Core/Grid/Definition/Factory/AttributeGroupGridDefinitionFactory.php
+++ b/src/Core/Grid/Definition/Factory/AttributeGroupGridDefinitionFactory.php
@@ -159,6 +159,14 @@ protected function getGridActions()
                 ],
             ])
             )
+            ->add(
+                (new LinkGridAction('export'))
+                    ->setName($this->trans('Export', [], 'Admin.Actions'))
+                    ->setIcon('cloud_download')
+                    ->setOptions([
+                        'route' => 'admin_attribute_groups_export',
+                    ])
+            )
             ->add((new SimpleGridAction('common_refresh_list'))
             ->setName($this->trans('Refresh list', [], 'Admin.Advparameters.Feature'))
             ->setIcon('refresh')
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php
index 7e96bf1869d55..2cd1f29aec0b7 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php
@@ -39,6 +39,7 @@
 use PrestaShop\PrestaShop\Core\Grid\Position\GridPositionUpdaterInterface;
 use PrestaShop\PrestaShop\Core\Grid\Position\PositionUpdateFactoryInterface;
 use PrestaShop\PrestaShop\Core\Search\Filters\AttributeGroupFilters;
+use PrestaShopBundle\Component\CsvResponse;
 use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
 use PrestaShopBundle\Security\Annotation\AdminSecurity;
 use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -131,6 +132,7 @@ public function editAction(Request $request, int $attributeGroupId): Response
         $attributeFormHandler = $this->get('PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Handler\AttributeGroupFormHandler');
 
         $attributeGroupForm = $attributeGroupFormBuilder->getFormFor($attributeGroupId);
+
         $attributeGroupForm->handleRequest($request);
 
         try {
@@ -169,14 +171,36 @@ public function editAction(Request $request, int $attributeGroupId): Response
      * )
 
      *
-     * @param int $attributeGroupId
+     * @param AttributeGroupFilters $filters
      *
-     * @return RedirectResponse
+     * @return CsvResponse
      */
-    public function exportAction(int $attributeGroupId)
+    public function exportAction(AttributeGroupFilters $filters): CsvResponse
     {
-        //@todo: implement in antoher pr
-        return $this->redirectToRoute('admin_attribute_groups_index');
+        $filters = new AttributeGroupFilters(['limit' => null] + $filters->all());
+        $attributeGroupGridFactory = $this->get('prestashop.core.grid.factory.attribute_group');
+        $attributeGroupGrid = $attributeGroupGridFactory->getGrid($filters);
+
+        $headers = [
+            'id_attribute_group' => $this->trans('ID', 'Admin.Global'),
+            'name' => $this->trans('Name', 'Admin.Global'),
+            'position' => $this->trans('Position', 'Admin.Global'),
+        ];
+
+        $data = [];
+
+        foreach ($attributeGroupGrid->getData()->getRecords()->all() as $record) {
+            $data[] = [
+                'id_attribute_group' => $record['id_attribute_group'],
+                'name' => $record['name'],
+                'position' => $record['position'],
+            ];
+        }
+
+        return (new CsvResponse())
+            ->setData($data)
+            ->setHeadersData($headers)
+            ->setFileName('attribute_group_' . date('Y-m-d_His') . '.csv');
     }
 
     /**
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/attribute_group.yml b/src/PrestaShopBundle/Resources/config/services/adapter/attribute_group.yml
index 6d54daa3b7f72..32af69438a75f 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/attribute_group.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/attribute_group.yml
@@ -4,21 +4,15 @@ services:
 
   PrestaShop\PrestaShop\Adapter\AttributeGroup\CommandHandler\AddAttributeGroupHandler:
     autowire: true
-    tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\AddAttributeGroupCommand
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\AttributeGroup\CommandHandler\EditAttributeGroupHandler:
     autowire: true
-    tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\EditAttributeGroupCommand
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\AttributeGroup\QueryHandler\GetAttributeGroupForEditingHandler:
     autowire: true
-    tags:
-      - name: tactician.handler
-        command: PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Query\GetAttributeGroupForEditing
+    autoconfigure: true
 
   PrestaShop\PrestaShop\Adapter\AttributeGroup\AttributeGroupViewDataProvider:
     arguments:

From 0a19eaefa6a8cf854360e61f12be65aa9f58e914 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Thu, 14 Sep 2023 10:08:50 +0200
Subject: [PATCH 0996/1030] Fix typeScript check errors

---
 .../UI/pages/BO/catalog/productsV2/add/descriptionTab.ts  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/UI/pages/BO/catalog/productsV2/add/descriptionTab.ts b/tests/UI/pages/BO/catalog/productsV2/add/descriptionTab.ts
index 10881e5fa4418..112ca59f484e1 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/descriptionTab.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/descriptionTab.ts
@@ -267,7 +267,7 @@ class DescriptionTab extends BOBasePage {
    * @param image {string} Browser tab
    * @returns {Promise<string>}
    */
-  async replaceImageSelection(page: Page, image: string): Promise<string> {
+  async replaceImageSelection(page: Page, image: string): Promise<string | null> {
     await this.uploadOnFileChooser(page, this.productImageDropZoneReplaceImageSelection, [image]);
     await page.locator(this.productImageDropZoneBtnSubmit).click();
 
@@ -279,7 +279,7 @@ class DescriptionTab extends BOBasePage {
    * @param page {Page} Browser tab
    * @returns {Promise<string>}
    */
-  async deleteImage(page: Page): Promise<string> {
+  async deleteImage(page: Page): Promise<string | null> {
     await this.closeGrowlMessage(page);
     await page.locator(this.productImageDropZoneDeleteImageSelection).click();
     await page.locator(this.applyDeleteImageButton).click();
@@ -359,9 +359,9 @@ class DescriptionTab extends BOBasePage {
    * Add new category
    * @param page {Page} Browser tab
    * @param categories {string[]} Browser tab
-   * @returns {Promise<string>}
+   * @returns {Promise<void>}
    */
-  async addNewCategory(page: Page, categories: string[]): Promise<string> {
+  async addNewCategory(page: Page, categories: string[]): Promise<void> {
     await page.locator(this.addCategoryButton).click();
     await this.waitForVisibleSelector(page, this.addCategoryInput);
     for (let i: number = 0; i < categories.length; i++) {

From 585589d9da67cf08c4d1834a023bbd82d5a34524 Mon Sep 17 00:00:00 2001
From: Jonathan Lelievre <jonathan.lelievre@prestashop.com>
Date: Thu, 14 Sep 2023 11:02:47 +0200
Subject: [PATCH 0997/1030] Bump 8.1.2 version

---
 install-dev/install_version.php | 2 +-
 src/Core/Version.php            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/install-dev/install_version.php b/install-dev/install_version.php
index 2761133584a81..0f18523e50705 100644
--- a/install-dev/install_version.php
+++ b/install-dev/install_version.php
@@ -24,7 +24,7 @@
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  */
 
-define('_PS_INSTALL_VERSION_', '8.1.1');
+define('_PS_INSTALL_VERSION_', '8.1.2');
 define('_PS_INSTALL_MINIMUM_PHP_VERSION_ID_', 70205);
 define('_PS_INSTALL_MAXIMUM_PHP_VERSION_ID_', 81099);
 
diff --git a/src/Core/Version.php b/src/Core/Version.php
index 07d50273f8300..b5a0b27bda5ec 100644
--- a/src/Core/Version.php
+++ b/src/Core/Version.php
@@ -32,11 +32,11 @@
  */
 final class Version
 {
-    public const VERSION = '8.1.1';
+    public const VERSION = '8.1.2';
     public const MAJOR_VERSION_STRING = '8';
     public const MAJOR_VERSION = 8;
     public const MINOR_VERSION = 1;
-    public const RELEASE_VERSION = 1;
+    public const RELEASE_VERSION = 2;
 
     // This class should not be instanciated
     private function __construct()

From 09af97413f504f07b08764c96c165d656aa4d485 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 15 Sep 2023 09:08:35 +0000
Subject: [PATCH 0998/1030] Bump @types/chai from 4.3.5 to 4.3.6 in /tests/UI

Bumps [@types/chai](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/chai) from 4.3.5 to 4.3.6.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/chai)

---
updated-dependencies:
- dependency-name: "@types/chai"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 14 +++++++-------
 tests/UI/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index 4328c0ace22bb..105cc091a2865 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -28,7 +28,7 @@
         "xpath-ts": "^1.3.13"
       },
       "devDependencies": {
-        "@types/chai": "^4.3.5",
+        "@types/chai": "^4.3.6",
         "@types/chai-string": "^1.4.3",
         "@types/libsodium-wrappers": "^0.7.11",
         "@types/mocha": "^10.0.1",
@@ -447,9 +447,9 @@
       }
     },
     "node_modules/@types/chai": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.5.tgz",
-      "integrity": "sha512-mEo1sAde+UCE6b2hxn332f1g1E8WfYRu6p5SvTKr2ZKC1f7gFJXk4h5PyGP9Dt6gCaG8y8XhwnXWC6Iy2cmBng==",
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.6.tgz",
+      "integrity": "sha512-VOVRLM1mBxIRxydiViqPcKn6MIxZytrbMpd6RJLIWKxUNr3zux8no0Oc7kJx0WAPIitgZ0gkrDS+btlqQpubpw==",
       "dev": true
     },
     "node_modules/@types/chai-string": {
@@ -8287,9 +8287,9 @@
       "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A=="
     },
     "@types/chai": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.5.tgz",
-      "integrity": "sha512-mEo1sAde+UCE6b2hxn332f1g1E8WfYRu6p5SvTKr2ZKC1f7gFJXk4h5PyGP9Dt6gCaG8y8XhwnXWC6Iy2cmBng==",
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.6.tgz",
+      "integrity": "sha512-VOVRLM1mBxIRxydiViqPcKn6MIxZytrbMpd6RJLIWKxUNr3zux8no0Oc7kJx0WAPIitgZ0gkrDS+btlqQpubpw==",
       "dev": true
     },
     "@types/chai-string": {
diff --git a/tests/UI/package.json b/tests/UI/package.json
index ee99f0fec194b..57024da9d3d45 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -121,7 +121,7 @@
     "xpath-ts": "^1.3.13"
   },
   "devDependencies": {
-    "@types/chai": "^4.3.5",
+    "@types/chai": "^4.3.6",
     "@types/chai-string": "^1.4.3",
     "@types/libsodium-wrappers": "^0.7.11",
     "@types/mocha": "^10.0.1",

From f39889d96d7af23801f7c1faf6698237f3d98724 Mon Sep 17 00:00:00 2001
From: Ibrahima SOW <ibrahima.sow@prestashop.com>
Date: Fri, 15 Sep 2023 09:53:11 +0000
Subject: [PATCH 0999/1030] Add target blank styling for new-theme

---
 .../new-theme/scss/components/layout/_main_header.scss   | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/admin-dev/themes/new-theme/scss/components/layout/_main_header.scss b/admin-dev/themes/new-theme/scss/components/layout/_main_header.scss
index d92e68c6de931..6b2ade2e08f92 100644
--- a/admin-dev/themes/new-theme/scss/components/layout/_main_header.scss
+++ b/admin-dev/themes/new-theme/scss/components/layout/_main_header.scss
@@ -747,6 +747,15 @@ $header-text-color: #4e6167 !default;
       &.dropdown-item {
         margin: 10px 0;
 
+        &[target="_blank"]::after {
+          position: relative;
+          top: 2px;
+          font-family: "Material Icons", sans-serif;
+          color: #bbcdd2;
+          content: "\e89e";
+          opacity: 0.7;
+        }
+
         &:hover {
           color: #fff;
           background-color: #25b9d7;

From 1f02866c6741504a0356788b31e709a8bf1b3fd3 Mon Sep 17 00:00:00 2001
From: tleon <thomas.leone@prestashop.com>
Date: Tue, 29 Aug 2023 16:29:57 +0200
Subject: [PATCH 1000/1030] feat(api-platform): handle scope on endpoints

---
 app/config/security_test.yml                  |  2 +-
 ...urceMetadataCollectionFactoryDecorator.php | 89 +++++++++++++++++++
 .../ApiPlatform/Resources/Hook.php            | 25 +++---
 .../config/services/adapter/hook.yml          |  6 ++
 .../Repository/AccessTokenRepository.php      |  3 +
 5 files changed, 112 insertions(+), 13 deletions(-)
 create mode 100644 src/PrestaShopBundle/ApiPlatform/Decorator/AttributesResourceMetadataCollectionFactoryDecorator.php

diff --git a/app/config/security_test.yml b/app/config/security_test.yml
index 2fa2611561337..4476a36ed7c0c 100644
--- a/app/config/security_test.yml
+++ b/app/config/security_test.yml
@@ -13,7 +13,7 @@ security:
     oauth2:
       memory:
         users:
-          my_client_id: { password: 'prestashop' }
+          my_client_id: { password: 'prestashop', roles: [ 'ROLE_HOOK_READ', 'ROLE_HOOK_WRITE' ] }
 
   encoders:
     Symfony\Component\Security\Core\User\User: plaintext
diff --git a/src/PrestaShopBundle/ApiPlatform/Decorator/AttributesResourceMetadataCollectionFactoryDecorator.php b/src/PrestaShopBundle/ApiPlatform/Decorator/AttributesResourceMetadataCollectionFactoryDecorator.php
new file mode 100644
index 0000000000000..8c5d14afbdc93
--- /dev/null
+++ b/src/PrestaShopBundle/ApiPlatform/Decorator/AttributesResourceMetadataCollectionFactoryDecorator.php
@@ -0,0 +1,89 @@
+<?php
+
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\ApiPlatform\Decorator;
+
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
+use ApiPlatform\Metadata\Resource\ResourceMetadataCollection;
+
+/** Decorate Api platform's ResourceMetadataCollectionFactory, so we can alter the results it returns */
+class AttributesResourceMetadataCollectionFactoryDecorator implements ResourceMetadataCollectionFactoryInterface
+{
+    private ResourceMetadataCollectionFactoryInterface $innerFactory;
+
+    public function __construct(ResourceMetadataCollectionFactoryInterface $innerFactory)
+    {
+        $this->innerFactory = $innerFactory;
+    }
+
+    public function create(string $resourceClass): ResourceMetadataCollection
+    {
+        // We call the original method since we only want to alter the result of this method.
+        $resourceMetadataCollection = $this->innerFactory->create($resourceClass);
+
+        /** @var ApiResource $resourceMetadata */
+        foreach ($resourceMetadataCollection as $resourceMetadata) {
+            $operations = $resourceMetadata->getOperations();
+            /** @var Operation $operation */
+            foreach ($operations as $key => $operation) {
+                $extraProperties = $operation->getExtraProperties();
+                if (array_key_exists('scopes', $extraProperties)) {
+                    $scopesToAdd = $extraProperties['scopes'];
+                    $modifiedOperationWithSecurity = $operation->withSecurity(
+                        $this->translateScopeToSecurity($scopesToAdd, $operation->getSecurity())
+                    );
+                    // We unset the extra property scopes so that the element is not treated again.
+                    unset($extraProperties['scopes']);
+                    $modifiedOperation = $modifiedOperationWithSecurity->withExtraProperties($extraProperties);
+                    // We remove the original element and replace it with our clone.
+                    $operations->remove($key);
+                    $operations->add($key, $modifiedOperation);
+                }
+            }
+        }
+
+        return $resourceMetadataCollection;
+    }
+
+    private function translateScopeToSecurity(array $scopes, ?string $existingSecurity): string
+    {
+        $security = '';
+        $arrayLength = count($scopes);
+        foreach ($scopes as $key => $scope) {
+            $security .= 'is_granted("ROLE_' . strtoupper($scope) . '")';
+            if ($key !== $arrayLength - 1) {
+                $security .= ' OR ';
+            }
+        }
+
+        return empty($existingSecurity) ? $security : sprintf('(%s) OR (%s)', $existingSecurity, $security);
+    }
+}
diff --git a/src/PrestaShopBundle/ApiPlatform/Resources/Hook.php b/src/PrestaShopBundle/ApiPlatform/Resources/Hook.php
index dd488013a358c..c1c65a094acad 100644
--- a/src/PrestaShopBundle/ApiPlatform/Resources/Hook.php
+++ b/src/PrestaShopBundle/ApiPlatform/Resources/Hook.php
@@ -38,7 +38,6 @@
 use PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHookStatus;
 use PrestaShopBundle\ApiPlatform\Processor\CommandProcessor;
 use PrestaShopBundle\ApiPlatform\Provider\QueryProvider;
-use Symfony\Component\Serializer\Annotation\Groups;
 
 #[ApiResource(
     operations: [
@@ -61,40 +60,42 @@
                     [
                         'name' => 'Authorization',
                         'in' => 'scopes',
-                        'description' => 'read:hook-status <br> write:hook-status ',
+                        'description' => 'hook_read <br> hook_write ',
                     ],
                 ],
             ],
             exceptionToStatus: [HookNotFoundException::class => 404],
-            normalizationContext: [
-                'groups' => [
-                    'hook-status:read',
-                ],
-            ],
             provider: QueryProvider::class,
-            extraProperties: ['query' => GetHookStatus::class]
+            extraProperties: [
+                'query' => GetHookStatus::class,
+                'scopes' => ['hook_read'],
+            ]
         ),
         new Put(
             uriTemplate: '/hook-status',
             processor: CommandProcessor::class,
-            extraProperties: ['command' => UpdateHookStatusCommand::class]
+            extraProperties: [
+                'command' => UpdateHookStatusCommand::class,
+                'scopes' => ['hook_write'],
+            ]
         ),
         new Get(
             uriTemplate: '/hooks/{id}',
             requirements: ['id' => '\d+'],
             exceptionToStatus: [HookNotFoundException::class => 404],
             provider: QueryProvider::class,
-            extraProperties: ['query' => GetHook::class]
+            extraProperties: [
+                'query' => GetHook::class,
+                'scopes' => ['hook_read'],
+            ]
         ),
     ],
 )]
 class Hook
 {
     #[ApiProperty(identifier: true)]
-    #[Groups(['hook-status:read'])]
     public int $id;
 
-    #[Groups(['hook-status:read'])]
     public bool $active;
 
     public string $name;
diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/hook.yml b/src/PrestaShopBundle/Resources/config/services/adapter/hook.yml
index 0d0d487611f0b..59067b2ab410f 100644
--- a/src/PrestaShopBundle/Resources/config/services/adapter/hook.yml
+++ b/src/PrestaShopBundle/Resources/config/services/adapter/hook.yml
@@ -17,3 +17,9 @@ services:
 
   prestashop.adapter.hook.manager:
     alias: PrestaShop\PrestaShop\Adapter\HookManager
+
+  prestashop.attributes.ressource.metadata.collection.factory:
+    class: PrestaShopBundle\ApiPlatform\Decorator\AttributesResourceMetadataCollectionFactoryDecorator
+    decorates: api_platform.metadata.resource.metadata_collection_factory
+    arguments:
+      $innerFactory: '@prestashop.attributes.ressource.metadata.collection.factory.inner'
diff --git a/src/PrestaShopBundle/Security/OAuth2/Repository/AccessTokenRepository.php b/src/PrestaShopBundle/Security/OAuth2/Repository/AccessTokenRepository.php
index f6c1eb665d34d..00ddfe8981881 100644
--- a/src/PrestaShopBundle/Security/OAuth2/Repository/AccessTokenRepository.php
+++ b/src/PrestaShopBundle/Security/OAuth2/Repository/AccessTokenRepository.php
@@ -48,6 +48,9 @@ public function getNewToken(
         $token = new AccessToken();
         $token->setClient($clientEntity);
         $token->setUserIdentifier($userIdentifier);
+        foreach ($scopes as $scope) {
+            $token->addScope($scope);
+        }
 
         return $token;
     }

From b94b2ef7a710d601232c114f1edb6ac744170d86 Mon Sep 17 00:00:00 2001
From: Jonathan Lelievre <jonathan.lelievre@prestashop.com>
Date: Fri, 15 Sep 2023 11:59:25 +0200
Subject: [PATCH 1001/1030] Skip external API tests

---
 .../02_externalAuthServer/01_authorizationEndpoint.ts          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/01_authorizationEndpoint.ts b/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/01_authorizationEndpoint.ts
index 56f72279000d7..c33a06e19c6dd 100644
--- a/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/01_authorizationEndpoint.ts
+++ b/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/01_authorizationEndpoint.ts
@@ -7,7 +7,8 @@ import {APIRequestContext, request} from 'playwright';
 
 const baseContext: string = 'functional_API_clientCredentialGrantFlow_externalAuthServer_authorizationEndpoint';
 
-describe('API : External Auth Server - Authorization Endpoint', async () => {
+// @todo : https://github.com/PrestaShop/PrestaShop/issues/33946
+describe.skip('API : External Auth Server - Authorization Endpoint', async () => {
   let apiContextBO: APIRequestContext;
   let apiContextKeycloak: APIRequestContext;
   let accessTokenKeycloak: string;

From 83509d2efcc8916c794abe2cdef36c3bc118554e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 15 Sep 2023 12:13:43 +0000
Subject: [PATCH 1002/1030] Bump eslint from 8.48.0 to 8.49.0 in /tests/UI

Bumps [eslint](https://github.com/eslint/eslint) from 8.48.0 to 8.49.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.48.0...v8.49.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 46 +++++++++++++++++++-------------------
 tests/UI/package.json      |  2 +-
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index 105cc091a2865..81dc24a12a29f 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -36,7 +36,7 @@
         "@typescript-eslint/eslint-plugin": "^6.5.0",
         "@typescript-eslint/parser": "^6.6.0",
         "babel-eslint": "^10.1.0",
-        "eslint": "^8.48.0",
+        "eslint": "^8.49.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-deprecation": "^1.5.0",
         "eslint-plugin-html": "^7.1.0",
@@ -287,9 +287,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.48.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.48.0.tgz",
-      "integrity": "sha512-ZSjtmelB7IJfWD2Fvb7+Z+ChTIKWq6kjda95fLcQKNS5aheVHn4IkfgRQE3sIIzTcSLwLcLZUD9UBt+V7+h+Pw==",
+      "version": "8.49.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.49.0.tgz",
+      "integrity": "sha512-1S8uAY/MTJqVx0SC4epBq+N2yhuwtNwLbJYNZyhL2pO1ZVKn5HFXav5T41Ryzy9K9V7ZId2JB2oy/W4aCd9/2w==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -311,9 +311,9 @@
       }
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz",
-      "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==",
+      "version": "0.11.11",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.11.tgz",
+      "integrity": "sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==",
       "dev": true,
       "dependencies": {
         "@humanwhocodes/object-schema": "^1.2.1",
@@ -2607,16 +2607,16 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.48.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.48.0.tgz",
-      "integrity": "sha512-sb6DLeIuRXxeM1YljSe1KEx9/YYeZFQWcV8Rq9HfigmdDEugjLEVEa1ozDjL6YDjBpQHPJxJzze+alxi4T3OLg==",
+      "version": "8.49.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.49.0.tgz",
+      "integrity": "sha512-jw03ENfm6VJI0jA9U+8H5zfl5b+FvuU3YYvZRdZHOlU2ggJkxrlkJH4HcDrZpj6YwD8kuYqvQM8LyesoazrSOQ==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.2",
-        "@eslint/js": "8.48.0",
-        "@humanwhocodes/config-array": "^0.11.10",
+        "@eslint/js": "8.49.0",
+        "@humanwhocodes/config-array": "^0.11.11",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
         "ajv": "^6.12.4",
@@ -8171,9 +8171,9 @@
       }
     },
     "@eslint/js": {
-      "version": "8.48.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.48.0.tgz",
-      "integrity": "sha512-ZSjtmelB7IJfWD2Fvb7+Z+ChTIKWq6kjda95fLcQKNS5aheVHn4IkfgRQE3sIIzTcSLwLcLZUD9UBt+V7+h+Pw==",
+      "version": "8.49.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.49.0.tgz",
+      "integrity": "sha512-1S8uAY/MTJqVx0SC4epBq+N2yhuwtNwLbJYNZyhL2pO1ZVKn5HFXav5T41Ryzy9K9V7ZId2JB2oy/W4aCd9/2w==",
       "dev": true
     },
     "@faker-js/faker": {
@@ -8182,9 +8182,9 @@
       "integrity": "sha512-Uo3pGspElQW91PCvKSIAXoEgAUlRnH29sX2/p89kg7sP1m2PzCufHINd0FhTXQf6DYGiUlVncdSPa2F9wxed2A=="
     },
     "@humanwhocodes/config-array": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz",
-      "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==",
+      "version": "0.11.11",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.11.tgz",
+      "integrity": "sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==",
       "dev": true,
       "requires": {
         "@humanwhocodes/object-schema": "^1.2.1",
@@ -9853,16 +9853,16 @@
       }
     },
     "eslint": {
-      "version": "8.48.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.48.0.tgz",
-      "integrity": "sha512-sb6DLeIuRXxeM1YljSe1KEx9/YYeZFQWcV8Rq9HfigmdDEugjLEVEa1ozDjL6YDjBpQHPJxJzze+alxi4T3OLg==",
+      "version": "8.49.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.49.0.tgz",
+      "integrity": "sha512-jw03ENfm6VJI0jA9U+8H5zfl5b+FvuU3YYvZRdZHOlU2ggJkxrlkJH4HcDrZpj6YwD8kuYqvQM8LyesoazrSOQ==",
       "dev": true,
       "requires": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.2",
-        "@eslint/js": "8.48.0",
-        "@humanwhocodes/config-array": "^0.11.10",
+        "@eslint/js": "8.49.0",
+        "@humanwhocodes/config-array": "^0.11.11",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
         "ajv": "^6.12.4",
diff --git a/tests/UI/package.json b/tests/UI/package.json
index 57024da9d3d45..8ca7d112bd747 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -129,7 +129,7 @@
     "@typescript-eslint/eslint-plugin": "^6.5.0",
     "@typescript-eslint/parser": "^6.6.0",
     "babel-eslint": "^10.1.0",
-    "eslint": "^8.48.0",
+    "eslint": "^8.49.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-deprecation": "^1.5.0",
     "eslint-plugin-html": "^7.1.0",

From 7aa5916339f3281cc7f9950c99f5873773511f1a Mon Sep 17 00:00:00 2001
From: Matthieu Rolland <matthieu.rolland@prestashop.com>
Date: Fri, 15 Sep 2023 14:15:39 +0200
Subject: [PATCH 1003/1030] Update
 src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml

Co-authored-by: Jonathan Lelievre <jo.lelievre@gmail.com>
---
 .../Resources/config/services/bundle/form/form_type.yml       | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
index e186c0f5ff0cd..456b77847ec68 100644
--- a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
+++ b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml
@@ -432,9 +432,7 @@ services:
 
   PrestaShopBundle\Form\Admin\Sell\Catalog\FeatureType: ~
   PrestaShopBundle\Form\Admin\Sell\Catalog\FeatureValueType: ~
-  PrestaShopBundle\Form\Admin\Sell\Catalog\AttributeGroupType:
-    tags:
-      - { name: form.type }
+  PrestaShopBundle\Form\Admin\Sell\Catalog\AttributeGroupType: ~
 
   PrestaShopBundle\Form\Admin\Sell\Order\ChangeOrderCurrencyType:
     arguments:

From 7de8b4d81dca68f4d76d0bd97fc2320bf3d52e7b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 15 Sep 2023 12:57:08 +0000
Subject: [PATCH 1004/1030] Bump @typescript-eslint/eslint-plugin from 6.5.0 to
 6.7.0 in /tests/UI

Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 6.5.0 to 6.7.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.7.0/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 234 ++++++++++++++++++-------------------
 tests/UI/package.json      |   2 +-
 2 files changed, 118 insertions(+), 118 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index 81dc24a12a29f..88d1e30b7af42 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -33,7 +33,7 @@
         "@types/libsodium-wrappers": "^0.7.11",
         "@types/mocha": "^10.0.1",
         "@types/mochawesome": "^6.2.1",
-        "@typescript-eslint/eslint-plugin": "^6.5.0",
+        "@typescript-eslint/eslint-plugin": "^6.7.0",
         "@typescript-eslint/parser": "^6.6.0",
         "babel-eslint": "^10.1.0",
         "eslint": "^8.49.0",
@@ -541,16 +541,16 @@
       "dev": true
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.5.0.tgz",
-      "integrity": "sha512-2pktILyjvMaScU6iK3925uvGU87E+N9rh372uGZgiMYwafaw9SXq86U04XPq3UH6tzRvNgBsub6x2DacHc33lw==",
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.7.0.tgz",
+      "integrity": "sha512-gUqtknHm0TDs1LhY12K2NA3Rmlmp88jK9Tx8vGZMfHeNMLE3GH2e9TRub+y+SOjuYgtOmok+wt1AyDPZqxbNag==",
       "dev": true,
       "dependencies": {
         "@eslint-community/regexpp": "^4.5.1",
-        "@typescript-eslint/scope-manager": "6.5.0",
-        "@typescript-eslint/type-utils": "6.5.0",
-        "@typescript-eslint/utils": "6.5.0",
-        "@typescript-eslint/visitor-keys": "6.5.0",
+        "@typescript-eslint/scope-manager": "6.7.0",
+        "@typescript-eslint/type-utils": "6.7.0",
+        "@typescript-eslint/utils": "6.7.0",
+        "@typescript-eslint/visitor-keys": "6.7.0",
         "debug": "^4.3.4",
         "graphemer": "^1.4.0",
         "ignore": "^5.2.4",
@@ -576,13 +576,13 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.5.0.tgz",
-      "integrity": "sha512-A8hZ7OlxURricpycp5kdPTH3XnjG85UpJS6Fn4VzeoH4T388gQJ/PGP4ole5NfKt4WDVhmLaQ/dBLNDC4Xl/Kw==",
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.7.0.tgz",
+      "integrity": "sha512-lAT1Uau20lQyjoLUQ5FUMSX/dS07qux9rYd5FGzKz/Kf8W8ccuvMyldb8hadHdK/qOI7aikvQWqulnEq2nCEYA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.5.0",
-        "@typescript-eslint/visitor-keys": "6.5.0"
+        "@typescript-eslint/types": "6.7.0",
+        "@typescript-eslint/visitor-keys": "6.7.0"
       },
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -593,9 +593,9 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.5.0.tgz",
-      "integrity": "sha512-eqLLOEF5/lU8jW3Bw+8auf4lZSbbljHR2saKnYqON12G/WsJrGeeDHWuQePoEf9ro22+JkbPfWQwKEC5WwLQ3w==",
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.7.0.tgz",
+      "integrity": "sha512-ihPfvOp7pOcN/ysoj0RpBPOx3HQTJTrIN8UZK+WFd3/iDeFHHqeyYxa4hQk4rMhsz9H9mXpR61IzwlBVGXtl9Q==",
       "dev": true,
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -606,13 +606,13 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.5.0.tgz",
-      "integrity": "sha512-q0rGwSe9e5Kk/XzliB9h2LBc9tmXX25G0833r7kffbl5437FPWb2tbpIV9wAATebC/018pGa9fwPDuvGN+LxWQ==",
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.7.0.tgz",
+      "integrity": "sha512-dPvkXj3n6e9yd/0LfojNU8VMUGHWiLuBZvbM6V6QYD+2qxqInE7J+J/ieY2iGwR9ivf/R/haWGkIj04WVUeiSQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.5.0",
-        "@typescript-eslint/visitor-keys": "6.5.0",
+        "@typescript-eslint/types": "6.7.0",
+        "@typescript-eslint/visitor-keys": "6.7.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -633,17 +633,17 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.5.0.tgz",
-      "integrity": "sha512-9nqtjkNykFzeVtt9Pj6lyR9WEdd8npPhhIPM992FWVkZuS6tmxHfGVnlUcjpUP2hv8r4w35nT33mlxd+Be1ACQ==",
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.7.0.tgz",
+      "integrity": "sha512-MfCq3cM0vh2slSikQYqK2Gq52gvOhe57vD2RM3V4gQRZYX4rDPnKLu5p6cm89+LJiGlwEXU8hkYxhqqEC/V3qA==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "@types/json-schema": "^7.0.12",
         "@types/semver": "^7.5.0",
-        "@typescript-eslint/scope-manager": "6.5.0",
-        "@typescript-eslint/types": "6.5.0",
-        "@typescript-eslint/typescript-estree": "6.5.0",
+        "@typescript-eslint/scope-manager": "6.7.0",
+        "@typescript-eslint/types": "6.7.0",
+        "@typescript-eslint/typescript-estree": "6.7.0",
         "semver": "^7.5.4"
       },
       "engines": {
@@ -658,12 +658,12 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.5.0.tgz",
-      "integrity": "sha512-yCB/2wkbv3hPsh02ZS8dFQnij9VVQXJMN/gbQsaaY+zxALkZnxa/wagvLEFsAWMPv7d7lxQmNsIzGU1w/T/WyA==",
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.7.0.tgz",
+      "integrity": "sha512-/C1RVgKFDmGMcVGeD8HjKv2bd72oI1KxQDeY8uc66gw9R0OK0eMq48cA+jv9/2Ag6cdrsUGySm1yzYmfz0hxwQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.5.0",
+        "@typescript-eslint/types": "6.7.0",
         "eslint-visitor-keys": "^3.4.1"
       },
       "engines": {
@@ -818,13 +818,13 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.5.0.tgz",
-      "integrity": "sha512-f7OcZOkRivtujIBQ4yrJNIuwyCQO1OjocVqntl9dgSIZAdKqicj3xFDqDOzHDlGCZX990LqhLQXWRnQvsapq8A==",
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.7.0.tgz",
+      "integrity": "sha512-f/QabJgDAlpSz3qduCyQT0Fw7hHpmhOzY/Rv6zO3yO+HVIdPfIWhrQoAyG+uZVtWAIS85zAyzgAFfyEr+MgBpg==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "6.5.0",
-        "@typescript-eslint/utils": "6.5.0",
+        "@typescript-eslint/typescript-estree": "6.7.0",
+        "@typescript-eslint/utils": "6.7.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.0.1"
       },
@@ -845,13 +845,13 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/scope-manager": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.5.0.tgz",
-      "integrity": "sha512-A8hZ7OlxURricpycp5kdPTH3XnjG85UpJS6Fn4VzeoH4T388gQJ/PGP4ole5NfKt4WDVhmLaQ/dBLNDC4Xl/Kw==",
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.7.0.tgz",
+      "integrity": "sha512-lAT1Uau20lQyjoLUQ5FUMSX/dS07qux9rYd5FGzKz/Kf8W8ccuvMyldb8hadHdK/qOI7aikvQWqulnEq2nCEYA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.5.0",
-        "@typescript-eslint/visitor-keys": "6.5.0"
+        "@typescript-eslint/types": "6.7.0",
+        "@typescript-eslint/visitor-keys": "6.7.0"
       },
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -862,9 +862,9 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.5.0.tgz",
-      "integrity": "sha512-eqLLOEF5/lU8jW3Bw+8auf4lZSbbljHR2saKnYqON12G/WsJrGeeDHWuQePoEf9ro22+JkbPfWQwKEC5WwLQ3w==",
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.7.0.tgz",
+      "integrity": "sha512-ihPfvOp7pOcN/ysoj0RpBPOx3HQTJTrIN8UZK+WFd3/iDeFHHqeyYxa4hQk4rMhsz9H9mXpR61IzwlBVGXtl9Q==",
       "dev": true,
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -875,13 +875,13 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.5.0.tgz",
-      "integrity": "sha512-q0rGwSe9e5Kk/XzliB9h2LBc9tmXX25G0833r7kffbl5437FPWb2tbpIV9wAATebC/018pGa9fwPDuvGN+LxWQ==",
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.7.0.tgz",
+      "integrity": "sha512-dPvkXj3n6e9yd/0LfojNU8VMUGHWiLuBZvbM6V6QYD+2qxqInE7J+J/ieY2iGwR9ivf/R/haWGkIj04WVUeiSQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.5.0",
-        "@typescript-eslint/visitor-keys": "6.5.0",
+        "@typescript-eslint/types": "6.7.0",
+        "@typescript-eslint/visitor-keys": "6.7.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -902,17 +902,17 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.5.0.tgz",
-      "integrity": "sha512-9nqtjkNykFzeVtt9Pj6lyR9WEdd8npPhhIPM992FWVkZuS6tmxHfGVnlUcjpUP2hv8r4w35nT33mlxd+Be1ACQ==",
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.7.0.tgz",
+      "integrity": "sha512-MfCq3cM0vh2slSikQYqK2Gq52gvOhe57vD2RM3V4gQRZYX4rDPnKLu5p6cm89+LJiGlwEXU8hkYxhqqEC/V3qA==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "@types/json-schema": "^7.0.12",
         "@types/semver": "^7.5.0",
-        "@typescript-eslint/scope-manager": "6.5.0",
-        "@typescript-eslint/types": "6.5.0",
-        "@typescript-eslint/typescript-estree": "6.5.0",
+        "@typescript-eslint/scope-manager": "6.7.0",
+        "@typescript-eslint/types": "6.7.0",
+        "@typescript-eslint/typescript-estree": "6.7.0",
         "semver": "^7.5.4"
       },
       "engines": {
@@ -927,12 +927,12 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.5.0.tgz",
-      "integrity": "sha512-yCB/2wkbv3hPsh02ZS8dFQnij9VVQXJMN/gbQsaaY+zxALkZnxa/wagvLEFsAWMPv7d7lxQmNsIzGU1w/T/WyA==",
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.7.0.tgz",
+      "integrity": "sha512-/C1RVgKFDmGMcVGeD8HjKv2bd72oI1KxQDeY8uc66gw9R0OK0eMq48cA+jv9/2Ag6cdrsUGySm1yzYmfz0hxwQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.5.0",
+        "@typescript-eslint/types": "6.7.0",
         "eslint-visitor-keys": "^3.4.1"
       },
       "engines": {
@@ -8381,16 +8381,16 @@
       "dev": true
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.5.0.tgz",
-      "integrity": "sha512-2pktILyjvMaScU6iK3925uvGU87E+N9rh372uGZgiMYwafaw9SXq86U04XPq3UH6tzRvNgBsub6x2DacHc33lw==",
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.7.0.tgz",
+      "integrity": "sha512-gUqtknHm0TDs1LhY12K2NA3Rmlmp88jK9Tx8vGZMfHeNMLE3GH2e9TRub+y+SOjuYgtOmok+wt1AyDPZqxbNag==",
       "dev": true,
       "requires": {
         "@eslint-community/regexpp": "^4.5.1",
-        "@typescript-eslint/scope-manager": "6.5.0",
-        "@typescript-eslint/type-utils": "6.5.0",
-        "@typescript-eslint/utils": "6.5.0",
-        "@typescript-eslint/visitor-keys": "6.5.0",
+        "@typescript-eslint/scope-manager": "6.7.0",
+        "@typescript-eslint/type-utils": "6.7.0",
+        "@typescript-eslint/utils": "6.7.0",
+        "@typescript-eslint/visitor-keys": "6.7.0",
         "debug": "^4.3.4",
         "graphemer": "^1.4.0",
         "ignore": "^5.2.4",
@@ -8400,29 +8400,29 @@
       },
       "dependencies": {
         "@typescript-eslint/scope-manager": {
-          "version": "6.5.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.5.0.tgz",
-          "integrity": "sha512-A8hZ7OlxURricpycp5kdPTH3XnjG85UpJS6Fn4VzeoH4T388gQJ/PGP4ole5NfKt4WDVhmLaQ/dBLNDC4Xl/Kw==",
+          "version": "6.7.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.7.0.tgz",
+          "integrity": "sha512-lAT1Uau20lQyjoLUQ5FUMSX/dS07qux9rYd5FGzKz/Kf8W8ccuvMyldb8hadHdK/qOI7aikvQWqulnEq2nCEYA==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.5.0",
-            "@typescript-eslint/visitor-keys": "6.5.0"
+            "@typescript-eslint/types": "6.7.0",
+            "@typescript-eslint/visitor-keys": "6.7.0"
           }
         },
         "@typescript-eslint/types": {
-          "version": "6.5.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.5.0.tgz",
-          "integrity": "sha512-eqLLOEF5/lU8jW3Bw+8auf4lZSbbljHR2saKnYqON12G/WsJrGeeDHWuQePoEf9ro22+JkbPfWQwKEC5WwLQ3w==",
+          "version": "6.7.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.7.0.tgz",
+          "integrity": "sha512-ihPfvOp7pOcN/ysoj0RpBPOx3HQTJTrIN8UZK+WFd3/iDeFHHqeyYxa4hQk4rMhsz9H9mXpR61IzwlBVGXtl9Q==",
           "dev": true
         },
         "@typescript-eslint/typescript-estree": {
-          "version": "6.5.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.5.0.tgz",
-          "integrity": "sha512-q0rGwSe9e5Kk/XzliB9h2LBc9tmXX25G0833r7kffbl5437FPWb2tbpIV9wAATebC/018pGa9fwPDuvGN+LxWQ==",
+          "version": "6.7.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.7.0.tgz",
+          "integrity": "sha512-dPvkXj3n6e9yd/0LfojNU8VMUGHWiLuBZvbM6V6QYD+2qxqInE7J+J/ieY2iGwR9ivf/R/haWGkIj04WVUeiSQ==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.5.0",
-            "@typescript-eslint/visitor-keys": "6.5.0",
+            "@typescript-eslint/types": "6.7.0",
+            "@typescript-eslint/visitor-keys": "6.7.0",
             "debug": "^4.3.4",
             "globby": "^11.1.0",
             "is-glob": "^4.0.3",
@@ -8431,27 +8431,27 @@
           }
         },
         "@typescript-eslint/utils": {
-          "version": "6.5.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.5.0.tgz",
-          "integrity": "sha512-9nqtjkNykFzeVtt9Pj6lyR9WEdd8npPhhIPM992FWVkZuS6tmxHfGVnlUcjpUP2hv8r4w35nT33mlxd+Be1ACQ==",
+          "version": "6.7.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.7.0.tgz",
+          "integrity": "sha512-MfCq3cM0vh2slSikQYqK2Gq52gvOhe57vD2RM3V4gQRZYX4rDPnKLu5p6cm89+LJiGlwEXU8hkYxhqqEC/V3qA==",
           "dev": true,
           "requires": {
             "@eslint-community/eslint-utils": "^4.4.0",
             "@types/json-schema": "^7.0.12",
             "@types/semver": "^7.5.0",
-            "@typescript-eslint/scope-manager": "6.5.0",
-            "@typescript-eslint/types": "6.5.0",
-            "@typescript-eslint/typescript-estree": "6.5.0",
+            "@typescript-eslint/scope-manager": "6.7.0",
+            "@typescript-eslint/types": "6.7.0",
+            "@typescript-eslint/typescript-estree": "6.7.0",
             "semver": "^7.5.4"
           }
         },
         "@typescript-eslint/visitor-keys": {
-          "version": "6.5.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.5.0.tgz",
-          "integrity": "sha512-yCB/2wkbv3hPsh02ZS8dFQnij9VVQXJMN/gbQsaaY+zxALkZnxa/wagvLEFsAWMPv7d7lxQmNsIzGU1w/T/WyA==",
+          "version": "6.7.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.7.0.tgz",
+          "integrity": "sha512-/C1RVgKFDmGMcVGeD8HjKv2bd72oI1KxQDeY8uc66gw9R0OK0eMq48cA+jv9/2Ag6cdrsUGySm1yzYmfz0hxwQ==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.5.0",
+            "@typescript-eslint/types": "6.7.0",
             "eslint-visitor-keys": "^3.4.1"
           }
         },
@@ -8536,41 +8536,41 @@
       }
     },
     "@typescript-eslint/type-utils": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.5.0.tgz",
-      "integrity": "sha512-f7OcZOkRivtujIBQ4yrJNIuwyCQO1OjocVqntl9dgSIZAdKqicj3xFDqDOzHDlGCZX990LqhLQXWRnQvsapq8A==",
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.7.0.tgz",
+      "integrity": "sha512-f/QabJgDAlpSz3qduCyQT0Fw7hHpmhOzY/Rv6zO3yO+HVIdPfIWhrQoAyG+uZVtWAIS85zAyzgAFfyEr+MgBpg==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/typescript-estree": "6.5.0",
-        "@typescript-eslint/utils": "6.5.0",
+        "@typescript-eslint/typescript-estree": "6.7.0",
+        "@typescript-eslint/utils": "6.7.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.0.1"
       },
       "dependencies": {
         "@typescript-eslint/scope-manager": {
-          "version": "6.5.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.5.0.tgz",
-          "integrity": "sha512-A8hZ7OlxURricpycp5kdPTH3XnjG85UpJS6Fn4VzeoH4T388gQJ/PGP4ole5NfKt4WDVhmLaQ/dBLNDC4Xl/Kw==",
+          "version": "6.7.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.7.0.tgz",
+          "integrity": "sha512-lAT1Uau20lQyjoLUQ5FUMSX/dS07qux9rYd5FGzKz/Kf8W8ccuvMyldb8hadHdK/qOI7aikvQWqulnEq2nCEYA==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.5.0",
-            "@typescript-eslint/visitor-keys": "6.5.0"
+            "@typescript-eslint/types": "6.7.0",
+            "@typescript-eslint/visitor-keys": "6.7.0"
           }
         },
         "@typescript-eslint/types": {
-          "version": "6.5.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.5.0.tgz",
-          "integrity": "sha512-eqLLOEF5/lU8jW3Bw+8auf4lZSbbljHR2saKnYqON12G/WsJrGeeDHWuQePoEf9ro22+JkbPfWQwKEC5WwLQ3w==",
+          "version": "6.7.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.7.0.tgz",
+          "integrity": "sha512-ihPfvOp7pOcN/ysoj0RpBPOx3HQTJTrIN8UZK+WFd3/iDeFHHqeyYxa4hQk4rMhsz9H9mXpR61IzwlBVGXtl9Q==",
           "dev": true
         },
         "@typescript-eslint/typescript-estree": {
-          "version": "6.5.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.5.0.tgz",
-          "integrity": "sha512-q0rGwSe9e5Kk/XzliB9h2LBc9tmXX25G0833r7kffbl5437FPWb2tbpIV9wAATebC/018pGa9fwPDuvGN+LxWQ==",
+          "version": "6.7.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.7.0.tgz",
+          "integrity": "sha512-dPvkXj3n6e9yd/0LfojNU8VMUGHWiLuBZvbM6V6QYD+2qxqInE7J+J/ieY2iGwR9ivf/R/haWGkIj04WVUeiSQ==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.5.0",
-            "@typescript-eslint/visitor-keys": "6.5.0",
+            "@typescript-eslint/types": "6.7.0",
+            "@typescript-eslint/visitor-keys": "6.7.0",
             "debug": "^4.3.4",
             "globby": "^11.1.0",
             "is-glob": "^4.0.3",
@@ -8579,27 +8579,27 @@
           }
         },
         "@typescript-eslint/utils": {
-          "version": "6.5.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.5.0.tgz",
-          "integrity": "sha512-9nqtjkNykFzeVtt9Pj6lyR9WEdd8npPhhIPM992FWVkZuS6tmxHfGVnlUcjpUP2hv8r4w35nT33mlxd+Be1ACQ==",
+          "version": "6.7.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.7.0.tgz",
+          "integrity": "sha512-MfCq3cM0vh2slSikQYqK2Gq52gvOhe57vD2RM3V4gQRZYX4rDPnKLu5p6cm89+LJiGlwEXU8hkYxhqqEC/V3qA==",
           "dev": true,
           "requires": {
             "@eslint-community/eslint-utils": "^4.4.0",
             "@types/json-schema": "^7.0.12",
             "@types/semver": "^7.5.0",
-            "@typescript-eslint/scope-manager": "6.5.0",
-            "@typescript-eslint/types": "6.5.0",
-            "@typescript-eslint/typescript-estree": "6.5.0",
+            "@typescript-eslint/scope-manager": "6.7.0",
+            "@typescript-eslint/types": "6.7.0",
+            "@typescript-eslint/typescript-estree": "6.7.0",
             "semver": "^7.5.4"
           }
         },
         "@typescript-eslint/visitor-keys": {
-          "version": "6.5.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.5.0.tgz",
-          "integrity": "sha512-yCB/2wkbv3hPsh02ZS8dFQnij9VVQXJMN/gbQsaaY+zxALkZnxa/wagvLEFsAWMPv7d7lxQmNsIzGU1w/T/WyA==",
+          "version": "6.7.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.7.0.tgz",
+          "integrity": "sha512-/C1RVgKFDmGMcVGeD8HjKv2bd72oI1KxQDeY8uc66gw9R0OK0eMq48cA+jv9/2Ag6cdrsUGySm1yzYmfz0hxwQ==",
           "dev": true,
           "requires": {
-            "@typescript-eslint/types": "6.5.0",
+            "@typescript-eslint/types": "6.7.0",
             "eslint-visitor-keys": "^3.4.1"
           }
         },
diff --git a/tests/UI/package.json b/tests/UI/package.json
index 8ca7d112bd747..6f9c93d175289 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -126,7 +126,7 @@
     "@types/libsodium-wrappers": "^0.7.11",
     "@types/mocha": "^10.0.1",
     "@types/mochawesome": "^6.2.1",
-    "@typescript-eslint/eslint-plugin": "^6.5.0",
+    "@typescript-eslint/eslint-plugin": "^6.7.0",
     "@typescript-eslint/parser": "^6.6.0",
     "babel-eslint": "^10.1.0",
     "eslint": "^8.49.0",

From 9eac8c6af25cfe55c474e2cd34abd01bf6b05db4 Mon Sep 17 00:00:00 2001
From: Jonathan Lelievre <jonathan.lelievre@prestashop.com>
Date: Fri, 15 Sep 2023 16:22:15 +0200
Subject: [PATCH 1005/1030] Skip also second test

---
 .../02_externalAuthServer/02_resourceEndpoint.ts               | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts b/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts
index 61a84288ec2d5..b23f063601620 100644
--- a/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts
+++ b/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts
@@ -20,7 +20,8 @@ import {
 
 const baseContext: string = 'functional_API_clientCredentialGrantFlow_externalAuthServer_resourceEndpoint';
 
-describe('API : External Auth Server - Resource Endpoint', async () => {
+// @todo : https://github.com/PrestaShop/PrestaShop/issues/33946
+describe.skip('API : External Auth Server - Resource Endpoint', async () => {
   // Browser
   let browserContext: BrowserContext;
   let page: Page;

From c9eff49aa1c23bcd08e85983944ee0abb846f42c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Sep 2023 04:45:37 +0000
Subject: [PATCH 1006/1030] Bump libsodium-wrappers from 0.7.11 to 0.7.13 in
 /tests/UI

Bumps [libsodium-wrappers](https://github.com/jedisct1/libsodium.js) from 0.7.11 to 0.7.13.
- [Commits](https://github.com/jedisct1/libsodium.js/compare/0.7.11...0.7.13)

---
updated-dependencies:
- dependency-name: libsodium-wrappers
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 30 +++++++++++++++---------------
 tests/UI/package.json      |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index 88d1e30b7af42..44335f7421cc1 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -19,7 +19,7 @@
         "fast-xml-parser": "^4.2.7",
         "jpeg-js": "^0.4.4",
         "js-image-generator": "^1.0.4",
-        "libsodium-wrappers": "^0.7.11",
+        "libsodium-wrappers": "^0.7.13",
         "maildev": "^2.1.0",
         "mocha": "^10.2.0",
         "mochawesome": "^7.1.3",
@@ -4593,16 +4593,16 @@
       }
     },
     "node_modules/libsodium": {
-      "version": "0.7.11",
-      "resolved": "https://registry.npmjs.org/libsodium/-/libsodium-0.7.11.tgz",
-      "integrity": "sha512-WPfJ7sS53I2s4iM58QxY3Inb83/6mjlYgcmZs7DJsvDlnmVUwNinBCi5vBT43P6bHRy01O4zsMU2CoVR6xJ40A=="
+      "version": "0.7.13",
+      "resolved": "https://registry.npmjs.org/libsodium/-/libsodium-0.7.13.tgz",
+      "integrity": "sha512-mK8ju0fnrKXXfleL53vtp9xiPq5hKM0zbDQtcxQIsSmxNgSxqCj6R7Hl9PkrNe2j29T4yoDaF7DJLK9/i5iWUw=="
     },
     "node_modules/libsodium-wrappers": {
-      "version": "0.7.11",
-      "resolved": "https://registry.npmjs.org/libsodium-wrappers/-/libsodium-wrappers-0.7.11.tgz",
-      "integrity": "sha512-SrcLtXj7BM19vUKtQuyQKiQCRJPgbpauzl3s0rSwD+60wtHqSUuqcoawlMDheCJga85nKOQwxNYQxf/CKAvs6Q==",
+      "version": "0.7.13",
+      "resolved": "https://registry.npmjs.org/libsodium-wrappers/-/libsodium-wrappers-0.7.13.tgz",
+      "integrity": "sha512-kasvDsEi/r1fMzKouIDv7B8I6vNmknXwGiYodErGuESoFTohGSKZplFtVxZqHaoQ217AynyIFgnOVRitpHs0Qw==",
       "dependencies": {
-        "libsodium": "^0.7.11"
+        "libsodium": "^0.7.13"
       }
     },
     "node_modules/linkify-it": {
@@ -11323,16 +11323,16 @@
       }
     },
     "libsodium": {
-      "version": "0.7.11",
-      "resolved": "https://registry.npmjs.org/libsodium/-/libsodium-0.7.11.tgz",
-      "integrity": "sha512-WPfJ7sS53I2s4iM58QxY3Inb83/6mjlYgcmZs7DJsvDlnmVUwNinBCi5vBT43P6bHRy01O4zsMU2CoVR6xJ40A=="
+      "version": "0.7.13",
+      "resolved": "https://registry.npmjs.org/libsodium/-/libsodium-0.7.13.tgz",
+      "integrity": "sha512-mK8ju0fnrKXXfleL53vtp9xiPq5hKM0zbDQtcxQIsSmxNgSxqCj6R7Hl9PkrNe2j29T4yoDaF7DJLK9/i5iWUw=="
     },
     "libsodium-wrappers": {
-      "version": "0.7.11",
-      "resolved": "https://registry.npmjs.org/libsodium-wrappers/-/libsodium-wrappers-0.7.11.tgz",
-      "integrity": "sha512-SrcLtXj7BM19vUKtQuyQKiQCRJPgbpauzl3s0rSwD+60wtHqSUuqcoawlMDheCJga85nKOQwxNYQxf/CKAvs6Q==",
+      "version": "0.7.13",
+      "resolved": "https://registry.npmjs.org/libsodium-wrappers/-/libsodium-wrappers-0.7.13.tgz",
+      "integrity": "sha512-kasvDsEi/r1fMzKouIDv7B8I6vNmknXwGiYodErGuESoFTohGSKZplFtVxZqHaoQ217AynyIFgnOVRitpHs0Qw==",
       "requires": {
-        "libsodium": "^0.7.11"
+        "libsodium": "^0.7.13"
       }
     },
     "linkify-it": {
diff --git a/tests/UI/package.json b/tests/UI/package.json
index 6f9c93d175289..ae3a11a35af25 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -112,7 +112,7 @@
     "fast-xml-parser": "^4.2.7",
     "jpeg-js": "^0.4.4",
     "js-image-generator": "^1.0.4",
-    "libsodium-wrappers": "^0.7.11",
+    "libsodium-wrappers": "^0.7.13",
     "maildev": "^2.1.0",
     "mocha": "^10.2.0",
     "mochawesome": "^7.1.3",

From 311204b6cf822a9c22d69d353d2b38466b52d8f3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Sep 2023 04:46:06 +0000
Subject: [PATCH 1007/1030] Bump eslint-plugin-deprecation from 1.5.0 to 2.0.0
 in /tests/UI

Bumps [eslint-plugin-deprecation](https://github.com/gund/eslint-plugin-deprecation) from 1.5.0 to 2.0.0.
- [Release notes](https://github.com/gund/eslint-plugin-deprecation/releases)
- [Changelog](https://github.com/gund/eslint-plugin-deprecation/blob/master/CHANGELOG.md)
- [Commits](https://github.com/gund/eslint-plugin-deprecation/compare/v1.5.0...v2.0.0)

---
updated-dependencies:
- dependency-name: eslint-plugin-deprecation
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 502 ++++---------------------------------
 tests/UI/package.json      |   2 +-
 2 files changed, 56 insertions(+), 448 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index 88d1e30b7af42..4008fd90d8080 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -38,7 +38,7 @@
         "babel-eslint": "^10.1.0",
         "eslint": "^8.49.0",
         "eslint-config-airbnb-base": "^15.0.0",
-        "eslint-plugin-deprecation": "^1.5.0",
+        "eslint-plugin-deprecation": "^2.0.0",
         "eslint-plugin-html": "^7.1.0",
         "eslint-plugin-import": "^2.28.1",
         "jsdoc-to-markdown": "^8.0.0",
@@ -575,117 +575,6 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.7.0.tgz",
-      "integrity": "sha512-lAT1Uau20lQyjoLUQ5FUMSX/dS07qux9rYd5FGzKz/Kf8W8ccuvMyldb8hadHdK/qOI7aikvQWqulnEq2nCEYA==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "6.7.0",
-        "@typescript-eslint/visitor-keys": "6.7.0"
-      },
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.7.0.tgz",
-      "integrity": "sha512-ihPfvOp7pOcN/ysoj0RpBPOx3HQTJTrIN8UZK+WFd3/iDeFHHqeyYxa4hQk4rMhsz9H9mXpR61IzwlBVGXtl9Q==",
-      "dev": true,
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.7.0.tgz",
-      "integrity": "sha512-dPvkXj3n6e9yd/0LfojNU8VMUGHWiLuBZvbM6V6QYD+2qxqInE7J+J/ieY2iGwR9ivf/R/haWGkIj04WVUeiSQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "6.7.0",
-        "@typescript-eslint/visitor-keys": "6.7.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "semver": "^7.5.4",
-        "ts-api-utils": "^1.0.1"
-      },
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.7.0.tgz",
-      "integrity": "sha512-MfCq3cM0vh2slSikQYqK2Gq52gvOhe57vD2RM3V4gQRZYX4rDPnKLu5p6cm89+LJiGlwEXU8hkYxhqqEC/V3qA==",
-      "dev": true,
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.4.0",
-        "@types/json-schema": "^7.0.12",
-        "@types/semver": "^7.5.0",
-        "@typescript-eslint/scope-manager": "6.7.0",
-        "@typescript-eslint/types": "6.7.0",
-        "@typescript-eslint/typescript-estree": "6.7.0",
-        "semver": "^7.5.4"
-      },
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^7.0.0 || ^8.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.7.0.tgz",
-      "integrity": "sha512-/C1RVgKFDmGMcVGeD8HjKv2bd72oI1KxQDeY8uc66gw9R0OK0eMq48cA+jv9/2Ag6cdrsUGySm1yzYmfz0hxwQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "6.7.0",
-        "eslint-visitor-keys": "^3.4.1"
-      },
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-visitor-keys": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
     "node_modules/@typescript-eslint/parser": {
       "version": "6.6.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.6.0.tgz",
@@ -801,16 +690,16 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "5.60.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.60.1.tgz",
-      "integrity": "sha512-Dn/LnN7fEoRD+KspEOV0xDMynEmR3iSHdgNsarlXNLGGtcUok8L4N71dxUgt3YvlO8si7E+BJ5Fe3wb5yUw7DQ==",
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.7.0.tgz",
+      "integrity": "sha512-lAT1Uau20lQyjoLUQ5FUMSX/dS07qux9rYd5FGzKz/Kf8W8ccuvMyldb8hadHdK/qOI7aikvQWqulnEq2nCEYA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.60.1",
-        "@typescript-eslint/visitor-keys": "5.60.1"
+        "@typescript-eslint/types": "6.7.0",
+        "@typescript-eslint/visitor-keys": "6.7.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^16.0.0 || >=18.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -844,24 +733,7 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/scope-manager": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.7.0.tgz",
-      "integrity": "sha512-lAT1Uau20lQyjoLUQ5FUMSX/dS07qux9rYd5FGzKz/Kf8W8ccuvMyldb8hadHdK/qOI7aikvQWqulnEq2nCEYA==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "6.7.0",
-        "@typescript-eslint/visitor-keys": "6.7.0"
-      },
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": {
+    "node_modules/@typescript-eslint/types": {
       "version": "6.7.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.7.0.tgz",
       "integrity": "sha512-ihPfvOp7pOcN/ysoj0RpBPOx3HQTJTrIN8UZK+WFd3/iDeFHHqeyYxa4hQk4rMhsz9H9mXpR61IzwlBVGXtl9Q==",
@@ -874,7 +746,7 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": {
+    "node_modules/@typescript-eslint/typescript-estree": {
       "version": "6.7.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.7.0.tgz",
       "integrity": "sha512-dPvkXj3n6e9yd/0LfojNU8VMUGHWiLuBZvbM6V6QYD+2qxqInE7J+J/ieY2iGwR9ivf/R/haWGkIj04WVUeiSQ==",
@@ -901,7 +773,7 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils": {
+    "node_modules/@typescript-eslint/utils": {
       "version": "6.7.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.7.0.tgz",
       "integrity": "sha512-MfCq3cM0vh2slSikQYqK2Gq52gvOhe57vD2RM3V4gQRZYX4rDPnKLu5p6cm89+LJiGlwEXU8hkYxhqqEC/V3qA==",
@@ -926,7 +798,7 @@
         "eslint": "^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": {
+    "node_modules/@typescript-eslint/visitor-keys": {
       "version": "6.7.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.7.0.tgz",
       "integrity": "sha512-/C1RVgKFDmGMcVGeD8HjKv2bd72oI1KxQDeY8uc66gw9R0OK0eMq48cA+jv9/2Ag6cdrsUGySm1yzYmfz0hxwQ==",
@@ -943,7 +815,7 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/eslint-visitor-keys": {
+    "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
       "version": "3.4.3",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
       "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
@@ -955,114 +827,6 @@
         "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/@typescript-eslint/types": {
-      "version": "5.60.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.60.1.tgz",
-      "integrity": "sha512-zDcDx5fccU8BA0IDZc71bAtYIcG9PowaOwaD8rjYbqwK7dpe/UMQl3inJ4UtUK42nOCT41jTSCwg76E62JpMcg==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "5.60.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.60.1.tgz",
-      "integrity": "sha512-hkX70J9+2M2ZT6fhti5Q2FoU9zb+GeZK2SLP1WZlvUDqdMbEKhexZODD1WodNRyO8eS+4nScvT0dts8IdaBzfw==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "5.60.1",
-        "@typescript-eslint/visitor-keys": "5.60.1",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/utils": {
-      "version": "5.60.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.60.1.tgz",
-      "integrity": "sha512-tiJ7FFdFQOWssFa3gqb94Ilexyw0JVxj6vBzaSpfN/8IhoKkDuSAenUKvsSHw2A/TMpJb26izIszTXaqygkvpQ==",
-      "dev": true,
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.2.0",
-        "@types/json-schema": "^7.0.9",
-        "@types/semver": "^7.3.12",
-        "@typescript-eslint/scope-manager": "5.60.1",
-        "@typescript-eslint/types": "5.60.1",
-        "@typescript-eslint/typescript-estree": "5.60.1",
-        "eslint-scope": "^5.1.1",
-        "semver": "^7.3.7"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/utils/node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.60.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.60.1.tgz",
-      "integrity": "sha512-xEYIxKcultP6E/RMKqube11pGjXH1DCo60mQoWhVYyKfLkwbIVVjYxmOenNMxILx0TjCujPTjjnTIVzm09TXIw==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "5.60.1",
-        "eslint-visitor-keys": "^3.3.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
-      "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
     "node_modules/@xmldom/xmldom": {
       "version": "0.8.10",
       "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz",
@@ -2735,18 +2499,18 @@
       }
     },
     "node_modules/eslint-plugin-deprecation": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-deprecation/-/eslint-plugin-deprecation-1.5.0.tgz",
-      "integrity": "sha512-mRcssI/tLROueBQ6yf4LnnGTijbMsTCPIpbRbPj5R5wGYVCpk1zDmAS0SEkgcUDXOPc22qMNFR24Qw7vSPrlTA==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-deprecation/-/eslint-plugin-deprecation-2.0.0.tgz",
+      "integrity": "sha512-OAm9Ohzbj11/ZFyICyR5N6LbOIvQMp7ZU2zI7Ej0jIc8kiGUERXPNMfw2QqqHD1ZHtjMub3yPZILovYEYucgoQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/utils": "^5.57.0",
+        "@typescript-eslint/utils": "^6.0.0",
         "tslib": "^2.3.1",
         "tsutils": "^3.21.0"
       },
       "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0",
-        "typescript": "^3.7.5 || ^4.0.0 || ^5.0.0"
+        "eslint": "^7.0.0 || ^8.0.0",
+        "typescript": "^4.2.4 || ^5.0.0"
       }
     },
     "node_modules/eslint-plugin-deprecation/node_modules/tslib": {
@@ -3138,15 +2902,6 @@
         "node": ">=4.0"
       }
     },
-    "node_modules/estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
     "node_modules/esutils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
@@ -8397,70 +8152,6 @@
         "natural-compare": "^1.4.0",
         "semver": "^7.5.4",
         "ts-api-utils": "^1.0.1"
-      },
-      "dependencies": {
-        "@typescript-eslint/scope-manager": {
-          "version": "6.7.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.7.0.tgz",
-          "integrity": "sha512-lAT1Uau20lQyjoLUQ5FUMSX/dS07qux9rYd5FGzKz/Kf8W8ccuvMyldb8hadHdK/qOI7aikvQWqulnEq2nCEYA==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "6.7.0",
-            "@typescript-eslint/visitor-keys": "6.7.0"
-          }
-        },
-        "@typescript-eslint/types": {
-          "version": "6.7.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.7.0.tgz",
-          "integrity": "sha512-ihPfvOp7pOcN/ysoj0RpBPOx3HQTJTrIN8UZK+WFd3/iDeFHHqeyYxa4hQk4rMhsz9H9mXpR61IzwlBVGXtl9Q==",
-          "dev": true
-        },
-        "@typescript-eslint/typescript-estree": {
-          "version": "6.7.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.7.0.tgz",
-          "integrity": "sha512-dPvkXj3n6e9yd/0LfojNU8VMUGHWiLuBZvbM6V6QYD+2qxqInE7J+J/ieY2iGwR9ivf/R/haWGkIj04WVUeiSQ==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "6.7.0",
-            "@typescript-eslint/visitor-keys": "6.7.0",
-            "debug": "^4.3.4",
-            "globby": "^11.1.0",
-            "is-glob": "^4.0.3",
-            "semver": "^7.5.4",
-            "ts-api-utils": "^1.0.1"
-          }
-        },
-        "@typescript-eslint/utils": {
-          "version": "6.7.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.7.0.tgz",
-          "integrity": "sha512-MfCq3cM0vh2slSikQYqK2Gq52gvOhe57vD2RM3V4gQRZYX4rDPnKLu5p6cm89+LJiGlwEXU8hkYxhqqEC/V3qA==",
-          "dev": true,
-          "requires": {
-            "@eslint-community/eslint-utils": "^4.4.0",
-            "@types/json-schema": "^7.0.12",
-            "@types/semver": "^7.5.0",
-            "@typescript-eslint/scope-manager": "6.7.0",
-            "@typescript-eslint/types": "6.7.0",
-            "@typescript-eslint/typescript-estree": "6.7.0",
-            "semver": "^7.5.4"
-          }
-        },
-        "@typescript-eslint/visitor-keys": {
-          "version": "6.7.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.7.0.tgz",
-          "integrity": "sha512-/C1RVgKFDmGMcVGeD8HjKv2bd72oI1KxQDeY8uc66gw9R0OK0eMq48cA+jv9/2Ag6cdrsUGySm1yzYmfz0hxwQ==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "6.7.0",
-            "eslint-visitor-keys": "^3.4.1"
-          }
-        },
-        "eslint-visitor-keys": {
-          "version": "3.4.3",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-          "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-          "dev": true
-        }
       }
     },
     "@typescript-eslint/parser": {
@@ -8526,13 +8217,13 @@
       }
     },
     "@typescript-eslint/scope-manager": {
-      "version": "5.60.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.60.1.tgz",
-      "integrity": "sha512-Dn/LnN7fEoRD+KspEOV0xDMynEmR3iSHdgNsarlXNLGGtcUok8L4N71dxUgt3YvlO8si7E+BJ5Fe3wb5yUw7DQ==",
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.7.0.tgz",
+      "integrity": "sha512-lAT1Uau20lQyjoLUQ5FUMSX/dS07qux9rYd5FGzKz/Kf8W8ccuvMyldb8hadHdK/qOI7aikvQWqulnEq2nCEYA==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.60.1",
-        "@typescript-eslint/visitor-keys": "5.60.1"
+        "@typescript-eslint/types": "6.7.0",
+        "@typescript-eslint/visitor-keys": "6.7.0"
       }
     },
     "@typescript-eslint/type-utils": {
@@ -8545,135 +8236,58 @@
         "@typescript-eslint/utils": "6.7.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.0.1"
-      },
-      "dependencies": {
-        "@typescript-eslint/scope-manager": {
-          "version": "6.7.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.7.0.tgz",
-          "integrity": "sha512-lAT1Uau20lQyjoLUQ5FUMSX/dS07qux9rYd5FGzKz/Kf8W8ccuvMyldb8hadHdK/qOI7aikvQWqulnEq2nCEYA==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "6.7.0",
-            "@typescript-eslint/visitor-keys": "6.7.0"
-          }
-        },
-        "@typescript-eslint/types": {
-          "version": "6.7.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.7.0.tgz",
-          "integrity": "sha512-ihPfvOp7pOcN/ysoj0RpBPOx3HQTJTrIN8UZK+WFd3/iDeFHHqeyYxa4hQk4rMhsz9H9mXpR61IzwlBVGXtl9Q==",
-          "dev": true
-        },
-        "@typescript-eslint/typescript-estree": {
-          "version": "6.7.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.7.0.tgz",
-          "integrity": "sha512-dPvkXj3n6e9yd/0LfojNU8VMUGHWiLuBZvbM6V6QYD+2qxqInE7J+J/ieY2iGwR9ivf/R/haWGkIj04WVUeiSQ==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "6.7.0",
-            "@typescript-eslint/visitor-keys": "6.7.0",
-            "debug": "^4.3.4",
-            "globby": "^11.1.0",
-            "is-glob": "^4.0.3",
-            "semver": "^7.5.4",
-            "ts-api-utils": "^1.0.1"
-          }
-        },
-        "@typescript-eslint/utils": {
-          "version": "6.7.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.7.0.tgz",
-          "integrity": "sha512-MfCq3cM0vh2slSikQYqK2Gq52gvOhe57vD2RM3V4gQRZYX4rDPnKLu5p6cm89+LJiGlwEXU8hkYxhqqEC/V3qA==",
-          "dev": true,
-          "requires": {
-            "@eslint-community/eslint-utils": "^4.4.0",
-            "@types/json-schema": "^7.0.12",
-            "@types/semver": "^7.5.0",
-            "@typescript-eslint/scope-manager": "6.7.0",
-            "@typescript-eslint/types": "6.7.0",
-            "@typescript-eslint/typescript-estree": "6.7.0",
-            "semver": "^7.5.4"
-          }
-        },
-        "@typescript-eslint/visitor-keys": {
-          "version": "6.7.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.7.0.tgz",
-          "integrity": "sha512-/C1RVgKFDmGMcVGeD8HjKv2bd72oI1KxQDeY8uc66gw9R0OK0eMq48cA+jv9/2Ag6cdrsUGySm1yzYmfz0hxwQ==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "6.7.0",
-            "eslint-visitor-keys": "^3.4.1"
-          }
-        },
-        "eslint-visitor-keys": {
-          "version": "3.4.3",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-          "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-          "dev": true
-        }
       }
     },
     "@typescript-eslint/types": {
-      "version": "5.60.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.60.1.tgz",
-      "integrity": "sha512-zDcDx5fccU8BA0IDZc71bAtYIcG9PowaOwaD8rjYbqwK7dpe/UMQl3inJ4UtUK42nOCT41jTSCwg76E62JpMcg==",
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.7.0.tgz",
+      "integrity": "sha512-ihPfvOp7pOcN/ysoj0RpBPOx3HQTJTrIN8UZK+WFd3/iDeFHHqeyYxa4hQk4rMhsz9H9mXpR61IzwlBVGXtl9Q==",
       "dev": true
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "5.60.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.60.1.tgz",
-      "integrity": "sha512-hkX70J9+2M2ZT6fhti5Q2FoU9zb+GeZK2SLP1WZlvUDqdMbEKhexZODD1WodNRyO8eS+4nScvT0dts8IdaBzfw==",
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.7.0.tgz",
+      "integrity": "sha512-dPvkXj3n6e9yd/0LfojNU8VMUGHWiLuBZvbM6V6QYD+2qxqInE7J+J/ieY2iGwR9ivf/R/haWGkIj04WVUeiSQ==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.60.1",
-        "@typescript-eslint/visitor-keys": "5.60.1",
+        "@typescript-eslint/types": "6.7.0",
+        "@typescript-eslint/visitor-keys": "6.7.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
+        "semver": "^7.5.4",
+        "ts-api-utils": "^1.0.1"
       }
     },
     "@typescript-eslint/utils": {
-      "version": "5.60.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.60.1.tgz",
-      "integrity": "sha512-tiJ7FFdFQOWssFa3gqb94Ilexyw0JVxj6vBzaSpfN/8IhoKkDuSAenUKvsSHw2A/TMpJb26izIszTXaqygkvpQ==",
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.7.0.tgz",
+      "integrity": "sha512-MfCq3cM0vh2slSikQYqK2Gq52gvOhe57vD2RM3V4gQRZYX4rDPnKLu5p6cm89+LJiGlwEXU8hkYxhqqEC/V3qA==",
       "dev": true,
       "requires": {
-        "@eslint-community/eslint-utils": "^4.2.0",
-        "@types/json-schema": "^7.0.9",
-        "@types/semver": "^7.3.12",
-        "@typescript-eslint/scope-manager": "5.60.1",
-        "@typescript-eslint/types": "5.60.1",
-        "@typescript-eslint/typescript-estree": "5.60.1",
-        "eslint-scope": "^5.1.1",
-        "semver": "^7.3.7"
-      },
-      "dependencies": {
-        "eslint-scope": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-          "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-          "dev": true,
-          "requires": {
-            "esrecurse": "^4.3.0",
-            "estraverse": "^4.1.1"
-          }
-        }
+        "@eslint-community/eslint-utils": "^4.4.0",
+        "@types/json-schema": "^7.0.12",
+        "@types/semver": "^7.5.0",
+        "@typescript-eslint/scope-manager": "6.7.0",
+        "@typescript-eslint/types": "6.7.0",
+        "@typescript-eslint/typescript-estree": "6.7.0",
+        "semver": "^7.5.4"
       }
     },
     "@typescript-eslint/visitor-keys": {
-      "version": "5.60.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.60.1.tgz",
-      "integrity": "sha512-xEYIxKcultP6E/RMKqube11pGjXH1DCo60mQoWhVYyKfLkwbIVVjYxmOenNMxILx0TjCujPTjjnTIVzm09TXIw==",
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.7.0.tgz",
+      "integrity": "sha512-/C1RVgKFDmGMcVGeD8HjKv2bd72oI1KxQDeY8uc66gw9R0OK0eMq48cA+jv9/2Ag6cdrsUGySm1yzYmfz0hxwQ==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.60.1",
-        "eslint-visitor-keys": "^3.3.0"
+        "@typescript-eslint/types": "6.7.0",
+        "eslint-visitor-keys": "^3.4.1"
       },
       "dependencies": {
         "eslint-visitor-keys": {
-          "version": "3.4.1",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
-          "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
+          "version": "3.4.3",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+          "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
           "dev": true
         }
       }
@@ -10080,12 +9694,12 @@
       }
     },
     "eslint-plugin-deprecation": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-deprecation/-/eslint-plugin-deprecation-1.5.0.tgz",
-      "integrity": "sha512-mRcssI/tLROueBQ6yf4LnnGTijbMsTCPIpbRbPj5R5wGYVCpk1zDmAS0SEkgcUDXOPc22qMNFR24Qw7vSPrlTA==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-deprecation/-/eslint-plugin-deprecation-2.0.0.tgz",
+      "integrity": "sha512-OAm9Ohzbj11/ZFyICyR5N6LbOIvQMp7ZU2zI7Ej0jIc8kiGUERXPNMfw2QqqHD1ZHtjMub3yPZILovYEYucgoQ==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/utils": "^5.57.0",
+        "@typescript-eslint/utils": "^6.0.0",
         "tslib": "^2.3.1",
         "tsutils": "^3.21.0"
       },
@@ -10261,12 +9875,6 @@
         }
       }
     },
-    "estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true
-    },
     "esutils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
diff --git a/tests/UI/package.json b/tests/UI/package.json
index 6f9c93d175289..375039808b4c6 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -131,7 +131,7 @@
     "babel-eslint": "^10.1.0",
     "eslint": "^8.49.0",
     "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-plugin-deprecation": "^1.5.0",
+    "eslint-plugin-deprecation": "^2.0.0",
     "eslint-plugin-html": "^7.1.0",
     "eslint-plugin-import": "^2.28.1",
     "jsdoc-to-markdown": "^8.0.0",

From c9cfb8c89c304ce780b60c9c024ed98d8a68e632 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Sep 2023 07:36:31 +0000
Subject: [PATCH 1008/1030] Bump @typescript-eslint/parser from 6.6.0 to 6.7.0
 in /tests/UI

Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 6.6.0 to 6.7.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.7.0/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 165 ++++---------------------------------
 tests/UI/package.json      |   2 +-
 2 files changed, 16 insertions(+), 151 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index 4008fd90d8080..97e6036f773e2 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -34,7 +34,7 @@
         "@types/mocha": "^10.0.1",
         "@types/mochawesome": "^6.2.1",
         "@typescript-eslint/eslint-plugin": "^6.7.0",
-        "@typescript-eslint/parser": "^6.6.0",
+        "@typescript-eslint/parser": "^6.7.0",
         "babel-eslint": "^10.1.0",
         "eslint": "^8.49.0",
         "eslint-config-airbnb-base": "^15.0.0",
@@ -576,15 +576,15 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.6.0.tgz",
-      "integrity": "sha512-setq5aJgUwtzGrhW177/i+DMLqBaJbdwGj2CPIVFFLE0NCliy5ujIdLHd2D1ysmlmsjdL2GWW+hR85neEfc12w==",
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.7.0.tgz",
+      "integrity": "sha512-jZKYwqNpNm5kzPVP5z1JXAuxjtl2uG+5NpaMocFPTNC2EdYIgbXIPImObOkhbONxtFTTdoZstLZefbaK+wXZng==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "6.6.0",
-        "@typescript-eslint/types": "6.6.0",
-        "@typescript-eslint/typescript-estree": "6.6.0",
-        "@typescript-eslint/visitor-keys": "6.6.0",
+        "@typescript-eslint/scope-manager": "6.7.0",
+        "@typescript-eslint/types": "6.7.0",
+        "@typescript-eslint/typescript-estree": "6.7.0",
+        "@typescript-eslint/visitor-keys": "6.7.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -603,92 +603,6 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
-      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.6.0.tgz",
-      "integrity": "sha512-pT08u5W/GT4KjPUmEtc2kSYvrH8x89cVzkA0Sy2aaOUIw6YxOIjA8ilwLr/1fLjOedX1QAuBpG9XggWqIIfERw==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "6.6.0",
-        "@typescript-eslint/visitor-keys": "6.6.0"
-      },
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
-      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.6.0.tgz",
-      "integrity": "sha512-CB6QpJQ6BAHlJXdwUmiaXDBmTqIE2bzGTDLADgvqtHWuhfNP3rAOK7kAgRMAET5rDRr9Utt+qAzRBdu3AhR3sg==",
-      "dev": true,
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.6.0.tgz",
-      "integrity": "sha512-hMcTQ6Al8MP2E6JKBAaSxSVw5bDhdmbCEhGW/V8QXkb9oNsFkA4SBuOMYVPxD3jbtQ4R/vSODBsr76R6fP3tbA==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "6.6.0",
-        "@typescript-eslint/visitor-keys": "6.6.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "semver": "^7.5.4",
-        "ts-api-utils": "^1.0.1"
-      },
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.6.0.tgz",
-      "integrity": "sha512-L61uJT26cMOfFQ+lMZKoJNbAEckLe539VhTxiGHrWl5XSKQgA0RTBZJW2HFPy5T0ZvPVSD93QsrTKDkfNwJGyQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "6.6.0",
-        "eslint-visitor-keys": "^3.4.1"
-      },
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/eslint-visitor-keys": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
     "node_modules/@typescript-eslint/scope-manager": {
       "version": "6.7.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.7.0.tgz",
@@ -8155,65 +8069,16 @@
       }
     },
     "@typescript-eslint/parser": {
-      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.6.0.tgz",
-      "integrity": "sha512-setq5aJgUwtzGrhW177/i+DMLqBaJbdwGj2CPIVFFLE0NCliy5ujIdLHd2D1ysmlmsjdL2GWW+hR85neEfc12w==",
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.7.0.tgz",
+      "integrity": "sha512-jZKYwqNpNm5kzPVP5z1JXAuxjtl2uG+5NpaMocFPTNC2EdYIgbXIPImObOkhbONxtFTTdoZstLZefbaK+wXZng==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "6.6.0",
-        "@typescript-eslint/types": "6.6.0",
-        "@typescript-eslint/typescript-estree": "6.6.0",
-        "@typescript-eslint/visitor-keys": "6.6.0",
+        "@typescript-eslint/scope-manager": "6.7.0",
+        "@typescript-eslint/types": "6.7.0",
+        "@typescript-eslint/typescript-estree": "6.7.0",
+        "@typescript-eslint/visitor-keys": "6.7.0",
         "debug": "^4.3.4"
-      },
-      "dependencies": {
-        "@typescript-eslint/scope-manager": {
-          "version": "6.6.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.6.0.tgz",
-          "integrity": "sha512-pT08u5W/GT4KjPUmEtc2kSYvrH8x89cVzkA0Sy2aaOUIw6YxOIjA8ilwLr/1fLjOedX1QAuBpG9XggWqIIfERw==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "6.6.0",
-            "@typescript-eslint/visitor-keys": "6.6.0"
-          }
-        },
-        "@typescript-eslint/types": {
-          "version": "6.6.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.6.0.tgz",
-          "integrity": "sha512-CB6QpJQ6BAHlJXdwUmiaXDBmTqIE2bzGTDLADgvqtHWuhfNP3rAOK7kAgRMAET5rDRr9Utt+qAzRBdu3AhR3sg==",
-          "dev": true
-        },
-        "@typescript-eslint/typescript-estree": {
-          "version": "6.6.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.6.0.tgz",
-          "integrity": "sha512-hMcTQ6Al8MP2E6JKBAaSxSVw5bDhdmbCEhGW/V8QXkb9oNsFkA4SBuOMYVPxD3jbtQ4R/vSODBsr76R6fP3tbA==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "6.6.0",
-            "@typescript-eslint/visitor-keys": "6.6.0",
-            "debug": "^4.3.4",
-            "globby": "^11.1.0",
-            "is-glob": "^4.0.3",
-            "semver": "^7.5.4",
-            "ts-api-utils": "^1.0.1"
-          }
-        },
-        "@typescript-eslint/visitor-keys": {
-          "version": "6.6.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.6.0.tgz",
-          "integrity": "sha512-L61uJT26cMOfFQ+lMZKoJNbAEckLe539VhTxiGHrWl5XSKQgA0RTBZJW2HFPy5T0ZvPVSD93QsrTKDkfNwJGyQ==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "6.6.0",
-            "eslint-visitor-keys": "^3.4.1"
-          }
-        },
-        "eslint-visitor-keys": {
-          "version": "3.4.3",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-          "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-          "dev": true
-        }
       }
     },
     "@typescript-eslint/scope-manager": {
diff --git a/tests/UI/package.json b/tests/UI/package.json
index 375039808b4c6..1be809e74005b 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -127,7 +127,7 @@
     "@types/mocha": "^10.0.1",
     "@types/mochawesome": "^6.2.1",
     "@typescript-eslint/eslint-plugin": "^6.7.0",
-    "@typescript-eslint/parser": "^6.6.0",
+    "@typescript-eslint/parser": "^6.7.0",
     "babel-eslint": "^10.1.0",
     "eslint": "^8.49.0",
     "eslint-config-airbnb-base": "^15.0.0",

From d3f0537f8d30da6ffb9bfe3f449c58e91136e3d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@prestashop.com>
Date: Mon, 18 Sep 2023 17:15:04 +0200
Subject: [PATCH 1009/1030] Remove 8.0.x branch from Update PHP Modules cron

---
 .github/workflows/cron_php_update_modules.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/cron_php_update_modules.yml b/.github/workflows/cron_php_update_modules.yml
index 9da4eda793961..98d4c5dab8967 100644
--- a/.github/workflows/cron_php_update_modules.yml
+++ b/.github/workflows/cron_php_update_modules.yml
@@ -20,7 +20,6 @@ jobs:
         BRANCH:
           - develop
           - 8.1.x
-          - 8.0.x
     env:
       GH_BRANCH: ${{ matrix.BRANCH }}
 

From f262b4503d24eb0156b201fcb02116f537535f2e Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Mon, 18 Sep 2023 15:39:05 +0200
Subject: [PATCH 1010/1030] Functional Tests : BO - Catalog - Products : Pack
 Tab

---
 .../functional/04_CRUDPackOfProducts.ts       |   4 +-
 .../productV2/functional/12_packTab.ts        | 580 ++++++++++++++++++
 tests/UI/data/demo/products.ts                |  39 +-
 .../pages/BO/catalog/productsV2/add/index.ts  |   4 +-
 .../BO/catalog/productsV2/add/packTab.ts      |  37 +-
 tests/UI/pages/BO/catalog/productsV2/index.ts |  12 +-
 tests/UI/pages/FO/product/index.ts            |  41 +-
 tests/UI/pages/commonPage.ts                  |   2 +-
 tests/UI/utils/basicHelper.ts                 |   9 +
 9 files changed, 690 insertions(+), 38 deletions(-)
 create mode 100644 tests/UI/campaigns/productV2/functional/12_packTab.ts

diff --git a/tests/UI/campaigns/productV2/functional/04_CRUDPackOfProducts.ts b/tests/UI/campaigns/productV2/functional/04_CRUDPackOfProducts.ts
index f8adc99db9cc5..6fdfd525c27a6 100644
--- a/tests/UI/campaigns/productV2/functional/04_CRUDPackOfProducts.ts
+++ b/tests/UI/campaigns/productV2/functional/04_CRUDPackOfProducts.ts
@@ -401,7 +401,7 @@ describe('BO - Catalog - Products : CRUD pack of products', async () => {
       it(`should check the product '${test.args.product.name}' in the pack`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `checkProductInPack${index}`, baseContext);
 
-        const result = await foProductPage.getProductInPackList(page, index + 2);
+        const result = await foProductPage.getProductInPackList(page, index + 1);
         await Promise.all([
           await expect(result.image).to.contains(test.args.product.coverImage),
           await expect(result.name).to.equal(test.args.product.name),
@@ -470,7 +470,7 @@ describe('BO - Catalog - Products : CRUD pack of products', async () => {
       it(`should check the product '${test.args.product.name}' in the pack`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `checkEditProductInPack${index}`, baseContext);
 
-        const result = await foProductPage.getProductInPackList(page, index + 2);
+        const result = await foProductPage.getProductInPackList(page, index + 1);
         await Promise.all([
           await expect(result.image).to.contains(test.args.product.coverImage),
           await expect(result.name).to.equal(test.args.product.name),
diff --git a/tests/UI/campaigns/productV2/functional/12_packTab.ts b/tests/UI/campaigns/productV2/functional/12_packTab.ts
new file mode 100644
index 0000000000000..a7e75c27817f8
--- /dev/null
+++ b/tests/UI/campaigns/productV2/functional/12_packTab.ts
@@ -0,0 +1,580 @@
+// Import utils
+import basicHelper from '@utils/basicHelper';
+import helper from '@utils/helpers';
+import testContext from '@utils/testContext';
+
+// Import common tests
+import loginCommon from '@commonTests/BO/loginBO';
+import {deleteProductV2Test} from '@commonTests/BO/catalog/product';
+
+// Import pages
+// Import BO pages
+import dashboardPage from '@pages/BO/dashboard';
+import createProductsPage from '@pages/BO/catalog/productsV2/add';
+import productsPage from '@pages/BO/catalog/productsV2';
+import packTab from '@pages/BO/catalog/productsV2/add/packTab';
+import pricingTab from '@pages/BO/catalog/productsV2/add/pricingTab';
+import ordersPage from '@pages/BO/orders';
+// Import FO pages
+import foProductPage from '@pages/FO/product';
+import {cartPage} from '@pages/FO/cart';
+import checkoutPage from '@pages/FO/checkout';
+import orderConfirmationPage from '@pages/FO/checkout/orderConfirmation';
+
+// Import data
+import Customers from '@data/demo/customers';
+import OrderStatuses from '@data/demo/orderStatuses';
+import PaymentMethods from '@data/demo/paymentMethods';
+import Products from '@data/demo/products';
+import ProductData from '@data/faker/product';
+
+import type {BrowserContext, Page} from 'playwright';
+import {expect} from 'chai';
+
+const baseContext: string = 'productV2_functional_CRUDPackOfProducts';
+
+describe('BO - Catalog - Products : Pack Tab', async () => {
+  let browserContext: BrowserContext;
+  let page: Page;
+  let productStockDemo1: number = 0;
+  let productStockDemo9: number = 0;
+
+  const productNameEn: string = 'My pack';
+  const productNameFr: string = 'Mon pack';
+  const productRetailPrice: number = 25.00;
+  const productQuantity: number = 4;
+  const productStock: number = 100;
+
+  // before and after functions
+  before(async function () {
+    browserContext = await helper.createBrowserContext(this.browser);
+    page = await helper.newTab(browserContext);
+  });
+
+  after(async () => {
+    await helper.closeBrowserContext(browserContext);
+  });
+
+  describe('BO - Create the product', async () => {
+    it('should login in BO', async function () {
+      await loginCommon.loginBO(this, page);
+    });
+
+    it('should go to \'Catalog > Products\' page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToProductsPage', baseContext);
+
+      await dashboardPage.goToSubMenu(
+        page,
+        dashboardPage.catalogParentLink,
+        dashboardPage.productsLink,
+      );
+      await productsPage.closeSfToolBar(page);
+
+      const pageTitle = await productsPage.getPageTitle(page);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
+    });
+
+    it(`should filter the product "${Products.demo_1.reference}"`, async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'filterProductDemo1', baseContext);
+
+      await productsPage.resetFilter(page);
+      await productsPage.filterProducts(page, 'product_name', Products.demo_1.name);
+
+      const numberOfProductsAfterFilter = await productsPage.getNumberOfProductsFromList(page);
+      expect(numberOfProductsAfterFilter).to.be.gte(1);
+
+      const productReference = await productsPage.getTextColumn(page, 'reference', 1);
+      expect(productReference).to.be.eq(Products.demo_1.reference);
+
+      productStockDemo1 = await productsPage.getTextColumn(page, 'quantity', 1) as number;
+      expect(productStockDemo1).to.be.gte(1);
+    });
+
+    it(`should filter the product "${Products.demo_9.reference}"`, async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'filterProductDemo9', baseContext);
+
+      await productsPage.resetFilter(page);
+      await productsPage.filterProducts(page, 'product_name', Products.demo_9.name);
+
+      const numberOfProductsAfterFilter = await productsPage.getNumberOfProductsFromList(page);
+      expect(numberOfProductsAfterFilter).to.be.gte(1);
+
+      const productReference = await productsPage.getTextColumn(page, 'reference', 1);
+      expect(productReference).to.be.eq(Products.demo_9.reference);
+
+      productStockDemo9 = await productsPage.getTextColumn(page, 'quantity', 1) as number;
+      expect(productStockDemo9).to.be.gte(1);
+    });
+
+    it('should reset all filters', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'resetFilterBeforeNew', baseContext);
+
+      const numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
+      expect(numberOfProducts).to.be.above(0);
+    });
+
+    it('should click on \'New product\' button and check new product modal', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'clickOnNewProductButton', baseContext);
+
+      const isModalVisible = await productsPage.clickOnNewProductButton(page);
+      expect(isModalVisible).to.be.eq(true);
+    });
+
+    it('should choose \'Pack of products\'', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'choosePackProduct', baseContext);
+
+      await productsPage.selectProductType(page, 'pack');
+
+      const pageTitle = await createProductsPage.getPageTitle(page);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
+    });
+
+    it('should go to new product page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToNewProductPage', baseContext);
+
+      await productsPage.clickOnAddNewProduct(page);
+
+      const pageTitle = await createProductsPage.getPageTitle(page);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
+    });
+
+    it('should edit the product name', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'editProductNameEn', baseContext);
+
+      await createProductsPage.setProductName(page, productNameEn, 'en');
+      await createProductsPage.setProductName(page, productNameFr, 'fr');
+      await createProductsPage.setProductStatus(page, true);
+
+      const message = await createProductsPage.saveProduct(page);
+      expect(message).to.eq(createProductsPage.successfulUpdateMessage);
+    });
+  });
+
+  describe('BO - Edit properties of the pack', async () => {
+    it('should go to the Pack tab', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToPackTab', baseContext);
+
+      // The Pack Tab has the identifier `stock`
+      await createProductsPage.goToTab(page, 'stock');
+
+      const isTabActive = await createProductsPage.isTabActive(page, 'stock');
+      expect(isTabActive).to.be.eq(true);
+    });
+
+    it('should add a product by product name to the pack', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'addProductByNameToPack', baseContext);
+
+      await packTab.addProductToPack(page, 'shirt', 1);
+
+      const updateProductMessage = await createProductsPage.saveProduct(page);
+      expect(updateProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+
+      const numberOfProducts = await packTab.getNumberOfProductsInPack(page);
+      expect(numberOfProducts).to.equal(1);
+
+      const result = await packTab.getProductInPackInformation(page, 1);
+      await Promise.all([
+        expect(result.name).to.equal(
+          `${Products.demo_1.name}: `
+          + `${basicHelper.capitalize(Products.demo_1.attributes[0].name)} - ${Products.demo_1.attributes[0].values[0]}, `
+          + `${basicHelper.capitalize(Products.demo_1.attributes[1].name)} - ${Products.demo_1.attributes[1].values[0]}`,
+        ),
+        expect(result.reference).to.equal(`Ref: ${Products.demo_1.reference}`),
+        expect(result.quantity).to.equal(1),
+      ]);
+    });
+
+    it('should add a product by reference to the pack', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'addProductByRefToPack', baseContext);
+
+      await packTab.addProductToPack(page, Products.demo_14.reference, 1);
+
+      const updateProductMessage = await createProductsPage.saveProduct(page);
+      expect(updateProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+
+      const numberOfProducts = await packTab.getNumberOfProductsInPack(page);
+      expect(numberOfProducts).to.equal(2);
+
+      const result = await packTab.getProductInPackInformation(page, 2);
+      await Promise.all([
+        expect(result.name).to.equal(Products.demo_14.name),
+        expect(result.reference).to.equal(`Ref: ${Products.demo_14.reference}`),
+        expect(result.quantity).to.equal(1),
+      ]);
+    });
+
+    it('should add set quantity for the first product in pack', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'setQuantityInPack', baseContext);
+
+      await packTab.setProductQuantity(page, 0, productQuantity);
+
+      const updateProductMessage = await createProductsPage.saveProduct(page);
+      expect(updateProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+
+      const numberOfProducts = await packTab.getNumberOfProductsInPack(page);
+      expect(numberOfProducts).to.equal(2);
+
+      const result = await packTab.getProductInPackInformation(page, 1);
+      await Promise.all([
+        expect(result.name).to.equal(
+          `${Products.demo_1.name}: `
+          + `${basicHelper.capitalize(Products.demo_1.attributes[0].name)} - ${Products.demo_1.attributes[0].values[0]}, `
+          + `${basicHelper.capitalize(Products.demo_1.attributes[1].name)} - ${Products.demo_1.attributes[1].values[0]}`,
+        ),
+        expect(result.reference).to.equal(`Ref: ${Products.demo_1.reference}`),
+        expect(result.quantity).to.equal(productQuantity),
+      ]);
+    });
+
+    it('should delete the second product in pack', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'deleteProductInPack', baseContext);
+
+      await packTab.deleteProduct(page, 2, true);
+
+      const updateProductMessage = await createProductsPage.saveProduct(page);
+      expect(updateProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+
+      const numberOfProducts = await packTab.getNumberOfProductsInPack(page);
+      expect(numberOfProducts).to.equal(1);
+    });
+
+    it('should add a product by reference to the pack', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'addProductByRefToPack2', baseContext);
+
+      await packTab.addProductToPack(page, Products.demo_9.reference, 1);
+
+      const updateProductMessage = await createProductsPage.saveProduct(page);
+      expect(updateProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+
+      const numberOfProducts = await packTab.getNumberOfProductsInPack(page);
+      expect(numberOfProducts).to.equal(2);
+
+      const result = await packTab.getProductInPackInformation(page, 2);
+      await Promise.all([
+        expect(result.name).to.equal(
+          `${Products.demo_9.name}: `
+          + `${basicHelper.capitalize(Products.demo_9.attributes[0].name)} - ${Products.demo_9.attributes[0].values[0]}`,
+        ),
+        expect(result.reference).to.equal(`Ref: ${Products.demo_9.reference}`),
+        expect(result.quantity).to.equal(1),
+      ]);
+    });
+
+    it('should edit quantity to the pack', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'editQuantityPack', baseContext);
+
+      await packTab.editQuantity(page, productStock);
+
+      const updateProductMessage = await createProductsPage.saveProduct(page);
+      expect(updateProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+    });
+
+    it('should go to the Pricing tab', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToPricingTab', baseContext);
+
+      await createProductsPage.goToTab(page, 'pricing');
+
+      const isTabActive = await createProductsPage.isTabActive(page, 'pricing');
+      expect(isTabActive).to.be.eq(true);
+    });
+
+    it('should set the retail price', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'setRetailPrice', baseContext);
+
+      await pricingTab.setRetailPrice(page, true, productRetailPrice);
+
+      const message = await createProductsPage.saveProduct(page);
+      expect(message).to.eq(createProductsPage.successfulUpdateMessage);
+
+      const productHeaderSummary = await createProductsPage.getProductHeaderSummary(page);
+      expect(productHeaderSummary.priceTaxExc).to.equals(`€${productRetailPrice.toFixed(2)} tax excl.`);
+      expect(productHeaderSummary.priceTaxIncl).to.equals(
+        `€${productRetailPrice.toFixed(2)} tax incl. (tax rule: 0%)`,
+      );
+    });
+
+    it('should preview the product on front-office', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'previewPack', baseContext);
+
+      page = await createProductsPage.previewProduct(page);
+      await foProductPage.changeLanguage(page, 'en');
+
+      const pageTitle: string = await foProductPage.getPageTitle(page);
+      expect(pageTitle).to.contains(productNameEn);
+    });
+
+    it('should check product information', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'checkProductInformation', baseContext);
+
+      const productInformation = await foProductPage.getProductInformation(page);
+      expect(productRetailPrice).to.eq(productInformation.price);
+
+      // @todo : https://github.com/PrestaShop/PrestaShop/issues/33962
+      /*
+      const productsPrice = await foProductPage.getPackProductsPrice(page);
+      const calculatedPrice = (Products.demo_1.finalPrice * productQuantity + Products.demo_9.finalPrice).toFixed(2);
+      expect(calculatedPrice).to.eq(productsPrice);
+      */
+
+      const product1 = await foProductPage.getProductInPackList(page, 1);
+      await Promise.all([
+        expect(product1.name).to.equals(
+          `${Products.demo_1.name} `
+          + `${basicHelper.capitalize(Products.demo_1.attributes[0].name)}-${Products.demo_1.attributes[0].values[0]} `
+          + `${basicHelper.capitalize(Products.demo_1.attributes[1].name)}-${Products.demo_1.attributes[1].values[0]}`,
+        ),
+        expect(product1.price).to.equals(`€${Products.demo_1.finalPrice.toFixed(2)}`),
+        expect(product1.quantity).to.equals(productQuantity),
+      ]);
+
+      const product2 = await foProductPage.getProductInPackList(page, 2);
+      await Promise.all([
+        expect(product2.name).to.equals(
+          `${Products.demo_9.name} `
+          + `${basicHelper.capitalize(Products.demo_9.attributes[0].name)}-${Products.demo_9.attributes[0].values[0]}`,
+        ),
+        expect(product2.price).to.equals(`€${Products.demo_9.finalPrice.toFixed(2)}`),
+        expect(product2.quantity).to.equals(1),
+      ]);
+    });
+  });
+
+  describe('Order the pack on FO & check stock', async () => {
+    it('should order the pack', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'orderPack1', baseContext);
+
+      // Add product to the cart
+      await foProductPage.addProductToTheCart(page);
+
+      // Proceed to checkout the shopping cart
+      await cartPage.clickOnProceedToCheckout(page);
+      // Connect
+      await checkoutPage.clickOnSignIn(page);
+      await checkoutPage.customerLogin(page, Customers.johnDoe);
+
+      // Address step - Go to delivery step
+      const isStepAddressComplete = await checkoutPage.goToDeliveryStep(page);
+      expect(isStepAddressComplete).to.be.eq(true);
+
+      // Delivery step - Go to payment step
+      const isStepDeliveryComplete = await checkoutPage.goToPaymentStep(page);
+      expect(isStepDeliveryComplete).to.be.eq(true);
+
+      // Payment step - Choose payment step
+      await checkoutPage.choosePaymentAndOrder(page, PaymentMethods.wirePayment.moduleName);
+
+      // Check the confirmation message
+      const cardTitle = await orderConfirmationPage.getOrderConfirmationCardTitle(page);
+      expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
+    });
+
+    it('should return to BO', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'returnToBackOffice', baseContext);
+
+      page = await orderConfirmationPage.closePage(browserContext, page, 0);
+      await page.reload();
+
+      const pageTitle = await createProductsPage.getPageTitle(page);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
+    });
+
+    it('should return to the Pack tab', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'returnToPackTab', baseContext);
+
+      // The Pack Tab has the identifier `stock`
+      await createProductsPage.goToTab(page, 'stock');
+
+      const isTabActive = await createProductsPage.isTabActive(page, 'stock');
+      expect(isTabActive).to.be.eq(true);
+    });
+
+    it('should check the stock', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'checkStock', baseContext);
+
+      const stockValue = await packTab.getStockValue(page);
+      expect(stockValue).to.be.equals(productStock - 1);
+    });
+  });
+
+  describe(`Set the order to ${OrderStatuses.delivered.name} & check stock`, async () => {
+    it('should go to \'Orders > Orders\' page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToOrdersPage', baseContext);
+
+      await dashboardPage.goToSubMenu(
+        page,
+        dashboardPage.ordersParentLink,
+        dashboardPage.ordersLink,
+      );
+
+      const pageTitle: string = await ordersPage.getPageTitle(page);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
+    });
+
+    it('should update order status', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'updateOrderStatus', baseContext);
+
+      const textResult: string = await ordersPage.setOrderStatus(page, 1, OrderStatuses.delivered);
+      expect(textResult).to.equal(ordersPage.successfulUpdateMessage);
+    });
+
+    it('should go to \'Catalog > Products\' page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'returnProductsPage', baseContext);
+
+      await dashboardPage.goToSubMenu(
+        page,
+        dashboardPage.catalogParentLink,
+        dashboardPage.productsLink,
+      );
+      await productsPage.closeSfToolBar(page);
+
+      const pageTitle = await productsPage.getPageTitle(page);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
+    });
+
+    it('should go to the first product page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToFirstProductPage', baseContext);
+
+      await productsPage.goToProductPage(page);
+
+      const pageTitle: string = await createProductsPage.getPageTitle(page);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
+    });
+
+    it('should return to the Pack tab', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'returnToPackTab', baseContext);
+
+      // The Pack Tab has the identifier `stock`
+      await createProductsPage.goToTab(page, 'stock');
+
+      const isTabActive = await createProductsPage.isTabActive(page, 'stock');
+      expect(isTabActive).to.be.eq(true);
+    });
+
+    it('should check the recent stock movement', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'checkRecentStockMovement', baseContext);
+
+      const result = await packTab.getStockMovement(page, 1);
+      await Promise.all([
+        expect(result.dateTime).to.contains('Shipped products'),
+        expect(result.employee).to.equal(''),
+        expect(result.quantity).to.equal(-1),
+      ]);
+    });
+  });
+
+  describe('Decrement products in pack only - Configure, Order & Check stocks', async () => {
+    it('should edit Pack Quantities "Decrement products in pack only"', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'editPackQuantities', baseContext);
+
+      await packTab.editPackStockType(page, 'Decrement products in pack only');
+
+      const updateProductMessage = await createProductsPage.saveProduct(page);
+      expect(updateProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+    });
+
+    it('should preview the product on front-office', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'previewPack2', baseContext);
+
+      page = await createProductsPage.previewProduct(page);
+      await foProductPage.changeLanguage(page, 'en');
+
+      const pageTitle: string = await foProductPage.getPageTitle(page);
+      expect(pageTitle).to.contains(productNameEn);
+    });
+
+    it('should order the pack', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'orderPack2', baseContext);
+
+      // Add product to the cart
+      await foProductPage.addProductToTheCart(page);
+
+      // Proceed to checkout the shopping cart
+      await cartPage.clickOnProceedToCheckout(page);
+
+      // Address step - Go to delivery step
+      const isStepAddressComplete = await checkoutPage.goToDeliveryStep(page);
+      expect(isStepAddressComplete).to.be.eq(true);
+
+      // Delivery step - Go to payment step
+      const isStepDeliveryComplete = await checkoutPage.goToPaymentStep(page);
+      expect(isStepDeliveryComplete).to.be.eq(true);
+
+      // Payment step - Choose payment step
+      await checkoutPage.choosePaymentAndOrder(page, PaymentMethods.wirePayment.moduleName);
+
+      // Check the confirmation message
+      const cardTitle = await orderConfirmationPage.getOrderConfirmationCardTitle(page);
+      expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
+    });
+
+    it('should return to BO', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'returnToBackOffice', baseContext);
+
+      page = await orderConfirmationPage.closePage(browserContext, page, 0);
+
+      const pageTitle = await createProductsPage.getPageTitle(page);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
+    });
+
+    it('should go to \'Catalog > Products\' page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'returnProductsPage', baseContext);
+
+      await dashboardPage.goToSubMenu(
+        page,
+        dashboardPage.catalogParentLink,
+        dashboardPage.productsLink,
+      );
+      await productsPage.closeSfToolBar(page);
+
+      const pageTitle = await productsPage.getPageTitle(page);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
+    });
+
+    it(`should filter and check the product "${Products.demo_1.reference}"`, async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'filterProductDemo1', baseContext);
+
+      await productsPage.resetFilter(page);
+      await productsPage.filterProducts(page, 'product_name', Products.demo_1.name);
+
+      const numberOfProductsAfterFilter = await productsPage.getNumberOfProductsFromList(page);
+      expect(numberOfProductsAfterFilter).to.be.gte(1);
+
+      const productReference = await productsPage.getTextColumn(page, 'reference', 1);
+      expect(productReference).to.be.eq(Products.demo_1.reference);
+
+      const productStock = await productsPage.getTextColumn(page, 'quantity', 1) as number;
+      expect(productStock).to.be.gte(1);
+
+      expect(productStock).to.be.eq(productStockDemo1 - productQuantity);
+    });
+
+    it(`should filter and check the product "${Products.demo_9.reference}"`, async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'filterProductDemo9', baseContext);
+
+      await productsPage.resetFilter(page);
+      await productsPage.filterProducts(page, 'product_name', Products.demo_9.name);
+
+      const numberOfProductsAfterFilter = await productsPage.getNumberOfProductsFromList(page);
+      expect(numberOfProductsAfterFilter).to.be.gte(1);
+
+      const productReference = await productsPage.getTextColumn(page, 'reference', 1);
+      expect(productReference).to.be.eq(Products.demo_9.reference);
+
+      const productStock = await productsPage.getTextColumn(page, 'quantity', 1) as number;
+      expect(productStock).to.be.gte(1);
+
+      expect(productStock).to.be.eq(productStockDemo9 - 1);
+    });
+
+    it('should reset all filters', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFinal', baseContext);
+
+      const numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
+      expect(numberOfProducts).to.be.above(0);
+    });
+  });
+
+  deleteProductV2Test(new ProductData({
+    name: productNameEn,
+  }), `${baseContext}_postTest_0`);
+});
diff --git a/tests/UI/data/demo/products.ts b/tests/UI/data/demo/products.ts
index 199f0dd4820b6..1a9a32281d2ad 100644
--- a/tests/UI/data/demo/products.ts
+++ b/tests/UI/data/demo/products.ts
@@ -99,19 +99,20 @@ export default {
     quantity: 1200,
     status: true,
   }),
-  demo_12: new ProductData({
-    id: 7,
-    name: 'Mug The adventure begins',
-    thumbImage: 'mug-the-adventure-begins.jpg',
-    coverImage: 'mug-the-adventure-begins.jpg',
-    reference: 'demo_12',
-    category: 'Home Accessories',
-    summary: 'White Ceramic Mug. 325ml',
-    priceTaxExcluded: 11.9,
-    price: 14.28,
-    tax: 20,
-    quantity: 300,
+  demo_9: new ProductData({
+    id: 17,
+    name: 'Brown bear notebook',
+    reference: 'demo_9',
+    category: 'Stationery',
+    price: 15.48,
+    quantity: 1200,
     status: true,
+    attributes: [
+      {
+        name: 'Paper Type',
+        values: ['Ruled', 'Plain', 'Squarred', 'Doted'],
+      },
+    ],
   }),
   demo_11: new ProductData({
     id: 6,
@@ -127,6 +128,20 @@ export default {
     quantity: 300,
     status: true,
   }),
+  demo_12: new ProductData({
+    id: 7,
+    name: 'Mug The adventure begins',
+    thumbImage: 'mug-the-adventure-begins.jpg',
+    coverImage: 'mug-the-adventure-begins.jpg',
+    reference: 'demo_12',
+    category: 'Home Accessories',
+    summary: 'White Ceramic Mug. 325ml',
+    priceTaxExcluded: 11.9,
+    price: 14.28,
+    tax: 20,
+    quantity: 300,
+    status: true,
+  }),
   demo_13: new ProductData({
     id: 8,
     name: 'Mug Today is a good day',
diff --git a/tests/UI/pages/BO/catalog/productsV2/add/index.ts b/tests/UI/pages/BO/catalog/productsV2/add/index.ts
index 2ab2822e80e9e..3e50be1ef234c 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/index.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/index.ts
@@ -211,7 +211,9 @@ class CreateProduct extends BOBasePage {
       priceTaxExc: await this.getTextContent(page, this.productHeaderTaxExcluded),
       priceTaxIncl: await this.getTextContent(page, this.productHeaderTaxIncluded),
       quantity: await this.getTextContent(page, this.productHeaderQuantity, false),
-      reference: await this.getTextContent(page, this.productHeaderReference('reference'), false),
+      reference: (await page.locator(this.productHeaderReference('reference')).count())
+        ? await this.getTextContent(page, this.productHeaderReference('reference'), false)
+        : '',
       mpn: (await page.locator(this.productHeaderReference('mpn')).count())
         ? await this.getTextContent(page, this.productHeaderReference('mpn'), false)
         : '',
diff --git a/tests/UI/pages/BO/catalog/productsV2/add/packTab.ts b/tests/UI/pages/BO/catalog/productsV2/add/packTab.ts
index 85f12c54156ce..6a0ef51fcf150 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/packTab.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/packTab.ts
@@ -44,6 +44,8 @@ class PackTab extends BOBasePage {
 
   private readonly alertDangerProductInPack: (productInList: number) => string;
 
+  private readonly editQuantityBase: string;
+
   private readonly editQuantityInput: string;
 
   private readonly minimalQuantityInput: string;
@@ -108,6 +110,7 @@ class PackTab extends BOBasePage {
       + 'delta_quantity + span';
 
     // Edit quantity selectors
+    this.editQuantityBase = 'input#product_stock_quantities_delta_quantity_quantity';
     this.editQuantityInput = '#product_stock_quantities_delta_quantity_delta';
     this.minimalQuantityInput = '#product_stock_quantities_minimal_quantity';
     this.packStockTypeRadioButton = (buttonRow: number) => `#product_stock_pack_stock_type_${buttonRow} +i`;
@@ -245,7 +248,7 @@ class PackTab extends BOBasePage {
   async getStockMovement(page: Page, movementRow: number): Promise<ProductStockMovement> {
     return {
       dateTime: await this.getTextContent(page, this.dateTimeRowInTable(movementRow - 1)),
-      employee: await this.getTextContent(page, this.employeeRowInTable(movementRow - 1)),
+      employee: await this.getTextContent(page, this.employeeRowInTable(movementRow - 1), false),
       quantity: await this.getNumberFromText(page, this.quantityRowInTable(movementRow - 1)),
     };
   }
@@ -301,10 +304,27 @@ class PackTab extends BOBasePage {
    * @param packData {ProductPackOptions} Data to edit pack of products
    */
   async editPackOfProducts(page: Page, packData: ProductPackOptions): Promise<void> {
-    await this.setValue(page, this.editQuantityInput, packData.quantity);
+    await this.editQuantity(page, packData.quantity);
     await this.setValue(page, this.minimalQuantityInput, packData.minimalQuantity);
+    await this.editPackStockType(page, packData.packQuantitiesOption);
+  }
+
+  /**
+   * Edit quantity
+   * @param page {Page} Browser tab
+   * @param quantity {number} Quantity
+   */
+  async editQuantity(page: Page, quantity: number): Promise<void> {
+    await this.setValue(page, this.editQuantityInput, quantity);
+  }
 
-    switch (packData.packQuantitiesOption) {
+  /**
+   * Edit quantity
+   * @param page {Page} Browser tab
+   * @param packStockType {string} Quantity
+   */
+  async editPackStockType(page: Page, packStockType: string): Promise<void> {
+    switch (packStockType) {
       case 'Decrement pack only':
         await page.click(this.packStockTypeRadioButton(0));
         break;
@@ -322,9 +342,18 @@ class PackTab extends BOBasePage {
         break;
 
       default:
-        throw new Error(`Radio button for ${packData.packQuantitiesOption} was not found`);
+        throw new Error(`Radio button for ${packStockType} was not found`);
     }
   }
+
+  /**
+   * Get the value of the stock
+   * @param page {Page} Browser tab
+   * @return <Promise<number>>
+   */
+  async getStockValue(page: Page): Promise<number> {
+    return parseInt(await page.locator(this.editQuantityBase).getAttribute('value') ?? '', 10);
+  }
 }
 
 export default new PackTab();
diff --git a/tests/UI/pages/BO/catalog/productsV2/index.ts b/tests/UI/pages/BO/catalog/productsV2/index.ts
index 9c0d83e283bec..89b91cf0abc2b 100644
--- a/tests/UI/pages/BO/catalog/productsV2/index.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/index.ts
@@ -304,8 +304,8 @@ class Products extends BOBasePage {
     await this.waitForVisibleSelector(page, `${this.modalCreateProduct} iframe`);
     await this.waitForHiddenSelector(page, this.modalCreateProductLoader);
 
-    const createProductFrame: Frame | null = await page.frame({url: /sell\/catalog\/products-v2\/create/gmi});
-    await expect(createProductFrame).to.be.not.null;
+    const createProductFrame: Frame | null = page.frame({url: /sell\/catalog\/products-v2\/create/gmi});
+    expect(createProductFrame).to.be.not.eq(null);
 
     return this.getTextContent(createProductFrame!, this.productTypeDescription);
   }
@@ -329,8 +329,8 @@ class Products extends BOBasePage {
     await this.waitForVisibleSelector(page, `${this.modalCreateProduct} iframe`);
     await this.waitForHiddenSelector(page, this.modalCreateProductLoader);
 
-    const createProductFrame: Frame | null = await page.frame({url: /sell\/catalog\/products-v2\/create/gmi});
-    await expect(createProductFrame).to.be.not.null;
+    const createProductFrame: Frame | null = page.frame({url: /sell\/catalog\/products-v2\/create/gmi});
+    expect(createProductFrame).to.be.not.eq(null);
 
     await this.waitForSelectorAndClick(createProductFrame!, this.productType(productType));
   }
@@ -341,8 +341,8 @@ class Products extends BOBasePage {
    * @returns {Promise<void>}
    */
   async clickOnAddNewProduct(page: Page): Promise<void> {
-    const createProductFrame: Frame | null = await page.frame({url: /sell\/catalog\/products-v2\/create/gmi});
-    await expect(createProductFrame).to.be.not.null;
+    const createProductFrame: Frame | null = page.frame({url: /sell\/catalog\/products-v2\/create/gmi});
+    expect(createProductFrame).to.be.not.eq(null);
 
     await this.waitForSelectorAndClick(createProductFrame!, this.addNewProductButton);
   }
diff --git a/tests/UI/pages/FO/product/index.ts b/tests/UI/pages/FO/product/index.ts
index a7a537f614491..6f8cf4a5278e9 100644
--- a/tests/UI/pages/FO/product/index.ts
+++ b/tests/UI/pages/FO/product/index.ts
@@ -77,6 +77,8 @@ class Product extends FOBasePage {
 
   private readonly regularPrice: string;
 
+  private readonly packProductsPrice: string;
+
   private readonly productPrice: string;
 
   private readonly taxShippingDeliveryBlock: string;
@@ -181,6 +183,7 @@ class Product extends FOBasePage {
     this.discountAmountSpan = `${this.productPricesBlock} .discount.discount-amount`;
     this.discountPercentageSpan = `${this.productPricesBlock} .discount.discount-percentage`;
     this.regularPrice = `${this.productPricesBlock} .regular-price`;
+    this.packProductsPrice = `${this.productPricesBlock} .product-pack-price span`;
     this.productPrice = `${this.productPricesBlock} .current-price span`;
     this.taxShippingDeliveryBlock = `${this.productPricesBlock} div.tax-shipping-delivery-label`;
     this.deliveryInformationSpan = `${this.taxShippingDeliveryBlock} span.delivery-information`;
@@ -246,7 +249,7 @@ class Product extends FOBasePage {
    * @param page {Page} Browser tab
    * @return {Promise<boolean>}
    */
-  isProductTagVisible(page: Page): Promise<boolean> {
+  async isProductTagVisible(page: Page): Promise<boolean> {
     return this.elementVisible(page, this.productFlag);
   }
 
@@ -260,7 +263,9 @@ class Product extends FOBasePage {
       name: await this.getTextContent(page, this.productName),
       price: await this.getPriceFromText(page, this.productPrice),
       summary: await this.getTextContent(page, this.shortDescription, false),
-      description: await this.getTextContent(page, this.productDescription),
+      description: (await page.locator(`${this.productDescription}:visible`).count())
+        ? await this.getTextContent(page, this.productDescription)
+        : '',
     };
   }
 
@@ -274,11 +279,14 @@ class Product extends FOBasePage {
     image: string | null, quantity: number,
     price: string, name: string
   }> {
+    // Add +1 due to span before the article
+    const productIdentifier: number = productInList + 1;
+
     return {
-      image: await this.getAttributeContent(page, this.productInPackImage(productInList), 'src'),
-      name: await this.getTextContent(page, this.productInPackName(productInList)),
-      price: await this.getTextContent(page, this.productInPackPrice(productInList)),
-      quantity: await this.getNumberFromText(page, this.productInPackQuantity(productInList)),
+      image: await this.getAttributeContent(page, this.productInPackImage(productIdentifier), 'src'),
+      name: await this.getTextContent(page, this.productInPackName(productIdentifier)),
+      price: await this.getTextContent(page, this.productInPackPrice(productIdentifier)),
+      quantity: await this.getNumberFromText(page, this.productInPackQuantity(productIdentifier)),
     };
   }
 
@@ -287,17 +295,26 @@ class Product extends FOBasePage {
    * @param page {Page} Browser tab
    * @returns {Promise<number>}
    */
-  getRegularPrice(page: Page): Promise<number> {
+  async getRegularPrice(page: Page): Promise<number> {
     return this.getPriceFromText(page, this.regularPrice);
   }
 
+  /**
+   * Get the price of products in pack
+   * @param page {Page} Browser tab
+   * @returns {Promise<number>}
+   */
+  async getPackProductsPrice(page: Page): Promise<number> {
+    return this.getPriceFromText(page, this.packProductsPrice);
+  }
+
   /**
    * Get product attributes from a Ul selector
    * @param page {Page} Browser tab
    * @param ulSelector {string} Selector to locate the element
    * @returns {Promise<Array<string>>}
    */
-  getProductsAttributesFromUl(page: Page, ulSelector: string): Promise<Array<string | null>> {
+  async getProductsAttributesFromUl(page: Page, ulSelector: string): Promise<Array<string | null>> {
     return page.$$eval(`${ulSelector} li .attribute-name`, (all) => all.map((el) => el.textContent));
   }
 
@@ -381,7 +398,7 @@ class Product extends FOBasePage {
    * @param page {Page} Browser tab
    * @returns {Promise<string>}
    */
-  getDiscountAmount(page: Page): Promise<string> {
+  async getDiscountAmount(page: Page): Promise<string> {
     return this.getTextContent(page, this.discountAmountSpan);
   }
 
@@ -390,7 +407,7 @@ class Product extends FOBasePage {
    * @param page {Page} Browser tab
    * @returns {Promise<string>}
    */
-  getDiscountPercentage(page: Page): Promise<string> {
+  async getDiscountPercentage(page: Page): Promise<string> {
     return this.getTextContent(page, this.discountPercentageSpan);
   }
 
@@ -399,7 +416,7 @@ class Product extends FOBasePage {
    * @param page {Page} Browser tab
    * @return {promise<string>}
    */
-  getProductAvailabilityLabel(page: Page): Promise<string> {
+  async getProductAvailabilityLabel(page: Page): Promise<string> {
     return this.getTextContent(page, this.productAvailability, false);
   }
 
@@ -408,7 +425,7 @@ class Product extends FOBasePage {
    * @param page {Page} Browser tab
    * @return {Promise<string>}
    */
-  getDeliveryInformationText(page: Page): Promise<string> {
+  async getDeliveryInformationText(page: Page): Promise<string> {
     return this.getTextContent(page, this.deliveryInformationSpan);
   }
 
diff --git a/tests/UI/pages/commonPage.ts b/tests/UI/pages/commonPage.ts
index 3c4a815455b35..09cce2a875436 100755
--- a/tests/UI/pages/commonPage.ts
+++ b/tests/UI/pages/commonPage.ts
@@ -346,7 +346,7 @@ export default class CommonPage {
   async getNumberFromText(page: Page | Frame, selector: string, timeout: number = 0): Promise<number> {
     await page.waitForTimeout(timeout);
     const text = await this.getTextContent(page, selector, false);
-    const number = (/\d+/g.exec(text) ?? '').toString();
+    const number = (/-?\d+/g.exec(text) ?? '').toString();
 
     return parseInt(number, 10);
   }
diff --git a/tests/UI/utils/basicHelper.ts b/tests/UI/utils/basicHelper.ts
index 2adb7f0ea0bac..4cff8703ba6aa 100644
--- a/tests/UI/utils/basicHelper.ts
+++ b/tests/UI/utils/basicHelper.ts
@@ -57,4 +57,13 @@ export default {
 
     return age;
   },
+
+  /**
+   * Make a string's first character uppercase
+   * @param value {string}
+   * @returns {string}
+   */
+  capitalize(value: string): string {
+    return value.charAt(0).toUpperCase() + value.slice(1);
+  },
 };

From 1d5773f5254ddc12fbce01874cbe44fbe228b410 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Mon, 4 Sep 2023 09:12:51 +0200
Subject: [PATCH 1011/1030] Functional Tests : FO - Header & Footer - Check
 links in footer

---
 .../BO/02_orders/01_orders/04_updateStatus.ts |  14 +-
 .../createOrders/08_chooseAddress.ts          |   2 +-
 .../06_merchandiseReturnsTab.ts               |   2 +-
 .../viewAndEditOrder/07_messagesBlock.ts      |  28 +-
 .../02_categories/02_CRUDCategoryInBO.ts      |   2 +-
 .../02_categories/08_editHomeCategory.ts      |   2 +-
 .../02_addresses/06_setRequiredFields.ts      |  16 +-
 .../01_merchandiseReturnOptions.ts            |   2 +-
 .../03_merchandiseReturns/02_deleteProduct.ts |   2 +-
 .../03_merchandiseReturns/03_updateStatus.ts  |   2 +-
 .../08_design/04_pages/01_CRUDPageCategory.ts |   2 +-
 .../15_checkStoreImageFormat.ts               |   2 +-
 .../02_countries/02_CRUDCountry.ts            |  24 +-
 .../02_countries/05_countriesRestrictions.ts  |   6 +-
 .../general/08_enableDisableSuppliers.ts      |   2 +-
 .../general/09_enableDisableBrands.ts         |   2 +-
 .../general/03_disableReorderingOption.ts     |   2 +-
 .../BO/15_header/08_checkNotifications.ts     |   8 +-
 .../02_checkLinksInFooter.ts                  |  54 ++--
 .../01_creditSlips/01_consultCreditSlip.ts    |  50 ++--
 .../03_userAccount/01_editInformation.ts      |   2 +-
 .../classic/03_userAccount/02_CRUDAddress.ts  |   4 +-
 .../02_orderHistory/01_consultOrderList.ts    |  26 +-
 .../01_reorderFromOrderDetail.ts              |  14 +-
 .../01_orderDetails/02_downloadInvoice.ts     |  14 +-
 .../03_requestMerchandiseReturn.ts            |   8 +-
 .../01_orderDetails/04_sendMessage.ts         |   8 +-
 .../02_reorderFromOrderList.ts                |  14 +-
 .../02_orderHistory/03_downloadInvoice.ts     |  12 +-
 .../01_consultReturnDetails.ts                |   2 +-
 .../02_checkOrderReturnPDF.ts                 |   2 +-
 .../04_newsletter/01_subscribeNewsletter.ts   |  10 +-
 .../06_homePage/02_displaySomeProducts.ts     |   4 +-
 .../03_shippingMethods/01_addOrderMessage.ts  |   2 +-
 .../01_login/01_passwordReminder.ts           |   8 +-
 .../02_checkLinksInFooter.ts                  | 258 ++++++++++++++++++
 .../functional/05_CRUDVirtualProduct.ts       |   8 +-
 tests/UI/commonTests/FO/account.ts            |  22 +-
 tests/UI/pages/FO/FObasePage.ts               |  11 +-
 tests/UI/pages/FO/aboutUs/index.ts            |   9 +-
 tests/UI/pages/FO/bestSales/index.ts          |   9 +-
 tests/UI/pages/FO/cart/index.ts               |   4 +-
 tests/UI/pages/FO/contactUs/index.ts          |   4 +-
 tests/UI/pages/FO/delivery/index.ts           |   9 +-
 tests/UI/pages/FO/home/index.ts               |   4 +-
 .../UI/pages/FO/hummingbird/aboutUs/index.ts  |  18 ++
 .../pages/FO/hummingbird/bestSales/index.ts   |  18 ++
 tests/UI/pages/FO/hummingbird/cart/index.ts   |   4 +-
 .../pages/FO/hummingbird/contactUs/index.ts   |   4 +-
 .../UI/pages/FO/hummingbird/delivery/index.ts |  18 ++
 tests/UI/pages/FO/hummingbird/home/index.ts   |   4 +-
 .../pages/FO/hummingbird/legalNotice/index.ts |  18 ++
 tests/UI/pages/FO/hummingbird/login/index.ts  |   4 +-
 .../UI/pages/FO/hummingbird/myAccount/add.ts  |   4 +-
 .../FO/hummingbird/myAccount/addAddress.ts    |  18 ++
 .../FO/hummingbird/myAccount/addresses.ts     |  19 ++
 .../FO/hummingbird/myAccount/creditSlips.ts   |  18 ++
 .../FO/hummingbird/myAccount/identity.ts      |  18 ++
 .../pages/FO/hummingbird/myAccount/index.ts   |   4 +-
 .../FO/hummingbird/myAccount/myWishlists.ts   |  18 ++
 .../FO/hummingbird/myAccount/orderHistory.ts  |  18 ++
 .../pages/FO/hummingbird/newProducts/index.ts |  17 ++
 .../orderTracking/guestOrderTracking.ts       |  17 ++
 .../FO/hummingbird/passwordReminder/index.ts  |   4 +-
 .../pages/FO/hummingbird/pricesDrop/index.ts  |  17 ++
 .../FO/hummingbird/searchResults/index.ts     |   4 +-
 .../FO/hummingbird/securePayment/index.ts     |  17 ++
 .../UI/pages/FO/hummingbird/siteMap/index.ts  |  17 ++
 tests/UI/pages/FO/hummingbird/stores/index.ts |  17 ++
 .../termsAndConditionsOfUse/index.ts          |  17 ++
 tests/UI/pages/FO/legalNotice/index.ts        |   9 +-
 tests/UI/pages/FO/login/index.ts              |   4 +-
 tests/UI/pages/FO/myAccount/add.ts            |   4 +-
 tests/UI/pages/FO/myAccount/addAddress.ts     |   9 +-
 tests/UI/pages/FO/myAccount/addresses.ts      |   9 +-
 tests/UI/pages/FO/myAccount/creditSlips.ts    |   9 +-
 tests/UI/pages/FO/myAccount/identity.ts       |   9 +-
 tests/UI/pages/FO/myAccount/index.ts          |   4 +-
 tests/UI/pages/FO/myAccount/myWishlists.ts    |   9 +-
 tests/UI/pages/FO/myAccount/orderHistory.ts   |   7 +-
 tests/UI/pages/FO/newProducts/index.ts        |   9 +-
 .../FO/orderTracking/guestOrderTracking.ts    |  10 +-
 tests/UI/pages/FO/passwordReminder/index.ts   |   4 +-
 tests/UI/pages/FO/pricesDrop/index.ts         |   9 +-
 tests/UI/pages/FO/searchResults/index.ts      |   5 +-
 tests/UI/pages/FO/securePayment/index.ts      |   9 +-
 tests/UI/pages/FO/siteMap/index.ts            |   9 +-
 tests/UI/pages/FO/stores/index.ts             |   9 +-
 .../pages/FO/termsAndConditionsOfUse/index.ts |   9 +-
 89 files changed, 867 insertions(+), 303 deletions(-)
 create mode 100644 tests/UI/campaigns/functional/FO/hummingbird/02_headerAndFooter/02_checkLinksInFooter.ts
 create mode 100644 tests/UI/pages/FO/hummingbird/aboutUs/index.ts
 create mode 100644 tests/UI/pages/FO/hummingbird/bestSales/index.ts
 create mode 100644 tests/UI/pages/FO/hummingbird/delivery/index.ts
 create mode 100644 tests/UI/pages/FO/hummingbird/legalNotice/index.ts
 create mode 100644 tests/UI/pages/FO/hummingbird/myAccount/addAddress.ts
 create mode 100644 tests/UI/pages/FO/hummingbird/myAccount/addresses.ts
 create mode 100644 tests/UI/pages/FO/hummingbird/myAccount/creditSlips.ts
 create mode 100644 tests/UI/pages/FO/hummingbird/myAccount/identity.ts
 create mode 100644 tests/UI/pages/FO/hummingbird/myAccount/myWishlists.ts
 create mode 100644 tests/UI/pages/FO/hummingbird/myAccount/orderHistory.ts
 create mode 100644 tests/UI/pages/FO/hummingbird/newProducts/index.ts
 create mode 100644 tests/UI/pages/FO/hummingbird/orderTracking/guestOrderTracking.ts
 create mode 100644 tests/UI/pages/FO/hummingbird/pricesDrop/index.ts
 create mode 100644 tests/UI/pages/FO/hummingbird/securePayment/index.ts
 create mode 100644 tests/UI/pages/FO/hummingbird/siteMap/index.ts
 create mode 100644 tests/UI/pages/FO/hummingbird/stores/index.ts
 create mode 100644 tests/UI/pages/FO/hummingbird/termsAndConditionsOfUse/index.ts

diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/04_updateStatus.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/04_updateStatus.ts
index 09fffba177a00..85dda8bcfc375 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/04_updateStatus.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/04_updateStatus.ts
@@ -15,7 +15,7 @@ import ordersPage from '@pages/BO/orders';
 import {homePage} from '@pages/FO/home';
 import {loginPage as foLoginPage} from '@pages/FO/login';
 import {myAccountPage} from '@pages/FO/myAccount';
-import foOrderHistoryPage from '@pages/FO/myAccount/orderHistory';
+import {orderHistoryPage} from '@pages/FO/myAccount/orderHistory';
 
 // Import data
 import Customers from '@data/demo/customers';
@@ -236,14 +236,14 @@ describe('BO - orders : Update order status', async () => {
           await homePage.goToMyAccountPage(page);
           await myAccountPage.goToHistoryAndDetailsPage(page);
 
-          const pageTitle = await foOrderHistoryPage.getPageTitle(page);
-          await expect(pageTitle, 'Fail to open order history page').to.contains(foOrderHistoryPage.pageTitle);
+          const pageTitle = await orderHistoryPage.getPageTitle(page);
+          await expect(pageTitle, 'Fail to open order history page').to.contains(orderHistoryPage.pageTitle);
         });
 
         it('should check the last order status', async function () {
           await testContext.addContextItem(this, 'testIdentifier', `checkLastOrderStatus${index}`, baseContext);
 
-          const orderStatusFO = await foOrderHistoryPage.getOrderStatus(page, 1);
+          const orderStatusFO = await orderHistoryPage.getOrderStatus(page, 1);
           await expect(orderStatusFO, 'Order status is not correct').to.equal(test.args.orderStatus.name);
         });
 
@@ -251,14 +251,14 @@ describe('BO - orders : Update order status', async () => {
           it('should check if the last invoice is visible', async function () {
             await testContext.addContextItem(this, 'testIdentifier', `checkLastInvoice${index}`, baseContext);
 
-            const isVisible = await foOrderHistoryPage.isInvoiceVisible(page, 1);
+            const isVisible = await orderHistoryPage.isInvoiceVisible(page, 1);
             await expect(isVisible, 'The invoice file is not existing!').to.be.true;
           });
 
           it('should check the order ID of the invoice', async function () {
             await testContext.addContextItem(this, 'testIdentifier', `checkOrderID${index}`, baseContext);
 
-            const orderID = await foOrderHistoryPage.getOrderIdFromInvoiceHref(page, 1);
+            const orderID = await orderHistoryPage.getOrderIdFromInvoiceHref(page, 1);
             await expect(orderID, 'The invoice file attached is not correct!').to.contains(`id_order=${orderId}`);
           });
         }
@@ -266,7 +266,7 @@ describe('BO - orders : Update order status', async () => {
         it('should close the shop page', async function () {
           await testContext.addContextItem(this, 'testIdentifier', `closeShop${index}`, baseContext);
 
-          page = await foOrderHistoryPage.closePage(browserContext, page, 0);
+          page = await orderHistoryPage.closePage(browserContext, page, 0);
 
           const pageTitle = await ordersPage.getPageTitle(page);
           await expect(pageTitle).to.contains(ordersPage.pageTitle);
diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/08_chooseAddress.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/08_chooseAddress.ts
index 4ca336f71f260..62b5cc110c8da 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/08_chooseAddress.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/08_chooseAddress.ts
@@ -18,7 +18,7 @@ import {homePage} from '@pages/FO/home';
 import {loginPage as foLoginPage} from '@pages/FO/login';
 import {myAccountPage} from '@pages/FO/myAccount';
 import orderDetailsPage from '@pages/FO/myAccount/orderDetails';
-import orderHistoryPage from '@pages/FO/myAccount/orderHistory';
+import {orderHistoryPage} from '@pages/FO/myAccount/orderHistory';
 
 // Import data
 import Customers from '@data/demo/customers';
diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/06_merchandiseReturnsTab.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/06_merchandiseReturnsTab.ts
index 50b95efbf84b8..1f91d8b31561f 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/06_merchandiseReturnsTab.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/06_merchandiseReturnsTab.ts
@@ -20,7 +20,7 @@ import {loginPage as foLoginPage} from '@pages/FO/login';
 import {myAccountPage} from '@pages/FO/myAccount';
 import foMerchandiseReturnsPage from '@pages/FO/myAccount/merchandiseReturns';
 import orderDetailsPage from '@pages/FO/myAccount/orderDetails';
-import orderHistoryPage from '@pages/FO/myAccount/orderHistory';
+import {orderHistoryPage} from '@pages/FO/myAccount/orderHistory';
 
 // Import data
 import Customers from '@data/demo/customers';
diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/07_messagesBlock.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/07_messagesBlock.ts
index 79cc158ec3f98..9a583947c0cc0 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/07_messagesBlock.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/07_messagesBlock.ts
@@ -18,7 +18,7 @@ import foOrderConfirmationPage from '@pages/FO/checkout/orderConfirmation';
 import {homePage as foHomePage} from '@pages/FO/home';
 import {loginPage as foLoginPage} from '@pages/FO/login';
 import {myAccountPage} from '@pages/FO/myAccount';
-import foOrderHistoryPage from '@pages/FO/myAccount/orderHistory';
+import {orderHistoryPage} from '@pages/FO/myAccount/orderHistory';
 
 // Import data
 import Customers from '@data/demo/customers';
@@ -202,26 +202,26 @@ describe('BO - Orders - View and edit order : Check messages block', async () =>
       await foHomePage.goToMyAccountPage(page);
       await myAccountPage.goToHistoryAndDetailsPage(page);
 
-      const pageTitle = await foOrderHistoryPage.getPageTitle(page);
-      await expect(pageTitle, 'Fail to open order history page').to.contains(foOrderHistoryPage.pageTitle);
+      const pageTitle = await orderHistoryPage.getPageTitle(page);
+      await expect(pageTitle, 'Fail to open order history page').to.contains(orderHistoryPage.pageTitle);
     });
 
     it('should go to the first order in the list and check order message', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkOrderMessageBlock1', baseContext);
 
-      await foOrderHistoryPage.goToDetailsPage(page, 1);
+      await orderHistoryPage.goToDetailsPage(page, 1);
 
-      const isBoxMessagesVisible = await foOrderHistoryPage.isBoxMessagesSectionVisible(page);
+      const isBoxMessagesVisible = await orderHistoryPage.isBoxMessagesSectionVisible(page);
       await expect(isBoxMessagesVisible, 'Box messages is not visible!').to.be.true;
 
-      const isMessageRowVisible = await foOrderHistoryPage.isMessageRowVisible(page);
+      const isMessageRowVisible = await orderHistoryPage.isMessageRowVisible(page);
       await expect(isMessageRowVisible, 'Message is not visible!').to.be.true;
     });
 
     it('should check the message text', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkOrderMessageBlock2', baseContext);
 
-      const message = await foOrderHistoryPage.getMessageRow(page);
+      const message = await orderHistoryPage.getMessageRow(page);
       await expect(message)
         .to.contain(today)
         .and.to.contain(`${Employees.DefaultEmployee.firstName} ${Employees.DefaultEmployee.lastName}`)
@@ -324,17 +324,17 @@ describe('BO - Orders - View and edit order : Check messages block', async () =>
       await foHomePage.goToMyAccountPage(page);
       await myAccountPage.goToHistoryAndDetailsPage(page);
 
-      const pageTitle = await foOrderHistoryPage.getPageTitle(page);
-      await expect(pageTitle, 'Fail to open order history page').to.contains(foOrderHistoryPage.pageTitle);
+      const pageTitle = await orderHistoryPage.getPageTitle(page);
+      await expect(pageTitle, 'Fail to open order history page').to.contains(orderHistoryPage.pageTitle);
     });
 
     it('should go to the first order in the list and check that new message is not visible', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkOrderMessageBlock3', baseContext);
 
-      await foOrderHistoryPage.goToDetailsPage(page, 1);
+      await orderHistoryPage.goToDetailsPage(page, 1);
 
       // New message is on the first row
-      const message = await foOrderHistoryPage.getMessageRow(page, 1);
+      const message = await orderHistoryPage.getMessageRow(page, 1);
       await expect(message, 'Second message is not visible!').to.not.contain(secondMessageData.message);
     });
   });
@@ -344,15 +344,15 @@ describe('BO - Orders - View and edit order : Check messages block', async () =>
     it('should send message', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'sendMessage2', baseContext);
 
-      const alertMessage = await foOrderHistoryPage.sendMessage(page, messageToSendData);
-      expect(alertMessage, 'Success message is not displayed!').to.equal(foOrderHistoryPage.messageSuccessSent);
+      const alertMessage = await orderHistoryPage.sendMessage(page, messageToSendData);
+      expect(alertMessage, 'Success message is not displayed!').to.equal(orderHistoryPage.messageSuccessSent);
     });
 
     it('should go back to BO', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'goBackToBo2', baseContext);
 
       // Close page and init page objects
-      page = await foOrderHistoryPage.closePage(browserContext, page, 0);
+      page = await orderHistoryPage.closePage(browserContext, page, 0);
 
       const pageTitle = await orderPageMessagesBlock.getPageTitle(page);
       await expect(pageTitle, 'Fail to go back to BO!').to.contains(orderPageMessagesBlock.pageTitle);
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/02_categories/02_CRUDCategoryInBO.ts b/tests/UI/campaigns/functional/BO/03_catalog/02_categories/02_CRUDCategoryInBO.ts
index 63388255b0171..520b1dd04c049 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/02_categories/02_CRUDCategoryInBO.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/02_categories/02_CRUDCategoryInBO.ts
@@ -14,7 +14,7 @@ import dashboardPage from '@pages/BO/dashboard';
 // Import FO pages
 import categoryPage from '@pages/FO/category';
 import {homePage as foHomePage} from '@pages/FO/home';
-import siteMapPage from '@pages/FO/siteMap';
+import {siteMapPage} from '@pages/FO/siteMap';
 
 // Import data
 import CategoryData from '@data/faker/category';
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/02_categories/08_editHomeCategory.ts b/tests/UI/campaigns/functional/BO/03_catalog/02_categories/08_editHomeCategory.ts
index de86a4b983ee5..fa0a770f5b24e 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/02_categories/08_editHomeCategory.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/02_categories/08_editHomeCategory.ts
@@ -14,7 +14,7 @@ import dashboardPage from '@pages/BO/dashboard';
 // Import FO pages
 import categoryPage from '@pages/FO/category';
 import {homePage as foHomePage} from '@pages/FO/home';
-import siteMapPage from '@pages/FO/siteMap';
+import {siteMapPage} from '@pages/FO/siteMap';
 
 // Import data
 import Categories from '@data/demo/categories';
diff --git a/tests/UI/campaigns/functional/BO/04_customers/02_addresses/06_setRequiredFields.ts b/tests/UI/campaigns/functional/BO/04_customers/02_addresses/06_setRequiredFields.ts
index 0558fd60bbdea..92752e8f59c11 100644
--- a/tests/UI/campaigns/functional/BO/04_customers/02_addresses/06_setRequiredFields.ts
+++ b/tests/UI/campaigns/functional/BO/04_customers/02_addresses/06_setRequiredFields.ts
@@ -13,8 +13,8 @@ import dashboardPage from '@pages/BO/dashboard';
 import {homePage as foHomePage} from '@pages/FO/home';
 import {loginPage as foLoginPage} from '@pages/FO/login';
 import {myAccountPage} from '@pages/FO/myAccount';
-import foAddressesPage from '@pages/FO/myAccount/addresses';
-import foAddAddressesPage from '@pages/FO/myAccount/addAddress';
+import {addressesPage as foAddressesPage} from '@pages/FO/myAccount/addresses';
+import {addAddressPage} from '@pages/FO/myAccount/addAddress';
 
 // Import data
 import Customers from '@data/demo/customers';
@@ -115,23 +115,23 @@ describe('BO - Customers - Addresses : Set required fields for addresses', async
 
       await foAddressesPage.openNewAddressForm(page);
 
-      const pageHeaderTitle = await foAddAddressesPage.getHeaderTitle(page);
-      await expect(pageHeaderTitle).to.equal(foAddAddressesPage.creationFormTitle);
+      const pageHeaderTitle = await addAddressPage.getHeaderTitle(page);
+      await expect(pageHeaderTitle).to.equal(addAddressPage.creationFormTitle);
     });
 
     it('should check if \'Vat number\' is required', async function () {
       await testContext.addContextItem(this, 'testIdentifier', `checkOptionalLabel${index}`, baseContext);
 
-      const result = await foAddAddressesPage.isVatNumberRequired(page);
+      const result = await addAddressPage.isVatNumberRequired(page);
       await expect(result).to.equal(test.args.exist);
     });
 
     it('should sign out from FO', async function () {
       await testContext.addContextItem(this, 'testIdentifier', `signOutFO${index}`, baseContext);
 
-      await foAddAddressesPage.logout(page);
+      await addAddressPage.logout(page);
 
-      const isCustomerConnected = await foAddAddressesPage.isCustomerConnected(page);
+      const isCustomerConnected = await addAddressPage.isCustomerConnected(page);
       await expect(isCustomerConnected, 'Customer is connected').to.be.false;
     });
 
@@ -139,7 +139,7 @@ describe('BO - Customers - Addresses : Set required fields for addresses', async
       await testContext.addContextItem(this, 'testIdentifier', `goBackToBO${index}`, baseContext);
 
       // Go back to BO
-      page = await foAddAddressesPage.closePage(browserContext, page, 0);
+      page = await addAddressPage.closePage(browserContext, page, 0);
 
       const pageTitle = await addressesPage.getPageTitle(page);
       await expect(pageTitle).to.contains(addressesPage.pageTitle);
diff --git a/tests/UI/campaigns/functional/BO/05_customerService/03_merchandiseReturns/01_merchandiseReturnOptions.ts b/tests/UI/campaigns/functional/BO/05_customerService/03_merchandiseReturns/01_merchandiseReturnOptions.ts
index ec379253e019e..7e821d8c430a8 100644
--- a/tests/UI/campaigns/functional/BO/05_customerService/03_merchandiseReturns/01_merchandiseReturnOptions.ts
+++ b/tests/UI/campaigns/functional/BO/05_customerService/03_merchandiseReturns/01_merchandiseReturnOptions.ts
@@ -20,7 +20,7 @@ import {loginPage as foLoginPage} from '@pages/FO/login';
 import {myAccountPage} from '@pages/FO/myAccount';
 import foMerchandiseReturnsPage from '@pages/FO/myAccount/merchandiseReturns';
 import orderDetailsPage from '@pages/FO/myAccount/orderDetails';
-import orderHistoryPage from '@pages/FO/myAccount/orderHistory';
+import {orderHistoryPage} from '@pages/FO/myAccount/orderHistory';
 import productPage from '@pages/FO/product';
 
 // Import data
diff --git a/tests/UI/campaigns/functional/BO/05_customerService/03_merchandiseReturns/02_deleteProduct.ts b/tests/UI/campaigns/functional/BO/05_customerService/03_merchandiseReturns/02_deleteProduct.ts
index ee5e4a37193d6..57b860256880c 100644
--- a/tests/UI/campaigns/functional/BO/05_customerService/03_merchandiseReturns/02_deleteProduct.ts
+++ b/tests/UI/campaigns/functional/BO/05_customerService/03_merchandiseReturns/02_deleteProduct.ts
@@ -21,7 +21,7 @@ import {loginPage as foLoginPage} from '@pages/FO/login';
 import {myAccountPage} from '@pages/FO/myAccount';
 import foMerchandiseReturnsPage from '@pages/FO/myAccount/merchandiseReturns';
 import orderDetailsPage from '@pages/FO/myAccount/orderDetails';
-import orderHistoryPage from '@pages/FO/myAccount/orderHistory';
+import {orderHistoryPage} from '@pages/FO/myAccount/orderHistory';
 
 // Import data
 import Customers from '@data/demo/customers';
diff --git a/tests/UI/campaigns/functional/BO/05_customerService/03_merchandiseReturns/03_updateStatus.ts b/tests/UI/campaigns/functional/BO/05_customerService/03_merchandiseReturns/03_updateStatus.ts
index a66a4fb3f13ce..3494dbd3392c2 100644
--- a/tests/UI/campaigns/functional/BO/05_customerService/03_merchandiseReturns/03_updateStatus.ts
+++ b/tests/UI/campaigns/functional/BO/05_customerService/03_merchandiseReturns/03_updateStatus.ts
@@ -23,7 +23,7 @@ import {loginPage as foLoginPage} from '@pages/FO/login';
 import {myAccountPage} from '@pages/FO/myAccount';
 import foMerchandiseReturnsPage from '@pages/FO/myAccount/merchandiseReturns';
 import orderDetailsPage from '@pages/FO/myAccount/orderDetails';
-import orderHistoryPage from '@pages/FO/myAccount/orderHistory';
+import {orderHistoryPage} from '@pages/FO/myAccount/orderHistory';
 
 // Import data
 import Customers from '@data/demo/customers';
diff --git a/tests/UI/campaigns/functional/BO/08_design/04_pages/01_CRUDPageCategory.ts b/tests/UI/campaigns/functional/BO/08_design/04_pages/01_CRUDPageCategory.ts
index aed7aa9f0cbe4..df3fddac8c57b 100644
--- a/tests/UI/campaigns/functional/BO/08_design/04_pages/01_CRUDPageCategory.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/04_pages/01_CRUDPageCategory.ts
@@ -14,7 +14,7 @@ import addPageCategoryPage from '@pages/BO/design/pages/pageCategory/add';
 // Import FO pages
 import cmsPage from '@pages/FO/cms';
 import {homePage as foHomePage} from '@pages/FO/home';
-import siteMapPage from '@pages/FO/siteMap';
+import {siteMapPage} from '@pages/FO/siteMap';
 
 // Import data
 import CMSCategoryData from '@data/faker/CMScategory';
diff --git a/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/15_checkStoreImageFormat.ts b/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/15_checkStoreImageFormat.ts
index 2c08c1438da1c..86b9eb8bee05c 100644
--- a/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/15_checkStoreImageFormat.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/15_checkStoreImageFormat.ts
@@ -16,7 +16,7 @@ import storesPage from '@pages/BO/shopParameters/stores';
 import createStoresPage from '@pages/BO/shopParameters/stores/add';
 // Import FO pages
 import {homePage} from '@pages/FO/home';
-import storePage from '@pages/FO/stores';
+import {storesPage as storePage} from '@pages/FO/stores';
 
 // Import data
 import StoreData from '@data/faker/store';
diff --git a/tests/UI/campaigns/functional/BO/11_international/02_locations/02_countries/02_CRUDCountry.ts b/tests/UI/campaigns/functional/BO/11_international/02_locations/02_countries/02_CRUDCountry.ts
index 3d67a4b36409f..0e4b10cfd2c44 100644
--- a/tests/UI/campaigns/functional/BO/11_international/02_locations/02_countries/02_CRUDCountry.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/02_locations/02_countries/02_CRUDCountry.ts
@@ -15,8 +15,8 @@ import addCountryPage from '@pages/BO/international/locations/countries/add';
 import {homePage as foHomePage} from '@pages/FO/home';
 import {loginPage as foLoginPage} from '@pages/FO/login';
 import {myAccountPage} from '@pages/FO/myAccount';
-import foAddressesPage from '@pages/FO/myAccount/addresses';
-import foNewAddressesPage from '@pages/FO/myAccount/addAddress';
+import {addressesPage} from '@pages/FO/myAccount/addresses';
+import {addAddressPage} from '@pages/FO/myAccount/addAddress';
 
 // Import data
 import Customers from '@data/demo/customers';
@@ -172,25 +172,25 @@ describe('BO - International - Countries : CRUD country', async () => {
       await foHomePage.goToMyAccountPage(page);
       await myAccountPage.goToAddressesPage(page);
 
-      const pageTitle = await foAddressesPage.getPageTitle(page);
-      await expect(pageTitle, 'Fail to open addresses page').to.contains(foAddressesPage.pageTitle);
+      const pageTitle = await addressesPage.getPageTitle(page);
+      await expect(pageTitle, 'Fail to open addresses page').to.contains(addressesPage.pageTitle);
     });
 
     it(`should check that the new country '${createCountryData.name}' exist`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkIsNewCountryExist', baseContext);
 
-      await foAddressesPage.openNewAddressForm(page);
+      await addressesPage.openNewAddressForm(page);
 
-      const countryExist = await foNewAddressesPage.countryExist(page, createCountryData.name);
+      const countryExist = await addAddressPage.countryExist(page, createCountryData.name);
       await expect(countryExist, 'Country does not exist').to.be.true;
     });
 
     it('should sign out from FO', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'sighOutFO_1', baseContext);
 
-      await foAddressesPage.logout(page);
+      await addressesPage.logout(page);
 
-      const isCustomerConnected = await foAddressesPage.isCustomerConnected(page);
+      const isCustomerConnected = await addressesPage.isCustomerConnected(page);
       await expect(isCustomerConnected, 'Customer is connected').to.be.false;
     });
 
@@ -275,16 +275,16 @@ describe('BO - International - Countries : CRUD country', async () => {
       await foHomePage.goToMyAccountPage(page);
       await myAccountPage.goToAddressesPage(page);
 
-      const pageTitle = await foAddressesPage.getPageTitle(page);
-      await expect(pageTitle, 'Fail to open addresses page').to.contains(foAddressesPage.pageTitle);
+      const pageTitle = await addressesPage.getPageTitle(page);
+      await expect(pageTitle, 'Fail to open addresses page').to.contains(addressesPage.pageTitle);
     });
 
     it(`should check that the edited country '${editCountryData.name}' not exist`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkIsCountryNotExist', baseContext);
 
-      await foAddressesPage.openNewAddressForm(page);
+      await addressesPage.openNewAddressForm(page);
 
-      const countryExist = await foNewAddressesPage.countryExist(page, editCountryData.name);
+      const countryExist = await addAddressPage.countryExist(page, editCountryData.name);
       await expect(countryExist, 'Country exist').to.be.false;
     });
 
diff --git a/tests/UI/campaigns/functional/BO/11_international/02_locations/02_countries/05_countriesRestrictions.ts b/tests/UI/campaigns/functional/BO/11_international/02_locations/02_countries/05_countriesRestrictions.ts
index 797b64f66d6b2..b8624cff81427 100644
--- a/tests/UI/campaigns/functional/BO/11_international/02_locations/02_countries/05_countriesRestrictions.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/02_locations/02_countries/05_countriesRestrictions.ts
@@ -14,8 +14,8 @@ import countriesPage from '@pages/BO/international/locations/countries';
 import {homePage} from '@pages/FO/home';
 import {loginPage as foLoginPage} from '@pages/FO/login';
 import {myAccountPage} from '@pages/FO/myAccount';
-import addressesPage from '@pages/FO/myAccount/addresses';
-import newAddressesPage from '@pages/FO/myAccount/addAddress';
+import {addressesPage} from '@pages/FO/myAccount/addresses';
+import {addAddressPage} from '@pages/FO/myAccount/addAddress';
 
 // Import data
 import Countries from '@data/demo/countries';
@@ -156,7 +156,7 @@ describe('BO - International - Countries : Restrict country selections in front
 
       await addressesPage.openNewAddressForm(page);
 
-      const countryExist = await newAddressesPage.countryExist(page, Countries.afghanistan.name);
+      const countryExist = await addAddressPage.countryExist(page, Countries.afghanistan.name);
       await expect(countryExist).to.equal(status.args.isCountryVisible);
     });
 
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/01_general/general/08_enableDisableSuppliers.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/01_general/general/08_enableDisableSuppliers.ts
index 2b5ab089d8a4f..58757dba1b1a1 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/01_general/general/08_enableDisableSuppliers.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/01_general/general/08_enableDisableSuppliers.ts
@@ -13,7 +13,7 @@ import brandsPage from '@pages/BO/catalog/brands';
 import suppliersPage from '@pages/BO/catalog/suppliers';
 // Import FO pages
 import {homePage} from '@pages/FO/home';
-import siteMapPage from '@pages/FO/siteMap';
+import {siteMapPage} from '@pages/FO/siteMap';
 
 import {expect} from 'chai';
 import type {BrowserContext, Page} from 'playwright';
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/01_general/general/09_enableDisableBrands.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/01_general/general/09_enableDisableBrands.ts
index 742936fc9166c..815462ee19a77 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/01_general/general/09_enableDisableBrands.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/01_general/general/09_enableDisableBrands.ts
@@ -10,7 +10,7 @@ import dashboardPage from '@pages/BO/dashboard';
 import generalPage from '@pages/BO/shopParameters/general';
 import brandsPage from '@pages/BO/catalog/brands';
 import {homePage} from '@pages/FO/home';
-import siteMapPage from '@pages/FO/siteMap';
+import {siteMapPage} from '@pages/FO/siteMap';
 
 import {expect} from 'chai';
 import type {BrowserContext, Page} from 'playwright';
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/general/03_disableReorderingOption.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/general/03_disableReorderingOption.ts
index 39cc9a32a49ea..b514548c42ec9 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/general/03_disableReorderingOption.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/general/03_disableReorderingOption.ts
@@ -13,7 +13,7 @@ import orderSettingsPage from '@pages/BO/shopParameters/orderSettings';
 import {loginPage as foLoginPage} from '@pages/FO/login';
 import {homePage} from '@pages/FO/home';
 import {myAccountPage} from '@pages/FO/myAccount';
-import orderHistoryPage from '@pages/FO/myAccount/orderHistory';
+import {orderHistoryPage} from '@pages/FO/myAccount/orderHistory';
 
 // Import data
 import Customers from '@data/demo/customers';
diff --git a/tests/UI/campaigns/functional/BO/15_header/08_checkNotifications.ts b/tests/UI/campaigns/functional/BO/15_header/08_checkNotifications.ts
index 912e7d73ece53..ac4b8571c2fac 100644
--- a/tests/UI/campaigns/functional/BO/15_header/08_checkNotifications.ts
+++ b/tests/UI/campaigns/functional/BO/15_header/08_checkNotifications.ts
@@ -12,7 +12,7 @@ import ordersPage from '@pages/BO/orders';
 import {homePage} from '@pages/FO/home';
 import {loginPage as foLoginPage} from '@pages/FO/login';
 import {myAccountPage} from '@pages/FO/myAccount';
-import foOrderHistoryPage from '@pages/FO/myAccount/orderHistory';
+import {orderHistoryPage} from '@pages/FO/myAccount/orderHistory';
 import orderDetails from '@pages/FO/myAccount/orderDetails';
 import customerServicePage from '@pages/BO/customerService/customerService';
 import viewOrderMessagePage from '@pages/BO/customerService/orderMessages/add';
@@ -159,14 +159,14 @@ describe('BO - Header : Check notifications', async () => {
       await homePage.goToMyAccountPage(page);
       await myAccountPage.goToHistoryAndDetailsPage(page);
 
-      const pageHeaderTitle = await foOrderHistoryPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(foOrderHistoryPage.pageTitle);
+      const pageHeaderTitle = await orderHistoryPage.getPageTitle(page);
+      await expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
     });
 
     it('Go to order details and send message', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'sendMessage', baseContext);
 
-      await foOrderHistoryPage.goToDetailsPage(page);
+      await orderHistoryPage.goToDetailsPage(page);
 
       const successMessageText = await orderDetails.addAMessage(page, messageOption, messageSend);
       await expect(successMessageText).to.equal(orderDetails.successMessageText);
diff --git a/tests/UI/campaigns/functional/FO/classic/02_headerAndFooter/02_checkLinksInFooter.ts b/tests/UI/campaigns/functional/FO/classic/02_headerAndFooter/02_checkLinksInFooter.ts
index d9abdd168030f..875707c0b29ae 100644
--- a/tests/UI/campaigns/functional/FO/classic/02_headerAndFooter/02_checkLinksInFooter.ts
+++ b/tests/UI/campaigns/functional/FO/classic/02_headerAndFooter/02_checkLinksInFooter.ts
@@ -10,27 +10,27 @@ import {createAccountTest} from '@commonTests/FO/account';
 // Import pages
 // Import BO pages
 // Import FO pages
-import aboutUsPage from '@pages/FO/aboutUs';
-import bestSalesPage from '@pages/FO/bestSales';
+import {aboutUsPage} from '@pages/FO/aboutUs';
+import {bestSalesPage} from '@pages/FO/bestSales';
 import {contactUsPage} from '@pages/FO/contactUs';
-import deliveryPage from '@pages/FO/delivery';
+import {deliveryPage} from '@pages/FO/delivery';
 import {homePage} from '@pages/FO/home';
-import legalNoticePage from '@pages/FO/legalNotice';
+import {legalNoticePage} from '@pages/FO/legalNotice';
 import {loginPage} from '@pages/FO/login';
 import {createAccountPage} from '@pages/FO/myAccount/add';
-import addAddressPage from '@pages/FO/myAccount/addAddress';
-import addressesPage from '@pages/FO/myAccount/addresses';
-import creditSlipsPage from '@pages/FO/myAccount/creditSlips';
-import personalInfoPage from '@pages/FO/myAccount/identity';
-import myWishlistPage from '@pages/FO/myAccount/myWishlists';
-import ordersPage from '@pages/FO/myAccount/orderHistory';
-import guestOrderTrackingPage from '@pages/FO/orderTracking/guestOrderTracking';
-import newProductsPage from '@pages/FO/newProducts';
-import pricesDropPage from '@pages/FO/pricesDrop';
-import securePaymentPage from '@pages/FO/securePayment';
-import siteMapPage from '@pages/FO/siteMap';
-import storesPage from '@pages/FO/stores';
-import termsAndConditionsOfUsePage from '@pages/FO/termsAndConditionsOfUse';
+import {addAddressPage} from '@pages/FO/myAccount/addAddress';
+import {addressesPage} from '@pages/FO/myAccount/addresses';
+import {creditSlipPage} from '@pages/FO/myAccount/creditSlips';
+import {accountIdentityPage} from '@pages/FO/myAccount/identity';
+import {myWishlistsPage} from '@pages/FO/myAccount/myWishlists';
+import {orderHistoryPage} from '@pages/FO/myAccount/orderHistory';
+import {guestOrderTrackingPage} from '@pages/FO/orderTracking/guestOrderTracking';
+import {newProductsPage} from '@pages/FO/newProducts';
+import {pricesDropPage} from '@pages/FO/pricesDrop';
+import {securePaymentPage} from '@pages/FO/securePayment';
+import {siteMapPage} from '@pages/FO/siteMap';
+import {storesPage} from '@pages/FO/stores';
+import {termsAndConditionsOfUsePage} from '@pages/FO/termsAndConditionsOfUse';
 
 // Import data
 import Customers from '@data/demo/customers';
@@ -165,11 +165,11 @@ describe('FO - Header and Footer : Check links in footer page', async () => {
     });
 
     [
-      {linkSelector: 'Information', pageTitle: personalInfoPage.pageTitle},
+      {linkSelector: 'Information', pageTitle: accountIdentityPage.pageTitle},
       {linkSelector: 'Addresses', pageTitle: addressesPage.pageTitle},
-      {linkSelector: 'Orders', pageTitle: ordersPage.pageTitle},
-      {linkSelector: 'Credit slips', pageTitle: creditSlipsPage.pageTitle},
-      {linkSelector: 'Wishlist', pageTitle: myWishlistPage.pageTitle},
+      {linkSelector: 'Orders', pageTitle: orderHistoryPage.pageTitle},
+      {linkSelector: 'Credit slips', pageTitle: creditSlipPage.pageTitle},
+      {linkSelector: 'Wishlist', pageTitle: myWishlistsPage.pageTitle},
       {linkSelector: 'Sign out', pageTitle: loginPage.pageTitle},
     ].forEach((args, index: number) => {
       it(`should check '${args.linkSelector}' footer links`, async function () {
@@ -179,7 +179,7 @@ describe('FO - Header and Footer : Check links in footer page', async () => {
         await homePage.goToFooterLink(page, args.linkSelector);
 
         if (args.linkSelector === 'Wishlist') {
-          pageTitle = await myWishlistPage.getPageTitle(page);
+          pageTitle = await myWishlistsPage.getPageTitle(page);
         } else {
           pageTitle = await homePage.getPageTitle(page);
         }
@@ -203,11 +203,11 @@ describe('FO - Header and Footer : Check links in footer page', async () => {
     });
 
     [
-      {linkSelector: 'Information', pageTitle: personalInfoPage.pageTitle},
+      {linkSelector: 'Information', pageTitle: accountIdentityPage.pageTitle},
       {linkSelector: 'Add first address', pageTitle: addAddressPage.pageTitle},
-      {linkSelector: 'Orders', pageTitle: ordersPage.pageTitle},
-      {linkSelector: 'Credit slips', pageTitle: creditSlipsPage.pageTitle},
-      {linkSelector: 'Wishlist', pageTitle: myWishlistPage.pageTitle},
+      {linkSelector: 'Orders', pageTitle: orderHistoryPage.pageTitle},
+      {linkSelector: 'Credit slips', pageTitle: creditSlipPage.pageTitle},
+      {linkSelector: 'Wishlist', pageTitle: myWishlistsPage.pageTitle},
       {linkSelector: 'Sign out', pageTitle: loginPage.pageTitle},
     ].forEach((args, index: number) => {
       it(`should check '${args.linkSelector}' footer links`, async function () {
@@ -217,7 +217,7 @@ describe('FO - Header and Footer : Check links in footer page', async () => {
         await homePage.goToFooterLink(page, args.linkSelector);
 
         if (args.linkSelector === 'Wishlist') {
-          pageTitle = await myWishlistPage.getPageTitle(page);
+          pageTitle = await myWishlistsPage.getPageTitle(page);
         } else {
           pageTitle = await homePage.getPageTitle(page);
         }
diff --git a/tests/UI/campaigns/functional/FO/classic/03_userAccount/01_creditSlips/01_consultCreditSlip.ts b/tests/UI/campaigns/functional/FO/classic/03_userAccount/01_creditSlips/01_consultCreditSlip.ts
index 79dcf035c2acc..6680749ebb68f 100644
--- a/tests/UI/campaigns/functional/FO/classic/03_userAccount/01_creditSlips/01_consultCreditSlip.ts
+++ b/tests/UI/campaigns/functional/FO/classic/03_userAccount/01_creditSlips/01_consultCreditSlip.ts
@@ -15,9 +15,6 @@ import {createOrderByCustomerTest} from '@commonTests/FO/order';
 // Import pages
 // Import BO pages
 import dashboardPage from '@pages/BO/dashboard';
-import {myAccountPage} from '@pages/FO/myAccount';
-import creditSlipsPage from '@pages/FO/myAccount/creditSlips';
-import orderDetailsPage from '@pages/FO/myAccount/orderDetails';
 import ordersPage from '@pages/BO/orders';
 import viewOrderProductsBlockPage from '@pages/BO/orders/view/productsBlock';
 import orderPageTabListBlock from '@pages/BO/orders/view/tabListBlock';
@@ -25,6 +22,9 @@ import {viewOrderBasePage} from '@pages/BO/orders/view/viewOrderBasePage';
 // Import FO pages
 import {homePage} from '@pages/FO/home';
 import {loginPage} from '@pages/FO/login';
+import {myAccountPage} from '@pages/FO/myAccount';
+import {creditSlipPage} from '@pages/FO/myAccount/creditSlips';
+import orderDetailsPage from '@pages/FO/myAccount/orderDetails';
 
 // Import data
 import OrderStatuses from '@data/demo/orderStatuses';
@@ -150,19 +150,19 @@ describe('FO - Consult credit slip list & View PDF Credit slip & View order', as
       });
 
       it('should go credit slips page', async function () {
-        await testContext.addContextItem(this, 'testIdentifier', 'goToCreditSlipsPage1', baseContext);
+        await testContext.addContextItem(this, 'testIdentifier', 'goTocreditSlipPage1', baseContext);
 
         await myAccountPage.goToCreditSlipsPage(page);
 
-        const pageTitle = await creditSlipsPage.getPageTitle(page);
-        await expect(pageTitle).to.equal(creditSlipsPage.pageTitle);
+        const pageTitle = await creditSlipPage.getPageTitle(page);
+        await expect(pageTitle).to.equal(creditSlipPage.pageTitle);
       });
 
       it('should check there no credit slips', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkNoCreditSlips', baseContext);
 
-        const alertInfoMessage = await creditSlipsPage.getAlertInfoMessage(page);
-        await expect(alertInfoMessage).to.equal(creditSlipsPage.noCreditSlipsInfoMessage);
+        const alertInfoMessage = await creditSlipPage.getAlertInfoMessage(page);
+        await expect(alertInfoMessage).to.equal(creditSlipPage.noCreditSlipsInfoMessage);
       });
     });
 
@@ -275,38 +275,38 @@ describe('FO - Consult credit slip list & View PDF Credit slip & View order', as
       });
 
       it('should go credit slips page', async function () {
-        await testContext.addContextItem(this, 'testIdentifier', 'goToCreditSlipsPage2', baseContext);
+        await testContext.addContextItem(this, 'testIdentifier', 'goTocreditSlipPage2', baseContext);
 
         await myAccountPage.goToCreditSlipsPage(page);
 
-        const pageTitle = await creditSlipsPage.getPageTitle(page);
-        await expect(pageTitle).to.equal(creditSlipsPage.pageTitle);
+        const pageTitle = await creditSlipPage.getPageTitle(page);
+        await expect(pageTitle).to.equal(creditSlipPage.pageTitle);
       });
 
       it('should check the number of credit slips', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkNumberCreditSlips', baseContext);
 
-        const numberCreditSlips = await creditSlipsPage.getNumberOfCreditSlips(page);
+        const numberCreditSlips = await creditSlipPage.getNumberOfCreditSlips(page);
         await expect(numberCreditSlips).to.equal(1);
       });
 
       it('should check that the \'Order reference, Credit Slip ID, Date Issued\' are correct', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkCreditSlipInfo', baseContext);
 
-        const creditSlipOrderReference = await creditSlipsPage.getOrderReference(page, 1);
+        const creditSlipOrderReference = await creditSlipPage.getOrderReference(page, 1);
         await expect(creditSlipOrderReference).to.equal(orderReference);
 
-        const creditSlipOrderIdentifier = await creditSlipsPage.getCreditSlipID(page, 1);
+        const creditSlipOrderIdentifier = await creditSlipPage.getCreditSlipID(page, 1);
         await expect(parseInt(creditSlipOrderIdentifier.replace('#', ''), 10)).to.equal(parseInt(creditSlipID, 10));
 
-        const creditSlipDateIssued = await creditSlipsPage.getDateIssued(page, 1);
+        const creditSlipDateIssued = await creditSlipPage.getDateIssued(page, 1);
         await expect(creditSlipDateIssued).to.equal(dateIssued);
       });
 
       it('should click on the PDF Icon on the "View credit slip" column', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'clickOnViewCreditSlip', baseContext);
 
-        filePath = await creditSlipsPage.downloadCreditSlip(page, 1);
+        filePath = await creditSlipPage.downloadCreditSlip(page, 1);
 
         const found = await files.doesFileExist(filePath);
         await expect(found, 'PDF file was not downloaded').to.be.true;
@@ -346,14 +346,14 @@ describe('FO - Consult credit slip list & View PDF Credit slip & View order', as
       it('should click on the order Reference link', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'clickOrderReferenceLink', baseContext);
 
-        await creditSlipsPage.clickOrderReference(page, 1);
+        await creditSlipPage.clickOrderReference(page, 1);
 
         const pageTitle = await orderDetailsPage.getPageTitle(page);
         await expect(pageTitle).to.equal(orderDetailsPage.pageTitle);
       });
 
       it('should go to credit slips page', async function () {
-        await testContext.addContextItem(this, 'testIdentifier', 'goToCreditSlipsPage3', baseContext);
+        await testContext.addContextItem(this, 'testIdentifier', 'goTocreditSlipPage3', baseContext);
 
         await homePage.goToMyAccountPage(page);
 
@@ -362,32 +362,32 @@ describe('FO - Consult credit slip list & View PDF Credit slip & View order', as
 
         await myAccountPage.goToCreditSlipsPage(page);
 
-        const creditSlipsPageTitle = await creditSlipsPage.getPageTitle(page);
-        await expect(creditSlipsPageTitle).to.equal(creditSlipsPage.pageTitle);
+        const creditSlipPageTitle = await creditSlipPage.getPageTitle(page);
+        await expect(creditSlipPageTitle).to.equal(creditSlipPage.pageTitle);
       });
 
       it('should click on the "Back to your account" link', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'clickBackToYourAccountLink', baseContext);
 
-        await creditSlipsPage.clickBackToYourAccountLink(page);
+        await creditSlipPage.clickBackToYourAccountLink(page);
 
         const myAccountPageTitle = await myAccountPage.getPageTitle(page);
         await expect(myAccountPageTitle).to.equal(myAccountPage.pageTitle);
       });
 
       it('should go to credit slips page', async function () {
-        await testContext.addContextItem(this, 'testIdentifier', 'goToCreditSlipsPage4', baseContext);
+        await testContext.addContextItem(this, 'testIdentifier', 'goTocreditSlipPage4', baseContext);
 
         await myAccountPage.goToCreditSlipsPage(page);
 
-        const creditSlipsPageTitle = await creditSlipsPage.getPageTitle(page);
-        await expect(creditSlipsPageTitle).to.equal(creditSlipsPage.pageTitle);
+        const creditSlipPageTitle = await creditSlipPage.getPageTitle(page);
+        await expect(creditSlipPageTitle).to.equal(creditSlipPage.pageTitle);
       });
 
       it('should click on the "Home" link', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'clickHomeLink', baseContext);
 
-        await creditSlipsPage.clickHomeLink(page);
+        await creditSlipPage.clickHomeLink(page);
 
         const homePageTitle = await homePage.getPageTitle(page);
         await expect(homePageTitle).to.equal(homePage.pageTitle);
diff --git a/tests/UI/campaigns/functional/FO/classic/03_userAccount/01_editInformation.ts b/tests/UI/campaigns/functional/FO/classic/03_userAccount/01_editInformation.ts
index 8cd4e712019cf..46f7c7277f6a9 100644
--- a/tests/UI/campaigns/functional/FO/classic/03_userAccount/01_editInformation.ts
+++ b/tests/UI/campaigns/functional/FO/classic/03_userAccount/01_editInformation.ts
@@ -10,7 +10,7 @@ import {createAccountTest} from '@commonTests/FO/account';
 import {homePage} from '@pages/FO/home';
 import {loginPage} from '@pages/FO/login';
 import {myAccountPage} from '@pages/FO/myAccount';
-import accountIdentityPage from '@pages/FO/myAccount/identity';
+import {accountIdentityPage} from '@pages/FO/myAccount/identity';
 
 // Import data
 import CustomerData from '@data/faker/customer';
diff --git a/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_CRUDAddress.ts b/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_CRUDAddress.ts
index 83c0b0d92e6b9..5145071a27959 100644
--- a/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_CRUDAddress.ts
+++ b/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_CRUDAddress.ts
@@ -13,8 +13,8 @@ import checkoutPage from '@pages/FO/checkout';
 import {homePage} from '@pages/FO/home';
 import {loginPage} from '@pages/FO/login';
 import {myAccountPage} from '@pages/FO/myAccount';
-import addAddressPage from '@pages/FO/myAccount/addAddress';
-import addressesPage from '@pages/FO/myAccount/addresses';
+import {addAddressPage} from '@pages/FO/myAccount/addAddress';
+import {addressesPage} from '@pages/FO/myAccount/addresses';
 import productPage from '@pages/FO/product';
 
 // Import data
diff --git a/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_consultOrderList.ts b/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_consultOrderList.ts
index 2f5fcf2fd351f..3a5440b93d269 100644
--- a/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_consultOrderList.ts
+++ b/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_consultOrderList.ts
@@ -12,7 +12,7 @@ import {createOrderByCustomerTest} from '@commonTests/FO/order';
 // Import FO pages
 import {homePage as foHomePage} from '@pages/FO/home';
 import {loginPage as foLoginPage} from '@pages/FO/login';
-import foOrderHistoryPage from '@pages/FO/myAccount/orderHistory';
+import {orderHistoryPage} from '@pages/FO/myAccount/orderHistory';
 import {myAccountPage} from '@pages/FO/myAccount';
 
 // Import data
@@ -115,14 +115,14 @@ describe('FO - Account - Order history : Consult order list', async () => {
       await foHomePage.goToMyAccountPage(page);
       await myAccountPage.goToHistoryAndDetailsPage(page);
 
-      const pageHeaderTitle: string = await foOrderHistoryPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(foOrderHistoryPage.pageTitle);
+      const pageHeaderTitle: string = await orderHistoryPage.getPageTitle(page);
+      await expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
     });
 
     it('should check number of orders', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkNumberOfOrders1', baseContext);
 
-      const numberOfOrders: number = await foOrderHistoryPage.getNumberOfOrders(page);
+      const numberOfOrders: number = await orderHistoryPage.getNumberOfOrders(page);
       await expect(numberOfOrders).to.equal(0);
     });
   });
@@ -134,23 +134,23 @@ describe('FO - Account - Order history : Consult order list', async () => {
     it('should reload the FO page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'reloadPage', baseContext);
 
-      await foOrderHistoryPage.reloadPage(page);
+      await orderHistoryPage.reloadPage(page);
 
-      const pageHeaderTitle: string = await foOrderHistoryPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(foOrderHistoryPage.pageTitle);
+      const pageHeaderTitle: string = await orderHistoryPage.getPageTitle(page);
+      await expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
     });
 
     it('should check the number of orders', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkNumberOfOrders2', baseContext);
 
-      const numberOfOrders: number = await foOrderHistoryPage.getNumberOfOrders(page);
+      const numberOfOrders: number = await orderHistoryPage.getNumberOfOrders(page);
       await expect(numberOfOrders).to.equal(1);
     });
 
     it('should check the order information', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkOrderInformation', baseContext);
 
-      const result: OrderHistory = await foOrderHistoryPage.getOrderHistoryDetails(page);
+      const result: OrderHistory = await orderHistoryPage.getOrderHistoryDetails(page);
       await Promise.all([
         await expect(result.reference).not.null,
         await expect(result.date).to.equal(today),
@@ -164,7 +164,7 @@ describe('FO - Account - Order history : Consult order list', async () => {
     it('should click on \'Back to you account\' link', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'backToYourAccount', baseContext);
 
-      await foOrderHistoryPage.clickOnBackToYourAccountLink(page);
+      await orderHistoryPage.clickOnBackToYourAccountLink(page);
 
       const pageTitle: string = await myAccountPage.getPageTitle(page);
       await expect(pageTitle).to.equal(myAccountPage.pageTitle);
@@ -175,14 +175,14 @@ describe('FO - Account - Order history : Consult order list', async () => {
 
       await myAccountPage.goToHistoryAndDetailsPage(page);
 
-      const pageHeaderTitle: string = await foOrderHistoryPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(foOrderHistoryPage.pageTitle);
+      const pageHeaderTitle: string = await orderHistoryPage.getPageTitle(page);
+      await expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
     });
 
     it('should click on \'Home\' link', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnHomeLink', baseContext);
 
-      await foOrderHistoryPage.clickOnHomeLink(page);
+      await orderHistoryPage.clickOnHomeLink(page);
 
       const pageTitle: string = await foHomePage.getPageTitle(page);
       await expect(pageTitle).to.equal(foHomePage.pageTitle);
diff --git a/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_orderDetails/01_reorderFromOrderDetail.ts b/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_orderDetails/01_reorderFromOrderDetail.ts
index 812a1312e72f3..581762b731299 100644
--- a/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_orderDetails/01_reorderFromOrderDetail.ts
+++ b/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_orderDetails/01_reorderFromOrderDetail.ts
@@ -12,7 +12,7 @@ import {homePage as foHomePage} from '@pages/FO/home';
 import {loginPage as foLoginPage} from '@pages/FO/login';
 import {myAccountPage} from '@pages/FO/myAccount';
 import orderDetailsPage from '@pages/FO/myAccount/orderDetails';
-import foOrderHistoryPage from '@pages/FO/myAccount/orderHistory';
+import {orderHistoryPage} from '@pages/FO/myAccount/orderHistory';
 
 // Import data
 import Customers from '@data/demo/customers';
@@ -108,14 +108,14 @@ describe('FO - Account - Order details : Reorder from order detail', async () =>
 
       await myAccountPage.goToHistoryAndDetailsPage(page);
 
-      const pageHeaderTitle = await foOrderHistoryPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(foOrderHistoryPage.pageTitle);
+      const pageHeaderTitle = await orderHistoryPage.getPageTitle(page);
+      await expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
     });
 
     it('should go to order details page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'goToFoToOrderDetails', baseContext);
 
-      await foOrderHistoryPage.goToDetailsPage(page);
+      await orderHistoryPage.goToDetailsPage(page);
 
       const pageTitle = await orderDetailsPage.getPageTitle(page);
       await expect(pageTitle).to.equal(orderDetailsPage.pageTitle);
@@ -172,14 +172,14 @@ describe('FO - Account - Order details : Reorder from order detail', async () =>
 
       await myAccountPage.goToHistoryAndDetailsPage(page);
 
-      const pageHeaderTitle = await foOrderHistoryPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(foOrderHistoryPage.pageTitle);
+      const pageHeaderTitle = await orderHistoryPage.getPageTitle(page);
+      await expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
     });
 
     it('should go to order details page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'goBackToFoToOrderDetails', baseContext);
 
-      await foOrderHistoryPage.goToDetailsPage(page);
+      await orderHistoryPage.goToDetailsPage(page);
 
       const pageTitle = await orderDetailsPage.getPageTitle(page);
       await expect(pageTitle).to.equal(orderDetailsPage.pageTitle);
diff --git a/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_orderDetails/02_downloadInvoice.ts b/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_orderDetails/02_downloadInvoice.ts
index db9816a854ab4..d3eea2f18d1c8 100644
--- a/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_orderDetails/02_downloadInvoice.ts
+++ b/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_orderDetails/02_downloadInvoice.ts
@@ -11,7 +11,7 @@ import {createOrderByCustomerTest} from '@commonTests/FO/order';
 import {homePage as foHomePage} from '@pages/FO/home';
 import {loginPage as foLoginPage} from '@pages/FO/login';
 import {myAccountPage} from '@pages/FO/myAccount';
-import foOrderHistoryPage from '@pages/FO/myAccount/orderHistory';
+import {orderHistoryPage} from '@pages/FO/myAccount/orderHistory';
 import invoicesPage from '@pages/BO/orders/invoices';
 import ordersPage from '@pages/BO/orders';
 import orderPageTabListBlock from '@pages/BO/orders/view/tabListBlock';
@@ -156,14 +156,14 @@ describe('FO - Account - Order details : Download invoice', async () => {
 
       await myAccountPage.goToHistoryAndDetailsPage(page);
 
-      const pageHeaderTitle: string = await foOrderHistoryPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(foOrderHistoryPage.pageTitle);
+      const pageHeaderTitle: string = await orderHistoryPage.getPageTitle(page);
+      await expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
     });
 
     it('should go to order details page of the first order in list', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'goToFoToOrderDetails', baseContext);
 
-      await foOrderHistoryPage.goToDetailsPage(page);
+      await orderHistoryPage.goToDetailsPage(page);
 
       const pageTitle: string = await orderDetailsPage.getPageTitle(page);
       await expect(pageTitle).to.equal(orderDetailsPage.pageTitle);
@@ -195,14 +195,14 @@ describe('FO - Account - Order details : Download invoice', async () => {
 
       await myAccountPage.goToHistoryAndDetailsPage(page);
 
-      const pageHeaderTitle: string = await foOrderHistoryPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(foOrderHistoryPage.pageTitle);
+      const pageHeaderTitle: string = await orderHistoryPage.getPageTitle(page);
+      await expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
     });
 
     it('should go to order details page of the second order in list', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'goToFoToOrderDetails2', baseContext);
 
-      await foOrderHistoryPage.goToDetailsPage(page, 2);
+      await orderHistoryPage.goToDetailsPage(page, 2);
 
       const pageTitle: string = await orderDetailsPage.getPageTitle(page);
       await expect(pageTitle).to.equal(orderDetailsPage.pageTitle);
diff --git a/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_orderDetails/03_requestMerchandiseReturn.ts b/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_orderDetails/03_requestMerchandiseReturn.ts
index 6fb4655001fa3..7b17473830f0f 100644
--- a/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_orderDetails/03_requestMerchandiseReturn.ts
+++ b/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_orderDetails/03_requestMerchandiseReturn.ts
@@ -15,7 +15,7 @@ import loginCommon from '@commonTests/BO/loginBO';
 import {homePage as foHomePage} from '@pages/FO/home';
 import {loginPage as foLoginPage} from '@pages/FO/login';
 import {myAccountPage} from '@pages/FO/myAccount';
-import foOrderHistoryPage from '@pages/FO/myAccount/orderHistory';
+import {orderHistoryPage} from '@pages/FO/myAccount/orderHistory';
 import invoicesPage from '@pages/BO/orders/invoices';
 import ordersPage from '@pages/BO/orders';
 import orderPageTabListBlock from '@pages/BO/orders/view/tabListBlock';
@@ -165,14 +165,14 @@ describe('FO - Account - Order details : Request merchandise return', async () =
 
       await myAccountPage.goToHistoryAndDetailsPage(page);
 
-      const pageHeaderTitle = await foOrderHistoryPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(foOrderHistoryPage.pageTitle);
+      const pageHeaderTitle = await orderHistoryPage.getPageTitle(page);
+      await expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
     });
 
     it('should go to order details page of the first order in list', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'goToFoToOrderDetails', baseContext);
 
-      await foOrderHistoryPage.goToDetailsPage(page);
+      await orderHistoryPage.goToDetailsPage(page);
 
       const pageTitle = await orderDetailsPage.getPageTitle(page);
       await expect(pageTitle).to.equal(orderDetailsPage.pageTitle);
diff --git a/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_orderDetails/04_sendMessage.ts b/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_orderDetails/04_sendMessage.ts
index d40a08e41808c..cf26a502a841c 100644
--- a/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_orderDetails/04_sendMessage.ts
+++ b/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_orderDetails/04_sendMessage.ts
@@ -18,7 +18,7 @@ import {homePage as foHomePage} from '@pages/FO/home';
 import {loginPage as foLoginPage} from '@pages/FO/login';
 import {myAccountPage} from '@pages/FO/myAccount';
 import orderDetails from '@pages/FO/myAccount/orderDetails';
-import foOrderHistoryPage from '@pages/FO/myAccount/orderHistory';
+import {orderHistoryPage} from '@pages/FO/myAccount/orderHistory';
 import productPage from '@pages/FO/product';
 
 // Import data
@@ -202,14 +202,14 @@ describe('FO - Account : Send a message with an ordered product', async () => {
       await foHomePage.goToMyAccountPage(page);
       await myAccountPage.goToHistoryAndDetailsPage(page);
 
-      const pageHeaderTitle = await foOrderHistoryPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(foOrderHistoryPage.pageTitle);
+      const pageHeaderTitle = await orderHistoryPage.getPageTitle(page);
+      await expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
     });
 
     it('Go to order details ', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'goToFoToOrderDetails', baseContext);
 
-      await foOrderHistoryPage.goToDetailsPage(page);
+      await orderHistoryPage.goToDetailsPage(page);
 
       const successMessageText = await orderDetails.addAMessage(page, messageOption, messageSend);
       await expect(successMessageText).to.equal(orderDetails.successMessageText);
diff --git a/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/02_reorderFromOrderList.ts b/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/02_reorderFromOrderList.ts
index 369e9df4d1799..9d5657c5e9ef4 100644
--- a/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/02_reorderFromOrderList.ts
+++ b/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/02_reorderFromOrderList.ts
@@ -12,7 +12,7 @@ import {homePage as foHomePage} from '@pages/FO/home';
 import {loginPage as foLoginPage} from '@pages/FO/login';
 import {myAccountPage} from '@pages/FO/myAccount';
 import orderDetailsPage from '@pages/FO/myAccount/orderDetails';
-import foOrderHistoryPage from '@pages/FO/myAccount/orderHistory';
+import {orderHistoryPage} from '@pages/FO/myAccount/orderHistory';
 
 // Import data
 import Customers from '@data/demo/customers';
@@ -108,14 +108,14 @@ describe('FO - Account - Order history : Reorder from order list', async () => {
 
       await myAccountPage.goToHistoryAndDetailsPage(page);
 
-      const pageHeaderTitle = await foOrderHistoryPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(foOrderHistoryPage.pageTitle);
+      const pageHeaderTitle = await orderHistoryPage.getPageTitle(page);
+      await expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
     });
 
     it('should reorder the last order', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'reorderLastOrder', baseContext);
 
-      await foOrderHistoryPage.clickOnReorderLink(page);
+      await orderHistoryPage.clickOnReorderLink(page);
 
       const isCheckoutPage = await checkoutPage.isCheckoutPage(page);
       await expect(isCheckoutPage, 'Browser is not in checkout Page').to.be.true;
@@ -163,14 +163,14 @@ describe('FO - Account - Order history : Reorder from order list', async () => {
 
       await myAccountPage.goToHistoryAndDetailsPage(page);
 
-      const pageHeaderTitle = await foOrderHistoryPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(foOrderHistoryPage.pageTitle);
+      const pageHeaderTitle = await orderHistoryPage.getPageTitle(page);
+      await expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
     });
 
     it('should go to order details page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'goToFoToOrderDetails', baseContext);
 
-      await foOrderHistoryPage.goToDetailsPage(page);
+      await orderHistoryPage.goToDetailsPage(page);
 
       const pageTitle = await orderDetailsPage.getPageTitle(page);
       await expect(pageTitle).to.equal(orderDetailsPage.pageTitle);
diff --git a/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/03_downloadInvoice.ts b/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/03_downloadInvoice.ts
index ea9e08d6c898a..cb08cc43697ad 100644
--- a/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/03_downloadInvoice.ts
+++ b/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/03_downloadInvoice.ts
@@ -11,7 +11,7 @@ import {createOrderByCustomerTest} from '@commonTests/FO/order';
 import {homePage as foHomePage} from '@pages/FO/home';
 import {loginPage as foLoginPage} from '@pages/FO/login';
 import {myAccountPage} from '@pages/FO/myAccount';
-import foOrderHistoryPage from '@pages/FO/myAccount/orderHistory';
+import {orderHistoryPage} from '@pages/FO/myAccount/orderHistory';
 import invoicesPage from '@pages/BO/orders/invoices';
 import ordersPage from '@pages/BO/orders';
 import orderPageTabListBlock from '@pages/BO/orders/view/tabListBlock';
@@ -155,21 +155,21 @@ describe('FO - Account - Order history : download invoice', async () => {
 
       await myAccountPage.goToHistoryAndDetailsPage(page);
 
-      const pageHeaderTitle: string = await foOrderHistoryPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(foOrderHistoryPage.pageTitle);
+      const pageHeaderTitle: string = await orderHistoryPage.getPageTitle(page);
+      await expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
     });
 
     it('should check that the invoice of the first order in list is visible', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkInvoice', baseContext);
 
-      const isVisible: boolean = await foOrderHistoryPage.isInvoiceVisible(page, 1);
+      const isVisible: boolean = await orderHistoryPage.isInvoiceVisible(page, 1);
       await expect(isVisible, 'The invoice file is not existing!').to.be.true;
     });
 
     it('should download the invoice and check the invoice ID', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'downloadInvoice', baseContext);
 
-      const downloadFilePath: string|null = await foOrderHistoryPage.downloadInvoice(page);
+      const downloadFilePath: string|null = await orderHistoryPage.downloadInvoice(page);
 
       const exist: boolean = await files.isTextInPDF(downloadFilePath, fileName);
       await expect(exist).to.be.true;
@@ -178,7 +178,7 @@ describe('FO - Account - Order history : download invoice', async () => {
     it('should check that no invoice is visible for the second order in list', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkNoInvoice', baseContext);
 
-      const isVisible: boolean = await foOrderHistoryPage.isInvoiceVisible(page, 2);
+      const isVisible: boolean = await orderHistoryPage.isInvoiceVisible(page, 2);
       await expect(isVisible).to.be.false;
     });
   });
diff --git a/tests/UI/campaigns/functional/FO/classic/03_userAccount/merchandiseReturns/01_consultReturnDetails.ts b/tests/UI/campaigns/functional/FO/classic/03_userAccount/merchandiseReturns/01_consultReturnDetails.ts
index 3c4e97177aacb..ab0200c459a42 100644
--- a/tests/UI/campaigns/functional/FO/classic/03_userAccount/merchandiseReturns/01_consultReturnDetails.ts
+++ b/tests/UI/campaigns/functional/FO/classic/03_userAccount/merchandiseReturns/01_consultReturnDetails.ts
@@ -20,7 +20,7 @@ import {loginPage} from '@pages/FO/login';
 import {myAccountPage} from '@pages/FO/myAccount';
 import foMerchandiseReturnsPage from '@pages/FO/myAccount/merchandiseReturns';
 import orderDetailsPage from '@pages/FO/myAccount/orderDetails';
-import orderHistoryPage from '@pages/FO/myAccount/orderHistory';
+import {orderHistoryPage} from '@pages/FO/myAccount/orderHistory';
 import returnDetailsPage from '@pages/FO/myAccount/returnDetails';
 
 // Import data
diff --git a/tests/UI/campaigns/functional/FO/classic/03_userAccount/merchandiseReturns/02_checkOrderReturnPDF.ts b/tests/UI/campaigns/functional/FO/classic/03_userAccount/merchandiseReturns/02_checkOrderReturnPDF.ts
index 55b047a7926a6..187d5b50ac233 100644
--- a/tests/UI/campaigns/functional/FO/classic/03_userAccount/merchandiseReturns/02_checkOrderReturnPDF.ts
+++ b/tests/UI/campaigns/functional/FO/classic/03_userAccount/merchandiseReturns/02_checkOrderReturnPDF.ts
@@ -22,7 +22,7 @@ import {loginPage} from '@pages/FO/login';
 import {myAccountPage} from '@pages/FO/myAccount';
 import foMerchandiseReturnsPage from '@pages/FO/myAccount/merchandiseReturns';
 import orderDetailsPage from '@pages/FO/myAccount/orderDetails';
-import orderHistoryPage from '@pages/FO/myAccount/orderHistory';
+import {orderHistoryPage} from '@pages/FO/myAccount/orderHistory';
 import returnDetailsPage from '@pages/FO/myAccount/returnDetails';
 
 // Import data
diff --git a/tests/UI/campaigns/functional/FO/classic/04_newsletter/01_subscribeNewsletter.ts b/tests/UI/campaigns/functional/FO/classic/04_newsletter/01_subscribeNewsletter.ts
index f4ee2e8e70304..b85f5eec83703 100644
--- a/tests/UI/campaigns/functional/FO/classic/04_newsletter/01_subscribeNewsletter.ts
+++ b/tests/UI/campaigns/functional/FO/classic/04_newsletter/01_subscribeNewsletter.ts
@@ -15,7 +15,7 @@ import psEmailSubscriptionPage from '@pages/BO/modules/psEmailSubscription';
 import {homePage as foHomePage} from '@pages/FO/home';
 import {loginPage as foLoginPage} from '@pages/FO/login';
 import {myAccountPage} from '@pages/FO/myAccount';
-import foAccountIdentityPage from '@pages/FO/myAccount/identity';
+import {accountIdentityPage} from '@pages/FO/myAccount/identity';
 
 // Import data
 import Customers from '@data/demo/customers';
@@ -98,15 +98,15 @@ describe('FO - Newsletter : Subscribe to Newsletter', async () => {
       await foHomePage.goToMyAccountPage(page);
       await myAccountPage.goToInformationPage(page);
 
-      const pageTitle = await foAccountIdentityPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(foAccountIdentityPage.pageTitle);
+      const pageTitle = await accountIdentityPage.getPageTitle(page);
+      await expect(pageTitle).to.equal(accountIdentityPage.pageTitle);
     });
 
     it('should unsubscribe from newsletter', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'unsubscribeFromNewsLetter', baseContext);
 
-      const unsubscribeAlertText = await foAccountIdentityPage.unsubscribeNewsletter(page, Customers.johnDoe.password);
-      await expect(unsubscribeAlertText).to.contains(foAccountIdentityPage.successfulUpdateMessage);
+      const unsubscribeAlertText = await accountIdentityPage.unsubscribeNewsletter(page, Customers.johnDoe.password);
+      await expect(unsubscribeAlertText).to.contains(accountIdentityPage.successfulUpdateMessage);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/FO/classic/06_homePage/02_displaySomeProducts.ts b/tests/UI/campaigns/functional/FO/classic/06_homePage/02_displaySomeProducts.ts
index 0424616038a25..abe2cfed254df 100644
--- a/tests/UI/campaigns/functional/FO/classic/06_homePage/02_displaySomeProducts.ts
+++ b/tests/UI/campaigns/functional/FO/classic/06_homePage/02_displaySomeProducts.ts
@@ -5,8 +5,8 @@ import testContext from '@utils/testContext';
 // Import pages
 import categoryPageFO from '@pages/FO/category';
 import {homePage} from '@pages/FO/home';
-import pricesDropPage from '@pages/FO/pricesDrop';
-import newProductsPage from '@pages/FO/newProducts';
+import {pricesDropPage} from '@pages/FO/pricesDrop';
+import {newProductsPage} from '@pages/FO/newProducts';
 
 import {expect} from 'chai';
 import type {BrowserContext, Page} from 'playwright';
diff --git a/tests/UI/campaigns/functional/FO/classic/11_checkout/03_shippingMethods/01_addOrderMessage.ts b/tests/UI/campaigns/functional/FO/classic/11_checkout/03_shippingMethods/01_addOrderMessage.ts
index 551e76a22c64f..282b60186bef8 100644
--- a/tests/UI/campaigns/functional/FO/classic/11_checkout/03_shippingMethods/01_addOrderMessage.ts
+++ b/tests/UI/campaigns/functional/FO/classic/11_checkout/03_shippingMethods/01_addOrderMessage.ts
@@ -10,7 +10,7 @@ import {loginPage} from '@pages/FO/login';
 import productPage from '@pages/FO/product';
 import orderConfirmationPage from '@pages/FO/checkout/orderConfirmation';
 import {myAccountPage} from '@pages/FO/myAccount';
-import orderHistoryPage from '@pages/FO/myAccount/orderHistory';
+import {orderHistoryPage} from '@pages/FO/myAccount/orderHistory';
 import orderDetailsPage from '@pages/FO/myAccount/orderDetails';
 
 // Import data
diff --git a/tests/UI/campaigns/functional/FO/hummingbird/01_login/01_passwordReminder.ts b/tests/UI/campaigns/functional/FO/hummingbird/01_login/01_passwordReminder.ts
index 88efc7ddd913d..0c2f7f0f413d5 100644
--- a/tests/UI/campaigns/functional/FO/hummingbird/01_login/01_passwordReminder.ts
+++ b/tests/UI/campaigns/functional/FO/hummingbird/01_login/01_passwordReminder.ts
@@ -51,11 +51,11 @@ describe('FO - Login : Password reminder', async () => {
   customerNewPassword.email = customerData.email;
   customerNewPassword.password = newPassword;
 
-  // Pre-condition : Install Hummingbird
-  installHummingbird(`${baseContext}_preTest_1`);
-
   // Pre-Condition : Setup config SMTP
-  setupSmtpConfigTest(`${baseContext}_preTest_2`);
+  setupSmtpConfigTest(`${baseContext}_preTest_1`);
+
+  // Pre-condition : Install Hummingbird
+  installHummingbird(`${baseContext}_preTest_2`);
 
   // Pre-condition : Create new customer on FO
   createAccountTest(customerData, `${baseContext}_preTest_3`);
diff --git a/tests/UI/campaigns/functional/FO/hummingbird/02_headerAndFooter/02_checkLinksInFooter.ts b/tests/UI/campaigns/functional/FO/hummingbird/02_headerAndFooter/02_checkLinksInFooter.ts
new file mode 100644
index 0000000000000..cf5eedf1f320b
--- /dev/null
+++ b/tests/UI/campaigns/functional/FO/hummingbird/02_headerAndFooter/02_checkLinksInFooter.ts
@@ -0,0 +1,258 @@
+// Import utils
+import helper from '@utils/helpers';
+import testContext from '@utils/testContext';
+
+// Import commonTests
+import deleteCacheTest from '@commonTests/BO/advancedParameters/cache';
+import {deleteCustomerTest} from '@commonTests/BO/customers/customer';
+import {createAccountTest} from '@commonTests/FO/account';
+import {installHummingbird, uninstallHummingbird} from '@commonTests/FO/hummingbird';
+
+// Import pages
+// Import BO pages
+// Import FO pages
+import aboutUsPage from '@pages/FO/hummingbird/aboutUs';
+import bestSalesPage from '@pages/FO/hummingbird/bestSales';
+import contactUsPage from '@pages/FO/hummingbird/contactUs';
+import deliveryPage from '@pages/FO/hummingbird/delivery';
+import homePage from '@pages/FO/hummingbird/home';
+import legalNoticePage from '@pages/FO/hummingbird/legalNotice';
+import loginPage from '@pages/FO/hummingbird/login';
+import createAccountPage from '@pages/FO/hummingbird/myAccount/add';
+import addAddressPage from '@pages/FO/hummingbird/myAccount/addAddress';
+import addressesPage from '@pages/FO/hummingbird/myAccount/addresses';
+import creditSlipsPage from '@pages/FO/hummingbird/myAccount/creditSlips';
+import personalInfoPage from '@pages/FO/hummingbird/myAccount/identity';
+import myWishlistPage from '@pages/FO/hummingbird/myAccount/myWishlists';
+import ordersPage from '@pages/FO/hummingbird/myAccount/orderHistory';
+import guestOrderTrackingPage from '@pages/FO/hummingbird/orderTracking/guestOrderTracking';
+import newProductsPage from '@pages/FO/hummingbird/newProducts';
+import pricesDropPage from '@pages/FO/hummingbird/pricesDrop';
+import securePaymentPage from '@pages/FO/hummingbird/securePayment';
+import siteMapPage from '@pages/FO/hummingbird/siteMap';
+import storesPage from '@pages/FO/hummingbird/stores';
+import termsAndConditionsOfUsePage from '@pages/FO/hummingbird/termsAndConditionsOfUse';
+
+// Import data
+import Customers from '@data/demo/customers';
+import CustomerData from '@data/faker/customer';
+
+import {expect} from 'chai';
+import type {BrowserContext, Page} from 'playwright';
+
+const baseContext: string = 'functional_FO_hummingbird_headerAndFooter_checkLinksInFooter';
+
+/*
+Pre-condition:
+- Create new customer account
+- Delete cache
+Scenario:
+- Go to FO
+- Check footer Products links( Prices drop, New products and Best sales)
+Check our company links( Delivery, Legal notices, Terms and conditions of use, About us, Secure payment, Contact us,
+Sitemap, Stores)
+- Check your account links( Personal info, Orders, Credit slips, Addresses)
+- Check store information
+- Check copyright
+Post-condition:
+- Delete created customer
+ */
+describe('FO - Header and Footer : Check links in footer page', async () => {
+  let browserContext: BrowserContext;
+  let page: Page;
+  let pageTitle: string;
+
+  const today: Date = new Date();
+  const currentYear: string = today.getFullYear().toString();
+  const createCustomerData: CustomerData = new CustomerData();
+
+  // Pre-condition: Create new account on FO
+  createAccountTest(createCustomerData, `${baseContext}_preTest_1`);
+
+  // Pre-condition : Install Hummingbird
+  installHummingbird(`${baseContext}_preTest_2`);
+
+  // Pre-condition: Delete cache
+  deleteCacheTest(`${baseContext}_preTest_3`);
+
+  // before and after functions
+  before(async function () {
+    browserContext = await helper.createBrowserContext(this.browser);
+    page = await helper.newTab(browserContext);
+  });
+
+  after(async () => {
+    await helper.closeBrowserContext(browserContext);
+  });
+
+  it('should go to FO home page', async function () {
+    await testContext.addContextItem(this, 'testIdentifier', 'goToFO', baseContext);
+
+    await homePage.goToFo(page);
+
+    const isHomePage = await homePage.isHomePage(page);
+    expect(isHomePage).to.be.eq(true);
+  });
+
+  describe('Check \'Products\' footer links', async () => {
+    [
+      {linkSelector: 'Prices drop', pageTitle: pricesDropPage.pageTitle},
+      {linkSelector: 'New products', pageTitle: newProductsPage.pageTitle},
+      {linkSelector: 'Best sellers', pageTitle: bestSalesPage.pageTitle},
+    ].forEach((args, index: number) => {
+      it(`should check '${args.linkSelector}' footer links`, async function () {
+        await testContext.addContextItem(this, 'testIdentifier', `checkProductsFooterLinks${index}`, baseContext);
+
+        // Check prices drop link
+        await homePage.goToFooterLink(page, args.linkSelector);
+
+        const pageTitle = await homePage.getPageTitle(page);
+        expect(pageTitle).to.equal(args.pageTitle);
+      });
+    });
+  });
+
+  describe('Check \'Our Company\' footer links', async () => {
+    [
+      {linkSelector: 'Delivery', pageTitle: deliveryPage.pageTitle},
+      {linkSelector: 'Legal Notice', pageTitle: legalNoticePage.pageTitle},
+      {linkSelector: 'Terms and conditions of use', pageTitle: termsAndConditionsOfUsePage.pageTitle},
+      {linkSelector: 'About us', pageTitle: aboutUsPage.pageTitle},
+      {linkSelector: 'Secure payment', pageTitle: securePaymentPage.pageTitle},
+      {linkSelector: 'Contact us', pageTitle: contactUsPage.pageTitle},
+      {linkSelector: 'Sitemap', pageTitle: siteMapPage.pageTitle},
+      {linkSelector: 'Stores', pageTitle: storesPage.pageTitle},
+    ].forEach((args, index: number) => {
+      it(`should check '${args.linkSelector}' footer links`, async function () {
+        await testContext.addContextItem(this, 'testIdentifier', `checkOurCompanyFooterLinks${index}`, baseContext);
+
+        // Check prices drop link
+        await homePage.goToFooterLink(page, args.linkSelector);
+
+        const pageTitle = await homePage.getPageTitle(page);
+        expect(pageTitle).to.equal(args.pageTitle);
+      });
+    });
+  });
+
+  describe('Check \'Your Account\' footer links before login', async () => {
+    [
+      {linkSelector: 'Order tracking', pageTitle: guestOrderTrackingPage.pageTitle},
+      {linkSelector: 'Sign in', pageTitle: loginPage.pageTitle},
+      {linkSelector: 'Create account', pageTitle: createAccountPage.formTitle},
+    ].forEach((args, index: number) => {
+      it(`should check '${args.linkSelector}' footer links`, async function () {
+        await testContext.addContextItem(this, 'testIdentifier', `checkYourAccountFooterLinks1${index}`, baseContext);
+
+        // Check prices drop link
+        await homePage.goToFooterLink(page, args.linkSelector);
+
+        if (args.linkSelector === 'Create account') {
+          pageTitle = await createAccountPage.getHeaderTitle(page);
+        } else {
+          pageTitle = await homePage.getPageTitle(page);
+        }
+        expect(pageTitle).to.equal(args.pageTitle);
+      });
+    });
+  });
+
+  describe('Check \'Your Account\' footer links after login with default customer', async () => {
+    it('should login to FO', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'loginFO', baseContext);
+
+      await homePage.goToLoginPage(page);
+      await loginPage.customerLogin(page, Customers.johnDoe);
+
+      const isCustomerConnected = await loginPage.isCustomerConnected(page);
+      expect(isCustomerConnected, 'Customer is not connected').to.equal(true);
+    });
+
+    [
+      {linkSelector: 'Information', pageTitle: personalInfoPage.pageTitle},
+      {linkSelector: 'Addresses', pageTitle: addressesPage.pageTitle},
+      {linkSelector: 'Orders', pageTitle: ordersPage.pageTitle},
+      {linkSelector: 'Credit slips', pageTitle: creditSlipsPage.pageTitle},
+      {linkSelector: 'Wishlist', pageTitle: myWishlistPage.pageTitle},
+      {linkSelector: 'Sign out', pageTitle: loginPage.pageTitle},
+    ].forEach((args, index: number) => {
+      it(`should check '${args.linkSelector}' footer links`, async function () {
+        await testContext.addContextItem(this, 'testIdentifier', `checkYourAccountFooterLinks2${index}`, baseContext);
+
+        // Check prices drop link
+        await homePage.goToFooterLink(page, args.linkSelector);
+
+        if (args.linkSelector === 'Wishlist') {
+          pageTitle = await myWishlistPage.getPageTitle(page);
+        } else {
+          pageTitle = await homePage.getPageTitle(page);
+        }
+        expect(pageTitle).to.equal(args.pageTitle);
+      });
+    });
+  });
+
+  // Pre-condition: Delete cache
+  deleteCacheTest(`${baseContext}_preTest3`);
+
+  describe('Check \'Your Account\' footer links after login with new customer without address', async () => {
+    it('should login to FO', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'loginFONewCustomer', baseContext);
+
+      await homePage.goToLoginPage(page);
+      await loginPage.customerLogin(page, createCustomerData);
+
+      const isCustomerConnected = await loginPage.isCustomerConnected(page);
+      expect(isCustomerConnected, 'Customer is not connected').to.equal(true);
+    });
+
+    [
+      {linkSelector: 'Information', pageTitle: personalInfoPage.pageTitle},
+      {linkSelector: 'Add first address', pageTitle: addAddressPage.pageTitle},
+      {linkSelector: 'Orders', pageTitle: ordersPage.pageTitle},
+      {linkSelector: 'Credit slips', pageTitle: creditSlipsPage.pageTitle},
+      {linkSelector: 'Wishlist', pageTitle: myWishlistPage.pageTitle},
+      {linkSelector: 'Sign out', pageTitle: loginPage.pageTitle},
+    ].forEach((args, index: number) => {
+      it(`should check '${args.linkSelector}' footer links`, async function () {
+        await testContext.addContextItem(this, 'testIdentifier', `checkYourAccountFooterLinks3${index}`, baseContext);
+
+        // Check prices drop link
+        await homePage.goToFooterLink(page, args.linkSelector);
+
+        if (args.linkSelector === 'Wishlist') {
+          pageTitle = await myWishlistPage.getPageTitle(page);
+        } else {
+          pageTitle = await homePage.getPageTitle(page);
+        }
+        expect(pageTitle).to.equal(args.pageTitle);
+      });
+    });
+  });
+
+  describe('Check \'Store Information\'', async () => {
+    it('should check \'Store Information\'', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'checkStoreInformation', baseContext);
+
+      const storeInformation = await homePage.getStoreInformation(page);
+      expect(storeInformation).to.contains(global.INSTALL.SHOP_NAME)
+        .and.to.contain(global.INSTALL.COUNTRY)
+        .and.to.contains(global.BO.EMAIL);
+    });
+  });
+
+  describe('Check the copyright', async () => {
+    it('should check the copyright', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'checkCopyright', baseContext);
+
+      const copyright = await homePage.getCopyright(page);
+      expect(copyright).to.equal(`© ${currentYear} - Ecommerce software by PrestaShop™`);
+    });
+  });
+
+  // Post-condition : Uninstall Hummingbird
+  uninstallHummingbird(`${baseContext}_postTest_1`);
+
+  // Post-condition: Delete the created customer account
+  deleteCustomerTest(createCustomerData, `${baseContext}_postTest_2`);
+});
diff --git a/tests/UI/campaigns/productV2/functional/05_CRUDVirtualProduct.ts b/tests/UI/campaigns/productV2/functional/05_CRUDVirtualProduct.ts
index a2ea37f82f887..6d5cf554b3205 100644
--- a/tests/UI/campaigns/productV2/functional/05_CRUDVirtualProduct.ts
+++ b/tests/UI/campaigns/productV2/functional/05_CRUDVirtualProduct.ts
@@ -20,7 +20,7 @@ import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
 import orderConfirmationPage from '@pages/FO/checkout/orderConfirmation';
 import {myAccountPage} from '@pages/FO/myAccount';
-import foOrderHistoryPage from '@pages/FO/myAccount/orderHistory';
+import {orderHistoryPage} from '@pages/FO/myAccount/orderHistory';
 import orderDetailsPage from '@pages/FO/myAccount/orderDetails';
 
 // Import data
@@ -313,14 +313,14 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
 
         await myAccountPage.goToHistoryAndDetailsPage(page);
 
-        const pageHeaderTitle = await foOrderHistoryPage.getPageTitle(page);
-        await expect(pageHeaderTitle).to.equal(foOrderHistoryPage.pageTitle);
+        const pageHeaderTitle = await orderHistoryPage.getPageTitle(page);
+        await expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
       });
 
       it('should go to order details page', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'goToFoToOrderDetails', baseContext);
 
-        await foOrderHistoryPage.goToDetailsPage(page);
+        await orderHistoryPage.goToDetailsPage(page);
 
         const pageTitle: string = await orderDetailsPage.getPageTitle(page);
         await expect(pageTitle).to.equal(orderDetailsPage.pageTitle);
diff --git a/tests/UI/commonTests/FO/account.ts b/tests/UI/commonTests/FO/account.ts
index c0ee2b9cf3481..38cc325cd8eb7 100644
--- a/tests/UI/commonTests/FO/account.ts
+++ b/tests/UI/commonTests/FO/account.ts
@@ -7,8 +7,8 @@ import {homePage} from '@pages/FO/home';
 import {loginPage as foLoginPage} from '@pages/FO/login';
 import {createAccountPage as foCreateAccountPage} from '@pages/FO/myAccount/add';
 import {myAccountPage} from '@pages/FO/myAccount';
-import foAddressesPage from '@pages/FO/myAccount/addresses';
-import foAddAddressesPage from '@pages/FO/myAccount/addAddress';
+import {addressesPage} from '@pages/FO/myAccount/addresses';
+import {addAddressPage} from '@pages/FO/myAccount/addAddress';
 
 import {expect} from 'chai';
 import type {BrowserContext, Page} from 'playwright';
@@ -133,34 +133,34 @@ function createAddressTest(
     });
 
     it('should go to \'Addresses\' page', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'goToFOAddressesPage', baseContext);
+      await testContext.addContextItem(this, 'testIdentifier', 'goToaddressesPage', baseContext);
 
       await myAccountPage.goToAddressesPage(page);
 
-      const pageHeaderTitle = await foAddressesPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.include(foAddressesPage.addressPageTitle);
+      const pageHeaderTitle = await addressesPage.getPageTitle(page);
+      await expect(pageHeaderTitle).to.include(addressesPage.addressPageTitle);
     });
 
     it('should go to create address page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'goToNewAddressPage', baseContext);
 
-      await foAddressesPage.openNewAddressForm(page);
+      await addressesPage.openNewAddressForm(page);
 
-      const pageHeaderTitle = await foAddAddressesPage.getHeaderTitle(page);
-      await expect(pageHeaderTitle).to.equal(foAddAddressesPage.creationFormTitle);
+      const pageHeaderTitle = await addAddressPage.getHeaderTitle(page);
+      await expect(pageHeaderTitle).to.equal(addAddressPage.creationFormTitle);
     });
 
     it('should create address', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createAddress', baseContext);
 
-      const textResult = await foAddAddressesPage.setAddress(page, addressData);
-      await expect(textResult).to.equal(foAddressesPage.addAddressSuccessfulMessage);
+      const textResult = await addAddressPage.setAddress(page, addressData);
+      await expect(textResult).to.equal(addressesPage.addAddressSuccessfulMessage);
     });
 
     it('should sign out from FO', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'signOutFO', baseContext);
 
-      await foAddAddressesPage.goToHomePage(page);
+      await addAddressPage.goToHomePage(page);
       await homePage.logout(page);
 
       const isCustomerConnected = await homePage.isCustomerConnected(page);
diff --git a/tests/UI/pages/FO/FObasePage.ts b/tests/UI/pages/FO/FObasePage.ts
index 4de108da9f70f..6dd8e53fb846c 100644
--- a/tests/UI/pages/FO/FObasePage.ts
+++ b/tests/UI/pages/FO/FObasePage.ts
@@ -133,6 +133,8 @@ export default class FOBasePage extends CommonPage {
 
   protected readonly navbarLink: string;
 
+  private readonly hCopyrightLink: string;
+
   protected readonly hSearchInput: string;
 
   protected theme: string;
@@ -141,9 +143,11 @@ export default class FOBasePage extends CommonPage {
    * @constructs
    * Setting up texts and selectors to use on all FO pages
    */
-  constructor() {
+  constructor(theme: string = 'classic') {
     super();
 
+    this.theme = theme;
+
     // Selectors for home page
     // Header links
     this.content = '#content';
@@ -224,9 +228,8 @@ export default class FOBasePage extends CommonPage {
     this.languageSelector = '#language-selector';
     this.cartProductsCountHummingbird = '#_desktop_cart .header-block__action-btn span.header-block__badge';
     this.navbarLink = '.navbar-brand';
+    this.hCopyrightLink = '#footer div.footer__main p.copyright a[href*="www.prestashop-project.org"]';
     this.hSearchInput = '#search_widget .js-search-input';
-
-    this.theme = 'classic';
   }
 
   // Header methods
@@ -749,7 +752,7 @@ export default class FOBasePage extends CommonPage {
    * @returns {Promise<string>}
    */
   async getCopyright(page: Page): Promise<string> {
-    return this.getTextContent(page, this.copyrightLink);
+    return this.getTextContent(page, this.theme === 'hummingbird' ? this.hCopyrightLink : this.copyrightLink);
   }
 
   /**
diff --git a/tests/UI/pages/FO/aboutUs/index.ts b/tests/UI/pages/FO/aboutUs/index.ts
index f74398167ced3..83fde3317d584 100644
--- a/tests/UI/pages/FO/aboutUs/index.ts
+++ b/tests/UI/pages/FO/aboutUs/index.ts
@@ -5,18 +5,19 @@ import FOBasePage from '@pages/FO/FObasePage';
  * @class
  * @extends FOBasePage
  */
-class AboutUs extends FOBasePage {
+class AboutUsPage extends FOBasePage {
   public readonly pageTitle: string;
 
   /**
    * @constructs
    * Setting up texts and selectors to use on about us page
    */
-  constructor() {
-    super();
+  constructor(theme: string = 'classic') {
+    super(theme);
 
     this.pageTitle = 'About us';
   }
 }
 
-export default new AboutUs();
+const aboutUsPage = new AboutUsPage();
+export {aboutUsPage, AboutUsPage};
diff --git a/tests/UI/pages/FO/bestSales/index.ts b/tests/UI/pages/FO/bestSales/index.ts
index 485028b1eac98..86b63bf3281d4 100644
--- a/tests/UI/pages/FO/bestSales/index.ts
+++ b/tests/UI/pages/FO/bestSales/index.ts
@@ -5,18 +5,19 @@ import FOBasePage from '@pages/FO/FObasePage';
  * @class
  * @extends FOBasePage
  */
-class BestSales extends FOBasePage {
+class BestSalesPage extends FOBasePage {
   public readonly pageTitle: string;
 
   /**
    * @constructs
    * Setting up texts and selectors to use on best sales page
    */
-  constructor() {
-    super();
+  constructor(theme: string = 'classic') {
+    super(theme);
 
     this.pageTitle = 'Best sellers';
   }
 }
 
-export default new BestSales();
+const bestSalesPage = new BestSalesPage();
+export {bestSalesPage, BestSalesPage};
diff --git a/tests/UI/pages/FO/cart/index.ts b/tests/UI/pages/FO/cart/index.ts
index 842f176124637..0202c4aa447e3 100644
--- a/tests/UI/pages/FO/cart/index.ts
+++ b/tests/UI/pages/FO/cart/index.ts
@@ -110,8 +110,8 @@ class CartPage extends FOBasePage {
    * @constructs
    * Setting up texts and selectors to use on cart page
    */
-  constructor() {
-    super();
+  constructor(theme: string = 'classic') {
+    super(theme);
 
     this.pageTitle = 'Cart';
     this.cartRuleAlreadyUsedErrorText = 'This voucher has already been used';
diff --git a/tests/UI/pages/FO/contactUs/index.ts b/tests/UI/pages/FO/contactUs/index.ts
index f54026273f7aa..2f2f4ebea3f71 100644
--- a/tests/UI/pages/FO/contactUs/index.ts
+++ b/tests/UI/pages/FO/contactUs/index.ts
@@ -44,8 +44,8 @@ class ContactUsPage extends FOBasePage {
    * @constructs
    * Setting up texts and selectors to use on contact us page
    */
-  constructor() {
-    super();
+  constructor(theme: string = 'classic') {
+    super(theme);
 
     this.pageTitle = 'Contact us';
     this.validationMessage = 'Your message has been successfully sent to our team.';
diff --git a/tests/UI/pages/FO/delivery/index.ts b/tests/UI/pages/FO/delivery/index.ts
index 9f398f97e24d6..8f7ec94633931 100644
--- a/tests/UI/pages/FO/delivery/index.ts
+++ b/tests/UI/pages/FO/delivery/index.ts
@@ -6,18 +6,19 @@ import FOBasePage from '@pages/FO/FObasePage';
  * @class
  * @extends FOBasePage
  */
-class Delivery extends FOBasePage {
+class DeliveryPage extends FOBasePage {
   public readonly pageTitle: string;
 
   /**
    * @constructs
    * Setting up texts and selectors to use on delivery page
    */
-  constructor() {
-    super();
+  constructor(theme: string = 'classic') {
+    super(theme);
 
     this.pageTitle = 'Delivery';
   }
 }
 
-export default new Delivery();
+const deliveryPage = new DeliveryPage();
+export {deliveryPage, DeliveryPage};
diff --git a/tests/UI/pages/FO/home/index.ts b/tests/UI/pages/FO/home/index.ts
index 45d02d21da3de..d63bfe67625a3 100644
--- a/tests/UI/pages/FO/home/index.ts
+++ b/tests/UI/pages/FO/home/index.ts
@@ -151,8 +151,8 @@ class HomePage extends FOBasePage {
    * @constructs
    * Setting up texts and selectors to use on home page
    */
-  constructor() {
-    super();
+  constructor(theme: string = 'classic') {
+    super(theme);
 
     this.pageTitle = global.INSTALL.SHOP_NAME;
     this.successAddToCartMessage = 'Product successfully added to your shopping cart';
diff --git a/tests/UI/pages/FO/hummingbird/aboutUs/index.ts b/tests/UI/pages/FO/hummingbird/aboutUs/index.ts
new file mode 100644
index 0000000000000..db9620cf5d147
--- /dev/null
+++ b/tests/UI/pages/FO/hummingbird/aboutUs/index.ts
@@ -0,0 +1,18 @@
+// Import FO pages
+import {AboutUsPage} from '@pages/FO/aboutUs/index';
+
+/**
+ * Contact Us page, contains functions that can be used on the page
+ * @class
+ * @extends FOBasePage
+ */
+class AboutUs extends AboutUsPage {
+  /**
+   * @constructs
+   */
+  constructor() {
+    super('hummingbird');
+  }
+}
+
+export default new AboutUs();
diff --git a/tests/UI/pages/FO/hummingbird/bestSales/index.ts b/tests/UI/pages/FO/hummingbird/bestSales/index.ts
new file mode 100644
index 0000000000000..351d036d6e302
--- /dev/null
+++ b/tests/UI/pages/FO/hummingbird/bestSales/index.ts
@@ -0,0 +1,18 @@
+// Import FO pages
+import {BestSalesPage} from '@pages/FO/bestSales/index';
+
+/**
+ * Contact Us page, contains functions that can be used on the page
+ * @class
+ * @extends FOBasePage
+ */
+class BestSales extends BestSalesPage {
+  /**
+   * @constructs
+   */
+  constructor() {
+    super('hummingbird');
+  }
+}
+
+export default new BestSales();
diff --git a/tests/UI/pages/FO/hummingbird/cart/index.ts b/tests/UI/pages/FO/hummingbird/cart/index.ts
index 6252d82ea74e8..23d18397a5178 100644
--- a/tests/UI/pages/FO/hummingbird/cart/index.ts
+++ b/tests/UI/pages/FO/hummingbird/cart/index.ts
@@ -11,9 +11,7 @@ class Cart extends CartPage {
    * @constructs
    */
   constructor() {
-    super();
-
-    this.theme = 'hummingbird';
+    super('hummingbird');
   }
 }
 
diff --git a/tests/UI/pages/FO/hummingbird/contactUs/index.ts b/tests/UI/pages/FO/hummingbird/contactUs/index.ts
index 3923c77ae9244..812658c94ddd0 100644
--- a/tests/UI/pages/FO/hummingbird/contactUs/index.ts
+++ b/tests/UI/pages/FO/hummingbird/contactUs/index.ts
@@ -11,9 +11,7 @@ class ContactUs extends ContactUsPage {
    * @constructs
    */
   constructor() {
-    super();
-
-    this.theme = 'hummingbird';
+    super('hummingbird');
   }
 }
 
diff --git a/tests/UI/pages/FO/hummingbird/delivery/index.ts b/tests/UI/pages/FO/hummingbird/delivery/index.ts
new file mode 100644
index 0000000000000..2b42092027dbd
--- /dev/null
+++ b/tests/UI/pages/FO/hummingbird/delivery/index.ts
@@ -0,0 +1,18 @@
+// Import FO pages
+import {DeliveryPage} from '@pages/FO/delivery/index';
+
+/**
+ * Contact Us page, contains functions that can be used on the page
+ * @class
+ * @extends FOBasePage
+ */
+class Delivery extends DeliveryPage {
+  /**
+   * @constructs
+   */
+  constructor() {
+    super('hummingbird');
+  }
+}
+
+export default new Delivery();
diff --git a/tests/UI/pages/FO/hummingbird/home/index.ts b/tests/UI/pages/FO/hummingbird/home/index.ts
index a259202fee310..52cc5f63f5ce5 100644
--- a/tests/UI/pages/FO/hummingbird/home/index.ts
+++ b/tests/UI/pages/FO/hummingbird/home/index.ts
@@ -12,9 +12,7 @@ class Home extends HomePage {
    * Setting up texts and selectors to use on home page
    */
   constructor() {
-    super();
-
-    this.theme = 'hummingbird';
+    super('hummingbird');
   }
 }
 
diff --git a/tests/UI/pages/FO/hummingbird/legalNotice/index.ts b/tests/UI/pages/FO/hummingbird/legalNotice/index.ts
new file mode 100644
index 0000000000000..5f2d3adf89c4d
--- /dev/null
+++ b/tests/UI/pages/FO/hummingbird/legalNotice/index.ts
@@ -0,0 +1,18 @@
+// Import FO pages
+import {LegalNoticePage} from '@pages/FO/legalNotice/index';
+
+/**
+ * Contact Us page, contains functions that can be used on the page
+ * @class
+ * @extends FOBasePage
+ */
+class LegalNotice extends LegalNoticePage {
+  /**
+   * @constructs
+   */
+  constructor() {
+    super('hummingbird');
+  }
+}
+
+export default new LegalNotice();
diff --git a/tests/UI/pages/FO/hummingbird/login/index.ts b/tests/UI/pages/FO/hummingbird/login/index.ts
index 4ff1f36eab6ca..3a593a5e490dc 100644
--- a/tests/UI/pages/FO/hummingbird/login/index.ts
+++ b/tests/UI/pages/FO/hummingbird/login/index.ts
@@ -12,9 +12,7 @@ class Login extends LoginPage {
    * Setting up texts and selectors to use on login page
    */
   constructor() {
-    super();
-
-    this.theme = 'hummingbird';
+    super('hummingbird');
 
     this.displayRegisterFormLink = 'div a[data-link-action=\'display-register-form\']';
     this.passwordReminderLink = '.login__forgot-password a';
diff --git a/tests/UI/pages/FO/hummingbird/myAccount/add.ts b/tests/UI/pages/FO/hummingbird/myAccount/add.ts
index f2be75d943034..5d66692bd31cb 100644
--- a/tests/UI/pages/FO/hummingbird/myAccount/add.ts
+++ b/tests/UI/pages/FO/hummingbird/myAccount/add.ts
@@ -12,9 +12,7 @@ class CreateAccount extends CreateAccountPage {
    * Setting up texts and selectors to use on create account page
    */
   constructor() {
-    super();
-
-    this.theme = 'hummingbird';
+    super('hummingbird');
 
     this.pageHeaderTitle = '#wrapper .page-header h1';
   }
diff --git a/tests/UI/pages/FO/hummingbird/myAccount/addAddress.ts b/tests/UI/pages/FO/hummingbird/myAccount/addAddress.ts
new file mode 100644
index 0000000000000..fc71c1fb1e6b2
--- /dev/null
+++ b/tests/UI/pages/FO/hummingbird/myAccount/addAddress.ts
@@ -0,0 +1,18 @@
+// Import FO pages
+import {AddAddressPage} from '@pages/FO/myAccount/addAddress';
+
+/**
+ * @class
+ * @extends FOBasePage
+ */
+class AddAddress extends AddAddressPage {
+  /**
+   * @constructs
+   * Setting up texts and selectors to use on create account page
+   */
+  constructor() {
+    super('hummingbird');
+  }
+}
+
+export default new AddAddress();
diff --git a/tests/UI/pages/FO/hummingbird/myAccount/addresses.ts b/tests/UI/pages/FO/hummingbird/myAccount/addresses.ts
new file mode 100644
index 0000000000000..f030bf712c69b
--- /dev/null
+++ b/tests/UI/pages/FO/hummingbird/myAccount/addresses.ts
@@ -0,0 +1,19 @@
+// Import FO pages
+import {AddressesPage} from '@pages/FO/myAccount/addresses';
+
+/**
+ * Create account page, contains functions that can be used on the page
+ * @class
+ * @extends FOBasePage
+ */
+class Addresses extends AddressesPage {
+  /**
+   * @constructs
+   * Setting up texts and selectors to use on create account page
+   */
+  constructor() {
+    super('hummingbird');
+  }
+}
+
+export default new Addresses();
diff --git a/tests/UI/pages/FO/hummingbird/myAccount/creditSlips.ts b/tests/UI/pages/FO/hummingbird/myAccount/creditSlips.ts
new file mode 100644
index 0000000000000..9c83df810825d
--- /dev/null
+++ b/tests/UI/pages/FO/hummingbird/myAccount/creditSlips.ts
@@ -0,0 +1,18 @@
+// Import FO pages
+import {CreditSlipPage} from '@pages/FO/myAccount/creditSlips';
+
+/**
+ * @class
+ * @extends FOBasePage
+ */
+class CreditSlip extends CreditSlipPage {
+  /**
+   * @constructs
+   * Setting up texts and selectors to use on create account page
+   */
+  constructor() {
+    super('hummingbird');
+  }
+}
+
+export default new CreditSlip();
diff --git a/tests/UI/pages/FO/hummingbird/myAccount/identity.ts b/tests/UI/pages/FO/hummingbird/myAccount/identity.ts
new file mode 100644
index 0000000000000..b245ef810cc05
--- /dev/null
+++ b/tests/UI/pages/FO/hummingbird/myAccount/identity.ts
@@ -0,0 +1,18 @@
+// Import FO pages
+import {AccountIdentityPage} from '@pages/FO/myAccount/identity';
+
+/**
+ * @class
+ * @extends FOBasePage
+ */
+class AccountIdentity extends AccountIdentityPage {
+  /**
+   * @constructs
+   * Setting up texts and selectors to use
+   */
+  constructor() {
+    super('hummingbird');
+  }
+}
+
+export default new AccountIdentity();
diff --git a/tests/UI/pages/FO/hummingbird/myAccount/index.ts b/tests/UI/pages/FO/hummingbird/myAccount/index.ts
index 689a8beac68eb..548b5eeae9436 100644
--- a/tests/UI/pages/FO/hummingbird/myAccount/index.ts
+++ b/tests/UI/pages/FO/hummingbird/myAccount/index.ts
@@ -12,9 +12,7 @@ class MyAccount extends MyAccountPage {
    * Setting up texts and selectors to use on my account page
    */
   constructor() {
-    super();
-
-    this.theme = 'hummingbird';
+    super('hummingbird');
 
     this.logoutFooterLink = '#my-account .account-menu .account-menu--signout';
   }
diff --git a/tests/UI/pages/FO/hummingbird/myAccount/myWishlists.ts b/tests/UI/pages/FO/hummingbird/myAccount/myWishlists.ts
new file mode 100644
index 0000000000000..555d597310263
--- /dev/null
+++ b/tests/UI/pages/FO/hummingbird/myAccount/myWishlists.ts
@@ -0,0 +1,18 @@
+// Import FO pages
+import {MyWishlistsPage} from '@pages/FO/myAccount/myWishlists';
+
+/**
+ * @class
+ * @extends FOBasePage
+ */
+class MyWishlists extends MyWishlistsPage {
+  /**
+   * @constructs
+   * Setting up texts and selectors to use
+   */
+  constructor() {
+    super('hummingbird');
+  }
+}
+
+export default new MyWishlists();
diff --git a/tests/UI/pages/FO/hummingbird/myAccount/orderHistory.ts b/tests/UI/pages/FO/hummingbird/myAccount/orderHistory.ts
new file mode 100644
index 0000000000000..8cf1381387e9b
--- /dev/null
+++ b/tests/UI/pages/FO/hummingbird/myAccount/orderHistory.ts
@@ -0,0 +1,18 @@
+// Import FO pages
+import {OrderHistoryPage} from '@pages/FO/myAccount/orderHistory';
+
+/**
+ * @class
+ * @extends FOBasePage
+ */
+class OrderHistory extends OrderHistoryPage {
+  /**
+   * @constructs
+   * Setting up texts and selectors to use
+   */
+  constructor() {
+    super('hummingbird');
+  }
+}
+
+export default new OrderHistory();
diff --git a/tests/UI/pages/FO/hummingbird/newProducts/index.ts b/tests/UI/pages/FO/hummingbird/newProducts/index.ts
new file mode 100644
index 0000000000000..3ade2dde8dd09
--- /dev/null
+++ b/tests/UI/pages/FO/hummingbird/newProducts/index.ts
@@ -0,0 +1,17 @@
+// Import FO pages
+import {NewProductsPage} from '@pages/FO/newProducts/index';
+
+/**
+ * @class
+ * @extends FOBasePage
+ */
+class NewProducts extends NewProductsPage {
+  /**
+   * @constructs
+   */
+  constructor() {
+    super('hummingbird');
+  }
+}
+
+export default new NewProducts();
diff --git a/tests/UI/pages/FO/hummingbird/orderTracking/guestOrderTracking.ts b/tests/UI/pages/FO/hummingbird/orderTracking/guestOrderTracking.ts
new file mode 100644
index 0000000000000..a7c77c92ca151
--- /dev/null
+++ b/tests/UI/pages/FO/hummingbird/orderTracking/guestOrderTracking.ts
@@ -0,0 +1,17 @@
+// Import FO pages
+import {GuestOrderTrackingPage} from '@pages/FO/orderTracking/guestOrderTracking';
+
+/**
+ * @class
+ * @extends FOBasePage
+ */
+class GuestOrderTracking extends GuestOrderTrackingPage {
+  /**
+    * @constructs
+    */
+  constructor() {
+    super('hummingbird');
+  }
+}
+
+export default new GuestOrderTracking();
diff --git a/tests/UI/pages/FO/hummingbird/passwordReminder/index.ts b/tests/UI/pages/FO/hummingbird/passwordReminder/index.ts
index 03b977f0c917b..c5ac2cabec169 100644
--- a/tests/UI/pages/FO/hummingbird/passwordReminder/index.ts
+++ b/tests/UI/pages/FO/hummingbird/passwordReminder/index.ts
@@ -12,9 +12,7 @@ class PasswordReminder extends PasswordReminderPage {
    * Setting up texts and selectors to use on my account page
    */
   constructor() {
-    super();
-
-    this.theme = 'hummingbird';
+    super('hummingbird');
 
     this.emailAddressText = 'section.renew-password > div.mb-3:nth-child(1)';
     this.sendResetLinkSuccessAlert = '#content .alert-success';
diff --git a/tests/UI/pages/FO/hummingbird/pricesDrop/index.ts b/tests/UI/pages/FO/hummingbird/pricesDrop/index.ts
new file mode 100644
index 0000000000000..d639e58e71bf6
--- /dev/null
+++ b/tests/UI/pages/FO/hummingbird/pricesDrop/index.ts
@@ -0,0 +1,17 @@
+// Import FO pages
+import {PricesDropPage} from '@pages/FO/pricesDrop/index';
+
+/**
+ * @class
+ * @extends FOBasePage
+ */
+class PricesDrop extends PricesDropPage {
+  /**
+   * @constructs
+   */
+  constructor() {
+    super('hummingbird');
+  }
+}
+
+export default new PricesDrop();
diff --git a/tests/UI/pages/FO/hummingbird/searchResults/index.ts b/tests/UI/pages/FO/hummingbird/searchResults/index.ts
index 7dab7900e282b..f66d34dfec762 100644
--- a/tests/UI/pages/FO/hummingbird/searchResults/index.ts
+++ b/tests/UI/pages/FO/hummingbird/searchResults/index.ts
@@ -12,9 +12,7 @@ class SearchResults extends SearchResultsPage {
    * Setting up texts and selectors to use on my account page
    */
   constructor() {
-    super();
-
-    this.theme = 'hummingbird';
+    super('hummingbird');
 
     this.productPrice = '#js-product-list div.card span.product-miniature__price';
   }
diff --git a/tests/UI/pages/FO/hummingbird/securePayment/index.ts b/tests/UI/pages/FO/hummingbird/securePayment/index.ts
new file mode 100644
index 0000000000000..62f3d33666eb6
--- /dev/null
+++ b/tests/UI/pages/FO/hummingbird/securePayment/index.ts
@@ -0,0 +1,17 @@
+// Import FO pages
+import {SecurePaymentPage} from '@pages/FO/securePayment/index';
+
+/**
+ * @class
+ * @extends FOBasePage
+ */
+class SecurePayment extends SecurePaymentPage {
+  /**
+   * @constructs
+   */
+  constructor() {
+    super('hummingbird');
+  }
+}
+
+export default new SecurePayment();
diff --git a/tests/UI/pages/FO/hummingbird/siteMap/index.ts b/tests/UI/pages/FO/hummingbird/siteMap/index.ts
new file mode 100644
index 0000000000000..fd74d494be832
--- /dev/null
+++ b/tests/UI/pages/FO/hummingbird/siteMap/index.ts
@@ -0,0 +1,17 @@
+// Import FO pages
+import {SiteMapPage} from '@pages/FO/siteMap/index';
+
+/**
+ * @class
+ * @extends FOBasePage
+ */
+class SiteMap extends SiteMapPage {
+  /**
+   * @constructs
+   */
+  constructor() {
+    super('hummingbird');
+  }
+}
+
+export default new SiteMap();
diff --git a/tests/UI/pages/FO/hummingbird/stores/index.ts b/tests/UI/pages/FO/hummingbird/stores/index.ts
new file mode 100644
index 0000000000000..e32c69ad235d1
--- /dev/null
+++ b/tests/UI/pages/FO/hummingbird/stores/index.ts
@@ -0,0 +1,17 @@
+// Import FO pages
+import {StoresPage} from '@pages/FO/stores/index';
+
+/**
+ * @class
+ * @extends FOBasePage
+ */
+class Stores extends StoresPage {
+  /**
+   * @constructs
+   */
+  constructor() {
+    super('hummingbird');
+  }
+}
+
+export default new Stores();
diff --git a/tests/UI/pages/FO/hummingbird/termsAndConditionsOfUse/index.ts b/tests/UI/pages/FO/hummingbird/termsAndConditionsOfUse/index.ts
new file mode 100644
index 0000000000000..d00ffe6737969
--- /dev/null
+++ b/tests/UI/pages/FO/hummingbird/termsAndConditionsOfUse/index.ts
@@ -0,0 +1,17 @@
+// Import FO pages
+import {TermsAndConditionsOfUsePage} from '@pages/FO/termsAndConditionsOfUse/index';
+
+/**
+ * @class
+ * @extends FOBasePage
+ */
+class TermsAndConditionsOfUse extends TermsAndConditionsOfUsePage {
+  /**
+   * @constructs
+   */
+  constructor() {
+    super('hummingbird');
+  }
+}
+
+export default new TermsAndConditionsOfUse();
diff --git a/tests/UI/pages/FO/legalNotice/index.ts b/tests/UI/pages/FO/legalNotice/index.ts
index 323a10f2d6a38..ffde9951f88ae 100644
--- a/tests/UI/pages/FO/legalNotice/index.ts
+++ b/tests/UI/pages/FO/legalNotice/index.ts
@@ -6,18 +6,19 @@ import FOBasePage from '@pages/FO/FObasePage';
  * @class
  * @extends FOBasePage
  */
-class LegalNotice extends FOBasePage {
+class LegalNoticePage extends FOBasePage {
   public readonly pageTitle: string;
 
   /**
    * @constructs
    * Setting up texts and selectors to use on legal notice page
    */
-  constructor() {
-    super();
+  constructor(theme: string = 'classic') {
+    super(theme);
 
     this.pageTitle = 'Legal Notice';
   }
 }
 
-export default new LegalNotice();
+const legalNoticePage = new LegalNoticePage();
+export {legalNoticePage, LegalNoticePage};
diff --git a/tests/UI/pages/FO/login/index.ts b/tests/UI/pages/FO/login/index.ts
index b9b080216019f..f063d423d6be3 100644
--- a/tests/UI/pages/FO/login/index.ts
+++ b/tests/UI/pages/FO/login/index.ts
@@ -38,8 +38,8 @@ class LoginPage extends FOBasePage {
    * @constructs
    * Setting up texts and selectors to use on login page
    */
-  constructor() {
-    super();
+  constructor(theme: string = 'classic') {
+    super(theme);
 
     this.pageTitle = 'Login';
     this.loginErrorText = 'Authentication failed.';
diff --git a/tests/UI/pages/FO/myAccount/add.ts b/tests/UI/pages/FO/myAccount/add.ts
index 0ead6702aca9b..95c2e101b7751 100644
--- a/tests/UI/pages/FO/myAccount/add.ts
+++ b/tests/UI/pages/FO/myAccount/add.ts
@@ -46,8 +46,8 @@ class CreateAccountPage extends FOBasePage {
    * @constructs
    * Setting up texts and selectors to use on create account page
    */
-  constructor() {
-    super();
+  constructor(theme: string = 'classic') {
+    super(theme);
 
     this.pageTitle = 'Login';
     this.formTitle = 'Create an account';
diff --git a/tests/UI/pages/FO/myAccount/addAddress.ts b/tests/UI/pages/FO/myAccount/addAddress.ts
index 9b19cce10421e..fb0cc3ab2f071 100644
--- a/tests/UI/pages/FO/myAccount/addAddress.ts
+++ b/tests/UI/pages/FO/myAccount/addAddress.ts
@@ -9,7 +9,7 @@ import AddressData from '@data/faker/address';
  * @class
  * @extends FOBasePage
  */
-class AddAddress extends FOBasePage {
+class AddAddressPage extends FOBasePage {
   public readonly pageTitle: string;
 
   public readonly creationFormTitle: string;
@@ -48,8 +48,8 @@ class AddAddress extends FOBasePage {
    * @constructs
    * Setting up texts and selectors to use on add address page
    */
-  constructor() {
-    super();
+  constructor(theme: string = 'classic') {
+    super(theme);
 
     this.pageTitle = 'Address';
     this.creationFormTitle = 'New address';
@@ -157,4 +157,5 @@ class AddAddress extends FOBasePage {
   }
 }
 
-export default new AddAddress();
+const addAddressPage = new AddAddressPage();
+export {addAddressPage, AddAddressPage};
diff --git a/tests/UI/pages/FO/myAccount/addresses.ts b/tests/UI/pages/FO/myAccount/addresses.ts
index a815038b9cecd..e4fc2983ec061 100644
--- a/tests/UI/pages/FO/myAccount/addresses.ts
+++ b/tests/UI/pages/FO/myAccount/addresses.ts
@@ -8,7 +8,7 @@ import type {Page} from 'playwright';
  * @class
  * @extends FOBasePage
  */
-class Addresses extends FOBasePage {
+class AddressesPage extends FOBasePage {
   public readonly pageTitle: string;
 
   public readonly addressPageTitle: string;
@@ -35,8 +35,8 @@ class Addresses extends FOBasePage {
    * @constructs
    * Setting up texts and selectors to use on addresses page
    */
-  constructor() {
-    super();
+  constructor(theme: string = 'classic') {
+    super(theme);
 
     this.pageTitle = 'Addresses';
     this.addressPageTitle = 'Address';
@@ -119,4 +119,5 @@ class Addresses extends FOBasePage {
   }
 }
 
-export default new Addresses();
+const addressesPage = new AddressesPage();
+export {addressesPage, AddressesPage};
diff --git a/tests/UI/pages/FO/myAccount/creditSlips.ts b/tests/UI/pages/FO/myAccount/creditSlips.ts
index 4ea9af10dbd00..fe50a8e43a0cb 100644
--- a/tests/UI/pages/FO/myAccount/creditSlips.ts
+++ b/tests/UI/pages/FO/myAccount/creditSlips.ts
@@ -7,7 +7,7 @@ import type {Page} from 'playwright';
  * @class
  * @extends FOBasePage
  */
-class CreditSlip extends FOBasePage {
+class CreditSlipPage extends FOBasePage {
   public readonly pageTitle: string;
 
   public readonly noCreditSlipsInfoMessage: string;
@@ -30,8 +30,8 @@ class CreditSlip extends FOBasePage {
    * @constructs
    * Setting up texts and selectors to use on credit slip page
    */
-  constructor() {
-    super();
+  constructor(theme: string = 'classic') {
+    super(theme);
 
     // Title
     this.pageTitle = 'Credit slip';
@@ -141,4 +141,5 @@ class CreditSlip extends FOBasePage {
   }
 }
 
-export default new CreditSlip();
+const creditSlipPage = new CreditSlipPage();
+export {creditSlipPage, CreditSlipPage};
diff --git a/tests/UI/pages/FO/myAccount/identity.ts b/tests/UI/pages/FO/myAccount/identity.ts
index 3f78a44726df2..dd3b723ff3a40 100644
--- a/tests/UI/pages/FO/myAccount/identity.ts
+++ b/tests/UI/pages/FO/myAccount/identity.ts
@@ -7,7 +7,7 @@ import type {Page} from 'playwright';
  * @class
  * @extends FOBasePage
  */
-class AccountIdentity extends FOBasePage {
+class AccountIdentityPage extends FOBasePage {
   public readonly pageTitle: string;
 
   public readonly successfulUpdateMessage: string;
@@ -54,8 +54,8 @@ class AccountIdentity extends FOBasePage {
    * @constructs
    * Setting up texts and selectors to use on identity page
    */
-  constructor() {
-    super();
+  constructor(theme: string = 'classic') {
+    super(theme);
 
     this.pageTitle = 'Identity';
     this.successfulUpdateMessage = 'Information successfully updated.';
@@ -164,4 +164,5 @@ class AccountIdentity extends FOBasePage {
   }
 }
 
-export default new AccountIdentity();
+const accountIdentityPage = new AccountIdentityPage();
+export {accountIdentityPage, AccountIdentityPage};
diff --git a/tests/UI/pages/FO/myAccount/index.ts b/tests/UI/pages/FO/myAccount/index.ts
index 75c9c2f8daba4..84229ddc43773 100644
--- a/tests/UI/pages/FO/myAccount/index.ts
+++ b/tests/UI/pages/FO/myAccount/index.ts
@@ -36,8 +36,8 @@ class MyAccountPage extends FOBasePage {
    * @constructs
    * Setting up texts and selectors to use on my account page
    */
-  constructor() {
-    super();
+  constructor(theme: string = 'classic') {
+    super(theme);
 
     this.pageTitle = 'My account';
     this.resetPasswordSuccessMessage = 'Your password has been successfully reset and a confirmation has been sent to'
diff --git a/tests/UI/pages/FO/myAccount/myWishlists.ts b/tests/UI/pages/FO/myAccount/myWishlists.ts
index 9a7de4451f1ab..4a20510700259 100644
--- a/tests/UI/pages/FO/myAccount/myWishlists.ts
+++ b/tests/UI/pages/FO/myAccount/myWishlists.ts
@@ -7,7 +7,7 @@ import type {Page} from 'playwright';
  * @class
  * @extends FOBasePage
  */
-class MyWishlists extends FOBasePage {
+class MyWishlistsPage extends FOBasePage {
   public readonly pageTitle: string;
 
   private readonly headerTitle: string;
@@ -16,8 +16,8 @@ class MyWishlists extends FOBasePage {
    * @constructs
    * Setting up texts and selectors to use on vouchers page
    */
-  constructor() {
-    super();
+  constructor(theme: string = 'classic') {
+    super(theme);
 
     this.pageTitle = 'My wishlists';
 
@@ -39,4 +39,5 @@ class MyWishlists extends FOBasePage {
   }
 }
 
-export default new MyWishlists();
+const myWishlistsPage = new MyWishlistsPage();
+export {myWishlistsPage, MyWishlistsPage};
diff --git a/tests/UI/pages/FO/myAccount/orderHistory.ts b/tests/UI/pages/FO/myAccount/orderHistory.ts
index aed7d565f5919..3aac3a19abc03 100644
--- a/tests/UI/pages/FO/myAccount/orderHistory.ts
+++ b/tests/UI/pages/FO/myAccount/orderHistory.ts
@@ -52,8 +52,8 @@ class OrderHistoryPage extends FOBasePage {
    * @constructs
    * Setting up texts and selectors to use on order history page
    */
-  constructor() {
-    super();
+  constructor(theme: string = 'classic') {
+    super(theme);
 
     this.pageTitle = 'Order history';
 
@@ -259,4 +259,5 @@ class OrderHistoryPage extends FOBasePage {
   }
 }
 
-export default new OrderHistoryPage();
+const orderHistoryPage = new OrderHistoryPage();
+export {orderHistoryPage, OrderHistoryPage};
diff --git a/tests/UI/pages/FO/newProducts/index.ts b/tests/UI/pages/FO/newProducts/index.ts
index d4b17935f3009..215cc8453c023 100644
--- a/tests/UI/pages/FO/newProducts/index.ts
+++ b/tests/UI/pages/FO/newProducts/index.ts
@@ -5,18 +5,19 @@ import FOBasePage from '@pages/FO/FObasePage';
  * @class
  * @extends FOBasePage
  */
-class NewProducts extends FOBasePage {
+class NewProductsPage extends FOBasePage {
   public readonly pageTitle: string;
 
   /**
    * @constructs
    * Setting up texts and selectors to use on new products page
    */
-  constructor() {
-    super();
+  constructor(theme: string = 'classic') {
+    super(theme);
 
     this.pageTitle = 'New products';
   }
 }
 
-export default new NewProducts();
+const newProductsPage = new NewProductsPage();
+export {newProductsPage, NewProductsPage};
diff --git a/tests/UI/pages/FO/orderTracking/guestOrderTracking.ts b/tests/UI/pages/FO/orderTracking/guestOrderTracking.ts
index 11b14c188e385..230f5372e3077 100644
--- a/tests/UI/pages/FO/orderTracking/guestOrderTracking.ts
+++ b/tests/UI/pages/FO/orderTracking/guestOrderTracking.ts
@@ -5,19 +5,21 @@ import FOBasePage from '@pages/FO/FObasePage';
  * @class
  * @extends FOBasePage
  */
-class GuestOrderTracking extends FOBasePage {
+class GuestOrderTrackingPage extends FOBasePage {
   public readonly pageTitle: string;
 
   /**
    * @constructs
    * Setting up texts and selectors to use on Guest order tracking page
    */
-  constructor() {
-    super();
+  constructor(theme: string = 'classic') {
+    super(theme);
+
     this.pageTitle = 'Guest tracking';
 
     // Selectors for the page
   }
 }
 
-export default new GuestOrderTracking();
+const guestOrderTrackingPage = new GuestOrderTrackingPage();
+export {guestOrderTrackingPage, GuestOrderTrackingPage};
diff --git a/tests/UI/pages/FO/passwordReminder/index.ts b/tests/UI/pages/FO/passwordReminder/index.ts
index 61463b772d5d5..1222018941c36 100644
--- a/tests/UI/pages/FO/passwordReminder/index.ts
+++ b/tests/UI/pages/FO/passwordReminder/index.ts
@@ -34,8 +34,8 @@ class PasswordReminderPage extends FOBasePage {
    * @constructs
    * Setting up texts and selectors to use on password reminder page
    */
-  constructor() {
-    super();
+  constructor(theme: string = 'classic') {
+    super(theme);
 
     this.pageTitle = 'Forgot your password';
     this.errorMessage = 'You can regenerate your password only every 360 minute(s)';
diff --git a/tests/UI/pages/FO/pricesDrop/index.ts b/tests/UI/pages/FO/pricesDrop/index.ts
index 119a23d165f54..be2c13b6b738e 100644
--- a/tests/UI/pages/FO/pricesDrop/index.ts
+++ b/tests/UI/pages/FO/pricesDrop/index.ts
@@ -5,18 +5,19 @@ import FOBasePage from '@pages/FO/FObasePage';
  * @class
  * @extends FOBasePage
  */
-class PricesDrop extends FOBasePage {
+class PricesDropPage extends FOBasePage {
   public readonly pageTitle: string;
 
   /**
    * @constructs
    * Setting up texts and selectors to use on prices drop page
    */
-  constructor() {
-    super();
+  constructor(theme: string = 'classic') {
+    super(theme);
 
     this.pageTitle = 'Prices drop';
   }
 }
 
-export default new PricesDrop();
+const pricesDropPage = new PricesDropPage();
+export {pricesDropPage, PricesDropPage};
diff --git a/tests/UI/pages/FO/searchResults/index.ts b/tests/UI/pages/FO/searchResults/index.ts
index e4955d4db6ec5..527d597c05732 100644
--- a/tests/UI/pages/FO/searchResults/index.ts
+++ b/tests/UI/pages/FO/searchResults/index.ts
@@ -36,8 +36,9 @@ class SearchResultsPage extends FOBasePage {
    * @constructs
    * Setting up texts and selectors to use on search page
    */
-  constructor() {
-    super();
+  constructor(theme: string = 'classic') {
+    super(theme);
+
     this.pageTitle = 'Search';
 
     // Selectors for search Results page
diff --git a/tests/UI/pages/FO/securePayment/index.ts b/tests/UI/pages/FO/securePayment/index.ts
index 4141930dcbbe6..38a4ac75b79f5 100644
--- a/tests/UI/pages/FO/securePayment/index.ts
+++ b/tests/UI/pages/FO/securePayment/index.ts
@@ -5,18 +5,19 @@ import FOBasePage from '@pages/FO/FObasePage';
  * @class
  * @extends FOBasePage
  */
-class SecurePayment extends FOBasePage {
+class SecurePaymentPage extends FOBasePage {
   public readonly pageTitle: string;
 
   /**
    * @constructs
    * Setting up texts and selectors to use on secure payment page
    */
-  constructor() {
-    super();
+  constructor(theme: string = 'classic') {
+    super(theme);
 
     this.pageTitle = 'Secure payment';
   }
 }
 
-export default new SecurePayment();
+const securePaymentPage = new SecurePaymentPage();
+export {securePaymentPage, SecurePaymentPage};
diff --git a/tests/UI/pages/FO/siteMap/index.ts b/tests/UI/pages/FO/siteMap/index.ts
index 2bf37560d0f3c..117ae71047a4b 100644
--- a/tests/UI/pages/FO/siteMap/index.ts
+++ b/tests/UI/pages/FO/siteMap/index.ts
@@ -7,7 +7,7 @@ import type {Page} from 'playwright';
  * @class
  * @extends FOBasePage
  */
-class SiteMap extends FOBasePage {
+class SiteMapPage extends FOBasePage {
   public readonly pageTitle: string;
 
   private readonly categoryNameSelect: (id: number) => string;
@@ -24,8 +24,8 @@ class SiteMap extends FOBasePage {
    * @constructs
    * Setting up texts and selectors to use on site map page
    */
-  constructor() {
-    super();
+  constructor(theme: string = 'classic') {
+    super(theme);
 
     this.pageTitle = 'Sitemap';
 
@@ -99,4 +99,5 @@ class SiteMap extends FOBasePage {
   }
 }
 
-export default new SiteMap();
+const siteMapPage = new SiteMapPage();
+export {siteMapPage, SiteMapPage};
diff --git a/tests/UI/pages/FO/stores/index.ts b/tests/UI/pages/FO/stores/index.ts
index 3e4e899d6d16d..7b07874002e21 100644
--- a/tests/UI/pages/FO/stores/index.ts
+++ b/tests/UI/pages/FO/stores/index.ts
@@ -7,7 +7,7 @@ import type {Page} from 'playwright';
  * @class
  * @extends FOBasePage
  */
-class Stores extends FOBasePage {
+class StoresPage extends FOBasePage {
   public readonly pageTitle: string;
 
   public readonly storeBlock: (idStore: number) => string;
@@ -18,8 +18,8 @@ class Stores extends FOBasePage {
    * @constructs
    * Setting up texts and selectors to use on stores page
    */
-  constructor() {
-    super();
+  constructor(theme: string = 'classic') {
+    super(theme);
 
     this.pageTitle = 'Stores';
 
@@ -38,4 +38,5 @@ class Stores extends FOBasePage {
   }
 }
 
-export default new Stores();
+const storesPage = new StoresPage();
+export {storesPage, StoresPage};
diff --git a/tests/UI/pages/FO/termsAndConditionsOfUse/index.ts b/tests/UI/pages/FO/termsAndConditionsOfUse/index.ts
index 7ca53f0601330..2eb5994f364ef 100644
--- a/tests/UI/pages/FO/termsAndConditionsOfUse/index.ts
+++ b/tests/UI/pages/FO/termsAndConditionsOfUse/index.ts
@@ -5,18 +5,19 @@ import FOBasePage from '@pages/FO/FObasePage';
  * @class
  * @extends FOBasePage
  */
-class TermsAndConditionsOfUse extends FOBasePage {
+class TermsAndConditionsOfUsePage extends FOBasePage {
   public readonly pageTitle: string;
 
   /**
    * @constructs
    * Setting up texts and selectors to use on terms and conditions of use page
    */
-  constructor() {
-    super();
+  constructor(theme: string = 'classic') {
+    super(theme);
 
     this.pageTitle = 'Terms and conditions of use';
   }
 }
 
-export default new TermsAndConditionsOfUse();
+const termsAndConditionsOfUsePage = new TermsAndConditionsOfUsePage();
+export {termsAndConditionsOfUsePage, TermsAndConditionsOfUsePage};

From 395b744c805bf1cc1afa34b28ae38145e9680603 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Sep 2023 04:47:51 +0000
Subject: [PATCH 1012/1030] Bump playwright from 1.37.1 to 1.38.0 in /tests/UI

Bumps [playwright](https://github.com/Microsoft/playwright) from 1.37.1 to 1.38.0.
- [Release notes](https://github.com/Microsoft/playwright/releases)
- [Commits](https://github.com/Microsoft/playwright/compare/v1.37.1...v1.38.0)

---
updated-dependencies:
- dependency-name: playwright
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/UI/package-lock.json | 35 +++++++++++++++++++----------------
 tests/UI/package.json      |  2 +-
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json
index d48c74ea69a61..f1478e39c6409 100644
--- a/tests/UI/package-lock.json
+++ b/tests/UI/package-lock.json
@@ -24,7 +24,7 @@
         "mocha": "^10.2.0",
         "mochawesome": "^7.1.3",
         "pdfjs-dist": "^3.4.120",
-        "playwright": "^1.37.1",
+        "playwright": "^1.38.0",
         "xpath-ts": "^1.3.13"
       },
       "devDependencies": {
@@ -5805,24 +5805,26 @@
       }
     },
     "node_modules/playwright": {
-      "version": "1.37.1",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.37.1.tgz",
-      "integrity": "sha512-bgUXRrQKhT48zHdxDYQTpf//0xDfDd5hLeEhjuSw8rXEGoT9YeElpfvs/izonTNY21IQZ7d3s22jLxYaAnubbQ==",
-      "hasInstallScript": true,
+      "version": "1.38.0",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.38.0.tgz",
+      "integrity": "sha512-fJGw+HO0YY+fU/F1N57DMO+TmXHTrmr905J05zwAQE9xkuwP/QLDk63rVhmyxh03dYnEhnRbsdbH9B0UVVRB3A==",
       "dependencies": {
-        "playwright-core": "1.37.1"
+        "playwright-core": "1.38.0"
       },
       "bin": {
         "playwright": "cli.js"
       },
       "engines": {
         "node": ">=16"
+      },
+      "optionalDependencies": {
+        "fsevents": "2.3.2"
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.37.1",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.37.1.tgz",
-      "integrity": "sha512-17EuQxlSIYCmEMwzMqusJ2ztDgJePjrbttaefgdsiqeLWidjYz9BxXaTaZWxH1J95SHGk6tjE+dwgWILJoUZfA==",
+      "version": "1.38.0",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.38.0.tgz",
+      "integrity": "sha512-f8z1y8J9zvmHoEhKgspmCvOExF2XdcxMW8jNRuX4vkQFrzV4MlZ55iwb5QeyiFQgOFCUolXiRHgpjSEnqvO48g==",
       "bin": {
         "playwright-core": "cli.js"
       },
@@ -11946,17 +11948,18 @@
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
     },
     "playwright": {
-      "version": "1.37.1",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.37.1.tgz",
-      "integrity": "sha512-bgUXRrQKhT48zHdxDYQTpf//0xDfDd5hLeEhjuSw8rXEGoT9YeElpfvs/izonTNY21IQZ7d3s22jLxYaAnubbQ==",
+      "version": "1.38.0",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.38.0.tgz",
+      "integrity": "sha512-fJGw+HO0YY+fU/F1N57DMO+TmXHTrmr905J05zwAQE9xkuwP/QLDk63rVhmyxh03dYnEhnRbsdbH9B0UVVRB3A==",
       "requires": {
-        "playwright-core": "1.37.1"
+        "fsevents": "2.3.2",
+        "playwright-core": "1.38.0"
       }
     },
     "playwright-core": {
-      "version": "1.37.1",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.37.1.tgz",
-      "integrity": "sha512-17EuQxlSIYCmEMwzMqusJ2ztDgJePjrbttaefgdsiqeLWidjYz9BxXaTaZWxH1J95SHGk6tjE+dwgWILJoUZfA=="
+      "version": "1.38.0",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.38.0.tgz",
+      "integrity": "sha512-f8z1y8J9zvmHoEhKgspmCvOExF2XdcxMW8jNRuX4vkQFrzV4MlZ55iwb5QeyiFQgOFCUolXiRHgpjSEnqvO48g=="
     },
     "prelude-ls": {
       "version": "1.1.2",
diff --git a/tests/UI/package.json b/tests/UI/package.json
index 92cb9034b7288..baf3a0835a475 100644
--- a/tests/UI/package.json
+++ b/tests/UI/package.json
@@ -117,7 +117,7 @@
     "mocha": "^10.2.0",
     "mochawesome": "^7.1.3",
     "pdfjs-dist": "^3.4.120",
-    "playwright": "^1.37.1",
+    "playwright": "^1.38.0",
     "xpath-ts": "^1.3.13"
   },
   "devDependencies": {

From a71cdde17526e6dfcafa79a4f44ec0fecd8b741f Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Mon, 18 Sep 2023 16:29:31 +0200
Subject: [PATCH 1013/1030] Github Actions : Added `npx playwright install`

---
 .github/workflows/cron_nightly_tests_reusable.yml |  8 ++++++++
 .github/workflows/sanity.yml                      | 10 +++++++++-
 .github/workflows/ui_tests_code_checks.yml        |  3 +++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/cron_nightly_tests_reusable.yml b/.github/workflows/cron_nightly_tests_reusable.yml
index c993f805af821..3ccbf682a00e2 100644
--- a/.github/workflows/cron_nightly_tests_reusable.yml
+++ b/.github/workflows/cron_nightly_tests_reusable.yml
@@ -224,6 +224,10 @@ jobs:
         working-directory: ${{ inputs.TESTS_DIR }}
         run: npm ci
 
+      - name: Install browsers
+        working-directory: ${{ inputs.TESTS_DIR }}
+        run: npx playwright install --with-deps
+
       # Run tests (if error, we continue for uploading report)
       - name: Run tests
         continue-on-error: true
@@ -291,6 +295,10 @@ jobs:
         working-directory: ${{ inputs.TESTS_DIR }}
         run: npm ci
 
+      - name: Install browsers
+        working-directory: ${{ inputs.TESTS_DIR }}
+        run: npx playwright install --with-deps
+
       - name: Combine reports
         working-directory: ${{ inputs.TESTS_DIR }}
         env:
diff --git a/.github/workflows/sanity.yml b/.github/workflows/sanity.yml
index 16ee7f76c1975..15e9b36b6e7aa 100644
--- a/.github/workflows/sanity.yml
+++ b/.github/workflows/sanity.yml
@@ -40,8 +40,16 @@ jobs:
         run: mv .env.ci .env
         working-directory: ./tests/UI
 
+      - name: Install dependencies
+        working-directory: ./tests/UI
+        run: npm ci
+
+      - name: Install browsers
+        working-directory: ./tests/UI
+        run: npx playwright install --with-deps
+
       - name: Run tests
-        run: npm ci && npm run test:sanity:fast-fail
+        run: npm run test:sanity:fast-fail
         working-directory: ./tests/UI
         env:
           ENABLE_SSL: true
diff --git a/.github/workflows/ui_tests_code_checks.yml b/.github/workflows/ui_tests_code_checks.yml
index d4e4ce042836b..b34164bfaca44 100644
--- a/.github/workflows/ui_tests_code_checks.yml
+++ b/.github/workflows/ui_tests_code_checks.yml
@@ -92,6 +92,9 @@ jobs:
       - name: Install dependencies in UI tests directory
         run: npm ci
 
+      - name: Install browsers
+        run: npx playwright install --with-deps
+
       - name: Generate mocha reports with failed steps
         run: GENERATE_FAILED_STEPS=true npm run test:all
         continue-on-error: true

From 2f2d5cf426c8e8c19b077d6e78321d5b6cefd1f8 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Mon, 18 Sep 2023 16:52:48 +0200
Subject: [PATCH 1014/1030] Functional Tests : Fixed deprecations

---
 .github/workflows/ui_tests_code_checks.yml    |  3 ++
 .../BO/advancedParameters/email/index.ts      |  4 +--
 .../pages/BO/advancedParameters/logs/index.ts |  4 +--
 tests/UI/pages/BO/catalog/brands/add.ts       |  2 +-
 .../discounts/catalogPriceRules/add.ts        |  4 +--
 .../discounts/catalogPriceRules/index.ts      |  4 +--
 tests/UI/pages/BO/catalog/products/add.ts     |  8 ++---
 tests/UI/pages/BO/catalog/products/index.ts   | 14 ++++-----
 .../catalog/productsV2/add/combinationsTab.ts |  2 +-
 .../catalog/productsV2/add/descriptionTab.ts  |  6 ++--
 .../BO/catalog/productsV2/add/packTab.ts      |  2 +-
 tests/UI/pages/BO/catalog/productsV2/index.ts | 30 +++++++++----------
 tests/UI/pages/BO/catalog/stocks/index.ts     |  2 +-
 .../BO/catalog/stocks/movements/index.ts      |  2 +-
 tests/UI/pages/BO/catalog/suppliers/add.ts    |  2 +-
 tests/UI/pages/BO/customers/index.ts          |  4 +--
 .../pages/BO/customers/outstanding/index.ts   |  4 +--
 .../pages/BO/modules/moduleManager/index.ts   |  2 +-
 tests/UI/pages/BO/orders/creditSlips/index.ts |  4 +--
 tests/UI/pages/BO/orders/index.ts             |  4 +--
 .../UI/pages/BO/orders/shoppingCarts/index.ts |  4 +--
 .../trafficAndSeo/seoAndUrls/add.ts           |  2 +-
 tests/UI/pages/commonPage.ts                  |  2 +-
 tests/UI/pages/install/index.ts               | 14 ++++-----
 tests/UI/tools/urls.ts                        |  8 ++---
 25 files changed, 70 insertions(+), 67 deletions(-)

diff --git a/.github/workflows/ui_tests_code_checks.yml b/.github/workflows/ui_tests_code_checks.yml
index b34164bfaca44..c9de7c39eef25 100644
--- a/.github/workflows/ui_tests_code_checks.yml
+++ b/.github/workflows/ui_tests_code_checks.yml
@@ -42,6 +42,9 @@ jobs:
       - name: Install dependencies in UI tests directory
         run: npm ci
 
+      - name: Install browsers
+        run: npx playwright install --with-deps
+
       - name: Check eslint errors
         run: npm run lint
 
diff --git a/tests/UI/pages/BO/advancedParameters/email/index.ts b/tests/UI/pages/BO/advancedParameters/email/index.ts
index 366e395b94e1b..8747ac19e22d4 100644
--- a/tests/UI/pages/BO/advancedParameters/email/index.ts
+++ b/tests/UI/pages/BO/advancedParameters/email/index.ts
@@ -250,8 +250,8 @@ class Email extends BOBasePage {
    * @returns {Promise<void>}
    */
   async filterEmailLogsByDate(page: Page, dateFrom: string, dateTo: string): Promise<void> {
-    await page.type(this.emailFilterColumnInput('date_add_from'), dateFrom);
-    await page.type(this.emailFilterColumnInput('date_add_to'), dateTo);
+    await page.locator(this.emailFilterColumnInput('date_add_from')).fill(dateFrom);
+    await page.locator(this.emailFilterColumnInput('date_add_to')).fill(dateTo);
     // click on search
     await this.clickAndWaitForURL(page, this.filterSearchButton);
   }
diff --git a/tests/UI/pages/BO/advancedParameters/logs/index.ts b/tests/UI/pages/BO/advancedParameters/logs/index.ts
index 226e6f2e71e46..416b21011198f 100644
--- a/tests/UI/pages/BO/advancedParameters/logs/index.ts
+++ b/tests/UI/pages/BO/advancedParameters/logs/index.ts
@@ -275,8 +275,8 @@ class Logs extends BOBasePage {
    * @returns {Promise<void>}
    */
   async filterLogsByDate(page: Page, dateFrom: string, dateTo: string): Promise<void> {
-    await page.type(this.filterColumnInput('date_add_from'), dateFrom);
-    await page.type(this.filterColumnInput('date_add_to'), dateTo);
+    await page.locator(this.filterColumnInput('date_add_from')).fill(dateFrom);
+    await page.locator(this.filterColumnInput('date_add_to')).fill(dateTo);
     // click on search
     await this.clickAndWaitForURL(page, this.filterSearchButton);
   }
diff --git a/tests/UI/pages/BO/catalog/brands/add.ts b/tests/UI/pages/BO/catalog/brands/add.ts
index 66b68590fbc7c..3c76ff19123bc 100644
--- a/tests/UI/pages/BO/catalog/brands/add.ts
+++ b/tests/UI/pages/BO/catalog/brands/add.ts
@@ -139,7 +139,7 @@ class AddBrand extends BOBasePage {
   async addKeywords(page: Page, keywords: string[], id: number = 1): Promise<void> {
     /* eslint-disable no-await-in-loop, no-restricted-syntax */
     for (const keyword of keywords) {
-      await page.type(this.metaKeywordsInput(id), keyword);
+      await page.locator(this.metaKeywordsInput(id)).fill(keyword);
       await page.keyboard.press('Enter');
     }
     /* eslint-enable no-await-in-loop, no-restricted-syntax */
diff --git a/tests/UI/pages/BO/catalog/discounts/catalogPriceRules/add.ts b/tests/UI/pages/BO/catalog/discounts/catalogPriceRules/add.ts
index 5aa66d8876781..52aa61b87c4e5 100644
--- a/tests/UI/pages/BO/catalog/discounts/catalogPriceRules/add.ts
+++ b/tests/UI/pages/BO/catalog/discounts/catalogPriceRules/add.ts
@@ -77,10 +77,10 @@ class AddCatalogPriceRule extends BOBasePage {
     await this.selectByVisibleText(page, this.groupSelect, priceRuleData.group);
     await this.setValue(page, this.fromQuantityInput, priceRuleData.fromQuantity);
     if (priceRuleData.fromDate !== '') {
-      await page.type(this.fromDateInput, priceRuleData.fromDate);
+      await page.locator(this.fromDateInput).fill(priceRuleData.fromDate);
     }
     if (priceRuleData.toDate !== '') {
-      await page.type(this.toDateInput, priceRuleData.toDate);
+      await page.locator(this.toDateInput).fill(priceRuleData.toDate);
     }
     await this.selectByVisibleText(page, this.reductionTypeSelect, priceRuleData.reductionType);
     await this.selectByVisibleText(page, this.reductionTaxSelect, priceRuleData.reductionTax);
diff --git a/tests/UI/pages/BO/catalog/discounts/catalogPriceRules/index.ts b/tests/UI/pages/BO/catalog/discounts/catalogPriceRules/index.ts
index d8ef4eff42b82..25f401ef8dfb7 100644
--- a/tests/UI/pages/BO/catalog/discounts/catalogPriceRules/index.ts
+++ b/tests/UI/pages/BO/catalog/discounts/catalogPriceRules/index.ts
@@ -240,8 +240,8 @@ class CatalogPriceRules extends BOBasePage {
    * @returns {Promise<void>}
    */
   async filterByDate(page: Page, filterBy: string, dateFrom: string, dateTo: string): Promise<void> {
-    await page.type(this.filterDateFromColumn(filterBy), dateFrom);
-    await page.type(this.filterDateToColumn(filterBy), dateTo);
+    await page.locator(this.filterDateFromColumn(filterBy)).fill(dateFrom);
+    await page.locator(this.filterDateToColumn(filterBy)).fill(dateTo);
     // click on search
     await page.click(this.filterSearchButton);
     await this.elementVisible(page, this.filterResetButton);
diff --git a/tests/UI/pages/BO/catalog/products/add.ts b/tests/UI/pages/BO/catalog/products/add.ts
index 53140b45b72c7..177ef3b867e6c 100644
--- a/tests/UI/pages/BO/catalog/products/add.ts
+++ b/tests/UI/pages/BO/catalog/products/add.ts
@@ -254,7 +254,7 @@ class AddProduct extends BOBasePage {
     await page.keyboard.press('Backspace');
 
     // Fill the text
-    await page.keyboard.type(value);
+    await page.locator(`${selector} .mce-edit-area`).pressSequentially(value);
   }
 
   /**
@@ -413,7 +413,7 @@ class AddProduct extends BOBasePage {
    * @return {Promise<void>}
    */
   async addAttribute(page: Page, attribute: string): Promise<void> {
-    await page.type(this.selectAttributeInput, attribute);
+    await page.locator(this.selectAttributeInput).fill(attribute);
     await page.keyboard.press('ArrowDown');
     await page.keyboard.press('Enter');
   }
@@ -436,7 +436,7 @@ class AddProduct extends BOBasePage {
     }
 
     // Edit quantity
-    await page.type(this.productCombinationBulkQuantityInput, quantity.toString());
+    await page.locator(this.productCombinationBulkQuantityInput).fill(quantity.toString());
     await this.scrollTo(page, this.applyOnCombinationsButton);
     await page.click(this.applyOnCombinationsButton);
 
@@ -700,7 +700,7 @@ class AddProduct extends BOBasePage {
    * @returns {Promise<void>}
    */
   async addProductToPack(page: Page, product: string, quantity: number): Promise<void> {
-    await page.type(this.packItemsInput, product);
+    await page.locator(this.packItemsInput).fill(product);
     await this.waitForSelectorAndClick(page, this.packsearchResult);
     await this.setValue(page, this.packQuantityInput, quantity);
     await page.click(this.addProductToPackButton);
diff --git a/tests/UI/pages/BO/catalog/products/index.ts b/tests/UI/pages/BO/catalog/products/index.ts
index c3f148d8f9f26..8adae85575639 100644
--- a/tests/UI/pages/BO/catalog/products/index.ts
+++ b/tests/UI/pages/BO/catalog/products/index.ts
@@ -237,8 +237,8 @@ class Products extends BOBasePage {
    * @return {Promise<void>}
    */
   async filterIDProducts(page: Page, idMin: number, idMax: number): Promise<void> {
-    await page.type(this.productFilterIDMinInput, idMin.toString());
-    await page.type(this.productFilterIDMaxInput, idMax.toString());
+    await page.locator(this.productFilterIDMinInput).fill(idMin.toString());
+    await page.locator(this.productFilterIDMaxInput).fill(idMax.toString());
     await page.click(this.filterSearchButton);
     await this.elementVisible(page, this.filterResetButton, 2000);
   }
@@ -291,8 +291,8 @@ class Products extends BOBasePage {
    * @return {Promise<void>}
    */
   async filterPriceProducts(page: Page, priceMin: number, priceMax: number): Promise<void> {
-    await page.type(this.productFilterPriceMinInput, priceMin.toString());
-    await page.type(this.productFilterPriceMaxInput, priceMax.toString());
+    await page.locator(this.productFilterPriceMinInput).fill(priceMin.toString());
+    await page.locator(this.productFilterPriceMaxInput).fill(priceMax.toString());
     await page.click(this.filterSearchButton);
     await this.elementVisible(page, this.filterResetButton, 2000);
   }
@@ -321,8 +321,8 @@ class Products extends BOBasePage {
    * @return {Promise<void>}
    */
   async filterQuantityProducts(page: Page, quantityMin: number, quantityMax: number): Promise<void> {
-    await page.type(this.productFilterQuantityMinInput, quantityMin.toString());
-    await page.type(this.productFilterQuantityMaxInput, quantityMax.toString());
+    await page.locator(this.productFilterQuantityMinInput).fill(quantityMin.toString());
+    await page.locator(this.productFilterQuantityMaxInput).fill(quantityMax.toString());
     await page.click(this.filterSearchButton);
     await this.elementVisible(page, this.filterResetButton, 2000);
   }
@@ -365,7 +365,7 @@ class Products extends BOBasePage {
     switch (filterType) {
       case 'input':
         if (typeof value === 'string') {
-          await page.type(this.productFilterInput(filterBy), value);
+          await page.locator(this.productFilterInput(filterBy)).fill(value);
         } else {
           switch (filterBy) {
             case 'id_product':
diff --git a/tests/UI/pages/BO/catalog/productsV2/add/combinationsTab.ts b/tests/UI/pages/BO/catalog/productsV2/add/combinationsTab.ts
index ebf72b91b8135..f1c90b86cb7ea 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/combinationsTab.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/combinationsTab.ts
@@ -321,7 +321,7 @@ class CombinationsTab extends BOBasePage {
    * @returns {Promise<void>}
    */
   async selectAttribute(page: Page, combination: string): Promise<void> {
-    await page.type(this.searchAttributesButton, combination);
+    await page.locator(this.searchAttributesButton).fill(combination);
     await page.keyboard.press('ArrowDown');
     await page.keyboard.press('Enter');
   }
diff --git a/tests/UI/pages/BO/catalog/productsV2/add/descriptionTab.ts b/tests/UI/pages/BO/catalog/productsV2/add/descriptionTab.ts
index 112ca59f484e1..41e509e8b72fb 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/descriptionTab.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/descriptionTab.ts
@@ -302,7 +302,7 @@ class DescriptionTab extends BOBasePage {
     await page.keyboard.press('Backspace');
 
     // Fill the text
-    await page.keyboard.type(value);
+    await page.locator(`${selector} .mce-edit-area`).pressSequentially(value);
   }
 
   /**
@@ -365,7 +365,7 @@ class DescriptionTab extends BOBasePage {
     await page.locator(this.addCategoryButton).click();
     await this.waitForVisibleSelector(page, this.addCategoryInput);
     for (let i: number = 0; i < categories.length; i++) {
-      await page.type(this.addCategoryInput, categories[i]);
+      await page.locator(this.addCategoryInput).pressSequentially(categories[i]);
       await page.keyboard.press('ArrowDown');
       await page.keyboard.press('Enter');
       await page.waitForTimeout(1000);
@@ -427,7 +427,7 @@ class DescriptionTab extends BOBasePage {
    * @returns {Promise<void>}
    */
   async addRelatedProduct(page: Page, productName: string): Promise<void> {
-    await page.type(this.relatedProductSelectButton, productName);
+    await page.locator(this.relatedProductSelectButton).fill(productName);
     await page.keyboard.press('ArrowDown');
     await page.keyboard.press('Enter');
   }
diff --git a/tests/UI/pages/BO/catalog/productsV2/add/packTab.ts b/tests/UI/pages/BO/catalog/productsV2/add/packTab.ts
index 85f12c54156ce..a7c818b750999 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/packTab.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/packTab.ts
@@ -128,7 +128,7 @@ class PackTab extends BOBasePage {
    */
   async searchProduct(page: Page, productName: string): Promise<string> {
     await this.waitForSelectorAndClick(page, this.packTabLink);
-    await page.type(this.searchProductInput, productName);
+    await page.locator(this.searchProductInput).fill(productName);
     await this.waitForVisibleSelector(page, this.searchResult);
     await page.waitForTimeout(1000);
 
diff --git a/tests/UI/pages/BO/catalog/productsV2/index.ts b/tests/UI/pages/BO/catalog/productsV2/index.ts
index 9c0d83e283bec..2a0db9c8610d8 100644
--- a/tests/UI/pages/BO/catalog/productsV2/index.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/index.ts
@@ -304,8 +304,8 @@ class Products extends BOBasePage {
     await this.waitForVisibleSelector(page, `${this.modalCreateProduct} iframe`);
     await this.waitForHiddenSelector(page, this.modalCreateProductLoader);
 
-    const createProductFrame: Frame | null = await page.frame({url: /sell\/catalog\/products-v2\/create/gmi});
-    await expect(createProductFrame).to.be.not.null;
+    const createProductFrame: Frame | null = page.frame({url: /sell\/catalog\/products-v2\/create/gmi});
+    expect(createProductFrame).to.be.not.eq(null);
 
     return this.getTextContent(createProductFrame!, this.productTypeDescription);
   }
@@ -329,8 +329,8 @@ class Products extends BOBasePage {
     await this.waitForVisibleSelector(page, `${this.modalCreateProduct} iframe`);
     await this.waitForHiddenSelector(page, this.modalCreateProductLoader);
 
-    const createProductFrame: Frame | null = await page.frame({url: /sell\/catalog\/products-v2\/create/gmi});
-    await expect(createProductFrame).to.be.not.null;
+    const createProductFrame: Frame | null = page.frame({url: /sell\/catalog\/products-v2\/create/gmi});
+    expect(createProductFrame).to.be.not.eq(null);
 
     await this.waitForSelectorAndClick(createProductFrame!, this.productType(productType));
   }
@@ -341,8 +341,8 @@ class Products extends BOBasePage {
    * @returns {Promise<void>}
    */
   async clickOnAddNewProduct(page: Page): Promise<void> {
-    const createProductFrame: Frame | null = await page.frame({url: /sell\/catalog\/products-v2\/create/gmi});
-    await expect(createProductFrame).to.be.not.null;
+    const createProductFrame: Frame | null = page.frame({url: /sell\/catalog\/products-v2\/create/gmi});
+    expect(createProductFrame).to.be.not.eq(null);
 
     await this.waitForSelectorAndClick(createProductFrame!, this.addNewProductButton);
   }
@@ -551,8 +551,8 @@ class Products extends BOBasePage {
    * @return {Promise<void>}
    */
   async filterProductsByID(page: Page, idMin: number, idMax: number): Promise<void> {
-    await page.type(this.productFilterIDMinInput, idMin.toString());
-    await page.type(this.productFilterIDMaxInput, idMax.toString());
+    await page.locator(this.productFilterIDMinInput).fill(idMin.toString());
+    await page.locator(this.productFilterIDMaxInput).fill(idMax.toString());
   }
 
   /**
@@ -563,8 +563,8 @@ class Products extends BOBasePage {
    * @return {Promise<void>}
    */
   async filterProductsByQuantity(page: Page, quantityMin: number, quantityMax: number): Promise<void> {
-    await page.type(this.productFilterQuantityMinInput, quantityMin.toString());
-    await page.type(this.productFilterQuantityMaxInput, quantityMax.toString());
+    await page.locator(this.productFilterQuantityMinInput).fill(quantityMin.toString());
+    await page.locator(this.productFilterQuantityMaxInput).fill(quantityMax.toString());
   }
 
   /**
@@ -575,8 +575,8 @@ class Products extends BOBasePage {
    * @return {Promise<void>}
    */
   async filterProductsByPrice(page: Page, priceMin: number, priceMax: number): Promise<void> {
-    await page.type(this.productFilterPriceMinInput, priceMin.toString());
-    await page.type(this.productFilterPriceMaxInput, priceMax.toString());
+    await page.locator(this.productFilterPriceMinInput).fill(priceMin.toString());
+    await page.locator(this.productFilterPriceMaxInput).fill(priceMax.toString());
   }
 
   /**
@@ -594,13 +594,13 @@ class Products extends BOBasePage {
         if (typeof value === 'string') {
           switch (filterBy) {
             case 'product_name':
-              await page.type(this.productFilterNameInput, value);
+              await page.locator(this.productFilterNameInput).fill(value);
               break;
             case 'reference':
-              await page.type(this.productFilterReferenceInput, value);
+              await page.locator(this.productFilterReferenceInput).fill(value);
               break;
             case 'category':
-              await page.type(this.productFilterCategoryInput, value);
+              await page.locator(this.productFilterCategoryInput).fill(value);
               break;
             case 'position':
               await this.setValue(page, this.productFilterPositionInput, value);
diff --git a/tests/UI/pages/BO/catalog/stocks/index.ts b/tests/UI/pages/BO/catalog/stocks/index.ts
index 2332142c5c5a3..f5508d62f00ef 100644
--- a/tests/UI/pages/BO/catalog/stocks/index.ts
+++ b/tests/UI/pages/BO/catalog/stocks/index.ts
@@ -255,7 +255,7 @@ class Stocks extends BOBasePage {
    * @returns {Promise<void>}
    */
   async simpleFilter(page: Page, value: string): Promise<void> {
-    await page.type(this.searchInput, value);
+    await page.locator(this.searchInput).fill(value);
     await page.click(this.searchButton);
     if (await this.elementVisible(page, this.productListLoading, 1000)) {
       await this.waitForHiddenSelector(page, this.productListLoading);
diff --git a/tests/UI/pages/BO/catalog/stocks/movements/index.ts b/tests/UI/pages/BO/catalog/stocks/movements/index.ts
index b1d216cb57e1e..d4d557b5f0294 100644
--- a/tests/UI/pages/BO/catalog/stocks/movements/index.ts
+++ b/tests/UI/pages/BO/catalog/stocks/movements/index.ts
@@ -110,7 +110,7 @@ class Movements extends BOBasePage {
    * @returns {Promise<void>}
    */
   async simpleFilter(page: Page, value: string): Promise<void> {
-    await page.type(this.searchInput, value);
+    await page.locator(this.searchInput).fill(value);
     await Promise.all([
       page.click(this.searchButton),
       this.waitForVisibleSelector(page, this.productListLoading),
diff --git a/tests/UI/pages/BO/catalog/suppliers/add.ts b/tests/UI/pages/BO/catalog/suppliers/add.ts
index 0ee51153cefae..411751ae5d5bd 100644
--- a/tests/UI/pages/BO/catalog/suppliers/add.ts
+++ b/tests/UI/pages/BO/catalog/suppliers/add.ts
@@ -188,7 +188,7 @@ class AddSupplier extends BOBasePage {
   async addKeywords(page: Page, keywords: string[], idLang: number = 1): Promise<void> {
     /* eslint-disable no-restricted-syntax */
     for (const keyword of keywords) {
-      await page.type(this.metaKeywordsInput(idLang), keyword);
+      await page.locator(this.metaKeywordsInput(idLang)).fill(keyword);
       await page.keyboard.press('Enter');
     }
     /* eslint-enable no-restricted-syntax */
diff --git a/tests/UI/pages/BO/customers/index.ts b/tests/UI/pages/BO/customers/index.ts
index 7d451647d9507..ae2071a38f29c 100644
--- a/tests/UI/pages/BO/customers/index.ts
+++ b/tests/UI/pages/BO/customers/index.ts
@@ -242,8 +242,8 @@ class Customers extends BOBasePage {
    * @returns {Promise<void>}
    */
   async filterCustomersByRegistration(page: Page, dateFrom: string, dateTo: string): Promise<void> {
-    await page.type(this.customerFilterColumnInput('date_add_from'), dateFrom);
-    await page.type(this.customerFilterColumnInput('date_add_to'), dateTo);
+    await page.locator(this.customerFilterColumnInput('date_add_from')).fill(dateFrom);
+    await page.locator(this.customerFilterColumnInput('date_add_to')).fill(dateTo);
     // click on search
     await this.clickAndWaitForURL(page, this.filterSearchButton);
   }
diff --git a/tests/UI/pages/BO/customers/outstanding/index.ts b/tests/UI/pages/BO/customers/outstanding/index.ts
index 726740b519fa9..dc10a049fdd26 100644
--- a/tests/UI/pages/BO/customers/outstanding/index.ts
+++ b/tests/UI/pages/BO/customers/outstanding/index.ts
@@ -282,8 +282,8 @@ class Outstanding extends BOBasePage {
    * @returns {Promise<void>}
    */
   async filterOutstandingByDate(page: Page, dateFrom: string, dateTo: string): Promise<void> {
-    await page.type(this.outstandingFilterColumnInput('date_add_from'), dateFrom);
-    await page.type(this.outstandingFilterColumnInput('date_add_to'), dateTo);
+    await page.locator(this.outstandingFilterColumnInput('date_add_from')).fill(dateFrom);
+    await page.locator(this.outstandingFilterColumnInput('date_add_to')).fill(dateTo);
     // click on search
     await this.clickAndWaitForURL(page, this.filterSearchButton);
   }
diff --git a/tests/UI/pages/BO/modules/moduleManager/index.ts b/tests/UI/pages/BO/modules/moduleManager/index.ts
index bd61ef09342e3..aa57aaf2b1357 100644
--- a/tests/UI/pages/BO/modules/moduleManager/index.ts
+++ b/tests/UI/pages/BO/modules/moduleManager/index.ts
@@ -230,7 +230,7 @@ class ModuleManager extends BOBasePage {
    */
   async searchModule(page: Page, module: ModuleData): Promise<boolean> {
     await this.reloadPage(page);
-    await page.type(this.searchModuleTagInput, module.tag);
+    await page.locator(this.searchModuleTagInput).fill(module.tag);
     await page.click(this.searchModuleButton);
 
     return this.isModuleVisible(page, module);
diff --git a/tests/UI/pages/BO/orders/creditSlips/index.ts b/tests/UI/pages/BO/orders/creditSlips/index.ts
index 3869a05275cf0..936efded5122b 100644
--- a/tests/UI/pages/BO/orders/creditSlips/index.ts
+++ b/tests/UI/pages/BO/orders/creditSlips/index.ts
@@ -175,8 +175,8 @@ class CreditSlips extends BOBasePage {
    * @returns {Promise<void>}
    */
   async filterCreditSlipsByDate(page: Page, dateFrom: string, dateTo: string): Promise<void> {
-    await page.type(this.creditSlipsFilterColumnInput('date_issued_from'), dateFrom);
-    await page.type(this.creditSlipsFilterColumnInput('date_issued_to'), dateTo);
+    await page.locator(this.creditSlipsFilterColumnInput('date_issued_from')).fill(dateFrom);
+    await page.locator(this.creditSlipsFilterColumnInput('date_issued_to')).fill(dateTo);
     // click on search
     await this.clickAndWaitForURL(page, this.filterSearchButton);
   }
diff --git a/tests/UI/pages/BO/orders/index.ts b/tests/UI/pages/BO/orders/index.ts
index 3cd11299e8a62..fa4ead0620b20 100644
--- a/tests/UI/pages/BO/orders/index.ts
+++ b/tests/UI/pages/BO/orders/index.ts
@@ -255,8 +255,8 @@ class Order extends BOBasePage {
    * @returns {Promise<void>}
    */
   async filterOrdersByDate(page: Page, dateFrom: string, dateTo: string): Promise<void> {
-    await page.type(this.filterColumn('date_add_from'), dateFrom);
-    await page.type(this.filterColumn('date_add_to'), dateTo);
+    await page.locator(this.filterColumn('date_add_from')).fill(dateFrom);
+    await page.locator(this.filterColumn('date_add_to')).fill(dateTo);
     // click on search
     await this.clickAndWaitForURL(page, this.filterSearchButton);
   }
diff --git a/tests/UI/pages/BO/orders/shoppingCarts/index.ts b/tests/UI/pages/BO/orders/shoppingCarts/index.ts
index cc370185ba707..0d7f6d2b0db11 100644
--- a/tests/UI/pages/BO/orders/shoppingCarts/index.ts
+++ b/tests/UI/pages/BO/orders/shoppingCarts/index.ts
@@ -276,8 +276,8 @@ class ShoppingCarts extends BOBasePage {
    * @returns {Promise<void>}
    */
   async filterByDate(page: Page, dateFrom: string, dateTo: string): Promise<void> {
-    await page.type(this.filterDateFromColumn, dateFrom);
-    await page.type(this.filterDateToColumn, dateTo);
+    await page.locator(this.filterDateFromColumn).fill(dateFrom);
+    await page.locator(this.filterDateToColumn).fill(dateTo);
     // click on search
     await this.clickAndWaitForURL(page, this.filterSearchButton);
   }
diff --git a/tests/UI/pages/BO/shopParameters/trafficAndSeo/seoAndUrls/add.ts b/tests/UI/pages/BO/shopParameters/trafficAndSeo/seoAndUrls/add.ts
index 9fe0fa749ab0c..1c719181e2f89 100644
--- a/tests/UI/pages/BO/shopParameters/trafficAndSeo/seoAndUrls/add.ts
+++ b/tests/UI/pages/BO/shopParameters/trafficAndSeo/seoAndUrls/add.ts
@@ -102,7 +102,7 @@ class AddSeoUrl extends BOBasePage {
    */
   async addKeywords(page: Page, keywords: string[], idLang: number = 1): Promise<void> {
     for (let i = 0; i < keywords.length; i++) {
-      await page.type(this.metaKeywordsInput(idLang), keywords[i]);
+      await page.locator(this.metaKeywordsInput(idLang)).fill(keywords[i]);
       await page.keyboard.press('Enter');
     }
   }
diff --git a/tests/UI/pages/commonPage.ts b/tests/UI/pages/commonPage.ts
index 3c4a815455b35..b48db676d4735 100755
--- a/tests/UI/pages/commonPage.ts
+++ b/tests/UI/pages/commonPage.ts
@@ -231,7 +231,7 @@ export default class CommonPage {
     await this.clearInput(page, selector);
 
     if (value !== null) {
-      await page.type(selector, value.toString());
+      await page.locator(selector).fill(value.toString());
     }
   }
 
diff --git a/tests/UI/pages/install/index.ts b/tests/UI/pages/install/index.ts
index 660151a224c84..018e330730be8 100755
--- a/tests/UI/pages/install/index.ts
+++ b/tests/UI/pages/install/index.ts
@@ -287,19 +287,19 @@ class Install extends CommonPage {
    * @return {Promise<void>}
    */
   async fillInformationForm(page: Page): Promise<void> {
-    await page.type(this.shopNameInput, global.INSTALL.SHOP_NAME);
+    await page.locator(this.shopNameInput).fill(global.INSTALL.SHOP_NAME);
 
     // Choosing country
     await page.click(this.countryChosenSelect);
-    await page.type(this.countryChosenSearchInput, global.INSTALL.COUNTRY);
+    await page.locator(this.countryChosenSearchInput).fill(global.INSTALL.COUNTRY);
     await page.keyboard.press('Enter');
     await page.click(this.enableSslRadio(global.INSTALL.ENABLE_SSL ? 1 : 0));
 
-    await page.type(this.firstNameInput, global.BO.FIRSTNAME);
-    await page.type(this.lastNameInput, global.BO.LASTNAME);
-    await page.type(this.emailInput, global.BO.EMAIL);
-    await page.type(this.passwordInput, global.BO.PASSWD);
-    await page.type(this.repeatPasswordInput, global.BO.PASSWD);
+    await page.locator(this.firstNameInput).fill(global.BO.FIRSTNAME);
+    await page.locator(this.lastNameInput).fill(global.BO.LASTNAME);
+    await page.locator(this.emailInput).fill(global.BO.EMAIL);
+    await page.locator(this.passwordInput).fill(global.BO.PASSWD);
+    await page.locator(this.repeatPasswordInput).fill(global.BO.PASSWD);
   }
 
   /**
diff --git a/tests/UI/tools/urls.ts b/tests/UI/tools/urls.ts
index 2c24fc46b4434..4ada3f0c1efe2 100644
--- a/tests/UI/tools/urls.ts
+++ b/tests/UI/tools/urls.ts
@@ -9,8 +9,8 @@ import {Page} from 'playwright';
 const loginBO = async function (page: Page): Promise<void> {
   const currentUrl: string = page.url();
 
-  await page.type('#email', global.BO.EMAIL);
-  await page.type('#passwd', global.BO.PASSWD);
+  await page.locator('#email').fill(global.BO.EMAIL);
+  await page.locator('#passwd').fill(global.BO.PASSWD);
 
   await Promise.all([
     page.click('#submit_login'),
@@ -34,8 +34,8 @@ const loginBO = async function (page: Page): Promise<void> {
 const loginFO = async function (page: Page): Promise<void> {
   const currentUrl: string = page.url();
 
-  await page.type('#login-form input[name=email]', Customers.johnDoe.email);
-  await page.type('#login-form input[name=password]', Customers.johnDoe.password);
+  await page.locator('#login-form input[name=email]').fill(Customers.johnDoe.email);
+  await page.locator('#login-form input[name=password]').fill(Customers.johnDoe.password);
 
   await Promise.all([
     page.click('#submit-login'),

From 9d83e7a3daeb07fbd94902855e9502476d8c75eb Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Tue, 19 Sep 2023 11:53:45 +0200
Subject: [PATCH 1015/1030] Functional Tests : Fixed Sanity Tests

---
 .../BO/catalog/productsV2/add/descriptionTab.ts      | 12 +++++++++---
 tests/UI/pages/BO/orders/view/productsBlock.ts       |  4 ++--
 tests/UI/pages/commonPage.ts                         |  2 +-
 tests/UI/pages/install/index.ts                      |  2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/tests/UI/pages/BO/catalog/productsV2/add/descriptionTab.ts b/tests/UI/pages/BO/catalog/productsV2/add/descriptionTab.ts
index 41e509e8b72fb..e06a983960a90 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/descriptionTab.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/descriptionTab.ts
@@ -59,10 +59,14 @@ class DescriptionTab extends BOBasePage {
 
   private readonly productSummaryTabLocale: (locale: string) => string;
 
+  private readonly productSummaryTabContent: (locale: string) => string;
+
   private readonly productDescription: string;
 
   private readonly productDescriptionTabLocale: (locale: string) => string;
 
+  private readonly productDescriptionTabContent: (locale: string) => string;
+
   private readonly productDefaultCategory: string;
 
   private readonly addCategoryButton: string;
@@ -128,8 +132,10 @@ class DescriptionTab extends BOBasePage {
     // Description & summary selectors
     this.productSummary = '#product_description_description_short';
     this.productSummaryTabLocale = (locale: string) => `${this.productSummary} a[data-locale="${locale}"]`;
+    this.productSummaryTabContent = (locale: string) => `${this.productSummary} div.panel[data-locale="${locale}"]`;
     this.productDescription = '#product_description_description';
     this.productDescriptionTabLocale = (locale: string) => `${this.productDescription} a[data-locale="${locale}"]`;
+    this.productDescriptionTabContent = (locale: string) => `${this.productDescription} div.panel[data-locale="${locale}"]`;
     // Categories selectors
     this.productDefaultCategory = '#product_description_categories_default_category_id';
     this.addCategoryButton = '#product_description_categories_add_categories_btn';
@@ -302,7 +308,7 @@ class DescriptionTab extends BOBasePage {
     await page.keyboard.press('Backspace');
 
     // Fill the text
-    await page.locator(`${selector} .mce-edit-area`).pressSequentially(value);
+    await page.keyboard.type(value);
   }
 
   /**
@@ -318,11 +324,11 @@ class DescriptionTab extends BOBasePage {
 
     await page.locator(this.productSummaryTabLocale('en')).click();
     await this.elementVisible(page, `${this.productSummaryTabLocale('en')}.active`);
-    await this.setValueOnTinymceInput(page, this.productSummary, productData.summary);
+    await this.setValueOnTinymceInput(page, this.productSummaryTabContent('en'), productData.summary);
 
     await page.locator(this.productDescriptionTabLocale('en')).click();
     await this.elementVisible(page, `${this.productDescriptionTabLocale('en')}.active`);
-    await this.setValueOnTinymceInput(page, this.productDescription, productData.description);
+    await this.setValueOnTinymceInput(page, this.productDescriptionTabContent('en'), productData.description);
   }
 
   /**
diff --git a/tests/UI/pages/BO/orders/view/productsBlock.ts b/tests/UI/pages/BO/orders/view/productsBlock.ts
index a2eb2301e4051..6ec7ba298fe71 100644
--- a/tests/UI/pages/BO/orders/view/productsBlock.ts
+++ b/tests/UI/pages/BO/orders/view/productsBlock.ts
@@ -281,9 +281,9 @@ class ProductsBlock extends ViewOrderBasePage {
       page.click(this.editProductButton(row)),
       this.waitForVisibleSelector(page, this.editProductQuantityInput),
     ]);
-    await this.setValue(page, this.editProductQuantityInput, quantity);
+    await this.setValue(page, `${this.editProductQuantityInput}:visible`, quantity);
     await Promise.all([
-      page.click(this.UpdateProductButton),
+      page.click(`${this.UpdateProductButton}:visible`),
       this.waitForVisibleSelector(page, this.editProductQuantityInput),
     ]);
     await this.waitForVisibleSelector(page, this.productQuantitySpan(row));
diff --git a/tests/UI/pages/commonPage.ts b/tests/UI/pages/commonPage.ts
index b48db676d4735..3b43fb881fe79 100755
--- a/tests/UI/pages/commonPage.ts
+++ b/tests/UI/pages/commonPage.ts
@@ -231,7 +231,7 @@ export default class CommonPage {
     await this.clearInput(page, selector);
 
     if (value !== null) {
-      await page.locator(selector).fill(value.toString());
+      await page.locator(selector).pressSequentially(value.toString());
     }
   }
 
diff --git a/tests/UI/pages/install/index.ts b/tests/UI/pages/install/index.ts
index 018e330730be8..af7f7c412e67c 100755
--- a/tests/UI/pages/install/index.ts
+++ b/tests/UI/pages/install/index.ts
@@ -291,7 +291,7 @@ class Install extends CommonPage {
 
     // Choosing country
     await page.click(this.countryChosenSelect);
-    await page.locator(this.countryChosenSearchInput).fill(global.INSTALL.COUNTRY);
+    await page.locator(this.countryChosenSearchInput).pressSequentially(global.INSTALL.COUNTRY);
     await page.keyboard.press('Enter');
     await page.click(this.enableSslRadio(global.INSTALL.ENABLE_SSL ? 1 : 0));
 

From e337999e317653c408bf1f0f599c361cf37e0597 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Wed, 20 Sep 2023 09:15:11 +0200
Subject: [PATCH 1016/1030] Functional Tests : Fixed UI Tests

---
 tests/UI/pages/BO/catalog/products/add.ts      | 6 +++---
 tests/UI/pages/BO/orders/view/productsBlock.ts | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/UI/pages/BO/catalog/products/add.ts b/tests/UI/pages/BO/catalog/products/add.ts
index 177ef3b867e6c..6b102ea9209c0 100644
--- a/tests/UI/pages/BO/catalog/products/add.ts
+++ b/tests/UI/pages/BO/catalog/products/add.ts
@@ -175,8 +175,8 @@ class AddProduct extends BOBasePage {
     this.previewProductLink = 'a#product_form_preview_btn';
     this.productOnlineSwitch = '.product-footer div.switch-input';
     this.productOnlineTitle = 'h2.for-switch.online-title';
-    this.productShortDescriptionIframe = '#form_step1_description_short';
-    this.productDescriptionIframe = '#form_step1_description';
+    this.productShortDescriptionIframe = '#form_step1_description_short div.translation-field[data-locale="en"]';
+    this.productDescriptionIframe = '#form_step1_description div.translation-field[data-locale="en"]';
     this.productTaxRuleSelect = '#step2_id_tax_rules_group_rendered';
     this.productDeleteLink = '.product-footer a.delete';
     this.dangerMessageShortDescription = '#form_step1_description_short .has-danger li';
@@ -254,7 +254,7 @@ class AddProduct extends BOBasePage {
     await page.keyboard.press('Backspace');
 
     // Fill the text
-    await page.locator(`${selector} .mce-edit-area`).pressSequentially(value);
+    await page.keyboard.type(value);
   }
 
   /**
diff --git a/tests/UI/pages/BO/orders/view/productsBlock.ts b/tests/UI/pages/BO/orders/view/productsBlock.ts
index 6ec7ba298fe71..8104c31f0257c 100644
--- a/tests/UI/pages/BO/orders/view/productsBlock.ts
+++ b/tests/UI/pages/BO/orders/view/productsBlock.ts
@@ -302,7 +302,7 @@ class ProductsBlock extends ViewOrderBasePage {
     await this.dialogListener(page);
 
     await this.waitForSelectorAndClick(page, this.editProductButton(row));
-    await this.setValue(page, this.editProductPriceInput, price);
+    await this.setValue(page, `${this.editProductPriceInput}:visible`, price);
 
     await Promise.all([
       page.click(this.UpdateProductButton),
@@ -329,7 +329,7 @@ class ProductsBlock extends ViewOrderBasePage {
       page.click(this.editProductButton(row)),
       this.waitForVisibleSelector(page, this.editProductPriceInput),
     ]);
-    await this.setValue(page, this.editProductPriceInput, price);
+    await this.setValue(page, `${this.editProductPriceInput}:visible`, price);
 
     await Promise.all([
       page.click(this.UpdateProductButton),

From 0b7c82a59da840523ce13c6daf837867da4a420d Mon Sep 17 00:00:00 2001
From: matks <mathieu.ferment@prestashop.com>
Date: Thu, 21 Sep 2023 11:57:50 +0200
Subject: [PATCH 1017/1030] Update link to
 https://contributors.prestashop-project.org

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 00db00cd4003b..b681b20224900 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
         },
         {
             "name": "PrestaShop Community",
-            "homepage": "https://contributors.prestashop.com/"
+            "homepage": "https://contributors.prestashop-project.org/"
         }
     ],
     "require": {

From 2d1bed26093030cbb68524e530f8b4dbb4aae38c Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Thu, 21 Sep 2023 13:05:43 +0200
Subject: [PATCH 1018/1030] Add new test to check details tab - part 1

---
 .../productV2/functional/14_detailsTab.ts     | 424 ++++++++++++++++++
 1 file changed, 424 insertions(+)
 create mode 100644 tests/UI/campaigns/productV2/functional/14_detailsTab.ts

diff --git a/tests/UI/campaigns/productV2/functional/14_detailsTab.ts b/tests/UI/campaigns/productV2/functional/14_detailsTab.ts
new file mode 100644
index 0000000000000..8c62cab930708
--- /dev/null
+++ b/tests/UI/campaigns/productV2/functional/14_detailsTab.ts
@@ -0,0 +1,424 @@
+// Import utils
+import helper from '@utils/helpers';
+import testContext from '@utils/testContext';
+import files from '@utils/files';
+
+// Import common tests
+import loginCommon from '@commonTests/BO/loginBO';
+
+// Import BO pages
+import dashboardPage from '@pages/BO/dashboard';
+import createProductPage from '@pages/BO/catalog/productsV2/add';
+import detailsTab from '@pages/BO/catalog/productsV2/add/detailsTab';
+import productsPage from '@pages/BO/catalog/productsV2';
+import filesPage from '@pages/BO/catalog/files';
+
+// Import FO pages
+import foProductPage from '@pages/FO/product';
+
+// Import data
+import ProductData from '@data/faker/product';
+
+import type {BrowserContext, Page} from 'playwright';
+import {expect} from 'chai';
+
+const baseContext: string = 'productV2_functional_detailsTab';
+
+describe('BO - Catalog - Products : Details tab', async () => {
+  let browserContext: BrowserContext;
+  let page: Page;
+
+  // Data to create standard product
+  const newProductData: ProductData = new ProductData({
+    type: 'standard',
+    quantity: 100,
+    minimumQuantity: 1,
+    status: true,
+    MPN: 'lorem ipsum',
+    UPC: 'lorem ipsum',
+    EAN13: 'lorem ipsum',
+    ISBN: 'lorem ipsum',
+  });
+  // Data to edit standard product
+  const editProductData: ProductData = new ProductData({
+    MPN: 'HSC0424PP',
+    UPC: '987654321098',
+    EAN13: '9782409038600',
+    ISBN: '978-2-409-03860-0',
+    features: [
+      {
+        featureName: 'Composition',
+        preDefinedValue: 'Cotton',
+      }, {
+        featureName: 'Composition',
+        customizedValue: 'Lorem Ipsum',
+      },
+    ],
+    files: [
+      {
+        fileName: 'Hello world',
+        description: 'hello world',
+        file: 'test.png',
+      },
+    ],
+    displayCondition: true,
+    condition: 'Used',
+    customizations: [
+      {
+        label: 'Lorem ipsum',
+        type: 'Text',
+        required: false,
+      },
+      {
+        label: 'Lorem ipsum',
+        type: 'Text',
+        required: true,
+      },
+      {
+        label: 'Lorem ipsum',
+        type: 'File',
+        required: false,
+      },
+      {
+        label: 'Lorem ipsum',
+        type: 'File',
+        required: true,
+      },
+    ],
+  });
+
+  // before and after functions
+  before(async function () {
+    browserContext = await helper.createBrowserContext(this.browser);
+    page = await helper.newTab(browserContext);
+
+    await files.generateImage(editProductData.files[0].file);
+  });
+
+  after(async () => {
+    await helper.closeBrowserContext(browserContext);
+
+    await files.deleteFile(editProductData.files[0].file);
+  });
+
+  // 1 - Create product
+  describe('Create product', async () => {
+    it('should login in BO', async function () {
+      await loginCommon.loginBO(this, page);
+    });
+
+    it('should go to \'Catalog > Products\' page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToProductsPage', baseContext);
+
+      await dashboardPage.goToSubMenu(
+        page,
+        dashboardPage.catalogParentLink,
+        dashboardPage.productsLink,
+      );
+
+      await productsPage.closeSfToolBar(page);
+
+      const pageTitle = await productsPage.getPageTitle(page);
+      await expect(pageTitle).to.contains(productsPage.pageTitle);
+    });
+
+    it('should click on \'New product\' button and check new product modal', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'clickOnNewProductButton', baseContext);
+
+      const isModalVisible = await productsPage.clickOnNewProductButton(page);
+      await expect(isModalVisible).to.be.true;
+    });
+
+    it('should choose \'Standard product\' and go to new product page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'chooseStandardProduct', baseContext);
+
+      await productsPage.selectProductType(page, newProductData.type);
+      await productsPage.clickOnAddNewProduct(page);
+
+      const pageTitle = await createProductPage.getPageTitle(page);
+      await expect(pageTitle).to.contains(createProductPage.pageTitle);
+    });
+
+    it('should create standard product', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'createStandardProduct', baseContext);
+
+      const createProductMessage = await createProductPage.setProduct(page, newProductData);
+      await expect(createProductMessage).to.equal(createProductPage.successfulUpdateMessage);
+    });
+  });
+
+  // 2 - Check all options in Details tab
+  describe('Check all options in Details tab', async () => {
+    it('should go to details tab and set References form with a wrong data and check the error message', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'setWrongData', baseContext);
+
+      await detailsTab.setProductDetails(page, newProductData);
+      await detailsTab.setMPN(page, newProductData.MPN!);
+      await detailsTab.setUPC(page, newProductData.UPC!);
+
+      let errorMessage = await detailsTab.getErrorMessageInReferencesForm(page, 3);
+      expect(errorMessage).to.eq(`"${newProductData.UPC}" is invalid`);
+
+      await detailsTab.setEAN13(page, newProductData.EAN13!);
+
+      errorMessage = await detailsTab.getErrorMessageInReferencesForm(page, 4);
+      expect(errorMessage).to.eq(`"${newProductData.EAN13}" is invalid`);
+
+      await detailsTab.setISBN(page, newProductData.ISBN!);
+
+      errorMessage = await detailsTab.getErrorMessageInReferencesForm(page, 5);
+      expect(errorMessage).to.eq(`"${newProductData.ISBN}" is invalid`);
+    });
+
+    it('should set References form with a good data', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'setGoodDara', baseContext);
+
+      await detailsTab.setMPN(page, editProductData.MPN!);
+      await detailsTab.setUPC(page, editProductData.UPC!);
+      await detailsTab.setEAN13(page, editProductData.EAN13!);
+      await detailsTab.setISBN(page, editProductData.ISBN!);
+
+      const message = await createProductPage.saveProduct(page);
+      expect(message).to.eq(createProductPage.successfulUpdateMessage);
+    });
+
+    it('should add 2 features', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'addFirstFeature', baseContext);
+
+      await detailsTab.setFeature(page, editProductData);
+
+      const message = await createProductPage.saveProduct(page);
+      expect(message).to.eq(createProductPage.successfulUpdateMessage);
+    });
+
+    it('should preview product', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'previewProduct', baseContext);
+
+      // Click on preview button
+      page = await createProductPage.previewProduct(page);
+
+      await foProductPage.changeLanguage(page, 'en');
+
+      const pageTitle = await foProductPage.getPageTitle(page);
+      expect(pageTitle).to.contains(newProductData.name);
+    });
+
+    it('should check the product features list', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'getProductFeaturesList', baseContext);
+
+      const productFeatures = await foProductPage.getProductFeaturesList(page);
+      expect(productFeatures).to.eq(
+        `Data sheet ${editProductData.features[0].featureName} ${editProductData.features[0].preDefinedValue}`
+        + ` ${editProductData.features[1].customizedValue}`);
+    });
+
+    it('should go back to BO', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goBackToBO', baseContext);
+
+      // Go back to BO
+      page = await foProductPage.closePage(browserContext, page, 0);
+
+      const pageTitle = await createProductPage.getPageTitle(page);
+      expect(pageTitle).to.contains(createProductPage.pageTitle);
+    });
+
+    it('should delete the created features', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'deleteFeatures', baseContext);
+
+      await detailsTab.deleteFeatures(page, editProductData);
+
+      const message = await createProductPage.saveProduct(page);
+      expect(message).to.eq(createProductPage.successfulUpdateMessage);
+    });
+
+    it('should preview product', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'previewProduct2', baseContext);
+
+      // Click on preview button
+      page = await createProductPage.previewProduct(page);
+
+      await foProductPage.changeLanguage(page, 'en');
+
+      const pageTitle = await foProductPage.getPageTitle(page);
+      expect(pageTitle).to.contains(newProductData.name);
+    });
+
+    it('should check that product features list is empty', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'isFeatureBlockNotVisible', baseContext);
+
+      const isVisible = await foProductPage.isFeaturesBlockVisible(page);
+      expect(isVisible).to.eq(false);
+    });
+
+    it('should go back to BO', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goBackToBO2', baseContext);
+
+      // Go back to BO
+      page = await foProductPage.closePage(browserContext, page, 0);
+
+      const pageTitle = await createProductPage.getPageTitle(page);
+      expect(pageTitle).to.contains(createProductPage.pageTitle);
+    });
+
+    it('should click on \'Manage all files\' link', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'clickOnManageAllFiles', baseContext);
+
+      page = await detailsTab.clickOnManageAllFiles(page);
+
+      const pageTitle = await filesPage.getPageTitle(page);
+      expect(pageTitle).to.contains(filesPage.pageTitle);
+    });
+
+    it('should close Files page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'closeFilesPage', baseContext);
+
+      page = await filesPage.closePage(browserContext, page, 0);
+
+      const pageTitle = await createProductPage.getPageTitle(page);
+      expect(pageTitle).to.contains(createProductPage.pageTitle);
+    });
+
+    it('should search for a not existing file', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'searchNotExistingFile', baseContext);
+
+      const searchResult = await detailsTab.searchFile(page, 'hello world');
+      expect(searchResult).to.eq('No results found for "hello world"');
+    });
+
+    it('should add new file', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'addNewFile', baseContext);
+
+      await detailsTab.addNewFile(page, editProductData);
+
+      const message = await createProductPage.saveProduct(page);
+      expect(message).to.eq(createProductPage.successfulUpdateMessage);
+    });
+
+    it('should delete the file', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'deleteFile', baseContext);
+
+      await detailsTab.deleteFiles(page, editProductData);
+
+      const alertMessage = await detailsTab.getNoFileAttachedMessage(page);
+      expect(alertMessage).to.eq('No files attached');
+    });
+
+    it('should set the condition in product page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'setCondition', baseContext);
+
+      await detailsTab.setCondition(page, editProductData);
+
+      const message = await createProductPage.saveProduct(page);
+      expect(message).to.eq(createProductPage.successfulUpdateMessage);
+    });
+
+    it('should preview product', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'previewProduct3', baseContext);
+
+      // Click on preview button
+      page = await createProductPage.previewProduct(page);
+
+      await foProductPage.changeLanguage(page, 'en');
+
+      const pageTitle = await foProductPage.getPageTitle(page);
+      expect(pageTitle).to.contains(newProductData.name);
+    });
+
+    it('should check the product condition', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'checkProductCondition', baseContext);
+
+      const productCondition = await foProductPage.getProductCondition(page);
+      expect(productCondition).to.eq(`Condition ${editProductData.condition}`);
+    });
+
+    it('should go back to BO', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goBackToBO3', baseContext);
+
+      // Go back to BO
+      page = await foProductPage.closePage(browserContext, page, 0);
+
+      const pageTitle = await createProductPage.getPageTitle(page);
+      expect(pageTitle).to.contains(createProductPage.pageTitle);
+    });
+
+    it('should create 4 customizations', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'createCustomizations', baseContext);
+
+      await detailsTab.addNewCustomizations(page, editProductData);
+
+      const message = await createProductPage.saveProduct(page);
+      expect(message).to.eq(createProductPage.successfulUpdateMessage);
+    });
+
+    it('should preview product', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'previewProduct4', baseContext);
+
+      // Click on preview button
+      page = await createProductPage.previewProduct(page);
+
+      await foProductPage.changeLanguage(page, 'en');
+
+      const pageTitle = await foProductPage.getPageTitle(page);
+      expect(pageTitle).to.contains(newProductData.name);
+    });
+
+    it('should check the customization section', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'checkProductCustomizations', baseContext);
+
+      const productCondition = await foProductPage.isCustomizationBlockVisible(page);
+      expect(productCondition).to.eq(true);
+    });
+
+    it('should go back to BO', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goBackToBO4', baseContext);
+
+      // Go back to BO
+      page = await foProductPage.closePage(browserContext, page, 0);
+
+      const pageTitle = await createProductPage.getPageTitle(page);
+      expect(pageTitle).to.contains(createProductPage.pageTitle);
+    });
+
+    it('should delete the 4 customizations', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'deleteCustomizations', baseContext);
+
+      await detailsTab.deleteCustomizations(page, editProductData);
+
+      const message = await createProductPage.saveProduct(page);
+      expect(message).to.eq(createProductPage.successfulUpdateMessage);
+    });
+  });
+
+  // 3 - Delete product
+  describe('POST-TEST: Delete product', async () => {
+    it('should delete product', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'deleteProduct', baseContext);
+
+      const createProductMessage = await createProductPage.deleteProduct(page);
+      expect(createProductMessage).to.equal(productsPage.successfulDeleteMessage);
+    });
+  });
+
+  // 4 - Delete file
+  describe('POST-TEST: Delete file', async () => {
+    it('should go to \'Catalog > Files\' page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToFilesPage', baseContext);
+
+      await dashboardPage.goToSubMenu(
+        page,
+        dashboardPage.catalogParentLink,
+        dashboardPage.filesLink,
+      );
+
+      const pageTitle = await filesPage.getPageTitle(page);
+      await expect(pageTitle).to.contains(filesPage.pageTitle);
+    });
+
+    it('should delete files with Bulk Actions', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'BulkDelete', baseContext);
+
+      const deleteTextResult = await filesPage.deleteFilesBulkActions(page);
+      await expect(deleteTextResult).to.be.equal(filesPage.successfulMultiDeleteMessage);
+    });
+  });
+});

From bf31537d86e83015deab4efe795b0cccb971a61a Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Thu, 21 Sep 2023 13:05:58 +0200
Subject: [PATCH 1019/1030] Add new test to check details tab - part 2

---
 tests/UI/data/faker/product.ts   | 72 ++++++++++++++++++++++++++++++--
 tests/UI/data/types/product.d.ts | 30 +++++++++++++
 2 files changed, 98 insertions(+), 4 deletions(-)

diff --git a/tests/UI/data/faker/product.ts b/tests/UI/data/faker/product.ts
index 4e56d5bad69c4..f9a736a89788c 100644
--- a/tests/UI/data/faker/product.ts
+++ b/tests/UI/data/faker/product.ts
@@ -4,6 +4,9 @@ import {
   ProductCustomization,
   ProductPackItem,
   ProductSpecificPrice,
+  ProductFeatures,
+  ProductFiles,
+  ProductCustomizations,
 } from '@data/types/product';
 
 import {faker} from '@faker-js/faker';
@@ -21,13 +24,13 @@ export default class ProductData {
 
   public nameFR: string;
 
-  public defaultImage: string|null;
+  public defaultImage: string | null;
 
-  public coverImage: string|null;
+  public coverImage: string | null;
 
-  public thumbImage: string|null;
+  public thumbImage: string | null;
 
-  public thumbImageFR: string|null;
+  public thumbImageFR: string | null;
 
   public category: string;
 
@@ -41,6 +44,22 @@ export default class ProductData {
 
   public reference: string;
 
+  public MPN: string | null;
+
+  public UPC: string | null;
+
+  public EAN13: string | null;
+
+  public ISBN: string | null;
+
+  public features: ProductFeatures[];
+
+  public files: ProductFiles[];
+
+  public displayCondition: boolean;
+
+  public condition: string;
+
   public quantity: number;
 
   public tax: number;
@@ -81,6 +100,8 @@ export default class ProductData {
 
   public customization: ProductCustomization;
 
+  public customizations: ProductCustomizations[];
+
   public downloadFile: boolean;
 
   public fileName: string;
@@ -135,6 +156,18 @@ export default class ProductData {
     /** @type {string} Reference of the product */
     this.reference = productToCreate.reference || faker.string.alphanumeric(7);
 
+    /** @type {string|null} MPN of the product */
+    this.MPN = productToCreate.MPN || null;
+
+    /** @type {string|null} UPC of the product */
+    this.UPC = productToCreate.UPC || null;
+
+    /** @type {string|null} EAN13 of the product */
+    this.EAN13 = productToCreate.EAN13 || null;
+
+    /** @type {string|null} ISBN of the product */
+    this.ISBN = productToCreate.ISBN || null;
+
     /** @type {number} Quantity available of the product */
     this.quantity = productToCreate.quantity === undefined
       ? faker.number.int({min: 1, max: 9})
@@ -177,6 +210,29 @@ export default class ProductData {
       },
     ];
 
+    /** @type {ProductFeatures[]} Features of the product */
+    this.features = productToCreate.features || [
+      {
+        featureName: 'Composition',
+        preDefinedValue: 'Cotton',
+      },
+    ];
+
+    /** @type {ProductFiles[]} Files attached to the product in details tab*/
+    this.files = productToCreate.files || [
+      {
+        fileName: 'test',
+        description: 'test',
+        file: 'test.txt',
+      },
+    ];
+
+    /** @type {boolean} Boolean to choose if we need to display condition or not */
+    this.displayCondition = productToCreate.displayCondition || false;
+
+    /** @type {string} Condition to choose */
+    this.condition = productToCreate.condition || 'Use';
+
     /** @type {ProductPackItem[]} Pack of products to add to the product */
     this.pack = productToCreate.pack || [
       {
@@ -234,6 +290,14 @@ export default class ProductData {
       required: true,
     };
 
+    /** @type {ProductCustomization} Customized value of the product */
+    this.customizations = productToCreate.customizations || [
+      {
+        label: 'Type your text here',
+        type: 'Text',
+        required: true,
+      }];
+
     /** @type {boolean} True to download file */
     this.downloadFile = productToCreate.downloadFile || false;
 
diff --git a/tests/UI/data/types/product.d.ts b/tests/UI/data/types/product.d.ts
index 3090e2c8e8782..3edf81e57332d 100644
--- a/tests/UI/data/types/product.d.ts
+++ b/tests/UI/data/types/product.d.ts
@@ -22,6 +22,15 @@ type ProductCreator = {
   summary?: string
   description?: string
   reference?: string
+  MPN?: string | null
+  UPC?: string | null
+  EAN13?: string | null
+  ISBN?: string | null
+  features?: ProductFeatures[]
+  files?: ProductFiles[]
+  displayCondition?: boolean
+  condition?: string
+  customizations?: ProductCustomizations[]
   quantity?: number
   tax?: number
   price?: number
@@ -54,6 +63,18 @@ type ProductCombination = {
   price: number
 };
 
+type ProductFeatures = {
+  featureName: string,
+  preDefinedValue?: string,
+  customizedValue?: string,
+}
+
+type ProductFiles = {
+  fileName: string,
+  description: string,
+  file: string,
+}
+
 type ProductCombinationOptions = {
   reference: string
   impactOnPriceTExc: number
@@ -96,6 +117,12 @@ type ProductCustomization = {
   required: boolean
 };
 
+type ProductCustomizations = {
+  label: string
+  type: string
+  required: boolean
+};
+
 type ProductDetailsBasic = {
   image: string
   name: string
@@ -204,4 +231,7 @@ export {
   ProductReviewCreator,
   ProductSpecificPrice,
   ProductStockMovement,
+  ProductFeatures,
+  ProductFiles,
+  ProductCustomizations,
 };

From 183813483fcff1329aca44dcc89110d8721666ba Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Thu, 21 Sep 2023 13:06:16 +0200
Subject: [PATCH 1020/1030] Add new test to check details tab - part 3

---
 .../BO/catalog/productsV2/add/detailsTab.ts   | 280 +++++++++++++++++-
 .../pages/BO/catalog/productsV2/add/index.ts  |   2 +-
 tests/UI/pages/FO/product/index.ts            |  45 +++
 tests/UI/pages/commonPage.ts                  |   4 +-
 4 files changed, 318 insertions(+), 13 deletions(-)

diff --git a/tests/UI/pages/BO/catalog/productsV2/add/detailsTab.ts b/tests/UI/pages/BO/catalog/productsV2/add/detailsTab.ts
index 562009f06a919..dfb3e23d70d98 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/detailsTab.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/detailsTab.ts
@@ -1,9 +1,12 @@
 import type {Page} from 'playwright';
+import {Frame} from 'playwright';
+import {expect} from 'chai';
 
 import type ProductData from '@data/faker/product';
 
 // Import pages
 import BOBasePage from '@pages/BO/BObasePage';
+import createProductPage from '@pages/BO/catalog/productsV2/add';
 
 /**
  * Details tab on new product V2 page, contains functions that can be used on the page
@@ -23,9 +26,71 @@ class DetailsTab extends BOBasePage {
 
   private readonly productUPCInput: string;
 
-  private readonly productShowCondition: string;
+  private readonly productConditionSelect: string;
 
-  private readonly productConditionInput: string;
+  private readonly addFeatureButton: string;
+
+  private readonly featureNameInput: string;
+
+  private readonly predefinedValueInput: string;
+
+  private readonly confirmDeleteFeatureButton: string;
+
+  private readonly manageAllFilesLink: string;
+
+  private readonly searchFileInput: string;
+
+  private readonly searchFileResult: string;
+
+  private readonly addNewFileButton: string;
+
+  private readonly createFileFrame: string;
+
+  private readonly fileNameInput: string;
+
+  private readonly fileDescriptionInput: string;
+
+  private readonly attachFileButton: string;
+
+  private readonly saveFileButton: string;
+
+  private readonly deleteFileConfirmButton: string;
+
+  private readonly noFileAttachedErrorAlert: string;
+
+  private readonly addNewCustomizationButton: string;
+
+  private readonly confirmDeleteCustomizationButton: string;
+
+  private readonly deleteCustomizationModal: string;
+
+  private readonly deleteFileModal: string;
+
+  private readonly deleteFeatureModal: string;
+
+  private readonly chooseFeatureSelect: (row: number) => string;
+
+  private readonly featureNameSelect: (row: number) => string;
+
+  private readonly choosePredefinedValueSelect: (row: number) => string;
+
+  private readonly predefinedValueSelect: (row: number) => string;
+
+  private readonly featureCustomizedValue: (row: number) => string;
+
+  private readonly deleteFeatureIcon: (row: number) => string;
+
+  private readonly deleteFileIcon: (row: number) => string;
+
+  private readonly displayCondition: (row: number) => string;
+
+  private readonly customizationNameInput: (row: number) => string;
+
+  private readonly customizationTypeSelect: (row: number) => string;
+
+  private readonly deleteCustomizationIcon: (row: number) => string;
+
+  private readonly customizationRequiredButton: (row: number, toEnable: number) => string;
 
   /**
    * @constructs
@@ -35,20 +100,60 @@ class DetailsTab extends BOBasePage {
     super();
 
     // Selectors in details tab
+    // References section
     this.detailsTabLink = '#product_details-tab-nav';
-    this.productEAN13Input = '#product_details_references_ean_13';
-    this.productISBNInput = '#product_details_references_isbn';
-    this.productMPNInput = '#product_details_references_mpn';
     this.productReferenceInput = '#product_details_references_reference';
+    this.productMPNInput = '#product_details_references_mpn';
     this.productUPCInput = '#product_details_references_upc';
-    this.productShowCondition = '#product_details_show_condition_1';
-    this.productConditionInput = '#product_details_condition';
+    this.productEAN13Input = '#product_details_references_ean_13';
+    this.productISBNInput = '#product_details_references_isbn';
+    // Features section
+    this.addFeatureButton = '#product_details_features_add_feature';
+    this.chooseFeatureSelect = (row: number) => `#select2-product_details_features_feature_values_${row}_feature_id-container`;
+    this.featureNameInput = 'span.select2-container--open span.select2-search--dropdown input';
+    this.featureNameSelect = (row: number) => `#select2-product_details_features_feature_values_${row}_feature_id-results`
+      + ' .select2-results__option--highlighted';
+    this.choosePredefinedValueSelect = (row: number) => `#select2-product_details_features_feature_values_${row}_feature`
+      + '_value_id-container';
+    this.predefinedValueInput = 'span.select2-container--open span.select2-search--dropdown input';
+    this.predefinedValueSelect = (row: number) => `#select2-product_details_features_feature_values_${row}_feature_`
+      + 'value_id-results .select2-results__option--highlighted';
+    this.featureCustomizedValue = (row: number) => `#product_details_features_feature_values_${row}_custom_value_1`;
+    this.deleteFeatureIcon = (row: number) => `#product_details_features_feature_values_${row}_delete`;
+    this.deleteFeatureModal = '#modal-confirm-delete-feature-value';
+    this.confirmDeleteFeatureButton = `${this.deleteFeatureModal} div.modal-footer button.btn-confirm-submit`;
+    // Attached files section
+    this.manageAllFilesLink = '#product_details div.small.font-secondary a[href*=\'sell/attachments/\']';
+    this.searchFileInput = '#product_details_attachments_attached_files_search_input';
+    this.searchFileResult = '#product_details_attachments_attached_files div.search-with-icon span div';
+    this.addNewFileButton = '#product_details_attachments_add_attachment_btn';
+    this.createFileFrame = '#modal-create-product-attachment';
+    this.fileNameInput = '#attachment_name_1';
+    this.fileDescriptionInput = '#attachment_file_description_1';
+    this.attachFileButton = '#attachment_file';
+    this.saveFileButton = '#main-div div.card-footer button';
+    this.deleteFileIcon = (row: number) => `#product_details_attachments_attached_files_${row} i.entity-item-delete`;
+    this.deleteFileModal = '#modal-confirm-remove-entity';
+    this.deleteFileConfirmButton = `${this.deleteFileModal} div.modal-footer button.btn-confirm-submit`;
+    this.noFileAttachedErrorAlert = '#product_details_attachments_attached_files div.alert-info p.alert-text';
+    // Display condition section
+    this.displayCondition = (toEnable: number) => `#product_details_show_condition_${toEnable}`;
+    this.productConditionSelect = '#product_details_condition';
+    // Customization section
+    this.addNewCustomizationButton = '#product_details_customizations_add_customization_field';
+    this.customizationNameInput = (row: number) => `#product_details_customizations_customization_fields_${row}_name_1`;
+    this.customizationTypeSelect = (row: number) => `#product_details_customizations_customization_fields_${row}_type`;
+    this.customizationRequiredButton = (row: number, toEnable: number) => '#product_details_customizations_customization'
+      + `_fields_${row}_required_${toEnable}`;
+    this.deleteCustomizationIcon = (row: number) => `#product_details_customizations_customization_fields_${row}_remove`
+      + ' i.material-icons';
+    this.deleteCustomizationModal = '#modal-confirm-delete-customization';
+    this.confirmDeleteCustomizationButton = `${this.deleteCustomizationModal} div.modal-footer button.btn-confirm-submit`;
   }
 
   /*
   Methods
    */
-
   /**
    * Set product details
    * @param page {Page} Browser tab
@@ -100,6 +205,161 @@ class DetailsTab extends BOBasePage {
     await this.setValue(page, this.productUPCInput, value);
   }
 
+  /**
+   * Get error message in references form
+   * @param page {Page} Browser tab
+   * @param inputNumber {number} Input number to get error message
+   * @returns {Promise<string>}
+   */
+  async getErrorMessageInReferencesForm(page: Page, inputNumber: number): Promise<string> {
+    await this.clickAndWaitForLoadState(page, createProductPage.saveProductButton);
+
+    return this.getTextContent(page, `#product_details_references div:nth-child(${inputNumber}) div.alert-text`);
+  }
+
+  /**
+   * Set feature
+   * @param page {Page} Browser tab
+   * @param productData {ProductData} Data to set on feature form
+   * @returns {Promise<void>}
+   */
+  async setFeature(page: Page, productData: ProductData): Promise<void> {
+    for (let i: number = 0; i < productData.features.length; i++) {
+      await page.locator(this.addFeatureButton).click();
+      await this.waitForSelectorAndClick(page, this.chooseFeatureSelect(i));
+      await this.setValue(page, this.featureNameInput, productData.features[i].featureName);
+      await this.waitForSelectorAndClick(page, this.featureNameSelect(i));
+
+      if (productData.features[i].preDefinedValue) {
+        await this.waitForSelectorAndClick(page, this.choosePredefinedValueSelect(i));
+        await this.setValue(page, this.predefinedValueInput, productData.features[i].preDefinedValue!);
+        await this.waitForSelectorAndClick(page, this.predefinedValueSelect(i));
+      }
+      if (productData.features[i].customizedValue) {
+        await this.setValue(page, this.featureCustomizedValue(i), productData.features[i].customizedValue!);
+      }
+    }
+  }
+
+  /**
+   * Delete all features
+   * @param page {Page} Browser tab
+   * @param productData {ProductData} Data to delete feature
+   * @returns {Promise<void>}
+   */
+  async deleteFeatures(page: Page, productData: ProductData): Promise<void> {
+    for (let i: number = 0; i < productData.features.length; i++) {
+      await this.waitForSelectorAndClick(page, this.deleteFeatureIcon(i));
+      await this.waitForSelectorAndClick(page, this.confirmDeleteFeatureButton);
+    }
+  }
+
+  /**
+   * Click on manage all files
+   * @param page {Page} Browser tab
+   * @returns {Promise<Page>}
+   */
+  async clickOnManageAllFiles(page: Page): Promise<Page> {
+    return this.openLinkWithTargetBlank(page, this.manageAllFilesLink);
+  }
+
+  /**
+   * Search file
+   * @param page {Page} Browser tab
+   * @param fileName {string} File name to search
+   * @returns {Promise<string>}
+   */
+  async searchFile(page: Page, fileName: string): Promise<string> {
+    await this.setValue(page, this.searchFileInput, fileName);
+    await page.waitForTimeout(2000);
+
+    return this.getTextContent(page, this.searchFileResult);
+  }
+
+  /**
+   * Add new file
+   * @param page {Page} Browser tab
+   * @param productData {ProductData} Data to set on add file form
+   * @returns {Promise<void>}
+   */
+  async addNewFile(page: Page, productData: ProductData): Promise<void> {
+    for (let i: number = 0; i < productData.files.length; i++) {
+      await this.waitForSelectorAndClick(page, this.addNewFileButton);
+
+      await this.waitForVisibleSelector(page, this.createFileFrame);
+
+      const newFileFrame: Frame | null = await page.frame({name: 'modal-create-product-attachment-iframe'});
+      await expect(newFileFrame).to.be.not.null;
+
+      await this.setValue(newFileFrame!, this.fileNameInput, productData.files[i].fileName);
+      await this.setValue(newFileFrame!, this.fileDescriptionInput, productData.files[i].description);
+      await this.uploadFile(newFileFrame!, this.attachFileButton, productData.files[i].file);
+      await newFileFrame!.locator(this.saveFileButton).click();
+    }
+  }
+
+  /**
+   * Delete all files
+   * @param page {Page} Browser tab
+   * @param productData {ProductData} Data to delete file
+   * @returns {Promise<void>}
+   */
+  async deleteFiles(page: Page, productData: ProductData): Promise<void> {
+    for (let i: number = 0; i < productData.files.length; i++) {
+      await this.waitForSelectorAndClick(page, this.deleteFileIcon(i));
+      await this.waitForSelectorAndClick(page, this.deleteFileConfirmButton);
+    }
+  }
+
+  /**
+   * Get no file attached message
+   * @param page {Page} Browser tab
+   * @returns {Promise<string>}
+   */
+  async getNoFileAttachedMessage(page: Page): Promise<string> {
+    return this.getTextContent(page, this.noFileAttachedErrorAlert);
+  }
+
+  /**
+   * Set condition
+   * @param page {Page} Browser tab
+   * @param productData {ProductData} Data to set condition
+   * @returns {Promise<void>}
+   */
+  async setCondition(page: Page, productData: ProductData): Promise<void> {
+    await this.setChecked(page, this.displayCondition(productData.displayCondition ? 1 : 0));
+    await this.selectByVisibleText(page, this.productConditionSelect, productData.condition);
+  }
+
+  /**
+   * Add new customization
+   * @param page {Page} Browser tab
+   * @param productData {ProductData} Data to add customization
+   * @returns {Promise<void>}
+   */
+  async addNewCustomizations(page: Page, productData: ProductData): Promise<void> {
+    for (let i: number = 0; i < productData.customizations.length; i++) {
+      await this.waitForSelectorAndClick(page, this.addNewCustomizationButton);
+
+      await this.setValue(page, this.customizationNameInput(i), productData.customizations[i].label);
+      await this.selectByVisibleText(page, this.customizationTypeSelect(i), productData.customizations[i].type);
+      await this.setChecked(page, this.customizationRequiredButton(i, productData.customizations[i].required ? 1 : 0));
+    }
+  }
+
+  /**
+   * Delete all customizations
+   * @param page {Page} Browser tab
+   * @param productData {ProductData} Data to delete customizations
+   * @returns {Promise<void>}
+   */
+  async deleteCustomizations(page: Page, productData: ProductData): Promise<void> {
+    for (let i: number = 0; i < productData.customizations.length; i++) {
+      await this.waitForSelectorAndClick(page, this.deleteCustomizationIcon(i));
+      await this.waitForSelectorAndClick(page, this.confirmDeleteCustomizationButton);
+    }
+  }
+
   /**
    * @param page {Page}
    * @param inputName {string}
@@ -107,7 +367,7 @@ class DetailsTab extends BOBasePage {
   async getValue(page: Page, inputName: string): Promise<string> {
     switch (inputName) {
       case 'condition':
-        return page.$eval(this.productConditionInput, (node: HTMLSelectElement) => node.value);
+        return page.$eval(this.productConditionSelect, (node: HTMLSelectElement) => node.value);
       case 'mpn':
         return this.getAttributeContent(page, this.productMPNInput, 'value');
       case 'reference':
@@ -119,7 +379,7 @@ class DetailsTab extends BOBasePage {
       case 'isbn':
         return this.getAttributeContent(page, this.productISBNInput, 'value');
       case 'show_condition':
-        return (await this.isChecked(page, this.productShowCondition)) ? '1' : '0';
+        return (await this.isChecked(page, this.displayCondition(1))) ? '1' : '0';
       default:
         throw new Error(`Input ${inputName} was not found`);
     }
diff --git a/tests/UI/pages/BO/catalog/productsV2/add/index.ts b/tests/UI/pages/BO/catalog/productsV2/add/index.ts
index 2ab2822e80e9e..c52b9142cb37a 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/index.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/index.ts
@@ -63,7 +63,7 @@ class CreateProduct extends BOBasePage {
 
   private readonly previewProductButton: string;
 
-  private readonly saveProductButton: string;
+  public readonly saveProductButton: string;
 
   private readonly deleteProductButton: string;
 
diff --git a/tests/UI/pages/FO/product/index.ts b/tests/UI/pages/FO/product/index.ts
index a7a537f614491..9b1fa4302f88c 100644
--- a/tests/UI/pages/FO/product/index.ts
+++ b/tests/UI/pages/FO/product/index.ts
@@ -45,6 +45,8 @@ class Product extends FOBasePage {
 
   private readonly productDetail: string;
 
+  private readonly productFeaturesList: string;
+
   private readonly continueShoppingButton: string;
 
   private readonly productAvailabilityIcon: string;
@@ -163,6 +165,7 @@ class Product extends FOBasePage {
     this.proceedToCheckoutButton = `${this.blockCartModal} div.cart-content-btn a`;
     this.productQuantitySpan = '#product-details div.product-quantities label';
     this.productDetail = 'div.product-information a[href=\'#product-details\']';
+    this.productFeaturesList = '#product-details section.product-features';
     this.continueShoppingButton = `${this.blockCartModal} div.cart-content-btn button`;
     this.productAvailabilityIcon = '#product-availability i';
     this.productAvailability = '#product-availability';
@@ -548,6 +551,48 @@ class Product extends FOBasePage {
     return this.elementVisible(page, this.productQuantitySpan, 1000);
   }
 
+  /**
+   * Get product features list
+   * @param page {Page} Browser tab
+   * @returns {Promise<string>}
+   */
+  async getProductFeaturesList(page: Page): Promise<string> {
+    await this.waitForSelectorAndClick(page, this.productDetail);
+
+    return this.getTextContent(page, this.productFeaturesList);
+  }
+
+  /**
+   * Is features block visible
+   * @param page {Page} Browser tab
+   * @returns {Promise<boolean>}
+   */
+  async isFeaturesBlockVisible(page: Page): Promise<boolean> {
+    await this.waitForSelectorAndClick(page, this.productDetail);
+
+    return this.elementVisible(page, this.productFeaturesList);
+  }
+
+  /**
+   * Get product condition
+   * @param page {Page} Browser tab
+   * @returns {Promise<string>}
+   */
+  async getProductCondition(page: Page): Promise<string> {
+    await this.waitForSelectorAndClick(page, this.productDetail);
+
+    return this.getTextContent(page, '#product-details div.product-condition');
+  }
+
+  /**
+   * Is customization block visible
+   * @param page {Page} Browser tab
+   * @returns {Promise<boolean>}
+   */
+  async isCustomizationBlockVisible(page: Page): Promise<boolean> {
+    return this.elementVisible(page, 'div.product-container div.product-information section.product-customization', 1000);
+  }
+
   /**
    * Is availability product displayed
    * @param page {Page} Browser tab
diff --git a/tests/UI/pages/commonPage.ts b/tests/UI/pages/commonPage.ts
index 3c4a815455b35..60dff2bbe1dc1 100755
--- a/tests/UI/pages/commonPage.ts
+++ b/tests/UI/pages/commonPage.ts
@@ -479,12 +479,12 @@ export default class CommonPage {
 
   /**
    * Upload file in input type=file selector
-   * @param page {Page} Browser tab
+   * @param page {Page | Frame} Browser tab
    * @param selector {string} String to locate the file input
    * @param filePath {string} Path of the file to add
    * @return {Promise<void>}
    */
-  async uploadFile(page: Page, selector: string, filePath: string): Promise<void> {
+  async uploadFile(page: Page | Frame, selector: string, filePath: string): Promise<void> {
     const input = await page.$(selector);
 
     if (input) {

From 5e89f704b81878d7f2a3c336d9366aab267b8756 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Thu, 21 Sep 2023 14:43:01 +0200
Subject: [PATCH 1021/1030] Fix review

---
 .../productV2/functional/14_detailsTab.ts     | 38 +++++++++----------
 tests/UI/data/faker/product.ts                | 24 ++++++------
 tests/UI/data/types/product.d.ts              |  8 ++--
 .../BO/catalog/productsV2/add/detailsTab.ts   |  6 ++-
 4 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/tests/UI/campaigns/productV2/functional/14_detailsTab.ts b/tests/UI/campaigns/productV2/functional/14_detailsTab.ts
index 8c62cab930708..c78e8e9747b24 100644
--- a/tests/UI/campaigns/productV2/functional/14_detailsTab.ts
+++ b/tests/UI/campaigns/productV2/functional/14_detailsTab.ts
@@ -34,17 +34,17 @@ describe('BO - Catalog - Products : Details tab', async () => {
     quantity: 100,
     minimumQuantity: 1,
     status: true,
-    MPN: 'lorem ipsum',
-    UPC: 'lorem ipsum',
-    EAN13: 'lorem ipsum',
-    ISBN: 'lorem ipsum',
+    mpn: 'lorem ipsum',
+    upc: 'lorem ipsum',
+    ean13: 'lorem ipsum',
+    isbn: 'lorem ipsum',
   });
   // Data to edit standard product
   const editProductData: ProductData = new ProductData({
-    MPN: 'HSC0424PP',
-    UPC: '987654321098',
-    EAN13: '9782409038600',
-    ISBN: '978-2-409-03860-0',
+    mpn: 'HSC0424PP',
+    upc: '987654321098',
+    ean13: '9782409038600',
+    isbn: '978-2-409-03860-0',
     features: [
       {
         featureName: 'Composition',
@@ -153,30 +153,30 @@ describe('BO - Catalog - Products : Details tab', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'setWrongData', baseContext);
 
       await detailsTab.setProductDetails(page, newProductData);
-      await detailsTab.setMPN(page, newProductData.MPN!);
-      await detailsTab.setUPC(page, newProductData.UPC!);
+      await detailsTab.setMPN(page, newProductData.mpn!);
+      await detailsTab.setUPC(page, newProductData.upc!);
 
       let errorMessage = await detailsTab.getErrorMessageInReferencesForm(page, 3);
-      expect(errorMessage).to.eq(`"${newProductData.UPC}" is invalid`);
+      expect(errorMessage).to.eq(`"${newProductData.upc}" is invalid`);
 
-      await detailsTab.setEAN13(page, newProductData.EAN13!);
+      await detailsTab.setEAN13(page, newProductData.ean13!);
 
       errorMessage = await detailsTab.getErrorMessageInReferencesForm(page, 4);
-      expect(errorMessage).to.eq(`"${newProductData.EAN13}" is invalid`);
+      expect(errorMessage).to.eq(`"${newProductData.ean13}" is invalid`);
 
-      await detailsTab.setISBN(page, newProductData.ISBN!);
+      await detailsTab.setISBN(page, newProductData.isbn!);
 
       errorMessage = await detailsTab.getErrorMessageInReferencesForm(page, 5);
-      expect(errorMessage).to.eq(`"${newProductData.ISBN}" is invalid`);
+      expect(errorMessage).to.eq(`"${newProductData.isbn}" is invalid`);
     });
 
     it('should set References form with a good data', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'setGoodDara', baseContext);
 
-      await detailsTab.setMPN(page, editProductData.MPN!);
-      await detailsTab.setUPC(page, editProductData.UPC!);
-      await detailsTab.setEAN13(page, editProductData.EAN13!);
-      await detailsTab.setISBN(page, editProductData.ISBN!);
+      await detailsTab.setMPN(page, editProductData.mpn!);
+      await detailsTab.setUPC(page, editProductData.upc!);
+      await detailsTab.setEAN13(page, editProductData.ean13!);
+      await detailsTab.setISBN(page, editProductData.isbn!);
 
       const message = await createProductPage.saveProduct(page);
       expect(message).to.eq(createProductPage.successfulUpdateMessage);
diff --git a/tests/UI/data/faker/product.ts b/tests/UI/data/faker/product.ts
index f9a736a89788c..f3260ecc2c199 100644
--- a/tests/UI/data/faker/product.ts
+++ b/tests/UI/data/faker/product.ts
@@ -44,13 +44,13 @@ export default class ProductData {
 
   public reference: string;
 
-  public MPN: string | null;
+  public mpn: string | null;
 
-  public UPC: string | null;
+  public upc: string | null;
 
-  public EAN13: string | null;
+  public ean13: string | null;
 
-  public ISBN: string | null;
+  public isbn: string | null;
 
   public features: ProductFeatures[];
 
@@ -156,17 +156,17 @@ export default class ProductData {
     /** @type {string} Reference of the product */
     this.reference = productToCreate.reference || faker.string.alphanumeric(7);
 
-    /** @type {string|null} MPN of the product */
-    this.MPN = productToCreate.MPN || null;
+    /** @type {string|null} mpn of the product */
+    this.mpn = productToCreate.mpn || null;
 
-    /** @type {string|null} UPC of the product */
-    this.UPC = productToCreate.UPC || null;
+    /** @type {string|null} upc of the product */
+    this.upc = productToCreate.upc || null;
 
-    /** @type {string|null} EAN13 of the product */
-    this.EAN13 = productToCreate.EAN13 || null;
+    /** @type {string|null} ean13 of the product */
+    this.ean13 = productToCreate.ean13 || null;
 
-    /** @type {string|null} ISBN of the product */
-    this.ISBN = productToCreate.ISBN || null;
+    /** @type {string|null} isbn of the product */
+    this.isbn = productToCreate.isbn || null;
 
     /** @type {number} Quantity available of the product */
     this.quantity = productToCreate.quantity === undefined
diff --git a/tests/UI/data/types/product.d.ts b/tests/UI/data/types/product.d.ts
index 3edf81e57332d..ee2036e67e555 100644
--- a/tests/UI/data/types/product.d.ts
+++ b/tests/UI/data/types/product.d.ts
@@ -22,10 +22,10 @@ type ProductCreator = {
   summary?: string
   description?: string
   reference?: string
-  MPN?: string | null
-  UPC?: string | null
-  EAN13?: string | null
-  ISBN?: string | null
+  mpn?: string | null
+  upc?: string | null
+  ean13?: string | null
+  isbn?: string | null
   features?: ProductFeatures[]
   files?: ProductFiles[]
   displayCondition?: boolean
diff --git a/tests/UI/pages/BO/catalog/productsV2/add/detailsTab.ts b/tests/UI/pages/BO/catalog/productsV2/add/detailsTab.ts
index dfb3e23d70d98..377d8d125ac15 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/detailsTab.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/detailsTab.ts
@@ -289,7 +289,7 @@ class DetailsTab extends BOBasePage {
       await this.waitForVisibleSelector(page, this.createFileFrame);
 
       const newFileFrame: Frame | null = await page.frame({name: 'modal-create-product-attachment-iframe'});
-      await expect(newFileFrame).to.be.not.null;
+      expect(newFileFrame).to.not.eq(null);
 
       await this.setValue(newFileFrame!, this.fileNameInput, productData.files[i].fileName);
       await this.setValue(newFileFrame!, this.fileDescriptionInput, productData.files[i].description);
@@ -367,7 +367,9 @@ class DetailsTab extends BOBasePage {
   async getValue(page: Page, inputName: string): Promise<string> {
     switch (inputName) {
       case 'condition':
-        return page.$eval(this.productConditionSelect, (node: HTMLSelectElement) => node.value);
+        return page
+          .locator(this.productConditionSelect)
+          .evaluate((el: HTMLSelectElement) => el.value);
       case 'mpn':
         return this.getAttributeContent(page, this.productMPNInput, 'value');
       case 'reference':

From 877e4a13547fb379a528c190053fa4a1a0da03c0 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Mon, 18 Sep 2023 17:54:41 +0200
Subject: [PATCH 1022/1030] Add new test to check combination tab

---
 .../productV2/functional/11_combinationTab.ts | 436 ++++++++++++++++++
 .../catalog/productsV2/add/combinationsTab.ts | 196 +++++++-
 2 files changed, 624 insertions(+), 8 deletions(-)
 create mode 100644 tests/UI/campaigns/productV2/functional/11_combinationTab.ts

diff --git a/tests/UI/campaigns/productV2/functional/11_combinationTab.ts b/tests/UI/campaigns/productV2/functional/11_combinationTab.ts
new file mode 100644
index 0000000000000..ddb0ea6c6cab1
--- /dev/null
+++ b/tests/UI/campaigns/productV2/functional/11_combinationTab.ts
@@ -0,0 +1,436 @@
+// Import utils
+import helper from '@utils/helpers';
+import testContext from '@utils/testContext';
+import files from '@utils/files';
+
+// Import common tests
+import loginCommon from '@commonTests/BO/loginBO';
+
+// Import pages
+import dashboardPage from '@pages/BO/dashboard';
+import productsPage from '@pages/BO/catalog/productsV2';
+import createProductsPage from '@pages/BO/catalog/productsV2/add';
+import combinationsTab from '@pages/BO/catalog/productsV2/add/combinationsTab';
+import attributesPage from '@pages/BO/catalog/attributes';
+import foProductPage from '@pages/FO/product';
+import productSettings from '@pages/BO/shopParameters/productSettings';
+
+// Import data
+import ProductData from '@data/faker/product';
+import type {
+  ProductCombinationOptions,
+  ProductAttribute,
+} from '@data/types/product';
+
+import {expect} from 'chai';
+import type {BrowserContext, Page} from 'playwright';
+
+const baseContext: string = 'productV2_functional_combinationTab';
+
+describe('BO - Catalog - Products : Combination tab', async () => {
+  let browserContext: BrowserContext;
+  let page: Page;
+
+  // Data to create product with combinations
+  const newProductData: ProductData = new ProductData({
+    type: 'combinations',
+    coverImage: 'cover.jpg',
+    thumbImage: 'thumb.jpg',
+    taxRule: 'No tax',
+    quantity: 50,
+    minimumQuantity: 1,
+    attributes: [
+      {
+        name: 'size',
+        values: ['S', 'M', 'L', 'XL'],
+      },
+      {
+        name: 'color',
+        values: ['Gray', 'Taupe', 'Beige', 'White', 'Red', 'Black', 'Orange', 'Green', 'Yellow', 'Brown'],
+      },
+    ],
+    status: true,
+  });
+
+  // Data to edit the first combination
+  const firstCombinationData: ProductCombinationOptions = {
+    reference: 'efghigk',
+    impactOnPriceTExc: 20,
+    quantity: 150,
+  };
+
+  // before and after functions
+  before(async function () {
+    browserContext = await helper.createBrowserContext(this.browser);
+    page = await helper.newTab(browserContext);
+    if (newProductData.coverImage) {
+      await files.generateImage(newProductData.coverImage);
+    }
+    if (newProductData.thumbImage) {
+      await files.generateImage(newProductData.thumbImage);
+    }
+  });
+
+  after(async () => {
+    await helper.closeBrowserContext(browserContext);
+    if (newProductData.coverImage) {
+      await files.deleteFile(newProductData.coverImage);
+    }
+    if (newProductData.thumbImage) {
+      await files.deleteFile(newProductData.thumbImage);
+    }
+  });
+
+  describe('Create product with combination', async () => {
+    it('should login in BO', async function () {
+      await loginCommon.loginBO(this, page);
+    });
+
+    it('should go to \'Catalog > Products\' page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToProductsPage', baseContext);
+
+      await dashboardPage.goToSubMenu(
+        page,
+        dashboardPage.catalogParentLink,
+        dashboardPage.productsLink,
+      );
+
+      await productsPage.closeSfToolBar(page);
+
+      const pageTitle = await productsPage.getPageTitle(page);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
+    });
+
+    it('should click on \'New product\' button and check new product modal', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'clickOnNewProductButton', baseContext);
+
+      const isModalVisible = await productsPage.clickOnNewProductButton(page);
+      await expect(isModalVisible).to.be.true;
+    });
+
+    it('should select the product with combination and check the description', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'checkStandardProductDescription', baseContext);
+
+      await productsPage.selectProductType(page, newProductData.type);
+
+      const productTypeDescription = await productsPage.getProductDescription(page);
+      expect(productTypeDescription).to.contains(productsPage.productWithCombinationsDescription);
+    });
+
+    it('should go to new product page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'chooseProductWithCombinations', baseContext);
+
+      await productsPage.clickOnAddNewProduct(page);
+
+      const pageTitle = await createProductsPage.getPageTitle(page);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
+    });
+
+    it('should create product', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'createProduct', baseContext);
+
+      await createProductsPage.closeSfToolBar(page);
+
+      const createProductMessage = await createProductsPage.setProduct(page, newProductData);
+      expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+    });
+
+    it('should go to \'Combinations\' tab and click on \'Attributes & Features\' link', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'checkAttributes&FeaturesLink', baseContext);
+
+      page = await combinationsTab.clickOnAttributesAndFeaturesLink(page);
+
+      const pageTitle = await attributesPage.getPageTitle(page);
+      expect(pageTitle).to.contains(attributesPage.pageTitle);
+    });
+
+    it('should close \'Attributes & Features\' page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'closePage', baseContext);
+
+      page = await attributesPage.closePage(browserContext, page, 0);
+
+      const pageTitle = await createProductsPage.getPageTitle(page);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
+    });
+
+    it('should click on learn more link', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'clickOnLearnMore', baseContext);
+
+      page = await combinationsTab.clickOnLearnMoreButton(page);
+
+      page = await combinationsTab.closePage(browserContext, page, 0);
+
+      const pageTitle = await createProductsPage.getPageTitle(page);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
+    });
+
+    it('should click on generate combination button', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'clickOnGenerateCombinationButton', baseContext);
+
+      const isModalVisible = await combinationsTab.clickOnGenerateCombinationButton(page);
+      await expect(isModalVisible).to.be.true;
+    });
+
+    it('should click on cancel button', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'clickOnCancelButton', baseContext);
+
+      const isModalNotVisible = await combinationsTab.clickOnCancelButton(page);
+      await expect(isModalNotVisible).to.be.true;
+    });
+
+    it('should create combination by checking size and color checkboxes', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'createCombination', baseContext);
+
+      await combinationsTab.clickOnGenerateCombinationButton(page);
+
+      let generateCombinationsButton = await combinationsTab.selectAllValues(page, 'size');
+      expect(generateCombinationsButton).to.equal(combinationsTab.generateCombinationsMessage(4));
+
+      generateCombinationsButton = await combinationsTab.selectAllValues(page, 'color');
+      expect(generateCombinationsButton).to.equal(combinationsTab.generateCombinationsMessage(56));
+    });
+
+    it('should click on generate combinations button', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'generateCombinations', baseContext);
+
+      const successMessage = await combinationsTab.generateCombinations(page);
+      await expect(successMessage).to.equal(combinationsTab.successfulGenerateCombinationsMessage(56));
+    });
+  });
+
+  describe('Edit combinations', async () => {
+    it('should edit the first combination', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'editFirstCombination', baseContext);
+
+      await combinationsTab.clickOnEditIcon(page, 1);
+
+      const successMessage = await combinationsTab.editCombinationFromModal(page, firstCombinationData);
+      await expect(successMessage).to.equal(combinationsTab.successfulUpdateMessage);
+    });
+
+    // @todo : https://github.com/PrestaShop/PrestaShop/issues/33965
+    it.skip('should click on next combination button', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'clickOnNextButton', baseContext);
+
+      await combinationsTab.clickOnNextCombinationButton(page);
+
+      const combinationName = await combinationsTab.getCombinationNameFromModal(page);
+      await expect(combinationName).to.equal('Size - S, Color - Taupe');
+    });
+
+    it.skip('should click on previous combination button', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'clickOnPreviousButton', baseContext);
+
+      await combinationsTab.clickOnPreviousCombinationButton(page);
+
+      const combinationName = await combinationsTab.getCombinationNameFromModal(page);
+      await expect(combinationName).to.equal('Size - S, Color - Gray');
+    });
+
+    it('should close the modal', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'closeModal', baseContext);
+
+      const isModalVisible = await combinationsTab.closeEditCombinationModal(page);
+      await expect(isModalVisible).to.be.false;
+    });
+  });
+
+  describe('Check out of stock options', async () => {
+    [
+      {args: {option: 'Deny orders', isAddToCartButtonVisible: false}},
+      {args: {option: 'Allow orders', isAddToCartButtonVisible: true}},
+      {args: {option: 'Use default behavior', isAddToCartButtonVisible: false}},
+    ].forEach((test, index) => {
+      it(`should check the '${test.args.option}' option`, async function () {
+        await testContext.addContextItem(this, 'testIdentifier', `checkOrderOption${index}`, baseContext);
+
+        await combinationsTab.setOptionWhenOutOfStock(page, test.args.option);
+
+        const createProductMessage = await createProductsPage.saveProduct(page);
+        expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+      });
+
+      it('should preview product', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', `previewProduct${index}`, baseContext);
+
+        // Click on preview button
+        page = await createProductsPage.previewProduct(page);
+
+        await foProductPage.changeLanguage(page, 'en');
+
+        const pageTitle = await foProductPage.getPageTitle(page);
+        await expect(pageTitle).to.contains(newProductData.name);
+      });
+
+      it('should select combination and check the add to cart button', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', `selectCombination${index}`, baseContext);
+        const firstCombination: ProductAttribute[] = [
+          {
+            name: 'size',
+            value: 'L',
+          },
+          {
+            name: 'color',
+            value: 'White',
+          },
+        ];
+        await foProductPage.selectAttributes(page, 1, firstCombination);
+
+        const isVisible = await foProductPage.isAddToCartButtonEnabled(page);
+        await expect(isVisible).to.eq(test.args.isAddToCartButtonVisible);
+      });
+
+      it('should go back to BO', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', `goBackToBO${index}`, baseContext);
+
+        // Go back to BO
+        page = await foProductPage.closePage(browserContext, page, 0);
+
+        const pageTitle = await createProductsPage.getPageTitle(page);
+        await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+      });
+    });
+
+    it('should click on edit default behaviour link', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'editBehaviour', baseContext);
+
+      page = await combinationsTab.clickOnEditDefaultBehaviourLink(page);
+
+      const pageTitle = await productSettings.getPageTitle(page);
+      await expect(pageTitle).to.contains(productSettings.pageTitle);
+    });
+
+    it('should close the page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goBackToBO3', baseContext);
+
+      page = await productSettings.closePage(browserContext, page, 0);
+
+      const pageTitle = await createProductsPage.getPageTitle(page);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
+    });
+
+    it('should set label when in stock', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'setLabelWhenInStock', baseContext);
+
+      await combinationsTab.setLabelWhenInStock(page, 'Product available');
+
+      const createProductMessage = await createProductsPage.saveProduct(page);
+      expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+    });
+
+    it('should preview product', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'previewProduct3', baseContext);
+
+      // Click on preview button
+      page = await createProductsPage.previewProduct(page);
+
+      await foProductPage.changeLanguage(page, 'en');
+
+      const pageTitle = await foProductPage.getPageTitle(page);
+      await expect(pageTitle).to.contains(newProductData.name);
+    });
+
+    it('should select combination', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'selectCombination3', baseContext);
+      const firstCombination: ProductAttribute[] = [
+        {
+          name: 'size',
+          value: 'S',
+        },
+        {
+          name: 'color',
+          value: 'Taupe',
+        },
+      ];
+      await foProductPage.selectAttributes(page, 1, firstCombination);
+
+      const isVisible = await foProductPage.isAddToCartButtonEnabled(page);
+      await expect(isVisible).to.be.false;
+    });
+
+    it('should check the product availability label', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'selectCombination4', baseContext);
+
+      const availabilityLabel = await foProductPage.getProductAvailabilityLabel(page);
+      await expect(availabilityLabel).to.contains('Product available');
+    });
+
+    it('should close the page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goBackToBO4', baseContext);
+
+      page = await productSettings.closePage(browserContext, page, 0);
+
+      const pageTitle = await createProductsPage.getPageTitle(page);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
+    });
+
+    it('should check the allow orders option and set Label when out of stock', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'checkDenyOrder', baseContext);
+
+      await combinationsTab.setOptionWhenOutOfStock(page, 'Allow orders');
+
+      await combinationsTab.setLabelWhenOutOfStock(page, 'Out of stock');
+
+      const createProductMessage = await createProductsPage.saveProduct(page);
+      expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+    });
+
+    it('should preview product', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'previewProduct4', baseContext);
+
+      // Click on preview button
+      page = await createProductsPage.previewProduct(page);
+
+      await foProductPage.changeLanguage(page, 'en');
+
+      const pageTitle = await foProductPage.getPageTitle(page);
+      await expect(pageTitle).to.contains(newProductData.name);
+    });
+
+    it('should select combination', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'selectCombination5', baseContext);
+      const firstCombination: ProductAttribute[] = [
+        {
+          name: 'size',
+          value: 'L',
+        },
+        {
+          name: 'color',
+          value: 'Taupe',
+        },
+      ];
+      await foProductPage.selectAttributes(page, 1, firstCombination);
+
+      const isVisible = await foProductPage.isAddToCartButtonEnabled(page);
+      await expect(isVisible).to.be.true;
+    });
+
+    it('should check the label of out of stock', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'selectCombination6', baseContext);
+
+      const availabilityLabel = await foProductPage.getProductAvailabilityLabel(page);
+      await expect(availabilityLabel).to.contains('Out of stock');
+
+      const isVisible = await foProductPage.isAddToCartButtonEnabled(page);
+      await expect(isVisible).to.be.true;
+    });
+
+    it('should close the page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goBackToBO5', baseContext);
+
+      page = await productSettings.closePage(browserContext, page, 0);
+
+      const pageTitle = await createProductsPage.getPageTitle(page);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
+    });
+  });
+
+  describe('Delete product', async () => {
+    it('should delete product', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'deleteProduct', baseContext);
+
+      const createProductMessage = await createProductsPage.deleteProduct(page);
+      await expect(createProductMessage).to.equal(productsPage.successfulDeleteMessage);
+    });
+  });
+});
diff --git a/tests/UI/pages/BO/catalog/productsV2/add/combinationsTab.ts b/tests/UI/pages/BO/catalog/productsV2/add/combinationsTab.ts
index f1c90b86cb7ea..ee08f2d601fcf 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/combinationsTab.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/combinationsTab.ts
@@ -33,6 +33,8 @@ class CombinationsTab extends BOBasePage {
 
   private readonly combinationsTabLink: string;
 
+  private readonly learnMoreButton: string;
+
   private readonly attributesAndFeaturesHyperLink: string;
 
   private readonly generateFirstCombinationsButton: string;
@@ -41,6 +43,8 @@ class CombinationsTab extends BOBasePage {
 
   private readonly generateCombinationsModal: string;
 
+  private readonly cancelButton: string;
+
   private readonly searchAttributesButton: string;
 
   private readonly generateCombinationsButtonOnModal: string;
@@ -69,6 +73,8 @@ class CombinationsTab extends BOBasePage {
 
   private readonly bulkEditModalStockLocationSwitchButton: (toEnable: number) => string;
 
+  private readonly selectAllAttributeCheckboxButton: (row: number) => string;
+
   private readonly bulkEditModalStockLocationInput: string;
 
   private readonly bulkEditModalSaveButton: string;
@@ -133,6 +139,8 @@ class CombinationsTab extends BOBasePage {
 
   private readonly editCombinationModal: string;
 
+  private readonly editCombinationNameValue: string;
+
   private readonly editCombinationModalQuantityInput: string;
 
   private readonly editCombinationModalMinimalQuantityInput: string;
@@ -157,6 +165,10 @@ class CombinationsTab extends BOBasePage {
 
   private readonly modalConfirmDeleteCombination: string;
 
+  private readonly previousCombinationButton: string;
+
+  private readonly nextCombinationButton: string;
+
   private readonly modalDeleteCombinationCancelButton: string;
 
   private readonly modalDeleteCombinationDeleteButton: string;
@@ -177,6 +189,18 @@ class CombinationsTab extends BOBasePage {
 
   private readonly paginationPreviousLink: string;
 
+  private readonly denyOrderRadioButton: string;
+
+  private readonly allowOrderRadioButton: string;
+
+  private readonly useDefaultBehaviourRadioButton: string;
+
+  private readonly editDefaultBehaviourLink: string;
+
+  private readonly labelWhenInStock: string;
+
+  private readonly labelWhenOutOfStock: string;
+
   /**
    * @constructs
    * Setting up texts and selectors to use on combinations tab
@@ -191,6 +215,7 @@ class CombinationsTab extends BOBasePage {
 
     // Selectors in combinations tab
     this.combinationsTabLink = '#product_combinations-tab-nav';
+    this.learnMoreButton = '#combinations-empty-state a[href*=\'documentation\']';
     this.attributesAndFeaturesHyperLink = '#combinations-empty-state p.mx-auto.showcase-list-card__message a.alert-link';
     this.generateFirstCombinationsButton = '#combinations-empty-state button.generate-combinations-button';
     this.generateCombinationButton = '#combination-list-actions button.generate-combinations-button';
@@ -199,6 +224,7 @@ class CombinationsTab extends BOBasePage {
     this.generateCombinationsButtonOnModal = `${this.generateCombinationsModal} footer button.btn.btn-primary`;
     this.generateCombinationsCloseButton = `${this.generateCombinationsModal} button.close`;
     this.saveCombinationEditButton = '#save-combinations-edition';
+    this.cancelButton = `${this.generateCombinationsModal} button.btn-outline-secondary`;
 
     // Bulk actions selectors
     this.bulkActionsButton = '#combination-bulk-actions-btn';
@@ -259,11 +285,14 @@ class CombinationsTab extends BOBasePage {
     this.combinationListSelectAllDropDownMenu = '#bulk-all-selection-dropdown .dropdown-menu.show';
     this.combinationListBulkSelectAll = '#bulk-all-selection-dropdown label[for="bulk-select-all"]';
     this.combinationListBulkSelectAllInPage = '#bulk-select-all-in-page + i';
+    this.selectAllAttributeCheckboxButton = (row: number) => '#attributes-list-selector div.attributes-content'
+      + ` div:nth-child(${row}) div.attribute-group-header div`;
 
     // Edit combination modal
     this.editCombinationIframe = '.combination-iframe';
     this.editCombinationEditModal = '#combination-edit-modal';
     this.editCombinationModal = '#combination-edit-modal div.combination-modal div.modal.show';
+    this.editCombinationNameValue = '#combination_form_header div.combination-name-row span.text-preview-value';
     this.editCombinationModalQuantityInput = '#combination_form_stock_quantities_delta_quantity_delta';
     this.editCombinationModalMinimalQuantityInput = '#combination_form_stock_quantities_minimal_quantity';
     this.editCombinationModalImpactOnPriceTExcInput = '#combination_form_price_impact_price_tax_excluded';
@@ -278,6 +307,8 @@ class CombinationsTab extends BOBasePage {
       + `${row - 1}_employee_name + span`;
     this.combinationStockMovements = (row: number) => `#combination_form_stock_quantities_stock_movements_${row - 1}`
       + '_delta_quantity + span';
+    this.previousCombinationButton = `${this.editCombinationModal} button.btn-previous-combination`;
+    this.nextCombinationButton = `${this.editCombinationModal} button.btn-next-combination`;
 
     // Delete combination modal
     this.modalConfirmDeleteCombination = '#modal-confirm-delete-combination';
@@ -296,6 +327,14 @@ class CombinationsTab extends BOBasePage {
     this.paginationLimitSelect = '#paginator-limit';
     this.paginationNextLink = `${this.paginationBlock} .page-link.next:not(.disabled)`;
     this.paginationPreviousLink = `${this.paginationBlock} .page-link.previous:not(.disabled)`;
+
+    // When out of stock selectors
+    this.denyOrderRadioButton = '#product_combinations_availability_out_of_stock_type_0 +i';
+    this.allowOrderRadioButton = '#product_combinations_availability_out_of_stock_type_1 +i';
+    this.useDefaultBehaviourRadioButton = '#product_combinations_availability_out_of_stock_type_2 +i';
+    this.editDefaultBehaviourLink = '#product_combinations_availability a[href*=configuration_fieldset_stock]';
+    this.labelWhenInStock = '#product_combinations_availability_available_now_label_1';
+    this.labelWhenOutOfStock = '#product_combinations_availability_available_later_label_1';
   }
 
   /*
@@ -314,6 +353,43 @@ class CombinationsTab extends BOBasePage {
     return this.openLinkWithTargetBlank(page, this.attributesAndFeaturesHyperLink, 'body');
   }
 
+  /**
+   * Click on learn more button
+   * @param page {Page} Browser tab
+   * @returns {Promise<Page>}
+   */
+  async clickOnLearnMoreButton(page: Page): Promise<Page> {
+    await this.waitForSelectorAndClick(page, this.combinationsTabLink);
+
+    return this.openLinkWithTargetBlank(page, this.learnMoreButton, 'body');
+  }
+
+  /**
+   * Click on generate combination button
+   * @param page {Page} Browser tab
+   * @returns {Promise<boolean>}
+   */
+  async clickOnGenerateCombinationButton(page: Page): Promise<boolean> {
+    if (await this.elementVisible(page, this.generateCombinationButton, 2000)) {
+      await this.waitForSelectorAndClick(page, this.generateCombinationButton);
+    } else {
+      await this.waitForSelectorAndClick(page, this.generateFirstCombinationsButton);
+    }
+
+    return this.elementVisible(page, this.generateCombinationsModal, 1000);
+  }
+
+  /**
+   * Click on cancel button
+   * @param page {Page} Browser tab
+   * @returns {Promise<boolean>}
+   */
+  async clickOnCancelButton(page: Page): Promise<boolean> {
+    await this.waitForSelectorAndClick(page, this.cancelButton);
+
+    return this.elementNotVisible(page, this.generateCombinationsModal, 1000);
+  }
+
   /**
    * Add combination
    * @param page {Page} Browser tab
@@ -352,6 +428,29 @@ class CombinationsTab extends BOBasePage {
     return this.getTextContent(page, this.generateCombinationsButtonOnModal);
   }
 
+  /**
+   * Select all values
+   * @param page {Page} Browser tab
+   * @param attribute {string}
+   * @returns {Promise<string>}
+   */
+  async selectAllValues(page: Page, attribute: string): Promise<string> {
+    switch (attribute) {
+      case 'size':
+        await page.locator(this.selectAllAttributeCheckboxButton(1)).click();
+        break;
+
+      case 'color':
+        await page.locator(this.selectAllAttributeCheckboxButton(2)).click();
+        break;
+
+      default:
+        throw new Error('Attribute is not existing');
+    }
+
+    return this.getTextContent(page, this.generateCombinationsButtonOnModal);
+  }
+
   /**
    * Generate combinations
    * @param page {Page} Browser tab
@@ -412,6 +511,36 @@ class CombinationsTab extends BOBasePage {
     return this.getGrowlMessageContent(page);
   }
 
+  /**
+   * Click on next combination button
+   * @param page {Page} Browser tab
+   * @returns {Promise<void>}
+   */
+  async clickOnNextCombinationButton(page: Page): Promise<void> {
+    await page.locator(this.nextCombinationButton).click();
+  }
+
+  /**
+   * Click on previous combination button
+   * @param page {Page} Browser tab
+   * @returns {Promise<void>}
+   */
+  async clickOnPreviousCombinationButton(page: Page): Promise<void> {
+    await page.locator(this.previousCombinationButton).click();
+  }
+
+  /**
+   * Get combination name from modal
+   * @param page {Page} Browser tab
+   * @returns {Promise<string>}
+   */
+  async getCombinationNameFromModal(page: Page): Promise<string> {
+    const combinationFrame: Frame | null = await page.frame({url: /sell\/catalog\/products-v2\/combinations/gmi});
+    await expect(combinationFrame).to.be.not.null;
+
+    return this.getTextContent(combinationFrame!, this.editCombinationNameValue);
+  }
+
   /**
    * Click on delete icon then (delete/cancel)
    * @param page {Page} Browser tab
@@ -443,7 +572,7 @@ class CombinationsTab extends BOBasePage {
     await page.waitForTimeout(2000);
     await this.waitForVisibleSelector(page, this.editCombinationIframe);
 
-    const combinationFrame: Frame|null = await page.frame({url: /sell\/catalog\/products-v2\/combinations/gmi});
+    const combinationFrame: Frame | null = await page.frame({url: /sell\/catalog\/products-v2\/combinations/gmi});
     await expect(combinationFrame).to.be.not.null;
 
     await this.setValue(combinationFrame!, this.editCombinationModalQuantityInput, combinationData.quantity);
@@ -473,7 +602,7 @@ class CombinationsTab extends BOBasePage {
    * @returns {Promise<ProductStockMovement>}
    */
   async getRecentStockMovements(page: Page, row: number = 1): Promise<ProductStockMovement> {
-    const combinationFrame: Frame|null = await page.frame({url: /sell\/catalog\/products-v2\/combinations/gmi});
+    const combinationFrame: Frame | null = await page.frame({url: /sell\/catalog\/products-v2\/combinations/gmi});
     await expect(combinationFrame).to.be.not.null;
 
     return {
@@ -489,7 +618,7 @@ class CombinationsTab extends BOBasePage {
    * @returns {Promise<boolean>}
    */
   async closeEditCombinationModal(page: Page): Promise<boolean> {
-    const combinationFrame: Frame|null = await page.frame({url: /sell\/catalog\/products-v2\/combinations/gmi});
+    const combinationFrame: Frame | null = await page.frame({url: /sell\/catalog\/products-v2\/combinations/gmi});
     await expect(combinationFrame).to.be.not.null;
 
     await this.waitForSelectorAndClick(page, this.editCombinationModalCancelButton);
@@ -523,7 +652,7 @@ class CombinationsTab extends BOBasePage {
 
   /**
    * Get text column
-   * @param page {Page} Browser tab
+   * @param page {Frame|Page} Browser tab
    * @param column {string} Column name to get text content
    * @param row {number} Row on table
    * @returns {Promise<string>}
@@ -635,13 +764,13 @@ class CombinationsTab extends BOBasePage {
     if (!footerText) {
       return 0;
     }
-    const regexMatch: RegExpMatchArray|null = footerText.match(/out of ([0-9]+)/);
+    const regexMatch: RegExpMatchArray | null = footerText.match(/out of ([0-9]+)/);
 
     if (regexMatch === null) {
       return 0;
     }
 
-    const regexResult: RegExpExecArray|null = /\d+/g.exec(regexMatch.toString());
+    const regexResult: RegExpExecArray | null = /\d+/g.exec(regexMatch.toString());
 
     if (regexResult === null) {
       return 0;
@@ -722,7 +851,7 @@ class CombinationsTab extends BOBasePage {
    * @param editStockData {ProductCombinationBulkStock} Data to set on bulk edit stock form
    * @returns {Promise<void>}
    */
-  async bulkEditStock(page: Frame|Page, editStockData: ProductCombinationBulkStock): Promise<void> {
+  async bulkEditStock(page: Frame | Page, editStockData: ProductCombinationBulkStock): Promise<void> {
     await this.waitForSelectorAndClick(page, this.bulkEditModalStocksButton);
     await this.setChecked(
       page,
@@ -756,7 +885,7 @@ class CombinationsTab extends BOBasePage {
    * @param editRetailPriceData {ProductCombinationBulkRetailPrice} Data to set on bulk edit retail price form
    * @returns {Promise<void>}
    */
-  async bulkEditRetailPrice(page: Frame|Page, editRetailPriceData: ProductCombinationBulkRetailPrice): Promise<void> {
+  async bulkEditRetailPrice(page: Frame | Page, editRetailPriceData: ProductCombinationBulkRetailPrice): Promise<void> {
     await this.waitForSelectorAndClick(page, this.bulkEditModalRetailPriceButton);
     await this.setChecked(page, this.bulkEditModalCostPriceSwitchButton(editRetailPriceData.costPriceToEnable ? 1 : 0),
     );
@@ -820,6 +949,57 @@ class CombinationsTab extends BOBasePage {
     // Return text in modal
     return result;
   }
+
+  // Methods for when out of stock
+  /**
+   * Set option when out of stock
+   * @param page {Page} Browser tab
+   * @param option {string} Option to check
+   * @returns {Promise<void>}
+   */
+  async setOptionWhenOutOfStock(page: Page, option: string): Promise<void> {
+    switch (option) {
+      case 'Deny orders':
+        await this.setChecked(page, this.denyOrderRadioButton);
+        break;
+      case 'Allow orders':
+        await this.setChecked(page, this.allowOrderRadioButton);
+        break;
+      case 'Use default behavior':
+        await this.setChecked(page, this.useDefaultBehaviourRadioButton);
+        break;
+      default:
+        throw new Error(`Option ${option} was not found`);
+    }
+  }
+
+  /**
+   * Click on edit default behaviour link
+   * @param page {Page} Browser tab
+   * @returns {Promise<Page>}
+   */
+  async clickOnEditDefaultBehaviourLink(page: Page): Promise<Page> {
+    return this.openLinkWithTargetBlank(page, this.editDefaultBehaviourLink);
+  }
+
+  /**
+   * Set label when in stock
+   * @param page {Page} Browser tab
+   * @param label {string} Label to set when in stock in the input
+   * @returns {Promise<void>}
+   */
+  async setLabelWhenInStock(page: Page, label: string): Promise<void> {
+    await this.setValue(page, this.labelWhenInStock, label);
+  }
+
+  /**
+   * Set label when out of stock
+   * @param page {Page} Browser tab
+   * @param label {string} Label to set when out of stock in the input
+   */
+  async setLabelWhenOutOfStock(page: Page, label: string): Promise<void> {
+    await this.setValue(page, this.labelWhenOutOfStock, label);
+  }
 }
 
 export default new CombinationsTab();

From 47b56835abeab4b45f574da67a5c5e5fdd35f7c1 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Mon, 18 Sep 2023 17:59:51 +0200
Subject: [PATCH 1023/1030] Add some fixes

---
 .../productV2/functional/11_combinationTab.ts          | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/tests/UI/campaigns/productV2/functional/11_combinationTab.ts b/tests/UI/campaigns/productV2/functional/11_combinationTab.ts
index ddb0ea6c6cab1..fccace25bbefb 100644
--- a/tests/UI/campaigns/productV2/functional/11_combinationTab.ts
+++ b/tests/UI/campaigns/productV2/functional/11_combinationTab.ts
@@ -39,16 +39,6 @@ describe('BO - Catalog - Products : Combination tab', async () => {
     taxRule: 'No tax',
     quantity: 50,
     minimumQuantity: 1,
-    attributes: [
-      {
-        name: 'size',
-        values: ['S', 'M', 'L', 'XL'],
-      },
-      {
-        name: 'color',
-        values: ['Gray', 'Taupe', 'Beige', 'White', 'Red', 'Black', 'Orange', 'Green', 'Yellow', 'Brown'],
-      },
-    ],
     status: true,
   });
 

From e9184eda292b8609ef704ffe0ced42cad4bdf02e Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Thu, 21 Sep 2023 15:16:11 +0200
Subject: [PATCH 1024/1030] Fix review

---
 .../03_CRUDProductWithCombinations.ts         | 106 +++++++++---------
 .../productV2/functional/11_combinationTab.ts |  40 +++----
 .../catalog/productsV2/add/combinationsTab.ts |   2 +-
 3 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/tests/UI/campaigns/productV2/functional/03_CRUDProductWithCombinations.ts b/tests/UI/campaigns/productV2/functional/03_CRUDProductWithCombinations.ts
index 22c7c34b0962a..4c95d361e7baa 100644
--- a/tests/UI/campaigns/productV2/functional/03_CRUDProductWithCombinations.ts
+++ b/tests/UI/campaigns/productV2/functional/03_CRUDProductWithCombinations.ts
@@ -172,14 +172,14 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       await productsPage.closeSfToolBar(page);
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should click on \'New product\' button and check new product modal', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnNewProductButton', baseContext);
 
       const isModalVisible = await productsPage.clickOnNewProductButton(page);
-      await expect(isModalVisible).to.be.true;
+      expect(isModalVisible).eq(true);
     });
 
     it('should select the product with combination and check the description', async function () {
@@ -188,7 +188,7 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       await productsPage.selectProductType(page, newProductData.type);
 
       const productTypeDescription = await productsPage.getProductDescription(page);
-      await expect(productTypeDescription).to.contains(productsPage.productWithCombinationsDescription);
+      expect(productTypeDescription).to.contains(productsPage.productWithCombinationsDescription);
     });
 
     it('should go to new product page', async function () {
@@ -197,7 +197,7 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       await productsPage.clickOnAddNewProduct(page);
 
       const pageTitle = await createProductsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
     });
 
     it('should create product', async function () {
@@ -206,7 +206,7 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       await createProductsPage.closeSfToolBar(page);
 
       const createProductMessage = await createProductsPage.setProduct(page, newProductData);
-      await expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+      expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
     });
   });
 
@@ -217,7 +217,7 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       page = await combinationsTab.clickOnAttributesAndFeaturesLink(page);
 
       const pageTitle = await attributesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(attributesPage.pageTitle);
+      expect(pageTitle).to.contains(attributesPage.pageTitle);
     });
 
     it('should close \'Attributes & Features\' page', async function () {
@@ -226,7 +226,7 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       page = await attributesPage.closePage(browserContext, page, 0);
 
       const pageTitle = await createProductsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
     });
 
     it('should create combinations and check generate combinations button', async function () {
@@ -236,21 +236,21 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
         page,
         newProductData.attributes,
       );
-      await expect(generateCombinationsButton).to.equal(combinationsTab.generateCombinationsMessage(40));
+      expect(generateCombinationsButton).to.equal(combinationsTab.generateCombinationsMessage(40));
     });
 
     it('should click on generate combinations button', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'generateCombinations', baseContext);
 
       const successMessage = await combinationsTab.generateCombinations(page);
-      await expect(successMessage).to.equal(combinationsTab.successfulGenerateCombinationsMessage(40));
+      expect(successMessage).to.equal(combinationsTab.successfulGenerateCombinationsMessage(40));
     });
 
     it('combinations generation modal should be closed', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'generateCombinationsModalIsClosed2', baseContext);
 
       const isModalClosed = await combinationsTab.generateCombinationModalIsClosed(page);
-      await expect(isModalClosed).to.be.true;
+      expect(isModalClosed).eq(true);
     });
   });
 
@@ -259,21 +259,21 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       await testContext.addContextItem(this, 'testIdentifier', 'editFirstCombination', baseContext);
 
       const successMessage = await combinationsTab.editCombination(page, firstCombinationData);
-      await expect(successMessage).to.equal(combinationsTab.successfulUpdateMessage);
+      expect(successMessage).to.equal(combinationsTab.successfulUpdateMessage);
     });
 
     it('should click on edit icon for the second combination and check the modal', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnEditSecondCombination', baseContext);
 
       const isVisible = await combinationsTab.clickOnEditIcon(page, 2);
-      await expect(isVisible).to.be.true;
+      expect(isVisible).eq(true);
     });
 
     it('should edit the combination from the modal', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'editSecondCombination', baseContext);
 
       const successMessage = await combinationsTab.editCombinationFromModal(page, secondCombinationData);
-      await expect(successMessage).to.equal(combinationsTab.successfulUpdateMessage);
+      expect(successMessage).to.equal(combinationsTab.successfulUpdateMessage);
     });
 
     it('should check the recent stock movement in the modal', async function () {
@@ -281,9 +281,9 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
 
       const result = await combinationsTab.getRecentStockMovements(page);
       await Promise.all([
-        await expect(result.dateTime).to.contains(todayDate),
-        await expect(result.employee).to.equal(`${global.BO.FIRSTNAME} ${global.BO.LASTNAME}`),
-        await expect(result.quantity).to.equal(secondCombinationData.quantity),
+        expect(result.dateTime).to.contains(todayDate),
+        expect(result.employee).to.equal(`${global.BO.FIRSTNAME} ${global.BO.LASTNAME}`),
+        expect(result.quantity).to.equal(secondCombinationData.quantity),
       ]);
     });
 
@@ -291,7 +291,7 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       await testContext.addContextItem(this, 'testIdentifier', 'closeModal', baseContext);
 
       const isModalVisible = await combinationsTab.closeEditCombinationModal(page);
-      await expect(isModalVisible).to.be.false;
+      expect(isModalVisible).eq(false);
     });
   });
 
@@ -402,9 +402,9 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
         const expectedResult = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
         if (test.args.sortDirection === 'asc') {
-          await expect(sortedTableFloat).to.deep.equal(expectedResult);
+          expect(sortedTableFloat).to.deep.equal(expectedResult);
         } else {
-          await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+          expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
         }
       });
     });
@@ -445,14 +445,14 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       await testContext.addContextItem(this, 'testIdentifier', 'deleteFirstCombinationCancel', baseContext);
 
       const isModalVisible = await combinationsTab.clickOnDeleteIcon(page, 'cancel');
-      await expect(isModalVisible).to.be.false;
+      expect(isModalVisible).eq(false);
     });
 
     it('should delete the first combination', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteFirstCombination', baseContext);
 
       const successMessage = await combinationsTab.clickOnDeleteIcon(page, 'delete');
-      await expect(successMessage).to.equal(createProductsPage.successfulDeleteMessage);
+      expect(successMessage).to.equal(createProductsPage.successfulDeleteMessage);
     });
   });
 
@@ -465,7 +465,7 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
 
       for (let i = 1; i <= 3; i++) {
         const name = await combinationsTab.getTextColumn(page, 'name', i);
-        await expect(name).to.contains('Size - S');
+        expect(name).to.contains('Size - S');
       }
     });
 
@@ -473,14 +473,14 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       await testContext.addContextItem(this, 'testIdentifier', 'checkFilterBySizeButton', baseContext);
 
       const buttonName = await combinationsTab.getFilterBySizeButtonName(page);
-      await expect(buttonName).to.equal('Size (1)');
+      expect(buttonName).to.equal('Size (1)');
     });
 
     it('should clear filter', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clearFilter', baseContext);
 
       const numberOfCombinations = await combinationsTab.clearFilter(page);
-      await expect(numberOfCombinations).to.equal(39);
+      expect(numberOfCombinations).to.equal(39);
     });
   });
 
@@ -489,21 +489,21 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       await testContext.addContextItem(this, 'testIdentifier', 'selectAllCombinations', baseContext);
 
       const isBulkActionsButtonVisible = await combinationsTab.selectAllCombinations(page);
-      await expect(isBulkActionsButtonVisible).to.be.true;
+      expect(isBulkActionsButtonVisible).eq(true);
     });
 
     it('should click on edit combinations by bulk actions and check the modal title', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnEditByBulkActions', baseContext);
 
       const modalTitle = await combinationsTab.clickOnEditCombinationsByBulkActions(page);
-      await expect(modalTitle).to.equal(combinationsTab.editCombinationsModalTitle(39));
+      expect(modalTitle).to.equal(combinationsTab.editCombinationsModalTitle(39));
     });
 
     it('should edit Stocks, Retail price and Specific references', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'editStock', baseContext);
 
       const successMessage = await combinationsTab.editCombinationsByBulkActions(page, editStockData);
-      await expect(successMessage).to.equal(combinationsTab.editCombinationsModalMessage(39));
+      expect(successMessage).to.equal(combinationsTab.editCombinationsModalMessage(39));
     });
   });
 
@@ -516,14 +516,14 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       await createProductsPage.setProductStatus(page, true);
 
       const updateProductMessage = await createProductsPage.saveProduct(page);
-      await expect(updateProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+      expect(updateProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
     });
 
     it('should check that the save button is changed to \'Save and publish\'', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkSaveButton', baseContext);
 
       const saveButtonName = await createProductsPage.getSaveButtonName(page);
-      await expect(saveButtonName).to.equal(createProductsPage.saveAndPublishButtonName);
+      expect(saveButtonName).to.equal(createProductsPage.saveAndPublishButtonName);
     });
 
     it('should check the product header details', async function () {
@@ -552,7 +552,7 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       await foProductPage.changeLanguage(page, 'en');
 
       const pageTitle = await foProductPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(newProductData.name);
+      expect(pageTitle).to.contains(newProductData.name);
     });
 
     it('should check all product information', async function () {
@@ -562,18 +562,18 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
 
       const result = await foProductPage.getProductInformation(page);
       await Promise.all([
-        await expect(result.name).to.equal(newProductData.name),
-        await expect(result.price).to.equal(pricingData.price + secondCombinationData.impactOnPriceTExc + taxValue),
-        await expect(result.summary).to.equal(newProductData.summary),
-        await expect(result.description).to.equal(newProductData.description),
+        expect(result.name).to.equal(newProductData.name),
+        expect(result.price).to.equal(pricingData.price + secondCombinationData.impactOnPriceTExc + taxValue),
+        expect(result.summary).to.equal(newProductData.summary),
+        expect(result.description).to.equal(newProductData.description),
       ]);
 
       const productAttributes = await foProductPage.getProductAttributes(page);
       await Promise.all([
-        await expect(productAttributes[0].name).to.equal(newProductData.attributes[0].name),
-        await expect(productAttributes[0].value).to.equal(newProductData.attributes[0].values.join(' ')),
-        await expect(productAttributes[1].name).to.equal(newProductData.attributes[1].name),
-        await expect(productAttributes[1].value).to.equal(editProductAttributesData[1].values.join(' ')),
+        expect(productAttributes[0].name).to.equal(newProductData.attributes[0].name),
+        expect(productAttributes[0].value).to.equal(newProductData.attributes[0].values.join(' ')),
+        expect(productAttributes[1].name).to.equal(newProductData.attributes[1].name),
+        expect(productAttributes[1].value).to.equal(editProductAttributesData[1].values.join(' ')),
       ]);
     });
   });
@@ -586,14 +586,14 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       page = await foProductPage.closePage(browserContext, page, 0);
 
       const pageTitle: string = await createProductsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
     });
 
     it('should edit the created product', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'editProduct', baseContext);
 
       const createProductMessage = await createProductsPage.setProduct(page, editProductData);
-      await expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+      expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
     });
 
     it('should add combinations and check generate combinations button', async function () {
@@ -603,7 +603,7 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
         page,
         editProductData.attributes,
       );
-      await expect(generateCombinationsButton).to.equal(combinationsTab.generateCombinationsMessage(6));
+      expect(generateCombinationsButton).to.equal(combinationsTab.generateCombinationsMessage(6));
     });
 
     it('should click on generate combinations button', async function () {
@@ -617,14 +617,14 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       await testContext.addContextItem(this, 'testIdentifier', 'generateCombinationsModalIsClosed2', baseContext);
 
       const isModalClosed = await combinationsTab.generateCombinationModalIsClosed(page);
-      await expect(isModalClosed).to.be.true;
+      expect(isModalClosed).eq(true);
     });
 
     it('should save the product', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'saveProduct2', baseContext);
 
       const updateProductMessage = await createProductsPage.saveProduct(page);
-      await expect(updateProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+      expect(updateProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
     });
   });
 
@@ -638,7 +638,7 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       await foProductPage.changeLanguage(page, 'en');
 
       const pageTitle = await foProductPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(editProductData.name);
+      expect(pageTitle).to.contains(editProductData.name);
     });
 
     it('should check all product information', async function () {
@@ -646,17 +646,17 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
 
       const result = await foProductPage.getProductInformation(page);
       await Promise.all([
-        await expect(result.name).to.equal(editProductData.name),
-        await expect(result.price).to.equal(editProductData.price + secondCombinationData.impactOnPriceTExc),
-        await expect(result.description).to.equal(editProductData.description),
+        expect(result.name).to.equal(editProductData.name),
+        expect(result.price).to.equal(editProductData.price + secondCombinationData.impactOnPriceTExc),
+        expect(result.description).to.equal(editProductData.description),
       ]);
 
       const productAttributes = await foProductPage.getProductAttributes(page);
       await Promise.all([
-        await expect(productAttributes[0].name).to.equal(editProductAttributesData[0].name),
-        await expect(productAttributes[0].value).to.equal(editProductAttributesData[0].values.join(' ')),
-        await expect(productAttributes[1].name).to.equal(editProductAttributesData[1].name),
-        await expect(productAttributes[1].value).to.equal(editProductAttributesData[1].values.join(' ')),
+        expect(productAttributes[0].name).to.equal(editProductAttributesData[0].name),
+        expect(productAttributes[0].value).to.equal(editProductAttributesData[0].values.join(' ')),
+        expect(productAttributes[1].name).to.equal(editProductAttributesData[1].name),
+        expect(productAttributes[1].value).to.equal(editProductAttributesData[1].values.join(' ')),
       ]);
     });
 
@@ -667,7 +667,7 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       page = await foProductPage.closePage(browserContext, page, 0);
 
       const pageTitle = await createProductsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
     });
   });
 
@@ -676,7 +676,7 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       await testContext.addContextItem(this, 'testIdentifier', 'deleteProduct', baseContext);
 
       const createProductMessage = await createProductsPage.deleteProduct(page);
-      await expect(createProductMessage).to.equal(productsPage.successfulDeleteMessage);
+      expect(createProductMessage).to.equal(productsPage.successfulDeleteMessage);
     });
   });
 });
diff --git a/tests/UI/campaigns/productV2/functional/11_combinationTab.ts b/tests/UI/campaigns/productV2/functional/11_combinationTab.ts
index fccace25bbefb..560f515dfb5e3 100644
--- a/tests/UI/campaigns/productV2/functional/11_combinationTab.ts
+++ b/tests/UI/campaigns/productV2/functional/11_combinationTab.ts
@@ -95,7 +95,7 @@ describe('BO - Catalog - Products : Combination tab', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnNewProductButton', baseContext);
 
       const isModalVisible = await productsPage.clickOnNewProductButton(page);
-      await expect(isModalVisible).to.be.true;
+      expect(isModalVisible).eq(true);
     });
 
     it('should select the product with combination and check the description', async function () {
@@ -158,14 +158,14 @@ describe('BO - Catalog - Products : Combination tab', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnGenerateCombinationButton', baseContext);
 
       const isModalVisible = await combinationsTab.clickOnGenerateCombinationButton(page);
-      await expect(isModalVisible).to.be.true;
+      expect(isModalVisible).eq(true);
     });
 
     it('should click on cancel button', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnCancelButton', baseContext);
 
       const isModalNotVisible = await combinationsTab.clickOnCancelButton(page);
-      await expect(isModalNotVisible).to.be.true;
+      expect(isModalNotVisible).eq(true);
     });
 
     it('should create combination by checking size and color checkboxes', async function () {
@@ -184,7 +184,7 @@ describe('BO - Catalog - Products : Combination tab', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'generateCombinations', baseContext);
 
       const successMessage = await combinationsTab.generateCombinations(page);
-      await expect(successMessage).to.equal(combinationsTab.successfulGenerateCombinationsMessage(56));
+      expect(successMessage).to.equal(combinationsTab.successfulGenerateCombinationsMessage(56));
     });
   });
 
@@ -195,7 +195,7 @@ describe('BO - Catalog - Products : Combination tab', async () => {
       await combinationsTab.clickOnEditIcon(page, 1);
 
       const successMessage = await combinationsTab.editCombinationFromModal(page, firstCombinationData);
-      await expect(successMessage).to.equal(combinationsTab.successfulUpdateMessage);
+      expect(successMessage).to.equal(combinationsTab.successfulUpdateMessage);
     });
 
     // @todo : https://github.com/PrestaShop/PrestaShop/issues/33965
@@ -205,7 +205,7 @@ describe('BO - Catalog - Products : Combination tab', async () => {
       await combinationsTab.clickOnNextCombinationButton(page);
 
       const combinationName = await combinationsTab.getCombinationNameFromModal(page);
-      await expect(combinationName).to.equal('Size - S, Color - Taupe');
+      expect(combinationName).to.equal('Size - S, Color - Taupe');
     });
 
     it.skip('should click on previous combination button', async function () {
@@ -221,7 +221,7 @@ describe('BO - Catalog - Products : Combination tab', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'closeModal', baseContext);
 
       const isModalVisible = await combinationsTab.closeEditCombinationModal(page);
-      await expect(isModalVisible).to.be.false;
+      expect(isModalVisible).eq(false);
     });
   });
 
@@ -249,7 +249,7 @@ describe('BO - Catalog - Products : Combination tab', async () => {
         await foProductPage.changeLanguage(page, 'en');
 
         const pageTitle = await foProductPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(newProductData.name);
+        expect(pageTitle).to.contains(newProductData.name);
       });
 
       it('should select combination and check the add to cart button', async function () {
@@ -267,7 +267,7 @@ describe('BO - Catalog - Products : Combination tab', async () => {
         await foProductPage.selectAttributes(page, 1, firstCombination);
 
         const isVisible = await foProductPage.isAddToCartButtonEnabled(page);
-        await expect(isVisible).to.eq(test.args.isAddToCartButtonVisible);
+        expect(isVisible).to.eq(test.args.isAddToCartButtonVisible);
       });
 
       it('should go back to BO', async function () {
@@ -277,7 +277,7 @@ describe('BO - Catalog - Products : Combination tab', async () => {
         page = await foProductPage.closePage(browserContext, page, 0);
 
         const pageTitle = await createProductsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+        expect(pageTitle).to.contains(createProductsPage.pageTitle);
       });
     });
 
@@ -287,7 +287,7 @@ describe('BO - Catalog - Products : Combination tab', async () => {
       page = await combinationsTab.clickOnEditDefaultBehaviourLink(page);
 
       const pageTitle = await productSettings.getPageTitle(page);
-      await expect(pageTitle).to.contains(productSettings.pageTitle);
+      expect(pageTitle).to.contains(productSettings.pageTitle);
     });
 
     it('should close the page', async function () {
@@ -317,7 +317,7 @@ describe('BO - Catalog - Products : Combination tab', async () => {
       await foProductPage.changeLanguage(page, 'en');
 
       const pageTitle = await foProductPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(newProductData.name);
+      expect(pageTitle).to.contains(newProductData.name);
     });
 
     it('should select combination', async function () {
@@ -335,14 +335,14 @@ describe('BO - Catalog - Products : Combination tab', async () => {
       await foProductPage.selectAttributes(page, 1, firstCombination);
 
       const isVisible = await foProductPage.isAddToCartButtonEnabled(page);
-      await expect(isVisible).to.be.false;
+      expect(isVisible).eq(false);
     });
 
     it('should check the product availability label', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'selectCombination4', baseContext);
 
       const availabilityLabel = await foProductPage.getProductAvailabilityLabel(page);
-      await expect(availabilityLabel).to.contains('Product available');
+      expect(availabilityLabel).to.contains('Product available');
     });
 
     it('should close the page', async function () {
@@ -374,7 +374,7 @@ describe('BO - Catalog - Products : Combination tab', async () => {
       await foProductPage.changeLanguage(page, 'en');
 
       const pageTitle = await foProductPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(newProductData.name);
+      expect(pageTitle).to.contains(newProductData.name);
     });
 
     it('should select combination', async function () {
@@ -392,17 +392,17 @@ describe('BO - Catalog - Products : Combination tab', async () => {
       await foProductPage.selectAttributes(page, 1, firstCombination);
 
       const isVisible = await foProductPage.isAddToCartButtonEnabled(page);
-      await expect(isVisible).to.be.true;
+      expect(isVisible).eq(true);
     });
 
     it('should check the label of out of stock', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'selectCombination6', baseContext);
 
       const availabilityLabel = await foProductPage.getProductAvailabilityLabel(page);
-      await expect(availabilityLabel).to.contains('Out of stock');
+      expect(availabilityLabel).to.contains('Out of stock');
 
       const isVisible = await foProductPage.isAddToCartButtonEnabled(page);
-      await expect(isVisible).to.be.true;
+      expect(isVisible).eq(true);
     });
 
     it('should close the page', async function () {
@@ -415,12 +415,12 @@ describe('BO - Catalog - Products : Combination tab', async () => {
     });
   });
 
-  describe('Delete product', async () => {
+  describe('Post-Test: Delete product', async () => {
     it('should delete product', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteProduct', baseContext);
 
       const createProductMessage = await createProductsPage.deleteProduct(page);
-      await expect(createProductMessage).to.equal(productsPage.successfulDeleteMessage);
+      expect(createProductMessage).to.equal(productsPage.successfulDeleteMessage);
     });
   });
 });
diff --git a/tests/UI/pages/BO/catalog/productsV2/add/combinationsTab.ts b/tests/UI/pages/BO/catalog/productsV2/add/combinationsTab.ts
index ee08f2d601fcf..0075d56fb0eac 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/combinationsTab.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/combinationsTab.ts
@@ -536,7 +536,7 @@ class CombinationsTab extends BOBasePage {
    */
   async getCombinationNameFromModal(page: Page): Promise<string> {
     const combinationFrame: Frame | null = await page.frame({url: /sell\/catalog\/products-v2\/combinations/gmi});
-    await expect(combinationFrame).to.be.not.null;
+    expect(combinationFrame).not.eq(null);
 
     return this.getTextContent(combinationFrame!, this.editCombinationNameValue);
   }

From 14f2395afeed761d763ce19489c383edf2cf20f9 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Tue, 19 Sep 2023 14:42:55 +0200
Subject: [PATCH 1025/1030] Add new test to check virtual tab

---
 .../productV2/functional/13_virtualTab.ts     | 377 ++++++++++++++++++
 tests/UI/data/faker/product.ts                |  18 +-
 tests/UI/data/types/product.d.ts              |   2 +
 .../productsV2/add/virtualProductTab.ts       |  93 ++++-
 4 files changed, 484 insertions(+), 6 deletions(-)
 create mode 100644 tests/UI/campaigns/productV2/functional/13_virtualTab.ts

diff --git a/tests/UI/campaigns/productV2/functional/13_virtualTab.ts b/tests/UI/campaigns/productV2/functional/13_virtualTab.ts
new file mode 100644
index 0000000000000..9564e54008b30
--- /dev/null
+++ b/tests/UI/campaigns/productV2/functional/13_virtualTab.ts
@@ -0,0 +1,377 @@
+// Import utils
+import helper from '@utils/helpers';
+import files from '@utils/files';
+import testContext from '@utils/testContext';
+import date from '@utils/date';
+
+// Import common tests
+import loginCommon from '@commonTests/BO/loginBO';
+
+// Import pages
+import dashboardPage from '@pages/BO/dashboard';
+import createProductsPage from '@pages/BO/catalog/productsV2/add';
+import productsPage from '@pages/BO/catalog/productsV2';
+import foProductPage from '@pages/FO/product';
+import {cartPage} from '@pages/FO/cart';
+import checkoutPage from '@pages/FO/checkout';
+import Customers from '@data/demo/customers';
+import PaymentMethods from '@data/demo/paymentMethods';
+import orderConfirmationPage from '@pages/FO/checkout/orderConfirmation';
+import {homePage} from '@pages/FO/home';
+import {myAccountPage} from '@pages/FO/myAccount';
+import foOrderHistoryPage from '@pages/FO/myAccount/orderHistory';
+import orderDetailsPage from '@pages/FO/myAccount/orderDetails';
+import virtualProductTab from '@pages/BO/catalog/productsV2/add/virtualProductTab';
+import productSettings from '@pages/BO/shopParameters/productSettings';
+
+// Import data
+import ProductData from '@data/faker/product';
+
+import type {BrowserContext, Page} from 'playwright';
+import {expect} from 'chai';
+
+const baseContext: string = 'productV2_functional_virtualTab';
+
+describe('BO - Catalog - Products : Virtual tab', async () => {
+  let browserContext: BrowserContext;
+  let page: Page;
+  const futureDate: string = date.getDateFormat('yyyy-mm-dd', 'future');
+
+  // Data to create standard product
+  const newProductData: ProductData = new ProductData({
+    type: 'virtual',
+    price: 0,
+    quantity: 100,
+    minimumQuantity: 1,
+    downloadFile: true,
+    fileName: 'virtual.jpg',
+    allowedDownload: 0,
+    expirationDate: futureDate,
+    numberOfDays: 0,
+    status: true,
+  });
+
+  // before and after functions
+  before(async function () {
+    browserContext = await helper.createBrowserContext(this.browser);
+    page = await helper.newTab(browserContext);
+
+    await files.generateImage(newProductData.fileName);
+  });
+
+  after(async () => {
+    await helper.closeBrowserContext(browserContext);
+
+    await files.deleteFile(newProductData.fileName);
+  });
+
+  // 1 - Create product
+  describe('Create product', async () => {
+    it('should login in BO', async function () {
+      await loginCommon.loginBO(this, page);
+    });
+
+    it('should go to \'Catalog > Products\' page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToProductsPage', baseContext);
+
+      await dashboardPage.goToSubMenu(
+        page,
+        dashboardPage.catalogParentLink,
+        dashboardPage.productsLink,
+      );
+
+      await productsPage.closeSfToolBar(page);
+
+      const pageTitle = await productsPage.getPageTitle(page);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
+    });
+
+    it('should click on \'New product\' button and check new product modal', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'clickOnNewProductButton', baseContext);
+
+      const isModalVisible = await productsPage.clickOnNewProductButton(page);
+      await expect(isModalVisible).to.be.true;
+    });
+
+    it('should choose \'Virtual product\' and go to new product page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'chooseVirtualProduct', baseContext);
+
+      await productsPage.selectProductType(page, newProductData.type);
+
+      await productsPage.clickOnAddNewProduct(page);
+
+      const pageTitle = await createProductsPage.getPageTitle(page);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
+    });
+
+    it('should create virtual product', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'createVirtualProduct', baseContext);
+
+      const createProductMessage: string = await createProductsPage.setProduct(page, newProductData);
+      expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+    });
+  });
+
+  // 2 - Create order and download the virtual product
+  describe('Create order and download the virtual product', async () => {
+    it('should preview product', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'previewProduct', baseContext);
+
+      // Click on preview button
+      page = await createProductsPage.previewProduct(page);
+
+      await foProductPage.changeLanguage(page, 'en');
+
+      const pageTitle: string = await foProductPage.getPageTitle(page);
+      expect(pageTitle).to.contains(newProductData.name);
+    });
+
+    it('should add product to cart', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'addProductToCart', baseContext);
+
+      // Add the product to the cart
+      await foProductPage.addProductToTheCart(page, 1);
+
+      const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
+      expect(notificationsNumber).to.equal(1);
+    });
+
+    it('should proceed to checkout and sign in', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'proceedToCheckout', baseContext);
+
+      // Proceed to checkout the shopping cart
+      await cartPage.clickOnProceedToCheckout(page);
+
+      // Personal information step - Login
+      await checkoutPage.clickOnSignIn(page);
+      await checkoutPage.customerLogin(page, Customers.johnDoe);
+    });
+
+    it('should go to payment step', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToPaymentStep', baseContext);
+
+      const isStepAddressComplete = await checkoutPage.goToDeliveryStep(page);
+      await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+    });
+
+    it('should pay the order', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'payTheOrder', baseContext);
+
+      await checkoutPage.choosePaymentAndOrder(page, PaymentMethods.wirePayment.moduleName);
+
+      const cardTitle = await orderConfirmationPage.getOrderConfirmationCardTitle(page);
+      expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
+    });
+
+    it('should go to my account page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToAccountPage', baseContext);
+
+      await homePage.goToMyAccountPage(page);
+
+      const pageTitle = await myAccountPage.getPageTitle(page);
+      expect(pageTitle).to.equal(myAccountPage.pageTitle);
+    });
+
+    it('should go to order history page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToOrderHistoryPage', baseContext);
+
+      await myAccountPage.goToHistoryAndDetailsPage(page);
+
+      const pageHeaderTitle = await foOrderHistoryPage.getPageTitle(page);
+      expect(pageHeaderTitle).to.equal(foOrderHistoryPage.pageTitle);
+    });
+
+    it('should go to order details page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goToFoToOrderDetails', baseContext);
+
+      await foOrderHistoryPage.goToDetailsPage(page);
+
+      const pageTitle = await orderDetailsPage.getPageTitle(page);
+      expect(pageTitle).to.equal(orderDetailsPage.pageTitle);
+    });
+
+    it('should download the file', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'checkDownloadFile', baseContext);
+
+      await orderDetailsPage.clickOnDownloadLink(page);
+
+      const doesFileExist = await files.doesFileExist(newProductData.fileName, 5000);
+      await expect(doesFileExist, 'File is not downloaded!').to.be.true;
+    });
+
+    it('should close the FO page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goBackToBO', baseContext);
+
+      // Go back to BO
+      page = await foProductPage.closePage(browserContext, page, 0);
+
+      const pageTitle = await createProductsPage.getPageTitle(page);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
+    });
+  });
+
+  // 3 - Check the options of out of stock
+  describe('Check the options of out of stock', async () => {
+    it('should set the product quantity to 0', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'setProductQuantity', baseContext);
+
+      await virtualProductTab.setProductQuantity(page, -100);
+
+      const createProductMessage = await createProductsPage.saveProduct(page);
+      expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+    });
+
+    [
+      {args: {option: 'Deny orders', isAddToCartButtonVisible: false}},
+      {args: {option: 'Allow orders', isAddToCartButtonVisible: true}},
+      {args: {option: 'Use default behavior', isAddToCartButtonVisible: false}},
+    ].forEach((test, index) => {
+      it(`should check the '${test.args.option}' option`, async function () {
+        await testContext.addContextItem(this, 'testIdentifier', `checkOrderOption${index}`, baseContext);
+
+        await virtualProductTab.setOptionWhenOutOfStock(page, test.args.option);
+
+        const createProductMessage = await createProductsPage.saveProduct(page);
+        expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+      });
+
+      it('should preview product', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', `previewProduct${index}`, baseContext);
+
+        // Click on preview button
+        page = await createProductsPage.previewProduct(page);
+
+        await foProductPage.changeLanguage(page, 'en');
+
+        const pageTitle = await foProductPage.getPageTitle(page);
+        expect(pageTitle).to.contains(newProductData.name);
+      });
+
+      it('should check the add to cart button', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', `checkAddToCartButton${index}`, baseContext);
+
+        const isVisible = await foProductPage.isAddToCartButtonEnabled(page);
+        expect(isVisible).to.eq(test.args.isAddToCartButtonVisible);
+      });
+
+      it('should go back to BO', async function () {
+        await testContext.addContextItem(this, 'testIdentifier', `goBackToBO${index}`, baseContext);
+
+        // Go back to BO
+        page = await foProductPage.closePage(browserContext, page, 0);
+
+        const pageTitle = await createProductsPage.getPageTitle(page);
+        await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+      });
+    });
+
+    it('should click on edit default behaviour link', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'editBehaviour', baseContext);
+
+      page = await virtualProductTab.clickOnEditDefaultBehaviourLink(page);
+
+      const pageTitle = await productSettings.getPageTitle(page);
+      expect(pageTitle).to.contains(productSettings.pageTitle);
+    });
+
+    it('should close the page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goBackToBO3', baseContext);
+
+      page = await productSettings.closePage(browserContext, page, 0);
+
+      const pageTitle = await createProductsPage.getPageTitle(page);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
+    });
+
+    it('should set label when in stock', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'setLabelWhenInStock', baseContext);
+
+      await virtualProductTab.setProductQuantity(page, 100);
+      await virtualProductTab.setLabelWhenInStock(page, 'Product available');
+
+      const createProductMessage = await createProductsPage.saveProduct(page);
+      expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+    });
+
+    it('should preview product', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'previewProduct3', baseContext);
+
+      // Click on preview button
+      page = await createProductsPage.previewProduct(page);
+
+      await foProductPage.changeLanguage(page, 'en');
+
+      const pageTitle = await foProductPage.getPageTitle(page);
+      expect(pageTitle).to.contains(newProductData.name);
+    });
+
+    it('should check the product availability label', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'checkProductAvailableLabel', baseContext);
+
+      const availabilityLabel = await foProductPage.getProductAvailabilityLabel(page);
+      await expect(availabilityLabel).to.contains('Product available');
+    });
+
+    it('should close the page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goBackToBO4', baseContext);
+
+      page = await foProductPage.closePage(browserContext, page, 0);
+
+      const pageTitle = await createProductsPage.getPageTitle(page);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
+    });
+
+    it('should check the allow orders option and set Label when out of stock', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'checkDenyOrder', baseContext);
+
+      await virtualProductTab.setProductQuantity(page, -100);
+      await virtualProductTab.setOptionWhenOutOfStock(page, 'Allow orders');
+
+      await virtualProductTab.setLabelWhenOutOfStock(page, 'Out of stock');
+
+      const createProductMessage = await createProductsPage.saveProduct(page);
+      expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+    });
+
+    it('should preview product', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'previewProduct4', baseContext);
+
+      // Click on preview button
+      page = await createProductsPage.previewProduct(page);
+
+      await foProductPage.changeLanguage(page, 'en');
+
+      const pageTitle = await foProductPage.getPageTitle(page);
+      expect(pageTitle).to.contains(newProductData.name);
+    });
+
+    it('should check the label of out of stock', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'checkLabelOutOfStock', baseContext);
+
+      const availabilityLabel = await foProductPage.getProductAvailabilityLabel(page);
+      await expect(availabilityLabel).to.contains('Out of stock');
+
+      const isVisible = await foProductPage.isAddToCartButtonEnabled(page);
+      await expect(isVisible).to.be.true;
+    });
+
+    it('should close the page', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'goBackToBO5', baseContext);
+
+      page = await foProductPage.closePage(browserContext, page, 0);
+
+      const pageTitle = await createProductsPage.getPageTitle(page);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
+    });
+  });
+
+  // 4 - Delete product
+  describe('Delete product', async () => {
+    it('should delete product', async function () {
+      await testContext.addContextItem(this, 'testIdentifier', 'deleteProduct', baseContext);
+
+      const createProductMessage: string = await createProductsPage.deleteProduct(page);
+      expect(createProductMessage).to.equal(productsPage.successfulDeleteMessage);
+    });
+  });
+});
diff --git a/tests/UI/data/faker/product.ts b/tests/UI/data/faker/product.ts
index 4e56d5bad69c4..7960a4cf716dd 100644
--- a/tests/UI/data/faker/product.ts
+++ b/tests/UI/data/faker/product.ts
@@ -21,13 +21,13 @@ export default class ProductData {
 
   public nameFR: string;
 
-  public defaultImage: string|null;
+  public defaultImage: string | null;
 
-  public coverImage: string|null;
+  public coverImage: string | null;
 
-  public thumbImage: string|null;
+  public thumbImage: string | null;
 
-  public thumbImageFR: string|null;
+  public thumbImageFR: string | null;
 
   public category: string;
 
@@ -87,6 +87,10 @@ export default class ProductData {
 
   public allowedDownload: number;
 
+  public expirationDate: string | null;
+
+  public numberOfDays: number | null;
+
   public weight: number;
 
   public combinations: ProductCombination[];
@@ -243,6 +247,12 @@ export default class ProductData {
     /** @type {number} Number of allowed downloads */
     this.allowedDownload = productToCreate.allowedDownload || faker.number.int({min: 1, max: 20});
 
+    /** @type {string} Expiration date */
+    this.expirationDate = productToCreate.expirationDate || null;
+
+    /** @type {number} Number of days limit */
+    this.numberOfDays = productToCreate.numberOfDays || null;
+
     /** @type {number} Weight of the package */
     this.weight = productToCreate.weight || faker.number.int({min: 1, max: 20});
 
diff --git a/tests/UI/data/types/product.d.ts b/tests/UI/data/types/product.d.ts
index 3090e2c8e8782..26fd26abff397 100644
--- a/tests/UI/data/types/product.d.ts
+++ b/tests/UI/data/types/product.d.ts
@@ -45,6 +45,8 @@ type ProductCreator = {
   downloadFile?: boolean
   fileName?: string
   allowedDownload?: number
+  expirationDate?: string | null
+  numberOfDays?: number | null
   weight?: number
   combinations?: ProductCombination[]
 };
diff --git a/tests/UI/pages/BO/catalog/productsV2/add/virtualProductTab.ts b/tests/UI/pages/BO/catalog/productsV2/add/virtualProductTab.ts
index 93368283cb589..bf4d5fba88c15 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/virtualProductTab.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/virtualProductTab.ts
@@ -26,6 +26,22 @@ class VirtualProductTab extends BOBasePage {
 
   private readonly productFileDownloadTimesLimit: string;
 
+  private readonly productFileExpirationDate: string;
+
+  private readonly productFileNumberOfDays: string;
+
+  private readonly denyOrderRadioButton: string;
+
+  private readonly allowOrderRadioButton: string;
+
+  private readonly useDefaultBehaviourRadioButton: string;
+
+  private readonly editDefaultBehaviourLink: string;
+
+  private readonly labelWhenInStock: string;
+
+  private readonly labelWhenOutOfStock: string;
+
   /**
    * @constructs
    * Setting up texts and selectors to use on Virtual product tab
@@ -41,12 +57,33 @@ class VirtualProductTab extends BOBasePage {
     this.productFile = '#product_stock_virtual_product_file_file';
     this.productFileNameInput = '#product_stock_virtual_product_file_name';
     this.productFileDownloadTimesLimit = '#product_stock_virtual_product_file_download_times_limit';
+    this.productFileExpirationDate = '#product_stock_virtual_product_file_expiration_date';
+    this.productFileNumberOfDays = '#product_stock_virtual_product_file_access_days_limit';
+
+    // When out of stock selectors
+    this.denyOrderRadioButton = '#product_stock_availability_out_of_stock_type_0 +i';
+    this.allowOrderRadioButton = '#product_stock_availability_out_of_stock_type_1 +i';
+    this.useDefaultBehaviourRadioButton = '#product_stock_availability_out_of_stock_type_2 +i';
+    this.editDefaultBehaviourLink = '#product_stock_availability a[href*=configuration_fieldset_stock]';
+    this.labelWhenInStock = '#product_stock_availability_available_now_label_1';
+    this.labelWhenOutOfStock = '#product_stock_availability_available_later_label_1';
   }
 
   /*
   Methods
    */
 
+  /**
+   * Set product quantity
+   * @param page {Page} Browser tab
+   * @param quantity {string} Product quantity to set in the input
+   * @returns {Promise<void>}
+   */
+  async setProductQuantity(page: Page, quantity: number): Promise<void> {
+    await this.waitForSelectorAndClick(page, this.virtualProductTabLink);
+    await this.setValue(page, this.productQuantityInput, quantity);
+  }
+
   /**
    * Set virtual product
    * @param page {Page} Browser tab
@@ -54,8 +91,7 @@ class VirtualProductTab extends BOBasePage {
    * @returns {Promise<void>}
    */
   async setVirtualProduct(page: Page, productData: ProductData): Promise<void> {
-    await this.waitForSelectorAndClick(page, this.virtualProductTabLink);
-    await this.setValue(page, this.productQuantityInput, productData.quantity);
+    await this.setProductQuantity(page, productData.quantity);
     await this.setValue(page, this.productMinimumQuantityInput, productData.minimumQuantity);
     if (productData.downloadFile) {
       await this.waitForSelectorAndClick(page, this.productChooseFile);
@@ -63,8 +99,61 @@ class VirtualProductTab extends BOBasePage {
       await this.uploadFile(page, this.productFile, productData.fileName);
       await this.setValue(page, this.productFileNameInput, productData.fileName);
       await this.setValue(page, this.productFileDownloadTimesLimit, productData.allowedDownload);
+      await this.setValue(page, this.productFileExpirationDate, productData.expirationDate!);
+      await this.setValue(page, this.productFileNumberOfDays, productData.numberOfDays!);
+    }
+  }
+
+  // Methods for when out of stock
+  /**
+   * Set option when out of stock
+   * @param page {Page} Browser tab
+   * @param option {string} Option to check
+   * @returns {Promise<void>}
+   */
+  async setOptionWhenOutOfStock(page: Page, option: string): Promise<void> {
+    switch (option) {
+      case 'Deny orders':
+        await this.setChecked(page, this.denyOrderRadioButton);
+        break;
+      case 'Allow orders':
+        await this.setChecked(page, this.allowOrderRadioButton);
+        break;
+      case 'Use default behavior':
+        await this.setChecked(page, this.useDefaultBehaviourRadioButton);
+        break;
+      default:
+        throw new Error(`Option ${option} was not found`);
     }
   }
+
+  /**
+   * Click on edit default behaviour link
+   * @param page {Page} Browser tab
+   * @returns {Promise<Page>}
+   */
+  async clickOnEditDefaultBehaviourLink(page: Page): Promise<Page> {
+    return this.openLinkWithTargetBlank(page, this.editDefaultBehaviourLink);
+  }
+
+  /**
+   * Set label when in stock
+   * @param page {Page} Browser tab
+   * @param label {string} Label to set when in stock in the input
+   * @returns {Promise<void>}
+   */
+  async setLabelWhenInStock(page: Page, label: string): Promise<void> {
+    await this.setValue(page, this.labelWhenInStock, label);
+  }
+
+  /**
+   * Set label when out of stock
+   * @param page {Page} Browser tab
+   * @param label {string} Label to set when out of stock in the input
+   */
+  async setLabelWhenOutOfStock(page: Page, label: string): Promise<void> {
+    await this.setValue(page, this.labelWhenOutOfStock, label);
+  }
 }
 
 export default new VirtualProductTab();

From 69fdde7a08b3ab472bc3c228a60c7478db23a865 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Thu, 21 Sep 2023 15:24:31 +0200
Subject: [PATCH 1026/1030] Fix review

---
 .../productV2/functional/13_virtualTab.ts     | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/tests/UI/campaigns/productV2/functional/13_virtualTab.ts b/tests/UI/campaigns/productV2/functional/13_virtualTab.ts
index 9564e54008b30..9a60cac7aa294 100644
--- a/tests/UI/campaigns/productV2/functional/13_virtualTab.ts
+++ b/tests/UI/campaigns/productV2/functional/13_virtualTab.ts
@@ -7,25 +7,27 @@ import date from '@utils/date';
 // Import common tests
 import loginCommon from '@commonTests/BO/loginBO';
 
-// Import pages
+// Import BO pages
 import dashboardPage from '@pages/BO/dashboard';
 import createProductsPage from '@pages/BO/catalog/productsV2/add';
 import productsPage from '@pages/BO/catalog/productsV2';
+import virtualProductTab from '@pages/BO/catalog/productsV2/add/virtualProductTab';
+import productSettings from '@pages/BO/shopParameters/productSettings';
+
+// Import FO pages
 import foProductPage from '@pages/FO/product';
 import {cartPage} from '@pages/FO/cart';
 import checkoutPage from '@pages/FO/checkout';
-import Customers from '@data/demo/customers';
-import PaymentMethods from '@data/demo/paymentMethods';
 import orderConfirmationPage from '@pages/FO/checkout/orderConfirmation';
 import {homePage} from '@pages/FO/home';
 import {myAccountPage} from '@pages/FO/myAccount';
 import foOrderHistoryPage from '@pages/FO/myAccount/orderHistory';
 import orderDetailsPage from '@pages/FO/myAccount/orderDetails';
-import virtualProductTab from '@pages/BO/catalog/productsV2/add/virtualProductTab';
-import productSettings from '@pages/BO/shopParameters/productSettings';
 
 // Import data
 import ProductData from '@data/faker/product';
+import Customers from '@data/demo/customers';
+import PaymentMethods from '@data/demo/paymentMethods';
 
 import type {BrowserContext, Page} from 'playwright';
 import {expect} from 'chai';
@@ -90,7 +92,7 @@ describe('BO - Catalog - Products : Virtual tab', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnNewProductButton', baseContext);
 
       const isModalVisible = await productsPage.clickOnNewProductButton(page);
-      await expect(isModalVisible).to.be.true;
+      expect(isModalVisible).eq(true);
     });
 
     it('should choose \'Virtual product\' and go to new product page', async function () {
@@ -151,7 +153,7 @@ describe('BO - Catalog - Products : Virtual tab', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'goToPaymentStep', baseContext);
 
       const isStepAddressComplete = await checkoutPage.goToDeliveryStep(page);
-      await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
     });
 
     it('should pay the order', async function () {
@@ -196,7 +198,7 @@ describe('BO - Catalog - Products : Virtual tab', async () => {
       await orderDetailsPage.clickOnDownloadLink(page);
 
       const doesFileExist = await files.doesFileExist(newProductData.fileName, 5000);
-      await expect(doesFileExist, 'File is not downloaded!').to.be.true;
+      expect(doesFileExist, 'File is not downloaded!').to.be.true;
     });
 
     it('should close the FO page', async function () {
@@ -261,7 +263,7 @@ describe('BO - Catalog - Products : Virtual tab', async () => {
         page = await foProductPage.closePage(browserContext, page, 0);
 
         const pageTitle = await createProductsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+        expect(pageTitle).to.contains(createProductsPage.pageTitle);
       });
     });
 
@@ -309,7 +311,7 @@ describe('BO - Catalog - Products : Virtual tab', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'checkProductAvailableLabel', baseContext);
 
       const availabilityLabel = await foProductPage.getProductAvailabilityLabel(page);
-      await expect(availabilityLabel).to.contains('Product available');
+      expect(availabilityLabel).to.contains('Product available');
     });
 
     it('should close the page', async function () {
@@ -352,7 +354,7 @@ describe('BO - Catalog - Products : Virtual tab', async () => {
       await expect(availabilityLabel).to.contains('Out of stock');
 
       const isVisible = await foProductPage.isAddToCartButtonEnabled(page);
-      await expect(isVisible).to.be.true;
+      expect(isVisible).eq(true);
     });
 
     it('should close the page', async function () {
@@ -366,7 +368,7 @@ describe('BO - Catalog - Products : Virtual tab', async () => {
   });
 
   // 4 - Delete product
-  describe('Delete product', async () => {
+  describe('POST-TEST: Delete product', async () => {
     it('should delete product', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteProduct', baseContext);
 

From 9af96e24b29248c71e34697c61bb2aff83d60fb7 Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Thu, 21 Sep 2023 15:36:16 +0200
Subject: [PATCH 1027/1030] Fix review

---
 .../functional/05_CRUDVirtualProduct.ts       | 120 +++++++++---------
 .../productV2/functional/13_virtualTab.ts     |  12 +-
 2 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/tests/UI/campaigns/productV2/functional/05_CRUDVirtualProduct.ts b/tests/UI/campaigns/productV2/functional/05_CRUDVirtualProduct.ts
index 6d5cf554b3205..c155a41eae7c2 100644
--- a/tests/UI/campaigns/productV2/functional/05_CRUDVirtualProduct.ts
+++ b/tests/UI/campaigns/productV2/functional/05_CRUDVirtualProduct.ts
@@ -122,15 +122,15 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
 
       await productsPage.closeSfToolBar(page);
 
-      const pageTitle: string = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      const pageTitle = await productsPage.getPageTitle(page);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should click on \'New product\' button and check new product modal', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnNewProductButton', baseContext);
 
-      const isModalVisible: boolean = await productsPage.clickOnNewProductButton(page);
-      await expect(isModalVisible).to.be.true;
+      const isModalVisible = await productsPage.clickOnNewProductButton(page);
+      expect(isModalVisible).eq(true);
     });
 
     it('should choose \'Virtual product\'', async function () {
@@ -138,24 +138,24 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
 
       await productsPage.selectProductType(page, newProductData.type);
 
-      const pageTitle: string = await createProductsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+      const pageTitle = await createProductsPage.getPageTitle(page);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
     });
 
     it('should check the virtual product description', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkVirtualProductDescription', baseContext);
 
-      const productTypeDescription: string = await productsPage.getProductDescription(page);
-      await expect(productTypeDescription).to.contains(productsPage.virtualProductDescription);
+      const productTypeDescription = await productsPage.getProductDescription(page);
+      expect(productTypeDescription).to.contains(productsPage.virtualProductDescription);
     });
 
     it('should go to new product page', async function () {
-      await testContext.addContextItem(this, 'testIdentifier', 'goToNewfoProductPage', baseContext);
+      await testContext.addContextItem(this, 'testIdentifier', 'goToNewFoProductPage', baseContext);
 
       await productsPage.clickOnAddNewProduct(page);
 
-      const pageTitle: string = await createProductsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+      const pageTitle = await createProductsPage.getPageTitle(page);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
     });
 
     it('should create virtual product', async function () {
@@ -163,8 +163,8 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
 
       await createProductsPage.closeSfToolBar(page);
 
-      const createProductMessage: string = await createProductsPage.setProduct(page, newProductData);
-      await expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+      const createProductMessage = await createProductsPage.setProduct(page, newProductData);
+      expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
     });
   });
 
@@ -173,7 +173,7 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
     it('should check the product header details', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkProductHeaderDetails', baseContext);
 
-      const taxValue: number = await basicHelper.percentage(newProductData.price, newProductData.tax);
+      const taxValue = await basicHelper.percentage(newProductData.price, newProductData.tax);
 
       const productHeaderSummary = await createProductsPage.getProductHeaderSummary(page);
       await Promise.all([
@@ -188,8 +188,8 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
     it('should check that the save button is changed to \'Save and publish\'', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkSaveButton', baseContext);
 
-      const saveButtonName: string = await createProductsPage.getSaveButtonName(page);
-      await expect(saveButtonName).to.equal(createProductsPage.saveAndPublishButtonName);
+      const saveButtonName = await createProductsPage.getSaveButtonName(page);
+      expect(saveButtonName).to.equal(createProductsPage.saveAndPublishButtonName);
     });
 
     it('should preview product', async function () {
@@ -200,21 +200,21 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
 
       await foProductPage.changeLanguage(page, 'en');
 
-      const pageTitle: string = await foProductPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(newProductData.name);
+      const pageTitle = await foProductPage.getPageTitle(page);
+      expect(pageTitle).to.contains(newProductData.name);
     });
 
     it('should check all product information', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkProductInformation', baseContext);
 
-      const taxValue: number = await basicHelper.percentage(newProductData.price, newProductData.tax);
+      const taxValue = await basicHelper.percentage(newProductData.price, newProductData.tax);
 
       const result = await foProductPage.getProductInformation(page);
       await Promise.all([
-        await expect(result.name).to.equal(newProductData.name),
-        await expect(result.price.toFixed(2)).to.equal((newProductData.price + taxValue).toFixed(2)),
-        await expect(result.summary).to.equal(newProductData.summary),
-        await expect(result.description).to.equal(newProductData.description),
+        expect(result.name).to.equal(newProductData.name),
+        expect(result.price.toFixed(2)).to.equal((newProductData.price + taxValue).toFixed(2)),
+        expect(result.summary).to.equal(newProductData.summary),
+        expect(result.description).to.equal(newProductData.description),
       ]);
     });
 
@@ -225,8 +225,8 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
         // Add the product to the cart
         await foProductPage.addProductToTheCart(page, 1);
 
-        const notificationsNumber: number = await cartPage.getCartNotificationsNumber(page);
-        await expect(notificationsNumber).to.be.equal(1);
+        const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
+        expect(notificationsNumber).to.be.equal(1);
       });
 
       it('should proceed to checkout and sign in', async function () {
@@ -245,7 +245,7 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
 
         // Address step - Go to delivery step
         const isStepAddressComplete = await checkoutPage.goToDeliveryStep(page);
-        await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+        expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
       });
 
       it('should pay the order', async function () {
@@ -255,8 +255,8 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
         await checkoutPage.choosePaymentAndOrder(page, PaymentMethods.wirePayment.moduleName);
 
         // Check the confirmation message
-        const cardTitle: string = await orderConfirmationPage.getOrderConfirmationCardTitle(page);
-        await expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
+        const cardTitle = await orderConfirmationPage.getOrderConfirmationCardTitle(page);
+        expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
       });
 
       it('should go back to BO', async function () {
@@ -266,7 +266,7 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
         page = await foProductPage.closePage(browserContext, page, 0);
 
         const pageTitle = await createProductsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+        expect(pageTitle).to.contains(createProductsPage.pageTitle);
       });
 
       it('should go to \'Orders > Orders\' page', async function () {
@@ -278,15 +278,15 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
           dashboardPage.ordersLink,
         );
 
-        const pageTitle: string = await ordersPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(ordersPage.pageTitle);
+        const pageTitle = await ordersPage.getPageTitle(page);
+        expect(pageTitle).to.contains(ordersPage.pageTitle);
       });
 
       it('should update order status', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'updateOrderStatus', baseContext);
 
-        const textResult: string = await ordersPage.setOrderStatus(page, 1, OrderStatuses.paymentAccepted);
-        await expect(textResult).to.equal(ordersPage.successfulUpdateMessage);
+        const textResult = await ordersPage.setOrderStatus(page, 1, OrderStatuses.paymentAccepted);
+        expect(textResult).to.equal(ordersPage.successfulUpdateMessage);
       });
 
       it('should view my shop', async function () {
@@ -295,8 +295,8 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
         // Click on view my shop
         page = await ordersPage.viewMyShop(page);
 
-        const isHomePage: boolean = await homePage.isHomePage(page);
-        await expect(isHomePage, 'Home page is not displayed').to.be.true;
+        const isHomePage = await homePage.isHomePage(page);
+        expect(isHomePage, 'Home page is not displayed').to.be.true;
       });
 
       it('should go to my account page', async function () {
@@ -305,7 +305,7 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
         await homePage.goToMyAccountPage(page);
 
         const pageTitle = await myAccountPage.getPageTitle(page);
-        await expect(pageTitle).to.equal(myAccountPage.pageTitle);
+        expect(pageTitle).to.equal(myAccountPage.pageTitle);
       });
 
       it('should go to order history page', async function () {
@@ -314,7 +314,7 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
         await myAccountPage.goToHistoryAndDetailsPage(page);
 
         const pageHeaderTitle = await orderHistoryPage.getPageTitle(page);
-        await expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
+        expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
       });
 
       it('should go to order details page', async function () {
@@ -322,8 +322,8 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
 
         await orderHistoryPage.goToDetailsPage(page);
 
-        const pageTitle: string = await orderDetailsPage.getPageTitle(page);
-        await expect(pageTitle).to.equal(orderDetailsPage.pageTitle);
+        const pageTitle = await orderDetailsPage.getPageTitle(page);
+        expect(pageTitle).to.equal(orderDetailsPage.pageTitle);
       });
 
       it('should download the file', async function () {
@@ -331,8 +331,8 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
 
         await orderDetailsPage.clickOnDownloadLink(page);
 
-        const doesFileExist: boolean = await files.doesFileExist(newProductData.fileName, 5000);
-        await expect(doesFileExist, 'File is not downloaded!').to.be.true;
+        const doesFileExist = await files.doesFileExist(newProductData.fileName, 5000);
+        expect(doesFileExist, 'File is not downloaded!').eq(true);
       });
 
       it('should check if the mail is in mailbox', async function () {
@@ -359,8 +359,8 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
       // Go back to BO
       page = await foProductPage.closePage(browserContext, page, 0);
 
-      const pageTitle: string = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      const pageTitle = await ordersPage.getPageTitle(page);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should go to \'Catalog > Products\' page', async function () {
@@ -374,8 +374,8 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
 
       await productsPage.closeSfToolBar(page);
 
-      const pageTitle: string = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      const pageTitle = await productsPage.getPageTitle(page);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should go to the first product page', async function () {
@@ -383,21 +383,21 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
 
       await productsPage.goToProductPage(page);
 
-      const pageTitle: string = await createProductsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+      const pageTitle = await createProductsPage.getPageTitle(page);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
     });
 
     it('should edit the created product', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'editCreatedProduct', baseContext);
 
-      const createProductMessage: string = await createProductsPage.setProduct(page, editProductData);
-      await expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+      const createProductMessage = await createProductsPage.setProduct(page, editProductData);
+      expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
     });
 
     it('should check the product header details', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkEditedProductHeaderDetails', baseContext);
 
-      const taxValue: number = await basicHelper.percentage(editProductData.price, editProductData.tax);
+      const taxValue = await basicHelper.percentage(editProductData.price, editProductData.tax);
 
       const productHeaderSummary = await createProductsPage.getProductHeaderSummary(page);
       await Promise.all([
@@ -420,20 +420,20 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
 
       await foProductPage.changeLanguage(page, 'en');
 
-      const pageTitle: string = await foProductPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(editProductData.name);
+      const pageTitle = await foProductPage.getPageTitle(page);
+      expect(pageTitle).to.contains(editProductData.name);
     });
 
     it('should check all product information', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkEditedProductInformation', baseContext);
 
-      const taxValue: number = await basicHelper.percentage(editProductData.price, editProductData.tax);
+      const taxValue = await basicHelper.percentage(editProductData.price, editProductData.tax);
 
       const result = await foProductPage.getProductInformation(page);
       await Promise.all([
-        await expect(result.name).to.equal(editProductData.name),
-        await expect(result.price.toFixed(2)).to.equal((editProductData.price + taxValue).toFixed(2)),
-        await expect(result.description).to.equal(editProductData.description),
+        expect(result.name).to.equal(editProductData.name),
+        expect(result.price.toFixed(2)).to.equal((editProductData.price + taxValue).toFixed(2)),
+        expect(result.description).to.equal(editProductData.description),
       ]);
     });
 
@@ -443,8 +443,8 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
       // Go back to BO
       page = await foProductPage.closePage(browserContext, page, 0);
 
-      const pageTitle: string = await createProductsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+      const pageTitle = await createProductsPage.getPageTitle(page);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
     });
   });
 
@@ -453,8 +453,8 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
     it('should delete product', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteProduct', baseContext);
 
-      const createProductMessage: string = await createProductsPage.deleteProduct(page);
-      await expect(createProductMessage).to.equal(productsPage.successfulDeleteMessage);
+      const createProductMessage = await createProductsPage.deleteProduct(page);
+      expect(createProductMessage).to.equal(productsPage.successfulDeleteMessage);
     });
   });
 
diff --git a/tests/UI/campaigns/productV2/functional/13_virtualTab.ts b/tests/UI/campaigns/productV2/functional/13_virtualTab.ts
index 9a60cac7aa294..089e8263fe9ac 100644
--- a/tests/UI/campaigns/productV2/functional/13_virtualTab.ts
+++ b/tests/UI/campaigns/productV2/functional/13_virtualTab.ts
@@ -21,7 +21,7 @@ import checkoutPage from '@pages/FO/checkout';
 import orderConfirmationPage from '@pages/FO/checkout/orderConfirmation';
 import {homePage} from '@pages/FO/home';
 import {myAccountPage} from '@pages/FO/myAccount';
-import foOrderHistoryPage from '@pages/FO/myAccount/orderHistory';
+import {orderHistoryPage} from '@pages/FO/myAccount/orderHistory';
 import orderDetailsPage from '@pages/FO/myAccount/orderDetails';
 
 // Import data
@@ -153,7 +153,7 @@ describe('BO - Catalog - Products : Virtual tab', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'goToPaymentStep', baseContext);
 
       const isStepAddressComplete = await checkoutPage.goToDeliveryStep(page);
-      expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepAddressComplete, 'Step Address is not complete').eq(true);
     });
 
     it('should pay the order', async function () {
@@ -179,14 +179,14 @@ describe('BO - Catalog - Products : Virtual tab', async () => {
 
       await myAccountPage.goToHistoryAndDetailsPage(page);
 
-      const pageHeaderTitle = await foOrderHistoryPage.getPageTitle(page);
-      expect(pageHeaderTitle).to.equal(foOrderHistoryPage.pageTitle);
+      const pageHeaderTitle = await orderHistoryPage.getPageTitle(page);
+      expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
     });
 
     it('should go to order details page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'goToFoToOrderDetails', baseContext);
 
-      await foOrderHistoryPage.goToDetailsPage(page);
+      await orderHistoryPage.goToDetailsPage(page);
 
       const pageTitle = await orderDetailsPage.getPageTitle(page);
       expect(pageTitle).to.equal(orderDetailsPage.pageTitle);
@@ -198,7 +198,7 @@ describe('BO - Catalog - Products : Virtual tab', async () => {
       await orderDetailsPage.clickOnDownloadLink(page);
 
       const doesFileExist = await files.doesFileExist(newProductData.fileName, 5000);
-      expect(doesFileExist, 'File is not downloaded!').to.be.true;
+      expect(doesFileExist, 'File is not downloaded!').eq(true);
     });
 
     it('should close the FO page', async function () {

From 00994f6878e7fdd04c28458a7bdbf3d370223e5c Mon Sep 17 00:00:00 2001
From: nesrineabdmouleh <nesrine.abdmouleh.info@gmail.com>
Date: Thu, 21 Sep 2023 15:53:21 +0200
Subject: [PATCH 1028/1030] Fix eslint errors

---
 .../campaigns/productV2/functional/05_CRUDVirtualProduct.ts   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/UI/campaigns/productV2/functional/05_CRUDVirtualProduct.ts b/tests/UI/campaigns/productV2/functional/05_CRUDVirtualProduct.ts
index c155a41eae7c2..24919ebfcc6ec 100644
--- a/tests/UI/campaigns/productV2/functional/05_CRUDVirtualProduct.ts
+++ b/tests/UI/campaigns/productV2/functional/05_CRUDVirtualProduct.ts
@@ -245,7 +245,7 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
 
         // Address step - Go to delivery step
         const isStepAddressComplete = await checkoutPage.goToDeliveryStep(page);
-        expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+        expect(isStepAddressComplete, 'Step Address is not complete').eq(true);
       });
 
       it('should pay the order', async function () {
@@ -296,7 +296,7 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
         page = await ordersPage.viewMyShop(page);
 
         const isHomePage = await homePage.isHomePage(page);
-        expect(isHomePage, 'Home page is not displayed').to.be.true;
+        expect(isHomePage, 'Home page is not displayed').eq(true);
       });
 
       it('should go to my account page', async function () {

From 502f3023a70768787b923ef6e283338e3ff67027 Mon Sep 17 00:00:00 2001
From: boubkerbribri <boubker.bribri@prestashop.com>
Date: Wed, 16 Aug 2023 15:21:49 +0200
Subject: [PATCH 1029/1030] test: remove await form expect

---
 tests/UI/campaigns/cldr/03_deleteCurrency.ts  |  44 +--
 .../cldr/04_searchCurrencyByISOCode.ts        |  40 +--
 .../cldr/05_searchCurrencyByEnableDisable.ts  |  36 +--
 .../cldr/07_editSymbolFormatCurrency.ts       |  44 +--
 .../cldr/08_resetSymbolFormatSettings.ts      |  34 +--
 .../cldr/09_enableDisableCurrency.ts          |  70 ++---
 .../campaigns/functional/API/01_basicTest.ts  |   4 +-
 .../01_authorizationEndpoint.ts               |  28 +-
 .../02_resourceEndpoint.ts                    |  38 +--
 .../01_authorizationEndpoint.ts               |  50 ++--
 .../02_resourceEndpoint.ts                    |  50 ++--
 .../BO/00_login/01_passwordReminder.ts        |  22 +-
 .../functional/BO/00_login/02_login.ts        |  10 +-
 .../functional/BO/00_login/03_logout.ts       |   2 +-
 .../01_dashboard/01_enableDisableDemoMode.ts  |   4 +-
 .../BO/02_orders/01_orders/01_helpCard.ts     |   8 +-
 .../BO/02_orders/01_orders/02_filterOrders.ts |  16 +-
 .../BO/02_orders/01_orders/03_exportOrders.ts |   6 +-
 .../BO/02_orders/01_orders/04_updateStatus.ts |  60 ++--
 .../01_orders/05_bulkUpdateOrdersStatus.ts    |   6 +-
 .../01_orders/06_bulkOpenInNewTab.ts          |  20 +-
 .../BO/02_orders/01_orders/07_sortOrders.ts   |  10 +-
 .../BO/02_orders/01_orders/08_viewCustomer.ts |  12 +-
 .../BO/02_orders/01_orders/09_viewGuest.ts    |   8 +-
 .../BO/02_orders/01_orders/10_pagination.ts   |  24 +-
 .../BO/02_orders/01_orders/11_previewOrder.ts |  72 ++---
 .../createOrders/01_searchViewCustomer.ts     |  32 +--
 .../createOrders/02_createCustomer.ts         |   8 +-
 .../createOrders/03_createSimpleOrderInBO.ts  |  16 +-
 .../createOrders/04_selectPreviousCarts.ts    | 104 +++----
 .../createOrders/05_selectPreviousOrders.ts   |  50 ++--
 .../createOrders/06_addProductToTheCart.ts    |  42 +--
 .../createOrders/07_searchAddRemoveVoucher.ts |  56 ++--
 .../createOrders/08_chooseAddress.ts          |  80 +++---
 .../createOrders/09_chooseShipping.ts         |  28 +-
 .../01_orders/createOrders/10_checkSummary.ts |  36 +--
 .../viewAndEditOrder/01_customerBlock.ts      |  84 +++---
 .../viewAndEditOrder/02_productBlock.ts       |  72 ++---
 .../viewAndEditOrder/03_statusTab.ts          |  90 +++---
 .../viewAndEditOrder/04_documentsTab.ts       |  78 ++---
 .../viewAndEditOrder/05_carriersTab.ts        |  16 +-
 .../06_merchandiseReturnsTab.ts               |  72 ++---
 .../viewAndEditOrder/07_messagesBlock.ts      |  62 ++--
 .../viewAndEditOrder/08_paymentBlock.ts       |  60 ++--
 .../viewAndEditOrder/09_addDiscount.ts        |  86 +++---
 .../viewAndEditOrder/10_changeStatus.ts       |  52 ++--
 .../viewAndEditOrder/11_checkInvoice.ts       | 272 +++++++++---------
 .../viewAndEditOrder/12_checkMultiInvoice.ts  |  86 +++---
 .../02_invoices/01_generateInvoiceByDate.ts   |  14 +-
 .../02_invoices/02_generateInvoiceByStatus.ts |  20 +-
 .../01_enableDisableInvoices.ts               |  14 +-
 .../02_enableDisableTaxBreakdown.ts           |  76 ++---
 .../03_enableDisableProductImage.ts           |  34 +--
 .../03_invoiceOptions/04_invoicePrefix.ts     |  18 +-
 .../05_enableDisableCurrentYear.ts            |  28 +-
 .../03_invoiceOptions/06_otherOptions.ts      |  22 +-
 .../01_createFilterCreditSlips.ts             |  30 +-
 .../02_sortAndPaginationCreditSlips.ts        |  20 +-
 .../03_generateCreditSlipsByDate.ts           |  16 +-
 .../03_creditSlips/04_creditSlipOptions.ts    |  22 +-
 .../01_generateDeliverySlipByDate.ts          |  14 +-
 .../01_deliverySlipPrefix.ts                  |  14 +-
 .../02_deliverySlipNumber.ts                  |  10 +-
 .../03_enableDisableProductImage.ts           |  32 +--
 .../01_filterShoppingCarts.ts                 |  28 +-
 .../05_shoppingCarts/02_sortAndPagination.ts  |  14 +-
 .../05_shoppingCarts/03_viewCarts.ts          |  54 ++--
 .../05_shoppingCarts/04_exportCarts.ts        |   6 +-
 .../05_deleteAbandonedCarts.ts                |  12 +-
 .../01_filterAndQuickEditProducts.ts          |  26 +-
 .../02_paginationAndSortProducts.ts           |  24 +-
 .../BO/03_catalog/01_products/03_helpCard.ts  |   8 +-
 .../01_products/04_previewProductFromList.ts  |  12 +-
 .../05_duplicateProductFromList.ts            |  14 +-
 .../03_catalog/01_products/06_bulkActions.ts  |  30 +-
 .../01_filterAndQuickEditCategories.ts        |  20 +-
 .../02_categories/02_CRUDCategoryInBO.ts      |  84 +++---
 .../02_categories/03_categoriesBulkAction.ts  |  22 +-
 .../04_changeCategoryPosition.ts              |  18 +-
 .../05_paginationAndSortCategories.ts         |  12 +-
 .../03_catalog/02_categories/06_helpCard.ts   |   8 +-
 .../02_categories/07_exportCategories.ts      |   6 +-
 .../02_categories/08_editHomeCategory.ts      |  24 +-
 .../03_monitoring/01_deleteEmptyCategory.ts   |  26 +-
 .../03_monitoring/02_monitoringProducts.ts    |  22 +-
 .../03_catalog/03_monitoring/03_helpCard.ts   |   8 +-
 .../01_emptyCategories.ts                     |  12 +-
 .../02_withCombinationsWithoutQuantities.ts   |  12 +-
 ...03_withoutCombinationsWithoutQuantities.ts |  12 +-
 .../04_disabledProducts.ts                    |  12 +-
 .../05_productsWithoutImage.ts                |  12 +-
 .../06_productsWithoutDescription.ts          |  12 +-
 .../07_productsWithoutPrice.ts                |  12 +-
 .../01_CRUDAttributesAndValues.ts             |  50 ++--
 .../01_attributes/02_changePosition.ts        |  28 +-
 .../attributes/01_filterAttributes.ts         |  12 +-
 .../02_sortPaginationAndBulkDelete.ts         |  24 +-
 .../01_attributes/attributes/04_helpCard.ts   |   8 +-
 .../01_attributes/values/01_filterValues.ts   |  16 +-
 .../values/02_sortPaginationAndBulkDelete.ts  |  32 +--
 .../02_features/01_CRUDFeaturesAndValues.ts   |  44 +--
 .../02_features/features/01_filterFeatures.ts |  12 +-
 .../02_sortPaginationAndBulkDelete.ts         |  14 +-
 .../02_features/features/03_changePosition.ts |  26 +-
 .../02_features/features/04_helpCard.ts       |  10 +-
 .../values/01_filterFeatureValues.ts          |  16 +-
 .../values/02_sortPaginationAndBulkDelete.ts  |  32 +--
 .../brands/01_CRUDBrandAndAddress.ts          |  86 +++---
 .../brands/02_helpCard.ts                     |   8 +-
 .../brands/addresses/01_filterAddresses.ts    |  10 +-
 .../02_sortPaginationAndBulkActions.ts        |  24 +-
 .../brands/01_filterAndQuickEditBrands.ts     |  22 +-
 .../brands/02_sortPaginationAndBulkActions.ts |  28 +-
 .../brands/brands/03_exportBrands.ts          |   8 +-
 .../suppliers/01_CRUDSupplier.ts              |  28 +-
 .../suppliers/02_filterAndQuickEdit.ts        |  24 +-
 .../suppliers/03_helpCard.ts                  |  10 +-
 .../04_paginationSortAndBulkActions.ts        |  30 +-
 .../BO/03_catalog/06_files/01_CRUDFile.ts     |  16 +-
 .../03_filterSortPaginationAndBulkActions.ts  |  28 +-
 .../BO/03_catalog/06_files/04_helpCard.ts     |   8 +-
 .../01_information/01_withAndWithoutCode.ts   |  70 ++---
 .../02_enableDisablePartialUse.ts             |  82 +++---
 .../01_information/03_priority.ts             |  34 +--
 .../01_information/04_disableStatus.ts        |  22 +-
 .../02_conditions/01_limitToSingleCustomer.ts |  24 +-
 .../02_conditions/02_invalidDateTime.ts       |  14 +-
 .../02_conditions/03_minimumAmount.ts         |  18 +-
 .../02_conditions/04_checkTotalAvailable.ts   |  28 +-
 .../05_checkTotalAvailableForEachUser.ts      |  34 +--
 .../02_conditions/06_countrySelection.ts      |  44 +--
 .../02_conditions/07_carrierSelection.ts      |  30 +-
 .../08_customerGroupSelection.ts              |  34 +--
 .../02_conditions/10_productSelection.ts      |  34 +--
 .../03_actions/07_applyToSpecificProduct.ts   |  34 +--
 ..._filterQuickEditAndBulkActionsCartRules.ts |  34 +--
 .../03_sortAndPaginationCartRule.ts           |  28 +-
 .../01_CRUDCatalogPriceRule.ts                |  42 +--
 .../02_filterSortAndPagination.ts             |  34 +--
 .../08_stocks/01_simpleFilterStocks.ts        |  10 +-
 .../03_catalog/08_stocks/02_updateQuantity.ts |  30 +-
 .../08_stocks/03_bulkEditQuantity.ts          |  20 +-
 .../08_stocks/04_filterStocksByStatus.ts      |  16 +-
 .../BO/03_catalog/08_stocks/06_helpCard.ts    |   8 +-
 .../movements/02_sortAndPagination.ts         |  26 +-
 .../01_customers/02_CRUDCustomer.ts           |  74 ++---
 .../01_customers/03_customersBulkActions.ts   |  24 +-
 .../04_paginationAndSortCustomers.ts          |  16 +-
 .../01_customers/05_setRequiredFields.ts      |  12 +-
 .../01_customers/06_exportCustomers.ts        |   8 +-
 .../04_customers/01_customers/07_helpCard.ts  |   8 +-
 .../01_customers/08_viewCustomer.ts           | 118 ++++----
 .../01_customers/09_subscribeToNewsletter.ts  |  20 +-
 .../02_addresses/01_filterAddresses.ts        |  10 +-
 .../02_addresses/02_CRUDAddressInBO.ts        |  30 +-
 .../02_addresses/03_addressesBulkActions.ts   |  16 +-
 .../04_paginationAndSortAddresses.ts          |  12 +-
 .../04_customers/02_addresses/05_helpCard.ts  |   8 +-
 .../02_addresses/06_setRequiredFields.ts      |  18 +-
 .../03_outstanding/01_helpCard.ts             |   8 +-
 .../03_outstanding/02_viewOrder.ts            |  14 +-
 .../03_outstanding/03_viewInvoice.ts          |  16 +-
 .../03_outstanding/04_pagination.ts           |  10 +-
 .../05_sortFilterOutstanding.ts               |  40 +--
 .../01_customerService/01_viewMessage.ts      |  18 +-
 .../01_customerService/02_changeStatus.ts     |  32 +--
 .../01_customerService/03_respondToMessage.ts |  18 +-
 .../01_customerService/04_contactOptions.ts   |  28 +-
 .../02_orderMessages/01_CRUDOrderMessage.ts   |  28 +-
 .../02_filterAndBulkDeleteOrderMessages.ts    |  22 +-
 .../03_paginationAndSortOrderMessages.ts      |  24 +-
 .../01_merchandiseReturnOptions.ts            |  50 ++--
 .../03_merchandiseReturns/02_deleteProduct.ts |  52 ++--
 .../03_merchandiseReturns/03_updateStatus.ts  |  66 ++---
 .../01_modules/01_filterModulesByStatus.ts    |  10 +-
 .../02_filterModulesByCategories.ts           |   4 +-
 .../01_modules/03_searchModule.ts             |   4 +-
 .../01_modules/04_enableDisableModule.ts      |  10 +-
 .../01_modules/05_resetModule.ts              |   8 +-
 .../01_modules/06_installUninstallModule.ts   |  10 +-
 .../01_modules/07_bulkActions.ts              |   8 +-
 .../01_modules/08_uploadModule.ts             |  12 +-
 .../01_modules/09_configureModule.ts          |   6 +-
 .../02_alerts/02_resetModule.ts               |   6 +-
 .../02_alerts/03_installUninstallModule.ts    |   8 +-
 .../02_alerts/05_configureModule.ts           |   6 +-
 .../01_themeAndLogo/01_addNewTheme.ts         |  34 +--
 .../01_enableDisableModule.ts                 |   6 +-
 .../02_pagesConfiguration/02_resetModule.ts   |   6 +-
 .../03_installUninstallModule.ts              |   8 +-
 .../01_advancedCustomization.ts               |  36 +--
 .../03_emailTheme/01_previewEmailThemes.ts    |   8 +-
 .../02_selectDefaultEmailTheme.ts             |   4 +-
 .../03_emailTheme/03_viewRawHtmlAndText.ts    |  12 +-
 .../08_design/04_pages/01_CRUDPageCategory.ts |  94 +++---
 .../BO/08_design/04_pages/02_helpCard.ts      |   8 +-
 .../01_filterAndQuickEditCategories.ts        |  30 +-
 .../categories/02_categoriesBulkActions.ts    |  22 +-
 .../03_paginationAndSortCategories.ts         |  26 +-
 .../pages/01_filterAndQuickEditPages.ts       |  24 +-
 .../04_pages/pages/02_pagesBulkActions.ts     |  22 +-
 .../08_design/04_pages/pages/03_pagination.ts |  16 +-
 .../08_design/04_pages/pages/04_sortPages.ts  |  10 +-
 .../08_design/05_positions/01_filterModule.ts |  10 +-
 .../08_design/05_positions/02_searchHook.ts   |   4 +-
 .../06_imageSettings/01_filterImageTypes.ts   |  12 +-
 .../06_imageSettings/02_CRUDImageType.ts      |  24 +-
 .../03_bulkDeleteImageTypes.ts                |  18 +-
 .../06_imageSettings/05_sortAndPagination.ts  |  24 +-
 .../06_imageSettings/06_deleteActions.ts      |  24 +-
 .../09_imageGenerationOptions.ts              |   8 +-
 .../10_regenerateThumbnails.ts                |  22 +-
 .../11_imageGenerationOnCreation.ts           |  48 ++--
 .../13_checkProductImageFormat.ts             |  50 ++--
 .../14_checkCategoryImageFormat.ts            |  46 +--
 .../15_checkStoreImageFormat.ts               |  54 ++--
 .../16_checkBaseImageFormat.ts                |  36 +--
 .../01_createAndCheckFooterLinkWidget.ts      |  20 +-
 .../09_shipping/01_carriers/01_CRUDCarrier.ts |  56 ++--
 .../01_carriers/02_filterSortAndPagination.ts |  32 +--
 .../01_carriers/03_quickEditAndBulkActions.ts |  28 +-
 .../01_carriers/04_changePosition.ts          |  14 +-
 .../01_handling/01_handlingCharges.ts         |  64 ++---
 .../02_carrierOptions/01_defaultCarrier.ts    |  12 +-
 .../02_updateCarriersSortOption.ts            |  40 +--
 .../02_preferences/01_currencyRestrictions.ts |  14 +-
 .../02_preferences/02_groupRestrictions.ts    |  40 +--
 .../02_preferences/03_countryRestrictions.ts  |  18 +-
 .../02_preferences/04_carrierRestrictions.ts  |  22 +-
 .../01_importLocalizationPack.ts              |  30 +-
 .../01_localization/02_defaultLanguage.ts     |   6 +-
 .../01_localization/03_helpButton.ts          |   8 +-
 .../01_localization/04_defaultCurrency.ts     |  30 +-
 .../01_localization/05_defaultCountry.ts      |  10 +-
 .../01_filterAndQuickEditLanguages.ts         |  34 +--
 .../02_languages/02_CRUDLanguage.ts           |  42 +--
 .../02_languages/03_bulkActionsLanguages.ts   |  24 +-
 .../02_languages/04_sortAndPagination.ts      |  28 +-
 .../02_languages/05_helpButton.ts             |  10 +-
 .../01_createOfficialCurrency.ts              |  46 +--
 .../02_createUnofficialCurrency.ts            |  46 +--
 .../03_currencies/03_helpButton.ts            |  10 +-
 .../03_currencies/04_updateExchangeRate.ts    |  34 +--
 .../05_filterSortAndPagination.ts             |  34 +--
 .../01_zones/01_filterAndQuickEditZones.ts    |  20 +-
 .../02_locations/01_zones/02_CRUDZone.ts      |  28 +-
 .../01_zones/03_bulkActionsZones.ts           |  20 +-
 .../01_zones/04_sortAndPagination.ts          |  24 +-
 .../01_filterAndQuickEditCountries.ts         |  22 +-
 .../02_countries/02_CRUDCountry.ts            |  58 ++--
 .../02_countries/03_bulkActionsCountries.ts   |  22 +-
 .../02_countries/04_sortAndPagination.ts      |  12 +-
 .../02_countries/05_countriesRestrictions.ts  |  36 +--
 .../03_states/01_filterAndQuickEditStates.ts  |  22 +-
 .../02_locations/03_states/02_CRUDState.ts    |  30 +-
 .../03_states/03_bulkActionsStates.ts         |  22 +-
 .../03_states/04_sortAndPagination.ts         |  14 +-
 .../01_taxes/01_filterAndQuickEditTaxes.ts    |  22 +-
 .../03_taxes/01_taxes/02_CRUDTaxesInBO.ts     |  28 +-
 .../01_taxes/03_taxesBulkActionsInBO.ts       |  26 +-
 .../03_taxes/01_taxes/04_taxOptionsForm.ts    |   4 +-
 .../03_taxes/01_taxes/05_sortAndPagination.ts |  18 +-
 .../03_taxes/02_taxRules/01_CRUDTaxRules.ts   |  28 +-
 .../02_taxRules/02_filterSortAndPagination.ts |  34 +--
 .../02_taxRules/03_quickEditAndBulkActions.ts |  36 +--
 .../04_translations/01_modifyTranslation.ts   |  18 +-
 .../04_translations/02_addUpdateLanguage.ts   |  20 +-
 .../04_translations/03_exportLanguage.ts      |   4 +-
 .../general/08_enableDisableSuppliers.ts      |  18 +-
 .../general/09_enableDisableBrands.ts         |  16 +-
 .../general/11_enableDisableMultistore.ts     |   6 +-
 .../maintenance/01_enableDisableShop.ts       |  36 +--
 .../general/01_enableFinalSummary.ts          |  14 +-
 .../general/02_enableGuestCheckout.ts         |  12 +-
 .../general/03_disableReorderingOption.ts     |  12 +-
 .../04_minimumPurchaseTotalRequired.ts        |  14 +-
 .../general/06_termsOfService.ts              |  14 +-
 .../giftOptions/01_giftOptions.ts             |  68 ++---
 .../01_CRUDOrderReturnStatus.ts               |  26 +-
 .../02_filterSortAndPagination.ts             |  32 +--
 .../statuses/01_CRUDOrderStatus.ts            |  36 +--
 .../statuses/02_filterSortAndPagination.ts    |  34 +--
 .../02_statuses/statuses/03_quickEdit.ts      |  16 +-
 .../01_productsGeneral/01_catalogMode.ts      |  26 +-
 .../01_productsGeneral/02_newDaysNumber.ts    |   8 +-
 .../03_maxSizeShortDescription.ts             |  14 +-
 .../04_quantityDiscountsBasedOn.ts            |  28 +-
 .../05_forceUpdateFriendlyURL.ts              |  18 +-
 .../06_defaultActivationStatus.ts             |   8 +-
 .../01_displayAvailableQuantities.ts          |  10 +-
 .../03_separatorOfAttributeAnchor.ts          |  12 +-
 .../04_displayDiscountedPrice.ts              |  26 +-
 .../01_enableStockManagement.ts               |   8 +-
 .../02_defaultPackStockManagement.ts          |  38 +--
 .../03_displayUnavailableProductAttributes.ts |  20 +-
 .../04_displayRemainingQuantities.ts          |  16 +-
 .../05_allowOrderingOutOfStock.ts             |  22 +-
 .../06_labelOfInStockProducts.ts              |  10 +-
 .../03_productsStock/07_labelOutOfStock.ts    |  26 +-
 .../08_enableDeliveryTimeOfInStockProducts.ts |  12 +-
 ..._enableDeliveryTimeOfOutOfStockProducts.ts |  22 +-
 .../01_updateNumberOfProductsPerPage.ts       |  12 +-
 .../02_updateDefaultProductsOrder.ts          |  12 +-
 .../01_customers/01_redisplayCartAtLogin.ts   |  16 +-
 .../02_sendEmailAfterRegistration.ts          |  22 +-
 .../01_customers/04_enableB2BMode.ts          |   8 +-
 .../01_customers/05_askForBirthDate.ts        |   8 +-
 .../01_customers/06_enablePartnerOffers.ts    |   8 +-
 .../02_groups/01_filterGroups.ts              |  14 +-
 .../02_groups/02_CRUDGroups.ts                |  26 +-
 .../02_groups/03_bulkDeleteGroups.ts          |  20 +-
 .../03_titles/01_filterTitles.ts              |  12 +-
 .../03_titles/02_CRUDTitles.ts                |  26 +-
 .../03_titles/03_bulkDeleteTitles.ts          |  20 +-
 .../01_contacts/01_filterContacts.ts          |  10 +-
 .../05_contact/01_contacts/02_CRUDContact.ts  |  24 +-
 .../01_contacts/03_contactBulkActions.ts      |  18 +-
 .../01_contacts/04_sortAndPagination.ts       |  12 +-
 .../02_stores/01_filterAndQuickEditStores.ts  |  22 +-
 .../05_contact/02_stores/02_CRUDStores.ts     |  26 +-
 .../02_stores/03_bulkActionsStores.ts         |  22 +-
 .../05_contact/02_stores/04_contactDetails.ts |  32 +--
 .../02_stores/05_sortAndPagination.ts         |  28 +-
 .../01_seoAndUrls/01_filterSeoPages.ts        |  10 +-
 .../01_seoAndUrls/02_CRUDSeoPage.ts           |  28 +-
 .../06_sortAndPaginationSeoPages.ts           |  12 +-
 .../01_seoAndUrls/07_bulkDeleteSeoPages.ts    |  16 +-
 .../03_enableDisableFriendlyURL.ts            |  12 +-
 .../04_enableDisableAccentedURL.ts            |  24 +-
 .../01_displayAttributesInProductMetaTitle.ts |  10 +-
 .../01_seoAndUrls/helpCard.ts                 |   8 +-
 .../01_filterSortAndPagination.ts             |  20 +-
 .../02_searchEngines/02_CRUDSearchEngines.ts  |  30 +-
 .../02_searchEngines/03_bulkActions.ts        |  20 +-
 .../07_search/01_search/01_CRUDSearch.ts      |  24 +-
 .../01_editSearchSettings/03_fuzzySearch.ts   |  34 +--
 .../07_search/01_search/02_bulkActions.ts     |  22 +-
 .../07_search/01_search/03_quickEditStatus.ts |  12 +-
 .../07_search/02_tags/01_CRUDTag.ts           |  20 +-
 .../02_tags/02_filterSortAndPagination.ts     |  28 +-
 .../02_performance/02_debugMode.ts            |   6 +-
 .../03_administration/01_general.ts           |   4 +-
 .../01_filterDeleteAndBulkActionsEmails.ts    |  38 +--
 .../04_email/02_enableDisableLogEmails.ts     |   6 +-
 .../03_sendTestEmail/01_sendTestEmail.ts      |   4 +-
 .../04_email/03_sortAndPagination.ts          |  38 +--
 .../05_import/01_downloadSampleFiles.ts       |   6 +-
 .../01_filterAndQuickEditEmployees.ts         |  32 +--
 .../06_team/employees/02_CRUDEmployee.ts      |  42 +--
 .../employees/03_employeesBulkActions.ts      |  26 +-
 .../06_team/employees/04_helpCard.ts          |   8 +-
 .../06_team/employees/05_sortAndPagination.ts |  24 +-
 .../06_team/permission/01_editMenu.ts         |  28 +-
 .../06_team/permission/02_editModules.ts      |  14 +-
 .../06_team/roles/01_filterRoles.ts           |  12 +-
 .../06_team/roles/02_CRUDRoles.ts             |  24 +-
 .../06_team/roles/03_helpCard.ts              |  10 +-
 .../06_team/roles/04_sortRoles.ts             |  10 +-
 .../roles/05_paginationAndBulkActions.ts      |  18 +-
 .../dbBackup/01_createAndDeleteDbBackup.ts    |  16 +-
 .../dbBackup/02_paginationAndBulkDelete.ts    |  14 +-
 .../07_database/dbBackup/03_helpCard.ts       |  10 +-
 .../07_database/sqlManager/01_CRUDSqlQuery.ts |  34 +--
 .../07_database/sqlManager/02_helpCard.ts     |   8 +-
 .../sqlManager/03_exportSqlQuery.ts           |  18 +-
 .../sqlManager/04_filterSortAndPagination.ts  |  30 +-
 .../08_logs/01_filterSortAndPagination.ts     |  34 +--
 .../08_logs/02_logsByEmail.ts                 |   6 +-
 .../09_webservice/01_CRUDWebservice.ts        |  24 +-
 .../02_filterAndQuickEditWebservice.ts        |  26 +-
 .../09_webservice/03_helpCard.ts              |   8 +-
 .../04_sortPaginationAndBulkActions.ts        |  26 +-
 .../10_multistore/01_CRUDShopGroups.ts        |  40 +--
 .../02_filterSortAndPaginationShopGroups.ts   |  26 +-
 .../10_multistore/03_CRUDShops.ts             |  20 +-
 .../04_filterSortAndPaginationShops.ts        |  24 +-
 .../05_filterSortAndPaginationShopUrls.ts     |  24 +-
 .../06_quickEditAndBulkActionsShopUrls.ts     |  32 +--
 .../10_multistore/07_editUrlOptions.ts        |  26 +-
 .../01_enableDisableExperimentalProductV2.ts  |  18 +-
 .../12_authorizationServer/01_CRUD.ts         |  20 +-
 .../12_authorizationServer/02_viewDetail.ts   |  22 +-
 .../functional/BO/15_header/01_leftMenu.ts    |  20 +-
 .../functional/BO/15_header/02_quickAccess.ts |  20 +-
 .../functional/BO/15_header/03_searchBar.ts   |  30 +-
 .../functional/BO/15_header/05_viewMyShop.ts  |   8 +-
 .../functional/BO/15_header/07_myProfile.ts   |  46 +--
 .../BO/15_header/08_checkNotifications.ts     |  36 +--
 .../classic/01_login/01_passwordReminder.ts   |  28 +-
 .../FO/classic/01_login/02_login.ts           |  18 +-
 .../FO/classic/01_login/03_logout.ts          |  14 +-
 .../FO/classic/01_login/04_createAccount.ts   |  14 +-
 .../01_checkLinksInHeader.ts                  |  22 +-
 .../02_checkLinksInFooter.ts                  |  20 +-
 .../02_headerAndFooter/03_changeCurrency.ts   |  22 +-
 .../02_headerAndFooter/04_changeLanguage.ts   |  42 +--
 .../01_creditSlips/01_consultCreditSlip.ts    |  82 +++---
 .../03_userAccount/01_editInformation.ts      |  52 ++--
 .../classic/03_userAccount/02_CRUDAddress.ts  |  54 ++--
 .../02_orderHistory/01_consultOrderList.ts    |  32 +--
 .../01_reorderFromOrderDetail.ts              |  32 +--
 .../01_orderDetails/02_downloadInvoice.ts     |  32 +--
 .../03_requestMerchandiseReturn.ts            |  24 +-
 .../01_orderDetails/04_sendMessage.ts         |  44 +--
 .../02_reorderFromOrderList.ts                |  30 +-
 .../02_orderHistory/03_downloadInvoice.ts     |  24 +-
 .../classic/03_userAccount/03_viewVouchers.ts |  10 +-
 .../03_userAccount/04_getGDPRDataInPDF.ts     | 166 +++++------
 .../03_userAccount/05_getGDPRDataInCSV.ts     | 162 +++++------
 .../03_userAccount/06_contactUsOnGDPRPage.ts  |  20 +-
 .../FO/classic/03_userAccount/07_logOut.ts    |  10 +-
 .../01_consultReturnDetails.ts                |  68 ++---
 .../02_checkOrderReturnPDF.ts                 |  72 ++---
 .../04_newsletter/01_subscribeNewsletter.ts   |  30 +-
 .../05_contactUs/01_checkMailtoLink.ts        |   6 +-
 .../02_sendMessageWithCustomer.ts             |  22 +-
 .../05_contactUs/03_sendMessageAsAnonymous.ts |  26 +-
 .../classic/05_contactUs/04_addAttachment.ts  |  28 +-
 .../FO/classic/06_homePage/01_checkSlider.ts  |  12 +-
 .../06_homePage/02_displaySomeProducts.ts     |  30 +-
 .../FO/classic/06_homePage/03_allProducts.ts  |  18 +-
 .../06_homePage/04_productQuickView.ts        |  42 +--
 .../07_search/01_consultAutocompleteList.ts   |  14 +-
 .../FO/classic/07_search/02_searchProduct.ts  |  16 +-
 .../FO/classic/07_search/03_searchNoResult.ts |  16 +-
 .../01_consultCategoriesInHeader.ts           |   6 +-
 .../02_sortAndFilter/01_sortProducts.ts       |  22 +-
 .../03_navigationAndDisplay/01_displayTags.ts |  72 ++---
 .../03_navigationAndDisplay/02_pagination.ts  |  42 +--
 .../03_quickViewProducts.ts                   |  24 +-
 .../04_displayOnSaleFlag.ts                   |  10 +-
 .../FO/classic/09_productPage/01_quickView.ts |  38 +--
 .../01_quickView/01_addToCart.ts              |  12 +-
 .../FO/classic/09_productPage/02_addToCart.ts |  80 +++---
 .../10_cart/02_cart/01_changeQuantity.ts      |  30 +-
 .../10_cart/02_cart/02_deleteProduct.ts       |  12 +-
 .../10_cart/02_cart/03_addPromoCode.ts        |  20 +-
 .../01_personalInformation/02_signIn.ts       |  20 +-
 .../05_passwordReminder.ts                    |  32 +--
 .../FO/classic/11_checkout/01_showDetails.ts  |  36 +--
 .../02_addresses/01_CRUDAddress.ts            |  52 ++--
 .../02_useDifferentAddressForInvoice.ts       |  26 +-
 .../03_shippingMethods/01_addOrderMessage.ts  |  22 +-
 .../03_shippingMethods/02_selectCarrier.ts    |  20 +-
 .../12_orderConfirmation/05_contactUs.ts      |  42 +--
 .../01_login/01_passwordReminder.ts           |  28 +-
 .../FO/hummingbird/01_login/02_login.ts       |  18 +-
 .../FO/hummingbird/01_login/03_logout.ts      |  14 +-
 .../hummingbird/01_login/04_createAccount.ts  |  12 +-
 .../01_checkLinksInHeader.ts                  |  22 +-
 .../02_headerAndFooter/04_changeLanguage.ts   |  12 +-
 .../functional/WS/01_countriesCRUD.ts         |  60 ++--
 .../campaigns/functional/WS/03_storesCRUD.ts  |  60 ++--
 .../02_statisticsTabSettings.ts               |  32 +--
 .../01_installation/04_resetModule.ts         |  30 +-
 .../04_uninstallAndDeleteModule.ts            |  32 +--
 .../productV2/functional/01_filterProducts.ts |  42 +--
 .../functional/02_CRUDStandardProduct.ts      |  40 +--
 .../03_CRUDProductWithCombinations.ts         |  16 +-
 .../functional/04_CRUDPackOfProducts.ts       |  98 +++----
 .../functional/06_duplicateProduct.ts         |  30 +-
 .../functional/07_productBulkActions.ts       |  34 +--
 .../productV2/functional/08_header.ts         |  12 +-
 .../productV2/functional/10_descriptionTab.ts |  18 +-
 .../productV2/functional/11_combinationTab.ts |   2 +-
 .../productV2/functional/13_virtualTab.ts     |   2 +-
 .../productV2/functional/14_detailsTab.ts     |  12 +-
 .../checkout/100PercentDiscount_FO.ts         |  46 +--
 .../currencies/computingPrecision_FO.ts       |  80 +++---
 .../menu/deniedAccessToModuleCatalogPage.ts   |   6 +-
 .../sanity/01_installShop/01_installShop.ts   |  26 +-
 .../sanity/02_ordersBO/01_filterOrders.ts     |   8 +-
 .../sanity/02_ordersBO/02_editOrder.ts        |   8 +-
 .../sanity/03_productsBO/01_filterProducts.ts |  18 +-
 .../03_productsBO/02_CRUDStandardProduct.ts   |  38 +--
 .../03_CRUDProductWithCombinations.ts         |  62 ++--
 .../03_productsBO/04_CRUDVirtualProduct.ts    |  38 +--
 .../sanity/03_productsBO/05_deleteProduct.ts  |  24 +-
 .../06_deleteProductsWithBulkActions.ts       |  34 +--
 .../sanity/04_catalogFO/01_filterProducts.ts  |   8 +-
 .../sanity/04_catalogFO/02_checkProduct.ts    |   4 +-
 .../sanity/05_cartFO/01_editCheckCart.ts      |  24 +-
 .../sanity/06_checkoutFO/01_orderProduct.ts   |  22 +-
 .../BO/advancedParameters/cache.ts            |   4 +-
 .../BO/advancedParameters/employee.ts         |  16 +-
 .../BO/advancedParameters/importFile.ts       |  12 +-
 .../BO/advancedParameters/multistore.ts       |   4 +-
 .../BO/advancedParameters/newFeatures.ts      |   4 +-
 .../BO/advancedParameters/setPermissions.ts   |   8 +-
 .../commonTests/BO/advancedParameters/smtp.ts |   8 +-
 .../commonTests/BO/advancedParameters/ws.ts   |  24 +-
 tests/UI/commonTests/BO/catalog/cartRule.ts   |  24 +-
 tests/UI/commonTests/BO/catalog/category.ts   |  10 +-
 tests/UI/commonTests/BO/catalog/features.ts   |  24 +-
 tests/UI/commonTests/BO/catalog/monitoring.ts |   6 +-
 tests/UI/commonTests/BO/catalog/product.ts    |  38 +--
 .../BO/customerService/merchandiseReturns.ts  |   8 +-
 tests/UI/commonTests/BO/customers/address.ts  |  20 +-
 tests/UI/commonTests/BO/customers/customer.ts |  32 +--
 .../commonTests/BO/international/currency.ts  |  16 +-
 .../UI/commonTests/BO/international/ecoTax.ts |   8 +-
 tests/UI/commonTests/BO/loginBO.ts            |   4 +-
 .../commonTests/BO/modules/moduleManager.ts   |  16 +-
 .../UI/commonTests/BO/orders/shoppingCarts.ts |  12 +-
 tests/UI/commonTests/BO/shopParameters/b2b.ts |   8 +-
 tests/UI/commonTests/FO/account.ts            |  24 +-
 tests/UI/commonTests/FO/hummingbird.ts        |  22 +-
 .../UI/commonTests/FO/hummingbird/account.ts  |   8 +-
 tests/UI/commonTests/FO/loginFO.ts            |   6 +-
 tests/UI/commonTests/FO/order.ts              |  42 +--
 tests/UI/commonTests/FO/shoppingCart.ts       |  14 +-
 .../catalog/productsV2/add/combinationsTab.ts |   8 +-
 .../UI/pages/BO/orders/view/customerBlock.ts  |  26 +-
 tests/UI/tools/linkchecker.ts                 |   2 +-
 514 files changed, 6722 insertions(+), 6710 deletions(-)

diff --git a/tests/UI/campaigns/cldr/03_deleteCurrency.ts b/tests/UI/campaigns/cldr/03_deleteCurrency.ts
index 23b7747775529..bb6980f7108db 100644
--- a/tests/UI/campaigns/cldr/03_deleteCurrency.ts
+++ b/tests/UI/campaigns/cldr/03_deleteCurrency.ts
@@ -58,7 +58,7 @@ describe('CLDR : Delete a currency', async () => {
     await localizationPage.closeSfToolBar(page);
 
     const pageTitle = await localizationPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(localizationPage.pageTitle);
+    expect(pageTitle).to.contains(localizationPage.pageTitle);
   });
 
   it('should go to Currencies Tab', async function () {
@@ -67,14 +67,14 @@ describe('CLDR : Delete a currency', async () => {
     await localizationPage.goToSubTabCurrencies(page);
 
     const pageTitle = await currenciesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(currenciesPage.pageTitle);
+    expect(pageTitle).to.contains(currenciesPage.pageTitle);
   });
 
   it('should reset all filters', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilter', baseContext);
 
     numberOfCurrencies = await currenciesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfCurrencies).to.be.above(0);
+    expect(numberOfCurrencies).to.be.above(0);
   });
 
   currencies.forEach((currency: CurrencyData, index : number) => {
@@ -84,7 +84,7 @@ describe('CLDR : Delete a currency', async () => {
       await currenciesPage.goToAddNewCurrencyPage(page);
 
       const pageTitle = await addCurrencyPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addCurrencyPage.pageTitle);
+      expect(pageTitle).to.contains(addCurrencyPage.pageTitle);
     });
 
     it(`should create the currency ${currency.isoCode}`, async function () {
@@ -92,11 +92,11 @@ describe('CLDR : Delete a currency', async () => {
 
       // Create and check successful message
       const textResult = await addCurrencyPage.addOfficialCurrency(page, currency);
-      await expect(textResult).to.contains(currenciesPage.successfulCreationMessage);
+      expect(textResult).to.contains(currenciesPage.successfulCreationMessage);
 
       // Check number of currencies after creation
       const numberOfCurrenciesAfterCreation = await currenciesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfCurrenciesAfterCreation).to.be.equal(numberOfCurrencies + index + 1);
+      expect(numberOfCurrenciesAfterCreation).to.be.equal(numberOfCurrencies + index + 1);
     });
   });
 
@@ -106,14 +106,14 @@ describe('CLDR : Delete a currency', async () => {
     await localizationPage.goToSubTabLocalizations(page);
 
     const pageTitle = await localizationPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(localizationPage.pageTitle);
+    expect(pageTitle).to.contains(localizationPage.pageTitle);
   });
 
   it(`should choose '${Currencies.usd.isoCode}' as default currency`, async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'setUSDAsDefaultCurrency', baseContext);
 
     const textResult = await localizationPage.setDefaultCurrency(page, `${Currencies.usd.name} (${Currencies.usd.isoCode})`);
-    await expect(textResult).to.contains(localizationPage.successfulSettingsUpdateMessage);
+    expect(textResult).to.contains(localizationPage.successfulSettingsUpdateMessage);
   });
 
   it('should go to Currencies Tab', async function () {
@@ -122,7 +122,7 @@ describe('CLDR : Delete a currency', async () => {
     await localizationPage.goToSubTabCurrencies(page);
 
     const pageTitle = await currenciesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(currenciesPage.pageTitle);
+    expect(pageTitle).to.contains(currenciesPage.pageTitle);
   });
 
   it(`should filter by iso code of currency '${Currencies.usd.isoCode}'`, async function () {
@@ -133,18 +133,18 @@ describe('CLDR : Delete a currency', async () => {
 
     // Check number of currencies
     const numberOfCurrenciesAfterFilter = await currenciesPage.getNumberOfElementInGrid(page);
-    await expect(numberOfCurrenciesAfterFilter).to.be.equal(1);
+    expect(numberOfCurrenciesAfterFilter).to.be.equal(1);
 
     // Check currency
     const textColumn = await currenciesPage.getTextColumnFromTableCurrency(page, 1, 'iso_code');
-    await expect(textColumn).to.contains(Currencies.usd.isoCode);
+    expect(textColumn).to.contains(Currencies.usd.isoCode);
   });
 
   it('should delete currency', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'deleteCurrencyUSDWithError', baseContext);
 
     const result = await currenciesPage.deleteCurrency(page, 1);
-    await expect(result).to.be.equal(currenciesPage.cannotDeleteDefaultCurrencyMessage);
+    expect(result).to.be.equal(currenciesPage.cannotDeleteDefaultCurrencyMessage);
   });
 
   it('should go to Localization Tab', async function () {
@@ -153,14 +153,14 @@ describe('CLDR : Delete a currency', async () => {
     await localizationPage.goToSubTabLocalizations(page);
 
     const pageTitle = await localizationPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(localizationPage.pageTitle);
+    expect(pageTitle).to.contains(localizationPage.pageTitle);
   });
 
   it(`should choose '${Currencies.euro.isoCode}' as default currency`, async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'setEURAsDefaultCurrency', baseContext);
 
     const textResult = await localizationPage.setDefaultCurrency(page, `${Currencies.euro.name} (${Currencies.euro.isoCode})`);
-    await expect(textResult).to.contains(localizationPage.successfulSettingsUpdateMessage);
+    expect(textResult).to.contains(localizationPage.successfulSettingsUpdateMessage);
   });
 
   it('should go to Currencies Tab', async function () {
@@ -169,7 +169,7 @@ describe('CLDR : Delete a currency', async () => {
     await localizationPage.goToSubTabCurrencies(page);
 
     const pageTitle = await currenciesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(currenciesPage.pageTitle);
+    expect(pageTitle).to.contains(currenciesPage.pageTitle);
   });
 
   it(`should filter by iso code of currency '${Currencies.usd.isoCode}'`, async function () {
@@ -180,28 +180,28 @@ describe('CLDR : Delete a currency', async () => {
 
     // Check number of currencies
     const numberOfCurrenciesAfterFilter = await currenciesPage.getNumberOfElementInGrid(page);
-    await expect(numberOfCurrenciesAfterFilter).to.be.equal(1);
+    expect(numberOfCurrenciesAfterFilter).to.be.equal(1);
 
     // Check currency
     const textColumn = await currenciesPage.getTextColumnFromTableCurrency(page, 1, 'iso_code');
-    await expect(textColumn).to.contains(Currencies.usd.isoCode);
+    expect(textColumn).to.contains(Currencies.usd.isoCode);
   });
 
   it('should delete currency', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'deleteCurrencyUSD', baseContext);
 
     const result = await currenciesPage.deleteCurrency(page, 1);
-    await expect(result).to.be.equal(currenciesPage.successfulDeleteMessage);
+    expect(result).to.be.equal(currenciesPage.successfulDeleteMessage);
   });
 
   it(`should select rows except '${Currencies.euro.isoCode}'`, async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetAndSelectRowsExceptEUR', baseContext);
 
     const numberOfCurrenciesAfterDelete = await currenciesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfCurrenciesAfterDelete).to.be.eq(numberOfCurrencies + currencies.length - 1);
+    expect(numberOfCurrenciesAfterDelete).to.be.eq(numberOfCurrencies + currencies.length - 1);
 
     const isBulkActionsEnabledBeforeSelect = await currenciesPage.isBulkActionsEnabled(page);
-    await expect(isBulkActionsEnabledBeforeSelect).to.be.false;
+    expect(isBulkActionsEnabledBeforeSelect).to.eq(false);
 
     for (let numRow = 1; numRow <= numberOfCurrenciesAfterDelete; numRow++) {
       const textColumn = await currenciesPage.getTextColumnFromTableCurrency(page, numRow, 'iso_code');
@@ -212,7 +212,7 @@ describe('CLDR : Delete a currency', async () => {
     }
 
     const isBulkActionsEnabledAfterSelect = await currenciesPage.isBulkActionsEnabled(page);
-    await expect(isBulkActionsEnabledAfterSelect).to.be.true;
+    expect(isBulkActionsEnabledAfterSelect).to.eq(true);
   });
 
   it('should bulk delete currencies', async function () {
@@ -222,6 +222,6 @@ describe('CLDR : Delete a currency', async () => {
     expect(result).to.be.eq(currenciesPage.successfulMultiDeleteMessage);
 
     const numberOfCurrenciesAfterBulkDeete = await currenciesPage.getNumberOfElementInGrid(page);
-    await expect(numberOfCurrenciesAfterBulkDeete).to.be.equal(numberOfCurrencies);
+    expect(numberOfCurrenciesAfterBulkDeete).to.be.equal(numberOfCurrencies);
   });
 });
diff --git a/tests/UI/campaigns/cldr/04_searchCurrencyByISOCode.ts b/tests/UI/campaigns/cldr/04_searchCurrencyByISOCode.ts
index d5dbbe1965dc1..d79595edcf749 100644
--- a/tests/UI/campaigns/cldr/04_searchCurrencyByISOCode.ts
+++ b/tests/UI/campaigns/cldr/04_searchCurrencyByISOCode.ts
@@ -60,7 +60,7 @@ describe('CLDR : Search a currency by ISO code', async () => {
     await localizationPage.closeSfToolBar(page);
 
     const pageTitle = await localizationPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(localizationPage.pageTitle);
+    expect(pageTitle).to.contains(localizationPage.pageTitle);
   });
 
   it('should go to Currencies Tab', async function () {
@@ -69,14 +69,14 @@ describe('CLDR : Search a currency by ISO code', async () => {
     await localizationPage.goToSubTabCurrencies(page);
 
     const pageTitle = await currenciesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(currenciesPage.pageTitle);
+    expect(pageTitle).to.contains(currenciesPage.pageTitle);
   });
 
   it('should reset all filters', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilter', baseContext);
 
     numberOfCurrencies = await currenciesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfCurrencies).to.be.above(0);
+    expect(numberOfCurrencies).to.be.above(0);
   });
 
   installedCurrencies.forEach((currency: CurrencyData, index: number) => {
@@ -86,7 +86,7 @@ describe('CLDR : Search a currency by ISO code', async () => {
       await currenciesPage.goToAddNewCurrencyPage(page);
 
       const pageTitle = await addCurrencyPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addCurrencyPage.pageTitle);
+      expect(pageTitle).to.contains(addCurrencyPage.pageTitle);
     });
 
     it(`should create the currency ${currency.isoCode}`, async function () {
@@ -94,11 +94,11 @@ describe('CLDR : Search a currency by ISO code', async () => {
 
       // Create and check successful message
       const textResult = await addCurrencyPage.addOfficialCurrency(page, currency);
-      await expect(textResult).to.contains(currenciesPage.successfulCreationMessage);
+      expect(textResult).to.contains(currenciesPage.successfulCreationMessage);
 
       // Check number of currencies after creation
       const numberOfCurrenciesAfterCreation = await currenciesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfCurrenciesAfterCreation).to.be.equal(numberOfCurrencies + index + 1);
+      expect(numberOfCurrenciesAfterCreation).to.be.equal(numberOfCurrencies + index + 1);
     });
   });
 
@@ -110,11 +110,11 @@ describe('CLDR : Search a currency by ISO code', async () => {
 
     // Check number of currencies
     const numberOfCurrenciesAfterFilter = await currenciesPage.getNumberOfElementInGrid(page);
-    await expect(numberOfCurrenciesAfterFilter).to.be.equal(1);
+    expect(numberOfCurrenciesAfterFilter).to.be.equal(1);
 
     // Check currency
     const textColumn = await currenciesPage.getTextColumnFromTableCurrency(page, 1, 'iso_code');
-    await expect(textColumn).to.contains(Currencies.euro.isoCode);
+    expect(textColumn).to.contains(Currencies.euro.isoCode);
   });
 
   it('should filter by iso code "US"', async function () {
@@ -125,11 +125,11 @@ describe('CLDR : Search a currency by ISO code', async () => {
 
     // Check number of currencies
     const numberOfCurrenciesAfterFilter = await currenciesPage.getNumberOfElementInGrid(page);
-    await expect(numberOfCurrenciesAfterFilter).to.be.equal(1);
+    expect(numberOfCurrenciesAfterFilter).to.be.equal(1);
 
     // Check currency
     const textColumn = await currenciesPage.getTextColumnFromTableCurrency(page, 1, 'iso_code');
-    await expect(textColumn).to.contains(Currencies.usd.isoCode);
+    expect(textColumn).to.contains(Currencies.usd.isoCode);
   });
 
   it('should filter by iso code "PY"', async function () {
@@ -141,14 +141,14 @@ describe('CLDR : Search a currency by ISO code', async () => {
 
     // Check number of currencies
     const numberOfCurrenciesAfterFilter = await currenciesPage.getNumberOfElementInGrid(page);
-    await expect(numberOfCurrenciesAfterFilter).to.be.equal(2);
+    expect(numberOfCurrenciesAfterFilter).to.be.equal(2);
 
     // Check currencies
     const textColumnRow1 = await currenciesPage.getTextColumnFromTableCurrency(page, 1, 'iso_code');
-    await expect(textColumnRow1).to.contains(Currencies.jpy.isoCode);
+    expect(textColumnRow1).to.contains(Currencies.jpy.isoCode);
 
     const textColumnRow2 = await currenciesPage.getTextColumnFromTableCurrency(page, 2, 'iso_code');
-    await expect(textColumnRow2).to.contains(Currencies.pyg.isoCode);
+    expect(textColumnRow2).to.contains(Currencies.pyg.isoCode);
   });
 
   it('should filter by iso code "P"', async function () {
@@ -160,17 +160,17 @@ describe('CLDR : Search a currency by ISO code', async () => {
 
     // Check number of currencies
     const numberOfCurrenciesAfterFilter = await currenciesPage.getNumberOfElementInGrid(page);
-    await expect(numberOfCurrenciesAfterFilter).to.be.equal(3);
+    expect(numberOfCurrenciesAfterFilter).to.be.equal(3);
 
     // Check currencies
     const textColumnRow1 = await currenciesPage.getTextColumnFromTableCurrency(page, 1, 'iso_code');
-    await expect(textColumnRow1).to.contains(Currencies.gbp.isoCode);
+    expect(textColumnRow1).to.contains(Currencies.gbp.isoCode);
 
     const textColumnRow2 = await currenciesPage.getTextColumnFromTableCurrency(page, 2, 'iso_code');
-    await expect(textColumnRow2).to.contains(Currencies.jpy.isoCode);
+    expect(textColumnRow2).to.contains(Currencies.jpy.isoCode);
 
     const textColumnRow3 = await currenciesPage.getTextColumnFromTableCurrency(page, 3, 'iso_code');
-    await expect(textColumnRow3).to.contains(Currencies.pyg.isoCode);
+    expect(textColumnRow3).to.contains(Currencies.pyg.isoCode);
   });
 
   it('should filter by iso code "ABC"', async function () {
@@ -181,18 +181,18 @@ describe('CLDR : Search a currency by ISO code', async () => {
 
     // Check number of currencies
     const numberOfCurrenciesAfterFilter = await currenciesPage.getNumberOfElementInGrid(page);
-    await expect(numberOfCurrenciesAfterFilter).to.be.equal(0);
+    expect(numberOfCurrenciesAfterFilter).to.be.equal(0);
 
     // Check currencies
     const textColumn = await currenciesPage.getTextForEmptyTable(page);
-    await expect(textColumn).to.equal('warning No records found');
+    expect(textColumn).to.equal('warning No records found');
   });
 
   it('should reset all filters', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFinal', baseContext);
 
     const numberOfCurrenciesAfterReset = await currenciesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfCurrenciesAfterReset).to.be.eq(numberOfCurrencies + installedCurrencies.length);
+    expect(numberOfCurrenciesAfterReset).to.be.eq(numberOfCurrencies + installedCurrencies.length);
   });
 
   // Post-condition - Delete currencies
diff --git a/tests/UI/campaigns/cldr/05_searchCurrencyByEnableDisable.ts b/tests/UI/campaigns/cldr/05_searchCurrencyByEnableDisable.ts
index f33dc067ba879..aa95eb88cb36b 100644
--- a/tests/UI/campaigns/cldr/05_searchCurrencyByEnableDisable.ts
+++ b/tests/UI/campaigns/cldr/05_searchCurrencyByEnableDisable.ts
@@ -52,7 +52,7 @@ describe('CLDR : Search a currency by enable/disable', async () => {
     await localizationPage.closeSfToolBar(page);
 
     const pageTitle = await localizationPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(localizationPage.pageTitle);
+    expect(pageTitle).to.contains(localizationPage.pageTitle);
   });
 
   it('should go to Currencies Tab', async function () {
@@ -61,14 +61,14 @@ describe('CLDR : Search a currency by enable/disable', async () => {
     await localizationPage.goToSubTabCurrencies(page);
 
     const pageTitle = await currenciesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(currenciesPage.pageTitle);
+    expect(pageTitle).to.contains(currenciesPage.pageTitle);
   });
 
   it('should reset all filters', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilter', baseContext);
 
     numberOfCurrencies = await currenciesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfCurrencies).to.be.above(0);
+    expect(numberOfCurrencies).to.be.above(0);
   });
 
   it('should go to create new currency page', async function () {
@@ -77,7 +77,7 @@ describe('CLDR : Search a currency by enable/disable', async () => {
     await currenciesPage.goToAddNewCurrencyPage(page);
 
     const pageTitle = await addCurrencyPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(addCurrencyPage.pageTitle);
+    expect(pageTitle).to.contains(addCurrencyPage.pageTitle);
   });
 
   it('should create the currency USD', async function () {
@@ -85,11 +85,11 @@ describe('CLDR : Search a currency by enable/disable', async () => {
 
     // Create and check successful message
     const textResult = await addCurrencyPage.addOfficialCurrency(page, Currencies.usd);
-    await expect(textResult).to.contains(currenciesPage.successfulCreationMessage);
+    expect(textResult).to.contains(currenciesPage.successfulCreationMessage);
 
     // Check number of currencies after creation
     const numberOfCurrenciesAfterCreation = await currenciesPage.getNumberOfElementInGrid(page);
-    await expect(numberOfCurrenciesAfterCreation).to.be.equal(numberOfCurrencies + 1);
+    expect(numberOfCurrenciesAfterCreation).to.be.equal(numberOfCurrencies + 1);
   });
 
   it(`should filter by iso code of currency '${Currencies.usd.isoCode}'`, async function () {
@@ -100,11 +100,11 @@ describe('CLDR : Search a currency by enable/disable', async () => {
 
     // Check number of currencies
     const numberOfCurrenciesAfterFilter = await currenciesPage.getNumberOfElementInGrid(page);
-    await expect(numberOfCurrenciesAfterFilter).to.be.equal(1);
+    expect(numberOfCurrenciesAfterFilter).to.be.equal(1);
 
     // Check currency created
     const textColumn = await currenciesPage.getTextColumnFromTableCurrency(page, 1, 'iso_code');
-    await expect(textColumn).to.contains(Currencies.usd.isoCode);
+    expect(textColumn).to.contains(Currencies.usd.isoCode);
   });
 
   it(`should disable currency '${Currencies.usd.isoCode}'`, async function () {
@@ -113,7 +113,7 @@ describe('CLDR : Search a currency by enable/disable', async () => {
     await currenciesPage.setStatus(page, 1, false);
 
     const status = await currenciesPage.getStatus(page, 1);
-    await expect(status).to.be.false;
+    expect(status).to.eq(false);
   });
 
   it('should search Enabled currencies', async function () {
@@ -123,10 +123,10 @@ describe('CLDR : Search a currency by enable/disable', async () => {
     await currenciesPage.filterTable(page, 'select', 'active', '1');
 
     const numberEnabledCurrencies = await currenciesPage.getNumberOfElementInGrid(page);
-    await expect(numberEnabledCurrencies).to.be.eq(1);
+    expect(numberEnabledCurrencies).to.be.eq(1);
 
     const textColumn = await currenciesPage.getTextColumnFromTableCurrency(page, 1, 'iso_code');
-    await expect(textColumn).to.contains(Currencies.euro.isoCode);
+    expect(textColumn).to.contains(Currencies.euro.isoCode);
   });
 
   it('should search Disabled currencies', async function () {
@@ -136,10 +136,10 @@ describe('CLDR : Search a currency by enable/disable', async () => {
     await currenciesPage.filterTable(page, 'select', 'active', '0');
 
     const numberEnabledCurrencies = await currenciesPage.getNumberOfElementInGrid(page);
-    await expect(numberEnabledCurrencies).to.be.eq(1);
+    expect(numberEnabledCurrencies).to.be.eq(1);
 
     const textColumn = await currenciesPage.getTextColumnFromTableCurrency(page, 1, 'iso_code');
-    await expect(textColumn).to.contains(Currencies.usd.isoCode);
+    expect(textColumn).to.contains(Currencies.usd.isoCode);
   });
 
   it(`should enable currency '${Currencies.usd.isoCode}'`, async function () {
@@ -148,7 +148,7 @@ describe('CLDR : Search a currency by enable/disable', async () => {
     await currenciesPage.setStatus(page, 1, true);
 
     const textColumn = await currenciesPage.getTextForEmptyTable(page);
-    await expect(textColumn).to.equal('warning No records found');
+    expect(textColumn).to.equal('warning No records found');
   });
 
   it('should go to create new currency page', async function () {
@@ -157,7 +157,7 @@ describe('CLDR : Search a currency by enable/disable', async () => {
     await currenciesPage.goToAddNewCurrencyPage(page);
 
     const pageTitle = await addCurrencyPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(addCurrencyPage.pageTitle);
+    expect(pageTitle).to.contains(addCurrencyPage.pageTitle);
   });
 
   it('should create the currency GBP', async function () {
@@ -165,18 +165,18 @@ describe('CLDR : Search a currency by enable/disable', async () => {
 
     // Create and check successful message
     const textResult = await addCurrencyPage.addOfficialCurrency(page, Currencies.gbp);
-    await expect(textResult).to.contains(currenciesPage.successfulCreationMessage);
+    expect(textResult).to.contains(currenciesPage.successfulCreationMessage);
 
     // Check number of currencies after creation
     const numberOfCurrenciesAfterCreation = await currenciesPage.getNumberOfElementInGrid(page);
-    await expect(numberOfCurrenciesAfterCreation).to.be.eq(0);
+    expect(numberOfCurrenciesAfterCreation).to.be.eq(0);
   });
 
   it('should reset all filters', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFinal', baseContext);
 
     const numberOfCurrenciesAfterReset = await currenciesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfCurrenciesAfterReset).to.be.eq(numberOfCurrencies + 2);
+    expect(numberOfCurrenciesAfterReset).to.be.eq(numberOfCurrencies + 2);
   });
 
   // Post-condition - Delete currency USD
diff --git a/tests/UI/campaigns/cldr/07_editSymbolFormatCurrency.ts b/tests/UI/campaigns/cldr/07_editSymbolFormatCurrency.ts
index ed596a17ec0e3..d73ddbece6f8e 100644
--- a/tests/UI/campaigns/cldr/07_editSymbolFormatCurrency.ts
+++ b/tests/UI/campaigns/cldr/07_editSymbolFormatCurrency.ts
@@ -53,7 +53,7 @@ describe('CLDR : Edit symbol / format currency', async () => {
     await localizationPage.closeSfToolBar(page);
 
     const pageTitle = await localizationPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(localizationPage.pageTitle);
+    expect(pageTitle).to.contains(localizationPage.pageTitle);
   });
 
   it('should go to Currencies Tab', async function () {
@@ -62,14 +62,14 @@ describe('CLDR : Edit symbol / format currency', async () => {
     await localizationPage.goToSubTabCurrencies(page);
 
     const pageTitle = await currenciesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(currenciesPage.pageTitle);
+    expect(pageTitle).to.contains(currenciesPage.pageTitle);
   });
 
   it('should reset all filters', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilter0', baseContext);
 
     numberOfCurrencies = await currenciesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfCurrencies).to.be.above(0);
+    expect(numberOfCurrencies).to.be.above(0);
   });
 
   it(`should filter by iso code of currency '${Currencies.euro.isoCode}'`, async function () {
@@ -80,11 +80,11 @@ describe('CLDR : Edit symbol / format currency', async () => {
 
     // Check number of currencies
     const numberOfCurrenciesAfterFilter = await currenciesPage.getNumberOfElementInGrid(page);
-    await expect(numberOfCurrenciesAfterFilter).to.be.equal(1);
+    expect(numberOfCurrenciesAfterFilter).to.be.equal(1);
 
     // Check currency created
     const textColumn = await currenciesPage.getTextColumnFromTableCurrency(page, 1, 'iso_code');
-    await expect(textColumn).to.contains(Currencies.euro.isoCode);
+    expect(textColumn).to.contains(Currencies.euro.isoCode);
   });
 
   it(`should edit the currency '${Currencies.euro.isoCode}'`, async function () {
@@ -93,21 +93,21 @@ describe('CLDR : Edit symbol / format currency', async () => {
     await currenciesPage.goToEditCurrencyPage(page, 1);
 
     const pageTitle = await addCurrencyPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(addCurrencyPage.pageTitleEdit(Currencies.euro.name));
+    expect(pageTitle).to.contains(addCurrencyPage.pageTitleEdit(Currencies.euro.name));
   });
 
   it('should have multiples currencies formats', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'checkMultipleFormats', baseContext);
 
     const numberCurrencyFormats = await addCurrencyPage.getNumberOfElementInGrid(page);
-    await expect(numberCurrencyFormats).to.be.gt(0);
+    expect(numberCurrencyFormats).to.be.gt(0);
   });
 
   it('should edit the first currency format and open a modal', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'editCurrencyFormat', baseContext);
 
     const isModalVisible = await addCurrencyPage.editCurrencyFormat(page, 1);
-    await expect(isModalVisible).to.be.true;
+    expect(isModalVisible).to.eq(true);
   });
 
   it(`should update the symbol by ${customSymbol} & the format`, async function () {
@@ -118,17 +118,17 @@ describe('CLDR : Edit symbol / format currency', async () => {
     await addCurrencyPage.saveCurrencyFormat(page);
 
     const exampleFormat = await addCurrencyPage.getTextColumnFromTable(page, 1, 2);
-    await expect(exampleFormat).to.endWith(` ${customSymbol}`);
+    expect(exampleFormat).to.endWith(` ${customSymbol}`);
   });
 
   it('should reset the currency format', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetCurrencyFormat', baseContext);
 
     const growlMessage = await addCurrencyPage.resetCurrencyFormat(page, 1);
-    await expect(growlMessage).to.be.eq(addCurrencyPage.resetCurrencyFormatMessage);
+    expect(growlMessage).to.be.eq(addCurrencyPage.resetCurrencyFormatMessage);
 
     const exampleFormat = await addCurrencyPage.getTextColumnFromTable(page, 1, 2);
-    await expect(exampleFormat).to.startWith(Currencies.euro.symbol);
+    expect(exampleFormat).to.startWith(Currencies.euro.symbol);
   });
 
   [1, 2].forEach((numRow: number) => {
@@ -136,7 +136,7 @@ describe('CLDR : Edit symbol / format currency', async () => {
       await testContext.addContextItem(this, 'testIdentifier', `editCurrencyFormat${numRow}`, baseContext);
 
       const isModalVisible = await addCurrencyPage.editCurrencyFormat(page, numRow);
-      await expect(isModalVisible).to.be.true;
+      expect(isModalVisible).to.eq(true);
     });
 
     it(`should update the symbol by ${customSymbol} and the format`, async function () {
@@ -147,7 +147,7 @@ describe('CLDR : Edit symbol / format currency', async () => {
       await addCurrencyPage.saveCurrencyFormat(page);
 
       const exampleFormat = await addCurrencyPage.getTextColumnFromTable(page, numRow, 2);
-      await expect(exampleFormat).to.endWith(` ${customSymbol}`);
+      expect(exampleFormat).to.endWith(` ${customSymbol}`);
     });
   });
 
@@ -155,10 +155,10 @@ describe('CLDR : Edit symbol / format currency', async () => {
     await testContext.addContextItem(this, 'testIdentifier', 'resetCurrency0', baseContext);
 
     const result = await addCurrencyPage.saveCurrencyForm(page);
-    await expect(result).to.be.eq(currenciesPage.successfulUpdateMessage);
+    expect(result).to.be.eq(currenciesPage.successfulUpdateMessage);
 
     const symbolCurrency = await currenciesPage.getTextColumnFromTableCurrency(page, 1, 'symbol');
-    await expect(symbolCurrency).to.be.eq(customSymbol);
+    expect(symbolCurrency).to.be.eq(customSymbol);
   });
 
   it(`should edit the currency '${Currencies.euro.isoCode}'`, async function () {
@@ -167,40 +167,40 @@ describe('CLDR : Edit symbol / format currency', async () => {
     await currenciesPage.goToEditCurrencyPage(page, 1);
 
     const pageTitle = await addCurrencyPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(addCurrencyPage.pageTitleEdit(Currencies.euro.name));
+    expect(pageTitle).to.contains(addCurrencyPage.pageTitleEdit(Currencies.euro.name));
   });
 
   it('should restore default settings\'', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'restoreDefaultSettings', baseContext);
 
     const modalRestore = await addCurrencyPage.restoreDefaultSettings(page);
-    await expect(modalRestore).to.be.true;
+    expect(modalRestore).to.eq(true);
   });
 
   it('should check the restoration is done', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'checkRestorationDone', baseContext);
 
     const exampleFormatRow1 = await addCurrencyPage.getTextColumnFromTable(page, 1, 2);
-    await expect(exampleFormatRow1).to.startWith(Currencies.euro.symbol);
+    expect(exampleFormatRow1).to.startWith(Currencies.euro.symbol);
 
     const exampleFormatRow2 = await addCurrencyPage.getTextColumnFromTable(page, 2, 2);
-    await expect(exampleFormatRow2).to.endWith(` ${Currencies.euro.symbol}`);
+    expect(exampleFormatRow2).to.endWith(` ${Currencies.euro.symbol}`);
   });
 
   it('should update the currency', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetCurrency1', baseContext);
 
     const result = await addCurrencyPage.saveCurrencyForm(page);
-    await expect(result).to.be.eq(currenciesPage.successfulUpdateMessage);
+    expect(result).to.be.eq(currenciesPage.successfulUpdateMessage);
 
     const symbolCurrency = await currenciesPage.getTextColumnFromTableCurrency(page, 1, 'symbol');
-    await expect(symbolCurrency).to.be.eq(Currencies.euro.symbol);
+    expect(symbolCurrency).to.be.eq(Currencies.euro.symbol);
   });
 
   it('should reset all filters', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilter1', baseContext);
 
     numberOfCurrencies = await currenciesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfCurrencies).to.be.above(0);
+    expect(numberOfCurrencies).to.be.above(0);
   });
 });
diff --git a/tests/UI/campaigns/cldr/08_resetSymbolFormatSettings.ts b/tests/UI/campaigns/cldr/08_resetSymbolFormatSettings.ts
index fa3c8255ea526..23b1670e27eb1 100644
--- a/tests/UI/campaigns/cldr/08_resetSymbolFormatSettings.ts
+++ b/tests/UI/campaigns/cldr/08_resetSymbolFormatSettings.ts
@@ -53,7 +53,7 @@ describe('CLDR : Reset symbol / format settings', async () => {
     await localizationPage.closeSfToolBar(page);
 
     const pageTitle = await localizationPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(localizationPage.pageTitle);
+    expect(pageTitle).to.contains(localizationPage.pageTitle);
   });
 
   it('should go to Currencies Tab', async function () {
@@ -62,14 +62,14 @@ describe('CLDR : Reset symbol / format settings', async () => {
     await localizationPage.goToSubTabCurrencies(page);
 
     const pageTitle = await currenciesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(currenciesPage.pageTitle);
+    expect(pageTitle).to.contains(currenciesPage.pageTitle);
   });
 
   it('should reset all filters', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilter0', baseContext);
 
     numberOfCurrencies = await currenciesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfCurrencies).to.be.above(0);
+    expect(numberOfCurrencies).to.be.above(0);
   });
 
   it(`should filter by iso code of currency '${Currencies.euro.isoCode}'`, async function () {
@@ -80,11 +80,11 @@ describe('CLDR : Reset symbol / format settings', async () => {
 
     // Check number of currencies
     const numberOfCurrenciesAfterFilter = await currenciesPage.getNumberOfElementInGrid(page);
-    await expect(numberOfCurrenciesAfterFilter).to.be.equal(1);
+    expect(numberOfCurrenciesAfterFilter).to.be.equal(1);
 
     // Check currency created
     const textColumn = await currenciesPage.getTextColumnFromTableCurrency(page, 1, 'iso_code');
-    await expect(textColumn).to.contains(Currencies.euro.isoCode);
+    expect(textColumn).to.contains(Currencies.euro.isoCode);
   });
 
   it(`should edit the currency '${Currencies.euro.isoCode}'`, async function () {
@@ -93,21 +93,21 @@ describe('CLDR : Reset symbol / format settings', async () => {
     await currenciesPage.goToEditCurrencyPage(page, 1);
 
     const pageTitle = await addCurrencyPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(addCurrencyPage.pageTitleEdit(Currencies.euro.name));
+    expect(pageTitle).to.contains(addCurrencyPage.pageTitleEdit(Currencies.euro.name));
   });
 
   it('should have multiples currencies formats', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'checkMultipleFormats', baseContext);
 
     const numberCurrencyFormats = await addCurrencyPage.getNumberOfElementInGrid(page);
-    await expect(numberCurrencyFormats).to.be.gt(0);
+    expect(numberCurrencyFormats).to.be.gt(0);
   });
 
   it('should edit the first currency format and open a modal', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'editCurrencyFormat', baseContext);
 
     const isModalVisible = await addCurrencyPage.editCurrencyFormat(page, 1);
-    await expect(isModalVisible).to.be.true;
+    expect(isModalVisible).to.eq(true);
   });
 
   it(`should update the symbol by ${customSymbol}`, async function () {
@@ -117,17 +117,17 @@ describe('CLDR : Reset symbol / format settings', async () => {
     await addCurrencyPage.saveCurrencyFormat(page);
 
     const exampleFormat = await addCurrencyPage.getTextColumnFromTable(page, 1, 2);
-    await expect(exampleFormat).to.startWith(customSymbol);
+    expect(exampleFormat).to.startWith(customSymbol);
   });
 
   it('should update the currency', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'saveCurrency', baseContext);
 
     const result = await addCurrencyPage.saveCurrencyForm(page);
-    await expect(result).to.be.eq(currenciesPage.successfulUpdateMessage);
+    expect(result).to.be.eq(currenciesPage.successfulUpdateMessage);
 
     const symbolCurrency = await currenciesPage.getTextColumnFromTableCurrency(page, 1, 'symbol');
-    await expect(symbolCurrency).to.be.eq(customSymbol);
+    expect(symbolCurrency).to.be.eq(customSymbol);
   });
 
   it(`should edit the currency '${Currencies.euro.isoCode}'`, async function () {
@@ -136,33 +136,33 @@ describe('CLDR : Reset symbol / format settings', async () => {
     await currenciesPage.goToEditCurrencyPage(page, 1);
 
     const pageTitle = await addCurrencyPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(addCurrencyPage.pageTitleEdit(Currencies.euro.name));
+    expect(pageTitle).to.contains(addCurrencyPage.pageTitleEdit(Currencies.euro.name));
   });
 
   it('should reset the currency format', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetCurrencyFormat', baseContext);
 
     const growlMessage = await addCurrencyPage.resetCurrencyFormat(page, 1);
-    await expect(growlMessage).to.be.eq(addCurrencyPage.resetCurrencyFormatMessage);
+    expect(growlMessage).to.be.eq(addCurrencyPage.resetCurrencyFormatMessage);
 
     const exampleFormat = await addCurrencyPage.getTextColumnFromTable(page, 1, 2);
-    await expect(exampleFormat).to.startWith(Currencies.euro.symbol);
+    expect(exampleFormat).to.startWith(Currencies.euro.symbol);
   });
 
   it('should update the currency', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetCurrency', baseContext);
 
     const result = await addCurrencyPage.saveCurrencyForm(page);
-    await expect(result).to.be.eq(currenciesPage.successfulUpdateMessage);
+    expect(result).to.be.eq(currenciesPage.successfulUpdateMessage);
 
     const symbolCurrency = await currenciesPage.getTextColumnFromTableCurrency(page, 1, 'symbol');
-    await expect(symbolCurrency).to.be.eq(Currencies.euro.symbol);
+    expect(symbolCurrency).to.be.eq(Currencies.euro.symbol);
   });
 
   it('should reset all filters', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilter1', baseContext);
 
     numberOfCurrencies = await currenciesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfCurrencies).to.be.above(0);
+    expect(numberOfCurrencies).to.be.above(0);
   });
 });
diff --git a/tests/UI/campaigns/cldr/09_enableDisableCurrency.ts b/tests/UI/campaigns/cldr/09_enableDisableCurrency.ts
index acdcc8852e12d..2333bc4312f97 100644
--- a/tests/UI/campaigns/cldr/09_enableDisableCurrency.ts
+++ b/tests/UI/campaigns/cldr/09_enableDisableCurrency.ts
@@ -55,7 +55,7 @@ describe('CLDR : Enable/Disable a currency', async () => {
     await localizationPage.closeSfToolBar(page);
 
     const pageTitle = await localizationPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(localizationPage.pageTitle);
+    expect(pageTitle).to.contains(localizationPage.pageTitle);
   });
 
   it('should go to Currencies Tab', async function () {
@@ -64,14 +64,14 @@ describe('CLDR : Enable/Disable a currency', async () => {
     await localizationPage.goToSubTabCurrencies(page);
 
     const pageTitle = await currenciesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(currenciesPage.pageTitle);
+    expect(pageTitle).to.contains(currenciesPage.pageTitle);
   });
 
   it('should reset all filters', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilter0', baseContext);
 
     numberOfCurrencies = await currenciesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfCurrencies).to.be.above(0);
+    expect(numberOfCurrencies).to.be.above(0);
   });
 
   it(`should filter by iso code of currency '${Currencies.euro.isoCode}'`, async function () {
@@ -82,31 +82,31 @@ describe('CLDR : Enable/Disable a currency', async () => {
 
     // Check number of currencies
     const numberOfCurrenciesAfterFilter = await currenciesPage.getNumberOfElementInGrid(page);
-    await expect(numberOfCurrenciesAfterFilter).to.be.equal(1);
+    expect(numberOfCurrenciesAfterFilter).to.be.equal(1);
 
     // Check currency created
     const textColumn = await currenciesPage.getTextColumnFromTableCurrency(page, 1, 'iso_code');
-    await expect(textColumn).to.contains(Currencies.euro.isoCode);
+    expect(textColumn).to.contains(Currencies.euro.isoCode);
   });
 
   it('should disable the default currency and check the error message', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'disableCurrency', baseContext);
 
     const isActionPerformed = await currenciesPage.setStatus(page, 1, false);
-    await expect(isActionPerformed).to.be.true;
+    expect(isActionPerformed).to.eq(true);
 
     const resultMessage = await currenciesPage.getAlertDangerBlockParagraphContent(page);
-    await expect(resultMessage).to.contains(currenciesPage.cannotDisableDefaultCurrencyMessage);
+    expect(resultMessage).to.contains(currenciesPage.cannotDisableDefaultCurrencyMessage);
 
     const currencyStatus = await currenciesPage.getStatus(page, 1);
-    await expect(currencyStatus).to.be.true;
+    expect(currencyStatus).to.eq(true);
   });
 
   it('should reset all filters', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilter1', baseContext);
 
     numberOfCurrencies = await currenciesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfCurrencies).to.be.above(0);
+    expect(numberOfCurrencies).to.be.above(0);
   });
 
   it('should go to create new currency page', async function () {
@@ -115,7 +115,7 @@ describe('CLDR : Enable/Disable a currency', async () => {
     await currenciesPage.goToAddNewCurrencyPage(page);
 
     const pageTitle = await addCurrencyPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(addCurrencyPage.pageTitle);
+    expect(pageTitle).to.contains(addCurrencyPage.pageTitle);
   });
 
   it('should create official currency', async function () {
@@ -123,11 +123,11 @@ describe('CLDR : Enable/Disable a currency', async () => {
 
     // Create and check successful message
     const textResult = await addCurrencyPage.addOfficialCurrency(page, currencyDollar);
-    await expect(textResult).to.contains(currenciesPage.successfulCreationMessage);
+    expect(textResult).to.contains(currenciesPage.successfulCreationMessage);
 
     // Check number of currencies after creation
     const numberOfCurrenciesAfterCreation = await currenciesPage.getNumberOfElementInGrid(page);
-    await expect(numberOfCurrenciesAfterCreation).to.be.equal(numberOfCurrencies + 1);
+    expect(numberOfCurrenciesAfterCreation).to.be.equal(numberOfCurrencies + 1);
   });
 
   it(`should filter by iso code of currency '${currencyDollar.isoCode}'`, async function () {
@@ -138,24 +138,24 @@ describe('CLDR : Enable/Disable a currency', async () => {
 
     // Check number of currencies
     const numberOfCurrenciesAfterFilter = await currenciesPage.getNumberOfElementInGrid(page);
-    await expect(numberOfCurrenciesAfterFilter).to.be.equal(1);
+    expect(numberOfCurrenciesAfterFilter).to.be.equal(1);
 
     // Check currency created
     const textColumn = await currenciesPage.getTextColumnFromTableCurrency(page, 1, 'iso_code');
-    await expect(textColumn).to.contains(currencyDollar.isoCode);
+    expect(textColumn).to.contains(currencyDollar.isoCode);
   });
 
   it(`should enable the currency '${currencyDollar.isoCode}'`, async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'enableDollarCurrency', baseContext);
 
     const isActionPerformed = await currenciesPage.setStatus(page, 1, true);
-    await expect(isActionPerformed).to.be.true;
+    expect(isActionPerformed).to.eq(true);
 
     const resultMessage = await currenciesPage.getAlertSuccessBlockParagraphContent(page);
-    await expect(resultMessage).to.contains(currenciesPage.successfulUpdateStatusMessage);
+    expect(resultMessage).to.contains(currenciesPage.successfulUpdateStatusMessage);
 
     const currencyStatus = await currenciesPage.getStatus(page, 1);
-    await expect(currencyStatus).to.be.true;
+    expect(currencyStatus).to.eq(true);
   });
 
   it('should go to Localization Tab', async function () {
@@ -164,14 +164,14 @@ describe('CLDR : Enable/Disable a currency', async () => {
     await localizationPage.goToSubTabLocalizations(page);
 
     const pageTitle = await localizationPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(localizationPage.pageTitle);
+    expect(pageTitle).to.contains(localizationPage.pageTitle);
   });
 
   it(`should choose '${currencyDollar.isoCode}' as default currency`, async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'setDollarAsDefaultCurrency', baseContext);
 
     const textResult = await localizationPage.setDefaultCurrency(page, `${currencyDollar.name} (${currencyDollar.isoCode})`);
-    await expect(textResult).to.contain(localizationPage.successfulSettingsUpdateMessage);
+    expect(textResult).to.contain(localizationPage.successfulSettingsUpdateMessage);
   });
 
   it('should go to Currencies Tab', async function () {
@@ -180,7 +180,7 @@ describe('CLDR : Enable/Disable a currency', async () => {
     await localizationPage.goToSubTabCurrencies(page);
 
     const pageTitle = await currenciesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(currenciesPage.pageTitle);
+    expect(pageTitle).to.contains(currenciesPage.pageTitle);
   });
 
   it(`should filter by iso code of currency '${Currencies.euro.isoCode}'`, async function () {
@@ -191,37 +191,37 @@ describe('CLDR : Enable/Disable a currency', async () => {
 
     // Check number of currencies
     const numberOfCurrenciesAfterFilter = await currenciesPage.getNumberOfElementInGrid(page);
-    await expect(numberOfCurrenciesAfterFilter).to.be.equal(1);
+    expect(numberOfCurrenciesAfterFilter).to.be.equal(1);
 
     // Check currency created
     const textColumn = await currenciesPage.getTextColumnFromTableCurrency(page, 1, 'iso_code');
-    await expect(textColumn).to.contains(Currencies.euro.isoCode);
+    expect(textColumn).to.contains(Currencies.euro.isoCode);
   });
 
   it(`should disable the currency '${Currencies.euro.isoCode}'`, async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'disableEuroCurrency', baseContext);
 
     const isActionPerformed = await currenciesPage.setStatus(page, 1, false);
-    await expect(isActionPerformed).to.be.true;
+    expect(isActionPerformed).to.eq(true);
 
     const resultMessage = await currenciesPage.getAlertSuccessBlockParagraphContent(page);
-    await expect(resultMessage).to.contains(currenciesPage.successfulUpdateStatusMessage);
+    expect(resultMessage).to.contains(currenciesPage.successfulUpdateStatusMessage);
 
     const currencyStatus = await currenciesPage.getStatus(page, 1);
-    await expect(currencyStatus).to.be.false;
+    expect(currencyStatus).to.eq(false);
   });
 
   it(`should enable the currency '${Currencies.euro.isoCode}'`, async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'enableEuroCurrency', baseContext);
 
     const isActionPerformed = await currenciesPage.setStatus(page, 1, true);
-    await expect(isActionPerformed).to.be.true;
+    expect(isActionPerformed).to.eq(true);
 
     const resultMessage = await currenciesPage.getAlertSuccessBlockParagraphContent(page);
-    await expect(resultMessage).to.contains(currenciesPage.successfulUpdateStatusMessage);
+    expect(resultMessage).to.contains(currenciesPage.successfulUpdateStatusMessage);
 
     const currencyStatus = await currenciesPage.getStatus(page, 1);
-    await expect(currencyStatus).to.be.true;
+    expect(currencyStatus).to.eq(true);
   });
 
   it('should go to Localization Tab', async function () {
@@ -230,14 +230,14 @@ describe('CLDR : Enable/Disable a currency', async () => {
     await localizationPage.goToSubTabLocalizations(page);
 
     const pageTitle = await localizationPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(localizationPage.pageTitle);
+    expect(pageTitle).to.contains(localizationPage.pageTitle);
   });
 
   it(`should choose '${Currencies.euro.isoCode}' as default currency`, async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'setEuroAsDefaultCurrency', baseContext);
 
     const textResult = await localizationPage.setDefaultCurrency(page, `${Currencies.euro.name} (${Currencies.euro.isoCode})`);
-    await expect(textResult).to.contain(localizationPage.successfulSettingsUpdateMessage);
+    expect(textResult).to.contain(localizationPage.successfulSettingsUpdateMessage);
   });
 
   it('should go to Currencies Tab', async function () {
@@ -246,7 +246,7 @@ describe('CLDR : Enable/Disable a currency', async () => {
     await localizationPage.goToSubTabCurrencies(page);
 
     const pageTitle = await currenciesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(currenciesPage.pageTitle);
+    expect(pageTitle).to.contains(currenciesPage.pageTitle);
   });
 
   it(`should filter by iso code of currency '${currencyDollar.isoCode}'`, async function () {
@@ -257,24 +257,24 @@ describe('CLDR : Enable/Disable a currency', async () => {
 
     // Check number of currencies
     const numberOfCurrenciesAfterFilter = await currenciesPage.getNumberOfElementInGrid(page);
-    await expect(numberOfCurrenciesAfterFilter).to.be.equal(1);
+    expect(numberOfCurrenciesAfterFilter).to.be.equal(1);
 
     // Check currency
     const textColumn = await currenciesPage.getTextColumnFromTableCurrency(page, 1, 'iso_code');
-    await expect(textColumn).to.contains(currencyDollar.isoCode);
+    expect(textColumn).to.contains(currencyDollar.isoCode);
   });
 
   it('should delete currency', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'deleteCurrency', baseContext);
 
     const result = await currenciesPage.deleteCurrency(page, 1);
-    await expect(result).to.be.equal(currenciesPage.successfulDeleteMessage);
+    expect(result).to.be.equal(currenciesPage.successfulDeleteMessage);
   });
 
   it('should reset filters', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterDelete', baseContext);
 
     const numberOfCurrenciesAfterReset = await currenciesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfCurrenciesAfterReset).to.be.equal(numberOfCurrencies);
+    expect(numberOfCurrenciesAfterReset).to.be.equal(numberOfCurrencies);
   });
 });
diff --git a/tests/UI/campaigns/functional/API/01_basicTest.ts b/tests/UI/campaigns/functional/API/01_basicTest.ts
index cf8beb38240bd..9a3f91bf0bd34 100644
--- a/tests/UI/campaigns/functional/API/01_basicTest.ts
+++ b/tests/UI/campaigns/functional/API/01_basicTest.ts
@@ -19,14 +19,14 @@ describe('API : Basic Test', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'requestNewApi', baseContext);
 
       const apiResponse = await apiContext.get('api/');
-      await expect(apiResponse.status()).to.eq(404);
+      expect(apiResponse.status()).to.eq(404);
     });
 
     it('should request the endpoint /admin-dev/api/hook-status', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'requestNewApiHookStatus', baseContext);
 
       const apiResponse = await apiContext.get('api/hook-status');
-      await expect(apiResponse.status()).to.eq(405);
+      expect(apiResponse.status()).to.eq(405);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/01_internalAuthServer/01_authorizationEndpoint.ts b/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/01_internalAuthServer/01_authorizationEndpoint.ts
index ee5bec7330ee8..d1a8638724c96 100644
--- a/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/01_internalAuthServer/01_authorizationEndpoint.ts
+++ b/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/01_internalAuthServer/01_authorizationEndpoint.ts
@@ -19,14 +19,14 @@ describe('API : Internal Auth Server - Authorization Endpoint', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'requestAuthWithMethodGET', baseContext);
 
       const apiResponse = await apiContext.get('api/oauth2/token');
-      await expect(apiResponse.status()).to.eq(405);
+      expect(apiResponse.status()).to.eq(405);
     });
 
     it('should request the endpoint /admin-dev/api/oauth2/token with method POST', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'requestAuthWithMethodPOST', baseContext);
 
       const apiResponse = await apiContext.post('api/oauth2/token');
-      await expect(apiResponse.status()).to.eq(400);
+      expect(apiResponse.status()).to.eq(400);
     });
 
     it('should request the endpoint /admin-dev/api/oauth2/token with method POST with unuseful data', async function () {
@@ -37,7 +37,7 @@ describe('API : Internal Auth Server - Authorization Endpoint', async () => {
           notUsed: 'notUsed',
         },
       });
-      await expect(apiResponse.status()).to.eq(400);
+      expect(apiResponse.status()).to.eq(400);
     });
 
     it('should request the endpoint /admin-dev/api/oauth2/token with method POST with invalid data', async function () {
@@ -50,7 +50,7 @@ describe('API : Internal Auth Server - Authorization Endpoint', async () => {
           grant_type: 'client_credentials',
         },
       });
-      await expect(apiResponse.status()).to.eq(401);
+      expect(apiResponse.status()).to.eq(401);
     });
 
     it('should request the endpoint /admin-dev/api/oauth2/token with method POST with valid + unuseful data', async function () {
@@ -64,7 +64,7 @@ describe('API : Internal Auth Server - Authorization Endpoint', async () => {
           notUsed: 'notUsed',
         },
       });
-      await expect(apiResponse.status()).to.eq(200);
+      expect(apiResponse.status()).to.eq(200);
     });
 
     it('should request the endpoint /admin-dev/api/oauth2/token with method POST with valid data', async function () {
@@ -78,17 +78,17 @@ describe('API : Internal Auth Server - Authorization Endpoint', async () => {
           grant_type: 'client_credentials',
         },
       });
-      await expect(apiResponse.status()).to.eq(200);
-      await expect(api.hasResponseHeader(apiResponse, 'Content-Type')).to.be.true;
-      await expect(api.getResponseHeader(apiResponse, 'Content-Type')).to.contains('application/json');
+      expect(apiResponse.status()).to.eq(200);
+      expect(api.hasResponseHeader(apiResponse, 'Content-Type')).to.eq(true);
+      expect(api.getResponseHeader(apiResponse, 'Content-Type')).to.contains('application/json');
 
       const jsonResponse = await apiResponse.json();
-      await expect(jsonResponse).to.have.property('token_type');
-      await expect(jsonResponse.token_type).to.be.eq('Bearer');
-      await expect(jsonResponse).to.have.property('expires_in');
-      await expect(jsonResponse.expires_in).to.be.eq(3600);
-      await expect(jsonResponse).to.have.property('access_token');
-      await expect(jsonResponse.token_type).to.be.a('string');
+      expect(jsonResponse).to.have.property('token_type');
+      expect(jsonResponse.token_type).to.be.eq('Bearer');
+      expect(jsonResponse).to.have.property('expires_in');
+      expect(jsonResponse.expires_in).to.be.eq(3600);
+      expect(jsonResponse).to.have.property('access_token');
+      expect(jsonResponse.token_type).to.be.a('string');
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/01_internalAuthServer/02_resourceEndpoint.ts b/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/01_internalAuthServer/02_resourceEndpoint.ts
index daa28092bff0d..72302254451bb 100644
--- a/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/01_internalAuthServer/02_resourceEndpoint.ts
+++ b/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/01_internalAuthServer/02_resourceEndpoint.ts
@@ -28,11 +28,11 @@ describe('API : Internal Auth Server - Resource Endpoint', async () => {
           grant_type: 'client_credentials',
         },
       });
-      await expect(apiResponse.status()).to.eq(200);
+      expect(apiResponse.status()).to.eq(200);
 
       const jsonResponse = await apiResponse.json();
-      await expect(jsonResponse).to.have.property('access_token');
-      await expect(jsonResponse.access_token).to.be.a('string');
+      expect(jsonResponse).to.have.property('access_token');
+      expect(jsonResponse.access_token).to.be.a('string');
 
       accessToken = jsonResponse.access_token;
       accessTokenExpired = api.setAccessTokenAsExpired(accessToken);
@@ -42,9 +42,9 @@ describe('API : Internal Auth Server - Resource Endpoint', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'requestEndpointWithoutAccessToken', baseContext);
 
       const apiResponse = await apiContext.get('api/hook-status/1');
-      await expect(apiResponse.status()).to.eq(401);
-      await expect(api.hasResponseHeader(apiResponse, 'WWW-Authenticate')).to.be.true;
-      await expect(api.getResponseHeader(apiResponse, 'WWW-Authenticate')).to.be.eq('Bearer');
+      expect(apiResponse.status()).to.eq(401);
+      expect(api.hasResponseHeader(apiResponse, 'WWW-Authenticate')).to.eq(true);
+      expect(api.getResponseHeader(apiResponse, 'WWW-Authenticate')).to.be.eq('Bearer');
     });
 
     it('should request the endpoint /admin-dev/api/hook-status/1 with invalid access token', async function () {
@@ -55,9 +55,9 @@ describe('API : Internal Auth Server - Resource Endpoint', async () => {
           Authorization: 'Bearer INVALIDTOKEN',
         },
       });
-      await expect(apiResponse.status()).to.eq(401);
-      await expect(api.hasResponseHeader(apiResponse, 'WWW-Authenticate')).to.be.true;
-      await expect(api.getResponseHeader(apiResponse, 'WWW-Authenticate')).to.be.eq('Bearer');
+      expect(apiResponse.status()).to.eq(401);
+      expect(api.hasResponseHeader(apiResponse, 'WWW-Authenticate')).to.eq(true);
+      expect(api.getResponseHeader(apiResponse, 'WWW-Authenticate')).to.be.eq('Bearer');
     });
 
     it('should request the endpoint /admin-dev/api/hook-status/1 with expired access token', async function () {
@@ -68,9 +68,9 @@ describe('API : Internal Auth Server - Resource Endpoint', async () => {
           Authorization: `Bearer ${accessTokenExpired}`,
         },
       });
-      await expect(apiResponse.status()).to.eq(401);
-      await expect(api.hasResponseHeader(apiResponse, 'WWW-Authenticate')).to.be.true;
-      await expect(api.getResponseHeader(apiResponse, 'WWW-Authenticate')).to.be.eq('Bearer');
+      expect(apiResponse.status()).to.eq(401);
+      expect(api.hasResponseHeader(apiResponse, 'WWW-Authenticate')).to.eq(true);
+      expect(api.getResponseHeader(apiResponse, 'WWW-Authenticate')).to.be.eq('Bearer');
     });
 
     it('should request the endpoint /admin-dev/api/hook-status/1 with valid access token', async function () {
@@ -81,15 +81,15 @@ describe('API : Internal Auth Server - Resource Endpoint', async () => {
           Authorization: `Bearer ${accessToken}`,
         },
       });
-      await expect(apiResponse.status()).to.eq(200);
-      await expect(api.hasResponseHeader(apiResponse, 'Content-Type')).to.be.true;
-      await expect(api.getResponseHeader(apiResponse, 'Content-Type')).to.contains('application/json');
+      expect(apiResponse.status()).to.eq(200);
+      expect(api.hasResponseHeader(apiResponse, 'Content-Type')).to.eq(true);
+      expect(api.getResponseHeader(apiResponse, 'Content-Type')).to.contains('application/json');
 
       const jsonResponse = await apiResponse.json();
-      await expect(jsonResponse).to.have.property('id');
-      await expect(jsonResponse.id).to.be.a('number');
-      await expect(jsonResponse).to.have.property('active');
-      await expect(jsonResponse.active).to.be.a('boolean');
+      expect(jsonResponse).to.have.property('id');
+      expect(jsonResponse.id).to.be.a('number');
+      expect(jsonResponse).to.have.property('active');
+      expect(jsonResponse.active).to.be.a('boolean');
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/01_authorizationEndpoint.ts b/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/01_authorizationEndpoint.ts
index c33a06e19c6dd..ffcc90f57c6cd 100644
--- a/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/01_authorizationEndpoint.ts
+++ b/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/01_authorizationEndpoint.ts
@@ -32,14 +32,14 @@ describe.skip('API : External Auth Server - Authorization Endpoint', async () =>
         false,
         true,
       );
-      await expect(accessTokenKeycloak.length).to.be.gt(0);
+      expect(accessTokenKeycloak.length).to.be.gt(0);
     }
   });
 
   after(async () => {
     if (!global.GENERATE_FAILED_STEPS) {
       const isRemoved: boolean = await keycloakHelper.removeClient(global.keycloakConfig.keycloakClientId);
-      await expect(isRemoved).to.be.true;
+      expect(isRemoved).to.eq(true);
     }
   });
 
@@ -48,14 +48,14 @@ describe.skip('API : External Auth Server - Authorization Endpoint', async () =>
       await testContext.addContextItem(this, 'testIdentifier', 'requestAuthWithMethodGET', baseContext);
 
       const apiResponse = await apiContextBO.get('api/oauth2/token');
-      await expect(apiResponse.status()).to.eq(405);
+      expect(apiResponse.status()).to.eq(405);
     });
 
     it('should request the endpoint /admin-dev/api/oauth2/token with method POST', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'requestAuthWithMethodPOST', baseContext);
 
       const apiResponse = await apiContextBO.post('api/oauth2/token');
-      await expect(apiResponse.status()).to.eq(400);
+      expect(apiResponse.status()).to.eq(400);
     });
 
     it('should request the endpoint /admin-dev/api/oauth2/token with method POST with unuseful data', async function () {
@@ -66,7 +66,7 @@ describe.skip('API : External Auth Server - Authorization Endpoint', async () =>
           notUsed: 'notUsed',
         },
       });
-      await expect(apiResponse.status()).to.eq(400);
+      expect(apiResponse.status()).to.eq(400);
     });
 
     it('should request the endpoint /admin-dev/api/oauth2/token with method POST with invalid data', async function () {
@@ -79,7 +79,7 @@ describe.skip('API : External Auth Server - Authorization Endpoint', async () =>
           grant_type: 'client_credentials',
         },
       });
-      await expect(apiResponse.status()).to.eq(401);
+      expect(apiResponse.status()).to.eq(401);
     });
 
     it('should request the endpoint /admin-dev/api/oauth2/token with method POST with valid + unuseful data', async function () {
@@ -93,7 +93,7 @@ describe.skip('API : External Auth Server - Authorization Endpoint', async () =>
           notUsed: 'notUsed',
         },
       });
-      await expect(apiResponse.status()).to.eq(200);
+      expect(apiResponse.status()).to.eq(200);
     });
 
     it('should request the endpoint /admin-dev/api/oauth2/token with method POST with valid data', async function () {
@@ -107,17 +107,17 @@ describe.skip('API : External Auth Server - Authorization Endpoint', async () =>
           grant_type: 'client_credentials',
         },
       });
-      await expect(apiResponse.status()).to.eq(200);
-      await expect(api.hasResponseHeader(apiResponse, 'Content-Type')).to.be.true;
-      await expect(api.getResponseHeader(apiResponse, 'Content-Type')).to.contains('application/json');
+      expect(apiResponse.status()).to.eq(200);
+      expect(api.hasResponseHeader(apiResponse, 'Content-Type')).to.eq(true);
+      expect(api.getResponseHeader(apiResponse, 'Content-Type')).to.contains('application/json');
 
       const jsonResponse = await apiResponse.json();
-      await expect(jsonResponse).to.have.property('token_type');
-      await expect(jsonResponse.token_type).to.be.eq('Bearer');
-      await expect(jsonResponse).to.have.property('expires_in');
-      await expect(jsonResponse.expires_in).to.be.eq(3600);
-      await expect(jsonResponse).to.have.property('access_token');
-      await expect(jsonResponse.token_type).to.be.a('string');
+      expect(jsonResponse).to.have.property('token_type');
+      expect(jsonResponse.token_type).to.be.eq('Bearer');
+      expect(jsonResponse).to.have.property('expires_in');
+      expect(jsonResponse.expires_in).to.be.eq(3600);
+      expect(jsonResponse).to.have.property('access_token');
+      expect(jsonResponse.token_type).to.be.a('string');
     });
 
     it(
@@ -132,17 +132,17 @@ describe.skip('API : External Auth Server - Authorization Endpoint', async () =>
             grant_type: 'client_credentials',
           },
         });
-        await expect(apiResponse.status()).to.eq(200);
-        await expect(api.hasResponseHeader(apiResponse, 'Content-Type')).to.be.true;
-        await expect(api.getResponseHeader(apiResponse, 'Content-Type')).to.contains('application/json');
+        expect(apiResponse.status()).to.eq(200);
+        expect(api.hasResponseHeader(apiResponse, 'Content-Type')).to.eq(true);
+        expect(api.getResponseHeader(apiResponse, 'Content-Type')).to.contains('application/json');
 
         const jsonResponse = await apiResponse.json();
-        await expect(jsonResponse).to.have.property('token_type');
-        await expect(jsonResponse.token_type).to.be.eq('Bearer');
-        await expect(jsonResponse).to.have.property('expires_in');
-        await expect(jsonResponse.expires_in).to.be.eq(60);
-        await expect(jsonResponse).to.have.property('access_token');
-        await expect(jsonResponse.token_type).to.be.a('string');
+        expect(jsonResponse).to.have.property('token_type');
+        expect(jsonResponse.token_type).to.be.eq('Bearer');
+        expect(jsonResponse).to.have.property('expires_in');
+        expect(jsonResponse.expires_in).to.be.eq(60);
+        expect(jsonResponse).to.have.property('access_token');
+        expect(jsonResponse.token_type).to.be.a('string');
       },
     );
   });
diff --git a/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts b/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts
index b23f063601620..28e28b0e27578 100644
--- a/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts
+++ b/tests/UI/campaigns/functional/API/01_clientCredentialGrantFlow/02_externalAuthServer/02_resourceEndpoint.ts
@@ -49,7 +49,7 @@ describe.skip('API : External Auth Server - Resource Endpoint', async () => {
         false,
         true,
       );
-      await expect(clientSecretKeycloak.length).to.be.gt(0);
+      expect(clientSecretKeycloak.length).to.be.gt(0);
 
       const apiResponse: APIResponse = await apiContextKeycloak.post('realms/master/protocol/openid-connect/token', {
         form: {
@@ -58,11 +58,11 @@ describe.skip('API : External Auth Server - Resource Endpoint', async () => {
           grant_type: 'client_credentials',
         },
       });
-      await expect(apiResponse.status()).to.eq(200);
+      expect(apiResponse.status()).to.eq(200);
 
       const jsonResponse = await apiResponse.json();
-      await expect(jsonResponse).to.have.property('access_token');
-      await expect(jsonResponse.access_token).to.be.a('string');
+      expect(jsonResponse).to.have.property('access_token');
+      expect(jsonResponse.access_token).to.be.a('string');
 
       accessTokenKeycloak = jsonResponse.access_token;
       accessTokenExpiredKeycloak = api.setAccessTokenAsExpired(accessTokenKeycloak);
@@ -74,7 +74,7 @@ describe.skip('API : External Auth Server - Resource Endpoint', async () => {
 
     if (!global.GENERATE_FAILED_STEPS) {
       const isRemoved: boolean = await keycloakHelper.removeClient(global.keycloakConfig.keycloakClientId);
-      await expect(isRemoved).to.be.true;
+      expect(isRemoved).to.eq(true);
     }
   });
 
@@ -96,14 +96,14 @@ describe.skip('API : External Auth Server - Resource Endpoint', async () => {
       await moduleManagerPage.closeSfToolBar(page);
 
       const pageTitle = await moduleManagerPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
+      expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
     });
 
     it(`should search the module '${Modules.keycloak.name}'`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'searchModule', baseContext);
 
       const isModuleVisible = await moduleManagerPage.searchModule(page, Modules.keycloak);
-      await expect(isModuleVisible, 'Module is not visible!').to.be.true;
+      expect(isModuleVisible, 'Module is not visible!').to.eq(true);
     });
 
     it(`should go to the configuration page of the module '${Modules.keycloak.name}'`, async function () {
@@ -112,7 +112,7 @@ describe.skip('API : External Auth Server - Resource Endpoint', async () => {
       await moduleManagerPage.goToConfigurationPage(page, Modules.keycloak.tag);
 
       const pageTitle = await keycloakConnectorDemo.getPageTitle(page);
-      await expect(pageTitle).to.eq(keycloakConnectorDemo.pageTitle);
+      expect(pageTitle).to.eq(keycloakConnectorDemo.pageTitle);
     });
 
     it('should define the Keycloak Realm endpoint', async function () {
@@ -122,16 +122,16 @@ describe.skip('API : External Auth Server - Resource Endpoint', async () => {
         page,
         `${global.keycloakConfig.keycloakInternalUrl}/realms/master`,
       );
-      await expect(textResult).to.be.eq(keycloakConnectorDemo.successfulUpdateMessage);
+      expect(textResult).to.be.eq(keycloakConnectorDemo.successfulUpdateMessage);
     });
 
     it('should request the endpoint /admin-dev/api/hook-status/1 without access token', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'requestEndpointWithoutAccessToken', baseContext);
 
       const apiResponse = await apiContext.get('api/hook-status/1');
-      await expect(apiResponse.status()).to.eq(401);
-      await expect(api.hasResponseHeader(apiResponse, 'WWW-Authenticate')).to.be.true;
-      await expect(api.getResponseHeader(apiResponse, 'WWW-Authenticate')).to.be.eq('Bearer');
+      expect(apiResponse.status()).to.eq(401);
+      expect(api.hasResponseHeader(apiResponse, 'WWW-Authenticate')).to.eq(true);
+      expect(api.getResponseHeader(apiResponse, 'WWW-Authenticate')).to.be.eq('Bearer');
     });
 
     it('should request the endpoint /admin-dev/api/hook-status/1 with invalid access token', async function () {
@@ -142,9 +142,9 @@ describe.skip('API : External Auth Server - Resource Endpoint', async () => {
           Authorization: 'Bearer INVALIDTOKEN',
         },
       });
-      await expect(apiResponse.status()).to.eq(401);
-      await expect(api.hasResponseHeader(apiResponse, 'WWW-Authenticate')).to.be.true;
-      await expect(api.getResponseHeader(apiResponse, 'WWW-Authenticate')).to.be.eq('Bearer');
+      expect(apiResponse.status()).to.eq(401);
+      expect(api.hasResponseHeader(apiResponse, 'WWW-Authenticate')).to.eq(true);
+      expect(api.getResponseHeader(apiResponse, 'WWW-Authenticate')).to.be.eq('Bearer');
     });
 
     it('should request the endpoint /admin-dev/api/hook-status/1 with expired access token', async function () {
@@ -156,9 +156,9 @@ describe.skip('API : External Auth Server - Resource Endpoint', async () => {
         },
       });
 
-      await expect(apiResponse.status()).to.eq(401);
-      await expect(api.hasResponseHeader(apiResponse, 'WWW-Authenticate')).to.be.true;
-      await expect(api.getResponseHeader(apiResponse, 'WWW-Authenticate')).to.be.eq('Bearer');
+      expect(apiResponse.status()).to.eq(401);
+      expect(api.hasResponseHeader(apiResponse, 'WWW-Authenticate')).to.eq(true);
+      expect(api.getResponseHeader(apiResponse, 'WWW-Authenticate')).to.be.eq('Bearer');
     });
 
     it('should request the endpoint /admin-dev/api/hook-status/1 with valid access token', async function () {
@@ -170,15 +170,15 @@ describe.skip('API : External Auth Server - Resource Endpoint', async () => {
         },
       });
 
-      await expect(apiResponse.status()).to.eq(200);
-      await expect(api.hasResponseHeader(apiResponse, 'Content-Type')).to.be.true;
-      await expect(api.getResponseHeader(apiResponse, 'Content-Type')).to.contains('application/json');
+      expect(apiResponse.status()).to.eq(200);
+      expect(api.hasResponseHeader(apiResponse, 'Content-Type')).to.eq(true);
+      expect(api.getResponseHeader(apiResponse, 'Content-Type')).to.contains('application/json');
 
       const jsonResponse = await apiResponse.json();
-      await expect(jsonResponse).to.have.property('id');
-      await expect(jsonResponse.id).to.be.a('number');
-      await expect(jsonResponse).to.have.property('active');
-      await expect(jsonResponse.active).to.be.a('boolean');
+      expect(jsonResponse).to.have.property('id');
+      expect(jsonResponse.id).to.be.a('number');
+      expect(jsonResponse).to.have.property('active');
+      expect(jsonResponse.active).to.be.a('boolean');
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/00_login/01_passwordReminder.ts b/tests/UI/campaigns/functional/BO/00_login/01_passwordReminder.ts
index cea0b5afc3972..17bf49d88ee68 100644
--- a/tests/UI/campaigns/functional/BO/00_login/01_passwordReminder.ts
+++ b/tests/UI/campaigns/functional/BO/00_login/01_passwordReminder.ts
@@ -88,14 +88,14 @@ describe('BO - Login : Password reminder', async () => {
       );
 
       const pageTitle = await employeesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(employeesPage.pageTitle);
+      expect(pageTitle).to.contains(employeesPage.pageTitle);
     });
 
     it('should reset all filters and get number of employees', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
       numberOfEmployees = await employeesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfEmployees).to.be.above(0);
+      expect(numberOfEmployees).to.be.above(0);
     });
 
     it('should go to add new employee page', async function () {
@@ -104,14 +104,14 @@ describe('BO - Login : Password reminder', async () => {
       await employeesPage.goToAddNewEmployeePage(page);
 
       const pageTitle = await addEmployeePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addEmployeePage.pageTitleCreate);
+      expect(pageTitle).to.contains(addEmployeePage.pageTitleCreate);
     });
 
     it('should create employee and check result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createEmployee', baseContext);
 
       const textResult = await addEmployeePage.createEditEmployee(page, createEmployeeData);
-      await expect(textResult).to.equal(employeesPage.successfulCreationMessage);
+      expect(textResult).to.equal(employeesPage.successfulCreationMessage);
     });
 
     it('should logout from BO', async function () {
@@ -126,7 +126,7 @@ describe('BO - Login : Password reminder', async () => {
       await loginPage.goTo(page, global.BO.URL);
 
       const pageTitle = await loginPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(loginPage.pageTitle);
+      expect(pageTitle).to.contains(loginPage.pageTitle);
     });
 
     it('should send reset password mail', async function () {
@@ -135,13 +135,13 @@ describe('BO - Login : Password reminder', async () => {
       await loginPage.sendResetPasswordLink(page, createEmployeeData.email);
 
       const successTextContent = await loginPage.getResetPasswordSuccessMessage(page);
-      await expect(successTextContent).to.contains(loginPage.resetPasswordSuccessText);
+      expect(successTextContent).to.contains(loginPage.resetPasswordSuccessText);
     });
 
     it('should check if reset password mail is in mailbox', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkIfResetPasswordMailIsInMailbox', baseContext);
 
-      await expect(newMail.subject).to.contains(resetPasswordMailSubject);
+      expect(newMail.subject).to.contains(resetPasswordMailSubject);
     });
   });
 
@@ -160,7 +160,7 @@ describe('BO - Login : Password reminder', async () => {
       );
 
       const pageTitle = await employeesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(employeesPage.pageTitle);
+      expect(pageTitle).to.contains(employeesPage.pageTitle);
     });
 
     it('should filter list of employees by email', async function () {
@@ -174,21 +174,21 @@ describe('BO - Login : Password reminder', async () => {
       );
 
       const textEmail = await employeesPage.getTextColumnFromTable(page, 1, 'email');
-      await expect(textEmail).to.contains(createEmployeeData.email);
+      expect(textEmail).to.contains(createEmployeeData.email);
     });
 
     it('should delete employee', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteEmployee', baseContext);
 
       const textResult = await employeesPage.deleteEmployee(page, 1);
-      await expect(textResult).to.equal(employeesPage.successfulDeleteMessage);
+      expect(textResult).to.equal(employeesPage.successfulDeleteMessage);
     });
 
     it('should reset filter and check the number of employees', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDelete', baseContext);
 
       const numberOfEmployeesAfterDelete = await employeesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfEmployeesAfterDelete).to.be.equal(numberOfEmployees);
+      expect(numberOfEmployeesAfterDelete).to.be.equal(numberOfEmployees);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/00_login/02_login.ts b/tests/UI/campaigns/functional/BO/00_login/02_login.ts
index 0609a35927dc8..36c9c333be4a3 100644
--- a/tests/UI/campaigns/functional/BO/00_login/02_login.ts
+++ b/tests/UI/campaigns/functional/BO/00_login/02_login.ts
@@ -37,7 +37,7 @@ describe('BO - Login : Login in BO', async () => {
     await loginPage.goTo(page, global.BO.URL);
 
     const pageTitle = await loginPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(loginPage.pageTitle);
+    expect(pageTitle).to.contains(loginPage.pageTitle);
   });
 
   it('should enter an invalid credentials', async function () {
@@ -46,7 +46,7 @@ describe('BO - Login : Login in BO', async () => {
     await loginPage.failedLogin(page, employeeData.email, employeeData.password);
 
     const loginError = await loginPage.getLoginError(page);
-    await expect(loginError).to.contains(loginPage.loginErrorText);
+    expect(loginError).to.contains(loginPage.loginErrorText);
   });
 
   it('should enter an invalid email', async function () {
@@ -55,7 +55,7 @@ describe('BO - Login : Login in BO', async () => {
     await loginPage.failedLogin(page, employeeData.email, Employees.DefaultEmployee.password);
 
     const loginError = await loginPage.getLoginError(page);
-    await expect(loginError).to.contains(loginPage.loginErrorText);
+    expect(loginError).to.contains(loginPage.loginErrorText);
   });
 
   it('should enter an invalid password', async function () {
@@ -64,7 +64,7 @@ describe('BO - Login : Login in BO', async () => {
     await loginPage.failedLogin(page, Employees.DefaultEmployee.email, employeeData.password);
 
     const loginError = await loginPage.getLoginError(page);
-    await expect(loginError).to.contains(loginPage.loginErrorText);
+    expect(loginError).to.contains(loginPage.loginErrorText);
   });
 
   it('should enter a valid credentials', async function () {
@@ -73,6 +73,6 @@ describe('BO - Login : Login in BO', async () => {
     await loginPage.successLogin(page, Employees.DefaultEmployee.email, Employees.DefaultEmployee.password);
 
     const pageTitle = await dashboardPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(dashboardPage.pageTitle);
+    expect(pageTitle).to.contains(dashboardPage.pageTitle);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/00_login/03_logout.ts b/tests/UI/campaigns/functional/BO/00_login/03_logout.ts
index 40c901470777a..73c3271ed7286 100644
--- a/tests/UI/campaigns/functional/BO/00_login/03_logout.ts
+++ b/tests/UI/campaigns/functional/BO/00_login/03_logout.ts
@@ -44,6 +44,6 @@ describe('BO - logout : log out from BO', async () => {
     await loginCommon.logoutBO(this, page);
 
     const pageTitle = await loginPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(loginPage.pageTitle);
+    expect(pageTitle).to.contains(loginPage.pageTitle);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/01_dashboard/01_enableDisableDemoMode.ts b/tests/UI/campaigns/functional/BO/01_dashboard/01_enableDisableDemoMode.ts
index d6f6a82d328d9..a54a4825dd0d3 100644
--- a/tests/UI/campaigns/functional/BO/01_dashboard/01_enableDisableDemoMode.ts
+++ b/tests/UI/campaigns/functional/BO/01_dashboard/01_enableDisableDemoMode.ts
@@ -37,7 +37,7 @@ describe('BO - Dashboard : Enable/Disable demo mode & check stats', async () =>
     await dashboardPage.setDemoMode(page, true);
 
     const salesScore = await dashboardPage.getSalesScore(page);
-    await expect(salesScore).to.be.above(400000);
+    expect(salesScore).to.be.above(400000);
   });
 
   it('should disable demo mode and check stats', async function () {
@@ -46,6 +46,6 @@ describe('BO - Dashboard : Enable/Disable demo mode & check stats', async () =>
     await dashboardPage.setDemoMode(page, false);
 
     const salesScore = await dashboardPage.getSalesScore(page);
-    await expect(salesScore).to.be.below(50000);
+    expect(salesScore).to.be.below(50000);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/01_helpCard.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/01_helpCard.ts
index 23081394d832b..4b476b0c89306 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/01_helpCard.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/01_helpCard.ts
@@ -44,23 +44,23 @@ describe('BO - Orders : Help card in order page', async () => {
     await ordersPage.closeSfToolBar(page);
 
     const pageTitle = await ordersPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(ordersPage.pageTitle);
+    expect(pageTitle).to.contains(ordersPage.pageTitle);
   });
 
   it('should open the help side bar and check the document language', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'openHelpSidebar', baseContext);
 
     const isHelpSidebarVisible = await ordersPage.openHelpSideBar(page);
-    await expect(isHelpSidebarVisible).to.be.true;
+    expect(isHelpSidebarVisible).to.eq(true);
 
     const documentURL = await ordersPage.getHelpDocumentURL(page);
-    await expect(documentURL).to.contains('country=en');
+    expect(documentURL).to.contains('country=en');
   });
 
   it('should close the help side bar', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'closeHelpSidebar', baseContext);
 
     const isHelpSidebarClosed = await ordersPage.closeHelpSideBar(page);
-    await expect(isHelpSidebarClosed).to.be.true;
+    expect(isHelpSidebarClosed).to.eq(true);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/02_filterOrders.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/02_filterOrders.ts
index 01bbbdfb4fc65..e70154cd3c93b 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/02_filterOrders.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/02_filterOrders.ts
@@ -53,14 +53,14 @@ describe('BO - Orders : Filter the Orders table', async () => {
     );
 
     const pageTitle = await ordersPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(ordersPage.pageTitle);
+    expect(pageTitle).to.contains(ordersPage.pageTitle);
   });
 
   it('should reset all filters and get number of orders', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFiltersFirst', baseContext);
 
     numberOfOrders = await ordersPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfOrders).to.be.above(0);
+    expect(numberOfOrders).to.be.above(0);
   });
 
   [
@@ -148,11 +148,11 @@ describe('BO - Orders : Filter the Orders table', async () => {
       );
 
       const numberOfOrdersAfterFilter = await ordersPage.getNumberOfElementInGrid(page);
-      await expect(numberOfOrdersAfterFilter).to.be.at.most(numberOfOrders);
+      expect(numberOfOrdersAfterFilter).to.be.at.most(numberOfOrders);
 
       for (let row = 1; row <= numberOfOrdersAfterFilter; row++) {
         const textColumn = await ordersPage.getTextColumn(page, test.args.filterBy, row);
-        await expect(textColumn).to.equal(test.args.filterValue);
+        expect(textColumn).to.equal(test.args.filterValue);
       }
     });
 
@@ -160,7 +160,7 @@ describe('BO - Orders : Filter the Orders table', async () => {
       await testContext.addContextItem(this, 'testIdentifier', `${test.args.identifier}Reset`, baseContext);
 
       const numberOfOrdersAfterReset = await ordersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfOrdersAfterReset).to.be.equal(numberOfOrders);
+      expect(numberOfOrdersAfterReset).to.be.equal(numberOfOrders);
     });
   });
 
@@ -172,11 +172,11 @@ describe('BO - Orders : Filter the Orders table', async () => {
 
     // Check number of element
     const numberOfOrdersAfterFilter = await ordersPage.getNumberOfElementInGrid(page);
-    await expect(numberOfOrdersAfterFilter).to.be.at.most(numberOfOrders);
+    expect(numberOfOrdersAfterFilter).to.be.at.most(numberOfOrders);
 
     for (let i = 1; i <= numberOfOrdersAfterFilter; i++) {
       const textColumn = await ordersPage.getTextColumn(page, 'date_add', i);
-      await expect(textColumn).to.contains(dateToCheck);
+      expect(textColumn).to.contains(dateToCheck);
     }
   });
 
@@ -184,6 +184,6 @@ describe('BO - Orders : Filter the Orders table', async () => {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilter', baseContext);
 
     const numberOfOrdersAfterReset = await ordersPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfOrdersAfterReset).to.be.equal(numberOfOrders);
+    expect(numberOfOrdersAfterReset).to.be.equal(numberOfOrders);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/03_exportOrders.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/03_exportOrders.ts
index e2b7286e44e7b..762279e3d554a 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/03_exportOrders.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/03_exportOrders.ts
@@ -46,7 +46,7 @@ describe('BO - Orders : Export orders', async () => {
     await ordersPage.closeSfToolBar(page);
 
     const pageTitle = await ordersPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(ordersPage.pageTitle);
+    expect(pageTitle).to.contains(ordersPage.pageTitle);
   });
 
   it('should export orders to a csv file', async function () {
@@ -55,7 +55,7 @@ describe('BO - Orders : Export orders', async () => {
     filePath = await ordersPage.exportDataToCsv(page);
 
     const doesFileExist = await files.doesFileExist(filePath, 5000);
-    await expect(doesFileExist, 'Export of data has failed').to.be.true;
+    expect(doesFileExist, 'Export of data has failed').to.eq(true);
   });
 
   it('should check existence of orders data in csv file', async function () {
@@ -68,7 +68,7 @@ describe('BO - Orders : Export orders', async () => {
     for (let row = 1; row <= numberOfOrders; row++) {
       const orderInCsvFormat = await ordersPage.getOrderInCsvFormat(page, row);
       const textExist = await files.isTextInFile(filePath, orderInCsvFormat, true, true);
-      await expect(textExist, `${orderInCsvFormat} was not found in the file`).to.be.true;
+      expect(textExist, `${orderInCsvFormat} was not found in the file`).to.eq(true);
     }
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/04_updateStatus.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/04_updateStatus.ts
index 85dda8bcfc375..a2e0dc215e9b4 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/04_updateStatus.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/04_updateStatus.ts
@@ -87,7 +87,7 @@ describe('BO - orders : Update order status', async () => {
       );
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should reset filter and get the last order ID', async function () {
@@ -97,7 +97,7 @@ describe('BO - orders : Update order status', async () => {
 
       const result: string = await ordersPage.getTextColumn(page, 'id_order', 1);
       orderId = parseInt(result, 10);
-      await expect(orderId).to.be.at.least(1);
+      expect(orderId).to.be.at.least(1);
     });
   });
 
@@ -112,14 +112,14 @@ describe('BO - orders : Update order status', async () => {
           await testContext.addContextItem(this, 'testIdentifier', `updateOrderStatus${index}`, baseContext);
 
           const textResult = await ordersPage.setOrderStatus(page, 1, test.args.orderStatus);
-          await expect(textResult).to.equal(ordersPage.successfulUpdateMessage);
+          expect(textResult).to.equal(ordersPage.successfulUpdateMessage);
         });
 
         it('should check that the status is updated successfully', async function () {
           await testContext.addContextItem(this, 'testIdentifier', `checkStatusBO${index}`, baseContext);
 
           const orderStatus = await ordersPage.getTextColumn(page, 'osname', 1);
-          await expect(orderStatus, 'Order status was not updated').to.equal(test.args.orderStatus.name);
+          expect(orderStatus, 'Order status was not updated').to.equal(test.args.orderStatus.name);
         });
 
         if (test.args.orderStatus.name === OrderStatuses.paymentAccepted.name) {
@@ -129,7 +129,7 @@ describe('BO - orders : Update order status', async () => {
             filePath = await ordersPage.downloadInvoice(page, 1);
 
             const doesFileExist = await files.doesFileExist(filePath, 5000);
-            await expect(doesFileExist, 'The file is not existing!').to.be.true;
+            expect(doesFileExist, 'The file is not existing!').to.eq(true);
           });
 
           it('should check invoice pdf file', async function () {
@@ -140,23 +140,23 @@ describe('BO - orders : Update order status', async () => {
 
             // Check Reference in pdf
             const referenceExist = await files.isTextInPDF(filePath, orderInformation.reference);
-            await expect(referenceExist, `Reference '${orderInformation.reference}' does not exist in invoice`)
-              .to.be.true;
+            expect(referenceExist, `Reference '${orderInformation.reference}' does not exist in invoice`)
+              .to.eq(true);
 
             // Check country name in delivery Address in pdf
             const deliveryExist = await files.isTextInPDF(filePath, orderInformation.delivery);
-            await expect(deliveryExist, `Country name '${orderInformation.delivery}' does not exist in invoice`)
-              .to.be.true;
+            expect(deliveryExist, `Country name '${orderInformation.delivery}' does not exist in invoice`)
+              .to.eq(true);
 
             // Check customer name in pdf
             const customerExist = await files.isTextInPDF(filePath, orderInformation.customer.slice(3));
-            await expect(customerExist, `Customer name '${orderInformation.customer}' does not exist in invoice`)
-              .to.be.true;
+            expect(customerExist, `Customer name '${orderInformation.customer}' does not exist in invoice`)
+              .to.eq(true);
 
             // Check total paid in pdf
             const totalPaidExist = await files.isTextInPDF(filePath, orderInformation.totalPaid);
-            await expect(totalPaidExist, `Total paid '${orderInformation.totalPaid}' does not exist in invoice`)
-              .to.be.true;
+            expect(totalPaidExist, `Total paid '${orderInformation.totalPaid}' does not exist in invoice`)
+              .to.eq(true);
           });
         }
 
@@ -167,7 +167,7 @@ describe('BO - orders : Update order status', async () => {
             filePath = await ordersPage.downloadDeliverySlip(page, 1);
 
             const doesFileExist = await files.doesFileExist(filePath, 5000);
-            await expect(doesFileExist).to.be.true;
+            expect(doesFileExist).to.eq(true);
           });
 
           it('should check delivery slip pdf file', async function () {
@@ -179,23 +179,23 @@ describe('BO - orders : Update order status', async () => {
             // Check Reference in pdf
             const referenceExist = await files.isTextInPDF(filePath, orderInformation.reference);
 
-            await expect(referenceExist, `Reference '${orderInformation.reference}' does not exist in delivery slip`)
-              .to.be.true;
+            expect(referenceExist, `Reference '${orderInformation.reference}' does not exist in delivery slip`)
+              .to.eq(true);
 
             // Check country name in delivery Address in pdf
             const deliveryExist = await files.isTextInPDF(filePath, orderInformation.delivery);
-            await expect(deliveryExist, `Country name '${orderInformation.delivery}' does not exist in delivery slip`)
-              .to.be.true;
+            expect(deliveryExist, `Country name '${orderInformation.delivery}' does not exist in delivery slip`)
+              .to.eq(true);
 
             // Check customer name in pdf
             const customerExist = await files.isTextInPDF(filePath, orderInformation.customer.slice(3));
-            await expect(customerExist, `Country name '${orderInformation.customer}' does not exist in delivery slip`)
-              .to.be.true;
+            expect(customerExist, `Country name '${orderInformation.customer}' does not exist in delivery slip`)
+              .to.eq(true);
 
             // Check total paid in pdf
             const totalPaidExist = await files.isTextInPDF(filePath, orderInformation.totalPaid);
-            await expect(totalPaidExist, `Total paid '${orderInformation.totalPaid}' does not exist in delivery slip`)
-              .to.be.true;
+            expect(totalPaidExist, `Total paid '${orderInformation.totalPaid}' does not exist in delivery slip`)
+              .to.eq(true);
           });
         }
       });
@@ -208,7 +208,7 @@ describe('BO - orders : Update order status', async () => {
           await homePage.changeLanguage(page, 'en');
 
           const isHomePage = await homePage.isHomePage(page);
-          await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+          expect(isHomePage, 'Fail to open FO home page').to.eq(true);
         });
 
         if (index === 0) {
@@ -218,7 +218,7 @@ describe('BO - orders : Update order status', async () => {
             await homePage.goToLoginPage(page);
 
             const pageTitle = await foLoginPage.getPageTitle(page);
-            await expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
+            expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
           });
 
           it('should sign in with default customer', async function () {
@@ -227,7 +227,7 @@ describe('BO - orders : Update order status', async () => {
             await foLoginPage.customerLogin(page, Customers.johnDoe);
 
             const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
-            await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+            expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
           });
         }
         it('should go to orders history page', async function () {
@@ -237,14 +237,14 @@ describe('BO - orders : Update order status', async () => {
           await myAccountPage.goToHistoryAndDetailsPage(page);
 
           const pageTitle = await orderHistoryPage.getPageTitle(page);
-          await expect(pageTitle, 'Fail to open order history page').to.contains(orderHistoryPage.pageTitle);
+          expect(pageTitle, 'Fail to open order history page').to.contains(orderHistoryPage.pageTitle);
         });
 
         it('should check the last order status', async function () {
           await testContext.addContextItem(this, 'testIdentifier', `checkLastOrderStatus${index}`, baseContext);
 
           const orderStatusFO = await orderHistoryPage.getOrderStatus(page, 1);
-          await expect(orderStatusFO, 'Order status is not correct').to.equal(test.args.orderStatus.name);
+          expect(orderStatusFO, 'Order status is not correct').to.equal(test.args.orderStatus.name);
         });
 
         if (test.args.orderStatus.name === OrderStatuses.paymentAccepted.name) {
@@ -252,14 +252,14 @@ describe('BO - orders : Update order status', async () => {
             await testContext.addContextItem(this, 'testIdentifier', `checkLastInvoice${index}`, baseContext);
 
             const isVisible = await orderHistoryPage.isInvoiceVisible(page, 1);
-            await expect(isVisible, 'The invoice file is not existing!').to.be.true;
+            expect(isVisible, 'The invoice file is not existing!').to.eq(true);
           });
 
           it('should check the order ID of the invoice', async function () {
             await testContext.addContextItem(this, 'testIdentifier', `checkOrderID${index}`, baseContext);
 
             const orderID = await orderHistoryPage.getOrderIdFromInvoiceHref(page, 1);
-            await expect(orderID, 'The invoice file attached is not correct!').to.contains(`id_order=${orderId}`);
+            expect(orderID, 'The invoice file attached is not correct!').to.contains(`id_order=${orderId}`);
           });
         }
 
@@ -269,7 +269,7 @@ describe('BO - orders : Update order status', async () => {
           page = await orderHistoryPage.closePage(browserContext, page, 0);
 
           const pageTitle = await ordersPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(ordersPage.pageTitle);
+          expect(pageTitle).to.contains(ordersPage.pageTitle);
         });
       });
     });
diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/05_bulkUpdateOrdersStatus.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/05_bulkUpdateOrdersStatus.ts
index 8d5c4a9e957c7..969ef5cc09ce7 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/05_bulkUpdateOrdersStatus.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/05_bulkUpdateOrdersStatus.ts
@@ -76,7 +76,7 @@ describe('BO - Orders : Bulk update orders status', async () => {
       );
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should update orders status with bulk action', async function () {
@@ -88,7 +88,7 @@ describe('BO - Orders : Bulk update orders status', async () => {
         false,
         [1, 2],
       );
-      await expect(textResult).to.equal(ordersPage.successfulUpdateMessage);
+      expect(textResult).to.equal(ordersPage.successfulUpdateMessage);
     });
 
     ['first', 'second'].forEach((arg: string, index: number) => {
@@ -96,7 +96,7 @@ describe('BO - Orders : Bulk update orders status', async () => {
         await testContext.addContextItem(this, 'testIdentifier', `checkOrderStatus${index + 1}`, baseContext);
 
         const orderStatus = await ordersPage.getTextColumn(page, 'osname', index + 1);
-        await expect(orderStatus, 'Order status is not correct').to.equal(OrderStatuses.paymentAccepted.name);
+        expect(orderStatus, 'Order status is not correct').to.equal(OrderStatuses.paymentAccepted.name);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/06_bulkOpenInNewTab.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/06_bulkOpenInNewTab.ts
index 0c8b7ace2f4df..1fb4f1639da60 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/06_bulkOpenInNewTab.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/06_bulkOpenInNewTab.ts
@@ -95,14 +95,14 @@ describe('BO - Orders : Bulk open on new tab', async () => {
       );
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFiltersFirst', baseContext);
 
       const numberOfOrders = await ordersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfOrders).to.be.above(0);
+      expect(numberOfOrders).to.be.above(0);
     });
 
     it('should click on \'Open in new tabs\' with bulk actions', async function () {
@@ -111,7 +111,7 @@ describe('BO - Orders : Bulk open on new tab', async () => {
       page = await ordersPage.bulkOpenInNewTabs(page, false, [1, 2]);
 
       const pageTitle = await orderPageCustomerBlock.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderPageCustomerBlock.pageTitle);
+      expect(pageTitle).to.contains(orderPageCustomerBlock.pageTitle);
     });
 
     it('should check the first opened order page', async function () {
@@ -119,9 +119,9 @@ describe('BO - Orders : Bulk open on new tab', async () => {
 
       // Check second customer information
       const customerInfo = await orderPageCustomerBlock.getCustomerInfoBlock(page);
-      await expect(customerInfo).to.contains(secondCustomerData.socialTitle);
-      await expect(customerInfo).to.contains(secondCustomerData.firstName);
-      await expect(customerInfo).to.contains(secondCustomerData.lastName);
+      expect(customerInfo).to.contains(secondCustomerData.socialTitle);
+      expect(customerInfo).to.contains(secondCustomerData.firstName);
+      expect(customerInfo).to.contains(secondCustomerData.lastName);
     });
 
     it('should close the tab and check that the second order page is opened', async function () {
@@ -130,7 +130,7 @@ describe('BO - Orders : Bulk open on new tab', async () => {
       page = await orderPageCustomerBlock.closePage(browserContext, page, 1);
 
       const pageTitle = await orderPageCustomerBlock.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderPageCustomerBlock.pageTitle);
+      expect(pageTitle).to.contains(orderPageCustomerBlock.pageTitle);
     });
 
     it('should check the second order page', async function () {
@@ -138,9 +138,9 @@ describe('BO - Orders : Bulk open on new tab', async () => {
 
       // Check second customer information
       const customerInfo = await orderPageCustomerBlock.getCustomerInfoBlock(page);
-      await expect(customerInfo).to.contains(firstCustomerData.socialTitle);
-      await expect(customerInfo).to.contains(firstCustomerData.firstName);
-      await expect(customerInfo).to.contains(firstCustomerData.lastName);
+      expect(customerInfo).to.contains(firstCustomerData.socialTitle);
+      expect(customerInfo).to.contains(firstCustomerData.firstName);
+      expect(customerInfo).to.contains(firstCustomerData.lastName);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/07_sortOrders.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/07_sortOrders.ts
index 0181659adc0bd..8dfb69f86f058 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/07_sortOrders.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/07_sortOrders.ts
@@ -48,7 +48,7 @@ describe('BO - Orders : Sort orders', async () => {
     await ordersPage.closeSfToolBar(page);
 
     const pageTitle = await ordersPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(ordersPage.pageTitle);
+    expect(pageTitle).to.contains(ordersPage.pageTitle);
   });
 
   const tests = [
@@ -112,17 +112,17 @@ describe('BO - Orders : Sort orders', async () => {
         const expectedResult = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
         if (test.args.sortDirection === 'asc') {
-          await expect(sortedTableFloat).to.deep.equal(expectedResult);
+          expect(sortedTableFloat).to.deep.equal(expectedResult);
         } else {
-          await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+          expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
         }
       } else {
         const expectedResult: string[] = await basicHelper.sortArray(nonSortedTable);
 
         if (test.args.sortDirection === 'asc') {
-          await expect(sortedTable).to.deep.equal(expectedResult);
+          expect(sortedTable).to.deep.equal(expectedResult);
         } else {
-          await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+          expect(sortedTable).to.deep.equal(expectedResult.reverse());
         }
       }
     });
diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/08_viewCustomer.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/08_viewCustomer.ts
index cca775645ae3a..e3305a0403c72 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/08_viewCustomer.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/08_viewCustomer.ts
@@ -52,14 +52,14 @@ describe('BO - Orders : View customer from orders page', async () => {
     await ordersPage.closeSfToolBar(page);
 
     const pageTitle = await ordersPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(ordersPage.pageTitle);
+    expect(pageTitle).to.contains(ordersPage.pageTitle);
   });
 
   it('should reset all filters', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilters', baseContext);
 
     const numberOfOrders = await ordersPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfOrders).to.be.above(0);
+    expect(numberOfOrders).to.be.above(0);
   });
 
   it('should filter order by customer name', async function () {
@@ -73,7 +73,7 @@ describe('BO - Orders : View customer from orders page', async () => {
     );
 
     const numberOfOrders = await ordersPage.getNumberOfElementInGrid(page);
-    await expect(numberOfOrders).to.be.at.least(1);
+    expect(numberOfOrders).to.be.at.least(1);
   });
 
   it('should check customer link', async function () {
@@ -83,7 +83,7 @@ describe('BO - Orders : View customer from orders page', async () => {
     page = await ordersPage.viewCustomer(page, 1);
 
     const pageTitle = await viewCustomerPage.getPageTitle(page);
-    await expect(pageTitle).to
+    expect(pageTitle).to
       .eq(viewCustomerPage.pageTitle(`${Customers.johnDoe.firstName[0]}. ${Customers.johnDoe.lastName}`));
   });
 
@@ -97,13 +97,13 @@ describe('BO - Orders : View customer from orders page', async () => {
     );
 
     const pageTitle = await ordersPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(ordersPage.pageTitle);
+    expect(pageTitle).to.contains(ordersPage.pageTitle);
   });
 
   it('should reset all filters', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFiltersAfterCheck', baseContext);
 
     const numberOfOrders = await ordersPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfOrders).to.be.above(0);
+    expect(numberOfOrders).to.be.above(0);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/09_viewGuest.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/09_viewGuest.ts
index 37b0045424fb6..0623602f776fa 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/09_viewGuest.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/09_viewGuest.ts
@@ -82,14 +82,14 @@ describe('BO - Orders : View guest from orders page', async () => {
       await ordersPage.closeSfToolBar(page);
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilters', baseContext);
 
       const numberOfOrders = await ordersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfOrders).to.be.above(0);
+      expect(numberOfOrders).to.be.above(0);
     });
 
     it('should filter order by customer name', async function () {
@@ -103,7 +103,7 @@ describe('BO - Orders : View guest from orders page', async () => {
       );
 
       const numberOfOrders = await ordersPage.getNumberOfElementInGrid(page);
-      await expect(numberOfOrders).to.be.at.least(1);
+      expect(numberOfOrders).to.be.at.least(1);
     });
 
     it('should check guest link', async function () {
@@ -113,7 +113,7 @@ describe('BO - Orders : View guest from orders page', async () => {
       page = await ordersPage.viewCustomer(page, 1);
 
       const pageTitle = await viewCustomerPage.getPageTitle(page);
-      await expect(pageTitle).to
+      expect(pageTitle).to
         .contains(viewCustomerPage.pageTitle(`${customerData.firstName[0]}. ${customerData.lastName}`));
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/10_pagination.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/10_pagination.ts
index 28040dfad4639..452e8fba8b97b 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/10_pagination.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/10_pagination.ts
@@ -86,14 +86,14 @@ describe('BO - Orders : Pagination of orders table', async () => {
       );
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should reset all filters and get number of orders', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFiltersFirst', baseContext);
 
       numberOfOrders = await ordersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfOrders).to.be.above(0);
+      expect(numberOfOrders).to.be.above(0);
     });
 
     it('should change the items number to 10 per page', async function () {
@@ -139,14 +139,14 @@ describe('BO - Orders : Pagination of orders table', async () => {
       const sortedTableFloat: number[] = sortedTable.map((text: string): number => parseFloat(text));
 
       const expectedResult = await basicHelper.sortArrayNumber(nonSortedTableFloat);
-      await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+      expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
     });
 
     it('should check that the orders table is sorted by total desc', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'CheckSortDesc', baseContext);
 
       const allOrdersTable = await ordersPage.getAllRowsColumnContent(page, 'total_paid_tax_incl');
-      await expect(allOrdersTable).to.deep.equal(sortedTable);
+      expect(allOrdersTable).to.deep.equal(sortedTable);
     });
 
     it('should change the items number to 10 per page', async function () {
@@ -161,7 +161,7 @@ describe('BO - Orders : Pagination of orders table', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'checkFirstPageSortDesc', baseContext);
 
       const firstTable = await ordersPage.getAllRowsColumnContent(page, 'total_paid_tax_incl');
-      await expect(firstTable).to.deep.equal(sortedTable.slice(0, 10));
+      expect(firstTable).to.deep.equal(sortedTable.slice(0, 10));
     });
 
     it('should click on next', async function () {
@@ -178,7 +178,7 @@ describe('BO - Orders : Pagination of orders table', async () => {
       const secondTable = await ordersPage.getAllRowsColumnContent(page, 'total_paid_tax_incl');
       const numberOfOrdersInPage = await ordersPage.getNumberOfOrdersInPage(page);
 
-      await expect(secondTable).to.deep.equal(sortedTable.slice(10, 10 + numberOfOrdersInPage));
+      expect(secondTable).to.deep.equal(sortedTable.slice(10, 10 + numberOfOrdersInPage));
     });
 
     it('should change the items number to 50 per page', async function () {
@@ -200,7 +200,7 @@ describe('BO - Orders : Pagination of orders table', async () => {
       const sortedTableFloat: number[] = sortedTable.map((text: string): number => parseFloat(text));
 
       const expectedResult = await basicHelper.sortArrayNumber(nonSortedTableFloat);
-      await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+      expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
     });
 
     it('should filter by customer \'J.DOE\'', async function () {
@@ -209,7 +209,7 @@ describe('BO - Orders : Pagination of orders table', async () => {
       await ordersPage.filterOrders(page, 'input', 'customer', 'J. DOE');
 
       numberOfOrdersAfterFilter = await ordersPage.getNumberOfElementInGrid(page);
-      await expect(numberOfOrdersAfterFilter).to.be.at.most(numberOfOrders);
+      expect(numberOfOrdersAfterFilter).to.be.at.most(numberOfOrders);
     });
 
     it('should check that the orders table is filtered by customer', async function () {
@@ -217,7 +217,7 @@ describe('BO - Orders : Pagination of orders table', async () => {
 
       for (let row = 1; row <= numberOfOrdersAfterFilter; row++) {
         const textColumn = await ordersPage.getTextColumn(page, 'customer', row);
-        await expect(textColumn).to.equal('J. DOE');
+        expect(textColumn).to.equal('J. DOE');
       }
     });
 
@@ -234,7 +234,7 @@ describe('BO - Orders : Pagination of orders table', async () => {
 
       for (let row = 1; row <= 10; row++) {
         const textColumn = await ordersPage.getTextColumn(page, 'customer', row);
-        await expect(textColumn).to.equal('J. DOE');
+        expect(textColumn).to.equal('J. DOE');
       }
     });
 
@@ -253,7 +253,7 @@ describe('BO - Orders : Pagination of orders table', async () => {
 
       for (let row = 1; row <= numberOfOrdersInPage; row++) {
         const textColumn = await ordersPage.getTextColumn(page, 'customer', row);
-        await expect(textColumn).to.equal('J. DOE');
+        expect(textColumn).to.equal('J. DOE');
       }
     });
 
@@ -261,7 +261,7 @@ describe('BO - Orders : Pagination of orders table', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilter', baseContext);
 
       const numberOfOrdersAfterReset = await ordersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfOrdersAfterReset).to.be.equal(numberOfOrders);
+      expect(numberOfOrdersAfterReset).to.be.equal(numberOfOrders);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/11_previewOrder.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/11_previewOrder.ts
index b1c82fe057973..306081dbec485 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/11_previewOrder.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/11_previewOrder.ts
@@ -79,7 +79,7 @@ describe('BO - Orders : Preview order', async () => {
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     [
@@ -101,7 +101,7 @@ describe('BO - Orders : Preview order', async () => {
         await homePage.searchProduct(page, test.args.productName);
 
         const pageTitle = await searchResultsPage.getPageTitle(page);
-        await expect(pageTitle).to.equal(searchResultsPage.pageTitle);
+        expect(pageTitle).to.equal(searchResultsPage.pageTitle);
       });
 
       it('should add the product to cart', async function () {
@@ -112,7 +112,7 @@ describe('BO - Orders : Preview order', async () => {
         await productPage.addProductToTheCart(page, 1, [], false);
 
         const notificationsNumber = await productPage.getCartNotificationsNumber(page);
-        await expect(notificationsNumber).to.be.equal(index + 1);
+        expect(notificationsNumber).to.be.equal(index + 1);
       });
     });
 
@@ -122,7 +122,7 @@ describe('BO - Orders : Preview order', async () => {
       await productPage.goToCartPage(page);
 
       const pageTitle = await cartPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(cartPage.pageTitle);
+      expect(pageTitle).to.contains(cartPage.pageTitle);
     });
 
     it('should proceed to checkout', async function () {
@@ -133,21 +133,21 @@ describe('BO - Orders : Preview order', async () => {
 
       // Go to checkout page
       const isCheckoutPage = await checkoutPage.isCheckoutPage(page);
-      await expect(isCheckoutPage).to.be.true;
+      expect(isCheckoutPage).to.eq(true);
     });
 
     it('should fill guest personal information', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'setPersonalInformation', baseContext);
 
       const isStepPersonalInfoCompleted = await checkoutPage.setGuestPersonalInformation(page, customerData);
-      await expect(isStepPersonalInfoCompleted, 'Step personal information is not completed').to.be.true;
+      expect(isStepPersonalInfoCompleted, 'Step personal information is not completed').to.eq(true);
     });
 
     it('should fill address form and go to delivery step', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'setAddressStep', baseContext);
 
       const isStepAddressComplete = await checkoutPage.setAddress(page, addressData);
-      await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
     });
 
     it('should validate the order', async function () {
@@ -155,14 +155,14 @@ describe('BO - Orders : Preview order', async () => {
 
       // Delivery step - Go to payment step
       const isStepDeliveryComplete = await checkoutPage.goToPaymentStep(page);
-      await expect(isStepDeliveryComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepDeliveryComplete, 'Step Address is not complete').to.eq(true);
 
       // Payment step - Choose payment step
       await checkoutPage.choosePaymentAndOrder(page, PaymentMethods.wirePayment.moduleName);
       const cardTitle = await orderConfirmationPage.getOrderConfirmationCardTitle(page);
 
       // Check the confirmation message
-      await expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
+      expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
     });
   });
 
@@ -179,14 +179,14 @@ describe('BO - Orders : Preview order', async () => {
         await ordersPage.closeSfToolBar(page);
 
         const pageTitle = await ordersPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(ordersPage.pageTitle);
+        expect(pageTitle).to.contains(ordersPage.pageTitle);
       });
 
       it('should reset all filters', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'resetFilters', baseContext);
 
         const numberOfOrders = await ordersPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfOrders).to.be.above(0);
+        expect(numberOfOrders).to.be.above(0);
       });
 
       it(`should filter order by customer last name ${customerData.lastName}`, async function () {
@@ -195,21 +195,21 @@ describe('BO - Orders : Preview order', async () => {
         await ordersPage.filterOrders(page, 'input', 'customer', customerData.lastName);
 
         const numberOfOrders = await ordersPage.getNumberOfElementInGrid(page);
-        await expect(numberOfOrders).to.be.at.least(1);
+        expect(numberOfOrders).to.be.at.least(1);
       });
 
       it('should click on expand button to preview the order', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'previewOrder', baseContext);
 
         const isPreviewBlockVisible = await ordersPage.previewOrder(page);
-        await expect(isPreviewBlockVisible, 'Preview block is not visible').to.be.true;
+        expect(isPreviewBlockVisible, 'Preview block is not visible').to.eq(true);
       });
 
       it('should check the shipping details', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkShippingDetails', baseContext);
 
         const shippingDetails = await ordersPage.getShippingDetails(page);
-        await expect(shippingDetails, 'Shipping details are not correct!')
+        expect(shippingDetails, 'Shipping details are not correct!')
           .to.equal(`Carrier: ${Carriers.default.name} Tracking number: - Shipping details: `
             + `${customerData.firstName} ${customerData.lastName} ${addressData.company} ${addressData.address} `
             + `${addressData.postalCode} ${addressData.city} ${addressData.country} ${addressData.phone}`);
@@ -219,14 +219,14 @@ describe('BO - Orders : Preview order', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'checkEmailAddress', baseContext);
 
         const emailAddress = await ordersPage.getCustomerEmail(page);
-        await expect(emailAddress, 'Email address is not correct!').to.equal(`Email: ${customerData.email}`);
+        expect(emailAddress, 'Email address is not correct!').to.equal(`Email: ${customerData.email}`);
       });
 
       it('should check the invoice address details', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkInvoiceDetails', baseContext);
 
         const invoiceAddress = await ordersPage.getCustomerInvoiceAddressDetails(page);
-        await expect(invoiceAddress, 'Invoice details are not correct!')
+        expect(invoiceAddress, 'Invoice details are not correct!')
           .to.equal(`Invoice details: ${customerData.firstName} ${customerData.lastName} `
             + `${addressData.company} ${addressData.address} ${addressData.postalCode} ${addressData.city} `
             + `${addressData.country} ${addressData.phone}`);
@@ -236,7 +236,7 @@ describe('BO - Orders : Preview order', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'checkProductsNumber', baseContext);
 
         const productsNumber = await ordersPage.getProductsNumberFromTable(page);
-        await expect(productsNumber, 'Products number is not correct!').to.equal(11);
+        expect(productsNumber, 'Products number is not correct!').to.equal(11);
       });
 
       [
@@ -255,7 +255,7 @@ describe('BO - Orders : Preview order', async () => {
           await testContext.addContextItem(this, 'testIdentifier', `checkProduct${index}`, baseContext);
 
           const productInformation = await ordersPage.getProductDetailsFromTable(page, index + 1);
-          await expect(productInformation).to.contains(test.args.product.name)
+          expect(productInformation).to.contains(test.args.product.name)
             .and.to.contains(test.args.product.reference)
             .and.to.contains(1)
             .and.to.contains(test.args.productPrice);
@@ -266,7 +266,7 @@ describe('BO - Orders : Preview order', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'check1MoreText', baseContext);
 
         const lastProductsTableLine = await ordersPage.getProductDetailsFromTable(page, 12);
-        await expect(lastProductsTableLine).to.equal('more_horiz (1 more)');
+        expect(lastProductsTableLine).to.equal('more_horiz (1 more)');
       });
 
       it('should click on \'(1 more)\' link and check the last product in the list', async function () {
@@ -275,7 +275,7 @@ describe('BO - Orders : Preview order', async () => {
         await ordersPage.clickOnMoreLink(page);
 
         const productInformation = await ordersPage.getProductDetailsFromTable(page, 11);
-        await expect(productInformation).to.contains(Products.demo_18.name)
+        expect(productInformation).to.contains(Products.demo_18.name)
           .and.to.contains(Products.demo_18.reference)
           .and.to.contains(1)
           .and.to.contains(Products.demo_18.finalPrice);
@@ -289,7 +289,7 @@ describe('BO - Orders : Preview order', async () => {
         await ordersPage.openOrderDetails(page);
 
         const pageTitle = await orderPageProductsBlock.getPageTitle(page);
-        await expect(pageTitle).to.contains(orderPageProductsBlock.pageTitle);
+        expect(pageTitle).to.contains(orderPageProductsBlock.pageTitle);
       });
 
       it('should add another product to the list', async function () {
@@ -298,35 +298,35 @@ describe('BO - Orders : Preview order', async () => {
         await orderPageProductsBlock.searchProduct(page, Products.demo_19.name);
 
         const textResult = await orderPageProductsBlock.addProductToCart(page);
-        await expect(textResult).to.contains(orderPageProductsBlock.successfulAddProductMessage);
+        expect(textResult).to.contains(orderPageProductsBlock.successfulAddProductMessage);
       });
 
       it('should click on \'Carriers\' tab', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'displayCarriersTab', baseContext);
 
         const isTabOpened = await orderPageTabListBlock.goToCarriersTab(page);
-        await expect(isTabOpened).to.be.true;
+        expect(isTabOpened).to.eq(true);
       });
 
       it('should click on \'Edit\' link and check the modal', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'clickOnEditLink', baseContext);
 
         const isModalVisible = await orderPageTabListBlock.clickOnEditLink(page);
-        await expect(isModalVisible, 'Edit shipping modal is not visible!').to.be.true;
+        expect(isModalVisible, 'Edit shipping modal is not visible!').to.eq(true);
       });
 
       it('should edit the carrier', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'editCarrier', baseContext);
 
         const textResult = await orderPageTabListBlock.setShippingDetails(page, shippingDetailsData);
-        await expect(textResult).to.equal(orderPageTabListBlock.successfulUpdateMessage);
+        expect(textResult).to.equal(orderPageTabListBlock.successfulUpdateMessage);
       });
 
       it('should edit the shipping address', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'editShippingAddress', baseContext);
 
         const shippingAddress = await orderPageCustomerBlock.editExistingShippingAddress(page, editShippingAddressData);
-        await expect(shippingAddress, 'Shipping address is not correct!')
+        expect(shippingAddress, 'Shipping address is not correct!')
           .to.contain(editShippingAddressData.firstName)
           .and.to.contain(editShippingAddressData.lastName)
           .and.to.contain(editShippingAddressData.address)
@@ -339,7 +339,7 @@ describe('BO - Orders : Preview order', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'editDeliveryAddress', baseContext);
 
         const invoiceAddress = await orderPageCustomerBlock.editExistingInvoiceAddress(page, editInvoiceAddressData);
-        await expect(invoiceAddress, 'Invoice address is not correct!')
+        expect(invoiceAddress, 'Invoice address is not correct!')
           .to.contain(editInvoiceAddressData.firstName)
           .and.to.contain(editInvoiceAddressData.lastName)
           .and.to.contain(editInvoiceAddressData.address)
@@ -354,21 +354,21 @@ describe('BO - Orders : Preview order', async () => {
         await dashboardPage.goToSubMenu(page, dashboardPage.ordersParentLink, dashboardPage.ordersLink);
 
         const pageTitle = await ordersPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(ordersPage.pageTitle);
+        expect(pageTitle).to.contains(ordersPage.pageTitle);
       });
 
       it('should click on expand button to preview the order', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'previewOrder2', baseContext);
 
         const isPreviewBlockVisible = await ordersPage.previewOrder(page);
-        await expect(isPreviewBlockVisible, 'Preview block is not visible').to.be.true;
+        expect(isPreviewBlockVisible, 'Preview block is not visible').to.eq(true);
       });
 
       it('should check the shipping details', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkEditedShippingAddress', baseContext);
 
         const shippingDetails = await ordersPage.getShippingDetails(page);
-        await expect(shippingDetails, 'Shipping address is not correct!')
+        expect(shippingDetails, 'Shipping address is not correct!')
           .to.equal(`Carrier: ${shippingDetailsData.carrier} Tracking number: ${shippingDetailsData.trackingNumber}`
             + ` Shipping details: ${editShippingAddressData.firstName} ${editShippingAddressData.lastName}`
             + ` ${editShippingAddressData.company} ${editShippingAddressData.address}`
@@ -381,7 +381,7 @@ describe('BO - Orders : Preview order', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'checkEditedInvoiceAddress', baseContext);
 
         const invoiceAddress = await ordersPage.getCustomerInvoiceAddressDetails(page);
-        await expect(invoiceAddress, 'Invoice address is not correct!')
+        expect(invoiceAddress, 'Invoice address is not correct!')
           .to.equal(`Invoice details: ${editInvoiceAddressData.firstName} ${editInvoiceAddressData.lastName} `
             + `${editInvoiceAddressData.company} ${editInvoiceAddressData.address}`
             + ` ${editInvoiceAddressData.secondAddress} ${editInvoiceAddressData.postalCode}`
@@ -392,7 +392,7 @@ describe('BO - Orders : Preview order', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'checkProductsNumber1', baseContext);
 
         const productsNumber = await ordersPage.getProductsNumberFromTable(page);
-        await expect(productsNumber, 'Products number is not correct!').to.equal(12);
+        expect(productsNumber, 'Products number is not correct!').to.equal(12);
       });
 
       describe('Check the products list', async () => {
@@ -412,7 +412,7 @@ describe('BO - Orders : Preview order', async () => {
             await testContext.addContextItem(this, 'testIdentifier', `checkProduct${index}1`, baseContext);
 
             const productInformation = await ordersPage.getProductDetailsFromTable(page, index + 1);
-            await expect(productInformation).to.contains(test.args.product.name)
+            expect(productInformation).to.contains(test.args.product.name)
               .and.to.contains(test.args.product.reference)
               .and.to.contains(1)
               .and.to.contains(test.args.productPrice);
@@ -423,7 +423,7 @@ describe('BO - Orders : Preview order', async () => {
           await testContext.addContextItem(this, 'testIdentifier', 'check2MoreText', baseContext);
 
           const lastProductsTableLine = await ordersPage.getProductDetailsFromTable(page, 13);
-          await expect(lastProductsTableLine).to.equal('more_horiz (2 more)');
+          expect(lastProductsTableLine).to.equal('more_horiz (2 more)');
         });
 
         it('should click on \'(2 more)\' link and check the last product in the list', async function () {
@@ -432,12 +432,12 @@ describe('BO - Orders : Preview order', async () => {
           await ordersPage.clickOnMoreLink(page, 13);
 
           let productInformation = await ordersPage.getProductDetailsFromTable(page, 11);
-          await expect(productInformation).to.contains(Products.demo_18.name)
+          expect(productInformation).to.contains(Products.demo_18.name)
             .and.to.contains(Products.demo_18.reference)
             .and.to.contains(1)
             .and.to.contains(Products.demo_18.finalPrice);
           productInformation = await ordersPage.getProductDetailsFromTable(page, 12);
-          await expect(productInformation).to.contains(Products.demo_19.name)
+          expect(productInformation).to.contains(Products.demo_19.name)
             .and.to.contains(Products.demo_19.reference)
             .and.to.contains(1)
             .and.to.contains(Products.demo_19.finalPrice);
diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/01_searchViewCustomer.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/01_searchViewCustomer.ts
index 636d58726a89d..a9a84123b08a2 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/01_searchViewCustomer.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/01_searchViewCustomer.ts
@@ -79,7 +79,7 @@ describe('BO - Orders - Create order : Search and view customer details from new
       );
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should go to create order page', async function () {
@@ -88,7 +88,7 @@ describe('BO - Orders - Create order : Search and view customer details from new
       await ordersPage.goToCreateOrderPage(page);
 
       const pageTitle = await addOrderPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addOrderPage.pageTitle);
+      expect(pageTitle).to.contains(addOrderPage.pageTitle);
     });
 
     [
@@ -109,7 +109,7 @@ describe('BO - Orders - Create order : Search and view customer details from new
         await addOrderPage.searchCustomer(page, step.customer.email);
 
         const errorDisplayed = await addOrderPage.getNoCustomerFoundError(page);
-        await expect(errorDisplayed, 'Error is not correct').to.equal(addOrderPage.noCustomerFoundText);
+        expect(errorDisplayed, 'Error is not correct').to.equal(addOrderPage.noCustomerFoundText);
       });
     });
 
@@ -119,19 +119,19 @@ describe('BO - Orders - Create order : Search and view customer details from new
       await addOrderPage.searchCustomer(page, Customers.johnDoe.lastName);
 
       const searchResultNumber = await addOrderPage.getCustomersSearchNumber(page);
-      await expect(searchResultNumber).to.be.equal(2);
+      expect(searchResultNumber).to.be.equal(2);
     });
 
     it('should check that first customer card contain \'Name, Email, birthdate and groups\'', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkFirstSearchResult', baseContext);
 
       const defaultCustomerName = await addOrderPage.getCustomerNameFromResult(page, 1);
-      await expect(defaultCustomerName).to.contains(
+      expect(defaultCustomerName).to.contains(
         `${Customers.johnDoe.firstName} ${Customers.johnDoe.lastName}`,
       );
 
       const customerCardContent = await addOrderPage.getCustomerCardBody(page, 1);
-      await expect(customerCardContent)
+      expect(customerCardContent)
         .to.contains(Customers.johnDoe.email)
         .and.to.contains(Customers.johnDoe.birthDate.toJSON().slice(0, 10))
         .and.to.contains(Customers.johnDoe.defaultCustomerGroup);
@@ -141,10 +141,10 @@ describe('BO - Orders - Create order : Search and view customer details from new
       await testContext.addContextItem(this, 'testIdentifier', 'checkSecondSearchResult', baseContext);
 
       const newCustomerName = await addOrderPage.getCustomerNameFromResult(page, 2);
-      await expect(newCustomerName).to.contains(`${newCustomer.firstName} ${newCustomer.lastName}`);
+      expect(newCustomerName).to.contains(`${newCustomer.firstName} ${newCustomer.lastName}`);
 
       const customerCardContent = await addOrderPage.getCustomerCardBody(page, 2);
-      await expect(customerCardContent)
+      expect(customerCardContent)
         .to.contains(newCustomer.email)
         .and.to.contains(`${newCustomer.yearOfBirth}-${newCustomer.monthOfBirth}-${newCustomer.dayOfBirth}`)
         .and.to.contains(newCustomer.defaultCustomerGroup);
@@ -158,7 +158,7 @@ describe('BO - Orders - Create order : Search and view customer details from new
         await addOrderPage.searchCustomer(page, Customers.johnDoe.email);
 
         const isCartsTableVisible = await addOrderPage.chooseCustomer(page);
-        await expect(isCartsTableVisible).to.be.true;
+        expect(isCartsTableVisible).to.eq(true);
       },
     );
   });
@@ -169,19 +169,19 @@ describe('BO - Orders - Create order : Search and view customer details from new
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnDetailButton', baseContext);
 
       const isIframeVisible = await addOrderPage.clickOnDetailsButton(page);
-      await expect(isIframeVisible).to.be.true;
+      expect(isIframeVisible).to.eq(true);
     });
 
     it('should check the existence of personal information block in the iframe', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkPersonalInformation', baseContext);
 
       customerIframe = await addOrderPage.getCustomerIframe(page, Customers.johnDoe.id);
-      await expect(customerIframe).to.be.not.null;
+      expect(customerIframe).to.not.eq(null);
 
       const cardHeaderText = await viewCustomerPage.getPersonalInformationTitle(customerIframe!);
-      await expect(cardHeaderText).to.contains(Customers.johnDoe.firstName);
-      await expect(cardHeaderText).to.contains(Customers.johnDoe.lastName);
-      await expect(cardHeaderText).to.contains(Customers.johnDoe.email);
+      expect(cardHeaderText).to.contains(Customers.johnDoe.firstName);
+      expect(cardHeaderText).to.contains(Customers.johnDoe.lastName);
+      expect(cardHeaderText).to.contains(Customers.johnDoe.email);
     });
 
     [
@@ -199,7 +199,7 @@ describe('BO - Orders - Create order : Search and view customer details from new
         await testContext.addContextItem(this, 'testIdentifier', `check${test.args.blockName}Number`, baseContext);
 
         const cardHeaderText = await viewCustomerPage.getNumberOfElementFromTitle(customerIframe!, test.args.blockName);
-        await expect(parseInt(cardHeaderText, 10)).to.be.at.least(test.args.number);
+        expect(parseInt(cardHeaderText, 10)).to.be.at.least(test.args.number);
       });
     });
 
@@ -207,7 +207,7 @@ describe('BO - Orders - Create order : Search and view customer details from new
       await testContext.addContextItem(this, 'testIdentifier', 'checkAddPrivateNote', baseContext);
 
       const isVisible = await viewCustomerPage.isPrivateNoteBlockVisible(customerIframe!);
-      await expect(isVisible).to.be.true;
+      expect(isVisible).to.eq(true);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/02_createCustomer.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/02_createCustomer.ts
index 82607a8cb8587..9d8f14761d8f5 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/02_createCustomer.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/02_createCustomer.ts
@@ -55,7 +55,7 @@ describe('BO - Orders - Create order : Create customer from new order page', asy
     );
 
     const pageTitle = await ordersPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(ordersPage.pageTitle);
+    expect(pageTitle).to.contains(ordersPage.pageTitle);
   });
 
   it('should go to create order page', async function () {
@@ -64,14 +64,14 @@ describe('BO - Orders - Create order : Create customer from new order page', asy
     await ordersPage.goToCreateOrderPage(page);
 
     const pageTitle = await addOrderPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(addOrderPage.pageTitle);
+    expect(pageTitle).to.contains(addOrderPage.pageTitle);
   });
 
   it('should create customer and check result', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'createCustomer', baseContext);
 
     const customerName = await addOrderPage.addNewCustomer(page, customerData);
-    await expect(customerName).to.contains(`${customerData.firstName} ${customerData.lastName}`);
+    expect(customerName).to.contains(`${customerData.firstName} ${customerData.lastName}`);
   });
 
   it('should search for the new customer and check result', async function () {
@@ -80,7 +80,7 @@ describe('BO - Orders - Create order : Create customer from new order page', asy
     await addOrderPage.searchCustomer(page, customerData.email);
 
     const customerName = await addOrderPage.getCustomerNameFromResult(page, 1);
-    await expect(customerName).to.contains(`${customerData.firstName} ${customerData.lastName}`);
+    expect(customerName).to.contains(`${customerData.firstName} ${customerData.lastName}`);
   });
 
   // Post-condition: Delete created customer
diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/03_createSimpleOrderInBO.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/03_createSimpleOrderInBO.ts
index 66454c1d3d5c3..75c15b68a3af0 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/03_createSimpleOrderInBO.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/03_createSimpleOrderInBO.ts
@@ -90,7 +90,7 @@ describe('BO - Orders - Create order : Create simple order in BO', async () => {
     await ordersPage.closeSfToolBar(page);
 
     const pageTitle = await ordersPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(ordersPage.pageTitle);
+    expect(pageTitle).to.contains(ordersPage.pageTitle);
   });
 
   it('should go to create order page', async function () {
@@ -99,7 +99,7 @@ describe('BO - Orders - Create order : Create simple order in BO', async () => {
     await ordersPage.goToCreateOrderPage(page);
 
     const pageTitle = await addOrderPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(addOrderPage.pageTitle);
+    expect(pageTitle).to.contains(addOrderPage.pageTitle);
   });
 
   describe('Create order and check result', async () => {
@@ -109,28 +109,28 @@ describe('BO - Orders - Create order : Create simple order in BO', async () => {
       await addOrderPage.createOrder(page, orderToMake);
 
       const pageTitle = await orderPageProductsBlock.getPageTitle(page);
-      await expect(pageTitle).to.contain(orderPageProductsBlock.pageTitle);
+      expect(pageTitle).to.contain(orderPageProductsBlock.pageTitle);
     });
 
     it('should check order status', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkOrderStatus', baseContext);
 
       const orderStatus = await orderPageProductsBlock.getOrderStatus(page);
-      await expect(orderStatus).to.equal(orderToMake.status.name);
+      expect(orderStatus).to.equal(orderToMake.status.name);
     });
 
     it('should check order total price', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkOrderPrice', baseContext);
 
       const totalPrice = await orderPageProductsBlock.getOrderTotalPrice(page);
-      await expect(totalPrice).to.equal(orderToMake.totalPrice);
+      expect(totalPrice).to.equal(orderToMake.totalPrice);
     });
 
     it('should check order shipping address', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkShippingAddress', baseContext);
 
       const shippingAddress = await orderPageCustomerBlock.getShippingAddress(page);
-      await expect(shippingAddress)
+      expect(shippingAddress)
         .to.contain(orderToMake.deliveryAddress.firstName)
         .and.to.contain(orderToMake.deliveryAddress.lastName)
         .and.to.contain(orderToMake.deliveryAddress.address)
@@ -143,7 +143,7 @@ describe('BO - Orders - Create order : Create simple order in BO', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'checkInvoiceAddress', baseContext);
 
       const invoiceAddress = await orderPageCustomerBlock.getInvoiceAddress(page);
-      await expect(invoiceAddress)
+      expect(invoiceAddress)
         .to.contain(orderToMake.deliveryAddress.firstName)
         .and.to.contain(orderToMake.deliveryAddress.lastName)
         .and.to.contain(orderToMake.deliveryAddress.address)
@@ -157,7 +157,7 @@ describe('BO - Orders - Create order : Create simple order in BO', async () => {
 
       for (let i = 1; i <= orderToMake.products.length; i++) {
         const productName = await orderPageProductsBlock.getProductNameFromTable(page, i);
-        await expect(productName).to.contain(orderToMake.products[i - 1].product.name);
+        expect(productName).to.contain(orderToMake.products[i - 1].product.name);
       }
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/04_selectPreviousCarts.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/04_selectPreviousCarts.ts
index 5e11e3ac69201..f950cbfc1138e 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/04_selectPreviousCarts.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/04_selectPreviousCarts.ts
@@ -91,14 +91,14 @@ describe('BO - Orders - Create Order : Select Previous Carts', async () => {
       );
 
       const pageTitle = await shoppingCartsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(shoppingCartsPage.pageTitle);
+      expect(pageTitle).to.contains(shoppingCartsPage.pageTitle);
     });
 
     it('should reset all filters and get number of shopping carts', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFiltersFirst1', baseContext);
 
       numberOfShoppingCarts = await shoppingCartsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfShoppingCarts).to.be.above(0);
+      expect(numberOfShoppingCarts).to.be.above(0);
     });
 
     it('should search the non ordered shopping carts', async function () {
@@ -107,13 +107,13 @@ describe('BO - Orders - Create Order : Select Previous Carts', async () => {
       await shoppingCartsPage.filterTable(page, 'input', 'status', 'Non ordered');
 
       numberOfNonOrderedShoppingCarts = await shoppingCartsPage.getNumberOfElementInGrid(page);
-      await expect(numberOfNonOrderedShoppingCarts).to.be.at.most(numberOfShoppingCarts);
+      expect(numberOfNonOrderedShoppingCarts).to.be.at.most(numberOfShoppingCarts);
 
       numberOfShoppingCarts -= numberOfNonOrderedShoppingCarts;
 
       for (let row = 1; row <= numberOfNonOrderedShoppingCarts; row++) {
         const textColumn = await shoppingCartsPage.getTextColumn(page, row, 'status');
-        await expect(textColumn).to.contains('Non ordered');
+        expect(textColumn).to.contains('Non ordered');
       }
     });
 
@@ -122,7 +122,7 @@ describe('BO - Orders - Create Order : Select Previous Carts', async () => {
 
       if (numberOfNonOrderedShoppingCarts > 0) {
         const deleteTextResult = await shoppingCartsPage.bulkDeleteShoppingCarts(page);
-        await expect(deleteTextResult).to.be.contains(shoppingCartsPage.successfulMultiDeleteMessage);
+        expect(deleteTextResult).to.be.contains(shoppingCartsPage.successfulMultiDeleteMessage);
       }
     });
 
@@ -130,7 +130,7 @@ describe('BO - Orders - Create Order : Select Previous Carts', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDeleteNonOrderedCarts1', baseContext);
 
       const numberOfShoppingCartsAfterReset = await shoppingCartsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfShoppingCartsAfterReset).to.be.equal(numberOfShoppingCarts);
+      expect(numberOfShoppingCartsAfterReset).to.be.equal(numberOfShoppingCarts);
     });
 
     it('should get the last shopping cart ID', async function () {
@@ -140,7 +140,7 @@ describe('BO - Orders - Create Order : Select Previous Carts', async () => {
         await shoppingCartsPage.getTextColumn(page, 1, 'id_cart'),
         10,
       );
-      await expect(lastShoppingCartId).to.be.above(0);
+      expect(lastShoppingCartId).to.be.above(0);
     });
   });
 
@@ -157,7 +157,7 @@ describe('BO - Orders - Create Order : Select Previous Carts', async () => {
       await ordersPage.closeSfToolBar(page);
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should go to create order page', async function () {
@@ -166,7 +166,7 @@ describe('BO - Orders - Create Order : Select Previous Carts', async () => {
       await ordersPage.goToCreateOrderPage(page);
 
       const pageTitle = await addOrderPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addOrderPage.pageTitle);
+      expect(pageTitle).to.contains(addOrderPage.pageTitle);
     });
 
     it('should search for default customer', async function () {
@@ -175,14 +175,14 @@ describe('BO - Orders - Create Order : Select Previous Carts', async () => {
       await addOrderPage.searchCustomer(page, Customers.johnDoe.email);
 
       const customerName = await addOrderPage.getCustomerNameFromResult(page, 1);
-      await expect(customerName).to.contains(`${Customers.johnDoe.firstName} ${Customers.johnDoe.lastName}`);
+      expect(customerName).to.contains(`${Customers.johnDoe.firstName} ${Customers.johnDoe.lastName}`);
     });
 
     it('should click on the choose button of the default customer', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnChooseButton1', baseContext);
 
       const isBlockHistoryVisible = await addOrderPage.chooseCustomer(page);
-      await expect(isBlockHistoryVisible).to.be.true;
+      expect(isBlockHistoryVisible).to.eq(true);
     });
   });
 
@@ -192,7 +192,7 @@ describe('BO - Orders - Create Order : Select Previous Carts', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'checkThatNoRecordFoundForCarts', baseContext);
 
       const noRecordsFoundText = await addOrderPage.getTextWhenCartsTableIsEmpty(page);
-      await expect(noRecordsFoundText).to.contains('No records found');
+      expect(noRecordsFoundText).to.contains('No records found');
     });
   });
 
@@ -208,14 +208,14 @@ describe('BO - Orders - Create Order : Select Previous Carts', async () => {
       );
 
       const pageTitle = await shoppingCartsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(shoppingCartsPage.pageTitle);
+      expect(pageTitle).to.contains(shoppingCartsPage.pageTitle);
     });
 
     it('should reset all filters and get number of shopping carts', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFiltersFirst2', baseContext);
 
       numberOfShoppingCarts = await shoppingCartsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfShoppingCarts).to.be.above(0);
+      expect(numberOfShoppingCarts).to.be.above(0);
     });
 
     it('should search the non ordered shopping carts', async function () {
@@ -224,13 +224,13 @@ describe('BO - Orders - Create Order : Select Previous Carts', async () => {
       await shoppingCartsPage.filterTable(page, 'input', 'status', 'Non ordered');
 
       numberOfNonOrderedShoppingCarts = await shoppingCartsPage.getNumberOfElementInGrid(page);
-      await expect(numberOfNonOrderedShoppingCarts).to.be.at.most(numberOfShoppingCarts);
+      expect(numberOfNonOrderedShoppingCarts).to.be.at.most(numberOfShoppingCarts);
 
       numberOfShoppingCarts -= numberOfNonOrderedShoppingCarts;
 
       for (let row = 1; row <= numberOfNonOrderedShoppingCarts; row++) {
         const textColumn = await shoppingCartsPage.getTextColumn(page, row, 'status');
-        await expect(textColumn).to.contains('Non ordered');
+        expect(textColumn).to.contains('Non ordered');
       }
     });
 
@@ -239,7 +239,7 @@ describe('BO - Orders - Create Order : Select Previous Carts', async () => {
 
       if (numberOfNonOrderedShoppingCarts > 0) {
         const deleteTextResult = await shoppingCartsPage.bulkDeleteShoppingCarts(page);
-        await expect(deleteTextResult).to.be.contains(shoppingCartsPage.successfulMultiDeleteMessage);
+        expect(deleteTextResult).to.be.contains(shoppingCartsPage.successfulMultiDeleteMessage);
       }
     });
 
@@ -247,14 +247,14 @@ describe('BO - Orders - Create Order : Select Previous Carts', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDeleteNonOrderedCarts2', baseContext);
 
       const numberOfShoppingCartsAfterReset = await shoppingCartsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfShoppingCartsAfterReset).to.be.equal(numberOfShoppingCarts);
+      expect(numberOfShoppingCartsAfterReset).to.be.equal(numberOfShoppingCarts);
     });
 
     it('should get the last shopping cart ID', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'getIdOfLastShoppingCart2', baseContext);
 
       lastShoppingCartId = parseInt(await shoppingCartsPage.getTextColumn(page, 1, 'id_cart'), 10);
-      await expect(lastShoppingCartId).to.be.above(0);
+      expect(lastShoppingCartId).to.be.above(0);
     });
   });
 
@@ -267,7 +267,7 @@ describe('BO - Orders - Create Order : Select Previous Carts', async () => {
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should go to login page', async function () {
@@ -276,7 +276,7 @@ describe('BO - Orders - Create Order : Select Previous Carts', async () => {
       await homePage.goToLoginPage(page);
 
       const pageTitle = await foLoginPage.getPageTitle(page);
-      await expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
+      expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
     });
 
     it('should sign in with customer credentials', async function () {
@@ -285,7 +285,7 @@ describe('BO - Orders - Create Order : Select Previous Carts', async () => {
       await foLoginPage.customerLogin(page, Customers.johnDoe);
 
       const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
 
     it('should add product to cart', async function () {
@@ -299,7 +299,7 @@ describe('BO - Orders - Create Order : Select Previous Carts', async () => {
       await productPage.addProductToTheCart(page);
 
       const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
-      await expect(notificationsNumber).to.be.equal(1);
+      expect(notificationsNumber).to.be.equal(1);
     });
 
     it('should go to delivery step', async function () {
@@ -310,7 +310,7 @@ describe('BO - Orders - Create Order : Select Previous Carts', async () => {
 
       // Address step - Go to delivery step
       const isStepAddressComplete = await checkoutPage.goToDeliveryStep(page);
-      await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
     });
 
     it('should select My carrier', async function () {
@@ -320,7 +320,7 @@ describe('BO - Orders - Create Order : Select Previous Carts', async () => {
         page,
         Carriers.myCarrier.id,
       );
-      await expect(isPaymentStepDisplayed, 'Payment Step is not displayed').to.be.true;
+      expect(isPaymentStepDisplayed, 'Payment Step is not displayed').to.eq(true);
     });
 
     it('should close the current page', async function () {
@@ -329,7 +329,7 @@ describe('BO - Orders - Create Order : Select Previous Carts', async () => {
       page = await checkoutPage.closePage(browserContext, page, 0);
 
       const pageTitle = await shoppingCartsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(shoppingCartsPage.pageTitle);
+      expect(pageTitle).to.contains(shoppingCartsPage.pageTitle);
 
       await shoppingCartsPage.reloadPage(page);
       lastShoppingCartId = parseInt(await shoppingCartsPage.getTextColumn(page, 1, 'id_cart'), 10);
@@ -348,7 +348,7 @@ describe('BO - Orders - Create Order : Select Previous Carts', async () => {
       );
 
       const pageTitle = await stocksPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(stocksPage.pageTitle);
+      expect(pageTitle).to.contains(stocksPage.pageTitle);
     });
 
     it(`should filter by product '${Products.demo_1.name}'`, async function () {
@@ -357,14 +357,14 @@ describe('BO - Orders - Create Order : Select Previous Carts', async () => {
       await stocksPage.simpleFilter(page, Products.demo_1.name);
 
       const numberOfProductsAfterFilter = await stocksPage.getNumberOfProductsFromList(page);
-      await expect(numberOfProductsAfterFilter).to.be.at.least(1);
+      expect(numberOfProductsAfterFilter).to.be.at.least(1);
     });
 
     it('should get the Available stock of the ordered product', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'getAvailableStockOfOrderedProduct', baseContext);
 
       availableStockOfOrderedProduct = parseInt(await stocksPage.getTextColumnFromTableStocks(page, 1, 'available'), 10);
-      await expect(availableStockOfOrderedProduct).to.be.above(0);
+      expect(availableStockOfOrderedProduct).to.be.above(0);
     });
   });
 
@@ -380,7 +380,7 @@ describe('BO - Orders - Create Order : Select Previous Carts', async () => {
       );
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should go to create order page', async function () {
@@ -389,7 +389,7 @@ describe('BO - Orders - Create Order : Select Previous Carts', async () => {
       await ordersPage.goToCreateOrderPage(page);
 
       const pageTitle = await addOrderPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addOrderPage.pageTitle);
+      expect(pageTitle).to.contains(addOrderPage.pageTitle);
     });
 
     it('should search for default customer', async function () {
@@ -398,21 +398,21 @@ describe('BO - Orders - Create Order : Select Previous Carts', async () => {
       await addOrderPage.searchCustomer(page, Customers.johnDoe.email);
 
       const customerName = await addOrderPage.getCustomerNameFromResult(page, 1);
-      await expect(customerName).to.contains(`${Customers.johnDoe.firstName} ${Customers.johnDoe.lastName}`);
+      expect(customerName).to.contains(`${Customers.johnDoe.firstName} ${Customers.johnDoe.lastName}`);
     });
 
     it('should click on the choose button of the default customer', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnChooseButton2', baseContext);
 
       const isBlockHistoryVisible = await addOrderPage.chooseCustomer(page);
-      await expect(isBlockHistoryVisible).to.be.true;
+      expect(isBlockHistoryVisible).to.eq(true);
     });
 
     it('should check the shopping cart ID', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkShoppingCartId', baseContext);
 
       const cartId = await addOrderPage.getTextColumnFromCartsTable(page, 'id');
-      await expect(parseInt(cartId, 10)).to.be.equal(lastShoppingCartId);
+      expect(parseInt(cartId, 10)).to.be.equal(lastShoppingCartId);
     });
     [
       {args: {columnName: 'date', result: today}},
@@ -425,9 +425,9 @@ describe('BO - Orders - Create Order : Select Previous Carts', async () => {
         const cartColumn = await addOrderPage.getTextColumnFromCartsTable(page, test.args.columnName);
 
         if (test.args.columnName === 'date') {
-          await expect(cartColumn).to.contains(test.args.result);
+          expect(cartColumn).to.contains(test.args.result);
         } else {
-          await expect(cartColumn).to.be.equal(test.args.result);
+          expect(cartColumn).to.be.equal(test.args.result);
         }
       });
     });
@@ -439,24 +439,24 @@ describe('BO - Orders - Create Order : Select Previous Carts', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnDetailsButton', baseContext);
 
       const isIframeVisible = await addOrderPage.clickOnCartDetailsButton(page, 1);
-      await expect(isIframeVisible).to.be.true;
+      expect(isIframeVisible).to.eq(true);
     });
 
     it('should check the cart Id', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkCardId', baseContext);
 
       shoppingCartPage = addOrderPage.getShoppingCartIframe(page, lastShoppingCartId);
-      await expect(shoppingCartPage).to.be.not.null;
+      expect(shoppingCartPage).to.not.eq(null);
 
       const cartId = await viewShoppingCartPage.getCartId(shoppingCartPage!);
-      await expect(cartId).to.be.equal(`Cart #${lastShoppingCartId}`);
+      expect(cartId).to.be.equal(`Cart #${lastShoppingCartId}`);
     });
 
     it('should check the cart total', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkCardTotal', baseContext);
 
       const cartTotal = await viewShoppingCartPage.getCartTotal(shoppingCartPage!);
-      await expect(cartTotal.toString())
+      expect(cartTotal.toString())
         .to.be.equal((Products.demo_1.finalPrice + myCarrierCost).toFixed(2));
     });
 
@@ -465,7 +465,7 @@ describe('BO - Orders - Create Order : Select Previous Carts', async () => {
 
       const customerInformation = await viewShoppingCartPage
         .getCustomerInformation(shoppingCartPage!);
-      await expect(customerInformation)
+      expect(customerInformation)
         .to.contains(`${Customers.johnDoe.socialTitle} ${Customers.johnDoe.firstName} ${Customers.johnDoe.lastName}`)
         .and.to.contains(Customers.johnDoe.email)
         .and.to.contains(todayCartFormat);
@@ -475,10 +475,10 @@ describe('BO - Orders - Create Order : Select Previous Carts', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'checkOrderInformationBlock', baseContext);
 
       const orderInformation = await viewShoppingCartPage.getOrderInformation(shoppingCartPage!);
-      await expect(orderInformation).to.contains('No order was created from this cart.');
+      expect(orderInformation).to.contains('No order was created from this cart.');
 
       const hasButtonCreateOrderFromCart = await viewShoppingCartPage.hasButtonCreateOrderFromCart(shoppingCartPage!);
-      await expect(hasButtonCreateOrderFromCart).to.be.true;
+      expect(hasButtonCreateOrderFromCart).to.eq(true);
     });
 
     it('should check the product stock_available in cart Summary Block', async function () {
@@ -486,7 +486,7 @@ describe('BO - Orders - Create Order : Select Previous Carts', async () => {
         .addContextItem(this, 'testIdentifier', 'checkProductStockAvailableInCartSummaryBlock', baseContext);
 
       const cartSummary = await viewShoppingCartPage.getTextColumn(shoppingCartPage!, 'stock_available');
-      await expect(cartSummary).to.contains(availableStockOfOrderedProduct.toString());
+      expect(cartSummary).to.contains(availableStockOfOrderedProduct.toString());
     });
 
     [
@@ -506,9 +506,9 @@ describe('BO - Orders - Create Order : Select Previous Carts', async () => {
         const cartSummary = await viewShoppingCartPage.getTextColumn(shoppingCartPage!, test.args.columnName);
 
         if (test.args.columnName === 'title') {
-          await expect(cartSummary).to.contains(test.args.result).and.to.contains(test.args.result_2);
+          expect(cartSummary).to.contains(test.args.result).and.to.contains(test.args.result_2);
         }
-        await expect(cartSummary).to.contains(test.args.result);
+        expect(cartSummary).to.contains(test.args.result);
       });
     });
   });
@@ -519,35 +519,35 @@ describe('BO - Orders - Create Order : Select Previous Carts', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'closeIframe', baseContext);
 
       const isIframeNotVisible = await addOrderPage.closeIframe(page);
-      await expect(isIframeNotVisible, 'iframe shopping cart is still visible').to.be.true;
+      expect(isIframeNotVisible, 'iframe shopping cart is still visible').to.eq(true);
     });
 
     it('should click on \'Use\' button and check that product table is visible on \'Cart\' block', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnUseButton', baseContext);
 
       const isProductTableVisible = await addOrderPage.clickOnCartUseButton(page);
-      await expect(isProductTableVisible, 'Product table is not visible!').to.be.true;
+      expect(isProductTableVisible, 'Product table is not visible!').to.eq(true);
     });
 
     it('should check the delivery option selected', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkDeliverySelected', baseContext);
 
       const deliveryOption = await addOrderPage.getDeliveryOption(page);
-      await expect(deliveryOption).to.contains(Carriers.myCarrier.name);
+      expect(deliveryOption).to.contains(Carriers.myCarrier.name);
     });
 
     it('should check the shipping cost', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkShippingCost', baseContext);
 
       const shippingCost = await addOrderPage.getShippingCost(page);
-      await expect(shippingCost).to.be.equal(`€${myCarrierCost.toFixed(2)}`);
+      expect(shippingCost).to.be.equal(`€${myCarrierCost.toFixed(2)}`);
     });
 
     it('should check the total', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkTotal', baseContext);
 
       const totalOrder = await addOrderPage.getTotal(page);
-      await expect(totalOrder).to.be.equal(`€${(Products.demo_1.finalPrice + myCarrierCost).toFixed(2)}`);
+      expect(totalOrder).to.be.equal(`€${(Products.demo_1.finalPrice + myCarrierCost).toFixed(2)}`);
     });
 
     it('should complete the order', async function () {
@@ -560,7 +560,7 @@ describe('BO - Orders - Create Order : Select Previous Carts', async () => {
       );
 
       const pageTitle = await orderPageProductsBlock.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderPageProductsBlock.pageTitle);
+      expect(pageTitle).to.contains(orderPageProductsBlock.pageTitle);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/05_selectPreviousOrders.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/05_selectPreviousOrders.ts
index 9d3e8b4b59d40..8dc31554f70bb 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/05_selectPreviousOrders.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/05_selectPreviousOrders.ts
@@ -107,7 +107,7 @@ describe('BO - Orders - Create order : Select previous orders', async () => {
       await customersPage.closeSfToolBar(page);
 
       const pageTitle = await customersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customersPage.pageTitle);
+      expect(pageTitle).to.contains(customersPage.pageTitle);
     });
 
     it('should filter list by email', async function () {
@@ -116,14 +116,14 @@ describe('BO - Orders - Create order : Select previous orders', async () => {
       await customersPage.filterCustomers(page, 'input', 'email', newCustomer.email);
 
       const textResult = await customersPage.getTextColumnFromTableCustomers(page, 1, 'email');
-      await expect(textResult).to.contains(newCustomer.email);
+      expect(textResult).to.contains(newCustomer.email);
     });
 
     it('should get the customer ID', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'getCustomerID', baseContext);
 
       customerID = parseInt(await customersPage.getTextColumnFromTableCustomers(page, 1, 'id_customer'), 10);
-      await expect(customerID).to.be.above(0);
+      expect(customerID).to.be.above(0);
     });
   });
 
@@ -140,14 +140,14 @@ describe('BO - Orders - Create order : Select previous orders', async () => {
       await ordersPage.closeSfToolBar(page);
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAllFilters', baseContext);
 
       const numberOfOrders = await ordersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfOrders).to.be.above(0);
+      expect(numberOfOrders).to.be.above(0);
     });
 
     it(`should filter the Orders table by 'Customer: ${newCustomer.lastName}'`, async function () {
@@ -156,14 +156,14 @@ describe('BO - Orders - Create order : Select previous orders', async () => {
       await ordersPage.filterOrders(page, 'input', 'customer', newCustomer.lastName);
 
       const textColumn = await ordersPage.getTextColumn(page, 'customer', 1);
-      await expect(textColumn).to.contains(newCustomer.lastName);
+      expect(textColumn).to.contains(newCustomer.lastName);
     });
 
     it('should get the order ID', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'getOrderID', baseContext);
 
       orderID = await ordersPage.getOrderIDNumber(page);
-      await expect(orderID).to.be.at.least(5);
+      expect(orderID).to.be.at.least(5);
     });
   });
 
@@ -175,7 +175,7 @@ describe('BO - Orders - Create order : Select previous orders', async () => {
       await ordersPage.goToCreateOrderPage(page);
 
       const pageTitle = await addOrderPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addOrderPage.pageTitle);
+      expect(pageTitle).to.contains(addOrderPage.pageTitle);
     });
 
     it(`should choose customer ${newCustomer.firstName} ${newCustomer.lastName}`, async function () {
@@ -184,7 +184,7 @@ describe('BO - Orders - Create order : Select previous orders', async () => {
       await addOrderPage.searchCustomer(page, newCustomer.email);
 
       const isCartsTableVisible = await addOrderPage.chooseCustomer(page);
-      await expect(isCartsTableVisible, 'History block is not visible!').to.be.true;
+      expect(isCartsTableVisible, 'History block is not visible!').to.eq(true);
     });
   });
 
@@ -194,21 +194,21 @@ describe('BO - Orders - Create order : Select previous orders', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'selectOrdersTab', baseContext);
 
       const isOrdersTableVisible = await addOrderPage.clickOnOrdersTab(page);
-      await expect(isOrdersTableVisible, 'Orders table is not visible!').to.be.true;
+      expect(isOrdersTableVisible, 'Orders table is not visible!').to.eq(true);
     });
 
     it('should check that there is only one order', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkOrdersNumber', baseContext);
 
       const ordersNumber = await addOrderPage.getOrdersNumber(page);
-      await expect(ordersNumber, 'Orders number is not correct!').to.be.equal(1);
+      expect(ordersNumber, 'Orders number is not correct!').to.be.equal(1);
     });
 
     it('should check the order \'id\'', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkIdOrder', baseContext);
 
       const textResult = await addOrderPage.getTextFromOrdersTable(page, 'id');
-      await expect(textResult, 'The \'id\' value is not correct!').to.contains(orderID);
+      expect(textResult, 'The \'id\' value is not correct!').to.contains(orderID);
     });
 
     [
@@ -222,7 +222,7 @@ describe('BO - Orders - Create order : Select previous orders', async () => {
         await testContext.addContextItem(this, 'testIdentifier', `check${test.args.columnName}Order`, baseContext);
 
         const textResult = await addOrderPage.getTextFromOrdersTable(page, test.args.columnName);
-        await expect(textResult, `The '${test.args.columnName}' value is not correct!`).to.contains(test.args.content);
+        expect(textResult, `The '${test.args.columnName}' value is not correct!`).to.contains(test.args.content);
       });
     });
   });
@@ -233,27 +233,27 @@ describe('BO - Orders - Create order : Select previous orders', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnDetailsButton', baseContext);
 
       const isIframeVisible = await addOrderPage.clickOnOrderDetailsButton(page);
-      await expect(isIframeVisible, 'View order Iframe is not visible!').to.be.true;
+      expect(isIframeVisible, 'View order Iframe is not visible!').to.eq(true);
     });
 
     it('should check customer title, name, lastname, reference', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkCustomerInfo', baseContext);
 
       orderIframe = await addOrderPage.getOrderIframe(page, orderID);
-      await expect(orderIframe).to.be.not.null;
+      expect(orderIframe).to.not.eq(null);
 
       const customerInfo = await orderPageCustomerBlock.getCustomerInfoBlock(orderIframe!);
-      await expect(customerInfo).to.contains(newCustomer.socialTitle);
-      await expect(customerInfo).to.contains(newCustomer.firstName);
-      await expect(customerInfo).to.contains(newCustomer.lastName);
-      await expect(customerInfo).to.contains(customerID.toString());
+      expect(customerInfo).to.contains(newCustomer.socialTitle);
+      expect(customerInfo).to.contains(newCustomer.firstName);
+      expect(customerInfo).to.contains(newCustomer.lastName);
+      expect(customerInfo).to.contains(customerID.toString());
     });
 
     it('should check number of ordered products', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkNumberOfProducts0', baseContext);
 
       const productCount = await orderPageProductsBlock.getProductsNumber(orderIframe!);
-      await expect(productCount).to.equal(1);
+      expect(productCount).to.equal(1);
     });
 
     it('should check the ordered product details', async function () {
@@ -273,14 +273,14 @@ describe('BO - Orders - Create order : Select previous orders', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'checkStatusNumber', baseContext);
 
       const statusNumber = await orderPageTabListBlock.getStatusNumber(orderIframe!);
-      await expect(statusNumber).to.be.equal(1);
+      expect(statusNumber).to.be.equal(1);
     });
 
     it('should check the status name from the table', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkStatusName', baseContext);
 
       const statusName = await orderPageTabListBlock.getTextColumnFromHistoryTable(orderIframe!, 'status', 1);
-      await expect(statusName).to.be.equal('Awaiting bank wire payment');
+      expect(statusName).to.be.equal('Awaiting bank wire payment');
     });
   });
 
@@ -290,14 +290,14 @@ describe('BO - Orders - Create order : Select previous orders', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'closeOrderIframe', baseContext);
 
       const isIframeNotVisible = await addOrderPage.closeIframe(page);
-      await expect(isIframeNotVisible, 'Order iframe still visible!').to.be.true;
+      expect(isIframeNotVisible, 'Order iframe still visible!').to.eq(true);
     });
 
     it('should click on \'Use\' button and check that product table is visible on \'Cart\' block', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnUseButton', baseContext);
 
       const isProductTableVisible = await addOrderPage.clickOnOrderUseButton(page);
-      await expect(isProductTableVisible, 'Product table is not visible!').to.be.true;
+      expect(isProductTableVisible, 'Product table is not visible!').to.eq(true);
     });
 
     it('should complete the order', async function () {
@@ -306,7 +306,7 @@ describe('BO - Orders - Create order : Select previous orders', async () => {
       await addOrderPage.setSummaryAndCreateOrder(page, paymentMethodModuleName, orderStatus);
 
       const pageTitle = await orderPageProductsBlock.getPageTitle(page);
-      await expect(pageTitle).to.contain(orderPageProductsBlock.pageTitle);
+      expect(pageTitle).to.contain(orderPageProductsBlock.pageTitle);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/06_addProductToTheCart.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/06_addProductToTheCart.ts
index ff814ca69887b..e57df696ebc4d 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/06_addProductToTheCart.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/06_addProductToTheCart.ts
@@ -224,7 +224,7 @@ describe('BO - Orders - Create order : Add a product to the cart', async () => {
       await productsPage.closeSfToolBar(page);
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     [
@@ -245,7 +245,7 @@ describe('BO - Orders - Create order : Add a product to the cart', async () => {
         }
 
         const pageTitle = await addProductPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addProductPage.pageTitle);
+        expect(pageTitle).to.contains(addProductPage.pageTitle);
       });
 
       it(`create product '${product.name}'`, async function () {
@@ -260,7 +260,7 @@ describe('BO - Orders - Create order : Add a product to the cart', async () => {
         if (product === productWithEcoTax) {
           await addProductPage.addEcoTax(page, productWithEcoTax.ecoTax);
         }
-        await expect(createProductMessage).to.equal(addProductPage.settingUpdatedMessage);
+        expect(createProductMessage).to.equal(addProductPage.settingUpdatedMessage);
       });
     });
   });
@@ -283,7 +283,7 @@ describe('BO - Orders - Create order : Add a product to the cart', async () => {
       );
 
       const pageTitle = await stocksPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(stocksPage.pageTitle);
+      expect(pageTitle).to.contains(stocksPage.pageTitle);
     });
 
     it('should get the Available stock of the simple product \'demo_11\'', async function () {
@@ -292,14 +292,14 @@ describe('BO - Orders - Create order : Add a product to the cart', async () => {
       await stocksPage.simpleFilter(page, Products.demo_11.name);
 
       availableStockSimpleProduct = parseInt(await stocksPage.getTextColumnFromTableStocks(page, 1, 'available'), 10);
-      await expect(availableStockSimpleProduct).to.be.above(0);
+      expect(availableStockSimpleProduct).to.be.above(0);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilter1', baseContext);
 
       const numberOfProductsAfterReset = await stocksPage.resetFilter(page);
-      await expect(numberOfProductsAfterReset).to.be.above(1);
+      expect(numberOfProductsAfterReset).to.be.above(1);
     });
 
     it('should get the Available stock of the product with combinations \'demo_1\'', async function () {
@@ -308,14 +308,14 @@ describe('BO - Orders - Create order : Add a product to the cart', async () => {
       await stocksPage.simpleFilter(page, Products.demo_1.name);
 
       availableStockCombinationProduct = parseInt(await stocksPage.getTextColumnFromTableStocks(page, 1, 'available'), 10);
-      await expect(availableStockCombinationProduct).to.be.above(0);
+      expect(availableStockCombinationProduct).to.be.above(0);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilter2', baseContext);
 
       const numberOfProductsAfterReset = await stocksPage.resetFilter(page);
-      await expect(numberOfProductsAfterReset).to.be.above(1);
+      expect(numberOfProductsAfterReset).to.be.above(1);
     });
 
     it('should get the Available stock of the virtual product \'demo_18\'', async function () {
@@ -324,14 +324,14 @@ describe('BO - Orders - Create order : Add a product to the cart', async () => {
       await stocksPage.simpleFilter(page, Products.demo_18.name);
 
       availableStockVirtualProduct = parseInt(await stocksPage.getTextColumnFromTableStocks(page, 1, 'available'), 10);
-      await expect(availableStockVirtualProduct).to.be.above(0);
+      expect(availableStockVirtualProduct).to.be.above(0);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilter3', baseContext);
 
       const numberOfProductsAfterReset = await stocksPage.resetFilter(page);
-      await expect(numberOfProductsAfterReset).to.be.above(1);
+      expect(numberOfProductsAfterReset).to.be.above(1);
     });
 
     it('should get the Available stock of the customized product \'demo_14\'', async function () {
@@ -340,7 +340,7 @@ describe('BO - Orders - Create order : Add a product to the cart', async () => {
       await stocksPage.simpleFilter(page, Products.demo_14.name);
 
       availableStockCustomizedProduct = parseInt(await stocksPage.getTextColumnFromTableStocks(page, 1, 'available'), 10);
-      await expect(availableStockCustomizedProduct).to.be.above(0);
+      expect(availableStockCustomizedProduct).to.be.above(0);
     });
   });
 
@@ -357,7 +357,7 @@ describe('BO - Orders - Create order : Add a product to the cart', async () => {
       await ordersPage.closeSfToolBar(page);
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should go to create order page', async function () {
@@ -366,7 +366,7 @@ describe('BO - Orders - Create order : Add a product to the cart', async () => {
       await ordersPage.goToCreateOrderPage(page);
 
       const pageTitle = await addOrderPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addOrderPage.pageTitle);
+      expect(pageTitle).to.contains(addOrderPage.pageTitle);
     });
 
     it(`should choose customer ${Customers.johnDoe.firstName} ${Customers.johnDoe.lastName}`, async function () {
@@ -375,7 +375,7 @@ describe('BO - Orders - Create order : Add a product to the cart', async () => {
       await addOrderPage.searchCustomer(page, Customers.johnDoe.email);
 
       const isCartsTableVisible = await addOrderPage.chooseCustomer(page);
-      await expect(isCartsTableVisible, 'History block is not visible!').to.be.true;
+      expect(isCartsTableVisible, 'History block is not visible!').to.eq(true);
     });
   });
 
@@ -385,7 +385,7 @@ describe('BO - Orders - Create order : Add a product to the cart', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'searchNonExistentProduct', baseContext);
 
       const alertMessage = await addOrderPage.searchProductAndGetAlert(page, 'non existent');
-      await expect(alertMessage).to.equal(addOrderPage.noProductFoundText);
+      expect(alertMessage).to.equal(addOrderPage.noProductFoundText);
     });
 
     it('should add to cart \'Standard simple product\' and check details', async function () {
@@ -465,7 +465,7 @@ describe('BO - Orders - Create order : Add a product to the cart', async () => {
         packOfProducts.name,
         productToSelect,
       );
-      await expect(alertMessage).to.equal('You must add a minimum quantity of 2');
+      expect(alertMessage).to.equal('You must add a minimum quantity of 2');
     });
 
     it('should increase the quantity of \'Pack of products\' and add it to the cart', async function () {
@@ -491,7 +491,7 @@ describe('BO - Orders - Create order : Add a product to the cart', async () => {
       const productToSelect = `${Products.demo_14.name} - €${Products.demo_14.priceTaxExcluded.toFixed(2)}`;
 
       const alertMessage = await addOrderPage.AddProductToCartAndGetAlert(page, Products.demo_14.name, productToSelect);
-      await expect(alertMessage).to.equal('Please fill in all the required fields.');
+      expect(alertMessage).to.equal('Please fill in all the required fields.');
     });
 
     it('should add customized text to \'Customized product\' and add it to the cart', async function () {
@@ -538,7 +538,7 @@ describe('BO - Orders - Create order : Add a product to the cart', async () => {
         productOutOfStockNotAllowed.name,
         productToSelect,
       );
-      await expect(alertMessage).to.equal('There are not enough products in stock.');
+      expect(alertMessage).to.equal('There are not enough products in stock.');
     });
 
     it('should add to cart product \'With specific price\' and check details', async function () {
@@ -626,14 +626,14 @@ describe('BO - Orders - Create order : Add a product to the cart', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'removeProduct', baseContext);
 
       const isProductNotVisible = await addOrderPage.removeProduct(page, 9);
-      await expect(isProductNotVisible, 'Product is still visible in the cart!').to.be.true;
+      expect(isProductNotVisible, 'Product is still visible in the cart!').to.eq(true);
     });
 
     it('should check that the gift is removed from the cart', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkThatTheGiftIsRemoved', baseContext);
 
       const isGiftNotVisible = await addOrderPage.isProductNotVisibleInCart(page, 10);
-      await expect(isGiftNotVisible, 'The gift is still visible in the cart!').to.be.true;
+      expect(isGiftNotVisible, 'The gift is still visible in the cart!').to.eq(true);
     });
 
     it('should select another currency and check that the price is changed', async function () {
@@ -659,7 +659,7 @@ describe('BO - Orders - Create order : Add a product to the cart', async () => {
       await addOrderPage.waitForVisibleProductImage(page, 3, Products.demo_18.thumbImageFR ?? '');
 
       const result = await addOrderPage.getProductDetailsFromTable(page, 3);
-      await expect(result.description).to.contains(Products.demo_18.nameFR);
+      expect(result.description).to.contains(Products.demo_18.nameFR);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/07_searchAddRemoveVoucher.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/07_searchAddRemoveVoucher.ts
index d56bd7e49b389..234c8db8e91c9 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/07_searchAddRemoveVoucher.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/07_searchAddRemoveVoucher.ts
@@ -121,7 +121,7 @@ describe('BO - Orders - Create order : Search, add and remove voucher', async ()
       await ordersPage.closeSfToolBar(page);
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should go to create order page', async function () {
@@ -130,7 +130,7 @@ describe('BO - Orders - Create order : Search, add and remove voucher', async ()
       await ordersPage.goToCreateOrderPage(page);
 
       const pageTitle = await addOrderPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addOrderPage.pageTitle);
+      expect(pageTitle).to.contains(addOrderPage.pageTitle);
     });
 
     it(`should choose customer ${Customers.johnDoe.firstName} ${Customers.johnDoe.lastName}`, async function () {
@@ -139,7 +139,7 @@ describe('BO - Orders - Create order : Search, add and remove voucher', async ()
       await addOrderPage.searchCustomer(page, Customers.johnDoe.email);
 
       const isCartsTableVisible = await addOrderPage.chooseCustomer(page);
-      await expect(isCartsTableVisible, 'History block is not visible!').to.be.true;
+      expect(isCartsTableVisible, 'History block is not visible!').to.eq(true);
     });
   });
 
@@ -199,7 +199,7 @@ describe('BO - Orders - Create order : Search, add and remove voucher', async ()
       await addOrderPage.removeVoucher(page, 1);
 
       const result = await addOrderPage.getVoucherDetailsFromTable(page);
-      await expect(result.name).to.contains(cartRuleWithoutCodeData.name);
+      expect(result.name).to.contains(cartRuleWithoutCodeData.name);
     });
   });
 
@@ -215,28 +215,28 @@ describe('BO - Orders - Create order : Search, add and remove voucher', async ()
       );
 
       const pageTitle = await cartRulesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(cartRulesPage.pageTitle);
+      expect(pageTitle).to.contains(cartRulesPage.pageTitle);
     });
 
     it('should reset and get number of cart rules', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilter', baseContext);
 
       numberOfCartRules = await cartRulesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCartRules).to.be.at.least(0);
+      expect(numberOfCartRules).to.be.at.least(0);
     });
 
     it('should delete cart rule', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteCartRule', baseContext);
 
       const validationMessage = await cartRulesPage.deleteCartRule(page, 1, cartRuleWithoutCodeData.name);
-      await expect(validationMessage).to.contains(cartRulesPage.successfulDeleteMessage);
+      expect(validationMessage).to.contains(cartRulesPage.successfulDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterBulkDelete', baseContext);
 
       const numberOfCartRulesAfterDelete = await cartRulesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCartRulesAfterDelete).to.equal(numberOfCartRules - 1);
+      expect(numberOfCartRulesAfterDelete).to.equal(numberOfCartRules - 1);
     });
   });
 
@@ -253,7 +253,7 @@ describe('BO - Orders - Create order : Search, add and remove voucher', async ()
       await ordersPage.closeSfToolBar(page);
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should go to create order page', async function () {
@@ -262,7 +262,7 @@ describe('BO - Orders - Create order : Search, add and remove voucher', async ()
       await ordersPage.goToCreateOrderPage(page);
 
       const pageTitle = await addOrderPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addOrderPage.pageTitle);
+      expect(pageTitle).to.contains(addOrderPage.pageTitle);
     });
 
     it(`should choose customer ${Customers.johnDoe.firstName} ${Customers.johnDoe.lastName}`, async function () {
@@ -271,7 +271,7 @@ describe('BO - Orders - Create order : Search, add and remove voucher', async ()
       await addOrderPage.searchCustomer(page, Customers.johnDoe.email);
 
       const isCartsTableVisible = await addOrderPage.chooseCustomer(page);
-      await expect(isCartsTableVisible, 'History block is not visible!').to.be.true;
+      expect(isCartsTableVisible, 'History block is not visible!').to.eq(true);
     });
 
     it('should add to cart the product \'demo_12\' and check details', async function () {
@@ -294,14 +294,14 @@ describe('BO - Orders - Create order : Search, add and remove voucher', async ()
       await testContext.addContextItem(this, 'testIdentifier', 'checkThatVouchersBlockIsNotVisible', baseContext);
 
       const isVoucherTableNotVisible = await addOrderPage.isVouchersTableNotVisible(page);
-      await expect(isVoucherTableNotVisible, 'Vouchers table is visible!').to.be.true;
+      expect(isVoucherTableNotVisible, 'Vouchers table is visible!').to.eq(true);
     });
 
     it('should search for the created voucher with code and check details', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'searchVoucher1', baseContext);
 
       const voucherToSelect = await addOrderPage.searchVoucher(page, cartRuleWithCodeData.name);
-      await expect(voucherToSelect).to.equal(`${cartRuleWithCodeData.name} - ${cartRuleWithCodeData.code}`);
+      expect(voucherToSelect).to.equal(`${cartRuleWithCodeData.name} - ${cartRuleWithCodeData.code}`);
 
       const result = await addOrderPage.getVoucherDetailsFromTable(page);
       await Promise.all([
@@ -338,7 +338,7 @@ describe('BO - Orders - Create order : Search, add and remove voucher', async ()
       await addOrderPage.searchVoucher(page, cartRuleWithCodeData.name);
 
       const voucherErrorText = await addOrderPage.getCartRuleErrorText(page);
-      await expect(voucherErrorText).to.equal(addOrderPage.cartRuleAlreadyExistErrorText);
+      expect(voucherErrorText).to.equal(addOrderPage.cartRuleAlreadyExistErrorText);
     });
 
     it('should remove voucher and check that vouchers table is not visible', async function () {
@@ -347,7 +347,7 @@ describe('BO - Orders - Create order : Search, add and remove voucher', async ()
       await addOrderPage.removeVoucher(page, 1);
 
       const isVoucherTableNotVisible = await addOrderPage.isVouchersTableNotVisible(page);
-      await expect(isVoucherTableNotVisible, 'Vouchers table is visible!').to.be.true;
+      expect(isVoucherTableNotVisible, 'Vouchers table is visible!').to.eq(true);
     });
 
     it('should check summary block', async function () {
@@ -373,7 +373,7 @@ describe('BO - Orders - Create order : Search, add and remove voucher', async ()
       await testContext.addContextItem(this, 'testIdentifier', 'searchInvalidVoucher', baseContext);
 
       const searchResult = await addOrderPage.searchVoucher(page, 'testVoucher');
-      await expect(searchResult).to.equal(addOrderPage.noVoucherFoudErrorMessage);
+      expect(searchResult).to.equal(addOrderPage.noVoucherFoudErrorMessage);
     });
   });
 
@@ -383,10 +383,10 @@ describe('BO - Orders - Create order : Search, add and remove voucher', async ()
       await testContext.addContextItem(this, 'testIdentifier', 'addVoucherAndGetIframe', baseContext);
 
       const isIframeVisible = await addOrderPage.clickOnAddVoucherButton(page);
-      await expect(isIframeVisible, 'Add cart rule frame is not visible!').to.be.true;
+      expect(isIframeVisible, 'Add cart rule frame is not visible!').to.eq(true);
 
       addVoucherPage = await addOrderPage.getCreateVoucherIframe(page);
-      await expect(addVoucherPage).to.be.not.null;
+      expect(addVoucherPage).to.not.eq(null);
     });
 
     it('should create then search for the disabled voucher and check the error message', async function () {
@@ -397,7 +397,7 @@ describe('BO - Orders - Create order : Search, add and remove voucher', async ()
       await addOrderPage.searchVoucher(page, disabledCartRuleData.name);
 
       const voucherErrorText = await addOrderPage.getCartRuleErrorText(page);
-      await expect(voucherErrorText).to.equal(addOrderPage.voucherDisabledErrorMessage);
+      expect(voucherErrorText).to.equal(addOrderPage.voucherDisabledErrorMessage);
     });
   });
 
@@ -407,14 +407,14 @@ describe('BO - Orders - Create order : Search, add and remove voucher', async ()
       await testContext.addContextItem(this, 'testIdentifier', 'AddVoucherAndCheckIframe', baseContext);
 
       const isIframeVisible = await addOrderPage.clickOnAddVoucherButton(page);
-      await expect(isIframeVisible, 'Add cart rule frame is not visible!').to.be.true;
+      expect(isIframeVisible, 'Add cart rule frame is not visible!').to.eq(true);
     });
 
     it('should create the cart rule', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'CreateCArtRuleWithGift', baseContext);
 
       addVoucherPage = await addOrderPage.getCreateVoucherIframe(page);
-      await expect(addVoucherPage).to.be.not.null;
+      expect(addVoucherPage).to.not.eq(null);
 
       await addCartRulePage.createEditCartRules(addVoucherPage!, cartRuleWithGiftData, false);
     });
@@ -423,7 +423,7 @@ describe('BO - Orders - Create order : Search, add and remove voucher', async ()
       await testContext.addContextItem(this, 'testIdentifier', 'searchVoucherWithGift', baseContext);
 
       const voucherToSelect = await addOrderPage.searchVoucher(page, cartRuleWithGiftData.name);
-      await expect(voucherToSelect).to.equal(`${cartRuleWithGiftData.name} - ${cartRuleWithGiftData.code}`);
+      expect(voucherToSelect).to.equal(`${cartRuleWithGiftData.name} - ${cartRuleWithGiftData.code}`);
 
       const result = await addOrderPage.getVoucherDetailsFromTable(page, 1);
       await Promise.all([
@@ -469,14 +469,14 @@ describe('BO - Orders - Create order : Search, add and remove voucher', async ()
       await addOrderPage.removeVoucher(page, 1);
 
       const isVoucherTableNotVisible = await addOrderPage.isVouchersTableNotVisible(page);
-      await expect(isVoucherTableNotVisible, 'Vouchers table is visible!').to.be.true;
+      expect(isVoucherTableNotVisible, 'Vouchers table is visible!').to.eq(true);
     });
 
     it('should check that the gift product is deleted', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'CheckGiftDeleted', baseContext);
 
       const isRowNotVisible = await addOrderPage.isProductTableRowNotVisible(page, 2);
-      await expect(isRowNotVisible, 'Gift product still visible on products table!').to.be.true;
+      expect(isRowNotVisible, 'Gift product still visible on products table!').to.eq(true);
     });
 
     it('should check summary block', async function () {
@@ -502,14 +502,14 @@ describe('BO - Orders - Create order : Search, add and remove voucher', async ()
       await testContext.addContextItem(this, 'testIdentifier', 'clickToAddFreeShippingVoucher', baseContext);
 
       const isIframeVisible = await addOrderPage.clickOnAddVoucherButton(page);
-      await expect(isIframeVisible, 'Add cart rule frame is not visible!').to.be.true;
+      expect(isIframeVisible, 'Add cart rule frame is not visible!').to.eq(true);
     });
 
     it('should create the cart rule', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'addFreeShippingVoucher', baseContext);
 
       addVoucherPage = await addOrderPage.getCreateVoucherIframe(page);
-      await expect(addVoucherPage).to.be.not.null;
+      expect(addVoucherPage).to.not.eq(null);
 
       await addCartRulePage.createEditCartRules(addVoucherPage!, cartRuleFreeShippingData, false);
     });
@@ -518,7 +518,7 @@ describe('BO - Orders - Create order : Search, add and remove voucher', async ()
       await testContext.addContextItem(this, 'testIdentifier', 'searchFreeShippingVoucher', baseContext);
 
       const voucherToSelect = await addOrderPage.searchVoucher(page, cartRuleFreeShippingData.name);
-      await expect(voucherToSelect).to.equal(`${cartRuleFreeShippingData.name} - ${cartRuleFreeShippingData.code}`);
+      expect(voucherToSelect).to.equal(`${cartRuleFreeShippingData.name} - ${cartRuleFreeShippingData.code}`);
 
       const result = await addOrderPage.getVoucherDetailsFromTable(page);
       await Promise.all([
@@ -534,7 +534,7 @@ describe('BO - Orders - Create order : Search, add and remove voucher', async ()
       const shippingPriceTTC = await addOrderPage.setDeliveryOption(
         page, `${Carriers.myCarrier.name} - Delivery next day!`,
       );
-      await expect(shippingPriceTTC).to.equal(`€${Carriers.myCarrier.priceTTC.toFixed(2)}`);
+      expect(shippingPriceTTC).to.equal(`€${Carriers.myCarrier.priceTTC.toFixed(2)}`);
     });
 
     it('should re-check voucher details', async function () {
diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/08_chooseAddress.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/08_chooseAddress.ts
index 62b5cc110c8da..68a219d58e7e5 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/08_chooseAddress.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/08_chooseAddress.ts
@@ -93,7 +93,7 @@ describe('BO - Orders - Create order : Choose address', async () => {
       await ordersPage.closeSfToolBar(page);
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should go to create order page', async function () {
@@ -102,7 +102,7 @@ describe('BO - Orders - Create order : Choose address', async () => {
       await ordersPage.goToCreateOrderPage(page);
 
       const pageTitle = await addOrderPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addOrderPage.pageTitle);
+      expect(pageTitle).to.contains(addOrderPage.pageTitle);
     });
 
     it(`should choose customer ${Customers.johnDoe.firstName} ${Customers.johnDoe.lastName}`, async function () {
@@ -111,7 +111,7 @@ describe('BO - Orders - Create order : Choose address', async () => {
       await addOrderPage.searchCustomer(page, Customers.johnDoe.email);
 
       const isCartsTableVisible = await addOrderPage.chooseCustomer(page);
-      await expect(isCartsTableVisible, 'History block is not visible!').to.be.true;
+      expect(isCartsTableVisible, 'History block is not visible!').to.eq(true);
     });
 
     it('should add to cart the product \'demo_12\' and check details', async function () {
@@ -134,7 +134,7 @@ describe('BO - Orders - Create order : Choose address', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'chooseCreatedDeliveryAddress', baseContext);
 
       const newAddress = await addOrderPage.chooseDeliveryAddress(page, newAddressToCreate.alias);
-      await expect(newAddress).to.be.equal(`${newAddressToCreate.firstName} ${newAddressToCreate.lastName}`
+      expect(newAddress).to.be.equal(`${newAddressToCreate.firstName} ${newAddressToCreate.lastName}`
         + `${newAddressToCreate.company}${newAddressToCreate.address}${newAddressToCreate.secondAddress}`
         + `${newAddressToCreate.postalCode} ${newAddressToCreate.city}${newAddressToCreate.country}`
         + `${newAddressToCreate.phone}`);
@@ -144,7 +144,7 @@ describe('BO - Orders - Create order : Choose address', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'chooseCreatedInvoiceAddress', baseContext);
 
       const newAddress = await addOrderPage.chooseInvoiceAddress(page, newAddressToCreate.alias);
-      await expect(newAddress).to.be.equal(`${newAddressToCreate.firstName} ${newAddressToCreate.lastName}`
+      expect(newAddress).to.be.equal(`${newAddressToCreate.firstName} ${newAddressToCreate.lastName}`
         + `${newAddressToCreate.company}${newAddressToCreate.address}${newAddressToCreate.secondAddress}`
         + `${newAddressToCreate.postalCode} ${newAddressToCreate.city}${newAddressToCreate.country}`
         + `${newAddressToCreate.phone}`);
@@ -156,14 +156,14 @@ describe('BO - Orders - Create order : Choose address', async () => {
       await addOrderPage.setSummaryAndCreateOrder(page, paymentMethodModuleName, OrderStatuses.paymentAccepted);
 
       const pageTitle = await orderPageCustomerBlock.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderPageCustomerBlock.pageTitle);
+      expect(pageTitle).to.contains(orderPageCustomerBlock.pageTitle);
     });
 
     it('should get the order ID', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'getOrderID', baseContext);
 
       orderID = await orderPageCustomerBlock.getOrderID(page);
-      await expect(orderID).to.be.at.least(5);
+      expect(orderID).to.be.at.least(5);
     });
   });
 
@@ -179,7 +179,7 @@ describe('BO - Orders - Create order : Choose address', async () => {
       );
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should go to create order page', async function () {
@@ -188,7 +188,7 @@ describe('BO - Orders - Create order : Choose address', async () => {
       await ordersPage.goToCreateOrderPage(page);
 
       const pageTitle = await addOrderPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addOrderPage.pageTitle);
+      expect(pageTitle).to.contains(addOrderPage.pageTitle);
     });
 
     it(`should choose customer ${Customers.johnDoe.firstName} ${Customers.johnDoe.lastName}`, async function () {
@@ -197,14 +197,14 @@ describe('BO - Orders - Create order : Choose address', async () => {
       await addOrderPage.searchCustomer(page, Customers.johnDoe.email);
 
       const isCartsTableVisible = await addOrderPage.chooseCustomer(page);
-      await expect(isCartsTableVisible, 'History block is not visible!').to.be.true;
+      expect(isCartsTableVisible, 'History block is not visible!').to.eq(true);
     });
 
     it(`should choose the delivery address '${newAddressToCreate.alias}' and check details`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'chooseCreatedDeliveryAddress2', baseContext);
 
       const newAddress = await addOrderPage.chooseDeliveryAddress(page, newAddressToCreate.alias);
-      await expect(newAddress).to.be.equal(`${newAddressToCreate.firstName} ${newAddressToCreate.lastName}`
+      expect(newAddress).to.be.equal(`${newAddressToCreate.firstName} ${newAddressToCreate.lastName}`
         + `${newAddressToCreate.company}${newAddressToCreate.address}${newAddressToCreate.secondAddress}`
         + `${newAddressToCreate.postalCode} ${newAddressToCreate.city}${newAddressToCreate.country}`
         + `${newAddressToCreate.phone}`);
@@ -214,7 +214,7 @@ describe('BO - Orders - Create order : Choose address', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'chooseCreatedInvoiceAddress2', baseContext);
 
       const newAddress = await addOrderPage.chooseInvoiceAddress(page, newAddressToCreate.alias);
-      await expect(newAddress).to.be.equal(`${newAddressToCreate.firstName} ${newAddressToCreate.lastName}`
+      expect(newAddress).to.be.equal(`${newAddressToCreate.firstName} ${newAddressToCreate.lastName}`
         + `${newAddressToCreate.company}${newAddressToCreate.address}${newAddressToCreate.secondAddress}`
         + `${newAddressToCreate.postalCode} ${newAddressToCreate.city}${newAddressToCreate.country}`
         + `${newAddressToCreate.phone}`);
@@ -228,19 +228,19 @@ describe('BO - Orders - Create order : Choose address', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'clickOnEditAddress', baseContext);
 
         const isIframeVisible = await addOrderPage.clickOnEditDeliveryAddressButton(page);
-        await expect(isIframeVisible, 'Edit address iframe is not visible!').to.be.true;
+        expect(isIframeVisible, 'Edit address iframe is not visible!').to.eq(true);
       });
 
       it('should edit the address and check it', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'editAddress', baseContext);
 
         editAddressIframe = await addOrderPage.getEditAddressIframe(page);
-        await expect(editAddressIframe).to.be.not.null;
+        expect(editAddressIframe).to.not.eq(null);
 
         await addAddressPage.createEditAddress(editAddressIframe!, addressToEditData, true, false);
 
         const editedAddress = await addOrderPage.getDeliveryAddressDetails(page);
-        await expect(editedAddress).to.be.equal(`${addressToEditData.firstName} ${addressToEditData.lastName}`
+        expect(editedAddress).to.be.equal(`${addressToEditData.firstName} ${addressToEditData.lastName}`
           + `${addressToEditData.company}${addressToEditData.address}${addressToEditData.secondAddress}`
           + `${addressToEditData.postalCode} ${addressToEditData.city}${addressToEditData.country}`
           + `${addressToEditData.phone}`);
@@ -258,7 +258,7 @@ describe('BO - Orders - Create order : Choose address', async () => {
         );
 
         const pageTitle = await ordersPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(ordersPage.pageTitle);
+        expect(pageTitle).to.contains(ordersPage.pageTitle);
       });
 
       it('should filter the list by order ID', async function () {
@@ -267,7 +267,7 @@ describe('BO - Orders - Create order : Choose address', async () => {
         await ordersPage.filterOrders(page, 'input', 'id_order', orderID.toString());
 
         const numberOfOrdersAfterFilter = await ordersPage.getNumberOfElementInGrid(page);
-        await expect(numberOfOrdersAfterFilter).to.be.equal(1);
+        expect(numberOfOrdersAfterFilter).to.be.equal(1);
       });
 
       it('should view the order', async function () {
@@ -276,14 +276,14 @@ describe('BO - Orders - Create order : Choose address', async () => {
         await ordersPage.goToOrder(page, 1);
 
         const pageTitle = await orderPageCustomerBlock.getPageTitle(page);
-        await expect(pageTitle).to.contains(orderPageCustomerBlock.pageTitle);
+        expect(pageTitle).to.contains(orderPageCustomerBlock.pageTitle);
       });
 
       it('should check the shipping address', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkShippingAddress', baseContext);
 
         const shippingAddress = await orderPageCustomerBlock.getShippingAddress(page);
-        await expect(shippingAddress)
+        expect(shippingAddress)
           .to.contain(newAddressToCreate.firstName)
           .and.to.contain(newAddressToCreate.lastName)
           .and.to.contain(newAddressToCreate.address)
@@ -297,7 +297,7 @@ describe('BO - Orders - Create order : Choose address', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'checkInvoiceAddress', baseContext);
 
         const shippingAddress = await orderPageCustomerBlock.getInvoiceAddress(page);
-        await expect(shippingAddress)
+        expect(shippingAddress)
           .to.contain(newAddressToCreate.firstName)
           .and.to.contain(newAddressToCreate.lastName)
           .and.to.contain(newAddressToCreate.address)
@@ -318,7 +318,7 @@ describe('BO - Orders - Create order : Choose address', async () => {
         await homePage.changeLanguage(page, 'en');
 
         const isHomePage = await homePage.isHomePage(page);
-        await expect(isHomePage, 'Home page is not displayed').to.be.true;
+        expect(isHomePage, 'Home page is not displayed').to.eq(true);
       });
 
       it('should go to login page', async function () {
@@ -327,7 +327,7 @@ describe('BO - Orders - Create order : Choose address', async () => {
         await homePage.goToLoginPage(page);
 
         const pageTitle = await foLoginPage.getPageTitle(page);
-        await expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
+        expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
       });
 
       it('should sign in with customer credentials', async function () {
@@ -336,7 +336,7 @@ describe('BO - Orders - Create order : Choose address', async () => {
         await foLoginPage.customerLogin(page, Customers.johnDoe);
 
         const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
-        await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+        expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
       });
 
       it('should go to account page', async function () {
@@ -345,7 +345,7 @@ describe('BO - Orders - Create order : Choose address', async () => {
         await homePage.goToMyAccountPage(page);
 
         const pageTitle = await myAccountPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(myAccountPage.pageTitle);
+        expect(pageTitle).to.contains(myAccountPage.pageTitle);
       });
 
       it('should go to \'Order history and details\' page', async function () {
@@ -354,7 +354,7 @@ describe('BO - Orders - Create order : Choose address', async () => {
         await myAccountPage.goToHistoryAndDetailsPage(page);
 
         const pageTitle = await orderHistoryPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(orderHistoryPage.pageTitle);
+        expect(pageTitle).to.contains(orderHistoryPage.pageTitle);
       });
 
       it('should click on details link of the first created order and check the delivery address', async function () {
@@ -363,7 +363,7 @@ describe('BO - Orders - Create order : Choose address', async () => {
         await orderHistoryPage.goToOrderDetailsPage(page, orderID);
 
         const deliveryAddress = await orderDetailsPage.getDeliveryAddress(page);
-        await expect(deliveryAddress).to.contain(newAddressToCreate.firstName)
+        expect(deliveryAddress).to.contain(newAddressToCreate.firstName)
           .and.to.contain(newAddressToCreate.lastName)
           .and.to.contain(newAddressToCreate.address)
           .and.to.contain(newAddressToCreate.postalCode)
@@ -376,7 +376,7 @@ describe('BO - Orders - Create order : Choose address', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'checkInvoiceAddressFO', baseContext);
 
         const deliveryAddress = await orderDetailsPage.getInvoiceAddress(page);
-        await expect(deliveryAddress).to.contain(newAddressToCreate.firstName)
+        expect(deliveryAddress).to.contain(newAddressToCreate.firstName)
           .and.to.contain(newAddressToCreate.lastName)
           .and.to.contain(newAddressToCreate.address)
           .and.to.contain(newAddressToCreate.postalCode)
@@ -391,7 +391,7 @@ describe('BO - Orders - Create order : Choose address', async () => {
         page = await orderDetailsPage.closePage(browserContext, page, 0);
 
         const pageTitle = await orderPageCustomerBlock.getPageTitle(page);
-        await expect(pageTitle).to.contains(orderPageCustomerBlock.pageTitle);
+        expect(pageTitle).to.contains(orderPageCustomerBlock.pageTitle);
       });
     });
 
@@ -406,7 +406,7 @@ describe('BO - Orders - Create order : Choose address', async () => {
         );
 
         const pageTitle = await ordersPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(ordersPage.pageTitle);
+        expect(pageTitle).to.contains(ordersPage.pageTitle);
       });
 
       it('should go to create order page', async function () {
@@ -415,7 +415,7 @@ describe('BO - Orders - Create order : Choose address', async () => {
         await ordersPage.goToCreateOrderPage(page);
 
         const pageTitle = await addOrderPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addOrderPage.pageTitle);
+        expect(pageTitle).to.contains(addOrderPage.pageTitle);
       });
 
       it(`should choose customer ${Customers.johnDoe.firstName} ${Customers.johnDoe.lastName}`, async function () {
@@ -424,14 +424,14 @@ describe('BO - Orders - Create order : Choose address', async () => {
         await addOrderPage.searchCustomer(page, Customers.johnDoe.email);
 
         const isCartsTableVisible = await addOrderPage.chooseCustomer(page);
-        await expect(isCartsTableVisible, 'History block is not visible!').to.be.true;
+        expect(isCartsTableVisible, 'History block is not visible!').to.eq(true);
       });
 
       it(`should choose the address '${addressToEditData.alias}'`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'chooseMyAddress', baseContext);
 
         const editedAddress = await addOrderPage.chooseInvoiceAddress(page, addressToEditData.alias);
-        await expect(editedAddress).to.be.equal(`${addressToEditData.firstName} ${addressToEditData.lastName}`
+        expect(editedAddress).to.be.equal(`${addressToEditData.firstName} ${addressToEditData.lastName}`
           + `${addressToEditData.company}${addressToEditData.address}${addressToEditData.secondAddress}`
           + `${addressToEditData.postalCode} ${addressToEditData.city}${addressToEditData.country}`
           + `${addressToEditData.phone}`);
@@ -441,19 +441,19 @@ describe('BO - Orders - Create order : Choose address', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'clickOnEditAddress2', baseContext);
 
         const isIframeVisible = await addOrderPage.clickOnEditInvoiceAddressButton(page);
-        await expect(isIframeVisible, 'Edit address iframe is not visible!').to.be.true;
+        expect(isIframeVisible, 'Edit address iframe is not visible!').to.eq(true);
       });
 
       it('should edit the address and check it', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'editAddress2', baseContext);
 
         editAddressIframe = await addOrderPage.getEditAddressIframe(page);
-        await expect(editAddressIframe).to.be.not.null;
+        expect(editAddressIframe).to.not.eq(null);
 
         await addAddressPage.createEditAddress(editAddressIframe!, newAddressToCreate, true, false);
 
         const editedAddress = await addOrderPage.getInvoiceAddressDetails(page);
-        await expect(editedAddress).to.be.equal(`${newAddressToCreate.firstName} ${newAddressToCreate.lastName}`
+        expect(editedAddress).to.be.equal(`${newAddressToCreate.firstName} ${newAddressToCreate.lastName}`
           + `${newAddressToCreate.company}${newAddressToCreate.address}${newAddressToCreate.secondAddress}`
           + `${newAddressToCreate.postalCode} ${newAddressToCreate.city}${newAddressToCreate.country}`
           + `${newAddressToCreate.phone}`);
@@ -467,26 +467,26 @@ describe('BO - Orders - Create order : Choose address', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnEditAddress3', baseContext);
 
       const isIframeVisible = await addOrderPage.clickOnAddNewAddressButton(page);
-      await expect(isIframeVisible, 'Add address iframe is not visible!').to.be.true;
+      expect(isIframeVisible, 'Add address iframe is not visible!').to.eq(true);
     });
 
     it('should add new address', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'addNewAddress', baseContext);
 
       addAddressIframe = await addOrderPage.getAddAddressIframe(page);
-      await expect(addAddressIframe).to.be.not.null;
+      expect(addAddressIframe).to.not.eq(null);
 
       await addAddressPage.createEditAddress(addAddressIframe!, newAddressData, true, false);
 
       const deliveryAddress = await addOrderPage.getDeliveryAddressList(page);
-      await expect(deliveryAddress).to.contains(newAddressData.alias);
+      expect(deliveryAddress).to.contains(newAddressData.alias);
     });
 
     it('should choose the new delivery address', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'chooseNewDeliveryAddress', baseContext);
 
       const newAddress = await addOrderPage.chooseDeliveryAddress(page, newAddressData.alias);
-      await expect(newAddress).to.be.equal(`${newAddressData.firstName} ${newAddressData.lastName}`
+      expect(newAddress).to.be.equal(`${newAddressData.firstName} ${newAddressData.lastName}`
         + `${newAddressData.company}${newAddressData.address}${newAddressData.secondAddress}`
         + `${newAddressData.postalCode} ${newAddressData.city}${newAddressData.country}`
         + `${newAddressData.phone}`);
@@ -496,7 +496,7 @@ describe('BO - Orders - Create order : Choose address', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'selectNewInvoiceAddress', baseContext);
 
       const newAddress = await addOrderPage.chooseInvoiceAddress(page, newAddressData.alias);
-      await expect(newAddress).to.be.equal(`${newAddressData.firstName} ${newAddressData.lastName}`
+      expect(newAddress).to.be.equal(`${newAddressData.firstName} ${newAddressData.lastName}`
         + `${newAddressData.company}${newAddressData.address}${newAddressData.secondAddress}`
         + `${newAddressData.postalCode} ${newAddressData.city}${newAddressData.country}`
         + `${newAddressData.phone}`);
diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/09_chooseShipping.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/09_chooseShipping.ts
index ed71565011e4f..719ad757a2dd9 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/09_chooseShipping.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/09_chooseShipping.ts
@@ -91,7 +91,7 @@ describe('BO - Orders - Create order : Choose shipping', async () => {
       await orderSettingsPage.closeSfToolBar(page);
 
       const pageTitle = await orderSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
     });
 
     it(`should configure gift options: price '€${giftOptions.price}' and tax '${giftOptions.tax}`, async function () {
@@ -104,7 +104,7 @@ describe('BO - Orders - Create order : Choose shipping', async () => {
         giftOptions.tax,
         giftOptions.isRecyclablePackage,
       );
-      await expect(result).to.contains(orderSettingsPage.successfulUpdateMessage);
+      expect(result).to.contains(orderSettingsPage.successfulUpdateMessage);
     });
   });
 
@@ -121,7 +121,7 @@ describe('BO - Orders - Create order : Choose shipping', async () => {
       await ordersPage.closeSfToolBar(page);
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should go to create order page', async function () {
@@ -130,7 +130,7 @@ describe('BO - Orders - Create order : Choose shipping', async () => {
       await ordersPage.goToCreateOrderPage(page);
 
       const pageTitle = await addOrderPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addOrderPage.pageTitle);
+      expect(pageTitle).to.contains(addOrderPage.pageTitle);
     });
 
     it(`should choose customer ${Customers.johnDoe.firstName} ${Customers.johnDoe.lastName}`, async function () {
@@ -139,7 +139,7 @@ describe('BO - Orders - Create order : Choose shipping', async () => {
       await addOrderPage.searchCustomer(page, Customers.johnDoe.email);
 
       const isCartsTableVisible = await addOrderPage.chooseCustomer(page);
-      await expect(isCartsTableVisible, 'History block is not visible!').to.be.true;
+      expect(isCartsTableVisible, 'History block is not visible!').to.eq(true);
     });
   });
 
@@ -149,7 +149,7 @@ describe('BO - Orders - Create order : Choose shipping', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'checkThatShippingBlockNotVisible', baseContext);
 
       const isVisible = await addOrderPage.isShippingBlockVisible(page);
-      await expect(isVisible, 'Shipping block is visible!').to.be.false;
+      expect(isVisible, 'Shipping block is visible!').to.eq(false);
     });
 
     it('should add product to cart', async function () {
@@ -169,7 +169,7 @@ describe('BO - Orders - Create order : Choose shipping', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'checkThatShippingBlockVisible', baseContext);
 
       const isVisible = await addOrderPage.isShippingBlockVisible(page);
-      await expect(isVisible, 'Shipping block is not visible!').to.be.true;
+      expect(isVisible, 'Shipping block is not visible!').to.eq(true);
     });
 
     it(`should choose the carrier '${Carriers.myCarrier.name}' and check shipping price`, async function () {
@@ -178,7 +178,7 @@ describe('BO - Orders - Create order : Choose shipping', async () => {
       const shippingPriceTTC = await addOrderPage.setDeliveryOption(
         page, `${Carriers.myCarrier.name} - Delivery next day!`,
       );
-      await expect(shippingPriceTTC).to.equal(`€${Carriers.myCarrier.priceTTC.toFixed(2)}`);
+      expect(shippingPriceTTC).to.equal(`€${Carriers.myCarrier.priceTTC.toFixed(2)}`);
     });
 
     it('should check summary block', async function () {
@@ -201,7 +201,7 @@ describe('BO - Orders - Create order : Choose shipping', async () => {
       await addOrderPage.setFreeShipping(page, true);
 
       const shippingPrice = await addOrderPage.getShippingCost(page);
-      await expect(shippingPrice).to.be.equal('€0.00');
+      expect(shippingPrice).to.be.equal('€0.00');
     });
 
     it('should re-check summary block', async function () {
@@ -246,14 +246,14 @@ describe('BO - Orders - Create order : Choose shipping', async () => {
       await addOrderPage.setSummaryAndCreateOrder(page, paymentMethodModuleName, orderStatus);
 
       const pageTitle = await orderPageProductsBlock.getPageTitle(page);
-      await expect(pageTitle).to.contain(orderPageProductsBlock.pageTitle);
+      expect(pageTitle).to.contain(orderPageProductsBlock.pageTitle);
     });
 
     it('should check \'Recycled packaging\' and \'gift wrapping\' badges', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkBadges', baseContext);
 
       const recyclePackagingBadge = await orderPageTabListBlock.getSuccessBadge(page, 2);
-      await expect(recyclePackagingBadge).to.contain('Recycled packaging')
+      expect(recyclePackagingBadge).to.contain('Recycled packaging')
         .and.to.contain('Gift wrapping');
     });
 
@@ -261,7 +261,7 @@ describe('BO - Orders - Create order : Choose shipping', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'checkGiftMessage', baseContext);
 
       const giftMessageText = await orderPageTabListBlock.getGiftMessage(page);
-      await expect(giftMessageText).to.be.equal(giftMessage);
+      expect(giftMessageText).to.be.equal(giftMessage);
     });
   });
 
@@ -278,7 +278,7 @@ describe('BO - Orders - Create order : Choose shipping', async () => {
       await orderSettingsPage.closeSfToolBar(page);
 
       const pageTitle = await orderSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
     });
 
     it('should go back to default configuration', async function () {
@@ -291,7 +291,7 @@ describe('BO - Orders - Create order : Choose shipping', async () => {
         defaultGiftOptions.tax,
         defaultGiftOptions.isRecyclablePackage,
       );
-      await expect(result).to.contains(orderSettingsPage.successfulUpdateMessage);
+      expect(result).to.contains(orderSettingsPage.successfulUpdateMessage);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/10_checkSummary.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/10_checkSummary.ts
index ea48601f20eb5..f37301af99f4b 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/10_checkSummary.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/createOrders/10_checkSummary.ts
@@ -108,7 +108,7 @@ describe('BO - Orders - Create order : Check summary', async () => {
       await ordersPage.closeSfToolBar(page);
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should go to create order page', async function () {
@@ -117,7 +117,7 @@ describe('BO - Orders - Create order : Check summary', async () => {
       await ordersPage.goToCreateOrderPage(page);
 
       const pageTitle = await addOrderPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addOrderPage.pageTitle);
+      expect(pageTitle).to.contains(addOrderPage.pageTitle);
     });
 
     it(`should choose customer ${Customers.johnDoe.firstName} ${Customers.johnDoe.lastName}`, async function () {
@@ -126,14 +126,14 @@ describe('BO - Orders - Create order : Check summary', async () => {
       await addOrderPage.searchCustomer(page, Customers.johnDoe.email);
 
       const isCartsTableVisible = await addOrderPage.chooseCustomer(page);
-      await expect(isCartsTableVisible, 'History block is not visible!').to.be.true;
+      expect(isCartsTableVisible, 'History block is not visible!').to.eq(true);
     });
 
     it('should check that summary block is not visible', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkSummaryNotVisible', baseContext);
 
       const isSummaryBlockVisible = await addOrderPage.isSummaryBlockVisible(page);
-      await expect(isSummaryBlockVisible, 'Summary block is visible!').to.be.false;
+      expect(isSummaryBlockVisible, 'Summary block is visible!').to.eq(false);
     });
 
     it(`should add to cart '${Products.demo_12.name}'`, async function () {
@@ -155,7 +155,7 @@ describe('BO - Orders - Create order : Check summary', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'checkSummaryVisible', baseContext);
 
       const isSummaryBlockVisible = await addOrderPage.isSummaryBlockVisible(page);
-      await expect(isSummaryBlockVisible, 'Summary block is not visible!').to.be.true;
+      expect(isSummaryBlockVisible, 'Summary block is not visible!').to.eq(true);
     });
   });
 
@@ -182,7 +182,7 @@ describe('BO - Orders - Create order : Check summary', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'searchVoucher1', baseContext);
 
         const voucherToSelect = await addOrderPage.searchVoucher(page, cartRuleWithCodeData.name);
-        await expect(voucherToSelect).to.equal(`${cartRuleWithCodeData.name} - ${cartRuleWithCodeData.code}`);
+        expect(voucherToSelect).to.equal(`${cartRuleWithCodeData.name} - ${cartRuleWithCodeData.code}`);
 
         const result = await addOrderPage.getVoucherDetailsFromTable(page);
         await Promise.all([
@@ -218,7 +218,7 @@ describe('BO - Orders - Create order : Check summary', async () => {
         await addOrderPage.removeVoucher(page, 1);
 
         const isVoucherTableNotVisible = await addOrderPage.isVouchersTableNotVisible(page);
-        await expect(isVoucherTableNotVisible, 'Vouchers table is visible!').to.be.true;
+        expect(isVoucherTableNotVisible, 'Vouchers table is visible!').to.eq(true);
       });
 
       it('should check summary block', async function () {
@@ -243,7 +243,7 @@ describe('BO - Orders - Create order : Check summary', async () => {
         const shippingPriceTTC = await addOrderPage.setDeliveryOption(
           page, `${Carriers.myCarrier.name} - Delivery next day!`,
         );
-        await expect(shippingPriceTTC).to.equal(`€${Carriers.myCarrier.priceTTC.toFixed(2)}`);
+        expect(shippingPriceTTC).to.equal(`€${Carriers.myCarrier.priceTTC.toFixed(2)}`);
       });
 
       it('should check summary block', async function () {
@@ -266,14 +266,14 @@ describe('BO - Orders - Create order : Check summary', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'setMoreActions', baseContext);
 
         const textMessage = await addOrderPage.setMoreActionsPreFilledOrder(page);
-        await expect(textMessage, 'Invalid success message!').to.be.equal(addOrderPage.emailSendSuccessMessage);
+        expect(textMessage, 'Invalid success message!').to.be.equal(addOrderPage.emailSendSuccessMessage);
       });
 
       it('should check if the mail is in mailbox', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkIfMailIsInMailbox', baseContext);
 
-        await expect(newMail.subject).to.eq(`[${global.INSTALL.SHOP_NAME}] Process the payment of your order`);
-        await expect(newMail.text).to.contains('A new order has been generated on your behalf.');
+        expect(newMail.subject).to.eq(`[${global.INSTALL.SHOP_NAME}] Process the payment of your order`);
+        expect(newMail.text).to.contains('A new order has been generated on your behalf.');
       });
 
       it('should choose \'Proceed to checkout in the front office\' from more actions', async function () {
@@ -282,7 +282,7 @@ describe('BO - Orders - Create order : Check summary', async () => {
         page = await addOrderPage.setMoreActionsProceedToCheckout(page);
 
         const isCheckoutPage = await checkoutPage.isCheckoutPage(page);
-        await expect(isCheckoutPage, 'Not redirected to checkout page!').to.be.true;
+        expect(isCheckoutPage, 'Not redirected to checkout page!').to.eq(true);
       });
 
       it('should close the checkout page and go back to BO', async function () {
@@ -291,7 +291,7 @@ describe('BO - Orders - Create order : Check summary', async () => {
         page = await checkoutPage.closePage(browserContext, page, 0);
 
         const pageTitle = await addOrderPage.getPageTitle(page);
-        await expect(pageTitle, 'Fo page not closed!').to.contains(addOrderPage.pageTitle);
+        expect(pageTitle, 'Fo page not closed!').to.contains(addOrderPage.pageTitle);
       });
     });
 
@@ -302,7 +302,7 @@ describe('BO - Orders - Create order : Check summary', async () => {
         await addOrderPage.setOrderMessage(page, orderMessage);
 
         const isOrderCreated = await addOrderPage.clickOnCreateOrderButton(page, false);
-        await expect(isOrderCreated, 'The order is created!').to.be.false;
+        expect(isOrderCreated, 'The order is created!').to.eq(false);
       });
 
       it('should choose payment method, click on create button then check that the order is not created',
@@ -312,7 +312,7 @@ describe('BO - Orders - Create order : Check summary', async () => {
           await addOrderPage.setPaymentMethod(page, paymentMethodModuleName);
 
           const isOrderCreated = await addOrderPage.clickOnCreateOrderButton(page, false);
-          await expect(isOrderCreated, 'The order is created!').to.be.false;
+          expect(isOrderCreated, 'The order is created!').to.eq(false);
         });
 
       it('should choose payment method, order status then click on create order and check that the order is create',
@@ -323,14 +323,14 @@ describe('BO - Orders - Create order : Check summary', async () => {
           await addOrderPage.setOrderStatus(page, OrderStatuses.paymentAccepted);
 
           const isOrderCreated = await addOrderPage.clickOnCreateOrderButton(page, true);
-          await expect(isOrderCreated, 'The order is created!').to.be.true;
+          expect(isOrderCreated, 'The order is created!').to.eq(true);
         });
 
       it('should check that the page displayed is view order page', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkOrder message', baseContext);
 
         const pageTitle = await orderPageMessagesBlock.getPageTitle(page);
-        await expect(pageTitle, 'View order page is not displayed!').to.contain(
+        expect(pageTitle, 'View order page is not displayed!').to.contain(
           orderPageMessagesBlock.pageTitle,
         );
       });
@@ -339,7 +339,7 @@ describe('BO - Orders - Create order : Check summary', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'checkOrderMessage', baseContext);
 
         const textMessage = await orderPageMessagesBlock.getTextMessage(page, 1, 'customer');
-        await expect(textMessage, 'Message is not correct!').to.contains(orderMessage);
+        expect(textMessage, 'Message is not correct!').to.contains(orderMessage);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/01_customerBlock.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/01_customerBlock.ts
index 3666beabe5440..0d3ad7e7c045d 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/01_customerBlock.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/01_customerBlock.ts
@@ -116,7 +116,7 @@ describe('BO - Orders - View and edit order : Check and edit customer block', as
       await customersPage.closeSfToolBar(page);
 
       const pageTitle = await customersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customersPage.pageTitle);
+      expect(pageTitle).to.contains(customersPage.pageTitle);
     });
 
     it('should filter list by email', async function () {
@@ -125,14 +125,14 @@ describe('BO - Orders - View and edit order : Check and edit customer block', as
       await customersPage.filterCustomers(page, 'input', 'email', customerData.email);
 
       const textResult = await customersPage.getTextColumnFromTableCustomers(page, 1, 'email');
-      await expect(textResult).to.contains(customerData.email);
+      expect(textResult).to.contains(customerData.email);
     });
 
     it('should get the customer ID', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'getCustomerID', baseContext);
 
       customerID = parseInt(await customersPage.getTextColumnFromTableCustomers(page, 1, 'id_customer'), 10);
-      await expect(customerID).to.be.above(0);
+      expect(customerID).to.be.above(0);
     });
 
     it('should go to \'Customers > Addresses\' page', async function () {
@@ -145,7 +145,7 @@ describe('BO - Orders - View and edit order : Check and edit customer block', as
       );
 
       const pageTitle = await addressesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addressesPage.pageTitle);
+      expect(pageTitle).to.contains(addressesPage.pageTitle);
     });
 
     it('should get the customer address ID', async function () {
@@ -154,7 +154,7 @@ describe('BO - Orders - View and edit order : Check and edit customer block', as
       await addressesPage.filterAddresses(page, 'input', 'firstname', secondAddressData.firstName);
 
       const numberOfAddressesAfterFilter = await addressesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfAddressesAfterFilter).to.be.at.most(1);
+      expect(numberOfAddressesAfterFilter).to.be.at.most(1);
 
       addressID = await addressesPage.getTextColumnFromTableAddresses(page, 1, 'id_address');
     });
@@ -173,14 +173,14 @@ describe('BO - Orders - View and edit order : Check and edit customer block', as
       await ordersPage.closeSfToolBar(page);
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFiltersFirst', baseContext);
 
       const numberOfOrders = await ordersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfOrders).to.be.above(0);
+      expect(numberOfOrders).to.be.above(0);
     });
 
     it(`should filter the Orders table by 'Customer: ${customerData.lastName}'`, async function () {
@@ -189,7 +189,7 @@ describe('BO - Orders - View and edit order : Check and edit customer block', as
       await ordersPage.filterOrders(page, 'input', 'customer', customerData.lastName);
 
       const textColumn = await ordersPage.getTextColumn(page, 'customer', 1);
-      await expect(textColumn).to.contains(customerData.lastName);
+      expect(textColumn).to.contains(customerData.lastName);
     });
 
     it('should view the order', async function () {
@@ -198,7 +198,7 @@ describe('BO - Orders - View and edit order : Check and edit customer block', as
       await ordersPage.goToOrder(page, 1);
 
       const pageTitle = await orderPageCustomerBlock.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderPageCustomerBlock.pageTitle);
+      expect(pageTitle).to.contains(orderPageCustomerBlock.pageTitle);
     });
   });
 
@@ -208,31 +208,31 @@ describe('BO - Orders - View and edit order : Check and edit customer block', as
       await testContext.addContextItem(this, 'testIdentifier', 'checkCustomerInfo', baseContext);
 
       const customerInfo = await orderPageCustomerBlock.getCustomerInfoBlock(page);
-      await expect(customerInfo).to.contains(customerData.socialTitle);
-      await expect(customerInfo).to.contains(customerData.firstName);
-      await expect(customerInfo).to.contains(customerData.lastName);
-      await expect(customerInfo).to.contains(customerID.toString());
+      expect(customerInfo).to.contains(customerData.socialTitle);
+      expect(customerInfo).to.contains(customerData.firstName);
+      expect(customerInfo).to.contains(customerData.lastName);
+      expect(customerInfo).to.contains(customerID.toString());
     });
 
     it('should check customer email address', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkCustomerEmail', baseContext);
 
       const customerEmail = await orderPageCustomerBlock.getCustomerEmail(page);
-      await expect(customerEmail).to.contains(`mailto:${customerData.email}`);
+      expect(customerEmail).to.contains(`mailto:${customerData.email}`);
     });
 
     it('should check the number of validated orders', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkValidatedOrderNumber', baseContext);
 
       const customerEmail = await orderPageCustomerBlock.getValidatedOrdersNumber(page);
-      await expect(customerEmail).to.equal(0);
+      expect(customerEmail).to.equal(0);
     });
 
     it('should check the shipping address', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkShippingAddress', baseContext);
 
       const shippingAddress = await orderPageCustomerBlock.getShippingAddress(page);
-      await expect(shippingAddress)
+      expect(shippingAddress)
         .to.contain(firstAddressData.firstName)
         .and.to.contain(firstAddressData.lastName)
         .and.to.contain(firstAddressData.address)
@@ -245,7 +245,7 @@ describe('BO - Orders - View and edit order : Check and edit customer block', as
       await testContext.addContextItem(this, 'testIdentifier', 'checkInvoiceAddress', baseContext);
 
       const shippingAddress = await orderPageCustomerBlock.getInvoiceAddress(page);
-      await expect(shippingAddress)
+      expect(shippingAddress)
         .to.contain(firstAddressData.firstName)
         .and.to.contain(firstAddressData.lastName)
         .and.to.contain(firstAddressData.address)
@@ -258,7 +258,7 @@ describe('BO - Orders - View and edit order : Check and edit customer block', as
       await testContext.addContextItem(this, 'testIdentifier', 'checkPrivateNoteVisible', baseContext);
 
       const result = await orderPageCustomerBlock.isPrivateNoteTextareaVisible(page);
-      await expect(result).to.be.false;
+      expect(result).to.eq(false);
     });
 
     it('should click on \'View full details\' and check if the page is redirected to '
@@ -268,7 +268,7 @@ describe('BO - Orders - View and edit order : Check and edit customer block', as
       await orderPageCustomerBlock.goToViewFullDetails(page);
 
       const pageTitle = await viewCustomerPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customerData.lastName);
+      expect(pageTitle).to.contains(customerData.lastName);
     });
 
     it('should go back to Orders page', async function () {
@@ -281,7 +281,7 @@ describe('BO - Orders - View and edit order : Check and edit customer block', as
       );
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it(`should filter the Orders table by 'Customer: ${customerData.lastName}'`, async function () {
@@ -290,7 +290,7 @@ describe('BO - Orders - View and edit order : Check and edit customer block', as
       await ordersPage.filterOrders(page, 'input', 'customer', customerData.lastName);
 
       const textColumn = await ordersPage.getTextColumn(page, 'customer', 1);
-      await expect(textColumn).to.contains(customerData.lastName);
+      expect(textColumn).to.contains(customerData.lastName);
     });
 
     it('should view the order', async function () {
@@ -299,14 +299,14 @@ describe('BO - Orders - View and edit order : Check and edit customer block', as
       await ordersPage.goToOrder(page, 1);
 
       const pageTitle = await orderPageCustomerBlock.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderPageCustomerBlock.pageTitle);
+      expect(pageTitle).to.contains(orderPageCustomerBlock.pageTitle);
     });
 
     it('should edit existing shipping address and check it', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'editShippingAddress', baseContext);
 
       const shippingAddress = await orderPageCustomerBlock.editExistingShippingAddress(page, editShippingAddressData);
-      await expect(shippingAddress)
+      expect(shippingAddress)
         .to.contain(editShippingAddressData.firstName)
         .and.to.contain(editShippingAddressData.lastName)
         .and.to.contain(editShippingAddressData.address)
@@ -325,7 +325,7 @@ describe('BO - Orders - View and edit order : Check and edit customer block', as
       expect(alertMessage).to.contains(orderPageCustomerBlock.successfulUpdateMessage);
 
       const shippingAddress = await orderPageCustomerBlock.getShippingAddress(page);
-      await expect(shippingAddress)
+      expect(shippingAddress)
         .to.contain(secondAddressData.firstName)
         .and.to.contain(secondAddressData.lastName)
         .and.to.contain(secondAddressData.address)
@@ -338,7 +338,7 @@ describe('BO - Orders - View and edit order : Check and edit customer block', as
       await testContext.addContextItem(this, 'testIdentifier', 'editInvoiceAddress', baseContext);
 
       const invoiceAddress = await orderPageCustomerBlock.editExistingInvoiceAddress(page, editInvoiceAddressData);
-      await expect(invoiceAddress)
+      expect(invoiceAddress)
         .to.contain(editInvoiceAddressData.firstName)
         .and.to.contain(editInvoiceAddressData.lastName)
         .and.to.contain(editInvoiceAddressData.address)
@@ -357,7 +357,7 @@ describe('BO - Orders - View and edit order : Check and edit customer block', as
       expect(alertMessage).to.contains(orderPageCustomerBlock.successfulUpdateMessage);
 
       const shippingAddress = await orderPageCustomerBlock.getInvoiceAddress(page);
-      await expect(shippingAddress)
+      expect(shippingAddress)
         .to.contain(secondAddressData.firstName)
         .and.to.contain(secondAddressData.lastName)
         .and.to.contain(secondAddressData.address)
@@ -372,7 +372,7 @@ describe('BO - Orders - View and edit order : Check and edit customer block', as
       await orderPageCustomerBlock.clickAddNewPrivateNote(page);
 
       const result = await orderPageCustomerBlock.isPrivateNoteTextareaVisible(page);
-      await expect(result).to.be.true;
+      expect(result).to.eq(true);
     });
 
     it('should go back to \'Orders\' page', async function () {
@@ -385,7 +385,7 @@ describe('BO - Orders - View and edit order : Check and edit customer block', as
       );
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it(`should filter the Orders table by 'Customer: ${Customers.johnDoe.lastName}'`, async function () {
@@ -394,7 +394,7 @@ describe('BO - Orders - View and edit order : Check and edit customer block', as
       await ordersPage.filterOrders(page, 'input', 'customer', Customers.johnDoe.lastName);
 
       const textColumn = await ordersPage.getTextColumn(page, 'customer', 1);
-      await expect(textColumn).to.contains(Customers.johnDoe.lastName);
+      expect(textColumn).to.contains(Customers.johnDoe.lastName);
     });
 
     it('should view the 1st order for the default customer', async function () {
@@ -403,7 +403,7 @@ describe('BO - Orders - View and edit order : Check and edit customer block', as
       await ordersPage.goToOrder(page, 1);
 
       const pageTitle = await orderPageCustomerBlock.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderPageCustomerBlock.pageTitle);
+      expect(pageTitle).to.contains(orderPageCustomerBlock.pageTitle);
     });
 
     it('should add private note', async function () {
@@ -412,7 +412,7 @@ describe('BO - Orders - View and edit order : Check and edit customer block', as
       await orderPageCustomerBlock.clickAddNewPrivateNote(page);
 
       const result = await orderPageCustomerBlock.setPrivateNote(page, privateNote);
-      await expect(result).to.contains(orderPageCustomerBlock.successfulUpdateMessage);
+      expect(result).to.contains(orderPageCustomerBlock.successfulUpdateMessage);
     });
 
     it('should go back to \'Orders\' page', async function () {
@@ -425,7 +425,7 @@ describe('BO - Orders - View and edit order : Check and edit customer block', as
       );
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it(`should filter the Orders table by 'Customer: ${customerData.lastName}'`, async function () {
@@ -434,7 +434,7 @@ describe('BO - Orders - View and edit order : Check and edit customer block', as
       await ordersPage.filterOrders(page, 'input', 'customer', customerData.lastName);
 
       const textColumn = await ordersPage.getTextColumn(page, 'customer', 1);
-      await expect(textColumn).to.contains(customerData.lastName);
+      expect(textColumn).to.contains(customerData.lastName);
     });
 
     it('should view the order', async function () {
@@ -443,7 +443,7 @@ describe('BO - Orders - View and edit order : Check and edit customer block', as
       await ordersPage.goToOrder(page, 1);
 
       const pageTitle = await orderPageCustomerBlock.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderPageCustomerBlock.pageTitle);
+      expect(pageTitle).to.contains(orderPageCustomerBlock.pageTitle);
     });
 
     it('should click on add new note and check that the textarea is visible', async function () {
@@ -452,14 +452,14 @@ describe('BO - Orders - View and edit order : Check and edit customer block', as
       await orderPageCustomerBlock.clickAddNewPrivateNote(page);
 
       const result = await orderPageCustomerBlock.isPrivateNoteTextareaVisible(page);
-      await expect(result).to.be.true;
+      expect(result).to.eq(true);
     });
 
     it('should check that the private note is empty', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkPrivateNoteTextNotVisible', baseContext);
 
       const note = await orderPageCustomerBlock.getPrivateNoteContent(page);
-      await expect(note).to.not.equal(privateNote);
+      expect(note).to.not.equal(privateNote);
     });
 
     it('should go back to \'Orders\' page', async function () {
@@ -472,7 +472,7 @@ describe('BO - Orders - View and edit order : Check and edit customer block', as
       );
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it(`should filter the Orders table by 'Customer: ${Customers.johnDoe.lastName}'`, async function () {
@@ -481,7 +481,7 @@ describe('BO - Orders - View and edit order : Check and edit customer block', as
       await ordersPage.filterOrders(page, 'input', 'customer', Customers.johnDoe.lastName);
 
       const textColumn = await ordersPage.getTextColumn(page, 'customer', 1);
-      await expect(textColumn).to.contains(Customers.johnDoe.lastName);
+      expect(textColumn).to.contains(Customers.johnDoe.lastName);
     });
 
     it('should view the 2nd order for the default customer', async function () {
@@ -490,24 +490,24 @@ describe('BO - Orders - View and edit order : Check and edit customer block', as
       await ordersPage.goToOrder(page, 2);
 
       const pageTitle = await orderPageCustomerBlock.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderPageCustomerBlock.pageTitle);
+      expect(pageTitle).to.contains(orderPageCustomerBlock.pageTitle);
     });
 
     it('should check that the private note is not empty', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkPrivateNoteTextVisible', baseContext);
 
       const result = await orderPageCustomerBlock.isPrivateNoteTextareaVisible(page);
-      await expect(result).to.be.true;
+      expect(result).to.eq(true);
 
       const note = await orderPageCustomerBlock.getPrivateNoteContent(page);
-      await expect(note).to.equal(privateNote);
+      expect(note).to.equal(privateNote);
     });
 
     it('should delete private note', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deletePrivateNote', baseContext);
 
       const result = await orderPageCustomerBlock.setPrivateNote(page, '');
-      await expect(result).to.contains(orderPageCustomerBlock.successfulUpdateMessage);
+      expect(result).to.contains(orderPageCustomerBlock.successfulUpdateMessage);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/02_productBlock.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/02_productBlock.ts
index d8f8fe6f62d28..a415d54dc993a 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/02_productBlock.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/02_productBlock.ts
@@ -237,14 +237,14 @@ describe('BO - Orders - View and edit order : Check product block in view order
       await productsPage.closeSfToolBar(page);
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should reset all filters and get number of products', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFiltersBeforeCreate', baseContext);
 
       const numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProducts).to.be.above(0);
+      expect(numberOfProducts).to.be.above(0);
     });
 
     [
@@ -269,7 +269,7 @@ describe('BO - Orders - View and edit order : Check product block in view order
           }
 
           const pageTitle = await addProductPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(addProductPage.pageTitle);
+          expect(pageTitle).to.contains(addProductPage.pageTitle);
         });
 
         it('should create Product', async function () {
@@ -288,7 +288,7 @@ describe('BO - Orders - View and edit order : Check product block in view order
           if (product === productWithEcoTax) {
             await addProductPage.addEcoTax(page, productWithEcoTax.ecoTax);
           }
-          await expect(createProductMessage).to.equal(addProductPage.settingUpdatedMessage);
+          expect(createProductMessage).to.equal(addProductPage.settingUpdatedMessage);
         });
       });
     });
@@ -304,7 +304,7 @@ describe('BO - Orders - View and edit order : Check product block in view order
         );
 
         const pageTitle = await cartRulesPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(cartRulesPage.pageTitle);
+        expect(pageTitle).to.contains(cartRulesPage.pageTitle);
       });
 
       it('should go to new cart rule page', async function () {
@@ -313,14 +313,14 @@ describe('BO - Orders - View and edit order : Check product block in view order
         await cartRulesPage.goToAddNewCartRulesPage(page);
 
         const pageTitle = await addCartRulePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addCartRulePage.pageTitle);
+        expect(pageTitle).to.contains(addCartRulePage.pageTitle);
       });
 
       it('should create new cart rule', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'createCartRule', baseContext);
 
         const validationMessage = await addCartRulePage.createEditCartRules(page, newCartRuleData);
-        await expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
+        expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
       });
     });
   });
@@ -338,14 +338,14 @@ describe('BO - Orders - View and edit order : Check product block in view order
       await ordersPage.closeSfToolBar(page);
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAllFilters', baseContext);
 
       const numberOfOrders = await ordersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfOrders).to.be.above(0);
+      expect(numberOfOrders).to.be.above(0);
     });
 
     it(`should filter the Orders table by 'Customer: ${customerData.lastName}'`, async function () {
@@ -354,7 +354,7 @@ describe('BO - Orders - View and edit order : Check product block in view order
       await ordersPage.filterOrders(page, 'input', 'customer', customerData.lastName);
 
       const textColumn = await ordersPage.getTextColumn(page, 'customer', 1);
-      await expect(textColumn).to.contains(customerData.lastName);
+      expect(textColumn).to.contains(customerData.lastName);
     });
 
     it('should view the order', async function () {
@@ -363,7 +363,7 @@ describe('BO - Orders - View and edit order : Check product block in view order
       await ordersPage.goToOrder(page, 1);
 
       const pageTitle = await orderPageProductsBlock.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderPageProductsBlock.pageTitle);
+      expect(pageTitle).to.contains(orderPageProductsBlock.pageTitle);
     });
   });
 
@@ -373,14 +373,14 @@ describe('BO - Orders - View and edit order : Check product block in view order
       await testContext.addContextItem(this, 'testIdentifier', 'deleteProduct', baseContext);
 
       const textResult = await orderPageProductsBlock.deleteProduct(page, 1);
-      await expect(textResult).to.contains(orderPageProductsBlock.successfulDeleteProductMessage);
+      expect(textResult).to.contains(orderPageProductsBlock.successfulDeleteProductMessage);
     });
 
     it('should check number of products', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkNumberOfProducts0', baseContext);
 
       const productCount = await orderPageProductsBlock.getProductsNumber(page);
-      await expect(productCount).to.equal(productNumber);
+      expect(productCount).to.equal(productNumber);
     });
 
     describe('Add \'Simple product\' 2 times and check the error message', async () => {
@@ -401,7 +401,7 @@ describe('BO - Orders - View and edit order : Check product block in view order
         await testContext.addContextItem(this, 'testIdentifier', 'addSimpleProductToTheCart1', baseContext);
 
         const textResult = await orderPageProductsBlock.addProductToCart(page);
-        await expect(textResult).to.contains(orderPageProductsBlock.successfulAddProductMessage);
+        expect(textResult).to.contains(orderPageProductsBlock.successfulAddProductMessage);
 
         productNumber += 1;
       });
@@ -426,7 +426,7 @@ describe('BO - Orders - View and edit order : Check product block in view order
         await orderPageProductsBlock.searchProduct(page, simpleProduct.name);
 
         const textResult = await orderPageProductsBlock.addProductToCart(page);
-        await expect(textResult).to.contains(orderPageProductsBlock.errorAddSameProduct);
+        expect(textResult).to.contains(orderPageProductsBlock.errorAddSameProduct);
       });
 
       it('should click on cancel button', async function () {
@@ -435,7 +435,7 @@ describe('BO - Orders - View and edit order : Check product block in view order
         await orderPageProductsBlock.cancelAddProductToCart(page);
 
         const isVisible = await orderPageProductsBlock.isAddProductTableRowVisible(page);
-        await expect(isVisible).to.be.false;
+        expect(isVisible).to.eq(false);
       });
     });
 
@@ -456,7 +456,7 @@ describe('BO - Orders - View and edit order : Check product block in view order
         await testContext.addContextItem(this, 'testIdentifier', 'addCombinationProduct', baseContext);
 
         const textResult = await orderPageProductsBlock.addProductToCart(page);
-        await expect(textResult).to.contains(orderPageProductsBlock.successfulAddProductMessage);
+        expect(textResult).to.contains(orderPageProductsBlock.successfulAddProductMessage);
 
         productNumber += 1;
       });
@@ -493,7 +493,7 @@ describe('BO - Orders - View and edit order : Check product block in view order
         await testContext.addContextItem(this, 'testIdentifier', 'addVirtualProductToTheCart', baseContext);
 
         const textResult = await orderPageProductsBlock.addProductToCart(page);
-        await expect(textResult).to.contains(orderPageProductsBlock.successfulAddProductMessage);
+        expect(textResult).to.contains(orderPageProductsBlock.successfulAddProductMessage);
 
         productNumber += 1;
       });
@@ -532,14 +532,14 @@ describe('BO - Orders - View and edit order : Check product block in view order
         await testContext.addContextItem(this, 'testIdentifier', 'addPackOfProductsToTheCart', baseContext);
 
         const textResult = await orderPageProductsBlock.addProductToCart(page);
-        await expect(textResult).to.contains(orderPageProductsBlock.errorMinimumQuantityMessage);
+        expect(textResult).to.contains(orderPageProductsBlock.errorMinimumQuantityMessage);
       });
 
       it('should increase the quantity and check ordered product details', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkPackOfProductsDetails', baseContext);
 
         const textResult = await orderPageProductsBlock.addProductToCart(page, packOfProducts.minimumQuantity);
-        await expect(textResult).to.contains(orderPageProductsBlock.successfulAddProductMessage);
+        expect(textResult).to.contains(orderPageProductsBlock.successfulAddProductMessage);
 
         const result = await orderPageProductsBlock.getProductDetails(page, 3);
         await Promise.all([
@@ -572,7 +572,7 @@ describe('BO - Orders - View and edit order : Check product block in view order
         await testContext.addContextItem(this, 'testIdentifier', 'addCustomizedProductToTheCart', baseContext);
 
         const textResult = await orderPageProductsBlock.addProductToCart(page);
-        await expect(textResult).to.contains(orderPageProductsBlock.successfulAddProductMessage);
+        expect(textResult).to.contains(orderPageProductsBlock.successfulAddProductMessage);
         productNumber += 1;
       });
 
@@ -608,7 +608,7 @@ describe('BO - Orders - View and edit order : Check product block in view order
         await testContext.addContextItem(this, 'testIdentifier', 'addProductOutOfStockAllowed', baseContext);
 
         const textResult = await orderPageProductsBlock.addProductToCart(page);
-        await expect(textResult).to.contains(orderPageProductsBlock.successfulAddProductMessage);
+        expect(textResult).to.contains(orderPageProductsBlock.successfulAddProductMessage);
 
         productNumber += 1;
       });
@@ -630,7 +630,7 @@ describe('BO - Orders - View and edit order : Check product block in view order
         await testContext.addContextItem(this, 'testIdentifier', 'updateQuantityOutOfStockAllowed', baseContext);
 
         const quantity = await orderPageProductsBlock.modifyProductQuantity(page, 1, newQuantity);
-        await expect(quantity, 'Quantity was not updated').to.equal(newQuantity);
+        expect(quantity, 'Quantity was not updated').to.equal(newQuantity);
       });
     });
 
@@ -652,7 +652,7 @@ describe('BO - Orders - View and edit order : Check product block in view order
         await testContext.addContextItem(this, 'testIdentifier', 'checkThatAddButtonIsDisabled', baseContext);
 
         const isDisabled = await orderPageProductsBlock.isAddButtonDisabled(page);
-        await expect(isDisabled).to.be.true;
+        expect(isDisabled).to.eq(true);
       });
 
       it('should increase the quantity of the product and check that cancel button still disabled', async function () {
@@ -661,7 +661,7 @@ describe('BO - Orders - View and edit order : Check product block in view order
         await orderPageProductsBlock.addQuantity(page, newQuantity);
 
         const isDisabled = await orderPageProductsBlock.isAddButtonDisabled(page);
-        await expect(isDisabled).to.be.true;
+        expect(isDisabled).to.eq(true);
       });
 
       it('should click on cancel button', async function () {
@@ -670,7 +670,7 @@ describe('BO - Orders - View and edit order : Check product block in view order
         await orderPageProductsBlock.cancelAddProductToCart(page);
 
         const isVisible = await orderPageProductsBlock.isAddProductTableRowVisible(page);
-        await expect(isVisible).to.be.false;
+        expect(isVisible).to.eq(false);
       });
     });
 
@@ -691,7 +691,7 @@ describe('BO - Orders - View and edit order : Check product block in view order
         await testContext.addContextItem(this, 'testIdentifier', 'addProductWithSpecificPriceToTheCart', baseContext);
 
         const textResult = await orderPageProductsBlock.addProductToCart(page);
-        await expect(textResult).to.contains(orderPageProductsBlock.successfulAddProductMessage);
+        expect(textResult).to.contains(orderPageProductsBlock.successfulAddProductMessage);
 
         productNumber += 1;
       });
@@ -729,7 +729,7 @@ describe('BO - Orders - View and edit order : Check product block in view order
 
         const textResult = await orderPageProductsBlock.addProductToCart(page);
 
-        await expect(textResult).to.contains(orderPageProductsBlock.successfulAddProductMessage);
+        expect(textResult).to.contains(orderPageProductsBlock.successfulAddProductMessage);
         productNumber += 1;
       });
 
@@ -765,7 +765,7 @@ describe('BO - Orders - View and edit order : Check product block in view order
         await testContext.addContextItem(this, 'testIdentifier', 'addProductWithCartRuleToTheCart', baseContext);
 
         const textResult = await orderPageProductsBlock.addProductToCart(page);
-        await expect(textResult).to.contains(orderPageProductsBlock.successfulAddProductMessage);
+        expect(textResult).to.contains(orderPageProductsBlock.successfulAddProductMessage);
 
         productNumber += 1;
       });
@@ -789,7 +789,7 @@ describe('BO - Orders - View and edit order : Check product block in view order
         await testContext.addContextItem(this, 'testIdentifier', 'updateQuantity', baseContext);
 
         const quantity = await orderPageProductsBlock.modifyProductQuantity(page, 1, newQuantity);
-        await expect(quantity, 'Quantity was not updated').to.equal(newQuantity);
+        expect(quantity, 'Quantity was not updated').to.equal(newQuantity);
       });
 
       it('should update the price', async function () {
@@ -810,7 +810,7 @@ describe('BO - Orders - View and edit order : Check product block in view order
         await testContext.addContextItem(this, 'testIdentifier', 'checkNumberOfProducts', baseContext);
 
         const productCount = await orderPageProductsBlock.getProductsNumber(page);
-        await expect(productCount).to.equal(productNumber);
+        expect(productCount).to.equal(productNumber);
       });
 
       describe('Paginate between pages', async () => {
@@ -818,35 +818,35 @@ describe('BO - Orders - View and edit order : Check product block in view order
           await testContext.addContextItem(this, 'testIdentifier', 'displayDefaultItemsNumber', baseContext);
 
           const isNextLinkVisible = await orderPageProductsBlock.selectPaginationLimit(page, 8);
-          await expect(isNextLinkVisible).to.be.true;
+          expect(isNextLinkVisible).to.eq(true);
         });
 
         it('should click on next', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'clickOnNext', baseContext);
 
           const paginationNumber = await orderPageProductsBlock.paginationNext(page);
-          await expect(paginationNumber).to.equal('2');
+          expect(paginationNumber).to.equal('2');
         });
 
         it('should click on previous', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'clickOnPrevious', baseContext);
 
           const paginationNumber = await orderPageProductsBlock.paginationPrevious(page);
-          await expect(paginationNumber).to.equal('1');
+          expect(paginationNumber).to.equal('1');
         });
 
         it('should display 20 items', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'displayAllItems', baseContext);
 
           const isNextLinkVisible = await orderPageProductsBlock.selectPaginationLimit(page, 20);
-          await expect(isNextLinkVisible).to.be.false;
+          expect(isNextLinkVisible).to.eq(false);
         });
 
         it('should display 8 items', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'redisplayDefaultItemsNumber', baseContext);
 
           const isNextLinkVisible = await orderPageProductsBlock.selectPaginationLimit(page, 8);
-          await expect(isNextLinkVisible).to.be.true;
+          expect(isNextLinkVisible).to.eq(true);
         });
       });
     });
diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/03_statusTab.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/03_statusTab.ts
index f480bda0bc048..c5651a37b1c13 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/03_statusTab.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/03_statusTab.ts
@@ -149,14 +149,14 @@ describe('BO - Orders - View and edit order : Check order status tab', async ()
       await ordersPage.closeSfToolBar(page);
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetOrderTableFilters1', baseContext);
 
       const numberOfOrders = await ordersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfOrders).to.be.above(0);
+      expect(numberOfOrders).to.be.above(0);
     });
 
     it(`should filter the Orders table by 'Customer: ${customerData.lastName}'`, async function () {
@@ -165,7 +165,7 @@ describe('BO - Orders - View and edit order : Check order status tab', async ()
       await ordersPage.filterOrders(page, 'input', 'customer', customerData.lastName);
 
       const textColumn = await ordersPage.getTextColumn(page, 'customer', 1);
-      await expect(textColumn).to.contains(customerData.lastName);
+      expect(textColumn).to.contains(customerData.lastName);
     });
 
     it('should view the order', async function () {
@@ -174,7 +174,7 @@ describe('BO - Orders - View and edit order : Check order status tab', async ()
       await ordersPage.goToOrder(page, 1);
 
       const pageTitle = await orderPageTabListBlock.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+      expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
     });
   });
 
@@ -184,69 +184,69 @@ describe('BO - Orders - View and edit order : Check order status tab', async ()
       await testContext.addContextItem(this, 'testIdentifier', 'checkStatusNumber', baseContext);
 
       const statusNumber = await orderPageTabListBlock.getStatusNumber(page);
-      await expect(statusNumber).to.be.equal(1);
+      expect(statusNumber).to.be.equal(1);
     });
 
     it('should click on \'Resend email\'', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resendEmail', baseContext);
 
       const textResult = await orderPageTabListBlock.resendEmail(page);
-      await expect(textResult).to.contains(orderPageTabListBlock.validationSendMessage);
+      expect(textResult).to.contains(orderPageTabListBlock.validationSendMessage);
     });
 
     it('should check if the mail is in mailbox', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkIfResetPasswordMailIsInMailbox', baseContext);
 
-      await expect(newMail.subject).to.contains('[PrestaShop] Awaiting bank wire payment');
+      expect(newMail.subject).to.contains('[PrestaShop] Awaiting bank wire payment');
     });
 
     it('should click on update status and check the error message', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnUpdateStatusAndSeeTheErrorMessage', baseContext);
 
       const textResult = await orderPageTabListBlock.clickOnUpdateStatus(page);
-      await expect(textResult).to.contains(orderPageTabListBlock.errorAssignSameStatus);
+      expect(textResult).to.contains(orderPageTabListBlock.errorAssignSameStatus);
     });
 
     it(`should change the order status to '${OrderStatuses.canceled.name}' and check it`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'cancelOrderByStatus', baseContext);
 
       const textResult = await orderPageTabListBlock.updateOrderStatus(page, OrderStatuses.canceled.name);
-      await expect(textResult).to.equal(orderPageTabListBlock.successfulUpdateMessage);
+      expect(textResult).to.equal(orderPageTabListBlock.successfulUpdateMessage);
     });
 
     it('should check that the status number is equal to 2', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkStatusNumber2', baseContext);
 
       const statusNumber = await orderPageTabListBlock.getStatusNumber(page);
-      await expect(statusNumber).to.be.equal(2);
+      expect(statusNumber).to.be.equal(2);
     });
 
     it('should check the status name from the table', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkStatusName1', baseContext);
 
       const statusName = await orderPageTabListBlock.getTextColumnFromHistoryTable(page, 'status', 1);
-      await expect(statusName).to.be.equal(OrderStatuses.canceled.name);
+      expect(statusName).to.be.equal(OrderStatuses.canceled.name);
     });
 
     it('should check the employee name from the table', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkEmployeeName1', baseContext);
 
       const employeeName = await orderPageTabListBlock.getTextColumnFromHistoryTable(page, 'employee', 1);
-      await expect(employeeName).to.be.equal(`${Employees.DefaultEmployee.firstName} ${Employees.DefaultEmployee.lastName}`);
+      expect(employeeName).to.be.equal(`${Employees.DefaultEmployee.firstName} ${Employees.DefaultEmployee.lastName}`);
     });
 
     it('should check the date from the table', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkDate1', baseContext);
 
       const date = await orderPageTabListBlock.getTextColumnFromHistoryTable(page, 'date', 1);
-      await expect(date).to.contain(today);
+      expect(date).to.contain(today);
     });
 
     it('should check that the order note is closed', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkOrderNoteClosed1', baseContext);
 
       const isOpened = await orderPageTabListBlock.isOrderNoteOpened(page);
-      await expect(isOpened).to.be.false;
+      expect(isOpened).to.eq(false);
     });
 
     it('should logout from BO', async function () {
@@ -263,7 +263,7 @@ describe('BO - Orders - View and edit order : Check order status tab', async ()
       await loginPage.successLogin(page, createEmployeeData.email, createEmployeeData.password);
 
       const pageTitle = await dashboardPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(dashboardPage.pageTitle);
+      expect(pageTitle).to.contains(dashboardPage.pageTitle);
     });
 
     it('should go to \'Orders > Orders\' page', async function () {
@@ -277,14 +277,14 @@ describe('BO - Orders - View and edit order : Check order status tab', async ()
       await ordersPage.closeSfToolBar(page);
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetOrderTableFilters2', baseContext);
 
       const numberOfOrders = await ordersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfOrders).to.be.above(0);
+      expect(numberOfOrders).to.be.above(0);
     });
 
     it(`should filter the Orders table by 'Customer: ${customerData.lastName}'`, async function () {
@@ -293,7 +293,7 @@ describe('BO - Orders - View and edit order : Check order status tab', async ()
       await ordersPage.filterOrders(page, 'input', 'customer', customerData.lastName);
 
       const textColumn = await ordersPage.getTextColumn(page, 'customer', 1);
-      await expect(textColumn).to.contains(customerData.lastName);
+      expect(textColumn).to.contains(customerData.lastName);
     });
 
     it('should view the order', async function () {
@@ -302,70 +302,70 @@ describe('BO - Orders - View and edit order : Check order status tab', async ()
       await ordersPage.goToOrder(page, 1);
 
       const pageTitle = await orderPageTabListBlock.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+      expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
     });
 
     it(`should change the order status to '${OrderStatuses.paymentAccepted.name}'`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateOrderStatusToAccepted', baseContext);
 
       const textResult = await orderPageTabListBlock.updateOrderStatus(page, OrderStatuses.paymentAccepted.name);
-      await expect(textResult).to.equal(orderPageTabListBlock.successfulUpdateMessage);
+      expect(textResult).to.equal(orderPageTabListBlock.successfulUpdateMessage);
     });
 
     it('should check that the status number is equal to 3', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkStatusNumber3', baseContext);
 
       const statusNumber = await orderPageTabListBlock.getStatusNumber(page);
-      await expect(statusNumber).to.be.equal(3);
+      expect(statusNumber).to.be.equal(3);
     });
 
     it('should check the status name from the table', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkStatusName2', baseContext);
 
       const statusName = await orderPageTabListBlock.getTextColumnFromHistoryTable(page, 'status', 1);
-      await expect(statusName).to.be.equal(OrderStatuses.paymentAccepted.name);
+      expect(statusName).to.be.equal(OrderStatuses.paymentAccepted.name);
     });
 
     it('should check the employee name from the table', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkEmployeeName2', baseContext);
 
       const employeeName = await orderPageTabListBlock.getTextColumnFromHistoryTable(page, 'employee', 1);
-      await expect(employeeName).to.be.equal(`${createEmployeeData.firstName} ${createEmployeeData.lastName}`);
+      expect(employeeName).to.be.equal(`${createEmployeeData.firstName} ${createEmployeeData.lastName}`);
     });
 
     it('should check the date from the table', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkDate2', baseContext);
 
       const date = await orderPageTabListBlock.getTextColumnFromHistoryTable(page, 'date', 1);
-      await expect(date).to.contain(today);
+      expect(date).to.contain(today);
     });
 
     it(`should change the order status to '${OrderStatuses.shipped.name}'`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateOrderStatusToShipped', baseContext);
 
       const textResult = await orderPageTabListBlock.updateOrderStatus(page, OrderStatuses.shipped.name);
-      await expect(textResult).to.equal(orderPageTabListBlock.successfulUpdateMessage);
+      expect(textResult).to.equal(orderPageTabListBlock.successfulUpdateMessage);
     });
 
     it('should check that the status number is equal to 4', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkStatusNumber4', baseContext);
 
       const statusNumber = await orderPageTabListBlock.getStatusNumber(page);
-      await expect(statusNumber).to.be.equal(4);
+      expect(statusNumber).to.be.equal(4);
     });
 
     it('should check that the order note still closed', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkOrderNoteClosed2', baseContext);
 
       const isOpened = await orderPageTabListBlock.isOrderNoteOpened(page);
-      await expect(isOpened).to.be.false;
+      expect(isOpened).to.eq(false);
     });
 
     it('should open the order note textarea', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'openOrderNote', baseContext);
 
       const isOpened = await orderPageTabListBlock.openOrderNoteTextarea(page);
-      await expect(isOpened).to.be.true;
+      expect(isOpened).to.eq(true);
     });
 
     it('should go to \'Orders > Orders\' page', async function () {
@@ -379,14 +379,14 @@ describe('BO - Orders - View and edit order : Check order status tab', async ()
       await ordersPage.closeSfToolBar(page);
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetOrderTableFilters3', baseContext);
 
       const numberOfOrders = await ordersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfOrders).to.be.above(0);
+      expect(numberOfOrders).to.be.above(0);
     });
 
     it(`should filter the Orders table by 'Customer: ${Customers.johnDoe.lastName}'`, async function () {
@@ -395,7 +395,7 @@ describe('BO - Orders - View and edit order : Check order status tab', async ()
       await ordersPage.filterOrders(page, 'input', 'customer', Customers.johnDoe.lastName);
 
       const textColumn = await ordersPage.getTextColumn(page, 'customer', 1);
-      await expect(textColumn).to.contains(Customers.johnDoe.lastName);
+      expect(textColumn).to.contains(Customers.johnDoe.lastName);
     });
 
     it('should view the order', async function () {
@@ -404,21 +404,21 @@ describe('BO - Orders - View and edit order : Check order status tab', async ()
       await ordersPage.goToOrder(page, 1);
 
       const pageTitle = await orderPageTabListBlock.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+      expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
     });
 
     it('should check that the status number is equal to 1', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkStatusNumber5', baseContext);
 
       const statusNumber = await orderPageTabListBlock.getStatusNumber(page);
-      await expect(statusNumber).to.be.equal(1);
+      expect(statusNumber).to.be.equal(1);
     });
 
     it('should set an order note', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'setOrderNote', baseContext);
 
       const textResult = await orderPageTabListBlock.setOrderNote(page, orderNote);
-      await expect(textResult).to.equal(orderPageTabListBlock.updateSuccessfullMessage);
+      expect(textResult).to.equal(orderPageTabListBlock.updateSuccessfullMessage);
     });
 
     it('should go to \'Orders > Orders\' page', async function () {
@@ -432,14 +432,14 @@ describe('BO - Orders - View and edit order : Check order status tab', async ()
       await ordersPage.closeSfToolBar(page);
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetOrderTableFilters4', baseContext);
 
       const numberOfOrders = await ordersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfOrders).to.be.above(0);
+      expect(numberOfOrders).to.be.above(0);
     });
 
     it(`should filter the Orders table by 'Customer: ${customerData.lastName}'`, async function () {
@@ -448,7 +448,7 @@ describe('BO - Orders - View and edit order : Check order status tab', async ()
       await ordersPage.filterOrders(page, 'input', 'customer', customerData.lastName);
 
       const textColumn = await ordersPage.getTextColumn(page, 'customer', 1);
-      await expect(textColumn).to.contains(customerData.lastName);
+      expect(textColumn).to.contains(customerData.lastName);
     });
 
     it('should view the order', async function () {
@@ -457,14 +457,14 @@ describe('BO - Orders - View and edit order : Check order status tab', async ()
       await ordersPage.goToOrder(page, 1);
 
       const pageTitle = await orderPageTabListBlock.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+      expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
     });
 
     it('should check that the order note is closed', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkOrderNoteClosed3', baseContext);
 
       const isOpened = await orderPageTabListBlock.isOrderNoteOpened(page);
-      await expect(isOpened).to.be.false;
+      expect(isOpened).to.eq(false);
     });
 
     it('should logout from BO', async function () {
@@ -489,14 +489,14 @@ describe('BO - Orders - View and edit order : Check order status tab', async ()
       await ordersPage.closeSfToolBar(page);
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetOrderTableFilters5', baseContext);
 
       const numberOfOrders = await ordersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfOrders).to.be.above(0);
+      expect(numberOfOrders).to.be.above(0);
     });
 
     it(`should filter the Orders table by 'Customer: ${Customers.johnDoe.lastName}'`, async function () {
@@ -505,7 +505,7 @@ describe('BO - Orders - View and edit order : Check order status tab', async ()
       await ordersPage.filterOrders(page, 'input', 'customer', Customers.johnDoe.lastName);
 
       const textColumn = await ordersPage.getTextColumn(page, 'customer', 1);
-      await expect(textColumn).to.contains(Customers.johnDoe.lastName);
+      expect(textColumn).to.contains(Customers.johnDoe.lastName);
     });
 
     it('should view the order', async function () {
@@ -514,21 +514,21 @@ describe('BO - Orders - View and edit order : Check order status tab', async ()
       await ordersPage.goToOrder(page, 1);
 
       const pageTitle = await orderPageTabListBlock.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+      expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
     });
 
     it('should check that the order note is not empty', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkOrderNoteEmpty', baseContext);
 
       const orderNote = await orderPageTabListBlock.getOrderNoteContent(page);
-      await expect(orderNote).to.be.equal(orderNote);
+      expect(orderNote).to.be.equal(orderNote);
     });
 
     it('should delete the order note', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteOrderNote', baseContext);
 
       const textResult = await orderPageTabListBlock.setOrderNote(page, '');
-      await expect(textResult).to.equal(orderPageTabListBlock.updateSuccessfullMessage);
+      expect(textResult).to.equal(orderPageTabListBlock.updateSuccessfullMessage);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/04_documentsTab.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/04_documentsTab.ts
index 978ae408e831b..2a0fc68fe6688 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/04_documentsTab.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/04_documentsTab.ts
@@ -84,7 +84,7 @@ describe('BO - Orders - View and edit order : Check order documents tab', async
       await invoicesPage.closeSfToolBar(page);
 
       const pageTitle = await invoicesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(invoicesPage.pageTitle);
+      expect(pageTitle).to.contains(invoicesPage.pageTitle);
     });
 
     it('should disable invoices', async function () {
@@ -93,7 +93,7 @@ describe('BO - Orders - View and edit order : Check order documents tab', async
       await invoicesPage.enableInvoices(page, false);
 
       const textMessage = await invoicesPage.saveInvoiceOptions(page);
-      await expect(textMessage).to.contains(invoicesPage.successfulUpdateMessage);
+      expect(textMessage).to.contains(invoicesPage.successfulUpdateMessage);
     });
   });
 
@@ -110,14 +110,14 @@ describe('BO - Orders - View and edit order : Check order documents tab', async
       await ordersPage.closeSfToolBar(page);
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetOrderTableFilters1', baseContext);
 
       const numberOfOrders = await ordersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfOrders).to.be.above(0);
+      expect(numberOfOrders).to.be.above(0);
     });
 
     it(`should filter the Orders table by 'Customer: ${Customers.johnDoe.lastName}'`, async function () {
@@ -126,7 +126,7 @@ describe('BO - Orders - View and edit order : Check order documents tab', async
       await ordersPage.filterOrders(page, 'input', 'customer', Customers.johnDoe.lastName);
 
       const textColumn = await ordersPage.getTextColumn(page, 'customer', 1);
-      await expect(textColumn).to.contains(Customers.johnDoe.lastName);
+      expect(textColumn).to.contains(Customers.johnDoe.lastName);
     });
 
     it('should view the order', async function () {
@@ -135,7 +135,7 @@ describe('BO - Orders - View and edit order : Check order documents tab', async
       await ordersPage.goToOrder(page, 1);
 
       const pageTitle = await orderPageTabListBlock.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+      expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
     });
   });
 
@@ -145,14 +145,14 @@ describe('BO - Orders - View and edit order : Check order documents tab', async
       await testContext.addContextItem(this, 'testIdentifier', 'displayDocumentsTab1', baseContext);
 
       const isTabOpened = await orderPageTabListBlock.goToDocumentsTab(page);
-      await expect(isTabOpened).to.be.true;
+      expect(isTabOpened).to.eq(true);
     });
 
     it('should check that \'Generate invoice\' button is not visible', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkGenerateInvoiceButton1', baseContext);
 
       const isVisible = await orderPageTabListBlock.isGenerateInvoiceButtonVisible(page);
-      await expect(isVisible).to.be.false;
+      expect(isVisible).to.eq(false);
     });
   });
 
@@ -169,7 +169,7 @@ describe('BO - Orders - View and edit order : Check order documents tab', async
       await invoicesPage.closeSfToolBar(page);
 
       const pageTitle = await invoicesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(invoicesPage.pageTitle);
+      expect(pageTitle).to.contains(invoicesPage.pageTitle);
     });
 
     it('should enable invoices', async function () {
@@ -178,7 +178,7 @@ describe('BO - Orders - View and edit order : Check order documents tab', async
       await invoicesPage.enableInvoices(page, true);
 
       const textMessage = await invoicesPage.saveInvoiceOptions(page);
-      await expect(textMessage).to.contains(invoicesPage.successfulUpdateMessage);
+      expect(textMessage).to.contains(invoicesPage.successfulUpdateMessage);
     });
   });
 
@@ -195,14 +195,14 @@ describe('BO - Orders - View and edit order : Check order documents tab', async
       await ordersPage.closeSfToolBar(page);
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetOrderTableFilters2', baseContext);
 
       const numberOfOrders = await ordersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfOrders).to.be.above(0);
+      expect(numberOfOrders).to.be.above(0);
     });
 
     it(`should filter the Orders table by 'Customer: ${Customers.johnDoe.lastName}'`, async function () {
@@ -211,7 +211,7 @@ describe('BO - Orders - View and edit order : Check order documents tab', async
       await ordersPage.filterOrders(page, 'input', 'customer', Customers.johnDoe.lastName);
 
       const textColumn = await ordersPage.getTextColumn(page, 'customer', 1);
-      await expect(textColumn).to.contains(Customers.johnDoe.lastName);
+      expect(textColumn).to.contains(Customers.johnDoe.lastName);
     });
 
     it('should view the order', async function () {
@@ -220,7 +220,7 @@ describe('BO - Orders - View and edit order : Check order documents tab', async
       await ordersPage.goToOrder(page, 1);
 
       const pageTitle = await orderPageTabListBlock.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+      expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
     });
   });
 
@@ -230,87 +230,87 @@ describe('BO - Orders - View and edit order : Check order documents tab', async
       await testContext.addContextItem(this, 'testIdentifier', 'displayDocumentsTab2', baseContext);
 
       const isTabOpened = await orderPageTabListBlock.goToDocumentsTab(page);
-      await expect(isTabOpened).to.be.true;
+      expect(isTabOpened).to.eq(true);
     });
 
     it('should check that \'Generate invoice\' button is visible', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkGenerateInvoiceButton2', baseContext);
 
       const isVisible = await orderPageTabListBlock.isGenerateInvoiceButtonVisible(page);
-      await expect(isVisible).to.be.true;
+      expect(isVisible).to.eq(true);
     });
 
     it('should check that documents number is equal to 0', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkDocumentsNumber0', baseContext);
 
       const documentsNumber = await orderPageTabListBlock.getDocumentsNumber(page);
-      await expect(documentsNumber).to.be.equal(0);
+      expect(documentsNumber).to.be.equal(0);
     });
 
     it('should check the existence of the message \'There is no available document\'', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkMessage', baseContext);
 
       const textMessage = await orderPageTabListBlock.getTextColumnFromDocumentsTable(page, 'alert-available', 1);
-      await expect(textMessage).to.be.equal(orderPageTabListBlock.noAvailableDocumentsMessage);
+      expect(textMessage).to.be.equal(orderPageTabListBlock.noAvailableDocumentsMessage);
     });
 
     it('should click on \'Generate invoice\' button', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'create invoice', baseContext);
 
       const textResult = await orderPageTabListBlock.generateInvoice(page);
-      await expect(textResult).to.equal(orderPageTabListBlock.successfulUpdateMessage);
+      expect(textResult).to.equal(orderPageTabListBlock.successfulUpdateMessage);
     });
 
     it('should check that documents number is equal to 1', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkDocumentsNumber1', baseContext);
 
       const documentsNumber = await orderPageTabListBlock.getDocumentsNumber(page);
-      await expect(documentsNumber).to.be.equal(1);
+      expect(documentsNumber).to.be.equal(1);
     });
 
     it('should check if \'Invoice\' document is created', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkInvoiceDocument', baseContext);
 
       const documentType = await orderPageTabListBlock.getDocumentType(page, 1);
-      await expect(documentType).to.be.equal('Invoice');
+      expect(documentType).to.be.equal('Invoice');
     });
 
     it('should download the \'Invoice\' file', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'downloadInvoice', baseContext);
 
       filePath = await orderPageTabListBlock.downloadInvoice(page, 1);
-      await expect(filePath).to.be.not.null;
+      expect(filePath).to.not.eq(null);
 
       const doesFileExist = await files.doesFileExist(filePath, 5000);
-      await expect(doesFileExist).to.be.true;
+      expect(doesFileExist).to.eq(true);
     });
 
     it('should add note', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'addNote', baseContext);
 
       const textResult = await orderPageTabListBlock.setDocumentNote(page, note, 1);
-      await expect(textResult).to.equal(orderPageTabListBlock.updateSuccessfullMessage);
+      expect(textResult).to.equal(orderPageTabListBlock.updateSuccessfullMessage);
     });
 
     it('should check that the button \'Edit note\' is visible', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkEditNoteButton', baseContext);
 
       const isVisible = await orderPageTabListBlock.isEditDocumentNoteButtonVisible(page);
-      await expect(isVisible).to.be.true;
+      expect(isVisible).to.eq(true);
     });
 
     it('should delete note', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteNote', baseContext);
 
       const textResult = await orderPageTabListBlock.setDocumentNote(page, '', 1);
-      await expect(textResult).to.equal(orderPageTabListBlock.updateSuccessfullMessage);
+      expect(textResult).to.equal(orderPageTabListBlock.updateSuccessfullMessage);
     });
 
     it('should check that the button \'Add note\' is visible', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkAddNoteButton', baseContext);
 
       const isVisible = await orderPageTabListBlock.isAddDocumentNoteButtonVisible(page);
-      await expect(isVisible).to.be.true;
+      expect(isVisible).to.eq(true);
     });
 
     it('should click on \'Enter payment\' button', async function () {
@@ -319,52 +319,52 @@ describe('BO - Orders - View and edit order : Check order documents tab', async
       await orderPageTabListBlock.clickOnEnterPaymentButton(page);
 
       const amountValue = await orderPagePaymentBlock.getPaymentAmountInputValue(page);
-      await expect(amountValue).to.not.equal('');
+      expect(amountValue).to.not.equal('');
     });
 
     it(`should change the order status to '${OrderStatuses.paymentAccepted.name}'`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateOrderStatusPaymentAccepted', baseContext);
 
       const textResult = await orderPageTabListBlock.modifyOrderStatus(page, OrderStatuses.paymentAccepted.name);
-      await expect(textResult).to.equal(OrderStatuses.paymentAccepted.name);
+      expect(textResult).to.equal(OrderStatuses.paymentAccepted.name);
     });
 
     it('should check that the button \'Enter payment\' is not visible', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkEnterPaymentButton', baseContext);
 
       const isVisible = await orderPageTabListBlock.isEnterPaymentButtonVisible(page);
-      await expect(isVisible).to.be.false;
+      expect(isVisible).to.eq(false);
     });
 
     it(`should change the order status to '${OrderStatuses.shipped.name}'`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateOrderStatusShipped', baseContext);
 
       const textResult = await orderPageTabListBlock.modifyOrderStatus(page, OrderStatuses.shipped.name);
-      await expect(textResult).to.equal(OrderStatuses.shipped.name);
+      expect(textResult).to.equal(OrderStatuses.shipped.name);
     });
 
     it('should check that documents number is equal to 2', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkDocumentsNumber2', baseContext);
 
       const documentsNumber = await orderPageTabListBlock.getDocumentsNumber(page);
-      await expect(documentsNumber).to.be.equal(2);
+      expect(documentsNumber).to.be.equal(2);
     });
 
     it('should check if \'Delivery slip\' document is created', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkDeliverySlipDocument', baseContext);
 
       const documentType = await orderPageTabListBlock.getDocumentType(page, 3);
-      await expect(documentType).to.be.equal('Delivery slip');
+      expect(documentType).to.be.equal('Delivery slip');
     });
 
     it('should download \'Delivery slip\' file', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'downloadDeliverySlip', baseContext);
 
       filePath = await orderPageTabListBlock.downloadInvoice(page, 3);
-      await expect(filePath).to.be.not.null;
+      expect(filePath).to.not.eq(null);
 
       const doesFileExist = await files.doesFileExist(filePath, 5000);
-      await expect(doesFileExist).to.be.true;
+      expect(doesFileExist).to.eq(true);
     });
 
     it('should create \'Partial refund\'', async function () {
@@ -373,7 +373,7 @@ describe('BO - Orders - View and edit order : Check order documents tab', async
       await orderPageTabListBlock.clickOnPartialRefund(page);
 
       const textMessage = await orderPageProductsBlock.addPartialRefundProduct(page, 1, 1);
-      await expect(textMessage).to.contains(orderPageProductsBlock.partialRefundValidationMessage);
+      expect(textMessage).to.contains(orderPageProductsBlock.partialRefundValidationMessage);
     });
 
     it('should check if \'Credit slip\' document is created', async function () {
@@ -381,17 +381,17 @@ describe('BO - Orders - View and edit order : Check order documents tab', async
 
       // Get document name
       const documentType = await orderPageTabListBlock.getDocumentType(page, 4);
-      await expect(documentType).to.be.equal('Credit slip');
+      expect(documentType).to.be.equal('Credit slip');
     });
 
     it('should download \'Credit slip\' file', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'downloadCreditSlip', baseContext);
 
       filePath = await orderPageTabListBlock.downloadInvoice(page, 4);
-      await expect(filePath).to.be.not.null;
+      expect(filePath).to.not.eq(null);
 
       const doesFileExist = await files.doesFileExist(filePath, 5000);
-      await expect(doesFileExist).to.be.true;
+      expect(doesFileExist).to.eq(true);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/05_carriersTab.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/05_carriersTab.ts
index b635b4c437700..0b987e2bca18c 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/05_carriersTab.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/05_carriersTab.ts
@@ -87,14 +87,14 @@ describe('BO - Orders - View and edit order : Check order carriers tab', async (
       await ordersPage.closeSfToolBar(page);
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetOrderTableFilters1', baseContext);
 
       const numberOfOrders = await ordersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfOrders).to.be.above(0);
+      expect(numberOfOrders).to.be.above(0);
     });
 
     it(`should filter the Orders table by 'Customer: ${Customers.johnDoe.lastName}'`, async function () {
@@ -103,7 +103,7 @@ describe('BO - Orders - View and edit order : Check order carriers tab', async (
       await ordersPage.filterOrders(page, 'input', 'customer', Customers.johnDoe.lastName);
 
       const textColumn = await ordersPage.getTextColumn(page, 'customer', 1);
-      await expect(textColumn).to.contains(Customers.johnDoe.lastName);
+      expect(textColumn).to.contains(Customers.johnDoe.lastName);
     });
 
     it('should view the order', async function () {
@@ -112,7 +112,7 @@ describe('BO - Orders - View and edit order : Check order carriers tab', async (
       await ordersPage.goToOrder(page, 1);
 
       const pageTitle = await orderPageTabListBlock.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+      expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
     });
   });
 
@@ -122,14 +122,14 @@ describe('BO - Orders - View and edit order : Check order carriers tab', async (
       await testContext.addContextItem(this, 'testIdentifier', 'displayCarriersTab', baseContext);
 
       const isTabOpened = await orderPageTabListBlock.goToCarriersTab(page);
-      await expect(isTabOpened).to.be.true;
+      expect(isTabOpened).to.eq(true);
     });
 
     it('should check that the carriers number is equal to 1', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkCarriersNumber', baseContext);
 
       const carriersNumber = await orderPageTabListBlock.getCarriersNumber(page);
-      await expect(carriersNumber).to.be.equal(1);
+      expect(carriersNumber).to.be.equal(1);
     });
 
     it('should check the carrier details', async function () {
@@ -149,14 +149,14 @@ describe('BO - Orders - View and edit order : Check order carriers tab', async (
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnEditLink', baseContext);
 
       const isModalVisible = await orderPageTabListBlock.clickOnEditLink(page);
-      await expect(isModalVisible, 'Edit shipping modal is not visible!').to.be.true;
+      expect(isModalVisible, 'Edit shipping modal is not visible!').to.eq(true);
     });
 
     it('should update the carrier and add a tracking number', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateTrackingNumber', baseContext);
 
       const textResult = await orderPageTabListBlock.setShippingDetails(page, shippingDetailsData);
-      await expect(textResult).to.equal(orderPageTabListBlock.successfulUpdateMessage);
+      expect(textResult).to.equal(orderPageTabListBlock.successfulUpdateMessage);
     });
 
     it('should check the updated carrier details', async function () {
diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/06_merchandiseReturnsTab.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/06_merchandiseReturnsTab.ts
index 1f91d8b31561f..b70902b7d0b7c 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/06_merchandiseReturnsTab.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/06_merchandiseReturnsTab.ts
@@ -102,7 +102,7 @@ describe('BO - Orders - View and edit order : Check merchandise returns tab', as
       );
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should filter the Orders table by the default customer and check the result', async function () {
@@ -111,7 +111,7 @@ describe('BO - Orders - View and edit order : Check merchandise returns tab', as
       await ordersPage.filterOrders(page, 'input', 'customer', Customers.johnDoe.lastName);
 
       const textColumn = await ordersPage.getTextColumn(page, 'customer', 1);
-      await expect(textColumn).to.contains(Customers.johnDoe.lastName);
+      expect(textColumn).to.contains(Customers.johnDoe.lastName);
     });
 
     it('should get the order ID', async function () {
@@ -128,21 +128,21 @@ describe('BO - Orders - View and edit order : Check merchandise returns tab', as
       await ordersPage.goToOrder(page, 1);
 
       const pageTitle = await orderPageTabListBlock.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+      expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
     });
 
     it(`should change the order status to '${OrderStatuses.shipped.name}' and check it`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateOrderStatus', baseContext);
 
       const result = await orderPageTabListBlock.modifyOrderStatus(page, OrderStatuses.shipped.name);
-      await expect(result).to.equal(OrderStatuses.shipped.name);
+      expect(result).to.equal(OrderStatuses.shipped.name);
     });
 
     it('should check if the button \'Return products\' is visible', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkReturnProductsButton', baseContext);
 
       const result = await orderPageTabListBlock.isReturnProductsButtonVisible(page);
-      await expect(result).to.be.true;
+      expect(result).to.eq(true);
     });
   });
 
@@ -156,7 +156,7 @@ describe('BO - Orders - View and edit order : Check merchandise returns tab', as
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Home page is not displayed').to.be.true;
+      expect(isHomePage, 'Home page is not displayed').to.eq(true);
     });
 
     it('should go to login page', async function () {
@@ -165,7 +165,7 @@ describe('BO - Orders - View and edit order : Check merchandise returns tab', as
       await homePage.goToLoginPage(page);
 
       const pageTitle = await foLoginPage.getPageTitle(page);
-      await expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
+      expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
     });
 
     it('should sign in with customer credentials', async function () {
@@ -174,7 +174,7 @@ describe('BO - Orders - View and edit order : Check merchandise returns tab', as
       await foLoginPage.customerLogin(page, Customers.johnDoe);
 
       const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
 
     it('should go to account page', async function () {
@@ -183,7 +183,7 @@ describe('BO - Orders - View and edit order : Check merchandise returns tab', as
       await homePage.goToMyAccountPage(page);
 
       const pageTitle = await myAccountPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(myAccountPage.pageTitle);
+      expect(pageTitle).to.contains(myAccountPage.pageTitle);
     });
 
     it('should go to \'Order history and details\' page', async function () {
@@ -192,7 +192,7 @@ describe('BO - Orders - View and edit order : Check merchandise returns tab', as
       await myAccountPage.goToHistoryAndDetailsPage(page);
 
       const pageTitle = await orderHistoryPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderHistoryPage.pageTitle);
+      expect(pageTitle).to.contains(orderHistoryPage.pageTitle);
     });
 
     it('should go to the first order in the list and check the existence of order return form', async function () {
@@ -201,7 +201,7 @@ describe('BO - Orders - View and edit order : Check merchandise returns tab', as
       await orderHistoryPage.goToDetailsPage(page, 1);
 
       const result = await orderDetailsPage.isOrderReturnFormVisible(page);
-      await expect(result).to.be.true;
+      expect(result).to.eq(true);
     });
 
     it('should create a merchandise return', async function () {
@@ -210,7 +210,7 @@ describe('BO - Orders - View and edit order : Check merchandise returns tab', as
       await orderDetailsPage.requestMerchandiseReturn(page, 'Test merchandise returns');
 
       const pageTitle = await foMerchandiseReturnsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(foMerchandiseReturnsPage.pageTitle);
+      expect(pageTitle).to.contains(foMerchandiseReturnsPage.pageTitle);
     });
 
     it('should close the FO page and go back to BO', async function () {
@@ -219,7 +219,7 @@ describe('BO - Orders - View and edit order : Check merchandise returns tab', as
       page = await orderDetailsPage.closePage(browserContext, page, 0);
 
       const pageTitle = await orderPageTabListBlock.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+      expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
     });
   });
 
@@ -235,7 +235,7 @@ describe('BO - Orders - View and edit order : Check merchandise returns tab', as
       await ordersPage.closeSfToolBar(page);
 
       const pageTitle = await boMerchandiseReturnsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(boMerchandiseReturnsPage.pageTitle);
+      expect(pageTitle).to.contains(boMerchandiseReturnsPage.pageTitle);
     });
 
     it('should check the existence of the merchandise returns in the table', async function () {
@@ -244,14 +244,14 @@ describe('BO - Orders - View and edit order : Check merchandise returns tab', as
       await boMerchandiseReturnsPage.filterMerchandiseReturnsTable(page, 'a!id_order', orderID.toString());
 
       const result = await boMerchandiseReturnsPage.getTextColumnFromMerchandiseReturnsTable(page, 'id_order');
-      await expect(result).to.contains(orderID);
+      expect(result).to.contains(orderID);
     });
 
     it('should get the ID from the table', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'getTrackingNumber', baseContext);
 
       returnID = await boMerchandiseReturnsPage.getTextColumnFromMerchandiseReturnsTable(page, 'id_order_return');
-      await expect(parseInt(returnID, 10)).to.not.equal(0);
+      expect(parseInt(returnID, 10)).to.not.equal(0);
     });
   });
 
@@ -266,7 +266,7 @@ describe('BO - Orders - View and edit order : Check merchandise returns tab', as
       );
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should filter the Orders table by the default customer and check the result', async function () {
@@ -275,7 +275,7 @@ describe('BO - Orders - View and edit order : Check merchandise returns tab', as
       await ordersPage.filterOrders(page, 'input', 'customer', Customers.johnDoe.lastName);
 
       const textColumn = await ordersPage.getTextColumn(page, 'customer', 1);
-      await expect(textColumn).to.contains(Customers.johnDoe.lastName);
+      expect(textColumn).to.contains(Customers.johnDoe.lastName);
     });
 
     it('should go to the first order page', async function () {
@@ -285,21 +285,21 @@ describe('BO - Orders - View and edit order : Check merchandise returns tab', as
       await ordersPage.goToOrder(page, 1);
 
       const pageTitle = await orderPageTabListBlock.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+      expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
     });
 
     it('should click on \'Merchandise returns\' tab', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'displayCarriersTab', baseContext);
 
       const isTabOpened = await orderPageTabListBlock.goToMerchandiseReturnsTab(page);
-      await expect(isTabOpened).to.be.true;
+      expect(isTabOpened).to.eq(true);
     });
 
     it('should check that the merchandise returns number is equal to 1', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkCarriersNumber', baseContext);
 
       const carriersNumber = await orderPageTabListBlock.getMerchandiseReturnsNumber(page);
-      await expect(carriersNumber).to.be.equal(1);
+      expect(carriersNumber).to.be.equal(1);
     });
 
     it('should check the merchandise returns details', async function () {
@@ -332,7 +332,7 @@ describe('BO - Orders - View and edit order : Check merchandise returns tab', as
         await boMerchandiseReturnsPage.closeSfToolBar(page);
 
         const pageTitle = await boMerchandiseReturnsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(boMerchandiseReturnsPage.pageTitle);
+        expect(pageTitle).to.contains(boMerchandiseReturnsPage.pageTitle);
       });
 
       it('should check the existence of the merchandise returns in the table', async function () {
@@ -341,7 +341,7 @@ describe('BO - Orders - View and edit order : Check merchandise returns tab', as
         await boMerchandiseReturnsPage.filterMerchandiseReturnsTable(page, 'a!id_order', orderID.toString());
 
         const result = await boMerchandiseReturnsPage.getTextColumnFromMerchandiseReturnsTable(page, 'id_order');
-        await expect(result).to.contains(orderID);
+        expect(result).to.contains(orderID);
       });
 
       it('should go to edit merchandise returns page', async function () {
@@ -350,14 +350,14 @@ describe('BO - Orders - View and edit order : Check merchandise returns tab', as
         await boMerchandiseReturnsPage.goToMerchandiseReturnPage(page);
 
         const pageTitle = await editMerchandiseReturnsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(editMerchandiseReturnsPage.pageTitle);
+        expect(pageTitle).to.contains(editMerchandiseReturnsPage.pageTitle);
       });
 
       it('should edit merchandise returns status', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `editReturnStatus${index}`, baseContext);
 
         const textResult = await editMerchandiseReturnsPage.setStatus(page, test.args.status);
-        await expect(textResult).to.contains(editMerchandiseReturnsPage.successfulUpdateMessage);
+        expect(textResult).to.contains(editMerchandiseReturnsPage.successfulUpdateMessage);
       });
     });
 
@@ -372,7 +372,7 @@ describe('BO - Orders - View and edit order : Check merchandise returns tab', as
         );
 
         const pageTitle = await ordersPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(ordersPage.pageTitle);
+        expect(pageTitle).to.contains(ordersPage.pageTitle);
       });
 
       it('should filter the Orders table by the default customer and check the result', async function () {
@@ -381,7 +381,7 @@ describe('BO - Orders - View and edit order : Check merchandise returns tab', as
         await ordersPage.filterOrders(page, 'input', 'customer', Customers.johnDoe.lastName);
 
         const textColumn = await ordersPage.getTextColumn(page, 'customer', 1);
-        await expect(textColumn).to.contains(Customers.johnDoe.lastName);
+        expect(textColumn).to.contains(Customers.johnDoe.lastName);
       });
 
       it('should go to the first order page', async function () {
@@ -391,28 +391,28 @@ describe('BO - Orders - View and edit order : Check merchandise returns tab', as
         await ordersPage.goToOrder(page, 1);
 
         const pageTitle = await orderPageTabListBlock.getPageTitle(page);
-        await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+        expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
       });
 
       it('should click on \'Merchandise returns\' tab', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `clickOnMerchandiseReturn${index}`, baseContext);
 
         const isTabOpened = await orderPageTabListBlock.goToMerchandiseReturnsTab(page);
-        await expect(isTabOpened).to.be.true;
+        expect(isTabOpened).to.eq(true);
       });
 
       it('should check that the merchandise returns number is equal to 1', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `checkMerchandiseReturnsNumber${index}`, baseContext);
 
         const carriersNumber = await orderPageTabListBlock.getMerchandiseReturnsNumber(page);
-        await expect(carriersNumber).to.be.equal(1);
+        expect(carriersNumber).to.be.equal(1);
       });
 
       it(`should check the merchandise returns status is '${test.args.status}'`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `checkCarrierDetails0${index}`, baseContext);
 
         const result = await orderPageTabListBlock.getMerchandiseReturnsDetails(page);
-        await expect(result.status).to.equal(test.args.status);
+        expect(result.status).to.equal(test.args.status);
       });
     });
 
@@ -426,7 +426,7 @@ describe('BO - Orders - View and edit order : Check merchandise returns tab', as
         await homePage.changeLanguage(page, 'en');
 
         const isHomePage = await homePage.isHomePage(page);
-        await expect(isHomePage, 'Home page is not displayed').to.be.true;
+        expect(isHomePage, 'Home page is not displayed').to.eq(true);
       });
 
       it('should go to account page', async function () {
@@ -435,7 +435,7 @@ describe('BO - Orders - View and edit order : Check merchandise returns tab', as
         await homePage.goToMyAccountPage(page);
 
         const pageTitle = await myAccountPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(myAccountPage.pageTitle);
+        expect(pageTitle).to.contains(myAccountPage.pageTitle);
       });
 
       it('should go to \'Merchandise Returns\' page', async function () {
@@ -444,14 +444,14 @@ describe('BO - Orders - View and edit order : Check merchandise returns tab', as
         await myAccountPage.goToMerchandiseReturnsPage(page);
 
         const pageTitle = await foMerchandiseReturnsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(foMerchandiseReturnsPage.pageTitle);
+        expect(pageTitle).to.contains(foMerchandiseReturnsPage.pageTitle);
       });
 
       it('should verify order return status', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `checkOrderReturnStatus${index}`, baseContext);
 
         const fileName = await foMerchandiseReturnsPage.getTextColumn(page, 'status');
-        await expect(fileName).to.be.equal(test.args.status);
+        expect(fileName).to.be.equal(test.args.status);
       });
 
       it('should close the FO page and go back to BO', async function () {
@@ -460,7 +460,7 @@ describe('BO - Orders - View and edit order : Check merchandise returns tab', as
         page = await orderDetailsPage.closePage(browserContext, page, 0);
 
         const pageTitle = await orderPageTabListBlock.getPageTitle(page);
-        await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+        expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/07_messagesBlock.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/07_messagesBlock.ts
index 9a583947c0cc0..1b850cc7f0f22 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/07_messagesBlock.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/07_messagesBlock.ts
@@ -97,14 +97,14 @@ describe('BO - Orders - View and edit order : Check messages block', async () =>
       await ordersPage.closeSfToolBar(page);
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetOrderTableFilters1', baseContext);
 
       const numberOfOrders = await ordersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfOrders).to.be.above(0);
+      expect(numberOfOrders).to.be.above(0);
     });
 
     it(`should filter the Orders table by 'Customer: ${Customers.johnDoe.lastName}'`, async function () {
@@ -113,7 +113,7 @@ describe('BO - Orders - View and edit order : Check messages block', async () =>
       await ordersPage.filterOrders(page, 'input', 'customer', Customers.johnDoe.lastName);
 
       const textColumn = await ordersPage.getTextColumn(page, 'customer', 1);
-      await expect(textColumn).to.contains(Customers.johnDoe.lastName);
+      expect(textColumn).to.contains(Customers.johnDoe.lastName);
     });
 
     it('should view the order', async function () {
@@ -122,7 +122,7 @@ describe('BO - Orders - View and edit order : Check messages block', async () =>
       await ordersPage.goToOrder(page, 1);
 
       const pageTitle = await orderPageMessagesBlock.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderPageMessagesBlock.pageTitle);
+      expect(pageTitle).to.contains(orderPageMessagesBlock.pageTitle);
     });
   });
 
@@ -139,28 +139,28 @@ describe('BO - Orders - View and edit order : Check messages block', async () =>
       await testContext.addContextItem(this, 'testIdentifier', 'checkMessageNumber1', baseContext);
 
       const messagesNumber = await orderPageMessagesBlock.getMessagesNumber(page);
-      await expect(messagesNumber).to.be.equal(1);
+      expect(messagesNumber).to.be.equal(1);
     });
 
     it('should check that the message is visible and get it', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkMessage1', baseContext);
 
       const isVisible = await orderPageMessagesBlock.isMessageVisible(page);
-      await expect(isVisible).to.be.true;
+      expect(isVisible).to.eq(true);
     });
 
     it('should check the message sender and the date', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkSenderAndDate1', baseContext);
 
       textMessage = await orderPageMessagesBlock.getTextMessage(page);
-      await expect(textMessage).to.contains(`Me ${today}`);
+      expect(textMessage).to.contains(`Me ${today}`);
     });
 
     it('should check the employee icon, the message date and the message sender', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkEmployeeIcon1', baseContext);
 
       const isVisible = await orderPageMessagesBlock.isEmployeeIconVisible(page);
-      await expect(isVisible).to.be.true;
+      expect(isVisible).to.eq(true);
     });
   });
 
@@ -175,7 +175,7 @@ describe('BO - Orders - View and edit order : Check messages block', async () =>
       await foHomePage.changeLanguage(page, 'en');
 
       const isHomePage = await foHomePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should go to login page', async function () {
@@ -184,7 +184,7 @@ describe('BO - Orders - View and edit order : Check messages block', async () =>
       await foHomePage.goToLoginPage(page);
 
       const pageTitle = await foLoginPage.getPageTitle(page);
-      await expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
+      expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
     });
 
     it('should sign in with default customer', async function () {
@@ -193,7 +193,7 @@ describe('BO - Orders - View and edit order : Check messages block', async () =>
       await foLoginPage.customerLogin(page, Customers.johnDoe);
 
       const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
 
     it('should go to orders history page', async function () {
@@ -203,7 +203,7 @@ describe('BO - Orders - View and edit order : Check messages block', async () =>
       await myAccountPage.goToHistoryAndDetailsPage(page);
 
       const pageTitle = await orderHistoryPage.getPageTitle(page);
-      await expect(pageTitle, 'Fail to open order history page').to.contains(orderHistoryPage.pageTitle);
+      expect(pageTitle, 'Fail to open order history page').to.contains(orderHistoryPage.pageTitle);
     });
 
     it('should go to the first order in the list and check order message', async function () {
@@ -212,17 +212,17 @@ describe('BO - Orders - View and edit order : Check messages block', async () =>
       await orderHistoryPage.goToDetailsPage(page, 1);
 
       const isBoxMessagesVisible = await orderHistoryPage.isBoxMessagesSectionVisible(page);
-      await expect(isBoxMessagesVisible, 'Box messages is not visible!').to.be.true;
+      expect(isBoxMessagesVisible, 'Box messages is not visible!').to.eq(true);
 
       const isMessageRowVisible = await orderHistoryPage.isMessageRowVisible(page);
-      await expect(isMessageRowVisible, 'Message is not visible!').to.be.true;
+      expect(isMessageRowVisible, 'Message is not visible!').to.eq(true);
     });
 
     it('should check the message text', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkOrderMessageBlock2', baseContext);
 
       const message = await orderHistoryPage.getMessageRow(page);
-      await expect(message)
+      expect(message)
         .to.contain(today)
         .and.to.contain(`${Employees.DefaultEmployee.firstName} ${Employees.DefaultEmployee.lastName}`)
         .and.to.contain(textMessage.substring(0, textMessage.indexOf('Me') - 1));
@@ -234,7 +234,7 @@ describe('BO - Orders - View and edit order : Check messages block', async () =>
       await foOrderConfirmationPage.logout(page);
 
       const isCustomerConnected = await foOrderConfirmationPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is connected').to.be.false;
+      expect(isCustomerConnected, 'Customer is connected').to.eq(false);
     });
   });
 
@@ -247,7 +247,7 @@ describe('BO - Orders - View and edit order : Check messages block', async () =>
       page = await foOrderConfirmationPage.closePage(browserContext, page, 0);
 
       const pageTitle = await orderPageMessagesBlock.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderPageMessagesBlock.pageTitle);
+      expect(pageTitle).to.contains(orderPageMessagesBlock.pageTitle);
     });
 
     it('should send second message', async function () {
@@ -261,28 +261,28 @@ describe('BO - Orders - View and edit order : Check messages block', async () =>
       await testContext.addContextItem(this, 'testIdentifier', 'checkMessageNumber2', baseContext);
 
       const messagesNumber = await orderPageMessagesBlock.getMessagesNumber(page);
-      await expect(messagesNumber).to.be.equal(2);
+      expect(messagesNumber).to.be.equal(2);
     });
 
     it('should check that the second message is visible', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkMessage2', baseContext);
 
       const isVisible = await orderPageMessagesBlock.isMessageVisible(page, 2);
-      await expect(isVisible).to.be.true;
+      expect(isVisible).to.eq(true);
     });
 
     it('should check that the employee icon is private', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkEmployeeIcon2', baseContext);
 
       const isVisible = await orderPageMessagesBlock.isEmployeePrivateIconVisible(page, 2);
-      await expect(isVisible).to.be.true;
+      expect(isVisible).to.eq(true);
     });
 
     it('should check the sender message and the date', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkSenderAndDate2', baseContext);
 
       textMessage = await orderPageMessagesBlock.getTextMessage(page, 2);
-      await expect(textMessage, 'Sender or date is incorrect!').to.contains(`Me ${today}`);
+      expect(textMessage, 'Sender or date is incorrect!').to.contains(`Me ${today}`);
     });
   });
 
@@ -297,7 +297,7 @@ describe('BO - Orders - View and edit order : Check messages block', async () =>
       await foHomePage.changeLanguage(page, 'en');
 
       const isHomePage = await foHomePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should go to login page', async function () {
@@ -306,7 +306,7 @@ describe('BO - Orders - View and edit order : Check messages block', async () =>
       await foHomePage.goToLoginPage(page);
 
       const pageTitle = await foLoginPage.getPageTitle(page);
-      await expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
+      expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
     });
 
     it('should sign in with default customer', async function () {
@@ -315,7 +315,7 @@ describe('BO - Orders - View and edit order : Check messages block', async () =>
       await foLoginPage.customerLogin(page, Customers.johnDoe);
 
       const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
 
     it('should go to orders history page', async function () {
@@ -325,7 +325,7 @@ describe('BO - Orders - View and edit order : Check messages block', async () =>
       await myAccountPage.goToHistoryAndDetailsPage(page);
 
       const pageTitle = await orderHistoryPage.getPageTitle(page);
-      await expect(pageTitle, 'Fail to open order history page').to.contains(orderHistoryPage.pageTitle);
+      expect(pageTitle, 'Fail to open order history page').to.contains(orderHistoryPage.pageTitle);
     });
 
     it('should go to the first order in the list and check that new message is not visible', async function () {
@@ -335,7 +335,7 @@ describe('BO - Orders - View and edit order : Check messages block', async () =>
 
       // New message is on the first row
       const message = await orderHistoryPage.getMessageRow(page, 1);
-      await expect(message, 'Second message is not visible!').to.not.contain(secondMessageData.message);
+      expect(message, 'Second message is not visible!').to.not.contain(secondMessageData.message);
     });
   });
 
@@ -355,7 +355,7 @@ describe('BO - Orders - View and edit order : Check messages block', async () =>
       page = await orderHistoryPage.closePage(browserContext, page, 0);
 
       const pageTitle = await orderPageMessagesBlock.getPageTitle(page);
-      await expect(pageTitle, 'Fail to go back to BO!').to.contains(orderPageMessagesBlock.pageTitle);
+      expect(pageTitle, 'Fail to go back to BO!').to.contains(orderPageMessagesBlock.pageTitle);
     });
 
     it('should reload the page and check that the messages number is equal to 3', async function () {
@@ -364,21 +364,21 @@ describe('BO - Orders - View and edit order : Check messages block', async () =>
       await orderPageMessagesBlock.reloadPage(page);
 
       const messagesNumber = await orderPageMessagesBlock.getMessagesNumber(page);
-      await expect(messagesNumber, 'Messages number is not correct!').to.be.equal(3);
+      expect(messagesNumber, 'Messages number is not correct!').to.be.equal(3);
     });
 
     it('should check that the third message is visible', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkThirdMessage', baseContext);
 
       const isVisible = await orderPageMessagesBlock.isMessageVisible(page, 3, 'customer');
-      await expect(isVisible, 'Message is not visible!').to.be.true;
+      expect(isVisible, 'Message is not visible!').to.eq(true);
     });
 
     it('should check the message, the sender message and the date', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkSenderAndDate3', baseContext);
 
       textMessage = await orderPageMessagesBlock.getTextMessage(page, 3, 'customer');
-      await expect(textMessage, 'Sender or date is not correct!')
+      expect(textMessage, 'Sender or date is not correct!')
         .to.contains(`${Customers.johnDoe.firstName} ${Customers.johnDoe.lastName} ${today}`)
         .and.to.contains(messageToSendData.message);
     });
@@ -392,7 +392,7 @@ describe('BO - Orders - View and edit order : Check messages block', async () =>
       await orderPageMessagesBlock.clickOnConfigureMessageLink(page);
 
       const pageTitle = await orderMessagesPage.getPageTitle(page);
-      await expect(pageTitle, 'Order messages page is not opened!').to.contains(orderMessagesPage.pageTitle);
+      expect(pageTitle, 'Order messages page is not opened!').to.contains(orderMessagesPage.pageTitle);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/08_paymentBlock.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/08_paymentBlock.ts
index 4fe0b7456eea8..4a43b8d4fb150 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/08_paymentBlock.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/08_paymentBlock.ts
@@ -138,14 +138,14 @@ describe('BO - Orders - View and edit order : Check payment Block', async () =>
       await ordersPage.closeSfToolBar(page);
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetOrderTableFilters1', baseContext);
 
       const numberOfOrders = await ordersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfOrders, 'Number of orders is not correct!').to.be.above(0);
+      expect(numberOfOrders, 'Number of orders is not correct!').to.be.above(0);
     });
 
     it(`should filter the Orders table by 'Customer: ${Customers.johnDoe.lastName}'`, async function () {
@@ -154,7 +154,7 @@ describe('BO - Orders - View and edit order : Check payment Block', async () =>
       await ordersPage.filterOrders(page, 'input', 'customer', Customers.johnDoe.lastName);
 
       const textColumn = await ordersPage.getTextColumn(page, 'customer', 1);
-      await expect(textColumn, 'Lastname is not correct').to.contains(Customers.johnDoe.lastName);
+      expect(textColumn, 'Lastname is not correct').to.contains(Customers.johnDoe.lastName);
     });
 
     it('should view the order', async function () {
@@ -163,7 +163,7 @@ describe('BO - Orders - View and edit order : Check payment Block', async () =>
       await ordersPage.goToOrder(page, 1);
 
       const pageTitle = await orderPageMessagesBlock.getPageTitle(page);
-      await expect(pageTitle, 'Error when view order page!').to.contains(orderPageMessagesBlock.pageTitle);
+      expect(pageTitle, 'Error when view order page!').to.contains(orderPageMessagesBlock.pageTitle);
     });
   });
 
@@ -173,7 +173,7 @@ describe('BO - Orders - View and edit order : Check payment Block', async () =>
       await testContext.addContextItem(this, 'testIdentifier', 'checkPayments1', baseContext);
 
       const paymentsNumber = await orderPageMessagesBlock.getPaymentsNumber(page);
-      await expect(paymentsNumber, 'Payments number is not correct! ').to.equal(0);
+      expect(paymentsNumber, 'Payments number is not correct! ').to.equal(0);
     });
 
     it('should add payment when amount is inferior to the total', async function () {
@@ -196,7 +196,7 @@ describe('BO - Orders - View and edit order : Check payment Block', async () =>
       await testContext.addContextItem(this, 'testIdentifier', 'checkpayments2', baseContext);
 
       const paymentsNumber = await orderPageMessagesBlock.getPaymentsNumber(page);
-      await expect(paymentsNumber, 'Payments number is not correct! ').to.equal(1);
+      expect(paymentsNumber, 'Payments number is not correct! ').to.equal(1);
     });
 
     it('should check the payment details', async function () {
@@ -227,7 +227,7 @@ describe('BO - Orders - View and edit order : Check payment Block', async () =>
       await testContext.addContextItem(this, 'testIdentifier', 'checkpayments3', baseContext);
 
       const paymentsNumber = await orderPageMessagesBlock.getPaymentsNumber(page);
-      await expect(paymentsNumber, 'Payments number is not correct! ').to.equal(2);
+      expect(paymentsNumber, 'Payments number is not correct! ').to.equal(2);
     });
 
     it('should check the payment details', async function () {
@@ -267,7 +267,7 @@ describe('BO - Orders - View and edit order : Check payment Block', async () =>
       await testContext.addContextItem(this, 'testIdentifier', 'checkpayments4', baseContext);
 
       const paymentsNumber = await orderPageMessagesBlock.getPaymentsNumber(page);
-      await expect(paymentsNumber, 'Payments number is not correct! ').to.equal(3);
+      expect(paymentsNumber, 'Payments number is not correct! ').to.equal(3);
     });
 
     it('should check the payment details', async function () {
@@ -290,7 +290,7 @@ describe('BO - Orders - View and edit order : Check payment Block', async () =>
       await testContext.addContextItem(this, 'testIdentifier', 'displayPaymentDetail', baseContext);
 
       const result = await orderPageMessagesBlock.displayPaymentDetail(page);
-      await expect(result)
+      expect(result)
         .to.contain('Card number Not defined')
         .and.to.contain('Card type Not defined')
         .and.to.contain('Expiration date Not defined')
@@ -311,14 +311,14 @@ describe('BO - Orders - View and edit order : Check payment Block', async () =>
       await ordersPage.closeSfToolBar(page);
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetOrderTableFilters2', baseContext);
 
       const numberOfOrders = await ordersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfOrders).to.be.above(0);
+      expect(numberOfOrders).to.be.above(0);
     });
 
     it(`should filter the Orders table by 'Customer: ${Customers.johnDoe.lastName}'`, async function () {
@@ -327,7 +327,7 @@ describe('BO - Orders - View and edit order : Check payment Block', async () =>
       await ordersPage.filterOrders(page, 'input', 'customer', Customers.johnDoe.lastName);
 
       const textColumn = await ordersPage.getTextColumn(page, 'customer', 1);
-      await expect(textColumn).to.contains(Customers.johnDoe.lastName);
+      expect(textColumn).to.contains(Customers.johnDoe.lastName);
     });
 
     it('should view the order', async function () {
@@ -336,14 +336,14 @@ describe('BO - Orders - View and edit order : Check payment Block', async () =>
       await ordersPage.goToOrder(page, 1);
 
       const pageTitle = await orderPageMessagesBlock.getPageTitle(page);
-      await expect(pageTitle, 'Error when view order page!').to.contains(orderPageMessagesBlock.pageTitle);
+      expect(pageTitle, 'Error when view order page!').to.contains(orderPageMessagesBlock.pageTitle);
     });
 
     it('should check that the new currency is visible on select options', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkSelectOption', baseContext);
 
       const listOfCurrencies = await orderPageMessagesBlock.getCurrencySelectOptions(page);
-      await expect(listOfCurrencies).to.contain('€')
+      expect(listOfCurrencies).to.contain('€')
         .and.to.contain(Currencies.mad.isoCode);
     });
 
@@ -368,14 +368,14 @@ describe('BO - Orders - View and edit order : Check payment Block', async () =>
       );
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetOrderTableFilters3', baseContext);
 
       const numberOfOrders = await ordersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfOrders).to.be.above(0);
+      expect(numberOfOrders).to.be.above(0);
     });
 
     it(`should filter the Orders table by 'Customer: ${Customers.johnDoe.lastName}'`, async function () {
@@ -384,7 +384,7 @@ describe('BO - Orders - View and edit order : Check payment Block', async () =>
       await ordersPage.filterOrders(page, 'input', 'customer', Customers.johnDoe.lastName);
 
       const textColumn = await ordersPage.getTextColumn(page, 'customer', 2);
-      await expect(textColumn).to.contains(Customers.johnDoe.lastName);
+      expect(textColumn).to.contains(Customers.johnDoe.lastName);
     });
 
     it('should view the order', async function () {
@@ -393,28 +393,28 @@ describe('BO - Orders - View and edit order : Check payment Block', async () =>
       await ordersPage.goToOrder(page, 2);
 
       const pageTitle = await orderPageMessagesBlock.getPageTitle(page);
-      await expect(pageTitle, 'Error when view order page!').to.contains(orderPageMessagesBlock.pageTitle);
+      expect(pageTitle, 'Error when view order page!').to.contains(orderPageMessagesBlock.pageTitle);
     });
 
     it('should check that the payments number is equal to 0', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkpayments5', baseContext);
 
       const paymentsNumber = await orderPageMessagesBlock.getPaymentsNumber(page);
-      await expect(paymentsNumber, 'Payments number is not correct! ').to.equal(0);
+      expect(paymentsNumber, 'Payments number is not correct! ').to.equal(0);
     });
 
     it(`should change the order status to '${OrderStatuses.paymentAccepted.name}'`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateOrderStatusPaymentAccepted', baseContext);
 
       const textResult = await orderPageMessagesBlock.modifyOrderStatus(page, OrderStatuses.paymentAccepted.name);
-      await expect(textResult).to.equal(OrderStatuses.paymentAccepted.name);
+      expect(textResult).to.equal(OrderStatuses.paymentAccepted.name);
     });
 
     it('should check that the payments number is equal to 1', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkpayments6', baseContext);
 
       const paymentsNumber = await orderPageMessagesBlock.getPaymentsNumber(page);
-      await expect(paymentsNumber, 'Payments number is not correct! ').to.equal(1);
+      expect(paymentsNumber, 'Payments number is not correct! ').to.equal(1);
     });
 
     it('should check the payment details and get the invoice number', async function () {
@@ -439,7 +439,7 @@ describe('BO - Orders - View and edit order : Check payment Block', async () =>
       await orderPageProductsBlock.selectInvoice(page);
 
       const textResult = await orderPageProductsBlock.addProductToCart(page, 1, true);
-      await expect(textResult).to.contains(orderPageProductsBlock.successfulAddProductMessage);
+      expect(textResult).to.contains(orderPageProductsBlock.successfulAddProductMessage);
     });
 
     it('should check that products number is equal to 2', async function () {
@@ -448,21 +448,21 @@ describe('BO - Orders - View and edit order : Check payment Block', async () =>
       await orderPageMessagesBlock.reloadPage(page);
 
       const productCount = await orderPageProductsBlock.getProductsNumber(page);
-      await expect(productCount).to.equal(2);
+      expect(productCount).to.equal(2);
     });
 
     it('should check that invoices number is equal to 2', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkDocumentsNumber', baseContext);
 
       const documentsNumber = await orderPageTabListBlock.getDocumentsNumber(page);
-      await expect(documentsNumber).to.be.equal(2);
+      expect(documentsNumber).to.be.equal(2);
     });
 
     it('should check that payments number is equal to 1', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkpayments7', baseContext);
 
       const paymentsNumber = await orderPageMessagesBlock.getPaymentsNumber(page);
-      await expect(paymentsNumber, 'Payments number is not correct! ').to.equal(1);
+      expect(paymentsNumber, 'Payments number is not correct! ').to.equal(1);
     });
 
     it('should check the warning message', async function () {
@@ -487,7 +487,7 @@ describe('BO - Orders - View and edit order : Check payment Block', async () =>
       await testContext.addContextItem(this, 'testIdentifier', 'checkpayments8', baseContext);
 
       const paymentsNumber = await orderPageMessagesBlock.getPaymentsNumber(page);
-      await expect(paymentsNumber, 'Payments number is not correct! ').to.equal(2);
+      expect(paymentsNumber, 'Payments number is not correct! ').to.equal(2);
     });
 
     it('should download the invoice and check payment method and amount', async function () {
@@ -495,16 +495,16 @@ describe('BO - Orders - View and edit order : Check payment Block', async () =>
 
       // Download invoice
       filePath = await orderPageTabListBlock.downloadInvoice(page, 3);
-      await expect(filePath).to.be.not.null;
+      expect(filePath).to.not.eq(null);
 
       const exist = await files.doesFileExist(filePath);
-      await expect(exist, 'File doesn\'t exist!').to.be.true;
+      expect(exist, 'File doesn\'t exist!').to.eq(true);
 
       const paymentMethodExist = await files.isTextInPDF(filePath, paymentDataAmountEqualRest.paymentMethod);
-      await expect(paymentMethodExist, 'Payment method does not exist in invoice!').to.be.true;
+      expect(paymentMethodExist, 'Payment method does not exist in invoice!').to.eq(true);
 
       const amountExist = await files.isTextInPDF(filePath, paymentDataAmountEqualRest.amount.toString());
-      await expect(amountExist, 'Payment amount does not exist in invoice!').to.be.true;
+      expect(amountExist, 'Payment amount does not exist in invoice!').to.eq(true);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/09_addDiscount.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/09_addDiscount.ts
index 719885d473ae4..f167f2a3f202e 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/09_addDiscount.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/09_addDiscount.ts
@@ -156,14 +156,14 @@ describe('BO - Orders - View and edit order : Add discount', async () => {
       await ordersPage.closeSfToolBar(page);
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetOrderTable1', baseContext);
 
       const numberOfOrders = await ordersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfOrders, 'Number of orders is not correct!').to.be.above(0);
+      expect(numberOfOrders, 'Number of orders is not correct!').to.be.above(0);
     });
 
     it(`should filter the Orders table by 'Customer: ${Customers.johnDoe.lastName}'`, async function () {
@@ -172,7 +172,7 @@ describe('BO - Orders - View and edit order : Add discount', async () => {
       await ordersPage.filterOrders(page, 'input', 'customer', Customers.johnDoe.lastName);
 
       const textColumn = await ordersPage.getTextColumn(page, 'customer', 1);
-      await expect(textColumn, 'Lastname is not correct').to.contains(Customers.johnDoe.lastName);
+      expect(textColumn, 'Lastname is not correct').to.contains(Customers.johnDoe.lastName);
     });
 
     it('should view the order', async function () {
@@ -181,14 +181,14 @@ describe('BO - Orders - View and edit order : Add discount', async () => {
       await ordersPage.goToOrder(page, 1);
 
       const pageTitle = await orderPageProductsBlock.getPageTitle(page);
-      await expect(pageTitle, 'Error when view order page!').to.contains(orderPageProductsBlock.pageTitle);
+      expect(pageTitle, 'Error when view order page!').to.contains(orderPageProductsBlock.pageTitle);
     });
 
     it('should get the total to pay', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'getTotalToPay', baseContext);
 
       totalOrder = await orderPageProductsBlock.getOrderTotalPrice(page);
-      await expect(totalOrder).is.not.equal(0);
+      expect(totalOrder).is.not.equal(0);
     });
   });
 
@@ -198,7 +198,7 @@ describe('BO - Orders - View and edit order : Add discount', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'addDiscountInvalidValue', baseContext);
 
       const errorMessage = await orderPageProductsBlock.addDiscount(page, discountDataInvalidValue);
-      await expect(errorMessage, 'Error message is not correct!')
+      expect(errorMessage, 'Error message is not correct!')
         .to.equal(orderPageProductsBlock.discountMustBeNumberErrorMessage);
     });
 
@@ -206,7 +206,7 @@ describe('BO - Orders - View and edit order : Add discount', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'addDiscountPercentSup100', baseContext);
 
       const errorMessage = await orderPageProductsBlock.addDiscount(page, discountPercentSup100Value);
-      await expect(errorMessage, 'Error message is not correct!')
+      expect(errorMessage, 'Error message is not correct!')
         .to.equal(orderPageProductsBlock.invalidPercentValueErrorMessage);
     });
 
@@ -214,7 +214,7 @@ describe('BO - Orders - View and edit order : Add discount', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'addDiscountPercentInf0', baseContext);
 
       const errorMessage = await orderPageProductsBlock.addDiscount(page, discountPercentInf0Value);
-      await expect(errorMessage, 'Error message is not correct!')
+      expect(errorMessage, 'Error message is not correct!')
         .to.equal(orderPageProductsBlock.percentValueNotPositiveErrorMessage);
     });
 
@@ -222,7 +222,7 @@ describe('BO - Orders - View and edit order : Add discount', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'addDiscountPercentGoodValue', baseContext);
 
       const errorMessage = await orderPageProductsBlock.addDiscount(page, discountPercentGoodValue);
-      await expect(errorMessage, 'Validation message is not correct!')
+      expect(errorMessage, 'Validation message is not correct!')
         .to.equal(orderPageProductsBlock.successfulUpdateMessage);
     });
 
@@ -230,21 +230,21 @@ describe('BO - Orders - View and edit order : Add discount', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'checkNewDiscountTable', baseContext);
 
       const isVisible = await orderPageProductsBlock.isDiscountListTableVisible(page);
-      await expect(isVisible, 'Discount list table is not visible').to.be.true;
+      expect(isVisible, 'Discount list table is not visible').to.eq(true);
     });
 
     it('should check the discount name', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkDiscountName', baseContext);
 
       const discountName = await orderPageProductsBlock.getTextColumnFromDiscountTable(page, 'name');
-      await expect(discountName).to.be.equal(discountPercentGoodValue.name);
+      expect(discountName).to.be.equal(discountPercentGoodValue.name);
     });
 
     it('should check the discount value', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkDiscountValue', baseContext);
 
       const discountValue = await orderPageProductsBlock.getTextColumnFromDiscountTable(page, 'value');
-      await expect(discountValue).to.equal(
+      expect(discountValue).to.equal(
         `- €${totalOrder - (totalOrder * parseFloat(discountPercentGoodValue.value)) / 100}`,
       );
     });
@@ -253,7 +253,7 @@ describe('BO - Orders - View and edit order : Add discount', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'checkTotalAfterDiscount', baseContext);
 
       const totalAfterDiscount = await orderPageProductsBlock.getOrderTotalPrice(page);
-      await expect(totalAfterDiscount)
+      expect(totalAfterDiscount)
         .to.be.equal(totalOrder - (totalOrder * parseFloat(discountPercentGoodValue.value)) / 100);
     });
 
@@ -261,14 +261,14 @@ describe('BO - Orders - View and edit order : Add discount', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'checkTotalDiscountValue', baseContext);
 
       const discountValue = await orderPageProductsBlock.getOrderTotalDiscounts(page);
-      await expect(discountValue).to.equal((totalOrder * parseFloat(discountPercentGoodValue.value)) / 100 - totalOrder);
+      expect(discountValue).to.equal((totalOrder * parseFloat(discountPercentGoodValue.value)) / 100 - totalOrder);
     });
 
     it('should delete the discount', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteDiscount1', baseContext);
 
       const validationMessage = await orderPageProductsBlock.deleteDiscount(page);
-      await expect(validationMessage, 'Successful update alert is not correct')
+      expect(validationMessage, 'Successful update alert is not correct')
         .to.equal(orderPageProductsBlock.successfulUpdateMessage);
     });
 
@@ -276,7 +276,7 @@ describe('BO - Orders - View and edit order : Add discount', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'addDiscountAmountInvalidValue', baseContext);
 
       const errorMessage = await orderPageProductsBlock.addDiscount(page, discountAmountTextValue);
-      await expect(errorMessage, 'Error message is not correct!')
+      expect(errorMessage, 'Error message is not correct!')
         .to.equal(orderPageProductsBlock.discountMustBeNumberErrorMessage);
     });
 
@@ -284,14 +284,14 @@ describe('BO - Orders - View and edit order : Add discount', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'addDiscountAmountNegativeValue', baseContext);
 
       const errorMessage = await orderPageProductsBlock.addDiscount(page, discountAmountNegativeValue);
-      await expect(errorMessage, 'Error message is not correct!').to.equal('Amount value must be greater than 0.');
+      expect(errorMessage, 'Error message is not correct!').to.equal('Amount value must be greater than 0.');
     });
 
     it('should add a discount amount greater than the total and check error message', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'addDiscountAmountGreaterThanTotal', baseContext);
 
       const errorMessage = await orderPageProductsBlock.addDiscount(page, discountAmountGreaterThanTotal);
-      await expect(errorMessage, 'Error message is not correct!')
+      expect(errorMessage, 'Error message is not correct!')
         .to.equal(orderPageProductsBlock.discountCannotExceedTotalErrorMessage);
     });
 
@@ -299,7 +299,7 @@ describe('BO - Orders - View and edit order : Add discount', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'addCorrectDiscountAmount', baseContext);
 
       const errorMessage = await orderPageProductsBlock.addDiscount(page, discountAmountGoodValue);
-      await expect(errorMessage, 'Validation message is not correct!')
+      expect(errorMessage, 'Validation message is not correct!')
         .to.equal(orderPageProductsBlock.successfulUpdateMessage);
     });
 
@@ -307,21 +307,21 @@ describe('BO - Orders - View and edit order : Add discount', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'checkNewDiscountTable2', baseContext);
 
       const isVisible = await orderPageProductsBlock.isDiscountListTableVisible(page);
-      await expect(isVisible, 'Discount list table is not visible').to.be.true;
+      expect(isVisible, 'Discount list table is not visible').to.eq(true);
     });
 
     it('should check the discount name', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkDiscountName2', baseContext);
 
       const discountName = await orderPageProductsBlock.getTextColumnFromDiscountTable(page, 'name');
-      await expect(discountName).to.be.equal(discountAmountGoodValue.name);
+      expect(discountName).to.be.equal(discountAmountGoodValue.name);
     });
 
     it('should check the discount value', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkDiscountValue2', baseContext);
 
       const discountValue = await orderPageProductsBlock.getTextColumnFromDiscountTable(page, 'value');
-      await expect(discountValue).to.equal(
+      expect(discountValue).to.equal(
         `- €${discountAmountGoodValue.value}`,
       );
     });
@@ -330,14 +330,14 @@ describe('BO - Orders - View and edit order : Add discount', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'checkTotalAfterDiscount2', baseContext);
 
       const totalAfterDiscount = await orderPageProductsBlock.getOrderTotalPrice(page);
-      await expect(totalAfterDiscount).to.be.equal(totalOrder - parseFloat(discountAmountGoodValue.value));
+      expect(totalAfterDiscount).to.be.equal(totalOrder - parseFloat(discountAmountGoodValue.value));
     });
 
     it('should check the total discounts value', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkTotalDiscountValue2', baseContext);
 
       const discountValue = await orderPageProductsBlock.getOrderTotalDiscounts(page);
-      await expect(discountValue).to.equal(parseFloat(discountAmountGoodValue.value) * -1);
+      expect(discountValue).to.equal(parseFloat(discountAmountGoodValue.value) * -1);
     });
   });
 
@@ -353,7 +353,7 @@ describe('BO - Orders - View and edit order : Add discount', async () => {
       );
 
       const pageTitle = await cartRulesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(cartRulesPage.pageTitle);
+      expect(pageTitle).to.contains(cartRulesPage.pageTitle);
     });
     [
       {
@@ -384,11 +384,11 @@ describe('BO - Orders - View and edit order : Add discount', async () => {
         );
 
         const numberOfCartRulesAfterFilter = await cartRulesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfCartRulesAfterFilter).to.be.equal(1);
+        expect(numberOfCartRulesAfterFilter).to.be.equal(1);
 
         for (let row = 1; row <= numberOfCartRulesAfterFilter; row++) {
           const textColumn = await cartRulesPage.getTextColumn(page, row, test.args.filterBy);
-          await expect(textColumn).to.contains(test.args.filterValue);
+          expect(textColumn).to.contains(test.args.filterValue);
         }
       });
 
@@ -396,7 +396,7 @@ describe('BO - Orders - View and edit order : Add discount', async () => {
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}Reset`, baseContext);
 
         const numberOfCartRulesAfterReset = await cartRulesPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfCartRulesAfterReset).to.equal(numberOfCartRules + 2);
+        expect(numberOfCartRulesAfterReset).to.equal(numberOfCartRules + 2);
       });
     });
   });
@@ -414,7 +414,7 @@ describe('BO - Orders - View and edit order : Add discount', async () => {
       await ordersPage.closeSfToolBar(page);
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it(`should filter the Orders table by 'Customer: ${Customers.johnDoe.lastName}'`, async function () {
@@ -423,7 +423,7 @@ describe('BO - Orders - View and edit order : Add discount', async () => {
       await ordersPage.filterOrders(page, 'input', 'customer', Customers.johnDoe.lastName);
 
       const textColumn = await ordersPage.getTextColumn(page, 'customer', 1);
-      await expect(textColumn, 'Lastname is not correct').to.contains(Customers.johnDoe.lastName);
+      expect(textColumn, 'Lastname is not correct').to.contains(Customers.johnDoe.lastName);
     });
 
     it('should view the order', async function () {
@@ -432,14 +432,14 @@ describe('BO - Orders - View and edit order : Add discount', async () => {
       await ordersPage.goToOrder(page, 1);
 
       const pageTitle = await orderPageProductsBlock.getPageTitle(page);
-      await expect(pageTitle, 'Error when view order page!').to.contains(orderPageProductsBlock.pageTitle);
+      expect(pageTitle, 'Error when view order page!').to.contains(orderPageProductsBlock.pageTitle);
     });
 
     it('should delete the created discount', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteDiscount2', baseContext);
 
       const validationMessage = await orderPageProductsBlock.deleteDiscount(page);
-      await expect(validationMessage, 'Successful update alert is not correct')
+      expect(validationMessage, 'Successful update alert is not correct')
         .to.equal(orderPageProductsBlock.successfulUpdateMessage);
     });
   });
@@ -450,7 +450,7 @@ describe('BO - Orders - View and edit order : Add discount', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'addDiscountFreeShipping', baseContext);
 
       const errorMessage = await orderPageProductsBlock.addDiscount(page, discountFreeShipping);
-      await expect(errorMessage, 'Error message is not correct!')
+      expect(errorMessage, 'Error message is not correct!')
         .to.equal(orderPageProductsBlock.successfulUpdateMessage);
     });
 
@@ -458,70 +458,70 @@ describe('BO - Orders - View and edit order : Add discount', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'checkFreeShippingDiscountTable', baseContext);
 
       const isVisible = await orderPageProductsBlock.isDiscountListTableVisible(page);
-      await expect(isVisible, 'Discount list table is not visible').to.be.true;
+      expect(isVisible, 'Discount list table is not visible').to.eq(true);
     });
 
     it('should check the discount name', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkFreeShippingDiscountName', baseContext);
 
       const discountName = await orderPageProductsBlock.getTextColumnFromDiscountTable(page, 'name');
-      await expect(discountName).to.be.equal(discountFreeShipping.name);
+      expect(discountName).to.be.equal(discountFreeShipping.name);
     });
 
     it('should check the discount value', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkFreeShippingDiscountValue', baseContext);
 
       const discountValue = await orderPageProductsBlock.getTextColumnFromDiscountTable(page, 'value');
-      await expect(discountValue).to.equal('€0.00');
+      expect(discountValue).to.equal('€0.00');
     });
 
     it('should click on \'Carriers\' tab', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'displayCarriersTab', baseContext);
 
       const isTabOpened = await orderPageTabListBlock.goToCarriersTab(page);
-      await expect(isTabOpened).to.be.true;
+      expect(isTabOpened).to.eq(true);
     });
 
     it('should click on \'Edit\' link and check the modal', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnEditLink', baseContext);
 
       const isModalVisible = await orderPageTabListBlock.clickOnEditLink(page);
-      await expect(isModalVisible, 'Edit shipping modal is not visible!').to.be.true;
+      expect(isModalVisible, 'Edit shipping modal is not visible!').to.eq(true);
     });
 
     it('should update the carrier and add a tracking number', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateCarrier', baseContext);
 
       const textResult = await orderPageTabListBlock.setShippingDetails(page, shippingDetailsData);
-      await expect(textResult).to.equal(orderPageTabListBlock.successfulUpdateMessage);
+      expect(textResult).to.equal(orderPageTabListBlock.successfulUpdateMessage);
     });
 
     it('should check that the discount value is changed', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkNewCarrierDiscountValue', baseContext);
 
       const discountValue = await orderPageProductsBlock.getTextColumnFromDiscountTable(page, 'value');
-      await expect(discountValue).to.equal(`- ${shippingDetailsCost}`);
+      expect(discountValue).to.equal(`- ${shippingDetailsCost}`);
     });
 
     it('should check total after discount', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkTotalAfterDiscount3', baseContext);
 
       const totalAfterDiscount = await orderPageProductsBlock.getOrderTotalPrice(page);
-      await expect(totalAfterDiscount).to.be.equal(totalOrder);
+      expect(totalAfterDiscount).to.be.equal(totalOrder);
     });
 
     it('should check the total discounts value', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkTotalDiscountValue3', baseContext);
 
       const discountValue = await orderPageProductsBlock.getOrderTotalDiscounts(page);
-      await expect(discountValue).to.equal(-8.40);
+      expect(discountValue).to.equal(-8.40);
     });
 
     it('should delete the created discount', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteFreeShippingDiscount', baseContext);
 
       const validationMessage = await orderPageProductsBlock.deleteDiscount(page);
-      await expect(validationMessage, 'Successful update alert is not correct')
+      expect(validationMessage, 'Successful update alert is not correct')
         .to.equal(orderPageProductsBlock.successfulUpdateMessage);
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/10_changeStatus.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/10_changeStatus.ts
index 3d0f2d83807db..5f633b534016f 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/10_changeStatus.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/10_changeStatus.ts
@@ -78,7 +78,7 @@ describe('BO - Orders - View and edit order : Change order status', async () =>
       );
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should filter the Orders table by the default customer and check the result', async function () {
@@ -87,7 +87,7 @@ describe('BO - Orders - View and edit order : Change order status', async () =>
       await ordersPage.filterOrders(page, 'input', 'customer', Customers.johnDoe.lastName);
 
       const textColumn = await ordersPage.getTextColumn(page, 'customer', 1);
-      await expect(textColumn).to.contains(Customers.johnDoe.lastName);
+      expect(textColumn).to.contains(Customers.johnDoe.lastName);
     });
 
     it('should go to the first order page', async function () {
@@ -97,28 +97,28 @@ describe('BO - Orders - View and edit order : Change order status', async () =>
       await ordersPage.goToOrder(page, 1);
 
       const pageTitle = await orderPageTabListBlock.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+      expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
     });
 
     it('should check that \'Update status button\' is disabled', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkThatUpdateStatusButtonIsDisabled1', baseContext);
 
       const isButtonDisabled = await orderPageTabListBlock.isUpdateStatusButtonDisabled(page);
-      await expect(isButtonDisabled, 'Update status button is not disabled!').to.be.true;
+      expect(isButtonDisabled, 'Update status button is not disabled!').to.eq(true);
     });
 
     it('should check that \'Partial refund\' button is not visible', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkPartialRefundButton1', baseContext);
 
       const isButtonVisible = await orderPageTabListBlock.isPartialRefundButtonVisible(page);
-      await expect(isButtonVisible, 'Partial refund button is visible!').to.be.false;
+      expect(isButtonVisible, 'Partial refund button is visible!').to.eq(false);
     });
 
     it('should check that \'View invoice\' button is not visible', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkViewInvoiceButton1', baseContext);
 
       const isButtonVisible = await orderPageTabListBlock.isViewInvoiceButtonVisible(page);
-      await expect(isButtonVisible, 'Partial refund button is visible!').to.be.false;
+      expect(isButtonVisible, 'Partial refund button is visible!').to.eq(false);
     });
 
     it('should select the same status', async function () {
@@ -134,42 +134,42 @@ describe('BO - Orders - View and edit order : Change order status', async () =>
       await testContext.addContextItem(this, 'testIdentifier', 'checkThatUpdateStatusButtonIsDisabled2', baseContext);
 
       const isButtonDisabled = await orderPageTabListBlock.isUpdateStatusButtonDisabled(page);
-      await expect(isButtonDisabled, 'Update status button is not disabled!').to.be.true;
+      expect(isButtonDisabled, 'Update status button is not disabled!').to.eq(true);
     });
 
     it('should check that \'Partial refund\' button still not visible', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkPartialRefundButton2', baseContext);
 
       const isButtonVisible = await orderPageTabListBlock.isPartialRefundButtonVisible(page);
-      await expect(isButtonVisible, 'Partial refund button is visible!').to.be.false;
+      expect(isButtonVisible, 'Partial refund button is visible!').to.eq(false);
     });
 
     it('should check that \'View invoice\' button still not visible', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkViewInvoiceButton2', baseContext);
 
       const isButtonVisible = await orderPageTabListBlock.isViewInvoiceButtonVisible(page);
-      await expect(isButtonVisible, 'Partial refund button is visible!').to.be.false;
+      expect(isButtonVisible, 'Partial refund button is visible!').to.eq(false);
     });
 
     it('should check that \'View delivery slip\' button is not visible', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkViewInvoiceButton3', baseContext);
 
       const isButtonVisible = await orderPageTabListBlock.isDeliverySlipButtonVisible(page);
-      await expect(isButtonVisible, 'Partial refund button is visible!').to.be.false;
+      expect(isButtonVisible, 'Partial refund button is visible!').to.eq(false);
     });
 
     it(`should select the status '${OrderStatuses.canceled.name}'`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'selectCanceledStatus', baseContext);
 
       const result = await orderPageTabListBlock.modifyOrderStatus(page, OrderStatuses.canceled.name);
-      await expect(result).to.equal(OrderStatuses.canceled.name);
+      expect(result).to.equal(OrderStatuses.canceled.name);
     });
 
     it('should check that the statuses number is equal to 2', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkStatusesNumber1', baseContext);
 
       const statusesNumber = await orderPageTabListBlock.getStatusesNumber(page);
-      await expect(statusesNumber).to.be.equal(2);
+      expect(statusesNumber).to.be.equal(2);
     });
 
     it(`should check that the actual status is '${OrderStatuses.canceled.name}'`, async function () {
@@ -183,35 +183,35 @@ describe('BO - Orders - View and edit order : Change order status', async () =>
       await testContext.addContextItem(this, 'testIdentifier', 'checkPartialRefundButton3', baseContext);
 
       const isButtonVisible = await orderPageTabListBlock.isPartialRefundButtonVisible(page);
-      await expect(isButtonVisible, 'Partial refund button is visible!').to.be.false;
+      expect(isButtonVisible, 'Partial refund button is visible!').to.eq(false);
     });
 
     it('should check that \'View invoice\' button is not visible', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkViewInvoiceButton4', baseContext);
 
       const isButtonVisible = await orderPageTabListBlock.isViewInvoiceButtonVisible(page);
-      await expect(isButtonVisible, 'Partial refund button is visible!').to.be.false;
+      expect(isButtonVisible, 'Partial refund button is visible!').to.eq(false);
     });
 
     it('should check that \'View delivery slip\' button is not visible', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkViewInvoiceButton5', baseContext);
 
       const isButtonVisible = await orderPageTabListBlock.isDeliverySlipButtonVisible(page);
-      await expect(isButtonVisible, 'Partial refund button is visible!').to.be.false;
+      expect(isButtonVisible, 'Partial refund button is visible!').to.eq(false);
     });
 
     it(`should select the status '${OrderStatuses.paymentAccepted.name}'`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'selectPaymentAcceptedStatus', baseContext);
 
       const result = await orderPageTabListBlock.modifyOrderStatus(page, OrderStatuses.paymentAccepted.name);
-      await expect(result).to.equal(OrderStatuses.paymentAccepted.name);
+      expect(result).to.equal(OrderStatuses.paymentAccepted.name);
     });
 
     it('should check that the statuses number is equal to 3', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkStatusesNumber2', baseContext);
 
       const statusesNumber = await orderPageTabListBlock.getStatusesNumber(page);
-      await expect(statusesNumber).to.be.equal(3);
+      expect(statusesNumber).to.be.equal(3);
     });
 
     it(`should check that the actual status is '${OrderStatuses.paymentAccepted.name}'`, async function () {
@@ -225,45 +225,45 @@ describe('BO - Orders - View and edit order : Change order status', async () =>
       await testContext.addContextItem(this, 'testIdentifier', 'checkPartialRefundButton4', baseContext);
 
       const isButtonVisible = await orderPageTabListBlock.isPartialRefundButtonVisible(page);
-      await expect(isButtonVisible, 'Partial refund button is not visible!').to.be.true;
+      expect(isButtonVisible, 'Partial refund button is not visible!').to.eq(true);
     });
 
     it('should check that \'View invoice\' button is visible', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkViewInvoiceButton6', baseContext);
 
       const isButtonVisible = await orderPageTabListBlock.isViewInvoiceButtonVisible(page);
-      await expect(isButtonVisible, 'Partial refund button is not visible!').to.be.true;
+      expect(isButtonVisible, 'Partial refund button is not visible!').to.eq(true);
     });
 
     it('should check that \'View delivery slip\' button is not visible', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkViewInvoiceButton7', baseContext);
 
       const isButtonVisible = await orderPageTabListBlock.isDeliverySlipButtonVisible(page);
-      await expect(isButtonVisible, 'Partial refund button is visible!').to.be.false;
+      expect(isButtonVisible, 'Partial refund button is visible!').to.eq(false);
     });
 
     it('should click on \'View invoice\' button and check that the file is downloaded', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnViewInvoice', baseContext);
 
       filePath = await orderPageTabListBlock.viewInvoice(page);
-      await expect(filePath).to.be.not.null;
+      expect(filePath).to.not.eq(null);
 
       const doesFileExist = await files.doesFileExist(filePath, 5000);
-      await expect(doesFileExist, 'File is not downloaded!').to.be.true;
+      expect(doesFileExist, 'File is not downloaded!').to.eq(true);
     });
 
     it(`should select the status '${OrderStatuses.shipped.name}'`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'selectShippedStatus', baseContext);
 
       const result = await orderPageTabListBlock.modifyOrderStatus(page, OrderStatuses.shipped.name);
-      await expect(result).to.equal(OrderStatuses.shipped.name);
+      expect(result).to.equal(OrderStatuses.shipped.name);
     });
 
     it('should check that the statuses number is equal to 4', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkStatusesNumber3', baseContext);
 
       const statusesNumber = await orderPageTabListBlock.getStatusesNumber(page);
-      await expect(statusesNumber).to.be.equal(4);
+      expect(statusesNumber).to.be.equal(4);
     });
 
     it(`should check that the actual status is '${OrderStatuses.shipped.name}'`, async function () {
@@ -277,10 +277,10 @@ describe('BO - Orders - View and edit order : Change order status', async () =>
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnViewInvoice2', baseContext);
 
       filePath = await orderPageTabListBlock.viewDeliverySlip(page);
-      await expect(filePath).to.be.not.null;
+      expect(filePath).to.not.eq(null);
 
       const doesFileExist = await files.doesFileExist(filePath, 5000);
-      await expect(doesFileExist, 'File is not downloaded!').to.be.true;
+      expect(doesFileExist, 'File is not downloaded!').to.eq(true);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/11_checkInvoice.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/11_checkInvoice.ts
index 787cbcedcbd91..c50c389c012f3 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/11_checkInvoice.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/11_checkInvoice.ts
@@ -197,14 +197,14 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
           await productsPage.closeSfToolBar(page);
 
           const pageTitle = await productsPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(productsPage.pageTitle);
+          expect(pageTitle).to.contains(productsPage.pageTitle);
         });
 
         it('should reset all filters and get number of products', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'resetFiltersBeforeCreate', baseContext);
 
           numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
-          await expect(numberOfProducts).to.be.above(0);
+          expect(numberOfProducts).to.be.above(0);
         });
       }
 
@@ -218,7 +218,7 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
         }
 
         const pageTitle = await addProductPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addProductPage.pageTitle);
+        expect(pageTitle).to.contains(addProductPage.pageTitle);
       });
 
       it('should create Product', async function () {
@@ -235,7 +235,7 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
         if (product === productWithEcoTax) {
           await addProductPage.addEcoTax(page, product.ecoTax);
         }
-        await expect(createProductMessage).to.equal(addProductPage.settingUpdatedMessage);
+        expect(createProductMessage).to.equal(addProductPage.settingUpdatedMessage);
       });
     });
   });
@@ -257,14 +257,14 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
         await ordersPage.closeSfToolBar(page);
 
         const pageTitle = await ordersPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(ordersPage.pageTitle);
+        expect(pageTitle).to.contains(ordersPage.pageTitle);
       });
 
       it('should reset all filters', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'resetOrderTableFilters1', baseContext);
 
         const numberOfOrders = await ordersPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfOrders).to.be.above(0);
+        expect(numberOfOrders).to.be.above(0);
       });
 
       it(`should filter the Orders table by 'Customer: ${Customers.johnDoe.lastName}'`, async function () {
@@ -273,7 +273,7 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
         await ordersPage.filterOrders(page, 'input', 'customer', Customers.johnDoe.lastName);
 
         const textColumn = await ordersPage.getTextColumn(page, 'customer', 1);
-        await expect(textColumn).to.contains(Customers.johnDoe.lastName);
+        expect(textColumn).to.contains(Customers.johnDoe.lastName);
       });
 
       it('should view the order', async function () {
@@ -282,7 +282,7 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
         await ordersPage.goToOrder(page, 2);
 
         const pageTitle = await orderPageTabListBlock.getPageTitle(page);
-        await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+        expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
       });
     });
 
@@ -291,7 +291,7 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'deleteOrderedProduct', baseContext);
 
         const textResult = await orderPageProductsBlock.deleteProduct(page, 1);
-        await expect(textResult).to.contains(orderPageProductsBlock.successfulDeleteProductMessage);
+        expect(textResult).to.contains(orderPageProductsBlock.successfulDeleteProductMessage);
       });
 
       it(`should search for the product '${virtualProduct.name}'`, async function () {
@@ -300,14 +300,14 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
         await orderPageProductsBlock.searchProduct(page, virtualProduct.name);
 
         const result = await orderPageProductsBlock.getSearchedProductInformation(page);
-        await expect(result.available).to.equal(virtualProduct.quantity - 1);
+        expect(result.available).to.equal(virtualProduct.quantity - 1);
       });
 
       it('should add the product to the cart', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'addProductToCart1', baseContext);
 
         const textResult = await orderPageProductsBlock.addProductToCart(page, 13);
-        await expect(textResult).to.contains(orderPageProductsBlock.successfulAddProductMessage);
+        expect(textResult).to.contains(orderPageProductsBlock.successfulAddProductMessage);
       });
 
       it('should change the \'Invoice address\'', async function () {
@@ -324,38 +324,38 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'updateOrderStatus1', baseContext);
 
         const textResult = await orderPageTabListBlock.modifyOrderStatus(page, OrderStatuses.paymentAccepted.name);
-        await expect(textResult).to.equal(OrderStatuses.paymentAccepted.name);
+        expect(textResult).to.equal(OrderStatuses.paymentAccepted.name);
       });
 
       it('should check that there is no carrier', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkCarriersNumber', baseContext);
 
         const carriersNumber = await orderPageTabListBlock.getCarriersNumber(page);
-        await expect(carriersNumber).to.be.equal(0);
+        expect(carriersNumber).to.be.equal(0);
       });
 
       it('should get the invoice file name', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'getInvoiceFileName1', baseContext);
 
         fileName = await orderPageTabListBlock.getFileName(page);
-        await expect(filePath).is.not.equal('');
+        expect(filePath).is.not.equal('');
       });
 
       it('should get the order reference', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'getOrderReference1', baseContext);
 
         orderReference = await orderPageTabListBlock.getOrderReference(page);
-        await expect(orderReference).is.not.equal('');
+        expect(orderReference).is.not.equal('');
       });
 
       it('should click on \'View invoice\' button and check that the file is downloaded', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'clickOnViewInvoice1', baseContext);
 
         filePath = await orderPageTabListBlock.viewInvoice(page);
-        await expect(filePath).to.be.not.null;
+        expect(filePath).to.not.eq(null);
 
         const doesFileExist = await files.doesFileExist(filePath, 5000);
-        await expect(doesFileExist, 'File is not downloaded!').to.be.true;
+        expect(doesFileExist, 'File is not downloaded!').to.eq(true);
       });
     });
 
@@ -367,10 +367,10 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
           await testContext.addContextItem(this, 'testIdentifier', 'checkHeaderInvoice1', baseContext);
 
           const imageNumber = await files.getImageNumberInPDF(filePath);
-          await expect(imageNumber, 'Logo is not visible!').to.be.equal(1);
+          expect(imageNumber, 'Logo is not visible!').to.be.equal(1);
 
           const isVisible = await files.isTextInPDF(filePath, `INVOICE,,${today},,#${fileName}`);
-          await expect(isVisible, 'File name header is not correct!').to.be.true;
+          expect(isVisible, 'File name header is not correct!').to.eq(true);
         });
 
         it('should check that the \'Delivery address\' is correct', async function () {
@@ -388,7 +388,7 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
             + `${Addresses.second.country},`
             + `${Addresses.second.phone}`,
           );
-          await expect(deliveryAddressExist, 'Delivery address is not correct in invoice!').to.be.true;
+          expect(deliveryAddressExist, 'Delivery address is not correct in invoice!').to.eq(true);
         });
 
         it('should check that the \'Billing address\' is correct', async function () {
@@ -404,7 +404,7 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
             + `${Addresses.third.country},`
             + `${Addresses.third.phone}`,
           );
-          await expect(billingAddressExist, 'Billing address is not correct in invoice!').to.be.true;
+          expect(billingAddressExist, 'Billing address is not correct in invoice!').to.eq(true);
         });
 
         it('should check that the \'Invoice number, Invoice date, Order reference and Order date\' are correct',
@@ -416,7 +416,7 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
               'Invoice Number, ,Invoice Date, ,Order Reference, ,Order date,,'
               + `#${fileName}, ,${today}, ,${orderReference}, ,${today},`,
             );
-            await expect(invoiceNumberExist, 'Invoice information are not correct!').to.be.true;
+            expect(invoiceNumberExist, 'Invoice information are not correct!').to.eq(true);
           });
       });
 
@@ -429,7 +429,7 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
             filePath,
             `${virtualProduct.reference}, ,${virtualProduct.name}`,
           );
-          await expect(productReferenceExist, 'Product name and reference are not correct!').to.be.true;
+          expect(productReferenceExist, 'Product name and reference are not correct!').to.eq(true);
         });
 
         it('should check that the \'Product Tax Rate, Unit Price (tax excl.), quantity and Product Total price'
@@ -444,10 +444,10 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
             + '13, ,'
             + `€${(virtualProduct.priceTaxExcluded * 13).toFixed(2)}`,
           );
-          await expect(
+          expect(
             productPriceExist,
             'Product Tax Rate, unit price (tax exl.), quantity and Total price (tax excl.) are not correct!',
-          ).to.be.true;
+          ).to.eq(true);
         });
       });
 
@@ -464,10 +464,10 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
             + `€${((virtualProduct.price - virtualProduct.priceTaxExcluded) * 13)
               .toFixed(2)}`,
           );
-          await expect(
+          expect(
             taxDetailsVisible,
             'Tax detail, tax Rate, Base price and Total tax are not correct!',
-          ).to.be.true;
+          ).to.eq(true);
         });
       });
 
@@ -480,14 +480,14 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
             'Payment Method, ,Bank transfer, ,'
             + `€${(virtualProduct.price * 13).toFixed(2)}`,
           );
-          await expect(paymentMethodExist, 'Payment method and total to pay are not correct!').to.be.true;
+          expect(paymentMethodExist, 'Payment method and total to pay are not correct!').to.eq(true);
         });
 
         it('should check that the carrier is not visible', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCarrierNotVisible', baseContext);
 
           const isCarrierVisible = await files.isTextInPDF(filePath, `Carrier, ${Carriers.default.name}`);
-          await expect(isCarrierVisible, `Carrier '${Carriers.default.name}' is visible!`).to.be.false;
+          expect(isCarrierVisible, `Carrier '${Carriers.default.name}' is visible!`).to.eq(false);
         });
       });
 
@@ -508,10 +508,10 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
               + `Total Tax, ,€${(tax * 13).toFixed(2)},,`
               + `Total, ,€${priceTaxIncl.toFixed(2)}`,
             );
-            await expect(
+            expect(
               isPaymentTableCorrect,
               'Total Products, Total(Tax exc.), Total Tax, Total are not correct!',
-            ).to.be.true;
+            ).to.eq(true);
           });
       });
     });
@@ -531,14 +531,14 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
         await ordersPage.closeSfToolBar(page);
 
         const pageTitle = await ordersPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(ordersPage.pageTitle);
+        expect(pageTitle).to.contains(ordersPage.pageTitle);
       });
 
       it('should reset all filters', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'resetOrderTableFilters2', baseContext);
 
         const numberOfOrders = await ordersPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfOrders).to.be.above(0);
+        expect(numberOfOrders).to.be.above(0);
       });
 
       it(`should filter the Orders table by 'Customer: ${Customers.johnDoe.lastName}'`, async function () {
@@ -547,7 +547,7 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
         await ordersPage.filterOrders(page, 'input', 'customer', Customers.johnDoe.lastName);
 
         const textColumn = await ordersPage.getTextColumn(page, 'customer', 1);
-        await expect(textColumn).to.contains(Customers.johnDoe.lastName);
+        expect(textColumn).to.contains(Customers.johnDoe.lastName);
       });
 
       it('should view the order', async function () {
@@ -556,7 +556,7 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
         await ordersPage.goToOrder(page, 1);
 
         const pageTitle = await orderPageTabListBlock.getPageTitle(page);
-        await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+        expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
       });
     });
 
@@ -565,31 +565,31 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'updateOrderStatus2', baseContext);
 
         const textResult = await orderPageTabListBlock.modifyOrderStatus(page, OrderStatuses.paymentAccepted.name);
-        await expect(textResult).to.equal(OrderStatuses.paymentAccepted.name);
+        expect(textResult).to.equal(OrderStatuses.paymentAccepted.name);
       });
 
       it('should get the invoice file name', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'getInvoiceFileName2', baseContext);
 
         fileName = await orderPageTabListBlock.getFileName(page);
-        await expect(filePath).is.not.equal('');
+        expect(filePath).is.not.equal('');
       });
 
       it('should get the order reference', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'getOrderReference2', baseContext);
 
         orderReference = await orderPageTabListBlock.getOrderReference(page);
-        await expect(orderReference).is.not.equal('');
+        expect(orderReference).is.not.equal('');
       });
 
       it('should click on \'View invoice\' button and check that the file is downloaded', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'clickOnViewInvoice2', baseContext);
 
         filePath = await orderPageTabListBlock.viewInvoice(page);
-        await expect(filePath).is.not.null;
+        expect(filePath).to.not.eq(null);
 
         const doesFileExist = await files.doesFileExist(filePath, 5000);
-        await expect(doesFileExist, 'File is not downloaded!').to.be.true;
+        expect(doesFileExist, 'File is not downloaded!').to.eq(true);
       });
     });
 
@@ -601,10 +601,10 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
           await testContext.addContextItem(this, 'testIdentifier', 'checkHeaderInvoice2', baseContext);
 
           const imageNumber = await files.getImageNumberInPDF(filePath);
-          await expect(imageNumber, 'Logo is not visible!').to.be.equal(1);
+          expect(imageNumber, 'Logo is not visible!').to.be.equal(1);
 
           const isVisible = await files.isTextInPDF(filePath, `INVOICE,,${today},,#${fileName}`);
-          await expect(isVisible, 'File name header is not correct!').to.be.true;
+          expect(isVisible, 'File name header is not correct!').to.eq(true);
         });
 
         it('should check that the \'Delivery address\' is correct', async function () {
@@ -622,7 +622,7 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
             + `${Addresses.second.country},`
             + `${Addresses.second.phone}`,
           );
-          await expect(deliveryAddressExist, 'Delivery address is not correct in invoice!').to.be.true;
+          expect(deliveryAddressExist, 'Delivery address is not correct in invoice!').to.eq(true);
         });
 
         it('should check that the \'Billing address\' is correct', async function () {
@@ -639,7 +639,7 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
             + `${Addresses.second.country},`
             + `${Addresses.second.phone}`,
           );
-          await expect(billingAddressExist, 'Billing address is not correct in invoice!').to.be.true;
+          expect(billingAddressExist, 'Billing address is not correct in invoice!').to.eq(true);
         });
 
         it('should check that the \'Invoice number, Invoice date, Order reference and Order date\' are correct',
@@ -651,7 +651,7 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
               'Invoice Number, ,Invoice Date, ,Order Reference, ,Order date,,'
               + `#${fileName}, ,${today}, ,${orderReference}, ,${today},`,
             );
-            await expect(invoiceNumberExist, 'Invoice information are not correct!').to.be.true;
+            expect(invoiceNumberExist, 'Invoice information are not correct!').to.eq(true);
           });
       });
 
@@ -663,7 +663,7 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
             filePath,
             `${customizedProduct.reference}, ,${customizedProduct.name}`,
           );
-          await expect(productReferenceExist, 'Product name and reference are not correct!').to.be.true;
+          expect(productReferenceExist, 'Product name and reference are not correct!').to.eq(true);
         });
 
         it('should check that the customized text is visible', async function () {
@@ -673,7 +673,7 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
             filePath,
             `${customizedProduct.customization}: text,(1)`,
           );
-          await expect(isCustomizedTextVisible, 'Customized text is not visible!').to.be.false;
+          expect(isCustomizedTextVisible, 'Customized text is not visible!').to.eq(false);
         });
 
         it('should check that the \'Unit Price (tax excl.), quantity and Product Total price '
@@ -687,10 +687,10 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
             + '1, ,'
             + `€${customizedProduct.price.toFixed(2)}`,
           );
-          await expect(
+          expect(
             productPriceExist,
             'Unit Price (tax excl.), quantity and Product Total price are not correct!',
-          ).to.be.true;
+          ).to.eq(true);
         });
       });
 
@@ -699,7 +699,7 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
           await testContext.addContextItem(this, 'testIdentifier', 'checkIsTaxesTableNotVisible', baseContext);
 
           const isTaxTableVisible = await files.isTextInPDF(filePath, 'Tax Detail,Tax Rate,Base price,Total Tax');
-          await expect(isTaxTableVisible, 'Tax table is visible!').to.be.false;
+          expect(isTaxTableVisible, 'Tax table is visible!').to.eq(false);
         });
       });
 
@@ -712,14 +712,14 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
             'Payment Method, ,Bank transfer, ,'
             + `€${(customizedProduct.price).toFixed(2)}`,
           );
-          await expect(paymentMethodExist, 'Payment method and total to pay are not correct!').to.be.true;
+          expect(paymentMethodExist, 'Payment method and total to pay are not correct!').to.eq(true);
         });
 
         it('should check that the carrier is visible', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCarrierVisible2', baseContext);
 
           const isCarrierVisible = await files.isTextInPDF(filePath, Carriers.default.name);
-          await expect(isCarrierVisible, `Carrier '${Carriers.default.name}' is not visible!`).to.be.true;
+          expect(isCarrierVisible, `Carrier '${Carriers.default.name}' is not visible!`).to.eq(true);
         });
       });
 
@@ -736,10 +736,10 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
               + `Total (Tax excl.), ,€${customizedProduct.price.toFixed(2)},,`
               + `Total, ,€${customizedProduct.price.toFixed(2)}`,
             );
-            await expect(
+            expect(
               isShippingCostVisible,
               'Total Products, Shipping Costs, Total(Tax exc.), Total are not correct!',
-            ).to.be.true;
+            ).to.eq(true);
           });
       });
     });
@@ -754,38 +754,38 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
         await orderPageProductsBlock.searchProduct(page, productWithSpecificPrice.name);
 
         const result = await orderPageProductsBlock.getSearchedProductInformation(page);
-        await expect(result.available).to.equal(productWithSpecificPrice.quantity - 1);
+        expect(result.available).to.equal(productWithSpecificPrice.quantity - 1);
       });
 
       it('should add the product to the cart', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'addProductToCart2', baseContext);
 
         const textResult = await orderPageProductsBlock.addProductToCart(page, 1);
-        await expect(textResult).to.contains(orderPageTabListBlock.successfulAddProductMessage);
+        expect(textResult).to.contains(orderPageTabListBlock.successfulAddProductMessage);
       });
 
       it('should get the invoice file name', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'getInvoiceFileName3', baseContext);
 
         fileName = await orderPageTabListBlock.getFileName(page);
-        await expect(filePath).is.not.equal('');
+        expect(filePath).is.not.equal('');
       });
 
       it('should get the order reference', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'getOrderReference3', baseContext);
 
         orderReference = await orderPageTabListBlock.getOrderReference(page);
-        await expect(orderReference).is.not.equal('');
+        expect(orderReference).is.not.equal('');
       });
 
       it('should click on \'View invoice\' button and check that the file is downloaded', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'clickOnViewInvoice3', baseContext);
 
         filePath = await orderPageTabListBlock.viewInvoice(page);
-        await expect(filePath).to.be.not.null;
+        expect(filePath).to.not.eq(null);
 
         const doesFileExist = await files.doesFileExist(filePath, 5000);
-        await expect(doesFileExist, 'File is not downloaded!').to.be.true;
+        expect(doesFileExist, 'File is not downloaded!').to.eq(true);
       });
     });
 
@@ -797,10 +797,10 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
           await testContext.addContextItem(this, 'testIdentifier', 'checkHeaderInvoice3', baseContext);
 
           const imageNumber = await files.getImageNumberInPDF(filePath);
-          await expect(imageNumber, 'Logo is not visible!').to.be.equal(1);
+          expect(imageNumber, 'Logo is not visible!').to.be.equal(1);
 
           const isVisible = await files.isTextInPDF(filePath, `INVOICE,,${today},,#${fileName}`);
-          await expect(isVisible, 'File name header is not correct!').to.be.true;
+          expect(isVisible, 'File name header is not correct!').to.eq(true);
         });
 
         it('should check that the \'Delivery address\' is correct', async function () {
@@ -818,7 +818,7 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
             + `${Addresses.second.country},`
             + `${Addresses.second.phone}`,
           );
-          await expect(deliveryAddressExist, 'Delivery address is not correct in invoice!').to.be.true;
+          expect(deliveryAddressExist, 'Delivery address is not correct in invoice!').to.eq(true);
         });
 
         it('should check that the \'Billing address\' is correct', async function () {
@@ -835,7 +835,7 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
             + `${Addresses.second.country},`
             + `${Addresses.second.phone}`,
           );
-          await expect(billingAddressExist, 'Billing address is not correct in invoice!').to.be.true;
+          expect(billingAddressExist, 'Billing address is not correct in invoice!').to.eq(true);
         });
 
         it('should check that the \'Invoice number, Invoice date, Order reference and Order date\' are correct',
@@ -847,7 +847,7 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
               'Invoice Number, ,Invoice Date, ,Order Reference, ,Order date,,'
               + `#${fileName}, ,${today}, ,${orderReference}, ,${today},`,
             );
-            await expect(invoiceNumberExist, 'Invoice information are not correct!').to.be.true;
+            expect(invoiceNumberExist, 'Invoice information are not correct!').to.eq(true);
           });
       });
 
@@ -860,14 +860,14 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
             filePath,
             `${productWithSpecificPrice.reference}, ,${productWithSpecificPrice.name}`,
           );
-          await expect(productReferenceExist, 'Product name and reference are not correct!').to.be.true;
+          expect(productReferenceExist, 'Product name and reference are not correct!').to.eq(true);
         });
 
         it('should check that the column \'Base price (Tax excl.)\' is visible', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkBasePriceColumnVisible', baseContext);
 
           const basePriceColumnVisible = await files.isTextInPDF(filePath, 'Base,price,(Tax excl.)');
-          await expect(basePriceColumnVisible, 'Base price is not visible!').to.be.true;
+          expect(basePriceColumnVisible, 'Base price is not visible!').to.eq(true);
         });
 
         it('should check that the \'Base price (Tax excl.), Unit Price, Quantity, Total (Tax excl.)\' '
@@ -888,9 +888,9 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
             + '1, ,'
             + `€${unitPrice.toFixed(2)}`,
           );
-          await expect(
+          expect(
             basePriceVisible,
-            'Base price (Tax excl.), Unit Price, Quantity, Total (Tax excl.) are not correct!').to.be.true;
+            'Base price (Tax excl.), Unit Price, Quantity, Total (Tax excl.) are not correct!').to.eq(true);
         });
       });
 
@@ -899,7 +899,7 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
           await testContext.addContextItem(this, 'testIdentifier', 'checkIsTaxesTableNotVisible2', baseContext);
 
           const isTaxTableVisible = await files.isTextInPDF(filePath, 'Tax Detail,Tax Rate,Base price,Total Tax');
-          await expect(isTaxTableVisible, 'Tax table is visible!').to.be.false;
+          expect(isTaxTableVisible, 'Tax table is visible!').to.eq(false);
         });
       });
 
@@ -912,14 +912,14 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
             'Payment Method, ,Bank transfer, ,'
             + `€${customizedProduct.price.toFixed(2)}`,
           );
-          await expect(paymentMethodExist, 'Payment method and total are not correct!').to.be.true;
+          expect(paymentMethodExist, 'Payment method and total are not correct!').to.eq(true);
         });
 
         it('should check that the carrier is visible', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCarrierVisible3', baseContext);
 
           const isCarrierVisible = await files.isTextInPDF(filePath, Carriers.default.name);
-          await expect(isCarrierVisible, `Carrier '${Carriers.default.name}' is not visible!`).to.be.true;
+          expect(isCarrierVisible, `Carrier '${Carriers.default.name}' is not visible!`).to.eq(true);
         });
       });
 
@@ -944,10 +944,10 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
               + `Total (Tax excl.), ,€${totalPriceTaxExcl.toFixed(2)},,`
               + `Total, ,€${totalPriceTaxExcl.toFixed(2)}`,
             );
-            await expect(
+            expect(
               isShippingCostVisible,
               'Total Products, Shipping Costs, Total(Tax exc.), Total are not correct!',
-            ).to.be.true;
+            ).to.eq(true);
           });
       });
 
@@ -956,31 +956,31 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
           await testContext.addContextItem(this, 'testIdentifier', 'deleteAddedProduct', baseContext);
 
           const textResult = await orderPageProductsBlock.deleteProduct(page, 1);
-          await expect(textResult).to.contains(orderPageProductsBlock.successfulDeleteProductMessage);
+          expect(textResult).to.contains(orderPageProductsBlock.successfulDeleteProductMessage);
         });
 
         it('should click on \'View invoice\' button and check that the file is downloaded', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'viewInvoice4', baseContext);
 
           filePath = await orderPageTabListBlock.viewInvoice(page);
-          await expect(filePath).to.be.not.null;
+          expect(filePath).to.not.eq(null);
 
           const doesFileExist = await files.doesFileExist(filePath, 5000);
-          await expect(doesFileExist, 'File is not downloaded!').to.be.true;
+          expect(doesFileExist, 'File is not downloaded!').to.eq(true);
         });
 
         it('should check that the \'Product name\' is not visible', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkProductName', baseContext);
 
           const productNameExist = await files.isTextInPDF(filePath, productWithSpecificPrice.name);
-          await expect(productNameExist, 'Product name is visible!').to.be.false;
+          expect(productNameExist, 'Product name is visible!').to.eq(false);
         });
 
         it('should check that the column \'Base price (Tax excl.)\' is not visible', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkBasePriceColumn', baseContext);
 
           const basePriceColumnVisible = await files.isTextInPDF(filePath, 'Base,price,(Tax excl.)');
-          await expect(basePriceColumnVisible, 'Base price is not visible!').to.be.false;
+          expect(basePriceColumnVisible, 'Base price is not visible!').to.eq(false);
         });
       });
     });
@@ -995,38 +995,38 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
         await orderPageProductsBlock.searchProduct(page, productWithEcoTax.name);
 
         const result = await orderPageProductsBlock.getSearchedProductInformation(page);
-        await expect(result.available).to.equal(productWithEcoTax.quantity - 1);
+        expect(result.available).to.equal(productWithEcoTax.quantity - 1);
       });
 
       it('should add the product to the cart', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'addProductToCart3', baseContext);
 
         const textResult = await orderPageProductsBlock.addProductToCart(page, 1);
-        await expect(textResult).to.contains(orderPageProductsBlock.successfulAddProductMessage);
+        expect(textResult).to.contains(orderPageProductsBlock.successfulAddProductMessage);
       });
 
       it('should get the invoice file name', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'getInvoiceFileName4', baseContext);
 
         fileName = await orderPageTabListBlock.getFileName(page);
-        await expect(filePath).is.not.equal('');
+        expect(filePath).is.not.equal('');
       });
 
       it('should get the order reference', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'getOrderReference4', baseContext);
 
         orderReference = await orderPageTabListBlock.getOrderReference(page);
-        await expect(orderReference).is.not.equal('');
+        expect(orderReference).is.not.equal('');
       });
 
       it('should click on \'View invoice\' button and check that the file is downloaded', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'clickOnViewInvoice4', baseContext);
 
         filePath = await orderPageTabListBlock.viewInvoice(page);
-        await expect(filePath).to.be.not.null;
+        expect(filePath).to.not.eq(null);
 
         const doesFileExist = await files.doesFileExist(filePath, 5000);
-        await expect(doesFileExist, 'File is not downloaded!').to.be.true;
+        expect(doesFileExist, 'File is not downloaded!').to.eq(true);
       });
     });
 
@@ -1038,10 +1038,10 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
           await testContext.addContextItem(this, 'testIdentifier', 'checkHeaderInvoice4', baseContext);
 
           const imageNumber = await files.getImageNumberInPDF(filePath);
-          await expect(imageNumber, 'Logo is not visible!').to.be.equal(1);
+          expect(imageNumber, 'Logo is not visible!').to.be.equal(1);
 
           const isVisible = await files.isTextInPDF(filePath, `INVOICE,,${today},,#${fileName}`);
-          await expect(isVisible, 'File name header is not correct!').to.be.true;
+          expect(isVisible, 'File name header is not correct!').to.eq(true);
         });
 
         it('should check that the \'Delivery address\' is correct', async function () {
@@ -1059,7 +1059,7 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
             + `${Addresses.second.country},`
             + `${Addresses.second.phone}`,
           );
-          await expect(deliveryAddressExist, 'Delivery address is not correct in invoice!').to.be.true;
+          expect(deliveryAddressExist, 'Delivery address is not correct in invoice!').to.eq(true);
         });
 
         it('should check that the \'Billing address\' is correct', async function () {
@@ -1076,7 +1076,7 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
             + `${Addresses.second.country},`
             + `${Addresses.second.phone}`,
           );
-          await expect(billingAddressExist, 'Billing address is not correct in invoice!').to.be.true;
+          expect(billingAddressExist, 'Billing address is not correct in invoice!').to.eq(true);
         });
 
         it('should check that the \'Invoice number, Invoice date, Order reference and Order date\' are correct',
@@ -1088,7 +1088,7 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
               'Invoice Number, ,Invoice Date, ,Order Reference, ,Order date,,'
               + `#${fileName}, ,${today}, ,${orderReference}, ,${today},`,
             );
-            await expect(invoiceNumberExist, 'Invoice information are not correct!').to.be.true;
+            expect(invoiceNumberExist, 'Invoice information are not correct!').to.eq(true);
           });
       });
 
@@ -1101,14 +1101,14 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
             filePath,
             `${productWithEcoTax.reference}, ,${productWithEcoTax.name}`,
           );
-          await expect(productReferenceExist, 'Product name and reference are not correct!').to.be.true;
+          expect(productReferenceExist, 'Product name and reference are not correct!').to.eq(true);
         });
 
         it('should check that the column \'Base price (Tax excl.)\' is not visible', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkBasePriceColumnNotVisible', baseContext);
 
           const basePriceColumnVisible = await files.isTextInPDF(filePath, 'Base,price,(Tax excl.)');
-          await expect(basePriceColumnVisible, 'Base price is visible!').to.be.false;
+          expect(basePriceColumnVisible, 'Base price is visible!').to.eq(false);
         });
 
         it('should check that the \'Unit price (Tax excl.), Ecotax, Quantity, Total (Tax excl.)\' are correct',
@@ -1123,8 +1123,8 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
               + '1, ,'
               + `€${productWithEcoTax.price.toFixed(2)}`,
             );
-            await expect(basePriceVisible, 'Unit price (Tax excl.), Ecotax, Quantity, '
-              + 'Total (Tax excl.) are not correct in invoice!').to.be.true;
+            expect(basePriceVisible, 'Unit price (Tax excl.), Ecotax, Quantity, '
+              + 'Total (Tax excl.) are not correct in invoice!').to.eq(true);
           });
       });
 
@@ -1141,10 +1141,10 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
               + `€${productWithEcoTax.ecoTax.toFixed(2)}, ,`
               + '€0.00',
             );
-            await expect(
+            expect(
               taxDetailsVisible,
               'Tax detail, tax Rate, Base price and Total tax are not correct!',
-            ).to.be.true;
+            ).to.eq(true);
           });
       });
 
@@ -1157,14 +1157,14 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
             'Payment Method, ,Bank transfer, ,'
             + `€${customizedProduct.price.toFixed(2)}`,
           );
-          await expect(paymentMethodExist, 'Payment method and total are not correct!').to.be.true;
+          expect(paymentMethodExist, 'Payment method and total are not correct!').to.eq(true);
         });
 
         it('should check that the carrier is visible', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCarrierVisible4', baseContext);
 
           const isCarrierVisible = await files.isTextInPDF(filePath, Carriers.default.name);
-          await expect(isCarrierVisible, `Carrier '${Carriers.default.name}' is not visible!`).to.be.true;
+          expect(isCarrierVisible, `Carrier '${Carriers.default.name}' is not visible!`).to.eq(true);
         });
       });
 
@@ -1183,10 +1183,10 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
               + `Total (Tax excl.), ,€${totalPriceTaxExcl.toFixed(2)},,`
               + `Total, ,€${totalPriceTaxExcl.toFixed(2)}`,
             );
-            await expect(
+            expect(
               isShippingCostVisible,
               'Total Products, Shipping Costs, Total(Tax exc.), Total are not correct!',
-            ).to.be.true;
+            ).to.eq(true);
           });
       });
 
@@ -1205,10 +1205,10 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
           await testContext.addContextItem(this, 'testIdentifier', 'clickOnViewInvoice5', baseContext);
 
           filePath = await orderPageTabListBlock.viewInvoice(page);
-          await expect(filePath).to.be.not.null;
+          expect(filePath).to.not.eq(null);
 
           const doesFileExist = await files.doesFileExist(filePath, 5000);
-          await expect(doesFileExist, 'File is not downloaded!').to.be.true;
+          expect(doesFileExist, 'File is not downloaded!').to.eq(true);
         });
 
         it('should check that the \'Delivery address\' is correct', async function () {
@@ -1224,7 +1224,7 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
             + `${Addresses.third.country},`
             + `${Addresses.third.phone}`,
           );
-          await expect(deliveryAddressExist, 'Delivery address is not correct!').to.be.true;
+          expect(deliveryAddressExist, 'Delivery address is not correct!').to.eq(true);
         });
 
         it('should change the \'Invoice address\'', async function () {
@@ -1241,10 +1241,10 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
           await testContext.addContextItem(this, 'testIdentifier', 'clickOnViewInvoice6', baseContext);
 
           filePath = await orderPageTabListBlock.viewInvoice(page);
-          await expect(filePath).to.be.not.null;
+          expect(filePath).to.not.eq(null);
 
           const doesFileExist = await files.doesFileExist(filePath, 5000);
-          await expect(doesFileExist, 'File is not downloaded!').to.be.true;
+          expect(doesFileExist, 'File is not downloaded!').to.eq(true);
         });
 
         it('should check that the \'Billing address\' is updated', async function () {
@@ -1260,7 +1260,7 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
             + `${Addresses.third.country},`
             + `${Addresses.third.phone}`,
           );
-          await expect(deliveryAddressExist, 'Billing address is not correct!').to.be.true;
+          expect(deliveryAddressExist, 'Billing address is not correct!').to.eq(true);
         });
       });
 
@@ -1269,62 +1269,62 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
           await testContext.addContextItem(this, 'testIdentifier', 'displayDocumentsTab', baseContext);
 
           const isTabOpened = await orderPageTabListBlock.goToDocumentsTab(page);
-          await expect(isTabOpened).to.be.true;
+          expect(isTabOpened).to.eq(true);
         });
 
         it('should add note', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'addNote', baseContext);
 
           const textResult = await orderPageTabListBlock.setDocumentNote(page, 'Test note', 1);
-          await expect(textResult).to.equal(orderPageTabListBlock.updateSuccessfullMessage);
+          expect(textResult).to.equal(orderPageTabListBlock.updateSuccessfullMessage);
         });
 
         it('should click on \'View invoice\' button and check that the file is downloaded', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'viewInvoiceToCheckNote1', baseContext);
 
           filePath = await orderPageTabListBlock.viewInvoice(page);
-          await expect(filePath).to.be.not.null;
+          expect(filePath).to.not.eq(null);
 
           const doesFileExist = await files.doesFileExist(filePath, 5000);
-          await expect(doesFileExist, 'File is not downloaded!').to.be.true;
+          expect(doesFileExist, 'File is not downloaded!').to.eq(true);
         });
 
         it('should check that the note is visible in the invoice', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkIsNoteVisible', baseContext);
 
           const isNoteVisible = await files.isTextInPDF(filePath, 'Test note');
-          await expect(isNoteVisible, 'Note does not exist in invoice!').to.be.true;
+          expect(isNoteVisible, 'Note does not exist in invoice!').to.eq(true);
         });
 
         it('should click on \'Documents\' tab', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'displayDocumentsTabToDeleteNote', baseContext);
 
           const isTabOpened = await orderPageTabListBlock.goToDocumentsTab(page);
-          await expect(isTabOpened).to.be.true;
+          expect(isTabOpened).to.eq(true);
         });
 
         it('should delete the note', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'deleteNote', baseContext);
 
           const textResult = await orderPageTabListBlock.setDocumentNote(page, '', 1);
-          await expect(textResult).to.equal(orderPageTabListBlock.updateSuccessfullMessage);
+          expect(textResult).to.equal(orderPageTabListBlock.updateSuccessfullMessage);
         });
 
         it('should click on \'View invoice\' button and check that the file is downloaded', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'viewInvoiceToCheckNote2', baseContext);
 
           filePath = await orderPageTabListBlock.viewInvoice(page);
-          await expect(filePath).to.be.not.null;
+          expect(filePath).to.not.eq(null);
 
           const doesFileExist = await files.doesFileExist(filePath, 5000);
-          await expect(doesFileExist, 'File is not downloaded!').to.be.true;
+          expect(doesFileExist, 'File is not downloaded!').to.eq(true);
         });
 
         it('should check that the note is not visible in the invoice', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkIsNoteNotVisible', baseContext);
 
           const isNoteVisible = await files.isTextInPDF(filePath, 'Test note');
-          await expect(isNoteVisible, 'Note does is visible in invoice!').to.be.false;
+          expect(isNoteVisible, 'Note does is visible in invoice!').to.eq(false);
         });
       });
 
@@ -1333,14 +1333,14 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
           await testContext.addContextItem(this, 'testIdentifier', 'displayCarriersTab', baseContext);
 
           const isTabOpened = await orderPageTabListBlock.goToCarriersTab(page);
-          await expect(isTabOpened).to.be.true;
+          expect(isTabOpened).to.eq(true);
         });
 
         it('should click on \'Edit\' link and check the modal', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'clickOnEditLink', baseContext);
 
           const isModalVisible = await orderPageTabListBlock.clickOnEditLink(page);
-          await expect(isModalVisible, 'Edit shipping modal is not visible!').to.be.true;
+          expect(isModalVisible, 'Edit shipping modal is not visible!').to.eq(true);
         });
 
         it('should update the carrier', async function () {
@@ -1353,24 +1353,24 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
           });
 
           const textResult = await orderPageTabListBlock.setShippingDetails(page, shippingDetailsData);
-          await expect(textResult).to.equal(orderPageTabListBlock.successfulUpdateMessage);
+          expect(textResult).to.equal(orderPageTabListBlock.successfulUpdateMessage);
         });
 
         it('should click on \'View invoice\' button and check that the file is downloaded', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'clickOnViewInvoice7', baseContext);
 
           filePath = await orderPageTabListBlock.viewInvoice(page);
-          await expect(filePath).to.be.not.null;
+          expect(filePath).to.not.eq(null);
 
           const doesFileExist = await files.doesFileExist(filePath, 5000);
-          await expect(doesFileExist, 'File is not downloaded!').to.be.true;
+          expect(doesFileExist, 'File is not downloaded!').to.eq(true);
         });
 
         it('should check that the edited \'Carrier\' is visible in the invoice', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkCarrier', baseContext);
 
           const isCarrierVisible = await files.isTextInPDF(filePath, `Carrier, ,${Carriers.myCarrier.name}`);
-          await expect(isCarrierVisible, 'New carrier not exist in invoice!').to.be.true;
+          expect(isCarrierVisible, 'New carrier not exist in invoice!').to.eq(true);
         });
 
         it('should check that \'Shipping cost, Total (Tax exl.), Total Tax and Total\' are changed',
@@ -1387,10 +1387,10 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
               + `Total (Tax excl.), ,€${(totalPrice + 7.00).toFixed(2)},,`
               + `Total, ,€${(totalPrice + 7.00).toFixed(2)}`,
             );
-            await expect(
+            expect(
               isDiscountVisible,
               'Shipping cost, Total (Tax exl.), Total Tax and Total are not correct in the invoice!')
-              .to.be.true;
+              .to.eq(true);
           });
       });
 
@@ -1399,7 +1399,7 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
           await testContext.addContextItem(this, 'testIdentifier', 'addDiscountPercent', baseContext);
 
           const validationMessage = await orderPageProductsBlock.addDiscount(page, discountData);
-          await expect(validationMessage, 'Validation message is not correct!')
+          expect(validationMessage, 'Validation message is not correct!')
             .to.equal(orderPageTabListBlock.successfulUpdateMessage);
         });
 
@@ -1407,10 +1407,10 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
           await testContext.addContextItem(this, 'testIdentifier', 'clickOnViewInvoice8', baseContext);
 
           filePath = await orderPageTabListBlock.viewInvoice(page);
-          await expect(filePath).to.be.not.null;
+          expect(filePath).to.not.eq(null);
 
           const doesFileExist = await files.doesFileExist(filePath, 5000);
-          await expect(doesFileExist, 'File is not downloaded!').to.be.true;
+          expect(doesFileExist, 'File is not downloaded!').to.eq(true);
         });
 
         it('should check that \'Discounts\' table is visible in the invoice', async function () {
@@ -1424,7 +1424,7 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
             'Discounts,,Discount, ,'
             + `- €${discount.toFixed(2)}`,
           );
-          await expect(isDiscountVisible, 'Discounts table is not visible in the invoice!').to.be.true;
+          expect(isDiscountVisible, 'Discounts table is not visible in the invoice!').to.eq(true);
         });
 
         it('should check that \'Total discount, Total( Tax excl.) and total\' are correct', async function () {
@@ -1441,14 +1441,14 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
             + `Total (Tax excl.), ,€${(totalPrice - discount + 7.00).toFixed(2)},,`
             + `Total, ,€${(totalPrice - discount + 7.00).toFixed(2)}`,
           );
-          await expect(isDiscountVisible, 'Discount is not visible in the invoice!').to.be.true;
+          expect(isDiscountVisible, 'Discount is not visible in the invoice!').to.eq(true);
         });
 
         it('should delete the discount', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'deleteDiscount', baseContext);
 
           const validationMessage = await orderPageProductsBlock.deleteDiscount(page);
-          await expect(validationMessage, 'Successful delete alert is not correct')
+          expect(validationMessage, 'Successful delete alert is not correct')
             .to.equal(orderPageTabListBlock.successfulUpdateMessage);
         });
 
@@ -1456,10 +1456,10 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
           await testContext.addContextItem(this, 'testIdentifier', 'viewInvoiceToCheckDiscount', baseContext);
 
           filePath = await orderPageTabListBlock.viewInvoice(page);
-          await expect(filePath).to.be.not.null;
+          expect(filePath).to.not.eq(null);
 
           const doesFileExist = await files.doesFileExist(filePath, 5000);
-          await expect(doesFileExist, 'File is not downloaded!').to.be.true;
+          expect(doesFileExist, 'File is not downloaded!').to.eq(true);
         });
 
         it('should check that the discount is not visible in the invoice', async function () {
@@ -1473,7 +1473,7 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
             ' Total Discounts,'
             + `-€${(totalPrice - discount).toFixed(2)}`,
           );
-          await expect(isDiscountVisible, 'Total discount is visible in the invoice!').to.be.false;
+          expect(isDiscountVisible, 'Total discount is visible in the invoice!').to.eq(false);
         });
       });
 
@@ -1492,10 +1492,10 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
           await testContext.addContextItem(this, 'testIdentifier', 'viewInvoiceToCheckPayment', baseContext);
 
           filePath = await orderPageTabListBlock.viewInvoice(page);
-          await expect(filePath).to.be.not.null;
+          expect(filePath).to.not.eq(null);
 
           const doesFileExist = await files.doesFileExist(filePath, 5000);
-          await expect(doesFileExist, 'File is not downloaded!').to.be.true;
+          expect(doesFileExist, 'File is not downloaded!').to.eq(true);
         });
 
         it('should check that the new payment is visible in the invoice', async function () {
@@ -1506,7 +1506,7 @@ describe('BO - Orders - View and edit order: Check invoice', async () => {
             `,Payment Method, ,Bank transfer, ,€${customizedProduct.price.toFixed(2)},,`
             + `${paymentData.paymentMethod}, ,€${paymentData.amount}`,
           );
-          await expect(isPaymentMethodVisible, 'Payment method is no correct!').to.be.true;
+          expect(isPaymentMethodVisible, 'Payment method is no correct!').to.eq(true);
         });
       });
     });
diff --git a/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/12_checkMultiInvoice.ts b/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/12_checkMultiInvoice.ts
index f079b98ec7808..229c0bc643fa1 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/12_checkMultiInvoice.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/01_orders/viewAndEditOrder/12_checkMultiInvoice.ts
@@ -130,14 +130,14 @@ describe('BO - Orders - View and edit order: Check multi invoice', async () => {
       await ordersPage.closeSfToolBar(page);
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterOrderTable', baseContext);
 
       const numberOfOrders = await ordersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfOrders, 'Number of orders is not correct!').to.be.above(0);
+      expect(numberOfOrders, 'Number of orders is not correct!').to.be.above(0);
     });
 
     it(`should filter the Orders table by 'Customer: ${Customers.johnDoe.lastName}'`, async function () {
@@ -146,7 +146,7 @@ describe('BO - Orders - View and edit order: Check multi invoice', async () => {
       await ordersPage.filterOrders(page, 'input', 'customer', Customers.johnDoe.lastName);
 
       const textColumn = await ordersPage.getTextColumn(page, 'customer', 1);
-      await expect(textColumn, 'Lastname is not correct').to.contains(Customers.johnDoe.lastName);
+      expect(textColumn, 'Lastname is not correct').to.contains(Customers.johnDoe.lastName);
     });
 
     it('should view the order', async function () {
@@ -155,7 +155,7 @@ describe('BO - Orders - View and edit order: Check multi invoice', async () => {
       await ordersPage.goToOrder(page, 1);
 
       const pageTitle = await orderPageProductsBlock.getPageTitle(page);
-      await expect(pageTitle, 'Error when view order page!').to.contains(orderPageProductsBlock.pageTitle);
+      expect(pageTitle, 'Error when view order page!').to.contains(orderPageProductsBlock.pageTitle);
     });
   });
 
@@ -165,14 +165,14 @@ describe('BO - Orders - View and edit order: Check multi invoice', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'updateOrderStatus', baseContext);
 
       const textResult = await orderPageTabListBlock.updateOrderStatus(page, OrderStatuses.paymentAccepted.name);
-      await expect(textResult).to.equal(orderPageProductsBlock.successfulUpdateMessage);
+      expect(textResult).to.equal(orderPageProductsBlock.successfulUpdateMessage);
     });
 
     it('should get the first invoice file name', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'getFirstInvoiceFileName', baseContext);
 
       firstFileName = await orderPageTabListBlock.getFileName(page);
-      await expect(filePath).is.not.equal('');
+      expect(filePath).is.not.equal('');
     });
   });
 
@@ -184,7 +184,7 @@ describe('BO - Orders - View and edit order: Check multi invoice', async () => {
       await orderPageProductsBlock.searchProduct(page, firstProduct.name);
 
       const textResult = await orderPageProductsBlock.addProductToCart(page);
-      await expect(textResult).to.contains(orderPageProductsBlock.errorAddSameProductInInvoice(firstFileName));
+      expect(textResult).to.contains(orderPageProductsBlock.errorAddSameProductInInvoice(firstFileName));
     });
 
     it('should create a new invoice', async function () {
@@ -193,10 +193,10 @@ describe('BO - Orders - View and edit order: Check multi invoice', async () => {
       await orderPageProductsBlock.selectInvoice(page);
 
       const carrierName = await orderPageProductsBlock.getNewInvoiceCarrierName(page);
-      await expect(carrierName).to.contains(`Carrier : ${Carriers.default.name}`);
+      expect(carrierName).to.contains(`Carrier : ${Carriers.default.name}`);
 
       const isSelected = await orderPageProductsBlock.isFreeShippingSelected(page);
-      await expect(isSelected).to.be.false;
+      expect(isSelected).to.eq(false);
     });
 
     it('should update the product price and add the product to the cart', async function () {
@@ -205,14 +205,14 @@ describe('BO - Orders - View and edit order: Check multi invoice', async () => {
       await orderPageProductsBlock.updateProductPrice(page, newProductPrice);
 
       const textResult = await orderPageProductsBlock.addProductToCart(page, 2, true);
-      await expect(textResult).to.contains(orderPageProductsBlock.successfulAddProductMessage);
+      expect(textResult).to.contains(orderPageProductsBlock.successfulAddProductMessage);
     });
 
     it('should check that order total price is correct', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkTotalToPayIsCorrect', baseContext);
 
       const totalPrice = await orderPageProductsBlock.getOrderTotalPrice(page);
-      await expect(totalPrice.toFixed(2)).to.equal((newProductPrice * 3).toFixed(2));
+      expect(totalPrice.toFixed(2)).to.equal((newProductPrice * 3).toFixed(2));
     });
 
     it('should check that products number is equal to 2', async function () {
@@ -221,21 +221,21 @@ describe('BO - Orders - View and edit order: Check multi invoice', async () => {
       await orderPageProductsBlock.reloadPage(page);
 
       const productCount = await orderPageProductsBlock.getProductsNumber(page);
-      await expect(productCount).to.equal(2);
+      expect(productCount).to.equal(2);
     });
 
     it('should check that invoices number is equal to 2', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkDocumentsNumber', baseContext);
 
       const documentsNumber = await orderPageTabListBlock.getDocumentsNumber(page);
-      await expect(documentsNumber).to.be.equal(2);
+      expect(documentsNumber).to.be.equal(2);
     });
 
     it('should get the second invoice file name', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'getSecondInvoiceNumber', baseContext);
 
       secondFileName = await orderPageTabListBlock.getFileName(page, 3);
-      await expect(filePath).is.not.equal('');
+      expect(filePath).is.not.equal('');
     });
   });
 
@@ -245,10 +245,10 @@ describe('BO - Orders - View and edit order: Check multi invoice', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'downloadFirstInvoice', baseContext);
 
       filePath = await orderPageTabListBlock.downloadInvoice(page, 1);
-      await expect(filePath).to.be.not.null;
+      expect(filePath).to.not.eq(null);
 
       const doesFileExist = await files.doesFileExist(filePath, 5000);
-      await expect(doesFileExist).to.be.true;
+      expect(doesFileExist).to.eq(true);
     });
 
     it('should check that the \'Product reference, Product name\' are correct', async function () {
@@ -258,7 +258,7 @@ describe('BO - Orders - View and edit order: Check multi invoice', async () => {
         filePath,
         `${firstProduct.reference}, ,${firstProduct.name}`,
       );
-      await expect(productReferenceExist, 'Product name and reference are not correct!').to.be.true;
+      expect(productReferenceExist, 'Product name and reference are not correct!').to.eq(true);
     });
 
     it('should check that the \'Unit Price, Quantity, Total (Tax excl.)\' '
@@ -272,10 +272,10 @@ describe('BO - Orders - View and edit order: Check multi invoice', async () => {
         + '1, ,'
         + `€${newProductPrice.toFixed(2)}`,
       );
-      await expect(
+      expect(
         priceVisible,
         'Unit Price, Quantity, Total (Tax excl.) are not correct')
-        .to.be.true;
+        .to.eq(true);
     });
 
     it('should edit the product price and check the price of the 2 products', async function () {
@@ -304,10 +304,10 @@ describe('BO - Orders - View and edit order: Check multi invoice', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'viewInvoice', baseContext);
 
       filePath = await orderPageProductsBlock.viewInvoice(page);
-      await expect(filePath).to.be.not.null;
+      expect(filePath).to.not.eq(null);
 
       const doesFileExist = await files.doesFileExist(filePath, 5000);
-      await expect(doesFileExist, 'File is not downloaded!').to.be.true;
+      expect(doesFileExist, 'File is not downloaded!').to.eq(true);
     });
 
     it('should check that the \'Unit Price, Quantity, Total (Tax excl.)\' '
@@ -321,10 +321,10 @@ describe('BO - Orders - View and edit order: Check multi invoice', async () => {
         + '1, ,'
         + `€${secondNewProductPrice.toFixed(2)}`,
       );
-      await expect(
+      expect(
         priceVisible,
         'Unit Price, Quantity, Total (Tax excl.) are not correct on the first invoice')
-        .to.be.true;
+        .to.eq(true);
     });
 
     it('should check that the \'Unit Price, Quantity, Total (Tax excl.)\' '
@@ -338,10 +338,10 @@ describe('BO - Orders - View and edit order: Check multi invoice', async () => {
         + '2, ,'
         + `€${(secondNewProductPrice * 2).toFixed(2)}`,
       );
-      await expect(
+      expect(
         priceVisible,
         'Unit Price, Quantity, Total (Tax excl.) are not correct on the second invoice')
-        .to.be.true;
+        .to.eq(true);
     });
   });
 
@@ -351,21 +351,21 @@ describe('BO - Orders - View and edit order: Check multi invoice', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'displayCarriersTab', baseContext);
 
       const isTabOpened = await orderPageTabListBlock.goToCarriersTab(page);
-      await expect(isTabOpened).to.be.true;
+      expect(isTabOpened).to.eq(true);
     });
 
     it('should click on \'Edit\' link and check the modal', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnEditLink', baseContext);
 
       const isModalVisible = await orderPageTabListBlock.clickOnEditLink(page);
-      await expect(isModalVisible, 'Edit shipping modal is not visible!').to.be.true;
+      expect(isModalVisible, 'Edit shipping modal is not visible!').to.eq(true);
     });
 
     it(`should select the default not free carrier '${Carriers.myCarrier.name}'`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'selectNewCarrier', baseContext);
 
       const textResult = await orderPageTabListBlock.setShippingDetails(page, carrierDataToSelect);
-      await expect(textResult).to.equal(orderPageTabListBlock.successfulUpdateMessage);
+      expect(textResult).to.equal(orderPageTabListBlock.successfulUpdateMessage);
     });
 
     it(`should search for the product '${secondProduct.name}' and check that there is `
@@ -375,7 +375,7 @@ describe('BO - Orders - View and edit order: Check multi invoice', async () => {
       await orderPageProductsBlock.searchProduct(page, secondProduct.name);
 
       const invoices = await orderPageProductsBlock.getInvoicesFromSelectOptions(page);
-      await expect(invoices).to.contains(`#${firstFileName}#${secondFileName}`);
+      expect(invoices).to.contains(`#${firstFileName}#${secondFileName}`);
     });
 
     it('should create a new invoice', async function () {
@@ -384,10 +384,10 @@ describe('BO - Orders - View and edit order: Check multi invoice', async () => {
       await orderPageProductsBlock.selectInvoice(page);
 
       const carrierName = await orderPageProductsBlock.getNewInvoiceCarrierName(page);
-      await expect(carrierName).to.contains(`Carrier : ${Carriers.myCarrier.name}`);
+      expect(carrierName).to.contains(`Carrier : ${Carriers.myCarrier.name}`);
 
       const isSelected = await orderPageProductsBlock.isFreeShippingSelected(page);
-      await expect(isSelected).to.be.false;
+      expect(isSelected).to.eq(false);
     });
 
     it('should select \'Free shipping\' checkbox', async function () {
@@ -396,14 +396,14 @@ describe('BO - Orders - View and edit order: Check multi invoice', async () => {
       await orderPageProductsBlock.selectFreeShippingCheckbox(page);
 
       const isSelected = await orderPageProductsBlock.isFreeShippingSelected(page);
-      await expect(isSelected).to.be.true;
+      expect(isSelected).to.eq(true);
     });
 
     it(`should add the product '${secondProduct.name}' to the cart`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'addSecondProductToCart', baseContext);
 
       const textResult = await orderPageProductsBlock.addProductToCart(page, 1, true);
-      await expect(textResult).to.contains(orderPageProductsBlock.successfulAddProductMessage);
+      expect(textResult).to.contains(orderPageProductsBlock.successfulAddProductMessage);
     });
 
     it('should check that invoices number is equal to 3', async function () {
@@ -412,21 +412,21 @@ describe('BO - Orders - View and edit order: Check multi invoice', async () => {
       await orderPageProductsBlock.reloadPage(page);
 
       const documentsNumber = await orderPageTabListBlock.getDocumentsNumber(page);
-      await expect(documentsNumber).to.be.equal(3);
+      expect(documentsNumber).to.be.equal(3);
     });
 
     it('should check the existence of new discount table', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkNewDiscountTable', baseContext);
 
       const isVisible = await orderPageProductsBlock.isDiscountListTableVisible(page);
-      await expect(isVisible, 'Discount list table is not visible').to.be.true;
+      expect(isVisible, 'Discount list table is not visible').to.eq(true);
     });
 
     it('should check the discount \'[Generated] CartRule for Free Shipping\'', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkDiscountName', baseContext);
 
       const discountName = await orderPageProductsBlock.getTextColumnFromDiscountTable(page, 'name');
-      await expect(discountName).to.be.equal('[Generated] CartRule for Free Shipping');
+      expect(discountName).to.be.equal('[Generated] CartRule for Free Shipping');
     });
   });
 
@@ -436,10 +436,10 @@ describe('BO - Orders - View and edit order: Check multi invoice', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'downloadThirdInvoice', baseContext);
 
       filePath = await orderPageTabListBlock.downloadInvoice(page, 5);
-      await expect(filePath).to.be.not.null;
+      expect(filePath).to.not.eq(null);
 
       const doesFileExist = await files.doesFileExist(filePath, 5000);
-      await expect(doesFileExist).to.be.true;
+      expect(doesFileExist).to.eq(true);
     });
 
     it('should check that the \'Product reference, Product name\' are correct', async function () {
@@ -449,7 +449,7 @@ describe('BO - Orders - View and edit order: Check multi invoice', async () => {
         filePath,
         `${secondProduct.reference}, ,${secondProduct.name}`,
       );
-      await expect(productReferenceExist, 'Product name and reference are not correct!').to.be.true;
+      expect(productReferenceExist, 'Product name and reference are not correct!').to.eq(true);
     });
 
     it('should check that the \'Unit Price, Quantity, Total (Tax excl.)\' '
@@ -463,10 +463,10 @@ describe('BO - Orders - View and edit order: Check multi invoice', async () => {
         + '1, ,'
         + `€${secondProduct.price.toFixed(2)}`,
       );
-      await expect(
+      expect(
         priceVisible,
         'Unit Price, Quantity, Total (Tax excl.) are not correct')
-        .to.be.true;
+        .to.eq(true);
     });
 
     it('should check that \'Total Products, Shipping Costs, Total(Tax exc.), Total\' are correct',
@@ -481,10 +481,10 @@ describe('BO - Orders - View and edit order: Check multi invoice', async () => {
           + `Total (Tax excl.), ,€${secondProduct.price.toFixed(2)},,`
           + `Total, ,€${secondProduct.price.toFixed(2)}`,
         );
-        await expect(
+        expect(
           isShippingCostVisible,
           'Total Products, Shipping Costs, Total(Tax exc.), Total are not correct!',
-        ).to.be.true;
+        ).to.eq(true);
       });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/02_orders/02_invoices/01_generateInvoiceByDate.ts b/tests/UI/campaigns/functional/BO/02_orders/02_invoices/01_generateInvoiceByDate.ts
index 56b126dfafc74..d1cbc4de53c2d 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/02_invoices/01_generateInvoiceByDate.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/02_invoices/01_generateInvoiceByDate.ts
@@ -56,14 +56,14 @@ describe('BO - Orders - Invoices : Generate PDF file by date', async () => {
       await ordersPage.closeSfToolBar(page);
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should reset all filters and get number of orders', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilters', baseContext);
 
       const numberOfOrders = await ordersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfOrders).to.be.above(0);
+      expect(numberOfOrders).to.be.above(0);
     });
 
     it('should go to the first order page', async function () {
@@ -73,14 +73,14 @@ describe('BO - Orders - Invoices : Generate PDF file by date', async () => {
       await ordersPage.goToOrder(page, 1);
 
       const pageTitle = await orderPageTabListBlock.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+      expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
     });
 
     it(`should change the order status to '${OrderStatuses.shipped.name}' and check it`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateOrderStatus', baseContext);
 
       const result = await orderPageTabListBlock.modifyOrderStatus(page, OrderStatuses.shipped.name);
-      await expect(result).to.equal(OrderStatuses.shipped.name);
+      expect(result).to.equal(OrderStatuses.shipped.name);
     });
   });
 
@@ -95,7 +95,7 @@ describe('BO - Orders - Invoices : Generate PDF file by date', async () => {
       );
 
       const pageTitle = await invoicesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(invoicesPage.pageTitle);
+      expect(pageTitle).to.contains(invoicesPage.pageTitle);
     });
 
     it('should generate PDF file by date and check the file existence', async function () {
@@ -105,7 +105,7 @@ describe('BO - Orders - Invoices : Generate PDF file by date', async () => {
       filePath = await invoicesPage.generatePDFByDateAndDownload(page, todayDate, todayDate);
 
       const exist = await files.doesFileExist(filePath);
-      await expect(exist, 'File does not exist').to.be.true;
+      expect(exist, 'File does not exist').to.eq(true);
     });
 
     it('should check the error message when there is no invoice in the entered date', async function () {
@@ -114,7 +114,7 @@ describe('BO - Orders - Invoices : Generate PDF file by date', async () => {
       // Generate PDF
       const textMessage = await invoicesPage.generatePDFByDateAndFail(page, futureDate, futureDate);
 
-      await expect(textMessage).to.equal(invoicesPage.errorMessageWhenGenerateFileByDate);
+      expect(textMessage).to.equal(invoicesPage.errorMessageWhenGenerateFileByDate);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/02_orders/02_invoices/02_generateInvoiceByStatus.ts b/tests/UI/campaigns/functional/BO/02_orders/02_invoices/02_generateInvoiceByStatus.ts
index 61be1d217ba8a..b71eed030d7eb 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/02_invoices/02_generateInvoiceByStatus.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/02_invoices/02_generateInvoiceByStatus.ts
@@ -56,7 +56,7 @@ describe('BO - Orders - Invoices : Generate PDF file by status', async () => {
         await ordersPage.closeSfToolBar(page);
 
         const pageTitle = await ordersPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(ordersPage.pageTitle);
+        expect(pageTitle).to.contains(ordersPage.pageTitle);
       });
 
       it(`should go to the order page n°${orderToEdit.args.orderRow}`, async function () {
@@ -65,14 +65,14 @@ describe('BO - Orders - Invoices : Generate PDF file by status', async () => {
         await ordersPage.goToOrder(page, orderToEdit.args.orderRow);
 
         const pageTitle = await orderPageTabListBlock.getPageTitle(page);
-        await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+        expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
       });
 
       it(`should change the order status to '${orderToEdit.args.status}' and check it`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `updateOrderStatus${index + 1}`, baseContext);
 
         const result = await orderPageTabListBlock.modifyOrderStatus(page, orderToEdit.args.status);
-        await expect(result).to.equal(orderToEdit.args.status);
+        expect(result).to.equal(orderToEdit.args.status);
       });
     });
   });
@@ -88,7 +88,7 @@ describe('BO - Orders - Invoices : Generate PDF file by status', async () => {
       );
 
       const pageTitle = await invoicesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(invoicesPage.pageTitle);
+      expect(pageTitle).to.contains(invoicesPage.pageTitle);
     });
 
     it('should check the error message when we don\'t select a status', async function () {
@@ -96,7 +96,7 @@ describe('BO - Orders - Invoices : Generate PDF file by status', async () => {
 
       // Generate PDF
       const textMessage = await invoicesPage.generatePDFByStatusAndFail(page);
-      await expect(textMessage).to.equal(invoicesPage.errorMessageWhenNotSelectStatus);
+      expect(textMessage).to.equal(invoicesPage.errorMessageWhenNotSelectStatus);
     });
 
     it('should check the error message when there is no invoice in the status selected', async function () {
@@ -107,7 +107,7 @@ describe('BO - Orders - Invoices : Generate PDF file by status', async () => {
 
       // Generate PDF
       const textMessage = await invoicesPage.generatePDFByStatusAndFail(page);
-      await expect(textMessage).to.equal(invoicesPage.errorMessageWhenGenerateFileByStatus);
+      expect(textMessage).to.equal(invoicesPage.errorMessageWhenGenerateFileByStatus);
     });
 
     it('should choose the statuses, generate the invoice and check the file existence', async function () {
@@ -119,12 +119,12 @@ describe('BO - Orders - Invoices : Generate PDF file by status', async () => {
 
       // Generate PDF
       filePath = await invoicesPage.generatePDFByStatusAndDownload(page);
-      await expect(filePath).to.be.not.null;
+      expect(filePath).to.not.eq(null);
 
       // Check that file exist
       if (filePath) {
         const exist = await files.doesFileExist(filePath);
-        await expect(exist).to.be.true;
+        expect(exist).to.eq(true);
       }
     });
 
@@ -136,12 +136,12 @@ describe('BO - Orders - Invoices : Generate PDF file by status', async () => {
 
       // Generate PDF
       filePath = await invoicesPage.generatePDFByStatusAndDownload(page);
-      await expect(filePath).to.be.not.null;
+      expect(filePath).to.not.eq(null);
 
       // Check that file exist
       if (filePath) {
         const exist = await files.doesFileExist(filePath);
-        await expect(exist).to.be.true;
+        expect(exist).to.eq(true);
       }
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/02_orders/02_invoices/03_invoiceOptions/01_enableDisableInvoices.ts b/tests/UI/campaigns/functional/BO/02_orders/02_invoices/03_invoiceOptions/01_enableDisableInvoices.ts
index 5c3a7b17f1fbe..3e6f3b7f6c8ed 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/02_invoices/03_invoiceOptions/01_enableDisableInvoices.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/02_invoices/03_invoiceOptions/01_enableDisableInvoices.ts
@@ -94,7 +94,7 @@ describe('BO - Orders - Invoices : Enable/Disable invoices', async () => {
         await invoicesPage.closeSfToolBar(page);
 
         const pageTitle = await invoicesPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(invoicesPage.pageTitle);
+        expect(pageTitle).to.contains(invoicesPage.pageTitle);
       });
 
       it(`should ${test.args.action} invoices`, async function () {
@@ -103,7 +103,7 @@ describe('BO - Orders - Invoices : Enable/Disable invoices', async () => {
         await invoicesPage.enableInvoices(page, test.args.status);
 
         const textMessage = await invoicesPage.saveInvoiceOptions(page);
-        await expect(textMessage).to.contains(invoicesPage.successfulUpdateMessage);
+        expect(textMessage).to.contains(invoicesPage.successfulUpdateMessage);
       });
 
       it('should go to \'Orders > Orders\' page', async function () {
@@ -116,7 +116,7 @@ describe('BO - Orders - Invoices : Enable/Disable invoices', async () => {
         );
 
         const pageTitle = await ordersPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(ordersPage.pageTitle);
+        expect(pageTitle).to.contains(ordersPage.pageTitle);
       });
 
       it('should go to the first order page', async function () {
@@ -125,14 +125,14 @@ describe('BO - Orders - Invoices : Enable/Disable invoices', async () => {
         await ordersPage.goToOrder(page, 1);
 
         const pageTitle = await orderPageTabListBlock.getPageTitle(page);
-        await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+        expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
       });
 
       it(`should change the order status to '${test.args.orderStatus}' and check it`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `updateStatus${index}`, baseContext);
 
         const result = await orderPageTabListBlock.modifyOrderStatus(page, test.args.orderStatus);
-        await expect(result).to.equal(test.args.orderStatus);
+        expect(result).to.equal(test.args.orderStatus);
       });
 
       it(`should check that there is ${test.args.isInvoiceCreated}`, async function () {
@@ -141,9 +141,9 @@ describe('BO - Orders - Invoices : Enable/Disable invoices', async () => {
         const documentName = await orderPageTabListBlock.getDocumentType(page);
 
         if (test.args.status) {
-          await expect(documentName).to.be.equal('Invoice');
+          expect(documentName).to.be.equal('Invoice');
         } else {
-          await expect(documentName).to.be.not.equal('Invoice');
+          expect(documentName).to.be.not.equal('Invoice');
         }
       });
     });
diff --git a/tests/UI/campaigns/functional/BO/02_orders/02_invoices/03_invoiceOptions/02_enableDisableTaxBreakdown.ts b/tests/UI/campaigns/functional/BO/02_orders/02_invoices/03_invoiceOptions/02_enableDisableTaxBreakdown.ts
index 38f0263b1dff2..3e9a3bcd367d9 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/02_invoices/03_invoiceOptions/02_enableDisableTaxBreakdown.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/02_invoices/03_invoiceOptions/02_enableDisableTaxBreakdown.ts
@@ -107,7 +107,7 @@ describe('BO - Orders - Invoices : Enable/Disable tax breakdown', async () => {
         await invoicesPage.closeSfToolBar(page);
 
         const pageTitle = await invoicesPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(invoicesPage.pageTitle);
+        expect(pageTitle).to.contains(invoicesPage.pageTitle);
       });
 
       it('should enable tax breakdown', async function () {
@@ -116,7 +116,7 @@ describe('BO - Orders - Invoices : Enable/Disable tax breakdown', async () => {
         await invoicesPage.enableTaxBreakdown(page, true);
 
         const textMessage = await invoicesPage.saveInvoiceOptions(page);
-        await expect(textMessage).to.contains(invoicesPage.successfulUpdateMessage);
+        expect(textMessage).to.contains(invoicesPage.successfulUpdateMessage);
       });
     });
 
@@ -131,7 +131,7 @@ describe('BO - Orders - Invoices : Enable/Disable tax breakdown', async () => {
         );
 
         const pageTitle = await taxesPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(taxesPage.pageTitle);
+        expect(pageTitle).to.contains(taxesPage.pageTitle);
       });
 
       it('should go to \'Tax Rules\' page', async function () {
@@ -140,7 +140,7 @@ describe('BO - Orders - Invoices : Enable/Disable tax breakdown', async () => {
         await taxesPage.goToTaxRulesPage(page);
 
         const pageTitle = await taxRulesPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(taxRulesPage.pageTitle);
+        expect(pageTitle).to.contains(taxRulesPage.pageTitle);
       });
 
       it('should go to \'Add new tax rules group\' page', async function () {
@@ -149,21 +149,21 @@ describe('BO - Orders - Invoices : Enable/Disable tax breakdown', async () => {
         await taxRulesPage.goToAddNewTaxRulesGroupPage(page);
 
         const pageTitle = await addTaxRulesPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addTaxRulesPage.pageTitleCreate);
+        expect(pageTitle).to.contains(addTaxRulesPage.pageTitleCreate);
       });
 
       it('should create new tax rule group', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'createTaxRuleGroup', baseContext);
 
         const textResult = await addTaxRulesPage.createEditTaxRulesGroup(page, taxRuleGroupToCreate);
-        await expect(textResult).to.contains(addTaxRulesPage.successfulCreationMessage);
+        expect(textResult).to.contains(addTaxRulesPage.successfulCreationMessage);
       });
 
       it('should create new tax rule n°1', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'createFirstTaxRule', baseContext);
 
         const textResult = await addTaxRulesPage.createEditTaxRules(page, firstTaxRuleToCreate);
-        await expect(textResult).to.contains(addTaxRulesPage.successfulUpdateMessage);
+        expect(textResult).to.contains(addTaxRulesPage.successfulUpdateMessage);
       });
 
       it('should go to \'Add new tax rule\' page', async function () {
@@ -172,14 +172,14 @@ describe('BO - Orders - Invoices : Enable/Disable tax breakdown', async () => {
         await addTaxRulesPage.clickOnAddNewTaxRule(page);
 
         const pageTitle = await addTaxRulesPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addTaxRulesPage.pageTitleEdit);
+        expect(pageTitle).to.contains(addTaxRulesPage.pageTitleEdit);
       });
 
       it('should create new tax rule n°2', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'createSecondTaxRule', baseContext);
 
         const textResult = await addTaxRulesPage.createEditTaxRules(page, secondTaxRuleToCreate);
-        await expect(textResult).to.contains(addTaxRulesPage.successfulUpdateMessage);
+        expect(textResult).to.contains(addTaxRulesPage.successfulUpdateMessage);
       });
     });
 
@@ -194,7 +194,7 @@ describe('BO - Orders - Invoices : Enable/Disable tax breakdown', async () => {
         );
 
         const pageTitle = await boProductsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(boProductsPage.pageTitle);
+        expect(pageTitle).to.contains(boProductsPage.pageTitle);
       });
 
       it('should create product', async function () {
@@ -203,7 +203,7 @@ describe('BO - Orders - Invoices : Enable/Disable tax breakdown', async () => {
         await boProductsPage.goToAddProductPage(page);
 
         const createProductMessage = await addProductPage.createEditBasicProduct(page, productData);
-        await expect(createProductMessage).to.equal(addProductPage.settingUpdatedMessage);
+        expect(createProductMessage).to.equal(addProductPage.settingUpdatedMessage);
       });
     });
 
@@ -216,7 +216,7 @@ describe('BO - Orders - Invoices : Enable/Disable tax breakdown', async () => {
         await foProductPage.changeLanguage(page, 'en');
 
         const pageTitle = await foProductPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(productData.name);
+        expect(pageTitle).to.contains(productData.name);
       });
 
       it('should add product to cart', async function () {
@@ -226,7 +226,7 @@ describe('BO - Orders - Invoices : Enable/Disable tax breakdown', async () => {
         await foProductPage.addProductToTheCart(page);
 
         const pageTitle = await cartPage.getPageTitle(page);
-        await expect(pageTitle).to.equal(cartPage.pageTitle);
+        expect(pageTitle).to.equal(cartPage.pageTitle);
       });
 
       it('should proceed to checkout and sign in by default customer', async function () {
@@ -245,7 +245,7 @@ describe('BO - Orders - Invoices : Enable/Disable tax breakdown', async () => {
 
         // Address step - Go to delivery step
         const isStepAddressComplete = await checkoutPage.goToDeliveryStep(page);
-        await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+        expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
       });
 
       it('should go to payment step', async function () {
@@ -253,7 +253,7 @@ describe('BO - Orders - Invoices : Enable/Disable tax breakdown', async () => {
 
         // Delivery step - Go to payment step
         const isStepDeliveryComplete = await checkoutPage.goToPaymentStep(page);
-        await expect(isStepDeliveryComplete, 'Step Address is not complete').to.be.true;
+        expect(isStepDeliveryComplete, 'Step Address is not complete').to.eq(true);
       });
 
       it('should choose payment method and confirm the order', async function () {
@@ -264,7 +264,7 @@ describe('BO - Orders - Invoices : Enable/Disable tax breakdown', async () => {
 
         // Check the confirmation message
         const cardTitle = await orderConfirmationPage.getOrderConfirmationCardTitle(page);
-        await expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
+        expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
       });
 
       it('should go back to BO', async function () {
@@ -274,7 +274,7 @@ describe('BO - Orders - Invoices : Enable/Disable tax breakdown', async () => {
         page = await orderConfirmationPage.closePage(browserContext, page, 0);
 
         const pageTitle = await addProductPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addProductPage.pageTitle);
+        expect(pageTitle).to.contains(addProductPage.pageTitle);
       });
     });
 
@@ -289,7 +289,7 @@ describe('BO - Orders - Invoices : Enable/Disable tax breakdown', async () => {
         );
 
         const pageTitle = await ordersPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(ordersPage.pageTitle);
+        expect(pageTitle).to.contains(ordersPage.pageTitle);
       });
 
       it('should go to the first order page', async function () {
@@ -298,14 +298,14 @@ describe('BO - Orders - Invoices : Enable/Disable tax breakdown', async () => {
         await ordersPage.goToOrder(page, 1);
 
         const pageTitle = await orderPageTabListBlock.getPageTitle(page);
-        await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+        expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
       });
 
       it(`should change the order status to '${OrderStatuses.paymentAccepted.name}' and check it`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'changeOrderStatusTaxBreakdown', baseContext);
 
         const result = await orderPageTabListBlock.modifyOrderStatus(page, OrderStatuses.paymentAccepted.name);
-        await expect(result).to.equal(OrderStatuses.paymentAccepted.name);
+        expect(result).to.equal(OrderStatuses.paymentAccepted.name);
       });
 
       it('should download the invoice', async function () {
@@ -313,11 +313,11 @@ describe('BO - Orders - Invoices : Enable/Disable tax breakdown', async () => {
 
         // Download invoice
         firstInvoiceFileName = await orderPageTabListBlock.downloadInvoice(page);
-        await expect(firstInvoiceFileName).to.be.not.null;
+        expect(firstInvoiceFileName).to.not.eq(null);
 
         // Check that file exist
         const exist = await files.doesFileExist(firstInvoiceFileName);
-        await expect(exist).to.be.true;
+        expect(exist).to.eq(true);
       });
 
       it('should check the tax breakdown', async function () {
@@ -325,11 +325,11 @@ describe('BO - Orders - Invoices : Enable/Disable tax breakdown', async () => {
 
         // Check the existence of the first tax
         let exist = await files.isTextInPDF(firstInvoiceFileName, '10.000 %');
-        await expect(exist).to.be.true;
+        expect(exist).to.eq(true);
 
         // Check the existence of the second tax
         exist = await files.isTextInPDF(firstInvoiceFileName, '20.000 %');
-        await expect(exist).to.be.true;
+        expect(exist).to.eq(true);
       });
     });
   });
@@ -346,7 +346,7 @@ describe('BO - Orders - Invoices : Enable/Disable tax breakdown', async () => {
         );
 
         const pageTitle = await invoicesPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(invoicesPage.pageTitle);
+        expect(pageTitle).to.contains(invoicesPage.pageTitle);
       });
 
       it('should disable tax breakdown', async function () {
@@ -355,7 +355,7 @@ describe('BO - Orders - Invoices : Enable/Disable tax breakdown', async () => {
         await invoicesPage.enableTaxBreakdown(page, false);
 
         const textMessage = await invoicesPage.saveInvoiceOptions(page);
-        await expect(textMessage).to.contains(invoicesPage.successfulUpdateMessage);
+        expect(textMessage).to.contains(invoicesPage.successfulUpdateMessage);
       });
     });
 
@@ -370,7 +370,7 @@ describe('BO - Orders - Invoices : Enable/Disable tax breakdown', async () => {
         );
 
         const pageTitle = await ordersPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(ordersPage.pageTitle);
+        expect(pageTitle).to.contains(ordersPage.pageTitle);
       });
 
       it('should go to the first order page', async function () {
@@ -379,7 +379,7 @@ describe('BO - Orders - Invoices : Enable/Disable tax breakdown', async () => {
         await ordersPage.goToOrder(page, 1);
 
         const pageTitle = await orderPageTabListBlock.getPageTitle(page);
-        await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+        expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
       });
 
       it('should download the invoice', async function () {
@@ -387,10 +387,10 @@ describe('BO - Orders - Invoices : Enable/Disable tax breakdown', async () => {
 
         // Download invoice and check existence
         secondInvoiceFileName = await orderPageTabListBlock.downloadInvoice(page);
-        await expect(secondInvoiceFileName).to.be.not.null;
+        expect(secondInvoiceFileName).to.not.eq(null);
 
         const exist = await files.doesFileExist(secondInvoiceFileName);
-        await expect(exist).to.be.true;
+        expect(exist).to.eq(true);
       });
 
       it('should check that there is no tax breakdown', async function () {
@@ -398,13 +398,13 @@ describe('BO - Orders - Invoices : Enable/Disable tax breakdown', async () => {
 
         // Check that there is only one tax line 30.000 %
         let exist = await files.isTextInPDF(secondInvoiceFileName, '10.000 %');
-        await expect(exist).to.be.false;
+        expect(exist).to.eq(false);
 
         exist = await files.isTextInPDF(secondInvoiceFileName, '20.000 %');
-        await expect(exist).to.be.false;
+        expect(exist).to.eq(false);
 
         exist = await files.isTextInPDF(secondInvoiceFileName, '30.000 %');
-        await expect(exist).to.be.true;
+        expect(exist).to.eq(true);
       });
     });
   });
@@ -421,7 +421,7 @@ describe('BO - Orders - Invoices : Enable/Disable tax breakdown', async () => {
       );
 
       const pageTitle = await taxesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(taxesPage.pageTitle);
+      expect(pageTitle).to.contains(taxesPage.pageTitle);
     });
 
     it('should go to \'Tax Rules\' page', async function () {
@@ -430,7 +430,7 @@ describe('BO - Orders - Invoices : Enable/Disable tax breakdown', async () => {
       await taxesPage.goToTaxRulesPage(page);
 
       const pageTitle = await taxRulesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(taxRulesPage.pageTitle);
+      expect(pageTitle).to.contains(taxRulesPage.pageTitle);
     });
 
     it('should filter list by name', async function () {
@@ -451,7 +451,7 @@ describe('BO - Orders - Invoices : Enable/Disable tax breakdown', async () => {
           i,
           'name',
         );
-        await expect(textColumn).to.contains(taxRuleGroupToCreate.name);
+        expect(textColumn).to.contains(taxRuleGroupToCreate.name);
       }
     });
 
@@ -459,14 +459,14 @@ describe('BO - Orders - Invoices : Enable/Disable tax breakdown', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteCarriers', baseContext);
 
       const deleteTextResult = await taxRulesPage.bulkDeleteTaxRules(page);
-      await expect(deleteTextResult).to.be.contains(taxRulesPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.contains(taxRulesPage.successfulMultiDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterDelete', baseContext);
 
       const numberOfLinesAfterReset = await taxRulesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfLinesAfterReset).to.be.above(0);
+      expect(numberOfLinesAfterReset).to.be.above(0);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/02_orders/02_invoices/03_invoiceOptions/03_enableDisableProductImage.ts b/tests/UI/campaigns/functional/BO/02_orders/02_invoices/03_invoiceOptions/03_enableDisableProductImage.ts
index 3ad3048d9f94e..1e2b863b85fa6 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/02_invoices/03_invoiceOptions/03_enableDisableProductImage.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/02_invoices/03_invoiceOptions/03_enableDisableProductImage.ts
@@ -76,7 +76,7 @@ describe('BO - Orders - Invoices : Enable/Disable product image in invoices', as
           await invoicesPage.closeSfToolBar(page);
 
           const pageTitle = await invoicesPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(invoicesPage.pageTitle);
+          expect(pageTitle).to.contains(invoicesPage.pageTitle);
         });
 
         it(`should ${test.args.action} product image`, async function () {
@@ -85,7 +85,7 @@ describe('BO - Orders - Invoices : Enable/Disable product image in invoices', as
           await invoicesPage.enableProductImage(page, test.args.enable);
 
           const textMessage = await invoicesPage.saveInvoiceOptions(page);
-          await expect(textMessage).to.contains(invoicesPage.successfulUpdateMessage);
+          expect(textMessage).to.contains(invoicesPage.successfulUpdateMessage);
         });
       });
 
@@ -99,7 +99,7 @@ describe('BO - Orders - Invoices : Enable/Disable product image in invoices', as
           await homePage.changeLanguage(page, 'en');
 
           const isHomePage = await homePage.isHomePage(page);
-          await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+          expect(isHomePage, 'Fail to open FO home page').to.eq(true);
         });
 
         it('should go to login page', async function () {
@@ -108,7 +108,7 @@ describe('BO - Orders - Invoices : Enable/Disable product image in invoices', as
           await homePage.goToLoginPage(page);
 
           const pageTitle = await foLoginPage.getPageTitle(page);
-          await expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
+          expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
         });
 
         it('should sign in with default customer', async function () {
@@ -117,7 +117,7 @@ describe('BO - Orders - Invoices : Enable/Disable product image in invoices', as
           await foLoginPage.customerLogin(page, Customers.johnDoe);
 
           const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
-          await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+          expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
         });
 
         it('should add product to cart', async function () {
@@ -131,7 +131,7 @@ describe('BO - Orders - Invoices : Enable/Disable product image in invoices', as
           await productPage.addProductToTheCart(page);
 
           const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
-          await expect(notificationsNumber).to.be.equal(1);
+          expect(notificationsNumber).to.be.equal(1);
         });
 
         it('should go to delivery step', async function () {
@@ -142,7 +142,7 @@ describe('BO - Orders - Invoices : Enable/Disable product image in invoices', as
 
           // Address step - Go to delivery step
           const isStepAddressComplete = await checkoutPage.goToDeliveryStep(page);
-          await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+          expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
         });
 
         it('should go to payment step', async function () {
@@ -150,7 +150,7 @@ describe('BO - Orders - Invoices : Enable/Disable product image in invoices', as
 
           // Delivery step - Go to payment step
           const isStepDeliveryComplete = await checkoutPage.goToPaymentStep(page);
-          await expect(isStepDeliveryComplete, 'Step Address is not complete').to.be.true;
+          expect(isStepDeliveryComplete, 'Step Address is not complete').to.eq(true);
         });
 
         it('should choose payment method and confirm the order', async function () {
@@ -161,7 +161,7 @@ describe('BO - Orders - Invoices : Enable/Disable product image in invoices', as
 
           // Check the confirmation message
           const cardTitle = await orderConfirmationPage.getOrderConfirmationCardTitle(page);
-          await expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
+          expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
         });
 
         it('should sign out from FO', async function () {
@@ -170,7 +170,7 @@ describe('BO - Orders - Invoices : Enable/Disable product image in invoices', as
           await orderConfirmationPage.logout(page);
 
           const isCustomerConnected = await orderConfirmationPage.isCustomerConnected(page);
-          await expect(isCustomerConnected, 'Customer is connected').to.be.false;
+          expect(isCustomerConnected, 'Customer is connected').to.eq(false);
         });
 
         it('should go back to BO', async function () {
@@ -180,7 +180,7 @@ describe('BO - Orders - Invoices : Enable/Disable product image in invoices', as
           page = await orderConfirmationPage.closePage(browserContext, page, 0);
 
           const pageTitle = await invoicesPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(invoicesPage.pageTitle);
+          expect(pageTitle).to.contains(invoicesPage.pageTitle);
         });
       });
 
@@ -195,7 +195,7 @@ describe('BO - Orders - Invoices : Enable/Disable product image in invoices', as
           );
 
           const pageTitle = await ordersPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(ordersPage.pageTitle);
+          expect(pageTitle).to.contains(ordersPage.pageTitle);
         });
 
         it('should go to the created order page', async function () {
@@ -204,14 +204,14 @@ describe('BO - Orders - Invoices : Enable/Disable product image in invoices', as
           await ordersPage.goToOrder(page, 1);
 
           const pageTitle = await orderPageTabListBlock.getPageTitle(page);
-          await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+          expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
         });
 
         it(`should change the order status to '${OrderStatuses.shipped.name}' and check it`, async function () {
           await testContext.addContextItem(this, 'testIdentifier', `updateOrderStatus${index}`, baseContext);
 
           const result = await orderPageTabListBlock.modifyOrderStatus(page, OrderStatuses.shipped.name);
-          await expect(result).to.equal(OrderStatuses.shipped.name);
+          expect(result).to.equal(OrderStatuses.shipped.name);
         });
 
         it('should download the invoice', async function () {
@@ -219,17 +219,17 @@ describe('BO - Orders - Invoices : Enable/Disable product image in invoices', as
 
           // Download invoice
           filePath = await orderPageTabListBlock.downloadInvoice(page);
-          await expect(filePath).to.not.be.null;
+          expect(filePath).to.not.eq(null);
 
           const exist = await files.doesFileExist(filePath);
-          await expect(exist).to.be.true;
+          expect(exist).to.eq(true);
         });
 
         it('should check the product images in the PDF File', async function () {
           await testContext.addContextItem(this, 'testIdentifier', `checkProductImages${index}`, baseContext);
 
           const imageNumber = await files.getImageNumberInPDF(filePath);
-          await expect(imageNumber).to.be.equal(test.args.imageNumber);
+          expect(imageNumber).to.be.equal(test.args.imageNumber);
 
           await files.deleteFile(filePath);
         });
diff --git a/tests/UI/campaigns/functional/BO/02_orders/02_invoices/03_invoiceOptions/04_invoicePrefix.ts b/tests/UI/campaigns/functional/BO/02_orders/02_invoices/03_invoiceOptions/04_invoicePrefix.ts
index 83180ae21a6b1..21bb660ca49dd 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/02_invoices/03_invoiceOptions/04_invoicePrefix.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/02_invoices/03_invoiceOptions/04_invoicePrefix.ts
@@ -61,7 +61,7 @@ describe('BO - Orders - Invoices : Update invoice prefix and check the generated
       await invoicesPage.closeSfToolBar(page);
 
       const pageTitle = await invoicesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(invoicesPage.pageTitle);
+      expect(pageTitle).to.contains(invoicesPage.pageTitle);
     });
 
     it(`should update the invoice prefix to ${invoiceData.prefix}`, async function () {
@@ -70,7 +70,7 @@ describe('BO - Orders - Invoices : Update invoice prefix and check the generated
       await invoicesPage.changePrefix(page, invoiceData.prefix);
 
       const textMessage = await invoicesPage.saveInvoiceOptions(page);
-      await expect(textMessage).to.contains(invoicesPage.successfulUpdateMessage);
+      expect(textMessage).to.contains(invoicesPage.successfulUpdateMessage);
     });
   });
 
@@ -85,7 +85,7 @@ describe('BO - Orders - Invoices : Update invoice prefix and check the generated
       );
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should go to the first order page', async function () {
@@ -95,14 +95,14 @@ describe('BO - Orders - Invoices : Update invoice prefix and check the generated
       await ordersPage.goToOrder(page, 1);
 
       const pageTitle = await orderPageTabListBlock.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+      expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
     });
 
     it(`should change the order status to '${OrderStatuses.shipped.name}' and check it`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'UpdateStatusForUpdatedPrefix', baseContext);
 
       const result = await orderPageTabListBlock.modifyOrderStatus(page, OrderStatuses.shipped.name);
-      await expect(result).to.equal(OrderStatuses.shipped.name);
+      expect(result).to.equal(OrderStatuses.shipped.name);
     });
 
     it(`should check that the invoice file name contain the prefix '${invoiceData.prefix}'`, async function () {
@@ -125,7 +125,7 @@ describe('BO - Orders - Invoices : Update invoice prefix and check the generated
       );
 
       const pageTitle = await invoicesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(invoicesPage.pageTitle);
+      expect(pageTitle).to.contains(invoicesPage.pageTitle);
     });
 
     it(`should change the invoice prefix to '${defaultPrefix}'`, async function () {
@@ -134,7 +134,7 @@ describe('BO - Orders - Invoices : Update invoice prefix and check the generated
       await invoicesPage.changePrefix(page, defaultPrefix);
 
       const textMessage = await invoicesPage.saveInvoiceOptions(page);
-      await expect(textMessage).to.contains(invoicesPage.successfulUpdateMessage);
+      expect(textMessage).to.contains(invoicesPage.successfulUpdateMessage);
     });
   });
 
@@ -149,7 +149,7 @@ describe('BO - Orders - Invoices : Update invoice prefix and check the generated
       );
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should go to the first order page', async function () {
@@ -158,7 +158,7 @@ describe('BO - Orders - Invoices : Update invoice prefix and check the generated
       await ordersPage.goToOrder(page, 1);
 
       const pageTitle = await orderPageTabListBlock.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+      expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
     });
 
     it(`should check that the invoice file name contain the default prefix ${defaultPrefix}`, async function () {
diff --git a/tests/UI/campaigns/functional/BO/02_orders/02_invoices/03_invoiceOptions/05_enableDisableCurrentYear.ts b/tests/UI/campaigns/functional/BO/02_orders/02_invoices/03_invoiceOptions/05_enableDisableCurrentYear.ts
index 2f9122aa97d9c..810e05fa27fe6 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/02_invoices/03_invoiceOptions/05_enableDisableCurrentYear.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/02_invoices/03_invoiceOptions/05_enableDisableCurrentYear.ts
@@ -66,7 +66,7 @@ describe('BO - Orders - Invoices : Enable/Disable current year', async () => {
       await invoicesPage.closeSfToolBar(page);
 
       const pageTitle = await invoicesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(invoicesPage.pageTitle);
+      expect(pageTitle).to.contains(invoicesPage.pageTitle);
     });
 
     it('should enable add current year to invoice number', async function () {
@@ -75,7 +75,7 @@ describe('BO - Orders - Invoices : Enable/Disable current year', async () => {
       await invoicesPage.enableAddCurrentYearToInvoice(page, true);
 
       const textMessage = await invoicesPage.saveInvoiceOptions(page);
-      await expect(textMessage).to.contains(invoicesPage.successfulUpdateMessage);
+      expect(textMessage).to.contains(invoicesPage.successfulUpdateMessage);
     });
 
     describe('Choose the position of the year at the end and check it', async () => {
@@ -86,7 +86,7 @@ describe('BO - Orders - Invoices : Enable/Disable current year', async () => {
         await invoicesPage.chooseInvoiceOptionsYearPosition(page, 0);
 
         const textMessage = await invoicesPage.saveInvoiceOptions(page);
-        await expect(textMessage).to.contains(invoicesPage.successfulUpdateMessage);
+        expect(textMessage).to.contains(invoicesPage.successfulUpdateMessage);
       });
 
       it('should go to \'Orders > Orders\' page', async function () {
@@ -99,7 +99,7 @@ describe('BO - Orders - Invoices : Enable/Disable current year', async () => {
         );
 
         const pageTitle = await ordersPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(ordersPage.pageTitle);
+        expect(pageTitle).to.contains(ordersPage.pageTitle);
       });
 
       it('should go to the first order page', async function () {
@@ -108,14 +108,14 @@ describe('BO - Orders - Invoices : Enable/Disable current year', async () => {
         await ordersPage.goToOrder(page, 1);
 
         const pageTitle = await orderPageTabListBlock.getPageTitle(page);
-        await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+        expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
       });
 
       it(`should change the order status to '${OrderStatuses.shipped.name}' and check it`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'updateStatusEnabledCurrentYearInTheEnd', baseContext);
 
         const result = await orderPageTabListBlock.modifyOrderStatus(page, OrderStatuses.shipped.name);
-        await expect(result).to.equal(OrderStatuses.shipped.name);
+        expect(result).to.equal(OrderStatuses.shipped.name);
       });
 
       it('should check that the invoice file name contain current year at the end', async function () {
@@ -137,7 +137,7 @@ describe('BO - Orders - Invoices : Enable/Disable current year', async () => {
         );
 
         const pageTitle = await invoicesPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(invoicesPage.pageTitle);
+        expect(pageTitle).to.contains(invoicesPage.pageTitle);
       });
 
       it('should choose \'Before the sequential number\'', async function () {
@@ -147,7 +147,7 @@ describe('BO - Orders - Invoices : Enable/Disable current year', async () => {
         await invoicesPage.chooseInvoiceOptionsYearPosition(page, 1);
 
         const textMessage = await invoicesPage.saveInvoiceOptions(page);
-        await expect(textMessage).to.contains(invoicesPage.successfulUpdateMessage);
+        expect(textMessage).to.contains(invoicesPage.successfulUpdateMessage);
       });
 
       it('should go to \'Orders > Orders\' page', async function () {
@@ -160,7 +160,7 @@ describe('BO - Orders - Invoices : Enable/Disable current year', async () => {
         );
 
         const pageTitle = await ordersPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(ordersPage.pageTitle);
+        expect(pageTitle).to.contains(ordersPage.pageTitle);
       });
 
       it('should go to the first order page', async function () {
@@ -169,7 +169,7 @@ describe('BO - Orders - Invoices : Enable/Disable current year', async () => {
         await ordersPage.goToOrder(page, 1);
 
         const pageTitle = await orderPageTabListBlock.getPageTitle(page);
-        await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+        expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
       });
 
       it('should check that the invoice file name contain current year at the beginning', async function () {
@@ -192,7 +192,7 @@ describe('BO - Orders - Invoices : Enable/Disable current year', async () => {
       );
 
       const pageTitle = await invoicesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(invoicesPage.pageTitle);
+      expect(pageTitle).to.contains(invoicesPage.pageTitle);
     });
 
     it('should disable add current year to invoice number', async function () {
@@ -201,7 +201,7 @@ describe('BO - Orders - Invoices : Enable/Disable current year', async () => {
       await invoicesPage.enableAddCurrentYearToInvoice(page, false);
 
       const textMessage = await invoicesPage.saveInvoiceOptions(page);
-      await expect(textMessage).to.contains(invoicesPage.successfulUpdateMessage);
+      expect(textMessage).to.contains(invoicesPage.successfulUpdateMessage);
     });
 
     describe('Check the invoice file Name', async () => {
@@ -215,7 +215,7 @@ describe('BO - Orders - Invoices : Enable/Disable current year', async () => {
         );
 
         const pageTitle = await ordersPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(ordersPage.pageTitle);
+        expect(pageTitle).to.contains(ordersPage.pageTitle);
       });
 
       it('should go to the first order page', async function () {
@@ -224,7 +224,7 @@ describe('BO - Orders - Invoices : Enable/Disable current year', async () => {
         await ordersPage.goToOrder(page, 1);
 
         const pageTitle = await orderPageTabListBlock.getPageTitle(page);
-        await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+        expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
       });
 
       it('should check that the invoice file name does not contain the current year', async function () {
diff --git a/tests/UI/campaigns/functional/BO/02_orders/02_invoices/03_invoiceOptions/06_otherOptions.ts b/tests/UI/campaigns/functional/BO/02_orders/02_invoices/03_invoiceOptions/06_otherOptions.ts
index 255a6149d920f..67cd1854d135e 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/02_invoices/03_invoiceOptions/06_otherOptions.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/02_invoices/03_invoiceOptions/06_otherOptions.ts
@@ -89,7 +89,7 @@ describe('BO - Orders - Invoices : Update \'Invoice number, Legal free text and
       await invoicesPage.closeSfToolBar(page);
 
       const pageTitle = await invoicesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(invoicesPage.pageTitle);
+      expect(pageTitle).to.contains(invoicesPage.pageTitle);
     });
 
     it('should change the invoice number, the invoice legal free text and the invoice footer text', async function () {
@@ -98,7 +98,7 @@ describe('BO - Orders - Invoices : Update \'Invoice number, Legal free text and
       await invoicesPage.setInputOptions(page, invoiceData);
 
       const textMessage = await invoicesPage.saveInvoiceOptions(page);
-      await expect(textMessage).to.contains(invoicesPage.successfulUpdateMessage);
+      expect(textMessage).to.contains(invoicesPage.successfulUpdateMessage);
     });
   });
 
@@ -113,7 +113,7 @@ describe('BO - Orders - Invoices : Update \'Invoice number, Legal free text and
       );
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should go to the first order page', async function () {
@@ -122,14 +122,14 @@ describe('BO - Orders - Invoices : Update \'Invoice number, Legal free text and
       await ordersPage.goToOrder(page, 1);
 
       const pageTitle = await orderPageTabListBlock.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+      expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
     });
 
     it(`should change the order status to '${OrderStatuses.shipped.name}'`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateStatusUpdatedOptions', baseContext);
 
       const result = await orderPageTabListBlock.modifyOrderStatus(page, OrderStatuses.shipped.name);
-      await expect(result).to.equal(OrderStatuses.shipped.name);
+      expect(result).to.equal(OrderStatuses.shipped.name);
     });
 
     it('should download the invoice', async function () {
@@ -137,11 +137,11 @@ describe('BO - Orders - Invoices : Update \'Invoice number, Legal free text and
 
       // Download invoice
       filePath = await orderPageTabListBlock.downloadInvoice(page);
-      await expect(filePath).to.be.not.null;
+      expect(filePath).to.not.eq(null);
 
       if (filePath) {
         const exist = await files.doesFileExist(filePath);
-        await expect(exist).to.be.true;
+        expect(exist).to.eq(true);
       }
     });
 
@@ -158,7 +158,7 @@ describe('BO - Orders - Invoices : Update \'Invoice number, Legal free text and
 
       // Check the existence of the Legal free text
       const exist = await files.isTextInPDF(filePath, invoiceData.legalFreeText);
-      await expect(exist, `PDF does not contains this text : ${invoiceData.legalFreeText}`).to.be.true;
+      expect(exist, `PDF does not contains this text : ${invoiceData.legalFreeText}`).to.eq(true);
     });
 
     it('should check that the invoice contain the \'Footer text\'', async function () {
@@ -166,7 +166,7 @@ describe('BO - Orders - Invoices : Update \'Invoice number, Legal free text and
 
       // Check the existence of the Footer text
       const exist = await files.isTextInPDF(filePath, invoiceData.footerText);
-      await expect(exist, `PDF does not contains this text : ${invoiceData.footerText}`).to.be.true;
+      expect(exist, `PDF does not contains this text : ${invoiceData.footerText}`).to.eq(true);
     });
   });
 
@@ -181,7 +181,7 @@ describe('BO - Orders - Invoices : Update \'Invoice number, Legal free text and
       );
 
       const pageTitle = await invoicesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(invoicesPage.pageTitle);
+      expect(pageTitle).to.contains(invoicesPage.pageTitle);
     });
 
     it('should change the Invoice number, legal free text and the footer text to default data', async function () {
@@ -190,7 +190,7 @@ describe('BO - Orders - Invoices : Update \'Invoice number, Legal free text and
       await invoicesPage.setInputOptions(page, invoiceDefaultData);
 
       const textMessage = await invoicesPage.saveInvoiceOptions(page);
-      await expect(textMessage).to.contains(invoicesPage.successfulUpdateMessage);
+      expect(textMessage).to.contains(invoicesPage.successfulUpdateMessage);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/02_orders/03_creditSlips/01_createFilterCreditSlips.ts b/tests/UI/campaigns/functional/BO/02_orders/03_creditSlips/01_createFilterCreditSlips.ts
index 16923f5bb7b6a..93be5458d58cd 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/03_creditSlips/01_createFilterCreditSlips.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/03_creditSlips/01_createFilterCreditSlips.ts
@@ -81,7 +81,7 @@ describe('BO - Orders - Credit slips : Create, filter and check credit slips fil
       );
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should go to the first order page', async function () {
@@ -90,14 +90,14 @@ describe('BO - Orders - Credit slips : Create, filter and check credit slips fil
       await ordersPage.goToOrder(page, 1);
 
       const pageTitle = await orderPageTabListBlock.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+      expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
     });
 
     it(`should change the order status to '${OrderStatuses.shipped.name}' and check it`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateCreatedOrderStatus', baseContext);
 
       const result = await orderPageTabListBlock.modifyOrderStatus(page, OrderStatuses.shipped.name);
-      await expect(result).to.equal(OrderStatuses.shipped.name);
+      expect(result).to.equal(OrderStatuses.shipped.name);
     });
 
     const tests = [
@@ -116,7 +116,7 @@ describe('BO - Orders - Credit slips : Create, filter and check credit slips fil
           test.args.productID,
           test.args.quantity,
         );
-        await expect(textMessage).to.contains(orderPageProductsBlock.partialRefundValidationMessage);
+        expect(textMessage).to.contains(orderPageProductsBlock.partialRefundValidationMessage);
       });
 
       it('should check the existence of the Credit slip document', async function () {
@@ -124,7 +124,7 @@ describe('BO - Orders - Credit slips : Create, filter and check credit slips fil
 
         // Get document name
         const documentType = await orderPageTabListBlock.getDocumentType(page, test.args.documentRow);
-        await expect(documentType).to.be.equal('Credit slip');
+        expect(documentType).to.be.equal('Credit slip');
       });
     });
   });
@@ -141,14 +141,14 @@ describe('BO - Orders - Credit slips : Create, filter and check credit slips fil
       await creditSlipsPage.closeSfToolBar(page);
 
       const pageTitle = await creditSlipsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(creditSlipsPage.pageTitle);
+      expect(pageTitle).to.contains(creditSlipsPage.pageTitle);
     });
 
     it('should reset all filters and get number of credit slips', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
       numberOfCreditSlips = await creditSlipsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCreditSlips).to.be.above(0);
+      expect(numberOfCreditSlips).to.be.above(0);
     });
 
     const tests = [
@@ -184,7 +184,7 @@ describe('BO - Orders - Credit slips : Create, filter and check credit slips fil
 
         // Get number of credit slips
         const numberOfCreditSlipsAfterFilter = await creditSlipsPage.getNumberOfElementInGrid(page);
-        await expect(numberOfCreditSlipsAfterFilter).to.be.at.most(numberOfCreditSlips);
+        expect(numberOfCreditSlipsAfterFilter).to.be.at.most(numberOfCreditSlips);
 
         for (let i = 1; i <= numberOfCreditSlipsAfterFilter; i++) {
           const textColumn = await creditSlipsPage.getTextColumnFromTableCreditSlips(
@@ -192,7 +192,7 @@ describe('BO - Orders - Credit slips : Create, filter and check credit slips fil
             i,
             test.args.columnName,
           );
-          await expect(textColumn).to.contains(test.args.filterValue);
+          expect(textColumn).to.contains(test.args.filterValue);
         }
       });
 
@@ -200,7 +200,7 @@ describe('BO - Orders - Credit slips : Create, filter and check credit slips fil
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}Reset`, baseContext);
 
         const numberOfCreditSlipsAfterReset = await creditSlipsPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfCreditSlipsAfterReset).to.be.equal(numberOfCreditSlips);
+        expect(numberOfCreditSlipsAfterReset).to.be.equal(numberOfCreditSlips);
       });
     });
 
@@ -212,11 +212,11 @@ describe('BO - Orders - Credit slips : Create, filter and check credit slips fil
 
       // Check number of element
       const numberOfCreditSlipsAfterFilter = await creditSlipsPage.getNumberOfElementInGrid(page);
-      await expect(numberOfCreditSlipsAfterFilter).to.be.at.most(numberOfCreditSlips);
+      expect(numberOfCreditSlipsAfterFilter).to.be.at.most(numberOfCreditSlips);
 
       for (let i = 1; i <= numberOfCreditSlipsAfterFilter; i++) {
         const textColumn = await creditSlipsPage.getTextColumnFromTableCreditSlips(page, i, 'date_add');
-        await expect(textColumn).to.contains(todayDateToCheck);
+        expect(textColumn).to.contains(todayDateToCheck);
       }
     });
 
@@ -224,7 +224,7 @@ describe('BO - Orders - Credit slips : Create, filter and check credit slips fil
       await testContext.addContextItem(this, 'testIdentifier', 'filterDateIssuedReset', baseContext);
 
       const numberOfCreditSlipsAfterReset = await creditSlipsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCreditSlipsAfterReset).to.be.equal(numberOfCreditSlips);
+      expect(numberOfCreditSlipsAfterReset).to.be.equal(numberOfCreditSlips);
     });
   });
 
@@ -254,7 +254,7 @@ describe('BO - Orders - Credit slips : Create, filter and check credit slips fil
           1,
           'id_order_slip',
         );
-        await expect(textColumn).to.contains(creditSlip.args.id);
+        expect(textColumn).to.contains(creditSlip.args.id);
       });
 
       it(`should download the ${creditSlip.args.number} credit slip and check the file existence`, async function () {
@@ -263,7 +263,7 @@ describe('BO - Orders - Credit slips : Create, filter and check credit slips fil
         const filePath = await creditSlipsPage.downloadCreditSlip(page);
 
         const exist = await files.doesFileExist(filePath);
-        await expect(exist).to.be.true;
+        expect(exist).to.eq(true);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/02_orders/03_creditSlips/02_sortAndPaginationCreditSlips.ts b/tests/UI/campaigns/functional/BO/02_orders/03_creditSlips/02_sortAndPaginationCreditSlips.ts
index 658496ec9d11e..7c3f4365bab75 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/03_creditSlips/02_sortAndPaginationCreditSlips.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/03_creditSlips/02_sortAndPaginationCreditSlips.ts
@@ -89,7 +89,7 @@ describe('BO - Orders - Credit slips : Sort (by ID, Date and OrderID) and Pagina
         );
 
         const pageTitle = await ordersPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(ordersPage.pageTitle);
+        expect(pageTitle).to.contains(ordersPage.pageTitle);
       });
 
       it(`should change the order status to '${OrderStatuses.shipped.name}' and check it`, async function () {
@@ -101,7 +101,7 @@ describe('BO - Orders - Credit slips : Sort (by ID, Date and OrderID) and Pagina
         );
 
         const textResult = await ordersPage.setOrderStatus(page, 1, OrderStatuses.shipped);
-        await expect(textResult).to.equal(ordersPage.successfulUpdateMessage);
+        expect(textResult).to.equal(ordersPage.successfulUpdateMessage);
       });
 
       it('should go to the first order page', async function () {
@@ -115,7 +115,7 @@ describe('BO - Orders - Credit slips : Sort (by ID, Date and OrderID) and Pagina
         await ordersPage.goToOrder(page, 1);
 
         const pageTitle = await orderPageTabListBlock.getPageTitle(page);
-        await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+        expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
       });
 
       it('should add a partial refund', async function () {
@@ -129,7 +129,7 @@ describe('BO - Orders - Credit slips : Sort (by ID, Date and OrderID) and Pagina
         await orderPageTabListBlock.clickOnPartialRefund(page);
 
         const textMessage = await orderPageProductsBlock.addPartialRefundProduct(page, 1, 1);
-        await expect(textMessage).to.contains(orderPageProductsBlock.partialRefundValidationMessage);
+        expect(textMessage).to.contains(orderPageProductsBlock.partialRefundValidationMessage);
       });
 
       it('should check the existence of the Credit slip document', async function () {
@@ -141,7 +141,7 @@ describe('BO - Orders - Credit slips : Sort (by ID, Date and OrderID) and Pagina
         );
 
         const documentType = await orderPageTabListBlock.getDocumentType(page, 4);
-        await expect(documentType).to.be.equal(creditSlipDocumentName);
+        expect(documentType).to.be.equal(creditSlipDocumentName);
       });
     });
   }
@@ -163,7 +163,7 @@ describe('BO - Orders - Credit slips : Sort (by ID, Date and OrderID) and Pagina
       await creditSlipsPage.closeSfToolBar(page);
 
       const pageTitle = await creditSlipsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(creditSlipsPage.pageTitle);
+      expect(pageTitle).to.contains(creditSlipsPage.pageTitle);
     });
 
     it('should reset all filters and get number of credit slips', async function () {
@@ -245,17 +245,17 @@ describe('BO - Orders - Credit slips : Sort (by ID, Date and OrderID) and Pagina
           const expectedResult: number[] = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+            expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+            expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
         } else {
           const expectedResult: string[] = await basicHelper.sortArray(nonSortedTable);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         }
       });
diff --git a/tests/UI/campaigns/functional/BO/02_orders/03_creditSlips/03_generateCreditSlipsByDate.ts b/tests/UI/campaigns/functional/BO/02_orders/03_creditSlips/03_generateCreditSlipsByDate.ts
index 5436f6465bbb1..5bdf6e4ef992d 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/03_creditSlips/03_generateCreditSlipsByDate.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/03_creditSlips/03_generateCreditSlipsByDate.ts
@@ -79,7 +79,7 @@ describe('BO - Orders - Credit slips : Generate Credit slip file by date', async
       );
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should go to the first order page', async function () {
@@ -88,14 +88,14 @@ describe('BO - Orders - Credit slips : Generate Credit slip file by date', async
       await ordersPage.goToOrder(page, 1);
 
       const pageTitle = await orderPageTabListBlock.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+      expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
     });
 
     it(`should change the order status to '${OrderStatuses.shipped.name}' and check it`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateCreatedOrderStatus', baseContext);
 
       const result = await orderPageTabListBlock.modifyOrderStatus(page, OrderStatuses.shipped.name);
-      await expect(result).to.equal(OrderStatuses.shipped.name);
+      expect(result).to.equal(OrderStatuses.shipped.name);
     });
 
     it('should add a partial refund', async function () {
@@ -104,14 +104,14 @@ describe('BO - Orders - Credit slips : Generate Credit slip file by date', async
       await orderPageTabListBlock.clickOnPartialRefund(page);
 
       const textMessage = await orderPageProductsBlock.addPartialRefundProduct(page, 1, 1);
-      await expect(textMessage).to.contains(orderPageProductsBlock.partialRefundValidationMessage);
+      expect(textMessage).to.contains(orderPageProductsBlock.partialRefundValidationMessage);
     });
 
     it('should check the existence of the Credit slip document', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkCreditSlipDocumentName', baseContext);
 
       const documentType = await orderPageTabListBlock.getDocumentType(page, 4);
-      await expect(documentType).to.be.equal(creditSlipDocumentName);
+      expect(documentType).to.be.equal(creditSlipDocumentName);
     });
   });
 
@@ -127,7 +127,7 @@ describe('BO - Orders - Credit slips : Generate Credit slip file by date', async
       await creditSlipsPage.closeSfToolBar(page);
 
       const pageTitle = await creditSlipsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(creditSlipsPage.pageTitle);
+      expect(pageTitle).to.contains(creditSlipsPage.pageTitle);
     });
 
     it('should generate PDF file by date and check the file existence', async function () {
@@ -137,7 +137,7 @@ describe('BO - Orders - Credit slips : Generate Credit slip file by date', async
       const filePath = await creditSlipsPage.generatePDFByDateAndDownload(page);
 
       const exist = await files.doesFileExist(filePath);
-      await expect(exist).to.be.true;
+      expect(exist).to.eq(true);
     });
 
     it('should check the error message when there is no credit slip in the entered date', async function () {
@@ -145,7 +145,7 @@ describe('BO - Orders - Credit slips : Generate Credit slip file by date', async
 
       // Generate credit slip and get error message
       const textMessage = await creditSlipsPage.generatePDFByDateAndFail(page, futureDate, futureDate);
-      await expect(textMessage).to.equal(creditSlipsPage.errorMessageWhenGenerateFileByDate);
+      expect(textMessage).to.equal(creditSlipsPage.errorMessageWhenGenerateFileByDate);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/02_orders/03_creditSlips/04_creditSlipOptions.ts b/tests/UI/campaigns/functional/BO/02_orders/03_creditSlips/04_creditSlipOptions.ts
index 769e2b6f7b47b..a5e2e7a1b7192 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/03_creditSlips/04_creditSlipOptions.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/03_creditSlips/04_creditSlipOptions.ts
@@ -104,7 +104,7 @@ describe('BO - Orders - Credit slips: Credit slip options', async () => {
       await creditSlipsPage.closeSfToolBar(page);
 
       const pageTitle = await creditSlipsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(creditSlipsPage.pageTitle);
+      expect(pageTitle).to.contains(creditSlipsPage.pageTitle);
     });
 
     it(`should change the credit slip prefix to ${prefixToEdit}`, async function () {
@@ -113,7 +113,7 @@ describe('BO - Orders - Credit slips: Credit slip options', async () => {
       await creditSlipsPage.changePrefix(page, prefixToEdit);
 
       const textMessage = await creditSlipsPage.saveCreditSlipOptions(page);
-      await expect(textMessage).to.contains(creditSlipsPage.successfulUpdateMessage);
+      expect(textMessage).to.contains(creditSlipsPage.successfulUpdateMessage);
     });
   });
 
@@ -128,7 +128,7 @@ describe('BO - Orders - Credit slips: Credit slip options', async () => {
       );
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should go to the last order page', async function () {
@@ -137,14 +137,14 @@ describe('BO - Orders - Credit slips: Credit slip options', async () => {
       await ordersPage.goToOrder(page, 1);
 
       const pageTitle = await orderPageTabListBlock.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+      expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
     });
 
     it(`should change the order status to '${OrderStatuses.shipped.name}' and check it`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateOrderStatus', baseContext);
 
       const result = await orderPageTabListBlock.modifyOrderStatus(page, OrderStatuses.shipped.name);
-      await expect(result).to.equal(OrderStatuses.shipped.name);
+      expect(result).to.equal(OrderStatuses.shipped.name);
     });
 
     it('should create a partial refund', async function () {
@@ -153,7 +153,7 @@ describe('BO - Orders - Credit slips: Credit slip options', async () => {
       await orderPageTabListBlock.clickOnPartialRefund(page);
 
       const textMessage = await orderPageProductsBlock.addPartialRefundProduct(page, 1, 1);
-      await expect(textMessage).to.contains(orderPageProductsBlock.partialRefundValidationMessage);
+      expect(textMessage).to.contains(orderPageProductsBlock.partialRefundValidationMessage);
     });
 
     it('should check the existence of the Credit slip document', async function () {
@@ -161,7 +161,7 @@ describe('BO - Orders - Credit slips: Credit slip options', async () => {
 
       // Get document name
       const documentType = await orderPageTabListBlock.getDocumentType(page, 4);
-      await expect(documentType).to.be.equal('Credit slip');
+      expect(documentType).to.be.equal('Credit slip');
     });
 
     it(`should check that the credit slip file name contain the prefix '${prefixToEdit}'`, async function () {
@@ -184,7 +184,7 @@ describe('BO - Orders - Credit slips: Credit slip options', async () => {
       );
 
       const pageTitle = await creditSlipsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(creditSlipsPage.pageTitle);
+      expect(pageTitle).to.contains(creditSlipsPage.pageTitle);
     });
 
     it('should delete the credit slip prefix', async function () {
@@ -193,7 +193,7 @@ describe('BO - Orders - Credit slips: Credit slip options', async () => {
       await creditSlipsPage.deletePrefix(page);
 
       const textMessage = await creditSlipsPage.saveCreditSlipOptions(page);
-      await expect(textMessage).to.contains(creditSlipsPage.successfulUpdateMessage);
+      expect(textMessage).to.contains(creditSlipsPage.successfulUpdateMessage);
     });
   });
 
@@ -208,7 +208,7 @@ describe('BO - Orders - Credit slips: Credit slip options', async () => {
       );
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should go to the first order page', async function () {
@@ -217,7 +217,7 @@ describe('BO - Orders - Credit slips: Credit slip options', async () => {
       await ordersPage.goToOrder(page, 1);
 
       const pageTitle = await orderPageTabListBlock.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+      expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
     });
 
     it('should check the credit slip file name', async function () {
diff --git a/tests/UI/campaigns/functional/BO/02_orders/04_deliverySlips/01_generateDeliverySlipByDate.ts b/tests/UI/campaigns/functional/BO/02_orders/04_deliverySlips/01_generateDeliverySlipByDate.ts
index 1fd3a176d8688..c30a49645c9cb 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/04_deliverySlips/01_generateDeliverySlipByDate.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/04_deliverySlips/01_generateDeliverySlipByDate.ts
@@ -58,7 +58,7 @@ describe('BO - Orders - Delivery slips : Generate Delivery slip file by date', a
       await ordersPage.closeSfToolBar(page);
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should go to the last order page', async function () {
@@ -67,21 +67,21 @@ describe('BO - Orders - Delivery slips : Generate Delivery slip file by date', a
       await ordersPage.goToOrder(page, 1);
 
       const pageTitle = await orderPageTabListBlock.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+      expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
     });
 
     it(`should change the order status to '${OrderStatuses.shipped.name}' and check it`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateOrderStatus', baseContext);
 
       const result = await orderPageTabListBlock.modifyOrderStatus(page, OrderStatuses.shipped.name);
-      await expect(result).to.equal(OrderStatuses.shipped.name);
+      expect(result).to.equal(OrderStatuses.shipped.name);
     });
 
     it('should check the delivery slip document name', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkDocumentName', baseContext);
 
       const documentType = await orderPageTabListBlock.getDocumentType(page, 3);
-      await expect(documentType).to.be.equal('Delivery slip');
+      expect(documentType).to.be.equal('Delivery slip');
     });
   });
 
@@ -96,7 +96,7 @@ describe('BO - Orders - Delivery slips : Generate Delivery slip file by date', a
       );
 
       const pageTitle = await deliverySlipsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(deliverySlipsPage.pageTitle);
+      expect(pageTitle).to.contains(deliverySlipsPage.pageTitle);
     });
 
     it('should generate PDF file by date and check the file existence', async function () {
@@ -106,7 +106,7 @@ describe('BO - Orders - Delivery slips : Generate Delivery slip file by date', a
       const filePath = await deliverySlipsPage.generatePDFByDateAndDownload(page);
 
       const exist = await files.doesFileExist(filePath);
-      await expect(exist).to.be.true;
+      expect(exist).to.eq(true);
     });
 
     it('should check the error message when there is no delivery slip at the entered date', async function () {
@@ -114,7 +114,7 @@ describe('BO - Orders - Delivery slips : Generate Delivery slip file by date', a
 
       // Generate delivery slips and get error message
       const textMessage = await deliverySlipsPage.generatePDFByDateAndFail(page, futureDate, futureDate);
-      await expect(textMessage).to.equal(deliverySlipsPage.errorMessageWhenGenerateFileByDate);
+      expect(textMessage).to.equal(deliverySlipsPage.errorMessageWhenGenerateFileByDate);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/02_orders/04_deliverySlips/02_deliverySlipOptions/01_deliverySlipPrefix.ts b/tests/UI/campaigns/functional/BO/02_orders/04_deliverySlips/02_deliverySlipOptions/01_deliverySlipPrefix.ts
index 049d009db45f9..8536929daf369 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/04_deliverySlips/02_deliverySlipOptions/01_deliverySlipPrefix.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/04_deliverySlips/02_deliverySlipOptions/01_deliverySlipPrefix.ts
@@ -60,7 +60,7 @@ describe('BO - Orders - Delivery slips : Update delivery slip prefix and check t
       await deliverySlipsPage.closeSfToolBar(page);
 
       const pageTitle = await deliverySlipsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(deliverySlipsPage.pageTitle);
+      expect(pageTitle).to.contains(deliverySlipsPage.pageTitle);
     });
 
     it(`should update the delivery slip prefix to ${deliverySlipData.prefix}`, async function () {
@@ -69,7 +69,7 @@ describe('BO - Orders - Delivery slips : Update delivery slip prefix and check t
       await deliverySlipsPage.changePrefix(page, deliverySlipData.prefix);
 
       const textMessage = await deliverySlipsPage.saveDeliverySlipOptions(page);
-      await expect(textMessage).to.contains(deliverySlipsPage.successfulUpdateMessage);
+      expect(textMessage).to.contains(deliverySlipsPage.successfulUpdateMessage);
     });
   });
 
@@ -84,7 +84,7 @@ describe('BO - Orders - Delivery slips : Update delivery slip prefix and check t
       );
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should go to the first order page', async function () {
@@ -93,14 +93,14 @@ describe('BO - Orders - Delivery slips : Update delivery slip prefix and check t
       await ordersPage.goToOrder(page, 1);
 
       const pageTitle = await orderPageTabListBlock.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+      expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
     });
 
     it(`should change the order status to '${OrderStatuses.shipped.name}' and check it`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateOrderStatus', baseContext);
 
       const result = await orderPageTabListBlock.modifyOrderStatus(page, OrderStatuses.shipped.name);
-      await expect(result).to.equal(OrderStatuses.shipped.name);
+      expect(result).to.equal(OrderStatuses.shipped.name);
     });
 
     it(`should check that the delivery slip file name contain '${deliverySlipData.prefix}'`, async function () {
@@ -124,7 +124,7 @@ describe('BO - Orders - Delivery slips : Update delivery slip prefix and check t
       await deliverySlipsPage.closeSfToolBar(page);
 
       const pageTitle = await deliverySlipsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(deliverySlipsPage.pageTitle);
+      expect(pageTitle).to.contains(deliverySlipsPage.pageTitle);
     });
 
     it(`should update the delivery slip prefix to '${defaultPrefix}'`, async function () {
@@ -133,7 +133,7 @@ describe('BO - Orders - Delivery slips : Update delivery slip prefix and check t
       await deliverySlipsPage.changePrefix(page, defaultPrefix);
 
       const textMessage = await deliverySlipsPage.saveDeliverySlipOptions(page);
-      await expect(textMessage).to.contains(deliverySlipsPage.successfulUpdateMessage);
+      expect(textMessage).to.contains(deliverySlipsPage.successfulUpdateMessage);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/02_orders/04_deliverySlips/02_deliverySlipOptions/02_deliverySlipNumber.ts b/tests/UI/campaigns/functional/BO/02_orders/04_deliverySlips/02_deliverySlipOptions/02_deliverySlipNumber.ts
index 73ca880ba7133..9de35b7ff0b10 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/04_deliverySlips/02_deliverySlipOptions/02_deliverySlipNumber.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/04_deliverySlips/02_deliverySlipOptions/02_deliverySlipNumber.ts
@@ -80,7 +80,7 @@ describe('BO - Orders - Delivery slips : Update \'Delivery slip number\'', async
       await deliverySlipsPage.closeSfToolBar(page);
 
       const pageTitle = await deliverySlipsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(deliverySlipsPage.pageTitle);
+      expect(pageTitle).to.contains(deliverySlipsPage.pageTitle);
     });
 
     it('should change the Delivery slip number', async function () {
@@ -89,7 +89,7 @@ describe('BO - Orders - Delivery slips : Update \'Delivery slip number\'', async
       await deliverySlipsPage.changeNumber(page, deliverySlipData.number);
 
       const textMessage = await deliverySlipsPage.saveDeliverySlipOptions(page);
-      await expect(textMessage).to.contains(deliverySlipsPage.successfulUpdateMessage);
+      expect(textMessage).to.contains(deliverySlipsPage.successfulUpdateMessage);
     });
   });
 
@@ -104,7 +104,7 @@ describe('BO - Orders - Delivery slips : Update \'Delivery slip number\'', async
       );
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should go to the first order page', async function () {
@@ -113,14 +113,14 @@ describe('BO - Orders - Delivery slips : Update \'Delivery slip number\'', async
       await ordersPage.goToOrder(page, 1);
 
       const pageTitle = await orderPageTabListBlock.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+      expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
     });
 
     it(`should change the order status to '${OrderStatuses.shipped.name}'`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateOrderStatus', baseContext);
 
       const result = await orderPageTabListBlock.modifyOrderStatus(page, OrderStatuses.shipped.name);
-      await expect(result).to.equal(OrderStatuses.shipped.name);
+      expect(result).to.equal(OrderStatuses.shipped.name);
     });
 
     it('should check that the delivery slip file name contain the \'Delivery slip number\'', async function () {
diff --git a/tests/UI/campaigns/functional/BO/02_orders/04_deliverySlips/02_deliverySlipOptions/03_enableDisableProductImage.ts b/tests/UI/campaigns/functional/BO/02_orders/04_deliverySlips/02_deliverySlipOptions/03_enableDisableProductImage.ts
index e8cc679cd28af..e947fdd4d1b27 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/04_deliverySlips/02_deliverySlipOptions/03_enableDisableProductImage.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/04_deliverySlips/02_deliverySlipOptions/03_enableDisableProductImage.ts
@@ -91,7 +91,7 @@ describe('BO - Orders - Delivery slips : Enable/Disable product image', async ()
         await deliverySlipsPage.closeSfToolBar(page);
 
         const pageTitle = await deliverySlipsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(deliverySlipsPage.pageTitle);
+        expect(pageTitle).to.contains(deliverySlipsPage.pageTitle);
       });
 
       it(`should ${test.args.action} product image`, async function () {
@@ -100,7 +100,7 @@ describe('BO - Orders - Delivery slips : Enable/Disable product image', async ()
         await deliverySlipsPage.setEnableProductImage(page, test.args.enable);
 
         const textMessage = await deliverySlipsPage.saveDeliverySlipOptions(page);
-        await expect(textMessage).to.contains(deliverySlipsPage.successfulUpdateMessage);
+        expect(textMessage).to.contains(deliverySlipsPage.successfulUpdateMessage);
       });
 
       describe('Create new order in FO', async () => {
@@ -113,7 +113,7 @@ describe('BO - Orders - Delivery slips : Enable/Disable product image', async ()
           await homePage.changeLanguage(page, 'en');
 
           const isHomePage = await homePage.isHomePage(page);
-          await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+          expect(isHomePage, 'Fail to open FO home page').to.eq(true);
         });
 
         it('should go to login page', async function () {
@@ -122,7 +122,7 @@ describe('BO - Orders - Delivery slips : Enable/Disable product image', async ()
           await homePage.goToLoginPage(page);
 
           const pageTitle = await foLoginPage.getPageTitle(page);
-          await expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
+          expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
         });
 
         it('should sign in with default customer', async function () {
@@ -131,7 +131,7 @@ describe('BO - Orders - Delivery slips : Enable/Disable product image', async ()
           await foLoginPage.customerLogin(page, Customers.johnDoe);
 
           const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
-          await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+          expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
         });
 
         it('should add product to cart', async function () {
@@ -145,7 +145,7 @@ describe('BO - Orders - Delivery slips : Enable/Disable product image', async ()
           await productPage.addProductToTheCart(page);
 
           const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
-          await expect(notificationsNumber).to.be.equal(1);
+          expect(notificationsNumber).to.be.equal(1);
         });
 
         it('should go to delivery step', async function () {
@@ -156,7 +156,7 @@ describe('BO - Orders - Delivery slips : Enable/Disable product image', async ()
 
           // Address step - Go to delivery step
           const isStepAddressComplete = await checkoutPage.goToDeliveryStep(page);
-          await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+          expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
         });
 
         it('should go to payment step', async function () {
@@ -164,7 +164,7 @@ describe('BO - Orders - Delivery slips : Enable/Disable product image', async ()
 
           // Delivery step - Go to payment step
           const isStepDeliveryComplete = await checkoutPage.goToPaymentStep(page);
-          await expect(isStepDeliveryComplete, 'Step Address is not complete').to.be.true;
+          expect(isStepDeliveryComplete, 'Step Address is not complete').to.eq(true);
         });
 
         it('should choose payment method and confirm the order', async function () {
@@ -175,7 +175,7 @@ describe('BO - Orders - Delivery slips : Enable/Disable product image', async ()
 
           // Check the confirmation message
           const cardTitle = await orderConfirmationPage.getOrderConfirmationCardTitle(page);
-          await expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
+          expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
         });
 
         it('should sign out from FO', async function () {
@@ -184,7 +184,7 @@ describe('BO - Orders - Delivery slips : Enable/Disable product image', async ()
           await orderConfirmationPage.logout(page);
 
           const isCustomerConnected = await orderConfirmationPage.isCustomerConnected(page);
-          await expect(isCustomerConnected, 'Customer is connected').to.be.false;
+          expect(isCustomerConnected, 'Customer is connected').to.eq(false);
         });
 
         it('should go back to BO', async function () {
@@ -194,7 +194,7 @@ describe('BO - Orders - Delivery slips : Enable/Disable product image', async ()
           page = await orderConfirmationPage.closePage(browserContext, page, 0);
 
           const pageTitle = await deliverySlipsPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(deliverySlipsPage.pageTitle);
+          expect(pageTitle).to.contains(deliverySlipsPage.pageTitle);
         });
       });
 
@@ -209,7 +209,7 @@ describe('BO - Orders - Delivery slips : Enable/Disable product image', async ()
           );
 
           const pageTitle = await ordersPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(ordersPage.pageTitle);
+          expect(pageTitle).to.contains(ordersPage.pageTitle);
         });
 
         it('should go to the created order page', async function () {
@@ -218,14 +218,14 @@ describe('BO - Orders - Delivery slips : Enable/Disable product image', async ()
           await ordersPage.goToOrder(page, 1);
 
           const pageTitle = await orderPageTabListBlock.getPageTitle(page);
-          await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+          expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
         });
 
         it(`should change the order status to '${OrderStatuses.shipped.name}' and check it`, async function () {
           await testContext.addContextItem(this, 'testIdentifier', `updateOrderStatus${index}`, baseContext);
 
           const result = await orderPageTabListBlock.modifyOrderStatus(page, OrderStatuses.shipped.name);
-          await expect(result).to.equal(OrderStatuses.shipped.name);
+          expect(result).to.equal(OrderStatuses.shipped.name);
         });
 
         it('should download the delivery slip', async function () {
@@ -234,14 +234,14 @@ describe('BO - Orders - Delivery slips : Enable/Disable product image', async ()
           filePath = await orderPageTabListBlock.downloadDeliverySlip(page);
 
           const exist = await files.doesFileExist(filePath);
-          await expect(exist).to.be.true;
+          expect(exist).to.eq(true);
         });
 
         it(`should check that there is ${test.args.isProductImageDisplayed} in the PDF File`, async function () {
           await testContext.addContextItem(this, 'testIdentifier', `checkProductImage${index}`, baseContext);
 
           const imageNumber = await files.getImageNumberInPDF(filePath);
-          await expect(imageNumber).to.be.equal(test.args.imageNumber);
+          expect(imageNumber).to.be.equal(test.args.imageNumber);
         });
       });
     });
diff --git a/tests/UI/campaigns/functional/BO/02_orders/05_shoppingCarts/01_filterShoppingCarts.ts b/tests/UI/campaigns/functional/BO/02_orders/05_shoppingCarts/01_filterShoppingCarts.ts
index 45bcee27ad1da..ad399cb0fedc2 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/05_shoppingCarts/01_filterShoppingCarts.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/05_shoppingCarts/01_filterShoppingCarts.ts
@@ -54,14 +54,14 @@ describe('BO - Orders - Shopping carts : Filter the Shopping carts table', async
     );
 
     const pageTitle = await shoppingCartsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(shoppingCartsPage.pageTitle);
+    expect(pageTitle).to.contains(shoppingCartsPage.pageTitle);
   });
 
   it('should reset all filters and get number of shopping carts', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFiltersFirst', baseContext);
 
     numberOfShoppingCarts = await shoppingCartsPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfShoppingCarts).to.be.above(0);
+    expect(numberOfShoppingCarts).to.be.above(0);
   });
 
   it('should search the non ordered shopping carts and delete them if exist', async function () {
@@ -70,18 +70,18 @@ describe('BO - Orders - Shopping carts : Filter the Shopping carts table', async
     await shoppingCartsPage.filterTable(page, 'input', 'status', 'Non ordered');
 
     const numberOfShoppingCartsAfterFilter = await shoppingCartsPage.getNumberOfElementInGrid(page);
-    await expect(numberOfShoppingCartsAfterFilter).to.be.at.most(numberOfShoppingCarts);
+    expect(numberOfShoppingCartsAfterFilter).to.be.at.most(numberOfShoppingCarts);
 
     numberOfShoppingCarts -= numberOfShoppingCartsAfterFilter;
 
     for (let row = 1; row <= numberOfShoppingCartsAfterFilter; row++) {
       const textColumn = await shoppingCartsPage.getTextColumn(page, row, 'status');
-      await expect(textColumn).to.contains('Non ordered');
+      expect(textColumn).to.contains('Non ordered');
     }
 
     if (numberOfShoppingCartsAfterFilter > 0) {
       const deleteTextResult = await shoppingCartsPage.bulkDeleteShoppingCarts(page);
-      await expect(deleteTextResult).to.be.contains(shoppingCartsPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.contains(shoppingCartsPage.successfulMultiDeleteMessage);
     }
   });
 
@@ -89,7 +89,7 @@ describe('BO - Orders - Shopping carts : Filter the Shopping carts table', async
     await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDeleteNonOrderedCarts', baseContext);
 
     const numberOfShoppingCartsAfterReset = await shoppingCartsPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfShoppingCartsAfterReset).to.be.equal(numberOfShoppingCarts);
+    expect(numberOfShoppingCartsAfterReset).to.be.equal(numberOfShoppingCarts);
   });
 
   it('should change pagination to 300 items per page', async function () {
@@ -101,7 +101,7 @@ describe('BO - Orders - Shopping carts : Filter the Shopping carts table', async
       paginationNumber = await shoppingCartsPage.selectPaginationLimit(page, 300);
     }
 
-    await expect(paginationNumber).to.equal('1');
+    expect(paginationNumber).to.equal('1');
   });
 
   const tests = [
@@ -164,15 +164,15 @@ describe('BO - Orders - Shopping carts : Filter the Shopping carts table', async
       );
 
       const numberOfShoppingCartsAfterFilter = await shoppingCartsPage.getNumberOfElementInGrid(page);
-      await expect(numberOfShoppingCartsAfterFilter).to.be.at.most(numberOfShoppingCarts);
+      expect(numberOfShoppingCartsAfterFilter).to.be.at.most(numberOfShoppingCarts);
 
       for (let row = 1; row <= numberOfShoppingCartsAfterFilter; row++) {
         const textColumn = await shoppingCartsPage.getTextColumn(page, row, test.args.filterBy);
 
         if (test.args.filterBy === 'id_guest') {
-          await expect(textColumn).to.equal(test.args.filterValue === '1' ? 'Yes' : 'No');
+          expect(textColumn).to.equal(test.args.filterValue === '1' ? 'Yes' : 'No');
         } else {
-          await expect(textColumn).to.contains(test.args.filterValue);
+          expect(textColumn).to.contains(test.args.filterValue);
         }
       }
     });
@@ -181,7 +181,7 @@ describe('BO - Orders - Shopping carts : Filter the Shopping carts table', async
       await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}Reset`, baseContext);
 
       const numberOfShoppingCartsAfterReset = await shoppingCartsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfShoppingCartsAfterReset).to.be.equal(numberOfShoppingCarts);
+      expect(numberOfShoppingCartsAfterReset).to.be.equal(numberOfShoppingCarts);
     });
   });
 
@@ -193,11 +193,11 @@ describe('BO - Orders - Shopping carts : Filter the Shopping carts table', async
 
     // Check number of element
     const numberOfShoppingCartsAfterFilter = await shoppingCartsPage.getNumberOfElementInGrid(page);
-    await expect(numberOfShoppingCartsAfterFilter).to.be.at.most(numberOfShoppingCarts);
+    expect(numberOfShoppingCartsAfterFilter).to.be.at.most(numberOfShoppingCarts);
 
     for (let row = 1; row <= numberOfShoppingCartsAfterFilter; row++) {
       const textColumn = await shoppingCartsPage.getTextColumn(page, row, 'date');
-      await expect(textColumn).to.contains(todayDate);
+      expect(textColumn).to.contains(todayDate);
     }
   });
 
@@ -205,6 +205,6 @@ describe('BO - Orders - Shopping carts : Filter the Shopping carts table', async
     await testContext.addContextItem(this, 'testIdentifier', 'resetAfterFilterDate', baseContext);
 
     const numberOfShoppingCartsAfterReset = await shoppingCartsPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfShoppingCartsAfterReset).to.be.equal(numberOfShoppingCarts);
+    expect(numberOfShoppingCartsAfterReset).to.be.equal(numberOfShoppingCarts);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/02_orders/05_shoppingCarts/02_sortAndPagination.ts b/tests/UI/campaigns/functional/BO/02_orders/05_shoppingCarts/02_sortAndPagination.ts
index 2d6a25acaa8f4..216cf89e4d343 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/05_shoppingCarts/02_sortAndPagination.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/05_shoppingCarts/02_sortAndPagination.ts
@@ -86,7 +86,7 @@ describe('BO - Orders - Shopping carts : Sort and pagination shopping carts', as
       );
 
       const pageTitle = await shoppingCartsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(shoppingCartsPage.pageTitle);
+      expect(pageTitle).to.contains(shoppingCartsPage.pageTitle);
     });
 
     it('should change the items number to 20 per page', async function () {
@@ -126,7 +126,7 @@ describe('BO - Orders - Shopping carts : Sort and pagination shopping carts', as
       await shoppingCartsPage.filterTable(page, 'input', 'c!lastname', 'guest');
 
       const textColumn = await shoppingCartsPage.getTextColumn(page, 1, 'c!lastname');
-      await expect(textColumn).to.contains(customerData.lastName);
+      expect(textColumn).to.contains(customerData.lastName);
     });
 
     const sortTests = [
@@ -199,17 +199,17 @@ describe('BO - Orders - Shopping carts : Sort and pagination shopping carts', as
           const expectedResult = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
           if (test.args.sortDirection === 'up') {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+            expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+            expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
         } else {
           const expectedResult: string[] = await basicHelper.sortArray(nonSortedTable);
 
           if (test.args.sortDirection === 'up') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         }
       });
@@ -219,7 +219,7 @@ describe('BO - Orders - Shopping carts : Sort and pagination shopping carts', as
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterSort', baseContext);
 
       const numberOfShoppingCartsAfterReset = await shoppingCartsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfShoppingCartsAfterReset).to.be.above(1);
+      expect(numberOfShoppingCartsAfterReset).to.be.above(1);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/02_orders/05_shoppingCarts/03_viewCarts.ts b/tests/UI/campaigns/functional/BO/02_orders/05_shoppingCarts/03_viewCarts.ts
index 368ca8f88027c..7a84637f20e00 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/05_shoppingCarts/03_viewCarts.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/05_shoppingCarts/03_viewCarts.ts
@@ -97,14 +97,14 @@ describe('BO - Orders - Shopping carts : View carts', async () => {
       );
 
       const pageTitle = await shoppingCartsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(shoppingCartsPage.pageTitle);
+      expect(pageTitle).to.contains(shoppingCartsPage.pageTitle);
     });
 
     it('should reset all filters and get number of shopping carts', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFiltersFirst', baseContext);
 
       numberOfShoppingCarts = await shoppingCartsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfShoppingCarts).to.be.above(0);
+      expect(numberOfShoppingCarts).to.be.above(0);
     });
 
     it('should search the non ordered shopping cart', async function () {
@@ -113,10 +113,10 @@ describe('BO - Orders - Shopping carts : View carts', async () => {
       await shoppingCartsPage.filterTable(page, 'input', 'status', 'Non ordered');
 
       const numberOfShoppingCartsAfterFilter = await shoppingCartsPage.getNumberOfElementInGrid(page);
-      await expect(numberOfShoppingCartsAfterFilter).to.equal(1);
+      expect(numberOfShoppingCartsAfterFilter).to.equal(1);
 
       const textColumn = await shoppingCartsPage.getTextColumn(page, 1, 'status');
-      await expect(textColumn).to.contains('Non ordered');
+      expect(textColumn).to.contains('Non ordered');
     });
 
     it('should go the Shopping Cart details page', async function () {
@@ -126,14 +126,14 @@ describe('BO - Orders - Shopping carts : View carts', async () => {
       await shoppingCartsPage.goToViewPage(page, 1);
 
       const pageTitle = await shoppingCartViewPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(shoppingCartViewPage.pageTitle(lastShoppingCartId));
+      expect(pageTitle).to.contains(shoppingCartViewPage.pageTitle(lastShoppingCartId));
     });
 
     it('should check the cart total', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkCardTotal', baseContext);
 
       const cartTotal = await shoppingCartViewPage.getCartTotal(page);
-      await expect(cartTotal.toString())
+      expect(cartTotal.toString())
         .to.be.equal((Products.demo_1.finalPrice).toFixed(2));
     });
 
@@ -141,7 +141,7 @@ describe('BO - Orders - Shopping carts : View carts', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'checkCustomerInformationBlock1', baseContext);
 
       const customerInformation = await shoppingCartViewPage.getCustomerInformation(page);
-      await expect(customerInformation)
+      expect(customerInformation)
         .to.contains(`${customerData.socialTitle} ${customerData.firstName} ${customerData.lastName}`)
         .and.to.contains(customerData.email)
         .and.to.contains(todayCartFormat);
@@ -151,10 +151,10 @@ describe('BO - Orders - Shopping carts : View carts', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'checkOrderInformationBlock1', baseContext);
 
       const orderInformation = await shoppingCartViewPage.getOrderInformation(page);
-      await expect(orderInformation).to.contains('No order was created from this cart.');
+      expect(orderInformation).to.contains('No order was created from this cart.');
 
       const hasButtonCreateOrderFromCart = await shoppingCartViewPage.hasButtonCreateOrderFromCart(page);
-      await expect(hasButtonCreateOrderFromCart).to.be.true;
+      expect(hasButtonCreateOrderFromCart).to.eq(true);
     });
 
     [
@@ -182,9 +182,9 @@ describe('BO - Orders - Shopping carts : View carts', async () => {
         );
 
         if (test.args.columnName === 'title') {
-          await expect(cartSummary).to.contains(test.args.result).and.to.contains(test.args.result_2);
+          expect(cartSummary).to.contains(test.args.result).and.to.contains(test.args.result_2);
         }
-        await expect(cartSummary).to.contains(test.args.result);
+        expect(cartSummary).to.contains(test.args.result);
       });
     });
 
@@ -194,7 +194,7 @@ describe('BO - Orders - Shopping carts : View carts', async () => {
       await shoppingCartViewPage.createOrderFromThisCart(page);
 
       const pageTitle = await addOrderPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addOrderPage.pageTitle);
+      expect(pageTitle).to.contains(addOrderPage.pageTitle);
     });
 
     it('should fill the order and create it', async function () {
@@ -208,10 +208,10 @@ describe('BO - Orders - Shopping carts : View carts', async () => {
       await addOrderPage.clickOnCreateOrderButton(page);
 
       const pageTitle = await orderPageProductsBlock.getPageTitle(page);
-      await expect(pageTitle).to.contain(orderPageProductsBlock.pageTitle);
+      expect(pageTitle).to.contain(orderPageProductsBlock.pageTitle);
 
       orderId = await orderPageProductsBlock.getOrderID(page);
-      await expect(orderId).to.be.gt(0);
+      expect(orderId).to.be.gt(0);
     });
 
     it('should go to \'Orders > Shopping carts\' page', async function () {
@@ -224,7 +224,7 @@ describe('BO - Orders - Shopping carts : View carts', async () => {
       );
 
       const pageTitle = await shoppingCartsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(shoppingCartsPage.pageTitle);
+      expect(pageTitle).to.contains(shoppingCartsPage.pageTitle);
     });
 
     it('should search a shopping cart with a specific order Id', async function () {
@@ -233,10 +233,10 @@ describe('BO - Orders - Shopping carts : View carts', async () => {
       await shoppingCartsPage.filterTable(page, 'input', 'status', orderId.toString());
 
       const numberOfShoppingCartsAfterFilter = await shoppingCartsPage.getNumberOfElementInGrid(page);
-      await expect(numberOfShoppingCartsAfterFilter).to.be.at.equal(1);
+      expect(numberOfShoppingCartsAfterFilter).to.be.at.equal(1);
 
       const textColumn = await shoppingCartsPage.getTextColumn(page, 1, 'status');
-      await expect(textColumn).to.contains(orderId);
+      expect(textColumn).to.contains(orderId);
     });
 
     it('should go the Shopping Cart details page', async function () {
@@ -246,14 +246,14 @@ describe('BO - Orders - Shopping carts : View carts', async () => {
       await shoppingCartsPage.goToViewPage(page, 1);
 
       const pageTitle = await shoppingCartViewPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(shoppingCartViewPage.pageTitle(lastShoppingCartId));
+      expect(pageTitle).to.contains(shoppingCartViewPage.pageTitle(lastShoppingCartId));
     });
 
     it('should check the customer Information Block', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkCustomerInformationBlock2', baseContext);
 
       const customerInformation = await shoppingCartViewPage.getCustomerInformation(page);
-      await expect(customerInformation)
+      expect(customerInformation)
         .to.contains(`${customerData.socialTitle} ${customerData.firstName} ${customerData.lastName}`)
         .and.to.contains(customerData.email)
         .and.to.contains(todayCartFormat);
@@ -263,10 +263,10 @@ describe('BO - Orders - Shopping carts : View carts', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'checkOrderInformationBlock2', baseContext);
 
       const orderInformation = await shoppingCartViewPage.getOrderInformation(page);
-      await expect(orderInformation).to.contains(`Order #${orderId}`);
+      expect(orderInformation).to.contains(`Order #${orderId}`);
 
       const hasButtonCreateOrderFromCart = await shoppingCartViewPage.hasButtonCreateOrderFromCart(page);
-      await expect(hasButtonCreateOrderFromCart).to.be.false;
+      expect(hasButtonCreateOrderFromCart).to.eq(false);
     });
 
     [
@@ -294,9 +294,9 @@ describe('BO - Orders - Shopping carts : View carts', async () => {
         );
 
         if (test.args.columnName === 'title') {
-          await expect(cartSummary).to.contains(test.args.result).and.to.contains(test.args.result_2);
+          expect(cartSummary).to.contains(test.args.result).and.to.contains(test.args.result_2);
         }
-        await expect(cartSummary).to.contains(test.args.result);
+        expect(cartSummary).to.contains(test.args.result);
       });
     });
 
@@ -306,10 +306,10 @@ describe('BO - Orders - Shopping carts : View carts', async () => {
       await shoppingCartViewPage.goToOrderPage(page);
 
       const pageTitle = await orderPageProductsBlock.getPageTitle(page);
-      await expect(pageTitle).to.contain(orderPageProductsBlock.pageTitle);
+      expect(pageTitle).to.contain(orderPageProductsBlock.pageTitle);
 
       const orderDetailId = await orderPageProductsBlock.getOrderID(page);
-      await expect(orderDetailId).to.be.eq(orderId);
+      expect(orderDetailId).to.be.eq(orderId);
     });
 
     it('should go to \'Orders > Shopping carts\' page', async function () {
@@ -322,14 +322,14 @@ describe('BO - Orders - Shopping carts : View carts', async () => {
       );
 
       const pageTitle = await shoppingCartsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(shoppingCartsPage.pageTitle);
+      expect(pageTitle).to.contains(shoppingCartsPage.pageTitle);
     });
 
     it('should reset all filters and check number of shopping carts', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilters', baseContext);
 
       const numberOfShoppingCartsAfterReset = await shoppingCartsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfShoppingCartsAfterReset).to.be.above(0);
+      expect(numberOfShoppingCartsAfterReset).to.be.above(0);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/02_orders/05_shoppingCarts/04_exportCarts.ts b/tests/UI/campaigns/functional/BO/02_orders/05_shoppingCarts/04_exportCarts.ts
index 4aa2877303b17..ff951c487771d 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/05_shoppingCarts/04_exportCarts.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/05_shoppingCarts/04_exportCarts.ts
@@ -52,7 +52,7 @@ describe('BO - Orders - Shopping carts: Export carts', async () => {
     );
 
     const pageTitle = await shoppingCartsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(shoppingCartsPage.pageTitle);
+    expect(pageTitle).to.contains(shoppingCartsPage.pageTitle);
   });
 
   it('should change the items number to 300 per page', async function () {
@@ -68,7 +68,7 @@ describe('BO - Orders - Shopping carts: Export carts', async () => {
     filePath = await shoppingCartsPage.exportDataToCsv(page);
 
     const doesFileExist = await files.doesFileExist(filePath, 5000);
-    await expect(doesFileExist, 'Export of data has failed').to.be.true;
+    expect(doesFileExist, 'Export of data has failed').to.eq(true);
   });
 
   it('should check existence of carts data in csv file', async function () {
@@ -81,7 +81,7 @@ describe('BO - Orders - Shopping carts: Export carts', async () => {
     for (let row = 1; row <= numberOfOrders; row++) {
       const cartInCsvFormat = await shoppingCartsPage.getCartInCsvFormat(page, row);
       const textExist = await files.isTextInFile(filePath, cartInCsvFormat, true, true);
-      await expect(textExist, `${cartInCsvFormat} was not found in the file`).to.be.true;
+      expect(textExist, `${cartInCsvFormat} was not found in the file`).to.eq(true);
     }
   });
 
diff --git a/tests/UI/campaigns/functional/BO/02_orders/05_shoppingCarts/05_deleteAbandonedCarts.ts b/tests/UI/campaigns/functional/BO/02_orders/05_shoppingCarts/05_deleteAbandonedCarts.ts
index 68cd1e764ca94..cddd3100bc103 100644
--- a/tests/UI/campaigns/functional/BO/02_orders/05_shoppingCarts/05_deleteAbandonedCarts.ts
+++ b/tests/UI/campaigns/functional/BO/02_orders/05_shoppingCarts/05_deleteAbandonedCarts.ts
@@ -72,14 +72,14 @@ describe('BO - Orders : Create shopping cart and delete abandoned one', async ()
       );
 
       const pageTitle = await shoppingCartsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(shoppingCartsPage.pageTitle);
+      expect(pageTitle).to.contains(shoppingCartsPage.pageTitle);
     });
 
     it('should reset all filters and get number of shopping carts', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFiltersFirst', baseContext);
 
       numberOfShoppingCarts = await shoppingCartsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfShoppingCarts).to.be.above(0);
+      expect(numberOfShoppingCarts).to.be.above(0);
     });
 
     it('should search the non ordered shopping carts', async function () {
@@ -88,13 +88,13 @@ describe('BO - Orders : Create shopping cart and delete abandoned one', async ()
       await shoppingCartsPage.filterTable(page, 'input', 'status', 'Non ordered');
 
       numberOfShoppingCartsAfterFilter = await shoppingCartsPage.getNumberOfElementInGrid(page);
-      await expect(numberOfShoppingCartsAfterFilter).to.be.at.most(numberOfShoppingCarts);
+      expect(numberOfShoppingCartsAfterFilter).to.be.at.most(numberOfShoppingCarts);
 
       numberOfShoppingCarts -= numberOfShoppingCartsAfterFilter;
 
       for (let row = 1; row <= numberOfShoppingCartsAfterFilter; row++) {
         const textColumn = await shoppingCartsPage.getTextColumn(page, row, 'status');
-        await expect(textColumn).to.contains('Non ordered');
+        expect(textColumn).to.contains('Non ordered');
       }
     });
 
@@ -102,14 +102,14 @@ describe('BO - Orders : Create shopping cart and delete abandoned one', async ()
       await testContext.addContextItem(this, 'testIdentifier', 'deleteNonOrderedShoppingCarts', baseContext);
 
       const deleteTextResult = await shoppingCartsPage.bulkDeleteShoppingCarts(page);
-      await expect(deleteTextResult).to.be.contains(shoppingCartsPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.contains(shoppingCartsPage.successfulMultiDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDeleteNonOrderedCarts', baseContext);
 
       const numberOfShoppingCartsAfterReset = await shoppingCartsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfShoppingCartsAfterReset).to.be.equal(numberOfShoppingCarts);
+      expect(numberOfShoppingCartsAfterReset).to.be.equal(numberOfShoppingCarts);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/01_products/01_filterAndQuickEditProducts.ts b/tests/UI/campaigns/functional/BO/03_catalog/01_products/01_filterAndQuickEditProducts.ts
index 9374316b11e71..278a06f873740 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/01_products/01_filterAndQuickEditProducts.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/01_products/01_filterAndQuickEditProducts.ts
@@ -58,14 +58,14 @@ describe('BO - Catalog - Products : Filter and quick edit Products table', async
       await productsPage.closeSfToolBar(page);
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should reset all filters and get number of products', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFirst', baseContext);
 
       numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProducts).to.be.above(0);
+      expect(numberOfProducts).to.be.above(0);
     });
   });
 
@@ -150,19 +150,19 @@ describe('BO - Catalog - Products : Filter and quick edit Products table', async
         );
 
         const numberOfProductsAfterFilter = await productsPage.getNumberOfProductsFromList(page);
-        await expect(numberOfProductsAfterFilter).to.within(0, numberOfProducts);
+        expect(numberOfProductsAfterFilter).to.within(0, numberOfProducts);
 
         for (let i = 1; i <= numberOfProductsAfterFilter; i++) {
           if (test.args.filterBy === 'active') {
             const productStatus = await productsPage.getProductStatusFromList(page, i);
-            await expect(productStatus).to.equal(test.args.filterValue === '1');
+            expect(productStatus).to.equal(test.args.filterValue === '1');
           } else {
             const textColumn = await productsPage.getTextColumn(page, test.args.filterBy, i);
 
             if (typeof test.args.filterValue === 'object') {
-              await expect(parseFloat(textColumn)).to.within(test.args.filterValue.min, test.args.filterValue.max);
+              expect(parseFloat(textColumn)).to.within(test.args.filterValue.min, test.args.filterValue.max);
             } else {
-              await expect(textColumn).to.contains(test.args.filterValue);
+              expect(textColumn).to.contains(test.args.filterValue);
             }
           }
         }
@@ -172,7 +172,7 @@ describe('BO - Catalog - Products : Filter and quick edit Products table', async
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}Reset`, baseContext);
 
         const numberOfProductsAfterReset = await productsPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfProductsAfterReset).to.equal(numberOfProducts);
+        expect(numberOfProductsAfterReset).to.equal(numberOfProducts);
       });
     });
   });
@@ -185,11 +185,11 @@ describe('BO - Catalog - Products : Filter and quick edit Products table', async
       await productsPage.filterProducts(page, 'name', Products.demo_3.name);
 
       const numberOfProductsAfterFilter = await productsPage.getNumberOfProductsFromList(page);
-      await expect(numberOfProductsAfterFilter).to.be.below(numberOfProducts);
+      expect(numberOfProductsAfterFilter).to.be.below(numberOfProducts);
 
       for (let i = 1; i <= numberOfProductsAfterFilter; i++) {
         const textColumn = await productsPage.getProductNameFromList(page, i);
-        await expect(textColumn).to.contains(Products.demo_3.name);
+        expect(textColumn).to.contains(Products.demo_3.name);
       }
     });
 
@@ -210,14 +210,14 @@ describe('BO - Catalog - Products : Filter and quick edit Products table', async
           const resultMessage = await productsPage.getAlertSuccessBlockParagraphContent(page);
 
           if (productStatus.args.enable) {
-            await expect(resultMessage).to.contains(productsPage.productActivatedSuccessfulMessage);
+            expect(resultMessage).to.contains(productsPage.productActivatedSuccessfulMessage);
           } else {
-            await expect(resultMessage).to.contains(productsPage.productDeactivatedSuccessfulMessage);
+            expect(resultMessage).to.contains(productsPage.productDeactivatedSuccessfulMessage);
           }
         }
 
         const currentStatus = await productsPage.getProductStatusFromList(page, 1);
-        await expect(currentStatus).to.be.equal(productStatus.args.enable);
+        expect(currentStatus).to.be.equal(productStatus.args.enable);
       });
     });
 
@@ -225,7 +225,7 @@ describe('BO - Catalog - Products : Filter and quick edit Products table', async
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilter', baseContext);
 
       const numberOfProductsAfterReset = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProductsAfterReset).to.equal(numberOfProducts);
+      expect(numberOfProductsAfterReset).to.equal(numberOfProducts);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/01_products/02_paginationAndSortProducts.ts b/tests/UI/campaigns/functional/BO/03_catalog/01_products/02_paginationAndSortProducts.ts
index c79cf7363f6ff..f9a563b4b5a1d 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/01_products/02_paginationAndSortProducts.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/01_products/02_paginationAndSortProducts.ts
@@ -64,14 +64,14 @@ describe('BO - Catalog - Products : Pagination and sort Products table', async (
       await productsPage.closeSfToolBar(page);
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should reset all filters and get number of products', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFirst', baseContext);
 
       numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProducts).to.be.above(0);
+      expect(numberOfProducts).to.be.above(0);
     });
   });
 
@@ -169,17 +169,17 @@ describe('BO - Catalog - Products : Pagination and sort Products table', async (
           const expectedResult: number[] = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+            expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+            expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
         } else {
           const expectedResult: string[] = await basicHelper.sortArray(nonSortedTable);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         }
       });
@@ -202,14 +202,14 @@ describe('BO - Catalog - Products : Pagination and sort Products table', async (
         await productsPage.goToAddProductPage(page);
 
         const pageTitle = await addProductPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addProductPage.pageTitle);
+        expect(pageTitle).to.contains(addProductPage.pageTitle);
       });
 
       it(`should create product n°${index + 1}`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `createProduct${index}`, baseContext);
 
         const createProductMessage = await addProductPage.createEditBasicProduct(page, createProductData);
-        await expect(createProductMessage).to.equal(addProductPage.settingUpdatedMessage);
+        expect(createProductMessage).to.equal(addProductPage.settingUpdatedMessage);
       });
 
       it('should go to catalog page', async function () {
@@ -218,7 +218,7 @@ describe('BO - Catalog - Products : Pagination and sort Products table', async (
         await addProductPage.goToCatalogPage(page);
 
         const pageTitle = await productsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(productsPage.pageTitle);
+        expect(pageTitle).to.contains(productsPage.pageTitle);
       });
     });
   });
@@ -263,14 +263,14 @@ describe('BO - Catalog - Products : Pagination and sort Products table', async (
       await productsPage.filterProducts(page, 'name', 'todelete');
 
       const numberOfProductsAfterFilter = await productsPage.getNumberOfProductsFromList(page);
-      await expect(numberOfProductsAfterFilter).to.equal(3);
+      expect(numberOfProductsAfterFilter).to.equal(3);
     });
 
     it('should delete products by bulk actions', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDelete', baseContext);
 
       const deleteTextResult = await productsPage.deleteAllProductsWithBulkActions(page);
-      await expect(deleteTextResult).to.equal(productsPage.productMultiDeletedSuccessfulMessage);
+      expect(deleteTextResult).to.equal(productsPage.productMultiDeletedSuccessfulMessage);
     });
 
     it('should reset all filters', async function () {
@@ -279,7 +279,7 @@ describe('BO - Catalog - Products : Pagination and sort Products table', async (
       await productsPage.resetFilterCategory(page);
 
       const numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProducts).to.be.above(0);
+      expect(numberOfProducts).to.be.above(0);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/01_products/03_helpCard.ts b/tests/UI/campaigns/functional/BO/03_catalog/01_products/03_helpCard.ts
index 9a82769e426c7..fe62a06603c1f 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/01_products/03_helpCard.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/01_products/03_helpCard.ts
@@ -43,23 +43,23 @@ describe('BO - Catalog - Products : Help card in products page', async () => {
     await productsPage.closeSfToolBar(page);
 
     const pageTitle = await productsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(productsPage.pageTitle);
+    expect(pageTitle).to.contains(productsPage.pageTitle);
   });
 
   it('should open the help side bar and check the document language', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'openHelpSidebar', baseContext);
 
     const isHelpSidebarVisible = await productsPage.openHelpSideBar(page);
-    await expect(isHelpSidebarVisible).to.be.true;
+    expect(isHelpSidebarVisible).to.eq(true);
 
     const documentURL = await productsPage.getHelpDocumentURL(page);
-    await expect(documentURL).to.contains('country=en');
+    expect(documentURL).to.contains('country=en');
   });
 
   it('should close the help side bar', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'closeHelpSidebar', baseContext);
 
     const isHelpSidebarClosed = await productsPage.closeHelpSideBar(page);
-    await expect(isHelpSidebarClosed).to.be.true;
+    expect(isHelpSidebarClosed).to.eq(true);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/01_products/04_previewProductFromList.ts b/tests/UI/campaigns/functional/BO/03_catalog/01_products/04_previewProductFromList.ts
index 89bf68e4e0388..e62ecc42f2669 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/01_products/04_previewProductFromList.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/01_products/04_previewProductFromList.ts
@@ -66,14 +66,14 @@ describe('BO - Catalog - Products : Preview product from list', async () => {
       await productsPage.closeSfToolBar(page);
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should reset all filters and get number of products', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFirst', baseContext);
 
       numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProducts).to.be.above(0);
+      expect(numberOfProducts).to.be.above(0);
     });
 
     it(`should filter product by name '${Products.demo_5.name}'`, async function () {
@@ -82,7 +82,7 @@ describe('BO - Catalog - Products : Preview product from list', async () => {
       await productsPage.filterProducts(page, 'name', Products.demo_5.name);
 
       const textColumn = await productsPage.getProductNameFromList(page, 1);
-      await expect(textColumn).to.contains(Products.demo_5.name);
+      expect(textColumn).to.contains(Products.demo_5.name);
     });
 
     it('should preview product', async function () {
@@ -93,7 +93,7 @@ describe('BO - Catalog - Products : Preview product from list', async () => {
 
       // Check product information in FO
       const productInformation = await foProductPage.getProductInformation(page);
-      await expect(productInformation.name).to.equal(Products.demo_5.name);
+      expect(productInformation.name).to.equal(Products.demo_5.name);
     });
 
     it('should close the current page', async function () {
@@ -102,14 +102,14 @@ describe('BO - Catalog - Products : Preview product from list', async () => {
       page = await foProductPage.closePage(browserContext, page, 0);
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should reset all filters and get number of products', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetSecond', baseContext);
 
       numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProducts).to.be.above(0);
+      expect(numberOfProducts).to.be.above(0);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/01_products/05_duplicateProductFromList.ts b/tests/UI/campaigns/functional/BO/03_catalog/01_products/05_duplicateProductFromList.ts
index dacaa0f97217f..cbfb654c637ab 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/01_products/05_duplicateProductFromList.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/01_products/05_duplicateProductFromList.ts
@@ -65,14 +65,14 @@ describe('BO - Catalog - Products : Duplicate product from list', async () => {
       await productsPage.closeSfToolBar(page);
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should reset all filters and get number of products', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFirst', baseContext);
 
       numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProducts).to.be.above(0);
+      expect(numberOfProducts).to.be.above(0);
     });
 
     it(`should filter product by name '${Products.demo_5.name}'`, async function () {
@@ -81,7 +81,7 @@ describe('BO - Catalog - Products : Duplicate product from list', async () => {
       await productsPage.filterProducts(page, 'name', Products.demo_5.name);
 
       const textColumn = await productsPage.getProductNameFromList(page, 1);
-      await expect(textColumn).to.contains(Products.demo_5.name);
+      expect(textColumn).to.contains(Products.demo_5.name);
     });
 
     it('should duplicate product', async function () {
@@ -89,28 +89,28 @@ describe('BO - Catalog - Products : Duplicate product from list', async () => {
 
       // Duplicate product from list
       const textResult = await productsPage.duplicateProduct(page, 1);
-      await expect(textResult).to.contain(addProductPage.duplicateSuccessfulMessage);
+      expect(textResult).to.contain(addProductPage.duplicateSuccessfulMessage);
     });
 
     it('should check duplicated product name', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkProductName', baseContext);
 
       const productName = await addProductPage.getProductName(page);
-      await expect(productName).to.contain(`copy of ${Products.demo_5.name}`);
+      expect(productName).to.contain(`copy of ${Products.demo_5.name}`);
     });
 
     it('should delete duplicated product', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteProduct', baseContext);
 
       const textResult = await addProductPage.deleteProduct(page);
-      await expect(textResult).to.contain(productsPage.productDeletedSuccessfulMessage);
+      expect(textResult).to.contain(productsPage.productDeletedSuccessfulMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDelete', baseContext);
 
       const numberOfProductsAfterReset = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProductsAfterReset).to.be.equal(numberOfProducts);
+      expect(numberOfProductsAfterReset).to.be.equal(numberOfProducts);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/01_products/06_bulkActions.ts b/tests/UI/campaigns/functional/BO/03_catalog/01_products/06_bulkActions.ts
index aabfbe9724d77..3108a5a52c25e 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/01_products/06_bulkActions.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/01_products/06_bulkActions.ts
@@ -67,14 +67,14 @@ describe('BO - Catalog - Products : Bulk actions products', async () => {
       await productsPage.closeSfToolBar(page);
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should reset all filters and get number of products', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFirst', baseContext);
 
       numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProducts).to.be.above(0);
+      expect(numberOfProducts).to.be.above(0);
     });
 
     [firstProductData, secondProductData].forEach((productData: ProductData, index: number) => {
@@ -84,7 +84,7 @@ describe('BO - Catalog - Products : Bulk actions products', async () => {
         await productsPage.goToAddProductPage(page);
 
         const createProductMessage = await addProductPage.createEditBasicProduct(page, productData);
-        await expect(createProductMessage).to.equal(addProductPage.settingUpdatedMessage);
+        expect(createProductMessage).to.equal(addProductPage.settingUpdatedMessage);
       });
 
       it('should go to catalog page', async function () {
@@ -93,7 +93,7 @@ describe('BO - Catalog - Products : Bulk actions products', async () => {
         await addProductPage.goToCatalogPage(page);
 
         const pageTitle = await productsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(productsPage.pageTitle);
+        expect(pageTitle).to.contains(productsPage.pageTitle);
       });
     });
   });
@@ -105,7 +105,7 @@ describe('BO - Catalog - Products : Bulk actions products', async () => {
       await productsPage.filterProducts(page, 'name', 'TO DELETE');
 
       const textColumn = await productsPage.getProductNameFromList(page, 1);
-      await expect(textColumn).to.contains('TO DELETE');
+      expect(textColumn).to.contains('TO DELETE');
     });
 
     [
@@ -116,7 +116,7 @@ describe('BO - Catalog - Products : Bulk actions products', async () => {
         await testContext.addContextItem(this, 'testIdentifier', `${test.action}Products`, baseContext);
 
         const textResult = await productsPage.bulkSetStatus(page, test.status);
-        await expect(textResult)
+        expect(textResult)
           .to.equal(
             test.status
               ? productsPage.productMultiActivatedSuccessfulMessage
@@ -125,7 +125,7 @@ describe('BO - Catalog - Products : Bulk actions products', async () => {
 
         for (let row = 1; row <= 2; row++) {
           const productStatus = await productsPage.getProductStatusFromList(page, row);
-          await expect(productStatus).to.equal(test.status);
+          expect(productStatus).to.equal(test.status);
         }
       });
     });
@@ -134,7 +134,7 @@ describe('BO - Catalog - Products : Bulk actions products', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterBulkSetStatus', baseContext);
 
       const numberOfProductsAfterReset = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProductsAfterReset).to.be.equal(numberOfProducts + 2);
+      expect(numberOfProductsAfterReset).to.be.equal(numberOfProducts + 2);
     });
   });
 
@@ -145,24 +145,24 @@ describe('BO - Catalog - Products : Bulk actions products', async () => {
       await productsPage.filterProducts(page, 'name', 'TO DELETE');
 
       const textColumn = await productsPage.getProductNameFromList(page, 1);
-      await expect(textColumn).to.contains('TO DELETE');
+      expect(textColumn).to.contains('TO DELETE');
     });
 
     it('should duplicate products by bulk actions', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDuplicate', baseContext);
 
       const duplicateTextResult = await productsPage.duplicateAllProductsWithBulkActions(page);
-      await expect(duplicateTextResult).to.equal(productsPage.productMultiDuplicatedSuccessfulMessage);
+      expect(duplicateTextResult).to.equal(productsPage.productMultiDuplicatedSuccessfulMessage);
 
       numberOfFilteredProductsAfterDuplicate = await productsPage.getNumberOfProductsFromList(page);
-      await expect(numberOfFilteredProductsAfterDuplicate).to.be.below(numberOfProducts);
+      expect(numberOfFilteredProductsAfterDuplicate).to.be.below(numberOfProducts);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterBulkDuplicate', baseContext);
 
       const numberOfProductsAfterDuplicate = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProductsAfterDuplicate)
+      expect(numberOfProductsAfterDuplicate)
         .to.be.equal(numberOfProducts + numberOfFilteredProductsAfterDuplicate);
     });
   });
@@ -174,21 +174,21 @@ describe('BO - Catalog - Products : Bulk actions products', async () => {
       await productsPage.filterProducts(page, 'name', 'TO DELETE');
 
       const textColumn = await productsPage.getProductNameFromList(page, 1);
-      await expect(textColumn).to.contains('TO DELETE');
+      expect(textColumn).to.contains('TO DELETE');
     });
 
     it('should delete products by bulk actions', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDelete', baseContext);
 
       const deleteTextResult = await productsPage.deleteAllProductsWithBulkActions(page);
-      await expect(deleteTextResult).to.equal(productsPage.productMultiDeletedSuccessfulMessage);
+      expect(deleteTextResult).to.equal(productsPage.productMultiDeletedSuccessfulMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterBulkDelete', baseContext);
 
       const numberOfProductsAfterReset = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProductsAfterReset).to.be.equal(numberOfProducts);
+      expect(numberOfProductsAfterReset).to.be.equal(numberOfProducts);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/02_categories/01_filterAndQuickEditCategories.ts b/tests/UI/campaigns/functional/BO/03_catalog/02_categories/01_filterAndQuickEditCategories.ts
index fc12d23c59eb4..faa78a7c32065 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/02_categories/01_filterAndQuickEditCategories.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/02_categories/01_filterAndQuickEditCategories.ts
@@ -48,14 +48,14 @@ describe('BO - Catalog - Categories : Filter and quick edit Categories table', a
     await categoriesPage.closeSfToolBar(page);
 
     const pageTitle = await categoriesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(categoriesPage.pageTitle);
+    expect(pageTitle).to.contains(categoriesPage.pageTitle);
   });
 
   it('should reset all filters and get number of Categories in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFirst', baseContext);
 
     numberOfCategories = await categoriesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfCategories).to.be.above(0);
+    expect(numberOfCategories).to.be.above(0);
   });
 
   // 1 : Filter Categories with all inputs and selects in grid table
@@ -123,19 +123,19 @@ describe('BO - Catalog - Categories : Filter and quick edit Categories table', a
         // Can't know most categories that can be displayed
         // because we don't have total of categories and subcategories
         const numberOfCategoriesAfterFilter = await categoriesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfCategoriesAfterFilter).to.be.at.least(1);
+        expect(numberOfCategoriesAfterFilter).to.be.at.least(1);
 
         for (let i = 1; i <= numberOfCategoriesAfterFilter; i++) {
           if (test.args.filterBy === 'active') {
             const categoryStatus = await categoriesPage.getStatus(page, i);
-            await expect(categoryStatus).to.equal(test.args.filterValue === '1');
+            expect(categoryStatus).to.equal(test.args.filterValue === '1');
           } else {
             const textColumn = await categoriesPage.getTextColumnFromTableCategories(
               page,
               i,
               test.args.filterBy,
             );
-            await expect(textColumn).to.contains(test.args.filterValue);
+            expect(textColumn).to.contains(test.args.filterValue);
           }
         }
       });
@@ -144,7 +144,7 @@ describe('BO - Catalog - Categories : Filter and quick edit Categories table', a
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}Reset`, baseContext);
 
         const numberOfCategoriesAfterReset = await categoriesPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfCategoriesAfterReset).to.equal(numberOfCategories);
+        expect(numberOfCategoriesAfterReset).to.equal(numberOfCategories);
       });
     });
   });
@@ -163,7 +163,7 @@ describe('BO - Catalog - Categories : Filter and quick edit Categories table', a
       );
 
       const numberOfCategoriesAfterFilter = await categoriesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfCategoriesAfterFilter).to.be.at.above(0);
+      expect(numberOfCategoriesAfterFilter).to.be.at.above(0);
     });
 
     [
@@ -182,11 +182,11 @@ describe('BO - Catalog - Categories : Filter and quick edit Categories table', a
         if (isActionPerformed) {
           const resultMessage = await categoriesPage.getGrowlMessageContent(page);
 
-          await expect(resultMessage).to.contains(categoriesPage.successfulUpdateStatusMessage);
+          expect(resultMessage).to.contains(categoriesPage.successfulUpdateStatusMessage);
         }
 
         const categoryStatus = await categoriesPage.getStatus(page, 1);
-        await expect(categoryStatus).to.be.equal(test.args.enabledValue);
+        expect(categoryStatus).to.be.equal(test.args.enabledValue);
       });
     });
 
@@ -194,7 +194,7 @@ describe('BO - Catalog - Categories : Filter and quick edit Categories table', a
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterQuickEdit', baseContext);
 
       const numberOfCategoriesAfterReset = await categoriesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCategoriesAfterReset).to.equal(numberOfCategories);
+      expect(numberOfCategoriesAfterReset).to.equal(numberOfCategories);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/02_categories/02_CRUDCategoryInBO.ts b/tests/UI/campaigns/functional/BO/03_catalog/02_categories/02_CRUDCategoryInBO.ts
index 520b1dd04c049..32698b73677bf 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/02_categories/02_CRUDCategoryInBO.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/02_categories/02_CRUDCategoryInBO.ts
@@ -75,14 +75,14 @@ describe('BO - Catalog - Categories : CRUD Category in BO', async () => {
     await categoriesPage.closeSfToolBar(page);
 
     const pageTitle = await categoriesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(categoriesPage.pageTitle);
+    expect(pageTitle).to.contains(categoriesPage.pageTitle);
   });
 
   it('should reset all filters and get number of categories in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFirst', baseContext);
 
     numberOfCategories = await categoriesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfCategories).to.be.above(0);
+    expect(numberOfCategories).to.be.above(0);
   });
 
   // 1 : Create category and subcategory then go to FO to check the existence of the new categories
@@ -94,17 +94,17 @@ describe('BO - Catalog - Categories : CRUD Category in BO', async () => {
         await categoriesPage.goToAddNewCategoryPage(page);
 
         const pageTitle = await addCategoryPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addCategoryPage.pageTitleCreate);
+        expect(pageTitle).to.contains(addCategoryPage.pageTitleCreate);
       });
 
       it('should create category and check the categories number', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'createCategory', baseContext);
 
         const textResult = await addCategoryPage.createEditCategory(page, createCategoryData);
-        await expect(textResult).to.equal(categoriesPage.successfulCreationMessage);
+        expect(textResult).to.equal(categoriesPage.successfulCreationMessage);
 
         const numberOfCategoriesAfterCreation = await categoriesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfCategoriesAfterCreation).to.be.equal(numberOfCategories + 1);
+        expect(numberOfCategoriesAfterCreation).to.be.equal(numberOfCategories + 1);
       });
 
       it('should search for the new category and check result', async function () {
@@ -119,11 +119,11 @@ describe('BO - Catalog - Categories : CRUD Category in BO', async () => {
         );
 
         const numberOfCategoriesAfterFilter = await categoriesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfCategoriesAfterFilter).to.be.at.most(numberOfCategories);
+        expect(numberOfCategoriesAfterFilter).to.be.at.most(numberOfCategories);
 
         for (let i: number = 1; i <= numberOfCategoriesAfterFilter; i++) {
           const textColumn = await categoriesPage.getTextColumnFromTableCategories(page, i, 'name');
-          await expect(textColumn).to.contains(createCategoryData.name);
+          expect(textColumn).to.contains(createCategoryData.name);
         }
       });
 
@@ -137,7 +137,7 @@ describe('BO - Catalog - Categories : CRUD Category in BO', async () => {
         await foHomePage.changeLanguage(page, 'en');
 
         const isHomePage = await foHomePage.isHomePage(page);
-        await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+        expect(isHomePage, 'Fail to open FO home page').to.eq(true);
       });
 
       it('should check the created category', async function () {
@@ -147,11 +147,11 @@ describe('BO - Catalog - Categories : CRUD Category in BO', async () => {
         await foHomePage.goToFooterLink(page, 'Sitemap');
 
         const pageTitle = await siteMapPage.getPageTitle(page);
-        await expect(pageTitle).to.equal(siteMapPage.pageTitle);
+        expect(pageTitle).to.equal(siteMapPage.pageTitle);
 
         // Check category name
         const categoryName = await siteMapPage.getCategoryName(page, categoryID);
-        await expect(categoryName).to.contains(createCategoryData.name);
+        expect(categoryName).to.contains(createCategoryData.name);
       });
 
       it('should view the created category', async function () {
@@ -161,11 +161,11 @@ describe('BO - Catalog - Categories : CRUD Category in BO', async () => {
 
         // Check category name
         const pageTitle = await categoryPage.getHeaderPageName(page);
-        await expect(pageTitle).to.contains(createCategoryData.name.toUpperCase());
+        expect(pageTitle).to.contains(createCategoryData.name.toUpperCase());
 
         // Check category description
         const categoryDescription = await categoryPage.getCategoryDescription(page);
-        await expect(categoryDescription).to.equal(createCategoryData.description);
+        expect(categoryDescription).to.equal(createCategoryData.description);
       });
 
       it('should go back to BO', async function () {
@@ -175,7 +175,7 @@ describe('BO - Catalog - Categories : CRUD Category in BO', async () => {
         page = await categoryPage.closePage(browserContext, page, 0);
 
         const pageTitle = await categoriesPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(categoriesPage.pageTitle);
+        expect(pageTitle).to.contains(categoriesPage.pageTitle);
       });
     });
 
@@ -186,7 +186,7 @@ describe('BO - Catalog - Categories : CRUD Category in BO', async () => {
         await categoriesPage.goToViewSubCategoriesPage(page, 1);
 
         const pageTitle = await categoriesPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(createCategoryData.name);
+        expect(pageTitle).to.contains(createCategoryData.name);
       });
 
       it('should go to add new category page', async function () {
@@ -195,14 +195,14 @@ describe('BO - Catalog - Categories : CRUD Category in BO', async () => {
         await categoriesPage.goToAddNewCategoryPage(page);
 
         const pageTitle = await addCategoryPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addCategoryPage.pageTitleCreate);
+        expect(pageTitle).to.contains(addCategoryPage.pageTitleCreate);
       });
 
       it('should create a subcategory', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'createSubcategory', baseContext);
 
         const textResult = await addCategoryPage.createEditCategory(page, createSubCategoryData);
-        await expect(textResult).to.equal(categoriesPage.successfulCreationMessage);
+        expect(textResult).to.equal(categoriesPage.successfulCreationMessage);
       });
 
       it('should search for the subcategory and check result', async function () {
@@ -217,7 +217,7 @@ describe('BO - Catalog - Categories : CRUD Category in BO', async () => {
         );
 
         const textColumn = await categoriesPage.getTextColumnFromTableCategories(page, 1, 'name');
-        await expect(textColumn).to.contains(createSubCategoryData.name);
+        expect(textColumn).to.contains(createSubCategoryData.name);
       });
 
       it('should go to FO and check the created Subcategory', async function () {
@@ -232,11 +232,11 @@ describe('BO - Catalog - Categories : CRUD Category in BO', async () => {
         await foHomePage.goToFooterLink(page, 'Sitemap');
 
         const pageTitle = await siteMapPage.getPageTitle(page);
-        await expect(pageTitle).to.equal(siteMapPage.pageTitle);
+        expect(pageTitle).to.equal(siteMapPage.pageTitle);
 
         // Check category
         const categoryName = await siteMapPage.getCategoryName(page, subcategoryID);
-        await expect(categoryName).to.contains(createSubCategoryData.name);
+        expect(categoryName).to.contains(createSubCategoryData.name);
       });
 
       it('should view the created subcategory', async function () {
@@ -246,11 +246,11 @@ describe('BO - Catalog - Categories : CRUD Category in BO', async () => {
 
         // Check subcategory name
         const pageTitle = await categoryPage.getHeaderPageName(page);
-        await expect(pageTitle).to.contains(createSubCategoryData.name.toUpperCase());
+        expect(pageTitle).to.contains(createSubCategoryData.name.toUpperCase());
 
         // Check subcategory description
         const subcategoryDescription = await categoryPage.getCategoryDescription(page);
-        await expect(subcategoryDescription).to.equal(createSubCategoryData.description);
+        expect(subcategoryDescription).to.equal(createSubCategoryData.description);
       });
 
       it('should go back to BO', async function () {
@@ -260,7 +260,7 @@ describe('BO - Catalog - Categories : CRUD Category in BO', async () => {
         page = await categoryPage.closePage(browserContext, page, 0);
 
         const pageTitle = await categoriesPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(createCategoryData.name);
+        expect(pageTitle).to.contains(createCategoryData.name);
       });
     });
   });
@@ -277,7 +277,7 @@ describe('BO - Catalog - Categories : CRUD Category in BO', async () => {
       );
 
       const pageTitle = await categoriesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(categoriesPage.pageTitle);
+      expect(pageTitle).to.contains(categoriesPage.pageTitle);
     });
 
     it(`should filter list by Name '${createCategoryData.name}'`, async function () {
@@ -292,7 +292,7 @@ describe('BO - Catalog - Categories : CRUD Category in BO', async () => {
       );
 
       const textColumn = await categoriesPage.getTextColumnFromTableCategories(page, 1, 'name');
-      await expect(textColumn).to.contains(createCategoryData.name);
+      expect(textColumn).to.contains(createCategoryData.name);
     });
 
     it('should click on view category', async function () {
@@ -301,7 +301,7 @@ describe('BO - Catalog - Categories : CRUD Category in BO', async () => {
       await categoriesPage.goToViewSubCategoriesPage(page, 1);
 
       const pageTitle = await categoriesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(createCategoryData.name);
+      expect(pageTitle).to.contains(createCategoryData.name);
     });
 
     it('should check subcategories list', async function () {
@@ -316,7 +316,7 @@ describe('BO - Catalog - Categories : CRUD Category in BO', async () => {
       );
 
       const textColumn = await categoriesPage.getTextColumnFromTableCategories(page, 1, 'name');
-      await expect(textColumn).to.contains(createSubCategoryData.name);
+      expect(textColumn).to.contains(createSubCategoryData.name);
     });
   });
 
@@ -332,7 +332,7 @@ describe('BO - Catalog - Categories : CRUD Category in BO', async () => {
       );
 
       const pageTitle = await categoriesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(categoriesPage.pageTitle);
+      expect(pageTitle).to.contains(categoriesPage.pageTitle);
     });
 
     it(`should filter list by Name '${createCategoryData.name}'`, async function () {
@@ -347,7 +347,7 @@ describe('BO - Catalog - Categories : CRUD Category in BO', async () => {
       );
 
       const textColumn = await categoriesPage.getTextColumnFromTableCategories(page, 1, 'name');
-      await expect(textColumn).to.contains(createCategoryData.name);
+      expect(textColumn).to.contains(createCategoryData.name);
     });
 
     it('should go to edit category page', async function () {
@@ -356,17 +356,17 @@ describe('BO - Catalog - Categories : CRUD Category in BO', async () => {
       await categoriesPage.goToEditCategoryPage(page, 1);
 
       const pageTitle = await addCategoryPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addCategoryPage.pageTitleEdit + createCategoryData.name);
+      expect(pageTitle).to.contains(addCategoryPage.pageTitleEdit + createCategoryData.name);
     });
 
     it('should update the category', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateCategory', baseContext);
 
       const textResult = await addCategoryPage.createEditCategory(page, editCategoryData);
-      await expect(textResult).to.equal(categoriesPage.successfulUpdateMessage);
+      expect(textResult).to.equal(categoriesPage.successfulUpdateMessage);
 
       const numberOfCategoriesAfterUpdate = await categoriesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCategoriesAfterUpdate).to.be.equal(numberOfCategories + 1);
+      expect(numberOfCategoriesAfterUpdate).to.be.equal(numberOfCategories + 1);
     });
 
     it('should search for the new category and check result', async function () {
@@ -381,7 +381,7 @@ describe('BO - Catalog - Categories : CRUD Category in BO', async () => {
       );
 
       const textColumn = await categoriesPage.getTextColumnFromTableCategories(page, 1, 'name');
-      await expect(textColumn).to.contains(editCategoryData.name);
+      expect(textColumn).to.contains(editCategoryData.name);
     });
 
     it('should go to FO and check that the category does not exist', async function () {
@@ -395,11 +395,11 @@ describe('BO - Catalog - Categories : CRUD Category in BO', async () => {
       await foHomePage.goToFooterLink(page, 'Sitemap');
 
       const pageTitle = await siteMapPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(siteMapPage.pageTitle);
+      expect(pageTitle).to.equal(siteMapPage.pageTitle);
 
       // Check category name
       const categoryName = await siteMapPage.isVisibleCategory(page, categoryID);
-      await expect(categoryName).to.be.false;
+      expect(categoryName).to.eq(false);
     });
 
     it('should go back to BO', async function () {
@@ -409,7 +409,7 @@ describe('BO - Catalog - Categories : CRUD Category in BO', async () => {
       page = await siteMapPage.closePage(browserContext, page, 0);
 
       const pageTitle = await categoriesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(categoriesPage.pageTitle);
+      expect(pageTitle).to.contains(categoriesPage.pageTitle);
     });
   });
 
@@ -425,7 +425,7 @@ describe('BO - Catalog - Categories : CRUD Category in BO', async () => {
       );
 
       const pageTitle = await categoriesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(categoriesPage.pageTitle);
+      expect(pageTitle).to.contains(categoriesPage.pageTitle);
     });
 
     it(`should filter list by Name '${editCategoryData.name}'`, async function () {
@@ -441,17 +441,17 @@ describe('BO - Catalog - Categories : CRUD Category in BO', async () => {
       categoryID = parseInt(await categoriesPage.getTextColumnFromTableCategories(page, 1, 'id_category'), 10);
 
       const textColumn = await categoriesPage.getTextColumnFromTableCategories(page, 1, 'name');
-      await expect(textColumn).to.contains(editCategoryData.name);
+      expect(textColumn).to.contains(editCategoryData.name);
     });
 
     it('should delete category', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteCategory', baseContext);
 
       const textResult = await categoriesPage.deleteCategory(page, 1);
-      await expect(textResult).to.equal(categoriesPage.successfulDeleteMessage);
+      expect(textResult).to.equal(categoriesPage.successfulDeleteMessage);
 
       const numberOfCategoriesAfterDeletion = await categoriesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCategoriesAfterDeletion).to.be.equal(numberOfCategories);
+      expect(numberOfCategoriesAfterDeletion).to.be.equal(numberOfCategories);
     });
 
     it('should go to FO', async function () {
@@ -463,7 +463,7 @@ describe('BO - Catalog - Categories : CRUD Category in BO', async () => {
       await foHomePage.changeLanguage(page, 'en');
 
       const isHomePage = await foHomePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should check that the deleted category does not exist', async function () {
@@ -473,10 +473,10 @@ describe('BO - Catalog - Categories : CRUD Category in BO', async () => {
       await foHomePage.goToFooterLink(page, 'Sitemap');
 
       const pageTitle = await siteMapPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(siteMapPage.pageTitle);
+      expect(pageTitle).to.equal(siteMapPage.pageTitle);
 
       const categoryName = await siteMapPage.isVisibleCategory(page, categoryID);
-      await expect(categoryName, 'Category is visible in FO!').to.be.false;
+      expect(categoryName, 'Category is visible in FO!').to.eq(false);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/02_categories/03_categoriesBulkAction.ts b/tests/UI/campaigns/functional/BO/03_catalog/02_categories/03_categoriesBulkAction.ts
index 5c1f7aed78c2a..6205e4b2cab8c 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/02_categories/03_categoriesBulkAction.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/02_categories/03_categoriesBulkAction.ts
@@ -65,14 +65,14 @@ describe('BO - Catalog - Categories : Enable/Disable/Delete categories by Bulk A
     await categoriesPage.closeSfToolBar(page);
 
     const pageTitle = await categoriesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(categoriesPage.pageTitle);
+    expect(pageTitle).to.contains(categoriesPage.pageTitle);
   });
 
   it('should reset all filters and get number of categories in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFirst', baseContext);
 
     numberOfCategories = await categoriesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfCategories).to.be.above(0);
+    expect(numberOfCategories).to.be.above(0);
   });
 
   // 1 : Create 2 categories In BO
@@ -87,17 +87,17 @@ describe('BO - Catalog - Categories : Enable/Disable/Delete categories by Bulk A
         await categoriesPage.goToAddNewCategoryPage(page);
 
         const pageTitle = await addCategoryPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addCategoryPage.pageTitleCreate);
+        expect(pageTitle).to.contains(addCategoryPage.pageTitleCreate);
       });
 
       it('should create category and check result', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `createCategory${index + 1}`, baseContext);
 
         const textResult = await addCategoryPage.createEditCategory(page, test.args.categoryToCreate);
-        await expect(textResult).to.equal(categoriesPage.successfulCreationMessage);
+        expect(textResult).to.equal(categoriesPage.successfulCreationMessage);
 
         const numberOfCategoriesAfterCreation = await categoriesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfCategoriesAfterCreation).to.be.equal(numberOfCategories + index + 1);
+        expect(numberOfCategoriesAfterCreation).to.be.equal(numberOfCategories + index + 1);
       });
     });
   });
@@ -115,7 +115,7 @@ describe('BO - Catalog - Categories : Enable/Disable/Delete categories by Bulk A
       );
 
       const textResult = await categoriesPage.getTextColumnFromTableCategories(page, 1, 'name');
-      await expect(textResult).to.contains('todelete');
+      expect(textResult).to.contains('todelete');
     });
 
     [
@@ -129,14 +129,14 @@ describe('BO - Catalog - Categories : Enable/Disable/Delete categories by Bulk A
           page,
           test.args.enabledValue,
         );
-        await expect(textResult).to.be.equal(categoriesPage.successfulUpdateStatusMessage);
+        expect(textResult).to.be.equal(categoriesPage.successfulUpdateStatusMessage);
 
         const numberOfCategoriesInGrid = await categoriesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfCategoriesInGrid).to.be.at.most(numberOfCategories);
+        expect(numberOfCategoriesInGrid).to.be.at.most(numberOfCategories);
 
         for (let i = 1; i <= numberOfCategoriesInGrid; i++) {
           const categoryStatus = await categoriesPage.getStatus(page, i);
-          await expect(categoryStatus).to.equal(test.args.enabledValue);
+          expect(categoryStatus).to.equal(test.args.enabledValue);
         }
       });
     });
@@ -148,14 +148,14 @@ describe('BO - Catalog - Categories : Enable/Disable/Delete categories by Bulk A
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDelete', baseContext);
 
       const deleteTextResult = await categoriesPage.deleteCategoriesBulkActions(page);
-      await expect(deleteTextResult).to.be.equal(categoriesPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.equal(categoriesPage.successfulMultiDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDelete', baseContext);
 
       const numberOfCategoriesAfterReset = await categoriesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCategoriesAfterReset).to.equal(numberOfCategories);
+      expect(numberOfCategoriesAfterReset).to.equal(numberOfCategories);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/02_categories/04_changeCategoryPosition.ts b/tests/UI/campaigns/functional/BO/03_catalog/02_categories/04_changeCategoryPosition.ts
index 7b0ba311746d6..19a3d90ad5f69 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/02_categories/04_changeCategoryPosition.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/02_categories/04_changeCategoryPosition.ts
@@ -45,14 +45,14 @@ describe('BO - Catalog - Categories : Change category position', async () => {
     await categoriesPage.closeSfToolBar(page);
 
     const pageTitle = await categoriesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(categoriesPage.pageTitle);
+    expect(pageTitle).to.contains(categoriesPage.pageTitle);
   });
 
   it('should reset all filters and get number of categories in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFirst', baseContext);
 
     numberOfCategories = await categoriesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfCategories).to.be.above(0);
+    expect(numberOfCategories).to.be.above(0);
   });
 
   it('should sort categories by position', async function () {
@@ -68,7 +68,7 @@ describe('BO - Catalog - Categories : Change category position', async () => {
     const sortedTableFloat: number[] = await sortedTable.map((text: string): number => parseFloat(text));
 
     const expectedResult = await basicHelper.sortArrayNumber(nonSortedTableFloat);
-    await expect(sortedTableFloat).to.deep.equal(expectedResult);
+    expect(sortedTableFloat).to.deep.equal(expectedResult);
   });
 
   describe('Change categories position', async () => {
@@ -82,21 +82,21 @@ describe('BO - Catalog - Categories : Change category position', async () => {
       );
 
       const resultText = await categoriesPage.changeCategoryPosition(page, 1, 2);
-      await expect(resultText).to.equal(categoriesPage.successfulUpdateMessage);
+      expect(resultText).to.equal(categoriesPage.successfulUpdateMessage);
 
       const firstCategoryNameAfterUpdate = await categoriesPage.getTextColumnFromTableCategories(
         page,
         1,
         'name',
       );
-      await expect(firstCategoryNameBeforeUpdate).to.not.equal(firstCategoryNameAfterUpdate);
+      expect(firstCategoryNameBeforeUpdate).to.not.equal(firstCategoryNameAfterUpdate);
 
       const secondCategoryNameAfterUpdate = await categoriesPage.getTextColumnFromTableCategories(
         page,
         2,
         'name',
       );
-      await expect(firstCategoryNameBeforeUpdate).to.equal(secondCategoryNameAfterUpdate);
+      expect(firstCategoryNameBeforeUpdate).to.equal(secondCategoryNameAfterUpdate);
     });
 
     it('should reset category position', async function () {
@@ -109,21 +109,21 @@ describe('BO - Catalog - Categories : Change category position', async () => {
       );
 
       const resultText = await categoriesPage.changeCategoryPosition(page, 2, 1);
-      await expect(resultText).to.equal(categoriesPage.successfulUpdateMessage);
+      expect(resultText).to.equal(categoriesPage.successfulUpdateMessage);
 
       const secondCategoryNameAfterUpdate = await categoriesPage.getTextColumnFromTableCategories(
         page,
         2,
         'name',
       );
-      await expect(secondCategoryNameBeforeUpdate).to.not.equal(secondCategoryNameAfterUpdate);
+      expect(secondCategoryNameBeforeUpdate).to.not.equal(secondCategoryNameAfterUpdate);
 
       const firstCategoryNameAfterUpdate = await categoriesPage.getTextColumnFromTableCategories(
         page,
         1,
         'name',
       );
-      await expect(secondCategoryNameBeforeUpdate).to.equal(firstCategoryNameAfterUpdate);
+      expect(secondCategoryNameBeforeUpdate).to.equal(firstCategoryNameAfterUpdate);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/02_categories/05_paginationAndSortCategories.ts b/tests/UI/campaigns/functional/BO/03_catalog/02_categories/05_paginationAndSortCategories.ts
index 42f2c5039227e..6680670104de6 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/02_categories/05_paginationAndSortCategories.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/02_categories/05_paginationAndSortCategories.ts
@@ -75,14 +75,14 @@ describe('BO - Catalog - Categories : Pagination and sort categories table', asy
       await dashboardPage.closeSfToolBar(page);
 
       const pageTitle = await categoriesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(categoriesPage.pageTitle);
+      expect(pageTitle).to.contains(categoriesPage.pageTitle);
     });
 
     it('should reset all filters and get number of categories in BO', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFirst', baseContext);
 
       numberOfCategories = await categoriesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCategories).to.be.above(0);
+      expect(numberOfCategories).to.be.above(0);
     });
   });
 
@@ -174,17 +174,17 @@ describe('BO - Catalog - Categories : Pagination and sort categories table', asy
           const expectedResult: number[] = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+            expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+            expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
         } else {
           const expectedResult: string[] = await basicHelper.sortArray(nonSortedTable);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         }
       });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/02_categories/06_helpCard.ts b/tests/UI/campaigns/functional/BO/03_catalog/02_categories/06_helpCard.ts
index c99210a1395d4..7212a6d95d745 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/02_categories/06_helpCard.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/02_categories/06_helpCard.ts
@@ -43,23 +43,23 @@ describe('BO - Catalog - Categories : Help card in categories page', async () =>
     await categoriesPage.closeSfToolBar(page);
 
     const pageTitle = await categoriesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(categoriesPage.pageTitle);
+    expect(pageTitle).to.contains(categoriesPage.pageTitle);
   });
 
   it('should open the help side bar and check the document language', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'openHelpSidebar', baseContext);
 
     const isHelpSidebarVisible = await categoriesPage.openHelpSideBar(page);
-    await expect(isHelpSidebarVisible).to.be.true;
+    expect(isHelpSidebarVisible).to.eq(true);
 
     const documentURL = await categoriesPage.getHelpDocumentURL(page);
-    await expect(documentURL).to.contains('country=en');
+    expect(documentURL).to.contains('country=en');
   });
 
   it('should close the help side bar', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'closeHelpSidebar', baseContext);
 
     const isHelpSidebarClosed = await categoriesPage.closeHelpSideBar(page);
-    await expect(isHelpSidebarClosed).to.be.true;
+    expect(isHelpSidebarClosed).to.eq(true);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/02_categories/07_exportCategories.ts b/tests/UI/campaigns/functional/BO/03_catalog/02_categories/07_exportCategories.ts
index 61d0f6e9ef166..2639890d0d7d8 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/02_categories/07_exportCategories.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/02_categories/07_exportCategories.ts
@@ -50,7 +50,7 @@ describe('BO - Catalog - Categories : Export categories', async () => {
     await categoriesPage.closeSfToolBar(page);
 
     const pageTitle = await categoriesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(categoriesPage.pageTitle);
+    expect(pageTitle).to.contains(categoriesPage.pageTitle);
   });
 
   it('should export categories to a csv file', async function () {
@@ -59,7 +59,7 @@ describe('BO - Catalog - Categories : Export categories', async () => {
     filePath = await categoriesPage.exportDataToCsv(page);
 
     const doesFileExist = await files.doesFileExist(filePath, 5000);
-    await expect(doesFileExist, 'Export of data has failed').to.be.true;
+    expect(doesFileExist, 'Export of data has failed').to.eq(true);
   });
 
   it('should check existence of categories data in csv file', async function () {
@@ -70,7 +70,7 @@ describe('BO - Catalog - Categories : Export categories', async () => {
     for (let row = 1; row <= numberOfCategories; row++) {
       const categoryInCsvFormat = await categoriesPage.getCategoryInCsvFormat(page, row);
       const textExist = await files.isTextInFile(filePath, categoryInCsvFormat, true);
-      await expect(textExist, `${categoryInCsvFormat} was not found in the file`).to.be.true;
+      expect(textExist, `${categoryInCsvFormat} was not found in the file`).to.eq(true);
     }
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/02_categories/08_editHomeCategory.ts b/tests/UI/campaigns/functional/BO/03_catalog/02_categories/08_editHomeCategory.ts
index fa0a770f5b24e..2fa5b36af15ff 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/02_categories/08_editHomeCategory.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/02_categories/08_editHomeCategory.ts
@@ -62,7 +62,7 @@ describe('BO - Catalog - Categories : Edit home category', async () => {
     await categoriesPage.closeSfToolBar(page);
 
     const pageTitle = await categoriesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(categoriesPage.pageTitle);
+    expect(pageTitle).to.contains(categoriesPage.pageTitle);
   });
 
   it('should go to Edit Home category page', async function () {
@@ -71,14 +71,14 @@ describe('BO - Catalog - Categories : Edit home category', async () => {
     await categoriesPage.goToEditHomeCategoryPage(page);
 
     const pageTitle = await editCategoryPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(editCategoryPage.pageTitleEdit);
+    expect(pageTitle).to.contains(editCategoryPage.pageTitleEdit);
   });
 
   it('should update the category', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'updateCategory', baseContext);
 
     const textResult = await editCategoryPage.editHomeCategory(page, editCategoryData);
-    await expect(textResult).to.equal(categoriesPage.pageRootTitle);
+    expect(textResult).to.equal(categoriesPage.pageRootTitle);
   });
 
   it('should go to FO and check the updated category', async function () {
@@ -91,17 +91,17 @@ describe('BO - Catalog - Categories : Edit home category', async () => {
     await foHomePage.changeLanguage(page, 'en');
 
     const isHomePage = await foHomePage.isHomePage(page);
-    await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+    expect(isHomePage, 'Fail to open FO home page').to.eq(true);
 
     // Go to sitemap page
     await foHomePage.goToFooterLink(page, 'Sitemap');
 
     const pageTitle = await siteMapPage.getPageTitle(page);
-    await expect(pageTitle).to.equal(siteMapPage.pageTitle);
+    expect(pageTitle).to.equal(siteMapPage.pageTitle);
 
     // Check category name
     const categoryName = await siteMapPage.getCategoryName(page, categoryID);
-    await expect(categoryName).to.contains(editCategoryData.name);
+    expect(categoryName).to.contains(editCategoryData.name);
   });
 
   it('should view the created category', async function () {
@@ -111,11 +111,11 @@ describe('BO - Catalog - Categories : Edit home category', async () => {
 
     // Check category name
     const pageTitle = await categoryPage.getHeaderPageName(page);
-    await expect(pageTitle).to.contains(editCategoryData.name.toUpperCase());
+    expect(pageTitle).to.contains(editCategoryData.name.toUpperCase());
 
     // Check category description
     const categoryDescription = await categoryPage.getCategoryDescription(page);
-    await expect(categoryDescription).to.equal(editCategoryData.description);
+    expect(categoryDescription).to.equal(editCategoryData.description);
   });
 
   it('should go back to BO', async function () {
@@ -125,7 +125,7 @@ describe('BO - Catalog - Categories : Edit home category', async () => {
     page = await categoryPage.closePage(browserContext, page, 0);
 
     const pageTitle = await categoriesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(categoriesPage.pageRootTitle);
+    expect(pageTitle).to.contains(categoriesPage.pageRootTitle);
   });
 
   it('should click on view category', async function () {
@@ -134,7 +134,7 @@ describe('BO - Catalog - Categories : Edit home category', async () => {
     await categoriesPage.goToViewSubCategoriesPage(page, 1);
 
     const pageTitle = await categoriesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(categoriesPage.pageTitle);
+    expect(pageTitle).to.contains(categoriesPage.pageTitle);
   });
 
   it('should go to Edit Home category page', async function () {
@@ -143,13 +143,13 @@ describe('BO - Catalog - Categories : Edit home category', async () => {
     await categoriesPage.goToEditHomeCategoryPage(page);
 
     const pageTitle = await editCategoryPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(editCategoryData.name);
+    expect(pageTitle).to.contains(editCategoryData.name);
   });
 
   it('should reset update the category', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetUpdateCategory', baseContext);
 
     const textResult = await editCategoryPage.editHomeCategory(page, Categories.home);
-    await expect(textResult).to.equal(categoriesPage.pageRootTitle);
+    expect(textResult).to.equal(categoriesPage.pageRootTitle);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/01_deleteEmptyCategory.ts b/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/01_deleteEmptyCategory.ts
index 92d837bac6675..79f50da4372ba 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/01_deleteEmptyCategory.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/01_deleteEmptyCategory.ts
@@ -64,14 +64,14 @@ describe('BO - Catalog - Monitoring : Create empty category and delete it from m
     await categoriesPage.closeSfToolBar(page);
 
     const pageTitle = await categoriesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(categoriesPage.pageTitle);
+    expect(pageTitle).to.contains(categoriesPage.pageTitle);
   });
 
   it('should reset all filters and get number of categories in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFirst', baseContext);
 
     numberOfCategories = await categoriesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfCategories).to.be.above(0);
+    expect(numberOfCategories).to.be.above(0);
   });
 
   describe('Create empty category in BO', async () => {
@@ -81,17 +81,17 @@ describe('BO - Catalog - Monitoring : Create empty category and delete it from m
       await categoriesPage.goToAddNewCategoryPage(page);
 
       const pageTitle = await addCategoryPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addCategoryPage.pageTitleCreate);
+      expect(pageTitle).to.contains(addCategoryPage.pageTitleCreate);
     });
 
     it('should create category and check the categories number', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createCategory', baseContext);
 
       const textResult = await addCategoryPage.createEditCategory(page, createCategoryData);
-      await expect(textResult).to.equal(categoriesPage.successfulCreationMessage);
+      expect(textResult).to.equal(categoriesPage.successfulCreationMessage);
 
       const numberOfCategoriesAfterCreation = await categoriesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfCategoriesAfterCreation).to.be.equal(numberOfCategories + 1);
+      expect(numberOfCategoriesAfterCreation).to.be.equal(numberOfCategories + 1);
     });
   });
 
@@ -106,10 +106,10 @@ describe('BO - Catalog - Monitoring : Create empty category and delete it from m
       );
 
       const pageTitle = await monitoringPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(monitoringPage.pageTitle);
+      expect(pageTitle).to.contains(monitoringPage.pageTitle);
 
       numberOfEmptyCategories = await monitoringPage.resetAndGetNumberOfLines(page, 'empty_category');
-      await expect(numberOfEmptyCategories).to.be.at.least(1);
+      expect(numberOfEmptyCategories).to.be.at.least(1);
     });
 
     it(`should filter categories by Name ${createCategoryData.name}`, async function () {
@@ -124,14 +124,14 @@ describe('BO - Catalog - Monitoring : Create empty category and delete it from m
       );
 
       const textColumn = await monitoringPage.getTextColumnFromTable(page, 'empty_category', 1, 'name');
-      await expect(textColumn).to.contains(createCategoryData.name);
+      expect(textColumn).to.contains(createCategoryData.name);
     });
 
     it('should reset filter in empty categories grid', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetInMonitoringPage', baseContext);
 
       numberOfEmptyCategories = await monitoringPage.resetAndGetNumberOfLines(page, 'empty_category');
-      await expect(numberOfEmptyCategories).to.be.at.least(1);
+      expect(numberOfEmptyCategories).to.be.at.least(1);
     });
   });
 
@@ -148,24 +148,24 @@ describe('BO - Catalog - Monitoring : Create empty category and delete it from m
       );
 
       const textColumn = await monitoringPage.getTextColumnFromTable(page, 'empty_category', 1, 'name');
-      await expect(textColumn).to.contains(createCategoryData.name);
+      expect(textColumn).to.contains(createCategoryData.name);
     });
 
     it('should delete category', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteCategory', baseContext);
 
       const textResult = await monitoringPage.deleteCategoryInGrid(page, 'empty_category', 1, 1);
-      await expect(textResult).to.equal(monitoringPage.successfulDeleteMessage);
+      expect(textResult).to.equal(monitoringPage.successfulDeleteMessage);
 
       const pageTitle = await categoriesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(categoriesPage.pageTitle);
+      expect(pageTitle).to.contains(categoriesPage.pageTitle);
     });
 
     it('should reset filter check number of categories', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterDelete', baseContext);
 
       const numberOfCategoriesAfterDelete = await categoriesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCategoriesAfterDelete).to.be.equal(numberOfCategories);
+      expect(numberOfCategoriesAfterDelete).to.be.equal(numberOfCategories);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/02_monitoringProducts.ts b/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/02_monitoringProducts.ts
index 4a98cc7901863..1a156a1305300 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/02_monitoringProducts.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/02_monitoringProducts.ts
@@ -133,7 +133,7 @@ describe('BO - Catalog - Monitoring : Create different products and delete them
           await productsPage.closeSfToolBar(page);
 
           const pageTitle = await productsPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(productsPage.pageTitle);
+          expect(pageTitle).to.contains(productsPage.pageTitle);
         });
       }
 
@@ -141,7 +141,7 @@ describe('BO - Catalog - Monitoring : Create different products and delete them
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}_resetFirst`, baseContext);
 
         numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfProducts).to.be.above(0);
+        expect(numberOfProducts).to.be.above(0);
       });
 
       it('should create product and check the products number', async function () {
@@ -160,7 +160,7 @@ describe('BO - Catalog - Monitoring : Create different products and delete them
           );
         }
 
-        await expect(createProductMessage).to.equal(addProductPage.settingUpdatedMessage);
+        expect(createProductMessage).to.equal(addProductPage.settingUpdatedMessage);
       });
     });
 
@@ -180,13 +180,13 @@ describe('BO - Catalog - Monitoring : Create different products and delete them
         );
 
         const pageTitle = await monitoringPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(monitoringPage.pageTitle);
+        expect(pageTitle).to.contains(monitoringPage.pageTitle);
 
         numberOfProductsIngrid = await monitoringPage.resetAndGetNumberOfLines(
           page,
           test.args.gridName,
         );
-        await expect(numberOfProductsIngrid).to.be.at.least(1);
+        expect(numberOfProductsIngrid).to.be.at.least(1);
       });
 
       it(`should filter products ${test.args.productType} grid and check existence of new product`, async function () {
@@ -211,7 +211,7 @@ describe('BO - Catalog - Monitoring : Create different products and delete them
           1,
           'name',
         );
-        await expect(textColumn).to.contains(test.args.productToCreate.name);
+        expect(textColumn).to.contains(test.args.productToCreate.name);
       });
 
       it(`should reset filter in products ${test.args.productType} grid`, async function () {
@@ -223,7 +223,7 @@ describe('BO - Catalog - Monitoring : Create different products and delete them
         );
 
         numberOfProductsIngrid = await monitoringPage.resetAndGetNumberOfLines(page, test.args.gridName);
-        await expect(numberOfProductsIngrid).to.be.at.least(1);
+        expect(numberOfProductsIngrid).to.be.at.least(1);
       });
     });
 
@@ -250,7 +250,7 @@ describe('BO - Catalog - Monitoring : Create different products and delete them
           1,
           'name',
         );
-        await expect(textColumn).to.contains(test.args.productToCreate.name);
+        expect(textColumn).to.contains(test.args.productToCreate.name);
       });
 
       it('should delete product', async function () {
@@ -262,10 +262,10 @@ describe('BO - Catalog - Monitoring : Create different products and delete them
         );
 
         const textResult = await monitoringPage.deleteProductInGrid(page, test.args.gridName, 1);
-        await expect(textResult).to.equal(productsPage.productDeletedSuccessfulMessage);
+        expect(textResult).to.equal(productsPage.productDeletedSuccessfulMessage);
 
         const pageTitle = await productsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(productsPage.pageTitle);
+        expect(pageTitle).to.contains(productsPage.pageTitle);
       });
 
       it('should reset filter check number of products', async function () {
@@ -277,7 +277,7 @@ describe('BO - Catalog - Monitoring : Create different products and delete them
         );
 
         const numberOfProductsAfterDelete = await productsPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfProductsAfterDelete).to.be.equal(numberOfProducts);
+        expect(numberOfProductsAfterDelete).to.be.equal(numberOfProducts);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/03_helpCard.ts b/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/03_helpCard.ts
index d9e18ab3a4a47..f653ca108e378 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/03_helpCard.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/03_helpCard.ts
@@ -44,23 +44,23 @@ describe('BO - Catalog - Monitoring : Help card in monitoring page', async () =>
     await monitoringPage.closeSfToolBar(page);
 
     const pageTitle = await monitoringPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(monitoringPage.pageTitle);
+    expect(pageTitle).to.contains(monitoringPage.pageTitle);
   });
 
   it('should open the help side bar and check the document language', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'openHelpSidebar', baseContext);
 
     const isHelpSidebarVisible = await monitoringPage.openHelpSideBar(page);
-    await expect(isHelpSidebarVisible).to.be.true;
+    expect(isHelpSidebarVisible).to.eq(true);
 
     const documentURL = await monitoringPage.getHelpDocumentURL(page);
-    await expect(documentURL).to.contains('country=en');
+    expect(documentURL).to.contains('country=en');
   });
 
   it('should close the help side bar', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'closeHelpSidebar', baseContext);
 
     const isHelpSidebarClosed = await monitoringPage.closeHelpSideBar(page);
-    await expect(isHelpSidebarClosed).to.be.true;
+    expect(isHelpSidebarClosed).to.eq(true);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/sortPaginationAndBulkDelete/01_emptyCategories.ts b/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/sortPaginationAndBulkDelete/01_emptyCategories.ts
index 1535bfb81e28e..2b5b26d72ac72 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/sortPaginationAndBulkDelete/01_emptyCategories.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/sortPaginationAndBulkDelete/01_emptyCategories.ts
@@ -76,14 +76,14 @@ describe('BO - Catalog - Monitoring : Sort and pagination list of empty categori
       );
 
       const pageTitle = await monitoringPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(monitoringPage.pageTitle);
+      expect(pageTitle).to.contains(monitoringPage.pageTitle);
     });
 
     it('should check that the number of imported categories is greater than 10', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkNumberOfCategories', baseContext);
 
       const numberOfEmptyCategories = await monitoringPage.resetAndGetNumberOfLines(page, 'empty_category');
-      await expect(numberOfEmptyCategories).to.be.at.least(10);
+      expect(numberOfEmptyCategories).to.be.at.least(10);
     });
 
     const sortTests = [
@@ -132,17 +132,17 @@ describe('BO - Catalog - Monitoring : Sort and pagination list of empty categori
             const expectedResult: number[] = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
             if (test.args.sortDirection === 'asc') {
-              await expect(sortedTableFloat).to.deep.equal(expectedResult);
+              expect(sortedTableFloat).to.deep.equal(expectedResult);
             } else {
-              await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+              expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
             }
           } else {
             const expectedResult: string[] = await basicHelper.sortArray(nonSortedTable);
 
             if (test.args.sortDirection === 'asc') {
-              await expect(sortedTable).to.deep.equal(expectedResult);
+              expect(sortedTable).to.deep.equal(expectedResult);
             } else {
-              await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+              expect(sortedTable).to.deep.equal(expectedResult.reverse());
             }
           }
         },
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/sortPaginationAndBulkDelete/02_withCombinationsWithoutQuantities.ts b/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/sortPaginationAndBulkDelete/02_withCombinationsWithoutQuantities.ts
index 35855f3c6e3ef..9b1f9e751347a 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/sortPaginationAndBulkDelete/02_withCombinationsWithoutQuantities.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/sortPaginationAndBulkDelete/02_withCombinationsWithoutQuantities.ts
@@ -85,14 +85,14 @@ describe('BO - Catalog - Monitoring : Sort and pagination list of products with
       );
 
       const pageTitle = await monitoringPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(monitoringPage.pageTitle);
+      expect(pageTitle).to.contains(monitoringPage.pageTitle);
     });
 
     it('should check that the number of imported products is greater than 10', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkNumberOfProducts', baseContext);
 
       const numberOfProductsIngrid = await monitoringPage.resetAndGetNumberOfLines(page, tableName);
-      await expect(numberOfProductsIngrid).to.be.at.least(10);
+      expect(numberOfProductsIngrid).to.be.at.least(10);
     });
 
     const sortTests = [
@@ -146,17 +146,17 @@ describe('BO - Catalog - Monitoring : Sort and pagination list of products with
             const expectedResult: number[] = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
             if (test.args.sortDirection === 'asc') {
-              await expect(sortedTableFloat).to.deep.equal(expectedResult);
+              expect(sortedTableFloat).to.deep.equal(expectedResult);
             } else {
-              await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+              expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
             }
           } else {
             const expectedResult: string[] = await basicHelper.sortArray(nonSortedTable);
 
             if (test.args.sortDirection === 'asc') {
-              await expect(sortedTable).to.deep.equal(expectedResult);
+              expect(sortedTable).to.deep.equal(expectedResult);
             } else {
-              await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+              expect(sortedTable).to.deep.equal(expectedResult.reverse());
             }
           }
         },
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/sortPaginationAndBulkDelete/03_withoutCombinationsWithoutQuantities.ts b/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/sortPaginationAndBulkDelete/03_withoutCombinationsWithoutQuantities.ts
index a7ed8a4efd8a0..3c350d2da02c3 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/sortPaginationAndBulkDelete/03_withoutCombinationsWithoutQuantities.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/sortPaginationAndBulkDelete/03_withoutCombinationsWithoutQuantities.ts
@@ -74,14 +74,14 @@ describe('BO - Catalog - Monitoring : Sort and pagination list of products witho
       );
 
       const pageTitle = await monitoringPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(monitoringPage.pageTitle);
+      expect(pageTitle).to.contains(monitoringPage.pageTitle);
     });
 
     it('should check that the number of imported products is greater than 10', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkNumberOfProducts', baseContext);
 
       const numberOfProductsIngrid = await monitoringPage.resetAndGetNumberOfLines(page, tableName);
-      await expect(numberOfProductsIngrid).to.be.at.least(10);
+      expect(numberOfProductsIngrid).to.be.at.least(10);
     });
 
     const sortTests = [
@@ -135,17 +135,17 @@ describe('BO - Catalog - Monitoring : Sort and pagination list of products witho
             const expectedResult: number[] = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
             if (test.args.sortDirection === 'asc') {
-              await expect(sortedTableFloat).to.deep.equal(expectedResult);
+              expect(sortedTableFloat).to.deep.equal(expectedResult);
             } else {
-              await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+              expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
             }
           } else {
             const expectedResult: string[] = await basicHelper.sortArray(nonSortedTable);
 
             if (test.args.sortDirection === 'asc') {
-              await expect(sortedTable).to.deep.equal(expectedResult);
+              expect(sortedTable).to.deep.equal(expectedResult);
             } else {
-              await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+              expect(sortedTable).to.deep.equal(expectedResult.reverse());
             }
           }
         },
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/sortPaginationAndBulkDelete/04_disabledProducts.ts b/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/sortPaginationAndBulkDelete/04_disabledProducts.ts
index f9c6a07e146f4..602b765caefc5 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/sortPaginationAndBulkDelete/04_disabledProducts.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/sortPaginationAndBulkDelete/04_disabledProducts.ts
@@ -73,14 +73,14 @@ describe('BO - Catalog - Monitoring : Sort and pagination list of disabled produ
       );
 
       const pageTitle = await monitoringPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(monitoringPage.pageTitle);
+      expect(pageTitle).to.contains(monitoringPage.pageTitle);
     });
 
     it('should check that the number of imported products is greater than 10', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkNumberOfProducts', baseContext);
 
       const numberOfProductsIngrid = await monitoringPage.resetAndGetNumberOfLines(page, tableName);
-      await expect(numberOfProductsIngrid).to.be.at.least(10);
+      expect(numberOfProductsIngrid).to.be.at.least(10);
     });
 
     const sortTests = [
@@ -132,17 +132,17 @@ describe('BO - Catalog - Monitoring : Sort and pagination list of disabled produ
             const expectedResult: number[] = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
             if (test.args.sortDirection === 'asc') {
-              await expect(sortedTableFloat).to.deep.equal(expectedResult);
+              expect(sortedTableFloat).to.deep.equal(expectedResult);
             } else {
-              await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+              expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
             }
           } else {
             const expectedResult: string[] = await basicHelper.sortArray(nonSortedTable);
 
             if (test.args.sortDirection === 'asc') {
-              await expect(sortedTable).to.deep.equal(expectedResult);
+              expect(sortedTable).to.deep.equal(expectedResult);
             } else {
-              await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+              expect(sortedTable).to.deep.equal(expectedResult.reverse());
             }
           }
         },
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/sortPaginationAndBulkDelete/05_productsWithoutImage.ts b/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/sortPaginationAndBulkDelete/05_productsWithoutImage.ts
index 3ebda784f73ae..d2fd7065feadd 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/sortPaginationAndBulkDelete/05_productsWithoutImage.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/sortPaginationAndBulkDelete/05_productsWithoutImage.ts
@@ -73,14 +73,14 @@ describe('BO - Catalog - Monitoring : Sort and pagination list of products witho
       );
 
       const pageTitle = await monitoringPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(monitoringPage.pageTitle);
+      expect(pageTitle).to.contains(monitoringPage.pageTitle);
     });
 
     it('should check that the number of imported products is greater than 10', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkNumberOfProducts', baseContext);
 
       const numberOfProductsIngrid = await monitoringPage.resetAndGetNumberOfLines(page, tableName);
-      await expect(numberOfProductsIngrid).to.be.at.least(10);
+      expect(numberOfProductsIngrid).to.be.at.least(10);
     });
 
     const sortTests = [
@@ -134,17 +134,17 @@ describe('BO - Catalog - Monitoring : Sort and pagination list of products witho
             const expectedResult: number[] = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
             if (test.args.sortDirection === 'asc') {
-              await expect(sortedTableFloat).to.deep.equal(expectedResult);
+              expect(sortedTableFloat).to.deep.equal(expectedResult);
             } else {
-              await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+              expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
             }
           } else {
             const expectedResult: string[] = await basicHelper.sortArray(nonSortedTable);
 
             if (test.args.sortDirection === 'asc') {
-              await expect(sortedTable).to.deep.equal(expectedResult);
+              expect(sortedTable).to.deep.equal(expectedResult);
             } else {
-              await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+              expect(sortedTable).to.deep.equal(expectedResult.reverse());
             }
           }
         },
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/sortPaginationAndBulkDelete/06_productsWithoutDescription.ts b/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/sortPaginationAndBulkDelete/06_productsWithoutDescription.ts
index b63e7c2ccc7b9..3976e71fe39f8 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/sortPaginationAndBulkDelete/06_productsWithoutDescription.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/sortPaginationAndBulkDelete/06_productsWithoutDescription.ts
@@ -73,14 +73,14 @@ describe('BO - Catalog - Monitoring : Sort and pagination list of products witho
       );
 
       const pageTitle = await monitoringPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(monitoringPage.pageTitle);
+      expect(pageTitle).to.contains(monitoringPage.pageTitle);
     });
 
     it('should check that the number of imported products is greater than 10', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkNumberOfProducts', baseContext);
 
       const numberOfProductsIngrid = await monitoringPage.resetAndGetNumberOfLines(page, tableName);
-      await expect(numberOfProductsIngrid).to.be.at.least(10);
+      expect(numberOfProductsIngrid).to.be.at.least(10);
     });
 
     const sortTests = [
@@ -132,17 +132,17 @@ describe('BO - Catalog - Monitoring : Sort and pagination list of products witho
             const expectedResult: number[] = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
             if (test.args.sortDirection === 'asc') {
-              await expect(sortedTableFloat).to.deep.equal(expectedResult);
+              expect(sortedTableFloat).to.deep.equal(expectedResult);
             } else {
-              await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+              expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
             }
           } else {
             const expectedResult: string[] = await basicHelper.sortArray(nonSortedTable);
 
             if (test.args.sortDirection === 'asc') {
-              await expect(sortedTable).to.deep.equal(expectedResult);
+              expect(sortedTable).to.deep.equal(expectedResult);
             } else {
-              await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+              expect(sortedTable).to.deep.equal(expectedResult.reverse());
             }
           }
         },
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/sortPaginationAndBulkDelete/07_productsWithoutPrice.ts b/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/sortPaginationAndBulkDelete/07_productsWithoutPrice.ts
index 22e2ca0ea68c8..2ce7f1f1c3a9d 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/sortPaginationAndBulkDelete/07_productsWithoutPrice.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/03_monitoring/sortPaginationAndBulkDelete/07_productsWithoutPrice.ts
@@ -73,14 +73,14 @@ describe('BO - Catalog - Monitoring : Sort and pagination list of products witho
       );
 
       const pageTitle = await monitoringPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(monitoringPage.pageTitle);
+      expect(pageTitle).to.contains(monitoringPage.pageTitle);
     });
 
     it('should check that the number of imported products is greater than 10', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkNumberOfProducts', baseContext);
 
       const numberOfProductsIngrid = await monitoringPage.resetAndGetNumberOfLines(page, tableName);
-      await expect(numberOfProductsIngrid).to.be.at.least(10);
+      expect(numberOfProductsIngrid).to.be.at.least(10);
     });
 
     const sortTests = [
@@ -132,17 +132,17 @@ describe('BO - Catalog - Monitoring : Sort and pagination list of products witho
             const expectedResult: number[] = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
             if (test.args.sortDirection === 'asc') {
-              await expect(sortedTableFloat).to.deep.equal(expectedResult);
+              expect(sortedTableFloat).to.deep.equal(expectedResult);
             } else {
-              await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+              expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
             }
           } else {
             const expectedResult: string[] = await basicHelper.sortArray(nonSortedTable);
 
             if (test.args.sortDirection === 'asc') {
-              await expect(sortedTable).to.deep.equal(expectedResult);
+              expect(sortedTable).to.deep.equal(expectedResult);
             } else {
-              await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+              expect(sortedTable).to.deep.equal(expectedResult.reverse());
             }
           }
         },
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/01_attributes/01_CRUDAttributesAndValues.ts b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/01_attributes/01_CRUDAttributesAndValues.ts
index 29fc5b763a5ff..5d7f9672a0268 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/01_attributes/01_CRUDAttributesAndValues.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/01_attributes/01_CRUDAttributesAndValues.ts
@@ -84,14 +84,14 @@ describe('BO - Catalog - Attributes & Features : CRUD attribute and values', asy
     await attributesPage.closeSfToolBar(page);
 
     const pageTitle = await attributesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(attributesPage.pageTitle);
+    expect(pageTitle).to.contains(attributesPage.pageTitle);
   });
 
   it('should reset all filters and get number of attributes in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfAttributes = await attributesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfAttributes).to.be.above(0);
+    expect(numberOfAttributes).to.be.above(0);
   });
 
   describe('Create attribute', async () => {
@@ -101,17 +101,17 @@ describe('BO - Catalog - Attributes & Features : CRUD attribute and values', asy
       await attributesPage.goToAddAttributePage(page);
 
       const pageTitle = await addAttributePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addAttributePage.createPageTitle);
+      expect(pageTitle).to.contains(addAttributePage.createPageTitle);
     });
 
     it('should create new attribute', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createNewAttribute', baseContext);
 
       const textResult = await addAttributePage.addEditAttribute(page, createAttributeData);
-      await expect(textResult).to.contains(attributesPage.successfulCreationMessage);
+      expect(textResult).to.contains(attributesPage.successfulCreationMessage);
 
       const numberOfAttributesAfterCreation = await attributesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfAttributesAfterCreation).to.equal(numberOfAttributes + 1);
+      expect(numberOfAttributesAfterCreation).to.equal(numberOfAttributes + 1);
     });
   });
 
@@ -122,7 +122,7 @@ describe('BO - Catalog - Attributes & Features : CRUD attribute and values', asy
       await attributesPage.filterTable(page, 'b!name', createAttributeData.name);
 
       const textColumn = await attributesPage.getTextColumn(page, 1, 'b!name');
-      await expect(textColumn).to.contains(createAttributeData.name);
+      expect(textColumn).to.contains(createAttributeData.name);
     });
 
     it('should view attribute', async function () {
@@ -131,7 +131,7 @@ describe('BO - Catalog - Attributes & Features : CRUD attribute and values', asy
       await attributesPage.viewAttribute(page, 1);
 
       const pageTitle = await viewAttributePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(`${viewAttributePage.pageTitle} ${createAttributeData.name}`);
+      expect(pageTitle).to.contains(`${viewAttributePage.pageTitle} ${createAttributeData.name}`);
     });
   });
 
@@ -142,7 +142,7 @@ describe('BO - Catalog - Attributes & Features : CRUD attribute and values', asy
       await viewAttributePage.goToAddNewValuePage(page);
 
       const pageTitle = await addValuePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addValuePage.createPageTitle);
+      expect(pageTitle).to.contains(addValuePage.createPageTitle);
     });
 
     valuesToCreate.forEach((valueToCreate: AttributeValueData, index: number) => {
@@ -150,7 +150,7 @@ describe('BO - Catalog - Attributes & Features : CRUD attribute and values', asy
         await testContext.addContextItem(this, 'testIdentifier', `createValue${index}`, baseContext);
 
         const textResult = await addValuePage.addEditValue(page, valueToCreate, index === 0);
-        await expect(textResult).to.contains(viewAttributePage.successfulCreationMessage);
+        expect(textResult).to.contains(viewAttributePage.successfulCreationMessage);
       });
     });
   });
@@ -163,7 +163,7 @@ describe('BO - Catalog - Attributes & Features : CRUD attribute and values', asy
       await attributesPage.filterTable(page, 'b!name', createAttributeData.name);
 
       const textColumn = await attributesPage.getTextColumn(page, 1, 'b!name');
-      await expect(textColumn).to.contains(createAttributeData.name);
+      expect(textColumn).to.contains(createAttributeData.name);
     });
 
     it('should go to edit attribute page', async function () {
@@ -172,14 +172,14 @@ describe('BO - Catalog - Attributes & Features : CRUD attribute and values', asy
       await attributesPage.goToEditAttributePage(page, 1);
 
       const pageTitle = await addAttributePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addAttributePage.editPageTitle);
+      expect(pageTitle).to.contains(addAttributePage.editPageTitle);
     });
 
     it('should update attribute', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateAttribute', baseContext);
 
       const textResult = await addAttributePage.addEditAttribute(page, updateAttributeData);
-      await expect(textResult).to.contains(attributesPage.successfulUpdateMessage);
+      expect(textResult).to.contains(attributesPage.successfulUpdateMessage);
     });
   });
 
@@ -190,7 +190,7 @@ describe('BO - Catalog - Attributes & Features : CRUD attribute and values', asy
       await attributesPage.filterTable(page, 'b!name', updateAttributeData.name);
 
       const textColumn = await attributesPage.getTextColumn(page, 1, 'b!name');
-      await expect(textColumn).to.contains(updateAttributeData.name);
+      expect(textColumn).to.contains(updateAttributeData.name);
     });
 
     it('should view updated attribute', async function () {
@@ -199,10 +199,10 @@ describe('BO - Catalog - Attributes & Features : CRUD attribute and values', asy
       await attributesPage.viewAttribute(page, 1);
 
       const pageTitle = await viewAttributePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(`${viewAttributePage.pageTitle} ${updateAttributeData.name}`);
+      expect(pageTitle).to.contains(`${viewAttributePage.pageTitle} ${updateAttributeData.name}`);
 
       const numberOfValues = await viewAttributePage.getNumberOfElementInGrid(page);
-      await expect(numberOfValues).to.equal(2);
+      expect(numberOfValues).to.equal(2);
     });
   });
 
@@ -213,7 +213,7 @@ describe('BO - Catalog - Attributes & Features : CRUD attribute and values', asy
       await viewAttributePage.filterTable(page, 'b!name', valuesToCreate[0].value);
 
       const textColumn = await viewAttributePage.getTextColumn(page, 1, 'b!name');
-      await expect(textColumn).to.contains(valuesToCreate[0].value);
+      expect(textColumn).to.contains(valuesToCreate[0].value);
     });
 
     it('should go to edit value page', async function () {
@@ -222,14 +222,14 @@ describe('BO - Catalog - Attributes & Features : CRUD attribute and values', asy
       await viewAttributePage.goToEditValuePage(page, 1);
 
       const pageTitle = await addValuePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addValuePage.editPageTitle);
+      expect(pageTitle).to.contains(addValuePage.editPageTitle);
     });
 
     it('should update value', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateValue', baseContext);
 
       const textResult = await addValuePage.addEditValue(page, updateValueData);
-      await expect(textResult).to.contains(addValuePage.successfulUpdateMessage);
+      expect(textResult).to.contains(addValuePage.successfulUpdateMessage);
     });
   });
 
@@ -240,17 +240,17 @@ describe('BO - Catalog - Attributes & Features : CRUD attribute and values', asy
       await viewAttributePage.filterTable(page, 'b!name', valuesToCreate[1].value);
 
       const textColumn = await viewAttributePage.getTextColumn(page, 1, 'b!name');
-      await expect(textColumn).to.contains(valuesToCreate[1].value);
+      expect(textColumn).to.contains(valuesToCreate[1].value);
     });
 
     it('should delete value', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteValue', baseContext);
 
       const textResult = await viewAttributePage.deleteValue(page, 1);
-      await expect(textResult).to.contains(viewAttributePage.successfulDeleteMessage);
+      expect(textResult).to.contains(viewAttributePage.successfulDeleteMessage);
 
       const numberOfValues = await viewAttributePage.resetAndGetNumberOfLines(page);
-      await expect(numberOfValues).to.equal(1);
+      expect(numberOfValues).to.equal(1);
     });
   });
 
@@ -261,7 +261,7 @@ describe('BO - Catalog - Attributes & Features : CRUD attribute and values', asy
       await viewAttributePage.backToAttributesList(page);
 
       const pageTitle = await attributesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(attributesPage.pageTitle);
+      expect(pageTitle).to.contains(attributesPage.pageTitle);
     });
 
     it('should filter attributes', async function () {
@@ -271,17 +271,17 @@ describe('BO - Catalog - Attributes & Features : CRUD attribute and values', asy
       await attributesPage.filterTable(page, 'b!name', updateAttributeData.name);
 
       const textColumn = await attributesPage.getTextColumn(page, 1, 'b!name');
-      await expect(textColumn).to.contains(updateAttributeData.name);
+      expect(textColumn).to.contains(updateAttributeData.name);
     });
 
     it('should delete attribute', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteAttribute', baseContext);
 
       const textResult = await attributesPage.deleteAttribute(page, 1);
-      await expect(textResult).to.contains(attributesPage.successfulDeleteMessage);
+      expect(textResult).to.contains(attributesPage.successfulDeleteMessage);
 
       const numberOfAttributesAfterDelete = await attributesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfAttributesAfterDelete).to.equal(numberOfAttributes);
+      expect(numberOfAttributesAfterDelete).to.equal(numberOfAttributes);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/01_attributes/02_changePosition.ts b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/01_attributes/02_changePosition.ts
index c83682ac4cb70..1a7f77855490e 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/01_attributes/02_changePosition.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/01_attributes/02_changePosition.ts
@@ -58,7 +58,7 @@ describe('BO - Catalog - Attributes & Features : Change attributes & values posi
     );
 
     const pageTitle = await attributesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(attributesPage.pageTitle);
+    expect(pageTitle).to.contains(attributesPage.pageTitle);
   });
 
   describe('Change attribute position', async () => {
@@ -67,7 +67,7 @@ describe('BO - Catalog - Attributes & Features : Change attributes & values posi
       await testContext.addContextItem(this, 'testIdentifier', 'resetAttributesFilters', baseContext);
 
       const numberOfAttributes = await attributesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfAttributes).to.be.above(2);
+      expect(numberOfAttributes).to.be.above(2);
     });
 
     it('should sort by \'position\' \'asc\' and check result', async function () {
@@ -83,7 +83,7 @@ describe('BO - Catalog - Attributes & Features : Change attributes & values posi
       const sortedTableFloat = sortedTable.map((text: string): number => parseFloat(text));
 
       const expectedResult = await basicHelper.sortArrayNumber(nonSortedTableFloat);
-      await expect(sortedTableFloat).to.deep.equal(expectedResult);
+      expect(sortedTableFloat).to.deep.equal(expectedResult);
     });
 
     it('should change first attribute position to 3', async function () {
@@ -94,11 +94,11 @@ describe('BO - Catalog - Attributes & Features : Change attributes & values posi
 
       // Change position and check successful message
       const textResult = await attributesPage.changePosition(page, 1, 3);
-      await expect(textResult, 'Unable to change position').to.contains(attributesPage.successfulUpdateMessage);
+      expect(textResult, 'Unable to change position').to.contains(attributesPage.successfulUpdateMessage);
 
       // Get third row attribute name and check if is equal the first row attribute name before changing position
       const thirdRowAttributeName = await attributesPage.getTextColumn(page, 3, 'b!name');
-      await expect(thirdRowAttributeName, 'Changing position was done wrongly').to.equal(firstRowAttributeName);
+      expect(thirdRowAttributeName, 'Changing position was done wrongly').to.equal(firstRowAttributeName);
     });
 
     it('should reset third attribute position to 1', async function () {
@@ -109,11 +109,11 @@ describe('BO - Catalog - Attributes & Features : Change attributes & values posi
 
       // Change position and check successful message
       const textResult = await attributesPage.changePosition(page, 3, 1);
-      await expect(textResult, 'Unable to change position').to.contains(attributesPage.successfulUpdateMessage);
+      expect(textResult, 'Unable to change position').to.contains(attributesPage.successfulUpdateMessage);
 
       // Get first row attribute name and check if is equal the first row attribute name before changing position
       const firstRowAttributeName = await attributesPage.getTextColumn(page, 1, 'b!name');
-      await expect(firstRowAttributeName, 'Changing position was done wrongly').to.equal(thirdRowAttributeName);
+      expect(firstRowAttributeName, 'Changing position was done wrongly').to.equal(thirdRowAttributeName);
     });
   });
 
@@ -124,7 +124,7 @@ describe('BO - Catalog - Attributes & Features : Change attributes & values posi
       await attributesPage.filterTable(page, 'b!name', Attributes.size.name);
 
       const textColumn = await attributesPage.getTextColumn(page, 1, 'b!name');
-      await expect(textColumn).to.contains(Attributes.size.name);
+      expect(textColumn).to.contains(Attributes.size.name);
     });
 
     it('should view attribute', async function () {
@@ -133,7 +133,7 @@ describe('BO - Catalog - Attributes & Features : Change attributes & values posi
       await attributesPage.viewAttribute(page, 1);
 
       const pageTitle = await viewAttributePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(`${viewAttributePage.pageTitle} ${Attributes.size.name}`);
+      expect(pageTitle).to.contains(`${viewAttributePage.pageTitle} ${Attributes.size.name}`);
     });
 
     // Should reset filters before changing position
@@ -141,7 +141,7 @@ describe('BO - Catalog - Attributes & Features : Change attributes & values posi
       await testContext.addContextItem(this, 'testIdentifier', 'resetValueFilters', baseContext);
 
       const numberOfValues = await viewAttributePage.resetAndGetNumberOfLines(page);
-      await expect(numberOfValues).to.be.above(2);
+      expect(numberOfValues).to.be.above(2);
     });
 
     it('should change first value position to 3', async function () {
@@ -152,11 +152,11 @@ describe('BO - Catalog - Attributes & Features : Change attributes & values posi
 
       // Change position and check successful message
       const textResult = await viewAttributePage.changePosition(page, 1, 3);
-      await expect(textResult, 'Unable to change position').to.contains(attributesPage.successfulUpdateMessage);
+      expect(textResult, 'Unable to change position').to.contains(attributesPage.successfulUpdateMessage);
 
       // Get third row attribute name and check if is equal the first row attribute name before changing position
       const thirdRowValueName = await viewAttributePage.getTextColumn(page, 3, 'b!name');
-      await expect(thirdRowValueName, 'Changing position was done wrongly').to.equal(firstRowValueName);
+      expect(thirdRowValueName, 'Changing position was done wrongly').to.equal(firstRowValueName);
     });
 
     it('should reset third value position to 1', async function () {
@@ -167,11 +167,11 @@ describe('BO - Catalog - Attributes & Features : Change attributes & values posi
 
       // Change position and check successful message
       const textResult = await viewAttributePage.changePosition(page, 3, 1);
-      await expect(textResult, 'Unable to change position').to.contains(attributesPage.successfulUpdateMessage);
+      expect(textResult, 'Unable to change position').to.contains(attributesPage.successfulUpdateMessage);
 
       // Get first row attribute name and check if is equal the first row attribute name before changing position
       const firstRowValueName = await viewAttributePage.getTextColumn(page, 1, 'b!name');
-      await expect(firstRowValueName, 'Changing position was done wrongly').to.equal(thirdRowValueName);
+      expect(firstRowValueName, 'Changing position was done wrongly').to.equal(thirdRowValueName);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/01_attributes/attributes/01_filterAttributes.ts b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/01_attributes/attributes/01_filterAttributes.ts
index 8c3fe7264979e..052bd0d64b785 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/01_attributes/attributes/01_filterAttributes.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/01_attributes/attributes/01_filterAttributes.ts
@@ -51,14 +51,14 @@ describe('BO - Catalog - Attributes & Features : Filter attributes table', async
     await attributesPage.closeSfToolBar(page);
 
     const pageTitle = await attributesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(attributesPage.pageTitle);
+    expect(pageTitle).to.contains(attributesPage.pageTitle);
   });
 
   it('should reset all filters and get number of attributes in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfAttributes = await attributesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfAttributes).to.be.above(0);
+    expect(numberOfAttributes).to.be.above(0);
   });
 
   describe('Filter attributes', async () => {
@@ -91,14 +91,14 @@ describe('BO - Catalog - Attributes & Features : Filter attributes table', async
         );
 
         const numberOfAttributesAfterFilter = await attributesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfAttributesAfterFilter).to.be.at.most(numberOfAttributes);
+        expect(numberOfAttributesAfterFilter).to.be.at.most(numberOfAttributes);
 
         const textColumn = await attributesPage.getTextColumn(page, 1, test.args.filterBy);
 
         if (typeof test.args.filterValue === 'number') {
-          await expect(textColumn).to.contains(test.args.filterValue + 1);
+          expect(textColumn).to.contains(test.args.filterValue + 1);
         } else {
-          await expect(textColumn).to.contains(test.args.filterValue);
+          expect(textColumn).to.contains(test.args.filterValue);
         }
       });
 
@@ -106,7 +106,7 @@ describe('BO - Catalog - Attributes & Features : Filter attributes table', async
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}Reset`, baseContext);
 
         const numberOfAttributesAfterReset = await attributesPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfAttributesAfterReset).to.equal(numberOfAttributes);
+        expect(numberOfAttributesAfterReset).to.equal(numberOfAttributes);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/01_attributes/attributes/02_sortPaginationAndBulkDelete.ts b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/01_attributes/attributes/02_sortPaginationAndBulkDelete.ts
index e3fdb59a3f47e..b491efd34c1a8 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/01_attributes/attributes/02_sortPaginationAndBulkDelete.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/01_attributes/attributes/02_sortPaginationAndBulkDelete.ts
@@ -56,14 +56,14 @@ describe('BO - Catalog - Attributes & Features : Sort, pagination and bulk delet
     await attributesPage.closeSfToolBar(page);
 
     const pageTitle = await attributesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(attributesPage.pageTitle);
+    expect(pageTitle).to.contains(attributesPage.pageTitle);
   });
 
   it('should reset all filters and get number of attributes in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfAttributes = await attributesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfAttributes).to.be.above(0);
+    expect(numberOfAttributes).to.be.above(0);
   });
 
   // 1 : Create 17 new attributes
@@ -77,17 +77,17 @@ describe('BO - Catalog - Attributes & Features : Sort, pagination and bulk delet
         await attributesPage.goToAddAttributePage(page);
 
         const pageTitle = await addAttributePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addAttributePage.createPageTitle);
+        expect(pageTitle).to.contains(addAttributePage.createPageTitle);
       });
 
       it(`should create attribute n°${index + 1}`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `createNewAttribute${index}`, baseContext);
 
         const textResult = await addAttributePage.addEditAttribute(page, createAttributeData);
-        await expect(textResult).to.contains(attributesPage.successfulCreationMessage);
+        expect(textResult).to.contains(attributesPage.successfulCreationMessage);
 
         const numberOfAttributesAfterCreation = await attributesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfAttributesAfterCreation).to.equal(numberOfAttributes + 1 + index);
+        expect(numberOfAttributesAfterCreation).to.equal(numberOfAttributes + 1 + index);
       });
     });
   });
@@ -175,17 +175,17 @@ describe('BO - Catalog - Attributes & Features : Sort, pagination and bulk delet
           const expectedResult: number[] = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
           if (test.args.sortDirection === 'up') {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+            expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+            expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
         } else {
           const expectedResult: string[] = await basicHelper.sortArray(nonSortedTable);
 
           if (test.args.sortDirection === 'up') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         }
       });
@@ -200,21 +200,21 @@ describe('BO - Catalog - Attributes & Features : Sort, pagination and bulk delet
       await attributesPage.filterTable(page, 'b!name', 'todelete');
 
       const textColumn = await attributesPage.getTextColumn(page, 1, 'b!name');
-      await expect(textColumn).to.contains('todelete');
+      expect(textColumn).to.contains('todelete');
     });
 
     it('should delete attributes with Bulk Actions and check result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteAttributes', baseContext);
 
       const deleteTextResult = await attributesPage.bulkDeleteAttributes(page);
-      await expect(deleteTextResult).to.be.contains(attributesPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.contains(attributesPage.successfulMultiDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterDelete', baseContext);
 
       const numberOfAttributesAfterReset = await attributesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfAttributesAfterReset).to.be.equal(numberOfAttributes);
+      expect(numberOfAttributesAfterReset).to.be.equal(numberOfAttributes);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/01_attributes/attributes/04_helpCard.ts b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/01_attributes/attributes/04_helpCard.ts
index 28b48a28930ad..db74ad1ac768e 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/01_attributes/attributes/04_helpCard.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/01_attributes/attributes/04_helpCard.ts
@@ -48,27 +48,27 @@ describe('BO - Catalog - Attributes & Features : Help card on attributes page',
     await attributesPage.closeSfToolBar(page);
 
     const pageTitle = await attributesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(attributesPage.pageTitle);
+    expect(pageTitle).to.contains(attributesPage.pageTitle);
   });
 
   it('should open the help side bar', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'openHelpSidebar', baseContext);
 
     const isHelpSidebarVisible = await attributesPage.openHelpSideBar(page);
-    await expect(isHelpSidebarVisible).to.be.true;
+    expect(isHelpSidebarVisible).to.eq(true);
   });
 
   it('should check the document language', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'checkDocumentLanguage', baseContext);
 
     const documentURL = await attributesPage.getHelpDocumentURL(page);
-    await expect(documentURL).to.contains('country=en');
+    expect(documentURL).to.contains('country=en');
   });
 
   it('should close the help side bar', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'closeHelpSidebar', baseContext);
 
     const isHelpSidebarClosed = await attributesPage.closeHelpSideBar(page);
-    await expect(isHelpSidebarClosed).to.be.true;
+    expect(isHelpSidebarClosed).to.eq(true);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/01_attributes/values/01_filterValues.ts b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/01_attributes/values/01_filterValues.ts
index 80ed866595ddf..55dd540f8c904 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/01_attributes/values/01_filterValues.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/01_attributes/values/01_filterValues.ts
@@ -53,7 +53,7 @@ describe('BO - Catalog - Attributes & Features : Filter attribute values table',
     await attributesPage.closeSfToolBar(page);
 
     const pageTitle = await attributesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(attributesPage.pageTitle);
+    expect(pageTitle).to.contains(attributesPage.pageTitle);
   });
 
   it('should filter attributes table by name \'Color\'', async function () {
@@ -62,7 +62,7 @@ describe('BO - Catalog - Attributes & Features : Filter attribute values table',
     await attributesPage.filterTable(page, 'b!name', Attributes.color.name);
 
     const textColumn = await attributesPage.getTextColumn(page, 1, 'b!name');
-    await expect(textColumn).to.contains(Attributes.color.name);
+    expect(textColumn).to.contains(Attributes.color.name);
   });
 
   it('should view attribute', async function () {
@@ -71,14 +71,14 @@ describe('BO - Catalog - Attributes & Features : Filter attribute values table',
     await attributesPage.viewAttribute(page, 1);
 
     const pageTitle = await viewAttributePage.getPageTitle(page);
-    await expect(pageTitle).to.contains(`${viewAttributePage.pageTitle} ${Attributes.color.name}`);
+    expect(pageTitle).to.contains(`${viewAttributePage.pageTitle} ${Attributes.color.name}`);
   });
 
   it('should reset all filters and get number of values in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfValues = await viewAttributePage.resetAndGetNumberOfLines(page);
-    await expect(numberOfValues).to.be.above(0);
+    expect(numberOfValues).to.be.above(0);
   });
 
   describe('Filter values table', async () => {
@@ -128,14 +128,14 @@ describe('BO - Catalog - Attributes & Features : Filter attribute values table',
         );
 
         const numberOfValuesAfterFilter = await viewAttributePage.getNumberOfElementInGrid(page);
-        await expect(numberOfValuesAfterFilter).to.be.at.most(numberOfValues);
+        expect(numberOfValuesAfterFilter).to.be.at.most(numberOfValues);
 
         const textColumn = await viewAttributePage.getTextColumn(page, 1, test.args.filterBy);
 
         if (typeof test.args.filterValue === 'number') {
-          await expect(textColumn).to.contains(test.args.filterValue + 1);
+          expect(textColumn).to.contains(test.args.filterValue + 1);
         } else {
-          await expect(textColumn).to.contains(test.args.filterValue);
+          expect(textColumn).to.contains(test.args.filterValue);
         }
       });
 
@@ -143,7 +143,7 @@ describe('BO - Catalog - Attributes & Features : Filter attribute values table',
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}Reset`, baseContext);
 
         const numberOfValuesAfterReset = await viewAttributePage.resetAndGetNumberOfLines(page);
-        await expect(numberOfValuesAfterReset).to.equal(numberOfValues);
+        expect(numberOfValuesAfterReset).to.equal(numberOfValues);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/01_attributes/values/02_sortPaginationAndBulkDelete.ts b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/01_attributes/values/02_sortPaginationAndBulkDelete.ts
index 0d273472ace25..42b7bc797eaa7 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/01_attributes/values/02_sortPaginationAndBulkDelete.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/01_attributes/values/02_sortPaginationAndBulkDelete.ts
@@ -58,14 +58,14 @@ describe('BO - Catalog - Attributes & Features : Sort, pagination and bulk delet
     await attributesPage.closeSfToolBar(page);
 
     const pageTitle = await attributesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(attributesPage.pageTitle);
+    expect(pageTitle).to.contains(attributesPage.pageTitle);
   });
 
   it('should reset all filters', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetAttributeFilter', baseContext);
 
     const numberOfAttributesAfterReset = await attributesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfAttributesAfterReset).to.be.above(0);
+    expect(numberOfAttributesAfterReset).to.be.above(0);
   });
 
   it('should filter list of attributes by name \'Color\'', async function () {
@@ -74,7 +74,7 @@ describe('BO - Catalog - Attributes & Features : Sort, pagination and bulk delet
     await attributesPage.filterTable(page, 'b!name', 'Color');
 
     const textColumn = await attributesPage.getTextColumn(page, 1, 'b!name');
-    await expect(textColumn).to.contains('Color');
+    expect(textColumn).to.contains('Color');
   });
 
   it('should view attribute \'Color\'', async function () {
@@ -83,10 +83,10 @@ describe('BO - Catalog - Attributes & Features : Sort, pagination and bulk delet
     await attributesPage.viewAttribute(page, 1);
 
     const pageTitle = await viewAttributePage.getPageTitle(page);
-    await expect(pageTitle).to.contains(`${viewAttributePage.pageTitle} Color`);
+    expect(pageTitle).to.contains(`${viewAttributePage.pageTitle} Color`);
 
     numberOfValues = await viewAttributePage.resetAndGetNumberOfLines(page);
-    await expect(numberOfValues).to.be.above(0);
+    expect(numberOfValues).to.be.above(0);
   });
 
   // 1 : Create 7 new values
@@ -98,7 +98,7 @@ describe('BO - Catalog - Attributes & Features : Sort, pagination and bulk delet
       await viewAttributePage.goToAddNewValuePage(page);
 
       const pageTitle = await addValuePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addValuePage.createPageTitle);
+      expect(pageTitle).to.contains(addValuePage.createPageTitle);
     });
 
     creationTests.forEach((test: number, index: number) => {
@@ -107,7 +107,7 @@ describe('BO - Catalog - Attributes & Features : Sort, pagination and bulk delet
         await testContext.addContextItem(this, 'testIdentifier', `createNewValue${index}`, baseContext);
 
         const textResult = await addValuePage.addEditValue(page, createValueData, index !== 6);
-        await expect(textResult).to.contains(attributesPage.successfulCreationMessage);
+        expect(textResult).to.contains(attributesPage.successfulCreationMessage);
       });
     });
 
@@ -117,10 +117,10 @@ describe('BO - Catalog - Attributes & Features : Sort, pagination and bulk delet
       await attributesPage.viewAttribute(page, 1);
 
       const pageTitle = await viewAttributePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(`${viewAttributePage.pageTitle} Color`);
+      expect(pageTitle).to.contains(`${viewAttributePage.pageTitle} Color`);
 
       const numberOfValuesAfterCreation = await viewAttributePage.resetAndGetNumberOfLines(page);
-      await expect(numberOfValuesAfterCreation).to.equal(numberOfValues + 7);
+      expect(numberOfValuesAfterCreation).to.equal(numberOfValues + 7);
     });
   });
 
@@ -217,17 +217,17 @@ describe('BO - Catalog - Attributes & Features : Sort, pagination and bulk delet
           const expectedResult: number[] = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
           if (test.args.sortDirection === 'up') {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+            expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+            expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
         } else {
           const expectedResult: string[] = await basicHelper.sortArray(nonSortedTable);
 
           if (test.args.sortDirection === 'up') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         }
       });
@@ -242,21 +242,21 @@ describe('BO - Catalog - Attributes & Features : Sort, pagination and bulk delet
       await viewAttributePage.filterTable(page, 'b!name', 'toDelete');
 
       const numberOfValuesAfterFilter = await viewAttributePage.getNumberOfElementInGrid(page);
-      await expect(numberOfValuesAfterFilter).to.be.at.most(numberOfValues);
+      expect(numberOfValuesAfterFilter).to.be.at.most(numberOfValues);
     });
 
     it('should delete values with Bulk Actions and check result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteAttributes', baseContext);
 
       const deleteTextResult = await viewAttributePage.bulkDeleteValues(page);
-      await expect(deleteTextResult).to.be.contains(viewAttributePage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.contains(viewAttributePage.successfulMultiDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilter', baseContext);
 
       const numberOfValuesAfterReset = await viewAttributePage.resetAndGetNumberOfLines(page);
-      await expect(numberOfValuesAfterReset).to.equal(numberOfValues);
+      expect(numberOfValuesAfterReset).to.equal(numberOfValues);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/01_CRUDFeaturesAndValues.ts b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/01_CRUDFeaturesAndValues.ts
index 0b2041754fb54..2cbc0fb556b32 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/01_CRUDFeaturesAndValues.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/01_CRUDFeaturesAndValues.ts
@@ -77,7 +77,7 @@ describe('BO - Catalog - Attributes & Features : CRUD features and values', asyn
     await attributesPage.closeSfToolBar(page);
 
     const pageTitle = await attributesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(attributesPage.pageTitle);
+    expect(pageTitle).to.contains(attributesPage.pageTitle);
   });
 
   it('should go to Features page', async function () {
@@ -86,14 +86,14 @@ describe('BO - Catalog - Attributes & Features : CRUD features and values', asyn
     await attributesPage.goToFeaturesPage(page);
 
     const pageTitle = await featuresPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(featuresPage.pageTitle);
+    expect(pageTitle).to.contains(featuresPage.pageTitle);
   });
 
   it('should reset all filters and get number of features in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfFeatures = await featuresPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfFeatures).to.be.above(0);
+    expect(numberOfFeatures).to.be.above(0);
   });
 
   describe('Create feature', async () => {
@@ -103,14 +103,14 @@ describe('BO - Catalog - Attributes & Features : CRUD features and values', asyn
       await featuresPage.goToAddFeaturePage(page);
 
       const pageTitle = await addFeaturePage.getPageTitle(page);
-      await expect(pageTitle).to.eq(addFeaturePage.createPageTitle);
+      expect(pageTitle).to.eq(addFeaturePage.createPageTitle);
     });
 
     it('should create feature', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createNewFeature', baseContext);
 
       const textResult = await addFeaturePage.setFeature(page, createFeatureData);
-      await expect(textResult).to.contains(featuresPage.successfulCreationMessage);
+      expect(textResult).to.contains(featuresPage.successfulCreationMessage);
     });
   });
 
@@ -121,7 +121,7 @@ describe('BO - Catalog - Attributes & Features : CRUD features and values', asyn
       await featuresPage.filterTable(page, 'name', createFeatureData.name);
 
       const textColumn = await featuresPage.getTextColumn(page, 1, 'name');
-      await expect(textColumn).to.contains(createFeatureData.name);
+      expect(textColumn).to.contains(createFeatureData.name);
     });
 
     it('should view feature', async function () {
@@ -130,7 +130,7 @@ describe('BO - Catalog - Attributes & Features : CRUD features and values', asyn
       await featuresPage.viewFeature(page, 1);
 
       const pageTitle = await viewFeaturePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(`${createFeatureData.name} • ${global.INSTALL.SHOP_NAME}`);
+      expect(pageTitle).to.contains(`${createFeatureData.name} • ${global.INSTALL.SHOP_NAME}`);
     });
   });
 
@@ -141,21 +141,21 @@ describe('BO - Catalog - Attributes & Features : CRUD features and values', asyn
       await viewFeaturePage.goToAddNewValuePage(page);
 
       const pageTitle = await addValuePage.getPageTitle(page);
-      await expect(pageTitle).to.eq(addValuePage.createPageTitle);
+      expect(pageTitle).to.eq(addValuePage.createPageTitle);
     });
 
     it('should create value', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createNewValue', baseContext);
 
       const textResult = await addValuePage.addEditValue(page, createFeatureValueData, true);
-      await expect(textResult).to.contains(addValuePage.successfulCreationMessage);
+      expect(textResult).to.contains(addValuePage.successfulCreationMessage);
     });
 
     it('should create a second value', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createSecondValue', baseContext);
 
       const textResult = await addValuePage.addEditValue(page, createSecondFeatureValueData, false);
-      await expect(textResult).to.contains(viewFeaturePage.successfulCreationMessage);
+      expect(textResult).to.contains(viewFeaturePage.successfulCreationMessage);
     });
   });
 
@@ -164,10 +164,10 @@ describe('BO - Catalog - Attributes & Features : CRUD features and values', asyn
       await testContext.addContextItem(this, 'testIdentifier', 'viewFeature1', baseContext);
 
       const pageTitle = await viewFeaturePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(`${createFeatureData.name} • ${global.INSTALL.SHOP_NAME}`);
+      expect(pageTitle).to.contains(`${createFeatureData.name} • ${global.INSTALL.SHOP_NAME}`);
 
       const numberOfValuesAfterCreation = await viewFeaturePage.resetAndGetNumberOfLines(page);
-      await expect(numberOfValuesAfterCreation).to.equal(numberOfValues + 2);
+      expect(numberOfValuesAfterCreation).to.equal(numberOfValues + 2);
     });
   });
 
@@ -178,14 +178,14 @@ describe('BO - Catalog - Attributes & Features : CRUD features and values', asyn
       await viewFeaturePage.goToEditValuePage(page, 2);
 
       const pageTitle = await addValuePage.getPageTitle(page);
-      await expect(pageTitle).to.eq(addValuePage.editPageTitle);
+      expect(pageTitle).to.eq(addValuePage.editPageTitle);
     });
 
     it('should update the second value', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'editValue', baseContext);
 
       const textResult = await addValuePage.addEditValue(page, editSecondFeatureValueData, false);
-      await expect(textResult).to.contains(viewFeaturePage.successfulUpdateMessage);
+      expect(textResult).to.contains(viewFeaturePage.successfulUpdateMessage);
     });
   });
 
@@ -196,7 +196,7 @@ describe('BO - Catalog - Attributes & Features : CRUD features and values', asyn
       await viewFeaturePage.clickOnBackToTheListButton(page);
 
       const pageTitle = await featuresPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(featuresPage.pageTitle);
+      expect(pageTitle).to.contains(featuresPage.pageTitle);
     });
 
     it('should filter list of features by the created feature', async function () {
@@ -205,7 +205,7 @@ describe('BO - Catalog - Attributes & Features : CRUD features and values', asyn
       await featuresPage.filterTable(page, 'name', createFeatureData.name);
 
       const textColumn = await featuresPage.getTextColumn(page, 1, 'name');
-      await expect(textColumn).to.contains(createFeatureData.name);
+      expect(textColumn).to.contains(createFeatureData.name);
     });
 
     it('should edit the created feature', async function () {
@@ -214,7 +214,7 @@ describe('BO - Catalog - Attributes & Features : CRUD features and values', asyn
       await featuresPage.clickOnEditFeature(page, 1);
 
       const textResult = await addFeaturePage.setFeature(page, editFeatureData);
-      await expect(textResult).to.contains(addFeaturePage.successfulUpdateMessage);
+      expect(textResult).to.contains(addFeaturePage.successfulUpdateMessage);
     });
   });
 
@@ -225,14 +225,14 @@ describe('BO - Catalog - Attributes & Features : CRUD features and values', asyn
       await featuresPage.viewFeature(page, 1);
 
       const pageTitle = await viewFeaturePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(`${editFeatureData.name} • ${global.INSTALL.SHOP_NAME}`);
+      expect(pageTitle).to.contains(`${editFeatureData.name} • ${global.INSTALL.SHOP_NAME}`);
     });
 
     it('should delete the second value', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteValue', baseContext);
 
       const textResult = await viewFeaturePage.deleteValue(page, 2);
-      await expect(textResult).to.contains(viewFeaturePage.successfulDeleteMessage);
+      expect(textResult).to.contains(viewFeaturePage.successfulDeleteMessage);
     });
   });
 
@@ -243,7 +243,7 @@ describe('BO - Catalog - Attributes & Features : CRUD features and values', asyn
       await viewFeaturePage.clickOnBackToTheListButton(page);
 
       const pageTitle = await featuresPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(featuresPage.pageTitle);
+      expect(pageTitle).to.contains(featuresPage.pageTitle);
     });
 
     it('should filter list of features by the created feature', async function () {
@@ -252,14 +252,14 @@ describe('BO - Catalog - Attributes & Features : CRUD features and values', asyn
       await featuresPage.filterTable(page, 'name', editFeatureData.name);
 
       const textColumn = await featuresPage.getTextColumn(page, 1, 'name');
-      await expect(textColumn).to.contains(editFeatureData.name);
+      expect(textColumn).to.contains(editFeatureData.name);
     });
 
     it('should delete the created feature', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteFeature', baseContext);
 
       const textResult = await featuresPage.deleteFeature(page, 1);
-      await expect(textResult).to.contains(featuresPage.successfulDeleteMessage);
+      expect(textResult).to.contains(featuresPage.successfulDeleteMessage);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/01_filterFeatures.ts b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/01_filterFeatures.ts
index ee5226af86035..d40e4615da2d1 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/01_filterFeatures.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/01_filterFeatures.ts
@@ -49,7 +49,7 @@ describe('BO - Catalog - Attributes & Features : Filter features table', async (
     await attributesPage.closeSfToolBar(page);
 
     const pageTitle = await attributesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(attributesPage.pageTitle);
+    expect(pageTitle).to.contains(attributesPage.pageTitle);
   });
 
   it('should go to features page', async function () {
@@ -58,14 +58,14 @@ describe('BO - Catalog - Attributes & Features : Filter features table', async (
     await attributesPage.goToFeaturesPage(page);
 
     const pageTitle = await featuresPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(featuresPage.pageTitle);
+    expect(pageTitle).to.contains(featuresPage.pageTitle);
   });
 
   it('should reset all filters and get number of features in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfFeatures = await featuresPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfFeatures).to.be.above(0);
+    expect(numberOfFeatures).to.be.above(0);
   });
 
   describe('Filter features', async () => {
@@ -100,21 +100,21 @@ describe('BO - Catalog - Attributes & Features : Filter features table', async (
         );
 
         const numberOfFeaturesAfterFilter = await featuresPage.getNumberOfElementInGrid(page);
-        await expect(numberOfFeaturesAfterFilter).to.be.at.most(numberOfFeatures);
+        expect(numberOfFeaturesAfterFilter).to.be.at.most(numberOfFeatures);
 
         const textColumn = await featuresPage.getTextColumn(
           page,
           1,
           test.args.filterBy,
         );
-        await expect(textColumn).to.contains(test.args.filterValue);
+        expect(textColumn).to.contains(test.args.filterValue);
       });
 
       it('should reset all filters', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}Reset`, baseContext);
 
         const numberOfFeaturesAfterReset = await featuresPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfFeaturesAfterReset).to.equal(numberOfFeatures);
+        expect(numberOfFeaturesAfterReset).to.equal(numberOfFeatures);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/02_sortPaginationAndBulkDelete.ts b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/02_sortPaginationAndBulkDelete.ts
index 2c120595ac91e..600855a2120aa 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/02_sortPaginationAndBulkDelete.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/02_sortPaginationAndBulkDelete.ts
@@ -69,7 +69,7 @@ describe('BO - Catalog - Attributes & Features : Sort, pagination and bulk delet
       await attributesPage.closeSfToolBar(page);
 
       const pageTitle = await attributesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(attributesPage.pageTitle);
+      expect(pageTitle).to.contains(attributesPage.pageTitle);
     });
 
     it('should go to Features page', async function () {
@@ -78,10 +78,10 @@ describe('BO - Catalog - Attributes & Features : Sort, pagination and bulk delet
       await attributesPage.goToFeaturesPage(page);
 
       const pageTitle = await featuresPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(featuresPage.pageTitle);
+      expect(pageTitle).to.contains(featuresPage.pageTitle);
 
       numberOfFeatures = await featuresPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfFeatures).to.be.above(0);
+      expect(numberOfFeatures).to.be.above(0);
     });
 
     it('should change the items number to 20 per page', async function () {
@@ -165,17 +165,17 @@ describe('BO - Catalog - Attributes & Features : Sort, pagination and bulk delet
           const expectedResult = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+            expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+            expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
         } else {
           const expectedResult = await basicHelper.sortArray(nonSortedTable);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         }
 
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/03_changePosition.ts b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/03_changePosition.ts
index ff9e620864885..333c249b90a6c 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/03_changePosition.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/03_changePosition.ts
@@ -57,7 +57,7 @@ describe('BO - Catalog - Attributes & Features : Change feature position', async
       await attributesPage.closeSfToolBar(page);
 
       const pageTitle = await attributesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(attributesPage.pageTitle);
+      expect(pageTitle).to.contains(attributesPage.pageTitle);
     });
 
     it('should go to Features page', async function () {
@@ -66,7 +66,7 @@ describe('BO - Catalog - Attributes & Features : Change feature position', async
       await attributesPage.goToFeaturesPage(page);
 
       const pageTitle = await featuresPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(featuresPage.pageTitle);
+      expect(pageTitle).to.contains(featuresPage.pageTitle);
     });
 
     it('should go to add new feature page', async function () {
@@ -75,14 +75,14 @@ describe('BO - Catalog - Attributes & Features : Change feature position', async
       await featuresPage.goToAddFeaturePage(page);
 
       const pageTitle = await addFeaturePage.getPageTitle(page);
-      await expect(pageTitle).to.eq(addFeaturePage.createPageTitle);
+      expect(pageTitle).to.eq(addFeaturePage.createPageTitle);
     });
 
     it('should create feature', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createNewFeature', baseContext);
 
       const textResult = await addFeaturePage.setFeature(page, createFeatureData);
-      await expect(textResult).to.contains(featuresPage.successfulCreationMessage);
+      expect(textResult).to.contains(featuresPage.successfulCreationMessage);
     });
   });
 
@@ -101,7 +101,7 @@ describe('BO - Catalog - Attributes & Features : Change feature position', async
 
       const expectedResult: number[] = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
-      await expect(sortedTableFloat).to.deep.equal(expectedResult);
+      expect(sortedTableFloat).to.deep.equal(expectedResult);
     });
 
     it('should change first feature position to 2', async function () {
@@ -112,11 +112,11 @@ describe('BO - Catalog - Attributes & Features : Change feature position', async
 
       // Change position and check successful message
       const textResult = await featuresPage.changePosition(page, 1, 2);
-      await expect(textResult, 'Unable to change position').to.contains(featuresPage.successfulUpdateMessage);
+      expect(textResult, 'Unable to change position').to.contains(featuresPage.successfulUpdateMessage);
 
       // Get second row feature name and check if is equal the first row feature name before changing position
       const secondRowFeatureName = await featuresPage.getTextColumn(page, 2, 'name', 'position');
-      await expect(secondRowFeatureName, 'Changing position was done wrongly').to.equal(firstRowFeatureName);
+      expect(secondRowFeatureName, 'Changing position was done wrongly').to.equal(firstRowFeatureName);
     });
 
     it('should change second feature position to 3', async function () {
@@ -130,11 +130,11 @@ describe('BO - Catalog - Attributes & Features : Change feature position', async
 
       // Change position and check successful message
       const textResult = await featuresPage.changePosition(page, 2, 3);
-      await expect(textResult, 'Unable to change position').to.contains(featuresPage.successfulUpdateMessage);
+      expect(textResult, 'Unable to change position').to.contains(featuresPage.successfulUpdateMessage);
 
       // Get first row feature name and check if is equal the first row feature name before changing position
       const thirdRowFeatureName = await featuresPage.getTextColumn(page, 3, 'name', 'position');
-      await expect(thirdRowFeatureName, 'Changing position was done wrongly').to.equal(secondRowFeatureName);
+      expect(thirdRowFeatureName, 'Changing position was done wrongly').to.equal(secondRowFeatureName);
     });
 
     it('should reset the sort to \'id_feature\'', async function () {
@@ -151,7 +151,7 @@ describe('BO - Catalog - Attributes & Features : Change feature position', async
 
       const expectedResult: number[] = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
-      await expect(sortedTableFloat).to.deep.equal(expectedResult);
+      expect(sortedTableFloat).to.deep.equal(expectedResult);
     });
   });
 
@@ -162,21 +162,21 @@ describe('BO - Catalog - Attributes & Features : Change feature position', async
       await featuresPage.filterTable(page, 'name', createFeatureData.name);
 
       const textColumn = await featuresPage.getTextColumn(page, 1, 'name');
-      await expect(textColumn).to.contains(createFeatureData.name);
+      expect(textColumn).to.contains(createFeatureData.name);
     });
 
     it('should delete the created feature', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteFeature', baseContext);
 
       const textResult = await featuresPage.deleteFeature(page, 1);
-      await expect(textResult).to.contains(featuresPage.successfulDeleteMessage);
+      expect(textResult).to.contains(featuresPage.successfulDeleteMessage);
     });
 
     it('should reset all filters and get number of features in BO', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilter', baseContext);
 
       const numberOfFeatures = await featuresPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfFeatures).to.be.above(0);
+      expect(numberOfFeatures).to.be.above(0);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/04_helpCard.ts b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/04_helpCard.ts
index ab88ce3eb63da..ccf355e1a7a79 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/04_helpCard.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/features/04_helpCard.ts
@@ -49,7 +49,7 @@ describe('BO - Catalog - Attributes & Features : Help card on features page', as
     await attributesPage.closeSfToolBar(page);
 
     const pageTitle = await attributesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(attributesPage.pageTitle);
+    expect(pageTitle).to.contains(attributesPage.pageTitle);
   });
 
   it('should go to Features page', async function () {
@@ -58,27 +58,27 @@ describe('BO - Catalog - Attributes & Features : Help card on features page', as
     await attributesPage.goToFeaturesPage(page);
 
     const pageTitle = await featuresPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(featuresPage.pageTitle);
+    expect(pageTitle).to.contains(featuresPage.pageTitle);
   });
 
   it('should open the help side bar and check the document language', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'openHelpSidebar', baseContext);
 
     const isHelpSidebarVisible = await featuresPage.openHelpSideBar(page);
-    await expect(isHelpSidebarVisible, 'Help side bar is not opened!').to.be.true;
+    expect(isHelpSidebarVisible, 'Help side bar is not opened!').to.eq(true);
   });
 
   it('should check the document language', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'checkDocumentLanguage', baseContext);
 
     const documentURL = await featuresPage.getHelpDocumentURL(page);
-    await expect(documentURL, 'Help document is not in english language!').to.contains('country=en');
+    expect(documentURL, 'Help document is not in english language!').to.contains('country=en');
   });
 
   it('should close the help side bar', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'closeHelpSidebar', baseContext);
 
     const isHelpSidebarClosed = await featuresPage.closeHelpSideBar(page);
-    await expect(isHelpSidebarClosed, 'Help document is not closed!').to.be.true;
+    expect(isHelpSidebarClosed, 'Help document is not closed!').to.eq(true);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/values/01_filterFeatureValues.ts b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/values/01_filterFeatureValues.ts
index d0d194f292934..c5c471c856fe7 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/values/01_filterFeatureValues.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/values/01_filterFeatureValues.ts
@@ -50,7 +50,7 @@ describe('BO - Catalog - Attributes & Features : Filter feature values table', a
     await attributesPage.closeSfToolBar(page);
 
     const pageTitle = await attributesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(attributesPage.pageTitle);
+    expect(pageTitle).to.contains(attributesPage.pageTitle);
   });
 
   it('should go to Features page', async function () {
@@ -59,7 +59,7 @@ describe('BO - Catalog - Attributes & Features : Filter feature values table', a
     await attributesPage.goToFeaturesPage(page);
 
     const pageTitle = await featuresPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(featuresPage.pageTitle);
+    expect(pageTitle).to.contains(featuresPage.pageTitle);
   });
 
   it('should filter by name \'Composition\'', async function () {
@@ -69,7 +69,7 @@ describe('BO - Catalog - Attributes & Features : Filter feature values table', a
     await featuresPage.filterTable(page, 'name', Features.composition.name);
 
     const textColumn = await featuresPage.getTextColumn(page, 1, 'name', 'id_feature');
-    await expect(textColumn).to.contains(Features.composition.name);
+    expect(textColumn).to.contains(Features.composition.name);
   });
 
   it('should view feature', async function () {
@@ -78,14 +78,14 @@ describe('BO - Catalog - Attributes & Features : Filter feature values table', a
     await featuresPage.viewFeature(page, 1);
 
     const pageTitle = await viewFeaturePage.getPageTitle(page);
-    await expect(pageTitle).to.contains(`${Features.composition.name} • ${global.INSTALL.SHOP_NAME}`);
+    expect(pageTitle).to.contains(`${Features.composition.name} • ${global.INSTALL.SHOP_NAME}`);
   });
 
   it('should reset all filters and get number of features in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfFeaturesValues = await viewFeaturePage.resetAndGetNumberOfLines(page);
-    await expect(numberOfFeaturesValues).to.be.above(0);
+    expect(numberOfFeaturesValues).to.be.above(0);
   });
 
   describe('Filter feature values', async () => {
@@ -119,17 +119,17 @@ describe('BO - Catalog - Attributes & Features : Filter feature values table', a
         );
 
         const numberOfFeaturesValuesAfterFilter = await viewFeaturePage.getNumberOfElementInGrid(page);
-        await expect(numberOfFeaturesValuesAfterFilter).to.be.at.most(numberOfFeaturesValues);
+        expect(numberOfFeaturesValuesAfterFilter).to.be.at.most(numberOfFeaturesValues);
 
         const textColumn = await viewFeaturePage.getTextColumn(page, 1, test.args.filterBy);
-        await expect(textColumn).to.contains(test.args.filterValue);
+        expect(textColumn).to.contains(test.args.filterValue);
       });
 
       it('should reset all filters', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}Reset`, baseContext);
 
         const numberOfFeaturesValuesAfterReset = await viewFeaturePage.resetAndGetNumberOfLines(page);
-        await expect(numberOfFeaturesValuesAfterReset).to.equal(numberOfFeaturesValues);
+        expect(numberOfFeaturesValuesAfterReset).to.equal(numberOfFeaturesValues);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/values/02_sortPaginationAndBulkDelete.ts b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/values/02_sortPaginationAndBulkDelete.ts
index 0fed31c2e19df..f4d83d90bcc3a 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/values/02_sortPaginationAndBulkDelete.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/04_attributesAndFeatures/02_features/values/02_sortPaginationAndBulkDelete.ts
@@ -62,7 +62,7 @@ describe('BO - Catalog - Catalog > Attributes & Features : Sort, pagination and
     await attributesPage.closeSfToolBar(page);
 
     const pageTitle = await attributesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(attributesPage.pageTitle);
+    expect(pageTitle).to.contains(attributesPage.pageTitle);
   });
 
   it('should go to Features page', async function () {
@@ -71,7 +71,7 @@ describe('BO - Catalog - Catalog > Attributes & Features : Sort, pagination and
     await attributesPage.goToFeaturesPage(page);
 
     const pageTitle = await featuresPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(featuresPage.pageTitle);
+    expect(pageTitle).to.contains(featuresPage.pageTitle);
   });
 
   it('should filter list of features by name \'Composition\'', async function () {
@@ -80,7 +80,7 @@ describe('BO - Catalog - Catalog > Attributes & Features : Sort, pagination and
     await featuresPage.filterTable(page, 'name', Features.composition.name);
 
     const textColumn = await featuresPage.getTextColumn(page, 1, 'name', 'id_feature');
-    await expect(textColumn).to.contains('Composition');
+    expect(textColumn).to.contains('Composition');
   });
 
   it('should view feature \'Composition\'', async function () {
@@ -89,10 +89,10 @@ describe('BO - Catalog - Catalog > Attributes & Features : Sort, pagination and
     await featuresPage.viewFeature(page, 1);
 
     const pageTitle = await viewFeaturePage.getPageTitle(page);
-    await expect(pageTitle).to.contains(`${Features.composition.name} • ${global.INSTALL.SHOP_NAME}`);
+    expect(pageTitle).to.contains(`${Features.composition.name} • ${global.INSTALL.SHOP_NAME}`);
 
     numberOfValues = await viewFeaturePage.resetAndGetNumberOfLines(page);
-    await expect(numberOfValues).to.be.above(0);
+    expect(numberOfValues).to.be.above(0);
   });
 
   // 1 : Create 15 new values
@@ -104,7 +104,7 @@ describe('BO - Catalog - Catalog > Attributes & Features : Sort, pagination and
       await viewFeaturePage.goToAddNewValuePage(page);
 
       const pageTitle = await addValuePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addValuePage.createPageTitle);
+      expect(pageTitle).to.contains(addValuePage.createPageTitle);
     });
 
     creationTests.forEach((test: number, index: number) => {
@@ -117,7 +117,7 @@ describe('BO - Catalog - Catalog > Attributes & Features : Sort, pagination and
 
         if (index === 14) {
           const textResult = await addValuePage.addEditValue(page, createFeatureValueData, false);
-          await expect(textResult).to.contains(viewFeaturePage.successfulCreationMessage);
+          expect(textResult).to.contains(viewFeaturePage.successfulCreationMessage);
         } else {
           await addValuePage.addEditValue(page, createFeatureValueData, true);
         }
@@ -128,10 +128,10 @@ describe('BO - Catalog - Catalog > Attributes & Features : Sort, pagination and
       await testContext.addContextItem(this, 'testIdentifier', 'viewFeatureComposition2', baseContext);
 
       const pageTitle = await viewFeaturePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(`${Features.composition.name} • ${global.INSTALL.SHOP_NAME}`);
+      expect(pageTitle).to.contains(`${Features.composition.name} • ${global.INSTALL.SHOP_NAME}`);
 
       const numberOfValuesAfterCreation = await viewFeaturePage.resetAndGetNumberOfLines(page);
-      await expect(numberOfValuesAfterCreation).to.equal(numberOfValues + 15);
+      expect(numberOfValuesAfterCreation).to.equal(numberOfValues + 15);
     });
   });
 
@@ -208,17 +208,17 @@ describe('BO - Catalog - Catalog > Attributes & Features : Sort, pagination and
           const expectedResult: number[] = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+            expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+            expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
         } else {
           const expectedResult: string[] = await basicHelper.sortArray(nonSortedTable);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         }
       });
@@ -233,21 +233,21 @@ describe('BO - Catalog - Catalog > Attributes & Features : Sort, pagination and
       await viewFeaturePage.filterTable(page, 'value', 'toDelete');
 
       const numberOfValuesAfterFilter = await viewFeaturePage.getNumberOfElementInGrid(page);
-      await expect(numberOfValuesAfterFilter).to.be.equal(15);
+      expect(numberOfValuesAfterFilter).to.be.equal(15);
     });
 
     it('should delete values with Bulk Actions and check result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteFeatures', baseContext);
 
       const deleteTextResult = await viewFeaturePage.bulkDeleteValues(page);
-      await expect(deleteTextResult).to.be.contains(viewFeaturePage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.contains(viewFeaturePage.successfulMultiDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilter', baseContext);
 
       const numberOfValuesAfterReset = await viewFeaturePage.resetAndGetNumberOfLines(page);
-      await expect(numberOfValuesAfterReset).to.equal(numberOfValues);
+      expect(numberOfValuesAfterReset).to.equal(numberOfValues);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/brands/01_CRUDBrandAndAddress.ts b/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/brands/01_CRUDBrandAndAddress.ts
index f7c4363c07496..a0e5440f1dad5 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/brands/01_CRUDBrandAndAddress.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/brands/01_CRUDBrandAndAddress.ts
@@ -73,17 +73,17 @@ describe('BO - Catalog - Brands & suppliers : CRUD Brand and Address', async ()
     await brandsPage.closeSfToolBar(page);
 
     const pageTitle = await brandsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(brandsPage.pageTitle);
+    expect(pageTitle).to.contains(brandsPage.pageTitle);
   });
 
   it('should reset all filters', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFiltersFirst', baseContext);
 
     numberOfBrands = await brandsPage.resetAndGetNumberOfLines(page, brandsTable);
-    await expect(numberOfBrands).to.be.above(0);
+    expect(numberOfBrands).to.be.above(0);
 
     numberOfBrandsAddresses = await brandsPage.resetAndGetNumberOfLines(page, addressesTable);
-    await expect(numberOfBrandsAddresses).to.be.above(0);
+    expect(numberOfBrandsAddresses).to.be.above(0);
   });
 
   // 1: Create Brand
@@ -94,17 +94,17 @@ describe('BO - Catalog - Brands & suppliers : CRUD Brand and Address', async ()
       await brandsPage.goToAddNewBrandPage(page);
 
       const pageTitle = await addBrandPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addBrandPage.pageTitle);
+      expect(pageTitle).to.contains(addBrandPage.pageTitle);
     });
 
     it('should create brand', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createBrand', baseContext);
 
       const result = await addBrandPage.createEditBrand(page, createBrandData);
-      await expect(result).to.equal(brandsPage.successfulCreationMessage);
+      expect(result).to.equal(brandsPage.successfulCreationMessage);
 
       const numberOfBrandsAfterCreation = await brandsPage.getNumberOfElementInGrid(page, brandsTable);
-      await expect(numberOfBrandsAfterCreation).to.be.equal(numberOfBrands + 1);
+      expect(numberOfBrandsAfterCreation).to.be.equal(numberOfBrands + 1);
     });
   });
 
@@ -116,19 +116,19 @@ describe('BO - Catalog - Brands & suppliers : CRUD Brand and Address', async ()
       await brandsPage.goToAddNewBrandAddressPage(page);
 
       const pageTitle = await addBrandAddressPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addBrandAddressPage.pageTitle);
+      expect(pageTitle).to.contains(addBrandAddressPage.pageTitle);
     });
 
     it('should create brand address', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createAddress', baseContext);
 
       const result = await addBrandAddressPage.createEditBrandAddress(page, createBrandAddressData);
-      await expect(result).to.equal(brandsPage.successfulCreationMessage);
+      expect(result).to.equal(brandsPage.successfulCreationMessage);
 
       const numberOfBrandsAddressesAfterCreation = await brandsPage.getNumberOfElementInGrid(page, addressesTable);
 
       createBrandData.addresses += 1;
-      await expect(numberOfBrandsAddressesAfterCreation).to.be.equal(numberOfBrandsAddresses + 1);
+      expect(numberOfBrandsAddressesAfterCreation).to.be.equal(numberOfBrandsAddresses + 1);
     });
   });
 
@@ -140,10 +140,10 @@ describe('BO - Catalog - Brands & suppliers : CRUD Brand and Address', async ()
       await brandsPage.filterBrands(page, 'input', 'name', createBrandData.name);
 
       const numberOfBrandsAfterFilter = await brandsPage.getNumberOfElementInGrid(page, brandsTable);
-      await expect(numberOfBrandsAfterFilter).to.be.at.most(numberOfBrands);
+      expect(numberOfBrandsAfterFilter).to.be.at.most(numberOfBrands);
 
       const textColumn = await brandsPage.getTextColumnFromTableBrands(page, 1, 'name');
-      await expect(textColumn).to.contains(createBrandData.name);
+      expect(textColumn).to.contains(createBrandData.name);
     });
 
     it('should view brand', async function () {
@@ -152,17 +152,17 @@ describe('BO - Catalog - Brands & suppliers : CRUD Brand and Address', async ()
       await brandsPage.viewBrand(page, 1);
 
       const pageTitle = await viewBrandPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(createBrandData.name);
+      expect(pageTitle).to.contains(createBrandData.name);
     });
 
     it('should check existence of the associated address', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkAddressOnCreatedBrand', baseContext);
 
       const numberOfAddressesInGrid = await viewBrandPage.getNumberOfAddressesInGrid(page);
-      await expect(numberOfAddressesInGrid).to.equal(createBrandData.addresses);
+      expect(numberOfAddressesInGrid).to.equal(createBrandData.addresses);
 
       const textColumn = await viewBrandPage.getTextColumnFromTableAddresses(page, 1, 1);
-      await expect(textColumn).to.contains(`${createBrandAddressData.firstName} ${createBrandAddressData.lastName}`);
+      expect(textColumn).to.contains(`${createBrandAddressData.firstName} ${createBrandAddressData.lastName}`);
     });
 
     it('should return brands Page', async function () {
@@ -171,14 +171,14 @@ describe('BO - Catalog - Brands & suppliers : CRUD Brand and Address', async ()
       await viewBrandPage.goToPreviousPage(page);
 
       const pageTitle = await brandsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(brandsPage.pageTitle);
+      expect(pageTitle).to.contains(brandsPage.pageTitle);
     });
 
     it('should reset brands filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterViewCreatedBrand', baseContext);
 
       const numberOfBrandsAfterReset = await brandsPage.resetAndGetNumberOfLines(page, brandsTable);
-      await expect(numberOfBrandsAfterReset).to.be.equal(numberOfBrands + 1);
+      expect(numberOfBrandsAfterReset).to.be.equal(numberOfBrands + 1);
     });
   });
 
@@ -190,10 +190,10 @@ describe('BO - Catalog - Brands & suppliers : CRUD Brand and Address', async ()
       await brandsPage.filterBrands(page, 'input', 'name', createBrandData.name);
 
       const numberOfBrandsAfterFilter = await brandsPage.getNumberOfElementInGrid(page, brandsTable);
-      await expect(numberOfBrandsAfterFilter).to.be.at.most(numberOfBrands);
+      expect(numberOfBrandsAfterFilter).to.be.at.most(numberOfBrands);
 
       const textColumn = await brandsPage.getTextColumnFromTableBrands(page, 1, 'name');
-      await expect(textColumn).to.contains(createBrandData.name);
+      expect(textColumn).to.contains(createBrandData.name);
     });
 
     it('should go to edit brand page', async function () {
@@ -202,14 +202,14 @@ describe('BO - Catalog - Brands & suppliers : CRUD Brand and Address', async ()
       await brandsPage.goToEditBrandPage(page, 1);
 
       const pageTitle = await addBrandPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addBrandPage.pageTitleEdit);
+      expect(pageTitle).to.contains(addBrandPage.pageTitleEdit);
     });
 
     it('should edit brand', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateBrand', baseContext);
 
       const result = await addBrandPage.createEditBrand(page, editBrandData);
-      await expect(result).to.equal(brandsPage.successfulUpdateMessage);
+      expect(result).to.equal(brandsPage.successfulUpdateMessage);
 
       editBrandData.addresses += 1;
     });
@@ -220,7 +220,7 @@ describe('BO - Catalog - Brands & suppliers : CRUD Brand and Address', async ()
       await brandsPage.filterAddresses(page, 'input', 'name', editBrandData.name);
 
       const textColumn = await brandsPage.getTextColumnFromTableAddresses(page, 1, 'name');
-      await expect(textColumn).to.contains(editBrandData.name);
+      expect(textColumn).to.contains(editBrandData.name);
     });
 
     it('should reset all filters', async function () {
@@ -228,11 +228,11 @@ describe('BO - Catalog - Brands & suppliers : CRUD Brand and Address', async ()
 
       // Reset Filter Brands
       const numberOfBrandsAfterReset = await brandsPage.resetAndGetNumberOfLines(page, brandsTable);
-      await expect(numberOfBrandsAfterReset).to.be.equal(numberOfBrands + 1);
+      expect(numberOfBrandsAfterReset).to.be.equal(numberOfBrands + 1);
 
       // Reset Filter Brand Address
       const numberOfBrandsAddressesAfterReset = await brandsPage.resetAndGetNumberOfLines(page, addressesTable);
-      await expect(numberOfBrandsAddressesAfterReset).to.be.equal(numberOfBrandsAddresses + 1);
+      expect(numberOfBrandsAddressesAfterReset).to.be.equal(numberOfBrandsAddresses + 1);
     });
   });
 
@@ -244,7 +244,7 @@ describe('BO - Catalog - Brands & suppliers : CRUD Brand and Address', async ()
       await brandsPage.filterAddresses(page, 'input', 'name', editBrandData.name);
 
       const textColumn = await brandsPage.getTextColumnFromTableAddresses(page, 1, 'name');
-      await expect(textColumn).to.contains(editBrandData.name);
+      expect(textColumn).to.contains(editBrandData.name);
     });
 
     it('should go to edit brand address page', async function () {
@@ -253,21 +253,21 @@ describe('BO - Catalog - Brands & suppliers : CRUD Brand and Address', async ()
       await brandsPage.goToEditBrandAddressPage(page, 1);
 
       const pageTitle = await addBrandPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addBrandPage.pageTitleEdit);
+      expect(pageTitle).to.contains(addBrandPage.pageTitleEdit);
     });
 
     it('should edit brand address', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateAddress', baseContext);
 
       const result = await addBrandAddressPage.createEditBrandAddress(page, editBrandAddressData);
-      await expect(result).to.equal(brandsPage.successfulUpdateMessage);
+      expect(result).to.equal(brandsPage.successfulUpdateMessage);
     });
 
     it('should reset Brand Addresses filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterUpdateAddress', baseContext);
 
       const numberOfBrandsAddressesAfterReset = await brandsPage.resetAndGetNumberOfLines(page, addressesTable);
-      await expect(numberOfBrandsAddressesAfterReset).to.be.equal(numberOfBrandsAddresses + 1);
+      expect(numberOfBrandsAddressesAfterReset).to.be.equal(numberOfBrandsAddresses + 1);
     });
   });
   // 6 : View Brand and check Address Value in list
@@ -278,10 +278,10 @@ describe('BO - Catalog - Brands & suppliers : CRUD Brand and Address', async ()
       await brandsPage.filterBrands(page, 'input', 'name', editBrandData.name);
 
       const numberOfBrandsAfterFilter = await brandsPage.getNumberOfElementInGrid(page, brandsTable);
-      await expect(numberOfBrandsAfterFilter).to.be.at.most(numberOfBrands);
+      expect(numberOfBrandsAfterFilter).to.be.at.most(numberOfBrands);
 
       const textColumn = await brandsPage.getTextColumnFromTableBrands(page, 1, 'name');
-      await expect(textColumn).to.contains(editBrandData.name);
+      expect(textColumn).to.contains(editBrandData.name);
     });
 
     it('should view brand', async function () {
@@ -290,17 +290,17 @@ describe('BO - Catalog - Brands & suppliers : CRUD Brand and Address', async ()
       await brandsPage.viewBrand(page, 1);
 
       const pageTitle = await viewBrandPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(editBrandData.name);
+      expect(pageTitle).to.contains(editBrandData.name);
     });
 
     it('should check existence of the associated address', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkAddressOnUpdatedBrand', baseContext);
 
       const numberOfAddressesInGrid = await viewBrandPage.getNumberOfAddressesInGrid(page);
-      await expect(numberOfAddressesInGrid).to.equal(editBrandData.addresses);
+      expect(numberOfAddressesInGrid).to.equal(editBrandData.addresses);
 
       const textColumn = await viewBrandPage.getTextColumnFromTableAddresses(page, 1, 1);
-      await expect(textColumn).to.contains(`${editBrandAddressData.firstName} ${editBrandAddressData.lastName}`);
+      expect(textColumn).to.contains(`${editBrandAddressData.firstName} ${editBrandAddressData.lastName}`);
     });
 
     it('should go back to brands Page', async function () {
@@ -309,14 +309,14 @@ describe('BO - Catalog - Brands & suppliers : CRUD Brand and Address', async ()
       await viewBrandPage.goToPreviousPage(page);
 
       const pageTitle = await brandsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(brandsPage.pageTitle);
+      expect(pageTitle).to.contains(brandsPage.pageTitle);
     });
 
     it('should reset filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterViewUpdatedBrand', baseContext);
 
       const numberOfBrandsAfterReset = await brandsPage.resetAndGetNumberOfLines(page, brandsTable);
-      await expect(numberOfBrandsAfterReset).to.be.equal(numberOfBrands + 1);
+      expect(numberOfBrandsAfterReset).to.be.equal(numberOfBrands + 1);
     });
   });
 
@@ -328,17 +328,17 @@ describe('BO - Catalog - Brands & suppliers : CRUD Brand and Address', async ()
       await brandsPage.filterBrands(page, 'input', 'name', editBrandData.name);
 
       const numberOfBrandsAfterFilter = await brandsPage.getNumberOfElementInGrid(page, brandsTable);
-      await expect(numberOfBrandsAfterFilter).to.be.at.most(numberOfBrands);
+      expect(numberOfBrandsAfterFilter).to.be.at.most(numberOfBrands);
 
       const textColumn = await brandsPage.getTextColumnFromTableBrands(page, 1, 'name');
-      await expect(textColumn).to.contains(editBrandData.name);
+      expect(textColumn).to.contains(editBrandData.name);
     });
 
     it('should delete brand', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteBrand', baseContext);
 
       const result = await brandsPage.deleteBrand(page, 1);
-      await expect(result).to.be.equal(brandsPage.successfulDeleteMessage);
+      expect(result).to.be.equal(brandsPage.successfulDeleteMessage);
     });
 
     it('should check that the Brand Address is deleted successfully', async function () {
@@ -348,14 +348,14 @@ describe('BO - Catalog - Brands & suppliers : CRUD Brand and Address', async ()
       await brandsPage.filterAddresses(page, 'input', 'lastname', editBrandAddressData.lastName);
 
       const textColumn = await brandsPage.getTextColumnFromTableAddresses(page, 1, 'name');
-      await expect(textColumn).to.contains('--');
+      expect(textColumn).to.contains('--');
     });
 
     it('should reset filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetBrandsListAfterDelete', baseContext);
 
       const numberOfBrandsAfterReset = await brandsPage.resetAndGetNumberOfLines(page, brandsTable);
-      await expect(numberOfBrandsAfterReset).to.be.equal(numberOfBrands);
+      expect(numberOfBrandsAfterReset).to.be.equal(numberOfBrands);
     });
   });
 
@@ -368,24 +368,24 @@ describe('BO - Catalog - Brands & suppliers : CRUD Brand and Address', async ()
       await brandsPage.filterAddresses(page, 'input', 'lastname', editBrandAddressData.lastName);
 
       const textColumnFirstName = await brandsPage.getTextColumnFromTableAddresses(page, 1, 'firstname');
-      await expect(textColumnFirstName).to.contains(editBrandAddressData.firstName);
+      expect(textColumnFirstName).to.contains(editBrandAddressData.firstName);
 
       const textColumnLastName = await brandsPage.getTextColumnFromTableAddresses(page, 1, 'lastname');
-      await expect(textColumnLastName).to.contains(editBrandAddressData.lastName);
+      expect(textColumnLastName).to.contains(editBrandAddressData.lastName);
     });
 
     it('should delete Brand Address', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteAddress', baseContext);
 
       const result = await brandsPage.deleteBrandAddress(page, 1);
-      await expect(result).to.be.equal(brandsPage.successfulDeleteMessage);
+      expect(result).to.be.equal(brandsPage.successfulDeleteMessage);
     });
 
     it('should reset filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAddressesListAfterDelete', baseContext);
 
       const numberOfBrandsAddressesAfterReset = await brandsPage.resetAndGetNumberOfLines(page, addressesTable);
-      await expect(numberOfBrandsAddressesAfterReset).to.be.equal(numberOfBrandsAddresses);
+      expect(numberOfBrandsAddressesAfterReset).to.be.equal(numberOfBrandsAddresses);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/brands/02_helpCard.ts b/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/brands/02_helpCard.ts
index 1926a1bb91f13..c1addfb28d6f9 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/brands/02_helpCard.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/brands/02_helpCard.ts
@@ -43,23 +43,23 @@ describe('BO - Catalog - Brands & suppliers : Help card on brands page', async (
     await brandsPage.closeSfToolBar(page);
 
     const pageTitle = await brandsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(brandsPage.pageTitle);
+    expect(pageTitle).to.contains(brandsPage.pageTitle);
   });
 
   it('should open the help side bar and check the document language', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'openHelpSidebar', baseContext);
 
     const isHelpSidebarVisible = await brandsPage.openHelpSideBar(page);
-    await expect(isHelpSidebarVisible).to.be.true;
+    expect(isHelpSidebarVisible).to.eq(true);
 
     const documentURL = await brandsPage.getHelpDocumentURL(page);
-    await expect(documentURL).to.contains('country=en');
+    expect(documentURL).to.contains('country=en');
   });
 
   it('should close the help side bar', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'closeHelpSidebar', baseContext);
 
     const isHelpSidebarClosed = await brandsPage.closeHelpSideBar(page);
-    await expect(isHelpSidebarClosed).to.be.true;
+    expect(isHelpSidebarClosed).to.eq(true);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/brands/addresses/01_filterAddresses.ts b/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/brands/addresses/01_filterAddresses.ts
index e83b52f9a48bc..470128b794bfd 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/brands/addresses/01_filterAddresses.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/brands/addresses/01_filterAddresses.ts
@@ -51,14 +51,14 @@ describe('BO - Catalog - Brands & Suppliers : Filter and quick edit Addresses ta
     await brandsPage.closeSfToolBar(page);
 
     const pageTitle = await brandsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(brandsPage.pageTitle);
+    expect(pageTitle).to.contains(brandsPage.pageTitle);
   });
 
   it('should reset all filters and get number of addresses in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilter', baseContext);
 
     numberOfAddresses = await brandsPage.resetAndGetNumberOfLines(page, tableName);
-    await expect(numberOfAddresses).to.be.above(0);
+    expect(numberOfAddresses).to.be.above(0);
   });
 
   // 1 : Filter addresses table
@@ -141,11 +141,11 @@ describe('BO - Catalog - Brands & Suppliers : Filter and quick edit Addresses ta
         );
 
         const numberOfAddressesAfterFilter = await brandsPage.getNumberOfElementInGrid(page, tableName);
-        await expect(numberOfAddressesAfterFilter).to.be.at.most(numberOfAddresses);
+        expect(numberOfAddressesAfterFilter).to.be.at.most(numberOfAddresses);
 
         for (let i = 1; i <= numberOfAddressesAfterFilter; i++) {
           const textColumn = await brandsPage.getTextColumnFromTableAddresses(page, i, test.args.filterBy);
-          await expect(textColumn).to.contains(test.args.filterValue);
+          expect(textColumn).to.contains(test.args.filterValue);
         }
       });
 
@@ -153,7 +153,7 @@ describe('BO - Catalog - Brands & Suppliers : Filter and quick edit Addresses ta
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}Reset`, baseContext);
 
         const numberOfAddressesAfterReset = await brandsPage.resetAndGetNumberOfLines(page, tableName);
-        await expect(numberOfAddressesAfterReset).to.equal(numberOfAddresses);
+        expect(numberOfAddressesAfterReset).to.equal(numberOfAddresses);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/brands/addresses/02_sortPaginationAndBulkActions.ts b/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/brands/addresses/02_sortPaginationAndBulkActions.ts
index 1b42d5dbb4f55..ce1c0e361e9e3 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/brands/addresses/02_sortPaginationAndBulkActions.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/brands/addresses/02_sortPaginationAndBulkActions.ts
@@ -57,14 +57,14 @@ describe('BO - Catalog - Brands & Suppliers : Sort, pagination and bulk actions
     await dashboardPage.closeSfToolBar(page);
 
     const pageTitle = await brandsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(brandsPage.pageTitle);
+    expect(pageTitle).to.contains(brandsPage.pageTitle);
   });
 
   it('should reset all filters and get number of addresses in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAddressesTable', baseContext);
 
     numberOfAddresses = await brandsPage.resetAndGetNumberOfLines(page, tableName);
-    await expect(numberOfAddresses).to.be.above(0);
+    expect(numberOfAddresses).to.be.above(0);
   });
 
   // 1 : Create 10 new addresses
@@ -79,17 +79,17 @@ describe('BO - Catalog - Brands & Suppliers : Sort, pagination and bulk actions
         await brandsPage.goToAddNewBrandAddressPage(page);
 
         const pageTitle = await addBrandAddressPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addBrandAddressPage.pageTitle);
+        expect(pageTitle).to.contains(addBrandAddressPage.pageTitle);
       });
 
       it(`should create address n°${index + 1}`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `createAddress${index}`, baseContext);
 
         const result = await addBrandAddressPage.createEditBrandAddress(page, createAddressData);
-        await expect(result).to.equal(brandsPage.successfulCreationMessage);
+        expect(result).to.equal(brandsPage.successfulCreationMessage);
 
         const numberOfAddressesAfterCreation = await brandsPage.getNumberOfElementInGrid(page, tableName);
-        await expect(numberOfAddressesAfterCreation).to.be.equal(numberOfAddresses + 1 + index);
+        expect(numberOfAddressesAfterCreation).to.be.equal(numberOfAddresses + 1 + index);
       });
     });
   });
@@ -185,17 +185,17 @@ describe('BO - Catalog - Brands & Suppliers : Sort, pagination and bulk actions
             const expectedResult: number[] = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
             if (test.args.sortDirection === 'asc') {
-              await expect(sortedTableFloat).to.deep.equal(expectedResult);
+              expect(sortedTableFloat).to.deep.equal(expectedResult);
             } else {
-              await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+              expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
             }
           } else {
             const expectedResult: string[] = await basicHelper.sortArray(nonSortedTable);
 
             if (test.args.sortDirection === 'asc') {
-              await expect(sortedTable).to.deep.equal(expectedResult);
+              expect(sortedTable).to.deep.equal(expectedResult);
             } else {
-              await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+              expect(sortedTable).to.deep.equal(expectedResult.reverse());
             }
           }
         },
@@ -211,21 +211,21 @@ describe('BO - Catalog - Brands & Suppliers : Sort, pagination and bulk actions
       await brandsPage.filterAddresses(page, 'input', 'city', 'todelete');
 
       const textColumn = await brandsPage.getTextColumnFromTableAddresses(page, 1, 'city');
-      await expect(textColumn).to.contains('todelete');
+      expect(textColumn).to.contains('todelete');
     });
 
     it('should delete with Bulk Actions and check result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteAddresses', baseContext);
 
       const deleteTextResult = await brandsPage.deleteWithBulkActions(page, tableName);
-      await expect(deleteTextResult).to.be.equal(brandsPage.successfulDeleteMessage);
+      expect(deleteTextResult).to.be.equal(brandsPage.successfulDeleteMessage);
     });
 
     it('should reset filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDeleteAddresses', baseContext);
 
       const numberOfAddressesAfterReset = await brandsPage.resetAndGetNumberOfLines(page, tableName);
-      await expect(numberOfAddressesAfterReset).to.be.equal(numberOfAddresses);
+      expect(numberOfAddressesAfterReset).to.be.equal(numberOfAddresses);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/brands/brands/01_filterAndQuickEditBrands.ts b/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/brands/brands/01_filterAndQuickEditBrands.ts
index 51705af369106..5c6114f0173b2 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/brands/brands/01_filterAndQuickEditBrands.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/brands/brands/01_filterAndQuickEditBrands.ts
@@ -51,14 +51,14 @@ describe('BO - Catalog - Brands & suppliers : Filter and quick edit Brands table
     await brandsPage.closeSfToolBar(page);
 
     const pageTitle = await brandsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(brandsPage.pageTitle);
+    expect(pageTitle).to.contains(brandsPage.pageTitle);
   });
 
   it('should reset all filters and get number of brands in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilter', baseContext);
 
     numberOfBrands = await brandsPage.resetAndGetNumberOfLines(page, tableName);
-    await expect(numberOfBrands).to.be.above(0);
+    expect(numberOfBrands).to.be.above(0);
   });
 
   // 1 : Filter brands table
@@ -109,15 +109,15 @@ describe('BO - Catalog - Brands & suppliers : Filter and quick edit Brands table
         }
 
         const numberOfBrandsAfterFilter = await brandsPage.getNumberOfElementInGrid(page, tableName);
-        await expect(numberOfBrandsAfterFilter).to.be.at.most(numberOfBrands);
+        expect(numberOfBrandsAfterFilter).to.be.at.most(numberOfBrands);
 
         for (let i = 1; i <= numberOfBrandsAfterFilter; i++) {
           if (test.args.filterBy === 'active') {
             const brandStatus = await brandsPage.getBrandStatus(page, i);
-            await expect(brandStatus).to.equal(test.args.filterValue === '1');
+            expect(brandStatus).to.equal(test.args.filterValue === '1');
           } else {
             const textColumn = await brandsPage.getTextColumnFromTableBrands(page, i, test.args.filterBy);
-            await expect(textColumn).to.contains(test.args.filterValue);
+            expect(textColumn).to.contains(test.args.filterValue);
           }
         }
       });
@@ -126,7 +126,7 @@ describe('BO - Catalog - Brands & suppliers : Filter and quick edit Brands table
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}Reset`, baseContext);
 
         const numberOfBrandsAfterReset = await brandsPage.resetAndGetNumberOfLines(page, tableName);
-        await expect(numberOfBrandsAfterReset).to.equal(numberOfBrands);
+        expect(numberOfBrandsAfterReset).to.equal(numberOfBrands);
       });
     });
   });
@@ -139,10 +139,10 @@ describe('BO - Catalog - Brands & suppliers : Filter and quick edit Brands table
       await brandsPage.filterBrands(page, 'input', 'name', Brands.first.name);
 
       const numberOfBrandsAfterFilter = await brandsPage.getNumberOfElementInGrid(page, tableName);
-      await expect(numberOfBrandsAfterFilter).to.be.at.most(numberOfBrands);
+      expect(numberOfBrandsAfterFilter).to.be.at.most(numberOfBrands);
 
       const textColumn = await brandsPage.getTextColumnFromTableBrands(page, 1, 'name');
-      await expect(textColumn).to.contains(Brands.first.name);
+      expect(textColumn).to.contains(Brands.first.name);
     });
 
     [
@@ -156,11 +156,11 @@ describe('BO - Catalog - Brands & suppliers : Filter and quick edit Brands table
 
         if (isActionPerformed) {
           const resultMessage = await brandsPage.getAlertSuccessBlockParagraphContent(page);
-          await expect(resultMessage).to.contains(brandsPage.successfulUpdateStatusMessage);
+          expect(resultMessage).to.contains(brandsPage.successfulUpdateStatusMessage);
         }
 
         const brandsStatus = await brandsPage.getBrandStatus(page, 1);
-        await expect(brandsStatus).to.be.equal(test.args.enabledValue);
+        expect(brandsStatus).to.be.equal(test.args.enabledValue);
       });
     });
 
@@ -168,7 +168,7 @@ describe('BO - Catalog - Brands & suppliers : Filter and quick edit Brands table
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterQuickEdit', baseContext);
 
       const numberOfBrandsAfterReset = await brandsPage.resetAndGetNumberOfLines(page, tableName);
-      await expect(numberOfBrandsAfterReset).to.equal(numberOfBrands);
+      expect(numberOfBrandsAfterReset).to.equal(numberOfBrands);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/brands/brands/02_sortPaginationAndBulkActions.ts b/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/brands/brands/02_sortPaginationAndBulkActions.ts
index ad485199e4b4c..b15d9c437c297 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/brands/brands/02_sortPaginationAndBulkActions.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/brands/brands/02_sortPaginationAndBulkActions.ts
@@ -72,14 +72,14 @@ describe('BO - Catalog - Brands & Suppliers : Sort, pagination and bulk actions
       await dashboardPage.closeSfToolBar(page);
 
       const pageTitle = await brandsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(brandsPage.pageTitle);
+      expect(pageTitle).to.contains(brandsPage.pageTitle);
     });
 
     it('should reset all filters and get number of brands in BO', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterBrandsTable', baseContext);
 
       numberOfBrands = await brandsPage.resetAndGetNumberOfLines(page, tableName);
-      await expect(numberOfBrands).to.be.above(0);
+      expect(numberOfBrands).to.be.above(0);
     });
 
     it('should change the items number to 10 per page', async function () {
@@ -147,17 +147,17 @@ describe('BO - Catalog - Brands & Suppliers : Sort, pagination and bulk actions
             const expectedResult: number[] = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
             if (test.args.sortDirection === 'asc') {
-              await expect(sortedTableFloat).to.deep.equal(expectedResult);
+              expect(sortedTableFloat).to.deep.equal(expectedResult);
             } else {
-              await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+              expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
             }
           } else {
             const expectedResult: string[] = await basicHelper.sortArray(nonSortedTable);
 
             if (test.args.sortDirection === 'asc') {
-              await expect(sortedTable).to.deep.equal(expectedResult);
+              expect(sortedTable).to.deep.equal(expectedResult);
             } else {
-              await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+              expect(sortedTable).to.deep.equal(expectedResult.reverse());
             }
           }
         },
@@ -173,7 +173,7 @@ describe('BO - Catalog - Brands & Suppliers : Sort, pagination and bulk actions
       await brandsPage.filterBrands(page, 'input', 'name', 'todelete');
 
       const textColumn = await brandsPage.getTextColumnFromTableBrands(page, 1, 'name');
-      await expect(textColumn).to.contains('todelete');
+      expect(textColumn).to.contains('todelete');
     });
 
     [
@@ -184,14 +184,14 @@ describe('BO - Catalog - Brands & Suppliers : Sort, pagination and bulk actions
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.action}Brand`, baseContext);
 
         const textResult = await brandsPage.bulkSetBrandsStatus(page, test.args.enabledValue);
-        await expect(textResult).to.be.equal(brandsPage.successfulUpdateStatusMessage);
+        expect(textResult).to.be.equal(brandsPage.successfulUpdateStatusMessage);
 
         const numberOfBrandsInGrid = await brandsPage.getNumberOfElementInGrid(page, tableName);
-        await expect(numberOfBrandsInGrid).to.be.equal(numberOfImportedBrands);
+        expect(numberOfBrandsInGrid).to.be.equal(numberOfImportedBrands);
 
         for (let i = 1; i <= numberOfBrandsInGrid; i++) {
           const brandStatus = await brandsPage.getBrandStatus(page, i);
-          await expect(brandStatus).to.equal(test.args.enabledValue);
+          expect(brandStatus).to.equal(test.args.enabledValue);
         }
       });
     });
@@ -200,7 +200,7 @@ describe('BO - Catalog - Brands & Suppliers : Sort, pagination and bulk actions
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterBulkEdit', baseContext);
 
       const numberOfBrandsAfterReset = await brandsPage.resetAndGetNumberOfLines(page, tableName);
-      await expect(numberOfBrandsAfterReset).to.be.equal(numberOfBrands);
+      expect(numberOfBrandsAfterReset).to.be.equal(numberOfBrands);
     });
   });
 
@@ -212,21 +212,21 @@ describe('BO - Catalog - Brands & Suppliers : Sort, pagination and bulk actions
       await brandsPage.filterBrands(page, 'input', 'name', 'todelete');
 
       const textColumn = await brandsPage.getTextColumnFromTableBrands(page, 1, 'name');
-      await expect(textColumn).to.contains('todelete');
+      expect(textColumn).to.contains('todelete');
     });
 
     it('should delete with bulk actions and check result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteBrands', baseContext);
 
       const deleteTextResult = await brandsPage.deleteWithBulkActions(page, tableName);
-      await expect(deleteTextResult).to.be.equal(brandsPage.successfulDeleteMessage);
+      expect(deleteTextResult).to.be.equal(brandsPage.successfulDeleteMessage);
     });
 
     it('should reset filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDeleteBrands', baseContext);
 
       const numberOfBrandsAfterReset = await brandsPage.resetAndGetNumberOfLines(page, tableName);
-      await expect(numberOfBrandsAfterReset).to.be.equal(numberOfBrands - numberOfImportedBrands);
+      expect(numberOfBrandsAfterReset).to.be.equal(numberOfBrands - numberOfImportedBrands);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/brands/brands/03_exportBrands.ts b/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/brands/brands/03_exportBrands.ts
index 32152faab3273..feaa184bf1fb1 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/brands/brands/03_exportBrands.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/brands/brands/03_exportBrands.ts
@@ -53,14 +53,14 @@ describe('BO - Catalog - Brands & Suppliers : Export brands', async () => {
     await brandsPage.closeSfToolBar(page);
 
     const pageTitle = await brandsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(brandsPage.pageTitle);
+    expect(pageTitle).to.contains(brandsPage.pageTitle);
   });
 
   it('should reset all filters and get number of brands in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilter', baseContext);
 
     numberOfBrands = await brandsPage.resetAndGetNumberOfLines(page, tableName);
-    await expect(numberOfBrands).to.be.above(0);
+    expect(numberOfBrands).to.be.above(0);
   });
 
   it('should export brands to a csv file', async function () {
@@ -69,7 +69,7 @@ describe('BO - Catalog - Brands & Suppliers : Export brands', async () => {
     filePath = await brandsPage.exportBrandsDataToCsv(page);
 
     const doesFileExist = await files.doesFileExist(filePath, 5000);
-    await expect(doesFileExist, 'Export of data has failed').to.be.true;
+    expect(doesFileExist, 'Export of data has failed').to.eq(true);
   });
 
   it('should check existence of brands data in csv file', async function () {
@@ -81,7 +81,7 @@ describe('BO - Catalog - Brands & Suppliers : Export brands', async () => {
       const brandInCsvFormat = await brandsPage.getBrandInCsvFormat(page, row);
 
       const textExist = await files.isTextInFile(filePath, brandInCsvFormat, true, true);
-      await expect(textExist, `${brandInCsvFormat} was not found in the file`).to.be.true;
+      expect(textExist, `${brandInCsvFormat} was not found in the file`).to.eq(true);
     }
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/suppliers/01_CRUDSupplier.ts b/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/suppliers/01_CRUDSupplier.ts
index 6a4281c807227..e44b7dc86563b 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/suppliers/01_CRUDSupplier.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/suppliers/01_CRUDSupplier.ts
@@ -66,7 +66,7 @@ describe('BO - Catalog - Brands & Suppliers : CRUD supplier', async () => {
     await brandsPage.closeSfToolBar(page);
 
     const pageTitle = await brandsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(brandsPage.pageTitle);
+    expect(pageTitle).to.contains(brandsPage.pageTitle);
   });
 
   // Go to suppliers page
@@ -76,7 +76,7 @@ describe('BO - Catalog - Brands & Suppliers : CRUD supplier', async () => {
     await brandsPage.goToSubTabSuppliers(page);
 
     const pageTitle = await suppliersPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(suppliersPage.pageTitle);
+    expect(pageTitle).to.contains(suppliersPage.pageTitle);
   });
 
   // 1: Create supplier
@@ -87,14 +87,14 @@ describe('BO - Catalog - Brands & Suppliers : CRUD supplier', async () => {
       await suppliersPage.goToAddNewSupplierPage(page);
 
       const pageTitle = await addSupplierPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addSupplierPage.pageTitle);
+      expect(pageTitle).to.contains(addSupplierPage.pageTitle);
     });
 
     it('should create supplier', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createSupplier', baseContext);
 
       const result = await addSupplierPage.createEditSupplier(page, createSupplierData);
-      await expect(result).to.equal(suppliersPage.successfulCreationMessage);
+      expect(result).to.equal(suppliersPage.successfulCreationMessage);
     });
   });
 
@@ -106,7 +106,7 @@ describe('BO - Catalog - Brands & Suppliers : CRUD supplier', async () => {
       await suppliersPage.filterTable(page, 'input', 'name', createSupplierData.name);
 
       const textColumn = await suppliersPage.getTextColumnFromTableSupplier(page, 1, 'name');
-      await expect(textColumn).to.contain(createSupplierData.name);
+      expect(textColumn).to.contain(createSupplierData.name);
     });
 
     it('should view supplier', async function () {
@@ -116,7 +116,7 @@ describe('BO - Catalog - Brands & Suppliers : CRUD supplier', async () => {
       await suppliersPage.viewSupplier(page, 1);
 
       const pageTitle = await viewSupplierPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(createSupplierData.name);
+      expect(pageTitle).to.contains(createSupplierData.name);
     });
 
     it('should return suppliers page', async function () {
@@ -125,7 +125,7 @@ describe('BO - Catalog - Brands & Suppliers : CRUD supplier', async () => {
       await viewSupplierPage.goToPreviousPage(page);
 
       const pageTitle = await suppliersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(suppliersPage.pageTitle);
+      expect(pageTitle).to.contains(suppliersPage.pageTitle);
     });
   });
 
@@ -137,14 +137,14 @@ describe('BO - Catalog - Brands & Suppliers : CRUD supplier', async () => {
       await suppliersPage.goToEditSupplierPage(page, 1);
 
       const pageTitle = await addSupplierPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addSupplierPage.pageTitleEdit);
+      expect(pageTitle).to.contains(addSupplierPage.pageTitleEdit);
     });
 
     it('should edit supplier', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateSupplier', baseContext);
 
       const result = await addSupplierPage.createEditSupplier(page, editSupplierData);
-      await expect(result).to.equal(suppliersPage.successfulUpdateMessage);
+      expect(result).to.equal(suppliersPage.successfulUpdateMessage);
     });
   });
 
@@ -157,7 +157,7 @@ describe('BO - Catalog - Brands & Suppliers : CRUD supplier', async () => {
       await suppliersPage.filterTable(page, 'input', 'name', editSupplierData.name);
 
       const textColumn = await suppliersPage.getTextColumnFromTableSupplier(page, 1, 'name');
-      await expect(textColumn).to.contain(editSupplierData.name);
+      expect(textColumn).to.contain(editSupplierData.name);
     });
 
     it('should view supplier', async function () {
@@ -167,7 +167,7 @@ describe('BO - Catalog - Brands & Suppliers : CRUD supplier', async () => {
       await suppliersPage.viewSupplier(page, 1);
 
       const pageTitle = await viewSupplierPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(editSupplierData.name);
+      expect(pageTitle).to.contains(editSupplierData.name);
     });
 
     it('should return to suppliers page', async function () {
@@ -176,7 +176,7 @@ describe('BO - Catalog - Brands & Suppliers : CRUD supplier', async () => {
       await viewSupplierPage.goToPreviousPage(page);
 
       const pageTitle = await suppliersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(suppliersPage.pageTitle);
+      expect(pageTitle).to.contains(suppliersPage.pageTitle);
     });
   });
 
@@ -189,7 +189,7 @@ describe('BO - Catalog - Brands & Suppliers : CRUD supplier', async () => {
       await suppliersPage.filterTable(page, 'input', 'name', editSupplierData.name);
 
       const textColumn = await suppliersPage.getTextColumnFromTableSupplier(page, 1, 'name');
-      await expect(textColumn).to.contain(editSupplierData.name);
+      expect(textColumn).to.contain(editSupplierData.name);
     });
 
     it('should delete supplier', async function () {
@@ -197,7 +197,7 @@ describe('BO - Catalog - Brands & Suppliers : CRUD supplier', async () => {
 
       // delete supplier in first row
       const result = await suppliersPage.deleteSupplier(page, 1);
-      await expect(result).to.be.equal(suppliersPage.successfulDeleteMessage);
+      expect(result).to.be.equal(suppliersPage.successfulDeleteMessage);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/suppliers/02_filterAndQuickEdit.ts b/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/suppliers/02_filterAndQuickEdit.ts
index 6d0b913cf6377..55cd2dc22bc90 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/suppliers/02_filterAndQuickEdit.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/suppliers/02_filterAndQuickEdit.ts
@@ -50,7 +50,7 @@ describe('BO - Catalog - Brands & Suppliers : Filter and quick edit suppliers',
     await brandsPage.closeSfToolBar(page);
 
     const pageTitle = await brandsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(brandsPage.pageTitle);
+    expect(pageTitle).to.contains(brandsPage.pageTitle);
   });
 
   it('should go to Suppliers page', async function () {
@@ -59,14 +59,14 @@ describe('BO - Catalog - Brands & Suppliers : Filter and quick edit suppliers',
     await brandsPage.goToSubTabSuppliers(page);
 
     const pageTitle = await suppliersPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(suppliersPage.pageTitle);
+    expect(pageTitle).to.contains(suppliersPage.pageTitle);
   });
 
   it('should reset filter', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'firstReset', baseContext);
 
     numberOfSuppliers = await suppliersPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfSuppliers).to.be.at.least(0);
+    expect(numberOfSuppliers).to.be.at.least(0);
   });
 
   // 2: Filter Suppliers
@@ -121,16 +121,16 @@ describe('BO - Catalog - Brands & Suppliers : Filter and quick edit suppliers',
 
         // Check number of suppliers
         const numberOfSuppliersAfterFilter = await suppliersPage.getNumberOfElementInGrid(page);
-        await expect(numberOfSuppliersAfterFilter).to.be.at.most(numberOfSuppliers);
+        expect(numberOfSuppliersAfterFilter).to.be.at.most(numberOfSuppliers);
 
         // Check text column or status in all rows after filter
         for (let i = 1; i <= numberOfSuppliersAfterFilter; i++) {
           if (test.args.filterBy === 'active') {
             const supplierStatus = await suppliersPage.getStatus(page, i);
-            await expect(supplierStatus).to.equal(test.args.filterValue === '1');
+            expect(supplierStatus).to.equal(test.args.filterValue === '1');
           } else {
             const textColumn = await suppliersPage.getTextColumnFromTableSupplier(page, i, test.args.filterBy);
-            await expect(textColumn).to.contains(test.args.filterValue);
+            expect(textColumn).to.contains(test.args.filterValue);
           }
         }
       });
@@ -139,7 +139,7 @@ describe('BO - Catalog - Brands & Suppliers : Filter and quick edit suppliers',
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}Reset`, baseContext);
 
         const numberOfSuppliersAfterReset = await suppliersPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfSuppliersAfterReset).to.be.equal(numberOfSuppliers);
+        expect(numberOfSuppliersAfterReset).to.be.equal(numberOfSuppliers);
       });
     });
   });
@@ -153,11 +153,11 @@ describe('BO - Catalog - Brands & Suppliers : Filter and quick edit suppliers',
 
       // Check number od suppliers
       const numberOfSuppliersAfterFilter = await suppliersPage.getNumberOfElementInGrid(page);
-      await expect(numberOfSuppliersAfterFilter).to.be.at.most(numberOfSuppliers);
+      expect(numberOfSuppliersAfterFilter).to.be.at.most(numberOfSuppliers);
 
       // check text column of first row after filter
       const textColumn = await suppliersPage.getTextColumnFromTableSupplier(page, 1, 'name');
-      await expect(textColumn).to.contains(Suppliers.fashionSupplier.name);
+      expect(textColumn).to.contains(Suppliers.fashionSupplier.name);
     });
 
     [
@@ -171,11 +171,11 @@ describe('BO - Catalog - Brands & Suppliers : Filter and quick edit suppliers',
 
         if (isActionPerformed) {
           const resultMessage = await suppliersPage.getAlertSuccessBlockParagraphContent(page);
-          await expect(resultMessage).to.contains(suppliersPage.successfulUpdateStatusMessage);
+          expect(resultMessage).to.contains(suppliersPage.successfulUpdateStatusMessage);
         }
 
         const supplierStatus = await suppliersPage.getStatus(page, 1);
-        await expect(supplierStatus).to.be.equal(test.args.enabledValue);
+        expect(supplierStatus).to.be.equal(test.args.enabledValue);
       });
     });
 
@@ -183,7 +183,7 @@ describe('BO - Catalog - Brands & Suppliers : Filter and quick edit suppliers',
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterQuickEdit', baseContext);
 
       const numberOfSuppliersAfterReset = await suppliersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfSuppliersAfterReset).to.be.equal(numberOfSuppliers);
+      expect(numberOfSuppliersAfterReset).to.be.equal(numberOfSuppliers);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/suppliers/03_helpCard.ts b/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/suppliers/03_helpCard.ts
index c139ee9f7a10a..f62f86dc28075 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/suppliers/03_helpCard.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/suppliers/03_helpCard.ts
@@ -44,7 +44,7 @@ describe('BO - Catalog - Brands & Suppliers : Help card on Suppliers page', asyn
     await brandsPage.closeSfToolBar(page);
 
     const pageTitle = await brandsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(brandsPage.pageTitle);
+    expect(pageTitle).to.contains(brandsPage.pageTitle);
   });
 
   it('should go to Suppliers page', async function () {
@@ -53,23 +53,23 @@ describe('BO - Catalog - Brands & Suppliers : Help card on Suppliers page', asyn
     await brandsPage.goToSubTabSuppliers(page);
 
     const pageTitle = await suppliersPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(suppliersPage.pageTitle);
+    expect(pageTitle).to.contains(suppliersPage.pageTitle);
   });
 
   it('should open the help side bar and check the document language', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'openHelpSidebar', baseContext);
 
     const isHelpSidebarVisible = await suppliersPage.openHelpSideBar(page);
-    await expect(isHelpSidebarVisible).to.be.true;
+    expect(isHelpSidebarVisible).to.eq(true);
 
     const documentURL = await suppliersPage.getHelpDocumentURL(page);
-    await expect(documentURL).to.contains('country=en');
+    expect(documentURL).to.contains('country=en');
   });
 
   it('should close the help side bar', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'closeHelpSidebar', baseContext);
 
     const isHelpSidebarClosed = await suppliersPage.closeHelpSideBar(page);
-    await expect(isHelpSidebarClosed).to.be.true;
+    expect(isHelpSidebarClosed).to.eq(true);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/suppliers/04_paginationSortAndBulkActions.ts b/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/suppliers/04_paginationSortAndBulkActions.ts
index 42bc6d9c94e87..384d3c179dc67 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/suppliers/04_paginationSortAndBulkActions.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/05_brandsAndSuppliers/suppliers/04_paginationSortAndBulkActions.ts
@@ -59,7 +59,7 @@ describe('BO - Catalog - Brands & Suppliers : Pagination and sort suppliers', as
     await dashboardPage.closeSfToolBar(page);
 
     const pageTitle = await brandsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(brandsPage.pageTitle);
+    expect(pageTitle).to.contains(brandsPage.pageTitle);
   });
 
   // Go to suppliers page
@@ -69,7 +69,7 @@ describe('BO - Catalog - Brands & Suppliers : Pagination and sort suppliers', as
     await brandsPage.goToSubTabSuppliers(page);
 
     const pageTitle = await suppliersPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(suppliersPage.pageTitle);
+    expect(pageTitle).to.contains(suppliersPage.pageTitle);
 
     numberOfSuppliers = await suppliersPage.resetAndGetNumberOfLines(page);
   });
@@ -87,17 +87,17 @@ describe('BO - Catalog - Brands & Suppliers : Pagination and sort suppliers', as
         await suppliersPage.goToAddNewSupplierPage(page);
 
         const pageTitle = await addSupplierPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addSupplierPage.pageTitle);
+        expect(pageTitle).to.contains(addSupplierPage.pageTitle);
       });
 
       it(`should create supplier n°${index + 1} and check result`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `createSupplier${index}`, baseContext);
 
         const result = await addSupplierPage.createEditSupplier(page, createSupplierData);
-        await expect(result).to.equal(suppliersPage.successfulCreationMessage);
+        expect(result).to.equal(suppliersPage.successfulCreationMessage);
 
         const numberOfSuppliersAfterCreation = await suppliersPage.getNumberOfElementInGrid(page);
-        await expect(numberOfSuppliersAfterCreation).to.be.equal(numberOfSuppliers + 1 + index);
+        expect(numberOfSuppliersAfterCreation).to.be.equal(numberOfSuppliers + 1 + index);
       });
 
       after(() => files.deleteFile(createSupplierData.logo));
@@ -183,17 +183,17 @@ describe('BO - Catalog - Brands & Suppliers : Pagination and sort suppliers', as
             const expectedResult: number[] = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
             if (test.args.sortDirection === 'asc') {
-              await expect(sortedTableFloat).to.deep.equal(expectedResult);
+              expect(sortedTableFloat).to.deep.equal(expectedResult);
             } else {
-              await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+              expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
             }
           } else {
             const expectedResult: string[] = await basicHelper.sortArray(nonSortedTable);
 
             if (test.args.sortDirection === 'asc') {
-              await expect(sortedTable).to.deep.equal(expectedResult);
+              expect(sortedTable).to.deep.equal(expectedResult);
             } else {
-              await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+              expect(sortedTable).to.deep.equal(expectedResult.reverse());
             }
           }
         },
@@ -214,7 +214,7 @@ describe('BO - Catalog - Brands & Suppliers : Pagination and sort suppliers', as
       );
 
       const textColumn = await suppliersPage.getTextColumnFromTableSupplier(page, 1, 'name');
-      await expect(textColumn).to.contains('todelete');
+      expect(textColumn).to.contains('todelete');
     });
 
     [
@@ -226,15 +226,15 @@ describe('BO - Catalog - Brands & Suppliers : Pagination and sort suppliers', as
 
         const disableTextResult = await suppliersPage.bulkSetStatus(page, test.args.enabledValue);
 
-        await expect(disableTextResult).to.be.equal(suppliersPage.successfulUpdateStatusMessage);
+        expect(disableTextResult).to.be.equal(suppliersPage.successfulUpdateStatusMessage);
 
         // Check that element in grid are disabled
         const numberOfSuppliersInGrid = await suppliersPage.getNumberOfElementInGrid(page);
-        await expect(numberOfSuppliersInGrid).to.be.at.most(11);
+        expect(numberOfSuppliersInGrid).to.be.at.most(11);
 
         for (let i = 1; i <= numberOfSuppliersInGrid; i++) {
           const supplierStatus = await suppliersPage.getStatus(page, i);
-          await expect(supplierStatus).to.equal(test.args.enabledValue);
+          expect(supplierStatus).to.equal(test.args.enabledValue);
         }
       });
     });
@@ -243,14 +243,14 @@ describe('BO - Catalog - Brands & Suppliers : Pagination and sort suppliers', as
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteSuppliers', baseContext);
 
       const deleteTextResult = await suppliersPage.deleteWithBulkActions(page);
-      await expect(deleteTextResult).to.be.equal(suppliersPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.equal(suppliersPage.successfulMultiDeleteMessage);
     });
 
     it('should reset filter', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterBulkDelete', baseContext);
 
       const numberOfSuppliersAfterReset = await suppliersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfSuppliersAfterReset).to.be.equal(numberOfSuppliers);
+      expect(numberOfSuppliersAfterReset).to.be.equal(numberOfSuppliers);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/06_files/01_CRUDFile.ts b/tests/UI/campaigns/functional/BO/03_catalog/06_files/01_CRUDFile.ts
index dbe929d11a42f..b81f855c97d94 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/06_files/01_CRUDFile.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/06_files/01_CRUDFile.ts
@@ -68,7 +68,7 @@ describe('BO - Catalog - Files : CRUD file', async () => {
     await filesPage.closeSfToolBar(page);
 
     const pageTitle = await filesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(filesPage.pageTitle);
+    expect(pageTitle).to.contains(filesPage.pageTitle);
   });
 
   describe('Create file', async () => {
@@ -78,14 +78,14 @@ describe('BO - Catalog - Files : CRUD file', async () => {
       await filesPage.goToAddNewFilePage(page);
 
       const pageTitle = await addFilePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addFilePage.pageTitle);
+      expect(pageTitle).to.contains(addFilePage.pageTitle);
     });
 
     it('should create file', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createFile', baseContext);
 
       const result = await addFilePage.createEditFile(page, createFileData);
-      await expect(result).to.equal(filesPage.successfulCreationMessage);
+      expect(result).to.equal(filesPage.successfulCreationMessage);
     });
   });
 
@@ -96,7 +96,7 @@ describe('BO - Catalog - Files : CRUD file', async () => {
       const filePath = await filesPage.viewFile(page, 1);
 
       const found = await files.doesFileExist(filePath);
-      await expect(found, `${createFileData.filename} was not downloaded`).to.be.true;
+      expect(found, `${createFileData.filename} was not downloaded`).to.eq(true);
     });
   });
 
@@ -107,14 +107,14 @@ describe('BO - Catalog - Files : CRUD file', async () => {
       await filesPage.goToEditFilePage(page, 1);
 
       const pageTitle = await addFilePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addFilePage.pageTitleEdit);
+      expect(pageTitle).to.contains(addFilePage.pageTitleEdit);
     });
 
     it('should edit file', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateFile', baseContext);
 
       const result = await addFilePage.createEditFile(page, editFileData);
-      await expect(result).to.equal(filesPage.successfulUpdateMessage);
+      expect(result).to.equal(filesPage.successfulUpdateMessage);
     });
   });
 
@@ -125,7 +125,7 @@ describe('BO - Catalog - Files : CRUD file', async () => {
       const filePath = await filesPage.viewFile(page, 1);
 
       const found = await files.doesFileExist(filePath);
-      await expect(found, `${editFileData.filename} was not downloaded`).to.be.true;
+      expect(found, `${editFileData.filename} was not downloaded`).to.eq(true);
     });
   });
 
@@ -135,7 +135,7 @@ describe('BO - Catalog - Files : CRUD file', async () => {
 
       // delete file in first row
       const result = await filesPage.deleteFile(page, 1);
-      await expect(result).to.be.equal(filesPage.successfulDeleteMessage);
+      expect(result).to.be.equal(filesPage.successfulDeleteMessage);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/06_files/03_filterSortPaginationAndBulkActions.ts b/tests/UI/campaigns/functional/BO/03_catalog/06_files/03_filterSortPaginationAndBulkActions.ts
index 90fdf8976e63d..23d6082fe7d1b 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/06_files/03_filterSortPaginationAndBulkActions.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/06_files/03_filterSortPaginationAndBulkActions.ts
@@ -59,7 +59,7 @@ describe('BO - Catalog - Files : Filter, sort, pagination and bulk actions files
     numberOfFiles = await filesPage.resetAndGetNumberOfLines(page);
 
     const pageTitle = await filesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(filesPage.pageTitle);
+    expect(pageTitle).to.contains(filesPage.pageTitle);
   });
 
   // 1: Create 11 files
@@ -75,17 +75,17 @@ describe('BO - Catalog - Files : Filter, sort, pagination and bulk actions files
         await filesPage.goToAddNewFilePage(page);
 
         const pageTitle = await addFilePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addFilePage.pageTitle);
+        expect(pageTitle).to.contains(addFilePage.pageTitle);
       });
 
       it(`should create file n°${index + 1}`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `createFile${index}`, baseContext);
 
         const result = await addFilePage.createEditFile(page, createFileData);
-        await expect(result).to.equal(filesPage.successfulCreationMessage);
+        expect(result).to.equal(filesPage.successfulCreationMessage);
 
         const numberOfFilesAfterCreation = await filesPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfFilesAfterCreation).to.be.equal(numberOfFiles + 1 + index);
+        expect(numberOfFilesAfterCreation).to.be.equal(numberOfFiles + 1 + index);
       });
 
       after(() => files.deleteFile(createFileData.filename));
@@ -124,7 +124,7 @@ describe('BO - Catalog - Files : Filter, sort, pagination and bulk actions files
 
         for (let i = 1; i <= numberOfFilesAfterFilter; i++) {
           const textName = await filesPage.getTextColumnFromTable(page, i, test.args.filterBy);
-          await expect(textName).to.contains(test.args.filterValue);
+          expect(textName).to.contains(test.args.filterValue);
         }
       });
 
@@ -132,7 +132,7 @@ describe('BO - Catalog - Files : Filter, sort, pagination and bulk actions files
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}Reset`, baseContext);
 
         const numberOfFilesAfterReset = await filesPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfFilesAfterReset).to.be.equal(numberOfFiles + 11);
+        expect(numberOfFilesAfterReset).to.be.equal(numberOfFiles + 11);
       });
     });
   });
@@ -217,17 +217,17 @@ describe('BO - Catalog - Files : Filter, sort, pagination and bulk actions files
             const expectedResult: number[] = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
             if (test.args.sortDirection === 'asc') {
-              await expect(sortedTableFloat).to.deep.equal(expectedResult);
+              expect(sortedTableFloat).to.deep.equal(expectedResult);
             } else {
-              await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+              expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
             }
           } else {
             const expectedResult: string[] = await basicHelper.sortArray(nonSortedTable);
 
             if (test.args.sortDirection === 'asc') {
-              await expect(sortedTable).to.deep.equal(expectedResult);
+              expect(sortedTable).to.deep.equal(expectedResult);
             } else {
-              await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+              expect(sortedTable).to.deep.equal(expectedResult.reverse());
             }
           }
         },
@@ -243,7 +243,7 @@ describe('BO - Catalog - Files : Filter, sort, pagination and bulk actions files
       await filesPage.filterTable(page, 'name', 'todelete');
 
       const numberOfFilesAfterFilter = await filesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfFilesAfterFilter).to.be.above(0);
+      expect(numberOfFilesAfterFilter).to.be.above(0);
 
       for (let i = 1; i <= numberOfFilesAfterFilter; i++) {
         const textColumn = await filesPage.getTextColumnFromTable(
@@ -251,7 +251,7 @@ describe('BO - Catalog - Files : Filter, sort, pagination and bulk actions files
           i,
           'name',
         );
-        await expect(textColumn).to.contains('todelete');
+        expect(textColumn).to.contains('todelete');
       }
     });
 
@@ -259,14 +259,14 @@ describe('BO - Catalog - Files : Filter, sort, pagination and bulk actions files
       await testContext.addContextItem(this, 'testIdentifier', 'BulkDelete', baseContext);
 
       const deleteTextResult = await filesPage.deleteFilesBulkActions(page);
-      await expect(deleteTextResult).to.be.equal(filesPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.equal(filesPage.successfulMultiDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDelete', baseContext);
 
       const numberOfFilesAfterReset = await filesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfFilesAfterReset).to.be.equal(numberOfFiles);
+      expect(numberOfFilesAfterReset).to.be.equal(numberOfFiles);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/06_files/04_helpCard.ts b/tests/UI/campaigns/functional/BO/03_catalog/06_files/04_helpCard.ts
index b60fc10a98761..56b721f5b9cd8 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/06_files/04_helpCard.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/06_files/04_helpCard.ts
@@ -43,23 +43,23 @@ describe('BO - Catalog - Files : Help card on files page', async () => {
     await filesPage.closeSfToolBar(page);
 
     const pageTitle = await filesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(filesPage.pageTitle);
+    expect(pageTitle).to.contains(filesPage.pageTitle);
   });
 
   it('should open the help side bar and check the document language', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'openHelpSidebar', baseContext);
 
     const isHelpSidebarVisible = await filesPage.openHelpSideBar(page);
-    await expect(isHelpSidebarVisible).to.be.true;
+    expect(isHelpSidebarVisible).to.eq(true);
 
     const documentURL = await filesPage.getHelpDocumentURL(page);
-    await expect(documentURL).to.contains('country=en');
+    expect(documentURL).to.contains('country=en');
   });
 
   it('should close the help side bar', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'closeHelpSidebar', baseContext);
 
     const isHelpSidebarClosed = await filesPage.closeHelpSideBar(page);
-    await expect(isHelpSidebarClosed).to.be.true;
+    expect(isHelpSidebarClosed).to.eq(true);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/01_information/01_withAndWithoutCode.ts b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/01_information/01_withAndWithoutCode.ts
index 84818c4df6029..226e60a5f36d8 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/01_information/01_withAndWithoutCode.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/01_information/01_withAndWithoutCode.ts
@@ -75,7 +75,7 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with/without code', async (
     );
 
     const pageTitle = await cartRulesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(cartRulesPage.pageTitle);
+    expect(pageTitle).to.contains(cartRulesPage.pageTitle);
   });
 
   describe('case 1 : Create cart rule without code then check it on FO', async () => {
@@ -86,14 +86,14 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with/without code', async (
         await cartRulesPage.goToAddNewCartRulesPage(page);
 
         const pageTitle = await addCartRulePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addCartRulePage.pageTitle);
+        expect(pageTitle).to.contains(addCartRulePage.pageTitle);
       });
 
       it('should create cart rule', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'createCartRule', baseContext);
 
         const validationMessage = await addCartRulePage.createEditCartRules(page, cartRuleWithoutCode);
-        await expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
+        expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
       });
     });
 
@@ -106,7 +106,7 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with/without code', async (
         await foHomePage.changeLanguage(page, 'en');
 
         const isHomePage = await foHomePage.isHomePage(page);
-        await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+        expect(isHomePage, 'Fail to open FO home page').to.eq(true);
       });
 
       it('should go to the first product page', async function () {
@@ -115,7 +115,7 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with/without code', async (
         await foHomePage.goToProductPage(page, 1);
 
         const pageTitle = await foProductPage.getPageTitle(page);
-        await expect(pageTitle.toUpperCase()).to.contains(Products.demo_1.name.toUpperCase());
+        expect(pageTitle.toUpperCase()).to.contains(Products.demo_1.name.toUpperCase());
       });
 
       it('should add product to cart and proceed to checkout', async function () {
@@ -124,7 +124,7 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with/without code', async (
         await foProductPage.addProductToTheCart(page);
 
         const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
-        await expect(notificationsNumber).to.be.equal(1);
+        expect(notificationsNumber).to.be.equal(1);
       });
 
       it('should verify the total after discount', async function () {
@@ -135,13 +135,13 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with/without code', async (
           - ((Products.demo_1.finalPrice * discountPercent) / 100);
 
         const priceATI = await cartPage.getATIPrice(page);
-        await expect(priceATI).to.equal(parseFloat(totalAfterDiscount.toFixed(2)));
+        expect(priceATI).to.equal(parseFloat(totalAfterDiscount.toFixed(2)));
 
         const cartRuleName = await cartPage.getCartRuleName(page);
-        await expect(cartRuleName).to.equal(cartRuleWithoutCode.name);
+        expect(cartRuleName).to.equal(cartRuleWithoutCode.name);
 
         const discountValue = await cartPage.getDiscountValue(page);
-        await expect(discountValue).to.equal(parseFloat(totalAfterDiscount.toFixed(2)) - Products.demo_1.finalPrice);
+        expect(discountValue).to.equal(parseFloat(totalAfterDiscount.toFixed(2)) - Products.demo_1.finalPrice);
       });
 
       it('should remove product from shopping cart', async function () {
@@ -150,7 +150,7 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with/without code', async (
         await cartPage.deleteProduct(page, 1);
 
         const notificationNumber = await cartPage.getCartNotificationsNumber(page);
-        await expect(notificationNumber).to.be.equal(0);
+        expect(notificationNumber).to.be.equal(0);
       });
     });
   });
@@ -164,7 +164,7 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with/without code', async (
         page = await foHomePage.closePage(browserContext, page, 0);
 
         const pageTitle = await cartRulesPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(cartRulesPage.pageTitle);
+        expect(pageTitle).to.contains(cartRulesPage.pageTitle);
       });
 
       it('should go to edit cart rule page', async function () {
@@ -173,14 +173,14 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with/without code', async (
         await cartRulesPage.goToEditCartRulePage(page, 1);
 
         const pageTitle = await addCartRulePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addCartRulePage.editPageTitle);
+        expect(pageTitle).to.contains(addCartRulePage.editPageTitle);
       });
 
       it('should update cart rule', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'updateCartRule', baseContext);
 
         const validationMessage = await addCartRulePage.createEditCartRules(page, cartRuleWithCode);
-        await expect(validationMessage).to.contains(addCartRulePage.successfulUpdateMessage);
+        expect(validationMessage).to.contains(addCartRulePage.successfulUpdateMessage);
       });
     });
 
@@ -193,7 +193,7 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with/without code', async (
         await foHomePage.changeLanguage(page, 'en');
 
         const isHomePage = await foHomePage.isHomePage(page);
-        await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+        expect(isHomePage, 'Fail to open FO home page').to.eq(true);
       });
 
       it('should go to the first product page', async function () {
@@ -202,7 +202,7 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with/without code', async (
         await foHomePage.goToProductPage(page, 1);
 
         const pageTitle = await foProductPage.getPageTitle(page);
-        await expect(pageTitle.toUpperCase()).to.contains(Products.demo_1.name.toUpperCase());
+        expect(pageTitle.toUpperCase()).to.contains(Products.demo_1.name.toUpperCase());
       });
 
       it('should add product to cart and proceed to checkout', async function () {
@@ -211,14 +211,14 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with/without code', async (
         await foProductPage.addProductToTheCart(page);
 
         const notificationNumber = await cartPage.getCartNotificationsNumber(page);
-        await expect(notificationNumber).to.be.equal(1);
+        expect(notificationNumber).to.be.equal(1);
       });
 
       it('should verify the total before the discount', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkTotalBeforeDiscount', baseContext);
 
         const priceATI = await cartPage.getATIPrice(page);
-        await expect(priceATI).to.equal(Products.demo_1.finalPrice);
+        expect(priceATI).to.equal(Products.demo_1.finalPrice);
       });
 
       it('should set the promo code', async function () {
@@ -227,7 +227,7 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with/without code', async (
         await cartPage.addPromoCode(page, cartRuleWithCode.code);
 
         const cartRuleName = await cartPage.getCartRuleName(page, 1);
-        await expect(cartRuleName).to.equal(cartRuleWithCode.name);
+        expect(cartRuleName).to.equal(cartRuleWithCode.name);
       });
 
       it('should verify the total after the discount', async function () {
@@ -238,10 +238,10 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with/without code', async (
           - ((Products.demo_1.finalPrice * discountPercent) / 100);
 
         const priceATI = await cartPage.getATIPrice(page);
-        await expect(priceATI).to.equal(parseFloat(totalAfterPromoCode.toFixed(2)));
+        expect(priceATI).to.equal(parseFloat(totalAfterPromoCode.toFixed(2)));
 
         const discountValue = await cartPage.getDiscountValue(page, 1);
-        await expect(discountValue).to.equal(parseFloat((totalAfterPromoCode - Products.demo_1.finalPrice).toFixed(2)));
+        expect(discountValue).to.equal(parseFloat((totalAfterPromoCode - Products.demo_1.finalPrice).toFixed(2)));
       });
 
       it('should remove voucher and product from shopping cart', async function () {
@@ -251,7 +251,7 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with/without code', async (
         await cartPage.deleteProduct(page, 1);
 
         const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
-        await expect(notificationsNumber).to.be.equal(0);
+        expect(notificationsNumber).to.be.equal(0);
       });
     });
   });
@@ -265,7 +265,7 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with/without code', async (
         page = await foHomePage.closePage(browserContext, page, 0);
 
         const pageTitle = await cartRulesPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(cartRulesPage.pageTitle);
+        expect(pageTitle).to.contains(cartRulesPage.pageTitle);
       });
 
       it('should go to edit cart rule page', async function () {
@@ -274,14 +274,14 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with/without code', async (
         await cartRulesPage.goToEditCartRulePage(page, 1);
 
         const pageTitle = await addCartRulePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addCartRulePage.editPageTitle);
+        expect(pageTitle).to.contains(addCartRulePage.editPageTitle);
       });
 
       it('should update cart rule', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'updateCartRule2', baseContext);
 
         const validationMessage = await addCartRulePage.createEditCartRules(page, secondCartRuleWithCode);
-        await expect(validationMessage).to.contains(addCartRulePage.successfulUpdateMessage);
+        expect(validationMessage).to.contains(addCartRulePage.successfulUpdateMessage);
       });
     });
 
@@ -294,7 +294,7 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with/without code', async (
         await foHomePage.changeLanguage(page, 'en');
 
         const isHomePage = await foHomePage.isHomePage(page);
-        await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+        expect(isHomePage, 'Fail to open FO home page').to.eq(true);
       });
 
       it('should go to the first product page', async function () {
@@ -303,7 +303,7 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with/without code', async (
         await foHomePage.goToProductPage(page, 1);
 
         const pageTitle = await foProductPage.getPageTitle(page);
-        await expect(pageTitle.toUpperCase()).to.contains(Products.demo_1.name.toUpperCase());
+        expect(pageTitle.toUpperCase()).to.contains(Products.demo_1.name.toUpperCase());
       });
 
       it('should add product to cart and proceed to checkout', async function () {
@@ -312,21 +312,21 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with/without code', async (
         await foProductPage.addProductToTheCart(page);
 
         const notificationNumber = await cartPage.getCartNotificationsNumber(page);
-        await expect(notificationNumber).to.be.equal(1);
+        expect(notificationNumber).to.be.equal(1);
       });
 
       it('should verify the total before the discount', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkTotalBeforeDiscount2', baseContext);
 
         const priceATI = await cartPage.getATIPrice(page);
-        await expect(priceATI).to.equal(Products.demo_1.finalPrice);
+        expect(priceATI).to.equal(Products.demo_1.finalPrice);
       });
 
       it('should check the displayed promo code', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkPromoCodeBlock2', baseContext);
 
         const promoCode = await cartPage.getHighlightPromoCode(page);
-        await expect(promoCode).to.equal(`${secondCartRuleWithCode.code} - ${secondCartRuleWithCode.name}`);
+        expect(promoCode).to.equal(`${secondCartRuleWithCode.code} - ${secondCartRuleWithCode.name}`);
       });
 
       it('should click on the promo code', async function () {
@@ -335,7 +335,7 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with/without code', async (
         await cartPage.clickOnPromoCode(page);
 
         const cartRuleName = await cartPage.getCartRuleName(page, 1);
-        await expect(cartRuleName).to.equal(`${secondCartRuleWithCode.code} - ${secondCartRuleWithCode.name}`);
+        expect(cartRuleName).to.equal(`${secondCartRuleWithCode.code} - ${secondCartRuleWithCode.name}`);
       });
 
       it('should verify the total after the discount', async function () {
@@ -345,10 +345,10 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with/without code', async (
           - ((Products.demo_1.finalPrice * (cartRuleWithCode.discountPercent!)) / 100);
 
         const priceATI = await cartPage.getATIPrice(page);
-        await expect(priceATI).to.equal(parseFloat(totalAfterPromoCode.toFixed(2)));
+        expect(priceATI).to.equal(parseFloat(totalAfterPromoCode.toFixed(2)));
 
         const discountValue = await cartPage.getDiscountValue(page, 1);
-        await expect(discountValue).to.equal(parseFloat((totalAfterPromoCode - Products.demo_1.finalPrice).toFixed(2)));
+        expect(discountValue).to.equal(parseFloat((totalAfterPromoCode - Products.demo_1.finalPrice).toFixed(2)));
       });
 
       it('should remove voucher and product from shopping cart', async function () {
@@ -358,7 +358,7 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with/without code', async (
         await cartPage.deleteProduct(page, 1);
 
         const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
-        await expect(notificationsNumber).to.be.equal(0);
+        expect(notificationsNumber).to.be.equal(0);
       });
     });
   });
@@ -371,14 +371,14 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with/without code', async (
       page = await foHomePage.closePage(browserContext, page, 0);
 
       const pageTitle = await cartRulesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(cartRulesPage.pageTitle);
+      expect(pageTitle).to.contains(cartRulesPage.pageTitle);
     });
 
     it('should delete cart rule', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteCartRule', baseContext);
 
       const validationMessage = await cartRulesPage.deleteCartRule(page);
-      await expect(validationMessage).to.contains(cartRulesPage.successfulDeleteMessage);
+      expect(validationMessage).to.contains(cartRulesPage.successfulDeleteMessage);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/01_information/02_enableDisablePartialUse.ts b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/01_information/02_enableDisablePartialUse.ts
index 52ccc941e3989..f0e18c2921adf 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/01_information/02_enableDisablePartialUse.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/01_information/02_enableDisablePartialUse.ts
@@ -85,7 +85,7 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with enabled/disabled parti
         );
 
         const pageTitle = await cartRulesPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(cartRulesPage.pageTitle);
+        expect(pageTitle).to.contains(cartRulesPage.pageTitle);
       });
 
       it('should go to new cart rule page', async function () {
@@ -94,14 +94,14 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with enabled/disabled parti
         await cartRulesPage.goToAddNewCartRulesPage(page);
 
         const pageTitle = await addCartRulePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addCartRulePage.pageTitle);
+        expect(pageTitle).to.contains(addCartRulePage.pageTitle);
       });
 
       it('should create cart rule', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'createCartRule2', baseContext);
 
         const validationMessage = await addCartRulePage.createEditCartRules(page, cartRuleEnabledPartialUse);
-        await expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
+        expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
       });
     });
 
@@ -114,7 +114,7 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with enabled/disabled parti
         await homePage.changeLanguage(page, 'en');
 
         const isHomePage = await homePage.isHomePage(page);
-        await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+        expect(isHomePage, 'Fail to open FO home page').to.eq(true);
       });
 
       it('should go to the first product page', async function () {
@@ -123,7 +123,7 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with enabled/disabled parti
         await homePage.goToProductPage(page, 1);
 
         const pageTitle = await foProductPage.getPageTitle(page);
-        await expect(pageTitle.toUpperCase()).to.contains(Products.demo_1.name.toUpperCase());
+        expect(pageTitle.toUpperCase()).to.contains(Products.demo_1.name.toUpperCase());
       });
 
       it('should add product to cart and proceed to checkout', async function () {
@@ -132,20 +132,20 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with enabled/disabled parti
         await foProductPage.addProductToTheCart(page);
 
         const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
-        await expect(notificationsNumber).to.be.equal(1);
+        expect(notificationsNumber).to.be.equal(1);
       });
 
       it('should verify the total after discount', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'verifyTotalAfterDiscount1', baseContext);
 
         const priceATI = await cartPage.getATIPrice(page);
-        await expect(priceATI).to.equal(0);
+        expect(priceATI).to.equal(0);
 
         const cartRuleName = await cartPage.getCartRuleName(page);
-        await expect(cartRuleName).to.equal(cartRuleEnabledPartialUse.name);
+        expect(cartRuleName).to.equal(cartRuleEnabledPartialUse.name);
 
         const discountValue = await cartPage.getDiscountValue(page);
-        await expect(discountValue.toString()).to.equal(`-${Products.demo_1.finalPrice}`);
+        expect(discountValue.toString()).to.equal(`-${Products.demo_1.finalPrice}`);
       });
 
       it('should validate shopping cart and go to checkout page', async function () {
@@ -154,7 +154,7 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with enabled/disabled parti
         await cartPage.clickOnProceedToCheckout(page);
 
         const isCheckoutPage = await checkoutPage.isCheckoutPage(page);
-        await expect(isCheckoutPage).to.be.true;
+        expect(isCheckoutPage).to.eq(true);
       });
 
       it('should sign in by created customer', async function () {
@@ -163,7 +163,7 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with enabled/disabled parti
         await checkoutPage.clickOnSignIn(page);
 
         const isCustomerConnected = await checkoutPage.customerLogin(page, Customers.johnDoe);
-        await expect(isCustomerConnected, 'Customer is not connected!').to.be.true;
+        expect(isCustomerConnected, 'Customer is not connected!').to.eq(true);
       });
 
       it('should go to delivery step', async function () {
@@ -171,7 +171,7 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with enabled/disabled parti
 
         // Address step - Go to delivery step
         const isStepAddressComplete = await checkoutPage.goToDeliveryStep(page);
-        await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+        expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
       });
 
       it('should go to payment step', async function () {
@@ -179,7 +179,7 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with enabled/disabled parti
 
         // Delivery step - Go to payment step
         const isStepDeliveryComplete = await checkoutPage.goToPaymentStep(page);
-        await expect(isStepDeliveryComplete, 'Step Address is not complete').to.be.true;
+        expect(isStepDeliveryComplete, 'Step Address is not complete').to.eq(true);
       });
 
       it('should confirm the order', async function () {
@@ -190,7 +190,7 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with enabled/disabled parti
 
         // Check the confirmation message
         const cardTitle = await orderConfirmationPage.getOrderConfirmationCardTitle(page);
-        await expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
+        expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
       });
 
       it('should go to vouchers page', async function () {
@@ -200,14 +200,14 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with enabled/disabled parti
         await myAccountPage.goToVouchersPage(page);
 
         const pageHeaderTitle = await foVouchersPage.getPageTitle(page);
-        await expect(pageHeaderTitle).to.equal(foVouchersPage.pageTitle);
+        expect(pageHeaderTitle).to.equal(foVouchersPage.pageTitle);
       });
 
       it('should get the number of vouchers', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'getNumberOfVouchers', baseContext);
 
         const numberOfVouchers = await foVouchersPage.getNumberOfVouchers(page);
-        await expect(numberOfVouchers).to.equal(1);
+        expect(numberOfVouchers).to.equal(1);
       });
 
       [
@@ -225,7 +225,7 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with enabled/disabled parti
             cartRule.args.row,
             cartRule.args.column,
           );
-          await expect(cartRuleTextColumn).to.equal(cartRule.args.value);
+          expect(cartRuleTextColumn).to.equal(cartRule.args.value);
         });
       });
     });
@@ -240,14 +240,14 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with enabled/disabled parti
         await cartRulesPage.reloadPage(page);
 
         const pageTitle = await cartRulesPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(cartRulesPage.pageTitle);
+        expect(pageTitle).to.contains(cartRulesPage.pageTitle);
       });
 
       it('should check the number of cart rules', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkNumberOfCartRules', baseContext);
 
         const numberOfCartRules = await cartRulesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfCartRules).to.equal(2);
+        expect(numberOfCartRules).to.equal(2);
       });
 
       it('should go to edit the first cart rule', async function () {
@@ -256,14 +256,14 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with enabled/disabled parti
         await cartRulesPage.goToEditCartRulePage(page, 1);
 
         const pageTitle = await addCartRulePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addCartRulePage.editPageTitle);
+        expect(pageTitle).to.contains(addCartRulePage.editPageTitle);
       });
 
       it('should check the cart rule limit customer', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkCartRuleCustomer', baseContext);
 
         const customer = await addCartRulePage.getLimitSingleCustomer(page);
-        await expect(customer).to.equal(
+        expect(customer).to.equal(
           `${Customers.johnDoe.firstName} ${Customers.johnDoe.lastName} (${Customers.johnDoe.email})`);
       });
 
@@ -271,7 +271,7 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with enabled/disabled parti
         await testContext.addContextItem(this, 'testIdentifier', 'checkCartRuleAmountValue', baseContext);
 
         const amount = await addCartRulePage.getAmountValue(page);
-        await expect(amount).to.equal(amountValue.toString());
+        expect(amount).to.equal(amountValue.toString());
       });
     });
 
@@ -282,14 +282,14 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with enabled/disabled parti
         await addCartRulePage.clickOnCancelButton(page);
 
         const pageTitle = await cartRulesPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(cartRulesPage.pageTitle);
+        expect(pageTitle).to.contains(cartRulesPage.pageTitle);
       });
 
       it('should bulk delete cart rules', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteCartRules', baseContext);
 
         const deleteTextResult = await cartRulesPage.bulkDeleteCartRules(page);
-        await expect(deleteTextResult).to.be.contains(cartRulesPage.successfulMultiDeleteMessage);
+        expect(deleteTextResult).to.be.contains(cartRulesPage.successfulMultiDeleteMessage);
       });
     });
   });
@@ -302,14 +302,14 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with enabled/disabled parti
         await cartRulesPage.goToAddNewCartRulesPage(page);
 
         const pageTitle = await addCartRulePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addCartRulePage.pageTitle);
+        expect(pageTitle).to.contains(addCartRulePage.pageTitle);
       });
 
       it('should create cart rule', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'createCartRule1', baseContext);
 
         const validationMessage = await addCartRulePage.createEditCartRules(page, cartRuleDisabledPartialUse);
-        await expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
+        expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
       });
     });
 
@@ -322,7 +322,7 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with enabled/disabled parti
         await homePage.changeLanguage(page, 'en');
 
         const isHomePage = await homePage.isHomePage(page);
-        await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+        expect(isHomePage, 'Fail to open FO home page').to.eq(true);
       });
 
       it('should go to the first product page', async function () {
@@ -331,7 +331,7 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with enabled/disabled parti
         await homePage.goToProductPage(page, 1);
 
         const pageTitle = await foProductPage.getPageTitle(page);
-        await expect(pageTitle.toUpperCase()).to.contains(Products.demo_1.name.toUpperCase());
+        expect(pageTitle.toUpperCase()).to.contains(Products.demo_1.name.toUpperCase());
       });
 
       it('should add product to cart and proceed to checkout', async function () {
@@ -340,20 +340,20 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with enabled/disabled parti
         await foProductPage.addProductToTheCart(page);
 
         const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
-        await expect(notificationsNumber).to.be.equal(1);
+        expect(notificationsNumber).to.be.equal(1);
       });
 
       it('should verify the total after discount', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'verifyTotalAfterDiscount2', baseContext);
 
         const priceATI = await cartPage.getATIPrice(page);
-        await expect(priceATI).to.equal(0);
+        expect(priceATI).to.equal(0);
 
         const cartRuleName = await cartPage.getCartRuleName(page);
-        await expect(cartRuleName).to.equal(cartRuleEnabledPartialUse.name);
+        expect(cartRuleName).to.equal(cartRuleEnabledPartialUse.name);
 
         const discountValue = await cartPage.getDiscountValue(page);
-        await expect(discountValue.toString()).to.equal(`-${Products.demo_1.finalPrice}`);
+        expect(discountValue.toString()).to.equal(`-${Products.demo_1.finalPrice}`);
       });
 
       it('should validate shopping cart and go to checkout page', async function () {
@@ -362,7 +362,7 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with enabled/disabled parti
         await cartPage.clickOnProceedToCheckout(page);
 
         const isCheckoutPage = await checkoutPage.isCheckoutPage(page);
-        await expect(isCheckoutPage).to.be.true;
+        expect(isCheckoutPage).to.eq(true);
       });
 
       it('should go to delivery step', async function () {
@@ -370,7 +370,7 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with enabled/disabled parti
 
         // Address step - Go to delivery step
         const isStepAddressComplete = await checkoutPage.goToDeliveryStep(page);
-        await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+        expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
       });
 
       it('should go to payment step', async function () {
@@ -378,7 +378,7 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with enabled/disabled parti
 
         // Delivery step - Go to payment step
         const isStepDeliveryComplete = await checkoutPage.goToPaymentStep(page);
-        await expect(isStepDeliveryComplete, 'Step Address is not complete').to.be.true;
+        expect(isStepDeliveryComplete, 'Step Address is not complete').to.eq(true);
       });
 
       it('should confirm the order', async function () {
@@ -389,7 +389,7 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with enabled/disabled parti
 
         // Check the confirmation message
         const cardTitle = await orderConfirmationPage.getOrderConfirmationCardTitle(page);
-        await expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
+        expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
       });
 
       it('should go to vouchers page', async function () {
@@ -399,14 +399,14 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with enabled/disabled parti
         await myAccountPage.goToVouchersPage(page);
 
         const pageHeaderTitle = await foVouchersPage.getPageTitle(page);
-        await expect(pageHeaderTitle).to.equal(foVouchersPage.pageTitle);
+        expect(pageHeaderTitle).to.equal(foVouchersPage.pageTitle);
       });
 
       it('should get the number of vouchers', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'getNumberOfVouchers2', baseContext);
 
         const numberOfVouchers = await foVouchersPage.getNumberOfVouchers(page);
-        await expect(numberOfVouchers).to.equal(0);
+        expect(numberOfVouchers).to.equal(0);
       });
     });
 
@@ -420,14 +420,14 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with enabled/disabled parti
         await cartRulesPage.reloadPage(page);
 
         const pageTitle = await cartRulesPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(cartRulesPage.pageTitle);
+        expect(pageTitle).to.contains(cartRulesPage.pageTitle);
       });
 
       it('should check the number of cart rules', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkNumberOfCartRules2', baseContext);
 
         const numberOfCartRules = await cartRulesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfCartRules).to.equal(1);
+        expect(numberOfCartRules).to.equal(1);
       });
     });
 
@@ -436,7 +436,7 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with enabled/disabled parti
         await testContext.addContextItem(this, 'testIdentifier', 'deleteCartRule', baseContext);
 
         const deleteTextResult = await cartRulesPage.deleteCartRule(page);
-        await expect(deleteTextResult).to.be.contains(cartRulesPage.successfulDeleteMessage);
+        expect(deleteTextResult).to.be.contains(cartRulesPage.successfulDeleteMessage);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/01_information/03_priority.ts b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/01_information/03_priority.ts
index 4faf514cff5b2..833f8982c2f6c 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/01_information/03_priority.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/01_information/03_priority.ts
@@ -90,7 +90,7 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with priority', async () =>
     );
 
     const pageTitle = await cartRulesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(cartRulesPage.pageTitle);
+    expect(pageTitle).to.contains(cartRulesPage.pageTitle);
   });
 
   describe('Create 2 cart rules with priority 1 and 2', async () => {
@@ -101,14 +101,14 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with priority', async () =>
         await cartRulesPage.goToAddNewCartRulesPage(page);
 
         const pageTitle = await addCartRulePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addCartRulePage.pageTitle);
+        expect(pageTitle).to.contains(addCartRulePage.pageTitle);
       });
 
       it('should create cart rule', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'createCartRule', baseContext);
 
         const validationMessage = await addCartRulePage.createEditCartRules(page, cartRulePriority2);
-        await expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
+        expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
       });
     });
 
@@ -119,14 +119,14 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with priority', async () =>
         await cartRulesPage.goToAddNewCartRulesPage(page);
 
         const pageTitle = await addCartRulePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addCartRulePage.pageTitle);
+        expect(pageTitle).to.contains(addCartRulePage.pageTitle);
       });
 
       it('should create cart rule', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'createCartRule2', baseContext);
 
         const validationMessage = await addCartRulePage.createEditCartRules(page, cartRulePriority1);
-        await expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
+        expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
       });
     });
   });
@@ -140,7 +140,7 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with priority', async () =>
       await foHomePage.changeLanguage(page, 'en');
 
       const isHomePage = await foHomePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should go to the first product page', async function () {
@@ -149,7 +149,7 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with priority', async () =>
       await foHomePage.goToProductPage(page, 1);
 
       const pageTitle = await foProductPage.getPageTitle(page);
-      await expect(pageTitle.toUpperCase()).to.contains(Products.demo_1.name.toUpperCase());
+      expect(pageTitle.toUpperCase()).to.contains(Products.demo_1.name.toUpperCase());
     });
 
     it('should add product to cart and proceed to checkout', async function () {
@@ -158,17 +158,17 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with priority', async () =>
       await foProductPage.addProductToTheCart(page);
 
       const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
-      await expect(notificationsNumber).to.be.equal(1);
+      expect(notificationsNumber).to.be.equal(1);
     });
 
     it('should check that the cart rule priority 1 is applied before priority 2', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkCartRule', baseContext);
 
       const firstCartRule = await cartPage.getCartRuleName(page, 1);
-      await expect(firstCartRule).to.equal(cartRulePriority1.name);
+      expect(firstCartRule).to.equal(cartRulePriority1.name);
 
       const secondCartRule = await cartPage.getCartRuleName(page, 2);
-      await expect(secondCartRule).to.equal(cartRulePriority2.name);
+      expect(secondCartRule).to.equal(cartRulePriority2.name);
     });
 
     it('should check the total after discount', async function () {
@@ -178,21 +178,21 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with priority', async () =>
         - (cartRulePriority2.discountAmount!.value + cartRulePriority1.discountAmount!.value);
 
       const priceATI = await cartPage.getATIPrice(page);
-      await expect(priceATI).to.equal(parseFloat(totalAfterDiscount.toFixed(2)));
+      expect(priceATI).to.equal(parseFloat(totalAfterDiscount.toFixed(2)));
     });
 
     it('should check the discount value', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkDiscountValue', baseContext);
 
       const totalDiscountValue = await cartPage.getSubtotalDiscountValue(page);
-      await expect(totalDiscountValue)
+      expect(totalDiscountValue)
         .to.equal(-(cartRulePriority2.discountAmount!.value + cartRulePriority1.discountAmount!.value));
 
       const firstDiscountValue = await cartPage.getDiscountValue(page, 1);
-      await expect(firstDiscountValue).to.equal(-(cartRulePriority1.discountAmount!.value));
+      expect(firstDiscountValue).to.equal(-(cartRulePriority1.discountAmount!.value));
 
       const secondDiscountValue = await cartPage.getDiscountValue(page, 1);
-      await expect(secondDiscountValue).to.equal(-(cartRulePriority2.discountAmount!.value));
+      expect(secondDiscountValue).to.equal(-(cartRulePriority2.discountAmount!.value));
     });
 
     it('should remove product from shopping cart', async function () {
@@ -201,7 +201,7 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with priority', async () =>
       await cartPage.deleteProduct(page, 1);
 
       const notificationNumber = await cartPage.getCartNotificationsNumber(page);
-      await expect(notificationNumber).to.be.equal(0);
+      expect(notificationNumber).to.be.equal(0);
     });
   });
 
@@ -213,14 +213,14 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with priority', async () =>
       page = await foHomePage.closePage(browserContext, page, 0);
 
       const pageTitle = await cartRulesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(cartRulesPage.pageTitle);
+      expect(pageTitle).to.contains(cartRulesPage.pageTitle);
     });
 
     it('should bulk delete cart rules', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteCartRules', baseContext);
 
       const deleteTextResult = await cartRulesPage.bulkDeleteCartRules(page);
-      await expect(deleteTextResult).to.be.contains(cartRulesPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.contains(cartRulesPage.successfulMultiDeleteMessage);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/01_information/04_disableStatus.ts b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/01_information/04_disableStatus.ts
index 491755233314b..ce84e1dc405f4 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/01_information/04_disableStatus.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/01_information/04_disableStatus.ts
@@ -72,7 +72,7 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with disabled status', asyn
       );
 
       const pageTitle = await cartRulesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(cartRulesPage.pageTitle);
+      expect(pageTitle).to.contains(cartRulesPage.pageTitle);
     });
 
     it('should go to new cart rule page', async function () {
@@ -81,14 +81,14 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with disabled status', asyn
       await cartRulesPage.goToAddNewCartRulesPage(page);
 
       const pageTitle = await addCartRulePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addCartRulePage.pageTitle);
+      expect(pageTitle).to.contains(addCartRulePage.pageTitle);
     });
 
     it('should create cart rule', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createCartRule2', baseContext);
 
       const validationMessage = await addCartRulePage.createEditCartRules(page, disabledCartRule);
-      await expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
+      expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
     });
   });
 
@@ -101,7 +101,7 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with disabled status', asyn
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should go to the first product page', async function () {
@@ -110,7 +110,7 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with disabled status', asyn
       await homePage.goToProductPage(page, 1);
 
       const pageTitle = await foProductPage.getPageTitle(page);
-      await expect(pageTitle.toUpperCase()).to.contains(Products.demo_1.name.toUpperCase());
+      expect(pageTitle.toUpperCase()).to.contains(Products.demo_1.name.toUpperCase());
     });
 
     it('should add product to cart and proceed to checkout', async function () {
@@ -119,21 +119,21 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with disabled status', asyn
       await foProductPage.addProductToTheCart(page);
 
       const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
-      await expect(notificationsNumber).to.be.equal(1);
+      expect(notificationsNumber).to.be.equal(1);
     });
 
     it('should verify the total', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'verifyTotal', baseContext);
 
       const priceATI = await cartPage.getATIPrice(page);
-      await expect(priceATI).to.equal(Products.demo_1.finalPrice);
+      expect(priceATI).to.equal(Products.demo_1.finalPrice);
     });
 
     it('should check that the cart rule name is not visible', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'isPromoCodeVisible', baseContext);
 
       const isVisible = await cartPage.isCartRuleNameVisible(page);
-      await expect(isVisible).to.be.false;
+      expect(isVisible).to.eq(false);
     });
 
     it('should remove product from shopping cart', async function () {
@@ -142,7 +142,7 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with disabled status', asyn
       await cartPage.deleteProduct(page, 1);
 
       const notificationNumber = await cartPage.getCartNotificationsNumber(page);
-      await expect(notificationNumber).to.be.equal(0);
+      expect(notificationNumber).to.be.equal(0);
     });
   });
 
@@ -154,14 +154,14 @@ describe('BO - Catalog - Cart rules : CRUD cart rule with disabled status', asyn
       page = await homePage.closePage(browserContext, page, 0);
 
       const pageTitle = await cartRulesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(cartRulesPage.pageTitle);
+      expect(pageTitle).to.contains(cartRulesPage.pageTitle);
     });
 
     it('should delete cart rule', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteCartRule', baseContext);
 
       const deleteTextResult = await cartRulesPage.deleteCartRule(page);
-      await expect(deleteTextResult).to.be.contains(cartRulesPage.successfulDeleteMessage);
+      expect(deleteTextResult).to.be.contains(cartRulesPage.successfulDeleteMessage);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/01_limitToSingleCustomer.ts b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/01_limitToSingleCustomer.ts
index 36b71be5cbcdd..3e4294a2591d0 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/01_limitToSingleCustomer.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/01_limitToSingleCustomer.ts
@@ -81,7 +81,7 @@ describe('BO - Catalog - Cart rules : Limit to single customer', async () => {
       );
 
       const pageTitle = await cartRulesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(cartRulesPage.pageTitle);
+      expect(pageTitle).to.contains(cartRulesPage.pageTitle);
     });
 
     it('should go to new cart rule page', async function () {
@@ -90,14 +90,14 @@ describe('BO - Catalog - Cart rules : Limit to single customer', async () => {
       await cartRulesPage.goToAddNewCartRulesPage(page);
 
       const pageTitle = await addCartRulePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addCartRulePage.pageTitle);
+      expect(pageTitle).to.contains(addCartRulePage.pageTitle);
     });
 
     it('should create new cart rule', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createCartRule', baseContext);
 
       const validationMessage = await addCartRulePage.createEditCartRules(page, newCartRuleData);
-      await expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
+      expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
     });
   });
 
@@ -108,7 +108,7 @@ describe('BO - Catalog - Cart rules : Limit to single customer', async () => {
       await homePage.goTo(page, global.FO.URL);
 
       const result = await homePage.isHomePage(page);
-      await expect(result).to.be.true;
+      expect(result).to.eq(true);
     });
 
     it('should go to login page', async function () {
@@ -117,7 +117,7 @@ describe('BO - Catalog - Cart rules : Limit to single customer', async () => {
       await homePage.goToLoginPage(page);
 
       const pageTitle = await foLoginPage.getPageTitle(page);
-      await expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
+      expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
     });
 
     it('should sign in with default customer', async function () {
@@ -126,7 +126,7 @@ describe('BO - Catalog - Cart rules : Limit to single customer', async () => {
       await foLoginPage.customerLogin(page, Customers.johnDoe);
 
       const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
 
     it('should go to vouchers page', async function () {
@@ -136,7 +136,7 @@ describe('BO - Catalog - Cart rules : Limit to single customer', async () => {
       await myAccountPage.goToVouchersPage(page);
 
       const pageHeaderTitle = await foVouchersPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(foVouchersPage.pageTitle);
+      expect(pageHeaderTitle).to.equal(foVouchersPage.pageTitle);
     });
 
     [
@@ -152,7 +152,7 @@ describe('BO - Catalog - Cart rules : Limit to single customer', async () => {
         await testContext.addContextItem(this, 'testIdentifier', `checkVoucher${index}`, baseContext);
 
         const cartRuleTextColumn = await foVouchersPage.getTextColumnFromTableVouchers(page, 1, cartRule.args.column);
-        await expect(cartRuleTextColumn).to.equal(cartRule.args.value);
+        expect(cartRuleTextColumn).to.equal(cartRule.args.value);
       });
     });
 
@@ -162,7 +162,7 @@ describe('BO - Catalog - Cart rules : Limit to single customer', async () => {
       await foVouchersPage.logout(page);
 
       const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is connected!').to.be.false;
+      expect(isCustomerConnected, 'Customer is connected!').to.eq(false);
     });
 
     it('should add the first product to the cart', async function () {
@@ -173,14 +173,14 @@ describe('BO - Catalog - Cart rules : Limit to single customer', async () => {
       await homePage.proceedToCheckout(page);
 
       const pageTitle = await cartPage.getPageTitle(page);
-      await expect(pageTitle).to.eq(cartPage.pageTitle);
+      expect(pageTitle).to.eq(cartPage.pageTitle);
     });
 
     it('should check that there is no discount applied', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkNoDiscount', baseContext);
 
       const isVisible = await cartPage.isCartRuleNameVisible(page);
-      await expect(isVisible).to.be.false;
+      expect(isVisible).to.eq(false);
     });
 
     it('should delete the last product from the cart', async function () {
@@ -189,7 +189,7 @@ describe('BO - Catalog - Cart rules : Limit to single customer', async () => {
       await cartPage.deleteProduct(page, 1);
 
       const notificationNumber = await cartPage.getCartNotificationsNumber(page);
-      await expect(notificationNumber).to.eq(0);
+      expect(notificationNumber).to.eq(0);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/02_invalidDateTime.ts b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/02_invalidDateTime.ts
index df534bf58d376..c752993e4ab24 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/02_invalidDateTime.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/02_invalidDateTime.ts
@@ -73,7 +73,7 @@ describe('BO - Catalog - Cart rules : Invalid date time', async () => {
       );
 
       const pageTitle = await cartRulesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(cartRulesPage.pageTitle);
+      expect(pageTitle).to.contains(cartRulesPage.pageTitle);
     });
 
     it('should go to new cart rule page', async function () {
@@ -82,14 +82,14 @@ describe('BO - Catalog - Cart rules : Invalid date time', async () => {
       await cartRulesPage.goToAddNewCartRulesPage(page);
 
       const pageTitle = await addCartRulePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addCartRulePage.pageTitle);
+      expect(pageTitle).to.contains(addCartRulePage.pageTitle);
     });
 
     it('should create new cart rule', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createCartRule', baseContext);
 
       const validationMessage = await addCartRulePage.createEditCartRules(page, newCartRuleData);
-      await expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
+      expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
     });
   });
 
@@ -100,7 +100,7 @@ describe('BO - Catalog - Cart rules : Invalid date time', async () => {
       await homePage.goTo(page, global.FO.URL);
 
       const result = await homePage.isHomePage(page);
-      await expect(result).to.be.true;
+      expect(result).to.eq(true);
     });
 
     it('should add the first product to the cart', async function () {
@@ -111,14 +111,14 @@ describe('BO - Catalog - Cart rules : Invalid date time', async () => {
       await homePage.proceedToCheckout(page);
 
       const pageTitle = await cartPage.getPageTitle(page);
-      await expect(pageTitle).to.eq(cartPage.pageTitle);
+      expect(pageTitle).to.eq(cartPage.pageTitle);
     });
 
     it('should check that there is no discount applied', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkNoDiscount', baseContext);
 
       const isVisible = await cartPage.isCartRuleNameVisible(page);
-      await expect(isVisible).to.be.false;
+      expect(isVisible).to.eq(false);
     });
 
     it('should delete the last product from the cart', async function () {
@@ -127,7 +127,7 @@ describe('BO - Catalog - Cart rules : Invalid date time', async () => {
       await cartPage.deleteProduct(page, 1);
 
       const notificationNumber = await cartPage.getCartNotificationsNumber(page);
-      await expect(notificationNumber).to.eq(0);
+      expect(notificationNumber).to.eq(0);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/03_minimumAmount.ts b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/03_minimumAmount.ts
index 58da82b301b40..f734f7050013f 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/03_minimumAmount.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/03_minimumAmount.ts
@@ -79,7 +79,7 @@ describe('BO - Catalog - Cart rules : Minimum amount', async () => {
       );
 
       const pageTitle = await cartRulesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(cartRulesPage.pageTitle);
+      expect(pageTitle).to.contains(cartRulesPage.pageTitle);
     });
 
     it('should go to new cart rule page', async function () {
@@ -88,14 +88,14 @@ describe('BO - Catalog - Cart rules : Minimum amount', async () => {
       await cartRulesPage.goToAddNewCartRulesPage(page);
 
       const pageTitle = await addCartRulePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addCartRulePage.pageTitle);
+      expect(pageTitle).to.contains(addCartRulePage.pageTitle);
     });
 
     it('should create new cart rule', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createCartRule', baseContext);
 
       const validationMessage = await addCartRulePage.createEditCartRules(page, newCartRuleData);
-      await expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
+      expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
     });
   });
 
@@ -106,7 +106,7 @@ describe('BO - Catalog - Cart rules : Minimum amount', async () => {
       await homePage.goTo(page, global.FO.URL);
 
       const result = await homePage.isHomePage(page);
-      await expect(result).to.be.true;
+      expect(result).to.eq(true);
     });
 
     it('should add the third product to the cart', async function () {
@@ -117,7 +117,7 @@ describe('BO - Catalog - Cart rules : Minimum amount', async () => {
       await homePage.proceedToCheckout(page);
 
       const pageTitle = await cartPage.getPageTitle(page);
-      await expect(pageTitle).to.eq(cartPage.pageTitle);
+      expect(pageTitle).to.eq(cartPage.pageTitle);
     });
 
     it('should add the promo code and check the error message', async function () {
@@ -126,7 +126,7 @@ describe('BO - Catalog - Cart rules : Minimum amount', async () => {
       await cartPage.addPromoCode(page, newCartRuleData.code);
 
       const errorMessage = await cartPage.getCartRuleErrorMessage(page);
-      await expect(errorMessage).to.eq(
+      expect(errorMessage).to.eq(
         `${cartPage.minimumAmountErrorMessage} €${newCartRuleData.minimumAmount.value.toFixed(2)}.`);
     });
 
@@ -136,7 +136,7 @@ describe('BO - Catalog - Cart rules : Minimum amount', async () => {
       await cartPage.editProductQuantity(page, 1, 2);
 
       const totalBeforeDiscount = await cartPage.getATIPrice(page);
-      await expect(totalBeforeDiscount).to.eq(parseFloat((Products.demo_6.combinations[0].price * 2).toFixed(2)));
+      expect(totalBeforeDiscount).to.eq(parseFloat((Products.demo_6.combinations[0].price * 2).toFixed(2)));
     });
 
     it('should add the promo code and check the total', async function () {
@@ -147,7 +147,7 @@ describe('BO - Catalog - Cart rules : Minimum amount', async () => {
       const discount = await basicHelper.percentage(Products.demo_6.combinations[0].price * 2, newCartRuleData.discountPercent!);
 
       const totalAfterDiscount = await cartPage.getATIPrice(page);
-      await expect(totalAfterDiscount).to.eq(parseFloat((Products.demo_6.combinations[0].price * 2 - discount).toFixed(2)));
+      expect(totalAfterDiscount).to.eq(parseFloat((Products.demo_6.combinations[0].price * 2 - discount).toFixed(2)));
     });
 
     it('should delete the last product from the cart', async function () {
@@ -156,7 +156,7 @@ describe('BO - Catalog - Cart rules : Minimum amount', async () => {
       await cartPage.deleteProduct(page, 1);
 
       const notificationNumber = await cartPage.getCartNotificationsNumber(page);
-      await expect(notificationNumber).to.eq(0);
+      expect(notificationNumber).to.eq(0);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/04_checkTotalAvailable.ts b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/04_checkTotalAvailable.ts
index d331cdd56c469..f77f40f2c9a6a 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/04_checkTotalAvailable.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/04_checkTotalAvailable.ts
@@ -77,7 +77,7 @@ describe('BO - Catalog - Cart rules : Check Total available', async () => {
       );
 
       const pageTitle = await cartRulesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(cartRulesPage.pageTitle);
+      expect(pageTitle).to.contains(cartRulesPage.pageTitle);
     });
 
     it('should go to new cart rule page', async function () {
@@ -86,14 +86,14 @@ describe('BO - Catalog - Cart rules : Check Total available', async () => {
       await cartRulesPage.goToAddNewCartRulesPage(page);
 
       const pageTitle = await addCartRulePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addCartRulePage.pageTitle);
+      expect(pageTitle).to.contains(addCartRulePage.pageTitle);
     });
 
     it('should create cart rule', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createCartRule', baseContext);
 
       const validationMessage = await addCartRulePage.createEditCartRules(page, cartRuleCode);
-      await expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
+      expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
     });
 
     it('should view my shop', async function () {
@@ -104,7 +104,7 @@ describe('BO - Catalog - Cart rules : Check Total available', async () => {
       await foHomePage.changeLanguage(page, 'en');
 
       const isHomePage = await foHomePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
   });
 
@@ -119,7 +119,7 @@ describe('BO - Catalog - Cart rules : Check Total available', async () => {
         await foHomePage.goToProductPage(page, 1);
 
         const pageTitle = await foProductPage.getPageTitle(page);
-        await expect(pageTitle.toUpperCase()).to.contains(Products.demo_1.name.toUpperCase());
+        expect(pageTitle.toUpperCase()).to.contains(Products.demo_1.name.toUpperCase());
       });
 
       it('should add product to cart and proceed to checkout', async function () {
@@ -128,7 +128,7 @@ describe('BO - Catalog - Cart rules : Check Total available', async () => {
         await foProductPage.addProductToTheCart(page);
 
         const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
-        await expect(notificationsNumber).to.be.equal(1);
+        expect(notificationsNumber).to.be.equal(1);
       });
 
       it('should set the promo code', async function () {
@@ -146,7 +146,7 @@ describe('BO - Catalog - Cart rules : Check Total available', async () => {
             - await basicHelper.percentage(Products.demo_1.finalPrice, cartRuleCode.discountPercent!);
 
           const totalAfterDiscount = await cartPage.getATIPrice(page);
-          await expect(totalAfterDiscount).to.equal(parseFloat(discountedPrice.toFixed(2)));
+          expect(totalAfterDiscount).to.equal(parseFloat(discountedPrice.toFixed(2)));
         });
 
         it('should proceed to checkout', async function () {
@@ -156,7 +156,7 @@ describe('BO - Catalog - Cart rules : Check Total available', async () => {
           await cartPage.clickOnProceedToCheckout(page);
 
           const isCheckout = await checkoutPage.isCheckoutPage(page);
-          await expect(isCheckout).to.be.true;
+          expect(isCheckout).to.eq(true);
         });
 
         it('should sign in by default customer', async function () {
@@ -165,21 +165,21 @@ describe('BO - Catalog - Cart rules : Check Total available', async () => {
           await checkoutPage.clickOnSignIn(page);
 
           const isCustomerConnected = await checkoutPage.customerLogin(page, Customers.johnDoe);
-          await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+          expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
         });
 
         it('should go to delivery address step', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'confirmAddressStep', baseContext);
 
           const isDeliveryStep = await checkoutPage.goToDeliveryStep(page);
-          await expect(isDeliveryStep, 'Delivery Step boc is not displayed').to.be.true;
+          expect(isDeliveryStep, 'Delivery Step boc is not displayed').to.eq(true);
         });
 
         it('should choose the shipping method', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'shippingMethodStep', baseContext);
 
           const isPaymentStep = await checkoutPage.goToPaymentStep(page);
-          await expect(isPaymentStep, 'Payment Step bloc is not displayed').to.be.true;
+          expect(isPaymentStep, 'Payment Step bloc is not displayed').to.eq(true);
         });
 
         it('should choose the payment type and confirm the order', async function () {
@@ -189,7 +189,7 @@ describe('BO - Catalog - Cart rules : Check Total available', async () => {
 
           const cardTitle = await orderConfirmationPage.getOrderConfirmationCardTitle(page);
           // Check the confirmation message
-          await expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
+          expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
         });
 
         it('should click on the logo of the shop', async function () {
@@ -198,7 +198,7 @@ describe('BO - Catalog - Cart rules : Check Total available', async () => {
           await foHomePage.clickOnHeaderLink(page, 'Logo');
 
           const pageTitle = await foHomePage.getPageTitle(page);
-          await expect(pageTitle).to.equal(foHomePage.pageTitle);
+          expect(pageTitle).to.equal(foHomePage.pageTitle);
         });
       }
       if (test.args.testIdentifier === 'cartRuleNotAccepted') {
@@ -206,7 +206,7 @@ describe('BO - Catalog - Cart rules : Check Total available', async () => {
           await testContext.addContextItem(this, 'testIdentifier', 'searchExistingVoucher', baseContext);
 
           const voucherErrorText = await cartPage.getCartRuleErrorMessage(page);
-          await expect(voucherErrorText).to.equal(cartPage.cartRuleAlreadyUsedErrorText);
+          expect(voucherErrorText).to.equal(cartPage.cartRuleAlreadyUsedErrorText);
         });
       }
     });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/05_checkTotalAvailableForEachUser.ts b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/05_checkTotalAvailableForEachUser.ts
index ef108cec291d9..e312dd5135b51 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/05_checkTotalAvailableForEachUser.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/05_checkTotalAvailableForEachUser.ts
@@ -80,7 +80,7 @@ describe('BO - Catalog - Cart rules : Check Total available for each user', asyn
       );
 
       const pageTitle = await cartRulesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(cartRulesPage.pageTitle);
+      expect(pageTitle).to.contains(cartRulesPage.pageTitle);
     });
 
     it('should go to new cart rule page', async function () {
@@ -89,14 +89,14 @@ describe('BO - Catalog - Cart rules : Check Total available for each user', asyn
       await cartRulesPage.goToAddNewCartRulesPage(page);
 
       const pageTitle = await addCartRulePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addCartRulePage.pageTitle);
+      expect(pageTitle).to.contains(addCartRulePage.pageTitle);
     });
 
     it('should create cart rule', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createCartRule', baseContext);
 
       const validationMessage = await addCartRulePage.createEditCartRules(page, newCartRuleData);
-      await expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
+      expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
     });
 
     it('should view my shop', async function () {
@@ -107,7 +107,7 @@ describe('BO - Catalog - Cart rules : Check Total available for each user', asyn
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
   });
 
@@ -123,7 +123,7 @@ describe('BO - Catalog - Cart rules : Check Total available for each user', asyn
         await homePage.goToProductPage(page, 1);
 
         const pageTitle = await productPage.getPageTitle(page);
-        await expect(pageTitle.toUpperCase()).to.contains(Products.demo_1.name.toUpperCase());
+        expect(pageTitle.toUpperCase()).to.contains(Products.demo_1.name.toUpperCase());
       });
 
       it('should add product to cart and proceed to checkout', async function () {
@@ -132,7 +132,7 @@ describe('BO - Catalog - Cart rules : Check Total available for each user', asyn
         await productPage.addProductToTheCart(page);
 
         const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
-        await expect(notificationsNumber).to.be.equal(1);
+        expect(notificationsNumber).to.be.equal(1);
       });
 
       it('should set the promo code', async function () {
@@ -149,7 +149,7 @@ describe('BO - Catalog - Cart rules : Check Total available for each user', asyn
             - await basicHelper.percentage(Products.demo_1.finalPrice, newCartRuleData.discountPercent!);
 
           const totalAfterDiscount = await cartPage.getATIPrice(page);
-          await expect(totalAfterDiscount).to.equal(parseFloat(discountedPrice.toFixed(2)));
+          expect(totalAfterDiscount).to.equal(parseFloat(discountedPrice.toFixed(2)));
         });
 
         it('should proceed to checkout', async function () {
@@ -159,7 +159,7 @@ describe('BO - Catalog - Cart rules : Check Total available for each user', asyn
           await cartPage.clickOnProceedToCheckout(page);
 
           const isCheckout = await checkoutPage.isCheckoutPage(page);
-          await expect(isCheckout).to.be.true;
+          expect(isCheckout).to.eq(true);
         });
 
         it('should sign in by default customer', async function () {
@@ -168,21 +168,21 @@ describe('BO - Catalog - Cart rules : Check Total available for each user', asyn
           await checkoutPage.clickOnSignIn(page);
 
           const isCustomerConnected = await checkoutPage.customerLogin(page, Customers.johnDoe);
-          await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+          expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
         });
 
         it('should go to delivery address step', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'confirmAddressStep', baseContext);
 
           const isDeliveryStep = await checkoutPage.goToDeliveryStep(page);
-          await expect(isDeliveryStep, 'Delivery Step boc is not displayed').to.be.true;
+          expect(isDeliveryStep, 'Delivery Step boc is not displayed').to.eq(true);
         });
 
         it('should choose the shipping method', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'shippingMethodStep', baseContext);
 
           const isPaymentStep = await checkoutPage.goToPaymentStep(page);
-          await expect(isPaymentStep, 'Payment Step bloc is not displayed').to.be.true;
+          expect(isPaymentStep, 'Payment Step bloc is not displayed').to.eq(true);
         });
 
         it('should choose the payment type and confirm the order', async function () {
@@ -192,7 +192,7 @@ describe('BO - Catalog - Cart rules : Check Total available for each user', asyn
 
           const cardTitle = await orderConfirmationPage.getOrderConfirmationCardTitle(page);
           // Check the confirmation message
-          await expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
+          expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
         });
 
         it('should go to home page', async function () {
@@ -201,7 +201,7 @@ describe('BO - Catalog - Cart rules : Check Total available for each user', asyn
           await homePage.clickOnHeaderLink(page, 'Logo');
 
           const pageTitle = await homePage.getPageTitle(page);
-          await expect(pageTitle).to.equal(homePage.pageTitle);
+          expect(pageTitle).to.equal(homePage.pageTitle);
         });
       }
       if (test.args.testIdentifier === 'cartRuleNotAccepted') {
@@ -209,7 +209,7 @@ describe('BO - Catalog - Cart rules : Check Total available for each user', asyn
           await testContext.addContextItem(this, 'testIdentifier', 'checkErrorMessage', baseContext);
 
           const voucherErrorText = await cartPage.getCartRuleErrorMessage(page);
-          await expect(voucherErrorText).to.equal(cartPage.cartRuleLimitUsageErrorText);
+          expect(voucherErrorText).to.equal(cartPage.cartRuleLimitUsageErrorText);
         });
 
         it('should sign out', async function () {
@@ -219,7 +219,7 @@ describe('BO - Catalog - Cart rules : Check Total available for each user', asyn
           await loginPage.clickOnHeaderLink(page, 'Logo');
 
           const isCustomerConnected = await homePage.isCustomerConnected(page);
-          await expect(isCustomerConnected, 'Customer is connected!').to.be.false;
+          expect(isCustomerConnected, 'Customer is connected!').to.eq(false);
         });
       }
 
@@ -231,7 +231,7 @@ describe('BO - Catalog - Cart rules : Check Total available for each user', asyn
             - await basicHelper.percentage(Products.demo_1.finalPrice, newCartRuleData.discountPercent!);
 
           const totalAfterDiscount = await cartPage.getATIPrice(page);
-          await expect(totalAfterDiscount).to.equal(parseFloat(discountedPrice.toFixed(2)));
+          expect(totalAfterDiscount).to.equal(parseFloat(discountedPrice.toFixed(2)));
         });
 
         it('should delete the last product from the cart', async function () {
@@ -240,7 +240,7 @@ describe('BO - Catalog - Cart rules : Check Total available for each user', asyn
           await cartPage.deleteProduct(page, 1);
 
           const notificationNumber = await cartPage.getCartNotificationsNumber(page);
-          await expect(notificationNumber).to.eq(0);
+          expect(notificationNumber).to.eq(0);
         });
       }
     });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/06_countrySelection.ts b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/06_countrySelection.ts
index ba87565809646..82bcec1ca6e89 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/06_countrySelection.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/06_countrySelection.ts
@@ -88,7 +88,7 @@ describe('BO - Catalog - Cart rules : Country selection', async () => {
       await zonesPage.closeSfToolBar(page);
 
       const pageTitle = await zonesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(zonesPage.pageTitle);
+      expect(pageTitle).to.contains(zonesPage.pageTitle);
     });
 
     it('should go to \'Countries\' page', async function () {
@@ -97,14 +97,14 @@ describe('BO - Catalog - Cart rules : Country selection', async () => {
       await zonesPage.goToSubTabCountries(page);
 
       const pageTitle = await countriesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(countriesPage.pageTitle);
+      expect(pageTitle).to.contains(countriesPage.pageTitle);
     });
 
     it('should reset all filters and get number of countries in BO', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
       const numberOfCountries = await countriesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCountries).to.be.above(0);
+      expect(numberOfCountries).to.be.above(0);
     });
 
     it(`should search for the country '${Countries.unitedStates.name}'`, async function () {
@@ -113,10 +113,10 @@ describe('BO - Catalog - Cart rules : Country selection', async () => {
       await countriesPage.filterTable(page, 'input', 'b!name', Countries.unitedStates.name);
 
       const numberOfCountriesAfterFilter = await countriesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfCountriesAfterFilter).to.be.equal(1);
+      expect(numberOfCountriesAfterFilter).to.be.equal(1);
 
       const textColumn = await countriesPage.getTextColumnFromTable(page, 1, 'b!name');
-      await expect(textColumn).to.equal(Countries.unitedStates.name);
+      expect(textColumn).to.equal(Countries.unitedStates.name);
     });
 
     it('should enable the country', async function () {
@@ -125,7 +125,7 @@ describe('BO - Catalog - Cart rules : Country selection', async () => {
       await countriesPage.setCountryStatus(page, 1, true);
 
       const currentStatus = await countriesPage.getCountryStatus(page, 1);
-      await expect(currentStatus).to.be.true;
+      expect(currentStatus).to.eq(true);
     });
 
     it('should reset filter', async function () {
@@ -134,7 +134,7 @@ describe('BO - Catalog - Cart rules : Country selection', async () => {
       await countriesPage.resetFilter(page);
 
       const numberOfCountriesAfterReset = await countriesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCountriesAfterReset).to.be.at.least(1);
+      expect(numberOfCountriesAfterReset).to.be.at.least(1);
     });
   });
 
@@ -149,7 +149,7 @@ describe('BO - Catalog - Cart rules : Country selection', async () => {
       );
 
       const pageTitle = await cartRulesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(cartRulesPage.pageTitle);
+      expect(pageTitle).to.contains(cartRulesPage.pageTitle);
     });
 
     it('should go to new cart rule page', async function () {
@@ -158,14 +158,14 @@ describe('BO - Catalog - Cart rules : Country selection', async () => {
       await cartRulesPage.goToAddNewCartRulesPage(page);
 
       const pageTitle = await addCartRulePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addCartRulePage.pageTitle);
+      expect(pageTitle).to.contains(addCartRulePage.pageTitle);
     });
 
     it('should create cart rule', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createCartRule', baseContext);
 
       const validationMessage = await addCartRulePage.createEditCartRules(page, cartRule);
-      await expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
+      expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
     });
   });
 
@@ -177,7 +177,7 @@ describe('BO - Catalog - Cart rules : Country selection', async () => {
       await foHomePage.changeLanguage(page, 'en');
 
       const isHomePage = await foHomePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should go to the third product page', async function () {
@@ -186,7 +186,7 @@ describe('BO - Catalog - Cart rules : Country selection', async () => {
       await foHomePage.goToProductPage(page, 3);
 
       const pageTitle = await foProductPage.getPageTitle(page);
-      await expect(pageTitle.toUpperCase()).to.contains(Products.demo_6.name.toUpperCase());
+      expect(pageTitle.toUpperCase()).to.contains(Products.demo_6.name.toUpperCase());
     });
 
     it('should add product to cart and proceed to checkout', async function () {
@@ -195,7 +195,7 @@ describe('BO - Catalog - Cart rules : Country selection', async () => {
       await foProductPage.addProductToTheCart(page);
 
       const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
-      await expect(notificationsNumber).to.be.equal(1);
+      expect(notificationsNumber).to.be.equal(1);
     });
 
     it('should set the promo code and verify the error message', async function () {
@@ -204,7 +204,7 @@ describe('BO - Catalog - Cart rules : Country selection', async () => {
       await cartPage.addPromoCode(page, cartRule.code);
 
       const chooseDeliveryAddressNotification = await cartPage.getAlertWarningForPromoCode(page);
-      await expect(chooseDeliveryAddressNotification).to.equal(cartPage.alertChooseDeliveryAddressWarningText);
+      expect(chooseDeliveryAddressNotification).to.equal(cartPage.alertChooseDeliveryAddressWarningText);
     });
 
     it('should proceed to checkout', async function () {
@@ -214,7 +214,7 @@ describe('BO - Catalog - Cart rules : Country selection', async () => {
       await cartPage.clickOnProceedToCheckout(page);
 
       const isCheckout = await checkoutPage.isCheckoutPage(page);
-      await expect(isCheckout).to.be.true;
+      expect(isCheckout).to.eq(true);
     });
 
     it('should sign in by the default customer', async function () {
@@ -223,7 +223,7 @@ describe('BO - Catalog - Cart rules : Country selection', async () => {
       await checkoutPage.clickOnSignIn(page);
 
       const isCustomerConnected = await checkoutPage.customerLogin(page, Customers.johnDoe);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
 
     it('should choose the delivery address', async function () {
@@ -232,7 +232,7 @@ describe('BO - Catalog - Cart rules : Country selection', async () => {
       await checkoutPage.chooseDeliveryAddress(page, 2);
 
       const isDeliveryStep = await checkoutPage.goToDeliveryStep(page);
-      await expect(isDeliveryStep, 'Delivery Step block is not displayed').to.be.true;
+      expect(isDeliveryStep, 'Delivery Step block is not displayed').to.eq(true);
     });
 
     it('should set the promo code', async function () {
@@ -241,21 +241,21 @@ describe('BO - Catalog - Cart rules : Country selection', async () => {
       await checkoutPage.addPromoCode(page, cartRule.code);
 
       const cartRuleName = await checkoutPage.getCartRuleName(page, 1);
-      await expect(cartRuleName).to.equal(cartRule.name);
+      expect(cartRuleName).to.equal(cartRule.name);
     });
 
     it('should check the total after discount', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkTotalAfterDiscount', baseContext);
 
       const totalAfterDiscount = await checkoutPage.getATIPrice(page);
-      await expect(totalAfterDiscount).to.eq(Products.demo_6.price - cartRule.discountAmount!.value + Carriers.myCarrier.price);
+      expect(totalAfterDiscount).to.eq(Products.demo_6.price - cartRule.discountAmount!.value + Carriers.myCarrier.price);
     });
 
     it('should remove the discount', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'removeTheDiscount', baseContext);
 
       const isDeleteIconNotVisible = await checkoutPage.removePromoCode(page);
-      await expect(isDeleteIconNotVisible, 'The discount is not removed').to.be.true;
+      expect(isDeleteIconNotVisible, 'The discount is not removed').to.eq(true);
     });
 
     it('should go to Home page', async function () {
@@ -264,7 +264,7 @@ describe('BO - Catalog - Cart rules : Country selection', async () => {
       await foHomePage.clickOnHeaderLink(page, 'Logo');
 
       const pageTitle = await foHomePage.getPageTitle(page);
-      await expect(pageTitle).to.equal(foHomePage.pageTitle);
+      expect(pageTitle).to.equal(foHomePage.pageTitle);
     });
 
     it('should go to cart page and remove product', async function () {
@@ -274,7 +274,7 @@ describe('BO - Catalog - Cart rules : Country selection', async () => {
       await cartPage.deleteProduct(page, 1);
 
       const notificationNumber = await cartPage.getCartNotificationsNumber(page);
-      await expect(notificationNumber).to.be.equal(0);
+      expect(notificationNumber).to.be.equal(0);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/07_carrierSelection.ts b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/07_carrierSelection.ts
index da94cba5cd92f..655839fb48540 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/07_carrierSelection.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/07_carrierSelection.ts
@@ -83,7 +83,7 @@ describe('BO - Catalog - Cart rules : Carrier selection', async () => {
       );
 
       const pageTitle = await cartRulesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(cartRulesPage.pageTitle);
+      expect(pageTitle).to.contains(cartRulesPage.pageTitle);
     });
 
     it('should go to new cart rule page', async function () {
@@ -92,14 +92,14 @@ describe('BO - Catalog - Cart rules : Carrier selection', async () => {
       await cartRulesPage.goToAddNewCartRulesPage(page);
 
       const pageTitle = await addCartRulePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addCartRulePage.pageTitle);
+      expect(pageTitle).to.contains(addCartRulePage.pageTitle);
     });
 
     it('should create cart rule', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createCartRule', baseContext);
 
       const validationMessage = await addCartRulePage.createEditCartRules(page, newCartRuleData);
-      await expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
+      expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
     });
 
     it('should view my shop', async function () {
@@ -109,7 +109,7 @@ describe('BO - Catalog - Cart rules : Carrier selection', async () => {
       await foHomePage.changeLanguage(page, 'en');
 
       const isHomePage = await foHomePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
   });
 
@@ -120,7 +120,7 @@ describe('BO - Catalog - Cart rules : Carrier selection', async () => {
       await foHomePage.goToProductPage(page, 3);
 
       const pageTitle = await foProductPage.getPageTitle(page);
-      await expect(pageTitle.toUpperCase()).to.contains(Products.demo_6.name.toUpperCase());
+      expect(pageTitle.toUpperCase()).to.contains(Products.demo_6.name.toUpperCase());
     });
 
     it('should add product to cart and proceed to checkout', async function () {
@@ -129,7 +129,7 @@ describe('BO - Catalog - Cart rules : Carrier selection', async () => {
       await foProductPage.addProductToTheCart(page);
 
       const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
-      await expect(notificationsNumber).to.be.equal(1);
+      expect(notificationsNumber).to.be.equal(1);
     });
 
     it('should add the promo code and check the error message', async function () {
@@ -138,7 +138,7 @@ describe('BO - Catalog - Cart rules : Carrier selection', async () => {
       await cartPage.addPromoCode(page, newCartRuleData.code);
 
       const alertMessage = await cartPage.getCartRuleErrorMessage(page);
-      await expect(alertMessage).to.equal(cartPage.cartRuleChooseCarrierAlertMessageText);
+      expect(alertMessage).to.equal(cartPage.cartRuleChooseCarrierAlertMessageText);
     });
 
     it('should proceed to checkout', async function () {
@@ -147,7 +147,7 @@ describe('BO - Catalog - Cart rules : Carrier selection', async () => {
       await cartPage.clickOnProceedToCheckout(page);
 
       const isCheckout = await checkoutPage.isCheckoutPage(page);
-      await expect(isCheckout).to.be.true;
+      expect(isCheckout).to.eq(true);
     });
 
     it('should sign in by default customer', async function () {
@@ -156,14 +156,14 @@ describe('BO - Catalog - Cart rules : Carrier selection', async () => {
       await checkoutPage.clickOnSignIn(page);
 
       const isCustomerConnected = await checkoutPage.customerLogin(page, Customers.johnDoe);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
 
     it('should go to delivery step', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'confirmAddressStep', baseContext);
 
       const isDeliveryStep = await checkoutPage.goToDeliveryStep(page);
-      await expect(isDeliveryStep, 'Delivery Step block is not displayed').to.be.true;
+      expect(isDeliveryStep, 'Delivery Step block is not displayed').to.eq(true);
     });
 
     it('should set the promo code and choose the wrong shipping method', async function () {
@@ -173,7 +173,7 @@ describe('BO - Catalog - Cart rules : Carrier selection', async () => {
       await checkoutPage.addPromoCode(page, newCartRuleData.code);
 
       const errorShippingMessage = await checkoutPage.getCartRuleErrorMessage(page);
-      await expect(errorShippingMessage).to.equal(cartPage.cartRuleCannotUseVoucherAlertMessageText);
+      expect(errorShippingMessage).to.equal(cartPage.cartRuleCannotUseVoucherAlertMessageText);
     });
 
     it('should choose the restricted shipping method and continue', async function () {
@@ -184,7 +184,7 @@ describe('BO - Catalog - Cart rules : Carrier selection', async () => {
       await checkoutPage.chooseShippingMethodAndAddComment(page, Carriers.myCarrier.id);
 
       const priceATI = await checkoutPage.getATIPrice(page);
-      await expect(priceATI.toFixed(2))
+      expect(priceATI.toFixed(2))
         .to.equal((Products.demo_6.combinations[0].price + Carriers.myCarrier.priceTTC).toFixed(2));
     });
 
@@ -197,7 +197,7 @@ describe('BO - Catalog - Cart rules : Carrier selection', async () => {
         - newCartRuleData.discountAmount!.value + Carriers.myCarrier.priceTTC;
 
       const priceATI = await checkoutPage.getATIPrice(page);
-      await expect(priceATI.toFixed(2)).to.equal(totalAfterDiscount.toFixed(2));
+      expect(priceATI.toFixed(2)).to.equal(totalAfterDiscount.toFixed(2));
     });
 
     it('should go to Home page', async function () {
@@ -206,7 +206,7 @@ describe('BO - Catalog - Cart rules : Carrier selection', async () => {
       await foHomePage.clickOnHeaderLink(page, 'Logo');
 
       const pageTitle = await foHomePage.getPageTitle(page);
-      await expect(pageTitle).to.equal(foHomePage.pageTitle);
+      expect(pageTitle).to.equal(foHomePage.pageTitle);
     });
 
     it('should go to cart page and delete the product', async function () {
@@ -217,7 +217,7 @@ describe('BO - Catalog - Cart rules : Carrier selection', async () => {
       await cartPage.deleteProduct(page, 1);
 
       const notificationNumber = await cartPage.getCartNotificationsNumber(page);
-      await expect(notificationNumber).to.be.equal(0);
+      expect(notificationNumber).to.be.equal(0);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/08_customerGroupSelection.ts b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/08_customerGroupSelection.ts
index 701cd143f37c2..63f997e98c0a9 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/08_customerGroupSelection.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/08_customerGroupSelection.ts
@@ -77,7 +77,7 @@ describe('BO - Catalog - Cart rules : Customer Group selection', async () => {
       );
 
       const pageTitle = await cartRulesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(cartRulesPage.pageTitle);
+      expect(pageTitle).to.contains(cartRulesPage.pageTitle);
     });
 
     it('should go to new cart rule page', async function () {
@@ -86,14 +86,14 @@ describe('BO - Catalog - Cart rules : Customer Group selection', async () => {
       await cartRulesPage.goToAddNewCartRulesPage(page);
 
       const pageTitle = await addCartRulePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addCartRulePage.pageTitle);
+      expect(pageTitle).to.contains(addCartRulePage.pageTitle);
     });
 
     it('should create cart rule', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createCartRule', baseContext);
 
       const validationMessage = await addCartRulePage.createEditCartRules(page, cartRuleCode);
-      await expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
+      expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
     });
 
     it('should view my shop', async function () {
@@ -103,7 +103,7 @@ describe('BO - Catalog - Cart rules : Customer Group selection', async () => {
       await foHomePage.changeLanguage(page, 'en');
 
       const isHomePage = await foHomePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
   });
 
@@ -114,7 +114,7 @@ describe('BO - Catalog - Cart rules : Customer Group selection', async () => {
       await foHomePage.goToLoginPage(page);
 
       const pageTitle = await loginPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(loginPage.pageTitle);
+      expect(pageTitle).to.equal(loginPage.pageTitle);
     });
 
     it('should sign in by default customer', async function () {
@@ -123,10 +123,10 @@ describe('BO - Catalog - Cart rules : Customer Group selection', async () => {
       await loginPage.customerLogin(page, Customers.johnDoe);
 
       const isCustomerConnected = await loginPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected!').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected!').to.eq(true);
 
       const isHomePage = await foHomePage.isHomePage(page);
-      await expect(isHomePage).to.be.true;
+      expect(isHomePage).to.eq(true);
     });
 
     it('should go to the first product page', async function () {
@@ -135,7 +135,7 @@ describe('BO - Catalog - Cart rules : Customer Group selection', async () => {
       await foHomePage.goToProductPage(page, 1);
 
       const pageTitle = await foProductPage.getPageTitle(page);
-      await expect(pageTitle.toUpperCase()).to.contains(Products.demo_1.name.toUpperCase());
+      expect(pageTitle.toUpperCase()).to.contains(Products.demo_1.name.toUpperCase());
     });
 
     it('should add product to cart', async function () {
@@ -144,7 +144,7 @@ describe('BO - Catalog - Cart rules : Customer Group selection', async () => {
       await foProductPage.addProductToTheCart(page);
 
       const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
-      await expect(notificationsNumber).to.be.equal(1);
+      expect(notificationsNumber).to.be.equal(1);
     });
 
     it('should add the promo code and check the error message', async function () {
@@ -153,7 +153,7 @@ describe('BO - Catalog - Cart rules : Customer Group selection', async () => {
       await cartPage.addPromoCode(page, cartRuleCode.code);
 
       const alertMessage = await cartPage.getCartRuleErrorMessage(page);
-      await expect(alertMessage).to.equal(cartPage.cartRuleAlertMessageText);
+      expect(alertMessage).to.equal(cartPage.cartRuleAlertMessageText);
     });
 
     it('should logout by the link in the header', async function () {
@@ -162,7 +162,7 @@ describe('BO - Catalog - Cart rules : Customer Group selection', async () => {
       await foHomePage.logout(page);
 
       const isCustomerConnected = await foHomePage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is connected!').to.be.false;
+      expect(isCustomerConnected, 'Customer is connected!').to.eq(false);
     });
 
     it('should go to home page', async function () {
@@ -171,7 +171,7 @@ describe('BO - Catalog - Cart rules : Customer Group selection', async () => {
       await foHomePage.clickOnHeaderLink(page, 'Logo');
 
       const pageTitle = await foHomePage.getPageTitle(page);
-      await expect(pageTitle).to.equal(foHomePage.pageTitle);
+      expect(pageTitle).to.equal(foHomePage.pageTitle);
     });
 
     it('should go to the first product page', async function () {
@@ -180,7 +180,7 @@ describe('BO - Catalog - Cart rules : Customer Group selection', async () => {
       await foHomePage.goToProductPage(page, 1);
 
       const pageTitle = await foProductPage.getPageTitle(page);
-      await expect(pageTitle.toUpperCase()).to.contains(Products.demo_1.name.toUpperCase());
+      expect(pageTitle.toUpperCase()).to.contains(Products.demo_1.name.toUpperCase());
     });
 
     it('should add product to cart', async function () {
@@ -189,7 +189,7 @@ describe('BO - Catalog - Cart rules : Customer Group selection', async () => {
       await foProductPage.addProductToTheCart(page);
 
       const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
-      await expect(notificationsNumber).to.be.equal(1);
+      expect(notificationsNumber).to.be.equal(1);
     });
 
     it('should add the promo code and verify the total after discount', async function () {
@@ -198,7 +198,7 @@ describe('BO - Catalog - Cart rules : Customer Group selection', async () => {
       await cartPage.addPromoCode(page, cartRuleCode.code);
 
       const totalAfterDiscount = await cartPage.getATIPrice(page);
-      await expect(totalAfterDiscount).to.equal(0);
+      expect(totalAfterDiscount).to.equal(0);
     });
 
     it('should go to Home page', async function () {
@@ -207,7 +207,7 @@ describe('BO - Catalog - Cart rules : Customer Group selection', async () => {
       await foHomePage.clickOnHeaderLink(page, 'Logo');
 
       const pageTitle = await foHomePage.getPageTitle(page);
-      await expect(pageTitle).to.equal(foHomePage.pageTitle);
+      expect(pageTitle).to.equal(foHomePage.pageTitle);
     });
 
     it('should go to cart page and delete the product', async function () {
@@ -218,7 +218,7 @@ describe('BO - Catalog - Cart rules : Customer Group selection', async () => {
       await cartPage.deleteProduct(page, 1);
 
       const notificationNumber = await cartPage.getCartNotificationsNumber(page);
-      await expect(notificationNumber).to.be.equal(0);
+      expect(notificationNumber).to.be.equal(0);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/10_productSelection.ts b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/10_productSelection.ts
index 640cadd128ebd..3d314b8f5c59b 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/10_productSelection.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/02_conditions/10_productSelection.ts
@@ -79,7 +79,7 @@ describe('BO - Catalog - Cart rules : Product selection', async () => {
       );
 
       const pageTitle = await cartRulesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(cartRulesPage.pageTitle);
+      expect(pageTitle).to.contains(cartRulesPage.pageTitle);
     });
 
     it('should go to new cart rule page', async function () {
@@ -88,14 +88,14 @@ describe('BO - Catalog - Cart rules : Product selection', async () => {
       await cartRulesPage.goToAddNewCartRulesPage(page);
 
       const pageTitle = await addCartRulePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addCartRulePage.pageTitle);
+      expect(pageTitle).to.contains(addCartRulePage.pageTitle);
     });
 
     it('should create cart rule', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createCartRule', baseContext);
 
       const validationMessage = await addCartRulePage.createEditCartRules(page, newCartRuleData);
-      await expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
+      expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
     });
 
     it('should view my shop', async function () {
@@ -105,7 +105,7 @@ describe('BO - Catalog - Cart rules : Product selection', async () => {
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
   });
 
@@ -116,7 +116,7 @@ describe('BO - Catalog - Cart rules : Product selection', async () => {
       await homePage.goToLoginPage(page);
 
       const pageTitle = await loginPage.getPageTitle(page);
-      await expect(pageTitle).to.eq(loginPage.pageTitle);
+      expect(pageTitle).to.eq(loginPage.pageTitle);
     });
 
     it('should login', async function () {
@@ -125,7 +125,7 @@ describe('BO - Catalog - Cart rules : Product selection', async () => {
       await loginPage.customerLogin(page, Customers.johnDoe);
 
       const isCustomerConnected = await loginPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected!').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected!').to.eq(true);
     });
 
     it(`should search for the product '${Products.demo_8.name}' and go to product page`, async function () {
@@ -135,7 +135,7 @@ describe('BO - Catalog - Cart rules : Product selection', async () => {
       await searchResultsPage.goToProductPage(page, 1);
 
       const pageTitle = await productPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(Products.demo_8.name);
+      expect(pageTitle).to.contains(Products.demo_8.name);
     });
 
     it('should add the product to cart and click on continue shopping', async function () {
@@ -145,7 +145,7 @@ describe('BO - Catalog - Cart rules : Product selection', async () => {
       await productPage.goToHomePage(page);
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should add the first product to the cart by quick view', async function () {
@@ -154,7 +154,7 @@ describe('BO - Catalog - Cart rules : Product selection', async () => {
       await homePage.addProductToCartByQuickView(page, 1);
 
       const isNotVisible = await homePage.continueShopping(page);
-      await expect(isNotVisible).to.be.true;
+      expect(isNotVisible).to.eq(true);
     });
 
     it('should add the second product to the cart by quick view', async function () {
@@ -165,7 +165,7 @@ describe('BO - Catalog - Cart rules : Product selection', async () => {
 
       // Check number of products in cart
       const notificationsNumber = await homePage.getCartNotificationsNumber(page);
-      await expect(notificationsNumber).to.eq(3);
+      expect(notificationsNumber).to.eq(3);
     });
 
     it('should add the promo code and check the cart rule name', async function () {
@@ -174,7 +174,7 @@ describe('BO - Catalog - Cart rules : Product selection', async () => {
       await cartPage.addPromoCode(page, newCartRuleData.code);
 
       const cartRuleName = await cartPage.getCartRuleName(page, 1);
-      await expect(cartRuleName).to.eq(newCartRuleData.name);
+      expect(cartRuleName).to.eq(newCartRuleData.name);
     });
 
     it('should check the discount value', async function () {
@@ -185,7 +185,7 @@ describe('BO - Catalog - Cart rules : Product selection', async () => {
       const discount = await basicHelper.percentage(total, newCartRuleData.discountPercent!);
 
       const discountValue = await cartPage.getDiscountValue(page);
-      await expect(discountValue).to.eq(-discount.toFixed(2));
+      expect(discountValue).to.eq(-discount.toFixed(2));
     });
 
     it('should delete the second product from the cart', async function () {
@@ -194,7 +194,7 @@ describe('BO - Catalog - Cart rules : Product selection', async () => {
       await cartPage.deleteProduct(page, 2);
 
       const notificationNumber = await cartPage.getCartNotificationsNumber(page);
-      await expect(notificationNumber).to.eq(2);
+      expect(notificationNumber).to.eq(2);
     });
 
     it('should check the discount value', async function () {
@@ -205,7 +205,7 @@ describe('BO - Catalog - Cart rules : Product selection', async () => {
       const discount = await basicHelper.percentage(total, newCartRuleData.discountPercent!);
 
       const discountValue = await cartPage.getDiscountValue(page);
-      await expect(discountValue).to.eq(-discount.toFixed(2));
+      expect(discountValue).to.eq(-discount.toFixed(2));
     });
 
     it(`should delete the product '${Products.demo_8.name}' from the cart`, async function () {
@@ -214,14 +214,14 @@ describe('BO - Catalog - Cart rules : Product selection', async () => {
       await cartPage.deleteProduct(page, 1);
 
       const notificationNumber = await cartPage.getCartNotificationsNumber(page);
-      await expect(notificationNumber).to.eq(1);
+      expect(notificationNumber).to.eq(1);
     });
 
     it('should check that no discount is applied to the cart', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkNoDiscount', baseContext);
 
       const isVisible = await cartPage.isCartRuleNameVisible(page);
-      await expect(isVisible).to.be.false;
+      expect(isVisible).to.eq(false);
     });
 
     it('should delete the last product from the cart', async function () {
@@ -230,7 +230,7 @@ describe('BO - Catalog - Cart rules : Product selection', async () => {
       await cartPage.deleteProduct(page, 1);
 
       const notificationNumber = await cartPage.getCartNotificationsNumber(page);
-      await expect(notificationNumber).to.eq(0);
+      expect(notificationNumber).to.eq(0);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/03_actions/07_applyToSpecificProduct.ts b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/03_actions/07_applyToSpecificProduct.ts
index 15e26d8b14322..c202c362f9c7a 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/03_actions/07_applyToSpecificProduct.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/01_CRUDCartRule/03_actions/07_applyToSpecificProduct.ts
@@ -78,7 +78,7 @@ describe('BO - Catalog - Cart rules : Apply discount to specific product', async
       );
 
       const pageTitle = await cartRulesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(cartRulesPage.pageTitle);
+      expect(pageTitle).to.contains(cartRulesPage.pageTitle);
     });
 
     it('should go to new cart rule page', async function () {
@@ -87,14 +87,14 @@ describe('BO - Catalog - Cart rules : Apply discount to specific product', async
       await cartRulesPage.goToAddNewCartRulesPage(page);
 
       const pageTitle = await addCartRulePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addCartRulePage.pageTitle);
+      expect(pageTitle).to.contains(addCartRulePage.pageTitle);
     });
 
     it('should create cart rule', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createCartRule', baseContext);
 
       const validationMessage = await addCartRulePage.createEditCartRules(page, newCartRuleData);
-      await expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
+      expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
     });
 
     it('should view my shop', async function () {
@@ -104,7 +104,7 @@ describe('BO - Catalog - Cart rules : Apply discount to specific product', async
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
   });
 
@@ -115,7 +115,7 @@ describe('BO - Catalog - Cart rules : Apply discount to specific product', async
       await homePage.goToLoginPage(page);
 
       const pageTitle = await loginPage.getPageTitle(page);
-      await expect(pageTitle).to.eq(loginPage.pageTitle);
+      expect(pageTitle).to.eq(loginPage.pageTitle);
     });
 
     it('should login', async function () {
@@ -124,7 +124,7 @@ describe('BO - Catalog - Cart rules : Apply discount to specific product', async
       await loginPage.customerLogin(page, Customers.johnDoe);
 
       const isCustomerConnected = await loginPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected!').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected!').to.eq(true);
     });
 
     it(`should search for the product '${Products.demo_8.name}' and go to product page`, async function () {
@@ -134,7 +134,7 @@ describe('BO - Catalog - Cart rules : Apply discount to specific product', async
       await searchResultsPage.goToProductPage(page, 1);
 
       const pageTitle = await productPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(Products.demo_8.name);
+      expect(pageTitle).to.contains(Products.demo_8.name);
     });
 
     it('should add the product to cart and click on continue shopping', async function () {
@@ -144,7 +144,7 @@ describe('BO - Catalog - Cart rules : Apply discount to specific product', async
       await productPage.goToHomePage(page);
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should add the first product to the cart by quick view', async function () {
@@ -153,7 +153,7 @@ describe('BO - Catalog - Cart rules : Apply discount to specific product', async
       await homePage.addProductToCartByQuickView(page, 1);
 
       const isNotVisible = await homePage.continueShopping(page);
-      await expect(isNotVisible).to.be.true;
+      expect(isNotVisible).to.eq(true);
     });
 
     it('should add the second product to the cart by quick view', async function () {
@@ -164,7 +164,7 @@ describe('BO - Catalog - Cart rules : Apply discount to specific product', async
 
       // Check number of products in cart
       const notificationsNumber = await homePage.getCartNotificationsNumber(page);
-      await expect(notificationsNumber).to.eq(3);
+      expect(notificationsNumber).to.eq(3);
     });
 
     it('should add the promo code and check the cart rule name', async function () {
@@ -173,7 +173,7 @@ describe('BO - Catalog - Cart rules : Apply discount to specific product', async
       await cartPage.addPromoCode(page, newCartRuleData.code);
 
       const cartRuleName = await cartPage.getCartRuleName(page, 1);
-      await expect(cartRuleName).to.eq(newCartRuleData.name);
+      expect(cartRuleName).to.eq(newCartRuleData.name);
     });
 
     it('should check the discount value', async function () {
@@ -182,7 +182,7 @@ describe('BO - Catalog - Cart rules : Apply discount to specific product', async
       const discount = await basicHelper.percentage(Products.demo_8.finalPrice, newCartRuleData.discountPercent!);
 
       const discountValue = await cartPage.getDiscountValue(page);
-      await expect(discountValue).to.eq(-discount.toFixed(2));
+      expect(discountValue).to.eq(-discount.toFixed(2));
     });
 
     it('should delete the second product from the cart', async function () {
@@ -191,7 +191,7 @@ describe('BO - Catalog - Cart rules : Apply discount to specific product', async
       await cartPage.deleteProduct(page, 2);
 
       const notificationNumber = await cartPage.getCartNotificationsNumber(page);
-      await expect(notificationNumber).to.eq(2);
+      expect(notificationNumber).to.eq(2);
     });
 
     it('should check the discount value', async function () {
@@ -200,7 +200,7 @@ describe('BO - Catalog - Cart rules : Apply discount to specific product', async
       const discount = await basicHelper.percentage(Products.demo_8.finalPrice, newCartRuleData.discountPercent!);
 
       const discountValue = await cartPage.getDiscountValue(page);
-      await expect(discountValue).to.eq(-discount.toFixed(2));
+      expect(discountValue).to.eq(-discount.toFixed(2));
     });
 
     it(`should delete the product '${Products.demo_8.name}' from the cart`, async function () {
@@ -209,14 +209,14 @@ describe('BO - Catalog - Cart rules : Apply discount to specific product', async
       await cartPage.deleteProduct(page, 1);
 
       const notificationNumber = await cartPage.getCartNotificationsNumber(page);
-      await expect(notificationNumber).to.eq(1);
+      expect(notificationNumber).to.eq(1);
     });
 
     it('should check that no discount is applied to the cart', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkNoDiscount', baseContext);
 
       const isVisible = await cartPage.isCartRuleNameVisible(page);
-      await expect(isVisible).to.be.false;
+      expect(isVisible).to.eq(false);
     });
 
     it('should delete the last product from the cart', async function () {
@@ -225,7 +225,7 @@ describe('BO - Catalog - Cart rules : Apply discount to specific product', async
       await cartPage.deleteProduct(page, 1);
 
       const notificationNumber = await cartPage.getCartNotificationsNumber(page);
-      await expect(notificationNumber).to.eq(0);
+      expect(notificationNumber).to.eq(0);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/02_filterQuickEditAndBulkActionsCartRules.ts b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/02_filterQuickEditAndBulkActionsCartRules.ts
index 46c3e1bb0b9f1..529250a387dab 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/02_filterQuickEditAndBulkActionsCartRules.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/02_filterQuickEditAndBulkActionsCartRules.ts
@@ -66,14 +66,14 @@ describe('BO - Catalog - Discounts : Filter, quick edit and bulk actions cart ru
     );
 
     const pageTitle = await cartRulesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(cartRulesPage.pageTitle);
+    expect(pageTitle).to.contains(cartRulesPage.pageTitle);
   });
 
   it('should reset and get number of cart rules', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFirst', baseContext);
 
     numberOfCartRules = await cartRulesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfCartRules).to.be.at.least(0);
+    expect(numberOfCartRules).to.be.at.least(0);
   });
 
   describe('Create 2 cart rules', async () => {
@@ -85,17 +85,17 @@ describe('BO - Catalog - Discounts : Filter, quick edit and bulk actions cart ru
           await cartRulesPage.goToAddNewCartRulesPage(page);
 
           const pageTitle = await addCartRulePage.getPageTitle(page);
-          await expect(pageTitle).to.contains(addCartRulePage.pageTitle);
+          expect(pageTitle).to.contains(addCartRulePage.pageTitle);
         });
 
         it('should create new cart rule', async function () {
           await testContext.addContextItem(this, 'testIdentifier', `createCartRule${index}`, baseContext);
 
           const validationMessage = await addCartRulePage.createEditCartRules(page, cartRuleToCreate);
-          await expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
+          expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
 
           const numberOfCartRulesAfterCreation = await cartRulesPage.getNumberOfElementInGrid(page);
-          await expect(numberOfCartRulesAfterCreation).to.be.at.most(numberOfCartRules + index + 1);
+          expect(numberOfCartRulesAfterCreation).to.be.at.most(numberOfCartRules + index + 1);
         });
       });
   });
@@ -141,19 +141,19 @@ describe('BO - Catalog - Discounts : Filter, quick edit and bulk actions cart ru
         );
 
         const numberOfCartRulesAfterFilter = await cartRulesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfCartRulesAfterFilter).to.be.at.most(numberOfCartRules + 2);
+        expect(numberOfCartRulesAfterFilter).to.be.at.most(numberOfCartRules + 2);
 
         for (let row = 1; row <= numberOfCartRulesAfterFilter; row++) {
           if (test.args.filterBy === 'active') {
             const cartRuleStatus = await cartRulesPage.getCartRuleStatus(page, row);
-            await expect(cartRuleStatus).to.equal(test.args.filterValue === '1');
+            expect(cartRuleStatus).to.equal(test.args.filterValue === '1');
           } else {
             const textColumn = await cartRulesPage.getTextColumn(
               page,
               row,
               test.args.filterBy,
             );
-            await expect(textColumn).to.contains(test.args.filterValue);
+            expect(textColumn).to.contains(test.args.filterValue);
           }
         }
       });
@@ -162,7 +162,7 @@ describe('BO - Catalog - Discounts : Filter, quick edit and bulk actions cart ru
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}Reset`, baseContext);
 
         const numberOfCartRulesAfterReset = await cartRulesPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfCartRulesAfterReset).to.equal(numberOfCartRules + 2);
+        expect(numberOfCartRulesAfterReset).to.equal(numberOfCartRules + 2);
       });
     });
   });
@@ -174,7 +174,7 @@ describe('BO - Catalog - Discounts : Filter, quick edit and bulk actions cart ru
       await cartRulesPage.filterCartRules(page, 'input', 'name', firstCartRule.name);
 
       const textColumn = await cartRulesPage.getTextColumn(page, 1, 'name');
-      await expect(textColumn).to.contains(firstCartRule.name);
+      expect(textColumn).to.contains(firstCartRule.name);
     });
 
     [
@@ -187,7 +187,7 @@ describe('BO - Catalog - Discounts : Filter, quick edit and bulk actions cart ru
         await cartRulesPage.setCartRuleStatus(page, 1, status.args.enable);
 
         const currentStatus = await cartRulesPage.getCartRuleStatus(page, 1);
-        await expect(currentStatus).to.be.equal(status.args.enable);
+        expect(currentStatus).to.be.equal(status.args.enable);
       });
     });
 
@@ -195,7 +195,7 @@ describe('BO - Catalog - Discounts : Filter, quick edit and bulk actions cart ru
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterQuickEdit', baseContext);
 
       const numberOfCartRulesAfterReset = await cartRulesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCartRulesAfterReset).to.equal(numberOfCartRules + 2);
+      expect(numberOfCartRulesAfterReset).to.equal(numberOfCartRules + 2);
     });
   });
 
@@ -211,11 +211,11 @@ describe('BO - Catalog - Discounts : Filter, quick edit and bulk actions cart ru
       );
 
       const numberOfCartRulesAfterFilter = await cartRulesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfCartRulesAfterFilter).to.be.at.most(numberOfCartRules + 2);
+      expect(numberOfCartRulesAfterFilter).to.be.at.most(numberOfCartRules + 2);
 
       for (let row = 1; row <= numberOfCartRulesAfterFilter; row++) {
         const textColumn = await cartRulesPage.getTextColumn(page, row, 'name');
-        await expect(textColumn).to.contains('todelete');
+        expect(textColumn).to.contains('todelete');
       }
     });
 
@@ -232,7 +232,7 @@ describe('BO - Catalog - Discounts : Filter, quick edit and bulk actions cart ru
 
         for (let row = 1; row <= numberOfCartRulesBulkActions; row++) {
           const rowStatus = await cartRulesPage.getCartRuleStatus(page, row);
-          await expect(rowStatus).to.equal(test.wantedStatus);
+          expect(rowStatus).to.equal(test.wantedStatus);
         }
       });
     });
@@ -241,14 +241,14 @@ describe('BO - Catalog - Discounts : Filter, quick edit and bulk actions cart ru
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteCartRules', baseContext);
 
       const deleteTextResult = await cartRulesPage.bulkDeleteCartRules(page);
-      await expect(deleteTextResult).to.be.contains(cartRulesPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.contains(cartRulesPage.successfulMultiDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterBulkDelete', baseContext);
 
       const numberOfCartRulesAfterDelete = await cartRulesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCartRulesAfterDelete).to.equal(numberOfCartRules);
+      expect(numberOfCartRulesAfterDelete).to.equal(numberOfCartRules);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/03_sortAndPaginationCartRule.ts b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/03_sortAndPaginationCartRule.ts
index 34ef2e39ec08e..5089f66d78088 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/03_sortAndPaginationCartRule.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/01_cartRules/03_sortAndPaginationCartRule.ts
@@ -54,14 +54,14 @@ describe('BO - Catalog - Discounts : Sort and pagination cart rules', async () =
     );
 
     const pageTitle = await cartRulesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(cartRulesPage.pageTitle);
+    expect(pageTitle).to.contains(cartRulesPage.pageTitle);
   });
 
   it('should reset filter and get number of cart rules', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFirst', baseContext);
 
     numberOfCartRules = await cartRulesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfCartRules).to.be.at.least(0);
+    expect(numberOfCartRules).to.be.at.least(0);
   });
 
   // 1 - create 21 cart rules
@@ -80,17 +80,17 @@ describe('BO - Catalog - Discounts : Sort and pagination cart rules', async () =
         await cartRulesPage.goToAddNewCartRulesPage(page);
 
         const pageTitle = await addCartRulePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addCartRulePage.pageTitle);
+        expect(pageTitle).to.contains(addCartRulePage.pageTitle);
       });
 
       it(`should create cart rule n°${index + 1}`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `createCartRule${index}`, baseContext);
 
         const validationMessage = await addCartRulePage.createEditCartRules(page, cartRuleData);
-        await expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
+        expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
 
         const numberOfCartRulesAfterCreation = await cartRulesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfCartRulesAfterCreation).to.be.equal(numberOfCartRules + 1 + index);
+        expect(numberOfCartRulesAfterCreation).to.be.equal(numberOfCartRules + 1 + index);
       });
     });
   });
@@ -207,25 +207,25 @@ describe('BO - Catalog - Discounts : Sort and pagination cart rules', async () =
           const expectedResult: number[] = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
           if (test.args.sortDirection === 'up') {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+            expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+            expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
         } else if (test.args.isDate) {
           const expectedResult: string[] = await basicHelper.sortArrayDate(nonSortedTable);
 
           if (test.args.sortDirection === 'up') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         } else {
           const expectedResult: string[] = await basicHelper.sortArray(nonSortedTable);
 
           if (test.args.sortDirection === 'up') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         }
       });
@@ -243,7 +243,7 @@ describe('BO - Catalog - Discounts : Sort and pagination cart rules', async () =
 
       for (let i = 1; i <= numberOfCartRulesAfterFilter; i++) {
         const textColumn = await cartRulesPage.getTextColumn(page, i, 'name');
-        await expect(textColumn).to.contains('todelete');
+        expect(textColumn).to.contains('todelete');
       }
     });
 
@@ -251,14 +251,14 @@ describe('BO - Catalog - Discounts : Sort and pagination cart rules', async () =
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteCartRules', baseContext);
 
       const deleteTextResult = await cartRulesPage.bulkDeleteCartRules(page);
-      await expect(deleteTextResult).to.be.contains(cartRulesPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.contains(cartRulesPage.successfulMultiDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterBulkDelete', baseContext);
 
       const numberOfCartRulesAfterDelete = await cartRulesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCartRulesAfterDelete).to.equal(numberOfCartRules);
+      expect(numberOfCartRulesAfterDelete).to.equal(numberOfCartRules);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/02_catalogPriceRules/01_CRUDCatalogPriceRule.ts b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/02_catalogPriceRules/01_CRUDCatalogPriceRule.ts
index 2831babeedea4..083d6da16a70c 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/02_catalogPriceRules/01_CRUDCatalogPriceRule.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/02_catalogPriceRules/01_CRUDCatalogPriceRule.ts
@@ -86,7 +86,7 @@ describe('BO - Catalog - Discounts : CRUD catalog price rules', async () => {
       );
 
       const pageTitle = await cartRulesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(cartRulesPage.pageTitle);
+      expect(pageTitle).to.contains(cartRulesPage.pageTitle);
     });
 
     it('should go to \'Catalog Price Rules\' tab', async function () {
@@ -95,7 +95,7 @@ describe('BO - Catalog - Discounts : CRUD catalog price rules', async () => {
       await cartRulesPage.goToCatalogPriceRulesTab(page);
 
       const pageTitle = await catalogPriceRulesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(catalogPriceRulesPage.pageTitle);
+      expect(pageTitle).to.contains(catalogPriceRulesPage.pageTitle);
     });
 
     it('should create new catalog price rule', async function () {
@@ -104,10 +104,10 @@ describe('BO - Catalog - Discounts : CRUD catalog price rules', async () => {
       await catalogPriceRulesPage.goToAddNewCatalogPriceRulePage(page);
 
       const pageTitle = await addCatalogPriceRulePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addCatalogPriceRulePage.pageTitle);
+      expect(pageTitle).to.contains(addCatalogPriceRulePage.pageTitle);
 
       const validationMessage = await addCatalogPriceRulePage.setCatalogPriceRule(page, newCatalogPriceRuleData);
-      await expect(validationMessage).to.contains(catalogPriceRulesPage.successfulCreationMessage);
+      expect(validationMessage).to.contains(catalogPriceRulesPage.successfulCreationMessage);
     });
   });
 
@@ -121,7 +121,7 @@ describe('BO - Catalog - Discounts : CRUD catalog price rules', async () => {
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should go to the first product page', async function () {
@@ -130,7 +130,7 @@ describe('BO - Catalog - Discounts : CRUD catalog price rules', async () => {
       await homePage.goToProductPage(page, 1);
 
       const pageTitle = await productPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(Products.demo_1.name);
+      expect(pageTitle).to.contains(Products.demo_1.name);
     });
 
     it('should check the discount', async function () {
@@ -138,15 +138,15 @@ describe('BO - Catalog - Discounts : CRUD catalog price rules', async () => {
 
       // Check quantity for discount value
       const quantityDiscountValue = await productPage.getQuantityDiscountValue(page);
-      await expect(quantityDiscountValue).to.equal(newCatalogPriceRuleData.fromQuantity);
+      expect(quantityDiscountValue).to.equal(newCatalogPriceRuleData.fromQuantity);
 
       // Check unit discount value
       const unitDiscountValue = await productPage.getDiscountValue(page);
-      await expect(unitDiscountValue).to.equal(`€${newCatalogPriceRuleData.reduction}.00`);
+      expect(unitDiscountValue).to.equal(`€${newCatalogPriceRuleData.reduction}.00`);
 
       // Check discount percentage
       let columnValue = await productPage.getDiscountPercentage(page);
-      await expect(columnValue).to.equal(defaultDiscount);
+      expect(columnValue).to.equal(defaultDiscount);
 
       // Check final price
       let finalPrice = await productPage.getProductInformation(page);
@@ -157,7 +157,7 @@ describe('BO - Catalog - Discounts : CRUD catalog price rules', async () => {
 
       // Check discount value
       columnValue = await productPage.getDiscountAmount(page);
-      await expect(columnValue).to.equal(discountAmountForNewDiscount);
+      expect(columnValue).to.equal(discountAmountForNewDiscount);
 
       // Check final price
       finalPrice = await productPage.getProductInformation(page);
@@ -173,7 +173,7 @@ describe('BO - Catalog - Discounts : CRUD catalog price rules', async () => {
       page = await productPage.closePage(browserContext, page, 0);
 
       const pageTitle = await catalogPriceRulesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(catalogPriceRulesPage.pageTitle);
+      expect(pageTitle).to.contains(catalogPriceRulesPage.pageTitle);
     });
 
     it('should update the created catalog price rule', async function () {
@@ -182,10 +182,10 @@ describe('BO - Catalog - Discounts : CRUD catalog price rules', async () => {
       await catalogPriceRulesPage.goToEditCatalogPriceRulePage(page, newCatalogPriceRuleData.name);
 
       const pageTitle = await addCatalogPriceRulePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addCatalogPriceRulePage.editPageTitle);
+      expect(pageTitle).to.contains(addCatalogPriceRulePage.editPageTitle);
 
       const validationMessage = await addCatalogPriceRulePage.setCatalogPriceRule(page, editCatalogPriceRuleData);
-      await expect(validationMessage).to.contains(catalogPriceRulesPage.successfulUpdateMessage);
+      expect(validationMessage).to.contains(catalogPriceRulesPage.successfulUpdateMessage);
     });
   });
 
@@ -199,7 +199,7 @@ describe('BO - Catalog - Discounts : CRUD catalog price rules', async () => {
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should go to the first product page', async function () {
@@ -208,7 +208,7 @@ describe('BO - Catalog - Discounts : CRUD catalog price rules', async () => {
       await homePage.goToProductPage(page, 1);
 
       const pageTitle = await productPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(Products.demo_1.name);
+      expect(pageTitle).to.contains(Products.demo_1.name);
     });
 
     it('should check the discount', async function () {
@@ -216,15 +216,15 @@ describe('BO - Catalog - Discounts : CRUD catalog price rules', async () => {
 
       // Check quantity for discount value
       const quantityDiscountValue = await productPage.getQuantityDiscountValue(page);
-      await expect(quantityDiscountValue).to.equal(editCatalogPriceRuleData.fromQuantity);
+      expect(quantityDiscountValue).to.equal(editCatalogPriceRuleData.fromQuantity);
 
       // Check unit discount value
       const unitDiscountValue = await productPage.getDiscountValue(page);
-      await expect(unitDiscountValue).to.equal(`€${editCatalogPriceRuleData.reduction}.00`);
+      expect(unitDiscountValue).to.equal(`€${editCatalogPriceRuleData.reduction}.00`);
 
       // Check discount percentage
       let columnValue = await productPage.getDiscountPercentage(page);
-      await expect(columnValue).to.equal(defaultDiscount);
+      expect(columnValue).to.equal(defaultDiscount);
 
       // Check final price
       let finalPrice = await productPage.getProductInformation(page);
@@ -235,7 +235,7 @@ describe('BO - Catalog - Discounts : CRUD catalog price rules', async () => {
 
       // Check discount value
       columnValue = await productPage.getDiscountAmount(page);
-      await expect(columnValue).to.equal(discountAmountForUpdatedDiscount);
+      expect(columnValue).to.equal(discountAmountForUpdatedDiscount);
 
       // Check final price
       finalPrice = await productPage.getProductInformation(page);
@@ -251,14 +251,14 @@ describe('BO - Catalog - Discounts : CRUD catalog price rules', async () => {
       page = await productPage.closePage(browserContext, page, 0);
 
       const pageTitle = await catalogPriceRulesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(catalogPriceRulesPage.pageTitle);
+      expect(pageTitle).to.contains(catalogPriceRulesPage.pageTitle);
     });
 
     it('should delete catalog price rule', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteCatalogPriceRule', baseContext);
 
       const deleteTextResult = await catalogPriceRulesPage.deleteCatalogPriceRule(page, editCatalogPriceRuleData.name);
-      await expect(deleteTextResult).to.contains(catalogPriceRulesPage.successfulDeleteMessage);
+      expect(deleteTextResult).to.contains(catalogPriceRulesPage.successfulDeleteMessage);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/02_catalogPriceRules/02_filterSortAndPagination.ts b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/02_catalogPriceRules/02_filterSortAndPagination.ts
index 8ecb1ad5d77c4..314b703b60bd6 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/02_catalogPriceRules/02_filterSortAndPagination.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/07_discounts/02_catalogPriceRules/02_filterSortAndPagination.ts
@@ -63,7 +63,7 @@ describe('BO - Catalog - Discounts : Filter, sort and pagination catalog price r
     );
 
     const pageTitle = await cartRulesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(cartRulesPage.pageTitle);
+    expect(pageTitle).to.contains(cartRulesPage.pageTitle);
   });
 
   it('should go to \'Catalog Price Rules\' tab', async function () {
@@ -74,7 +74,7 @@ describe('BO - Catalog - Discounts : Filter, sort and pagination catalog price r
     numberOfCatalogPriceRules = await catalogPriceRulesPage.resetAndGetNumberOfLines(page);
 
     const pageTitle = await catalogPriceRulesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(catalogPriceRulesPage.pageTitle);
+    expect(pageTitle).to.contains(catalogPriceRulesPage.pageTitle);
   });
 
   // 1 - Create 21 catalog price rules
@@ -93,17 +93,17 @@ describe('BO - Catalog - Discounts : Filter, sort and pagination catalog price r
         await catalogPriceRulesPage.goToAddNewCatalogPriceRulePage(page);
 
         const pageTitle = await addCatalogPriceRulePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addCatalogPriceRulePage.pageTitle);
+        expect(pageTitle).to.contains(addCatalogPriceRulePage.pageTitle);
       });
 
       it(`should create catalog price rule n°${index + 1}`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `createCatalogPriceRule${index}`, baseContext);
 
         const validationMessage = await addCatalogPriceRulePage.setCatalogPriceRule(page, priceRuleData);
-        await expect(validationMessage).to.contains(catalogPriceRulesPage.successfulCreationMessage);
+        expect(validationMessage).to.contains(catalogPriceRulesPage.successfulCreationMessage);
 
         const numberOfCatalogPriceRulesAfterCreation = await catalogPriceRulesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfCatalogPriceRulesAfterCreation).to.be.at.most(numberOfCatalogPriceRules + index + 1);
+        expect(numberOfCatalogPriceRulesAfterCreation).to.be.at.most(numberOfCatalogPriceRules + index + 1);
       });
     });
   });
@@ -180,11 +180,11 @@ describe('BO - Catalog - Discounts : Filter, sort and pagination catalog price r
         );
 
         const numberOfPriceRulesAfterFilter = await catalogPriceRulesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfPriceRulesAfterFilter).to.be.at.most(numberOfCatalogPriceRules + 21);
+        expect(numberOfPriceRulesAfterFilter).to.be.at.most(numberOfCatalogPriceRules + 21);
 
         for (let row = 1; row <= numberOfPriceRulesAfterFilter; row++) {
           const textColumn = await catalogPriceRulesPage.getTextColumn(page, row, test.args.filterBy);
-          await expect(textColumn).to.contains(test.args.filterValue);
+          expect(textColumn).to.contains(test.args.filterValue);
         }
       });
 
@@ -192,7 +192,7 @@ describe('BO - Catalog - Discounts : Filter, sort and pagination catalog price r
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}Reset`, baseContext);
 
         const numberOfPriceRulesAfterReset = await catalogPriceRulesPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfPriceRulesAfterReset).to.equal(numberOfCatalogPriceRules + 21);
+        expect(numberOfPriceRulesAfterReset).to.equal(numberOfCatalogPriceRules + 21);
       });
     });
 
@@ -230,7 +230,7 @@ describe('BO - Catalog - Discounts : Filter, sort and pagination catalog price r
             row,
             test.args.filterBy,
           );
-          await expect(textColumn).to.contains(dateToCheck);
+          expect(textColumn).to.contains(dateToCheck);
         }
       });
 
@@ -238,7 +238,7 @@ describe('BO - Catalog - Discounts : Filter, sort and pagination catalog price r
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}Reset`, baseContext);
 
         const numberOfPriceRulesAfterReset = await catalogPriceRulesPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfPriceRulesAfterReset).to.equal(numberOfCatalogPriceRules + 21);
+        expect(numberOfPriceRulesAfterReset).to.equal(numberOfCatalogPriceRules + 21);
       });
     });
   });
@@ -365,25 +365,25 @@ describe('BO - Catalog - Discounts : Filter, sort and pagination catalog price r
           const expectedResult: number[] = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
           if (test.args.sortDirection === 'up') {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+            expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+            expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
         } else if (test.args.isDate) {
           const expectedResult: string[] = await basicHelper.sortArrayDate(nonSortedTable);
 
           if (test.args.sortDirection === 'up') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         } else {
           const expectedResult: string[] = await basicHelper.sortArray(nonSortedTable);
 
           if (test.args.sortDirection === 'up') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         }
       });
@@ -427,7 +427,7 @@ describe('BO - Catalog - Discounts : Filter, sort and pagination catalog price r
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeletePriceRules', baseContext);
 
       const deleteTextResult = await catalogPriceRulesPage.bulkDeletePriceRules(page);
-      await expect(deleteTextResult).to.be.contains(catalogPriceRulesPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.contains(catalogPriceRulesPage.successfulMultiDeleteMessage);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/01_simpleFilterStocks.ts b/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/01_simpleFilterStocks.ts
index 8ed66daba54c0..24beeb1e2c856 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/01_simpleFilterStocks.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/01_simpleFilterStocks.ts
@@ -49,14 +49,14 @@ describe('BO - Catalog - Stocks : Simple filter stocks', async () => {
     await stocksPage.closeSfToolBar(page);
 
     const pageTitle = await stocksPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(stocksPage.pageTitle);
+    expect(pageTitle).to.contains(stocksPage.pageTitle);
   });
 
   it('should get number of products in list', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'getNumberOfProductsInList', baseContext);
 
     numberOfProducts = await stocksPage.getTotalNumberOfProducts(page);
-    await expect(numberOfProducts).to.be.above(0);
+    expect(numberOfProducts).to.be.above(0);
   });
 
   // Filter products by name, reference, supplier
@@ -72,11 +72,11 @@ describe('BO - Catalog - Stocks : Simple filter stocks', async () => {
         await stocksPage.simpleFilter(page, test.args.filterValue);
 
         const numberOfProductsAfterFilter = await stocksPage.getNumberOfProductsFromList(page);
-        await expect(numberOfProductsAfterFilter).to.be.at.most(numberOfProducts);
+        expect(numberOfProductsAfterFilter).to.be.at.most(numberOfProducts);
 
         for (let i = 1; i <= numberOfProductsAfterFilter; i++) {
           const textColumn = await stocksPage.getTextColumnFromTableStocks(page, i, test.args.filterBy);
-          await expect(textColumn).to.contains(test.args.filterValue);
+          expect(textColumn).to.contains(test.args.filterValue);
         }
       });
 
@@ -84,7 +84,7 @@ describe('BO - Catalog - Stocks : Simple filter stocks', async () => {
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}Reset`, baseContext);
 
         const numberOfProductsAfterReset = await stocksPage.resetFilter(page);
-        await expect(numberOfProductsAfterReset).to.equal(numberOfProducts);
+        expect(numberOfProductsAfterReset).to.equal(numberOfProducts);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/02_updateQuantity.ts b/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/02_updateQuantity.ts
index 39a51ed5c441d..b7aeaf399d7ec 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/02_updateQuantity.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/02_updateQuantity.ts
@@ -51,14 +51,14 @@ describe('BO - Catalog - Stocks : Update Quantity', async () => {
     await stocksPage.closeSfToolBar(page);
 
     const pageTitle = await stocksPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(stocksPage.pageTitle);
+    expect(pageTitle).to.contains(stocksPage.pageTitle);
   });
 
   it('should get number of products in list', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'getNumberOfProducts', baseContext);
 
     numberOfProducts = await stocksPage.getTotalNumberOfProducts(page);
-    await expect(numberOfProducts).to.be.above(0);
+    expect(numberOfProducts).to.be.above(0);
   });
 
   /*
@@ -77,10 +77,10 @@ describe('BO - Catalog - Stocks : Update Quantity', async () => {
         await stocksPage.simpleFilter(page, productStock.name);
 
         const numberOfProductsAfterFilter = await stocksPage.getNumberOfProductsFromList(page);
-        await expect(numberOfProductsAfterFilter).to.be.at.most(numberOfProducts);
+        expect(numberOfProductsAfterFilter).to.be.at.most(numberOfProducts);
 
         const textColumn = await stocksPage.getTextColumnFromTableStocks(page, 1, 'name');
-        await expect(textColumn).to.contains(productStock.name);
+        expect(textColumn).to.contains(productStock.name);
 
         // Get physical and available quantities of product
         productStock.stocks = {
@@ -88,8 +88,8 @@ describe('BO - Catalog - Stocks : Update Quantity', async () => {
           available: parseInt(await stocksPage.getTextColumnFromTableStocks(page, 1, 'available'), 10),
         };
 
-        await expect(productStock.stocks.physical).to.be.above(0);
-        await expect(productStock.stocks.available).to.be.above(0);
+        expect(productStock.stocks.physical).to.be.above(0);
+        expect(productStock.stocks.available).to.be.above(0);
       });
 
       it(`should ${test.args.action} quantity by setting input value`, async function () {
@@ -97,15 +97,15 @@ describe('BO - Catalog - Stocks : Update Quantity', async () => {
 
         // Update Quantity and check successful message
         const updateMessage = await stocksPage.updateRowQuantityWithInput(page, 1, test.args.updateValue);
-        await expect(updateMessage).to.contains(stocksPage.successfulUpdateMessage);
+        expect(updateMessage).to.contains(stocksPage.successfulUpdateMessage);
 
         // Check physical and available quantities of product after update
         const quantityToCheck = await stocksPage.getStockQuantityForProduct(page, 1);
 
-        await expect(quantityToCheck.physical).to.be.equal(productStock.stocks.physical + test.args.updateValue);
+        expect(quantityToCheck.physical).to.be.equal(productStock.stocks.physical + test.args.updateValue);
         productStock.stocks.physical = quantityToCheck.physical;
 
-        await expect(quantityToCheck.available).to.be.equal(productStock.stocks.available + test.args.updateValue);
+        expect(quantityToCheck.available).to.be.equal(productStock.stocks.available + test.args.updateValue);
         productStock.stocks.available = quantityToCheck.available;
       });
 
@@ -115,7 +115,7 @@ describe('BO - Catalog - Stocks : Update Quantity', async () => {
         await stocksPage.goToSubTabMovements(page);
 
         const pageTitle = await movementsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(movementsPage.pageTitle);
+        expect(pageTitle).to.contains(movementsPage.pageTitle);
       });
 
       it(`should filter by product name '${productStock.name}' and check result`, async function () {
@@ -124,14 +124,14 @@ describe('BO - Catalog - Stocks : Update Quantity', async () => {
         await movementsPage.simpleFilter(page, productStock.name);
 
         const numberOfMovements = await movementsPage.getNumberOfElementInGrid(page);
-        await expect(numberOfMovements).to.be.at.least(1);
+        expect(numberOfMovements).to.be.at.least(1);
 
         const productName = await movementsPage.getTextColumnFromTable(page, numberOfMovements, 'product_name');
-        await expect(productName).to.contain(productStock.name);
+        expect(productName).to.contain(productStock.name);
 
         // Check movement quantity
         const movementQuantity = await movementsPage.getTextColumnFromTable(page, numberOfMovements, 'quantity');
-        await expect(parseFloat(movementQuantity)).to.equal(test.args.updateValue);
+        expect(parseFloat(movementQuantity)).to.equal(test.args.updateValue);
       });
 
       it('should go back to stocks page', async function () {
@@ -140,14 +140,14 @@ describe('BO - Catalog - Stocks : Update Quantity', async () => {
         await movementsPage.goToSubTabStocks(page);
 
         const pageTitle = await stocksPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(stocksPage.pageTitle);
+        expect(pageTitle).to.contains(stocksPage.pageTitle);
       });
 
       it('should reset all filters', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `resetFilterStocks${index}`, baseContext);
 
         const numberOfProductsAfterReset = await stocksPage.resetFilter(page);
-        await expect(numberOfProductsAfterReset).to.equal(numberOfProducts);
+        expect(numberOfProductsAfterReset).to.equal(numberOfProducts);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/03_bulkEditQuantity.ts b/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/03_bulkEditQuantity.ts
index bd7bc35fe892a..78adcbb9d410c 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/03_bulkEditQuantity.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/03_bulkEditQuantity.ts
@@ -53,14 +53,14 @@ describe('BO - Catalog - Stocks : Bulk edit quantity', async () => {
     await stocksPage.closeSfToolBar(page);
 
     const pageTitle = await stocksPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(stocksPage.pageTitle);
+    expect(pageTitle).to.contains(stocksPage.pageTitle);
   });
 
   it('should get number of products in list', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'getNumberOfProducts', baseContext);
 
     numberOfProducts = await stocksPage.getTotalNumberOfProducts(page);
-    await expect(numberOfProducts).to.be.above(0);
+    expect(numberOfProducts).to.be.above(0);
   });
 
   describe('Bulk edit quantity by setting input value', async () => {
@@ -70,11 +70,11 @@ describe('BO - Catalog - Stocks : Bulk edit quantity', async () => {
       await stocksPage.simpleFilter(page, Products.demo_8.name);
 
       const numberOfProductsAfterFilter = await stocksPage.getNumberOfProductsFromList(page);
-      await expect(numberOfProductsAfterFilter).to.be.at.most(numberOfProducts);
+      expect(numberOfProductsAfterFilter).to.be.at.most(numberOfProducts);
 
       for (let i = 1; i <= numberOfProductsAfterFilter; i++) {
         const textColumn = await stocksPage.getTextColumnFromTableStocks(page, i, 'name');
-        await expect(textColumn).to.contains(Products.demo_8.name);
+        expect(textColumn).to.contains(Products.demo_8.name);
 
         // Get physical and available quantities of product
         stocks[`product${i}`] = {
@@ -82,8 +82,8 @@ describe('BO - Catalog - Stocks : Bulk edit quantity', async () => {
           available: parseInt(await stocksPage.getTextColumnFromTableStocks(page, i, 'available'), 10),
         };
 
-        await expect(stocks[`product${i}`].physical).to.be.above(0);
-        await expect(stocks[`product${i}`].available).to.be.above(0);
+        expect(stocks[`product${i}`].physical).to.be.above(0);
+        expect(stocks[`product${i}`].available).to.be.above(0);
       }
     });
 
@@ -96,7 +96,7 @@ describe('BO - Catalog - Stocks : Bulk edit quantity', async () => {
 
         // Update quantity and check successful message
         const updateMessage = await stocksPage.bulkEditQuantityWithInput(page, test.args.updateValue);
-        await expect(updateMessage).to.contains(stocksPage.successfulUpdateMessage);
+        expect(updateMessage).to.contains(stocksPage.successfulUpdateMessage);
 
         const numberOfProductsInList = await stocksPage.getNumberOfProductsFromList(page);
 
@@ -104,10 +104,10 @@ describe('BO - Catalog - Stocks : Bulk edit quantity', async () => {
         for (let i = 1; i <= numberOfProductsInList; i++) {
           const quantityToCheck = await stocksPage.getStockQuantityForProduct(page, i);
 
-          await expect(quantityToCheck.physical).to.be.equal(stocks[`product${i}`].physical + test.args.updateValue);
+          expect(quantityToCheck.physical).to.be.equal(stocks[`product${i}`].physical + test.args.updateValue);
           stocks[`product${i}`].physical = quantityToCheck.physical;
 
-          await expect(quantityToCheck.available).to.be.equal(stocks[`product${i}`].available + test.args.updateValue);
+          expect(quantityToCheck.available).to.be.equal(stocks[`product${i}`].available + test.args.updateValue);
           stocks[`product${i}`].available = quantityToCheck.available;
         }
       });
@@ -117,7 +117,7 @@ describe('BO - Catalog - Stocks : Bulk edit quantity', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterEditQuantities', baseContext);
 
       const numberOfProductsAfterReset = await stocksPage.resetFilter(page);
-      await expect(numberOfProductsAfterReset).to.equal(numberOfProducts);
+      expect(numberOfProductsAfterReset).to.equal(numberOfProducts);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/04_filterStocksByStatus.ts b/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/04_filterStocksByStatus.ts
index 834153e62271d..845e5b4f1e92e 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/04_filterStocksByStatus.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/04_filterStocksByStatus.ts
@@ -65,7 +65,7 @@ describe('BO - Catalog - Stocks : Filter stocks by status', async () => {
       await productsPage.closeSfToolBar(page);
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should reset all filters', async function () {
@@ -74,7 +74,7 @@ describe('BO - Catalog - Stocks : Filter stocks by status', async () => {
       await productsPage.resetFilterCategory(page);
 
       numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProducts).to.be.above(0);
+      expect(numberOfProducts).to.be.above(0);
     });
 
     it('should create disabled Product', async function () {
@@ -83,7 +83,7 @@ describe('BO - Catalog - Stocks : Filter stocks by status', async () => {
       await productsPage.goToAddProductPage(page);
 
       const createProductMessage = await addProductPage.createEditBasicProduct(page, productData);
-      await expect(createProductMessage).to.equal(addProductPage.settingUpdatedMessage);
+      expect(createProductMessage).to.equal(addProductPage.settingUpdatedMessage);
     });
   });
 
@@ -98,7 +98,7 @@ describe('BO - Catalog - Stocks : Filter stocks by status', async () => {
       );
 
       const pageTitle = await stocksPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(stocksPage.pageTitle);
+      expect(pageTitle).to.contains(stocksPage.pageTitle);
     });
 
     it('should filter by status \'disabled\' and check the existence of the created product', async function () {
@@ -107,7 +107,7 @@ describe('BO - Catalog - Stocks : Filter stocks by status', async () => {
       await stocksPage.filterByStatus(page, 'disabled');
 
       const textColumn = await stocksPage.getTextColumnFromTableStocks(page, 1, 'name');
-      await expect(textColumn).to.contains(productData.name);
+      expect(textColumn).to.contains(productData.name);
     });
   });
 
@@ -122,17 +122,17 @@ describe('BO - Catalog - Stocks : Filter stocks by status', async () => {
       );
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should delete product', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteProduct', baseContext);
 
       const testResult = await productsPage.deleteProduct(page, productData);
-      await expect(testResult).to.equal(productsPage.productDeletedSuccessfulMessage);
+      expect(testResult).to.equal(productsPage.productDeletedSuccessfulMessage);
 
       const numberOfProductsAfterDelete = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProductsAfterDelete).to.equal(numberOfProducts);
+      expect(numberOfProductsAfterDelete).to.equal(numberOfProducts);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/06_helpCard.ts b/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/06_helpCard.ts
index e1caf11a8f7db..cd4000e7c686f 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/06_helpCard.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/06_helpCard.ts
@@ -43,23 +43,23 @@ describe('BO - Catalog - Stocks : Help card in stocks page', async () => {
     );
 
     const pageTitle = await stocksPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(stocksPage.pageTitle);
+    expect(pageTitle).to.contains(stocksPage.pageTitle);
   });
 
   it('should open the help side bar and check the document language', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'openHelpSidebar', baseContext);
 
     const isHelpSidebarVisible = await stocksPage.openHelpSideBar(page);
-    await expect(isHelpSidebarVisible).to.be.true;
+    expect(isHelpSidebarVisible).to.eq(true);
 
     const documentURL = await stocksPage.getHelpDocumentURL(page);
-    await expect(documentURL).to.contains('country=en');
+    expect(documentURL).to.contains('country=en');
   });
 
   it('should close the help side bar', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'closeHelpSidebar', baseContext);
 
     const isHelpSidebarClosed = await stocksPage.closeHelpSideBar(page);
-    await expect(isHelpSidebarClosed).to.be.true;
+    expect(isHelpSidebarClosed).to.eq(true);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/movements/02_sortAndPagination.ts b/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/movements/02_sortAndPagination.ts
index f1cb892373424..d6e5b3508906b 100644
--- a/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/movements/02_sortAndPagination.ts
+++ b/tests/UI/campaigns/functional/BO/03_catalog/08_stocks/movements/02_sortAndPagination.ts
@@ -49,7 +49,7 @@ describe('BO - Catalog - Movements : Sort and pagination', async () => {
       await stocksPage.closeSfToolBar(page);
 
       const pageTitle = await stocksPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(stocksPage.pageTitle);
+      expect(pageTitle).to.contains(stocksPage.pageTitle);
     });
 
     it(`should bulk edit the quantity of the product '${Products.demo_1.name}'`, async function () {
@@ -59,7 +59,7 @@ describe('BO - Catalog - Movements : Sort and pagination', async () => {
 
       // Update quantity and check successful message
       const updateMessage = await stocksPage.bulkEditQuantityWithInput(page, 301);
-      await expect(updateMessage).to.contains(stocksPage.successfulUpdateMessage);
+      expect(updateMessage).to.contains(stocksPage.successfulUpdateMessage);
     });
   });
 
@@ -70,7 +70,7 @@ describe('BO - Catalog - Movements : Sort and pagination', async () => {
       await stocksPage.goToSubTabMovements(page);
 
       const pageTitle = await movementsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(movementsPage.pageTitle);
+      expect(pageTitle).to.contains(movementsPage.pageTitle);
     });
 
     const sortTests = [
@@ -115,17 +115,17 @@ describe('BO - Catalog - Movements : Sort and pagination', async () => {
           const expectedResult: number[] = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+            expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+            expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
         } else {
           const expectedResult: string[] = await basicHelper.sortArray(nonSortedTable);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         }
       });
@@ -143,14 +143,14 @@ describe('BO - Catalog - Movements : Sort and pagination', async () => {
       );
 
       const pageTitle = await stocksPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(stocksPage.pageTitle);
+      expect(pageTitle).to.contains(stocksPage.pageTitle);
     });
 
     it('should bulk edit the quantity of all products in the first page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'bulkEditQuantityFirstPage', baseContext);
 
       const updateMessage = await stocksPage.bulkEditQuantityWithInput(page, 301);
-      await expect(updateMessage).to.contains(stocksPage.successfulUpdateMessage);
+      expect(updateMessage).to.contains(stocksPage.successfulUpdateMessage);
     });
 
     it('should go to the second page and bulk edit the quantity of all products', async function () {
@@ -159,7 +159,7 @@ describe('BO - Catalog - Movements : Sort and pagination', async () => {
       await stocksPage.paginateTo(page, 2);
 
       const updateMessage = await stocksPage.bulkEditQuantityWithInput(page, 301);
-      await expect(updateMessage).to.contains(stocksPage.successfulUpdateMessage);
+      expect(updateMessage).to.contains(stocksPage.successfulUpdateMessage);
     });
   });
 
@@ -170,21 +170,21 @@ describe('BO - Catalog - Movements : Sort and pagination', async () => {
       await stocksPage.goToSubTabMovements(page);
 
       const pageTitle = await movementsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(movementsPage.pageTitle);
+      expect(pageTitle).to.contains(movementsPage.pageTitle);
     });
 
     it('should go to the next page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'goToNextPage', baseContext);
 
       const pageNumber = await movementsPage.paginateTo(page, 2);
-      await expect(pageNumber).to.eq(2);
+      expect(pageNumber).to.eq(2);
     });
 
     it('should go back to the first page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'goBackToFirstPage', baseContext);
 
       const pageNumber = await movementsPage.paginateTo(page, 1);
-      await expect(pageNumber).to.eq(1);
+      expect(pageNumber).to.eq(1);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/04_customers/01_customers/02_CRUDCustomer.ts b/tests/UI/campaigns/functional/BO/04_customers/01_customers/02_CRUDCustomer.ts
index b5c3914d704d2..85922ff7a64e2 100644
--- a/tests/UI/campaigns/functional/BO/04_customers/01_customers/02_CRUDCustomer.ts
+++ b/tests/UI/campaigns/functional/BO/04_customers/01_customers/02_CRUDCustomer.ts
@@ -60,14 +60,14 @@ describe('BO - Customers - Customers : CRUD Customer in BO', async () => {
     await customersPage.closeSfToolBar(page);
 
     const pageTitle = await customersPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(customersPage.pageTitle);
+    expect(pageTitle).to.contains(customersPage.pageTitle);
   });
 
   it('should reset all filters', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFirst', baseContext);
 
     numberOfCustomers = await customersPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfCustomers).to.be.above(0);
+    expect(numberOfCustomers).to.be.above(0);
   });
 
   // 1 : Create customer and go to FO to check sign in is OK
@@ -78,17 +78,17 @@ describe('BO - Customers - Customers : CRUD Customer in BO', async () => {
       await customersPage.goToAddNewCustomerPage(page);
 
       const pageTitle = await addCustomerPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addCustomerPage.pageTitleCreate);
+      expect(pageTitle).to.contains(addCustomerPage.pageTitleCreate);
     });
 
     it('should create customer and check result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createCustomer', baseContext);
 
       const textResult = await addCustomerPage.createEditCustomer(page, createCustomerData);
-      await expect(textResult).to.equal(customersPage.successfulCreationMessage);
+      expect(textResult).to.equal(customersPage.successfulCreationMessage);
 
       const numberOfCustomersAfterCreation = await customersPage.getNumberOfElementInGrid(page);
-      await expect(numberOfCustomersAfterCreation).to.be.equal(numberOfCustomers + 1);
+      expect(numberOfCustomersAfterCreation).to.be.equal(numberOfCustomers + 1);
     });
   });
 
@@ -103,7 +103,7 @@ describe('BO - Customers - Customers : CRUD Customer in BO', async () => {
       await foHomePage.changeLanguage(page, 'en');
 
       const isHomePage = await foHomePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should sign in by new customer', async function () {
@@ -113,7 +113,7 @@ describe('BO - Customers - Customers : CRUD Customer in BO', async () => {
       await foLoginPage.customerLogin(page, createCustomerData);
 
       const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
-      await expect(isCustomerConnected).to.be.true;
+      expect(isCustomerConnected).to.eq(true);
     });
 
     it('should logout', async function () {
@@ -123,7 +123,7 @@ describe('BO - Customers - Customers : CRUD Customer in BO', async () => {
       await foHomePage.logout(page);
 
       const isCustomerConnected = await foHomePage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is connected!').to.be.false;
+      expect(isCustomerConnected, 'Customer is connected!').to.eq(false);
     });
 
     it('should go back to BO', async function () {
@@ -133,7 +133,7 @@ describe('BO - Customers - Customers : CRUD Customer in BO', async () => {
       page = await foHomePage.closePage(browserContext, page, 0);
 
       const pageTitle = await customersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customersPage.pageTitle);
+      expect(pageTitle).to.contains(customersPage.pageTitle);
     });
   });
 
@@ -146,7 +146,7 @@ describe('BO - Customers - Customers : CRUD Customer in BO', async () => {
       await customersPage.filterCustomers(page, 'input', 'email', createCustomerData.email);
 
       const textEmail = await customersPage.getTextColumnFromTableCustomers(page, 1, 'email');
-      await expect(textEmail).to.contains(createCustomerData.email);
+      expect(textEmail).to.contains(createCustomerData.email);
     });
 
     it('should click on view customer', async function () {
@@ -155,22 +155,22 @@ describe('BO - Customers - Customers : CRUD Customer in BO', async () => {
       await customersPage.goToViewCustomerPage(page, 1);
 
       const pageTitle = await viewCustomerPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(viewCustomerPage.pageTitle(createCustomerName));
+      expect(pageTitle).to.contains(viewCustomerPage.pageTitle(createCustomerName));
     });
 
     it('should check customer personal information', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkCreatedCustomerInfo', baseContext);
 
       const cardHeaderText = await viewCustomerPage.getPersonalInformationTitle(page);
-      await expect(cardHeaderText).to.contains(createCustomerData.firstName);
-      await expect(cardHeaderText).to.contains(createCustomerData.lastName);
-      await expect(cardHeaderText).to.contains(createCustomerData.email);
+      expect(cardHeaderText).to.contains(createCustomerData.firstName);
+      expect(cardHeaderText).to.contains(createCustomerData.lastName);
+      expect(cardHeaderText).to.contains(createCustomerData.email);
 
       const numOrders = await viewCustomerPage.getNumberOfElementFromTitle(page, 'Orders');
-      await expect(parseInt(numOrders, 10)).equal(0);
+      expect(parseInt(numOrders, 10)).equal(0);
 
       const numCarts = await viewCustomerPage.getNumberOfElementFromTitle(page, 'Carts');
-      await expect(parseInt(numCarts, 10)).equal(0);
+      expect(parseInt(numCarts, 10)).equal(0);
     });
   });
 
@@ -186,7 +186,7 @@ describe('BO - Customers - Customers : CRUD Customer in BO', async () => {
       );
 
       const pageTitle = await customersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customersPage.pageTitle);
+      expect(pageTitle).to.contains(customersPage.pageTitle);
     });
 
     it(`should filter list by email '${createCustomerData.email}'`, async function () {
@@ -196,7 +196,7 @@ describe('BO - Customers - Customers : CRUD Customer in BO', async () => {
       await customersPage.filterCustomers(page, 'input', 'email', createCustomerData.email);
 
       const textEmail = await customersPage.getTextColumnFromTableCustomers(page, 1, 'email');
-      await expect(textEmail).to.contains(createCustomerData.email);
+      expect(textEmail).to.contains(createCustomerData.email);
     });
 
     it('should go to edit customer page', async function () {
@@ -205,17 +205,17 @@ describe('BO - Customers - Customers : CRUD Customer in BO', async () => {
       await customersPage.goToEditCustomerPage(page, 1);
 
       const pageTitle = await addCustomerPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addCustomerPage.pageTitleEdit);
+      expect(pageTitle).to.contains(addCustomerPage.pageTitleEdit);
     });
 
     it('should update customer', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateCustomer', baseContext);
 
       const textResult = await addCustomerPage.createEditCustomer(page, editCustomerData);
-      await expect(textResult).to.equal(customersPage.successfulUpdateMessage);
+      expect(textResult).to.equal(customersPage.successfulUpdateMessage);
 
       const numberOfCustomersAfterUpdate = await customersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCustomersAfterUpdate).to.be.equal(numberOfCustomers + 1);
+      expect(numberOfCustomersAfterUpdate).to.be.equal(numberOfCustomers + 1);
     });
   });
 
@@ -230,7 +230,7 @@ describe('BO - Customers - Customers : CRUD Customer in BO', async () => {
       await foHomePage.changeLanguage(page, 'en');
 
       const isHomePage = await foHomePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should check sign in by edited account', async function () {
@@ -241,10 +241,10 @@ describe('BO - Customers - Customers : CRUD Customer in BO', async () => {
       await foLoginPage.customerLogin(page, editCustomerData);
 
       const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
-      await expect(isCustomerConnected).to.be.false;
+      expect(isCustomerConnected).to.eq(false);
 
       const loginError = await foLoginPage.getLoginError(page);
-      await expect(loginError).to.contains(foLoginPage.disabledAccountErrorText);
+      expect(loginError).to.contains(foLoginPage.disabledAccountErrorText);
     });
 
     it('should go back to BO', async function () {
@@ -254,7 +254,7 @@ describe('BO - Customers - Customers : CRUD Customer in BO', async () => {
       page = await foHomePage.closePage(browserContext, page, 0);
 
       const pageTitle = await customersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customersPage.pageTitle);
+      expect(pageTitle).to.contains(customersPage.pageTitle);
     });
   });
 
@@ -267,7 +267,7 @@ describe('BO - Customers - Customers : CRUD Customer in BO', async () => {
       await customersPage.filterCustomers(page, 'input', 'email', editCustomerData.email);
 
       const textEmail = await customersPage.getTextColumnFromTableCustomers(page, 1, 'email');
-      await expect(textEmail).to.contains(editCustomerData.email);
+      expect(textEmail).to.contains(editCustomerData.email);
     });
 
     it('should click on view customer', async function () {
@@ -276,22 +276,22 @@ describe('BO - Customers - Customers : CRUD Customer in BO', async () => {
       await customersPage.goToViewCustomerPage(page, 1);
 
       const pageTitle = await viewCustomerPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(viewCustomerPage.pageTitle(editCustomerName));
+      expect(pageTitle).to.contains(viewCustomerPage.pageTitle(editCustomerName));
     });
 
     it('should check customer personal information', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkUpdatedCustomerInfo', baseContext);
 
       const cardHeaderText = await viewCustomerPage.getPersonalInformationTitle(page);
-      await expect(cardHeaderText).to.contains(editCustomerData.firstName);
-      await expect(cardHeaderText).to.contains(editCustomerData.lastName);
-      await expect(cardHeaderText).to.contains(editCustomerData.email);
+      expect(cardHeaderText).to.contains(editCustomerData.firstName);
+      expect(cardHeaderText).to.contains(editCustomerData.lastName);
+      expect(cardHeaderText).to.contains(editCustomerData.email);
 
       const numOrders = await viewCustomerPage.getNumberOfElementFromTitle(page, 'Orders');
-      await expect(parseInt(numOrders, 10)).equal(0);
+      expect(parseInt(numOrders, 10)).equal(0);
 
       const numCarts = await viewCustomerPage.getNumberOfElementFromTitle(page, 'Carts');
-      await expect(parseInt(numCarts, 10)).equal(0);
+      expect(parseInt(numCarts, 10)).equal(0);
     });
   });
 
@@ -307,7 +307,7 @@ describe('BO - Customers - Customers : CRUD Customer in BO', async () => {
       );
 
       const pageTitle = await customersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customersPage.pageTitle);
+      expect(pageTitle).to.contains(customersPage.pageTitle);
     });
 
     it(`should filter list by email '${editCustomerData.email}'`, async function () {
@@ -317,24 +317,24 @@ describe('BO - Customers - Customers : CRUD Customer in BO', async () => {
       await customersPage.filterCustomers(page, 'input', 'email', editCustomerData.email);
 
       const textEmail = await customersPage.getTextColumnFromTableCustomers(page, 1, 'email');
-      await expect(textEmail).to.contains(editCustomerData.email);
+      expect(textEmail).to.contains(editCustomerData.email);
     });
 
     it('should delete customer', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteCustomer', baseContext);
 
       const textResult = await customersPage.deleteCustomer(page, 1);
-      await expect(textResult).to.equal(customersPage.successfulDeleteMessage);
+      expect(textResult).to.equal(customersPage.successfulDeleteMessage);
 
       const numberOfCustomersAfterDelete = await customersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCustomersAfterDelete).to.be.equal(numberOfCustomers);
+      expect(numberOfCustomersAfterDelete).to.be.equal(numberOfCustomers);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterDelete', baseContext);
 
       const numberOfCustomersAfterReset = await customersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCustomersAfterReset).to.equal(numberOfCustomers);
+      expect(numberOfCustomersAfterReset).to.equal(numberOfCustomers);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/04_customers/01_customers/03_customersBulkActions.ts b/tests/UI/campaigns/functional/BO/04_customers/01_customers/03_customersBulkActions.ts
index b7a8a93fa781d..31bc584f1d3d8 100644
--- a/tests/UI/campaigns/functional/BO/04_customers/01_customers/03_customersBulkActions.ts
+++ b/tests/UI/campaigns/functional/BO/04_customers/01_customers/03_customersBulkActions.ts
@@ -55,14 +55,14 @@ describe('BO - Customers - Customers : Customers bulk actions', async () => {
     await customersPage.closeSfToolBar(page);
 
     const pageTitle = await customersPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(customersPage.pageTitle);
+    expect(pageTitle).to.contains(customersPage.pageTitle);
   });
 
   it('should reset all filters', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFirst', baseContext);
 
     numberOfCustomers = await customersPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfCustomers).to.be.above(0);
+    expect(numberOfCustomers).to.be.above(0);
   });
 
   // 1 : Create 2 customers In BO
@@ -77,17 +77,17 @@ describe('BO - Customers - Customers : Customers bulk actions', async () => {
         await customersPage.goToAddNewCustomerPage(page);
 
         const pageTitle = await addCustomerPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addCustomerPage.pageTitleCreate);
+        expect(pageTitle).to.contains(addCustomerPage.pageTitleCreate);
       });
 
       it(`should create customer n°${index + 1} and check result`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `createCustomer${index + 1}`, baseContext);
 
         const textResult = await addCustomerPage.createEditCustomer(page, test.args.customerToCreate);
-        await expect(textResult).to.equal(customersPage.successfulCreationMessage);
+        expect(textResult).to.equal(customersPage.successfulCreationMessage);
 
         const numberOfCustomersAfterCreation = await customersPage.getNumberOfElementInGrid(page);
-        await expect(numberOfCustomersAfterCreation).to.be.equal(numberOfCustomers + index + 1);
+        expect(numberOfCustomersAfterCreation).to.be.equal(numberOfCustomers + index + 1);
       });
     });
   });
@@ -100,7 +100,7 @@ describe('BO - Customers - Customers : Customers bulk actions', async () => {
       await customersPage.filterCustomers(page, 'input', 'firstname', 'todelete');
 
       const textResult = await customersPage.getTextColumnFromTableCustomers(page, 1, 'firstname');
-      await expect(textResult).to.contains('todelete');
+      expect(textResult).to.contains('todelete');
     });
 
     [
@@ -111,14 +111,14 @@ describe('BO - Customers - Customers : Customers bulk actions', async () => {
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.action}Customers`, baseContext);
 
         const textResult = await customersPage.bulkSetStatus(page, test.args.enabledValue);
-        await expect(textResult).to.be.equal(customersPage.successfulUpdateMessage);
+        expect(textResult).to.be.equal(customersPage.successfulUpdateMessage);
 
         const numberOfCustomersInGrid = await customersPage.getNumberOfElementInGrid(page);
-        await expect(numberOfCustomersInGrid).to.be.at.least(2);
+        expect(numberOfCustomersInGrid).to.be.at.least(2);
 
         for (let i = 1; i <= numberOfCustomersInGrid; i++) {
           const customerStatus = await customersPage.getCustomerStatus(page, i);
-          await expect(customerStatus).to.equals(test.args.enabledValue);
+          expect(customerStatus).to.equals(test.args.enabledValue);
         }
       });
     });
@@ -132,21 +132,21 @@ describe('BO - Customers - Customers : Customers bulk actions', async () => {
       await customersPage.filterCustomers(page, 'input', 'firstname', 'todelete');
 
       const textResult = await customersPage.getTextColumnFromTableCustomers(page, 1, 'firstname');
-      await expect(textResult).to.contains('todelete');
+      expect(textResult).to.contains('todelete');
     });
 
     it('should delete customers', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteCustomers', baseContext);
 
       const deleteTextResult = await customersPage.deleteCustomersBulkActions(page);
-      await expect(deleteTextResult).to.be.equal(customersPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.equal(customersPage.successfulMultiDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterBulkDelete', baseContext);
 
       const numberOfCustomersAfterReset = await customersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCustomersAfterReset).to.be.equal(numberOfCustomers);
+      expect(numberOfCustomersAfterReset).to.be.equal(numberOfCustomers);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/04_customers/01_customers/04_paginationAndSortCustomers.ts b/tests/UI/campaigns/functional/BO/04_customers/01_customers/04_paginationAndSortCustomers.ts
index 29cf7f791ca1f..3b0f2126e960a 100644
--- a/tests/UI/campaigns/functional/BO/04_customers/01_customers/04_paginationAndSortCustomers.ts
+++ b/tests/UI/campaigns/functional/BO/04_customers/01_customers/04_paginationAndSortCustomers.ts
@@ -72,14 +72,14 @@ describe('BO - Customers - Customers : Pagination and sort customers table', asy
       await dashboardPage.closeSfToolBar(page);
 
       const pageTitle = await customersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customersPage.pageTitle);
+      expect(pageTitle).to.contains(customersPage.pageTitle);
     });
 
     it('should reset all filters and get number of customers in BO', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFirst', baseContext);
 
       numberOfCustomers = await customersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCustomers).to.be.above(0);
+      expect(numberOfCustomers).to.be.above(0);
     });
   });
 
@@ -174,25 +174,25 @@ describe('BO - Customers - Customers : Pagination and sort customers table', asy
           const expectedResult: number[] = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+            expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+            expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
         } else if (test.args.isDate) {
           const expectedResult: string[] = await basicHelper.sortArrayDate(nonSortedTable);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         } else {
           const expectedResult: string[] = await basicHelper.sortArray(nonSortedTable);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         }
       });
diff --git a/tests/UI/campaigns/functional/BO/04_customers/01_customers/05_setRequiredFields.ts b/tests/UI/campaigns/functional/BO/04_customers/01_customers/05_setRequiredFields.ts
index d0fc4f342ba30..685f5093e2f3c 100644
--- a/tests/UI/campaigns/functional/BO/04_customers/01_customers/05_setRequiredFields.ts
+++ b/tests/UI/campaigns/functional/BO/04_customers/01_customers/05_setRequiredFields.ts
@@ -48,7 +48,7 @@ describe('BO - Customers - Customers : Set required fields', async () => {
     await customersPage.closeSfToolBar(page);
 
     const pageTitle = await customersPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(customersPage.pageTitle);
+    expect(pageTitle).to.contains(customersPage.pageTitle);
   });
 
   [
@@ -59,7 +59,7 @@ describe('BO - Customers - Customers : Set required fields', async () => {
       await testContext.addContextItem(this, 'testIdentifier', `${test.args.action}PartnersOffers`, baseContext);
 
       const textResult = await customersPage.setRequiredFields(page, 0, test.args.exist);
-      await expect(textResult).to.equal(customersPage.successfulUpdateMessage);
+      expect(textResult).to.equal(customersPage.successfulUpdateMessage);
     });
 
     it('should view my shop', async function () {
@@ -71,7 +71,7 @@ describe('BO - Customers - Customers : Set required fields', async () => {
       await foHomePage.changeLanguage(page, 'en');
 
       const isHomePage = await foHomePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should go to create account FO and check \'Receive offers from our partners\' checkbox', async function () {
@@ -82,7 +82,7 @@ describe('BO - Customers - Customers : Set required fields', async () => {
       await foLoginPage.goToCreateAccountPage(page);
 
       const pageTitle = await foCreateAccountPage.getHeaderTitle(page);
-      await expect(pageTitle).to.contains(foCreateAccountPage.formTitle);
+      expect(pageTitle).to.contains(foCreateAccountPage.formTitle);
     });
 
     it('should check \'Receive offers from our partners\' checkbox', async function () {
@@ -90,7 +90,7 @@ describe('BO - Customers - Customers : Set required fields', async () => {
 
       // Check partner offer required
       const isPartnerOfferRequired = await foCreateAccountPage.isPartnerOfferRequired(page);
-      await expect(isPartnerOfferRequired).to.be.equal(test.args.exist);
+      expect(isPartnerOfferRequired).to.be.equal(test.args.exist);
     });
 
     it('should go back to BO', async function () {
@@ -100,7 +100,7 @@ describe('BO - Customers - Customers : Set required fields', async () => {
       page = await foCreateAccountPage.closePage(browserContext, page, 0);
 
       const pageTitle = await customersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customersPage.pageTitle);
+      expect(pageTitle).to.contains(customersPage.pageTitle);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/04_customers/01_customers/06_exportCustomers.ts b/tests/UI/campaigns/functional/BO/04_customers/01_customers/06_exportCustomers.ts
index 1746bdcc9d020..cabe3303a6a85 100644
--- a/tests/UI/campaigns/functional/BO/04_customers/01_customers/06_exportCustomers.ts
+++ b/tests/UI/campaigns/functional/BO/04_customers/01_customers/06_exportCustomers.ts
@@ -50,14 +50,14 @@ describe('BO - Customers - Customers : Export customers', async () => {
     );
 
     const pageTitle = await customersPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(customersPage.pageTitle);
+    expect(pageTitle).to.contains(customersPage.pageTitle);
   });
 
   it('should reset all filters and get number of customers in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFirst', baseContext);
 
     numberOfCustomers = await customersPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfCustomers).to.be.above(0);
+    expect(numberOfCustomers).to.be.above(0);
   });
 
   it('should export customers to a csv file', async function () {
@@ -66,7 +66,7 @@ describe('BO - Customers - Customers : Export customers', async () => {
     filePath = await customersPage.exportDataToCsv(page);
 
     const doesFileExist = await files.doesFileExist(filePath, 5000);
-    await expect(doesFileExist, 'Export of data has failed').to.be.true;
+    expect(doesFileExist, 'Export of data has failed').to.eq(true);
   });
 
   it('should check existence of customers data in csv file', async function () {
@@ -77,7 +77,7 @@ describe('BO - Customers - Customers : Export customers', async () => {
     for (let row: number = 1; row <= numberOfCustomers; row++) {
       const customerInCsvFormat = await customersPage.getCustomerInCsvFormat(page, row);
       const textExist = await files.isTextInFile(filePath, customerInCsvFormat, true);
-      await expect(textExist, `${customerInCsvFormat} was not found in the file`).to.be.true;
+      expect(textExist, `${customerInCsvFormat} was not found in the file`).to.eq(true);
     }
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/04_customers/01_customers/07_helpCard.ts b/tests/UI/campaigns/functional/BO/04_customers/01_customers/07_helpCard.ts
index 1790b9531f681..043ab680a8949 100644
--- a/tests/UI/campaigns/functional/BO/04_customers/01_customers/07_helpCard.ts
+++ b/tests/UI/campaigns/functional/BO/04_customers/01_customers/07_helpCard.ts
@@ -44,23 +44,23 @@ describe('BO - Customers - Customers : Help card on customers page', async () =>
     await customersPage.closeSfToolBar(page);
 
     const pageTitle = await customersPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(customersPage.pageTitle);
+    expect(pageTitle).to.contains(customersPage.pageTitle);
   });
 
   it('should open the help side bar and check the document language', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'openHelpSidebar', baseContext);
 
     const isHelpSidebarVisible = await customersPage.openHelpSideBar(page);
-    await expect(isHelpSidebarVisible).to.be.true;
+    expect(isHelpSidebarVisible).to.eq(true);
 
     const documentURL = await customersPage.getHelpDocumentURL(page);
-    await expect(documentURL).to.contains('country=en');
+    expect(documentURL).to.contains('country=en');
   });
 
   it('should close the help side bar', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'closeHelpSidebar', baseContext);
 
     const isHelpSidebarNotVisible = await customersPage.closeHelpSideBar(page);
-    await expect(isHelpSidebarNotVisible).to.be.true;
+    expect(isHelpSidebarNotVisible).to.eq(true);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/04_customers/01_customers/08_viewCustomer.ts b/tests/UI/campaigns/functional/BO/04_customers/01_customers/08_viewCustomer.ts
index b712851e2d255..8fc79f36ad02e 100644
--- a/tests/UI/campaigns/functional/BO/04_customers/01_customers/08_viewCustomer.ts
+++ b/tests/UI/campaigns/functional/BO/04_customers/01_customers/08_viewCustomer.ts
@@ -97,14 +97,14 @@ describe('BO - Customers - Customers : View information about customer', async (
     await customersPage.closeSfToolBar(page);
 
     const pageTitle = await customersPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(customersPage.pageTitle);
+    expect(pageTitle).to.contains(customersPage.pageTitle);
   });
 
   it('should reset all filters', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetAllFilter', baseContext);
 
     numberOfCustomers = await customersPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfCustomers).to.be.above(0);
+    expect(numberOfCustomers).to.be.above(0);
   });
 
   // 1 : Create customer
@@ -115,17 +115,17 @@ describe('BO - Customers - Customers : View information about customer', async (
       await customersPage.goToAddNewCustomerPage(page);
 
       const pageTitle = await addCustomerPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addCustomerPage.pageTitleCreate);
+      expect(pageTitle).to.contains(addCustomerPage.pageTitleCreate);
     });
 
     it('should create customer and check result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createCustomer', baseContext);
 
       const textResult = await addCustomerPage.createEditCustomer(page, createCustomerData);
-      await expect(textResult).to.equal(customersPage.successfulCreationMessage);
+      expect(textResult).to.equal(customersPage.successfulCreationMessage);
 
       const numberOfCustomersAfterCreation = await customersPage.getNumberOfElementInGrid(page);
-      await expect(numberOfCustomersAfterCreation).to.be.equal(numberOfCustomers + 1);
+      expect(numberOfCustomersAfterCreation).to.be.equal(numberOfCustomers + 1);
     });
   });
 
@@ -143,7 +143,7 @@ describe('BO - Customers - Customers : View information about customer', async (
       );
 
       const textEmail = await customersPage.getTextColumnFromTableCustomers(page, 1, 'email');
-      await expect(textEmail).to.contains(createCustomerData.email);
+      expect(textEmail).to.contains(createCustomerData.email);
     });
 
     it('should click on view customer', async function () {
@@ -152,29 +152,29 @@ describe('BO - Customers - Customers : View information about customer', async (
       await customersPage.goToViewCustomerPage(page, 1);
 
       const pageTitle = await viewCustomerPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(viewCustomerPage.pageTitle(createCustomerName));
+      expect(pageTitle).to.contains(viewCustomerPage.pageTitle(createCustomerName));
     });
 
     it('should check personal information title', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkPersonalInformationTitle1', baseContext);
 
       const cardHeaderText = await viewCustomerPage.getPersonalInformationTitle(page);
-      await expect(cardHeaderText).to.contains(createCustomerData.firstName);
-      await expect(cardHeaderText).to.contains(createCustomerData.lastName);
-      await expect(cardHeaderText).to.contains(createCustomerData.email);
+      expect(cardHeaderText).to.contains(createCustomerData.firstName);
+      expect(cardHeaderText).to.contains(createCustomerData.lastName);
+      expect(cardHeaderText).to.contains(createCustomerData.email);
     });
 
     it('should check customer personal information', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkCreatedCustomerInfo1', baseContext);
 
       const cardHeaderText = await viewCustomerPage.getTextFromElement(page, 'Personal information');
-      await expect(cardHeaderText).to.contains(createCustomerData.socialTitle);
-      await expect(cardHeaderText).to.contains(`birth date: ${customerBirthDate}`);
-      await expect(cardHeaderText).to.contains('Never');
-      await expect(cardHeaderText).to.contains(Languages.english.name);
-      await expect(cardHeaderText).to.contains('Newsletter');
-      await expect(cardHeaderText).to.contains('Partner offers');
-      await expect(cardHeaderText).to.contains('Active');
+      expect(cardHeaderText).to.contains(createCustomerData.socialTitle);
+      expect(cardHeaderText).to.contains(`birth date: ${customerBirthDate}`);
+      expect(cardHeaderText).to.contains('Never');
+      expect(cardHeaderText).to.contains(Languages.english.name);
+      expect(cardHeaderText).to.contains('Newsletter');
+      expect(cardHeaderText).to.contains('Partner offers');
+      expect(cardHeaderText).to.contains('Active');
     });
 
     [
@@ -188,7 +188,7 @@ describe('BO - Customers - Customers : View information about customer', async (
         await testContext.addContextItem(this, 'testIdentifier', `check${test.args.blockName}Number`, baseContext);
 
         const cardHeaderText = await viewCustomerPage.getNumberOfElementFromTitle(page, test.args.blockName);
-        await expect(cardHeaderText).to.contains(test.args.number);
+        expect(cardHeaderText).to.contains(test.args.number);
       });
     });
   });
@@ -204,7 +204,7 @@ describe('BO - Customers - Customers : View information about customer', async (
       await foHomePage.changeLanguage(page, 'en');
 
       const isHomePage = await foHomePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should add the first product to the cart', async function () {
@@ -216,7 +216,7 @@ describe('BO - Customers - Customers : View information about customer', async (
       await productPage.addProductToTheCart(page);
 
       const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
-      await expect(notificationsNumber).to.be.equal(1);
+      expect(notificationsNumber).to.be.equal(1);
     });
 
     it('should proceed to checkout', async function () {
@@ -226,7 +226,7 @@ describe('BO - Customers - Customers : View information about customer', async (
       await cartPage.clickOnProceedToCheckout(page);
 
       const isCheckoutPage = await checkoutPage.isCheckoutPage(page);
-      await expect(isCheckoutPage).to.be.true;
+      expect(isCheckoutPage).to.eq(true);
     });
 
     it('should login and go to address step', async function () {
@@ -235,14 +235,14 @@ describe('BO - Customers - Customers : View information about customer', async (
       await checkoutPage.clickOnSignIn(page);
 
       const isStepLoginComplete = await checkoutPage.customerLogin(page, createCustomerData);
-      await expect(isStepLoginComplete, 'Step Personal information is not complete').to.be.true;
+      expect(isStepLoginComplete, 'Step Personal information is not complete').to.eq(true);
     });
 
     it('should create address then continue to delivery step', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createAddress', baseContext);
 
       const isStepAddressComplete = await checkoutPage.setAddress(page, address);
-      await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
     });
 
     it('should add a comment then continue to payment step', async function () {
@@ -253,7 +253,7 @@ describe('BO - Customers - Customers : View information about customer', async (
         1,
         'test message',
       );
-      await expect(isStepDeliveryComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepDeliveryComplete, 'Step Address is not complete').to.eq(true);
     });
 
     it('should choose the payment method and confirm the order', async function () {
@@ -263,7 +263,7 @@ describe('BO - Customers - Customers : View information about customer', async (
 
       // Check the confirmation message
       const cardTitle = await orderConfirmationPage.getOrderConfirmationCardTitle(page);
-      await expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
+      expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
     });
 
     it('should go back to BO', async function () {
@@ -272,7 +272,7 @@ describe('BO - Customers - Customers : View information about customer', async (
       page = await orderConfirmationPage.closePage(browserContext, page, 0);
 
       const pageTitle = await viewCustomerPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(viewCustomerPage.pageTitle(createCustomerName));
+      expect(pageTitle).to.contains(viewCustomerPage.pageTitle(createCustomerName));
     });
   });
 
@@ -288,7 +288,7 @@ describe('BO - Customers - Customers : View information about customer', async (
       );
 
       const pageTitle = await customersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customersPage.pageTitle);
+      expect(pageTitle).to.contains(customersPage.pageTitle);
     });
 
     it(`should filter list by email '${createCustomerData.email}'`, async function () {
@@ -298,7 +298,7 @@ describe('BO - Customers - Customers : View information about customer', async (
       await customersPage.filterCustomers(page, 'input', 'email', createCustomerData.email);
 
       const textEmail = await customersPage.getTextColumnFromTableCustomers(page, 1, 'email');
-      await expect(textEmail).to.contains(createCustomerData.email);
+      expect(textEmail).to.contains(createCustomerData.email);
     });
 
     it('should click on view customer', async function () {
@@ -307,29 +307,29 @@ describe('BO - Customers - Customers : View information about customer', async (
       await customersPage.goToViewCustomerPage(page, 1);
 
       const pageTitle = await viewCustomerPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(viewCustomerPage.pageTitle(createCustomerName));
+      expect(pageTitle).to.contains(viewCustomerPage.pageTitle(createCustomerName));
     });
 
     it('should check personal information title', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkPersonalInformationTitle2', baseContext);
 
       const cardHeaderText = await viewCustomerPage.getPersonalInformationTitle(page);
-      await expect(cardHeaderText).to.contains(createCustomerData.firstName);
-      await expect(cardHeaderText).to.contains(createCustomerData.lastName);
-      await expect(cardHeaderText).to.contains(createCustomerData.email);
+      expect(cardHeaderText).to.contains(createCustomerData.firstName);
+      expect(cardHeaderText).to.contains(createCustomerData.lastName);
+      expect(cardHeaderText).to.contains(createCustomerData.email);
     });
 
     it('should check customer personal information', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkCreatedCustomerInfo2', baseContext);
 
       const cardHeaderText = await viewCustomerPage.getTextFromElement(page, 'Personal information');
-      await expect(cardHeaderText).to.contains(createCustomerData.socialTitle);
-      await expect(cardHeaderText).to.contains(`birth date: ${customerBirthDate}`);
-      await expect(cardHeaderText).to.contains(today);
-      await expect(cardHeaderText).to.contains(Languages.english.name);
-      await expect(cardHeaderText).to.contains('Newsletter');
-      await expect(cardHeaderText).to.contains('Partner offers');
-      await expect(cardHeaderText).to.contains('Active');
+      expect(cardHeaderText).to.contains(createCustomerData.socialTitle);
+      expect(cardHeaderText).to.contains(`birth date: ${customerBirthDate}`);
+      expect(cardHeaderText).to.contains(today);
+      expect(cardHeaderText).to.contains(Languages.english.name);
+      expect(cardHeaderText).to.contains('Newsletter');
+      expect(cardHeaderText).to.contains('Partner offers');
+      expect(cardHeaderText).to.contains('Active');
     });
 
     [
@@ -348,7 +348,7 @@ describe('BO - Customers - Customers : View information about customer', async (
         );
 
         const cardHeaderText = await viewCustomerPage.getNumberOfElementFromTitle(page, test.args.blockName);
-        await expect(cardHeaderText).to.contains(test.args.number);
+        expect(cardHeaderText).to.contains(test.args.number);
       });
     });
 
@@ -427,23 +427,23 @@ describe('BO - Customers - Customers : View information about customer', async (
       await viewCustomerPage.goToEditCustomerPage(page);
 
       const pageTitle = await addCustomerPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addCustomerPage.pageTitleEdit);
+      expect(pageTitle).to.contains(addCustomerPage.pageTitleEdit);
     });
 
     it('should edit customer information', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateCustomer', baseContext);
 
       const textResult = await addCustomerPage.createEditCustomer(page, editCustomerData);
-      await expect(textResult).to.equal(viewCustomerPage.successfulUpdateMessage);
+      expect(textResult).to.equal(viewCustomerPage.successfulUpdateMessage);
     });
 
     it('should check personal information title', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkUpdatedCustomerTitle', baseContext);
 
       const cardHeaderText = await viewCustomerPage.getPersonalInformationTitle(page);
-      await expect(cardHeaderText).to.contains(editCustomerData.firstName);
-      await expect(cardHeaderText).to.contains(editCustomerData.lastName);
-      await expect(cardHeaderText).to.contains(editCustomerData.email);
+      expect(cardHeaderText).to.contains(editCustomerData.firstName);
+      expect(cardHeaderText).to.contains(editCustomerData.lastName);
+      expect(cardHeaderText).to.contains(editCustomerData.email);
     });
 
     it('should check customer personal information', async function () {
@@ -475,14 +475,14 @@ describe('BO - Customers - Customers : View information about customer', async (
       await viewCustomerPage.goToPage(page, 'Orders');
 
       const pageTitle = await orderPageCustomerBlock.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderPageCustomerBlock.pageTitle);
+      expect(pageTitle).to.contains(orderPageCustomerBlock.pageTitle);
     });
 
     it('should modify order status', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'modifyOrderStatus', baseContext);
 
       const result = await orderPageCustomerBlock.modifyOrderStatus(page, OrderStatuses.shipped.name);
-      await expect(result).to.equal(OrderStatuses.shipped.name);
+      expect(result).to.equal(OrderStatuses.shipped.name);
     });
 
     it('should go to \'Customers > Customers\' page', async function () {
@@ -495,7 +495,7 @@ describe('BO - Customers - Customers : View information about customer', async (
       );
 
       const pageTitle = await customersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customersPage.pageTitle);
+      expect(pageTitle).to.contains(customersPage.pageTitle);
     });
 
     it(`should filter list by email '${editCustomerData.email}'`, async function () {
@@ -505,7 +505,7 @@ describe('BO - Customers - Customers : View information about customer', async (
       await customersPage.filterCustomers(page, 'input', 'email', editCustomerData.email);
 
       const textEmail = await customersPage.getTextColumnFromTableCustomers(page, 1, 'email');
-      await expect(textEmail).to.contains(editCustomerData.email);
+      expect(textEmail).to.contains(editCustomerData.email);
     });
 
     it('should click on view customer', async function () {
@@ -514,7 +514,7 @@ describe('BO - Customers - Customers : View information about customer', async (
       await customersPage.goToViewCustomerPage(page, 1);
 
       const pageTitle = await viewCustomerPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(viewCustomerPage.pageTitle(editCustomerName));
+      expect(pageTitle).to.contains(viewCustomerPage.pageTitle(editCustomerName));
     });
 
     it('should check order status', async function () {
@@ -531,7 +531,7 @@ describe('BO - Customers - Customers : View information about customer', async (
       await testContext.addContextItem(this, 'testIdentifier', 'CheckPurchasedProductsNumber', baseContext);
 
       const cardHeaderText = await viewCustomerPage.getNumberOfElementFromTitle(page, 'Purchased products');
-      await expect(cardHeaderText).to.contains(1);
+      expect(cardHeaderText).to.contains(1);
     });
 
     it('should check purchased products', async function () {
@@ -551,14 +551,14 @@ describe('BO - Customers - Customers : View information about customer', async (
       await viewCustomerPage.goToPage(page, 'Addresses');
 
       const pageTitle = await addAddressPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addAddressPage.pageTitleEdit);
+      expect(pageTitle).to.contains(addAddressPage.pageTitleEdit);
     });
 
     it('should modify the address', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateAddress', baseContext);
 
       const textResult = await addAddressPage.createEditAddress(page, createAddressData);
-      await expect(textResult).to.equal(viewCustomerPage.updateSuccessfulMessage);
+      expect(textResult).to.equal(viewCustomerPage.updateSuccessfulMessage);
     });
 
     it('should check the edited address', async function () {
@@ -583,7 +583,7 @@ describe('BO - Customers - Customers : View information about customer', async (
       await viewCustomerPage.goToPage(page, 'Carts');
 
       const pageTitle = await viewCartPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(viewCartPage.pageTitle(idCart));
+      expect(pageTitle).to.contains(viewCartPage.pageTitle(idCart));
     });
   });
 
@@ -599,7 +599,7 @@ describe('BO - Customers - Customers : View information about customer', async (
       );
 
       const pageTitle = await customersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customersPage.pageTitle);
+      expect(pageTitle).to.contains(customersPage.pageTitle);
     });
 
     it(`should filter list by email '${editCustomerData.email}'`, async function () {
@@ -609,24 +609,24 @@ describe('BO - Customers - Customers : View information about customer', async (
       await customersPage.filterCustomers(page, 'input', 'email', editCustomerData.email);
 
       const textEmail = await customersPage.getTextColumnFromTableCustomers(page, 1, 'email');
-      await expect(textEmail).to.contains(editCustomerData.email);
+      expect(textEmail).to.contains(editCustomerData.email);
     });
 
     it('should delete customer', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteCustomer', baseContext);
 
       const textResult = await customersPage.deleteCustomer(page, 1);
-      await expect(textResult).to.equal(customersPage.successfulDeleteMessage);
+      expect(textResult).to.equal(customersPage.successfulDeleteMessage);
 
       const numberOfCustomersAfterDelete = await customersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCustomersAfterDelete).to.be.equal(numberOfCustomers);
+      expect(numberOfCustomersAfterDelete).to.be.equal(numberOfCustomers);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAllFilter2', baseContext);
 
       numberOfCustomers = await customersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCustomers).to.be.above(0);
+      expect(numberOfCustomers).to.be.above(0);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/04_customers/01_customers/09_subscribeToNewsletter.ts b/tests/UI/campaigns/functional/BO/04_customers/01_customers/09_subscribeToNewsletter.ts
index ca1dcf0ec8358..c521d789da42c 100644
--- a/tests/UI/campaigns/functional/BO/04_customers/01_customers/09_subscribeToNewsletter.ts
+++ b/tests/UI/campaigns/functional/BO/04_customers/01_customers/09_subscribeToNewsletter.ts
@@ -50,14 +50,14 @@ describe('BO - Customers - Customers : Check customer subscription to newsletter
     await customersPage.closeSfToolBar(page);
 
     const pageTitle = await customersPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(customersPage.pageTitle);
+    expect(pageTitle).to.contains(customersPage.pageTitle);
   });
 
   it('should reset all filters and get number of customers in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetAllFilters', baseContext);
 
     numberOfCustomers = await customersPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfCustomers).to.be.above(0);
+    expect(numberOfCustomers).to.be.above(0);
   });
 
   it(`should filter by email '${Customers.johnDoe.email}'`, async function () {
@@ -66,7 +66,7 @@ describe('BO - Customers - Customers : Check customer subscription to newsletter
     await customersPage.filterCustomers(page, 'input', 'email', Customers.johnDoe.email);
 
     const numberOfCustomersAfterFilter = await customersPage.getNumberOfElementInGrid(page);
-    await expect(numberOfCustomersAfterFilter).to.equal(1);
+    expect(numberOfCustomersAfterFilter).to.equal(1);
   });
 
   [
@@ -79,7 +79,7 @@ describe('BO - Customers - Customers : Check customer subscription to newsletter
       await customersPage.setNewsletterStatus(page, 1, test.args.value);
 
       const newsletterStatus = await customersPage.getNewsletterStatus(page, 1);
-      await expect(newsletterStatus).to.be.equal(test.args.value);
+      expect(newsletterStatus).to.be.equal(test.args.value);
     });
 
     it('should go to \'Modules > Module Manager\' page', async function () {
@@ -92,7 +92,7 @@ describe('BO - Customers - Customers : Check customer subscription to newsletter
       );
 
       const pageTitle = await moduleManagerPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
+      expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
     });
 
     it(`should go to '${Modules.psEmailSubscription.name}' module`, async function () {
@@ -103,7 +103,7 @@ describe('BO - Customers - Customers : Check customer subscription to newsletter
       await moduleManagerPage.goToConfigurationPage(page, Modules.psEmailSubscription.tag);
 
       const pageTitle = await psEmailSubscriptionPage.getPageSubtitle(page);
-      await expect(pageTitle).to.contains(Modules.psEmailSubscription.name);
+      expect(pageTitle).to.contains(Modules.psEmailSubscription.name);
     });
 
     it('should check customer registration to newsletter', async function () {
@@ -113,9 +113,9 @@ describe('BO - Customers - Customers : Check customer subscription to newsletter
       const listOfEmails = await psEmailSubscriptionPage.getListOfNewsletterRegistrationEmails(page);
 
       if (test.args.value) {
-        await expect(listOfEmails).to.include(Customers.johnDoe.email);
+        expect(listOfEmails).to.include(Customers.johnDoe.email);
       } else {
-        await expect(listOfEmails).to.not.include(Customers.johnDoe.email);
+        expect(listOfEmails).to.not.include(Customers.johnDoe.email);
       }
     });
 
@@ -129,7 +129,7 @@ describe('BO - Customers - Customers : Check customer subscription to newsletter
       );
 
       const pageTitle = await customersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customersPage.pageTitle);
+      expect(pageTitle).to.contains(customersPage.pageTitle);
     });
   });
 
@@ -137,6 +137,6 @@ describe('BO - Customers - Customers : Check customer subscription to newsletter
     await testContext.addContextItem(this, 'testIdentifier', 'resetAfterAll', baseContext);
 
     const numberOfCustomersAfterReset = await customersPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfCustomersAfterReset).to.equal(numberOfCustomers);
+    expect(numberOfCustomersAfterReset).to.equal(numberOfCustomers);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/04_customers/02_addresses/01_filterAddresses.ts b/tests/UI/campaigns/functional/BO/04_customers/02_addresses/01_filterAddresses.ts
index 304db918dc713..81313879ba192 100644
--- a/tests/UI/campaigns/functional/BO/04_customers/02_addresses/01_filterAddresses.ts
+++ b/tests/UI/campaigns/functional/BO/04_customers/02_addresses/01_filterAddresses.ts
@@ -49,14 +49,14 @@ describe('BO - Customers - Addresses : Filter Addresses table', async () => {
     );
 
     const pageTitle = await addressesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(addressesPage.pageTitle);
+    expect(pageTitle).to.contains(addressesPage.pageTitle);
   });
 
   it('should reset all filters and get number of addresses in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFirst', baseContext);
 
     numberOfAddresses = await addressesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfAddresses).to.be.above(0);
+    expect(numberOfAddresses).to.be.above(0);
   });
 
   // Filter addresses with all inputs and selects in grid table
@@ -139,7 +139,7 @@ describe('BO - Customers - Addresses : Filter Addresses table', async () => {
         );
 
         const numberOfAddressesAfterFilter = await addressesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfAddressesAfterFilter).to.be.at.most(numberOfAddresses);
+        expect(numberOfAddressesAfterFilter).to.be.at.most(numberOfAddresses);
 
         for (let i = 1; i <= numberOfAddressesAfterFilter; i++) {
           const textColumn = await addressesPage.getTextColumnFromTableAddresses(
@@ -147,7 +147,7 @@ describe('BO - Customers - Addresses : Filter Addresses table', async () => {
             i,
             test.args.filterBy === 'id_country' ? 'country_name' : test.args.filterBy,
           );
-          await expect(textColumn).to.contains(test.args.filterValue);
+          expect(textColumn).to.contains(test.args.filterValue);
         }
       });
 
@@ -155,7 +155,7 @@ describe('BO - Customers - Addresses : Filter Addresses table', async () => {
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}Reset`, baseContext);
 
         const numberOfAddressesAfterReset = await addressesPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfAddressesAfterReset).to.equal(numberOfAddresses);
+        expect(numberOfAddressesAfterReset).to.equal(numberOfAddresses);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/04_customers/02_addresses/02_CRUDAddressInBO.ts b/tests/UI/campaigns/functional/BO/04_customers/02_addresses/02_CRUDAddressInBO.ts
index 251b4295f9aad..731602af54a42 100644
--- a/tests/UI/campaigns/functional/BO/04_customers/02_addresses/02_CRUDAddressInBO.ts
+++ b/tests/UI/campaigns/functional/BO/04_customers/02_addresses/02_CRUDAddressInBO.ts
@@ -52,14 +52,14 @@ describe('BO - Customers - Addresses : CRUD Address in BO', async () => {
     await addressesPage.closeSfToolBar(page);
 
     const pageTitle = await addressesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(addressesPage.pageTitle);
+    expect(pageTitle).to.contains(addressesPage.pageTitle);
   });
 
   it('should reset all filters', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFirst', baseContext);
 
     numberOfAddresses = await addressesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfAddresses).to.be.above(0);
+    expect(numberOfAddresses).to.be.above(0);
   });
 
   // 1 : Create address
@@ -70,17 +70,17 @@ describe('BO - Customers - Addresses : CRUD Address in BO', async () => {
       await addressesPage.goToAddNewAddressPage(page);
 
       const pageTitle = await addAddressPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addAddressPage.pageTitleCreate);
+      expect(pageTitle).to.contains(addAddressPage.pageTitleCreate);
     });
 
     it('should create address and check result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createAddress', baseContext);
 
       const textResult = await addAddressPage.createEditAddress(page, createAddressData);
-      await expect(textResult).to.equal(addressesPage.successfulCreationMessage);
+      expect(textResult).to.equal(addressesPage.successfulCreationMessage);
 
       const numberOfAddressesAfterCreation = await addressesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfAddressesAfterCreation).to.be.equal(numberOfAddresses + 1);
+      expect(numberOfAddressesAfterCreation).to.be.equal(numberOfAddresses + 1);
     });
   });
 
@@ -94,10 +94,10 @@ describe('BO - Customers - Addresses : CRUD Address in BO', async () => {
       await addressesPage.filterAddresses(page, 'input', 'lastname', createAddressData.lastName);
 
       const firstName = await addressesPage.getTextColumnFromTableAddresses(page, 1, 'firstname');
-      await expect(firstName).to.contains(createAddressData.firstName);
+      expect(firstName).to.contains(createAddressData.firstName);
 
       const lastName = await addressesPage.getTextColumnFromTableAddresses(page, 1, 'lastname');
-      await expect(lastName).to.contains(createAddressData.lastName);
+      expect(lastName).to.contains(createAddressData.lastName);
     });
 
     it('should go to edit address page', async function () {
@@ -106,17 +106,17 @@ describe('BO - Customers - Addresses : CRUD Address in BO', async () => {
       await addressesPage.goToEditAddressPage(page, 1);
 
       const pageTitle = await addAddressPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addAddressPage.pageTitleEdit);
+      expect(pageTitle).to.contains(addAddressPage.pageTitleEdit);
     });
 
     it('should update address', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateAddress', baseContext);
 
       const textResult = await addAddressPage.createEditAddress(page, editAddressData);
-      await expect(textResult).to.equal(addressesPage.successfulUpdateMessage);
+      expect(textResult).to.equal(addressesPage.successfulUpdateMessage);
 
       const numberOfAddressesAfterUpdate = await addressesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfAddressesAfterUpdate).to.be.equal(numberOfAddresses + 1);
+      expect(numberOfAddressesAfterUpdate).to.be.equal(numberOfAddresses + 1);
     });
   });
 
@@ -130,27 +130,27 @@ describe('BO - Customers - Addresses : CRUD Address in BO', async () => {
       await addressesPage.filterAddresses(page, 'input', 'lastname', editAddressData.lastName);
 
       const firstName = await addressesPage.getTextColumnFromTableAddresses(page, 1, 'firstname');
-      await expect(firstName).to.contains(editAddressData.firstName);
+      expect(firstName).to.contains(editAddressData.firstName);
 
       const lastName = await addressesPage.getTextColumnFromTableAddresses(page, 1, 'lastname');
-      await expect(lastName).to.contains(editAddressData.lastName);
+      expect(lastName).to.contains(editAddressData.lastName);
     });
 
     it('should delete address', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteAddress', baseContext);
 
       const textResult = await addressesPage.deleteAddress(page, 1);
-      await expect(textResult).to.equal(addressesPage.successfulDeleteMessage);
+      expect(textResult).to.equal(addressesPage.successfulDeleteMessage);
 
       const numberOfAddressesAfterDelete = await addressesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfAddressesAfterDelete).to.be.equal(numberOfAddresses);
+      expect(numberOfAddressesAfterDelete).to.be.equal(numberOfAddresses);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDelete', baseContext);
 
       const numberOfAddressesAfterReset = await addressesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfAddressesAfterReset).to.equal(numberOfAddresses);
+      expect(numberOfAddressesAfterReset).to.equal(numberOfAddresses);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/04_customers/02_addresses/03_addressesBulkActions.ts b/tests/UI/campaigns/functional/BO/04_customers/02_addresses/03_addressesBulkActions.ts
index 1e6eeb93b6e4d..21c4d77d7a7f1 100644
--- a/tests/UI/campaigns/functional/BO/04_customers/02_addresses/03_addressesBulkActions.ts
+++ b/tests/UI/campaigns/functional/BO/04_customers/02_addresses/03_addressesBulkActions.ts
@@ -51,14 +51,14 @@ describe('BO - Customers - Addresses : Addresses bulk actions', async () => {
     await addressesPage.closeSfToolBar(page);
 
     const pageTitle = await addressesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(addressesPage.pageTitle);
+    expect(pageTitle).to.contains(addressesPage.pageTitle);
   });
 
   it('should reset all filters', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFirst', baseContext);
 
     numberOfAddresses = await addressesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfAddresses).to.be.above(0);
+    expect(numberOfAddresses).to.be.above(0);
   });
 
   // 1 : Create 2 addresses in BO
@@ -73,17 +73,17 @@ describe('BO - Customers - Addresses : Addresses bulk actions', async () => {
         await addressesPage.goToAddNewAddressPage(page);
 
         const pageTitle = await addAddressPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addAddressPage.pageTitleCreate);
+        expect(pageTitle).to.contains(addAddressPage.pageTitleCreate);
       });
 
       it(`should create address n°${index + 1} and check result`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `createAddress${index + 1}`, baseContext);
 
         const textResult = await addAddressPage.createEditAddress(page, test.args.addressToCreate);
-        await expect(textResult).to.equal(addressesPage.successfulCreationMessage);
+        expect(textResult).to.equal(addressesPage.successfulCreationMessage);
 
         const numberOfAddressesAfterCreation = await addressesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfAddressesAfterCreation).to.be.equal(numberOfAddresses + index + 1);
+        expect(numberOfAddressesAfterCreation).to.be.equal(numberOfAddresses + index + 1);
       });
     });
   });
@@ -97,21 +97,21 @@ describe('BO - Customers - Addresses : Addresses bulk actions', async () => {
       await addressesPage.filterAddresses(page, 'input', 'address1', addressData.address);
 
       const address = await addressesPage.getTextColumnFromTableAddresses(page, 1, 'address1');
-      await expect(address).to.contains(addressData.address);
+      expect(address).to.contains(addressData.address);
     });
 
     it('should delete addresses with Bulk Actions and check addresses Page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteAddresses', baseContext);
 
       const deleteTextResult = await addressesPage.deleteAddressesBulkActions(page);
-      await expect(deleteTextResult).to.be.equal(addressesPage.successfulDeleteMessage);
+      expect(deleteTextResult).to.be.equal(addressesPage.successfulDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterBulkDelete', baseContext);
 
       const numberOfAddressesAfterReset = await addressesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfAddressesAfterReset).to.be.equal(numberOfAddresses);
+      expect(numberOfAddressesAfterReset).to.be.equal(numberOfAddresses);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/04_customers/02_addresses/04_paginationAndSortAddresses.ts b/tests/UI/campaigns/functional/BO/04_customers/02_addresses/04_paginationAndSortAddresses.ts
index 4a652c492a84e..57007ac821943 100644
--- a/tests/UI/campaigns/functional/BO/04_customers/02_addresses/04_paginationAndSortAddresses.ts
+++ b/tests/UI/campaigns/functional/BO/04_customers/02_addresses/04_paginationAndSortAddresses.ts
@@ -72,14 +72,14 @@ describe('BO - Customers - Addresses : Pagination and sort addresses table', asy
       await dashboardPage.closeSfToolBar(page);
 
       const pageTitle = await addressesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addressesPage.pageTitle);
+      expect(pageTitle).to.contains(addressesPage.pageTitle);
     });
 
     it('should reset all filters and get number of addresses in BO', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFirst', baseContext);
 
       numberOfAddresses = await addressesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfAddresses).to.be.above(0);
+      expect(numberOfAddresses).to.be.above(0);
     });
   });
 
@@ -158,17 +158,17 @@ describe('BO - Customers - Addresses : Pagination and sort addresses table', asy
           const expectedResult: number[] = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+            expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+            expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
         } else {
           const expectedResult: string[] = await basicHelper.sortArray(nonSortedTable);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         }
       });
diff --git a/tests/UI/campaigns/functional/BO/04_customers/02_addresses/05_helpCard.ts b/tests/UI/campaigns/functional/BO/04_customers/02_addresses/05_helpCard.ts
index fc5b0971e0fcf..59b32ddac0de0 100644
--- a/tests/UI/campaigns/functional/BO/04_customers/02_addresses/05_helpCard.ts
+++ b/tests/UI/campaigns/functional/BO/04_customers/02_addresses/05_helpCard.ts
@@ -43,23 +43,23 @@ describe('BO - Customers - Addresses - Help card on addresses page', async () =>
     );
 
     const pageTitle = await addressesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(addressesPage.pageTitle);
+    expect(pageTitle).to.contains(addressesPage.pageTitle);
   });
 
   it('should open the help side bar and check the document language', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'openHelpSidebar', baseContext);
 
     const isHelpSidebarVisible = await addressesPage.openHelpSideBar(page);
-    await expect(isHelpSidebarVisible).to.be.true;
+    expect(isHelpSidebarVisible).to.eq(true);
 
     const documentURL = await addressesPage.getHelpDocumentURL(page);
-    await expect(documentURL).to.contains('country=en');
+    expect(documentURL).to.contains('country=en');
   });
 
   it('should close the help side bar', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'closeHelpSidebar', baseContext);
 
     const isHelpSidebarNotVisible = await addressesPage.closeHelpSideBar(page);
-    await expect(isHelpSidebarNotVisible).to.be.true;
+    expect(isHelpSidebarNotVisible).to.eq(true);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/04_customers/02_addresses/06_setRequiredFields.ts b/tests/UI/campaigns/functional/BO/04_customers/02_addresses/06_setRequiredFields.ts
index 92752e8f59c11..802ec81480fea 100644
--- a/tests/UI/campaigns/functional/BO/04_customers/02_addresses/06_setRequiredFields.ts
+++ b/tests/UI/campaigns/functional/BO/04_customers/02_addresses/06_setRequiredFields.ts
@@ -63,7 +63,7 @@ describe('BO - Customers - Addresses : Set required fields for addresses', async
     await addressesPage.closeSfToolBar(page);
 
     const pageTitle = await addressesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(addressesPage.pageTitle);
+    expect(pageTitle).to.contains(addressesPage.pageTitle);
   });
 
   [
@@ -74,7 +74,7 @@ describe('BO - Customers - Addresses : Set required fields for addresses', async
       await testContext.addContextItem(this, 'testIdentifier', `${test.args.action}VatNumber`, baseContext);
 
       const textResult = await addressesPage.setRequiredFields(page, 6, test.args.exist);
-      await expect(textResult).to.equal(addressesPage.successfulUpdateMessage);
+      expect(textResult).to.equal(addressesPage.successfulUpdateMessage);
     });
 
     it('should view my shop and login', async function () {
@@ -86,7 +86,7 @@ describe('BO - Customers - Addresses : Set required fields for addresses', async
       await foHomePage.changeLanguage(page, 'en');
 
       const isHomePage = await foHomePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should login in FO', async function () {
@@ -97,7 +97,7 @@ describe('BO - Customers - Addresses : Set required fields for addresses', async
       await foLoginPage.customerLogin(page, Customers.johnDoe);
 
       const connected = await foHomePage.isCustomerConnected(page);
-      await expect(connected, 'Customer is not connected in FO').to.be.true;
+      expect(connected, 'Customer is not connected in FO').to.eq(true);
     });
 
     it('should go to \'Customers > Addresses\' page', async function () {
@@ -107,7 +107,7 @@ describe('BO - Customers - Addresses : Set required fields for addresses', async
       await myAccountPage.goToAddressesPage(page);
 
       const pageHeaderTitle = await foAddressesPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(foAddressesPage.pageTitle);
+      expect(pageHeaderTitle).to.equal(foAddressesPage.pageTitle);
     });
 
     it('should go to create address page', async function () {
@@ -116,14 +116,14 @@ describe('BO - Customers - Addresses : Set required fields for addresses', async
       await foAddressesPage.openNewAddressForm(page);
 
       const pageHeaderTitle = await addAddressPage.getHeaderTitle(page);
-      await expect(pageHeaderTitle).to.equal(addAddressPage.creationFormTitle);
+      expect(pageHeaderTitle).to.equal(addAddressPage.creationFormTitle);
     });
 
     it('should check if \'Vat number\' is required', async function () {
       await testContext.addContextItem(this, 'testIdentifier', `checkOptionalLabel${index}`, baseContext);
 
       const result = await addAddressPage.isVatNumberRequired(page);
-      await expect(result).to.equal(test.args.exist);
+      expect(result).to.equal(test.args.exist);
     });
 
     it('should sign out from FO', async function () {
@@ -132,7 +132,7 @@ describe('BO - Customers - Addresses : Set required fields for addresses', async
       await addAddressPage.logout(page);
 
       const isCustomerConnected = await addAddressPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is connected').to.be.false;
+      expect(isCustomerConnected, 'Customer is connected').to.eq(false);
     });
 
     it('should go back to BO', async function () {
@@ -142,7 +142,7 @@ describe('BO - Customers - Addresses : Set required fields for addresses', async
       page = await addAddressPage.closePage(browserContext, page, 0);
 
       const pageTitle = await addressesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addressesPage.pageTitle);
+      expect(pageTitle).to.contains(addressesPage.pageTitle);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/04_customers/03_outstanding/01_helpCard.ts b/tests/UI/campaigns/functional/BO/04_customers/03_outstanding/01_helpCard.ts
index af72bbe10c884..121ccfe1fc803 100644
--- a/tests/UI/campaigns/functional/BO/04_customers/03_outstanding/01_helpCard.ts
+++ b/tests/UI/campaigns/functional/BO/04_customers/03_outstanding/01_helpCard.ts
@@ -58,24 +58,24 @@ describe('BO - Customers - Outstanding : Help card in outstanding page', async (
       await outstandingPage.closeSfToolBar(page);
 
       const pageTitle = await outstandingPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(outstandingPage.pageTitle);
+      expect(pageTitle).to.contains(outstandingPage.pageTitle);
     });
 
     it('should open the help side bar and check the document language', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'openHelpSidebar', baseContext);
 
       const isHelpSidebarVisible = await outstandingPage.openHelpSideBar(page);
-      await expect(isHelpSidebarVisible).to.be.true;
+      expect(isHelpSidebarVisible).to.eq(true);
 
       const documentURL = await outstandingPage.getHelpDocumentURL(page);
-      await expect(documentURL).to.contains('country=en');
+      expect(documentURL).to.contains('country=en');
     });
 
     it('should close the help side bar', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'closeHelpSidebar', baseContext);
 
       const isHelpSidebarNotVisible = await outstandingPage.closeHelpSideBar(page);
-      await expect(isHelpSidebarNotVisible).to.be.true;
+      expect(isHelpSidebarNotVisible).to.eq(true);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/04_customers/03_outstanding/02_viewOrder.ts b/tests/UI/campaigns/functional/BO/04_customers/03_outstanding/02_viewOrder.ts
index 19e1234cba648..437c91113df08 100644
--- a/tests/UI/campaigns/functional/BO/04_customers/03_outstanding/02_viewOrder.ts
+++ b/tests/UI/campaigns/functional/BO/04_customers/03_outstanding/02_viewOrder.ts
@@ -88,7 +88,7 @@ describe('BO - Customers - Outstanding : View order', async () => {
       );
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should reset filter and get the last orderID and reference', async function () {
@@ -100,24 +100,24 @@ describe('BO - Customers - Outstanding : View order', async () => {
         await ordersPage.getTextColumn(page, 'id_order', 1),
         10,
       );
-      await expect(orderId).to.be.at.least(1);
+      expect(orderId).to.be.at.least(1);
 
       orderReference = await ordersPage.getTextColumn(page, 'reference', 1);
-      await expect(orderReference).to.not.equal('');
+      expect(orderReference).to.not.equal('');
     });
 
     it('should update order status', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateOrderStatus', baseContext);
 
       const textResult = await ordersPage.setOrderStatus(page, 1, OrderStatuses.paymentAccepted);
-      await expect(textResult).to.equal(ordersPage.successfulUpdateMessage);
+      expect(textResult).to.equal(ordersPage.successfulUpdateMessage);
     });
 
     it('should check that the status is updated successfully', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkStatusBO', baseContext);
 
       const orderStatus = await ordersPage.getTextColumn(page, 'osname', 1);
-      await expect(orderStatus, 'Order status was not updated').to.equal(OrderStatuses.paymentAccepted.name);
+      expect(orderStatus, 'Order status was not updated').to.equal(OrderStatuses.paymentAccepted.name);
     });
   });
 
@@ -134,7 +134,7 @@ describe('BO - Customers - Outstanding : View order', async () => {
       await outstandingPage.closeSfToolBar(page);
 
       const pageTitle = await outstandingPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(outstandingPage.pageTitle);
+      expect(pageTitle).to.contains(outstandingPage.pageTitle);
     });
 
     it('should reset filter and get the last outstanding ID', async function () {
@@ -146,7 +146,7 @@ describe('BO - Customers - Outstanding : View order', async () => {
         await outstandingPage.getTextColumn(page, 'id_invoice', 1),
         10,
       );
-      await expect(outstandingId).to.be.at.least(1);
+      expect(outstandingId).to.be.at.least(1);
     });
 
     it('should view the Order and check the orderID and the reference', async function () {
diff --git a/tests/UI/campaigns/functional/BO/04_customers/03_outstanding/03_viewInvoice.ts b/tests/UI/campaigns/functional/BO/04_customers/03_outstanding/03_viewInvoice.ts
index 76581663eedeb..4ed4a4ee75c9d 100644
--- a/tests/UI/campaigns/functional/BO/04_customers/03_outstanding/03_viewInvoice.ts
+++ b/tests/UI/campaigns/functional/BO/04_customers/03_outstanding/03_viewInvoice.ts
@@ -87,7 +87,7 @@ describe('BO - Customers - Outstanding : View invoice', async () => {
       );
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should reset filter and get the last reference', async function () {
@@ -96,21 +96,21 @@ describe('BO - Customers - Outstanding : View invoice', async () => {
       await ordersPage.resetFilter(page);
 
       orderReference = await ordersPage.getTextColumn(page, 'reference', 1);
-      await expect(orderReference).to.not.equal(null);
+      expect(orderReference).to.not.equal(null);
     });
 
     it('should update order status', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateOrderStatus', baseContext);
 
       const textResult = await ordersPage.setOrderStatus(page, 1, OrderStatuses.paymentAccepted);
-      await expect(textResult).to.equal(ordersPage.successfulUpdateMessage);
+      expect(textResult).to.equal(ordersPage.successfulUpdateMessage);
     });
 
     it('should check that the status is updated successfully', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkStatusBO', baseContext);
 
       const orderStatus = await ordersPage.getTextColumn(page, 'osname', 1);
-      await expect(orderStatus, 'Order status was not updated').to.equal(OrderStatuses.paymentAccepted.name);
+      expect(orderStatus, 'Order status was not updated').to.equal(OrderStatuses.paymentAccepted.name);
     });
   });
 
@@ -127,7 +127,7 @@ describe('BO - Customers - Outstanding : View invoice', async () => {
       await outstandingPage.closeSfToolBar(page);
 
       const pageTitle = await outstandingPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(outstandingPage.pageTitle);
+      expect(pageTitle).to.contains(outstandingPage.pageTitle);
     });
 
     it('should reset filter and get the last outstanding ID', async function () {
@@ -139,7 +139,7 @@ describe('BO - Customers - Outstanding : View invoice', async () => {
         await outstandingPage.getTextColumn(page, 'id_invoice', 1),
         10,
       );
-      await expect(outstandingId).to.be.at.least(1);
+      expect(outstandingId).to.be.at.least(1);
     });
 
     it('should view the Invoice and check the order reference', async function () {
@@ -148,7 +148,7 @@ describe('BO - Customers - Outstanding : View invoice', async () => {
       filePath = await outstandingPage.viewInvoice(page, 'invoice', 1);
 
       const doesFileExist = await files.doesFileExist(filePath, 5000);
-      await expect(doesFileExist, 'The file is not existing!').to.be.true;
+      expect(doesFileExist, 'The file is not existing!').to.eq(true);
     });
 
     it('should check reference in the invoice pdf file', async function () {
@@ -156,7 +156,7 @@ describe('BO - Customers - Outstanding : View invoice', async () => {
 
       // Check Reference in pdf
       const referenceOrder = await files.isTextInPDF(filePath, orderReference);
-      await expect(referenceOrder).to.be.true;
+      expect(referenceOrder).to.eq(true);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/04_customers/03_outstanding/04_pagination.ts b/tests/UI/campaigns/functional/BO/04_customers/03_outstanding/04_pagination.ts
index 84636eff98a85..c966e1adc9a0c 100644
--- a/tests/UI/campaigns/functional/BO/04_customers/03_outstanding/04_pagination.ts
+++ b/tests/UI/campaigns/functional/BO/04_customers/03_outstanding/04_pagination.ts
@@ -93,21 +93,21 @@ describe('BO - Customers - Outstanding : Pagination of the outstanding page', as
           }
 
           const pageTitle = await ordersPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(ordersPage.pageTitle);
+          expect(pageTitle).to.contains(ordersPage.pageTitle);
         });
 
         it('should update order status', async function () {
           await testContext.addContextItem(this, 'testIdentifier', `updateOrderStatus_${index}`, baseContext);
 
           const textResult = await ordersPage.setOrderStatus(page, 1, OrderStatuses.paymentAccepted);
-          await expect(textResult).to.equal(ordersPage.successfulUpdateMessage);
+          expect(textResult).to.equal(ordersPage.successfulUpdateMessage);
         });
 
         it('should check that the status is updated successfully', async function () {
           await testContext.addContextItem(this, 'testIdentifier', `checkStatusBO_${index}`, baseContext);
 
           const orderStatus = await ordersPage.getTextColumn(page, 'osname', 1);
-          await expect(orderStatus, 'Order status was not updated').to.equal(OrderStatuses.paymentAccepted.name);
+          expect(orderStatus, 'Order status was not updated').to.equal(OrderStatuses.paymentAccepted.name);
         });
       });
     });
@@ -123,7 +123,7 @@ describe('BO - Customers - Outstanding : Pagination of the outstanding page', as
       );
 
       const pageTitle = await outstandingPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(outstandingPage.pageTitle);
+      expect(pageTitle).to.contains(outstandingPage.pageTitle);
     });
 
     it('should reset all filters and get the number of outstanding', async function () {
@@ -132,7 +132,7 @@ describe('BO - Customers - Outstanding : Pagination of the outstanding page', as
       await outstandingPage.resetFilter(page);
 
       numberOutstanding = await outstandingPage.getNumberOutstanding(page);
-      await expect(numberOutstanding).to.be.above(numberOfOrdersToCreate);
+      expect(numberOutstanding).to.be.above(numberOfOrdersToCreate);
     });
 
     it('should change the items number to 10 per page', async function () {
diff --git a/tests/UI/campaigns/functional/BO/04_customers/03_outstanding/05_sortFilterOutstanding.ts b/tests/UI/campaigns/functional/BO/04_customers/03_outstanding/05_sortFilterOutstanding.ts
index ab2560072584c..8a261bcfa7a14 100644
--- a/tests/UI/campaigns/functional/BO/04_customers/03_outstanding/05_sortFilterOutstanding.ts
+++ b/tests/UI/campaigns/functional/BO/04_customers/03_outstanding/05_sortFilterOutstanding.ts
@@ -119,21 +119,21 @@ describe('BO - Customers - Outstanding : Filter and sort the Outstanding table',
           }
 
           const pageTitle = await ordersPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(ordersPage.pageTitle);
+          expect(pageTitle).to.contains(ordersPage.pageTitle);
         });
 
         it('should update order status', async function () {
           await testContext.addContextItem(this, 'testIdentifier', `updateOrderStatus_${index}`, baseContext);
 
           const textResult = await ordersPage.setOrderStatus(page, 1, OrderStatuses.paymentAccepted);
-          await expect(textResult).to.equal(ordersPage.successfulUpdateMessage);
+          expect(textResult).to.equal(ordersPage.successfulUpdateMessage);
         });
 
         it('should check that the status is updated successfully', async function () {
           await testContext.addContextItem(this, 'testIdentifier', `checkStatusBO_${index}`, baseContext);
 
           const orderStatus = await ordersPage.getTextColumn(page, 'osname', 1);
-          await expect(orderStatus, 'Order status was not updated').to.equal(OrderStatuses.paymentAccepted.name);
+          expect(orderStatus, 'Order status was not updated').to.equal(OrderStatuses.paymentAccepted.name);
         });
       });
     });
@@ -151,7 +151,7 @@ describe('BO - Customers - Outstanding : Filter and sort the Outstanding table',
       );
 
       const pageTitle = await outstandingPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(outstandingPage.pageTitle);
+      expect(pageTitle).to.contains(outstandingPage.pageTitle);
     });
     it('should reset filter and get the outstanding number', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterOutstanding', baseContext);
@@ -159,7 +159,7 @@ describe('BO - Customers - Outstanding : Filter and sort the Outstanding table',
       await outstandingPage.resetFilter(page);
 
       numberOutstanding = await outstandingPage.getNumberOutstanding(page);
-      await expect(numberOutstanding).to.be.above(0);
+      expect(numberOutstanding).to.be.above(0);
     });
   });
 
@@ -217,7 +217,7 @@ describe('BO - Customers - Outstanding : Filter and sort the Outstanding table',
         await outstandingPage.filterTable(page, test.args.filterType, test.args.filterBy, test.args.filterValue);
 
         const numberOutstandingAfterFilter = await outstandingPage.getNumberOutstanding(page);
-        await expect(numberOutstandingAfterFilter).to.be.at.most(numberOutstanding);
+        expect(numberOutstandingAfterFilter).to.be.at.most(numberOutstanding);
       });
 
       it('should reset all filters and get the number of outstanding', async function () {
@@ -226,7 +226,7 @@ describe('BO - Customers - Outstanding : Filter and sort the Outstanding table',
         await outstandingPage.resetFilter(page);
 
         const numberOutstandingAfterReset = await outstandingPage.getNumberOutstanding(page);
-        await expect(numberOutstandingAfterReset).to.be.equal(numberOutstanding);
+        expect(numberOutstandingAfterReset).to.be.equal(numberOutstanding);
       });
     });
 
@@ -238,11 +238,11 @@ describe('BO - Customers - Outstanding : Filter and sort the Outstanding table',
 
       // Check number of element
       const numberOfOutstandingAfterFilter = await outstandingPage.getNumberOutstanding(page);
-      await expect(numberOfOutstandingAfterFilter).to.be.at.most(numberOutstanding);
+      expect(numberOfOutstandingAfterFilter).to.be.at.most(numberOutstanding);
 
       for (let i = 1; i <= numberOfOutstandingAfterFilter; i++) {
         const textColumn = await outstandingPage.getTextColumn(page, 'date_add', i);
-        await expect(textColumn).to.contains(dateToCheck);
+        expect(textColumn).to.contains(dateToCheck);
       }
     });
 
@@ -252,7 +252,7 @@ describe('BO - Customers - Outstanding : Filter and sort the Outstanding table',
       await outstandingPage.resetFilter(page);
 
       const numberOutstandingAfterReset = await outstandingPage.getNumberOutstanding(page);
-      await expect(numberOutstandingAfterReset).to.be.equal(numberOutstanding);
+      expect(numberOutstandingAfterReset).to.be.equal(numberOutstanding);
     });
   });
 
@@ -267,7 +267,7 @@ describe('BO - Customers - Outstanding : Filter and sort the Outstanding table',
       await outstandingPage.filterTable(page, 'input', 'outstanding_allow_amount', '€');
 
       const numberOutstandingAfterFilter = await outstandingPage.getNumberOutstanding(page);
-      await expect(numberOutstandingAfterFilter).to.be.at.most(numberOutstanding);
+      expect(numberOutstandingAfterFilter).to.be.at.most(numberOutstanding);
     });
     const sortByOutstandingAllowance = [
       {
@@ -304,17 +304,17 @@ describe('BO - Customers - Outstanding : Filter and sort the Outstanding table',
           const expectedResult: number[] = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+            expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+            expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
         } else {
           const expectedResult = await basicHelper.sortArray(nonSortedTable);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         }
       });
@@ -325,7 +325,7 @@ describe('BO - Customers - Outstanding : Filter and sort the Outstanding table',
       await outstandingPage.resetFilter(page);
 
       const numberOutstandingAfterReset = await outstandingPage.getNumberOutstanding(page);
-      await expect(numberOutstandingAfterReset).to.be.equal(numberOutstanding);
+      expect(numberOutstandingAfterReset).to.be.equal(numberOutstanding);
     });
 
     const sortTests = [
@@ -371,17 +371,17 @@ describe('BO - Customers - Outstanding : Filter and sort the Outstanding table',
           const expectedResult: number[] = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+            expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+            expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
         } else {
           const expectedResult = await basicHelper.sortArray(nonSortedTable);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         }
       });
diff --git a/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/01_viewMessage.ts b/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/01_viewMessage.ts
index b444f06f66225..24b68a72fef59 100644
--- a/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/01_viewMessage.ts
+++ b/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/01_viewMessage.ts
@@ -56,7 +56,7 @@ describe('BO - Customer Service : View message', async () => {
       await homePage.goTo(page, global.FO.URL);
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage).to.be.true;
+      expect(isHomePage).to.eq(true);
     });
 
     it('should go to contact us page', async function () {
@@ -66,7 +66,7 @@ describe('BO - Customer Service : View message', async () => {
       await homePage.goToFooterLink(page, 'Contact us');
 
       const pageTitle = await contactUsPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(contactUsPage.pageTitle);
+      expect(pageTitle).to.equal(contactUsPage.pageTitle);
     });
 
     it('should send message to customer service', async function () {
@@ -75,7 +75,7 @@ describe('BO - Customer Service : View message', async () => {
       await contactUsPage.sendMessage(page, contactUsData, `${contactUsData.fileName}.jpg`);
 
       const validationMessage = await contactUsPage.getAlertSuccess(page);
-      await expect(validationMessage).to.equal(contactUsPage.validationMessage);
+      expect(validationMessage).to.equal(contactUsPage.validationMessage);
     });
   });
 
@@ -94,14 +94,14 @@ describe('BO - Customer Service : View message', async () => {
       );
 
       const pageTitle = await customerServicePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customerServicePage.pageTitle);
+      expect(pageTitle).to.contains(customerServicePage.pageTitle);
     });
 
     it('should get the customer service id and the date', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'getMessageID', baseContext);
 
       idCustomer = await customerServicePage.getTextColumn(page, 1, 'id_customer_thread');
-      await expect(parseInt(idCustomer, 10)).to.be.at.least(0);
+      expect(parseInt(idCustomer, 10)).to.be.at.least(0);
 
       messageDateTime = await customerServicePage.getTextColumn(page, 1, 'date');
     });
@@ -112,14 +112,14 @@ describe('BO - Customer Service : View message', async () => {
       await customerServicePage.goToViewMessagePage(page);
 
       const pageTitle = await viewPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(viewPage.pageTitle);
+      expect(pageTitle).to.contains(viewPage.pageTitle);
     });
 
     it('should check the thread form', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkThreadForm', baseContext);
 
       const badgeNumber = await viewPage.getBadgeNumber(page);
-      await expect(badgeNumber).to.contains(idCustomer);
+      expect(badgeNumber).to.contains(idCustomer);
 
       const text = await viewPage.getCustomerMessage(page);
       expect(text).to.contains(contactUsData.emailAddress);
@@ -163,14 +163,14 @@ describe('BO - Customer Service : View message', async () => {
       );
 
       const pageTitle = await customerServicePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customerServicePage.pageTitle);
+      expect(pageTitle).to.contains(customerServicePage.pageTitle);
     });
 
     it('should delete the message', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteMessage', baseContext);
 
       const textResult = await customerServicePage.deleteMessage(page, 1);
-      await expect(textResult).to.contains(customerServicePage.successfulDeleteMessage);
+      expect(textResult).to.contains(customerServicePage.successfulDeleteMessage);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/02_changeStatus.ts b/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/02_changeStatus.ts
index a01fbb2e1e333..145dce6c92984 100644
--- a/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/02_changeStatus.ts
+++ b/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/02_changeStatus.ts
@@ -62,7 +62,7 @@ describe('BO - Customer Service : Change status', async () => {
       await homePage.goTo(page, global.FO.URL);
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should go to login page', async function () {
@@ -71,7 +71,7 @@ describe('BO - Customer Service : Change status', async () => {
       await homePage.goToLoginPage(page);
 
       const pageTitle = await foLoginPage.getPageTitle(page);
-      await expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
+      expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
     });
 
     it('should sign in with default customer', async function () {
@@ -80,7 +80,7 @@ describe('BO - Customer Service : Change status', async () => {
       await foLoginPage.customerLogin(page, Customers.johnDoe);
 
       const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
 
     it('should go to contact us page', async function () {
@@ -90,7 +90,7 @@ describe('BO - Customer Service : Change status', async () => {
       await homePage.goToFooterLink(page, 'Contact us');
 
       const pageTitle = await contactUsPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(contactUsPage.pageTitle);
+      expect(pageTitle).to.equal(contactUsPage.pageTitle);
     });
 
     it('should send message to customer service', async function () {
@@ -99,7 +99,7 @@ describe('BO - Customer Service : Change status', async () => {
       await contactUsPage.sendMessage(page, contactUsData, `${contactUsData.fileName}.jpg`);
 
       const validationMessage = await contactUsPage.getAlertSuccess(page);
-      await expect(validationMessage).to.equal(contactUsPage.validationMessage);
+      expect(validationMessage).to.equal(contactUsPage.validationMessage);
     });
   });
 
@@ -118,7 +118,7 @@ describe('BO - Customer Service : Change status', async () => {
       );
 
       const pageTitle = await customerServicePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customerServicePage.pageTitle);
+      expect(pageTitle).to.contains(customerServicePage.pageTitle);
     });
     [
       {args: {status: 'Handled', statusToCheck: 'Re-open'}},
@@ -132,14 +132,14 @@ describe('BO - Customer Service : Change status', async () => {
         await customerServicePage.goToViewMessagePage(page);
 
         const pageTitle = await viewPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(viewPage.pageTitle);
+        expect(pageTitle).to.contains(viewPage.pageTitle);
       });
 
       it(`should change the order status to '${test.args.status}'`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `setOrderStatus${test.args.status}`, baseContext);
 
         const newStatus = await viewPage.setStatus(page, test.args.status);
-        await expect(newStatus).to.contains(test.args.statusToCheck);
+        expect(newStatus).to.contains(test.args.statusToCheck);
       });
 
       it('should go to \'Customer Service > Customer Service\' page', async function () {
@@ -152,14 +152,14 @@ describe('BO - Customer Service : Change status', async () => {
         );
 
         const pageTitle = await customerServicePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(customerServicePage.pageTitle);
+        expect(pageTitle).to.contains(customerServicePage.pageTitle);
       });
 
       it('should check if the status color is changed', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `checkStatusColor${index}`, baseContext);
 
         const isChanged = await customerServicePage.isStatusChanged(page, 1, test.args.status);
-        await expect(isChanged).to.be.true;
+        expect(isChanged).to.eq(true);
       });
     });
   });
@@ -171,14 +171,14 @@ describe('BO - Customer Service : Change status', async () => {
       await customerServicePage.goToViewMessagePage(page);
 
       const pageTitle = await viewPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(viewPage.pageTitle);
+      expect(pageTitle).to.contains(viewPage.pageTitle);
     });
 
     it('should click on forward message button', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnForwardButton', baseContext);
 
       const isModalVisible = await viewPage.clickOnForwardMessageButton(page);
-      await expect(isModalVisible).to.be.true;
+      expect(isModalVisible).to.eq(true);
     });
 
     it('should forward the message and check the thread', async function () {
@@ -187,7 +187,7 @@ describe('BO - Customer Service : Change status', async () => {
       await viewPage.forwardMessage(page, forwardMessageData);
 
       const messages = await viewPage.getThreadMessages(page);
-      await expect(messages)
+      expect(messages)
         .to.contains(`${viewPage.forwardMessageSuccessMessage} ${Employees.DefaultEmployee.firstName}`
           + ` ${Employees.DefaultEmployee.lastName}`)
         .and.contains(forwardMessageData.message);
@@ -197,7 +197,7 @@ describe('BO - Customer Service : Change status', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'checkOrdersAndMessagesForm', baseContext);
 
       const text = await viewPage.getOrdersAndMessagesTimeline(page);
-      await expect(text).to.contains('Orders and messages timeline')
+      expect(text).to.contains('Orders and messages timeline')
         .and.contains(`${viewPage.forwardMessageSuccessMessage} ${Employees.DefaultEmployee.firstName}`
         + ` ${Employees.DefaultEmployee.lastName}`)
         .and.contains(`Comment: ${forwardMessageData.message}`);
@@ -215,14 +215,14 @@ describe('BO - Customer Service : Change status', async () => {
       );
 
       const pageTitle = await customerServicePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customerServicePage.pageTitle);
+      expect(pageTitle).to.contains(customerServicePage.pageTitle);
     });
 
     it('should delete the message', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteMessage', baseContext);
 
       const textResult = await customerServicePage.deleteMessage(page, 1);
-      await expect(textResult).to.contains(customerServicePage.successfulDeleteMessage);
+      expect(textResult).to.contains(customerServicePage.successfulDeleteMessage);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/03_respondToMessage.ts b/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/03_respondToMessage.ts
index 6c5fed2851ef0..68e8d53512fc3 100644
--- a/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/03_respondToMessage.ts
+++ b/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/03_respondToMessage.ts
@@ -55,7 +55,7 @@ describe('BO - Customer Service : Respond to message', async () => {
       await homePage.goTo(page, global.FO.URL);
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage).to.be.true;
+      expect(isHomePage).to.eq(true);
     });
 
     it('should go to contact us page', async function () {
@@ -65,7 +65,7 @@ describe('BO - Customer Service : Respond to message', async () => {
       await homePage.goToFooterLink(page, 'Contact us');
 
       const pageTitle = await contactUsPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(contactUsPage.pageTitle);
+      expect(pageTitle).to.equal(contactUsPage.pageTitle);
     });
 
     it('should send message to customer service', async function () {
@@ -74,7 +74,7 @@ describe('BO - Customer Service : Respond to message', async () => {
       await contactUsPage.sendMessage(page, contactUsData, `${contactUsData.fileName}.jpg`);
 
       const validationMessage = await contactUsPage.getAlertSuccess(page);
-      await expect(validationMessage).to.equal(contactUsPage.validationMessage);
+      expect(validationMessage).to.equal(contactUsPage.validationMessage);
     });
   });
 
@@ -93,7 +93,7 @@ describe('BO - Customer Service : Respond to message', async () => {
       );
 
       const pageTitle = await customerServicePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customerServicePage.pageTitle);
+      expect(pageTitle).to.contains(customerServicePage.pageTitle);
     });
 
     it('should go to view message page', async function () {
@@ -102,7 +102,7 @@ describe('BO - Customer Service : Respond to message', async () => {
       await customerServicePage.goToViewMessagePage(page);
 
       const pageTitle = await viewPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(viewPage.pageTitle);
+      expect(pageTitle).to.contains(viewPage.pageTitle);
     });
 
     it('should add a response and check the thread', async function () {
@@ -111,14 +111,14 @@ describe('BO - Customer Service : Respond to message', async () => {
       await viewPage.addResponse(page, answerMessage);
 
       const messages = await viewPage.getThreadMessages(page);
-      await expect(messages).to.contains(answerMessage);
+      expect(messages).to.contains(answerMessage);
     });
 
     it('should check orders and messages timeline', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkOrdersAndMessagesForm', baseContext);
 
       const text = await viewPage.getOrdersAndMessagesTimeline(page);
-      await expect(text).to.contains(answerMessage);
+      expect(text).to.contains(answerMessage);
     });
   });
 
@@ -133,14 +133,14 @@ describe('BO - Customer Service : Respond to message', async () => {
       );
 
       const pageTitle = await customerServicePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customerServicePage.pageTitle);
+      expect(pageTitle).to.contains(customerServicePage.pageTitle);
     });
 
     it('should delete the message', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteMessage', baseContext);
 
       const textResult = await customerServicePage.deleteMessage(page, 1);
-      await expect(textResult).to.contains(customerServicePage.successfulDeleteMessage);
+      expect(textResult).to.contains(customerServicePage.successfulDeleteMessage);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/04_contactOptions.ts b/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/04_contactOptions.ts
index dd250e9e82fc8..9b8d68b5bf59d 100644
--- a/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/04_contactOptions.ts
+++ b/tests/UI/campaigns/functional/BO/05_customerService/01_customerService/04_contactOptions.ts
@@ -62,14 +62,14 @@ describe('BO - Customer Service : Contact options', async () => {
       );
 
       const pageTitle = await customerServicePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customerServicePage.pageTitle);
+      expect(pageTitle).to.contains(customerServicePage.pageTitle);
     });
 
     it('should update default message', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateDefaultMessage', baseContext);
 
       const result = await customerServicePage.setDefaultMessage(page, 'Test default message');
-      await expect(result).to.contains(customerServicePage.successfulUpdateMessage);
+      expect(result).to.contains(customerServicePage.successfulUpdateMessage);
     });
   });
 
@@ -80,7 +80,7 @@ describe('BO - Customer Service : Contact options', async () => {
       page = await customerServicePage.viewMyShop(page);
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should go to contact us page', async function () {
@@ -90,7 +90,7 @@ describe('BO - Customer Service : Contact options', async () => {
       await homePage.goToFooterLink(page, 'Contact us');
 
       const pageTitle = await contactUsPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(contactUsPage.pageTitle);
+      expect(pageTitle).to.equal(contactUsPage.pageTitle);
     });
 
     it('should send message to customer service then close the page', async function () {
@@ -99,7 +99,7 @@ describe('BO - Customer Service : Contact options', async () => {
       await contactUsPage.sendMessage(page, contactUsData, `${contactUsData.fileName}.jpg`);
 
       const validationMessage = await contactUsPage.getAlertSuccess(page);
-      await expect(validationMessage).to.equal(contactUsPage.validationMessage);
+      expect(validationMessage).to.equal(contactUsPage.validationMessage);
 
       page = await contactUsPage.closePage(browserContext, page, 0);
     });
@@ -113,7 +113,7 @@ describe('BO - Customer Service : Contact options', async () => {
       await customerServicePage.goToViewMessagePage(page);
 
       const pageTitle = await viewPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(viewPage.pageTitle);
+      expect(pageTitle).to.contains(viewPage.pageTitle);
     });
 
     it('should check your answer form', async function () {
@@ -133,14 +133,14 @@ describe('BO - Customer Service : Contact options', async () => {
       );
 
       const pageTitle = await customerServicePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customerServicePage.pageTitle);
+      expect(pageTitle).to.contains(customerServicePage.pageTitle);
     });
 
     it('should go back to default message', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'goBackToDefaultMessage', baseContext);
 
       const result = await customerServicePage.setDefaultMessage(page, 'Dear Customer,\n\n Regards,\nCustomer service');
-      await expect(result).to.contains(customerServicePage.successfulUpdateMessage);
+      expect(result).to.contains(customerServicePage.successfulUpdateMessage);
     });
   });
 
@@ -153,7 +153,7 @@ describe('BO - Customer Service : Contact options', async () => {
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.action}FileUploading`, baseContext);
 
         const result = await customerServicePage.allowFileUploading(page, test.args.enable);
-        await expect(result).to.contains(customerServicePage.successfulUpdateMessage);
+        expect(result).to.contains(customerServicePage.successfulUpdateMessage);
       });
 
       it('should view my shop', async function () {
@@ -162,7 +162,7 @@ describe('BO - Customer Service : Contact options', async () => {
         page = await customerServicePage.viewMyShop(page);
 
         const isHomePage = await homePage.isHomePage(page);
-        await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+        expect(isHomePage, 'Fail to open FO home page').to.eq(true);
       });
 
       it('should go to contact us page', async function () {
@@ -171,14 +171,14 @@ describe('BO - Customer Service : Contact options', async () => {
         await homePage.clickOnHeaderLink(page, 'Contact us');
 
         const pageTitle = await contactUsPage.getPageTitle(page);
-        await expect(pageTitle).to.equal(contactUsPage.pageTitle);
+        expect(pageTitle).to.equal(contactUsPage.pageTitle);
       });
 
       it('should check the existence of attachment input in contact us form', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `checkUploadFile${index}`, baseContext);
 
         const isVisible = await contactUsPage.isAttachmentInputVisible(page);
-        await expect(isVisible).to.be.equal(test.args.enable);
+        expect(isVisible).to.be.equal(test.args.enable);
       });
 
       it('should go back to BO', async function () {
@@ -187,7 +187,7 @@ describe('BO - Customer Service : Contact options', async () => {
         page = await contactUsPage.closePage(browserContext, page, 0);
 
         const pageTitle = await customerServicePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(customerServicePage.pageTitle);
+        expect(pageTitle).to.contains(customerServicePage.pageTitle);
       });
     });
   });
@@ -197,7 +197,7 @@ describe('BO - Customer Service : Contact options', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteMessage', baseContext);
 
       const textResult = await customerServicePage.deleteMessage(page, 1);
-      await expect(textResult).to.contains(customerServicePage.successfulDeleteMessage);
+      expect(textResult).to.contains(customerServicePage.successfulDeleteMessage);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/05_customerService/02_orderMessages/01_CRUDOrderMessage.ts b/tests/UI/campaigns/functional/BO/05_customerService/02_orderMessages/01_CRUDOrderMessage.ts
index bf381d6ed4c8c..9602659e2bdf5 100644
--- a/tests/UI/campaigns/functional/BO/05_customerService/02_orderMessages/01_CRUDOrderMessage.ts
+++ b/tests/UI/campaigns/functional/BO/05_customerService/02_orderMessages/01_CRUDOrderMessage.ts
@@ -56,14 +56,14 @@ describe('BO - Customer Service - Order Messages : CRUD order message', async ()
     await orderMessagesPage.closeSfToolBar(page);
 
     const pageTitle = await orderMessagesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(orderMessagesPage.pageTitle);
+    expect(pageTitle).to.contains(orderMessagesPage.pageTitle);
   });
 
   it('should reset all filters', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFirst', baseContext);
 
     numberOfOrderMessages = await orderMessagesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfOrderMessages).to.be.above(0);
+    expect(numberOfOrderMessages).to.be.above(0);
   });
 
   // 1: Create order message
@@ -74,21 +74,21 @@ describe('BO - Customer Service - Order Messages : CRUD order message', async ()
       await orderMessagesPage.goToAddNewOrderMessagePage(page);
 
       const pageTitle = await addOrderMessagePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addOrderMessagePage.pageTitle);
+      expect(pageTitle).to.contains(addOrderMessagePage.pageTitle);
     });
 
     it('should create order message', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createOrderMessage', baseContext);
 
       const result = await addOrderMessagePage.addEditOrderMessage(page, createOrderMessageData);
-      await expect(result).to.equal(orderMessagesPage.successfulCreationMessage);
+      expect(result).to.equal(orderMessagesPage.successfulCreationMessage);
     });
 
     it('should reset filters and check number of order messages', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterCreate', baseContext);
 
       const numberOfOrderMessagesAfterReset = await orderMessagesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfOrderMessagesAfterReset).to.be.equal(numberOfOrderMessages + 1);
+      expect(numberOfOrderMessagesAfterReset).to.be.equal(numberOfOrderMessages + 1);
     });
   });
 
@@ -100,10 +100,10 @@ describe('BO - Customer Service - Order Messages : CRUD order message', async ()
       await orderMessagesPage.filterTable(page, 'name', createOrderMessageData.name);
 
       const numberOfOrderMessagesAfterFilter = await orderMessagesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfOrderMessagesAfterFilter).to.be.at.most(numberOfOrderMessages + 1);
+      expect(numberOfOrderMessagesAfterFilter).to.be.at.most(numberOfOrderMessages + 1);
 
       const textColumn = await orderMessagesPage.getTextColumnFromTable(page, 1, 'name');
-      await expect(textColumn).to.contains(createOrderMessageData.name);
+      expect(textColumn).to.contains(createOrderMessageData.name);
     });
 
     it('should go to edit first order message page', async function () {
@@ -112,21 +112,21 @@ describe('BO - Customer Service - Order Messages : CRUD order message', async ()
       await orderMessagesPage.gotoEditOrderMessage(page, 1);
 
       const pageTitle = await addOrderMessagePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addOrderMessagePage.pageTitleEdit);
+      expect(pageTitle).to.contains(addOrderMessagePage.pageTitleEdit);
     });
 
     it('should edit order message', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateOrderMessage', baseContext);
 
       const result = await addOrderMessagePage.addEditOrderMessage(page, editOrderMessageData);
-      await expect(result).to.equal(orderMessagesPage.successfulUpdateMessage);
+      expect(result).to.equal(orderMessagesPage.successfulUpdateMessage);
     });
 
     it('should reset filters and check number of order messages', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterUpdate', baseContext);
 
       const numberOfOrderMessagesAfterReset = await orderMessagesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfOrderMessagesAfterReset).to.be.equal(numberOfOrderMessages + 1);
+      expect(numberOfOrderMessagesAfterReset).to.be.equal(numberOfOrderMessages + 1);
     });
   });
 
@@ -138,10 +138,10 @@ describe('BO - Customer Service - Order Messages : CRUD order message', async ()
       await orderMessagesPage.filterTable(page, 'name', editOrderMessageData.name);
 
       const numberOfOrderMessagesAfterFilter = await orderMessagesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfOrderMessagesAfterFilter).to.be.at.most(numberOfOrderMessages + 1);
+      expect(numberOfOrderMessagesAfterFilter).to.be.at.most(numberOfOrderMessages + 1);
 
       const textColumn = await orderMessagesPage.getTextColumnFromTable(page, 1, 'name');
-      await expect(textColumn).to.contains(editOrderMessageData.name);
+      expect(textColumn).to.contains(editOrderMessageData.name);
     });
 
     it('should delete order message', async function () {
@@ -149,14 +149,14 @@ describe('BO - Customer Service - Order Messages : CRUD order message', async ()
 
       // delete order message in first row
       const result = await orderMessagesPage.deleteOrderMessage(page, 1);
-      await expect(result).to.be.equal(orderMessagesPage.successfulDeleteMessage);
+      expect(result).to.be.equal(orderMessagesPage.successfulDeleteMessage);
     });
 
     it('should reset filters and check number of order messages', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDelete', baseContext);
 
       const numberOfOrderMessagesAfterReset = await orderMessagesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfOrderMessagesAfterReset).to.be.equal(numberOfOrderMessages);
+      expect(numberOfOrderMessagesAfterReset).to.be.equal(numberOfOrderMessages);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/05_customerService/02_orderMessages/02_filterAndBulkDeleteOrderMessages.ts b/tests/UI/campaigns/functional/BO/05_customerService/02_orderMessages/02_filterAndBulkDeleteOrderMessages.ts
index 1d70b197b1dec..eb3b9b6e70ac2 100644
--- a/tests/UI/campaigns/functional/BO/05_customerService/02_orderMessages/02_filterAndBulkDeleteOrderMessages.ts
+++ b/tests/UI/campaigns/functional/BO/05_customerService/02_orderMessages/02_filterAndBulkDeleteOrderMessages.ts
@@ -56,14 +56,14 @@ describe('BO - Customer Service - Order Messages : Filter and bulk delete order
     await orderMessagesPage.closeSfToolBar(page);
 
     const pageTitle = await orderMessagesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(orderMessagesPage.pageTitle);
+    expect(pageTitle).to.contains(orderMessagesPage.pageTitle);
   });
 
   it('should reset all filters', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFirst', baseContext);
 
     numberOfOrderMessages = await orderMessagesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfOrderMessages).to.be.above(0);
+    expect(numberOfOrderMessages).to.be.above(0);
   });
 
   // 1: Create 2 order message
@@ -78,17 +78,17 @@ describe('BO - Customer Service - Order Messages : Filter and bulk delete order
         await orderMessagesPage.goToAddNewOrderMessagePage(page);
 
         const pageTitle = await addOrderMessagePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addOrderMessagePage.pageTitle);
+        expect(pageTitle).to.contains(addOrderMessagePage.pageTitle);
       });
 
       it('should create order message', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `createOrderMessage${index + 1}`, baseContext);
 
         const result = await addOrderMessagePage.addEditOrderMessage(page, test.args.orderMessageToCreate);
-        await expect(result).to.equal(orderMessagesPage.successfulCreationMessage);
+        expect(result).to.equal(orderMessagesPage.successfulCreationMessage);
 
         const numberOfOrderMessagesAfterCreation = await orderMessagesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfOrderMessagesAfterCreation).to.be.equal(numberOfOrderMessages + index + 1);
+        expect(numberOfOrderMessagesAfterCreation).to.be.equal(numberOfOrderMessages + index + 1);
       });
     });
   });
@@ -105,17 +105,17 @@ describe('BO - Customer Service - Order Messages : Filter and bulk delete order
         await orderMessagesPage.filterTable(page, test.args.filterBy, test.args.filterValue);
 
         const numberOfOrderMessagesAfterFilter = await orderMessagesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfOrderMessagesAfterFilter).to.be.at.most(numberOfOrderMessages + 1);
+        expect(numberOfOrderMessagesAfterFilter).to.be.at.most(numberOfOrderMessages + 1);
 
         const textColumn = await orderMessagesPage.getTextColumnFromTable(page, 1, test.args.filterBy);
-        await expect(textColumn).to.contains(test.args.filterValue);
+        expect(textColumn).to.contains(test.args.filterValue);
       });
 
       it('should reset filters and check number of order messages', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}Reset`, baseContext);
 
         const numberOfOrderMessagesAfterReset = await orderMessagesPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfOrderMessagesAfterReset).to.be.equal(numberOfOrderMessages + 2);
+        expect(numberOfOrderMessagesAfterReset).to.be.equal(numberOfOrderMessages + 2);
       });
     });
   });
@@ -128,21 +128,21 @@ describe('BO - Customer Service - Order Messages : Filter and bulk delete order
       await orderMessagesPage.filterTable(page, 'name', firstOrderMessageData.name);
 
       const textColumn = await orderMessagesPage.getTextColumnFromTable(page, 1, 'name');
-      await expect(textColumn).to.contains(firstOrderMessageData.name);
+      expect(textColumn).to.contains(firstOrderMessageData.name);
     });
 
     it('should delete order messages', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDelete', baseContext);
 
       const result = await orderMessagesPage.deleteWithBulkActions(page);
-      await expect(result).to.be.equal(orderMessagesPage.successfulMultiDeleteMessage);
+      expect(result).to.be.equal(orderMessagesPage.successfulMultiDeleteMessage);
     });
 
     it('should reset filters and check number of order messages', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterBulkDelete', baseContext);
 
       const numberOfOrderMessagesAfterReset = await orderMessagesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfOrderMessagesAfterReset).to.be.equal(numberOfOrderMessages);
+      expect(numberOfOrderMessagesAfterReset).to.be.equal(numberOfOrderMessages);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/05_customerService/02_orderMessages/03_paginationAndSortOrderMessages.ts b/tests/UI/campaigns/functional/BO/05_customerService/02_orderMessages/03_paginationAndSortOrderMessages.ts
index ac4cd08b3be07..a531da9e32646 100644
--- a/tests/UI/campaigns/functional/BO/05_customerService/02_orderMessages/03_paginationAndSortOrderMessages.ts
+++ b/tests/UI/campaigns/functional/BO/05_customerService/02_orderMessages/03_paginationAndSortOrderMessages.ts
@@ -55,14 +55,14 @@ describe('BO - Customer Service - Order Messages : Pagination and sort order mes
     await dashboardPage.closeSfToolBar(page);
 
     const pageTitle = await orderMessagesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(orderMessagesPage.pageTitle);
+    expect(pageTitle).to.contains(orderMessagesPage.pageTitle);
   });
 
   it('should reset all filters and get number of order messages in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfOrderMessages = await orderMessagesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfOrderMessages).to.be.above(0);
+    expect(numberOfOrderMessages).to.be.above(0);
   });
 
   describe('Create 10 order messages in BO', async () => {
@@ -78,21 +78,21 @@ describe('BO - Customer Service - Order Messages : Pagination and sort order mes
         await orderMessagesPage.goToAddNewOrderMessagePage(page);
 
         const pageTitle = await addOrderMessagePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addOrderMessagePage.pageTitle);
+        expect(pageTitle).to.contains(addOrderMessagePage.pageTitle);
       });
 
       it(`should create order message n°${index + 1}`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `createOrderMessage${index}`, baseContext);
 
         const textResult = await addOrderMessagePage.addEditOrderMessage(page, createOrderMessageData);
-        await expect(textResult).to.equal(orderMessagesPage.successfulCreationMessage);
+        expect(textResult).to.equal(orderMessagesPage.successfulCreationMessage);
       });
 
       it('should check the order messages number', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `checkOrderMessageNumber${index}`, baseContext);
 
         const numberOfOrderMessagesAfterCreation = await orderMessagesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfOrderMessagesAfterCreation).to.be.equal(numberOfOrderMessages + 1 + index);
+        expect(numberOfOrderMessagesAfterCreation).to.be.equal(numberOfOrderMessages + 1 + index);
       });
     });
   });
@@ -162,17 +162,17 @@ describe('BO - Customer Service - Order Messages : Pagination and sort order mes
           const expectedResult = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+            expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+            expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
         } else {
           const expectedResult = await basicHelper.sortArray(nonSortedTable);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         }
       });
@@ -186,21 +186,21 @@ describe('BO - Customer Service - Order Messages : Pagination and sort order mes
       await orderMessagesPage.filterTable(page, 'name', 'toSortAndPaginate');
 
       const textResult = await orderMessagesPage.getTextColumnFromTable(page, 1, 'name');
-      await expect(textResult).to.contains('toSortAndPaginate');
+      expect(textResult).to.contains('toSortAndPaginate');
     });
 
     it('should delete order messages', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'BulkDelete', baseContext);
 
       const deleteTextResult = await orderMessagesPage.deleteWithBulkActions(page);
-      await expect(deleteTextResult).to.be.equal(orderMessagesPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.equal(orderMessagesPage.successfulMultiDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDelete', baseContext);
 
       const numberOfOrderMessagesAfterFilter = await orderMessagesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfOrderMessagesAfterFilter).to.be.equal(numberOfOrderMessages);
+      expect(numberOfOrderMessagesAfterFilter).to.be.equal(numberOfOrderMessages);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/05_customerService/03_merchandiseReturns/01_merchandiseReturnOptions.ts b/tests/UI/campaigns/functional/BO/05_customerService/03_merchandiseReturns/01_merchandiseReturnOptions.ts
index 7e821d8c430a8..c93c800d70935 100644
--- a/tests/UI/campaigns/functional/BO/05_customerService/03_merchandiseReturns/01_merchandiseReturnOptions.ts
+++ b/tests/UI/campaigns/functional/BO/05_customerService/03_merchandiseReturns/01_merchandiseReturnOptions.ts
@@ -68,7 +68,7 @@ describe('BO - Customer Service - Merchandise Returns : Merchandise return (RMA)
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should go to login page', async function () {
@@ -77,7 +77,7 @@ describe('BO - Customer Service - Merchandise Returns : Merchandise return (RMA)
       await homePage.goToLoginPage(page);
 
       const pageTitle = await foLoginPage.getPageTitle(page);
-      await expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
+      expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
     });
 
     it('should sign in with default customer', async function () {
@@ -86,7 +86,7 @@ describe('BO - Customer Service - Merchandise Returns : Merchandise return (RMA)
       await foLoginPage.customerLogin(page, Customers.johnDoe);
 
       const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
 
     it('should add product to cart', async function () {
@@ -100,7 +100,7 @@ describe('BO - Customer Service - Merchandise Returns : Merchandise return (RMA)
       await productPage.addProductToTheCart(page);
 
       const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
-      await expect(notificationsNumber).to.be.equal(1);
+      expect(notificationsNumber).to.be.equal(1);
     });
 
     it('should go to delivery step', async function () {
@@ -111,7 +111,7 @@ describe('BO - Customer Service - Merchandise Returns : Merchandise return (RMA)
 
       // Address step - Go to delivery step
       const isStepAddressComplete = await checkoutPage.goToDeliveryStep(page);
-      await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
     });
 
     it('should go to payment step', async function () {
@@ -119,7 +119,7 @@ describe('BO - Customer Service - Merchandise Returns : Merchandise return (RMA)
 
       // Delivery step - Go to payment step
       const isStepDeliveryComplete = await checkoutPage.goToPaymentStep(page);
-      await expect(isStepDeliveryComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepDeliveryComplete, 'Step Address is not complete').to.eq(true);
     });
 
     it('should choose payment method and confirm the order', async function () {
@@ -130,7 +130,7 @@ describe('BO - Customer Service - Merchandise Returns : Merchandise return (RMA)
 
       // Check the confirmation message
       const cardTitle = await orderConfirmationPage.getOrderConfirmationCardTitle(page);
-      await expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
+      expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
     });
 
     it('should sign out from FO', async function () {
@@ -139,7 +139,7 @@ describe('BO - Customer Service - Merchandise Returns : Merchandise return (RMA)
       await orderConfirmationPage.logout(page);
 
       const isCustomerConnected = await orderConfirmationPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is connected').to.be.false;
+      expect(isCustomerConnected, 'Customer is connected').to.eq(false);
     });
   });
 
@@ -163,21 +163,21 @@ describe('BO - Customer Service - Merchandise Returns : Merchandise return (RMA)
         await boMerchandiseReturnsPage.closeSfToolBar(page);
 
         const pageTitle = await boMerchandiseReturnsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(boMerchandiseReturnsPage.pageTitle);
+        expect(pageTitle).to.contains(boMerchandiseReturnsPage.pageTitle);
       });
 
       it(`should ${test.args.action} merchandise returns`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.action}Returns`, baseContext);
 
         const result = await boMerchandiseReturnsPage.setOrderReturnStatus(page, test.args.enable);
-        await expect(result).to.contains(boMerchandiseReturnsPage.successfulUpdateMessage);
+        expect(result).to.contains(boMerchandiseReturnsPage.successfulUpdateMessage);
       });
 
       it('should update Returns prefix', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `updateReturnPrefix${index}`, baseContext);
 
         const result = await boMerchandiseReturnsPage.setReturnsPrefix(page, test.args.prefix);
-        await expect(result).to.contains(boMerchandiseReturnsPage.successfulUpdateMessage);
+        expect(result).to.contains(boMerchandiseReturnsPage.successfulUpdateMessage);
       });
 
       it('should go to \'Orders > Orders\' page', async function () {
@@ -190,7 +190,7 @@ describe('BO - Customer Service - Merchandise Returns : Merchandise return (RMA)
         );
 
         const pageTitle = await ordersPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(ordersPage.pageTitle);
+        expect(pageTitle).to.contains(ordersPage.pageTitle);
       });
 
       it('should filter the Orders table by the default customer and check the result', async function () {
@@ -199,7 +199,7 @@ describe('BO - Customer Service - Merchandise Returns : Merchandise return (RMA)
         await ordersPage.filterOrders(page, 'input', 'customer', Customers.johnDoe.lastName);
 
         const textColumn = await ordersPage.getTextColumn(page, 'customer', 1);
-        await expect(textColumn).to.contains(Customers.johnDoe.lastName);
+        expect(textColumn).to.contains(Customers.johnDoe.lastName);
       });
 
       it('should go to the first order page', async function () {
@@ -209,21 +209,21 @@ describe('BO - Customer Service - Merchandise Returns : Merchandise return (RMA)
         await ordersPage.goToOrder(page, 1);
 
         const pageTitle = await viewOrderBasePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(viewOrderBasePage.pageTitle);
+        expect(pageTitle).to.contains(viewOrderBasePage.pageTitle);
       });
 
       it(`should change the order status to '${OrderStatuses.shipped.name}' and check it`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `updateOrderStatus${index}`, baseContext);
 
         const result = await viewOrderBasePage.modifyOrderStatus(page, OrderStatuses.shipped.name);
-        await expect(result).to.equal(OrderStatuses.shipped.name);
+        expect(result).to.equal(OrderStatuses.shipped.name);
       });
 
       it('should check if the button \'Return products\' is visible', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `checkReturnProductsButton${index}`, baseContext);
 
         const result = await viewOrderBasePage.isReturnProductsButtonVisible(page);
-        await expect(result).to.equal(test.args.enable);
+        expect(result).to.equal(test.args.enable);
       });
 
       it('should go to FO', async function () {
@@ -235,7 +235,7 @@ describe('BO - Customer Service - Merchandise Returns : Merchandise return (RMA)
         await homePage.changeLanguage(page, 'en');
 
         const isHomePage = await homePage.isHomePage(page);
-        await expect(isHomePage, 'Home page is not displayed').to.be.true;
+        expect(isHomePage, 'Home page is not displayed').to.eq(true);
       });
 
       // Go to My account page by login the first time and click on account link the second time
@@ -247,12 +247,12 @@ describe('BO - Customer Service - Merchandise Returns : Merchandise return (RMA)
           await foLoginPage.customerLogin(page, Customers.johnDoe);
 
           const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
-          await expect(isCustomerConnected).to.be.true;
+          expect(isCustomerConnected).to.eq(true);
 
           await homePage.goToMyAccountPage(page);
 
           const pageTitle = await myAccountPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(myAccountPage.pageTitle);
+          expect(pageTitle).to.contains(myAccountPage.pageTitle);
         });
       } else {
         it('should go to account page', async function () {
@@ -261,7 +261,7 @@ describe('BO - Customer Service - Merchandise Returns : Merchandise return (RMA)
           await homePage.goToMyAccountPage(page);
 
           const pageTitle = await myAccountPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(myAccountPage.pageTitle);
+          expect(pageTitle).to.contains(myAccountPage.pageTitle);
         });
       }
 
@@ -271,7 +271,7 @@ describe('BO - Customer Service - Merchandise Returns : Merchandise return (RMA)
         await myAccountPage.goToHistoryAndDetailsPage(page);
 
         const pageTitle = await orderHistoryPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(orderHistoryPage.pageTitle);
+        expect(pageTitle).to.contains(orderHistoryPage.pageTitle);
       });
 
       it('should go to the first order in the list and check the existence of order return form', async function () {
@@ -280,7 +280,7 @@ describe('BO - Customer Service - Merchandise Returns : Merchandise return (RMA)
         await orderHistoryPage.goToDetailsPage(page, 1);
 
         const result = await orderDetailsPage.isOrderReturnFormVisible(page);
-        await expect(result).to.equal(test.args.enable);
+        expect(result).to.equal(test.args.enable);
       });
       if (test.args.enable) {
         it('should create a merchandise return', async function () {
@@ -289,14 +289,14 @@ describe('BO - Customer Service - Merchandise Returns : Merchandise return (RMA)
           await orderDetailsPage.requestMerchandiseReturn(page, 'test');
 
           const pageTitle = await foMerchandiseReturnsPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(foMerchandiseReturnsPage.pageTitle);
+          expect(pageTitle).to.contains(foMerchandiseReturnsPage.pageTitle);
         });
 
         it('should verify order return prefix', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'checkOrderReturnPrefix', baseContext);
 
           const fileName = await foMerchandiseReturnsPage.getTextColumn(page, 'fileName');
-          await expect(fileName).to.contains(test.args.prefix);
+          expect(fileName).to.contains(test.args.prefix);
         });
       }
 
@@ -306,7 +306,7 @@ describe('BO - Customer Service - Merchandise Returns : Merchandise return (RMA)
         page = await orderDetailsPage.closePage(browserContext, page, 0);
 
         const pageTitle = await viewOrderBasePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(viewOrderBasePage.pageTitle);
+        expect(pageTitle).to.contains(viewOrderBasePage.pageTitle);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/05_customerService/03_merchandiseReturns/02_deleteProduct.ts b/tests/UI/campaigns/functional/BO/05_customerService/03_merchandiseReturns/02_deleteProduct.ts
index 57b860256880c..62a069566b5d8 100644
--- a/tests/UI/campaigns/functional/BO/05_customerService/03_merchandiseReturns/02_deleteProduct.ts
+++ b/tests/UI/campaigns/functional/BO/05_customerService/03_merchandiseReturns/02_deleteProduct.ts
@@ -69,7 +69,7 @@ describe('BO - Customer Service - Merchandise Returns : Delete product', async (
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should go to login page', async function () {
@@ -78,7 +78,7 @@ describe('BO - Customer Service - Merchandise Returns : Delete product', async (
       await homePage.goToLoginPage(page);
 
       const pageTitle = await foLoginPage.getPageTitle(page);
-      await expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
+      expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
     });
 
     it('should sign in with default customer', async function () {
@@ -87,7 +87,7 @@ describe('BO - Customer Service - Merchandise Returns : Delete product', async (
       await foLoginPage.customerLogin(page, Customers.johnDoe);
 
       const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
 
     it('should add 3 products to the cart', async function () {
@@ -108,7 +108,7 @@ describe('BO - Customer Service - Merchandise Returns : Delete product', async (
       await homePage.proceedToCheckout(page);
 
       const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
-      await expect(notificationsNumber).to.be.equal(6);
+      expect(notificationsNumber).to.be.equal(6);
     });
 
     it('should go to delivery step', async function () {
@@ -117,14 +117,14 @@ describe('BO - Customer Service - Merchandise Returns : Delete product', async (
       await cartPage.clickOnProceedToCheckout(page);
 
       const isStepAddressComplete = await checkoutPage.goToDeliveryStep(page);
-      await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
     });
 
     it('should go to payment step', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'goToPaymentStep', baseContext);
 
       const isStepDeliveryComplete = await checkoutPage.goToPaymentStep(page);
-      await expect(isStepDeliveryComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepDeliveryComplete, 'Step Address is not complete').to.eq(true);
     });
 
     it('should choose payment method and confirm the order', async function () {
@@ -133,7 +133,7 @@ describe('BO - Customer Service - Merchandise Returns : Delete product', async (
       await checkoutPage.choosePaymentAndOrder(page, PaymentMethods.wirePayment.moduleName);
 
       const cardTitle = await orderConfirmationPage.getOrderConfirmationCardTitle(page);
-      await expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
+      expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
     });
   });
 
@@ -153,14 +153,14 @@ describe('BO - Customer Service - Merchandise Returns : Delete product', async (
       await merchandiseReturnsPage.closeSfToolBar(page);
 
       const pageTitle = await merchandiseReturnsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(merchandiseReturnsPage.pageTitle);
+      expect(pageTitle).to.contains(merchandiseReturnsPage.pageTitle);
     });
 
     it('should enable merchandise returns', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'enableReturns', baseContext);
 
       const result = await merchandiseReturnsPage.setOrderReturnStatus(page, true);
-      await expect(result).to.contains(merchandiseReturnsPage.successfulUpdateMessage);
+      expect(result).to.contains(merchandiseReturnsPage.successfulUpdateMessage);
     });
   });
 
@@ -175,7 +175,7 @@ describe('BO - Customer Service - Merchandise Returns : Delete product', async (
       );
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should go to the first order page', async function () {
@@ -184,21 +184,21 @@ describe('BO - Customer Service - Merchandise Returns : Delete product', async (
       await ordersPage.goToOrder(page, 1);
 
       const pageTitle = await viewOrderBasePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(viewOrderBasePage.pageTitle);
+      expect(pageTitle).to.contains(viewOrderBasePage.pageTitle);
     });
 
     it(`should change the order status to '${OrderStatuses.shipped.name}' and check it`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateOrderStatus', baseContext);
 
       const result = await viewOrderBasePage.modifyOrderStatus(page, OrderStatuses.shipped.name);
-      await expect(result).to.equal(OrderStatuses.shipped.name);
+      expect(result).to.equal(OrderStatuses.shipped.name);
     });
 
     it('should check if the button \'Return products\' is visible', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkReturnProductsButton', baseContext);
 
       const result = await viewOrderBasePage.isReturnProductsButtonVisible(page);
-      await expect(result).to.be.true;
+      expect(result).to.eq(true);
     });
   });
 
@@ -210,7 +210,7 @@ describe('BO - Customer Service - Merchandise Returns : Delete product', async (
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Home page is not displayed').to.be.true;
+      expect(isHomePage, 'Home page is not displayed').to.eq(true);
     });
 
     it('should go to account page', async function () {
@@ -219,7 +219,7 @@ describe('BO - Customer Service - Merchandise Returns : Delete product', async (
       await homePage.goToMyAccountPage(page);
 
       const pageTitle = await myAccountPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(myAccountPage.pageTitle);
+      expect(pageTitle).to.contains(myAccountPage.pageTitle);
     });
 
     it('should go to \'Order history and details\' page', async function () {
@@ -228,7 +228,7 @@ describe('BO - Customer Service - Merchandise Returns : Delete product', async (
       await myAccountPage.goToHistoryAndDetailsPage(page);
 
       const pageTitle = await orderHistoryPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderHistoryPage.pageTitle);
+      expect(pageTitle).to.contains(orderHistoryPage.pageTitle);
     });
 
     it('should go to the first order in the list and check the existence of order return form', async function () {
@@ -237,7 +237,7 @@ describe('BO - Customer Service - Merchandise Returns : Delete product', async (
       await orderHistoryPage.goToDetailsPage(page, 1);
 
       const result = await orderDetailsPage.isOrderReturnFormVisible(page);
-      await expect(result).to.be.true;
+      expect(result).to.eq(true);
     });
 
     it('should create a merchandise return', async function () {
@@ -249,7 +249,7 @@ describe('BO - Customer Service - Merchandise Returns : Delete product', async (
         [{quantity: 1}, {quantity: 1}, {quantity: 2}]);
 
       const pageTitle = await foMerchandiseReturnsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(foMerchandiseReturnsPage.pageTitle);
+      expect(pageTitle).to.contains(foMerchandiseReturnsPage.pageTitle);
     });
 
     it('should close the FO page and go back to BO', async function () {
@@ -258,7 +258,7 @@ describe('BO - Customer Service - Merchandise Returns : Delete product', async (
       page = await orderDetailsPage.closePage(browserContext, page, 0);
 
       const pageTitle = await viewOrderBasePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(viewOrderBasePage.pageTitle);
+      expect(pageTitle).to.contains(viewOrderBasePage.pageTitle);
     });
   });
 
@@ -277,7 +277,7 @@ describe('BO - Customer Service - Merchandise Returns : Delete product', async (
         );
 
         const pageTitle = await merchandiseReturnsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(merchandiseReturnsPage.pageTitle);
+        expect(pageTitle).to.contains(merchandiseReturnsPage.pageTitle);
       });
 
       it('should go to edit merchandise returns page', async function () {
@@ -286,7 +286,7 @@ describe('BO - Customer Service - Merchandise Returns : Delete product', async (
         await merchandiseReturnsPage.goToMerchandiseReturnPage(page);
 
         const pageTitle = await editMerchandiseReturnsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(editMerchandiseReturnsPage.pageTitle);
+        expect(pageTitle).to.contains(editMerchandiseReturnsPage.pageTitle);
       });
 
       it(`should delete the first returned product and click on '${test.args.button}'`, async function () {
@@ -295,9 +295,9 @@ describe('BO - Customer Service - Merchandise Returns : Delete product', async (
         const text = await editMerchandiseReturnsPage.deleteProduct(page, 1, test.args.understandTheRisk);
 
         if (test.args.understandTheRisk) {
-          await expect(text).to.contains(editMerchandiseReturnsPage.successfulUpdateMessage);
+          expect(text).to.contains(editMerchandiseReturnsPage.successfulUpdateMessage);
         } else {
-          await expect(text).to.eq(dashboardPage.pageTitle);
+          expect(text).to.eq(dashboardPage.pageTitle);
         }
       });
     });
@@ -308,14 +308,14 @@ describe('BO - Customer Service - Merchandise Returns : Delete product', async (
       await merchandiseReturnsPage.goToMerchandiseReturnPage(page);
 
       const pageTitle = await editMerchandiseReturnsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(editMerchandiseReturnsPage.pageTitle);
+      expect(pageTitle).to.contains(editMerchandiseReturnsPage.pageTitle);
     });
 
     it('should try to delete the last returned product and check the error message', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteLastProduct', baseContext);
 
       const errorMessage = await editMerchandiseReturnsPage.clickOnDeleteLastProductButton(page);
-      await expect(errorMessage).to.contains(merchandiseReturnsPage.errorDeletionMessage);
+      expect(errorMessage).to.contains(merchandiseReturnsPage.errorDeletionMessage);
     });
   });
 
@@ -324,7 +324,7 @@ describe('BO - Customer Service - Merchandise Returns : Delete product', async (
       await testContext.addContextItem(this, 'testIdentifier', 'disableReturns', baseContext);
 
       const result = await merchandiseReturnsPage.setOrderReturnStatus(page, false);
-      await expect(result).to.contains(merchandiseReturnsPage.successfulUpdateMessage);
+      expect(result).to.contains(merchandiseReturnsPage.successfulUpdateMessage);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/05_customerService/03_merchandiseReturns/03_updateStatus.ts b/tests/UI/campaigns/functional/BO/05_customerService/03_merchandiseReturns/03_updateStatus.ts
index 3494dbd3392c2..a10266c8f68d2 100644
--- a/tests/UI/campaigns/functional/BO/05_customerService/03_merchandiseReturns/03_updateStatus.ts
+++ b/tests/UI/campaigns/functional/BO/05_customerService/03_merchandiseReturns/03_updateStatus.ts
@@ -75,7 +75,7 @@ describe('BO - Customer Service - Merchandise Returns : Update status', async ()
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should go to login page', async function () {
@@ -84,7 +84,7 @@ describe('BO - Customer Service - Merchandise Returns : Update status', async ()
       await homePage.goToLoginPage(page);
 
       const pageTitle = await foLoginPage.getPageTitle(page);
-      await expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
+      expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
     });
 
     it('should sign in with default customer', async function () {
@@ -93,7 +93,7 @@ describe('BO - Customer Service - Merchandise Returns : Update status', async ()
       await foLoginPage.customerLogin(page, Customers.johnDoe);
 
       const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
 
     it('should add the first product to the cart', async function () {
@@ -106,7 +106,7 @@ describe('BO - Customer Service - Merchandise Returns : Update status', async ()
       await homePage.proceedToCheckout(page);
 
       const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
-      await expect(notificationsNumber).to.be.equal(2);
+      expect(notificationsNumber).to.be.equal(2);
     });
 
     it('should go to delivery step', async function () {
@@ -115,14 +115,14 @@ describe('BO - Customer Service - Merchandise Returns : Update status', async ()
       await cartPage.clickOnProceedToCheckout(page);
 
       const isStepAddressComplete = await checkoutPage.goToDeliveryStep(page);
-      await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
     });
 
     it('should go to payment step', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'goToPaymentStep', baseContext);
 
       const isStepDeliveryComplete = await checkoutPage.goToPaymentStep(page);
-      await expect(isStepDeliveryComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepDeliveryComplete, 'Step Address is not complete').to.eq(true);
     });
 
     it('should choose payment method and confirm the order', async function () {
@@ -131,7 +131,7 @@ describe('BO - Customer Service - Merchandise Returns : Update status', async ()
       await checkoutPage.choosePaymentAndOrder(page, PaymentMethods.wirePayment.moduleName);
 
       const cardTitle = await orderConfirmationPage.getOrderConfirmationCardTitle(page);
-      await expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
+      expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
     });
   });
 
@@ -151,14 +151,14 @@ describe('BO - Customer Service - Merchandise Returns : Update status', async ()
       await merchandiseReturnsPage.closeSfToolBar(page);
 
       const pageTitle = await merchandiseReturnsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(merchandiseReturnsPage.pageTitle);
+      expect(pageTitle).to.contains(merchandiseReturnsPage.pageTitle);
     });
 
     it('should enable merchandise returns', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'enableReturns', baseContext);
 
       const result = await merchandiseReturnsPage.setOrderReturnStatus(page, true);
-      await expect(result).to.contains(merchandiseReturnsPage.successfulUpdateMessage);
+      expect(result).to.contains(merchandiseReturnsPage.successfulUpdateMessage);
     });
   });
 
@@ -173,7 +173,7 @@ describe('BO - Customer Service - Merchandise Returns : Update status', async ()
       );
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should go to the first order page', async function () {
@@ -182,21 +182,21 @@ describe('BO - Customer Service - Merchandise Returns : Update status', async ()
       await ordersPage.goToOrder(page, 1);
 
       const pageTitle = await viewOrderBasePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(viewOrderBasePage.pageTitle);
+      expect(pageTitle).to.contains(viewOrderBasePage.pageTitle);
     });
 
     it(`should change the order status to '${OrderStatuses.shipped.name}' and check it`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateOrderStatus', baseContext);
 
       const result = await viewOrderBasePage.modifyOrderStatus(page, OrderStatuses.shipped.name);
-      await expect(result).to.equal(OrderStatuses.shipped.name);
+      expect(result).to.equal(OrderStatuses.shipped.name);
     });
 
     it('should check if the button \'Return products\' is visible', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkReturnProductsButton', baseContext);
 
       const result = await viewOrderBasePage.isReturnProductsButtonVisible(page);
-      await expect(result).to.be.true;
+      expect(result).to.eq(true);
     });
   });
 
@@ -208,7 +208,7 @@ describe('BO - Customer Service - Merchandise Returns : Update status', async ()
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Home page is not displayed').to.be.true;
+      expect(isHomePage, 'Home page is not displayed').to.eq(true);
     });
 
     it('should go to account page', async function () {
@@ -217,7 +217,7 @@ describe('BO - Customer Service - Merchandise Returns : Update status', async ()
       await homePage.goToMyAccountPage(page);
 
       const pageTitle = await myAccountPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(myAccountPage.pageTitle);
+      expect(pageTitle).to.contains(myAccountPage.pageTitle);
     });
 
     it('should go to \'Order history and details\' page', async function () {
@@ -226,7 +226,7 @@ describe('BO - Customer Service - Merchandise Returns : Update status', async ()
       await myAccountPage.goToHistoryAndDetailsPage(page);
 
       const pageTitle = await orderHistoryPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderHistoryPage.pageTitle);
+      expect(pageTitle).to.contains(orderHistoryPage.pageTitle);
     });
 
     it('should go to the first order in the list and check the existence of order return form', async function () {
@@ -235,7 +235,7 @@ describe('BO - Customer Service - Merchandise Returns : Update status', async ()
       await orderHistoryPage.goToDetailsPage(page, 1);
 
       const result = await orderDetailsPage.isOrderReturnFormVisible(page);
-      await expect(result).to.be.true;
+      expect(result).to.eq(true);
     });
 
     it('should create a merchandise return', async function () {
@@ -244,7 +244,7 @@ describe('BO - Customer Service - Merchandise Returns : Update status', async ()
       await orderDetailsPage.requestMerchandiseReturn(page, 'test', 1, [{quantity: 1}]);
 
       const pageTitle = await foMerchandiseReturnsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(foMerchandiseReturnsPage.pageTitle);
+      expect(pageTitle).to.contains(foMerchandiseReturnsPage.pageTitle);
     });
 
     it('should close the FO page and go back to BO', async function () {
@@ -253,7 +253,7 @@ describe('BO - Customer Service - Merchandise Returns : Update status', async ()
       page = await orderDetailsPage.closePage(browserContext, page, 0);
 
       const pageTitle = await viewOrderBasePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(viewOrderBasePage.pageTitle);
+      expect(pageTitle).to.contains(viewOrderBasePage.pageTitle);
     });
   });
 
@@ -268,14 +268,14 @@ describe('BO - Customer Service - Merchandise Returns : Update status', async ()
       );
 
       const pageTitle = await merchandiseReturnsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(merchandiseReturnsPage.pageTitle);
+      expect(pageTitle).to.contains(merchandiseReturnsPage.pageTitle);
     });
 
     it('should get the return number', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'getReturnNumber', baseContext);
 
       returnID = parseInt(await merchandiseReturnsPage.getTextColumnFromMerchandiseReturnsTable(page, 'id_order_return'), 10);
-      await expect(returnID).to.not.equal(0);
+      expect(returnID).to.not.equal(0);
     });
 
     const tests = [
@@ -292,14 +292,14 @@ describe('BO - Customer Service - Merchandise Returns : Update status', async ()
           await merchandiseReturnsPage.goToMerchandiseReturnPage(page);
 
           const pageTitle = await editMerchandiseReturnsPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(editMerchandiseReturnsPage.pageTitle);
+          expect(pageTitle).to.contains(editMerchandiseReturnsPage.pageTitle);
         });
 
         it('should update the status', async function () {
           await testContext.addContextItem(this, 'testIdentifier', `editStatus${index}`, baseContext);
 
           const textResult = await editMerchandiseReturnsPage.setStatus(page, test.args.status, true);
-          await expect(textResult).to.contains(editMerchandiseReturnsPage.successfulUpdateMessage);
+          expect(textResult).to.contains(editMerchandiseReturnsPage.successfulUpdateMessage);
         });
 
         if (test.args.status === OrderReturnStatuses.waitingForPackage.name) {
@@ -309,14 +309,14 @@ describe('BO - Customer Service - Merchandise Returns : Update status', async ()
             filePath = await editMerchandiseReturnsPage.downloadPDF(page);
 
             const exist = await files.doesFileExist(filePath);
-            await expect(exist, 'File does not exist').to.be.true;
+            expect(exist, 'File does not exist').to.eq(true);
           });
 
           it('should check the file name', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'checkFileName', baseContext);
 
             const fileName = await editMerchandiseReturnsPage.getFileName(page);
-            await expect(fileName).to.eq('Print out');
+            expect(fileName).to.eq('Print out');
           });
 
           it('should check the header of the return PDF', async function () {
@@ -328,7 +328,7 @@ describe('BO - Customer Service - Merchandise Returns : Update status', async ()
               returnPrefix = '#RE0000';
             }
             const isVisible = await files.isTextInPDF(filePath, `ORDER RETURN,,${todayDate},,${returnPrefix}${returnID}`);
-            await expect(isVisible, 'The header of the PDF is not correct!').to.be.true;
+            expect(isVisible, 'The header of the PDF is not correct!').to.eq(true);
           });
 
           it('should check the billing address in the PDF', async function () {
@@ -345,7 +345,7 @@ describe('BO - Customer Service - Merchandise Returns : Update status', async ()
               + `${Addresses.second.country},`
               + `${Addresses.second.phone}`,
             );
-            await expect(billingAddressExist, 'Billing address is not correct in PDF!').to.be.true;
+            expect(billingAddressExist, 'Billing address is not correct in PDF!').to.eq(true);
           });
 
           it('should check the return number', async function () {
@@ -361,7 +361,7 @@ describe('BO - Customer Service - Merchandise Returns : Update status', async ()
               filePath,
               'We have logged your return request.,Your package must be returned to us within 14 days of receiving your order.'
               + `,,Return Number, ,Date,,${returnPrefix}${returnID}, ,${todayDate}`);
-            await expect(isVisible, 'Order return ID and the date are not correct!').to.be.true;
+            expect(isVisible, 'Order return ID and the date are not correct!').to.eq(true);
           });
 
           it('should check the returned product details', async function () {
@@ -371,14 +371,14 @@ describe('BO - Customer Service - Merchandise Returns : Update status', async ()
               filePath,
               `Items to be returned, ,Reference, ,Qty,,${Products.demo_1.name} (Size: S - Color: White), ,`
               + `${Products.demo_1.reference}, ,1`);
-            await expect(isVisible, 'Returned product details are not correct!').to.be.true;
+            expect(isVisible, 'Returned product details are not correct!').to.eq(true);
           });
         } else {
           it('should check that the file is not existing', async function () {
             await testContext.addContextItem(this, 'testIdentifier', `checkFileNotExisting${index}`, baseContext);
 
             const fileName = await editMerchandiseReturnsPage.getFileName(page);
-            await expect(fileName).to.eq('--');
+            expect(fileName).to.eq('--');
           });
         }
         it('should click on cancel button', async function () {
@@ -387,14 +387,14 @@ describe('BO - Customer Service - Merchandise Returns : Update status', async ()
           await editMerchandiseReturnsPage.clickOnCancelButton(page);
 
           const pageTitle = await merchandiseReturnsPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(merchandiseReturnsPage.pageTitle);
+          expect(pageTitle).to.contains(merchandiseReturnsPage.pageTitle);
         });
 
         it('should check the updated status in the merchandise returns table', async function () {
           await testContext.addContextItem(this, 'testIdentifier', `checkStatus${index}`, baseContext);
 
           const status = await merchandiseReturnsPage.getTextColumnFromMerchandiseReturnsTable(page, 'name');
-          await expect(status).to.eq(test.args.status);
+          expect(status).to.eq(test.args.status);
         });
       });
     });
@@ -405,7 +405,7 @@ describe('BO - Customer Service - Merchandise Returns : Update status', async ()
       await testContext.addContextItem(this, 'testIdentifier', 'disableReturns', baseContext);
 
       const result = await merchandiseReturnsPage.setOrderReturnStatus(page, false);
-      await expect(result).to.contains(merchandiseReturnsPage.successfulUpdateMessage);
+      expect(result).to.contains(merchandiseReturnsPage.successfulUpdateMessage);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/01_modules/01_filterModulesByStatus.ts b/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/01_modules/01_filterModulesByStatus.ts
index dced6fe836c3a..fae155e461c3a 100644
--- a/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/01_modules/01_filterModulesByStatus.ts
+++ b/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/01_modules/01_filterModulesByStatus.ts
@@ -46,7 +46,7 @@ describe('BO - Modules - Module Manager : Filter modules by status', async () =>
     await moduleManagerPage.closeSfToolBar(page);
 
     const pageTitle = await moduleManagerPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
+    expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
   });
 
   describe('Filter modules by status', async () => {
@@ -54,7 +54,7 @@ describe('BO - Modules - Module Manager : Filter modules by status', async () =>
       await testContext.addContextItem(this, 'testIdentifier', 'uninstallModule', baseContext);
 
       const successMessage = await moduleManagerPage.setActionInModule(page, Modules.contactForm, 'uninstall');
-      await expect(successMessage).to.eq(moduleManagerPage.uninstallModuleSuccessMessage(Modules.contactForm.tag));
+      expect(successMessage).to.eq(moduleManagerPage.uninstallModuleSuccessMessage(Modules.contactForm.tag));
     });
 
     ['enabled', 'disabled', 'installed', 'uninstalled'].forEach((status: string, index: number) => {
@@ -65,7 +65,7 @@ describe('BO - Modules - Module Manager : Filter modules by status', async () =>
 
         const modules = await moduleManagerPage.getAllModulesStatus(page, status);
         modules.map(
-          (module) => expect(module.status, `'${module.name}' is not ${status}`).to.be.true,
+          (module) => expect(module.status, `'${module.name}' is not ${status}`).to.eq(true),
         );
       });
     });
@@ -74,7 +74,7 @@ describe('BO - Modules - Module Manager : Filter modules by status', async () =>
       await testContext.addContextItem(this, 'testIdentifier', 'installModule', baseContext);
 
       const successMessage = await moduleManagerPage.setActionInModule(page, Modules.contactForm, 'install');
-      await expect(successMessage).to.eq(moduleManagerPage.installModuleSuccessMessage(Modules.contactForm.tag));
+      expect(successMessage).to.eq(moduleManagerPage.installModuleSuccessMessage(Modules.contactForm.tag));
     });
 
     it('should show all modules and check the different blocks', async function () {
@@ -83,7 +83,7 @@ describe('BO - Modules - Module Manager : Filter modules by status', async () =>
       await moduleManagerPage.filterByStatus(page, 'all-Modules');
 
       const blocksNumber = await moduleManagerPage.getNumberOfBlocks(page);
-      await expect(blocksNumber).greaterThan(2);
+      expect(blocksNumber).greaterThan(2);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/01_modules/02_filterModulesByCategories.ts b/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/01_modules/02_filterModulesByCategories.ts
index 1444b040c98da..a9f23e3fc2b64 100644
--- a/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/01_modules/02_filterModulesByCategories.ts
+++ b/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/01_modules/02_filterModulesByCategories.ts
@@ -46,7 +46,7 @@ describe('BO - Modules - Module Manager : Filter modules by Categories', async (
     await moduleManagerPage.closeSfToolBar(page);
 
     const pageTitle = await moduleManagerPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
+    expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
   });
 
   describe('Filter modules by categories', async () => {
@@ -58,7 +58,7 @@ describe('BO - Modules - Module Manager : Filter modules by Categories', async (
         await moduleManagerPage.filterByCategory(page, category);
 
         const firstBlockTitle = await moduleManagerPage.getBlockModuleTitle(page, 1);
-        await expect(firstBlockTitle).to.equal(category);
+        expect(firstBlockTitle).to.equal(category);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/01_modules/03_searchModule.ts b/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/01_modules/03_searchModule.ts
index b810298390ebb..bf6d0f5ce7d4a 100644
--- a/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/01_modules/03_searchModule.ts
+++ b/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/01_modules/03_searchModule.ts
@@ -46,13 +46,13 @@ describe('BO - Modules - Module Manager : Search module', async () => {
     await moduleManagerPage.closeSfToolBar(page);
 
     const pageTitle = await moduleManagerPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
+    expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
   });
 
   it(`should search the module ${Modules.contactForm.name}`, async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'searchModule', baseContext);
 
     const isModuleVisible = await moduleManagerPage.searchModule(page, Modules.contactForm);
-    await expect(isModuleVisible, 'Module is not visible!').to.be.true;
+    expect(isModuleVisible, 'Module is not visible!').to.eq(true);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/01_modules/04_enableDisableModule.ts b/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/01_modules/04_enableDisableModule.ts
index 7dbc0be502bd7..09529ee507914 100644
--- a/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/01_modules/04_enableDisableModule.ts
+++ b/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/01_modules/04_enableDisableModule.ts
@@ -46,7 +46,7 @@ describe('BO - Modules - Module Manager : Enable/Disable module', async () => {
     await moduleManagerPage.closeSfToolBar(page);
 
     const pageTitle = await moduleManagerPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
+    expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
   });
 
   [
@@ -62,7 +62,7 @@ describe('BO - Modules - Module Manager : Enable/Disable module', async () => {
       await testContext.addContextItem(this, 'testIdentifier', test.args.action, baseContext);
 
       const successMessage = await moduleManagerPage.setActionInModule(page, Modules.availableQuantities, test.args.action);
-      await expect(successMessage).to.eq(test.args.message);
+      expect(successMessage).to.eq(test.args.message);
     });
   });
 
@@ -70,14 +70,14 @@ describe('BO - Modules - Module Manager : Enable/Disable module', async () => {
     await testContext.addContextItem(this, 'testIdentifier', 'searchModule', baseContext);
 
     const isModuleVisible = await moduleManagerPage.searchModule(page, Modules.availableQuantities);
-    await expect(isModuleVisible).to.be.true;
+    expect(isModuleVisible).to.eq(true);
   });
 
   it('should enable the module', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'enableModule', baseContext);
 
     const successMessage = await moduleManagerPage.setActionInModule(page, Modules.availableQuantities, 'enable');
-    await expect(successMessage).to.eq(moduleManagerPage.enableModuleSuccessMessage(Modules.availableQuantities.tag));
+    expect(successMessage).to.eq(moduleManagerPage.enableModuleSuccessMessage(Modules.availableQuantities.tag));
   });
 
   it('should show all modules', async function () {
@@ -86,6 +86,6 @@ describe('BO - Modules - Module Manager : Enable/Disable module', async () => {
     await moduleManagerPage.filterByStatus(page, 'all-Modules');
 
     const blocksNumber = await moduleManagerPage.getNumberOfBlocks(page);
-    await expect(blocksNumber).greaterThan(2);
+    expect(blocksNumber).greaterThan(2);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/01_modules/05_resetModule.ts b/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/01_modules/05_resetModule.ts
index 2e9fba53c4edf..4177eba5a326f 100644
--- a/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/01_modules/05_resetModule.ts
+++ b/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/01_modules/05_resetModule.ts
@@ -46,21 +46,21 @@ describe('BO - Modules - Module Manager : Reset module', async () => {
     await moduleManagerPage.closeSfToolBar(page);
 
     const pageTitle = await moduleManagerPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
+    expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
   });
 
   it(`should search the module ${Modules.contactForm.name}`, async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'searchModule', baseContext);
 
     const isModuleVisible = await moduleManagerPage.searchModule(page, Modules.contactForm);
-    await expect(isModuleVisible).to.be.true;
+    expect(isModuleVisible).to.eq(true);
   });
 
   it('should reset the module', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetModule', baseContext);
 
     const successMessage = await moduleManagerPage.setActionInModule(page, Modules.contactForm, 'reset');
-    await expect(successMessage).to.eq(moduleManagerPage.resetModuleSuccessMessage(Modules.contactForm.tag));
+    expect(successMessage).to.eq(moduleManagerPage.resetModuleSuccessMessage(Modules.contactForm.tag));
   });
 
   it('should show all modules', async function () {
@@ -69,6 +69,6 @@ describe('BO - Modules - Module Manager : Reset module', async () => {
     await moduleManagerPage.filterByStatus(page, 'all-Modules');
 
     const blocksNumber = await moduleManagerPage.getNumberOfBlocks(page);
-    await expect(blocksNumber).greaterThan(2);
+    expect(blocksNumber).greaterThan(2);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/01_modules/06_installUninstallModule.ts b/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/01_modules/06_installUninstallModule.ts
index 5a036958a80c8..ade731333f3c5 100644
--- a/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/01_modules/06_installUninstallModule.ts
+++ b/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/01_modules/06_installUninstallModule.ts
@@ -46,28 +46,28 @@ describe('BO - Modules - Module Manager : Install/Uninstall module', async () =>
     await moduleManagerPage.closeSfToolBar(page);
 
     const pageTitle = await moduleManagerPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
+    expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
   });
 
   it(`should search the module ${Modules.psEmailSubscription.name}`, async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'searchModule', baseContext);
 
     const isModuleVisible = await moduleManagerPage.searchModule(page, Modules.psEmailSubscription);
-    await expect(isModuleVisible, 'Module is not visible!').to.be.true;
+    expect(isModuleVisible, 'Module is not visible!').to.eq(true);
   });
 
   it(`should uninstall the module '${Modules.psEmailSubscription.name}'`, async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'uninstallModule', baseContext);
 
     const successMessage = await moduleManagerPage.setActionInModule(page, Modules.psEmailSubscription, 'uninstall');
-    await expect(successMessage).to.eq(moduleManagerPage.uninstallModuleSuccessMessage(Modules.psEmailSubscription.tag));
+    expect(successMessage).to.eq(moduleManagerPage.uninstallModuleSuccessMessage(Modules.psEmailSubscription.tag));
   });
 
   it(`should install the module '${Modules.psEmailSubscription.name}'`, async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'installModule', baseContext);
 
     const successMessage = await moduleManagerPage.setActionInModule(page, Modules.psEmailSubscription, 'install');
-    await expect(successMessage).to.eq(moduleManagerPage.installModuleSuccessMessage(Modules.psEmailSubscription.tag));
+    expect(successMessage).to.eq(moduleManagerPage.installModuleSuccessMessage(Modules.psEmailSubscription.tag));
   });
 
   it('should show all modules', async function () {
@@ -76,6 +76,6 @@ describe('BO - Modules - Module Manager : Install/Uninstall module', async () =>
     await moduleManagerPage.filterByStatus(page, 'all-Modules');
 
     const blocksNumber = await moduleManagerPage.getNumberOfBlocks(page);
-    await expect(blocksNumber).greaterThan(2);
+    expect(blocksNumber).greaterThan(2);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/01_modules/07_bulkActions.ts b/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/01_modules/07_bulkActions.ts
index c2d82876b3fea..dbf8c88bac345 100644
--- a/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/01_modules/07_bulkActions.ts
+++ b/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/01_modules/07_bulkActions.ts
@@ -46,14 +46,14 @@ describe('BO - Modules - Module Manager : Bulk actions', async () => {
     await moduleManagerPage.closeSfToolBar(page);
 
     const pageTitle = await moduleManagerPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
+    expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
   });
 
   it('should check that the bulk action button is disabled', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'checkBulkActionButton', baseContext);
 
     const isBulkActionsDisabled = await moduleManagerPage.isBulkActionsButtonDisabled(page);
-    await expect(isBulkActionsDisabled).to.be.true;
+    expect(isBulkActionsDisabled).to.eq(true);
   });
 
   it(`should select the module '${Modules.availableQuantities.name}' and check the bulk actions button`, async function () {
@@ -62,7 +62,7 @@ describe('BO - Modules - Module Manager : Bulk actions', async () => {
     await moduleManagerPage.selectModule(page, Modules.availableQuantities.tag);
 
     const isBulkActionsDisabled = await moduleManagerPage.isBulkActionsButtonDisabled(page);
-    await expect(isBulkActionsDisabled).to.be.false;
+    expect(isBulkActionsDisabled).to.eq(false);
   });
 
   [
@@ -91,7 +91,7 @@ describe('BO - Modules - Module Manager : Bulk actions', async () => {
       await testContext.addContextItem(this, 'testIdentifier', `bulkActions${index}`, baseContext);
 
       const successMessage = await moduleManagerPage.bulkActions(page, test.args.action);
-      await expect(successMessage).to.eq(test.args.message);
+      expect(successMessage).to.eq(test.args.message);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/01_modules/08_uploadModule.ts b/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/01_modules/08_uploadModule.ts
index 726d3fad6996b..9f4fa496cac8b 100644
--- a/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/01_modules/08_uploadModule.ts
+++ b/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/01_modules/08_uploadModule.ts
@@ -43,7 +43,7 @@ describe('BO - Modules - Module Manager : Upload module', async () => {
     await files.downloadFile(Modules.keycloak.releaseZip, 'module.zip');
 
     const found = await files.doesFileExist('module.zip');
-    await expect(found).to.be.true;
+    expect(found).to.eq(true);
   });
 
   it('should go to \'Modules > Module Manager\' page', async function () {
@@ -57,34 +57,34 @@ describe('BO - Modules - Module Manager : Upload module', async () => {
     await moduleManagerPage.closeSfToolBar(page);
 
     const pageTitle = await moduleManagerPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
+    expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
   });
 
   it(`should upload the module '${Modules.keycloak.name}'`, async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'uploadModule', baseContext);
 
     const successMessage = await moduleManagerPage.uploadModule(page, 'module.zip');
-    await expect(successMessage).to.eq(moduleManagerPage.uploadModuleSuccessMessage);
+    expect(successMessage).to.eq(moduleManagerPage.uploadModuleSuccessMessage);
   });
 
   it('should close upload module modal', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'closeModal', baseContext);
 
     const isModalVisible = await moduleManagerPage.closeUploadModuleModal(page);
-    await expect(isModalVisible).to.be.true;
+    expect(isModalVisible).to.eq(true);
   });
 
   it(`should search the module '${Modules.keycloak.name}'`, async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'searchModule', baseContext);
 
     const isModuleVisible = await moduleManagerPage.searchModule(page, Modules.keycloak);
-    await expect(isModuleVisible, 'Module is not visible!').to.be.true;
+    expect(isModuleVisible, 'Module is not visible!').to.eq(true);
   });
 
   it(`should uninstall the module '${Modules.keycloak.name}'`, async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'uninstallModule', baseContext);
 
     const successMessage = await moduleManagerPage.setActionInModule(page, Modules.keycloak, 'uninstall');
-    await expect(successMessage).to.eq(moduleManagerPage.uninstallModuleSuccessMessage(Modules.keycloak.tag));
+    expect(successMessage).to.eq(moduleManagerPage.uninstallModuleSuccessMessage(Modules.keycloak.tag));
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/01_modules/09_configureModule.ts b/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/01_modules/09_configureModule.ts
index 0ccac6dfbac3c..73518ff82701f 100644
--- a/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/01_modules/09_configureModule.ts
+++ b/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/01_modules/09_configureModule.ts
@@ -47,14 +47,14 @@ describe('BO - Modules - Module Manager : Configure module', async () => {
     await moduleManagerPage.closeSfToolBar(page);
 
     const pageTitle = await moduleManagerPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
+    expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
   });
 
   it(`should search for module ${Modules.contactForm.name}`, async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'searchForModule', baseContext);
 
     const isModuleVisible = await moduleManagerPage.searchModule(page, Modules.contactForm);
-    await expect(isModuleVisible, 'Module is not visible!').to.be.true;
+    expect(isModuleVisible, 'Module is not visible!').to.eq(true);
   });
 
   it('should go to module configuration page', async function () {
@@ -63,6 +63,6 @@ describe('BO - Modules - Module Manager : Configure module', async () => {
     await moduleManagerPage.goToConfigurationPage(page, Modules.contactForm.tag);
 
     const pageSubtitle = await moduleConfigurationPage.getPageSubtitle(page);
-    await expect(pageSubtitle).to.contains(Modules.contactForm.name);
+    expect(pageSubtitle).to.contains(Modules.contactForm.name);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/02_alerts/02_resetModule.ts b/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/02_alerts/02_resetModule.ts
index d4d99ba45b781..21d665fdb98a5 100644
--- a/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/02_alerts/02_resetModule.ts
+++ b/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/02_alerts/02_resetModule.ts
@@ -47,7 +47,7 @@ describe('BO - Modules - Alerts tab : Reset module', async () => {
     await moduleManagerPage.closeSfToolBar(page);
 
     const pageTitle = await moduleManagerPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
+    expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
   });
 
   it('should go to \'Alerts\' tab', async function () {
@@ -56,13 +56,13 @@ describe('BO - Modules - Alerts tab : Reset module', async () => {
     await moduleManagerPage.goToAlertsTab(page);
 
     const pageTitle = await moduleAlertsPage.getPageTitle(page);
-    await expect(pageTitle).to.eq(moduleAlertsPage.pageTitle);
+    expect(pageTitle).to.eq(moduleAlertsPage.pageTitle);
   });
 
   it(`should reset the module '${Modules.psCheckPayment.name}'`, async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetModule', baseContext);
 
     const successMessage = await moduleAlertsPage.setActionInModule(page, Modules.psCheckPayment, 'reset');
-    await expect(successMessage).to.eq(moduleAlertsPage.resetModuleSuccessMessage(Modules.psCheckPayment.tag));
+    expect(successMessage).to.eq(moduleAlertsPage.resetModuleSuccessMessage(Modules.psCheckPayment.tag));
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/02_alerts/03_installUninstallModule.ts b/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/02_alerts/03_installUninstallModule.ts
index bf2ac8c95711c..c3b620c91d278 100644
--- a/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/02_alerts/03_installUninstallModule.ts
+++ b/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/02_alerts/03_installUninstallModule.ts
@@ -47,7 +47,7 @@ describe('BO - Modules - Alerts : Install/Uninstall module', async () => {
     await moduleManagerPage.closeSfToolBar(page);
 
     const pageTitle = await moduleManagerPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
+    expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
   });
 
   it('should go to \'Alerts\' tab', async function () {
@@ -56,20 +56,20 @@ describe('BO - Modules - Alerts : Install/Uninstall module', async () => {
     await moduleManagerPage.goToAlertsTab(page);
 
     const pageTitle = await moduleAlertsPage.getPageTitle(page);
-    await expect(pageTitle).to.eq(moduleAlertsPage.pageTitle);
+    expect(pageTitle).to.eq(moduleAlertsPage.pageTitle);
   });
 
   it(`should uninstall the module '${Modules.psCheckPayment.name}'`, async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'uninstallModule', baseContext);
 
     const successMessage = await moduleAlertsPage.setActionInModule(page, Modules.psCheckPayment, 'uninstall');
-    await expect(successMessage).to.eq(moduleAlertsPage.uninstallModuleSuccessMessage(Modules.psCheckPayment.tag));
+    expect(successMessage).to.eq(moduleAlertsPage.uninstallModuleSuccessMessage(Modules.psCheckPayment.tag));
   });
 
   it(`should install the module '${Modules.psCheckPayment.name}'`, async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'installModule', baseContext);
 
     const successMessage = await moduleAlertsPage.setActionInModule(page, Modules.psCheckPayment, 'install');
-    await expect(successMessage).to.eq(moduleAlertsPage.installModuleSuccessMessage(Modules.psCheckPayment.tag));
+    expect(successMessage).to.eq(moduleAlertsPage.installModuleSuccessMessage(Modules.psCheckPayment.tag));
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/02_alerts/05_configureModule.ts b/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/02_alerts/05_configureModule.ts
index 147602e419c5a..e5eed65f7dd44 100644
--- a/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/02_alerts/05_configureModule.ts
+++ b/tests/UI/campaigns/functional/BO/07_modules/01_moduleManager/02_alerts/05_configureModule.ts
@@ -48,7 +48,7 @@ describe('BO - Modules - Alerts : Configure module', async () => {
     await moduleManagerPage.closeSfToolBar(page);
 
     const pageTitle = await moduleManagerPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
+    expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
   });
 
   it('should go to \'Alerts\' tab', async function () {
@@ -57,7 +57,7 @@ describe('BO - Modules - Alerts : Configure module', async () => {
     await moduleManagerPage.goToAlertsTab(page);
 
     const pageTitle = await moduleAlertsPage.getPageTitle(page);
-    await expect(pageTitle).to.eq(moduleAlertsPage.pageTitle);
+    expect(pageTitle).to.eq(moduleAlertsPage.pageTitle);
   });
 
   it('should go to module configuration page', async function () {
@@ -66,6 +66,6 @@ describe('BO - Modules - Alerts : Configure module', async () => {
     await moduleAlertsPage.goToConfigurationPage(page, Modules.psCheckPayment.tag);
 
     const pageSubtitle = await moduleConfigurationPage.getPageSubtitle(page);
-    await expect(pageSubtitle).to.contains(Modules.psCheckPayment.name);
+    expect(pageSubtitle).to.contains(Modules.psCheckPayment.name);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/08_design/01_themeAndLogo/01_themeAndLogo/01_addNewTheme.ts b/tests/UI/campaigns/functional/BO/08_design/01_themeAndLogo/01_themeAndLogo/01_addNewTheme.ts
index 7d9afb64d38b5..69f0a09abee8e 100644
--- a/tests/UI/campaigns/functional/BO/08_design/01_themeAndLogo/01_themeAndLogo/01_addNewTheme.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/01_themeAndLogo/01_themeAndLogo/01_addNewTheme.ts
@@ -53,7 +53,7 @@ describe('BO - Design - Theme & Logo : Add new theme', async () => {
     await themeAndLogoPage.closeSfToolBar(page);
 
     const pageTitle = await themeAndLogoPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(themeAndLogoPage.pageTitle);
+    expect(pageTitle).to.contains(themeAndLogoPage.pageTitle);
   });
 
   it('should go to \'Add new theme\' page', async function () {
@@ -62,7 +62,7 @@ describe('BO - Design - Theme & Logo : Add new theme', async () => {
     await themeAndLogoPage.goToNewThemePage(page);
 
     const pageTitle = await themeImportPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(themeImportPage.pageTitle);
+    expect(pageTitle).to.contains(themeImportPage.pageTitle);
   });
 
   describe('Import from your computer', async () => {
@@ -72,7 +72,7 @@ describe('BO - Design - Theme & Logo : Add new theme', async () => {
       await files.downloadFile(urlTheme, 'theme.zip');
 
       const found = await files.doesFileExist('theme.zip');
-      await expect(found).to.be.true;
+      expect(found).to.eq(true);
     });
 
     it('should import theme from your computer', async function () {
@@ -81,20 +81,20 @@ describe('BO - Design - Theme & Logo : Add new theme', async () => {
       await themeImportPage.importFromYourComputer(page, 'theme.zip');
 
       const pageTitle = await themeAndLogoPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(themeAndLogoPage.pageTitle);
+      expect(pageTitle).to.contains(themeAndLogoPage.pageTitle);
 
       const numThemes = await themeAndLogoPage.getNumberOfThemes(page);
-      await expect(numThemes).to.eq(2);
+      expect(numThemes).to.eq(2);
     });
 
     it('should remove the theme Hummingbird', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'removeThemeHummingbird1', baseContext);
 
       const result = await themeAndLogoPage.removeTheme(page, 'hummingbird');
-      await expect(result).to.eq(themeAndLogoPage.successfulDeleteMessage);
+      expect(result).to.eq(themeAndLogoPage.successfulDeleteMessage);
 
       const numThemes = await themeAndLogoPage.getNumberOfThemes(page);
-      await expect(numThemes).to.eq(1);
+      expect(numThemes).to.eq(1);
     });
   });
 
@@ -105,7 +105,7 @@ describe('BO - Design - Theme & Logo : Add new theme', async () => {
       await themeAndLogoPage.goToNewThemePage(page);
 
       const pageTitle = await themeImportPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(themeImportPage.pageTitle);
+      expect(pageTitle).to.contains(themeImportPage.pageTitle);
     });
 
     it('should import from the web the Hummingbird theme', async function () {
@@ -114,20 +114,20 @@ describe('BO - Design - Theme & Logo : Add new theme', async () => {
       await themeImportPage.importFromWeb(page, urlTheme);
 
       const pageTitle = await themeAndLogoPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(themeAndLogoPage.pageTitle);
+      expect(pageTitle).to.contains(themeAndLogoPage.pageTitle);
 
       const numThemes = await themeAndLogoPage.getNumberOfThemes(page);
-      await expect(numThemes).to.eq(2);
+      expect(numThemes).to.eq(2);
     });
 
     it('should remove the theme Hummingbird', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'removeThemeHummingbird2', baseContext);
 
       const result = await themeAndLogoPage.removeTheme(page, 'hummingbird');
-      await expect(result).to.eq(themeAndLogoPage.successfulDeleteMessage);
+      expect(result).to.eq(themeAndLogoPage.successfulDeleteMessage);
 
       const numThemes = await themeAndLogoPage.getNumberOfThemes(page);
-      await expect(numThemes).to.eq(1);
+      expect(numThemes).to.eq(1);
     });
   });
 
@@ -140,7 +140,7 @@ describe('BO - Design - Theme & Logo : Add new theme', async () => {
       await themeAndLogoPage.goToNewThemePage(page);
 
       const pageTitle = await themeImportPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(themeImportPage.pageTitle);
+      expect(pageTitle).to.contains(themeImportPage.pageTitle);
     });
 
     it('should import from FTP', async function () {
@@ -149,20 +149,20 @@ describe('BO - Design - Theme & Logo : Add new theme', async () => {
       await themeImportPage.importFromFTP(page, 'theme.zip');
 
       const pageTitle = await themeAndLogoPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(themeAndLogoPage.pageTitle);
+      expect(pageTitle).to.contains(themeAndLogoPage.pageTitle);
 
       const numThemes = await themeAndLogoPage.getNumberOfThemes(page);
-      await expect(numThemes).to.eq(2);
+      expect(numThemes).to.eq(2);
     });
 
     it('should remove the theme Hummingbird', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'removeThemeHummingbird3', baseContext);
 
       const result = await themeAndLogoPage.removeTheme(page, 'hummingbird');
-      await expect(result).to.eq(themeAndLogoPage.successfulDeleteMessage);
+      expect(result).to.eq(themeAndLogoPage.successfulDeleteMessage);
 
       const numThemes = await themeAndLogoPage.getNumberOfThemes(page);
-      await expect(numThemes).to.eq(1);
+      expect(numThemes).to.eq(1);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/08_design/01_themeAndLogo/02_pagesConfiguration/01_enableDisableModule.ts b/tests/UI/campaigns/functional/BO/08_design/01_themeAndLogo/02_pagesConfiguration/01_enableDisableModule.ts
index ed44aca47509d..33804043be2e6 100644
--- a/tests/UI/campaigns/functional/BO/08_design/01_themeAndLogo/02_pagesConfiguration/01_enableDisableModule.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/01_themeAndLogo/02_pagesConfiguration/01_enableDisableModule.ts
@@ -47,7 +47,7 @@ describe('BO - Design - Theme & Logo : Enable/disable module', async () => {
     await themeAndLogoPage.closeSfToolBar(page);
 
     const pageTitle = await themeAndLogoPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(themeAndLogoPage.pageTitle);
+    expect(pageTitle).to.contains(themeAndLogoPage.pageTitle);
   });
 
   it('should go to \'Pages configuration\' page', async function () {
@@ -56,7 +56,7 @@ describe('BO - Design - Theme & Logo : Enable/disable module', async () => {
     await themeAndLogoPage.goToSubTabPagesConfiguration(page);
 
     const pageTitle = await pagesConfigurationPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(pagesConfigurationPage.pageTitle);
+    expect(pageTitle).to.contains(pagesConfigurationPage.pageTitle);
   });
 
   [
@@ -77,7 +77,7 @@ describe('BO - Design - Theme & Logo : Enable/disable module', async () => {
       await testContext.addContextItem(this, 'testIdentifier', test.args.action, baseContext);
 
       const successMessage = await pagesConfigurationPage.setActionInModule(page, Modules.mainMenu, test.args.action);
-      await expect(successMessage).to.eq(pagesConfigurationPage.successMessage);
+      expect(successMessage).to.eq(pagesConfigurationPage.successMessage);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/08_design/01_themeAndLogo/02_pagesConfiguration/02_resetModule.ts b/tests/UI/campaigns/functional/BO/08_design/01_themeAndLogo/02_pagesConfiguration/02_resetModule.ts
index 57623530f521f..0fd4f0a24203c 100644
--- a/tests/UI/campaigns/functional/BO/08_design/01_themeAndLogo/02_pagesConfiguration/02_resetModule.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/01_themeAndLogo/02_pagesConfiguration/02_resetModule.ts
@@ -47,7 +47,7 @@ describe('BO - Design - Theme & Logo : Reset module', async () => {
     await themeAndLogoPage.closeSfToolBar(page);
 
     const pageTitle = await themeAndLogoPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(themeAndLogoPage.pageTitle);
+    expect(pageTitle).to.contains(themeAndLogoPage.pageTitle);
   });
 
   it('should go to \'Pages configuration\' page', async function () {
@@ -56,13 +56,13 @@ describe('BO - Design - Theme & Logo : Reset module', async () => {
     await themeAndLogoPage.goToSubTabPagesConfiguration(page);
 
     const pageTitle = await pagesConfigurationPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(pagesConfigurationPage.pageTitle);
+    expect(pageTitle).to.contains(pagesConfigurationPage.pageTitle);
   });
 
   it('should reset the module', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetModule', baseContext);
 
     const successMessage = await pagesConfigurationPage.setActionInModule(page, Modules.mainMenu, 'reset');
-    await expect(successMessage).to.eq(pagesConfigurationPage.successMessage);
+    expect(successMessage).to.eq(pagesConfigurationPage.successMessage);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/08_design/01_themeAndLogo/02_pagesConfiguration/03_installUninstallModule.ts b/tests/UI/campaigns/functional/BO/08_design/01_themeAndLogo/02_pagesConfiguration/03_installUninstallModule.ts
index ce9a31776879b..20b570744afed 100644
--- a/tests/UI/campaigns/functional/BO/08_design/01_themeAndLogo/02_pagesConfiguration/03_installUninstallModule.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/01_themeAndLogo/02_pagesConfiguration/03_installUninstallModule.ts
@@ -47,7 +47,7 @@ describe('BO - Design - Theme & Logo : Install/Uninstall module', async () => {
     await themeAndLogoPage.closeSfToolBar(page);
 
     const pageTitle = await themeAndLogoPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(themeAndLogoPage.pageTitle);
+    expect(pageTitle).to.contains(themeAndLogoPage.pageTitle);
   });
 
   it('should go to \'Pages configuration\' page', async function () {
@@ -56,20 +56,20 @@ describe('BO - Design - Theme & Logo : Install/Uninstall module', async () => {
     await themeAndLogoPage.goToSubTabPagesConfiguration(page);
 
     const pageTitle = await pagesConfigurationPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(pagesConfigurationPage.pageTitle);
+    expect(pageTitle).to.contains(pagesConfigurationPage.pageTitle);
   });
 
   it('should uninstall the module', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'uninstallModule', baseContext);
 
     const successMessage = await pagesConfigurationPage.setActionInModule(page, Modules.mainMenu, 'uninstall');
-    await expect(successMessage).to.eq(pagesConfigurationPage.successMessage);
+    expect(successMessage).to.eq(pagesConfigurationPage.successMessage);
   });
 
   it('should install the module', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'installModule', baseContext);
 
     const successMessage = await pagesConfigurationPage.setActionInModule(page, Modules.mainMenu, 'install');
-    await expect(successMessage).to.eq(pagesConfigurationPage.successMessage);
+    expect(successMessage).to.eq(pagesConfigurationPage.successMessage);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/08_design/01_themeAndLogo/03_advancedCustomization/01_advancedCustomization.ts b/tests/UI/campaigns/functional/BO/08_design/01_themeAndLogo/03_advancedCustomization/01_advancedCustomization.ts
index 6772c38a19dbf..091fb30f3abdf 100644
--- a/tests/UI/campaigns/functional/BO/08_design/01_themeAndLogo/03_advancedCustomization/01_advancedCustomization.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/01_themeAndLogo/03_advancedCustomization/01_advancedCustomization.ts
@@ -73,14 +73,14 @@ describe('BO - Design - Theme & Logo - Advanced Customization', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'searchForModule', baseContext);
 
       const isModuleVisible = await moduleManagerPage.searchModule(page, Modules.themeCustomization);
-      await expect(isModuleVisible, `The module ${Modules.themeCustomization.name} is not installed`).to.be.true;
+      expect(isModuleVisible, `The module ${Modules.themeCustomization.name} is not installed`).to.eq(true);
     });
 
     it(`should check the status of the module ${Modules.themeCustomization.name}`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkStatusModule', baseContext);
 
       const isModuleEnabled = await moduleManagerPage.isModuleStatus(page, Modules.themeCustomization.name, 'enable');
-      await expect(isModuleEnabled, `The module ${Modules.themeCustomization.name} is disabled`).to.be.true;
+      expect(isModuleEnabled, `The module ${Modules.themeCustomization.name} is disabled`).to.eq(true);
     });
   });
 
@@ -97,7 +97,7 @@ describe('BO - Design - Theme & Logo - Advanced Customization', async () => {
       await themeAndLogoPage.closeSfToolBar(page);
 
       const pageTitle = await themeAndLogoPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(themeAndLogoPage.pageTitle);
+      expect(pageTitle).to.contains(themeAndLogoPage.pageTitle);
     });
 
     it('should go to \'Advanced Customization\' page', async function () {
@@ -106,7 +106,7 @@ describe('BO - Design - Theme & Logo - Advanced Customization', async () => {
       await themeAndLogoPage.goToSubTabAdvancedCustomization(page);
 
       const pageTitle = await advancedCustomizationPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(advancedCustomizationPage.pageTitle);
+      expect(pageTitle).to.contains(advancedCustomizationPage.pageTitle);
     });
 
     it('should download theme', async function () {
@@ -115,14 +115,14 @@ describe('BO - Design - Theme & Logo - Advanced Customization', async () => {
       filePath = await advancedCustomizationPage.downloadTheme(page);
 
       const exist = await files.doesFileExist(filePath);
-      await expect(exist, 'Theme was not downloaded').to.be.true;
+      expect(exist, 'Theme was not downloaded').to.eq(true);
     });
 
     it('should click on upload child theme button', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnUploadChildTheme', baseContext);
 
       const modalTitle = await advancedCustomizationPage.clickOnUploadChildThemeButton(page);
-      await expect(modalTitle, 'Modal \'Upload child theme\' is not displayed')
+      expect(modalTitle, 'Modal \'Upload child theme\' is not displayed')
         .to.contains('Drop your child theme archive here or select file');
     });
 
@@ -132,7 +132,7 @@ describe('BO - Design - Theme & Logo - Advanced Customization', async () => {
       await files.renameFile(filePath, renamedFilePath);
 
       const uploadTheme = await advancedCustomizationPage.uploadTheme(page, renamedFilePath);
-      await expect(uploadTheme, 'Child theme is not uploaded')
+      expect(uploadTheme, 'Child theme is not uploaded')
         .to.contains('The child theme has been added successfully.');
     });
 
@@ -140,7 +140,7 @@ describe('BO - Design - Theme & Logo - Advanced Customization', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'closeModal', baseContext);
 
       const isModalClosed = await advancedCustomizationPage.closeModal(page);
-      await expect(isModalClosed, 'Modal not closed').to.be.true;
+      expect(isModalClosed, 'Modal not closed').to.eq(true);
     });
 
     // remove the child_classic.zip from themes folder
@@ -152,7 +152,7 @@ describe('BO - Design - Theme & Logo - Advanced Customization', async () => {
       await files.deleteFile(generatedFilePath);
 
       const doesFileExist = await files.doesFileExist(generatedFilePath);
-      await expect(doesFileExist).to.be.false;
+      expect(doesFileExist).to.eq(false);
     });
 
     it('should remove the zip file of the child theme from the temporary path', async function () {
@@ -162,7 +162,7 @@ describe('BO - Design - Theme & Logo - Advanced Customization', async () => {
       await files.deleteFile(renamedFilePath);
 
       const doesFileExist = await files.doesFileExist(renamedFilePath);
-      await expect(doesFileExist).to.be.false;
+      expect(doesFileExist).to.eq(false);
     });
   });
 
@@ -179,14 +179,14 @@ describe('BO - Design - Theme & Logo - Advanced Customization', async () => {
       await themeAndLogoPage.closeSfToolBar(page);
 
       const pageTitle = await themeAndLogoPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(themeAndLogoPage.pageTitle);
+      expect(pageTitle).to.contains(themeAndLogoPage.pageTitle);
     });
 
     it('should use the child theme', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'useChildTheme', baseContext);
 
       const successResult = await themeAndLogoPage.useTheme(page);
-      await expect(successResult).to.be.equal(themeAndLogoPage.successfulUpdateMessage);
+      expect(successResult).to.be.equal(themeAndLogoPage.successfulUpdateMessage);
     });
 
     it('should click on view my shop', async function () {
@@ -196,7 +196,7 @@ describe('BO - Design - Theme & Logo - Advanced Customization', async () => {
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should close the current page', async function () {
@@ -205,7 +205,7 @@ describe('BO - Design - Theme & Logo - Advanced Customization', async () => {
       page = await homePage.closePage(browserContext, page, 0);
 
       const pageTitle = await themeAndLogoPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(themeAndLogoPage.pageTitle);
+      expect(pageTitle).to.contains(themeAndLogoPage.pageTitle);
     });
   });
 
@@ -215,14 +215,14 @@ describe('BO - Design - Theme & Logo - Advanced Customization', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'useClassicTheme', baseContext);
 
       const successResult = await themeAndLogoPage.useTheme(page);
-      await expect(successResult).to.be.equal(themeAndLogoPage.successfulUpdateMessage);
+      expect(successResult).to.be.equal(themeAndLogoPage.successfulUpdateMessage);
     });
 
     it('should delete the child theme', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteChildTheme', baseContext);
 
       const successResult = await themeAndLogoPage.deleteTheme(page);
-      await expect(successResult).to.be.equal(themeAndLogoPage.successfulDeleteMessage);
+      expect(successResult).to.be.equal(themeAndLogoPage.successfulDeleteMessage);
     });
   });
 
@@ -234,7 +234,7 @@ describe('BO - Design - Theme & Logo - Advanced Customization', async () => {
       await themeAndLogoPage.goToSubTabAdvancedCustomization(page);
 
       const pageTitle = await advancedCustomizationPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(advancedCustomizationPage.pageTitle);
+      expect(pageTitle).to.contains(advancedCustomizationPage.pageTitle);
     });
 
     it('should get the How to use parents/child themes link', async function () {
@@ -242,7 +242,7 @@ describe('BO - Design - Theme & Logo - Advanced Customization', async () => {
         .addContextItem(this, 'testIdentifier', 'getHowToUseParentsChildThemesLink', baseContext);
 
       const linkParentChildPage = await advancedCustomizationPage.getHowToUseParentsChildThemesLink(page);
-      await expect(linkParentChildPage)
+      expect(linkParentChildPage)
         .to
         .contains('https://devdocs.prestashop.com/1.7/themes/reference/template_inheritance/parent_child_feature/');
     });
diff --git a/tests/UI/campaigns/functional/BO/08_design/03_emailTheme/01_previewEmailThemes.ts b/tests/UI/campaigns/functional/BO/08_design/03_emailTheme/01_previewEmailThemes.ts
index 96fe1047c19b4..fdf9302e21968 100644
--- a/tests/UI/campaigns/functional/BO/08_design/03_emailTheme/01_previewEmailThemes.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/03_emailTheme/01_previewEmailThemes.ts
@@ -44,7 +44,7 @@ describe('BO - Design - Email Theme : Preview email theme', async () => {
     await emailThemesPage.closeSfToolBar(page);
 
     const pageTitle = await emailThemesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(emailThemesPage.pageTitle);
+    expect(pageTitle).to.contains(emailThemesPage.pageTitle);
   });
 
   describe('Preview email theme', async () => {
@@ -63,7 +63,7 @@ describe('BO - Design - Email Theme : Preview email theme', async () => {
         await emailThemesPage.previewEmailTheme(page, test.args.emailThemeName);
 
         const pageTitle = await previewEmailThemesPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(
+        expect(pageTitle).to.contains(
           `${previewEmailThemesPage.pageTitle} ${test.args.emailThemeName}`,
         );
       });
@@ -77,7 +77,7 @@ describe('BO - Design - Email Theme : Preview email theme', async () => {
         );
 
         const numberOfLayouts = await previewEmailThemesPage.getNumberOfLayoutInGrid(page);
-        await expect(numberOfLayouts).to.equal(test.args.numberOfLayouts);
+        expect(numberOfLayouts).to.equal(test.args.numberOfLayouts);
       });
 
       it('should go back to email themes page', async function () {
@@ -91,7 +91,7 @@ describe('BO - Design - Email Theme : Preview email theme', async () => {
         await previewEmailThemesPage.goBackToEmailThemesPage(page);
 
         const pageTitle = await emailThemesPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(emailThemesPage.pageTitle);
+        expect(pageTitle).to.contains(emailThemesPage.pageTitle);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/08_design/03_emailTheme/02_selectDefaultEmailTheme.ts b/tests/UI/campaigns/functional/BO/08_design/03_emailTheme/02_selectDefaultEmailTheme.ts
index c7fff4ca4d340..68ca42a1bd948 100644
--- a/tests/UI/campaigns/functional/BO/08_design/03_emailTheme/02_selectDefaultEmailTheme.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/03_emailTheme/02_selectDefaultEmailTheme.ts
@@ -43,7 +43,7 @@ describe('BO - Design - Email Theme : Select default email theme', async () => {
     await emailThemesPage.closeSfToolBar(page);
 
     const pageTitle = await emailThemesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(emailThemesPage.pageTitle);
+    expect(pageTitle).to.contains(emailThemesPage.pageTitle);
   });
 
   ['classic', 'modern'].forEach((emailTheme: string) => {
@@ -56,7 +56,7 @@ describe('BO - Design - Email Theme : Select default email theme', async () => {
       );
 
       const textMessage = await emailThemesPage.selectDefaultEmailTheme(page, emailTheme);
-      await expect(textMessage).to.contains(emailThemesPage.emailThemeConfigurationSuccessfulMessage);
+      expect(textMessage).to.contains(emailThemesPage.emailThemeConfigurationSuccessfulMessage);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/08_design/03_emailTheme/03_viewRawHtmlAndText.ts b/tests/UI/campaigns/functional/BO/08_design/03_emailTheme/03_viewRawHtmlAndText.ts
index 061775302c76e..441cc0af35378 100644
--- a/tests/UI/campaigns/functional/BO/08_design/03_emailTheme/03_viewRawHtmlAndText.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/03_emailTheme/03_viewRawHtmlAndText.ts
@@ -53,7 +53,7 @@ describe('BO - Design - Email Theme : View raw html and text', async () => {
     await emailThemesPage.closeSfToolBar(page);
 
     const pageTitle = await emailThemesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(emailThemesPage.pageTitle);
+    expect(pageTitle).to.contains(emailThemesPage.pageTitle);
   });
 
   it('should preview classic email theme', async function () {
@@ -62,7 +62,7 @@ describe('BO - Design - Email Theme : View raw html and text', async () => {
     await emailThemesPage.previewEmailTheme(page, emailThemeName);
 
     const pageTitle = await previewEmailThemesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(
+    expect(pageTitle).to.contains(
       `${previewEmailThemesPage.pageTitle} ${emailThemeName}`,
     );
   });
@@ -72,7 +72,7 @@ describe('BO - Design - Email Theme : View raw html and text', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'viewRawHtml', baseContext);
 
       newPage = await previewEmailThemesPage.viewRawHtml(page, 1);
-      await expect(newPage.url())
+      expect(newPage.url())
         .to.contain(emailThemeName)
         .and.to.contain('raw')
         .and.to.contain('.html');
@@ -82,7 +82,7 @@ describe('BO - Design - Email Theme : View raw html and text', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'checkRawHtmlText', baseContext);
 
       const pageText = await previewEmailThemesPage.getTextFromViewLayoutPage(newPage);
-      await expect(pageText)
+      expect(pageText)
         .to.contain(global.FO.URL)
         .and.to.contain('<html')
         .and.to.contain('<body')
@@ -98,7 +98,7 @@ describe('BO - Design - Email Theme : View raw html and text', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'viewRawText', baseContext);
 
       newPage = await previewEmailThemesPage.viewRawText(page, 1);
-      await expect(newPage.url())
+      expect(newPage.url())
         .to.contain(emailThemeName)
         .and.to.contain('raw')
         .and.to.contain('.txt');
@@ -108,7 +108,7 @@ describe('BO - Design - Email Theme : View raw html and text', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'checkRawTextPage', baseContext);
 
       const pageText = await previewEmailThemesPage.getTextFromViewLayoutPage(newPage);
-      await expect(pageText)
+      expect(pageText)
         .to.contain(global.FO.URL)
         .and.to.contain('Hi');
     });
diff --git a/tests/UI/campaigns/functional/BO/08_design/04_pages/01_CRUDPageCategory.ts b/tests/UI/campaigns/functional/BO/08_design/04_pages/01_CRUDPageCategory.ts
index df3fddac8c57b..add3e30c46b4d 100644
--- a/tests/UI/campaigns/functional/BO/08_design/04_pages/01_CRUDPageCategory.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/04_pages/01_CRUDPageCategory.ts
@@ -74,14 +74,14 @@ describe('BO - Design - Pages : CRUD category and page', async () => {
     await pagesPage.closeSfToolBar(page);
 
     const pageTitle = await pagesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(pagesPage.pageTitle);
+    expect(pageTitle).to.contains(pagesPage.pageTitle);
   });
 
   it('should reset all filters and get number of categories in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfCategories = await pagesPage.resetAndGetNumberOfLines(page, categoriesTableName);
-    if (numberOfCategories !== 0) await expect(numberOfCategories).to.be.above(0);
+    if (numberOfCategories !== 0) expect(numberOfCategories).to.be.above(0);
   });
 
   // 1 : Create category then go to FO to check it
@@ -92,14 +92,14 @@ describe('BO - Design - Pages : CRUD category and page', async () => {
       await pagesPage.goToAddNewPageCategory(page);
 
       const pageTitle = await addPageCategoryPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addPageCategoryPage.pageTitleCreate);
+      expect(pageTitle).to.contains(addPageCategoryPage.pageTitleCreate);
     });
 
     it('should create category ', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'CreatePageCategory', baseContext);
 
       const textResult = await addPageCategoryPage.createEditPageCategory(page, createCategoryData);
-      await expect(textResult).to.equal(pagesPage.successfulCreationMessage);
+      expect(textResult).to.equal(pagesPage.successfulCreationMessage);
     });
 
     it('should go back to categories', async function () {
@@ -108,7 +108,7 @@ describe('BO - Design - Pages : CRUD category and page', async () => {
       await pagesPage.backToList(page);
 
       const pageTitle = await pagesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(pagesPage.pageTitle);
+      expect(pageTitle).to.contains(pagesPage.pageTitle);
     });
 
     it('should check the categories number', async function () {
@@ -118,7 +118,7 @@ describe('BO - Design - Pages : CRUD category and page', async () => {
         page,
         categoriesTableName,
       );
-      await expect(numberOfCategoriesAfterCreation).to.be.equal(numberOfCategories + 1);
+      expect(numberOfCategoriesAfterCreation).to.be.equal(numberOfCategories + 1);
     });
 
     it('should search for the new category and check result', async function () {
@@ -127,7 +127,7 @@ describe('BO - Design - Pages : CRUD category and page', async () => {
       await pagesPage.filterTable(page, categoriesTableName, 'input', 'name', createCategoryData.name);
 
       const textColumn = await pagesPage.getTextColumnFromTableCmsPageCategory(page, 1, 'name');
-      await expect(textColumn).to.contains(createCategoryData.name);
+      expect(textColumn).to.contains(createCategoryData.name);
 
       // Get category ID
       categoryID = parseInt(
@@ -144,7 +144,7 @@ describe('BO - Design - Pages : CRUD category and page', async () => {
       await foHomePage.changeLanguage(page, 'en');
 
       const pageTitle = await foHomePage.getPageTitle(page);
-      await expect(pageTitle).to.equal(foHomePage.pageTitle);
+      expect(pageTitle).to.equal(foHomePage.pageTitle);
     });
 
     it('should go to \'Sitemap\' page', async function () {
@@ -153,14 +153,14 @@ describe('BO - Design - Pages : CRUD category and page', async () => {
       await foHomePage.goToFooterLink(page, 'Sitemap');
 
       const pageTitle = await siteMapPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(siteMapPage.pageTitle);
+      expect(pageTitle).to.equal(siteMapPage.pageTitle);
     });
 
     it('should check the created category', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkCreatedCategoryFO1', baseContext);
 
       const pageCategoryName = await siteMapPage.getPageCategoryName(page, categoryID);
-      await expect(pageCategoryName).to.contains(createCategoryData.name);
+      expect(pageCategoryName).to.contains(createCategoryData.name);
     });
 
     it('should go back to BO', async function () {
@@ -169,7 +169,7 @@ describe('BO - Design - Pages : CRUD category and page', async () => {
       page = await siteMapPage.closePage(browserContext, page, 0);
 
       const pageTitle = await pagesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(pagesPage.pageTitle);
+      expect(pageTitle).to.contains(pagesPage.pageTitle);
     });
   });
 
@@ -181,14 +181,14 @@ describe('BO - Design - Pages : CRUD category and page', async () => {
       await pagesPage.viewCategory(page, 1);
 
       const pageTitle = await pagesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(pagesPage.pageTitle);
+      expect(pageTitle).to.contains(pagesPage.pageTitle);
     });
 
     it('should get the pages number', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkNumberOfPages', baseContext);
 
       numberOfPages = await pagesPage.getNumberOfElementInGrid(page, pagesTableName);
-      await expect(numberOfPages).to.equal(0);
+      expect(numberOfPages).to.equal(0);
     });
 
     it('should go to add new page', async function () {
@@ -197,14 +197,14 @@ describe('BO - Design - Pages : CRUD category and page', async () => {
       await pagesPage.goToAddNewPage(page);
 
       const pageTitle = await addPagePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addPagePage.pageTitleCreate);
+      expect(pageTitle).to.contains(addPagePage.pageTitleCreate);
     });
 
     it('should create page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createPage', baseContext);
 
       const textResult = await addPagePage.createEditPage(page, createPageData);
-      await expect(textResult).to.equal(pagesPage.successfulCreationMessage);
+      expect(textResult).to.equal(pagesPage.successfulCreationMessage);
     });
 
     it('should search for the created page and check result', async function () {
@@ -213,7 +213,7 @@ describe('BO - Design - Pages : CRUD category and page', async () => {
       await pagesPage.filterTable(page, pagesTableName, 'input', 'meta_title', createPageData.title);
 
       const textColumn = await pagesPage.getTextColumnFromTableCmsPage(page, 1, 'meta_title');
-      await expect(textColumn).to.contains(createPageData.title);
+      expect(textColumn).to.contains(createPageData.title);
     });
 
     it('should go to edit page', async function () {
@@ -222,7 +222,7 @@ describe('BO - Design - Pages : CRUD category and page', async () => {
       await pagesPage.goToEditPage(page, 1);
 
       const pageTitle = await addPagePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addPagePage.editPageTitle(createPageData.title));
+      expect(pageTitle).to.contains(addPagePage.editPageTitle(createPageData.title));
     });
 
     it('should preview the page in FO', async function () {
@@ -231,13 +231,13 @@ describe('BO - Design - Pages : CRUD category and page', async () => {
       page = await addPagePage.previewPage(page);
 
       const pageTitle = await cmsPage.getTextContent(page, cmsPage.pageTitle);
-      await expect(pageTitle).to.contains(createPageData.title);
+      expect(pageTitle).to.contains(createPageData.title);
 
       const metaTitle = await cmsPage.getPageTitle(page);
-      await expect(metaTitle).to.equal(createPageData.metaTitle);
+      expect(metaTitle).to.equal(createPageData.metaTitle);
 
       const pageContent = await cmsPage.getTextContent(page, cmsPage.pageContent);
-      await expect(pageContent).to.include(createPageData.content);
+      expect(pageContent).to.include(createPageData.content);
     });
 
     it('should go back to BO', async function () {
@@ -246,7 +246,7 @@ describe('BO - Design - Pages : CRUD category and page', async () => {
       page = await cmsPage.closePage(browserContext, page, 0);
 
       const pageTitle = await addPagePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addPagePage.editPageTitle(createPageData.title));
+      expect(pageTitle).to.contains(addPagePage.editPageTitle(createPageData.title));
     });
 
     it('should click on cancel button', async function () {
@@ -255,7 +255,7 @@ describe('BO - Design - Pages : CRUD category and page', async () => {
       await addPagePage.cancelPage(page);
 
       const pageTitle = await pagesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(pagesPage.pageTitle);
+      expect(pageTitle).to.contains(pagesPage.pageTitle);
     });
   });
 
@@ -267,7 +267,7 @@ describe('BO - Design - Pages : CRUD category and page', async () => {
       await pagesPage.filterTable(page, categoriesTableName, 'input', 'name', createCategoryData.name);
 
       const textColumn = await pagesPage.getTextColumnFromTableCmsPageCategory(page, 1, 'name');
-      await expect(textColumn).to.contains(createCategoryData.name);
+      expect(textColumn).to.contains(createCategoryData.name);
     });
 
     it('should go to edit category page', async function () {
@@ -276,14 +276,14 @@ describe('BO - Design - Pages : CRUD category and page', async () => {
       await pagesPage.goToEditCategoryPage(page, 1);
 
       const pageTitle = await addPageCategoryPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addPageCategoryPage.pageTitleEdit);
+      expect(pageTitle).to.contains(addPageCategoryPage.pageTitleEdit);
     });
 
     it('should update the created page category', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'UpdateCategory', baseContext);
 
       const textResult = await addPageCategoryPage.createEditPageCategory(page, editCategoryData);
-      await expect(textResult).to.equal(addPageCategoryPage.successfulUpdateMessage);
+      expect(textResult).to.equal(addPageCategoryPage.successfulUpdateMessage);
     });
 
     it('should go back to categories list', async function () {
@@ -292,7 +292,7 @@ describe('BO - Design - Pages : CRUD category and page', async () => {
       await pagesPage.backToList(page);
 
       const pageTitle = await pagesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(pagesPage.pageTitle);
+      expect(pageTitle).to.contains(pagesPage.pageTitle);
     });
 
     it('should search for the updated category and check result', async function () {
@@ -301,7 +301,7 @@ describe('BO - Design - Pages : CRUD category and page', async () => {
       await pagesPage.filterTable(page, categoriesTableName, 'input', 'name', editCategoryData.name);
 
       const textColumn = await pagesPage.getTextColumnFromTableCmsPageCategory(page, 1, 'name');
-      await expect(textColumn).to.contains(editCategoryData.name);
+      expect(textColumn).to.contains(editCategoryData.name);
 
       categoryID = parseInt(
         await pagesPage.getTextColumnFromTableCmsPageCategory(page, 1, 'id_cms_category'),
@@ -316,7 +316,7 @@ describe('BO - Design - Pages : CRUD category and page', async () => {
       await foHomePage.changeLanguage(page, 'en');
 
       const pageTitle = await foHomePage.getPageTitle(page);
-      await expect(pageTitle).to.equal(foHomePage.pageTitle);
+      expect(pageTitle).to.equal(foHomePage.pageTitle);
     });
 
     it('should go to \'Sitemap\' page', async function () {
@@ -325,14 +325,14 @@ describe('BO - Design - Pages : CRUD category and page', async () => {
       await foHomePage.goToFooterLink(page, 'Sitemap');
 
       const pageTitle = await siteMapPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(siteMapPage.pageTitle);
+      expect(pageTitle).to.equal(siteMapPage.pageTitle);
     });
 
     it('should check the updated category', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkUpdatedCategoryFO2', baseContext);
 
       const pageCategoryName = await siteMapPage.getPageCategoryName(page, categoryID);
-      await expect(pageCategoryName).to.contains(editCategoryData.name);
+      expect(pageCategoryName).to.contains(editCategoryData.name);
     });
 
     it('should go back to BO', async function () {
@@ -341,7 +341,7 @@ describe('BO - Design - Pages : CRUD category and page', async () => {
       page = await siteMapPage.closePage(browserContext, page, 0);
 
       const pageTitle = await pagesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(pagesPage.pageTitle);
+      expect(pageTitle).to.contains(pagesPage.pageTitle);
     });
   });
 
@@ -353,7 +353,7 @@ describe('BO - Design - Pages : CRUD category and page', async () => {
       await pagesPage.viewCategory(page, 1);
 
       const pageTitle = await pagesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(pagesPage.pageTitle);
+      expect(pageTitle).to.contains(pagesPage.pageTitle);
     });
 
     it('should search for the created page and check result', async function () {
@@ -362,7 +362,7 @@ describe('BO - Design - Pages : CRUD category and page', async () => {
       await pagesPage.filterTable(page, pagesTableName, 'input', 'meta_title', createPageData.title);
 
       const textColumn = await pagesPage.getTextColumnFromTableCmsPage(page, 1, 'meta_title');
-      await expect(textColumn).to.contains(createPageData.title);
+      expect(textColumn).to.contains(createPageData.title);
     });
 
     it('should go to edit page', async function () {
@@ -371,14 +371,14 @@ describe('BO - Design - Pages : CRUD category and page', async () => {
       await pagesPage.goToEditPage(page, 1);
 
       const pageTitle = await addPagePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addPagePage.editPageTitle(createPageData.title));
+      expect(pageTitle).to.contains(addPagePage.editPageTitle(createPageData.title));
     });
 
     it('should update the created page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updatePage', baseContext);
 
       const textResult = await addPagePage.createEditPage(page, editPageData);
-      await expect(textResult).to.equal(pagesPage.successfulUpdateMessage);
+      expect(textResult).to.equal(pagesPage.successfulUpdateMessage);
     });
 
     it('should search for the updated Page and check result', async function () {
@@ -387,7 +387,7 @@ describe('BO - Design - Pages : CRUD category and page', async () => {
       await pagesPage.filterTable(page, pagesTableName, 'input', 'meta_title', editPageData.title);
 
       const textColumn = await pagesPage.getTextColumnFromTableCmsPage(page, 1, 'meta_title');
-      await expect(textColumn).to.contains(editPageData.title);
+      expect(textColumn).to.contains(editPageData.title);
     });
 
     it('should go to edit page', async function () {
@@ -396,7 +396,7 @@ describe('BO - Design - Pages : CRUD category and page', async () => {
       await pagesPage.goToEditPage(page, 1);
 
       const pageTitle = await addPagePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addPagePage.editPageTitle(editPageData.title));
+      expect(pageTitle).to.contains(addPagePage.editPageTitle(editPageData.title));
     });
 
     it('should click on preview button and check that the page does not exist in FO', async function () {
@@ -405,7 +405,7 @@ describe('BO - Design - Pages : CRUD category and page', async () => {
       page = await addPagePage.previewPage(page);
 
       const pageTitle = await cmsPage.getTextContent(page, cmsPage.pageTitle);
-      await expect(pageTitle).to.include(cmsPage.pageNotFound);
+      expect(pageTitle).to.include(cmsPage.pageNotFound);
     });
 
     it('should go back to BO', async function () {
@@ -414,7 +414,7 @@ describe('BO - Design - Pages : CRUD category and page', async () => {
       page = await cmsPage.closePage(browserContext, page, 0);
 
       const pageTitle = await addPagePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addPagePage.editPageTitle(editPageData.title));
+      expect(pageTitle).to.contains(addPagePage.editPageTitle(editPageData.title));
     });
 
     it('should click on cancel button', async function () {
@@ -423,7 +423,7 @@ describe('BO - Design - Pages : CRUD category and page', async () => {
       await addPagePage.cancelPage(page);
 
       const pageTitle = await pagesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(pagesPage.pageTitle);
+      expect(pageTitle).to.contains(pagesPage.pageTitle);
     });
   });
 
@@ -435,7 +435,7 @@ describe('BO - Design - Pages : CRUD category and page', async () => {
       await pagesPage.viewCategory(page, 1);
 
       const pageTitle = await pagesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(pagesPage.pageTitle);
+      expect(pageTitle).to.contains(pagesPage.pageTitle);
     });
 
     it('should search for the updated page to delete', async function () {
@@ -450,21 +450,21 @@ describe('BO - Design - Pages : CRUD category and page', async () => {
       );
 
       const textColumn = await pagesPage.getTextColumnFromTableCmsPage(page, 1, 'meta_title');
-      await expect(textColumn).to.contains(editPageData.title);
+      expect(textColumn).to.contains(editPageData.title);
     });
 
     it('should delete page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deletePage', baseContext);
 
       const textResult = await pagesPage.deleteRowInTable(page, pagesTableName, 1);
-      await expect(textResult).to.equal(pagesPage.successfulDeleteMessage);
+      expect(textResult).to.equal(pagesPage.successfulDeleteMessage);
     });
 
     it('should reset filter', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterPages', baseContext);
 
       const numberOfPagesAfterDeletion = await pagesPage.resetAndGetNumberOfLines(page, pagesTableName);
-      await expect(numberOfPagesAfterDeletion).to.be.equal(numberOfPages);
+      expect(numberOfPagesAfterDeletion).to.be.equal(numberOfPages);
     });
 
     it('should click on back to list', async function () {
@@ -473,14 +473,14 @@ describe('BO - Design - Pages : CRUD category and page', async () => {
       await pagesPage.backToList(page);
 
       const pageTitle = await pagesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(pagesPage.pageTitle);
+      expect(pageTitle).to.contains(pagesPage.pageTitle);
     });
 
     it('should delete category', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteCategory', baseContext);
 
       const textResult = await pagesPage.deleteRowInTable(page, categoriesTableName, 1);
-      await expect(textResult).to.equal(pagesPage.successfulDeleteMessage);
+      expect(textResult).to.equal(pagesPage.successfulDeleteMessage);
     });
 
     it('should reset filter', async function () {
@@ -490,7 +490,7 @@ describe('BO - Design - Pages : CRUD category and page', async () => {
         page,
         categoriesTableName,
       );
-      await expect(numberOfCategoriesAfterDeletion).to.be.equal(numberOfCategories);
+      expect(numberOfCategoriesAfterDeletion).to.be.equal(numberOfCategories);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/08_design/04_pages/02_helpCard.ts b/tests/UI/campaigns/functional/BO/08_design/04_pages/02_helpCard.ts
index 80cd6844b9048..b4acd415cce12 100644
--- a/tests/UI/campaigns/functional/BO/08_design/04_pages/02_helpCard.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/04_pages/02_helpCard.ts
@@ -43,23 +43,23 @@ describe('BO - Design - Pages : Help card on pages page', async () => {
     await pagesPage.closeSfToolBar(page);
 
     const pageTitle = await pagesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(pagesPage.pageTitle);
+    expect(pageTitle).to.contains(pagesPage.pageTitle);
   });
 
   it('should open the help side bar and check the document language', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'openHelpSidebar', baseContext);
 
     const isHelpSidebarVisible = await pagesPage.openHelpSideBar(page);
-    await expect(isHelpSidebarVisible).to.be.true;
+    expect(isHelpSidebarVisible).to.eq(true);
 
     const documentURL = await pagesPage.getHelpDocumentURL(page);
-    await expect(documentURL).to.contains('country=en');
+    expect(documentURL).to.contains('country=en');
   });
 
   it('should close the help side bar', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'closeHelpSidebar', baseContext);
 
     const isHelpSidebarClosed = await pagesPage.closeHelpSideBar(page);
-    await expect(isHelpSidebarClosed).to.be.true;
+    expect(isHelpSidebarClosed).to.eq(true);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/08_design/04_pages/categories/01_filterAndQuickEditCategories.ts b/tests/UI/campaigns/functional/BO/08_design/04_pages/categories/01_filterAndQuickEditCategories.ts
index d1737a083e92e..941b39f581a0e 100644
--- a/tests/UI/campaigns/functional/BO/08_design/04_pages/categories/01_filterAndQuickEditCategories.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/04_pages/categories/01_filterAndQuickEditCategories.ts
@@ -58,7 +58,7 @@ describe('BO - Design - Pages : Filter and quick edit categories table', async (
     await pagesPage.closeSfToolBar(page);
 
     const pageTitle = await pagesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(pagesPage.pageTitle);
+    expect(pageTitle).to.contains(pagesPage.pageTitle);
   });
 
   // 1 : Create two categories and filter with all inputs and selects in grid table
@@ -70,14 +70,14 @@ describe('BO - Design - Pages : Filter and quick edit categories table', async (
         await pagesPage.goToAddNewPageCategory(page);
 
         const pageTitle = await addPageCategoryPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addPageCategoryPage.pageTitleCreate);
+        expect(pageTitle).to.contains(addPageCategoryPage.pageTitleCreate);
       });
 
       it(`should create category n°${index + 1}`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `createCategory${index + 1}`, baseContext);
 
         const textResult = await addPageCategoryPage.createEditPageCategory(page, categoryToCreate);
-        await expect(textResult).to.equal(pagesPage.successfulCreationMessage);
+        expect(textResult).to.equal(pagesPage.successfulCreationMessage);
       });
 
       it('should go back to categories list', async function () {
@@ -86,7 +86,7 @@ describe('BO - Design - Pages : Filter and quick edit categories table', async (
         await pagesPage.backToList(page);
 
         const pageTitle = await pagesPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(pagesPage.pageTitle);
+        expect(pageTitle).to.contains(pagesPage.pageTitle);
       });
     });
   });
@@ -97,7 +97,7 @@ describe('BO - Design - Pages : Filter and quick edit categories table', async (
       await testContext.addContextItem(this, 'testIdentifier', 'resetBeforeFilter', baseContext);
 
       numberOfCategories = await pagesPage.resetAndGetNumberOfLines(page, categoriesTableName);
-      await expect(numberOfCategories).to.be.above(0);
+      expect(numberOfCategories).to.be.above(0);
     });
 
     const tests = [
@@ -155,19 +155,19 @@ describe('BO - Design - Pages : Filter and quick edit categories table', async (
           page,
           categoriesTableName,
         );
-        await expect(numberOfCategoriesAfterFilter).to.be.at.most(numberOfCategories);
+        expect(numberOfCategoriesAfterFilter).to.be.at.most(numberOfCategories);
 
         for (let i = 1; i <= numberOfCategoriesAfterFilter; i++) {
           if (test.args.filterBy === 'active') {
             const categoryStatus = await pagesPage.getStatus(page, categoriesTableName, i);
-            await expect(categoryStatus).to.equal(test.args.filterValue === '1');
+            expect(categoryStatus).to.equal(test.args.filterValue === '1');
           } else {
             const textColumn = await pagesPage.getTextColumnFromTableCmsPageCategory(
               page,
               i,
               test.args.filterBy,
             );
-            await expect(textColumn).to.contains(test.args.filterValue);
+            expect(textColumn).to.contains(test.args.filterValue);
           }
         }
       });
@@ -179,7 +179,7 @@ describe('BO - Design - Pages : Filter and quick edit categories table', async (
           page,
           categoriesTableName,
         );
-        await expect(numberOfCategoriesAfterFilter).to.be.equal(numberOfCategories);
+        expect(numberOfCategoriesAfterFilter).to.be.equal(numberOfCategories);
       });
     });
   });
@@ -192,10 +192,10 @@ describe('BO - Design - Pages : Filter and quick edit categories table', async (
       await pagesPage.filterTable(page, categoriesTableName, 'input', 'name', firstCategoryData.name);
 
       const numberOfCategoriesAfterFilter = await pagesPage.getNumberOfElementInGrid(page, categoriesTableName);
-      await expect(numberOfCategoriesAfterFilter).to.be.at.most(numberOfCategories);
+      expect(numberOfCategoriesAfterFilter).to.be.at.most(numberOfCategories);
 
       const textColumn = await pagesPage.getTextColumnFromTableCmsPageCategory(page, 1, 'name');
-      await expect(textColumn).to.contains(firstCategoryData.name);
+      expect(textColumn).to.contains(firstCategoryData.name);
     });
 
     [
@@ -209,11 +209,11 @@ describe('BO - Design - Pages : Filter and quick edit categories table', async (
 
         if (isActionPerformed) {
           const resultMessage = await pagesPage.getAlertSuccessBlockParagraphContent(page);
-          await expect(resultMessage).to.contains(pagesPage.successfulUpdateStatusMessage);
+          expect(resultMessage).to.contains(pagesPage.successfulUpdateStatusMessage);
         }
 
         const currentStatus = await pagesPage.getStatus(page, categoriesTableName, 1);
-        await expect(currentStatus).to.be.equal(categoryStatus.args.enable);
+        expect(currentStatus).to.be.equal(categoryStatus.args.enable);
       });
 
       it('should reset all filters', async function () {
@@ -225,7 +225,7 @@ describe('BO - Design - Pages : Filter and quick edit categories table', async (
         );
 
         const numberOfCategoriesAfterFilter = await pagesPage.resetAndGetNumberOfLines(page, categoriesTableName);
-        await expect(numberOfCategoriesAfterFilter).to.be.equal(numberOfCategories);
+        expect(numberOfCategoriesAfterFilter).to.be.equal(numberOfCategories);
       });
     });
 
@@ -233,7 +233,7 @@ describe('BO - Design - Pages : Filter and quick edit categories table', async (
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteCategories', baseContext);
 
       const deleteTextResult = await pagesPage.deleteWithBulkActions(page, categoriesTableName);
-      await expect(deleteTextResult).to.be.equal(pagesPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.equal(pagesPage.successfulMultiDeleteMessage);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/08_design/04_pages/categories/02_categoriesBulkActions.ts b/tests/UI/campaigns/functional/BO/08_design/04_pages/categories/02_categoriesBulkActions.ts
index 634e9630d1c3d..aee579acfa97c 100644
--- a/tests/UI/campaigns/functional/BO/08_design/04_pages/categories/02_categoriesBulkActions.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/04_pages/categories/02_categoriesBulkActions.ts
@@ -55,7 +55,7 @@ describe('BO - Design - Pages : Enable/Disable/Delete categories with Bulk Actio
     await pagesPage.closeSfToolBar(page);
 
     const pageTitle = await pagesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(pagesPage.pageTitle);
+    expect(pageTitle).to.contains(pagesPage.pageTitle);
   });
 
   it('should reset filter and get number of categories in BO', async function () {
@@ -64,7 +64,7 @@ describe('BO - Design - Pages : Enable/Disable/Delete categories with Bulk Actio
     numberOfCategories = await pagesPage.resetAndGetNumberOfLines(page, categoriesTableName);
 
     if (numberOfCategories !== 0) {
-      await expect(numberOfCategories).to.be.above(0);
+      expect(numberOfCategories).to.be.above(0);
     }
   });
 
@@ -77,14 +77,14 @@ describe('BO - Design - Pages : Enable/Disable/Delete categories with Bulk Actio
         await pagesPage.goToAddNewPageCategory(page);
 
         const pageTitle = await addPageCategoryPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addPageCategoryPage.pageTitleCreate);
+        expect(pageTitle).to.contains(addPageCategoryPage.pageTitleCreate);
       });
 
       it(`should create category n° ${index + 1}`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `createCategory${index + 1}`, baseContext);
 
         const textResult = await addPageCategoryPage.createEditPageCategory(page, categoryToCreate);
-        await expect(textResult).to.equal(pagesPage.successfulCreationMessage);
+        expect(textResult).to.equal(pagesPage.successfulCreationMessage);
       });
 
       it('should go back to categories list', async function () {
@@ -93,7 +93,7 @@ describe('BO - Design - Pages : Enable/Disable/Delete categories with Bulk Actio
         await pagesPage.backToList(page);
 
         const pageTitle = await pagesPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(pagesPage.pageTitle);
+        expect(pageTitle).to.contains(pagesPage.pageTitle);
       });
     });
   });
@@ -106,7 +106,7 @@ describe('BO - Design - Pages : Enable/Disable/Delete categories with Bulk Actio
       await pagesPage.filterTable(page, categoriesTableName, 'input', 'name', 'todelete');
 
       const textResult = await pagesPage.getTextColumnFromTableCmsPageCategory(page, 1, 'name');
-      await expect(textResult).to.contains('todelete');
+      expect(textResult).to.contains('todelete');
     });
 
     [
@@ -117,7 +117,7 @@ describe('BO - Design - Pages : Enable/Disable/Delete categories with Bulk Actio
         await testContext.addContextItem(this, 'testIdentifier', `${categoryStatus.args.status}Category`, baseContext);
 
         const textResult = await pagesPage.bulkSetStatus(page, categoriesTableName, categoryStatus.args.enable);
-        await expect(textResult).to.be.equal(pagesPage.successfulUpdateStatusMessage);
+        expect(textResult).to.be.equal(pagesPage.successfulUpdateStatusMessage);
 
         const numberOfCategoriesInGrid = await pagesPage.getNumberOfElementInGrid(page, categoriesTableName);
 
@@ -127,7 +127,7 @@ describe('BO - Design - Pages : Enable/Disable/Delete categories with Bulk Actio
             categoriesTableName,
             i,
           );
-          await expect(textColumn).to.equal(categoryStatus.args.enable);
+          expect(textColumn).to.equal(categoryStatus.args.enable);
         }
       });
     });
@@ -141,14 +141,14 @@ describe('BO - Design - Pages : Enable/Disable/Delete categories with Bulk Actio
       await pagesPage.filterTable(page, categoriesTableName, 'input', 'name', 'todelete');
 
       const textResult = await pagesPage.getTextColumnFromTableCmsPageCategory(page, 1, 'name');
-      await expect(textResult).to.contains('todelete');
+      expect(textResult).to.contains('todelete');
     });
 
     it('should delete categories', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteCategories', baseContext);
 
       const deleteTextResult = await pagesPage.deleteWithBulkActions(page, categoriesTableName);
-      await expect(deleteTextResult).to.be.equal(pagesPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.equal(pagesPage.successfulMultiDeleteMessage);
     });
 
     it('should reset all filters', async function () {
@@ -158,7 +158,7 @@ describe('BO - Design - Pages : Enable/Disable/Delete categories with Bulk Actio
         page,
         categoriesTableName,
       );
-      await expect(numberOfCategoriesAfterFilter).to.be.equal(numberOfCategories);
+      expect(numberOfCategoriesAfterFilter).to.be.equal(numberOfCategories);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/08_design/04_pages/categories/03_paginationAndSortCategories.ts b/tests/UI/campaigns/functional/BO/08_design/04_pages/categories/03_paginationAndSortCategories.ts
index 34866cb60febd..f226451b792a2 100644
--- a/tests/UI/campaigns/functional/BO/08_design/04_pages/categories/03_paginationAndSortCategories.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/04_pages/categories/03_paginationAndSortCategories.ts
@@ -58,14 +58,14 @@ describe('BO - Design - Pages : Pagination and sort categories table', async ()
     await pagesPage.closeSfToolBar(page);
 
     const pageTitle = await pagesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(pagesPage.pageTitle);
+    expect(pageTitle).to.contains(pagesPage.pageTitle);
   });
 
   it('should reset all filters and get number of categories in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfCategories = await pagesPage.resetAndGetNumberOfLines(page, categoriesTableName);
-    if (numberOfCategories !== 0) await expect(numberOfCategories).to.be.above(0);
+    if (numberOfCategories !== 0) expect(numberOfCategories).to.be.above(0);
   });
 
   // 1 : Create 11 categories
@@ -80,14 +80,14 @@ describe('BO - Design - Pages : Pagination and sort categories table', async ()
         await pagesPage.goToAddNewPageCategory(page);
 
         const pageTitle = await addPageCategoryPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addPageCategoryPage.pageTitleCreate);
+        expect(pageTitle).to.contains(addPageCategoryPage.pageTitleCreate);
       });
 
       it(`should create category n°${index + 1}`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `CreatePageCategory${index}`, baseContext);
 
         const textResult = await addPageCategoryPage.createEditPageCategory(page, createCategoryData);
-        await expect(textResult).to.equal(pagesPage.successfulCreationMessage);
+        expect(textResult).to.equal(pagesPage.successfulCreationMessage);
       });
 
       it('should go back to categories list', async function () {
@@ -96,7 +96,7 @@ describe('BO - Design - Pages : Pagination and sort categories table', async ()
         await pagesPage.backToList(page);
 
         const pageTitle = await pagesPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(pagesPage.pageTitle);
+        expect(pageTitle).to.contains(pagesPage.pageTitle);
       });
 
       it('should check the categories number', async function () {
@@ -106,7 +106,7 @@ describe('BO - Design - Pages : Pagination and sort categories table', async ()
           page,
           categoriesTableName,
         );
-        await expect(numberOfCategoriesAfterCreation).to.be.equal(numberOfCategories + 1 + index);
+        expect(numberOfCategoriesAfterCreation).to.be.equal(numberOfCategories + 1 + index);
       });
     });
   });
@@ -199,17 +199,17 @@ describe('BO - Design - Pages : Pagination and sort categories table', async ()
           const expectedResult: number[] = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+            expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+            expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
         } else {
           const expectedResult = await basicHelper.sortArray(nonSortedTable);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         }
       });
@@ -224,14 +224,14 @@ describe('BO - Design - Pages : Pagination and sort categories table', async ()
       await pagesPage.filterTable(page, categoriesTableName, 'input', 'name', 'todelete');
 
       const textResult = await pagesPage.getTextColumnFromTableCmsPageCategory(page, 1, 'name');
-      await expect(textResult).to.contains('todelete');
+      expect(textResult).to.contains('todelete');
     });
 
     it('should delete categories', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteCategories', baseContext);
 
       const deleteTextResult = await pagesPage.deleteWithBulkActions(page, categoriesTableName);
-      await expect(deleteTextResult).to.be.equal(pagesPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.equal(pagesPage.successfulMultiDeleteMessage);
     });
 
     it('should reset all filters', async function () {
@@ -241,7 +241,7 @@ describe('BO - Design - Pages : Pagination and sort categories table', async ()
         page,
         categoriesTableName,
       );
-      await expect(numberOfCategoriesAfterFilter).to.be.equal(numberOfCategories);
+      expect(numberOfCategoriesAfterFilter).to.be.equal(numberOfCategories);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/08_design/04_pages/pages/01_filterAndQuickEditPages.ts b/tests/UI/campaigns/functional/BO/08_design/04_pages/pages/01_filterAndQuickEditPages.ts
index e232272b72337..280c3d0d12360 100644
--- a/tests/UI/campaigns/functional/BO/08_design/04_pages/pages/01_filterAndQuickEditPages.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/04_pages/pages/01_filterAndQuickEditPages.ts
@@ -53,14 +53,14 @@ describe('BO - Design - Pages : Filter and quick edit pages table', async () =>
     await pagesPage.closeSfToolBar(page);
 
     const pageTitle = await pagesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(pagesPage.pageTitle);
+    expect(pageTitle).to.contains(pagesPage.pageTitle);
   });
 
   it('should reset all filters and get number of pages in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFiltersFirst', baseContext);
 
     numberOfPages = await pagesPage.resetAndGetNumberOfLines(page, pagesTableName);
-    await expect(numberOfPages).to.be.above(0);
+    expect(numberOfPages).to.be.above(0);
   });
 
   // 1 : Filter pages with all inputs and selects in grid table
@@ -117,15 +117,15 @@ describe('BO - Design - Pages : Filter and quick edit pages table', async () =>
         );
 
         const numberOfPagesAfterFilter = await pagesPage.getNumberOfElementInGrid(page, pagesTableName);
-        await expect(numberOfPagesAfterFilter).to.be.at.most(numberOfPages);
+        expect(numberOfPagesAfterFilter).to.be.at.most(numberOfPages);
 
         for (let i = 1; i <= numberOfPagesAfterFilter; i++) {
           if (test.args.filterBy === 'active') {
             const pagesStatus = await pagesPage.getStatus(page, pagesTableName, i);
-            await expect(pagesStatus).to.equal(test.args.filterValue === '1');
+            expect(pagesStatus).to.equal(test.args.filterValue === '1');
           } else {
             const textColumn = await pagesPage.getTextColumnFromTableCmsPage(page, i, test.args.filterBy);
-            await expect(textColumn).to.contains(test.args.filterValue);
+            expect(textColumn).to.contains(test.args.filterValue);
           }
         }
       });
@@ -134,7 +134,7 @@ describe('BO - Design - Pages : Filter and quick edit pages table', async () =>
         await testContext.addContextItem(this, 'testIdentifier', `reset_${test.args.testIdentifier}`, baseContext);
 
         const numberOfPagesAfterReset = await pagesPage.resetAndGetNumberOfLines(page, pagesTableName);
-        await expect(numberOfPagesAfterReset).to.be.equal(numberOfPages);
+        expect(numberOfPagesAfterReset).to.be.equal(numberOfPages);
       });
     });
   });
@@ -155,13 +155,13 @@ describe('BO - Design - Pages : Filter and quick edit pages table', async () =>
       const numberOfPagesAfterFilter = await pagesPage.getNumberOfElementInGrid(page, pagesTableName);
 
       if (numberOfPages === 0) {
-        await expect(numberOfPagesAfterFilter).to.be.equal(numberOfPages + 1);
+        expect(numberOfPagesAfterFilter).to.be.equal(numberOfPages + 1);
       } else {
-        await expect(numberOfPagesAfterFilter).to.be.at.most(numberOfPages);
+        expect(numberOfPagesAfterFilter).to.be.at.most(numberOfPages);
       }
 
       const textColumn = await pagesPage.getTextColumnFromTableCmsPage(page, 1, 'meta_title');
-      await expect(textColumn).to.contains(CMSPages.termsAndCondition.title);
+      expect(textColumn).to.contains(CMSPages.termsAndCondition.title);
     });
 
     [
@@ -175,11 +175,11 @@ describe('BO - Design - Pages : Filter and quick edit pages table', async () =>
 
         if (isActionPerformed) {
           const resultMessage = await pagesPage.getAlertSuccessBlockParagraphContent(page);
-          await expect(resultMessage).to.contains(pagesPage.successfulUpdateStatusMessage);
+          expect(resultMessage).to.contains(pagesPage.successfulUpdateStatusMessage);
         }
 
         const currentStatus = await pagesPage.getStatus(page, pagesTableName, 1);
-        await expect(currentStatus).to.be.equal(pageStatus.args.enable);
+        expect(currentStatus).to.be.equal(pageStatus.args.enable);
       });
     });
 
@@ -187,7 +187,7 @@ describe('BO - Design - Pages : Filter and quick edit pages table', async () =>
       await testContext.addContextItem(this, 'testIdentifier', 'quickEditReset', baseContext);
 
       const numberOfPagesAfterReset = await pagesPage.resetAndGetNumberOfLines(page, pagesTableName);
-      await expect(numberOfPagesAfterReset).to.be.equal(numberOfPages);
+      expect(numberOfPagesAfterReset).to.be.equal(numberOfPages);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/08_design/04_pages/pages/02_pagesBulkActions.ts b/tests/UI/campaigns/functional/BO/08_design/04_pages/pages/02_pagesBulkActions.ts
index 496aeaed3d455..41ed15c2bebed 100644
--- a/tests/UI/campaigns/functional/BO/08_design/04_pages/pages/02_pagesBulkActions.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/04_pages/pages/02_pagesBulkActions.ts
@@ -56,14 +56,14 @@ describe('BO - Design - Pages : Enable/Disable/Delete pages with Bulk Actions',
     await pagesPage.closeSfToolBar(page);
 
     const pageTitle = await pagesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(pagesPage.pageTitle);
+    expect(pageTitle).to.contains(pagesPage.pageTitle);
   });
 
   it('should reset filter and get number of pages in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFiltersFirst', baseContext);
 
     numberOfPages = await pagesPage.resetAndGetNumberOfLines(page, pagesTable);
-    await expect(numberOfPages).to.be.above(0);
+    expect(numberOfPages).to.be.above(0);
   });
 
   // 1 : Create 2 pages In BO
@@ -75,14 +75,14 @@ describe('BO - Design - Pages : Enable/Disable/Delete pages with Bulk Actions',
         await pagesPage.goToAddNewPage(page);
 
         const pageTitle = await addPagePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addPagePage.pageTitleCreate);
+        expect(pageTitle).to.contains(addPagePage.pageTitleCreate);
       });
 
       it(`should create page n°${index + 1}`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `createPage${index + 1}`, baseContext);
 
         const textResult = await addPagePage.createEditPage(page, pageToCreate);
-        await expect(textResult).to.equal(pagesPage.successfulCreationMessage);
+        expect(textResult).to.equal(pagesPage.successfulCreationMessage);
       });
     });
   });
@@ -95,7 +95,7 @@ describe('BO - Design - Pages : Enable/Disable/Delete pages with Bulk Actions',
       await pagesPage.filterTable(page, pagesTable, 'input', 'meta_title', 'todelete');
 
       const textResult = await pagesPage.getTextColumnFromTableCmsPage(page, 1, 'meta_title');
-      await expect(textResult).to.contains('todelete');
+      expect(textResult).to.contains('todelete');
     });
 
     [
@@ -106,14 +106,14 @@ describe('BO - Design - Pages : Enable/Disable/Delete pages with Bulk Actions',
         await testContext.addContextItem(this, 'testIdentifier', `${pageStatus.args.status}Page`, baseContext);
 
         const textResult = await pagesPage.bulkSetStatus(page, pagesTable, pageStatus.args.enable);
-        await expect(textResult).to.be.equal(pagesPage.successfulUpdateStatusMessage);
+        expect(textResult).to.be.equal(pagesPage.successfulUpdateStatusMessage);
 
         const numberOfPagesInGrid = await pagesPage.getNumberOfElementInGrid(page, pagesTable);
-        await expect(numberOfPagesInGrid).to.be.at.most(numberOfPages);
+        expect(numberOfPagesInGrid).to.be.at.most(numberOfPages);
 
         for (let i = 1; i <= numberOfPagesInGrid; i++) {
           const textColumn = await pagesPage.getStatus(page, pagesTable, i);
-          await expect(textColumn).to.equal(pageStatus.args.enable);
+          expect(textColumn).to.equal(pageStatus.args.enable);
         }
       });
     });
@@ -127,21 +127,21 @@ describe('BO - Design - Pages : Enable/Disable/Delete pages with Bulk Actions',
       await pagesPage.filterTable(page, pagesTable, 'input', 'meta_title', 'todelete');
 
       const textResult = await pagesPage.getTextColumnFromTableCmsPage(page, 1, 'meta_title');
-      await expect(textResult).to.contains('todelete');
+      expect(textResult).to.contains('todelete');
     });
 
     it('should delete pages', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'BulkDelete', baseContext);
 
       const deleteTextResult = await pagesPage.deleteWithBulkActions(page, pagesTable);
-      await expect(deleteTextResult).to.be.equal(pagesPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.equal(pagesPage.successfulMultiDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDelete', baseContext);
 
       const numberOfPagesAfterFilter = await pagesPage.resetAndGetNumberOfLines(page, pagesTable);
-      await expect(numberOfPagesAfterFilter).to.be.equal(numberOfPages);
+      expect(numberOfPagesAfterFilter).to.be.equal(numberOfPages);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/08_design/04_pages/pages/03_pagination.ts b/tests/UI/campaigns/functional/BO/08_design/04_pages/pages/03_pagination.ts
index c36163b45a229..fb5a8b5ec7b63 100644
--- a/tests/UI/campaigns/functional/BO/08_design/04_pages/pages/03_pagination.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/04_pages/pages/03_pagination.ts
@@ -54,7 +54,7 @@ describe('BO - design - Pages : Pagination of Pages table', async () => {
       await pagesPage.closeSfToolBar(page);
 
       const pageTitle = await pagesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(pagesPage.pageTitle);
+      expect(pageTitle).to.contains(pagesPage.pageTitle);
     });
 
     it('should reset all filters and get number of pages in BO', async function () {
@@ -62,7 +62,7 @@ describe('BO - design - Pages : Pagination of Pages table', async () => {
 
       numberOfPages = await pagesPage.resetAndGetNumberOfLines(page, 'cms_page');
       if (numberOfPages !== 0) {
-        await expect(numberOfPages).to.be.above(0);
+        expect(numberOfPages).to.be.above(0);
       }
     });
 
@@ -76,14 +76,14 @@ describe('BO - design - Pages : Pagination of Pages table', async () => {
         await pagesPage.goToAddNewPage(page);
 
         const pageTitle = await addPagePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addPagePage.pageTitleCreate);
+        expect(pageTitle).to.contains(addPagePage.pageTitleCreate);
       });
 
       it(`should create page n°${index + 1}`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `createPage${index}`, baseContext);
 
         const textResult = await addPagePage.createEditPage(page, createPageData);
-        await expect(textResult).to.equal(pagesPage.successfulCreationMessage);
+        expect(textResult).to.equal(pagesPage.successfulCreationMessage);
       });
     });
 
@@ -91,7 +91,7 @@ describe('BO - design - Pages : Pagination of Pages table', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'checkPagesNumber', baseContext);
 
       const numberOfPagesAfterCreation = await pagesPage.getNumberOfElementInGrid(page, 'cms_page');
-      await expect(numberOfPagesAfterCreation).to.be.equal(numberOfPages + 11);
+      expect(numberOfPagesAfterCreation).to.be.equal(numberOfPages + 11);
     });
   });
 
@@ -134,21 +134,21 @@ describe('BO - design - Pages : Pagination of Pages table', async () => {
       await pagesPage.filterTable(page, 'cms_page', 'input', 'meta_title', 'todelete');
 
       const textResult = await pagesPage.getTextColumnFromTableCmsPage(page, 1, 'meta_title');
-      await expect(textResult).to.contains('todelete');
+      expect(textResult).to.contains('todelete');
     });
 
     it('should delete pages', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'BulkDelete', baseContext);
 
       const deleteTextResult = await pagesPage.deleteWithBulkActions(page, 'cms_page');
-      await expect(deleteTextResult).to.be.equal(pagesPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.equal(pagesPage.successfulMultiDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDelete', baseContext);
 
       const numberOfPagesAfterFilter = await pagesPage.resetAndGetNumberOfLines(page, 'cms_page');
-      await expect(numberOfPagesAfterFilter).to.be.equal(numberOfPages);
+      expect(numberOfPagesAfterFilter).to.be.equal(numberOfPages);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/08_design/04_pages/pages/04_sortPages.ts b/tests/UI/campaigns/functional/BO/08_design/04_pages/pages/04_sortPages.ts
index c1b1985d792f9..1df1202a5f25d 100644
--- a/tests/UI/campaigns/functional/BO/08_design/04_pages/pages/04_sortPages.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/04_pages/pages/04_sortPages.ts
@@ -47,7 +47,7 @@ describe('BO - design - Pages : Sort Pages table', async () => {
     await pagesPage.closeSfToolBar(page);
 
     const pageTitle = await pagesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(pagesPage.pageTitle);
+    expect(pageTitle).to.contains(pagesPage.pageTitle);
   });
 
   // Sort pages table
@@ -101,17 +101,17 @@ describe('BO - design - Pages : Sort Pages table', async () => {
           const expectedResult: number[] = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+            expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+            expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
         } else {
           const expectedResult = await basicHelper.sortArray(nonSortedTable);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         }
       });
diff --git a/tests/UI/campaigns/functional/BO/08_design/05_positions/01_filterModule.ts b/tests/UI/campaigns/functional/BO/08_design/05_positions/01_filterModule.ts
index a2b97ba512e71..4bb5c24f1bc6b 100644
--- a/tests/UI/campaigns/functional/BO/08_design/05_positions/01_filterModule.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/05_positions/01_filterModule.ts
@@ -44,7 +44,7 @@ describe('BO - Design - Positions : Filter module', async () => {
     await positionsPage.closeSfToolBar(page);
 
     const pageTitle = await positionsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(positionsPage.pageTitle);
+    expect(pageTitle).to.contains(positionsPage.pageTitle);
   });
 
   it(`should filter by module '${moduleName}' and check the result`, async function () {
@@ -53,7 +53,7 @@ describe('BO - Design - Positions : Filter module', async () => {
     await positionsPage.filterModule(page, moduleName);
 
     const numberOfHooks = await positionsPage.getNumberOfHooks(page);
-    await expect(numberOfHooks).to.eq(5);
+    expect(numberOfHooks).to.eq(5);
   });
 
   const hooks: string[] = [
@@ -68,10 +68,10 @@ describe('BO - Design - Positions : Filter module', async () => {
       await testContext.addContextItem(this, 'testIdentifier', `checkHooks${hook}`, baseContext);
 
       const isVisible = await positionsPage.isHookVisible(page, hook);
-      await expect(isVisible).to.be.true;
+      expect(isVisible).to.eq(true);
 
       const firstModuleName = await positionsPage.getModulesInHook(page, hook);
-      await expect(firstModuleName).to.contain(moduleName);
+      expect(firstModuleName).to.contain(moduleName);
     });
   });
 
@@ -81,6 +81,6 @@ describe('BO - Design - Positions : Filter module', async () => {
     await positionsPage.filterModule(page, 'All modules');
 
     const numberOfHooks = await positionsPage.getNumberOfHooks(page);
-    await expect(numberOfHooks).to.above(5);
+    expect(numberOfHooks).to.above(5);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/08_design/05_positions/02_searchHook.ts b/tests/UI/campaigns/functional/BO/08_design/05_positions/02_searchHook.ts
index 0b67955282dd1..da857d8b8a81f 100644
--- a/tests/UI/campaigns/functional/BO/08_design/05_positions/02_searchHook.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/05_positions/02_searchHook.ts
@@ -43,7 +43,7 @@ describe('BO - Design - Positions : Search for a hook', async () => {
     await positionsPage.closeSfToolBar(page);
 
     const pageTitle = await positionsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(positionsPage.pageTitle);
+    expect(pageTitle).to.contains(positionsPage.pageTitle);
   });
 
   const hooks: string[] = [
@@ -63,7 +63,7 @@ describe('BO - Design - Positions : Search for a hook', async () => {
       );
 
       const textResult = await positionsPage.searchHook(page, hook);
-      await expect(textResult).to.equal(hook);
+      expect(textResult).to.equal(hook);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/01_filterImageTypes.ts b/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/01_filterImageTypes.ts
index 343785f4d7ac3..0f965a2cb07e6 100644
--- a/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/01_filterImageTypes.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/01_filterImageTypes.ts
@@ -50,14 +50,14 @@ describe('BO - Design - Positions : Filter image types table', async () => {
     await imageSettingsPage.closeSfToolBar(page);
 
     const pageTitle = await imageSettingsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(imageSettingsPage.pageTitle);
+    expect(pageTitle).to.contains(imageSettingsPage.pageTitle);
   });
 
   it('should reset all filters and get number of image types in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfImageTypes = await imageSettingsPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfImageTypes).to.be.above(0);
+    expect(numberOfImageTypes).to.be.above(0);
   });
 
   describe('Filter image types table', async () => {
@@ -157,19 +157,19 @@ describe('BO - Design - Positions : Filter image types table', async () => {
         );
 
         const numberOfImageTypesAfterFilter = await imageSettingsPage.getNumberOfElementInGrid(page);
-        await expect(numberOfImageTypesAfterFilter).to.be.at.most(numberOfImageTypes);
+        expect(numberOfImageTypesAfterFilter).to.be.at.most(numberOfImageTypes);
 
         for (let row = 1; row <= numberOfImageTypesAfterFilter; row++) {
           if (test.args.filterType === 'select') {
             const status = await imageSettingsPage.getImageTypeStatus(page, row, test.args.filterBy);
-            await expect(status).to.equal(test.args.filterValue === '1');
+            expect(status).to.equal(test.args.filterValue === '1');
           } else {
             const textColumn = await imageSettingsPage.getTextColumn(
               page,
               row,
               test.args.filterBy,
             );
-            await expect(textColumn).to.contains(test.args.filterValue);
+            expect(textColumn).to.contains(test.args.filterValue);
           }
         }
       });
@@ -178,7 +178,7 @@ describe('BO - Design - Positions : Filter image types table', async () => {
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}Reset`, baseContext);
 
         const numberOfImageTypesAfterReset = await imageSettingsPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfImageTypesAfterReset).to.equal(numberOfImageTypes);
+        expect(numberOfImageTypesAfterReset).to.equal(numberOfImageTypes);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/02_CRUDImageType.ts b/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/02_CRUDImageType.ts
index 2ab82d1173d59..16e6d1fd6108e 100644
--- a/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/02_CRUDImageType.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/02_CRUDImageType.ts
@@ -56,14 +56,14 @@ describe('BO - Design - Image Settings : CRUD image type in BO', async () => {
     await imageSettingsPage.closeSfToolBar(page);
 
     const pageTitle = await imageSettingsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(imageSettingsPage.pageTitle);
+    expect(pageTitle).to.contains(imageSettingsPage.pageTitle);
   });
 
   it('should reset all filters and get number of image types in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfImageTypes = await imageSettingsPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfImageTypes).to.be.above(0);
+    expect(numberOfImageTypes).to.be.above(0);
   });
 
   // 1 - Create image type
@@ -74,17 +74,17 @@ describe('BO - Design - Image Settings : CRUD image type in BO', async () => {
       await imageSettingsPage.goToNewImageTypePage(page);
 
       const pageTitle = await addImageTypePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addImageTypePage.pageTitleCreate);
+      expect(pageTitle).to.contains(addImageTypePage.pageTitleCreate);
     });
 
     it('should create image type and check result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createImageType', baseContext);
 
       const textResult = await addImageTypePage.createEditImageType(page, createImageTypeData);
-      await expect(textResult).to.contains(imageSettingsPage.successfulCreationMessage);
+      expect(textResult).to.contains(imageSettingsPage.successfulCreationMessage);
 
       const numberOfImageTypesAfterCreation = await imageSettingsPage.getNumberOfElementInGrid(page);
-      await expect(numberOfImageTypesAfterCreation).to.be.equal(numberOfImageTypes + 1);
+      expect(numberOfImageTypesAfterCreation).to.be.equal(numberOfImageTypes + 1);
     });
   });
 
@@ -102,7 +102,7 @@ describe('BO - Design - Image Settings : CRUD image type in BO', async () => {
       );
 
       const textEmail = await imageSettingsPage.getTextColumn(page, 1, 'name');
-      await expect(textEmail).to.contains(createImageTypeData.name);
+      expect(textEmail).to.contains(createImageTypeData.name);
     });
 
     it('should go to edit image type page', async function () {
@@ -111,17 +111,17 @@ describe('BO - Design - Image Settings : CRUD image type in BO', async () => {
       await imageSettingsPage.gotoEditImageTypePage(page, 1);
 
       const pageTitle = await addImageTypePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addImageTypePage.pageTitleEdit);
+      expect(pageTitle).to.contains(addImageTypePage.pageTitleEdit);
     });
 
     it('should update image type', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateImageType', baseContext);
 
       const textResult = await addImageTypePage.createEditImageType(page, editImageTypeData);
-      await expect(textResult).to.contains(imageSettingsPage.successfulUpdateMessage);
+      expect(textResult).to.contains(imageSettingsPage.successfulUpdateMessage);
 
       const numberOfImageTypesAfterUpdate = await imageSettingsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfImageTypesAfterUpdate).to.be.equal(numberOfImageTypes + 1);
+      expect(numberOfImageTypesAfterUpdate).to.be.equal(numberOfImageTypes + 1);
     });
   });
 
@@ -139,17 +139,17 @@ describe('BO - Design - Image Settings : CRUD image type in BO', async () => {
       );
 
       const textEmail = await imageSettingsPage.getTextColumn(page, 1, 'name');
-      await expect(textEmail).to.contains(editImageTypeData.name);
+      expect(textEmail).to.contains(editImageTypeData.name);
     });
 
     it('should delete image type', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteImageType', baseContext);
 
       const textResult = await imageSettingsPage.deleteImageType(page, 1);
-      await expect(textResult).to.contains(imageSettingsPage.successfulDeleteMessage);
+      expect(textResult).to.contains(imageSettingsPage.successfulDeleteMessage);
 
       const numberOfImageTypesAfterDelete = await imageSettingsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfImageTypesAfterDelete).to.be.equal(numberOfImageTypes);
+      expect(numberOfImageTypesAfterDelete).to.be.equal(numberOfImageTypes);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/03_bulkDeleteImageTypes.ts b/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/03_bulkDeleteImageTypes.ts
index e180dfeeac6ad..49aedc1e326d8 100644
--- a/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/03_bulkDeleteImageTypes.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/03_bulkDeleteImageTypes.ts
@@ -57,14 +57,14 @@ describe('BO - Design - Image Settings : Bulk delete image types', async () => {
     await imageSettingsPage.closeSfToolBar(page);
 
     const pageTitle = await imageSettingsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(imageSettingsPage.pageTitle);
+    expect(pageTitle).to.contains(imageSettingsPage.pageTitle);
   });
 
   it('should reset all filters and get number of image types in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfImageTypes = await imageSettingsPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfImageTypes).to.be.above(0);
+    expect(numberOfImageTypes).to.be.above(0);
   });
 
   describe('Create 2 image types in BO', async () => {
@@ -75,17 +75,17 @@ describe('BO - Design - Image Settings : Bulk delete image types', async () => {
         await imageSettingsPage.goToNewImageTypePage(page);
 
         const pageTitle = await addImageTypePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addImageTypePage.pageTitleCreate);
+        expect(pageTitle).to.contains(addImageTypePage.pageTitleCreate);
       });
 
       it(`should create image type n° ${index + 1} and check result`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `createImageType${index + 1}`, baseContext);
 
         const textResult = await addImageTypePage.createEditImageType(page, ImageTypeToCreate);
-        await expect(textResult).to.contains(imageSettingsPage.successfulCreationMessage);
+        expect(textResult).to.contains(imageSettingsPage.successfulCreationMessage);
 
         const numberOfImageTypesAfterCreation = await imageSettingsPage.getNumberOfElementInGrid(page);
-        await expect(numberOfImageTypesAfterCreation).to.be.equal(numberOfImageTypes + index + 1);
+        expect(numberOfImageTypesAfterCreation).to.be.equal(numberOfImageTypes + index + 1);
       });
     });
   });
@@ -97,11 +97,11 @@ describe('BO - Design - Image Settings : Bulk delete image types', async () => {
       await imageSettingsPage.filterTable(page, 'input', 'name', 'todelete');
 
       const numberOfImageTypesAfterFilter = await imageSettingsPage.getNumberOfElementInGrid(page);
-      await expect(numberOfImageTypesAfterFilter).to.be.at.most(numberOfImageTypes);
+      expect(numberOfImageTypesAfterFilter).to.be.at.most(numberOfImageTypes);
 
       for (let i = 1; i <= numberOfImageTypesAfterFilter; i++) {
         const textColumn = await imageSettingsPage.getTextColumn(page, i, 'name');
-        await expect(textColumn).to.contains('todelete');
+        expect(textColumn).to.contains('todelete');
       }
     });
 
@@ -109,14 +109,14 @@ describe('BO - Design - Image Settings : Bulk delete image types', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteImageTypes', baseContext);
 
       const deleteTextResult = await imageSettingsPage.bulkDeleteImageTypes(page);
-      await expect(deleteTextResult).to.be.contains(imageSettingsPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.contains(imageSettingsPage.successfulMultiDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterDelete', baseContext);
 
       const numberOfImageTypesAfterReset = await imageSettingsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfImageTypesAfterReset).to.be.equal(numberOfImageTypes);
+      expect(numberOfImageTypesAfterReset).to.be.equal(numberOfImageTypes);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/05_sortAndPagination.ts b/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/05_sortAndPagination.ts
index 9178232da0496..8eee0b0946f50 100644
--- a/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/05_sortAndPagination.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/05_sortAndPagination.ts
@@ -54,14 +54,14 @@ describe('BO - Design - Image Settings : Pagination and sort image settings', as
     await imageSettingsPage.closeSfToolBar(page);
 
     const pageTitle = await imageSettingsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(imageSettingsPage.pageTitle);
+    expect(pageTitle).to.contains(imageSettingsPage.pageTitle);
   });
 
   it('should reset all filters and get number of image types in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfImageTypes = await imageSettingsPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfImageTypes).to.be.above(0);
+    expect(numberOfImageTypes).to.be.above(0);
   });
 
   // 1 : Create 15 new image types
@@ -76,17 +76,17 @@ describe('BO - Design - Image Settings : Pagination and sort image settings', as
         await imageSettingsPage.goToNewImageTypePage(page);
 
         const pageTitle = await addImageTypePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addImageTypePage.pageTitleCreate);
+        expect(pageTitle).to.contains(addImageTypePage.pageTitleCreate);
       });
 
       it(`should create image type n°${index + 1}`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `createImageType${index}`, baseContext);
 
         const textResult = await addImageTypePage.createEditImageType(page, createImageTypeData);
-        await expect(textResult).to.contains(imageSettingsPage.successfulCreationMessage);
+        expect(textResult).to.contains(imageSettingsPage.successfulCreationMessage);
 
         const numberOfImageTypesAfterCreation = await imageSettingsPage.getNumberOfElementInGrid(page);
-        await expect(numberOfImageTypesAfterCreation).to.be.equal(numberOfImageTypes + 1 + index);
+        expect(numberOfImageTypesAfterCreation).to.be.equal(numberOfImageTypes + 1 + index);
       });
     });
   });
@@ -184,17 +184,17 @@ describe('BO - Design - Image Settings : Pagination and sort image settings', as
           const expectedResult = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
           if (test.args.sortDirection === 'up') {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+            expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+            expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
         } else {
           const expectedResult = await basicHelper.sortArray(nonSortedTable);
 
           if (test.args.sortDirection === 'up') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         }
       });
@@ -212,7 +212,7 @@ describe('BO - Design - Image Settings : Pagination and sort image settings', as
 
       for (let i = 1; i <= numberOfImageTypesAfterFilter; i++) {
         const textColumn = await imageSettingsPage.getTextColumn(page, i, 'name');
-        await expect(textColumn).to.contains('todelete');
+        expect(textColumn).to.contains('todelete');
       }
     });
 
@@ -220,14 +220,14 @@ describe('BO - Design - Image Settings : Pagination and sort image settings', as
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteImageTypes', baseContext);
 
       const deleteTextResult = await imageSettingsPage.bulkDeleteImageTypes(page);
-      await expect(deleteTextResult).to.be.contains(imageSettingsPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.contains(imageSettingsPage.successfulMultiDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterDelete', baseContext);
 
       const numberOfImageTypesAfterReset = await imageSettingsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfImageTypesAfterReset).to.be.equal(numberOfImageTypes);
+      expect(numberOfImageTypesAfterReset).to.be.equal(numberOfImageTypes);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/06_deleteActions.ts b/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/06_deleteActions.ts
index aaaf16f82cd07..4d8b55d78d1c1 100644
--- a/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/06_deleteActions.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/06_deleteActions.ts
@@ -57,14 +57,14 @@ describe('BO - Design - Image Settings : Delete Actions', async () => {
     await imageSettingsPage.closeSfToolBar(page);
 
     const pageTitle = await imageSettingsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(imageSettingsPage.pageTitle);
+    expect(pageTitle).to.contains(imageSettingsPage.pageTitle);
   });
 
   it('should reset all filters and get number of image types in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfImageTypes = await imageSettingsPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfImageTypes).to.be.above(0);
+    expect(numberOfImageTypes).to.be.above(0);
   });
 
   // 1 : Create 2 new image types
@@ -78,17 +78,17 @@ describe('BO - Design - Image Settings : Delete Actions', async () => {
         await imageSettingsPage.goToNewImageTypePage(page);
 
         const pageTitle = await addImageTypePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addImageTypePage.pageTitleCreate);
+        expect(pageTitle).to.contains(addImageTypePage.pageTitleCreate);
       });
 
       it(`should create image type n°${index + 1}`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `createImageType${index}`, baseContext);
 
         const textResult = await addImageTypePage.createEditImageType(page, createImageTypeData);
-        await expect(textResult).to.contains(imageSettingsPage.successfulCreationMessage);
+        expect(textResult).to.contains(imageSettingsPage.successfulCreationMessage);
 
         const numberOfImageTypesAfterCreation = await imageSettingsPage.getNumberOfElementInGrid(page);
-        await expect(numberOfImageTypesAfterCreation).to.be.equal(numberOfImageTypes + 1 + index);
+        expect(numberOfImageTypesAfterCreation).to.be.equal(numberOfImageTypes + 1 + index);
       });
     });
 
@@ -96,7 +96,7 @@ describe('BO - Design - Image Settings : Delete Actions', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'regenerateThumbnails', baseContext);
 
       const textResult = await imageSettingsPage.regenerateThumbnails(page);
-      await expect(textResult).to.contains(imageSettingsPage.messageThumbnailsRegenerated);
+      expect(textResult).to.contains(imageSettingsPage.messageThumbnailsRegenerated);
     });
 
     testImageTypes.forEach((value: boolean, index: number) => {
@@ -109,7 +109,7 @@ describe('BO - Design - Image Settings : Delete Actions', async () => {
         );
 
         const exist = await files.doesFileExist(imagePath);
-        await expect(exist, 'File doesn\'t exist!').to.be.true;
+        expect(exist, 'File doesn\'t exist!').to.eq(true);
       });
     });
   });
@@ -124,20 +124,20 @@ describe('BO - Design - Image Settings : Delete Actions', async () => {
         await imageSettingsPage.filterTable(page, 'input', 'name', `todelete${index}`);
 
         const numberOfImageTypesAfterFilter = await imageSettingsPage.getNumberOfElementInGrid(page);
-        await expect(numberOfImageTypesAfterFilter).to.be.eq(1);
+        expect(numberOfImageTypesAfterFilter).to.be.eq(1);
 
         const textColumn = await imageSettingsPage.getTextColumn(page, 1, 'name');
-        await expect(textColumn).to.contains(`todelete${index}`);
+        expect(textColumn).to.contains(`todelete${index}`);
       });
 
       it('should delete image type', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `deleteImageType${index}`, baseContext);
 
         const textResult = await imageSettingsPage.deleteImageType(page, 1, value);
-        await expect(textResult).to.contains(imageSettingsPage.successfulDeleteMessage);
+        expect(textResult).to.contains(imageSettingsPage.successfulDeleteMessage);
 
         const numberOfImageTypesAfterDelete = await imageSettingsPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfImageTypesAfterDelete).to.be.equal(numberOfImageTypes + (1 - index));
+        expect(numberOfImageTypesAfterDelete).to.be.equal(numberOfImageTypes + (1 - index));
       });
 
       it('should check that images relative to image type are not removed', async function () {
@@ -149,7 +149,7 @@ describe('BO - Design - Image Settings : Delete Actions', async () => {
         );
 
         const exist = await files.doesFileExist(imagePath);
-        await expect(exist, 'File doesn\'t exist!').to.be.eq(!value);
+        expect(exist, 'File doesn\'t exist!').to.be.eq(!value);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/09_imageGenerationOptions.ts b/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/09_imageGenerationOptions.ts
index 86e4c23082a01..eeffa46766cd7 100644
--- a/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/09_imageGenerationOptions.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/09_imageGenerationOptions.ts
@@ -52,7 +52,7 @@ describe('BO - Design - Image Settings : Image Generation options', async () =>
       await imageSettingsPage.closeSfToolBar(page);
 
       const pageTitle = await imageSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(imageSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(imageSettingsPage.pageTitle);
     });
 
     it('should check image generation options', async function () {
@@ -60,17 +60,17 @@ describe('BO - Design - Image Settings : Image Generation options', async () =>
 
       // JPEG/PNG should be checked
       const jpegChecked = await imageSettingsPage.isImageFormatToGenerateChecked(page, 'jpg');
-      await expect(jpegChecked).to.be.true;
+      expect(jpegChecked).to.eq(true);
 
       // JPEG/PNG should be greyed
       // You can't uncheck the JPEG/PNG format
       const jpegDisabled = await imageSettingsPage.isImageFormatToGenerateDisabled(page, 'jpg');
-      await expect(jpegDisabled).to.be.true;
+      expect(jpegDisabled).to.eq(true);
 
       // >= PHP 8.1 : The checkbox of AVIF should be enabled
       // <  PHP 8.1 : The checkbox of AVIF should be disabled
       const avifDisabled = await imageSettingsPage.isImageFormatToGenerateDisabled(page, 'avif');
-      await expect(avifDisabled).to.be.true;
+      expect(avifDisabled).to.eq(true);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/10_regenerateThumbnails.ts b/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/10_regenerateThumbnails.ts
index 4ff5bfa8073b0..69a15e1583833 100644
--- a/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/10_regenerateThumbnails.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/10_regenerateThumbnails.ts
@@ -107,7 +107,7 @@ describe('BO - Design - Image Settings - Regenerate thumbnail', async () => {
       await imageSettingsPage.closeSfToolBar(page);
 
       const pageTitle = await imageSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(imageSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(imageSettingsPage.pageTitle);
     });
 
     it('should enable WebP image format', async function () {
@@ -122,11 +122,11 @@ describe('BO - Design - Image Settings - Regenerate thumbnail', async () => {
 
       // JPEG/PNG should be checked
       const jpegChecked = await imageSettingsPage.isImageFormatToGenerateChecked(page, 'jpg');
-      await expect(jpegChecked).to.be.true;
+      expect(jpegChecked).to.eq(true);
 
       // WebP should be checked
       const webpChecked = await imageSettingsPage.isImageFormatToGenerateChecked(page, 'webp');
-      await expect(webpChecked).to.be.true;
+      expect(webpChecked).to.eq(true);
     });
   });
 
@@ -181,14 +181,14 @@ describe('BO - Design - Image Settings - Regenerate thumbnail', async () => {
         await testContext.addContextItem(this, 'testIdentifier', `${arg.type}RegenerateThumbnails`, baseContext);
 
         const textResult = await imageSettingsPage.regenerateThumbnails(page, arg.type);
-        await expect(textResult).to.contains(imageSettingsPage.messageThumbnailsRegenerated);
+        expect(textResult).to.contains(imageSettingsPage.messageThumbnailsRegenerated);
       });
 
       it('should check that the form is reset', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `${arg.type}CheckFormReset`, baseContext);
 
         const image = await imageSettingsPage.getRegenerateThumbnailsImage(page);
-        await expect(image).to.contains('all');
+        expect(image).to.contains('all');
       });
 
       it('should check that images have been regenerated', async function () {
@@ -266,14 +266,14 @@ describe('BO - Design - Image Settings - Regenerate thumbnail', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'allRegenerateThumbnails', baseContext);
 
       const textResult = await imageSettingsPage.regenerateThumbnails(page, 'all');
-      await expect(textResult).to.contains(imageSettingsPage.messageThumbnailsRegenerated);
+      expect(textResult).to.contains(imageSettingsPage.messageThumbnailsRegenerated);
     });
 
     it('should check that the form is reset', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'allCheckFormReset', baseContext);
 
       const image = await imageSettingsPage.getRegenerateThumbnailsImage(page);
-      await expect(image).to.contains('all');
+      expect(image).to.contains('all');
     });
 
     it('should check that images have been regenerated', async function () {
@@ -353,14 +353,14 @@ describe('BO - Design - Image Settings - Regenerate thumbnail', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'specificCategoryRegenerateThumbnails', baseContext);
 
       const textResult = await imageSettingsPage.regenerateThumbnails(page, 'categories', formats.categories[0]);
-      await expect(textResult).to.contains(imageSettingsPage.messageThumbnailsRegenerated);
+      expect(textResult).to.contains(imageSettingsPage.messageThumbnailsRegenerated);
     });
 
     it('should check that the form is reset', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'specificCategoryCheckFormReset', baseContext);
 
       const image = await imageSettingsPage.getRegenerateThumbnailsImage(page);
-      await expect(image).to.contains('all');
+      expect(image).to.contains('all');
     });
 
     it('should check that images have been regenerated', async function () {
@@ -399,14 +399,14 @@ describe('BO - Design - Image Settings - Regenerate thumbnail', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'categoryWithEraseRegenerateThumbnails', baseContext);
 
       const textResult = await imageSettingsPage.regenerateThumbnails(page, 'categories', 'All', true);
-      await expect(textResult).to.contains(imageSettingsPage.messageThumbnailsRegenerated);
+      expect(textResult).to.contains(imageSettingsPage.messageThumbnailsRegenerated);
     });
 
     it('should check that the form is reset', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'categoryWithEraseCheckFormReset', baseContext);
 
       const image = await imageSettingsPage.getRegenerateThumbnailsImage(page);
-      await expect(image).to.contains('all');
+      expect(image).to.contains('all');
     });
 
     it('should check that images have been regenerated', async function () {
diff --git a/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/11_imageGenerationOnCreation.ts b/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/11_imageGenerationOnCreation.ts
index 940bc5de05bd4..c88bf52a8bda7 100644
--- a/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/11_imageGenerationOnCreation.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/11_imageGenerationOnCreation.ts
@@ -100,7 +100,7 @@ describe('BO - Design - Image Settings - Image Generation on creation', async ()
       await imageSettingsPage.closeSfToolBar(page);
 
       const pageTitle = await imageSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(imageSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(imageSettingsPage.pageTitle);
     });
 
     it('should enable WebP image format', async function () {
@@ -115,15 +115,15 @@ describe('BO - Design - Image Settings - Image Generation on creation', async ()
 
       // JPEG/PNG should be checked
       const jpegChecked = await imageSettingsPage.isImageFormatToGenerateChecked(page, 'jpg');
-      await expect(jpegChecked).to.be.true;
+      expect(jpegChecked).to.eq(true);
 
       // JPEG/PNG should be checked
       const jpegDisabled = await imageSettingsPage.isImageFormatToGenerateDisabled(page, 'jpg');
-      await expect(jpegDisabled).to.be.true;
+      expect(jpegDisabled).to.eq(true);
 
       // WebP should be checked
       const webpChecked = await imageSettingsPage.isImageFormatToGenerateChecked(page, 'webp');
-      await expect(webpChecked).to.be.true;
+      expect(webpChecked).to.eq(true);
     });
 
     it('should fetch image name', async function () {
@@ -150,21 +150,21 @@ describe('BO - Design - Image Settings - Image Generation on creation', async ()
       await productsPage.closeSfToolBar(page);
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should click on \'New product\' button and check new product modal', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnNewProductButton', baseContext);
 
       const isModalVisible = await productsPage.clickOnNewProductButton(page);
-      await expect(isModalVisible).to.be.true;
+      expect(isModalVisible).to.eq(true);
     });
 
     it('should check the standard product description', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkStandardProductDescription', baseContext);
 
       const productTypeDescription = await productsPage.getProductDescription(page);
-      await expect(productTypeDescription).to.contains(productsPage.standardProductDescription);
+      expect(productTypeDescription).to.contains(productsPage.standardProductDescription);
     });
 
     it('should choose \'Standard product\'', async function () {
@@ -173,7 +173,7 @@ describe('BO - Design - Image Settings - Image Generation on creation', async ()
       await productsPage.selectProductType(page, productData.type);
 
       const pageTitle = await createProductsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
     });
 
     it('should go to new product page', async function () {
@@ -182,7 +182,7 @@ describe('BO - Design - Image Settings - Image Generation on creation', async ()
       await productsPage.clickOnAddNewProduct(page);
 
       const pageTitle = await createProductsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
     });
 
     it('should create standard product', async function () {
@@ -191,7 +191,7 @@ describe('BO - Design - Image Settings - Image Generation on creation', async ()
       await createProductsPage.closeSfToolBar(page);
 
       const createProductMessage = await createProductsPage.setProduct(page, productData);
-      await expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+      expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
     });
 
     it('should check the product header details', async function () {
@@ -213,10 +213,10 @@ describe('BO - Design - Image Settings - Image Generation on creation', async ()
       await testContext.addContextItem(this, 'testIdentifier', 'checkSaveButton', baseContext);
 
       const saveButtonName = await createProductsPage.getSaveButtonName(page);
-      await expect(saveButtonName).to.equal('Save and publish');
+      expect(saveButtonName).to.equal('Save and publish');
 
       idProduct = await createProductsPage.getProductID(page);
-      await expect(idProduct).to.be.gt(0);
+      expect(idProduct).to.be.gt(0);
     });
 
     it('should check that images are generated', async function () {
@@ -231,18 +231,18 @@ describe('BO - Design - Image Settings - Image Generation on creation', async ()
       const pathProductId: string = pathProductIdSplitted.join('/');
 
       const fileJpegExists = await files.doesFileExist(`${files.getRootPath()}/img/p/${pathProductId}/${idProduct}.jpg`);
-      await expect(fileJpegExists, 'File doesn\'t exist!').to.be.true;
+      expect(fileJpegExists, 'File doesn\'t exist!').to.eq(true);
 
       await Promise.all(imageTypeProducts.map(async (imageTypeName: string) => {
         const fileJpegExists = await files.doesFileExist(
           `${files.getRootPath()}/img/p/${pathProductId}/${idProduct}-${imageTypeName}.jpg`,
         );
-        await expect(fileJpegExists, 'File doesn\'t exist!').to.be.true;
+        expect(fileJpegExists, 'File doesn\'t exist!').to.eq(true);
 
         const fileWebpExists = await files.doesFileExist(
           `${files.getRootPath()}/img/p/${pathProductId}/${idProduct}-${imageTypeName}.webp`,
         );
-        await expect(fileWebpExists, 'File doesn\'t exist!').to.be.true;
+        expect(fileWebpExists, 'File doesn\'t exist!').to.eq(true);
       }));
     });
   });
@@ -259,7 +259,7 @@ describe('BO - Design - Image Settings - Image Generation on creation', async ()
       await categoriesPage.closeSfToolBar(page);
 
       const pageTitle = await categoriesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(categoriesPage.pageTitle);
+      expect(pageTitle).to.contains(categoriesPage.pageTitle);
     });
 
     it('should go to add new category page', async function () {
@@ -268,14 +268,14 @@ describe('BO - Design - Image Settings - Image Generation on creation', async ()
       await categoriesPage.goToAddNewCategoryPage(page);
 
       const pageTitle = await addCategoryPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addCategoryPage.pageTitleCreate);
+      expect(pageTitle).to.contains(addCategoryPage.pageTitleCreate);
     });
 
     it('should create category', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createCategory', baseContext);
 
       const textResult = await addCategoryPage.createEditCategory(page, categoryData);
-      await expect(textResult).to.equal(categoriesPage.successfulCreationMessage);
+      expect(textResult).to.equal(categoriesPage.successfulCreationMessage);
     });
 
     it('should filter category by Name and fetch the ID', async function () {
@@ -289,10 +289,10 @@ describe('BO - Design - Image Settings - Image Generation on creation', async ()
       );
 
       const numberOfCategoriesAfterFilter = await categoriesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfCategoriesAfterFilter).to.be.eq(1);
+      expect(numberOfCategoriesAfterFilter).to.be.eq(1);
 
       idCategory = parseInt(await categoriesPage.getTextColumnFromTableCategories(page, 1, 'id_category'), 10);
-      await expect(idCategory).to.be.gt(0);
+      expect(idCategory).to.be.gt(0);
     });
 
     // @todo : https://github.com/PrestaShop/PrestaShop/issues/30520
@@ -301,22 +301,22 @@ describe('BO - Design - Image Settings - Image Generation on creation', async ()
 
       // Category Image
       const categoryImageExists = await files.doesFileExist(`${files.getRootPath()}/img/c/${idCategory}.jpg`);
-      await expect(categoryImageExists, `File ${idCategory}.jpg doesn't exist!`).to.be.true;
+      expect(categoryImageExists, `File ${idCategory}.jpg doesn't exist!`).to.eq(true);
 
       // Thumnbail Image
       const thumbnailImageExists = await files.doesFileExist(`${files.getRootPath()}/img/c/${idCategory}_thumb.jpg`);
-      await expect(thumbnailImageExists, `File ${idCategory}.jpg doesn't exist!`).to.be.true;
+      expect(thumbnailImageExists, `File ${idCategory}.jpg doesn't exist!`).to.eq(true);
 
       await Promise.all(imageTypeCategories.map(async (imageTypeName: string) => {
         const fileJpegExists = await files.doesFileExist(
           `${files.getRootPath()}/img/c/${idCategory}-${imageTypeName}.jpg`,
         );
-        await expect(fileJpegExists, `File ${idCategory}-${imageTypeName}.jpg doesn't exist!`).to.be.true;
+        expect(fileJpegExists, `File ${idCategory}-${imageTypeName}.jpg doesn't exist!`).to.eq(true);
 
         const fileWebpExists = await files.doesFileExist(
           `${files.getRootPath()}/img/c/${idCategory}-${imageTypeName}.webp`,
         );
-        await expect(fileWebpExists, `File ${idCategory}-${imageTypeName}.webp doesn't exist!`).to.be.true;
+        expect(fileWebpExists, `File ${idCategory}-${imageTypeName}.webp doesn't exist!`).to.eq(true);
       }));
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/13_checkProductImageFormat.ts b/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/13_checkProductImageFormat.ts
index c37ed2810e8c4..70e702e6e283e 100644
--- a/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/13_checkProductImageFormat.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/13_checkProductImageFormat.ts
@@ -98,7 +98,7 @@ describe('BO - Design - Image Settings - Check product image format', async () =
       await imageSettingsPage.closeSfToolBar(page);
 
       const pageTitle = await imageSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(imageSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(imageSettingsPage.pageTitle);
     });
 
     it('should enable WebP image format', async function () {
@@ -113,15 +113,15 @@ describe('BO - Design - Image Settings - Check product image format', async () =
 
       // JPEG/PNG should be checked
       const jpegChecked = await imageSettingsPage.isImageFormatToGenerateChecked(page, 'jpg');
-      await expect(jpegChecked).to.be.true;
+      expect(jpegChecked).to.eq(true);
 
       // JPEG/PNG should be checked
       const jpegDisabled = await imageSettingsPage.isImageFormatToGenerateDisabled(page, 'jpg');
-      await expect(jpegDisabled).to.be.true;
+      expect(jpegDisabled).to.eq(true);
 
       // WebP should be checked
       const webpChecked = await imageSettingsPage.isImageFormatToGenerateChecked(page, 'webp');
-      await expect(webpChecked).to.be.true;
+      expect(webpChecked).to.eq(true);
     });
   });
 
@@ -151,7 +151,7 @@ describe('BO - Design - Image Settings - Check product image format', async () =
           await categoryPage.goToBO(page);
 
           const pageTitle = await dashboardPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(dashboardPage.pageTitle);
+          expect(pageTitle).to.contains(dashboardPage.pageTitle);
         });
       }
       it('should go to \'Catalog > Products\' page', async function () {
@@ -166,14 +166,14 @@ describe('BO - Design - Image Settings - Check product image format', async () =
         await productsPage.closeSfToolBar(page);
 
         const pageTitle = await productsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(productsPage.pageTitle);
+        expect(pageTitle).to.contains(productsPage.pageTitle);
       });
 
       it('should click on \'New product\' button and check new product modal', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `clickOnNewProductButton${arg.extOriginal}`, baseContext);
 
         const isModalVisible = await productsPage.clickOnNewProductButton(page);
-        await expect(isModalVisible).to.be.true;
+        expect(isModalVisible).to.eq(true);
       });
 
       it('should check the standard product description', async function () {
@@ -185,7 +185,7 @@ describe('BO - Design - Image Settings - Check product image format', async () =
         );
 
         const productTypeDescription = await productsPage.getProductDescription(page);
-        await expect(productTypeDescription).to.contains(productsPage.standardProductDescription);
+        expect(productTypeDescription).to.contains(productsPage.standardProductDescription);
       });
 
       it('should choose \'Standard product\'', async function () {
@@ -194,7 +194,7 @@ describe('BO - Design - Image Settings - Check product image format', async () =
         await productsPage.selectProductType(page, arg.product.type);
 
         const pageTitle = await createProductsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+        expect(pageTitle).to.contains(createProductsPage.pageTitle);
       });
 
       it('should go to new product page', async function () {
@@ -203,7 +203,7 @@ describe('BO - Design - Image Settings - Check product image format', async () =
         await productsPage.clickOnAddNewProduct(page);
 
         const pageTitle = await createProductsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+        expect(pageTitle).to.contains(createProductsPage.pageTitle);
       });
 
       it('should create standard product', async function () {
@@ -212,18 +212,18 @@ describe('BO - Design - Image Settings - Check product image format', async () =
         await createProductsPage.closeSfToolBar(page);
 
         const createProductMessage = await createProductsPage.setProduct(page, arg.product);
-        await expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+        expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
       });
 
       it('should check that the save button is changed to \'Save and publish\'', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `checkSaveButton${arg.extOriginal}`, baseContext);
 
         const saveButtonName = await createProductsPage.getSaveButtonName(page);
-        await expect(saveButtonName).to.equal('Save and publish');
+        expect(saveButtonName).to.equal('Save and publish');
 
         idProduct = await createProductsPage.getProductID(page);
         idProductImage = await descriptionTab.getProductIDImageCover(page);
-        await expect(idProduct).to.be.gt(0);
+        expect(idProduct).to.be.gt(0);
       });
 
       it('should check that images are generated', async function () {
@@ -241,31 +241,31 @@ describe('BO - Design - Image Settings - Check product image format', async () =
         const pathImageOriginal: string = `${files.getRootPath()}/img/p/${pathProductId}/${idProductImage}.jpg`;
 
         const fileExistsOriginal = await files.doesFileExist(pathImageOriginal);
-        await expect(fileExistsOriginal, `The file ${pathImageOriginal} doesn't exist!`).to.be.true;
+        expect(fileExistsOriginal, `The file ${pathImageOriginal} doesn't exist!`).to.eq(true);
 
         // @todo : https://github.com/PrestaShop/PrestaShop/issues/32265
         if (arg.extOriginal !== 'webp') {
           const imageTypeOriginal = await files.getImageType(pathImageOriginal);
-          await expect(imageTypeOriginal).to.be.eq(arg.extOriginal);
+          expect(imageTypeOriginal).to.be.eq(arg.extOriginal);
         }
 
         // Check the Jpg file
         const pathImageJPG: string = `${files.getRootPath()}/img/p/${pathProductId}/${idProductImage}-large_default.jpg`;
 
         const fileExistsJPG = await files.doesFileExist(pathImageJPG);
-        await expect(fileExistsJPG, `The file ${pathImageJPG} doesn't exist!`).to.be.true;
+        expect(fileExistsJPG, `The file ${pathImageJPG} doesn't exist!`).to.eq(true);
 
         const imageTypeJPG = await files.getImageType(pathImageJPG);
-        await expect(imageTypeJPG).to.be.eq(arg.extGenerated);
+        expect(imageTypeJPG).to.be.eq(arg.extGenerated);
 
         // Check the WebP file
         const pathImageWEBP: string = `${files.getRootPath()}/img/p/${pathProductId}/${idProductImage}-large_default.webp`;
 
         const fileExistsWEBP = await files.doesFileExist(pathImageWEBP);
-        await expect(fileExistsWEBP, `The file ${pathImageWEBP} doesn't exist!`).to.be.true;
+        expect(fileExistsWEBP, `The file ${pathImageWEBP} doesn't exist!`).to.eq(true);
 
         const imageTypeWEBP = await files.getImageType(pathImageWEBP);
-        await expect(imageTypeWEBP).to.be.eq('webp');
+        expect(imageTypeWEBP).to.be.eq('webp');
       });
 
       it('should go to FO page', async function () {
@@ -275,7 +275,7 @@ describe('BO - Design - Image Settings - Check product image format', async () =
         await homePage.changeLanguage(page, 'en');
 
         const isHomePage = await homePage.isHomePage(page);
-        await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+        expect(isHomePage, 'Fail to open FO home page').to.eq(true);
       });
 
       it('should go to all products page', async function () {
@@ -284,7 +284,7 @@ describe('BO - Design - Image Settings - Check product image format', async () =
         await homePage.goToAllProductsPage(page);
 
         const isCategoryPageVisible = await categoryPage.isCategoryPage(page);
-        await expect(isCategoryPageVisible, 'Home category page was not opened').to.be.true;
+        expect(isCategoryPageVisible, 'Home category page was not opened').to.eq(true);
       });
 
       it(`should go to the second page and quick view the product '${arg.product.name}'`, async function () {
@@ -293,24 +293,24 @@ describe('BO - Design - Image Settings - Check product image format', async () =
         await categoryPage.goToNextPage(page);
 
         const nthProduct: number|null = await categoryPage.getNThChildFromIDProduct(page, idProduct);
-        await expect(nthProduct).to.be.not.null;
+        expect(nthProduct).to.not.eq(null);
 
         await categoryPage.quickViewProduct(page, nthProduct as number);
 
         const isModalVisible = await categoryPage.isQuickViewProductModalVisible(page);
-        await expect(isModalVisible).to.be.true;
+        expect(isModalVisible).to.eq(true);
       });
 
       it('should check that the main image of the quick view is a WebP', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `checkMainImageQuickView${arg.extOriginal}`, baseContext);
 
         const quickViewImageMain = await categoryPage.getQuickViewImageMain(page);
-        await expect(quickViewImageMain).to.be.not.null;
+        expect(quickViewImageMain).to.not.eq(null);
 
         await files.downloadFile(quickViewImageMain as string, 'image.img');
 
         const quickViewImageMainType = await files.getImageType('image.img');
-        await expect(quickViewImageMainType).to.be.eq('webp');
+        expect(quickViewImageMainType).to.be.eq('webp');
 
         await files.deleteFile('image.img');
       });
diff --git a/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/14_checkCategoryImageFormat.ts b/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/14_checkCategoryImageFormat.ts
index 73dd0dbc23c34..7d95e07a7f665 100644
--- a/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/14_checkCategoryImageFormat.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/14_checkCategoryImageFormat.ts
@@ -99,7 +99,7 @@ describe('BO - Design - Image Settings - Check category image format', async ()
       await imageSettingsPage.closeSfToolBar(page);
 
       const pageTitle = await imageSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(imageSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(imageSettingsPage.pageTitle);
     });
 
     it('should enable WebP image format', async function () {
@@ -114,15 +114,15 @@ describe('BO - Design - Image Settings - Check category image format', async ()
 
       // JPEG/PNG should be checked
       const jpegChecked = await imageSettingsPage.isImageFormatToGenerateChecked(page, 'jpg');
-      await expect(jpegChecked).to.be.true;
+      expect(jpegChecked).to.eq(true);
 
       // JPEG/PNG should be checked
       const jpegDisabled = await imageSettingsPage.isImageFormatToGenerateDisabled(page, 'jpg');
-      await expect(jpegDisabled).to.be.true;
+      expect(jpegDisabled).to.eq(true);
 
       // WebP should be checked
       const webpChecked = await imageSettingsPage.isImageFormatToGenerateChecked(page, 'webp');
-      await expect(webpChecked).to.be.true;
+      expect(webpChecked).to.eq(true);
     });
   });
 
@@ -160,7 +160,7 @@ describe('BO - Design - Image Settings - Check category image format', async ()
             await categoryPage.goToBO(page);
 
             const pageTitle = await dashboardPage.getPageTitle(page);
-            await expect(pageTitle).to.contains(dashboardPage.pageTitle);
+            expect(pageTitle).to.contains(dashboardPage.pageTitle);
           });
         }
 
@@ -176,7 +176,7 @@ describe('BO - Design - Image Settings - Check category image format', async ()
           await categoriesPage.closeSfToolBar(page);
 
           const pageTitle = await categoriesPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(categoriesPage.pageTitle);
+          expect(pageTitle).to.contains(categoriesPage.pageTitle);
         });
 
         it('should click on \'Add new category\' button', async function () {
@@ -185,7 +185,7 @@ describe('BO - Design - Image Settings - Check category image format', async ()
           await categoriesPage.goToAddNewCategoryPage(page);
 
           const pageTitle = await addCategoryPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(addCategoryPage.pageTitleCreate);
+          expect(pageTitle).to.contains(addCategoryPage.pageTitleCreate);
         });
 
         it('should create category', async function () {
@@ -194,7 +194,7 @@ describe('BO - Design - Image Settings - Check category image format', async ()
           await addCategoryPage.closeSfToolBar(page);
 
           const textResult = await addCategoryPage.createEditCategory(page, arg.category);
-          await expect(textResult).to.equal(categoriesPage.successfulCreationMessage);
+          expect(textResult).to.equal(categoriesPage.successfulCreationMessage);
         });
 
         it('should search for the new category and fetch the ID', async function () {
@@ -209,7 +209,7 @@ describe('BO - Design - Image Settings - Check category image format', async ()
           );
 
           const textColumn = await categoriesPage.getTextColumnFromTableCategories(page, 1, 'name');
-          await expect(textColumn).to.contains(arg.category.name);
+          expect(textColumn).to.contains(arg.category.name);
 
           idCategory = parseInt(await categoriesPage.getTextColumnFromTableCategories(page, 1, 'id_category'), 10);
         });
@@ -221,19 +221,19 @@ describe('BO - Design - Image Settings - Check category image format', async ()
           const pathImageJPG: string = `${files.getRootPath()}/img/c/${idCategory}.jpg`;
 
           const fileExistsJPG = await files.doesFileExist(pathImageJPG);
-          await expect(fileExistsJPG, `The file ${pathImageJPG} doesn't exist!`).to.be.true;
+          expect(fileExistsJPG, `The file ${pathImageJPG} doesn't exist!`).to.eq(true);
 
           const imageTypeJPG = await files.getImageType(pathImageJPG);
-          await expect(imageTypeJPG).to.be.eq(arg.extOriginal);
+          expect(imageTypeJPG).to.be.eq(arg.extOriginal);
 
           // Check the cover image file
           const pathImageCoverJPG: string = `${files.getRootPath()}/img/c/${idCategory}-category_default.jpg`;
 
           const fileExistsCoverJPG = await files.doesFileExist(pathImageCoverJPG);
-          await expect(fileExistsCoverJPG, `The file ${pathImageCoverJPG} doesn't exist!`).to.be.true;
+          expect(fileExistsCoverJPG, `The file ${pathImageCoverJPG} doesn't exist!`).to.eq(true);
 
           const imageTypeCoverJPG = await files.getImageType(pathImageCoverJPG);
-          await expect(imageTypeCoverJPG).to.be.eq(arg.extImageType);
+          expect(imageTypeCoverJPG).to.be.eq(arg.extImageType);
 
           // @todo : https://github.com/PrestaShop/PrestaShop/issues/32404
           /*
@@ -241,20 +241,20 @@ describe('BO - Design - Image Settings - Check category image format', async ()
           const pathImageWEBP: string = `${files.getRootPath()}/img/c/${idCategory}-large_default.webp`;
 
           const fileExistsWEBP = await files.doesFileExist(pathImageWEBP);
-          await expect(fileExistsWEBP, `The file ${pathImageWEBP} doesn't exist!`).to.be.true;
+          expect(fileExistsWEBP, `The file ${pathImageWEBP} doesn't exist!`).to.eq(true);
 
           const imageTypeWEBP = await files.getImageType(pathImageWEBP);
-          await expect(imageTypeWEBP).to.be.eq('webp');
+          expect(imageTypeWEBP).to.be.eq('webp');
           */
 
           // Check the Menu image file
           const pathImageMetaJPG: string = `${files.getRootPath()}/img/c/${idCategory}-small_default.jpg`;
 
           const fileExistsMetaJPG = await files.doesFileExist(pathImageMetaJPG);
-          await expect(fileExistsMetaJPG, `The file ${pathImageMetaJPG} doesn't exist!`).to.be.true;
+          expect(fileExistsMetaJPG, `The file ${pathImageMetaJPG} doesn't exist!`).to.eq(true);
 
           const imageTypeMetaJPG = await files.getImageType(pathImageMetaJPG);
-          await expect(imageTypeMetaJPG).to.be.eq(arg.extOriginal);
+          expect(imageTypeMetaJPG).to.be.eq(arg.extOriginal);
 
           // @todo : https://github.com/PrestaShop/PrestaShop/issues/32404
           /*
@@ -262,10 +262,10 @@ describe('BO - Design - Image Settings - Check category image format', async ()
           const pathImageWEBP: string = `${files.getRootPath()}/img/c/${idCategory}-large_default.webp`;
 
           const fileExistsWEBP = await files.doesFileExist(pathImageWEBP);
-          await expect(fileExistsWEBP, `The file ${pathImageWEBP} doesn't exist!`).to.be.true;
+          expect(fileExistsWEBP, `The file ${pathImageWEBP} doesn't exist!`).to.eq(true);
 
           const imageTypeWEBP = await files.getImageType(pathImageWEBP);
-          await expect(imageTypeWEBP).to.be.eq('webp');
+          expect(imageTypeWEBP).to.be.eq('webp');
           */
         });
 
@@ -276,7 +276,7 @@ describe('BO - Design - Image Settings - Check category image format', async ()
           await homePage.changeLanguage(page, 'en');
 
           const isHomePage = await homePage.isHomePage(page);
-          await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+          expect(isHomePage, 'Fail to open FO home page').to.eq(true);
         });
 
         it('should go to all products page', async function () {
@@ -285,19 +285,19 @@ describe('BO - Design - Image Settings - Check category image format', async ()
           await homePage.goToAllProductsPage(page);
 
           const isCategoryPageVisible = await categoryPage.isCategoryPage(page);
-          await expect(isCategoryPageVisible, 'Home category page was not opened').to.be.true;
+          expect(isCategoryPageVisible, 'Home category page was not opened').to.eq(true);
         });
 
         it('should check that the main image of the quick view is a WebP', async function () {
           await testContext.addContextItem(this, 'testIdentifier', `checkMainImageQuickView${argExtension}`, baseContext);
 
           const categoryImage = await categoryPage.getCategoryImageMain(page, arg.category.name);
-          await expect(categoryImage).to.be.not.null;
+          expect(categoryImage).to.not.eq(null);
 
           await files.downloadFile(categoryImage as string, 'image.img');
 
           const categoryImageType = await files.getImageType('image.img');
-          await expect(categoryImageType).to.be.eq('webp');
+          expect(categoryImageType).to.be.eq('webp');
 
           await files.deleteFile('image.img');
         });
diff --git a/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/15_checkStoreImageFormat.ts b/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/15_checkStoreImageFormat.ts
index 86b9eb8bee05c..00f5cf1ed2eca 100644
--- a/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/15_checkStoreImageFormat.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/15_checkStoreImageFormat.ts
@@ -85,7 +85,7 @@ describe('BO - Design - Image Settings - Check store image format', async () =>
       await imageSettingsPage.closeSfToolBar(page);
 
       const pageTitle = await imageSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(imageSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(imageSettingsPage.pageTitle);
     });
 
     it('should enable WebP image format', async function () {
@@ -100,15 +100,15 @@ describe('BO - Design - Image Settings - Check store image format', async () =>
 
       // JPEG/PNG should be checked
       const jpegChecked = await imageSettingsPage.isImageFormatToGenerateChecked(page, 'jpg');
-      await expect(jpegChecked).to.be.true;
+      expect(jpegChecked).to.eq(true);
 
       // JPEG/PNG should be checked
       const jpegDisabled = await imageSettingsPage.isImageFormatToGenerateDisabled(page, 'jpg');
-      await expect(jpegDisabled).to.be.true;
+      expect(jpegDisabled).to.eq(true);
 
       // WebP should be checked
       const webpChecked = await imageSettingsPage.isImageFormatToGenerateChecked(page, 'webp');
-      await expect(webpChecked).to.be.true;
+      expect(webpChecked).to.eq(true);
     });
   });
 
@@ -132,7 +132,7 @@ describe('BO - Design - Image Settings - Check store image format', async () =>
           await storePage.goToBO(page);
 
           const pageTitle = await dashboardPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(dashboardPage.pageTitle);
+          expect(pageTitle).to.contains(dashboardPage.pageTitle);
         });
       }
 
@@ -147,7 +147,7 @@ describe('BO - Design - Image Settings - Check store image format', async () =>
         await contactPage.closeSfToolBar(page);
 
         const pageTitle = await contactPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(contactPage.pageTitle);
+        expect(pageTitle).to.contains(contactPage.pageTitle);
       });
 
       it('should go to \'Stores\' tab', async function () {
@@ -156,7 +156,7 @@ describe('BO - Design - Image Settings - Check store image format', async () =>
         await contactPage.goToStoresPage(page);
 
         const pageTitle = await storesPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(storesPage.pageTitle);
+        expect(pageTitle).to.contains(storesPage.pageTitle);
       });
 
       it('should click on \'Add new store\' button', async function () {
@@ -165,14 +165,14 @@ describe('BO - Design - Image Settings - Check store image format', async () =>
         await storesPage.goToNewStorePage(page);
 
         const pageTitle = await createStoresPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(createStoresPage.pageTitleCreate);
+        expect(pageTitle).to.contains(createStoresPage.pageTitleCreate);
       });
 
       it('should create a store', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `createStore${arg.extOriginal}`, baseContext);
 
         const createMessage = await createStoresPage.createEditStore(page, arg.store);
-        await expect(createMessage).to.contains(storesPage.successfulCreationMessage);
+        expect(createMessage).to.contains(storesPage.successfulCreationMessage);
       });
 
       it('should search for the new store and fetch the ID', async function () {
@@ -187,7 +187,7 @@ describe('BO - Design - Image Settings - Check store image format', async () =>
         );
 
         const textColumn = await storesPage.getTextColumn(page, 1, 'sl!name');
-        await expect(textColumn).to.contains(arg.store.name);
+        expect(textColumn).to.contains(arg.store.name);
 
         idStore = parseInt(await storesPage.getTextColumn(page, 1, 'id_store'), 10);
       });
@@ -199,32 +199,32 @@ describe('BO - Design - Image Settings - Check store image format', async () =>
         const pathImageOrigJPG: string = `${files.getRootPath()}/img/st/${idStore}.jpg`;
 
         const fileExistsOrigJPG = await files.doesFileExist(pathImageOrigJPG);
-        await expect(fileExistsOrigJPG, `The file ${pathImageOrigJPG} doesn't exist!`).to.be.true;
+        expect(fileExistsOrigJPG, `The file ${pathImageOrigJPG} doesn't exist!`).to.eq(true);
 
         const imageTypeOrigJPG = await files.getImageType(pathImageOrigJPG);
 
         // @todo : https://github.com/PrestaShop/PrestaShop/issues/32527
         if (arg.extOriginal !== 'png') {
-          await expect(imageTypeOrigJPG).to.be.eq(arg.extOriginal);
+          expect(imageTypeOrigJPG).to.be.eq(arg.extOriginal);
         }
 
         // Check the imageFormat file
         const pathImageJPG: string = `${files.getRootPath()}/img/st/${idStore}-stores_default.jpg`;
 
         const fileExistsJPG = await files.doesFileExist(pathImageJPG);
-        await expect(fileExistsJPG, `The file ${pathImageJPG} doesn't exist!`).to.be.true;
+        expect(fileExistsJPG, `The file ${pathImageJPG} doesn't exist!`).to.eq(true);
 
         const imageTypeJPG = await files.getImageType(pathImageJPG);
-        await expect(imageTypeJPG).to.be.eq(arg.extOriginal);
+        expect(imageTypeJPG).to.be.eq(arg.extOriginal);
 
         // Check the WebP file
         const pathImageWEBP: string = `${files.getRootPath()}/img/st/${idStore}-stores_default.webp`;
 
         const fileExistsWEBP = await files.doesFileExist(pathImageWEBP);
-        await expect(fileExistsWEBP, `The file ${pathImageWEBP} doesn't exist!`).to.be.true;
+        expect(fileExistsWEBP, `The file ${pathImageWEBP} doesn't exist!`).to.eq(true);
 
         const imageTypeWEBP = await files.getImageType(pathImageWEBP);
-        await expect(imageTypeWEBP).to.be.eq('webp');
+        expect(imageTypeWEBP).to.be.eq('webp');
       });
 
       it('should go to FO page', async function () {
@@ -234,7 +234,7 @@ describe('BO - Design - Image Settings - Check store image format', async () =>
         await homePage.changeLanguage(page, 'en');
 
         const isHomePage = await homePage.isHomePage(page);
-        await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+        expect(isHomePage, 'Fail to open FO home page').to.eq(true);
       });
 
       it('should go to Stores page', async function () {
@@ -243,7 +243,7 @@ describe('BO - Design - Image Settings - Check store image format', async () =>
         await homePage.goToFooterLink(page, 'Stores');
 
         const pageTitle = await storePage.getPageTitle(page);
-        await expect(pageTitle).to.be.eq(storePage.pageTitle);
+        expect(pageTitle).to.be.eq(storePage.pageTitle);
       });
 
       it('should check that the main image of the store is a WebP', async function () {
@@ -251,12 +251,12 @@ describe('BO - Design - Image Settings - Check store image format', async () =>
 
         // Check the WebP file from the Stores page
         const quickViewImageMain = await storePage.getStoreImageMain(page, idStore);
-        await expect(quickViewImageMain).to.be.not.null;
+        expect(quickViewImageMain).to.not.eq(null);
 
         await files.downloadFile(quickViewImageMain as string, 'image.img');
 
         const quickViewImageMainType = await files.getImageType('image.img');
-        await expect(quickViewImageMainType).to.be.eq('webp');
+        expect(quickViewImageMainType).to.be.eq('webp');
 
         await files.deleteFile('image.img');
 
@@ -264,10 +264,10 @@ describe('BO - Design - Image Settings - Check store image format', async () =>
         const pathImageWEBP: string = `${files.getRootPath()}/img/st/${idStore}-stores_default.webp`;
 
         const fileExistsWEBP = await files.doesFileExist(pathImageWEBP);
-        await expect(fileExistsWEBP, `The file ${pathImageWEBP} doesn't exist!`).to.be.true;
+        expect(fileExistsWEBP, `The file ${pathImageWEBP} doesn't exist!`).to.eq(true);
 
         const imageTypeWEBP = await files.getImageType(pathImageWEBP);
-        await expect(imageTypeWEBP).to.be.eq('webp');
+        expect(imageTypeWEBP).to.be.eq('webp');
       });
     });
   });
@@ -291,7 +291,7 @@ describe('BO - Design - Image Settings - Check store image format', async () =>
           await storePage.goToBO(page);
 
           const pageTitle = await dashboardPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(dashboardPage.pageTitle);
+          expect(pageTitle).to.contains(dashboardPage.pageTitle);
         });
 
         it('should go to \'Shop Parameters > Contact\' page', async function () {
@@ -305,7 +305,7 @@ describe('BO - Design - Image Settings - Check store image format', async () =>
           await contactPage.closeSfToolBar(page);
 
           const pageTitle = await contactPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(contactPage.pageTitle);
+          expect(pageTitle).to.contains(contactPage.pageTitle);
         });
 
         it('should go to \'Stores\' tab', async function () {
@@ -314,7 +314,7 @@ describe('BO - Design - Image Settings - Check store image format', async () =>
           await contactPage.goToStoresPage(page);
 
           const pageTitle = await storesPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(storesPage.pageTitle);
+          expect(pageTitle).to.contains(storesPage.pageTitle);
         });
       }
 
@@ -325,14 +325,14 @@ describe('BO - Design - Image Settings - Check store image format', async () =>
         await storesPage.filterTable(page, 'input', 'sl!name', arg.store.name);
 
         const storeName = await storesPage.getTextColumn(page, 1, 'sl!name');
-        await expect(storeName).to.contains(arg.store.name);
+        expect(storeName).to.contains(arg.store.name);
       });
 
       it('should delete store', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `deleteStore${arg.extension}`, baseContext);
 
         const textResult = await storesPage.deleteStore(page, 1);
-        await expect(textResult).to.contains(storesPage.successfulDeleteMessage);
+        expect(textResult).to.contains(storesPage.successfulDeleteMessage);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/16_checkBaseImageFormat.ts b/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/16_checkBaseImageFormat.ts
index 1dc2f0edb213c..603545421135b 100644
--- a/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/16_checkBaseImageFormat.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/06_imageSettings/16_checkBaseImageFormat.ts
@@ -98,7 +98,7 @@ describe('BO - Design - Image Settings - Check base image format', async () => {
       await imageSettingsPage.closeSfToolBar(page);
 
       const pageTitle = await imageSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(imageSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(imageSettingsPage.pageTitle);
     });
 
     it('should check Image Generation Options', async function () {
@@ -106,15 +106,15 @@ describe('BO - Design - Image Settings - Check base image format', async () => {
 
       // Image Format : JPEG/PNG should be checked
       const jpegChecked = await imageSettingsPage.isImageFormatToGenerateChecked(page, 'jpg');
-      await expect(jpegChecked).to.be.true;
+      expect(jpegChecked).to.eq(true);
 
       // Image Format : JPEG/PNG should be disabled
       const jpegDisabled = await imageSettingsPage.isImageFormatToGenerateDisabled(page, 'jpg');
-      await expect(jpegDisabled).to.be.true;
+      expect(jpegDisabled).to.eq(true);
 
       // Base Format : PNG should be checked
       const pngChecked = await imageSettingsPage.isBaseFormatToGenerateChecked(page, 'png');
-      await expect(pngChecked).to.be.true;
+      expect(pngChecked).to.eq(true);
     });
 
     [
@@ -150,7 +150,7 @@ describe('BO - Design - Image Settings - Check base image format', async () => {
             await imageSettingsPage.closeSfToolBar(page);
 
             const pageTitle = await imageSettingsPage.getPageTitle(page);
-            await expect(pageTitle).to.contains(imageSettingsPage.pageTitle);
+            expect(pageTitle).to.contains(imageSettingsPage.pageTitle);
           });
         }
 
@@ -158,10 +158,10 @@ describe('BO - Design - Image Settings - Check base image format', async () => {
           await testContext.addContextItem(this, 'testIdentifier', `setBaseFormatImageGenerationOptions${index}`, baseContext);
 
           const textResult = await imageSettingsPage.setBaseFormatChecked(page, arg.baseFormat, true);
-          await expect(textResult).to.be.eq(imageSettingsPage.messageSettingsUpdated);
+          expect(textResult).to.be.eq(imageSettingsPage.messageSettingsUpdated);
 
           const baseFormatChecked = await imageSettingsPage.isBaseFormatToGenerateChecked(page, arg.baseFormat);
-          await expect(baseFormatChecked).to.be.true;
+          expect(baseFormatChecked).to.eq(true);
         });
 
         it('should go to \'Catalog > Products\' page', async function () {
@@ -175,14 +175,14 @@ describe('BO - Design - Image Settings - Check base image format', async () => {
           await productsPage.closeSfToolBar(page);
 
           const pageTitle = await productsPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(productsPage.pageTitle);
+          expect(pageTitle).to.contains(productsPage.pageTitle);
         });
 
         it('should click on \'New product\' button and check new product modal', async function () {
           await testContext.addContextItem(this, 'testIdentifier', `clickOnNewProductButton${index}`, baseContext);
 
           const isModalVisible = await productsPage.clickOnNewProductButton(page);
-          await expect(isModalVisible).to.be.true;
+          expect(isModalVisible).to.eq(true);
         });
 
         it('should check the standard product description', async function () {
@@ -194,7 +194,7 @@ describe('BO - Design - Image Settings - Check base image format', async () => {
           );
 
           const productTypeDescription = await productsPage.getProductDescription(page);
-          await expect(productTypeDescription).to.contains(productsPage.standardProductDescription);
+          expect(productTypeDescription).to.contains(productsPage.standardProductDescription);
         });
 
         it('should choose \'Standard product\'', async function () {
@@ -203,7 +203,7 @@ describe('BO - Design - Image Settings - Check base image format', async () => {
           await productsPage.selectProductType(page, arg.product.type);
 
           const pageTitle = await createProductsPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+          expect(pageTitle).to.contains(createProductsPage.pageTitle);
         });
 
         it('should go to new product page', async function () {
@@ -212,7 +212,7 @@ describe('BO - Design - Image Settings - Check base image format', async () => {
           await productsPage.clickOnAddNewProduct(page);
 
           const pageTitle = await createProductsPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+          expect(pageTitle).to.contains(createProductsPage.pageTitle);
         });
 
         it('should create standard product', async function () {
@@ -221,25 +221,25 @@ describe('BO - Design - Image Settings - Check base image format', async () => {
           await createProductsPage.closeSfToolBar(page);
 
           const createProductMessage = await createProductsPage.setProduct(page, arg.product);
-          await expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+          expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
         });
 
         it('should check that the save button is changed to \'Save and publish\'', async function () {
           await testContext.addContextItem(this, 'testIdentifier', `checkSaveButton${index}`, baseContext);
 
           const saveButtonName = await createProductsPage.getSaveButtonName(page);
-          await expect(saveButtonName).to.equal('Save and publish');
+          expect(saveButtonName).to.equal('Save and publish');
 
           idProduct = await createProductsPage.getProductID(page);
           idProductImage = await descriptionTab.getProductIDImageCover(page);
-          await expect(idProduct).to.be.gt(0);
+          expect(idProduct).to.be.gt(0);
         });
 
         it(`should check that image is generated in format ${arg.extGenerated.toUpperCase()}`, async function () {
           await testContext.addContextItem(this, 'testIdentifier', `checkProductImages${index}`, baseContext);
 
           const pathProductIdSplitted: RegExpMatchArray|null = idProductImage.toString().match(/./g);
-          await expect(pathProductIdSplitted).to.be.not.null;
+          expect(pathProductIdSplitted).to.not.eq(null);
 
           if (!pathProductIdSplitted) {
             return;
@@ -251,10 +251,10 @@ describe('BO - Design - Image Settings - Check base image format', async () => {
           const pathImageJPG: string = `${files.getRootPath()}/img/p/${pathProductId}/${idProductImage}-large_default.jpg`;
 
           const fileExistsJPG = await files.doesFileExist(pathImageJPG);
-          await expect(fileExistsJPG, `The file ${pathImageJPG} doesn't exist!`).to.be.true;
+          expect(fileExistsJPG, `The file ${pathImageJPG} doesn't exist!`).to.eq(true);
 
           const imageTypeJPG = await files.getImageType(pathImageJPG);
-          await expect(imageTypeJPG).to.be.eq(arg.extGenerated);
+          expect(imageTypeJPG).to.be.eq(arg.extGenerated);
         });
       });
     });
diff --git a/tests/UI/campaigns/functional/BO/08_design/07_linkWidget/01_createAndCheckFooterLinkWidget.ts b/tests/UI/campaigns/functional/BO/08_design/07_linkWidget/01_createAndCheckFooterLinkWidget.ts
index 3c1d32086c8b7..0688a2de6a7fc 100644
--- a/tests/UI/campaigns/functional/BO/08_design/07_linkWidget/01_createAndCheckFooterLinkWidget.ts
+++ b/tests/UI/campaigns/functional/BO/08_design/07_linkWidget/01_createAndCheckFooterLinkWidget.ts
@@ -58,14 +58,14 @@ describe('BO - Design - Link Widget : Create footer link widget and check it in
     await linkWidgetsPage.closeSfToolBar(page);
 
     const pageTitle = await linkWidgetsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(linkWidgetsPage.pageTitle);
+    expect(pageTitle).to.contains(linkWidgetsPage.pageTitle);
   });
 
   it('should get link widget number', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'getLinkWidgetNumber', baseContext);
 
     numberOfLinkWidgetInFooter = await linkWidgetsPage.getNumberOfElementInGrid(page, Hooks.displayFooter.name);
-    await expect(numberOfLinkWidgetInFooter).to.be.above(0);
+    expect(numberOfLinkWidgetInFooter).to.be.above(0);
   });
 
   describe('Create link widget', async () => {
@@ -75,17 +75,17 @@ describe('BO - Design - Link Widget : Create footer link widget and check it in
       await linkWidgetsPage.goToNewLinkWidgetPage(page);
 
       const pageTitle = await addLinkWidgetPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addLinkWidgetPage.pageTitle);
+      expect(pageTitle).to.contains(addLinkWidgetPage.pageTitle);
     });
 
     it('should create link widget', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createFooterLInkWidget', baseContext);
 
       const textResult = await addLinkWidgetPage.addLinkWidget(page, LinkWidgets.demo_1);
-      await expect(textResult).to.equal(linkWidgetsPage.successfulCreationMessage);
+      expect(textResult).to.equal(linkWidgetsPage.successfulCreationMessage);
 
       const numberOfLinkWidget = await linkWidgetsPage.getNumberOfElementInGrid(page, Hooks.displayFooter.name);
-      await expect(numberOfLinkWidget).to.equal(numberOfLinkWidgetInFooter + 1);
+      expect(numberOfLinkWidget).to.equal(numberOfLinkWidgetInFooter + 1);
     });
   });
 
@@ -99,14 +99,14 @@ describe('BO - Design - Link Widget : Create footer link widget and check it in
       await foHomePage.changeLanguage(page, 'en');
 
       const pageTitle = await foHomePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(foHomePage.pageTitle);
+      expect(pageTitle).to.contains(foHomePage.pageTitle);
     });
 
     it('should check link widget in the footer of home page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkLinkWidgetInFO', baseContext);
 
       const title = await foHomePage.getFooterLinksBlockTitle(page, numberOfLinkWidgetInFooter + 1);
-      await expect(title).to.contains(LinkWidgets.demo_1.name);
+      expect(title).to.contains(LinkWidgets.demo_1.name);
 
       const linksTextContent = await foHomePage.getFooterLinksTextContent(page, numberOfLinkWidgetInFooter + 1);
       await Promise.all([
@@ -124,7 +124,7 @@ describe('BO - Design - Link Widget : Create footer link widget and check it in
       page = await foHomePage.closePage(browserContext, page, 0);
 
       const pageTitle = await linkWidgetsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(linkWidgetsPage.pageTitle);
+      expect(pageTitle).to.contains(linkWidgetsPage.pageTitle);
     });
   });
 
@@ -137,13 +137,13 @@ describe('BO - Design - Link Widget : Create footer link widget and check it in
         Hooks.displayFooter.name,
         numberOfLinkWidgetInFooter + 1,
       );
-      await expect(textResult).to.equal(linkWidgetsPage.successfulDeleteMessage);
+      expect(textResult).to.equal(linkWidgetsPage.successfulDeleteMessage);
 
       const numberOfLinkWidgetAfterDelete = await linkWidgetsPage.getNumberOfElementInGrid(
         page,
         Hooks.displayFooter.name,
       );
-      await expect(numberOfLinkWidgetAfterDelete).to.equal(numberOfLinkWidgetInFooter);
+      expect(numberOfLinkWidgetAfterDelete).to.equal(numberOfLinkWidgetInFooter);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/09_shipping/01_carriers/01_CRUDCarrier.ts b/tests/UI/campaigns/functional/BO/09_shipping/01_carriers/01_CRUDCarrier.ts
index 78a1ede4bd6d7..5c3db3bdd61ac 100644
--- a/tests/UI/campaigns/functional/BO/09_shipping/01_carriers/01_CRUDCarrier.ts
+++ b/tests/UI/campaigns/functional/BO/09_shipping/01_carriers/01_CRUDCarrier.ts
@@ -84,14 +84,14 @@ describe('BO - Shipping - Carriers : CRUD carrier in BO', async () => {
     );
 
     const pageTitle = await carriersPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(carriersPage.pageTitle);
+    expect(pageTitle).to.contains(carriersPage.pageTitle);
   });
 
   it('should reset all filters and get number of carriers in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfCarriers = await carriersPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfCarriers).to.be.above(0);
+    expect(numberOfCarriers).to.be.above(0);
   });
 
   // 1 - Create carrier
@@ -102,17 +102,17 @@ describe('BO - Shipping - Carriers : CRUD carrier in BO', async () => {
       await carriersPage.goToAddNewCarrierPage(page);
 
       const pageTitle = await addCarrierPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addCarrierPage.pageTitleCreate);
+      expect(pageTitle).to.contains(addCarrierPage.pageTitleCreate);
     });
 
     it('should create carrier and check result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createCarrier', baseContext);
 
       const textResult = await addCarrierPage.createEditCarrier(page, createCarrierData);
-      await expect(textResult).to.contains(carriersPage.successfulCreationMessage);
+      expect(textResult).to.contains(carriersPage.successfulCreationMessage);
 
       const numberCarriersAfterCreation = await carriersPage.getNumberOfElementInGrid(page);
-      await expect(numberCarriersAfterCreation).to.be.equal(numberOfCarriers + 1);
+      expect(numberCarriersAfterCreation).to.be.equal(numberOfCarriers + 1);
     });
 
     it('should filter list by name and get the new carrier ID', async function () {
@@ -129,7 +129,7 @@ describe('BO - Shipping - Carriers : CRUD carrier in BO', async () => {
       carrierID = parseInt(await carriersPage.getTextColumn(page, 1, 'id_carrier'), 10);
 
       const name = await carriersPage.getTextColumn(page, 1, 'name');
-      await expect(name).to.contains(createCarrierData.name);
+      expect(name).to.contains(createCarrierData.name);
     });
   });
 
@@ -144,7 +144,7 @@ describe('BO - Shipping - Carriers : CRUD carrier in BO', async () => {
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Home page is not displayed').to.be.true;
+      expect(isHomePage, 'Home page is not displayed').to.eq(true);
     });
 
     it('should go to login page', async function () {
@@ -153,7 +153,7 @@ describe('BO - Shipping - Carriers : CRUD carrier in BO', async () => {
       await homePage.goToLoginPage(page);
 
       const pageTitle = await foLoginPage.getPageTitle(page);
-      await expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
+      expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
     });
 
     it('should sign in with default customer', async function () {
@@ -162,7 +162,7 @@ describe('BO - Shipping - Carriers : CRUD carrier in BO', async () => {
       await foLoginPage.customerLogin(page, Customers.johnDoe);
 
       const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
 
     it('should create an order', async function () {
@@ -179,14 +179,14 @@ describe('BO - Shipping - Carriers : CRUD carrier in BO', async () => {
 
       // Address step - Go to delivery step
       const isStepAddressComplete = await checkoutPage.goToDeliveryStep(page);
-      await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
     });
 
     it('should check that the new carrier is not visible', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkNewCarrier', baseContext);
 
       const isShippingMethodVisible = await checkoutPage.isShippingMethodVisible(page, carrierID);
-      await expect(isShippingMethodVisible, 'The carrier is visible').to.be.false;
+      expect(isShippingMethodVisible, 'The carrier is visible').to.eq(false);
     });
 
     it('should sign out from FO', async function () {
@@ -196,7 +196,7 @@ describe('BO - Shipping - Carriers : CRUD carrier in BO', async () => {
       await checkoutPage.logout(page);
 
       const isCustomerConnected = await checkoutPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is connected').to.be.false;
+      expect(isCustomerConnected, 'Customer is connected').to.eq(false);
     });
   });
 
@@ -208,7 +208,7 @@ describe('BO - Shipping - Carriers : CRUD carrier in BO', async () => {
       page = await checkoutPage.closePage(browserContext, page, 0);
 
       const pageTitle = await carriersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(carriersPage.pageTitle);
+      expect(pageTitle).to.contains(carriersPage.pageTitle);
     });
 
     it('should filter list by name', async function () {
@@ -223,7 +223,7 @@ describe('BO - Shipping - Carriers : CRUD carrier in BO', async () => {
       );
 
       const carrierName = await carriersPage.getTextColumn(page, 1, 'name');
-      await expect(carrierName).to.contains(createCarrierData.name);
+      expect(carrierName).to.contains(createCarrierData.name);
     });
 
     it('should go to edit carrier page', async function () {
@@ -232,17 +232,17 @@ describe('BO - Shipping - Carriers : CRUD carrier in BO', async () => {
       await carriersPage.gotoEditCarrierPage(page, 1);
 
       const pageTitle = await addCarrierPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addCarrierPage.pageTitleEdit);
+      expect(pageTitle).to.contains(addCarrierPage.pageTitleEdit);
     });
 
     it('should update carrier', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateCarrier', baseContext);
 
       const textResult = await addCarrierPage.createEditCarrier(page, editCarrierData);
-      await expect(textResult).to.contains(carriersPage.successfulUpdateMessage);
+      expect(textResult).to.contains(carriersPage.successfulUpdateMessage);
 
       const numberOfCarriersAfterUpdate = await carriersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCarriersAfterUpdate).to.be.equal(numberOfCarriers + 1);
+      expect(numberOfCarriersAfterUpdate).to.be.equal(numberOfCarriers + 1);
     });
 
     it('should filter list by name and get the edited carrier ID', async function () {
@@ -259,7 +259,7 @@ describe('BO - Shipping - Carriers : CRUD carrier in BO', async () => {
       carrierID = parseInt(await carriersPage.getTextColumn(page, 1, 'id_carrier'), 10);
 
       const name = await carriersPage.getTextColumn(page, 1, 'name');
-      await expect(name).to.contains(editCarrierData.name);
+      expect(name).to.contains(editCarrierData.name);
     });
   });
 
@@ -274,7 +274,7 @@ describe('BO - Shipping - Carriers : CRUD carrier in BO', async () => {
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Home page is not displayed').to.be.true;
+      expect(isHomePage, 'Home page is not displayed').to.eq(true);
     });
 
     it('should go to login page', async function () {
@@ -283,7 +283,7 @@ describe('BO - Shipping - Carriers : CRUD carrier in BO', async () => {
       await homePage.goToLoginPage(page);
 
       const pageTitle = await foLoginPage.getPageTitle(page);
-      await expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
+      expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
     });
 
     it('should sign in with default customer', async function () {
@@ -292,7 +292,7 @@ describe('BO - Shipping - Carriers : CRUD carrier in BO', async () => {
       await foLoginPage.customerLogin(page, Customers.johnDoe);
 
       const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
 
     it('should create an order', async function () {
@@ -309,14 +309,14 @@ describe('BO - Shipping - Carriers : CRUD carrier in BO', async () => {
 
       // Address step - Go to delivery step
       const isStepAddressComplete = await checkoutPage.goToDeliveryStep(page);
-      await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
     });
 
     it('should check that the updated carrier is visible', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkEditedCarrier', baseContext);
 
       const isShippingMethodVisible = await checkoutPage.isShippingMethodVisible(page, carrierID);
-      await expect(isShippingMethodVisible, 'The carrier is not visible').to.be.true;
+      expect(isShippingMethodVisible, 'The carrier is not visible').to.eq(true);
     });
 
     it('should sign out from FO', async function () {
@@ -326,7 +326,7 @@ describe('BO - Shipping - Carriers : CRUD carrier in BO', async () => {
       await checkoutPage.logout(page);
 
       const isCustomerConnected = await checkoutPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is connected').to.be.false;
+      expect(isCustomerConnected, 'Customer is connected').to.eq(false);
     });
   });
 
@@ -338,7 +338,7 @@ describe('BO - Shipping - Carriers : CRUD carrier in BO', async () => {
       page = await checkoutPage.closePage(browserContext, page, 0);
 
       const pageTitle = await carriersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(carriersPage.pageTitle);
+      expect(pageTitle).to.contains(carriersPage.pageTitle);
     });
 
     it('should filter list by name', async function () {
@@ -353,17 +353,17 @@ describe('BO - Shipping - Carriers : CRUD carrier in BO', async () => {
       );
 
       const carrierName = await carriersPage.getTextColumn(page, 1, 'name');
-      await expect(carrierName).to.contains(editCarrierData.name);
+      expect(carrierName).to.contains(editCarrierData.name);
     });
 
     it('should delete carrier', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteCarrier', baseContext);
 
       const textResult = await carriersPage.deleteCarrier(page, 1);
-      await expect(textResult).to.contains(carriersPage.successfulDeleteMessage);
+      expect(textResult).to.contains(carriersPage.successfulDeleteMessage);
 
       const numberOfCarriersAfterDelete = await carriersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCarriersAfterDelete).to.be.equal(numberOfCarriers);
+      expect(numberOfCarriersAfterDelete).to.be.equal(numberOfCarriers);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/09_shipping/01_carriers/02_filterSortAndPagination.ts b/tests/UI/campaigns/functional/BO/09_shipping/01_carriers/02_filterSortAndPagination.ts
index 9507af31df737..7ce085abde1de 100644
--- a/tests/UI/campaigns/functional/BO/09_shipping/01_carriers/02_filterSortAndPagination.ts
+++ b/tests/UI/campaigns/functional/BO/09_shipping/01_carriers/02_filterSortAndPagination.ts
@@ -52,14 +52,14 @@ describe('BO - Shipping - Carriers : Filter, sort and pagination carriers', asyn
     );
 
     const pageTitle = await carriersPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(carriersPage.pageTitle);
+    expect(pageTitle).to.contains(carriersPage.pageTitle);
   });
 
   it('should reset all filters and get number of carriers in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfCarriers = await carriersPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfCarriers).to.be.above(0);
+    expect(numberOfCarriers).to.be.above(0);
   });
 
   // 1 - Filter carriers
@@ -135,15 +135,15 @@ describe('BO - Shipping - Carriers : Filter, sort and pagination carriers', asyn
         );
 
         const numberOfCarriersAfterFilter = await carriersPage.getNumberOfElementInGrid(page);
-        await expect(numberOfCarriersAfterFilter).to.be.at.most(numberOfCarriers);
+        expect(numberOfCarriersAfterFilter).to.be.at.most(numberOfCarriers);
 
         for (let row = 1; row <= numberOfCarriersAfterFilter; row++) {
           const textColumn = await carriersPage.getTextColumn(page, row, test.args.filterBy);
 
           if (test.expected !== undefined) {
-            await expect(textColumn).to.contains(test.expected);
+            expect(textColumn).to.contains(test.expected);
           } else {
-            await expect(textColumn).to.contains(test.args.filterValue);
+            expect(textColumn).to.contains(test.args.filterValue);
           }
         }
       });
@@ -152,7 +152,7 @@ describe('BO - Shipping - Carriers : Filter, sort and pagination carriers', asyn
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}Reset`, baseContext);
 
         const numberOfCarriersAfterReset = await carriersPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfCarriersAfterReset).to.equal(numberOfCarriers);
+        expect(numberOfCarriersAfterReset).to.equal(numberOfCarriers);
       });
     });
   });
@@ -209,17 +209,17 @@ describe('BO - Shipping - Carriers : Filter, sort and pagination carriers', asyn
           const expectedResult = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
           if (test.args.sortDirection === 'up') {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+            expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+            expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
         } else {
           const expectedResult = await basicHelper.sortArray(nonSortedTable);
 
           if (test.args.sortDirection === 'up') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         }
       });
@@ -239,17 +239,17 @@ describe('BO - Shipping - Carriers : Filter, sort and pagination carriers', asyn
 
         await carriersPage.goToAddNewCarrierPage(page);
         const pageTitle = await addCarrierPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addCarrierPage.pageTitleCreate);
+        expect(pageTitle).to.contains(addCarrierPage.pageTitleCreate);
       });
 
       it(`should create carrier n°${index + 1} and check result`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `createCarrier${index}`, baseContext);
 
         const textResult = await addCarrierPage.createEditCarrier(page, carrierData);
-        await expect(textResult).to.contains(carriersPage.successfulCreationMessage);
+        expect(textResult).to.contains(carriersPage.successfulCreationMessage);
 
         const numberOfCarriersAfterCreation = await carriersPage.getNumberOfElementInGrid(page);
-        await expect(numberOfCarriersAfterCreation).to.be.equal(numberOfCarriers + 1 + index);
+        expect(numberOfCarriersAfterCreation).to.be.equal(numberOfCarriers + 1 + index);
       });
 
       after(() => files.deleteFile(`todelete${index}.jpg`));
@@ -307,7 +307,7 @@ describe('BO - Shipping - Carriers : Filter, sort and pagination carriers', asyn
           i,
           'name',
         );
-        await expect(textColumn).to.contains('todelete');
+        expect(textColumn).to.contains('todelete');
       }
     });
 
@@ -315,14 +315,14 @@ describe('BO - Shipping - Carriers : Filter, sort and pagination carriers', asyn
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteCarriers', baseContext);
 
       const deleteTextResult = await carriersPage.bulkDeleteCarriers(page);
-      await expect(deleteTextResult).to.be.contains(carriersPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.contains(carriersPage.successfulMultiDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterDelete', baseContext);
 
       const numberOfCarriersAfterReset = await carriersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCarriersAfterReset).to.be.equal(numberOfCarriers);
+      expect(numberOfCarriersAfterReset).to.be.equal(numberOfCarriers);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/09_shipping/01_carriers/03_quickEditAndBulkActions.ts b/tests/UI/campaigns/functional/BO/09_shipping/01_carriers/03_quickEditAndBulkActions.ts
index af57b7459b40f..0dc9104015b51 100644
--- a/tests/UI/campaigns/functional/BO/09_shipping/01_carriers/03_quickEditAndBulkActions.ts
+++ b/tests/UI/campaigns/functional/BO/09_shipping/01_carriers/03_quickEditAndBulkActions.ts
@@ -53,14 +53,14 @@ describe('BO - Shipping - Carriers : Quick edit and bulk actions carriers', asyn
     );
 
     const pageTitle = await carriersPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(carriersPage.pageTitle);
+    expect(pageTitle).to.contains(carriersPage.pageTitle);
   });
 
   it('should reset all filters and get number of carriers in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfCarriers = await carriersPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfCarriers).to.be.above(0);
+    expect(numberOfCarriers).to.be.above(0);
   });
 
   // 1 - Create 2 carriers
@@ -76,17 +76,17 @@ describe('BO - Shipping - Carriers : Quick edit and bulk actions carriers', asyn
 
         await carriersPage.goToAddNewCarrierPage(page);
         const pageTitle = await addCarrierPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addCarrierPage.pageTitleCreate);
+        expect(pageTitle).to.contains(addCarrierPage.pageTitleCreate);
       });
 
       it(`should create carrier n°${index + 1} and check result`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `createCarrier${index}`, baseContext);
 
         const textResult = await addCarrierPage.createEditCarrier(page, carrierData);
-        await expect(textResult).to.contains(carriersPage.successfulCreationMessage);
+        expect(textResult).to.contains(carriersPage.successfulCreationMessage);
 
         const numberOfCarriersAfterCreation = await carriersPage.getNumberOfElementInGrid(page);
-        await expect(numberOfCarriersAfterCreation).to.be.equal(numberOfCarriers + 1 + index);
+        expect(numberOfCarriersAfterCreation).to.be.equal(numberOfCarriers + 1 + index);
       });
 
       after(() => files.deleteFile(`todelete${index}.jpg`));
@@ -113,7 +113,7 @@ describe('BO - Shipping - Carriers : Quick edit and bulk actions carriers', asyn
           i,
           'name',
         );
-        await expect(textColumn).to.contains('todelete');
+        expect(textColumn).to.contains('todelete');
       }
     });
 
@@ -128,11 +128,11 @@ describe('BO - Shipping - Carriers : Quick edit and bulk actions carriers', asyn
 
         if (isActionPerformed) {
           const resultMessage = await carriersPage.getAlertSuccessBlockContent(page);
-          await expect(resultMessage).to.contains(carriersPage.successfulUpdateStatusMessage);
+          expect(resultMessage).to.contains(carriersPage.successfulUpdateStatusMessage);
         }
 
         const carrierStatus = await carriersPage.getStatus(page, 1);
-        await expect(carrierStatus).to.be.equal(test.args.enabledValue);
+        expect(carrierStatus).to.be.equal(test.args.enabledValue);
       });
     });
 
@@ -140,7 +140,7 @@ describe('BO - Shipping - Carriers : Quick edit and bulk actions carriers', asyn
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterEnableDisable', baseContext);
 
       const numberOfCarriersAfterReset = await carriersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCarriersAfterReset).to.be.equal(numberOfCarriers + 2);
+      expect(numberOfCarriersAfterReset).to.be.equal(numberOfCarriers + 2);
     });
   });
 
@@ -164,7 +164,7 @@ describe('BO - Shipping - Carriers : Quick edit and bulk actions carriers', asyn
           i,
           'name',
         );
-        await expect(textColumn).to.contains('todelete');
+        expect(textColumn).to.contains('todelete');
       }
     });
 
@@ -176,7 +176,7 @@ describe('BO - Shipping - Carriers : Quick edit and bulk actions carriers', asyn
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.action}ByBulkActions`, baseContext);
 
         const deleteTextResult = await carriersPage.bulkSetStatus(page, test.args.action);
-        await expect(deleteTextResult).to.be.contains(carriersPage.successfulUpdateStatusMessage);
+        expect(deleteTextResult).to.be.contains(carriersPage.successfulUpdateStatusMessage);
       });
     });
   });
@@ -201,7 +201,7 @@ describe('BO - Shipping - Carriers : Quick edit and bulk actions carriers', asyn
           i,
           'name',
         );
-        await expect(textColumn).to.contains('todelete');
+        expect(textColumn).to.contains('todelete');
       }
     });
 
@@ -209,14 +209,14 @@ describe('BO - Shipping - Carriers : Quick edit and bulk actions carriers', asyn
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteCarriers', baseContext);
 
       const deleteTextResult = await carriersPage.bulkDeleteCarriers(page);
-      await expect(deleteTextResult).to.be.contains(carriersPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.contains(carriersPage.successfulMultiDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterDelete', baseContext);
 
       const numberOfCarriersAfterReset = await carriersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCarriersAfterReset).to.be.equal(numberOfCarriers);
+      expect(numberOfCarriersAfterReset).to.be.equal(numberOfCarriers);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/09_shipping/01_carriers/04_changePosition.ts b/tests/UI/campaigns/functional/BO/09_shipping/01_carriers/04_changePosition.ts
index 8d01bfe70b8d4..5041b1708d62d 100644
--- a/tests/UI/campaigns/functional/BO/09_shipping/01_carriers/04_changePosition.ts
+++ b/tests/UI/campaigns/functional/BO/09_shipping/01_carriers/04_changePosition.ts
@@ -48,7 +48,7 @@ describe('BO - Shipping - Carriers : Change carrier position', async () => {
     );
 
     const pageTitle = await carriersPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(carriersPage.pageTitle);
+    expect(pageTitle).to.contains(carriersPage.pageTitle);
   });
 
   describe('Change carrier position', async () => {
@@ -57,7 +57,7 @@ describe('BO - Shipping - Carriers : Change carrier position', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'resetCarriersFilters', baseContext);
 
       const numberOfCarriers = await carriersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCarriers).to.be.above(2);
+      expect(numberOfCarriers).to.be.above(2);
     });
 
     it('should sort by \'position\' \'asc\' And check result', async function () {
@@ -74,7 +74,7 @@ describe('BO - Shipping - Carriers : Change carrier position', async () => {
 
       const expectedResult = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
-      await expect(sortedTableFloat).to.deep.equal(expectedResult);
+      expect(sortedTableFloat).to.deep.equal(expectedResult);
     });
 
     it('should change first carrier position to 3', async function () {
@@ -85,11 +85,11 @@ describe('BO - Shipping - Carriers : Change carrier position', async () => {
 
       // Change position and check successful message
       const textResult = await carriersPage.changePosition(page, 1, 3);
-      await expect(textResult, 'Unable to change position').to.contains(carriersPage.successfulUpdateMessage);
+      expect(textResult, 'Unable to change position').to.contains(carriersPage.successfulUpdateMessage);
 
       // Get third row carrier name and check if is equal the first row carrier name before changing position
       const thirdRowCarrierName = await carriersPage.getTextColumn(page, 3, 'name');
-      await expect(thirdRowCarrierName, 'Changing position was done wrongly').to.equal(firstRowCarrierName);
+      expect(thirdRowCarrierName, 'Changing position was done wrongly').to.equal(firstRowCarrierName);
     });
 
     it('should reset third carrier position to 1', async function () {
@@ -100,11 +100,11 @@ describe('BO - Shipping - Carriers : Change carrier position', async () => {
 
       // Change position and check successful message
       const textResult = await carriersPage.changePosition(page, 3, 1);
-      await expect(textResult, 'Unable to change position').to.contains(carriersPage.successfulUpdateMessage);
+      expect(textResult, 'Unable to change position').to.contains(carriersPage.successfulUpdateMessage);
 
       // Get first row carrier name and check if is equal the first row carrier name before changing position
       const firstRowCarrierName = await carriersPage.getTextColumn(page, 1, 'name');
-      await expect(firstRowCarrierName, 'Changing position was done wrongly').to.equal(thirdRowCarrierName);
+      expect(firstRowCarrierName, 'Changing position was done wrongly').to.equal(thirdRowCarrierName);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/09_shipping/02_preferences/01_handling/01_handlingCharges.ts b/tests/UI/campaigns/functional/BO/09_shipping/02_preferences/01_handling/01_handlingCharges.ts
index d1c9bedc5ef3b..55b9715a6d562 100644
--- a/tests/UI/campaigns/functional/BO/09_shipping/02_preferences/01_handling/01_handlingCharges.ts
+++ b/tests/UI/campaigns/functional/BO/09_shipping/02_preferences/01_handling/01_handlingCharges.ts
@@ -91,7 +91,7 @@ describe('BO - Shipping - Preferences : Test handling charges for carriers in FO
       await customerSettingsPage.closeSfToolBar(page);
 
       const pageTitle = await customerSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customerSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(customerSettingsPage.pageTitle);
     });
 
     it('should go to Groups page', async function () {
@@ -100,7 +100,7 @@ describe('BO - Shipping - Preferences : Test handling charges for carriers in FO
       await customerSettingsPage.goToGroupsPage(page);
 
       const pageTitle = await groupsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(groupsPage.pageTitle);
+      expect(pageTitle).to.contains(groupsPage.pageTitle);
     });
 
     it(`should filter by '${Groups.customer.name}'`, async function () {
@@ -109,7 +109,7 @@ describe('BO - Shipping - Preferences : Test handling charges for carriers in FO
       await groupsPage.filterTable(page, 'input', 'b!name', Groups.customer.name);
 
       const textColumn = await groupsPage.getTextColumn(page, 1, 'b!name');
-      await expect(textColumn).to.contains(Groups.customer.name);
+      expect(textColumn).to.contains(Groups.customer.name);
     });
 
     it('should go to edit group page', async function () {
@@ -118,14 +118,14 @@ describe('BO - Shipping - Preferences : Test handling charges for carriers in FO
       await groupsPage.gotoEditGroupPage(page, 1);
 
       const pageTitle = await addGroupPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addGroupPage.pageTitleEdit);
+      expect(pageTitle).to.contains(addGroupPage.pageTitleEdit);
     });
 
     it('should update group by choosing \'Tax excluded\'', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateGroup1', baseContext);
 
       const textResult = await addGroupPage.setPriceDisplayMethod(page, priceDisplayMethod[0]);
-      await expect(textResult).to.contains(groupsPage.successfulUpdateMessage);
+      expect(textResult).to.contains(groupsPage.successfulUpdateMessage);
     });
   });
 
@@ -141,7 +141,7 @@ describe('BO - Shipping - Preferences : Test handling charges for carriers in FO
       );
 
       const pageTitle = await carriersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(carriersPage.pageTitle);
+      expect(pageTitle).to.contains(carriersPage.pageTitle);
     });
 
     it('should go to add new carrier page', async function () {
@@ -150,14 +150,14 @@ describe('BO - Shipping - Preferences : Test handling charges for carriers in FO
       await carriersPage.goToAddNewCarrierPage(page);
 
       const pageTitle = await addCarrierPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addCarrierPage.pageTitleCreate);
+      expect(pageTitle).to.contains(addCarrierPage.pageTitleCreate);
     });
 
     it('should create carrier and check result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createCarrier', baseContext);
 
       const textResult = await addCarrierPage.createEditCarrier(page, createCarrierData);
-      await expect(textResult).to.contains(carriersPage.successfulCreationMessage);
+      expect(textResult).to.contains(carriersPage.successfulCreationMessage);
     });
 
     it('should filter list by name and get the new carrier ID', async function () {
@@ -170,7 +170,7 @@ describe('BO - Shipping - Preferences : Test handling charges for carriers in FO
       newCarrierID = parseInt(await carriersPage.getTextColumn(page, 1, 'id_carrier'), 10);
 
       const name = await carriersPage.getTextColumn(page, 1, 'name');
-      await expect(name).to.contains(createCarrierData.name);
+      expect(name).to.contains(createCarrierData.name);
     });
   });
 
@@ -185,7 +185,7 @@ describe('BO - Shipping - Preferences : Test handling charges for carriers in FO
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Home page is not displayed').to.be.true;
+      expect(isHomePage, 'Home page is not displayed').to.eq(true);
     });
 
     it('should go to login page', async function () {
@@ -194,7 +194,7 @@ describe('BO - Shipping - Preferences : Test handling charges for carriers in FO
       await homePage.goToLoginPage(page);
 
       const pageTitle = await foLoginPage.getPageTitle(page);
-      await expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
+      expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
     });
 
     it('should sign in with default customer', async function () {
@@ -203,7 +203,7 @@ describe('BO - Shipping - Preferences : Test handling charges for carriers in FO
       await foLoginPage.customerLogin(page, Customers.johnDoe);
 
       const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
 
     it('should create an order', async function () {
@@ -220,7 +220,7 @@ describe('BO - Shipping - Preferences : Test handling charges for carriers in FO
 
       // Address step - Go to delivery step
       const isStepAddressComplete = await checkoutPage.goToDeliveryStep(page);
-      await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
     });
 
     it('should select the new carrier and check the chipping costs', async function () {
@@ -239,7 +239,7 @@ describe('BO - Shipping - Preferences : Test handling charges for carriers in FO
       await checkoutPage.logout(page);
 
       const isCustomerConnected = await checkoutPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is connected').to.be.false;
+      expect(isCustomerConnected, 'Customer is connected').to.eq(false);
     });
   });
 
@@ -251,7 +251,7 @@ describe('BO - Shipping - Preferences : Test handling charges for carriers in FO
       page = await checkoutPage.closePage(browserContext, page, 0);
 
       const pageTitle = await carriersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(carriersPage.pageTitle);
+      expect(pageTitle).to.contains(carriersPage.pageTitle);
     });
 
     it('should go to \'Shipping > Preferences\' page', async function () {
@@ -260,14 +260,14 @@ describe('BO - Shipping - Preferences : Test handling charges for carriers in FO
       await dashboardPage.goToSubMenu(page, dashboardPage.shippingLink, dashboardPage.shippingPreferencesLink);
 
       const pageTitle = await preferencesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(preferencesPage.pageTitle);
+      expect(pageTitle).to.contains(preferencesPage.pageTitle);
     });
 
     it('should update \'Handling charges\' value', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateHandlingCharges1', baseContext);
 
       const textResult = await preferencesPage.setHandlingCharges(page, updateHandlingChargesValue.toString());
-      await expect(textResult).to.contain(preferencesPage.successfulUpdateMessage);
+      expect(textResult).to.contain(preferencesPage.successfulUpdateMessage);
     });
   });
 
@@ -282,7 +282,7 @@ describe('BO - Shipping - Preferences : Test handling charges for carriers in FO
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Home page is not displayed').to.be.true;
+      expect(isHomePage, 'Home page is not displayed').to.eq(true);
     });
 
     it('should go to login page', async function () {
@@ -291,7 +291,7 @@ describe('BO - Shipping - Preferences : Test handling charges for carriers in FO
       await homePage.goToLoginPage(page);
 
       const pageTitle = await foLoginPage.getPageTitle(page);
-      await expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
+      expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
     });
 
     it('should sign in with default customer', async function () {
@@ -300,7 +300,7 @@ describe('BO - Shipping - Preferences : Test handling charges for carriers in FO
       await foLoginPage.customerLogin(page, Customers.johnDoe);
 
       const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
 
     it('should create an order', async function () {
@@ -317,7 +317,7 @@ describe('BO - Shipping - Preferences : Test handling charges for carriers in FO
 
       // Address step - Go to delivery step
       const isStepAddressComplete = await checkoutPage.goToDeliveryStep(page);
-      await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
     });
 
     it('should select the new carrier and check the chipping costs', async function () {
@@ -336,7 +336,7 @@ describe('BO - Shipping - Preferences : Test handling charges for carriers in FO
       await checkoutPage.logout(page);
 
       const isCustomerConnected = await checkoutPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is connected').to.be.false;
+      expect(isCustomerConnected, 'Customer is connected').to.eq(false);
     });
   });
 
@@ -348,14 +348,14 @@ describe('BO - Shipping - Preferences : Test handling charges for carriers in FO
       page = await checkoutPage.closePage(browserContext, page, 0);
 
       const pageTitle = await preferencesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(preferencesPage.pageTitle);
+      expect(pageTitle).to.contains(preferencesPage.pageTitle);
     });
 
     it('should update \'Handling charges\' value', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateHandlingCharges2', baseContext);
 
       const textResult = await preferencesPage.setHandlingCharges(page, defaultHandlingChargesValue.toString());
-      await expect(textResult).to.contain(preferencesPage.successfulUpdateMessage);
+      expect(textResult).to.contain(preferencesPage.successfulUpdateMessage);
     });
   });
 
@@ -371,7 +371,7 @@ describe('BO - Shipping - Preferences : Test handling charges for carriers in FO
       );
 
       const pageTitle = await carriersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(carriersPage.pageTitle);
+      expect(pageTitle).to.contains(carriersPage.pageTitle);
     });
 
     it('should filter list by name', async function () {
@@ -381,14 +381,14 @@ describe('BO - Shipping - Preferences : Test handling charges for carriers in FO
       await carriersPage.filterTable(page, 'input', 'name', createCarrierData.name);
 
       const carrierName = await carriersPage.getTextColumn(page, 1, 'name');
-      await expect(carrierName).to.contains(createCarrierData.name);
+      expect(carrierName).to.contains(createCarrierData.name);
     });
 
     it('should delete carrier', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteCarrier', baseContext);
 
       const textResult = await carriersPage.deleteCarrier(page, 1);
-      await expect(textResult).to.contains(carriersPage.successfulDeleteMessage);
+      expect(textResult).to.contains(carriersPage.successfulDeleteMessage);
 
       await carriersPage.resetFilter(page);
     });
@@ -407,7 +407,7 @@ describe('BO - Shipping - Preferences : Test handling charges for carriers in FO
       await customerSettingsPage.closeSfToolBar(page);
 
       const pageTitle = await customerSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customerSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(customerSettingsPage.pageTitle);
     });
 
     it('should go to Groups page', async function () {
@@ -416,7 +416,7 @@ describe('BO - Shipping - Preferences : Test handling charges for carriers in FO
       await customerSettingsPage.goToGroupsPage(page);
 
       const pageTitle = await groupsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(groupsPage.pageTitle);
+      expect(pageTitle).to.contains(groupsPage.pageTitle);
     });
 
     it(`should filter by '${Groups.customer.name}'`, async function () {
@@ -425,7 +425,7 @@ describe('BO - Shipping - Preferences : Test handling charges for carriers in FO
       await groupsPage.filterTable(page, 'input', 'b!name', Groups.customer.name);
 
       const textColumn = await groupsPage.getTextColumn(page, 1, 'b!name');
-      await expect(textColumn).to.contains(Groups.customer.name);
+      expect(textColumn).to.contains(Groups.customer.name);
     });
 
     it('should go to edit group page', async function () {
@@ -434,14 +434,14 @@ describe('BO - Shipping - Preferences : Test handling charges for carriers in FO
       await groupsPage.gotoEditGroupPage(page, 1);
 
       const pageTitle = await addGroupPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addGroupPage.pageTitleEdit);
+      expect(pageTitle).to.contains(addGroupPage.pageTitleEdit);
     });
 
     it('should update group by choosing \'Tax included\'', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateGroup2', baseContext);
 
       const textResult = await addGroupPage.setPriceDisplayMethod(page, priceDisplayMethod[1]);
-      await expect(textResult).to.contains(groupsPage.successfulUpdateMessage);
+      expect(textResult).to.contains(groupsPage.successfulUpdateMessage);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/09_shipping/02_preferences/02_carrierOptions/01_defaultCarrier.ts b/tests/UI/campaigns/functional/BO/09_shipping/02_preferences/02_carrierOptions/01_defaultCarrier.ts
index 1533ce93d4a25..99108ea52f459 100644
--- a/tests/UI/campaigns/functional/BO/09_shipping/02_preferences/02_carrierOptions/01_defaultCarrier.ts
+++ b/tests/UI/campaigns/functional/BO/09_shipping/02_preferences/02_carrierOptions/01_defaultCarrier.ts
@@ -61,7 +61,7 @@ describe('BO - Shipping - Preferences : Update default carrier and check it in F
     await preferencesPage.closeSfToolBar(page);
 
     const pageTitle = await preferencesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(preferencesPage.pageTitle);
+    expect(pageTitle).to.contains(preferencesPage.pageTitle);
   });
 
   const carriers: CarrierData[] = [
@@ -75,7 +75,7 @@ describe('BO - Shipping - Preferences : Update default carrier and check it in F
         await testContext.addContextItem(this, 'testIdentifier', `setDefaultCarrier${index}`, baseContext);
 
         const textResult = await preferencesPage.setDefaultCarrier(page, carrier);
-        await expect(textResult).to.contain(preferencesPage.successfulUpdateMessage);
+        expect(textResult).to.contain(preferencesPage.successfulUpdateMessage);
       });
 
       it('should view my shop', async function () {
@@ -87,7 +87,7 @@ describe('BO - Shipping - Preferences : Update default carrier and check it in F
         await foHomePage.changeLanguage(page, 'en');
 
         const isHomePage = await foHomePage.isHomePage(page);
-        await expect(isHomePage, 'Home page is not displayed').to.be.true;
+        expect(isHomePage, 'Home page is not displayed').to.eq(true);
       });
 
       it('should go to shipping step in checkout', async function () {
@@ -109,14 +109,14 @@ describe('BO - Shipping - Preferences : Update default carrier and check it in F
 
         // Address step - Go to delivery step
         const isStepAddressComplete = await foCheckoutPage.goToDeliveryStep(page);
-        await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+        expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
       });
 
       it('should verify default carrier', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `checkDefaultCarrier${index}`, baseContext);
 
         const selectedShippingMethod = await foCheckoutPage.getSelectedShippingMethod(page);
-        await expect(selectedShippingMethod, 'Wrong carrier was selected in FO').to.equal(carrier.name);
+        expect(selectedShippingMethod, 'Wrong carrier was selected in FO').to.equal(carrier.name);
       });
 
       it('should go back to BO', async function () {
@@ -125,7 +125,7 @@ describe('BO - Shipping - Preferences : Update default carrier and check it in F
         page = await foCheckoutPage.closePage(browserContext, page, 0);
 
         const pageTitle = await preferencesPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(preferencesPage.pageTitle);
+        expect(pageTitle).to.contains(preferencesPage.pageTitle);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/09_shipping/02_preferences/02_carrierOptions/02_updateCarriersSortOption.ts b/tests/UI/campaigns/functional/BO/09_shipping/02_preferences/02_carrierOptions/02_updateCarriersSortOption.ts
index 23e47b1609bd0..034357800b147 100644
--- a/tests/UI/campaigns/functional/BO/09_shipping/02_preferences/02_carrierOptions/02_updateCarriersSortOption.ts
+++ b/tests/UI/campaigns/functional/BO/09_shipping/02_preferences/02_carrierOptions/02_updateCarriersSortOption.ts
@@ -66,7 +66,7 @@ describe('BO - Shipping - Preferences : Update \'sort carriers by\' and \'Order
     );
 
     const pageTitle = await carriersPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(carriersPage.pageTitle);
+    expect(pageTitle).to.contains(carriersPage.pageTitle);
   });
 
   const carriersNames: string[] = [
@@ -79,7 +79,7 @@ describe('BO - Shipping - Preferences : Update \'sort carriers by\' and \'Order
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
       numberOfCarriers = await carriersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCarriers).to.be.above(0);
+      expect(numberOfCarriers).to.be.above(0);
     });
 
     carriersNames.forEach((carrierName: string, index: number) => {
@@ -89,7 +89,7 @@ describe('BO - Shipping - Preferences : Update \'sort carriers by\' and \'Order
         await carriersPage.filterTable(page, 'input', 'name', carrierName);
 
         const textColumn = await carriersPage.getTextColumn(page, 1, 'name');
-        await expect(textColumn).to.contains(carrierName);
+        expect(textColumn).to.contains(carrierName);
       });
 
       it('should enable the carrier', async function () {
@@ -99,18 +99,18 @@ describe('BO - Shipping - Preferences : Update \'sort carriers by\' and \'Order
 
         if (isActionPerformed) {
           const resultMessage = await carriersPage.getAlertSuccessBlockContent(page);
-          await expect(resultMessage).to.contains(carriersPage.successfulUpdateStatusMessage);
+          expect(resultMessage).to.contains(carriersPage.successfulUpdateStatusMessage);
         }
 
         const carrierStatus = await carriersPage.getStatus(page, 1);
-        await expect(carrierStatus).to.be.true;
+        expect(carrierStatus).to.eq(true);
       });
 
       it('should reset all filters', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `resetFilterAfterEnable${index}`, baseContext);
 
         const numberOfCarriersAfterReset = await carriersPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfCarriersAfterReset).to.be.equal(numberOfCarriers);
+        expect(numberOfCarriersAfterReset).to.be.equal(numberOfCarriers);
       });
     });
   });
@@ -127,7 +127,7 @@ describe('BO - Shipping - Preferences : Update \'sort carriers by\' and \'Order
       await preferencesPage.closeSfToolBar(page);
 
       const pageTitle = await preferencesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(preferencesPage.pageTitle);
+      expect(pageTitle).to.contains(preferencesPage.pageTitle);
     });
 
     const sortByPosition: string[] = [
@@ -146,7 +146,7 @@ describe('BO - Shipping - Preferences : Update \'sort carriers by\' and \'Order
         await testContext.addContextItem(this, 'testIdentifier', `setDefaultCarrier${index}`, baseContext);
 
         const textResult = await preferencesPage.setCarrierSortOrderBy(page, test.args.sortBy, test.args.orderBy);
-        await expect(textResult).to.contain(preferencesPage.successfulUpdateMessage);
+        expect(textResult).to.contain(preferencesPage.successfulUpdateMessage);
       });
 
       it('should view my shop', async function () {
@@ -158,7 +158,7 @@ describe('BO - Shipping - Preferences : Update \'sort carriers by\' and \'Order
         await foHomePage.changeLanguage(page, 'en');
 
         const isHomePage = await foHomePage.isHomePage(page);
-        await expect(isHomePage, 'Home page is not displayed').to.be.true;
+        expect(isHomePage, 'Home page is not displayed').to.eq(true);
       });
 
       it('should go to shipping step in checkout', async function () {
@@ -179,7 +179,7 @@ describe('BO - Shipping - Preferences : Update \'sort carriers by\' and \'Order
 
         // Address step - Go to delivery step
         const isStepAddressComplete = await foCheckoutPage.goToDeliveryStep(page);
-        await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+        expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
       });
 
       it('should verify the sort of carriers', async function () {
@@ -190,17 +190,17 @@ describe('BO - Shipping - Preferences : Update \'sort carriers by\' and \'Order
           const expectedResult = await basicHelper.sortArray(sortedCarriers);
 
           if (test.args.orderBy === 'Ascending') {
-            await expect(sortedCarriers).to.deep.equal(expectedResult);
+            expect(sortedCarriers).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedCarriers).to.deep.equal(expectedResult.reverse());
+            expect(sortedCarriers).to.deep.equal(expectedResult.reverse());
           }
         } else if (test.args.sortBy === 'Position') {
           const sortedCarriers = await foCheckoutPage.getAllCarriersNames(page);
 
           if (test.args.orderBy === 'Ascending') {
-            await expect(sortedCarriers).to.deep.equal(sortByPosition);
+            expect(sortedCarriers).to.deep.equal(sortByPosition);
           } else {
-            await expect(sortedCarriers).to.deep.equal(sortByPosition.reverse());
+            expect(sortedCarriers).to.deep.equal(sortByPosition.reverse());
           }
         }
       });
@@ -211,7 +211,7 @@ describe('BO - Shipping - Preferences : Update \'sort carriers by\' and \'Order
         page = await foCheckoutPage.closePage(browserContext, page, 0);
 
         const pageTitle = await preferencesPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(preferencesPage.pageTitle);
+        expect(pageTitle).to.contains(preferencesPage.pageTitle);
       });
     });
   });
@@ -227,7 +227,7 @@ describe('BO - Shipping - Preferences : Update \'sort carriers by\' and \'Order
       );
 
       const pageTitle = await carriersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(carriersPage.pageTitle);
+      expect(pageTitle).to.contains(carriersPage.pageTitle);
     });
 
     carriersNames.forEach((carrierName: string, index: number) => {
@@ -237,7 +237,7 @@ describe('BO - Shipping - Preferences : Update \'sort carriers by\' and \'Order
         await carriersPage.filterTable(page, 'input', 'name', carrierName);
 
         const textColumn = await carriersPage.getTextColumn(page, 1, 'name');
-        await expect(textColumn).to.contains(carrierName);
+        expect(textColumn).to.contains(carrierName);
       });
 
       it('should disable the carrier', async function () {
@@ -247,18 +247,18 @@ describe('BO - Shipping - Preferences : Update \'sort carriers by\' and \'Order
 
         if (isActionPerformed) {
           const resultMessage = await carriersPage.getAlertSuccessBlockContent(page);
-          await expect(resultMessage).to.contains(carriersPage.successfulUpdateStatusMessage);
+          expect(resultMessage).to.contains(carriersPage.successfulUpdateStatusMessage);
         }
 
         const carrierStatus = await carriersPage.getStatus(page, 1);
-        await expect(carrierStatus).to.be.false;
+        expect(carrierStatus).to.eq(false);
       });
 
       it('should reset all filters', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `resetFilterAfterDisable${index}`, baseContext);
 
         const numberOfCarriersAfterReset = await carriersPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfCarriersAfterReset).to.be.equal(numberOfCarriers);
+        expect(numberOfCarriersAfterReset).to.be.equal(numberOfCarriers);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/10_payment/02_preferences/01_currencyRestrictions.ts b/tests/UI/campaigns/functional/BO/10_payment/02_preferences/01_currencyRestrictions.ts
index 062665bd8d206..8ade905a6fe31 100644
--- a/tests/UI/campaigns/functional/BO/10_payment/02_preferences/01_currencyRestrictions.ts
+++ b/tests/UI/campaigns/functional/BO/10_payment/02_preferences/01_currencyRestrictions.ts
@@ -52,7 +52,7 @@ describe('BO - Payment - Preferences : Configure currency restrictions', async (
     await preferencesPage.closeSfToolBar(page);
 
     const pageTitle = await preferencesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(preferencesPage.pageTitle);
+    expect(pageTitle).to.contains(preferencesPage.pageTitle);
   });
 
   [
@@ -69,7 +69,7 @@ describe('BO - Payment - Preferences : Configure currency restrictions', async (
         test.args.paymentModule,
         test.args.exist,
       );
-      await expect(result).to.contains(preferencesPage.successfulUpdateMessage);
+      expect(result).to.contains(preferencesPage.successfulUpdateMessage);
     });
 
     it('should view my shop', async function () {
@@ -81,7 +81,7 @@ describe('BO - Payment - Preferences : Configure currency restrictions', async (
       await homePage.changeLanguage(page, 'en');
 
       const pageTitle = await homePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(homePage.pageTitle);
+      expect(pageTitle).to.contains(homePage.pageTitle);
     });
 
     it('should create the order and go to payment step', async function () {
@@ -103,11 +103,11 @@ describe('BO - Payment - Preferences : Configure currency restrictions', async (
 
       // Address step - Go to delivery step
       const isStepAddressComplete = await checkoutPage.goToDeliveryStep(page);
-      await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
 
       // Delivery step - Go to payment step
       const isStepDeliveryComplete = await checkoutPage.goToPaymentStep(page);
-      await expect(isStepDeliveryComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepDeliveryComplete, 'Step Address is not complete').to.eq(true);
     });
 
     it(`should check the '${test.args.paymentModule}' payment module`, async function () {
@@ -115,7 +115,7 @@ describe('BO - Payment - Preferences : Configure currency restrictions', async (
 
       // Payment step - Choose payment step
       const isVisible = await checkoutPage.isPaymentMethodExist(page, test.args.paymentModule);
-      await expect(isVisible).to.be.equal(test.args.exist);
+      expect(isVisible).to.be.equal(test.args.exist);
     });
 
     it('should go back to BO', async function () {
@@ -125,7 +125,7 @@ describe('BO - Payment - Preferences : Configure currency restrictions', async (
       page = await checkoutPage.closePage(browserContext, page, 0);
 
       const pageTitle = await preferencesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(preferencesPage.pageTitle);
+      expect(pageTitle).to.contains(preferencesPage.pageTitle);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/10_payment/02_preferences/02_groupRestrictions.ts b/tests/UI/campaigns/functional/BO/10_payment/02_preferences/02_groupRestrictions.ts
index 428df8478a55d..3d703a4d6e28a 100644
--- a/tests/UI/campaigns/functional/BO/10_payment/02_preferences/02_groupRestrictions.ts
+++ b/tests/UI/campaigns/functional/BO/10_payment/02_preferences/02_groupRestrictions.ts
@@ -63,14 +63,14 @@ describe('BO - Payment - Preferences : Configure group restrictions', async () =
       await customersPage.closeSfToolBar(page);
 
       const pageTitle = await customersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customersPage.pageTitle);
+      expect(pageTitle).to.contains(customersPage.pageTitle);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetBeforeCreate', baseContext);
 
       numberOfCustomers = await customersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCustomers).to.be.above(0);
+      expect(numberOfCustomers).to.be.above(0);
     });
 
     [
@@ -83,7 +83,7 @@ describe('BO - Payment - Preferences : Configure group restrictions', async () =
         await customersPage.goToAddNewCustomerPage(page);
 
         const pageTitle = await addCustomerPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addCustomerPage.pageTitleCreate);
+        expect(pageTitle).to.contains(addCustomerPage.pageTitleCreate);
       });
 
       it(`should create customer n°${index + 1} and check result`, async function () {
@@ -91,11 +91,11 @@ describe('BO - Payment - Preferences : Configure group restrictions', async () =
 
         // Create customer
         const textResult = await addCustomerPage.createEditCustomer(page, test.args.customerData);
-        await expect(textResult).to.equal(customersPage.successfulCreationMessage);
+        expect(textResult).to.equal(customersPage.successfulCreationMessage);
 
         // Check number of customers
         const numberOfCustomersAfterCreation = await customersPage.getNumberOfElementInGrid(page);
-        await expect(numberOfCustomersAfterCreation).to.be.equal(numberOfCustomers + index + 1);
+        expect(numberOfCustomersAfterCreation).to.be.equal(numberOfCustomers + index + 1);
       });
     });
   });
@@ -111,7 +111,7 @@ describe('BO - Payment - Preferences : Configure group restrictions', async () =
       );
 
       const pageTitle = await preferencesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(preferencesPage.pageTitle);
+      expect(pageTitle).to.contains(preferencesPage.pageTitle);
     });
 
     [
@@ -178,7 +178,7 @@ describe('BO - Payment - Preferences : Configure group restrictions', async () =
               test.args.paymentModuleToEdit,
               test.args.check,
             );
-            await expect(result).to.contains(preferencesPage.successfulUpdateMessage);
+            expect(result).to.contains(preferencesPage.successfulUpdateMessage);
           });
 
           it('should view my shop', async function () {
@@ -194,7 +194,7 @@ describe('BO - Payment - Preferences : Configure group restrictions', async () =
             await homePage.changeLanguage(page, 'en');
 
             const pageTitle = await homePage.getPageTitle(page);
-            await expect(pageTitle).to.contains(homePage.pageTitle);
+            expect(pageTitle).to.contains(homePage.pageTitle);
           });
 
           it('should add the first product to the cart and proceed to checkout', async function () {
@@ -213,7 +213,7 @@ describe('BO - Payment - Preferences : Configure group restrictions', async () =
             await cartPage.clickOnProceedToCheckout(page);
 
             const isCheckoutPage = await checkoutPage.isCheckoutPage(page);
-            await expect(isCheckoutPage).to.be.true;
+            expect(isCheckoutPage).to.eq(true);
           });
 
           // Personal information step - Login
@@ -229,7 +229,7 @@ describe('BO - Payment - Preferences : Configure group restrictions', async () =
               await checkoutPage.clickOnSignIn(page);
 
               const isStepLoginComplete = await checkoutPage.customerLogin(page, group.args.customer);
-              await expect(isStepLoginComplete, 'Step Personal information is not complete').to.be.true;
+              expect(isStepLoginComplete, 'Step Personal information is not complete').to.eq(true);
             });
           }
 
@@ -244,7 +244,7 @@ describe('BO - Payment - Preferences : Configure group restrictions', async () =
               );
 
               const isStepAddressComplete = await checkoutPage.setAddress(page, address);
-              await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+              expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
             });
           }
 
@@ -259,7 +259,7 @@ describe('BO - Payment - Preferences : Configure group restrictions', async () =
               );
 
               const isStepAddressComplete = await checkoutPage.goToDeliveryStep(page);
-              await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+              expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
             });
           }
 
@@ -274,15 +274,15 @@ describe('BO - Payment - Preferences : Configure group restrictions', async () =
 
             // Go to payment step
             const isStepDeliveryComplete = await checkoutPage.goToPaymentStep(page);
-            await expect(isStepDeliveryComplete, 'Step Address is not complete').to.be.true;
+            expect(isStepDeliveryComplete, 'Step Address is not complete').to.eq(true);
 
             // Check wire Payment block
             let isVisible = await checkoutPage.isPaymentMethodExist(page, test.args.paymentModuleToEdit);
-            await expect(isVisible).to.be.equal(test.args.wirePaymentExist);
+            expect(isVisible).to.be.equal(test.args.wirePaymentExist);
 
             // Check Payment block
             isVisible = await checkoutPage.isPaymentMethodExist(page, test.args.defaultPaymentModule);
-            await expect(isVisible).to.be.equal(test.args.checkPaymentExist);
+            expect(isVisible).to.be.equal(test.args.checkPaymentExist);
           });
 
           it('should go back to BO', async function () {
@@ -292,7 +292,7 @@ describe('BO - Payment - Preferences : Configure group restrictions', async () =
             page = await homePage.closePage(browserContext, page, 0);
 
             const pageTitle = await preferencesPage.getPageTitle(page);
-            await expect(pageTitle).to.contains(preferencesPage.pageTitle);
+            expect(pageTitle).to.contains(preferencesPage.pageTitle);
           });
         });
       });
@@ -310,7 +310,7 @@ describe('BO - Payment - Preferences : Configure group restrictions', async () =
       );
 
       const pageTitle = await customersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customersPage.pageTitle);
+      expect(pageTitle).to.contains(customersPage.pageTitle);
     });
 
     [
@@ -331,18 +331,18 @@ describe('BO - Payment - Preferences : Configure group restrictions', async () =
         );
 
         const textEmail = await customersPage.getTextColumnFromTableCustomers(page, 1, 'email');
-        await expect(textEmail).to.contains(test.args.customerData.email);
+        expect(textEmail).to.contains(test.args.customerData.email);
       });
 
       it(`should delete customer n°${index + 1}`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `deleteCustomer${index}`, baseContext);
 
         const textResult = await customersPage.deleteCustomer(page, 1);
-        await expect(textResult).to.equal(customersPage.successfulDeleteMessage);
+        expect(textResult).to.equal(customersPage.successfulDeleteMessage);
 
         // Check number of customers after delete
         const numberOfCustomersAfterDelete = await customersPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfCustomersAfterDelete).to.be.equal(numberOfCustomers - index + 1);
+        expect(numberOfCustomersAfterDelete).to.be.equal(numberOfCustomers - index + 1);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/10_payment/02_preferences/03_countryRestrictions.ts b/tests/UI/campaigns/functional/BO/10_payment/02_preferences/03_countryRestrictions.ts
index f8d74e0ebf9fd..0d0d45e776f78 100644
--- a/tests/UI/campaigns/functional/BO/10_payment/02_preferences/03_countryRestrictions.ts
+++ b/tests/UI/campaigns/functional/BO/10_payment/02_preferences/03_countryRestrictions.ts
@@ -54,7 +54,7 @@ describe('BO - Payment - Preferences : Configure country restrictions', async ()
     await preferencesPage.closeSfToolBar(page);
 
     const pageTitle = await preferencesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(preferencesPage.pageTitle);
+    expect(pageTitle).to.contains(preferencesPage.pageTitle);
   });
 
   [
@@ -72,7 +72,7 @@ describe('BO - Payment - Preferences : Configure country restrictions', async ()
         test.args.paymentModule,
         test.args.exist,
       );
-      await expect(result).to.contains(preferencesPage.successfulUpdateMessage);
+      expect(result).to.contains(preferencesPage.successfulUpdateMessage);
     });
 
     it('should view my shop', async function () {
@@ -84,7 +84,7 @@ describe('BO - Payment - Preferences : Configure country restrictions', async ()
       await homePage.changeLanguage(page, 'en');
 
       const pageTitle = await homePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(homePage.pageTitle);
+      expect(pageTitle).to.contains(homePage.pageTitle);
     });
 
     it('should add the first product to the cart and checkout', async function () {
@@ -103,7 +103,7 @@ describe('BO - Payment - Preferences : Configure country restrictions', async ()
       await cartPage.clickOnProceedToCheckout(page);
 
       const isCheckoutPage = await checkoutPage.isCheckoutPage(page);
-      await expect(isCheckoutPage).to.be.true;
+      expect(isCheckoutPage).to.eq(true);
     });
 
     // Personal information step - Login
@@ -115,7 +115,7 @@ describe('BO - Payment - Preferences : Configure country restrictions', async ()
         await checkoutPage.clickOnSignIn(page);
 
         const isStepLoginComplete = await checkoutPage.customerLogin(page, Customers.johnDoe);
-        await expect(isStepLoginComplete, 'Step Personal information is not complete').to.be.true;
+        expect(isStepLoginComplete, 'Step Personal information is not complete').to.eq(true);
       }
     });
 
@@ -124,7 +124,7 @@ describe('BO - Payment - Preferences : Configure country restrictions', async ()
 
       // Address step - Go to delivery step
       const isStepAddressComplete = await checkoutPage.goToDeliveryStep(page);
-      await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
     });
 
     it('should continue to payment step and check the existence of payment method', async function () {
@@ -132,11 +132,11 @@ describe('BO - Payment - Preferences : Configure country restrictions', async ()
 
       // Delivery step - Go to payment step
       const isStepDeliveryComplete = await checkoutPage.goToPaymentStep(page);
-      await expect(isStepDeliveryComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepDeliveryComplete, 'Step Address is not complete').to.eq(true);
 
       // Payment step - Check payment method
       const isVisible = await checkoutPage.isPaymentMethodExist(page, test.args.paymentModule);
-      await expect(isVisible).to.be.equal(test.args.exist);
+      expect(isVisible).to.be.equal(test.args.exist);
     });
 
     it('should go back to BO', async function () {
@@ -146,7 +146,7 @@ describe('BO - Payment - Preferences : Configure country restrictions', async ()
       page = await homePage.closePage(browserContext, page, 0);
 
       const pageTitle = await preferencesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(preferencesPage.pageTitle);
+      expect(pageTitle).to.contains(preferencesPage.pageTitle);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/10_payment/02_preferences/04_carrierRestrictions.ts b/tests/UI/campaigns/functional/BO/10_payment/02_preferences/04_carrierRestrictions.ts
index f5662e9d6de17..7169733316ba1 100644
--- a/tests/UI/campaigns/functional/BO/10_payment/02_preferences/04_carrierRestrictions.ts
+++ b/tests/UI/campaigns/functional/BO/10_payment/02_preferences/04_carrierRestrictions.ts
@@ -46,7 +46,7 @@ describe('BO - Payment - Preferences : Configure carrier restrictions and check
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should go to login page', async function () {
@@ -55,7 +55,7 @@ describe('BO - Payment - Preferences : Configure carrier restrictions and check
       await homePage.goToLoginPage(page);
 
       const pageTitle = await foLoginPage.getPageTitle(page);
-      await expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
+      expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
     });
 
     it('should sign in with default customer', async function () {
@@ -64,7 +64,7 @@ describe('BO - Payment - Preferences : Configure carrier restrictions and check
       await foLoginPage.customerLogin(page, Customers.johnDoe);
 
       const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
   });
 
@@ -84,7 +84,7 @@ describe('BO - Payment - Preferences : Configure carrier restrictions and check
       await preferencesPage.closeSfToolBar(page);
 
       const pageTitle = await preferencesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(preferencesPage.pageTitle);
+      expect(pageTitle).to.contains(preferencesPage.pageTitle);
     });
 
     [
@@ -107,7 +107,7 @@ describe('BO - Payment - Preferences : Configure carrier restrictions and check
           test.args.paymentModule,
           test.args.exist,
         );
-        await expect(result).to.contains(preferencesPage.successfulUpdateMessage);
+        expect(result).to.contains(preferencesPage.successfulUpdateMessage);
       });
 
       it('should view my shop', async function () {
@@ -119,7 +119,7 @@ describe('BO - Payment - Preferences : Configure carrier restrictions and check
         await homePage.changeLanguage(page, 'en');
 
         const pageTitle = await homePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(homePage.pageTitle);
+        expect(pageTitle).to.contains(homePage.pageTitle);
       });
 
       it('should add the first product to the cart and proceed to checkout', async function () {
@@ -133,7 +133,7 @@ describe('BO - Payment - Preferences : Configure carrier restrictions and check
         await cartPage.clickOnProceedToCheckout(page);
 
         const isCheckoutPage = await checkoutPage.isCheckoutPage(page);
-        await expect(isCheckoutPage).to.be.true;
+        expect(isCheckoutPage).to.eq(true);
       });
 
       it('should continue to delivery step', async function () {
@@ -141,7 +141,7 @@ describe('BO - Payment - Preferences : Configure carrier restrictions and check
 
         // Address step - Go to delivery step
         const isStepAddressComplete = await checkoutPage.goToDeliveryStep(page);
-        await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+        expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
       });
 
       it('should continue to payment step and check the existence of payment method', async function () {
@@ -149,11 +149,11 @@ describe('BO - Payment - Preferences : Configure carrier restrictions and check
 
         // Delivery step - Go to payment step
         const isStepDeliveryComplete = await checkoutPage.goToPaymentStep(page);
-        await expect(isStepDeliveryComplete, 'Step Address is not complete').to.be.true;
+        expect(isStepDeliveryComplete, 'Step Address is not complete').to.eq(true);
 
         // Payment step - Check payment method
         const isVisible = await checkoutPage.isPaymentMethodExist(page, test.args.paymentModule);
-        await expect(isVisible).to.be.equal(test.args.exist);
+        expect(isVisible).to.be.equal(test.args.exist);
       });
 
       it('should go back to BO', async function () {
@@ -163,7 +163,7 @@ describe('BO - Payment - Preferences : Configure carrier restrictions and check
         page = await homePage.closePage(browserContext, page, 0);
 
         const pageTitle = await preferencesPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(preferencesPage.pageTitle);
+        expect(pageTitle).to.contains(preferencesPage.pageTitle);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/11_international/01_localization/01_localization/01_importLocalizationPack.ts b/tests/UI/campaigns/functional/BO/11_international/01_localization/01_localization/01_importLocalizationPack.ts
index 00a814804b194..7c98147e96ab4 100644
--- a/tests/UI/campaigns/functional/BO/11_international/01_localization/01_localization/01_importLocalizationPack.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/01_localization/01_localization/01_importLocalizationPack.ts
@@ -67,7 +67,7 @@ describe('BO - International - Localization : Import a localization pack', async
     await localizationPage.closeSfToolBar(page);
 
     const pageTitle = await localizationPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(localizationPage.pageTitle);
+    expect(pageTitle).to.contains(localizationPage.pageTitle);
   });
 
   describe('Import localization pack and check existence of language and currency in FO', async () => {
@@ -75,7 +75,7 @@ describe('BO - International - Localization : Import a localization pack', async
       await testContext.addContextItem(this, 'testIdentifier', 'importLocalizationPack', baseContext);
 
       const textResult = await localizationPage.importLocalizationPack(page, 'Chile', contentToImport);
-      await expect(textResult).to.equal(localizationPage.importLocalizationPackSuccessfulMessage);
+      expect(textResult).to.equal(localizationPage.importLocalizationPackSuccessfulMessage);
     });
 
     it('should go to FO', async function () {
@@ -85,7 +85,7 @@ describe('BO - International - Localization : Import a localization pack', async
       page = await currenciesPage.viewMyShop(page);
 
       const isHomePage = await foHomePage.isHomePage(page);
-      await expect(isHomePage).to.be.true;
+      expect(isHomePage).to.eq(true);
     });
 
     it('should change FO currency', async function () {
@@ -95,7 +95,7 @@ describe('BO - International - Localization : Import a localization pack', async
       await foHomePage.changeCurrency(page, Currencies.chileanPeso.isoCode, Currencies.chileanPeso.symbol);
 
       const shopCurrency = await foHomePage.getDefaultCurrency(page);
-      await expect(shopCurrency).to.contain(Currencies.chileanPeso.isoCode);
+      expect(shopCurrency).to.contain(Currencies.chileanPeso.isoCode);
     });
 
     it('should change FO language', async function () {
@@ -104,7 +104,7 @@ describe('BO - International - Localization : Import a localization pack', async
       await foHomePage.changeLanguage(page, Languages.spanish.isoCode);
 
       const shopLanguage = await foHomePage.getDefaultShopLanguage(page);
-      await expect(Languages.spanish.name).to.contain(shopLanguage);
+      expect(Languages.spanish.name).to.contain(shopLanguage);
     });
 
     it('should go back to BO', async function () {
@@ -113,7 +113,7 @@ describe('BO - International - Localization : Import a localization pack', async
       page = await foHomePage.closePage(browserContext, page, 0);
 
       const pageTitle = await localizationPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(localizationPage.pageTitle);
+      expect(pageTitle).to.contains(localizationPage.pageTitle);
     });
   });
 
@@ -124,7 +124,7 @@ describe('BO - International - Localization : Import a localization pack', async
       await localizationPage.goToSubTabLanguages(page);
 
       const pageTitle = await languagesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(languagesPage.pageTitle);
+      expect(pageTitle).to.contains(languagesPage.pageTitle);
     });
 
     it(`should filter language by name '${Languages.spanish.name}'`, async function () {
@@ -133,24 +133,24 @@ describe('BO - International - Localization : Import a localization pack', async
       await languagesPage.filterTable(page, 'input', 'name', Languages.spanish.name);
 
       const numberOfLanguagesAfterFilter = await languagesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfLanguagesAfterFilter).to.be.at.least(1);
+      expect(numberOfLanguagesAfterFilter).to.be.at.least(1);
 
       const textColumn = await languagesPage.getTextColumnFromTable(page, 1, 'name');
-      await expect(textColumn).to.contains(Languages.spanish.name);
+      expect(textColumn).to.contains(Languages.spanish.name);
     });
 
     it('should delete language', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteLanguage', baseContext);
 
       const textResult = await languagesPage.deleteLanguage(page, 1);
-      await expect(textResult).to.to.contains(languagesPage.successfulDeleteMessage);
+      expect(textResult).to.to.contains(languagesPage.successfulDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetLanguages', baseContext);
 
       const numberOfLanguagesAfterReset = await languagesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfLanguagesAfterReset).to.be.at.least(1);
+      expect(numberOfLanguagesAfterReset).to.be.at.least(1);
     });
   });
 
@@ -161,7 +161,7 @@ describe('BO - International - Localization : Import a localization pack', async
       await localizationPage.goToSubTabCurrencies(page);
 
       const pageTitle = await currenciesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(currenciesPage.pageTitle);
+      expect(pageTitle).to.contains(currenciesPage.pageTitle);
     });
 
     it(`should filter by iso code of currency '${Currencies.chileanPeso.isoCode}'`, async function () {
@@ -170,21 +170,21 @@ describe('BO - International - Localization : Import a localization pack', async
       await currenciesPage.filterTable(page, 'input', 'iso_code', Currencies.chileanPeso.isoCode);
 
       const textColumn = await currenciesPage.getTextColumnFromTableCurrency(page, 1, 'iso_code');
-      await expect(textColumn).to.contains(Currencies.chileanPeso.isoCode);
+      expect(textColumn).to.contains(Currencies.chileanPeso.isoCode);
     });
 
     it('should delete currency', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteCurrency', baseContext);
 
       const result = await currenciesPage.deleteCurrency(page, 1);
-      await expect(result).to.be.equal(currenciesPage.successfulDeleteMessage);
+      expect(result).to.be.equal(currenciesPage.successfulDeleteMessage);
     });
 
     it('should reset filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetCurrencies', baseContext);
 
       const numberOfCurrenciesAfterReset = await currenciesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCurrenciesAfterReset).to.be.at.least(1);
+      expect(numberOfCurrenciesAfterReset).to.be.at.least(1);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/11_international/01_localization/01_localization/02_defaultLanguage.ts b/tests/UI/campaigns/functional/BO/11_international/01_localization/01_localization/02_defaultLanguage.ts
index 835c4ee9933dd..58373de9d9708 100644
--- a/tests/UI/campaigns/functional/BO/11_international/01_localization/01_localization/02_defaultLanguage.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/01_localization/01_localization/02_defaultLanguage.ts
@@ -56,7 +56,7 @@ describe('BO - International - Localization : Update default language', async ()
         await localizationPage.closeSfToolBar(page);
 
         const pageTitle = await localizationPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(localizationPage.pageTitle);
+        expect(pageTitle).to.contains(localizationPage.pageTitle);
       });
 
       it('should set \'Default language\' and \'Set language from browser\'', async function () {
@@ -67,7 +67,7 @@ describe('BO - International - Localization : Update default language', async ()
           test.args.language,
           test.args.defaultBrowserLanguage,
         );
-        await expect(textResult).to.equal('Update successful');
+        expect(textResult).to.equal('Update successful');
       });
     });
 
@@ -89,7 +89,7 @@ describe('BO - International - Localization : Update default language', async ()
           await homePage.goTo(page, global.FO.URL);
 
           const isHomePage = await homePage.isHomePage(page);
-          await expect(isHomePage).to.be.true;
+          expect(isHomePage).to.eq(true);
         });
 
         it('should go to FO and check the language', async function () {
diff --git a/tests/UI/campaigns/functional/BO/11_international/01_localization/01_localization/03_helpButton.ts b/tests/UI/campaigns/functional/BO/11_international/01_localization/01_localization/03_helpButton.ts
index d571bd6499cff..e13e9d4612a59 100644
--- a/tests/UI/campaigns/functional/BO/11_international/01_localization/01_localization/03_helpButton.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/01_localization/01_localization/03_helpButton.ts
@@ -43,23 +43,23 @@ describe('BO - International - Localization : Help Button', async () => {
     );
 
     const pageTitle = await localizationPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(localizationPage.pageTitle);
+    expect(pageTitle).to.contains(localizationPage.pageTitle);
   });
 
   it('should open the help side bar and check the document language', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'openHelpSidebar', baseContext);
 
     const isHelpSidebarVisible = await localizationPage.openHelpSideBar(page);
-    await expect(isHelpSidebarVisible).to.be.true;
+    expect(isHelpSidebarVisible).to.eq(true);
 
     const documentURL = await localizationPage.getHelpDocumentURL(page);
-    await expect(documentURL).to.contains('country=en');
+    expect(documentURL).to.contains('country=en');
   });
 
   it('should close the help side bar', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'closeHelpSidebar', baseContext);
 
     const isHelpSidebarVisible = await localizationPage.closeHelpSideBar(page);
-    await expect(isHelpSidebarVisible).to.be.true;
+    expect(isHelpSidebarVisible).to.eq(true);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/11_international/01_localization/01_localization/04_defaultCurrency.ts b/tests/UI/campaigns/functional/BO/11_international/01_localization/01_localization/04_defaultCurrency.ts
index ab4c399c5d844..d63c63fdd01de 100644
--- a/tests/UI/campaigns/functional/BO/11_international/01_localization/01_localization/04_defaultCurrency.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/01_localization/01_localization/04_defaultCurrency.ts
@@ -63,14 +63,14 @@ describe('BO - International - Localization : Update default currency', async ()
       await localizationPage.closeSfToolBar(page);
 
       const pageTitle = await localizationPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(localizationPage.pageTitle);
+      expect(pageTitle).to.contains(localizationPage.pageTitle);
     });
 
     it('should import localization pack', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'importLocalizationPack', baseContext);
 
       const textResult = await localizationPage.importLocalizationPack(page, 'Chile', contentToImport);
-      await expect(textResult).to.equal(localizationPage.importLocalizationPackSuccessfulMessage);
+      expect(textResult).to.equal(localizationPage.importLocalizationPackSuccessfulMessage);
     });
   });
 
@@ -120,14 +120,14 @@ describe('BO - International - Localization : Update default currency', async ()
         await localizationPage.closeSfToolBar(page);
 
         const pageTitle = await localizationPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(localizationPage.pageTitle);
+        expect(pageTitle).to.contains(localizationPage.pageTitle);
       });
 
       it('should choose default currency', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `setDefaultCurrency${index}`, baseContext);
 
         const textResult = await localizationPage.setDefaultCurrency(page, test.args.defaultCurrency);
-        await expect(textResult).to.contain(localizationPage.successfulSettingsUpdateMessage);
+        expect(textResult).to.contain(localizationPage.successfulSettingsUpdateMessage);
       });
 
       it('should go to FO and check the existence of currency', async function () {
@@ -137,7 +137,7 @@ describe('BO - International - Localization : Update default currency', async ()
         page = await localizationPage.viewMyShop(page);
 
         const defaultCurrency = await foHomePage.getDefaultCurrency(page);
-        await expect(defaultCurrency).to.equal(test.args.currency);
+        expect(defaultCurrency).to.equal(test.args.currency);
       });
 
       it('should go back to BO', async function () {
@@ -146,7 +146,7 @@ describe('BO - International - Localization : Update default currency', async ()
         page = await foHomePage.closePage(browserContext, page, 0);
 
         const pageTitle = await localizationPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(localizationPage.pageTitle);
+        expect(pageTitle).to.contains(localizationPage.pageTitle);
       });
 
       if (index === (currenciesToTest.length - 1)) {
@@ -157,7 +157,7 @@ describe('BO - International - Localization : Update default currency', async ()
             await localizationPage.goToSubTabCurrencies(page);
 
             const pageTitle = await currenciesPage.getPageTitle(page);
-            await expect(pageTitle).to.contains(currenciesPage.pageTitle);
+            expect(pageTitle).to.contains(currenciesPage.pageTitle);
           });
 
           it(`should filter by iso code of currency '${Currencies.chileanPeso.isoCode}'`, async function () {
@@ -166,21 +166,21 @@ describe('BO - International - Localization : Update default currency', async ()
             await currenciesPage.filterTable(page, 'input', 'iso_code', Currencies.chileanPeso.isoCode);
 
             const textColumn = await currenciesPage.getTextColumnFromTableCurrency(page, 1, 'iso_code');
-            await expect(textColumn).to.contains(Currencies.chileanPeso.isoCode);
+            expect(textColumn).to.contains(Currencies.chileanPeso.isoCode);
           });
 
           it('should delete currency', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'deleteCurrency', baseContext);
 
             const result = await currenciesPage.deleteCurrency(page, 1);
-            await expect(result).to.be.equal(currenciesPage.successfulDeleteMessage);
+            expect(result).to.be.equal(currenciesPage.successfulDeleteMessage);
           });
 
           it('should reset filters', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'resetCurrencies', baseContext);
 
             const numberOfCurrenciesAfterReset = await currenciesPage.resetAndGetNumberOfLines(page);
-            await expect(numberOfCurrenciesAfterReset).to.be.at.least(1);
+            expect(numberOfCurrenciesAfterReset).to.be.at.least(1);
           });
         });
 
@@ -191,7 +191,7 @@ describe('BO - International - Localization : Update default currency', async ()
             await localizationPage.goToSubTabLanguages(page);
 
             const pageTitle = await languagesPage.getPageTitle(page);
-            await expect(pageTitle).to.contains(languagesPage.pageTitle);
+            expect(pageTitle).to.contains(languagesPage.pageTitle);
           });
 
           it(`should filter language by name '${Languages.spanish.name}'`, async function () {
@@ -200,24 +200,24 @@ describe('BO - International - Localization : Update default currency', async ()
             await languagesPage.filterTable(page, 'input', 'name', Languages.spanish.name);
 
             const numberOfLanguagesAfterFilter = await languagesPage.getNumberOfElementInGrid(page);
-            await expect(numberOfLanguagesAfterFilter).to.be.at.least(1);
+            expect(numberOfLanguagesAfterFilter).to.be.at.least(1);
 
             const textColumn = await languagesPage.getTextColumnFromTable(page, 1, 'name');
-            await expect(textColumn).to.contains(Languages.spanish.name);
+            expect(textColumn).to.contains(Languages.spanish.name);
           });
 
           it('should delete language', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'deleteLanguage', baseContext);
 
             const textResult = await languagesPage.deleteLanguage(page, 1);
-            await expect(textResult).to.to.contains(languagesPage.successfulDeleteMessage);
+            expect(textResult).to.to.contains(languagesPage.successfulDeleteMessage);
           });
 
           it('should reset all filters', async function () {
             await testContext.addContextItem(this, 'testIdentifier', 'resetLanguages', baseContext);
 
             const numberOfLanguagesAfterReset = await languagesPage.resetAndGetNumberOfLines(page);
-            await expect(numberOfLanguagesAfterReset).to.be.at.least(1);
+            expect(numberOfLanguagesAfterReset).to.be.at.least(1);
           });
         });
       }
diff --git a/tests/UI/campaigns/functional/BO/11_international/01_localization/01_localization/05_defaultCountry.ts b/tests/UI/campaigns/functional/BO/11_international/01_localization/01_localization/05_defaultCountry.ts
index 22825ba1d1f62..5efc40ed67ee4 100644
--- a/tests/UI/campaigns/functional/BO/11_international/01_localization/01_localization/05_defaultCountry.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/01_localization/01_localization/05_defaultCountry.ts
@@ -61,14 +61,14 @@ describe('BO - International - Localization : Update default country', async ()
         );
 
         const pageTitle = await localizationPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(localizationPage.pageTitle);
+        expect(pageTitle).to.contains(localizationPage.pageTitle);
       });
 
       it(`should set default country to '${country}'`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `setDefaultCountry${index}`, baseContext);
 
         const textResult = await localizationPage.setDefaultCountry(page, country);
-        await expect(textResult).to.contain(localizationPage.successfulSettingsUpdateMessage);
+        expect(textResult).to.contain(localizationPage.successfulSettingsUpdateMessage);
       });
 
       it('should go to addresses page', async function () {
@@ -81,7 +81,7 @@ describe('BO - International - Localization : Update default country', async ()
         );
 
         const pageTitle = await addressesPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addressesPage.pageTitle);
+        expect(pageTitle).to.contains(addressesPage.pageTitle);
       });
 
       it('should go to add new address page', async function () {
@@ -90,14 +90,14 @@ describe('BO - International - Localization : Update default country', async ()
         await addressesPage.goToAddNewAddressPage(page);
 
         const pageTitle = await addAddressPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addAddressPage.pageTitleCreate);
+        expect(pageTitle).to.contains(addAddressPage.pageTitleCreate);
       });
 
       it('should check default country', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `checkSelectedCountry${index}`, baseContext);
 
         const selectedCountry = await addAddressPage.getSelectedCountry(page);
-        await expect(selectedCountry).to.equal(country);
+        expect(selectedCountry).to.equal(country);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/11_international/01_localization/02_languages/01_filterAndQuickEditLanguages.ts b/tests/UI/campaigns/functional/BO/11_international/01_localization/02_languages/01_filterAndQuickEditLanguages.ts
index 5fd11f2c5b95f..cfbe90718985b 100644
--- a/tests/UI/campaigns/functional/BO/11_international/01_localization/02_languages/01_filterAndQuickEditLanguages.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/01_localization/02_languages/01_filterAndQuickEditLanguages.ts
@@ -53,7 +53,7 @@ describe('BO - International - Languages : Filter and quick edit languages', asy
     await localizationPage.closeSfToolBar(page);
 
     const pageTitle = await localizationPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(localizationPage.pageTitle);
+    expect(pageTitle).to.contains(localizationPage.pageTitle);
   });
 
   it('should go to \'Languages\' page', async function () {
@@ -62,14 +62,14 @@ describe('BO - International - Languages : Filter and quick edit languages', asy
     await localizationPage.goToSubTabLanguages(page);
 
     const pageTitle = await languagesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(languagesPage.pageTitle);
+    expect(pageTitle).to.contains(languagesPage.pageTitle);
   });
 
   it('should reset all filters and get number of languages in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfLanguages = await languagesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfLanguages).to.be.above(0);
+    expect(numberOfLanguages).to.be.above(0);
   });
 
   describe('Filter languages', async () => {
@@ -152,20 +152,20 @@ describe('BO - International - Languages : Filter and quick edit languages', asy
 
         // Check number of languages
         const numberOfLanguagesAfterFilter = await languagesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfLanguagesAfterFilter).to.be.at.most(numberOfLanguages);
-        await expect(numberOfLanguagesAfterFilter).to.be.at.least(1);
+        expect(numberOfLanguagesAfterFilter).to.be.at.most(numberOfLanguages);
+        expect(numberOfLanguagesAfterFilter).to.be.at.least(1);
 
         for (let i = 1; i <= numberOfLanguagesAfterFilter; i++) {
           if (test.args.filterBy === 'active') {
             const languageStatus = await languagesPage.getStatus(page, i);
-            await expect(languageStatus).to.equal(test.args.filterValue === '1');
+            expect(languageStatus).to.equal(test.args.filterValue === '1');
           } else {
             const textColumn = await languagesPage.getTextColumnFromTable(
               page,
               i,
               test.args.filterBy,
             );
-            await expect(textColumn).to.contains(test.args.filterValue);
+            expect(textColumn).to.contains(test.args.filterValue);
           }
         }
       });
@@ -174,7 +174,7 @@ describe('BO - International - Languages : Filter and quick edit languages', asy
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}Reset`, baseContext);
 
         const numberOfLanguagesAfterReset = await languagesPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfLanguagesAfterReset).to.equal(numberOfLanguages);
+        expect(numberOfLanguagesAfterReset).to.equal(numberOfLanguages);
       });
     });
   });
@@ -187,10 +187,10 @@ describe('BO - International - Languages : Filter and quick edit languages', asy
 
       // Check number of languages
       const numberOfLanguagesAfterFilter = await languagesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfLanguagesAfterFilter).to.be.at.least(1);
+      expect(numberOfLanguagesAfterFilter).to.be.at.least(1);
 
       const textColumn = await languagesPage.getTextColumnFromTable(page, 1, 'iso_code');
-      await expect(textColumn).to.contains(Languages.english.isoCode);
+      expect(textColumn).to.contains(Languages.english.isoCode);
     });
 
     it('should disable \'en\' language and check error message', async function () {
@@ -199,14 +199,14 @@ describe('BO - International - Languages : Filter and quick edit languages', asy
       await languagesPage.setStatus(page, 1, false);
 
       const textError = await languagesPage.getAlertDangerBlockParagraphContent(page);
-      await expect(textError).to.equal(languagesPage.unSuccessfulUpdateDefaultLanguageStatusMessage);
+      expect(textError).to.equal(languagesPage.unSuccessfulUpdateDefaultLanguageStatusMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'disableDefaultLanguageReset', baseContext);
 
       const numberOfLanguagesAfterReset = await languagesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfLanguagesAfterReset).to.equal(numberOfLanguages);
+      expect(numberOfLanguagesAfterReset).to.equal(numberOfLanguages);
     });
   });
 
@@ -219,10 +219,10 @@ describe('BO - International - Languages : Filter and quick edit languages', asy
 
       // Check number od languages
       const numberOfLanguagesAfterFilter = await languagesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfLanguagesAfterFilter).to.be.at.least(1);
+      expect(numberOfLanguagesAfterFilter).to.be.at.least(1);
 
       const textColumn = await languagesPage.getTextColumnFromTable(page, 1, 'iso_code');
-      await expect(textColumn).to.contains(Languages.french.isoCode);
+      expect(textColumn).to.contains(Languages.french.isoCode);
     });
 
     const tests = [
@@ -238,10 +238,10 @@ describe('BO - International - Languages : Filter and quick edit languages', asy
 
         if (isActionPerformed) {
           const resultMessage = await languagesPage.getAlertSuccessBlockParagraphContent(page);
-          await expect(resultMessage).to.contains(languagesPage.successfulUpdateStatusMessage);
+          expect(resultMessage).to.contains(languagesPage.successfulUpdateStatusMessage);
         }
         const languageStatus = await languagesPage.getStatus(page, 1);
-        await expect(languageStatus).to.be.equal(test.args.enabledValue);
+        expect(languageStatus).to.be.equal(test.args.enabledValue);
       });
     });
 
@@ -249,7 +249,7 @@ describe('BO - International - Languages : Filter and quick edit languages', asy
       await testContext.addContextItem(this, 'testIdentifier', 'quickEditReset', baseContext);
 
       const numberOfLanguagesAfterReset = await languagesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfLanguagesAfterReset).to.equal(numberOfLanguages);
+      expect(numberOfLanguagesAfterReset).to.equal(numberOfLanguages);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/11_international/01_localization/02_languages/02_CRUDLanguage.ts b/tests/UI/campaigns/functional/BO/11_international/01_localization/02_languages/02_CRUDLanguage.ts
index ff2a431385ea8..31f55a5d9fa80 100644
--- a/tests/UI/campaigns/functional/BO/11_international/01_localization/02_languages/02_CRUDLanguage.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/01_localization/02_languages/02_CRUDLanguage.ts
@@ -77,7 +77,7 @@ describe('BO - International - Languages : CRUD language', async () => {
     await localizationPage.closeSfToolBar(page);
 
     const pageTitle = await localizationPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(localizationPage.pageTitle);
+    expect(pageTitle).to.contains(localizationPage.pageTitle);
   });
 
   it('should go to \'Languages\' page', async function () {
@@ -86,14 +86,14 @@ describe('BO - International - Languages : CRUD language', async () => {
     await localizationPage.goToSubTabLanguages(page);
 
     const pageTitle = await languagesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(languagesPage.pageTitle);
+    expect(pageTitle).to.contains(languagesPage.pageTitle);
   });
 
   it('should reset all filters and get number of languages in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfLanguages = await languagesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfLanguages).to.be.above(0);
+    expect(numberOfLanguages).to.be.above(0);
   });
 
   describe('Create Language', async () => {
@@ -103,17 +103,17 @@ describe('BO - International - Languages : CRUD language', async () => {
       await languagesPage.goToAddNewLanguage(page);
 
       const pageTitle = await addLanguagePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addLanguagePage.pageTitle);
+      expect(pageTitle).to.contains(addLanguagePage.pageTitle);
     });
 
     it('should create new language', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createNewLanguages', baseContext);
 
       const textResult = await addLanguagePage.createEditLanguage(page, createLanguageData);
-      await expect(textResult).to.to.contains(languagesPage.successfulCreationMessage);
+      expect(textResult).to.to.contains(languagesPage.successfulCreationMessage);
 
       const numberOfLanguagesAfterCreation = await languagesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfLanguagesAfterCreation).to.be.equal(numberOfLanguages + 1);
+      expect(numberOfLanguagesAfterCreation).to.be.equal(numberOfLanguages + 1);
     });
 
     it('should go to FO', async function () {
@@ -123,14 +123,14 @@ describe('BO - International - Languages : CRUD language', async () => {
       page = await languagesPage.viewMyShop(page);
 
       const isHomePage = await foHomePage.isHomePage(page);
-      await expect(isHomePage).to.be.true;
+      expect(isHomePage).to.eq(true);
     });
 
     it(`should check that '${createLanguageData.name}' exist`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkCreatedLanguageFO', baseContext);
 
       const isLanguageInFO = await foHomePage.languageExists(page, createLanguageData.isoCode);
-      await expect(isLanguageInFO, `${createLanguageData.name} was not found as a language in FO`).to.be.true;
+      expect(isLanguageInFO, `${createLanguageData.name} was not found as a language in FO`).to.eq(true);
     });
 
     it('should go back to BO', async function () {
@@ -139,7 +139,7 @@ describe('BO - International - Languages : CRUD language', async () => {
       page = await foHomePage.closePage(browserContext, page, 0);
 
       const pageTitle = await languagesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(languagesPage.pageTitle);
+      expect(pageTitle).to.contains(languagesPage.pageTitle);
     });
   });
 
@@ -152,10 +152,10 @@ describe('BO - International - Languages : CRUD language', async () => {
 
       // Check number of languages
       const numberOfLanguagesAfterFilter = await languagesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfLanguagesAfterFilter).to.be.at.least(1);
+      expect(numberOfLanguagesAfterFilter).to.be.at.least(1);
 
       const textColumn = await languagesPage.getTextColumnFromTable(page, 1, 'name');
-      await expect(textColumn).to.contains(createLanguageData.name);
+      expect(textColumn).to.contains(createLanguageData.name);
     });
 
     it('should go to edit language page', async function () {
@@ -164,17 +164,17 @@ describe('BO - International - Languages : CRUD language', async () => {
       await languagesPage.goToEditLanguage(page, 1);
 
       const pageTitle = await addLanguagePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addLanguagePage.pageEditTitle);
+      expect(pageTitle).to.contains(addLanguagePage.pageEditTitle);
     });
 
     it('should edit language', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'editLanguage', baseContext);
 
       const textResult = await addLanguagePage.createEditLanguage(page, editLanguageData);
-      await expect(textResult).to.to.contains(languagesPage.successfulUpdateMessage);
+      expect(textResult).to.to.contains(languagesPage.successfulUpdateMessage);
 
       const numberOfLanguagesAfterReset = await languagesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfLanguagesAfterReset).to.be.equal(numberOfLanguages + 1);
+      expect(numberOfLanguagesAfterReset).to.be.equal(numberOfLanguages + 1);
     });
 
     it('should go to FO', async function () {
@@ -184,14 +184,14 @@ describe('BO - International - Languages : CRUD language', async () => {
       page = await languagesPage.viewMyShop(page);
 
       const isHomePage = await foHomePage.isHomePage(page);
-      await expect(isHomePage).to.be.true;
+      expect(isHomePage).to.eq(true);
     });
 
     it(`should check that '${editLanguageData.name}' does not exist`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkUpdatedLanguageFO', baseContext);
 
       const isLanguageInFO = await foHomePage.languageExists(page, editLanguageData.isoCode);
-      await expect(isLanguageInFO, `${editLanguageData.name} was found as a language in FO`).to.be.false;
+      expect(isLanguageInFO, `${editLanguageData.name} was found as a language in FO`).to.eq(false);
     });
 
     it('should go back to BO', async function () {
@@ -200,7 +200,7 @@ describe('BO - International - Languages : CRUD language', async () => {
       page = await foHomePage.closePage(browserContext, page, 0);
 
       const pageTitle = await languagesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(languagesPage.pageTitle);
+      expect(pageTitle).to.contains(languagesPage.pageTitle);
     });
   });
 
@@ -213,24 +213,24 @@ describe('BO - International - Languages : CRUD language', async () => {
 
       // Check number of languages
       const numberOfLanguagesAfterFilter = await languagesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfLanguagesAfterFilter).to.be.at.least(1);
+      expect(numberOfLanguagesAfterFilter).to.be.at.least(1);
 
       const textColumn = await languagesPage.getTextColumnFromTable(page, 1, 'name');
-      await expect(textColumn).to.contains(editLanguageData.name);
+      expect(textColumn).to.contains(editLanguageData.name);
     });
 
     it('should delete language', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteLanguage', baseContext);
 
       const textResult = await languagesPage.deleteLanguage(page, 1);
-      await expect(textResult).to.to.contains(languagesPage.successfulDeleteMessage);
+      expect(textResult).to.to.contains(languagesPage.successfulDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDelete', baseContext);
 
       const numberOfLanguagesAfterReset = await languagesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfLanguagesAfterReset).to.be.equal(numberOfLanguages);
+      expect(numberOfLanguagesAfterReset).to.be.equal(numberOfLanguages);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/11_international/01_localization/02_languages/03_bulkActionsLanguages.ts b/tests/UI/campaigns/functional/BO/11_international/01_localization/02_languages/03_bulkActionsLanguages.ts
index 6dbcf557498ac..f91878ce375e4 100644
--- a/tests/UI/campaigns/functional/BO/11_international/01_localization/02_languages/03_bulkActionsLanguages.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/01_localization/02_languages/03_bulkActionsLanguages.ts
@@ -73,7 +73,7 @@ describe('BO - International - Languages : Bulk disable, enable and delete langu
     await localizationPage.closeSfToolBar(page);
 
     const pageTitle = await localizationPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(localizationPage.pageTitle);
+    expect(pageTitle).to.contains(localizationPage.pageTitle);
   });
 
   it('should go to \'Languages\' page', async function () {
@@ -82,14 +82,14 @@ describe('BO - International - Languages : Bulk disable, enable and delete langu
     await localizationPage.goToSubTabLanguages(page);
 
     const pageTitle = await languagesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(languagesPage.pageTitle);
+    expect(pageTitle).to.contains(languagesPage.pageTitle);
   });
 
   it('should reset all filters and get number of languages in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfLanguages = await languagesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfLanguages).to.be.above(0);
+    expect(numberOfLanguages).to.be.above(0);
   });
 
   describe('Create 2 Languages', async () => {
@@ -100,17 +100,17 @@ describe('BO - International - Languages : Bulk disable, enable and delete langu
         await languagesPage.goToAddNewLanguage(page);
 
         const pageTitle = await addLanguagePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addLanguagePage.pageTitle);
+        expect(pageTitle).to.contains(addLanguagePage.pageTitle);
       });
 
       it('should create new language', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `createLanguage${index + 1}`, baseContext);
 
         const textResult = await addLanguagePage.createEditLanguage(page, languageToCreate);
-        await expect(textResult).to.to.contains(languagesPage.successfulCreationMessage);
+        expect(textResult).to.to.contains(languagesPage.successfulCreationMessage);
 
         const numberOfLanguagesAfterCreation = await languagesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfLanguagesAfterCreation).to.be.equal(numberOfLanguages + index + 1);
+        expect(numberOfLanguagesAfterCreation).to.be.equal(numberOfLanguages + index + 1);
       });
     });
   });
@@ -128,7 +128,7 @@ describe('BO - International - Languages : Bulk disable, enable and delete langu
       await languagesPage.filterTable(page, 'input', 'name', 'languageToDelete');
 
       const numberOfLanguagesAfterFilter = await languagesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfLanguagesAfterFilter).to.be.at.least(2);
+      expect(numberOfLanguagesAfterFilter).to.be.at.least(2);
     });
 
     tests.forEach((test) => {
@@ -139,15 +139,15 @@ describe('BO - International - Languages : Bulk disable, enable and delete langu
           page,
           test.args.toEnable,
         );
-        await expect(disableTextResult).to.be.equal(languagesPage.successfulUpdateStatusMessage);
+        expect(disableTextResult).to.be.equal(languagesPage.successfulUpdateStatusMessage);
 
         // Check that element in grid are disabled
         const numberOfLanguagesInGrid = await languagesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfLanguagesInGrid).to.be.at.most(numberOfLanguages);
+        expect(numberOfLanguagesInGrid).to.be.at.most(numberOfLanguages);
 
         for (let i = 1; i <= numberOfLanguagesInGrid; i++) {
           const textColumn = await languagesPage.getStatus(page, i);
-          await expect(textColumn).to.equal(test.args.toEnable);
+          expect(textColumn).to.equal(test.args.toEnable);
         }
       });
     });
@@ -156,14 +156,14 @@ describe('BO - International - Languages : Bulk disable, enable and delete langu
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDelete', baseContext);
 
       const deleteTextResult = await languagesPage.deleteWithBulkActions(page);
-      await expect(deleteTextResult).to.be.equal(languagesPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.equal(languagesPage.successfulMultiDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDelete', baseContext);
 
       const numberOfLanguagesAfterDelete = await languagesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfLanguagesAfterDelete).to.be.equal(numberOfLanguages);
+      expect(numberOfLanguagesAfterDelete).to.be.equal(numberOfLanguages);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/11_international/01_localization/02_languages/04_sortAndPagination.ts b/tests/UI/campaigns/functional/BO/11_international/01_localization/02_languages/04_sortAndPagination.ts
index a03a9011ea53e..f5b5d233daf05 100644
--- a/tests/UI/campaigns/functional/BO/11_international/01_localization/02_languages/04_sortAndPagination.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/01_localization/02_languages/04_sortAndPagination.ts
@@ -62,7 +62,7 @@ describe('BO - International - Languages : Sort and pagination', async () => {
     await localizationPage.closeSfToolBar(page);
 
     const pageTitle = await localizationPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(localizationPage.pageTitle);
+    expect(pageTitle).to.contains(localizationPage.pageTitle);
   });
 
   it('should go to \'Languages\' page', async function () {
@@ -71,14 +71,14 @@ describe('BO - International - Languages : Sort and pagination', async () => {
     await localizationPage.goToSubTabLanguages(page);
 
     const pageTitle = await languagesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(languagesPage.pageTitle);
+    expect(pageTitle).to.contains(languagesPage.pageTitle);
   });
 
   it('should reset all filters and get number of languages in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfLanguages = await languagesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfLanguages).to.be.above(0);
+    expect(numberOfLanguages).to.be.above(0);
   });
 
   // 1 - Sort table
@@ -122,17 +122,17 @@ describe('BO - International - Languages : Sort and pagination', async () => {
           const expectedResult = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+            expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+            expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
         } else {
           const expectedResult = await basicHelper.sortArray(nonSortedTable);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         }
       });
@@ -160,17 +160,17 @@ describe('BO - International - Languages : Sort and pagination', async () => {
           await languagesPage.goToAddNewLanguage(page);
 
           const pageTitle = await addLanguagePage.getPageTitle(page);
-          await expect(pageTitle).to.contains(addLanguagePage.pageTitle);
+          expect(pageTitle).to.contains(addLanguagePage.pageTitle);
         });
 
         it(`Create language n°${index + 1} in BO`, async function () {
           await testContext.addContextItem(this, 'testIdentifier', `createNewLanguage${index}`, baseContext);
 
           const textResult = await addLanguagePage.createEditLanguage(page, test.args.languageData);
-          await expect(textResult).to.to.contains(languagesPage.successfulCreationMessage);
+          expect(textResult).to.to.contains(languagesPage.successfulCreationMessage);
 
           const numberOfLanguagesAfterCreation = await languagesPage.getNumberOfElementInGrid(page);
-          await expect(numberOfLanguagesAfterCreation).to.be.equal(numberOfLanguages + 1 + index);
+          expect(numberOfLanguagesAfterCreation).to.be.equal(numberOfLanguages + 1 + index);
         });
       });
     });
@@ -215,24 +215,24 @@ describe('BO - International - Languages : Sort and pagination', async () => {
 
           // Check number of languages
           const numberOfLanguagesAfterFilter = await languagesPage.getNumberOfElementInGrid(page);
-          await expect(numberOfLanguagesAfterFilter).to.be.at.least(1);
+          expect(numberOfLanguagesAfterFilter).to.be.at.least(1);
 
           const textColumn = await languagesPage.getTextColumnFromTable(page, 1, 'name');
-          await expect(textColumn).to.contains(test.args.languageData.name);
+          expect(textColumn).to.contains(test.args.languageData.name);
         });
 
         it('should delete language', async function () {
           await testContext.addContextItem(this, 'testIdentifier', `deleteLanguage${index}`, baseContext);
 
           const textResult = await languagesPage.deleteLanguage(page, 1);
-          await expect(textResult).to.to.contains(languagesPage.successfulDeleteMessage);
+          expect(textResult).to.to.contains(languagesPage.successfulDeleteMessage);
         });
 
         it('should reset all filters', async function () {
           await testContext.addContextItem(this, 'testIdentifier', `resetAfterDelete${index}`, baseContext);
 
           const numberOfLanguagesAfterReset = await languagesPage.resetAndGetNumberOfLines(page);
-          await expect(numberOfLanguagesAfterReset).to.be.equal(numberOfLanguages + 8 - index);
+          expect(numberOfLanguagesAfterReset).to.be.equal(numberOfLanguages + 8 - index);
         });
       });
     });
diff --git a/tests/UI/campaigns/functional/BO/11_international/01_localization/02_languages/05_helpButton.ts b/tests/UI/campaigns/functional/BO/11_international/01_localization/02_languages/05_helpButton.ts
index 368a0c985f05f..401ac30b700d3 100644
--- a/tests/UI/campaigns/functional/BO/11_international/01_localization/02_languages/05_helpButton.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/01_localization/02_languages/05_helpButton.ts
@@ -44,7 +44,7 @@ describe('BO - International - Languages : Help Button', async () => {
     await localizationPage.closeSfToolBar(page);
 
     const pageTitle = await localizationPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(localizationPage.pageTitle);
+    expect(pageTitle).to.contains(localizationPage.pageTitle);
   });
 
   it('should go to \'Languages\' page', async function () {
@@ -53,23 +53,23 @@ describe('BO - International - Languages : Help Button', async () => {
     await localizationPage.goToSubTabLanguages(page);
 
     const pageTitle = await languagesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(languagesPage.pageTitle);
+    expect(pageTitle).to.contains(languagesPage.pageTitle);
   });
 
   it('should open the help side bar and check the document language', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'openHelpSidebar', baseContext);
 
     const isHelpSidebarVisible = await languagesPage.openHelpSideBar(page);
-    await expect(isHelpSidebarVisible).to.be.true;
+    expect(isHelpSidebarVisible).to.eq(true);
 
     const documentURL = await languagesPage.getHelpDocumentURL(page);
-    await expect(documentURL).to.contains('country=en');
+    expect(documentURL).to.contains('country=en');
   });
 
   it('should close the help side bar', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'closeHelpSidebar', baseContext);
 
     const isHelpSidebarVisible = await languagesPage.closeHelpSideBar(page);
-    await expect(isHelpSidebarVisible).to.be.true;
+    expect(isHelpSidebarVisible).to.eq(true);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/11_international/01_localization/03_currencies/01_createOfficialCurrency.ts b/tests/UI/campaigns/functional/BO/11_international/01_localization/03_currencies/01_createOfficialCurrency.ts
index e725c150c8ba3..afa2c4f2c5161 100644
--- a/tests/UI/campaigns/functional/BO/11_international/01_localization/03_currencies/01_createOfficialCurrency.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/01_localization/03_currencies/01_createOfficialCurrency.ts
@@ -58,7 +58,7 @@ describe('BO - International - Currencies : Create official currency and check i
     await localizationPage.closeSfToolBar(page);
 
     const pageTitle = await localizationPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(localizationPage.pageTitle);
+    expect(pageTitle).to.contains(localizationPage.pageTitle);
   });
 
   it('should go to \'Currencies\' page', async function () {
@@ -67,14 +67,14 @@ describe('BO - International - Currencies : Create official currency and check i
     await localizationPage.goToSubTabCurrencies(page);
 
     const pageTitle = await currenciesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(currenciesPage.pageTitle);
+    expect(pageTitle).to.contains(currenciesPage.pageTitle);
   });
 
   it('should reset all filters', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfCurrencies = await currenciesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfCurrencies).to.be.above(0);
+    expect(numberOfCurrencies).to.be.above(0);
   });
 
   describe('Create official currency', async () => {
@@ -84,7 +84,7 @@ describe('BO - International - Currencies : Create official currency and check i
       await currenciesPage.goToAddNewCurrencyPage(page);
 
       const pageTitle = await addCurrencyPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addCurrencyPage.pageTitle);
+      expect(pageTitle).to.contains(addCurrencyPage.pageTitle);
     });
 
     it('should create official currency', async function () {
@@ -92,11 +92,11 @@ describe('BO - International - Currencies : Create official currency and check i
 
       // Create and check successful message
       const textResult = await addCurrencyPage.addOfficialCurrency(page, Currencies.mad);
-      await expect(textResult).to.contains(currenciesPage.successfulCreationMessage);
+      expect(textResult).to.contains(currenciesPage.successfulCreationMessage);
 
       // Check number of currencies after creation
       const numberOfCurrenciesAfterCreation = await currenciesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfCurrenciesAfterCreation).to.be.equal(numberOfCurrencies + 1);
+      expect(numberOfCurrenciesAfterCreation).to.be.equal(numberOfCurrencies + 1);
     });
 
     it(
@@ -109,7 +109,7 @@ describe('BO - International - Currencies : Create official currency and check i
 
         // Check number of currencies
         const numberOfCurrenciesAfterFilter = await currenciesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfCurrenciesAfterFilter).to.be.at.most(numberOfCurrencies + 1);
+        expect(numberOfCurrenciesAfterFilter).to.be.at.most(numberOfCurrencies + 1);
 
         // Check currency created
         const createdCurrency = await currenciesPage.getCurrencyFromTable(page, 1);
@@ -130,7 +130,7 @@ describe('BO - International - Currencies : Create official currency and check i
       page = await currenciesPage.viewMyShop(page);
 
       const isHomePage = await foHomePage.isHomePage(page);
-      await expect(isHomePage).to.be.true;
+      expect(isHomePage).to.eq(true);
     });
 
     it('should change FO currency', async function () {
@@ -140,7 +140,7 @@ describe('BO - International - Currencies : Create official currency and check i
       await foHomePage.changeCurrency(page, Currencies.mad.isoCode, Currencies.mad.symbol);
 
       const shopCurrency = await foHomePage.getDefaultCurrency(page);
-      await expect(shopCurrency).to.contain(Currencies.mad.isoCode);
+      expect(shopCurrency).to.contain(Currencies.mad.isoCode);
     });
 
     it('should go back to BO', async function () {
@@ -149,14 +149,14 @@ describe('BO - International - Currencies : Create official currency and check i
       page = await foHomePage.closePage(browserContext, page, 0);
 
       const pageTitle = await currenciesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(currenciesPage.pageTitle);
+      expect(pageTitle).to.contains(currenciesPage.pageTitle);
     });
 
     it('should reset filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterCreation', baseContext);
 
       const numberOfCurrenciesAfterReset = await currenciesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCurrenciesAfterReset).to.be.equal(numberOfCurrencies + 1);
+      expect(numberOfCurrenciesAfterReset).to.be.equal(numberOfCurrencies + 1);
     });
   });
 
@@ -169,11 +169,11 @@ describe('BO - International - Currencies : Create official currency and check i
 
       // Check number of currencies
       const numberOfCurrenciesAfterFilter = await currenciesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfCurrenciesAfterFilter).to.be.at.most(numberOfCurrencies + 1);
+      expect(numberOfCurrenciesAfterFilter).to.be.at.most(numberOfCurrencies + 1);
 
       // Check existence of currency created
       const textColumn = await currenciesPage.getTextColumnFromTableCurrency(page, 1, 'iso_code');
-      await expect(textColumn).to.contains(Currencies.mad.isoCode);
+      expect(textColumn).to.contains(Currencies.mad.isoCode);
     });
 
     it('should disable currency', async function () {
@@ -184,12 +184,12 @@ describe('BO - International - Currencies : Create official currency and check i
 
       if (isActionPerformed) {
         const resultMessage = await currenciesPage.getAlertSuccessBlockParagraphContent(page);
-        await expect(resultMessage).to.contains(currenciesPage.successfulUpdateStatusMessage);
+        expect(resultMessage).to.contains(currenciesPage.successfulUpdateStatusMessage);
       }
 
       // Check currency disabled
       const currencyStatus = await currenciesPage.getStatus(page, 1);
-      await expect(currencyStatus).to.be.equal(false);
+      expect(currencyStatus).to.be.equal(false);
     });
 
     it('should go to FO', async function () {
@@ -199,14 +199,14 @@ describe('BO - International - Currencies : Create official currency and check i
       page = await currenciesPage.viewMyShop(page);
 
       const isHomePage = await foHomePage.isHomePage(page);
-      await expect(isHomePage).to.be.true;
+      expect(isHomePage).to.eq(true);
     });
 
     it('should check that the currencies list is not visible', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkCurrency2', baseContext);
 
       const found = await foHomePage.isCurrencyDropdownExist(page);
-      await expect(found, 'Currencies list is visible').to.be.false;
+      expect(found, 'Currencies list is visible').to.eq(false);
     });
 
     it('should go back to BO', async function () {
@@ -215,14 +215,14 @@ describe('BO - International - Currencies : Create official currency and check i
       page = await foHomePage.closePage(browserContext, page, 0);
 
       const pageTitle = await currenciesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(currenciesPage.pageTitle);
+      expect(pageTitle).to.contains(currenciesPage.pageTitle);
     });
 
     it('should reset filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterDisable', baseContext);
 
       const numberOfCurrenciesAfterReset = await currenciesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCurrenciesAfterReset).to.be.equal(numberOfCurrencies + 1);
+      expect(numberOfCurrenciesAfterReset).to.be.equal(numberOfCurrencies + 1);
     });
   });
 
@@ -234,25 +234,25 @@ describe('BO - International - Currencies : Create official currency and check i
       await currenciesPage.filterTable(page, 'input', 'iso_code', Currencies.mad.isoCode);
 
       const numberOfCurrenciesAfterFilter = await currenciesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfCurrenciesAfterFilter).to.be.equal(numberOfCurrencies);
+      expect(numberOfCurrenciesAfterFilter).to.be.equal(numberOfCurrencies);
 
       // Check currency to delete
       const textColumn = await currenciesPage.getTextColumnFromTableCurrency(page, 1, 'iso_code');
-      await expect(textColumn).to.contains(Currencies.mad.isoCode);
+      expect(textColumn).to.contains(Currencies.mad.isoCode);
     });
 
     it('should delete currency', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteCurrency', baseContext);
 
       const result = await currenciesPage.deleteCurrency(page, 1);
-      await expect(result).to.be.equal(currenciesPage.successfulDeleteMessage);
+      expect(result).to.be.equal(currenciesPage.successfulDeleteMessage);
     });
 
     it('should reset filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterDelete', baseContext);
 
       const numberOfCurrenciesAfterReset = await currenciesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCurrenciesAfterReset).to.be.equal(numberOfCurrencies);
+      expect(numberOfCurrenciesAfterReset).to.be.equal(numberOfCurrencies);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/11_international/01_localization/03_currencies/02_createUnofficialCurrency.ts b/tests/UI/campaigns/functional/BO/11_international/01_localization/03_currencies/02_createUnofficialCurrency.ts
index 9a1051f3c2fb1..7efe727dcc1fe 100644
--- a/tests/UI/campaigns/functional/BO/11_international/01_localization/03_currencies/02_createUnofficialCurrency.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/01_localization/03_currencies/02_createUnofficialCurrency.ts
@@ -58,7 +58,7 @@ describe('BO - International - Currencies : Create unofficial currency and check
     await localizationPage.closeSfToolBar(page);
 
     const pageTitle = await localizationPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(localizationPage.pageTitle);
+    expect(pageTitle).to.contains(localizationPage.pageTitle);
   });
 
   it('should go to \'Currencies\' page', async function () {
@@ -67,14 +67,14 @@ describe('BO - International - Currencies : Create unofficial currency and check
     await localizationPage.goToSubTabCurrencies(page);
 
     const pageTitle = await currenciesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(currenciesPage.pageTitle);
+    expect(pageTitle).to.contains(currenciesPage.pageTitle);
   });
 
   it('should reset all filters', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfCurrencies = await currenciesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfCurrencies).to.be.above(0);
+    expect(numberOfCurrencies).to.be.above(0);
   });
 
   describe('Create unofficial currency', async () => {
@@ -84,7 +84,7 @@ describe('BO - International - Currencies : Create unofficial currency and check
       await currenciesPage.goToAddNewCurrencyPage(page);
 
       const pageTitle = await addCurrencyPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addCurrencyPage.pageTitle);
+      expect(pageTitle).to.contains(addCurrencyPage.pageTitle);
     });
 
     it('should create unofficial currency', async function () {
@@ -92,11 +92,11 @@ describe('BO - International - Currencies : Create unofficial currency and check
 
       // Check successful message after creation
       const textResult = await addCurrencyPage.createUnOfficialCurrency(page, Currencies.toman);
-      await expect(textResult).to.contains(currenciesPage.successfulCreationMessage);
+      expect(textResult).to.contains(currenciesPage.successfulCreationMessage);
 
       // Check number of currencies after creation
       const numberOfCurrenciesAfterCreation = await currenciesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfCurrenciesAfterCreation).to.be.equal(numberOfCurrencies + 1);
+      expect(numberOfCurrenciesAfterCreation).to.be.equal(numberOfCurrencies + 1);
     });
 
     it(
@@ -109,7 +109,7 @@ describe('BO - International - Currencies : Create unofficial currency and check
 
         // Check number of element
         const numberOfCurrenciesAfterFilter = await currenciesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfCurrenciesAfterFilter).to.be.equal(numberOfCurrencies);
+        expect(numberOfCurrenciesAfterFilter).to.be.equal(numberOfCurrencies);
 
         const createdCurrency = await currenciesPage.getCurrencyFromTable(page, 1);
         await Promise.all([
@@ -129,7 +129,7 @@ describe('BO - International - Currencies : Create unofficial currency and check
       page = await currenciesPage.viewMyShop(page);
 
       const isHomePage = await foHomePage.isHomePage(page);
-      await expect(isHomePage).to.be.true;
+      expect(isHomePage).to.eq(true);
     });
 
     it('should change FO currency', async function () {
@@ -139,7 +139,7 @@ describe('BO - International - Currencies : Create unofficial currency and check
       await foHomePage.changeCurrency(page, Currencies.toman.isoCode, Currencies.toman.symbol);
 
       const shopCurrency = await foHomePage.getDefaultCurrency(page);
-      await expect(shopCurrency).to.contain(Currencies.toman.isoCode);
+      expect(shopCurrency).to.contain(Currencies.toman.isoCode);
     });
 
     it('should go back to BO', async function () {
@@ -148,14 +148,14 @@ describe('BO - International - Currencies : Create unofficial currency and check
       page = await foHomePage.closePage(browserContext, page, 0);
 
       const pageTitle = await currenciesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(currenciesPage.pageTitle);
+      expect(pageTitle).to.contains(currenciesPage.pageTitle);
     });
 
     it('should reset filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterCreation', baseContext);
 
       const numberOfCurrenciesAfterReset = await currenciesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCurrenciesAfterReset).to.be.equal(numberOfCurrencies + 1);
+      expect(numberOfCurrenciesAfterReset).to.be.equal(numberOfCurrencies + 1);
     });
   });
 
@@ -168,11 +168,11 @@ describe('BO - International - Currencies : Create unofficial currency and check
 
       // Check number of currencies
       const numberOfCurrenciesAfterFilter = await currenciesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfCurrenciesAfterFilter).to.be.equal(numberOfCurrencies);
+      expect(numberOfCurrenciesAfterFilter).to.be.equal(numberOfCurrencies);
 
       // Check currency created
       const textColumn = await currenciesPage.getTextColumnFromTableCurrency(page, 1, 'iso_code');
-      await expect(textColumn).to.contains(Currencies.toman.isoCode);
+      expect(textColumn).to.contains(Currencies.toman.isoCode);
     });
 
     it('should disable currency', async function () {
@@ -182,12 +182,12 @@ describe('BO - International - Currencies : Create unofficial currency and check
 
       if (isActionPerformed) {
         const resultMessage = await currenciesPage.getAlertSuccessBlockParagraphContent(page);
-        await expect(resultMessage).to.contains(currenciesPage.successfulUpdateStatusMessage);
+        expect(resultMessage).to.contains(currenciesPage.successfulUpdateStatusMessage);
       }
 
       // Check currency disabled
       const currencyStatus = await currenciesPage.getStatus(page, 1);
-      await expect(currencyStatus).to.be.equal(false);
+      expect(currencyStatus).to.be.equal(false);
     });
 
     it('should go to FO', async function () {
@@ -197,14 +197,14 @@ describe('BO - International - Currencies : Create unofficial currency and check
       page = await currenciesPage.viewMyShop(page);
 
       const isHomePage = await foHomePage.isHomePage(page);
-      await expect(isHomePage).to.be.true;
+      expect(isHomePage).to.eq(true);
     });
 
     it('should check that the currencies list is not visible', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkCurrency2', baseContext);
 
       const found = await foHomePage.isCurrencyDropdownExist(page);
-      await expect(found, 'Currencies list is visible').to.be.false;
+      expect(found, 'Currencies list is visible').to.eq(false);
     });
 
     it('should go back to BO', async function () {
@@ -213,14 +213,14 @@ describe('BO - International - Currencies : Create unofficial currency and check
       page = await foHomePage.closePage(browserContext, page, 0);
 
       const pageTitle = await currenciesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(currenciesPage.pageTitle);
+      expect(pageTitle).to.contains(currenciesPage.pageTitle);
     });
 
     it('should reset filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterDisable', baseContext);
 
       const numberOfCurrenciesAfterReset = await currenciesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCurrenciesAfterReset).to.be.equal(numberOfCurrencies + 1);
+      expect(numberOfCurrenciesAfterReset).to.be.equal(numberOfCurrencies + 1);
     });
   });
 
@@ -233,24 +233,24 @@ describe('BO - International - Currencies : Create unofficial currency and check
 
       // Check number of currencies
       const numberOfCurrenciesAfterFilter = await currenciesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfCurrenciesAfterFilter).to.be.equal(numberOfCurrencies);
+      expect(numberOfCurrenciesAfterFilter).to.be.equal(numberOfCurrencies);
 
       const textColumn = await currenciesPage.getTextColumnFromTableCurrency(page, 1, 'iso_code');
-      await expect(textColumn).to.contains(Currencies.toman.isoCode);
+      expect(textColumn).to.contains(Currencies.toman.isoCode);
     });
 
     it('should delete currency', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteCurrency', baseContext);
 
       const result = await currenciesPage.deleteCurrency(page, 1);
-      await expect(result).to.be.equal(currenciesPage.successfulDeleteMessage);
+      expect(result).to.be.equal(currenciesPage.successfulDeleteMessage);
     });
 
     it('should reset filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterDelete', baseContext);
 
       const numberOfCurrenciesAfterReset = await currenciesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCurrenciesAfterReset).to.be.equal(numberOfCurrencies);
+      expect(numberOfCurrenciesAfterReset).to.be.equal(numberOfCurrencies);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/11_international/01_localization/03_currencies/03_helpButton.ts b/tests/UI/campaigns/functional/BO/11_international/01_localization/03_currencies/03_helpButton.ts
index 30fe56dc23ff9..8689d38656514 100644
--- a/tests/UI/campaigns/functional/BO/11_international/01_localization/03_currencies/03_helpButton.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/01_localization/03_currencies/03_helpButton.ts
@@ -44,7 +44,7 @@ describe('BO - International - currencies : Help button', async () => {
     );
 
     const pageTitle = await localizationPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(localizationPage.pageTitle);
+    expect(pageTitle).to.contains(localizationPage.pageTitle);
   });
 
   it('should go to \'Currencies\' page', async function () {
@@ -53,23 +53,23 @@ describe('BO - International - currencies : Help button', async () => {
     await localizationPage.goToSubTabCurrencies(page);
 
     const pageTitle = await currenciesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(currenciesPage.pageTitle);
+    expect(pageTitle).to.contains(currenciesPage.pageTitle);
   });
 
   it('should open the help side bar and check the document language', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'openHelpSidebar', baseContext);
 
     const isHelpSidebarVisible = await currenciesPage.openHelpSideBar(page);
-    await expect(isHelpSidebarVisible).to.be.true;
+    expect(isHelpSidebarVisible).to.eq(true);
 
     const documentURL = await currenciesPage.getHelpDocumentURL(page);
-    await expect(documentURL).to.contains('country=en');
+    expect(documentURL).to.contains('country=en');
   });
 
   it('should close the help side bar', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'closeHelpSidebar', baseContext);
 
     const isHelpSidebarVisible = await currenciesPage.closeHelpSideBar(page);
-    await expect(isHelpSidebarVisible).to.be.true;
+    expect(isHelpSidebarVisible).to.eq(true);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/11_international/01_localization/03_currencies/04_updateExchangeRate.ts b/tests/UI/campaigns/functional/BO/11_international/01_localization/03_currencies/04_updateExchangeRate.ts
index 6ae00e6739563..1801dc72ef2e0 100644
--- a/tests/UI/campaigns/functional/BO/11_international/01_localization/03_currencies/04_updateExchangeRate.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/01_localization/03_currencies/04_updateExchangeRate.ts
@@ -52,7 +52,7 @@ describe('BO - International - Currencies : Update exchange rate', async () => {
       await localizationPage.closeSfToolBar(page);
 
       const pageTitle = await localizationPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(localizationPage.pageTitle);
+      expect(pageTitle).to.contains(localizationPage.pageTitle);
     });
 
     it('should go to \'Currencies\' page', async function () {
@@ -61,14 +61,14 @@ describe('BO - International - Currencies : Update exchange rate', async () => {
       await localizationPage.goToSubTabCurrencies(page);
 
       const pageTitle = await currenciesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(currenciesPage.pageTitle);
+      expect(pageTitle).to.contains(currenciesPage.pageTitle);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
       numberOfCurrencies = await currenciesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCurrencies).to.be.above(0);
+      expect(numberOfCurrencies).to.be.above(0);
     });
 
     it('should go to create new currency page', async function () {
@@ -77,7 +77,7 @@ describe('BO - International - Currencies : Update exchange rate', async () => {
       await currenciesPage.goToAddNewCurrencyPage(page);
 
       const pageTitle = await addCurrencyPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addCurrencyPage.pageTitle);
+      expect(pageTitle).to.contains(addCurrencyPage.pageTitle);
     });
 
     it('should create currency', async function () {
@@ -85,11 +85,11 @@ describe('BO - International - Currencies : Update exchange rate', async () => {
 
       // Create and check successful message
       const textResult = await addCurrencyPage.addOfficialCurrency(page, Currencies.mad);
-      await expect(textResult).to.contains(currenciesPage.successfulCreationMessage);
+      expect(textResult).to.contains(currenciesPage.successfulCreationMessage);
 
       // Check number of currencies after creation
       const numberOfCurrenciesAfterCreation = await currenciesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfCurrenciesAfterCreation).to.be.equal(numberOfCurrencies + 1);
+      expect(numberOfCurrenciesAfterCreation).to.be.equal(numberOfCurrencies + 1);
     });
   });
 
@@ -101,11 +101,11 @@ describe('BO - International - Currencies : Update exchange rate', async () => {
       await currenciesPage.filterTable(page, 'input', 'iso_code', Currencies.mad.isoCode);
 
       const numberOfCurrenciesAfterFilter = await currenciesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfCurrenciesAfterFilter).to.be.equal(numberOfCurrencies);
+      expect(numberOfCurrenciesAfterFilter).to.be.equal(numberOfCurrencies);
 
       // Check currency to delete
       const textColumn = await currenciesPage.getTextColumnFromTableCurrency(page, 1, 'iso_code');
-      await expect(textColumn).to.contains(Currencies.mad.isoCode);
+      expect(textColumn).to.contains(Currencies.mad.isoCode);
     });
 
     it('should go to the created currency page', async function () {
@@ -114,7 +114,7 @@ describe('BO - International - Currencies : Update exchange rate', async () => {
       await currenciesPage.goToEditCurrencyPage(page, 1);
 
       const pageTitle = await addCurrencyPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addCurrencyPage.editCurrencyPage);
+      expect(pageTitle).to.contains(addCurrencyPage.editCurrencyPage);
     });
 
     it('should update the exchange rate of the created currency', async function () {
@@ -122,7 +122,7 @@ describe('BO - International - Currencies : Update exchange rate', async () => {
 
       // Update and check successful message
       const textResult = await addCurrencyPage.updateExchangeRate(page, newExchangeRate);
-      await expect(textResult).to.contains(currenciesPage.successfulUpdateMessage);
+      expect(textResult).to.contains(currenciesPage.successfulUpdateMessage);
     });
 
     it('should click on Update exchange rate button', async function () {
@@ -130,7 +130,7 @@ describe('BO - International - Currencies : Update exchange rate', async () => {
 
       // Click on update exchange rates button and check successful message
       const textResult = await currenciesPage.updateExchangeRate(page);
-      await expect(textResult).to.contains(currenciesPage.successfulUpdateMessage);
+      expect(textResult).to.contains(currenciesPage.successfulUpdateMessage);
     });
 
     it(`should filter by iso code of currency '${Currencies.mad.isoCode}'`, async function () {
@@ -140,14 +140,14 @@ describe('BO - International - Currencies : Update exchange rate', async () => {
       await currenciesPage.filterTable(page, 'input', 'iso_code', Currencies.mad.isoCode);
 
       const textColumn = await currenciesPage.getTextColumnFromTableCurrency(page, 1, 'iso_code');
-      await expect(textColumn).to.contains(Currencies.mad.isoCode);
+      expect(textColumn).to.contains(Currencies.mad.isoCode);
     });
 
     it(`should check that the exchange rate of currency '${Currencies.mad.isoCode}' is updated`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkExchangeRates', baseContext);
 
       const textColumn = await currenciesPage.getTextColumnFromTableCurrency(page, 1, 'conversion_rate');
-      await expect(textColumn).to.not.equal(newExchangeRate);
+      expect(textColumn).to.not.equal(newExchangeRate);
     });
   });
 
@@ -159,25 +159,25 @@ describe('BO - International - Currencies : Update exchange rate', async () => {
       await currenciesPage.filterTable(page, 'input', 'iso_code', Currencies.mad.isoCode);
 
       const numberOfCurrenciesAfterFilter = await currenciesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfCurrenciesAfterFilter).to.be.equal(numberOfCurrencies);
+      expect(numberOfCurrenciesAfterFilter).to.be.equal(numberOfCurrencies);
 
       // Check currency to delete
       const textColumn = await currenciesPage.getTextColumnFromTableCurrency(page, 1, 'iso_code');
-      await expect(textColumn).to.contains(Currencies.mad.isoCode);
+      expect(textColumn).to.contains(Currencies.mad.isoCode);
     });
 
     it('should delete currency', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteCurrency', baseContext);
 
       const result = await currenciesPage.deleteCurrency(page, 1);
-      await expect(result).to.be.equal(currenciesPage.successfulDeleteMessage);
+      expect(result).to.be.equal(currenciesPage.successfulDeleteMessage);
     });
 
     it('should reset filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterDelete', baseContext);
 
       const numberOfCurrenciesAfterReset = await currenciesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCurrenciesAfterReset).to.be.equal(numberOfCurrencies);
+      expect(numberOfCurrenciesAfterReset).to.be.equal(numberOfCurrencies);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/11_international/01_localization/03_currencies/05_filterSortAndPagination.ts b/tests/UI/campaigns/functional/BO/11_international/01_localization/03_currencies/05_filterSortAndPagination.ts
index d5f660d752ba3..90da674c5a0cc 100644
--- a/tests/UI/campaigns/functional/BO/11_international/01_localization/03_currencies/05_filterSortAndPagination.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/01_localization/03_currencies/05_filterSortAndPagination.ts
@@ -58,7 +58,7 @@ describe('BO - International - Currencies : Filter, sort and pagination', async
     await localizationPage.closeSfToolBar(page);
 
     const pageTitle = await localizationPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(localizationPage.pageTitle);
+    expect(pageTitle).to.contains(localizationPage.pageTitle);
   });
 
   it('should go to \'Currencies\' page', async function () {
@@ -67,14 +67,14 @@ describe('BO - International - Currencies : Filter, sort and pagination', async
     await localizationPage.goToSubTabCurrencies(page);
 
     const pageTitle = await currenciesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(currenciesPage.pageTitle);
+    expect(pageTitle).to.contains(currenciesPage.pageTitle);
   });
 
   it('should reset all filters', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfCurrencies = await currenciesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfCurrencies).to.be.above(0);
+    expect(numberOfCurrencies).to.be.above(0);
   });
 
   const currencies: CurrencyData[] = [Currencies.mad, Currencies.all, Currencies.chileanPeso, Currencies.dzd, Currencies.tnd,
@@ -90,7 +90,7 @@ describe('BO - International - Currencies : Filter, sort and pagination', async
         await currenciesPage.goToAddNewCurrencyPage(page);
 
         const pageTitle = await addCurrencyPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addCurrencyPage.pageTitle);
+        expect(pageTitle).to.contains(addCurrencyPage.pageTitle);
       });
 
       it('should create currency', async function () {
@@ -98,11 +98,11 @@ describe('BO - International - Currencies : Filter, sort and pagination', async
 
         // Create and check successful message
         const textResult = await addCurrencyPage.addOfficialCurrency(page, currency);
-        await expect(textResult).to.contains(currenciesPage.successfulCreationMessage);
+        expect(textResult).to.contains(currenciesPage.successfulCreationMessage);
 
         // Check number of currencies after creation
         const numberOfCurrenciesAfterCreation = await currenciesPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfCurrenciesAfterCreation).to.be.equal(numberOfCurrencies + 1 + index);
+        expect(numberOfCurrenciesAfterCreation).to.be.equal(numberOfCurrencies + 1 + index);
       });
     });
   });
@@ -169,22 +169,22 @@ describe('BO - International - Currencies : Filter, sort and pagination', async
         );
         if (test.args.filterBy === 'active') {
           const currencyStatus = await currenciesPage.getStatus(page, 1);
-          await expect(currencyStatus).to.be.equal(test.args.filterValue === '1');
+          expect(currencyStatus).to.be.equal(test.args.filterValue === '1');
         } else {
           const currency = await currenciesPage.getTextColumnFromTableCurrency(page, 1, test.args.filterBy);
-          await expect(currency).to.contains(test.args.filterValue);
+          expect(currency).to.contains(test.args.filterValue);
         }
 
         // Check number of currencies
         const numberOfCurrenciesAfterFilter = await currenciesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfCurrenciesAfterFilter).to.be.most(numberOfCurrencies + 10);
+        expect(numberOfCurrenciesAfterFilter).to.be.most(numberOfCurrencies + 10);
       });
 
       it('should reset filter', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `resetFilter${index}`, baseContext);
 
         const numberOfCurrenciesAfterReset = await currenciesPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfCurrenciesAfterReset).to.be.equal(numberOfCurrencies + 10);
+        expect(numberOfCurrenciesAfterReset).to.be.equal(numberOfCurrencies + 10);
       });
     });
   });
@@ -266,17 +266,17 @@ describe('BO - International - Currencies : Filter, sort and pagination', async
           const expectedResult = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+            expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+            expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
         } else {
           const expectedResult = await basicHelper.sortArray(nonSortedTable);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         }
       });
@@ -292,21 +292,21 @@ describe('BO - International - Currencies : Filter, sort and pagination', async
         await currenciesPage.filterTable(page, 'input', 'name', currency.name);
 
         const currencyName = await currenciesPage.getTextColumnFromTableCurrency(page, 1, 'name');
-        await expect(currencyName).to.contains(currency.name);
+        expect(currencyName).to.contains(currency.name);
       });
 
       it('should delete currency', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `deleteCurrency${index}`, baseContext);
 
         const result = await currenciesPage.deleteCurrency(page, 1);
-        await expect(result).to.be.equal(currenciesPage.successfulDeleteMessage);
+        expect(result).to.be.equal(currenciesPage.successfulDeleteMessage);
       });
 
       it('should reset filter', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `resetFilterAfterDelete${index}`, baseContext);
 
         const numberOfCurrenciesAfterReset = await currenciesPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfCurrenciesAfterReset).to.be.equal(numberOfCurrencies + 10 - index - 1);
+        expect(numberOfCurrenciesAfterReset).to.be.equal(numberOfCurrencies + 10 - index - 1);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/11_international/02_locations/01_zones/01_filterAndQuickEditZones.ts b/tests/UI/campaigns/functional/BO/11_international/02_locations/01_zones/01_filterAndQuickEditZones.ts
index 7378b80c96b5b..859a7ef88a57f 100644
--- a/tests/UI/campaigns/functional/BO/11_international/02_locations/01_zones/01_filterAndQuickEditZones.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/02_locations/01_zones/01_filterAndQuickEditZones.ts
@@ -51,14 +51,14 @@ describe('BO - International - Zones : Filter and quick edit', async () => {
     await zonesPage.closeSfToolBar(page);
 
     const pageTitle = await zonesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(zonesPage.pageTitle);
+    expect(pageTitle).to.contains(zonesPage.pageTitle);
   });
 
   it('should reset all filters and get number of zones in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfZones = await zonesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfZones).to.be.above(0);
+    expect(numberOfZones).to.be.above(0);
   });
 
   describe('Filter zones', async () => {
@@ -99,19 +99,19 @@ describe('BO - International - Zones : Filter and quick edit', async () => {
         );
 
         const numberOfZonesAfterFilter = await zonesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfZonesAfterFilter).to.be.at.most(numberOfZones);
+        expect(numberOfZonesAfterFilter).to.be.at.most(numberOfZones);
 
         for (let row = 1; row <= numberOfZonesAfterFilter; row++) {
           if (test.args.filterBy === 'active') {
             const zoneStatus = await zonesPage.getZoneStatus(page, row);
-            await expect(zoneStatus).to.equal(test.args.filterValue === '1');
+            expect(zoneStatus).to.equal(test.args.filterValue === '1');
           } else {
             const textColumn = await zonesPage.getTextColumn(
               page,
               row,
               test.args.filterBy,
             );
-            await expect(textColumn).to.contains(test.args.filterValue);
+            expect(textColumn).to.contains(test.args.filterValue);
           }
         }
       });
@@ -120,7 +120,7 @@ describe('BO - International - Zones : Filter and quick edit', async () => {
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}Reset`, baseContext);
 
         const numberOfZonesAfterReset = await zonesPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfZonesAfterReset).to.equal(numberOfZones);
+        expect(numberOfZonesAfterReset).to.equal(numberOfZones);
       });
     });
   });
@@ -137,10 +137,10 @@ describe('BO - International - Zones : Filter and quick edit', async () => {
       );
 
       const numberOfZonesAfterFilter = await zonesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfZonesAfterFilter).to.be.below(numberOfZones);
+      expect(numberOfZonesAfterFilter).to.be.below(numberOfZones);
 
       const textColumn = await zonesPage.getTextColumn(page, 1, 'name');
-      await expect(textColumn).to.contains(Zones.northAmerica.name);
+      expect(textColumn).to.contains(Zones.northAmerica.name);
     });
 
     [
@@ -157,7 +157,7 @@ describe('BO - International - Zones : Filter and quick edit', async () => {
         );
 
         const currentStatus = await zonesPage.getZoneStatus(page, 1);
-        await expect(currentStatus).to.be.equal(status.args.enable);
+        expect(currentStatus).to.be.equal(status.args.enable);
       });
     });
 
@@ -165,7 +165,7 @@ describe('BO - International - Zones : Filter and quick edit', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterQuickEdit', baseContext);
 
       const numberOfZonesAfterReset = await zonesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfZonesAfterReset).to.equal(numberOfZones);
+      expect(numberOfZonesAfterReset).to.equal(numberOfZones);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/11_international/02_locations/01_zones/02_CRUDZone.ts b/tests/UI/campaigns/functional/BO/11_international/02_locations/01_zones/02_CRUDZone.ts
index 81db57185bce8..165f3c2ecce85 100644
--- a/tests/UI/campaigns/functional/BO/11_international/02_locations/01_zones/02_CRUDZone.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/02_locations/01_zones/02_CRUDZone.ts
@@ -51,14 +51,14 @@ describe('BO - International - Zones : CRUD zone', async () => {
     await zonesPage.closeSfToolBar(page);
 
     const pageTitle = await zonesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(zonesPage.pageTitle);
+    expect(pageTitle).to.contains(zonesPage.pageTitle);
   });
 
   it('should reset all filters and get number of zones in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfZones = await zonesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfZones).to.be.above(0);
+    expect(numberOfZones).to.be.above(0);
   });
 
   describe('Create zone', async () => {
@@ -68,17 +68,17 @@ describe('BO - International - Zones : CRUD zone', async () => {
       await zonesPage.goToAddNewZonePage(page);
 
       const pageTitle = await addZonePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addZonePage.pageTitleCreate);
+      expect(pageTitle).to.contains(addZonePage.pageTitleCreate);
     });
 
     it('should create new zone', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createNewZone', baseContext);
 
       const textResult = await addZonePage.createEditZone(page, createZoneData);
-      await expect(textResult).to.to.contains(zonesPage.successfulCreationMessage);
+      expect(textResult).to.to.contains(zonesPage.successfulCreationMessage);
 
       const numberOfZonesAfterCreation = await zonesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfZonesAfterCreation).to.be.equal(numberOfZones + 1);
+      expect(numberOfZonesAfterCreation).to.be.equal(numberOfZones + 1);
     });
   });
 
@@ -91,11 +91,11 @@ describe('BO - International - Zones : CRUD zone', async () => {
 
       // Check number of zones
       const numberOfZonesAfterFilter = await zonesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfZonesAfterFilter).to.be.at.least(1);
+      expect(numberOfZonesAfterFilter).to.be.at.least(1);
 
       // row = 1 (first row)
       const textColumn = await zonesPage.getTextColumn(page, 1, 'name');
-      await expect(textColumn).to.contains(createZoneData.name);
+      expect(textColumn).to.contains(createZoneData.name);
     });
 
     it('should go to edit zone page', async function () {
@@ -104,17 +104,17 @@ describe('BO - International - Zones : CRUD zone', async () => {
       await zonesPage.goToEditZonePage(page, 1);
 
       const pageTitle = await addZonePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addZonePage.pageTitleEdit);
+      expect(pageTitle).to.contains(addZonePage.pageTitleEdit);
     });
 
     it('should edit zone', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'ediZone', baseContext);
 
       const textResult = await addZonePage.createEditZone(page, editZoneData);
-      await expect(textResult).to.to.contains(zonesPage.successfulUpdateMessage);
+      expect(textResult).to.to.contains(zonesPage.successfulUpdateMessage);
 
       const numberOfZonesAfterReset = await zonesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfZonesAfterReset).to.be.equal(numberOfZones + 1);
+      expect(numberOfZonesAfterReset).to.be.equal(numberOfZones + 1);
     });
   });
 
@@ -127,24 +127,24 @@ describe('BO - International - Zones : CRUD zone', async () => {
 
       // Check number of zones
       const numberOfZonesAfterFilter = await zonesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfZonesAfterFilter).to.be.at.least(1);
+      expect(numberOfZonesAfterFilter).to.be.at.least(1);
 
       const textColumn = await zonesPage.getTextColumn(page, 1, 'name');
-      await expect(textColumn).to.contains(editZoneData.name);
+      expect(textColumn).to.contains(editZoneData.name);
     });
 
     it('should delete zone', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteZone', baseContext);
 
       const textResult = await zonesPage.deleteZone(page, 1);
-      await expect(textResult).to.to.contains(zonesPage.successfulDeleteMessage);
+      expect(textResult).to.to.contains(zonesPage.successfulDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDelete', baseContext);
 
       const numberOfZonesAfterReset = await zonesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfZonesAfterReset).to.be.equal(numberOfZones);
+      expect(numberOfZonesAfterReset).to.be.equal(numberOfZones);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/11_international/02_locations/01_zones/03_bulkActionsZones.ts b/tests/UI/campaigns/functional/BO/11_international/02_locations/01_zones/03_bulkActionsZones.ts
index 766e3050fb02b..96341418a4d49 100644
--- a/tests/UI/campaigns/functional/BO/11_international/02_locations/01_zones/03_bulkActionsZones.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/02_locations/01_zones/03_bulkActionsZones.ts
@@ -53,14 +53,14 @@ describe('BO - International - Zones : Bulk enable, disable and delete', async (
     await zonesPage.closeSfToolBar(page);
 
     const pageTitle = await zonesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(zonesPage.pageTitle);
+    expect(pageTitle).to.contains(zonesPage.pageTitle);
   });
 
   it('should reset all filters and get number of zones in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfZones = await zonesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfZones).to.be.above(0);
+    expect(numberOfZones).to.be.above(0);
   });
 
   describe('Create 2 zones in BO', async () => {
@@ -71,17 +71,17 @@ describe('BO - International - Zones : Bulk enable, disable and delete', async (
         await zonesPage.goToAddNewZonePage(page);
 
         const pageTitle = await addZonePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addZonePage.pageTitleCreate);
+        expect(pageTitle).to.contains(addZonePage.pageTitleCreate);
       });
 
       it('should create zone and check result', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `createZone${index + 1}`, baseContext);
 
         const textResult = await addZonePage.createEditZone(page, zoneToCreate);
-        await expect(textResult).to.contains(zonesPage.successfulCreationMessage);
+        expect(textResult).to.contains(zonesPage.successfulCreationMessage);
 
         const numberOfZonesAfterCreation = await zonesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfZonesAfterCreation).to.be.equal(numberOfZones + index + 1);
+        expect(numberOfZonesAfterCreation).to.be.equal(numberOfZones + index + 1);
       });
     });
   });
@@ -98,7 +98,7 @@ describe('BO - International - Zones : Bulk enable, disable and delete', async (
       );
 
       const numberOfZonesAfterFilter = await zonesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfZonesAfterFilter).to.be.at.most(numberOfZones);
+      expect(numberOfZonesAfterFilter).to.be.at.most(numberOfZones);
 
       for (let i = 1; i <= numberOfZonesAfterFilter; i++) {
         const textColumn = await zonesPage.getTextColumn(
@@ -106,7 +106,7 @@ describe('BO - International - Zones : Bulk enable, disable and delete', async (
           i,
           'name',
         );
-        await expect(textColumn).to.contains('todelete');
+        expect(textColumn).to.contains('todelete');
       }
     });
 
@@ -123,7 +123,7 @@ describe('BO - International - Zones : Bulk enable, disable and delete', async (
 
         for (let row = 1; row <= numberOfZonesBulkActions; row++) {
           const rowStatus = await zonesPage.getZoneStatus(page, row);
-          await expect(rowStatus).to.equal(test.wantedStatus);
+          expect(rowStatus).to.equal(test.wantedStatus);
         }
       });
     });
@@ -132,14 +132,14 @@ describe('BO - International - Zones : Bulk enable, disable and delete', async (
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteZones', baseContext);
 
       const deleteTextResult = await zonesPage.bulkDeleteZones(page);
-      await expect(deleteTextResult).to.be.contains(zonesPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.contains(zonesPage.successfulMultiDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterDelete', baseContext);
 
       const numberOfZonesAfterReset = await zonesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfZonesAfterReset).to.be.equal(numberOfZones);
+      expect(numberOfZonesAfterReset).to.be.equal(numberOfZones);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/11_international/02_locations/01_zones/04_sortAndPagination.ts b/tests/UI/campaigns/functional/BO/11_international/02_locations/01_zones/04_sortAndPagination.ts
index 6335bce924d55..4721948c23fef 100644
--- a/tests/UI/campaigns/functional/BO/11_international/02_locations/01_zones/04_sortAndPagination.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/02_locations/01_zones/04_sortAndPagination.ts
@@ -54,14 +54,14 @@ describe('BO - International - Zones : Sort and pagination', async () => {
     );
 
     const pageTitle = await zonesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(zonesPage.pageTitle);
+    expect(pageTitle).to.contains(zonesPage.pageTitle);
   });
 
   it('should reset all filters and get number of zones in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfZones = await zonesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfZones).to.be.above(0);
+    expect(numberOfZones).to.be.above(0);
   });
 
   // 1 : Sort zones
@@ -104,17 +104,17 @@ describe('BO - International - Zones : Sort and pagination', async () => {
           const expectedResult = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+            expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+            expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
         } else {
           const expectedResult = await basicHelper.sortArray(nonSortedTable);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         }
       });
@@ -134,17 +134,17 @@ describe('BO - International - Zones : Sort and pagination', async () => {
         await zonesPage.goToAddNewZonePage(page);
 
         const pageTitle = await addZonePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addZonePage.pageTitleCreate);
+        expect(pageTitle).to.contains(addZonePage.pageTitleCreate);
       });
 
       it('should create zone and check result', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `createZone${index}`, baseContext);
 
         const textResult = await addZonePage.createEditZone(page, createZoneData);
-        await expect(textResult).to.contains(zonesPage.successfulCreationMessage);
+        expect(textResult).to.contains(zonesPage.successfulCreationMessage);
 
         const numberOfZonesAfterCreation = await zonesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfZonesAfterCreation).to.be.equal(numberOfZones + 1 + index);
+        expect(numberOfZonesAfterCreation).to.be.equal(numberOfZones + 1 + index);
       });
     });
   });
@@ -200,7 +200,7 @@ describe('BO - International - Zones : Sort and pagination', async () => {
           i,
           'name',
         );
-        await expect(textColumn).to.contains('todelete');
+        expect(textColumn).to.contains('todelete');
       }
     });
 
@@ -208,14 +208,14 @@ describe('BO - International - Zones : Sort and pagination', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteZones', baseContext);
 
       const deleteTextResult = await zonesPage.bulkDeleteZones(page);
-      await expect(deleteTextResult).to.be.contains(zonesPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.contains(zonesPage.successfulMultiDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterDelete', baseContext);
 
       const numberOfZonesAfterReset = await zonesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfZonesAfterReset).to.be.equal(numberOfZones);
+      expect(numberOfZonesAfterReset).to.be.equal(numberOfZones);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/11_international/02_locations/02_countries/01_filterAndQuickEditCountries.ts b/tests/UI/campaigns/functional/BO/11_international/02_locations/02_countries/01_filterAndQuickEditCountries.ts
index 4041c741031b9..41e9f324e779a 100644
--- a/tests/UI/campaigns/functional/BO/11_international/02_locations/02_countries/01_filterAndQuickEditCountries.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/02_locations/02_countries/01_filterAndQuickEditCountries.ts
@@ -52,7 +52,7 @@ describe('BO - International - Countries : Filter and quick edit', async () => {
     await zonesPage.closeSfToolBar(page);
 
     const pageTitle = await zonesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(zonesPage.pageTitle);
+    expect(pageTitle).to.contains(zonesPage.pageTitle);
   });
 
   it('should go to \'Countries\' page', async function () {
@@ -61,14 +61,14 @@ describe('BO - International - Countries : Filter and quick edit', async () => {
     await zonesPage.goToSubTabCountries(page);
 
     const pageTitle = await countriesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(countriesPage.pageTitle);
+    expect(pageTitle).to.contains(countriesPage.pageTitle);
   });
 
   it('should reset all filters and get number of countries in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfCountries = await countriesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfCountries).to.be.above(0);
+    expect(numberOfCountries).to.be.above(0);
   });
 
   describe('Filter countries', async () => {
@@ -135,18 +135,18 @@ describe('BO - International - Countries : Filter and quick edit', async () => {
         );
 
         const numberOfCountriesAfterFilter = await countriesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfCountriesAfterFilter).to.be.at.most(numberOfCountries);
+        expect(numberOfCountriesAfterFilter).to.be.at.most(numberOfCountries);
 
         if (test.args.filterBy === 'a!active') {
           const countryStatus = await countriesPage.getCountryStatus(page, 1);
-          await expect(countryStatus).to.equal(test.args.filterValue === '1');
+          expect(countryStatus).to.equal(test.args.filterValue === '1');
         } else {
           const textColumn = await countriesPage.getTextColumnFromTable(
             page,
             1,
             test.args.filterBy,
           );
-          await expect(textColumn).to.contains(test.args.filterValue);
+          expect(textColumn).to.contains(test.args.filterValue);
         }
       });
 
@@ -154,7 +154,7 @@ describe('BO - International - Countries : Filter and quick edit', async () => {
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}Reset`, baseContext);
 
         const numberOfCountriesAfterReset = await countriesPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfCountriesAfterReset).to.equal(numberOfCountries);
+        expect(numberOfCountriesAfterReset).to.equal(numberOfCountries);
       });
     });
   });
@@ -171,10 +171,10 @@ describe('BO - International - Countries : Filter and quick edit', async () => {
       );
 
       const numberOfCountriesAfterFilter = await countriesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfCountriesAfterFilter).to.be.below(numberOfCountries);
+      expect(numberOfCountriesAfterFilter).to.be.below(numberOfCountries);
 
       const textColumn = await countriesPage.getTextColumnFromTable(page, 1, 'b!name');
-      await expect(textColumn).to.contains(Countries.germany.name);
+      expect(textColumn).to.contains(Countries.germany.name);
     });
 
     [
@@ -191,7 +191,7 @@ describe('BO - International - Countries : Filter and quick edit', async () => {
         );
 
         const currentStatus = await countriesPage.getCountryStatus(page, 1);
-        await expect(currentStatus).to.be.equal(status.args.enable);
+        expect(currentStatus).to.be.equal(status.args.enable);
       });
     });
 
@@ -199,7 +199,7 @@ describe('BO - International - Countries : Filter and quick edit', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterQuickEdit', baseContext);
 
       const numberOfCountriesAfterReset = await countriesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCountriesAfterReset).to.equal(numberOfCountries);
+      expect(numberOfCountriesAfterReset).to.equal(numberOfCountries);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/11_international/02_locations/02_countries/02_CRUDCountry.ts b/tests/UI/campaigns/functional/BO/11_international/02_locations/02_countries/02_CRUDCountry.ts
index 0e4b10cfd2c44..b45a126faa4a9 100644
--- a/tests/UI/campaigns/functional/BO/11_international/02_locations/02_countries/02_CRUDCountry.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/02_locations/02_countries/02_CRUDCountry.ts
@@ -91,7 +91,7 @@ describe('BO - International - Countries : CRUD country', async () => {
     await zonesPage.closeSfToolBar(page);
 
     const pageTitle = await zonesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(zonesPage.pageTitle);
+    expect(pageTitle).to.contains(zonesPage.pageTitle);
   });
 
   it('should go to \'Countries\' page', async function () {
@@ -100,14 +100,14 @@ describe('BO - International - Countries : CRUD country', async () => {
     await zonesPage.goToSubTabCountries(page);
 
     const pageTitle = await countriesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(countriesPage.pageTitle);
+    expect(pageTitle).to.contains(countriesPage.pageTitle);
   });
 
   it('should reset all filters and get number of countries in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfCountries = await countriesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfCountries).to.be.above(0);
+    expect(numberOfCountries).to.be.above(0);
   });
 
   describe('Create country', async () => {
@@ -117,24 +117,24 @@ describe('BO - International - Countries : CRUD country', async () => {
       await countriesPage.goToAddNewCountryPage(page);
 
       const pageTitle = await addCountryPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addCountryPage.pageTitleCreate);
+      expect(pageTitle).to.contains(addCountryPage.pageTitleCreate);
     });
 
     it('should try to create new country with a used ISO code and an invalid prefix', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkCreateNewCountry', baseContext);
 
       const textResult = await addCountryPage.createEditCountry(page, countryDataIncorrectDate);
-      await expect(textResult).to.to.contains(addCountryPage.errorMessageIsoCode).and.contains(addCountryPage.errorMessagePrefix);
+      expect(textResult).to.to.contains(addCountryPage.errorMessageIsoCode).and.contains(addCountryPage.errorMessagePrefix);
     });
 
     it('should create new country', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createNewCountry', baseContext);
 
       const textResult = await addCountryPage.createEditCountry(page, createCountryData);
-      await expect(textResult).to.to.contains(countriesPage.successfulCreationMessage);
+      expect(textResult).to.to.contains(countriesPage.successfulCreationMessage);
 
       const numberOfCountriesAfterCreation = await countriesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfCountriesAfterCreation).to.be.equal(numberOfCountries + 1);
+      expect(numberOfCountriesAfterCreation).to.be.equal(numberOfCountries + 1);
     });
 
     it('should view my shop', async function () {
@@ -145,7 +145,7 @@ describe('BO - International - Countries : CRUD country', async () => {
       await foHomePage.changeLanguage(page, 'en');
 
       const isHomePage = await foHomePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should go to login page', async function () {
@@ -154,7 +154,7 @@ describe('BO - International - Countries : CRUD country', async () => {
       await foHomePage.goToLoginPage(page);
 
       const pageTitle = await foLoginPage.getPageTitle(page);
-      await expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
+      expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
     });
 
     it('should sign in with default customer', async function () {
@@ -163,7 +163,7 @@ describe('BO - International - Countries : CRUD country', async () => {
       await foLoginPage.customerLogin(page, Customers.johnDoe);
 
       const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
 
     it('should go to addresses page', async function () {
@@ -173,7 +173,7 @@ describe('BO - International - Countries : CRUD country', async () => {
       await myAccountPage.goToAddressesPage(page);
 
       const pageTitle = await addressesPage.getPageTitle(page);
-      await expect(pageTitle, 'Fail to open addresses page').to.contains(addressesPage.pageTitle);
+      expect(pageTitle, 'Fail to open addresses page').to.contains(addressesPage.pageTitle);
     });
 
     it(`should check that the new country '${createCountryData.name}' exist`, async function () {
@@ -182,7 +182,7 @@ describe('BO - International - Countries : CRUD country', async () => {
       await addressesPage.openNewAddressForm(page);
 
       const countryExist = await addAddressPage.countryExist(page, createCountryData.name);
-      await expect(countryExist, 'Country does not exist').to.be.true;
+      expect(countryExist, 'Country does not exist').to.eq(true);
     });
 
     it('should sign out from FO', async function () {
@@ -191,7 +191,7 @@ describe('BO - International - Countries : CRUD country', async () => {
       await addressesPage.logout(page);
 
       const isCustomerConnected = await addressesPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is connected').to.be.false;
+      expect(isCustomerConnected, 'Customer is connected').to.eq(false);
     });
 
     it('should go back to BO', async function () {
@@ -201,7 +201,7 @@ describe('BO - International - Countries : CRUD country', async () => {
       page = await foHomePage.closePage(browserContext, page, 0);
 
       const pageTitle = await countriesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(countriesPage.pageTitle);
+      expect(pageTitle).to.contains(countriesPage.pageTitle);
     });
   });
 
@@ -214,11 +214,11 @@ describe('BO - International - Countries : CRUD country', async () => {
 
       // Check number of countries
       const numberOfCountriesAfterFilter = await countriesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfCountriesAfterFilter).to.be.at.least(1);
+      expect(numberOfCountriesAfterFilter).to.be.at.least(1);
 
       // row = 1 (first row)
       const textColumn = await countriesPage.getTextColumnFromTable(page, 1, 'b!name');
-      await expect(textColumn).to.contains(createCountryData.name);
+      expect(textColumn).to.contains(createCountryData.name);
     });
 
     it('should go to edit country page', async function () {
@@ -227,17 +227,17 @@ describe('BO - International - Countries : CRUD country', async () => {
       await countriesPage.goToEditCountryPage(page, 1);
 
       const pageTitle = await addCountryPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addCountryPage.pageTitleEdit);
+      expect(pageTitle).to.contains(addCountryPage.pageTitleEdit);
     });
 
     it('should edit country', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'editCountry', baseContext);
 
       const textResult = await addCountryPage.createEditCountry(page, editCountryData);
-      await expect(textResult).to.to.contains(countriesPage.successfulUpdateMessage);
+      expect(textResult).to.to.contains(countriesPage.successfulUpdateMessage);
 
       const numberOfCountriesAfterReset = await countriesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCountriesAfterReset).to.be.equal(numberOfCountries + 1);
+      expect(numberOfCountriesAfterReset).to.be.equal(numberOfCountries + 1);
     });
 
     it('should view my shop', async function () {
@@ -248,7 +248,7 @@ describe('BO - International - Countries : CRUD country', async () => {
       await foHomePage.changeLanguage(page, 'en');
 
       const isHomePage = await foHomePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should go to login page', async function () {
@@ -257,7 +257,7 @@ describe('BO - International - Countries : CRUD country', async () => {
       await foHomePage.goToLoginPage(page);
 
       const pageTitle = await foLoginPage.getPageTitle(page);
-      await expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
+      expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
     });
 
     it('should sign in with default customer', async function () {
@@ -266,7 +266,7 @@ describe('BO - International - Countries : CRUD country', async () => {
       await foLoginPage.customerLogin(page, Customers.johnDoe);
 
       const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
 
     it('should go to addresses page', async function () {
@@ -276,7 +276,7 @@ describe('BO - International - Countries : CRUD country', async () => {
       await myAccountPage.goToAddressesPage(page);
 
       const pageTitle = await addressesPage.getPageTitle(page);
-      await expect(pageTitle, 'Fail to open addresses page').to.contains(addressesPage.pageTitle);
+      expect(pageTitle, 'Fail to open addresses page').to.contains(addressesPage.pageTitle);
     });
 
     it(`should check that the edited country '${editCountryData.name}' not exist`, async function () {
@@ -285,7 +285,7 @@ describe('BO - International - Countries : CRUD country', async () => {
       await addressesPage.openNewAddressForm(page);
 
       const countryExist = await addAddressPage.countryExist(page, editCountryData.name);
-      await expect(countryExist, 'Country exist').to.be.false;
+      expect(countryExist, 'Country exist').to.eq(false);
     });
 
     it('should go back to BO', async function () {
@@ -295,7 +295,7 @@ describe('BO - International - Countries : CRUD country', async () => {
       page = await foHomePage.closePage(browserContext, page, 0);
 
       const pageTitle = await countriesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(countriesPage.pageTitle);
+      expect(pageTitle).to.contains(countriesPage.pageTitle);
     });
   });
 
@@ -308,24 +308,24 @@ describe('BO - International - Countries : CRUD country', async () => {
 
       // Check number of countries
       const numberOfCountriesAfterFilter = await countriesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfCountriesAfterFilter).to.be.at.least(1);
+      expect(numberOfCountriesAfterFilter).to.be.at.least(1);
 
       const textColumn = await countriesPage.getTextColumnFromTable(page, 1, 'b!name');
-      await expect(textColumn).to.contains(editCountryData.name);
+      expect(textColumn).to.contains(editCountryData.name);
     });
 
     it('should delete country', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteCountry', baseContext);
 
       const textResult = await countriesPage.deleteCountriesByBulkActions(page);
-      await expect(textResult).to.to.contains(countriesPage.successfulMultiDeleteMessage);
+      expect(textResult).to.to.contains(countriesPage.successfulMultiDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDelete', baseContext);
 
       const numberOfCountriesAfterReset = await countriesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCountriesAfterReset).to.be.equal(numberOfCountries);
+      expect(numberOfCountriesAfterReset).to.be.equal(numberOfCountries);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/11_international/02_locations/02_countries/03_bulkActionsCountries.ts b/tests/UI/campaigns/functional/BO/11_international/02_locations/02_countries/03_bulkActionsCountries.ts
index f96de9be591bc..57268a1fe9021 100644
--- a/tests/UI/campaigns/functional/BO/11_international/02_locations/02_countries/03_bulkActionsCountries.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/02_locations/02_countries/03_bulkActionsCountries.ts
@@ -72,7 +72,7 @@ describe('BO - International - Countries : Bulk actions', async () => {
     await zonesPage.closeSfToolBar(page);
 
     const pageTitle = await zonesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(zonesPage.pageTitle);
+    expect(pageTitle).to.contains(zonesPage.pageTitle);
   });
 
   it('should go to \'Countries\' page', async function () {
@@ -81,14 +81,14 @@ describe('BO - International - Countries : Bulk actions', async () => {
     await zonesPage.goToSubTabCountries(page);
 
     const pageTitle = await countriesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(countriesPage.pageTitle);
+    expect(pageTitle).to.contains(countriesPage.pageTitle);
   });
 
   it('should reset all filters and get number of countries in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfCountries = await countriesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfCountries).to.be.above(0);
+    expect(numberOfCountries).to.be.above(0);
   });
 
   describe('Create country', async () => {
@@ -100,17 +100,17 @@ describe('BO - International - Countries : Bulk actions', async () => {
           await countriesPage.goToAddNewCountryPage(page);
 
           const pageTitle = await addCountryPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(addCountryPage.pageTitleCreate);
+          expect(pageTitle).to.contains(addCountryPage.pageTitleCreate);
         });
 
         it('should create new country', async function () {
           await testContext.addContextItem(this, 'testIdentifier', `createNewCountry${index}`, baseContext);
 
           const textResult = await addCountryPage.createEditCountry(page, countryToCreate);
-          await expect(textResult).to.to.contains(countriesPage.successfulCreationMessage);
+          expect(textResult).to.to.contains(countriesPage.successfulCreationMessage);
 
           const numberOfCountriesAfterCreation = await countriesPage.getNumberOfElementInGrid(page);
-          await expect(numberOfCountriesAfterCreation).to.be.equal(numberOfCountries + index + 1);
+          expect(numberOfCountriesAfterCreation).to.be.equal(numberOfCountries + index + 1);
         });
       });
   });
@@ -124,10 +124,10 @@ describe('BO - International - Countries : Bulk actions', async () => {
 
       // Check number of countries
       const numberOfCountriesAfterFilter = await countriesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfCountriesAfterFilter).to.be.at.least(1);
+      expect(numberOfCountriesAfterFilter).to.be.at.least(1);
 
       const textColumn = await countriesPage.getTextColumnFromTable(page, 1, 'b!name');
-      await expect(textColumn).to.contains('todelete');
+      expect(textColumn).to.contains('todelete');
     });
 
     [
@@ -142,7 +142,7 @@ describe('BO - International - Countries : Bulk actions', async () => {
 
         for (let row = 1; row <= numberOfZonesBulkActions; row++) {
           const rowStatus = await countriesPage.getCountryStatus(page, row);
-          await expect(rowStatus).to.equal(test.wantedStatus);
+          expect(rowStatus).to.equal(test.wantedStatus);
         }
       });
     });
@@ -151,14 +151,14 @@ describe('BO - International - Countries : Bulk actions', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteCountries', baseContext);
 
       const textResult = await countriesPage.deleteCountriesByBulkActions(page);
-      await expect(textResult).to.to.contains(countriesPage.successfulMultiDeleteMessage);
+      expect(textResult).to.to.contains(countriesPage.successfulMultiDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDelete', baseContext);
 
       const numberOfCountriesAfterReset = await countriesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCountriesAfterReset).to.be.equal(numberOfCountries);
+      expect(numberOfCountriesAfterReset).to.be.equal(numberOfCountries);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/11_international/02_locations/02_countries/04_sortAndPagination.ts b/tests/UI/campaigns/functional/BO/11_international/02_locations/02_countries/04_sortAndPagination.ts
index 9d6b94acb9c55..e297aa2ea12f4 100644
--- a/tests/UI/campaigns/functional/BO/11_international/02_locations/02_countries/04_sortAndPagination.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/02_locations/02_countries/04_sortAndPagination.ts
@@ -48,7 +48,7 @@ describe('BO - International - Countries : Sort and pagination', async () => {
     );
 
     const pageTitle = await zonesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(zonesPage.pageTitle);
+    expect(pageTitle).to.contains(zonesPage.pageTitle);
   });
 
   it('should go to \'Countries\' page', async function () {
@@ -57,7 +57,7 @@ describe('BO - International - Countries : Sort and pagination', async () => {
     await zonesPage.goToSubTabCountries(page);
 
     const pageTitle = await countriesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(countriesPage.pageTitle);
+    expect(pageTitle).to.contains(countriesPage.pageTitle);
   });
 
   // 1 - Pagination next and previous
@@ -163,17 +163,17 @@ describe('BO - International - Countries : Sort and pagination', async () => {
           const expectedResult = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
           if (test.args.sortDirection === 'up') {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+            expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+            expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
         } else {
           const expectedResult = await basicHelper.sortArray(nonSortedTable);
 
           if (test.args.sortDirection === 'up') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         }
       });
diff --git a/tests/UI/campaigns/functional/BO/11_international/02_locations/02_countries/05_countriesRestrictions.ts b/tests/UI/campaigns/functional/BO/11_international/02_locations/02_countries/05_countriesRestrictions.ts
index b8624cff81427..812b617f1b7a2 100644
--- a/tests/UI/campaigns/functional/BO/11_international/02_locations/02_countries/05_countriesRestrictions.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/02_locations/02_countries/05_countriesRestrictions.ts
@@ -64,7 +64,7 @@ describe('BO - International - Countries : Restrict country selections in front
     await zonesPage.closeSfToolBar(page);
 
     const pageTitle = await zonesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(zonesPage.pageTitle);
+    expect(pageTitle).to.contains(zonesPage.pageTitle);
   });
 
   it('should go to \'Countries\' page', async function () {
@@ -73,14 +73,14 @@ describe('BO - International - Countries : Restrict country selections in front
     await zonesPage.goToSubTabCountries(page);
 
     const pageTitle = await countriesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(countriesPage.pageTitle);
+    expect(pageTitle).to.contains(countriesPage.pageTitle);
   });
 
   it('should reset all filters and get number of countries in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfCountries = await countriesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfCountries).to.be.above(0);
+    expect(numberOfCountries).to.be.above(0);
   });
 
   it(`should search for the country '${Countries.afghanistan.name}'`, async function () {
@@ -89,10 +89,10 @@ describe('BO - International - Countries : Restrict country selections in front
     await countriesPage.filterTable(page, 'input', 'b!name', Countries.afghanistan.name);
 
     const numberOfCountriesAfterFilter = await countriesPage.getNumberOfElementInGrid(page);
-    await expect(numberOfCountriesAfterFilter).to.be.equal(1);
+    expect(numberOfCountriesAfterFilter).to.be.equal(1);
 
     const textColumn = await countriesPage.getTextColumnFromTable(page, 1, 'b!name');
-    await expect(textColumn).to.equal(Countries.afghanistan.name);
+    expect(textColumn).to.equal(Countries.afghanistan.name);
   });
 
   it(`should enable the country '${Countries.afghanistan.name}'`, async function () {
@@ -101,7 +101,7 @@ describe('BO - International - Countries : Restrict country selections in front
     await countriesPage.setCountryStatus(page, 1, true);
 
     const currentStatus = await countriesPage.getCountryStatus(page, 1);
-    await expect(currentStatus).to.be.true;
+    expect(currentStatus).to.eq(true);
   });
 
   [
@@ -112,7 +112,7 @@ describe('BO - International - Countries : Restrict country selections in front
       await testContext.addContextItem(this, 'testIdentifier', `${status.args.status}RestrictCountry`, baseContext);
 
       const currentStatus = await countriesPage.setCountriesRestrictions(page, status.args.enable);
-      await expect(currentStatus).to.contains(countriesPage.settingsUpdateMessage);
+      expect(currentStatus).to.contains(countriesPage.settingsUpdateMessage);
     });
 
     it('should go to FO', async function () {
@@ -124,7 +124,7 @@ describe('BO - International - Countries : Restrict country selections in front
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Home page is not displayed').to.be.true;
+      expect(isHomePage, 'Home page is not displayed').to.eq(true);
     });
 
     it('should login', async function () {
@@ -134,12 +134,12 @@ describe('BO - International - Countries : Restrict country selections in front
       await foLoginPage.customerLogin(page, Customers.johnDoe);
 
       const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
-      await expect(isCustomerConnected).to.be.true;
+      expect(isCustomerConnected).to.eq(true);
 
       await homePage.goToMyAccountPage(page);
 
       const pageTitle = await myAccountPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(myAccountPage.pageTitle);
+      expect(pageTitle).to.contains(myAccountPage.pageTitle);
     });
 
     it('should go to addresses page', async function () {
@@ -148,7 +148,7 @@ describe('BO - International - Countries : Restrict country selections in front
       await myAccountPage.goToAddressesPage(page);
 
       const pageTitle = await addressesPage.getPageTitle(page);
-      await expect(pageTitle, 'Fail to open addresses page').to.contains(addressesPage.pageTitle);
+      expect(pageTitle, 'Fail to open addresses page').to.contains(addressesPage.pageTitle);
     });
 
     it(`should check if the country '${Countries.afghanistan.name}' exist`, async function () {
@@ -157,7 +157,7 @@ describe('BO - International - Countries : Restrict country selections in front
       await addressesPage.openNewAddressForm(page);
 
       const countryExist = await addAddressPage.countryExist(page, Countries.afghanistan.name);
-      await expect(countryExist).to.equal(status.args.isCountryVisible);
+      expect(countryExist).to.equal(status.args.isCountryVisible);
     });
 
     it('should sign out from FO', async function () {
@@ -166,7 +166,7 @@ describe('BO - International - Countries : Restrict country selections in front
       await addressesPage.logout(page);
 
       const isCustomerConnected = await addressesPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is connected').to.be.false;
+      expect(isCustomerConnected, 'Customer is connected').to.eq(false);
     });
 
     it('should close the FO page and go back to BO', async function () {
@@ -175,7 +175,7 @@ describe('BO - International - Countries : Restrict country selections in front
       page = await myAccountPage.closePage(browserContext, page, 0);
 
       const pageTitle = await countriesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(countriesPage.pageTitle);
+      expect(pageTitle).to.contains(countriesPage.pageTitle);
     });
   });
 
@@ -185,10 +185,10 @@ describe('BO - International - Countries : Restrict country selections in front
     await countriesPage.filterTable(page, 'input', 'b!name', Countries.afghanistan.name);
 
     const numberOfCountriesAfterFilter = await countriesPage.getNumberOfElementInGrid(page);
-    await expect(numberOfCountriesAfterFilter).to.be.equal(1);
+    expect(numberOfCountriesAfterFilter).to.be.equal(1);
 
     const textColumn = await countriesPage.getTextColumnFromTable(page, 1, 'b!name');
-    await expect(textColumn).to.equal(Countries.afghanistan.name);
+    expect(textColumn).to.equal(Countries.afghanistan.name);
   });
 
   it('should disable the country', async function () {
@@ -197,13 +197,13 @@ describe('BO - International - Countries : Restrict country selections in front
     await countriesPage.setCountryStatus(page, 1, false);
 
     const currentStatus = await countriesPage.getCountryStatus(page, 1);
-    await expect(currentStatus).to.be.false;
+    expect(currentStatus).to.eq(false);
   });
 
   it('should reset all filters', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDisable', baseContext);
 
     const numberOfCountriesAfterReset = await countriesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfCountriesAfterReset).to.equal(numberOfCountries);
+    expect(numberOfCountriesAfterReset).to.equal(numberOfCountries);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/11_international/02_locations/03_states/01_filterAndQuickEditStates.ts b/tests/UI/campaigns/functional/BO/11_international/02_locations/03_states/01_filterAndQuickEditStates.ts
index 08c206fdc1bcf..fa3fafd3cff14 100644
--- a/tests/UI/campaigns/functional/BO/11_international/02_locations/03_states/01_filterAndQuickEditStates.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/02_locations/03_states/01_filterAndQuickEditStates.ts
@@ -52,7 +52,7 @@ describe('BO - International - States : Filter and quick edit', async () => {
     await zonesPage.closeSfToolBar(page);
 
     const pageTitle = await zonesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(zonesPage.pageTitle);
+    expect(pageTitle).to.contains(zonesPage.pageTitle);
   });
 
   it('should go to \'States\' page', async function () {
@@ -61,14 +61,14 @@ describe('BO - International - States : Filter and quick edit', async () => {
     await zonesPage.goToSubTabStates(page);
 
     const pageTitle = await statesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(statesPage.pageTitle);
+    expect(pageTitle).to.contains(statesPage.pageTitle);
   });
 
   it('should reset all filters and get number of states in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfStates = await statesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfStates).to.be.above(0);
+    expect(numberOfStates).to.be.above(0);
   });
 
   describe('Filter states', async () => {
@@ -135,18 +135,18 @@ describe('BO - International - States : Filter and quick edit', async () => {
         );
 
         const numberOfStatesAfterFilter = await statesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfStatesAfterFilter).to.be.at.most(numberOfStates);
+        expect(numberOfStatesAfterFilter).to.be.at.most(numberOfStates);
 
         if (test.args.filterBy === 'active') {
           const countryStatus = await statesPage.getStateStatus(page, 1);
-          await expect(countryStatus).to.equal(test.args.filterValue === '1');
+          expect(countryStatus).to.equal(test.args.filterValue === '1');
         } else {
           const textColumn = await statesPage.getTextColumn(
             page,
             1,
             test.args.filterBy,
           );
-          await expect(textColumn).to.contains(test.args.filterValue);
+          expect(textColumn).to.contains(test.args.filterValue);
         }
       });
 
@@ -154,7 +154,7 @@ describe('BO - International - States : Filter and quick edit', async () => {
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}Reset`, baseContext);
 
         const numberOfStatesAfterReset = await statesPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfStatesAfterReset).to.equal(numberOfStates);
+        expect(numberOfStatesAfterReset).to.equal(numberOfStates);
       });
     });
   });
@@ -171,10 +171,10 @@ describe('BO - International - States : Filter and quick edit', async () => {
       );
 
       const numberOfStatesAfterFilter = await statesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfStatesAfterFilter).to.be.below(numberOfStates);
+      expect(numberOfStatesAfterFilter).to.be.below(numberOfStates);
 
       const textColumn = await statesPage.getTextColumn(page, 1, 'name');
-      await expect(textColumn).to.contains(States.california.name);
+      expect(textColumn).to.contains(States.california.name);
     });
 
     [
@@ -191,7 +191,7 @@ describe('BO - International - States : Filter and quick edit', async () => {
         );
 
         const currentStatus = await statesPage.getStateStatus(page, 1);
-        await expect(currentStatus).to.be.equal(status.args.enable);
+        expect(currentStatus).to.be.equal(status.args.enable);
       });
     });
 
@@ -199,7 +199,7 @@ describe('BO - International - States : Filter and quick edit', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterQuickEdit', baseContext);
 
       const numberOfStatesAfterReset = await statesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfStatesAfterReset).to.equal(numberOfStates);
+      expect(numberOfStatesAfterReset).to.equal(numberOfStates);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/11_international/02_locations/03_states/02_CRUDState.ts b/tests/UI/campaigns/functional/BO/11_international/02_locations/03_states/02_CRUDState.ts
index 22c558578c666..76be9ec6fd6d7 100644
--- a/tests/UI/campaigns/functional/BO/11_international/02_locations/03_states/02_CRUDState.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/02_locations/03_states/02_CRUDState.ts
@@ -52,7 +52,7 @@ describe('BO - International - States : CRUD state', async () => {
     await zonesPage.closeSfToolBar(page);
 
     const pageTitle = await zonesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(zonesPage.pageTitle);
+    expect(pageTitle).to.contains(zonesPage.pageTitle);
   });
 
   it('should go to \'States\' page', async function () {
@@ -61,14 +61,14 @@ describe('BO - International - States : CRUD state', async () => {
     await zonesPage.goToSubTabStates(page);
 
     const pageTitle = await statesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(statesPage.pageTitle);
+    expect(pageTitle).to.contains(statesPage.pageTitle);
   });
 
   it('should reset all filters and get number of states in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfStates = await statesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfStates).to.be.above(0);
+    expect(numberOfStates).to.be.above(0);
   });
 
   describe('Create state', async () => {
@@ -78,17 +78,17 @@ describe('BO - International - States : CRUD state', async () => {
       await statesPage.goToAddNewStatePage(page);
 
       const pageTitle = await addStatePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addStatePage.pageTitleCreate);
+      expect(pageTitle).to.contains(addStatePage.pageTitleCreate);
     });
 
     it('should create new state', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createNewState', baseContext);
 
       const textResult = await addStatePage.createEditState(page, createStateData);
-      await expect(textResult).to.to.contains(statesPage.successfulCreationMessage);
+      expect(textResult).to.to.contains(statesPage.successfulCreationMessage);
 
       const numberOfStatesAfterCreation = await statesPage.getNumberOfElement(page);
-      await expect(numberOfStatesAfterCreation).to.be.equal(numberOfStates + 1);
+      expect(numberOfStatesAfterCreation).to.be.equal(numberOfStates + 1);
     });
   });
 
@@ -101,11 +101,11 @@ describe('BO - International - States : CRUD state', async () => {
 
       // Check number of states
       const numberOfStatesAfterFilter = await statesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfStatesAfterFilter).to.be.at.least(1);
+      expect(numberOfStatesAfterFilter).to.be.at.least(1);
 
       // row = 1 (first row)
       const textColumn = await statesPage.getTextColumn(page, 1, 'name');
-      await expect(textColumn).to.contains(createStateData.name);
+      expect(textColumn).to.contains(createStateData.name);
     });
 
     it('should go to edit state page', async function () {
@@ -114,17 +114,17 @@ describe('BO - International - States : CRUD state', async () => {
       await statesPage.goToEditStatePage(page, 1);
 
       const pageTitle = await addStatePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addStatePage.pageTitleEdit);
+      expect(pageTitle).to.contains(addStatePage.pageTitleEdit);
     });
 
     it('should edit state', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'ediState', baseContext);
 
       const textResult = await addStatePage.createEditState(page, editStateData);
-      await expect(textResult).to.to.contains(statesPage.successfulUpdateMessage);
+      expect(textResult).to.to.contains(statesPage.successfulUpdateMessage);
 
       const numberOfStatesAfterReset = await statesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfStatesAfterReset).to.be.equal(numberOfStates + 1);
+      expect(numberOfStatesAfterReset).to.be.equal(numberOfStates + 1);
     });
   });
 
@@ -137,24 +137,24 @@ describe('BO - International - States : CRUD state', async () => {
 
       // Check number of state
       const numberOfStatesAfterFilter = await statesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfStatesAfterFilter).to.be.at.least(1);
+      expect(numberOfStatesAfterFilter).to.be.at.least(1);
 
       const textColumn = await statesPage.getTextColumn(page, 1, 'name');
-      await expect(textColumn).to.contains(editStateData.name);
+      expect(textColumn).to.contains(editStateData.name);
     });
 
     it('should delete state', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteState', baseContext);
 
       const textResult = await statesPage.deleteState(page, 1);
-      await expect(textResult).to.to.contains(statesPage.successfulDeleteMessage);
+      expect(textResult).to.to.contains(statesPage.successfulDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDelete', baseContext);
 
       const numberOfStatesAfterReset = await statesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfStatesAfterReset).to.be.equal(numberOfStates);
+      expect(numberOfStatesAfterReset).to.be.equal(numberOfStates);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/11_international/02_locations/03_states/03_bulkActionsStates.ts b/tests/UI/campaigns/functional/BO/11_international/02_locations/03_states/03_bulkActionsStates.ts
index e44833b5ec1eb..5fac847ef5402 100644
--- a/tests/UI/campaigns/functional/BO/11_international/02_locations/03_states/03_bulkActionsStates.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/02_locations/03_states/03_bulkActionsStates.ts
@@ -54,7 +54,7 @@ describe('BO - International - States : Bulk edit status and bulk delete', async
     await zonesPage.closeSfToolBar(page);
 
     const pageTitle = await zonesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(zonesPage.pageTitle);
+    expect(pageTitle).to.contains(zonesPage.pageTitle);
   });
 
   it('should go to \'States\' page', async function () {
@@ -63,7 +63,7 @@ describe('BO - International - States : Bulk edit status and bulk delete', async
     await zonesPage.goToSubTabStates(page);
 
     const pageTitle = await statesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(statesPage.pageTitle);
+    expect(pageTitle).to.contains(statesPage.pageTitle);
   });
 
   it('should reset all filters and get number of states in BO', async function () {
@@ -72,7 +72,7 @@ describe('BO - International - States : Bulk edit status and bulk delete', async
     await statesPage.resetAndGetNumberOfLines(page);
 
     numberOfStates = await statesPage.getNumberOfElement(page);
-    await expect(numberOfStates).to.be.above(0);
+    expect(numberOfStates).to.be.above(0);
   });
 
   describe('Create 2 states in BO', async () => {
@@ -83,17 +83,17 @@ describe('BO - International - States : Bulk edit status and bulk delete', async
         await statesPage.goToAddNewStatePage(page);
 
         const pageTitle = await addStatePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addStatePage.pageTitleCreate);
+        expect(pageTitle).to.contains(addStatePage.pageTitleCreate);
       });
 
       it('should create state and check result', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `createState${index + 1}`, baseContext);
 
         const textResult = await addStatePage.createEditState(page, stateToCreate);
-        await expect(textResult).to.contains(statesPage.successfulCreationMessage);
+        expect(textResult).to.contains(statesPage.successfulCreationMessage);
 
         const numberOfStatesAfterCreation = await statesPage.getNumberOfElement(page);
-        await expect(numberOfStatesAfterCreation).to.be.equal(numberOfStates + index + 1);
+        expect(numberOfStatesAfterCreation).to.be.equal(numberOfStates + index + 1);
       });
     });
   });
@@ -110,7 +110,7 @@ describe('BO - International - States : Bulk edit status and bulk delete', async
       );
 
       const numberOfStatesAfterFilter = await statesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfStatesAfterFilter).to.be.at.most(numberOfStates);
+      expect(numberOfStatesAfterFilter).to.be.at.most(numberOfStates);
 
       for (let i = 1; i <= numberOfStatesAfterFilter; i++) {
         const textColumn = await statesPage.getTextColumn(
@@ -118,7 +118,7 @@ describe('BO - International - States : Bulk edit status and bulk delete', async
           i,
           'name',
         );
-        await expect(textColumn).to.contains('todelete');
+        expect(textColumn).to.contains('todelete');
       }
     });
 
@@ -135,7 +135,7 @@ describe('BO - International - States : Bulk edit status and bulk delete', async
 
         for (let row = 1; row <= numberOfStatesBulkActions; row++) {
           const rowStatus = await statesPage.getStateStatus(page, row);
-          await expect(rowStatus).to.equal(test.wantedStatus);
+          expect(rowStatus).to.equal(test.wantedStatus);
         }
       });
     });
@@ -144,14 +144,14 @@ describe('BO - International - States : Bulk edit status and bulk delete', async
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteStates', baseContext);
 
       const deleteTextResult = await statesPage.bulkDeleteStates(page);
-      await expect(deleteTextResult).to.be.contains(statesPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.contains(statesPage.successfulMultiDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterBulkActions', baseContext);
 
       const numberOfStatesAfterReset = await statesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfStatesAfterReset).to.be.equal(numberOfStates);
+      expect(numberOfStatesAfterReset).to.be.equal(numberOfStates);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/11_international/02_locations/03_states/04_sortAndPagination.ts b/tests/UI/campaigns/functional/BO/11_international/02_locations/03_states/04_sortAndPagination.ts
index 08a0ba6ae4c58..0f59efac0849a 100644
--- a/tests/UI/campaigns/functional/BO/11_international/02_locations/03_states/04_sortAndPagination.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/02_locations/03_states/04_sortAndPagination.ts
@@ -51,7 +51,7 @@ describe('BO - International - States : Sort and pagination', async () => {
     );
 
     const pageTitle = await zonesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(zonesPage.pageTitle);
+    expect(pageTitle).to.contains(zonesPage.pageTitle);
   });
 
   it('should go to \'States\' page', async function () {
@@ -60,7 +60,7 @@ describe('BO - International - States : Sort and pagination', async () => {
     await zonesPage.goToSubTabStates(page);
 
     const pageTitle = await statesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(statesPage.pageTitle);
+    expect(pageTitle).to.contains(statesPage.pageTitle);
   });
 
   // 1 - Pagination next and previous
@@ -173,17 +173,17 @@ describe('BO - International - States : Sort and pagination', async () => {
           const expectedResult = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+            expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+            expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
         } else {
           const expectedResult = await basicHelper.sortArray(nonSortedTable);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         }
       });
@@ -193,7 +193,7 @@ describe('BO - International - States : Sort and pagination', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterSort', baseContext);
 
       const numberOfStates = await statesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfStates).to.be.above(0);
+      expect(numberOfStates).to.be.above(0);
     });
 
     it('should change the item number to 50 per page', async function () {
diff --git a/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/01_filterAndQuickEditTaxes.ts b/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/01_filterAndQuickEditTaxes.ts
index db6fc4e5fddc7..d5088b4fd5896 100644
--- a/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/01_filterAndQuickEditTaxes.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/01_filterAndQuickEditTaxes.ts
@@ -50,14 +50,14 @@ describe('BO - International - Taxes : Filter And Quick Edit', async () => {
     );
 
     const pageTitle = await taxesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(taxesPage.pageTitle);
+    expect(pageTitle).to.contains(taxesPage.pageTitle);
   });
 
   it('should reset all filters and get Number of Taxes in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfTaxes = await taxesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfTaxes).to.be.above(0);
+    expect(numberOfTaxes).to.be.above(0);
   });
 
   // 1 : Filter Taxes
@@ -101,16 +101,16 @@ describe('BO - International - Taxes : Filter And Quick Edit', async () => {
         await taxesPage.filterTaxes(page, test.args.filterType, test.args.filterBy, test.args.filterValue);
 
         const numberOfTaxesAfterFilter = await taxesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfTaxesAfterFilter).to.be.at.most(numberOfTaxes);
+        expect(numberOfTaxesAfterFilter).to.be.at.most(numberOfTaxes);
 
         // Check value in table
         for (let i = 1; i <= numberOfTaxesAfterFilter; i++) {
           if (test.args.filterBy === 'active') {
             const taxStatus = await taxesPage.getStatus(page, i);
-            await expect(taxStatus).to.equal(test.args.filterValue === '1');
+            expect(taxStatus).to.equal(test.args.filterValue === '1');
           } else {
             const textColumn = await taxesPage.getTextColumnFromTableTaxes(page, i, test.args.filterBy);
-            await expect(textColumn).to.contains(test.args.filterValue);
+            expect(textColumn).to.contains(test.args.filterValue);
           }
         }
       });
@@ -119,7 +119,7 @@ describe('BO - International - Taxes : Filter And Quick Edit', async () => {
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}Reset`, baseContext);
 
         const numberOfTaxesAfterReset = await taxesPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfTaxesAfterReset).to.equal(numberOfTaxes);
+        expect(numberOfTaxesAfterReset).to.equal(numberOfTaxes);
       });
     });
   });
@@ -132,10 +132,10 @@ describe('BO - International - Taxes : Filter And Quick Edit', async () => {
       await taxesPage.filterTaxes(page, 'input', 'name', tax.DefaultFrTax.name);
 
       const numberOfTaxesAfterFilter = await taxesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfTaxesAfterFilter).to.be.at.most(numberOfTaxes);
+      expect(numberOfTaxesAfterFilter).to.be.at.most(numberOfTaxes);
 
       const textColumn = await taxesPage.getTextColumnFromTableTaxes(page, 1, 'name');
-      await expect(textColumn).to.contains(tax.DefaultFrTax.name);
+      expect(textColumn).to.contains(tax.DefaultFrTax.name);
     });
 
     [
@@ -153,11 +153,11 @@ describe('BO - International - Taxes : Filter And Quick Edit', async () => {
 
         if (isActionPerformed) {
           const resultMessage = await taxesPage.getAlertSuccessBlockParagraphContent(page);
-          await expect(resultMessage).to.contains(taxesPage.successfulUpdateStatusMessage);
+          expect(resultMessage).to.contains(taxesPage.successfulUpdateStatusMessage);
         }
 
         const taxStatus = await taxesPage.getStatus(page, 1);
-        await expect(taxStatus).to.be.equal(test.args.enabledValue);
+        expect(taxStatus).to.be.equal(test.args.enabledValue);
       });
     });
 
@@ -165,7 +165,7 @@ describe('BO - International - Taxes : Filter And Quick Edit', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterQuickEdit', baseContext);
 
       const numberOfTaxesAfterReset = await taxesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfTaxesAfterReset).to.equal(numberOfTaxes);
+      expect(numberOfTaxesAfterReset).to.equal(numberOfTaxes);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/02_CRUDTaxesInBO.ts b/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/02_CRUDTaxesInBO.ts
index fdf7488caac0c..b74743b23a60e 100644
--- a/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/02_CRUDTaxesInBO.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/02_CRUDTaxesInBO.ts
@@ -51,14 +51,14 @@ describe('BO - International - Taxes : Create, Update and Delete Tax', async ()
     );
 
     const pageTitle = await taxesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(taxesPage.pageTitle);
+    expect(pageTitle).to.contains(taxesPage.pageTitle);
   });
 
   it('should reset all filters', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfTaxes = await taxesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfTaxes).to.be.above(0);
+    expect(numberOfTaxes).to.be.above(0);
   });
 
   // 1 : Create tax with data generated from faker
@@ -69,17 +69,17 @@ describe('BO - International - Taxes : Create, Update and Delete Tax', async ()
       await taxesPage.goToAddNewTaxPage(page);
 
       const pageTitle = await addTaxPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addTaxPage.pageTitleCreate);
+      expect(pageTitle).to.contains(addTaxPage.pageTitleCreate);
     });
 
     it('should create Tax and check result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createTax', baseContext);
 
       const textResult = await addTaxPage.createEditTax(page, createTaxData);
-      await expect(textResult).to.equal(addTaxPage.successfulCreationMessage);
+      expect(textResult).to.equal(addTaxPage.successfulCreationMessage);
 
       const numberOfTaxesAfterCreation = await taxesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfTaxesAfterCreation).to.be.equal(numberOfTaxes + 1);
+      expect(numberOfTaxesAfterCreation).to.be.equal(numberOfTaxes + 1);
     });
   });
 
@@ -96,7 +96,7 @@ describe('BO - International - Taxes : Create, Update and Delete Tax', async ()
       );
 
       const textName = await taxesPage.getTextColumnFromTableTaxes(page, 1, 'name');
-      await expect(textName).to.contains(createTaxData.name);
+      expect(textName).to.contains(createTaxData.name);
     });
 
     it('should filter list by tax rate', async function () {
@@ -110,7 +110,7 @@ describe('BO - International - Taxes : Create, Update and Delete Tax', async ()
       );
 
       const textRate = await taxesPage.getTextColumnFromTableTaxes(page, 1, 'rate');
-      await expect(textRate).to.contains(createTaxData.rate);
+      expect(textRate).to.contains(createTaxData.rate);
     });
 
     it('should go to edit tax page', async function () {
@@ -119,21 +119,21 @@ describe('BO - International - Taxes : Create, Update and Delete Tax', async ()
       await taxesPage.goToEditTaxPage(page, 1);
 
       const pageTitle = await addTaxPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addTaxPage.pageTitleEdit);
+      expect(pageTitle).to.contains(addTaxPage.pageTitleEdit);
     });
 
     it('should update tax', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateTax', baseContext);
 
       const textResult = await addTaxPage.createEditTax(page, editTaxData);
-      await expect(textResult).to.equal(taxesPage.successfulUpdateMessage);
+      expect(textResult).to.equal(taxesPage.successfulUpdateMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterUpdate', baseContext);
 
       const numberOfTaxesAfterReset = await taxesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfTaxesAfterReset).to.equal(numberOfTaxes + 1);
+      expect(numberOfTaxesAfterReset).to.equal(numberOfTaxes + 1);
     });
   });
 
@@ -150,7 +150,7 @@ describe('BO - International - Taxes : Create, Update and Delete Tax', async ()
       );
 
       const textName = await taxesPage.getTextColumnFromTableTaxes(page, 1, 'name');
-      await expect(textName).to.contains(editTaxData.name);
+      expect(textName).to.contains(editTaxData.name);
     });
 
     it('should filter list by tax rate', async function () {
@@ -164,17 +164,17 @@ describe('BO - International - Taxes : Create, Update and Delete Tax', async ()
       );
 
       const textRate = await taxesPage.getTextColumnFromTableTaxes(page, 1, 'rate');
-      await expect(textRate).to.contains(editTaxData.rate);
+      expect(textRate).to.contains(editTaxData.rate);
     });
 
     it('should delete Tax', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteTax', baseContext);
 
       const textResult = await taxesPage.deleteTax(page, 1);
-      await expect(textResult).to.equal(taxesPage.successfulDeleteMessage);
+      expect(textResult).to.equal(taxesPage.successfulDeleteMessage);
 
       const numberOfTaxesAfterDelete = await taxesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfTaxesAfterDelete).to.be.equal(numberOfTaxes);
+      expect(numberOfTaxesAfterDelete).to.be.equal(numberOfTaxes);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/03_taxesBulkActionsInBO.ts b/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/03_taxesBulkActionsInBO.ts
index 7d45636c8b3f9..09c24d409daf5 100644
--- a/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/03_taxesBulkActionsInBO.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/03_taxesBulkActionsInBO.ts
@@ -51,14 +51,14 @@ describe('BO - International - Taxes : Bulk actions', async () => {
     );
 
     const pageTitle = await taxesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(taxesPage.pageTitle);
+    expect(pageTitle).to.contains(taxesPage.pageTitle);
   });
 
   it('should reset all filters', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfTaxes = await taxesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfTaxes).to.be.above(0);
+    expect(numberOfTaxes).to.be.above(0);
   });
 
   // 1 : Create 2 taxes with data from faker
@@ -75,17 +75,17 @@ describe('BO - International - Taxes : Bulk actions', async () => {
         await taxesPage.goToAddNewTaxPage(page);
 
         const pageTitle = await addTaxPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addTaxPage.pageTitleCreate);
+        expect(pageTitle).to.contains(addTaxPage.pageTitleCreate);
       });
 
       it('should create tax and check result', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `CreateTax${index + 1}`, baseContext);
 
         const textResult = await addTaxPage.createEditTax(page, test.args.taxToCreate);
-        await expect(textResult).to.equal(taxesPage.successfulCreationMessage);
+        expect(textResult).to.equal(taxesPage.successfulCreationMessage);
 
         const numberOfTaxesAfterCreation = await taxesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfTaxesAfterCreation).to.be.equal(numberOfTaxes + index + 1);
+        expect(numberOfTaxesAfterCreation).to.be.equal(numberOfTaxes + index + 1);
       });
     });
   });
@@ -103,7 +103,7 @@ describe('BO - International - Taxes : Bulk actions', async () => {
       );
 
       const textResult = await taxesPage.getTextColumnFromTableTaxes(page, 1, 'name');
-      await expect(textResult).to.contains('TVA to delete');
+      expect(textResult).to.contains('TVA to delete');
     });
 
     [
@@ -117,14 +117,14 @@ describe('BO - International - Taxes : Bulk actions', async () => {
           page,
           test.args.enabledValue,
         );
-        await expect(textResult).to.be.equal(taxesPage.successfulUpdateStatusMessage);
+        expect(textResult).to.be.equal(taxesPage.successfulUpdateStatusMessage);
 
         const numberOfTaxesInGrid = await taxesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfTaxesInGrid).to.be.at.most(numberOfTaxes);
+        expect(numberOfTaxesInGrid).to.be.at.most(numberOfTaxes);
 
         for (let i = 1; i <= numberOfTaxesInGrid; i++) {
           const taxStatus = await taxesPage.getStatus(page, i);
-          await expect(taxStatus).to.equal(test.args.enabledValue);
+          expect(taxStatus).to.equal(test.args.enabledValue);
         }
       });
     });
@@ -133,7 +133,7 @@ describe('BO - International - Taxes : Bulk actions', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterBulkEdit', baseContext);
 
       const numberOfTaxesAfterReset = await taxesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfTaxesAfterReset).to.be.equal(numberOfTaxes + 2);
+      expect(numberOfTaxesAfterReset).to.be.equal(numberOfTaxes + 2);
     });
   });
 
@@ -150,17 +150,17 @@ describe('BO - International - Taxes : Bulk actions', async () => {
       );
 
       const textResult = await taxesPage.getTextColumnFromTableTaxes(page, 1, 'name');
-      await expect(textResult).to.contains('TVA to delete');
+      expect(textResult).to.contains('TVA to delete');
     });
 
     it('should delete Taxes with Bulk Actions and check Result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDelete', baseContext);
 
       const deleteTextResult = await taxesPage.deleteTaxesBulkActions(page);
-      await expect(deleteTextResult).to.be.equal(taxesPage.successfulDeleteMessage);
+      expect(deleteTextResult).to.be.equal(taxesPage.successfulDeleteMessage);
 
       const numberOfTaxesAfterReset = await taxesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfTaxesAfterReset).to.be.equal(numberOfTaxes);
+      expect(numberOfTaxesAfterReset).to.be.equal(numberOfTaxes);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/04_taxOptionsForm.ts b/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/04_taxOptionsForm.ts
index 69e115fbce868..b6c77615c1f25 100644
--- a/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/04_taxOptionsForm.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/04_taxOptionsForm.ts
@@ -48,7 +48,7 @@ describe('BO - International - Taxes : Edit Tax options with all EcoTax values',
     await taxesPage.closeSfToolBar(page);
 
     const pageTitle = await taxesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(taxesPage.pageTitle);
+    expect(pageTitle).to.contains(taxesPage.pageTitle);
   });
 
   // Testing all options of EcoTax
@@ -63,7 +63,7 @@ describe('BO - International - Taxes : Edit Tax options with all EcoTax values',
         await testContext.addContextItem(this, 'testIdentifier', `updateForm${index + 1}`, baseContext);
 
         const textResult = await taxesPage.updateTaxOption(page, taxOption);
-        await expect(textResult).to.be.equal('Update successful');
+        expect(textResult).to.be.equal('Update successful');
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/05_sortAndPagination.ts b/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/05_sortAndPagination.ts
index fc494788efc54..d2c8b899392a4 100644
--- a/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/05_sortAndPagination.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/03_taxes/01_taxes/05_sortAndPagination.ts
@@ -44,14 +44,14 @@ describe('BO - International - Taxes : Sort and pagination', async () => {
     );
 
     const pageTitle = await taxesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(taxesPage.pageTitle);
+    expect(pageTitle).to.contains(taxesPage.pageTitle);
   });
 
   it('should reset all filters and get Number of Taxes in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfTaxes = await taxesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfTaxes).to.be.above(0);
+    expect(numberOfTaxes).to.be.above(0);
   });
 
   describe('Sort taxes', async () => {
@@ -110,17 +110,17 @@ describe('BO - International - Taxes : Sort and pagination', async () => {
           const expectedResult = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+            expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+            expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
         } else {
           const expectedResult = await basicHelper.sortArray(nonSortedTable);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         }
       });
@@ -139,21 +139,21 @@ describe('BO - International - Taxes : Sort and pagination', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnNext', baseContext);
 
       const paginationNumber = await taxesPage.paginationNext(page);
-      await expect(paginationNumber).to.contains('(page 2 / 4)');
+      expect(paginationNumber).to.contains('(page 2 / 4)');
     });
 
     it('should click on previous', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnPrevious', baseContext);
 
       const paginationNumber = await taxesPage.paginationPrevious(page);
-      await expect(paginationNumber).to.contains('(page 1 / 4)');
+      expect(paginationNumber).to.contains('(page 1 / 4)');
     });
 
     it('should change the item number to 50 per page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'changeItemNumberTo50', baseContext);
 
       const paginationNumber = await taxesPage.selectPaginationLimit(page, 50);
-      await expect(paginationNumber).to.contains('(page 1 / 1)');
+      expect(paginationNumber).to.contains('(page 1 / 1)');
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/11_international/03_taxes/02_taxRules/01_CRUDTaxRules.ts b/tests/UI/campaigns/functional/BO/11_international/03_taxes/02_taxRules/01_CRUDTaxRules.ts
index d76f1036af641..f81e74d94fbd4 100644
--- a/tests/UI/campaigns/functional/BO/11_international/03_taxes/02_taxRules/01_CRUDTaxRules.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/03_taxes/02_taxRules/01_CRUDTaxRules.ts
@@ -54,7 +54,7 @@ describe('BO - International - Tax rules : Create, Update and Delete Tax rule',
       );
 
       const pageTitle = await taxesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(taxesPage.pageTitle);
+      expect(pageTitle).to.contains(taxesPage.pageTitle);
     });
 
     it('should go to \'Tax Rules\' page', async function () {
@@ -63,14 +63,14 @@ describe('BO - International - Tax rules : Create, Update and Delete Tax rule',
       await taxesPage.goToTaxRulesPage(page);
 
       const pageTitle = await taxRulesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(taxRulesPage.pageTitle);
+      expect(pageTitle).to.contains(taxRulesPage.pageTitle);
     });
 
     it('should reset all filters and get number of Tax rules in BO', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
       numberOfTaxRules = await taxRulesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfTaxRules).to.be.above(0);
+      expect(numberOfTaxRules).to.be.above(0);
     });
 
     it('should go to Add new tax rules group page', async function () {
@@ -79,14 +79,14 @@ describe('BO - International - Tax rules : Create, Update and Delete Tax rule',
       await taxRulesPage.goToAddNewTaxRulesGroupPage(page);
 
       const pageTitle = await addTaxRulesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addTaxRulesPage.pageTitleCreate);
+      expect(pageTitle).to.contains(addTaxRulesPage.pageTitleCreate);
     });
 
     it('should create new tax rule group', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createTaxRuleGroup', baseContext);
 
       const textResult = await addTaxRulesPage.createEditTaxRulesGroup(page, taxRuleDataToCreate);
-      await expect(textResult).to.contains(addTaxRulesPage.successfulCreationMessage);
+      expect(textResult).to.contains(addTaxRulesPage.successfulCreationMessage);
     });
   });
 
@@ -98,7 +98,7 @@ describe('BO - International - Tax rules : Create, Update and Delete Tax rule',
       await taxesPage.goToTaxRulesPage(page);
 
       const pageTitle = await taxRulesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(taxRulesPage.pageTitle);
+      expect(pageTitle).to.contains(taxRulesPage.pageTitle);
     });
 
     it('should filter list by tax name', async function () {
@@ -112,7 +112,7 @@ describe('BO - International - Tax rules : Create, Update and Delete Tax rule',
       );
 
       const textName = await taxRulesPage.getTextColumnFromTable(page, 1, 'name');
-      await expect(textName).to.contains(taxRuleDataToCreate.name);
+      expect(textName).to.contains(taxRuleDataToCreate.name);
     });
 
     it('should go to edit tax Rule page', async function () {
@@ -121,14 +121,14 @@ describe('BO - International - Tax rules : Create, Update and Delete Tax rule',
       await taxRulesPage.goToEditTaxRulePage(page, 1);
 
       const pageTitle = await addTaxRulesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addTaxRulesPage.pageTitleEdit);
+      expect(pageTitle).to.contains(addTaxRulesPage.pageTitleEdit);
     });
 
     it('should update tax', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateTaxRule', baseContext);
 
       const textResult = await addTaxRulesPage.createEditTaxRulesGroup(page, taxRuleDataToEdit);
-      await expect(textResult).to.contains(addTaxRulesPage.successfulUpdateMessage);
+      expect(textResult).to.contains(addTaxRulesPage.successfulUpdateMessage);
     });
 
     it('should go to \'Tax Rules\' page', async function () {
@@ -137,14 +137,14 @@ describe('BO - International - Tax rules : Create, Update and Delete Tax rule',
       await taxesPage.goToTaxRulesPage(page);
 
       const pageTitle = await taxRulesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(taxRulesPage.pageTitle);
+      expect(pageTitle).to.contains(taxRulesPage.pageTitle);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterUpdate', baseContext);
 
       const numberOfTaxRulesAfterReset = await taxRulesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfTaxRulesAfterReset).to.equal(numberOfTaxRules + 1);
+      expect(numberOfTaxRulesAfterReset).to.equal(numberOfTaxRules + 1);
     });
   });
 
@@ -161,17 +161,17 @@ describe('BO - International - Tax rules : Create, Update and Delete Tax rule',
       );
 
       const textName = await taxRulesPage.getTextColumnFromTable(page, 1, 'name');
-      await expect(textName).to.contains(taxRuleDataToEdit.name);
+      expect(textName).to.contains(taxRuleDataToEdit.name);
     });
 
     it('should delete Tax', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteTaxRule', baseContext);
 
       const textResult = await taxRulesPage.deleteTaxRule(page, 1);
-      await expect(textResult).to.contains(taxRulesPage.successfulDeleteMessage);
+      expect(textResult).to.contains(taxRulesPage.successfulDeleteMessage);
 
       const numberOfTaxRulesAfterDelete = await taxRulesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfTaxRulesAfterDelete).to.be.equal(numberOfTaxRules);
+      expect(numberOfTaxRulesAfterDelete).to.be.equal(numberOfTaxRules);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/11_international/03_taxes/02_taxRules/02_filterSortAndPagination.ts b/tests/UI/campaigns/functional/BO/11_international/03_taxes/02_taxRules/02_filterSortAndPagination.ts
index 49c15b6d78474..5de48f12acc81 100644
--- a/tests/UI/campaigns/functional/BO/11_international/03_taxes/02_taxRules/02_filterSortAndPagination.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/03_taxes/02_taxRules/02_filterSortAndPagination.ts
@@ -57,7 +57,7 @@ describe('BO - International - Tax rules : Filter, sort and pagination', async (
     );
 
     const pageTitle = await taxesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(taxesPage.pageTitle);
+    expect(pageTitle).to.contains(taxesPage.pageTitle);
   });
 
   it('should go to \'Tax Rules\' page', async function () {
@@ -66,14 +66,14 @@ describe('BO - International - Tax rules : Filter, sort and pagination', async (
     await taxesPage.goToTaxRulesPage(page);
 
     const pageTitle = await taxRulesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(taxRulesPage.pageTitle);
+    expect(pageTitle).to.contains(taxRulesPage.pageTitle);
   });
 
   it('should reset all filters and get number of Tax rules in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfTaxRules = await taxRulesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfTaxRules).to.be.above(0);
+    expect(numberOfTaxRules).to.be.above(0);
   });
 
   // 1 - Filter tax rules
@@ -121,15 +121,15 @@ describe('BO - International - Tax rules : Filter, sort and pagination', async (
         );
 
         const numberOfLinesAfterFilter = await taxRulesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfLinesAfterFilter).to.be.at.most(numberOfTaxRules);
+        expect(numberOfLinesAfterFilter).to.be.at.most(numberOfTaxRules);
 
         for (let row = 1; row <= numberOfLinesAfterFilter; row++) {
           const textColumn = await taxRulesPage.getTextColumnFromTable(page, row, test.args.filterBy);
 
           if (test.expected !== undefined) {
-            await expect(textColumn).to.contains(test.expected);
+            expect(textColumn).to.contains(test.expected);
           } else {
-            await expect(textColumn).to.contains(test.args.filterValue);
+            expect(textColumn).to.contains(test.args.filterValue);
           }
         }
       });
@@ -138,7 +138,7 @@ describe('BO - International - Tax rules : Filter, sort and pagination', async (
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}Reset`, baseContext);
 
         const numberOfLinesAfterReset = await taxRulesPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfLinesAfterReset).to.equal(numberOfTaxRules);
+        expect(numberOfLinesAfterReset).to.equal(numberOfTaxRules);
       });
     });
   });
@@ -185,17 +185,17 @@ describe('BO - International - Tax rules : Filter, sort and pagination', async (
           const expectedResult = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
           if (test.args.sortDirection === 'up') {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+            expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+            expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
         } else {
           const expectedResult = await basicHelper.sortArray(nonSortedTable);
 
           if (test.args.sortDirection === 'up') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         }
       });
@@ -215,19 +215,19 @@ describe('BO - International - Tax rules : Filter, sort and pagination', async (
         await taxRulesPage.goToAddNewTaxRulesGroupPage(page);
 
         const pageTitle = await addTaxRulesPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addTaxRulesPage.pageTitleCreate);
+        expect(pageTitle).to.contains(addTaxRulesPage.pageTitleCreate);
       });
 
       it('should create tax rule group and check result', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `createTaxRule${index}`, baseContext);
 
         const textResult = await addTaxRulesPage.createEditTaxRulesGroup(page, taxRuleData);
-        await expect(textResult).to.contains(addTaxRulesPage.successfulCreationMessage);
+        expect(textResult).to.contains(addTaxRulesPage.successfulCreationMessage);
 
         await taxesPage.goToTaxRulesPage(page);
 
         const numberOfLinesAfterCreation = await taxRulesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfLinesAfterCreation).to.be.equal(numberOfTaxRules + 1 + index);
+        expect(numberOfLinesAfterCreation).to.be.equal(numberOfTaxRules + 1 + index);
       });
     });
   });
@@ -283,7 +283,7 @@ describe('BO - International - Tax rules : Filter, sort and pagination', async (
           i,
           'name',
         );
-        await expect(textColumn).to.contains('todelete');
+        expect(textColumn).to.contains('todelete');
       }
     });
 
@@ -291,14 +291,14 @@ describe('BO - International - Tax rules : Filter, sort and pagination', async (
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteCarriers', baseContext);
 
       const deleteTextResult = await taxRulesPage.bulkDeleteTaxRules(page);
-      await expect(deleteTextResult).to.be.contains(taxRulesPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.contains(taxRulesPage.successfulMultiDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterDelete', baseContext);
 
       const numberOfLinesAfterReset = await taxRulesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfLinesAfterReset).to.be.equal(numberOfTaxRules);
+      expect(numberOfLinesAfterReset).to.be.equal(numberOfTaxRules);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/11_international/03_taxes/02_taxRules/03_quickEditAndBulkActions.ts b/tests/UI/campaigns/functional/BO/11_international/03_taxes/02_taxRules/03_quickEditAndBulkActions.ts
index 18b5ce5381a62..894a82f6108e9 100644
--- a/tests/UI/campaigns/functional/BO/11_international/03_taxes/02_taxRules/03_quickEditAndBulkActions.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/03_taxes/02_taxRules/03_quickEditAndBulkActions.ts
@@ -56,7 +56,7 @@ describe('BO - International - Tax rules : Bulk actions', async () => {
     );
 
     const pageTitle = await taxesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(taxesPage.pageTitle);
+    expect(pageTitle).to.contains(taxesPage.pageTitle);
   });
 
   it('should go to \'Tax Rules\' page', async function () {
@@ -65,14 +65,14 @@ describe('BO - International - Tax rules : Bulk actions', async () => {
     await taxesPage.goToTaxRulesPage(page);
 
     const pageTitle = await taxRulesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(taxRulesPage.pageTitle);
+    expect(pageTitle).to.contains(taxRulesPage.pageTitle);
   });
 
   it('should reset all filters and get number of Tax rules in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfTaxRules = await taxRulesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfTaxRules).to.be.above(0);
+    expect(numberOfTaxRules).to.be.above(0);
   });
 
   // 1 : Create 2 tax rules with data from faker
@@ -87,14 +87,14 @@ describe('BO - International - Tax rules : Bulk actions', async () => {
         await taxRulesPage.goToAddNewTaxRulesGroupPage(page);
 
         const pageTitle = await addTaxRulesPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addTaxRulesPage.pageTitleCreate);
+        expect(pageTitle).to.contains(addTaxRulesPage.pageTitleCreate);
       });
 
       it('should create tax rule and check result', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `CreateTax${index + 1}`, baseContext);
 
         const textResult = await addTaxRulesPage.createEditTaxRulesGroup(page, test.args.taxRuleToCreate);
-        await expect(textResult).to.contains(addTaxRulesPage.successfulCreationMessage);
+        expect(textResult).to.contains(addTaxRulesPage.successfulCreationMessage);
       });
 
       it('should go to Tax Rules page', async function () {
@@ -103,10 +103,10 @@ describe('BO - International - Tax rules : Bulk actions', async () => {
         await taxesPage.goToTaxRulesPage(page);
 
         const numberOfLineAfterCreation = await taxRulesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfLineAfterCreation).to.be.equal(numberOfTaxRules + index + 1);
+        expect(numberOfLineAfterCreation).to.be.equal(numberOfTaxRules + index + 1);
 
         const pageTitle = await taxRulesPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(taxRulesPage.pageTitle);
+        expect(pageTitle).to.contains(taxRulesPage.pageTitle);
       });
     });
   });
@@ -119,7 +119,7 @@ describe('BO - International - Tax rules : Bulk actions', async () => {
       await taxRulesPage.filterTable(page, 'input', 'name', firstTaxRuleData.name);
 
       const textResult = await taxRulesPage.getTextColumnFromTable(page, 1, 'name');
-      await expect(textResult).to.contains(firstTaxRuleData.name);
+      expect(textResult).to.contains(firstTaxRuleData.name);
     });
 
     [
@@ -133,11 +133,11 @@ describe('BO - International - Tax rules : Bulk actions', async () => {
 
         if (isActionPerformed) {
           const resultMessage = await taxRulesPage.getAlertSuccessBlockContent(page);
-          await expect(resultMessage).to.contains(taxRulesPage.successfulUpdateStatusMessage);
+          expect(resultMessage).to.contains(taxRulesPage.successfulUpdateStatusMessage);
         }
 
         const status = await taxRulesPage.getStatus(page, 1);
-        await expect(status).to.be.equal(test.args.enabledValue);
+        expect(status).to.be.equal(test.args.enabledValue);
       });
     });
 
@@ -145,7 +145,7 @@ describe('BO - International - Tax rules : Bulk actions', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterQuickEdit', baseContext);
 
       const numberOfLinesAfterReset = await taxRulesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfLinesAfterReset).to.be.equal(numberOfTaxRules + 2);
+      expect(numberOfLinesAfterReset).to.be.equal(numberOfTaxRules + 2);
     });
   });
 
@@ -166,20 +166,20 @@ describe('BO - International - Tax rules : Bulk actions', async () => {
         );
 
         const textResult = await taxRulesPage.getTextColumnFromTable(page, 1, 'name');
-        await expect(textResult).to.contains(test.args.taxRule);
+        expect(textResult).to.contains(test.args.taxRule);
       });
 
       it(`should ${test.args.action} tax rules with bulk actions and check Result`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `bulk${test.args.action}`, baseContext);
 
         const textResult = await taxRulesPage.bulkSetStatus(page, test.args.enabledValue);
-        await expect(textResult).to.contains(taxRulesPage.successfulUpdateStatusMessage);
+        expect(textResult).to.contains(taxRulesPage.successfulUpdateStatusMessage);
 
         const numberOfElementInGrid = await taxRulesPage.getNumberOfElementInGrid(page);
 
         for (let i = 1; i <= numberOfElementInGrid; i++) {
           const textColumn = await taxRulesPage.getStatus(page, i);
-          await expect(textColumn).to.equal(test.args.enabledValue);
+          expect(textColumn).to.equal(test.args.enabledValue);
         }
       });
     });
@@ -188,7 +188,7 @@ describe('BO - International - Tax rules : Bulk actions', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterBulkEdit', baseContext);
 
       const numberOfLinesAfterReset = await taxRulesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfLinesAfterReset).to.be.equal(numberOfTaxRules + 2);
+      expect(numberOfLinesAfterReset).to.be.equal(numberOfTaxRules + 2);
     });
   });
 
@@ -205,17 +205,17 @@ describe('BO - International - Tax rules : Bulk actions', async () => {
       );
 
       const textResult = await taxRulesPage.getTextColumnFromTable(page, 1, 'name');
-      await expect(textResult).to.contains('toDelete');
+      expect(textResult).to.contains('toDelete');
     });
 
     it('should delete Taxes with Bulk Actions and check Result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDelete', baseContext);
 
       const deleteTextResult = await taxRulesPage.bulkDeleteTaxRules(page);
-      await expect(deleteTextResult).to.contains(taxRulesPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.contains(taxRulesPage.successfulMultiDeleteMessage);
 
       const numberOfTaxesAfterReset = await taxRulesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfTaxesAfterReset).to.be.equal(numberOfTaxRules);
+      expect(numberOfTaxesAfterReset).to.be.equal(numberOfTaxRules);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/11_international/04_translations/01_modifyTranslation.ts b/tests/UI/campaigns/functional/BO/11_international/04_translations/01_modifyTranslation.ts
index 0b7469d12c0eb..f780cbad2189d 100644
--- a/tests/UI/campaigns/functional/BO/11_international/04_translations/01_modifyTranslation.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/04_translations/01_modifyTranslation.ts
@@ -46,7 +46,7 @@ describe('BO - International - Translation : Edit', async () => {
     );
 
     const pageTitle = await translationsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(translationsPage.pageTitle);
+    expect(pageTitle).to.contains(translationsPage.pageTitle);
   });
 
   it('should choose the translation to modify', async function () {
@@ -54,7 +54,7 @@ describe('BO - International - Translation : Edit', async () => {
 
     await translationsPage.modifyTranslation(page, 'Front office Translations', 'classic', Languages.french.name);
     const pageTitle = await translationsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(translationsPage.pageTitle);
+    expect(pageTitle).to.contains(translationsPage.pageTitle);
   });
 
   it('should search \'Popular Products\' expression and modify the french translation', async function () {
@@ -62,7 +62,7 @@ describe('BO - International - Translation : Edit', async () => {
 
     await translationsPage.searchTranslation(page, 'Popular Products');
     const textResult = await translationsPage.translateExpression(page, 'translate');
-    await expect(textResult).to.equal(translationsPage.validationMessage);
+    expect(textResult).to.equal(translationsPage.validationMessage);
   });
 
   it('should go to FO page and change the language to French', async function () {
@@ -72,14 +72,14 @@ describe('BO - International - Translation : Edit', async () => {
     await homePage.changeLanguage(page, 'fr');
 
     const isHomePage = await homePage.isHomePage(page);
-    await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+    expect(isHomePage, 'Fail to open FO home page').to.eq(true);
   });
 
   it('should check the translation', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'checkTranslation', baseContext);
 
     const title = await homePage.getBlockTitle(page);
-    await expect(title).to.contain('translate');
+    expect(title).to.contain('translate');
   });
 
   it('should go back to BO', async function () {
@@ -89,14 +89,14 @@ describe('BO - International - Translation : Edit', async () => {
     page = await homePage.closePage(browserContext, page, 0);
 
     const pageTitle = await translationsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(translationsPage.pageTitle);
+    expect(pageTitle).to.contains(translationsPage.pageTitle);
   });
 
   it('should reset the french translation', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'searchAndResetTranslation', baseContext);
 
     const textResult = await translationsPage.resetTranslation(page);
-    await expect(textResult).to.equal(translationsPage.validationResetMessage);
+    expect(textResult).to.equal(translationsPage.validationResetMessage);
   });
 
   it('should go to FO page and change the language to French', async function () {
@@ -106,13 +106,13 @@ describe('BO - International - Translation : Edit', async () => {
     await homePage.changeLanguage(page, 'fr');
 
     const isHomePage = await homePage.isHomePage(page);
-    await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+    expect(isHomePage, 'Fail to open FO home page').to.eq(true);
   });
 
   it('should check the translation', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'checkTranslationAfterReset', baseContext);
 
     const title = await homePage.getBlockTitle(page);
-    await expect(title).to.equal('Produits populaires');
+    expect(title).to.equal('Produits populaires');
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/11_international/04_translations/02_addUpdateLanguage.ts b/tests/UI/campaigns/functional/BO/11_international/04_translations/02_addUpdateLanguage.ts
index 082a8b919e824..b793bd9957b8a 100644
--- a/tests/UI/campaigns/functional/BO/11_international/04_translations/02_addUpdateLanguage.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/04_translations/02_addUpdateLanguage.ts
@@ -52,14 +52,14 @@ describe('BO - International - Translation : Add update a language', async () =>
     await translationsPage.closeSfToolBar(page);
 
     const pageTitle = await translationsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(translationsPage.pageTitle);
+    expect(pageTitle).to.contains(translationsPage.pageTitle);
   });
 
   it(`should choose the '${Languages.deutsch.name}' language to add or update`, async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'chooseLanguage', baseContext);
 
     const textResult = await translationsPage.addUpdateLanguage(page, Languages.deutsch.name);
-    await expect(textResult).to.equal(translationsPage.successAlertMessage);
+    expect(textResult).to.equal(translationsPage.successAlertMessage);
   });
 
   it('should go to FO page and check the new language', async function () {
@@ -69,7 +69,7 @@ describe('BO - International - Translation : Add update a language', async () =>
     await homePage.changeLanguage(page, Languages.deutsch.isoCode);
 
     const isHomePage = await homePage.isHomePage(page);
-    await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+    expect(isHomePage, 'Fail to open FO home page').to.eq(true);
   });
 
   it('should go back to BO', async function () {
@@ -79,7 +79,7 @@ describe('BO - International - Translation : Add update a language', async () =>
     page = await homePage.closePage(browserContext, page, 0);
 
     const pageTitle = await translationsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(translationsPage.pageTitle);
+    expect(pageTitle).to.contains(translationsPage.pageTitle);
   });
 
   it('should go to localization page', async function () {
@@ -92,7 +92,7 @@ describe('BO - International - Translation : Add update a language', async () =>
     );
 
     const pageTitle = await localizationPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(localizationPage.pageTitle);
+    expect(pageTitle).to.contains(localizationPage.pageTitle);
   });
 
   it('should go to languages page', async function () {
@@ -101,14 +101,14 @@ describe('BO - International - Translation : Add update a language', async () =>
     await localizationPage.goToSubTabLanguages(page);
 
     const pageTitle = await languagesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(languagesPage.pageTitle);
+    expect(pageTitle).to.contains(languagesPage.pageTitle);
   });
 
   it('should reset all filters and get number of languages in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfLanguages = await languagesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfLanguages).to.be.above(0);
+    expect(numberOfLanguages).to.be.above(0);
   });
 
   it(`should filter language by name '${Languages.deutsch.name}'`, async function () {
@@ -118,20 +118,20 @@ describe('BO - International - Translation : Add update a language', async () =>
     await languagesPage.filterTable(page, 'input', 'name', Languages.deutsch.name);
 
     const textColumn = await languagesPage.getTextColumnFromTable(page, 1, 'name');
-    await expect(textColumn).to.contains(Languages.deutsch.name);
+    expect(textColumn).to.contains(Languages.deutsch.name);
   });
 
   it('should delete language', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'deleteLanguage', baseContext);
 
     const textResult = await languagesPage.deleteLanguage(page, 1);
-    await expect(textResult).to.to.contains(languagesPage.successfulDeleteMessage);
+    expect(textResult).to.to.contains(languagesPage.successfulDeleteMessage);
   });
 
   it('should reset all filters', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDelete', baseContext);
 
     const numberOfLanguagesAfterReset = await languagesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfLanguagesAfterReset).to.be.equal(numberOfLanguages - 1);
+    expect(numberOfLanguagesAfterReset).to.be.equal(numberOfLanguages - 1);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/11_international/04_translations/03_exportLanguage.ts b/tests/UI/campaigns/functional/BO/11_international/04_translations/03_exportLanguage.ts
index 8245573c30c2a..e550aa4fcd7d3 100644
--- a/tests/UI/campaigns/functional/BO/11_international/04_translations/03_exportLanguage.ts
+++ b/tests/UI/campaigns/functional/BO/11_international/04_translations/03_exportLanguage.ts
@@ -46,7 +46,7 @@ describe('BO - International - Translation : Export languages', async () => {
     );
 
     const pageTitle = await translationsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(translationsPage.pageTitle);
+    expect(pageTitle).to.contains(translationsPage.pageTitle);
   });
 
   const tests = [
@@ -81,7 +81,7 @@ describe('BO - International - Translation : Export languages', async () => {
         test.args.types,
       );
       const doesFileExist = await files.doesFileExist(filePath);
-      await expect(doesFileExist, `File '${filePath}' was not downloaded`).to.be.true;
+      expect(doesFileExist, `File '${filePath}' was not downloaded`).to.eq(true);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/01_general/general/08_enableDisableSuppliers.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/01_general/general/08_enableDisableSuppliers.ts
index 58757dba1b1a1..5625946d76d69 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/01_general/general/08_enableDisableSuppliers.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/01_general/general/08_enableDisableSuppliers.ts
@@ -60,14 +60,14 @@ describe('BO - Shop Parameters - General : Enable/Disable display suppliers', as
       await generalPage.closeSfToolBar(page);
 
       const pageTitle = await generalPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(generalPage.pageTitle);
+      expect(pageTitle).to.contains(generalPage.pageTitle);
     });
 
     it(`should ${test.args.action} display suppliers`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', `${test.args.action}DisplaySuppliers`, baseContext);
 
       const result = await generalPage.setDisplaySuppliers(page, test.args.exist);
-      await expect(result).to.contains(generalPage.successfulUpdateMessage);
+      expect(result).to.contains(generalPage.successfulUpdateMessage);
     });
 
     it('should go to \'Brands & Suppliers\' page', async function () {
@@ -80,7 +80,7 @@ describe('BO - Shop Parameters - General : Enable/Disable display suppliers', as
       );
 
       const pageTitle = await brandsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(brandsPage.pageTitle);
+      expect(pageTitle).to.contains(brandsPage.pageTitle);
     });
 
     it('should go to \'Suppliers\' tab', async function () {
@@ -89,14 +89,14 @@ describe('BO - Shop Parameters - General : Enable/Disable display suppliers', as
       await brandsPage.goToSubTabSuppliers(page);
 
       const pageTitle = await suppliersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(suppliersPage.pageTitle);
+      expect(pageTitle).to.contains(suppliersPage.pageTitle);
     });
 
     it(`should check that the message alert contains '${test.args.action}'`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', `checkAlertContains_${test.args.action}`, baseContext);
 
       const text = await suppliersPage.getAlertInfoBlockParagraphContent(page);
-      await expect(text).to.contains(test.args.action);
+      expect(text).to.contains(test.args.action);
     });
 
     it('should go to FO', async function () {
@@ -108,7 +108,7 @@ describe('BO - Shop Parameters - General : Enable/Disable display suppliers', as
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage).to.be.true;
+      expect(isHomePage).to.eq(true);
     });
 
     it('should verify the existence of the suppliers page link', async function () {
@@ -117,10 +117,10 @@ describe('BO - Shop Parameters - General : Enable/Disable display suppliers', as
       await homePage.goToFooterLink(page, 'Sitemap');
 
       const pageTitle = await siteMapPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(siteMapPage.pageTitle);
+      expect(pageTitle).to.equal(siteMapPage.pageTitle);
 
       const exist = await siteMapPage.isSuppliersLinkVisible(page);
-      await expect(exist).to.be.equal(test.args.exist);
+      expect(exist).to.be.equal(test.args.exist);
     });
 
     it('should go back to BO', async function () {
@@ -129,7 +129,7 @@ describe('BO - Shop Parameters - General : Enable/Disable display suppliers', as
       page = await siteMapPage.closePage(browserContext, page, 0);
 
       const pageTitle = await suppliersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(suppliersPage.pageTitle);
+      expect(pageTitle).to.contains(suppliersPage.pageTitle);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/01_general/general/09_enableDisableBrands.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/01_general/general/09_enableDisableBrands.ts
index 815462ee19a77..79668fb68cbf8 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/01_general/general/09_enableDisableBrands.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/01_general/general/09_enableDisableBrands.ts
@@ -57,14 +57,14 @@ describe('BO - Shop Parameters - General : Enable/Disable display brands', async
       await generalPage.closeSfToolBar(page);
 
       const pageTitle = await generalPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(generalPage.pageTitle);
+      expect(pageTitle).to.contains(generalPage.pageTitle);
     });
 
     it(`should ${test.args.action} display brands`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', `${test.args.action}DisplayBrands`, baseContext);
 
       const result = await generalPage.setDisplayBrands(page, test.args.exist);
-      await expect(result).to.contains(generalPage.successfulUpdateMessage);
+      expect(result).to.contains(generalPage.successfulUpdateMessage);
     });
 
     it('should go to \'Brands & Suppliers\' page', async function () {
@@ -77,14 +77,14 @@ describe('BO - Shop Parameters - General : Enable/Disable display brands', async
       );
 
       const pageTitle = await brandsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(brandsPage.pageTitle);
+      expect(pageTitle).to.contains(brandsPage.pageTitle);
     });
 
     it(`should check that the message alert contains '${test.args.action}'`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', `checkAlertContains_${test.args.action}`, baseContext);
 
       const text = await brandsPage.getAlertInfoBlockParagraphContent(page);
-      await expect(text).to.contains(test.args.action);
+      expect(text).to.contains(test.args.action);
     });
 
     it('should go to FO', async function () {
@@ -97,7 +97,7 @@ describe('BO - Shop Parameters - General : Enable/Disable display brands', async
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage).to.be.true;
+      expect(isHomePage).to.eq(true);
     });
 
     it('should verify the existence of the brands page link', async function () {
@@ -106,10 +106,10 @@ describe('BO - Shop Parameters - General : Enable/Disable display brands', async
       await homePage.goToFooterLink(page, 'Sitemap');
 
       const pageTitle = await siteMapPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(siteMapPage.pageTitle);
+      expect(pageTitle).to.equal(siteMapPage.pageTitle);
 
       const exist = await siteMapPage.isBrandsLinkVisible(page);
-      await expect(exist).to.be.equal(test.args.exist);
+      expect(exist).to.be.equal(test.args.exist);
     });
 
     it('should go back to BO', async function () {
@@ -118,7 +118,7 @@ describe('BO - Shop Parameters - General : Enable/Disable display brands', async
       page = await siteMapPage.closePage(browserContext, page, 0);
 
       const pageTitle = await brandsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(brandsPage.pageTitle);
+      expect(pageTitle).to.contains(brandsPage.pageTitle);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/01_general/general/11_enableDisableMultistore.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/01_general/general/11_enableDisableMultistore.ts
index 30fd0620fd843..f25c3aa786be4 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/01_general/general/11_enableDisableMultistore.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/01_general/general/11_enableDisableMultistore.ts
@@ -47,7 +47,7 @@ describe('BO - Shop Parameters - General : Enable/Disable multi store', async ()
     await generalPage.closeSfToolBar(page);
 
     const pageTitle = await generalPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(generalPage.pageTitle);
+    expect(pageTitle).to.contains(generalPage.pageTitle);
   });
 
   const tests = [
@@ -60,7 +60,7 @@ describe('BO - Shop Parameters - General : Enable/Disable multi store', async ()
       await testContext.addContextItem(this, 'testIdentifier', `${test.args.action}MultiStore`, baseContext);
 
       const result = await generalPage.setMultiStoreStatus(page, test.args.exist);
-      await expect(result).to.contains(generalPage.successfulUpdateMessage);
+      expect(result).to.contains(generalPage.successfulUpdateMessage);
     });
 
     it('should check the existence of \'Advanced Parameters > Multistore\' page', async function () {
@@ -71,7 +71,7 @@ describe('BO - Shop Parameters - General : Enable/Disable multi store', async ()
         generalPage.advancedParametersLink,
         generalPage.multistoreLink,
       );
-      await expect(result).to.be.equal(test.args.exist);
+      expect(result).to.be.equal(test.args.exist);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/01_general/maintenance/01_enableDisableShop.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/01_general/maintenance/01_enableDisableShop.ts
index 45693d770f692..4b3735772c080 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/01_general/maintenance/01_enableDisableShop.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/01_general/maintenance/01_enableDisableShop.ts
@@ -55,7 +55,7 @@ describe('BO - Shop Parameters - General - Maintenance : Enable/Disable shop', a
     await generalPage.closeSfToolBar(page);
 
     const pageTitle = await generalPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(generalPage.pageTitle);
+    expect(pageTitle).to.contains(generalPage.pageTitle);
   });
 
   it('should go to \'Maintenance\' tab', async function () {
@@ -64,21 +64,21 @@ describe('BO - Shop Parameters - General - Maintenance : Enable/Disable shop', a
     await generalPage.goToSubTabMaintenance(page);
 
     const pageTitle = await maintenancePage.getPageTitle(page);
-    await expect(pageTitle).to.contains(maintenancePage.pageTitle);
+    expect(pageTitle).to.contains(maintenancePage.pageTitle);
   });
 
   it('should disable the shop', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'disableShop', baseContext);
 
     const result = await maintenancePage.changeShopStatus(page, false);
-    await expect(result).to.contains(maintenancePage.successfulUpdateMessage);
+    expect(result).to.contains(maintenancePage.successfulUpdateMessage);
   });
 
   it('should enable store for logged-in employees', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'enableStoreForLoggedInEmployees', baseContext);
 
     const result = await maintenancePage.changeStoreForLoggedInEmployees(page, true);
-    await expect(result).to.contains(maintenancePage.successfulUpdateMessage);
+    expect(result).to.contains(maintenancePage.successfulUpdateMessage);
   });
 
   it('should verify that the shop is enabled', async function () {
@@ -87,10 +87,10 @@ describe('BO - Shop Parameters - General - Maintenance : Enable/Disable shop', a
     page = await maintenancePage.viewMyShop(page);
 
     const pageContent = await homePage.getTextContent(page, homePage.content);
-    await expect(pageContent).to.not.equal(maintenancePage.maintenanceText);
+    expect(pageContent).to.not.equal(maintenancePage.maintenanceText);
 
     const result = await homePage.isHomePage(page);
-    await expect(result).to.be.true;
+    expect(result).to.eq(true);
   });
 
   it('should disable store for logged-in employees', async function () {
@@ -100,7 +100,7 @@ describe('BO - Shop Parameters - General - Maintenance : Enable/Disable shop', a
     page = await homePage.closePage(browserContext, page, 0);
 
     const result = await maintenancePage.changeStoreForLoggedInEmployees(page, false);
-    await expect(result).to.contains(maintenancePage.successfulUpdateMessage);
+    expect(result).to.contains(maintenancePage.successfulUpdateMessage);
   });
 
   it('should verify the existence of the maintenance text', async function () {
@@ -109,7 +109,7 @@ describe('BO - Shop Parameters - General - Maintenance : Enable/Disable shop', a
     page = await maintenancePage.viewMyShop(page);
 
     const pageContent = await homePage.getTextContent(page, homePage.content);
-    await expect(pageContent).to.equal(maintenancePage.maintenanceText);
+    expect(pageContent).to.equal(maintenancePage.maintenanceText);
   });
 
   it('should update the maintenance text', async function () {
@@ -119,7 +119,7 @@ describe('BO - Shop Parameters - General - Maintenance : Enable/Disable shop', a
     page = await homePage.closePage(browserContext, page, 0);
 
     const result = await maintenancePage.changeMaintenanceTextShopStatus(page, newMaintenanceText);
-    await expect(result).to.contains(maintenancePage.successfulUpdateMessage);
+    expect(result).to.contains(maintenancePage.successfulUpdateMessage);
   });
 
   it('should verify that the maintenance text is updated successfully', async function () {
@@ -128,7 +128,7 @@ describe('BO - Shop Parameters - General - Maintenance : Enable/Disable shop', a
     page = await maintenancePage.viewMyShop(page);
 
     const pageContent = await homePage.getTextContent(page, homePage.content);
-    await expect(pageContent).to.equal(newMaintenanceText);
+    expect(pageContent).to.equal(newMaintenanceText);
   });
 
   it('should go back to the default maintenance text', async function () {
@@ -140,14 +140,14 @@ describe('BO - Shop Parameters - General - Maintenance : Enable/Disable shop', a
       page,
       maintenancePage.maintenanceText,
     );
-    await expect(result).to.contains(maintenancePage.successfulUpdateMessage);
+    expect(result).to.contains(maintenancePage.successfulUpdateMessage);
   });
 
   it('should add my IP address in Maintenance ip input', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'addMyIpAddress', baseContext);
 
     const result = await maintenancePage.addMyIpAddress(page);
-    await expect(result).to.contains(maintenancePage.successfulUpdateMessage);
+    expect(result).to.contains(maintenancePage.successfulUpdateMessage);
   });
 
   it('should verify that the Home page is displayed successfully', async function () {
@@ -156,10 +156,10 @@ describe('BO - Shop Parameters - General - Maintenance : Enable/Disable shop', a
     page = await maintenancePage.viewMyShop(page);
 
     const pageContent = await homePage.getTextContent(page, homePage.content);
-    await expect(pageContent).to.not.equal(maintenancePage.maintenanceText);
+    expect(pageContent).to.not.equal(maintenancePage.maintenanceText);
 
     const result = await homePage.isHomePage(page);
-    await expect(result).to.be.true;
+    expect(result).to.eq(true);
   });
 
   it('should delete the maintenance ip address', async function () {
@@ -168,14 +168,14 @@ describe('BO - Shop Parameters - General - Maintenance : Enable/Disable shop', a
     page = await homePage.closePage(browserContext, page, 0);
 
     const result = await maintenancePage.addMaintenanceIPAddress(page, '');
-    await expect(result).to.contains(maintenancePage.successfulUpdateMessage);
+    expect(result).to.contains(maintenancePage.successfulUpdateMessage);
   });
 
   it('should enable the shop', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'enableShop', baseContext);
 
     const result = await maintenancePage.changeShopStatus(page);
-    await expect(result).to.contains(maintenancePage.successfulUpdateMessage);
+    expect(result).to.contains(maintenancePage.successfulUpdateMessage);
   });
 
   it('should verify that the shop is enabled', async function () {
@@ -184,9 +184,9 @@ describe('BO - Shop Parameters - General - Maintenance : Enable/Disable shop', a
     page = await maintenancePage.viewMyShop(page);
 
     const pageContent = await homePage.getTextContent(page, homePage.content);
-    await expect(pageContent).to.not.equal(maintenancePage.maintenanceText);
+    expect(pageContent).to.not.equal(maintenancePage.maintenanceText);
 
     const result = await homePage.isHomePage(page);
-    await expect(result).to.be.true;
+    expect(result).to.eq(true);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/general/01_enableFinalSummary.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/general/01_enableFinalSummary.ts
index 3ac188ed5a511..3b3a815196cd6 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/general/01_enableFinalSummary.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/general/01_enableFinalSummary.ts
@@ -57,7 +57,7 @@ describe('BO - Shop Parameters - Order Settings : Enable/Disable final summary',
     await orderSettingsPage.closeSfToolBar(page);
 
     const pageTitle = await orderSettingsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
+    expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
   });
 
   const tests = [
@@ -70,7 +70,7 @@ describe('BO - Shop Parameters - Order Settings : Enable/Disable final summary',
       await testContext.addContextItem(this, 'testIdentifier', `${test.args.action}FinalSummary`, baseContext);
 
       const result = await orderSettingsPage.setFinalSummaryStatus(page, test.args.exist);
-      await expect(result).to.contains(orderSettingsPage.successfulUpdateMessage);
+      expect(result).to.contains(orderSettingsPage.successfulUpdateMessage);
     });
 
     it('should view my shop', async function () {
@@ -82,7 +82,7 @@ describe('BO - Shop Parameters - Order Settings : Enable/Disable final summary',
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Home page is not displayed').to.be.true;
+      expect(isHomePage, 'Home page is not displayed').to.eq(true);
     });
 
     it('should check the final summary after checkout', async function () {
@@ -106,15 +106,15 @@ describe('BO - Shop Parameters - Order Settings : Enable/Disable final summary',
 
       // Address step - Go to delivery step
       const isStepAddressComplete = await checkoutPage.goToDeliveryStep(page);
-      await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
 
       // Delivery step - Go to payment step
       const isStepDeliveryComplete = await checkoutPage.goToPaymentStep(page);
-      await expect(isStepDeliveryComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepDeliveryComplete, 'Step Address is not complete').to.eq(true);
 
       // Check the final summary existence in payment step
       const isVisible = await orderConfirmationPage.isFinalSummaryVisible(page);
-      await expect(isVisible).to.be.equal(test.args.exist);
+      expect(isVisible).to.be.equal(test.args.exist);
     });
 
     it('should go back to BO', async function () {
@@ -123,7 +123,7 @@ describe('BO - Shop Parameters - Order Settings : Enable/Disable final summary',
       page = await orderConfirmationPage.closePage(browserContext, page, 0);
 
       const pageTitle = await orderSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/general/02_enableGuestCheckout.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/general/02_enableGuestCheckout.ts
index 3f1948ad8b2df..70aeefbc012cf 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/general/02_enableGuestCheckout.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/general/02_enableGuestCheckout.ts
@@ -49,7 +49,7 @@ describe('BO - Shop Parameters - Order Settings : Enable/Disable guest checkout'
     await orderSettingsPage.closeSfToolBar(page);
 
     const pageTitle = await orderSettingsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
+    expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
   });
 
   const tests = [
@@ -70,7 +70,7 @@ describe('BO - Shop Parameters - Order Settings : Enable/Disable guest checkout'
       await testContext.addContextItem(this, 'testIdentifier', `guestCheckout${index}`, baseContext);
 
       const result = await orderSettingsPage.setGuestCheckoutStatus(page, test.args.exist);
-      await expect(result).to.contains(orderSettingsPage.successfulUpdateMessage);
+      expect(result).to.contains(orderSettingsPage.successfulUpdateMessage);
     });
 
     it('should view my shop', async function () {
@@ -82,7 +82,7 @@ describe('BO - Shop Parameters - Order Settings : Enable/Disable guest checkout'
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Home page is not displayed').to.be.true;
+      expect(isHomePage, 'Home page is not displayed').to.eq(true);
     });
 
     it('should verify the guest checkout', async function () {
@@ -99,10 +99,10 @@ describe('BO - Shop Parameters - Order Settings : Enable/Disable guest checkout'
 
       // Check guest checkout
       const isNoticeVisible = await checkoutPage.getActiveLinkFromPersonalInformationBlock(page);
-      await expect(isNoticeVisible).to.be.equal(test.args.tabName);
+      expect(isNoticeVisible).to.be.equal(test.args.tabName);
 
       const isPasswordRequired = await checkoutPage.isPasswordRequired(page);
-      await expect(isPasswordRequired).to.be.equal(test.args.pwdRequired);
+      expect(isPasswordRequired).to.be.equal(test.args.pwdRequired);
     });
 
     it('should go back to BO', async function () {
@@ -111,7 +111,7 @@ describe('BO - Shop Parameters - Order Settings : Enable/Disable guest checkout'
       page = await checkoutPage.closePage(browserContext, page, 0);
 
       const pageTitle = await orderSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/general/03_disableReorderingOption.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/general/03_disableReorderingOption.ts
index b514548c42ec9..329c0965d45d9 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/general/03_disableReorderingOption.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/general/03_disableReorderingOption.ts
@@ -56,7 +56,7 @@ describe('BO - Shop Parameters - Order Settings : Enable/Disable reordering opti
     await orderSettingsPage.closeSfToolBar(page);
 
     const pageTitle = await orderSettingsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
+    expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
   });
 
   const tests = [
@@ -69,7 +69,7 @@ describe('BO - Shop Parameters - Order Settings : Enable/Disable reordering opti
       await testContext.addContextItem(this, 'testIdentifier', `setReorderingOption${index}`, baseContext);
 
       const result = await orderSettingsPage.setReorderOptionStatus(page, test.args.status);
-      await expect(result).to.contains(orderSettingsPage.successfulUpdateMessage);
+      expect(result).to.contains(orderSettingsPage.successfulUpdateMessage);
     });
 
     it('should view my shop', async function () {
@@ -81,7 +81,7 @@ describe('BO - Shop Parameters - Order Settings : Enable/Disable reordering opti
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Home page is not displayed').to.be.true;
+      expect(isHomePage, 'Home page is not displayed').to.eq(true);
     });
 
     it('should verify the reordering option', async function () {
@@ -92,7 +92,7 @@ describe('BO - Shop Parameters - Order Settings : Enable/Disable reordering opti
       await foLoginPage.customerLogin(page, Customers.johnDoe);
 
       const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
-      await expect(isCustomerConnected).to.be.true;
+      expect(isCustomerConnected).to.eq(true);
 
       // Go to order history page
       await homePage.goToMyAccountPage(page);
@@ -100,7 +100,7 @@ describe('BO - Shop Parameters - Order Settings : Enable/Disable reordering opti
 
       // Check reorder link
       const isReorderLinkVisible = await orderHistoryPage.isReorderLinkVisible(page);
-      await expect(isReorderLinkVisible).to.be.equal(test.args.reorderOption);
+      expect(isReorderLinkVisible).to.be.equal(test.args.reorderOption);
     });
 
     it('should go back to BO', async function () {
@@ -111,7 +111,7 @@ describe('BO - Shop Parameters - Order Settings : Enable/Disable reordering opti
       page = await orderHistoryPage.closePage(browserContext, page, 0);
 
       const pageTitle = await orderSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/general/04_minimumPurchaseTotalRequired.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/general/04_minimumPurchaseTotalRequired.ts
index 377a7ae4d2f41..2d21afc72d842 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/general/04_minimumPurchaseTotalRequired.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/general/04_minimumPurchaseTotalRequired.ts
@@ -58,7 +58,7 @@ describe('BO - Shop Parameters - Order Settings : Test minimum purchase total re
     await orderSettingsPage.closeSfToolBar(page);
 
     const pageTitle = await orderSettingsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
+    expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
   });
 
   const tests = [
@@ -71,7 +71,7 @@ describe('BO - Shop Parameters - Order Settings : Test minimum purchase total re
       await testContext.addContextItem(this, 'testIdentifier', `updateMinimumPurchaseTotal_${index}`, baseContext);
 
       const result = await orderSettingsPage.setMinimumPurchaseRequiredTotal(page, test.args.value);
-      await expect(result).to.contains(orderSettingsPage.successfulUpdateMessage);
+      expect(result).to.contains(orderSettingsPage.successfulUpdateMessage);
     });
 
     it('should view my shop', async function () {
@@ -84,7 +84,7 @@ describe('BO - Shop Parameters - Order Settings : Test minimum purchase total re
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Home page is not displayed').to.be.true;
+      expect(isHomePage, 'Home page is not displayed').to.eq(true);
     });
 
     it('should verify the minimum purchase total value', async function () {
@@ -103,15 +103,15 @@ describe('BO - Shop Parameters - Order Settings : Test minimum purchase total re
 
       // Check proceed to checkout button enable/disable
       const isDisabled = await cartPage.isProceedToCheckoutButtonDisabled(page);
-      await expect(isDisabled).to.equal(test.args.disable);
+      expect(isDisabled).to.equal(test.args.disable);
 
       // Check alert message
       const isAlertVisible = await cartPage.isAlertWarningForMinimumPurchaseVisible(page);
-      await expect(isAlertVisible).to.equal(test.args.alertMessage);
+      expect(isAlertVisible).to.equal(test.args.alertMessage);
 
       if (isAlertVisible) {
         const alertText = await cartPage.getAlertWarning(page);
-        await expect(alertText).to.contains(alertMessage);
+        expect(alertText).to.contains(alertMessage);
       }
     });
 
@@ -121,7 +121,7 @@ describe('BO - Shop Parameters - Order Settings : Test minimum purchase total re
       page = await cartPage.closePage(browserContext, page, 0);
 
       const pageTitle = await orderSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/general/06_termsOfService.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/general/06_termsOfService.ts
index d20341ba5631c..2b86ae6b58866 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/general/06_termsOfService.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/general/06_termsOfService.ts
@@ -56,7 +56,7 @@ describe('BO - Shop Parameters - Order Settings : Enable/Disable terms of servic
     await orderSettingsPage.closeSfToolBar(page);
 
     const pageTitle = await orderSettingsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
+    expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
   });
 
   const tests = [
@@ -98,7 +98,7 @@ describe('BO - Shop Parameters - Order Settings : Enable/Disable terms of servic
       );
 
       const result = await orderSettingsPage.setTermsOfService(page, test.args.enable, test.args.pageName);
-      await expect(result).to.contains(orderSettingsPage.successfulUpdateMessage);
+      expect(result).to.contains(orderSettingsPage.successfulUpdateMessage);
     });
 
     it('should check terms of service checkbox', async function () {
@@ -124,15 +124,15 @@ describe('BO - Shop Parameters - Order Settings : Enable/Disable terms of servic
 
       // Address step - Go to delivery step
       const isStepAddressComplete = await checkoutPage.goToDeliveryStep(page);
-      await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
 
       // Delivery step - Go to payment step
       const isStepDeliveryComplete = await checkoutPage.goToPaymentStep(page);
-      await expect(isStepDeliveryComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepDeliveryComplete, 'Step Address is not complete').to.eq(true);
 
       // Check terms of service checkbox existence
       const isVisible = await checkoutPage.isConditionToApproveCheckboxVisible(page);
-      await expect(isVisible).to.be.equal(test.args.enable);
+      expect(isVisible).to.be.equal(test.args.enable);
     });
 
     if (test.args.enable) {
@@ -140,7 +140,7 @@ describe('BO - Shop Parameters - Order Settings : Enable/Disable terms of servic
         await testContext.addContextItem(this, 'testIdentifier', `checkTermsOfServicePage${index}`, baseContext);
 
         const pageName = await checkoutPage.getTermsOfServicePageTitle(page);
-        await expect(pageName).to.contains(test.args.title);
+        expect(pageName).to.contains(test.args.title);
       });
     }
 
@@ -150,7 +150,7 @@ describe('BO - Shop Parameters - Order Settings : Enable/Disable terms of servic
       page = await checkoutPage.closePage(browserContext, page, 0);
 
       const pageTitle = await orderSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/giftOptions/01_giftOptions.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/giftOptions/01_giftOptions.ts
index a509f41dbf33b..ab12346d887cc 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/giftOptions/01_giftOptions.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/01_orderSettings/giftOptions/01_giftOptions.ts
@@ -122,7 +122,7 @@ describe('BO - Shop Parameters - Order Settings : Update gift options ', async (
           await orderSettingsPage.closeSfToolBar(page);
 
           const pageTitle = await orderSettingsPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
+          expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
         });
 
         it('should set gift options', async function () {
@@ -135,7 +135,7 @@ describe('BO - Shop Parameters - Order Settings : Update gift options ', async (
             test.args.isGiftWrappingTax,
             test.args.isRecycledPackaging,
           );
-          await expect(result, 'Success message is not displayed!')
+          expect(result, 'Success message is not displayed!')
             .to.contains(orderSettingsPage.successfulUpdateMessage);
         });
       });
@@ -148,7 +148,7 @@ describe('BO - Shop Parameters - Order Settings : Update gift options ', async (
           await homePage.changeLanguage(page, 'en');
 
           const isHomePage = await homePage.isHomePage(page);
-          await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+          expect(isHomePage, 'Fail to open FO home page').to.eq(true);
         });
 
         it('should go to login page', async function () {
@@ -157,7 +157,7 @@ describe('BO - Shop Parameters - Order Settings : Update gift options ', async (
           await homePage.goToLoginPage(page);
 
           const pageTitle = await foLoginPage.getPageTitle(page);
-          await expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
+          expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
         });
 
         it('should sign in with default customer', async function () {
@@ -166,7 +166,7 @@ describe('BO - Shop Parameters - Order Settings : Update gift options ', async (
           await foLoginPage.customerLogin(page, Customers.johnDoe);
 
           const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
-          await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+          expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
         });
 
         it('should go to home page', async function () {
@@ -175,7 +175,7 @@ describe('BO - Shop Parameters - Order Settings : Update gift options ', async (
           await foLoginPage.goToHomePage(page);
 
           const isHomePage = await homePage.isHomePage(page);
-          await expect(isHomePage, 'Fail to open home page!').to.be.true;
+          expect(isHomePage, 'Fail to open home page!').to.eq(true);
         });
 
         it('should add product to the cart', async function () {
@@ -186,7 +186,7 @@ describe('BO - Shop Parameters - Order Settings : Update gift options ', async (
           await productPage.addProductToTheCart(page);
 
           const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
-          await expect(notificationsNumber).to.be.equal(1);
+          expect(notificationsNumber).to.be.equal(1);
         });
 
         it('should click on proceed to checkout and go to delivery step', async function () {
@@ -195,14 +195,14 @@ describe('BO - Shop Parameters - Order Settings : Update gift options ', async (
           await cartPage.clickOnProceedToCheckout(page);
 
           const isStepAddressComplete = await checkoutPage.goToDeliveryStep(page);
-          await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+          expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
         });
 
         it(`should check that gift checkbox visibility is '${test.args.isGiftWrapping}'`, async function () {
           await testContext.addContextItem(this, 'testIdentifier', `checkGiftVisibility${index}`, baseContext);
 
           const isGiftCheckboxVisible = await checkoutPage.isGiftCheckboxVisible(page);
-          await expect(
+          expect(
             isGiftCheckboxVisible,
             'Gift checkbox has not the correct status',
           ).to.equal(test.args.isGiftWrapping);
@@ -215,7 +215,7 @@ describe('BO - Shop Parameters - Order Settings : Update gift options ', async (
             await checkoutPage.setGiftCheckBox(page);
 
             const isVisible = await checkoutPage.isGiftMessageTextareaVisible(page);
-            await expect(isVisible, 'Gift message textarea is not visible!').to.be.true;
+            expect(isVisible, 'Gift message textarea is not visible!').to.eq(true);
 
             if (isVisible) {
               await checkoutPage.setGiftMessage(page, 'This is your gift');
@@ -228,7 +228,7 @@ describe('BO - Shop Parameters - Order Settings : Update gift options ', async (
             await testContext.addContextItem(this, 'testIdentifier', `checkGiftPrice${index}`, baseContext);
 
             const giftPrice = await checkoutPage.getGiftPrice(page);
-            await expect(giftPrice, 'Gift price is incorrect').to.equal(
+            expect(giftPrice, 'Gift price is incorrect').to.equal(
               test.args.giftWrappingPrice === 0
                 ? 'Free'
                 : `€${(
@@ -245,7 +245,7 @@ describe('BO - Shop Parameters - Order Settings : Update gift options ', async (
             await testContext.addContextItem(this, 'testIdentifier', `checkRecycleDVisibility${index}`, baseContext);
 
             const isRecycledPackagingCheckboxVisible = await checkoutPage.isRecycledPackagingCheckboxVisible(page);
-            await expect(
+            expect(
               isRecycledPackagingCheckboxVisible,
               'Recycled packaging checkbox has not the correct status',
             ).to.equal(test.args.isRecycledPackaging);
@@ -259,7 +259,7 @@ describe('BO - Shop Parameters - Order Settings : Update gift options ', async (
           await testContext.addContextItem(this, 'testIdentifier', `goToPaymentStep${index}`, baseContext);
 
           const isStepDeliveryComplete = await checkoutPage.goToPaymentStep(page);
-          await expect(isStepDeliveryComplete, 'Step Address is not complete').to.be.true;
+          expect(isStepDeliveryComplete, 'Step Address is not complete').to.eq(true);
         });
 
         it('should choose payment method and confirm the order', async function () {
@@ -268,7 +268,7 @@ describe('BO - Shop Parameters - Order Settings : Update gift options ', async (
           await checkoutPage.choosePaymentAndOrder(page, PaymentMethods.wirePayment.moduleName);
 
           const cardTitle = await orderConfirmationPage.getOrderConfirmationCardTitle(page);
-          await expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
+          expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
         });
 
         if (test.args.giftWrappingPrice !== 0) {
@@ -276,7 +276,7 @@ describe('BO - Shop Parameters - Order Settings : Update gift options ', async (
             await testContext.addContextItem(this, 'testIdentifier', `checkGiftWrappingPrice${index}`, baseContext);
 
             const giftWrappingValue = await orderConfirmationPage.getGiftWrappingValue(page);
-            await expect(giftWrappingValue).to.equal(test.args.giftWrappingPrice);
+            expect(giftWrappingValue).to.equal(test.args.giftWrappingPrice);
           });
         }
 
@@ -287,7 +287,7 @@ describe('BO - Shop Parameters - Order Settings : Update gift options ', async (
           await homePage.logout(page);
 
           const isCustomerConnected = await homePage.isCustomerConnected(page);
-          await expect(isCustomerConnected, 'Customer should be disconnected').to.be.false;
+          expect(isCustomerConnected, 'Customer should be disconnected').to.eq(false);
         });
       });
 
@@ -298,7 +298,7 @@ describe('BO - Shop Parameters - Order Settings : Update gift options ', async (
           page = await checkoutPage.closePage(browserContext, page, 0);
 
           const pageTitle = await orderSettingsPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
+          expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
         });
 
         it('should go to \'Orders > Orders\' page', async function () {
@@ -308,14 +308,14 @@ describe('BO - Shop Parameters - Order Settings : Update gift options ', async (
           await ordersPage.closeSfToolBar(page);
 
           const pageTitle = await ordersPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(ordersPage.pageTitle);
+          expect(pageTitle).to.contains(ordersPage.pageTitle);
         });
 
         it('should reset all filters', async function () {
           await testContext.addContextItem(this, 'testIdentifier', `resetOrderTableFilters${index}`, baseContext);
 
           const numberOfOrders = await ordersPage.resetAndGetNumberOfLines(page);
-          await expect(numberOfOrders).to.be.above(5);
+          expect(numberOfOrders).to.be.above(5);
         });
 
         it('should view the first order in the list', async function () {
@@ -324,7 +324,7 @@ describe('BO - Shop Parameters - Order Settings : Update gift options ', async (
           await ordersPage.goToOrder(page, 1);
 
           const pageTitle = await orderPageTabListBlock.getPageTitle(page);
-          await expect(pageTitle, 'View order page is not visible!').to.contains(orderPageTabListBlock.pageTitle);
+          expect(pageTitle, 'View order page is not visible!').to.contains(orderPageTabListBlock.pageTitle);
         });
 
         if (test.args.isGiftWrapping && !test.args.isRecycledPackaging) {
@@ -332,34 +332,34 @@ describe('BO - Shop Parameters - Order Settings : Update gift options ', async (
             await testContext.addContextItem(this, 'testIdentifier', `checkGiftOnStatusTab${index}`, baseContext);
 
             const isGiftWrapping = await orderPageTabListBlock.getSuccessBadge(page, 1);
-            await expect(isGiftWrapping).to.be.equal('Gift wrapping');
+            expect(isGiftWrapping).to.be.equal('Gift wrapping');
           });
 
           it('should check \'gift wrapping\' badge on documents tab', async function () {
             await testContext.addContextItem(this, 'testIdentifier', `checkGiftOnDocTab${index}`, baseContext);
 
             const isTabOpened = await orderPageTabListBlock.goToDocumentsTab(page);
-            await expect(isTabOpened, 'Documents tab is not opened!').to.be.true;
+            expect(isTabOpened, 'Documents tab is not opened!').to.eq(true);
 
             const isGiftWrapping = await orderPageTabListBlock.getSuccessBadge(page, 1);
-            await expect(isGiftWrapping).to.be.equal('Gift wrapping');
+            expect(isGiftWrapping).to.be.equal('Gift wrapping');
           });
 
           it('should check \'gift wrapping\' badge on carriers tab', async function () {
             await testContext.addContextItem(this, 'testIdentifier', `checkGiftOnCarriersTab${index}`, baseContext);
 
             const isTabOpened = await orderPageTabListBlock.goToCarriersTab(page);
-            await expect(isTabOpened, 'Carriers tab is not opened!').to.be.true;
+            expect(isTabOpened, 'Carriers tab is not opened!').to.eq(true);
 
             const isGiftWrapping = await orderPageTabListBlock.getSuccessBadge(page, 1);
-            await expect(isGiftWrapping).to.be.equal('Gift wrapping');
+            expect(isGiftWrapping).to.be.equal('Gift wrapping');
           });
 
           it('should check the gift message', async function () {
             await testContext.addContextItem(this, 'testIdentifier', `checkGiftMessage${index}`, baseContext);
 
             const giftMessageText = await orderPageTabListBlock.getGiftMessage(page);
-            await expect(giftMessageText).to.be.equal('This is your gift');
+            expect(giftMessageText).to.be.equal('This is your gift');
           });
         }
 
@@ -368,7 +368,7 @@ describe('BO - Shop Parameters - Order Settings : Update gift options ', async (
             await testContext.addContextItem(this, 'testIdentifier', `checkWrappingAmount${index}`, baseContext);
 
             const wrappingAmount = await orderPageProductsBlock.getOrderWrappingTotal(page);
-            await expect(wrappingAmount).to.be.equal(
+            expect(wrappingAmount).to.be.equal(
               test.args.giftWrappingPrice * (test.args.isGiftWrappingTax === 'None' ? 1 : (1 + test.args.taxValue)));
           });
         }
@@ -378,7 +378,7 @@ describe('BO - Shop Parameters - Order Settings : Update gift options ', async (
             await testContext.addContextItem(this, 'testIdentifier', `checkBadgesOnStatusTab${index}`, baseContext);
 
             const isRecycledPackaging = await orderPageTabListBlock.getSuccessBadge(page, 2);
-            await expect(isRecycledPackaging).to.contain('Recycled packaging')
+            expect(isRecycledPackaging).to.contain('Recycled packaging')
               .and.to.contain('Gift wrapping');
           });
 
@@ -386,10 +386,10 @@ describe('BO - Shop Parameters - Order Settings : Update gift options ', async (
             await testContext.addContextItem(this, 'testIdentifier', `checkBadgesOnDocTab${index}`, baseContext);
 
             const isTabOpened = await orderPageTabListBlock.goToDocumentsTab(page);
-            await expect(isTabOpened, 'Documents tab is not opened!').to.be.true;
+            expect(isTabOpened, 'Documents tab is not opened!').to.eq(true);
 
             const isRecycledPackaging = await orderPageTabListBlock.getSuccessBadge(page, 2);
-            await expect(isRecycledPackaging).to.contain('Recycled packaging')
+            expect(isRecycledPackaging).to.contain('Recycled packaging')
               .and.to.contain('Gift wrapping');
           });
 
@@ -397,10 +397,10 @@ describe('BO - Shop Parameters - Order Settings : Update gift options ', async (
             await testContext.addContextItem(this, 'testIdentifier', `checkBadgesOnCarriersTab${index}`, baseContext);
 
             const isTabOpened = await orderPageTabListBlock.goToCarriersTab(page);
-            await expect(isTabOpened, 'Carriers tab is not opened!').to.be.true;
+            expect(isTabOpened, 'Carriers tab is not opened!').to.eq(true);
 
             const isRecycledPackaging = await orderPageTabListBlock.getSuccessBadge(page, 2);
-            await expect(isRecycledPackaging).to.be.contain('Recycled packaging')
+            expect(isRecycledPackaging).to.be.contain('Recycled packaging')
               .and.to.contain('Gift wrapping');
           });
         }
@@ -416,14 +416,14 @@ describe('BO - Shop Parameters - Order Settings : Update gift options ', async (
       await dashboardPage.goToSubMenu(page, dashboardPage.shopParametersParentLink, dashboardPage.orderSettingsLink);
 
       const pageTitle = await orderSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
     });
 
     it('should go back to the default configuration', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'backToDefaultConfig', baseContext);
 
       const result = await orderSettingsPage.setGiftOptions(page, false, 0, 'None', false);
-      await expect(result).to.contains(orderSettingsPage.successfulUpdateMessage);
+      expect(result).to.contains(orderSettingsPage.successfulUpdateMessage);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/returnStatuses/01_CRUDOrderReturnStatus.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/returnStatuses/01_CRUDOrderReturnStatus.ts
index 87e054f8b86e6..322c6cb759f19 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/returnStatuses/01_CRUDOrderReturnStatus.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/returnStatuses/01_CRUDOrderReturnStatus.ts
@@ -60,7 +60,7 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Create, update '
     );
 
     const pageTitle = await orderSettingsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
+    expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
   });
 
   it('should go to \'Statuses\' page', async function () {
@@ -69,14 +69,14 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Create, update '
     await orderSettingsPage.goToStatusesPage(page);
 
     const pageTitle = await statusesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(statusesPage.pageTitle);
+    expect(pageTitle).to.contains(statusesPage.pageTitle);
   });
 
   it('should reset all filters and get number of order return statuses', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfOrderReturnStatuses = await statusesPage.resetAndGetNumberOfLines(page, tableName);
-    await expect(numberOfOrderReturnStatuses).to.be.above(0);
+    expect(numberOfOrderReturnStatuses).to.be.above(0);
   });
 
   // 1 - Create order return status
@@ -87,17 +87,17 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Create, update '
       await statusesPage.goToNewOrderReturnStatusPage(page);
 
       const pageTitle = await addOrderReturnStatusPage.getPageTitle(page);
-      await expect(pageTitle).to.eq(addOrderReturnStatusPage.pageTitleCreate);
+      expect(pageTitle).to.eq(addOrderReturnStatusPage.pageTitleCreate);
     });
 
     it('should create order return status and check result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createOrderStatus', baseContext);
 
       const textResult = await addOrderReturnStatusPage.setOrderReturnStatus(page, createOrderReturnStatusData);
-      await expect(textResult).to.contains(statusesPage.successfulCreationMessage);
+      expect(textResult).to.contains(statusesPage.successfulCreationMessage);
 
       const numberOfLinesAfterCreation = await statusesPage.getNumberOfElementInGrid(page, tableName);
-      await expect(numberOfLinesAfterCreation).to.be.equal(numberOfOrderReturnStatuses + 1);
+      expect(numberOfLinesAfterCreation).to.be.equal(numberOfOrderReturnStatuses + 1);
     });
   });
 
@@ -116,7 +116,7 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Create, update '
       );
 
       const textEmail = await statusesPage.getTextColumn(page, tableName, 1, 'name');
-      await expect(textEmail).to.contains(createOrderReturnStatusData.name);
+      expect(textEmail).to.contains(createOrderReturnStatusData.name);
     });
 
     it('should go to edit order return status page', async function () {
@@ -125,17 +125,17 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Create, update '
       await statusesPage.goToEditPage(page, tableName, 1);
 
       const pageTitle = await addOrderReturnStatusPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addOrderReturnStatusPage.pageTitleEdit(createOrderReturnStatusData.name));
+      expect(pageTitle).to.contains(addOrderReturnStatusPage.pageTitleEdit(createOrderReturnStatusData.name));
     });
 
     it('should update order return status', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateOrderReturnStatus', baseContext);
 
       const textResult = await addOrderReturnStatusPage.setOrderReturnStatus(page, editOrderStatusData);
-      await expect(textResult).to.contains(statusesPage.successfulUpdateMessage);
+      expect(textResult).to.contains(statusesPage.successfulUpdateMessage);
 
       const numberOfOrderReturnStatusesAfterUpdate = await statusesPage.resetAndGetNumberOfLines(page, tableName);
-      await expect(numberOfOrderReturnStatusesAfterUpdate).to.be.equal(numberOfOrderReturnStatuses + 1);
+      expect(numberOfOrderReturnStatusesAfterUpdate).to.be.equal(numberOfOrderReturnStatuses + 1);
     });
   });
 
@@ -154,17 +154,17 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Create, update '
       );
 
       const textEmail = await statusesPage.getTextColumn(page, tableName, 1, 'name');
-      await expect(textEmail).to.contains(editOrderStatusData.name);
+      expect(textEmail).to.contains(editOrderStatusData.name);
     });
 
     it('should delete order return status', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteOrderStatus', baseContext);
 
       const textResult = await statusesPage.deleteOrderStatus(page, tableName, 1);
-      await expect(textResult).to.contains(statusesPage.successfulDeleteMessage);
+      expect(textResult).to.contains(statusesPage.successfulDeleteMessage);
 
       const numberOfOrderReturnStatusesAfterDelete = await statusesPage.resetAndGetNumberOfLines(page, tableName);
-      await expect(numberOfOrderReturnStatusesAfterDelete).to.be.equal(numberOfOrderReturnStatuses);
+      expect(numberOfOrderReturnStatusesAfterDelete).to.be.equal(numberOfOrderReturnStatuses);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/returnStatuses/02_filterSortAndPagination.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/returnStatuses/02_filterSortAndPagination.ts
index e496a05a26770..556129b257e9b 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/returnStatuses/02_filterSortAndPagination.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/returnStatuses/02_filterSortAndPagination.ts
@@ -60,7 +60,7 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Filter, sort and '
     );
 
     const pageTitle = await orderSettingsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
+    expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
   });
 
   it('should go to \'Statuses\' page', async function () {
@@ -69,14 +69,14 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Filter, sort and '
     await orderSettingsPage.goToStatusesPage(page);
 
     const pageTitle = await statusesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(statusesPage.pageTitle);
+    expect(pageTitle).to.contains(statusesPage.pageTitle);
   });
 
   it('should reset all filters and get number of order return statuses', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfOrderReturnStatuses = await statusesPage.resetAndGetNumberOfLines(page, tableName);
-    await expect(numberOfOrderReturnStatuses).to.be.above(0);
+    expect(numberOfOrderReturnStatuses).to.be.above(0);
   });
 
   // 1 - Filter order return statuses
@@ -117,7 +117,7 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Filter, sort and '
         );
 
         const numberOfLinesAfterFilter = await statusesPage.getNumberOfElementInGrid(page, tableName);
-        await expect(numberOfLinesAfterFilter).to.be.at.most(numberOfOrderReturnStatuses);
+        expect(numberOfLinesAfterFilter).to.be.at.most(numberOfOrderReturnStatuses);
 
         for (let row = 1; row <= numberOfLinesAfterFilter; row++) {
           const textColumn = await statusesPage.getTextColumn(
@@ -126,7 +126,7 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Filter, sort and '
             row,
             test.args.filterBy,
           );
-          await expect(textColumn).to.contains(test.args.filterValue);
+          expect(textColumn).to.contains(test.args.filterValue);
         }
       });
 
@@ -134,7 +134,7 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Filter, sort and '
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}Reset`, baseContext);
 
         const numberOfLinesAfterReset = await statusesPage.resetAndGetNumberOfLines(page, tableName);
-        await expect(numberOfLinesAfterReset).to.equal(numberOfOrderReturnStatuses);
+        expect(numberOfLinesAfterReset).to.equal(numberOfOrderReturnStatuses);
       });
     });
   });
@@ -197,17 +197,17 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Filter, sort and '
           const expectedResult = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+            expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+            expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
         } else {
           const expectedResult = await basicHelper.sortArray(nonSortedTable);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         }
       });
@@ -227,17 +227,17 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Filter, sort and '
         await statusesPage.goToNewOrderReturnStatusPage(page);
 
         const pageTitle = await addOrderReturnStatusPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addOrderReturnStatusPage.pageTitleCreate);
+        expect(pageTitle).to.contains(addOrderReturnStatusPage.pageTitleCreate);
       });
 
       it('should create order status and check result', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `createOrderReturnStatus${index}`, baseContext);
 
         const textResult = await addOrderReturnStatusPage.setOrderReturnStatus(page, orderReturnStatusData);
-        await expect(textResult).to.contains(statusesPage.successfulCreationMessage);
+        expect(textResult).to.contains(statusesPage.successfulCreationMessage);
 
         const numberOfLinesAfterCreation = await statusesPage.getNumberOfElementInGrid(page, tableName);
-        await expect(numberOfLinesAfterCreation).to.be.equal(numberOfOrderReturnStatuses + index + 1);
+        expect(numberOfLinesAfterCreation).to.be.equal(numberOfOrderReturnStatuses + index + 1);
       });
     });
   });
@@ -283,7 +283,7 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Filter, sort and '
 
       for (let i = 1; i <= numberOfLinesAfterFilter; i++) {
         const textColumn = await statusesPage.getTextColumn(page, tableName, i, 'name');
-        await expect(textColumn).to.contains('todelete');
+        expect(textColumn).to.contains('todelete');
       }
     });
 
@@ -291,13 +291,13 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Filter, sort and '
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteStatus', baseContext);
 
       const deleteTextResult = await statusesPage.bulkDeleteOrderStatuses(page, tableName);
-      await expect(deleteTextResult).to.be.contains(statusesPage.successfulDeleteMessage);
+      expect(deleteTextResult).to.be.contains(statusesPage.successfulDeleteMessage);
     });
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterDelete', baseContext);
 
       const numberOfLinesAfterReset = await statusesPage.resetAndGetNumberOfLines(page, tableName);
-      await expect(numberOfLinesAfterReset).to.be.equal(numberOfOrderReturnStatuses);
+      expect(numberOfLinesAfterReset).to.be.equal(numberOfOrderReturnStatuses);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/statuses/01_CRUDOrderStatus.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/statuses/01_CRUDOrderStatus.ts
index 0b4902c314037..2b7688f4e8802 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/statuses/01_CRUDOrderStatus.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/statuses/01_CRUDOrderStatus.ts
@@ -74,7 +74,7 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Create, read, updat
     );
 
     const pageTitle = await orderSettingsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
+    expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
   });
 
   it('should go to \'Statuses\' page', async function () {
@@ -83,14 +83,14 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Create, read, updat
     await orderSettingsPage.goToStatusesPage(page);
 
     const pageTitle = await statusesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(statusesPage.pageTitle);
+    expect(pageTitle).to.contains(statusesPage.pageTitle);
   });
 
   it('should reset all filters and get number of order statuses', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfOrderStatuses = await statusesPage.resetAndGetNumberOfLines(page, tableName);
-    await expect(numberOfOrderStatuses).to.be.above(0);
+    expect(numberOfOrderStatuses).to.be.above(0);
   });
 
   // 1 - Create order status
@@ -101,17 +101,17 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Create, read, updat
       await statusesPage.goToNewOrderStatusPage(page);
 
       const pageTitle = await addOrderStatusPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addOrderStatusPage.pageTitleCreate);
+      expect(pageTitle).to.contains(addOrderStatusPage.pageTitleCreate);
     });
 
     it('should create order status and check result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createOrderStatus', baseContext);
 
       const textResult = await addOrderStatusPage.setOrderStatus(page, createOrderStatusData);
-      await expect(textResult).to.contains(statusesPage.successfulCreationMessage);
+      expect(textResult).to.contains(statusesPage.successfulCreationMessage);
 
       const numberOfLinesAfterCreation = await statusesPage.getNumberOfElementInGrid(page, tableName);
-      await expect(numberOfLinesAfterCreation).to.be.equal(numberOfOrderStatuses + 1);
+      expect(numberOfLinesAfterCreation).to.be.equal(numberOfOrderStatuses + 1);
     });
   });
 
@@ -127,7 +127,7 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Create, read, updat
       );
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should go to the first order page', async function () {
@@ -136,14 +136,14 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Create, read, updat
       await ordersPage.goToOrder(page, 1);
 
       const pageTitle = await viewOrderBasePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(viewOrderBasePage.pageTitle);
+      expect(pageTitle).to.contains(viewOrderBasePage.pageTitle);
     });
 
     it(`should check if the order status '${createOrderStatusData.name}' is visible`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkDoesStatusVisible', baseContext);
 
       const isStatusExist = await viewOrderBasePage.doesStatusExist(page, createOrderStatusData.name);
-      await expect(isStatusExist, 'Status does not exist').to.be.true;
+      expect(isStatusExist, 'Status does not exist').to.eq(true);
     });
   });
 
@@ -159,7 +159,7 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Create, read, updat
       );
 
       const pageTitle = await orderSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
     });
 
     it('should go to \'Statuses\' page', async function () {
@@ -168,7 +168,7 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Create, read, updat
       await orderSettingsPage.goToStatusesPage(page);
 
       const pageTitle = await statusesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(statusesPage.pageTitle);
+      expect(pageTitle).to.contains(statusesPage.pageTitle);
     });
 
     it('should filter list by name', async function () {
@@ -184,7 +184,7 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Create, read, updat
       );
 
       const textEmail = await statusesPage.getTextColumn(page, tableName, 1, 'name');
-      await expect(textEmail).to.contains(createOrderStatusData.name);
+      expect(textEmail).to.contains(createOrderStatusData.name);
     });
 
     it('should go to edit order status page', async function () {
@@ -193,17 +193,17 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Create, read, updat
       await statusesPage.goToEditPage(page, tableName, 1);
 
       const pageTitle = await addOrderStatusPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addOrderStatusPage.pageTitleEdit(createOrderStatusData.name));
+      expect(pageTitle).to.contains(addOrderStatusPage.pageTitleEdit(createOrderStatusData.name));
     });
 
     it('should update order status', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateOrderStatus', baseContext);
 
       const textResult = await addOrderStatusPage.setOrderStatus(page, editOrderStatusData);
-      await expect(textResult).to.contains(statusesPage.successfulUpdateMessage);
+      expect(textResult).to.contains(statusesPage.successfulUpdateMessage);
 
       const numberOfOrderStatusesAfterUpdate = await statusesPage.resetAndGetNumberOfLines(page, tableName);
-      await expect(numberOfOrderStatusesAfterUpdate).to.be.equal(numberOfOrderStatuses + 1);
+      expect(numberOfOrderStatusesAfterUpdate).to.be.equal(numberOfOrderStatuses + 1);
     });
   });
 
@@ -222,17 +222,17 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Create, read, updat
       );
 
       const textEmail = await statusesPage.getTextColumn(page, tableName, 1, 'name');
-      await expect(textEmail).to.contains(editOrderStatusData.name);
+      expect(textEmail).to.contains(editOrderStatusData.name);
     });
 
     it('should delete order status', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteOrderStatus', baseContext);
 
       const textResult = await statusesPage.deleteOrderStatus(page, tableName, 1);
-      await expect(textResult).to.contains(statusesPage.successfulDeleteMessage);
+      expect(textResult).to.contains(statusesPage.successfulDeleteMessage);
 
       const numberOfOrderStatusesAfterDelete = await statusesPage.resetAndGetNumberOfLines(page, tableName);
-      await expect(numberOfOrderStatusesAfterDelete).to.be.equal(numberOfOrderStatuses);
+      expect(numberOfOrderStatusesAfterDelete).to.be.equal(numberOfOrderStatuses);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/statuses/02_filterSortAndPagination.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/statuses/02_filterSortAndPagination.ts
index 6f4831fbb0037..4af889d7f5cb7 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/statuses/02_filterSortAndPagination.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/statuses/02_filterSortAndPagination.ts
@@ -65,7 +65,7 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Filter, sort and pa
     );
 
     const pageTitle = await orderSettingsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
+    expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
   });
 
   it('should go to \'Statuses\' page', async function () {
@@ -74,14 +74,14 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Filter, sort and pa
     await orderSettingsPage.goToStatusesPage(page);
 
     const pageTitle = await statusesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(statusesPage.pageTitle);
+    expect(pageTitle).to.contains(statusesPage.pageTitle);
   });
 
   it('should reset all filters and get number of order statuses', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfOrderStatuses = await statusesPage.resetAndGetNumberOfLines(page, tableName);
-    await expect(numberOfOrderStatuses).to.be.above(0);
+    expect(numberOfOrderStatuses).to.be.above(0);
   });
 
   // 1 - Filter order statuses
@@ -162,12 +162,12 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Filter, sort and pa
         );
 
         const numberOfLinesAfterFilter = await statusesPage.getNumberOfElementInGrid(page, tableName);
-        await expect(numberOfLinesAfterFilter).to.be.at.most(numberOfOrderStatuses);
+        expect(numberOfLinesAfterFilter).to.be.at.most(numberOfOrderStatuses);
 
         for (let row = 1; row <= numberOfLinesAfterFilter; row++) {
           if (test.args.filterTypeOf === 'boolean') {
             const columnStatus = await statusesPage.getStatus(page, tableName, row, test.args.filterBy);
-            await expect(columnStatus).to.equal(test.args.filterValue === '1');
+            expect(columnStatus).to.equal(test.args.filterValue === '1');
           } else {
             const textColumn = await statusesPage.getTextColumn(
               page,
@@ -175,7 +175,7 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Filter, sort and pa
               row,
               test.args.filterBy,
             );
-            await expect(textColumn).to.contains(test.args.filterValue);
+            expect(textColumn).to.contains(test.args.filterValue);
           }
         }
       });
@@ -184,7 +184,7 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Filter, sort and pa
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}Reset`, baseContext);
 
         const numberOfLinesAfterReset = await statusesPage.resetAndGetNumberOfLines(page, tableName);
-        await expect(numberOfLinesAfterReset).to.equal(numberOfOrderStatuses);
+        expect(numberOfLinesAfterReset).to.equal(numberOfOrderStatuses);
       });
     });
   });
@@ -249,17 +249,17 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Filter, sort and pa
           const expectedResult = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+            expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+            expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
         } else {
           const expectedResult = await basicHelper.sortArray(nonSortedTable);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         }
       });
@@ -281,17 +281,17 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Filter, sort and pa
         await statusesPage.goToNewOrderStatusPage(page);
 
         const pageTitle = await addOrderStatusPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addOrderStatusPage.pageTitleCreate);
+        expect(pageTitle).to.contains(addOrderStatusPage.pageTitleCreate);
       });
 
       it('should create order status and check result', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `createOrderStatus${index}`, baseContext);
 
         const textResult = await addOrderStatusPage.setOrderStatus(page, orderStatusData);
-        await expect(textResult).to.contains(statusesPage.successfulCreationMessage);
+        expect(textResult).to.contains(statusesPage.successfulCreationMessage);
 
         const numberOfLinesAfterCreation = await statusesPage.getNumberOfElementInGrid(page, tableName);
-        await expect(numberOfLinesAfterCreation).to.be.equal(numberOfOrderStatuses + index + 1);
+        expect(numberOfLinesAfterCreation).to.be.equal(numberOfOrderStatuses + index + 1);
       });
 
       after(() => files.deleteFile(`todelete${index}.jpg`));
@@ -346,7 +346,7 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Filter, sort and pa
 
       for (let i = 1; i <= numberOfLinesAfterFilter; i++) {
         const textColumn = await statusesPage.getTextColumn(page, tableName, i, 'name');
-        await expect(textColumn).to.contains('todelete');
+        expect(textColumn).to.contains('todelete');
       }
     });
 
@@ -354,14 +354,14 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Filter, sort and pa
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteStatus', baseContext);
 
       const deleteTextResult = await statusesPage.bulkDeleteOrderStatuses(page, tableName);
-      await expect(deleteTextResult).to.be.contains(statusesPage.successfulDeleteMessage);
+      expect(deleteTextResult).to.be.contains(statusesPage.successfulDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterDelete', baseContext);
 
       const numberOfLinesAfterReset = await statusesPage.resetAndGetNumberOfLines(page, tableName);
-      await expect(numberOfLinesAfterReset).to.be.equal(numberOfOrderStatuses);
+      expect(numberOfLinesAfterReset).to.be.equal(numberOfOrderStatuses);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/statuses/03_quickEdit.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/statuses/03_quickEdit.ts
index 5c1c9b9565926..493c5675f9bb7 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/statuses/03_quickEdit.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/02_orderSettings/02_statuses/statuses/03_quickEdit.ts
@@ -54,7 +54,7 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Quick edit order st
     );
 
     const pageTitle = await orderSettingsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
+    expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
   });
 
   it('should go to \'Statuses\' page', async function () {
@@ -63,23 +63,23 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Quick edit order st
     await orderSettingsPage.goToStatusesPage(page);
 
     const pageTitle = await statusesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(statusesPage.pageTitle);
+    expect(pageTitle).to.contains(statusesPage.pageTitle);
   });
 
   it('should filter by status name', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'filterByName', baseContext);
 
     numberOfOrderStatuses = await statusesPage.resetAndGetNumberOfLines(page, tableName);
-    await expect(numberOfOrderStatuses).to.be.above(0);
+    expect(numberOfOrderStatuses).to.be.above(0);
 
     await statusesPage.filterTable(page, tableName, 'input', 'name', OrderStatuses.shipped.name);
 
     const numberOfLinesAfterFilter = await statusesPage.getNumberOfElementInGrid(page, tableName);
-    await expect(numberOfLinesAfterFilter).to.be.above(0);
+    expect(numberOfLinesAfterFilter).to.be.above(0);
 
     for (let row = 1; row <= numberOfLinesAfterFilter; row++) {
       const textColumn = await statusesPage.getTextColumn(page, tableName, row, 'name');
-      await expect(textColumn).to.contains(OrderStatuses.shipped.name);
+      expect(textColumn).to.contains(OrderStatuses.shipped.name);
     }
   });
 
@@ -130,11 +130,11 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Quick edit order st
 
       if (isActionPerformed) {
         const resultMessage = await statusesPage.getAlertSuccessBlockParagraphContent(page);
-        await expect(resultMessage).to.contains(statusesPage.successfulUpdateStatusMessage);
+        expect(resultMessage).to.contains(statusesPage.successfulUpdateStatusMessage);
       }
 
       const currentStatus = await statusesPage.getStatus(page, tableName, 1, orderStatus.args.columnName);
-      await expect(currentStatus).to.be.equal(orderStatus.args.enable);
+      expect(currentStatus).to.be.equal(orderStatus.args.enable);
     });
   });
 
@@ -142,6 +142,6 @@ describe('BO - Shop Parameters - Order Settings - Statuses : Quick edit order st
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilter', baseContext);
 
     const numberOfLinesAfterReset = await statusesPage.resetAndGetNumberOfLines(page, tableName);
-    await expect(numberOfLinesAfterReset).to.equal(numberOfOrderStatuses);
+    expect(numberOfLinesAfterReset).to.equal(numberOfOrderStatuses);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/01_catalogMode.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/01_catalogMode.ts
index c036ad1ca4a3b..faa72f787aea4 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/01_catalogMode.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/01_catalogMode.ts
@@ -57,7 +57,7 @@ describe('BO - Shop Parameters - Product Settings : Enable/Disable catalog mode'
     await productSettingsPage.closeSfToolBar(page);
 
     const pageTitle = await productSettingsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+    expect(pageTitle).to.contains(productSettingsPage.pageTitle);
   });
 
   const tests = [
@@ -75,7 +75,7 @@ describe('BO - Shop Parameters - Product Settings : Enable/Disable catalog mode'
       );
 
       const result = await productSettingsPage.changeCatalogModeStatus(page, test.args.enable);
-      await expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
+      expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
     });
 
     if (test.args.enable) {
@@ -104,7 +104,7 @@ describe('BO - Shop Parameters - Product Settings : Enable/Disable catalog mode'
           );
 
           const result = await productSettingsPage.setShowPricesStatus(page, showPrices.args.enable);
-          await expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
+          expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
         });
 
         it('should check product prices in the home page', async function () {
@@ -114,7 +114,7 @@ describe('BO - Shop Parameters - Product Settings : Enable/Disable catalog mode'
           await homePage.changeLanguage(page, 'en');
 
           const isPriceVisible = await homePage.isPriceVisible(page, 1);
-          await expect(isPriceVisible).to.equal(showPrices.args.enable);
+          expect(isPriceVisible).to.equal(showPrices.args.enable);
         });
 
         it('should go to the first product page', async function () {
@@ -123,17 +123,17 @@ describe('BO - Shop Parameters - Product Settings : Enable/Disable catalog mode'
           await homePage.goToProductPage(page, 1);
 
           const pageTitle = await productPage.getPageTitle(page);
-          await expect(pageTitle.toUpperCase()).to.contains(Products.demo_1.name.toUpperCase());
+          expect(pageTitle.toUpperCase()).to.contains(Products.demo_1.name.toUpperCase());
         });
 
         it('should check the existence of product price and add to cart button', async function () {
           await testContext.addContextItem(this, 'testIdentifier', `checkPrice&AddToCartButton${index}`, baseContext);
 
           let isVisible = await productPage.isPriceDisplayed(page);
-          await expect(isVisible).to.equal(showPrices.args.isPriceExist);
+          expect(isVisible).to.equal(showPrices.args.isPriceExist);
 
           isVisible = await productPage.isAddToCartButtonDisplayed(page);
-          await expect(isVisible).to.equal(showPrices.args.isAddToCartExist);
+          expect(isVisible).to.equal(showPrices.args.isAddToCartExist);
         });
 
         it('should close the page and go back to BO', async function () {
@@ -142,7 +142,7 @@ describe('BO - Shop Parameters - Product Settings : Enable/Disable catalog mode'
           page = await productPage.closePage(browserContext, page, 0);
 
           const pageTitle = await productSettingsPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+          expect(pageTitle).to.contains(productSettingsPage.pageTitle);
         });
       });
     } else {
@@ -158,7 +158,7 @@ describe('BO - Shop Parameters - Product Settings : Enable/Disable catalog mode'
         await homePage.changeLanguage(page, 'en');
 
         const isPriceVisible = await homePage.isPriceVisible(page, 1);
-        await expect(isPriceVisible).to.be.true;
+        expect(isPriceVisible).to.eq(true);
       });
 
       it('should go to the first product page', async function () {
@@ -167,7 +167,7 @@ describe('BO - Shop Parameters - Product Settings : Enable/Disable catalog mode'
         await homePage.goToProductPage(page, 1);
 
         const pageTitle = await productPage.getPageTitle(page);
-        await expect(pageTitle.toUpperCase()).to.contains(Products.demo_1.name.toUpperCase());
+        expect(pageTitle.toUpperCase()).to.contains(Products.demo_1.name.toUpperCase());
       });
 
       it('should check the existence of product price and add to cart button', async function () {
@@ -179,10 +179,10 @@ describe('BO - Shop Parameters - Product Settings : Enable/Disable catalog mode'
         );
 
         let isVisible = await productPage.isPriceDisplayed(page);
-        await expect(isVisible).to.be.true;
+        expect(isVisible).to.eq(true);
 
         isVisible = await productPage.isAddToCartButtonDisplayed(page);
-        await expect(isVisible).to.be.true;
+        expect(isVisible).to.eq(true);
       });
 
       it('should close the page and go back to BO', async function () {
@@ -191,7 +191,7 @@ describe('BO - Shop Parameters - Product Settings : Enable/Disable catalog mode'
         page = await productPage.closePage(browserContext, page, 0);
 
         const pageTitle = await productSettingsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+        expect(pageTitle).to.contains(productSettingsPage.pageTitle);
       });
     }
   });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/02_newDaysNumber.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/02_newDaysNumber.ts
index 2302a3ae93a04..866e9747aad96 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/02_newDaysNumber.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/02_newDaysNumber.ts
@@ -53,7 +53,7 @@ describe('BO - Shop Parameters - Product Settings : Update Number of days for wh
     await productSettingsPage.closeSfToolBar(page);
 
     const pageTitle = await productSettingsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+    expect(pageTitle).to.contains(productSettingsPage.pageTitle);
   });
 
   const tests = [
@@ -66,7 +66,7 @@ describe('BO - Shop Parameters - Product Settings : Update Number of days for wh
       await testContext.addContextItem(this, 'testIdentifier', `updateNumberOfDaysTo${test.args.value}`, baseContext);
 
       const result = await productSettingsPage.updateNumberOfDays(page, test.args.value);
-      await expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
+      expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
     });
 
     it('should check the new flag in the product miniature in FO', async function () {
@@ -75,7 +75,7 @@ describe('BO - Shop Parameters - Product Settings : Update Number of days for wh
       page = await productSettingsPage.viewMyShop(page);
 
       const isNewFlagVisible = await homePage.isNewFlagVisible(page, 1);
-      await expect(isNewFlagVisible).to.be.equal(test.args.exist);
+      expect(isNewFlagVisible).to.be.equal(test.args.exist);
     });
 
     it('should close the page and go back to BO', async function () {
@@ -84,7 +84,7 @@ describe('BO - Shop Parameters - Product Settings : Update Number of days for wh
       page = await homePage.closePage(browserContext, page, 0);
 
       const pageTitle = await productSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(productSettingsPage.pageTitle);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/03_maxSizeShortDescription.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/03_maxSizeShortDescription.ts
index e29c13f282385..52c9cb5ebcc99 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/03_maxSizeShortDescription.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/03_maxSizeShortDescription.ts
@@ -73,14 +73,14 @@ describe('BO - Shop Parameters - Product Settings : Update max size of short des
         await productSettingsPage.closeSfToolBar(page);
 
         const pageTitle = await productSettingsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+        expect(pageTitle).to.contains(productSettingsPage.pageTitle);
       });
 
       it(`should update max size of short description to ${test.args.descriptionSize}`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `updateMaxSizeSummaryValue${index + 1}`, baseContext);
 
         const result = await productSettingsPage.UpdateMaxSizeOfSummary(page, test.args.descriptionSize);
-        await expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
+        expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
       });
 
       it('should go to \'Catalog > Products\' page', async function () {
@@ -93,7 +93,7 @@ describe('BO - Shop Parameters - Product Settings : Update max size of short des
         );
 
         const pageTitle = await productsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(productsPage.pageTitle);
+        expect(pageTitle).to.contains(productsPage.pageTitle);
       });
 
       if (test.args.descriptionSize === maxSummarySizeValue) {
@@ -104,10 +104,10 @@ describe('BO - Shop Parameters - Product Settings : Update max size of short des
           await productsPage.goToAddProductPage(page);
 
           let errorMessage = await addProductPage.createEditBasicProduct(page, productData);
-          await expect(errorMessage).to.equal(addProductPage.errorMessage);
+          expect(errorMessage).to.equal(addProductPage.errorMessage);
 
           errorMessage = await addProductPage.getErrorMessageWhenSummaryIsTooLong(page);
-          await expect(errorMessage).to.equal(
+          expect(errorMessage).to.equal(
             addProductPage.errorMessageWhenSummaryTooLong(maxSummarySizeValue),
           );
         });
@@ -118,7 +118,7 @@ describe('BO - Shop Parameters - Product Settings : Update max size of short des
           await productsPage.goToAddProductPage(page);
 
           const validationMessage = await addProductPage.createEditBasicProduct(page, productData);
-          await expect(validationMessage).to.equal(addProductPage.settingUpdatedMessage);
+          expect(validationMessage).to.equal(addProductPage.settingUpdatedMessage);
         });
       }
     });
@@ -127,7 +127,7 @@ describe('BO - Shop Parameters - Product Settings : Update max size of short des
       await testContext.addContextItem(this, 'testIdentifier', 'deleteProduct', baseContext);
 
       const testResult = await addProductPage.deleteProduct(page);
-      await expect(testResult).to.equal(productsPage.productDeletedSuccessfulMessage);
+      expect(testResult).to.equal(productsPage.productDeletedSuccessfulMessage);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/04_quantityDiscountsBasedOn.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/04_quantityDiscountsBasedOn.ts
index 2d95a3fb47251..25e80c2c667c5 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/04_quantityDiscountsBasedOn.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/04_quantityDiscountsBasedOn.ts
@@ -114,14 +114,14 @@ describe('BO - Shop Parameters - Product Settings : Choose quantity discount bas
       await productSettingsPage.closeSfToolBar(page);
 
       const pageTitle = await productSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(productSettingsPage.pageTitle);
     });
 
     it('should choose quantity discounts based on \'Products\'', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'chooseQuantityDiscountsBasedOnProducts', baseContext);
 
       const result = await productSettingsPage.chooseQuantityDiscountsBasedOn(page, 'Products');
-      await expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
+      expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
     });
 
     it('should go to \'Catalog > Products\' page', async function () {
@@ -134,14 +134,14 @@ describe('BO - Shop Parameters - Product Settings : Choose quantity discount bas
       );
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterProducts', baseContext);
 
       numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProducts).to.be.above(0);
+      expect(numberOfProducts).to.be.above(0);
     });
 
     it('should create product with combinations and add a specific price', async function () {
@@ -154,7 +154,7 @@ describe('BO - Shop Parameters - Product Settings : Choose quantity discount bas
         page,
         productWithCombinations,
       );
-      await expect(createProductMessage).to.equal(addProductPage.settingUpdatedMessage);
+      expect(createProductMessage).to.equal(addProductPage.settingUpdatedMessage);
 
       await addProductPage.addSpecificPrices(page, productWithCombinations.specificPrice);
     });
@@ -167,7 +167,7 @@ describe('BO - Shop Parameters - Product Settings : Choose quantity discount bas
       await foProductPage.addProductToTheCart(page, 1, secondAttributeToChoose, true);
 
       const priceATI = await cartPage.getATIPrice(page);
-      await expect(priceATI).to.equal(firstCartTotalATI);
+      expect(priceATI).to.equal(firstCartTotalATI);
 
       page = await cartPage.closePage(browserContext, page, 0);
     });
@@ -182,14 +182,14 @@ describe('BO - Shop Parameters - Product Settings : Choose quantity discount bas
       );
 
       const pageTitle = await productSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(productSettingsPage.pageTitle);
     });
 
     it('should choose quantity discounts based on \'Combinations\'', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'chooseQuantityDiscountsBasedOnCombinations', baseContext);
 
       const result = await productSettingsPage.chooseQuantityDiscountsBasedOn(page, 'Combinations');
-      await expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
+      expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
     });
 
     it('should view my shop and check ATI price in FO', async function () {
@@ -199,7 +199,7 @@ describe('BO - Shop Parameters - Product Settings : Choose quantity discount bas
       await foProductPage.goToCartPage(page);
 
       const priceATI = await cartPage.getATIPrice(page);
-      await expect(priceATI).to.equal(secondCartTotalATI);
+      expect(priceATI).to.equal(secondCartTotalATI);
     });
 
     it('should close the page and go back to BO', async function () {
@@ -208,7 +208,7 @@ describe('BO - Shop Parameters - Product Settings : Choose quantity discount bas
       page = await cartPage.closePage(browserContext, page, 0);
 
       const pageTitle = await productSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(productSettingsPage.pageTitle);
     });
 
     it('should go to \'Catalog > Products\' page', async function () {
@@ -221,24 +221,24 @@ describe('BO - Shop Parameters - Product Settings : Choose quantity discount bas
       );
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should delete product from dropDown menu', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteProduct', baseContext);
 
       const deleteTextResult = await productsPage.deleteProduct(page, productWithCombinations);
-      await expect(deleteTextResult).to.equal(productsPage.productDeletedSuccessfulMessage);
+      expect(deleteTextResult).to.equal(productsPage.productDeletedSuccessfulMessage);
 
       const numberOfProductsAfterDelete = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProductsAfterDelete).to.equal(numberOfProducts);
+      expect(numberOfProductsAfterDelete).to.equal(numberOfProducts);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilters', baseContext);
 
       const numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProducts).to.be.above(0);
+      expect(numberOfProducts).to.be.above(0);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/05_forceUpdateFriendlyURL.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/05_forceUpdateFriendlyURL.ts
index 1c89498846ad1..86e22a8de8581 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/05_forceUpdateFriendlyURL.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/05_forceUpdateFriendlyURL.ts
@@ -70,7 +70,7 @@ describe('BO - Shop Parameters - Product Settings : Enable/Disable force update
       await productsPage.closeSfToolBar(page);
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should go to create product page and create a product', async function () {
@@ -79,7 +79,7 @@ describe('BO - Shop Parameters - Product Settings : Enable/Disable force update
       await productsPage.goToAddProductPage(page);
 
       const validationMessage = await addProductPage.createEditBasicProduct(page, productData);
-      await expect(validationMessage).to.equal(addProductPage.settingUpdatedMessage);
+      expect(validationMessage).to.equal(addProductPage.settingUpdatedMessage);
     });
 
     const tests = [
@@ -107,7 +107,7 @@ describe('BO - Shop Parameters - Product Settings : Enable/Disable force update
         );
 
         const pageTitle = await productSettingsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+        expect(pageTitle).to.contains(productSettingsPage.pageTitle);
       });
 
       it(`should ${test.args.action} force update friendly URL`, async function () {
@@ -118,7 +118,7 @@ describe('BO - Shop Parameters - Product Settings : Enable/Disable force update
         );
 
         const result = await productSettingsPage.setForceUpdateFriendlyURLStatus(page, test.args.enable);
-        await expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
+        expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
       });
 
       it('should go to \'Catalog > Products\' page', async function () {
@@ -131,7 +131,7 @@ describe('BO - Shop Parameters - Product Settings : Enable/Disable force update
         );
 
         const pageTitle = await productsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(productsPage.pageTitle);
+        expect(pageTitle).to.contains(productsPage.pageTitle);
       });
 
       it('should go to the created product page', async function () {
@@ -141,17 +141,17 @@ describe('BO - Shop Parameters - Product Settings : Enable/Disable force update
         await productsPage.goToProductPage(page, 1);
 
         const pageTitle = await addProductPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addProductPage.pageTitle);
+        expect(pageTitle).to.contains(addProductPage.pageTitle);
       });
 
       it('should update the product name and check the friendly URL', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `UpdateProductAndCheckFriendlyURL${index}`, baseContext);
 
         const validationMessage = await addProductPage.createEditBasicProduct(page, test.args.editProduct);
-        await expect(validationMessage).to.equal(addProductPage.settingUpdatedMessage);
+        expect(validationMessage).to.equal(addProductPage.settingUpdatedMessage);
 
         const friendlyURL = await addProductPage.getFriendlyURL(page);
-        await expect(friendlyURL).to.equal(test.args.friendlyURL.toLowerCase());
+        expect(friendlyURL).to.equal(test.args.friendlyURL.toLowerCase());
       });
     });
 
@@ -159,7 +159,7 @@ describe('BO - Shop Parameters - Product Settings : Enable/Disable force update
       await testContext.addContextItem(this, 'testIdentifier', 'deleteProduct', baseContext);
 
       const testResult = await addProductPage.deleteProduct(page);
-      await expect(testResult).to.equal(productsPage.productDeletedSuccessfulMessage);
+      expect(testResult).to.equal(productsPage.productDeletedSuccessfulMessage);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/06_defaultActivationStatus.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/06_defaultActivationStatus.ts
index c2cbf3e09c29d..838090f1277ec 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/06_defaultActivationStatus.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/01_productsGeneral/06_defaultActivationStatus.ts
@@ -66,7 +66,7 @@ describe('BO - Shop Parameters - Product Settings : Enable/Disable default activ
         await productSettingsPage.closeSfToolBar(page);
 
         const pageTitle = await productSettingsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+        expect(pageTitle).to.contains(productSettingsPage.pageTitle);
       });
 
       it(`should ${test.args.action} default activation status`, async function () {
@@ -78,7 +78,7 @@ describe('BO - Shop Parameters - Product Settings : Enable/Disable default activ
         );
 
         const result = await productSettingsPage.setDefaultActivationStatus(page, test.args.enable);
-        await expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
+        expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
       });
 
       it('should go to \'Catalog > Products\' page', async function () {
@@ -91,7 +91,7 @@ describe('BO - Shop Parameters - Product Settings : Enable/Disable default activ
         );
 
         const pageTitle = await productsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(productsPage.pageTitle);
+        expect(pageTitle).to.contains(productsPage.pageTitle);
       });
 
       it('should go to create product page and check the new product online status', async function () {
@@ -100,7 +100,7 @@ describe('BO - Shop Parameters - Product Settings : Enable/Disable default activ
         await productsPage.goToAddProductPage(page);
 
         const online = await addProductPage.getOnlineButtonStatus(page);
-        await expect(online).to.be.equal(test.args.enable);
+        expect(online).to.be.equal(test.args.enable);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/02_productPage/01_displayAvailableQuantities.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/02_productPage/01_displayAvailableQuantities.ts
index 288359b11018e..18d16e046e5e2 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/02_productPage/01_displayAvailableQuantities.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/02_productPage/01_displayAvailableQuantities.ts
@@ -54,7 +54,7 @@ describe('BO - Shop Parameters - Product Settings : Display available quantities
     await productSettingsPage.closeSfToolBar(page);
 
     const pageTitle = await productSettingsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+    expect(pageTitle).to.contains(productSettingsPage.pageTitle);
   });
 
   const tests = [
@@ -71,7 +71,7 @@ describe('BO - Shop Parameters - Product Settings : Display available quantities
       );
 
       const result = await productSettingsPage.setDisplayAvailableQuantitiesStatus(page, test.args.enable);
-      await expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
+      expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
     });
 
     it('should view my shop and go to first product page', async function () {
@@ -80,7 +80,7 @@ describe('BO - Shop Parameters - Product Settings : Display available quantities
       page = await productSettingsPage.viewMyShop(page);
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Home page was not opened').to.be.true;
+      expect(isHomePage, 'Home page was not opened').to.eq(true);
 
       await homePage.goToProductPage(page, 1);
     });
@@ -89,7 +89,7 @@ describe('BO - Shop Parameters - Product Settings : Display available quantities
       await testContext.addContextItem(this, 'testIdentifier', `checkQuantity${index}`, baseContext);
 
       const quantityIsVisible = await productPage.isQuantityDisplayed(page);
-      await expect(quantityIsVisible).to.be.equal(test.args.enable);
+      expect(quantityIsVisible).to.be.equal(test.args.enable);
     });
 
     it('should close the page and go back to BO', async function () {
@@ -98,7 +98,7 @@ describe('BO - Shop Parameters - Product Settings : Display available quantities
       page = await productPage.closePage(browserContext, page, 0);
 
       const pageTitle = await productSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(productSettingsPage.pageTitle);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/02_productPage/03_separatorOfAttributeAnchor.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/02_productPage/03_separatorOfAttributeAnchor.ts
index 889341a88f21d..1f332d61b11de 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/02_productPage/03_separatorOfAttributeAnchor.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/02_productPage/03_separatorOfAttributeAnchor.ts
@@ -53,7 +53,7 @@ describe('BO - Shop Parameters - Product Settings : Update separator of attribut
     );
 
     const pageTitle = await productSettingsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+    expect(pageTitle).to.contains(productSettingsPage.pageTitle);
   });
 
   const tests = [
@@ -69,7 +69,7 @@ describe('BO - Shop Parameters - Product Settings : Update separator of attribut
         page,
         test.args.option,
       );
-      await expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
+      expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
     });
 
     it('should view my shop', async function () {
@@ -79,7 +79,7 @@ describe('BO - Shop Parameters - Product Settings : Update separator of attribut
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Home page was not opened').to.be.true;
+      expect(isHomePage, 'Home page was not opened').to.eq(true);
     });
 
     it('should search for the product and go to product page', async function () {
@@ -89,14 +89,14 @@ describe('BO - Shop Parameters - Product Settings : Update separator of attribut
       await searchResultsPage.goToProductPage(page, 1);
 
       const pageTitle = await productPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(Products.demo_1.name);
+      expect(pageTitle).to.contains(Products.demo_1.name);
     });
 
     it('should check the attribute separator on the product links in FO', async function () {
       await testContext.addContextItem(this, 'testIdentifier', `checkAttributeSeparator_${index}`, baseContext);
 
       const currentURL = await productPage.getProductPageURL(page);
-      await expect(currentURL).to.contains(test.args.attributesInProductLink);
+      expect(currentURL).to.contains(test.args.attributesInProductLink);
     });
 
     it('should close the page and go back to BO', async function () {
@@ -105,7 +105,7 @@ describe('BO - Shop Parameters - Product Settings : Update separator of attribut
       page = await productPage.closePage(browserContext, page, 0);
 
       const pageTitle = await productSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(productSettingsPage.pageTitle);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/02_productPage/04_displayDiscountedPrice.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/02_productPage/04_displayDiscountedPrice.ts
index 396f532db6863..669df1c0fd6d5 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/02_productPage/04_displayDiscountedPrice.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/02_productPage/04_displayDiscountedPrice.ts
@@ -66,7 +66,7 @@ describe('BO - Shop Parameters - Product Settings : Enable/Disable display disco
     );
 
     const pageTitle = await cartRulesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(cartRulesPage.pageTitle);
+    expect(pageTitle).to.contains(cartRulesPage.pageTitle);
   });
 
   it('should go to \'Catalog Price Rules\' tab', async function () {
@@ -75,7 +75,7 @@ describe('BO - Shop Parameters - Product Settings : Enable/Disable display disco
     await cartRulesPage.goToCatalogPriceRulesTab(page);
 
     const pageTitle = await catalogPriceRulesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(catalogPriceRulesPage.pageTitle);
+    expect(pageTitle).to.contains(catalogPriceRulesPage.pageTitle);
   });
 
   it('should create new catalog price rule', async function () {
@@ -84,10 +84,10 @@ describe('BO - Shop Parameters - Product Settings : Enable/Disable display disco
     await catalogPriceRulesPage.goToAddNewCatalogPriceRulePage(page);
 
     const pageTitle = await addCatalogPriceRulePage.getPageTitle(page);
-    await expect(pageTitle).to.contains(addCatalogPriceRulePage.pageTitle);
+    expect(pageTitle).to.contains(addCatalogPriceRulePage.pageTitle);
 
     const validationMessage = await addCatalogPriceRulePage.setCatalogPriceRule(page, priceRuleData);
-    await expect(validationMessage).to.contains(catalogPriceRulesPage.successfulCreationMessage);
+    expect(validationMessage).to.contains(catalogPriceRulesPage.successfulCreationMessage);
   });
 
   it('should go to \'Shop parameters > Product Settings\' page', async function () {
@@ -101,7 +101,7 @@ describe('BO - Shop Parameters - Product Settings : Enable/Disable display disco
     await productSettingsPage.closeSfToolBar(page);
 
     const pageTitle = await productSettingsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+    expect(pageTitle).to.contains(productSettingsPage.pageTitle);
   });
 
   const tests = [
@@ -130,7 +130,7 @@ describe('BO - Shop Parameters - Product Settings : Enable/Disable display disco
         page,
         test.args.enable,
       );
-      await expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
+      expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
     });
 
     it('should view my shop and go to first product page', async function () {
@@ -140,7 +140,7 @@ describe('BO - Shop Parameters - Product Settings : Enable/Disable display disco
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Home page was not opened').to.be.true;
+      expect(isHomePage, 'Home page was not opened').to.eq(true);
 
       await homePage.goToProductPage(page, 1);
     });
@@ -149,10 +149,10 @@ describe('BO - Shop Parameters - Product Settings : Enable/Disable display disco
       await testContext.addContextItem(this, 'testIdentifier', `checkUnitValue${index}`, baseContext);
 
       const columnTitle = await productPage.getDiscountColumnTitle(page);
-      await expect(columnTitle).to.equal(test.args.textColumnToCheck);
+      expect(columnTitle).to.equal(test.args.textColumnToCheck);
 
       const columnValue = await productPage.getDiscountValue(page);
-      await expect(columnValue).to.equal(test.args.valueToCheck);
+      expect(columnValue).to.equal(test.args.valueToCheck);
     });
 
     it('should go back to BO', async function () {
@@ -161,7 +161,7 @@ describe('BO - Shop Parameters - Product Settings : Enable/Disable display disco
       page = await productPage.closePage(browserContext, page, 0);
 
       const pageTitle = await productSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(productSettingsPage.pageTitle);
     });
   });
 
@@ -175,7 +175,7 @@ describe('BO - Shop Parameters - Product Settings : Enable/Disable display disco
     );
 
     const pageTitle = await cartRulesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(cartRulesPage.pageTitle);
+    expect(pageTitle).to.contains(cartRulesPage.pageTitle);
   });
 
   it('should go to \'Catalog Price Rules\' tab', async function () {
@@ -184,13 +184,13 @@ describe('BO - Shop Parameters - Product Settings : Enable/Disable display disco
     await cartRulesPage.goToCatalogPriceRulesTab(page);
 
     const pageTitle = await catalogPriceRulesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(catalogPriceRulesPage.pageTitle);
+    expect(pageTitle).to.contains(catalogPriceRulesPage.pageTitle);
   });
 
   it('should delete catalog price rule', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'deleteCatalogPriceRule', baseContext);
 
     const deleteTextResult = await catalogPriceRulesPage.deleteCatalogPriceRule(page, priceRuleData.name);
-    await expect(deleteTextResult).to.contains(catalogPriceRulesPage.successfulDeleteMessage);
+    expect(deleteTextResult).to.contains(catalogPriceRulesPage.successfulDeleteMessage);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/01_enableStockManagement.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/01_enableStockManagement.ts
index 7270a361cf16f..1e15000bf2d05 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/01_enableStockManagement.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/01_enableStockManagement.ts
@@ -59,14 +59,14 @@ describe('BO - Shop Parameters - Product Settings : Enable/Disable stock managem
         );
 
         const pageTitle = await productSettingsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+        expect(pageTitle).to.contains(productSettingsPage.pageTitle);
       });
 
       it(`should ${test.args.action} stock management`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.action}StockManagement`, baseContext);
 
         const result = await productSettingsPage.setEnableStockManagementStatus(page, test.args.enable);
-        await expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
+        expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
       });
 
       it('should go to \'Catalog > Products\' page', async function () {
@@ -79,7 +79,7 @@ describe('BO - Shop Parameters - Product Settings : Enable/Disable stock managem
         );
 
         const pageTitle = await productsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(productsPage.pageTitle);
+        expect(pageTitle).to.contains(productsPage.pageTitle);
       });
 
       it('should go to create product page and check the existence of quantity input', async function () {
@@ -88,7 +88,7 @@ describe('BO - Shop Parameters - Product Settings : Enable/Disable stock managem
         await productsPage.goToAddProductPage(page);
 
         const isVisible = await addProductPage.isQuantityInputVisible(page);
-        await expect(isVisible).to.equal(test.args.isQuantityVisible);
+        expect(isVisible).to.equal(test.args.isQuantityVisible);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/02_defaultPackStockManagement.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/02_defaultPackStockManagement.ts
index c042d8c9aa415..8fcdd0a3e8f03 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/02_defaultPackStockManagement.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/02_defaultPackStockManagement.ts
@@ -90,7 +90,7 @@ describe('BO - Shop Parameters - Product Settings : Default pack stock managemen
         await productsPage.closeSfToolBar(page);
 
         const pageTitle = await productsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(productsPage.pageTitle);
+        expect(pageTitle).to.contains(productsPage.pageTitle);
       });
 
       it('should go to create product page and create a product', async function () {
@@ -99,7 +99,7 @@ describe('BO - Shop Parameters - Product Settings : Default pack stock managemen
         await productsPage.goToAddProductPage(page);
 
         const validationMessage = await addProductPage.createEditBasicProduct(page, test.args.productToCreate);
-        await expect(validationMessage).to.equal(addProductPage.settingUpdatedMessage);
+        expect(validationMessage).to.equal(addProductPage.settingUpdatedMessage);
       });
     });
   });
@@ -143,14 +143,14 @@ describe('BO - Shop Parameters - Product Settings : Default pack stock managemen
           );
 
           const pageTitle = await productSettingsPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+          expect(pageTitle).to.contains(productSettingsPage.pageTitle);
         });
 
         it(`should choose the Default pack stock management '${test.args.option}'`, async function () {
           await testContext.addContextItem(this, 'testIdentifier', `stockManagementOption${index}`, baseContext);
 
           const result = await productSettingsPage.setDefaultPackStockManagement(page, test.args.option);
-          await expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
+          expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
         });
 
         it('should view my shop', async function () {
@@ -160,7 +160,7 @@ describe('BO - Shop Parameters - Product Settings : Default pack stock managemen
           await foHomePage.changeLanguage(page, 'en');
 
           const isFoHomePage = await foHomePage.isHomePage(page);
-          await expect(isFoHomePage, 'Fail to open FO home page').to.be.true;
+          expect(isFoHomePage, 'Fail to open FO home page').to.eq(true);
         });
 
         it('should go to login page', async function () {
@@ -169,7 +169,7 @@ describe('BO - Shop Parameters - Product Settings : Default pack stock managemen
           await foHomePage.goToLoginPage(page);
 
           const pageTitle = await foLoginPage.getPageTitle(page);
-          await expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
+          expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
         });
 
         it('should sign in with default customer', async function () {
@@ -178,7 +178,7 @@ describe('BO - Shop Parameters - Product Settings : Default pack stock managemen
           await foLoginPage.customerLogin(page, Customers.johnDoe);
 
           const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
-          await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+          expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
         });
 
         it('should create an order', async function () {
@@ -199,18 +199,18 @@ describe('BO - Shop Parameters - Product Settings : Default pack stock managemen
 
           // Address step - Go to delivery step
           const isStepAddressComplete = await checkoutPage.goToDeliveryStep(page);
-          await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+          expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
 
           // Delivery step - Go to payment step
           const isStepDeliveryComplete = await checkoutPage.goToPaymentStep(page);
-          await expect(isStepDeliveryComplete, 'Step Address is not complete').to.be.true;
+          expect(isStepDeliveryComplete, 'Step Address is not complete').to.eq(true);
 
           // Payment step - Choose payment step
           await checkoutPage.choosePaymentAndOrder(page, PaymentMethods.wirePayment.moduleName);
 
           // Check the confirmation message
           const cardTitle = await orderConfirmationPage.getOrderConfirmationCardTitle(page);
-          await expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
+          expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
         });
 
         it('should sign out from FO', async function () {
@@ -219,7 +219,7 @@ describe('BO - Shop Parameters - Product Settings : Default pack stock managemen
           await orderConfirmationPage.logout(page);
 
           const isCustomerConnected = await orderConfirmationPage.isCustomerConnected(page);
-          await expect(isCustomerConnected, 'Customer is connected').to.be.false;
+          expect(isCustomerConnected, 'Customer is connected').to.eq(false);
         });
 
         it('should go back to BO', async function () {
@@ -228,7 +228,7 @@ describe('BO - Shop Parameters - Product Settings : Default pack stock managemen
           page = await foProductPage.closePage(browserContext, page, 0);
 
           const pageTitle = await productSettingsPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+          expect(pageTitle).to.contains(productSettingsPage.pageTitle);
         });
 
         it('should go to \'Catalog > Products\' page', async function () {
@@ -241,7 +241,7 @@ describe('BO - Shop Parameters - Product Settings : Default pack stock managemen
           );
 
           const pageTitle = await productsPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(productsPage.pageTitle);
+          expect(pageTitle).to.contains(productsPage.pageTitle);
         });
 
         it('should search for the pack of products and check the quantity', async function () {
@@ -251,7 +251,7 @@ describe('BO - Shop Parameters - Product Settings : Default pack stock managemen
           await productsPage.filterProducts(page, 'name', productPackData.name);
 
           const packQuantity = await productsPage.getProductQuantityFromList(page, 1);
-          await expect(packQuantity).to.equal(test.args.packQuantity);
+          expect(packQuantity).to.equal(test.args.packQuantity);
         });
 
         it('should search for the first product in the pack and check the quantity', async function () {
@@ -261,7 +261,7 @@ describe('BO - Shop Parameters - Product Settings : Default pack stock managemen
           await productsPage.filterProducts(page, 'name', firstProductData.name);
 
           const packQuantity = await productsPage.getProductQuantityFromList(page, 1);
-          await expect(packQuantity).to.equal(test.args.firstProductQuantity);
+          expect(packQuantity).to.equal(test.args.firstProductQuantity);
         });
 
         it('should search for the second product in the pack and check the quantity', async function () {
@@ -271,7 +271,7 @@ describe('BO - Shop Parameters - Product Settings : Default pack stock managemen
           await productsPage.filterProducts(page, 'name', secondProductData.name);
 
           const packQuantity = await productsPage.getProductQuantityFromList(page, 1);
-          await expect(packQuantity).to.equal(test.args.secondProductQuantity);
+          expect(packQuantity).to.equal(test.args.secondProductQuantity);
         });
       });
     });
@@ -288,7 +288,7 @@ describe('BO - Shop Parameters - Product Settings : Default pack stock managemen
       );
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     const tests = [
@@ -304,14 +304,14 @@ describe('BO - Shop Parameters - Product Settings : Default pack stock managemen
         await productsPage.filterProducts(page, 'name', test.args.productToCreate.name);
 
         const deleteTextResult = await productsPage.deleteProduct(page, test.args.productToCreate);
-        await expect(deleteTextResult).to.equal(productsPage.productDeletedSuccessfulMessage);
+        expect(deleteTextResult).to.equal(productsPage.productDeletedSuccessfulMessage);
       });
 
       it('should reset all filters', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `resetFilters${index}`, baseContext);
 
         const numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfProducts).to.be.above(0);
+        expect(numberOfProducts).to.be.above(0);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/03_displayUnavailableProductAttributes.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/03_displayUnavailableProductAttributes.ts
index e0604ccd1ff9a..de471642f86a5 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/03_displayUnavailableProductAttributes.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/03_displayUnavailableProductAttributes.ts
@@ -78,7 +78,7 @@ describe('BO - Shop Parameters - Product Settings : Display unavailable product
       await productsPage.closeSfToolBar(page);
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should go to create product page and create a product', async function () {
@@ -88,7 +88,7 @@ describe('BO - Shop Parameters - Product Settings : Display unavailable product
       await addProductPage.createEditBasicProduct(page, productData);
 
       const validationMessage = await addProductPage.setAttributesInProduct(page, productData);
-      await expect(validationMessage).to.equal(addProductPage.settingUpdatedMessage);
+      expect(validationMessage).to.equal(addProductPage.settingUpdatedMessage);
     });
 
     it('should go to \'Shop parameters > Product Settings\' page', async function () {
@@ -101,7 +101,7 @@ describe('BO - Shop Parameters - Product Settings : Display unavailable product
       );
 
       const pageTitle = await productSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(productSettingsPage.pageTitle);
     });
 
     const tests = [
@@ -122,7 +122,7 @@ describe('BO - Shop Parameters - Product Settings : Display unavailable product
           test.args.enable,
         );
 
-        await expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
+        expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
       });
 
       it('should check the unavailable product attributes in FO product page', async function () {
@@ -138,13 +138,13 @@ describe('BO - Shop Parameters - Product Settings : Display unavailable product
           page,
           productData.attributes[1].values[0],
         );
-        await expect(sizeIsVisible).to.be.equal(test.args.enable);
+        expect(sizeIsVisible).to.be.equal(test.args.enable);
 
         const colorIsVisible = await productPage.isUnavailableProductColorDisplayed(
           page,
           productData.attributes[0].values[0],
         );
-        await expect(colorIsVisible).to.be.equal(test.args.enable);
+        expect(colorIsVisible).to.be.equal(test.args.enable);
       });
 
       it('should close the page and go back to BO', async function () {
@@ -153,7 +153,7 @@ describe('BO - Shop Parameters - Product Settings : Display unavailable product
         page = await productPage.closePage(browserContext, page, 0);
 
         const pageTitle = await productSettingsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+        expect(pageTitle).to.contains(productSettingsPage.pageTitle);
       });
     });
 
@@ -167,14 +167,14 @@ describe('BO - Shop Parameters - Product Settings : Display unavailable product
       );
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should delete product', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteProduct', baseContext);
 
       const deleteTextResult = await productsPage.deleteProduct(page, productData);
-      await expect(deleteTextResult).to.equal(productsPage.productDeletedSuccessfulMessage);
+      expect(deleteTextResult).to.equal(productsPage.productDeletedSuccessfulMessage);
     });
 
     it('should reset all filters', async function () {
@@ -183,7 +183,7 @@ describe('BO - Shop Parameters - Product Settings : Display unavailable product
       await productsPage.resetFilterCategory(page);
 
       const numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProducts).to.be.above(0);
+      expect(numberOfProducts).to.be.above(0);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/04_displayRemainingQuantities.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/04_displayRemainingQuantities.ts
index 100527629a655..e46427e93587a 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/04_displayRemainingQuantities.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/04_displayRemainingQuantities.ts
@@ -73,7 +73,7 @@ describe('BO - Shop Parameters - Product Settings : Display remaining quantities
       await productsPage.closeSfToolBar(page);
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should go to create product page and create a product', async function () {
@@ -82,7 +82,7 @@ describe('BO - Shop Parameters - Product Settings : Display remaining quantities
       await productsPage.goToAddProductPage(page);
 
       const validationMessage = await addProductPage.createEditBasicProduct(page, productData);
-      await expect(validationMessage).to.equal(addProductPage.settingUpdatedMessage);
+      expect(validationMessage).to.equal(addProductPage.settingUpdatedMessage);
     });
 
     it('should go to \'Shop parameters > Product Settings\' page', async function () {
@@ -95,7 +95,7 @@ describe('BO - Shop Parameters - Product Settings : Display remaining quantities
       );
 
       const pageTitle = await productSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(productSettingsPage.pageTitle);
     });
 
     const tests = [
@@ -108,7 +108,7 @@ describe('BO - Shop Parameters - Product Settings : Display remaining quantities
         await testContext.addContextItem(this, 'testIdentifier', `setDisplayRemainingQuantity${index}`, baseContext);
 
         const result = await productSettingsPage.setDisplayRemainingQuantities(page, test.args.quantity);
-        await expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
+        expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
       });
 
       it('should view my shop', async function () {
@@ -117,7 +117,7 @@ describe('BO - Shop Parameters - Product Settings : Display remaining quantities
         page = await productSettingsPage.viewMyShop(page);
 
         const isHomePage = await homePage.isHomePage(page);
-        await expect(isHomePage, 'Home page was not opened').to.be.true;
+        expect(isHomePage, 'Home page was not opened').to.eq(true);
       });
 
       it('should search for the product and go to product page', async function () {
@@ -127,7 +127,7 @@ describe('BO - Shop Parameters - Product Settings : Display remaining quantities
         await searchResultsPage.goToProductPage(page, 1);
 
         const pageTitle = await productPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(productData.name);
+        expect(pageTitle).to.contains(productData.name);
       });
 
       it('should check the product availability', async function () {
@@ -139,7 +139,7 @@ describe('BO - Shop Parameters - Product Settings : Display remaining quantities
         );
 
         const lastQuantityIsVisible = await productPage.isAvailabilityQuantityDisplayed(page);
-        await expect(lastQuantityIsVisible).to.be.equal(test.args.exist);
+        expect(lastQuantityIsVisible).to.be.equal(test.args.exist);
       });
 
       it('should close the page and go back to BO', async function () {
@@ -148,7 +148,7 @@ describe('BO - Shop Parameters - Product Settings : Display remaining quantities
         page = await productPage.closePage(browserContext, page, 0);
 
         const pageTitle = await productSettingsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+        expect(pageTitle).to.contains(productSettingsPage.pageTitle);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/05_allowOrderingOutOfStock.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/05_allowOrderingOutOfStock.ts
index 5974d1492dce7..be8dfcf77ffd9 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/05_allowOrderingOutOfStock.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/05_allowOrderingOutOfStock.ts
@@ -64,7 +64,7 @@ describe('BO - Shop Parameters - Product Settings : Allow ordering of out-of-sto
       await productsPage.closeSfToolBar(page);
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should go to create product page and create a product', async function () {
@@ -73,7 +73,7 @@ describe('BO - Shop Parameters - Product Settings : Allow ordering of out-of-sto
       await productsPage.goToAddProductPage(page);
 
       const validationMessage = await addProductPage.createEditBasicProduct(page, productData);
-      await expect(validationMessage).to.equal(addProductPage.settingUpdatedMessage);
+      expect(validationMessage).to.equal(addProductPage.settingUpdatedMessage);
     });
 
     it('should go to \'Shop parameters > Product Settings\' page', async function () {
@@ -86,7 +86,7 @@ describe('BO - Shop Parameters - Product Settings : Allow ordering of out-of-sto
       );
 
       const pageTitle = await productSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(productSettingsPage.pageTitle);
     });
 
     const tests = [
@@ -103,7 +103,7 @@ describe('BO - Shop Parameters - Product Settings : Allow ordering of out-of-sto
         );
 
         const result = await productSettingsPage.setAllowOrderingOutOfStockStatus(page, test.args.enable);
-        await expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
+        expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
       });
 
       it('should view my shop', async function () {
@@ -113,7 +113,7 @@ describe('BO - Shop Parameters - Product Settings : Allow ordering of out-of-sto
         page = await productSettingsPage.viewMyShop(page);
 
         const isHomePage = await homePage.isHomePage(page);
-        await expect(isHomePage, 'Home page was not opened').to.be.true;
+        expect(isHomePage, 'Home page was not opened').to.eq(true);
       });
 
       it('should search for the product and go to product page', async function () {
@@ -124,7 +124,7 @@ describe('BO - Shop Parameters - Product Settings : Allow ordering of out-of-sto
         await searchResultsPage.goToProductPage(page, 1);
 
         const pageTitle = await productPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(productData.name);
+        expect(pageTitle).to.contains(productData.name);
       });
 
       it('should check add to cart button is enabled or not', async function () {
@@ -137,7 +137,7 @@ describe('BO - Shop Parameters - Product Settings : Allow ordering of out-of-sto
 
         // Check add to cart button
         const lastQuantityIsVisible = await productPage.isAddToCartButtonEnabled(page);
-        await expect(lastQuantityIsVisible).to.be.equal(test.args.enable);
+        expect(lastQuantityIsVisible).to.be.equal(test.args.enable);
       });
 
       it('should go back to BO', async function () {
@@ -147,7 +147,7 @@ describe('BO - Shop Parameters - Product Settings : Allow ordering of out-of-sto
         page = await productPage.closePage(browserContext, page, 0);
 
         const pageTitle = await productSettingsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+        expect(pageTitle).to.contains(productSettingsPage.pageTitle);
       });
     });
 
@@ -161,14 +161,14 @@ describe('BO - Shop Parameters - Product Settings : Allow ordering of out-of-sto
       );
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should delete product', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteProduct', baseContext);
 
       const deleteTextResult = await productsPage.deleteProduct(page, productData);
-      await expect(deleteTextResult).to.equal(productsPage.productDeletedSuccessfulMessage);
+      expect(deleteTextResult).to.equal(productsPage.productDeletedSuccessfulMessage);
     });
 
     it('should reset all filters', async function () {
@@ -177,7 +177,7 @@ describe('BO - Shop Parameters - Product Settings : Allow ordering of out-of-sto
       await productsPage.resetFilterCategory(page);
 
       const numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProducts).to.be.above(0);
+      expect(numberOfProducts).to.be.above(0);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/06_labelOfInStockProducts.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/06_labelOfInStockProducts.ts
index e944f2a8319ee..1ab804ea3cabb 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/06_labelOfInStockProducts.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/06_labelOfInStockProducts.ts
@@ -47,7 +47,7 @@ describe('BO - Shop Parameters - Product Settings : Update label of in-stock pro
     await dashboardPage.closeSfToolBar(page);
 
     const pageTitle = await productSettingsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+    expect(pageTitle).to.contains(productSettingsPage.pageTitle);
   });
   const tests = [
     {args: {label: 'Product is available', labelToCheck: 'Product is available', exist: true}},
@@ -59,7 +59,7 @@ describe('BO - Shop Parameters - Product Settings : Update label of in-stock pro
       await testContext.addContextItem(this, 'testIdentifier', `updateLabelOfInStockProducts_${index}`, baseContext);
 
       const result = await productSettingsPage.setLabelOfInStockProducts(page, test.args.label);
-      await expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
+      expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
     });
 
     it('should check the label of in-stock product in FO product page', async function () {
@@ -75,10 +75,10 @@ describe('BO - Shop Parameters - Product Settings : Update label of in-stock pro
       await homePage.goToProductPage(page, 1);
 
       const isVisible = await productPage.isAvailabilityQuantityDisplayed(page);
-      await expect(isVisible).to.be.equal(test.args.exist);
+      expect(isVisible).to.be.equal(test.args.exist);
 
       const availabilityLabel = await productPage.getProductAvailabilityLabel(page);
-      await expect(availabilityLabel).to.contains(test.args.labelToCheck);
+      expect(availabilityLabel).to.contains(test.args.labelToCheck);
     });
 
     it('should go back to BO', async function () {
@@ -87,7 +87,7 @@ describe('BO - Shop Parameters - Product Settings : Update label of in-stock pro
       page = await productPage.closePage(browserContext, page, 0);
 
       const pageTitle = await productSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(productSettingsPage.pageTitle);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/07_labelOutOfStock.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/07_labelOutOfStock.ts
index 7187b7d022b51..10a7d1ea5cbe4 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/07_labelOutOfStock.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/07_labelOutOfStock.ts
@@ -65,7 +65,7 @@ describe('BO - Shop Parameters - product Settings : Set label out-of-stock with
       await productsPage.closeSfToolBar(page);
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should go to create product page and create a product', async function () {
@@ -74,7 +74,7 @@ describe('BO - Shop Parameters - product Settings : Set label out-of-stock with
       await productsPage.goToAddProductPage(page);
 
       const validationMessage = await addProductPage.createEditBasicProduct(page, productData);
-      await expect(validationMessage).to.equal(addProductPage.settingUpdatedMessage);
+      expect(validationMessage).to.equal(addProductPage.settingUpdatedMessage);
     });
 
     it('should go to \'Shop parameters > Product Settings\' page', async function () {
@@ -87,7 +87,7 @@ describe('BO - Shop Parameters - product Settings : Set label out-of-stock with
       );
 
       const pageTitle = await productSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(productSettingsPage.pageTitle);
     });
 
     const tests = [
@@ -131,7 +131,7 @@ describe('BO - Shop Parameters - product Settings : Set label out-of-stock with
         );
 
         const result = await productSettingsPage.setAllowOrderingOutOfStockStatus(page, test.args.enable);
-        await expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
+        expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
       });
 
       it(`should set Label of out-of-stock products with ${test.args.backordersAction} backorders`, async function () {
@@ -150,7 +150,7 @@ describe('BO - Shop Parameters - product Settings : Set label out-of-stock with
           result = await productSettingsPage.setLabelOosDeniedBackorders(page, test.args.label);
         }
 
-        await expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
+        expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
       });
 
       it('should view my shop', async function () {
@@ -164,7 +164,7 @@ describe('BO - Shop Parameters - product Settings : Set label out-of-stock with
         page = await productSettingsPage.viewMyShop(page);
 
         const isHomePage = await homePage.isHomePage(page);
-        await expect(isHomePage, 'Home page was not opened').to.be.true;
+        expect(isHomePage, 'Home page was not opened').to.eq(true);
       });
 
       it('should search for the product and go to product page', async function () {
@@ -180,7 +180,7 @@ describe('BO - Shop Parameters - product Settings : Set label out-of-stock with
         await searchResultsPage.goToProductPage(page, 1);
 
         const pageTitle = await productPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(productData.name);
+        expect(pageTitle).to.contains(productData.name);
       });
 
       it('should check label out-of-stock', async function () {
@@ -193,10 +193,10 @@ describe('BO - Shop Parameters - product Settings : Set label out-of-stock with
 
         // Check quantity and availability label
         const lastQuantityIsVisible = await productPage.isAddToCartButtonEnabled(page);
-        await expect(lastQuantityIsVisible).to.be.equal(test.args.enable);
+        expect(lastQuantityIsVisible).to.be.equal(test.args.enable);
 
         const availabilityLabel = await productPage.getProductAvailabilityLabel(page);
-        await expect(availabilityLabel).to.contains(test.args.labelToCheck);
+        expect(availabilityLabel).to.contains(test.args.labelToCheck);
       });
 
       it('should go back to BO', async function () {
@@ -205,7 +205,7 @@ describe('BO - Shop Parameters - product Settings : Set label out-of-stock with
         page = await productPage.closePage(browserContext, page, 0);
 
         const pageTitle = await productSettingsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+        expect(pageTitle).to.contains(productSettingsPage.pageTitle);
       });
     });
 
@@ -219,14 +219,14 @@ describe('BO - Shop Parameters - product Settings : Set label out-of-stock with
       );
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should delete product', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteProduct', baseContext);
 
       const deleteTextResult = await productsPage.deleteProduct(page, productData);
-      await expect(deleteTextResult).to.equal(productsPage.productDeletedSuccessfulMessage);
+      expect(deleteTextResult).to.equal(productsPage.productDeletedSuccessfulMessage);
     });
 
     it('should reset all filters', async function () {
@@ -235,7 +235,7 @@ describe('BO - Shop Parameters - product Settings : Set label out-of-stock with
       await productsPage.resetFilterCategory(page);
 
       const numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProducts).to.be.above(0);
+      expect(numberOfProducts).to.be.above(0);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/08_enableDeliveryTimeOfInStockProducts.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/08_enableDeliveryTimeOfInStockProducts.ts
index 5efc908fb8aba..6d03fa55a68a8 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/08_enableDeliveryTimeOfInStockProducts.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/08_enableDeliveryTimeOfInStockProducts.ts
@@ -46,7 +46,7 @@ describe('BO - Shop Parameters - Product Settings : Enable delivery time in stoc
     );
 
     const pageTitle = await productSettingsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+    expect(pageTitle).to.contains(productSettingsPage.pageTitle);
   });
 
   const tests = [
@@ -59,7 +59,7 @@ describe('BO - Shop Parameters - Product Settings : Enable delivery time in stoc
       await testContext.addContextItem(this, 'testIdentifier', `${test.args.action}StockManagement`, baseContext);
 
       const result = await productSettingsPage.setDeliveryTimeInStock(page, test.args.deliveryTimeText);
-      await expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
+      expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
     });
 
     it('should view my shop', async function () {
@@ -69,7 +69,7 @@ describe('BO - Shop Parameters - Product Settings : Enable delivery time in stoc
       await foHomePage.changeLanguage(page, 'en');
 
       const isHomePage = await foHomePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should check delivery time block visibility', async function () {
@@ -78,7 +78,7 @@ describe('BO - Shop Parameters - Product Settings : Enable delivery time in stoc
       await foHomePage.goToProductPage(page, 4);
 
       const isDeliveryTimeBlockVisible = await foProductPage.isDeliveryInformationVisible(page);
-      await expect(isDeliveryTimeBlockVisible).to.equal(test.args.enable);
+      expect(isDeliveryTimeBlockVisible).to.equal(test.args.enable);
     });
 
     if (test.args.enable) {
@@ -86,7 +86,7 @@ describe('BO - Shop Parameters - Product Settings : Enable delivery time in stoc
         await testContext.addContextItem(this, 'testIdentifier', `deliveryTimeBlockText${index}`, baseContext);
 
         const deliveryTimeText = await foProductPage.getDeliveryInformationText(page);
-        await expect(deliveryTimeText).to.equal(test.args.deliveryTimeText);
+        expect(deliveryTimeText).to.equal(test.args.deliveryTimeText);
       });
     }
 
@@ -96,7 +96,7 @@ describe('BO - Shop Parameters - Product Settings : Enable delivery time in stoc
       page = await foProductPage.closePage(browserContext, page, 0);
 
       const pageTitle = await productSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(productSettingsPage.pageTitle);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/09_enableDeliveryTimeOfOutOfStockProducts.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/09_enableDeliveryTimeOfOutOfStockProducts.ts
index 46d6ee66c32a4..05036f688eb6e 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/09_enableDeliveryTimeOfOutOfStockProducts.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/03_productsStock/09_enableDeliveryTimeOfOutOfStockProducts.ts
@@ -65,7 +65,7 @@ describe('BO - Shop Parameters - Product Settings : Enable delivery time out-of-
       await productsPage.closeSfToolBar(page);
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should go to create product page and create a product', async function () {
@@ -74,7 +74,7 @@ describe('BO - Shop Parameters - Product Settings : Enable delivery time out-of-
       await productsPage.goToAddProductPage(page);
 
       const validationMessage = await addProductPage.createEditBasicProduct(page, productData);
-      await expect(validationMessage).to.equal(addProductPage.settingUpdatedMessage);
+      expect(validationMessage).to.equal(addProductPage.settingUpdatedMessage);
     });
   });
 
@@ -89,7 +89,7 @@ describe('BO - Shop Parameters - Product Settings : Enable delivery time out-of-
       );
 
       const pageTitle = await productSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(productSettingsPage.pageTitle);
     });
 
     const tests = [
@@ -107,7 +107,7 @@ describe('BO - Shop Parameters - Product Settings : Enable delivery time out-of-
             page,
             test.args.deliveryTimeText,
           );
-          await expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
+          expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
         });
 
         it('should view my shop', async function () {
@@ -118,7 +118,7 @@ describe('BO - Shop Parameters - Product Settings : Enable delivery time out-of-
           await foHomePage.changeLanguage(page, 'en');
 
           const isFoHomePage = await foHomePage.isHomePage(page);
-          await expect(isFoHomePage, 'Fail to open FO home page').to.be.true;
+          expect(isFoHomePage, 'Fail to open FO home page').to.eq(true);
         });
 
         it('should check delivery time block visibility', async function () {
@@ -128,7 +128,7 @@ describe('BO - Shop Parameters - Product Settings : Enable delivery time out-of-
           await searchResultsPage.goToProductPage(page, 1);
 
           const isDeliveryTimeBlockVisible = await foProductPage.isDeliveryInformationVisible(page);
-          await expect(isDeliveryTimeBlockVisible).to.equal(test.args.enable);
+          expect(isDeliveryTimeBlockVisible).to.equal(test.args.enable);
         });
 
         if (test.args.enable) {
@@ -136,7 +136,7 @@ describe('BO - Shop Parameters - Product Settings : Enable delivery time out-of-
             await testContext.addContextItem(this, 'testIdentifier', `deliveryTimeBlockText${index}`, baseContext);
 
             const deliveryTimeText = await foProductPage.getDeliveryInformationText(page);
-            await expect(deliveryTimeText).to.equal(test.args.deliveryTimeText);
+            expect(deliveryTimeText).to.equal(test.args.deliveryTimeText);
           });
         }
 
@@ -146,7 +146,7 @@ describe('BO - Shop Parameters - Product Settings : Enable delivery time out-of-
           page = await foProductPage.closePage(browserContext, page, 0);
 
           const pageTitle = await productSettingsPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+          expect(pageTitle).to.contains(productSettingsPage.pageTitle);
         });
       });
     });
@@ -163,14 +163,14 @@ describe('BO - Shop Parameters - Product Settings : Enable delivery time out-of-
       );
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should delete product', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteProduct', baseContext);
 
       const deleteTextResult = await productsPage.deleteProduct(page, productData);
-      await expect(deleteTextResult).to.equal(productsPage.productDeletedSuccessfulMessage);
+      expect(deleteTextResult).to.equal(productsPage.productDeletedSuccessfulMessage);
     });
 
     it('should reset all filters', async function () {
@@ -179,7 +179,7 @@ describe('BO - Shop Parameters - Product Settings : Enable delivery time out-of-
       await productsPage.resetFilterCategory(page);
 
       const numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProducts).to.be.above(0);
+      expect(numberOfProducts).to.be.above(0);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/04_pagination/01_updateNumberOfProductsPerPage.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/04_pagination/01_updateNumberOfProductsPerPage.ts
index cb5c9a6f8fb4e..6efc583f08d4f 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/04_pagination/01_updateNumberOfProductsPerPage.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/04_pagination/01_updateNumberOfProductsPerPage.ts
@@ -64,7 +64,7 @@ describe('BO - Shop Parameters - Product Settings : Update number of product dis
           await productSettingsPage.closeSfToolBar(page);
 
           const pageTitle = await productSettingsPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+          expect(pageTitle).to.contains(productSettingsPage.pageTitle);
         });
       }
 
@@ -77,7 +77,7 @@ describe('BO - Shop Parameters - Product Settings : Update number of product dis
             page,
             test.args.numberOfProductsPerPage,
           );
-          await expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
+          expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
         },
       );
 
@@ -87,7 +87,7 @@ describe('BO - Shop Parameters - Product Settings : Update number of product dis
         page = await productSettingsPage.viewMyShop(page);
 
         const isHomePage = await homePageFO.isHomePage(page);
-        await expect(isHomePage, 'Home page was not opened').to.be.true;
+        expect(isHomePage, 'Home page was not opened').to.eq(true);
       });
 
       it('should go to all products page', async function () {
@@ -97,7 +97,7 @@ describe('BO - Shop Parameters - Product Settings : Update number of product dis
         await homePageFO.goToAllProductsPage(page);
 
         const isCategoryPage = await categoryPageFO.isCategoryPage(page);
-        await expect(isCategoryPage, 'Home category page was not opened');
+        expect(isCategoryPage, 'Home category page was not opened');
       });
 
       it(`should check that number of products is equal to '${test.args.numberOfProductsPerPage}'`, async function () {
@@ -105,7 +105,7 @@ describe('BO - Shop Parameters - Product Settings : Update number of product dis
 
         const numberOfProducts = await categoryPageFO.getNumberOfProductsDisplayed(page);
 
-        await expect(
+        expect(
           numberOfProducts,
           'Number of product displayed is incorrect',
         ).to.equal(test.args.numberOfProductsPerPage);
@@ -117,7 +117,7 @@ describe('BO - Shop Parameters - Product Settings : Update number of product dis
         page = await homePageFO.closePage(browserContext, page, 0);
 
         const pageTitle = await productSettingsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+        expect(pageTitle).to.contains(productSettingsPage.pageTitle);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/04_pagination/02_updateDefaultProductsOrder.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/04_pagination/02_updateDefaultProductsOrder.ts
index 5a8931069dbf7..8040e0fe6287f 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/04_pagination/02_updateDefaultProductsOrder.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/03_productSettings/04_pagination/02_updateDefaultProductsOrder.ts
@@ -53,7 +53,7 @@ describe('BO - Shop Parameters - Product Settings : Update default product order
     await productSettingsPage.closeSfToolBar(page);
 
     const pageTitle = await productSettingsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+    expect(pageTitle).to.contains(productSettingsPage.pageTitle);
   });
 
   const tests = [
@@ -110,7 +110,7 @@ describe('BO - Shop Parameters - Product Settings : Update default product order
           test.args.orderMethod,
         );
 
-        await expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
+        expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
       });
 
       it('should view my shop', async function () {
@@ -119,7 +119,7 @@ describe('BO - Shop Parameters - Product Settings : Update default product order
         page = await productSettingsPage.viewMyShop(page);
 
         const isHomePage = await homePageFO.isHomePage(page);
-        await expect(isHomePage, 'Home page was not opened').to.be.true;
+        expect(isHomePage, 'Home page was not opened').to.eq(true);
       });
 
       it('should go to all products page', async function () {
@@ -129,7 +129,7 @@ describe('BO - Shop Parameters - Product Settings : Update default product order
         await homePageFO.goToAllProductsPage(page);
 
         const isCategoryPage = await categoryPageFO.isCategoryPage(page);
-        await expect(isCategoryPage, 'Home category page was not opened');
+        expect(isCategoryPage, 'Home category page was not opened');
       });
 
       it(
@@ -138,7 +138,7 @@ describe('BO - Shop Parameters - Product Settings : Update default product order
           await testContext.addContextItem(this, 'testIdentifier', `checkProductsOrder${index + 1}`, baseContext);
 
           const defaultProductOrder = await categoryPageFO.getSortByValue(page);
-          await expect(defaultProductOrder, 'Default products order is incorrect').to.contains(test.args.textOnSelect);
+          expect(defaultProductOrder, 'Default products order is incorrect').to.contains(test.args.textOnSelect);
         },
       );
 
@@ -148,7 +148,7 @@ describe('BO - Shop Parameters - Product Settings : Update default product order
         page = await homePageFO.closePage(browserContext, page, 0);
 
         const pageTitle = await productSettingsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+        expect(pageTitle).to.contains(productSettingsPage.pageTitle);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/01_customers/01_redisplayCartAtLogin.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/01_customers/01_redisplayCartAtLogin.ts
index 7e0aac81311d0..288c4f094ec30 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/01_customers/01_redisplayCartAtLogin.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/01_customers/01_redisplayCartAtLogin.ts
@@ -60,7 +60,7 @@ describe('BO - Shop Parameters - Customer Settings : Enable/Disable re-display c
     await customerSettingsPage.closeSfToolBar(page);
 
     const pageTitle = await customerSettingsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(customerSettingsPage.pageTitle);
+    expect(pageTitle).to.contains(customerSettingsPage.pageTitle);
   });
 
   const tests = [
@@ -82,7 +82,7 @@ describe('BO - Shop Parameters - Customer Settings : Enable/Disable re-display c
         CustomerSettingsOptions.OPTION_CART_LOGIN,
         test.args.enable,
       );
-      await expect(result).to.contains(customerSettingsPage.successfulUpdateMessage);
+      expect(result).to.contains(customerSettingsPage.successfulUpdateMessage);
     });
 
     it('should view my shop and login FO', async function () {
@@ -96,7 +96,7 @@ describe('BO - Shop Parameters - Customer Settings : Enable/Disable re-display c
       await loginFOPage.customerLogin(page, Customers.johnDoe);
 
       const connected = await homePage.isCustomerConnected(page);
-      await expect(connected, 'Customer is not connected in FO').to.be.true;
+      expect(connected, 'Customer is not connected in FO').to.eq(true);
     });
 
     it('should add the first product to the cart then logout', async function () {
@@ -109,7 +109,7 @@ describe('BO - Shop Parameters - Customer Settings : Enable/Disable re-display c
 
       // Check number of product in cart
       const notificationsNumber = await homePage.getCartNotificationsNumber(page);
-      await expect(notificationsNumber).to.be.above(0);
+      expect(notificationsNumber).to.be.above(0);
 
       // Logout from FO
       await homePage.logout(page);
@@ -123,7 +123,7 @@ describe('BO - Shop Parameters - Customer Settings : Enable/Disable re-display c
       await loginFOPage.customerLogin(page, Customers.johnDoe);
 
       const connected = await homePage.isCustomerConnected(page);
-      await expect(connected, 'Customer is not connected in FO').to.be.true;
+      expect(connected, 'Customer is not connected in FO').to.eq(true);
     });
 
     it('should check the cart then logout', async function () {
@@ -133,11 +133,11 @@ describe('BO - Shop Parameters - Customer Settings : Enable/Disable re-display c
       const notificationsNumber = await homePage.getCartNotificationsNumber(page);
 
       if (test.args.enable) {
-        await expect(notificationsNumber).to.be.above(0);
+        expect(notificationsNumber).to.be.above(0);
         // Logout from FO
         await homePage.logout(page);
       } else {
-        await expect(notificationsNumber).to.be.equal(0);
+        expect(notificationsNumber).to.be.equal(0);
       }
     });
 
@@ -149,7 +149,7 @@ describe('BO - Shop Parameters - Customer Settings : Enable/Disable re-display c
         page = await homePage.closePage(browserContext, page, 0);
 
         const pageTitle = await customerSettingsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(customerSettingsPage.pageTitle);
+        expect(pageTitle).to.contains(customerSettingsPage.pageTitle);
       });
     }
   });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/01_customers/02_sendEmailAfterRegistration.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/01_customers/02_sendEmailAfterRegistration.ts
index 7e49f9e60a960..7123a0726e846 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/01_customers/02_sendEmailAfterRegistration.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/01_customers/02_sendEmailAfterRegistration.ts
@@ -81,7 +81,7 @@ describe('BO - Shop Parameters - Customer Settings : Enable/Disable send an emai
       await customerSettingsPage.closeSfToolBar(page);
 
       const pageTitle = await customerSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customerSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(customerSettingsPage.pageTitle);
     });
 
     it(`should ${test.args.action} send an email after registration`, async function () {
@@ -92,7 +92,7 @@ describe('BO - Shop Parameters - Customer Settings : Enable/Disable send an emai
         CustomerSettingsOptions.OPTION_EMAIL_REGISTRATION,
         test.args.enable,
       );
-      await expect(result).to.contains(customerSettingsPage.successfulUpdateMessage);
+      expect(result).to.contains(customerSettingsPage.successfulUpdateMessage);
     });
 
     it('should create a customer account from FO', async function () {
@@ -108,7 +108,7 @@ describe('BO - Shop Parameters - Customer Settings : Enable/Disable send an emai
       await foCreateAccountPage.createAccount(page, test.args.customer);
 
       const connected = await foCreateAccountPage.isCustomerConnected(page);
-      await expect(connected, 'Customer is not created in FO').to.be.true;
+      expect(connected, 'Customer is not created in FO').to.eq(true);
 
       await foCreateAccountPage.logout(page);
     });
@@ -119,7 +119,7 @@ describe('BO - Shop Parameters - Customer Settings : Enable/Disable send an emai
       page = await foCreateAccountPage.closePage(browserContext, page, 0);
 
       const pageTitle = await customerSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customerSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(customerSettingsPage.pageTitle);
     });
 
     it('should go to \'Advanced parameters > E-mail\' page', async function () {
@@ -132,7 +132,7 @@ describe('BO - Shop Parameters - Customer Settings : Enable/Disable send an emai
       );
 
       const pageTitle = await emailPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(emailPage.pageTitle);
+      expect(pageTitle).to.contains(emailPage.pageTitle);
     });
 
     it('should check if there is a welcome email for the new customer', async function () {
@@ -141,7 +141,7 @@ describe('BO - Shop Parameters - Customer Settings : Enable/Disable send an emai
       await emailPage.filterEmailLogs(page, 'input', 'recipient', test.args.customer.email);
 
       const numberOfEmailAfterFilter = await emailPage.getNumberOfElementInGrid(page);
-      await expect(numberOfEmailAfterFilter).to.be.equal(test.args.nbrAfterFilter);
+      expect(numberOfEmailAfterFilter).to.be.equal(test.args.nbrAfterFilter);
     });
   });
 
@@ -156,14 +156,14 @@ describe('BO - Shop Parameters - Customer Settings : Enable/Disable send an emai
       );
 
       const pageTitle = await customersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customersPage.pageTitle);
+      expect(pageTitle).to.contains(customersPage.pageTitle);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilter', baseContext);
 
       numberOfCustomers = await customersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCustomers).to.be.above(0);
+      expect(numberOfCustomers).to.be.above(0);
     });
 
     [
@@ -183,17 +183,17 @@ describe('BO - Shop Parameters - Customer Settings : Enable/Disable send an emai
         );
 
         const textEmail = await customersPage.getTextColumnFromTableCustomers(page, 1, 'email');
-        await expect(textEmail).to.contains(test.args.customerToDelete.email);
+        expect(textEmail).to.contains(test.args.customerToDelete.email);
       });
 
       it('should delete customer', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `deleteCustomer${index + 1}`, baseContext);
 
         const textResult = await customersPage.deleteCustomer(page, 1);
-        await expect(textResult).to.equal(customersPage.successfulDeleteMessage);
+        expect(textResult).to.equal(customersPage.successfulDeleteMessage);
 
         const numberOfCustomersAfterDelete = await customersPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfCustomersAfterDelete).to.be.equal(numberOfCustomers - (index + 1));
+        expect(numberOfCustomersAfterDelete).to.be.equal(numberOfCustomers - (index + 1));
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/01_customers/04_enableB2BMode.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/01_customers/04_enableB2BMode.ts
index 57042e8021bd8..f8d5ad9ad4da8 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/01_customers/04_enableB2BMode.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/01_customers/04_enableB2BMode.ts
@@ -56,7 +56,7 @@ describe('BO - Shop Parameters - Customer Settings : Enable/Disable B2B mode', a
     await customerSettingsPage.closeSfToolBar(page);
 
     const pageTitle = await customerSettingsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(customerSettingsPage.pageTitle);
+    expect(pageTitle).to.contains(customerSettingsPage.pageTitle);
   });
 
   const tests = [
@@ -73,7 +73,7 @@ describe('BO - Shop Parameters - Customer Settings : Enable/Disable B2B mode', a
         CustomerSettingsOptions.OPTION_B2B,
         test.args.enable,
       );
-      await expect(result).to.contains(customerSettingsPage.successfulUpdateMessage);
+      expect(result).to.contains(customerSettingsPage.successfulUpdateMessage);
     });
 
     it('should go to create customer page in FO and check company input', async function () {
@@ -89,7 +89,7 @@ describe('BO - Shop Parameters - Customer Settings : Enable/Disable B2B mode', a
 
       // Check B2B mode
       const isCompanyInputVisible = await foCreateAccountPage.isCompanyInputVisible(page);
-      await expect(isCompanyInputVisible).to.be.equal(test.args.enable);
+      expect(isCompanyInputVisible).to.be.equal(test.args.enable);
     });
 
     it('should go back to BO', async function () {
@@ -99,7 +99,7 @@ describe('BO - Shop Parameters - Customer Settings : Enable/Disable B2B mode', a
       page = await foCreateAccountPage.closePage(browserContext, page, 0);
 
       const pageTitle = await customerSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customerSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(customerSettingsPage.pageTitle);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/01_customers/05_askForBirthDate.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/01_customers/05_askForBirthDate.ts
index 426bf11c1e173..254183f2f8484 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/01_customers/05_askForBirthDate.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/01_customers/05_askForBirthDate.ts
@@ -56,7 +56,7 @@ describe('BO - Shop Parameters - Customer Settings : Enable/Disable ask for birt
     await customerSettingsPage.closeSfToolBar(page);
 
     const pageTitle = await customerSettingsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(customerSettingsPage.pageTitle);
+    expect(pageTitle).to.contains(customerSettingsPage.pageTitle);
   });
 
   const tests = [
@@ -74,7 +74,7 @@ describe('BO - Shop Parameters - Customer Settings : Enable/Disable ask for birt
         test.args.enable,
       );
 
-      await expect(result).to.contains(customerSettingsPage.successfulUpdateMessage);
+      expect(result).to.contains(customerSettingsPage.successfulUpdateMessage);
     });
 
     it('should go to customer account in FO and check birth day input', async function () {
@@ -92,7 +92,7 @@ describe('BO - Shop Parameters - Customer Settings : Enable/Disable ask for birt
 
       // Check birthday
       const isBirthDateInputVisible = await foCreateAccountPage.isBirthDateVisible(page);
-      await expect(isBirthDateInputVisible).to.be.equal(test.args.enable);
+      expect(isBirthDateInputVisible).to.be.equal(test.args.enable);
     });
 
     it('should go back to BO', async function () {
@@ -102,7 +102,7 @@ describe('BO - Shop Parameters - Customer Settings : Enable/Disable ask for birt
       page = await foCreateAccountPage.closePage(browserContext, page, 0);
 
       const pageTitle = await customerSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customerSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(customerSettingsPage.pageTitle);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/01_customers/06_enablePartnerOffers.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/01_customers/06_enablePartnerOffers.ts
index 829164eb274b9..4b74d1b43236a 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/01_customers/06_enablePartnerOffers.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/01_customers/06_enablePartnerOffers.ts
@@ -56,7 +56,7 @@ describe('BO - Shop Parameters - Customer Settings : Enable/Disable partner offe
     await customerSettingsPage.closeSfToolBar(page);
 
     const pageTitle = await customerSettingsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(customerSettingsPage.pageTitle);
+    expect(pageTitle).to.contains(customerSettingsPage.pageTitle);
   });
 
   const tests = [
@@ -73,7 +73,7 @@ describe('BO - Shop Parameters - Customer Settings : Enable/Disable partner offe
         CustomerSettingsOptions.OPTION_PARTNER_OFFER,
         test.args.enable,
       );
-      await expect(result).to.contains(customerSettingsPage.successfulUpdateMessage);
+      expect(result).to.contains(customerSettingsPage.successfulUpdateMessage);
     });
 
     it('should go to create customer account in FO and check partner offer checkbox', async function () {
@@ -89,7 +89,7 @@ describe('BO - Shop Parameters - Customer Settings : Enable/Disable partner offe
 
       // Check partner offer
       const isPartnerOfferVisible = await foCreateAccountPage.isPartnerOfferVisible(page);
-      await expect(isPartnerOfferVisible).to.be.equal(test.args.enable);
+      expect(isPartnerOfferVisible).to.be.equal(test.args.enable);
     });
 
     it('should go back to BO', async function () {
@@ -99,7 +99,7 @@ describe('BO - Shop Parameters - Customer Settings : Enable/Disable partner offe
       page = await foCreateAccountPage.closePage(browserContext, page, 0);
 
       const pageTitle = await customerSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customerSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(customerSettingsPage.pageTitle);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/02_groups/01_filterGroups.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/02_groups/01_filterGroups.ts
index a9d74c82c5f7b..435927815b07a 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/02_groups/01_filterGroups.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/02_groups/01_filterGroups.ts
@@ -50,7 +50,7 @@ describe('BO - Shop Parameters - Customer Settings : Filter groups by id, name a
     await customerSettingsPage.closeSfToolBar(page);
 
     const pageTitle = await customerSettingsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(customerSettingsPage.pageTitle);
+    expect(pageTitle).to.contains(customerSettingsPage.pageTitle);
   });
 
   it('should go to \'Groups\' page', async function () {
@@ -59,14 +59,14 @@ describe('BO - Shop Parameters - Customer Settings : Filter groups by id, name a
     await customerSettingsPage.goToGroupsPage(page);
 
     const pageTitle = await groupsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(groupsPage.pageTitle);
+    expect(pageTitle).to.contains(groupsPage.pageTitle);
   });
 
   it('should reset all filters and get number of groups in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfGroups = await groupsPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfGroups).to.be.above(0);
+    expect(numberOfGroups).to.be.above(0);
   });
 
   describe('Filter groups', async () => {
@@ -131,15 +131,15 @@ describe('BO - Shop Parameters - Customer Settings : Filter groups by id, name a
         );
 
         const numberOfGroupsAfterFilter = await groupsPage.getNumberOfElementInGrid(page);
-        await expect(numberOfGroupsAfterFilter).to.be.at.most(numberOfGroups);
+        expect(numberOfGroupsAfterFilter).to.be.at.most(numberOfGroups);
 
         for (let row = 1; row <= numberOfGroupsAfterFilter; row++) {
           const textColumn = await groupsPage.getTextColumn(page, row, test.args.filterBy);
 
           if (test.expected !== undefined) {
-            await expect(textColumn).to.contains(test.expected);
+            expect(textColumn).to.contains(test.expected);
           } else {
-            await expect(textColumn).to.contains(test.args.filterValue);
+            expect(textColumn).to.contains(test.args.filterValue);
           }
         }
       });
@@ -148,7 +148,7 @@ describe('BO - Shop Parameters - Customer Settings : Filter groups by id, name a
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}Reset`, baseContext);
 
         const numberOfGroupsAfterReset = await groupsPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfGroupsAfterReset).to.equal(numberOfGroups);
+        expect(numberOfGroupsAfterReset).to.equal(numberOfGroups);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/02_groups/02_CRUDGroups.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/02_groups/02_CRUDGroups.ts
index 8fc9dade6d930..ade80185536bc 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/02_groups/02_CRUDGroups.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/02_groups/02_CRUDGroups.ts
@@ -52,7 +52,7 @@ describe('BO - Shop Parameters - Customer Settings : Create, update and delete g
     await customerSettingsPage.closeSfToolBar(page);
 
     const pageTitle = await customerSettingsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(customerSettingsPage.pageTitle);
+    expect(pageTitle).to.contains(customerSettingsPage.pageTitle);
   });
 
   it('should go to \'Groups\' page', async function () {
@@ -61,14 +61,14 @@ describe('BO - Shop Parameters - Customer Settings : Create, update and delete g
     await customerSettingsPage.goToGroupsPage(page);
 
     const pageTitle = await groupsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(groupsPage.pageTitle);
+    expect(pageTitle).to.contains(groupsPage.pageTitle);
   });
 
   it('should reset all filters and get number of groups in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfGroups = await groupsPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfGroups).to.be.above(0);
+    expect(numberOfGroups).to.be.above(0);
   });
 
   describe('Create group in BO', async () => {
@@ -78,17 +78,17 @@ describe('BO - Shop Parameters - Customer Settings : Create, update and delete g
       await groupsPage.goToNewGroupPage(page);
 
       const pageTitle = await addGroupPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addGroupPage.pageTitleCreate);
+      expect(pageTitle).to.contains(addGroupPage.pageTitleCreate);
     });
 
     it('should create group and check result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createGroup', baseContext);
 
       const textResult = await addGroupPage.createEditGroup(page, createGroupData);
-      await expect(textResult).to.contains(groupsPage.successfulCreationMessage);
+      expect(textResult).to.contains(groupsPage.successfulCreationMessage);
 
       const numberOfGroupsAfterCreation = await groupsPage.getNumberOfElementInGrid(page);
-      await expect(numberOfGroupsAfterCreation).to.be.equal(numberOfGroups + 1);
+      expect(numberOfGroupsAfterCreation).to.be.equal(numberOfGroups + 1);
     });
   });
 
@@ -100,7 +100,7 @@ describe('BO - Shop Parameters - Customer Settings : Create, update and delete g
       await groupsPage.filterTable(page, 'input', 'b!name', createGroupData.name);
 
       const textEmail = await groupsPage.getTextColumn(page, 1, 'b!name');
-      await expect(textEmail).to.contains(createGroupData.name);
+      expect(textEmail).to.contains(createGroupData.name);
     });
 
     it('should go to edit group page', async function () {
@@ -109,17 +109,17 @@ describe('BO - Shop Parameters - Customer Settings : Create, update and delete g
       await groupsPage.gotoEditGroupPage(page, 1);
 
       const pageTitle = await addGroupPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addGroupPage.pageTitleEdit);
+      expect(pageTitle).to.contains(addGroupPage.pageTitleEdit);
     });
 
     it('should update group', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateGroup', baseContext);
 
       const textResult = await addGroupPage.createEditGroup(page, editGroupData);
-      await expect(textResult).to.contains(groupsPage.successfulUpdateMessage);
+      expect(textResult).to.contains(groupsPage.successfulUpdateMessage);
 
       const numberOfGroupsAfterUpdate = await groupsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfGroupsAfterUpdate).to.be.equal(numberOfGroups + 1);
+      expect(numberOfGroupsAfterUpdate).to.be.equal(numberOfGroups + 1);
     });
   });
 
@@ -131,21 +131,21 @@ describe('BO - Shop Parameters - Customer Settings : Create, update and delete g
       await groupsPage.filterTable(page, 'input', 'b!name', editGroupData.name);
 
       const textEmail = await groupsPage.getTextColumn(page, 1, 'b!name');
-      await expect(textEmail).to.contains(editGroupData.name);
+      expect(textEmail).to.contains(editGroupData.name);
     });
 
     it('should delete group', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteGroup', baseContext);
 
       const textResult = await groupsPage.deleteGroup(page, 1);
-      await expect(textResult).to.contains(groupsPage.successfulDeleteMessage);
+      expect(textResult).to.contains(groupsPage.successfulDeleteMessage);
     });
 
     it('should reset filter', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterDelete', baseContext);
 
       const numberOfGroupsAfterDelete = await groupsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfGroupsAfterDelete).to.be.equal(numberOfGroups);
+      expect(numberOfGroupsAfterDelete).to.be.equal(numberOfGroups);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/02_groups/03_bulkDeleteGroups.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/02_groups/03_bulkDeleteGroups.ts
index ef2acfff22d9e..dc01e615d865e 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/02_groups/03_bulkDeleteGroups.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/02_groups/03_bulkDeleteGroups.ts
@@ -56,7 +56,7 @@ describe('BO - Shop Parameters - Customer Settings : Bulk delete groups', async
     await customerSettingsPage.closeSfToolBar(page);
 
     const pageTitle = await customerSettingsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(customerSettingsPage.pageTitle);
+    expect(pageTitle).to.contains(customerSettingsPage.pageTitle);
   });
 
   it('should go to \'Groups\' page', async function () {
@@ -65,14 +65,14 @@ describe('BO - Shop Parameters - Customer Settings : Bulk delete groups', async
     await customerSettingsPage.goToGroupsPage(page);
 
     const pageTitle = await groupsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(groupsPage.pageTitle);
+    expect(pageTitle).to.contains(groupsPage.pageTitle);
   });
 
   it('should reset all filters and get number of groups in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfGroups = await groupsPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfGroups).to.be.above(0);
+    expect(numberOfGroups).to.be.above(0);
   });
 
   describe('Create 2 groups in BO', async () => {
@@ -83,17 +83,17 @@ describe('BO - Shop Parameters - Customer Settings : Bulk delete groups', async
         await groupsPage.goToNewGroupPage(page);
 
         const pageTitle = await addGroupPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addGroupPage.pageTitleCreate);
+        expect(pageTitle).to.contains(addGroupPage.pageTitleCreate);
       });
 
       it('should create group and check result', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `createGroup${index + 1}`, baseContext);
 
         const textResult = await addGroupPage.createEditGroup(page, groupToCreate);
-        await expect(textResult).to.contains(groupsPage.successfulCreationMessage);
+        expect(textResult).to.contains(groupsPage.successfulCreationMessage);
 
         const numberOfGroupsAfterCreation = await groupsPage.getNumberOfElementInGrid(page);
-        await expect(numberOfGroupsAfterCreation).to.be.equal(numberOfGroups + index + 1);
+        expect(numberOfGroupsAfterCreation).to.be.equal(numberOfGroups + index + 1);
       });
     });
   });
@@ -105,11 +105,11 @@ describe('BO - Shop Parameters - Customer Settings : Bulk delete groups', async
       await groupsPage.filterTable(page, 'input', 'b!name', 'todelete');
 
       const numberOfGroupsAfterFilter = await groupsPage.getNumberOfElementInGrid(page);
-      await expect(numberOfGroupsAfterFilter).to.be.at.most(numberOfGroups);
+      expect(numberOfGroupsAfterFilter).to.be.at.most(numberOfGroups);
 
       for (let i = 1; i <= numberOfGroupsAfterFilter; i++) {
         const textColumn = await groupsPage.getTextColumn(page, i, 'b!name');
-        await expect(textColumn).to.contains('todelete');
+        expect(textColumn).to.contains('todelete');
       }
     });
 
@@ -117,14 +117,14 @@ describe('BO - Shop Parameters - Customer Settings : Bulk delete groups', async
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteGroups', baseContext);
 
       const deleteTextResult = await groupsPage.bulkDeleteGroups(page);
-      await expect(deleteTextResult).to.be.contains(groupsPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.contains(groupsPage.successfulMultiDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterDelete', baseContext);
 
       const numberOfGroupsAfterReset = await groupsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfGroupsAfterReset).to.be.equal(numberOfGroups);
+      expect(numberOfGroupsAfterReset).to.be.equal(numberOfGroups);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/03_titles/01_filterTitles.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/03_titles/01_filterTitles.ts
index 073e929ad664e..422e057d5286c 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/03_titles/01_filterTitles.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/03_titles/01_filterTitles.ts
@@ -48,7 +48,7 @@ describe('BO _ Shop Parameters - Customer Settings : Filter titles by id, name a
     await customerSettingsPage.closeSfToolBar(page);
 
     const pageTitle = await customerSettingsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(customerSettingsPage.pageTitle);
+    expect(pageTitle).to.contains(customerSettingsPage.pageTitle);
   });
 
   it('should go to \'Titles\' page', async function () {
@@ -57,14 +57,14 @@ describe('BO _ Shop Parameters - Customer Settings : Filter titles by id, name a
     await customerSettingsPage.goToTitlesPage(page);
 
     const pageTitle = await titlesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(titlesPage.pageTitle);
+    expect(pageTitle).to.contains(titlesPage.pageTitle);
   });
 
   it('should reset all filters and get number of titles in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfTitles = await titlesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfTitles).to.be.above(0);
+    expect(numberOfTitles).to.be.above(0);
   });
 
   describe('Filter titles', async () => {
@@ -98,17 +98,17 @@ describe('BO _ Shop Parameters - Customer Settings : Filter titles by id, name a
         );
 
         const numberOfTitlesAfterFilter = await titlesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfTitlesAfterFilter).to.be.at.most(numberOfTitles);
+        expect(numberOfTitlesAfterFilter).to.be.at.most(numberOfTitles);
 
         const textColumn = await titlesPage.getTextColumn(page, 1, test.args.filterBy);
-        await expect(textColumn).to.contains(test.args.filterValue);
+        expect(textColumn).to.contains(test.args.filterValue);
       });
 
       it('should reset all filters', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}Reset`, baseContext);
 
         const numberOfTitlesAfterReset = await titlesPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfTitlesAfterReset).to.equal(numberOfTitles);
+        expect(numberOfTitlesAfterReset).to.equal(numberOfTitles);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/03_titles/02_CRUDTitles.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/03_titles/02_CRUDTitles.ts
index ea261abffcd39..ae9441f00757e 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/03_titles/02_CRUDTitles.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/03_titles/02_CRUDTitles.ts
@@ -64,7 +64,7 @@ describe('BO - Shop Parameters - Customer Settings : Create, update and delete t
     await customerSettingsPage.closeSfToolBar(page);
 
     const pageTitle = await customerSettingsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(customerSettingsPage.pageTitle);
+    expect(pageTitle).to.contains(customerSettingsPage.pageTitle);
   });
 
   it('should go to \'Titles\' page', async function () {
@@ -73,14 +73,14 @@ describe('BO - Shop Parameters - Customer Settings : Create, update and delete t
     await customerSettingsPage.goToTitlesPage(page);
 
     const pageTitle = await titlesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(titlesPage.pageTitle);
+    expect(pageTitle).to.contains(titlesPage.pageTitle);
   });
 
   it('should reset all filters and get number of titles in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfTitles = await titlesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfTitles).to.be.above(0);
+    expect(numberOfTitles).to.be.above(0);
   });
 
   describe('Create title in BO', async () => {
@@ -90,17 +90,17 @@ describe('BO - Shop Parameters - Customer Settings : Create, update and delete t
       await titlesPage.goToAddNewTitle(page);
 
       const pageTitle = await addTitlePage.getPageTitle(page);
-      await expect(pageTitle).to.eq(addTitlePage.pageTitleCreate);
+      expect(pageTitle).to.eq(addTitlePage.pageTitleCreate);
     });
 
     it('should create title and check result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createTitle', baseContext);
 
       const textResult = await addTitlePage.createEditTitle(page, createTitleData);
-      await expect(textResult).to.contains(titlesPage.successfulCreationMessage);
+      expect(textResult).to.contains(titlesPage.successfulCreationMessage);
 
       const numberOfTitlesAfterCreation = await titlesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfTitlesAfterCreation).to.be.equal(numberOfTitles + 1);
+      expect(numberOfTitlesAfterCreation).to.be.equal(numberOfTitles + 1);
     });
   });
 
@@ -112,7 +112,7 @@ describe('BO - Shop Parameters - Customer Settings : Create, update and delete t
       await titlesPage.filterTitles(page, 'input', 'name', createTitleData.name);
 
       const textEmail = await titlesPage.getTextColumn(page, 1, 'name');
-      await expect(textEmail).to.contains(createTitleData.name);
+      expect(textEmail).to.contains(createTitleData.name);
     });
 
     it('should go to edit title page', async function () {
@@ -121,17 +121,17 @@ describe('BO - Shop Parameters - Customer Settings : Create, update and delete t
       await titlesPage.gotoEditTitlePage(page, 1);
 
       const pageTitle = await addTitlePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addTitlePage.pageTitleEdit(createTitleData.name));
+      expect(pageTitle).to.contains(addTitlePage.pageTitleEdit(createTitleData.name));
     });
 
     it('should update title', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateTitle', baseContext);
 
       const textResult = await addTitlePage.createEditTitle(page, editTitleData);
-      await expect(textResult).to.contains(titlesPage.successfulUpdateMessage);
+      expect(textResult).to.contains(titlesPage.successfulUpdateMessage);
 
       const numberOfTitlesAfterUpdate = await titlesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfTitlesAfterUpdate).to.be.equal(numberOfTitles + 1);
+      expect(numberOfTitlesAfterUpdate).to.be.equal(numberOfTitles + 1);
     });
   });
 
@@ -143,17 +143,17 @@ describe('BO - Shop Parameters - Customer Settings : Create, update and delete t
       await titlesPage.filterTitles(page, 'input', 'name', editTitleData.name);
 
       const textEmail = await titlesPage.getTextColumn(page, 1, 'name');
-      await expect(textEmail).to.contains(editTitleData.name);
+      expect(textEmail).to.contains(editTitleData.name);
     });
 
     it('should delete title', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteTitle', baseContext);
 
       const textResult = await titlesPage.deleteTitle(page, 1);
-      await expect(textResult).to.contains(titlesPage.successfulDeleteMessage);
+      expect(textResult).to.contains(titlesPage.successfulDeleteMessage);
 
       const numberOfTitlesAfterDelete = await titlesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfTitlesAfterDelete).to.be.equal(numberOfTitles);
+      expect(numberOfTitlesAfterDelete).to.be.equal(numberOfTitles);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/03_titles/03_bulkDeleteTitles.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/03_titles/03_bulkDeleteTitles.ts
index 355790c43ef9e..8ea5accebfce0 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/03_titles/03_bulkDeleteTitles.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/04_customerSettings/03_titles/03_bulkDeleteTitles.ts
@@ -60,7 +60,7 @@ describe('BO - Shop Parameters - Customer Settings : Bulk delete titles', async
     await customerSettingsPage.closeSfToolBar(page);
 
     const pageTitle = await customerSettingsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(customerSettingsPage.pageTitle);
+    expect(pageTitle).to.contains(customerSettingsPage.pageTitle);
   });
 
   it('should go to \'Titles\' page', async function () {
@@ -69,14 +69,14 @@ describe('BO - Shop Parameters - Customer Settings : Bulk delete titles', async
     await customerSettingsPage.goToTitlesPage(page);
 
     const pageTitle = await titlesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(titlesPage.pageTitle);
+    expect(pageTitle).to.contains(titlesPage.pageTitle);
   });
 
   it('should reset all filters and get number of titles in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfTitles = await titlesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfTitles).to.be.above(0);
+    expect(numberOfTitles).to.be.above(0);
   });
 
   describe('Create 2 titles in BO', async () => {
@@ -87,17 +87,17 @@ describe('BO - Shop Parameters - Customer Settings : Bulk delete titles', async
         await titlesPage.goToAddNewTitle(page);
 
         const pageTitle = await addTitlePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addTitlePage.pageTitleCreate);
+        expect(pageTitle).to.contains(addTitlePage.pageTitleCreate);
       });
 
       it('should create title and check result', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `CreateTitle${index + 1}`, baseContext);
 
         const textResult = await addTitlePage.createEditTitle(page, titleToCreate);
-        await expect(textResult).to.contains(titlesPage.successfulCreationMessage);
+        expect(textResult).to.contains(titlesPage.successfulCreationMessage);
 
         const numberOfTitlesAfterCreation = await titlesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfTitlesAfterCreation).to.be.equal(numberOfTitles + index + 1);
+        expect(numberOfTitlesAfterCreation).to.be.equal(numberOfTitles + index + 1);
       });
     });
   });
@@ -109,11 +109,11 @@ describe('BO - Shop Parameters - Customer Settings : Bulk delete titles', async
       await titlesPage.filterTitles(page, 'input', 'name', 'todelete');
 
       const numberOfTitlesAfterFilter = await titlesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfTitlesAfterFilter).to.be.at.most(numberOfTitles);
+      expect(numberOfTitlesAfterFilter).to.be.at.most(numberOfTitles);
 
       for (let i = 1; i <= numberOfTitlesAfterFilter; i++) {
         const textColumn = await titlesPage.getTextColumn(page, i, 'name');
-        await expect(textColumn).to.contains('todelete');
+        expect(textColumn).to.contains('todelete');
       }
     });
 
@@ -121,14 +121,14 @@ describe('BO - Shop Parameters - Customer Settings : Bulk delete titles', async
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteTitles', baseContext);
 
       const deleteTextResult = await titlesPage.bulkDeleteTitles(page);
-      await expect(deleteTextResult).to.be.contains(titlesPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.contains(titlesPage.successfulMultiDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterDelete', baseContext);
 
       const numberOfTitlesAfterReset = await titlesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfTitlesAfterReset).to.be.equal(numberOfTitles);
+      expect(numberOfTitlesAfterReset).to.be.equal(numberOfTitles);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/01_contacts/01_filterContacts.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/01_contacts/01_filterContacts.ts
index 141fc5c5df59f..203f1934cdd72 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/01_contacts/01_filterContacts.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/01_contacts/01_filterContacts.ts
@@ -49,14 +49,14 @@ describe('BO - Shop Parameters - Contact : Filter Contacts table', async () => {
     await contactsPage.closeSfToolBar(page);
 
     const pageTitle = await contactsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(contactsPage.pageTitle);
+    expect(pageTitle).to.contains(contactsPage.pageTitle);
   });
 
   it('should reset all filters and get number of contacts in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfContacts = await contactsPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfContacts).to.be.above(0);
+    expect(numberOfContacts).to.be.above(0);
   });
 
   // 1 : Filter Contacts with all inputs and selects in grid table
@@ -82,11 +82,11 @@ describe('BO - Shop Parameters - Contact : Filter Contacts table', async () => {
         await contactsPage.filterContacts(page, test.args.filterBy, test.args.filterValue);
 
         const numberOfContactsAfterFilter = await contactsPage.getNumberOfElementInGrid(page);
-        await expect(numberOfContactsAfterFilter).to.be.at.most(numberOfContacts);
+        expect(numberOfContactsAfterFilter).to.be.at.most(numberOfContacts);
 
         for (let i = 1; i <= numberOfContactsAfterFilter; i++) {
           const textColumn = await contactsPage.getTextColumnFromTableContacts(page, i, test.args.filterBy);
-          await expect(textColumn).to.contains(test.args.filterValue);
+          expect(textColumn).to.contains(test.args.filterValue);
         }
       });
 
@@ -94,7 +94,7 @@ describe('BO - Shop Parameters - Contact : Filter Contacts table', async () => {
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}Reset`, baseContext);
 
         const numberOfContactsAfterReset = await contactsPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfContactsAfterReset).to.equal(numberOfContacts);
+        expect(numberOfContactsAfterReset).to.equal(numberOfContacts);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/01_contacts/02_CRUDContact.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/01_contacts/02_CRUDContact.ts
index 7df038c5dd5f1..c46e810d35730 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/01_contacts/02_CRUDContact.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/01_contacts/02_CRUDContact.ts
@@ -52,14 +52,14 @@ describe('BO - Shop Parameters - Contact : Create, Update and Delete contact in
     await contactsPage.closeSfToolBar(page);
 
     const pageTitle = await contactsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(contactsPage.pageTitle);
+    expect(pageTitle).to.contains(contactsPage.pageTitle);
   });
 
   it('should reset all filters', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfContacts = await contactsPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfContacts).to.be.above(0);
+    expect(numberOfContacts).to.be.above(0);
   });
 
   // 1 : Create contact in BO
@@ -70,17 +70,17 @@ describe('BO - Shop Parameters - Contact : Create, Update and Delete contact in
       await contactsPage.goToAddNewContactPage(page);
 
       const pageTitle = await addContactPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addContactPage.pageTitleCreate);
+      expect(pageTitle).to.contains(addContactPage.pageTitleCreate);
     });
 
     it('should create contact and check result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createContact', baseContext);
 
       const textResult = await addContactPage.createEditContact(page, createContactData);
-      await expect(textResult).to.equal(contactsPage.successfulCreationMessage);
+      expect(textResult).to.equal(contactsPage.successfulCreationMessage);
 
       const numberOfContactsAfterCreation = await contactsPage.getNumberOfElementInGrid(page);
-      await expect(numberOfContactsAfterCreation).to.be.equal(numberOfContacts + 1);
+      expect(numberOfContactsAfterCreation).to.be.equal(numberOfContacts + 1);
     });
   });
 
@@ -93,7 +93,7 @@ describe('BO - Shop Parameters - Contact : Create, Update and Delete contact in
       await contactsPage.filterContacts(page, 'email', createContactData.email);
 
       const textEmail = await contactsPage.getTextColumnFromTableContacts(page, 1, 'email');
-      await expect(textEmail).to.contains(createContactData.email);
+      expect(textEmail).to.contains(createContactData.email);
     });
 
     it('should go to edit contact page', async function () {
@@ -102,17 +102,17 @@ describe('BO - Shop Parameters - Contact : Create, Update and Delete contact in
       await contactsPage.goToEditContactPage(page, 1);
 
       const pageTitle = await addContactPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addContactPage.pageTitleEdit);
+      expect(pageTitle).to.contains(addContactPage.pageTitleEdit);
     });
 
     it('should update contact', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateContact', baseContext);
 
       const textResult = await addContactPage.createEditContact(page, editContactData);
-      await expect(textResult).to.equal(contactsPage.successfulUpdateMessage);
+      expect(textResult).to.equal(contactsPage.successfulUpdateMessage);
 
       const numberOfContactsAfterUpdate = await contactsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfContactsAfterUpdate).to.be.equal(numberOfContacts + 1);
+      expect(numberOfContactsAfterUpdate).to.be.equal(numberOfContacts + 1);
     });
   });
 
@@ -125,17 +125,17 @@ describe('BO - Shop Parameters - Contact : Create, Update and Delete contact in
       await contactsPage.filterContacts(page, 'email', editContactData.email);
 
       const textEmail = await contactsPage.getTextColumnFromTableContacts(page, 1, 'email');
-      await expect(textEmail).to.contains(editContactData.email);
+      expect(textEmail).to.contains(editContactData.email);
     });
 
     it('should delete contact', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteContact', baseContext);
 
       const textResult = await contactsPage.deleteContact(page, 1);
-      await expect(textResult).to.equal(contactsPage.successfulDeleteMessage);
+      expect(textResult).to.equal(contactsPage.successfulDeleteMessage);
 
       const numberOfContactsAfterDelete = await contactsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfContactsAfterDelete).to.be.equal(numberOfContacts);
+      expect(numberOfContactsAfterDelete).to.be.equal(numberOfContacts);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/01_contacts/03_contactBulkActions.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/01_contacts/03_contactBulkActions.ts
index 6f2e4b53b4555..47bb27b3bb614 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/01_contacts/03_contactBulkActions.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/01_contacts/03_contactBulkActions.ts
@@ -52,14 +52,14 @@ describe('BO - Shop Parameters - Contact : Bulk delete contacts', async () => {
     await contactsPage.closeSfToolBar(page);
 
     const pageTitle = await contactsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(contactsPage.pageTitle);
+    expect(pageTitle).to.contains(contactsPage.pageTitle);
   });
 
   it('should reset all filters and get number of contacts in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfContacts = await contactsPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfContacts).to.be.above(0);
+    expect(numberOfContacts).to.be.above(0);
   });
 
   // 1 : Create 2 contacts In BO
@@ -76,17 +76,17 @@ describe('BO - Shop Parameters - Contact : Bulk delete contacts', async () => {
         await contactsPage.goToAddNewContactPage(page);
 
         const pageTitle = await addContactPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addContactPage.pageTitleCreate);
+        expect(pageTitle).to.contains(addContactPage.pageTitleCreate);
       });
 
       it('should create contact and check result', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `CreateContact${index + 1}`, baseContext);
 
         const textResult = await addContactPage.createEditContact(page, test.args.contactToCreate);
-        await expect(textResult).to.equal(contactsPage.successfulCreationMessage);
+        expect(textResult).to.equal(contactsPage.successfulCreationMessage);
 
         const numberOfContactsAfterCreation = await contactsPage.getNumberOfElementInGrid(page);
-        await expect(numberOfContactsAfterCreation).to.be.equal(numberOfContacts + index + 1);
+        expect(numberOfContactsAfterCreation).to.be.equal(numberOfContacts + index + 1);
       });
     });
   });
@@ -99,11 +99,11 @@ describe('BO - Shop Parameters - Contact : Bulk delete contacts', async () => {
       await contactsPage.filterContacts(page, 'name', 'todelete');
 
       const numberOfContactsAfterFilter = await contactsPage.getNumberOfElementInGrid(page);
-      await expect(numberOfContactsAfterFilter).to.be.at.most(numberOfContacts);
+      expect(numberOfContactsAfterFilter).to.be.at.most(numberOfContacts);
 
       for (let i = 1; i <= numberOfContactsAfterFilter; i++) {
         const textColumn = await contactsPage.getTextColumnFromTableContacts(page, i, 'name');
-        await expect(textColumn).to.contains('todelete');
+        expect(textColumn).to.contains('todelete');
       }
     });
 
@@ -111,14 +111,14 @@ describe('BO - Shop Parameters - Contact : Bulk delete contacts', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteContacts', baseContext);
 
       const deleteTextResult = await contactsPage.deleteContactsBulkActions(page);
-      await expect(deleteTextResult).to.be.equal(contactsPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.equal(contactsPage.successfulMultiDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterDelete', baseContext);
 
       const numberOfContactsAfterReset = await contactsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfContactsAfterReset).to.be.equal(numberOfContacts);
+      expect(numberOfContactsAfterReset).to.be.equal(numberOfContacts);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/01_contacts/04_sortAndPagination.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/01_contacts/04_sortAndPagination.ts
index 71e6a2af5ecd1..e214126eacffe 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/01_contacts/04_sortAndPagination.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/01_contacts/04_sortAndPagination.ts
@@ -46,14 +46,14 @@ describe('BO - Shop Parameters - Contact : Sort Contacts list', async () => {
     await contactsPage.closeSfToolBar(page);
 
     const pageTitle = await contactsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(contactsPage.pageTitle);
+    expect(pageTitle).to.contains(contactsPage.pageTitle);
   });
 
   it('should reset all filters and get number of contacts in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfContacts = await contactsPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfContacts).to.be.above(0);
+    expect(numberOfContacts).to.be.above(0);
   });
 
   // Start sorting contacts
@@ -95,17 +95,17 @@ describe('BO - Shop Parameters - Contact : Sort Contacts list', async () => {
         const expectedResult = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
         if (test.args.sortDirection === 'asc') {
-          await expect(sortedTableFloat).to.deep.equal(expectedResult);
+          expect(sortedTableFloat).to.deep.equal(expectedResult);
         } else {
-          await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+          expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
         }
       } else {
         const expectedResult = await basicHelper.sortArray(nonSortedTable);
 
         if (test.args.sortDirection === 'asc') {
-          await expect(sortedTable).to.deep.equal(expectedResult);
+          expect(sortedTable).to.deep.equal(expectedResult);
         } else {
-          await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+          expect(sortedTable).to.deep.equal(expectedResult.reverse());
         }
       }
     });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/02_stores/01_filterAndQuickEditStores.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/02_stores/01_filterAndQuickEditStores.ts
index d23365f6078ec..2983be762bdef 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/02_stores/01_filterAndQuickEditStores.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/02_stores/01_filterAndQuickEditStores.ts
@@ -48,7 +48,7 @@ describe('BO - Shop Parameters - Contact : Filter and quick edit stores', async
     await contactPage.closeSfToolBar(page);
 
     const pageTitle = await contactPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(contactPage.pageTitle);
+    expect(pageTitle).to.contains(contactPage.pageTitle);
   });
 
   it('should go to \'Stores\' page', async function () {
@@ -57,14 +57,14 @@ describe('BO - Shop Parameters - Contact : Filter and quick edit stores', async
     await contactPage.goToStoresPage(page);
 
     const pageTitle = await storesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(storesPage.pageTitle);
+    expect(pageTitle).to.contains(storesPage.pageTitle);
   });
 
   it('should reset all filters and get number of stores in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfStores = await storesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfStores).to.be.above(0);
+    expect(numberOfStores).to.be.above(0);
   });
 
   describe('Filter stores', async () => {
@@ -173,15 +173,15 @@ describe('BO - Shop Parameters - Contact : Filter and quick edit stores', async
         );
 
         const numberOfStoresAfterFilter = await storesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfStoresAfterFilter).to.be.at.most(numberOfStores);
+        expect(numberOfStoresAfterFilter).to.be.at.most(numberOfStores);
 
         for (let row = 1; row <= numberOfStoresAfterFilter; row++) {
           if (test.args.column === 'Status') {
             const storeStatus = await storesPage.getStoreStatus(page, row);
-            await expect(storeStatus).to.equal(test.args.filterValue === '1');
+            expect(storeStatus).to.equal(test.args.filterValue === '1');
           } else {
             const textColumn = await storesPage.getTextColumn(page, row, test.args.filterBy);
-            await expect(textColumn).to.contains(test.args.filterValue);
+            expect(textColumn).to.contains(test.args.filterValue);
           }
         }
       });
@@ -190,7 +190,7 @@ describe('BO - Shop Parameters - Contact : Filter and quick edit stores', async
         await testContext.addContextItem(this, 'testIdentifier', `resetFilter${test.args.column}`, baseContext);
 
         const numberOfStoresAfterReset = await storesPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfStoresAfterReset).to.equal(numberOfStores);
+        expect(numberOfStoresAfterReset).to.equal(numberOfStores);
       });
     });
   });
@@ -202,10 +202,10 @@ describe('BO - Shop Parameters - Contact : Filter and quick edit stores', async
       await storesPage.filterTable(page, 'input', 'sl!name', Stores.second.name);
 
       const numberOfStoresAfterFilter = await storesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfStoresAfterFilter).to.be.at.most(numberOfStores);
+      expect(numberOfStoresAfterFilter).to.be.at.most(numberOfStores);
 
       const textColumn = await storesPage.getTextColumn(page, 1, 'sl!name');
-      await expect(textColumn).to.contains(Stores.second.name);
+      expect(textColumn).to.contains(Stores.second.name);
     });
 
     const tests = [
@@ -220,7 +220,7 @@ describe('BO - Shop Parameters - Contact : Filter and quick edit stores', async
         await storesPage.setStoreStatus(page, 1, test.args.statusWanted);
 
         const storeStatus = await storesPage.getStoreStatus(page, 1);
-        await expect(storeStatus).to.equal(test.args.statusWanted);
+        expect(storeStatus).to.equal(test.args.statusWanted);
       });
     });
 
@@ -228,7 +228,7 @@ describe('BO - Shop Parameters - Contact : Filter and quick edit stores', async
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterQuickEdit', baseContext);
 
       const numberOfStoresAfterReset = await storesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfStoresAfterReset).to.equal(numberOfStores);
+      expect(numberOfStoresAfterReset).to.equal(numberOfStores);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/02_stores/02_CRUDStores.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/02_stores/02_CRUDStores.ts
index c83f56712b210..25b43a0a66137 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/02_stores/02_CRUDStores.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/02_stores/02_CRUDStores.ts
@@ -52,7 +52,7 @@ describe('BO - Shop Parameters - Contact : Create, update and delete Store in BO
     await contactPage.closeSfToolBar(page);
 
     const pageTitle = await contactPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(contactPage.pageTitle);
+    expect(pageTitle).to.contains(contactPage.pageTitle);
   });
 
   it('should go to \'Stores\' page', async function () {
@@ -61,14 +61,14 @@ describe('BO - Shop Parameters - Contact : Create, update and delete Store in BO
     await contactPage.goToStoresPage(page);
 
     const pageTitle = await storesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(storesPage.pageTitle);
+    expect(pageTitle).to.contains(storesPage.pageTitle);
   });
 
   it('should reset all filters and get number of stores in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfStores = await storesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfStores).to.be.above(0);
+    expect(numberOfStores).to.be.above(0);
   });
 
   describe('Create store in BO', async () => {
@@ -78,17 +78,17 @@ describe('BO - Shop Parameters - Contact : Create, update and delete Store in BO
       await storesPage.goToNewStorePage(page);
 
       const pageTitle = await addStorePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addStorePage.pageTitleCreate);
+      expect(pageTitle).to.contains(addStorePage.pageTitleCreate);
     });
 
     it('should create store and check result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createStore', baseContext);
 
       const textResult = await addStorePage.createEditStore(page, createStoreData);
-      await expect(textResult).to.contains(storesPage.successfulCreationMessage);
+      expect(textResult).to.contains(storesPage.successfulCreationMessage);
 
       const numberOfStoresAfterCreation = await storesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfStoresAfterCreation).to.be.equal(numberOfStores + 1);
+      expect(numberOfStoresAfterCreation).to.be.equal(numberOfStores + 1);
     });
   });
 
@@ -100,7 +100,7 @@ describe('BO - Shop Parameters - Contact : Create, update and delete Store in BO
       await storesPage.filterTable(page, 'input', 'sl!name', createStoreData.name);
 
       const textEmail = await storesPage.getTextColumn(page, 1, 'sl!name');
-      await expect(textEmail).to.contains(createStoreData.name);
+      expect(textEmail).to.contains(createStoreData.name);
     });
 
     it('should go to edit store page', async function () {
@@ -109,17 +109,17 @@ describe('BO - Shop Parameters - Contact : Create, update and delete Store in BO
       await storesPage.gotoEditStorePage(page, 1);
 
       const pageTitle = await addStorePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addStorePage.pageTitleEdit);
+      expect(pageTitle).to.contains(addStorePage.pageTitleEdit);
     });
 
     it('should update store', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateStore', baseContext);
 
       const textResult = await addStorePage.createEditStore(page, editStoreData);
-      await expect(textResult).to.contains(storesPage.successfulUpdateMessage);
+      expect(textResult).to.contains(storesPage.successfulUpdateMessage);
 
       const numberOfStoresAfterUpdate = await storesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfStoresAfterUpdate).to.be.equal(numberOfStores + 1);
+      expect(numberOfStoresAfterUpdate).to.be.equal(numberOfStores + 1);
     });
   });
 
@@ -131,17 +131,17 @@ describe('BO - Shop Parameters - Contact : Create, update and delete Store in BO
       await storesPage.filterTable(page, 'input', 'sl!name', editStoreData.name);
 
       const textEmail = await storesPage.getTextColumn(page, 1, 'sl!name');
-      await expect(textEmail).to.contains(editStoreData.name);
+      expect(textEmail).to.contains(editStoreData.name);
     });
 
     it('should delete store', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteStore', baseContext);
 
       const textResult = await storesPage.deleteStore(page, 1);
-      await expect(textResult).to.contains(storesPage.successfulDeleteMessage);
+      expect(textResult).to.contains(storesPage.successfulDeleteMessage);
 
       const numberOfStoresAfterDelete = await storesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfStoresAfterDelete).to.be.equal(numberOfStores);
+      expect(numberOfStoresAfterDelete).to.be.equal(numberOfStores);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/02_stores/03_bulkActionsStores.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/02_stores/03_bulkActionsStores.ts
index 98ba09fc93388..a55a97c905304 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/02_stores/03_bulkActionsStores.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/02_stores/03_bulkActionsStores.ts
@@ -54,7 +54,7 @@ describe('BO - Shop Parameters - Contact : Enable/Disable/Delete with Bulk Actio
     await contactPage.closeSfToolBar(page);
 
     const pageTitle = await contactPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(contactPage.pageTitle);
+    expect(pageTitle).to.contains(contactPage.pageTitle);
   });
 
   it('should go to \'Stores\' page', async function () {
@@ -63,14 +63,14 @@ describe('BO - Shop Parameters - Contact : Enable/Disable/Delete with Bulk Actio
     await contactPage.goToStoresPage(page);
 
     const pageTitle = await storesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(storesPage.pageTitle);
+    expect(pageTitle).to.contains(storesPage.pageTitle);
   });
 
   it('should reset all filters and get number of stores in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfStores = await storesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfStores).to.be.above(0);
+    expect(numberOfStores).to.be.above(0);
   });
 
   describe('Create 2 stores in BO', async () => {
@@ -81,17 +81,17 @@ describe('BO - Shop Parameters - Contact : Enable/Disable/Delete with Bulk Actio
         await storesPage.goToNewStorePage(page);
 
         const pageTitle = await addStorePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addStorePage.pageTitleCreate);
+        expect(pageTitle).to.contains(addStorePage.pageTitleCreate);
       });
 
       it('should create store and check result', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `CreateStore${index + 1}`, baseContext);
 
         const textResult = await addStorePage.createEditStore(page, storeToCreate);
-        await expect(textResult).to.contains(storesPage.successfulCreationMessage);
+        expect(textResult).to.contains(storesPage.successfulCreationMessage);
 
         const numberOfStoresAfterCreation = await storesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfStoresAfterCreation).to.be.equal(numberOfStores + index + 1);
+        expect(numberOfStoresAfterCreation).to.be.equal(numberOfStores + index + 1);
       });
     });
   });
@@ -108,11 +108,11 @@ describe('BO - Shop Parameters - Contact : Enable/Disable/Delete with Bulk Actio
       );
 
       const numberOfStoresAfterFilter = await storesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfStoresAfterFilter).to.be.at.most(numberOfStores);
+      expect(numberOfStoresAfterFilter).to.be.at.most(numberOfStores);
 
       for (let i = 1; i <= numberOfStoresAfterFilter; i++) {
         const textColumn = await storesPage.getTextColumn(page, i, 'sl!name');
-        await expect(textColumn).to.contains('todelete');
+        expect(textColumn).to.contains('todelete');
       }
     });
 
@@ -131,7 +131,7 @@ describe('BO - Shop Parameters - Contact : Enable/Disable/Delete with Bulk Actio
 
         for (let row = 1; row <= numberOfStoresAfterBulkUpdateStatus; row++) {
           const storeStatus = await storesPage.getStoreStatus(page, row);
-          await expect(storeStatus).to.equal(test.args.statusWanted);
+          expect(storeStatus).to.equal(test.args.statusWanted);
         }
       });
     });
@@ -140,14 +140,14 @@ describe('BO - Shop Parameters - Contact : Enable/Disable/Delete with Bulk Actio
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteStores', baseContext);
 
       const deleteTextResult = await storesPage.bulkDeleteStores(page);
-      await expect(deleteTextResult).to.be.contains(storesPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.contains(storesPage.successfulMultiDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterDelete', baseContext);
 
       const numberOfStoresAfterReset = await storesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfStoresAfterReset).to.be.equal(numberOfStores);
+      expect(numberOfStoresAfterReset).to.be.equal(numberOfStores);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/02_stores/04_contactDetails.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/02_stores/04_contactDetails.ts
index 417146feb8d84..54219e635f294 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/02_stores/04_contactDetails.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/02_stores/04_contactDetails.ts
@@ -51,7 +51,7 @@ describe('BO - Shop Parameters - Contact : Configure contact details', async ()
     await contactPage.closeSfToolBar(page);
 
     const pageTitle = await contactPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(contactPage.pageTitle);
+    expect(pageTitle).to.contains(contactPage.pageTitle);
   });
 
   it('should go to stores page', async function () {
@@ -60,14 +60,14 @@ describe('BO - Shop Parameters - Contact : Configure contact details', async ()
     await contactPage.goToStoresPage(page);
 
     const pageTitle = await storesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(storesPage.pageTitle);
+    expect(pageTitle).to.contains(storesPage.pageTitle);
   });
 
   it('should fill contact details form', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'configureContactDetails', baseContext);
 
     const textResult = await storesPage.setContactDetails(page, storesContactToCreate);
-    await expect(textResult).to.contains(storesPage.contactFormSuccessfulUpdateMessage);
+    expect(textResult).to.contains(storesPage.contactFormSuccessfulUpdateMessage);
   });
 
   it('should view my shop', async function () {
@@ -78,23 +78,23 @@ describe('BO - Shop Parameters - Contact : Configure contact details', async ()
     await foHomePage.changeLanguage(page, 'en');
 
     const isHomePage = await foHomePage.isHomePage(page);
-    await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+    expect(isHomePage, 'Fail to open FO home page').to.eq(true);
   });
 
   it('should check contact details in FO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'checkContactDetailsInFO', baseContext);
 
     const storeInformation = await foHomePage.getStoreInformation(page);
-    await expect(storeInformation).to.contains(storesContactToCreate.name);
-    await expect(storeInformation).to.contains(storesContactToCreate.email);
-    await expect(storeInformation).to.not.contains(storesContactToCreate.registrationNumber);
-    await expect(storeInformation).to.contains(storesContactToCreate.address1);
-    await expect(storeInformation).to.contains(storesContactToCreate.address2);
-    await expect(storeInformation).to.contains(storesContactToCreate.postcode);
-    await expect(storeInformation).to.contains(storesContactToCreate.city);
-    await expect(storeInformation).to.contains(storesContactToCreate.country);
-    await expect(storeInformation).to.contains(storesContactToCreate.phone);
-    await expect(storeInformation).to.contains(storesContactToCreate.fax);
+    expect(storeInformation).to.contains(storesContactToCreate.name);
+    expect(storeInformation).to.contains(storesContactToCreate.email);
+    expect(storeInformation).to.not.contains(storesContactToCreate.registrationNumber);
+    expect(storeInformation).to.contains(storesContactToCreate.address1);
+    expect(storeInformation).to.contains(storesContactToCreate.address2);
+    expect(storeInformation).to.contains(storesContactToCreate.postcode);
+    expect(storeInformation).to.contains(storesContactToCreate.city);
+    expect(storeInformation).to.contains(storesContactToCreate.country);
+    expect(storeInformation).to.contains(storesContactToCreate.phone);
+    expect(storeInformation).to.contains(storesContactToCreate.fax);
   });
 
   it('should go back to BO', async function () {
@@ -104,13 +104,13 @@ describe('BO - Shop Parameters - Contact : Configure contact details', async ()
     page = await foHomePage.closePage(browserContext, page, 0);
 
     const pageTitle = await storesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(storesPage.pageTitle);
+    expect(pageTitle).to.contains(storesPage.pageTitle);
   });
 
   it('should back to default contact details information', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'backToDefaultInformation', baseContext);
 
     const textResult = await storesPage.setContactDetails(page, Stores.contact);
-    await expect(textResult).to.contains(storesPage.contactFormSuccessfulUpdateMessage);
+    expect(textResult).to.contains(storesPage.contactFormSuccessfulUpdateMessage);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/02_stores/05_sortAndPagination.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/02_stores/05_sortAndPagination.ts
index bf416290f624e..ab828f85ba344 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/02_stores/05_sortAndPagination.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/05_contact/02_stores/05_sortAndPagination.ts
@@ -57,7 +57,7 @@ describe('BO - Shop Parameters - Contact : Sort and pagination stores', async ()
     await contactPage.closeSfToolBar(page);
 
     const pageTitle = await contactPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(contactPage.pageTitle);
+    expect(pageTitle).to.contains(contactPage.pageTitle);
   });
 
   it('should go to stores page', async function () {
@@ -66,14 +66,14 @@ describe('BO - Shop Parameters - Contact : Sort and pagination stores', async ()
     await contactPage.goToStoresPage(page);
 
     const pageTitle = await storesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(storesPage.pageTitle);
+    expect(pageTitle).to.contains(storesPage.pageTitle);
   });
 
   it('should reset all filters and get number of stores in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfStores = await storesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfStores).to.be.above(0);
+    expect(numberOfStores).to.be.above(0);
   });
 
   describe('Sort stores', async () => {
@@ -167,17 +167,17 @@ describe('BO - Shop Parameters - Contact : Sort and pagination stores', async ()
           const expectedResult: number[] = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
           if (test.args.sortDirection === 'up') {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+            expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+            expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
         } else {
           const expectedResult: string[] = await basicHelper.sortArray(nonSortedTable);
 
           if (test.args.sortDirection === 'up') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         }
       });
@@ -198,17 +198,17 @@ describe('BO - Shop Parameters - Contact : Sort and pagination stores', async ()
             await storesPage.goToNewStorePage(page);
 
             const pageTitle = await addStorePage.getPageTitle(page);
-            await expect(pageTitle).to.contains(addStorePage.pageTitleCreate);
+            expect(pageTitle).to.contains(addStorePage.pageTitleCreate);
           });
 
           it('should create store and check result', async function () {
             await testContext.addContextItem(this, 'testIdentifier', `createStore${index}`, baseContext);
 
             const textResult = await addStorePage.createEditStore(page, createStoreData);
-            await expect(textResult).to.contains(storesPage.successfulCreationMessage);
+            expect(textResult).to.contains(storesPage.successfulCreationMessage);
 
             const numberOfStoresAfterCreation = await storesPage.getNumberOfElementInGrid(page);
-            await expect(numberOfStoresAfterCreation).to.be.equal(numberOfStores + 1 + index);
+            expect(numberOfStoresAfterCreation).to.be.equal(numberOfStores + 1 + index);
           });
         });
       });
@@ -251,11 +251,11 @@ describe('BO - Shop Parameters - Contact : Sort and pagination stores', async ()
         await storesPage.filterTable(page, 'input', 'sl!name', 'todelete');
 
         const numberOfStoresAfterFilter = await storesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfStoresAfterFilter).to.be.at.least(16);
+        expect(numberOfStoresAfterFilter).to.be.at.least(16);
 
         for (let i = 1; i <= numberOfStoresAfterFilter; i++) {
           const textColumn = await storesPage.getTextColumn(page, i, 'sl!name');
-          await expect(textColumn).to.contains('todelete');
+          expect(textColumn).to.contains('todelete');
         }
       });
 
@@ -263,14 +263,14 @@ describe('BO - Shop Parameters - Contact : Sort and pagination stores', async ()
         await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteStores', baseContext);
 
         const deleteTextResult = await storesPage.bulkDeleteStores(page);
-        await expect(deleteTextResult).to.be.contains(storesPage.successfulMultiDeleteMessage);
+        expect(deleteTextResult).to.be.contains(storesPage.successfulMultiDeleteMessage);
       });
 
       it('should reset all filters', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterDelete', baseContext);
 
         const numberOfStoresAfterReset = await storesPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfStoresAfterReset).to.be.equal(numberOfStores);
+        expect(numberOfStoresAfterReset).to.be.equal(numberOfStores);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/01_seoAndUrls/01_seoAndUrls/01_filterSeoPages.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/01_seoAndUrls/01_seoAndUrls/01_filterSeoPages.ts
index 143ec5fed9d7e..939645acaa991 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/01_seoAndUrls/01_seoAndUrls/01_filterSeoPages.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/01_seoAndUrls/01_seoAndUrls/01_filterSeoPages.ts
@@ -51,14 +51,14 @@ describe('BO - Shop Parameters - Traffic & SEO : Filter SEO pages with id, page,
     await seoAndUrlsPage.closeSfToolBar(page);
 
     const pageTitle = await seoAndUrlsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(seoAndUrlsPage.pageTitle);
+    expect(pageTitle).to.contains(seoAndUrlsPage.pageTitle);
   });
 
   it('should reset all filters and get number of SEO pages in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfSeoPages = await seoAndUrlsPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfSeoPages).to.be.above(0);
+    expect(numberOfSeoPages).to.be.above(0);
   });
 
   describe('Filter SEO pages', async () => {
@@ -80,11 +80,11 @@ describe('BO - Shop Parameters - Traffic & SEO : Filter SEO pages with id, page,
         );
 
         const numberOfSeoPagesAfterFilter = await seoAndUrlsPage.getNumberOfElementInGrid(page);
-        await expect(numberOfSeoPagesAfterFilter).to.be.at.most(numberOfSeoPages);
+        expect(numberOfSeoPagesAfterFilter).to.be.at.most(numberOfSeoPages);
 
         for (let i = 1; i <= numberOfSeoPagesAfterFilter; i++) {
           const textColumn = await seoAndUrlsPage.getTextColumnFromTable(page, i, test.args.filterBy);
-          await expect(textColumn).to.contains(test.args.filterValue);
+          expect(textColumn).to.contains(test.args.filterValue);
         }
       });
 
@@ -92,7 +92,7 @@ describe('BO - Shop Parameters - Traffic & SEO : Filter SEO pages with id, page,
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}Reset`, baseContext);
 
         const numberOfSeoPagesAfterReset = await seoAndUrlsPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfSeoPagesAfterReset).to.equal(numberOfSeoPages);
+        expect(numberOfSeoPagesAfterReset).to.equal(numberOfSeoPages);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/01_seoAndUrls/01_seoAndUrls/02_CRUDSeoPage.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/01_seoAndUrls/01_seoAndUrls/02_CRUDSeoPage.ts
index a87dec6e7166e..ef0c014815398 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/01_seoAndUrls/01_seoAndUrls/02_CRUDSeoPage.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/01_seoAndUrls/01_seoAndUrls/02_CRUDSeoPage.ts
@@ -52,14 +52,14 @@ describe('BO - Shop Parameters - Traffic & SEO : Create, update and delete seo p
     await seoAndUrlsPage.closeSfToolBar(page);
 
     const pageTitle = await seoAndUrlsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(seoAndUrlsPage.pageTitle);
+    expect(pageTitle).to.contains(seoAndUrlsPage.pageTitle);
   });
 
   it('should reset all filters and get number of SEO pages in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfSeoPages = await seoAndUrlsPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfSeoPages).to.be.above(0);
+    expect(numberOfSeoPages).to.be.above(0);
   });
 
   describe('Create seo page', async () => {
@@ -69,17 +69,17 @@ describe('BO - Shop Parameters - Traffic & SEO : Create, update and delete seo p
       await seoAndUrlsPage.goToNewSeoUrlPage(page);
 
       const pageTitle = await addSeoAndUrlPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addSeoAndUrlPage.pageTitle);
+      expect(pageTitle).to.contains(addSeoAndUrlPage.pageTitle);
     });
 
     it('should create seo page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createSeoPage', baseContext);
 
       const result = await addSeoAndUrlPage.createEditSeoPage(page, createSeoPageData);
-      await expect(result).to.equal(seoAndUrlsPage.successfulCreationMessage);
+      expect(result).to.equal(seoAndUrlsPage.successfulCreationMessage);
 
       const numberOfSeoPagesAfterCreation = await seoAndUrlsPage.getNumberOfElementInGrid(page);
-      await expect(numberOfSeoPagesAfterCreation).to.equal(numberOfSeoPages + 1);
+      expect(numberOfSeoPagesAfterCreation).to.equal(numberOfSeoPages + 1);
     });
   });
 
@@ -90,10 +90,10 @@ describe('BO - Shop Parameters - Traffic & SEO : Create, update and delete seo p
       await seoAndUrlsPage.filterTable(page, 'page', createSeoPageData.page);
 
       const numberOfSeoPagesAfterFilter = await seoAndUrlsPage.getNumberOfElementInGrid(page);
-      await expect(numberOfSeoPagesAfterFilter).to.be.at.least(1);
+      expect(numberOfSeoPagesAfterFilter).to.be.at.least(1);
 
       const textColumn = await seoAndUrlsPage.getTextColumnFromTable(page, 1, 'page');
-      await expect(textColumn).to.contains(createSeoPageData.page);
+      expect(textColumn).to.contains(createSeoPageData.page);
     });
 
     it('should go to edit first seo page page', async function () {
@@ -102,21 +102,21 @@ describe('BO - Shop Parameters - Traffic & SEO : Create, update and delete seo p
       await seoAndUrlsPage.goToEditSeoUrlPage(page, 1);
 
       const pageTitle = await addSeoAndUrlPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addSeoAndUrlPage.editPageTitle);
+      expect(pageTitle).to.contains(addSeoAndUrlPage.editPageTitle);
     });
 
     it('should edit seo page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'editSeoPage', baseContext);
 
       const result = await addSeoAndUrlPage.createEditSeoPage(page, editSeoPageData);
-      await expect(result).to.equal(seoAndUrlsPage.successfulUpdateMessage);
+      expect(result).to.equal(seoAndUrlsPage.successfulUpdateMessage);
     });
 
     it('should reset filter and check number of seo pages', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterUpdate', baseContext);
 
       const numberOfSeoPagesAfterCreation = await seoAndUrlsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfSeoPagesAfterCreation).to.equal(numberOfSeoPages + 1);
+      expect(numberOfSeoPagesAfterCreation).to.equal(numberOfSeoPages + 1);
     });
   });
 
@@ -127,10 +127,10 @@ describe('BO - Shop Parameters - Traffic & SEO : Create, update and delete seo p
       await seoAndUrlsPage.filterTable(page, 'page', editSeoPageData.page);
 
       const numberOfSeoPagesAfterFilter = await seoAndUrlsPage.getNumberOfElementInGrid(page);
-      await expect(numberOfSeoPagesAfterFilter).to.be.at.least(1);
+      expect(numberOfSeoPagesAfterFilter).to.be.at.least(1);
 
       const textColumn = await seoAndUrlsPage.getTextColumnFromTable(page, 1, 'page');
-      await expect(textColumn).to.contains(editSeoPageData.page);
+      expect(textColumn).to.contains(editSeoPageData.page);
     });
 
     it('should delete seo page', async function () {
@@ -138,14 +138,14 @@ describe('BO - Shop Parameters - Traffic & SEO : Create, update and delete seo p
 
       // delete seo page in first row
       const result = await seoAndUrlsPage.deleteSeoUrlPage(page, 1);
-      await expect(result).to.be.equal(seoAndUrlsPage.successfulDeleteMessage);
+      expect(result).to.be.equal(seoAndUrlsPage.successfulDeleteMessage);
     });
 
     it('should reset filter and check number of seo pages', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDelete', baseContext);
 
       const numberOfSeoPagesAfterCreation = await seoAndUrlsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfSeoPagesAfterCreation).to.equal(numberOfSeoPages);
+      expect(numberOfSeoPagesAfterCreation).to.equal(numberOfSeoPages);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/01_seoAndUrls/01_seoAndUrls/06_sortAndPaginationSeoPages.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/01_seoAndUrls/01_seoAndUrls/06_sortAndPaginationSeoPages.ts
index b7681e8df7c29..7f5a89be27dee 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/01_seoAndUrls/01_seoAndUrls/06_sortAndPaginationSeoPages.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/01_seoAndUrls/01_seoAndUrls/06_sortAndPaginationSeoPages.ts
@@ -45,14 +45,14 @@ describe('BO - Shop Parameters - Traffic & SEO : Sort and pagination seo pages',
     await seoAndUrlsPage.closeSfToolBar(page);
 
     const pageTitle = await seoAndUrlsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(seoAndUrlsPage.pageTitle);
+    expect(pageTitle).to.contains(seoAndUrlsPage.pageTitle);
   });
 
   it('should reset all filters and get number of SEO pages in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfSeoPages = await seoAndUrlsPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfSeoPages).to.be.above(0);
+    expect(numberOfSeoPages).to.be.above(0);
   });
 
   describe('Sort seo pages', async () => {
@@ -92,17 +92,17 @@ describe('BO - Shop Parameters - Traffic & SEO : Sort and pagination seo pages',
           const expectedResult: number[] = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+            expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+            expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
         } else {
           const expectedResult = await basicHelper.sortArray(nonSortedTable);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         }
       });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/01_seoAndUrls/01_seoAndUrls/07_bulkDeleteSeoPages.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/01_seoAndUrls/01_seoAndUrls/07_bulkDeleteSeoPages.ts
index cedcc3227031f..98e66560f69eb 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/01_seoAndUrls/01_seoAndUrls/07_bulkDeleteSeoPages.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/01_seoAndUrls/01_seoAndUrls/07_bulkDeleteSeoPages.ts
@@ -54,14 +54,14 @@ describe('BO - Shop Parameters - Traffic & SEO : Bulk delete seo pages', async (
     await seoAndUrlsPage.closeSfToolBar(page);
 
     const pageTitle = await seoAndUrlsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(seoAndUrlsPage.pageTitle);
+    expect(pageTitle).to.contains(seoAndUrlsPage.pageTitle);
   });
 
   it('should reset all filters and get number of SEO pages in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfSeoPages = await seoAndUrlsPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfSeoPages).to.be.above(0);
+    expect(numberOfSeoPages).to.be.above(0);
   });
 
   describe('Create 2 seo pages', async () => {
@@ -72,17 +72,17 @@ describe('BO - Shop Parameters - Traffic & SEO : Bulk delete seo pages', async (
         await seoAndUrlsPage.goToNewSeoUrlPage(page);
 
         const pageTitle = await addSeoAndUrlPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addSeoAndUrlPage.pageTitle);
+        expect(pageTitle).to.contains(addSeoAndUrlPage.pageTitle);
       });
 
       it('should create seo page', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `createSeoPage${index + 1}`, baseContext);
 
         const result = await addSeoAndUrlPage.createEditSeoPage(page, seoPageData);
-        await expect(result).to.equal(seoAndUrlsPage.successfulCreationMessage);
+        expect(result).to.equal(seoAndUrlsPage.successfulCreationMessage);
 
         const numberOfSeoPagesAfterCreation = await seoAndUrlsPage.getNumberOfElementInGrid(page);
-        await expect(numberOfSeoPagesAfterCreation).to.equal(numberOfSeoPages + 1 + index);
+        expect(numberOfSeoPagesAfterCreation).to.equal(numberOfSeoPages + 1 + index);
       });
     });
   });
@@ -94,7 +94,7 @@ describe('BO - Shop Parameters - Traffic & SEO : Bulk delete seo pages', async (
       await seoAndUrlsPage.filterTable(page, 'title', 'toDelete');
 
       const textColumn = await seoAndUrlsPage.getTextColumnFromTable(page, 1, 'title');
-      await expect(textColumn).to.contains('ToDelete');
+      expect(textColumn).to.contains('ToDelete');
     });
 
     it('should bulk delete seo page', async function () {
@@ -102,14 +102,14 @@ describe('BO - Shop Parameters - Traffic & SEO : Bulk delete seo pages', async (
 
       // Delete seo page in first row
       const result = await seoAndUrlsPage.bulkDeleteSeoUrlPage(page);
-      await expect(result).to.be.equal(seoAndUrlsPage.successfulMultiDeleteMessage);
+      expect(result).to.be.equal(seoAndUrlsPage.successfulMultiDeleteMessage);
     });
 
     it('should reset filter and check number of seo pages', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDelete', baseContext);
 
       const numberOfSeoPagesAfterCreation = await seoAndUrlsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfSeoPagesAfterCreation).to.equal(numberOfSeoPages);
+      expect(numberOfSeoPagesAfterCreation).to.equal(numberOfSeoPages);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/01_seoAndUrls/02_setUpUrls/03_enableDisableFriendlyURL.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/01_seoAndUrls/02_setUpUrls/03_enableDisableFriendlyURL.ts
index cee995b9a59b7..6a13614f26521 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/01_seoAndUrls/02_setUpUrls/03_enableDisableFriendlyURL.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/01_seoAndUrls/02_setUpUrls/03_enableDisableFriendlyURL.ts
@@ -46,14 +46,14 @@ describe('BO - Shop Parameters - Traffic & SEO : Enable/Disable friendly URL', a
     await seoAndUrlsPage.closeSfToolBar(page);
 
     const pageTitle = await seoAndUrlsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(seoAndUrlsPage.pageTitle);
+    expect(pageTitle).to.contains(seoAndUrlsPage.pageTitle);
   });
 
   it('should disable friendly URL', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'disableFriendlyUrl', baseContext);
 
     const result = await seoAndUrlsPage.enableDisableFriendlyURL(page, false);
-    await expect(result).to.contains(seoAndUrlsPage.successfulSettingsUpdateMessage);
+    expect(result).to.contains(seoAndUrlsPage.successfulSettingsUpdateMessage);
   });
 
   it('should go to FO and check the URL', async function () {
@@ -63,7 +63,7 @@ describe('BO - Shop Parameters - Traffic & SEO : Enable/Disable friendly URL', a
     page = await seoAndUrlsPage.viewMyShop(page);
 
     const url = await foHomePage.getCurrentURL(page);
-    await expect(url).to.contains('index.php');
+    expect(url).to.contains('index.php');
   });
 
   it('should go back to BO', async function () {
@@ -73,14 +73,14 @@ describe('BO - Shop Parameters - Traffic & SEO : Enable/Disable friendly URL', a
     page = await foHomePage.closePage(browserContext, page, 0);
 
     const pageTitle = await seoAndUrlsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(seoAndUrlsPage.pageTitle);
+    expect(pageTitle).to.contains(seoAndUrlsPage.pageTitle);
   });
 
   it('should enable friendly URL', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'enableFriendlyUrl', baseContext);
 
     const result = await seoAndUrlsPage.enableDisableFriendlyURL(page, true);
-    await expect(result).to.contains(seoAndUrlsPage.successfulSettingsUpdateMessage);
+    expect(result).to.contains(seoAndUrlsPage.successfulSettingsUpdateMessage);
   });
 
   it('should go to FO and check the URL', async function () {
@@ -91,6 +91,6 @@ describe('BO - Shop Parameters - Traffic & SEO : Enable/Disable friendly URL', a
     await foHomePage.changeLanguage(page, 'en');
 
     const url = await foHomePage.getCurrentURL(page);
-    await expect(url).to.contains('/en/');
+    expect(url).to.contains('/en/');
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/01_seoAndUrls/02_setUpUrls/04_enableDisableAccentedURL.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/01_seoAndUrls/02_setUpUrls/04_enableDisableAccentedURL.ts
index 5e2aafd2e0572..3ff196c362d7d 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/01_seoAndUrls/02_setUpUrls/04_enableDisableAccentedURL.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/01_seoAndUrls/02_setUpUrls/04_enableDisableAccentedURL.ts
@@ -65,7 +65,7 @@ describe('BO - Shop Parameters - Traffic & SEO : Enable/Disable accented URL', a
       await productsPage.closeSfToolBar(page);
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should create a product that the name contains accented characters', async function () {
@@ -74,7 +74,7 @@ describe('BO - Shop Parameters - Traffic & SEO : Enable/Disable accented URL', a
       await productsPage.goToAddProductPage(page);
 
       const createProductMessage = await addProductPage.createEditBasicProduct(page, productData);
-      await expect(createProductMessage).to.equal(addProductPage.settingUpdatedMessage);
+      expect(createProductMessage).to.equal(addProductPage.settingUpdatedMessage);
     });
 
     const tests = [
@@ -93,14 +93,14 @@ describe('BO - Shop Parameters - Traffic & SEO : Enable/Disable accented URL', a
         );
 
         const pageTitle = await seoAndUrlsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(seoAndUrlsPage.pageTitle);
+        expect(pageTitle).to.contains(seoAndUrlsPage.pageTitle);
       });
 
       it(`should ${test.args.action} accented URL`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.action}AccentedUrl`, baseContext);
 
         const result = await seoAndUrlsPage.enableDisableAccentedURL(page, test.args.enable);
-        await expect(result).to.contains(seoAndUrlsPage.successfulSettingsUpdateMessage);
+        expect(result).to.contains(seoAndUrlsPage.successfulSettingsUpdateMessage);
       });
 
       it('should go to \'Catalog > Products\' page', async function () {
@@ -113,7 +113,7 @@ describe('BO - Shop Parameters - Traffic & SEO : Enable/Disable accented URL', a
         );
 
         const pageTitle = await productsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(productsPage.pageTitle);
+        expect(pageTitle).to.contains(productsPage.pageTitle);
       });
 
       it('should reset all filters', async function () {
@@ -122,7 +122,7 @@ describe('BO - Shop Parameters - Traffic & SEO : Enable/Disable accented URL', a
         await productsPage.resetFilterCategory(page);
 
         const numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfProducts).to.be.above(0);
+        expect(numberOfProducts).to.be.above(0);
       });
 
       it('should filter by the created product name', async function () {
@@ -131,7 +131,7 @@ describe('BO - Shop Parameters - Traffic & SEO : Enable/Disable accented URL', a
         await productsPage.filterProducts(page, 'name', productName);
 
         const textColumn = await productsPage.getProductNameFromList(page, 1);
-        await expect(textColumn).to.contains(productName);
+        expect(textColumn).to.contains(productName);
       });
 
       it('should go to the created product page and reset the friendly url', async function () {
@@ -140,7 +140,7 @@ describe('BO - Shop Parameters - Traffic & SEO : Enable/Disable accented URL', a
         await productsPage.goToProductPage(page, 1);
 
         const pageTitle = await addProductPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addProductPage.pageTitle);
+        expect(pageTitle).to.contains(addProductPage.pageTitle);
 
         await addProductPage.resetURL(page);
       });
@@ -152,7 +152,7 @@ describe('BO - Shop Parameters - Traffic & SEO : Enable/Disable accented URL', a
         page = await addProductPage.previewProduct(page);
 
         const url = await foHomePage.getCurrentURL(page);
-        await expect(url).to.contains(test.args.productNameInURL.toLowerCase());
+        expect(url).to.contains(test.args.productNameInURL.toLowerCase());
       });
 
       it('should go back to BO', async function () {
@@ -162,7 +162,7 @@ describe('BO - Shop Parameters - Traffic & SEO : Enable/Disable accented URL', a
         page = await foHomePage.closePage(browserContext, page, 0);
 
         const pageTitle = await addProductPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addProductPage.pageTitle);
+        expect(pageTitle).to.contains(addProductPage.pageTitle);
       });
     });
 
@@ -170,14 +170,14 @@ describe('BO - Shop Parameters - Traffic & SEO : Enable/Disable accented URL', a
       await testContext.addContextItem(this, 'testIdentifier', 'deleteProduct', baseContext);
 
       const testResult = await addProductPage.deleteProduct(page);
-      await expect(testResult).to.equal(productsPage.productDeletedSuccessfulMessage);
+      expect(testResult).to.equal(productsPage.productDeletedSuccessfulMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilters', baseContext);
 
       const numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProducts).to.be.above(0);
+      expect(numberOfProducts).to.be.above(0);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/01_seoAndUrls/05_seoOptions/01_displayAttributesInProductMetaTitle.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/01_seoAndUrls/05_seoOptions/01_displayAttributesInProductMetaTitle.ts
index 9e791b95f9020..1a667920fc8f8 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/01_seoAndUrls/05_seoOptions/01_displayAttributesInProductMetaTitle.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/01_seoAndUrls/05_seoOptions/01_displayAttributesInProductMetaTitle.ts
@@ -52,7 +52,7 @@ describe('BO - Shop Parameters - Traffic & SEO : Enable/Disable display attribut
     await seoAndUrlsPage.closeSfToolBar(page);
 
     const pageTitle = await seoAndUrlsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(seoAndUrlsPage.pageTitle);
+    expect(pageTitle).to.contains(seoAndUrlsPage.pageTitle);
   });
 
   const tests = [
@@ -77,7 +77,7 @@ describe('BO - Shop Parameters - Traffic & SEO : Enable/Disable display attribut
       await testContext.addContextItem(this, 'testIdentifier', `${test.args.action}DisplayAttributes`, baseContext);
 
       const result = await seoAndUrlsPage.setStatusAttributesInProductMetaTitle(page, test.args.enable);
-      await expect(result).to.contains(seoAndUrlsPage.successfulSettingsUpdateMessage);
+      expect(result).to.contains(seoAndUrlsPage.successfulSettingsUpdateMessage);
     });
 
     it('should go to FO', async function () {
@@ -89,7 +89,7 @@ describe('BO - Shop Parameters - Traffic & SEO : Enable/Disable display attribut
       await foHomePage.changeLanguage(page, 'en');
 
       const isHomePage = await foHomePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should go to the first product page and check the title', async function () {
@@ -99,7 +99,7 @@ describe('BO - Shop Parameters - Traffic & SEO : Enable/Disable display attribut
       await foHomePage.goToProductPage(page, 1);
 
       const pageTitle = await productPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(test.args.metaTitle);
+      expect(pageTitle).to.equal(test.args.metaTitle);
     });
 
     it('should go back to BO', async function () {
@@ -109,7 +109,7 @@ describe('BO - Shop Parameters - Traffic & SEO : Enable/Disable display attribut
       page = await foHomePage.closePage(browserContext, page, 0);
 
       const pageTitle = await seoAndUrlsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(seoAndUrlsPage.pageTitle);
+      expect(pageTitle).to.contains(seoAndUrlsPage.pageTitle);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/01_seoAndUrls/helpCard.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/01_seoAndUrls/helpCard.ts
index 3278a28174ef1..e1ff19b84b1c2 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/01_seoAndUrls/helpCard.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/01_seoAndUrls/helpCard.ts
@@ -43,23 +43,23 @@ describe('BO - Shop Parameters - Traffic & SEO : Help card', async () => {
     await seoAndUrlsPage.closeSfToolBar(page);
 
     const pageTitle = await seoAndUrlsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(seoAndUrlsPage.pageTitle);
+    expect(pageTitle).to.contains(seoAndUrlsPage.pageTitle);
   });
 
   it('should open the help side bar and check the document language', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'openHelpSidebar', baseContext);
 
     const isHelpSidebarVisible = await seoAndUrlsPage.openHelpSideBar(page);
-    await expect(isHelpSidebarVisible).to.be.true;
+    expect(isHelpSidebarVisible).to.eq(true);
 
     const documentURL = await seoAndUrlsPage.getHelpDocumentURL(page);
-    await expect(documentURL).to.contains('country=en');
+    expect(documentURL).to.contains('country=en');
   });
 
   it('should close the help side bar', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'closeHelpSidebar', baseContext);
 
     const isHelpSidebarClosed = await seoAndUrlsPage.closeHelpSideBar(page);
-    await expect(isHelpSidebarClosed).to.be.true;
+    expect(isHelpSidebarClosed).to.eq(true);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/02_searchEngines/01_filterSortAndPagination.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/02_searchEngines/01_filterSortAndPagination.ts
index ae78f4ef292a0..92f851a24b4a0 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/02_searchEngines/01_filterSortAndPagination.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/02_searchEngines/01_filterSortAndPagination.ts
@@ -53,7 +53,7 @@ describe('BO - Shop Parameters - Traffic & SEO : Filter, sort and pagination sea
     );
 
     const pageTitle = await seoAndUrlsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(seoAndUrlsPage.pageTitle);
+    expect(pageTitle).to.contains(seoAndUrlsPage.pageTitle);
   });
 
   it('should go to \'Search Engines\' pge', async function () {
@@ -62,14 +62,14 @@ describe('BO - Shop Parameters - Traffic & SEO : Filter, sort and pagination sea
     await seoAndUrlsPage.goToSearchEnginesPage(page);
 
     const pageTitle = await searchEnginesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(searchEnginesPage.pageTitle);
+    expect(pageTitle).to.contains(searchEnginesPage.pageTitle);
   });
 
   it('should reset all filters and get number of search engines in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfSearchEngines = await searchEnginesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfSearchEngines).to.be.above(0);
+    expect(numberOfSearchEngines).to.be.above(0);
   });
 
   describe('Filter search engines', async () => {
@@ -90,7 +90,7 @@ describe('BO - Shop Parameters - Traffic & SEO : Filter, sort and pagination sea
         );
 
         const numberOfSearchEnginesAfterFilter = await searchEnginesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfSearchEnginesAfterFilter).to.be.at.most(numberOfSearchEngines);
+        expect(numberOfSearchEnginesAfterFilter).to.be.at.most(numberOfSearchEngines);
 
         for (let i = 1; i <= numberOfSearchEnginesAfterFilter; i++) {
           const textColumn = await searchEnginesPage.getTextColumn(
@@ -98,7 +98,7 @@ describe('BO - Shop Parameters - Traffic & SEO : Filter, sort and pagination sea
             i,
             test.args.filterBy,
           );
-          await expect(textColumn).to.contains(test.args.filterValue);
+          expect(textColumn).to.contains(test.args.filterValue);
         }
       });
 
@@ -106,7 +106,7 @@ describe('BO - Shop Parameters - Traffic & SEO : Filter, sort and pagination sea
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}Reset`, baseContext);
 
         const numberOfSearchEnginesAfterReset = await searchEnginesPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfSearchEnginesAfterReset).to.equal(numberOfSearchEngines);
+        expect(numberOfSearchEnginesAfterReset).to.equal(numberOfSearchEngines);
       });
     });
   });
@@ -162,17 +162,17 @@ describe('BO - Shop Parameters - Traffic & SEO : Filter, sort and pagination sea
           const expectedResult: number[] = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+            expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+            expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
         } else {
           const expectedResult = await basicHelper.sortArray(nonSortedTable);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         }
       });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/02_searchEngines/02_CRUDSearchEngines.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/02_searchEngines/02_CRUDSearchEngines.ts
index 185fb1b991b4d..5921337658b66 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/02_searchEngines/02_CRUDSearchEngines.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/02_searchEngines/02_CRUDSearchEngines.ts
@@ -58,7 +58,7 @@ describe('BO - Shop Parameters - Traffic & SEO : Create, update and delete searc
     await seoAndUrlsPage.closeSfToolBar(page);
 
     const pageTitle = await seoAndUrlsPage.getPageTitle(page);
-    await expect(pageTitle).to.contain(seoAndUrlsPage.pageTitle);
+    expect(pageTitle).to.contain(seoAndUrlsPage.pageTitle);
   });
 
   it('should go to \'Search Engines\' pge', async function () {
@@ -67,14 +67,14 @@ describe('BO - Shop Parameters - Traffic & SEO : Create, update and delete searc
     await seoAndUrlsPage.goToSearchEnginesPage(page);
 
     const pageTitle = await searchEnginesPage.getPageTitle(page);
-    await expect(pageTitle).to.contain(searchEnginesPage.pageTitle);
+    expect(pageTitle).to.contain(searchEnginesPage.pageTitle);
   });
 
   it('should reset all filters and get number of search engines in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfSearchEngines = await searchEnginesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfSearchEngines).to.be.above(0);
+    expect(numberOfSearchEngines).to.be.above(0);
   });
 
   describe('Create search engine', async () => {
@@ -84,17 +84,17 @@ describe('BO - Shop Parameters - Traffic & SEO : Create, update and delete searc
       await searchEnginesPage.goToNewSearchEnginePage(page);
 
       const pageTitle = await addSearchEnginePage.getPageTitle(page);
-      await expect(pageTitle).to.contain(addSearchEnginePage.pageTitleCreate);
+      expect(pageTitle).to.contain(addSearchEnginePage.pageTitleCreate);
     });
 
     it('should create search engine', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createSearchEngine', baseContext);
 
       const result = await addSearchEnginePage.createEditSearchEngine(page, createSearchEngineData);
-      await expect(result).to.contain(searchEnginesPage.successfulCreationMessage);
+      expect(result).to.contain(searchEnginesPage.successfulCreationMessage);
 
       const numberOfSearchEnginesAfterCreation = await searchEnginesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfSearchEnginesAfterCreation).to.equal(numberOfSearchEngines + 1);
+      expect(numberOfSearchEnginesAfterCreation).to.equal(numberOfSearchEngines + 1);
     });
   });
 
@@ -105,10 +105,10 @@ describe('BO - Shop Parameters - Traffic & SEO : Create, update and delete searc
       await searchEnginesPage.filterTable(page, 'server', createSearchEngineData.server);
 
       const numberOfSearchEnginesAfterFilter = await searchEnginesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfSearchEnginesAfterFilter).to.be.at.least(1);
+      expect(numberOfSearchEnginesAfterFilter).to.be.at.least(1);
 
       const textColumn = await searchEnginesPage.getTextColumn(page, 1, 'server');
-      await expect(textColumn).to.contain(createSearchEngineData.server);
+      expect(textColumn).to.contain(createSearchEngineData.server);
     });
 
     it('should go to edit first search engine page', async function () {
@@ -117,21 +117,21 @@ describe('BO - Shop Parameters - Traffic & SEO : Create, update and delete searc
       await searchEnginesPage.goToEditSearchEnginePage(page, 1);
 
       const pageTitle = await addSearchEnginePage.getPageTitle(page);
-      await expect(pageTitle).to.contain(addSearchEnginePage.pageTitleEdit);
+      expect(pageTitle).to.contain(addSearchEnginePage.pageTitleEdit);
     });
 
     it('should edit search engine', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'editSearchEngine', baseContext);
 
       const result = await addSearchEnginePage.createEditSearchEngine(page, editSearchEngineData);
-      await expect(result).to.contain(searchEnginesPage.successfulUpdateMessage);
+      expect(result).to.contain(searchEnginesPage.successfulUpdateMessage);
     });
 
     it('should reset filter and check number of search engine', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterUpdate', baseContext);
 
       const numberOfSearchEnginesAfterUpdate = await searchEnginesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfSearchEnginesAfterUpdate).to.equal(numberOfSearchEngines + 1);
+      expect(numberOfSearchEnginesAfterUpdate).to.equal(numberOfSearchEngines + 1);
     });
   });
 
@@ -142,10 +142,10 @@ describe('BO - Shop Parameters - Traffic & SEO : Create, update and delete searc
       await searchEnginesPage.filterTable(page, 'server', editSearchEngineData.server);
 
       const numberOfSearchEnginesAfterFilter = await searchEnginesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfSearchEnginesAfterFilter).to.be.at.least(1);
+      expect(numberOfSearchEnginesAfterFilter).to.be.at.least(1);
 
       const textColumn = await searchEnginesPage.getTextColumn(page, 1, 'server');
-      await expect(textColumn).to.contain(editSearchEngineData.server);
+      expect(textColumn).to.contain(editSearchEngineData.server);
     });
 
     it('should delete search engine', async function () {
@@ -153,14 +153,14 @@ describe('BO - Shop Parameters - Traffic & SEO : Create, update and delete searc
 
       // delete search engine in first row
       const result = await searchEnginesPage.deleteSearchEngine(page, 1);
-      await expect(result).to.be.contain(searchEnginesPage.successfulDeleteMessage);
+      expect(result).to.be.contain(searchEnginesPage.successfulDeleteMessage);
     });
 
     it('should reset filter and check number of searchEngine', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDelete', baseContext);
 
       const numberOfSearchEnginesAfterDelete = await searchEnginesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfSearchEnginesAfterDelete).to.equal(numberOfSearchEngines);
+      expect(numberOfSearchEnginesAfterDelete).to.equal(numberOfSearchEngines);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/02_searchEngines/03_bulkActions.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/02_searchEngines/03_bulkActions.ts
index 55240cab5a02d..7dd48edef677e 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/02_searchEngines/03_bulkActions.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/06_trafficAndSeo/02_searchEngines/03_bulkActions.ts
@@ -54,7 +54,7 @@ describe('BO - Shop Parameters - Traffic & SEO : Bulk delete search engine', asy
     await seoAndUrlsPage.closeSfToolBar(page);
 
     const pageTitle = await seoAndUrlsPage.getPageTitle(page);
-    await expect(pageTitle).to.contain(seoAndUrlsPage.pageTitle);
+    expect(pageTitle).to.contain(seoAndUrlsPage.pageTitle);
   });
 
   it('should go to \'Search Engines\' pge', async function () {
@@ -63,14 +63,14 @@ describe('BO - Shop Parameters - Traffic & SEO : Bulk delete search engine', asy
     await seoAndUrlsPage.goToSearchEnginesPage(page);
 
     const pageTitle = await searchEnginesPage.getPageTitle(page);
-    await expect(pageTitle).to.contain(searchEnginesPage.pageTitle);
+    expect(pageTitle).to.contain(searchEnginesPage.pageTitle);
   });
 
   it('should reset all filters and get number of search engines in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfSearchEngines = await searchEnginesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfSearchEngines).to.be.above(0);
+    expect(numberOfSearchEngines).to.be.above(0);
   });
 
   const creationTests: number[] = new Array(2).fill(0, 0, 2);
@@ -84,17 +84,17 @@ describe('BO - Shop Parameters - Traffic & SEO : Bulk delete search engine', asy
         await searchEnginesPage.goToNewSearchEnginePage(page);
 
         const pageTitle = await addSearchEnginePage.getPageTitle(page);
-        await expect(pageTitle).to.contain(addSearchEnginePage.pageTitleCreate);
+        expect(pageTitle).to.contain(addSearchEnginePage.pageTitleCreate);
       });
 
       it('should create search engine', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `createSearchEngine${index}`, baseContext);
 
         const result = await addSearchEnginePage.createEditSearchEngine(page, searchEngineData);
-        await expect(result).to.contain(searchEnginesPage.successfulCreationMessage);
+        expect(result).to.contain(searchEnginesPage.successfulCreationMessage);
 
         const numberOfSearchEnginesAfterCreation = await searchEnginesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfSearchEnginesAfterCreation).to.equal(numberOfSearchEngines + 1 + index);
+        expect(numberOfSearchEnginesAfterCreation).to.equal(numberOfSearchEngines + 1 + index);
       });
     });
   });
@@ -106,10 +106,10 @@ describe('BO - Shop Parameters - Traffic & SEO : Bulk delete search engine', asy
       await searchEnginesPage.filterTable(page, 'server', 'toDelete');
 
       const numberOfSearchEnginesAfterFilter = await searchEnginesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfSearchEnginesAfterFilter).to.be.at.least(2);
+      expect(numberOfSearchEnginesAfterFilter).to.be.at.least(2);
 
       const textColumn = await searchEnginesPage.getTextColumn(page, 1, 'server');
-      await expect(textColumn).to.contain('todelete');
+      expect(textColumn).to.contain('todelete');
     });
 
     it('should delete search engine', async function () {
@@ -117,14 +117,14 @@ describe('BO - Shop Parameters - Traffic & SEO : Bulk delete search engine', asy
 
       // delete search engine in first row
       const result = await searchEnginesPage.bulkDeleteSearchEngine(page);
-      await expect(result).to.be.contain(searchEnginesPage.successfulMultiDeleteMessage);
+      expect(result).to.be.contain(searchEnginesPage.successfulMultiDeleteMessage);
     });
 
     it('should reset filter and check number of searchEngine', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDelete', baseContext);
 
       const numberOfSearchEnginesAfterDelete = await searchEnginesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfSearchEnginesAfterDelete).to.equal(numberOfSearchEngines);
+      expect(numberOfSearchEnginesAfterDelete).to.equal(numberOfSearchEngines);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/07_search/01_search/01_CRUDSearch.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/07_search/01_search/01_CRUDSearch.ts
index 6d0a4a8462730..a883bd2965672 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/07_search/01_search/01_CRUDSearch.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/07_search/01_search/01_CRUDSearch.ts
@@ -55,14 +55,14 @@ describe('BO - Shop Parameters - Search : Create, update and delete search in BO
     );
 
     const pageTitle = await searchPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(searchPage.pageTitle);
+    expect(pageTitle).to.contains(searchPage.pageTitle);
   });
 
   it('should reset all filters and get number of alias in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfSearch = await searchPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfSearch).to.be.above(0);
+    expect(numberOfSearch).to.be.above(0);
   });
 
   // 1 - Create alias
@@ -73,17 +73,17 @@ describe('BO - Shop Parameters - Search : Create, update and delete search in BO
       await searchPage.goToAddNewAliasPage(page);
 
       const pageTitle = await addSearchPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addSearchPage.pageTitleCreate);
+      expect(pageTitle).to.contains(addSearchPage.pageTitleCreate);
     });
 
     it('should create alias and check result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createAlias', baseContext);
 
       const textResult = await addSearchPage.setAlias(page, createAliasData);
-      await expect(textResult).to.contains(searchPage.successfulCreationMessage);
+      expect(textResult).to.contains(searchPage.successfulCreationMessage);
 
       const numberOfElementAfterCreation = await searchPage.getNumberOfElementInGrid(page);
-      await expect(numberOfElementAfterCreation).to.be.equal(numberOfSearch + 1);
+      expect(numberOfElementAfterCreation).to.be.equal(numberOfSearch + 1);
     });
   });
 
@@ -96,7 +96,7 @@ describe('BO - Shop Parameters - Search : Create, update and delete search in BO
       await searchPage.filterTable(page, 'input', 'alias', createAliasData.alias);
 
       const textEmail = await searchPage.getTextColumn(page, 1, 'alias');
-      await expect(textEmail).to.contains(createAliasData.alias);
+      expect(textEmail).to.contains(createAliasData.alias);
     });
 
     it('should go to edit alias page', async function () {
@@ -105,17 +105,17 @@ describe('BO - Shop Parameters - Search : Create, update and delete search in BO
       await searchPage.gotoEditAliasPage(page, 1);
 
       const pageTitle = await addSearchPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addSearchPage.pageTitleEdit);
+      expect(pageTitle).to.contains(addSearchPage.pageTitleEdit);
     });
 
     it('should update alias', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateAlias', baseContext);
 
       const textResult = await addSearchPage.setAlias(page, editSearchData);
-      await expect(textResult).to.contains(searchPage.successfulUpdateMessage);
+      expect(textResult).to.contains(searchPage.successfulUpdateMessage);
 
       const numberOfSearchAfterUpdate = await searchPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfSearchAfterUpdate).to.be.equal(numberOfSearch + 1);
+      expect(numberOfSearchAfterUpdate).to.be.equal(numberOfSearch + 1);
     });
   });
 
@@ -128,17 +128,17 @@ describe('BO - Shop Parameters - Search : Create, update and delete search in BO
       await searchPage.filterTable(page, 'input', 'alias', createAliasData.alias);
 
       const textEmail = await searchPage.getTextColumn(page, 1, 'alias');
-      await expect(textEmail).to.contains(createAliasData.alias);
+      expect(textEmail).to.contains(createAliasData.alias);
     });
 
     it('should delete alias', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteAlias', baseContext);
 
       const textResult = await searchPage.deleteAlias(page, 1);
-      await expect(textResult).to.contains(searchPage.successfulDeleteMessage);
+      expect(textResult).to.contains(searchPage.successfulDeleteMessage);
 
       const numberOfSearchAfterDelete = await searchPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfSearchAfterDelete).to.be.equal(numberOfSearch);
+      expect(numberOfSearchAfterDelete).to.be.equal(numberOfSearch);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/07_search/01_search/01_editSearchSettings/03_fuzzySearch.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/07_search/01_search/01_editSearchSettings/03_fuzzySearch.ts
index 6aa57f07a5d78..1038121e964d5 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/07_search/01_search/01_editSearchSettings/03_fuzzySearch.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/07_search/01_search/01_editSearchSettings/03_fuzzySearch.ts
@@ -46,14 +46,14 @@ describe('BO - Shop Parameters - Search : Fuzzy search', async () => {
     );
 
     const pageTitle = await searchPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(searchPage.pageTitle);
+    expect(pageTitle).to.contains(searchPage.pageTitle);
   });
 
   it('should disable the Fuzzy Search', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'disableFuzzySearch', baseContext);
 
     const textResult = await searchPage.setFuzzySearch(page, false);
-    await expect(textResult).to.be.eq(searchPage.settingsUpdateMessage);
+    expect(textResult).to.be.eq(searchPage.settingsUpdateMessage);
   });
 
   it('should go to the Front Office', async function () {
@@ -69,10 +69,10 @@ describe('BO - Shop Parameters - Search : Fuzzy search', async () => {
     await testContext.addContextItem(this, 'testIdentifier', 'checkAutocompleteWoFuzzy', baseContext);
 
     const hasSearchResult = await homePage.hasAutocompleteSearchResult(page, 'test');
-    await expect(hasSearchResult).to.be.false;
+    expect(hasSearchResult).to.eq(false);
 
     const inputValue = await homePage.getSearchValue(page);
-    await expect(inputValue).equal('test');
+    expect(inputValue).equal('test');
   });
 
   it('should check the search page', async function () {
@@ -81,13 +81,13 @@ describe('BO - Shop Parameters - Search : Fuzzy search', async () => {
     await homePage.searchProduct(page, 'test');
 
     const pageTitle = await searchResultsPage.getPageTitle(page);
-    await expect(pageTitle).to.equal(searchResultsPage.pageTitle);
+    expect(pageTitle).to.equal(searchResultsPage.pageTitle);
 
     const hasResults = await searchResultsPage.hasResults(page);
-    await expect(hasResults).to.be.false;
+    expect(hasResults).to.eq(false);
 
     const searchInputValue = await searchResultsPage.getSearchValue(page);
-    await expect(searchInputValue).to.be.equal('test');
+    expect(searchInputValue).to.be.equal('test');
   });
 
   it('should go to BO', async function () {
@@ -96,7 +96,7 @@ describe('BO - Shop Parameters - Search : Fuzzy search', async () => {
     await searchResultsPage.goToBO(page);
 
     const pageTitle = await dashboardPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(dashboardPage.pageTitle);
+    expect(pageTitle).to.contains(dashboardPage.pageTitle);
   });
 
   it('should go to \'Shop Parameters > Search\' page', async function () {
@@ -109,14 +109,14 @@ describe('BO - Shop Parameters - Search : Fuzzy search', async () => {
     );
 
     const pageTitle = await searchPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(searchPage.pageTitle);
+    expect(pageTitle).to.contains(searchPage.pageTitle);
   });
 
   it('should disable the Fuzzy Search', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'enableFuzzySearch', baseContext);
 
     const textResult = await searchPage.setFuzzySearch(page, true);
-    await expect(textResult).to.be.eq(searchPage.settingsUpdateMessage);
+    expect(textResult).to.be.eq(searchPage.settingsUpdateMessage);
   });
 
   it('should go to the Front Office', async function () {
@@ -132,13 +132,13 @@ describe('BO - Shop Parameters - Search : Fuzzy search', async () => {
     await testContext.addContextItem(this, 'testIdentifier', 'checkAutocompleteWFuzzy', baseContext);
 
     const hasSearchResult = await homePage.hasAutocompleteSearchResult(page, 'test');
-    await expect(hasSearchResult).to.be.true;
+    expect(hasSearchResult).to.eq(true);
 
     const countSearchResult = await homePage.countAutocompleteSearchResult(page, 'test');
-    await expect(countSearchResult).to.be.eq(7);
+    expect(countSearchResult).to.be.eq(7);
 
     const inputValue = await homePage.getSearchValue(page);
-    await expect(inputValue).equal('test');
+    expect(inputValue).equal('test');
   });
 
   it('should check the search page', async function () {
@@ -147,15 +147,15 @@ describe('BO - Shop Parameters - Search : Fuzzy search', async () => {
     await homePage.searchProduct(page, 'test');
 
     const pageTitle = await searchResultsPage.getPageTitle(page);
-    await expect(pageTitle).to.equal(searchResultsPage.pageTitle);
+    expect(pageTitle).to.equal(searchResultsPage.pageTitle);
 
     const hasResults = await searchResultsPage.hasResults(page);
-    await expect(hasResults).to.be.true;
+    expect(hasResults).to.eq(true);
 
     const countResults = await searchResultsPage.getSearchResultsNumber(page);
-    await expect(countResults).to.be.eq(7);
+    expect(countResults).to.be.eq(7);
 
     const searchInputValue = await searchResultsPage.getSearchValue(page);
-    await expect(searchInputValue).to.be.equal('test');
+    expect(searchInputValue).to.be.equal('test');
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/07_search/01_search/02_bulkActions.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/07_search/01_search/02_bulkActions.ts
index 3b408f72a5f2b..c837c2aac17e0 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/07_search/01_search/02_bulkActions.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/07_search/01_search/02_bulkActions.ts
@@ -53,14 +53,14 @@ describe('BO - Shop Parameters - Search : Enable/Disable and delete by bulk acti
     );
 
     const pageTitle = await searchPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(searchPage.pageTitle);
+    expect(pageTitle).to.contains(searchPage.pageTitle);
   });
 
   it('should reset all filters and get number of aliases in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfSearch = await searchPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfSearch).to.be.above(0);
+    expect(numberOfSearch).to.be.above(0);
   });
 
   // 1 - Create 2 aliases
@@ -75,17 +75,17 @@ describe('BO - Shop Parameters - Search : Enable/Disable and delete by bulk acti
         await searchPage.goToAddNewAliasPage(page);
 
         const pageTitle = await addSearchPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addSearchPage.pageTitleCreate);
+        expect(pageTitle).to.contains(addSearchPage.pageTitleCreate);
       });
 
       it(`should create alias n°${index + 1} and check result`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `createAlias${index}`, baseContext);
 
         const textResult = await addSearchPage.setAlias(page, aliasData);
-        await expect(textResult).to.contains(searchPage.successfulCreationMessage);
+        expect(textResult).to.contains(searchPage.successfulCreationMessage);
 
         const numberOfElementAfterCreation = await searchPage.getNumberOfElementInGrid(page);
-        await expect(numberOfElementAfterCreation).to.be.equal(numberOfSearch + 1 + index);
+        expect(numberOfElementAfterCreation).to.be.equal(numberOfSearch + 1 + index);
       });
     });
   });
@@ -99,7 +99,7 @@ describe('BO - Shop Parameters - Search : Enable/Disable and delete by bulk acti
       await searchPage.filterTable(page, 'input', 'alias', 'todelete');
 
       const textAlias = await searchPage.getTextColumn(page, 1, 'alias');
-      await expect(textAlias).to.contains('todelete');
+      expect(textAlias).to.contains('todelete');
     });
 
     [
@@ -110,13 +110,13 @@ describe('BO - Shop Parameters - Search : Enable/Disable and delete by bulk acti
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.action}Status`, baseContext);
 
         const textResult = await searchPage.bulkSetStatus(page, test.args.value);
-        await expect(textResult).to.contains(searchPage.successfulUpdateStatusMessage);
+        expect(textResult).to.contains(searchPage.successfulUpdateStatusMessage);
 
         const numberOfElementInGrid = await searchPage.getNumberOfElementInGrid(page);
 
         for (let i = 1; i <= numberOfElementInGrid; i++) {
           const textColumn = await searchPage.getStatus(page, i);
-          await expect(textColumn).to.equal(test.args.value);
+          expect(textColumn).to.equal(test.args.value);
         }
       });
     });
@@ -131,17 +131,17 @@ describe('BO - Shop Parameters - Search : Enable/Disable and delete by bulk acti
       await searchPage.filterTable(page, 'input', 'alias', 'todelete');
 
       const textAlias = await searchPage.getTextColumn(page, 1, 'alias');
-      await expect(textAlias).to.contains('todelete');
+      expect(textAlias).to.contains('todelete');
     });
 
     it('should delete aliases', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteAliases', baseContext);
 
       const textResult = await searchPage.bulkDeleteAliases(page);
-      await expect(textResult).to.contains(searchPage.successfulMultiDeleteMessage);
+      expect(textResult).to.contains(searchPage.successfulMultiDeleteMessage);
 
       const numberOfSearchAfterDelete = await searchPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfSearchAfterDelete).to.be.equal(numberOfSearch);
+      expect(numberOfSearchAfterDelete).to.be.equal(numberOfSearch);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/07_search/01_search/03_quickEditStatus.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/07_search/01_search/03_quickEditStatus.ts
index 2335df9fecbcf..39fe0419db7c3 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/07_search/01_search/03_quickEditStatus.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/07_search/01_search/03_quickEditStatus.ts
@@ -49,14 +49,14 @@ describe('BO - Shop Parameters - Search : Quick edit status', async () => {
     );
 
     const pageTitle = await searchPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(searchPage.pageTitle);
+    expect(pageTitle).to.contains(searchPage.pageTitle);
   });
 
   it('should reset all filters and get number of aliases in BO', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfSearch = await searchPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfSearch).to.be.above(0);
+    expect(numberOfSearch).to.be.above(0);
   });
 
   it('should filter list by name', async function () {
@@ -66,7 +66,7 @@ describe('BO - Shop Parameters - Search : Quick edit status', async () => {
     await searchPage.filterTable(page, 'input', 'alias', Aliases.bloose.alias);
 
     const textAlias = await searchPage.getTextColumn(page, 1, 'alias');
-    await expect(textAlias).to.contains(Aliases.bloose.alias);
+    expect(textAlias).to.contains(Aliases.bloose.alias);
   });
 
   const statuses = [
@@ -82,11 +82,11 @@ describe('BO - Shop Parameters - Search : Quick edit status', async () => {
 
       if (isActionPerformed) {
         const resultMessage = await searchPage.getAlertSuccessBlockContent(page);
-        await expect(resultMessage).to.contains(searchPage.successfulUpdateStatusMessage);
+        expect(resultMessage).to.contains(searchPage.successfulUpdateStatusMessage);
       }
 
       const currentStatus = await searchPage.getStatus(page, 1);
-      await expect(currentStatus).to.be.equal(aliasStatus.args.enable);
+      expect(currentStatus).to.be.equal(aliasStatus.args.enable);
     });
   });
 
@@ -94,6 +94,6 @@ describe('BO - Shop Parameters - Search : Quick edit status', async () => {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilter', baseContext);
 
     const numberOfSearchAfterReset = await searchPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfSearchAfterReset).to.be.equal(numberOfSearch);
+    expect(numberOfSearchAfterReset).to.be.equal(numberOfSearch);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/07_search/02_tags/01_CRUDTag.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/07_search/02_tags/01_CRUDTag.ts
index a7a75753f3694..141e69d365aa4 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/07_search/02_tags/01_CRUDTag.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/07_search/02_tags/01_CRUDTag.ts
@@ -57,7 +57,7 @@ describe('BO - Shop Parameters - Search : Create, update and delete tag in BO',
     );
 
     const pageTitle = await searchPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(searchPage.pageTitle);
+    expect(pageTitle).to.contains(searchPage.pageTitle);
   });
 
   it('should go to \'Tags\' page', async function () {
@@ -67,7 +67,7 @@ describe('BO - Shop Parameters - Search : Create, update and delete tag in BO',
     numberOfTags = await tagsPage.getNumberOfElementInGrid(page);
 
     const pageTitle = await tagsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(tagsPage.pageTitle);
+    expect(pageTitle).to.contains(tagsPage.pageTitle);
   });
 
   // 1 - Create tag
@@ -78,17 +78,17 @@ describe('BO - Shop Parameters - Search : Create, update and delete tag in BO',
       await tagsPage.goToAddNewTagPage(page);
 
       const pageTitle = await addTagPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addTagPage.pageTitleCreate);
+      expect(pageTitle).to.contains(addTagPage.pageTitleCreate);
     });
 
     it('should create tag and check result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createTag', baseContext);
 
       const textResult = await addTagPage.setTag(page, createTagData);
-      await expect(textResult).to.contains(tagsPage.successfulCreationMessage);
+      expect(textResult).to.contains(tagsPage.successfulCreationMessage);
 
       const numberOfElementAfterCreation = await tagsPage.getNumberOfElementInGrid(page);
-      await expect(numberOfElementAfterCreation).to.be.equal(numberOfTags + 1);
+      expect(numberOfElementAfterCreation).to.be.equal(numberOfTags + 1);
     });
   });
 
@@ -100,17 +100,17 @@ describe('BO - Shop Parameters - Search : Create, update and delete tag in BO',
       await tagsPage.gotoEditTagPage(page, 1);
 
       const pageTitle = await addTagPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addTagPage.pageTitleEdit);
+      expect(pageTitle).to.contains(addTagPage.pageTitleEdit);
     });
 
     it('should update tag', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateTag', baseContext);
 
       const textResult = await addTagPage.setTag(page, editTagData);
-      await expect(textResult).to.contains(tagsPage.successfulUpdateMessage);
+      expect(textResult).to.contains(tagsPage.successfulUpdateMessage);
 
       const numberOfTagsAfterUpdate = await tagsPage.getNumberOfElementInGrid(page);
-      await expect(numberOfTagsAfterUpdate).to.be.equal(numberOfTags + 1);
+      expect(numberOfTagsAfterUpdate).to.be.equal(numberOfTags + 1);
     });
   });
 
@@ -120,10 +120,10 @@ describe('BO - Shop Parameters - Search : Create, update and delete tag in BO',
       await testContext.addContextItem(this, 'testIdentifier', 'deleteTag', baseContext);
 
       const textResult = await tagsPage.deleteTag(page, 1);
-      await expect(textResult).to.contains(tagsPage.successfulDeleteMessage);
+      expect(textResult).to.contains(tagsPage.successfulDeleteMessage);
 
       const numberOfTagsAfterDelete = await tagsPage.getNumberOfElementInGrid(page);
-      await expect(numberOfTagsAfterDelete).to.be.equal(numberOfTags);
+      expect(numberOfTagsAfterDelete).to.be.equal(numberOfTags);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/13_shopParameters/07_search/02_tags/02_filterSortAndPagination.ts b/tests/UI/campaigns/functional/BO/13_shopParameters/07_search/02_tags/02_filterSortAndPagination.ts
index e9ecc2b8be8be..e4dce35097868 100644
--- a/tests/UI/campaigns/functional/BO/13_shopParameters/07_search/02_tags/02_filterSortAndPagination.ts
+++ b/tests/UI/campaigns/functional/BO/13_shopParameters/07_search/02_tags/02_filterSortAndPagination.ts
@@ -57,7 +57,7 @@ describe('BO - Shop Parameters - Search : Filter, sort and pagination tag in BO'
     );
 
     const pageTitle = await searchPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(searchPage.pageTitle);
+    expect(pageTitle).to.contains(searchPage.pageTitle);
   });
 
   it('should go to \'Tags\' page', async function () {
@@ -67,7 +67,7 @@ describe('BO - Shop Parameters - Search : Filter, sort and pagination tag in BO'
     numberOfTags = await tagsPage.getNumberOfElementInGrid(page);
 
     const pageTitle = await tagsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(tagsPage.pageTitle);
+    expect(pageTitle).to.contains(tagsPage.pageTitle);
   });
 
   // 1 - Create tag
@@ -83,17 +83,17 @@ describe('BO - Shop Parameters - Search : Filter, sort and pagination tag in BO'
         await tagsPage.goToAddNewTagPage(page);
 
         const pageTitle = await addTagPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addTagPage.pageTitleCreate);
+        expect(pageTitle).to.contains(addTagPage.pageTitleCreate);
       });
 
       it(`should create tag n° ${index + 1} and check result`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `createTag${index}`, baseContext);
 
         const textResult = await addTagPage.setTag(page, tagData);
-        await expect(textResult).to.contains(tagsPage.successfulCreationMessage);
+        expect(textResult).to.contains(tagsPage.successfulCreationMessage);
 
         const numberOfElementAfterCreation = await tagsPage.getNumberOfElementInGrid(page);
-        await expect(numberOfElementAfterCreation).to.be.equal(numberOfTags + 1 + index);
+        expect(numberOfElementAfterCreation).to.be.equal(numberOfTags + 1 + index);
       });
     });
   });
@@ -114,11 +114,11 @@ describe('BO - Shop Parameters - Search : Filter, sort and pagination tag in BO'
         await tagsPage.filterTable(page, test.args.filterBy, test.args.filterValue);
 
         const numberOfLinesAfterFilter = await tagsPage.getNumberOfElementInGrid(page);
-        await expect(numberOfLinesAfterFilter).to.be.at.most(numberOfTags + 21);
+        expect(numberOfLinesAfterFilter).to.be.at.most(numberOfTags + 21);
 
         for (let row = 1; row <= numberOfLinesAfterFilter; row++) {
           const textColumn = await tagsPage.getTextColumn(page, row, test.args.filterBy);
-          await expect(textColumn).to.contains(test.args.filterValue);
+          expect(textColumn).to.contains(test.args.filterValue);
         }
       });
 
@@ -126,7 +126,7 @@ describe('BO - Shop Parameters - Search : Filter, sort and pagination tag in BO'
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}Reset`, baseContext);
 
         const numberOfLinesAfterReset = await tagsPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfLinesAfterReset).to.equal(numberOfTags + 21);
+        expect(numberOfLinesAfterReset).to.equal(numberOfTags + 21);
       });
     });
   });
@@ -193,17 +193,17 @@ describe('BO - Shop Parameters - Search : Filter, sort and pagination tag in BO'
           const expectedResult: number[] = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
           if (test.args.sortDirection === 'up') {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+            expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+            expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
         } else {
           const expectedResult = await basicHelper.sortArray(nonSortedTable);
 
           if (test.args.sortDirection === 'up') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         }
       });
@@ -252,7 +252,7 @@ describe('BO - Shop Parameters - Search : Filter, sort and pagination tag in BO'
 
       for (let i = 1; i <= numberOfLinesAfterFilter; i++) {
         const textColumn = await tagsPage.getTextColumn(page, i, 'a!name');
-        await expect(textColumn).to.contains('todelete');
+        expect(textColumn).to.contains('todelete');
       }
     });
 
@@ -260,7 +260,7 @@ describe('BO - Shop Parameters - Search : Filter, sort and pagination tag in BO'
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteTags', baseContext);
 
       const deleteTextResult = await tagsPage.bulkDelete(page);
-      await expect(deleteTextResult).to.be.contains(tagsPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.contains(tagsPage.successfulMultiDeleteMessage);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/02_performance/02_debugMode.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/02_performance/02_debugMode.ts
index 4075fbf7a3274..c6c15818f9f9e 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/02_performance/02_debugMode.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/02_performance/02_debugMode.ts
@@ -46,7 +46,7 @@ describe('BO - Advanced Parameters - Performance : Enable/Disable debug mode', a
     );
 
     const pageTitle = await performancePage.getPageTitle(page);
-    await expect(pageTitle).to.contains(performancePage.pageTitle);
+    expect(pageTitle).to.contains(performancePage.pageTitle);
   });
 
   const tests = [
@@ -59,14 +59,14 @@ describe('BO - Advanced Parameters - Performance : Enable/Disable debug mode', a
       await testContext.addContextItem(this, 'testIdentifier', `${test.args.action}DebugMode`, baseContext);
 
       const result = await performancePage.setDebugMode(page, test.args.exist);
-      await expect(result).to.contains(performancePage.successUpdateMessage);
+      expect(result).to.contains(performancePage.successUpdateMessage);
     });
 
     it('should check the debug toolbar', async function () {
       await testContext.addContextItem(this, 'testIdentifier', `checkDebugMode${index}`, baseContext);
 
       const isVisible = await performancePage.isDebugModeToggleVisible(page);
-      await expect(isVisible).to.eq(test.args.exist);
+      expect(isVisible).to.eq(test.args.exist);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/03_administration/01_general.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/03_administration/01_general.ts
index 65c6e1db93880..4504818a9255a 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/03_administration/01_general.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/03_administration/01_general.ts
@@ -58,7 +58,7 @@ describe('BO - Advanced Parameters - Administration : Check general options', as
     await testContext.addContextItem(this, 'testIdentifier', 'checkThatCookieIpAddressDisabled', baseContext);
 
     const isEnabled = await administrationPage.isCheckCookiesAddressEnabled(page);
-    await expect(isEnabled).to.be.false;
+    expect(isEnabled).to.eq(false);
   });
 
   it('should enable \'Cookie\'s IP address\'', async function () {
@@ -74,7 +74,7 @@ describe('BO - Advanced Parameters - Administration : Check general options', as
     await testContext.addContextItem(this, 'testIdentifier', 'checkThatCookieIpAddressEnabled', baseContext);
 
     const isEnabled = await administrationPage.isCheckCookiesAddressEnabled(page);
-    await expect(isEnabled).to.be.true;
+    expect(isEnabled).to.eq(true);
   });
 
   it('should update \'Lifetime of front office cookies\'', async function () {
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/04_email/01_filterDeleteAndBulkActionsEmails.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/04_email/01_filterDeleteAndBulkActionsEmails.ts
index d59529a7e8c3e..601c7b24f8c0f 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/04_email/01_filterDeleteAndBulkActionsEmails.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/04_email/01_filterDeleteAndBulkActionsEmails.ts
@@ -66,7 +66,7 @@ describe('BO - Advanced Parameters - Email : Filter, delete and bulk delete emai
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should add the first product to the cart', async function () {
@@ -79,7 +79,7 @@ describe('BO - Advanced Parameters - Email : Filter, delete and bulk delete emai
       await productPage.addProductToTheCart(page);
 
       const pageTitle = await cartPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(cartPage.pageTitle);
+      expect(pageTitle).to.contains(cartPage.pageTitle);
     });
 
     it('should proceed to checkout and sign in', async function () {
@@ -98,7 +98,7 @@ describe('BO - Advanced Parameters - Email : Filter, delete and bulk delete emai
 
       // Address step - Go to delivery step
       const isStepAddressComplete = await checkoutPage.goToDeliveryStep(page);
-      await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
     });
 
     it('should go to payment step', async function () {
@@ -106,7 +106,7 @@ describe('BO - Advanced Parameters - Email : Filter, delete and bulk delete emai
 
       // Delivery step - Go to payment step
       const isStepDeliveryComplete = await checkoutPage.goToPaymentStep(page);
-      await expect(isStepDeliveryComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepDeliveryComplete, 'Step Address is not complete').to.eq(true);
     });
 
     it('should pay the order', async function () {
@@ -117,7 +117,7 @@ describe('BO - Advanced Parameters - Email : Filter, delete and bulk delete emai
 
       // Check the confirmation message
       const cardTitle = await orderConfirmationPage.getOrderConfirmationCardTitle(page);
-      await expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
+      expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
     });
 
     it('should logout from FO', async function () {
@@ -127,7 +127,7 @@ describe('BO - Advanced Parameters - Email : Filter, delete and bulk delete emai
       await orderConfirmationPage.logout(page);
 
       const isCustomerConnected = await orderConfirmationPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.false;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(false);
     });
 
     it('should go back to BO', async function () {
@@ -137,7 +137,7 @@ describe('BO - Advanced Parameters - Email : Filter, delete and bulk delete emai
       page = await orderConfirmationPage.closePage(browserContext, page, 0);
 
       const pageTitle = await dashboardPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(dashboardPage.pageTitle);
+      expect(pageTitle).to.contains(dashboardPage.pageTitle);
     });
   });
 
@@ -152,14 +152,14 @@ describe('BO - Advanced Parameters - Email : Filter, delete and bulk delete emai
       );
 
       const pageTitle = await emailPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(emailPage.pageTitle);
+      expect(pageTitle).to.contains(emailPage.pageTitle);
     });
 
     it('should reset all filters and get number of email logs', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFiltersFirst', baseContext);
 
       numberOfEmails = await emailPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfEmails).to.be.above(0);
+      expect(numberOfEmails).to.be.above(0);
     });
     const tests = [
       {
@@ -221,11 +221,11 @@ describe('BO - Advanced Parameters - Email : Filter, delete and bulk delete emai
         );
 
         const numberOfEmailsAfterFilter = await emailPage.getNumberOfElementInGrid(page);
-        await expect(numberOfEmailsAfterFilter).to.be.at.most(numberOfEmails);
+        expect(numberOfEmailsAfterFilter).to.be.at.most(numberOfEmails);
 
         for (let row = 1; row <= numberOfEmailsAfterFilter; row++) {
           const textColumn = await emailPage.getTextColumn(page, test.args.filterBy, row);
-          await expect(textColumn).to.contains(test.args.filterValue);
+          expect(textColumn).to.contains(test.args.filterValue);
         }
       });
 
@@ -233,7 +233,7 @@ describe('BO - Advanced Parameters - Email : Filter, delete and bulk delete emai
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.identifier}Reset`, baseContext);
 
         const numberOfEmailsAfterReset = await emailPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfEmailsAfterReset).to.be.equal(numberOfEmails);
+        expect(numberOfEmailsAfterReset).to.be.equal(numberOfEmails);
       });
     });
 
@@ -243,11 +243,11 @@ describe('BO - Advanced Parameters - Email : Filter, delete and bulk delete emai
       await emailPage.filterEmailLogsByDate(page, today, today);
 
       const numberOfEmailsAfterFilter = await emailPage.getNumberOfElementInGrid(page);
-      await expect(numberOfEmailsAfterFilter).to.be.at.most(numberOfEmails);
+      expect(numberOfEmailsAfterFilter).to.be.at.most(numberOfEmails);
 
       for (let row = 1; row <= numberOfEmailsAfterFilter; row++) {
         const textColumn = await emailPage.getTextColumn(page, 'date_add', row);
-        await expect(textColumn).to.contains(today);
+        expect(textColumn).to.contains(today);
       }
     });
 
@@ -255,7 +255,7 @@ describe('BO - Advanced Parameters - Email : Filter, delete and bulk delete emai
       await testContext.addContextItem(this, 'testIdentifier', 'dateSentReset', baseContext);
 
       const numberOfEmailsAfterReset = await emailPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfEmailsAfterReset).to.be.equal(numberOfEmails);
+      expect(numberOfEmailsAfterReset).to.be.equal(numberOfEmails);
     });
   });
 
@@ -266,21 +266,21 @@ describe('BO - Advanced Parameters - Email : Filter, delete and bulk delete emai
       await emailPage.filterEmailLogs(page, 'input', 'subject', PaymentMethods.wirePayment.name);
 
       const numberOfEmailsAfterFilter = await emailPage.getNumberOfElementInGrid(page);
-      await expect(numberOfEmailsAfterFilter).to.be.at.most(numberOfEmails);
+      expect(numberOfEmailsAfterFilter).to.be.at.most(numberOfEmails);
     });
 
     it('should delete email', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteEmail', baseContext);
 
       const textResult = await emailPage.deleteEmailLog(page, 1);
-      await expect(textResult).to.equal(emailPage.successfulMultiDeleteMessage);
+      expect(textResult).to.equal(emailPage.successfulMultiDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDelete', baseContext);
 
       const numberOfEmailsAfterReset = await emailPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfEmailsAfterReset).to.be.equal(numberOfEmails - 1);
+      expect(numberOfEmailsAfterReset).to.be.equal(numberOfEmails - 1);
     });
   });
 
@@ -289,7 +289,7 @@ describe('BO - Advanced Parameters - Email : Filter, delete and bulk delete emai
       await testContext.addContextItem(this, 'testIdentifier', 'BulkDelete', baseContext);
 
       const deleteTextResult = await emailPage.deleteEmailLogsBulkActions(page);
-      await expect(deleteTextResult).to.be.equal(emailPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.equal(emailPage.successfulMultiDeleteMessage);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/04_email/02_enableDisableLogEmails.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/04_email/02_enableDisableLogEmails.ts
index 951b708b3ee7e..7a1cc8800af46 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/04_email/02_enableDisableLogEmails.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/04_email/02_enableDisableLogEmails.ts
@@ -46,7 +46,7 @@ describe('BO - Advanced Parameters - E-mail : Enable/Disable log emails', async
     );
 
     const pageTitle = await emailPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(emailPage.pageTitle);
+    expect(pageTitle).to.contains(emailPage.pageTitle);
   });
 
   const tests = [
@@ -59,14 +59,14 @@ describe('BO - Advanced Parameters - E-mail : Enable/Disable log emails', async
       await testContext.addContextItem(this, 'testIdentifier', `${test.args.action}LogEmails`, baseContext);
 
       const result = await emailPage.setLogEmails(page, test.args.exist);
-      await expect(result).to.contains(emailPage.successfulUpdateMessage);
+      expect(result).to.contains(emailPage.successfulUpdateMessage);
     });
 
     it('should check the existence of E-mail table', async function () {
       await testContext.addContextItem(this, 'testIdentifier', `checkEmailTable${index}`, baseContext);
 
       const isVisible = await emailPage.isLogEmailsTableVisible(page);
-      await expect(isVisible).to.equal(test.args.exist);
+      expect(isVisible).to.equal(test.args.exist);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/04_email/03_sendTestEmail/01_sendTestEmail.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/04_email/03_sendTestEmail/01_sendTestEmail.ts
index 8e66446b5e003..0765f19f0df37 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/04_email/03_sendTestEmail/01_sendTestEmail.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/04_email/03_sendTestEmail/01_sendTestEmail.ts
@@ -45,13 +45,13 @@ describe('BO - Advanced Parameters - Email : Send test email', async () => {
     );
 
     const pageTitle = await emailPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(emailPage.pageTitle);
+    expect(pageTitle).to.contains(emailPage.pageTitle);
   });
 
   it('should check successful message after sending test email', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'sendTestEmail', baseContext);
 
     const textResult = await emailPage.sendTestEmail(page, global.BO.EMAIL);
-    await expect(textResult).to.contains(emailPage.sendTestEmailSuccessfulMessage);
+    expect(textResult).to.contains(emailPage.sendTestEmailSuccessfulMessage);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/04_email/03_sortAndPagination.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/04_email/03_sortAndPagination.ts
index ae774195a80dd..b842568a56f33 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/04_email/03_sortAndPagination.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/04_email/03_sortAndPagination.ts
@@ -66,17 +66,17 @@ describe('BO - Advanced Parameters - E-mail : Sort and pagination emails', async
       await dashboardPage.closeSfToolBar(page);
 
       const pageTitle = await emailPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(emailPage.pageTitle);
+      expect(pageTitle).to.contains(emailPage.pageTitle);
     });
 
     it('should erase all emails', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'eraseEmails', baseContext);
 
       const textResult = await emailPage.eraseAllEmails(page);
-      await expect(textResult).to.equal(emailPage.successfulDeleteMessage);
+      expect(textResult).to.equal(emailPage.successfulDeleteMessage);
 
       const numberOfLines = await emailPage.getNumberOfElementInGrid(page);
-      await expect(numberOfLines).to.be.equal(0);
+      expect(numberOfLines).to.be.equal(0);
     });
   });
 
@@ -92,7 +92,7 @@ describe('BO - Advanced Parameters - E-mail : Sort and pagination emails', async
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should go to login page', async function () {
@@ -101,7 +101,7 @@ describe('BO - Advanced Parameters - E-mail : Sort and pagination emails', async
       await homePage.goToLoginPage(page);
 
       const pageTitle = await foLoginPage.getPageTitle(page);
-      await expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
+      expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
     });
 
     it('should sign in with default customer', async function () {
@@ -110,7 +110,7 @@ describe('BO - Advanced Parameters - E-mail : Sort and pagination emails', async
       await foLoginPage.customerLogin(page, Customers.johnDoe);
 
       const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
 
     const tests: number[] = new Array(6).fill(0, 0, 6);
@@ -133,18 +133,18 @@ describe('BO - Advanced Parameters - E-mail : Sort and pagination emails', async
 
         // Address step - Go to delivery step
         const isStepAddressComplete = await checkoutPage.goToDeliveryStep(page);
-        await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+        expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
 
         // Delivery step - Go to payment step
         const isStepDeliveryComplete = await checkoutPage.goToPaymentStep(page);
-        await expect(isStepDeliveryComplete, 'Step Address is not complete').to.be.true;
+        expect(isStepDeliveryComplete, 'Step Address is not complete').to.eq(true);
 
         // Payment step - Choose payment step
         await checkoutPage.choosePaymentAndOrder(page, PaymentMethods.wirePayment.moduleName);
 
         // Check the confirmation message
         const cardTitle = await orderConfirmationPage.getOrderConfirmationCardTitle(page);
-        await expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
+        expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
       });
     });
 
@@ -153,7 +153,7 @@ describe('BO - Advanced Parameters - E-mail : Sort and pagination emails', async
 
       await orderConfirmationPage.logout(page);
       const isCustomerConnected = await orderConfirmationPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is connected').to.be.false;
+      expect(isCustomerConnected, 'Customer is connected').to.eq(false);
     });
 
     it('should go back to BO', async function () {
@@ -163,7 +163,7 @@ describe('BO - Advanced Parameters - E-mail : Sort and pagination emails', async
       page = await orderConfirmationPage.closePage(browserContext, page, 0);
 
       const pageTitle = await emailPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(emailPage.pageTitle);
+      expect(pageTitle).to.contains(emailPage.pageTitle);
     });
   });
 
@@ -175,7 +175,7 @@ describe('BO - Advanced Parameters - E-mail : Sort and pagination emails', async
       await emailPage.reloadPage(page);
 
       const pageTitle = await emailPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(emailPage.pageTitle);
+      expect(pageTitle).to.contains(emailPage.pageTitle);
     });
 
     it('should change the items number to 10 per page', async function () {
@@ -300,25 +300,25 @@ describe('BO - Advanced Parameters - E-mail : Sort and pagination emails', async
           const expectedResult = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+            expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+            expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
         } else if (test.args.isDate) {
           const expectedResult = await basicHelper.sortArrayDate(nonSortedTable);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         } else {
           const expectedResult = await basicHelper.sortArray(nonSortedTable);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         }
       });
@@ -331,7 +331,7 @@ describe('BO - Advanced Parameters - E-mail : Sort and pagination emails', async
       await testContext.addContextItem(this, 'testIdentifier', 'BulkDelete', baseContext);
 
       const deleteTextResult = await emailPage.deleteEmailLogsBulkActions(page);
-      await expect(deleteTextResult).to.be.equal(emailPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.equal(emailPage.successfulMultiDeleteMessage);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/05_import/01_downloadSampleFiles.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/05_import/01_downloadSampleFiles.ts
index 919884c1690ad..2d41b3b0801c5 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/05_import/01_downloadSampleFiles.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/05_import/01_downloadSampleFiles.ts
@@ -45,7 +45,7 @@ describe('BO - Advanced Parameters - Import : Download sample csv files', async
     await importPage.closeSfToolBar(page);
 
     const pageTitle = await importPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(importPage.pageTitle);
+    expect(pageTitle).to.contains(importPage.pageTitle);
   });
 
   const sampleFiles = [
@@ -136,14 +136,14 @@ describe('BO - Advanced Parameters - Import : Download sample csv files', async
         filePath = await importPage.downloadSampleFile(page, sampleFile.args.type);
 
         const doesFileExist = await files.doesFileExist(filePath);
-        await expect(doesFileExist, `${sampleFile.args.type} sample file was not downloaded`).to.be.true;
+        expect(doesFileExist, `${sampleFile.args.type} sample file was not downloaded`).to.eq(true);
       });
 
       it(`should check ${sampleFile.args.type} sample text file`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `${sampleFile.args.type}checkTextFile`, baseContext);
 
         const textExist = await files.isTextInFile(filePath, sampleFile.args.textToCheck);
-        await expect(textExist, `Text was not found in ${sampleFile.args.type} sample file`).to.be.true;
+        expect(textExist, `Text was not found in ${sampleFile.args.type} sample file`).to.eq(true);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/employees/01_filterAndQuickEditEmployees.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/employees/01_filterAndQuickEditEmployees.ts
index e282216e017e1..cb890c0f5e57c 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/employees/01_filterAndQuickEditEmployees.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/employees/01_filterAndQuickEditEmployees.ts
@@ -57,14 +57,14 @@ describe('BO - Advanced Parameters - Team : Filter and quick edit Employees', as
     await employeesPage.closeSfToolBar(page);
 
     const pageTitle = await employeesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(employeesPage.pageTitle);
+    expect(pageTitle).to.contains(employeesPage.pageTitle);
   });
 
   it('should reset all filters and get number of employees', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfEmployees = await employeesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfEmployees).to.be.above(0);
+    expect(numberOfEmployees).to.be.above(0);
   });
 
   // PRE-TEST : Create employee and Filter with all inputs and selects in grid table in BO
@@ -75,17 +75,17 @@ describe('BO - Advanced Parameters - Team : Filter and quick edit Employees', as
       await employeesPage.goToAddNewEmployeePage(page);
 
       const pageTitle = await addEmployeePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addEmployeePage.pageTitleCreate);
+      expect(pageTitle).to.contains(addEmployeePage.pageTitleCreate);
     });
 
     it('should create employee', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createEmployee', baseContext);
 
       const textResult = await addEmployeePage.createEditEmployee(page, createEmployeeData);
-      await expect(textResult).to.equal(employeesPage.successfulCreationMessage);
+      expect(textResult).to.equal(employeesPage.successfulCreationMessage);
 
       const numberOfEmployeesAfterCreation = await employeesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfEmployeesAfterCreation).to.be.equal(numberOfEmployees + 1);
+      expect(numberOfEmployeesAfterCreation).to.be.equal(numberOfEmployees + 1);
     });
   });
 
@@ -149,15 +149,15 @@ describe('BO - Advanced Parameters - Team : Filter and quick edit Employees', as
         );
 
         const numberOfEmployeesAfterFilter = await employeesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfEmployeesAfterFilter).to.be.at.most(numberOfEmployees);
+        expect(numberOfEmployeesAfterFilter).to.be.at.most(numberOfEmployees);
 
         for (let i = 1; i <= numberOfEmployeesAfterFilter; i++) {
           if (test.args.filterBy === 'active') {
             const employeeStatus = await employeesPage.getStatus(page, i);
-            await expect(employeeStatus).to.equal(test.args.filterValue === '1');
+            expect(employeeStatus).to.equal(test.args.filterValue === '1');
           } else {
             const textColumn = await employeesPage.getTextColumnFromTable(page, i, test.args.filterBy);
-            await expect(textColumn).to.contains(test.args.filterValue);
+            expect(textColumn).to.contains(test.args.filterValue);
           }
         }
       });
@@ -166,7 +166,7 @@ describe('BO - Advanced Parameters - Team : Filter and quick edit Employees', as
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}Reset`, baseContext);
 
         const numberOfEmployeesAfterCreation = await employeesPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfEmployeesAfterCreation).to.be.above(numberOfEmployees);
+        expect(numberOfEmployeesAfterCreation).to.be.above(numberOfEmployees);
       });
     });
   });
@@ -179,11 +179,11 @@ describe('BO - Advanced Parameters - Team : Filter and quick edit Employees', as
       await employeesPage.filterEmployees(page, 'input', 'email', createEmployeeData.email);
 
       const numberOfEmployeesAfterFilter = await employeesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfEmployeesAfterFilter).to.be.at.most(numberOfEmployees);
+      expect(numberOfEmployeesAfterFilter).to.be.at.most(numberOfEmployees);
 
       for (let i = 1; i <= numberOfEmployeesAfterFilter; i++) {
         const textColumn = await employeesPage.getTextColumnFromTable(page, i, 'email');
-        await expect(textColumn).to.contains(createEmployeeData.email);
+        expect(textColumn).to.contains(createEmployeeData.email);
       }
     });
 
@@ -207,11 +207,11 @@ describe('BO - Advanced Parameters - Team : Filter and quick edit Employees', as
 
         if (isActionPerformed) {
           const resultMessage = await employeesPage.getAlertSuccessBlockParagraphContent(page);
-          await expect(resultMessage).to.contains(employeesPage.successfulUpdateStatusMessage);
+          expect(resultMessage).to.contains(employeesPage.successfulUpdateStatusMessage);
         }
 
         const currentStatus = await employeesPage.getStatus(page, 1);
-        await expect(currentStatus).to.be.equal(employeeStatus.args.enable);
+        expect(currentStatus).to.be.equal(employeeStatus.args.enable);
       });
     });
   });
@@ -224,21 +224,21 @@ describe('BO - Advanced Parameters - Team : Filter and quick edit Employees', as
       await employeesPage.filterEmployees(page, 'input', 'email', createEmployeeData.email);
 
       const textEmail = await employeesPage.getTextColumnFromTable(page, 1, 'email');
-      await expect(textEmail).to.contains(createEmployeeData.email);
+      expect(textEmail).to.contains(createEmployeeData.email);
     });
 
     it('should delete employee', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteEmployee', baseContext);
 
       const textResult = await employeesPage.deleteEmployee(page, 1);
-      await expect(textResult).to.equal(employeesPage.successfulDeleteMessage);
+      expect(textResult).to.equal(employeesPage.successfulDeleteMessage);
     });
 
     it('should reset filter and check the number of employees', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDelete', baseContext);
 
       const numberOfEmployeesAfterDelete = await employeesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfEmployeesAfterDelete).to.be.equal(numberOfEmployees);
+      expect(numberOfEmployeesAfterDelete).to.be.equal(numberOfEmployees);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/employees/02_CRUDEmployee.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/employees/02_CRUDEmployee.ts
index d110ee0a00bfc..fdcc3eab28f88 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/employees/02_CRUDEmployee.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/employees/02_CRUDEmployee.ts
@@ -69,14 +69,14 @@ describe('BO - Advanced Parameters - Team : CRUD Employee', async () => {
     await employeesPage.closeSfToolBar(page);
 
     const pageTitle = await employeesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(employeesPage.pageTitle);
+    expect(pageTitle).to.contains(employeesPage.pageTitle);
   });
 
   it('should reset all filters and get number of employees', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfEmployees = await employeesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfEmployees).to.be.above(0);
+    expect(numberOfEmployees).to.be.above(0);
   });
 
   // 1 : Create employee and go to BO to check sign in is OK
@@ -87,17 +87,17 @@ describe('BO - Advanced Parameters - Team : CRUD Employee', async () => {
       await employeesPage.goToAddNewEmployeePage(page);
 
       const pageTitle = await addEmployeePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addEmployeePage.pageTitleCreate);
+      expect(pageTitle).to.contains(addEmployeePage.pageTitleCreate);
     });
 
     it('should create employee and check result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createEmployee', baseContext);
 
       const textResult = await addEmployeePage.createEditEmployee(page, createEmployeeData);
-      await expect(textResult).to.equal(employeesPage.successfulCreationMessage);
+      expect(textResult).to.equal(employeesPage.successfulCreationMessage);
 
       const numberOfEmployeesAfterCreation = await employeesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfEmployeesAfterCreation).to.be.equal(numberOfEmployees + 1);
+      expect(numberOfEmployeesAfterCreation).to.be.equal(numberOfEmployees + 1);
     });
 
     it('should logout from BO', async function () {
@@ -110,7 +110,7 @@ describe('BO - Advanced Parameters - Team : CRUD Employee', async () => {
       await loginPage.successLogin(page, createEmployeeData.email, createEmployeeData.password);
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should logout from BO', async function () {
@@ -135,7 +135,7 @@ describe('BO - Advanced Parameters - Team : CRUD Employee', async () => {
         );
 
         const pageTitle = await employeesPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(employeesPage.pageTitle);
+        expect(pageTitle).to.contains(employeesPage.pageTitle);
       });
 
       it('should filter list by email', async function () {
@@ -144,7 +144,7 @@ describe('BO - Advanced Parameters - Team : CRUD Employee', async () => {
         await employeesPage.filterEmployees(page, 'input', 'email', createEmployeeData.email);
 
         const textEmail = await employeesPage.getTextColumnFromTable(page, 1, 'email');
-        await expect(textEmail).to.contains(createEmployeeData.email);
+        expect(textEmail).to.contains(createEmployeeData.email);
       });
 
       it('should go to edit employee page', async function () {
@@ -153,7 +153,7 @@ describe('BO - Advanced Parameters - Team : CRUD Employee', async () => {
         await employeesPage.goToEditEmployeePage(page, 1);
 
         const pageTitle = await addEmployeePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addEmployeePage.pageTitleEdit(
+        expect(pageTitle).to.contains(addEmployeePage.pageTitleEdit(
           createEmployeeData.lastName, createEmployeeData.firstName));
       });
 
@@ -161,7 +161,7 @@ describe('BO - Advanced Parameters - Team : CRUD Employee', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'updateEmployee', baseContext);
 
         const textResult = await addEmployeePage.createEditEmployee(page, firstEditEmployeeData);
-        await expect(textResult).to.equal(addEmployeePage.successfulUpdateMessage);
+        expect(textResult).to.equal(addEmployeePage.successfulUpdateMessage);
       });
 
       it('should click on cancel and verify the new employee\'s number', async function () {
@@ -170,7 +170,7 @@ describe('BO - Advanced Parameters - Team : CRUD Employee', async () => {
         await addEmployeePage.cancel(page);
 
         const numberOfEmployeesAfterUpdate = await employeesPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfEmployeesAfterUpdate).to.be.equal(numberOfEmployees + 1);
+        expect(numberOfEmployeesAfterUpdate).to.be.equal(numberOfEmployees + 1);
       });
 
       it('should logout from BO', async function () {
@@ -183,7 +183,7 @@ describe('BO - Advanced Parameters - Team : CRUD Employee', async () => {
         await loginPage.successLogin(page, firstEditEmployeeData.email, firstEditEmployeeData.password);
 
         const pageTitle = await ordersPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(ordersPage.pageTitle);
+        expect(pageTitle).to.contains(ordersPage.pageTitle);
       });
 
       it('should logout from BO', async function () {
@@ -206,7 +206,7 @@ describe('BO - Advanced Parameters - Team : CRUD Employee', async () => {
         );
 
         const pageTitle = await employeesPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(employeesPage.pageTitle);
+        expect(pageTitle).to.contains(employeesPage.pageTitle);
       });
 
       it('should filter list by email', async function () {
@@ -215,7 +215,7 @@ describe('BO - Advanced Parameters - Team : CRUD Employee', async () => {
         await employeesPage.filterEmployees(page, 'input', 'email', firstEditEmployeeData.email);
 
         const textEmail = await employeesPage.getTextColumnFromTable(page, 1, 'email');
-        await expect(textEmail).to.contains(firstEditEmployeeData.email);
+        expect(textEmail).to.contains(firstEditEmployeeData.email);
       });
 
       it('should go to edit employee page', async function () {
@@ -224,7 +224,7 @@ describe('BO - Advanced Parameters - Team : CRUD Employee', async () => {
         await employeesPage.goToEditEmployeePage(page, 1);
 
         const pageTitle = await addEmployeePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addEmployeePage.pageTitleEdit(
+        expect(pageTitle).to.contains(addEmployeePage.pageTitleEdit(
           firstEditEmployeeData.lastName, firstEditEmployeeData.firstName));
       });
 
@@ -232,7 +232,7 @@ describe('BO - Advanced Parameters - Team : CRUD Employee', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'disableEmployee', baseContext);
 
         const textResult = await addEmployeePage.createEditEmployee(page, secondEditEmployeeData);
-        await expect(textResult).to.equal(addEmployeePage.successfulUpdateMessage);
+        expect(textResult).to.equal(addEmployeePage.successfulUpdateMessage);
       });
 
       it('should logout from BO', async function () {
@@ -245,7 +245,7 @@ describe('BO - Advanced Parameters - Team : CRUD Employee', async () => {
         await loginPage.failedLogin(page, secondEditEmployeeData.email, secondEditEmployeeData.password);
 
         const loginError = await loginPage.getLoginError(page);
-        await expect(loginError).to.contains(loginPage.loginErrorText);
+        expect(loginError).to.contains(loginPage.loginErrorText);
       });
     });
   });
@@ -266,7 +266,7 @@ describe('BO - Advanced Parameters - Team : CRUD Employee', async () => {
       );
 
       const pageTitle = await employeesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(employeesPage.pageTitle);
+      expect(pageTitle).to.contains(employeesPage.pageTitle);
     });
 
     it('should filter list by email', async function () {
@@ -275,21 +275,21 @@ describe('BO - Advanced Parameters - Team : CRUD Employee', async () => {
       await employeesPage.filterEmployees(page, 'input', 'email', secondEditEmployeeData.email);
 
       const textEmail = await employeesPage.getTextColumnFromTable(page, 1, 'email');
-      await expect(textEmail).to.contains(secondEditEmployeeData.email);
+      expect(textEmail).to.contains(secondEditEmployeeData.email);
     });
 
     it('should delete employee', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteEmployee', baseContext);
 
       const textResult = await employeesPage.deleteEmployee(page, 1);
-      await expect(textResult).to.equal(employeesPage.successfulDeleteMessage);
+      expect(textResult).to.equal(employeesPage.successfulDeleteMessage);
     });
 
     it('should reset filter and check the number of employees', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDelete', baseContext);
 
       const numberOfEmployeesAfterDelete = await employeesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfEmployeesAfterDelete).to.be.equal(numberOfEmployees);
+      expect(numberOfEmployeesAfterDelete).to.be.equal(numberOfEmployees);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/employees/03_employeesBulkActions.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/employees/03_employeesBulkActions.ts
index b1cc8569e5685..dfaf4c17f5b52 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/employees/03_employeesBulkActions.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/employees/03_employeesBulkActions.ts
@@ -61,14 +61,14 @@ describe('BO - Advanced Parameters - Team : Create/Disable/Enable and bulk delet
     await employeesPage.closeSfToolBar(page);
 
     const pageTitle = await employeesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(employeesPage.pageTitle);
+    expect(pageTitle).to.contains(employeesPage.pageTitle);
   });
 
   it('should reset all filters and get number of employees', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfEmployees = await employeesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfEmployees).to.be.above(0);
+    expect(numberOfEmployees).to.be.above(0);
   });
 
   // 1 : Try to Enable/Disable the default employee with bulk actions
@@ -79,7 +79,7 @@ describe('BO - Advanced Parameters - Team : Create/Disable/Enable and bulk delet
       await employeesPage.filterEmployees(page, 'input', 'firstname', Employees.DefaultEmployee.firstName);
 
       const textColumn = await employeesPage.getTextColumnFromTable(page, 1, 'firstname');
-      await expect(textColumn).to.contains(Employees.DefaultEmployee.firstName);
+      expect(textColumn).to.contains(Employees.DefaultEmployee.firstName);
     });
 
     const statuses = [
@@ -91,7 +91,7 @@ describe('BO - Advanced Parameters - Team : Create/Disable/Enable and bulk delet
         await testContext.addContextItem(this, 'testIdentifier', `${employeeStatus.args.status}DefaultEmployee`, baseContext);
 
         const disableTextResult = await employeesPage.bulkSetStatus(page, employeeStatus.args.enable, false);
-        await expect(disableTextResult).to.be.equal(employeesPage.errorDeleteOwnAccountMessage);
+        expect(disableTextResult).to.be.equal(employeesPage.errorDeleteOwnAccountMessage);
       });
     });
   });
@@ -102,7 +102,7 @@ describe('BO - Advanced Parameters - Team : Create/Disable/Enable and bulk delet
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteDefaultEmployee', baseContext);
 
       const deleteTextResult = await employeesPage.deleteBulkActions(page, false);
-      await expect(deleteTextResult).to.be.equal(employeesPage.errorDeleteOwnAccountMessage);
+      expect(deleteTextResult).to.be.equal(employeesPage.errorDeleteOwnAccountMessage);
     });
   });
 
@@ -117,14 +117,14 @@ describe('BO - Advanced Parameters - Team : Create/Disable/Enable and bulk delet
         await employeesPage.goToAddNewEmployeePage(page);
 
         const pageTitle = await addEmployeePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addEmployeePage.pageTitleCreate);
+        expect(pageTitle).to.contains(addEmployeePage.pageTitleCreate);
       });
 
       it('should create employee', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `createEmployee${index + 1}`, baseContext);
 
         const textResult = await addEmployeePage.createEditEmployee(page, employeeToCreate);
-        await expect(textResult).to.equal(employeesPage.successfulCreationMessage);
+        expect(textResult).to.equal(employeesPage.successfulCreationMessage);
       });
     });
   });
@@ -137,11 +137,11 @@ describe('BO - Advanced Parameters - Team : Create/Disable/Enable and bulk delet
       await employeesPage.filterEmployees(page, 'input', 'firstname', firstEmployeeData.firstName);
 
       const numberOfEmployeesAfterFilter = await employeesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfEmployeesAfterFilter).to.be.at.most(numberOfEmployees + 2);
+      expect(numberOfEmployeesAfterFilter).to.be.at.most(numberOfEmployees + 2);
 
       for (let i = 1; i <= numberOfEmployeesAfterFilter; i++) {
         const textColumn = await employeesPage.getTextColumnFromTable(page, i, 'firstname');
-        await expect(textColumn).to.contains(firstEmployeeData.firstName);
+        expect(textColumn).to.contains(firstEmployeeData.firstName);
       }
     });
 
@@ -158,13 +158,13 @@ describe('BO - Advanced Parameters - Team : Create/Disable/Enable and bulk delet
           page,
           employeeStatus.args.enable,
         );
-        await expect(disableTextResult).to.be.equal(employeesPage.successfulUpdateStatusMessage);
+        expect(disableTextResult).to.be.equal(employeesPage.successfulUpdateStatusMessage);
 
         const numberOfEmployeesInGrid = await employeesPage.getNumberOfElementInGrid(page);
 
         for (let i = 1; i <= numberOfEmployeesInGrid; i++) {
           const textColumn = await employeesPage.getStatus(page, i);
-          await expect(textColumn).to.equal(employeeStatus.args.enable);
+          expect(textColumn).to.equal(employeeStatus.args.enable);
         }
       });
     });
@@ -176,14 +176,14 @@ describe('BO - Advanced Parameters - Team : Create/Disable/Enable and bulk delet
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteEmployee', baseContext);
 
       const deleteTextResult = await employeesPage.deleteBulkActions(page);
-      await expect(deleteTextResult).to.be.equal(employeesPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.equal(employeesPage.successfulMultiDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDelete', baseContext);
 
       const numberOfEmployeesAfterDelete = await employeesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfEmployeesAfterDelete).to.be.equal(numberOfEmployees);
+      expect(numberOfEmployeesAfterDelete).to.be.equal(numberOfEmployees);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/employees/04_helpCard.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/employees/04_helpCard.ts
index de3ef6cdb27ac..b899fbe2d9a9d 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/employees/04_helpCard.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/employees/04_helpCard.ts
@@ -44,23 +44,23 @@ describe('BO - Advanced Parameters - Team : Help card in Employee page', async (
     await employeesPage.closeSfToolBar(page);
 
     const pageTitle = await employeesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(employeesPage.pageTitle);
+    expect(pageTitle).to.contains(employeesPage.pageTitle);
   });
 
   it('should open the help side bar and check the document language', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'openHelpSidebar', baseContext);
 
     const isHelpSidebarVisible = await employeesPage.openHelpSideBar(page);
-    await expect(isHelpSidebarVisible).to.be.true;
+    expect(isHelpSidebarVisible).to.eq(true);
 
     const documentURL = await employeesPage.getHelpDocumentURL(page);
-    await expect(documentURL).to.contains('country=en');
+    expect(documentURL).to.contains('country=en');
   });
 
   it('should close the help side bar', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'closeHelpSidebar', baseContext);
 
     const isHelpSidebarNotVisible = await employeesPage.closeHelpSideBar(page);
-    await expect(isHelpSidebarNotVisible).to.be.true;
+    expect(isHelpSidebarNotVisible).to.eq(true);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/employees/05_sortAndPagination.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/employees/05_sortAndPagination.ts
index 2cc36b2f89e1e..c293e8701d880 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/employees/05_sortAndPagination.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/employees/05_sortAndPagination.ts
@@ -57,14 +57,14 @@ describe('BO - Advanced Parameters - Team : Sort and pagination employees', asyn
     await employeesPage.closeSfToolBar(page);
 
     const pageTitle = await employeesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(employeesPage.pageTitle);
+    expect(pageTitle).to.contains(employeesPage.pageTitle);
   });
 
   it('should reset all filters and get number of employees', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfEmployees = await employeesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfEmployees).to.be.above(0);
+    expect(numberOfEmployees).to.be.above(0);
   });
 
   // 1 : Create 10 employees
@@ -79,17 +79,17 @@ describe('BO - Advanced Parameters - Team : Sort and pagination employees', asyn
         await employeesPage.goToAddNewEmployeePage(page);
 
         const pageTitle = await addEmployeePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addEmployeePage.pageTitleCreate);
+        expect(pageTitle).to.contains(addEmployeePage.pageTitleCreate);
       });
 
       it(`should create employee n°${index + 1}`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `createEmployee${index + 1}`, baseContext);
 
         const textResult = await addEmployeePage.createEditEmployee(page, employeeToCreate);
-        await expect(textResult).to.equal(employeesPage.successfulCreationMessage);
+        expect(textResult).to.equal(employeesPage.successfulCreationMessage);
 
         const numberOfEmployeesAfterCreation = await employeesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfEmployeesAfterCreation).to.be.equal(numberOfEmployees + index + 1);
+        expect(numberOfEmployeesAfterCreation).to.be.equal(numberOfEmployees + index + 1);
       });
     });
   });
@@ -134,17 +134,17 @@ describe('BO - Advanced Parameters - Team : Sort and pagination employees', asyn
           const expectedResult = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+            expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+            expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
         } else {
           const expectedResult = await basicHelper.sortArray(nonSortedTable);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         }
       });
@@ -190,21 +190,21 @@ describe('BO - Advanced Parameters - Team : Sort and pagination employees', asyn
       await employeesPage.filterEmployees(page, 'input', 'email', employeeData.email);
 
       const textEmail = await employeesPage.getTextColumnFromTable(page, 1, 'email');
-      await expect(textEmail).to.contains(employeeData.email);
+      expect(textEmail).to.contains(employeeData.email);
     });
 
     it('should delete employees with Bulk Actions and check result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteEmployee', baseContext);
 
       const deleteTextResult = await employeesPage.deleteBulkActions(page);
-      await expect(deleteTextResult).to.be.equal(employeesPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.equal(employeesPage.successfulMultiDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDelete', baseContext);
 
       const numberOfEmployeesAfterDelete = await employeesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfEmployeesAfterDelete).to.be.equal(numberOfEmployees);
+      expect(numberOfEmployeesAfterDelete).to.be.equal(numberOfEmployees);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/permission/01_editMenu.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/permission/01_editMenu.ts
index 6955cba279922..f65dd0a02a06d 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/permission/01_editMenu.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/permission/01_editMenu.ts
@@ -45,21 +45,21 @@ describe('BO - Advanced Parameters - Team - Permission : Edit menu', async () =>
       await employeesPage.closeSfToolBar(page);
 
       const pageTitle = await employeesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(employeesPage.pageTitle);
+      expect(pageTitle).to.contains(employeesPage.pageTitle);
     });
 
     it('should go to \'Permissions\' tab', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'goToPermissionsTab', baseContext);
 
       const isTabOpened = await employeesPage.goToPermissionsTab(page);
-      await expect(isTabOpened, 'Permissions tab is not opened!').to.be.true;
+      expect(isTabOpened, 'Permissions tab is not opened!').to.eq(true);
     });
 
     it('should click on \'Logistician\' profile', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'goToProfileSubTab', baseContext);
 
       const isSubTabOpened = await permissionsPage.goToProfileSubTab(page, 'logistician');
-      await expect(isSubTabOpened, 'Profile sub-tab is not opened!').to.be.true;
+      expect(isSubTabOpened, 'Profile sub-tab is not opened!').to.eq(true);
     });
   });
 
@@ -68,7 +68,7 @@ describe('BO - Advanced Parameters - Team - Permission : Edit menu', async () =>
       await testContext.addContextItem(this, 'testIdentifier', 'checkAllCheckbox', baseContext);
 
       const isPermissionDefined = await permissionsPage.setPermissionOnAllPages(page, 'all');
-      await expect(isPermissionDefined, 'Permission is not updated').to.be.true;
+      expect(isPermissionDefined, 'Permission is not updated').to.eq(true);
     });
 
     [
@@ -81,7 +81,7 @@ describe('BO - Advanced Parameters - Team - Permission : Edit menu', async () =>
         await testContext.addContextItem(this, 'testIdentifier', `check_${test.args.action}1`, baseContext);
 
         const isBulkPermissionPerformed = await permissionsPage.isBulkPermissionPerformed(page, test.args.action);
-        await expect(isBulkPermissionPerformed).to.be.true;
+        expect(isBulkPermissionPerformed).to.eq(true);
       });
     });
   });
@@ -91,7 +91,7 @@ describe('BO - Advanced Parameters - Team - Permission : Edit menu', async () =>
       await testContext.addContextItem(this, 'testIdentifier', 'uncheckAllCheckbox', baseContext);
 
       const isPermissionDefined = await permissionsPage.setPermissionOnAllPages(page, 'all', false);
-      await expect(isPermissionDefined, 'Permission is not updated').to.be.true;
+      expect(isPermissionDefined, 'Permission is not updated').to.eq(true);
     });
 
     [
@@ -104,7 +104,7 @@ describe('BO - Advanced Parameters - Team - Permission : Edit menu', async () =>
         await testContext.addContextItem(this, 'testIdentifier', `unchecked_${test.args.action}1`, baseContext);
 
         const isBulkPermissionPerformed = await permissionsPage.isBulkPermissionPerformed(page, test.args.action, false);
-        await expect(isBulkPermissionPerformed).to.be.false;
+        expect(isBulkPermissionPerformed).to.eq(false);
       });
     });
   });
@@ -120,14 +120,14 @@ describe('BO - Advanced Parameters - Team - Permission : Edit menu', async () =>
         await testContext.addContextItem(this, 'testIdentifier', `checkAllCheckbox_${index}`, baseContext);
 
         const isPermissionDefined = await permissionsPage.setPermissionOnAllPages(page, test.args.action);
-        await expect(isPermissionDefined, 'Permission is not updated').to.be.true;
+        expect(isPermissionDefined, 'Permission is not updated').to.eq(true);
       });
 
       it(`should check that everything in '${test.args.action}' permission is checked`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `checkAllCheckboxForpermission${index}`, baseContext);
 
         const isBulkPermissionPerformed = await permissionsPage.isBulkPermissionPerformed(page, test.args.action);
-        await expect(isBulkPermissionPerformed).to.be.true;
+        expect(isBulkPermissionPerformed).to.eq(true);
       });
     });
   });
@@ -139,7 +139,7 @@ describe('BO - Advanced Parameters - Team - Permission : Edit menu', async () =>
       await permissionsPage.reloadPage(page);
 
       const isSubTabOpened = await permissionsPage.goToProfileSubTab(page, 'logistician');
-      await expect(isSubTabOpened, 'Profile sub-tab is not opened!').to.be.true;
+      expect(isSubTabOpened, 'Profile sub-tab is not opened!').to.eq(true);
     });
 
     [
@@ -165,14 +165,14 @@ describe('BO - Advanced Parameters - Team - Permission : Edit menu', async () =>
       await permissionsPage.setPermissionOnAllPages(page, 'all', false);
 
       const isPermissionDefined = await permissionsPage.setPermissionOnAllPages(page, 'all', false);
-      await expect(isPermissionDefined, 'Permission is not updated').to.be.true;
+      expect(isPermissionDefined, 'Permission is not updated').to.eq(true);
     });
 
     it('should set the permission \'All\' for \'Orders\'', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'setPermission', baseContext);
 
       const isPermissionDefined = await permissionsPage.setPermission(page, 'AdminParentOrders', 'all');
-      await expect(isPermissionDefined, 'Permission is not updated').to.be.true;
+      expect(isPermissionDefined, 'Permission is not updated').to.eq(true);
     });
 
     it('should check the number of checkbox checked', async function () {
@@ -181,7 +181,7 @@ describe('BO - Advanced Parameters - Team - Permission : Edit menu', async () =>
       const numberOfCheckBoxes = await permissionsPage.getNumberOfElementInMenu(page);
 
       const number = await permissionsPage.getNumberOfPagesUnChecked(page, 'all');
-      await expect(numberOfCheckBoxes - number).to.eq(6);
+      expect(numberOfCheckBoxes - number).to.eq(6);
     });
 
     [
@@ -196,7 +196,7 @@ describe('BO - Advanced Parameters - Team - Permission : Edit menu', async () =>
         await testContext.addContextItem(this, 'testIdentifier', `checkMenu${index}`, baseContext);
 
         const isChecked = await permissionsPage.isPageChecked(page, test.args.className, 'all');
-        await expect(isChecked).to.be.true;
+        expect(isChecked).to.eq(true);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/permission/02_editModules.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/permission/02_editModules.ts
index 7120c55c5e00d..638b23f385ffb 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/permission/02_editModules.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/permission/02_editModules.ts
@@ -45,21 +45,21 @@ describe('BO - Advanced Parameters - Team - Permission : Edit modules', async ()
       await employeesPage.closeSfToolBar(page);
 
       const pageTitle = await employeesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(employeesPage.pageTitle);
+      expect(pageTitle).to.contains(employeesPage.pageTitle);
     });
 
     it('should go to \'Permissions\' tab', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'goToPermissionsTab', baseContext);
 
       const isTabOpened = await employeesPage.goToPermissionsTab(page);
-      await expect(isTabOpened, 'Permissions tab is not opened!').to.be.true;
+      expect(isTabOpened, 'Permissions tab is not opened!').to.eq(true);
     });
 
     it('should click on \'Logistician\' profile', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'goToProfileSubTab', baseContext);
 
       const isSubTabOpened = await permissionsPage.goToProfileSubTab(page, 'logistician');
-      await expect(isSubTabOpened, 'Profile sub-tab is not opened!').to.be.true;
+      expect(isSubTabOpened, 'Profile sub-tab is not opened!').to.eq(true);
     });
   });
 
@@ -73,14 +73,14 @@ describe('BO - Advanced Parameters - Team - Permission : Edit modules', async ()
         await testContext.addContextItem(this, 'testIdentifier', `checkAllCheckbox_${index}`, baseContext);
 
         const isPermissionDefined = await permissionsPage.setPermissionOnAllModules(page, test.args.action);
-        await expect(isPermissionDefined, 'Permission is not updated').to.be.true;
+        expect(isPermissionDefined, 'Permission is not updated').to.eq(true);
       });
 
       it(`should check that everything in '${test.args.action}' permission is checked`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `checkAllCheckboxForBlock${index}`, baseContext);
 
         const isBulkPermissionPerformed = await permissionsPage.isAllPermissionPerformed(page, test.args.action);
-        await expect(isBulkPermissionPerformed).to.be.true;
+        expect(isBulkPermissionPerformed).to.eq(true);
       });
     });
   });
@@ -92,7 +92,7 @@ describe('BO - Advanced Parameters - Team - Permission : Edit modules', async ()
       await permissionsPage.reloadPage(page);
 
       const isSubTabOpened = await permissionsPage.goToProfileSubTab(page, 'logistician');
-      await expect(isSubTabOpened, 'Profile sub-tab is not opened!').to.be.true;
+      expect(isSubTabOpened, 'Profile sub-tab is not opened!').to.eq(true);
     });
 
     [
@@ -104,7 +104,7 @@ describe('BO - Advanced Parameters - Team - Permission : Edit modules', async ()
         await testContext.addContextItem(this, 'testIdentifier', `checkAfterRefreshPage${index}`, baseContext);
 
         const numberOfModulesUnchecked = await permissionsPage.getNumberOfModulesUnChecked(page, test.args.action);
-        await expect(numberOfModulesUnchecked).to.eq(0);
+        expect(numberOfModulesUnchecked).to.eq(0);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/roles/01_filterRoles.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/roles/01_filterRoles.ts
index 623eadf51e447..37c4d7b5b816a 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/roles/01_filterRoles.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/roles/01_filterRoles.ts
@@ -49,7 +49,7 @@ describe('BO - Advanced Parameters - Team : Filter roles table', async () => {
     await employeesPage.closeSfToolBar(page);
 
     const pageTitle = await employeesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(employeesPage.pageTitle);
+    expect(pageTitle).to.contains(employeesPage.pageTitle);
   });
 
   it('should go to \'Roles\' page', async function () {
@@ -58,14 +58,14 @@ describe('BO - Advanced Parameters - Team : Filter roles table', async () => {
     await employeesPage.goToRolesPage(page);
 
     const pageTitle = await rolesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(rolesPage.pageTitle);
+    expect(pageTitle).to.contains(rolesPage.pageTitle);
   });
 
   it('should reset all filters and get number of roles', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfProfiles = await rolesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfProfiles).to.be.above(0);
+    expect(numberOfProfiles).to.be.above(0);
   });
 
   // 1 : Filter roles table
@@ -90,11 +90,11 @@ describe('BO - Advanced Parameters - Team : Filter roles table', async () => {
         await rolesPage.filterRoles(page, test.args.filterType, test.args.filterBy, test.args.filterValue);
 
         const numberOfProfilesAfterFilter = await rolesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfProfilesAfterFilter).to.be.at.most(numberOfProfiles);
+        expect(numberOfProfilesAfterFilter).to.be.at.most(numberOfProfiles);
 
         for (let i = 1; i <= numberOfProfilesAfterFilter; i++) {
           const textName = await rolesPage.getTextColumnFromTable(page, i, test.args.filterBy);
-          await expect(textName).to.contains(test.args.filterValue);
+          expect(textName).to.contains(test.args.filterValue);
         }
       });
 
@@ -102,7 +102,7 @@ describe('BO - Advanced Parameters - Team : Filter roles table', async () => {
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}Reset`, baseContext);
 
         const numberOfProfilesAfterDelete = await rolesPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfProfilesAfterDelete).to.be.equal(numberOfProfiles);
+        expect(numberOfProfilesAfterDelete).to.be.equal(numberOfProfiles);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/roles/02_CRUDRoles.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/roles/02_CRUDRoles.ts
index 624889a613cb1..8d2b9c38d3645 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/roles/02_CRUDRoles.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/roles/02_CRUDRoles.ts
@@ -54,7 +54,7 @@ describe('BO - Advanced Parameters - Team : Create, Read, Update and Delete role
     await employeesPage.closeSfToolBar(page);
 
     const pageTitle = await employeesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(employeesPage.pageTitle);
+    expect(pageTitle).to.contains(employeesPage.pageTitle);
   });
 
   it('should go to \'Roles\' page', async function () {
@@ -63,14 +63,14 @@ describe('BO - Advanced Parameters - Team : Create, Read, Update and Delete role
     await employeesPage.goToRolesPage(page);
 
     const pageTitle = await rolesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(rolesPage.pageTitle);
+    expect(pageTitle).to.contains(rolesPage.pageTitle);
   });
 
   it('should reset all filters and get number of roles', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfRoles = await rolesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfRoles).to.be.above(0);
+    expect(numberOfRoles).to.be.above(0);
   });
 
   // 1 : Create role
@@ -81,17 +81,17 @@ describe('BO - Advanced Parameters - Team : Create, Read, Update and Delete role
       await rolesPage.goToAddNewRolePage(page);
 
       const pageTitle = await addRolePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addRolePage.pageTitleCreate);
+      expect(pageTitle).to.contains(addRolePage.pageTitleCreate);
     });
 
     it('should create role and check result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createRole', baseContext);
 
       const textResult = await addRolePage.createEditRole(page, createRoleData);
-      await expect(textResult).to.equal(rolesPage.successfulCreationMessage);
+      expect(textResult).to.equal(rolesPage.successfulCreationMessage);
 
       const numberOfRolesAfterCreation = await rolesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfRolesAfterCreation).to.be.equal(numberOfRoles + 1);
+      expect(numberOfRolesAfterCreation).to.be.equal(numberOfRoles + 1);
     });
   });
 
@@ -103,7 +103,7 @@ describe('BO - Advanced Parameters - Team : Create, Read, Update and Delete role
       await rolesPage.filterRoles(page, 'input', 'name', createRoleData.name);
 
       const textName = await rolesPage.getTextColumnFromTable(page, 1, 'name');
-      await expect(textName).to.contains(createRoleData.name);
+      expect(textName).to.contains(createRoleData.name);
     });
 
     it('should go to edit role page', async function () {
@@ -112,14 +112,14 @@ describe('BO - Advanced Parameters - Team : Create, Read, Update and Delete role
       await rolesPage.goToEditRolePage(page, 1);
 
       const pageTitle = await addRolePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addRolePage.pageTitleEdit(createRoleData.name));
+      expect(pageTitle).to.contains(addRolePage.pageTitleEdit(createRoleData.name));
     });
 
     it('should update the role', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateRole', baseContext);
 
       const textResult = await addRolePage.createEditRole(page, editRoleData);
-      await expect(textResult).to.equal(addRolePage.successfulUpdateMessage);
+      expect(textResult).to.equal(addRolePage.successfulUpdateMessage);
     });
   });
 
@@ -131,21 +131,21 @@ describe('BO - Advanced Parameters - Team : Create, Read, Update and Delete role
       await rolesPage.filterRoles(page, 'input', 'name', editRoleData.name);
 
       const textName = await rolesPage.getTextColumnFromTable(page, 1, 'name');
-      await expect(textName).to.contains(editRoleData.name);
+      expect(textName).to.contains(editRoleData.name);
     });
 
     it('should delete role', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteRole', baseContext);
 
       const textResult = await rolesPage.deleteRole(page, 1);
-      await expect(rolesPage.successfulDeleteMessage).to.contains(textResult);
+      expect(rolesPage.successfulDeleteMessage).to.contains(textResult);
     });
 
     it('should reset filter and check the number of roles', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDelete', baseContext);
 
       const numberOfRolesAfterDelete = await rolesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfRolesAfterDelete).to.be.equal(numberOfRoles);
+      expect(numberOfRolesAfterDelete).to.be.equal(numberOfRoles);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/roles/03_helpCard.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/roles/03_helpCard.ts
index 77a815e43e935..4dc8a372e3751 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/roles/03_helpCard.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/roles/03_helpCard.ts
@@ -45,7 +45,7 @@ describe('BO - Advanced Parameters - Team : Help card in Roles page', async () =
     await employeesPage.closeSfToolBar(page);
 
     const pageTitle = await employeesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(employeesPage.pageTitle);
+    expect(pageTitle).to.contains(employeesPage.pageTitle);
   });
 
   it('should go to \'Roles\' page', async function () {
@@ -54,23 +54,23 @@ describe('BO - Advanced Parameters - Team : Help card in Roles page', async () =
     await employeesPage.goToRolesPage(page);
 
     const pageTitle = await rolesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(rolesPage.pageTitle);
+    expect(pageTitle).to.contains(rolesPage.pageTitle);
   });
 
   it('should open the help side bar and check the document language', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'openHelpSidebar', baseContext);
 
     const isHelpSidebarVisible = await rolesPage.openHelpSideBar(page);
-    await expect(isHelpSidebarVisible).to.be.true;
+    expect(isHelpSidebarVisible).to.eq(true);
 
     const documentURL = await rolesPage.getHelpDocumentURL(page);
-    await expect(documentURL).to.contains('country=en');
+    expect(documentURL).to.contains('country=en');
   });
 
   it('should close the help side bar', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'closeHelpSidebar', baseContext);
 
     const isHelpSidebarVisible = await rolesPage.closeHelpSideBar(page);
-    await expect(isHelpSidebarVisible).to.be.true;
+    expect(isHelpSidebarVisible).to.eq(true);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/roles/04_sortRoles.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/roles/04_sortRoles.ts
index 3f5183936b692..052a249734979 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/roles/04_sortRoles.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/roles/04_sortRoles.ts
@@ -48,7 +48,7 @@ describe('BO - Advanced Parameters - Team : Sort Roles table', async () => {
     await dashboardPage.closeSfToolBar(page);
 
     const pageTitle = await employeesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(employeesPage.pageTitle);
+    expect(pageTitle).to.contains(employeesPage.pageTitle);
   });
 
   it('should go to \'Roles\' page', async function () {
@@ -57,14 +57,14 @@ describe('BO - Advanced Parameters - Team : Sort Roles table', async () => {
     await employeesPage.goToRolesPage(page);
 
     const pageTitle = await rolesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(rolesPage.pageTitle);
+    expect(pageTitle).to.contains(rolesPage.pageTitle);
   });
 
   it('should reset all filters and get number of roles', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfRoles = await rolesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfRoles).to.be.above(0);
+    expect(numberOfRoles).to.be.above(0);
   });
 
   const tests = [
@@ -86,9 +86,9 @@ describe('BO - Advanced Parameters - Team : Sort Roles table', async () => {
       const expectedResult = await basicHelper.sortArray(nonSortedTable);
 
       if (test.args.sortDirection === 'asc') {
-        await expect(sortedTable).to.deep.equal(expectedResult);
+        expect(sortedTable).to.deep.equal(expectedResult);
       } else {
-        await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+        expect(sortedTable).to.deep.equal(expectedResult.reverse());
       }
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/roles/05_paginationAndBulkActions.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/roles/05_paginationAndBulkActions.ts
index d0cb5ec515a55..a9bfafa6a39dd 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/roles/05_paginationAndBulkActions.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/06_team/roles/05_paginationAndBulkActions.ts
@@ -51,7 +51,7 @@ describe('BO - Advanced Parameters - Team : Pagination and delete roles by bulk
     await employeesPage.closeSfToolBar(page);
 
     const pageTitle = await employeesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(employeesPage.pageTitle);
+    expect(pageTitle).to.contains(employeesPage.pageTitle);
   });
 
   it('should go to \'Roles\' page', async function () {
@@ -60,14 +60,14 @@ describe('BO - Advanced Parameters - Team : Pagination and delete roles by bulk
     await employeesPage.goToRolesPage(page);
 
     const pageTitle = await rolesPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(rolesPage.pageTitle);
+    expect(pageTitle).to.contains(rolesPage.pageTitle);
   });
 
   it('should reset all filters and get number of roles', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
     numberOfRoles = await rolesPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfRoles).to.be.above(0);
+    expect(numberOfRoles).to.be.above(0);
   });
 
   // 1 : Create 11 roles
@@ -80,21 +80,21 @@ describe('BO - Advanced Parameters - Team : Pagination and delete roles by bulk
         await rolesPage.goToAddNewRolePage(page);
 
         const pageTitle = await addProfilePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addProfilePage.pageTitleCreate);
+        expect(pageTitle).to.contains(addProfilePage.pageTitleCreate);
       });
 
       it(`should create profile n°${index + 1}`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `CreateRole${index}`, baseContext);
 
         const textResult = await addProfilePage.createEditRole(page, createRoleData);
-        await expect(textResult).to.equal(rolesPage.successfulCreationMessage);
+        expect(textResult).to.equal(rolesPage.successfulCreationMessage);
       });
 
       it('should check roles number', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `checkProfilesNumber${index}`, baseContext);
 
         const numberOfRolesAfterDelete = await rolesPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfRolesAfterDelete).to.be.equal(numberOfRoles + 1 + index);
+        expect(numberOfRolesAfterDelete).to.be.equal(numberOfRoles + 1 + index);
       });
     });
   });
@@ -138,21 +138,21 @@ describe('BO - Advanced Parameters - Team : Pagination and delete roles by bulk
       await rolesPage.filterRoles(page, 'input', 'name', createRoleData.name);
 
       const textName = await rolesPage.getTextColumnFromTable(page, 1, 'name');
-      await expect(textName).to.contains(createRoleData.name);
+      expect(textName).to.contains(createRoleData.name);
     });
 
     it('should delete roles with Bulk Actions and check result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteProfile', baseContext);
 
       const deleteTextResult = await rolesPage.deleteBulkActions(page);
-      await expect(rolesPage.successfulDeleteMessage).to.be.contains(deleteTextResult);
+      expect(rolesPage.successfulDeleteMessage).to.be.contains(deleteTextResult);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDelete', baseContext);
 
       const numberOfRolesAfterDelete = await rolesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfRolesAfterDelete).to.be.equal(numberOfRoles);
+      expect(numberOfRolesAfterDelete).to.be.equal(numberOfRoles);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/07_database/dbBackup/01_createAndDeleteDbBackup.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/07_database/dbBackup/01_createAndDeleteDbBackup.ts
index 0cfefbcd2f66a..ee19eac5bb2f7 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/07_database/dbBackup/01_createAndDeleteDbBackup.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/07_database/dbBackup/01_createAndDeleteDbBackup.ts
@@ -55,7 +55,7 @@ describe('BO - Advanced Parameters - Database : Generate db backup and download
     await sqlManagerPage.closeSfToolBar(page);
 
     const pageTitle = await sqlManagerPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(sqlManagerPage.pageTitle);
+    expect(pageTitle).to.contains(sqlManagerPage.pageTitle);
   });
 
   it('should go to \'DB Backup\' page', async function () {
@@ -64,7 +64,7 @@ describe('BO - Advanced Parameters - Database : Generate db backup and download
     await sqlManagerPage.goToDbBackupPage(page);
 
     const pageTitle = await dbBackupPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(dbBackupPage.pageTitle);
+    expect(pageTitle).to.contains(dbBackupPage.pageTitle);
   });
 
   describe('Generate new backup', async () => {
@@ -72,17 +72,17 @@ describe('BO - Advanced Parameters - Database : Generate db backup and download
       await testContext.addContextItem(this, 'testIdentifier', 'checkNumberOfDbBackups', baseContext);
 
       numberOfBackups = await dbBackupPage.getNumberOfElementInGrid(page);
-      await expect(numberOfBackups).to.equal(0);
+      expect(numberOfBackups).to.equal(0);
     });
 
     it('should generate new db backup', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'generateNewDbBackup', baseContext);
 
       const result = await dbBackupPage.createDbDbBackup(page);
-      await expect(result).to.equal(dbBackupPage.successfulBackupCreationMessage);
+      expect(result).to.equal(dbBackupPage.successfulBackupCreationMessage);
 
       const numberOfBackupsAfterCreation = await dbBackupPage.getNumberOfElementInGrid(page);
-      await expect(numberOfBackupsAfterCreation).to.equal(numberOfBackups + 1);
+      expect(numberOfBackupsAfterCreation).to.equal(numberOfBackups + 1);
     });
   });
 
@@ -93,7 +93,7 @@ describe('BO - Advanced Parameters - Database : Generate db backup and download
       filePath = await dbBackupPage.downloadDbBackup(page);
 
       const found = await files.doesFileExist(filePath);
-      await expect(found, 'Download backup file failed').to.be.true;
+      expect(found, 'Download backup file failed').to.eq(true);
     });
   });
 
@@ -102,10 +102,10 @@ describe('BO - Advanced Parameters - Database : Generate db backup and download
       await testContext.addContextItem(this, 'testIdentifier', 'deleteDbBackup', baseContext);
 
       const result = await dbBackupPage.deleteBackup(page, 1);
-      await expect(result).to.be.equal(dbBackupPage.successfulDeleteMessage);
+      expect(result).to.be.equal(dbBackupPage.successfulDeleteMessage);
 
       const numberOfBackupsAfterDelete = await dbBackupPage.getNumberOfElementInGrid(page);
-      await expect(numberOfBackupsAfterDelete).to.equal(numberOfBackups);
+      expect(numberOfBackupsAfterDelete).to.equal(numberOfBackups);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/07_database/dbBackup/02_paginationAndBulkDelete.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/07_database/dbBackup/02_paginationAndBulkDelete.ts
index a203ab26733cb..8f4ccc373c759 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/07_database/dbBackup/02_paginationAndBulkDelete.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/07_database/dbBackup/02_paginationAndBulkDelete.ts
@@ -52,7 +52,7 @@ describe('BO - Advanced Parameters - Database : Pagination and bulk delete DB Ba
     await sqlManagerPage.closeSfToolBar(page);
 
     const pageTitle = await sqlManagerPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(sqlManagerPage.pageTitle);
+    expect(pageTitle).to.contains(sqlManagerPage.pageTitle);
   });
 
   it('should go to \'DB Backup\' page', async function () {
@@ -61,14 +61,14 @@ describe('BO - Advanced Parameters - Database : Pagination and bulk delete DB Ba
     await sqlManagerPage.goToDbBackupPage(page);
 
     const pageTitle = await dbBackupPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(dbBackupPage.pageTitle);
+    expect(pageTitle).to.contains(dbBackupPage.pageTitle);
   });
 
   it('should get number of db backups', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'checkNumberOfDbBackups', baseContext);
 
     numberOfBackups = await dbBackupPage.getNumberOfElementInGrid(page);
-    await expect(numberOfBackups).to.equal(0);
+    expect(numberOfBackups).to.equal(0);
   });
 
   // 1 - Create 11 DB backup
@@ -80,10 +80,10 @@ describe('BO - Advanced Parameters - Database : Pagination and bulk delete DB Ba
         await testContext.addContextItem(this, 'testIdentifier', `generateNewDbBackup${index}`, baseContext);
 
         const result = await dbBackupPage.createDbDbBackup(page);
-        await expect(result).to.equal(dbBackupPage.successfulBackupCreationMessage);
+        expect(result).to.equal(dbBackupPage.successfulBackupCreationMessage);
 
         const numberOfBackupsAfterCreation = await dbBackupPage.getNumberOfElementInGrid(page);
-        await expect(numberOfBackupsAfterCreation).to.equal(numberOfBackups + 1 + index);
+        expect(numberOfBackupsAfterCreation).to.equal(numberOfBackups + 1 + index);
       });
     });
   });
@@ -124,10 +124,10 @@ describe('BO - Advanced Parameters - Database : Pagination and bulk delete DB Ba
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteDbBackups', baseContext);
 
       const result = await dbBackupPage.deleteWithBulkActions(page);
-      await expect(result).to.be.equal(dbBackupPage.successfulMultiDeleteMessage);
+      expect(result).to.be.equal(dbBackupPage.successfulMultiDeleteMessage);
 
       const numberOfBackupsAfterDelete = await dbBackupPage.getNumberOfElementInGrid(page);
-      await expect(numberOfBackupsAfterDelete).to.equal(numberOfBackups);
+      expect(numberOfBackupsAfterDelete).to.equal(numberOfBackups);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/07_database/dbBackup/03_helpCard.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/07_database/dbBackup/03_helpCard.ts
index 87f40abae3cac..d85eac394f529 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/07_database/dbBackup/03_helpCard.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/07_database/dbBackup/03_helpCard.ts
@@ -46,7 +46,7 @@ describe('BO - Advanced Parameters - Database : Help card in DB Backup page', as
     await sqlManagerPage.closeSfToolBar(page);
 
     const pageTitle = await sqlManagerPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(sqlManagerPage.pageTitle);
+    expect(pageTitle).to.contains(sqlManagerPage.pageTitle);
   });
 
   it('should go to \'DB Backup\' page', async function () {
@@ -55,23 +55,23 @@ describe('BO - Advanced Parameters - Database : Help card in DB Backup page', as
     await sqlManagerPage.goToDbBackupPage(page);
 
     const pageTitle = await dbBackupPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(dbBackupPage.pageTitle);
+    expect(pageTitle).to.contains(dbBackupPage.pageTitle);
   });
 
   it('should open the help side bar and check the document language', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'openHelpSidebar', baseContext);
 
     const isHelpSidebarVisible = await dbBackupPage.openHelpSideBar(page);
-    await expect(isHelpSidebarVisible).to.be.true;
+    expect(isHelpSidebarVisible).to.eq(true);
 
     const documentURL = await dbBackupPage.getHelpDocumentURL(page);
-    await expect(documentURL).to.contains('country=en');
+    expect(documentURL).to.contains('country=en');
   });
 
   it('should close the help side bar', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'closeHelpSidebar', baseContext);
 
     const isHelpSidebarNotVisible = await dbBackupPage.closeHelpSideBar(page);
-    await expect(isHelpSidebarNotVisible).to.be.true;
+    expect(isHelpSidebarNotVisible).to.eq(true);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/07_database/sqlManager/01_CRUDSqlQuery.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/07_database/sqlManager/01_CRUDSqlQuery.ts
index 8d5d5eab7d038..093f6454e088d 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/07_database/sqlManager/01_CRUDSqlQuery.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/07_database/sqlManager/01_CRUDSqlQuery.ts
@@ -56,7 +56,7 @@ describe('BO - Advanced Parameters - Database : Create, View, update and delete
     await sqlManagerPage.closeSfToolBar(page);
 
     const pageTitle = await sqlManagerPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(sqlManagerPage.pageTitle);
+    expect(pageTitle).to.contains(sqlManagerPage.pageTitle);
   });
 
   it('should reset all filters', async function () {
@@ -65,7 +65,7 @@ describe('BO - Advanced Parameters - Database : Create, View, update and delete
     numberOfSQLQuery = await sqlManagerPage.resetAndGetNumberOfLines(page);
 
     if (numberOfSQLQuery !== 0) {
-      await expect(numberOfSQLQuery).to.be.above(0);
+      expect(numberOfSQLQuery).to.be.above(0);
     }
   });
 
@@ -76,14 +76,14 @@ describe('BO - Advanced Parameters - Database : Create, View, update and delete
       await sqlManagerPage.goToNewSQLQueryPage(page);
 
       const pageTitle = await addSqlQueryPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addSqlQueryPage.pageTitle);
+      expect(pageTitle).to.contains(addSqlQueryPage.pageTitle);
     });
 
     it('should create new SQL query', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createNewSQLQuery', baseContext);
 
       const textResult = await addSqlQueryPage.createEditSQLQuery(page, sqlQueryData);
-      await expect(textResult).to.equal(addSqlQueryPage.successfulCreationMessage);
+      expect(textResult).to.equal(addSqlQueryPage.successfulCreationMessage);
     });
   });
 
@@ -95,7 +95,7 @@ describe('BO - Advanced Parameters - Database : Create, View, update and delete
       await sqlManagerPage.filterSQLQuery(page, 'name', sqlQueryData.name);
 
       const sqlQueryName = await sqlManagerPage.getTextColumnFromTable(page, 1, 'name');
-      await expect(sqlQueryName).to.contains(sqlQueryData.name);
+      expect(sqlQueryName).to.contains(sqlQueryData.name);
     });
 
     it('should click on view button', async function () {
@@ -104,7 +104,7 @@ describe('BO - Advanced Parameters - Database : Create, View, update and delete
       await sqlManagerPage.goToViewSQLQueryPage(page, 1);
 
       const pageTitle = await viewQueryManagerPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(viewQueryManagerPage.pageTitle);
+      expect(pageTitle).to.contains(viewQueryManagerPage.pageTitle);
     });
 
     it('should check sql query result number', async function () {
@@ -135,7 +135,7 @@ describe('BO - Advanced Parameters - Database : Create, View, update and delete
       );
 
       const pageTitle = await sqlManagerPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(sqlManagerPage.pageTitle);
+      expect(pageTitle).to.contains(sqlManagerPage.pageTitle);
     });
 
     it('should filter list by name', async function () {
@@ -145,7 +145,7 @@ describe('BO - Advanced Parameters - Database : Create, View, update and delete
       await sqlManagerPage.filterSQLQuery(page, 'name', sqlQueryData.name);
 
       const sqlQueryName = await sqlManagerPage.getTextColumnFromTable(page, 1, 'name');
-      await expect(sqlQueryName).to.contains(sqlQueryData.name);
+      expect(sqlQueryName).to.contains(sqlQueryData.name);
     });
 
     it('should go to edit \'SQL Query\' page', async function () {
@@ -154,17 +154,17 @@ describe('BO - Advanced Parameters - Database : Create, View, update and delete
       await sqlManagerPage.goToEditSQLQueryPage(page, 1);
 
       const pageTitle = await addSqlQueryPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addSqlQueryPage.editPageTitle);
+      expect(pageTitle).to.contains(addSqlQueryPage.editPageTitle);
     });
 
     it('should update SQL query', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateSQLQuery', baseContext);
 
       const textResult = await addSqlQueryPage.createEditSQLQuery(page, editSqlQueryData);
-      await expect(textResult).to.equal(addSqlQueryPage.successfulUpdateMessage);
+      expect(textResult).to.equal(addSqlQueryPage.successfulUpdateMessage);
 
       const numberOfSQLQueryAfterUpdate = await sqlManagerPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfSQLQueryAfterUpdate).to.be.equal(numberOfSQLQuery + 1);
+      expect(numberOfSQLQueryAfterUpdate).to.be.equal(numberOfSQLQuery + 1);
     });
   });
 
@@ -176,7 +176,7 @@ describe('BO - Advanced Parameters - Database : Create, View, update and delete
       await sqlManagerPage.filterSQLQuery(page, 'name', editSqlQueryData.name);
 
       const sqlQueryName = await sqlManagerPage.getTextColumnFromTable(page, 1, 'name');
-      await expect(sqlQueryName).to.contains(editSqlQueryData.name);
+      expect(sqlQueryName).to.contains(editSqlQueryData.name);
     });
 
     it('should click on view button', async function () {
@@ -185,7 +185,7 @@ describe('BO - Advanced Parameters - Database : Create, View, update and delete
       await sqlManagerPage.goToViewSQLQueryPage(page, 1);
 
       const pageTitle = await viewQueryManagerPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(viewQueryManagerPage.pageTitle);
+      expect(pageTitle).to.contains(viewQueryManagerPage.pageTitle);
     });
 
     it('should check sql query result number', async function () {
@@ -216,7 +216,7 @@ describe('BO - Advanced Parameters - Database : Create, View, update and delete
       );
 
       const pageTitle = await sqlManagerPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(sqlManagerPage.pageTitle);
+      expect(pageTitle).to.contains(sqlManagerPage.pageTitle);
     });
 
     it('should filter list by name', async function () {
@@ -226,17 +226,17 @@ describe('BO - Advanced Parameters - Database : Create, View, update and delete
       await sqlManagerPage.filterSQLQuery(page, 'name', editSqlQueryData.name);
 
       const sqlQueryName = await sqlManagerPage.getTextColumnFromTable(page, 1, 'name');
-      await expect(sqlQueryName).to.contains(editSqlQueryData.name);
+      expect(sqlQueryName).to.contains(editSqlQueryData.name);
     });
 
     it('should delete SQL query', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteSQLQuery', baseContext);
 
       const textResult = await sqlManagerPage.deleteSQLQuery(page, 1);
-      await expect(textResult).to.equal(sqlManagerPage.successfulDeleteMessage);
+      expect(textResult).to.equal(sqlManagerPage.successfulDeleteMessage);
 
       const numberOfSQLQueryAfterDelete = await sqlManagerPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfSQLQueryAfterDelete).to.be.equal(numberOfSQLQuery);
+      expect(numberOfSQLQueryAfterDelete).to.be.equal(numberOfSQLQuery);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/07_database/sqlManager/02_helpCard.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/07_database/sqlManager/02_helpCard.ts
index e9eed0124de93..06e2d1bc427b6 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/07_database/sqlManager/02_helpCard.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/07_database/sqlManager/02_helpCard.ts
@@ -44,23 +44,23 @@ describe('BO - Advanced Parameters - Database : Help card in SQL Manager page',
     await sqlManagerPage.closeSfToolBar(page);
 
     const pageTitle = await sqlManagerPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(sqlManagerPage.pageTitle);
+    expect(pageTitle).to.contains(sqlManagerPage.pageTitle);
   });
 
   it('should open the help side bar and check the document language', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'openHelpSidebar', baseContext);
 
     const isHelpSidebarVisible = await sqlManagerPage.openHelpSideBar(page);
-    await expect(isHelpSidebarVisible).to.be.true;
+    expect(isHelpSidebarVisible).to.eq(true);
 
     const documentURL = await sqlManagerPage.getHelpDocumentURL(page);
-    await expect(documentURL).to.contains('country=en');
+    expect(documentURL).to.contains('country=en');
   });
 
   it('should close the help side bar', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'closeHelpSidebar', baseContext);
 
     const isHelpSidebarVisible = await sqlManagerPage.closeHelpSideBar(page);
-    await expect(isHelpSidebarVisible).to.be.true;
+    expect(isHelpSidebarVisible).to.eq(true);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/07_database/sqlManager/03_exportSqlQuery.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/07_database/sqlManager/03_exportSqlQuery.ts
index 67155c11976de..fb56f8fda4b49 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/07_database/sqlManager/03_exportSqlQuery.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/07_database/sqlManager/03_exportSqlQuery.ts
@@ -58,7 +58,7 @@ describe('BO - Advanced Parameters - Database : Export SQL query', async () => {
     await dashboardPage.closeSfToolBar(page);
 
     const pageTitle = await sqlManagerPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(sqlManagerPage.pageTitle);
+    expect(pageTitle).to.contains(sqlManagerPage.pageTitle);
   });
 
   it('should reset all filters', async function () {
@@ -66,7 +66,7 @@ describe('BO - Advanced Parameters - Database : Export SQL query', async () => {
 
     numberOfSQLQueries = await sqlManagerPage.resetAndGetNumberOfLines(page);
     if (numberOfSQLQueries !== 0) {
-      await expect(numberOfSQLQueries).to.be.above(0);
+      expect(numberOfSQLQueries).to.be.above(0);
     }
   });
 
@@ -77,14 +77,14 @@ describe('BO - Advanced Parameters - Database : Export SQL query', async () => {
       await sqlManagerPage.goToNewSQLQueryPage(page);
 
       const pageTitle = await addSqlQueryPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addSqlQueryPage.pageTitle);
+      expect(pageTitle).to.contains(addSqlQueryPage.pageTitle);
     });
 
     it('should create new SQL query', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createNewSQLQuery', baseContext);
 
       const textResult = await addSqlQueryPage.createEditSQLQuery(page, sqlQueryData);
-      await expect(textResult).to.equal(addSqlQueryPage.successfulCreationMessage);
+      expect(textResult).to.equal(addSqlQueryPage.successfulCreationMessage);
     });
   });
 
@@ -95,7 +95,7 @@ describe('BO - Advanced Parameters - Database : Export SQL query', async () => {
       filePath = await sqlManagerPage.exportSqlResultDataToCsv(page);
 
       const doesFileExist = await files.doesFileExist(filePath, 5000);
-      await expect(doesFileExist, 'Export of data has failed').to.be.true;
+      expect(doesFileExist, 'Export of data has failed').to.eq(true);
     });
 
     it('should check existence of query result data in csv file', async function () {
@@ -105,7 +105,7 @@ describe('BO - Advanced Parameters - Database : Export SQL query', async () => {
 
       for (let row = 1; row <= numberOfQuery; row++) {
         const textExist = await files.isTextInFile(filePath, fileContent, true, true);
-        await expect(textExist, `${fileContent} was not found in the file`).to.be.true;
+        expect(textExist, `${fileContent} was not found in the file`).to.eq(true);
       }
     });
   });
@@ -118,17 +118,17 @@ describe('BO - Advanced Parameters - Database : Export SQL query', async () => {
       await sqlManagerPage.filterSQLQuery(page, 'name', sqlQueryData.name);
 
       const sqlQueryName = await sqlManagerPage.getTextColumnFromTable(page, 1, 'name');
-      await expect(sqlQueryName).to.contains(sqlQueryData.name);
+      expect(sqlQueryName).to.contains(sqlQueryData.name);
     });
 
     it('should delete SQL query', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteSQLQuery', baseContext);
 
       const textResult = await sqlManagerPage.deleteSQLQuery(page, 1);
-      await expect(textResult).to.equal(sqlManagerPage.successfulDeleteMessage);
+      expect(textResult).to.equal(sqlManagerPage.successfulDeleteMessage);
 
       const numberOfSQLQueriesAfterDelete = await sqlManagerPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfSQLQueriesAfterDelete).to.be.equal(numberOfSQLQueries);
+      expect(numberOfSQLQueriesAfterDelete).to.be.equal(numberOfSQLQueries);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/07_database/sqlManager/04_filterSortAndPagination.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/07_database/sqlManager/04_filterSortAndPagination.ts
index b4ba0f982467e..7bd5a938942d7 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/07_database/sqlManager/04_filterSortAndPagination.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/07_database/sqlManager/04_filterSortAndPagination.ts
@@ -59,7 +59,7 @@ describe('BO - Advanced Parameters - Database : Filter, sort and pagination SQL
     await dashboardPage.closeSfToolBar(page);
 
     const pageTitle = await sqlManagerPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(sqlManagerPage.pageTitle);
+    expect(pageTitle).to.contains(sqlManagerPage.pageTitle);
   });
 
   it('should reset all filters', async function () {
@@ -68,7 +68,7 @@ describe('BO - Advanced Parameters - Database : Filter, sort and pagination SQL
     numberOfSQLQueries = await sqlManagerPage.resetAndGetNumberOfLines(page);
 
     if (numberOfSQLQueries !== 0) {
-      await expect(numberOfSQLQueries).to.be.above(0);
+      expect(numberOfSQLQueries).to.be.above(0);
     }
   });
 
@@ -84,17 +84,17 @@ describe('BO - Advanced Parameters - Database : Filter, sort and pagination SQL
         await sqlManagerPage.goToNewSQLQueryPage(page);
 
         const pageTitle = await addSqlQueryPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addSqlQueryPage.pageTitle);
+        expect(pageTitle).to.contains(addSqlQueryPage.pageTitle);
       });
 
       it(`should create SQL query n°${index + 1} and check result`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `createOrderStatus${index}`, baseContext);
 
         const textResult = await addSqlQueryPage.createEditSQLQuery(page, sqlQueryData);
-        await expect(textResult).to.contains(sqlManagerPage.successfulCreationMessage);
+        expect(textResult).to.contains(sqlManagerPage.successfulCreationMessage);
 
         const numberOfLinesAfterCreation = await sqlManagerPage.getNumberOfElementInGrid(page);
-        await expect(numberOfLinesAfterCreation).to.be.equal(numberOfSQLQueries + index + 1);
+        expect(numberOfLinesAfterCreation).to.be.equal(numberOfSQLQueries + index + 1);
       });
     });
   });
@@ -166,11 +166,11 @@ describe('BO - Advanced Parameters - Database : Filter, sort and pagination SQL
         await sqlManagerPage.filterSQLQuery(page, test.args.filterBy, test.args.filterValue);
 
         const numberOfLinesAfterFilter = await sqlManagerPage.getNumberOfElementInGrid(page);
-        await expect(numberOfLinesAfterFilter).to.be.at.most(numberOfSQLQueries + 11);
+        expect(numberOfLinesAfterFilter).to.be.at.most(numberOfSQLQueries + 11);
 
         for (let row = 1; row <= numberOfLinesAfterFilter; row++) {
           const textColumn = await sqlManagerPage.getTextColumnFromTable(page, row, test.args.filterBy);
-          await expect(textColumn).to.contains(test.args.filterValue);
+          expect(textColumn).to.contains(test.args.filterValue);
         }
       });
 
@@ -178,7 +178,7 @@ describe('BO - Advanced Parameters - Database : Filter, sort and pagination SQL
         await testContext.addContextItem(this, 'testIdentifier', `resetFilter${index}`, baseContext);
 
         numberOfSQLQueries = await sqlManagerPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfSQLQueries).to.be.above(0);
+        expect(numberOfSQLQueries).to.be.above(0);
       });
     });
   });
@@ -233,17 +233,17 @@ describe('BO - Advanced Parameters - Database : Filter, sort and pagination SQL
           const expectedResult = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+            expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+            expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
         } else {
           const expectedResult = await basicHelper.sortArray(nonSortedTable);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         }
       });
@@ -258,21 +258,21 @@ describe('BO - Advanced Parameters - Database : Filter, sort and pagination SQL
       await sqlManagerPage.filterSQLQuery(page, 'name', 'todelete');
 
       const textResult = await sqlManagerPage.getTextColumnFromTable(page, 1, 'name');
-      await expect(textResult).to.contains('todelete');
+      expect(textResult).to.contains('todelete');
     });
 
     it('should delete categories with Bulk Actions and check result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDelete', baseContext);
 
       const deleteTextResult = await sqlManagerPage.deleteWithBulkActions(page);
-      await expect(deleteTextResult).to.be.equal(sqlManagerPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.equal(sqlManagerPage.successfulMultiDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDelete', baseContext);
 
       const numberOfLinesAfterReset = await sqlManagerPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfLinesAfterReset).to.equal(numberOfSQLQueries - 11);
+      expect(numberOfLinesAfterReset).to.equal(numberOfSQLQueries - 11);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/08_logs/01_filterSortAndPagination.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/08_logs/01_filterSortAndPagination.ts
index 0f05258cc0ed9..b86900e2ace75 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/08_logs/01_filterSortAndPagination.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/08_logs/01_filterSortAndPagination.ts
@@ -55,17 +55,17 @@ describe('BO - Advanced Parameters - Logs : Filter, sort and pagination logs tab
     await logsPage.closeSfToolBar(page);
 
     const pageTitle = await logsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(logsPage.pageTitle);
+    expect(pageTitle).to.contains(logsPage.pageTitle);
   });
 
   it('should erase all logs', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'eraseLogs', baseContext);
 
     const textResult = await logsPage.eraseAllLogs(page);
-    await expect(textResult).to.equal(logsPage.successfulUpdateMessage);
+    expect(textResult).to.equal(logsPage.successfulUpdateMessage);
 
     numberOfLogs = await logsPage.getNumberOfElementInGrid(page);
-    await expect(numberOfLogs).to.be.equal(0);
+    expect(numberOfLogs).to.be.equal(0);
   });
 
   // Login and logout 11 times to have 11 logs
@@ -88,14 +88,14 @@ describe('BO - Advanced Parameters - Logs : Filter, sort and pagination logs tab
       await dashboardPage.goToSubMenu(page, dashboardPage.advancedParametersLink, dashboardPage.logsLink);
 
       const pageTitle = await logsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(logsPage.pageTitle);
+      expect(pageTitle).to.contains(logsPage.pageTitle);
     });
 
     it('should check the number of logs', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkLogsNumber', baseContext);
 
       const numberOfElements = await logsPage.getNumberOfElementInGrid(page);
-      await expect(numberOfElements).to.be.equal(11);
+      expect(numberOfElements).to.be.equal(11);
     });
   });
 
@@ -107,10 +107,10 @@ describe('BO - Advanced Parameters - Logs : Filter, sort and pagination logs tab
       await logsPage.reloadPage(page);
 
       const pageTitle = await logsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(logsPage.pageTitle);
+      expect(pageTitle).to.contains(logsPage.pageTitle);
 
       const numberOfElements = await logsPage.getNumberOfElementInGrid(page);
-      await expect(numberOfElements).to.be.equal(numberOfLogs + 11);
+      expect(numberOfElements).to.be.equal(numberOfLogs + 11);
     });
 
     it('should change the items number to 10 per page', async function () {
@@ -221,12 +221,12 @@ describe('BO - Advanced Parameters - Logs : Filter, sort and pagination logs tab
 
         const numberOfLogsAfterFilter = await logsPage.getNumberOfElementInGrid(page);
 
-        await expect(numberOfLogsAfterFilter).to.be.at.most(numberOfLogs + 11);
+        expect(numberOfLogsAfterFilter).to.be.at.most(numberOfLogs + 11);
 
         for (let i = 1; i <= numberOfLogsAfterFilter; i++) {
           const textColumn = await logsPage.getTextColumn(page, i, test.args.filterBy);
 
-          await expect(textColumn).to.contains(test.args.filterValue);
+          expect(textColumn).to.contains(test.args.filterValue);
         }
       });
 
@@ -234,7 +234,7 @@ describe('BO - Advanced Parameters - Logs : Filter, sort and pagination logs tab
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.testIdentifier}Reset`, baseContext);
 
         const numberOfLogsAfterReset = await logsPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfLogsAfterReset).to.equal(numberOfLogs + 11);
+        expect(numberOfLogsAfterReset).to.equal(numberOfLogs + 11);
       });
     });
 
@@ -244,11 +244,11 @@ describe('BO - Advanced Parameters - Logs : Filter, sort and pagination logs tab
       await logsPage.filterLogsByDate(page, today, today);
 
       const numberOfEmailsAfterFilter = await logsPage.getNumberOfElementInGrid(page);
-      await expect(numberOfEmailsAfterFilter).to.be.at.most(numberOfLogs + 11);
+      expect(numberOfEmailsAfterFilter).to.be.at.most(numberOfLogs + 11);
 
       for (let row: number = 1; row <= numberOfEmailsAfterFilter; row++) {
         const textColumn = await logsPage.getTextColumn(page, row, 'date_add');
-        await expect(textColumn).to.contains(today);
+        expect(textColumn).to.contains(today);
       }
     });
 
@@ -256,7 +256,7 @@ describe('BO - Advanced Parameters - Logs : Filter, sort and pagination logs tab
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterFilterByDate', baseContext);
 
       const numberOfLogsAfterReset = await logsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfLogsAfterReset).to.equal(numberOfLogs + 11);
+      expect(numberOfLogsAfterReset).to.equal(numberOfLogs + 11);
     });
   });
 
@@ -375,17 +375,17 @@ describe('BO - Advanced Parameters - Logs : Filter, sort and pagination logs tab
           const expectedResult = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+            expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+            expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
         } else {
           const expectedResult = await basicHelper.sortArray(nonSortedTable);
 
           if (test.args.sortDirection === 'asc') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         }
       });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/08_logs/02_logsByEmail.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/08_logs/02_logsByEmail.ts
index db2041f476548..8e7457bf41f34 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/08_logs/02_logsByEmail.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/08_logs/02_logsByEmail.ts
@@ -42,20 +42,20 @@ describe('BO - Advanced Parameters - Logs : Logs by email', async () => {
     await logsPage.closeSfToolBar(page);
 
     const pageTitle = await logsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(logsPage.pageTitle);
+    expect(pageTitle).to.contains(logsPage.pageTitle);
   });
 
   it('should enter an invalid email in \'Send emails to\' input and check the error message', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'setInvalidEmail', baseContext);
 
     const errorMessage = await logsPage.setEmail(page, 'demo@prestashop.');
-    await expect(errorMessage).to.eq('Invalid email: demo@prestashop..');
+    expect(errorMessage).to.eq('Invalid email: demo@prestashop..');
   });
 
   it('should enter a valid email in \'Send emails to\' input', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'setValidEmail', baseContext);
 
     const errorMessage = await logsPage.setEmail(page, Employees.DefaultEmployee.email);
-    await expect(errorMessage).to.eq(logsPage.successfulUpdateMessage);
+    expect(errorMessage).to.eq(logsPage.successfulUpdateMessage);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/09_webservice/01_CRUDWebservice.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/09_webservice/01_CRUDWebservice.ts
index a947f43743568..6d3ae52df1adc 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/09_webservice/01_CRUDWebservice.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/09_webservice/01_CRUDWebservice.ts
@@ -53,14 +53,14 @@ describe('BO - Advanced Parameters - Webservice : Create, Read, Update and Delet
     await webservicePage.closeSfToolBar(page);
 
     const pageTitle = await webservicePage.getPageTitle(page);
-    await expect(pageTitle).to.contains(webservicePage.pageTitle);
+    expect(pageTitle).to.contains(webservicePage.pageTitle);
   });
 
   it('should reset all filters and get number of webservices', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'firstReset', baseContext);
 
     numberOfWebserviceKeys = await webservicePage.resetAndGetNumberOfLines(page);
-    if (numberOfWebserviceKeys !== 0) await expect(numberOfWebserviceKeys).to.be.above(0);
+    if (numberOfWebserviceKeys !== 0) expect(numberOfWebserviceKeys).to.be.above(0);
   });
 
   // 1 : Create webservice key
@@ -71,17 +71,17 @@ describe('BO - Advanced Parameters - Webservice : Create, Read, Update and Delet
       await webservicePage.goToAddNewWebserviceKeyPage(page);
 
       const pageTitle = await addWebservicePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addWebservicePage.pageTitleCreate);
+      expect(pageTitle).to.contains(addWebservicePage.pageTitleCreate);
     });
 
     it('should create webservice key and check result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createWebserviceKey', baseContext);
 
       const textResult = await addWebservicePage.createEditWebservice(page, createWebserviceData);
-      await expect(textResult).to.equal(addWebservicePage.successfulCreationMessage);
+      expect(textResult).to.equal(addWebservicePage.successfulCreationMessage);
 
       const numberOfWebserviceKeysAfterCreation = await webservicePage.getNumberOfElementInGrid(page);
-      await expect(numberOfWebserviceKeysAfterCreation).to.be.equal(numberOfWebserviceKeys + 1);
+      expect(numberOfWebserviceKeysAfterCreation).to.be.equal(numberOfWebserviceKeys + 1);
     });
   });
 
@@ -98,7 +98,7 @@ describe('BO - Advanced Parameters - Webservice : Create, Read, Update and Delet
       );
 
       const key = await webservicePage.getTextColumnFromTable(page, 1, 'description');
-      await expect(key).to.contains(createWebserviceData.keyDescription);
+      expect(key).to.contains(createWebserviceData.keyDescription);
     });
 
     it('should go to edit webservice page', async function () {
@@ -107,21 +107,21 @@ describe('BO - Advanced Parameters - Webservice : Create, Read, Update and Delet
       await webservicePage.goToEditWebservicePage(page, 1);
 
       const pageTitle = await addWebservicePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addWebservicePage.pageTitleEdit);
+      expect(pageTitle).to.contains(addWebservicePage.pageTitleEdit);
     });
 
     it('should update the webservice key and check result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateWebserviceKey', baseContext);
 
       const textResult = await addWebservicePage.createEditWebservice(page, editWebserviceData);
-      await expect(textResult).to.equal(addWebservicePage.successfulUpdateMessage);
+      expect(textResult).to.equal(addWebservicePage.successfulUpdateMessage);
     });
 
     it('should reset filter and check the number of webservice keys', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterUpdate', baseContext);
 
       const numberOfWebserviceKeyAfterDelete = await webservicePage.resetAndGetNumberOfLines(page);
-      await expect(numberOfWebserviceKeyAfterDelete).to.be.equal(numberOfWebserviceKeys + 1);
+      expect(numberOfWebserviceKeyAfterDelete).to.be.equal(numberOfWebserviceKeys + 1);
     });
   });
 
@@ -138,21 +138,21 @@ describe('BO - Advanced Parameters - Webservice : Create, Read, Update and Delet
       );
 
       const key = await webservicePage.getTextColumnFromTable(page, 1, 'description');
-      await expect(key).to.contains(editWebserviceData.keyDescription);
+      expect(key).to.contains(editWebserviceData.keyDescription);
     });
 
     it('should delete webservice key', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteWebserviceKey', baseContext);
 
       const textResult = await webservicePage.deleteWebserviceKey(page, 1);
-      await expect(textResult).to.equal(webservicePage.successfulDeleteMessage);
+      expect(textResult).to.equal(webservicePage.successfulDeleteMessage);
     });
 
     it('should reset filter and check the number of webservice keys', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterDelete', baseContext);
 
       const numberOfWebserviceKeyAfterDelete = await webservicePage.resetAndGetNumberOfLines(page);
-      await expect(numberOfWebserviceKeyAfterDelete).to.be.equal(numberOfWebserviceKeys);
+      expect(numberOfWebserviceKeyAfterDelete).to.be.equal(numberOfWebserviceKeys);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/09_webservice/02_filterAndQuickEditWebservice.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/09_webservice/02_filterAndQuickEditWebservice.ts
index 842fdb2d89fcc..6e8e3093cbd75 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/09_webservice/02_filterAndQuickEditWebservice.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/09_webservice/02_filterAndQuickEditWebservice.ts
@@ -52,14 +52,14 @@ describe('BO - Advanced Parameters - Webservice : Filter and quick edit webservi
     await webservicePage.closeSfToolBar(page);
 
     const pageTitle = await webservicePage.getPageTitle(page);
-    await expect(pageTitle).to.contains(webservicePage.pageTitle);
+    expect(pageTitle).to.contains(webservicePage.pageTitle);
   });
 
   it('should reset all filters and get number of webservices', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'firstReset', baseContext);
 
     numberOfWebserviceKeys = await webservicePage.resetAndGetNumberOfLines(page);
-    if (numberOfWebserviceKeys !== 0) await expect(numberOfWebserviceKeys).to.be.above(0);
+    if (numberOfWebserviceKeys !== 0) expect(numberOfWebserviceKeys).to.be.above(0);
   });
 
   const tests = [
@@ -74,7 +74,7 @@ describe('BO - Advanced Parameters - Webservice : Filter and quick edit webservi
       await webservicePage.goToAddNewWebserviceKeyPage(page);
 
       const pageTitle = await addWebservicePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addWebservicePage.pageTitleCreate);
+      expect(pageTitle).to.contains(addWebservicePage.pageTitleCreate);
     });
 
     it('should create webservice key', async function () {
@@ -85,10 +85,10 @@ describe('BO - Advanced Parameters - Webservice : Filter and quick edit webservi
         test.args.webserviceToCreate,
         false,
       );
-      await expect(textResult).to.equal(addWebservicePage.successfulCreationMessage);
+      expect(textResult).to.equal(addWebservicePage.successfulCreationMessage);
 
       const numberOfWebserviceKeysAfterCreation = await webservicePage.getNumberOfElementInGrid(page);
-      await expect(numberOfWebserviceKeysAfterCreation).to.be.equal(numberOfWebserviceKeys + 1 + index);
+      expect(numberOfWebserviceKeysAfterCreation).to.be.equal(numberOfWebserviceKeys + 1 + index);
     });
   });
   describe('Filter webservice table', async () => {
@@ -138,10 +138,10 @@ describe('BO - Advanced Parameters - Webservice : Filter and quick edit webservi
         for (let i = 1; i <= numberOfElementAfterFilter; i++) {
           if (test.args.filterBy === 'active') {
             const wenServiceStatus = await webservicePage.getStatus(page, i);
-            await expect(wenServiceStatus).to.equal(test.args.filterValue === '1');
+            expect(wenServiceStatus).to.equal(test.args.filterValue === '1');
           } else {
             const textColumn = await webservicePage.getTextColumnFromTable(page, i, test.args.filterBy);
-            await expect(textColumn).to.contains(test.args.filterValue);
+            expect(textColumn).to.contains(test.args.filterValue);
           }
         }
       });
@@ -150,7 +150,7 @@ describe('BO - Advanced Parameters - Webservice : Filter and quick edit webservi
         await testContext.addContextItem(this, 'testIdentifier', `resetFilter_${index}`, baseContext);
 
         const numberOfElement = await webservicePage.resetAndGetNumberOfLines(page);
-        await expect(numberOfElement).to.be.equal(numberOfWebserviceKeys + 2);
+        expect(numberOfElement).to.be.equal(numberOfWebserviceKeys + 2);
       });
     });
   });
@@ -167,7 +167,7 @@ describe('BO - Advanced Parameters - Webservice : Filter and quick edit webservi
       );
 
       const key = await webservicePage.getTextColumnFromTable(page, 1, 'description');
-      await expect(key).to.contains(firstWebServiceData.keyDescription);
+      expect(key).to.contains(firstWebServiceData.keyDescription);
     });
 
     const statuses = [
@@ -187,11 +187,11 @@ describe('BO - Advanced Parameters - Webservice : Filter and quick edit webservi
 
         if (isActionPerformed) {
           const resultMessage = await webservicePage.getValidationMessage(page);
-          await expect(resultMessage).to.contains(webservicePage.successfulUpdateStatusMessage);
+          expect(resultMessage).to.contains(webservicePage.successfulUpdateStatusMessage);
         }
 
         const webserviceStatus = await webservicePage.getStatus(page, 1);
-        await expect(webserviceStatus).to.be.equal(webservice.args.enable);
+        expect(webserviceStatus).to.be.equal(webservice.args.enable);
       });
     });
   });
@@ -207,14 +207,14 @@ describe('BO - Advanced Parameters - Webservice : Filter and quick edit webservi
         await testContext.addContextItem(this, 'testIdentifier', `deleteWebserviceKey_${index}`, baseContext);
 
         const textResult = await webservicePage.deleteWebserviceKey(page, 1);
-        await expect(textResult).to.equal(webservicePage.successfulDeleteMessage);
+        expect(textResult).to.equal(webservicePage.successfulDeleteMessage);
       });
 
       it('should reset filter and check the number of webservice keys', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `resetFilterAfterDelete_${index}`, baseContext);
 
         const numberOfElement = await webservicePage.resetAndGetNumberOfLines(page);
-        await expect(numberOfElement).to.be.equal(numberOfWebserviceKeys - index + 1);
+        expect(numberOfElement).to.be.equal(numberOfWebserviceKeys - index + 1);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/09_webservice/03_helpCard.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/09_webservice/03_helpCard.ts
index 0be611df09fe9..f1f230256246f 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/09_webservice/03_helpCard.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/09_webservice/03_helpCard.ts
@@ -44,23 +44,23 @@ describe('BO - Advanced Parameters - Webservice : Help card in webservice page',
     await webservicePage.closeSfToolBar(page);
 
     const pageTitle = await webservicePage.getPageTitle(page);
-    await expect(pageTitle).to.contains(webservicePage.pageTitle);
+    expect(pageTitle).to.contains(webservicePage.pageTitle);
   });
 
   it('should open the help side bar and check the document language', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'openHelpSidebar', baseContext);
 
     const isHelpSidebarVisible = await webservicePage.openHelpSideBar(page);
-    await expect(isHelpSidebarVisible).to.be.true;
+    expect(isHelpSidebarVisible).to.eq(true);
 
     const documentURL = await webservicePage.getHelpDocumentURL(page);
-    await expect(documentURL).to.contains('country=en');
+    expect(documentURL).to.contains('country=en');
   });
 
   it('should close the help side bar', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'closeHelpSidebar', baseContext);
 
     const isHelpSidebarNotVisible = await webservicePage.closeHelpSideBar(page);
-    await expect(isHelpSidebarNotVisible).to.be.true;
+    expect(isHelpSidebarNotVisible).to.eq(true);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/09_webservice/04_sortPaginationAndBulkActions.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/09_webservice/04_sortPaginationAndBulkActions.ts
index d7932572d2370..235a4af2af891 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/09_webservice/04_sortPaginationAndBulkActions.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/09_webservice/04_sortPaginationAndBulkActions.ts
@@ -57,7 +57,7 @@ describe('BO - Advanced Parameters - Webservice : Sort, pagination and bulk acti
     await webservicePage.closeSfToolBar(page);
 
     const pageTitle = await webservicePage.getPageTitle(page);
-    await expect(pageTitle).to.contains(webservicePage.pageTitle);
+    expect(pageTitle).to.contains(webservicePage.pageTitle);
   });
 
   it('should reset all filters and get number of webservices', async function () {
@@ -65,7 +65,7 @@ describe('BO - Advanced Parameters - Webservice : Sort, pagination and bulk acti
 
     numberOfWebserviceKeys = await webservicePage.resetAndGetNumberOfLines(page);
     if (numberOfWebserviceKeys !== 0) {
-      await expect(numberOfWebserviceKeys).to.be.above(0);
+      expect(numberOfWebserviceKeys).to.be.above(0);
     }
   });
 
@@ -81,17 +81,17 @@ describe('BO - Advanced Parameters - Webservice : Sort, pagination and bulk acti
         await webservicePage.goToAddNewWebserviceKeyPage(page);
 
         const pageTitle = await addWebservicePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addWebservicePage.pageTitleCreate);
+        expect(pageTitle).to.contains(addWebservicePage.pageTitleCreate);
       });
 
       it(`should create webservice key n°${index + 1}`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `createWebserviceKey_${index}`, baseContext);
 
         const textResult = await addWebservicePage.createEditWebservice(page, webserviceData, true);
-        await expect(textResult).to.equal(addWebservicePage.successfulCreationMessage);
+        expect(textResult).to.equal(addWebservicePage.successfulCreationMessage);
 
         const numberOfWebserviceKeysAfterCreation = await webservicePage.getNumberOfElementInGrid(page);
-        await expect(numberOfWebserviceKeysAfterCreation).to.be.equal(numberOfWebserviceKeys + 1 + index);
+        expect(numberOfWebserviceKeysAfterCreation).to.be.equal(numberOfWebserviceKeys + 1 + index);
       });
     });
   });
@@ -147,9 +147,9 @@ describe('BO - Advanced Parameters - Webservice : Sort, pagination and bulk acti
         const expectedResult = await basicHelper.sortArray(nonSortedTable);
 
         if (test.args.sortDirection === 'asc') {
-          await expect(sortedTable).to.deep.equal(expectedResult);
+          expect(sortedTable).to.deep.equal(expectedResult);
         } else {
-          await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+          expect(sortedTable).to.deep.equal(expectedResult.reverse());
         }
       });
     });
@@ -163,7 +163,7 @@ describe('BO - Advanced Parameters - Webservice : Sort, pagination and bulk acti
       await webservicePage.filterWebserviceTable(page, 'input', 'description', 'todelete');
 
       const key = await webservicePage.getTextColumnFromTable(page, 1, 'description');
-      await expect(key).to.contains('todelete');
+      expect(key).to.contains('todelete');
     });
 
     const tests = [
@@ -176,13 +176,13 @@ describe('BO - Advanced Parameters - Webservice : Sort, pagination and bulk acti
         await testContext.addContextItem(this, 'testIdentifier', `${test.args.action}WebserviceKey`, baseContext);
 
         const textResult = await webservicePage.bulkSetStatus(page, test.args.enabledValue);
-        await expect(textResult).to.be.equal(webservicePage.successfulUpdateStatusMessage);
+        expect(textResult).to.be.equal(webservicePage.successfulUpdateStatusMessage);
 
         const numberOfWebserviceKeys = await webservicePage.getNumberOfElementInGrid(page);
 
         for (let i = 1; i <= numberOfWebserviceKeys; i++) {
           const webserviceStatus = await webservicePage.getStatus(page, i);
-          await expect(webserviceStatus).to.equal(test.args.enabledValue);
+          expect(webserviceStatus).to.equal(test.args.enabledValue);
         }
       });
     });
@@ -196,21 +196,21 @@ describe('BO - Advanced Parameters - Webservice : Sort, pagination and bulk acti
       await webservicePage.filterWebserviceTable(page, 'input', 'description', 'todelete');
 
       const key = await webservicePage.getTextColumnFromTable(page, 1, 'description');
-      await expect(key).to.contains('todelete');
+      expect(key).to.contains('todelete');
     });
 
     it('should delete webservice keys created', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteWebserviceKey', baseContext);
 
       const textResult = await webservicePage.deleteWithBulkActions(page);
-      await expect(textResult).to.equal(webservicePage.successfulMultiDeleteMessage);
+      expect(textResult).to.equal(webservicePage.successfulMultiDeleteMessage);
     });
 
     it('should reset filter and check the number of webservice keys', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterDelete', baseContext);
 
       const numberOfElement = await webservicePage.resetAndGetNumberOfLines(page);
-      await expect(numberOfElement).to.be.equal(numberOfWebserviceKeys);
+      expect(numberOfElement).to.be.equal(numberOfWebserviceKeys);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/01_CRUDShopGroups.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/01_CRUDShopGroups.ts
index 704ad6fe70721..5509fc0c647fd 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/01_CRUDShopGroups.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/01_CRUDShopGroups.ts
@@ -64,14 +64,14 @@ describe('BO - Advanced Parameters - Multistore : Create, Read, Update and Delet
       await multiStorePage.closeSfToolBar(page);
 
       const pageTitle = await multiStorePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(multiStorePage.pageTitle);
+      expect(pageTitle).to.contains(multiStorePage.pageTitle);
     });
 
     it('should get number of shop group', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'getNumberOfShopGroups', baseContext);
 
       numberOfShopGroups = await multiStorePage.getNumberOfElementInGrid(page);
-      await expect(numberOfShopGroups).to.be.above(0);
+      expect(numberOfShopGroups).to.be.above(0);
     });
 
     it('should go to add new shop group page', async function () {
@@ -80,17 +80,17 @@ describe('BO - Advanced Parameters - Multistore : Create, Read, Update and Delet
       await multiStorePage.goToNewShopGroupPage(page);
 
       const pageTitle = await addShopGroupPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addShopGroupPage.pageTitleCreate);
+      expect(pageTitle).to.contains(addShopGroupPage.pageTitleCreate);
     });
 
     it('should create shop group and check result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createShopGroup', baseContext);
 
       const textResult = await addShopGroupPage.setShopGroup(page, createShopGroupData);
-      await expect(textResult).to.contains(addShopGroupPage.successfulCreationMessage);
+      expect(textResult).to.contains(addShopGroupPage.successfulCreationMessage);
 
       const numberOfShopGroupsAfterCreation = await multiStorePage.getNumberOfElementInGrid(page);
-      await expect(numberOfShopGroupsAfterCreation).to.be.equal(numberOfShopGroups + 1);
+      expect(numberOfShopGroupsAfterCreation).to.be.equal(numberOfShopGroups + 1);
     });
   });
 
@@ -103,17 +103,17 @@ describe('BO - Advanced Parameters - Multistore : Create, Read, Update and Delet
       await multiStorePage.gotoEditShopGroupPage(page, 1);
 
       const pageTitle = await addShopGroupPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addShopGroupPage.pageTitleEdit);
+      expect(pageTitle).to.contains(addShopGroupPage.pageTitleEdit);
     });
 
     it('should edit shop group and check result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateShopGroup', baseContext);
 
       const textResult = await addShopGroupPage.setShopGroup(page, updateShopGroupData);
-      await expect(textResult).to.contains(addShopGroupPage.successfulUpdateMessage);
+      expect(textResult).to.contains(addShopGroupPage.successfulUpdateMessage);
 
       const numberOfShopGroupsAfterUpdate = await multiStorePage.resetAndGetNumberOfLines(page);
-      await expect(numberOfShopGroupsAfterUpdate).to.be.equal(numberOfShopGroups + 1);
+      expect(numberOfShopGroupsAfterUpdate).to.be.equal(numberOfShopGroups + 1);
     });
   });
 
@@ -125,21 +125,21 @@ describe('BO - Advanced Parameters - Multistore : Create, Read, Update and Delet
       await multiStorePage.goToNewShopPage(page);
 
       const pageTitle = await addShopPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addShopPage.pageTitleCreate);
+      expect(pageTitle).to.contains(addShopPage.pageTitleCreate);
     });
 
     it('should create shop', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createShop', baseContext);
 
       const textResult = await addShopPage.setShop(page, shopData);
-      await expect(textResult).to.contains(multiStorePage.successfulCreationMessage);
+      expect(textResult).to.contains(multiStorePage.successfulCreationMessage);
     });
 
     it('should get the id of the new shop', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'getShopID', baseContext);
 
       const numberOfShops = await shopPage.getNumberOfElementInGrid(page);
-      await expect(numberOfShops).to.be.above(0);
+      expect(numberOfShops).to.be.above(0);
 
       shopID = parseInt(await shopPage.getTextColumn(page, 1, 'id_shop'), 10);
     });
@@ -158,7 +158,7 @@ describe('BO - Advanced Parameters - Multistore : Create, Read, Update and Delet
       await multiStorePage.closeSfToolBar(page);
 
       const pageTitle = await multiStorePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(multiStorePage.pageTitle);
+      expect(pageTitle).to.contains(multiStorePage.pageTitle);
     });
 
     it('should check that there is no delete button', async function () {
@@ -167,7 +167,7 @@ describe('BO - Advanced Parameters - Multistore : Create, Read, Update and Delet
       await multiStorePage.filterTable(page, 'a!name', updateShopGroupData.name);
 
       const isVisible = await multiStorePage.isActionToggleButtonVisible(page, 1);
-      await expect(isVisible).to.be.false;
+      expect(isVisible).to.eq(false);
     });
   });
 
@@ -179,22 +179,22 @@ describe('BO - Advanced Parameters - Multistore : Create, Read, Update and Delet
       await multiStorePage.goToShopPage(page, shopID);
 
       const pageTitle = await shopPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(updateShopGroupData.name);
+      expect(pageTitle).to.contains(updateShopGroupData.name);
     });
 
     it('should delete the shop', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteShop', baseContext);
 
       const numberOfShops = await shopPage.getNumberOfElementInGrid(page);
-      await expect(numberOfShops).to.be.above(1);
+      expect(numberOfShops).to.be.above(1);
 
       await shopPage.filterTable(page, 'a!name', shopData.name);
 
       const textResult = await shopPage.deleteShop(page, 1);
-      await expect(textResult).to.contains(shopPage.successfulDeleteMessage);
+      expect(textResult).to.contains(shopPage.successfulDeleteMessage);
 
       const numberOfShopsAfterDelete = await shopPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfShopsAfterDelete).to.be.equal(1);
+      expect(numberOfShopsAfterDelete).to.be.equal(1);
     });
 
     it('should go to \'Advanced parameters > Multistore\' page', async function () {
@@ -207,7 +207,7 @@ describe('BO - Advanced Parameters - Multistore : Create, Read, Update and Delet
       );
 
       const pageTitle = await multiStorePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(multiStorePage.pageTitle);
+      expect(pageTitle).to.contains(multiStorePage.pageTitle);
     });
 
     it('should delete the shop group', async function () {
@@ -216,10 +216,10 @@ describe('BO - Advanced Parameters - Multistore : Create, Read, Update and Delet
       await multiStorePage.filterTable(page, 'a!name', updateShopGroupData.name);
 
       const textResult = await multiStorePage.deleteShopGroup(page, 1);
-      await expect(textResult).to.contains(multiStorePage.successfulDeleteMessage);
+      expect(textResult).to.contains(multiStorePage.successfulDeleteMessage);
 
       const numberOfShopGroupsAfterDelete = await multiStorePage.resetAndGetNumberOfLines(page);
-      await expect(numberOfShopGroupsAfterDelete).to.be.equal(numberOfShopGroups);
+      expect(numberOfShopGroupsAfterDelete).to.be.equal(numberOfShopGroups);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/02_filterSortAndPaginationShopGroups.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/02_filterSortAndPaginationShopGroups.ts
index 7c0b9ce9a2647..f6d88959020ef 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/02_filterSortAndPaginationShopGroups.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/02_filterSortAndPaginationShopGroups.ts
@@ -65,14 +65,14 @@ describe('BO - Advanced Parameters - MultiStore : Filter, sort and pagination sh
       await multiStorePage.closeSfToolBar(page);
 
       const pageTitle = await multiStorePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(multiStorePage.pageTitle);
+      expect(pageTitle).to.contains(multiStorePage.pageTitle);
     });
 
     it('should get number of shop groups', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'getNumberOfShopGroups', baseContext);
 
       numberOfShopGroups = await multiStorePage.getNumberOfElementInGrid(page);
-      await expect(numberOfShopGroups).to.be.above(0);
+      expect(numberOfShopGroups).to.be.above(0);
     });
   });
 
@@ -86,17 +86,17 @@ describe('BO - Advanced Parameters - MultiStore : Filter, sort and pagination sh
         await multiStorePage.goToNewShopGroupPage(page);
 
         const pageTitle = await addShopGroupPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addShopGroupPage.pageTitleCreate);
+        expect(pageTitle).to.contains(addShopGroupPage.pageTitleCreate);
       });
 
       it(`should create shop group n°${index + 1} and check result`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `createShopGroup${index}`, baseContext);
 
         const textResult = await addShopGroupPage.setShopGroup(page, shopGroupData);
-        await expect(textResult).to.contains(addShopGroupPage.successfulCreationMessage);
+        expect(textResult).to.contains(addShopGroupPage.successfulCreationMessage);
 
         const numberOfShopGroupsAfterCreation = await multiStorePage.getNumberOfElementInGrid(page);
-        await expect(numberOfShopGroupsAfterCreation).to.be.equal(numberOfShopGroups + 1 + index);
+        expect(numberOfShopGroupsAfterCreation).to.be.equal(numberOfShopGroups + 1 + index);
       });
     });
   });
@@ -116,7 +116,7 @@ describe('BO - Advanced Parameters - MultiStore : Filter, sort and pagination sh
 
         for (let i = 1; i <= numberOfElementAfterFilter; i++) {
           const textColumn = await multiStorePage.getTextColumn(page, i, test.args.filterBy);
-          await expect(textColumn).to.contains(test.args.filterValue);
+          expect(textColumn).to.contains(test.args.filterValue);
         }
       });
 
@@ -124,7 +124,7 @@ describe('BO - Advanced Parameters - MultiStore : Filter, sort and pagination sh
         await testContext.addContextItem(this, 'testIdentifier', `resetFilter_${index}`, baseContext);
 
         const numberOfElement = await multiStorePage.resetAndGetNumberOfLines(page);
-        await expect(numberOfElement).to.be.equal(numberOfShopGroups + 20);
+        expect(numberOfElement).to.be.equal(numberOfShopGroups + 20);
       });
     });
   });
@@ -203,17 +203,17 @@ describe('BO - Advanced Parameters - MultiStore : Filter, sort and pagination sh
           const expectedResult = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
           if (test.args.sortDirection === 'up') {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+            expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+            expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
         } else {
           const expectedResult = await basicHelper.sortArray(nonSortedTable);
 
           if (test.args.sortDirection === 'up') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         }
       });
@@ -229,10 +229,10 @@ describe('BO - Advanced Parameters - MultiStore : Filter, sort and pagination sh
         await multiStorePage.filterTable(page, 'a!name', `todelete${index}`);
 
         const textResult = await multiStorePage.deleteShopGroup(page, 1);
-        await expect(textResult).to.contains(multiStorePage.successfulDeleteMessage);
+        expect(textResult).to.contains(multiStorePage.successfulDeleteMessage);
 
         const numberOfShopGroupsAfterDelete = await multiStorePage.resetAndGetNumberOfLines(page);
-        await expect(numberOfShopGroupsAfterDelete).to.be.equal(numberOfShopGroups + 20 - index - 1);
+        expect(numberOfShopGroupsAfterDelete).to.be.equal(numberOfShopGroups + 20 - index - 1);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/03_CRUDShops.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/03_CRUDShops.ts
index 59b6331d25ef8..7ebdfba909fd1 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/03_CRUDShops.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/03_CRUDShops.ts
@@ -60,7 +60,7 @@ describe('BO - Advanced Parameters - Multistore : Create, Read, Update and Delet
       await multiStorePage.closeSfToolBar(page);
 
       const pageTitle = await multiStorePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(multiStorePage.pageTitle);
+      expect(pageTitle).to.contains(multiStorePage.pageTitle);
     });
 
     it('should go to add new shop page', async function () {
@@ -69,21 +69,21 @@ describe('BO - Advanced Parameters - Multistore : Create, Read, Update and Delet
       await multiStorePage.goToNewShopPage(page);
 
       const pageTitle = await addShopPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addShopPage.pageTitleCreate);
+      expect(pageTitle).to.contains(addShopPage.pageTitleCreate);
     });
 
     it('should create shop', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createShop', baseContext);
 
       const textResult = await addShopPage.setShop(page, createShopData);
-      await expect(textResult).to.contains(multiStorePage.successfulCreationMessage);
+      expect(textResult).to.contains(multiStorePage.successfulCreationMessage);
     });
 
     it('should get the id of the new shop', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'getShopID', baseContext);
 
       const numberOfShops = await shopPage.getNumberOfElementInGrid(page);
-      await expect(numberOfShops).to.be.above(0);
+      expect(numberOfShops).to.be.above(0);
 
       shopID = parseInt(await shopPage.getTextColumn(page, 1, 'id_shop'), 10);
     });
@@ -98,14 +98,14 @@ describe('BO - Advanced Parameters - Multistore : Create, Read, Update and Delet
       await shopPage.gotoEditShopPage(page, 1);
 
       const pageTitle = await addShopPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addShopPage.pageTitleEdit);
+      expect(pageTitle).to.contains(addShopPage.pageTitleEdit);
     });
 
     it('should edit shop and check result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateShop', baseContext);
 
       const textResult = await addShopPage.setShop(page, updateShopData);
-      await expect(textResult).to.contains(addShopPage.successfulUpdateMessage);
+      expect(textResult).to.contains(addShopPage.successfulUpdateMessage);
     });
 
     it('should go to add URL', async function () {
@@ -115,14 +115,14 @@ describe('BO - Advanced Parameters - Multistore : Create, Read, Update and Delet
       await shopPage.goToSetURL(page, 1);
 
       const pageTitle = await addShopUrlPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addShopUrlPage.pageTitleCreate);
+      expect(pageTitle).to.contains(addShopUrlPage.pageTitleCreate);
     });
 
     it('should set URL', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'addURL', baseContext);
 
       const textResult = await addShopUrlPage.setVirtualUrl(page, updateShopData);
-      await expect(textResult).to.contains(addShopUrlPage.successfulCreationMessage);
+      expect(textResult).to.contains(addShopUrlPage.successfulCreationMessage);
     });
   });
 
@@ -134,7 +134,7 @@ describe('BO - Advanced Parameters - Multistore : Create, Read, Update and Delet
       await multiStorePage.goToShopPage(page, shopID);
 
       const pageTitle = await shopPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(updateShopData.name);
+      expect(pageTitle).to.contains(updateShopData.name);
     });
 
     it('should delete the shop', async function () {
@@ -143,7 +143,7 @@ describe('BO - Advanced Parameters - Multistore : Create, Read, Update and Delet
       await shopPage.filterTable(page, 'a!name', updateShopData.name);
 
       const textResult = await shopPage.deleteShop(page, 1);
-      await expect(textResult).to.contains(shopPage.successfulDeleteMessage);
+      expect(textResult).to.contains(shopPage.successfulDeleteMessage);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/04_filterSortAndPaginationShops.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/04_filterSortAndPaginationShops.ts
index fcaa2cd7b44ca..a52b1632c961d 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/04_filterSortAndPaginationShops.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/04_filterSortAndPaginationShops.ts
@@ -65,7 +65,7 @@ describe('BO - Advanced Parameters - Multistore : Filter, sort and pagination sh
       await multiStorePage.closeSfToolBar(page);
 
       const pageTitle = await multiStorePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(multiStorePage.pageTitle);
+      expect(pageTitle).to.contains(multiStorePage.pageTitle);
     });
 
     it('should go to add new shop page', async function () {
@@ -74,14 +74,14 @@ describe('BO - Advanced Parameters - Multistore : Filter, sort and pagination sh
       await multiStorePage.goToNewShopPage(page);
 
       const pageTitle = await addShopPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addShopPage.pageTitleCreate);
+      expect(pageTitle).to.contains(addShopPage.pageTitleCreate);
     });
 
     it('should create shop', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createFirstShop', baseContext);
 
       const textResult = await addShopPage.setShop(page, shopCreate);
-      await expect(textResult).to.contains(multiStorePage.successfulCreationMessage);
+      expect(textResult).to.contains(multiStorePage.successfulCreationMessage);
     });
   });
 
@@ -99,14 +99,14 @@ describe('BO - Advanced Parameters - Multistore : Filter, sort and pagination sh
         await shopPage.goToNewShopPage(page);
 
         const pageTitle = await addShopPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addShopPage.pageTitleCreate);
+        expect(pageTitle).to.contains(addShopPage.pageTitleCreate);
       });
 
       it(`should create shop n°${index + 1}`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `createShop${index}`, baseContext);
 
         const textResult = await addShopPage.setShop(page, shopCreate);
-        await expect(textResult).to.contains(multiStorePage.successfulCreationMessage);
+        expect(textResult).to.contains(multiStorePage.successfulCreationMessage);
       });
     });
   });
@@ -129,7 +129,7 @@ describe('BO - Advanced Parameters - Multistore : Filter, sort and pagination sh
 
         for (let i = 1; i <= numberOfElementAfterFilter; i++) {
           const textColumn = await shopPage.getTextColumn(page, i, test.args.filterBy);
-          await expect(textColumn).to.contains(test.args.filterValue);
+          expect(textColumn).to.contains(test.args.filterValue);
         }
       });
 
@@ -137,7 +137,7 @@ describe('BO - Advanced Parameters - Multistore : Filter, sort and pagination sh
         await testContext.addContextItem(this, 'testIdentifier', `resetFilter_${index}`, baseContext);
 
         const numberOfElement = await shopPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfElement).to.be.above(20);
+        expect(numberOfElement).to.be.above(20);
       });
     });
   });
@@ -252,17 +252,17 @@ describe('BO - Advanced Parameters - Multistore : Filter, sort and pagination sh
           const expectedResult = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
           if (test.args.sortDirection === 'up') {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+            expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+            expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
         } else {
           const expectedResult = await basicHelper.sortArray(nonSortedTable);
 
           if (test.args.sortDirection === 'up') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         }
       });
@@ -278,7 +278,7 @@ describe('BO - Advanced Parameters - Multistore : Filter, sort and pagination sh
         await shopPage.filterTable(page, 'a!name', `Todelete${index}`);
 
         const textResult = await shopPage.deleteShop(page, 1);
-        await expect(textResult).to.contains(shopPage.successfulDeleteMessage);
+        expect(textResult).to.contains(shopPage.successfulDeleteMessage);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/05_filterSortAndPaginationShopUrls.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/05_filterSortAndPaginationShopUrls.ts
index 6bff9d0c36ec0..4e6450e8df12b 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/05_filterSortAndPaginationShopUrls.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/05_filterSortAndPaginationShopUrls.ts
@@ -63,7 +63,7 @@ describe('BO - Advanced Parameters - Multistore : Filter, sort and pagination sh
       );
 
       const pageTitle = await multiStorePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(multiStorePage.pageTitle);
+      expect(pageTitle).to.contains(multiStorePage.pageTitle);
     });
 
     it('should go to \'Shop Urls\' page', async function () {
@@ -72,7 +72,7 @@ describe('BO - Advanced Parameters - Multistore : Filter, sort and pagination sh
       await multiStorePage.goToShopURLPage(page, 1);
 
       const pageTitle = await multiStorePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(multiStorePage.pageTitle);
+      expect(pageTitle).to.contains(multiStorePage.pageTitle);
     });
   });
 
@@ -90,14 +90,14 @@ describe('BO - Advanced Parameters - Multistore : Filter, sort and pagination sh
         await shopUrlPage.goToAddNewUrl(page);
 
         const pageTitle = await addShopUrlPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addShopUrlPage.pageTitleCreate);
+        expect(pageTitle).to.contains(addShopUrlPage.pageTitleCreate);
       });
 
       it(`should create shop URl n°${index + 1}`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `addURL${index}`, baseContext);
 
         const textResult = await addShopUrlPage.setVirtualUrl(page, shopUrlData);
-        await expect(textResult).to.contains(addShopUrlPage.successfulCreationMessage);
+        expect(textResult).to.contains(addShopUrlPage.successfulCreationMessage);
       });
     });
   });
@@ -125,9 +125,9 @@ describe('BO - Advanced Parameters - Multistore : Filter, sort and pagination sh
           const textColumn = await shopUrlPage.getTextColumn(page, i, test.args.filterBy);
 
           if (test.expected !== undefined) {
-            await expect(textColumn).to.contains(test.expected);
+            expect(textColumn).to.contains(test.expected);
           } else {
-            await expect(textColumn).to.contains(test.args.filterValue);
+            expect(textColumn).to.contains(test.args.filterValue);
           }
         }
       });
@@ -136,7 +136,7 @@ describe('BO - Advanced Parameters - Multistore : Filter, sort and pagination sh
         await testContext.addContextItem(this, 'testIdentifier', `resetFilter_${index}`, baseContext);
 
         const numberOfElement = await shopUrlPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfElement).to.be.above(20);
+        expect(numberOfElement).to.be.above(20);
       });
     });
   });
@@ -227,17 +227,17 @@ describe('BO - Advanced Parameters - Multistore : Filter, sort and pagination sh
           const expectedResult = await basicHelper.sortArrayNumber(nonSortedTableFloat);
 
           if (test.args.sortDirection === 'up') {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult);
+            expect(sortedTableFloat).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
+            expect(sortedTableFloat).to.deep.equal(expectedResult.reverse());
           }
         } else {
           const expectedResult = await basicHelper.sortArray(nonSortedTable);
 
           if (test.args.sortDirection === 'up') {
-            await expect(sortedTable).to.deep.equal(expectedResult);
+            expect(sortedTable).to.deep.equal(expectedResult);
           } else {
-            await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+            expect(sortedTable).to.deep.equal(expectedResult.reverse());
           }
         }
       });
@@ -253,7 +253,7 @@ describe('BO - Advanced Parameters - Multistore : Filter, sort and pagination sh
         await shopUrlPage.filterTable(page, 'input', 'url', `ToDelete${index + 1}Shop`);
 
         const textResult = await shopUrlPage.deleteShopURL(page, 1);
-        await expect(textResult).to.contains(shopUrlPage.successfulDeleteMessage);
+        expect(textResult).to.contains(shopUrlPage.successfulDeleteMessage);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/06_quickEditAndBulkActionsShopUrls.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/06_quickEditAndBulkActionsShopUrls.ts
index 83d0e21766e5a..2b7e4acc07688 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/06_quickEditAndBulkActionsShopUrls.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/06_quickEditAndBulkActionsShopUrls.ts
@@ -63,7 +63,7 @@ describe('BO - Advanced Parameters - Multistore : Quick edit and bulk actions sh
       );
 
       const pageTitle = await multiStorePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(multiStorePage.pageTitle);
+      expect(pageTitle).to.contains(multiStorePage.pageTitle);
     });
 
     it('should go to shop Urls page', async function () {
@@ -72,14 +72,14 @@ describe('BO - Advanced Parameters - Multistore : Quick edit and bulk actions sh
       await multiStorePage.goToShopURLPage(page, 1);
 
       const pageTitle = await multiStorePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(multiStorePage.pageTitle);
+      expect(pageTitle).to.contains(multiStorePage.pageTitle);
     });
 
     it('should reset filter and get the number of shop urls', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilter', baseContext);
 
       numberOfShopUrls = await shopUrlPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfShopUrls).to.be.above(0);
+      expect(numberOfShopUrls).to.be.above(0);
     });
   });
 
@@ -91,14 +91,14 @@ describe('BO - Advanced Parameters - Multistore : Quick edit and bulk actions sh
       await shopUrlPage.goToAddNewUrl(page);
 
       const pageTitle = await addShopUrlPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addShopUrlPage.pageTitleCreate);
+      expect(pageTitle).to.contains(addShopUrlPage.pageTitleCreate);
     });
 
     it('should create shop URL', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'addURL', baseContext);
 
       const textResult = await addShopUrlPage.setVirtualUrl(page, ShopUrlData);
-      await expect(textResult).to.contains(addShopUrlPage.successfulCreationMessage);
+      expect(textResult).to.contains(addShopUrlPage.successfulCreationMessage);
     });
   });
 
@@ -113,7 +113,7 @@ describe('BO - Advanced Parameters - Multistore : Quick edit and bulk actions sh
 
       for (let i = 1; i <= numberOfShopUrlsAfterFilter; i++) {
         const textColumn = await shopUrlPage.getTextColumn(page, i, 'url');
-        await expect(textColumn).to.contains(ShopUrlData.name);
+        expect(textColumn).to.contains(ShopUrlData.name);
       }
     });
 
@@ -143,14 +143,14 @@ describe('BO - Advanced Parameters - Multistore : Quick edit and bulk actions sh
           const resultMessage = await shopUrlPage.getAlertSuccessBlockContent(page);
 
           if (test.args.columnName === 'Enabled') {
-            await expect(resultMessage).to.contains(shopUrlPage.successUpdateMessage);
+            expect(resultMessage).to.contains(shopUrlPage.successUpdateMessage);
           } else {
-            await expect(resultMessage).to.contains(shopUrlPage.successfulUpdateMessage);
+            expect(resultMessage).to.contains(shopUrlPage.successfulUpdateMessage);
           }
         }
 
         const carrierStatus = await shopUrlPage.getStatus(page, 1, test.args.column);
-        await expect(carrierStatus).to.be.equal(test.args.enabledValue);
+        expect(carrierStatus).to.be.equal(test.args.enabledValue);
       });
     });
 
@@ -158,7 +158,7 @@ describe('BO - Advanced Parameters - Multistore : Quick edit and bulk actions sh
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterEnableDisable', baseContext);
 
       const numberOfShopUrlsAfterReset = await shopUrlPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfShopUrlsAfterReset).to.be.equal(numberOfShopUrls + 1);
+      expect(numberOfShopUrlsAfterReset).to.be.equal(numberOfShopUrls + 1);
     });
 
     it('should set the default URL as the main URL', async function () {
@@ -168,11 +168,11 @@ describe('BO - Advanced Parameters - Multistore : Quick edit and bulk actions sh
 
       if (isActionPerformed) {
         const resultMessage = await shopUrlPage.getAlertSuccessBlockContent(page);
-        await expect(resultMessage).to.contains(shopUrlPage.successfulUpdateMessage);
+        expect(resultMessage).to.contains(shopUrlPage.successfulUpdateMessage);
       }
 
       const carrierStatus = await shopUrlPage.getStatus(page, 1, '5');
-      await expect(carrierStatus).to.be.equal(true);
+      expect(carrierStatus).to.be.equal(true);
     });
   });
 
@@ -187,7 +187,7 @@ describe('BO - Advanced Parameters - Multistore : Quick edit and bulk actions sh
 
       for (let i = 1; i <= numberOfShopUrlsAfterFilter; i++) {
         const textColumn = await shopUrlPage.getTextColumn(page, i, 'url');
-        await expect(textColumn).to.contains(ShopUrlData.name);
+        expect(textColumn).to.contains(ShopUrlData.name);
       }
     });
 
@@ -201,7 +201,7 @@ describe('BO - Advanced Parameters - Multistore : Quick edit and bulk actions sh
         await shopUrlPage.bulkSetStatus(page, test.args.enable);
 
         const textResult = await shopUrlPage.getAlertSuccessBlockContent(page);
-        await expect(textResult, 'Status is not updated!').to.contains(shopUrlPage.successUpdateMessage);
+        expect(textResult, 'Status is not updated!').to.contains(shopUrlPage.successUpdateMessage);
       });
     });
 
@@ -209,7 +209,7 @@ describe('BO - Advanced Parameters - Multistore : Quick edit and bulk actions sh
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterBulkActions', baseContext);
 
       const numberOfShopUrlsAfterReset = await shopUrlPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfShopUrlsAfterReset).to.be.equal(numberOfShopUrls + 1);
+      expect(numberOfShopUrlsAfterReset).to.be.equal(numberOfShopUrls + 1);
     });
   });
 
@@ -221,7 +221,7 @@ describe('BO - Advanced Parameters - Multistore : Quick edit and bulk actions sh
       await shopUrlPage.filterTable(page, 'input', 'url', ShopUrlData.name);
 
       const textResult = await shopUrlPage.deleteShopURL(page, 1);
-      await expect(textResult).to.contains(shopUrlPage.successfulDeleteMessage);
+      expect(textResult).to.contains(shopUrlPage.successfulDeleteMessage);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/07_editUrlOptions.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/07_editUrlOptions.ts
index bcfd6d3892856..952ddc0b2b1b0 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/07_editUrlOptions.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/10_multistore/07_editUrlOptions.ts
@@ -65,7 +65,7 @@ describe('BO - Advanced Parameters - Multistore : Edit URL options', async () =>
       );
 
       const pageTitle = await multiStorePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(multiStorePage.pageTitle);
+      expect(pageTitle).to.contains(multiStorePage.pageTitle);
     });
 
     it('should go to \'Shop Urls\' page', async function () {
@@ -74,7 +74,7 @@ describe('BO - Advanced Parameters - Multistore : Edit URL options', async () =>
       await multiStorePage.goToShopURLPage(page, 1);
 
       const pageTitle = await multiStorePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(multiStorePage.pageTitle);
+      expect(pageTitle).to.contains(multiStorePage.pageTitle);
     });
   });
 
@@ -86,21 +86,21 @@ describe('BO - Advanced Parameters - Multistore : Edit URL options', async () =>
       await shopUrlPage.goToEditShopURLPage(page, 1);
 
       const pageTitle = await editShopUrlPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(editShopUrlPage.pageTitleEdit);
+      expect(pageTitle).to.contains(editShopUrlPage.pageTitleEdit);
     });
 
     it('should disable the main URL and check the error message', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'disableMainURL', baseContext);
 
       const errorAlertMessage = await editShopUrlPage.setMainURL(page, 'off');
-      await expect(errorAlertMessage).to.contains(editShopUrlPage.errorDisableMainURLMessage);
+      expect(errorAlertMessage).to.contains(editShopUrlPage.errorDisableMainURLMessage);
     });
 
     it('should disable the shop and check the error message', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'disableShop', baseContext);
 
       const errorAlertMessage = await editShopUrlPage.setShopStatus(page, 'off');
-      await expect(errorAlertMessage).to.contains(editShopUrlPage.errorDisableMainURLMessage)
+      expect(errorAlertMessage).to.contains(editShopUrlPage.errorDisableMainURLMessage)
         .and.to.contains(editShopUrlPage.ErrorDisableShopMessage);
     });
 
@@ -110,14 +110,14 @@ describe('BO - Advanced Parameters - Multistore : Edit URL options', async () =>
       await shopUrlPage.goToAddNewUrl(page);
 
       const pageTitle = await editShopUrlPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(editShopUrlPage.pageTitleCreate);
+      expect(pageTitle).to.contains(editShopUrlPage.pageTitleCreate);
     });
 
     it('should create shop URL', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'addURL', baseContext);
 
       const textResult = await editShopUrlPage.setVirtualUrl(page, ShopUrlData);
-      await expect(textResult).to.contains(editShopUrlPage.successfulCreationMessage);
+      expect(textResult).to.contains(editShopUrlPage.successfulCreationMessage);
     });
 
     it('should disable the shop URL for the created url', async function () {
@@ -126,7 +126,7 @@ describe('BO - Advanced Parameters - Multistore : Edit URL options', async () =>
       await shopUrlPage.setStatus(page, 2, '6', false);
 
       const resultMessage = await shopUrlPage.getAlertSuccessBlockContent(page);
-      await expect(resultMessage).to.contains(shopUrlPage.successUpdateMessage);
+      expect(resultMessage).to.contains(shopUrlPage.successUpdateMessage);
     });
 
     it('should enable the main URL for the created url', async function () {
@@ -136,11 +136,11 @@ describe('BO - Advanced Parameters - Multistore : Edit URL options', async () =>
 
       if (isActionPerformed) {
         const resultMessage = await shopUrlPage.getAlertSuccessBlockContent(page);
-        await expect(resultMessage).to.contains(shopUrlPage.successfulUpdateMessage);
+        expect(resultMessage).to.contains(shopUrlPage.successfulUpdateMessage);
       }
 
       const status = await shopUrlPage.getStatus(page, 1, '6');
-      await expect(status).to.be.true;
+      expect(status).to.eq(true);
     });
 
     it('should enable the main URL for the first url', async function () {
@@ -149,10 +149,10 @@ describe('BO - Advanced Parameters - Multistore : Edit URL options', async () =>
       await shopUrlPage.setStatus(page, 1, '5', true);
 
       const resultMessage = await shopUrlPage.getAlertSuccessBlockContent(page);
-      await expect(resultMessage).to.contains(shopUrlPage.successfulUpdateMessage);
+      expect(resultMessage).to.contains(shopUrlPage.successfulUpdateMessage);
 
       const mainStatus = await shopUrlPage.getStatus(page, 1, '6');
-      await expect(mainStatus).to.be.true;
+      expect(mainStatus).to.eq(true);
     });
   });
 
@@ -162,7 +162,7 @@ describe('BO - Advanced Parameters - Multistore : Edit URL options', async () =>
       await testContext.addContextItem(this, 'testIdentifier', 'deleteShop', baseContext);
 
       const textResult = await shopUrlPage.deleteShopURL(page, 2);
-      await expect(textResult).to.contains(shopPage.successfulDeleteMessage);
+      expect(textResult).to.contains(shopPage.successfulDeleteMessage);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/11_newAndExperimentalFeatures/01_enableDisableExperimentalProductV2.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/11_newAndExperimentalFeatures/01_enableDisableExperimentalProductV2.ts
index dd1b6d6be6d87..cdb0f08e0afc4 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/11_newAndExperimentalFeatures/01_enableDisableExperimentalProductV2.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/11_newAndExperimentalFeatures/01_enableDisableExperimentalProductV2.ts
@@ -63,14 +63,14 @@ describe('BO - Advanced Parameters - New & Experimental Features : Enable/Disabl
         await featureFlagPage.closeSfToolBar(page);
 
         const pageTitle = await featureFlagPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(featureFlagPage.pageTitle);
+        expect(pageTitle).to.contains(featureFlagPage.pageTitle);
       });
 
       it('should enable New product page', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'enableNewProductPage', baseContext);
 
         const successMessage = await featureFlagPage.setFeatureFlag(page, featureFlagPage.featureFlagProductPageV2, true);
-        await expect(successMessage).to.be.contain(featureFlagPage.successfulUpdateMessage);
+        expect(successMessage).to.be.contain(featureFlagPage.successfulUpdateMessage);
       });
 
       it('should go to \'Catalog > Products\' page', async function () {
@@ -84,14 +84,14 @@ describe('BO - Advanced Parameters - New & Experimental Features : Enable/Disabl
         await productsPageV2.closeSfToolBar(page);
 
         const pageTitle = await productsPageV2.getPageTitle(page);
-        await expect(pageTitle).to.contains(productsPageV2.pageTitle);
+        expect(pageTitle).to.contains(productsPageV2.pageTitle);
       });
 
       it('should click on \'New product\' button and check new product modal', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'clickOnNewProductButton', baseContext);
 
         const isModalVisible = await productsPageV2.clickOnNewProductButton(page);
-        await expect(isModalVisible).to.be.true;
+        expect(isModalVisible).to.eq(true);
       });
 
       it('should choose \'Standard product\'', async function () {
@@ -101,7 +101,7 @@ describe('BO - Advanced Parameters - New & Experimental Features : Enable/Disabl
         await productsPageV2.clickOnAddNewProduct(page);
 
         const pageTitle = await createProductsPageV2.getPageTitle(page);
-        await expect(pageTitle).to.contains(createProductsPageV2.pageTitle);
+        expect(pageTitle).to.contains(createProductsPageV2.pageTitle);
       });
     });
   }
@@ -119,14 +119,14 @@ describe('BO - Advanced Parameters - New & Experimental Features : Enable/Disabl
         await featureFlagPage.closeSfToolBar(page);
 
         const pageTitle = await featureFlagPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(featureFlagPage.pageTitle);
+        expect(pageTitle).to.contains(featureFlagPage.pageTitle);
       });
 
       it('should disable New product page', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'disableNewProductPage', baseContext);
 
         const successMessage = await featureFlagPage.setFeatureFlag(page, featureFlagPage.featureFlagProductPageV2, false);
-        await expect(successMessage).to.be.contain(featureFlagPage.successfulUpdateMessage);
+        expect(successMessage).to.be.contain(featureFlagPage.successfulUpdateMessage);
       });
 
       it('should go to \'Catalog > Products\' page', async function () {
@@ -140,7 +140,7 @@ describe('BO - Advanced Parameters - New & Experimental Features : Enable/Disabl
         await productsPageV1.closeSfToolBar(page);
 
         const pageTitle = await productsPageV1.getPageTitle(page);
-        await expect(pageTitle).to.contains(productsPageV1.pageTitle);
+        expect(pageTitle).to.contains(productsPageV1.pageTitle);
       });
 
       it('should go to Add product page', async function () {
@@ -149,7 +149,7 @@ describe('BO - Advanced Parameters - New & Experimental Features : Enable/Disabl
         await productsPageV1.goToAddProductPage(page);
 
         const createProductTitle = await addProductPage.getPageTitle(page);
-        await expect(createProductTitle).to.contains(addProductPage.pageTitle);
+        expect(createProductTitle).to.contains(addProductPage.pageTitle);
       });
     });
   }
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/12_authorizationServer/01_CRUD.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/12_authorizationServer/01_CRUD.ts
index 91bed8b2decf1..34485864e87b7 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/12_authorizationServer/01_CRUD.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/12_authorizationServer/01_CRUD.ts
@@ -61,14 +61,14 @@ describe('BO - Advanced Parameter - Authorization Server : CRUD', async () => {
       );
 
       const pageTitle = await authorizationServerPage.getPageTitle(page);
-      await expect(pageTitle).to.eq(authorizationServerPage.pageTitle);
+      expect(pageTitle).to.eq(authorizationServerPage.pageTitle);
     });
 
     it('should check that no records found', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkThatNoRecordFound', baseContext);
 
       const noRecordsFoundText = await authorizationServerPage.getTextForEmptyTable(page);
-      await expect(noRecordsFoundText).to.contains('warning No records found');
+      expect(noRecordsFoundText).to.contains('warning No records found');
     });
 
     it('should go to add New Authorized App page', async function () {
@@ -77,17 +77,17 @@ describe('BO - Advanced Parameter - Authorization Server : CRUD', async () => {
       await authorizationServerPage.goToNewAuthorizedAppPage(page);
 
       const pageTitle = await addNewAuthorizedAppPage.getPageTitle(page);
-      await expect(pageTitle).to.eq(addNewAuthorizedAppPage.pageTitleCreate);
+      expect(pageTitle).to.eq(addNewAuthorizedAppPage.pageTitleCreate);
     });
 
     it('should create authorized app', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createAuthorizedApp', baseContext);
 
       const textResult = await addNewAuthorizedAppPage.addAuthorizedApplication(page, createApplication);
-      await expect(textResult).to.equal(addNewAuthorizedAppPage.successfulCreationMessage);
+      expect(textResult).to.equal(addNewAuthorizedAppPage.successfulCreationMessage);
 
       const numElements = await authorizationServerPage.getNumberOfElementInGrid(page);
-      await expect(numElements).to.equal(1);
+      expect(numElements).to.equal(1);
     });
 
     it('should go to edit Authorized App page', async function () {
@@ -96,27 +96,27 @@ describe('BO - Advanced Parameter - Authorization Server : CRUD', async () => {
       await authorizationServerPage.goToEditAuthorizedAppPage(page, 1);
 
       const pageTitle = await addNewAuthorizedAppPage.getPageTitle(page);
-      await expect(pageTitle).to.eq(addNewAuthorizedAppPage.pageTitleEdit(createApplication.appName));
+      expect(pageTitle).to.eq(addNewAuthorizedAppPage.pageTitleEdit(createApplication.appName));
     });
 
     it('should edit authorized app', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'editAuthorizedApp', baseContext);
 
       const textResult = await addNewAuthorizedAppPage.addAuthorizedApplication(page, editApplication);
-      await expect(textResult).to.equal(addNewAuthorizedAppPage.successfulUpdateMessage);
+      expect(textResult).to.equal(addNewAuthorizedAppPage.successfulUpdateMessage);
 
       const numElements = await authorizationServerPage.getNumberOfElementInGrid(page);
-      await expect(numElements).to.equal(1);
+      expect(numElements).to.equal(1);
     });
 
     it('should delete authorized app', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteAuthorizedApp', baseContext);
 
       const textResult = await authorizationServerPage.deleteAuthorizationApplication(page, 1);
-      await expect(textResult).to.equal(addNewAuthorizedAppPage.successfulDeleteMessage);
+      expect(textResult).to.equal(addNewAuthorizedAppPage.successfulDeleteMessage);
 
       const numElements = await authorizationServerPage.getNumberOfElementInGrid(page);
-      await expect(numElements).to.equal(0);
+      expect(numElements).to.equal(0);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/14_advancedParameters/12_authorizationServer/02_viewDetail.ts b/tests/UI/campaigns/functional/BO/14_advancedParameters/12_authorizationServer/02_viewDetail.ts
index 3447e8f60da76..80256736eed7c 100644
--- a/tests/UI/campaigns/functional/BO/14_advancedParameters/12_authorizationServer/02_viewDetail.ts
+++ b/tests/UI/campaigns/functional/BO/14_advancedParameters/12_authorizationServer/02_viewDetail.ts
@@ -59,14 +59,14 @@ describe('BO - Advanced Parameter - Authorization Server : View detail', async (
         );
 
         const pageTitle = await authorizationServerPage.getPageTitle(page);
-        await expect(pageTitle).to.eq(authorizationServerPage.pageTitle);
+        expect(pageTitle).to.eq(authorizationServerPage.pageTitle);
       });
 
       it('should check that no records found', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkThatNoRecordFound', baseContext);
 
         const noRecordsFoundText = await authorizationServerPage.getTextForEmptyTable(page);
-        await expect(noRecordsFoundText).to.contains('warning No records found');
+        expect(noRecordsFoundText).to.contains('warning No records found');
       });
 
       it('should go to add New Authorized App page', async function () {
@@ -75,17 +75,17 @@ describe('BO - Advanced Parameter - Authorization Server : View detail', async (
         await authorizationServerPage.goToNewAuthorizedAppPage(page);
 
         const pageTitle = await addNewAuthorizedAppPage.getPageTitle(page);
-        await expect(pageTitle).to.eq(addNewAuthorizedAppPage.pageTitleCreate);
+        expect(pageTitle).to.eq(addNewAuthorizedAppPage.pageTitleCreate);
       });
 
       it('should create authorized app', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'createAuthorizedApp', baseContext);
 
         const textResult = await addNewAuthorizedAppPage.addAuthorizedApplication(page, application);
-        await expect(textResult).to.equal(addNewAuthorizedAppPage.successfulCreationMessage);
+        expect(textResult).to.equal(addNewAuthorizedAppPage.successfulCreationMessage);
 
         const numElements = await authorizationServerPage.getNumberOfElementInGrid(page);
-        await expect(numElements).to.equal(1);
+        expect(numElements).to.equal(1);
       });
     });
 
@@ -96,15 +96,15 @@ describe('BO - Advanced Parameter - Authorization Server : View detail', async (
         await authorizationServerPage.goToViewAuthorizedAppPage(page, 1);
 
         const pageTitle = await viewAuthorizedAppPage.getPageTitle(page);
-        await expect(pageTitle).to.eq(viewAuthorizedAppPage.pageTitle(application.appName));
+        expect(pageTitle).to.eq(viewAuthorizedAppPage.pageTitle(application.appName));
       });
 
       it('should check details', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkDetailsInformations', baseContext);
 
         const appInformation = await viewAuthorizedAppPage.getAppInformation(page);
-        await expect(appInformation.appName).to.eq(application.appName);
-        await expect(appInformation.description).to.eq(application.description);
+        expect(appInformation.appName).to.eq(application.appName);
+        expect(appInformation.description).to.eq(application.description);
       });
     });
 
@@ -119,17 +119,17 @@ describe('BO - Advanced Parameter - Authorization Server : View detail', async (
         );
 
         const pageTitle = await authorizationServerPage.getPageTitle(page);
-        await expect(pageTitle).to.eq(authorizationServerPage.pageTitle);
+        expect(pageTitle).to.eq(authorizationServerPage.pageTitle);
       });
 
       it('should delete authorized app', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'deleteAuthorizedApp', baseContext);
 
         const textResult = await authorizationServerPage.deleteAuthorizationApplication(page, 1);
-        await expect(textResult).to.equal(addNewAuthorizedAppPage.successfulDeleteMessage);
+        expect(textResult).to.equal(addNewAuthorizedAppPage.successfulDeleteMessage);
 
         const numElements = await authorizationServerPage.getNumberOfElementInGrid(page);
-        await expect(numElements).to.equal(0);
+        expect(numElements).to.equal(0);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/BO/15_header/01_leftMenu.ts b/tests/UI/campaigns/functional/BO/15_header/01_leftMenu.ts
index e2d126debb686..6daa02c85530d 100644
--- a/tests/UI/campaigns/functional/BO/15_header/01_leftMenu.ts
+++ b/tests/UI/campaigns/functional/BO/15_header/01_leftMenu.ts
@@ -38,12 +38,12 @@ describe('BO - Header : Left menu', async () => {
         await dashboardPage.clickSubMenu(page, test.parent);
 
         const isVisible = await dashboardPage.isSubmenuVisible(page, test.parent, subTest);
-        await expect(isVisible).to.be.true;
+        expect(isVisible).to.eq(true);
 
         await dashboardPage.goToSubMenu(page, test.parent, subTest);
 
         const isMenuActive = await dashboardPage.isSubMenuActive(page, subTest);
-        await expect(isMenuActive).to.be.true;
+        expect(isMenuActive).to.eq(true);
       });
     });
   });
@@ -54,7 +54,7 @@ describe('BO - Header : Left menu', async () => {
     await dashboardPage.setSidebarCollapsed(page, true);
 
     const isSidebarCollapsed = await dashboardPage.isSidebarCollapsed(page);
-    await expect(isSidebarCollapsed).to.be.true;
+    expect(isSidebarCollapsed).to.eq(true);
   });
 
   dashboardPage.menuTree.forEach((test, index) => {
@@ -70,12 +70,12 @@ describe('BO - Header : Left menu', async () => {
         await dashboardPage.clickSubMenu(page, test.parent);
 
         const isVisible = await dashboardPage.isSubmenuVisible(page, test.parent, subTest);
-        await expect(isVisible).to.be.true;
+        expect(isVisible).to.eq(true);
 
         await dashboardPage.goToSubMenu(page, test.parent, subTest);
 
         const isMenuActive = await dashboardPage.isSubMenuActive(page, subTest);
-        await expect(isMenuActive).to.be.true;
+        expect(isMenuActive).to.eq(true);
       });
     });
   });
@@ -86,7 +86,7 @@ describe('BO - Header : Left menu', async () => {
     await dashboardPage.setSidebarCollapsed(page, false);
 
     const isSidebarCollapsed = await dashboardPage.isSidebarCollapsed(page);
-    await expect(isSidebarCollapsed).to.be.false;
+    expect(isSidebarCollapsed).to.eq(false);
   });
 
   it('should check the menu in mobile context', async function () {
@@ -95,10 +95,10 @@ describe('BO - Header : Left menu', async () => {
     await dashboardPage.resize(page, true);
 
     const isMobileMenuVisible = await dashboardPage.isMobileMenuVisible(page);
-    await expect(isMobileMenuVisible).to.be.true;
+    expect(isMobileMenuVisible).to.eq(true);
 
     const isNavbarVisible = await dashboardPage.isNavbarVisible(page);
-    await expect(isNavbarVisible).to.be.false;
+    expect(isNavbarVisible).to.eq(false);
   });
 
   it('should check the menu in desktop context', async function () {
@@ -107,9 +107,9 @@ describe('BO - Header : Left menu', async () => {
     await dashboardPage.resize(page, false);
 
     const isMobileMenuVisible = await dashboardPage.isMobileMenuVisible(page);
-    await expect(isMobileMenuVisible).to.be.false;
+    expect(isMobileMenuVisible).to.eq(false);
 
     const isNavbarVisible = await dashboardPage.isNavbarVisible(page);
-    await expect(isNavbarVisible).to.be.true;
+    expect(isNavbarVisible).to.eq(true);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/15_header/02_quickAccess.ts b/tests/UI/campaigns/functional/BO/15_header/02_quickAccess.ts
index d5a3c6963b230..3d50e49cdc22c 100644
--- a/tests/UI/campaigns/functional/BO/15_header/02_quickAccess.ts
+++ b/tests/UI/campaigns/functional/BO/15_header/02_quickAccess.ts
@@ -72,7 +72,7 @@ describe('BO - Header : Quick access links', async () => {
         await dashboardPage.quickAccessToPage(page, test.args.idLink);
 
         const pageTitle = await dashboardPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(test.args.pageTitle);
+        expect(pageTitle).to.contains(test.args.pageTitle);
       });
     });
 
@@ -80,7 +80,7 @@ describe('BO - Header : Quick access links', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'removeLinkFromQuickAccess', baseContext);
 
       const validationMessage = await newVoucherPage.removeLinkFromQuickAccess(page);
-      await expect(validationMessage).to.contains(newVoucherPage.successfulUpdateMessage);
+      expect(validationMessage).to.contains(newVoucherPage.successfulUpdateMessage);
     });
 
     it('should refresh the page and add current page to Quick access', async function () {
@@ -89,7 +89,7 @@ describe('BO - Header : Quick access links', async () => {
       await newVoucherPage.reloadPage(page);
 
       const validationMessage = await newVoucherPage.addCurrentPageToQuickAccess(page, 'New voucher');
-      await expect(validationMessage).to.contains(newVoucherPage.successfulUpdateMessage);
+      expect(validationMessage).to.contains(newVoucherPage.successfulUpdateMessage);
     });
 
     it('should go to \'Manage quick access\' page', async function () {
@@ -99,7 +99,7 @@ describe('BO - Header : Quick access links', async () => {
       await newVoucherPage.goToManageQuickAccessPage(page);
 
       const pageTitle = await quickAccessPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(quickAccessPage.pageTitle);
+      expect(pageTitle).to.contains(quickAccessPage.pageTitle);
     });
 
     it('should go to \'Add new quick access\' page', async function () {
@@ -108,14 +108,14 @@ describe('BO - Header : Quick access links', async () => {
       await quickAccessPage.goToAddNewQuickAccessPage(page);
 
       const pageTitle = await addNewQuickAccessPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addNewQuickAccessPage.pageTitle);
+      expect(pageTitle).to.contains(addNewQuickAccessPage.pageTitle);
     });
 
     it('should create new quick access link', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createQuickAccessLink', baseContext);
 
       const validationMessage = await addNewQuickAccessPage.setQuickAccessLink(page, quickAccessLinkData);
-      await expect(validationMessage).to.contains(addNewQuickAccessPage.successfulCreationMessage);
+      expect(validationMessage).to.contains(addNewQuickAccessPage.successfulCreationMessage);
     });
 
     it('should check the new link from Quick access', async function () {
@@ -124,7 +124,7 @@ describe('BO - Header : Quick access links', async () => {
       page = await dashboardPage.quickAccessToPageNewWindow(page, 4);
 
       const pageTitle = await newCustomerPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(newCustomerPage.pageTitleCreate);
+      expect(pageTitle).to.contains(newCustomerPage.pageTitleCreate);
     });
 
     it('should go to \'Manage quick access\' page', async function () {
@@ -133,7 +133,7 @@ describe('BO - Header : Quick access links', async () => {
       await newCustomerPage.goToManageQuickAccessPage(page);
 
       const pageTitle = await quickAccessPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(quickAccessPage.pageTitle);
+      expect(pageTitle).to.contains(quickAccessPage.pageTitle);
     });
 
     it('should filter quick access table by link name', async function () {
@@ -142,14 +142,14 @@ describe('BO - Header : Quick access links', async () => {
       await quickAccessPage.filterTable(page, 'input', 'name', quickAccessLinkData.name);
 
       const textColumn = await quickAccessPage.getTextColumn(page, 1, 'name');
-      await expect(textColumn).to.contains(quickAccessLinkData.name);
+      expect(textColumn).to.contains(quickAccessLinkData.name);
     });
 
     it('should delete the created quick access link by bulk actions', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteByBulkActions', baseContext);
 
       const textColumn = await quickAccessPage.bulkDeleteQuickAccessLink(page);
-      await expect(textColumn).to.be.contains(quickAccessPage.successfulMultiDeleteMessage);
+      expect(textColumn).to.be.contains(quickAccessPage.successfulMultiDeleteMessage);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/15_header/03_searchBar.ts b/tests/UI/campaigns/functional/BO/15_header/03_searchBar.ts
index 250c7004b1a44..cd89f1d71b6d8 100644
--- a/tests/UI/campaigns/functional/BO/15_header/03_searchBar.ts
+++ b/tests/UI/campaigns/functional/BO/15_header/03_searchBar.ts
@@ -37,29 +37,29 @@ describe('BO - Header : Search bar', async () => {
     await dashboardPage.search(page, 'orders');
 
     const pageTitle = await searchResultsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(searchResultsPage.pageTitle);
+    expect(pageTitle).to.contains(searchResultsPage.pageTitle);
   });
 
   it('should check results for "orders"', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'checkResultsForOrders', baseContext);
 
     const numberResults = await searchResultsPage.getNumberResults(page);
-    await expect(numberResults).to.be.eq(3);
+    expect(numberResults).to.be.eq(3);
 
     const numberFeatures = await searchResultsPage.getNumberResults(page, 'features');
-    await expect(numberFeatures).to.be.eq(1);
+    expect(numberFeatures).to.be.eq(1);
 
     const numberModules = await searchResultsPage.getNumberResults(page, 'modules');
-    await expect(numberModules).to.be.eq(2);
+    expect(numberModules).to.be.eq(2);
 
     const numberLinks = await searchResultsPage.getSearchPanelsLinksNumber(page);
-    await expect(numberLinks).to.be.eq(1);
+    expect(numberLinks).to.be.eq(1);
 
     const linkHref = await searchResultsPage.getSearchPanelsLinkURL(page, 1);
-    await expect(linkHref).to.contains('https://docs.prestashop-project.org/welcome/?q=');
+    expect(linkHref).to.contains('https://docs.prestashop-project.org/welcome/?q=');
 
     const linkText = await searchResultsPage.getSearchPanelsLinkText(page, 1);
-    await expect(linkText).to.contains('Go to the documentation');
+    expect(linkText).to.contains('Go to the documentation');
   });
 
   it('should search for "John Doe"', async function () {
@@ -68,31 +68,31 @@ describe('BO - Header : Search bar', async () => {
     await searchResultsPage.search(page, 'John Doe');
 
     const pageTitle = await searchResultsPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(searchResultsPage.pageTitle);
+    expect(pageTitle).to.contains(searchResultsPage.pageTitle);
   });
 
   it('should check results for "John Doe"', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'checkResultsForJohnDoe', baseContext);
 
     const numberResults = await searchResultsPage.getNumberResults(page);
-    await expect(numberResults).to.be.eq(1);
+    expect(numberResults).to.be.eq(1);
 
     const numberCustomers = await searchResultsPage.getNumberResults(page, 'customers');
-    await expect(numberCustomers).to.be.eq(1);
+    expect(numberCustomers).to.be.eq(1);
 
     const customerFirstName = await searchResultsPage.getTextColumn(page, 'customers', 1, 'firstname');
-    await expect(customerFirstName).to.be.eq('John');
+    expect(customerFirstName).to.be.eq('John');
 
     const customerName = await searchResultsPage.getTextColumn(page, 'customers', 1, 'name');
-    await expect(customerName).to.be.eq('DOE');
+    expect(customerName).to.be.eq('DOE');
 
     const numberLinks = await searchResultsPage.getSearchPanelsLinksNumber(page);
-    await expect(numberLinks).to.be.eq(1);
+    expect(numberLinks).to.be.eq(1);
 
     const linkHref = await searchResultsPage.getSearchPanelsLinkURL(page, 1);
-    await expect(linkHref).to.contains('https://docs.prestashop-project.org/welcome/?q=');
+    expect(linkHref).to.contains('https://docs.prestashop-project.org/welcome/?q=');
 
     const linkText = await searchResultsPage.getSearchPanelsLinkText(page, 1);
-    await expect(linkText).to.contains('Go to the documentation');
+    expect(linkText).to.contains('Go to the documentation');
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/15_header/05_viewMyShop.ts b/tests/UI/campaigns/functional/BO/15_header/05_viewMyShop.ts
index f61b259cf1666..8138c98a48995 100644
--- a/tests/UI/campaigns/functional/BO/15_header/05_viewMyShop.ts
+++ b/tests/UI/campaigns/functional/BO/15_header/05_viewMyShop.ts
@@ -31,10 +31,10 @@ describe('BO - Header : View My Shop', async () => {
     await loginCommon.loginBO(this, page);
 
     const numPages = helper.getNumberTabs(browserContext);
-    await expect(numPages).to.be.eq(1);
+    expect(numPages).to.be.eq(1);
 
     const pageTitle = await dashboardPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(dashboardPage.pageTitle);
+    expect(pageTitle).to.contains(dashboardPage.pageTitle);
   });
 
   it('should click on View my shop', async function () {
@@ -43,9 +43,9 @@ describe('BO - Header : View My Shop', async () => {
     page = await dashboardPage.viewMyShop(page);
 
     const numPages = helper.getNumberTabs(browserContext);
-    await expect(numPages).to.be.eq(2);
+    expect(numPages).to.be.eq(2);
 
     const pageTitle = await foHomePage.getPageTitle(page);
-    await expect(pageTitle).to.contains(foHomePage.pageTitle);
+    expect(pageTitle).to.contains(foHomePage.pageTitle);
   });
 });
diff --git a/tests/UI/campaigns/functional/BO/15_header/07_myProfile.ts b/tests/UI/campaigns/functional/BO/15_header/07_myProfile.ts
index 52f49b5a2ec34..b5bf028120b59 100644
--- a/tests/UI/campaigns/functional/BO/15_header/07_myProfile.ts
+++ b/tests/UI/campaigns/functional/BO/15_header/07_myProfile.ts
@@ -74,7 +74,7 @@ describe('BO - Header : My profile', async () => {
       await loginPage.successLogin(page, employeeData.email, employeeData.password);
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should go to \'Your profile\' page', async function () {
@@ -84,7 +84,7 @@ describe('BO - Header : My profile', async () => {
       await myProfilePage.closeSfToolBar(page);
 
       const pageTitle = await myProfilePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(myProfilePage.pageTitleEdit(employeeData.lastName, employeeData.firstName));
+      expect(pageTitle).to.contains(myProfilePage.pageTitleEdit(employeeData.lastName, employeeData.firstName));
     });
   });
 
@@ -98,13 +98,13 @@ describe('BO - Header : My profile', async () => {
       await myProfilePage.updateEditEmployee(page, employeeData.password, employeeData);
 
       const textResult = await myProfilePage.getAlertError(page);
-      await expect(textResult).to.equal(myProfilePage.errorInvalidFirstNameMessage);
+      expect(textResult).to.equal(myProfilePage.errorInvalidFirstNameMessage);
 
       const lastNameResult = await myProfilePage.getInputValue(page, 'lastname');
-      await expect(lastNameResult).to.equal(employeeData.lastName);
+      expect(lastNameResult).to.equal(employeeData.lastName);
 
       const firstNameResult = await myProfilePage.getInputValue(page, 'firstname');
-      await expect(firstNameResult).to.equal(employeeData.firstName);
+      expect(firstNameResult).to.equal(employeeData.firstName);
     });
 
     it('should update with valid firstname and invalid lastname and check error message', async function () {
@@ -115,13 +115,13 @@ describe('BO - Header : My profile', async () => {
       await myProfilePage.updateEditEmployee(page, employeeData.password, employeeData);
 
       const textResult = await myProfilePage.getAlertError(page);
-      await expect(textResult).to.equal(myProfilePage.errorInvalidLastNameMessage);
+      expect(textResult).to.equal(myProfilePage.errorInvalidLastNameMessage);
 
       const lastNameResult = await myProfilePage.getInputValue(page, 'lastname');
-      await expect(lastNameResult).to.equal(employeeData.lastName);
+      expect(lastNameResult).to.equal(employeeData.lastName);
 
       const firstNameResult = await myProfilePage.getInputValue(page, 'firstname');
-      await expect(firstNameResult).to.equal(employeeData.firstName);
+      expect(firstNameResult).to.equal(employeeData.firstName);
     });
 
     it('should update firstname and lastname with valid values', async function () {
@@ -133,16 +133,16 @@ describe('BO - Header : My profile', async () => {
       await myProfilePage.updateEditEmployee(page, employeeData.password, employeeData);
 
       const textResult = await myProfilePage.getAlertSuccess(page);
-      await expect(textResult).to.equal(myProfilePage.successfulUpdateMessage);
+      expect(textResult).to.equal(myProfilePage.successfulUpdateMessage);
 
       const lastNameResult = await myProfilePage.getInputValue(page, 'lastname');
-      await expect(lastNameResult).to.equal(employeeData.lastName);
+      expect(lastNameResult).to.equal(employeeData.lastName);
 
       const firstNameResult = await myProfilePage.getInputValue(page, 'firstname');
-      await expect(firstNameResult).to.equal(employeeData.firstName);
+      expect(firstNameResult).to.equal(employeeData.firstName);
 
       const pageTitle = await myProfilePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(myProfilePage.pageTitleEdit(employeeData.lastName, employeeData.firstName));
+      expect(pageTitle).to.contains(myProfilePage.pageTitleEdit(employeeData.lastName, employeeData.firstName));
     });
 
     it('should upload an invalid format image and check error message', async function () {
@@ -154,7 +154,7 @@ describe('BO - Header : My profile', async () => {
       await myProfilePage.updateEditEmployee(page, employeeData.password, employeeData);
 
       const textResult = await myProfilePage.getAlertError(page);
-      await expect(textResult).to.contains(myProfilePage.errorInvalidFormatImageMessage);
+      expect(textResult).to.contains(myProfilePage.errorInvalidFormatImageMessage);
 
       // Delete created file
       await files.deleteFile('image.svg');
@@ -169,7 +169,7 @@ describe('BO - Header : My profile', async () => {
       await myProfilePage.updateEditEmployee(page, employeeData.password, employeeData);
 
       const textResult = await myProfilePage.getAlertSuccess(page);
-      await expect(textResult).to.equal(myProfilePage.successfulUpdateMessage);
+      expect(textResult).to.equal(myProfilePage.successfulUpdateMessage);
 
       // Delete created file
       await files.deleteFile('image.jpg');
@@ -184,13 +184,13 @@ describe('BO - Header : My profile', async () => {
       await myProfilePage.updateEditEmployee(page, employeeData.password, employeeData);
 
       const textResult = await myProfilePage.getAlertSuccess(page);
-      await expect(textResult).to.equal(myProfilePage.successfulUpdateMessage);
+      expect(textResult).to.equal(myProfilePage.successfulUpdateMessage);
 
       const isChecked = await myProfilePage.isGravatarEnabled(page);
-      await expect(isChecked).to.be.true;
+      expect(isChecked).to.eq(true);
 
       const avatarURL = await myProfilePage.getCurrentEmployeeAvatar(page);
-      await expect(avatarURL).to.contains('https://www.gravatar.com/avatar/');
+      expect(avatarURL).to.contains('https://www.gravatar.com/avatar/');
 
       // Reset value
       employeeData.enableGravatar = false;
@@ -206,7 +206,7 @@ describe('BO - Header : My profile', async () => {
       await myProfilePage.updateEditEmployee(page, employeeData.password, employeeData);
 
       const textResult = await myProfilePage.getAlertSuccess(page);
-      await expect(textResult).to.equal(myProfilePage.successfulUpdateMessage);
+      expect(textResult).to.equal(myProfilePage.successfulUpdateMessage);
     });
 
     it('should logout from BO', async function () {
@@ -220,7 +220,7 @@ describe('BO - Header : My profile', async () => {
       await loginPage.successLogin(page, employeeData.email, employeeData.password);
 
       const pageTitle = await creditSlipsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(creditSlipsPage.pageTitle);
+      expect(pageTitle).to.contains(creditSlipsPage.pageTitle);
     });
 
     it('should reset the language', async function () {
@@ -233,7 +233,7 @@ describe('BO - Header : My profile', async () => {
       await myProfilePage.updateEditEmployee(page, employeeData.password, employeeData);
 
       const textResult = await myProfilePage.getAlertSuccess(page);
-      await expect(textResult).to.equal(myProfilePage.successfulUpdateMessage);
+      expect(textResult).to.equal(myProfilePage.successfulUpdateMessage);
     });
   });
 
@@ -248,7 +248,7 @@ describe('BO - Header : My profile', async () => {
       );
 
       const pageTitle = await employeesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(employeesPage.pageTitle);
+      expect(pageTitle).to.contains(employeesPage.pageTitle);
     });
 
     it('should filter list by email', async function () {
@@ -257,14 +257,14 @@ describe('BO - Header : My profile', async () => {
       await employeesPage.filterEmployees(page, 'input', 'email', employeeData.email);
 
       const textEmail = await employeesPage.getTextColumnFromTable(page, 1, 'email');
-      await expect(textEmail).to.contains(employeeData.email);
+      expect(textEmail).to.contains(employeeData.email);
     });
 
     it('should delete employee and check error message', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteEmployee', baseContext);
 
       const textResult = await employeesPage.deleteEmployeeAndFail(page, 1);
-      await expect(textResult).to.equal(employeesPage.errorDeleteOwnAccountMessage);
+      expect(textResult).to.equal(employeesPage.errorDeleteOwnAccountMessage);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/BO/15_header/08_checkNotifications.ts b/tests/UI/campaigns/functional/BO/15_header/08_checkNotifications.ts
index ac4b8571c2fac..1f5709f3084a1 100644
--- a/tests/UI/campaigns/functional/BO/15_header/08_checkNotifications.ts
+++ b/tests/UI/campaigns/functional/BO/15_header/08_checkNotifications.ts
@@ -103,14 +103,14 @@ describe('BO - Header : Check notifications', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'checkNotificationsNumber', baseContext);
 
       const number = await dashboardPage.getAllNotificationsNumber(page);
-      await expect(number).to.be.at.least(0);
+      expect(number).to.be.at.least(0);
     });
 
     it('should click on notifications icon', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnNotificationsLink', baseContext);
 
       const isNotificationsVisible = await dashboardPage.clickOnNotificationsLink(page);
-      await expect(isNotificationsVisible).to.be.true;
+      expect(isNotificationsVisible).to.eq(true);
 
       await dashboardPage.clickOnNotificationsTab(page, 'customers');
       await dashboardPage.clickOnNotificationsTab(page, 'messages');
@@ -122,7 +122,7 @@ describe('BO - Header : Check notifications', async () => {
       await dashboardPage.reloadPage(page);
 
       const number = await dashboardPage.getAllNotificationsNumber(page);
-      await expect(number).to.equal(0);
+      expect(number).to.equal(0);
     });
 
     it('should view my shop', async function () {
@@ -132,7 +132,7 @@ describe('BO - Header : Check notifications', async () => {
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should go to login page', async function () {
@@ -141,7 +141,7 @@ describe('BO - Header : Check notifications', async () => {
       await homePage.goToLoginPage(page);
 
       const pageTitle = await foLoginPage.getPageTitle(page);
-      await expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
+      expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
     });
 
     it('should sign in with default customer', async function () {
@@ -150,7 +150,7 @@ describe('BO - Header : Check notifications', async () => {
       await foLoginPage.customerLogin(page, Customers.johnDoe);
 
       const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
 
     it('should go to order history page', async function () {
@@ -160,7 +160,7 @@ describe('BO - Header : Check notifications', async () => {
       await myAccountPage.goToHistoryAndDetailsPage(page);
 
       const pageHeaderTitle = await orderHistoryPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
+      expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
     });
 
     it('Go to order details and send message', async function () {
@@ -169,7 +169,7 @@ describe('BO - Header : Check notifications', async () => {
       await orderHistoryPage.goToDetailsPage(page);
 
       const successMessageText = await orderDetails.addAMessage(page, messageOption, messageSend);
-      await expect(successMessageText).to.equal(orderDetails.successMessageText);
+      expect(successMessageText).to.equal(orderDetails.successMessageText);
     });
 
     it('should go back to BO', async function () {
@@ -181,21 +181,21 @@ describe('BO - Header : Check notifications', async () => {
       await dashboardPage.reloadPage(page);
 
       const pageTitle = await dashboardPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(dashboardPage.pageTitle);
+      expect(pageTitle).to.contains(dashboardPage.pageTitle);
     });
 
     it('should check notifications number', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkNotificationsNumber2', baseContext);
 
       const number = await dashboardPage.getAllNotificationsNumber(page);
-      await expect(number).to.equal(1);
+      expect(number).to.equal(1);
     });
 
     it('should click on notifications icon', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnNotificationsLink2', baseContext);
 
       const isNotificationsVisible = await dashboardPage.clickOnNotificationsLink(page);
-      await expect(isNotificationsVisible).to.be.true;
+      expect(isNotificationsVisible).to.eq(true);
     });
 
     it('should click on Messages tab', async function () {
@@ -204,7 +204,7 @@ describe('BO - Header : Check notifications', async () => {
       await dashboardPage.clickOnNotificationsTab(page, 'messages');
 
       const notificationsNumber = await dashboardPage.getNotificationsNumberInTab(page, 'customer_messages');
-      await expect(notificationsNumber).to.equal(1);
+      expect(notificationsNumber).to.equal(1);
     });
 
     it('should click on the first notification and check that the messages table is opened', async function () {
@@ -213,7 +213,7 @@ describe('BO - Header : Check notifications', async () => {
       await dashboardPage.clickOnNotification(page, 'messages');
 
       const pageTitle = await customerServicePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customerServicePage.pageTitle);
+      expect(pageTitle).to.contains(customerServicePage.pageTitle);
     });
   });
 
@@ -227,14 +227,14 @@ describe('BO - Header : Check notifications', async () => {
       await viewOrderMessagePage.goToDashboardPage(page);
 
       const isNotificationsVisible = await dashboardPage.clickOnNotificationsLink(page);
-      await expect(isNotificationsVisible).to.be.true;
+      expect(isNotificationsVisible).to.eq(true);
     });
 
     it('should check notifications number', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkNotificationsNumber3', baseContext);
 
       const number = await dashboardPage.getAllNotificationsNumber(page);
-      await expect(number).to.equal(2);
+      expect(number).to.equal(2);
     });
 
     it('should click on the first notification in orders tab', async function () {
@@ -243,7 +243,7 @@ describe('BO - Header : Check notifications', async () => {
       await dashboardPage.clickOnNotification(page, 'orders');
 
       const pageTitle = await orderPageTabListBlock.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+      expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
     });
 
     it('should click on customers tab', async function () {
@@ -254,7 +254,7 @@ describe('BO - Header : Check notifications', async () => {
       await dashboardPage.clickOnNotificationsTab(page, 'customers');
 
       const notificationsNumber = await dashboardPage.getNotificationsNumberInTab(page, 'customers');
-      await expect(notificationsNumber).to.equal(1);
+      expect(notificationsNumber).to.equal(1);
     });
 
     it('should click on the first notification and check that the customers table is opened', async function () {
@@ -265,7 +265,7 @@ describe('BO - Header : Check notifications', async () => {
       const customerName: string = `${customerData.firstName[0]}. ${customerData.lastName}`;
 
       const pageTitle = await viewCustomerPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(viewCustomerPage.pageTitle(customerName));
+      expect(pageTitle).to.contains(viewCustomerPage.pageTitle(customerName));
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/FO/classic/01_login/01_passwordReminder.ts b/tests/UI/campaigns/functional/FO/classic/01_login/01_passwordReminder.ts
index a3235300abca1..26b226994b7aa 100644
--- a/tests/UI/campaigns/functional/FO/classic/01_login/01_passwordReminder.ts
+++ b/tests/UI/campaigns/functional/FO/classic/01_login/01_passwordReminder.ts
@@ -81,7 +81,7 @@ describe('FO - Login : Password reminder', async () => {
       await homePage.goTo(page, global.FO.URL);
 
       const result = await homePage.isHomePage(page);
-      await expect(result).to.be.true;
+      expect(result).to.eq(true);
     });
 
     it('should go to login page', async function () {
@@ -90,7 +90,7 @@ describe('FO - Login : Password reminder', async () => {
       await homePage.goToLoginPage(page);
 
       const pageTitle = await loginPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(loginPage.pageTitle);
+      expect(pageTitle).to.equal(loginPage.pageTitle);
     });
 
     it('should click on \'Forgot your password?\' link', async function () {
@@ -99,7 +99,7 @@ describe('FO - Login : Password reminder', async () => {
       await loginPage.goToPasswordReminderPage(page);
 
       const pageTitle = await passwordReminderPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(passwordReminderPage.pageTitle);
+      expect(pageTitle).to.equal(passwordReminderPage.pageTitle);
     });
 
     it('should set the email address and send reset link', async function () {
@@ -108,13 +108,13 @@ describe('FO - Login : Password reminder', async () => {
       await passwordReminderPage.sendResetPasswordLink(page, customerData.email);
 
       const successAlertContent = await passwordReminderPage.checkResetLinkSuccess(page);
-      await expect(successAlertContent).to.contains(customerData.email);
+      expect(successAlertContent).to.contains(customerData.email);
     });
 
     it('should check if reset password mail is in mailbox', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkResetPasswordMail', baseContext);
 
-      await expect(newMail.subject).to.contains(resetPasswordMailSubject);
+      expect(newMail.subject).to.contains(resetPasswordMailSubject);
     });
 
     it('should open reset password link', async function () {
@@ -123,14 +123,14 @@ describe('FO - Login : Password reminder', async () => {
       await passwordReminderPage.openForgotPasswordPage(page, newMail.text);
 
       const pageTitle = await passwordReminderPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(passwordReminderPage.pageTitle);
+      expect(pageTitle).to.equal(passwordReminderPage.pageTitle);
     });
 
     it('should check the email address to reset password', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkEmailAddress', baseContext);
 
       const emailAddress = await passwordReminderPage.getEmailAddressToReset(page);
-      await expect(emailAddress).to.contains(customerData.email);
+      expect(emailAddress).to.contains(customerData.email);
     });
 
     it('should change the password and check the validation message', async function () {
@@ -139,7 +139,7 @@ describe('FO - Login : Password reminder', async () => {
       await passwordReminderPage.setNewPassword(page, newPassword);
 
       const successMessage = await myAccountPage.getSuccessMessageAlert(page);
-      await expect(successMessage).to.equal(`${myAccountPage.resetPasswordSuccessMessage} ${customerData.email}`);
+      expect(successMessage).to.equal(`${myAccountPage.resetPasswordSuccessMessage} ${customerData.email}`);
     });
 
     it('should logout from FO', async function () {
@@ -147,7 +147,7 @@ describe('FO - Login : Password reminder', async () => {
 
       await myAccountPage.logout(page);
       const isCustomerConnected = await myAccountPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is connected').to.be.false;
+      expect(isCustomerConnected, 'Customer is connected').to.eq(false);
     });
 
     it('should try to login with old password and check the error message', async function () {
@@ -156,7 +156,7 @@ describe('FO - Login : Password reminder', async () => {
       await loginPage.customerLogin(page, customerData, false);
 
       const loginError = await loginPage.getLoginError(page);
-      await expect(loginError).to.contains(loginPage.loginErrorText);
+      expect(loginError).to.contains(loginPage.loginErrorText);
     });
 
     it('should sign in with new password', async function () {
@@ -165,7 +165,7 @@ describe('FO - Login : Password reminder', async () => {
       await loginPage.customerLogin(page, customerNewPassword);
 
       const isCustomerConnected = await myAccountPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
 
     it('should logout from FO', async function () {
@@ -174,7 +174,7 @@ describe('FO - Login : Password reminder', async () => {
       await myAccountPage.logout(page);
 
       const isCustomerConnected = await myAccountPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is connected').to.be.false;
+      expect(isCustomerConnected, 'Customer is connected').to.eq(false);
     });
 
     it('should click on \'Forgot your password?\' link', async function () {
@@ -183,7 +183,7 @@ describe('FO - Login : Password reminder', async () => {
       await loginPage.goToPasswordReminderPage(page);
 
       const pageTitle = await passwordReminderPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(passwordReminderPage.pageTitle);
+      expect(pageTitle).to.equal(passwordReminderPage.pageTitle);
     });
 
     it('should set the customer email and check the error alert', async function () {
@@ -192,7 +192,7 @@ describe('FO - Login : Password reminder', async () => {
       await passwordReminderPage.sendResetPasswordLink(page, customerData.email);
 
       const regeneratePasswordAlert = await passwordReminderPage.getErrorMessage(page);
-      await expect(regeneratePasswordAlert).to.contains(passwordReminderPage.errorMessage);
+      expect(regeneratePasswordAlert).to.contains(passwordReminderPage.errorMessage);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/FO/classic/01_login/02_login.ts b/tests/UI/campaigns/functional/FO/classic/01_login/02_login.ts
index a1e94a7632a16..c259980ce9279 100644
--- a/tests/UI/campaigns/functional/FO/classic/01_login/02_login.ts
+++ b/tests/UI/campaigns/functional/FO/classic/01_login/02_login.ts
@@ -39,7 +39,7 @@ describe('FO - Login : Login in FO', async () => {
     await homePage.goTo(page, global.FO.URL);
 
     const result = await homePage.isHomePage(page);
-    await expect(result).to.be.true;
+    expect(result).to.eq(true);
   });
 
   it('should go to login page', async function () {
@@ -48,7 +48,7 @@ describe('FO - Login : Login in FO', async () => {
     await homePage.goToLoginPage(page);
 
     const pageTitle = await loginPage.getPageTitle(page);
-    await expect(pageTitle).to.equal(loginPage.pageTitle);
+    expect(pageTitle).to.equal(loginPage.pageTitle);
   });
 
   it('should enter an invalid credentials', async function () {
@@ -57,7 +57,7 @@ describe('FO - Login : Login in FO', async () => {
     await loginPage.customerLogin(page, firstCredentialsData, false);
 
     const loginError = await loginPage.getLoginError(page);
-    await expect(loginError).to.contains(loginPage.loginErrorText);
+    expect(loginError).to.contains(loginPage.loginErrorText);
   });
 
   it('should enter an invalid email', async function () {
@@ -66,7 +66,7 @@ describe('FO - Login : Login in FO', async () => {
     await loginPage.customerLogin(page, secondCredentialsData, false);
 
     const loginError = await loginPage.getLoginError(page);
-    await expect(loginError).to.contains(loginPage.loginErrorText);
+    expect(loginError).to.contains(loginPage.loginErrorText);
   });
 
   it('should enter an invalid password', async function () {
@@ -75,21 +75,21 @@ describe('FO - Login : Login in FO', async () => {
     await loginPage.customerLogin(page, thirdCredentialsData, false);
 
     const loginError = await loginPage.getLoginError(page);
-    await expect(loginError).to.contains(loginPage.loginErrorText);
+    expect(loginError).to.contains(loginPage.loginErrorText);
   });
 
   it('should check password type', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'checkPasswordType', baseContext);
 
     const inputType = await loginPage.getPasswordType(page);
-    await expect(inputType).to.equal('password');
+    expect(inputType).to.equal('password');
   });
 
   it('should click on show button and check the password', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'clickOnShowButton', baseContext);
 
     const inputType = await loginPage.showPassword(page);
-    await expect(inputType).to.equal('text');
+    expect(inputType).to.equal('text');
   });
 
   it('should enter a valid credentials', async function () {
@@ -98,9 +98,9 @@ describe('FO - Login : Login in FO', async () => {
     await loginPage.customerLogin(page, Customers.johnDoe);
 
     const isCustomerConnected = await loginPage.isCustomerConnected(page);
-    await expect(isCustomerConnected, 'Customer is not connected!').to.be.true;
+    expect(isCustomerConnected, 'Customer is not connected!').to.eq(true);
 
     const result = await homePage.isHomePage(page);
-    await expect(result).to.be.true;
+    expect(result).to.eq(true);
   });
 });
diff --git a/tests/UI/campaigns/functional/FO/classic/01_login/03_logout.ts b/tests/UI/campaigns/functional/FO/classic/01_login/03_logout.ts
index 44d066cf0f70d..f01d5eb6eba91 100644
--- a/tests/UI/campaigns/functional/FO/classic/01_login/03_logout.ts
+++ b/tests/UI/campaigns/functional/FO/classic/01_login/03_logout.ts
@@ -35,7 +35,7 @@ describe('FO - Login : Logout from FO', async () => {
     await homePage.goTo(page, global.FO.URL);
 
     const result = await homePage.isHomePage(page);
-    await expect(result).to.be.true;
+    expect(result).to.eq(true);
   });
 
   it('should go to login page', async function () {
@@ -44,7 +44,7 @@ describe('FO - Login : Logout from FO', async () => {
     await homePage.goToLoginPage(page);
 
     const pageTitle = await loginPage.getPageTitle(page);
-    await expect(pageTitle).to.equal(loginPage.pageTitle);
+    expect(pageTitle).to.equal(loginPage.pageTitle);
   });
 
   it('should sign in with default customer', async function () {
@@ -53,7 +53,7 @@ describe('FO - Login : Logout from FO', async () => {
     await loginPage.customerLogin(page, Customers.johnDoe);
 
     const isCustomerConnected = await loginPage.isCustomerConnected(page);
-    await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+    expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
   });
 
   it('should logout by the link in the header', async function () {
@@ -62,7 +62,7 @@ describe('FO - Login : Logout from FO', async () => {
     await homePage.logout(page);
 
     const isCustomerConnected = await homePage.isCustomerConnected(page);
-    await expect(isCustomerConnected, 'Customer is connected!').to.be.false;
+    expect(isCustomerConnected, 'Customer is connected!').to.eq(false);
   });
 
   it('should sign in with default customer', async function () {
@@ -72,7 +72,7 @@ describe('FO - Login : Logout from FO', async () => {
     await loginPage.customerLogin(page, Customers.johnDoe);
 
     const isCustomerConnected = await loginPage.isCustomerConnected(page);
-    await expect(isCustomerConnected, 'Customer is not connected!').to.be.true;
+    expect(isCustomerConnected, 'Customer is not connected!').to.eq(true);
   });
 
   it('should go to my account page', async function () {
@@ -81,7 +81,7 @@ describe('FO - Login : Logout from FO', async () => {
     await homePage.goToMyAccountPage(page);
 
     const pageTitle = await myAccountPage.getPageTitle(page);
-    await expect(pageTitle).to.equal(myAccountPage.pageTitle);
+    expect(pageTitle).to.equal(myAccountPage.pageTitle);
   });
 
   it('should logout by the link in the footer of account page', async function () {
@@ -90,6 +90,6 @@ describe('FO - Login : Logout from FO', async () => {
     await myAccountPage.logout(page);
 
     const isCustomerConnected = await myAccountPage.isCustomerConnected(page);
-    await expect(isCustomerConnected, 'Customer is connected!').to.be.false;
+    expect(isCustomerConnected, 'Customer is connected!').to.eq(false);
   });
 });
diff --git a/tests/UI/campaigns/functional/FO/classic/01_login/04_createAccount.ts b/tests/UI/campaigns/functional/FO/classic/01_login/04_createAccount.ts
index c0a6213d0df5a..ff8003068510a 100644
--- a/tests/UI/campaigns/functional/FO/classic/01_login/04_createAccount.ts
+++ b/tests/UI/campaigns/functional/FO/classic/01_login/04_createAccount.ts
@@ -58,7 +58,7 @@ describe('FO - Login : Create account', async () => {
       await homePage.goTo(page, global.FO.URL);
 
       const result = await homePage.isHomePage(page);
-      await expect(result).to.be.true;
+      expect(result).to.eq(true);
     });
 
     it('should go to login page', async function () {
@@ -67,7 +67,7 @@ describe('FO - Login : Create account', async () => {
       await homePage.goToLoginPage(page);
 
       const pageTitle = await loginPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(loginPage.pageTitle);
+      expect(pageTitle).to.equal(loginPage.pageTitle);
     });
 
     it('should go to create account page', async function () {
@@ -76,7 +76,7 @@ describe('FO - Login : Create account', async () => {
       await loginPage.goToCreateAccountPage(page);
 
       const pageHeaderTitle = await createAccountPage.getHeaderTitle(page);
-      await expect(pageHeaderTitle).to.equal(createAccountPage.formTitle);
+      expect(pageHeaderTitle).to.equal(createAccountPage.formTitle);
     });
 
     it('should create new account', async function () {
@@ -85,20 +85,20 @@ describe('FO - Login : Create account', async () => {
       await createAccountPage.createAccount(page, customerData);
 
       const isCustomerConnected = await homePage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Created customer is not connected!').to.be.true;
+      expect(isCustomerConnected, 'Created customer is not connected!').to.eq(true);
     });
 
     it('should check if the page is redirected to home page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'isHomePage', baseContext);
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to redirect to FO home page!').to.be.true;
+      expect(isHomePage, 'Fail to redirect to FO home page!').to.eq(true);
     });
 
     it('should check if welcome mail is in mailbox', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkWelcomeMail', baseContext);
 
-      await expect(newMail.subject).to.contains('Welcome!');
+      expect(newMail.subject).to.contains('Welcome!');
     });
 
     it('should sign out from FO', async function () {
@@ -107,7 +107,7 @@ describe('FO - Login : Create account', async () => {
       await homePage.logout(page);
 
       const isCustomerConnected = await homePage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is connected!').to.be.false;
+      expect(isCustomerConnected, 'Customer is connected!').to.eq(false);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/FO/classic/02_headerAndFooter/01_checkLinksInHeader.ts b/tests/UI/campaigns/functional/FO/classic/02_headerAndFooter/01_checkLinksInHeader.ts
index 2d7131b698420..5ffe17cc9eea2 100644
--- a/tests/UI/campaigns/functional/FO/classic/02_headerAndFooter/01_checkLinksInHeader.ts
+++ b/tests/UI/campaigns/functional/FO/classic/02_headerAndFooter/01_checkLinksInHeader.ts
@@ -47,7 +47,7 @@ describe('FO - Header and Footer : Check links in header page', async () => {
     await homePage.goToFo(page);
 
     const isHomePage = await homePage.isHomePage(page);
-    await expect(isHomePage).to.be.true;
+    expect(isHomePage).to.eq(true);
   });
 
   it('should check \'Contact us\' header link', async function () {
@@ -57,7 +57,7 @@ describe('FO - Header and Footer : Check links in header page', async () => {
     await homePage.clickOnHeaderLink(page, 'Contact us');
 
     const pageTitle = await contactUsPage.getPageTitle(page);
-    await expect(pageTitle, 'Fail to open FO login page').to.contains(contactUsPage.pageTitle);
+    expect(pageTitle, 'Fail to open FO login page').to.contains(contactUsPage.pageTitle);
   });
 
   it('should check \'sign in\' link', async function () {
@@ -67,7 +67,7 @@ describe('FO - Header and Footer : Check links in header page', async () => {
     await homePage.clickOnHeaderLink(page, 'Sign in');
 
     const pageTitle = await loginPage.getPageTitle(page);
-    await expect(pageTitle).to.equal(loginPage.pageTitle);
+    expect(pageTitle).to.equal(loginPage.pageTitle);
   });
 
   it('should sign in by default customer', async function () {
@@ -77,7 +77,7 @@ describe('FO - Header and Footer : Check links in header page', async () => {
     await loginPage.customerLogin(page, Customers.johnDoe);
 
     const isCustomerConnected = await loginPage.isCustomerConnected(page);
-    await expect(isCustomerConnected, 'Customer is not connected!').to.be.true;
+    expect(isCustomerConnected, 'Customer is not connected!').to.eq(true);
   });
 
   it('should check my account link', async function () {
@@ -86,7 +86,7 @@ describe('FO - Header and Footer : Check links in header page', async () => {
     await loginPage.goToMyAccountPage(page);
 
     const pageTitle = await myAccountPage.getPageTitle(page);
-    await expect(pageTitle).to.equal(myAccountPage.pageTitle);
+    expect(pageTitle).to.equal(myAccountPage.pageTitle);
   });
 
   it('should add a product to cart by quick view', async function () {
@@ -98,7 +98,7 @@ describe('FO - Header and Footer : Check links in header page', async () => {
 
     // Close block cart modal
     const isQuickViewModalClosed = await homePage.closeBlockCartModal(page);
-    await expect(isQuickViewModalClosed).to.be.true;
+    expect(isQuickViewModalClosed).to.eq(true);
   });
 
   it('should check \'Cart\' link', async function () {
@@ -108,7 +108,7 @@ describe('FO - Header and Footer : Check links in header page', async () => {
     await homePage.clickOnHeaderLink(page, 'Cart');
 
     const pageTitle = await cartPage.getPageTitle(page);
-    await expect(pageTitle).to.equal(cartPage.pageTitle);
+    expect(pageTitle).to.equal(cartPage.pageTitle);
   });
 
   it('should go to home page and check the notification number', async function () {
@@ -117,7 +117,7 @@ describe('FO - Header and Footer : Check links in header page', async () => {
     await loginPage.goToHomePage(page);
 
     const notificationsNumber = await homePage.getCartNotificationsNumber(page);
-    await expect(notificationsNumber, 'Notification number is not equal to 3!').to.be.equal(3);
+    expect(notificationsNumber, 'Notification number is not equal to 3!').to.be.equal(3);
   });
 
   it('should check \'Sign out\' link', async function () {
@@ -127,14 +127,14 @@ describe('FO - Header and Footer : Check links in header page', async () => {
     await homePage.logout(page);
 
     const isCustomerConnected = await homePage.isCustomerConnected(page);
-    await expect(isCustomerConnected, 'Customer is connected!').to.be.false;
+    expect(isCustomerConnected, 'Customer is connected!').to.eq(false);
   });
 
   it('should check that the cart is empty', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'checkNotificationNumber2', baseContext);
 
     const notificationsNumber = await homePage.getCartNotificationsNumber(page);
-    await expect(notificationsNumber, 'The cart is not empty!').to.be.equal(0);
+    expect(notificationsNumber, 'The cart is not empty!').to.be.equal(0);
   });
 
   it('should check \'Logo\' link', async function () {
@@ -143,6 +143,6 @@ describe('FO - Header and Footer : Check links in header page', async () => {
     await homePage.clickOnHeaderLink(page, 'Logo', false);
 
     const pageTitle = await homePage.getPageTitle(page);
-    await expect(pageTitle).to.equal(homePage.pageTitle);
+    expect(pageTitle).to.equal(homePage.pageTitle);
   });
 });
diff --git a/tests/UI/campaigns/functional/FO/classic/02_headerAndFooter/02_checkLinksInFooter.ts b/tests/UI/campaigns/functional/FO/classic/02_headerAndFooter/02_checkLinksInFooter.ts
index 875707c0b29ae..ac6a0538515cb 100644
--- a/tests/UI/campaigns/functional/FO/classic/02_headerAndFooter/02_checkLinksInFooter.ts
+++ b/tests/UI/campaigns/functional/FO/classic/02_headerAndFooter/02_checkLinksInFooter.ts
@@ -87,7 +87,7 @@ describe('FO - Header and Footer : Check links in footer page', async () => {
     await homePage.goToFo(page);
 
     const isHomePage = await homePage.isHomePage(page);
-    await expect(isHomePage).to.be.true;
+    expect(isHomePage).to.eq(true);
   });
 
   describe('Check \'Products\' footer links', async () => {
@@ -103,7 +103,7 @@ describe('FO - Header and Footer : Check links in footer page', async () => {
         await homePage.goToFooterLink(page, args.linkSelector);
 
         const pageTitle = await homePage.getPageTitle(page);
-        await expect(pageTitle).to.equal(args.pageTitle);
+        expect(pageTitle).to.equal(args.pageTitle);
       });
     });
   });
@@ -126,7 +126,7 @@ describe('FO - Header and Footer : Check links in footer page', async () => {
         await homePage.goToFooterLink(page, args.linkSelector);
 
         const pageTitle = await homePage.getPageTitle(page);
-        await expect(pageTitle).to.equal(args.pageTitle);
+        expect(pageTitle).to.equal(args.pageTitle);
       });
     });
   });
@@ -148,7 +148,7 @@ describe('FO - Header and Footer : Check links in footer page', async () => {
         } else {
           pageTitle = await homePage.getPageTitle(page);
         }
-        await expect(pageTitle).to.equal(args.pageTitle);
+        expect(pageTitle).to.equal(args.pageTitle);
       });
     });
   });
@@ -161,7 +161,7 @@ describe('FO - Header and Footer : Check links in footer page', async () => {
       await loginPage.customerLogin(page, Customers.johnDoe);
 
       const isCustomerConnected = await loginPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
 
     [
@@ -183,7 +183,7 @@ describe('FO - Header and Footer : Check links in footer page', async () => {
         } else {
           pageTitle = await homePage.getPageTitle(page);
         }
-        await expect(pageTitle).to.equal(args.pageTitle);
+        expect(pageTitle).to.equal(args.pageTitle);
       });
     });
   });
@@ -199,7 +199,7 @@ describe('FO - Header and Footer : Check links in footer page', async () => {
       await loginPage.customerLogin(page, createCustomerData);
 
       const isCustomerConnected = await loginPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
 
     [
@@ -221,7 +221,7 @@ describe('FO - Header and Footer : Check links in footer page', async () => {
         } else {
           pageTitle = await homePage.getPageTitle(page);
         }
-        await expect(pageTitle).to.equal(args.pageTitle);
+        expect(pageTitle).to.equal(args.pageTitle);
       });
     });
   });
@@ -231,7 +231,7 @@ describe('FO - Header and Footer : Check links in footer page', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'checkStoreInformation', baseContext);
 
       const storeInformation = await homePage.getStoreInformation(page);
-      await expect(storeInformation).to.contains(global.INSTALL.SHOP_NAME)
+      expect(storeInformation).to.contains(global.INSTALL.SHOP_NAME)
         .and.to.contain(global.INSTALL.COUNTRY)
         .and.to.contains(global.BO.EMAIL);
     });
@@ -242,7 +242,7 @@ describe('FO - Header and Footer : Check links in footer page', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'checkCopyright', baseContext);
 
       const copyright = await homePage.getCopyright(page);
-      await expect(copyright).to.equal(`© ${currentYear} - Ecommerce software by PrestaShop™`);
+      expect(copyright).to.equal(`© ${currentYear} - Ecommerce software by PrestaShop™`);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/FO/classic/02_headerAndFooter/03_changeCurrency.ts b/tests/UI/campaigns/functional/FO/classic/02_headerAndFooter/03_changeCurrency.ts
index 2ee1109996251..f3ccddeaa8996 100644
--- a/tests/UI/campaigns/functional/FO/classic/02_headerAndFooter/03_changeCurrency.ts
+++ b/tests/UI/campaigns/functional/FO/classic/02_headerAndFooter/03_changeCurrency.ts
@@ -62,14 +62,14 @@ describe('FO - Header and Footer : Change currency', async () => {
       await homePage.goToFo(page);
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage).to.be.true;
+      expect(isHomePage).to.eq(true);
     });
 
     it('should check that the currencies block is not visible', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkCurrenciesLink', baseContext);
 
       const isVisible = await homePage.isCurrencyVisible(page);
-      await expect(isVisible).to.be.false;
+      expect(isVisible).to.eq(false);
     });
   });
 
@@ -92,7 +92,7 @@ describe('FO - Header and Footer : Change currency', async () => {
       await localizationPage.closeSfToolBar(page);
 
       const pageTitle = await localizationPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(localizationPage.pageTitle);
+      expect(pageTitle).to.contains(localizationPage.pageTitle);
     });
 
     it('should go to \'Currencies\' page', async function () {
@@ -101,7 +101,7 @@ describe('FO - Header and Footer : Change currency', async () => {
       await localizationPage.goToSubTabCurrencies(page);
 
       const pageTitle = await currenciesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(currenciesPage.pageTitle);
+      expect(pageTitle).to.contains(currenciesPage.pageTitle);
     });
 
     it(`should get the currency exchange rate value '${Currencies.mad.isoCode}'`, async function () {
@@ -112,7 +112,7 @@ describe('FO - Header and Footer : Change currency', async () => {
 
       // Check exchange rate
       exchangeRateValue = await currenciesPage.getExchangeRateValue(page, 1);
-      await expect(exchangeRateValue).to.be.above(0);
+      expect(exchangeRateValue).to.be.above(0);
     });
   });
 
@@ -123,7 +123,7 @@ describe('FO - Header and Footer : Change currency', async () => {
       await homePage.goToFo(page);
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage).to.be.true;
+      expect(isHomePage).to.eq(true);
     });
 
     it('should change FO currency', async function () {
@@ -133,7 +133,7 @@ describe('FO - Header and Footer : Change currency', async () => {
       await homePage.changeCurrency(page, Currencies.mad.isoCode, Currencies.mad.symbol);
 
       const shopCurrency = await homePage.getDefaultCurrency(page);
-      await expect(shopCurrency).to.contains(Currencies.mad.isoCode);
+      expect(shopCurrency).to.contains(Currencies.mad.isoCode);
     });
 
     it('should search product', async function () {
@@ -142,7 +142,7 @@ describe('FO - Header and Footer : Change currency', async () => {
       await homePage.searchProduct(page, Products.demo_11.name);
 
       const pageTitle = await searchResultsPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(searchResultsPage.pageTitle);
+      expect(pageTitle).to.equal(searchResultsPage.pageTitle);
     });
 
     it('should check the product price', async function () {
@@ -151,7 +151,7 @@ describe('FO - Header and Footer : Change currency', async () => {
       const newExchangeRateValue = (exchangeRateValue * Products.demo_11.finalPrice).toFixed(Currencies.mad.decimals);
 
       const productPrice = await searchResultsPage.getProductPrice(page);
-      await expect(productPrice).to.contains(`${Currencies.mad.symbol}${newExchangeRateValue}`);
+      expect(productPrice).to.contains(`${Currencies.mad.symbol}${newExchangeRateValue}`);
     });
 
     it('should switch back to the default currency', async function () {
@@ -166,7 +166,7 @@ describe('FO - Header and Footer : Change currency', async () => {
       await homePage.changeCurrency(page, Currencies.euro.isoCode, Currencies.euro.symbol);
 
       const shopCurrency = await homePage.getDefaultCurrency(page);
-      await expect(shopCurrency).to.contains(Currencies.euro.isoCode);
+      expect(shopCurrency).to.contains(Currencies.euro.isoCode);
     });
 
     it('should check the product price', async function () {
@@ -175,7 +175,7 @@ describe('FO - Header and Footer : Change currency', async () => {
       const exchangeRate = Math.round(Currencies.euro.exchangeRate * Products.demo_11.finalPrice);
 
       const productPrice = await searchResultsPage.getProductPrice(page);
-      await expect(productPrice).to.contains(`${Currencies.euro.symbol}${exchangeRate}`);
+      expect(productPrice).to.contains(`${Currencies.euro.symbol}${exchangeRate}`);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/FO/classic/02_headerAndFooter/04_changeLanguage.ts b/tests/UI/campaigns/functional/FO/classic/02_headerAndFooter/04_changeLanguage.ts
index 1caca5bb8dd89..6ef6d63677c3f 100644
--- a/tests/UI/campaigns/functional/FO/classic/02_headerAndFooter/04_changeLanguage.ts
+++ b/tests/UI/campaigns/functional/FO/classic/02_headerAndFooter/04_changeLanguage.ts
@@ -59,7 +59,7 @@ describe('FO - Header and Footer : Change language', async () => {
       await localizationPage.closeSfToolBar(page);
 
       const pageTitle = await localizationPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(localizationPage.pageTitle);
+      expect(pageTitle).to.contains(localizationPage.pageTitle);
     });
 
     it('should go to \'Languages\' page', async function () {
@@ -68,14 +68,14 @@ describe('FO - Header and Footer : Change language', async () => {
       await localizationPage.goToSubTabLanguages(page);
 
       const pageTitle = await languagesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(languagesPage.pageTitle);
+      expect(pageTitle).to.contains(languagesPage.pageTitle);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst1', baseContext);
 
       const numberOfLanguages = await languagesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfLanguages).to.be.above(0);
+      expect(numberOfLanguages).to.be.above(0);
     });
 
     it('should filter by iso_code \'fr\'', async function () {
@@ -86,10 +86,10 @@ describe('FO - Header and Footer : Change language', async () => {
 
       // Check number od languages
       const numberOfLanguagesAfterFilter = await languagesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfLanguagesAfterFilter).to.be.at.least(1);
+      expect(numberOfLanguagesAfterFilter).to.be.at.least(1);
 
       const textColumn = await languagesPage.getTextColumnFromTable(page, 1, 'iso_code');
-      await expect(textColumn).to.contains(Languages.french.isoCode);
+      expect(textColumn).to.contains(Languages.french.isoCode);
     });
 
     it('should disable language', async function () {
@@ -99,17 +99,17 @@ describe('FO - Header and Footer : Change language', async () => {
 
       if (isActionPerformed) {
         const resultMessage = await languagesPage.getAlertSuccessBlockParagraphContent(page);
-        await expect(resultMessage).to.contains(languagesPage.successfulUpdateStatusMessage);
+        expect(resultMessage).to.contains(languagesPage.successfulUpdateStatusMessage);
       }
       const languageStatus = await languagesPage.getStatus(page, 1);
-      await expect(languageStatus).to.be.false;
+      expect(languageStatus).to.eq(false);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'quickEditReset1', baseContext);
 
       const numberOfLanguages = await languagesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfLanguages).to.be.above(0);
+      expect(numberOfLanguages).to.be.above(0);
     });
   });
 
@@ -121,21 +121,21 @@ describe('FO - Header and Footer : Change language', async () => {
       await homePage.goToFo(page);
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage).to.be.true;
+      expect(isHomePage).to.eq(true);
     });
 
     it('should check that the languages list is not visible', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkLanguageListNotVisible', baseContext);
 
       const isVisible = await homePage.isLanguageListVisible(page);
-      await expect(isVisible, 'Language list is visible!').to.be.false;
+      expect(isVisible, 'Language list is visible!').to.eq(false);
     });
 
     it('should check that the shop language is \'English\'', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkShopLanguage', baseContext);
 
       const language = await homePage.getShopLanguage(page);
-      await expect(language).to.equal('en-US');
+      expect(language).to.equal('en-US');
     });
   });
 
@@ -147,7 +147,7 @@ describe('FO - Header and Footer : Change language', async () => {
       await homePage.goToBO(page);
 
       const pageTitle = await dashboardPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(dashboardPage.pageTitle);
+      expect(pageTitle).to.contains(dashboardPage.pageTitle);
     });
 
     it('should go to \'International > Localization\' page', async function () {
@@ -161,7 +161,7 @@ describe('FO - Header and Footer : Change language', async () => {
       await localizationPage.closeSfToolBar(page);
 
       const pageTitle = await localizationPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(localizationPage.pageTitle);
+      expect(pageTitle).to.contains(localizationPage.pageTitle);
     });
 
     it('should go to \'Languages\' page', async function () {
@@ -170,7 +170,7 @@ describe('FO - Header and Footer : Change language', async () => {
       await localizationPage.goToSubTabLanguages(page);
 
       const pageTitle = await languagesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(languagesPage.pageTitle);
+      expect(pageTitle).to.contains(languagesPage.pageTitle);
     });
 
     it('should filter by iso_code \'fr\'', async function () {
@@ -181,10 +181,10 @@ describe('FO - Header and Footer : Change language', async () => {
 
       // Check number od languages
       const numberOfLanguagesAfterFilter = await languagesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfLanguagesAfterFilter).to.be.at.least(1);
+      expect(numberOfLanguagesAfterFilter).to.be.at.least(1);
 
       const textColumn = await languagesPage.getTextColumnFromTable(page, 1, 'iso_code');
-      await expect(textColumn).to.contains(Languages.french.isoCode);
+      expect(textColumn).to.contains(Languages.french.isoCode);
     });
 
     it('should enable language', async function () {
@@ -194,17 +194,17 @@ describe('FO - Header and Footer : Change language', async () => {
 
       if (isActionPerformed) {
         const resultMessage = await languagesPage.getAlertSuccessBlockParagraphContent(page);
-        await expect(resultMessage).to.contains(languagesPage.successfulUpdateStatusMessage);
+        expect(resultMessage).to.contains(languagesPage.successfulUpdateStatusMessage);
       }
       const languageStatus = await languagesPage.getStatus(page, 1);
-      await expect(languageStatus).to.be.true;
+      expect(languageStatus).to.eq(true);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'quickEditReset2', baseContext);
 
       const numberOfLanguages = await languagesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfLanguages).to.be.above(0);
+      expect(numberOfLanguages).to.be.above(0);
     });
   });
 
@@ -216,14 +216,14 @@ describe('FO - Header and Footer : Change language', async () => {
       await homePage.goToFo(page);
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage).to.be.true;
+      expect(isHomePage).to.eq(true);
     });
 
     it('should check that the languages list is visible', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkLanguageListVisible', baseContext);
 
       const isVisible = await homePage.isLanguageListVisible(page);
-      await expect(isVisible, 'Language list is not visible!').to.be.true;
+      expect(isVisible, 'Language list is not visible!').to.eq(true);
     });
 
     it('should change the shop language to \'French\'', async function () {
diff --git a/tests/UI/campaigns/functional/FO/classic/03_userAccount/01_creditSlips/01_consultCreditSlip.ts b/tests/UI/campaigns/functional/FO/classic/03_userAccount/01_creditSlips/01_consultCreditSlip.ts
index 6680749ebb68f..da64457cf90a3 100644
--- a/tests/UI/campaigns/functional/FO/classic/03_userAccount/01_creditSlips/01_consultCreditSlip.ts
+++ b/tests/UI/campaigns/functional/FO/classic/03_userAccount/01_creditSlips/01_consultCreditSlip.ts
@@ -119,7 +119,7 @@ describe('FO - Consult credit slip list & View PDF Credit slip & View order', as
         await homePage.goTo(page, global.FO.URL);
 
         const result = await homePage.isHomePage(page);
-        await expect(result).to.be.true;
+        expect(result).to.eq(true);
       });
 
       it('should go to login page', async function () {
@@ -128,7 +128,7 @@ describe('FO - Consult credit slip list & View PDF Credit slip & View order', as
         await homePage.goToLoginPage(page);
 
         const pageTitle = await loginPage.getPageTitle(page);
-        await expect(pageTitle).to.equal(loginPage.pageTitle);
+        expect(pageTitle).to.equal(loginPage.pageTitle);
       });
 
       it('should login', async function () {
@@ -137,7 +137,7 @@ describe('FO - Consult credit slip list & View PDF Credit slip & View order', as
         await loginPage.customerLogin(page, customerData);
 
         const isCustomerConnected = await loginPage.isCustomerConnected(page);
-        await expect(isCustomerConnected, 'Customer is not connected!').to.be.true;
+        expect(isCustomerConnected, 'Customer is not connected!').to.eq(true);
       });
 
       it('should go to my account page', async function () {
@@ -146,7 +146,7 @@ describe('FO - Consult credit slip list & View PDF Credit slip & View order', as
         await homePage.goToMyAccountPage(page);
 
         const pageTitle = await myAccountPage.getPageTitle(page);
-        await expect(pageTitle).to.equal(myAccountPage.pageTitle);
+        expect(pageTitle).to.equal(myAccountPage.pageTitle);
       });
 
       it('should go credit slips page', async function () {
@@ -155,14 +155,14 @@ describe('FO - Consult credit slip list & View PDF Credit slip & View order', as
         await myAccountPage.goToCreditSlipsPage(page);
 
         const pageTitle = await creditSlipPage.getPageTitle(page);
-        await expect(pageTitle).to.equal(creditSlipPage.pageTitle);
+        expect(pageTitle).to.equal(creditSlipPage.pageTitle);
       });
 
       it('should check there no credit slips', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkNoCreditSlips', baseContext);
 
         const alertInfoMessage = await creditSlipPage.getAlertInfoMessage(page);
-        await expect(alertInfoMessage).to.equal(creditSlipPage.noCreditSlipsInfoMessage);
+        expect(alertInfoMessage).to.equal(creditSlipPage.noCreditSlipsInfoMessage);
       });
     });
 
@@ -181,7 +181,7 @@ describe('FO - Consult credit slip list & View PDF Credit slip & View order', as
         );
 
         const pageTitle = await ordersPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(ordersPage.pageTitle);
+        expect(pageTitle).to.contains(ordersPage.pageTitle);
       });
 
       it('should go to the first order page', async function () {
@@ -191,21 +191,21 @@ describe('FO - Consult credit slip list & View PDF Credit slip & View order', as
         await ordersPage.goToOrder(page, 1);
 
         const pageTitle = await viewOrderBasePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(viewOrderBasePage.pageTitle);
+        expect(pageTitle).to.contains(viewOrderBasePage.pageTitle);
       });
 
       it(`should change the order status to '${OrderStatuses.paymentAccepted.name}' and check it`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'updateOrderStatus', baseContext);
 
         const result = await viewOrderBasePage.modifyOrderStatus(page, OrderStatuses.paymentAccepted.name);
-        await expect(result).to.equal(OrderStatuses.paymentAccepted.name);
+        expect(result).to.equal(OrderStatuses.paymentAccepted.name);
       });
 
       it('should check if the button \'Partial Refund\' is visible', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkPartialRefundButton', baseContext);
 
         const result = await viewOrderBasePage.isPartialRefundButtonVisible(page);
-        await expect(result).to.be.true;
+        expect(result).to.eq(true);
       });
 
       it('should create \'Partial refund\'', async function () {
@@ -214,14 +214,14 @@ describe('FO - Consult credit slip list & View PDF Credit slip & View order', as
         await viewOrderBasePage.clickOnPartialRefund(page);
 
         const textMessage = await viewOrderProductsBlockPage.addPartialRefundProduct(page, 1, 1);
-        await expect(textMessage).to.contains(viewOrderProductsBlockPage.partialRefundValidationMessage);
+        expect(textMessage).to.contains(viewOrderProductsBlockPage.partialRefundValidationMessage);
       });
 
       it('should check if the mail is in mailbox', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkIfMailIsInMailbox', baseContext);
 
-        await expect(newMail.subject).to.eq(`[${global.INSTALL.SHOP_NAME}] New credit slip regarding your order`);
-        await expect(newMail.text).to.contains('A credit slip has been generated in your name for order with the reference');
+        expect(newMail.subject).to.eq(`[${global.INSTALL.SHOP_NAME}] New credit slip regarding your order`);
+        expect(newMail.text).to.contains('A credit slip has been generated in your name for order with the reference');
       });
 
       it('should check if \'Credit slip\' document is created', async function () {
@@ -229,7 +229,7 @@ describe('FO - Consult credit slip list & View PDF Credit slip & View order', as
 
         // Get document name
         const documentType = await orderPageTabListBlock.getDocumentType(page, 3);
-        await expect(documentType).to.be.equal('Credit slip');
+        expect(documentType).to.be.equal('Credit slip');
       });
 
       it('should get the order reference', async function () {
@@ -237,7 +237,7 @@ describe('FO - Consult credit slip list & View PDF Credit slip & View order', as
 
         // Get document name
         orderReference = await viewOrderBasePage.getOrderReference(page);
-        await expect(orderReference).is.not.equal('');
+        expect(orderReference).is.not.equal('');
       });
 
       it('should get the identifier and the date issued of the credit slip', async function () {
@@ -245,11 +245,11 @@ describe('FO - Consult credit slip list & View PDF Credit slip & View order', as
 
         // Get Credit Slip ID
         creditSlipID = await orderPageTabListBlock.getFileName(page, 3);
-        await expect(creditSlipID).is.not.equal('');
+        expect(creditSlipID).is.not.equal('');
 
         // Get Date Issued
         dateIssued = await orderPageTabListBlock.getDocumentDate(page, 3);
-        await expect(dateIssued).is.not.equal('');
+        expect(dateIssued).is.not.equal('');
       });
     });
 
@@ -262,7 +262,7 @@ describe('FO - Consult credit slip list & View PDF Credit slip & View order', as
         await homePage.changeLanguage(page, 'en');
 
         const isHomePage = await homePage.isHomePage(page);
-        await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+        expect(isHomePage, 'Fail to open FO home page').to.eq(true);
       });
 
       it('should go to my account page', async function () {
@@ -271,7 +271,7 @@ describe('FO - Consult credit slip list & View PDF Credit slip & View order', as
         await homePage.goToMyAccountPage(page);
 
         const pageTitle = await myAccountPage.getPageTitle(page);
-        await expect(pageTitle).to.equal(myAccountPage.pageTitle);
+        expect(pageTitle).to.equal(myAccountPage.pageTitle);
       });
 
       it('should go credit slips page', async function () {
@@ -280,27 +280,27 @@ describe('FO - Consult credit slip list & View PDF Credit slip & View order', as
         await myAccountPage.goToCreditSlipsPage(page);
 
         const pageTitle = await creditSlipPage.getPageTitle(page);
-        await expect(pageTitle).to.equal(creditSlipPage.pageTitle);
+        expect(pageTitle).to.equal(creditSlipPage.pageTitle);
       });
 
       it('should check the number of credit slips', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkNumberCreditSlips', baseContext);
 
         const numberCreditSlips = await creditSlipPage.getNumberOfCreditSlips(page);
-        await expect(numberCreditSlips).to.equal(1);
+        expect(numberCreditSlips).to.equal(1);
       });
 
       it('should check that the \'Order reference, Credit Slip ID, Date Issued\' are correct', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkCreditSlipInfo', baseContext);
 
         const creditSlipOrderReference = await creditSlipPage.getOrderReference(page, 1);
-        await expect(creditSlipOrderReference).to.equal(orderReference);
+        expect(creditSlipOrderReference).to.equal(orderReference);
 
         const creditSlipOrderIdentifier = await creditSlipPage.getCreditSlipID(page, 1);
-        await expect(parseInt(creditSlipOrderIdentifier.replace('#', ''), 10)).to.equal(parseInt(creditSlipID, 10));
+        expect(parseInt(creditSlipOrderIdentifier.replace('#', ''), 10)).to.equal(parseInt(creditSlipID, 10));
 
         const creditSlipDateIssued = await creditSlipPage.getDateIssued(page, 1);
-        await expect(creditSlipDateIssued).to.equal(dateIssued);
+        expect(creditSlipDateIssued).to.equal(dateIssued);
       });
 
       it('should click on the PDF Icon on the "View credit slip" column', async function () {
@@ -309,7 +309,7 @@ describe('FO - Consult credit slip list & View PDF Credit slip & View order', as
         filePath = await creditSlipPage.downloadCreditSlip(page, 1);
 
         const found = await files.doesFileExist(filePath);
-        await expect(found, 'PDF file was not downloaded').to.be.true;
+        expect(found, 'PDF file was not downloaded').to.eq(true);
       });
 
       it('should check credit slip pdf file', async function () {
@@ -317,30 +317,30 @@ describe('FO - Consult credit slip list & View PDF Credit slip & View order', as
 
         // Check Name in pdf
         const isCreditSlip = await files.isTextInPDF(filePath, 'CREDIT SLIP');
-        await expect(isCreditSlip, 'Name of the PDF \'CREDIT SLIP\' does not exist in credit slip')
-          .to.be.true;
+        expect(isCreditSlip, 'Name of the PDF \'CREDIT SLIP\' does not exist in credit slip')
+          .to.eq(true);
 
         // Check Credit Slip ID in pdf
         const creditSlipIDExist = await files.isTextInPDF(filePath, creditSlipID);
-        await expect(creditSlipIDExist, `Credit Slip ID ${creditSlipID}' does not exist in credit slip`)
-          .to.be.true;
+        expect(creditSlipIDExist, `Credit Slip ID ${creditSlipID}' does not exist in credit slip`)
+          .to.eq(true);
 
         // Check DateIssued in pdf
         const dateIssuedExist = await files.isTextInPDF(filePath, dateIssued);
-        await expect(dateIssuedExist, `Date Issued '${dateIssued}' does not exist in credit slip`)
-          .to.be.true;
+        expect(dateIssuedExist, `Date Issued '${dateIssued}' does not exist in credit slip`)
+          .to.eq(true);
 
         // Check Order Reference in pdf
         const orderReferenceExist = await files.isTextInPDF(filePath, orderReference);
-        await expect(orderReferenceExist, `Order Reference '${orderReference}' does not exist in credit slip`)
-          .to.be.true;
+        expect(orderReferenceExist, `Order Reference '${orderReference}' does not exist in credit slip`)
+          .to.eq(true);
 
         // Check payment method in pdf
         const paymentMethodExist = await files.isTextInPDF(filePath, PaymentMethods.wirePayment.displayName);
-        await expect(
+        expect(
           paymentMethodExist,
           `Payment Method '${PaymentMethods.wirePayment.displayName}' does not exist in credit slip`,
-        ).to.be.true;
+        ).to.eq(true);
       });
 
       it('should click on the order Reference link', async function () {
@@ -349,7 +349,7 @@ describe('FO - Consult credit slip list & View PDF Credit slip & View order', as
         await creditSlipPage.clickOrderReference(page, 1);
 
         const pageTitle = await orderDetailsPage.getPageTitle(page);
-        await expect(pageTitle).to.equal(orderDetailsPage.pageTitle);
+        expect(pageTitle).to.equal(orderDetailsPage.pageTitle);
       });
 
       it('should go to credit slips page', async function () {
@@ -358,12 +358,12 @@ describe('FO - Consult credit slip list & View PDF Credit slip & View order', as
         await homePage.goToMyAccountPage(page);
 
         const myAccountPageTitle = await myAccountPage.getPageTitle(page);
-        await expect(myAccountPageTitle).to.equal(myAccountPage.pageTitle);
+        expect(myAccountPageTitle).to.equal(myAccountPage.pageTitle);
 
         await myAccountPage.goToCreditSlipsPage(page);
 
         const creditSlipPageTitle = await creditSlipPage.getPageTitle(page);
-        await expect(creditSlipPageTitle).to.equal(creditSlipPage.pageTitle);
+        expect(creditSlipPageTitle).to.equal(creditSlipPage.pageTitle);
       });
 
       it('should click on the "Back to your account" link', async function () {
@@ -372,7 +372,7 @@ describe('FO - Consult credit slip list & View PDF Credit slip & View order', as
         await creditSlipPage.clickBackToYourAccountLink(page);
 
         const myAccountPageTitle = await myAccountPage.getPageTitle(page);
-        await expect(myAccountPageTitle).to.equal(myAccountPage.pageTitle);
+        expect(myAccountPageTitle).to.equal(myAccountPage.pageTitle);
       });
 
       it('should go to credit slips page', async function () {
@@ -381,7 +381,7 @@ describe('FO - Consult credit slip list & View PDF Credit slip & View order', as
         await myAccountPage.goToCreditSlipsPage(page);
 
         const creditSlipPageTitle = await creditSlipPage.getPageTitle(page);
-        await expect(creditSlipPageTitle).to.equal(creditSlipPage.pageTitle);
+        expect(creditSlipPageTitle).to.equal(creditSlipPage.pageTitle);
       });
 
       it('should click on the "Home" link', async function () {
@@ -390,7 +390,7 @@ describe('FO - Consult credit slip list & View PDF Credit slip & View order', as
         await creditSlipPage.clickHomeLink(page);
 
         const homePageTitle = await homePage.getPageTitle(page);
-        await expect(homePageTitle).to.equal(homePage.pageTitle);
+        expect(homePageTitle).to.equal(homePage.pageTitle);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/FO/classic/03_userAccount/01_editInformation.ts b/tests/UI/campaigns/functional/FO/classic/03_userAccount/01_editInformation.ts
index 46f7c7277f6a9..0085f374177f6 100644
--- a/tests/UI/campaigns/functional/FO/classic/03_userAccount/01_editInformation.ts
+++ b/tests/UI/campaigns/functional/FO/classic/03_userAccount/01_editInformation.ts
@@ -81,7 +81,7 @@ describe('FO - Account : Edit information', async () => {
       await homePage.goTo(page, global.FO.URL);
 
       const result = await homePage.isHomePage(page);
-      await expect(result).to.be.true;
+      expect(result).to.eq(true);
     });
 
     it('should go to login page', async function () {
@@ -90,7 +90,7 @@ describe('FO - Account : Edit information', async () => {
       await homePage.goToLoginPage(page);
 
       const pageTitle = await loginPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(loginPage.pageTitle);
+      expect(pageTitle).to.equal(loginPage.pageTitle);
     });
 
     it('should login', async function () {
@@ -99,7 +99,7 @@ describe('FO - Account : Edit information', async () => {
       await loginPage.customerLogin(page, createCustomerData);
 
       const isCustomerConnected = await loginPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected!').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected!').to.eq(true);
     });
 
     it('should go to my account page', async function () {
@@ -108,7 +108,7 @@ describe('FO - Account : Edit information', async () => {
       await homePage.goToMyAccountPage(page);
 
       const pageTitle = await myAccountPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(myAccountPage.pageTitle);
+      expect(pageTitle).to.equal(myAccountPage.pageTitle);
     });
 
     it('should go account information page', async function () {
@@ -117,7 +117,7 @@ describe('FO - Account : Edit information', async () => {
       await myAccountPage.goToInformationPage(page);
 
       const pageTitle = await accountIdentityPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(accountIdentityPage.pageTitle);
+      expect(pageTitle).to.equal(accountIdentityPage.pageTitle);
     });
 
     it('case 1 - should edit the account information ** re-enter the same password and leave new password empty',
@@ -125,14 +125,14 @@ describe('FO - Account : Edit information', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'editAccount1', baseContext);
 
         const textResult = await accountIdentityPage.editAccount(page, createCustomerData.password, editCustomerData1);
-        await expect(textResult).to.be.equal(accountIdentityPage.successfulUpdateMessage);
+        expect(textResult).to.be.equal(accountIdentityPage.successfulUpdateMessage);
       });
 
     it('should check that the account is still connected after update', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'connectedUpdatedAccount', baseContext);
 
       const isCustomerConnected = await accountIdentityPage.isCustomerConnected(page);
-      await expect(isCustomerConnected).to.be.true;
+      expect(isCustomerConnected).to.eq(true);
     });
 
     it('case 2 - should edit the account information ** enter a wrong password and leave new password empty',
@@ -140,18 +140,18 @@ describe('FO - Account : Edit information', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'editAccount2', baseContext);
 
         const textResult = await accountIdentityPage.editAccount(page, 'wrongPass', editCustomerData1);
-        await expect(textResult).to.be.equal(accountIdentityPage.errorUpdateMessage);
+        expect(textResult).to.be.equal(accountIdentityPage.errorUpdateMessage);
       });
 
     it('should check the error alerts \'Invalid email/password combination\'', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkErrorAlerts2', baseContext);
 
       let textResult = await accountIdentityPage.getInvalidEmailAlert(page);
-      await expect(textResult, 'Invalid email/password alert is not visible!').to
+      expect(textResult, 'Invalid email/password alert is not visible!').to
         .equal(accountIdentityPage.invalidEmailAlertMessage);
 
       textResult = await accountIdentityPage.getInvalidPasswordAlert(page);
-      await expect(textResult, 'Invalid email/password alert is not visible!').to
+      expect(textResult, 'Invalid email/password alert is not visible!').to
         .equal(accountIdentityPage.invalidEmailAlertMessage);
     });
 
@@ -160,14 +160,14 @@ describe('FO - Account : Edit information', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'editAccount3', baseContext);
 
         const textResult = await accountIdentityPage.editAccount(page, createCustomerData.password, editCustomerData2);
-        await expect(textResult).to.be.equal(accountIdentityPage.errorUpdateMessage);
+        expect(textResult).to.be.equal(accountIdentityPage.errorUpdateMessage);
       });
 
     it('should check the minimum score alert on new password block', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkErrorAlerts3', baseContext);
 
       const textResult = await accountIdentityPage.getInvalidNewPasswordAlert(page);
-      await expect(textResult, 'Minimum score alert is not visible!').to
+      expect(textResult, 'Minimum score alert is not visible!').to
         .contains(accountIdentityPage.minimumScoreAlertMessage);
     });
 
@@ -176,18 +176,18 @@ describe('FO - Account : Edit information', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'editAccount4', baseContext);
 
         const textResult = await accountIdentityPage.editAccount(page, createCustomerData.password, editCustomerData3);
-        await expect(textResult).to.be.equal(accountIdentityPage.errorUpdateMessage);
+        expect(textResult).to.be.equal(accountIdentityPage.errorUpdateMessage);
       });
 
     it('should check the error alerts on new password block', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkErrorAlerts4', baseContext);
 
       let textResult = await accountIdentityPage.getInvalidNewPasswordAlert(page);
-      await expect(textResult, 'Invalid number of characters words alert is not visible!').to
+      expect(textResult, 'Invalid number of characters words alert is not visible!').to
         .contains(accountIdentityPage.invalidNumberOfCharacters);
 
       textResult = await accountIdentityPage.getInvalidNewPasswordAlert(page);
-      await expect(textResult, 'Minimum score alert is not visible!').to
+      expect(textResult, 'Minimum score alert is not visible!').to
         .contains(accountIdentityPage.minimumScoreAlertMessage);
     });
 
@@ -196,14 +196,14 @@ describe('FO - Account : Edit information', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'editAccount5', baseContext);
 
         const textResult = await accountIdentityPage.editAccount(page, createCustomerData.password, editCustomerData4);
-        await expect(textResult).to.be.equal(accountIdentityPage.errorUpdateMessage);
+        expect(textResult).to.be.equal(accountIdentityPage.errorUpdateMessage);
       });
 
     it('should check the error alert on new password block', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkErrorAlerts5', baseContext);
 
       const textResult = await accountIdentityPage.getInvalidNewPasswordAlert(page);
-      await expect(textResult, 'Minimum score alert is not visible!').to
+      expect(textResult, 'Minimum score alert is not visible!').to
         .contains(accountIdentityPage.minimumScoreAlertMessage);
     });
 
@@ -212,14 +212,14 @@ describe('FO - Account : Edit information', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'editAccount6', baseContext);
 
         const textResult = await accountIdentityPage.editAccount(page, createCustomerData.password, editCustomerData5);
-        await expect(textResult).to.be.equal(accountIdentityPage.errorUpdateMessage);
+        expect(textResult).to.be.equal(accountIdentityPage.errorUpdateMessage);
       });
 
     it('should check the error alert on new password block', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkErrorAlerts6', baseContext);
 
       const textResult = await accountIdentityPage.getInvalidNewPasswordAlert(page);
-      await expect(textResult, 'Minimum score password alert is not visible!').to
+      expect(textResult, 'Minimum score password alert is not visible!').to
         .contains(accountIdentityPage.minimumScoreAlertMessage);
     });
 
@@ -227,14 +227,14 @@ describe('FO - Account : Edit information', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'editAccount7', baseContext);
 
       const textResult = await accountIdentityPage.editAccount(page, createCustomerData.password, editCustomerData6);
-      await expect(textResult).to.be.equal(accountIdentityPage.errorUpdateMessage);
+      expect(textResult).to.be.equal(accountIdentityPage.errorUpdateMessage);
     });
 
     it('should check the error alert on new password block', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkErrorAlerts7', baseContext);
 
       const textResult = await accountIdentityPage.getInvalidNewPasswordAlert(page);
-      await expect(textResult, 'Minimum score alert is not visible!').to
+      expect(textResult, 'Minimum score alert is not visible!').to
         .contains(accountIdentityPage.minimumScoreAlertMessage);
     });
 
@@ -243,14 +243,14 @@ describe('FO - Account : Edit information', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'editAccount8', baseContext);
 
         const textResult = await accountIdentityPage.editAccount(page, createCustomerData.password, editCustomerData7);
-        await expect(textResult).to.be.equal(accountIdentityPage.errorUpdateMessage);
+        expect(textResult).to.be.equal(accountIdentityPage.errorUpdateMessage);
       });
 
     it('should check the error alert on new password block', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkErrorAlerts8', baseContext);
 
       const textResult = await accountIdentityPage.getInvalidNewPasswordAlert(page);
-      await expect(textResult, 'Minimum score alert is not visible!').to
+      expect(textResult, 'Minimum score alert is not visible!').to
         .contains(accountIdentityPage.minimumScoreAlertMessage);
     });
 
@@ -259,14 +259,14 @@ describe('FO - Account : Edit information', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'editAccount9', baseContext);
 
         const textResult = await accountIdentityPage.editAccount(page, createCustomerData.password, editCustomerData8);
-        await expect(textResult).to.be.equal(accountIdentityPage.errorUpdateMessage);
+        expect(textResult).to.be.equal(accountIdentityPage.errorUpdateMessage);
       });
 
     it('should check the error alert on new password block', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkErrorAlerts9', baseContext);
 
       const textResult = await accountIdentityPage.getInvalidNewPasswordAlert(page);
-      await expect(textResult, 'Minimum score alert is not visible!').to
+      expect(textResult, 'Minimum score alert is not visible!').to
         .contains(accountIdentityPage.minimumScoreAlertMessage);
     });
 
@@ -275,7 +275,7 @@ describe('FO - Account : Edit information', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'editAccount10', baseContext);
 
         const textResult = await accountIdentityPage.editAccount(page, createCustomerData.password, editCustomerData9);
-        await expect(textResult).to.be.equal(accountIdentityPage.successfulUpdateMessage);
+        expect(textResult).to.be.equal(accountIdentityPage.successfulUpdateMessage);
       });
   });
 
diff --git a/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_CRUDAddress.ts b/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_CRUDAddress.ts
index 5145071a27959..4c5392cd08fb8 100644
--- a/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_CRUDAddress.ts
+++ b/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_CRUDAddress.ts
@@ -76,7 +76,7 @@ describe('FO - Account : CRUD address', async () => {
       await homePage.goToFo(page);
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage).to.be.true;
+      expect(isHomePage).to.eq(true);
     });
 
     it('should go to login page', async function () {
@@ -85,7 +85,7 @@ describe('FO - Account : CRUD address', async () => {
       await homePage.goToLoginPage(page);
 
       const pageHeaderTitle = await loginPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(loginPage.pageTitle);
+      expect(pageHeaderTitle).to.equal(loginPage.pageTitle);
     });
 
     it('Should sign in FO', async function () {
@@ -94,7 +94,7 @@ describe('FO - Account : CRUD address', async () => {
       await loginPage.customerLogin(page, newCustomerData);
 
       const isCustomerConnected = await myAccountPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
 
     it('should go to \'My Account\' page', async function () {
@@ -103,7 +103,7 @@ describe('FO - Account : CRUD address', async () => {
       await homePage.goToMyAccountPage(page);
 
       const pageHeaderTitle = await myAccountPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(myAccountPage.pageTitle);
+      expect(pageHeaderTitle).to.equal(myAccountPage.pageTitle);
     });
 
     it('should go to \'Add first address\' page', async function () {
@@ -112,14 +112,14 @@ describe('FO - Account : CRUD address', async () => {
       await myAccountPage.goToAddressesPage(page);
 
       const pageHeaderTitle = await addressesPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(addressesPage.addressPageTitle);
+      expect(pageHeaderTitle).to.equal(addressesPage.addressPageTitle);
     });
 
     it('should create new address', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createAddress', baseContext);
 
       const textResult = await addAddressPage.setAddress(page, createAddressData);
-      await expect(textResult).to.equal(addressesPage.addAddressSuccessfulMessage);
+      expect(textResult).to.equal(addressesPage.addAddressSuccessfulMessage);
     });
   });
 
@@ -131,14 +131,14 @@ describe('FO - Account : CRUD address', async () => {
       await addressesPage.goToEditAddressPage(page, addressPosition);
 
       const pageHeaderTitle = await addAddressPage.getHeaderTitle(page);
-      await expect(pageHeaderTitle).to.equal(addAddressPage.updateFormTitle);
+      expect(pageHeaderTitle).to.equal(addAddressPage.updateFormTitle);
     });
 
     it('should update the address', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateAddress', baseContext);
 
       const textResult = await addAddressPage.setAddress(page, editAddressData);
-      await expect(textResult).to.equal(addressesPage.updateAddressSuccessfulMessage);
+      expect(textResult).to.equal(addressesPage.updateAddressSuccessfulMessage);
     });
 
     it('should go back to \'Your account page\'', async function () {
@@ -147,14 +147,14 @@ describe('FO - Account : CRUD address', async () => {
       await addAddressPage.clickOnBreadCrumbLink(page, 'my-account');
 
       const pageHeaderTitle = await myAccountPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(myAccountPage.pageTitle);
+      expect(pageHeaderTitle).to.equal(myAccountPage.pageTitle);
     });
 
     it('should check that \'Add first address\' is changed to \'Addresses\'', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkAddFirstAddress', baseContext);
 
       const isAddFirstAddressLinkVisible = await myAccountPage.isAddFirstAddressLinkVisible(page);
-      await expect(isAddFirstAddressLinkVisible, 'Add first address link is still visible!').to.be.false;
+      expect(isAddFirstAddressLinkVisible, 'Add first address link is still visible!').to.eq(false);
     });
   });
 
@@ -165,7 +165,7 @@ describe('FO - Account : CRUD address', async () => {
       await myAccountPage.goToAddressesPage(page);
 
       const pageHeaderTitle = await addressesPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(addressesPage.pageTitle);
+      expect(pageHeaderTitle).to.equal(addressesPage.pageTitle);
     });
 
     it('should go to \'Create new address\' page', async function () {
@@ -174,14 +174,14 @@ describe('FO - Account : CRUD address', async () => {
       await addressesPage.openNewAddressForm(page);
 
       const pageHeaderTitle = await addAddressPage.getHeaderTitle(page);
-      await expect(pageHeaderTitle).to.equal(addAddressPage.creationFormTitle);
+      expect(pageHeaderTitle).to.equal(addAddressPage.creationFormTitle);
     });
 
     it('should create new address', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createAddress2', baseContext);
 
       const textResult = await addAddressPage.setAddress(page, secondAddressData);
-      await expect(textResult).to.equal(addressesPage.addAddressSuccessfulMessage);
+      expect(textResult).to.equal(addressesPage.addAddressSuccessfulMessage);
     });
   });
 
@@ -192,7 +192,7 @@ describe('FO - Account : CRUD address', async () => {
       await homePage.goToHomePage(page);
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Home page is not displayed').to.be.true;
+      expect(isHomePage, 'Home page is not displayed').to.eq(true);
     });
 
     it('should go to product page', async function () {
@@ -201,7 +201,7 @@ describe('FO - Account : CRUD address', async () => {
       await homePage.goToProductPage(page, 1);
 
       const pageTitle = await productPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(Products.demo_1.name);
+      expect(pageTitle).to.contains(Products.demo_1.name);
     });
 
     it('should add product to the cart', async function () {
@@ -210,7 +210,7 @@ describe('FO - Account : CRUD address', async () => {
       await productPage.addProductToTheCart(page);
 
       const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
-      await expect(notificationsNumber).to.be.equal(1);
+      expect(notificationsNumber).to.be.equal(1);
     });
 
     it('should check that the two created addresses are displayed', async function () {
@@ -220,7 +220,7 @@ describe('FO - Account : CRUD address', async () => {
       await cartPage.clickOnProceedToCheckout(page);
 
       const addressesNumber = await checkoutPage.getNumberOfAddresses(page);
-      await expect(addressesNumber, 'The addresses number is not equal to 2!').to.equal(2);
+      expect(addressesNumber, 'The addresses number is not equal to 2!').to.equal(2);
     });
   });
 
@@ -231,7 +231,7 @@ describe('FO - Account : CRUD address', async () => {
       await homePage.goToHomePage(page);
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Home page is not displayed').to.be.true;
+      expect(isHomePage, 'Home page is not displayed').to.eq(true);
     });
 
     it('should go to \'My Account\' page', async function () {
@@ -240,7 +240,7 @@ describe('FO - Account : CRUD address', async () => {
       await homePage.goToMyAccountPage(page);
 
       const pageHeaderTitle = await myAccountPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(myAccountPage.pageTitle);
+      expect(pageHeaderTitle).to.equal(myAccountPage.pageTitle);
     });
 
     it('should go to addresses page', async function () {
@@ -249,7 +249,7 @@ describe('FO - Account : CRUD address', async () => {
       await myAccountPage.goToAddressesPage(page);
 
       const pageHeaderTitle = await addressesPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(addressesPage.pageTitle);
+      expect(pageHeaderTitle).to.equal(addressesPage.pageTitle);
     });
 
     it('should try to delete the first address and check the error message', async function () {
@@ -259,7 +259,7 @@ describe('FO - Account : CRUD address', async () => {
       secondAddressPosition = await addressesPage.getAddressPosition(page, secondAddressData.alias);
 
       const textResult = await addressesPage.deleteAddress(page, firstAddressPosition);
-      await expect(textResult).to.equal(addressesPage.deleteAddressErrorMessage);
+      expect(textResult).to.equal(addressesPage.deleteAddressErrorMessage);
     });
 
     it('should go to cart page', async function () {
@@ -268,7 +268,7 @@ describe('FO - Account : CRUD address', async () => {
       await addressesPage.goToCartPage(page);
 
       const pageTitle = await cartPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(cartPage.pageTitle);
+      expect(pageTitle).to.equal(cartPage.pageTitle);
     });
 
     it('should select the second address and continue', async function () {
@@ -281,7 +281,7 @@ describe('FO - Account : CRUD address', async () => {
 
       // Address step - Go to delivery step
       const isStepAddressComplete = await checkoutPage.goToDeliveryStep(page);
-      await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
     });
 
     it('should go to home page', async function () {
@@ -290,7 +290,7 @@ describe('FO - Account : CRUD address', async () => {
       await homePage.goToHomePage(page);
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Home page is not displayed').to.be.true;
+      expect(isHomePage, 'Home page is not displayed').to.eq(true);
     });
 
     it('should go to \'My Account\' page', async function () {
@@ -299,7 +299,7 @@ describe('FO - Account : CRUD address', async () => {
       await homePage.goToMyAccountPage(page);
 
       const pageHeaderTitle = await myAccountPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(myAccountPage.pageTitle);
+      expect(pageHeaderTitle).to.equal(myAccountPage.pageTitle);
     });
 
     it('should go to addresses page', async function () {
@@ -308,7 +308,7 @@ describe('FO - Account : CRUD address', async () => {
       await myAccountPage.goToAddressesPage(page);
 
       const pageHeaderTitle = await addressesPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(addressesPage.pageTitle);
+      expect(pageHeaderTitle).to.equal(addressesPage.pageTitle);
     });
 
     it('should delete the first address and check the success message', async function () {
@@ -317,7 +317,7 @@ describe('FO - Account : CRUD address', async () => {
       const addressPosition = await addressesPage.getAddressPosition(page, editAddressData.alias);
 
       const textResult = await addressesPage.deleteAddress(page, addressPosition);
-      await expect(textResult).to.equal(addressesPage.deleteAddressSuccessfulMessage);
+      expect(textResult).to.equal(addressesPage.deleteAddressSuccessfulMessage);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_consultOrderList.ts b/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_consultOrderList.ts
index 3a5440b93d269..3bda5eb24398e 100644
--- a/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_consultOrderList.ts
+++ b/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_consultOrderList.ts
@@ -88,7 +88,7 @@ describe('FO - Account - Order history : Consult order list', async () => {
       await foHomePage.goToFo(page);
 
       const isHomePage: boolean = await foHomePage.isHomePage(page);
-      await expect(isHomePage).to.be.true;
+      expect(isHomePage).to.eq(true);
     });
 
     it('should go to login page', async function () {
@@ -97,7 +97,7 @@ describe('FO - Account - Order history : Consult order list', async () => {
       await foHomePage.goToLoginPage(page);
 
       const pageHeaderTitle = await foLoginPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(foLoginPage.pageTitle);
+      expect(pageHeaderTitle).to.equal(foLoginPage.pageTitle);
     });
 
     it('should sign in FO', async function () {
@@ -106,7 +106,7 @@ describe('FO - Account - Order history : Consult order list', async () => {
       await foLoginPage.customerLogin(page, customerData);
 
       const isCustomerConnected: boolean = await myAccountPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
 
     it('should go to order history page', async function () {
@@ -116,14 +116,14 @@ describe('FO - Account - Order history : Consult order list', async () => {
       await myAccountPage.goToHistoryAndDetailsPage(page);
 
       const pageHeaderTitle: string = await orderHistoryPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
+      expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
     });
 
     it('should check number of orders', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkNumberOfOrders1', baseContext);
 
       const numberOfOrders: number = await orderHistoryPage.getNumberOfOrders(page);
-      await expect(numberOfOrders).to.equal(0);
+      expect(numberOfOrders).to.equal(0);
     });
   });
 
@@ -137,14 +137,14 @@ describe('FO - Account - Order history : Consult order list', async () => {
       await orderHistoryPage.reloadPage(page);
 
       const pageHeaderTitle: string = await orderHistoryPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
+      expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
     });
 
     it('should check the number of orders', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkNumberOfOrders2', baseContext);
 
       const numberOfOrders: number = await orderHistoryPage.getNumberOfOrders(page);
-      await expect(numberOfOrders).to.equal(1);
+      expect(numberOfOrders).to.equal(1);
     });
 
     it('should check the order information', async function () {
@@ -152,12 +152,12 @@ describe('FO - Account - Order history : Consult order list', async () => {
 
       const result: OrderHistory = await orderHistoryPage.getOrderHistoryDetails(page);
       await Promise.all([
-        await expect(result.reference).not.null,
-        await expect(result.date).to.equal(today),
-        await expect(result.price).to.equal(`€${Products.demo_1.finalPrice}`),
-        await expect(result.paymentType).to.equal(PaymentMethods.wirePayment.displayName),
-        await expect(result.status).to.equal(OrderStatuses.awaitingBankWire.name),
-        await expect(result.invoice).to.equal('-'),
+        expect(result.reference).not.null,
+        expect(result.date).to.equal(today),
+        expect(result.price).to.equal(`€${Products.demo_1.finalPrice}`),
+        expect(result.paymentType).to.equal(PaymentMethods.wirePayment.displayName),
+        expect(result.status).to.equal(OrderStatuses.awaitingBankWire.name),
+        expect(result.invoice).to.equal('-'),
       ]);
     });
 
@@ -167,7 +167,7 @@ describe('FO - Account - Order history : Consult order list', async () => {
       await orderHistoryPage.clickOnBackToYourAccountLink(page);
 
       const pageTitle: string = await myAccountPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(myAccountPage.pageTitle);
+      expect(pageTitle).to.equal(myAccountPage.pageTitle);
     });
 
     it('should go back to order history page', async function () {
@@ -176,7 +176,7 @@ describe('FO - Account - Order history : Consult order list', async () => {
       await myAccountPage.goToHistoryAndDetailsPage(page);
 
       const pageHeaderTitle: string = await orderHistoryPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
+      expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
     });
 
     it('should click on \'Home\' link', async function () {
@@ -185,7 +185,7 @@ describe('FO - Account - Order history : Consult order list', async () => {
       await orderHistoryPage.clickOnHomeLink(page);
 
       const pageTitle: string = await foHomePage.getPageTitle(page);
-      await expect(pageTitle).to.equal(foHomePage.pageTitle);
+      expect(pageTitle).to.equal(foHomePage.pageTitle);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_orderDetails/01_reorderFromOrderDetail.ts b/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_orderDetails/01_reorderFromOrderDetail.ts
index 581762b731299..2677391431a3a 100644
--- a/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_orderDetails/01_reorderFromOrderDetail.ts
+++ b/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_orderDetails/01_reorderFromOrderDetail.ts
@@ -73,7 +73,7 @@ describe('FO - Account - Order details : Reorder from order detail', async () =>
       await foHomePage.goToFo(page);
 
       const isHomePage: boolean = await foHomePage.isHomePage(page);
-      await expect(isHomePage).to.be.true;
+      expect(isHomePage).to.eq(true);
     });
 
     it('should go to login page', async function () {
@@ -82,7 +82,7 @@ describe('FO - Account - Order details : Reorder from order detail', async () =>
       await foHomePage.goToLoginPage(page);
 
       const pageHeaderTitle = await foLoginPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(foLoginPage.pageTitle);
+      expect(pageHeaderTitle).to.equal(foLoginPage.pageTitle);
     });
 
     it('should sign in FO', async function () {
@@ -91,7 +91,7 @@ describe('FO - Account - Order details : Reorder from order detail', async () =>
       await foLoginPage.customerLogin(page, Customers.johnDoe);
 
       const isCustomerConnected = await myAccountPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
 
     it('should go to my account page', async function () {
@@ -100,7 +100,7 @@ describe('FO - Account - Order details : Reorder from order detail', async () =>
       await foHomePage.goToMyAccountPage(page);
 
       const pageTitle = await myAccountPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(myAccountPage.pageTitle);
+      expect(pageTitle).to.equal(myAccountPage.pageTitle);
     });
 
     it('should go to order history page', async function () {
@@ -109,7 +109,7 @@ describe('FO - Account - Order details : Reorder from order detail', async () =>
       await myAccountPage.goToHistoryAndDetailsPage(page);
 
       const pageHeaderTitle = await orderHistoryPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
+      expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
     });
 
     it('should go to order details page', async function () {
@@ -118,7 +118,7 @@ describe('FO - Account - Order details : Reorder from order detail', async () =>
       await orderHistoryPage.goToDetailsPage(page);
 
       const pageTitle = await orderDetailsPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(orderDetailsPage.pageTitle);
+      expect(pageTitle).to.equal(orderDetailsPage.pageTitle);
     });
 
     it('should click on reorder link', async function () {
@@ -127,21 +127,21 @@ describe('FO - Account - Order details : Reorder from order detail', async () =>
       await orderDetailsPage.clickOnReorderLink(page);
 
       const isCheckoutPage = await checkoutPage.isCheckoutPage(page);
-      await expect(isCheckoutPage, 'Browser is not in checkout Page').to.be.true;
+      expect(isCheckoutPage, 'Browser is not in checkout Page').to.eq(true);
     });
 
     it('should validate Step Address and go to Delivery Step', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkDeliveryStepForReorder', baseContext);
 
       const isStepAddressComplete = await checkoutPage.goToDeliveryStep(page);
-      await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
     });
 
     it('should validate Step Delivery and go to Payment Step', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'goToPaymentStepForReorder', baseContext);
 
       const isStepDeliveryComplete = await checkoutPage.goToPaymentStep(page);
-      await expect(isStepDeliveryComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepDeliveryComplete, 'Step Address is not complete').to.eq(true);
     });
 
     it('should Pay by bank wire and confirm order', async function () {
@@ -150,10 +150,10 @@ describe('FO - Account - Order details : Reorder from order detail', async () =>
       await checkoutPage.choosePaymentAndOrder(page, PaymentMethods.wirePayment.moduleName);
 
       const pageTitle = await orderConfirmationPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(orderConfirmationPage.pageTitle);
+      expect(pageTitle).to.equal(orderConfirmationPage.pageTitle);
 
       const cardTitle = await orderConfirmationPage.getOrderConfirmationCardTitle(page);
-      await expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
+      expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
     });
   });
 
@@ -164,7 +164,7 @@ describe('FO - Account - Order details : Reorder from order detail', async () =>
       await foHomePage.goToMyAccountPage(page);
 
       const pageTitle = await myAccountPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(myAccountPage.pageTitle);
+      expect(pageTitle).to.equal(myAccountPage.pageTitle);
     });
 
     it('should go back to order history page', async function () {
@@ -173,7 +173,7 @@ describe('FO - Account - Order details : Reorder from order detail', async () =>
       await myAccountPage.goToHistoryAndDetailsPage(page);
 
       const pageHeaderTitle = await orderHistoryPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
+      expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
     });
 
     it('should go to order details page', async function () {
@@ -182,14 +182,14 @@ describe('FO - Account - Order details : Reorder from order detail', async () =>
       await orderHistoryPage.goToDetailsPage(page);
 
       const pageTitle = await orderDetailsPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(orderDetailsPage.pageTitle);
+      expect(pageTitle).to.equal(orderDetailsPage.pageTitle);
     });
 
     it('should check the ordered product', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkTheOrderedProduct', baseContext);
 
       const orderedProduct = await orderDetailsPage.getProductName(page);
-      await expect(orderedProduct).to.contain(Products.demo_1.name);
+      expect(orderedProduct).to.contain(Products.demo_1.name);
     });
 
     it('should sign out from FO', async function () {
@@ -198,7 +198,7 @@ describe('FO - Account - Order details : Reorder from order detail', async () =>
       await orderConfirmationPage.logout(page);
 
       const isCustomerConnected = await orderConfirmationPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is connected').to.be.false;
+      expect(isCustomerConnected, 'Customer is connected').to.eq(false);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_orderDetails/02_downloadInvoice.ts b/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_orderDetails/02_downloadInvoice.ts
index d3eea2f18d1c8..e2b933074d6db 100644
--- a/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_orderDetails/02_downloadInvoice.ts
+++ b/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_orderDetails/02_downloadInvoice.ts
@@ -85,7 +85,7 @@ describe('FO - Account - Order details : Download invoice', async () => {
       );
 
       const pageTitle: string = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should go to the first order page', async function () {
@@ -95,14 +95,14 @@ describe('FO - Account - Order details : Download invoice', async () => {
       await ordersPage.goToOrder(page, 1);
 
       const pageTitle: string = await orderPageTabListBlock.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+      expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
     });
 
     it(`should change the order status to '${OrderStatuses.shipped.name}' and check it`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateStatus', baseContext);
 
       const result: string = await orderPageTabListBlock.modifyOrderStatus(page, OrderStatuses.shipped.name);
-      await expect(result).to.equal(OrderStatuses.shipped.name);
+      expect(result).to.equal(OrderStatuses.shipped.name);
     });
 
     it('should get the invoice file name', async function () {
@@ -110,7 +110,7 @@ describe('FO - Account - Order details : Download invoice', async () => {
 
       // Get invoice file name
       fileName = await orderPageTabListBlock.getFileName(page);
-      await expect(fileName).not.null;
+      expect(fileName).to.not.eq(null);
     });
   });
 
@@ -121,7 +121,7 @@ describe('FO - Account - Order details : Download invoice', async () => {
       await foHomePage.goToFo(page);
 
       const isHomePage: boolean = await foHomePage.isHomePage(page);
-      await expect(isHomePage).to.be.true;
+      expect(isHomePage).to.eq(true);
     });
 
     it('should go to login page', async function () {
@@ -130,7 +130,7 @@ describe('FO - Account - Order details : Download invoice', async () => {
       await foHomePage.goToLoginPage(page);
 
       const pageHeaderTitle: string = await foLoginPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(foLoginPage.pageTitle);
+      expect(pageHeaderTitle).to.equal(foLoginPage.pageTitle);
     });
 
     it('should sign in FO', async function () {
@@ -139,7 +139,7 @@ describe('FO - Account - Order details : Download invoice', async () => {
       await foLoginPage.customerLogin(page, Customers.johnDoe);
 
       const isCustomerConnected: boolean = await myAccountPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
 
     it('should go to my account page', async function () {
@@ -148,7 +148,7 @@ describe('FO - Account - Order details : Download invoice', async () => {
       await foHomePage.goToMyAccountPage(page);
 
       const pageTitle: string = await myAccountPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(myAccountPage.pageTitle);
+      expect(pageTitle).to.equal(myAccountPage.pageTitle);
     });
 
     it('should go to order history page', async function () {
@@ -157,7 +157,7 @@ describe('FO - Account - Order details : Download invoice', async () => {
       await myAccountPage.goToHistoryAndDetailsPage(page);
 
       const pageHeaderTitle: string = await orderHistoryPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
+      expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
     });
 
     it('should go to order details page of the first order in list', async function () {
@@ -166,7 +166,7 @@ describe('FO - Account - Order details : Download invoice', async () => {
       await orderHistoryPage.goToDetailsPage(page);
 
       const pageTitle: string = await orderDetailsPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(orderDetailsPage.pageTitle);
+      expect(pageTitle).to.equal(orderDetailsPage.pageTitle);
     });
 
     it('should download the invoice', async function () {
@@ -175,10 +175,10 @@ describe('FO - Account - Order details : Download invoice', async () => {
       const downloadFilePath: string | null = await orderDetailsPage.downloadInvoice(page);
 
       const doesFileExist: boolean = await files.doesFileExist(downloadFilePath, 5000);
-      await expect(doesFileExist, 'File is not downloaded!').to.be.true;
+      expect(doesFileExist, 'File is not downloaded!').to.eq(true);
 
       const exist: boolean = await files.isTextInPDF(downloadFilePath, fileName);
-      await expect(exist).to.be.true;
+      expect(exist).to.eq(true);
     });
 
     it('should go to my account page', async function () {
@@ -187,7 +187,7 @@ describe('FO - Account - Order details : Download invoice', async () => {
       await foHomePage.goToMyAccountPage(page);
 
       const pageTitle: string = await myAccountPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(myAccountPage.pageTitle);
+      expect(pageTitle).to.equal(myAccountPage.pageTitle);
     });
 
     it('should go to order history page', async function () {
@@ -196,7 +196,7 @@ describe('FO - Account - Order details : Download invoice', async () => {
       await myAccountPage.goToHistoryAndDetailsPage(page);
 
       const pageHeaderTitle: string = await orderHistoryPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
+      expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
     });
 
     it('should go to order details page of the second order in list', async function () {
@@ -205,14 +205,14 @@ describe('FO - Account - Order details : Download invoice', async () => {
       await orderHistoryPage.goToDetailsPage(page, 2);
 
       const pageTitle: string = await orderDetailsPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(orderDetailsPage.pageTitle);
+      expect(pageTitle).to.equal(orderDetailsPage.pageTitle);
     });
 
     it('should check that no invoice is visible', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkNoInvoiceIsVisible', baseContext);
 
       const isInvoiceVisible: boolean = await orderDetailsPage.isInvoiceVisible(page);
-      await expect(isInvoiceVisible).to.be.false;
+      expect(isInvoiceVisible).to.eq(false);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_orderDetails/03_requestMerchandiseReturn.ts b/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_orderDetails/03_requestMerchandiseReturn.ts
index 7b17473830f0f..ec45a8f1f3ea7 100644
--- a/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_orderDetails/03_requestMerchandiseReturn.ts
+++ b/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_orderDetails/03_requestMerchandiseReturn.ts
@@ -95,7 +95,7 @@ describe('FO - Account - Order details : Request merchandise return', async () =
       );
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should go to the first order page', async function () {
@@ -105,21 +105,21 @@ describe('FO - Account - Order details : Request merchandise return', async () =
       await ordersPage.goToOrder(page, 1);
 
       const pageTitle = await orderPageTabListBlock.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+      expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
     });
 
     it(`should change the order status to '${OrderStatuses.delivered.name}' and check it`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateStatus', baseContext);
 
       const result = await orderPageTabListBlock.modifyOrderStatus(page, OrderStatuses.delivered.name);
-      await expect(result).to.equal(OrderStatuses.delivered.name);
+      expect(result).to.equal(OrderStatuses.delivered.name);
     });
 
     it('should get the order reference', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkFirstOrderUpdatedPrefix', baseContext);
 
       orderReference = await orderPageTabListBlock.getOrderReference(page);
-      await expect(orderReference).not.null;
+      expect(orderReference).to.not.eq(null);
     });
   });
 
@@ -130,7 +130,7 @@ describe('FO - Account - Order details : Request merchandise return', async () =
       await foHomePage.goToFo(page);
 
       const isHomePage = await foHomePage.isHomePage(page);
-      await expect(isHomePage).to.be.true;
+      expect(isHomePage).to.eq(true);
     });
 
     it('should go to login page', async function () {
@@ -139,7 +139,7 @@ describe('FO - Account - Order details : Request merchandise return', async () =
       await foHomePage.goToLoginPage(page);
 
       const pageHeaderTitle = await foLoginPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(foLoginPage.pageTitle);
+      expect(pageHeaderTitle).to.equal(foLoginPage.pageTitle);
     });
 
     it('should sign in FO', async function () {
@@ -148,7 +148,7 @@ describe('FO - Account - Order details : Request merchandise return', async () =
       await foLoginPage.customerLogin(page, Customers.johnDoe);
 
       const isCustomerConnected: boolean = await myAccountPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
 
     it('should go to my account page', async function () {
@@ -157,7 +157,7 @@ describe('FO - Account - Order details : Request merchandise return', async () =
       await foHomePage.goToMyAccountPage(page);
 
       const pageTitle = await myAccountPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(myAccountPage.pageTitle);
+      expect(pageTitle).to.equal(myAccountPage.pageTitle);
     });
 
     it('should go to order history page', async function () {
@@ -166,7 +166,7 @@ describe('FO - Account - Order details : Request merchandise return', async () =
       await myAccountPage.goToHistoryAndDetailsPage(page);
 
       const pageHeaderTitle = await orderHistoryPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
+      expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
     });
 
     it('should go to order details page of the first order in list', async function () {
@@ -175,14 +175,14 @@ describe('FO - Account - Order details : Request merchandise return', async () =
       await orderHistoryPage.goToDetailsPage(page);
 
       const pageTitle = await orderDetailsPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(orderDetailsPage.pageTitle);
+      expect(pageTitle).to.equal(orderDetailsPage.pageTitle);
     });
 
     it('should check the existence of order return form', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'isOrderReturnFormVisible', baseContext);
 
       const result = await orderDetailsPage.isOrderReturnFormVisible(page);
-      await expect(result).to.be.true;
+      expect(result).to.eq(true);
     });
 
     it('should create a merchandise return and check if merchandise return page is displayed', async function () {
@@ -191,7 +191,7 @@ describe('FO - Account - Order details : Request merchandise return', async () =
       await orderDetailsPage.requestMerchandiseReturn(page, 'Test merchandise returns');
 
       const pageTitle = await foMerchandiseReturnsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(foMerchandiseReturnsPage.pageTitle);
+      expect(pageTitle).to.contains(foMerchandiseReturnsPage.pageTitle);
     });
 
     it('should check the merchandise returns table', async function () {
diff --git a/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_orderDetails/04_sendMessage.ts b/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_orderDetails/04_sendMessage.ts
index cf26a502a841c..a23dd433cd5fa 100644
--- a/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_orderDetails/04_sendMessage.ts
+++ b/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/01_orderDetails/04_sendMessage.ts
@@ -69,7 +69,7 @@ describe('FO - Account : Send a message with an ordered product', async () => {
       await foHomePage.changeLanguage(page, 'en');
 
       const isHomePage = await foHomePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should go to login page', async function () {
@@ -78,7 +78,7 @@ describe('FO - Account : Send a message with an ordered product', async () => {
       await foHomePage.goToLoginPage(page);
 
       const pageTitle = await foLoginPage.getPageTitle(page);
-      await expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
+      expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
     });
 
     it('should sign in with default customer', async function () {
@@ -87,7 +87,7 @@ describe('FO - Account : Send a message with an ordered product', async () => {
       await foLoginPage.customerLogin(page, Customers.johnDoe);
 
       const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
 
     it('should create an order', async function () {
@@ -104,18 +104,18 @@ describe('FO - Account : Send a message with an ordered product', async () => {
 
       // Address step - Go to delivery step
       const isStepAddressComplete = await checkoutPage.goToDeliveryStep(page);
-      await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
 
       // Delivery step - Go to payment step
       const isStepDeliveryComplete = await checkoutPage.goToPaymentStep(page);
-      await expect(isStepDeliveryComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepDeliveryComplete, 'Step Address is not complete').to.eq(true);
 
       // Payment step - Choose payment step
       await checkoutPage.choosePaymentAndOrder(page, PaymentMethods.wirePayment.moduleName);
       const cardTitle = await orderConfirmationPage.getOrderConfirmationCardTitle(page);
 
       // Check the confirmation message
-      await expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
+      expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
     });
 
     it('should sign out from FO', async function () {
@@ -124,7 +124,7 @@ describe('FO - Account : Send a message with an ordered product', async () => {
       await orderConfirmationPage.logout(page);
 
       const isCustomerConnected = await orderConfirmationPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is connected').to.be.false;
+      expect(isCustomerConnected, 'Customer is connected').to.eq(false);
     });
   });
 
@@ -143,24 +143,24 @@ describe('FO - Account : Send a message with an ordered product', async () => {
       );
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should reset all filters ', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilters', baseContext);
 
       const numberOfOrders = await ordersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfOrders).to.be.above(0);
+      expect(numberOfOrders).to.be.above(0);
     });
 
     it(`should update order status to '${OrderStatuses.paymentAccepted.name}'`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateOrderStatus', baseContext);
 
       const textResult = await ordersPage.setOrderStatus(page, 1, OrderStatuses.paymentAccepted);
-      await expect(textResult).to.equal(ordersPage.successfulUpdateMessage);
+      expect(textResult).to.equal(ordersPage.successfulUpdateMessage);
 
       const orderStatus = await ordersPage.getTextColumn(page, 'osname', 1);
-      await expect(orderStatus, 'Order status was not updated').to.equal(OrderStatuses.paymentAccepted.name);
+      expect(orderStatus, 'Order status was not updated').to.equal(OrderStatuses.paymentAccepted.name);
     });
 
     it('disconnect from BO', async function () {
@@ -175,7 +175,7 @@ describe('FO - Account : Send a message with an ordered product', async () => {
       await foHomePage.goToFo(page);
 
       const isHomePage = await foHomePage.isHomePage(page);
-      await expect(isHomePage).to.be.true;
+      expect(isHomePage).to.eq(true);
     });
 
     it('should go to login page', async function () {
@@ -184,7 +184,7 @@ describe('FO - Account : Send a message with an ordered product', async () => {
       await foHomePage.goToLoginPage(page);
 
       const pageHeaderTitle = await foLoginPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(foLoginPage.pageTitle);
+      expect(pageHeaderTitle).to.equal(foLoginPage.pageTitle);
     });
 
     it('Should sign in FO', async function () {
@@ -193,7 +193,7 @@ describe('FO - Account : Send a message with an ordered product', async () => {
       await foLoginPage.customerLogin(page, Customers.johnDoe);
 
       const isCustomerConnected = await myAccountPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
 
     it('should go to order history page', async function () {
@@ -203,7 +203,7 @@ describe('FO - Account : Send a message with an ordered product', async () => {
       await myAccountPage.goToHistoryAndDetailsPage(page);
 
       const pageHeaderTitle = await orderHistoryPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
+      expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
     });
 
     it('Go to order details ', async function () {
@@ -212,7 +212,7 @@ describe('FO - Account : Send a message with an ordered product', async () => {
       await orderHistoryPage.goToDetailsPage(page);
 
       const successMessageText = await orderDetails.addAMessage(page, messageOption, messageSend);
-      await expect(successMessageText).to.equal(orderDetails.successMessageText);
+      expect(successMessageText).to.equal(orderDetails.successMessageText);
     });
   });
 
@@ -231,42 +231,42 @@ describe('FO - Account : Send a message with an ordered product', async () => {
       );
 
       const pageTitle = await customerServicePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customerServicePage.pageTitle);
+      expect(pageTitle).to.contains(customerServicePage.pageTitle);
     });
 
     it('should check customer name', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkCustomerName', baseContext);
 
       const email = await customerServicePage.getTextColumn(page, 1, 'customer');
-      await expect(email).to.contain(`${Customers.johnDoe.firstName} ${Customers.johnDoe.lastName}`);
+      expect(email).to.contain(`${Customers.johnDoe.firstName} ${Customers.johnDoe.lastName}`);
     });
 
     it('should check customer email', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkCustomerEmail', baseContext);
 
       const email = await customerServicePage.getTextColumn(page, 1, 'a!email');
-      await expect(email).to.contain(Customers.johnDoe.email);
+      expect(email).to.contain(Customers.johnDoe.email);
     });
 
     it('should check message type', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkMessageType', baseContext);
 
       const email = await customerServicePage.getTextColumn(page, 1, 'cl!id_contact');
-      await expect(email).to.contain('--');
+      expect(email).to.contain('--');
     });
 
     it('should check message', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkMessage', baseContext);
 
       const email = await customerServicePage.getTextColumn(page, 1, 'message');
-      await expect(email).to.contain(messageSend);
+      expect(email).to.contain(messageSend);
     });
 
     it('should delete the message', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteMessage', baseContext);
 
       const textResult = await customerServicePage.deleteMessage(page, 1);
-      await expect(textResult).to.contains(customerServicePage.successfulDeleteMessage);
+      expect(textResult).to.contains(customerServicePage.successfulDeleteMessage);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/02_reorderFromOrderList.ts b/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/02_reorderFromOrderList.ts
index 9d5657c5e9ef4..a63d23b702ea4 100644
--- a/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/02_reorderFromOrderList.ts
+++ b/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/02_reorderFromOrderList.ts
@@ -73,7 +73,7 @@ describe('FO - Account - Order history : Reorder from order list', async () => {
       await foHomePage.goToFo(page);
 
       const isHomePage: boolean = await foHomePage.isHomePage(page);
-      await expect(isHomePage).to.be.true;
+      expect(isHomePage).to.eq(true);
     });
 
     it('should go to login page', async function () {
@@ -82,7 +82,7 @@ describe('FO - Account - Order history : Reorder from order list', async () => {
       await foHomePage.goToLoginPage(page);
 
       const pageHeaderTitle = await foLoginPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(foLoginPage.pageTitle);
+      expect(pageHeaderTitle).to.equal(foLoginPage.pageTitle);
     });
 
     it('should sign in FO', async function () {
@@ -91,7 +91,7 @@ describe('FO - Account - Order history : Reorder from order list', async () => {
       await foLoginPage.customerLogin(page, Customers.johnDoe);
 
       const isCustomerConnected: boolean = await myAccountPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
 
     it('should go to my account page', async function () {
@@ -100,7 +100,7 @@ describe('FO - Account - Order history : Reorder from order list', async () => {
       await foHomePage.goToMyAccountPage(page);
 
       const pageTitle = await myAccountPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(myAccountPage.pageTitle);
+      expect(pageTitle).to.equal(myAccountPage.pageTitle);
     });
 
     it('should go to order history page', async function () {
@@ -109,7 +109,7 @@ describe('FO - Account - Order history : Reorder from order list', async () => {
       await myAccountPage.goToHistoryAndDetailsPage(page);
 
       const pageHeaderTitle = await orderHistoryPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
+      expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
     });
 
     it('should reorder the last order', async function () {
@@ -118,21 +118,21 @@ describe('FO - Account - Order history : Reorder from order list', async () => {
       await orderHistoryPage.clickOnReorderLink(page);
 
       const isCheckoutPage = await checkoutPage.isCheckoutPage(page);
-      await expect(isCheckoutPage, 'Browser is not in checkout Page').to.be.true;
+      expect(isCheckoutPage, 'Browser is not in checkout Page').to.eq(true);
     });
 
     it('should validate Step Address and go to Delivery Step', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkDeliveryStepForReorder', baseContext);
 
       const isStepAddressComplete = await checkoutPage.goToDeliveryStep(page);
-      await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
     });
 
     it('should validate Step Delivery and go to Payment Step', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'goToPaymentStepForReorder', baseContext);
 
       const isStepDeliveryComplete = await checkoutPage.goToPaymentStep(page);
-      await expect(isStepDeliveryComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepDeliveryComplete, 'Step Address is not complete').to.eq(true);
     });
 
     it('should Pay by bank wire and confirm order', async function () {
@@ -141,10 +141,10 @@ describe('FO - Account - Order history : Reorder from order list', async () => {
       await checkoutPage.choosePaymentAndOrder(page, PaymentMethods.wirePayment.moduleName);
 
       const pageTitle = await orderConfirmationPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(orderConfirmationPage.pageTitle);
+      expect(pageTitle).to.equal(orderConfirmationPage.pageTitle);
 
       const cardTitle = await orderConfirmationPage.getOrderConfirmationCardTitle(page);
-      await expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
+      expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
     });
   });
 
@@ -155,7 +155,7 @@ describe('FO - Account - Order history : Reorder from order list', async () => {
       await foHomePage.goToMyAccountPage(page);
 
       const pageTitle = await myAccountPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(myAccountPage.pageTitle);
+      expect(pageTitle).to.equal(myAccountPage.pageTitle);
     });
 
     it('should go back to order history page', async function () {
@@ -164,7 +164,7 @@ describe('FO - Account - Order history : Reorder from order list', async () => {
       await myAccountPage.goToHistoryAndDetailsPage(page);
 
       const pageHeaderTitle = await orderHistoryPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
+      expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
     });
 
     it('should go to order details page', async function () {
@@ -173,14 +173,14 @@ describe('FO - Account - Order history : Reorder from order list', async () => {
       await orderHistoryPage.goToDetailsPage(page);
 
       const pageTitle = await orderDetailsPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(orderDetailsPage.pageTitle);
+      expect(pageTitle).to.equal(orderDetailsPage.pageTitle);
     });
 
     it('should check the ordered product', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkTheOrderedProduct', baseContext);
 
       const orderedProduct = await orderDetailsPage.getProductName(page);
-      await expect(orderedProduct).to.contain(Products.demo_1.name);
+      expect(orderedProduct).to.contain(Products.demo_1.name);
     });
 
     it('should sign out from FO', async function () {
@@ -189,7 +189,7 @@ describe('FO - Account - Order history : Reorder from order list', async () => {
       await orderConfirmationPage.logout(page);
 
       const isCustomerConnected = await orderConfirmationPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is connected').to.be.false;
+      expect(isCustomerConnected, 'Customer is connected').to.eq(false);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/03_downloadInvoice.ts b/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/03_downloadInvoice.ts
index cb08cc43697ad..2d0f75bb7d7dd 100644
--- a/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/03_downloadInvoice.ts
+++ b/tests/UI/campaigns/functional/FO/classic/03_userAccount/02_orderHistory/03_downloadInvoice.ts
@@ -84,7 +84,7 @@ describe('FO - Account - Order history : download invoice', async () => {
       );
 
       const pageTitle: string = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should go to the first order page', async function () {
@@ -94,14 +94,14 @@ describe('FO - Account - Order history : download invoice', async () => {
       await ordersPage.goToOrder(page, 1);
 
       const pageTitle: string = await orderPageTabListBlock.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
+      expect(pageTitle).to.contains(orderPageTabListBlock.pageTitle);
     });
 
     it(`should change the order status to '${OrderStatuses.shipped.name}' and check it`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateStatus', baseContext);
 
       const result: string = await orderPageTabListBlock.modifyOrderStatus(page, OrderStatuses.shipped.name);
-      await expect(result).to.equal(OrderStatuses.shipped.name);
+      expect(result).to.equal(OrderStatuses.shipped.name);
     });
 
     it('should get the invoice file name', async function () {
@@ -109,7 +109,7 @@ describe('FO - Account - Order history : download invoice', async () => {
 
       // Get invoice file name
       fileName = await orderPageTabListBlock.getFileName(page);
-      await expect(fileName).not.null;
+      expect(fileName).to.not.eq(null);
     });
   });
 
@@ -120,7 +120,7 @@ describe('FO - Account - Order history : download invoice', async () => {
       await foHomePage.goToFo(page);
 
       const isHomePage: boolean = await foHomePage.isHomePage(page);
-      await expect(isHomePage).to.be.true;
+      expect(isHomePage).to.eq(true);
     });
 
     it('should go to login page', async function () {
@@ -129,7 +129,7 @@ describe('FO - Account - Order history : download invoice', async () => {
       await foHomePage.goToLoginPage(page);
 
       const pageHeaderTitle: string = await foLoginPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(foLoginPage.pageTitle);
+      expect(pageHeaderTitle).to.equal(foLoginPage.pageTitle);
     });
 
     it('should sign in FO', async function () {
@@ -138,7 +138,7 @@ describe('FO - Account - Order history : download invoice', async () => {
       await foLoginPage.customerLogin(page, Customers.johnDoe);
 
       const isCustomerConnected: boolean = await myAccountPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
 
     it('should go to my account page', async function () {
@@ -147,7 +147,7 @@ describe('FO - Account - Order history : download invoice', async () => {
       await foHomePage.goToMyAccountPage(page);
 
       const pageTitle: string = await myAccountPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(myAccountPage.pageTitle);
+      expect(pageTitle).to.equal(myAccountPage.pageTitle);
     });
 
     it('should go to order history page', async function () {
@@ -156,14 +156,14 @@ describe('FO - Account - Order history : download invoice', async () => {
       await myAccountPage.goToHistoryAndDetailsPage(page);
 
       const pageHeaderTitle: string = await orderHistoryPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
+      expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
     });
 
     it('should check that the invoice of the first order in list is visible', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkInvoice', baseContext);
 
       const isVisible: boolean = await orderHistoryPage.isInvoiceVisible(page, 1);
-      await expect(isVisible, 'The invoice file is not existing!').to.be.true;
+      expect(isVisible, 'The invoice file is not existing!').to.eq(true);
     });
 
     it('should download the invoice and check the invoice ID', async function () {
@@ -172,14 +172,14 @@ describe('FO - Account - Order history : download invoice', async () => {
       const downloadFilePath: string|null = await orderHistoryPage.downloadInvoice(page);
 
       const exist: boolean = await files.isTextInPDF(downloadFilePath, fileName);
-      await expect(exist).to.be.true;
+      expect(exist).to.eq(true);
     });
 
     it('should check that no invoice is visible for the second order in list', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkNoInvoice', baseContext);
 
       const isVisible: boolean = await orderHistoryPage.isInvoiceVisible(page, 2);
-      await expect(isVisible).to.be.false;
+      expect(isVisible).to.eq(false);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/FO/classic/03_userAccount/03_viewVouchers.ts b/tests/UI/campaigns/functional/FO/classic/03_userAccount/03_viewVouchers.ts
index 3cb8b69a9bfe4..58450c0119122 100644
--- a/tests/UI/campaigns/functional/FO/classic/03_userAccount/03_viewVouchers.ts
+++ b/tests/UI/campaigns/functional/FO/classic/03_userAccount/03_viewVouchers.ts
@@ -83,7 +83,7 @@ describe('FO - Account : View vouchers', async () => {
       await homePage.goTo(page, global.FO.URL);
 
       const result = await homePage.isHomePage(page);
-      await expect(result).to.be.true;
+      expect(result).to.eq(true);
     });
 
     it('should go to login page', async function () {
@@ -92,7 +92,7 @@ describe('FO - Account : View vouchers', async () => {
       await homePage.goToLoginPage(page);
 
       const pageTitle = await foLoginPage.getPageTitle(page);
-      await expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
+      expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
     });
 
     it('should sign in with created customer', async function () {
@@ -101,7 +101,7 @@ describe('FO - Account : View vouchers', async () => {
       await foLoginPage.customerLogin(page, customerData);
 
       const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
 
     it('should go to vouchers page', async function () {
@@ -111,7 +111,7 @@ describe('FO - Account : View vouchers', async () => {
       await myAccountPage.goToVouchersPage(page);
 
       const pageHeaderTitle = await foVouchersPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(foVouchersPage.pageTitle);
+      expect(pageHeaderTitle).to.equal(foVouchersPage.pageTitle);
     });
 
     [
@@ -138,7 +138,7 @@ describe('FO - Account : View vouchers', async () => {
           cartRule.args.row,
           cartRule.args.column,
         );
-        await expect(cartRuleTextColumn).to.equal(cartRule.args.value);
+        expect(cartRuleTextColumn).to.equal(cartRule.args.value);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/FO/classic/03_userAccount/04_getGDPRDataInPDF.ts b/tests/UI/campaigns/functional/FO/classic/03_userAccount/04_getGDPRDataInPDF.ts
index d52492c201c54..562dcc6b9f06d 100644
--- a/tests/UI/campaigns/functional/FO/classic/03_userAccount/04_getGDPRDataInPDF.ts
+++ b/tests/UI/campaigns/functional/FO/classic/03_userAccount/04_getGDPRDataInPDF.ts
@@ -116,7 +116,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await homePage.goToFo(page);
 
         const isHomePage = await homePage.isHomePage(page);
-        await expect(isHomePage).to.be.true;
+        expect(isHomePage).to.eq(true);
       });
 
       it('should go to create account page', async function () {
@@ -126,7 +126,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await loginPage.goToCreateAccountPage(page);
 
         const pageHeaderTitle = await createAccountPage.getHeaderTitle(page);
-        await expect(pageHeaderTitle).to.equal(createAccountPage.formTitle);
+        expect(pageHeaderTitle).to.equal(createAccountPage.formTitle);
       });
 
       it('should create new account', async function () {
@@ -135,7 +135,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await createAccountPage.createAccount(page, customerData);
 
         const isCustomerConnected = await homePage.isCustomerConnected(page);
-        await expect(isCustomerConnected).to.be.true;
+        expect(isCustomerConnected).to.eq(true);
       });
 
       it('should go to my account page', async function () {
@@ -144,7 +144,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await homePage.goToMyAccountPage(page);
 
         const pageTitle = await myAccountPage.getPageTitle(page);
-        await expect(pageTitle).to.equal(myAccountPage.pageTitle);
+        expect(pageTitle).to.equal(myAccountPage.pageTitle);
       });
 
       it('should go to \'GDPR - Personal data\' page', async function () {
@@ -153,7 +153,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await myAccountPage.goToMyGDPRPersonalDataPage(page);
 
         const pageTitle = await gdprPersonalDataPage.getPageTitle(page);
-        await expect(pageTitle).to.equal(gdprPersonalDataPage.pageTitle);
+        expect(pageTitle).to.equal(gdprPersonalDataPage.pageTitle);
       });
 
       it('should click on \'Get my data to PDF file\'', async function () {
@@ -162,7 +162,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         filePath = await gdprPersonalDataPage.exportDataToPDF(page);
 
         const found = await files.doesFileExist(filePath);
-        await expect(found, 'PDF file was not downloaded').to.be.true;
+        expect(found, 'PDF file was not downloaded').to.eq(true);
       });
     });
 
@@ -182,7 +182,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await customersPage.closeSfToolBar(page);
 
         const pageTitle = await customersPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(customersPage.pageTitle);
+        expect(pageTitle).to.contains(customersPage.pageTitle);
       });
 
       it(`should filter by customer first name '${customerData.firstName}'`, async function () {
@@ -191,7 +191,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await customersPage.filterCustomers(page, 'input', 'firstname', customerData.firstName);
 
         const numberOfCustomersAfterFilter = await customersPage.getNumberOfElementInGrid(page);
-        await expect(numberOfCustomersAfterFilter).to.equal(1);
+        expect(numberOfCustomersAfterFilter).to.equal(1);
       });
 
       it('should get creation account date', async function () {
@@ -200,7 +200,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         const registration = await customersPage.getTextColumnFromTableCustomers(page, 1, 'date_add');
         registrationDate = `${registration.substring(6, 10)}-${registration.substring(0, 2)}-`
           + `${registration.substring(3, 5)} ${registration.substring(11, 19)}`;
-        await expect(registrationDate).to.contains(dateNow.getFullYear());
+        expect(registrationDate).to.contains(dateNow.getFullYear());
       });
 
       it('should get last visit date', async function () {
@@ -209,7 +209,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         const lastVisit = await customersPage.getTextColumnFromTableCustomers(page, 1, 'connect');
         lastVisitDate = `${lastVisit.substring(6, 10)}-${lastVisit.substring(0, 2)}-`
           + `${lastVisit.substring(3, 5)} ${lastVisit.substring(11, 19)}`;
-        await expect(lastVisitDate).to.contains(dateNow.getFullYear());
+        expect(lastVisitDate).to.contains(dateNow.getFullYear());
       });
 
       it('should click on view customer', async function () {
@@ -218,14 +218,14 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await customersPage.goToViewCustomerPage(page, 1);
 
         const pageTitle = await viewCustomerPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(viewCustomerPage.pageTitle(createCustomerName));
+        expect(pageTitle).to.contains(viewCustomerPage.pageTitle(createCustomerName));
       });
 
       it('should get last connections ip address', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkLAstConnections', baseContext);
 
         ipAddress = await viewCustomerPage.getTextColumnFromTableLastConnections(page, 'ip-address');
-        await expect(ipAddress).to.not.be.null;
+        expect(ipAddress).to.not.eq(null);
       });
     });
 
@@ -235,7 +235,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'checkProductImage', baseContext);
 
         const imageNumber = await files.getImageNumberInPDF(filePath);
-        await expect(imageNumber).to.be.equal(1);
+        expect(imageNumber).to.be.equal(1);
       });
 
       it('should check the date and the customer name', async function () {
@@ -245,7 +245,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
           filePath,
           `${today},,${customerData.firstName} ${customerData.lastName},,`,
         );
-        await expect(isVisible, 'The date and the customer name are not correct!').to.be.true;
+        expect(isVisible, 'The date and the customer name are not correct!').to.eq(true);
       });
 
       it('should check general info', async function () {
@@ -258,14 +258,14 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
           + `Birth date, ,${customerData.birthDate.toISOString().slice(0, 10)},Age, ,${age},Email,`
           + `${customerData.email},Language, ,English (English),Creation account date, ,`
           + `${registrationDate},Last visit, ,${lastVisitDate},Siret,Ape,Company,Website`);
-        await expect(isVisible, 'General info is not correct!').to.be.true;
+        expect(isVisible, 'General info is not correct!').to.eq(true);
       });
 
       it('should check that Addresses table is empty', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkThatAddressesTableIsEmpty', baseContext);
 
         const isVisible = await files.isTextInPDF(filePath, ',No addresses,,');
-        await expect(isVisible, 'Addresses table is not empty!').to.be.true;
+        expect(isVisible, 'Addresses table is not empty!').to.eq(true);
       });
 
       it('should check that Orders table is empty', async function () {
@@ -273,21 +273,21 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
 
         const isVisible = await files.isTextInPDF(filePath, 'Orders,,Reference, ,Payment, ,Order state, ,'
           + 'Total paid, ,Date,,No orders,,');
-        await expect(isVisible, 'Orders table is not empty!').to.be.true;
+        expect(isVisible, 'Orders table is not empty!').to.eq(true);
       });
 
       it('should check that Carts table is empty', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkThatCartsTableIsEmpty1', baseContext);
 
         const isVisible = await files.isTextInPDF(filePath, ',Carts,,Id, ,Total products, ,Date,,No carts,,');
-        await expect(isVisible, 'Carts table is not empty!').to.be.true;
+        expect(isVisible, 'Carts table is not empty!').to.eq(true);
       });
 
       it('should check that Messages table is empty', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkThatMessagesTableIsEmpty', baseContext);
 
         const isVisible = await files.isTextInPDF(filePath, 'Messages,,IP, ,Message, ,Date,,No messages,,');
-        await expect(isVisible, 'Messages table is not empty!').to.be.true;
+        expect(isVisible, 'Messages table is not empty!').to.eq(true);
       });
 
       it('should check Last connections table', async function () {
@@ -296,7 +296,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         const isVisible = await files.isTextInPDF(filePath, 'Last connections,,Origin request, ,Page viewed, ,'
           + `Time on the page, ,IP address, ,Date,,1 / 2 ${today},,${customerData.firstName} `
           + `${customerData.lastName},,0, ,${ipAddress}, ,${lastVisitDate}`);
-        await expect(isVisible, 'The data in Last connections table is not correct!').to.be.true;
+        expect(isVisible, 'The data in Last connections table is not correct!').to.eq(true);
       });
 
       it('should check that Newsletter subscription table is empty', async function () {
@@ -304,14 +304,14 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
 
         const isVisible = await files.isTextInPDF(filePath, 'Module : Newsletter subscription,,0,,Newsletter '
           + 'subscription: no email to export, this customer has not registered.,,');
-        await expect(isVisible, 'Newsletter subscription table is not empty!').to.be.true;
+        expect(isVisible, 'Newsletter subscription table is not empty!').to.eq(true);
       });
 
       it('should check that Module product comments is empty', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkModuleProductComments', baseContext);
 
         const isVisible = await files.isTextInPDF(filePath, 'Module : Product Comments,,');
-        await expect(isVisible, 'Products comments is not empty!').to.be.true;
+        expect(isVisible, 'Products comments is not empty!').to.eq(true);
       });
 
       it('should check that mail alerts table is empty', async function () {
@@ -319,7 +319,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
 
         const isVisible = await files.isTextInPDF(filePath, ',Module : Mail alerts,,0,,Mail alert: Unable to export '
           + 'customer using email.');
-        await expect(isVisible, 'Mail alert table is not empty!').to.be.true;
+        expect(isVisible, 'Mail alert table is not empty!').to.eq(true);
       });
     });
   });
@@ -332,7 +332,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await homePage.goToFo(page);
 
         const isHomePage = await homePage.isHomePage(page);
-        await expect(isHomePage).to.be.true;
+        expect(isHomePage).to.eq(true);
       });
 
       it('should add product to cart', async function () {
@@ -344,7 +344,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await productPage.addProductToTheCart(page, 2);
 
         const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
-        await expect(notificationsNumber).to.be.equal(2);
+        expect(notificationsNumber).to.be.equal(2);
       });
 
       it('should go to my account page', async function () {
@@ -353,7 +353,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await homePage.goToMyAccountPage(page);
 
         const pageTitle = await myAccountPage.getPageTitle(page);
-        await expect(pageTitle).to.equal(myAccountPage.pageTitle);
+        expect(pageTitle).to.equal(myAccountPage.pageTitle);
       });
 
       it('should go to \'GDPR - Personal data\' page', async function () {
@@ -362,7 +362,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await myAccountPage.goToMyGDPRPersonalDataPage(page);
 
         const pageTitle = await gdprPersonalDataPage.getPageTitle(page);
-        await expect(pageTitle).to.equal(gdprPersonalDataPage.pageTitle);
+        expect(pageTitle).to.equal(gdprPersonalDataPage.pageTitle);
       });
 
       it('should click on \'Get my data to PDF file\'', async function () {
@@ -371,7 +371,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         filePath = await gdprPersonalDataPage.exportDataToPDF(page);
 
         const found = await files.doesFileExist(filePath);
-        await expect(found, 'PDF file was not downloaded').to.be.true;
+        expect(found, 'PDF file was not downloaded').to.eq(true);
       });
     });
 
@@ -382,7 +382,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await loginPage.goTo(page, global.BO.URL);
 
         const pageTitle = await dashboardPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(dashboardPage.pageTitle);
+        expect(pageTitle).to.contains(dashboardPage.pageTitle);
       });
 
       it('should go to \'Orders > Shopping carts\' page', async function () {
@@ -395,14 +395,14 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         );
 
         const pageTitle = await shoppingCartsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(shoppingCartsPage.pageTitle);
+        expect(pageTitle).to.contains(shoppingCartsPage.pageTitle);
       });
 
       it('should reset all filters and get number of shopping carts', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'resetFiltersFirst', baseContext);
 
         numberOfShoppingCarts = await shoppingCartsPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfShoppingCarts).to.be.above(0);
+        expect(numberOfShoppingCarts).to.be.above(0);
       });
 
       it('should filter list by customer', async function () {
@@ -411,10 +411,10 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await shoppingCartsPage.filterTable(page, 'input', 'c!lastname', customerData.lastName);
 
         const numberOfShoppingCartsAfterFilter = await shoppingCartsPage.getNumberOfElementInGrid(page);
-        await expect(numberOfShoppingCartsAfterFilter).to.equal(1);
+        expect(numberOfShoppingCartsAfterFilter).to.equal(1);
 
         const textColumn = await shoppingCartsPage.getTextColumn(page, 1, 'c!lastname');
-        await expect(textColumn).to.contains(customerData.lastName);
+        expect(textColumn).to.contains(customerData.lastName);
       });
 
       it('should get shopping cart ID and Date', async function () {
@@ -423,7 +423,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         shoppingCartDate = await shoppingCartsPage.getTextColumn(page, 1, 'date');
 
         shoppingCartID = await shoppingCartsPage.getTextColumn(page, 1, 'id_cart');
-        await expect(parseInt(shoppingCartID, 10)).to.be.greaterThan(5);
+        expect(parseInt(shoppingCartID, 10)).to.be.greaterThan(5);
       });
     });
 
@@ -437,7 +437,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         const isVisible = await files.isTextInPDF(filePath, `Carts,,Id, ,Total products, ,Date,,#${shoppingCartID}`
           + `, ,1, ,${shoppingCartDate},,Product(s) in the cart :,,Reference, ,Name, ,Quantity,,`
           + `${Products.demo_1.reference}, ,${Products.demo_1.name}, ,2`);
-        await expect(isVisible, 'Data in Carts table is not correct!').to.be.true;
+        expect(isVisible, 'Data in Carts table is not correct!').to.eq(true);
       });
     });
   });
@@ -450,7 +450,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await homePage.goToFo(page);
 
         const isHomePage = await homePage.isHomePage(page);
-        await expect(isHomePage).to.be.true;
+        expect(isHomePage).to.eq(true);
       });
 
       it('should go to carts page', async function () {
@@ -459,7 +459,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await homePage.goToCartPage(page);
 
         const pageTitle = await cartPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(cartPage.pageTitle);
+        expect(pageTitle).to.contains(cartPage.pageTitle);
       });
 
       it('should fill address form and go to delivery step', async function () {
@@ -469,7 +469,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await cartPage.clickOnProceedToCheckout(page);
 
         const isStepAddressComplete = await checkoutPage.setAddress(page, addressData);
-        await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+        expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
       });
 
       it('should go to payment step', async function () {
@@ -477,7 +477,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
 
         // Delivery step - Go to payment step
         const isStepDeliveryComplete = await checkoutPage.goToPaymentStep(page);
-        await expect(isStepDeliveryComplete, 'Step Address is not complete').to.be.true;
+        expect(isStepDeliveryComplete, 'Step Address is not complete').to.eq(true);
       });
 
       it('should choose payment method and confirm the order', async function () {
@@ -488,7 +488,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
 
         // Check the confirmation message
         const cardTitle = await orderConfirmationPage.getOrderConfirmationCardTitle(page);
-        await expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
+        expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
       });
 
       it('should go to my account page', async function () {
@@ -497,7 +497,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await homePage.goToMyAccountPage(page);
 
         const pageTitle = await myAccountPage.getPageTitle(page);
-        await expect(pageTitle).to.equal(myAccountPage.pageTitle);
+        expect(pageTitle).to.equal(myAccountPage.pageTitle);
       });
 
       it('should go to \'GDPR - Personal data\' page', async function () {
@@ -506,7 +506,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await myAccountPage.goToMyGDPRPersonalDataPage(page);
 
         const pageTitle = await gdprPersonalDataPage.getPageTitle(page);
-        await expect(pageTitle).to.equal(gdprPersonalDataPage.pageTitle);
+        expect(pageTitle).to.equal(gdprPersonalDataPage.pageTitle);
       });
 
       it('should click on \'Get my data to PDF file\'', async function () {
@@ -515,7 +515,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         filePath = await gdprPersonalDataPage.exportDataToPDF(page);
 
         const found = await files.doesFileExist(filePath);
-        await expect(found, 'PDF file was not downloaded').to.be.true;
+        expect(found, 'PDF file was not downloaded').to.eq(true);
       });
     });
 
@@ -526,7 +526,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await loginPage.goTo(page, global.BO.URL);
 
         const pageTitle = await dashboardPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(dashboardPage.pageTitle);
+        expect(pageTitle).to.contains(dashboardPage.pageTitle);
       });
 
       it('should go to \'Orders > Orders\' page', async function () {
@@ -539,7 +539,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         );
 
         const pageTitle = await ordersPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(ordersPage.pageTitle);
+        expect(pageTitle).to.contains(ordersPage.pageTitle);
       });
 
       it('should filter the Orders table by customer', async function () {
@@ -548,17 +548,17 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await ordersPage.filterOrders(page, 'input', 'customer', customerData.lastName);
 
         const numberOfOrdersAfterFilter = await ordersPage.getNumberOfElementInGrid(page);
-        await expect(numberOfOrdersAfterFilter).to.equal(1);
+        expect(numberOfOrdersAfterFilter).to.equal(1);
 
         const textColumn = await ordersPage.getTextColumn(page, 'customer');
-        await expect(textColumn).to.contains(customerData.lastName);
+        expect(textColumn).to.contains(customerData.lastName);
       });
 
       it('should get order data', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'getOrderData', baseContext);
 
         orderReference = await ordersPage.getTextColumn(page, 'reference');
-        await expect(orderReference).to.not.be.null;
+        expect(orderReference).to.not.eq(null);
 
         totalPaid = await ordersPage.getOrderATIPrice(page);
         orderDate = await ordersPage.getTextColumn(page, 'date_add');
@@ -568,7 +568,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'resetOrdersTable', baseContext);
 
         const numberOfOrders = await ordersPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfOrders).to.be.above(0);
+        expect(numberOfOrders).to.be.above(0);
       });
     });
 
@@ -580,7 +580,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
           + `Phone(s), ,Country, ,Date,,${addressData.alias}, ,${addressData.company}, ,${addressData.firstName} `
           + `${addressData.lastName}, ,${addressData.address},${addressData.postalCode} ${addressData.city},`
           + `${addressData.phone}, ,${addressData.country}`);
-        await expect(isVisible, 'Data in Addresses table is not correct!').to.be.true;
+        expect(isVisible, 'Data in Addresses table is not correct!').to.eq(true);
       });
 
       it('should check Orders table', async function () {
@@ -592,14 +592,14 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
           + ` ,Date,,${orderReference}, ,Bank transfer, ,Awaiting bank wire,payment,${totalPaid} EUR, ,`
           + `${orderCreateDate},,Product(s) in the order :,,Reference, ,Name, ,Quantity,,${Products.demo_1.reference}`
           + `, ,${Products.demo_1.name},(Size: S - Color: White),2`);
-        await expect(isVisible, 'Data in Orders table is not correct!').to.be.true;
+        expect(isVisible, 'Data in Orders table is not correct!').to.eq(true);
       });
 
       it('should check that Carts table is empty', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkCartsTable1', baseContext);
 
         const isVisible = await files.isTextInPDF(filePath, ',Carts,,Id, ,Total products, ,Date,,No carts');
-        await expect(isVisible, 'Carts table is not empty!').to.be.true;
+        expect(isVisible, 'Carts table is not empty!').to.eq(true);
       });
     });
   });
@@ -612,7 +612,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await homePage.goToFo(page);
 
         const isHomePage = await homePage.isHomePage(page);
-        await expect(isHomePage).to.be.true;
+        expect(isHomePage).to.eq(true);
       });
 
       it('should go on contact us page', async function () {
@@ -622,7 +622,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await loginPage.goToFooterLink(page, 'Contact us');
 
         const pageTitle = await contactUsPage.getPageTitle(page);
-        await expect(pageTitle).to.equal(contactUsPage.pageTitle);
+        expect(pageTitle).to.equal(contactUsPage.pageTitle);
       });
 
       it('should send message to customer service', async function () {
@@ -631,7 +631,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await contactUsPage.sendMessage(page, contactUsData, `${contactUsData.fileName}.txt`);
 
         const validationMessage = await contactUsPage.getAlertSuccess(page);
-        await expect(validationMessage).to.equal(contactUsPage.validationMessage);
+        expect(validationMessage).to.equal(contactUsPage.validationMessage);
       });
 
       it('should go to my account page', async function () {
@@ -640,7 +640,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await homePage.goToMyAccountPage(page);
 
         const pageTitle = await myAccountPage.getPageTitle(page);
-        await expect(pageTitle).to.equal(myAccountPage.pageTitle);
+        expect(pageTitle).to.equal(myAccountPage.pageTitle);
       });
 
       it('should go to \'GDPR - Personal data\' page', async function () {
@@ -649,7 +649,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await myAccountPage.goToMyGDPRPersonalDataPage(page);
 
         const pageTitle = await gdprPersonalDataPage.getPageTitle(page);
-        await expect(pageTitle).to.equal(gdprPersonalDataPage.pageTitle);
+        expect(pageTitle).to.equal(gdprPersonalDataPage.pageTitle);
       });
 
       it('should click on \'Get my data to PDF file\'', async function () {
@@ -658,7 +658,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         filePath = await gdprPersonalDataPage.exportDataToPDF(page);
 
         const found = await files.doesFileExist(filePath);
-        await expect(found, 'PDF file was not downloaded').to.be.true;
+        expect(found, 'PDF file was not downloaded').to.eq(true);
       });
     });
 
@@ -669,7 +669,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await loginPage.goTo(page, global.BO.URL);
 
         const pageTitle = await dashboardPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(dashboardPage.pageTitle);
+        expect(pageTitle).to.contains(dashboardPage.pageTitle);
       });
 
       it('should go to customer service page', async function () {
@@ -682,21 +682,21 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         );
 
         const pageTitle = await customerServicePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(customerServicePage.pageTitle);
+        expect(pageTitle).to.contains(customerServicePage.pageTitle);
       });
 
       it('should check customer name', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkCustomerName', baseContext);
 
         const email = await customerServicePage.getTextColumn(page, 1, 'customer');
-        await expect(email).to.contain(`${contactUsData.firstName} ${contactUsData.lastName}`);
+        expect(email).to.contain(`${contactUsData.firstName} ${contactUsData.lastName}`);
       });
 
       it('should get last message date', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkCustomerEmail', baseContext);
 
         messageDate = await customerServicePage.getTextColumn(page, 1, 'date');
-        await expect(messageDate).to.not.be.null;
+        expect(messageDate).to.not.eq(null);
       });
     });
 
@@ -708,7 +708,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
           + `Phone(s), ,Country, ,Date,,My Address, ,${addressData.company}, ,${addressData.firstName} `
           + `${addressData.lastName}, ,${addressData.address},${addressData.postalCode} ${addressData.city},`
           + `${addressData.phone}, ,${addressData.country}`);
-        await expect(isVisible, 'Data in Addresses table is not correct!').to.be.true;
+        expect(isVisible, 'Data in Addresses table is not correct!').to.eq(true);
       });
 
       it('should check Orders table', async function () {
@@ -720,14 +720,14 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
           + ` ,Date,,${orderReference}, ,Bank transfer, ,Awaiting bank wire,payment,${totalPaid} EUR, ,`
           + `${orderCreateDate},,Product(s) in the order :,,Reference, ,Name, ,Quantity,,${Products.demo_1.reference}`
           + `, ,${Products.demo_1.name},(Size: S - Color: White),2`);
-        await expect(isVisible, 'Data in Orders table is not correct!').to.be.true;
+        expect(isVisible, 'Data in Orders table is not correct!').to.eq(true);
       });
 
       it('should check that Carts table is empty', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkCartsTable2', baseContext);
 
         const isVisible = await files.isTextInPDF(filePath, ',Carts,,Id, ,Total products, ,Date,,No carts');
-        await expect(isVisible, 'Carts table is not empty!').to.be.true;
+        expect(isVisible, 'Carts table is not empty!').to.eq(true);
       });
 
       it('should check Messages table', async function () {
@@ -738,7 +738,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         const isVisible = await files.isTextInPDF(filePath, `Messages,,IP, ,Message, ,Date,,1 / 2 ${today},,`
           + `${contactUsData.firstName} ${contactUsData.lastName},,${ipAddress}, ,${contactUsData.message}, ,${
             dateString}`);
-        await expect(isVisible, 'Data in Messages table is not correct!').to.be.true;
+        expect(isVisible, 'Data in Messages table is not correct!').to.eq(true);
       });
     });
   });
@@ -751,7 +751,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await homePage.goToFo(page);
 
         const isHomePage = await homePage.isHomePage(page);
-        await expect(isHomePage).to.be.true;
+        expect(isHomePage).to.eq(true);
       });
 
       it('should logout by the link in the header', async function () {
@@ -760,7 +760,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await homePage.logout(page);
 
         const isCustomerConnected = await homePage.isCustomerConnected(page);
-        await expect(isCustomerConnected, 'Customer is connected!').to.be.false;
+        expect(isCustomerConnected, 'Customer is connected!').to.eq(false);
       });
 
       it('should sign in', async function () {
@@ -770,7 +770,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await loginPage.customerLogin(page, customerData);
 
         const isCustomerConnected = await loginPage.isCustomerConnected(page);
-        await expect(isCustomerConnected, 'Customer is not connected!').to.be.true;
+        expect(isCustomerConnected, 'Customer is not connected!').to.eq(true);
       });
 
       it('should go to my account page', async function () {
@@ -779,7 +779,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await homePage.goToMyAccountPage(page);
 
         const pageTitle = await myAccountPage.getPageTitle(page);
-        await expect(pageTitle).to.equal(myAccountPage.pageTitle);
+        expect(pageTitle).to.equal(myAccountPage.pageTitle);
       });
 
       it('should go to \'GDPR - Personal data\' page', async function () {
@@ -788,7 +788,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await myAccountPage.goToMyGDPRPersonalDataPage(page);
 
         const pageTitle = await gdprPersonalDataPage.getPageTitle(page);
-        await expect(pageTitle).to.equal(gdprPersonalDataPage.pageTitle);
+        expect(pageTitle).to.equal(gdprPersonalDataPage.pageTitle);
       });
 
       it('should click on \'Get my data to PDF file\'', async function () {
@@ -797,7 +797,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         filePath = await gdprPersonalDataPage.exportDataToPDF(page);
 
         const found = await files.doesFileExist(filePath);
-        await expect(found, 'PDF file was not downloaded').to.be.true;
+        expect(found, 'PDF file was not downloaded').to.eq(true);
       });
     });
 
@@ -808,7 +808,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await loginPage.goTo(page, global.BO.URL);
 
         const pageTitle = await dashboardPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(dashboardPage.pageTitle);
+        expect(pageTitle).to.contains(dashboardPage.pageTitle);
       });
 
       it('should go to \'Customers > Customers\' page', async function () {
@@ -822,7 +822,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await customersPage.closeSfToolBar(page);
 
         const pageTitle = await customersPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(customersPage.pageTitle);
+        expect(pageTitle).to.contains(customersPage.pageTitle);
       });
 
       it(`should filter by customer first name '${customerData.firstName}'`, async function () {
@@ -831,7 +831,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await customersPage.filterCustomers(page, 'input', 'firstname', customerData.firstName);
 
         const numberOfCustomersAfterFilter = await customersPage.getNumberOfElementInGrid(page);
-        await expect(numberOfCustomersAfterFilter).to.equal(1);
+        expect(numberOfCustomersAfterFilter).to.equal(1);
       });
 
       it('should get last visit date', async function () {
@@ -840,7 +840,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         const lastVisit = await customersPage.getTextColumnFromTableCustomers(page, 1, 'connect');
         secondLastVisitDate = `${lastVisit.substring(6, 10)}-${lastVisit.substring(0, 2)}-`
           + `${lastVisit.substring(3, 5)} ${lastVisit.substring(11, 19)}`;
-        await expect(lastVisitDate).to.contains(dateNow.getFullYear());
+        expect(lastVisitDate).to.contains(dateNow.getFullYear());
       });
 
       it('should click on view customer', async function () {
@@ -849,7 +849,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         await customersPage.goToViewCustomerPage(page, 1);
 
         const pageTitle = await viewCustomerPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(viewCustomerPage.pageTitle(createCustomerName));
+        expect(pageTitle).to.contains(viewCustomerPage.pageTitle(createCustomerName));
       });
 
       it('should get last connections origin', async function () {
@@ -861,7 +861,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         } else if (connectionOrigin === 'localhost') {
           connectionOrigin = `${global.INSTALL.ENABLE_SSL ? 'https://localhost:8002' : 'http://localhost:8001'},/en/,`;
         }
-        await expect(connectionOrigin).to.not.be.null;
+        expect(connectionOrigin).to.not.eq(null);
       });
     });
 
@@ -873,7 +873,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
           + `Phone(s), ,Country, ,Date,,My Address, ,${addressData.company}, ,${addressData.firstName} `
           + `${addressData.lastName}, ,${addressData.address},${addressData.postalCode} ${addressData.city},`
           + `${addressData.phone}, ,${addressData.country}`);
-        await expect(isVisible, 'Data in Addresses table is not correct!').to.be.true;
+        expect(isVisible, 'Data in Addresses table is not correct!').to.eq(true);
       });
 
       it('should check Orders table', async function () {
@@ -885,14 +885,14 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
           + ` ,Date,,${orderReference}, ,Bank transfer, ,Awaiting bank wire,payment,${totalPaid} EUR, ,`
           + `${orderCreateDate},,Product(s) in the order :,,Reference, ,Name, ,Quantity,,${Products.demo_1.reference}`
           + `, ,${Products.demo_1.name},(Size: S - Color: White),2`);
-        await expect(isVisible, 'Data in Orders table is not correct!').to.be.true;
+        expect(isVisible, 'Data in Orders table is not correct!').to.eq(true);
       });
 
       it('should check that Carts table is empty', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkCartsTable3', baseContext);
 
         const isVisible = await files.isTextInPDF(filePath, ',Carts,,Id, ,Total products, ,Date,,No carts');
-        await expect(isVisible, 'Carts table is not empty!').to.be.true;
+        expect(isVisible, 'Carts table is not empty!').to.eq(true);
       });
 
       it('should check Messages table', async function () {
@@ -903,7 +903,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         const isVisible = await files.isTextInPDF(filePath, `Messages,,IP, ,Message, ,Date,,1 / 2 ${today},,`
           + `${contactUsData.firstName} ${contactUsData.lastName},,${ipAddress}, ,${contactUsData.message}, ,${
             dateString}`);
-        await expect(isVisible, 'Data in Messages table is not correct!').to.be.true;
+        expect(isVisible, 'Data in Messages table is not correct!').to.eq(true);
       });
 
       it('should check Last connections table', async function () {
@@ -912,7 +912,7 @@ describe('FO - Account : Get GDPR data in PDF', async () => {
         const isVisible = await files.isTextInPDF(filePath, 'Last connectionsOrigin request Page viewed '
           + `Time on the page IP address Date${connectionOrigin.split(',').join('')}0 ${ipAddress} ${secondLastVisitDate}0 `
           + `${ipAddress} ${lastVisitDate}`, true);
-        await expect(isVisible, 'The data in Last connections table is not correct!').to.be.true;
+        expect(isVisible, 'The data in Last connections table is not correct!').to.eq(true);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/FO/classic/03_userAccount/05_getGDPRDataInCSV.ts b/tests/UI/campaigns/functional/FO/classic/03_userAccount/05_getGDPRDataInCSV.ts
index 5616ab6e368c0..497357ef86144 100644
--- a/tests/UI/campaigns/functional/FO/classic/03_userAccount/05_getGDPRDataInCSV.ts
+++ b/tests/UI/campaigns/functional/FO/classic/03_userAccount/05_getGDPRDataInCSV.ts
@@ -112,7 +112,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         await homePage.goToFo(page);
 
         const isHomePage = await homePage.isHomePage(page);
-        await expect(isHomePage).to.be.true;
+        expect(isHomePage).to.eq(true);
       });
 
       it('should go to create account page', async function () {
@@ -122,7 +122,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         await loginPage.goToCreateAccountPage(page);
 
         const pageHeaderTitle = await createAccountPage.getHeaderTitle(page);
-        await expect(pageHeaderTitle).to.equal(createAccountPage.formTitle);
+        expect(pageHeaderTitle).to.equal(createAccountPage.formTitle);
       });
 
       it('should create new account', async function () {
@@ -131,7 +131,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         await createAccountPage.createAccount(page, customerData);
 
         const isCustomerConnected = await homePage.isCustomerConnected(page);
-        await expect(isCustomerConnected).to.be.true;
+        expect(isCustomerConnected).to.eq(true);
       });
 
       it('should go to my account page', async function () {
@@ -140,7 +140,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         await homePage.goToMyAccountPage(page);
 
         const pageTitle = await myAccountPage.getPageTitle(page);
-        await expect(pageTitle).to.equal(myAccountPage.pageTitle);
+        expect(pageTitle).to.equal(myAccountPage.pageTitle);
       });
 
       it('should go to \'GDPR - Personal data\' page', async function () {
@@ -149,7 +149,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         await myAccountPage.goToMyGDPRPersonalDataPage(page);
 
         const pageTitle = await gdprPersonalDataPage.getPageTitle(page);
-        await expect(pageTitle).to.equal(gdprPersonalDataPage.pageTitle);
+        expect(pageTitle).to.equal(gdprPersonalDataPage.pageTitle);
       });
 
       it('should click on \'Get my data to CSV\'', async function () {
@@ -158,7 +158,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         filePath = await gdprPersonalDataPage.exportDataToCSV(page);
 
         const found = await files.doesFileExist(filePath);
-        await expect(found, 'CSV file was not downloaded').to.be.true;
+        expect(found, 'CSV file was not downloaded').to.eq(true);
       });
     });
 
@@ -178,7 +178,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         await customersPage.closeSfToolBar(page);
 
         const pageTitle = await customersPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(customersPage.pageTitle);
+        expect(pageTitle).to.contains(customersPage.pageTitle);
       });
 
       it(`should filter by customer first name '${customerData.firstName}'`, async function () {
@@ -187,7 +187,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         await customersPage.filterCustomers(page, 'input', 'firstname', customerData.firstName);
 
         const numberOfCustomersAfterFilter = await customersPage.getNumberOfElementInGrid(page);
-        await expect(numberOfCustomersAfterFilter).to.equal(1);
+        expect(numberOfCustomersAfterFilter).to.equal(1);
       });
 
       it('should get creation account date', async function () {
@@ -197,7 +197,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
 
         registrationDate = `${registration.substring(6, 10)}-${registration.substring(0, 2)}-`
           + `${registration.substring(3, 5)}${registration.substring(11, 19)}`;
-        await expect(registrationDate).to.contains(date.getFullYear());
+        expect(registrationDate).to.contains(date.getFullYear());
       });
 
       it('should get last visit date', async function () {
@@ -206,7 +206,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         const lastVisit = await customersPage.getTextColumnFromTableCustomers(page, 1, 'connect');
         lastVisitDate = `${lastVisit.substring(6, 10)}-${lastVisit.substring(0, 2)}-`
           + `${lastVisit.substring(3, 5)}${lastVisit.substring(11, 19)}`;
-        await expect(lastVisitDate).to.contains(date.getFullYear());
+        expect(lastVisitDate).to.contains(date.getFullYear());
       });
 
       it('should click on view customer', async function () {
@@ -215,14 +215,14 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         await customersPage.goToViewCustomerPage(page, 1);
 
         const pageTitle = await viewCustomerPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(viewCustomerPage.pageTitle(createCustomerName));
+        expect(pageTitle).to.contains(viewCustomerPage.pageTitle(createCustomerName));
       });
 
       it('should get last connections ip address', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkLAstConnections', baseContext);
 
         ipAddress = await viewCustomerPage.getTextColumnFromTableLastConnections(page, 'ip-address');
-        await expect(ipAddress).to.not.be.null;
+        expect(ipAddress).to.not.eq(null);
       });
     });
 
@@ -242,7 +242,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
           true,
           'utf16le',
         );
-        await expect(isVisible, 'General info is not correct!').to.be.true;
+        expect(isVisible, 'General info is not correct!').to.eq(true);
       });
 
       it('should check that Addresses table is empty', async function () {
@@ -255,7 +255,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
           true,
           'utf16le',
         );
-        await expect(isVisible, 'Addresses table is not empty!').to.be.true;
+        expect(isVisible, 'Addresses table is not empty!').to.eq(true);
       });
 
       it('should check that Orders table is empty', async function () {
@@ -268,7 +268,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
           true,
           'utf16le',
         );
-        await expect(isVisible, 'Orders table is not empty!').to.be.true;
+        expect(isVisible, 'Orders table is not empty!').to.eq(true);
       });
 
       it('should check that Carts table is empty', async function () {
@@ -281,7 +281,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
           true,
           'utf16le',
         );
-        await expect(isVisible, 'Carts table is not empty!').to.be.true;
+        expect(isVisible, 'Carts table is not empty!').to.eq(true);
       });
 
       it('should check that Messages table is empty', async function () {
@@ -294,7 +294,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
           true,
           'utf16le',
         );
-        await expect(isVisible, 'Messages table is not empty!').to.be.true;
+        expect(isVisible, 'Messages table is not empty!').to.eq(true);
       });
 
       it('should check Last connections table', async function () {
@@ -308,7 +308,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
           true,
           'utf16le',
         );
-        await expect(isVisible, 'The data in Last connections table is not correct!').to.be.true;
+        expect(isVisible, 'The data in Last connections table is not correct!').to.eq(true);
       });
 
       it('should check that Newsletter subscription table is empty', async function () {
@@ -321,7 +321,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
           true,
           'utf16le',
         );
-        await expect(isVisible, 'Newsletter subscription table is not empty!').to.be.true;
+        expect(isVisible, 'Newsletter subscription table is not empty!').to.eq(true);
       });
 
       it('should check that Module product comments is empty', async function () {
@@ -334,7 +334,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
           true,
           'utf16le',
         );
-        await expect(isVisible, 'Products comments is not empty!').to.be.true;
+        expect(isVisible, 'Products comments is not empty!').to.eq(true);
       });
 
       it('should check that mail alerts table is empty', async function () {
@@ -347,7 +347,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
           true,
           'utf16le',
         );
-        await expect(isVisible, 'Mail alert table is not empty!').to.be.true;
+        expect(isVisible, 'Mail alert table is not empty!').to.eq(true);
       });
     });
   });
@@ -360,7 +360,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         await homePage.goToFo(page);
 
         const isHomePage = await homePage.isHomePage(page);
-        await expect(isHomePage).to.be.true;
+        expect(isHomePage).to.eq(true);
       });
 
       it('should add product to cart', async function () {
@@ -372,7 +372,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         await productPage.addProductToTheCart(page, 2);
 
         const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
-        await expect(notificationsNumber).to.be.equal(2);
+        expect(notificationsNumber).to.be.equal(2);
       });
 
       it('should go to my account page', async function () {
@@ -381,7 +381,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         await homePage.goToMyAccountPage(page);
 
         const pageTitle = await myAccountPage.getPageTitle(page);
-        await expect(pageTitle).to.equal(myAccountPage.pageTitle);
+        expect(pageTitle).to.equal(myAccountPage.pageTitle);
       });
 
       it('should go to \'GDPR - Personal data\' page', async function () {
@@ -390,7 +390,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         await myAccountPage.goToMyGDPRPersonalDataPage(page);
 
         const pageTitle = await gdprPersonalDataPage.getPageTitle(page);
-        await expect(pageTitle).to.equal(gdprPersonalDataPage.pageTitle);
+        expect(pageTitle).to.equal(gdprPersonalDataPage.pageTitle);
       });
 
       it('should click on \'Get my data to CSV file\'', async function () {
@@ -399,7 +399,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         filePath = await gdprPersonalDataPage.exportDataToCSV(page);
 
         const found = await files.doesFileExist(filePath);
-        await expect(found, 'CSV file was not downloaded').to.be.true;
+        expect(found, 'CSV file was not downloaded').to.eq(true);
       });
     });
 
@@ -410,7 +410,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         await loginPage.goTo(page, global.BO.URL);
 
         const pageTitle = await dashboardPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(dashboardPage.pageTitle);
+        expect(pageTitle).to.contains(dashboardPage.pageTitle);
       });
 
       it('should go to \'Orders > Shopping carts\' page', async function () {
@@ -423,14 +423,14 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         );
 
         const pageTitle = await shoppingCartsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(shoppingCartsPage.pageTitle);
+        expect(pageTitle).to.contains(shoppingCartsPage.pageTitle);
       });
 
       it('should reset all filters and get number of shopping carts', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'resetFiltersFirst', baseContext);
 
         numberOfShoppingCarts = await shoppingCartsPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfShoppingCarts).to.be.above(0);
+        expect(numberOfShoppingCarts).to.be.above(0);
       });
 
       it('should filter list by customer', async function () {
@@ -439,10 +439,10 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         await shoppingCartsPage.filterTable(page, 'input', 'c!lastname', customerData.lastName);
 
         const numberOfShoppingCartsAfterFilter = await shoppingCartsPage.getNumberOfElementInGrid(page);
-        await expect(numberOfShoppingCartsAfterFilter).to.equal(1);
+        expect(numberOfShoppingCartsAfterFilter).to.equal(1);
 
         const textColumn = await shoppingCartsPage.getTextColumn(page, 1, 'c!lastname');
-        await expect(textColumn).to.contains(customerData.lastName);
+        expect(textColumn).to.contains(customerData.lastName);
       });
 
       it('should get shopping cart ID and Date', async function () {
@@ -453,7 +453,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
           + `${shoppingCartDate.substring(3, 5)}${shoppingCartDate.substring(11, 19)}`;
 
         shoppingCartID = await shoppingCartsPage.getTextColumn(page, 1, 'id_cart');
-        await expect(parseInt(shoppingCartID, 10)).to.be.greaterThan(5);
+        expect(parseInt(shoppingCartID, 10)).to.be.greaterThan(5);
       });
     });
 
@@ -470,7 +470,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
           true,
           'utf16le',
         );
-        await expect(isVisible, 'Data in Carts table is not correct!').to.be.true;
+        expect(isVisible, 'Data in Carts table is not correct!').to.eq(true);
       });
     });
   });
@@ -483,7 +483,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         await homePage.goToFo(page);
 
         const isHomePage = await homePage.isHomePage(page);
-        await expect(isHomePage).to.be.true;
+        expect(isHomePage).to.eq(true);
       });
 
       it('should go to carts page', async function () {
@@ -492,7 +492,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         await homePage.goToCartPage(page);
 
         const pageTitle = await cartPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(cartPage.pageTitle);
+        expect(pageTitle).to.contains(cartPage.pageTitle);
       });
 
       it('should fill address form and go to delivery step', async function () {
@@ -502,7 +502,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         await cartPage.clickOnProceedToCheckout(page);
 
         const isStepAddressComplete = await checkoutPage.setAddress(page, addressData);
-        await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+        expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
       });
 
       it('should go to payment step', async function () {
@@ -510,7 +510,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
 
         // Delivery step - Go to payment step
         const isStepDeliveryComplete = await checkoutPage.goToPaymentStep(page);
-        await expect(isStepDeliveryComplete, 'Step Address is not complete').to.be.true;
+        expect(isStepDeliveryComplete, 'Step Address is not complete').to.eq(true);
       });
 
       it('should choose payment method and confirm the order', async function () {
@@ -521,7 +521,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
 
         // Check the confirmation message
         const cardTitle = await orderConfirmationPage.getOrderConfirmationCardTitle(page);
-        await expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
+        expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
       });
 
       it('should go to my account page', async function () {
@@ -530,7 +530,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         await homePage.goToMyAccountPage(page);
 
         const pageTitle = await myAccountPage.getPageTitle(page);
-        await expect(pageTitle).to.equal(myAccountPage.pageTitle);
+        expect(pageTitle).to.equal(myAccountPage.pageTitle);
       });
 
       it('should go to \'GDPR - Personal data\' page', async function () {
@@ -539,7 +539,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         await myAccountPage.goToMyGDPRPersonalDataPage(page);
 
         const pageTitle = await gdprPersonalDataPage.getPageTitle(page);
-        await expect(pageTitle).to.equal(gdprPersonalDataPage.pageTitle);
+        expect(pageTitle).to.equal(gdprPersonalDataPage.pageTitle);
       });
 
       it('should click on \'Get my data to CSV file\'', async function () {
@@ -548,7 +548,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         filePath = await gdprPersonalDataPage.exportDataToCSV(page);
 
         const found = await files.doesFileExist(filePath);
-        await expect(found, 'CSV file was not downloaded').to.be.true;
+        expect(found, 'CSV file was not downloaded').to.eq(true);
       });
     });
 
@@ -559,7 +559,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         await loginPage.goTo(page, global.BO.URL);
 
         const pageTitle = await dashboardPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(dashboardPage.pageTitle);
+        expect(pageTitle).to.contains(dashboardPage.pageTitle);
       });
 
       it('should go to \'Orders > Orders\' page', async function () {
@@ -572,7 +572,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         );
 
         const pageTitle = await ordersPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(ordersPage.pageTitle);
+        expect(pageTitle).to.contains(ordersPage.pageTitle);
       });
 
       it('should filter the Orders table by customer', async function () {
@@ -581,17 +581,17 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         await ordersPage.filterOrders(page, 'input', 'customer', customerData.lastName);
 
         const numberOfOrdersAfterFilter = await ordersPage.getNumberOfElementInGrid(page);
-        await expect(numberOfOrdersAfterFilter).to.equal(1);
+        expect(numberOfOrdersAfterFilter).to.equal(1);
 
         const textColumn = await ordersPage.getTextColumn(page, 'customer');
-        await expect(textColumn).to.contains(customerData.lastName);
+        expect(textColumn).to.contains(customerData.lastName);
       });
 
       it('should get order data', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'getOrderData', baseContext);
 
         orderReference = await ordersPage.getTextColumn(page, 'reference');
-        await expect(orderReference).to.not.be.null;
+        expect(orderReference).to.not.eq(null);
 
         totalPaid = await ordersPage.getOrderATIPrice(page);
         orderDate = await ordersPage.getTextColumn(page, 'date_add');
@@ -603,7 +603,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'resetOrdersTable', baseContext);
 
         const numberOfOrders = await ordersPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfOrders).to.be.above(0);
+        expect(numberOfOrders).to.be.above(0);
       });
     });
 
@@ -619,7 +619,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
           true,
           true,
           'utf16le');
-        await expect(isVisible, 'Data in Addresses table is not correct!').to.be.true;
+        expect(isVisible, 'Data in Addresses table is not correct!').to.eq(true);
       });
 
       it('should check Orders table', async function () {
@@ -634,7 +634,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
           true,
           true,
           'utf16le');
-        await expect(isVisible, 'Data in Orders table is not correct!').to.be.true;
+        expect(isVisible, 'Data in Orders table is not correct!').to.eq(true);
       });
 
       it('should check that Carts table is empty', async function () {
@@ -646,7 +646,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
           true,
           true,
           'utf16le');
-        await expect(isVisible, 'Carts table is not empty!').to.be.true;
+        expect(isVisible, 'Carts table is not empty!').to.eq(true);
       });
     });
   });
@@ -659,7 +659,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         await homePage.goToFo(page);
 
         const isHomePage = await homePage.isHomePage(page);
-        await expect(isHomePage).to.be.true;
+        expect(isHomePage).to.eq(true);
       });
 
       it('should go on contact us page', async function () {
@@ -669,7 +669,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         await loginPage.goToFooterLink(page, 'Contact us');
 
         const pageTitle = await contactUsPage.getPageTitle(page);
-        await expect(pageTitle).to.equal(contactUsPage.pageTitle);
+        expect(pageTitle).to.equal(contactUsPage.pageTitle);
       });
 
       it('should send message to customer service', async function () {
@@ -678,7 +678,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         await contactUsPage.sendMessage(page, contactUsData, `${contactUsData.fileName}.txt`);
 
         const validationMessage = await contactUsPage.getAlertSuccess(page);
-        await expect(validationMessage).to.equal(contactUsPage.validationMessage);
+        expect(validationMessage).to.equal(contactUsPage.validationMessage);
       });
 
       it('should go to my account page', async function () {
@@ -687,7 +687,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         await homePage.goToMyAccountPage(page);
 
         const pageTitle = await myAccountPage.getPageTitle(page);
-        await expect(pageTitle).to.equal(myAccountPage.pageTitle);
+        expect(pageTitle).to.equal(myAccountPage.pageTitle);
       });
 
       it('should go to \'GDPR - Personal data\' page', async function () {
@@ -696,7 +696,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         await myAccountPage.goToMyGDPRPersonalDataPage(page);
 
         const pageTitle = await gdprPersonalDataPage.getPageTitle(page);
-        await expect(pageTitle).to.equal(gdprPersonalDataPage.pageTitle);
+        expect(pageTitle).to.equal(gdprPersonalDataPage.pageTitle);
       });
 
       it('should click on \'Get my data to CSV file\'', async function () {
@@ -705,7 +705,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         filePath = await gdprPersonalDataPage.exportDataToCSV(page);
 
         const found = await files.doesFileExist(filePath);
-        await expect(found, 'CSV file was not downloaded').to.be.true;
+        expect(found, 'CSV file was not downloaded').to.eq(true);
       });
     });
 
@@ -716,7 +716,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         await loginPage.goTo(page, global.BO.URL);
 
         const pageTitle = await dashboardPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(dashboardPage.pageTitle);
+        expect(pageTitle).to.contains(dashboardPage.pageTitle);
       });
 
       it('should go to customer service page', async function () {
@@ -729,14 +729,14 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         );
 
         const pageTitle = await customerServicePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(customerServicePage.pageTitle);
+        expect(pageTitle).to.contains(customerServicePage.pageTitle);
       });
 
       it('should check customer name', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkCustomerName', baseContext);
 
         const email = await customerServicePage.getTextColumn(page, 1, 'customer');
-        await expect(email).to.contain(`${contactUsData.firstName} ${contactUsData.lastName}`);
+        expect(email).to.contain(`${contactUsData.firstName} ${contactUsData.lastName}`);
       });
 
       it('should get last message date', async function () {
@@ -745,7 +745,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         messageDate = await customerServicePage.getTextColumn(page, 1, 'date');
         messageDate = `${messageDate.substring(6, 10)}-${messageDate.substring(0, 2)}-`
           + `${messageDate.substring(3, 5)}${messageDate.substring(11, 19)}`;
-        await expect(messageDate).to.not.be.null;
+        expect(messageDate).to.not.eq(null);
       });
     });
 
@@ -761,7 +761,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
           true,
           true,
           'utf16le');
-        await expect(isVisible, 'Data in Addresses table is not correct!').to.be.true;
+        expect(isVisible, 'Data in Addresses table is not correct!').to.eq(true);
       });
 
       it('should check Orders table', async function () {
@@ -776,7 +776,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
           true,
           true,
           'utf16le');
-        await expect(isVisible, 'Data in Orders table is not correct!').to.be.true;
+        expect(isVisible, 'Data in Orders table is not correct!').to.eq(true);
       });
 
       it('should check that Carts table is empty', async function () {
@@ -788,7 +788,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
           true,
           true,
           'utf16le');
-        await expect(isVisible, 'Carts table is not empty!').to.be.true;
+        expect(isVisible, 'Carts table is not empty!').to.eq(true);
       });
 
       it('should check Messages table', async function () {
@@ -800,7 +800,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
           true,
           true,
           'utf16le');
-        await expect(isVisible, 'Data in Messages table is not correct!').to.be.true;
+        expect(isVisible, 'Data in Messages table is not correct!').to.eq(true);
       });
     });
   });
@@ -813,7 +813,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         await homePage.goToFo(page);
 
         const isHomePage = await homePage.isHomePage(page);
-        await expect(isHomePage).to.be.true;
+        expect(isHomePage).to.eq(true);
       });
 
       it('should logout by the link in the header', async function () {
@@ -822,7 +822,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         await homePage.logout(page);
 
         const isCustomerConnected = await homePage.isCustomerConnected(page);
-        await expect(isCustomerConnected, 'Customer is connected!').to.be.false;
+        expect(isCustomerConnected, 'Customer is connected!').to.eq(false);
       });
 
       it('should sign in', async function () {
@@ -832,7 +832,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         await loginPage.customerLogin(page, customerData);
 
         const isCustomerConnected = await loginPage.isCustomerConnected(page);
-        await expect(isCustomerConnected, 'Customer is not connected!').to.be.true;
+        expect(isCustomerConnected, 'Customer is not connected!').to.eq(true);
       });
 
       it('should go to my account page', async function () {
@@ -841,7 +841,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         await homePage.goToMyAccountPage(page);
 
         const pageTitle = await myAccountPage.getPageTitle(page);
-        await expect(pageTitle).to.equal(myAccountPage.pageTitle);
+        expect(pageTitle).to.equal(myAccountPage.pageTitle);
       });
 
       it('should go to \'GDPR - Personal data\' page', async function () {
@@ -850,7 +850,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         await myAccountPage.goToMyGDPRPersonalDataPage(page);
 
         const pageTitle = await gdprPersonalDataPage.getPageTitle(page);
-        await expect(pageTitle).to.equal(gdprPersonalDataPage.pageTitle);
+        expect(pageTitle).to.equal(gdprPersonalDataPage.pageTitle);
       });
 
       it('should click on \'Get my data to CSV file\'', async function () {
@@ -859,7 +859,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         filePath = await gdprPersonalDataPage.exportDataToCSV(page);
 
         const found = await files.doesFileExist(filePath);
-        await expect(found, 'CSV file was not downloaded').to.be.true;
+        expect(found, 'CSV file was not downloaded').to.eq(true);
       });
     });
 
@@ -870,7 +870,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         await loginPage.goTo(page, global.BO.URL);
 
         const pageTitle = await dashboardPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(dashboardPage.pageTitle);
+        expect(pageTitle).to.contains(dashboardPage.pageTitle);
       });
 
       it('should go to \'Customers > Customers\' page', async function () {
@@ -885,7 +885,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         await customersPage.closeSfToolBar(page);
 
         const pageTitle = await customersPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(customersPage.pageTitle);
+        expect(pageTitle).to.contains(customersPage.pageTitle);
       });
 
       it(`should filter by customer first name '${customerData.firstName}'`, async function () {
@@ -894,7 +894,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         await customersPage.filterCustomers(page, 'input', 'firstname', customerData.firstName);
 
         const numberOfCustomersAfterFilter = await customersPage.getNumberOfElementInGrid(page);
-        await expect(numberOfCustomersAfterFilter).to.equal(1);
+        expect(numberOfCustomersAfterFilter).to.equal(1);
       });
 
       it('should get last visit date', async function () {
@@ -903,7 +903,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         const lastVisit = await customersPage.getTextColumnFromTableCustomers(page, 1, 'connect');
         secondLastVisitDate = `${lastVisit.substring(6, 10)}-${lastVisit.substring(0, 2)}-`
           + `${lastVisit.substring(3, 5)}${lastVisit.substring(11, 19)}`;
-        await expect(lastVisitDate).to.contains(date.getFullYear());
+        expect(lastVisitDate).to.contains(date.getFullYear());
       });
 
       it('should click on view customer', async function () {
@@ -912,7 +912,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
         await customersPage.goToViewCustomerPage(page, 1);
 
         const pageTitle = await viewCustomerPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(viewCustomerPage.pageTitle(createCustomerName));
+        expect(pageTitle).to.contains(viewCustomerPage.pageTitle(createCustomerName));
       });
 
       it('should get last connections origin', async function () {
@@ -928,7 +928,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
             connectionOrigin = 'http://localhost:8001/en/';
           }
         }
-        await expect(connectionOrigin).to.not.be.null;
+        expect(connectionOrigin).to.not.eq(null);
       });
     });
 
@@ -944,7 +944,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
           true,
           true,
           'utf16le');
-        await expect(isVisible, 'Data in Addresses table is not correct!').to.be.true;
+        expect(isVisible, 'Data in Addresses table is not correct!').to.eq(true);
       });
 
       it('should check Orders table', async function () {
@@ -959,7 +959,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
           true,
           true,
           'utf16le');
-        await expect(isVisible, 'Data in Orders table is not correct!').to.be.true;
+        expect(isVisible, 'Data in Orders table is not correct!').to.eq(true);
       });
 
       it('should check that Carts table is empty', async function () {
@@ -971,7 +971,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
           true,
           true,
           'utf16le');
-        await expect(isVisible, 'Carts table is not empty!').to.be.true;
+        expect(isVisible, 'Carts table is not empty!').to.eq(true);
       });
 
       it('should check Messages table', async function () {
@@ -983,7 +983,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
           true,
           true,
           'utf16le');
-        await expect(isVisible, 'Data in Messages table is not correct!').to.be.true;
+        expect(isVisible, 'Data in Messages table is not correct!').to.eq(true);
       });
 
       it('should check Last connections table', async function () {
@@ -996,7 +996,7 @@ describe('FO - Account : Get GDPR data in CSV', async () => {
           true,
           true,
           'utf16le');
-        await expect(isVisible, 'The data in Last connections table is not correct!').to.be.true;
+        expect(isVisible, 'The data in Last connections table is not correct!').to.eq(true);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/FO/classic/03_userAccount/06_contactUsOnGDPRPage.ts b/tests/UI/campaigns/functional/FO/classic/03_userAccount/06_contactUsOnGDPRPage.ts
index fa91bd0fab9fe..30d2adca5282a 100644
--- a/tests/UI/campaigns/functional/FO/classic/03_userAccount/06_contactUsOnGDPRPage.ts
+++ b/tests/UI/campaigns/functional/FO/classic/03_userAccount/06_contactUsOnGDPRPage.ts
@@ -59,7 +59,7 @@ describe('FO - Account : Contact us on GDPR page', async () => {
     await homePage.goToFo(page);
 
     const isHomePage = await homePage.isHomePage(page);
-    await expect(isHomePage).to.be.true;
+    expect(isHomePage).to.eq(true);
   });
 
   it('should go to login page', async function () {
@@ -68,7 +68,7 @@ describe('FO - Account : Contact us on GDPR page', async () => {
     await homePage.goToLoginPage(page);
 
     const pageHeaderTitle = await loginPage.getPageTitle(page);
-    await expect(pageHeaderTitle).to.equal(loginPage.pageTitle);
+    expect(pageHeaderTitle).to.equal(loginPage.pageTitle);
   });
 
   it('should sign in FO', async function () {
@@ -77,7 +77,7 @@ describe('FO - Account : Contact us on GDPR page', async () => {
     await loginPage.customerLogin(page, Customers.johnDoe);
 
     const isCustomerConnected = await myAccountPage.isCustomerConnected(page);
-    await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+    expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
   });
 
   it('should go to my account page', async function () {
@@ -86,7 +86,7 @@ describe('FO - Account : Contact us on GDPR page', async () => {
     await homePage.goToMyAccountPage(page);
 
     const pageTitle = await myAccountPage.getPageTitle(page);
-    await expect(pageTitle).to.equal(myAccountPage.pageTitle);
+    expect(pageTitle).to.equal(myAccountPage.pageTitle);
   });
 
   it('should go to \'GDPR - Personal data\' page', async function () {
@@ -95,7 +95,7 @@ describe('FO - Account : Contact us on GDPR page', async () => {
     await myAccountPage.goToMyGDPRPersonalDataPage(page);
 
     const pageTitle = await gdprPersonalDataPage.getPageTitle(page);
-    await expect(pageTitle).to.equal(gdprPersonalDataPage.pageTitle);
+    expect(pageTitle).to.equal(gdprPersonalDataPage.pageTitle);
   });
 
   it('should click on \'Contact page\' link from Rectification & Erasure requests block', async function () {
@@ -104,7 +104,7 @@ describe('FO - Account : Contact us on GDPR page', async () => {
     await gdprPersonalDataPage.goToContactUsPage(page);
 
     const pageTitle = await contactUsPage.getPageTitle(page);
-    await expect(pageTitle).to.equal(contactUsPage.pageTitle);
+    expect(pageTitle).to.equal(contactUsPage.pageTitle);
   });
 
   it('should send message to customer service', async function () {
@@ -113,7 +113,7 @@ describe('FO - Account : Contact us on GDPR page', async () => {
     await contactUsPage.sendMessage(page, contactUsData, `${contactUsData.fileName}.txt`);
 
     const validationMessage = await contactUsPage.getAlertSuccess(page);
-    await expect(validationMessage).to.equal(contactUsPage.validationMessage);
+    expect(validationMessage).to.equal(contactUsPage.validationMessage);
   });
 
   it('should login in BO', async function () {
@@ -130,20 +130,20 @@ describe('FO - Account : Contact us on GDPR page', async () => {
     );
 
     const pageTitle = await customerServicePage.getPageTitle(page);
-    await expect(pageTitle).to.contains(customerServicePage.pageTitle);
+    expect(pageTitle).to.contains(customerServicePage.pageTitle);
   });
 
   it('should check message', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'checkMessage', baseContext);
 
     const message = await customerServicePage.getTextColumn(page, 1, 'message');
-    await expect(message).to.contain(contactUsData.message);
+    expect(message).to.contain(contactUsData.message);
   });
 
   it('should delete the message', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'deleteMessage', baseContext);
 
     const textResult = await customerServicePage.deleteMessage(page, 1);
-    await expect(textResult).to.contains(customerServicePage.successfulDeleteMessage);
+    expect(textResult).to.contains(customerServicePage.successfulDeleteMessage);
   });
 });
diff --git a/tests/UI/campaigns/functional/FO/classic/03_userAccount/07_logOut.ts b/tests/UI/campaigns/functional/FO/classic/03_userAccount/07_logOut.ts
index 39438e6fcd389..ba754fd5259d8 100644
--- a/tests/UI/campaigns/functional/FO/classic/03_userAccount/07_logOut.ts
+++ b/tests/UI/campaigns/functional/FO/classic/03_userAccount/07_logOut.ts
@@ -35,7 +35,7 @@ describe('FO - User Account : LogOut', async () => {
     await homePage.goTo(page, global.FO.URL);
 
     const result = await homePage.isHomePage(page);
-    await expect(result).to.be.true;
+    expect(result).to.eq(true);
   });
 
   it('should logIn', async function () {
@@ -45,10 +45,10 @@ describe('FO - User Account : LogOut', async () => {
     await loginPage.customerLogin(page, Customers.johnDoe);
 
     const isCustomerConnected = await loginPage.isCustomerConnected(page);
-    await expect(isCustomerConnected, 'Customer is not connected!').to.be.true;
+    expect(isCustomerConnected, 'Customer is not connected!').to.eq(true);
 
     const result = await homePage.isHomePage(page);
-    await expect(result).to.be.true;
+    expect(result).to.eq(true);
   });
 
   it('should go to my account page', async function () {
@@ -57,7 +57,7 @@ describe('FO - User Account : LogOut', async () => {
     await homePage.goToMyAccountPage(page);
 
     const pageTitle = await myAccountPage.getPageTitle(page);
-    await expect(pageTitle).to.equal(myAccountPage.pageTitle);
+    expect(pageTitle).to.equal(myAccountPage.pageTitle);
   });
 
   it('should logOut with link in the footer', async function () {
@@ -66,6 +66,6 @@ describe('FO - User Account : LogOut', async () => {
     await myAccountPage.logout(page);
 
     const isCustomerConnected = await myAccountPage.isCustomerConnected(page);
-    await expect(isCustomerConnected, 'Customer is connected!').to.be.false;
+    expect(isCustomerConnected, 'Customer is connected!').to.eq(false);
   });
 });
diff --git a/tests/UI/campaigns/functional/FO/classic/03_userAccount/merchandiseReturns/01_consultReturnDetails.ts b/tests/UI/campaigns/functional/FO/classic/03_userAccount/merchandiseReturns/01_consultReturnDetails.ts
index ab0200c459a42..a9f753b2e259c 100644
--- a/tests/UI/campaigns/functional/FO/classic/03_userAccount/merchandiseReturns/01_consultReturnDetails.ts
+++ b/tests/UI/campaigns/functional/FO/classic/03_userAccount/merchandiseReturns/01_consultReturnDetails.ts
@@ -98,7 +98,7 @@ describe('FO - Account : Consult return details', async () => {
         );
 
         const pageTitle = await ordersPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(ordersPage.pageTitle);
+        expect(pageTitle).to.contains(ordersPage.pageTitle);
       });
 
       it('should filter the Orders table by the default customer and check the result', async function () {
@@ -107,7 +107,7 @@ describe('FO - Account : Consult return details', async () => {
         await ordersPage.filterOrders(page, 'input', 'customer', Customers.johnDoe.lastName);
 
         const textColumn = await ordersPage.getTextColumn(page, 'customer', 1);
-        await expect(textColumn).to.contains(Customers.johnDoe.lastName);
+        expect(textColumn).to.contains(Customers.johnDoe.lastName);
       });
 
       it('should get the order ID', async function () {
@@ -121,7 +121,7 @@ describe('FO - Account : Consult return details', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'getOrderReference', baseContext);
 
         orderReference = await ordersPage.getTextColumn(page, 'reference', 1);
-        await expect(orderReference).to.not.be.null;
+        expect(orderReference).to.not.eq(null);
       });
 
       it('should get the created Order date', async function () {
@@ -129,7 +129,7 @@ describe('FO - Account : Consult return details', async () => {
 
         orderDate = await ordersPage.getTextColumn(page, 'date_add', 1);
         orderDate = orderDate.substring(0, 10);
-        await expect(orderDate).to.not.be.null;
+        expect(orderDate).to.not.eq(null);
       });
 
       it('should go to the first order page', async function () {
@@ -139,14 +139,14 @@ describe('FO - Account : Consult return details', async () => {
         await ordersPage.goToOrder(page, 1);
 
         const pageTitle = await viewOrderBasePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(viewOrderBasePage.pageTitle);
+        expect(pageTitle).to.contains(viewOrderBasePage.pageTitle);
       });
 
       it(`should change the order status to '${OrderStatuses.shipped.name}' and check it`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'updateOrderStatus', baseContext);
 
         const result = await viewOrderBasePage.modifyOrderStatus(page, OrderStatuses.shipped.name);
-        await expect(result).to.equal(OrderStatuses.shipped.name);
+        expect(result).to.equal(OrderStatuses.shipped.name);
       });
 
       it('should go to \'Orders > Orders\' page', async function () {
@@ -159,14 +159,14 @@ describe('FO - Account : Consult return details', async () => {
         );
 
         const pageTitle = await ordersPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(ordersPage.pageTitle);
+        expect(pageTitle).to.contains(ordersPage.pageTitle);
       });
 
       it('should reset all filters', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'resetAllFilters', baseContext);
 
         const numberOfOrders = await ordersPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfOrders).to.be.above(0);
+        expect(numberOfOrders).to.be.above(0);
       });
     });
 
@@ -180,7 +180,7 @@ describe('FO - Account : Consult return details', async () => {
         await homePage.changeLanguage(page, 'en');
 
         const isHomePage = await homePage.isHomePage(page);
-        await expect(isHomePage, 'Home page is not displayed').to.be.true;
+        expect(isHomePage, 'Home page is not displayed').to.eq(true);
       });
 
       it('should login', async function () {
@@ -190,7 +190,7 @@ describe('FO - Account : Consult return details', async () => {
         await loginPage.customerLogin(page, Customers.johnDoe);
 
         const isCustomerConnected = await loginPage.isCustomerConnected(page);
-        await expect(isCustomerConnected).to.be.true;
+        expect(isCustomerConnected).to.eq(true);
       });
 
       it('should go to my account page', async function () {
@@ -199,7 +199,7 @@ describe('FO - Account : Consult return details', async () => {
         await homePage.goToMyAccountPage(page);
 
         const pageTitle = await myAccountPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(myAccountPage.pageTitle);
+        expect(pageTitle).to.contains(myAccountPage.pageTitle);
       });
 
       it('should go to \'Order history and details\' page', async function () {
@@ -208,7 +208,7 @@ describe('FO - Account : Consult return details', async () => {
         await myAccountPage.goToHistoryAndDetailsPage(page);
 
         const pageTitle = await orderHistoryPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(orderHistoryPage.pageTitle);
+        expect(pageTitle).to.contains(orderHistoryPage.pageTitle);
       });
 
       it('should go to the first order in the list and check the existence of order return form', async function () {
@@ -217,7 +217,7 @@ describe('FO - Account : Consult return details', async () => {
         await orderHistoryPage.goToDetailsPage(page, 1);
 
         const result = await orderDetailsPage.isOrderReturnFormVisible(page);
-        await expect(result).to.be.true;
+        expect(result).to.eq(true);
       });
 
       it('should create a merchandise return', async function () {
@@ -226,7 +226,7 @@ describe('FO - Account : Consult return details', async () => {
         await orderDetailsPage.requestMerchandiseReturn(page, 'message test');
 
         const pageTitle = await foMerchandiseReturnsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(foMerchandiseReturnsPage.pageTitle);
+        expect(pageTitle).to.contains(foMerchandiseReturnsPage.pageTitle);
       });
     });
 
@@ -235,28 +235,28 @@ describe('FO - Account : Consult return details', async () => {
         await testContext.addContextItem(this, 'testIdentifier', 'checkOrderReturnReference', baseContext);
 
         const packageStatus = await foMerchandiseReturnsPage.getTextColumn(page, 'orderReference');
-        await expect(packageStatus).to.equal(orderReference);
+        expect(packageStatus).to.equal(orderReference);
       });
 
       it('should verify the Order return file name', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkOrderReturnFileName', baseContext);
 
         const packageStatus = await foMerchandiseReturnsPage.getTextColumn(page, 'fileName');
-        await expect(packageStatus).to.contains('#RE00');
+        expect(packageStatus).to.contains('#RE00');
       });
 
       it('should verify the order return status', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkOrderReturnStatus', baseContext);
 
         const packageStatus = await foMerchandiseReturnsPage.getTextColumn(page, 'status');
-        await expect(packageStatus).to.equal(OrderReturnStatuses.waitingForConfirmation.name);
+        expect(packageStatus).to.equal(OrderReturnStatuses.waitingForConfirmation.name);
       });
 
       it('should verify the order return date issued', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkOrderReturnDateIssued', baseContext);
 
         const packageStatus = await foMerchandiseReturnsPage.getTextColumn(page, 'dateIssued');
-        await expect(packageStatus).to.equal(orderDate);
+        expect(packageStatus).to.equal(orderDate);
       });
 
       it('should go to return details page', async function () {
@@ -265,21 +265,21 @@ describe('FO - Account : Consult return details', async () => {
         await foMerchandiseReturnsPage.goToReturnDetailsPage(page);
 
         const pageTitle = await returnDetailsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(returnDetailsPage.pageTitle);
+        expect(pageTitle).to.contains(returnDetailsPage.pageTitle);
       });
 
       it('should check the return notification', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkReturnNotification', baseContext);
 
         const orderReturnNotifications = await returnDetailsPage.getAlertWarning(page);
-        await expect(orderReturnNotifications).to.equal(returnDetailsPage.errorMessage);
+        expect(orderReturnNotifications).to.equal(returnDetailsPage.errorMessage);
       });
 
       it('should check the return details', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkReturnDetails', baseContext);
 
         const orderReturnInfo = await returnDetailsPage.getOrderReturnInfo(page);
-        await expect(orderReturnInfo)
+        expect(orderReturnInfo)
           .to.contains(`on ${orderDate} ${returnDetailsPage.orderReturnCardBlock}`)
           .and.to.contains(OrderReturnStatuses.waitingForConfirmation.name)
           .and.to.contains(`List of items to be returned: Product Quantity ${Products.demo_1.name} `
@@ -303,7 +303,7 @@ describe('FO - Account : Consult return details', async () => {
           await foMerchandiseReturnsPage.goTo(page, global.BO.URL);
 
           const pageTitle = await dashboardPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(dashboardPage.pageTitle);
+          expect(pageTitle).to.contains(dashboardPage.pageTitle);
         });
 
         it('should go to \'Customer Service > Merchandise Returns\' page', async function () {
@@ -316,7 +316,7 @@ describe('FO - Account : Consult return details', async () => {
           );
 
           const pageTitle = await boMerchandiseReturnsPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(boMerchandiseReturnsPage.pageTitle);
+          expect(pageTitle).to.contains(boMerchandiseReturnsPage.pageTitle);
         });
 
         it('should check the existence of the merchandise returns in the table', async function () {
@@ -325,7 +325,7 @@ describe('FO - Account : Consult return details', async () => {
           await boMerchandiseReturnsPage.filterMerchandiseReturnsTable(page, 'a!id_order', orderID.toString());
 
           const result = await boMerchandiseReturnsPage.getTextColumnFromMerchandiseReturnsTable(page, 'id_order');
-          await expect(result).to.contains(orderID);
+          expect(result).to.contains(orderID);
         });
 
         if (index === 0) {
@@ -336,7 +336,7 @@ describe('FO - Account : Consult return details', async () => {
               page,
               'id_order_return',
             );
-            await expect(parseInt(idReturn, 10)).to.be.above(0);
+            expect(parseInt(idReturn, 10)).to.be.above(0);
 
             if (parseInt(idReturn, 10) > 10) {
               fileName += idReturn;
@@ -350,14 +350,14 @@ describe('FO - Account : Consult return details', async () => {
           await boMerchandiseReturnsPage.goToMerchandiseReturnPage(page);
 
           const pageTitle = await editMerchandiseReturnsPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(editMerchandiseReturnsPage.pageTitle);
+          expect(pageTitle).to.contains(editMerchandiseReturnsPage.pageTitle);
         });
 
         it('should edit merchandise returns status', async function () {
           await testContext.addContextItem(this, 'testIdentifier', `editReturnStatus${index}`, baseContext);
 
           const textResult = await editMerchandiseReturnsPage.setStatus(page, test.args.status);
-          await expect(textResult).to.contains(editMerchandiseReturnsPage.successfulUpdateMessage);
+          expect(textResult).to.contains(editMerchandiseReturnsPage.successfulUpdateMessage);
         });
       });
 
@@ -371,7 +371,7 @@ describe('FO - Account : Consult return details', async () => {
           await homePage.changeLanguage(page, 'en');
 
           const isHomePage = await homePage.isHomePage(page);
-          await expect(isHomePage, 'Home page is not displayed').to.be.true;
+          expect(isHomePage, 'Home page is not displayed').to.eq(true);
         });
 
         it('should go to account page', async function () {
@@ -380,7 +380,7 @@ describe('FO - Account : Consult return details', async () => {
           await homePage.goToMyAccountPage(page);
 
           const pageTitle = await myAccountPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(myAccountPage.pageTitle);
+          expect(pageTitle).to.contains(myAccountPage.pageTitle);
         });
 
         it('should go to \'Merchandise Returns\' page', async function () {
@@ -389,14 +389,14 @@ describe('FO - Account : Consult return details', async () => {
           await myAccountPage.goToMerchandiseReturnsPage(page);
 
           const pageTitle = await foMerchandiseReturnsPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(foMerchandiseReturnsPage.pageTitle);
+          expect(pageTitle).to.contains(foMerchandiseReturnsPage.pageTitle);
         });
 
         it('should verify the order return status', async function () {
           await testContext.addContextItem(this, 'testIdentifier', `checkOrderReturnStatus${index}`, baseContext);
 
           const fileName = await foMerchandiseReturnsPage.getTextColumn(page, 'status');
-          await expect(fileName).to.be.equal(test.args.status);
+          expect(fileName).to.be.equal(test.args.status);
         });
 
         it('should go to return details page', async function () {
@@ -405,21 +405,21 @@ describe('FO - Account : Consult return details', async () => {
           await foMerchandiseReturnsPage.goToReturnDetailsPage(page);
 
           const pageTitle = await returnDetailsPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(returnDetailsPage.pageTitle);
+          expect(pageTitle).to.contains(returnDetailsPage.pageTitle);
         });
 
         it('should check that the alert warning is not visible', async function () {
           await testContext.addContextItem(this, 'testIdentifier', `checkReturnNotification${index}`, baseContext);
 
           const isVisible = await returnDetailsPage.isAlertWarningVisible(page);
-          await expect(isVisible).to.be.false;
+          expect(isVisible).to.eq(false);
         });
 
         it('should check the return details', async function () {
           await testContext.addContextItem(this, 'testIdentifier', `checkReturnDetails${index}`, baseContext);
 
           const orderReturnInfo = await returnDetailsPage.getOrderReturnInfo(page);
-          await expect(orderReturnInfo)
+          expect(orderReturnInfo)
             .to.contains(`${fileName} on ${orderDate} ${returnDetailsPage.orderReturnCardBlock}`)
             .and.to.contains(test.args.status)
             .and.to.contains(`List of items to be returned: Product Quantity ${Products.demo_1.name} `
diff --git a/tests/UI/campaigns/functional/FO/classic/03_userAccount/merchandiseReturns/02_checkOrderReturnPDF.ts b/tests/UI/campaigns/functional/FO/classic/03_userAccount/merchandiseReturns/02_checkOrderReturnPDF.ts
index 187d5b50ac233..1c60ed3538568 100644
--- a/tests/UI/campaigns/functional/FO/classic/03_userAccount/merchandiseReturns/02_checkOrderReturnPDF.ts
+++ b/tests/UI/campaigns/functional/FO/classic/03_userAccount/merchandiseReturns/02_checkOrderReturnPDF.ts
@@ -103,7 +103,7 @@ describe('FO - Account : Check order return PDF', async () => {
       );
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should filter the Orders table by the default customer and check the result', async function () {
@@ -112,7 +112,7 @@ describe('FO - Account : Check order return PDF', async () => {
       await ordersPage.filterOrders(page, 'input', 'customer', Customers.johnDoe.lastName);
 
       const textColumn = await ordersPage.getTextColumn(page, 'customer', 1);
-      await expect(textColumn).to.contains(Customers.johnDoe.lastName);
+      expect(textColumn).to.contains(Customers.johnDoe.lastName);
     });
 
     it('should get the order ID', async function () {
@@ -126,7 +126,7 @@ describe('FO - Account : Check order return PDF', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'getOrderReference', baseContext);
 
       orderReference = await ordersPage.getTextColumn(page, 'reference', 1);
-      await expect(orderReference).to.not.be.null;
+      expect(orderReference).to.not.eq(null);
     });
 
     it('should get the created Order date', async function () {
@@ -134,7 +134,7 @@ describe('FO - Account : Check order return PDF', async () => {
 
       orderDate = await ordersPage.getTextColumn(page, 'date_add', 1);
       orderDate = orderDate.substring(0, 10);
-      await expect(orderDate).to.not.be.null;
+      expect(orderDate).to.not.eq(null);
     });
 
     it('should go to the first order page', async function () {
@@ -144,14 +144,14 @@ describe('FO - Account : Check order return PDF', async () => {
       await ordersPage.goToOrder(page, 1);
 
       const pageTitle = await viewOrderBasePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(viewOrderBasePage.pageTitle);
+      expect(pageTitle).to.contains(viewOrderBasePage.pageTitle);
     });
 
     it(`should change the order status to '${OrderStatuses.shipped.name}' and check it`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'updateOrderStatus', baseContext);
 
       const result = await viewOrderBasePage.modifyOrderStatus(page, OrderStatuses.shipped.name);
-      await expect(result).to.equal(OrderStatuses.shipped.name);
+      expect(result).to.equal(OrderStatuses.shipped.name);
     });
 
     it('should go to \'Orders > Orders\' page', async function () {
@@ -164,14 +164,14 @@ describe('FO - Account : Check order return PDF', async () => {
       );
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAllFilters', baseContext);
 
       const numberOfOrders = await ordersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfOrders).to.be.above(0);
+      expect(numberOfOrders).to.be.above(0);
     });
   });
 
@@ -185,7 +185,7 @@ describe('FO - Account : Check order return PDF', async () => {
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Home page is not displayed').to.be.true;
+      expect(isHomePage, 'Home page is not displayed').to.eq(true);
     });
 
     it('should login', async function () {
@@ -195,7 +195,7 @@ describe('FO - Account : Check order return PDF', async () => {
       await loginPage.customerLogin(page, Customers.johnDoe);
 
       const isCustomerConnected = await loginPage.isCustomerConnected(page);
-      await expect(isCustomerConnected).to.be.true;
+      expect(isCustomerConnected).to.eq(true);
     });
 
     it('should go to my account page', async function () {
@@ -204,7 +204,7 @@ describe('FO - Account : Check order return PDF', async () => {
       await homePage.goToMyAccountPage(page);
 
       const pageTitle = await myAccountPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(myAccountPage.pageTitle);
+      expect(pageTitle).to.contains(myAccountPage.pageTitle);
     });
 
     it('should go to \'Order history and details\' page', async function () {
@@ -213,7 +213,7 @@ describe('FO - Account : Check order return PDF', async () => {
       await myAccountPage.goToHistoryAndDetailsPage(page);
 
       const pageTitle = await orderHistoryPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderHistoryPage.pageTitle);
+      expect(pageTitle).to.contains(orderHistoryPage.pageTitle);
     });
 
     it('should go to the first order in the list and check the existence of order return form', async function () {
@@ -222,7 +222,7 @@ describe('FO - Account : Check order return PDF', async () => {
       await orderHistoryPage.goToDetailsPage(page, 1);
 
       const result = await orderDetailsPage.isOrderReturnFormVisible(page);
-      await expect(result).to.be.true;
+      expect(result).to.eq(true);
     });
 
     it('should create a merchandise return', async function () {
@@ -231,7 +231,7 @@ describe('FO - Account : Check order return PDF', async () => {
       await orderDetailsPage.requestMerchandiseReturn(page, 'message test');
 
       const pageTitle = await foMerchandiseReturnsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(foMerchandiseReturnsPage.pageTitle);
+      expect(pageTitle).to.contains(foMerchandiseReturnsPage.pageTitle);
     });
   });
 
@@ -240,28 +240,28 @@ describe('FO - Account : Check order return PDF', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'checkOrderReturnReference', baseContext);
 
       const packageStatus = await foMerchandiseReturnsPage.getTextColumn(page, 'orderReference');
-      await expect(packageStatus).to.equal(orderReference);
+      expect(packageStatus).to.equal(orderReference);
     });
 
     it('should verify the Order return file name', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkOrderReturnFileName', baseContext);
 
       const packageStatus = await foMerchandiseReturnsPage.getTextColumn(page, 'fileName');
-      await expect(packageStatus).to.contains('#RE00');
+      expect(packageStatus).to.contains('#RE00');
     });
 
     it('should verify the order return status', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkOrderReturnStatus1', baseContext);
 
       const packageStatus = await foMerchandiseReturnsPage.getTextColumn(page, 'status');
-      await expect(packageStatus).to.equal(OrderReturnStatuses.waitingForConfirmation.name);
+      expect(packageStatus).to.equal(OrderReturnStatuses.waitingForConfirmation.name);
     });
 
     it('should verify the order return date issued', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkOrderReturnDateIssued', baseContext);
 
       const packageStatus = await foMerchandiseReturnsPage.getTextColumn(page, 'dateIssued');
-      await expect(packageStatus).to.equal(orderDate);
+      expect(packageStatus).to.equal(orderDate);
     });
 
     it('should go to return details page', async function () {
@@ -270,21 +270,21 @@ describe('FO - Account : Check order return PDF', async () => {
       await foMerchandiseReturnsPage.goToReturnDetailsPage(page);
 
       const pageTitle = await returnDetailsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(returnDetailsPage.pageTitle);
+      expect(pageTitle).to.contains(returnDetailsPage.pageTitle);
     });
 
     it('should check the return notification', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkReturnNotification', baseContext);
 
       const orderReturnNotifications = await returnDetailsPage.getAlertWarning(page);
-      await expect(orderReturnNotifications).to.equal(returnDetailsPage.errorMessage);
+      expect(orderReturnNotifications).to.equal(returnDetailsPage.errorMessage);
     });
 
     it('should check the return details', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkReturnDetails', baseContext);
 
       const orderReturnInfo = await returnDetailsPage.getOrderReturnInfo(page);
-      await expect(orderReturnInfo)
+      expect(orderReturnInfo)
         .to.contains(`on ${orderDate} ${returnDetailsPage.orderReturnCardBlock}`)
         .and.to.contains(OrderReturnStatuses.waitingForConfirmation.name)
         .and.to.contains(`List of items to be returned: Product Quantity ${Products.demo_1.name} `
@@ -300,7 +300,7 @@ describe('FO - Account : Check order return PDF', async () => {
         await foMerchandiseReturnsPage.goTo(page, global.BO.URL);
 
         const pageTitle = await dashboardPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(dashboardPage.pageTitle);
+        expect(pageTitle).to.contains(dashboardPage.pageTitle);
       });
 
       it('should go to \'Customer Service > Merchandise Returns\' page', async function () {
@@ -313,7 +313,7 @@ describe('FO - Account : Check order return PDF', async () => {
         );
 
         const pageTitle = await boMerchandiseReturnsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(boMerchandiseReturnsPage.pageTitle);
+        expect(pageTitle).to.contains(boMerchandiseReturnsPage.pageTitle);
       });
 
       it('should check the existence of the merchandise returns in the table', async function () {
@@ -322,7 +322,7 @@ describe('FO - Account : Check order return PDF', async () => {
         await boMerchandiseReturnsPage.filterMerchandiseReturnsTable(page, 'a!id_order', orderID.toString());
 
         const result = await boMerchandiseReturnsPage.getTextColumnFromMerchandiseReturnsTable(page, 'id_order');
-        await expect(result).to.contains(orderID);
+        expect(result).to.contains(orderID);
       });
 
       it('should get the return ID', async function () {
@@ -332,7 +332,7 @@ describe('FO - Account : Check order return PDF', async () => {
           page,
           'id_order_return',
         );
-        await expect(parseInt(idReturn, 10)).to.be.above(0);
+        expect(parseInt(idReturn, 10)).to.be.above(0);
 
         if (parseInt(idReturn, 10) >= 10) {
           fileName += idReturn;
@@ -345,14 +345,14 @@ describe('FO - Account : Check order return PDF', async () => {
         await boMerchandiseReturnsPage.goToMerchandiseReturnPage(page);
 
         const pageTitle = await editMerchandiseReturnsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(editMerchandiseReturnsPage.pageTitle);
+        expect(pageTitle).to.contains(editMerchandiseReturnsPage.pageTitle);
       });
 
       it('should edit merchandise returns status', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'editReturnStatus', baseContext);
 
         const textResult = await editMerchandiseReturnsPage.setStatus(page, OrderReturnStatuses.waitingForPackage.name);
-        await expect(textResult).to.contains(editMerchandiseReturnsPage.successfulUpdateMessage);
+        expect(textResult).to.contains(editMerchandiseReturnsPage.successfulUpdateMessage);
       });
     });
 
@@ -366,7 +366,7 @@ describe('FO - Account : Check order return PDF', async () => {
         await homePage.changeLanguage(page, 'en');
 
         const isHomePage = await homePage.isHomePage(page);
-        await expect(isHomePage, 'Home page is not displayed').to.be.true;
+        expect(isHomePage, 'Home page is not displayed').to.eq(true);
       });
 
       it('should go to account page', async function () {
@@ -375,7 +375,7 @@ describe('FO - Account : Check order return PDF', async () => {
         await homePage.goToMyAccountPage(page);
 
         const pageTitle = await myAccountPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(myAccountPage.pageTitle);
+        expect(pageTitle).to.contains(myAccountPage.pageTitle);
       });
 
       it('should go to \'Merchandise Returns\' page', async function () {
@@ -384,14 +384,14 @@ describe('FO - Account : Check order return PDF', async () => {
         await myAccountPage.goToMerchandiseReturnsPage(page);
 
         const pageTitle = await foMerchandiseReturnsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(foMerchandiseReturnsPage.pageTitle);
+        expect(pageTitle).to.contains(foMerchandiseReturnsPage.pageTitle);
       });
 
       it('should verify the order return status', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkOrderReturnStatus2', baseContext);
 
         const fileName = await foMerchandiseReturnsPage.getTextColumn(page, 'status');
-        await expect(fileName).to.be.equal(OrderReturnStatuses.waitingForPackage.name);
+        expect(fileName).to.be.equal(OrderReturnStatuses.waitingForPackage.name);
       });
 
       it('should download the return form', async function () {
@@ -400,14 +400,14 @@ describe('FO - Account : Check order return PDF', async () => {
         filePath = await foMerchandiseReturnsPage.downloadReturnForm(page, 1);
 
         const found = await files.doesFileExist(filePath);
-        await expect(found, 'PDF file was not downloaded').to.be.true;
+        expect(found, 'PDF file was not downloaded').to.eq(true);
       });
 
       it('should check the PDF Header ', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkReturnFileName', baseContext);
 
         const isVisible = await files.isTextInPDF(filePath, `ORDER RETURN,,${today},,${fileName},,`);
-        await expect(isVisible, 'The order return file name is not correct!').to.be.true;
+        expect(isVisible, 'The order return file name is not correct!').to.eq(true);
       });
 
       it('should check the Billing & delivery address', async function () {
@@ -418,7 +418,7 @@ describe('FO - Account : Check order return PDF', async () => {
           + `${Addresses.second.secondAddress},${Addresses.second.postalCode} ${Addresses.second.city}`
           + `,${Addresses.second.country},${Addresses.second.phone},,`);
 
-        await expect(isVisible, 'Billing and delivery address are not correct!').to.be.true;
+        expect(isVisible, 'Billing and delivery address are not correct!').to.eq(true);
       });
 
       it('should check the number of returned days', async function () {
@@ -426,7 +426,7 @@ describe('FO - Account : Check order return PDF', async () => {
 
         const isVisible = await files.isTextInPDF(filePath, 'We have logged your return request.,Your package must '
           + 'be returned to us within 14 days of receiving your order.');
-        await expect(isVisible, 'returned days number is not correct!').to.be.true;
+        expect(isVisible, 'returned days number is not correct!').to.eq(true);
       });
 
       it('should check the returned product', async function () {
@@ -435,7 +435,7 @@ describe('FO - Account : Check order return PDF', async () => {
         const isVisible = await files.isTextInPDF(filePath, 'Items to be returned, ,Reference, ,Qty,,'
           + `${Products.demo_1.name} (Size: S - Color: White), ,${Products.demo_1.reference}, ,1`);
 
-        await expect(isVisible, 'returned product list is not correct!').to.be.true;
+        expect(isVisible, 'returned product list is not correct!').to.eq(true);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/FO/classic/04_newsletter/01_subscribeNewsletter.ts b/tests/UI/campaigns/functional/FO/classic/04_newsletter/01_subscribeNewsletter.ts
index b85f5eec83703..fd74922bf9c63 100644
--- a/tests/UI/campaigns/functional/FO/classic/04_newsletter/01_subscribeNewsletter.ts
+++ b/tests/UI/campaigns/functional/FO/classic/04_newsletter/01_subscribeNewsletter.ts
@@ -62,14 +62,14 @@ describe('FO - Newsletter : Subscribe to Newsletter', async () => {
       await foHomePage.goTo(page, global.FO.URL);
 
       const result = await foHomePage.isHomePage(page);
-      await expect(result).to.be.true;
+      expect(result).to.eq(true);
     });
 
     it('should subscribe to newsletter with already used email', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'subscribeWithAlreadyUsedEmail', baseContext);
 
       const newsletterSubscribeAlertMessage = await foHomePage.subscribeToNewsletter(page, Customers.johnDoe.email);
-      await expect(newsletterSubscribeAlertMessage).to.contains(foHomePage.alreadyUsedEmailMessage);
+      expect(newsletterSubscribeAlertMessage).to.contains(foHomePage.alreadyUsedEmailMessage);
     });
   });
 
@@ -80,7 +80,7 @@ describe('FO - Newsletter : Subscribe to Newsletter', async () => {
       await foHomePage.goToLoginPage(page);
 
       const pageHeaderTitle = await foLoginPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(foLoginPage.pageTitle);
+      expect(pageHeaderTitle).to.equal(foLoginPage.pageTitle);
     });
 
     it('Should sign in FO', async function () {
@@ -89,7 +89,7 @@ describe('FO - Newsletter : Subscribe to Newsletter', async () => {
       await foLoginPage.customerLogin(page, Customers.johnDoe);
 
       const isCustomerConnected = await myAccountPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
 
     it('should go account information page', async function () {
@@ -99,14 +99,14 @@ describe('FO - Newsletter : Subscribe to Newsletter', async () => {
       await myAccountPage.goToInformationPage(page);
 
       const pageTitle = await accountIdentityPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(accountIdentityPage.pageTitle);
+      expect(pageTitle).to.equal(accountIdentityPage.pageTitle);
     });
 
     it('should unsubscribe from newsletter', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'unsubscribeFromNewsLetter', baseContext);
 
       const unsubscribeAlertText = await accountIdentityPage.unsubscribeNewsletter(page, Customers.johnDoe.password);
-      await expect(unsubscribeAlertText).to.contains(accountIdentityPage.successfulUpdateMessage);
+      expect(unsubscribeAlertText).to.contains(accountIdentityPage.successfulUpdateMessage);
     });
   });
 
@@ -126,14 +126,14 @@ describe('FO - Newsletter : Subscribe to Newsletter', async () => {
       await moduleManagerPage.closeSfToolBar(page);
 
       const pageTitle = await moduleManagerPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
+      expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
     });
 
     it(`should search for module ${moduleInformation.name}`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'searchForModule', baseContext);
 
       const isModuleVisible = await moduleManagerPage.searchModule(page, moduleInformation);
-      await expect(isModuleVisible).to.be.true;
+      expect(isModuleVisible).to.eq(true);
     });
 
     it('should go to newsletter subscription module configuration page', async function () {
@@ -143,14 +143,14 @@ describe('FO - Newsletter : Subscribe to Newsletter', async () => {
       await moduleManagerPage.goToConfigurationPage(page, moduleInformation.tag);
 
       const moduleConfigurationPageSubtitle = await moduleConfigurationPage.getPageSubtitle(page);
-      await expect(moduleConfigurationPageSubtitle).to.contains(moduleInformation.name);
+      expect(moduleConfigurationPageSubtitle).to.contains(moduleInformation.name);
     });
 
     it('should check if user is unsubscribed from newsletter', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkThatEmailIsNotInTable', baseContext);
 
       const subscribedUserList = await psEmailSubscriptionPage.getListOfNewsletterRegistrationEmails(page);
-      await expect(subscribedUserList).to.not.contains(Customers.johnDoe.email);
+      expect(subscribedUserList).to.not.contains(Customers.johnDoe.email);
     });
 
     it('should logout from BO', async function () {
@@ -165,14 +165,14 @@ describe('FO - Newsletter : Subscribe to Newsletter', async () => {
       await foHomePage.goTo(page, global.FO.URL);
 
       const result = await foHomePage.isHomePage(page);
-      await expect(result).to.be.true;
+      expect(result).to.eq(true);
     });
 
     it('should subscribe to newsletter', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'subscribeToNewsletter', baseContext);
 
       const newsletterSubscribeAlertMessage = await foHomePage.subscribeToNewsletter(page, Customers.johnDoe.email);
-      await expect(newsletterSubscribeAlertMessage).to.contains(foHomePage.successSubscriptionMessage);
+      expect(newsletterSubscribeAlertMessage).to.contains(foHomePage.successSubscriptionMessage);
     });
   });
 
@@ -192,7 +192,7 @@ describe('FO - Newsletter : Subscribe to Newsletter', async () => {
       await moduleManagerPage.closeSfToolBar(page);
 
       const pageTitle = await moduleManagerPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
+      expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
     });
 
     it('should go to newsletter subscription module configuration page', async function () {
@@ -202,14 +202,14 @@ describe('FO - Newsletter : Subscribe to Newsletter', async () => {
       await moduleManagerPage.goToConfigurationPage(page, moduleInformation.tag);
 
       const moduleConfigurationPageSubtitle = await moduleConfigurationPage.getPageSubtitle(page);
-      await expect(moduleConfigurationPageSubtitle).to.contains(moduleInformation.name);
+      expect(moduleConfigurationPageSubtitle).to.contains(moduleInformation.name);
     });
 
     it('should check if previous customer subscription is visible in table', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkIfSubscriptionIsInTable', baseContext);
 
       const subscribedUserList = await psEmailSubscriptionPage.getListOfNewsletterRegistrationEmails(page);
-      await expect(subscribedUserList).to.contains(Customers.johnDoe.email);
+      expect(subscribedUserList).to.contains(Customers.johnDoe.email);
     });
 
     it('should logout from BO', async function () {
diff --git a/tests/UI/campaigns/functional/FO/classic/05_contactUs/01_checkMailtoLink.ts b/tests/UI/campaigns/functional/FO/classic/05_contactUs/01_checkMailtoLink.ts
index e85f381eb9f88..fe58a7d9b5bd8 100644
--- a/tests/UI/campaigns/functional/FO/classic/05_contactUs/01_checkMailtoLink.ts
+++ b/tests/UI/campaigns/functional/FO/classic/05_contactUs/01_checkMailtoLink.ts
@@ -39,7 +39,7 @@ describe('FO - Contact us : Check mail link on contact us page', async () => {
     await homePage.goToFo(page);
 
     const isHomePage = await homePage.isHomePage(page);
-    await expect(isHomePage).to.be.true;
+    expect(isHomePage).to.eq(true);
   });
 
   it('should go to \'Contact us\' page', async function () {
@@ -48,13 +48,13 @@ describe('FO - Contact us : Check mail link on contact us page', async () => {
     await homePage.clickOnHeaderLink(page, 'Contact us');
 
     const pageTitle = await contactUsPage.getPageTitle(page);
-    await expect(pageTitle, 'Fail to open FO login page').to.contains(contactUsPage.pageTitle);
+    expect(pageTitle, 'Fail to open FO login page').to.contains(contactUsPage.pageTitle);
   });
 
   it('should check email us link', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'checkEmailUsLink', baseContext);
 
     const emailUsLinkHref = await contactUsPage.getEmailUsLink(page);
-    await expect(emailUsLinkHref).to.equal(`mailto:${Employees.DefaultEmployee.email}`);
+    expect(emailUsLinkHref).to.equal(`mailto:${Employees.DefaultEmployee.email}`);
   });
 });
diff --git a/tests/UI/campaigns/functional/FO/classic/05_contactUs/02_sendMessageWithCustomer.ts b/tests/UI/campaigns/functional/FO/classic/05_contactUs/02_sendMessageWithCustomer.ts
index 367b61d34f7d3..8e9b2ceae86d7 100644
--- a/tests/UI/campaigns/functional/FO/classic/05_contactUs/02_sendMessageWithCustomer.ts
+++ b/tests/UI/campaigns/functional/FO/classic/05_contactUs/02_sendMessageWithCustomer.ts
@@ -63,7 +63,7 @@ describe('FO - Contact us : Send message from contact us page with customer logg
     await foHomePage.goTo(page, global.FO.URL);
 
     const isHomePage = await foHomePage.isHomePage(page);
-    await expect(isHomePage).to.be.true;
+    expect(isHomePage).to.eq(true);
   });
 
   it('should go to login page', async function () {
@@ -72,7 +72,7 @@ describe('FO - Contact us : Send message from contact us page with customer logg
     await foHomePage.goToLoginPage(page);
 
     const pageTitle = await foLoginPage.getPageTitle(page);
-    await expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
+    expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
   });
 
   it('should sign in with default customer', async function () {
@@ -81,7 +81,7 @@ describe('FO - Contact us : Send message from contact us page with customer logg
     await foLoginPage.customerLogin(page, Customers.johnDoe);
 
     const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
-    await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+    expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
   });
 
   it('should go on contact us page', async function () {
@@ -91,7 +91,7 @@ describe('FO - Contact us : Send message from contact us page with customer logg
     await foLoginPage.goToFooterLink(page, 'Contact us');
 
     const pageTitle = await contactUsPage.getPageTitle(page);
-    await expect(pageTitle).to.equal(contactUsPage.pageTitle);
+    expect(pageTitle).to.equal(contactUsPage.pageTitle);
   });
 
   it('should send message to customer service', async function () {
@@ -100,7 +100,7 @@ describe('FO - Contact us : Send message from contact us page with customer logg
     await contactUsPage.sendMessage(page, contactUsData, `${contactUsData.fileName}.txt`);
 
     const validationMessage = await contactUsPage.getAlertSuccess(page);
-    await expect(validationMessage).to.equal(contactUsPage.validationMessage);
+    expect(validationMessage).to.equal(contactUsPage.validationMessage);
   });
 
   it('should login in BO', async function () {
@@ -117,41 +117,41 @@ describe('FO - Contact us : Send message from contact us page with customer logg
     );
 
     const pageTitle = await customerServicePage.getPageTitle(page);
-    await expect(pageTitle).to.contains(customerServicePage.pageTitle);
+    expect(pageTitle).to.contains(customerServicePage.pageTitle);
   });
 
   it('should check customer name', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'checkCustomerName', baseContext);
 
     const email = await customerServicePage.getTextColumn(page, 1, 'customer');
-    await expect(email).to.contain(`${contactUsData.firstName} ${contactUsData.lastName}`);
+    expect(email).to.contain(`${contactUsData.firstName} ${contactUsData.lastName}`);
   });
 
   it('should check customer email', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'checkCustomerEmail', baseContext);
 
     const email = await customerServicePage.getTextColumn(page, 1, 'a!email');
-    await expect(email).to.contain(contactUsData.emailAddress);
+    expect(email).to.contain(contactUsData.emailAddress);
   });
 
   it('should check message type', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'checkMessageType', baseContext);
 
     const subject = await customerServicePage.getTextColumn(page, 1, 'cl!id_contact');
-    await expect(subject).to.contain(contactUsData.subject);
+    expect(subject).to.contain(contactUsData.subject);
   });
 
   it('should check message', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'checkMessage', baseContext);
 
     const message = await customerServicePage.getTextColumn(page, 1, 'message');
-    await expect(message).to.contain(contactUsData.message);
+    expect(message).to.contain(contactUsData.message);
   });
 
   it('should delete the message', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'deleteMessage', baseContext);
 
     const textResult = await customerServicePage.deleteMessage(page, 1);
-    await expect(textResult).to.contains(customerServicePage.successfulDeleteMessage);
+    expect(textResult).to.contains(customerServicePage.successfulDeleteMessage);
   });
 });
diff --git a/tests/UI/campaigns/functional/FO/classic/05_contactUs/03_sendMessageAsAnonymous.ts b/tests/UI/campaigns/functional/FO/classic/05_contactUs/03_sendMessageAsAnonymous.ts
index dba70070cb02b..adc6cde14239c 100644
--- a/tests/UI/campaigns/functional/FO/classic/05_contactUs/03_sendMessageAsAnonymous.ts
+++ b/tests/UI/campaigns/functional/FO/classic/05_contactUs/03_sendMessageAsAnonymous.ts
@@ -83,14 +83,14 @@ describe('FO - Contact us : Send message from contact us page with customer not
       await foHomePage.goTo(page, global.FO.URL);
 
       const isHomePage = await foHomePage.isHomePage(page);
-      await expect(isHomePage).to.be.true;
+      expect(isHomePage).to.eq(true);
     });
 
     it('should check if that any account is connected', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkIfCustomerNotConnected', baseContext);
 
       const isCustomerConnected = await foHomePage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is connected!').to.be.false;
+      expect(isCustomerConnected, 'Customer is connected!').to.eq(false);
     });
 
     it('should go on contact us page', async function () {
@@ -100,7 +100,7 @@ describe('FO - Contact us : Send message from contact us page with customer not
       await foLoginPage.goToFooterLink(page, 'Contact us');
 
       const pageTitle = await contactUsPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(contactUsPage.pageTitle);
+      expect(pageTitle).to.equal(contactUsPage.pageTitle);
     });
 
     it('should check if the email is empty', async function () {
@@ -109,7 +109,7 @@ describe('FO - Contact us : Send message from contact us page with customer not
       await contactUsPage.sendMessage(page, contactUsEmptyEmail);
 
       const invalidEmailError = await contactUsPage.getAlertError(page);
-      await expect(invalidEmailError).to.contains(contactUsPage.invalidEmail);
+      expect(invalidEmailError).to.contains(contactUsPage.invalidEmail);
     });
 
     it('should check if the email is invalid', async function () {
@@ -118,7 +118,7 @@ describe('FO - Contact us : Send message from contact us page with customer not
       await contactUsPage.sendMessage(page, contactUsInvalidEmail);
 
       const invalidEmailError = await contactUsPage.getAlertError(page);
-      await expect(invalidEmailError).to.contains(contactUsPage.invalidEmail);
+      expect(invalidEmailError).to.contains(contactUsPage.invalidEmail);
     });
 
     it('should check if the content is empty', async function () {
@@ -127,7 +127,7 @@ describe('FO - Contact us : Send message from contact us page with customer not
       await contactUsPage.sendMessage(page, contactUsEmptyContent);
 
       const invalidEmailError = await contactUsPage.getAlertError(page);
-      await expect(invalidEmailError).to.contains(contactUsPage.invalidContent);
+      expect(invalidEmailError).to.contains(contactUsPage.invalidContent);
     });
 
     it('should send message to customer service', async function () {
@@ -136,7 +136,7 @@ describe('FO - Contact us : Send message from contact us page with customer not
       await contactUsPage.sendMessage(page, contactUsData, `${contactUsData.fileName}.txt`);
 
       const validationMessage = await contactUsPage.getAlertSuccess(page);
-      await expect(validationMessage).to.equal(contactUsPage.validationMessage);
+      expect(validationMessage).to.equal(contactUsPage.validationMessage);
     });
   });
 
@@ -155,42 +155,42 @@ describe('FO - Contact us : Send message from contact us page with customer not
       );
 
       const pageTitle = await customerServicePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customerServicePage.pageTitle);
+      expect(pageTitle).to.contains(customerServicePage.pageTitle);
     });
 
     it('should check customer name', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkCustomerName', baseContext);
 
       const email = await customerServicePage.getTextColumn(page, 1, 'customer');
-      await expect(email).to.contain(`${contactUsData.firstName} ${contactUsData.lastName}`);
+      expect(email).to.contain(`${contactUsData.firstName} ${contactUsData.lastName}`);
     });
 
     it('should check customer email', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkCustomerEmail', baseContext);
 
       const email = await customerServicePage.getTextColumn(page, 1, 'a!email');
-      await expect(email).to.contain(contactUsData.emailAddress);
+      expect(email).to.contain(contactUsData.emailAddress);
     });
 
     it('should check message type', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkMessageType', baseContext);
 
       const subject = await customerServicePage.getTextColumn(page, 1, 'cl!id_contact');
-      await expect(subject).to.contain(contactUsData.subject);
+      expect(subject).to.contain(contactUsData.subject);
     });
 
     it('should check message', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkMessage', baseContext);
 
       const message = await customerServicePage.getTextColumn(page, 1, 'message');
-      await expect(message).to.contain(contactUsData.message);
+      expect(message).to.contain(contactUsData.message);
     });
 
     it('should delete the message', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteMessage', baseContext);
 
       const textResult = await customerServicePage.deleteMessage(page, 1);
-      await expect(textResult).to.contains(customerServicePage.successfulDeleteMessage);
+      expect(textResult).to.contains(customerServicePage.successfulDeleteMessage);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/FO/classic/05_contactUs/04_addAttachment.ts b/tests/UI/campaigns/functional/FO/classic/05_contactUs/04_addAttachment.ts
index f6c841ebcd532..e7007a34b55ef 100644
--- a/tests/UI/campaigns/functional/FO/classic/05_contactUs/04_addAttachment.ts
+++ b/tests/UI/campaigns/functional/FO/classic/05_contactUs/04_addAttachment.ts
@@ -69,7 +69,7 @@ describe('FO - Contact us : Add attachment', async () => {
     await foHomePage.goTo(page, global.FO.URL);
 
     const isHomePage = await foHomePage.isHomePage(page);
-    await expect(isHomePage).to.be.true;
+    expect(isHomePage).to.eq(true);
   });
 
   it('should go to login page', async function () {
@@ -78,7 +78,7 @@ describe('FO - Contact us : Add attachment', async () => {
     await foHomePage.goToLoginPage(page);
 
     const pageTitle = await foLoginPage.getPageTitle(page);
-    await expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
+    expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
   });
 
   it('should sign in with default customer', async function () {
@@ -87,7 +87,7 @@ describe('FO - Contact us : Add attachment', async () => {
     await foLoginPage.customerLogin(page, Customers.johnDoe);
 
     const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
-    await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+    expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
   });
 
   it('should go to contact us page', async function () {
@@ -97,7 +97,7 @@ describe('FO - Contact us : Add attachment', async () => {
     await foLoginPage.goToFooterLink(page, 'Contact us');
 
     const pageTitle = await contactUsPage.getPageTitle(page);
-    await expect(pageTitle).to.equal(contactUsPage.pageTitle);
+    expect(pageTitle).to.equal(contactUsPage.pageTitle);
   });
 
   it('should try to send message with csv file to customer service and check error message', async function () {
@@ -106,7 +106,7 @@ describe('FO - Contact us : Add attachment', async () => {
     await contactUsPage.sendMessage(page, contactUsData, `${contactUsData.fileName}.csv`);
 
     const validationMessage = await contactUsPage.getAlertError(page);
-    await expect(validationMessage).to.equal(contactUsPage.badFileExtensionErrorMessage);
+    expect(validationMessage).to.equal(contactUsPage.badFileExtensionErrorMessage);
   });
 
   it('should send message with PNG file to customer service and check validation message', async function () {
@@ -115,7 +115,7 @@ describe('FO - Contact us : Add attachment', async () => {
     await contactUsPage.sendMessage(page, contactUsData, `${contactUsData.fileName}.png`);
 
     const validationMessage = await contactUsPage.getAlertSuccess(page);
-    await expect(validationMessage).to.equal(contactUsPage.validationMessage);
+    expect(validationMessage).to.equal(contactUsPage.validationMessage);
   });
 
   it('should login in BO', async function () {
@@ -132,28 +132,28 @@ describe('FO - Contact us : Add attachment', async () => {
     );
 
     const pageTitle = await customerServicePage.getPageTitle(page);
-    await expect(pageTitle).to.contains(customerServicePage.pageTitle);
+    expect(pageTitle).to.contains(customerServicePage.pageTitle);
   });
 
   it('should check customer name', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'checkCustomerName', baseContext);
 
     const email = await customerServicePage.getTextColumn(page, 1, 'customer');
-    await expect(email).to.contain(`${contactUsData.firstName} ${contactUsData.lastName}`);
+    expect(email).to.contain(`${contactUsData.firstName} ${contactUsData.lastName}`);
   });
 
   it('should check customer email', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'checkCustomerEmail', baseContext);
 
     const email = await customerServicePage.getTextColumn(page, 1, 'a!email');
-    await expect(email).to.contain(contactUsData.emailAddress);
+    expect(email).to.contain(contactUsData.emailAddress);
   });
 
   it('should get the customer service id and the date', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'getMessageID', baseContext);
 
     idCustomer = await customerServicePage.getTextColumn(page, 1, 'id_customer_thread');
-    await expect(parseInt(idCustomer, 10)).to.be.at.least(0);
+    expect(parseInt(idCustomer, 10)).to.be.at.least(0);
 
     messageDateTime = await customerServicePage.getTextColumn(page, 1, 'date');
   });
@@ -164,7 +164,7 @@ describe('FO - Contact us : Add attachment', async () => {
     await customerServicePage.goToViewMessagePage(page);
 
     const pageTitle = await viewPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(viewPage.pageTitle);
+    expect(pageTitle).to.contains(viewPage.pageTitle);
   });
 
   it('should check the thread form', async function () {
@@ -183,7 +183,7 @@ describe('FO - Contact us : Add attachment', async () => {
     await testContext.addContextItem(this, 'testIdentifier', 'checkFileAttached', baseContext);
 
     const fileExtension = await viewPage.getAttachedFileHref(page);
-    await expect(fileExtension).to.contains('.png');
+    expect(fileExtension).to.contains('.png');
   });
 
   it('should go back to customer service page', async function () {
@@ -196,13 +196,13 @@ describe('FO - Contact us : Add attachment', async () => {
     );
 
     const pageTitle = await customerServicePage.getPageTitle(page);
-    await expect(pageTitle).to.contains(customerServicePage.pageTitle);
+    expect(pageTitle).to.contains(customerServicePage.pageTitle);
   });
 
   it('should delete the message', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'deleteMessage', baseContext);
 
     const textResult = await customerServicePage.deleteMessage(page, 1);
-    await expect(textResult).to.contains(customerServicePage.successfulDeleteMessage);
+    expect(textResult).to.contains(customerServicePage.successfulDeleteMessage);
   });
 });
diff --git a/tests/UI/campaigns/functional/FO/classic/06_homePage/01_checkSlider.ts b/tests/UI/campaigns/functional/FO/classic/06_homePage/01_checkSlider.ts
index 10754fb43232b..987525f22a9a6 100644
--- a/tests/UI/campaigns/functional/FO/classic/06_homePage/01_checkSlider.ts
+++ b/tests/UI/campaigns/functional/FO/classic/06_homePage/01_checkSlider.ts
@@ -30,38 +30,38 @@ describe('FO - Home Page : Check slider', async () => {
     await homePage.goTo(page, global.FO.URL);
 
     const result = await homePage.isHomePage(page);
-    await expect(result).to.be.true;
+    expect(result).to.eq(true);
   });
 
   it('should click in right arrow of the slider', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'clickOnRightSlideArrow', baseContext);
 
     let isVisible = await homePage.isSliderVisible(page, 1);
-    await expect(isVisible).to.be.true;
+    expect(isVisible).to.eq(true);
 
     await homePage.clickOnLeftOrRightArrow(page, 'right');
 
     isVisible = await homePage.isSliderVisible(page, 2);
-    await expect(isVisible).to.be.true;
+    expect(isVisible).to.eq(true);
   });
 
   it('should click in left arrow of the slider', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'clickOnLeftSlideArrow', baseContext);
 
     let isVisible = await homePage.isSliderVisible(page, 2);
-    await expect(isVisible).to.be.true;
+    expect(isVisible).to.eq(true);
 
     await homePage.clickOnLeftOrRightArrow(page, 'left');
 
     isVisible = await homePage.isSliderVisible(page, 1);
-    await expect(isVisible).to.be.true;
+    expect(isVisible).to.eq(true);
   });
 
   it('should check the slider URL', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'checkSliderURL', baseContext);
 
     const currentURL = await homePage.getSliderURL(page);
-    await expect(currentURL)
+    expect(currentURL)
       .to.contains('www.prestashop-project.org')
       .and.to.contains('homeslider&utm_campaign=back-office-EN&utm_content=download');
   });
diff --git a/tests/UI/campaigns/functional/FO/classic/06_homePage/02_displaySomeProducts.ts b/tests/UI/campaigns/functional/FO/classic/06_homePage/02_displaySomeProducts.ts
index abe2cfed254df..2427b884968fa 100644
--- a/tests/UI/campaigns/functional/FO/classic/06_homePage/02_displaySomeProducts.ts
+++ b/tests/UI/campaigns/functional/FO/classic/06_homePage/02_displaySomeProducts.ts
@@ -41,7 +41,7 @@ describe('FO - Home Page : Display some products', async () => {
       await homePage.goTo(page, global.FO.URL);
 
       const result = await homePage.isHomePage(page);
-      await expect(result).to.be.true;
+      expect(result).to.eq(true);
     });
 
     it('should check popular product title', async function () {
@@ -50,14 +50,14 @@ describe('FO - Home Page : Display some products', async () => {
       await homePage.changeLanguage(page, 'en');
 
       const popularProductTitle = await homePage.getBlockTitle(page, 1);
-      await expect(popularProductTitle).to.equal('Popular Products');
+      expect(popularProductTitle).to.equal('Popular Products');
     });
 
     it('should check the number of popular products', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkPopularProductsNumber', baseContext);
 
       const productsNumber = await homePage.getProductsBlockNumber(page, 1);
-      await expect(productsNumber).to.equal(8);
+      expect(productsNumber).to.equal(8);
     });
 
     it('should check All products link', async function () {
@@ -66,7 +66,7 @@ describe('FO - Home Page : Display some products', async () => {
       await homePage.goToAllProductsBlockPage(page, 1);
 
       const isCategoryPageVisible = await categoryPageFO.isCategoryPage(page);
-      await expect(isCategoryPageVisible, 'Home category page was not opened').to.be.true;
+      expect(isCategoryPageVisible, 'Home category page was not opened').to.eq(true);
     });
 
     it('should go to home page', async function () {
@@ -75,7 +75,7 @@ describe('FO - Home Page : Display some products', async () => {
       await homePage.goToHomePage(page);
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Home page is not displayed').to.be.true;
+      expect(isHomePage, 'Home page is not displayed').to.eq(true);
     });
   });
 
@@ -84,14 +84,14 @@ describe('FO - Home Page : Display some products', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'checkBanner', baseContext);
 
       const isVisible = await homePage.isBannerVisible(page);
-      await expect(isVisible).to.be.true;
+      expect(isVisible).to.eq(true);
     });
 
     it('should check that the custom text block is visible', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkCustomTextBlock', baseContext);
 
       const isVisible = await homePage.isCustomTextBlockVisible(page);
-      await expect(isVisible).to.be.true;
+      expect(isVisible).to.eq(true);
     });
   });
 
@@ -100,14 +100,14 @@ describe('FO - Home Page : Display some products', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'checkProductsOnSaleBlockTitle', baseContext);
 
       const popularProductTitle = await homePage.getBlockTitle(page, 2);
-      await expect(popularProductTitle).to.equal('On sale');
+      expect(popularProductTitle).to.equal('On sale');
     });
 
     it('should check the number of products in sale', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkNumberOfProductsInSale', baseContext);
 
       const productsNumber = await homePage.getProductsBlockNumber(page, 2);
-      await expect(productsNumber).to.equal(2);
+      expect(productsNumber).to.equal(2);
     });
 
     it('should check All products for sale link', async function () {
@@ -116,7 +116,7 @@ describe('FO - Home Page : Display some products', async () => {
       await homePage.goToAllProductsBlockPage(page, 2);
 
       const pageTitle = await pricesDropPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(pricesDropPage.pageTitle);
+      expect(pageTitle).to.equal(pricesDropPage.pageTitle);
     });
 
     it('should go to home page', async function () {
@@ -125,7 +125,7 @@ describe('FO - Home Page : Display some products', async () => {
       await homePage.goToHomePage(page);
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Home page is not displayed').to.be.true;
+      expect(isHomePage, 'Home page is not displayed').to.eq(true);
     });
   });
 
@@ -134,14 +134,14 @@ describe('FO - Home Page : Display some products', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'checkNewProductsBlock', baseContext);
 
       const popularProductTitle = await homePage.getBlockTitle(page, 3);
-      await expect(popularProductTitle).to.equal('New products');
+      expect(popularProductTitle).to.equal('New products');
     });
 
     it('should check the number of new products', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkNewProductsNumber', baseContext);
 
       const productsNumber = await homePage.getProductsBlockNumber(page, 3);
-      await expect(productsNumber).to.equal(8);
+      expect(productsNumber).to.equal(8);
     });
 
     it('should check All new products', async function () {
@@ -150,7 +150,7 @@ describe('FO - Home Page : Display some products', async () => {
       await homePage.goToAllProductsBlockPage(page, 3);
 
       const pageTitle = await newProductsPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(newProductsPage.pageTitle);
+      expect(pageTitle).to.equal(newProductsPage.pageTitle);
     });
 
     it('should go to home page', async function () {
@@ -159,7 +159,7 @@ describe('FO - Home Page : Display some products', async () => {
       await homePage.goToHomePage(page);
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Home page is not displayed').to.be.true;
+      expect(isHomePage, 'Home page is not displayed').to.eq(true);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/FO/classic/06_homePage/03_allProducts.ts b/tests/UI/campaigns/functional/FO/classic/06_homePage/03_allProducts.ts
index 975eb50de19c6..ef4eb2c7f0e30 100644
--- a/tests/UI/campaigns/functional/FO/classic/06_homePage/03_allProducts.ts
+++ b/tests/UI/campaigns/functional/FO/classic/06_homePage/03_allProducts.ts
@@ -58,14 +58,14 @@ describe('FO - Home Page : Display all products', async () => {
       await productsPage.closeSfToolBar(page);
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilter', baseContext);
 
       numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProducts).to.be.above(0);
+      expect(numberOfProducts).to.be.above(0);
     });
 
     it('should filter by Active Status', async function () {
@@ -74,11 +74,11 @@ describe('FO - Home Page : Display all products', async () => {
       await productsPage.filterProducts(page, 'active', 'Active', 'select');
 
       numberOfActiveProducts = await productsPage.getNumberOfProductsFromList(page);
-      await expect(numberOfActiveProducts).to.within(0, numberOfProducts);
+      expect(numberOfActiveProducts).to.within(0, numberOfProducts);
 
       for (let i = 1; i <= numberOfActiveProducts; i++) {
         const productStatus = await productsPage.getProductStatusFromList(page, i);
-        await expect(productStatus).to.be.true;
+        expect(productStatus).to.eq(true);
       }
     });
   });
@@ -90,7 +90,7 @@ describe('FO - Home Page : Display all products', async () => {
       await homePage.goTo(page, global.FO.URL);
 
       const result = await homePage.isHomePage(page);
-      await expect(result).to.be.true;
+      expect(result).to.eq(true);
     });
 
     it('should go to all products page', async function () {
@@ -100,7 +100,7 @@ describe('FO - Home Page : Display all products', async () => {
       await homePage.goToAllProductsPage(page);
 
       const isCategoryPageVisible = await categoryPageFO.isCategoryPage(page);
-      await expect(isCategoryPageVisible, 'Home category page was not opened').to.be.true;
+      expect(isCategoryPageVisible, 'Home category page was not opened').to.eq(true);
     });
 
     it('should check the number of products on the page', async function () {
@@ -121,21 +121,21 @@ describe('FO - Home Page : Display all products', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'homeSortAndPaginationLink', baseContext);
 
       const isSortingLinkVisible = await categoryPageFO.isSortButtonVisible(page);
-      await expect(isSortingLinkVisible, 'Sorting Link is not visible').to.be.true;
+      expect(isSortingLinkVisible, 'Sorting Link is not visible').to.eq(true);
     });
 
     it('should check the showing items text', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'showingItemTextDisplayed', baseContext);
 
       const numberOfItems = await categoryPageFO.getShowingItems(page);
-      await expect(numberOfItems).equal(`Showing 1-12 of ${numberOfActiveProducts} item(s)`);
+      expect(numberOfItems).equal(`Showing 1-12 of ${numberOfActiveProducts} item(s)`);
     });
 
     it('should check the list of product', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'displayedListOfProduct', baseContext);
 
       const listOfProductDisplayed = await categoryPageFO.getNumberOfProductsDisplayed(page);
-      await expect(listOfProductDisplayed).to.be.above(0);
+      expect(listOfProductDisplayed).to.be.above(0);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/FO/classic/06_homePage/04_productQuickView.ts b/tests/UI/campaigns/functional/FO/classic/06_homePage/04_productQuickView.ts
index 4a248b3a21204..7bc48eaa8406d 100644
--- a/tests/UI/campaigns/functional/FO/classic/06_homePage/04_productQuickView.ts
+++ b/tests/UI/campaigns/functional/FO/classic/06_homePage/04_productQuickView.ts
@@ -84,7 +84,7 @@ describe('FO - Home Page : Product quick view', async () => {
       await homePage.goTo(page, global.FO.URL);
 
       const result = await homePage.isHomePage(page);
-      await expect(result).to.be.true;
+      expect(result).to.eq(true);
     });
 
     it(`should quick view the product '${Products.demo_6.name}'`, async function () {
@@ -93,7 +93,7 @@ describe('FO - Home Page : Product quick view', async () => {
       await homePage.quickViewProduct(page, 3);
 
       const isModalVisible = await homePage.isQuickViewProductModalVisible(page);
-      await expect(isModalVisible).to.be.true;
+      expect(isModalVisible).to.eq(true);
     });
 
     it('should check product information', async function () {
@@ -110,9 +110,9 @@ describe('FO - Home Page : Product quick view', async () => {
       ]);
 
       const resultAttributes = await homePage.getSelectedAttributesFromQuickViewModal(page, defaultAttributes);
-      await expect(resultAttributes.length).to.be.equal(1);
-      await expect(resultAttributes[0].name).to.be.equal(defaultAttributes.name);
-      await expect(resultAttributes[0].value).to.be.equal(defaultAttributes.value);
+      expect(resultAttributes.length).to.be.equal(1);
+      expect(resultAttributes[0].name).to.be.equal(defaultAttributes.name);
+      expect(resultAttributes[0].value).to.be.equal(defaultAttributes.value);
     });
 
     it('should change combination and check product information', async function () {
@@ -130,9 +130,9 @@ describe('FO - Home Page : Product quick view', async () => {
       ]);
 
       const resultAttributes = await homePage.getSelectedAttributesFromQuickViewModal(page, attributes);
-      await expect(resultAttributes.length).to.be.equal(1);
-      await expect(resultAttributes[0].name).to.be.equal(attributes.name);
-      await expect(resultAttributes[0].value).to.be.equal(attributes.value);
+      expect(resultAttributes.length).to.be.equal(1);
+      expect(resultAttributes[0].name).to.be.equal(attributes.name);
+      expect(resultAttributes[0].value).to.be.equal(attributes.value);
     });
 
     it('should change the product quantity and click on add to cart', async function () {
@@ -142,14 +142,14 @@ describe('FO - Home Page : Product quick view', async () => {
       await homePage.addToCartByQuickView(page);
 
       const isVisible = await homePage.isBlockCartModalVisible(page);
-      await expect(isVisible).to.be.true;
+      expect(isVisible).to.eq(true);
     });
 
     it('should click on continue shopping and check that the modal is not visible', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnContinueShopping', baseContext);
 
       const isNotVisible = await homePage.continueShopping(page);
-      await expect(isNotVisible).to.be.true;
+      expect(isNotVisible).to.eq(true);
     });
   });
 
@@ -160,7 +160,7 @@ describe('FO - Home Page : Product quick view', async () => {
       await homePage.quickViewProduct(page, 6);
 
       const isModalVisible = await homePage.isQuickViewProductModalVisible(page);
-      await expect(isModalVisible).to.be.true;
+      expect(isModalVisible).to.eq(true);
     });
 
     it('should check product information', async function () {
@@ -184,14 +184,14 @@ describe('FO - Home Page : Product quick view', async () => {
       await homePage.addToCartByQuickView(page);
 
       const isVisible = await homePage.isBlockCartModalVisible(page);
-      await expect(isVisible).to.be.true;
+      expect(isVisible).to.eq(true);
     });
 
     it('should click on continue shopping and check that the modal is not visible', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnContinueShopping2', baseContext);
 
       const isNotVisible = await homePage.continueShopping(page);
-      await expect(isNotVisible).to.be.true;
+      expect(isNotVisible).to.eq(true);
     });
   });
 
@@ -202,7 +202,7 @@ describe('FO - Home Page : Product quick view', async () => {
       await homePage.goToAllProductsPage(page);
 
       const isCategoryPageVisible = await categoryPage.isCategoryPage(page);
-      await expect(isCategoryPageVisible, 'Home category page was not opened').to.be.true;
+      expect(isCategoryPageVisible, 'Home category page was not opened').to.eq(true);
     });
 
     it(`should go to the second page and quick view the product '${Products.demo_14.name}'`, async function () {
@@ -212,7 +212,7 @@ describe('FO - Home Page : Product quick view', async () => {
       await categoryPage.quickViewProduct(page, 7);
 
       const isModalVisible = await categoryPage.isQuickViewProductModalVisible(page);
-      await expect(isModalVisible).to.be.true;
+      expect(isModalVisible).to.eq(true);
     });
 
     it('should check product information', async function () {
@@ -233,14 +233,14 @@ describe('FO - Home Page : Product quick view', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'checkAddToCartButton', baseContext);
 
       const isEnabled = await homePage.isAddToCartButtonEnabled(page);
-      await expect(isEnabled, 'Add to cart button is not disabled').to.be.false;
+      expect(isEnabled, 'Add to cart button is not disabled').to.eq(false);
     });
 
     it('should close the quick view modal', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'closeQuickOptionModal', baseContext);
 
       const isQuickViewModalClosed = await homePage.closeQuickViewModal(page);
-      await expect(isQuickViewModalClosed).to.be.true;
+      expect(isQuickViewModalClosed).to.eq(true);
     });
   });
 
@@ -251,28 +251,28 @@ describe('FO - Home Page : Product quick view', async () => {
       await categoryPage.quickViewProduct(page, 8);
 
       const isModalVisible = await categoryPage.isQuickViewProductModalVisible(page);
-      await expect(isModalVisible).to.be.true;
+      expect(isModalVisible).to.eq(true);
     });
 
     it('should check that \'Add to cart\' button is disabled', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkAddToCartButton2', baseContext);
 
       const isEnabled = await homePage.isAddToCartButtonEnabled(page);
-      await expect(isEnabled, 'Add to cart button is not disabled').to.be.false;
+      expect(isEnabled, 'Add to cart button is not disabled').to.eq(false);
     });
 
     it('should check the product availability', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkProductAvailability', baseContext);
 
       const availability = await homePage.getProductAvailabilityText(page);
-      await expect(availability).to.contains('Out-of-Stock');
+      expect(availability).to.contains('Out-of-Stock');
     });
 
     it('should close the quick view modal', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'closeQuickOptionModal2', baseContext);
 
       const isQuickViewModalClosed = await homePage.closeQuickViewModal(page);
-      await expect(isQuickViewModalClosed).to.be.true;
+      expect(isQuickViewModalClosed).to.eq(true);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/FO/classic/07_search/01_consultAutocompleteList.ts b/tests/UI/campaigns/functional/FO/classic/07_search/01_consultAutocompleteList.ts
index d92fad956ad2c..035654a58cd71 100644
--- a/tests/UI/campaigns/functional/FO/classic/07_search/01_consultAutocompleteList.ts
+++ b/tests/UI/campaigns/functional/FO/classic/07_search/01_consultAutocompleteList.ts
@@ -38,7 +38,7 @@ describe('FO - Search Page : Search product and consult autocomplete list', asyn
     await homePage.goToFo(page);
 
     const isHomePage = await homePage.isHomePage(page);
-    await expect(isHomePage).to.be.true;
+    expect(isHomePage).to.eq(true);
   });
 
   it('should check the autocomplete list', async function () {
@@ -48,10 +48,10 @@ describe('FO - Search Page : Search product and consult autocomplete list', asyn
     const numSearchResults: number = 7;
 
     const numResults = await homePage.countAutocompleteSearchResult(page, searchValue);
-    await expect(numResults).equal(numSearchResults);
+    expect(numResults).equal(numSearchResults);
 
     const inputValue = await homePage.getSearchValue(page);
-    await expect(inputValue).equal(searchValue);
+    expect(inputValue).equal(searchValue);
   });
 
   it('should click outside the autocomplete list and check that the list is not displayed', async function () {
@@ -60,7 +60,7 @@ describe('FO - Search Page : Search product and consult autocomplete list', asyn
     await homePage.closeAutocompleteSearch(page);
 
     const hasAutocompleteList = await homePage.isAutocompleteSearchResultVisible(page);
-    await expect(hasAutocompleteList).to.be.false;
+    expect(hasAutocompleteList).to.eq(false);
   });
 
   [
@@ -81,10 +81,10 @@ describe('FO - Search Page : Search product and consult autocomplete list', asyn
       await testContext.addContextItem(this, 'testIdentifier', `checkAutocompleteList_${index}`, baseContext);
 
       const numResults = await homePage.countAutocompleteSearchResult(page, search.searchValue);
-      await expect(numResults).equal(search.numResults);
+      expect(numResults).equal(search.numResults);
 
       const inputValue = await homePage.getSearchValue(page);
-      await expect(inputValue).equal(search.searchValue);
+      expect(inputValue).equal(search.searchValue);
 
       await homePage.closeAutocompleteSearch(page);
     });
@@ -94,6 +94,6 @@ describe('FO - Search Page : Search product and consult autocomplete list', asyn
     await testContext.addContextItem(this, 'testIdentifier', 'checkAutocompleteListSmallString', baseContext);
 
     const hasSearchResult = await homePage.hasAutocompleteSearchResult(page, 'te');
-    await expect(hasSearchResult, 'There are results in autocomplete search').to.be.false;
+    expect(hasSearchResult, 'There are results in autocomplete search').to.eq(false);
   });
 });
diff --git a/tests/UI/campaigns/functional/FO/classic/07_search/02_searchProduct.ts b/tests/UI/campaigns/functional/FO/classic/07_search/02_searchProduct.ts
index a612b7972d4fd..5c3bb41f2bb55 100644
--- a/tests/UI/campaigns/functional/FO/classic/07_search/02_searchProduct.ts
+++ b/tests/UI/campaigns/functional/FO/classic/07_search/02_searchProduct.ts
@@ -42,17 +42,17 @@ describe('FO - Search Page : Search a product and validate', async () => {
     await homePage.goToFo(page);
 
     const isHomePage = await homePage.isHomePage(page);
-    await expect(isHomePage).to.be.true;
+    expect(isHomePage).to.eq(true);
   });
 
   it('should check autocomplete', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'checkAutocomplete', baseContext);
 
     const numResults = await homePage.countAutocompleteSearchResult(page, Products.demo_8.name);
-    await expect(numResults).equal(3);
+    expect(numResults).equal(3);
 
     const results = await homePage.getAutocompleteSearchResult(page, Products.demo_8.name);
-    await expect(results).contains('notebook');
+    expect(results).contains('notebook');
   });
 
   it('should choose product on the autocomplete list', async function () {
@@ -61,10 +61,10 @@ describe('FO - Search Page : Search a product and validate', async () => {
     await homePage.clickAutocompleteSearchResult(page, Products.demo_8.name, 1);
 
     const pageTitle = await productPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(Products.demo_8.name);
+    expect(pageTitle).to.contains(Products.demo_8.name);
 
     const inputValue = await homePage.getSearchValue(page);
-    await expect(inputValue).is.empty;
+    expect(inputValue).to.have.lengthOf(0);
   });
 
   it('should click on logo link and go to home page', async function () {
@@ -73,7 +73,7 @@ describe('FO - Search Page : Search a product and validate', async () => {
     await homePage.clickOnHeaderLink(page, 'Logo');
 
     const isHomePage = await homePage.isHomePage(page);
-    await expect(isHomePage).to.be.true;
+    expect(isHomePage).to.eq(true);
   });
 
   it('should click on Enter in autocomplete list', async function () {
@@ -82,9 +82,9 @@ describe('FO - Search Page : Search a product and validate', async () => {
     await homePage.searchProduct(page, Products.demo_8.name);
 
     const pageTitle = await searchResultsPage.getPageTitle(page);
-    await expect(pageTitle).to.equal(searchResultsPage.pageTitle);
+    expect(pageTitle).to.equal(searchResultsPage.pageTitle);
 
     const inputValue = await searchResultsPage.getSearchValue(page);
-    await expect(inputValue).is.equal(Products.demo_8.name);
+    expect(inputValue).is.equal(Products.demo_8.name);
   });
 });
diff --git a/tests/UI/campaigns/functional/FO/classic/07_search/03_searchNoResult.ts b/tests/UI/campaigns/functional/FO/classic/07_search/03_searchNoResult.ts
index afe297e20b274..2c5098abe4ea4 100644
--- a/tests/UI/campaigns/functional/FO/classic/07_search/03_searchNoResult.ts
+++ b/tests/UI/campaigns/functional/FO/classic/07_search/03_searchNoResult.ts
@@ -36,25 +36,25 @@ describe('FO - Search Page : Search product', async () => {
     await homePage.goToFo(page);
 
     const isHomePage = await homePage.isHomePage(page);
-    await expect(isHomePage).to.be.true;
+    expect(isHomePage).to.eq(true);
   });
 
   it('should search a string with less than 3 characters', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'searchSmallString', baseContext);
 
     const hasSearchResult = await homePage.hasAutocompleteSearchResult(page, 'te');
-    await expect(hasSearchResult, 'There are results in autocomplete search').to.be.false;
+    expect(hasSearchResult, 'There are results in autocomplete search').to.eq(false);
 
     await homePage.searchProduct(page, 'te');
 
     const pageTitle = await searchResultsPage.getPageTitle(page);
-    await expect(pageTitle).to.equal(searchResultsPage.pageTitle);
+    expect(pageTitle).to.equal(searchResultsPage.pageTitle);
 
     const hasResults = await searchResultsPage.hasResults(page);
-    await expect(hasResults, 'There are results!').to.be.false;
+    expect(hasResults, 'There are results!').to.eq(false);
 
     const searchInputValue = await searchResultsPage.getSearchValue(page);
-    await expect(searchInputValue, 'A search value exists').to.be.equal('te');
+    expect(searchInputValue, 'A search value exists').to.be.equal('te');
   });
 
   it('should search an empty string', async function () {
@@ -63,12 +63,12 @@ describe('FO - Search Page : Search product', async () => {
     await homePage.searchProduct(page, '');
 
     const pageTitle = await searchResultsPage.getPageTitle(page);
-    await expect(pageTitle).to.equal(searchResultsPage.pageTitle);
+    expect(pageTitle).to.equal(searchResultsPage.pageTitle);
 
     const hasResults = await searchResultsPage.hasResults(page);
-    await expect(hasResults, 'There are results!').to.be.false;
+    expect(hasResults, 'There are results!').to.eq(false);
 
     const searchInputValue = await searchResultsPage.getSearchValue(page);
-    await expect(searchInputValue, 'A search value exists').to.be.equal('');
+    expect(searchInputValue, 'A search value exists').to.be.equal('');
   });
 });
diff --git a/tests/UI/campaigns/functional/FO/classic/08_menuAndNavigation/01_navigateInCategories/01_consultCategoriesInHeader.ts b/tests/UI/campaigns/functional/FO/classic/08_menuAndNavigation/01_navigateInCategories/01_consultCategoriesInHeader.ts
index 2179c2c3ac26b..ef0a838ac3c76 100644
--- a/tests/UI/campaigns/functional/FO/classic/08_menuAndNavigation/01_navigateInCategories/01_consultCategoriesInHeader.ts
+++ b/tests/UI/campaigns/functional/FO/classic/08_menuAndNavigation/01_navigateInCategories/01_consultCategoriesInHeader.ts
@@ -39,7 +39,7 @@ describe('FO - Menu and Navigation : Check categories and subcategories links in
     await homePage.goToFo(page);
 
     const isHomePage = await homePage.isHomePage(page);
-    await expect(isHomePage).to.be.true;
+    expect(isHomePage).to.eq(true);
   });
 
   [Categories.clothes, Categories.accessories, Categories.art].forEach((test: CategoryData) => {
@@ -49,7 +49,7 @@ describe('FO - Menu and Navigation : Check categories and subcategories links in
       await homePage.goToCategory(page, test.id);
 
       const pageTitle = await homePage.getPageTitle(page);
-      await expect(pageTitle).to.equal(test.name);
+      expect(pageTitle).to.equal(test.name);
     });
   });
 
@@ -65,7 +65,7 @@ describe('FO - Menu and Navigation : Check categories and subcategories links in
       await homePage.goToSubCategory(page, test.args.category.id, test.args.subcategory.id);
 
       const pageTitle = await homePage.getPageTitle(page);
-      await expect(pageTitle).to.equal(test.args.subcategory.name);
+      expect(pageTitle).to.equal(test.args.subcategory.name);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/FO/classic/08_menuAndNavigation/02_sortAndFilter/01_sortProducts.ts b/tests/UI/campaigns/functional/FO/classic/08_menuAndNavigation/02_sortAndFilter/01_sortProducts.ts
index 67f0b5946480a..d84d1f53f817f 100644
--- a/tests/UI/campaigns/functional/FO/classic/08_menuAndNavigation/02_sortAndFilter/01_sortProducts.ts
+++ b/tests/UI/campaigns/functional/FO/classic/08_menuAndNavigation/02_sortAndFilter/01_sortProducts.ts
@@ -66,7 +66,7 @@ describe('FO - Menu and navigation : Sort products', async () => {
       await productsPage.closeSfToolBar(page);
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should filter by Active Status', async function () {
@@ -76,7 +76,7 @@ describe('FO - Menu and navigation : Sort products', async () => {
       await productsPage.filterProducts(page, 'active', 'Active', 'select');
 
       numberOfActiveProducts = await productsPage.getNumberOfProductsFromList(page);
-      await expect(numberOfActiveProducts).to.within(0, numberOfProducts);
+      expect(numberOfActiveProducts).to.within(0, numberOfProducts);
     });
   });
 
@@ -92,14 +92,14 @@ describe('FO - Menu and navigation : Sort products', async () => {
       );
 
       const pageTitle = await productSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(productSettingsPage.pageTitle);
     });
 
     it('should change the value of products per page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'changeProductPerPage', baseContext);
 
       const result = await productSettingsPage.setProductsDisplayedPerPage(page, numberOfActiveProducts);
-      await expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
+      expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
     });
   });
 
@@ -113,7 +113,7 @@ describe('FO - Menu and navigation : Sort products', async () => {
       await homePage.changeLanguage(page, 'en');
 
       const result = await homePage.isHomePage(page);
-      await expect(result).to.be.true;
+      expect(result).to.eq(true);
     });
 
     it('should go to all products page', async function () {
@@ -123,14 +123,14 @@ describe('FO - Menu and navigation : Sort products', async () => {
       await homePage.goToAllProductsPage(page);
 
       const isCategoryPageVisible = await categoryPageFO.isCategoryPage(page);
-      await expect(isCategoryPageVisible, 'Home category page was not opened').to.be.true;
+      expect(isCategoryPageVisible, 'Home category page was not opened').to.eq(true);
     });
 
     it('should check that the products as sorted by relevance', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkDefaultSort', baseContext);
 
       const isSortingLinkVisible = await categoryPageFO.getSortByValue(page);
-      await expect(isSortingLinkVisible).to.contain('Relevance');
+      expect(isSortingLinkVisible).to.contain('Relevance');
     });
 
     const tests = [
@@ -183,9 +183,9 @@ describe('FO - Menu and navigation : Sort products', async () => {
         const expectedResult: string[] = await basicHelper.sortArray(nonSortedTable);
 
         if (test.args.sortDirection === 'asc') {
-          await expect(sortedTable).to.deep.equal(expectedResult);
+          expect(sortedTable).to.deep.equal(expectedResult);
         } else {
-          await expect(sortedTable).to.deep.equal(expectedResult.reverse());
+          expect(sortedTable).to.deep.equal(expectedResult.reverse());
         }
       });
     });
@@ -199,14 +199,14 @@ describe('FO - Menu and navigation : Sort products', async () => {
       page = await categoryPageFO.closePage(browserContext, page, 0);
 
       const pageTitle = await productSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(productSettingsPage.pageTitle);
     });
 
     it('should change the value of products per page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'ResetProductPerPage', baseContext);
 
       const result = await productSettingsPage.setProductsDisplayedPerPage(page, 12);
-      await expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
+      expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/FO/classic/08_menuAndNavigation/03_navigationAndDisplay/01_displayTags.ts b/tests/UI/campaigns/functional/FO/classic/08_menuAndNavigation/03_navigationAndDisplay/01_displayTags.ts
index 48cb098c2e0cb..ff038665dc1a2 100644
--- a/tests/UI/campaigns/functional/FO/classic/08_menuAndNavigation/03_navigationAndDisplay/01_displayTags.ts
+++ b/tests/UI/campaigns/functional/FO/classic/08_menuAndNavigation/03_navigationAndDisplay/01_displayTags.ts
@@ -98,7 +98,7 @@ describe('FO - Navigation and display : Display tags', async () => {
       await homePage.goTo(page, global.FO.URL);
 
       const result = await homePage.isHomePage(page);
-      await expect(result).to.be.true;
+      expect(result).to.eq(true);
     });
 
     it(`should search for the product '${Products.demo_6.name}'`, async function () {
@@ -107,7 +107,7 @@ describe('FO - Navigation and display : Display tags', async () => {
       await homePage.searchProduct(page, Products.demo_6.name);
 
       const pageTitle = await searchResultsPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(searchResultsPage.pageTitle);
+      expect(pageTitle).to.equal(searchResultsPage.pageTitle);
     });
 
     it('should go to the product page', async function () {
@@ -116,14 +116,14 @@ describe('FO - Navigation and display : Display tags', async () => {
       await searchResultsPage.goToProductPage(page, 1);
 
       const pageTitle = await productPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(Products.demo_6.name);
+      expect(pageTitle).to.contains(Products.demo_6.name);
     });
 
     it('should check the new tag', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkNewTag', baseContext);
 
       const flagText = await productPage.getProductTag(page);
-      await expect(flagText).to.eq('New');
+      expect(flagText).to.eq('New');
     });
   });
 
@@ -142,14 +142,14 @@ describe('FO - Navigation and display : Display tags', async () => {
       );
 
       const pageTitle = await productSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(productSettingsPage.pageTitle);
     });
 
     it('should change the number of days to 0', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'changeNumberOfDays0', baseContext);
 
       const result = await productSettingsPage.updateNumberOfDays(page, 0);
-      await expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
+      expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
     });
   });
 
@@ -160,7 +160,7 @@ describe('FO - Navigation and display : Display tags', async () => {
       await homePage.goTo(page, global.FO.URL);
 
       const result = await homePage.isHomePage(page);
-      await expect(result).to.be.true;
+      expect(result).to.eq(true);
     });
 
     it(`should search for the product '${Products.demo_6.name}'`, async function () {
@@ -169,7 +169,7 @@ describe('FO - Navigation and display : Display tags', async () => {
       await homePage.searchProduct(page, Products.demo_6.name);
 
       const pageTitle = await searchResultsPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(searchResultsPage.pageTitle);
+      expect(pageTitle).to.equal(searchResultsPage.pageTitle);
     });
 
     it('should go to the product page', async function () {
@@ -178,14 +178,14 @@ describe('FO - Navigation and display : Display tags', async () => {
       await searchResultsPage.goToProductPage(page, 1);
 
       const pageTitle = await productPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(Products.demo_6.name);
+      expect(pageTitle).to.contains(Products.demo_6.name);
     });
 
     it('should check that the new tag is not displayed', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkIsNewTagNotVisible', baseContext);
 
       const isTagVisible = await productPage.isProductTagVisible(page);
-      await expect(isTagVisible).to.be.false;
+      expect(isTagVisible).to.eq(false);
     });
   });
 
@@ -196,7 +196,7 @@ describe('FO - Navigation and display : Display tags', async () => {
       await productPage.goTo(page, global.BO.URL);
 
       const pageTitle = await dashboardPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(dashboardPage.pageTitle);
+      expect(pageTitle).to.contains(dashboardPage.pageTitle);
     });
 
     it('should go to \'Catalog > Products\' page', async function () {
@@ -210,14 +210,14 @@ describe('FO - Navigation and display : Display tags', async () => {
       await productsPage.closeSfToolBar(page);
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilters', baseContext);
 
       const numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProducts).to.be.above(0);
+      expect(numberOfProducts).to.be.above(0);
     });
 
     it('should filter by product name', async function () {
@@ -226,7 +226,7 @@ describe('FO - Navigation and display : Display tags', async () => {
       await productsPage.filterProducts(page, 'name', Products.demo_6.name, 'input');
 
       const numberOfProducts = await productsPage.getNumberOfProductsFromList(page);
-      await expect(numberOfProducts).to.eq(1);
+      expect(numberOfProducts).to.eq(1);
     });
 
     it('should go to the product page', async function () {
@@ -235,14 +235,14 @@ describe('FO - Navigation and display : Display tags', async () => {
       await productsPage.goToEditProductPage(page, 1);
 
       const pageTitle = await addProductPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addProductPage.pageTitle);
+      expect(pageTitle).to.contains(addProductPage.pageTitle);
     });
 
     it('should add a specific price', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'addSpecificPrice', baseContext);
 
       const message = await addProductPage.addSpecificPrices(page, specificPriceData.specificPrice);
-      await expect(message).to.equal(addProductPage.settingUpdatedMessage);
+      expect(message).to.equal(addProductPage.settingUpdatedMessage);
     });
   });
 
@@ -253,14 +253,14 @@ describe('FO - Navigation and display : Display tags', async () => {
       page = await addProductPage.previewProduct(page);
 
       const pageTitle = await productPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(Products.demo_6.name);
+      expect(pageTitle).to.contains(Products.demo_6.name);
     });
 
     it('should check the discount tag', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkDiscountTag', baseContext);
 
       const flagText = await productPage.getProductTag(page);
-      await expect(flagText).to.eq(`-€${specificPriceData.specificPrice.discount.toFixed(2)}`);
+      expect(flagText).to.eq(`-€${specificPriceData.specificPrice.discount.toFixed(2)}`);
     });
   });
 
@@ -271,7 +271,7 @@ describe('FO - Navigation and display : Display tags', async () => {
       page = await homePage.closePage(browserContext, page, 0);
 
       const pageTitle = await addProductPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addProductPage.pageTitle);
+      expect(pageTitle).to.contains(addProductPage.pageTitle);
     });
 
     it('should go to \'Catalog > Products\' page', async function () {
@@ -281,7 +281,7 @@ describe('FO - Navigation and display : Display tags', async () => {
       await productsPage.closeSfToolBar(page);
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should go to add product page', async function () {
@@ -290,14 +290,14 @@ describe('FO - Navigation and display : Display tags', async () => {
       await productsPage.goToAddProductPage(page);
 
       const pageTitle = await addProductPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addProductPage.pageTitle);
+      expect(pageTitle).to.contains(addProductPage.pageTitle);
     });
 
     it(`create product '${packOfProducts.name}'`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createProduct', baseContext);
 
       const createProductMessage = await addProductPage.setProduct(page, packOfProducts);
-      await expect(createProductMessage).to.equal(addProductPage.settingUpdatedMessage);
+      expect(createProductMessage).to.equal(addProductPage.settingUpdatedMessage);
     });
   });
 
@@ -308,14 +308,14 @@ describe('FO - Navigation and display : Display tags', async () => {
       page = await addProductPage.previewProduct(page);
 
       const pageTitle = await productPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(packOfProducts.name);
+      expect(pageTitle).to.contains(packOfProducts.name);
     });
 
     it('should check the pack tag', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkPackTag', baseContext);
 
       const flagText = await productPage.getProductTag(page);
-      await expect(flagText).to.eq('Pack');
+      expect(flagText).to.eq('Pack');
     });
   });
 
@@ -326,7 +326,7 @@ describe('FO - Navigation and display : Display tags', async () => {
       page = await homePage.closePage(browserContext, page, 0);
 
       const pageTitle = await addProductPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addProductPage.pageTitle);
+      expect(pageTitle).to.contains(addProductPage.pageTitle);
     });
 
     it('should edit the quantity', async function () {
@@ -335,7 +335,7 @@ describe('FO - Navigation and display : Display tags', async () => {
       await addProductPage.setProductQuantity(page, 0);
 
       const message = await addProductPage.saveProduct(page);
-      await expect(message).to.eq(addProductPage.settingUpdatedMessage);
+      expect(message).to.eq(addProductPage.settingUpdatedMessage);
     });
   });
 
@@ -346,14 +346,14 @@ describe('FO - Navigation and display : Display tags', async () => {
       page = await addProductPage.previewProduct(page);
 
       const pageTitle = await productPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(packOfProducts.name);
+      expect(pageTitle).to.contains(packOfProducts.name);
     });
 
     it('should check the out-of-stock and pack tags', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkOutOfStockTag', baseContext);
 
       const flagText = await productPage.getProductTag(page);
-      await expect(flagText).to.contain('Pack')
+      expect(flagText).to.contain('Pack')
         .and.contain('Out-of-Stock');
     });
   });
@@ -366,7 +366,7 @@ describe('FO - Navigation and display : Display tags', async () => {
       page = await homePage.closePage(browserContext, page, 0);
 
       const pageTitle = await addProductPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addProductPage.pageTitle);
+      expect(pageTitle).to.contains(addProductPage.pageTitle);
     });
 
     it('should go to \'Shop parameters > Product Settings\' page', async function () {
@@ -379,14 +379,14 @@ describe('FO - Navigation and display : Display tags', async () => {
       );
 
       const pageTitle = await productSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(productSettingsPage.pageTitle);
     });
 
     it('should change the number of days to 12', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'changeNumberOfDays', baseContext);
 
       const result = await productSettingsPage.updateNumberOfDays(page, 12);
-      await expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
+      expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
     });
   });
 
@@ -403,14 +403,14 @@ describe('FO - Navigation and display : Display tags', async () => {
       await productsPage.closeSfToolBar(page);
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilters2', baseContext);
 
       const numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProducts).to.be.above(0);
+      expect(numberOfProducts).to.be.above(0);
     });
 
     it('should filter by product name', async function () {
@@ -419,7 +419,7 @@ describe('FO - Navigation and display : Display tags', async () => {
       await productsPage.filterProducts(page, 'name', Products.demo_6.name, 'input');
 
       const numberOfProducts = await productsPage.getNumberOfProductsFromList(page);
-      await expect(numberOfProducts).to.eq(1);
+      expect(numberOfProducts).to.eq(1);
     });
 
     it('should go to the product page', async function () {
@@ -428,14 +428,14 @@ describe('FO - Navigation and display : Display tags', async () => {
       await productsPage.goToEditProductPage(page, 1);
 
       const pageTitle = await addProductPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addProductPage.pageTitle);
+      expect(pageTitle).to.contains(addProductPage.pageTitle);
     });
 
     it('should delete the specific price', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteSpecificPrice', baseContext);
 
       const message = await addProductPage.deleteSpecificPrice(page);
-      await expect(message).to.equal(addProductPage.successfulDeleteMessage);
+      expect(message).to.equal(addProductPage.successfulDeleteMessage);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/FO/classic/08_menuAndNavigation/03_navigationAndDisplay/02_pagination.ts b/tests/UI/campaigns/functional/FO/classic/08_menuAndNavigation/03_navigationAndDisplay/02_pagination.ts
index 46addd4f3c0c2..5fc6f3fa4ffaa 100644
--- a/tests/UI/campaigns/functional/FO/classic/08_menuAndNavigation/03_navigationAndDisplay/02_pagination.ts
+++ b/tests/UI/campaigns/functional/FO/classic/08_menuAndNavigation/03_navigationAndDisplay/02_pagination.ts
@@ -49,7 +49,7 @@ describe('FO - Navigation and display : Pagination', async () => {
       await homePage.goTo(page, global.FO.URL);
 
       const result = await homePage.isHomePage(page);
-      await expect(result).to.be.true;
+      expect(result).to.eq(true);
     });
 
     it('should go to all products page', async function () {
@@ -59,7 +59,7 @@ describe('FO - Navigation and display : Pagination', async () => {
       await homePage.goToAllProductsPage(page);
 
       const isCategoryPageVisible = await categoryPageFO.isCategoryPage(page);
-      await expect(isCategoryPageVisible, 'Home category page was not opened').to.be.true;
+      expect(isCategoryPageVisible, 'Home category page was not opened').to.eq(true);
     });
 
     it('should check the number of products on the page', async function () {
@@ -73,7 +73,7 @@ describe('FO - Navigation and display : Pagination', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'checkPaginationLabel', baseContext);
 
       const pagesList = await categoryPageFO.getPagesList(page);
-      await expect(pagesList).to.contain('1 2 Next');
+      expect(pagesList).to.contain('1 2 Next');
     });
 
     it('should click on next', async function () {
@@ -82,14 +82,14 @@ describe('FO - Navigation and display : Pagination', async () => {
       await categoryPageFO.goToNextPage(page);
 
       const numberOfItems = await categoryPageFO.getShowingItems(page);
-      await expect(numberOfItems).to.eq('Showing 13-19 of 19 item(s)');
+      expect(numberOfItems).to.eq('Showing 13-19 of 19 item(s)');
     });
 
     it('should check the pagination in the bottom of the page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkPaginationLabel1', baseContext);
 
       const pagesList = await categoryPageFO.getPagesList(page);
-      await expect(pagesList).to.contain('Previous 1 2');
+      expect(pagesList).to.contain('Previous 1 2');
     });
 
     it('should click on previous', async function () {
@@ -98,7 +98,7 @@ describe('FO - Navigation and display : Pagination', async () => {
       await categoryPageFO.goToPreviousPage(page);
 
       const numberOfItems = await categoryPageFO.getShowingItems(page);
-      await expect(numberOfItems).to.eq('Showing 1-12 of 19 item(s)');
+      expect(numberOfItems).to.eq('Showing 1-12 of 19 item(s)');
     });
   });
 
@@ -117,14 +117,14 @@ describe('FO - Navigation and display : Pagination', async () => {
       );
 
       const pageTitle = await productSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(productSettingsPage.pageTitle);
     });
 
     it('should change the number of products per page to 6', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'changeNumberOfDays0', baseContext);
 
       const result = await productSettingsPage.setProductsDisplayedPerPage(page, 6);
-      await expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
+      expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
     });
   });
 
@@ -136,7 +136,7 @@ describe('FO - Navigation and display : Pagination', async () => {
       await homePage.changeLanguage(page, 'en');
 
       const result = await homePage.isHomePage(page);
-      await expect(result).to.be.true;
+      expect(result).to.eq(true);
     });
 
     it('should go to all products page', async function () {
@@ -146,7 +146,7 @@ describe('FO - Navigation and display : Pagination', async () => {
       await homePage.goToAllProductsPage(page);
 
       const isCategoryPageVisible = await categoryPageFO.isCategoryPage(page);
-      await expect(isCategoryPageVisible, 'Home category page was not opened').to.be.true;
+      expect(isCategoryPageVisible, 'Home category page was not opened').to.eq(true);
     });
 
     it('should check the number of products on the page', async function () {
@@ -160,7 +160,7 @@ describe('FO - Navigation and display : Pagination', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'checkPaginationLabel2', baseContext);
 
       const pagesList = await categoryPageFO.getPagesList(page);
-      await expect(pagesList).to.contain('1 2 3 4 Next');
+      expect(pagesList).to.contain('1 2 3 4 Next');
     });
 
     it('should click on next', async function () {
@@ -169,14 +169,14 @@ describe('FO - Navigation and display : Pagination', async () => {
       await categoryPageFO.goToNextPage(page);
 
       const numberOfItems = await categoryPageFO.getShowingItems(page);
-      await expect(numberOfItems).to.eq('Showing 7-12 of 19 item(s)');
+      expect(numberOfItems).to.eq('Showing 7-12 of 19 item(s)');
     });
 
     it('should check the pagination in the bottom of the page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkPaginationLabel3', baseContext);
 
       const pagesList = await categoryPageFO.getPagesList(page);
-      await expect(pagesList).to.contain('Previous 1 2 3 4 Next');
+      expect(pagesList).to.contain('Previous 1 2 3 4 Next');
     });
 
     it('should click on previous', async function () {
@@ -185,7 +185,7 @@ describe('FO - Navigation and display : Pagination', async () => {
       await categoryPageFO.goToPreviousPage(page);
 
       const numberOfItems = await categoryPageFO.getShowingItems(page);
-      await expect(numberOfItems).to.eq('Showing 1-6 of 19 item(s)');
+      expect(numberOfItems).to.eq('Showing 1-6 of 19 item(s)');
     });
   });
 
@@ -196,14 +196,14 @@ describe('FO - Navigation and display : Pagination', async () => {
       page = await homePage.closePage(browserContext, page, 0);
 
       const pageTitle = await productSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(productSettingsPage.pageTitle);
     });
 
     it('should change the number of products per page to 20', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'changeNumberOfDays1', baseContext);
 
       const result = await productSettingsPage.setProductsDisplayedPerPage(page, 20);
-      await expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
+      expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
     });
   });
 
@@ -215,7 +215,7 @@ describe('FO - Navigation and display : Pagination', async () => {
       await homePage.changeLanguage(page, 'en');
 
       const result = await homePage.isHomePage(page);
-      await expect(result).to.be.true;
+      expect(result).to.eq(true);
     });
 
     it('should go to all products page', async function () {
@@ -225,7 +225,7 @@ describe('FO - Navigation and display : Pagination', async () => {
       await homePage.goToAllProductsPage(page);
 
       const isCategoryPageVisible = await categoryPageFO.isCategoryPage(page);
-      await expect(isCategoryPageVisible, 'Home category page was not opened').to.be.true;
+      expect(isCategoryPageVisible, 'Home category page was not opened').to.eq(true);
     });
 
     it('should check the number of products on the page', async function () {
@@ -239,7 +239,7 @@ describe('FO - Navigation and display : Pagination', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'checkPaginationLabel4', baseContext);
 
       const isVisible = await categoryPageFO.isPagesListVisible(page);
-      await expect(isVisible).to.be.false;
+      expect(isVisible).to.eq(false);
     });
   });
 
@@ -251,14 +251,14 @@ describe('FO - Navigation and display : Pagination', async () => {
       page = await homePage.closePage(browserContext, page, 0);
 
       const pageTitle = await productSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(productSettingsPage.pageTitle);
     });
 
     it('should change the number of products per page to 12', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'changeNumberOfDays2', baseContext);
 
       const result = await productSettingsPage.setProductsDisplayedPerPage(page, 12);
-      await expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
+      expect(result).to.contains(productSettingsPage.successfulUpdateMessage);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/FO/classic/08_menuAndNavigation/03_navigationAndDisplay/03_quickViewProducts.ts b/tests/UI/campaigns/functional/FO/classic/08_menuAndNavigation/03_navigationAndDisplay/03_quickViewProducts.ts
index 9beac7e8974d7..ef695f026ee1b 100644
--- a/tests/UI/campaigns/functional/FO/classic/08_menuAndNavigation/03_navigationAndDisplay/03_quickViewProducts.ts
+++ b/tests/UI/campaigns/functional/FO/classic/08_menuAndNavigation/03_navigationAndDisplay/03_quickViewProducts.ts
@@ -40,7 +40,7 @@ describe('FO - Navigation and display : Quick view products', async () => {
       await homePage.goTo(page, global.FO.URL);
 
       const result = await homePage.isHomePage(page);
-      await expect(result).to.be.true;
+      expect(result).to.eq(true);
     });
 
     it(`should search for the product '${Products.demo_3.name}'`, async function () {
@@ -49,7 +49,7 @@ describe('FO - Navigation and display : Quick view products', async () => {
       await homePage.searchProduct(page, Products.demo_3.name);
 
       const pageTitle = await searchResultsPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(searchResultsPage.pageTitle);
+      expect(pageTitle).to.equal(searchResultsPage.pageTitle);
     });
 
     it(`should quick view the product '${Products.demo_3.name}'`, async function () {
@@ -58,7 +58,7 @@ describe('FO - Navigation and display : Quick view products', async () => {
       await searchResultsPage.quickViewProduct(page, 1);
 
       const isModalVisible = await searchResultsPage.isQuickViewProductModalVisible(page);
-      await expect(isModalVisible).to.be.true;
+      expect(isModalVisible).to.eq(true);
     });
 
     it('should check product information', async function () {
@@ -81,14 +81,14 @@ describe('FO - Navigation and display : Quick view products', async () => {
       await homePage.addToCartByQuickView(page);
 
       const isVisible = await homePage.isBlockCartModalVisible(page);
-      await expect(isVisible).to.be.true;
+      expect(isVisible).to.eq(true);
     });
 
     it('should click on continue shopping button', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'continueShopping', baseContext);
 
       const isModalNotVisible = await homePage.continueShopping(page);
-      await expect(isModalNotVisible).to.be.true;
+      expect(isModalNotVisible).to.eq(true);
     });
   });
 
@@ -99,7 +99,7 @@ describe('FO - Navigation and display : Quick view products', async () => {
       await homePage.searchProduct(page, Products.demo_12.name);
 
       const pageTitle = await searchResultsPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(searchResultsPage.pageTitle);
+      expect(pageTitle).to.equal(searchResultsPage.pageTitle);
     });
 
     it(`should quick view the product '${Products.demo_12.name}'`, async function () {
@@ -108,7 +108,7 @@ describe('FO - Navigation and display : Quick view products', async () => {
       await searchResultsPage.quickViewProduct(page, 1);
 
       const isModalVisible = await searchResultsPage.isQuickViewProductModalVisible(page);
-      await expect(isModalVisible).to.be.true;
+      expect(isModalVisible).to.eq(true);
     });
 
     it('should check product information', async function () {
@@ -129,7 +129,7 @@ describe('FO - Navigation and display : Quick view products', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'closeModal1', baseContext);
 
       const isQuickViewModalClosed = await homePage.closeQuickViewModal(page);
-      await expect(isQuickViewModalClosed).to.be.true;
+      expect(isQuickViewModalClosed).to.eq(true);
     });
   });
 
@@ -140,7 +140,7 @@ describe('FO - Navigation and display : Quick view products', async () => {
       await homePage.searchProduct(page, Products.demo_14.name);
 
       const pageTitle = await searchResultsPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(searchResultsPage.pageTitle);
+      expect(pageTitle).to.equal(searchResultsPage.pageTitle);
     });
 
     it(`should quick view the product '${Products.demo_14.name}'`, async function () {
@@ -149,7 +149,7 @@ describe('FO - Navigation and display : Quick view products', async () => {
       await searchResultsPage.quickViewProduct(page, 1);
 
       const isModalVisible = await searchResultsPage.isQuickViewProductModalVisible(page);
-      await expect(isModalVisible).to.be.true;
+      expect(isModalVisible).to.eq(true);
     });
 
     it('should check product information', async function () {
@@ -170,14 +170,14 @@ describe('FO - Navigation and display : Quick view products', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'checkAddToCartButton', baseContext);
 
       const isEnabled = await homePage.isAddToCartButtonEnabled(page);
-      await expect(isEnabled, 'Add to cart button is not disabled').to.be.false;
+      expect(isEnabled, 'Add to cart button is not disabled').to.eq(false);
     });
 
     it('should close the modal', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'closeModal2', baseContext);
 
       const isQuickViewModalClosed = await homePage.closeQuickViewModal(page);
-      await expect(isQuickViewModalClosed).to.be.true;
+      expect(isQuickViewModalClosed).to.eq(true);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/FO/classic/08_menuAndNavigation/03_navigationAndDisplay/04_displayOnSaleFlag.ts b/tests/UI/campaigns/functional/FO/classic/08_menuAndNavigation/03_navigationAndDisplay/04_displayOnSaleFlag.ts
index b32749e3dbe50..358c762a5da0a 100644
--- a/tests/UI/campaigns/functional/FO/classic/08_menuAndNavigation/03_navigationAndDisplay/04_displayOnSaleFlag.ts
+++ b/tests/UI/campaigns/functional/FO/classic/08_menuAndNavigation/03_navigationAndDisplay/04_displayOnSaleFlag.ts
@@ -67,7 +67,7 @@ describe('FO - Navigation and display : Display \'On sale\' flag', async () => {
       await productsPage.closeSfToolBar(page);
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should go to add product page', async function () {
@@ -76,7 +76,7 @@ describe('FO - Navigation and display : Display \'On sale\' flag', async () => {
       await productsPage.goToAddProductPage(page);
 
       const pageTitle = await addProductPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addProductPage.pageTitle);
+      expect(pageTitle).to.contains(addProductPage.pageTitle);
     });
 
     it(`create product '${onSaleProductData.name}'`, async function () {
@@ -85,7 +85,7 @@ describe('FO - Navigation and display : Display \'On sale\' flag', async () => {
       await addProductPage.setProduct(page, onSaleProductData);
 
       const createProductMessage = await addProductPage.displayOnSaleFlag(page, true);
-      await expect(createProductMessage).to.equal(addProductPage.settingUpdatedMessage);
+      expect(createProductMessage).to.equal(addProductPage.settingUpdatedMessage);
     });
   });
 
@@ -96,14 +96,14 @@ describe('FO - Navigation and display : Display \'On sale\' flag', async () => {
       page = await addProductPage.previewProduct(page);
 
       const pageTitle = await productPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(onSaleProductData.name);
+      expect(pageTitle).to.contains(onSaleProductData.name);
     });
 
     it('should check the discount flag', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkDiscountTag', baseContext);
 
       const flagText = await productPage.getProductTag(page);
-      await expect(flagText).to.contains('On sale!');
+      expect(flagText).to.contains('On sale!');
     });
   });
 
diff --git a/tests/UI/campaigns/functional/FO/classic/09_productPage/01_quickView.ts b/tests/UI/campaigns/functional/FO/classic/09_productPage/01_quickView.ts
index d0e7ac7b49a51..20b8fa68e219f 100644
--- a/tests/UI/campaigns/functional/FO/classic/09_productPage/01_quickView.ts
+++ b/tests/UI/campaigns/functional/FO/classic/09_productPage/01_quickView.ts
@@ -124,7 +124,7 @@ describe('FO - product page : Product quick view', async () => {
     await homePage.goToFo(page);
 
     const isHomePage = await homePage.isHomePage(page);
-    await expect(isHomePage).to.be.true;
+    expect(isHomePage).to.eq(true);
   });
 
   // 1 - Add to cart from quick view
@@ -164,7 +164,7 @@ describe('FO - product page : Product quick view', async () => {
       await homePage.proceedToCheckout(page);
 
       const pageTitle = await cartPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(cartPage.pageTitle);
+      expect(pageTitle).to.equal(cartPage.pageTitle);
 
       await cartPage.deleteProduct(page, 1);
 
@@ -203,7 +203,7 @@ describe('FO - product page : Product quick view', async () => {
       await homePage.proceedToCheckout(page);
 
       const pageTitle = await cartPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(cartPage.pageTitle);
+      expect(pageTitle).to.equal(cartPage.pageTitle);
 
       await cartPage.deleteProduct(page, 1);
 
@@ -255,7 +255,7 @@ describe('FO - product page : Product quick view', async () => {
         }
 
         const url = await homePage.getSocialSharingLink(page, test.args.name);
-        await expect(url).to.contain(test.result.url);
+        expect(url).to.contain(test.result.url);
       });
     });
   });
@@ -294,7 +294,7 @@ describe('FO - product page : Product quick view', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'closeQuickOptionModal', baseContext);
 
       const isQuickViewModalClosed = await homePage.closeQuickViewModal(page);
-      await expect(isQuickViewModalClosed).to.be.true;
+      expect(isQuickViewModalClosed).to.eq(true);
     });
   });
 
@@ -306,7 +306,7 @@ describe('FO - product page : Product quick view', async () => {
       await homePage.quickViewProduct(page, 1);
 
       const isModalVisible = await homePage.isQuickViewProductModalVisible(page);
-      await expect(isModalVisible).to.be.true;
+      expect(isModalVisible).to.eq(true);
     });
 
     it('should change combination on popup and proceed to checkout', async function () {
@@ -316,14 +316,14 @@ describe('FO - product page : Product quick view', async () => {
       await homePage.proceedToCheckout(page);
 
       const pageTitle = await cartPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(cartPage.pageTitle);
+      expect(pageTitle).to.equal(cartPage.pageTitle);
     });
 
     it('should check the products number in the cart', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkProductsNumber', baseContext);
 
       const notificationsNumber = await homePage.getCartNotificationsNumber(page);
-      await expect(notificationsNumber).to.be.equal(attributesQty);
+      expect(notificationsNumber).to.be.equal(attributesQty);
     });
 
     it('should check product details', async function () {
@@ -362,7 +362,7 @@ describe('FO - product page : Product quick view', async () => {
       await cartPage.goToHomePage(page);
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage).to.be.true;
+      expect(isHomePage).to.eq(true);
     });
 
     it('should select color \'Ẁhite\' and be on product page', async function () {
@@ -371,7 +371,7 @@ describe('FO - product page : Product quick view', async () => {
       await homePage.selectProductColor(page, 1, 'White');
 
       const pageTitle = await productPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(Products.demo_1.name);
+      expect(pageTitle).to.contains(Products.demo_1.name);
     });
 
     it('should get product image Url and go back to home page', async function () {
@@ -381,7 +381,7 @@ describe('FO - product page : Product quick view', async () => {
 
       await productPage.goToHomePage(page);
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage).to.be.true;
+      expect(isHomePage).to.eq(true);
     });
 
     it('should select color \'Black\' and be on product page', async function () {
@@ -390,14 +390,14 @@ describe('FO - product page : Product quick view', async () => {
       await homePage.selectProductColor(page, 1, 'Black');
 
       const pageTitle = await productPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(Products.demo_1.name);
+      expect(pageTitle).to.contains(Products.demo_1.name);
     });
 
     it('should product image be different from the ', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'getProductImage2', baseContext);
 
       imageSecondColor = await productPage.getProductImageUrls(page);
-      await expect(imageFirstColor.coverImage).to.not.equal(imageSecondColor.coverImage);
+      expect(imageFirstColor.coverImage).to.not.equal(imageSecondColor.coverImage);
     });
   });
 
@@ -430,7 +430,7 @@ describe('FO - product page : Product quick view', async () => {
         await boProductsPage.closeSfToolBar(page);
 
         const pageTitle = await boProductsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(boProductsPage.pageTitle);
+        expect(pageTitle).to.contains(boProductsPage.pageTitle);
       });
 
       it('should create Product', async function () {
@@ -439,7 +439,7 @@ describe('FO - product page : Product quick view', async () => {
         await boProductsPage.goToAddProductPage(page);
 
         const createProductMessage = await boAddProductPage.createEditBasicProduct(page, productData);
-        await expect(createProductMessage).to.equal(boAddProductPage.settingUpdatedMessage);
+        expect(createProductMessage).to.equal(boAddProductPage.settingUpdatedMessage);
       });
 
       it('should logout from BO', async function () {
@@ -471,7 +471,7 @@ describe('FO - product page : Product quick view', async () => {
         const coverSecondImageURL = await searchResultsPage.selectThumbImage(page, 2);
         const coverFirstImageURL = await searchResultsPage.selectThumbImage(page, 1);
 
-        await expect(coverSecondImageURL).to.not.equal(coverFirstImageURL);
+        expect(coverSecondImageURL).to.not.equal(coverFirstImageURL);
       });
     });
 
@@ -496,7 +496,7 @@ describe('FO - product page : Product quick view', async () => {
         await boProductsPage.closeSfToolBar(page);
 
         const pageTitle = await boProductsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(boProductsPage.pageTitle);
+        expect(pageTitle).to.contains(boProductsPage.pageTitle);
       });
 
       it('should delete product', async function () {
@@ -504,7 +504,7 @@ describe('FO - product page : Product quick view', async () => {
 
         await boProductsPage.resetFilter(page);
         const testResult = await boProductsPage.deleteProduct(page, productData);
-        await expect(testResult).to.equal(boProductsPage.productDeletedSuccessfulMessage);
+        expect(testResult).to.equal(boProductsPage.productDeletedSuccessfulMessage);
       });
 
       it('should reset all filters', async function () {
@@ -512,7 +512,7 @@ describe('FO - product page : Product quick view', async () => {
 
         await boProductsPage.resetFilterCategory(page);
         const numberOfProducts = await boProductsPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfProducts).to.be.above(0);
+        expect(numberOfProducts).to.be.above(0);
       });
 
       after(async () => {
diff --git a/tests/UI/campaigns/functional/FO/classic/09_productPage/01_quickView/01_addToCart.ts b/tests/UI/campaigns/functional/FO/classic/09_productPage/01_quickView/01_addToCart.ts
index fe7a17baeda13..b60946a22b51a 100644
--- a/tests/UI/campaigns/functional/FO/classic/09_productPage/01_quickView/01_addToCart.ts
+++ b/tests/UI/campaigns/functional/FO/classic/09_productPage/01_quickView/01_addToCart.ts
@@ -66,14 +66,14 @@ describe('FO - Product page - Quick view : Add to cart', async () => {
     await homePage.goToFo(page);
 
     const isHomePage = await homePage.isHomePage(page);
-    await expect(isHomePage).to.be.true;
+    expect(isHomePage).to.eq(true);
   });
 
   it('should add first product to cart by quick view', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'addToCartByQuickView', baseContext);
 
     const successMessage = await homePage.addProductToCartByQuickView(page, 1, 1);
-    await expect(successMessage).to.contains(homePage.successAddToCartMessage);
+    expect(successMessage).to.contains(homePage.successAddToCartMessage);
   });
 
   it('should check product details from cart modal', async function () {
@@ -106,7 +106,7 @@ describe('FO - Product page - Quick view : Add to cart', async () => {
     await homePage.proceedToCheckout(page);
 
     const pageTitle = await cartPage.getPageTitle(page);
-    await expect(pageTitle).to.equal(cartPage.pageTitle);
+    expect(pageTitle).to.equal(cartPage.pageTitle);
   });
 
   it('should check product details', async function () {
@@ -139,7 +139,7 @@ describe('FO - Product page - Quick view : Add to cart', async () => {
     await homePage.goToHomePage(page);
 
     const isHomePage = await homePage.isHomePage(page);
-    await expect(isHomePage, 'Home page is not displayed').to.be.true;
+    expect(isHomePage, 'Home page is not displayed').to.eq(true);
   });
 
   it(`should search for the product ${Products.demo_14.name}`, async function () {
@@ -148,7 +148,7 @@ describe('FO - Product page - Quick view : Add to cart', async () => {
     await homePage.searchProduct(page, Products.demo_14.name);
 
     const pageTitle = await searchResultsPage.getPageTitle(page);
-    await expect(pageTitle).to.equal(searchResultsPage.pageTitle);
+    expect(pageTitle).to.equal(searchResultsPage.pageTitle);
   });
 
   it('should quick view the product and check that Add to cart button is disabled', async function () {
@@ -157,6 +157,6 @@ describe('FO - Product page - Quick view : Add to cart', async () => {
     await searchResultsPage.quickViewProduct(page, 1);
 
     const isDisabled = await homePage.isAddToCartButtonDisabled(page);
-    await expect(isDisabled).to.be.true;
+    expect(isDisabled).to.eq(true);
   });
 });
diff --git a/tests/UI/campaigns/functional/FO/classic/09_productPage/02_addToCart.ts b/tests/UI/campaigns/functional/FO/classic/09_productPage/02_addToCart.ts
index 3274417097727..99022dcfdc282 100644
--- a/tests/UI/campaigns/functional/FO/classic/09_productPage/02_addToCart.ts
+++ b/tests/UI/campaigns/functional/FO/classic/09_productPage/02_addToCart.ts
@@ -94,7 +94,7 @@ describe('FO - product page : Add product to cart', async () => {
     await homePage.goToFo(page);
 
     const isHomePage = await homePage.isHomePage(page);
-    await expect(isHomePage).to.be.true;
+    expect(isHomePage).to.eq(true);
   });
 
   // 1 - Check details and choose combination
@@ -105,7 +105,7 @@ describe('FO - product page : Add product to cart', async () => {
       await homePage.goToProductPage(page, 1);
 
       const pageTitle = await productPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(Products.demo_1.name);
+      expect(pageTitle).to.contains(Products.demo_1.name);
     });
 
     it('should check product details', async function () {
@@ -113,30 +113,30 @@ describe('FO - product page : Add product to cart', async () => {
 
       const result = await productPage.getProductInformation(page);
       await Promise.all([
-        await expect(result.name).to.equal(Products.demo_1.name),
-        await expect(result.price).to.equal(Products.demo_1.finalPrice),
-        await expect(result.summary).to.equal(Products.demo_1.summary),
-        await expect(result.description).to.equal(Products.demo_1.description),
+        expect(result.name).to.equal(Products.demo_1.name),
+        expect(result.price).to.equal(Products.demo_1.finalPrice),
+        expect(result.summary).to.equal(Products.demo_1.summary),
+        expect(result.description).to.equal(Products.demo_1.description),
       ]);
 
       const resultRegularPrice = await productPage.getRegularPrice(page);
-      await expect(resultRegularPrice).to.equal(Products.demo_1.retailPrice);
+      expect(resultRegularPrice).to.equal(Products.demo_1.retailPrice);
 
       const resultDiscountPercentage = await productPage.getDiscountPercentage(page);
-      await expect(resultDiscountPercentage).to.contains(`${Products.demo_1.specificPrice.discount}%`);
+      expect(resultDiscountPercentage).to.contains(`${Products.demo_1.specificPrice.discount}%`);
 
       const productAttributes = await productPage.getProductAttributes(page);
       await Promise.all([
-        await expect(productAttributes[0].name).to.equal(Products.demo_1.attributes[0].name),
-        await expect(productAttributes[0].value).to.equal(Products.demo_1.attributes[0].values.join(' ')),
-        await expect(productAttributes[1].name).to.equal(Products.demo_1.attributes[1].name),
-        await expect(productAttributes[1].value).to.equal(Products.demo_1.attributes[1].values.join(' ')),
+        expect(productAttributes[0].name).to.equal(Products.demo_1.attributes[0].name),
+        expect(productAttributes[0].value).to.equal(Products.demo_1.attributes[0].values.join(' ')),
+        expect(productAttributes[1].name).to.equal(Products.demo_1.attributes[1].name),
+        expect(productAttributes[1].value).to.equal(Products.demo_1.attributes[1].values.join(' ')),
       ]);
 
       const resultImageUrls = await productPage.getProductImageUrls(page);
       await Promise.all([
-        await expect(resultImageUrls.coverImage).to.contains(Products.demo_1.coverImage),
-        await expect(resultImageUrls.thumbImage).to.contains(Products.demo_1.coverImage),
+        expect(resultImageUrls.coverImage).to.contains(Products.demo_1.coverImage),
+        expect(resultImageUrls.thumbImage).to.contains(Products.demo_1.coverImage),
       ]);
     });
 
@@ -147,31 +147,31 @@ describe('FO - product page : Add product to cart', async () => {
 
       const result = await productPage.getProductInformation(page);
       await Promise.all([
-        await expect(result.name).to.equal(Products.demo_1.name),
-        await expect(result.price).to.equal(Products.demo_1.finalPrice),
-        await expect(result.summary).to.equal(Products.demo_1.summary),
-        await expect(result.description).to.equal(Products.demo_1.description),
+        expect(result.name).to.equal(Products.demo_1.name),
+        expect(result.price).to.equal(Products.demo_1.finalPrice),
+        expect(result.summary).to.equal(Products.demo_1.summary),
+        expect(result.description).to.equal(Products.demo_1.description),
       ]);
 
       const resultDiscountPercentage = await productPage.getDiscountPercentage(page);
-      await expect(resultDiscountPercentage).to.contains(Products.demo_1.specificPrice.discount);
+      expect(resultDiscountPercentage).to.contains(Products.demo_1.specificPrice.discount);
 
       const resultRegularPrice = await productPage.getRegularPrice(page);
-      await expect(resultRegularPrice).to.equal(Products.demo_1.retailPrice);
+      expect(resultRegularPrice).to.equal(Products.demo_1.retailPrice);
 
       const resultImageUrls = await productPage.getProductImageUrls(page);
       await Promise.all([
-        await expect(resultImageUrls.coverImage).to.contains(Products.demo_1.coverImage),
-        await expect(resultImageUrls.thumbImage).to.contains(Products.demo_1.coverImage),
+        expect(resultImageUrls.coverImage).to.contains(Products.demo_1.coverImage),
+        expect(resultImageUrls.thumbImage).to.contains(Products.demo_1.coverImage),
       ]);
 
       const selectedProductAttributes = await productPage.getSelectedProductAttributes(page);
       await Promise.all([
-        await expect(selectedProductAttributes.length).to.equal(2),
-        await expect(selectedProductAttributes[0].name).to.equal(firstCombination[0].name),
-        await expect(selectedProductAttributes[0].value).to.equal(firstCombination[0].value),
-        await expect(selectedProductAttributes[1].name).to.equal(firstCombination[1].name),
-        await expect(selectedProductAttributes[1].value).to.equal(firstCombination[1].value),
+        expect(selectedProductAttributes.length).to.equal(2),
+        expect(selectedProductAttributes[0].name).to.equal(firstCombination[0].name),
+        expect(selectedProductAttributes[0].value).to.equal(firstCombination[0].value),
+        expect(selectedProductAttributes[1].name).to.equal(firstCombination[1].name),
+        expect(selectedProductAttributes[1].value).to.equal(firstCombination[1].value),
       ]);
     });
   });
@@ -184,7 +184,7 @@ describe('FO - product page : Add product to cart', async () => {
       await productPage.addProductToTheCart(page, quantity, secondCombination);
 
       const pageTitle = await cartPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(cartPage.pageTitle);
+      expect(pageTitle).to.equal(cartPage.pageTitle);
     });
 
     it('should check the ordered product details in cart page', async function () {
@@ -200,11 +200,11 @@ describe('FO - product page : Add product to cart', async () => {
 
       const cartProductAttributes = await cartPage.getProductAttributes(page, 1);
       await Promise.all([
-        await expect(cartProductAttributes.length).to.equal(2),
-        await expect(cartProductAttributes[0].name).to.equal(secondCombination[0].name),
-        await expect(cartProductAttributes[0].value).to.equal(secondCombination[0].value),
-        await expect(cartProductAttributes[1].name).to.equal(secondCombination[1].name),
-        await expect(cartProductAttributes[1].value).to.equal(secondCombination[1].value),
+        expect(cartProductAttributes.length).to.equal(2),
+        expect(cartProductAttributes[0].name).to.equal(secondCombination[0].name),
+        expect(cartProductAttributes[0].value).to.equal(secondCombination[0].value),
+        expect(cartProductAttributes[1].name).to.equal(secondCombination[1].name),
+        expect(cartProductAttributes[1].value).to.equal(secondCombination[1].value),
       ]);
     });
   });
@@ -238,7 +238,7 @@ describe('FO - product page : Add product to cart', async () => {
         await boProductsPage.closeSfToolBar(page);
 
         const pageTitle = await boProductsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(boProductsPage.pageTitle);
+        expect(pageTitle).to.contains(boProductsPage.pageTitle);
       });
 
       it('should create Product', async function () {
@@ -247,7 +247,7 @@ describe('FO - product page : Add product to cart', async () => {
         await boProductsPage.goToAddProductPage(page);
 
         const createProductMessage = await boAddProductPage.createEditBasicProduct(page, productData);
-        await expect(createProductMessage).to.equal(boAddProductPage.settingUpdatedMessage);
+        expect(createProductMessage).to.equal(boAddProductPage.settingUpdatedMessage);
       });
 
       it('should logout from BO', async function () {
@@ -279,7 +279,7 @@ describe('FO - product page : Add product to cart', async () => {
         const coverSecondImageURL = await productPage.selectThumbImage(page, 2);
         const coverFirstImageURL = await productPage.selectThumbImage(page, 1);
 
-        await expect(coverSecondImageURL).to.not.equal(coverFirstImageURL);
+        expect(coverSecondImageURL).to.not.equal(coverFirstImageURL);
       });
     });
 
@@ -304,7 +304,7 @@ describe('FO - product page : Add product to cart', async () => {
         await boProductsPage.closeSfToolBar(page);
 
         const pageTitle = await boProductsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(boProductsPage.pageTitle);
+        expect(pageTitle).to.contains(boProductsPage.pageTitle);
       });
 
       it('should delete product', async function () {
@@ -312,7 +312,7 @@ describe('FO - product page : Add product to cart', async () => {
 
         await boProductsPage.resetFilter(page);
         const testResult = await boProductsPage.deleteProduct(page, productData);
-        await expect(testResult).to.equal(boProductsPage.productDeletedSuccessfulMessage);
+        expect(testResult).to.equal(boProductsPage.productDeletedSuccessfulMessage);
       });
 
       it('should reset all filters', async function () {
@@ -320,7 +320,7 @@ describe('FO - product page : Add product to cart', async () => {
 
         await boProductsPage.resetFilterCategory(page);
         const numberOfProducts = await boProductsPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfProducts).to.be.above(0);
+        expect(numberOfProducts).to.be.above(0);
       });
 
       after(async () => {
@@ -369,7 +369,7 @@ describe('FO - product page : Add product to cart', async () => {
         await testContext.addContextItem(this, 'testIdentifier', `checkShareLink${index}`, baseContext);
 
         const url = await productPage.getSocialSharingLink(page, test.args.name);
-        await expect(url).to.contain(test.result.url);
+        expect(url).to.contain(test.result.url);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/01_changeQuantity.ts b/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/01_changeQuantity.ts
index 89fb474cae625..7166341ac6a53 100644
--- a/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/01_changeQuantity.ts
+++ b/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/01_changeQuantity.ts
@@ -31,7 +31,7 @@ describe('FO - cart : Change quantity', async () => {
     await homePage.changeLanguage(page, 'en');
 
     const isHomePage = await homePage.isHomePage(page);
-    await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+    expect(isHomePage, 'Fail to open FO home page').to.eq(true);
   });
 
   it('should add the first product to cart and proceed to checkout', async function () {
@@ -41,27 +41,27 @@ describe('FO - cart : Change quantity', async () => {
     await homePage.proceedToCheckout(page);
 
     const pageTitle = await cartPage.getPageTitle(page);
-    await expect(pageTitle).to.eq(cartPage.pageTitle);
+    expect(pageTitle).to.eq(cartPage.pageTitle);
   });
 
   it('should increase the product quantity by the touchspin up to 5', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'increaseQuantity5', baseContext);
 
     const quantity = await cartPage.setProductQuantity(page, 1, 5);
-    await expect(quantity).to.eq(5);
+    expect(quantity).to.eq(5);
 
     const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
-    await expect(notificationsNumber).to.be.eq(5);
+    expect(notificationsNumber).to.be.eq(5);
   });
 
   it('should decrease the product quantity by the touchspin down to 2', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'decreaseQuantity2', baseContext);
 
     const quantity = await cartPage.setProductQuantity(page, 1, 2);
-    await expect(quantity).to.eq(2);
+    expect(quantity).to.eq(2);
 
     const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
-    await expect(notificationsNumber).to.be.eq(2);
+    expect(notificationsNumber).to.be.eq(2);
   });
 
   it('should set the quantity 3 in the input', async function () {
@@ -70,7 +70,7 @@ describe('FO - cart : Change quantity', async () => {
     await cartPage.editProductQuantity(page, 1, 3);
 
     const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
-    await expect(notificationsNumber).to.be.eq(3);
+    expect(notificationsNumber).to.be.eq(3);
   });
 
   it('should set the quantity -6 in the input', async function () {
@@ -79,7 +79,7 @@ describe('FO - cart : Change quantity', async () => {
     await cartPage.editProductQuantity(page, 1, -6);
 
     const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
-    await expect(notificationsNumber).to.be.eq(3);
+    expect(notificationsNumber).to.be.eq(3);
   });
 
   it('should set the quantity +6 in the input', async function () {
@@ -88,7 +88,7 @@ describe('FO - cart : Change quantity', async () => {
     await cartPage.editProductQuantity(page, 1, +6);
 
     const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
-    await expect(notificationsNumber).to.be.eq(6);
+    expect(notificationsNumber).to.be.eq(6);
   });
 
   it('should set the quantity 64 in the input', async function () {
@@ -97,7 +97,7 @@ describe('FO - cart : Change quantity', async () => {
     await cartPage.editProductQuantity(page, 1, 64);
 
     const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
-    await expect(notificationsNumber).to.be.eq(64);
+    expect(notificationsNumber).to.be.eq(64);
   });
 
   it('should set \'azerty\' in the input', async function () {
@@ -106,7 +106,7 @@ describe('FO - cart : Change quantity', async () => {
     await cartPage.editProductQuantity(page, 1, 'azerty');
 
     const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
-    await expect(notificationsNumber).to.be.eq(64);
+    expect(notificationsNumber).to.be.eq(64);
   });
 
   it('should set the quantity 2400 in the input', async function () {
@@ -115,21 +115,21 @@ describe('FO - cart : Change quantity', async () => {
     await cartPage.editProductQuantity(page, 1, 2400);
 
     const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
-    await expect(notificationsNumber).to.be.eq(2400);
+    expect(notificationsNumber).to.be.eq(2400);
   });
 
   it('should check the error message', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'checkErrorMessage', baseContext);
 
     const alertText = await cartPage.getNotificationMessage(page);
-    await expect(alertText).to.contains(cartPage.errorNotificationForProductQuantity);
+    expect(alertText).to.contains(cartPage.errorNotificationForProductQuantity);
   });
 
   it('should check that proceed to checkout button is disabled', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'checkProceedToCheckoutButton', baseContext);
 
     const isDisabled = await cartPage.isProceedToCheckoutButtonDisabled(page);
-    await expect(isDisabled).to.be.true;
+    expect(isDisabled).to.eq(true);
   });
 
   it('should set the quantity 0 in the input', async function () {
@@ -138,6 +138,6 @@ describe('FO - cart : Change quantity', async () => {
     await cartPage.editProductQuantity(page, 1, 0);
 
     const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
-    await expect(notificationsNumber).to.be.eq(0);
+    expect(notificationsNumber).to.be.eq(0);
   });
 });
diff --git a/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/02_deleteProduct.ts b/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/02_deleteProduct.ts
index 22b68aa1fc236..ba4e3e7e39577 100644
--- a/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/02_deleteProduct.ts
+++ b/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/02_deleteProduct.ts
@@ -31,7 +31,7 @@ describe('FO - cart : Delete product', async () => {
     await homePage.changeLanguage(page, 'en');
 
     const isHomePage = await homePage.isHomePage(page);
-    await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+    expect(isHomePage, 'Fail to open FO home page').to.eq(true);
   });
 
   it('should add the first product to cart and proceed to checkout', async function () {
@@ -41,7 +41,7 @@ describe('FO - cart : Delete product', async () => {
     await homePage.proceedToCheckout(page);
 
     const pageTitle = await cartPage.getPageTitle(page);
-    await expect(pageTitle).to.eq(cartPage.pageTitle);
+    expect(pageTitle).to.eq(cartPage.pageTitle);
   });
 
   it('should set the quantity 0 in the input', async function () {
@@ -50,7 +50,7 @@ describe('FO - cart : Delete product', async () => {
     await cartPage.editProductQuantity(page, 1, 0);
 
     const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
-    await expect(notificationsNumber).to.be.eq(0);
+    expect(notificationsNumber).to.be.eq(0);
   });
 
   it('should go to home page', async function () {
@@ -59,7 +59,7 @@ describe('FO - cart : Delete product', async () => {
     await cartPage.goToHomePage(page);
 
     const result = await foHomePage.isHomePage(page);
-    await expect(result).to.be.true;
+    expect(result).to.eq(true);
   });
 
   it('should add the first product to cart and proceed to checkout', async function () {
@@ -69,7 +69,7 @@ describe('FO - cart : Delete product', async () => {
     await homePage.proceedToCheckout(page);
 
     const pageTitle = await cartPage.getPageTitle(page);
-    await expect(pageTitle).to.eq(cartPage.pageTitle);
+    expect(pageTitle).to.eq(cartPage.pageTitle);
   });
 
   it('should delete the product', async function () {
@@ -78,6 +78,6 @@ describe('FO - cart : Delete product', async () => {
     await cartPage.deleteProduct(page, 1);
 
     const notificationNumber = await cartPage.getCartNotificationsNumber(page);
-    await expect(notificationNumber).to.be.equal(0);
+    expect(notificationNumber).to.be.equal(0);
   });
 });
diff --git a/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/03_addPromoCode.ts b/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/03_addPromoCode.ts
index e972d51f9bb5f..59c1c2485e813 100644
--- a/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/03_addPromoCode.ts
+++ b/tests/UI/campaigns/functional/FO/classic/10_cart/02_cart/03_addPromoCode.ts
@@ -53,7 +53,7 @@ describe('FO - cart : Add promo code', async () => {
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should add the first product to cart and proceed to checkout', async function () {
@@ -63,7 +63,7 @@ describe('FO - cart : Add promo code', async () => {
       await homePage.proceedToCheckout(page);
 
       const pageTitle = await cartPage.getPageTitle(page);
-      await expect(pageTitle).to.eq(cartPage.pageTitle);
+      expect(pageTitle).to.eq(cartPage.pageTitle);
     });
 
     it('should add the promo code and check the total', async function () {
@@ -72,21 +72,21 @@ describe('FO - cart : Add promo code', async () => {
       await cartPage.addPromoCode(page, newCartRuleData.code);
 
       const isVisible = await cartPage.isCartRuleNameVisible(page);
-      await expect(isVisible).to.be.true;
+      expect(isVisible).to.eq(true);
     });
 
     it('should check the cart rule name', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkCartRuleName', baseContext);
 
       const cartRuleName = await cartPage.getCartRuleName(page);
-      await expect(cartRuleName).to.equal(newCartRuleData.name);
+      expect(cartRuleName).to.equal(newCartRuleData.name);
     });
 
     it('should check the discount value', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkDiscountValue', baseContext);
 
       const totalBeforeDiscount = await cartPage.getDiscountValue(page);
-      await expect(totalBeforeDiscount).to.eq(-newCartRuleData.discountAmount!.value);
+      expect(totalBeforeDiscount).to.eq(-newCartRuleData.discountAmount!.value);
     });
 
     it('should set the same promo code and check the error message', async function () {
@@ -95,10 +95,10 @@ describe('FO - cart : Add promo code', async () => {
       await cartPage.addPromoCode(page, newCartRuleData.code);
 
       const isVisible = await cartPage.isCartRuleNameVisible(page, 2);
-      await expect(isVisible).to.be.false;
+      expect(isVisible).to.eq(false);
 
       const voucherErrorText = await cartPage.getCartRuleErrorMessage(page);
-      await expect(voucherErrorText).to.equal(cartPage.cartRuleAlreadyInYourCartErrorText);
+      expect(voucherErrorText).to.equal(cartPage.cartRuleAlreadyInYourCartErrorText);
     });
 
     it('should set a not existing promo code and check the error message', async function () {
@@ -107,10 +107,10 @@ describe('FO - cart : Add promo code', async () => {
       await cartPage.addPromoCode(page, 'reduction', false);
 
       const isVisible = await cartPage.isCartRuleNameVisible(page, 2);
-      await expect(isVisible).to.be.false;
+      expect(isVisible).to.eq(false);
 
       const voucherErrorText = await cartPage.getCartRuleErrorMessage(page);
-      await expect(voucherErrorText).to.equal(cartPage.cartRuleNotExistingErrorText);
+      expect(voucherErrorText).to.equal(cartPage.cartRuleNotExistingErrorText);
     });
 
     it('should leave the promo code input blanc and check the error message', async function () {
@@ -119,7 +119,7 @@ describe('FO - cart : Add promo code', async () => {
       await cartPage.addPromoCode(page, '', false);
 
       const voucherErrorText = await cartPage.getCartRuleErrorMessage(page);
-      await expect(voucherErrorText).to.equal(cartPage.cartRuleMustEnterVoucherErrorText);
+      expect(voucherErrorText).to.equal(cartPage.cartRuleMustEnterVoucherErrorText);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/FO/classic/11_checkout/01_personalInformation/02_signIn.ts b/tests/UI/campaigns/functional/FO/classic/11_checkout/01_personalInformation/02_signIn.ts
index 14de36d9f8213..7277558c1576c 100644
--- a/tests/UI/campaigns/functional/FO/classic/11_checkout/01_personalInformation/02_signIn.ts
+++ b/tests/UI/campaigns/functional/FO/classic/11_checkout/01_personalInformation/02_signIn.ts
@@ -49,7 +49,7 @@ describe('FO - Checkout - Personal information : Sign in', async () => {
     await homePage.changeLanguage(page, 'en');
 
     const isHomePage = await homePage.isHomePage(page);
-    await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+    expect(isHomePage, 'Fail to open FO home page').to.eq(true);
   });
 
   it('should add product to cart', async function () {
@@ -59,7 +59,7 @@ describe('FO - Checkout - Personal information : Sign in', async () => {
     await productPage.addProductToTheCart(page, 1);
 
     const pageTitle = await cartPage.getPageTitle(page);
-    await expect(pageTitle).to.equal(cartPage.pageTitle);
+    expect(pageTitle).to.equal(cartPage.pageTitle);
   });
 
   it('should proceed to checkout validate the cart', async function () {
@@ -68,7 +68,7 @@ describe('FO - Checkout - Personal information : Sign in', async () => {
     await cartPage.clickOnProceedToCheckout(page);
 
     const isCheckoutPage = await checkoutPage.isCheckoutPage(page);
-    await expect(isCheckoutPage).to.be.true;
+    expect(isCheckoutPage).to.eq(true);
   });
 
   it('should enter an invalid credentials', async function () {
@@ -77,17 +77,17 @@ describe('FO - Checkout - Personal information : Sign in', async () => {
     await checkoutPage.clickOnSignIn(page);
 
     const isCustomerConnected = await checkoutPage.customerLogin(page, credentialsData);
-    await expect(isCustomerConnected, 'Customer is connected').to.be.false;
+    expect(isCustomerConnected, 'Customer is connected').to.eq(false);
 
     const loginError = await checkoutPage.getLoginError(page);
-    await expect(loginError).to.contains(checkoutPage.authenticationErrorMessage);
+    expect(loginError).to.contains(checkoutPage.authenticationErrorMessage);
   });
 
   it('should sign in with customer credentials', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'signIn', baseContext);
 
     const isCustomerConnected = await checkoutPage.customerLogin(page, Customers.johnDoe);
-    await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+    expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
   });
 
   it('should click on edit Personal information step and get the identity of the customer', async function () {
@@ -96,27 +96,27 @@ describe('FO - Checkout - Personal information : Sign in', async () => {
     await checkoutPage.clickOnEditPersonalInformationStep(page);
 
     const customerIdentity = await checkoutPage.getCustomerIdentity(page);
-    await expect(customerIdentity).to.equal(`Connected as ${Customers.johnDoe.firstName} ${Customers.johnDoe.lastName}.`);
+    expect(customerIdentity).to.equal(`Connected as ${Customers.johnDoe.firstName} ${Customers.johnDoe.lastName}.`);
   });
 
   it('should check the existence of the text message \'If you sign out now, your cart will be emptied.\'', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'checkMessage', baseContext);
 
     const message = await checkoutPage.getLogoutMessage(page);
-    await expect(message).to.equal(checkoutPage.messageIfYouSignOut);
+    expect(message).to.equal(checkoutPage.messageIfYouSignOut);
   });
 
   it('should logout and check that the customer is no longer connected', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'logout', baseContext);
 
     const isCustomerConnected = await checkoutPage.logOutCustomer(page);
-    await expect(isCustomerConnected, 'Customer is still connected').to.be.false;
+    expect(isCustomerConnected, 'Customer is still connected').to.eq(false);
   });
 
   it('should check the message \'There are no more items in your cart\' in shopping cart page', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'checkNoItemsNumber', baseContext);
 
     const message = await cartPage.getNoItemsInYourCartMessage(page);
-    await expect(message).to.equal(cartPage.noItemsInYourCartMessage);
+    expect(message).to.equal(cartPage.noItemsInYourCartMessage);
   });
 });
diff --git a/tests/UI/campaigns/functional/FO/classic/11_checkout/01_personalInformation/05_passwordReminder.ts b/tests/UI/campaigns/functional/FO/classic/11_checkout/01_personalInformation/05_passwordReminder.ts
index 7d5db078fac0d..dbb770fdedaa6 100644
--- a/tests/UI/campaigns/functional/FO/classic/11_checkout/01_personalInformation/05_passwordReminder.ts
+++ b/tests/UI/campaigns/functional/FO/classic/11_checkout/01_personalInformation/05_passwordReminder.ts
@@ -87,7 +87,7 @@ describe('FO - Checkout - Personal information : Password reminder', async () =>
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should add product to cart', async function () {
@@ -97,7 +97,7 @@ describe('FO - Checkout - Personal information : Password reminder', async () =>
       await productPage.addProductToTheCart(page, 1);
 
       const pageTitle = await cartPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(cartPage.pageTitle);
+      expect(pageTitle).to.equal(cartPage.pageTitle);
     });
 
     it('should proceed to checkout and validate the cart', async function () {
@@ -106,7 +106,7 @@ describe('FO - Checkout - Personal information : Password reminder', async () =>
       await cartPage.clickOnProceedToCheckout(page);
 
       const isCheckoutPage = await checkoutPage.isCheckoutPage(page);
-      await expect(isCheckoutPage).to.be.true;
+      expect(isCheckoutPage).to.eq(true);
     });
 
     it('should click on sign in then on \'Forgot your password?\' link ', async function () {
@@ -116,7 +116,7 @@ describe('FO - Checkout - Personal information : Password reminder', async () =>
       await checkoutPage.goToPasswordReminderPage(page);
 
       const pageTitle = await passwordReminderPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(passwordReminderPage.pageTitle);
+      expect(pageTitle).to.equal(passwordReminderPage.pageTitle);
     });
 
     it('should set the email address and send reset link', async function () {
@@ -125,13 +125,13 @@ describe('FO - Checkout - Personal information : Password reminder', async () =>
       await passwordReminderPage.sendResetPasswordLink(page, customerData.email);
 
       const successAlertContent = await passwordReminderPage.checkResetLinkSuccess(page);
-      await expect(successAlertContent).to.contains(customerData.email);
+      expect(successAlertContent).to.contains(customerData.email);
     });
 
     it('should check if reset password mail is in mailbox', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkResetPasswordMail', baseContext);
 
-      await expect(newMail.subject).to.contains(resetPasswordMailSubject);
+      expect(newMail.subject).to.contains(resetPasswordMailSubject);
     });
 
     it('should open reset password link', async function () {
@@ -140,14 +140,14 @@ describe('FO - Checkout - Personal information : Password reminder', async () =>
       await passwordReminderPage.openForgotPasswordPage(page, newMail.text);
 
       const pageTitle = await passwordReminderPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(passwordReminderPage.pageTitle);
+      expect(pageTitle).to.equal(passwordReminderPage.pageTitle);
     });
 
     it('should check the email address to reset password', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkEmailAddress', baseContext);
 
       const emailAddress = await passwordReminderPage.getEmailAddressToReset(page);
-      await expect(emailAddress).to.contains(customerData.email);
+      expect(emailAddress).to.contains(customerData.email);
     });
 
     it('should change the password and check the validation message', async function () {
@@ -156,7 +156,7 @@ describe('FO - Checkout - Personal information : Password reminder', async () =>
       await passwordReminderPage.setNewPassword(page, newPassword);
 
       const successMessage = await myAccountPage.getSuccessMessageAlert(page);
-      await expect(successMessage).to.equal(`${myAccountPage.resetPasswordSuccessMessage} ${customerData.email}`);
+      expect(successMessage).to.equal(`${myAccountPage.resetPasswordSuccessMessage} ${customerData.email}`);
     });
 
     it('should logout from FO', async function () {
@@ -164,7 +164,7 @@ describe('FO - Checkout - Personal information : Password reminder', async () =>
 
       await myAccountPage.logout(page);
       const isCustomerConnected = await myAccountPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is connected').to.be.false;
+      expect(isCustomerConnected, 'Customer is connected').to.eq(false);
     });
   });
 
@@ -174,7 +174,7 @@ describe('FO - Checkout - Personal information : Password reminder', async () =>
 
       await myAccountPage.goToHomePage(page);
       const result = await homePage.isHomePage(page);
-      await expect(result).to.be.true;
+      expect(result).to.eq(true);
     });
 
     it('should add product to cart', async function () {
@@ -184,7 +184,7 @@ describe('FO - Checkout - Personal information : Password reminder', async () =>
       await productPage.addProductToTheCart(page, 1);
 
       const pageTitle = await cartPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(cartPage.pageTitle);
+      expect(pageTitle).to.equal(cartPage.pageTitle);
     });
 
     it('should proceed to checkout and validate the cart', async function () {
@@ -193,7 +193,7 @@ describe('FO - Checkout - Personal information : Password reminder', async () =>
       await cartPage.clickOnProceedToCheckout(page);
 
       const isCheckoutPage = await checkoutPage.isCheckoutPage(page);
-      await expect(isCheckoutPage).to.be.true;
+      expect(isCheckoutPage).to.eq(true);
     });
 
     it('should enter an invalid credentials', async function () {
@@ -202,17 +202,17 @@ describe('FO - Checkout - Personal information : Password reminder', async () =>
       await checkoutPage.clickOnSignIn(page);
 
       const isCustomerConnected = await checkoutPage.customerLogin(page, customerData);
-      await expect(isCustomerConnected, 'Customer is connected').to.be.false;
+      expect(isCustomerConnected, 'Customer is connected').to.eq(false);
 
       const loginError = await checkoutPage.getLoginError(page);
-      await expect(loginError).to.contains(checkoutPage.authenticationErrorMessage);
+      expect(loginError).to.contains(checkoutPage.authenticationErrorMessage);
     });
 
     it('should sign in with customer credentials', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'signIn', baseContext);
 
       const isCustomerConnected = await checkoutPage.customerLogin(page, customerNewPassword);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/FO/classic/11_checkout/01_showDetails.ts b/tests/UI/campaigns/functional/FO/classic/11_checkout/01_showDetails.ts
index 7b0fc6764874c..3e070760fb763 100644
--- a/tests/UI/campaigns/functional/FO/classic/11_checkout/01_showDetails.ts
+++ b/tests/UI/campaigns/functional/FO/classic/11_checkout/01_showDetails.ts
@@ -47,7 +47,7 @@ describe('FO - Checkout : Show details', async () => {
     await homePage.changeLanguage(page, 'en');
 
     const isHomePage = await homePage.isHomePage(page);
-    await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+    expect(isHomePage, 'Fail to open FO home page').to.eq(true);
   });
 
   it('should add the first product to cart', async function () {
@@ -56,7 +56,7 @@ describe('FO - Checkout : Show details', async () => {
     await homePage.addProductToCartByQuickView(page, 1, 1);
 
     const isModalClosed = await homePage.closeBlockCartModal(page);
-    await expect(isModalClosed).to.be.true;
+    expect(isModalClosed).to.eq(true);
   });
 
   it('should add the third product to cart', async function () {
@@ -67,7 +67,7 @@ describe('FO - Checkout : Show details', async () => {
     await homePage.proceedToCheckout(page);
 
     const pageTitle = await cartPage.getPageTitle(page);
-    await expect(pageTitle).to.equal(cartPage.pageTitle);
+    expect(pageTitle).to.equal(cartPage.pageTitle);
   });
 
   it('should proceed to checkout and go to checkout page', async function () {
@@ -76,49 +76,49 @@ describe('FO - Checkout : Show details', async () => {
     await cartPage.clickOnProceedToCheckout(page);
 
     const isCheckoutPage = await checkoutPage.isCheckoutPage(page);
-    await expect(isCheckoutPage).to.be.true;
+    expect(isCheckoutPage).to.eq(true);
   });
 
   it('should check the items number', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'checkItemsNumber', baseContext);
 
     const itemsNumber = await checkoutPage.getItemsNumber(page);
-    await expect(itemsNumber).to.equal('3 items');
+    expect(itemsNumber).to.equal('3 items');
   });
 
   it('should click on \'Show details\' link', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'showDetails', baseContext);
 
     const isProductsListVisible = await checkoutPage.clickOnShowDetailsLink(page);
-    await expect(isProductsListVisible).to.be.true;
+    expect(isProductsListVisible).to.eq(true);
   });
 
   it('should check the first product details', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'checkFirstProductDetails', baseContext);
     const result = await checkoutPage.getProductDetails(page, 1);
     await Promise.all([
-      await expect(result.image).to.contains(Products.demo_1.coverImage),
-      await expect(result.name).to.equal(Products.demo_1.name),
-      await expect(result.quantity).to.equal(1),
-      await expect(result.price).to.equal(Products.demo_1.finalPrice),
+      expect(result.image).to.contains(Products.demo_1.coverImage),
+      expect(result.name).to.equal(Products.demo_1.name),
+      expect(result.quantity).to.equal(1),
+      expect(result.price).to.equal(Products.demo_1.finalPrice),
     ]);
 
     const attributes = await checkoutPage.getProductAttributes(page, 1);
-    await expect(attributes).to.equal('Size: S');
+    expect(attributes).to.equal('Size: S');
   });
 
   it('should check the second product details', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'checkSecondProductDetails', baseContext);
     const result = await checkoutPage.getProductDetails(page, 2);
     await Promise.all([
-      await expect(result.image).to.contains(Products.demo_6.coverImage),
-      await expect(result.name).to.equal(Products.demo_6.name),
-      await expect(result.quantity).to.equal(2),
-      await expect(result.price).to.equal(Products.demo_6.combinations[0].price),
+      expect(result.image).to.contains(Products.demo_6.coverImage),
+      expect(result.name).to.equal(Products.demo_6.name),
+      expect(result.quantity).to.equal(2),
+      expect(result.price).to.equal(Products.demo_6.combinations[0].price),
     ]);
 
     const attributes = await checkoutPage.getProductAttributes(page, 2);
-    await expect(attributes).to.equal('Dimension: 40x60cm');
+    expect(attributes).to.equal('Dimension: 40x60cm');
   });
 
   it('click on first product name', async function () {
@@ -127,7 +127,7 @@ describe('FO - Checkout : Show details', async () => {
     page = await checkoutPage.clickOnProductName(page, 1);
 
     const productInformation = await productPage.getProductInformation(page);
-    await expect(productInformation.name).to.equal(Products.demo_1.name);
+    expect(productInformation.name).to.equal(Products.demo_1.name);
   });
 
   it('should close the page and click on the first product image', async function () {
@@ -137,6 +137,6 @@ describe('FO - Checkout : Show details', async () => {
     await checkoutPage.clickOnProductImage(page, 1);
 
     const productInformation = await productPage.getProductInformation(page);
-    await expect(productInformation.name).to.equal(Products.demo_1.name);
+    expect(productInformation.name).to.equal(Products.demo_1.name);
   });
 });
diff --git a/tests/UI/campaigns/functional/FO/classic/11_checkout/02_addresses/01_CRUDAddress.ts b/tests/UI/campaigns/functional/FO/classic/11_checkout/02_addresses/01_CRUDAddress.ts
index 34446d8b37cb9..26cba6bb2aad1 100644
--- a/tests/UI/campaigns/functional/FO/classic/11_checkout/02_addresses/01_CRUDAddress.ts
+++ b/tests/UI/campaigns/functional/FO/classic/11_checkout/02_addresses/01_CRUDAddress.ts
@@ -81,7 +81,7 @@ describe('FO - Checkout - Addresses : CRUD address', async () => {
       await foHomePage.changeLanguage(page, 'en');
 
       const isHomePage = await foHomePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should go to first product page', async function () {
@@ -90,7 +90,7 @@ describe('FO - Checkout - Addresses : CRUD address', async () => {
       await foHomePage.goToProductPage(page, 1);
 
       const pageTitle = await foProductPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(Products.demo_1.name);
+      expect(pageTitle).to.contains(Products.demo_1.name);
     });
 
     it('should add product to cart and go to cart page', async function () {
@@ -99,7 +99,7 @@ describe('FO - Checkout - Addresses : CRUD address', async () => {
       await foProductPage.addProductToTheCart(page);
 
       const pageTitle = await cartPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(cartPage.pageTitle);
+      expect(pageTitle).to.equal(cartPage.pageTitle);
     });
 
     it('should validate shopping cart and go to checkout page', async function () {
@@ -108,7 +108,7 @@ describe('FO - Checkout - Addresses : CRUD address', async () => {
       await cartPage.clickOnProceedToCheckout(page);
 
       const isCheckoutPage = await checkoutPage.isCheckoutPage(page);
-      await expect(isCheckoutPage).to.be.true;
+      expect(isCheckoutPage).to.eq(true);
     });
 
     it('should sign in by created customer', async function () {
@@ -117,14 +117,14 @@ describe('FO - Checkout - Addresses : CRUD address', async () => {
       await checkoutPage.clickOnSignIn(page);
 
       const isCustomerConnected = await checkoutPage.customerLogin(page, customerData);
-      await expect(isCustomerConnected, 'Customer is not connected!').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected!').to.eq(true);
     });
 
     it('should create address then continue to delivery step', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createAddress', baseContext);
 
       const isStepAddressComplete = await checkoutPage.setAddress(page, addressData);
-      await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
     });
   });
 
@@ -135,7 +135,7 @@ describe('FO - Checkout - Addresses : CRUD address', async () => {
       await checkoutPage.clickOnEditAddressesStep(page);
 
       const addressesNumber = await checkoutPage.getNumberOfAddresses(page);
-      await expect(addressesNumber, 'The addresses number is not equal to 1!').to.equal(1);
+      expect(addressesNumber, 'The addresses number is not equal to 1!').to.equal(1);
     });
 
     it('should edit the created address', async function () {
@@ -144,7 +144,7 @@ describe('FO - Checkout - Addresses : CRUD address', async () => {
       await checkoutPage.clickOnEditAddress(page);
 
       const isStepAddressComplete = await checkoutPage.setAddress(page, editAddressData);
-      await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
     });
   });
 
@@ -155,7 +155,7 @@ describe('FO - Checkout - Addresses : CRUD address', async () => {
       await checkoutPage.clickOnEditAddressesStep(page);
 
       const addressesNumber = await checkoutPage.getNumberOfAddresses(page);
-      await expect(addressesNumber, 'The addresses number is not equal to 1!').to.equal(1);
+      expect(addressesNumber, 'The addresses number is not equal to 1!').to.equal(1);
     });
 
     it('should add new address', async function () {
@@ -164,7 +164,7 @@ describe('FO - Checkout - Addresses : CRUD address', async () => {
       await checkoutPage.clickOnAddNewAddressButton(page);
 
       const isStepAddressComplete = await checkoutPage.setAddress(page, newAddressData);
-      await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
     });
   });
 
@@ -175,7 +175,7 @@ describe('FO - Checkout - Addresses : CRUD address', async () => {
       await checkoutPage.clickOnEditAddressesStep(page);
 
       const addressesNumber = await checkoutPage.getNumberOfAddresses(page);
-      await expect(addressesNumber, 'The addresses number is not equal to 1!').to.equal(2);
+      expect(addressesNumber, 'The addresses number is not equal to 1!').to.equal(2);
     });
 
     it('should click on \'Billing address differs from shipping address\' link', async function () {
@@ -184,7 +184,7 @@ describe('FO - Checkout - Addresses : CRUD address', async () => {
       await checkoutPage.clickOnDifferentInvoiceAddressLink(page);
 
       const isInvoiceAddressBlockVisible = await checkoutPage.isInvoiceAddressBlockVisible(page);
-      await expect(isInvoiceAddressBlockVisible).to.be.true;
+      expect(isInvoiceAddressBlockVisible).to.eq(true);
     });
 
     it('should create new invoice address', async function () {
@@ -193,7 +193,7 @@ describe('FO - Checkout - Addresses : CRUD address', async () => {
       await checkoutPage.clickOnAddNewInvoiceAddressButton(page);
 
       const isStepAddressComplete = await checkoutPage.setInvoiceAddress(page, newInvoiceAddressData);
-      await expect(isStepAddressComplete).to.be.true;
+      expect(isStepAddressComplete).to.eq(true);
     });
 
     it('should check the number of delivered addresses', async function () {
@@ -202,14 +202,14 @@ describe('FO - Checkout - Addresses : CRUD address', async () => {
       await checkoutPage.clickOnEditAddressesStep(page);
 
       const addressesNumber = await checkoutPage.getNumberOfAddresses(page);
-      await expect(addressesNumber, 'The addresses number is not equal to 3!').to.equal(3);
+      expect(addressesNumber, 'The addresses number is not equal to 3!').to.equal(3);
     });
 
     it('should check the number of invoice addresses', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkNumberOfAddresses2', baseContext);
 
       const addressesNumber = await checkoutPage.getNumberOfInvoiceAddresses(page);
-      await expect(addressesNumber).to.equal(3);
+      expect(addressesNumber).to.equal(3);
     });
   });
 
@@ -218,7 +218,7 @@ describe('FO - Checkout - Addresses : CRUD address', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteFirstAddress', baseContext);
 
       const textMessage = await checkoutPage.deleteAddress(page, 3);
-      await expect(textMessage).to.equal(checkoutPage.deleteAddressSuccessMessage);
+      expect(textMessage).to.equal(checkoutPage.deleteAddressSuccessMessage);
     });
 
     it('should check the number of delivered addresses', async function () {
@@ -227,14 +227,14 @@ describe('FO - Checkout - Addresses : CRUD address', async () => {
       await checkoutPage.clickOnEditAddressesStep(page);
 
       const addressesNumber = await checkoutPage.getNumberOfAddresses(page);
-      await expect(addressesNumber, 'The addresses number is not equal to 2!').to.equal(2);
+      expect(addressesNumber, 'The addresses number is not equal to 2!').to.equal(2);
     });
 
     it('should check the number of invoice addresses', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkNumberOfAddresses4', baseContext);
 
       const addressesNumber = await checkoutPage.getNumberOfInvoiceAddresses(page);
-      await expect(addressesNumber).to.equal(2);
+      expect(addressesNumber).to.equal(2);
     });
   });
 
@@ -246,7 +246,7 @@ describe('FO - Checkout - Addresses : CRUD address', async () => {
       await checkoutPage.selectInvoiceAddress(page, 2);
 
       const isStepCompleted = await checkoutPage.clickOnContinueButtonFromAddressStep(page);
-      await expect(isStepCompleted).to.be.true;
+      expect(isStepCompleted).to.eq(true);
     });
 
     it('should check the number of delivered addresses', async function () {
@@ -255,14 +255,14 @@ describe('FO - Checkout - Addresses : CRUD address', async () => {
       await checkoutPage.clickOnEditAddressesStep(page);
 
       const addressesNumber = await checkoutPage.getNumberOfAddresses(page);
-      await expect(addressesNumber, 'The addresses number is not equal to 2!').to.equal(2);
+      expect(addressesNumber, 'The addresses number is not equal to 2!').to.equal(2);
     });
 
     it('should check the number of invoice addresses', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkNumberOfAddresses6', baseContext);
 
       const addressesNumber = await checkoutPage.getNumberOfInvoiceAddresses(page);
-      await expect(addressesNumber).to.equal(2);
+      expect(addressesNumber).to.equal(2);
     });
   });
 
@@ -274,7 +274,7 @@ describe('FO - Checkout - Addresses : CRUD address', async () => {
       await checkoutPage.selectInvoiceAddress(page, 1);
 
       const isStepCompleted = await checkoutPage.clickOnContinueButtonFromAddressStep(page);
-      await expect(isStepCompleted).to.be.true;
+      expect(isStepCompleted).to.eq(true);
     });
 
     it('should click on edit address step and check that there is no invoice address', async function () {
@@ -283,7 +283,7 @@ describe('FO - Checkout - Addresses : CRUD address', async () => {
       await checkoutPage.clickOnEditAddressesStep(page);
 
       const isInvoiceAddressBlockVisible = await checkoutPage.isInvoiceAddressBlockVisible(page);
-      await expect(isInvoiceAddressBlockVisible).to.be.false;
+      expect(isInvoiceAddressBlockVisible).to.eq(false);
     });
   });
 
@@ -292,17 +292,17 @@ describe('FO - Checkout - Addresses : CRUD address', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteTwoAddresses', baseContext);
 
       let textMessage = await checkoutPage.deleteAddress(page);
-      await expect(textMessage).to.equal(checkoutPage.deleteAddressSuccessMessage);
+      expect(textMessage).to.equal(checkoutPage.deleteAddressSuccessMessage);
 
       textMessage = await checkoutPage.deleteAddress(page);
-      await expect(textMessage).to.equal(checkoutPage.deleteAddressSuccessMessage);
+      expect(textMessage).to.equal(checkoutPage.deleteAddressSuccessMessage);
     });
 
     it('should check that the form for create address is visible', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkCreateAddressForm', baseContext);
 
       const isFormVisible = await checkoutPage.isAddressFormVisible(page);
-      await expect(isFormVisible).to.be.true;
+      expect(isFormVisible).to.eq(true);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/FO/classic/11_checkout/02_addresses/02_useDifferentAddressForInvoice.ts b/tests/UI/campaigns/functional/FO/classic/11_checkout/02_addresses/02_useDifferentAddressForInvoice.ts
index 5e3738c7e2727..ad51ea223661a 100644
--- a/tests/UI/campaigns/functional/FO/classic/11_checkout/02_addresses/02_useDifferentAddressForInvoice.ts
+++ b/tests/UI/campaigns/functional/FO/classic/11_checkout/02_addresses/02_useDifferentAddressForInvoice.ts
@@ -74,7 +74,7 @@ describe('FO - Guest checkout: Use different invoice address', async () => {
       await foHomePage.changeLanguage(page, 'en');
 
       const isHomePage = await foHomePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should go to fourth product page', async function () {
@@ -83,7 +83,7 @@ describe('FO - Guest checkout: Use different invoice address', async () => {
       await foHomePage.goToProductPage(page, 4);
 
       const pageTitle = await foProductPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(Products.demo_5.name);
+      expect(pageTitle).to.contains(Products.demo_5.name);
     });
 
     it('should add product to cart and go to cart page', async function () {
@@ -92,7 +92,7 @@ describe('FO - Guest checkout: Use different invoice address', async () => {
       await foProductPage.addProductToTheCart(page, 1);
 
       const pageTitle = await cartPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(cartPage.pageTitle);
+      expect(pageTitle).to.equal(cartPage.pageTitle);
     });
 
     it('should validate shopping cart and go to checkout page', async function () {
@@ -102,21 +102,21 @@ describe('FO - Guest checkout: Use different invoice address', async () => {
       await cartPage.clickOnProceedToCheckout(page);
 
       const isCheckoutPage = await foCheckoutPage.isCheckoutPage(page);
-      await expect(isCheckoutPage).to.be.true;
+      expect(isCheckoutPage).to.eq(true);
     });
 
     it('should fill customer information', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'fillCustomerInformation', baseContext);
 
       const isStepCompleted = await foCheckoutPage.setGuestPersonalInformation(page, guestData);
-      await expect(isStepCompleted).to.be.true;
+      expect(isStepCompleted).to.eq(true);
     });
 
     it('should fill different delivery and invoice addresses', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'fillCustomerAddresses', baseContext);
 
       const isStepCompleted = await foCheckoutPage.setAddress(page, deliveryAddress, invoiceAddress);
-      await expect(isStepCompleted).to.be.true;
+      expect(isStepCompleted).to.eq(true);
     });
 
     it('should complete the order', async function () {
@@ -124,14 +124,14 @@ describe('FO - Guest checkout: Use different invoice address', async () => {
 
       // Delivery step - Go to payment step
       const isStepDeliveryComplete = await foCheckoutPage.goToPaymentStep(page);
-      await expect(isStepDeliveryComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepDeliveryComplete, 'Step Address is not complete').to.eq(true);
 
       // Payment step - Choose payment step
       await foCheckoutPage.choosePaymentAndOrder(page, PaymentMethods.wirePayment.moduleName);
       const cardTitle = await orderConfirmationPage.getOrderConfirmationCardTitle(page);
 
       // Check the confirmation message
-      await expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
+      expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
     });
   });
 
@@ -151,14 +151,14 @@ describe('FO - Guest checkout: Use different invoice address', async () => {
       await ordersPage.closeSfToolBar(page);
 
       const pageTitle = await ordersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(ordersPage.pageTitle);
+      expect(pageTitle).to.contains(ordersPage.pageTitle);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilter', baseContext);
 
       const numberOfOrders = await ordersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfOrders).to.be.above(0);
+      expect(numberOfOrders).to.be.above(0);
     });
 
     it(`should filter the Orders table by 'Customer: ${guestData.lastName}'`, async function () {
@@ -168,7 +168,7 @@ describe('FO - Guest checkout: Use different invoice address', async () => {
       await ordersPage.filterOrders(page, 'input', 'customer', guestData.lastName);
 
       const textColumn = await ordersPage.getTextColumn(page, 'customer', 1);
-      await expect(textColumn).to.contains(guestData.lastName);
+      expect(textColumn).to.contains(guestData.lastName);
     });
 
     it('should view the order', async function () {
@@ -177,7 +177,7 @@ describe('FO - Guest checkout: Use different invoice address', async () => {
       await ordersPage.goToOrder(page, 1);
 
       const pageTitle = await orderPageCustomerBlock.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderPageCustomerBlock.pageTitle);
+      expect(pageTitle).to.contains(orderPageCustomerBlock.pageTitle);
     });
 
     it('should check that invoice and delivery addresses are different', async function () {
@@ -186,7 +186,7 @@ describe('FO - Guest checkout: Use different invoice address', async () => {
       const finalDeliveryAddress = await orderPageCustomerBlock.getShippingAddress(page);
       const finalInvoiceAddress = await orderPageCustomerBlock.getInvoiceAddress(page);
 
-      await expect(
+      expect(
         finalDeliveryAddress.replace('Shipping', ''),
         'Invoice and delivery addresses shouldn\'t be the same',
       )
diff --git a/tests/UI/campaigns/functional/FO/classic/11_checkout/03_shippingMethods/01_addOrderMessage.ts b/tests/UI/campaigns/functional/FO/classic/11_checkout/03_shippingMethods/01_addOrderMessage.ts
index 282b60186bef8..6c027b3b82b60 100644
--- a/tests/UI/campaigns/functional/FO/classic/11_checkout/03_shippingMethods/01_addOrderMessage.ts
+++ b/tests/UI/campaigns/functional/FO/classic/11_checkout/03_shippingMethods/01_addOrderMessage.ts
@@ -63,7 +63,7 @@ describe('FO - Checkout - Shipping methods : Add order message', async () => {
     await homePage.changeLanguage(page, 'en');
 
     const isHomePage = await homePage.isHomePage(page);
-    await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+    expect(isHomePage, 'Fail to open FO home page').to.eq(true);
   });
 
   it('should go to login page', async function () {
@@ -72,7 +72,7 @@ describe('FO - Checkout - Shipping methods : Add order message', async () => {
     await homePage.goToLoginPage(page);
 
     const pageTitle = await loginPage.getPageTitle(page);
-    await expect(pageTitle, 'Fail to open FO login page').to.contains(loginPage.pageTitle);
+    expect(pageTitle, 'Fail to open FO login page').to.contains(loginPage.pageTitle);
   });
 
   it('should sign in with customer credentials', async function () {
@@ -81,7 +81,7 @@ describe('FO - Checkout - Shipping methods : Add order message', async () => {
     await loginPage.customerLogin(page, Customers.johnDoe);
 
     const isCustomerConnected = await loginPage.isCustomerConnected(page);
-    await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+    expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
   });
 
   it('should add product to cart', async function () {
@@ -95,7 +95,7 @@ describe('FO - Checkout - Shipping methods : Add order message', async () => {
     await productPage.addProductToTheCart(page);
 
     const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
-    await expect(notificationsNumber).to.be.equal(1);
+    expect(notificationsNumber).to.be.equal(1);
   });
 
   it('should go to delivery step', async function () {
@@ -106,7 +106,7 @@ describe('FO - Checkout - Shipping methods : Add order message', async () => {
 
     // Address step - Go to delivery step
     const isStepAddressComplete = await checkoutPage.goToDeliveryStep(page);
-    await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+    expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
   });
 
   it(`should select '${Carriers.myCarrier.name}' and add a message`, async function () {
@@ -117,7 +117,7 @@ describe('FO - Checkout - Shipping methods : Add order message', async () => {
       Carriers.myCarrier.id,
       message,
     );
-    await expect(isPaymentStepDisplayed, 'Payment Step is not displayed').to.be.true;
+    expect(isPaymentStepDisplayed, 'Payment Step is not displayed').to.eq(true);
   });
 
   it('should click on edit \'Shipping methods\' step and check the order message', async function () {
@@ -126,7 +126,7 @@ describe('FO - Checkout - Shipping methods : Add order message', async () => {
     await checkoutPage.clickOnEditShippingMethodStep(page);
 
     const orderMessage = await checkoutPage.getOrderMessage(page);
-    await expect(orderMessage).to.equal(message);
+    expect(orderMessage).to.equal(message);
   });
 
   it(`should choose the other carrier '${Carriers.default.name}' and edit the order message`, async function () {
@@ -135,7 +135,7 @@ describe('FO - Checkout - Shipping methods : Add order message', async () => {
     await checkoutPage.chooseShippingMethodWithoutValidation(page, Carriers.default.id, editMessage);
 
     const isPaymentStep = await checkoutPage.goToPaymentStep(page);
-    await expect(isPaymentStep).to.be.true;
+    expect(isPaymentStep).to.eq(true);
   });
 
   it('should choose a payment method and validate the order', async function () {
@@ -145,7 +145,7 @@ describe('FO - Checkout - Shipping methods : Add order message', async () => {
 
     // Check the confirmation message
     const cardTitle: string = await orderConfirmationPage.getOrderConfirmationCardTitle(page);
-    await expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
+    expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
   });
 
   it('should go to order history and details page', async function () {
@@ -155,7 +155,7 @@ describe('FO - Checkout - Shipping methods : Add order message', async () => {
     await myAccountPage.goToHistoryAndDetailsPage(page);
 
     const pageHeaderTitle = await orderHistoryPage.getPageTitle(page);
-    await expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
+    expect(pageHeaderTitle).to.equal(orderHistoryPage.pageTitle);
   });
 
   it('Go to order details abd check the messages box', async function () {
@@ -164,6 +164,6 @@ describe('FO - Checkout - Shipping methods : Add order message', async () => {
     await orderHistoryPage.goToDetailsPage(page);
 
     const orderMessage = await orderDetailsPage.getBoxMessages(page);
-    await expect(orderMessage).to.contain(editMessage);
+    expect(orderMessage).to.contain(editMessage);
   });
 });
diff --git a/tests/UI/campaigns/functional/FO/classic/11_checkout/03_shippingMethods/02_selectCarrier.ts b/tests/UI/campaigns/functional/FO/classic/11_checkout/03_shippingMethods/02_selectCarrier.ts
index 49f41758d2afc..1012239ce95e0 100644
--- a/tests/UI/campaigns/functional/FO/classic/11_checkout/03_shippingMethods/02_selectCarrier.ts
+++ b/tests/UI/campaigns/functional/FO/classic/11_checkout/03_shippingMethods/02_selectCarrier.ts
@@ -68,7 +68,7 @@ describe('FO - Checkout - Shipping methods : Select carrier', async () => {
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should go to first product page', async function () {
@@ -77,7 +77,7 @@ describe('FO - Checkout - Shipping methods : Select carrier', async () => {
       await homePage.goToProductPage(page, 1);
 
       const pageTitle = await productPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(Products.demo_1.name);
+      expect(pageTitle).to.contains(Products.demo_1.name);
     });
 
     it('should add product to cart and go to cart page', async function () {
@@ -86,7 +86,7 @@ describe('FO - Checkout - Shipping methods : Select carrier', async () => {
       await productPage.addProductToTheCart(page);
 
       const pageTitle = await cartPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(cartPage.pageTitle);
+      expect(pageTitle).to.equal(cartPage.pageTitle);
     });
 
     it('should validate shopping cart and go to checkout page', async function () {
@@ -95,7 +95,7 @@ describe('FO - Checkout - Shipping methods : Select carrier', async () => {
       await cartPage.clickOnProceedToCheckout(page);
 
       const isCheckoutPage = await checkoutPage.isCheckoutPage(page);
-      await expect(isCheckoutPage).to.be.true;
+      expect(isCheckoutPage).to.eq(true);
     });
 
     it('should sign in by created customer', async function () {
@@ -104,7 +104,7 @@ describe('FO - Checkout - Shipping methods : Select carrier', async () => {
       await checkoutPage.clickOnSignIn(page);
 
       const isCustomerConnected = await checkoutPage.customerLogin(page, customerData);
-      await expect(isCustomerConnected, 'Customer is not connected!').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected!').to.eq(true);
     });
   });
 
@@ -113,14 +113,14 @@ describe('FO - Checkout - Shipping methods : Select carrier', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'createAddress', baseContext);
 
       const isStepAddressComplete = await checkoutPage.setAddress(page, addressData);
-      await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
     });
 
     it('should check the carriers list', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkCarriersList', baseContext);
 
       const carriers = await checkoutPage.getAllCarriersNames(page);
-      await expect(carriers).to.deep.equal([Carriers.default.name, Carriers.myCarrier.name]);
+      expect(carriers).to.deep.equal([Carriers.default.name, Carriers.myCarrier.name]);
     });
 
     it('should check the first carrier data', async function () {
@@ -171,7 +171,7 @@ describe('FO - Checkout - Shipping methods : Select carrier', async () => {
       await checkoutPage.clickOnEditAddressesStep(page);
 
       const addressesNumber = await checkoutPage.getNumberOfAddresses(page);
-      await expect(addressesNumber, 'The addresses number is not equal to 1!').to.equal(1);
+      expect(addressesNumber, 'The addresses number is not equal to 1!').to.equal(1);
     });
 
     it('should edit the created address', async function () {
@@ -181,14 +181,14 @@ describe('FO - Checkout - Shipping methods : Select carrier', async () => {
       await checkoutPage.setAddress(page, addressDataInUnitedStates);
 
       const isStepCompleted = await checkoutPage.clickOnContinueButtonFromAddressStep(page);
-      await expect(isStepCompleted).to.be.true;
+      expect(isStepCompleted).to.eq(true);
     });
 
     it('should check the carriers list', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkCarriersList2', baseContext);
 
       const carriers = await checkoutPage.getAllCarriersNames(page);
-      await expect(carriers).to.deep.equal([Carriers.myCarrier.name]);
+      expect(carriers).to.deep.equal([Carriers.myCarrier.name]);
     });
 
     it('should check the carrier data', async function () {
diff --git a/tests/UI/campaigns/functional/FO/classic/12_orderConfirmation/05_contactUs.ts b/tests/UI/campaigns/functional/FO/classic/12_orderConfirmation/05_contactUs.ts
index dc3da625cd896..52f876fae13e8 100644
--- a/tests/UI/campaigns/functional/FO/classic/12_orderConfirmation/05_contactUs.ts
+++ b/tests/UI/campaigns/functional/FO/classic/12_orderConfirmation/05_contactUs.ts
@@ -81,7 +81,7 @@ describe('FO - Order confirmation : Contact us', async () => {
 
       await foHomePage.goTo(page, global.FO.URL);
       const result = await foHomePage.isHomePage(page);
-      await expect(result).to.be.true;
+      expect(result).to.eq(true);
     });
 
     it('should go to login page', async function () {
@@ -90,7 +90,7 @@ describe('FO - Order confirmation : Contact us', async () => {
       await foHomePage.goToLoginPage(page);
 
       const pageHeaderTitle = await foLoginPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.equal(foLoginPage.pageTitle);
+      expect(pageHeaderTitle).to.equal(foLoginPage.pageTitle);
     });
 
     it('should sign in FO', async function () {
@@ -98,7 +98,7 @@ describe('FO - Order confirmation : Contact us', async () => {
 
       await foLoginPage.customerLogin(page, Customers.johnDoe);
       const isCustomerConnected = await myAccountPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
 
     it('should go to home page', async function () {
@@ -106,7 +106,7 @@ describe('FO - Order confirmation : Contact us', async () => {
 
       await foHomePage.goToHomePage(page);
       const result = await foHomePage.isHomePage(page);
-      await expect(result).to.be.true;
+      expect(result).to.eq(true);
     });
 
     it('should add first product to cart and Proceed to checkout', async function () {
@@ -115,7 +115,7 @@ describe('FO - Order confirmation : Contact us', async () => {
       await foHomePage.addProductToCartByQuickView(page, 1, 1);
       await foHomePage.proceedToCheckout(page);
       const pageTitle = await cartPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(cartPage.pageTitle);
+      expect(pageTitle).to.equal(cartPage.pageTitle);
     });
 
     it('should check the cart details', async function () {
@@ -135,26 +135,26 @@ describe('FO - Order confirmation : Contact us', async () => {
       await cartPage.clickOnProceedToCheckout(page);
 
       const isCheckoutPage = await checkoutPage.isCheckoutPage(page);
-      await expect(isCheckoutPage, 'Browser is not in checkout Page').to.be.true;
+      expect(isCheckoutPage, 'Browser is not in checkout Page').to.eq(true);
 
       const isStepPersonalInformationComplete = await checkoutPage.isStepCompleted(
         page,
         checkoutPage.personalInformationStepForm,
       );
-      await expect(isStepPersonalInformationComplete, 'Step Personal information is not complete').to.be.true;
+      expect(isStepPersonalInformationComplete, 'Step Personal information is not complete').to.eq(true);
     });
 
     it('should validate Step Address and go to Delivery Step', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkDeliveryStep', baseContext);
       const isStepAddressComplete = await checkoutPage.goToDeliveryStep(page);
-      await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
     });
 
     it('should validate Step Delivery and go to Payment Step', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'goToPaymentStep', baseContext);
 
       const isStepDeliveryComplete = await checkoutPage.goToPaymentStep(page);
-      await expect(isStepDeliveryComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepDeliveryComplete, 'Step Address is not complete').to.eq(true);
     });
 
     it('should Pay by back wire and confirm order', async function () {
@@ -162,10 +162,10 @@ describe('FO - Order confirmation : Contact us', async () => {
 
       await checkoutPage.choosePaymentAndOrder(page, PaymentMethods.wirePayment.moduleName);
       const pageTitle = await orderConfirmationPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(orderConfirmationPage.pageTitle);
+      expect(pageTitle).to.equal(orderConfirmationPage.pageTitle);
 
       const cardTitle = await orderConfirmationPage.getOrderConfirmationCardTitle(page);
-      await expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
+      expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
     });
   });
 
@@ -175,7 +175,7 @@ describe('FO - Order confirmation : Contact us', async () => {
 
       contactUsData.reference = await orderConfirmationPage.getOrderReferenceValue(page);
       contactUsData.message += ` ${contactUsData.reference}`;
-      await expect(contactUsData.reference).to.not.be.empty;
+      expect(contactUsData.reference).to.not.have.lengthOf(0);
     });
 
     it('should go to the "contact us" page', async function () {
@@ -184,7 +184,7 @@ describe('FO - Order confirmation : Contact us', async () => {
       await orderConfirmationPage.goToContactUsPage(page);
 
       const pageTitle = await contactUsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(contactUsPage.pageTitle);
+      expect(pageTitle).to.contains(contactUsPage.pageTitle);
     });
   });
 
@@ -193,7 +193,7 @@ describe('FO - Order confirmation : Contact us', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'checkTheFormInfos', baseContext);
 
       const emailFieldValue = await contactUsPage.getEmailFieldValue(page);
-      await expect(emailFieldValue).to.contains(Customers.johnDoe.email);
+      expect(emailFieldValue).to.contains(Customers.johnDoe.email);
     });
 
     it('should send the message', async function () {
@@ -202,7 +202,7 @@ describe('FO - Order confirmation : Contact us', async () => {
       await contactUsPage.sendMessage(page, contactUsData, filename);
 
       const sendMessageSuccessAlert = await contactUsPage.getAlertSuccess(page);
-      await expect(sendMessageSuccessAlert).to.contains(contactUsPage.validationMessage);
+      expect(sendMessageSuccessAlert).to.contains(contactUsPage.validationMessage);
     });
   });
 
@@ -221,7 +221,7 @@ describe('FO - Order confirmation : Contact us', async () => {
       );
 
       const pageTitle = await customerServiceMainPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customerServiceMainPage.pageTitle);
+      expect(pageTitle).to.contains(customerServiceMainPage.pageTitle);
     });
 
     it('should go to the message detailed view', async function () {
@@ -230,15 +230,15 @@ describe('FO - Order confirmation : Contact us', async () => {
       await customerServiceMainPage.goToViewMessagePage(page);
 
       const pageTitle = await customerServiceMessageViewPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customerServiceMessageViewPage.pageTitle);
+      expect(pageTitle).to.contains(customerServiceMessageViewPage.pageTitle);
     });
 
     it('should check the message content and uploaded file', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkMessageContentAndFile', baseContext);
 
       const messageContent = await customerServiceMessageViewPage.getCustomerMessage(page);
-      await expect(messageContent).to.contains(contactUsData.message);
-      await expect(messageContent).to.contains('Attachment');
+      expect(messageContent).to.contains(contactUsData.message);
+      expect(messageContent).to.contains('Attachment');
     });
 
     it('should go back to customer service page', async function () {
@@ -251,14 +251,14 @@ describe('FO - Order confirmation : Contact us', async () => {
       );
 
       const pageTitle = await customerServiceMainPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customerServiceMainPage.pageTitle);
+      expect(pageTitle).to.contains(customerServiceMainPage.pageTitle);
     });
 
     it('should delete the message', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteMessage', baseContext);
 
       const deleteMessageSuccessText = await customerServiceMainPage.deleteMessage(page, 1);
-      await expect(deleteMessageSuccessText).to.contains(customerServiceMainPage.deleteMessageSuccessAlertText);
+      expect(deleteMessageSuccessText).to.contains(customerServiceMainPage.deleteMessageSuccessAlertText);
     });
   });
 });
diff --git a/tests/UI/campaigns/functional/FO/hummingbird/01_login/01_passwordReminder.ts b/tests/UI/campaigns/functional/FO/hummingbird/01_login/01_passwordReminder.ts
index 0c2f7f0f413d5..3015dbbe9601d 100644
--- a/tests/UI/campaigns/functional/FO/hummingbird/01_login/01_passwordReminder.ts
+++ b/tests/UI/campaigns/functional/FO/hummingbird/01_login/01_passwordReminder.ts
@@ -85,7 +85,7 @@ describe('FO - Login : Password reminder', async () => {
       await homePage.goTo(page, global.FO.URL);
 
       const result = await homePage.isHomePage(page);
-      await expect(result).to.be.true;
+      expect(result).to.eq(true);
     });
 
     it('should go to login page', async function () {
@@ -94,7 +94,7 @@ describe('FO - Login : Password reminder', async () => {
       await homePage.goToLoginPage(page);
 
       const pageTitle = await loginPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(loginPage.pageTitle);
+      expect(pageTitle).to.equal(loginPage.pageTitle);
     });
 
     it('should click on \'Forgot your password?\' link', async function () {
@@ -103,7 +103,7 @@ describe('FO - Login : Password reminder', async () => {
       await loginPage.goToPasswordReminderPage(page);
 
       const pageTitle = await passwordReminderPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(passwordReminderPage.pageTitle);
+      expect(pageTitle).to.equal(passwordReminderPage.pageTitle);
     });
 
     it('should set the email address and send reset link', async function () {
@@ -112,13 +112,13 @@ describe('FO - Login : Password reminder', async () => {
       await passwordReminderPage.sendResetPasswordLink(page, customerData.email);
 
       const successAlertContent = await passwordReminderPage.checkResetLinkSuccess(page);
-      await expect(successAlertContent).to.contains(customerData.email);
+      expect(successAlertContent).to.contains(customerData.email);
     });
 
     it('should check if reset password mail is in mailbox', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkResetPasswordMail', baseContext);
 
-      await expect(newMail.subject).to.contains(resetPasswordMailSubject);
+      expect(newMail.subject).to.contains(resetPasswordMailSubject);
     });
 
     it('should open reset password link', async function () {
@@ -127,14 +127,14 @@ describe('FO - Login : Password reminder', async () => {
       await passwordReminderPage.openForgotPasswordPage(page, newMail.text);
 
       const pageTitle = await passwordReminderPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(passwordReminderPage.pageTitle);
+      expect(pageTitle).to.equal(passwordReminderPage.pageTitle);
     });
 
     it('should check the email address to reset password', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkEmailAddress', baseContext);
 
       const emailAddress = await passwordReminderPage.getEmailAddressToReset(page);
-      await expect(emailAddress).to.contains(customerData.email);
+      expect(emailAddress).to.contains(customerData.email);
     });
 
     it('should change the password and check the validation message', async function () {
@@ -143,7 +143,7 @@ describe('FO - Login : Password reminder', async () => {
       await passwordReminderPage.setNewPassword(page, newPassword);
 
       const successMessage = await myAccountPage.getSuccessMessageAlert(page);
-      await expect(successMessage).to.equal(`${myAccountPage.resetPasswordSuccessMessage} ${customerData.email}`);
+      expect(successMessage).to.equal(`${myAccountPage.resetPasswordSuccessMessage} ${customerData.email}`);
     });
 
     it('should logout from FO', async function () {
@@ -151,7 +151,7 @@ describe('FO - Login : Password reminder', async () => {
 
       await myAccountPage.logout(page);
       const isCustomerConnected = await myAccountPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is connected').to.be.false;
+      expect(isCustomerConnected, 'Customer is connected').to.eq(false);
     });
 
     it('should try to login with old password and check the error message', async function () {
@@ -160,7 +160,7 @@ describe('FO - Login : Password reminder', async () => {
       await loginPage.customerLogin(page, customerData, false);
 
       const loginError = await loginPage.getLoginError(page);
-      await expect(loginError).to.contains(loginPage.loginErrorText);
+      expect(loginError).to.contains(loginPage.loginErrorText);
     });
 
     it('should sign in with new password', async function () {
@@ -169,7 +169,7 @@ describe('FO - Login : Password reminder', async () => {
       await loginPage.customerLogin(page, customerNewPassword);
 
       const isCustomerConnected = await myAccountPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
 
     it('should logout from FO', async function () {
@@ -178,7 +178,7 @@ describe('FO - Login : Password reminder', async () => {
       await myAccountPage.logout(page);
 
       const isCustomerConnected = await myAccountPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is connected').to.be.false;
+      expect(isCustomerConnected, 'Customer is connected').to.eq(false);
     });
 
     it('should click on \'Forgot your password?\' link', async function () {
@@ -187,7 +187,7 @@ describe('FO - Login : Password reminder', async () => {
       await loginPage.goToPasswordReminderPage(page);
 
       const pageTitle = await passwordReminderPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(passwordReminderPage.pageTitle);
+      expect(pageTitle).to.equal(passwordReminderPage.pageTitle);
     });
 
     it('should set the customer email and check the error alert', async function () {
@@ -196,7 +196,7 @@ describe('FO - Login : Password reminder', async () => {
       await passwordReminderPage.sendResetPasswordLink(page, customerData.email);
 
       const regeneratePasswordAlert = await passwordReminderPage.getErrorMessage(page);
-      await expect(regeneratePasswordAlert).to.contains(passwordReminderPage.errorMessage);
+      expect(regeneratePasswordAlert).to.contains(passwordReminderPage.errorMessage);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/FO/hummingbird/01_login/02_login.ts b/tests/UI/campaigns/functional/FO/hummingbird/01_login/02_login.ts
index cc78c825a6479..f28c33bda9abc 100644
--- a/tests/UI/campaigns/functional/FO/hummingbird/01_login/02_login.ts
+++ b/tests/UI/campaigns/functional/FO/hummingbird/01_login/02_login.ts
@@ -46,7 +46,7 @@ describe('FO - Login : Login in FO', async () => {
       await homePage.goTo(page, global.FO.URL);
 
       const result = await homePage.isHomePage(page);
-      await expect(result).to.be.true;
+      expect(result).to.eq(true);
     });
 
     it('should go to login page', async function () {
@@ -55,7 +55,7 @@ describe('FO - Login : Login in FO', async () => {
       await homePage.goToLoginPage(page);
 
       const pageTitle = await loginPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(loginPage.pageTitle);
+      expect(pageTitle).to.equal(loginPage.pageTitle);
     });
 
     it('should enter an invalid credentials', async function () {
@@ -64,7 +64,7 @@ describe('FO - Login : Login in FO', async () => {
       await loginPage.customerLogin(page, firstCredentialsData, false);
 
       const loginError = await loginPage.getLoginError(page);
-      await expect(loginError).to.contains(loginPage.loginErrorText);
+      expect(loginError).to.contains(loginPage.loginErrorText);
     });
 
     it('should enter an invalid email', async function () {
@@ -73,7 +73,7 @@ describe('FO - Login : Login in FO', async () => {
       await loginPage.customerLogin(page, secondCredentialsData, false);
 
       const loginError = await loginPage.getLoginError(page);
-      await expect(loginError).to.contains(loginPage.loginErrorText);
+      expect(loginError).to.contains(loginPage.loginErrorText);
     });
 
     it('should enter an invalid password', async function () {
@@ -82,21 +82,21 @@ describe('FO - Login : Login in FO', async () => {
       await loginPage.customerLogin(page, thirdCredentialsData, false);
 
       const loginError = await loginPage.getLoginError(page);
-      await expect(loginError).to.contains(loginPage.loginErrorText);
+      expect(loginError).to.contains(loginPage.loginErrorText);
     });
 
     it('should check password type', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkPasswordType', baseContext);
 
       const inputType = await loginPage.getPasswordType(page);
-      await expect(inputType).to.equal('password');
+      expect(inputType).to.equal('password');
     });
 
     it('should click on show button and check the password', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnShowButton', baseContext);
 
       const inputType = await loginPage.showPassword(page);
-      await expect(inputType).to.equal('text');
+      expect(inputType).to.equal('text');
     });
 
     it('should enter a valid credentials', async function () {
@@ -105,10 +105,10 @@ describe('FO - Login : Login in FO', async () => {
       await loginPage.customerLogin(page, Customers.johnDoe);
 
       const isCustomerConnected = await loginPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected!').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected!').to.eq(true);
 
       const result = await homePage.isHomePage(page);
-      await expect(result).to.be.true;
+      expect(result).to.eq(true);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/FO/hummingbird/01_login/03_logout.ts b/tests/UI/campaigns/functional/FO/hummingbird/01_login/03_logout.ts
index 9951cf86bd8c2..2648ef9acb954 100644
--- a/tests/UI/campaigns/functional/FO/hummingbird/01_login/03_logout.ts
+++ b/tests/UI/campaigns/functional/FO/hummingbird/01_login/03_logout.ts
@@ -42,7 +42,7 @@ describe('FO - Login : Logout from FO', async () => {
       await homePage.goTo(page, global.FO.URL);
 
       const result = await homePage.isHomePage(page);
-      await expect(result).to.be.true;
+      expect(result).to.eq(true);
     });
 
     it('should go to login page', async function () {
@@ -51,7 +51,7 @@ describe('FO - Login : Logout from FO', async () => {
       await homePage.goToLoginPage(page);
 
       const pageTitle = await loginPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(loginPage.pageTitle);
+      expect(pageTitle).to.equal(loginPage.pageTitle);
     });
 
     it('should sign in with default customer', async function () {
@@ -60,7 +60,7 @@ describe('FO - Login : Logout from FO', async () => {
       await loginPage.customerLogin(page, Customers.johnDoe);
 
       const isCustomerConnected = await loginPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
 
     it('should logout by the link in the header', async function () {
@@ -69,7 +69,7 @@ describe('FO - Login : Logout from FO', async () => {
       await homePage.logout(page);
 
       const isCustomerConnected = await homePage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is connected!').to.be.false;
+      expect(isCustomerConnected, 'Customer is connected!').to.eq(false);
     });
 
     it('should sign in with default customer', async function () {
@@ -79,7 +79,7 @@ describe('FO - Login : Logout from FO', async () => {
       await loginPage.customerLogin(page, Customers.johnDoe);
 
       const isCustomerConnected = await loginPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected!').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected!').to.eq(true);
     });
 
     it('should go to my account page', async function () {
@@ -88,7 +88,7 @@ describe('FO - Login : Logout from FO', async () => {
       await homePage.goToMyAccountPage(page);
 
       const pageTitle = await myAccountPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(myAccountPage.pageTitle);
+      expect(pageTitle).to.equal(myAccountPage.pageTitle);
     });
 
     it('should logout by the link in the footer of account page', async function () {
@@ -97,7 +97,7 @@ describe('FO - Login : Logout from FO', async () => {
       await myAccountPage.logout(page);
 
       const isCustomerConnected = await myAccountPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is connected!').to.be.false;
+      expect(isCustomerConnected, 'Customer is connected!').to.eq(false);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/FO/hummingbird/01_login/04_createAccount.ts b/tests/UI/campaigns/functional/FO/hummingbird/01_login/04_createAccount.ts
index 54e8d3b2baa4e..4f3d090fb11a3 100644
--- a/tests/UI/campaigns/functional/FO/hummingbird/01_login/04_createAccount.ts
+++ b/tests/UI/campaigns/functional/FO/hummingbird/01_login/04_createAccount.ts
@@ -45,7 +45,7 @@ describe('FO - Login : Create account', async () => {
       await homePage.goTo(page, global.FO.URL);
 
       const result = await homePage.isHomePage(page);
-      await expect(result).to.be.true;
+      expect(result).to.eq(true);
     });
 
     it('should go to login page', async function () {
@@ -54,7 +54,7 @@ describe('FO - Login : Create account', async () => {
       await homePage.goToLoginPage(page);
 
       const pageTitle = await loginPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(loginPage.pageTitle);
+      expect(pageTitle).to.equal(loginPage.pageTitle);
     });
 
     it('should go to create account page', async function () {
@@ -63,7 +63,7 @@ describe('FO - Login : Create account', async () => {
       await loginPage.goToCreateAccountPage(page);
 
       const pageHeaderTitle = await createAccountPage.getHeaderTitle(page);
-      await expect(pageHeaderTitle).to.equal(createAccountPage.formTitle);
+      expect(pageHeaderTitle).to.equal(createAccountPage.formTitle);
     });
 
     it('should create new account', async function () {
@@ -72,14 +72,14 @@ describe('FO - Login : Create account', async () => {
       await createAccountPage.createAccount(page, customerData);
 
       const isCustomerConnected = await homePage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Created customer is not connected!').to.be.true;
+      expect(isCustomerConnected, 'Created customer is not connected!').to.eq(true);
     });
 
     it('should check if the page is redirected to home page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'isHomePage', baseContext);
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to redirect to FO home page!').to.be.true;
+      expect(isHomePage, 'Fail to redirect to FO home page!').to.eq(true);
     });
 
     it('should sign out from FO', async function () {
@@ -88,7 +88,7 @@ describe('FO - Login : Create account', async () => {
       await homePage.logout(page);
 
       const isCustomerConnected = await homePage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is connected!').to.be.false;
+      expect(isCustomerConnected, 'Customer is connected!').to.eq(false);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/FO/hummingbird/02_headerAndFooter/01_checkLinksInHeader.ts b/tests/UI/campaigns/functional/FO/hummingbird/02_headerAndFooter/01_checkLinksInHeader.ts
index 36cefc8e980ed..f45c94946f42d 100644
--- a/tests/UI/campaigns/functional/FO/hummingbird/02_headerAndFooter/01_checkLinksInHeader.ts
+++ b/tests/UI/campaigns/functional/FO/hummingbird/02_headerAndFooter/01_checkLinksInHeader.ts
@@ -54,7 +54,7 @@ describe('FO - Header and Footer : Check links in header page', async () => {
       await homePage.goToFo(page);
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage).to.be.true;
+      expect(isHomePage).to.eq(true);
     });
 
     it('should check \'Contact us\' header link', async function () {
@@ -64,7 +64,7 @@ describe('FO - Header and Footer : Check links in header page', async () => {
       await homePage.clickOnHeaderLink(page, 'Contact us');
 
       const pageTitle = await contactUsPage.getPageTitle(page);
-      await expect(pageTitle, 'Fail to open FO login page').to.contains(contactUsPage.pageTitle);
+      expect(pageTitle, 'Fail to open FO login page').to.contains(contactUsPage.pageTitle);
     });
 
     it('should check \'sign in\' link', async function () {
@@ -74,7 +74,7 @@ describe('FO - Header and Footer : Check links in header page', async () => {
       await homePage.clickOnHeaderLink(page, 'Sign in');
 
       const pageTitle = await loginPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(loginPage.pageTitle);
+      expect(pageTitle).to.equal(loginPage.pageTitle);
     });
 
     it('should sign in by default customer', async function () {
@@ -84,7 +84,7 @@ describe('FO - Header and Footer : Check links in header page', async () => {
       await loginPage.customerLogin(page, Customers.johnDoe);
 
       const isCustomerConnected = await loginPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected!').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected!').to.eq(true);
     });
 
     it('should check my account link', async function () {
@@ -93,7 +93,7 @@ describe('FO - Header and Footer : Check links in header page', async () => {
       await loginPage.goToMyAccountPage(page);
 
       const pageTitle = await myAccountPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(myAccountPage.pageTitle);
+      expect(pageTitle).to.equal(myAccountPage.pageTitle);
     });
 
     it('should add a product to cart by quick view', async function () {
@@ -105,7 +105,7 @@ describe('FO - Header and Footer : Check links in header page', async () => {
 
       // Close block cart modal
       const isQuickViewModalClosed = await homePage.closeBlockCartModal(page);
-      await expect(isQuickViewModalClosed).to.be.true;
+      expect(isQuickViewModalClosed).to.eq(true);
     });
 
     it('should check \'Cart\' link', async function () {
@@ -115,7 +115,7 @@ describe('FO - Header and Footer : Check links in header page', async () => {
       await homePage.clickOnHeaderLink(page, 'Cart');
 
       const pageTitle = await cartPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(cartPage.pageTitle);
+      expect(pageTitle).to.equal(cartPage.pageTitle);
     });
 
     it('should go to home page and check the notification number', async function () {
@@ -124,7 +124,7 @@ describe('FO - Header and Footer : Check links in header page', async () => {
       await loginPage.goToHomePage(page);
 
       const notificationsNumber = await homePage.getCartNotificationsNumber(page);
-      await expect(notificationsNumber, 'Notification number is not equal to 3!').to.be.equal(3);
+      expect(notificationsNumber, 'Notification number is not equal to 3!').to.be.equal(3);
     });
 
     it('should check \'Sign out\' link', async function () {
@@ -134,14 +134,14 @@ describe('FO - Header and Footer : Check links in header page', async () => {
       await homePage.logout(page);
 
       const isCustomerConnected = await homePage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is connected!').to.be.false;
+      expect(isCustomerConnected, 'Customer is connected!').to.eq(false);
     });
 
     it('should check that the cart is empty', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkNotificationNumber2', baseContext);
 
       const notificationsNumber = await homePage.getCartNotificationsNumber(page);
-      await expect(notificationsNumber, 'The cart is not empty!').to.be.equal(0);
+      expect(notificationsNumber, 'The cart is not empty!').to.be.equal(0);
     });
 
     it('should check \'Logo\' link', async function () {
@@ -150,7 +150,7 @@ describe('FO - Header and Footer : Check links in header page', async () => {
       await homePage.clickOnHeaderLink(page, 'Logo', false);
 
       const pageTitle = await homePage.getPageTitle(page);
-      await expect(pageTitle).to.equal(homePage.pageTitle);
+      expect(pageTitle).to.equal(homePage.pageTitle);
     });
   });
 
diff --git a/tests/UI/campaigns/functional/FO/hummingbird/02_headerAndFooter/04_changeLanguage.ts b/tests/UI/campaigns/functional/FO/hummingbird/02_headerAndFooter/04_changeLanguage.ts
index 295367855e21d..f7b409f52f9c9 100644
--- a/tests/UI/campaigns/functional/FO/hummingbird/02_headerAndFooter/04_changeLanguage.ts
+++ b/tests/UI/campaigns/functional/FO/hummingbird/02_headerAndFooter/04_changeLanguage.ts
@@ -107,7 +107,7 @@ describe('FO - Header and Footer : Change language', async () => {
           expect(resultMessage).to.contains(languagesPage.successfulUpdateStatusMessage);
         }
         const languageStatus = await languagesPage.getStatus(page, 1);
-        await expect(languageStatus).to.be.false;
+        expect(languageStatus).to.eq(false);
       });
 
       it('should reset all filters', async function () {
@@ -126,14 +126,14 @@ describe('FO - Header and Footer : Change language', async () => {
         await homePage.goToFo(page);
 
         const isHomePage = await homePage.isHomePage(page);
-        await expect(isHomePage).to.be.true;
+        expect(isHomePage).to.eq(true);
       });
 
       it('should check that the languages list is not visible', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkLanguageListNotVisible', baseContext);
 
         const isVisible = await homePage.isLanguageListVisible(page);
-        await expect(isVisible, 'Language list is visible!').to.be.false;
+        expect(isVisible, 'Language list is visible!').to.eq(false);
       });
 
       it('should check that the shop language is \'English\'', async function () {
@@ -202,7 +202,7 @@ describe('FO - Header and Footer : Change language', async () => {
           expect(resultMessage).to.contains(languagesPage.successfulUpdateStatusMessage);
         }
         const languageStatus = await languagesPage.getStatus(page, 1);
-        await expect(languageStatus).to.be.true;
+        expect(languageStatus).to.eq(true);
       });
 
       it('should reset all filters', async function () {
@@ -221,14 +221,14 @@ describe('FO - Header and Footer : Change language', async () => {
         await homePage.goToFo(page);
 
         const isHomePage = await homePage.isHomePage(page);
-        await expect(isHomePage).to.be.true;
+        expect(isHomePage).to.eq(true);
       });
 
       it('should check that the languages list is visible', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'checkLanguageListVisible', baseContext);
 
         const isVisible = await homePage.isLanguageListVisible(page);
-        await expect(isVisible, 'Language list is not visible!').to.be.true;
+        expect(isVisible, 'Language list is not visible!').to.eq(true);
       });
 
       it('should change the shop language to \'French\'', async function () {
diff --git a/tests/UI/campaigns/functional/WS/01_countriesCRUD.ts b/tests/UI/campaigns/functional/WS/01_countriesCRUD.ts
index 21edcec8a8421..32ef64302b169 100644
--- a/tests/UI/campaigns/functional/WS/01_countriesCRUD.ts
+++ b/tests/UI/campaigns/functional/WS/01_countriesCRUD.ts
@@ -82,7 +82,7 @@ describe('WS - Countries : CRUD', async () => {
         await webservicePage.closeSfToolBar(page);
 
         const pageTitle = await webservicePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(webservicePage.pageTitle);
+        expect(pageTitle).to.contains(webservicePage.pageTitle);
       });
 
       it('should filter list by key description', async function () {
@@ -97,11 +97,11 @@ describe('WS - Countries : CRUD', async () => {
         );
 
         const description = await webservicePage.getTextColumnFromTable(page, 1, 'description');
-        await expect(description).to.contains(wsKeyDescription);
+        expect(description).to.contains(wsKeyDescription);
 
         wsKey = await webservicePage.getTextColumnFromTable(page, 1, 'key');
         authorization = `Basic ${Buffer.from(`${wsKey}:`).toString('base64')}`;
-        await expect(wsKey).to.be.not.empty;
+        expect(wsKey).to.not.have.lengthOf(0);
       });
     });
 
@@ -116,7 +116,7 @@ describe('WS - Countries : CRUD', async () => {
           apiContext,
           authorization,
         );
-        await expect(apiResponse.status()).to.eq(200);
+        expect(apiResponse.status()).to.eq(200);
       });
 
       it('should check that the blank XML can be parsed', async function () {
@@ -125,7 +125,7 @@ describe('WS - Countries : CRUD', async () => {
         xmlResponse = await apiResponse.text();
 
         const isValidXML = xml.isValid(xmlResponse);
-        await expect(isValidXML).to.be.true;
+        expect(isValidXML).to.eq(true);
       });
 
       it('should check response root node', async function () {
@@ -157,7 +157,7 @@ describe('WS - Countries : CRUD', async () => {
 
           // Empty value
           const isEmptyNode: boolean = xml.isEmpty(node);
-          await expect(isEmptyNode, `The node ${node.nodeName} is not empty`).to.be.true;
+          expect(isEmptyNode, `The node ${node.nodeName} is not empty`).to.eq(true);
         }
       });
     });
@@ -173,7 +173,7 @@ describe('WS - Countries : CRUD', async () => {
           apiContext,
           authorization,
         );
-        await expect(apiResponse.status()).to.eq(200);
+        expect(apiResponse.status()).to.eq(200);
       });
 
       it('should check that the synopsis XML can be parsed', async function () {
@@ -182,7 +182,7 @@ describe('WS - Countries : CRUD', async () => {
         xmlResponse = await apiResponse.text();
 
         const isValidXML = xml.isValid(xmlResponse);
-        await expect(isValidXML).to.be.true;
+        expect(isValidXML).to.eq(true);
       });
 
       it('should check response root node', async function () {
@@ -217,7 +217,7 @@ describe('WS - Countries : CRUD', async () => {
 
           // Empty value
           const isEmptyNode = xml.isEmpty(node);
-          await expect(isEmptyNode, `The node ${node.nodeName} is not empty`).to.be.true;
+          expect(isEmptyNode, `The node ${node.nodeName} is not empty`).to.eq(true);
         }
       });
     });
@@ -235,7 +235,7 @@ describe('WS - Countries : CRUD', async () => {
           authorization,
         );
 
-        await expect(apiResponse.status()).to.eq(200);
+        expect(apiResponse.status()).to.eq(200);
       });
 
       it('should check response root node', async function () {
@@ -296,7 +296,7 @@ describe('WS - Countries : CRUD', async () => {
             authorization,
             xmlCreate,
           );
-          await expect(apiResponse.status()).to.eq(201);
+          expect(apiResponse.status()).to.eq(201);
         });
 
         it('should check response root node', async function () {
@@ -337,7 +337,7 @@ describe('WS - Countries : CRUD', async () => {
             countryNodeID,
           );
 
-          await expect(apiResponse.status()).to.eq(200);
+          expect(apiResponse.status()).to.eq(200);
         });
 
         it('should check response root node', async function () {
@@ -419,7 +419,7 @@ describe('WS - Countries : CRUD', async () => {
           await zonesPage.closeSfToolBar(page);
 
           const pageTitle = await zonesPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(zonesPage.pageTitle);
+          expect(pageTitle).to.contains(zonesPage.pageTitle);
         });
 
         it('should go to \'Countries\' page', async function () {
@@ -428,7 +428,7 @@ describe('WS - Countries : CRUD', async () => {
           await zonesPage.goToSubTabCountries(page);
 
           const pageTitle = await countriesPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(countriesPage.pageTitle);
+          expect(pageTitle).to.contains(countriesPage.pageTitle);
         });
 
         it('should filter country by ID', async function () {
@@ -440,10 +440,10 @@ describe('WS - Countries : CRUD', async () => {
 
           // Check number of countries
           const numberOfCountriesAfterFilter = await countriesPage.getNumberOfElementInGrid(page);
-          await expect(numberOfCountriesAfterFilter).to.be.eq(1);
+          expect(numberOfCountriesAfterFilter).to.be.eq(1);
 
           const textColumn = await countriesPage.getTextColumnFromTable(page, 1, 'id_country');
-          await expect(textColumn).to.contains(countryNodeID);
+          expect(textColumn).to.contains(countryNodeID);
         });
 
         it('should go to edit country page', async function () {
@@ -452,7 +452,7 @@ describe('WS - Countries : CRUD', async () => {
           await countriesPage.goToEditCountryPage(page, 1);
 
           const pageTitle = await addCountryPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(addCountryPage.pageTitleEdit);
+          expect(pageTitle).to.contains(addCountryPage.pageTitleEdit);
         });
 
         it('should check country\'s zone', async function () {
@@ -549,14 +549,14 @@ describe('WS - Countries : CRUD', async () => {
           await zonesPage.goToSubTabCountries(page);
 
           const pageTitle = await countriesPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(countriesPage.pageTitle);
+          expect(pageTitle).to.contains(countriesPage.pageTitle);
         });
 
         it('should reset all filters', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirstAfterPost', baseContext);
 
           const numberOfCountries = await countriesPage.resetAndGetNumberOfLines(page);
-          await expect(numberOfCountries).to.be.above(0);
+          expect(numberOfCountries).to.be.above(0);
         });
       });
     });
@@ -577,7 +577,7 @@ describe('WS - Countries : CRUD', async () => {
             xmlUpdate,
           );
 
-          await expect(apiResponse.status()).to.eq(200);
+          expect(apiResponse.status()).to.eq(200);
         });
 
         it('should check response root node', async function () {
@@ -618,7 +618,7 @@ describe('WS - Countries : CRUD', async () => {
             countryNodeID,
           );
 
-          await expect(apiResponse.status()).to.eq(200);
+          expect(apiResponse.status()).to.eq(200);
         });
 
         it('should check response root node', async function () {
@@ -699,10 +699,10 @@ describe('WS - Countries : CRUD', async () => {
 
           // Check number of countries
           const numberOfCountriesAfterFilter = await countriesPage.getNumberOfElementInGrid(page);
-          await expect(numberOfCountriesAfterFilter).to.be.eq(1);
+          expect(numberOfCountriesAfterFilter).to.be.eq(1);
 
           const textColumn = await countriesPage.getTextColumnFromTable(page, 1, 'id_country');
-          await expect(textColumn).to.contains(countryNodeID);
+          expect(textColumn).to.contains(countryNodeID);
         });
 
         it('should go to edit country page', async function () {
@@ -711,7 +711,7 @@ describe('WS - Countries : CRUD', async () => {
           await countriesPage.goToEditCountryPage(page, 1);
 
           const pageTitle = await addCountryPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(addCountryPage.pageTitleEdit);
+          expect(pageTitle).to.contains(addCountryPage.pageTitleEdit);
         });
 
         it('should check country\'s zone', async function () {
@@ -808,14 +808,14 @@ describe('WS - Countries : CRUD', async () => {
           await zonesPage.goToSubTabCountries(page);
 
           const pageTitle = await countriesPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(countriesPage.pageTitle);
+          expect(pageTitle).to.contains(countriesPage.pageTitle);
         });
 
         it('should reset all filters', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirstAfterPut', baseContext);
 
           const numberOfCountries = await countriesPage.resetAndGetNumberOfLines(page);
-          await expect(numberOfCountries).to.be.above(0);
+          expect(numberOfCountries).to.be.above(0);
         });
       });
     });
@@ -830,7 +830,7 @@ describe('WS - Countries : CRUD', async () => {
           countryNodeID,
         );
 
-        await expect(apiResponse.status()).to.eq(200);
+        expect(apiResponse.status()).to.eq(200);
       });
 
       it(`should request the endpoint ${CountryWS.endpoint}/{id} with method GET`, async function () {
@@ -842,7 +842,7 @@ describe('WS - Countries : CRUD', async () => {
           countryNodeID,
         );
 
-        await expect(apiResponse.status()).to.eq(404);
+        expect(apiResponse.status()).to.eq(404);
       });
 
       it('should filter country by ID', async function () {
@@ -854,14 +854,14 @@ describe('WS - Countries : CRUD', async () => {
 
         // Check number of countries
         const numberOfCountriesAfterFilter = await countriesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfCountriesAfterFilter).to.be.eq(0);
+        expect(numberOfCountriesAfterFilter).to.be.eq(0);
       });
 
       it('should reset all filters', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
         const numberOfCountries = await countriesPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfCountries).to.be.above(0);
+        expect(numberOfCountries).to.be.above(0);
       });
     });
   });
diff --git a/tests/UI/campaigns/functional/WS/03_storesCRUD.ts b/tests/UI/campaigns/functional/WS/03_storesCRUD.ts
index be449a90b601f..2085c65caad69 100644
--- a/tests/UI/campaigns/functional/WS/03_storesCRUD.ts
+++ b/tests/UI/campaigns/functional/WS/03_storesCRUD.ts
@@ -87,7 +87,7 @@ describe('WS - Stores : CRUD', async () => {
         await webservicePage.closeSfToolBar(page);
 
         const pageTitle = await webservicePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(webservicePage.pageTitle);
+        expect(pageTitle).to.contains(webservicePage.pageTitle);
       });
 
       it('should filter list by key description', async function () {
@@ -102,11 +102,11 @@ describe('WS - Stores : CRUD', async () => {
         );
 
         const description = await webservicePage.getTextColumnFromTable(page, 1, 'description');
-        await expect(description).to.contains(wsKeyDescription);
+        expect(description).to.contains(wsKeyDescription);
 
         wsKey = await webservicePage.getTextColumnFromTable(page, 1, 'key');
         authorization = `Basic ${Buffer.from(`${wsKey}:`).toString('base64')}`;
-        await expect(wsKey).to.be.not.empty;
+        expect(wsKey).to.not.have.lengthOf(0);
       });
     });
 
@@ -121,7 +121,7 @@ describe('WS - Stores : CRUD', async () => {
           apiContext,
           authorization,
         );
-        await expect(apiResponse.status()).to.eq(200);
+        expect(apiResponse.status()).to.eq(200);
       });
 
       it('should check that the blank XML can be parsed', async function () {
@@ -130,7 +130,7 @@ describe('WS - Stores : CRUD', async () => {
         xmlResponse = await apiResponse.text();
 
         const isValidXML = xml.isValid(xmlResponse);
-        await expect(isValidXML).to.be.true;
+        expect(isValidXML).to.eq(true);
       });
 
       it('should check response root node', async function () {
@@ -162,7 +162,7 @@ describe('WS - Stores : CRUD', async () => {
 
           // Empty value
           const isEmptyNode: boolean = xml.isEmpty(node);
-          await expect(isEmptyNode, `The node ${node.nodeName} is not empty`).to.be.true;
+          expect(isEmptyNode, `The node ${node.nodeName} is not empty`).to.eq(true);
         }
       });
     });
@@ -178,7 +178,7 @@ describe('WS - Stores : CRUD', async () => {
           apiContext,
           authorization,
         );
-        await expect(apiResponse.status()).to.eq(200);
+        expect(apiResponse.status()).to.eq(200);
       });
 
       it('should check that the synopsis XML can be parsed', async function () {
@@ -187,7 +187,7 @@ describe('WS - Stores : CRUD', async () => {
         xmlResponse = await apiResponse.text();
 
         const isValidXML = xml.isValid(xmlResponse);
-        await expect(isValidXML).to.be.true;
+        expect(isValidXML).to.eq(true);
       });
 
       it('should check response root node', async function () {
@@ -224,7 +224,7 @@ describe('WS - Stores : CRUD', async () => {
 
           // Empty value
           const isEmptyNode = xml.isEmpty(node);
-          await expect(isEmptyNode, `The node ${node.nodeName} is not empty`).to.be.true;
+          expect(isEmptyNode, `The node ${node.nodeName} is not empty`).to.eq(true);
         }
       });
     });
@@ -242,7 +242,7 @@ describe('WS - Stores : CRUD', async () => {
           authorization,
         );
 
-        await expect(apiResponse.status()).to.eq(200);
+        expect(apiResponse.status()).to.eq(200);
       });
 
       it('should check response root node', async function () {
@@ -304,7 +304,7 @@ describe('WS - Stores : CRUD', async () => {
             xmlCreate,
           );
 
-          await expect(apiResponse.status()).to.eq(201);
+          expect(apiResponse.status()).to.eq(201);
         });
 
         it('should check response root node', async function () {
@@ -344,7 +344,7 @@ describe('WS - Stores : CRUD', async () => {
             authorization,
             storeNodeID,
           );
-          await expect(apiResponse.status()).to.eq(200);
+          expect(apiResponse.status()).to.eq(200);
         });
 
         it('should check response root node', async function () {
@@ -428,7 +428,7 @@ describe('WS - Stores : CRUD', async () => {
           await contactPage.closeSfToolBar(page);
 
           const pageTitle = await contactPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(contactPage.pageTitle);
+          expect(pageTitle).to.contains(contactPage.pageTitle);
         });
 
         it('should go to \'Stores\' page', async function () {
@@ -437,7 +437,7 @@ describe('WS - Stores : CRUD', async () => {
           await contactPage.goToStoresPage(page);
 
           const pageTitle = await storesPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(storesPage.pageTitle);
+          expect(pageTitle).to.contains(storesPage.pageTitle);
         });
 
         it('should filter store by ID', async function () {
@@ -449,10 +449,10 @@ describe('WS - Stores : CRUD', async () => {
 
           // Check number of stores
           const numberOfStoresAfterFilter = await storesPage.getNumberOfElementInGrid(page);
-          await expect(numberOfStoresAfterFilter).to.be.eq(1);
+          expect(numberOfStoresAfterFilter).to.be.eq(1);
 
           const textColumn = await storesPage.getTextColumn(page, 1, 'id_store');
-          await expect(textColumn).to.contains(storeNodeID);
+          expect(textColumn).to.contains(storeNodeID);
         });
 
         it('should go to edit store page', async function () {
@@ -461,7 +461,7 @@ describe('WS - Stores : CRUD', async () => {
           await storesPage.gotoEditStorePage(page, 1);
 
           const pageTitle = await addStorePage.getPageTitle(page);
-          await expect(pageTitle).to.contains(addStorePage.pageTitleEdit);
+          expect(pageTitle).to.contains(addStorePage.pageTitleEdit);
         });
 
         it('should check store\'s name language 1', async function () {
@@ -637,14 +637,14 @@ describe('WS - Stores : CRUD', async () => {
           await contactPage.goToStoresPage(page);
 
           const pageTitle = await storesPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(storesPage.pageTitle);
+          expect(pageTitle).to.contains(storesPage.pageTitle);
         });
 
         it('should reset all filters', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirstAfterPost', baseContext);
 
           const numberOfStores = await storesPage.resetAndGetNumberOfLines(page);
-          await expect(numberOfStores).to.be.above(0);
+          expect(numberOfStores).to.be.above(0);
         });
       });
     });
@@ -664,7 +664,7 @@ describe('WS - Stores : CRUD', async () => {
             xmlUpdate,
           );
 
-          await expect(apiResponse.status()).to.eq(200);
+          expect(apiResponse.status()).to.eq(200);
         });
 
         it('should check response root node', async function () {
@@ -705,7 +705,7 @@ describe('WS - Stores : CRUD', async () => {
             storeNodeID,
           );
 
-          await expect(apiResponse.status()).to.eq(200);
+          expect(apiResponse.status()).to.eq(200);
         });
 
         it('should check response root node', async function () {
@@ -787,10 +787,10 @@ describe('WS - Stores : CRUD', async () => {
 
           // Check number of stores
           const numberOfStoresAfterFilter = await storesPage.getNumberOfElementInGrid(page);
-          await expect(numberOfStoresAfterFilter).to.be.eq(1);
+          expect(numberOfStoresAfterFilter).to.be.eq(1);
 
           const textColumn = await storesPage.getTextColumn(page, 1, 'id_store');
-          await expect(textColumn).to.contains(storeNodeID);
+          expect(textColumn).to.contains(storeNodeID);
         });
 
         it('should go to edit store page', async function () {
@@ -799,7 +799,7 @@ describe('WS - Stores : CRUD', async () => {
           await storesPage.gotoEditStorePage(page, 1);
 
           const pageTitle = await addStorePage.getPageTitle(page);
-          await expect(pageTitle).to.contains(addStorePage.pageTitleEdit);
+          expect(pageTitle).to.contains(addStorePage.pageTitleEdit);
         });
 
         it('should check store\'s name language 1', async function () {
@@ -980,14 +980,14 @@ describe('WS - Stores : CRUD', async () => {
           await contactPage.goToStoresPage(page);
 
           const pageTitle = await storesPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(storesPage.pageTitle);
+          expect(pageTitle).to.contains(storesPage.pageTitle);
         });
 
         it('should reset all filters', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirstAfterPost2', baseContext);
 
           const numberOfStores = await storesPage.resetAndGetNumberOfLines(page);
-          await expect(numberOfStores).to.be.above(0);
+          expect(numberOfStores).to.be.above(0);
         });
       });
     });
@@ -1002,7 +1002,7 @@ describe('WS - Stores : CRUD', async () => {
           storeNodeID,
         );
 
-        await expect(apiResponse.status()).to.eq(200);
+        expect(apiResponse.status()).to.eq(200);
       });
 
       it(`should request the endpoint ${StoreWS.endpoint}/{id} with method GET`, async function () {
@@ -1014,7 +1014,7 @@ describe('WS - Stores : CRUD', async () => {
           storeNodeID,
         );
 
-        await expect(apiResponse.status()).to.eq(404);
+        expect(apiResponse.status()).to.eq(404);
       });
 
       it('should filter store by ID', async function () {
@@ -1026,14 +1026,14 @@ describe('WS - Stores : CRUD', async () => {
 
         // Check number of stores
         const numberOfStoresAfterFilter = await storesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfStoresAfterFilter).to.be.eq(0);
+        expect(numberOfStoresAfterFilter).to.be.eq(0);
       });
 
       it('should reset all filters', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'resetFilterFirst', baseContext);
 
         const numberOfStores = await storesPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfStores).to.be.above(0);
+        expect(numberOfStores).to.be.above(0);
       });
     });
   });
diff --git a/tests/UI/campaigns/modules/blockwishlist/02_configuration/02_statisticsTabSettings.ts b/tests/UI/campaigns/modules/blockwishlist/02_configuration/02_statisticsTabSettings.ts
index a2d1f4308c693..cb8ed1b99c8e4 100644
--- a/tests/UI/campaigns/modules/blockwishlist/02_configuration/02_statisticsTabSettings.ts
+++ b/tests/UI/campaigns/modules/blockwishlist/02_configuration/02_statisticsTabSettings.ts
@@ -55,14 +55,14 @@ describe('Wishlist module - Statistics tab settings', async () => {
       await moduleManagerPage.closeSfToolBar(page);
 
       const pageTitle = await moduleManagerPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
+      expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
     });
 
     it(`should search the module ${Modules.blockwishlist.name}`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'searchModule', baseContext);
 
       const isModuleVisible = await moduleManagerPage.searchModule(page, Modules.blockwishlist);
-      await expect(isModuleVisible).to.be.true;
+      expect(isModuleVisible).to.eq(true);
     });
 
     it(`should go to the configuration page of the module '${Modules.blockwishlist.name}'`, async function () {
@@ -71,13 +71,13 @@ describe('Wishlist module - Statistics tab settings', async () => {
       await moduleManagerPage.goToConfigurationPage(page, Modules.blockwishlist.tag);
 
       const pageTitle = await blockwishlistPage.getPageTitle(page);
-      await expect(pageTitle).to.eq(blockwishlistPage.pageTitle);
+      expect(pageTitle).to.eq(blockwishlistPage.pageTitle);
 
       const isConfigurationTabActive = await blockwishlistPage.isTabActive(page, 'Configuration');
-      await expect(isConfigurationTabActive).to.be.true;
+      expect(isConfigurationTabActive).to.eq(true);
 
       const isStatisticsTabActive = await blockwishlistPage.isTabActive(page, 'Statistics');
-      await expect(isStatisticsTabActive).to.be.false;
+      expect(isStatisticsTabActive).to.eq(false);
     });
 
     it('should go on Statistics Tab', async function () {
@@ -86,10 +86,10 @@ describe('Wishlist module - Statistics tab settings', async () => {
       await blockwishlistPage.goToStatisticsTab(page);
 
       const pageTitle = await blockwishlistStatisticsPage.getPageTitle(page);
-      await expect(pageTitle).to.eq(blockwishlistStatisticsPage.pageTitle);
+      expect(pageTitle).to.eq(blockwishlistStatisticsPage.pageTitle);
 
       const noRecordsFoundText = await blockwishlistStatisticsPage.getTextForEmptyTable(page);
-      await expect(noRecordsFoundText).to.contains('warning No records found');
+      expect(noRecordsFoundText).to.contains('warning No records found');
     });
   });
   describe('Go to the FO and add to favorites some products', async () => {
@@ -100,7 +100,7 @@ describe('Wishlist module - Statistics tab settings', async () => {
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage).to.be.true;
+      expect(isHomePage).to.eq(true);
     });
 
     it('should go to login page', async function () {
@@ -109,7 +109,7 @@ describe('Wishlist module - Statistics tab settings', async () => {
       await homePage.goToLoginPage(page);
 
       const pageTitle = await foLoginPage.getPageTitle(page);
-      await expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
+      expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
     });
 
     it('should sign in with default customer', async function () {
@@ -118,7 +118,7 @@ describe('Wishlist module - Statistics tab settings', async () => {
       await foLoginPage.customerLogin(page, Customers.johnDoe);
 
       const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
 
     it('should go to all products page', async function () {
@@ -127,7 +127,7 @@ describe('Wishlist module - Statistics tab settings', async () => {
       await homePage.goToAllProductsPage(page);
 
       const isCategoryPageVisible = await categoryPage.isCategoryPage(page);
-      await expect(isCategoryPageVisible).to.be.true;
+      expect(isCategoryPageVisible).to.eq(true);
     });
 
     for (let idxProduct: number = 1; idxProduct <= 3; idxProduct++) {
@@ -136,10 +136,10 @@ describe('Wishlist module - Statistics tab settings', async () => {
         await testContext.addContextItem(this, 'testIdentifier', `addToFavorite${idxProduct}`, baseContext);
 
         const textResult = await categoryPage.addToWishList(page, idxProduct);
-        await expect(textResult).to.be.eq(categoryPage.messageAddedToWishlist);
+        expect(textResult).to.be.eq(categoryPage.messageAddedToWishlist);
 
         const isAddedToWishlist = await categoryPage.isAddedToWishlist(page, idxProduct);
-        await expect(isAddedToWishlist).to.be.true;
+        expect(isAddedToWishlist).to.eq(true);
       });
     }
 
@@ -149,7 +149,7 @@ describe('Wishlist module - Statistics tab settings', async () => {
       await categoryPage.logout(page);
 
       const isCustomerConnected = await homePage.isCustomerConnected(page);
-      await expect(isCustomerConnected).to.be.false;
+      expect(isCustomerConnected).to.eq(false);
     });
   });
   describe('Return to BO and check statistics', async () => {
@@ -159,7 +159,7 @@ describe('Wishlist module - Statistics tab settings', async () => {
       page = await homePage.closePage(browserContext, page, 0);
 
       const pageTitle = await blockwishlistStatisticsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(blockwishlistStatisticsPage.pageTitle);
+      expect(pageTitle).to.contains(blockwishlistStatisticsPage.pageTitle);
     });
     // @todo : https://github.com/PrestaShop/PrestaShop/issues/33374
     it.skip('should click on the refresh button', async function () {
@@ -169,7 +169,7 @@ describe('Wishlist module - Statistics tab settings', async () => {
 
       // Check statistics
       const pageTitle = await blockwishlistStatisticsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(blockwishlistStatisticsPage.pageTitle);
+      expect(pageTitle).to.contains(blockwishlistStatisticsPage.pageTitle);
     });
   });
 });
diff --git a/tests/UI/campaigns/modules/ps_cashondelivery/01_installation/04_resetModule.ts b/tests/UI/campaigns/modules/ps_cashondelivery/01_installation/04_resetModule.ts
index 3c3a193e63067..b50b1f55ae941 100644
--- a/tests/UI/campaigns/modules/ps_cashondelivery/01_installation/04_resetModule.ts
+++ b/tests/UI/campaigns/modules/ps_cashondelivery/01_installation/04_resetModule.ts
@@ -53,34 +53,34 @@ describe('Cash on delivery (COD) module - Reset module', async () => {
     await moduleManagerPage.closeSfToolBar(page);
 
     const pageTitle = await moduleManagerPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
+    expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
   });
 
   it(`should search the module ${Modules.psCashOnDelivery.name}`, async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'searchModule', baseContext);
 
     const isModuleVisible = await moduleManagerPage.searchModule(page, Modules.psCashOnDelivery);
-    await expect(isModuleVisible).to.be.true;
+    expect(isModuleVisible).to.eq(true);
   });
 
   it('should display the reset modal and cancel it', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetModuleAndCancel', baseContext);
 
     const textResult = await moduleManagerPage.setActionInModule(page, Modules.psCashOnDelivery, 'reset', true);
-    await expect(textResult).to.eq('');
+    expect(textResult).to.eq('');
 
     const isModuleVisible = await moduleManagerPage.isModuleVisible(page, Modules.psCashOnDelivery);
-    await expect(isModuleVisible).to.be.true;
+    expect(isModuleVisible).to.eq(true);
 
     const isModalVisible = await moduleManagerPage.isModalActionVisible(page, Modules.psCashOnDelivery, 'reset');
-    await expect(isModalVisible).to.be.false;
+    expect(isModalVisible).to.eq(false);
   });
 
   it('should reset the module', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetModule', baseContext);
 
     const successMessage = await moduleManagerPage.setActionInModule(page, Modules.psCashOnDelivery, 'reset');
-    await expect(successMessage).to.eq(moduleManagerPage.resetModuleSuccessMessage(Modules.psCashOnDelivery.tag));
+    expect(successMessage).to.eq(moduleManagerPage.resetModuleSuccessMessage(Modules.psCashOnDelivery.tag));
   });
 
   it('should go to Front Office', async function () {
@@ -90,7 +90,7 @@ describe('Cash on delivery (COD) module - Reset module', async () => {
     await homePage.changeLanguage(page, 'en');
 
     const isHomePage = await homePage.isHomePage(page);
-    await expect(isHomePage).to.be.true;
+    expect(isHomePage).to.eq(true);
   });
 
   it('should go to login page', async function () {
@@ -99,7 +99,7 @@ describe('Cash on delivery (COD) module - Reset module', async () => {
     await homePage.goToLoginPage(page);
 
     const pageTitle = await foLoginPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(foLoginPage.pageTitle);
+    expect(pageTitle).to.contains(foLoginPage.pageTitle);
   });
 
   it('should sign in with default customer', async function () {
@@ -108,7 +108,7 @@ describe('Cash on delivery (COD) module - Reset module', async () => {
     await foLoginPage.customerLogin(page, Customers.johnDoe);
 
     const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
-    await expect(isCustomerConnected).to.be.true;
+    expect(isCustomerConnected).to.eq(true);
   });
 
   it('should add the first product to the cart', async function () {
@@ -121,7 +121,7 @@ describe('Cash on delivery (COD) module - Reset module', async () => {
     await homePage.proceedToCheckout(page);
 
     const pageTitle = await cartPage.getPageTitle(page);
-    await expect(pageTitle).to.eq(cartPage.pageTitle);
+    expect(pageTitle).to.eq(cartPage.pageTitle);
   });
 
   it('should proceed to checkout and check Step Address', async function () {
@@ -130,27 +130,27 @@ describe('Cash on delivery (COD) module - Reset module', async () => {
     await cartPage.clickOnProceedToCheckout(page);
 
     const isCheckoutPage = await checkoutPage.isCheckoutPage(page);
-    await expect(isCheckoutPage).to.be.true;
+    expect(isCheckoutPage).to.eq(true);
 
     const isStepPersonalInformationComplete = await checkoutPage.isStepCompleted(
       page,
       checkoutPage.personalInformationStepForm,
     );
-    await expect(isStepPersonalInformationComplete).to.be.true;
+    expect(isStepPersonalInformationComplete).to.eq(true);
   });
 
   it('should validate Step Address and go to Delivery Step', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'checkDeliveryStep', baseContext);
 
     const isStepAddressComplete = await checkoutPage.goToDeliveryStep(page);
-    await expect(isStepAddressComplete).to.be.true;
+    expect(isStepAddressComplete).to.eq(true);
   });
 
   it('should go to payment step', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'goToPaymentStep', baseContext);
 
     const isStepDeliveryComplete = await checkoutPage.goToPaymentStep(page);
-    await expect(isStepDeliveryComplete, 'Step Address is not complete').to.be.true;
+    expect(isStepDeliveryComplete, 'Step Address is not complete').to.eq(true);
   });
 
   it(`should check the '${Modules.psCashOnDelivery.name}' payment module`, async function () {
@@ -158,6 +158,6 @@ describe('Cash on delivery (COD) module - Reset module', async () => {
 
     // Payment step - Choose payment step
     const isVisible = await checkoutPage.isPaymentMethodExist(page, Modules.psCashOnDelivery.tag);
-    await expect(isVisible).to.be.true;
+    expect(isVisible).to.eq(true);
   });
 });
diff --git a/tests/UI/campaigns/modules/ps_facetedsearch/01_installation/04_uninstallAndDeleteModule.ts b/tests/UI/campaigns/modules/ps_facetedsearch/01_installation/04_uninstallAndDeleteModule.ts
index 18f5c510230aa..0cb1aa1b6c107 100644
--- a/tests/UI/campaigns/modules/ps_facetedsearch/01_installation/04_uninstallAndDeleteModule.ts
+++ b/tests/UI/campaigns/modules/ps_facetedsearch/01_installation/04_uninstallAndDeleteModule.ts
@@ -53,41 +53,41 @@ describe('Faceted search module - Uninstall and delete module', async () => {
     await moduleManagerPage.closeSfToolBar(page);
 
     const pageTitle = await moduleManagerPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
+    expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
   });
 
   it(`should search the module ${Modules.psFacetedSearch.name}`, async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'searchModule', baseContext);
 
     const isModuleVisible = await moduleManagerPage.searchModule(page, Modules.psFacetedSearch);
-    await expect(isModuleVisible).to.be.true;
+    expect(isModuleVisible).to.eq(true);
   });
 
   it('should display the uninstall modal and cancel it', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetModuleAndCancel', baseContext);
 
     const textResult = await moduleManagerPage.setActionInModule(page, Modules.psFacetedSearch, 'uninstall', true);
-    await expect(textResult).to.eq('');
+    expect(textResult).to.eq('');
 
     const isModuleVisible = await moduleManagerPage.isModuleVisible(page, Modules.psFacetedSearch);
-    await expect(isModuleVisible).to.be.true;
+    expect(isModuleVisible).to.eq(true);
 
     const isModalVisible = await moduleManagerPage.isModalActionVisible(page, Modules.psFacetedSearch, 'uninstall');
-    await expect(isModalVisible).to.be.false;
+    expect(isModalVisible).to.eq(false);
 
     const dirExists = await files.doesFileExist(`${files.getRootPath()}/modules/${Modules.psFacetedSearch.tag}/`);
-    await expect(dirExists).to.be.true;
+    expect(dirExists).to.eq(true);
   });
 
   it('should uninstall the module', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetModule', baseContext);
 
     const successMessage = await moduleManagerPage.setActionInModule(page, Modules.psFacetedSearch, 'uninstall', false, true);
-    await expect(successMessage).to.eq(moduleManagerPage.uninstallModuleSuccessMessage(Modules.psFacetedSearch.tag));
+    expect(successMessage).to.eq(moduleManagerPage.uninstallModuleSuccessMessage(Modules.psFacetedSearch.tag));
 
     // Check the directory `modules/Modules.psFacetedSearch.tag`
     const dirExists = await files.doesFileExist(`${files.getRootPath()}/modules/${Modules.psFacetedSearch.tag}/`);
-    await expect(dirExists).to.be.false;
+    expect(dirExists).to.eq(false);
   });
 
   it('should go to Front Office', async function () {
@@ -97,7 +97,7 @@ describe('Faceted search module - Uninstall and delete module', async () => {
     await homePage.changeLanguage(page, 'en');
 
     const isHomePage = await homePage.isHomePage(page);
-    await expect(isHomePage).to.be.true;
+    expect(isHomePage).to.eq(true);
   });
 
   it('should go to the category Page', async function () {
@@ -106,14 +106,14 @@ describe('Faceted search module - Uninstall and delete module', async () => {
     await homePage.goToCategory(page, Categories.clothes.id);
 
     const pageTitle = await homePage.getPageTitle(page);
-    await expect(pageTitle).to.equal(Categories.clothes.name);
+    expect(pageTitle).to.equal(Categories.clothes.name);
   });
 
   it(`should check that ${Modules.psFacetedSearch.name} is not present`, async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'checkModuleNotPresent', baseContext);
 
     const hasFilters = await categoryPage.hasSearchFilters(page);
-    await expect(hasFilters).to.be.false;
+    expect(hasFilters).to.eq(false);
   });
 
   describe(`POST-CONDITION : Install the module ${Modules.psFacetedSearch.name}`, async () => {
@@ -123,7 +123,7 @@ describe('Faceted search module - Uninstall and delete module', async () => {
       page = await categoryPage.closePage(browserContext, page, 0);
 
       const pageTitle = await moduleManagerPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
+      expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
     });
 
     it(`should download the zip of the module '${Modules.psFacetedSearch.name}'`, async function () {
@@ -132,28 +132,28 @@ describe('Faceted search module - Uninstall and delete module', async () => {
       await files.downloadFile(Modules.psFacetedSearch.releaseZip, 'module.zip');
 
       const found = await files.doesFileExist('module.zip');
-      await expect(found).to.be.true;
+      expect(found).to.eq(true);
     });
 
     it(`should upload the module '${Modules.psFacetedSearch.name}'`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'uploadModule', baseContext);
 
       const successMessage = await moduleManagerPage.uploadModule(page, 'module.zip');
-      await expect(successMessage).to.eq(moduleManagerPage.uploadModuleSuccessMessage);
+      expect(successMessage).to.eq(moduleManagerPage.uploadModuleSuccessMessage);
     });
 
     it('should close upload module modal', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'closeModal', baseContext);
 
       const isModalNotVisible = await moduleManagerPage.closeUploadModuleModal(page);
-      await expect(isModalNotVisible).to.be.true;
+      expect(isModalNotVisible).to.eq(true);
     });
 
     it(`should search the module '${Modules.psFacetedSearch.name}'`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkModulePresent', baseContext);
 
       const isModuleVisible = await moduleManagerPage.searchModule(page, Modules.psFacetedSearch);
-      await expect(isModuleVisible, 'Module is not visible!').to.be.true;
+      expect(isModuleVisible, 'Module is not visible!').to.eq(true);
     });
   });
 });
diff --git a/tests/UI/campaigns/productV2/functional/01_filterProducts.ts b/tests/UI/campaigns/productV2/functional/01_filterProducts.ts
index 7912cc962069f..e3a13c4f322fc 100644
--- a/tests/UI/campaigns/productV2/functional/01_filterProducts.ts
+++ b/tests/UI/campaigns/productV2/functional/01_filterProducts.ts
@@ -49,21 +49,21 @@ describe('BO - Catalog - Products : Filter in Products Page', async () => {
       );
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should check that no filter is applied by default', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkNoFilter', baseContext);
 
       const isVisible = await productsPage.isResetButtonVisible(page);
-      await expect(isVisible, 'Reset button is visible!').to.be.false;
+      expect(isVisible, 'Reset button is visible!').to.eq(false);
     });
 
     it('should get number of products', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'getNumberOfProduct', baseContext);
 
       numberOfProducts = await productsPage.getNumberOfProductsFromHeader(page);
-      await expect(numberOfProducts).to.be.above(0);
+      expect(numberOfProducts).to.be.above(0);
     });
 
     [
@@ -101,7 +101,7 @@ describe('BO - Catalog - Products : Filter in Products Page', async () => {
         await productsPage.filterProducts(page, test.args.filterBy, test.args.filterValue, test.args.filterType);
 
         const textMessage = await productsPage.getAlertDangerBlockContent(page);
-        await expect(textMessage).to.equal(test.args.alertDanger);
+        expect(textMessage).to.equal(test.args.alertDanger);
       });
     });
 
@@ -175,9 +175,9 @@ describe('BO - Catalog - Products : Filter in Products Page', async () => {
         const numberOfProductsAfterFilter = await productsPage.getNumberOfProductsFromList(page);
 
         if (test.args.filterBy === 'active') {
-          await expect(numberOfProductsAfterFilter).to.be.above(0);
+          expect(numberOfProductsAfterFilter).to.be.above(0);
         } else {
-          await expect(numberOfProductsAfterFilter).to.be.below(numberOfProducts);
+          expect(numberOfProductsAfterFilter).to.be.below(numberOfProducts);
         }
 
         for (let i = 1; i <= numberOfProductsAfterFilter; i++) {
@@ -185,18 +185,18 @@ describe('BO - Catalog - Products : Filter in Products Page', async () => {
 
           switch (test.args.comparisonType) {
             case 'toWithinMinMax':
-              await expect(typeof test.args.filterValue).to.be.eq('object');
+              expect(typeof test.args.filterValue).to.be.eq('object');
               if (typeof test.args.filterValue !== 'string') {
-                await expect(textColumn).to.within(test.args.filterValue.min, test.args.filterValue.max);
+                expect(textColumn).to.within(test.args.filterValue.min, test.args.filterValue.max);
               }
               break;
 
             case 'toBeTrue':
-              await expect(textColumn).to.be.true;
+              expect(textColumn).to.eq(true);
               break;
 
             default:
-              await expect(textColumn).to.contain(test.args.filterValue);
+              expect(textColumn).to.contain(test.args.filterValue);
           }
         }
       });
@@ -205,7 +205,7 @@ describe('BO - Catalog - Products : Filter in Products Page', async () => {
         await testContext.addContextItem(this, 'testIdentifier', `resetAfter${test.args.identifier}`, baseContext);
 
         const numberOfProductsAfterReset = await productsPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfProductsAfterReset).to.equal(numberOfProducts);
+        expect(numberOfProductsAfterReset).to.equal(numberOfProducts);
       });
     });
 
@@ -215,14 +215,14 @@ describe('BO - Catalog - Products : Filter in Products Page', async () => {
       await productsPage.filterProducts(page, 'active', 'No', 'select');
 
       const textColumn = await productsPage.getTextForEmptyTable(page);
-      await expect(textColumn).to.equal('warning No records found');
+      expect(textColumn).to.equal('warning No records found');
     });
 
     it('should reset filter', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterByStatus', baseContext);
 
       const numberOfProductsAfterReset = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProductsAfterReset).to.equal(numberOfProducts);
+      expect(numberOfProductsAfterReset).to.equal(numberOfProducts);
     });
   });
 
@@ -233,35 +233,35 @@ describe('BO - Catalog - Products : Filter in Products Page', async () => {
       await productsPage.filterProductsByCategory(page, 'Home');
 
       const numberOfProductsAfterFilter = await productsPage.getNumberOfProductsFromList(page);
-      await expect(numberOfProductsAfterFilter).to.equal(numberOfProducts);
+      expect(numberOfProductsAfterFilter).to.equal(numberOfProducts);
     });
 
     it('should check the filter by category button name', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkFilterButtonName', baseContext);
 
       const filterButtonName = await productsPage.getFilterByCategoryButtonName(page);
-      await expect(filterButtonName).to.equal('Filter by categories (Home)');
+      expect(filterButtonName).to.equal('Filter by categories (Home)');
     });
 
     it('should check that the \'Clear filter\' link is visible', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkClearFilterLink', baseContext);
 
       const isVisible = await productsPage.isClearFilterLinkVisible(page);
-      await expect(isVisible).to.be.true;
+      expect(isVisible).to.eq(true);
     });
 
     it('should check that the new column \'Position\' is visible', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkPositionColumn', baseContext);
 
       const isVisible = await productsPage.isPositionColumnVisible(page);
-      await expect(isVisible).to.be.true;
+      expect(isVisible).to.eq(true);
     });
 
     it('should reset filter', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterByPosition', baseContext);
 
       const numberOfProductsAfterReset = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProductsAfterReset).to.equal(numberOfProducts);
+      expect(numberOfProductsAfterReset).to.equal(numberOfProducts);
     });
 
     it('should click on \'Clear filter\' button', async function () {
@@ -270,21 +270,21 @@ describe('BO - Catalog - Products : Filter in Products Page', async () => {
       await productsPage.clickOnClearFilterLink(page);
 
       const numberOfProductsAfterReset = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProductsAfterReset).to.equal(numberOfProducts);
+      expect(numberOfProductsAfterReset).to.equal(numberOfProducts);
     });
 
     it('should check that the \'Clear filter\' link is not visible', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkClearFilterLinkNotVisible', baseContext);
 
       const isVisible = await productsPage.isClearFilterLinkVisible(page);
-      await expect(isVisible).to.be.false;
+      expect(isVisible).to.eq(false);
     });
 
     it('should check that the new column \'Position\' is not visible', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkPositionColumnNotVisible', baseContext);
 
       const isVisible = await productsPage.isPositionColumnVisible(page);
-      await expect(isVisible).to.be.false;
+      expect(isVisible).to.eq(false);
     });
   });
 });
diff --git a/tests/UI/campaigns/productV2/functional/02_CRUDStandardProduct.ts b/tests/UI/campaigns/productV2/functional/02_CRUDStandardProduct.ts
index 4eac8cc63a8da..9bf10224c0360 100644
--- a/tests/UI/campaigns/productV2/functional/02_CRUDStandardProduct.ts
+++ b/tests/UI/campaigns/productV2/functional/02_CRUDStandardProduct.ts
@@ -85,21 +85,21 @@ describe('BO - Catalog - Products : CRUD standard product', async () => {
       await productsPage.closeSfToolBar(page);
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should click on \'New product\' button and check new product modal', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnNewProductButton', baseContext);
 
       const isModalVisible = await productsPage.clickOnNewProductButton(page);
-      await expect(isModalVisible).to.be.true;
+      expect(isModalVisible).to.eq(true);
     });
 
     it('should check the standard product description', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkStandardProductDescription', baseContext);
 
       const productTypeDescription = await productsPage.getProductDescription(page);
-      await expect(productTypeDescription).to.contains(productsPage.standardProductDescription);
+      expect(productTypeDescription).to.contains(productsPage.standardProductDescription);
     });
 
     it('should choose \'Standard product\'', async function () {
@@ -108,7 +108,7 @@ describe('BO - Catalog - Products : CRUD standard product', async () => {
       await productsPage.selectProductType(page, newProductData.type);
 
       const pageTitle = await createProductsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
     });
 
     it('should go to new product page', async function () {
@@ -117,7 +117,7 @@ describe('BO - Catalog - Products : CRUD standard product', async () => {
       await productsPage.clickOnAddNewProduct(page);
 
       const pageTitle = await createProductsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
     });
 
     it('should create standard product', async function () {
@@ -126,7 +126,7 @@ describe('BO - Catalog - Products : CRUD standard product', async () => {
       await createProductsPage.closeSfToolBar(page);
 
       const createProductMessage = await createProductsPage.setProduct(page, newProductData);
-      await expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+      expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
     });
 
     it('should check the product header details', async function () {
@@ -148,7 +148,7 @@ describe('BO - Catalog - Products : CRUD standard product', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'checkSaveButton', baseContext);
 
       const saveButtonName = await createProductsPage.getSaveButtonName(page);
-      await expect(saveButtonName).to.equal('Save and publish');
+      expect(saveButtonName).to.equal('Save and publish');
     });
   });
 
@@ -163,7 +163,7 @@ describe('BO - Catalog - Products : CRUD standard product', async () => {
       await foProductPage.changeLanguage(page, 'en');
 
       const pageTitle = await foProductPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(newProductData.name);
+      expect(pageTitle).to.contains(newProductData.name);
     });
 
     it('should check all product information', async function () {
@@ -173,10 +173,10 @@ describe('BO - Catalog - Products : CRUD standard product', async () => {
 
       const result = await foProductPage.getProductInformation(page);
       await Promise.all([
-        await expect(result.name).to.equal(newProductData.name),
-        await expect(result.price.toFixed(2)).to.equal((newProductData.price + taxValue).toFixed(2)),
-        await expect(result.summary).to.equal(newProductData.summary),
-        await expect(result.description).to.equal(newProductData.description),
+        expect(result.name).to.equal(newProductData.name),
+        expect(result.price.toFixed(2)).to.equal((newProductData.price + taxValue).toFixed(2)),
+        expect(result.summary).to.equal(newProductData.summary),
+        expect(result.description).to.equal(newProductData.description),
       ]);
     });
 
@@ -187,7 +187,7 @@ describe('BO - Catalog - Products : CRUD standard product', async () => {
       page = await foProductPage.closePage(browserContext, page, 0);
 
       const pageTitle = await createProductsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
     });
   });
 
@@ -197,7 +197,7 @@ describe('BO - Catalog - Products : CRUD standard product', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'editProduct', baseContext);
 
       const createProductMessage = await createProductsPage.setProduct(page, editProductData);
-      await expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+      expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
     });
 
     it('should check the product header details', async function () {
@@ -227,7 +227,7 @@ describe('BO - Catalog - Products : CRUD standard product', async () => {
       await foProductPage.changeLanguage(page, 'en');
 
       const pageTitle = await foProductPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(editProductData.name);
+      expect(pageTitle).to.contains(editProductData.name);
     });
 
     it('should check all product information', async function () {
@@ -237,9 +237,9 @@ describe('BO - Catalog - Products : CRUD standard product', async () => {
 
       const result = await foProductPage.getProductInformation(page);
       await Promise.all([
-        await expect(result.name).to.equal(editProductData.name),
-        await expect(result.price.toFixed(2)).to.equal((editProductData.price + taxValue).toFixed(2)),
-        await expect(result.description).to.equal(editProductData.description),
+        expect(result.name).to.equal(editProductData.name),
+        expect(result.price.toFixed(2)).to.equal((editProductData.price + taxValue).toFixed(2)),
+        expect(result.description).to.equal(editProductData.description),
       ]);
     });
 
@@ -250,7 +250,7 @@ describe('BO - Catalog - Products : CRUD standard product', async () => {
       page = await foProductPage.closePage(browserContext, page, 0);
 
       const pageTitle = await createProductsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
     });
   });
 
@@ -260,7 +260,7 @@ describe('BO - Catalog - Products : CRUD standard product', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteProduct', baseContext);
 
       const createProductMessage = await createProductsPage.deleteProduct(page);
-      await expect(createProductMessage).to.equal(productsPage.successfulDeleteMessage);
+      expect(createProductMessage).to.equal(productsPage.successfulDeleteMessage);
     });
   });
 });
diff --git a/tests/UI/campaigns/productV2/functional/03_CRUDProductWithCombinations.ts b/tests/UI/campaigns/productV2/functional/03_CRUDProductWithCombinations.ts
index 4c95d361e7baa..afadad03a4234 100644
--- a/tests/UI/campaigns/productV2/functional/03_CRUDProductWithCombinations.ts
+++ b/tests/UI/campaigns/productV2/functional/03_CRUDProductWithCombinations.ts
@@ -179,7 +179,7 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnNewProductButton', baseContext);
 
       const isModalVisible = await productsPage.clickOnNewProductButton(page);
-      expect(isModalVisible).eq(true);
+      expect(isModalVisible).to.eq(true);
     });
 
     it('should select the product with combination and check the description', async function () {
@@ -250,7 +250,7 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       await testContext.addContextItem(this, 'testIdentifier', 'generateCombinationsModalIsClosed2', baseContext);
 
       const isModalClosed = await combinationsTab.generateCombinationModalIsClosed(page);
-      expect(isModalClosed).eq(true);
+      expect(isModalClosed).to.eq(true);
     });
   });
 
@@ -266,7 +266,7 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnEditSecondCombination', baseContext);
 
       const isVisible = await combinationsTab.clickOnEditIcon(page, 2);
-      expect(isVisible).eq(true);
+      expect(isVisible).to.eq(true);
     });
 
     it('should edit the combination from the modal', async function () {
@@ -291,7 +291,7 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       await testContext.addContextItem(this, 'testIdentifier', 'closeModal', baseContext);
 
       const isModalVisible = await combinationsTab.closeEditCombinationModal(page);
-      expect(isModalVisible).eq(false);
+      expect(isModalVisible).to.eq(false);
     });
   });
 
@@ -445,7 +445,7 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       await testContext.addContextItem(this, 'testIdentifier', 'deleteFirstCombinationCancel', baseContext);
 
       const isModalVisible = await combinationsTab.clickOnDeleteIcon(page, 'cancel');
-      expect(isModalVisible).eq(false);
+      expect(isModalVisible).to.eq(false);
     });
 
     it('should delete the first combination', async function () {
@@ -489,7 +489,7 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       await testContext.addContextItem(this, 'testIdentifier', 'selectAllCombinations', baseContext);
 
       const isBulkActionsButtonVisible = await combinationsTab.selectAllCombinations(page);
-      expect(isBulkActionsButtonVisible).eq(true);
+      expect(isBulkActionsButtonVisible).to.eq(true);
     });
 
     it('should click on edit combinations by bulk actions and check the modal title', async function () {
@@ -610,14 +610,14 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       await testContext.addContextItem(this, 'testIdentifier', 'generateCombinations2', baseContext);
 
       const successMessage = await combinationsTab.generateCombinations(page);
-      await expect(successMessage).to.equal(combinationsTab.successfulGenerateCombinationsMessage(6));
+      expect(successMessage).to.equal(combinationsTab.successfulGenerateCombinationsMessage(6));
     });
 
     it('combinations generation modal should be closed', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'generateCombinationsModalIsClosed2', baseContext);
 
       const isModalClosed = await combinationsTab.generateCombinationModalIsClosed(page);
-      expect(isModalClosed).eq(true);
+      expect(isModalClosed).to.eq(true);
     });
 
     it('should save the product', async function () {
diff --git a/tests/UI/campaigns/productV2/functional/04_CRUDPackOfProducts.ts b/tests/UI/campaigns/productV2/functional/04_CRUDPackOfProducts.ts
index 6fdfd525c27a6..e809c02a380aa 100644
--- a/tests/UI/campaigns/productV2/functional/04_CRUDPackOfProducts.ts
+++ b/tests/UI/campaigns/productV2/functional/04_CRUDPackOfProducts.ts
@@ -119,14 +119,14 @@ describe('BO - Catalog - Products : CRUD pack of products', async () => {
         await productsPage.closeSfToolBar(page);
 
         const pageTitle = await productsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(productsPage.pageTitle);
+        expect(pageTitle).to.contains(productsPage.pageTitle);
       });
 
       it('should click on \'New product\' button and check new product modal', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'clickOnNewProductButton', baseContext);
 
         const isModalVisible = await productsPage.clickOnNewProductButton(page);
-        await expect(isModalVisible).to.be.true;
+        expect(isModalVisible).to.eq(true);
       });
 
       it('should choose \'Pack of products\'', async function () {
@@ -135,7 +135,7 @@ describe('BO - Catalog - Products : CRUD pack of products', async () => {
         await productsPage.selectProductType(page, newProductData.type);
 
         const pageTitle = await createProductsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+        expect(pageTitle).to.contains(createProductsPage.pageTitle);
       });
 
       it('should select the pack of products and check the description', async function () {
@@ -144,7 +144,7 @@ describe('BO - Catalog - Products : CRUD pack of products', async () => {
         await productsPage.selectProductType(page, newProductData.type);
 
         const productTypeDescription = await productsPage.getProductDescription(page);
-        await expect(productTypeDescription).to.contains(productsPage.packOfProductsDescription);
+        expect(productTypeDescription).to.contains(productsPage.packOfProductsDescription);
       });
 
       it('should go to new product page', async function () {
@@ -153,7 +153,7 @@ describe('BO - Catalog - Products : CRUD pack of products', async () => {
         await productsPage.clickOnAddNewProduct(page);
 
         const pageTitle = await createProductsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+        expect(pageTitle).to.contains(createProductsPage.pageTitle);
       });
     });
 
@@ -164,21 +164,21 @@ describe('BO - Catalog - Products : CRUD pack of products', async () => {
         await createProductsPage.closeSfToolBar(page);
 
         const createProductMessage = await createProductsPage.setProduct(page, newProductData);
-        await expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+        expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
       });
 
       it('should search for the same product and check that no results found', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'searchSameProduct', baseContext);
 
         const searchResult = await packTab.searchProduct(page, 'demo_11');
-        await expect(searchResult).to.equal('No results found for "demo_11"');
+        expect(searchResult).to.equal('No results found for "demo_11"');
       });
 
       it('should search for a non existent product', async function () {
         await testContext.addContextItem(this, 'testIdentifier', 'searchNonExistentProduct', baseContext);
 
         const searchResult = await packTab.searchProduct(page, 'Pack mug');
-        await expect(searchResult).to.equal('No results found for "Pack mug"');
+        expect(searchResult).to.equal('No results found for "Pack mug"');
       });
       const tests = [
         {
@@ -226,14 +226,14 @@ describe('BO - Catalog - Products : CRUD pack of products', async () => {
           await testContext.addContextItem(this, 'testIdentifier', `searchProductToPack${index}`, baseContext);
 
           const searchResult = await packTab.searchProduct(page, test.args.product.name);
-          await expect(searchResult).to.equal(test.args.resultOfSearch);
+          expect(searchResult).to.equal(test.args.resultOfSearch);
         });
 
         it('should check the number of product in list', async function () {
           await testContext.addContextItem(this, 'testIdentifier', `checkNumberOfProductsInList${index}`, baseContext);
 
           const numberOfProducts = await packTab.getNumberOfSearchedProduct(page);
-          await expect(numberOfProducts).to.equal(test.args.numberOfProducts);
+          expect(numberOfProducts).to.equal(test.args.numberOfProducts);
         });
 
         if (test.args.productType === 'product with combination') {
@@ -241,14 +241,14 @@ describe('BO - Catalog - Products : CRUD pack of products', async () => {
             await testContext.addContextItem(this, 'testIdentifier', 'chooseThirdCombination', baseContext);
 
             const isListOfProductVisible = await packTab.selectProductFromList(page, 3);
-            await expect(isListOfProductVisible).to.be.true;
+            expect(isListOfProductVisible).to.eq(true);
           });
         } else {
           it('should choose the searched product', async function () {
             await testContext.addContextItem(this, 'testIdentifier', `chooseProduct${index}`, baseContext);
 
             const isListOfProductVisible = await packTab.selectProductFromList(page, 1);
-            await expect(isListOfProductVisible).to.be.true;
+            expect(isListOfProductVisible).to.eq(true);
           });
         }
 
@@ -256,7 +256,7 @@ describe('BO - Catalog - Products : CRUD pack of products', async () => {
           await testContext.addContextItem(this, 'testIdentifier', `checkNumberOfProductsInPack${index}`, baseContext);
 
           const numberOfProducts = await packTab.getNumberOfProductsInPack(page);
-          await expect(numberOfProducts).to.equal(index + 2);
+          expect(numberOfProducts).to.equal(index + 2);
         });
 
         it('should check the selected product information', async function () {
@@ -264,10 +264,10 @@ describe('BO - Catalog - Products : CRUD pack of products', async () => {
 
           const result = await packTab.getProductInPackInformation(page, index + 2);
           await Promise.all([
-            await expect(result.image).to.contains(test.args.product.defaultImage),
-            await expect(result.name).to.equal(test.args.productToChooseName),
-            await expect(result.reference).to.equal(`Ref: ${test.args.product.reference}`),
-            await expect(result.quantity).to.equal(1),
+            expect(result.image).to.contains(test.args.product.defaultImage),
+            expect(result.name).to.equal(test.args.productToChooseName),
+            expect(result.reference).to.equal(`Ref: ${test.args.product.reference}`),
+            expect(result.quantity).to.equal(1),
           ]);
         });
       });
@@ -282,7 +282,7 @@ describe('BO - Catalog - Products : CRUD pack of products', async () => {
       await packTab.setProductQuantity(page, 0, -1);
 
       const errorMessage = await packTab.saveAndGetProductInPackErrorMessage(page, 1);
-      await expect(errorMessage).to.equal('This value should be greater than or equal to 1.');
+      expect(errorMessage).to.equal('This value should be greater than or equal to 1.');
     });
 
     it('should try to edit the quantity of the customized product by a text', async function () {
@@ -291,7 +291,7 @@ describe('BO - Catalog - Products : CRUD pack of products', async () => {
       await packTab.setProductQuantity(page, 0, 'test');
 
       const errorMessage = await packTab.saveAndGetProductInPackErrorMessage(page, 1);
-      await expect(errorMessage).to.equal('This value should be of type numeric.');
+      expect(errorMessage).to.equal('This value should be of type numeric.');
     });
 
     it('should set a valid quantity then save the product', async function () {
@@ -300,21 +300,21 @@ describe('BO - Catalog - Products : CRUD pack of products', async () => {
       await packTab.setProductQuantity(page, 0, 15);
 
       const updateProductMessage = await createProductsPage.saveProduct(page);
-      await expect(updateProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+      expect(updateProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
     });
 
     it('should try delete the customized product then cancel', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'cancelDeleteProduct', baseContext);
 
       const isModalVisible = await packTab.deleteProduct(page, 1, false);
-      await expect(isModalVisible).to.be.true;
+      expect(isModalVisible).to.eq(true);
     });
 
     it('should delete the customized product', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteCustomizedProduct', baseContext);
 
       const firstProductInList = await packTab.deleteProduct(page, 1, true);
-      await expect(firstProductInList).to.equal(createProductsPage.successfulUpdateMessage);
+      expect(firstProductInList).to.equal(createProductsPage.successfulUpdateMessage);
     });
 
     it('should edit the quantity and the minimum quantity of the pack then save', async function () {
@@ -323,7 +323,7 @@ describe('BO - Catalog - Products : CRUD pack of products', async () => {
       await packTab.editPackOfProducts(page, editPackData);
 
       const updateProductMessage = await createProductsPage.saveProduct(page);
-      await expect(updateProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+      expect(updateProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
     });
 
     it('should check the recent stock movement', async function () {
@@ -331,9 +331,9 @@ describe('BO - Catalog - Products : CRUD pack of products', async () => {
 
       const result = await packTab.getStockMovement(page, 1);
       await Promise.all([
-        await expect(result.dateTime).to.contains(todayDate),
-        await expect(result.employee).to.equal(`${Employees.DefaultEmployee.firstName} ${Employees.DefaultEmployee.lastName}`),
-        await expect(result.quantity).to.equal(editPackData.quantity),
+        expect(result.dateTime).to.contains(todayDate),
+        expect(result.employee).to.equal(`${Employees.DefaultEmployee.firstName} ${Employees.DefaultEmployee.lastName}`),
+        expect(result.quantity).to.equal(editPackData.quantity),
       ]);
     });
 
@@ -345,7 +345,7 @@ describe('BO - Catalog - Products : CRUD pack of products', async () => {
       await createProductsPage.setProductStatus(page, true);
 
       const updateProductMessage = await createProductsPage.saveProduct(page);
-      await expect(updateProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+      expect(updateProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
     });
 
     it('should check the product header details', async function () {
@@ -375,7 +375,7 @@ describe('BO - Catalog - Products : CRUD pack of products', async () => {
       await foProductPage.changeLanguage(page, 'en');
 
       const pageTitle = await foProductPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(newProductData.name);
+      expect(pageTitle).to.contains(newProductData.name);
     });
 
     it('should check all product information', async function () {
@@ -385,10 +385,10 @@ describe('BO - Catalog - Products : CRUD pack of products', async () => {
 
       const result = await foProductPage.getProductInformation(page);
       await Promise.all([
-        await expect(result.name).to.equal(newProductData.name),
-        await expect(result.price.toFixed(2)).to.equal((pricingData.price + taxValue).toFixed(2)),
-        await expect(result.summary).to.equal(newProductData.summary),
-        await expect(result.description).to.equal(newProductData.description),
+        expect(result.name).to.equal(newProductData.name),
+        expect(result.price.toFixed(2)).to.equal((pricingData.price + taxValue).toFixed(2)),
+        expect(result.summary).to.equal(newProductData.summary),
+        expect(result.description).to.equal(newProductData.description),
       ]);
     });
 
@@ -403,10 +403,10 @@ describe('BO - Catalog - Products : CRUD pack of products', async () => {
 
         const result = await foProductPage.getProductInPackList(page, index + 1);
         await Promise.all([
-          await expect(result.image).to.contains(test.args.product.coverImage),
-          await expect(result.name).to.equal(test.args.product.name),
-          await expect(result.price).to.equal(`€${test.args.product.finalPrice.toFixed(2)}`),
-          await expect(result.quantity).to.equal(test.args.quantity),
+          expect(result.image).to.contains(test.args.product.coverImage),
+          expect(result.name).to.equal(test.args.product.name),
+          expect(result.price).to.equal(`€${test.args.product.finalPrice.toFixed(2)}`),
+          expect(result.quantity).to.equal(test.args.quantity),
         ]);
       });
     });
@@ -421,14 +421,14 @@ describe('BO - Catalog - Products : CRUD pack of products', async () => {
       page = await foProductPage.closePage(browserContext, page, 0);
 
       const pageTitle = await createProductsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
     });
 
     it('should edit the created product', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'editProduct', baseContext);
 
       const createProductMessage = await createProductsPage.setProduct(page, editProductData);
-      await expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+      expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
     });
   });
 
@@ -443,7 +443,7 @@ describe('BO - Catalog - Products : CRUD pack of products', async () => {
       await foProductPage.changeLanguage(page, 'en');
 
       const pageTitle = await foProductPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(editProductData.name);
+      expect(pageTitle).to.contains(editProductData.name);
     });
 
     it('should check all product information', async function () {
@@ -453,10 +453,10 @@ describe('BO - Catalog - Products : CRUD pack of products', async () => {
 
       const result = await foProductPage.getProductInformation(page);
       await Promise.all([
-        await expect(result.name).to.equal(editProductData.name),
-        await expect(result.price.toFixed(2)).to.equal((editProductData.price + taxValue).toFixed(2)),
-        await expect(result.summary).to.equal(editProductData.summary),
-        await expect(result.description).to.equal(editProductData.description),
+        expect(result.name).to.equal(editProductData.name),
+        expect(result.price.toFixed(2)).to.equal((editProductData.price + taxValue).toFixed(2)),
+        expect(result.summary).to.equal(editProductData.summary),
+        expect(result.description).to.equal(editProductData.description),
       ]);
     });
 
@@ -472,10 +472,10 @@ describe('BO - Catalog - Products : CRUD pack of products', async () => {
 
         const result = await foProductPage.getProductInPackList(page, index + 1);
         await Promise.all([
-          await expect(result.image).to.contains(test.args.product.coverImage),
-          await expect(result.name).to.equal(test.args.product.name),
-          await expect(result.price).to.equal(`€${test.args.product.finalPrice.toFixed(2)}`),
-          await expect(result.quantity).to.equal(test.args.quantity),
+          expect(result.image).to.contains(test.args.product.coverImage),
+          expect(result.name).to.equal(test.args.product.name),
+          expect(result.price).to.equal(`€${test.args.product.finalPrice.toFixed(2)}`),
+          expect(result.quantity).to.equal(test.args.quantity),
         ]);
       });
     });
@@ -490,14 +490,14 @@ describe('BO - Catalog - Products : CRUD pack of products', async () => {
       page = await foProductPage.closePage(browserContext, page, 0);
 
       const pageTitle = await createProductsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
     });
 
     it('should delete product', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteProduct', baseContext);
 
       const createProductMessage = await createProductsPage.deleteProduct(page);
-      await expect(createProductMessage).to.equal(productsPage.successfulDeleteMessage);
+      expect(createProductMessage).to.equal(productsPage.successfulDeleteMessage);
     });
   });
 });
diff --git a/tests/UI/campaigns/productV2/functional/06_duplicateProduct.ts b/tests/UI/campaigns/productV2/functional/06_duplicateProduct.ts
index 4dcc90e4c8d96..b726d3b20c167 100644
--- a/tests/UI/campaigns/productV2/functional/06_duplicateProduct.ts
+++ b/tests/UI/campaigns/productV2/functional/06_duplicateProduct.ts
@@ -49,14 +49,14 @@ describe('BO - Catalog - Products : Duplicate product', async () => {
       await productsPage.closeSfToolBar(page);
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should get number of products', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'getNumberOfProduct', baseContext);
 
       numberOfProducts = await productsPage.getNumberOfProductsFromHeader(page);
-      await expect(numberOfProducts).to.be.above(0);
+      expect(numberOfProducts).to.be.above(0);
     });
 
     it(`should filter by reference '${Products.demo_14.reference}'`, async function () {
@@ -65,28 +65,28 @@ describe('BO - Catalog - Products : Duplicate product', async () => {
       await productsPage.filterProducts(page, 'reference', Products.demo_14.reference);
 
       const numberOfProductsAfterFilter = await productsPage.getNumberOfProductsFromList(page);
-      await expect(numberOfProductsAfterFilter).to.equal(1);
+      expect(numberOfProductsAfterFilter).to.equal(1);
     });
 
     it('should click on duplicate button', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnDuplicateProduct', baseContext);
 
       const isModalVisible = await productsPage.clickOnDuplicateProductButton(page);
-      await expect(isModalVisible).to.be.true;
+      expect(isModalVisible).to.eq(true);
     });
 
     it('should duplicate product', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'duplicateProduct', baseContext);
 
       const textMessage = await productsPage.clickOnConfirmDialogButton(page);
-      await expect(textMessage).to.equal(createProductsPage.successfulDuplicateMessage);
+      expect(textMessage).to.equal(createProductsPage.successfulDuplicateMessage);
     });
 
     it('should click on duplicate button from the footer of create product page', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickDuplicateFromFooterPage', baseContext);
 
       const textMessage = await createProductsPage.duplicateProduct(page);
-      await expect(textMessage).to.equal(createProductsPage.successfulDuplicateMessage);
+      expect(textMessage).to.equal(createProductsPage.successfulDuplicateMessage);
     });
 
     it('should click on \'Go to catalog\' button', async function () {
@@ -95,14 +95,14 @@ describe('BO - Catalog - Products : Duplicate product', async () => {
       await createProductsPage.goToCatalogPage(page);
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should check the number of duplicated products', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkNumberOfProducts', baseContext);
 
       const numberOfProductsAfterDuplicate = await productsPage.getNumberOfProductsFromList(page);
-      await expect(numberOfProductsAfterDuplicate).to.equal(3);
+      expect(numberOfProductsAfterDuplicate).to.equal(3);
     });
 
     it('should check the name of the duplicated product', async function () {
@@ -111,10 +111,10 @@ describe('BO - Catalog - Products : Duplicate product', async () => {
       await productsPage.filterProducts(page, 'product_name', 'copy of');
 
       let textColumn = await productsPage.getTextColumn(page, 'product_name', 1);
-      await expect(textColumn).to.contain(`copy of copy of ${Products.demo_14.name}`);
+      expect(textColumn).to.contain(`copy of copy of ${Products.demo_14.name}`);
 
       textColumn = await productsPage.getTextColumn(page, 'product_name', 2);
-      await expect(textColumn).to.contain(`copy of ${Products.demo_14.name}`);
+      expect(textColumn).to.contain(`copy of ${Products.demo_14.name}`);
     });
   });
 
@@ -123,35 +123,35 @@ describe('BO - Catalog - Products : Duplicate product', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnDeleteProduct', baseContext);
 
       const isBulkDeleteButtonEnabled = await productsPage.bulkSelectProducts(page);
-      await expect(isBulkDeleteButtonEnabled).to.be.true;
+      expect(isBulkDeleteButtonEnabled).to.eq(true);
     });
 
     it('should click on bulk actions button', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnBulkDeleteButton', baseContext);
 
       const textMessage = await productsPage.clickOnBulkActionsProducts(page, 'delete');
-      await expect(textMessage).to.equal('Deleting 2 products');
+      expect(textMessage).to.equal('Deleting 2 products');
     });
 
     it('should bulk delete products', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteProduct', baseContext);
 
       const textMessage = await productsPage.bulkActionsProduct(page, 'delete');
-      await expect(textMessage).to.equal('Deleting 2 / 2 products');
+      expect(textMessage).to.equal('Deleting 2 / 2 products');
     });
 
     it('should close progress modal', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'closeProgressModal', baseContext);
 
       const isModalVisible = await productsPage.closeBulkActionsProgressModal(page, 'delete');
-      await expect(isModalVisible).to.be.true;
+      expect(isModalVisible).to.eq(true);
     });
 
     it('should reset filter', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilter', baseContext);
 
       const numberOfProductsAfterReset = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProductsAfterReset).to.equal(numberOfProducts);
+      expect(numberOfProductsAfterReset).to.equal(numberOfProducts);
     });
   });
 });
diff --git a/tests/UI/campaigns/productV2/functional/07_productBulkActions.ts b/tests/UI/campaigns/productV2/functional/07_productBulkActions.ts
index 727125f0a1323..9f6cf9b5a0ddc 100644
--- a/tests/UI/campaigns/productV2/functional/07_productBulkActions.ts
+++ b/tests/UI/campaigns/productV2/functional/07_productBulkActions.ts
@@ -64,21 +64,21 @@ describe('BO - Catalog - Products : Enable, disable, duplicate and Delete produc
       await productsPage.closeSfToolBar(page);
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should reset filter and get number of products', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'getNumberOfProduct', baseContext);
 
       numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProducts).to.be.above(0);
+      expect(numberOfProducts).to.be.above(0);
     });
 
     it('should click on \'New product\' button and check new product modal', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnNewProductButton', baseContext);
 
       const isModalVisible = await productsPage.clickOnNewProductButton(page);
-      await expect(isModalVisible).to.be.true;
+      expect(isModalVisible).to.eq(true);
     });
 
     it('should choose \'Standard product\'', async function () {
@@ -87,7 +87,7 @@ describe('BO - Catalog - Products : Enable, disable, duplicate and Delete produc
       await productsPage.selectProductType(page, firstProductData.type);
 
       const pageTitle = await createProductsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
     });
 
     it('should go to new product page', async function () {
@@ -96,7 +96,7 @@ describe('BO - Catalog - Products : Enable, disable, duplicate and Delete produc
       await productsPage.clickOnAddNewProduct(page);
 
       const pageTitle = await createProductsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
     });
 
     it('should create standard product', async function () {
@@ -105,7 +105,7 @@ describe('BO - Catalog - Products : Enable, disable, duplicate and Delete produc
       await createProductsPage.closeSfToolBar(page);
 
       const createProductMessage = await createProductsPage.setProduct(page, firstProductData);
-      await expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+      expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
     });
   });
 
@@ -114,7 +114,7 @@ describe('BO - Catalog - Products : Enable, disable, duplicate and Delete produc
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnNewProductButton2', baseContext);
 
       const isModalVisible = await createProductsPage.clickOnNewProductButton(page);
-      await expect(isModalVisible).to.be.true;
+      expect(isModalVisible).to.eq(true);
     });
 
     it('should choose \'Standard product\'', async function () {
@@ -123,7 +123,7 @@ describe('BO - Catalog - Products : Enable, disable, duplicate and Delete produc
       await createProductsPage.chooseProductType(page, secondProductData.type);
 
       const isIframeVisible = await createProductsPage.isChooseProductIframeVisible(page);
-      await expect(isIframeVisible).to.be.false;
+      expect(isIframeVisible).to.eq(false);
     });
 
     it('should create product', async function () {
@@ -132,7 +132,7 @@ describe('BO - Catalog - Products : Enable, disable, duplicate and Delete produc
       await createProductsPage.closeSfToolBar(page);
 
       const createProductMessage = await createProductsPage.setProduct(page, secondProductData);
-      await expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+      expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
     });
   });
 
@@ -143,7 +143,7 @@ describe('BO - Catalog - Products : Enable, disable, duplicate and Delete produc
       await createProductsPage.goToCatalogPage(page);
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should filter list by \'Name\' and check result', async function () {
@@ -152,10 +152,10 @@ describe('BO - Catalog - Products : Enable, disable, duplicate and Delete produc
       await productsPage.filterProducts(page, 'product_name', 'myFavoriteProduct', 'input');
 
       const numberOfProductsAfterFilter: number = await productsPage.getNumberOfProductsFromList(page);
-      await expect(numberOfProductsAfterFilter).to.equal(2);
+      expect(numberOfProductsAfterFilter).to.equal(2);
 
       const textColumn = await productsPage.getTextColumn(page, 'product_name', 1);
-      await expect(textColumn).to.contains('myFavoriteProduct');
+      expect(textColumn).to.contains('myFavoriteProduct');
     });
   });
 
@@ -194,21 +194,21 @@ describe('BO - Catalog - Products : Enable, disable, duplicate and Delete produc
         await testContext.addContextItem(this, 'testIdentifier', `selectProducts${index}`, baseContext);
 
         const isBulkDeleteButtonEnabled = await productsPage.bulkSelectProducts(page);
-        await expect(isBulkDeleteButtonEnabled).to.be.true;
+        expect(isBulkDeleteButtonEnabled).to.eq(true);
       });
 
       it('should click on bulk actions button', async function () {
         await testContext.addContextItem(this, 'testIdentifier', `clickOnBulkActionsButton${index}`, baseContext);
 
         const textMessage = await productsPage.clickOnBulkActionsProducts(page, test.args.action);
-        await expect(textMessage).to.equal(`${test.args.message} ${test.args.productsNumber} products`);
+        expect(textMessage).to.equal(`${test.args.message} ${test.args.productsNumber} products`);
       });
 
       it(`should bulk ${test.args.action} products`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `bulk${test.args.action}Product`, baseContext);
 
         const textMessage = await productsPage.bulkActionsProduct(page, test.args.action);
-        await expect(textMessage).to.equal(
+        expect(textMessage).to.equal(
           `${test.args.message} ${test.args.productsNumber} / ${test.args.productsNumber} products`);
       });
 
@@ -216,7 +216,7 @@ describe('BO - Catalog - Products : Enable, disable, duplicate and Delete produc
         await testContext.addContextItem(this, 'testIdentifier', `close${test.args.action}ProgressModal`, baseContext);
 
         const isModalVisible = await productsPage.closeBulkActionsProgressModal(page, test.args.action);
-        await expect(isModalVisible).to.be.true;
+        expect(isModalVisible).to.eq(true);
       });
 
       if (index === 3) {
@@ -224,7 +224,7 @@ describe('BO - Catalog - Products : Enable, disable, duplicate and Delete produc
           await testContext.addContextItem(this, 'testIdentifier', 'checkNumberOfProduct', baseContext);
 
           const numberOfProductAfterBulkActions = await productsPage.resetAndGetNumberOfLines(page);
-          await expect(numberOfProductAfterBulkActions).to.be.equal(numberOfProducts);
+          expect(numberOfProductAfterBulkActions).to.be.equal(numberOfProducts);
         });
       }
     });
diff --git a/tests/UI/campaigns/productV2/functional/08_header.ts b/tests/UI/campaigns/productV2/functional/08_header.ts
index ef351965326a7..d93263fe8e832 100644
--- a/tests/UI/campaigns/productV2/functional/08_header.ts
+++ b/tests/UI/campaigns/productV2/functional/08_header.ts
@@ -95,7 +95,7 @@ describe('BO - Catalog - Products : Header', async () => {
     await testContext.addContextItem(this, 'testIdentifier', 'clickOnNewProductButton', baseContext);
 
     const isModalVisible = await productsPage.clickOnNewProductButton(page);
-    await expect(isModalVisible).to.be.true;
+    expect(isModalVisible).to.eq(true);
   });
 
   it('should check the standard product description', async function () {
@@ -195,7 +195,7 @@ describe('BO - Catalog - Products : Header', async () => {
     await createProductsPage.goToTab(page, 'pricing');
 
     const isTabActive = await createProductsPage.isTabActive(page, 'pricing');
-    await expect(isTabActive).to.be.true;
+    expect(isTabActive).to.eq(true);
   });
 
   it('should edit the retail price', async function () {
@@ -219,7 +219,7 @@ describe('BO - Catalog - Products : Header', async () => {
     await createProductsPage.goToTab(page, 'stock');
 
     const isTabActive = await createProductsPage.isTabActive(page, 'stock');
-    await expect(isTabActive).to.be.true;
+    expect(isTabActive).to.eq(true);
   });
 
   it('should add items to stock', async function () {
@@ -252,7 +252,7 @@ describe('BO - Catalog - Products : Header', async () => {
     await createProductsPage.goToTab(page, 'description');
 
     const isTabActive = await createProductsPage.isTabActive(page, 'description');
-    await expect(isTabActive).to.be.true;
+    expect(isTabActive).to.eq(true);
   });
 
   it('should add image', async function () {
@@ -295,7 +295,7 @@ describe('BO - Catalog - Products : Header', async () => {
 
     // FYI : stock is the ID for the "Virtual product" tab
     const isTabVisible = await createProductsPage.isTabVisible(page, 'stock');
-    await expect(isTabVisible).to.be.true;
+    expect(isTabVisible).to.eq(true);
   });
 
   it('should go to the Details tab', async function () {
@@ -304,7 +304,7 @@ describe('BO - Catalog - Products : Header', async () => {
     await createProductsPage.goToTab(page, 'details');
 
     const isTabActive = await createProductsPage.isTabActive(page, 'details');
-    await expect(isTabActive).to.be.true;
+    expect(isTabActive).to.eq(true);
   });
 
   it('should set references', async function () {
diff --git a/tests/UI/campaigns/productV2/functional/10_descriptionTab.ts b/tests/UI/campaigns/productV2/functional/10_descriptionTab.ts
index 3457e896f9043..a7da0726a7d78 100644
--- a/tests/UI/campaigns/productV2/functional/10_descriptionTab.ts
+++ b/tests/UI/campaigns/productV2/functional/10_descriptionTab.ts
@@ -86,7 +86,7 @@ describe('BO - Catalog - Products : Description tab', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnNewProductButton', baseContext);
 
       const isModalVisible = await productsPage.clickOnNewProductButton(page);
-      await expect(isModalVisible).to.be.true;
+      expect(isModalVisible).to.eq(true);
     });
 
     it('should choose \'Standard product\'', async function () {
@@ -130,14 +130,14 @@ describe('BO - Catalog - Products : Description tab', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'zoomImage', baseContext);
 
       const isImageZoomed = await descriptionTab.clickOnMagnifyingGlass(page);
-      await expect(isImageZoomed).to.be.true;
+      expect(isImageZoomed).to.eq(true);
     });
 
     it('should close the image zoom', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'closeZoom', baseContext);
 
       const isZoomClosed = await descriptionTab.closeImageZoom(page);
-      await expect(isZoomClosed).to.be.true;
+      expect(isZoomClosed).to.eq(true);
     });
 
     it('should replace image selection', async function () {
@@ -185,13 +185,13 @@ describe('BO - Catalog - Products : Description tab', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'checkDeleteIcon', baseContext);
 
       let isDeleteIconVisible = await descriptionTab.isDeleteCategoryIconVisible(page, 0);
-      await expect(isDeleteIconVisible).to.be.false;
+      expect(isDeleteIconVisible).to.eq(false);
 
       isDeleteIconVisible = await descriptionTab.isDeleteCategoryIconVisible(page, 1);
-      await expect(isDeleteIconVisible).to.be.true;
+      expect(isDeleteIconVisible).to.eq(true);
 
       isDeleteIconVisible = await descriptionTab.isDeleteCategoryIconVisible(page, 2);
-      await expect(isDeleteIconVisible).to.be.true;
+      expect(isDeleteIconVisible).to.eq(true);
     });
 
     it('should choose default category', async function () {
@@ -207,13 +207,13 @@ describe('BO - Catalog - Products : Description tab', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'checkDeleteIcon2', baseContext);
 
       let isDeleteIconVisible = await descriptionTab.isDeleteCategoryIconVisible(page, 0);
-      await expect(isDeleteIconVisible).to.be.true;
+      expect(isDeleteIconVisible).to.eq(true);
 
       isDeleteIconVisible = await descriptionTab.isDeleteCategoryIconVisible(page, 1);
-      await expect(isDeleteIconVisible).to.be.false;
+      expect(isDeleteIconVisible).to.eq(false);
 
       isDeleteIconVisible = await descriptionTab.isDeleteCategoryIconVisible(page, 2);
-      await expect(isDeleteIconVisible).to.be.true;
+      expect(isDeleteIconVisible).to.eq(true);
     });
 
     it('should choose brand', async function () {
diff --git a/tests/UI/campaigns/productV2/functional/11_combinationTab.ts b/tests/UI/campaigns/productV2/functional/11_combinationTab.ts
index 560f515dfb5e3..6f2f599328513 100644
--- a/tests/UI/campaigns/productV2/functional/11_combinationTab.ts
+++ b/tests/UI/campaigns/productV2/functional/11_combinationTab.ts
@@ -214,7 +214,7 @@ describe('BO - Catalog - Products : Combination tab', async () => {
       await combinationsTab.clickOnPreviousCombinationButton(page);
 
       const combinationName = await combinationsTab.getCombinationNameFromModal(page);
-      await expect(combinationName).to.equal('Size - S, Color - Gray');
+      expect(combinationName).to.equal('Size - S, Color - Gray');
     });
 
     it('should close the modal', async function () {
diff --git a/tests/UI/campaigns/productV2/functional/13_virtualTab.ts b/tests/UI/campaigns/productV2/functional/13_virtualTab.ts
index 089e8263fe9ac..184babd8bb0fe 100644
--- a/tests/UI/campaigns/productV2/functional/13_virtualTab.ts
+++ b/tests/UI/campaigns/productV2/functional/13_virtualTab.ts
@@ -351,7 +351,7 @@ describe('BO - Catalog - Products : Virtual tab', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'checkLabelOutOfStock', baseContext);
 
       const availabilityLabel = await foProductPage.getProductAvailabilityLabel(page);
-      await expect(availabilityLabel).to.contains('Out of stock');
+      expect(availabilityLabel).to.contains('Out of stock');
 
       const isVisible = await foProductPage.isAddToCartButtonEnabled(page);
       expect(isVisible).eq(true);
diff --git a/tests/UI/campaigns/productV2/functional/14_detailsTab.ts b/tests/UI/campaigns/productV2/functional/14_detailsTab.ts
index c78e8e9747b24..4d2c5a308098a 100644
--- a/tests/UI/campaigns/productV2/functional/14_detailsTab.ts
+++ b/tests/UI/campaigns/productV2/functional/14_detailsTab.ts
@@ -119,14 +119,14 @@ describe('BO - Catalog - Products : Details tab', async () => {
       await productsPage.closeSfToolBar(page);
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should click on \'New product\' button and check new product modal', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnNewProductButton', baseContext);
 
       const isModalVisible = await productsPage.clickOnNewProductButton(page);
-      await expect(isModalVisible).to.be.true;
+      expect(isModalVisible).to.eq(true);
     });
 
     it('should choose \'Standard product\' and go to new product page', async function () {
@@ -136,14 +136,14 @@ describe('BO - Catalog - Products : Details tab', async () => {
       await productsPage.clickOnAddNewProduct(page);
 
       const pageTitle = await createProductPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(createProductPage.pageTitle);
+      expect(pageTitle).to.contains(createProductPage.pageTitle);
     });
 
     it('should create standard product', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createStandardProduct', baseContext);
 
       const createProductMessage = await createProductPage.setProduct(page, newProductData);
-      await expect(createProductMessage).to.equal(createProductPage.successfulUpdateMessage);
+      expect(createProductMessage).to.equal(createProductPage.successfulUpdateMessage);
     });
   });
 
@@ -411,14 +411,14 @@ describe('BO - Catalog - Products : Details tab', async () => {
       );
 
       const pageTitle = await filesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(filesPage.pageTitle);
+      expect(pageTitle).to.contains(filesPage.pageTitle);
     });
 
     it('should delete files with Bulk Actions', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'BulkDelete', baseContext);
 
       const deleteTextResult = await filesPage.deleteFilesBulkActions(page);
-      await expect(deleteTextResult).to.be.equal(filesPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.equal(filesPage.successfulMultiDeleteMessage);
     });
   });
 });
diff --git a/tests/UI/campaigns/regression/checkout/100PercentDiscount_FO.ts b/tests/UI/campaigns/regression/checkout/100PercentDiscount_FO.ts
index 0fc89ef6fb8b9..a5451bcd9f1a4 100644
--- a/tests/UI/campaigns/regression/checkout/100PercentDiscount_FO.ts
+++ b/tests/UI/campaigns/regression/checkout/100PercentDiscount_FO.ts
@@ -84,7 +84,7 @@ describe('Regression - Checkout: Create 100% discount with free shipping discoun
       );
 
       const pageTitle = await cartRulesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(cartRulesPage.pageTitle);
+      expect(pageTitle).to.contains(cartRulesPage.pageTitle);
     });
 
     describe('Create a percentage cart rule', async () => {
@@ -99,7 +99,7 @@ describe('Regression - Checkout: Create 100% discount with free shipping discoun
         await cartRulesPage.goToAddNewCartRulesPage(page);
 
         const pageTitle = await addCartRulePage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addCartRulePage.pageTitle);
+        expect(pageTitle).to.contains(addCartRulePage.pageTitle);
       });
 
       it('should create new cart rule', async function () {
@@ -114,7 +114,7 @@ describe('Regression - Checkout: Create 100% discount with free shipping discoun
           page,
           percentCartRule,
         );
-        await expect(validationMessage).to.contains(
+        expect(validationMessage).to.contains(
           addCartRulePage.successfulCreationMessage,
         );
       });
@@ -136,7 +136,7 @@ describe('Regression - Checkout: Create 100% discount with free shipping discoun
         );
 
         const pageTitle = await orderSettingsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
+        expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
       });
 
       it('should change the terms and conditions back to disabled', async function () {
@@ -148,7 +148,7 @@ describe('Regression - Checkout: Create 100% discount with free shipping discoun
         );
 
         const result = await orderSettingsPage.setTermsOfService(page, false);
-        await expect(result).to.contains(
+        expect(result).to.contains(
           orderSettingsPage.successfulUpdateMessage,
         );
       });
@@ -171,7 +171,7 @@ describe('Regression - Checkout: Create 100% discount with free shipping discoun
       page = await cartRulesPage.viewMyShop(page);
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should add first product to cart and Proceed to checkout', async function () {
@@ -186,7 +186,7 @@ describe('Regression - Checkout: Create 100% discount with free shipping discoun
       await homePage.proceedToCheckout(page);
 
       const pageTitle = await cartPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(cartPage.pageTitle);
+      expect(pageTitle).to.equal(cartPage.pageTitle);
     });
 
     it('should add our discount code and check that the total price is 0', async function () {
@@ -200,7 +200,7 @@ describe('Regression - Checkout: Create 100% discount with free shipping discoun
       await cartPage.addPromoCode(page, percentCartRule.code);
 
       const totalPrice = await cartPage.getATIPrice(page);
-      await expect(totalPrice, 'Order total price is incorrect').to.equal(0);
+      expect(totalPrice, 'Order total price is incorrect').to.equal(0);
     });
 
     it('should go to checkout process', async function () {
@@ -214,7 +214,7 @@ describe('Regression - Checkout: Create 100% discount with free shipping discoun
       await cartPage.clickOnProceedToCheckout(page);
 
       const isCheckoutPage = await checkoutPage.isCheckoutPage(page);
-      await expect(isCheckoutPage).to.be.true;
+      expect(isCheckoutPage).to.eq(true);
     });
 
     it('should fill personal information as a guest', async function () {
@@ -229,10 +229,10 @@ describe('Regression - Checkout: Create 100% discount with free shipping discoun
         page,
         customerData,
       );
-      await expect(
+      expect(
         isStepPersonalInfoCompleted,
         'Step personal information is not completed',
-      ).to.be.true;
+      ).to.eq(true);
     });
 
     it('should fill address form and go to delivery step', async function () {
@@ -247,8 +247,8 @@ describe('Regression - Checkout: Create 100% discount with free shipping discoun
         page,
         addressData,
       );
-      await expect(isStepAddressComplete, 'Step Address is not complete')
-        .to.be.true;
+      expect(isStepAddressComplete, 'Step Address is not complete')
+        .to.eq(true);
     });
 
     it('should go to last step', async function () {
@@ -261,8 +261,8 @@ describe('Regression - Checkout: Create 100% discount with free shipping discoun
 
       // Delivery step - Go to payment step
       const isStepDeliveryComplete = await checkoutPage.goToPaymentStep(page);
-      await expect(isStepDeliveryComplete, 'Step Address is not complete')
-        .to.be.true;
+      expect(isStepDeliveryComplete, 'Step Address is not complete')
+        .to.eq(true);
     });
 
     it('should contain no payment needed text', async function () {
@@ -274,7 +274,7 @@ describe('Regression - Checkout: Create 100% discount with free shipping discoun
       );
 
       const noPaymentNeededText = await checkoutPage.getNoPaymentNeededBlockContent(page);
-      await expect(noPaymentNeededText).to.contains(checkoutPage.noPaymentNeededText);
+      expect(noPaymentNeededText).to.contains(checkoutPage.noPaymentNeededText);
     });
 
     it('should check that complete order button is enabled', async function () {
@@ -288,7 +288,7 @@ describe('Regression - Checkout: Create 100% discount with free shipping discoun
       const confirmButtonVisible = await checkoutPage.isPaymentConfirmationButtonVisibleAndEnabled(
         page,
       );
-      await expect(confirmButtonVisible, 'Confirm button visible').to.be.true;
+      expect(confirmButtonVisible, 'Confirm button visible').to.eq(true);
     });
 
     it('should complete the order', async function () {
@@ -306,7 +306,7 @@ describe('Regression - Checkout: Create 100% discount with free shipping discoun
       const cardTitle = await orderConfirmationPage.getOrderConfirmationCardTitle(
         page,
       );
-      await expect(cardTitle).to.contains(
+      expect(cardTitle).to.contains(
         orderConfirmationPage.orderConfirmationCardTitle,
       );
     });
@@ -329,7 +329,7 @@ describe('Regression - Checkout: Create 100% discount with free shipping discoun
       page = await checkoutPage.closePage(browserContext, page, 0);
 
       const pageTitle = await orderSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
     });
 
     describe('Delete created cart rules', async () => {
@@ -348,7 +348,7 @@ describe('Regression - Checkout: Create 100% discount with free shipping discoun
         );
 
         const pageTitle = await cartRulesPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(cartRulesPage.pageTitle);
+        expect(pageTitle).to.contains(cartRulesPage.pageTitle);
       });
 
       it('should delete our 100% cart rules', async function () {
@@ -360,7 +360,7 @@ describe('Regression - Checkout: Create 100% discount with free shipping discoun
         );
 
         const validationMessage = await cartRulesPage.deleteCartRule(page);
-        await expect(validationMessage).to.contains(
+        expect(validationMessage).to.contains(
           cartRulesPage.successfulDeleteMessage,
         );
       });
@@ -382,7 +382,7 @@ describe('Regression - Checkout: Create 100% discount with free shipping discoun
         );
 
         const pageTitle = await orderSettingsPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
+        expect(pageTitle).to.contains(orderSettingsPage.pageTitle);
       });
 
       it('should change the terms and conditions back to enabled', async function () {
@@ -398,7 +398,7 @@ describe('Regression - Checkout: Create 100% discount with free shipping discoun
           true,
           'Terms and conditions of use',
         );
-        await expect(result).to.contains(
+        expect(result).to.contains(
           orderSettingsPage.successfulUpdateMessage,
         );
       });
diff --git a/tests/UI/campaigns/regression/currencies/computingPrecision_FO.ts b/tests/UI/campaigns/regression/currencies/computingPrecision_FO.ts
index bdd6fdf4d13a6..37812f3a62943 100644
--- a/tests/UI/campaigns/regression/currencies/computingPrecision_FO.ts
+++ b/tests/UI/campaigns/regression/currencies/computingPrecision_FO.ts
@@ -119,7 +119,7 @@ describe(
         );
 
         const pageTitle = await cartRulesPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(cartRulesPage.pageTitle);
+        expect(pageTitle).to.contains(cartRulesPage.pageTitle);
       });
 
       describe('Create a percentage cart rule', async () => {
@@ -129,14 +129,14 @@ describe(
           await cartRulesPage.goToAddNewCartRulesPage(page);
 
           const pageTitle = await addCartRulePage.getPageTitle(page);
-          await expect(pageTitle).to.contains(addCartRulePage.pageTitle);
+          expect(pageTitle).to.contains(addCartRulePage.pageTitle);
         });
 
         it('should create new cart rule', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'createPercentCartRule', baseContext);
 
           const validationMessage = await addCartRulePage.createEditCartRules(page, percentCartRule);
-          await expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
+          expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
         });
       });
 
@@ -147,14 +147,14 @@ describe(
           await cartRulesPage.goToAddNewCartRulesPage(page);
 
           const pageTitle = await addCartRulePage.getPageTitle(page);
-          await expect(pageTitle).to.contains(addCartRulePage.pageTitle);
+          expect(pageTitle).to.contains(addCartRulePage.pageTitle);
         });
 
         it('should create new cart rule', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'createGiftCartRule', baseContext);
 
           const validationMessage = await addCartRulePage.createEditCartRules(page, giftCartRule);
-          await expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
+          expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
         });
       });
     });
@@ -171,7 +171,7 @@ describe(
         await localizationPage.closeSfToolBar(page);
 
         const pageTitle = await localizationPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(localizationPage.pageTitle);
+        expect(pageTitle).to.contains(localizationPage.pageTitle);
       });
 
       it('should go to currencies page', async function () {
@@ -180,7 +180,7 @@ describe(
         await localizationPage.goToSubTabCurrencies(page);
 
         const pageTitle = await currenciesPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(currenciesPage.pageTitle);
+        expect(pageTitle).to.contains(currenciesPage.pageTitle);
       });
 
       it(`should filter by iso code '${Currencies.euro.isoCode}'`, async function () {
@@ -191,7 +191,7 @@ describe(
 
         // Check number of currencies
         const numberOfCurrenciesAfterFilter = await currenciesPage.getNumberOfElementInGrid(page);
-        await expect(numberOfCurrenciesAfterFilter).to.be.at.least(1);
+        expect(numberOfCurrenciesAfterFilter).to.be.at.least(1);
       });
 
       it('should go to edit currency page', async function () {
@@ -200,7 +200,7 @@ describe(
         await currenciesPage.goToEditCurrencyPage(page, 1);
 
         const pageTitle = await addCurrencyPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(addCurrencyPage.editCurrencyPage);
+        expect(pageTitle).to.contains(addCurrencyPage.editCurrencyPage);
       });
 
       it('should set precision to 3', async function () {
@@ -208,7 +208,7 @@ describe(
 
         // Set currency precision to 3 and check successful update message
         const textResult = await addCurrencyPage.setCurrencyPrecision(page, 3);
-        await expect(textResult).to.contains(currenciesPage.successfulUpdateMessage);
+        expect(textResult).to.contains(currenciesPage.successfulUpdateMessage);
       });
     });
 
@@ -220,7 +220,7 @@ describe(
         await homePage.changeLanguage(page, 'en');
 
         const isHomePage = await homePage.isHomePage(page);
-        await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+        expect(isHomePage, 'Fail to open FO home page').to.eq(true);
       });
 
       it('should go to login page', async function () {
@@ -229,7 +229,7 @@ describe(
         await homePage.goToLoginPage(page);
 
         const pageTitle = await foLoginPage.getPageTitle(page);
-        await expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
+        expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
       });
 
       it('should sign in with default customer', async function () {
@@ -238,7 +238,7 @@ describe(
         await foLoginPage.customerLogin(page, Customers.johnDoe);
 
         const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
-        await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+        expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
       });
 
       it('should add product to cart', async function () {
@@ -254,7 +254,7 @@ describe(
 
         // Check cart page
         const pageTitle = await cartPage.getPageTitle(page);
-        await expect(pageTitle, 'Fail to go to cart page').to.contains(cartPage.pageTitle);
+        expect(pageTitle, 'Fail to go to cart page').to.contains(cartPage.pageTitle);
       });
 
       it('should add percent discount and check that the discount was added', async function () {
@@ -263,7 +263,7 @@ describe(
         await cartPage.addPromoCode(page, percentCartRule.code);
         const firstSubtotalDiscountValue = await cartPage.getSubtotalDiscountValue(page);
 
-        await expect(firstSubtotalDiscountValue, 'First discount was not applied')
+        expect(firstSubtotalDiscountValue, 'First discount was not applied')
           .to.equal(-(orderToMake.discountPercentValue));
       });
 
@@ -273,7 +273,7 @@ describe(
         await cartPage.addPromoCode(page, giftCartRule.code);
         const finalSubtotalDiscountValue = await cartPage.getSubtotalDiscountValue(page);
 
-        await expect(finalSubtotalDiscountValue, 'Second discount was not applied')
+        expect(finalSubtotalDiscountValue, 'Second discount was not applied')
           .to.equal(-(orderToMake.discountPercentValue + orderToMake.discountGiftValue));
       });
 
@@ -281,7 +281,7 @@ describe(
         await testContext.addContextItem(this, 'testIdentifier', 'checkToTalPriceInFO', baseContext);
 
         const totalPrice = await cartPage.getATIPrice(page);
-        await expect(totalPrice, 'Order total price is incorrect')
+        expect(totalPrice, 'Order total price is incorrect')
           .to.equal(orderToMake.totalPrice);
       });
 
@@ -293,18 +293,18 @@ describe(
 
         // Address step - Go to delivery step
         const isStepAddressComplete = await checkoutPage.goToDeliveryStep(page);
-        await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+        expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
 
         // Delivery step - Go to payment step
         const isStepDeliveryComplete = await checkoutPage.goToPaymentStep(page);
-        await expect(isStepDeliveryComplete, 'Step Address is not complete').to.be.true;
+        expect(isStepDeliveryComplete, 'Step Address is not complete').to.eq(true);
 
         // Payment step - Choose payment step
         await checkoutPage.choosePaymentAndOrder(page, PaymentMethods.wirePayment.moduleName);
         const cardTitle = await orderConfirmationPage.getOrderConfirmationCardTitle(page);
 
         // Check the confirmation message
-        await expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
+        expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
       });
     });
 
@@ -316,7 +316,7 @@ describe(
         page = await orderConfirmationPage.closePage(browserContext, page, 0);
 
         const pageTitle = await currenciesPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(currenciesPage.pageTitle);
+        expect(pageTitle).to.contains(currenciesPage.pageTitle);
       });
 
       it('should go to orders page', async function () {
@@ -329,7 +329,7 @@ describe(
         );
 
         const pageTitle = await ordersPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(ordersPage.pageTitle);
+        expect(pageTitle).to.contains(ordersPage.pageTitle);
       });
 
       it('should check order total price', async function () {
@@ -340,7 +340,7 @@ describe(
 
         // Check total price
         const totalPriceInOrdersPage = await ordersPage.getOrderATIPrice(page, 1);
-        await expect(totalPriceInOrdersPage, 'Order total price is incorrect').to.equal(orderToMake.totalPrice);
+        expect(totalPriceInOrdersPage, 'Order total price is incorrect').to.equal(orderToMake.totalPrice);
       });
     });
 
@@ -355,7 +355,7 @@ describe(
         );
 
         const pageTitle = await sqlManagerPage.getPageTitle(page);
-        await expect(pageTitle).to.contains(sqlManagerPage.pageTitle);
+        expect(pageTitle).to.contains(sqlManagerPage.pageTitle);
       });
 
       describe('Create new SQL query to get last order total price', async () => {
@@ -367,14 +367,14 @@ describe(
           sqlQueryData.sqlQuery = sqlQueryTemplate(orderToMake.reference);
 
           const pageTitle = await addSqlQueryPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(addSqlQueryPage.pageTitle);
+          expect(pageTitle).to.contains(addSqlQueryPage.pageTitle);
         });
 
         it('should create new SQL query', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'createSqlQuery', baseContext);
 
           const textResult = await addSqlQueryPage.createEditSQLQuery(page, sqlQueryData);
-          await expect(textResult).to.equal(addSqlQueryPage.successfulCreationMessage);
+          expect(textResult).to.equal(addSqlQueryPage.successfulCreationMessage);
         });
       });
 
@@ -386,7 +386,7 @@ describe(
           await sqlManagerPage.filterSQLQuery(page, 'name', sqlQueryData.name);
 
           const sqlQueryName = await sqlManagerPage.getTextColumnFromTable(page, 1, 'name');
-          await expect(sqlQueryName).to.contains(sqlQueryData.name);
+          expect(sqlQueryName).to.contains(sqlQueryData.name);
         });
 
         it('should click on view button', async function () {
@@ -395,7 +395,7 @@ describe(
           await sqlManagerPage.goToViewSQLQueryPage(page, 1);
 
           const pageTitle = await viewSqlQueryPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(viewSqlQueryPage.pageTitle);
+          expect(pageTitle).to.contains(viewSqlQueryPage.pageTitle);
         });
 
         it('should check order discount in database', async function () {
@@ -403,7 +403,7 @@ describe(
 
           // Get total discount from first column of the first row
           const discountInDatabase = await viewSqlQueryPage.getTextColumn(page, 1, 'total_discounts');
-          await expect(parseFloat(discountInDatabase), 'Discount price is incorrect in database')
+          expect(parseFloat(discountInDatabase), 'Discount price is incorrect in database')
             .to.equal(orderToMake.discountPercentValue + orderToMake.discountGiftValue);
         });
         it('should check last order total price', async function () {
@@ -411,7 +411,7 @@ describe(
 
           // Get total discount from second column of the first row
           const totalPriceInDatabase = await viewSqlQueryPage.getTextColumn(page, 1, 'total_paid_tax_incl');
-          await expect(parseFloat(totalPriceInDatabase), 'Total price is incorrect in database')
+          expect(parseFloat(totalPriceInDatabase), 'Total price is incorrect in database')
             .to.equal(orderToMake.totalPrice);
         });
       });
@@ -434,7 +434,7 @@ describe(
           );
 
           const pageTitle = await localizationPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(localizationPage.pageTitle);
+          expect(pageTitle).to.contains(localizationPage.pageTitle);
         });
 
         it('should go to currencies page', async function () {
@@ -443,7 +443,7 @@ describe(
           await localizationPage.goToSubTabCurrencies(page);
 
           const pageTitle = await currenciesPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(currenciesPage.pageTitle);
+          expect(pageTitle).to.contains(currenciesPage.pageTitle);
         });
 
         it(`should filter by iso code '${Currencies.euro.isoCode}'`, async function () {
@@ -454,7 +454,7 @@ describe(
 
           // Check number of currencies
           const numberOfCurrenciesAfterFilter = await currenciesPage.getNumberOfElementInGrid(page);
-          await expect(numberOfCurrenciesAfterFilter).to.be.at.least(1);
+          expect(numberOfCurrenciesAfterFilter).to.be.at.least(1);
         });
 
         it('should go to edit currency page', async function () {
@@ -463,7 +463,7 @@ describe(
           await currenciesPage.goToEditCurrencyPage(page, 1);
 
           const pageTitle = await addCurrencyPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(addCurrencyPage.editCurrencyPage);
+          expect(pageTitle).to.contains(addCurrencyPage.editCurrencyPage);
         });
 
         it('should reset currency precision', async function () {
@@ -471,7 +471,7 @@ describe(
 
           // Set currency precision to 2 and check successful update message
           const textResult = await addCurrencyPage.setCurrencyPrecision(page, 2);
-          await expect(textResult).to.contains(currenciesPage.successfulUpdateMessage);
+          expect(textResult).to.contains(currenciesPage.successfulUpdateMessage);
         });
       });
 
@@ -486,14 +486,14 @@ describe(
           );
 
           const pageTitle = await cartRulesPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(cartRulesPage.pageTitle);
+          expect(pageTitle).to.contains(cartRulesPage.pageTitle);
         });
 
         it('should bulk delete cart rules', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'deleteCartRules', baseContext);
 
           const deleteTextResult = await cartRulesPage.bulkDeleteCartRules(page);
-          await expect(deleteTextResult).to.be.contains(cartRulesPage.successfulMultiDeleteMessage);
+          expect(deleteTextResult).to.be.contains(cartRulesPage.successfulMultiDeleteMessage);
         });
       });
 
@@ -508,7 +508,7 @@ describe(
           );
 
           const pageTitle = await sqlManagerPage.getPageTitle(page);
-          await expect(pageTitle).to.contains(sqlManagerPage.pageTitle);
+          expect(pageTitle).to.contains(sqlManagerPage.pageTitle);
         });
 
         it('should filter list by name', async function () {
@@ -518,14 +518,14 @@ describe(
           await sqlManagerPage.filterSQLQuery(page, 'name', sqlQueryData.name);
 
           const sqlQueryName = await sqlManagerPage.getTextColumnFromTable(page, 1, 'name');
-          await expect(sqlQueryName).to.contains(sqlQueryData.name);
+          expect(sqlQueryName).to.contains(sqlQueryData.name);
         });
 
         it('should delete SQL query', async function () {
           await testContext.addContextItem(this, 'testIdentifier', 'deleteSQLQuery', baseContext);
 
           const textResult = await sqlManagerPage.deleteSQLQuery(page, 1);
-          await expect(textResult).to.equal(sqlManagerPage.successfulDeleteMessage);
+          expect(textResult).to.equal(sqlManagerPage.successfulDeleteMessage);
         });
       });
     });
diff --git a/tests/UI/campaigns/regression/menu/deniedAccessToModuleCatalogPage.ts b/tests/UI/campaigns/regression/menu/deniedAccessToModuleCatalogPage.ts
index 458e0ec2ea7b3..a5892a5da1e79 100644
--- a/tests/UI/campaigns/regression/menu/deniedAccessToModuleCatalogPage.ts
+++ b/tests/UI/campaigns/regression/menu/deniedAccessToModuleCatalogPage.ts
@@ -43,7 +43,7 @@ describe('Regression : Access to Module catalog is denied with neither left menu
       dashboardPage.modulesParentLink,
       dashboardPage.moduleCatalogueLink,
     );
-    await expect(isMenuTabVisible, 'The Menu tab is still visible').to.be.false;
+    expect(isMenuTabVisible, 'The Menu tab is still visible').to.eq(false);
   });
 
   it('should trigger a not found alert when accessing by legacy url', async function () {
@@ -52,7 +52,7 @@ describe('Regression : Access to Module catalog is denied with neither left menu
     await dashboardPage.navigateToPageWithInvalidToken(page, pageLegacyUrl);
 
     const alertText = await moduleCatalogPage.getAlertDangerBlockParagraphContent(page);
-    await expect(alertText).to.contain(moduleCatalogPage.pageNotFoundMessage);
+    expect(alertText).to.contain(moduleCatalogPage.pageNotFoundMessage);
   });
 
   it('should redirect to dashboard when accessing by symfony url', async function () {
@@ -61,6 +61,6 @@ describe('Regression : Access to Module catalog is denied with neither left menu
     await dashboardPage.navigateToPageWithInvalidToken(page, pageSymfonyUrl);
 
     const pageTitle = await dashboardPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(dashboardPage.pageTitle);
+    expect(pageTitle).to.contains(dashboardPage.pageTitle);
   });
 });
diff --git a/tests/UI/campaigns/sanity/01_installShop/01_installShop.ts b/tests/UI/campaigns/sanity/01_installShop/01_installShop.ts
index 3e513674d7bb3..5052eeeb0f298 100644
--- a/tests/UI/campaigns/sanity/01_installShop/01_installShop.ts
+++ b/tests/UI/campaigns/sanity/01_installShop/01_installShop.ts
@@ -34,7 +34,7 @@ describe('Install Prestashop', async () => {
     const stepTitle = await installPage.getStepTitle(page, 'Choose your language');
     const installationTitles = [installPage.firstStepFrTitle, installPage.firstStepEnTitle];
 
-    await expect(installationTitles.some((x) => stepTitle.includes(x))).to.be.true;
+    expect(installationTitles.some((x) => stepTitle.includes(x))).to.eq(true);
   });
 
   it('should change language to English and check title', async function () {
@@ -43,7 +43,7 @@ describe('Install Prestashop', async () => {
     await installPage.setInstallLanguage(page);
 
     const stepTitle = await installPage.getStepTitle(page, 'Choose your language');
-    await expect(stepTitle).to.contain(installPage.firstStepEnTitle);
+    expect(stepTitle).to.contain(installPage.firstStepEnTitle);
   });
 
   it('should click on next and go to step \'License Agreements\'', async function () {
@@ -52,7 +52,7 @@ describe('Install Prestashop', async () => {
     await installPage.nextStep(page);
 
     const stepTitle = await installPage.getStepTitle(page, 'License agreements');
-    await expect(stepTitle).to.contain(installPage.secondStepEnTitle);
+    expect(stepTitle).to.contain(installPage.secondStepEnTitle);
   });
 
   it('should agree to terms and conditions and go to step \'System compatibility\'', async function () {
@@ -63,7 +63,7 @@ describe('Install Prestashop', async () => {
 
     if (!(await installPage.isThirdStepVisible(page))) {
       const stepTitle = await installPage.getStepTitle(page, 'System compatibility');
-      await expect(stepTitle).to.contain(installPage.thirdStepEnTitle);
+      expect(stepTitle).to.contain(installPage.thirdStepEnTitle);
     }
   });
 
@@ -75,7 +75,7 @@ describe('Install Prestashop', async () => {
     }
 
     const stepTitle = await installPage.getStepTitle(page, 'Store information');
-    await expect(stepTitle).to.contain(installPage.fourthStepEnTitle);
+    expect(stepTitle).to.contain(installPage.fourthStepEnTitle);
   });
 
   it('should fill shop Information form and go to step \'Content Configuration\'', async function () {
@@ -86,7 +86,7 @@ describe('Install Prestashop', async () => {
     await installPage.waitForFinishedForthStep(page);
 
     const stepTitle = await installPage.getStepTitle(page, 'Content of your store');
-    await expect(stepTitle).to.contain(installPage.fifthStepEnTitle);
+    expect(stepTitle).to.contain(installPage.fifthStepEnTitle);
   });
 
   it('should click on next and go to step \'System Configuration\'', async function () {
@@ -96,7 +96,7 @@ describe('Install Prestashop', async () => {
     await installPage.waitForFinishedFifthStep(page);
 
     const stepTitle = await installPage.getStepTitle(page, 'System configuration');
-    await expect(stepTitle).to.contain(installPage.sixthStepEnTitle);
+    expect(stepTitle).to.contain(installPage.sixthStepEnTitle);
   });
 
   it('should fill database configuration form and check database connection', async function () {
@@ -104,7 +104,7 @@ describe('Install Prestashop', async () => {
 
     await installPage.fillDatabaseForm(page);
     const result = await installPage.isDatabaseConnected(page);
-    await expect(result).to.be.true;
+    expect(result).to.eq(true);
   });
 
   it('should start the installation process', async function () {
@@ -112,7 +112,7 @@ describe('Install Prestashop', async () => {
 
     await installPage.nextStep(page);
     const result = await installPage.isInstallationInProgress(page);
-    await expect(result).to.be.true;
+    expect(result).to.eq(true);
   });
 
   const tests = [
@@ -208,7 +208,7 @@ describe('Install Prestashop', async () => {
         test.args.step.name,
         test.args.step.timeout,
       );
-      await expect(stepFinished, `Fail to finish the step ${test.args.step.name}`).to.be.true;
+      expect(stepFinished, `Fail to finish the step ${test.args.step.name}`).to.eq(true);
     });
   });
 
@@ -216,10 +216,10 @@ describe('Install Prestashop', async () => {
     await testContext.addContextItem(this, 'testIdentifier', 'checkInstallationSuccessful', baseContext);
 
     const result = await installPage.isInstallationSuccessful(page);
-    await expect(result).to.be.true;
+    expect(result).to.eq(true);
 
     const stepTitle = await installPage.getStepTitle(page, 'Installation finished');
-    await expect(stepTitle).to.contain(installPage.finalStepEnTitle);
+    expect(stepTitle).to.contain(installPage.finalStepEnTitle);
   });
 
   it('should go to FO and check that Prestashop logo exists', async function () {
@@ -228,6 +228,6 @@ describe('Install Prestashop', async () => {
     page = await installPage.goToFOAfterInstall(page);
 
     const result = await homePage.isHomePage(page);
-    await expect(result).to.be.true;
+    expect(result).to.eq(true);
   });
 });
diff --git a/tests/UI/campaigns/sanity/02_ordersBO/01_filterOrders.ts b/tests/UI/campaigns/sanity/02_ordersBO/01_filterOrders.ts
index c737e0d7d8290..a77c1d006c188 100644
--- a/tests/UI/campaigns/sanity/02_ordersBO/01_filterOrders.ts
+++ b/tests/UI/campaigns/sanity/02_ordersBO/01_filterOrders.ts
@@ -52,14 +52,14 @@ describe('BO - Orders - Orders : Filter the Orders table by ID, REFERENCE, STATU
     );
 
     const pageTitle = await ordersPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(ordersPage.pageTitle);
+    expect(pageTitle).to.contains(ordersPage.pageTitle);
   });
 
   it('should reset all filters and get number of orders', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'resetFilters1', baseContext);
 
     numberOfOrders = await ordersPage.resetAndGetNumberOfLines(page);
-    await expect(numberOfOrders).to.be.above(0);
+    expect(numberOfOrders).to.be.above(0);
   });
 
   const tests = [
@@ -104,14 +104,14 @@ describe('BO - Orders - Orders : Filter the Orders table by ID, REFERENCE, STATU
       );
 
       const textColumn = await ordersPage.getTextColumn(page, test.args.filterBy, 1);
-      await expect(textColumn).to.equal(test.args.filterValue);
+      expect(textColumn).to.equal(test.args.filterValue);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', `resetFilters_${test.args.identifier}`, baseContext);
 
       const numberOfOrdersAfterReset = await ordersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfOrdersAfterReset).to.be.equal(numberOfOrders);
+      expect(numberOfOrdersAfterReset).to.be.equal(numberOfOrders);
     });
   });
 
diff --git a/tests/UI/campaigns/sanity/02_ordersBO/02_editOrder.ts b/tests/UI/campaigns/sanity/02_ordersBO/02_editOrder.ts
index 3e4c1d18a71d7..343ab6a62c67d 100644
--- a/tests/UI/campaigns/sanity/02_ordersBO/02_editOrder.ts
+++ b/tests/UI/campaigns/sanity/02_ordersBO/02_editOrder.ts
@@ -53,7 +53,7 @@ describe('BO - Orders - Orders : Edit Order BO', async () => {
     await ordersPage.closeSfToolBar(page);
 
     const pageTitle = await ordersPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(ordersPage.pageTitle);
+    expect(pageTitle).to.contains(ordersPage.pageTitle);
   });
 
   it('should go to the first order page', async function () {
@@ -62,21 +62,21 @@ describe('BO - Orders - Orders : Edit Order BO', async () => {
     await ordersPage.goToOrder(page, 1);
 
     const pageTitle = await orderPageProductsBlock.getPageTitle(page);
-    await expect(pageTitle).to.contains(orderPageProductsBlock.pageTitle);
+    expect(pageTitle).to.contains(orderPageProductsBlock.pageTitle);
   });
 
   it('should modify the product quantity and check the validation', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'editOrderQuantity', baseContext);
 
     const newQuantity = await orderPageProductsBlock.modifyProductQuantity(page, 1, 5);
-    await expect(newQuantity, 'Quantity was not updated').to.equal(5);
+    expect(newQuantity, 'Quantity was not updated').to.equal(5);
   });
 
   it('should modify the order status and check the validation', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'editOrderStatus', baseContext);
 
     const orderStatus = await orderPageProductsBlock.modifyOrderStatus(page, OrderStatuses.paymentAccepted.name);
-    await expect(orderStatus).to.equal(OrderStatuses.paymentAccepted.name);
+    expect(orderStatus).to.equal(OrderStatuses.paymentAccepted.name);
   });
 
   // Logout from BO
diff --git a/tests/UI/campaigns/sanity/03_productsBO/01_filterProducts.ts b/tests/UI/campaigns/sanity/03_productsBO/01_filterProducts.ts
index f33e4e5213aa0..0a5924731d14b 100644
--- a/tests/UI/campaigns/sanity/03_productsBO/01_filterProducts.ts
+++ b/tests/UI/campaigns/sanity/03_productsBO/01_filterProducts.ts
@@ -48,21 +48,21 @@ describe('BO - Catalog - Products : Filter in Products Page', async () => {
       );
 
       const pageTitle: string = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should check that no filter is applied by default', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkNoFilter', baseContext);
 
       const isVisible: boolean = await productsPage.isResetButtonVisible(page);
-      await expect(isVisible, 'Reset button is visible!').to.be.false;
+      expect(isVisible, 'Reset button is visible!').to.eq(false);
     });
 
     it('should get number of products', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'getNumberOfProduct', baseContext);
 
       numberOfProducts = await productsPage.getNumberOfProductsFromHeader(page);
-      await expect(numberOfProducts).to.be.above(0);
+      expect(numberOfProducts).to.be.above(0);
     });
 
     [
@@ -131,20 +131,20 @@ describe('BO - Catalog - Products : Filter in Products Page', async () => {
         const numberOfProductsAfterFilter: number = await productsPage.getNumberOfProductsFromList(page);
 
         if (test.args.filterBy === 'active') {
-          await expect(numberOfProductsAfterFilter).to.be.above(0);
+          expect(numberOfProductsAfterFilter).to.be.above(0);
         } else {
-          await expect(numberOfProductsAfterFilter).to.be.below(numberOfProducts);
+          expect(numberOfProductsAfterFilter).to.be.below(numberOfProducts);
         }
 
         for (let i = 1; i <= numberOfProductsAfterFilter; i++) {
           const textColumn = await productsPage.getTextColumn(page, test.args.filterBy, i);
 
           if (typeof test.args.filterValue !== 'string') {
-            await expect(textColumn).to.within(test.args.filterValue.min, test.args.filterValue.max);
+            expect(textColumn).to.within(test.args.filterValue.min, test.args.filterValue.max);
           } else if (test.args.filterBy === 'active') {
-            await expect(textColumn).to.be.true;
+            expect(textColumn).to.eq(true);
           } else {
-            await expect(textColumn).to.be.contain(test.args.filterValue);
+            expect(textColumn).to.be.contain(test.args.filterValue);
           }
         }
       });
@@ -153,7 +153,7 @@ describe('BO - Catalog - Products : Filter in Products Page', async () => {
         await testContext.addContextItem(this, 'testIdentifier', `resetAfter${test.args.identifier}`, baseContext);
 
         const numberOfProductsAfterReset: number = await productsPage.resetAndGetNumberOfLines(page);
-        await expect(numberOfProductsAfterReset).to.equal(numberOfProducts);
+        expect(numberOfProductsAfterReset).to.equal(numberOfProducts);
       });
     });
   });
diff --git a/tests/UI/campaigns/sanity/03_productsBO/02_CRUDStandardProduct.ts b/tests/UI/campaigns/sanity/03_productsBO/02_CRUDStandardProduct.ts
index ec7a982191c4b..e6e831fab0700 100644
--- a/tests/UI/campaigns/sanity/03_productsBO/02_CRUDStandardProduct.ts
+++ b/tests/UI/campaigns/sanity/03_productsBO/02_CRUDStandardProduct.ts
@@ -68,14 +68,14 @@ describe('BO - Catalog - Products : CRUD standard product', async () => {
       await productsPage.closeSfToolBar(page);
 
       const pageTitle: string = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should click on \'New product\' button and check new product modal', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnNewProductButton', baseContext);
 
       const isModalVisible: boolean = await productsPage.clickOnNewProductButton(page);
-      await expect(isModalVisible).to.be.true;
+      expect(isModalVisible).to.eq(true);
     });
 
     it('should choose \'Standard product\'', async function () {
@@ -84,7 +84,7 @@ describe('BO - Catalog - Products : CRUD standard product', async () => {
       await productsPage.selectProductType(page, newProductData.type);
 
       const pageTitle: string = await createProductsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
     });
 
     it('should go to new product page', async function () {
@@ -93,7 +93,7 @@ describe('BO - Catalog - Products : CRUD standard product', async () => {
       await productsPage.clickOnAddNewProduct(page);
 
       const pageTitle: string = await createProductsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
     });
 
     it('should create standard product', async function () {
@@ -102,14 +102,14 @@ describe('BO - Catalog - Products : CRUD standard product', async () => {
       await createProductsPage.closeSfToolBar(page);
 
       const createProductMessage: string = await createProductsPage.setProduct(page, newProductData);
-      await expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+      expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
     });
 
     it('should check that the save button is changed to \'Save and publish\'', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkSaveButton', baseContext);
 
       const saveButtonName: string = await createProductsPage.getSaveButtonName(page);
-      await expect(saveButtonName).to.equal('Save and publish');
+      expect(saveButtonName).to.equal('Save and publish');
     });
 
     it('should preview product', async function () {
@@ -121,7 +121,7 @@ describe('BO - Catalog - Products : CRUD standard product', async () => {
       await foProductPage.changeLanguage(page, 'en');
 
       const pageTitle: string = await foProductPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(newProductData.name);
+      expect(pageTitle).to.contains(newProductData.name);
     });
 
     it('should check all product information', async function () {
@@ -129,10 +129,10 @@ describe('BO - Catalog - Products : CRUD standard product', async () => {
 
       const result = await foProductPage.getProductInformation(page);
       await Promise.all([
-        await expect(result.name).to.equal(newProductData.name),
-        await expect(result.price).to.equal(newProductData.price),
-        await expect(result.summary).to.equal(newProductData.summary),
-        await expect(result.description).to.equal(newProductData.description),
+        expect(result.name).to.equal(newProductData.name),
+        expect(result.price).to.equal(newProductData.price),
+        expect(result.summary).to.equal(newProductData.summary),
+        expect(result.description).to.equal(newProductData.description),
       ]);
     });
 
@@ -143,7 +143,7 @@ describe('BO - Catalog - Products : CRUD standard product', async () => {
       page = await foProductPage.closePage(browserContext, page, 0);
 
       const pageTitle: string = await createProductsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
     });
   });
 
@@ -152,7 +152,7 @@ describe('BO - Catalog - Products : CRUD standard product', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'editProduct', baseContext);
 
       const createProductMessage: string = await createProductsPage.setProduct(page, editProductData);
-      await expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+      expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
     });
 
     it('should preview product', async function () {
@@ -164,7 +164,7 @@ describe('BO - Catalog - Products : CRUD standard product', async () => {
       await foProductPage.changeLanguage(page, 'en');
 
       const pageTitle: string = await foProductPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(editProductData.name);
+      expect(pageTitle).to.contains(editProductData.name);
     });
 
     it('should check all product information', async function () {
@@ -174,9 +174,9 @@ describe('BO - Catalog - Products : CRUD standard product', async () => {
 
       const result = await foProductPage.getProductInformation(page);
       await Promise.all([
-        await expect(result.name).to.equal(editProductData.name),
-        await expect(result.price).to.equal(editProductData.price + taxValue),
-        await expect(result.description).to.equal(editProductData.description),
+        expect(result.name).to.equal(editProductData.name),
+        expect(result.price).to.equal(editProductData.price + taxValue),
+        expect(result.description).to.equal(editProductData.description),
       ]);
     });
 
@@ -187,7 +187,7 @@ describe('BO - Catalog - Products : CRUD standard product', async () => {
       page = await foProductPage.closePage(browserContext, page, 0);
 
       const pageTitle: string = await createProductsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
     });
   });
 
@@ -196,7 +196,7 @@ describe('BO - Catalog - Products : CRUD standard product', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteProduct', baseContext);
 
       const createProductMessage: string = await createProductsPage.deleteProduct(page);
-      await expect(createProductMessage).to.equal(productsPage.successfulDeleteMessage);
+      expect(createProductMessage).to.equal(productsPage.successfulDeleteMessage);
     });
   });
 });
diff --git a/tests/UI/campaigns/sanity/03_productsBO/03_CRUDProductWithCombinations.ts b/tests/UI/campaigns/sanity/03_productsBO/03_CRUDProductWithCombinations.ts
index 205892fbf7959..339ad950e2dd3 100644
--- a/tests/UI/campaigns/sanity/03_productsBO/03_CRUDProductWithCombinations.ts
+++ b/tests/UI/campaigns/sanity/03_productsBO/03_CRUDProductWithCombinations.ts
@@ -80,14 +80,14 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       await productsPage.closeSfToolBar(page);
 
       const pageTitle: string = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should click on \'New product\' button and check new product modal', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnNewProductButton', baseContext);
 
       const isModalVisible: boolean = await productsPage.clickOnNewProductButton(page);
-      await expect(isModalVisible).to.be.true;
+      expect(isModalVisible).to.eq(true);
     });
 
     it('should choose \'Product with combinations\'', async function () {
@@ -96,7 +96,7 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       await productsPage.selectProductType(page, newProductData.type);
 
       const pageTitle: string = await createProductsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
     });
 
     it('should go to new product page', async function () {
@@ -105,7 +105,7 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       await productsPage.clickOnAddNewProduct(page);
 
       const pageTitle: string = await createProductsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
     });
 
     it('should create product', async function () {
@@ -114,14 +114,14 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       await createProductsPage.closeSfToolBar(page);
 
       const createProductMessage: string = await createProductsPage.setProduct(page, newProductData);
-      await expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+      expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
     });
 
     it('should check that the save button is changed to \'Save and publish\'', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkSaveButton', baseContext);
 
       const saveButtonName: string = await createProductsPage.getSaveButtonName(page);
-      await expect(saveButtonName).to.equal('Save and publish');
+      expect(saveButtonName).to.equal('Save and publish');
     });
 
     it('should create combinations and check generate combinations button', async function () {
@@ -131,28 +131,28 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
         page,
         newProductData.attributes,
       );
-      await expect(generateCombinationsButton).to.equal('Generate 4 combinations');
+      expect(generateCombinationsButton).to.equal('Generate 4 combinations');
     });
 
     it('should click on generate combinations button', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'generateCombinations', baseContext);
 
       const successMessage = await combinationsTab.generateCombinations(page);
-      await expect(successMessage).to.equal('Successfully generated 4 combinations.');
+      expect(successMessage).to.equal('Successfully generated 4 combinations.');
     });
 
     it('should check that combinations generation modal is closed', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'generateCombinationsModalIsClosed', baseContext);
 
       const isModalClosed = await combinationsTab.generateCombinationModalIsClosed(page);
-      await expect(isModalClosed).to.be.true;
+      expect(isModalClosed).to.eq(true);
     });
 
     it('should save the product', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'saveProduct', baseContext);
 
       const updateProductMessage: string = await createProductsPage.saveProduct(page);
-      await expect(updateProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+      expect(updateProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
     });
 
     it('should preview product', async function () {
@@ -164,7 +164,7 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       await foProductPage.changeLanguage(page, 'en');
 
       const pageTitle: string = await foProductPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(newProductData.name);
+      expect(pageTitle).to.contains(newProductData.name);
     });
 
     it('should check all product information', async function () {
@@ -172,18 +172,18 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
 
       const result = await foProductPage.getProductInformation(page);
       await Promise.all([
-        await expect(result.name).to.equal(newProductData.name),
-        await expect(result.price).to.equal(newProductData.price),
-        await expect(result.summary).to.equal(newProductData.summary),
-        await expect(result.description).to.equal(newProductData.description),
+        expect(result.name).to.equal(newProductData.name),
+        expect(result.price).to.equal(newProductData.price),
+        expect(result.summary).to.equal(newProductData.summary),
+        expect(result.description).to.equal(newProductData.description),
       ]);
 
       const productAttributes = await foProductPage.getProductAttributes(page);
       await Promise.all([
         // color
-        await expect(productAttributes[0].value).to.equal(newProductData.attributes[1].values.join(' ')),
+        expect(productAttributes[0].value).to.equal(newProductData.attributes[1].values.join(' ')),
         // size
-        await expect(productAttributes[1].value).to.equal(newProductData.attributes[0].values.join(' ')),
+        expect(productAttributes[1].value).to.equal(newProductData.attributes[0].values.join(' ')),
       ]);
     });
 
@@ -194,7 +194,7 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       page = await foProductPage.closePage(browserContext, page, 0);
 
       const pageTitle: string = await createProductsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
     });
   });
 
@@ -203,7 +203,7 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       await testContext.addContextItem(this, 'testIdentifier', 'editProduct', baseContext);
 
       const createProductMessage: string = await createProductsPage.setProduct(page, editProductData);
-      await expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+      expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
     });
 
     it('should add combinations and check generate combinations button', async function () {
@@ -213,28 +213,28 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
         page,
         editProductData.attributes,
       );
-      await expect(generateCombinationsButton).to.equal('Generate 6 combinations');
+      expect(generateCombinationsButton).to.equal('Generate 6 combinations');
     });
 
     it('should click on generate combinations button', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'generateCombinations2', baseContext);
 
       const successMessage = await combinationsTab.generateCombinations(page);
-      await expect(successMessage).to.equal('Successfully generated 6 combinations.');
+      expect(successMessage).to.equal('Successfully generated 6 combinations.');
     });
 
     it('should check that combinations generation modal is closed', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'generateCombinationsModalIsClosed2', baseContext);
 
       const isModalClosed = await combinationsTab.generateCombinationModalIsClosed(page);
-      await expect(isModalClosed).to.be.true;
+      expect(isModalClosed).to.eq(true);
     });
 
     it('should save the product', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'saveProduct2', baseContext);
 
       const updateProductMessage: string = await createProductsPage.saveProduct(page);
-      await expect(updateProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+      expect(updateProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
     });
 
     it('should preview product', async function () {
@@ -246,7 +246,7 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       await foProductPage.changeLanguage(page, 'en');
 
       const pageTitle: string = await foProductPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(editProductData.name);
+      expect(pageTitle).to.contains(editProductData.name);
     });
 
     it('should check all product information', async function () {
@@ -254,16 +254,16 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
 
       const result = await foProductPage.getProductInformation(page);
       await Promise.all([
-        await expect(result.name).to.equal(editProductData.name),
-        await expect(result.price).to.equal(editProductData.price),
-        await expect(result.description).to.equal(editProductData.description),
+        expect(result.name).to.equal(editProductData.name),
+        expect(result.price).to.equal(editProductData.price),
+        expect(result.description).to.equal(editProductData.description),
       ]);
 
       const productAttributes = await foProductPage.getProductAttributes(page);
       await Promise.all([
-        await expect(productAttributes[0].value).to.equal(
+        expect(productAttributes[0].value).to.equal(
           `${newProductData.attributes[1].values.join(' ')} ${editProductData.attributes[1].values.join(' ')}`),
-        await expect(productAttributes[1].value).to.equal(newProductData.attributes[0].values.join(' ')),
+        expect(productAttributes[1].value).to.equal(newProductData.attributes[0].values.join(' ')),
       ]);
     });
 
@@ -274,7 +274,7 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       page = await foProductPage.closePage(browserContext, page, 0);
 
       const pageTitle: string = await createProductsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
     });
   });
 
@@ -283,7 +283,7 @@ describe('BO - Catalog - Products : CRUD product with combinations', async () =>
       await testContext.addContextItem(this, 'testIdentifier', 'deleteProduct', baseContext);
 
       const createProductMessage: string = await createProductsPage.deleteProduct(page);
-      await expect(createProductMessage).to.equal(productsPage.successfulDeleteMessage);
+      expect(createProductMessage).to.equal(productsPage.successfulDeleteMessage);
     });
   });
 });
diff --git a/tests/UI/campaigns/sanity/03_productsBO/04_CRUDVirtualProduct.ts b/tests/UI/campaigns/sanity/03_productsBO/04_CRUDVirtualProduct.ts
index 45b271be58b8e..a5e79437418ba 100644
--- a/tests/UI/campaigns/sanity/03_productsBO/04_CRUDVirtualProduct.ts
+++ b/tests/UI/campaigns/sanity/03_productsBO/04_CRUDVirtualProduct.ts
@@ -67,14 +67,14 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
       await productsPage.closeSfToolBar(page);
 
       const pageTitle: string = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should click on \'New product\' button and check new product modal', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnNewProductButton', baseContext);
 
       const isModalVisible: boolean = await productsPage.clickOnNewProductButton(page);
-      await expect(isModalVisible).to.be.true;
+      expect(isModalVisible).to.eq(true);
     });
 
     it('should choose \'Virtual product\'', async function () {
@@ -83,7 +83,7 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
       await productsPage.selectProductType(page, newProductData.type);
 
       const pageTitle: string = await createProductsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
     });
 
     it('should go to new product page', async function () {
@@ -92,7 +92,7 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
       await productsPage.clickOnAddNewProduct(page);
 
       const pageTitle: string = await createProductsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
     });
 
     it('should create virtual product', async function () {
@@ -101,14 +101,14 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
       await createProductsPage.closeSfToolBar(page);
 
       const createProductMessage: string = await createProductsPage.setProduct(page, newProductData);
-      await expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+      expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
     });
 
     it('should check that the save button is changed to \'Save and publish\'', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'checkSaveButton', baseContext);
 
       const saveButtonName: string = await createProductsPage.getSaveButtonName(page);
-      await expect(saveButtonName).to.equal('Save and publish');
+      expect(saveButtonName).to.equal('Save and publish');
     });
 
     it('should preview product', async function () {
@@ -120,7 +120,7 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
       await foProductPage.changeLanguage(page, 'en');
 
       const pageTitle: string = await foProductPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(newProductData.name);
+      expect(pageTitle).to.contains(newProductData.name);
     });
 
     it('should check all product information', async function () {
@@ -128,10 +128,10 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
 
       const result = await foProductPage.getProductInformation(page);
       await Promise.all([
-        await expect(result.name).to.equal(newProductData.name),
-        await expect(result.price).to.equal(newProductData.price),
-        await expect(result.summary).to.equal(newProductData.summary),
-        await expect(result.description).to.equal(newProductData.description),
+        expect(result.name).to.equal(newProductData.name),
+        expect(result.price).to.equal(newProductData.price),
+        expect(result.summary).to.equal(newProductData.summary),
+        expect(result.description).to.equal(newProductData.description),
       ]);
     });
 
@@ -142,7 +142,7 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
       page = await foProductPage.closePage(browserContext, page, 0);
 
       const pageTitle: string = await createProductsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
     });
   });
 
@@ -151,7 +151,7 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'editProduct', baseContext);
 
       const createProductMessage: string = await createProductsPage.setProduct(page, editProductData);
-      await expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+      expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
     });
 
     it('should preview product', async function () {
@@ -163,7 +163,7 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
       await foProductPage.changeLanguage(page, 'en');
 
       const pageTitle: string = await foProductPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(editProductData.name);
+      expect(pageTitle).to.contains(editProductData.name);
     });
 
     it('should check all product information', async function () {
@@ -173,9 +173,9 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
 
       const result = await foProductPage.getProductInformation(page);
       await Promise.all([
-        await expect(result.name).to.equal(editProductData.name),
-        await expect(result.price).to.equal(editProductData.price + taxValue),
-        await expect(result.description).to.equal(editProductData.description),
+        expect(result.name).to.equal(editProductData.name),
+        expect(result.price).to.equal(editProductData.price + taxValue),
+        expect(result.description).to.equal(editProductData.description),
       ]);
     });
 
@@ -186,7 +186,7 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
       page = await foProductPage.closePage(browserContext, page, 0);
 
       const pageTitle: string = await createProductsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
     });
   });
 
@@ -195,7 +195,7 @@ describe('BO - Catalog - Products : CRUD virtual product', async () => {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteProduct', baseContext);
 
       const createProductMessage: string = await createProductsPage.deleteProduct(page);
-      await expect(createProductMessage).to.equal(productsPage.successfulDeleteMessage);
+      expect(createProductMessage).to.equal(productsPage.successfulDeleteMessage);
     });
   });
 });
diff --git a/tests/UI/campaigns/sanity/03_productsBO/05_deleteProduct.ts b/tests/UI/campaigns/sanity/03_productsBO/05_deleteProduct.ts
index afcad2fe2d7b7..1b90fc056cddf 100644
--- a/tests/UI/campaigns/sanity/03_productsBO/05_deleteProduct.ts
+++ b/tests/UI/campaigns/sanity/03_productsBO/05_deleteProduct.ts
@@ -57,21 +57,21 @@ describe('BO - Catalog - Products : Delete product', async () => {
       await productsPage.closeSfToolBar(page);
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should reset filter and get number of products', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'getNumberOfProduct', baseContext);
 
       numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProducts).to.be.above(0);
+      expect(numberOfProducts).to.be.above(0);
     });
 
     it('should click on \'New product\' button and check new product modal', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnNewProductButton', baseContext);
 
       const isModalVisible = await productsPage.clickOnNewProductButton(page);
-      await expect(isModalVisible).to.be.true;
+      expect(isModalVisible).to.eq(true);
     });
 
     it('should choose \'Standard product\'', async function () {
@@ -80,7 +80,7 @@ describe('BO - Catalog - Products : Delete product', async () => {
       await productsPage.selectProductType(page, newProductData.type);
 
       const pageTitle = await createProductsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
     });
 
     it('should go to new product page', async function () {
@@ -89,7 +89,7 @@ describe('BO - Catalog - Products : Delete product', async () => {
       await productsPage.clickOnAddNewProduct(page);
 
       const pageTitle = await createProductsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
     });
 
     it('should create standard product', async function () {
@@ -98,7 +98,7 @@ describe('BO - Catalog - Products : Delete product', async () => {
       await createProductsPage.closeSfToolBar(page);
 
       const createProductMessage = await createProductsPage.setProduct(page, newProductData);
-      await expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+      expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
     });
   });
 
@@ -109,7 +109,7 @@ describe('BO - Catalog - Products : Delete product', async () => {
       await createProductsPage.goToCatalogPage(page);
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should filter list by \'Reference\' and check result', async function () {
@@ -118,31 +118,31 @@ describe('BO - Catalog - Products : Delete product', async () => {
       await productsPage.filterProducts(page, 'reference', newProductData.reference, 'input');
 
       const numberOfProductsAfterFilter = await productsPage.getNumberOfProductsFromList(page);
-      await expect(numberOfProductsAfterFilter).to.equal(1);
+      expect(numberOfProductsAfterFilter).to.equal(1);
 
       const textColumn = await productsPage.getTextColumn(page, 'reference', 1);
-      await expect(textColumn).to.equal(newProductData.reference);
+      expect(textColumn).to.equal(newProductData.reference);
     });
 
     it('should click on delete product button', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnDeleteProduct', baseContext);
 
       const isModalVisible = await productsPage.clickOnDeleteProductButton(page);
-      await expect(isModalVisible).to.be.true;
+      expect(isModalVisible).to.eq(true);
     });
 
     it('should delete product', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteProduct', baseContext);
 
       const textMessage = await productsPage.clickOnConfirmDialogButton(page);
-      await expect(textMessage).to.equal(productsPage.successfulDeleteMessage);
+      expect(textMessage).to.equal(productsPage.successfulDeleteMessage);
     });
 
     it('should reset filter', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilter', baseContext);
 
       const numberOfProductsAfterReset = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProductsAfterReset).to.equal(numberOfProducts);
+      expect(numberOfProductsAfterReset).to.equal(numberOfProducts);
     });
   });
 });
diff --git a/tests/UI/campaigns/sanity/03_productsBO/06_deleteProductsWithBulkActions.ts b/tests/UI/campaigns/sanity/03_productsBO/06_deleteProductsWithBulkActions.ts
index 7d5bdc62e2346..0afad68b88700 100644
--- a/tests/UI/campaigns/sanity/03_productsBO/06_deleteProductsWithBulkActions.ts
+++ b/tests/UI/campaigns/sanity/03_productsBO/06_deleteProductsWithBulkActions.ts
@@ -68,21 +68,21 @@ describe('BO - Catalog - Products : Delete products with bulk actions', async ()
       await productsPage.closeSfToolBar(page);
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should reset filter and get number of products', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'getNumberOfProduct', baseContext);
 
       numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProducts).to.be.above(0);
+      expect(numberOfProducts).to.be.above(0);
     });
 
     it('should click on \'New product\' button and check new product modal', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnNewProductButton', baseContext);
 
       const isModalVisible = await productsPage.clickOnNewProductButton(page);
-      await expect(isModalVisible).to.be.true;
+      expect(isModalVisible).to.eq(true);
     });
 
     it('should choose \'Standard product\'', async function () {
@@ -91,7 +91,7 @@ describe('BO - Catalog - Products : Delete products with bulk actions', async ()
       await productsPage.selectProductType(page, firstProductData.type);
 
       const pageTitle = await createProductsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
     });
 
     it('should go to new product page', async function () {
@@ -100,7 +100,7 @@ describe('BO - Catalog - Products : Delete products with bulk actions', async ()
       await productsPage.clickOnAddNewProduct(page);
 
       const pageTitle = await createProductsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(createProductsPage.pageTitle);
+      expect(pageTitle).to.contains(createProductsPage.pageTitle);
     });
 
     it('should create standard product', async function () {
@@ -109,7 +109,7 @@ describe('BO - Catalog - Products : Delete products with bulk actions', async ()
       await createProductsPage.closeSfToolBar(page);
 
       const createProductMessage = await createProductsPage.setProduct(page, firstProductData);
-      await expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+      expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
     });
   });
 
@@ -118,7 +118,7 @@ describe('BO - Catalog - Products : Delete products with bulk actions', async ()
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnNewProductButton2', baseContext);
 
       const isModalVisible = await createProductsPage.clickOnNewProductButton(page);
-      await expect(isModalVisible).to.be.true;
+      expect(isModalVisible).to.eq(true);
     });
 
     it('should choose \'Standard product\'', async function () {
@@ -127,7 +127,7 @@ describe('BO - Catalog - Products : Delete products with bulk actions', async ()
       await createProductsPage.chooseProductType(page, secondProductData.type);
 
       const isIframeVisible = await createProductsPage.isChooseProductIframeVisible(page);
-      await expect(isIframeVisible).to.be.false;
+      expect(isIframeVisible).to.eq(false);
     });
 
     it('should create product', async function () {
@@ -136,7 +136,7 @@ describe('BO - Catalog - Products : Delete products with bulk actions', async ()
       await createProductsPage.closeSfToolBar(page);
 
       const createProductMessage = await createProductsPage.setProduct(page, secondProductData);
-      await expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
+      expect(createProductMessage).to.equal(createProductsPage.successfulUpdateMessage);
     });
   });
 
@@ -147,7 +147,7 @@ describe('BO - Catalog - Products : Delete products with bulk actions', async ()
       await createProductsPage.goToCatalogPage(page);
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should filter list by \'Name\' and check result', async function () {
@@ -156,45 +156,45 @@ describe('BO - Catalog - Products : Delete products with bulk actions', async ()
       await productsPage.filterProducts(page, 'product_name', 'toDelete', 'input');
 
       const numberOfProductsAfterFilter = await productsPage.getNumberOfProductsFromList(page);
-      await expect(numberOfProductsAfterFilter).to.equal(2);
+      expect(numberOfProductsAfterFilter).to.equal(2);
 
       const textColumn = await productsPage.getTextColumn(page, 'product_name', 1);
-      await expect(textColumn).to.contains('TODELETE');
+      expect(textColumn).to.contains('TODELETE');
     });
 
     it('should select the 2 products', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnDeleteProduct', baseContext);
 
       const isBulkDeleteButtonEnabled: boolean = await productsPage.bulkSelectProducts(page);
-      await expect(isBulkDeleteButtonEnabled).to.be.true;
+      expect(isBulkDeleteButtonEnabled).to.eq(true);
     });
 
     it('should click on bulk actions button', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnBulkDeleteButton', baseContext);
 
       const textMessage = await productsPage.clickOnBulkActionsProducts(page, 'delete');
-      await expect(textMessage).to.equal('Deleting 2 products');
+      expect(textMessage).to.equal('Deleting 2 products');
     });
 
     it('should bulk delete products', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteProduct', baseContext);
 
       const textMessage = await productsPage.bulkActionsProduct(page, 'delete');
-      await expect(textMessage).to.equal('Deleting 2 / 2 products');
+      expect(textMessage).to.equal('Deleting 2 / 2 products');
     });
 
     it('should close progress modal', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'closeProgressModal', baseContext);
 
       const isModalNotVisible = await productsPage.closeBulkActionsProgressModal(page, 'delete');
-      await expect(isModalNotVisible).to.be.true;
+      expect(isModalNotVisible).to.eq(true);
     });
 
     it('should reset filter', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilter', baseContext);
 
       const numberOfProductsAfterReset = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProductsAfterReset).to.equal(numberOfProducts);
+      expect(numberOfProductsAfterReset).to.equal(numberOfProducts);
     });
   });
 });
diff --git a/tests/UI/campaigns/sanity/04_catalogFO/01_filterProducts.ts b/tests/UI/campaigns/sanity/04_catalogFO/01_filterProducts.ts
index 3b5bc4a7240b4..13c2f7a4c08a8 100644
--- a/tests/UI/campaigns/sanity/04_catalogFO/01_filterProducts.ts
+++ b/tests/UI/campaigns/sanity/04_catalogFO/01_filterProducts.ts
@@ -53,7 +53,7 @@ describe('FO - Catalog : Filter Products by categories in Home page', async () =
       await homePage.goTo(page, global.FO.URL);
 
       const result = await homePage.isHomePage(page);
-      await expect(result).to.be.true;
+      expect(result).to.eq(true);
     });
 
     it('should check and get the products number', async function () {
@@ -62,7 +62,7 @@ describe('FO - Catalog : Filter Products by categories in Home page', async () =
       await homePage.goToAllProductsPage(page);
 
       allProductsNumber = await homePage.getProductsNumber(page);
-      await expect(allProductsNumber).to.be.above(0);
+      expect(allProductsNumber).to.be.above(0);
     });
 
     it('should filter products by the category \'Accessories\' and check result', async function () {
@@ -71,7 +71,7 @@ describe('FO - Catalog : Filter Products by categories in Home page', async () =
       await homePage.goToCategory(page, Categories.accessories.id);
 
       const numberOfProducts = await homePage.getProductsNumber(page);
-      await expect(numberOfProducts).to.be.below(allProductsNumber);
+      expect(numberOfProducts).to.be.below(allProductsNumber);
     });
 
     it('should filter products by the subcategory \'Stationery\' and check result', async function () {
@@ -80,7 +80,7 @@ describe('FO - Catalog : Filter Products by categories in Home page', async () =
       await homePage.goToSubCategory(page, Categories.accessories.id, Categories.stationery.id);
 
       const numberOfProducts = await homePage.getProductsNumber(page);
-      await expect(numberOfProducts).to.be.below(allProductsNumber);
+      expect(numberOfProducts).to.be.below(allProductsNumber);
     });
   });
 
diff --git a/tests/UI/campaigns/sanity/04_catalogFO/02_checkProduct.ts b/tests/UI/campaigns/sanity/04_catalogFO/02_checkProduct.ts
index 21acb7d540b08..30009bb2d1187 100644
--- a/tests/UI/campaigns/sanity/04_catalogFO/02_checkProduct.ts
+++ b/tests/UI/campaigns/sanity/04_catalogFO/02_checkProduct.ts
@@ -51,7 +51,7 @@ describe('FO - Catalog : Check the Product page', async () => {
       await homePage.goTo(page, global.FO.URL);
 
       const result = await homePage.isHomePage(page);
-      await expect(result).to.be.true;
+      expect(result).to.eq(true);
     });
 
     it('should go to the first product page', async function () {
@@ -60,7 +60,7 @@ describe('FO - Catalog : Check the Product page', async () => {
       await homePage.goToProductPage(page, 1);
 
       const pageTitle = await productPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(Products.demo_1.name);
+      expect(pageTitle).to.contains(Products.demo_1.name);
     });
 
     it('should check the product page', async function () {
diff --git a/tests/UI/campaigns/sanity/05_cartFO/01_editCheckCart.ts b/tests/UI/campaigns/sanity/05_cartFO/01_editCheckCart.ts
index b7243f30e6683..01f356f53dd7d 100644
--- a/tests/UI/campaigns/sanity/05_cartFO/01_editCheckCart.ts
+++ b/tests/UI/campaigns/sanity/05_cartFO/01_editCheckCart.ts
@@ -57,7 +57,7 @@ describe('FO - Cart : Check Cart in FO', async () => {
       await homePage.goTo(page, global.FO.URL);
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage).to.be.true;
+      expect(isHomePage).to.eq(true);
     });
 
     it('should go to the first product page', async function () {
@@ -66,7 +66,7 @@ describe('FO - Cart : Check Cart in FO', async () => {
       await homePage.goToProductPage(page, 1);
 
       const pageTitle = await productPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(Products.demo_1.name);
+      expect(pageTitle).to.contains(Products.demo_1.name);
     });
 
     it('should add product to cart and check that the number of products was updated in cart header', async function () {
@@ -75,7 +75,7 @@ describe('FO - Cart : Check Cart in FO', async () => {
       await productPage.addProductToTheCart(page);
       // getNumberFromText is used to get the notifications number in the cart
       const notificationsNumber = await homePage.getCartNotificationsNumber(page);
-      await expect(notificationsNumber).to.be.equal(1);
+      expect(notificationsNumber).to.be.equal(1);
     });
 
     it('should go to the home page', async function () {
@@ -84,7 +84,7 @@ describe('FO - Cart : Check Cart in FO', async () => {
       await homePage.goToHomePage(page);
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage).to.be.true;
+      expect(isHomePage).to.eq(true);
     });
 
     it('should go to the second product page', async function () {
@@ -93,7 +93,7 @@ describe('FO - Cart : Check Cart in FO', async () => {
       await homePage.goToProductPage(page, 2);
 
       const pageTitle = await productPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(Products.demo_3.name);
+      expect(pageTitle).to.contains(Products.demo_3.name);
     });
 
     it('should add product to cart and check that the number of products was updated in cart header', async function () {
@@ -103,7 +103,7 @@ describe('FO - Cart : Check Cart in FO', async () => {
 
       // getNumberFromText is used to get the notifications number in the cart
       const notificationsNumber = await homePage.getCartNotificationsNumber(page);
-      await expect(notificationsNumber).to.be.equal(2);
+      expect(notificationsNumber).to.be.equal(2);
     });
 
     it('should check the first product details', async function () {
@@ -134,7 +134,7 @@ describe('FO - Cart : Check Cart in FO', async () => {
       // getNumberFromText is used to get the price ATI
       totalATI = await cartPage.getATIPrice(page);
       // @todo : https://github.com/PrestaShop/PrestaShop/issues/9779
-      // await expect(totalATI.toString()).to.be.equal((Products.demo_3.finalPrice + Products.demo_1.finalPrice)
+      // expect(totalATI.toString()).to.be.equal((Products.demo_3.finalPrice + Products.demo_1.finalPrice)
       // .toFixed(2));
     });
 
@@ -143,7 +143,7 @@ describe('FO - Cart : Check Cart in FO', async () => {
 
       // getNumberFromText is used to get the products number
       itemsNumber = await cartPage.getProductsNumber(page);
-      await expect(itemsNumber).to.be.equal(2);
+      expect(itemsNumber).to.be.equal(2);
     });
 
     it('should edit the quantity of the first product ordered', async function () {
@@ -153,11 +153,11 @@ describe('FO - Cart : Check Cart in FO', async () => {
 
       // getNumberFromText is used to get the new price ATI
       const totalPrice = await cartPage.getATIPrice(page);
-      await expect(totalPrice).to.be.above(totalATI);
+      expect(totalPrice).to.be.above(totalATI);
 
       // getNumberFromText is used to get the new products number
       const productsNumber = await cartPage.getProductsNumber(page);
-      await expect(productsNumber).to.be.above(itemsNumber);
+      expect(productsNumber).to.be.above(itemsNumber);
     });
 
     it('should edit the quantity of the second product ordered', async function () {
@@ -167,11 +167,11 @@ describe('FO - Cart : Check Cart in FO', async () => {
 
       // getNumberFromText is used to get the new price ATI
       const totalPrice = await cartPage.getATIPrice(page);
-      await expect(totalPrice).to.be.above(totalATI);
+      expect(totalPrice).to.be.above(totalATI);
 
       // getNumberFromText is used to get the new products number
       const productsNumber = await cartPage.getCartNotificationsNumber(page);
-      await expect(productsNumber).to.be.above(itemsNumber);
+      expect(productsNumber).to.be.above(itemsNumber);
     });
   });
 
diff --git a/tests/UI/campaigns/sanity/06_checkoutFO/01_orderProduct.ts b/tests/UI/campaigns/sanity/06_checkoutFO/01_orderProduct.ts
index c3c4dea3958d0..e8e104aa8d91a 100644
--- a/tests/UI/campaigns/sanity/06_checkoutFO/01_orderProduct.ts
+++ b/tests/UI/campaigns/sanity/06_checkoutFO/01_orderProduct.ts
@@ -43,7 +43,7 @@ describe('BO - Checkout : Order a product and check order confirmation', async (
     await homePage.goTo(page, global.FO.URL);
 
     const result = await homePage.isHomePage(page);
-    await expect(result).to.be.true;
+    expect(result).to.eq(true);
   });
 
   it('should go to login page', async function () {
@@ -52,7 +52,7 @@ describe('BO - Checkout : Order a product and check order confirmation', async (
     await homePage.goToLoginPage(page);
 
     const pageTitle = await loginPage.getPageTitle(page);
-    await expect(pageTitle).to.equal(loginPage.pageTitle);
+    expect(pageTitle).to.equal(loginPage.pageTitle);
   });
 
   it('should sign In in FO with default account', async function () {
@@ -61,7 +61,7 @@ describe('BO - Checkout : Order a product and check order confirmation', async (
     await loginPage.customerLogin(page, Customers.johnDoe);
 
     const connected = await homePage.isCustomerConnected(page);
-    await expect(connected, 'Customer is not connected in FO').to.be.true;
+    expect(connected, 'Customer is not connected in FO').to.eq(true);
   });
 
   it('should go to home page', async function () {
@@ -74,7 +74,7 @@ describe('BO - Checkout : Order a product and check order confirmation', async (
     }
 
     const result = await homePage.isHomePage(page);
-    await expect(result).to.be.true;
+    expect(result).to.eq(true);
   });
 
   it('should add first product to cart and Proceed to checkout', async function () {
@@ -84,7 +84,7 @@ describe('BO - Checkout : Order a product and check order confirmation', async (
     await homePage.proceedToCheckout(page);
 
     const pageTitle = await cartPage.getPageTitle(page);
-    await expect(pageTitle).to.equal(cartPage.pageTitle);
+    expect(pageTitle).to.equal(cartPage.pageTitle);
   });
 
   it('should check the cart details', async function () {
@@ -104,27 +104,27 @@ describe('BO - Checkout : Order a product and check order confirmation', async (
     await cartPage.clickOnProceedToCheckout(page);
 
     const isCheckoutPage = await checkoutPage.isCheckoutPage(page);
-    await expect(isCheckoutPage, 'Browser is not in checkout Page').to.be.true;
+    expect(isCheckoutPage, 'Browser is not in checkout Page').to.eq(true);
 
     const isStepPersonalInformationComplete = await checkoutPage.isStepCompleted(
       page,
       checkoutPage.personalInformationStepForm,
     );
-    await expect(isStepPersonalInformationComplete, 'Step Personal information is not complete').to.be.true;
+    expect(isStepPersonalInformationComplete, 'Step Personal information is not complete').to.eq(true);
   });
 
   it('should validate Step Address and go to Delivery Step', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'checkDeliveryStep', baseContext);
 
     const isStepAddressComplete = await checkoutPage.goToDeliveryStep(page);
-    await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+    expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
   });
 
   it('should validate Step Delivery and go to Payment Step', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'goToPaymentStep', baseContext);
 
     const isStepDeliveryComplete = await checkoutPage.goToPaymentStep(page);
-    await expect(isStepDeliveryComplete, 'Step Address is not complete').to.be.true;
+    expect(isStepDeliveryComplete, 'Step Address is not complete').to.eq(true);
   });
 
   it('should Pay by back wire and confirm order', async function () {
@@ -133,9 +133,9 @@ describe('BO - Checkout : Order a product and check order confirmation', async (
     await checkoutPage.choosePaymentAndOrder(page, PaymentMethods.wirePayment.moduleName);
 
     const pageTitle = await orderConfirmationPage.getPageTitle(page);
-    await expect(pageTitle).to.equal(orderConfirmationPage.pageTitle);
+    expect(pageTitle).to.equal(orderConfirmationPage.pageTitle);
 
     const cardTitle = await orderConfirmationPage.getOrderConfirmationCardTitle(page);
-    await expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
+    expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
   });
 });
diff --git a/tests/UI/commonTests/BO/advancedParameters/cache.ts b/tests/UI/commonTests/BO/advancedParameters/cache.ts
index 4fa277c18159c..832de0cfa6850 100644
--- a/tests/UI/commonTests/BO/advancedParameters/cache.ts
+++ b/tests/UI/commonTests/BO/advancedParameters/cache.ts
@@ -46,14 +46,14 @@ function deleteCacheTest(baseContext: string = 'commonTests-deleteCache'): void
       await performancePage.closeSfToolBar(page);
 
       const pageTitle = await performancePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(performancePage.pageTitle);
+      expect(pageTitle).to.contains(performancePage.pageTitle);
     });
 
     it('should clear cache', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clearCache', baseContext);
 
       const successMessage = await performancePage.clearCache(page);
-      await expect(successMessage).to.equal(performancePage.clearCacheSuccessMessage);
+      expect(successMessage).to.equal(performancePage.clearCacheSuccessMessage);
     });
   });
 }
diff --git a/tests/UI/commonTests/BO/advancedParameters/employee.ts b/tests/UI/commonTests/BO/advancedParameters/employee.ts
index 4844ea73b57a4..48576be79fc7e 100644
--- a/tests/UI/commonTests/BO/advancedParameters/employee.ts
+++ b/tests/UI/commonTests/BO/advancedParameters/employee.ts
@@ -51,14 +51,14 @@ function createEmployeeTest(employeeData: EmployeeData, baseContext: string = 'c
       );
 
       const pageTitle = await employeesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(employeesPage.pageTitle);
+      expect(pageTitle).to.contains(employeesPage.pageTitle);
     });
 
     it('should reset all filters and get number of employees', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterEmployeeTable', baseContext);
 
       numberOfEmployees = await employeesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfEmployees).to.be.above(0);
+      expect(numberOfEmployees).to.be.above(0);
     });
 
     it('should go to add new employee page', async function () {
@@ -67,14 +67,14 @@ function createEmployeeTest(employeeData: EmployeeData, baseContext: string = 'c
       await employeesPage.goToAddNewEmployeePage(page);
 
       const pageTitle = await addEmployeePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addEmployeePage.pageTitleCreate);
+      expect(pageTitle).to.contains(addEmployeePage.pageTitleCreate);
     });
 
     it('should create employee and check result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createEmployee', baseContext);
 
       const textResult = await addEmployeePage.createEditEmployee(page, employeeData);
-      await expect(textResult).to.equal(employeesPage.successfulCreationMessage);
+      expect(textResult).to.equal(employeesPage.successfulCreationMessage);
     });
   });
 }
@@ -110,7 +110,7 @@ function deleteEmployeeTest(employeeData: EmployeeData, baseContext: string = 'c
       );
 
       const pageTitle = await employeesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(employeesPage.pageTitle);
+      expect(pageTitle).to.contains(employeesPage.pageTitle);
     });
 
     it('should filter list of employees by email', async function () {
@@ -119,21 +119,21 @@ function deleteEmployeeTest(employeeData: EmployeeData, baseContext: string = 'c
       await employeesPage.filterEmployees(page, 'input', 'email', employeeData.email);
 
       const textEmail = await employeesPage.getTextColumnFromTable(page, 1, 'email');
-      await expect(textEmail).to.contains(employeeData.email);
+      expect(textEmail).to.contains(employeeData.email);
     });
 
     it('should delete employee', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteEmployee', baseContext);
 
       const textResult = await employeesPage.deleteEmployee(page, 1);
-      await expect(textResult).to.equal(employeesPage.successfulDeleteMessage);
+      expect(textResult).to.equal(employeesPage.successfulDeleteMessage);
     });
 
     it('should reset filter and check the number of employees', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDeleteEmployee', baseContext);
 
       const numberOfEmployeesAfterDelete = await employeesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfEmployeesAfterDelete).to.be.equal(numberOfEmployees);
+      expect(numberOfEmployeesAfterDelete).to.be.equal(numberOfEmployees);
     });
   });
 }
diff --git a/tests/UI/commonTests/BO/advancedParameters/importFile.ts b/tests/UI/commonTests/BO/advancedParameters/importFile.ts
index e48b69619bcb4..54c215b1ae44f 100644
--- a/tests/UI/commonTests/BO/advancedParameters/importFile.ts
+++ b/tests/UI/commonTests/BO/advancedParameters/importFile.ts
@@ -52,14 +52,14 @@ function importFileTest(
       await importPage.closeSfToolBar(page);
 
       const pageTitle = await importPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(importPage.pageTitle);
+      expect(pageTitle).to.contains(importPage.pageTitle);
     });
 
     it(`should import '${fileName}' file`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'importFile', baseContext);
 
       const uploadSuccessText = await importPage.uploadImportFile(page, entityToImport, fileName);
-      await expect(uploadSuccessText).contain(fileName);
+      expect(uploadSuccessText).contain(fileName);
 
       if (await importPage.isForceAllIDNumbersVisible(page)) {
         await importPage.setForceAllIDNumbers(page);
@@ -70,21 +70,21 @@ function importFileTest(
       await testContext.addContextItem(this, 'testIdentifier', 'nextStep', baseContext);
 
       const panelTitle = await importPage.goToImportNextStep(page);
-      await expect(panelTitle).contain(importPage.importPanelTitle);
+      expect(panelTitle).contain(importPage.importPanelTitle);
     });
 
     it('should start import file', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'confirmImport', baseContext);
 
       const modalTitle = await importPage.startFileImport(page);
-      await expect(modalTitle).contain(importPage.importModalTitle);
+      expect(modalTitle).contain(importPage.importModalTitle);
     });
 
     it('should check that the import is completed', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'waitForImport', baseContext);
 
       const isCompleted = await importPage.getImportValidationMessage(page);
-      await expect(isCompleted, 'The import is not completed!')
+      expect(isCompleted, 'The import is not completed!')
         .contain('Data imported')
         .and.contain('Look at your listings to make sure it\'s all there as you wished.');
     });
@@ -93,7 +93,7 @@ function importFileTest(
       await testContext.addContextItem(this, 'testIdentifier', 'closeImportModal', baseContext);
 
       const isModalClosed = await importPage.closeImportModal(page);
-      await expect(isModalClosed).to.be.true;
+      expect(isModalClosed).to.eq(true);
     });
   });
 }
diff --git a/tests/UI/commonTests/BO/advancedParameters/multistore.ts b/tests/UI/commonTests/BO/advancedParameters/multistore.ts
index 5c1d3b9ff4039..a403399e5da22 100644
--- a/tests/UI/commonTests/BO/advancedParameters/multistore.ts
+++ b/tests/UI/commonTests/BO/advancedParameters/multistore.ts
@@ -47,14 +47,14 @@ function setMultiStoreStatus(status: boolean, baseContext: string = 'commonTests
       await generalPage.closeSfToolBar(page);
 
       const pageTitle = await generalPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(generalPage.pageTitle);
+      expect(pageTitle).to.contains(generalPage.pageTitle);
     });
 
     it(`should ${status ? 'enable' : 'disable'} the webservice`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'setMultiStoreStatus', baseContext);
 
       const result = await generalPage.setMultiStoreStatus(page, status);
-      await expect(result).to.contains(generalPage.successfulUpdateMessage);
+      expect(result).to.contains(generalPage.successfulUpdateMessage);
     });
   });
 }
diff --git a/tests/UI/commonTests/BO/advancedParameters/newFeatures.ts b/tests/UI/commonTests/BO/advancedParameters/newFeatures.ts
index d238caf71a0cc..68dd80e2903ab 100644
--- a/tests/UI/commonTests/BO/advancedParameters/newFeatures.ts
+++ b/tests/UI/commonTests/BO/advancedParameters/newFeatures.ts
@@ -76,14 +76,14 @@ function setFeatureFlag(featureFlag: string, expectedStatus: boolean, baseContex
       await featureFlagPage.closeSfToolBar(page);
 
       const pageTitle = await featureFlagPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(featureFlagPage.pageTitle);
+      expect(pageTitle).to.contains(featureFlagPage.pageTitle);
     });
 
     it(`should ${expectedStatus ? 'enable' : 'disable'} "${title}"`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'setFeatureFlag', baseContext);
 
       const successMessage = await featureFlagPage.setFeatureFlag(page, featureFlag, expectedStatus);
-      await expect(successMessage).to.be.contain(featureFlagPage.successfulUpdateMessage);
+      expect(successMessage).to.be.contain(featureFlagPage.successfulUpdateMessage);
     });
   });
 }
diff --git a/tests/UI/commonTests/BO/advancedParameters/setPermissions.ts b/tests/UI/commonTests/BO/advancedParameters/setPermissions.ts
index 3bde51b9c38ab..030ec157253d4 100644
--- a/tests/UI/commonTests/BO/advancedParameters/setPermissions.ts
+++ b/tests/UI/commonTests/BO/advancedParameters/setPermissions.ts
@@ -53,21 +53,21 @@ function setPermissions(
       );
 
       const pageTitle = await employeesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(employeesPage.pageTitle);
+      expect(pageTitle).to.contains(employeesPage.pageTitle);
     });
 
     it('should go to \'Permissions\' tab', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'goToPermissionsTab', baseContext);
 
       const isTabOpened = await employeesPage.goToPermissionsTab(page);
-      await expect(isTabOpened, 'Permissions tab is not opened!').to.be.true;
+      expect(isTabOpened, 'Permissions tab is not opened!').to.eq(true);
     });
 
     it('should click on the defined profile', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'goToProfileSubTab', baseContext);
 
       const isSubTabOpened = await permissionsPage.goToProfileSubTab(page, profileName);
-      await expect(isSubTabOpened, 'Profile sub-tab is not opened!').to.be.true;
+      expect(isSubTabOpened, 'Profile sub-tab is not opened!').to.eq(true);
     });
 
     permissionsData.forEach((permission: EmployeePermission) => {
@@ -81,7 +81,7 @@ function setPermissions(
           );
 
           const isPermissionDefined = await permissionsPage.setPermission(page, permission.className, access);
-          await expect(isPermissionDefined, 'Permission is not updated').to.be.true;
+          expect(isPermissionDefined, 'Permission is not updated').to.eq(true);
         });
       });
     });
diff --git a/tests/UI/commonTests/BO/advancedParameters/smtp.ts b/tests/UI/commonTests/BO/advancedParameters/smtp.ts
index a621495f65d60..236828bdc66ef 100644
--- a/tests/UI/commonTests/BO/advancedParameters/smtp.ts
+++ b/tests/UI/commonTests/BO/advancedParameters/smtp.ts
@@ -51,7 +51,7 @@ function setupSmtpConfigTest(baseContext: string = 'commonTests-configSMTP'): vo
       await emailPage.closeSfToolBar(page);
 
       const pageTitle = await emailPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(emailPage.pageTitle);
+      expect(pageTitle).to.contains(emailPage.pageTitle);
     });
 
     it('should fill the smtp parameters form fields', async function () {
@@ -64,7 +64,7 @@ function setupSmtpConfigTest(baseContext: string = 'commonTests-configSMTP'): vo
         Customers.johnDoe.password,
         smtpPort.toString(),
       );
-      await expect(alertSuccessMessage).to.contains(emailPage.successfulUpdateMessage);
+      expect(alertSuccessMessage).to.contains(emailPage.successfulUpdateMessage);
     });
   });
 }
@@ -100,14 +100,14 @@ function resetSmtpConfigTest(baseContext: string = 'commonTests-configSMTP'): vo
       await emailPage.closeSfToolBar(page);
 
       const pageTitle = await emailPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(emailPage.pageTitle);
+      expect(pageTitle).to.contains(emailPage.pageTitle);
     });
 
     it('should reset parameters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetMailParameters', baseContext);
 
       const successParametersReset = await emailPage.resetDefaultParameters(page);
-      await expect(successParametersReset).to.contains(emailPage.successfulUpdateMessage);
+      expect(successParametersReset).to.contains(emailPage.successfulUpdateMessage);
     });
   });
 }
diff --git a/tests/UI/commonTests/BO/advancedParameters/ws.ts b/tests/UI/commonTests/BO/advancedParameters/ws.ts
index 62cf16beb3770..4dc7faeceb265 100644
--- a/tests/UI/commonTests/BO/advancedParameters/ws.ts
+++ b/tests/UI/commonTests/BO/advancedParameters/ws.ts
@@ -50,14 +50,14 @@ function setWebserviceStatus(status: boolean, baseContext: string = 'commonTests
       await webservicePage.closeSfToolBar(page);
 
       const pageTitle = await webservicePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(webservicePage.pageTitle);
+      expect(pageTitle).to.contains(webservicePage.pageTitle);
     });
 
     it(`should ${status ? 'enable' : 'disable'} the webservice`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'setWebserviceStatus', baseContext);
 
       const textResult = await webservicePage.setWebserviceStatus(page, status);
-      await expect(textResult).to.contains(webservicePage.successfulUpdateMessage);
+      expect(textResult).to.contains(webservicePage.successfulUpdateMessage);
     });
   });
 }
@@ -100,14 +100,14 @@ function addWebserviceKey(
       await webservicePage.closeSfToolBar(page);
 
       const pageTitle = await webservicePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(webservicePage.pageTitle);
+      expect(pageTitle).to.contains(webservicePage.pageTitle);
     });
 
     it('should reset all filters and get number of webservices', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'firstReset', baseContext);
 
       numberOfWebserviceKeys = await webservicePage.resetAndGetNumberOfLines(page);
-      await expect(numberOfWebserviceKeys).to.be.eq(0);
+      expect(numberOfWebserviceKeys).to.be.eq(0);
     });
 
     it('should go to add new webservice key page', async function () {
@@ -116,17 +116,17 @@ function addWebserviceKey(
       await webservicePage.goToAddNewWebserviceKeyPage(page);
 
       const pageTitle = await addWebservicePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addWebservicePage.pageTitleCreate);
+      expect(pageTitle).to.contains(addWebservicePage.pageTitleCreate);
     });
 
     it('should create webservice key and check result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createWebserviceKey', baseContext);
 
       const textResult = await addWebservicePage.createEditWebservice(page, webserviceData);
-      await expect(textResult).to.equal(addWebservicePage.successfulCreationMessage);
+      expect(textResult).to.equal(addWebservicePage.successfulCreationMessage);
 
       const numberOfWebserviceKeysAfterCreation = await webservicePage.getNumberOfElementInGrid(page);
-      await expect(numberOfWebserviceKeysAfterCreation).to.be.eq(1);
+      expect(numberOfWebserviceKeysAfterCreation).to.be.eq(1);
     });
   });
 }
@@ -159,14 +159,14 @@ function removeWebserviceKey(keyDescription: string, baseContext: string = 'comm
       await webservicePage.closeSfToolBar(page);
 
       const pageTitle = await webservicePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(webservicePage.pageTitle);
+      expect(pageTitle).to.contains(webservicePage.pageTitle);
     });
 
     it('should reset all filters and get number of webservices', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'firstReset', baseContext);
 
       numberOfWebserviceKeys = await webservicePage.resetAndGetNumberOfLines(page);
-      await expect(numberOfWebserviceKeys).to.be.eq(1);
+      expect(numberOfWebserviceKeys).to.be.eq(1);
     });
 
     it('should filter list by key description', async function () {
@@ -180,21 +180,21 @@ function removeWebserviceKey(keyDescription: string, baseContext: string = 'comm
       );
 
       const key = await webservicePage.getTextColumnFromTable(page, 1, 'description');
-      await expect(key).to.contains(keyDescription);
+      expect(key).to.contains(keyDescription);
     });
 
     it('should delete webservice key', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteWebserviceKey', baseContext);
 
       const textResult = await webservicePage.deleteWebserviceKey(page, 1);
-      await expect(textResult).to.equal(webservicePage.successfulDeleteMessage);
+      expect(textResult).to.equal(webservicePage.successfulDeleteMessage);
     });
 
     it('should reset filter and check the number of webservice keys', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilterAfterDelete', baseContext);
 
       const numberOfWebserviceKeyAfterDelete = await webservicePage.resetAndGetNumberOfLines(page);
-      await expect(numberOfWebserviceKeyAfterDelete).to.be.equal(0);
+      expect(numberOfWebserviceKeyAfterDelete).to.be.equal(0);
     });
   });
 }
diff --git a/tests/UI/commonTests/BO/catalog/cartRule.ts b/tests/UI/commonTests/BO/catalog/cartRule.ts
index f21ff4a189d77..e86c632ac44b1 100644
--- a/tests/UI/commonTests/BO/catalog/cartRule.ts
+++ b/tests/UI/commonTests/BO/catalog/cartRule.ts
@@ -51,14 +51,14 @@ function createCartRuleTest(cartRuleData: CartRuleData, baseContext: string = 'c
       );
 
       const pageTitle = await cartRulesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(cartRulesPage.pageTitle);
+      expect(pageTitle).to.contains(cartRulesPage.pageTitle);
     });
 
     it('should reset and get number of cart rules', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFirst', baseContext);
 
       numberOfCartRules = await cartRulesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCartRules).to.be.at.least(0);
+      expect(numberOfCartRules).to.be.at.least(0);
     });
 
     it('should go to new cart rule page', async function () {
@@ -67,14 +67,14 @@ function createCartRuleTest(cartRuleData: CartRuleData, baseContext: string = 'c
       await cartRulesPage.goToAddNewCartRulesPage(page);
 
       const pageTitle = await addCartRulePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addCartRulePage.pageTitle);
+      expect(pageTitle).to.contains(addCartRulePage.pageTitle);
     });
 
     it('should create new cart rule', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createCartRule', baseContext);
 
       const validationMessage = await addCartRulePage.createEditCartRules(page, cartRuleData);
-      await expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
+      expect(validationMessage).to.contains(addCartRulePage.successfulCreationMessage);
     });
   });
 }
@@ -110,28 +110,28 @@ function deleteCartRuleTest(cartRuleName: string, baseContext : string = 'common
       );
 
       const pageTitle = await cartRulesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(cartRulesPage.pageTitle);
+      expect(pageTitle).to.contains(cartRulesPage.pageTitle);
     });
 
     it('should reset and get number of cart rules', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFirst', baseContext);
 
       numberOfCartRules = await cartRulesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCartRules).to.be.at.least(0);
+      expect(numberOfCartRules).to.be.at.least(0);
     });
 
     it('should delete cart rule', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteCartRule', baseContext);
 
       const validationMessage = await cartRulesPage.deleteCartRule(page, 1, cartRuleName);
-      await expect(validationMessage).to.contains(cartRulesPage.successfulDeleteMessage);
+      expect(validationMessage).to.contains(cartRulesPage.successfulDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterBulkDelete', baseContext);
 
       const numberOfCartRulesAfterDelete = await cartRulesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCartRulesAfterDelete).to.equal(numberOfCartRules - 1);
+      expect(numberOfCartRulesAfterDelete).to.equal(numberOfCartRules - 1);
     });
   });
 }
@@ -166,28 +166,28 @@ function bulkDeleteCartRuleTest(baseContext: string = 'commonTests-bulkDeleteCar
       );
 
       const pageTitle = await cartRulesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(cartRulesPage.pageTitle);
+      expect(pageTitle).to.contains(cartRulesPage.pageTitle);
     });
 
     it('should reset and get number of cart rules', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFirst', baseContext);
 
       numberOfCartRules = await cartRulesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCartRules).to.be.at.least(0);
+      expect(numberOfCartRules).to.be.at.least(0);
     });
 
     it('should bulk delete cart rules', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteCartRules', baseContext);
 
       const deleteTextResult = await cartRulesPage.bulkDeleteCartRules(page);
-      await expect(deleteTextResult).to.be.contains(cartRulesPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.contains(cartRulesPage.successfulMultiDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterBulkDelete', baseContext);
 
       const numberOfCartRulesAfterDelete = await cartRulesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCartRulesAfterDelete).to.equal(0);
+      expect(numberOfCartRulesAfterDelete).to.equal(0);
     });
   });
 }
diff --git a/tests/UI/commonTests/BO/catalog/category.ts b/tests/UI/commonTests/BO/catalog/category.ts
index 9a190b15d1494..d12444b0d556b 100644
--- a/tests/UI/commonTests/BO/catalog/category.ts
+++ b/tests/UI/commonTests/BO/catalog/category.ts
@@ -54,14 +54,14 @@ function bulkDeleteCategoriesTest(
       await categoriesPage.closeSfToolBar(page);
 
       const pageTitle = await categoriesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(categoriesPage.pageTitle);
+      expect(pageTitle).to.contains(categoriesPage.pageTitle);
     });
 
     it('should reset filter and get number of categories', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFirst', baseContext);
 
       numberOfCategories = await categoriesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCategories).to.be.above(0);
+      expect(numberOfCategories).to.be.above(0);
     });
 
     it('should filter list by Name \'category\'', async function () {
@@ -70,21 +70,21 @@ function bulkDeleteCategoriesTest(
       await categoriesPage.filterCategories(page, 'input', categoryData.filterBy, categoryData.value);
 
       const textColumn = await categoriesPage.getTextColumnFromTableCategories(page, 1, categoryData.filterBy);
-      await expect(textColumn).to.contains(categoryData.value);
+      expect(textColumn).to.contains(categoryData.value);
     });
 
     it('should delete categories', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDelete', baseContext);
 
       const deleteTextResult = await categoriesPage.deleteCategoriesBulkActions(page);
-      await expect(deleteTextResult).to.be.equal(categoriesPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.equal(categoriesPage.successfulMultiDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDelete', baseContext);
 
       const numberOfCategoriesAfterReset = await categoriesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCategoriesAfterReset).to.be.below(numberOfCategories);
+      expect(numberOfCategoriesAfterReset).to.be.below(numberOfCategories);
     });
   });
 }
diff --git a/tests/UI/commonTests/BO/catalog/features.ts b/tests/UI/commonTests/BO/catalog/features.ts
index 6cbf498ac89e7..a3cb1d6ac1fbf 100644
--- a/tests/UI/commonTests/BO/catalog/features.ts
+++ b/tests/UI/commonTests/BO/catalog/features.ts
@@ -54,7 +54,7 @@ function createFeatureTest(createFeatureData: FeatureData, baseContext: string =
       await attributesPage.closeSfToolBar(page);
 
       const pageTitle = await attributesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(attributesPage.pageTitle);
+      expect(pageTitle).to.contains(attributesPage.pageTitle);
     });
 
     it('should go to Features page', async function () {
@@ -63,10 +63,10 @@ function createFeatureTest(createFeatureData: FeatureData, baseContext: string =
       await attributesPage.goToFeaturesPage(page);
 
       const pageTitle = await featuresPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(featuresPage.pageTitle);
+      expect(pageTitle).to.contains(featuresPage.pageTitle);
 
       numberOfFeatures = await featuresPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfFeatures).to.be.above(0);
+      expect(numberOfFeatures).to.be.above(0);
     });
 
     it('should go to add new feature page', async function () {
@@ -75,14 +75,14 @@ function createFeatureTest(createFeatureData: FeatureData, baseContext: string =
       await featuresPage.goToAddFeaturePage(page);
 
       const pageTitle = await addFeaturePage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addFeaturePage.createPageTitle);
+      expect(pageTitle).to.contains(addFeaturePage.createPageTitle);
     });
 
     it('should create feature', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createNewFeature', baseContext);
 
       const textResult = await addFeaturePage.setFeature(page, createFeatureData);
-      await expect(textResult).to.contains(featuresPage.successfulCreationMessage);
+      expect(textResult).to.contains(featuresPage.successfulCreationMessage);
     });
   });
 }
@@ -119,7 +119,7 @@ function bulkDeleteFeaturesTest(featureName: string, baseContext: string = 'comm
       await attributesPage.closeSfToolBar(page);
 
       const pageTitle = await attributesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(attributesPage.pageTitle);
+      expect(pageTitle).to.contains(attributesPage.pageTitle);
     });
 
     it('should go to Features page', async function () {
@@ -128,10 +128,10 @@ function bulkDeleteFeaturesTest(featureName: string, baseContext: string = 'comm
       await attributesPage.goToFeaturesPage(page);
 
       const pageTitle = await featuresPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(featuresPage.pageTitle);
+      expect(pageTitle).to.contains(featuresPage.pageTitle);
 
       numberOfFeatures = await featuresPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfFeatures).to.be.above(0);
+      expect(numberOfFeatures).to.be.above(0);
     });
 
     it(`should filter by feature name '${featureName}'`, async function () {
@@ -140,28 +140,28 @@ function bulkDeleteFeaturesTest(featureName: string, baseContext: string = 'comm
       await featuresPage.filterTable(page, 'name', featureName);
 
       const numberOfFeaturesAfterFilter = await featuresPage.getNumberOfElementInGrid(page);
-      await expect(numberOfFeaturesAfterFilter).to.be.equal(19);
+      expect(numberOfFeaturesAfterFilter).to.be.equal(19);
     });
 
     it('should get the number of features to delete', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'getNumberToDelete', baseContext);
 
       numberOfFeaturesToDelete = await featuresPage.getNumberOfElementInGrid(page);
-      await expect(numberOfFeaturesToDelete).to.be.above(0);
+      expect(numberOfFeaturesToDelete).to.be.above(0);
     });
 
     it('should delete features by Bulk Actions and check result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteFeatures', baseContext);
 
       const deleteTextResult = await featuresPage.bulkDeleteFeatures(page);
-      await expect(deleteTextResult).to.be.contains(featuresPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.contains(featuresPage.successfulMultiDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilter', baseContext);
 
       const numberOfFeaturesAfterDelete = await featuresPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfFeaturesAfterDelete).to.equal(numberOfFeatures - numberOfFeaturesToDelete);
+      expect(numberOfFeaturesAfterDelete).to.equal(numberOfFeatures - numberOfFeaturesToDelete);
     });
   });
 }
diff --git a/tests/UI/commonTests/BO/catalog/monitoring.ts b/tests/UI/commonTests/BO/catalog/monitoring.ts
index 1fdb231576337..b031ce02d65b0 100644
--- a/tests/UI/commonTests/BO/catalog/monitoring.ts
+++ b/tests/UI/commonTests/BO/catalog/monitoring.ts
@@ -46,21 +46,21 @@ function bulkDeleteProductsTest(tableID: string, baseContext: string = `commonTe
       );
 
       const pageTitle = await monitoringPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(monitoringPage.pageTitle);
+      expect(pageTitle).to.contains(monitoringPage.pageTitle);
     });
 
     it('should bulk delete elements on table', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteElements', baseContext);
 
       const textResult = await monitoringPage.bulkDeleteElementsInTable(page, tableID);
-      await expect(textResult).to.equal(monitoringPage.successfulDeleteMessage);
+      expect(textResult).to.equal(monitoringPage.successfulDeleteMessage);
     });
 
     it('should check number of elements on table', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'reset', baseContext);
 
       const numberOfElementsAfterDelete = await monitoringPage.resetAndGetNumberOfLines(page, tableID);
-      await expect(numberOfElementsAfterDelete).to.be.equal(0);
+      expect(numberOfElementsAfterDelete).to.be.equal(0);
     });
   });
 }
diff --git a/tests/UI/commonTests/BO/catalog/product.ts b/tests/UI/commonTests/BO/catalog/product.ts
index dcb6f8840fabd..44c1a23042d94 100644
--- a/tests/UI/commonTests/BO/catalog/product.ts
+++ b/tests/UI/commonTests/BO/catalog/product.ts
@@ -50,14 +50,14 @@ function createProductTest(productData: ProductData, baseContext: string = 'comm
       await productsPage.closeSfToolBar(page);
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should reset all filters and get number of products', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFiltersBeforeCreate', baseContext);
 
       const numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProducts).to.be.above(0);
+      expect(numberOfProducts).to.be.above(0);
     });
 
     it('should go to add product page', async function () {
@@ -66,14 +66,14 @@ function createProductTest(productData: ProductData, baseContext: string = 'comm
       await productsPage.goToAddProductPage(page);
 
       const pageTitle = await addProductPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addProductPage.pageTitle);
+      expect(pageTitle).to.contains(addProductPage.pageTitle);
     });
 
     it('should create product', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createProduct', baseContext);
 
       const createProductMessage = await addProductPage.createEditBasicProduct(page, productData);
-      await expect(createProductMessage).to.equal(addProductPage.settingUpdatedMessage);
+      expect(createProductMessage).to.equal(addProductPage.settingUpdatedMessage);
     });
   });
 }
@@ -105,7 +105,7 @@ function deleteProductTest(productData: ProductData, baseContext: string = 'comm
       await dashboardPage.goToSubMenu(page, dashboardPage.catalogParentLink, dashboardPage.productsLink);
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should reset all filters', async function () {
@@ -114,21 +114,21 @@ function deleteProductTest(productData: ProductData, baseContext: string = 'comm
       await productsPage.resetFilter(page);
 
       const numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProducts).to.be.above(0);
+      expect(numberOfProducts).to.be.above(0);
     });
 
     it('should delete product from dropdown menu', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteProduct', baseContext);
 
       const deleteTextResult = await productsPage.deleteProduct(page, productData);
-      await expect(deleteTextResult).to.equal(productsPage.productDeletedSuccessfulMessage);
+      expect(deleteTextResult).to.equal(productsPage.productDeletedSuccessfulMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFiltersAfterDelete', baseContext);
 
       const numberOfProducts = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProducts).to.be.above(0);
+      expect(numberOfProducts).to.be.above(0);
     });
   });
 }
@@ -160,7 +160,7 @@ function deleteProductV2Test(productData: ProductData, baseContext: string = 'co
       await dashboardPage.goToSubMenu(page, dashboardPage.catalogParentLink, dashboardPage.productsLink);
 
       const pageTitle = await productsV2.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsV2.pageTitle);
+      expect(pageTitle).to.contains(productsV2.pageTitle);
     });
 
     it('should reset all filters', async function () {
@@ -169,28 +169,28 @@ function deleteProductV2Test(productData: ProductData, baseContext: string = 'co
       await productsV2.resetFilter(page);
 
       const numberOfProducts = await productsV2.resetAndGetNumberOfLines(page);
-      await expect(numberOfProducts).to.be.above(0);
+      expect(numberOfProducts).to.be.above(0);
     });
 
     it('should click on delete product button', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'clickOnDeleteProduct', baseContext);
 
       const isModalVisible: boolean = await productsV2.clickOnDeleteProductButton(page);
-      await expect(isModalVisible).to.be.true;
+      expect(isModalVisible).to.eq(true);
     });
 
     it('should delete product', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteProduct', baseContext);
 
       const textMessage: string = await productsV2.clickOnConfirmDialogButton(page);
-      await expect(textMessage).to.equal(productsV2.successfulDeleteMessage);
+      expect(textMessage).to.equal(productsV2.successfulDeleteMessage);
     });
 
     it('should reset filter', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFilter', baseContext);
 
       const numberOfProductsAfterReset: number = await productsV2.resetAndGetNumberOfLines(page);
-      await expect(numberOfProductsAfterReset).to.be.above(0);
+      expect(numberOfProductsAfterReset).to.be.above(0);
     });
   });
 }
@@ -222,14 +222,14 @@ function bulkDeleteProductsTest(productName: string, baseContext: string = 'comm
       await dashboardPage.goToSubMenu(page, dashboardPage.catalogParentLink, dashboardPage.productsLink);
 
       const pageTitle = await productsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(productsPage.pageTitle);
+      expect(pageTitle).to.contains(productsPage.pageTitle);
     });
 
     it('should get number of products', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'getNumberOfProducts', baseContext);
 
       numberOfProducts = await productsPage.getNumberOfProductsFromList(page);
-      await expect(numberOfProducts).to.be.at.least(0);
+      expect(numberOfProducts).to.be.at.least(0);
     });
 
     it('should filter products by name', async function () {
@@ -238,24 +238,24 @@ function bulkDeleteProductsTest(productName: string, baseContext: string = 'comm
       await productsPage.filterProducts(page, 'name', productName);
 
       numberOfProductsToDelete = await productsPage.getNumberOfProductsFromList(page);
-      await expect(numberOfProductsToDelete).to.be.at.least(0);
+      expect(numberOfProductsToDelete).to.be.at.least(0);
 
       const textColumn = await productsPage.getProductNameFromList(page, 1);
-      await expect(textColumn).to.contains(productName);
+      expect(textColumn).to.contains(productName);
     });
 
     it('should delete products by bulk actions', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteProducts', baseContext);
 
       const deleteTextResult = await productsPage.deleteAllProductsWithBulkActions(page);
-      await expect(deleteTextResult).to.equal(productsPage.productMultiDeletedSuccessfulMessage);
+      expect(deleteTextResult).to.equal(productsPage.productMultiDeletedSuccessfulMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterBulkDelete', baseContext);
 
       const numberOfProductsAfterReset = await productsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfProductsAfterReset).to.be.equal(numberOfProducts - numberOfProductsToDelete);
+      expect(numberOfProductsAfterReset).to.be.equal(numberOfProducts - numberOfProductsToDelete);
     });
   });
 }
diff --git a/tests/UI/commonTests/BO/customerService/merchandiseReturns.ts b/tests/UI/commonTests/BO/customerService/merchandiseReturns.ts
index a295cf71db51e..4946003d62482 100644
--- a/tests/UI/commonTests/BO/customerService/merchandiseReturns.ts
+++ b/tests/UI/commonTests/BO/customerService/merchandiseReturns.ts
@@ -46,14 +46,14 @@ function enableMerchandiseReturns(baseContext: string = 'commonTests-enableMerch
       await merchandiseReturnsPage.closeSfToolBar(page);
 
       const pageTitle = await merchandiseReturnsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(merchandiseReturnsPage.pageTitle);
+      expect(pageTitle).to.contains(merchandiseReturnsPage.pageTitle);
     });
 
     it('should enable merchandise returns', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'enableReturns', baseContext);
 
       const result = await merchandiseReturnsPage.setOrderReturnStatus(page, true);
-      await expect(result).to.contains(merchandiseReturnsPage.successfulUpdateMessage);
+      expect(result).to.contains(merchandiseReturnsPage.successfulUpdateMessage);
     });
   });
 }
@@ -88,14 +88,14 @@ function disableMerchandiseReturns(baseContext: string = 'commonTests-disableMer
       );
 
       const pageTitle = await merchandiseReturnsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(merchandiseReturnsPage.pageTitle);
+      expect(pageTitle).to.contains(merchandiseReturnsPage.pageTitle);
     });
 
     it('should disable merchandise returns', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'disableReturns', baseContext);
 
       const result = await merchandiseReturnsPage.setOrderReturnStatus(page, false);
-      await expect(result).to.contains(merchandiseReturnsPage.successfulUpdateMessage);
+      expect(result).to.contains(merchandiseReturnsPage.successfulUpdateMessage);
     });
   });
 }
diff --git a/tests/UI/commonTests/BO/customers/address.ts b/tests/UI/commonTests/BO/customers/address.ts
index bd1b99a828b88..311d92ba52969 100644
--- a/tests/UI/commonTests/BO/customers/address.ts
+++ b/tests/UI/commonTests/BO/customers/address.ts
@@ -53,14 +53,14 @@ function createAddressTest(addressData: AddressData, baseContext: string = 'comm
       await addressesPage.closeSfToolBar(page);
 
       const pageTitle = await addressesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addressesPage.pageTitle);
+      expect(pageTitle).to.contains(addressesPage.pageTitle);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFirst', baseContext);
 
       numberOfAddresses = await addressesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfAddresses).to.be.above(0);
+      expect(numberOfAddresses).to.be.above(0);
     });
 
     it('should go to add new address page', async function () {
@@ -69,17 +69,17 @@ function createAddressTest(addressData: AddressData, baseContext: string = 'comm
       await addressesPage.goToAddNewAddressPage(page);
 
       const pageTitle = await addAddressPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addAddressPage.pageTitleCreate);
+      expect(pageTitle).to.contains(addAddressPage.pageTitleCreate);
     });
 
     it('should create address and check result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createAddress', baseContext);
 
       const textResult = await addAddressPage.createEditAddress(page, addressData);
-      await expect(textResult).to.equal(addressesPage.successfulCreationMessage);
+      expect(textResult).to.equal(addressesPage.successfulCreationMessage);
 
       const numberOfAddressesAfterCreation = await addressesPage.getNumberOfElementInGrid(page);
-      await expect(numberOfAddressesAfterCreation).to.be.equal(numberOfAddresses + 1);
+      expect(numberOfAddressesAfterCreation).to.be.equal(numberOfAddresses + 1);
     });
   });
 }
@@ -122,14 +122,14 @@ function bulkDeleteAddressesTest(
       await addressesPage.closeSfToolBar(page);
 
       const pageTitle = await addressesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addressesPage.pageTitle);
+      expect(pageTitle).to.contains(addressesPage.pageTitle);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFirst', baseContext);
 
       numberOfAddresses = await addressesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfAddresses).to.be.above(0);
+      expect(numberOfAddresses).to.be.above(0);
     });
 
     it(`should filter list by '${filterBy}'`, async function () {
@@ -138,21 +138,21 @@ function bulkDeleteAddressesTest(
       await addressesPage.filterAddresses(page, 'input', filterBy, value);
 
       const address = await addressesPage.getTextColumnFromTableAddresses(page, 1, filterBy);
-      await expect(address).to.contains(value);
+      expect(address).to.contains(value);
     });
 
     it('should delete addresses with bulk actions and check result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteAddresses', baseContext);
 
       const deleteTextResult = await addressesPage.deleteAddressesBulkActions(page);
-      await expect(deleteTextResult).to.be.equal(addressesPage.successfulDeleteMessage);
+      expect(deleteTextResult).to.be.equal(addressesPage.successfulDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterBulkDelete', baseContext);
 
       const numberOfAddressesAfterReset = await addressesPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfAddressesAfterReset).to.be.above(0);
+      expect(numberOfAddressesAfterReset).to.be.above(0);
     });
   });
 }
diff --git a/tests/UI/commonTests/BO/customers/customer.ts b/tests/UI/commonTests/BO/customers/customer.ts
index d7ba5811a1f19..bd2b5883d33fe 100644
--- a/tests/UI/commonTests/BO/customers/customer.ts
+++ b/tests/UI/commonTests/BO/customers/customer.ts
@@ -49,7 +49,7 @@ function createCustomerTest(customerData: CustomerData, baseContext: string = 'c
       await customersPage.closeSfToolBar(page);
 
       const pageTitle = await customersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customersPage.pageTitle);
+      expect(pageTitle).to.contains(customersPage.pageTitle);
     });
 
     it('should go to add new customer page', async function () {
@@ -58,14 +58,14 @@ function createCustomerTest(customerData: CustomerData, baseContext: string = 'c
       await customersPage.goToAddNewCustomerPage(page);
 
       const pageTitle = await addCustomerPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addCustomerPage.pageTitleCreate);
+      expect(pageTitle).to.contains(addCustomerPage.pageTitleCreate);
     });
 
     it('should create customer and check result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createCustomer', baseContext);
 
       const textResult = await addCustomerPage.createEditCustomer(page, customerData);
-      await expect(textResult).to.equal(customersPage.successfulCreationMessage);
+      expect(textResult).to.equal(customersPage.successfulCreationMessage);
     });
   });
 }
@@ -99,7 +99,7 @@ function createCustomerB2BTest(customerData: CustomerData, baseContext: string =
       await customersPage.closeSfToolBar(page);
 
       const pageTitle = await customersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customersPage.pageTitle);
+      expect(pageTitle).to.contains(customersPage.pageTitle);
     });
 
     it('should go to add new customer page', async function () {
@@ -108,14 +108,14 @@ function createCustomerB2BTest(customerData: CustomerData, baseContext: string =
       await customersPage.goToAddNewCustomerPage(page);
 
       const pageTitle = await addCustomerPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addCustomerPage.pageTitleCreate);
+      expect(pageTitle).to.contains(addCustomerPage.pageTitleCreate);
     });
 
     it('should create B2B customer and check result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createCustomer', baseContext);
 
       const textResult = await addCustomerPage.createEditB2BCustomer(page, customerData);
-      await expect(textResult).to.equal(customersPage.successfulCreationMessage);
+      expect(textResult).to.equal(customersPage.successfulCreationMessage);
     });
   });
 }
@@ -149,14 +149,14 @@ function deleteCustomerTest(customerData: CustomerData, baseContext: string = 'c
       await customersPage.closeSfToolBar(page);
 
       const pageTitle = await customersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customersPage.pageTitle);
+      expect(pageTitle).to.contains(customersPage.pageTitle);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetCustomerFilterFirst', baseContext);
 
       numberOfCustomers = await customersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCustomers).to.be.above(0);
+      expect(numberOfCustomers).to.be.above(0);
     });
 
     it('should filter list by customer email', async function () {
@@ -165,21 +165,21 @@ function deleteCustomerTest(customerData: CustomerData, baseContext: string = 'c
       await customersPage.filterCustomers(page, 'input', 'email', customerData.email);
 
       const textResult = await customersPage.getTextColumnFromTableCustomers(page, 1, 'email');
-      await expect(textResult).to.contains(customerData.email);
+      expect(textResult).to.contains(customerData.email);
     });
 
     it('should delete customer and check result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteCustomer', baseContext);
 
       const deleteTextResult = await customersPage.deleteCustomer(page, 1);
-      await expect(deleteTextResult).to.be.equal(customersPage.successfulDeleteMessage);
+      expect(deleteTextResult).to.be.equal(customersPage.successfulDeleteMessage);
     });
 
     it('should reset filter and check the number of customers', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDeleteCustomer', baseContext);
 
       const numberOfCustomersAfterReset = await customersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCustomersAfterReset).to.be.above(0);
+      expect(numberOfCustomersAfterReset).to.be.above(0);
     });
   });
 }
@@ -218,14 +218,14 @@ function bulkDeleteCustomersTest(
       await customersPage.closeSfToolBar(page);
 
       const pageTitle = await customersPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customersPage.pageTitle);
+      expect(pageTitle).to.contains(customersPage.pageTitle);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetCustomerFilterFirst', baseContext);
 
       numberOfCustomers = await customersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCustomers).to.be.above(0);
+      expect(numberOfCustomers).to.be.above(0);
     });
 
     it(`should filter list by '${filterBy}'`, async function () {
@@ -234,21 +234,21 @@ function bulkDeleteCustomersTest(
       await customersPage.filterCustomers(page, 'input', filterBy, value);
 
       const textResult = await customersPage.getTextColumnFromTableCustomers(page, 1, filterBy);
-      await expect(textResult).to.contains(value);
+      expect(textResult).to.contains(value);
     });
 
     it('should delete customers with Bulk Actions and check result', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'bulkDeleteCustomers', baseContext);
 
       const deleteTextResult = await customersPage.deleteCustomersBulkActions(page);
-      await expect(deleteTextResult).to.be.equal(customersPage.successfulMultiDeleteMessage);
+      expect(deleteTextResult).to.be.equal(customersPage.successfulMultiDeleteMessage);
     });
 
     it('should reset all filters', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterBulkDelete', baseContext);
 
       const numberOfCustomersAfterReset = await customersPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfCustomersAfterReset).to.be.below(numberOfCustomers);
+      expect(numberOfCustomersAfterReset).to.be.below(numberOfCustomers);
     });
   });
 }
diff --git a/tests/UI/commonTests/BO/international/currency.ts b/tests/UI/commonTests/BO/international/currency.ts
index 73d02d67f2e96..294d2d6a767ec 100644
--- a/tests/UI/commonTests/BO/international/currency.ts
+++ b/tests/UI/commonTests/BO/international/currency.ts
@@ -53,7 +53,7 @@ function createCurrencyTest(currencyData: CurrencyData, baseContext: string = 'c
       await localizationPage.closeSfToolBar(page);
 
       const pageTitle = await localizationPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(localizationPage.pageTitle);
+      expect(pageTitle).to.contains(localizationPage.pageTitle);
     });
 
     it('should go to \'Currencies\' page', async function () {
@@ -62,7 +62,7 @@ function createCurrencyTest(currencyData: CurrencyData, baseContext: string = 'c
       await localizationPage.goToSubTabCurrencies(page);
 
       const pageTitle = await currenciesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(currenciesPage.pageTitle);
+      expect(pageTitle).to.contains(currenciesPage.pageTitle);
     });
 
     it('should go to create new currency page', async function () {
@@ -71,7 +71,7 @@ function createCurrencyTest(currencyData: CurrencyData, baseContext: string = 'c
       await currenciesPage.goToAddNewCurrencyPage(page);
 
       const pageTitle = await addCurrencyPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(addCurrencyPage.pageTitle);
+      expect(pageTitle).to.contains(addCurrencyPage.pageTitle);
     });
 
     it('should create currency', async function () {
@@ -79,7 +79,7 @@ function createCurrencyTest(currencyData: CurrencyData, baseContext: string = 'c
 
       // Create and check successful message
       const textResult = await addCurrencyPage.addOfficialCurrency(page, currencyData);
-      await expect(textResult).to.contains(currenciesPage.successfulCreationMessage);
+      expect(textResult).to.contains(currenciesPage.successfulCreationMessage);
     });
   });
 }
@@ -116,7 +116,7 @@ function deleteCurrencyTest(currencyData: CurrencyData, baseContext: string = 'c
       await localizationPage.closeSfToolBar(page);
 
       const pageTitle = await localizationPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(localizationPage.pageTitle);
+      expect(pageTitle).to.contains(localizationPage.pageTitle);
     });
 
     it('should go to \'Currencies\' page', async function () {
@@ -125,7 +125,7 @@ function deleteCurrencyTest(currencyData: CurrencyData, baseContext: string = 'c
       await localizationPage.goToSubTabCurrencies(page);
 
       const pageTitle = await currenciesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(currenciesPage.pageTitle);
+      expect(pageTitle).to.contains(currenciesPage.pageTitle);
     });
 
     it(`should filter by iso code of currency '${currencyData.isoCode}'`, async function () {
@@ -136,14 +136,14 @@ function deleteCurrencyTest(currencyData: CurrencyData, baseContext: string = 'c
 
       // Check currency to delete
       const textColumn = await currenciesPage.getTextColumnFromTableCurrency(page, 1, 'iso_code');
-      await expect(textColumn).to.contains(currencyData.isoCode);
+      expect(textColumn).to.contains(currencyData.isoCode);
     });
 
     it('should delete currency', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'deleteCurrency', baseContext);
 
       const result = await currenciesPage.deleteCurrency(page, 1);
-      await expect(result).to.be.equal(currenciesPage.successfulDeleteMessage);
+      expect(result).to.be.equal(currenciesPage.successfulDeleteMessage);
     });
   });
 }
diff --git a/tests/UI/commonTests/BO/international/ecoTax.ts b/tests/UI/commonTests/BO/international/ecoTax.ts
index 096ca4a8b7473..00d1b8e93a45f 100644
--- a/tests/UI/commonTests/BO/international/ecoTax.ts
+++ b/tests/UI/commonTests/BO/international/ecoTax.ts
@@ -42,14 +42,14 @@ function enableEcoTaxTest(baseContext: string = 'commonTests-enableEcoTaxTest'):
       await taxesPage.closeSfToolBar(page);
 
       const pageTitle = await taxesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(taxesPage.pageTitle);
+      expect(pageTitle).to.contains(taxesPage.pageTitle);
     });
 
     it('should enable ecotax', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'enableEcoTax', baseContext);
 
       const textResult = await taxesPage.enableEcoTax(page, true);
-      await expect(textResult).to.be.equal('Update successful');
+      expect(textResult).to.be.equal('Update successful');
     });
   });
 }
@@ -81,14 +81,14 @@ function disableEcoTaxTest(baseContext: string = 'commonTests-disableEcoTaxTest'
       await taxesPage.closeSfToolBar(page);
 
       const pageTitle = await taxesPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(taxesPage.pageTitle);
+      expect(pageTitle).to.contains(taxesPage.pageTitle);
     });
 
     it('should disable Ecotax', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'disableEcoTax', baseContext);
 
       const textResult = await taxesPage.enableEcoTax(page, false);
-      await expect(textResult).to.be.equal('Update successful');
+      expect(textResult).to.be.equal('Update successful');
     });
   });
 }
diff --git a/tests/UI/commonTests/BO/loginBO.ts b/tests/UI/commonTests/BO/loginBO.ts
index b5313842724a6..53897a782ac9f 100644
--- a/tests/UI/commonTests/BO/loginBO.ts
+++ b/tests/UI/commonTests/BO/loginBO.ts
@@ -20,7 +20,7 @@ export default {
     await loginPage.successLogin(page, email, password);
 
     const pageTitle = await dashboardPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(dashboardPage.pageTitle);
+    expect(pageTitle).to.contains(dashboardPage.pageTitle);
   },
 
   async logoutBO(mochaContext: Context, page: Page): Promise<void> {
@@ -29,6 +29,6 @@ export default {
     await dashboardPage.logoutBO(page);
 
     const pageTitle = await loginPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(loginPage.pageTitle);
+    expect(pageTitle).to.contains(loginPage.pageTitle);
   },
 };
diff --git a/tests/UI/commonTests/BO/modules/moduleManager.ts b/tests/UI/commonTests/BO/modules/moduleManager.ts
index 72bd77c2980cf..2ef494f29dc83 100644
--- a/tests/UI/commonTests/BO/modules/moduleManager.ts
+++ b/tests/UI/commonTests/BO/modules/moduleManager.ts
@@ -39,7 +39,7 @@ function installModule(module: ModuleData, baseContext: string = 'commonTests-in
       await files.downloadFile(module.releaseZip, 'module.zip');
 
       const found = await files.doesFileExist('module.zip');
-      await expect(found).to.be.true;
+      expect(found).to.eq(true);
     });
 
     it('should go to \'Modules > Module Manager\' page', async function () {
@@ -53,28 +53,28 @@ function installModule(module: ModuleData, baseContext: string = 'commonTests-in
       await moduleManagerPage.closeSfToolBar(page);
 
       const pageTitle = await moduleManagerPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
+      expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
     });
 
     it(`should upload the module '${module.name}'`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'uploadModule', baseContext);
 
       const successMessage = await moduleManagerPage.uploadModule(page, 'module.zip');
-      await expect(successMessage).to.eq(moduleManagerPage.uploadModuleSuccessMessage);
+      expect(successMessage).to.eq(moduleManagerPage.uploadModuleSuccessMessage);
     });
 
     it('should close upload module modal', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'closeModal', baseContext);
 
       const isModalVisible = await moduleManagerPage.closeUploadModuleModal(page);
-      await expect(isModalVisible).to.be.true;
+      expect(isModalVisible).to.eq(true);
     });
 
     it(`should search the module '${module.name}'`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'searchModule', baseContext);
 
       const isModuleVisible = await moduleManagerPage.searchModule(page, module);
-      await expect(isModuleVisible, 'Module is not visible!').to.be.true;
+      expect(isModuleVisible, 'Module is not visible!').to.eq(true);
     });
   });
 }
@@ -109,21 +109,21 @@ function uninstallModule(module: ModuleData, baseContext: string = 'commonTests-
       await moduleManagerPage.closeSfToolBar(page);
 
       const pageTitle = await moduleManagerPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
+      expect(pageTitle).to.contains(moduleManagerPage.pageTitle);
     });
 
     it(`should search the module '${Modules.keycloak.name}'`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'searchModule', baseContext);
 
       const isModuleVisible = await moduleManagerPage.searchModule(page, Modules.keycloak);
-      await expect(isModuleVisible, 'Module is not visible!').to.be.true;
+      expect(isModuleVisible, 'Module is not visible!').to.eq(true);
     });
 
     it(`should uninstall the module '${module.name}'`, async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'uninstallModule', baseContext);
 
       const successMessage = await moduleManagerPage.setActionInModule(page, module, 'uninstall');
-      await expect(successMessage).to.eq(moduleManagerPage.uninstallModuleSuccessMessage(module.tag));
+      expect(successMessage).to.eq(moduleManagerPage.uninstallModuleSuccessMessage(module.tag));
     });
   });
 }
diff --git a/tests/UI/commonTests/BO/orders/shoppingCarts.ts b/tests/UI/commonTests/BO/orders/shoppingCarts.ts
index 5c2355ee72731..38ff5f1f52433 100644
--- a/tests/UI/commonTests/BO/orders/shoppingCarts.ts
+++ b/tests/UI/commonTests/BO/orders/shoppingCarts.ts
@@ -47,14 +47,14 @@ function deleteNonOrderedShoppingCarts(baseContext: string = 'commonTests-delete
       );
 
       const pageTitle = await shoppingCartsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(shoppingCartsPage.pageTitle);
+      expect(pageTitle).to.contains(shoppingCartsPage.pageTitle);
     });
 
     it('should reset all filters and get number of shopping carts', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'resetFiltersFirst1', baseContext);
 
       numberOfShoppingCarts = await shoppingCartsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfShoppingCarts).to.be.above(0);
+      expect(numberOfShoppingCarts).to.be.above(0);
     });
 
     it('should search for the non ordered shopping carts', async function () {
@@ -63,13 +63,13 @@ function deleteNonOrderedShoppingCarts(baseContext: string = 'commonTests-delete
       await shoppingCartsPage.filterTable(page, 'input', 'status', 'Non ordered');
 
       numberOfNonOrderedShoppingCarts = await shoppingCartsPage.getNumberOfElementInGrid(page);
-      await expect(numberOfNonOrderedShoppingCarts).to.be.at.most(numberOfShoppingCarts);
+      expect(numberOfNonOrderedShoppingCarts).to.be.at.most(numberOfShoppingCarts);
 
       numberOfShoppingCarts -= numberOfNonOrderedShoppingCarts;
 
       for (let row = 1; row <= numberOfNonOrderedShoppingCarts; row++) {
         const textColumn = await shoppingCartsPage.getTextColumn(page, row, 'status');
-        await expect(textColumn).to.contains('Non ordered');
+        expect(textColumn).to.contains('Non ordered');
       }
     });
 
@@ -78,7 +78,7 @@ function deleteNonOrderedShoppingCarts(baseContext: string = 'commonTests-delete
 
       if (numberOfNonOrderedShoppingCarts > 0) {
         const deleteTextResult = await shoppingCartsPage.bulkDeleteShoppingCarts(page);
-        await expect(deleteTextResult).to.be.contains(shoppingCartsPage.successfulMultiDeleteMessage);
+        expect(deleteTextResult).to.be.contains(shoppingCartsPage.successfulMultiDeleteMessage);
       }
     });
 
@@ -86,7 +86,7 @@ function deleteNonOrderedShoppingCarts(baseContext: string = 'commonTests-delete
       await testContext.addContextItem(this, 'testIdentifier', 'resetAfterDeleteNonOrderedCarts1', baseContext);
 
       const numberOfShoppingCartsAfterReset = await shoppingCartsPage.resetAndGetNumberOfLines(page);
-      await expect(numberOfShoppingCartsAfterReset).to.be.equal(numberOfShoppingCarts);
+      expect(numberOfShoppingCartsAfterReset).to.be.equal(numberOfShoppingCarts);
     });
   });
 }
diff --git a/tests/UI/commonTests/BO/shopParameters/b2b.ts b/tests/UI/commonTests/BO/shopParameters/b2b.ts
index 244e08da953fd..a5aad283769ac 100644
--- a/tests/UI/commonTests/BO/shopParameters/b2b.ts
+++ b/tests/UI/commonTests/BO/shopParameters/b2b.ts
@@ -47,7 +47,7 @@ function enableB2BTest(baseContext: string = 'commonTests-enableB2BTest'): void
       await customerSettingsPage.closeSfToolBar(page);
 
       const pageTitle = await customerSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customerSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(customerSettingsPage.pageTitle);
     });
 
     it('should enable B2B mode', async function () {
@@ -58,7 +58,7 @@ function enableB2BTest(baseContext: string = 'commonTests-enableB2BTest'): void
         CustomerSettingsOptions.OPTION_B2B,
         true,
       );
-      await expect(result).to.contains(customerSettingsPage.successfulUpdateMessage);
+      expect(result).to.contains(customerSettingsPage.successfulUpdateMessage);
     });
   });
 }
@@ -94,7 +94,7 @@ function disableB2BTest(baseContext: string = 'commonTests-disableB2BTest'): voi
       await customerSettingsPage.closeSfToolBar(page);
 
       const pageTitle = await customerSettingsPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(customerSettingsPage.pageTitle);
+      expect(pageTitle).to.contains(customerSettingsPage.pageTitle);
     });
 
     it('should disable B2B mode', async function () {
@@ -105,7 +105,7 @@ function disableB2BTest(baseContext: string = 'commonTests-disableB2BTest'): voi
         CustomerSettingsOptions.OPTION_B2B,
         false,
       );
-      await expect(result).to.contains(customerSettingsPage.successfulUpdateMessage);
+      expect(result).to.contains(customerSettingsPage.successfulUpdateMessage);
     });
   });
 }
diff --git a/tests/UI/commonTests/FO/account.ts b/tests/UI/commonTests/FO/account.ts
index 38cc325cd8eb7..84ae4ae7ac973 100644
--- a/tests/UI/commonTests/FO/account.ts
+++ b/tests/UI/commonTests/FO/account.ts
@@ -44,7 +44,7 @@ function createAccountTest(customerData: CustomerData, baseContext: string = 'co
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should go to create account page', async function () {
@@ -54,7 +54,7 @@ function createAccountTest(customerData: CustomerData, baseContext: string = 'co
       await foLoginPage.goToCreateAccountPage(page);
 
       const pageHeaderTitle = await foCreateAccountPage.getHeaderTitle(page);
-      await expect(pageHeaderTitle).to.equal(foCreateAccountPage.formTitle);
+      expect(pageHeaderTitle).to.equal(foCreateAccountPage.formTitle);
     });
 
     it('should create new account', async function () {
@@ -63,7 +63,7 @@ function createAccountTest(customerData: CustomerData, baseContext: string = 'co
       await foCreateAccountPage.createAccount(page, customerData);
 
       const isCustomerConnected = await homePage.isCustomerConnected(page);
-      await expect(isCustomerConnected).to.be.true;
+      expect(isCustomerConnected).to.eq(true);
     });
 
     it('should sign out from FO', async function () {
@@ -73,7 +73,7 @@ function createAccountTest(customerData: CustomerData, baseContext: string = 'co
       await homePage.logout(page);
 
       const isCustomerConnected = await homePage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is connected').to.be.false;
+      expect(isCustomerConnected, 'Customer is connected').to.eq(false);
     });
   });
 }
@@ -103,7 +103,7 @@ function createAddressTest(
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should go to login page', async function () {
@@ -112,7 +112,7 @@ function createAddressTest(
       await homePage.goToLoginPage(page);
 
       const pageTitle = await foLoginPage.getPageTitle(page);
-      await expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
+      expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
     });
 
     it('should sign in with default customer', async function () {
@@ -120,7 +120,7 @@ function createAddressTest(
 
       await foLoginPage.customerLogin(page, customerLoginData);
       const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
 
     it('should go to \'My account\' page', async function () {
@@ -129,7 +129,7 @@ function createAddressTest(
       await homePage.goToMyAccountPage(page);
 
       const pageTitle = await myAccountPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(myAccountPage.pageTitle);
+      expect(pageTitle).to.equal(myAccountPage.pageTitle);
     });
 
     it('should go to \'Addresses\' page', async function () {
@@ -138,7 +138,7 @@ function createAddressTest(
       await myAccountPage.goToAddressesPage(page);
 
       const pageHeaderTitle = await addressesPage.getPageTitle(page);
-      await expect(pageHeaderTitle).to.include(addressesPage.addressPageTitle);
+      expect(pageHeaderTitle).to.include(addressesPage.addressPageTitle);
     });
 
     it('should go to create address page', async function () {
@@ -147,14 +147,14 @@ function createAddressTest(
       await addressesPage.openNewAddressForm(page);
 
       const pageHeaderTitle = await addAddressPage.getHeaderTitle(page);
-      await expect(pageHeaderTitle).to.equal(addAddressPage.creationFormTitle);
+      expect(pageHeaderTitle).to.equal(addAddressPage.creationFormTitle);
     });
 
     it('should create address', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'createAddress', baseContext);
 
       const textResult = await addAddressPage.setAddress(page, addressData);
-      await expect(textResult).to.equal(addressesPage.addAddressSuccessfulMessage);
+      expect(textResult).to.equal(addressesPage.addAddressSuccessfulMessage);
     });
 
     it('should sign out from FO', async function () {
@@ -164,7 +164,7 @@ function createAddressTest(
       await homePage.logout(page);
 
       const isCustomerConnected = await homePage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is connected').to.be.false;
+      expect(isCustomerConnected, 'Customer is connected').to.eq(false);
     });
   });
 }
diff --git a/tests/UI/commonTests/FO/hummingbird.ts b/tests/UI/commonTests/FO/hummingbird.ts
index 2535a06ee269a..1d18a335b2160 100644
--- a/tests/UI/commonTests/FO/hummingbird.ts
+++ b/tests/UI/commonTests/FO/hummingbird.ts
@@ -42,10 +42,10 @@ function installHummingbird(baseContext: string = 'commonTests-installHummingbir
       await themeAndLogoPage.closeSfToolBar(page);
 
       const pageTitle = await themeAndLogoPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(themeAndLogoPage.pageTitle);
+      expect(pageTitle).to.contains(themeAndLogoPage.pageTitle);
 
       const numThemes = await themeAndLogoPage.getNumberOfThemes(page);
-      await expect(numThemes).to.eq(1);
+      expect(numThemes).to.eq(1);
     });
 
     it('should go to \'Add new theme\' page', async function () {
@@ -54,7 +54,7 @@ function installHummingbird(baseContext: string = 'commonTests-installHummingbir
       await themeAndLogoPage.goToNewThemePage(page);
 
       const pageTitle = await themeImportPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(themeImportPage.pageTitle);
+      expect(pageTitle).to.contains(themeImportPage.pageTitle);
     });
 
     it('should import from the web the Hummingbird theme', async function () {
@@ -63,17 +63,17 @@ function installHummingbird(baseContext: string = 'commonTests-installHummingbir
       await themeImportPage.importFromWeb(page, urlTheme);
 
       const pageTitle = await themeAndLogoPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(themeAndLogoPage.pageTitle);
+      expect(pageTitle).to.contains(themeAndLogoPage.pageTitle);
 
       const numThemes = await themeAndLogoPage.getNumberOfThemes(page);
-      await expect(numThemes).to.eq(2);
+      expect(numThemes).to.eq(2);
     });
 
     it('should enable the theme Hummingbird', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'enableThemeHummingbird', baseContext);
 
       const result = await themeAndLogoPage.enableTheme(page, 'hummingbird');
-      await expect(result).to.eq(themeAndLogoPage.successfulUpdateMessage);
+      expect(result).to.eq(themeAndLogoPage.successfulUpdateMessage);
     });
   });
 }
@@ -108,27 +108,27 @@ function uninstallHummingbird(baseContext: string = 'commonTests-uninstallHummin
       await themeAndLogoPage.closeSfToolBar(page);
 
       const pageTitle = await themeAndLogoPage.getPageTitle(page);
-      await expect(pageTitle).to.contains(themeAndLogoPage.pageTitle);
+      expect(pageTitle).to.contains(themeAndLogoPage.pageTitle);
 
       const numThemes = await themeAndLogoPage.getNumberOfThemes(page);
-      await expect(numThemes).to.eq(2);
+      expect(numThemes).to.eq(2);
     });
 
     it('should enable the theme Classic', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'enableThemeClassic', baseContext);
 
       const result = await themeAndLogoPage.enableTheme(page, 'classic');
-      await expect(result).to.eq(themeAndLogoPage.successfulUpdateMessage);
+      expect(result).to.eq(themeAndLogoPage.successfulUpdateMessage);
     });
 
     it('should remove the theme Hummingbird', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'removeThemeHummingbird', baseContext);
 
       const result = await themeAndLogoPage.removeTheme(page, 'hummingbird');
-      await expect(result).to.eq(themeAndLogoPage.successfulDeleteMessage);
+      expect(result).to.eq(themeAndLogoPage.successfulDeleteMessage);
 
       const numThemes = await themeAndLogoPage.getNumberOfThemes(page);
-      await expect(numThemes).to.eq(1);
+      expect(numThemes).to.eq(1);
     });
   });
 }
diff --git a/tests/UI/commonTests/FO/hummingbird/account.ts b/tests/UI/commonTests/FO/hummingbird/account.ts
index 60f0c26c29b15..b16aab32e14b1 100644
--- a/tests/UI/commonTests/FO/hummingbird/account.ts
+++ b/tests/UI/commonTests/FO/hummingbird/account.ts
@@ -41,7 +41,7 @@ function createAccountTest(customerData: CustomerData, baseContext: string = 'co
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should go to create account page', async function () {
@@ -51,7 +51,7 @@ function createAccountTest(customerData: CustomerData, baseContext: string = 'co
       await foLoginPage.goToCreateAccountPage(page);
 
       const pageHeaderTitle = await foCreateAccountPage.getHeaderTitle(page);
-      await expect(pageHeaderTitle).to.equal(foCreateAccountPage.formTitle);
+      expect(pageHeaderTitle).to.equal(foCreateAccountPage.formTitle);
     });
 
     it('should create new account', async function () {
@@ -60,7 +60,7 @@ function createAccountTest(customerData: CustomerData, baseContext: string = 'co
       await foCreateAccountPage.createAccount(page, customerData);
 
       const isCustomerConnected = await homePage.isCustomerConnected(page);
-      await expect(isCustomerConnected).to.be.true;
+      expect(isCustomerConnected).to.eq(true);
     });
 
     it('should sign out from FO', async function () {
@@ -70,7 +70,7 @@ function createAccountTest(customerData: CustomerData, baseContext: string = 'co
       await homePage.logout(page);
 
       const isCustomerConnected = await homePage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is connected').to.be.false;
+      expect(isCustomerConnected, 'Customer is connected').to.eq(false);
     });
   });
 }
diff --git a/tests/UI/commonTests/FO/loginFO.ts b/tests/UI/commonTests/FO/loginFO.ts
index 2681f3042216c..e2c284524f76c 100644
--- a/tests/UI/commonTests/FO/loginFO.ts
+++ b/tests/UI/commonTests/FO/loginFO.ts
@@ -21,10 +21,10 @@ export default {
     await loginPage.customerLogin(page, customer);
 
     const isCustomerConnected = await myAccountPage.isCustomerConnected(page);
-    await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+    expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
 
     const pageTitle = await myAccountPage.getPageTitle(page);
-    await expect(pageTitle).to.contains(myAccountPage.pageTitle);
+    expect(pageTitle).to.contains(myAccountPage.pageTitle);
   },
 
   async logoutFO(mochaContext: Context, page: Page): Promise<void> {
@@ -34,6 +34,6 @@ export default {
     await loginPage.logout(page);
 
     const isCustomerConnected = await myAccountPage.isCustomerConnected(page);
-    await expect(isCustomerConnected, 'Customer is still connected').to.be.false;
+    expect(isCustomerConnected, 'Customer is still connected').to.eq(false);
   },
 };
diff --git a/tests/UI/commonTests/FO/order.ts b/tests/UI/commonTests/FO/order.ts
index 09bcce5e363de..e9de241c1d883 100644
--- a/tests/UI/commonTests/FO/order.ts
+++ b/tests/UI/commonTests/FO/order.ts
@@ -46,7 +46,7 @@ function createOrderByCustomerTest(orderData: OrderData, baseContext: string = '
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should go to login page', async function () {
@@ -55,7 +55,7 @@ function createOrderByCustomerTest(orderData: OrderData, baseContext: string = '
       await homePage.goToLoginPage(page);
 
       const pageTitle = await foLoginPage.getPageTitle(page);
-      await expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
+      expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
     });
 
     it('should sign in with customer credentials', async function () {
@@ -64,7 +64,7 @@ function createOrderByCustomerTest(orderData: OrderData, baseContext: string = '
       await foLoginPage.customerLogin(page, orderData.customer);
 
       const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
 
     it('should add product to cart', async function () {
@@ -78,7 +78,7 @@ function createOrderByCustomerTest(orderData: OrderData, baseContext: string = '
       await productPage.addProductToTheCart(page, orderData.products[0].quantity);
 
       const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
-      await expect(notificationsNumber).to.be.equal(orderData.products[0].quantity);
+      expect(notificationsNumber).to.be.equal(orderData.products[0].quantity);
     });
 
     it('should go to delivery step', async function () {
@@ -89,7 +89,7 @@ function createOrderByCustomerTest(orderData: OrderData, baseContext: string = '
 
       // Address step - Go to delivery step
       const isStepAddressComplete = await checkoutPage.goToDeliveryStep(page);
-      await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
     });
 
     it('should go to payment step', async function () {
@@ -97,7 +97,7 @@ function createOrderByCustomerTest(orderData: OrderData, baseContext: string = '
 
       // Delivery step - Go to payment step
       const isStepDeliveryComplete = await checkoutPage.goToPaymentStep(page);
-      await expect(isStepDeliveryComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepDeliveryComplete, 'Step Address is not complete').to.eq(true);
     });
 
     it('should choose payment method and confirm the order', async function () {
@@ -108,7 +108,7 @@ function createOrderByCustomerTest(orderData: OrderData, baseContext: string = '
 
       // Check the confirmation message
       const cardTitle = await orderConfirmationPage.getOrderConfirmationCardTitle(page);
-      await expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
+      expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
     });
   });
 }
@@ -141,7 +141,7 @@ function createOrderSpecificProductTest(
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should go to login page', async function () {
@@ -150,7 +150,7 @@ function createOrderSpecificProductTest(
       await homePage.goToLoginPage(page);
 
       const pageTitle = await foLoginPage.getPageTitle(page);
-      await expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
+      expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
     });
 
     it('should sign in with default customer', async function () {
@@ -159,7 +159,7 @@ function createOrderSpecificProductTest(
       await foLoginPage.customerLogin(page, orderData.customer);
 
       const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
 
     it(`should search for the product ${orderData.products[0].product.name}`, async function () {
@@ -168,7 +168,7 @@ function createOrderSpecificProductTest(
       await homePage.searchProduct(page, orderData.products[0].product.name);
 
       const pageTitle = await searchResultsPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(searchResultsPage.pageTitle);
+      expect(pageTitle).to.equal(searchResultsPage.pageTitle);
     });
 
     it('should add product to cart', async function () {
@@ -179,7 +179,7 @@ function createOrderSpecificProductTest(
       await productPage.addProductToTheCart(page, orderData.products[0].quantity);
 
       const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
-      await expect(notificationsNumber).to.be.equal(orderData.products[0].quantity);
+      expect(notificationsNumber).to.be.equal(orderData.products[0].quantity);
     });
 
     it('should go to delivery step', async function () {
@@ -190,7 +190,7 @@ function createOrderSpecificProductTest(
 
       // Address step - Go to delivery step
       const isStepAddressComplete = await checkoutPage.goToDeliveryStep(page);
-      await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
     });
 
     it('should go to payment step', async function () {
@@ -198,7 +198,7 @@ function createOrderSpecificProductTest(
 
       // Delivery step - Go to payment step
       const isStepDeliveryComplete = await checkoutPage.goToPaymentStep(page);
-      await expect(isStepDeliveryComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepDeliveryComplete, 'Step Address is not complete').to.eq(true);
     });
 
     it('should choose payment method and confirm the order', async function () {
@@ -209,7 +209,7 @@ function createOrderSpecificProductTest(
 
       // Check the confirmation message
       const cardTitle = await orderConfirmationPage.getOrderConfirmationCardTitle(page);
-      await expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
+      expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
     });
   });
 }
@@ -239,7 +239,7 @@ function createOrderByGuestTest(orderData: OrderData, baseContext: string = 'com
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should add product to cart and proceed to checkout', async function () {
@@ -255,21 +255,21 @@ function createOrderByGuestTest(orderData: OrderData, baseContext: string = 'com
 
       // Go to checkout page
       const isCheckoutPage = await checkoutPage.isCheckoutPage(page);
-      await expect(isCheckoutPage).to.be.true;
+      expect(isCheckoutPage).to.eq(true);
     });
 
     it('should fill guest personal information', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'setPersonalInformation', baseContext);
 
       const isStepPersonalInfoCompleted = await checkoutPage.setGuestPersonalInformation(page, orderData.customer);
-      await expect(isStepPersonalInfoCompleted, 'Step personal information is not completed').to.be.true;
+      expect(isStepPersonalInfoCompleted, 'Step personal information is not completed').to.eq(true);
     });
 
     it('should fill address form and go to delivery step', async function () {
       await testContext.addContextItem(this, 'testIdentifier', 'setAddressStep', baseContext);
 
       const isStepAddressComplete = await checkoutPage.setAddress(page, orderData.deliveryAddress);
-      await expect(isStepAddressComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepAddressComplete, 'Step Address is not complete').to.eq(true);
     });
 
     it('should validate the order', async function () {
@@ -277,14 +277,14 @@ function createOrderByGuestTest(orderData: OrderData, baseContext: string = 'com
 
       // Delivery step - Go to payment step
       const isStepDeliveryComplete = await checkoutPage.goToPaymentStep(page);
-      await expect(isStepDeliveryComplete, 'Step Address is not complete').to.be.true;
+      expect(isStepDeliveryComplete, 'Step Address is not complete').to.eq(true);
 
       // Payment step - Choose payment step
       await checkoutPage.choosePaymentAndOrder(page, orderData.paymentMethod.moduleName);
       const cardTitle = await orderConfirmationPage.getOrderConfirmationCardTitle(page);
 
       // Check the confirmation message
-      await expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
+      expect(cardTitle).to.contains(orderConfirmationPage.orderConfirmationCardTitle);
     });
   });
 }
diff --git a/tests/UI/commonTests/FO/shoppingCart.ts b/tests/UI/commonTests/FO/shoppingCart.ts
index f8ba736420d1a..c571d44646292 100644
--- a/tests/UI/commonTests/FO/shoppingCart.ts
+++ b/tests/UI/commonTests/FO/shoppingCart.ts
@@ -42,7 +42,7 @@ function createShoppingCart(orderData: OrderData, baseContext: string = 'commonT
       await homePage.changeLanguage(page, 'en');
 
       const isHomePage = await homePage.isHomePage(page);
-      await expect(isHomePage, 'Fail to open FO home page').to.be.true;
+      expect(isHomePage, 'Fail to open FO home page').to.eq(true);
     });
 
     it('should go to login page', async function () {
@@ -51,7 +51,7 @@ function createShoppingCart(orderData: OrderData, baseContext: string = 'commonT
       await homePage.goToLoginPage(page);
 
       const pageTitle = await foLoginPage.getPageTitle(page);
-      await expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
+      expect(pageTitle, 'Fail to open FO login page').to.contains(foLoginPage.pageTitle);
     });
 
     it('should sign in with customer', async function () {
@@ -60,7 +60,7 @@ function createShoppingCart(orderData: OrderData, baseContext: string = 'commonT
       await foLoginPage.customerLogin(page, orderData.customer);
 
       const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is not connected').to.be.true;
+      expect(isCustomerConnected, 'Customer is not connected').to.eq(true);
     });
 
     it(`should search for the product ${orderData.products[0].product.name}`, async function () {
@@ -69,7 +69,7 @@ function createShoppingCart(orderData: OrderData, baseContext: string = 'commonT
       await homePage.searchProduct(page, orderData.products[0].product.name);
 
       const pageTitle = await searchResultsPage.getPageTitle(page);
-      await expect(pageTitle).to.equal(searchResultsPage.pageTitle);
+      expect(pageTitle).to.equal(searchResultsPage.pageTitle);
     });
 
     it('should add product to cart', async function () {
@@ -80,7 +80,7 @@ function createShoppingCart(orderData: OrderData, baseContext: string = 'commonT
       await productPage.addProductToTheCart(page, orderData.products[0].quantity);
 
       const notificationsNumber = await cartPage.getCartNotificationsNumber(page);
-      await expect(notificationsNumber).to.be.equal(orderData.products[0].quantity);
+      expect(notificationsNumber).to.be.equal(orderData.products[0].quantity);
     });
 
     it('should sign out from FO', async function () {
@@ -89,10 +89,10 @@ function createShoppingCart(orderData: OrderData, baseContext: string = 'commonT
       await homePage.logout(page);
 
       const isCustomerConnected = await homePage.isCustomerConnected(page);
-      await expect(isCustomerConnected, 'Customer is connected').to.be.false;
+      expect(isCustomerConnected, 'Customer is connected').to.eq(false);
 
       const notificationNumber = await homePage.getCartNotificationsNumber(page);
-      await expect(notificationNumber).to.be.equal(0);
+      expect(notificationNumber).to.be.equal(0);
     });
   });
 }
diff --git a/tests/UI/pages/BO/catalog/productsV2/add/combinationsTab.ts b/tests/UI/pages/BO/catalog/productsV2/add/combinationsTab.ts
index 0075d56fb0eac..60ff5d7c16fad 100644
--- a/tests/UI/pages/BO/catalog/productsV2/add/combinationsTab.ts
+++ b/tests/UI/pages/BO/catalog/productsV2/add/combinationsTab.ts
@@ -573,7 +573,7 @@ class CombinationsTab extends BOBasePage {
     await this.waitForVisibleSelector(page, this.editCombinationIframe);
 
     const combinationFrame: Frame | null = await page.frame({url: /sell\/catalog\/products-v2\/combinations/gmi});
-    await expect(combinationFrame).to.be.not.null;
+    expect(combinationFrame).to.not.eq(null);
 
     await this.setValue(combinationFrame!, this.editCombinationModalQuantityInput, combinationData.quantity);
     if (combinationData.minimalQuantity) {
@@ -603,7 +603,7 @@ class CombinationsTab extends BOBasePage {
    */
   async getRecentStockMovements(page: Page, row: number = 1): Promise<ProductStockMovement> {
     const combinationFrame: Frame | null = await page.frame({url: /sell\/catalog\/products-v2\/combinations/gmi});
-    await expect(combinationFrame).to.be.not.null;
+    expect(combinationFrame).to.not.eq(null);
 
     return {
       dateTime: await this.getTextContent(combinationFrame!, this.combinationStockMovementsDate(row)),
@@ -619,7 +619,7 @@ class CombinationsTab extends BOBasePage {
    */
   async closeEditCombinationModal(page: Page): Promise<boolean> {
     const combinationFrame: Frame | null = await page.frame({url: /sell\/catalog\/products-v2\/combinations/gmi});
-    await expect(combinationFrame).to.be.not.null;
+    expect(combinationFrame).to.not.eq(null);
 
     await this.waitForSelectorAndClick(page, this.editCombinationModalCancelButton);
     if (await this.elementVisible(page, this.editCombinationModalDiscardButton, 2000)) {
@@ -925,7 +925,7 @@ class CombinationsTab extends BOBasePage {
    */
   async editCombinationsByBulkActions(page: Page, editCombinationsData: ProductCombinationBulk): Promise<string> {
     const bulkEditCombinationFrame: Frame|null = await page.frame('bulk-combination-form-modal-iframe');
-    await expect(bulkEditCombinationFrame).to.be.not.null;
+    expect(bulkEditCombinationFrame).to.not.eq(null);
 
     // Edit stocks
     if (editCombinationsData.stocks) {
diff --git a/tests/UI/pages/BO/orders/view/customerBlock.ts b/tests/UI/pages/BO/orders/view/customerBlock.ts
index f1469548afea2..6bdb0e3418dd7 100644
--- a/tests/UI/pages/BO/orders/view/customerBlock.ts
+++ b/tests/UI/pages/BO/orders/view/customerBlock.ts
@@ -5,8 +5,6 @@ import {ViewOrderBasePage} from '@pages/BO/orders/view/viewOrderBasePage';
 import AddressData from '@data/faker/address';
 
 import type {Frame, Page} from 'playwright';
-import {expect} from 'chai';
-
 /**
  * Customer block, contains functions that can be used on view/edit customer block
  * @class
@@ -83,6 +81,22 @@ class CustomerBlock extends ViewOrderBasePage {
   /*
   Methods
    */
+
+  /**
+   * Get Address frame
+   * @param page {Page} Browser tab
+   * @returns {Promise<Frame>}
+   */
+  async getAddressFrame(page: Page): Promise<Frame> {
+    const addressFrame: Frame|null = await page.frame({url: /sell\/addresses\/order/gmi});
+
+    if (addressFrame === null) {
+      throw new Error('Create product frame was not found');
+    }
+
+    return addressFrame;
+  }
+
   /**
    * Get customer information
    * @param page {Frame|Page} Browser tab
@@ -149,10 +163,9 @@ class CustomerBlock extends ViewOrderBasePage {
 
     await this.waitForVisibleSelector(page, this.editAddressIframe);
 
-    const addressFrame: Frame|null = await page.frame({url: /sell\/addresses\/order/gmi});
-    await expect(addressFrame).to.be.not.null;
+    const addressFrame = await this.getAddressFrame(page);
 
-    await addAddressPage.createEditAddress(addressFrame!, addressData, true, false);
+    await addAddressPage.createEditAddress(addressFrame, addressData, true, false);
 
     await this.waitForHiddenSelector(page, this.editAddressIframe);
 
@@ -187,8 +200,7 @@ class CustomerBlock extends ViewOrderBasePage {
 
     await this.waitForVisibleSelector(page, this.editAddressIframe);
 
-    const addressFrame: Frame|null = await page.frame({url: /sell\/addresses\/order/gmi});
-    await expect(addressFrame).to.be.not.null;
+    const addressFrame = await this.getAddressFrame(page);
 
     await addAddressPage.createEditAddress(addressFrame!, addressData, true, false);
 
diff --git a/tests/UI/tools/linkchecker.ts b/tests/UI/tools/linkchecker.ts
index ec9fee6015b1e..85ddba253e637 100755
--- a/tests/UI/tools/linkchecker.ts
+++ b/tests/UI/tools/linkchecker.ts
@@ -147,7 +147,7 @@ describe('Crawl every page for defects and issues', async () => {
           }
 
           // Print all errors
-          await expect(somethingFailed, `List of errors : \n${errors}`).to.be.false;
+          expect(somethingFailed, `List of errors : \n${errors}`).to.eq(false);
         });
       });
     });

From 8caae899a3a63e91e16f93266310c02a543f4dd8 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Fri, 22 Sep 2023 09:42:29 +0200
Subject: [PATCH 1030/1030] Nightly : Fixed Playwright in 1.7.8.x version

---
 .github/workflows/cron_nightly_tests_reusable.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/cron_nightly_tests_reusable.yml b/.github/workflows/cron_nightly_tests_reusable.yml
index 3ccbf682a00e2..5284339a2612c 100644
--- a/.github/workflows/cron_nightly_tests_reusable.yml
+++ b/.github/workflows/cron_nightly_tests_reusable.yml
@@ -226,6 +226,7 @@ jobs:
 
       - name: Install browsers
         working-directory: ${{ inputs.TESTS_DIR }}
+        if: env.GH_BRANCH != '1.7.8.x'
         run: npx playwright install --with-deps
 
       # Run tests (if error, we continue for uploading report)
@@ -297,6 +298,7 @@ jobs:
 
       - name: Install browsers
         working-directory: ${{ inputs.TESTS_DIR }}
+        if: env.GH_BRANCH != '1.7.8.x'
         run: npx playwright install --with-deps
 
       - name: Combine reports